From 869b40a24d4c0e89b05ae70173c1b7ffd397f9b1 Mon Sep 17 00:00:00 2001 From: Vanessa Dannenberg Date: Wed, 31 Oct 2018 13:38:52 -0400 Subject: add basic_materials mod update homedecor, pipeworks, gloopblocks, signs_lib, stainedglass also updated technic, roads, glooptest, framedglass (they're my forks actually, just until some pending PRs are merged) make default locked chests use basic_materials padlock --- technic/crafts.lua | 46 ++++++++------------------ technic/depends.txt | 1 + technic/items.lua | 16 --------- technic/machines/LV/compressor.lua | 2 +- technic/machines/LV/geothermal.lua | 2 +- technic/machines/LV/solar_panel.lua | 6 ++-- technic/machines/other/frames.lua | 8 ++--- technic/machines/register/alloy_recipes.lua | 2 +- technic/machines/register/grinder_recipes.lua | 2 +- technic/machines/supply_converter.lua | 2 +- technic/radiation.lua | 2 +- technic/textures/technic_fine_copper_wire.png | Bin 501 -> 0 bytes technic/textures/technic_fine_gold_wire.png | Bin 474 -> 0 bytes technic/textures/technic_fine_silver_wire.png | Bin 546 -> 0 bytes technic/tools/chainsaw.lua | 2 +- technic/tools/mining_lasers.lua | 4 +-- technic/tools/prospector.lua | 2 +- 17 files changed, 31 insertions(+), 66 deletions(-) delete mode 100644 technic/textures/technic_fine_copper_wire.png delete mode 100644 technic/textures/technic_fine_gold_wire.png delete mode 100644 technic/textures/technic_fine_silver_wire.png (limited to 'technic') diff --git a/technic/crafts.lua b/technic/crafts.lua index 5d3ae04..7d51f29 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,44 +77,17 @@ 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'}, + {'basic_materials:copper_wire', 'technic:wrought_iron_ingot', 'basic_materials:copper_wire'}, } }) @@ -153,10 +132,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 +159,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..d527c8b 100644 --- a/technic/items.lua +++ b/technic/items.lua @@ -69,22 +69,6 @@ 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", diff --git a/technic/machines/LV/compressor.lua b/technic/machines/LV/compressor.lua index 67b9f79..c1a1d73 100644 --- a/technic/machines/LV/compressor.lua +++ b/technic/machines/LV/compressor.lua @@ -6,7 +6,7 @@ minetest.register_craft({ recipe = { {'default:stone', 'technic: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'}, } }) diff --git a/technic/machines/LV/geothermal.lua b/technic/machines/LV/geothermal.lua index 27f4abc..1699a52 100644 --- a/technic/machines/LV/geothermal.lua +++ b/technic/machines/LV/geothermal.lua @@ -11,7 +11,7 @@ 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'}, } }) 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/other/frames.lua b/technic/machines/other/frames.lua index d5c60a3..ab07d58 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', '' }, } }) @@ -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', '' }, } }) 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..6c520ca 100644 --- a/technic/machines/supply_converter.lua +++ b/technic/machines/supply_converter.lua @@ -201,7 +201,7 @@ 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'}, } 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 deleted file mode 100644 index 3e663bb..0000000 Binary files a/technic/textures/technic_fine_copper_wire.png and /dev/null differ diff --git a/technic/textures/technic_fine_gold_wire.png b/technic/textures/technic_fine_gold_wire.png deleted file mode 100644 index 54a7a52..0000000 Binary files a/technic/textures/technic_fine_gold_wire.png and /dev/null differ diff --git a/technic/textures/technic_fine_silver_wire.png b/technic/textures/technic_fine_silver_wire.png deleted file mode 100644 index f40a52b..0000000 Binary files a/technic/textures/technic_fine_silver_wire.png and /dev/null differ diff --git a/technic/tools/chainsaw.lua b/technic/tools/chainsaw.lua index 3653d2d..75e028c 100644 --- a/technic/tools/chainsaw.lua +++ b/technic/tools/chainsaw.lua @@ -363,7 +363,7 @@ 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", "technic:motor", "technic:battery"}, {"", "", "technic:stainless_steel_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", ""}, } }) -- cgit v1.2.3