From 04a58a6a14b10eb8c043f560496b6ee8056fa216 Mon Sep 17 00:00:00 2001
From: Evert Prants <imsonotsleepy@gmail.com>
Date: Wed, 8 Aug 2018 18:05:11 +0300
Subject: [PATCH] Utility crafting recipes

---
 elepower_dynamics/crafting.lua | 27 ++++++++----
 elepower_machines/crafting.lua | 75 +++++++++++++++++++++++++++++-----
 2 files changed, 82 insertions(+), 20 deletions(-)

diff --git a/elepower_dynamics/crafting.lua b/elepower_dynamics/crafting.lua
index 4197ae4..2a3b6df 100644
--- a/elepower_dynamics/crafting.lua
+++ b/elepower_dynamics/crafting.lua
@@ -233,6 +233,15 @@ if easycrafting then
 			{"group:stone",  "elepower_dynamics:fluid_duct",  "group:stone"},
 		}
 	})
+
+	minetest.register_craft({
+		output = "elepower_dynamics:battery 2",
+		recipe = {
+			{"elepower_dynamics:zinc_dust", "elepower_dynamics:wound_copper_coil", "elepower_dynamics:lead_dust"},
+			{"elepower_dynamics:tin_plate", "default:mese_crystal_fragment", "elepower_dynamics:tin_plate"},
+			{"elepower_dynamics:tin_plate", "default:mese_crystal_fragment", "elepower_dynamics:tin_plate"},
+		}
+	})
 else
 	minetest.register_craft({
 		output = "elepower_dynamics:pcb_blank",
@@ -268,6 +277,15 @@ else
 			{"group:stone",  "elepower_dynamics:fluid_duct",  "group:stone"},
 		}
 	})
+
+	minetest.register_craft({
+		output = "elepower_dynamics:battery 2",
+		recipe = {
+			{"elepower_dynamics:zinc_dust", "elepower_dynamics:wound_copper_coil", "elepower_dynamics:lead_dust"},
+			{"elepower_dynamics:tin_plate", "default:mese_crystal", "elepower_dynamics:tin_plate"},
+			{"elepower_dynamics:tin_plate", "default:mese_crystal", "elepower_dynamics:tin_plate"},
+		}
+	})
 end
 
 minetest.register_craft({
@@ -288,15 +306,6 @@ minetest.register_craft({
 	}
 })
 
-minetest.register_craft({
-	output = "elepower_dynamics:battery 2",
-	recipe = {
-		{"elepower_dynamics:zinc_dust", "elepower_dynamics:wound_copper_coil", "elepower_dynamics:lead_dust"},
-		{"elepower_dynamics:tin_plate", "default:mese_crystal", "elepower_dynamics:tin_plate"},
-		{"elepower_dynamics:tin_plate", "default:mese_crystal", "elepower_dynamics:tin_plate"},
-	}
-})
-
 minetest.register_craft({
 	output = "elepower_dynamics:tin_can 8",
 	recipe = {
diff --git a/elepower_machines/crafting.lua b/elepower_machines/crafting.lua
index f936e04..70f7a68 100644
--- a/elepower_machines/crafting.lua
+++ b/elepower_machines/crafting.lua
@@ -87,18 +87,48 @@ for mat, data in pairs(elepd.registered_dusts) do
 end
 
 -- Other recipes
-elepm.register_craft({
-	type   = "grind",
-	recipe = { "farming:wheat" },
-	output = "farming:flour 2"
-})
 
-elepm.register_craft({
-	type   = "grind",
-	recipe = { "default:desert_sand 4" },
-	output = "elepower_dynamics:silicon",
-	time   = 8,
-})
+local grinding_recipes = {
+	{
+		recipe = { "farming:wheat" },
+		output = "farming:flour 2",
+		time   = 4,
+	},
+	{
+		recipe = { "default:desert_sand 4" },
+		output = "elepower_dynamics:silicon",
+	},
+	{
+		recipe = { "default:sand 4" },
+		output = "elepower_dynamics:silicon",
+	},
+	{
+		recipe = { "default:cobble" },
+		output = "default:gravel 4",
+	},
+	{
+		recipe = { "default:gravel" },
+		output = "default:sand 4",
+	},
+	{
+		recipe = { "default:mese" },
+		output = "default:mese_crystal 9",
+	},
+	{
+		recipe = { "default:mese_crystal" },
+		output = "default:mese_crystal_fragment 9",
+	}
+}
+
+-- Register solderer recipes
+for _,i in pairs(grinding_recipes) do
+	elepm.register_craft({
+		type   = "grind",
+		recipe = i.recipe,
+		output = i.output,
+		time   = i.time or 8,
+	})
+end
 
 -----------------
 -- Compressing --
@@ -130,6 +160,14 @@ for name in pairs(minetest.registered_nodes) do
 				time   = 1,
 			})
 
+			-- Also give a grinding recipe to get the sand back
+			elepm.register_craft({
+				type   = "grind",
+				recipe = { sandstone },
+				output = sand .. " 4",
+				time   = 5,
+			})
+
 			-- Find block as well
 			local ssblock = sandstone .. "_block"
 			if minetest.registered_nodes[ssblock] then
@@ -160,6 +198,20 @@ else
 	})
 end
 
+elepm.register_craft({
+	type   = "compress",
+	recipe = { "default:mese_crystal_fragment 9" },
+	output = "default:mese_crystal",
+	time   = 1,
+})
+
+elepm.register_craft({
+	type   = "compress",
+	recipe = { "default:mese_crystal 9" },
+	output = "default:mese",
+	time   = 1,
+})
+
 -------------
 -- Sawmill --
 -------------
@@ -199,6 +251,7 @@ end)
 ---------------
 -- Soldering --
 ---------------
+
 local induction_dust = "elepower_dynamics:viridisium_dust"
 if easycrafting then
 	induction_dust = "elepower_dynamics:zinc_dust"