Ran datagen and added new message in bottle

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

@@ -74,6 +74,7 @@
   "entity.hybrid-aquatic.betta": "Betta",
   "entity.hybrid-aquatic.blue_jellyfish": "Blue Jellyfish",
   "entity.hybrid-aquatic.bull_shark": "Bull Shark",
+  "entity.hybrid-aquatic.carp": "Carp",
   "entity.hybrid-aquatic.cauliflower_jellyfish": "Cauliflower Jellyfish",
   "entity.hybrid-aquatic.clownfish": "Clownfish",
   "entity.hybrid-aquatic.coconut_crab": "Coconut Crab",
@@ -163,6 +164,8 @@
   "hybrid-aquatic.sea_message.warranty": "We've been trying to reach you about your car's extended warranty.",
   "hybrid-aquatic.sea_message.warranty.title": "IMPORTANT: PLEASE READ",
   "hybrid-aquatic.sea_message.willowshine": "Beware the fish girl",
+  "hybrid-aquatic.sea_message.womp_womp": "womp womp",
+  "hybrid-aquatic.sea_message.womp_womp.title": "Catchphrase",
   "item.hybrid-aquatic.anglerfish": "Anglerfish",
   "item.hybrid-aquatic.anglerfish_spawn_egg": "Anglerfish Spawn Egg",
   "item.hybrid-aquatic.atolla_jellyfish_spawn_egg": "Atolla Jellyfish Spawn Egg",
@@ -179,6 +182,7 @@
   "item.hybrid-aquatic.blue_spotted_stingray": "Blue Spotted Stingray",
   "item.hybrid-aquatic.blue_tang": "Blue Tang",
   "item.hybrid-aquatic.bull_shark_spawn_egg": "Bull Shark Spawn Egg",
+  "item.hybrid-aquatic.carp_spawn_egg": "Carp Spawn Egg",
   "item.hybrid-aquatic.cauliflower_jellyfish_spawn_egg": "Cauliflower Jellyfish Spawn Egg",
   "item.hybrid-aquatic.clownfish": "Clownfish",
   "item.hybrid-aquatic.clownfish_spawn_egg": "Clownfish Spawn Egg",

src/generated/resources/assets/hybrid-aquatic/models/item/carp_spawn_egg.json

@@ -0,0 +1,3 @@
+{
+  "parent": "minecraft:item/template_spawn_egg"
+}

src/generated/resources/data/hybrid-aquatic/hybrid-aquatic/sea_message/womp_womp.json

@@ -0,0 +1,5 @@
+{
+  "author": "MrPress",
+  "has_title": true,
+  "translation_key": "hybrid-aquatic.sea_message.womp_womp"
+}

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

@@ -1,6 +1,10 @@
 {
   "replace": false,
   "values": [
-    "minecraft:warm_ocean"
+    "minecraft:warm_ocean",
+    {
+      "id": "regions_unexplored:rocky_reef",
+      "required": false
+    }
   ]
 }

src/generated/resources/data/hybrid-aquatic/tags/worldgen/biome/anglerfish_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_ocean",
+    "#minecraft:is_deep_ocean"
   ]
 }

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

@@ -6,6 +6,10 @@
     "minecraft:ocean",
     "minecraft:deep_lukewarm_ocean",
     "minecraft:lukewarm_ocean",
-    "minecraft:deep_ocean"
+    "minecraft:deep_ocean",
+    {
+      "id": "regions_unexplored:rocky_reef",
+      "required": false
+    }
   ]
 }

src/generated/resources/data/hybrid-aquatic/tags/worldgen/biome/barreleye_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_ocean",
+    "#minecraft:is_deep_ocean"
   ]
 }

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

@@ -22,6 +22,10 @@
     {
       "id": "regions_unexplored:tropical_river",
       "required": false
+    },
+    {
+      "id": "regions_unexplored:marsh",
+      "required": false
     }
   ]
 }

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

@@ -6,6 +6,10 @@
     "minecraft:deep_lukewarm_ocean",
     "minecraft:lukewarm_ocean",
     "minecraft:ocean",
-    "minecraft:deep_ocean"
+    "minecraft:deep_ocean",
+    {
+      "id": "regions_unexplored:rocky_reef",
+      "required": false
+    }
   ]
 }

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

@@ -3,6 +3,10 @@
   "values": [
     "minecraft:warm_ocean",
     "minecraft:deep_lukewarm_ocean",
-    "minecraft:lukewarm_ocean"
+    "minecraft:lukewarm_ocean",
+    {
+      "id": "regions_unexplored:rocky_reef",
+      "required": false
+    }
   ]
 }

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

@@ -2,6 +2,10 @@
   "replace": false,
   "values": [
     "minecraft:warm_ocean",
-    "minecraft:lukewarm_ocean"
+    "minecraft:lukewarm_ocean",
+    {
+      "id": "regions_unexplored:rocky_reef",
+      "required": false
+    }
   ]
 }

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

@@ -5,6 +5,10 @@
     {
       "id": "wythers:tropical_beach",
       "required": false
+    },
+    {
+      "id": "regions_unexplored:rocky_reef",
+      "required": false
     }
   ]
 }

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

@@ -6,6 +6,10 @@
     "minecraft:ocean",
     "minecraft:deep_lukewarm_ocean",
     "minecraft:lukewarm_ocean",
-    "minecraft:deep_ocean"
+    "minecraft:deep_ocean",
+    {
+      "id": "regions_unexplored:rocky_reef",
+      "required": false
+    }
   ]
 }

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

@@ -1,6 +1,10 @@
 {
   "replace": false,
   "values": [
-    "minecraft:warm_ocean"
+    "minecraft:warm_ocean",
+    {
+      "id": "regions_unexplored:rocky_reef",
+      "required": false
+    }
   ]
 }

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

@@ -2,6 +2,10 @@
   "replace": false,
   "values": [
     "minecraft:warm_ocean",
-    "minecraft:lukewarm_ocean"
+    "minecraft:lukewarm_ocean",
+    {
+      "id": "regions_unexplored:rocky_reef",
+      "required": false
+    }
   ]
 }

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

@@ -22,6 +22,10 @@
     {
       "id": "regions_unexplored:muddy_river",
       "required": false
+    },
+    {
+      "id": "regions_unexplored:marsh",
+      "required": false
     }
   ]
 }

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

@@ -2,6 +2,10 @@
   "replace": false,
   "values": [
     "minecraft:warm_ocean",
-    "minecraft:lukewarm_ocean"
+    "minecraft:lukewarm_ocean",
+    {
+      "id": "regions_unexplored:rocky_reef",
+      "required": false
+    }
   ]
 }

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

@@ -4,6 +4,11 @@
     "minecraft:ocean",
     "minecraft:warm_ocean",
     "minecraft:lukewarm_ocean",
-    "minecraft:beach"
+    "minecraft:beach",
+    "minecraft:stony_shore",
+    {
+      "id": "regions_unexplored:rocky_reef",
+      "required": false
+    }
   ]
 }

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": "regions_unexplored:rocky_reef",
+      "required": false
+    }
   ]
 }

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

@@ -5,6 +5,10 @@
     "minecraft:deep_ocean",
     "minecraft:deep_lukewarm_ocean",
     "minecraft:lukewarm_ocean",
-    "minecraft:warm_ocean"
+    "minecraft:warm_ocean",
+    {
+      "id": "regions_unexplored:rocky_reef",
+      "required": false
+    }
   ]
 }

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

@@ -3,6 +3,10 @@
   "values": [
     "minecraft:warm_ocean",
     "minecraft:deep_lukewarm_ocean",
-    "minecraft:lukewarm_ocean"
+    "minecraft:lukewarm_ocean",
+    {
+      "id": "regions_unexplored:rocky_reef",
+      "required": false
+    }
   ]
 }

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

@@ -2,6 +2,10 @@
   "replace": false,
   "values": [
     "minecraft:warm_ocean",
-    "minecraft:lukewarm_ocean"
+    "minecraft:lukewarm_ocean",
+    {
+      "id": "regions_unexplored:rocky_reef",
+      "required": false
+    }
   ]
 }

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

@@ -1,6 +1,14 @@
 {
   "replace": false,
   "values": [
-    "minecraft:cherry_grove"
+    "minecraft:cherry_grove",
+    {
+      "id": "regions_unexplored:mauve_hills",
+      "required": false
+    },
+    {
+      "id": "regions_unexplored:magnolia_woodland",
+      "required": false
+    }
   ]
 }

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

@@ -1,7 +1,6 @@
 {
   "replace": false,
   "values": [
-    "minecraft:swamp",
     "minecraft:mangrove_swamp",
     {
       "id": "wythers:jungle_river",

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

@@ -2,6 +2,10 @@
   "replace": false,
   "values": [
     "minecraft:warm_ocean",
-    "minecraft:lukewarm_ocean"
+    "minecraft:lukewarm_ocean",
+    {
+      "id": "regions_unexplored:rocky_reef",
+      "required": false
+    }
   ]
 }

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

@@ -1,6 +1,14 @@
 {
   "replace": false,
   "values": [
-    "minecraft:cherry_grove"
+    "minecraft:cherry_grove",
+    {
+      "id": "regions_unexplored:mauve_hills",
+      "required": false
+    },
+    {
+      "id": "regions_unexplored:magnolia_woodland",
+      "required": false
+    }
   ]
 }

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

@@ -9,6 +9,10 @@
     {
       "id": "wythers:tropical_beach",
       "required": false
+    },
+    {
+      "id": "regions_unexplored:rocky_reef",
+      "required": false
     }
   ]
 }

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

@@ -2,6 +2,10 @@
   "replace": false,
   "values": [
     "minecraft:warm_ocean",
-    "minecraft:lukewarm_ocean"
+    "minecraft:lukewarm_ocean",
+    {
+      "id": "regions_unexplored:rocky_reef",
+      "required": false
+    }
   ]
 }

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

@@ -3,6 +3,10 @@
   "values": [
     "minecraft:warm_ocean",
     "minecraft:lukewarm_ocean",
-    "minecraft:ocean"
+    "minecraft:ocean",
+    {
+      "id": "regions_unexplored:rocky_reef",
+      "required": false
+    }
   ]
 }

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

@@ -4,6 +4,10 @@
     "minecraft:ocean",
     "minecraft:lukewarm_ocean",
     "minecraft:deep_ocean",
-    "minecraft:deep_lukewarm_ocean"
+    "minecraft:deep_lukewarm_ocean",
+    {
+      "id": "regions_unexplored:rocky_reef",
+      "required": false
+    }
   ]
 }