From befe3ecc86f046310ec0a5c24f82acea2ad13d9d Mon Sep 17 00:00:00 2001
From: Vanessa Dannenberg <vanessa.e.dannenberg@gmail.com>
Date: Wed, 27 May 2020 18:32:57 +0200
Subject: [PATCH] Fix incorrect numeric types for 5.3.0-dev
---
technic_chests/gold_chest.lua | 506 +++++--------------------------------------------------
1 files changed, 49 insertions(+), 457 deletions(-)
diff --git a/technic_chests/gold_chest.lua b/technic_chests/gold_chest.lua
index fa275fa..24cbb5c 100644
--- a/technic_chests/gold_chest.lua
+++ b/technic_chests/gold_chest.lua
@@ -1,466 +1,58 @@
-local chest_mark_colors = {
- '_black',
- '_blue',
- '_brown',
- '_cyan',
- '_dark_green',
- '_dark_grey',
- '_green',
- '_grey',
- '_magenta',
- '_orange',
- '_pink',
- '_red',
- '_violet',
- '_white',
- '_yellow',
-}
-minetest.register_craft({
- output = 'technic:gold_chest 1',
- recipe = {
- {'moreores:gold_ingot','moreores:gold_ingot','moreores:gold_ingot'},
- {'moreores:gold_ingot','technic:silver_chest','moreores:gold_ingot'},
- {'moreores:gold_ingot','moreores:gold_ingot','moreores:gold_ingot'},
- }
-})
-
-minetest.register_craft({
- output = 'technic:gold_locked_chest 1',
- recipe = {
- {'moreores:gold_ingot','moreores:gold_ingot','moreores:gold_ingot'},
- {'moreores:gold_ingot','technic:silver_locked_chest','moreores:gold_ingot'},
- {'moreores:gold_ingot','moreores:gold_ingot','moreores:gold_ingot'},
- }
-})
-
-minetest.register_craft({
- output = 'technic:gold_locked_chest 1',
- recipe = {
- {'default:steel_ingot'},
- {'technic:gold_chest'},
- }
-})
-
-minetest.register_craftitem(":technic:gold_chest", {
- description = "Gold Chest",
- stack_max = 99,
-})
-minetest.register_craftitem(":technic:gold_locked_chest", {
- description = "Gold Locked Chest",
- stack_max = 99,
-})
-
-gold_chest_formspec = "invsize[12,9;]"..
- "list[current_name;main;0,0;12,4;]"..
- "list[current_player;main;0,5;8,4;]"
-
-gold_chest_inv_size = 12*4
-
-minetest.register_node(":technic:gold_chest", {
- description = "Gold Chest",
- tiles = {"technic_gold_chest_top.png", "technic_gold_chest_top.png", "technic_gold_chest_side.png",
- "technic_gold_chest_side.png", "technic_gold_chest_side.png", "technic_gold_chest_front.png"},
- paramtype2 = "facedir",
- groups = chest_groups1,
- tube = tubes_properties,
- 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",gold_chest_formspec)
- meta:set_string("infotext", "Gold Chest")
- local inv = meta:get_inventory()
- inv:set_size("main", gold_chest_inv_size)
- end,
-
- can_dig = chest_can_dig,
-
- on_punch = function (pos, node, puncher)
- chest_punched (pos,node,puncher);
- end,
-
- on_receive_fields = function(pos, formname, fields, sender)
- local meta = minetest.env:get_meta(pos);
- fields.text = fields.text or ""
- meta:set_string("text", fields.text)
- meta:set_string("infotext", '"'..fields.text..'"')
- meta:set_string("formspec",gold_chest_formspec)
- end,
-
- on_metadata_inventory_move = def_on_metadata_inventory_move,
- on_metadata_inventory_put = def_on_metadata_inventory_put,
- on_metadata_inventory_take = def_on_metadata_inventory_take
-})
-
-for i, state in ipairs(chest_mark_colors) do
-minetest.register_node(":technic:gold_chest".. state, {
- description = "Gold Chest",
- tiles = {"technic_gold_chest_top.png", "technic_gold_chest_top.png", "technic_gold_chest_side.png",
- "technic_gold_chest_side.png", "technic_gold_chest_side.png", "technic_gold_chest_front"..state..".png"},
- paramtype2 = "facedir",
- groups = chest_groups2,
- tube = tubes_properties,
- legacy_facedir_simple = true,
- sounds = default.node_sound_wood_defaults(),
- drop = "technic:gold_chest",
- on_construct = function(pos)
- local meta = minetest.env:get_meta(pos)
- meta:set_string("formspec",gold_chest_formspec)
- meta:set_string("infotext", "Gold Chest")
- local inv = meta:get_inventory()
- inv:set_size("main", gold_chest_inv_size)
- end,
-
- can_dig =chest_can_dig,
-
- on_punch = function (pos, node, puncher)
- chest_punched (pos,node,puncher);
- end,
-
- on_receive_fields = function(pos, formname, fields, sender)
- local meta = minetest.env:get_meta(pos);
- fields.text = fields.text or ""
- meta:set_string("text", fields.text)
- meta:set_string("infotext", '"'..fields.text..'"')
- meta:set_string("formspec",gold_chest_formspec)
- end,
-
- on_metadata_inventory_move = def_on_metadata_inventory_move,
- on_metadata_inventory_put = def_on_metadata_inventory_put,
- on_metadata_inventory_take = def_on_metadata_inventory_take
-})
+local material_list
+if minetest.get_modpath("moreores") then
+ material_list = { 'silver' }
+else
+ -- Make the gold chest obtainable for mere mortals (the silver chest is not obtainable)
+ material_list = { 'copper', 'silver' }
end
-minetest.register_node(":technic:gold_locked_chest", {
- description = "Gold Locked Chest",
- tiles = {"technic_gold_chest_top.png", "technic_gold_chest_top.png", "technic_gold_chest_side.png",
- "technic_gold_chest_side.png", "technic_gold_chest_side.png", "technic_gold_chest_locked.png"},
- paramtype2 = "facedir",
- drop = "technic:gold_locked_chest",
- groups = chest_groups1,
- tube = tubes_properties,
- 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", "Gold Locked Chest (owned by "..
- meta:get_string("owner")..")")
- end,
- on_construct = function(pos)
- local meta = minetest.env:get_meta(pos)
- meta:set_string("formspec",gold_chest_formspec)
- meta:set_string("infotext", "Gold Locked Chest")
- meta:set_string("owner", "")
- local inv = meta:get_inventory()
- inv:set_size("main", gold_chest_inv_size)
- end,
+for _, material in ipairs(material_list) do
+ minetest.register_craft({
+ output = 'technic:gold_chest',
+ recipe = {
+ {'default:gold_ingot','default:gold_ingot','default:gold_ingot'},
+ {'default:gold_ingot',"technic:"..material.."_chest",'default:gold_ingot'},
+ {'default:gold_ingot','default:gold_ingot','default:gold_ingot'},
+ }
+ })
- can_dig =chest_can_dig,
-
- on_punch = function (pos, node, puncher)
- local meta = minetest.env:get_meta(pos);
- if (has_locked_chest_privilege(meta, puncher)) then
- locked_chest_punched (pos,node,puncher);
- end
- end,
-
- on_receive_fields = function(pos, formname, fields, sender)
- local meta = minetest.env:get_meta(pos);
- fields.text = fields.text or ""
- meta:set_string("text", fields.text)
- meta:set_string("infotext", '"'..fields.text..'"')
- meta:set_string("formspec",gold_chest_formspec)
- end,
-
- allow_metadata_inventory_move = def_allow_metadata_inventory_move,
- allow_metadata_inventory_put = def_allow_metadata_inventory_put,
- allow_metadata_inventory_take = def_allow_metadata_inventory_take,
- on_metadata_inventory_move = def_on_metadata_inventory_move,
- on_metadata_inventory_put = def_on_metadata_inventory_put,
- on_metadata_inventory_take = def_on_metadata_inventory_take
-})
-
-for i, state in ipairs(chest_mark_colors) do
-minetest.register_node(":technic:gold_locked_chest".. state, {
- description = "Gold Locked Chest",
- tiles = {"technic_gold_chest_top.png", "technic_gold_chest_top.png", "technic_gold_chest_side.png",
- "technic_gold_chest_side.png", "technic_gold_chest_side.png", "technic_gold_chest_locked"..state..".png"},
- paramtype2 = "facedir",
- drop = "technic:gold_locked_chest",
- groups = chest_groups2,
- tube = tubes_properties,
- 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", "Gold Locked Chest (owned by "..
- meta:get_string("owner")..")")
- end,
- on_construct = function(pos)
- local meta = minetest.env:get_meta(pos)
- meta:set_string("formspec",gold_chest_formspec)
- meta:set_string("infotext", "Gold Locked Chest")
- meta:set_string("owner", "")
- local inv = meta:get_inventory()
- inv:set_size("main", gold_chest_inv_size)
- end,
-
- can_dig = chest_can_dig,
-
- on_punch = function (pos, node, puncher)
- local meta = minetest.env:get_meta(pos);
- if (has_locked_chest_privilege(meta, puncher)) then
- locked_chest_punched (pos,node,puncher);
- end
- end,
-
- on_receive_fields = function(pos, formname, fields, sender)
- local meta = minetest.env:get_meta(pos);
- fields.text = fields.text or ""
- meta:set_string("text", fields.text)
- meta:set_string("infotext", '"'..fields.text..'"')
- meta:set_string("formspec",gold_chest_formspec)
- end,
-
- allow_metadata_inventory_move = def_allow_metadata_inventory_move,
- allow_metadata_inventory_put = def_allow_metadata_inventory_put,
- allow_metadata_inventory_take = def_allow_metadata_inventory_take,
- on_metadata_inventory_move = def_on_metadata_inventory_move,
- on_metadata_inventory_put = def_on_metadata_inventory_put,
- on_metadata_inventory_take = def_on_metadata_inventory_take
-})
+ minetest.register_craft({
+ output = 'technic:gold_locked_chest',
+ recipe = {
+ {'default:gold_ingot','default:gold_ingot','default:gold_ingot'},
+ {'default:gold_ingot',"technic:"..material.."_locked_chest",'default:gold_ingot'},
+ {'default:gold_ingot','default:gold_ingot','default:gold_ingot'},
+ }
+ })
end
-function chest_punched (pos,node,puncher)
-
- local player_tool = puncher:get_wielded_item();
- local item=player_tool:get_name();
- if item == "dye:black" then
- if (hacky_swap_node(pos,"technic:gold_chest_black")) then
- player_tool:take_item(1);
- puncher:set_wielded_item(player_tool);
- return
- end
- end
- if item == "dye:blue" then
- if (hacky_swap_node(pos,"technic:gold_chest_blue")) then
- player_tool:take_item(1);
- puncher:set_wielded_item(player_tool);
- return
- end
- end
- if item == "dye:brown" then
- if (hacky_swap_node(pos,"technic:gold_chest_brown")) then
- player_tool:take_item(1);
- puncher:set_wielded_item(player_tool);
- return
- end
- end
- if item == "dye:cyan" then
- if (hacky_swap_node(pos,"technic:gold_chest_cyan")) then
- player_tool:take_item(1);
- puncher:set_wielded_item(player_tool);
- return
- end
- end
- if item == "dye:dark_green" then
- if (hacky_swap_node(pos,"technic:gold_chest_dark_green")) then
- player_tool:take_item(1);
- puncher:set_wielded_item(player_tool);
- return
- end
- end
- if item == "dye:dark_grey" then
- if (hacky_swap_node(pos,"technic:gold_chest_dark_grey")) then
- player_tool:take_item(1);
- puncher:set_wielded_item(player_tool);
- return
- end
- end
- if item == "dye:green" then
- if (hacky_swap_node(pos,"technic:gold_chest_green")) then
- player_tool:take_item(1);
- puncher:set_wielded_item(player_tool);
- return
- end
- end
- if item == "dye:grey" then
- if (hacky_swap_node(pos,"technic:gold_chest_grey")) then
- player_tool:take_item(1);
- puncher:set_wielded_item(player_tool);
- return
- end
- end
- if item == "dye:magenta" then
- if (hacky_swap_node(pos,"technic:gold_chest_magenta")) then
- player_tool:take_item(1);
- puncher:set_wielded_item(player_tool);
- return
- end
- end
- if item == "dye:orange" then
- if (hacky_swap_node(pos,"technic:gold_chest_orange")) then
- player_tool:take_item(1);
- puncher:set_wielded_item(player_tool);
- return
- end
- end
- if item == "dye:pink" then
- if (hacky_swap_node(pos,"technic:gold_chest_pink")) then
- player_tool:take_item(1);
- puncher:set_wielded_item(player_tool);
- return
- end
- end
- if item == "dye:red" then
- if (hacky_swap_node(pos,"technic:gold_chest_red")) then
- player_tool:take_item(1);
- puncher:set_wielded_item(player_tool);
- return
- end
- end
- if item == "dye:violet" then
- if (hacky_swap_node(pos,"technic:gold_chest_violet")) then
- player_tool:take_item(1);
- puncher:set_wielded_item(player_tool);
- return
- end
- end
- if item == "dye:white" then
- if (hacky_swap_node(pos,"technic:gold_chest_white")) then
- player_tool:take_item(1);
- puncher:set_wielded_item(player_tool);
- return
- end
- end
- if item == "dye:yellow" then
- if (hacky_swap_node(pos,"technic:gold_chest_yellow")) then
- player_tool:take_item(1);
- puncher:set_wielded_item(player_tool);
- return
- end
- end
+minetest.register_craft({
+ output = 'technic:gold_locked_chest',
+ type = "shapeless",
+ recipe = {
+ 'basic_materials:padlock',
+ 'technic:gold_chest',
+ }
+})
- local meta = minetest.env:get_meta(pos);
- meta:set_string("formspec", "hack:sign_text_input")
- end
+technic.chests:register("Gold", {
+ width = 15,
+ height = 6,
+ sort = true,
+ autosort = true,
+ infotext = true,
+ color = true,
+ locked = false,
+})
+technic.chests:register("Gold", {
+ width = 15,
+ height = 6,
+ sort = true,
+ autosort = true,
+ infotext = true,
+ color = true,
+ locked = true,
+})
-function locked_chest_punched (pos,node,puncher)
-
- local player_tool = puncher:get_wielded_item();
- local item=player_tool:get_name();
- if item == "dye:black" then
- if (hacky_swap_node(pos,"technic:gold_locked_chest_black")) then
- player_tool:take_item(1);
- puncher:set_wielded_item(player_tool);
- return
- end
- end
- if item == "dye:blue" then
- if (hacky_swap_node(pos,"technic:gold_locked_chest_blue")) then
- player_tool:take_item(1);
- puncher:set_wielded_item(player_tool);
- return
- end
- end
- if item == "dye:brown" then
- if (hacky_swap_node(pos,"technic:gold_locked_chest_brown")) then
- player_tool:take_item(1);
- puncher:set_wielded_item(player_tool);
- return
- end
- end
- if item == "dye:cyan" then
- if (hacky_swap_node(pos,"technic:gold_locked_chest_cyan")) then
- player_tool:take_item(1);
- puncher:set_wielded_item(player_tool);
- return
- end
- end
- if item == "dye:dark_green" then
- if (hacky_swap_node(pos,"technic:gold_locked_chest_dark_green")) then
- player_tool:take_item(1);
- puncher:set_wielded_item(player_tool);
- return
- end
- end
- if item == "dye:dark_grey" then
- if (hacky_swap_node(pos,"technic:gold_locked_chest_dark_grey")) then
- player_tool:take_item(1);
- puncher:set_wielded_item(player_tool);
- return
- end
- end
- if item == "dye:green" then
- if (hacky_swap_node(pos,"technic:gold_locked_chest_green")) then
- player_tool:take_item(1);
- puncher:set_wielded_item(player_tool);
- return
- end
- end
- if item == "dye:grey" then
- if (hacky_swap_node(pos,"technic:gold_locked_chest_grey")) then
- player_tool:take_item(1);
- puncher:set_wielded_item(player_tool);
- return
- end
- end
- if item == "dye:magenta" then
- if (hacky_swap_node(pos,"technic:gold_locked_chest_magenta")) then
- player_tool:take_item(1);
- puncher:set_wielded_item(player_tool);
- return
- end
- end
- if item == "dye:orange" then
- if (hacky_swap_node(pos,"technic:gold_locked_chest_orange")) then
- player_tool:take_item(1);
- puncher:set_wielded_item(player_tool);
- return
- end
- end
- if item == "dye:pink" then
- if (hacky_swap_node(pos,"technic:gold_locked_chest_pink")) then
- player_tool:take_item(1);
- puncher:set_wielded_item(player_tool);
- return
- end
- end
- if item == "dye:red" then
- if (hacky_swap_node(pos,"technic:gold_locked_chest_red")) then
- player_tool:take_item(1);
- puncher:set_wielded_item(player_tool);
- return
- end
- end
- if item == "dye:violet" then
- if (hacky_swap_node(pos,"technic:gold_locked_chest_violet")) then
- player_tool:take_item(1);
- puncher:set_wielded_item(player_tool);
- return
- end
- end
- if item == "dye:white" then
- if (hacky_swap_node(pos,"technic:gold_locked_chest_white")) then
- player_tool:take_item(1);
- puncher:set_wielded_item(player_tool);
- return
- end
- end
- if item == "dye:yellow" then
- if (hacky_swap_node(pos,"technic:gold_locked_chest_yellow")) then
- player_tool:take_item(1);
- puncher:set_wielded_item(player_tool);
- return
- end
- end
-
- local meta = minetest.env:get_meta(pos);
- meta:set_string("formspec", "hack:sign_text_input")
- end
-
--
Gitblit v1.8.0