From fbc4cc851125bc0a1d48043f78210f4836491beb Mon Sep 17 00:00:00 2001 From: thetaepsilon-gamedev <32034735+thetaepsilon-gamedev@users.noreply.github.com> Date: Tue, 28 Jan 2020 21:38:13 +0100 Subject: [PATCH] technic_cnc/cnc.lua: Fix access to non-existant stack parameter (#528) --- technic_chests/mithril_chest.lua | 171 ++++++++++++-------------------------------------------- 1 files changed, 37 insertions(+), 134 deletions(-) diff --git a/technic_chests/mithril_chest.lua b/technic_chests/mithril_chest.lua index d173ab9..05cbc40 100644 --- a/technic_chests/mithril_chest.lua +++ b/technic_chests/mithril_chest.lua @@ -1,145 +1,48 @@ -minetest.register_craft({ - output = 'technic:mithril_chest 1', - recipe = { - {'moreores:mithril_ingot','moreores:mithril_ingot','moreores:mithril_ingot'}, - {'moreores:mithril_ingot','technic:gold_chest','moreores:mithril_ingot'}, - {'moreores:mithril_ingot','moreores:mithril_ingot','moreores:mithril_ingot'}, - } -}) +if minetest.get_modpath("moreores") then + minetest.register_craft({ + output = 'technic:mithril_chest 1', + recipe = { + {'moreores:mithril_ingot','moreores:mithril_ingot','moreores:mithril_ingot'}, + {'moreores:mithril_ingot','technic:gold_chest','moreores:mithril_ingot'}, + {'moreores:mithril_ingot','moreores:mithril_ingot','moreores:mithril_ingot'}, + } + }) + + minetest.register_craft({ + output = 'technic:mithril_locked_chest 1', + recipe = { + {'moreores:mithril_ingot','moreores:mithril_ingot','moreores:mithril_ingot'}, + {'moreores:mithril_ingot','technic:gold_locked_chest','moreores:mithril_ingot'}, + {'moreores:mithril_ingot','moreores:mithril_ingot','moreores:mithril_ingot'}, + } + }) +end minetest.register_craft({ output = 'technic:mithril_locked_chest 1', recipe = { - {'moreores:mithril_ingot','moreores:mithril_ingot','moreores:mithril_ingot'}, - {'moreores:mithril_ingot','technic:gold_locked_chest','moreores:mithril_ingot'}, - {'moreores:mithril_ingot','moreores:mithril_ingot','moreores:mithril_ingot'}, - } -}) - -minetest.register_craft({ - output = 'technic:mithril_locked_chest 1', - recipe = { - {'default:steel_ingot'}, + {'basic_materials:padlock'}, {'technic:mithril_chest'}, } }) -minetest.register_node(":technic:mithril_chest", { - description = "Mithril Chest", - tiles = {"technic_mithril_chest_top.png", "technic_mithril_chest_top.png", "technic_mithril_chest_side.png", - "technic_mithril_chest_side.png", "technic_mithril_chest_side.png", "technic_mithril_chest_front.png"}, - paramtype2 = "facedir", - groups = {snappy=2,choppy=2,oddly_breakable_by_hand=2}, - legacy_facedir_simple = true, - sounds = default.node_sound_wood_defaults(), - on_construct = function(pos) - local meta = minetest.env:get_meta(pos) - meta:set_string("formspec", - "invsize[13,9;]".. - "list[current_name;main;0,0;13,4;]".. - "list[current_player;main;0,5;8,4;]") - meta:set_string("infotext", "Mithril Chest") - local inv = meta:get_inventory() - inv:set_size("main", 13*4) - end, - can_dig = function(pos,player) - local meta = minetest.env:get_meta(pos); - local inv = meta:get_inventory() - return inv:is_empty("main") - end, - - on_metadata_inventory_move = function(pos, from_list, from_index, - to_list, to_index, count, player) - minetest.log("action", player:get_player_name().. - " moves stuff in chest at "..minetest.pos_to_string(pos)) - return minetest.node_metadata_inventory_move_allow_all( - pos, from_list, from_index, to_list, to_index, count, player) - end, - on_metadata_inventory_offer = function(pos, listname, index, stack, player) - minetest.log("action", player:get_player_name().. - " moves stuff to chest at "..minetest.pos_to_string(pos)) - return minetest.node_metadata_inventory_offer_allow_all( - pos, listname, index, stack, player) - end, - on_metadata_inventory_take = function(pos, listname, index, stack, player) - minetest.log("action", player:get_player_name().. - " takes stuff from chest at "..minetest.pos_to_string(pos)) - end, +technic.chests:register("Mithril", { + width = 15, + height = 6, + sort = true, + autosort = true, + infotext = false, + color = false, + locked = false, }) -minetest.register_node(":technic:mithril_locked_chest", { - description = "Mithril Locked Chest", - tiles = {"technic_mithril_chest_top.png", "technic_mithril_chest_top.png", "technic_mithril_chest_side.png", - "technic_mithril_chest_side.png", "technic_mithril_chest_side.png", "technic_mithril_chest_locked.png"}, - paramtype2 = "facedir", - groups = {snappy=2,choppy=2,oddly_breakable_by_hand=2}, - legacy_facedir_simple = true, - sounds = default.node_sound_wood_defaults(), - after_place_node = function(pos, placer) - local meta = minetest.env:get_meta(pos) - meta:set_string("owner", placer:get_player_name() or "") - meta:set_string("infotext", "Mithril Locked Chest (owned by ".. - meta:get_string("owner")..")") - end, -on_construct = function(pos) - local meta = minetest.env:get_meta(pos) - meta:set_string("formspec", - "invsize[13,9;]".. - "list[current_name;main;0,0;13,4;]".. - "list[current_player;main;0,5;8,4;]") - meta:set_string("infotext", "Mithril Locked Chest") - meta:set_string("owner", "") - local inv = meta:get_inventory() - inv:set_size("main", 13*4) - end, - can_dig = function(pos,player) - local meta = minetest.env:get_meta(pos); - local inv = meta:get_inventory() - return inv:is_empty("main") - end, - allow_metadata_inventory_move = function(pos, from_list, from_index, to_list, to_index, count, player) - local meta = minetest.env:get_meta(pos) - if not has_locked_chest_privilege(meta, player) then - minetest.log("action", player:get_player_name().. - " tried to access a locked chest belonging to ".. - meta:get_string("owner").." at ".. - minetest.pos_to_string(pos)) - return 0 - end - return count - end, - allow_metadata_inventory_put = function(pos, listname, index, stack, player) - local meta = minetest.env:get_meta(pos) - if not has_locked_chest_privilege(meta, player) then - minetest.log("action", player:get_player_name().. - " tried to access a locked chest belonging to ".. - meta:get_string("owner").." at ".. - minetest.pos_to_string(pos)) - return 0 - end - return stack:get_count() - end, - allow_metadata_inventory_take = function(pos, listname, index, stack, player) - local meta = minetest.env:get_meta(pos) - if not has_locked_chest_privilege(meta, player) then - minetest.log("action", player:get_player_name().. - " tried to access a locked chest belonging to ".. - meta:get_string("owner").." at ".. - minetest.pos_to_string(pos)) - return 0 - end - return stack:get_count() - end, - on_metadata_inventory_move = function(pos, from_list, from_index, to_list, to_index, count, player) - minetest.log("action", player:get_player_name().. - " moves stuff in locked chest at "..minetest.pos_to_string(pos)) - end, - on_metadata_inventory_put = function(pos, listname, index, stack, player) - minetest.log("action", player:get_player_name().. - " moves stuff to locked chest at "..minetest.pos_to_string(pos)) - end, - on_metadata_inventory_take = function(pos, listname, index, stack, player) - minetest.log("action", player:get_player_name().. - " takes stuff from locked chest at "..minetest.pos_to_string(pos)) - end, +technic.chests:register("Mithril", { + width = 15, + height = 6, + sort = true, + autosort = true, + infotext = false, + color = false, + locked = true, }) + -- Gitblit v1.8.0