Tweaked biome builder to remove vanilla cherry grove/meadow from our …

…biome regions, tweaked animal spawns for certain biomes, misc asset cleanup
Glitchfiend · Mar 2, 2024 · 946d271 · 946d271
1 parent 10b8bb6
commit 946d271
Show file tree

Hide file tree

Showing 22 changed files with 166 additions and 139 deletions.
diff --git a/common/src/generated/resources/.cache/103d9f3f36b01595f1aa5172191e60eff02e6924 b/common/src/generated/resources/.cache/103d9f3f36b01595f1aa5172191e60eff02e6924
@@ -1,10 +1,10 @@
-// 1.20.4	2024-02-16T23:49:49.4194403	Registries
+// 1.20.4	2024-03-01T23:15:47.2293091	Registries
 bec08031dc5126119d3c7a1033703f8235bdf56e data/biomesoplenty/damage_type/bramble.json
 41f8df67f585538edc9847b6754275d24b813e06 data/biomesoplenty/damage_type/fumarole.json
 1db19ce8d33b8c131955b60ed830200bbee6a912 data/biomesoplenty/worldgen/biome/aspen_glade.json
-42e40aad7b302a8852edbfd224ed40d346601171 data/biomesoplenty/worldgen/biome/auroral_garden.json
+60d59d29b8998f29bfbbce0cde352f0aabc0376c data/biomesoplenty/worldgen/biome/auroral_garden.json
 2f83184d9ae2b17e8fbf9cf587de7c26a92b2a0e data/biomesoplenty/worldgen/biome/bayou.json
-db0c1c6cd86c593a9d97a250a93f78eb31cb964e data/biomesoplenty/worldgen/biome/bog.json
+c58515f1fea8f8a3eb0c406357ffac7955028795 data/biomesoplenty/worldgen/biome/bog.json
 3e51233412b1413b5808f93d4f9f01ba676ff1ea data/biomesoplenty/worldgen/biome/clover_patch.json
 28fd22f25ece7e18098e1ff77f4f2d53300489a5 data/biomesoplenty/worldgen/biome/cold_desert.json
 771af0c393c79eb8b0feb3d9fdec84f3828a2e1b data/biomesoplenty/worldgen/biome/coniferous_forest.json
@@ -28,12 +28,12 @@ d9000040ce4407e603b2089bb386181a6f4c4427 data/biomesoplenty/worldgen/biome/glowi
 c60852465ebacbddccba4c8a3ecc7fc7c958ece2 data/biomesoplenty/worldgen/biome/highland.json
 95bfe311c5f232012863d1047022f609d6c26cee data/biomesoplenty/worldgen/biome/hot_springs.json
 c1a5b54c326719b757ca2d91d84761a8d5c63a6e data/biomesoplenty/worldgen/biome/jacaranda_glade.json
-db467c12d72e4d7c68e40849a87a19d4f07a7547 data/biomesoplenty/worldgen/biome/jade_cliffs.json
-dbd2116f54e13f7637b0b6ea569506f7d9a66f14 data/biomesoplenty/worldgen/biome/lavender_field.json
+10d898d097a5ffb6d89fb0e9742fcf1dbf7cfb44 data/biomesoplenty/worldgen/biome/jade_cliffs.json
+0cb0d608c85fd521a156093c739f05dc0376b546 data/biomesoplenty/worldgen/biome/lavender_field.json
 9271f8b08e20a5b849d6b7117e4f16e17f1073b4 data/biomesoplenty/worldgen/biome/lush_desert.json
-e7b67fadf73cc6ef20430071a00ae224c09af64e data/biomesoplenty/worldgen/biome/lush_savanna.json
-fb8fed2ce44b547589d94ea42d3ae15b5252ec68 data/biomesoplenty/worldgen/biome/maple_woods.json
-c2cbdfcebec081e2f243cad5f56be4de684d50fc data/biomesoplenty/worldgen/biome/marsh.json
+af694b4e6d616db214b658bd0d59bf5d14c34caa data/biomesoplenty/worldgen/biome/lush_savanna.json
+4804f4f5c89afe2a5e25b05c320f2c5aeece60d8 data/biomesoplenty/worldgen/biome/maple_woods.json
+6be1f3544c3295b99ccf7c1c9958ab9ce58e194d data/biomesoplenty/worldgen/biome/marsh.json
 720c0d07ae063e27eef09fde77687496afffbb6d data/biomesoplenty/worldgen/biome/mediterranean_forest.json
 4f7d2a54b4eb3089e102a66e882d3a83d8e3c2dd data/biomesoplenty/worldgen/biome/moor.json
 db3fa7b84f20c42269e21304b79dddbefe1ae15d data/biomesoplenty/worldgen/biome/muskeg.json
@@ -46,17 +46,17 @@ de4c57b15aa7ccae2a9a0ff2d23ce72f75732550 data/biomesoplenty/worldgen/biome/origi
 d069fd79392dfcb351dd0e634e6ea4f9e83ba9ff data/biomesoplenty/worldgen/biome/pasture.json
 4603e83b7a2328b9175968047c7fce60c81ba0f3 data/biomesoplenty/worldgen/biome/prairie.json
 c192e14c69fed976327bb9429a643ae0a77a7cac data/biomesoplenty/worldgen/biome/pumpkin_patch.json
-6c8e60f6976657e727ac444f8db4f1972c9ff975 data/biomesoplenty/worldgen/biome/rainforest.json
+9fe7f995e8ee061051da9014bf21d0c68573643a data/biomesoplenty/worldgen/biome/rainforest.json
 21389471c642c1b46eb6679d54d2fcbd0aa966db data/biomesoplenty/worldgen/biome/redwood_forest.json
-690b5a1be251f98874dfdd2fbb3ef3bd811ecaa0 data/biomesoplenty/worldgen/biome/rocky_rainforest.json
+122e84e01443f60de57a87d443c3a918d7093167 data/biomesoplenty/worldgen/biome/rocky_rainforest.json
 7d21568158ce2c30daf4205345f0c0826c264551 data/biomesoplenty/worldgen/biome/rocky_shrubland.json
 c4777c88bf889161d1c20bf6e998341fc77493ec data/biomesoplenty/worldgen/biome/scrubland.json
 a90275f0d3e81663844572072a0359edf138f00f data/biomesoplenty/worldgen/biome/seasonal_forest.json
 915f6c670c2e93c0139193b39ea6520077170567 data/biomesoplenty/worldgen/biome/shrubland.json
-c8fa4838e950832b19ba66266866ea61b005223f data/biomesoplenty/worldgen/biome/snowblossom_grove.json
+1e23aaa20dad73d6b069d0e090e4dd55f0992035 data/biomesoplenty/worldgen/biome/snowblossom_grove.json
 da1e2ca3e9713a52d9ed243d551fd3d7c40c7ab1 data/biomesoplenty/worldgen/biome/snowy_coniferous_forest.json
 b3c0c91d6b8d73ef7f63253660566709c5b7f38b data/biomesoplenty/worldgen/biome/snowy_fir_clearing.json
-395105efa433bd42df952ed7ad1a22947f90a65b data/biomesoplenty/worldgen/biome/snowy_maple_woods.json
+7dc623b835163687d9be93a787fe25c5d4b29104 data/biomesoplenty/worldgen/biome/snowy_maple_woods.json
 82f90b4ed424d588a7af087fa323a82f71f3bb08 data/biomesoplenty/worldgen/biome/spider_nest.json
 384de385ee5a0940ca4fffe1f8017f35e873af38 data/biomesoplenty/worldgen/biome/tropics.json
 89b2556e41798476db1a083ad49d046d3dd2babf data/biomesoplenty/worldgen/biome/tundra.json

diff --git a/common/src/generated/resources/data/biomesoplenty/worldgen/biome/auroral_garden.json b/common/src/generated/resources/data/biomesoplenty/worldgen/biome/auroral_garden.json
@@ -110,24 +110,6 @@
         "minCount": 4,
         "weight": 12
       },
-      {
-        "type": "minecraft:pig",
-        "maxCount": 4,
-        "minCount": 4,
-        "weight": 10
-      },
-      {
-        "type": "minecraft:chicken",
-        "maxCount": 4,
-        "minCount": 4,
-        "weight": 10
-      },
-      {
-        "type": "minecraft:cow",
-        "maxCount": 4,
-        "minCount": 4,
-        "weight": 8
-      },
       {
         "type": "minecraft:fox",
         "maxCount": 4,

diff --git a/common/src/generated/resources/data/biomesoplenty/worldgen/biome/bog.json b/common/src/generated/resources/data/biomesoplenty/worldgen/biome/bog.json
@@ -98,7 +98,14 @@
       }
     ],
     "axolotls": [],
-    "creature": [],
+    "creature": [
+      {
+        "type": "minecraft:pig",
+        "maxCount": 4,
+        "minCount": 4,
+        "weight": 10
+      }
+    ],
     "misc": [],
     "monster": [
       {

diff --git a/common/src/generated/resources/data/biomesoplenty/worldgen/biome/jade_cliffs.json b/common/src/generated/resources/data/biomesoplenty/worldgen/biome/jade_cliffs.json
@@ -104,30 +104,6 @@
     ],
     "axolotls": [],
     "creature": [
-      {
-        "type": "minecraft:sheep",
-        "maxCount": 4,
-        "minCount": 4,
-        "weight": 12
-      },
-      {
-        "type": "minecraft:pig",
-        "maxCount": 4,
-        "minCount": 4,
-        "weight": 10
-      },
-      {
-        "type": "minecraft:chicken",
-        "maxCount": 4,
-        "minCount": 4,
-        "weight": 10
-      },
-      {
-        "type": "minecraft:cow",
-        "maxCount": 4,
-        "minCount": 4,
-        "weight": 8
-      },
       {
         "type": "minecraft:panda",
         "maxCount": 2,

diff --git a/common/src/generated/resources/data/biomesoplenty/worldgen/biome/lavender_field.json b/common/src/generated/resources/data/biomesoplenty/worldgen/biome/lavender_field.json
@@ -124,6 +124,18 @@
         "maxCount": 4,
         "minCount": 4,
         "weight": 8
+      },
+      {
+        "type": "minecraft:horse",
+        "maxCount": 6,
+        "minCount": 2,
+        "weight": 5
+      },
+      {
+        "type": "minecraft:donkey",
+        "maxCount": 3,
+        "minCount": 1,
+        "weight": 1
       }
     ],
     "misc": [],

diff --git a/common/src/generated/resources/data/biomesoplenty/worldgen/biome/lush_savanna.json b/common/src/generated/resources/data/biomesoplenty/worldgen/biome/lush_savanna.json
@@ -105,16 +105,46 @@
     "axolotls": [],
     "creature": [
       {
-        "type": "minecraft:rabbit",
-        "maxCount": 3,
+        "type": "minecraft:sheep",
+        "maxCount": 4,
+        "minCount": 4,
+        "weight": 12
+      },
+      {
+        "type": "minecraft:pig",
+        "maxCount": 4,
+        "minCount": 4,
+        "weight": 10
+      },
+      {
+        "type": "minecraft:chicken",
+        "maxCount": 4,
+        "minCount": 4,
+        "weight": 10
+      },
+      {
+        "type": "minecraft:cow",
+        "maxCount": 4,
+        "minCount": 4,
+        "weight": 8
+      },
+      {
+        "type": "minecraft:horse",
+        "maxCount": 6,
         "minCount": 2,
-        "weight": 4
+        "weight": 5
       },
       {
         "type": "minecraft:donkey",
         "maxCount": 3,
         "minCount": 1,
         "weight": 1
+      },
+      {
+        "type": "minecraft:rabbit",
+        "maxCount": 3,
+        "minCount": 2,
+        "weight": 4
       }
     ],
     "misc": [],

diff --git a/common/src/generated/resources/data/biomesoplenty/worldgen/biome/maple_woods.json b/common/src/generated/resources/data/biomesoplenty/worldgen/biome/maple_woods.json
@@ -99,6 +99,30 @@
     ],
     "axolotls": [],
     "creature": [
+      {
+        "type": "minecraft:sheep",
+        "maxCount": 4,
+        "minCount": 4,
+        "weight": 12
+      },
+      {
+        "type": "minecraft:pig",
+        "maxCount": 4,
+        "minCount": 4,
+        "weight": 10
+      },
+      {
+        "type": "minecraft:chicken",
+        "maxCount": 4,
+        "minCount": 4,
+        "weight": 10
+      },
+      {
+        "type": "minecraft:cow",
+        "maxCount": 4,
+        "minCount": 4,
+        "weight": 8
+      },
       {
         "type": "minecraft:wolf",
         "maxCount": 4,

diff --git a/common/src/generated/resources/data/biomesoplenty/worldgen/biome/marsh.json b/common/src/generated/resources/data/biomesoplenty/worldgen/biome/marsh.json
@@ -98,7 +98,20 @@
       }
     ],
     "axolotls": [],
-    "creature": [],
+    "creature": [
+      {
+        "type": "minecraft:pig",
+        "maxCount": 4,
+        "minCount": 4,
+        "weight": 10
+      },
+      {
+        "type": "minecraft:chicken",
+        "maxCount": 4,
+        "minCount": 4,
+        "weight": 10
+      }
+    ],
     "misc": [],
     "monster": [
       {

diff --git a/common/src/generated/resources/data/biomesoplenty/worldgen/biome/rainforest.json b/common/src/generated/resources/data/biomesoplenty/worldgen/biome/rainforest.json
@@ -117,6 +117,12 @@
         "minCount": 4,
         "weight": 10
       },
+      {
+        "type": "minecraft:pig",
+        "maxCount": 4,
+        "minCount": 4,
+        "weight": 10
+      },
       {
         "type": "minecraft:parrot",
         "maxCount": 2,

diff --git a/common/src/generated/resources/data/biomesoplenty/worldgen/biome/rocky_rainforest.json b/common/src/generated/resources/data/biomesoplenty/worldgen/biome/rocky_rainforest.json
@@ -109,6 +109,12 @@
     ],
     "axolotls": [],
     "creature": [
+      {
+        "type": "minecraft:chicken",
+        "maxCount": 4,
+        "minCount": 4,
+        "weight": 10
+      },
       {
         "type": "minecraft:parrot",
         "maxCount": 2,

diff --git a/common/src/generated/resources/data/biomesoplenty/worldgen/biome/snowblossom_grove.json b/common/src/generated/resources/data/biomesoplenty/worldgen/biome/snowblossom_grove.json
@@ -108,24 +108,6 @@
         "minCount": 4,
         "weight": 12
       },
-      {
-        "type": "minecraft:pig",
-        "maxCount": 4,
-        "minCount": 4,
-        "weight": 10
-      },
-      {
-        "type": "minecraft:chicken",
-        "maxCount": 4,
-        "minCount": 4,
-        "weight": 10
-      },
-      {
-        "type": "minecraft:cow",
-        "maxCount": 4,
-        "minCount": 4,
-        "weight": 8
-      },
       {
         "type": "minecraft:rabbit",
         "maxCount": 3,

diff --git a/common/src/generated/resources/data/biomesoplenty/worldgen/biome/snowy_maple_woods.json b/common/src/generated/resources/data/biomesoplenty/worldgen/biome/snowy_maple_woods.json
@@ -99,6 +99,30 @@
     ],
     "axolotls": [],
     "creature": [
+      {
+        "type": "minecraft:sheep",
+        "maxCount": 4,
+        "minCount": 4,
+        "weight": 12
+      },
+      {
+        "type": "minecraft:pig",
+        "maxCount": 4,
+        "minCount": 4,
+        "weight": 10
+      },
+      {
+        "type": "minecraft:chicken",
+        "maxCount": 4,
+        "minCount": 4,
+        "weight": 10
+      },
+      {
+        "type": "minecraft:cow",
+        "maxCount": 4,
+        "minCount": 4,
+        "weight": 8
+      },
       {
         "type": "minecraft:wolf",
         "maxCount": 4,

diff --git a/common/src/main/java/biomesoplenty/biome/BOPOverworldBiomeBuilder.java b/common/src/main/java/biomesoplenty/biome/BOPOverworldBiomeBuilder.java
@@ -170,11 +170,11 @@ public class BOPOverworldBiomeBuilder
     };
 
     protected final ResourceKey<Biome>[][] PLATEAU_BIOMES_VARIANT_BOP = new ResourceKey[][]{
-            {null,                null,                null,               null,                       null},
-            {Biomes.CHERRY_GROVE, null,                null,               null,                       null},
-            {Biomes.CHERRY_GROVE, Biomes.CHERRY_GROVE, BOPBiomes.HIGHLAND, BOPBiomes.MOOR,             null},
-            {null,                null,                null,               BOPBiomes.ROCKY_RAINFOREST, null},
-            {null,                null,                null,               null,                       BOPBiomes.LUSH_SAVANNA}
+            {null, null, null,                        null,                       null},
+            {null, null, BOPBiomes.CONIFEROUS_FOREST, BOPBiomes.FIELD,            null},
+            {null, null, BOPBiomes.HIGHLAND,          BOPBiomes.MOOR,             null},
+            {null, null, null,                        BOPBiomes.ROCKY_RAINFOREST, null},
+            {null, null, null,                        null,                       BOPBiomes.LUSH_SAVANNA}
     };
 
     protected final ResourceKey<Biome>[][] SLOPE_BIOMES_BOP = new ResourceKey[][]{