diff --git a/src/generated/resources/data/hybrid-aquatic/tags/worldgen/biome/atolla_jellyfish_spawn_biomes.json b/src/generated/resources/data/hybrid-aquatic/tags/worldgen/biome/atolla_jellyfish_spawn_biomes.json index 4ee1bc107..08e9dfdae 100644 --- a/src/generated/resources/data/hybrid-aquatic/tags/worldgen/biome/atolla_jellyfish_spawn_biomes.json +++ b/src/generated/resources/data/hybrid-aquatic/tags/worldgen/biome/atolla_jellyfish_spawn_biomes.json @@ -1,13 +1,7 @@ { "replace": false, "values": [ - "minecraft:deep_cold_ocean", - "minecraft:deep_ocean", - "minecraft:deep_frozen_ocean", - "minecraft:ocean", - "minecraft:lukewarm_ocean", - "minecraft:deep_lukewarm_ocean", - "minecraft:cold_ocean", - "minecraft:frozen_ocean" + "#minecraft:is_deep_ocean", + "#minecraft:is_ocean" ] } \ No newline at end of file diff --git a/src/generated/resources/data/hybrid-aquatic/tags/worldgen/biome/betta_spawn_biomes.json b/src/generated/resources/data/hybrid-aquatic/tags/worldgen/biome/betta_spawn_biomes.json index fb28e6203..ac671528d 100644 --- a/src/generated/resources/data/hybrid-aquatic/tags/worldgen/biome/betta_spawn_biomes.json +++ b/src/generated/resources/data/hybrid-aquatic/tags/worldgen/biome/betta_spawn_biomes.json @@ -2,6 +2,18 @@ "replace": false, "values": [ "minecraft:jungle", - "minecraft:sparse_jungle" + "minecraft:sparse_jungle", + { + "id": "wythers:jungle_river", + "required": false + }, + { + "id": "wythers:tropical_forest_river", + "required": false + }, + { + "id": "wythers:flooded_jungle", + "required": false + } ] } \ No newline at end of file diff --git a/src/generated/resources/data/hybrid-aquatic/tags/worldgen/biome/brittlestar_spawn_biomes.json b/src/generated/resources/data/hybrid-aquatic/tags/worldgen/biome/brittlestar_spawn_biomes.json index 359185cc9..e7fc64902 100644 --- a/src/generated/resources/data/hybrid-aquatic/tags/worldgen/biome/brittlestar_spawn_biomes.json +++ b/src/generated/resources/data/hybrid-aquatic/tags/worldgen/biome/brittlestar_spawn_biomes.json @@ -1,9 +1,6 @@ { "replace": false, "values": [ - "minecraft:deep_ocean", - "minecraft:deep_cold_ocean", - "minecraft:deep_lukewarm_ocean", - "minecraft:deep_frozen_ocean" + "#minecraft:is_deep_ocean" ] } \ No newline at end of file diff --git a/src/generated/resources/data/hybrid-aquatic/tags/worldgen/biome/coconut_crab_spawn_biomes.json b/src/generated/resources/data/hybrid-aquatic/tags/worldgen/biome/coconut_crab_spawn_biomes.json index 3b6d8bba9..f22642e1c 100644 --- a/src/generated/resources/data/hybrid-aquatic/tags/worldgen/biome/coconut_crab_spawn_biomes.json +++ b/src/generated/resources/data/hybrid-aquatic/tags/worldgen/biome/coconut_crab_spawn_biomes.json @@ -1,6 +1,10 @@ { "replace": false, "values": [ - "minecraft:beach" + "minecraft:beach", + { + "id": "wythers:tropical_beach", + "required": false + } ] } \ No newline at end of file diff --git a/src/generated/resources/data/hybrid-aquatic/tags/worldgen/biome/crayfish_spawn_biomes.json b/src/generated/resources/data/hybrid-aquatic/tags/worldgen/biome/crayfish_spawn_biomes.json index 47144e62e..227786219 100644 --- a/src/generated/resources/data/hybrid-aquatic/tags/worldgen/biome/crayfish_spawn_biomes.json +++ b/src/generated/resources/data/hybrid-aquatic/tags/worldgen/biome/crayfish_spawn_biomes.json @@ -2,6 +2,14 @@ "replace": false, "values": [ "minecraft:swamp", - "minecraft:mangrove_swamp" + "#minecraft:is_river", + { + "id": "wythers:waterlily_swamp", + "required": false + }, + { + "id": "wythers:gravelly_river", + "required": false + } ] } \ No newline at end of file diff --git a/src/generated/resources/data/hybrid-aquatic/tags/worldgen/biome/danio_spawn_biomes.json b/src/generated/resources/data/hybrid-aquatic/tags/worldgen/biome/danio_spawn_biomes.json index 739cca770..aa74155b1 100644 --- a/src/generated/resources/data/hybrid-aquatic/tags/worldgen/biome/danio_spawn_biomes.json +++ b/src/generated/resources/data/hybrid-aquatic/tags/worldgen/biome/danio_spawn_biomes.json @@ -3,6 +3,18 @@ "values": [ "minecraft:jungle", "minecraft:sparse_jungle", - "minecraft:mangrove_swamp" + "minecraft:mangrove_swamp", + { + "id": "wythers:jungle_river", + "required": false + }, + { + "id": "wythers:tropical_forest_river", + "required": false + }, + { + "id": "wythers:flooded_jungle", + "required": false + } ] } \ No newline at end of file diff --git a/src/generated/resources/data/hybrid-aquatic/tags/worldgen/biome/discus_spawn_biomes.json b/src/generated/resources/data/hybrid-aquatic/tags/worldgen/biome/discus_spawn_biomes.json index fb28e6203..ac671528d 100644 --- a/src/generated/resources/data/hybrid-aquatic/tags/worldgen/biome/discus_spawn_biomes.json +++ b/src/generated/resources/data/hybrid-aquatic/tags/worldgen/biome/discus_spawn_biomes.json @@ -2,6 +2,18 @@ "replace": false, "values": [ "minecraft:jungle", - "minecraft:sparse_jungle" + "minecraft:sparse_jungle", + { + "id": "wythers:jungle_river", + "required": false + }, + { + "id": "wythers:tropical_forest_river", + "required": false + }, + { + "id": "wythers:flooded_jungle", + "required": false + } ] } \ No newline at end of file diff --git a/src/generated/resources/data/hybrid-aquatic/tags/worldgen/biome/dragonfish_spawn_biomes.json b/src/generated/resources/data/hybrid-aquatic/tags/worldgen/biome/dragonfish_spawn_biomes.json index d254d34a1..3e4e90e04 100644 --- a/src/generated/resources/data/hybrid-aquatic/tags/worldgen/biome/dragonfish_spawn_biomes.json +++ b/src/generated/resources/data/hybrid-aquatic/tags/worldgen/biome/dragonfish_spawn_biomes.json @@ -1,14 +1,6 @@ { "replace": false, "values": [ - "minecraft:deep_cold_ocean", - "minecraft:deep_ocean", - "minecraft:deep_lukewarm_ocean", - "minecraft:deep_frozen_ocean", - "minecraft:ocean", - "minecraft:cold_ocean", - "minecraft:frozen_ocean", - "minecraft:lukewarm_ocean", - "minecraft:warm_ocean" + "#minecraft:is_ocean" ] } \ No newline at end of file diff --git a/src/generated/resources/data/hybrid-aquatic/tags/worldgen/biome/fiddler_crab_spawn_biomes.json b/src/generated/resources/data/hybrid-aquatic/tags/worldgen/biome/fiddler_crab_spawn_biomes.json index 6e8e3c9bf..dbbd6cda2 100644 --- a/src/generated/resources/data/hybrid-aquatic/tags/worldgen/biome/fiddler_crab_spawn_biomes.json +++ b/src/generated/resources/data/hybrid-aquatic/tags/worldgen/biome/fiddler_crab_spawn_biomes.json @@ -2,6 +2,10 @@ "replace": false, "values": [ "minecraft:mangrove_swamp", - "minecraft:beach" + "minecraft:beach", + { + "id": "wythers:waterlily_swamp", + "required": false + } ] } \ No newline at end of file diff --git a/src/generated/resources/data/hybrid-aquatic/tags/worldgen/biome/flashlight_fish_spawn_biomes.json b/src/generated/resources/data/hybrid-aquatic/tags/worldgen/biome/flashlight_fish_spawn_biomes.json index 84f5446cf..e7fc64902 100644 --- a/src/generated/resources/data/hybrid-aquatic/tags/worldgen/biome/flashlight_fish_spawn_biomes.json +++ b/src/generated/resources/data/hybrid-aquatic/tags/worldgen/biome/flashlight_fish_spawn_biomes.json @@ -1,9 +1,6 @@ { "replace": false, "values": [ - "minecraft:deep_cold_ocean", - "minecraft:deep_ocean", - "minecraft:deep_lukewarm_ocean", - "minecraft:warm_ocean" + "#minecraft:is_deep_ocean" ] } \ No newline at end of file diff --git a/src/generated/resources/data/hybrid-aquatic/tags/worldgen/biome/flower_crab_spawn_biomes.json b/src/generated/resources/data/hybrid-aquatic/tags/worldgen/biome/flower_crab_spawn_biomes.json index e6f5895ba..8f2456853 100644 --- a/src/generated/resources/data/hybrid-aquatic/tags/worldgen/biome/flower_crab_spawn_biomes.json +++ b/src/generated/resources/data/hybrid-aquatic/tags/worldgen/biome/flower_crab_spawn_biomes.json @@ -4,6 +4,10 @@ "minecraft:ocean", "minecraft:warm_ocean", "minecraft:lukewarm_ocean", - "minecraft:beach" + "minecraft:beach", + { + "id": "wythers:tropical_beach", + "required": false + } ] } \ No newline at end of file diff --git a/src/generated/resources/data/hybrid-aquatic/tags/worldgen/biome/frilled_shark_spawn_biomes.json b/src/generated/resources/data/hybrid-aquatic/tags/worldgen/biome/frilled_shark_spawn_biomes.json index 73816f6f8..e7fc64902 100644 --- a/src/generated/resources/data/hybrid-aquatic/tags/worldgen/biome/frilled_shark_spawn_biomes.json +++ b/src/generated/resources/data/hybrid-aquatic/tags/worldgen/biome/frilled_shark_spawn_biomes.json @@ -1,11 +1,6 @@ { "replace": false, "values": [ - "minecraft:deep_ocean", - "minecraft:deep_cold_ocean", - "minecraft:ocean", - "minecraft:cold_ocean", - "minecraft:frozen_ocean", - "minecraft:deep_frozen_ocean" + "#minecraft:is_deep_ocean" ] } \ No newline at end of file diff --git a/src/generated/resources/data/hybrid-aquatic/tags/worldgen/biome/ghost_crab_spawn_biomes.json b/src/generated/resources/data/hybrid-aquatic/tags/worldgen/biome/ghost_crab_spawn_biomes.json index e6f5895ba..1b1573b5e 100644 --- a/src/generated/resources/data/hybrid-aquatic/tags/worldgen/biome/ghost_crab_spawn_biomes.json +++ b/src/generated/resources/data/hybrid-aquatic/tags/worldgen/biome/ghost_crab_spawn_biomes.json @@ -4,6 +4,11 @@ "minecraft:ocean", "minecraft:warm_ocean", "minecraft:lukewarm_ocean", - "minecraft:beach" + "minecraft:beach", + "minecraft:stony_shore", + { + "id": "wythers:tropical_beach", + "required": false + } ] } \ No newline at end of file diff --git a/src/generated/resources/data/hybrid-aquatic/tags/worldgen/biome/giant_isopod_spawn_biomes.json b/src/generated/resources/data/hybrid-aquatic/tags/worldgen/biome/giant_isopod_spawn_biomes.json index 40a7a71b9..e7fc64902 100644 --- a/src/generated/resources/data/hybrid-aquatic/tags/worldgen/biome/giant_isopod_spawn_biomes.json +++ b/src/generated/resources/data/hybrid-aquatic/tags/worldgen/biome/giant_isopod_spawn_biomes.json @@ -1,11 +1,6 @@ { "replace": false, "values": [ - "minecraft:deep_ocean", - "minecraft:deep_lukewarm_ocean", - "minecraft:deep_cold_ocean", - "minecraft:deep_frozen_ocean", - "minecraft:cold_ocean", - "minecraft:frozen_ocean" + "#minecraft:is_deep_ocean" ] } \ No newline at end of file diff --git a/src/generated/resources/data/hybrid-aquatic/tags/worldgen/biome/gourami_spawn_biomes.json b/src/generated/resources/data/hybrid-aquatic/tags/worldgen/biome/gourami_spawn_biomes.json index 47144e62e..bd81b1676 100644 --- a/src/generated/resources/data/hybrid-aquatic/tags/worldgen/biome/gourami_spawn_biomes.json +++ b/src/generated/resources/data/hybrid-aquatic/tags/worldgen/biome/gourami_spawn_biomes.json @@ -2,6 +2,18 @@ "replace": false, "values": [ "minecraft:swamp", - "minecraft:mangrove_swamp" + "minecraft:mangrove_swamp", + { + "id": "wythers:jungle_river", + "required": false + }, + { + "id": "wythers:tropical_forest_river", + "required": false + }, + { + "id": "wythers:flooded_jungle", + "required": false + } ] } \ No newline at end of file diff --git a/src/generated/resources/data/hybrid-aquatic/tags/worldgen/biome/hermit_crab_spawn_biomes.json b/src/generated/resources/data/hybrid-aquatic/tags/worldgen/biome/hermit_crab_spawn_biomes.json index e6f5895ba..1b1573b5e 100644 --- a/src/generated/resources/data/hybrid-aquatic/tags/worldgen/biome/hermit_crab_spawn_biomes.json +++ b/src/generated/resources/data/hybrid-aquatic/tags/worldgen/biome/hermit_crab_spawn_biomes.json @@ -4,6 +4,11 @@ "minecraft:ocean", "minecraft:warm_ocean", "minecraft:lukewarm_ocean", - "minecraft:beach" + "minecraft:beach", + "minecraft:stony_shore", + { + "id": "wythers:tropical_beach", + "required": false + } ] } \ No newline at end of file diff --git a/src/generated/resources/data/hybrid-aquatic/tags/worldgen/biome/lightfoot_crab_spawn_biomes.json b/src/generated/resources/data/hybrid-aquatic/tags/worldgen/biome/lightfoot_crab_spawn_biomes.json index e6f5895ba..1b1573b5e 100644 --- a/src/generated/resources/data/hybrid-aquatic/tags/worldgen/biome/lightfoot_crab_spawn_biomes.json +++ b/src/generated/resources/data/hybrid-aquatic/tags/worldgen/biome/lightfoot_crab_spawn_biomes.json @@ -4,6 +4,11 @@ "minecraft:ocean", "minecraft:warm_ocean", "minecraft:lukewarm_ocean", - "minecraft:beach" + "minecraft:beach", + "minecraft:stony_shore", + { + "id": "wythers:tropical_beach", + "required": false + } ] } \ No newline at end of file diff --git a/src/generated/resources/data/hybrid-aquatic/tags/worldgen/biome/oscar_spawn_biomes.json b/src/generated/resources/data/hybrid-aquatic/tags/worldgen/biome/oscar_spawn_biomes.json index fb28e6203..ac671528d 100644 --- a/src/generated/resources/data/hybrid-aquatic/tags/worldgen/biome/oscar_spawn_biomes.json +++ b/src/generated/resources/data/hybrid-aquatic/tags/worldgen/biome/oscar_spawn_biomes.json @@ -2,6 +2,18 @@ "replace": false, "values": [ "minecraft:jungle", - "minecraft:sparse_jungle" + "minecraft:sparse_jungle", + { + "id": "wythers:jungle_river", + "required": false + }, + { + "id": "wythers:tropical_forest_river", + "required": false + }, + { + "id": "wythers:flooded_jungle", + "required": false + } ] } \ No newline at end of file diff --git a/src/generated/resources/data/hybrid-aquatic/tags/worldgen/biome/piranha_spawn_biomes.json b/src/generated/resources/data/hybrid-aquatic/tags/worldgen/biome/piranha_spawn_biomes.json index fb28e6203..ac671528d 100644 --- a/src/generated/resources/data/hybrid-aquatic/tags/worldgen/biome/piranha_spawn_biomes.json +++ b/src/generated/resources/data/hybrid-aquatic/tags/worldgen/biome/piranha_spawn_biomes.json @@ -2,6 +2,18 @@ "replace": false, "values": [ "minecraft:jungle", - "minecraft:sparse_jungle" + "minecraft:sparse_jungle", + { + "id": "wythers:jungle_river", + "required": false + }, + { + "id": "wythers:tropical_forest_river", + "required": false + }, + { + "id": "wythers:flooded_jungle", + "required": false + } ] } \ No newline at end of file diff --git a/src/generated/resources/data/hybrid-aquatic/tags/worldgen/biome/ratfish_spawn_biomes.json b/src/generated/resources/data/hybrid-aquatic/tags/worldgen/biome/ratfish_spawn_biomes.json index d254d34a1..08e9dfdae 100644 --- a/src/generated/resources/data/hybrid-aquatic/tags/worldgen/biome/ratfish_spawn_biomes.json +++ b/src/generated/resources/data/hybrid-aquatic/tags/worldgen/biome/ratfish_spawn_biomes.json @@ -1,14 +1,7 @@ { "replace": false, "values": [ - "minecraft:deep_cold_ocean", - "minecraft:deep_ocean", - "minecraft:deep_lukewarm_ocean", - "minecraft:deep_frozen_ocean", - "minecraft:ocean", - "minecraft:cold_ocean", - "minecraft:frozen_ocean", - "minecraft:lukewarm_ocean", - "minecraft:warm_ocean" + "#minecraft:is_deep_ocean", + "#minecraft:is_ocean" ] } \ No newline at end of file diff --git a/src/generated/resources/data/hybrid-aquatic/tags/worldgen/biome/sea_pig_spawn_biomes.json b/src/generated/resources/data/hybrid-aquatic/tags/worldgen/biome/sea_pig_spawn_biomes.json index cb125d57d..e7fc64902 100644 --- a/src/generated/resources/data/hybrid-aquatic/tags/worldgen/biome/sea_pig_spawn_biomes.json +++ b/src/generated/resources/data/hybrid-aquatic/tags/worldgen/biome/sea_pig_spawn_biomes.json @@ -1,9 +1,6 @@ { "replace": false, "values": [ - "minecraft:deep_lukewarm_ocean", - "minecraft:deep_ocean", - "minecraft:deep_cold_ocean", - "minecraft:deep_frozen_ocean" + "#minecraft:is_deep_ocean" ] } \ No newline at end of file diff --git a/src/generated/resources/data/hybrid-aquatic/tags/worldgen/biome/spider_crab_spawn_biomes.json b/src/generated/resources/data/hybrid-aquatic/tags/worldgen/biome/spider_crab_spawn_biomes.json index 40a7a71b9..e7fc64902 100644 --- a/src/generated/resources/data/hybrid-aquatic/tags/worldgen/biome/spider_crab_spawn_biomes.json +++ b/src/generated/resources/data/hybrid-aquatic/tags/worldgen/biome/spider_crab_spawn_biomes.json @@ -1,11 +1,6 @@ { "replace": false, "values": [ - "minecraft:deep_ocean", - "minecraft:deep_lukewarm_ocean", - "minecraft:deep_cold_ocean", - "minecraft:deep_frozen_ocean", - "minecraft:cold_ocean", - "minecraft:frozen_ocean" + "#minecraft:is_deep_ocean" ] } \ No newline at end of file diff --git a/src/generated/resources/data/hybrid-aquatic/tags/worldgen/biome/tetra_spawn_biomes.json b/src/generated/resources/data/hybrid-aquatic/tags/worldgen/biome/tetra_spawn_biomes.json new file mode 100644 index 000000000..aa74155b1 --- /dev/null +++ b/src/generated/resources/data/hybrid-aquatic/tags/worldgen/biome/tetra_spawn_biomes.json @@ -0,0 +1,20 @@ +{ + "replace": false, + "values": [ + "minecraft:jungle", + "minecraft:sparse_jungle", + "minecraft:mangrove_swamp", + { + "id": "wythers:jungle_river", + "required": false + }, + { + "id": "wythers:tropical_forest_river", + "required": false + }, + { + "id": "wythers:flooded_jungle", + "required": false + } + ] +} \ No newline at end of file diff --git a/src/generated/resources/data/hybrid-aquatic/tags/worldgen/biome/tiger_barb_spawn_biomes.json b/src/generated/resources/data/hybrid-aquatic/tags/worldgen/biome/tiger_barb_spawn_biomes.json index 47144e62e..b1b852023 100644 --- a/src/generated/resources/data/hybrid-aquatic/tags/worldgen/biome/tiger_barb_spawn_biomes.json +++ b/src/generated/resources/data/hybrid-aquatic/tags/worldgen/biome/tiger_barb_spawn_biomes.json @@ -2,6 +2,10 @@ "replace": false, "values": [ "minecraft:swamp", - "minecraft:mangrove_swamp" + "minecraft:mangrove_swamp", + { + "id": "wythers:waterlily_swamp", + "required": false + } ] } \ No newline at end of file diff --git a/src/generated/resources/data/hybrid-aquatic/tags/worldgen/biome/tube_sponge_spawn_biomes.json b/src/generated/resources/data/hybrid-aquatic/tags/worldgen/biome/tube_sponge_spawn_biomes.json index c0b2c32f9..af9fe6d01 100644 --- a/src/generated/resources/data/hybrid-aquatic/tags/worldgen/biome/tube_sponge_spawn_biomes.json +++ b/src/generated/resources/data/hybrid-aquatic/tags/worldgen/biome/tube_sponge_spawn_biomes.json @@ -1,14 +1,7 @@ { "replace": false, "values": [ - "minecraft:ocean", - "minecraft:deep_ocean", - "minecraft:frozen_ocean", - "minecraft:deep_frozen_ocean", - "minecraft:cold_ocean", - "minecraft:deep_cold_ocean", - "minecraft:lukewarm_ocean", - "minecraft:deep_lukewarm_ocean", - "minecraft:warm_ocean" + "#minecraft:is_ocean", + "#minecraft:is_deep_ocean" ] } \ No newline at end of file diff --git a/src/generated/resources/data/hybrid-aquatic/tags/worldgen/biome/umbrella_octopus_spawn_biomes.json b/src/generated/resources/data/hybrid-aquatic/tags/worldgen/biome/umbrella_octopus_spawn_biomes.json index d254d34a1..3e4e90e04 100644 --- a/src/generated/resources/data/hybrid-aquatic/tags/worldgen/biome/umbrella_octopus_spawn_biomes.json +++ b/src/generated/resources/data/hybrid-aquatic/tags/worldgen/biome/umbrella_octopus_spawn_biomes.json @@ -1,14 +1,6 @@ { "replace": false, "values": [ - "minecraft:deep_cold_ocean", - "minecraft:deep_ocean", - "minecraft:deep_lukewarm_ocean", - "minecraft:deep_frozen_ocean", - "minecraft:ocean", - "minecraft:cold_ocean", - "minecraft:frozen_ocean", - "minecraft:lukewarm_ocean", - "minecraft:warm_ocean" + "#minecraft:is_ocean" ] } \ No newline at end of file diff --git a/src/generated/resources/data/hybrid-aquatic/tags/worldgen/biome/vampire_crab_spawn_biomes.json b/src/generated/resources/data/hybrid-aquatic/tags/worldgen/biome/vampire_crab_spawn_biomes.json index b53b7f195..e3bedb1ac 100644 --- a/src/generated/resources/data/hybrid-aquatic/tags/worldgen/biome/vampire_crab_spawn_biomes.json +++ b/src/generated/resources/data/hybrid-aquatic/tags/worldgen/biome/vampire_crab_spawn_biomes.json @@ -5,6 +5,14 @@ "minecraft:bamboo_jungle", "minecraft:sparse_jungle", "minecraft:swamp", - "minecraft:mangrove_swamp" + "minecraft:mangrove_swamp", + { + "id": "wythers:flooded_jungle", + "required": false + }, + { + "id": "wythers:waterlily_swamp", + "required": false + } ] } \ No newline at end of file diff --git a/src/generated/resources/data/hybrid-aquatic/tags/worldgen/biome/vampire_squid_spawn_biomes.json b/src/generated/resources/data/hybrid-aquatic/tags/worldgen/biome/vampire_squid_spawn_biomes.json index d254d34a1..08e9dfdae 100644 --- a/src/generated/resources/data/hybrid-aquatic/tags/worldgen/biome/vampire_squid_spawn_biomes.json +++ b/src/generated/resources/data/hybrid-aquatic/tags/worldgen/biome/vampire_squid_spawn_biomes.json @@ -1,14 +1,7 @@ { "replace": false, "values": [ - "minecraft:deep_cold_ocean", - "minecraft:deep_ocean", - "minecraft:deep_lukewarm_ocean", - "minecraft:deep_frozen_ocean", - "minecraft:ocean", - "minecraft:cold_ocean", - "minecraft:frozen_ocean", - "minecraft:lukewarm_ocean", - "minecraft:warm_ocean" + "#minecraft:is_deep_ocean", + "#minecraft:is_ocean" ] } \ No newline at end of file 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 index 85de9de68..e655698e0 100644 --- a/src/main/kotlin/dev/hybridlabs/aquatic/data/server/tag/BiomeTagProvider.kt +++ b/src/main/kotlin/dev/hybridlabs/aquatic/data/server/tag/BiomeTagProvider.kt @@ -6,6 +6,7 @@ import net.fabricmc.fabric.api.datagen.v1.provider.FabricTagProvider import net.minecraft.registry.RegistryKeys import net.minecraft.registry.RegistryWrapper import net.minecraft.registry.tag.BiomeTags +import net.minecraft.util.Identifier import net.minecraft.world.biome.Biome import net.minecraft.world.biome.BiomeKeys import java.util.concurrent.CompletableFuture @@ -48,6 +49,9 @@ class BiomeTagProvider(output: FabricDataOutput, registriesFuture: CompletableFu BiomeKeys.JUNGLE, BiomeKeys.SPARSE_JUNGLE, ) + .addOptional(Identifier("wythers", "jungle_river")) + .addOptional(Identifier("wythers", "tropical_forest_river")) + .addOptional(Identifier("wythers", "flooded_jungle")) getOrCreateTagBuilder(HybridAquaticBiomeTags.STINGRAY_SPAWN_BIOMES).add( BiomeKeys.WARM_OCEAN, @@ -105,6 +109,7 @@ class BiomeTagProvider(output: FabricDataOutput, registriesFuture: CompletableFu BiomeKeys.BEACH, BiomeKeys.STONY_SHORE, ) + .addOptional(Identifier("wythers", "tropical_beach")) getOrCreateTagBuilder(HybridAquaticBiomeTags.GHOST_CRAB_SPAWN_BIOMES).add( BiomeKeys.OCEAN, @@ -113,6 +118,7 @@ class BiomeTagProvider(output: FabricDataOutput, registriesFuture: CompletableFu BiomeKeys.BEACH, BiomeKeys.STONY_SHORE, ) + .addOptional(Identifier("wythers", "tropical_beach")) getOrCreateTagBuilder(HybridAquaticBiomeTags.LIGHTFOOT_CRAB_SPAWN_BIOMES).add( BiomeKeys.OCEAN, @@ -121,6 +127,7 @@ class BiomeTagProvider(output: FabricDataOutput, registriesFuture: CompletableFu BiomeKeys.BEACH, BiomeKeys.STONY_SHORE, ) + .addOptional(Identifier("wythers", "tropical_beach")) getOrCreateTagBuilder(HybridAquaticBiomeTags.FLOWER_CRAB_SPAWN_BIOMES).add( BiomeKeys.OCEAN, @@ -128,6 +135,7 @@ class BiomeTagProvider(output: FabricDataOutput, registriesFuture: CompletableFu BiomeKeys.LUKEWARM_OCEAN, BiomeKeys.BEACH ) + .addOptional(Identifier("wythers", "tropical_beach")) getOrCreateTagBuilder(HybridAquaticBiomeTags.VAMPIRE_CRAB_SPAWN_BIOMES).add( BiomeKeys.JUNGLE, @@ -136,6 +144,8 @@ class BiomeTagProvider(output: FabricDataOutput, registriesFuture: CompletableFu BiomeKeys.SWAMP, BiomeKeys.MANGROVE_SWAMP ) + .addOptional(Identifier("wythers", "flooded_jungle")) + .addOptional(Identifier("wythers", "waterlily_swamp")) getOrCreateTagBuilder(HybridAquaticBiomeTags.HORSESHOE_CRAB_SPAWN_BIOMES).add( BiomeKeys.OCEAN, @@ -144,14 +154,8 @@ class BiomeTagProvider(output: FabricDataOutput, registriesFuture: CompletableFu BiomeKeys.BEACH, ) - getOrCreateTagBuilder(HybridAquaticBiomeTags.SPIDER_CRAB_SPAWN_BIOMES).add( - BiomeKeys.DEEP_OCEAN, - BiomeKeys.DEEP_LUKEWARM_OCEAN, - BiomeKeys.DEEP_COLD_OCEAN, - BiomeKeys.DEEP_FROZEN_OCEAN, - BiomeKeys.COLD_OCEAN, - BiomeKeys.FROZEN_OCEAN, - ) + getOrCreateTagBuilder(HybridAquaticBiomeTags.SPIDER_CRAB_SPAWN_BIOMES) + .forceAddTag(BiomeTags.IS_DEEP_OCEAN) getOrCreateTagBuilder(HybridAquaticBiomeTags.YETI_CRAB_SPAWN_BIOMES).add( BiomeKeys.DEEP_COLD_OCEAN, @@ -159,25 +163,19 @@ class BiomeTagProvider(output: FabricDataOutput, registriesFuture: CompletableFu BiomeKeys.DEEP_FROZEN_OCEAN, ) - getOrCreateTagBuilder(HybridAquaticBiomeTags.GIANT_ISOPOD_SPAWN_BIOMES).add( - BiomeKeys.DEEP_OCEAN, - BiomeKeys.DEEP_LUKEWARM_OCEAN, - BiomeKeys.DEEP_COLD_OCEAN, - BiomeKeys.DEEP_FROZEN_OCEAN, - BiomeKeys.COLD_OCEAN, - BiomeKeys.FROZEN_OCEAN, - ) + getOrCreateTagBuilder(HybridAquaticBiomeTags.GIANT_ISOPOD_SPAWN_BIOMES) + .forceAddTag(BiomeTags.IS_DEEP_OCEAN) getOrCreateTagBuilder(HybridAquaticBiomeTags.SHRIMP_SPAWN_BIOMES).add( BiomeKeys.WARM_OCEAN, BiomeKeys.LUKEWARM_OCEAN, ) - getOrCreateTagBuilder(HybridAquaticBiomeTags.CRAYFISH_SPAWN_BIOMES).add( - BiomeKeys.SWAMP, - BiomeKeys.MANGROVE_SWAMP, - BiomeKeys.RIVER, - ) + getOrCreateTagBuilder(HybridAquaticBiomeTags.CRAYFISH_SPAWN_BIOMES) + .add(BiomeKeys.SWAMP) + .forceAddTag(BiomeTags.IS_RIVER) + .addOptional(Identifier("wythers", "waterlily_swamp")) + .addOptional(Identifier("wythers", "gravelly_river")) getOrCreateTagBuilder(HybridAquaticBiomeTags.LOBSTER_SPAWN_BIOMES).add( BiomeKeys.WARM_OCEAN, @@ -188,6 +186,7 @@ class BiomeTagProvider(output: FabricDataOutput, registriesFuture: CompletableFu getOrCreateTagBuilder(HybridAquaticBiomeTags.COCONUT_CRAB_SPAWN_BIOMES).add( BiomeKeys.BEACH, ) + .addOptional(Identifier("wythers", "tropical_beach")) getOrCreateTagBuilder(HybridAquaticBiomeTags.CUTTLEFISH_SPAWN_BIOMES).add( BiomeKeys.WARM_OCEAN, @@ -198,35 +197,22 @@ class BiomeTagProvider(output: FabricDataOutput, registriesFuture: CompletableFu BiomeKeys.JUNGLE, BiomeKeys.SPARSE_JUNGLE, ) + .addOptional(Identifier("wythers", "jungle_river")) + .addOptional(Identifier("wythers", "tropical_forest_river")) + .addOptional(Identifier("wythers", "flooded_jungle")) - getOrCreateTagBuilder(HybridAquaticBiomeTags.DRAGONFISH_SPAWN_BIOMES).add( - BiomeKeys.DEEP_COLD_OCEAN, - BiomeKeys.DEEP_OCEAN, - BiomeKeys.DEEP_LUKEWARM_OCEAN, - BiomeKeys.DEEP_FROZEN_OCEAN, - BiomeKeys.OCEAN, - BiomeKeys.COLD_OCEAN, - BiomeKeys.FROZEN_OCEAN, - BiomeKeys.LUKEWARM_OCEAN, - BiomeKeys.WARM_OCEAN, - ) + getOrCreateTagBuilder(HybridAquaticBiomeTags.DRAGONFISH_SPAWN_BIOMES) + .forceAddTag(BiomeTags.IS_OCEAN) - getOrCreateTagBuilder(HybridAquaticBiomeTags.UMBRELLA_OCTOPUS_SPAWN_BIOMES).add( - BiomeKeys.DEEP_COLD_OCEAN, - BiomeKeys.DEEP_OCEAN, - BiomeKeys.DEEP_LUKEWARM_OCEAN, - BiomeKeys.DEEP_FROZEN_OCEAN, - BiomeKeys.OCEAN, - BiomeKeys.COLD_OCEAN, - BiomeKeys.FROZEN_OCEAN, - BiomeKeys.LUKEWARM_OCEAN, - BiomeKeys.WARM_OCEAN, - ) + getOrCreateTagBuilder(HybridAquaticBiomeTags.UMBRELLA_OCTOPUS_SPAWN_BIOMES) + .forceAddTag(BiomeTags.IS_OCEAN) - getOrCreateTagBuilder(HybridAquaticBiomeTags.FIDDLER_CRAB_SPAWN_BIOMES).add( + getOrCreateTagBuilder(HybridAquaticBiomeTags.FIDDLER_CRAB_SPAWN_BIOMES) + .add( BiomeKeys.MANGROVE_SWAMP, BiomeKeys.BEACH, - ) + ) + .addOptional(Identifier("wythers", "waterlily_swamp")) getOrCreateTagBuilder(HybridAquaticBiomeTags.FIREFLY_SQUID_SPAWN_BIOMES).add( BiomeKeys.DEEP_COLD_OCEAN, @@ -236,21 +222,11 @@ class BiomeTagProvider(output: FabricDataOutput, registriesFuture: CompletableFu BiomeKeys.WARM_OCEAN, ) - getOrCreateTagBuilder(HybridAquaticBiomeTags.FLASHLIGHT_FISH_SPAWN_BIOMES).add( - BiomeKeys.DEEP_COLD_OCEAN, - BiomeKeys.DEEP_OCEAN, - BiomeKeys.DEEP_LUKEWARM_OCEAN, - BiomeKeys.WARM_OCEAN, - ) + getOrCreateTagBuilder(HybridAquaticBiomeTags.FLASHLIGHT_FISH_SPAWN_BIOMES) + .forceAddTag(BiomeTags.IS_DEEP_OCEAN) - getOrCreateTagBuilder(HybridAquaticBiomeTags.FRILLED_SHARK_SPAWN_BIOMES).add( - BiomeKeys.DEEP_OCEAN, - BiomeKeys.DEEP_COLD_OCEAN, - BiomeKeys.OCEAN, - BiomeKeys.COLD_OCEAN, - BiomeKeys.FROZEN_OCEAN, - BiomeKeys.DEEP_FROZEN_OCEAN, - ) + getOrCreateTagBuilder(HybridAquaticBiomeTags.FRILLED_SHARK_SPAWN_BIOMES) + .forceAddTag(BiomeTags.IS_DEEP_OCEAN) getOrCreateTagBuilder(HybridAquaticBiomeTags.SEA_NETTLE_SPAWN_BIOMES).add( BiomeKeys.LUKEWARM_OCEAN, @@ -271,6 +247,9 @@ class BiomeTagProvider(output: FabricDataOutput, registriesFuture: CompletableFu BiomeKeys.SWAMP, BiomeKeys.MANGROVE_SWAMP, ) + .addOptional(Identifier("wythers", "jungle_river")) + .addOptional(Identifier("wythers", "tropical_forest_river")) + .addOptional(Identifier("wythers", "flooded_jungle")) getOrCreateTagBuilder(HybridAquaticBiomeTags.GREAT_WHITE_SHARK_SPAWN_BIOMES) .forceAddTag(BiomeTags.IS_DEEP_OCEAN) @@ -319,16 +298,9 @@ class BiomeTagProvider(output: FabricDataOutput, registriesFuture: CompletableFu BiomeKeys.DEEP_COLD_OCEAN, ) - getOrCreateTagBuilder(HybridAquaticBiomeTags.ATOLLA_JELLYFISH_SPAWN_BIOMES).add( - BiomeKeys.DEEP_COLD_OCEAN, - BiomeKeys.DEEP_OCEAN, - BiomeKeys.DEEP_FROZEN_OCEAN, - BiomeKeys.OCEAN, - BiomeKeys.LUKEWARM_OCEAN, - BiomeKeys.DEEP_LUKEWARM_OCEAN, - BiomeKeys.COLD_OCEAN, - BiomeKeys.FROZEN_OCEAN, - ) + getOrCreateTagBuilder(HybridAquaticBiomeTags.ATOLLA_JELLYFISH_SPAWN_BIOMES) + .forceAddTag(BiomeTags.IS_DEEP_OCEAN) + .forceAddTag(BiomeTags.IS_OCEAN) getOrCreateTagBuilder(HybridAquaticBiomeTags.LIONS_MANE_JELLYFISH_SPAWN_BIOMES).add( BiomeKeys.FROZEN_OCEAN, @@ -405,23 +377,21 @@ class BiomeTagProvider(output: FabricDataOutput, registriesFuture: CompletableFu BiomeKeys.JUNGLE, BiomeKeys.SPARSE_JUNGLE, ) + .addOptional(Identifier("wythers", "jungle_river")) + .addOptional(Identifier("wythers", "tropical_forest_river")) + .addOptional(Identifier("wythers", "flooded_jungle")) getOrCreateTagBuilder(HybridAquaticBiomeTags.PIRANHA_SPAWN_BIOMES).add( - BiomeKeys.JUNGLE, - BiomeKeys.SPARSE_JUNGLE, + BiomeKeys.JUNGLE, + BiomeKeys.SPARSE_JUNGLE, ) + .addOptional(Identifier("wythers", "jungle_river")) + .addOptional(Identifier("wythers", "tropical_forest_river")) + .addOptional(Identifier("wythers", "flooded_jungle")) - getOrCreateTagBuilder(HybridAquaticBiomeTags.RATFISH_SPAWN_BIOMES).add( - BiomeKeys.DEEP_COLD_OCEAN, - BiomeKeys.DEEP_OCEAN, - BiomeKeys.DEEP_LUKEWARM_OCEAN, - BiomeKeys.DEEP_FROZEN_OCEAN, - BiomeKeys.OCEAN, - BiomeKeys.COLD_OCEAN, - BiomeKeys.FROZEN_OCEAN, - BiomeKeys.LUKEWARM_OCEAN, - BiomeKeys.WARM_OCEAN, - ) + getOrCreateTagBuilder(HybridAquaticBiomeTags.RATFISH_SPAWN_BIOMES) + .forceAddTag(BiomeTags.IS_DEEP_OCEAN) + .forceAddTag(BiomeTags.IS_OCEAN) getOrCreateTagBuilder(HybridAquaticBiomeTags.ROCKFISH_SPAWN_BIOMES).add( BiomeKeys.WARM_OCEAN, @@ -441,12 +411,8 @@ class BiomeTagProvider(output: FabricDataOutput, registriesFuture: CompletableFu .forceAddTag(BiomeTags.IS_OCEAN) .forceAddTag(BiomeTags.IS_DEEP_OCEAN) - getOrCreateTagBuilder(HybridAquaticBiomeTags.SEA_PIG_SPAWN_BIOMES).add( - BiomeKeys.DEEP_LUKEWARM_OCEAN, - BiomeKeys.DEEP_OCEAN, - BiomeKeys.DEEP_COLD_OCEAN, - BiomeKeys.DEEP_FROZEN_OCEAN, - ) + getOrCreateTagBuilder(HybridAquaticBiomeTags.SEA_PIG_SPAWN_BIOMES) + .forceAddTag(BiomeTags.IS_DEEP_OCEAN) getOrCreateTagBuilder(HybridAquaticBiomeTags.REGULAR_SEA_CUCUMBER_SPAWN_BIOMES).add( BiomeKeys.OCEAN, @@ -484,12 +450,8 @@ class BiomeTagProvider(output: FabricDataOutput, registriesFuture: CompletableFu BiomeKeys.LUKEWARM_OCEAN, ) - getOrCreateTagBuilder(HybridAquaticBiomeTags.BRITTLESTAR_SPAWN_BIOMES).add( - BiomeKeys.DEEP_OCEAN, - BiomeKeys.DEEP_COLD_OCEAN, - BiomeKeys.DEEP_LUKEWARM_OCEAN, - BiomeKeys.DEEP_FROZEN_OCEAN, - ) + getOrCreateTagBuilder(HybridAquaticBiomeTags.BRITTLESTAR_SPAWN_BIOMES) + .forceAddTag(BiomeTags.IS_DEEP_OCEAN) getOrCreateTagBuilder(HybridAquaticBiomeTags.COT_SPAWN_BIOMES).add( BiomeKeys.WARM_OCEAN, @@ -531,10 +493,12 @@ class BiomeTagProvider(output: FabricDataOutput, registriesFuture: CompletableFu BiomeKeys.LUKEWARM_OCEAN, ) - getOrCreateTagBuilder(HybridAquaticBiomeTags.TIGER_BARB_SPAWN_BIOMES).add( + getOrCreateTagBuilder(HybridAquaticBiomeTags.TIGER_BARB_SPAWN_BIOMES) + .add( BiomeKeys.SWAMP, - BiomeKeys.MANGROVE_SWAMP, - ) + BiomeKeys.MANGROVE_SWAMP + ) + .addOptional(Identifier("wythers", "waterlily_swamp")) getOrCreateTagBuilder(HybridAquaticBiomeTags.TIGER_SHARK_SPAWN_BIOMES).add( BiomeKeys.DEEP_OCEAN, @@ -560,17 +524,9 @@ class BiomeTagProvider(output: FabricDataOutput, registriesFuture: CompletableFu BiomeKeys.LUKEWARM_OCEAN, ) - getOrCreateTagBuilder(HybridAquaticBiomeTags.VAMPIRE_SQUID_SPAWN_BIOMES).add( - BiomeKeys.DEEP_COLD_OCEAN, - BiomeKeys.DEEP_OCEAN, - BiomeKeys.DEEP_LUKEWARM_OCEAN, - BiomeKeys.DEEP_FROZEN_OCEAN, - BiomeKeys.OCEAN, - BiomeKeys.COLD_OCEAN, - BiomeKeys.FROZEN_OCEAN, - BiomeKeys.LUKEWARM_OCEAN, - BiomeKeys.WARM_OCEAN, - ) + getOrCreateTagBuilder(HybridAquaticBiomeTags.VAMPIRE_SQUID_SPAWN_BIOMES) + .forceAddTag(BiomeTags.IS_DEEP_OCEAN) + .forceAddTag(BiomeTags.IS_OCEAN) getOrCreateTagBuilder(HybridAquaticBiomeTags.WHALE_SHARK_SPAWN_BIOMES).add( BiomeKeys.DEEP_OCEAN, @@ -602,23 +558,27 @@ class BiomeTagProvider(output: FabricDataOutput, registriesFuture: CompletableFu BiomeKeys.SPARSE_JUNGLE, BiomeKeys.MANGROVE_SWAMP, ) + .addOptional(Identifier("wythers", "jungle_river")) + .addOptional(Identifier("wythers", "tropical_forest_river")) + .addOptional(Identifier("wythers", "flooded_jungle")) - getOrCreateTagBuilder(HybridAquaticBiomeTags.ANEMONE_SPAWN_BIOMES).add( - BiomeKeys.WARM_OCEAN, + getOrCreateTagBuilder(HybridAquaticBiomeTags.TETRA_SPAWN_BIOMES).add( + BiomeKeys.JUNGLE, + BiomeKeys.SPARSE_JUNGLE, + BiomeKeys.MANGROVE_SWAMP, ) + .addOptional(Identifier("wythers", "jungle_river")) + .addOptional(Identifier("wythers", "tropical_forest_river")) + .addOptional(Identifier("wythers", "flooded_jungle")) - getOrCreateTagBuilder(HybridAquaticBiomeTags.TUBE_SPONGE_SPAWN_BIOMES).add( - BiomeKeys.OCEAN, - BiomeKeys.DEEP_OCEAN, - BiomeKeys.FROZEN_OCEAN, - BiomeKeys.DEEP_FROZEN_OCEAN, - BiomeKeys.COLD_OCEAN, - BiomeKeys.DEEP_COLD_OCEAN, - BiomeKeys.LUKEWARM_OCEAN, - BiomeKeys.DEEP_LUKEWARM_OCEAN, + getOrCreateTagBuilder(HybridAquaticBiomeTags.ANEMONE_SPAWN_BIOMES).add( BiomeKeys.WARM_OCEAN, ) + getOrCreateTagBuilder(HybridAquaticBiomeTags.TUBE_SPONGE_SPAWN_BIOMES) + .forceAddTag(BiomeTags.IS_OCEAN) + .forceAddTag(BiomeTags.IS_DEEP_OCEAN) + getOrCreateTagBuilder(HybridAquaticBiomeTags.GIANT_CLAM_SPAWN_BIOMES).add( BiomeKeys.WARM_OCEAN, BiomeKeys.LUKEWARM_OCEAN,