From d0efa15b983f7a0a96e1a7abcdad713715dfeeeb Mon Sep 17 00:00:00 2001
From: Zefram <zefram@fysh.org>
Date: Mon, 18 Aug 2014 16:14:15 +0200
Subject: [PATCH] In quarry, skip past undiggable nodes
---
technic/machines/register/grinder_recipes.lua | 130 ++++++++++++++++++++++---------------------
1 files changed, 67 insertions(+), 63 deletions(-)
diff --git a/technic/machines/register/grinder_recipes.lua b/technic/machines/register/grinder_recipes.lua
index 13fa8f1..6ab19e7 100644
--- a/technic/machines/register/grinder_recipes.lua
+++ b/technic/machines/register/grinder_recipes.lua
@@ -1,85 +1,50 @@
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 = {
- {"default:bronze_ingot", "technic:bronze_dust 1"},
+ -- Dusts
{"default:coal_lump", "technic:coal_dust 2"},
- {"default:cobble", "default:gravel"},
- {"default:copper_ingot", "technic:copper_dust 1"},
{"default:copper_lump", "technic:copper_dust 2"},
{"default:desert_stone", "default:desert_sand"},
- {"default:gold_ingot", "technic:gold_dust 1"},
{"default:gold_lump", "technic:gold_dust 2"},
- {"default:gravel", "default:dirt"},
{"default:iron_lump", "technic:wrought_iron_dust 2"},
- {"default:stone", "default:sand"},
- {"gloopores:alatro_lump", "technic:alatro_dust 2"},
- {"gloopores:kalite_lump", "technic:kalite_dust 2"},
- {"gloopores:arol_lump", "technic:arol_dust 2"},
- {"gloopores:talinite_lump", "technic:talinite_dust 2"},
- {"gloopores:akalin_lump", "technic:akalin_dust 2"},
- {"moreores:mithril_ingot", "technic:mithril_dust 1"},
- {"moreores:mithril_lump", "technic:mithril_dust 2"},
- {"moreores:silver_ingot", "technic:silver_dust 1"},
- {"moreores:silver_lump", "technic:silver_dust 2"},
- {"moreores:tin_ingot", "technic:tin_dust 1"},
- {"moreores:tin_lump", "technic:tin_dust 2"},
- {"technic:cast_iron_ingot", "technic:cast_iron_dust 1"},
- {"technic:chromium_ingot", "technic:chromium_dust 1"},
{"technic:chromium_lump", "technic:chromium_dust 2"},
- {"technic:wrought_iron_ingot", "technic:wrought_iron_dust 1"},
- {"technic:carbon_steel_ingot", "technic:carbon_steel_dust 1"},
- {"technic:stainless_steel_ingot", "technic:stainless_steel_dust 1"},
- {"technic:zinc_ingot", "technic:zinc_dust 1"},
+ {"technic:uranium_lump", "technic:uranium_dust 2"},
{"technic:zinc_lump", "technic:zinc_dust 2"},
- {"technic:brass_ingot", "technic:brass_dust 1"},
+
+ -- 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"})
+ table.insert(recipes, {"gloopores:kalite_lump", "technic:kalite_dust 2"})
+ table.insert(recipes, {"gloopores:arol_lump", "technic:arol_dust 2"})
+ table.insert(recipes, {"gloopores:talinite_lump", "technic:talinite_dust 2"})
+ table.insert(recipes, {"gloopores:akalin_lump", "technic:akalin_dust 2"})
+end
if minetest.get_modpath("homedecor") then
table.insert(recipes, {"home_decor:brass_ingot", "technic:brass_dust 1"})
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)
@@ -96,13 +61,11 @@
recipe = "technic:"..lname.."_dust",
output = ingot,
})
+ technic.register_grinder_recipe({ input = {ingot}, output = "technic:"..lname.."_dust 1" })
end
end
-- Sorted alphibeticaly
-register_dust("Akalin", "glooptest:akalin_ingot")
-register_dust("Alatro", "glooptest:alatro_ingot")
-register_dust("Arol", "glooptest:arol_ingot")
register_dust("Brass", "technic:brass_ingot")
register_dust("Bronze", "default:bronze_ingot")
register_dust("Carbon Steel", "technic:carbon_steel_ingot")
@@ -114,10 +77,51 @@
register_dust("Mithril", "moreores:mithril_ingot")
register_dust("Silver", "moreores:silver_ingot")
register_dust("Stainless Steel", "technic:stainless_steel_ingot")
-register_dust("Talinite", "glooptest:talinite_ingot")
register_dust("Tin", "moreores:tin_ingot")
register_dust("Wrought Iron", "technic:wrought_iron_ingot")
register_dust("Zinc", "technic:zinc_ingot")
+if minetest.get_modpath("gloopores") or minetest.get_modpath("glooptest") then
+ register_dust("Akalin", "glooptest:akalin_ingot")
+ register_dust("Alatro", "glooptest:alatro_ingot")
+ register_dust("Arol", "glooptest:arol_ingot")
+ register_dust("Kalite", nil)
+ 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",
--
Gitblit v1.8.0