From 46d18af8d6a596a65c0107133f5f9e98af554da7 Mon Sep 17 00:00:00 2001
From: Sollace <sollacea@gmail.com>
Date: Mon, 23 Aug 2021 15:37:44 +0200
Subject: [PATCH] Added butterfly as a food item

---
 .../minelittlepony/unicopia/item/UItems.java  |   1 +
 .../resources/assets/unicopia/lang/en_us.json |   1 +
 .../unicopia/models/item/butterfly.json       |   6 +++++
 .../unicopia/textures/item/butterfly.png      | Bin 0 -> 559 bytes
 .../loot_tables/entities/butterfly.json       |  25 ++++++++++++++++++
 .../tags/items/food_types/raw_insect.json     |   3 ++-
 6 files changed, 35 insertions(+), 1 deletion(-)
 create mode 100644 src/main/resources/assets/unicopia/models/item/butterfly.json
 create mode 100644 src/main/resources/assets/unicopia/textures/item/butterfly.png
 create mode 100644 src/main/resources/data/unicopia/loot_tables/entities/butterfly.json

diff --git a/src/main/java/com/minelittlepony/unicopia/item/UItems.java b/src/main/java/com/minelittlepony/unicopia/item/UItems.java
index 3e36436b..c0020ace 100644
--- a/src/main/java/com/minelittlepony/unicopia/item/UItems.java
+++ b/src/main/java/com/minelittlepony/unicopia/item/UItems.java
@@ -75,6 +75,7 @@ public interface UItems {
     Item GOLDEN_WING = register("golden_wing", new Item(new Item.Settings().rarity(Rarity.UNCOMMON).group(ItemGroup.MATERIALS)));
 
     Item BUTTERFLY_SPAWN_EGG = register("butterfly_spawn_egg", new SpawnEggItem(UEntities.BUTTERFLY, 0x222200, 0xaaeeff, new Item.Settings().group(ItemGroup.MISC)));
+    Item BUTTERFLY = register("butterfly", new Item(new Item.Settings().group(ItemGroup.FOOD).food(UFoodComponents.INSECTS)));
 
     AmuletItem PEGASUS_AMULET = register("pegasus_amulet", new AmuletItem(new FabricItemSettings()
             .maxCount(1)
diff --git a/src/main/resources/assets/unicopia/lang/en_us.json b/src/main/resources/assets/unicopia/lang/en_us.json
index d2d8c94e..574024cf 100644
--- a/src/main/resources/assets/unicopia/lang/en_us.json
+++ b/src/main/resources/assets/unicopia/lang/en_us.json
@@ -16,6 +16,7 @@
   "item.unicopia.friendship_bracelet.glowing": "Glowing",
 
   "item.unicopia.butterfly_spawn_egg": "Butterfly Spawn Egg",
+  "item.unicopia.butterfly": "Butterfly",
 
   "item.unicopia.green_apple": "Granny Smith Apple",
   "item.unicopia.sweet_apple": "Sweet Apple Acres Apple",
diff --git a/src/main/resources/assets/unicopia/models/item/butterfly.json b/src/main/resources/assets/unicopia/models/item/butterfly.json
new file mode 100644
index 00000000..9ec18ca8
--- /dev/null
+++ b/src/main/resources/assets/unicopia/models/item/butterfly.json
@@ -0,0 +1,6 @@
+{
+    "parent": "unicopia:item/mug",
+    "textures": {
+        "layer0": "unicopia:item/butterfly"
+    }
+}
diff --git a/src/main/resources/assets/unicopia/textures/item/butterfly.png b/src/main/resources/assets/unicopia/textures/item/butterfly.png
new file mode 100644
index 0000000000000000000000000000000000000000..35e5ebd6644a201f3620d403ea235e6a8556e4d5
GIT binary patch
literal 559
zcmV+~0?_@5P)<h;3K|Lk000e1NJLTq000mG000mO1^@s6AM^iV0005@Nkl<ZILob)
zZEw<G6o#+!l&&CMTc$)8jp-zl__8f=8h?TM_xC|23n3v27-4TMRMwUD_+i3EnBP2K
zp0}Jk&wXD<xThL*XR+PL^E~aH&xL=~^5L0h5CPx!6ks-+36SS`Zn7+wTFqbFo9;N(
zMW1QZ9iDCqUp{?YHotz=0MIne9Ds6pLl5?w`XYQnrBW&G{=js{DO+0sqth88!p=@e
z*%1!ky~X#d8Ni44`=E1CdBAi!{jp-<aQ89W+uQVdJq^Q<nqT4~nq!P0%(=Ks@O_V>
zfWWgjJ-=cw81VJ`r2v@GXoO{109cmAB*`fhibBZ?gXejuLZxhoCON9Q5~2}V4R}6R
z9@R=K8LNVA-w(pLu8T3|=3tB#MZxb`vBoNjZZaAUhpPg|{g_UtLl}nA>2$;x!&O?W
zv9?MMB0>~J!-anUY1AE(B&Aw)BuUc!&CSYDv)No97!lg-Hl1HHS;H6vE(ZsD8U*gq
z-rk#gy{anBm%F<2&>pP_0NA!owQ{>I=hz0z+y)u=8=|W5nm`=KOcF&^nIyNEzO}o=
zlj&azF!&kax^81l;QBhJ)jH<v?9ytrjwzK&oSdAHW!dL`zmIL(8pko?@tC^-E<rcy
x4&8Ce^WX-j=XnZ99LG40gX1^~tTq3a`U6GZ+}TQcR~-NV002ovPDHLkV1m8@3Y`D|

literal 0
HcmV?d00001

diff --git a/src/main/resources/data/unicopia/loot_tables/entities/butterfly.json b/src/main/resources/data/unicopia/loot_tables/entities/butterfly.json
new file mode 100644
index 00000000..9992d4bd
--- /dev/null
+++ b/src/main/resources/data/unicopia/loot_tables/entities/butterfly.json
@@ -0,0 +1,25 @@
+{
+  "type": "minecraft:entity",
+  "pools": [
+    {
+      "rolls": 1,
+      "bonus_rolls": 0,
+      "entries": [
+        {
+          "type": "minecraft:item",
+          "functions": [
+            {
+              "function": "minecraft:looting_enchant",
+              "count": {
+                "type": "minecraft:uniform",
+                "min": 0.0,
+                "max": 1.0
+              }
+            }
+          ],
+          "name": "unicopia:butterfly"
+        }
+      ]
+    }
+  ]
+}
\ No newline at end of file
diff --git a/src/main/resources/data/unicopia/tags/items/food_types/raw_insect.json b/src/main/resources/data/unicopia/tags/items/food_types/raw_insect.json
index be6db0b2..4a791552 100644
--- a/src/main/resources/data/unicopia/tags/items/food_types/raw_insect.json
+++ b/src/main/resources/data/unicopia/tags/items/food_types/raw_insect.json
@@ -2,6 +2,7 @@
   "replace": false,
   "values": [
     "minecraft:spider_eye",
-    "unicopia:wheat_worms"
+    "unicopia:wheat_worms",
+    "unicopia:butterfly"
   ]
 }