From 90003b36dfb8024bcd0c567b239eadc948126fb0 Mon Sep 17 00:00:00 2001
From: Jordan Irwin <antumdeluge@gmail.com>
Date: Wed, 5 May 2021 17:38:39 -0700
Subject: [PATCH] Move antum:feather into antum_items mod

---
 mods/antum/core/items.lua                     |  20 ------------------
 mods/antum/items/animal.lua                   |   6 ++++++
 mods/antum/items/init.lua                     |   3 +++
 .../textures/antum_feather_white.png          | Bin
 mods/antum/spawneggs/mod.conf                 |   2 +-
 5 files changed, 10 insertions(+), 21 deletions(-)
 create mode 100644 mods/antum/items/animal.lua
 rename mods/antum/{core => items}/textures/antum_feather_white.png (100%)

diff --git a/mods/antum/core/items.lua b/mods/antum/core/items.lua
index b0a768a6..b32dec61 100644
--- a/mods/antum/core/items.lua
+++ b/mods/antum/core/items.lua
@@ -25,26 +25,6 @@
 --]]
 
 
--- Feather
-
---[[
-  The following mods have 'feather' items & should be added as soft dependencies to be overridden:
-    - mobs_animal
-    - animalmaterials
-]]
-
-local feathers = antum.getItemNames('feather')
-for index, feather in ipairs(feathers) do
-	antum.convertItemToAlias(feather, 'antum:feather')
-end
-
-core.register_craftitem(':antum:feather', {
-	description = 'Feather',
-	inventory_image = 'antum_feather_white.png',
-})
-core.register_alias('antum:feather_white', 'antum:feather')
-
-
 local depends_satisfied = true
 
 local depends = {
diff --git a/mods/antum/items/animal.lua b/mods/antum/items/animal.lua
new file mode 100644
index 00000000..6b85b9be
--- /dev/null
+++ b/mods/antum/items/animal.lua
@@ -0,0 +1,6 @@
+
+core.register_craftitem(":antum:feather", {
+	description = "Feather",
+	inventory_image = "antum_feather_white.png",
+})
+core.register_alias("antum:feather_white", "antum:feather")
diff --git a/mods/antum/items/init.lua b/mods/antum/items/init.lua
index 943c4087..add8c9a2 100644
--- a/mods/antum/items/init.lua
+++ b/mods/antum/items/init.lua
@@ -1,4 +1,7 @@
 
+antum.loadScript("animal")
+
+
 core.register_tool(":antum:sword_daemondeath", {
 	description = "Daemondeath Sword",
 	inventory_image = "antum_sword_daemondeath.png",
diff --git a/mods/antum/core/textures/antum_feather_white.png b/mods/antum/items/textures/antum_feather_white.png
similarity index 100%
rename from mods/antum/core/textures/antum_feather_white.png
rename to mods/antum/items/textures/antum_feather_white.png
diff --git a/mods/antum/spawneggs/mod.conf b/mods/antum/spawneggs/mod.conf
index b4990b96..de20a5ee 100644
--- a/mods/antum/spawneggs/mod.conf
+++ b/mods/antum/spawneggs/mod.conf
@@ -3,5 +3,5 @@ author = AntumDeluge
 description = Spawneggs for the Antum game
 license = MIT
 version = 0.1
-depends = antum, asm_spawneggs
+depends = antum, antum_items, asm_spawneggs
 optional_depends = default, wool, cmer_chicken, mobs_animal, spider, dirt_monster, mese_monster, sand_monster, tree_monster, dungeon_master