Updated Tetra item to Neon Tetra, and fixed missing language entry

hybridlabs · Jun 30, 2024 · 51eb295 · 51eb295
1 parent 199634c
commit 51eb295
Show file tree

Hide file tree

Showing 14 changed files with 15 additions and 13 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
@@ -260,6 +260,7 @@
   "item.hybrid-aquatic.nautilus_spawn_egg": "Nautilus Spawn Egg",
   "item.hybrid-aquatic.needlefish": "Needlefish",
   "item.hybrid-aquatic.needlefish_spawn_egg": "Needlefish Spawn Egg",
+  "item.hybrid-aquatic.neon_tetra": "Neon Tetra",
   "item.hybrid-aquatic.nomura_jellyfish_spawn_egg": "Nomura Jellyfish Spawn Egg",
   "item.hybrid-aquatic.nudibranch_spawn_egg": "Nudibranch Spawn Egg",
   "item.hybrid-aquatic.oarfish_spawn_egg": "Oarfish Spawn Egg",

diff --git a/...ets/hybrid-aquatic/models/item/tetra.json → ...ybrid-aquatic/models/item/neon_tetra.json b/...ets/hybrid-aquatic/models/item/tetra.json → ...ybrid-aquatic/models/item/neon_tetra.json
@@ -1,6 +1,6 @@
 {
   "parent": "minecraft:item/generated",
   "textures": {
-    "layer0": "hybrid-aquatic:item/tetra"
+    "layer0": "hybrid-aquatic:item/neon_tetra"
   }
 }
diff --git a/src/generated/resources/data/c/tags/items/foods/raw_fishes.json b/src/generated/resources/data/c/tags/items/foods/raw_fishes.json
@@ -21,7 +21,7 @@
     "hybrid-aquatic:piranha",
     "hybrid-aquatic:ratfish",
     "hybrid-aquatic:rockfish",
-    "hybrid-aquatic:tetra",
+    "hybrid-aquatic:neon_tetra",
     "hybrid-aquatic:tiger_barb",
     "hybrid-aquatic:triggerfish",
     "hybrid-aquatic:tuna",

diff --git a/src/generated/resources/data/hybrid-aquatic/loot_tables/gameplay/fishing/fish.json b/src/generated/resources/data/hybrid-aquatic/loot_tables/gameplay/fishing/fish.json
@@ -36,7 +36,7 @@
         },
         {
           "type": "minecraft:item",
-          "name": "hybrid-aquatic:tetra",
+          "name": "hybrid-aquatic:neon_tetra",
           "weight": 5
         },
         {

diff --git a/src/generated/resources/data/hybrid-aquatic/tags/items/crustacean_tempt_items.json b/src/generated/resources/data/hybrid-aquatic/tags/items/crustacean_tempt_items.json
@@ -28,7 +28,7 @@
     "hybrid-aquatic:piranha",
     "hybrid-aquatic:ratfish",
     "hybrid-aquatic:rockfish",
-    "hybrid-aquatic:tetra",
+    "hybrid-aquatic:neon_tetra",
     "hybrid-aquatic:tiger_barb",
     "hybrid-aquatic:triggerfish",
     "hybrid-aquatic:tuna",

diff --git a/src/generated/resources/data/minecraft/tags/items/fishes.json b/src/generated/resources/data/minecraft/tags/items/fishes.json
@@ -17,7 +17,7 @@
     "hybrid-aquatic:lionfish",
     "hybrid-aquatic:moray_eel",
     "hybrid-aquatic:piranha",
-    "hybrid-aquatic:tetra",
+    "hybrid-aquatic:neon_tetra",
     "hybrid-aquatic:danio",
     "hybrid-aquatic:gourami",
     "hybrid-aquatic:betta",

diff --git a/src/main/kotlin/dev/hybridlabs/aquatic/data/client/LanguageProvider.kt b/src/main/kotlin/dev/hybridlabs/aquatic/data/client/LanguageProvider.kt
@@ -112,6 +112,7 @@ class LanguageProvider(output: FabricDataOutput) : FabricLanguageProvider(output
             HybridAquaticItems.RAW_CRAYFISH to "Raw Crayfish",
             HybridAquaticItems.COOKED_CRAYFISH to "Cooked Crayfish",
             HybridAquaticItems.LIONFISH to "Lionfish",
+            HybridAquaticItems.NEON_TETRA to "Neon Tetra",
             HybridAquaticItems.MAHI_MAHI to "Mahi Mahi",
             HybridAquaticItems.TUNA to "Tuna",
             HybridAquaticItems.OPAH to "Opah",

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,7 +146,7 @@ class ModelProvider(output: FabricDataOutput) : FabricModelProvider(output) {
             HybridAquaticItems.PIRANHA,
             HybridAquaticItems.RATFISH,
             HybridAquaticItems.ROCKFISH,
-            HybridAquaticItems.TETRA,
+            HybridAquaticItems.NEON_TETRA,
             HybridAquaticItems.TIGER_BARB,
             HybridAquaticItems.TRIGGERFISH,
             HybridAquaticItems.TUNA,

diff --git a/src/main/kotlin/dev/hybridlabs/aquatic/data/server/loot/FishingLootTableProvider.kt b/src/main/kotlin/dev/hybridlabs/aquatic/data/server/loot/FishingLootTableProvider.kt
@@ -46,7 +46,7 @@ class FishingLootTableProvider(output: FabricDataOutput) : SimpleFabricLootTable
                                 .weight(5)
                         )
                         .with(
-                            ItemEntry.builder(HybridAquaticItems.TETRA)
+                            ItemEntry.builder(HybridAquaticItems.NEON_TETRA)
                                 .weight(5)
                         )
                         .with(

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
@@ -108,7 +108,7 @@ class ItemTagProvider(output: FabricDataOutput, registriesFuture: CompletableFut
             HybridAquaticItems.PIRANHA,
             HybridAquaticItems.RATFISH,
             HybridAquaticItems.ROCKFISH,
-            HybridAquaticItems.TETRA,
+            HybridAquaticItems.NEON_TETRA,
             HybridAquaticItems.TIGER_BARB,
             HybridAquaticItems.TRIGGERFISH,
             HybridAquaticItems.TUNA,
@@ -164,7 +164,7 @@ class ItemTagProvider(output: FabricDataOutput, registriesFuture: CompletableFut
             HybridAquaticItems.PIRANHA,
             HybridAquaticItems.RATFISH,
             HybridAquaticItems.ROCKFISH,
-            HybridAquaticItems.TETRA,
+            HybridAquaticItems.NEON_TETRA,
             HybridAquaticItems.TIGER_BARB,
             HybridAquaticItems.TRIGGERFISH,
             HybridAquaticItems.TUNA,
@@ -199,7 +199,7 @@ class ItemTagProvider(output: FabricDataOutput, registriesFuture: CompletableFut
             HybridAquaticItems.LIONFISH,
             HybridAquaticItems.MORAY_EEL,
             HybridAquaticItems.PIRANHA,
-            HybridAquaticItems.TETRA,
+            HybridAquaticItems.NEON_TETRA,
             HybridAquaticItems.DANIO,
             HybridAquaticItems.GOURAMI,
             HybridAquaticItems.BETTA,

diff --git a/src/main/kotlin/dev/hybridlabs/aquatic/enchantment/LiveCatchEnchantment.kt b/src/main/kotlin/dev/hybridlabs/aquatic/enchantment/LiveCatchEnchantment.kt
@@ -44,7 +44,7 @@ class LiveCatchEnchantment : Enchantment(Rarity.RARE, EnchantmentTarget.FISHING_
             HybridAquaticItems.TRIGGERFISH to HybridAquaticEntityTypes.TRIGGERFISH,
             HybridAquaticItems.TIGER_BARB to HybridAquaticEntityTypes.TIGER_BARB,
             HybridAquaticItems.BETTA to HybridAquaticEntityTypes.BETTA,
-            HybridAquaticItems.TETRA to HybridAquaticEntityTypes.TETRA,
+            HybridAquaticItems.NEON_TETRA to HybridAquaticEntityTypes.TETRA,
             HybridAquaticItems.DANIO to HybridAquaticEntityTypes.DANIO,
             HybridAquaticItems.DISCUS to HybridAquaticEntityTypes.DISCUS,
             HybridAquaticItems.RATFISH to HybridAquaticEntityTypes.RATFISH,

diff --git a/src/main/kotlin/dev/hybridlabs/aquatic/item/HybridAquaticItemGroups.kt b/src/main/kotlin/dev/hybridlabs/aquatic/item/HybridAquaticItemGroups.kt
@@ -138,7 +138,7 @@ object HybridAquaticItemGroups {
             entries.add(HybridAquaticItems.PIRANHA)
             entries.add(HybridAquaticItems.RATFISH)
             entries.add(HybridAquaticItems.ROCKFISH)
-            entries.add(HybridAquaticItems.TETRA)
+            entries.add(HybridAquaticItems.NEON_TETRA)
             entries.add(HybridAquaticItems.TIGER_BARB)
             entries.add(HybridAquaticItems.TRIGGERFISH)
             entries.add(HybridAquaticItems.TUNA)

diff --git a/src/main/kotlin/dev/hybridlabs/aquatic/item/HybridAquaticItems.kt b/src/main/kotlin/dev/hybridlabs/aquatic/item/HybridAquaticItems.kt
@@ -475,7 +475,7 @@ object HybridAquaticItems {
                 )
         )
     )
-    val TETRA = register("tetra",
+    val NEON_TETRA = register("neon_tetra",
         Item(
             FabricItemSettings()
                 .food(

diff --git a/...ts/hybrid-aquatic/textures/item/tetra.png → ...brid-aquatic/textures/item/neon_tetra.png b/...ts/hybrid-aquatic/textures/item/tetra.png → ...brid-aquatic/textures/item/neon_tetra.png
-Original file line number
+Diff line change
@@ Expand Up / @@ -475,7 +475,7 @@ object HybridAquaticItems { @@
                     )
             )
         )
-        val TETRA = register("tetra",
+        val NEON_TETRA = register("neon_tetra",
             Item(
                 FabricItemSettings()
                     .food(
@@ Expand Down @@