Refactor vl_pickblock

This commit is contained in:
Mikita Wiśniewski 2024-08-01 09:40:09 +07:00
parent af092f35d9
commit 02b24a9032
2 changed files with 37 additions and 30 deletions

View file

@ -1,33 +1,30 @@
local S = minetest.get_translator("vl_pickblock") local S = minetest.get_translator("vl_pickblock")
minetest.override_item("", { local function pickblock(itemstack, placer, pointed_thing)
on_place = function(itemstack, placer, pointed_thing)
if minetest.is_creative_enabled(placer:get_player_name()) then
mcl_util.call_on_rightclick(itemstack, placer, pointed_thing)
local node = minetest.get_node_or_nil(pointed_thing.under) local node = minetest.get_node_or_nil(pointed_thing.under)
if not node then return end if not node then return end
local def = minetest.registered_nodes[node.name] local def = minetest.registered_nodes[node.name]
if not def then return end if not def then return end
local rnode = {} local rnode
-- if this is an 'illegal' node and there's an explicit `_vl_pickblock` field, then return it -- if this is an 'illegal' node and there's an explicit `_vl_pickblock` field, then return it
-- if the node isn't 'illegal', return it as-is -- if the node isn't 'illegal', return it as-is
-- (and if it's 'illegal' and no `_vl_pickblock` is defined, well, bad luck) -- (and if it's 'illegal' and no `_vl_pickblock` is defined, well, bad luck)
if def.groups.not_in_creative_inventory and def.groups.not_in_creative_inventory ~= 0 then local illegal = (def.groups.not_in_creative_inventory and def.groups.not_in_creative_inventory ~= 0)
if illegal then
if def._vl_pickblock then if def._vl_pickblock then
rnode.name = def._vl_pickblock rnode = def._vl_pickblock
end end
else else
rnode = node rnode = node.name
end end
local inv = placer:get_inventory() local inv = placer:get_inventory()
for i=1,placer:hud_get_hotbar_itemcount() do for i=1,placer:hud_get_hotbar_itemcount() do
local stack = inv:get_stack("main", i) local stack = inv:get_stack("main", i)
if stack:get_name() == rnode.name then if stack:get_name() == rnode then
local msg = S("@1 is on slot @2", stack:get_short_description(), i) local msg = S("@1 is on slot @2", stack:get_short_description(), minetest.colorize(mcl_colors.GOLD, i))
mcl_title.set(placer, "actionbar", {text = msg, stay = 30}) mcl_title.set(placer, "actionbar", {text = msg, stay = 30})
return return
end end
@ -35,5 +32,15 @@ minetest.override_item("", {
return rnode return rnode
end end
minetest.override_item("", {
on_place = function(itemstack, placer, pointed_thing)
if minetest.is_creative_enabled(placer:get_player_name()) then
if mcl_util.call_on_rightclick(itemstack, placer, pointed_thing) then
return
else
return pickblock(itemstack, placer, pointed_thing)
end
end
end end
}) })

View file

@ -1,3 +1,3 @@
name = vl_pickblock name = vl_pickblock
description = Allows you to put the selected node in an empty slot of your hotbar when you're in creative mode. description = Allows you to put the selected node in an empty slot of your hotbar when you're in creative mode.
depeds = mcl_util, mcl_title depeds = mcl_util, mcl_colors, mcl_title