From d6b0deb989e649e2800932d4a587c3ba9e3e24c7 Mon Sep 17 00:00:00 2001 From: Vanessa Ezekowitz <vanessaezekowitz@gmail.com> Date: Sat, 17 Jan 2015 01:16:39 +0100 Subject: [PATCH] fix cnc stick formspec img (missed the border) --- technic/machines/register/grinder_recipes.lua | 101 +++++++++++++++++++++++++++++--------------------- 1 files changed, 59 insertions(+), 42 deletions(-) diff --git a/technic/machines/register/grinder_recipes.lua b/technic/machines/register/grinder_recipes.lua index cde68b6..2d76333 100644 --- a/technic/machines/register/grinder_recipes.lua +++ b/technic/machines/register/grinder_recipes.lua @@ -1,60 +1,35 @@ local S = technic.getter -if unified_inventory and unified_inventory.register_craft_type then - unified_inventory.register_craft_type("grinding", { - description = S("Grinding"), - height = 1, - width = 1, - }) -end - -technic.grinder_recipes = {} +technic.register_recipe_type("grinding", { description = S("Grinding") }) function technic.register_grinder_recipe(data) data.time = data.time or 3 - technic.grinder_recipes[data.input] = data - if unified_inventory then - unified_inventory.register_craft({ - type = "grinding", - output = data.output, - items = {data.input}, - width = 0, - }) - end + technic.register_recipe("grinding", data) end -minetest.after(0.01, function () - for ingredient, recipe in pairs(technic.grinder_recipes) do - ingredient = minetest.registered_aliases[ingredient] - while ingredient do - technic.grinder_recipes[ingredient] = recipe - ingredient = minetest.registered_aliases[ingredient] - end - end -end) - --- Receive an ItemStack of result by an ItemStack input -function technic.get_grinder_recipe(itemstack) - return technic.grinder_recipes[itemstack:get_name()] -end - --- Sorted alphebeticaly local recipes = { + -- Dusts {"default:coal_lump", "technic:coal_dust 2"}, - {"default:cobble", "default:gravel"}, {"default:copper_lump", "technic:copper_dust 2"}, {"default:desert_stone", "default:desert_sand"}, {"default:gold_lump", "technic:gold_dust 2"}, - {"default:gravel", "default:dirt"}, {"default:iron_lump", "technic:wrought_iron_dust 2"}, - {"default:stone", "default:sand"}, - {"moreores:mithril_lump", "technic:mithril_dust 2"}, - {"moreores:silver_lump", "technic:silver_dust 2"}, - {"moreores:tin_lump", "technic:tin_dust 2"}, {"technic:chromium_lump", "technic:chromium_dust 2"}, + {"technic:uranium_lump", "technic:uranium_dust 2"}, {"technic:zinc_lump", "technic:zinc_dust 2"}, + + -- Other + {"default:cobble", "default:gravel"}, + {"default:gravel", "default:dirt"}, + {"default:stone", "default:sand"}, } + +if minetest.get_modpath("moreores") then + table.insert(recipes, {"moreores:mithril_lump", "technic:mithril_dust 2"}) + table.insert(recipes, {"moreores:silver_lump", "technic:silver_dust 2"}) + table.insert(recipes, {"moreores:tin_lump", "technic:tin_dust 2"}) +end if minetest.get_modpath("gloopores") or minetest.get_modpath("glooptest") then table.insert(recipes, {"gloopores:alatro_lump", "technic:alatro_dust 2"}) @@ -69,7 +44,7 @@ end for _, data in pairs(recipes) do - technic.register_grinder_recipe({input=data[1], output=data[2]}) + technic.register_grinder_recipe({input = {data[1]}, output = data[2]}) end local function register_dust(name, ingot) @@ -86,7 +61,7 @@ recipe = "technic:"..lname.."_dust", output = ingot, }) - technic.register_grinder_recipe({ input = ingot, output = "technic:"..lname.."_dust 1" }) + technic.register_grinder_recipe({ input = {ingot}, output = "technic:"..lname.."_dust 1" }) end end @@ -113,9 +88,51 @@ register_dust("Talinite", "glooptest:talinite_ingot") end +for p = 0, 35 do + local nici = (p ~= 0 and p ~= 7 and p ~= 35) and 1 or nil + local psuffix = p == 7 and "" or p + local ingot = "technic:uranium"..psuffix.."_ingot" + local dust = "technic:uranium"..psuffix.."_dust" + minetest.register_craftitem(dust, { + description = S("%s Dust"):format(string.format(S("%.1f%%-Fissile Uranium"), p/10)), + inventory_image = "technic_uranium_dust.png", + on_place_on_ground = minetest.craftitem_place_item, + groups = {uranium_dust=1, not_in_creative_inventory=nici}, + }) + minetest.register_craft({ + type = "cooking", + recipe = dust, + output = ingot, + }) + technic.register_grinder_recipe({ input = {ingot}, output = dust }) +end + +local function uranium_dust(p) + return "technic:uranium"..(p == 7 and "" or p).."_dust" +end +for pa = 0, 34 do + for pb = pa+1, 35 do + local pc = (pa+pb)/2 + if pc == math.floor(pc) then + minetest.register_craft({ + type = "shapeless", + recipe = { uranium_dust(pa), uranium_dust(pb) }, + output = uranium_dust(pc).." 2", + }) + end + end +end + minetest.register_craft({ type = "fuel", recipe = "technic:coal_dust", burntime = 50, }) +if minetest.get_modpath("gloopores") or minetest.get_modpath("glooptest") then + minetest.register_craft({ + type = "fuel", + recipe = "technic:kalite_dust", + burntime = 37.5, + }) +end -- Gitblit v1.8.0