From 633beb8b8820f94ee41396651d6024876b37d279 Mon Sep 17 00:00:00 2001 From: Vanessa Ezekowitz Date: Mon, 14 Jul 2014 15:38:36 -0400 Subject: [PATCH] defer to technic for brass ingots if technic is not installed, just define its brass ingot and use the standard moreores silver/default copper craft recipe to make it. if technic is installed, define no recipe for it - let technic's zinc/copper alloy furnace recipe handle it. --- homedecor/crafts.lua | 56 ++++++++++++++++++++++++-------------------- 1 file changed, 31 insertions(+), 25 deletions(-) diff --git a/homedecor/crafts.lua b/homedecor/crafts.lua index 1cc98167..e7b75f17 100644 --- a/homedecor/crafts.lua +++ b/homedecor/crafts.lua @@ -37,12 +37,6 @@ minetest.register_craftitem("homedecor:drawer_small", { inventory_image = "homedecor_drawer_small.png", }) -minetest.register_craftitem("homedecor:brass_ingot", { - description = S("Brass Ingot"), - inventory_image = "homedecor_brass_ingot.png", - groups = { brass_ingot=1 } -}) - minetest.register_craftitem("homedecor:ic", { description = S("Simple Integrated Circuit"), inventory_image = "homedecor_ic.png", @@ -93,9 +87,9 @@ minetest.register_craftitem("homedecor:speaker_driver", { inventory_image = "homedecor_speaker_driver.png" }) --- alternate craftitem for silicon if mesecons isn't installed. +-- alternate crafting if mesecons is/isn't installed -if ( minetest.get_modpath("mesecons") ) == nil then +if not minetest.get_modpath("mesecons") then minetest.register_craftitem(":mesecons_materials:silicon", { description = S("Silicon lump"), @@ -112,6 +106,27 @@ if ( minetest.get_modpath("mesecons") ) == nil then end +-- alternate crafting if technic is/isn't installed + +if not minetest.get_modpath("technic") then + + minetest.register_craftitem(":technic:brass_ingot", { + description = S("Brass Ingot"), + inventory_image = "homedecor_brass_ingot.png", + }) + + minetest.register_craft( { + type = "shapeless", + output = "technic:brass_ingot 2", + recipe = { + "moreores:silver_ingot", + "default:copper_ingot", + }, + }) +end + +minetest.register_alias("homedecor:brass_ingot", "technic:brass_ingot") + -- the actual crafts minetest.register_craft( { @@ -729,15 +744,6 @@ minetest.register_craft({ burntime = 30, }) -minetest.register_craft( { - type = "shapeless", - output = "homedecor:brass_ingot 2", - recipe = { - "moreores:silver_ingot", - "default:copper_ingot", - }, -}) - -- Table legs minetest.register_craft( { @@ -752,9 +758,9 @@ minetest.register_craft( { minetest.register_craft( { output = "homedecor:table_legs_brass 3", recipe = { - { "", "group:brass_ingot", "" }, - { "", "group:brass_ingot", "" }, - { "group:brass_ingot", "group:brass_ingot", "group:brass_ingot" } + { "", "technic:brass_ingot", "" }, + { "", "technic:brass_ingot", "" }, + { "technic:brass_ingot", "technic:brass_ingot", "technic:brass_ingot" } }, }) @@ -778,9 +784,9 @@ minetest.register_craft({ minetest.register_craft( { output = "homedecor:pole_brass 4", recipe = { - { "", "group:brass_ingot", "" }, - { "", "group:brass_ingot", "" }, - { "", "group:brass_ingot", "" } + { "", "technic:brass_ingot", "" }, + { "", "technic:brass_ingot", "" }, + { "", "technic:brass_ingot", "" } }, }) @@ -1293,8 +1299,8 @@ minetest.register_craft({ minetest.register_craft( { output = "homedecor:fence_brass 6", recipe = { - { "group:brass_ingot", "group:brass_ingot", "group:brass_ingot" }, - { "group:brass_ingot", "group:brass_ingot", "group:brass_ingot" }, + { "technic:brass_ingot", "technic:brass_ingot", "technic:brass_ingot" }, + { "technic:brass_ingot", "technic:brass_ingot", "technic:brass_ingot" }, }, })