From 10307f23a78b33af50dc4a5f3d1baafb4ee4b0d9 Mon Sep 17 00:00:00 2001 From: Maciej 'agaran' Pijanka <agaran@pld-linux.org> Date: Thu, 16 Mar 2017 00:00:22 +0100 Subject: [PATCH] Do not run converters twice. --- technic/crafts.lua | 152 ++++++++++++++++++++++++++++---------------------- 1 files changed, 84 insertions(+), 68 deletions(-) diff --git a/technic/crafts.lua b/technic/crafts.lua index 591c02e..4859768 100644 --- a/technic/crafts.lua +++ b/technic/crafts.lua @@ -1,50 +1,17 @@ +-- check if we have the necessary dependencies to allow actually using these materials in the crafts +local mesecons_materials = minetest.get_modpath("mesecons_materials") + -- tubes crafting recipes minetest.register_craft({ - output = 'pipeworks:tube_1 9', - recipe = { - {'technic:stainless_steel_ingot', 'default:glass', 'technic:stainless_steel_ingot'}, - {'technic:stainless_steel_ingot', 'default:glass', 'technic:stainless_steel_ingot'}, - {'technic:stainless_steel_ingot', 'default:glass', 'technic:stainless_steel_ingot'}, - } -}) -minetest.register_craft({ - output = 'pipeworks:mese_tube_000000', - recipe = { - {'default:mese_crystal_fragment', 'pipeworks:tube_1', 'default:mese_crystal_fragment'}, - } -}) - -minetest.register_craft({ - output = 'pipeworks:accelerator_tube_000000', + output = 'pipeworks:accelerator_tube_1', recipe = { {'technic:copper_coil', 'pipeworks:tube_1', 'technic:copper_coil'}, } }) minetest.register_craft({ - output = 'pipeworks:detector_tube_off_000000', - recipe = { - {'mesecons:mesecon', 'pipeworks:tube_1', 'mesecons:mesecon'}, - } -}) - -minetest.register_craft({ - output = 'pipeworks:sand_tube_000000', - recipe = { - {'default:sand', 'pipeworks:tube_1', 'default:sand'}, - } -}) - -minetest.register_craft({ - output = 'pipeworks:mese_sand_tube_000000', - recipe = { - {'default:mese_crystal_fragment', 'pipeworks:sand_tube_000000', 'default:mese_crystal_fragment'}, - } -}) - -minetest.register_craft({ - output = 'pipeworks:teleport_tube_000000', + output = 'pipeworks:teleport_tube_1', recipe = { {'default:mese_crystal', 'technic:copper_coil', 'default:mese_crystal'}, {'pipeworks:tube_1', 'technic:control_logic_unit', 'pipeworks:tube_1'}, @@ -73,18 +40,18 @@ minetest.register_craft({ output = 'technic:blue_energy_crystal', recipe = { - {'default:gold_ingot', 'technic:battery', 'dye:blue'}, + {'moreores:mithril_ingot', 'technic:battery', 'dye:blue'}, {'technic:battery', 'technic:green_energy_crystal', 'technic:battery'}, - {'dye:blue', 'technic:battery', 'default:gold_ingot'}, + {'dye:blue', 'technic:battery', 'moreores:mithril_ingot'}, } }) minetest.register_craft({ output = 'technic:red_energy_crystal', recipe = { - {'default:gold_ingot', 'technic:battery', 'dye:red'}, + {'moreores:silver_ingot', 'technic:battery', 'dye:red'}, {'technic:battery', 'default:diamondblock', 'technic:battery'}, - {'dye:red', 'technic:battery', 'default:gold_ingot'}, + {'dye:red', 'technic:battery', 'moreores:silver_ingot'}, } }) @@ -98,45 +65,65 @@ }) 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', 'default:steel_ingot', 'technic:fine_copper_wire'}, - {'default:steel_ingot', '', 'default:steel_ingot'}, - {'technic:fine_copper_wire', 'default:steel_ingot', 'technic:fine_copper_wire'}, + {'technic:fine_copper_wire', 'technic:wrought_iron_ingot', 'technic:fine_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 = { - {'default:steel_ingot', 'technic:copper_coil', 'default:steel_ingot'}, - {'default:steel_ingot', 'technic:copper_coil', 'default:steel_ingot'}, - {'default:steel_ingot', 'default:copper_ingot', 'default:steel_ingot'}, + {'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'}, } }) + +local isolation = mesecons_materials and "mesecons_materials:fiber" or "technic:rubber" minetest.register_craft({ output = 'technic:lv_transformer', recipe = { - {'default:iron_lump', 'default:iron_lump', 'default:iron_lump'}, - {'technic:copper_coil', 'default:iron_lump', 'technic:copper_coil'}, - {'default:iron_lump', 'default:iron_lump', 'default:iron_lump'}, + {isolation, 'technic:wrought_iron_ingot', isolation}, + {'technic:copper_coil', 'technic:wrought_iron_ingot', 'technic:copper_coil'}, + {'technic:wrought_iron_ingot', 'technic:wrought_iron_ingot', 'technic:wrought_iron_ingot'}, } }) minetest.register_craft({ output = 'technic:mv_transformer', recipe = { - {'default:steel_ingot', 'default:steel_ingot', 'default:steel_ingot'}, - {'technic:copper_coil', 'default:steel_ingot', 'technic:copper_coil'}, - {'default:steel_ingot', 'default:steel_ingot', 'default:steel_ingot'}, + {isolation, 'technic:carbon_steel_ingot', isolation}, + {'technic:copper_coil', 'technic:carbon_steel_ingot', 'technic:copper_coil'}, + {'technic:carbon_steel_ingot', 'technic:carbon_steel_ingot', 'technic:carbon_steel_ingot'}, } }) minetest.register_craft({ output = 'technic:hv_transformer', recipe = { - {'technic:stainless_steel_ingot', 'technic:stainless_steel_ingot', 'technic:stainless_steel_ingot'}, + {isolation, 'technic:stainless_steel_ingot', isolation}, {'technic:copper_coil', 'technic:stainless_steel_ingot', 'technic:copper_coil'}, {'technic:stainless_steel_ingot', 'technic:stainless_steel_ingot', 'technic:stainless_steel_ingot'}, } @@ -145,9 +132,9 @@ minetest.register_craft({ output = 'technic:control_logic_unit', recipe = { - {'', 'default:gold_ingot', ''}, + {'', 'technic:fine_gold_wire', ''}, {'default:copper_ingot', 'technic:silicon_wafer', 'default:copper_ingot'}, - {'', 'default:copper_ingot', ''}, + {'', 'technic:chromium_ingot', ''}, } }) @@ -167,22 +154,51 @@ } }) -minetest.register_craftitem("technic:nothing", { - description = "", - inventory_image = "blank.png", +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", "technic:cast_iron_ingot", "technic:cast_iron_ingot" }, + }, }) +-- Remove some recipes +-- Bronze minetest.register_craft({ type = "shapeless", - output = "technic:nothing", + output = "default:bronze_ingot 0", recipe = {"default:copper_ingot", "default:steel_ingot"} }) -if minetest.register_craft_predict then - minetest.register_craft_predict(function(itemstack, player, old_craft_grid, craft_inv) - if itemstack:get_name() == "technic:nothing" then - return ItemStack("") - end - end) -end +-- Accelerator tube +minetest.register_craft({ + output = "pipeworks:accelerator_tube_1 0", + recipe = { + { "homedecor:plastic_sheeting", "homedecor:plastic_sheeting", "homedecor:plastic_sheeting" }, + { "default:mese_crystal_fragment", "default:steel_ingot", "default:mese_crystal_fragment" }, + { "homedecor:plastic_sheeting", "homedecor:plastic_sheeting", "homedecor:plastic_sheeting" } + }, +}) +-- Teleport tube +minetest.register_craft({ + output = "pipeworks:teleport_tube_1 0", + recipe = { + { "homedecor:plastic_sheeting", "homedecor:plastic_sheeting", "homedecor:plastic_sheeting" }, + { "default:desert_stone", "default:mese", "default:desert_stone" }, + { "homedecor:plastic_sheeting", "homedecor:plastic_sheeting", "homedecor:plastic_sheeting" } + }, +}) + +minetest.register_craft({ + output = "default:dirt 2", + type = "shapeless", + replacements = {{"bucket:bucket_water","bucket:bucket_empty"}}, + recipe = { + "technic:stone_dust", + "group:leaves", + "bucket:bucket_water", + "group:sand", + }, +}) -- Gitblit v1.8.0