From 5b97d94dae40fc638098dd674023a513dd992bf4 Mon Sep 17 00:00:00 2001 From: DS Date: Fri, 5 Oct 2018 19:46:33 +0200 Subject: [PATCH] New sandstone crafts, fix dye crafting (#390) --- .../machines/register/compressor_recipes.lua | 19 +++++++++++++--- .../machines/register/extractor_recipes.lua | 22 ++++++++++++++----- technic/machines/register/grinder_recipes.lua | 22 ++++++++++++++----- 3 files changed, 50 insertions(+), 13 deletions(-) diff --git a/technic/machines/register/compressor_recipes.lua b/technic/machines/register/compressor_recipes.lua index a625f1a..acb9eca 100644 --- a/technic/machines/register/compressor_recipes.lua +++ b/technic/machines/register/compressor_recipes.lua @@ -11,6 +11,8 @@ end local recipes = { {"default:snowblock", "default:ice"}, {"default:sand 2", "default:sandstone"}, + {"default:desert_sand 2", "default:desert_sandstone"}, + {"default:silver_sand 2", "default:silver_sandstone"}, {"default:desert_sand", "default:desert_stone"}, {"technic:mixed_metal_ingot", "technic:composite_plate"}, {"default:copper_ingot 5", "technic:copper_plate"}, @@ -21,10 +23,21 @@ local recipes = { -- defuse the default sandstone recipe, since we have the compressor to take over in a more realistic manner minetest.clear_craft({ - output = "default:sandstone", recipe = { - {'group:sand', 'group:sand'}, - {'group:sand', 'group:sand'} + {"default:sand", "default:sand"}, + {"default:sand", "default:sand"}, + }, +}) +minetest.clear_craft({ + recipe = { + {"default:desert_sand", "default:desert_sand"}, + {"default:desert_sand", "default:desert_sand"}, + }, +}) +minetest.clear_craft({ + recipe = { + {"default:silver_sand", "default:silver_sand"}, + {"default:silver_sand", "default:silver_sand"}, }, }) diff --git a/technic/machines/register/extractor_recipes.lua b/technic/machines/register/extractor_recipes.lua index 1de0ba0..54baa61 100644 --- a/technic/machines/register/extractor_recipes.lua +++ b/technic/machines/register/extractor_recipes.lua @@ -36,13 +36,21 @@ if minetest.get_modpath("dye") then -- overwrite the existing crafting recipes local dyes = {"white", "red", "yellow", "blue", "violet", "orange"} for _, color in ipairs(dyes) do - minetest.register_craft({ - type = "shapeless", - output = "dye:"..color.." 1", - recipe = {"group:flower,color_"..color}, + minetest.clear_craft({ + type = "shapeless", + recipe = {"group:flower,color_"..color}, + }) + minetest.register_craft({ + type = "shapeless", + output = "dye:"..color.." 1", + recipe = {"group:flower,color_"..color}, }) - end + + minetest.clear_craft({ + type = "shapeless", + recipe = {"group:coal"}, + }) minetest.register_craft({ type = "shapeless", output = "dye:black 1", @@ -50,6 +58,10 @@ if minetest.get_modpath("dye") then }) if unifieddyes then + minetest.clear_craft({ + type = "shapeless", + recipe = {"default:cactus"}, + }) minetest.register_craft({ type = "shapeless", output = "dye:green 1", diff --git a/technic/machines/register/grinder_recipes.lua b/technic/machines/register/grinder_recipes.lua index 1f4047c..8c8e178 100644 --- a/technic/machines/register/grinder_recipes.lua +++ b/technic/machines/register/grinder_recipes.lua @@ -23,17 +23,29 @@ local recipes = { {"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: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.clear_craft({ recipe = { - {'default:sandstone'} + {"default:sandstone"} + }, +}) +minetest.clear_craft({ + recipe = { + {"default:desert_sandstone"} + }, +}) +minetest.clear_craft({ + recipe = { + {"default:silver_sandstone"} }, })