From 701240bc3a17a73d73f3a96cd81e559d662ac42c Mon Sep 17 00:00:00 2001
From: Thomas Rudin <thomas@rudin.li>
Date: Sun, 09 Dec 2018 16:01:10 +0100
Subject: [PATCH] Quarry: Check for valid facedir to fix server freeze #465 (#466)
---
technic/machines/register/grinder_recipes.lua | 62 ++++++++++++++++++------------
1 files changed, 37 insertions(+), 25 deletions(-)
diff --git a/technic/machines/register/grinder_recipes.lua b/technic/machines/register/grinder_recipes.lua
index 4f544e9..da90aad 100644
--- a/technic/machines/register/grinder_recipes.lua
+++ b/technic/machines/register/grinder_recipes.lua
@@ -10,27 +10,42 @@
local recipes = {
-- 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"},
- {"technic:chromium_lump", "technic:chromium_dust 2"},
- {"technic:uranium_lump", "technic:uranium_dust 2"},
- {"technic:zinc_lump", "technic:zinc_dust 2"},
-
+ {"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"},
+
-- Other
- {"default:cobble", "default:gravel"},
- {"default:gravel", "default:dirt"},
- {"default:stone", "default:sand"},
- {"default:sandstone", "default:sand 2"}, -- reverse recipe can be found in the compressor
+ {"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
}
-- defuse the sandstone -> 4 sand recipe to avoid infinite sand bugs (also consult the inverse compressor recipe)
-minetest.register_craft({
- output = "default:sandstone 0",
+minetest.clear_craft({
recipe = {
- {'default:sandstone'}
+ {"default:sandstone"}
+ },
+})
+minetest.clear_craft({
+ recipe = {
+ {"default:desert_sandstone"}
+ },
+})
+minetest.clear_craft({
+ recipe = {
+ {"default:silver_sandstone"}
},
})
@@ -41,7 +56,6 @@
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
@@ -58,12 +72,6 @@
for _, data in pairs(recipes) do
technic.register_grinder_recipe({input = {data[1]}, output = data[2]})
-end
-
--- defuse common grinder unfriendly recipes
-if minetest.get_modpath("fake_fire") then -- from homedecor_modpack
- minetest.register_craft({ output='default:cobble', recipe={{'default:cobble 0'}}})
- minetest.register_craft({ output='default:gravel', recipe={{'default:gravel 0'}}})
end
-- dusts
@@ -85,18 +93,22 @@
end
-- Sorted alphibeticaly
-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("Mithril", "moreores:mithril_ingot")
register_dust("Silver", "moreores:silver_ingot")
register_dust("Stainless Steel", "technic:stainless_steel_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
--
Gitblit v1.8.0