A lot of spawn biome tweaks

hybridlabs · Nov 16, 2024 · e7cb601 · e7cb601
1 parent 41abe8e
commit e7cb601
Show file tree

Hide file tree

Showing 21 changed files with 502 additions and 697 deletions.
diff --git a/src/generated/resources/data/hybrid-aquatic/tags/worldgen/biome/all_cold_oceans.json b/src/generated/resources/data/hybrid-aquatic/tags/worldgen/biome/all_cold_oceans.json
diff --git a/...tags/worldgen/biome/deep_cold_oceans.json → ...ic/tags/worldgen/biome/arctic_oceans.json b/...tags/worldgen/biome/deep_cold_oceans.json → ...ic/tags/worldgen/biome/arctic_oceans.json
@@ -1,7 +1,7 @@
 {
   "replace": false,
   "values": [
-    "minecraft:deep_cold_ocean",
+    "minecraft:frozen_ocean",
     "minecraft:deep_frozen_ocean"
   ]
 }
diff --git a/src/generated/resources/data/hybrid-aquatic/tags/worldgen/biome/cold_oceans.json b/src/generated/resources/data/hybrid-aquatic/tags/worldgen/biome/cold_oceans.json
@@ -2,6 +2,6 @@
   "replace": false,
   "values": [
     "minecraft:cold_ocean",
-    "minecraft:frozen_ocean"
+    "minecraft:deep_cold_ocean"
   ]
 }
diff --git a/src/generated/resources/data/hybrid-aquatic/tags/worldgen/biome/deep_warm_oceans.json b/src/generated/resources/data/hybrid-aquatic/tags/worldgen/biome/deep_warm_oceans.json
diff --git a/src/generated/resources/data/hybrid-aquatic/tags/worldgen/biome/ocean.json b/src/generated/resources/data/hybrid-aquatic/tags/worldgen/biome/ocean.json
diff --git a/...uatic/tags/worldgen/biome/deep_ocean.json → ...tags/worldgen/biome/temperate_oceans.json b/...uatic/tags/worldgen/biome/deep_ocean.json → ...tags/worldgen/biome/temperate_oceans.json
@@ -1,6 +1,7 @@
 {
   "replace": false,
   "values": [
+    "minecraft:ocean",
     "minecraft:deep_ocean"
   ]
 }
diff --git a/.../tags/worldgen/biome/all_warm_oceans.json → .../tags/worldgen/biome/tropical_oceans.json b/.../tags/worldgen/biome/all_warm_oceans.json → .../tags/worldgen/biome/tropical_oceans.json
diff --git a/src/main/kotlin/dev/hybridlabs/aquatic/data/server/tag/BiomeTagProvider.kt b/src/main/kotlin/dev/hybridlabs/aquatic/data/server/tag/BiomeTagProvider.kt
@@ -34,30 +34,19 @@ class BiomeTagProvider(output: FabricDataOutput, registriesFuture: CompletableFu
             .forceAddTag(BiomeTags.IS_DEEP_OCEAN)
             .forceAddTag(BiomeTags.IS_BEACH)
 
-        getOrCreateTagBuilder(HybridAquaticBiomeTags.OCEAN)
-            .add(BiomeKeys.OCEAN)
-
-        getOrCreateTagBuilder(HybridAquaticBiomeTags.DEEP_OCEAN)
-            .add(BiomeKeys.DEEP_OCEAN)
-
-        getOrCreateTagBuilder(HybridAquaticBiomeTags.COLD_OCEANS)
-            .add(BiomeKeys.COLD_OCEAN,
-                BiomeKeys.FROZEN_OCEAN)
-
-            getOrCreateTagBuilder(HybridAquaticBiomeTags.DEEP_COLD_OCEANS)
-            .add(BiomeKeys.DEEP_COLD_OCEAN,
+        getOrCreateTagBuilder(HybridAquaticBiomeTags.ARCTIC_OCEANS)
+            .add(BiomeKeys.FROZEN_OCEAN,
                 BiomeKeys.DEEP_FROZEN_OCEAN)
 
-        getOrCreateTagBuilder(HybridAquaticBiomeTags.ALL_COLD_OCEANS)
+        getOrCreateTagBuilder(HybridAquaticBiomeTags.COLD_OCEANS)
             .add(BiomeKeys.COLD_OCEAN,
-                BiomeKeys.FROZEN_OCEAN,
-                BiomeKeys.DEEP_COLD_OCEAN,
-                BiomeKeys.DEEP_FROZEN_OCEAN)
+                BiomeKeys.DEEP_COLD_OCEAN)
 
-        getOrCreateTagBuilder(HybridAquaticBiomeTags.DEEP_WARM_OCEANS)
-            .add(BiomeKeys.DEEP_LUKEWARM_OCEAN)
+        getOrCreateTagBuilder(HybridAquaticBiomeTags.TEMPERATE_OCEANS)
+            .add(BiomeKeys.OCEAN)
+            .add(BiomeKeys.DEEP_OCEAN)
 
-        getOrCreateTagBuilder(HybridAquaticBiomeTags.ALL_WARM_OCEANS)
+        getOrCreateTagBuilder(HybridAquaticBiomeTags.TROPICAL_OCEANS)
             .add(BiomeKeys.LUKEWARM_OCEAN,
                 BiomeKeys.DEEP_LUKEWARM_OCEAN)
 

diff --git a/src/main/kotlin/dev/hybridlabs/aquatic/entity/critter/HybridAquaticCritterEntity.kt b/src/main/kotlin/dev/hybridlabs/aquatic/entity/critter/HybridAquaticCritterEntity.kt
@@ -2,6 +2,7 @@ package dev.hybridlabs.aquatic.entity.critter
 
 import dev.hybridlabs.aquatic.entity.critter.HybridAquaticCritterEntity.VariantCollisionRules.ExclusionStatus.EXCLUSIVE
 import dev.hybridlabs.aquatic.entity.critter.HybridAquaticCritterEntity.VariantCollisionRules.ExclusionStatus.INCLUSIVE
+import dev.hybridlabs.aquatic.entity.fish.HybridAquaticFishEntity
 import net.minecraft.entity.EntityData
 import net.minecraft.entity.EntityType
 import net.minecraft.entity.SpawnReason
@@ -327,9 +328,9 @@ open class HybridAquaticCritterEntity(
         }
 
         companion object {
-            fun biomeVariant(variantName: String, biomes : TagKey<Biome>, ignore : List<Ignore> = emptyList()): CritterVariant {
+            fun biomeVariant(variantName: String, biomes : List<TagKey<Biome>>, ignore : List<CritterVariant.Ignore> = emptyList()): CritterVariant {
                 return CritterVariant(variantName, { world, _, pos, _ ->
-                    world.getBiome(pos).isIn(biomes)
+                    biomes.any { tag -> world.getBiome(pos).isIn(tag) }
                 }, ignore)
             }
         }

diff --git a/src/main/kotlin/dev/hybridlabs/aquatic/entity/critter/NudibranchEntity.kt b/src/main/kotlin/dev/hybridlabs/aquatic/entity/critter/NudibranchEntity.kt
@@ -12,23 +12,23 @@ import software.bernie.geckolib.core.`object`.PlayState
 
 class NudibranchEntity(entityType: EntityType<out NudibranchEntity>, world: World) :
     HybridAquaticCritterEntity(entityType, world, variants = hashMapOf(
-        "pyjama" to CritterVariant.biomeVariant("pyjama", HybridAquaticBiomeTags.REEF,
+        "pyjama" to CritterVariant.biomeVariant("pyjama", listOf(HybridAquaticBiomeTags.TROPICAL_OCEANS, HybridAquaticBiomeTags.REEF),
             ignore = listOf(CritterVariant.Ignore.MODEL, CritterVariant.Ignore.ANIMATION)),
-        "bullock" to CritterVariant.biomeVariant("bullock", HybridAquaticBiomeTags.REEF,
+        "bullock" to CritterVariant.biomeVariant("bullock", listOf(HybridAquaticBiomeTags.TROPICAL_OCEANS, HybridAquaticBiomeTags.REEF),
             ignore = listOf(CritterVariant.Ignore.MODEL, CritterVariant.Ignore.ANIMATION)),
-        "sagami" to CritterVariant.biomeVariant("sagami", HybridAquaticBiomeTags.REEF,
+        "sagami" to CritterVariant.biomeVariant("sagami", listOf(HybridAquaticBiomeTags.TROPICAL_OCEANS, HybridAquaticBiomeTags.REEF),
             ignore = listOf(CritterVariant.Ignore.MODEL, CritterVariant.Ignore.ANIMATION)),
-        "festiva" to CritterVariant.biomeVariant("festiva", HybridAquaticBiomeTags.REEF,
+        "festiva" to CritterVariant.biomeVariant("festiva", listOf(HybridAquaticBiomeTags.TROPICAL_OCEANS, HybridAquaticBiomeTags.REEF),
             ignore = listOf(CritterVariant.Ignore.MODEL, CritterVariant.Ignore.ANIMATION)),
-        "magnificent" to CritterVariant.biomeVariant("magnificent", HybridAquaticBiomeTags.REEF,
+        "magnificent" to CritterVariant.biomeVariant("magnificent", listOf(HybridAquaticBiomeTags.TROPICAL_OCEANS, HybridAquaticBiomeTags.REEF),
             ignore = listOf(CritterVariant.Ignore.MODEL, CritterVariant.Ignore.ANIMATION)),
-        "kubaryana" to CritterVariant.biomeVariant("kubaryana", HybridAquaticBiomeTags.REEF,
+        "kubaryana" to CritterVariant.biomeVariant("kubaryana", listOf(HybridAquaticBiomeTags.TROPICAL_OCEANS, HybridAquaticBiomeTags.REEF),
             ignore = listOf(CritterVariant.Ignore.MODEL, CritterVariant.Ignore.ANIMATION)),
-        "yonowae" to CritterVariant.biomeVariant("yonowae", HybridAquaticBiomeTags.REEF,
+        "yonowae" to CritterVariant.biomeVariant("yonowae", listOf(HybridAquaticBiomeTags.TROPICAL_OCEANS, HybridAquaticBiomeTags.REEF),
             ignore = listOf(CritterVariant.Ignore.MODEL, CritterVariant.Ignore.ANIMATION)),
-        "kuniei" to CritterVariant.biomeVariant("kuniei", HybridAquaticBiomeTags.REEF,
+        "kuniei" to CritterVariant.biomeVariant("kuniei", listOf(HybridAquaticBiomeTags.TROPICAL_OCEANS, HybridAquaticBiomeTags.REEF),
             ignore = listOf(CritterVariant.Ignore.MODEL, CritterVariant.Ignore.ANIMATION)),
-        "baba" to CritterVariant.biomeVariant("baba", HybridAquaticBiomeTags.REEF,
+        "baba" to CritterVariant.biomeVariant("baba", listOf(HybridAquaticBiomeTags.TROPICAL_OCEANS, HybridAquaticBiomeTags.REEF),
             ignore = listOf(CritterVariant.Ignore.MODEL, CritterVariant.Ignore.ANIMATION)),
         )) {
 

diff --git a/src/main/kotlin/dev/hybridlabs/aquatic/entity/critter/SeaCucumberEntity.kt b/src/main/kotlin/dev/hybridlabs/aquatic/entity/critter/SeaCucumberEntity.kt
@@ -12,11 +12,11 @@ import software.bernie.geckolib.core.`object`.PlayState
 
 class SeaCucumberEntity(entityType: EntityType<out SeaCucumberEntity>, world: World) :
     HybridAquaticCritterEntity(entityType, world, variants = hashMapOf(
-        "sea_pig" to CritterVariant.biomeVariant("sea_pig", HybridAquaticBiomeTags.ALL_DEEP_OCEANS,
+        "sea_pig" to CritterVariant.biomeVariant("sea_pig", listOf(HybridAquaticBiomeTags.ARCTIC_OCEANS, HybridAquaticBiomeTags.COLD_OCEANS, HybridAquaticBiomeTags.COLD_OCEANS),
             ignore = listOf(CritterVariant.Ignore.ANIMATION)),
-        "black" to CritterVariant.biomeVariant("black", HybridAquaticBiomeTags.ALL_OCEANS,
+        "black" to CritterVariant.biomeVariant("black", listOf(HybridAquaticBiomeTags.TROPICAL_OCEANS, HybridAquaticBiomeTags.TEMPERATE_OCEANS),
             ignore = listOf(CritterVariant.Ignore.MODEL, CritterVariant.Ignore.ANIMATION)),
-        "red" to CritterVariant.biomeVariant("red", HybridAquaticBiomeTags.ALL_OCEANS,
+        "red" to CritterVariant.biomeVariant("red", listOf(HybridAquaticBiomeTags.TROPICAL_OCEANS, HybridAquaticBiomeTags.TEMPERATE_OCEANS),
             ignore = listOf(CritterVariant.Ignore.MODEL, CritterVariant.Ignore.ANIMATION)),
         )) {
 

diff --git a/src/main/kotlin/dev/hybridlabs/aquatic/entity/critter/SeaUrchinEntity.kt b/src/main/kotlin/dev/hybridlabs/aquatic/entity/critter/SeaUrchinEntity.kt
@@ -10,30 +10,32 @@ import net.minecraft.entity.attribute.EntityAttributes
 import net.minecraft.entity.damage.DamageSource
 import net.minecraft.entity.damage.DamageTypes
 import net.minecraft.entity.mob.PathAwareEntity
+import net.minecraft.registry.tag.BiomeTags
 import net.minecraft.registry.tag.DamageTypeTags
 import net.minecraft.util.math.BlockPos
 import net.minecraft.world.World
+import net.minecraft.world.biome.Biome
 import software.bernie.geckolib.core.animatable.GeoAnimatable
 import software.bernie.geckolib.core.animation.AnimationState
 import software.bernie.geckolib.core.`object`.PlayState
 
 class SeaUrchinEntity(entityType: EntityType<out SeaUrchinEntity>, world: World) :
     HybridAquaticCritterEntity(entityType, world, variants = hashMapOf(
-        "black" to CritterVariant.biomeVariant("black", HybridAquaticBiomeTags.ALL_OCEANS,
+        "black" to CritterVariant.biomeVariant("black", listOf(BiomeTags.IS_OCEAN, BiomeTags.IS_DEEP_OCEAN),
             ignore = listOf(CritterVariant.Ignore.MODEL, CritterVariant.Ignore.ANIMATION)),
-        "blue" to CritterVariant.biomeVariant("blue", HybridAquaticBiomeTags.ALL_OCEANS,
+        "blue" to CritterVariant.biomeVariant("blue", listOf(BiomeTags.IS_OCEAN, BiomeTags.IS_DEEP_OCEAN),
             ignore = listOf(CritterVariant.Ignore.MODEL, CritterVariant.Ignore.ANIMATION)),
-        "purple" to CritterVariant.biomeVariant("purple", HybridAquaticBiomeTags.ALL_OCEANS,
+        "purple" to CritterVariant.biomeVariant("purple", listOf(BiomeTags.IS_OCEAN, BiomeTags.IS_DEEP_OCEAN),
             ignore = listOf(CritterVariant.Ignore.MODEL, CritterVariant.Ignore.ANIMATION)),
-        "red" to CritterVariant.biomeVariant("red", HybridAquaticBiomeTags.ALL_OCEANS,
+        "red" to CritterVariant.biomeVariant("red", listOf(BiomeTags.IS_OCEAN, BiomeTags.IS_DEEP_OCEAN),
             ignore = listOf(CritterVariant.Ignore.MODEL, CritterVariant.Ignore.ANIMATION)),
-        "long_black" to CritterVariant.biomeVariant("long_black", HybridAquaticBiomeTags.ALL_OCEANS,
+        "long_black" to CritterVariant.biomeVariant("long_black", listOf(BiomeTags.IS_OCEAN, BiomeTags.IS_DEEP_OCEAN),
             ignore = listOf(CritterVariant.Ignore.MODEL, CritterVariant.Ignore.ANIMATION)),
-        "long_blue" to CritterVariant.biomeVariant("long_blue", HybridAquaticBiomeTags.ALL_OCEANS,
+        "long_blue" to CritterVariant.biomeVariant("long_blue", listOf(BiomeTags.IS_OCEAN, BiomeTags.IS_DEEP_OCEAN),
             ignore = listOf(CritterVariant.Ignore.MODEL, CritterVariant.Ignore.ANIMATION)),
-        "long_purple" to CritterVariant.biomeVariant("long_purple", HybridAquaticBiomeTags.ALL_OCEANS,
+        "long_purple" to CritterVariant.biomeVariant("long_purple", listOf(BiomeTags.IS_OCEAN, BiomeTags.IS_DEEP_OCEAN),
             ignore = listOf(CritterVariant.Ignore.MODEL, CritterVariant.Ignore.ANIMATION)),
-        "long_red" to CritterVariant.biomeVariant("long_red", HybridAquaticBiomeTags.ALL_OCEANS,
+        "long_red" to CritterVariant.biomeVariant("long_red", listOf(BiomeTags.IS_OCEAN, BiomeTags.IS_DEEP_OCEAN),
             ignore = listOf(CritterVariant.Ignore.MODEL, CritterVariant.Ignore.ANIMATION)),)) {
 
     private var timeUntilNextBreak = 0

diff --git a/src/main/kotlin/dev/hybridlabs/aquatic/entity/critter/StarfishEntity.kt b/src/main/kotlin/dev/hybridlabs/aquatic/entity/critter/StarfishEntity.kt
@@ -12,46 +12,46 @@ import software.bernie.geckolib.core.`object`.PlayState
 
 class StarfishEntity(entityType: EntityType<out StarfishEntity>, world: World) :
     HybridAquaticCritterEntity(entityType, world, variants = hashMapOf(
-        "blue" to CritterVariant.biomeVariant("blue", HybridAquaticBiomeTags.REEF,
+        "blue" to CritterVariant.biomeVariant("blue", listOf(HybridAquaticBiomeTags.TROPICAL_OCEANS, HybridAquaticBiomeTags.REEF),
             ignore = listOf(CritterVariant.Ignore.MODEL, CritterVariant.Ignore.ANIMATION)),
-        "orange" to CritterVariant.biomeVariant("orange", HybridAquaticBiomeTags.REEF,
+        "orange" to CritterVariant.biomeVariant("orange", listOf(HybridAquaticBiomeTags.TROPICAL_OCEANS, HybridAquaticBiomeTags.REEF),
             ignore = listOf(CritterVariant.Ignore.MODEL, CritterVariant.Ignore.ANIMATION)),
-        "green" to CritterVariant.biomeVariant("green", HybridAquaticBiomeTags.REEF,
+        "green" to CritterVariant.biomeVariant("green", listOf(HybridAquaticBiomeTags.TROPICAL_OCEANS, HybridAquaticBiomeTags.REEF),
             ignore = listOf(CritterVariant.Ignore.MODEL, CritterVariant.Ignore.ANIMATION)),
-        "purple" to CritterVariant.biomeVariant("purple", HybridAquaticBiomeTags.REEF,
+        "purple" to CritterVariant.biomeVariant("purple", listOf(HybridAquaticBiomeTags.TROPICAL_OCEANS, HybridAquaticBiomeTags.REEF),
             ignore = listOf(CritterVariant.Ignore.MODEL, CritterVariant.Ignore.ANIMATION)),
-        "red" to CritterVariant.biomeVariant("red", HybridAquaticBiomeTags.REEF,
+        "red" to CritterVariant.biomeVariant("red", listOf(HybridAquaticBiomeTags.TROPICAL_OCEANS, HybridAquaticBiomeTags.REEF),
             ignore = listOf(CritterVariant.Ignore.MODEL, CritterVariant.Ignore.ANIMATION)),
-        "yellow" to CritterVariant.biomeVariant("yellow", HybridAquaticBiomeTags.REEF,
+        "yellow" to CritterVariant.biomeVariant("yellow", listOf(HybridAquaticBiomeTags.TROPICAL_OCEANS, HybridAquaticBiomeTags.REEF),
             ignore = listOf(CritterVariant.Ignore.MODEL, CritterVariant.Ignore.ANIMATION)),
-        "medium_blue" to CritterVariant.biomeVariant("medium_blue", HybridAquaticBiomeTags.REEF,
+        "medium_blue" to CritterVariant.biomeVariant("medium_blue", listOf(HybridAquaticBiomeTags.TROPICAL_OCEANS, HybridAquaticBiomeTags.REEF),
             ignore = listOf(CritterVariant.Ignore.MODEL, CritterVariant.Ignore.ANIMATION)),
-        "medium_green" to CritterVariant.biomeVariant("medium_green", HybridAquaticBiomeTags.REEF,
+        "medium_green" to CritterVariant.biomeVariant("medium_green", listOf(HybridAquaticBiomeTags.TROPICAL_OCEANS, HybridAquaticBiomeTags.REEF),
             ignore = listOf(CritterVariant.Ignore.MODEL, CritterVariant.Ignore.ANIMATION)),
-        "medium_orange" to CritterVariant.biomeVariant("medium_orange", HybridAquaticBiomeTags.REEF,
+        "medium_orange" to CritterVariant.biomeVariant("medium_orange", listOf(HybridAquaticBiomeTags.TROPICAL_OCEANS, HybridAquaticBiomeTags.REEF),
             ignore = listOf(CritterVariant.Ignore.MODEL, CritterVariant.Ignore.ANIMATION)),
-        "medium_purple" to CritterVariant.biomeVariant("medium_purple", HybridAquaticBiomeTags.REEF,
+        "medium_purple" to CritterVariant.biomeVariant("medium_purple", listOf(HybridAquaticBiomeTags.TROPICAL_OCEANS, HybridAquaticBiomeTags.REEF),
             ignore = listOf(CritterVariant.Ignore.MODEL, CritterVariant.Ignore.ANIMATION)),
-        "medium_red" to CritterVariant.biomeVariant("medium_red", HybridAquaticBiomeTags.REEF,
+        "medium_red" to CritterVariant.biomeVariant("medium_red", listOf(HybridAquaticBiomeTags.TROPICAL_OCEANS, HybridAquaticBiomeTags.REEF),
             ignore = listOf(CritterVariant.Ignore.MODEL, CritterVariant.Ignore.ANIMATION)),
-        "medium_yellow" to CritterVariant.biomeVariant("medium_yellow", HybridAquaticBiomeTags.REEF,
+        "medium_yellow" to CritterVariant.biomeVariant("medium_yellow", listOf(HybridAquaticBiomeTags.TROPICAL_OCEANS, HybridAquaticBiomeTags.REEF),
             ignore = listOf(CritterVariant.Ignore.MODEL, CritterVariant.Ignore.ANIMATION)),
-        "medium_knobbed_blue" to CritterVariant.biomeVariant("medium_knobbed_blue", HybridAquaticBiomeTags.REEF,
+        "medium_knobbed_blue" to CritterVariant.biomeVariant("medium_knobbed_blue", listOf(HybridAquaticBiomeTags.TROPICAL_OCEANS, HybridAquaticBiomeTags.REEF),
             ignore = listOf(CritterVariant.Ignore.MODEL, CritterVariant.Ignore.ANIMATION)),
-        "medium_knobbed_green" to CritterVariant.biomeVariant("medium_knobbed_green", HybridAquaticBiomeTags.REEF,
+        "medium_knobbed_green" to CritterVariant.biomeVariant("medium_knobbed_green", listOf(HybridAquaticBiomeTags.TROPICAL_OCEANS, HybridAquaticBiomeTags.REEF),
             ignore = listOf(CritterVariant.Ignore.MODEL, CritterVariant.Ignore.ANIMATION)),
-        "medium_knobbed_orange" to CritterVariant.biomeVariant("medium_knobbed_orange", HybridAquaticBiomeTags.REEF,
+        "medium_knobbed_orange" to CritterVariant.biomeVariant("medium_knobbed_orange", listOf(HybridAquaticBiomeTags.TROPICAL_OCEANS, HybridAquaticBiomeTags.REEF),
             ignore = listOf(CritterVariant.Ignore.MODEL, CritterVariant.Ignore.ANIMATION)),
-        "medium_knobbed_purple" to CritterVariant.biomeVariant("medium_knobbed_purple", HybridAquaticBiomeTags.REEF,
+        "medium_knobbed_purple" to CritterVariant.biomeVariant("medium_knobbed_purple", listOf(HybridAquaticBiomeTags.TROPICAL_OCEANS, HybridAquaticBiomeTags.REEF),
             ignore = listOf(CritterVariant.Ignore.MODEL, CritterVariant.Ignore.ANIMATION)),
-        "medium_knobbed_red" to CritterVariant.biomeVariant("medium_knobbed_red", HybridAquaticBiomeTags.REEF,
+        "medium_knobbed_red" to CritterVariant.biomeVariant("medium_knobbed_red", listOf(HybridAquaticBiomeTags.TROPICAL_OCEANS, HybridAquaticBiomeTags.REEF),
             ignore = listOf(CritterVariant.Ignore.MODEL, CritterVariant.Ignore.ANIMATION)),
-        "medium_knobbed_yellow" to CritterVariant.biomeVariant("medium_knobbed_yellow", HybridAquaticBiomeTags.REEF,
+        "medium_knobbed_yellow" to CritterVariant.biomeVariant("medium_knobbed_yellow", listOf(HybridAquaticBiomeTags.TROPICAL_OCEANS, HybridAquaticBiomeTags.REEF),
             ignore = listOf(CritterVariant.Ignore.MODEL, CritterVariant.Ignore.ANIMATION)),
-        "crown_of_thorns" to CritterVariant.biomeVariant("crown_of_thorns", HybridAquaticBiomeTags.REEF),
-        "brittlestar_black" to CritterVariant.biomeVariant("brittlestar_black", HybridAquaticBiomeTags.ALL_DEEP_OCEANS),
-        "brittlestar_yellow" to CritterVariant.biomeVariant("brittlestar_yellow", HybridAquaticBiomeTags.ALL_DEEP_OCEANS),
-        "brittlestar_white" to CritterVariant.biomeVariant("brittlestar_white", HybridAquaticBiomeTags.ALL_DEEP_OCEANS),)) {
+        "crown_of_thorns" to CritterVariant.biomeVariant("crown_of_thorns", listOf(HybridAquaticBiomeTags.REEF)),
+        "brittlestar_black" to CritterVariant.biomeVariant("brittlestar_black", listOf(HybridAquaticBiomeTags.TROPICAL_OCEANS, HybridAquaticBiomeTags.REEF)),
+        "brittlestar_yellow" to CritterVariant.biomeVariant("brittlestar_yellow", listOf(HybridAquaticBiomeTags.TROPICAL_OCEANS, HybridAquaticBiomeTags.REEF)),
+        "brittlestar_white" to CritterVariant.biomeVariant("brittlestar_white", listOf(HybridAquaticBiomeTags.TROPICAL_OCEANS)),)) {
 
         companion object {
             fun createMobAttributes(): DefaultAttributeContainer.Builder {

diff --git a/src/main/kotlin/dev/hybridlabs/aquatic/entity/fish/MahiEntity.kt b/src/main/kotlin/dev/hybridlabs/aquatic/entity/fish/MahiEntity.kt
@@ -11,9 +11,9 @@ import net.minecraft.world.World
 
 class MahiEntity(entityType: EntityType<out MahiEntity>, world: World) :
     HybridAquaticFishEntity(entityType, world, variants = hashMapOf(
-        "mahi" to FishVariant.biomeVariant("mahi", listOf(HybridAquaticBiomeTags.DEEP_WARM_OCEANS),
+        "mahi" to FishVariant.biomeVariant("mahi", listOf(HybridAquaticBiomeTags.TROPICAL_OCEANS),
             ignore = listOf(FishVariant.Ignore.ANIMATION)),
-        "pompano" to FishVariant.biomeVariant("pompano", listOf(HybridAquaticBiomeTags.DEEP_WARM_OCEANS),
+        "pompano" to FishVariant.biomeVariant("pompano", listOf(HybridAquaticBiomeTags.TROPICAL_OCEANS),
             ignore = listOf(FishVariant.Ignore.ANIMATION)),
         ),
         listOf(

diff --git a/src/main/kotlin/dev/hybridlabs/aquatic/entity/fish/SeaBassEntity.kt b/src/main/kotlin/dev/hybridlabs/aquatic/entity/fish/SeaBassEntity.kt
@@ -10,7 +10,7 @@ import net.minecraft.world.World
 
 class SeaBassEntity(entityType: EntityType<out SeaBassEntity>, world: World) :
     HybridAquaticFishEntity(entityType, world, variants = hashMapOf(
-        "black" to FishVariant.biomeVariant("black", listOf(HybridAquaticBiomeTags.OCEAN),
+        "black" to FishVariant.biomeVariant("black", listOf(HybridAquaticBiomeTags.TEMPERATE_OCEANS),
             ignore = listOf(FishVariant.Ignore.ANIMATION, FishVariant.Ignore.MODEL)),
         ),
         listOf(