From ec73a8508fc8458e10be6a93bbc3be2eba26595f Mon Sep 17 00:00:00 2001 From: Vanessa Ezekowitz <vanessaezekowitz@gmail.com> Date: Mon, 19 Jan 2015 19:37:46 +0100 Subject: [PATCH] add custom collision and selection box handling to CNC machine also clean up formatting of surrounding code --- technic/crafts.lua | 62 +++++++++++++++++++------------ 1 files changed, 38 insertions(+), 24 deletions(-) diff --git a/technic/crafts.lua b/technic/crafts.lua index 1bc1e42..a8a0512 100644 --- a/technic/crafts.lua +++ b/technic/crafts.lua @@ -37,18 +37,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'}, } }) @@ -58,6 +58,24 @@ {'', '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', ''}, } }) @@ -82,7 +100,7 @@ minetest.register_craft({ output = 'technic:lv_transformer', recipe = { - {'technic:wrought_iron_ingot', 'technic:wrought_iron_ingot', 'technic:wrought_iron_ingot'}, + {'mesecons_materials:fiber', 'technic:wrought_iron_ingot', 'mesecons_materials:fiber'}, {'technic:copper_coil', 'technic:wrought_iron_ingot', 'technic:copper_coil'}, {'technic:wrought_iron_ingot', 'technic:wrought_iron_ingot', 'technic:wrought_iron_ingot'}, } @@ -91,7 +109,7 @@ minetest.register_craft({ output = 'technic:mv_transformer', recipe = { - {'technic:carbon_steel_ingot', 'technic:carbon_steel_ingot', 'technic:carbon_steel_ingot'}, + {'mesecons_materials:fiber', 'technic:carbon_steel_ingot', 'mesecons_materials:fiber'}, {'technic:copper_coil', 'technic:carbon_steel_ingot', 'technic:copper_coil'}, {'technic:carbon_steel_ingot', 'technic:carbon_steel_ingot', 'technic:carbon_steel_ingot'}, } @@ -100,7 +118,7 @@ minetest.register_craft({ output = 'technic:hv_transformer', recipe = { - {'technic:stainless_steel_ingot', 'technic:stainless_steel_ingot', 'technic:stainless_steel_ingot'}, + {'mesecons_materials:fiber', 'technic:stainless_steel_ingot', 'mesecons_materials:fiber'}, {'technic:copper_coil', 'technic:stainless_steel_ingot', 'technic:copper_coil'}, {'technic:stainless_steel_ingot', 'technic:stainless_steel_ingot', 'technic:stainless_steel_ingot'}, } @@ -109,9 +127,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', ''}, } }) @@ -131,30 +149,26 @@ } }) --- Remove some recipes -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" }, + }, }) -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 - +-- Remove some recipes -- Bronze minetest.register_craft({ type = "shapeless", - output = "technic:nothing", + output = "default:bronze_ingot 0", recipe = {"default:copper_ingot", "default:steel_ingot"} }) -- Accelerator tube minetest.register_craft({ - output = "technic:nothing", + 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" }, @@ -164,7 +178,7 @@ -- Teleport tube minetest.register_craft({ - output = "technic:nothing", + output = "pipeworks:teleport_tube_1 0", recipe = { { "homedecor:plastic_sheeting", "homedecor:plastic_sheeting", "homedecor:plastic_sheeting" }, { "default:desert_stone", "default:mese_block", "default:desert_stone" }, -- Gitblit v1.8.0