diff options
44 files changed, 139 insertions, 153 deletions
diff --git a/concrete/depends.txt b/concrete/depends.txt index c48fe0d..269e83a 100644 --- a/concrete/depends.txt +++ b/concrete/depends.txt @@ -1,3 +1,4 @@ default +basic_materials intllib? diff --git a/concrete/init.lua b/concrete/init.lua index ca04733..1da6a51 100644 --- a/concrete/init.lua +++ b/concrete/init.lua @@ -24,24 +24,6 @@ else end minetest.register_craft({ - output = 'technic:rebar 6', - recipe = { - {'','', steel_ingot}, - {'',steel_ingot,''}, - {steel_ingot, '', ''}, - } -}) - -minetest.register_craft({ - output = 'technic:concrete 5', - recipe = { - {'default:stone','technic:rebar','default:stone'}, - {'technic:rebar','default:stone','technic:rebar'}, - {'default:stone','technic:rebar','default:stone'}, - } -}) - -minetest.register_craft({ output = 'technic:concrete_post_platform 6', recipe = { {'technic:concrete','technic:concrete_post','technic:concrete'}, @@ -51,9 +33,9 @@ minetest.register_craft({ minetest.register_craft({ output = 'technic:concrete_post 12', recipe = { - {'default:stone','technic:rebar','default:stone'}, - {'default:stone','technic:rebar','default:stone'}, - {'default:stone','technic:rebar','default:stone'}, + {'default:stone','basic_materials:steel_bar','default:stone'}, + {'default:stone','basic_materials:steel_bar','default:stone'}, + {'default:stone','basic_materials:steel_bar','default:stone'}, } }) @@ -66,18 +48,6 @@ minetest.register_craft({ } }) -minetest.register_craftitem(":technic:rebar", { - description = S("Rebar"), - inventory_image = "technic_rebar.png", -}) - -minetest.register_node(":technic:concrete", { - description = S("Concrete Block"), - tiles = {"technic_concrete_block.png",}, - groups = {cracky=1, level=2, concrete=1}, - sounds = default.node_sound_stone_defaults(), -}) - minetest.register_node(":technic:blast_resistant_concrete", { description = S("Blast-resistant Concrete Block"), tiles = {"technic_blast_resistant_concrete_block.png",}, @@ -101,7 +71,7 @@ local box_right = {0, -0.3, -0.1, 0.5, 0.3, 0.1} minetest.register_node(":technic:concrete_post_platform", { description = S("Concrete Post Platform"), - tiles = {"technic_concrete_block.png",}, + tiles = {"basic_materials_concrete_block.png",}, groups={cracky=1, level=2}, sounds = default.node_sound_stone_defaults(), paramtype = "light", @@ -133,7 +103,7 @@ for platform = 0, 1 do minetest.register_node(":technic:concrete_post"..(platform == 1 and "_with_platform" or ""), { description = S("Concrete Post"), - tiles = {"technic_concrete_block.png"}, + tiles = {"basic_materials_concrete_block.png"}, groups = {cracky=1, level=2, concrete_post=1, not_in_creative_inventory=platform}, sounds = default.node_sound_stone_defaults(), drop = (platform == 1 and "technic:concrete_post_platform" or diff --git a/concrete/textures/technic_concrete_block.png b/concrete/textures/technic_concrete_block.png Binary files differdeleted file mode 100644 index cd94594..0000000 --- a/concrete/textures/technic_concrete_block.png +++ /dev/null diff --git a/concrete/textures/technic_rebar.png b/concrete/textures/technic_rebar.png Binary files differdeleted file mode 100644 index 16d1fc5..0000000 --- a/concrete/textures/technic_rebar.png +++ /dev/null diff --git a/extranodes/depends.txt b/extranodes/depends.txt index 4dcb99e..0279a18 100644 --- a/extranodes/depends.txt +++ b/extranodes/depends.txt @@ -1,5 +1,6 @@ default technic_worldgen +basic_materials concrete unifieddyes? intllib? diff --git a/extranodes/init.lua b/extranodes/init.lua index 1f65c29..5d8b260 100644 --- a/extranodes/init.lua +++ b/extranodes/init.lua @@ -30,7 +30,7 @@ if minetest.get_modpath("moreblocks") then stairsplus:register_all("technic", "concrete", "technic:concrete", { description=S("Concrete"), groups={cracky=3, not_in_creative_inventory=1}, - tiles={"technic_concrete_block.png"}, + tiles={"basic_materials_concrete_block.png"}, }) stairsplus:register_all("technic", "zinc_block", "technic:zinc_block", { @@ -57,10 +57,10 @@ if minetest.get_modpath("moreblocks") then tiles={"technic_stainless_steel_block.png"}, }) - stairsplus:register_all("technic", "brass_block", "technic:brass_block", { + stairsplus:register_all("technic", "brass_block", "basic_materials:brass_block", { description=S("Brass Block"), groups={cracky=1, not_in_creative_inventory=1}, - tiles={"technic_brass_block.png"}, + tiles={"basic_materials_brass_block.png"}, }) function register_technic_stairs_alias(modname, origname, newmod, newname) diff --git a/technic/crafts.lua b/technic/crafts.lua index 5d3ae04..90bd2dd 100644 --- a/technic/crafts.lua +++ b/technic/crafts.lua @@ -38,6 +38,12 @@ if pipeworks.enable_teleport_tube then }) end +-- basic materials' brass ingot + +minetest.clear_craft({ + output = "basic_materials:brass_ingot", +}) + -- tubes crafting recipes minetest.register_craft({ @@ -71,54 +77,24 @@ minetest.register_craft({ output = 'technic:red_energy_crystal', recipe = { {'moreores:silver_ingot', 'technic:battery', 'dye:red'}, - {'technic:battery', 'default:diamondblock', 'technic:battery'}, + {'technic:battery', 'basic_materials:energy_crystal_simple', 'technic:battery'}, {'dye:red', 'technic:battery', 'moreores:silver_ingot'}, } }) minetest.register_craft({ - output = 'technic:fine_copper_wire 2', - recipe = { - {'', 'default:copper_ingot', ''}, - {'', 'default:copper_ingot', ''}, - {'', 'default:copper_ingot', ''}, - } -}) - -minetest.register_craft({ - output = 'technic:fine_gold_wire 2', - recipe = { - {'', 'default:gold_ingot', ''}, - {'', 'default:gold_ingot', ''}, - {'', 'default:gold_ingot', ''}, - } -}) - -minetest.register_craft({ - output = 'technic:fine_silver_wire 2', - recipe = { - {'', 'moreores:silver_ingot', ''}, - {'', 'moreores:silver_ingot', ''}, - {'', 'moreores:silver_ingot', ''}, - } -}) - -minetest.register_craft({ output = 'technic:copper_coil 1', recipe = { - {'technic:fine_copper_wire', 'technic:wrought_iron_ingot', 'technic:fine_copper_wire'}, + {'basic_materials:copper_wire', 'technic:wrought_iron_ingot', 'basic_materials:copper_wire'}, {'technic:wrought_iron_ingot', '', 'technic:wrought_iron_ingot'}, - {'technic:fine_copper_wire', 'technic:wrought_iron_ingot', 'technic:fine_copper_wire'}, - } -}) - -minetest.register_craft({ - output = 'technic:motor', - recipe = { - {'technic:carbon_steel_ingot', 'technic:copper_coil', 'technic:carbon_steel_ingot'}, - {'technic:carbon_steel_ingot', 'technic:copper_coil', 'technic:carbon_steel_ingot'}, - {'technic:carbon_steel_ingot', 'default:copper_ingot', 'technic:carbon_steel_ingot'}, - } + {'basic_materials:copper_wire', 'technic:wrought_iron_ingot', 'basic_materials:copper_wire'}, + }, + replacements = { + {"basic_materials:copper_wire", "basic_materials:empty_spool"}, + {"basic_materials:copper_wire", "basic_materials:empty_spool"}, + {"basic_materials:copper_wire", "basic_materials:empty_spool"}, + {"basic_materials:copper_wire", "basic_materials:empty_spool"} + }, }) local isolation = mesecons_materials and "mesecons_materials:fiber" or "technic:rubber" @@ -153,10 +129,11 @@ minetest.register_craft({ minetest.register_craft({ output = 'technic:control_logic_unit', recipe = { - {'', 'technic:fine_gold_wire', ''}, + {'', 'basic_materials:gold_wire', ''}, {'default:copper_ingot', 'technic:silicon_wafer', 'default:copper_ingot'}, {'', 'technic:chromium_ingot', ''}, - } + }, + replacements = { {"basic_materials:gold_wire", "basic_materials:empty_spool"}, }, }) minetest.register_craft({ @@ -179,7 +156,7 @@ minetest.register_craft({ output = "technic:machine_casing", recipe = { { "technic:cast_iron_ingot", "technic:cast_iron_ingot", "technic:cast_iron_ingot" }, - { "technic:cast_iron_ingot", "technic:brass_ingot", "technic:cast_iron_ingot" }, + { "technic:cast_iron_ingot", "basic_materials:brass_ingot", "technic:cast_iron_ingot" }, { "technic:cast_iron_ingot", "technic:cast_iron_ingot", "technic:cast_iron_ingot" }, }, }) diff --git a/technic/depends.txt b/technic/depends.txt index 6b28f9f..1b76ab3 100644 --- a/technic/depends.txt +++ b/technic/depends.txt @@ -1,6 +1,7 @@ default pipeworks technic_worldgen +basic_materials bucket? screwdriver? mesecons? diff --git a/technic/items.lua b/technic/items.lua index a0edb96..d89ed46 100644 --- a/technic/items.lua +++ b/technic/items.lua @@ -69,32 +69,11 @@ minetest.register_tool("technic:red_energy_crystal", { } }) - -minetest.register_craftitem("technic:fine_copper_wire", { - description = S("Fine Copper Wire"), - inventory_image = "technic_fine_copper_wire.png", -}) - -minetest.register_craftitem("technic:fine_gold_wire", { - description = S("Fine Gold Wire"), - inventory_image = "technic_fine_gold_wire.png", -}) - -minetest.register_craftitem("technic:fine_silver_wire", { - description = S("Fine Silver Wire"), - inventory_image = "technic_fine_silver_wire.png", -}) - minetest.register_craftitem("technic:copper_coil", { description = S("Copper Coil"), inventory_image = "technic_copper_coil.png", }) -minetest.register_craftitem("technic:motor", { - description = S("Electric Motor"), - inventory_image = "technic_motor.png", -}) - minetest.register_craftitem("technic:lv_transformer", { description = S("Low Voltage Transformer"), inventory_image = "technic_lv_transformer.png", diff --git a/technic/machines/HV/forcefield.lua b/technic/machines/HV/forcefield.lua index 157dc33..230c8b0 100644 --- a/technic/machines/HV/forcefield.lua +++ b/technic/machines/HV/forcefield.lua @@ -17,7 +17,7 @@ local cable_entry = "^technic_cable_connection_overlay.png" minetest.register_craft({ output = "technic:forcefield_emitter_off", recipe = { - {"default:mese", "technic:motor", "default:mese" }, + {"default:mese", "basic_materials:motor", "default:mese" }, {"technic:deployer_off", "technic:machine_casing", "technic:deployer_off"}, {"default:mese", "technic:hv_cable", "default:mese" }, } diff --git a/technic/machines/HV/quarry.lua b/technic/machines/HV/quarry.lua index 86ca395..b7cc501 100644 --- a/technic/machines/HV/quarry.lua +++ b/technic/machines/HV/quarry.lua @@ -7,7 +7,7 @@ local cable_entry = "^technic_cable_connection_overlay.png" minetest.register_craft({ recipe = { {"technic:carbon_plate", "pipeworks:filter", "technic:composite_plate"}, - {"technic:motor", "technic:machine_casing", "technic:diamond_drill_head"}, + {"basic_materials:motor", "technic:machine_casing", "technic:diamond_drill_head"}, {"technic:carbon_steel_block", "technic:hv_cable", "technic:carbon_steel_block"}}, output = "technic:quarry", }) diff --git a/technic/machines/LV/cnc.lua b/technic/machines/LV/cnc.lua index fdfec99..b8eb729 100644 --- a/technic/machines/LV/cnc.lua +++ b/technic/machines/LV/cnc.lua @@ -14,7 +14,7 @@ minetest.register_craft({ output = 'technic:cnc', recipe = { {'default:glass', 'technic:diamond_drill_head', 'default:glass'}, - {'technic:control_logic_unit', 'technic:machine_casing', 'technic:motor'}, + {'technic:control_logic_unit', 'technic:machine_casing', 'basic_materials:motor'}, {'technic:carbon_steel_ingot', 'technic:lv_cable', 'technic:carbon_steel_ingot'}, }, }) diff --git a/technic/machines/LV/compressor.lua b/technic/machines/LV/compressor.lua index 67b9f79..84eb4c5 100644 --- a/technic/machines/LV/compressor.lua +++ b/technic/machines/LV/compressor.lua @@ -4,10 +4,14 @@ minetest.register_alias("compressor", "technic:lv_compressor") minetest.register_craft({ output = 'technic:lv_compressor', recipe = { - {'default:stone', 'technic:motor', 'default:stone'}, + {'default:stone', 'basic_materials:motor', 'default:stone'}, {'mesecons:piston', 'technic:machine_casing', 'mesecons:piston'}, - {'technic:fine_silver_wire', 'technic:lv_cable', 'technic:fine_silver_wire'}, - } + {'basic_materials:silver_wire', 'technic:lv_cable', 'basic_materials:silver_wire'}, + }, + replacements = { + {"basic_materials:silver_wire", "basic_materials:empty_spool"}, + {"basic_materials:silver_wire", "basic_materials:empty_spool"} + }, }) technic.register_compressor({tier = "LV", demand = {300}, speed = 1}) diff --git a/technic/machines/LV/extractor.lua b/technic/machines/LV/extractor.lua index 55d0140..123ad05 100644 --- a/technic/machines/LV/extractor.lua +++ b/technic/machines/LV/extractor.lua @@ -4,7 +4,7 @@ minetest.register_alias("extractor", "technic:lv_extractor") minetest.register_craft({ output = 'technic:lv_extractor', recipe = { - {'technic:treetap', 'technic:motor', 'technic:treetap'}, + {'technic:treetap', 'basic_materials:motor', 'technic:treetap'}, {'technic:treetap', 'technic:machine_casing', 'technic:treetap'}, {'', 'technic:lv_cable', ''}, } diff --git a/technic/machines/LV/geothermal.lua b/technic/machines/LV/geothermal.lua index 27f4abc..d828f6d 100644 --- a/technic/machines/LV/geothermal.lua +++ b/technic/machines/LV/geothermal.lua @@ -11,9 +11,13 @@ minetest.register_craft({ output = 'technic:geothermal', recipe = { {'technic:granite', 'default:diamond', 'technic:granite'}, - {'technic:fine_copper_wire', 'technic:machine_casing', 'technic:fine_copper_wire'}, + {'basic_materials:copper_wire', 'technic:machine_casing', 'basic_materials:copper_wire'}, {'technic:granite', 'technic:lv_cable', 'technic:granite'}, - } + }, + replacements = { + {"basic_materials:copper_wire", "basic_materials:empty_spool"}, + {"basic_materials:copper_wire", "basic_materials:empty_spool"} + }, }) minetest.register_craftitem("technic:geothermal", { diff --git a/technic/machines/LV/solar_panel.lua b/technic/machines/LV/solar_panel.lua index c072b13..6143fa9 100644 --- a/technic/machines/LV/solar_panel.lua +++ b/technic/machines/LV/solar_panel.lua @@ -9,9 +9,9 @@ minetest.register_craft({ output = 'technic:solar_panel', recipe = { {'technic:doped_silicon_wafer', 'technic:doped_silicon_wafer', 'technic:doped_silicon_wafer'}, - {'technic:fine_silver_wire', 'technic:lv_cable', 'mesecons_materials:glue'}, - - } + {'basic_materials:silver_wire', 'technic:lv_cable', 'mesecons_materials:glue'}, + }, + replacements = { {"basic_materials:silver_wire", "basic_materials:empty_spool"}, }, }) diff --git a/technic/machines/MV/centrifuge.lua b/technic/machines/MV/centrifuge.lua index a0aad64..fdc086f 100644 --- a/technic/machines/MV/centrifuge.lua +++ b/technic/machines/MV/centrifuge.lua @@ -1,7 +1,7 @@ minetest.register_craft({ output = "technic:mv_centrifuge", recipe = { - {"technic:motor", "technic:copper_plate", "technic:diamond_drill_head"}, + {"basic_materials:motor", "technic:copper_plate", "technic:diamond_drill_head"}, {"technic:copper_plate", "technic:machine_casing", "technic:copper_plate" }, {"pipeworks:one_way_tube", "technic:mv_cable", "pipeworks:mese_filter" }, } diff --git a/technic/machines/MV/wind_mill.lua b/technic/machines/MV/wind_mill.lua index 9df12b9..1baf54c 100644 --- a/technic/machines/MV/wind_mill.lua +++ b/technic/machines/MV/wind_mill.lua @@ -13,7 +13,7 @@ minetest.register_craft({ minetest.register_craft({ output = 'technic:wind_mill', recipe = { - {'', 'technic:motor', ''}, + {'', 'basic_materials:motor', ''}, {'technic:carbon_steel_ingot', 'technic:carbon_steel_block', 'technic:carbon_steel_ingot'}, {'', 'technic:mv_cable', ''}, } diff --git a/technic/machines/other/frames.lua b/technic/machines/other/frames.lua index d5c60a3..f991ba7 100644 --- a/technic/machines/other/frames.lua +++ b/technic/machines/other/frames.lua @@ -979,7 +979,7 @@ minetest.register_craft({ output = 'technic:frame_111111', recipe = { { '', 'default:stick', '' }, - { 'default:stick', 'technic:brass_ingot', 'default:stick' }, + { 'default:stick', 'basic_materials:brass_ingot', 'default:stick' }, { '', 'default:stick', '' }, } }) @@ -988,7 +988,7 @@ minetest.register_craft({ output = 'technic:frame_motor', recipe = { { '', 'technic:frame_111111', '' }, - { 'group:mesecon_conductor_craftable', 'technic:motor', 'group:mesecon_conductor_craftable' }, + { 'group:mesecon_conductor_craftable', 'basic_materials:motor', 'group:mesecon_conductor_craftable' }, { '', 'technic:frame_111111', '' }, } }) @@ -996,9 +996,9 @@ minetest.register_craft({ minetest.register_craft({ output = 'technic:template 10', recipe = { - { '', 'technic:brass_ingot', '' }, - { 'technic:brass_ingot', 'default:mese_crystal', 'technic:brass_ingot' }, - { '', 'technic:brass_ingot', '' }, + { '', 'basic_materials:brass_ingot', '' }, + { 'basic_materials:brass_ingot', 'default:mese_crystal', 'basic_materials:brass_ingot' }, + { '', 'basic_materials:brass_ingot', '' }, } }) @@ -1016,7 +1016,7 @@ minetest.register_craft({ output = 'technic:template_motor', recipe = { { '', 'technic:template', '' }, - { 'group:mesecon_conductor_craftable', 'technic:motor', 'group:mesecon_conductor_craftable' }, + { 'group:mesecon_conductor_craftable', 'basic_materials:motor', 'group:mesecon_conductor_craftable' }, { '', 'technic:template', '' }, } }) diff --git a/technic/machines/register/alloy_recipes.lua b/technic/machines/register/alloy_recipes.lua index 3aeacd5..8731b8e 100644 --- a/technic/machines/register/alloy_recipes.lua +++ b/technic/machines/register/alloy_recipes.lua @@ -21,7 +21,7 @@ local recipes = { {"technic:carbon_steel_dust 3", "technic:chromium_dust", "technic:stainless_steel_dust 4"}, {"technic:carbon_steel_ingot 3", "technic:chromium_ingot", "technic:stainless_steel_ingot 4"}, {"technic:copper_dust 2", "technic:zinc_dust", "technic:brass_dust 3"}, - {"default:copper_ingot 2", "technic:zinc_ingot", "technic:brass_ingot 3"}, + {"default:copper_ingot 2", "technic:zinc_ingot", "basic_materials:brass_ingot 3"}, {"default:sand 2", "technic:coal_dust 2", "technic:silicon_wafer"}, {"technic:silicon_wafer", "technic:gold_dust", "technic:doped_silicon_wafer"}, -- from https://en.wikipedia.org/wiki/Carbon_black diff --git a/technic/machines/register/grinder_recipes.lua b/technic/machines/register/grinder_recipes.lua index 8c8e178..da90aad 100644 --- a/technic/machines/register/grinder_recipes.lua +++ b/technic/machines/register/grinder_recipes.lua @@ -93,7 +93,7 @@ local function register_dust(name, ingot) end -- Sorted alphibeticaly -register_dust("Brass", "technic:brass_ingot") +register_dust("Brass", "basic_materials:brass_ingot") register_dust("Bronze", "default:bronze_ingot") register_dust("Carbon Steel", "technic:carbon_steel_ingot") register_dust("Cast Iron", "technic:cast_iron_ingot") diff --git a/technic/machines/supply_converter.lua b/technic/machines/supply_converter.lua index 9202c4a..24601c6 100644 --- a/technic/machines/supply_converter.lua +++ b/technic/machines/supply_converter.lua @@ -201,10 +201,11 @@ minetest.register_node("technic:supply_converter", { minetest.register_craft({ output = 'technic:supply_converter 1', recipe = { - {'technic:fine_gold_wire', 'technic:rubber', 'technic:doped_silicon_wafer'}, + {'basic_materials:gold_wire', 'technic:rubber', 'technic:doped_silicon_wafer'}, {'technic:mv_transformer', 'technic:machine_casing', 'technic:lv_transformer'}, {'technic:mv_cable', 'technic:rubber', 'technic:lv_cable'}, - } + }, + replacements = { {"basic_materials:gold_wire", "basic_materials:empty_spool"}, }, }) for tier, machines in pairs(technic.machines) do diff --git a/technic/radiation.lua b/technic/radiation.lua index a4c49c6..6e518d8 100644 --- a/technic/radiation.lua +++ b/technic/radiation.lua @@ -146,7 +146,7 @@ local rad_resistance_node = { ["moreores:mithril_block"] = 26, ["moreores:silver_block"] = 53, ["snow:snow_brick"] = 2.8, - ["technic:brass_block"] = 43, + ["basic_materials:brass_block"] = 43, ["technic:carbon_steel_block"] = 40, ["technic:cast_iron_block"] = 40, ["technic:chernobylite_block"] = 40, diff --git a/technic/textures/technic_fine_copper_wire.png b/technic/textures/technic_fine_copper_wire.png Binary files differdeleted file mode 100644 index 3e663bb..0000000 --- a/technic/textures/technic_fine_copper_wire.png +++ /dev/null diff --git a/technic/textures/technic_fine_gold_wire.png b/technic/textures/technic_fine_gold_wire.png Binary files differdeleted file mode 100644 index 54a7a52..0000000 --- a/technic/textures/technic_fine_gold_wire.png +++ /dev/null diff --git a/technic/textures/technic_fine_silver_wire.png b/technic/textures/technic_fine_silver_wire.png Binary files differdeleted file mode 100644 index f40a52b..0000000 --- a/technic/textures/technic_fine_silver_wire.png +++ /dev/null diff --git a/technic/textures/technic_motor.png b/technic/textures/technic_motor.png Binary files differdeleted file mode 100644 index 77d4b91..0000000 --- a/technic/textures/technic_motor.png +++ /dev/null diff --git a/technic/tools/chainsaw.lua b/technic/tools/chainsaw.lua index 3653d2d..8245fd6 100644 --- a/technic/tools/chainsaw.lua +++ b/technic/tools/chainsaw.lua @@ -363,8 +363,10 @@ minetest.register_craft({ output = "technic:chainsaw", recipe = { {"technic:stainless_steel_ingot", trigger, "technic:battery"}, - {"technic:fine_copper_wire", "technic:motor", "technic:battery"}, + {"basic_materials:copper_wire", "basic_materials:motor", "technic:battery"}, {"", "", "technic:stainless_steel_ingot"}, - } + }, + replacements = { {"basic_materials:copper_wire", "basic_materials:empty_spool"}, }, + }) diff --git a/technic/tools/mining_drill.lua b/technic/tools/mining_drill.lua index 1cf7491..250c461 100644 --- a/technic/tools/mining_drill.lua +++ b/technic/tools/mining_drill.lua @@ -7,7 +7,7 @@ minetest.register_craft({ output = 'technic:mining_drill', recipe = { {'default:tin_ingot', 'technic:diamond_drill_head', 'default:tin_ingot'}, - {'technic:stainless_steel_ingot', 'technic:motor', 'technic:stainless_steel_ingot'}, + {'technic:stainless_steel_ingot', 'basic_materials:motor', 'technic:stainless_steel_ingot'}, {'', 'technic:red_energy_crystal', 'default:copper_ingot'}, } }) diff --git a/technic/tools/mining_lasers.lua b/technic/tools/mining_lasers.lua index 6015e5a..ba5a726 100644 --- a/technic/tools/mining_lasers.lua +++ b/technic/tools/mining_lasers.lua @@ -11,8 +11,8 @@ local S = technic.getter minetest.register_craft({ output = "technic:laser_mk1", recipe = { - {"default:diamond", "technic:brass_ingot", "default:obsidian_glass"}, - {"", "technic:brass_ingot", "technic:red_energy_crystal"}, + {"default:diamond", "basic_materials:brass_ingot", "default:obsidian_glass"}, + {"", "basic_materials:brass_ingot", "technic:red_energy_crystal"}, {"", "", "default:copper_ingot"}, } }) diff --git a/technic/tools/prospector.lua b/technic/tools/prospector.lua index b28f1d8..9a918a2 100644 --- a/technic/tools/prospector.lua +++ b/technic/tools/prospector.lua @@ -122,7 +122,7 @@ minetest.register_craft({ output = "technic:prospector", recipe = { {"moreores:pick_silver", "moreores:mithril_block", "pipeworks:teleport_tube_1"}, - {"technic:brass_ingot", "technic:control_logic_unit", "technic:brass_ingot"}, + {"basic_materials:brass_ingot", "technic:control_logic_unit", "basic_materials:brass_ingot"}, {"", "technic:blue_energy_crystal", ""}, } }) diff --git a/technic/tools/vacuum.lua b/technic/tools/vacuum.lua index 037f3bb..b5afcb5 100644 --- a/technic/tools/vacuum.lua +++ b/technic/tools/vacuum.lua @@ -55,7 +55,7 @@ minetest.register_craft({ output = 'technic:vacuum', recipe = { {'pipeworks:tube_1', 'pipeworks:filter', 'technic:battery'}, - {'pipeworks:tube_1', 'technic:motor', 'technic:battery'}, + {'pipeworks:tube_1', 'basic_materials:motor', 'technic:battery'}, {'technic:stainless_steel_ingot', '', ''}, } }) diff --git a/technic_chests/copper_chest.lua b/technic_chests/copper_chest.lua index d40284b..fda1db0 100644 --- a/technic_chests/copper_chest.lua +++ b/technic_chests/copper_chest.lua @@ -19,7 +19,7 @@ minetest.register_craft({ minetest.register_craft({ output = 'technic:copper_locked_chest 1', recipe = { - {'default:steel_ingot'}, + {'basic_materials:padlock'}, {'technic:copper_chest'}, } }) diff --git a/technic_chests/depends.txt b/technic_chests/depends.txt index b9ca665..5d9ea6c 100644 --- a/technic_chests/depends.txt +++ b/technic_chests/depends.txt @@ -1,4 +1,6 @@ default +basic_materials +moreblocks? moreores? pipeworks? intllib? diff --git a/technic_chests/gold_chest.lua b/technic_chests/gold_chest.lua index c66b2f6..7a50b70 100644 --- a/technic_chests/gold_chest.lua +++ b/technic_chests/gold_chest.lua @@ -30,7 +30,7 @@ end minetest.register_craft({ output = 'technic:gold_locked_chest', recipe = { - {'default:steel_ingot'}, + {'basic_materials:padlock'}, {'technic:gold_chest'}, } }) diff --git a/technic_chests/init.lua b/technic_chests/init.lua index 6b1a1b2..188e516 100644 --- a/technic_chests/init.lua +++ b/technic_chests/init.lua @@ -15,6 +15,63 @@ dofile(modpath.."/silver_chest.lua") dofile(modpath.."/gold_chest.lua") dofile(modpath.."/mithril_chest.lua") +-- undo all of the locked wooden chest recipes created by default and +-- moreblocks, and just make them use a padlock. + +if minetest.get_modpath("moreblocks") then + minetest.clear_craft({ + type = "shapeless", + recipe = { + "default:chest", + "default:gold_ingot", + } + }) + + minetest.clear_craft({ + type = "shapeless", + recipe = { + "default:chest", + "default:bronze_ingot", + } + }) + + minetest.clear_craft({ + type = "shapeless", + recipe = { + "default:chest", + "default:copper_ingot", + } + }) +end + +minetest.clear_craft({ + type = "shapeless", + recipe = { + "default:chest", + "default:steel_ingot", + } +}) + +minetest.clear_craft({output = "default:chest_locked"}) + +minetest.register_craft({ + output = "default:chest_locked", + recipe = { + { "group:wood", "group:wood", "group:wood" }, + { "group:wood", "basic_materials:padlock", "group:wood" }, + { "group:wood", "group:wood", "group:wood" } + } +}) + +minetest.register_craft({ + output = "default:chest_locked", + type = "shapeless", + recipe = { + "default:chest", + "basic_materials:padlock" + } +}) + minetest.register_lbm({ name = "technic_chests:fix_wooden_chests", nodenames = {"default:chest"}, diff --git a/technic_chests/iron_chest.lua b/technic_chests/iron_chest.lua index 90434bb..237067b 100644 --- a/technic_chests/iron_chest.lua +++ b/technic_chests/iron_chest.lua @@ -26,7 +26,7 @@ minetest.register_craft({ minetest.register_craft({ output = 'technic:iron_locked_chest 1', recipe = { - {'default:steel_ingot'}, + {'basic_materials:padlock'}, {'technic:iron_chest'}, } }) diff --git a/technic_chests/mithril_chest.lua b/technic_chests/mithril_chest.lua index 909ff9e..05cbc40 100644 --- a/technic_chests/mithril_chest.lua +++ b/technic_chests/mithril_chest.lua @@ -21,7 +21,7 @@ end minetest.register_craft({ output = 'technic:mithril_locked_chest 1', recipe = { - {'default:steel_ingot'}, + {'basic_materials:padlock'}, {'technic:mithril_chest'}, } }) diff --git a/technic_chests/silver_chest.lua b/technic_chests/silver_chest.lua index c615304..4de196d 100644 --- a/technic_chests/silver_chest.lua +++ b/technic_chests/silver_chest.lua @@ -21,7 +21,7 @@ end minetest.register_craft({ output = 'technic:silver_locked_chest', recipe = { - {'default:steel_ingot'}, + {'basic_materials:padlock'}, {'technic:silver_chest'}, } }) diff --git a/technic_worldgen/crafts.lua b/technic_worldgen/crafts.lua index fba9df9..0590e70 100644 --- a/technic_worldgen/crafts.lua +++ b/technic_worldgen/crafts.lua @@ -48,11 +48,6 @@ minetest.register_craftitem(":technic:sulfur_lump", { inventory_image = "technic_sulfur_lump.png", }) -minetest.register_craftitem(":technic:brass_ingot", { - description = S("Brass Ingot"), - inventory_image = "technic_brass_ingot.png", -}) - minetest.register_alias("technic:wrought_iron_ingot", "default:steel_ingot") minetest.override_item("default:steel_ingot", { @@ -97,7 +92,6 @@ register_block("technic:uranium_block", "technic:uranium_ingot") register_block("technic:chromium_block", "technic:chromium_ingot") register_block("technic:zinc_block", "technic:zinc_ingot") register_block("technic:lead_block", "technic:lead_ingot") -register_block("technic:brass_block", "technic:brass_ingot") register_block("technic:cast_iron_block", "technic:cast_iron_ingot") register_block("technic:carbon_steel_block", "technic:carbon_steel_ingot") register_block("technic:stainless_steel_block", "technic:stainless_steel_ingot") diff --git a/technic_worldgen/depends.txt b/technic_worldgen/depends.txt index 3b1e4d0..6a92b7d 100644 --- a/technic_worldgen/depends.txt +++ b/technic_worldgen/depends.txt @@ -1,4 +1,5 @@ default +basic_materials intllib? mg? doors? diff --git a/technic_worldgen/nodes.lua b/technic_worldgen/nodes.lua index f3a88e4..14b4eba 100644 --- a/technic_worldgen/nodes.lua +++ b/technic_worldgen/nodes.lua @@ -133,14 +133,6 @@ minetest.register_node(":technic:stainless_steel_block", { sounds = default.node_sound_stone_defaults() }) -minetest.register_node(":technic:brass_block", { - description = S("Brass Block"), - tiles = { "technic_brass_block.png" }, - is_ground_content = true, - groups = {cracky=1, level=2}, - sounds = default.node_sound_stone_defaults() -}) - minetest.register_craft({ output = 'technic:marble_bricks 4', recipe = { diff --git a/technic_worldgen/textures/technic_brass_block.png b/technic_worldgen/textures/technic_brass_block.png Binary files differdeleted file mode 100644 index bc6fe78..0000000 --- a/technic_worldgen/textures/technic_brass_block.png +++ /dev/null diff --git a/technic_worldgen/textures/technic_brass_ingot.png b/technic_worldgen/textures/technic_brass_ingot.png Binary files differdeleted file mode 100644 index 06056e7..0000000 --- a/technic_worldgen/textures/technic_brass_ingot.png +++ /dev/null |
