Added mackerel item and reworked food values of most food items

hybridlabs · Nov 8, 2024 · 122f6f6 · 122f6f6
1 parent dffa4ad
commit 122f6f6
Show file tree

Hide file tree

Showing 14 changed files with 219 additions and 138 deletions.
diff --git a/src/generated/resources/assets/hybrid-aquatic/lang/en_us.json b/src/generated/resources/assets/hybrid-aquatic/lang/en_us.json
@@ -263,6 +263,7 @@
   "item.hybrid-aquatic.lions_mane_jellyfish_spawn_egg": "Lion's Mane Jellyfish Spawn Egg",
   "item.hybrid-aquatic.lobster_claw": "Lobster Claw",
   "item.hybrid-aquatic.lobster_spawn_egg": "Lobster Spawn Egg",
+  "item.hybrid-aquatic.mackerel": "Mackerel",
   "item.hybrid-aquatic.mackerel_spawn_egg": "Mackerel Spawn Egg",
   "item.hybrid-aquatic.magnetic_hook": "Magnetic Hook",
   "item.hybrid-aquatic.magnetic_hook.description": "Increases treasure chance",

diff --git a/src/generated/resources/assets/hybrid-aquatic/models/item/karkinos_spawn_egg.json b/src/generated/resources/assets/hybrid-aquatic/models/item/karkinos_spawn_egg.json
@@ -0,0 +1,3 @@
+{
+  "parent": "minecraft:item/template_spawn_egg"
+}
diff --git a/src/generated/resources/assets/hybrid-aquatic/models/item/mackerel.json b/src/generated/resources/assets/hybrid-aquatic/models/item/mackerel.json
@@ -0,0 +1,6 @@
+{
+  "parent": "minecraft:item/generated",
+  "textures": {
+    "layer0": "hybrid-aquatic:item/mackerel"
+  }
+}
diff --git a/src/generated/resources/data/hybrid-aquatic/loot_tables/entities/mackerel.json b/src/generated/resources/data/hybrid-aquatic/loot_tables/entities/mackerel.json
@@ -0,0 +1,34 @@
+{
+  "type": "minecraft:entity",
+  "pools": [
+    {
+      "bonus_rolls": 0.0,
+      "entries": [
+        {
+          "type": "minecraft:item",
+          "functions": [
+            {
+              "count": {
+                "type": "minecraft:uniform",
+                "max": 1.0,
+                "min": 0.0
+              },
+              "function": "minecraft:looting_enchant"
+            },
+            {
+              "add": false,
+              "count": {
+                "type": "minecraft:uniform",
+                "max": 1.0,
+                "min": 1.0
+              },
+              "function": "minecraft:set_count"
+            }
+          ],
+          "name": "hybrid-aquatic:mackerel"
+        }
+      ],
+      "rolls": 1.0
+    }
+  ]
+}
diff --git a/src/generated/resources/data/hybrid-aquatic/tags/items/small_fish.json b/src/generated/resources/data/hybrid-aquatic/tags/items/small_fish.json
@@ -25,6 +25,7 @@
     "hybrid-aquatic:gourami",
     "hybrid-aquatic:betta",
     "hybrid-aquatic:danio",
-    "hybrid-aquatic:neon_tetra"
+    "hybrid-aquatic:neon_tetra",
+    "hybrid-aquatic:mackerel"
   ]
 }
diff --git a/src/main/kotlin/dev/hybridlabs/aquatic/data/client/LanguageProvider.kt b/src/main/kotlin/dev/hybridlabs/aquatic/data/client/LanguageProvider.kt
@@ -134,6 +134,7 @@ class LanguageProvider(output: FabricDataOutput) : FabricLanguageProvider(output
             HybridAquaticItems.GOLDFISH to "Goldfish",
             HybridAquaticItems.MORAY_EEL to "Moray Eel",
             HybridAquaticItems.NEEDLEFISH to "Needlefish",
+            HybridAquaticItems.MACKEREL to "Mackerel",
             HybridAquaticItems.PIRANHA to "Piranha",
             HybridAquaticItems.ANGLERFISH to "Anglerfish",
             HybridAquaticItems.BARRELEYE to "Barreleye",

diff --git a/src/main/kotlin/dev/hybridlabs/aquatic/data/client/ModelProvider.kt b/src/main/kotlin/dev/hybridlabs/aquatic/data/client/ModelProvider.kt
@@ -146,6 +146,7 @@ class ModelProvider(output: FabricDataOutput) : FabricModelProvider(output) {
             HybridAquaticItems.MAHI,
             HybridAquaticItems.MORAY_EEL,
             HybridAquaticItems.NEEDLEFISH,
+            HybridAquaticItems.MACKEREL,
             HybridAquaticItems.OPAH,
             HybridAquaticItems.OARFISH,
             HybridAquaticItems.OSCAR,

diff --git a/src/main/kotlin/dev/hybridlabs/aquatic/data/server/loot/EntityTypeLootTableProvider.kt b/src/main/kotlin/dev/hybridlabs/aquatic/data/server/loot/EntityTypeLootTableProvider.kt
@@ -742,6 +742,17 @@ class EntityTypeLootTableProvider(output: FabricDataOutput) : SimpleFabricLootTa
             )
         }
 
+        export(exporter, HybridAquaticEntityTypes.MACKEREL) {
+            pool(
+                LootPool.builder()
+                    .with(
+                        ItemEntry.builder(HybridAquaticItems.MACKEREL)
+                            .apply(LootingEnchantLootFunction.builder(UniformLootNumberProvider.create(0.0F, 1.0F)))
+                            .apply(SetCountLootFunction.builder(UniformLootNumberProvider.create(1.0F, 1.0F)))
+                    )
+            )
+        }
+
         export(exporter, HybridAquaticEntityTypes.TRIGGERFISH) {
             pool(
                 LootPool.builder()

diff --git a/src/main/kotlin/dev/hybridlabs/aquatic/data/server/tag/ItemTagProvider.kt b/src/main/kotlin/dev/hybridlabs/aquatic/data/server/tag/ItemTagProvider.kt
@@ -109,6 +109,7 @@ class ItemTagProvider(output: FabricDataOutput, registriesFuture: CompletableFut
             HybridAquaticItems.BETTA,
             HybridAquaticItems.DANIO,
             HybridAquaticItems.NEON_TETRA,
+            HybridAquaticItems.MACKEREL,
         ).forEach { item ->
             getOrCreateTagBuilder(HybridAquaticItemTags.SMALL_FISH).add(item)
         }

diff --git a/src/main/kotlin/dev/hybridlabs/aquatic/item/HybridAquaticItemGroups.kt b/src/main/kotlin/dev/hybridlabs/aquatic/item/HybridAquaticItemGroups.kt
@@ -151,6 +151,7 @@ object  HybridAquaticItemGroups {
             entries.add(HybridAquaticItems.ROCKFISH)
             entries.add(HybridAquaticItems.SEA_BASS)
             entries.add(HybridAquaticItems.NEEDLEFISH)
+            entries.add(HybridAquaticItems.MACKEREL)
             entries.add(HybridAquaticItems.TUNA)
             entries.add(HybridAquaticItems.MAHI)
             entries.add(HybridAquaticItems.TOADFISH)