Added basic compatibility with William Wythers Expanded Ecosphere

hybridlabs · Jul 4, 2024 · 760e1d6 · 760e1d6
1 parent 2d969ce
commit 760e1d6
Show file tree

Hide file tree

Showing 29 changed files with 249 additions and 217 deletions.
diff --git a/...ated/resources/data/hybrid-aquatic/tags/worldgen/biome/atolla_jellyfish_spawn_biomes.json b/...ated/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"
   ]
 }
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
@@ -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
+    }
   ]
 }
diff --git a/...generated/resources/data/hybrid-aquatic/tags/worldgen/biome/brittlestar_spawn_biomes.json b/...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"
   ]
 }
diff --git a/...enerated/resources/data/hybrid-aquatic/tags/worldgen/biome/coconut_crab_spawn_biomes.json b/...enerated/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
+    }
   ]
 }
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
@@ -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
+    }
   ]
 }
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
@@ -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
+    }
   ]
 }
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
@@ -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
+    }
   ]
 }
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
@@ -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"
   ]
 }
diff --git a/...enerated/resources/data/hybrid-aquatic/tags/worldgen/biome/fiddler_crab_spawn_biomes.json b/...enerated/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
+    }
   ]
 }
diff --git a/...rated/resources/data/hybrid-aquatic/tags/worldgen/biome/flashlight_fish_spawn_biomes.json b/...rated/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"
   ]
 }
diff --git a/...generated/resources/data/hybrid-aquatic/tags/worldgen/biome/flower_crab_spawn_biomes.json b/...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
+    }
   ]
 }
diff --git a/...nerated/resources/data/hybrid-aquatic/tags/worldgen/biome/frilled_shark_spawn_biomes.json b/...nerated/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"
   ]
 }
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
@@ -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
+    }
   ]
 }
diff --git a/...enerated/resources/data/hybrid-aquatic/tags/worldgen/biome/giant_isopod_spawn_biomes.json b/...enerated/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"
   ]
 }
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
@@ -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
+    }
   ]
 }
diff --git a/...generated/resources/data/hybrid-aquatic/tags/worldgen/biome/hermit_crab_spawn_biomes.json b/...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
+    }
   ]
 }
diff --git a/...erated/resources/data/hybrid-aquatic/tags/worldgen/biome/lightfoot_crab_spawn_biomes.json b/...erated/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
+    }
   ]
 }
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
@@ -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
+    }
   ]
 }
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
@@ -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
+    }
   ]
 }
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
@@ -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"
   ]
 }
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
@@ -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"
   ]
 }
diff --git a/...generated/resources/data/hybrid-aquatic/tags/worldgen/biome/spider_crab_spawn_biomes.json b/...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"
   ]
 }
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
@@ -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
+    }
+  ]
+}
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
@@ -2,6 +2,10 @@
   "replace": false,
   "values": [
     "minecraft:swamp",
-    "minecraft:mangrove_swamp"
+    "minecraft:mangrove_swamp",
+    {
+      "id": "wythers:waterlily_swamp",
+      "required": false
+    }
   ]
 }