Created a generic StingrayEntity class

Added blue spotted stingray variant
Added spotted eagle ray variant

src/client/kotlin/dev/hybridlabs/aquatic/client/model/entity/fish/BlueSpottedStingrayEntityModel.kt → src/client/kotlin/dev/hybridlabs/aquatic/client/model/entity/fish/StingrayEntityModel.kt

@@ -2,4 +2,4 @@ package dev.hybridlabs.aquatic.client.model.entity.fish
 
 import dev.hybridlabs.aquatic.entity.fish.HybridAquaticFishEntity
 
-class BlueSpottedStingrayEntityModel : HybridAquaticFishEntityModel<HybridAquaticFishEntity>("blue_spotted_stingray")
+class StingrayEntityModel : HybridAquaticFishEntityModel<HybridAquaticFishEntity>("stingray")

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

@@ -46,7 +46,7 @@ object HybridAquaticEntityRenderers {
     val COWFISH = EntityRendererRegistry.register(HybridAquaticEntityTypes.COWFISH, ::CowfishEntityRenderer)
     val DISCUS = EntityRendererRegistry.register(HybridAquaticEntityTypes.DISCUS, ::DiscusEntityRenderer)
     val SURGEONFISH = EntityRendererRegistry.register(HybridAquaticEntityTypes.SURGEONFISH, ::SurgeonfishEntityRenderer)
-    val BLUE_SPOTTED_STINGRAY = EntityRendererRegistry.register(HybridAquaticEntityTypes.BLUE_SPOTTED_STINGRAY, ::BlueSpottedStingrayEntityRenderer)
+    val STINGRAY = EntityRendererRegistry.register(HybridAquaticEntityTypes.STINGRAY, ::StingrayEntityRenderer)
 
     //endregion
 

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

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

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

@@ -87,7 +87,6 @@
   "entity.hybrid-aquatic.basking_shark": "Basking Shark",
   "entity.hybrid-aquatic.betta": "Betta",
   "entity.hybrid-aquatic.blue_jellyfish": "Blue Jellyfish",
-  "entity.hybrid-aquatic.blue_spotted_stingray": "Blue Spotted Stingray",
   "entity.hybrid-aquatic.bull_shark": "Bull Shark",
   "entity.hybrid-aquatic.cauliflower_jellyfish": "Cauliflower Jellyfish",
   "entity.hybrid-aquatic.clownfish": "Clownfish",
@@ -141,6 +140,7 @@
   "entity.hybrid-aquatic.shrimp": "Shrimp",
   "entity.hybrid-aquatic.spider_crab": "Spider Crab",
   "entity.hybrid-aquatic.starfish": "Starfish",
+  "entity.hybrid-aquatic.stingray": "Blue Spotted Stingray",
   "entity.hybrid-aquatic.stonefish": "Stonefish",
   "entity.hybrid-aquatic.sunfish": "Sunfish",
   "entity.hybrid-aquatic.surgeonfish": "Surgeonfish",
@@ -186,7 +186,6 @@
   "item.hybrid-aquatic.black_pearl": "Black Pearl",
   "item.hybrid-aquatic.blue_jellyfish_spawn_egg": "Blue Jellyfish Spawn Egg",
   "item.hybrid-aquatic.blue_spotted_stingray": "Blue Spotted Stingray",
-  "item.hybrid-aquatic.blue_spotted_stingray_spawn_egg": "Blue Spotted Stingray Spawn Egg",
   "item.hybrid-aquatic.blue_tang": "Blue Tang",
   "item.hybrid-aquatic.bull_shark_spawn_egg": "Bull Shark Spawn Egg",
   "item.hybrid-aquatic.cauliflower_jellyfish_spawn_egg": "Cauliflower Jellyfish Spawn Egg",
@@ -306,6 +305,7 @@
   "item.hybrid-aquatic.spider_crab_spawn_egg": "Spider Crab Spawn Egg",
   "item.hybrid-aquatic.sponge_chunk": "Sponge Chunk",
   "item.hybrid-aquatic.starfish_spawn_egg": "Starfish Spawn Egg",
+  "item.hybrid-aquatic.stingray_spawn_egg": "Blue Spotted Stingray Spawn Egg",
   "item.hybrid-aquatic.stonefish_spawn_egg": "Stonefish Spawn Egg",
   "item.hybrid-aquatic.sunfish_spawn_egg": "Sunfish Spawn Egg",
   "item.hybrid-aquatic.surgeonfish_orangeshoulder": "Orangeshoulder Surgeonfish",

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

@@ -0,0 +1,14 @@
+{
+  "pools": [
+    {
+      "bonus_rolls": 0.0,
+      "entries": [
+        {
+          "type": "minecraft:item",
+          "name": "hybrid-aquatic:blue_spotted_stingray"
+        }
+      ],
+      "rolls": 1.0
+    }
+  ]
+}

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

@@ -37,7 +37,7 @@
     "hybrid-aquatic:discus",
     "hybrid-aquatic:firefly_squid",
     "hybrid-aquatic:dragonfish",
-    "hybrid-aquatic:blue_spotted_stingray",
+    "hybrid-aquatic:stingray",
     "hybrid-aquatic:surgeonfish"
   ]
 }

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

@@ -7,7 +7,7 @@
     "hybrid-aquatic:cuttlefish",
     "hybrid-aquatic:firefly_squid",
     "hybrid-aquatic:triggerfish",
-    "hybrid-aquatic:blue_spotted_stingray",
+    "hybrid-aquatic:stingray",
     "hybrid-aquatic:hammerhead_shark"
   ]
 }

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

@@ -3,7 +3,7 @@
   "values": [
     "#hybrid-aquatic:crab",
     "#hybrid-aquatic:shrimp",
-    "hybrid-aquatic:blue_spotted_stingray",
+    "hybrid-aquatic:stingray",
     "hybrid-aquatic:firefly_squid",
     "hybrid-aquatic:cuttlefish",
     "minecraft:tropical_fish",

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

@@ -34,7 +34,7 @@
     "hybrid-aquatic:shrimp",
     "hybrid-aquatic:crayfish",
     "hybrid-aquatic:lobster",
-    "hybrid-aquatic:blue_spotted_stingray",
+    "hybrid-aquatic:stingray",
     "hybrid-aquatic:vampire_squid",
     "hybrid-aquatic:glowing_sucker_octopus",
     "hybrid-aquatic:dragonfish",

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

@@ -281,7 +281,7 @@ class LanguageProvider(output: FabricDataOutput) : FabricLanguageProvider(output
             HybridAquaticEntityTypes.GLOWING_SUCKER_OCTOPUS to "Glowing Sucker Octopus",
             HybridAquaticEntityTypes.DISCUS to "Discus",
             HybridAquaticEntityTypes.FIREFLY_SQUID to "Firefly Squid",
-            HybridAquaticEntityTypes.BLUE_SPOTTED_STINGRAY to "Blue Spotted Stingray",
+            HybridAquaticEntityTypes.STINGRAY to "Blue Spotted Stingray",
             HybridAquaticEntityTypes.SURGEONFISH to "Surgeonfish",
             HybridAquaticEntityTypes.BULL_SHARK to "Bull Shark",
             HybridAquaticEntityTypes.BASKING_SHARK to "Basking Shark",

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

@@ -530,7 +530,7 @@ class EntityTypeLootTableProvider(output: FabricDataOutput) : SimpleFabricLootTa
             )
         }
 
-        export(exporter, HybridAquaticEntityTypes.BLUE_SPOTTED_STINGRAY) {
+        export(exporter, HybridAquaticEntityTypes.STINGRAY) {
             pool(
                 LootPool.builder()
                     .with(

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

@@ -684,6 +684,15 @@ class GenericLootTableProvider(output: FabricDataOutput) : SimpleFabricLootTable
                 )
         )
 
+        exporter.accept(
+            HybridAquaticLootTables.BLUE_SPOTTED_STINGRAY,
+            LootTable.builder()
+                .pool(
+                    LootPool.builder()
+                        .with(ItemEntry.builder(HybridAquaticItems.BLUE_SPOTTED_STINGRAY))
+                )
+        )
+
         exporter.accept(
             HybridAquaticLootTables.UNICORNFISH,
             LootTable.builder()

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

@@ -52,7 +52,7 @@ class BiomeTagProvider(output: FabricDataOutput, registriesFuture: CompletableFu
             BiomeKeys.SPARSE_JUNGLE,
         )
 
-        getOrCreateTagBuilder(HybridAquaticBiomeTags.BLUE_SPOTTED_STINGRAY_SPAWN_BIOMES).add(
+        getOrCreateTagBuilder(HybridAquaticBiomeTags.STINGRAY_SPAWN_BIOMES).add(
             BiomeKeys.WARM_OCEAN,
             BiomeKeys.LUKEWARM_OCEAN,
             BiomeKeys.BEACH,

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

@@ -46,7 +46,7 @@ class EntityTypeTagProvider(output: FabricDataOutput, registriesFuture: Completa
                 HybridAquaticEntityTypes.SHRIMP,
                 HybridAquaticEntityTypes.CRAYFISH,
                 HybridAquaticEntityTypes.LOBSTER,
-                HybridAquaticEntityTypes.BLUE_SPOTTED_STINGRAY,
+                HybridAquaticEntityTypes.STINGRAY,
                 HybridAquaticEntityTypes.VAMPIRE_SQUID,
                 HybridAquaticEntityTypes.GLOWING_SUCKER_OCTOPUS,
                 HybridAquaticEntityTypes.DRAGONFISH,
@@ -121,7 +121,7 @@ class EntityTypeTagProvider(output: FabricDataOutput, registriesFuture: Completa
             .addTag(HybridAquaticEntityTags.CRAB)
             .addTag(HybridAquaticEntityTags.SHRIMP)
             .add(
-                HybridAquaticEntityTypes.BLUE_SPOTTED_STINGRAY,
+                HybridAquaticEntityTypes.STINGRAY,
                 HybridAquaticEntityTypes.FIREFLY_SQUID,
                 HybridAquaticEntityTypes.CUTTLEFISH,
                 EntityType.TROPICAL_FISH,
@@ -401,7 +401,7 @@ class EntityTypeTagProvider(output: FabricDataOutput, registriesFuture: Completa
                 HybridAquaticEntityTypes.CUTTLEFISH,
                 HybridAquaticEntityTypes.FIREFLY_SQUID,
                 HybridAquaticEntityTypes.TRIGGERFISH,
-                HybridAquaticEntityTypes.BLUE_SPOTTED_STINGRAY,
+                HybridAquaticEntityTypes.STINGRAY,
                 HybridAquaticEntityTypes.HAMMERHEAD_SHARK,
             )
 
@@ -444,7 +444,7 @@ class EntityTypeTagProvider(output: FabricDataOutput, registriesFuture: Completa
                 HybridAquaticEntityTypes.DISCUS,
                 HybridAquaticEntityTypes.FIREFLY_SQUID,
                 HybridAquaticEntityTypes.DRAGONFISH,
-                HybridAquaticEntityTypes.BLUE_SPOTTED_STINGRAY,
+                HybridAquaticEntityTypes.STINGRAY,
                 HybridAquaticEntityTypes.SURGEONFISH
             )
 

src/main/kotlin/dev/hybridlabs/aquatic/enchantment/LiveCatchEnchantment.kt

@@ -29,14 +29,16 @@ class LiveCatchEnchantment : Enchantment(Rarity.RARE, EnchantmentTarget.FISHING_
             HybridAquaticItems.TUNA to HybridAquaticEntityTypes.TUNA,
             HybridAquaticItems.OPAH to HybridAquaticEntityTypes.OPAH,
             HybridAquaticItems.ROCKFISH to HybridAquaticEntityTypes.ROCKFISH,
-            HybridAquaticItems.BLUE_SPOTTED_STINGRAY to HybridAquaticEntityTypes.BLUE_SPOTTED_STINGRAY,
+            HybridAquaticItems.BLUE_SPOTTED_STINGRAY to HybridAquaticEntityTypes.STINGRAY,
             HybridAquaticItems.MORAY_EEL to HybridAquaticEntityTypes.MORAY_EEL,
             HybridAquaticItems.NEEDLEFISH to HybridAquaticEntityTypes.NEEDLEFISH,
             HybridAquaticItems.PIRANHA to HybridAquaticEntityTypes.PIRANHA,
             HybridAquaticItems.ANGLERFISH to HybridAquaticEntityTypes.ANGLERFISH,
             HybridAquaticItems.BARRELEYE to HybridAquaticEntityTypes.BARRELEYE,
             HybridAquaticItems.DRAGONFISH to HybridAquaticEntityTypes.DRAGONFISH,
             HybridAquaticItems.BLUE_TANG to HybridAquaticEntityTypes.SURGEONFISH,
+            HybridAquaticItems.SURGEONFISH_SOHAL to HybridAquaticEntityTypes.SURGEONFISH,
+            HybridAquaticItems.SURGEONFISH_ORANGESHOULDER to HybridAquaticEntityTypes.SURGEONFISH,
             HybridAquaticItems.CLOWNFISH to HybridAquaticEntityTypes.CLOWNFISH,
             HybridAquaticItems.COWFISH to HybridAquaticEntityTypes.COWFISH,
             HybridAquaticItems.TRIGGERFISH to HybridAquaticEntityTypes.TRIGGERFISH,

src/main/kotlin/dev/hybridlabs/aquatic/entity/HybridAquaticEntityTypes.kt

@@ -9,7 +9,7 @@ import dev.hybridlabs.aquatic.entity.critter.StarfishEntity
 import dev.hybridlabs.aquatic.entity.crustacean.*
 import dev.hybridlabs.aquatic.entity.fish.*
 import dev.hybridlabs.aquatic.entity.fish.deepsea.*
-import dev.hybridlabs.aquatic.entity.fish.ray.BlueSpottedStingrayEntity
+import dev.hybridlabs.aquatic.entity.fish.ray.StingrayEntity
 import dev.hybridlabs.aquatic.entity.jellyfish.*
 import dev.hybridlabs.aquatic.entity.miniboss.KarkinosEntity
 import dev.hybridlabs.aquatic.entity.shark.*
@@ -45,11 +45,11 @@ object HybridAquaticEntityTypes {
         BettaEntity.createMobAttributes()
     )
 
-    val BLUE_SPOTTED_STINGRAY = registerFish(
-        "blue_spotted_stingray",
-        ::BlueSpottedStingrayEntity,
+    val STINGRAY = registerFish(
+        "stingray",
+        ::StingrayEntity,
         EntityDimensions.fixed(0.75f, 0.2f),
-        BlueSpottedStingrayEntity.createMobAttributes()
+        StingrayEntity.createMobAttributes()
     )
 
     val SURGEONFISH = registerFish(

src/main/kotlin/dev/hybridlabs/aquatic/entity/SpawnRestrictionRegistry.kt

@@ -29,7 +29,7 @@ object SpawnRestrictionRegistry {
             HybridAquaticEntityTypes.COWFISH,
             HybridAquaticEntityTypes.SEAHORSE,
             HybridAquaticEntityTypes.SUNFISH,
-            HybridAquaticEntityTypes.BLUE_SPOTTED_STINGRAY,
+            HybridAquaticEntityTypes.STINGRAY,
             HybridAquaticEntityTypes.LIONFISH,
             HybridAquaticEntityTypes.TOADFISH,
             HybridAquaticEntityTypes.OARFISH,

src/main/kotlin/dev/hybridlabs/aquatic/entity/fish/ray/BlueSpottedStingrayEntity.kt → src/main/kotlin/dev/hybridlabs/aquatic/entity/fish/ray/StingrayEntity.kt

@@ -1,15 +1,27 @@
 package dev.hybridlabs.aquatic.entity.fish.ray
 
+import dev.hybridlabs.aquatic.tag.HybridAquaticBiomeTags
 import dev.hybridlabs.aquatic.tag.HybridAquaticEntityTags
 import net.minecraft.entity.EntityType
 import net.minecraft.entity.ai.goal.RevengeGoal
 import net.minecraft.entity.attribute.DefaultAttributeContainer
 import net.minecraft.entity.attribute.EntityAttributes
 import net.minecraft.entity.mob.WaterCreatureEntity
+import net.minecraft.util.Identifier
 import net.minecraft.world.World
 
-class BlueSpottedStingrayEntity(entityType: EntityType<out BlueSpottedStingrayEntity>, world: World) :
-    HybridAquaticRayEntity(entityType, world, emptyMap(), HybridAquaticEntityTags.STINGRAY_PREY, HybridAquaticEntityTags.STINGRAY_PREDATOR) {
+class StingrayEntity(entityType: EntityType<out StingrayEntity>, world: World) :
+    HybridAquaticRayEntity(entityType, world, variants = hashMapOf(
+        "spotted_eagle" to FishVariant.biomeVariant("spotted_eagle", HybridAquaticBiomeTags.STINGRAY_SPAWN_BIOMES),
+        "blue_spotted" to FishVariant.biomeVariant("blue_spotted", HybridAquaticBiomeTags.STINGRAY_SPAWN_BIOMES),),
+        HybridAquaticEntityTags.STINGRAY_PREY, HybridAquaticEntityTags.STINGRAY_PREDATOR) {
+
+    public override fun getLootTableId(): Identifier {
+        return when (this.variant?.variantName) {
+            "blue_spotted" -> Identifier("hybrid-aquatic", "gameplay/blue_spotted_stingray")
+            else -> super.getLootTableId()
+        }
+    }
 
     override fun initGoals() {
         super.initGoals()

src/main/kotlin/dev/hybridlabs/aquatic/item/HybridAquaticItems.kt

@@ -624,7 +624,7 @@ object HybridAquaticItems {
     val ANGLERFISH_SPAWN_EGG = registerSpawnEgg("anglerfish_spawn_egg", HybridAquaticEntityTypes.ANGLERFISH, 0x4d4848, 0xc4faff)
     val BARRELEYE_SPAWN_EGG = registerSpawnEgg("barreleye_spawn_egg", HybridAquaticEntityTypes.BARRELEYE, 0x543d34, 0x95f649)
     val BETTA_SPAWN_EGG = registerSpawnEgg("betta_spawn_egg", HybridAquaticEntityTypes.BETTA, 0xba3569, 0x581f45)
-    val BLUE_SPOTTED_STINGRAY_SPAWN_EGG = registerSpawnEgg("blue_spotted_stingray_spawn_egg", HybridAquaticEntityTypes.BLUE_SPOTTED_STINGRAY, 0xecbf52, 0x2563a4)
+    val STINGRAY_SPAWN_EGG = registerSpawnEgg("stingray_spawn_egg", HybridAquaticEntityTypes.STINGRAY, 0xecbf52, 0x2563a4)
     val SURGEONFISH_SPAWN_EGG = registerSpawnEgg("surgeonfish_spawn_egg", HybridAquaticEntityTypes.SURGEONFISH, 0x88a1d7, 0x211b2f)
     val CLOWNFISH_SPAWN_EGG = registerSpawnEgg("clownfish_spawn_egg", HybridAquaticEntityTypes.CLOWNFISH, 0xea6c36, 0xfdf7f9)
     val COWFISH_SPAWN_EGG = registerSpawnEgg("cowfish_spawn_egg", HybridAquaticEntityTypes.COWFISH, 0xfffeac, 0xffc056)

src/main/kotlin/dev/hybridlabs/aquatic/loot/HybridAquaticLootTables.kt

@@ -23,5 +23,7 @@ object HybridAquaticLootTables {
     val ORANGESHOULDER = Identifier(HybridAquatic.MOD_ID, "gameplay/orangeshoulder")
     val UNICORNFISH = Identifier(HybridAquatic.MOD_ID, "gameplay/unicornfish")
 
+    val BLUE_SPOTTED_STINGRAY = Identifier(HybridAquatic.MOD_ID, "gameplay/blue_spotted_stingray")
+
     val CRAB_DIGGING_TREASURE_ID = Identifier(HybridAquatic.MOD_ID, "gameplay/crab_digging_treasure")
 }

src/main/kotlin/dev/hybridlabs/aquatic/tag/HybridAquaticBiomeTags.kt

@@ -25,7 +25,7 @@ object HybridAquaticBiomeTags {
     val SURGEONFISH_SPAWN_BIOMES = create("surgeonfish_spawn_biomes")
     val COWFISH_SPAWN_BIOMES = create("cowfish_spawn_biomes")
     val SEAHORSE_SPAWN_BIOMES = create("seahorse_spawn_biomes")
-    val BLUE_SPOTTED_STINGRAY_SPAWN_BIOMES = create("blue_spotted_stingray_spawn_biomes")
+    val STINGRAY_SPAWN_BIOMES = create("stingray_spawn_biomes")
     val LIONFISH_SPAWN_BIOMES = create("lionfish_spawn_biomes")
     val MOON_JELLYFISH_SPAWN_BIOMES = create("moon_jellyfish_spawn_biomes")
     val FRIED_EGG_JELLYFISH_SPAWN_BIOMES = create("fried_egg_jellyfish_spawn_biomes")

src/main/kotlin/dev/hybridlabs/aquatic/world/EntityBiomeModifications.kt

@@ -18,7 +18,7 @@ object EntityBiomeModifications {
     init {
         // fish
         addFish(HybridAquaticEntityTypes.BETTA, HybridAquaticBiomeTags.BETTA_SPAWN_BIOMES, 10, 1, 2)
-        addFish(HybridAquaticEntityTypes.BLUE_SPOTTED_STINGRAY, HybridAquaticBiomeTags.BLUE_SPOTTED_STINGRAY_SPAWN_BIOMES, 3, 1, 1)
+        addFish(HybridAquaticEntityTypes.STINGRAY, HybridAquaticBiomeTags.STINGRAY_SPAWN_BIOMES, 3, 1, 1)
         addFish(HybridAquaticEntityTypes.SURGEONFISH, HybridAquaticBiomeTags.SURGEONFISH_SPAWN_BIOMES, 5, 1, 2)
         addFish(HybridAquaticEntityTypes.CLOWNFISH, HybridAquaticBiomeTags.CLOWNFISH_SPAWN_BIOMES, 5, 1, 2)
         addFish(HybridAquaticEntityTypes.COWFISH, HybridAquaticBiomeTags.COWFISH_SPAWN_BIOMES, 5, 1, 2)