Removed coral grouper item as Im too lazy to model the fish rn

hybridlabs · Jan 19, 2025 · 199e4c2 · 199e4c2
1 parent 21fd9e0
commit 199e4c2
Show file tree

Hide file tree

Showing 14 changed files with 0 additions and 40 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
@@ -305,7 +305,6 @@
   "item.hybrid-aquatic.coral_axe": "Coral Axe",
   "item.hybrid-aquatic.coral_blade": "Coral Blade",
   "item.hybrid-aquatic.coral_chunk": "Coral Chunk",
-  "item.hybrid-aquatic.coral_grouper": "Coral Grouper",
   "item.hybrid-aquatic.coral_hoe": "Coral Hoe",
   "item.hybrid-aquatic.coral_pickaxe": "Coral Pickaxe",
   "item.hybrid-aquatic.coral_shovel": "Coral Shovel",

diff --git a/src/generated/resources/assets/hybrid-aquatic/models/item/coral_grouper.json b/src/generated/resources/assets/hybrid-aquatic/models/item/coral_grouper.json
diff --git a/src/generated/resources/data/c/tags/items/foods/raw_fish.json b/src/generated/resources/data/c/tags/items/foods/raw_fish.json
@@ -37,7 +37,6 @@
     "hybrid-aquatic:golden_dorado",
     "hybrid-aquatic:coelacanth",
     "hybrid-aquatic:squirrelfish",
-    "hybrid-aquatic:coral_grouper",
     "hybrid-aquatic:gourami",
     "hybrid-aquatic:lionfish",
     "hybrid-aquatic:mahi",

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
@@ -37,7 +37,6 @@
     "hybrid-aquatic:golden_dorado",
     "hybrid-aquatic:coelacanth",
     "hybrid-aquatic:squirrelfish",
-    "hybrid-aquatic:coral_grouper",
     "hybrid-aquatic:gourami",
     "hybrid-aquatic:lionfish",
     "hybrid-aquatic:mahi",

diff --git a/src/generated/resources/data/hybrid-aquatic/loot_tables/gameplay/fishing/reef_fish.json b/src/generated/resources/data/hybrid-aquatic/loot_tables/gameplay/fishing/reef_fish.json
@@ -119,11 +119,6 @@
           "type": "minecraft:item",
           "name": "hybrid-aquatic:squirrelfish",
           "weight": 4
-        },
-        {
-          "type": "minecraft:item",
-          "name": "hybrid-aquatic:coral_grouper",
-          "weight": 2
         }
       ],
       "rolls": 1.0

diff --git a/src/generated/resources/data/hybrid-aquatic/tags/items/medium_fish.json b/src/generated/resources/data/hybrid-aquatic/tags/items/medium_fish.json
@@ -10,7 +10,6 @@
     "hybrid-aquatic:lionfish",
     "hybrid-aquatic:rockfish",
     "hybrid-aquatic:sea_bass",
-    "hybrid-aquatic:coral_grouper",
     "hybrid-aquatic:needlefish"
   ]
 }
diff --git a/src/generated/resources/data/minecraft/tags/items/fishes.json b/src/generated/resources/data/minecraft/tags/items/fishes.json
@@ -47,7 +47,6 @@
     "hybrid-aquatic:flying_fish",
     "hybrid-aquatic:tiger_barb",
     "hybrid-aquatic:coelacanth",
-    "hybrid-aquatic:coral_grouper",
     "hybrid-aquatic:squirrelfish",
     "hybrid-aquatic:golden_dorado"
   ]

diff --git a/src/main/kotlin/dev/hybridlabs/aquatic/data/client/LanguageProvider.kt b/src/main/kotlin/dev/hybridlabs/aquatic/data/client/LanguageProvider.kt
@@ -254,7 +254,6 @@ class LanguageProvider(output: FabricDataOutput) : FabricLanguageProvider(output
             HybridAquaticItems.FLASHLIGHT_FISH to "Flashlight Fish",
             HybridAquaticItems.SQUIRRELFISH to "Squirrel Fish",
             HybridAquaticItems.COELACANTH to "Coelacanth",
-            HybridAquaticItems.CORAL_GROUPER to "Coral Grouper",
             HybridAquaticItems.GOLDEN_DORADO to "Golden Dorado",
             HybridAquaticItems.MAHI to "Mahi",
             HybridAquaticItems.YELLOWFIN_TUNA to "Yellowfin Tuna",

diff --git a/src/main/kotlin/dev/hybridlabs/aquatic/data/client/ModelProvider.kt b/src/main/kotlin/dev/hybridlabs/aquatic/data/client/ModelProvider.kt
@@ -231,7 +231,6 @@ class ModelProvider(output: FabricDataOutput) : FabricModelProvider(output) {
             HybridAquaticItems.MACKEREL,
             HybridAquaticItems.FLYING_FISH,
             HybridAquaticItems.SQUIRRELFISH,
-            HybridAquaticItems.CORAL_GROUPER,
             HybridAquaticItems.COELACANTH,
             HybridAquaticItems.GOLDEN_DORADO,
             HybridAquaticItems.OPAH,

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
@@ -162,10 +162,6 @@ class FishingLootTableProvider(output: FabricDataOutput) :
                             ItemEntry.builder(HybridAquaticItems.SQUIRRELFISH)
                                 .weight(4)
                         )
-                        .with(
-                            ItemEntry.builder(HybridAquaticItems.CORAL_GROUPER)
-                                .weight(2)
-                        )
                 )
         )
 

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
@@ -132,7 +132,6 @@ class ItemTagProvider(output: FabricDataOutput, registriesFuture: CompletableFut
             HybridAquaticItems.LIONFISH,
             HybridAquaticItems.ROCKFISH,
             HybridAquaticItems.SEA_BASS,
-            HybridAquaticItems.CORAL_GROUPER,
             HybridAquaticItems.NEEDLEFISH,
         ).forEach { item ->
             getOrCreateTagBuilder(HybridAquaticItemTags.MEDIUM_FISH).add(item)
@@ -202,7 +201,6 @@ class ItemTagProvider(output: FabricDataOutput, registriesFuture: CompletableFut
             HybridAquaticItems.GOLDEN_DORADO,
             HybridAquaticItems.COELACANTH,
             HybridAquaticItems.SQUIRRELFISH,
-            HybridAquaticItems.CORAL_GROUPER,
             HybridAquaticItems.GOURAMI,
             HybridAquaticItems.LIONFISH,
             HybridAquaticItems.MAHI,
@@ -302,7 +300,6 @@ class ItemTagProvider(output: FabricDataOutput, registriesFuture: CompletableFut
             HybridAquaticItems.FLYING_FISH,
             HybridAquaticItems.TIGER_BARB,
             HybridAquaticItems.COELACANTH,
-            HybridAquaticItems.CORAL_GROUPER,
             HybridAquaticItems.SQUIRRELFISH,
             HybridAquaticItems.GOLDEN_DORADO,
         ).forEach { item ->

diff --git a/src/main/kotlin/dev/hybridlabs/aquatic/item/HybridAquaticItemGroups.kt b/src/main/kotlin/dev/hybridlabs/aquatic/item/HybridAquaticItemGroups.kt
@@ -186,7 +186,6 @@ object  HybridAquaticItemGroups {
             entries.add(HybridAquaticItems.TRIGGERFISH)
             entries.add(HybridAquaticItems.ROCKFISH)
             entries.add(HybridAquaticItems.SEA_BASS)
-            entries.add(HybridAquaticItems.CORAL_GROUPER)
             entries.add(HybridAquaticItems.COELACANTH)
             entries.add(HybridAquaticItems.NEEDLEFISH)
             entries.add(HybridAquaticItems.PARROTFISH)

diff --git a/src/main/kotlin/dev/hybridlabs/aquatic/item/HybridAquaticItems.kt b/src/main/kotlin/dev/hybridlabs/aquatic/item/HybridAquaticItems.kt
@@ -1163,20 +1163,6 @@ object HybridAquaticItems {
         )
     )
 
-    val CORAL_GROUPER = register(
-        "coral_grouper",
-        Item(
-            FabricItemSettings()
-                .food(
-                    FoodComponent.Builder()
-                        .hunger(2)
-                        .saturationModifier(0.4F)
-                        .meat()
-                        .build()
-                )
-        )
-    )
-
     val COELACANTH = register(
         "coelacanth",
         Item(

diff --git a/src/main/resources/assets/hybrid-aquatic/textures/item/coral_grouper.png b/src/main/resources/assets/hybrid-aquatic/textures/item/coral_grouper.png