From a06670b02f3f795ca4454fc38da7adf2a04e29d3 Mon Sep 17 00:00:00 2001
From: Wuzzy <almikes@aol.com>
Date: Wed, 26 Jul 2017 19:35:56 +0200
Subject: [PATCH] Soften dependencies in mcl_throwing

---
 mods/ITEMS/mcl_throwing/arrow.lua   | 25 ++++++++++++---------
 mods/ITEMS/mcl_throwing/depends.txt |  8 ++++---
 mods/ITEMS/mcl_throwing/init.lua    | 34 +++++++++++++++--------------
 3 files changed, 38 insertions(+), 29 deletions(-)

diff --git a/mods/ITEMS/mcl_throwing/arrow.lua b/mods/ITEMS/mcl_throwing/arrow.lua
index 0f5bbcc6..3cb3368e 100644
--- a/mods/ITEMS/mcl_throwing/arrow.lua
+++ b/mods/ITEMS/mcl_throwing/arrow.lua
@@ -1,3 +1,6 @@
+local mod_mcl_hunger = minetest.get_modpath("mcl_hunger")
+local mod_awards = minetest.get_modpath("awards") and minetest.get_modpath("mcl_achievements")
+
 minetest.register_craftitem("mcl_throwing:arrow", {
 	description = "Arrow",
 	_doc_items_longdesc = "Arrows are ammunition for bows and dispensers.",
@@ -90,7 +93,7 @@ THROWING_ARROW_ENTITY.on_step = function(self, dtime)
 					full_punch_interval=1.0,
 					damage_groups={fleshy=self._damage},
 				}, nil)
-				if is_player then
+				if mod_mcl_hunger and is_player then
 					mcl_hunger.exhaust(obj:get_player_name(), mcl_hunger.EXHAUST_DAMAGE)
 				end
 
@@ -100,7 +103,7 @@ THROWING_ARROW_ENTITY.on_step = function(self, dtime)
 					-- NOTE: Range has been reduced because mobs unload much earlier than that ... >_>
 					-- TODO: This achievement should be given for the kill, not just a hit
 					if self._shooter and self._shooter:is_player() and vector.distance(pos, self._startpos) >= 20 then
-						if (entity_name == "mobs_mc:skeleton" or entity_name == "mobs_mc:stray" or entity_name == "mobs_mc:witherskeleton") then
+						if mod_awards and (entity_name == "mobs_mc:skeleton" or entity_name == "mobs_mc:stray" or entity_name == "mobs_mc:witherskeleton") then
 							awards.unlock(self._shooter:get_player_name(), "mcl:snipeSkeleton")
 						end
 					end
@@ -127,11 +130,13 @@ end
 
 minetest.register_entity("mcl_throwing:arrow_entity", THROWING_ARROW_ENTITY)
 
-minetest.register_craft({
-	output = 'mcl_throwing:arrow 4',
-	recipe = {
-		{'mcl_core:flint'},
-		{'mcl_core:stick'},
-		{'mcl_mobitems:feather'}
-	}
-})
+if minetest.get_modpath("mcl_core") and minetest.get_modpath("mcl_mobitems") then
+	minetest.register_craft({
+		output = 'mcl_throwing:arrow 4',
+		recipe = {
+			{'mcl_core:flint'},
+			{'mcl_core:stick'},
+			{'mcl_mobitems:feather'}
+		}
+	})
+end
diff --git a/mods/ITEMS/mcl_throwing/depends.txt b/mods/ITEMS/mcl_throwing/depends.txt
index 2a2a5533..32b32db0 100644
--- a/mods/ITEMS/mcl_throwing/depends.txt
+++ b/mods/ITEMS/mcl_throwing/depends.txt
@@ -1,4 +1,6 @@
-mcl_core
-mcl_hunger
-mcl_achievements
+awards?
+mcl_achievements?
+mcl_hunger?
+mcl_core?
+mcl_mobitems?
 doc?
diff --git a/mods/ITEMS/mcl_throwing/init.lua b/mods/ITEMS/mcl_throwing/init.lua
index f8bee63e..3288ac4c 100644
--- a/mods/ITEMS/mcl_throwing/init.lua
+++ b/mods/ITEMS/mcl_throwing/init.lua
@@ -191,22 +191,24 @@ minetest.register_tool("mcl_throwing:bow_2", {
 	end,
 })
 
-minetest.register_craft({
-	output = 'mcl_throwing:bow',
-	recipe = {
-		{'', 'mcl_core:stick', 'mcl_mobitems:string'},
-		{'mcl_core:stick', '', 'mcl_mobitems:string'},
-		{'', 'mcl_core:stick', 'mcl_mobitems:string'},
-	}
-})
-minetest.register_craft({
-	output = 'mcl_throwing:bow',
-	recipe = {
-		{'mcl_mobitems:string', 'mcl_core:stick', ''},
-		{'mcl_mobitems:string', '', 'mcl_core:stick'},
-		{'mcl_mobitems:string', 'mcl_core:stick', ''},
-	}
-})
+if minetest.get_modpath("mcl_core") and minetest.get_modpath("mcl_mobitems") then
+	minetest.register_craft({
+		output = 'mcl_throwing:bow',
+		recipe = {
+			{'', 'mcl_core:stick', 'mcl_mobitems:string'},
+			{'mcl_core:stick', '', 'mcl_mobitems:string'},
+			{'', 'mcl_core:stick', 'mcl_mobitems:string'},
+		}
+	})
+	minetest.register_craft({
+		output = 'mcl_throwing:bow',
+		recipe = {
+			{'mcl_mobitems:string', 'mcl_core:stick', ''},
+			{'mcl_mobitems:string', '', 'mcl_core:stick'},
+			{'mcl_mobitems:string', 'mcl_core:stick', ''},
+		}
+	})
+end
 
 minetest.register_craft({
 	type = "fuel",