From b294ba619798a1f6e1f86adb694a84f3dce1e6d8 Mon Sep 17 00:00:00 2001
From: IamPyu <pyucreates@gmail.com>
Date: Sun, 29 Dec 2024 17:01:33 -0600
Subject: [PATCH] Add recipes for guns

---
 mods/ITEMS/pyutest_guns/api.lua  |  2 +-
 mods/ITEMS/pyutest_guns/init.lua | 21 +++++++++++++++++++++
 mods/ITEMS/pyutest_guns/mod.conf |  2 +-
 3 files changed, 23 insertions(+), 2 deletions(-)

diff --git a/mods/ITEMS/pyutest_guns/api.lua b/mods/ITEMS/pyutest_guns/api.lua
index 4f0b6cf..63b80f3 100644
--- a/mods/ITEMS/pyutest_guns/api.lua
+++ b/mods/ITEMS/pyutest_guns/api.lua
@@ -34,7 +34,7 @@ PyuTest.make_gun = function(name, desc, texture, cooldown, damage)
 	}, {
 		on_hit_node = function(self, pos, node) end,
 		on_hit_object = function(self, object)
-			if not self._owner:is_valid() then
+			if self._owner == nil or not self._owner:is_valid() then
 				return
 			end
 			PyuTest.deal_damage(object, damage, {
diff --git a/mods/ITEMS/pyutest_guns/init.lua b/mods/ITEMS/pyutest_guns/init.lua
index 40d8354..a1383fc 100644
--- a/mods/ITEMS/pyutest_guns/init.lua
+++ b/mods/ITEMS/pyutest_guns/init.lua
@@ -4,5 +4,26 @@ dofile(modpath .. "/api.lua")
 
 PyuTest.make_gun("pyutest_guns:flintlock", "Flintlock",
 	"pyutest-flintlock.png", 2, 6)
+
 PyuTest.make_gun("pyutest_guns:blunderbuss", "Blunderbuss", "pyutest-blunderbuss.png",
 	5, 12)
+
+core.register_craft({
+	output = "pyutest_guns:flintlock",
+	recipe = {
+		"pyutest_tools:gunpowder",
+		"pyutest_tools:flint",
+		"pyutest_tools:stick"
+	},
+	type = "shapeless",
+})
+
+core.register_craft({
+	output = "pyutest_guns:blunderbuss",
+	recipe = {
+		"pyutest_tools:gunpowder",
+		"pyutest_ores:iron_ingot",
+		"pyutest_tools:stick"
+	},
+	type = "shapeless",
+})
diff --git a/mods/ITEMS/pyutest_guns/mod.conf b/mods/ITEMS/pyutest_guns/mod.conf
index 966733e..42295ee 100644
--- a/mods/ITEMS/pyutest_guns/mod.conf
+++ b/mods/ITEMS/pyutest_guns/mod.conf
@@ -1 +1 @@
-depends = pyutest_tools,pyutest_projectiles
+depends = pyutest_tools,pyutest_projectiles,pyutest_ores