Fixed cephalopod variants and added basic tuna variants

src/client/kotlin/dev/hybridlabs/aquatic/client/model/entity/cephalopod/HybridAquaticCephalopodEntityModel.kt

@@ -7,18 +7,23 @@ import software.bernie.geckolib.model.GeoModel
 
 abstract class HybridAquaticCephalopodEntityModel<T: HybridAquaticCephalopodEntity> (private val id: String) : GeoModel<T>() {
     override fun getModelResource(animatable: T?): Identifier {
+        val variant = animatable?.variant
+        if (variant != null && !variant.ignore.contains(HybridAquaticCephalopodEntity.CephalopodVariant.Ignore.MODEL))
+            return Identifier(HybridAquatic.MOD_ID, "geo/${id}_${variant.variantName}.geo.json")
         return Identifier(HybridAquatic.MOD_ID, "geo/$id.geo.json")
     }
 
     override fun getTextureResource(animatable: T?): Identifier {
+        val variant = animatable?.variant
+        if (variant != null && !variant.ignore.contains(HybridAquaticCephalopodEntity.CephalopodVariant.Ignore.TEXTURE))
+            return Identifier(HybridAquatic.MOD_ID, "textures/entity/${id}_${variant.variantName}.png")
         return Identifier(HybridAquatic.MOD_ID, "textures/entity/$id.png")
     }
 
-    fun getVariantTexture(variant: String): Identifier {
-        return Identifier(HybridAquatic.MOD_ID, "textures/entity/${id}_$variant.png")
-    }
-
     override fun getAnimationResource(animatable: T?): Identifier {
+        val variant = animatable?.variant
+        if (variant != null && !variant.ignore.contains(HybridAquaticCephalopodEntity.CephalopodVariant.Ignore.ANIMATION))
+            return Identifier(HybridAquatic.MOD_ID, "animations/${id}_${variant.variantName}.animation.json")
         return Identifier(HybridAquatic.MOD_ID, "animations/$id.animation.json")
     }
 }

src/client/kotlin/dev/hybridlabs/aquatic/client/model/entity/cephalopod/UmbrellaOctopusEntityModel.kt

@@ -3,14 +3,4 @@ package dev.hybridlabs.aquatic.client.model.entity.cephalopod
 import dev.hybridlabs.aquatic.entity.cephalopod.HybridAquaticCephalopodEntity
 import net.minecraft.util.Identifier
 
-class UmbrellaOctopusEntityModel : HybridAquaticCephalopodEntityModel<HybridAquaticCephalopodEntity>("umbrella_octopus") {
-    override fun getTextureResource(animatable: HybridAquaticCephalopodEntity?): Identifier {
-        if (animatable != null) return getVariantTexture(allVariants[animatable.variant])
-        return super.getTextureResource(animatable)
-    }
-
-    companion object {
-        val allVariants: Array<String> = arrayOf("white", "brown", "orange", "yellow", "pink", "purple")
-    }
-}
-
+class UmbrellaOctopusEntityModel : HybridAquaticCephalopodEntityModel<HybridAquaticCephalopodEntity>("umbrella_octopus")

src/client/kotlin/dev/hybridlabs/aquatic/client/model/entity/fish/YellowfinTunaEntityModel.kt → src/client/kotlin/dev/hybridlabs/aquatic/client/model/entity/fish/TunaEntityModel.kt

@@ -2,4 +2,4 @@ package dev.hybridlabs.aquatic.client.model.entity.fish
 
 import dev.hybridlabs.aquatic.entity.fish.HybridAquaticFishEntity
 
-class YellowfinTunaEntityModel : HybridAquaticFishEntityModel<HybridAquaticFishEntity>("yellowfin_tuna")
+class TunaEntityModel : HybridAquaticFishEntityModel<HybridAquaticFishEntity>("tuna")

src/client/kotlin/dev/hybridlabs/aquatic/client/render/entity/HybridAquaticEntityRenderers.kt

@@ -1,7 +1,10 @@
 package dev.hybridlabs.aquatic.client.render.entity
 
 import dev.hybridlabs.aquatic.client.render.entity.cephalopods.*
-import dev.hybridlabs.aquatic.client.render.entity.critter.*
+import dev.hybridlabs.aquatic.client.render.entity.critter.NudibranchEntityRenderer
+import dev.hybridlabs.aquatic.client.render.entity.critter.SeaCucumberEntityRenderer
+import dev.hybridlabs.aquatic.client.render.entity.critter.SeaUrchinEntityRenderer
+import dev.hybridlabs.aquatic.client.render.entity.critter.StarfishEntityRenderer
 import dev.hybridlabs.aquatic.client.render.entity.crustacean.*
 import dev.hybridlabs.aquatic.client.render.entity.fish.*
 import dev.hybridlabs.aquatic.client.render.entity.jellyfish.*
@@ -16,7 +19,7 @@ object HybridAquaticEntityRenderers {
     val PIRANHA = EntityRendererRegistry.register(HybridAquaticEntityTypes.PIRANHA, ::PiranhaEntityRenderer)
     val BARRELEYE = EntityRendererRegistry.register(HybridAquaticEntityTypes.BARRELEYE, ::BarreleyeEntityRenderer)
     val CLOWNFISH = EntityRendererRegistry.register(HybridAquaticEntityTypes.CLOWNFISH, ::ClownfishEntityRenderer)
-    val YELLOWFIN_TUNA = EntityRendererRegistry.register(HybridAquaticEntityTypes.YELLOWFIN_TUNA, ::YellowfinTunaEntityRenderer)
+    val TUNA = EntityRendererRegistry.register(HybridAquaticEntityTypes.TUNA, ::TunaEntityRenderer)
     val FLASHLIGHT_FISH = EntityRendererRegistry.register(HybridAquaticEntityTypes.FLASHLIGHT_FISH, ::FlashlightfishEntityRenderer)
     val LIONFISH = EntityRendererRegistry.register(HybridAquaticEntityTypes.LIONFISH, ::LionfishEntityRenderer)
     val OARFISH = EntityRendererRegistry.register(HybridAquaticEntityTypes.OARFISH, ::OarfishEntityRenderer)

src/client/kotlin/dev/hybridlabs/aquatic/client/render/entity/fish/TunaEntityRenderer.kt

@@ -0,0 +1,8 @@
+package dev.hybridlabs.aquatic.client.render.entity.fish
+
+import dev.hybridlabs.aquatic.client.model.entity.fish.TunaEntityModel
+import dev.hybridlabs.aquatic.entity.fish.HybridAquaticFishEntity
+import net.minecraft.client.render.entity.EntityRendererFactory.Context
+
+class TunaEntityRenderer(context: Context) : HybridAquaticFishEntityRenderer<HybridAquaticFishEntity>(context,
+    TunaEntityModel(), true, false)

src/generated/resources/assets/hybrid-aquatic/lang/en_us.json

@@ -149,12 +149,12 @@
   "entity.hybrid-aquatic.tiger_shark": "Tiger Shark",
   "entity.hybrid-aquatic.toadfish": "Toadfish",
   "entity.hybrid-aquatic.triggerfish": "Triggerfish",
+  "entity.hybrid-aquatic.tuna": "Tuna",
   "entity.hybrid-aquatic.umbrella_octopus": "Umbrella Octopus",
   "entity.hybrid-aquatic.unicorn_fish": "Unicorn Fish",
   "entity.hybrid-aquatic.vampire_crab": "Vampire Crab",
   "entity.hybrid-aquatic.vampire_squid": "Vampire Squid",
   "entity.hybrid-aquatic.whale_shark": "Whale Shark",
-  "entity.hybrid-aquatic.yellowfin_tuna": "Yellowfin Tuna",
   "entity.hybrid-aquatic.yeti_crab": "Yeti Crab",
   "entity.hybrid-aquatic.zebra_danio": "Zebra Danio",
   "hybrid-aquatic.sea_message.bold_muddy": "AW MAN I DROWNED!",
@@ -315,6 +315,8 @@
   "item.hybrid-aquatic.toadfish_spawn_egg": "Toadfish Spawn Egg",
   "item.hybrid-aquatic.triggerfish": "Triggerfish",
   "item.hybrid-aquatic.triggerfish_spawn_egg": "Triggerfish Spawn Egg",
+  "item.hybrid-aquatic.tuna": "Tuna",
+  "item.hybrid-aquatic.tuna_spawn_egg": "Tuna Spawn Egg",
   "item.hybrid-aquatic.turtle_chestplate": "Turtle Chestplate",
   "item.hybrid-aquatic.umbrella_octopus_spawn_egg": "Umbrella Octopus Spawn Egg",
   "item.hybrid-aquatic.unicorn_fish": "Unicorn Fish",
@@ -323,8 +325,6 @@
   "item.hybrid-aquatic.vampire_crab_spawn_egg": "Vampire Crab Spawn Egg",
   "item.hybrid-aquatic.vampire_squid_spawn_egg": "Vampire Squid Spawn Egg",
   "item.hybrid-aquatic.whale_shark_spawn_egg": "Whale Shark Spawn Egg",
-  "item.hybrid-aquatic.yellowfin_tuna": "Yellowfin Tuna",
-  "item.hybrid-aquatic.yellowfin_tuna_spawn_egg": "Yellowfin Tuna Spawn Egg",
   "item.hybrid-aquatic.yeti_crab_claw": "Yeti Crab Claw",
   "item.hybrid-aquatic.yeti_crab_spawn_egg": "Yeti Crab Spawn Egg",
   "item.hybrid-aquatic.zebra_danio_spawn_egg": "Zebra Danio Spawn Egg",

src/generated/resources/assets/hybrid-aquatic/models/item/yellowfin_tuna.json → src/generated/resources/assets/hybrid-aquatic/models/item/tuna.json

@@ -1,6 +1,6 @@
 {
   "parent": "minecraft:item/generated",
   "textures": {
-    "layer0": "hybrid-aquatic:item/yellowfin_tuna"
+    "layer0": "hybrid-aquatic:item/tuna"
   }
 }

src/generated/resources/data/c/tags/items/foods/raw_fishes.json

@@ -5,7 +5,7 @@
     "hybrid-aquatic:barreleye",
     "hybrid-aquatic:clownfish",
     "hybrid-aquatic:rockfish",
-    "hybrid-aquatic:yellowfin_tuna",
+    "hybrid-aquatic:tuna",
     "hybrid-aquatic:blue_tang",
     "hybrid-aquatic:unicorn_fish",
     "hybrid-aquatic:triggerfish",

src/generated/resources/data/hybrid-aquatic/advancements/recipes/food/raw_fish_steak.json

@@ -60,7 +60,7 @@
         "items": [
           {
             "items": [
-              "hybrid-aquatic:yellowfin_tuna"
+              "hybrid-aquatic:tuna"
             ]
           }
         ]

src/generated/resources/data/hybrid-aquatic/loot_tables/entities/yellowfin_tuna.json → src/generated/resources/data/hybrid-aquatic/loot_tables/entities/tuna.json

@@ -39,7 +39,7 @@
               "function": "minecraft:set_count"
             }
           ],
-          "name": "hybrid-aquatic:yellowfin_tuna"
+          "name": "hybrid-aquatic:tuna"
         }
       ],
       "rolls": 1.0

src/generated/resources/data/hybrid-aquatic/loot_tables/gameplay/fishing/fish.json

@@ -46,7 +46,7 @@
         },
         {
           "type": "minecraft:item",
-          "name": "hybrid-aquatic:yellowfin_tuna",
+          "name": "hybrid-aquatic:tuna",
           "weight": 3
         },
         {

src/generated/resources/data/hybrid-aquatic/tags/entity_types/fishes.json

@@ -4,7 +4,7 @@
     "hybrid-aquatic:clownfish",
     "hybrid-aquatic:anglerfish",
     "hybrid-aquatic:barreleye",
-    "hybrid-aquatic:yellowfin_tuna",
+    "hybrid-aquatic:tuna",
     "hybrid-aquatic:cuttlefish",
     "hybrid-aquatic:flashlight_fish",
     "hybrid-aquatic:lionfish",

src/generated/resources/data/hybrid-aquatic/tags/entity_types/medium_prey.json

@@ -2,7 +2,7 @@
   "replace": false,
   "values": [
     "hybrid-aquatic:opah",
-    "hybrid-aquatic:yellowfin_tuna",
+    "hybrid-aquatic:tuna",
     "hybrid-aquatic:moray_eel",
     "hybrid-aquatic:mahimahi",
     "hybrid-aquatic:triggerfish",

src/generated/resources/data/hybrid-aquatic/tags/entity_types/predator/firefly_squid.json

@@ -5,7 +5,7 @@
     "#hybrid-aquatic:sharks",
     "hybrid-aquatic:oarfish",
     "hybrid-aquatic:opah",
-    "hybrid-aquatic:yellowfin_tuna",
+    "hybrid-aquatic:tuna",
     "hybrid-aquatic:mahimahi",
     "hybrid-aquatic:needlefish"
   ]

src/generated/resources/data/hybrid-aquatic/tags/entity_types/prey/bull_shark.json

@@ -2,7 +2,7 @@
   "replace": false,
   "values": [
     "hybrid-aquatic:mahimahi",
-    "hybrid-aquatic:yellowfin_tuna",
+    "hybrid-aquatic:tuna",
     "hybrid-aquatic:oarfish",
     "hybrid-aquatic:moray_eel",
     "hybrid-aquatic:opah",

src/generated/resources/data/hybrid-aquatic/tags/entity_types/prey/great_white_shark.json

@@ -2,7 +2,7 @@
   "replace": false,
   "values": [
     "hybrid-aquatic:mahimahi",
-    "hybrid-aquatic:yellowfin_tuna",
+    "hybrid-aquatic:tuna",
     "hybrid-aquatic:oarfish",
     "hybrid-aquatic:moray_eel",
     "hybrid-aquatic:opah",

src/generated/resources/data/hybrid-aquatic/tags/entity_types/prey/tiger_shark.json

@@ -2,7 +2,7 @@
   "replace": false,
   "values": [
     "hybrid-aquatic:mahimahi",
-    "hybrid-aquatic:yellowfin_tuna",
+    "hybrid-aquatic:tuna",
     "hybrid-aquatic:oarfish",
     "hybrid-aquatic:moray_eel",
     "hybrid-aquatic:opah",

src/generated/resources/data/hybrid-aquatic/tags/items/medium_fish.json

@@ -1,7 +1,7 @@
 {
   "replace": false,
   "values": [
-    "hybrid-aquatic:yellowfin_tuna",
+    "hybrid-aquatic:tuna",
     "hybrid-aquatic:mahi_mahi",
     "hybrid-aquatic:opah",
     "hybrid-aquatic:moray_eel",

src/generated/resources/data/hybrid-aquatic/tags/worldgen/biome/blackfin_spawn_biomes.json

@@ -0,0 +1,6 @@
+{
+  "replace": false,
+  "values": [
+    "minecraft:deep_cold_ocean"
+  ]
+}

src/generated/resources/data/hybrid-aquatic/tags/worldgen/biome/bluefin_spawn_biomes.json

@@ -0,0 +1,6 @@
+{
+  "replace": false,
+  "values": [
+    "minecraft:deep_ocean"
+  ]
+}

src/generated/resources/data/hybrid-aquatic/tags/worldgen/biome/yellowfin_spawn_biomes.json

@@ -0,0 +1,6 @@
+{
+  "replace": false,
+  "values": [
+    "minecraft:deep_lukewarm_ocean"
+  ]
+}

src/generated/resources/data/minecraft/tags/items/fishes.json

@@ -5,7 +5,7 @@
     "hybrid-aquatic:barreleye",
     "hybrid-aquatic:clownfish",
     "hybrid-aquatic:rockfish",
-    "hybrid-aquatic:yellowfin_tuna",
+    "hybrid-aquatic:tuna",
     "hybrid-aquatic:blue_tang",
     "hybrid-aquatic:unicorn_fish",
     "hybrid-aquatic:triggerfish",

src/main/kotlin/dev/hybridlabs/aquatic/data/client/LanguageProvider.kt

@@ -127,7 +127,7 @@ class LanguageProvider(output: FabricDataOutput) : FabricLanguageProvider(output
             HybridAquaticItems.COOKED_CRAYFISH to "Cooked Crayfish",
             HybridAquaticItems.LIONFISH to "Lionfish",
             HybridAquaticItems.MAHI_MAHI to "Mahi Mahi",
-            HybridAquaticItems.YELLOWFIN_TUNA to "Yellowfin Tuna",
+            HybridAquaticItems.TUNA to "Tuna",
             HybridAquaticItems.OPAH to "Opah",
             HybridAquaticItems.ROCKFISH to "Rockfish",
             HybridAquaticItems.BLUE_SPOTTED_STINGRAY to "Blue Spotted Stingray",
@@ -245,7 +245,7 @@ class LanguageProvider(output: FabricDataOutput) : FabricLanguageProvider(output
             HybridAquaticEntityTypes.ANGLERFISH to "Anglerfish",
             HybridAquaticEntityTypes.DRAGONFISH to "Dragonfish",
             HybridAquaticEntityTypes.BARRELEYE to "Barreleye",
-            HybridAquaticEntityTypes.YELLOWFIN_TUNA to "Yellowfin Tuna",
+            HybridAquaticEntityTypes.TUNA to "Tuna",
             HybridAquaticEntityTypes.CUTTLEFISH to "Cuttlefish",
             HybridAquaticEntityTypes.FLASHLIGHT_FISH to "Flashlight Fish",
             HybridAquaticEntityTypes.LIONFISH to "Lionfish",

src/main/kotlin/dev/hybridlabs/aquatic/data/client/ModelProvider.kt

@@ -144,7 +144,7 @@ class ModelProvider(output: FabricDataOutput) : FabricModelProvider(output) {
             HybridAquaticItems.BLACK_PEARL,
             HybridAquaticItems.LIONFISH,
             HybridAquaticItems.MAHI_MAHI,
-            HybridAquaticItems.YELLOWFIN_TUNA,
+            HybridAquaticItems.TUNA,
             HybridAquaticItems.OPAH,
             HybridAquaticItems.ROCKFISH,
             HybridAquaticItems.BLUE_SPOTTED_STINGRAY,

src/main/kotlin/dev/hybridlabs/aquatic/data/server/RecipeProvider.kt

@@ -1,7 +1,6 @@
 package dev.hybridlabs.aquatic.data.server
 
 import dev.hybridlabs.aquatic.block.HybridAquaticBlocks
-import dev.hybridlabs.aquatic.block.wood.HybridAquaticWoodTypes
 import dev.hybridlabs.aquatic.item.HybridAquaticItems
 import dev.hybridlabs.aquatic.tag.HybridAquaticItemTags
 import net.fabricmc.fabric.api.datagen.v1.FabricDataOutput
@@ -216,7 +215,7 @@ class RecipeProvider(output: FabricDataOutput) : FabricRecipeProvider(output) {
 
         ShapelessRecipeJsonBuilder.create(RecipeCategory.FOOD, HybridAquaticItems.RAW_FISH_STEAK, 1)
             .input(HybridAquaticItemTags.MEDIUM_FISH)
-            .criterion("has_yellowfin_tuna", InventoryChangedCriterion.Conditions.items(HybridAquaticItems.YELLOWFIN_TUNA))
+            .criterion("has_yellowfin_tuna", InventoryChangedCriterion.Conditions.items(HybridAquaticItems.TUNA))
             .criterion("has_mahi_mahi", InventoryChangedCriterion.Conditions.items(HybridAquaticItems.MAHI_MAHI))
             .criterion("has_opah", InventoryChangedCriterion.Conditions.items(HybridAquaticItems.OPAH))
             .criterion("has_moray_eel", InventoryChangedCriterion.Conditions.items(HybridAquaticItems.MORAY_EEL))

src/main/kotlin/dev/hybridlabs/aquatic/data/server/loot/EntityTypeLootTableProvider.kt

@@ -637,11 +637,11 @@ class EntityTypeLootTableProvider(output: FabricDataOutput) : SimpleFabricLootTa
         }
 
         // medium fish
-        export(exporter, HybridAquaticEntityTypes.YELLOWFIN_TUNA) {
+        export(exporter, HybridAquaticEntityTypes.TUNA) {
             pool(
                 LootPool.builder()
                     .with(
-                        ItemEntry.builder(HybridAquaticItems.YELLOWFIN_TUNA)
+                        ItemEntry.builder(HybridAquaticItems.TUNA)
                             .apply(FurnaceSmeltLootFunction.builder().conditionally(EntityPropertiesLootCondition.builder(LootContext.EntityTarget.THIS, NEEDS_ENTITY_ON_FIRE)))
                             .apply(LootingEnchantLootFunction.builder(UniformLootNumberProvider.create(0.0F, 1.0F)))
                             .apply(SetCountLootFunction.builder(UniformLootNumberProvider.create(1.0F, 1.0F)))

src/main/kotlin/dev/hybridlabs/aquatic/data/server/loot/FishingLootTableProvider.kt

@@ -54,7 +54,7 @@ class FishingLootTableProvider(output: FabricDataOutput) : SimpleFabricLootTable
                                 .weight(3)
                         )
                         .with(
-                            ItemEntry.builder(HybridAquaticItems.YELLOWFIN_TUNA)
+                            ItemEntry.builder(HybridAquaticItems.TUNA)
                                 .weight(3)
                         )
                         .with(

src/main/kotlin/dev/hybridlabs/aquatic/data/server/tag/BiomeTagProvider.kt

@@ -586,6 +586,18 @@ class BiomeTagProvider(output: FabricDataOutput, registriesFuture: CompletableFu
             HybridAquaticBiomes.SARGASSUM_SEA
         )
 
+        getOrCreateTagBuilder(HybridAquaticBiomeTags.YELLOWFIN_SPAWN_BIOMES).add(
+            BiomeKeys.DEEP_LUKEWARM_OCEAN,
+        )
+
+        getOrCreateTagBuilder(HybridAquaticBiomeTags.BLUEFIN_SPAWN_BIOMES).add(
+            BiomeKeys.DEEP_OCEAN,
+        )
+
+        getOrCreateTagBuilder(HybridAquaticBiomeTags.BLACKFIN_SPAWN_BIOMES).add(
+            BiomeKeys.DEEP_COLD_OCEAN,
+        )
+
         getOrCreateTagBuilder(HybridAquaticBiomeTags.ZEBRA_DANIO_SPAWN_BIOMES).add(
             BiomeKeys.JUNGLE,
             BiomeKeys.SPARSE_JUNGLE,