From 6b3fb6b0b4a6e3d97ca4b6c6173f62ab54cff236 Mon Sep 17 00:00:00 2001
From: Jordan Irwin <antumdeluge@gmail.com>
Date: Sun, 16 May 2021 18:44:35 -0700
Subject: [PATCH] Move craft recipes into crafts.lua

---
 crafts.lua | 53 +++++++++++++++++++++++++++++++++++++++++++++++++++++
 init.lua   |  1 +
 tools.lua  | 43 -------------------------------------------
 3 files changed, 54 insertions(+), 43 deletions(-)
 create mode 100644 crafts.lua

diff --git a/crafts.lua b/crafts.lua
new file mode 100644
index 0000000..2dbe47c
--- /dev/null
+++ b/crafts.lua
@@ -0,0 +1,53 @@
+
+local S = core.get_translator(alternode.modname)
+
+
+-- pencil
+local pencil = {
+	lead = "technic:lead_lump",
+	stick = "group:stick",
+	rubber = "technic:rubber",
+}
+
+-- FIXME: how to check if items are registered under "group:stick"
+if core.global_exists("default") and
+		core.registered_items[pencil.lead] and core.registered_items[pencil.rubber] then
+	core.register_craft({
+		output = alternode.modname .. ":pencil",
+		recipe = {
+			{"", "", pencil.lead},
+			{"", pencil.stick, ""},
+			{pencil.rubber, "", ""},
+		},
+	})
+end
+
+
+-- wand
+local wand = {
+	head = nil,
+	handle = nil,
+}
+
+if core.registered_items["gems_encrustable:aquamarine"] then
+	wand.head = "gems_encrustable:aquamarine"
+elseif core.registered_items["gems:aquamarine"] then
+	wand.head = "gems:aquamarine"
+end
+
+if core.registered_items["gems_encrustable:opal"] then
+	wand.handle = "gems_encrustable:opal"
+elseif core.registered_items["gems:opal"] then
+	wand.handle = "gems:opal"
+end
+
+if wand.head and wand.handle then
+	core.register_craft({
+		output = alternode.modname .. ":wand",
+		recipe = {
+			{"", "", wand.head},
+			{"", wand.handle, ""},
+			{wand.handle, "", ""},
+		},
+	})
+end
diff --git a/init.lua b/init.lua
index c9b48a4..888b135 100644
--- a/init.lua
+++ b/init.lua
@@ -8,6 +8,7 @@ local scripts = {
 	"commands",
 	"formspec",
 	"tools",
+	"crafts",
 }
 
 for _, script in ipairs(scripts) do
diff --git a/tools.lua b/tools.lua
index 769dc49..921a48c 100644
--- a/tools.lua
+++ b/tools.lua
@@ -137,20 +137,6 @@ core.register_craftitem(alternode.modname .. ":pencil", {
 })
 
 
--- craft recipe
--- FIXME: don't need to depend on default if "group:stick" exists
-if core.global_exists("default") and core.global_exists("technic") then
-	core.register_craft({
-		output = alternode.modname .. ":pencil",
-		recipe = {
-			{"", "", "technic:lead_lump"},
-			{"", "group:stick", ""},
-			{"technic:rubber", "", ""},
-		},
-	})
-end
-
-
 core.register_on_player_receive_fields(function(player, formname, fields)
 	if formname == alternode.modname .. ":pencil" then
 		-- FIXME: how to get node meta without storing in player meta?
@@ -229,32 +215,3 @@ core.register_craftitem(alternode.modname .. ":wand", {
 	end,
 })
 core.register_alias("ownit:wand", alternode.modname .. ":wand")
-
--- crafting of wand
-local wand = {
-	ing_head = nil,
-	ing_handle = nil,
-}
-
-if core.registered_items["gems_encrustable:aquamarine"] then
-	wand.ing_head = "gems_encrustable:aquamarine"
-elseif core.registered_items["gems:aquamarine"] then
-	wand.ing_head = "gems:aquamarine"
-end
-
-if core.registered_items["gems_encrustable:opal"] then
-	wand.ing_handle = "gems_encrustable:opal"
-elseif core.registered_items["gems:opal"] then
-	wand.ing_handle = "gems:opal"
-end
-
-if wand.ing_head and wand.ing_handle then
-	core.register_craft({
-		output = alternode.modname .. ":wand",
-		recipe = {
-			{"", "", wand.ing_head},
-			{"", wand.ing_handle, ""},
-			{wand.ing_handle, "", ""},
-		},
-	})
-end