Tweaked code

This commit is contained in:
TenPlus1 2016-05-18 20:04:15 +01:00
parent 7396af91d1
commit 4a0780cdfe

@ -1,6 +1,7 @@
-- formspec -- formspec
local function get_hopper_formspec(pos) local function get_hopper_formspec(pos)
local spos = pos.x .. "," .. pos.y .. "," ..pos.z local spos = pos.x .. "," .. pos.y .. "," ..pos.z
local formspec = local formspec =
"size[8,9]" "size[8,9]"
@ -12,6 +13,7 @@ local function get_hopper_formspec(pos)
.. "list[current_player;main;0,6.08;8,3;8]" .. "list[current_player;main;0,6.08;8,3;8]"
.. "listring[nodemeta:" .. spos .. ";main]" .. "listring[nodemeta:" .. spos .. ";main]"
.. "listring[current_player;main]" .. "listring[current_player;main]"
return formspec return formspec
end end
@ -40,42 +42,45 @@ minetest.register_node("hopper:hopper", {
}, },
on_construct = function(pos) on_construct = function(pos)
local meta = minetest.get_meta(pos)
local inv = meta:get_inventory() local inv = minetest.get_meta(pos):get_inventory()
meta:set_string("infotext", "Hopper")
inv:set_size("main", 4*4) inv:set_size("main", 4*4)
end, end,
can_dig = function(pos, player) can_dig = function(pos, player)
local meta = minetest.get_meta(pos)
local inv = meta:get_inventory() local inv = minetest.get_meta(pos):get_inventory()
return inv:is_empty("main") return inv:is_empty("main")
end, end,
on_rightclick = function(pos, node, clicker, itemstack) on_rightclick = function(pos, node, clicker, itemstack)
if minetest.is_protected(pos, clicker:get_player_name()) then if minetest.is_protected(pos, clicker:get_player_name()) then
return return
end end
minetest.show_formspec(
clicker:get_player_name(), minetest.show_formspec(clicker:get_player_name(),
"hopper:hopper", "hopper:hopper", get_hopper_formspec(pos))
get_hopper_formspec(pos)
)
end, end,
on_metadata_inventory_move = function(pos, from_list, from_index, to_list, to_index, count, player) on_metadata_inventory_move = function(pos, from_list, from_index, to_list, to_index, count, player)
minetest.log("action", player:get_player_name() minetest.log("action", player:get_player_name()
.." moves stuff in hopper at " .." moves stuff in hopper at "
..minetest.pos_to_string(pos)) ..minetest.pos_to_string(pos))
end, end,
on_metadata_inventory_put = function(pos, listname, index, stack, player) on_metadata_inventory_put = function(pos, listname, index, stack, player)
minetest.log("action", player:get_player_name() minetest.log("action", player:get_player_name()
.." moves stuff to hopper at " .." moves stuff to hopper at "
..minetest.pos_to_string(pos)) ..minetest.pos_to_string(pos))
end, end,
on_metadata_inventory_take = function(pos, listname, index, stack, player) on_metadata_inventory_take = function(pos, listname, index, stack, player)
minetest.log("action", player:get_player_name() minetest.log("action", player:get_player_name()
.." takes stuff from hopper at " .." takes stuff from hopper at "
..minetest.pos_to_string(pos)) ..minetest.pos_to_string(pos))
@ -113,42 +118,45 @@ minetest.register_node("hopper:hopper_side", {
}, },
on_construct = function(pos) on_construct = function(pos)
local meta = minetest.get_meta(pos)
local inv = meta:get_inventory() local inv = minetest.get_meta(pos):get_inventory()
meta:set_string("infotext", "Side Hopper")
inv:set_size("main", 4*4) inv:set_size("main", 4*4)
end, end,
can_dig = function(pos, player) can_dig = function(pos, player)
local meta = minetest.get_meta(pos)
local inv = meta:get_inventory() local inv = minetest.get_meta(pos):get_inventory()
return inv:is_empty("main") return inv:is_empty("main")
end, end,
on_rightclick = function(pos, node, clicker, itemstack) on_rightclick = function(pos, node, clicker, itemstack)
if minetest.is_protected(pos, clicker:get_player_name()) then if minetest.is_protected(pos, clicker:get_player_name()) then
return return
end end
minetest.show_formspec(
clicker:get_player_name(), minetest.show_formspec(clicker:get_player_name(),
"hopper:hopper_side", "hopper:hopper_side", get_hopper_formspec(pos))
get_hopper_formspec(pos)
)
end, end,
on_metadata_inventory_move = function(pos, from_list, from_index, to_list, to_index, count, player) on_metadata_inventory_move = function(pos, from_list, from_index, to_list, to_index, count, player)
minetest.log("action", player:get_player_name() minetest.log("action", player:get_player_name()
.." moves stuff in hopper at " .." moves stuff in hopper at "
..minetest.pos_to_string(pos)) ..minetest.pos_to_string(pos))
end, end,
on_metadata_inventory_put = function(pos, listname, index, stack, player) on_metadata_inventory_put = function(pos, listname, index, stack, player)
minetest.log("action", player:get_player_name() minetest.log("action", player:get_player_name()
.." moves stuff to hopper at " .." moves stuff to hopper at "
..minetest.pos_to_string(pos)) ..minetest.pos_to_string(pos))
end, end,
on_metadata_inventory_take = function(pos, listname, index, stack, player) on_metadata_inventory_take = function(pos, listname, index, stack, player)
minetest.log("action", player:get_player_name() minetest.log("action", player:get_player_name()
.." takes stuff from hopper at " .." takes stuff from hopper at "
..minetest.pos_to_string(pos)) ..minetest.pos_to_string(pos))
@ -167,8 +175,7 @@ minetest.register_abm({
action = function(pos, node) action = function(pos, node)
local meta = minetest.get_meta(pos) local inv = minetest.get_meta(pos):get_inventory()
local inv = meta:get_inventory()
local posob local posob
for _,object in pairs(minetest.get_objects_inside_radius(pos, 1)) do for _,object in pairs(minetest.get_objects_inside_radius(pos, 1)) do
@ -177,7 +184,8 @@ minetest.register_abm({
and object:get_luaentity() and object:get_luaentity()
and object:get_luaentity().name == "__builtin:item" and object:get_luaentity().name == "__builtin:item"
and inv and inv
and inv:room_for_item("main", ItemStack(object:get_luaentity().itemstring)) then and inv:room_for_item("main",
ItemStack(object:get_luaentity().itemstring)) then
posob = object:getpos() posob = object:getpos()
@ -185,7 +193,9 @@ minetest.register_abm({
and posob.y - pos.y <= 0.85 and posob.y - pos.y <= 0.85
and posob.y - pos.y >= 0.3 then and posob.y - pos.y >= 0.3 then
inv:add_item("main", ItemStack(object:get_luaentity().itemstring)) inv:add_item("main",
ItemStack(object:get_luaentity().itemstring))
object:get_luaentity().itemstring = "" object:get_luaentity().itemstring = ""
object:remove() object:remove()
end end
@ -198,8 +208,7 @@ minetest.register_abm({
local transfer = function(src, srcpos, dst, dstpos, name) local transfer = function(src, srcpos, dst, dstpos, name)
-- source inventory -- source inventory
local meta = minetest.get_meta(srcpos) local inv = minetest.get_meta(srcpos):get_inventory()
local inv = meta:get_inventory()
local invsize = inv:get_size(src) local invsize = inv:get_size(src)
-- check for empty source -- check for empty source
@ -208,8 +217,7 @@ local transfer = function(src, srcpos, dst, dstpos, name)
end end
-- destination inventory -- destination inventory
local meta2 = minetest.get_meta(dstpos) local inv2 = minetest.get_meta(dstpos):get_inventory()
local inv2 = meta2:get_inventory()
local invsize2 = inv2:get_size(dst) local invsize2 = inv2:get_size(dst)
local stack, item local stack, item