Reduce dependencies of technic_chests

technic_chests was depending on the technic mod, for the top-level
"technic" table and the technic.swap_node function.  Resolve that by
sharing the top-level table and inlining the one use of the function.
It was also depending on technic_worldgen, for the definitions of
cast iron and wrought iron.  Make the use of cast iron conditional on
technic_worldgen, falling back to default "steel".  Change the use of
wrought iron to directly use default "steel", to which it is aliased
anyway.
This commit is contained in:
Zefram 2014-07-26 19:33:48 +01:00
parent 9f0b41fe71
commit d60e3fe939
8 changed files with 21 additions and 15 deletions

View File

@ -19,7 +19,7 @@ minetest.register_craft({
minetest.register_craft({ minetest.register_craft({
output = 'technic:copper_locked_chest 1', output = 'technic:copper_locked_chest 1',
recipe = { recipe = {
{'technic:wrought_iron_ingot'}, {'default:steel_ingot'},
{'technic:copper_chest'}, {'technic:copper_chest'},
} }
}) })

View File

@ -1,6 +1,3 @@
default default
technic
technic_worldgen
pipeworks pipeworks
intllib? intllib?

View File

@ -20,7 +20,7 @@ minetest.register_craft({
minetest.register_craft({ minetest.register_craft({
output = 'technic:gold_locked_chest', output = 'technic:gold_locked_chest',
recipe = { recipe = {
{'technic:wrought_iron_ingot'}, {'default:steel_ingot'},
{'technic:gold_chest'}, {'technic:gold_chest'},
} }
}) })

View File

@ -4,6 +4,7 @@
modpath = minetest.get_modpath("technic_chests") modpath = minetest.get_modpath("technic_chests")
technic = technic or {}
technic.chests = {} technic.chests = {}
dofile(modpath.."/common.lua") dofile(modpath.."/common.lua")

View File

@ -1,26 +1,32 @@
local cast_iron_ingot
if minetest.get_modpath("technic_worldgen") then
cast_iron_ingot = "technic:cast_iron_ingot"
else
cast_iron_ingot = "default:steel_ingot"
end
minetest.register_craft({ minetest.register_craft({
output = 'technic:iron_chest 1', output = 'technic:iron_chest 1',
recipe = { recipe = {
{'technic:cast_iron_ingot','technic:cast_iron_ingot','technic:cast_iron_ingot'}, {cast_iron_ingot,cast_iron_ingot,cast_iron_ingot},
{'technic:cast_iron_ingot','default:chest','technic:cast_iron_ingot'}, {cast_iron_ingot,'default:chest',cast_iron_ingot},
{'technic:cast_iron_ingot','technic:cast_iron_ingot','technic:cast_iron_ingot'}, {cast_iron_ingot,cast_iron_ingot,cast_iron_ingot},
} }
}) })
minetest.register_craft({ minetest.register_craft({
output = 'technic:iron_locked_chest 1', output = 'technic:iron_locked_chest 1',
recipe = { recipe = {
{'technic:cast_iron_ingot','technic:cast_iron_ingot','technic:cast_iron_ingot'}, {cast_iron_ingot,cast_iron_ingot,cast_iron_ingot},
{'technic:cast_iron_ingot','default:chest_locked','technic:cast_iron_ingot'}, {cast_iron_ingot,'default:chest_locked',cast_iron_ingot},
{'technic:cast_iron_ingot','technic:cast_iron_ingot','technic:cast_iron_ingot'}, {cast_iron_ingot,cast_iron_ingot,cast_iron_ingot},
} }
}) })
minetest.register_craft({ minetest.register_craft({
output = 'technic:iron_locked_chest 1', output = 'technic:iron_locked_chest 1',
recipe = { recipe = {
{'technic:wrought_iron_ingot'}, {'default:steel_ingot'},
{'technic:iron_chest'}, {'technic:iron_chest'},
} }
}) })

View File

@ -19,7 +19,7 @@ minetest.register_craft({
minetest.register_craft({ minetest.register_craft({
output = 'technic:mithril_locked_chest 1', output = 'technic:mithril_locked_chest 1',
recipe = { recipe = {
{'technic:wrought_iron_ingot'}, {'default:steel_ingot'},
{'technic:mithril_chest'}, {'technic:mithril_chest'},
} }
}) })

View File

@ -49,7 +49,9 @@ end
local function check_color_buttons(pos, meta, chest_name, fields) local function check_color_buttons(pos, meta, chest_name, fields)
for i = 1, 16 do for i = 1, 16 do
if fields["color_button"..i] then if fields["color_button"..i] then
technic.swap_node(pos, chest_name..colorid_to_postfix(i)) local node = minetest.get_node(pos)
node.name = chest_name..colorid_to_postfix(i)
minetest.swap_node(pos, node)
meta:set_string("color", i) meta:set_string("color", i)
return return
end end

View File

@ -19,7 +19,7 @@ minetest.register_craft({
minetest.register_craft({ minetest.register_craft({
output = 'technic:silver_locked_chest', output = 'technic:silver_locked_chest',
recipe = { recipe = {
{'technic:wrought_iron_ingot'}, {'default:steel_ingot'},
{'technic:silver_chest'}, {'technic:silver_chest'},
} }
}) })