From 705961e2fe23678753de81b3034df946edc9ab9d Mon Sep 17 00:00:00 2001 From: SmallJoker <mk939@ymail.com> Date: Tue, 01 Nov 2022 20:27:26 +0100 Subject: [PATCH] Supply converter: Charge batteries again --- technic/machines/register/grinder_recipes.lua | 181 +++++++++++++++++++++++++++++++------------- 1 files changed, 127 insertions(+), 54 deletions(-) diff --git a/technic/machines/register/grinder_recipes.lua b/technic/machines/register/grinder_recipes.lua index 4f30f08..5adb4f0 100644 --- a/technic/machines/register/grinder_recipes.lua +++ b/technic/machines/register/grinder_recipes.lua @@ -1,71 +1,90 @@ -technic.grinder_recipes = {} +local S = technic.getter + +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 --- 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"}, - {"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:iron_dust 2"}, - {"default:steel_ingot", "technic:iron_dust 1"}, - {"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:chromium_ingot", "technic:chromium_dust 1"}, - {"technic:chromium_lump", "technic:chromium_dust 2"}, - {"technic:zinc_ingot", "technic:zinc_dust 1"}, - {"technic:zinc_lump", "technic:zinc_dust 2"}, - {"technic:brass_ingot", "technic:brass_dust 1"}, + -- Dusts + {"default:coal_lump", "technic:coal_dust 2"}, + {"default:copper_lump", "technic:copper_dust 2"}, + {"default:desert_stone", "default:desert_sand"}, + {"default:gold_lump", "technic:gold_dust 2"}, + {"default:iron_lump", "technic:wrought_iron_dust 2"}, + {"default: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"}, + {"technic:lead_lump", "technic:lead_dust 2"}, + {"technic:sulfur_lump", "technic:sulfur_dust 2"}, + {"default:stone", "technic:stone_dust"}, + {"default:sand", "technic:stone_dust"}, + {"default:desert_sand", "technic:stone_dust"}, + {"default:silver_sand", "technic:stone_dust"}, + + -- Other + {"default:cobble", "default:gravel"}, + {"default:gravel", "default:sand"}, + {"default:sandstone", "default:sand 2"}, -- reverse recipe can be found in the compressor + {"default:desert_sandstone", "default:desert_sand 2"}, -- reverse recipe can be found in the compressor + {"default:silver_sandstone", "default:silver_sand 2"}, -- reverse recipe can be found in the compressor + + {"default:ice", "default:snowblock"}, } + +-- defuse the sandstone -> 4 sand recipe to avoid infinite sand bugs (also consult the inverse compressor recipe) +minetest.clear_craft({ + recipe = { + {"default:sandstone"} + }, +}) +minetest.clear_craft({ + recipe = { + {"default:desert_sandstone"} + }, +}) +minetest.clear_craft({ + recipe = { + {"default:silver_sandstone"} + }, +}) + +if minetest.get_modpath("farming") then + table.insert(recipes, {"farming:seed_wheat", "farming:flour 1"}) +end + +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"}) +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 +-- dusts local function register_dust(name, ingot) local lname = string.lower(name) lname = string.gsub(lname, ' ', '_') minetest.register_craftitem("technic:"..lname.."_dust", { - description = name.." Dust", + description = S("%s Dust"):format(S(name)), inventory_image = "technic_"..lname.."_dust.png", - on_place_on_ground = minetest.craftitem_place_item, }) if ingot then minetest.register_craft({ @@ -73,28 +92,82 @@ 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("Brass", "basic_materials:brass_ingot") register_dust("Bronze", "default:bronze_ingot") +register_dust("Carbon Steel", "technic:carbon_steel_ingot") +register_dust("Cast Iron", "technic:cast_iron_ingot") +register_dust("Chernobylite", "technic:chernobylite_block") register_dust("Chromium", "technic:chromium_ingot") register_dust("Coal", nil) register_dust("Copper", "default:copper_ingot") +register_dust("Lead", "technic:lead_ingot") register_dust("Gold", "default:gold_ingot") -register_dust("Iron", "default:steel_ingot") 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("Stone", "default:stone") +register_dust("Sulfur", nil) +register_dust("Tin", "default: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", 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