Renamed Seasonal Orchard to Aspen Forest, renamed Lavender Forest to …

…Jacaranda Forest
Glitchfiend · Nov 25, 2023 · 993e2c5 · 993e2c5
1 parent c852b14
commit 993e2c5
Show file tree

Hide file tree

Showing 23 changed files with 191 additions and 178 deletions.
diff --git a/src/generated/resources/.cache/103d9f3f36b01595f1aa5172191e60eff02e6924 b/src/generated/resources/.cache/103d9f3f36b01595f1aa5172191e60eff02e6924
@@ -1,6 +1,7 @@
-// 1.20.2	2023-11-24T19:04:00.2074554	Registries
+// 1.20.2	2023-11-24T20:54:44.7840083	Registries
 a09ddf53150a7fcf8767a311dd5cf040fa2e9221 data/biomesoplenty/damage_type/bramble.json
 2d0eab2cc85c4c6397fdc41dd0cedefbc4a7a150 data/biomesoplenty/damage_type/fumarole.json
+ea437a6e9543930a3c829c5bf99eb270d94a6201 data/biomesoplenty/worldgen/biome/aspen_forest.json
 42e40aad7b302a8852edbfd224ed40d346601171 data/biomesoplenty/worldgen/biome/auroral_garden.json
 2f83184d9ae2b17e8fbf9cf587de7c26a92b2a0e data/biomesoplenty/worldgen/biome/bayou.json
 db0c1c6cd86c593a9d97a250a93f78eb31cb964e data/biomesoplenty/worldgen/biome/bog.json
@@ -22,9 +23,9 @@ d9000040ce4407e603b2089bb386181a6f4c4427 data/biomesoplenty/worldgen/biome/glowi
 7a1c57597ceed578a6a9ad29bb5475d766eeb4ed data/biomesoplenty/worldgen/biome/grassland.json
 c60852465ebacbddccba4c8a3ecc7fc7c958ece2 data/biomesoplenty/worldgen/biome/highland.json
 95bfe311c5f232012863d1047022f609d6c26cee data/biomesoplenty/worldgen/biome/hot_springs.json
+4154a4e77331837da4b3db36a98c5c017d279853 data/biomesoplenty/worldgen/biome/jacaranda_forest.json
 db467c12d72e4d7c68e40849a87a19d4f07a7547 data/biomesoplenty/worldgen/biome/jade_cliffs.json
 dbd2116f54e13f7637b0b6ea569506f7d9a66f14 data/biomesoplenty/worldgen/biome/lavender_field.json
-d6c5a3066a2863b326b2869c9a7840b016f73bff data/biomesoplenty/worldgen/biome/lavender_forest.json
 87d65c53fd5cff3ce46df5ae1f969b93187efcc9 data/biomesoplenty/worldgen/biome/lush_desert.json
 4289356071e43ee09b8e3f04a7f01c06205b1e16 data/biomesoplenty/worldgen/biome/lush_savanna.json
 80f2cf3912e5f67fc0a480a9c482ed98ad9b849e data/biomesoplenty/worldgen/biome/maple_woods.json
@@ -47,7 +48,6 @@ c4d43a9ad7026212331af4f806ca0609c9cd60e0 data/biomesoplenty/worldgen/biome/pumpk
 7d21568158ce2c30daf4205345f0c0826c264551 data/biomesoplenty/worldgen/biome/rocky_shrubland.json
 3285061bd512a79cabe9f63087aadc35a58ec4d9 data/biomesoplenty/worldgen/biome/scrubland.json
 bb2d81e974fdfe261ae8e3aab8767aa32b2b664d data/biomesoplenty/worldgen/biome/seasonal_forest.json
-44838c97a178eba09129d2b84073ef0eb9dcf7c9 data/biomesoplenty/worldgen/biome/seasonal_orchard.json
 915f6c670c2e93c0139193b39ea6520077170567 data/biomesoplenty/worldgen/biome/shrubland.json
 c8fa4838e950832b19ba66266866ea61b005223f data/biomesoplenty/worldgen/biome/snowblossom_grove.json
 da1e2ca3e9713a52d9ed243d551fd3d7c40c7ab1 data/biomesoplenty/worldgen/biome/snowy_coniferous_forest.json
@@ -257,6 +257,7 @@ b48440fe4a0cf0efdf35cd32d746772b45afda08 data/biomesoplenty/worldgen/configured_
 deef5c2930855fd7e0ed024f0ac8aed966ff7dcb data/biomesoplenty/worldgen/configured_feature/tall_umbran_tree.json
 d3a2bce6cff46fd0c26097cd1f904a6fd5b001d1 data/biomesoplenty/worldgen/configured_feature/thin_bamboo.json
 af8cdae336ba410701a356288fdd72fd03a80586 data/biomesoplenty/worldgen/configured_feature/toadstool_normal.json
+cf39ea65f0f723b4ef342e35c9eab27fc8a87c8d data/biomesoplenty/worldgen/configured_feature/trees_aspen_forest.json
 108ac76fc3eed1b443be22c0535de13304e77e41 data/biomesoplenty/worldgen/configured_feature/trees_auroral_garden.json
 bbfbf1d8fcc810292695b0f78c6e916b6c5cc577 data/biomesoplenty/worldgen/configured_feature/trees_bayou.json
 ecd542d1235a3656049a475f51ded6a17787ec32 data/biomesoplenty/worldgen/configured_feature/trees_bog.json
@@ -268,9 +269,9 @@ f65947e9697a2ce1d73ea2fe2879c7f19c92fb2a data/biomesoplenty/worldgen/configured_
 c5a22c26fd099d67a30e64a2956cc4b5c265f431 data/biomesoplenty/worldgen/configured_feature/trees_field_forest.json
 2a34a8affa673f46a2dc57a01266026fc0ba35bd data/biomesoplenty/worldgen/configured_feature/trees_fungal_jungle.json
 9b483676fa0c0499e99775417eea14fecdaeb9b9 data/biomesoplenty/worldgen/configured_feature/trees_hot_springs.json
+da92b358ef1cd592d3cf980abe497a8d49791562 data/biomesoplenty/worldgen/configured_feature/trees_jacaranda_forest.json
 d6dd1c0f2df75191098f1c740f68a15eb30ea75e data/biomesoplenty/worldgen/configured_feature/trees_jade_cliffs.json
 47557e3af86dd7d440314f0b782a83ae2b095416 data/biomesoplenty/worldgen/configured_feature/trees_lavender_field.json
-da92b358ef1cd592d3cf980abe497a8d49791562 data/biomesoplenty/worldgen/configured_feature/trees_lavender_forest.json
 5889f8d18aa98f2749e21a9b1989d48f1216f350 data/biomesoplenty/worldgen/configured_feature/trees_lush_desert.json
 73bc4d46f326c6189d391ecf8fda48a1af980bfb data/biomesoplenty/worldgen/configured_feature/trees_maple_forest.json
 4454b47782000d92e8ac72bae03ca931cf4aa72e data/biomesoplenty/worldgen/configured_feature/trees_muskeg.json
@@ -286,7 +287,6 @@ d4fae18de258c757c164eb84fe2030accbf94b2c data/biomesoplenty/worldgen/configured_
 bf541c17022068e4679cb496b24e8e0cc0c437e8 data/biomesoplenty/worldgen/configured_feature/trees_redwood_forest.json
 a4fd2cddf6d33adc3b3ee36c61d8abc60eeaf22b data/biomesoplenty/worldgen/configured_feature/trees_scrubland.json
 550e4350d5d189145ed852f894f789405bb0f22b data/biomesoplenty/worldgen/configured_feature/trees_seasonal_forest.json
-cf39ea65f0f723b4ef342e35c9eab27fc8a87c8d data/biomesoplenty/worldgen/configured_feature/trees_seasonal_orchard.json
 8b971a958d2ca8bb6d881e7e7950c8b3bcf60954 data/biomesoplenty/worldgen/configured_feature/trees_seasonal_pumpkin_patch.json
 5b7de709e8e8433bf6c352e7ecdab52ce58910db data/biomesoplenty/worldgen/configured_feature/trees_snowblossom_grove.json
 a163b4897c68b965e8c8fdcd2f28daa563684085 data/biomesoplenty/worldgen/configured_feature/trees_snowy_coniferous_forest.json
@@ -373,8 +373,8 @@ b8974c150e3f6ec95a353ce0f476fb28f90d5fdc data/biomesoplenty/worldgen/placed_feat
 ec6c880fe45a5421db544aa9cbc0279d1cae3a97 data/biomesoplenty/worldgen/placed_feature/flower_field_1.json
 977af58b49ff46669661d5d15581a36f997ccc35 data/biomesoplenty/worldgen/placed_feature/flower_field_2.json
 38a9eb5981ba35d7969497dd649a159b62727500 data/biomesoplenty/worldgen/placed_feature/flower_grassland.json
+a4a9cd4878aca00842f94b3dde08e75024a60055 data/biomesoplenty/worldgen/placed_feature/flower_jacaranda_forest.json
 5841cb63baca82268d21b60ad615e979991693bc data/biomesoplenty/worldgen/placed_feature/flower_lavender.json
-a4a9cd4878aca00842f94b3dde08e75024a60055 data/biomesoplenty/worldgen/placed_feature/flower_lavender_forest.json
 83a50c7343493e08ecd4550c2cabf1e2540f010b data/biomesoplenty/worldgen/placed_feature/flower_lush_desert.json
 8b708c3304f0d1972b4fea59c23fca59f5c5889a data/biomesoplenty/worldgen/placed_feature/flower_moor.json
 0626b77eb83fcb44916b5c2a2b7a7fd76cb9a700 data/biomesoplenty/worldgen/placed_feature/flower_mystic_grove.json
@@ -536,6 +536,7 @@ cbbf9e96d9aa6fb26b2ecb60fc9dc049084f7ec4 data/biomesoplenty/worldgen/placed_feat
 c2f17ae7a59995ac9634e9a1667804ca7cd1e4bc data/biomesoplenty/worldgen/placed_feature/thin_bamboo.json
 279b9fc1b35dee55e995a1efbc309545b4019e52 data/biomesoplenty/worldgen/placed_feature/toadstool_extra.json
 b3ff9c2274cb98160253e8661d4b04de56b6e6a4 data/biomesoplenty/worldgen/placed_feature/toadstool_normal.json
+ef862a92acb7c874a03caa9201fa069e8dff7235 data/biomesoplenty/worldgen/placed_feature/trees_aspen_forest.json
 e54d937f5f0efc535b9c3c890c5ab5a03c160d9c data/biomesoplenty/worldgen/placed_feature/trees_auroral_garden.json
 31a4908b14719be0519f84b278bceab7f722b5cb data/biomesoplenty/worldgen/placed_feature/trees_bayou.json
 8044c3fbdeba631f13c6d7167e431bb1e7514dc5 data/biomesoplenty/worldgen/placed_feature/trees_bog.json
@@ -548,9 +549,9 @@ addefe9727278378c9ff4343d1c06f3e896c5637 data/biomesoplenty/worldgen/placed_feat
 5f464874f713cc05db22d853b7460ad0646d6370 data/biomesoplenty/worldgen/placed_feature/trees_fir_clearing.json
 b59fd06e1c240962408eec93e18073f73bbe357c data/biomesoplenty/worldgen/placed_feature/trees_fungal_jungle.json
 84cd37279d0bc38ce00f25f158fb2ea81bcf4649 data/biomesoplenty/worldgen/placed_feature/trees_hot_springs.json
+dd9344dccb4fe8c0950e172e1e2a03150e4fc334 data/biomesoplenty/worldgen/placed_feature/trees_jacaranda_forest.json
 8a6840044f92e01a6bb78e8d6904fae7fc3703e7 data/biomesoplenty/worldgen/placed_feature/trees_jade_cliffs.json
 d3d805c5107b32626b8f3d658fdeb671512db581 data/biomesoplenty/worldgen/placed_feature/trees_lavender_field.json
-426c77e6e222a957c87cd870429a13ee5219864d data/biomesoplenty/worldgen/placed_feature/trees_lavender_forest.json
 b4fe6b6e47c2a605e7a3ac56544f53b7b01be919 data/biomesoplenty/worldgen/placed_feature/trees_lush_desert.json
 980e47b6844316bb0fb170d687f12b3ef6924702 data/biomesoplenty/worldgen/placed_feature/trees_maple_forest.json
 4a9a91dcdc955306b05a70f504b7326bd10e5581 data/biomesoplenty/worldgen/placed_feature/trees_mediterranean_forest.json
@@ -568,7 +569,6 @@ b55f4ccdcdb6fa79dcda41bc10e49af9e03560ef data/biomesoplenty/worldgen/placed_feat
 c1c5f0c4197dbec3e987a1326b7d15bef9a4f1b5 data/biomesoplenty/worldgen/placed_feature/trees_rocky_shrubland.json
 de63632a2699e1198b2bdbc5ad22b2cfabf66ca5 data/biomesoplenty/worldgen/placed_feature/trees_scrubland.json
 e471ed08d8839279e5b8b8a73e2cb5a7364aea5a data/biomesoplenty/worldgen/placed_feature/trees_seasonal_forest.json
-8ee5adb40aef638964d884e2163837c6b8cd0377 data/biomesoplenty/worldgen/placed_feature/trees_seasonal_orchard.json
 ac7a47820f1078b060c64d829c385d0b22f36f63 data/biomesoplenty/worldgen/placed_feature/trees_seasonal_pumpkin_patch.json
 bc02201bb19bfe926fddf3e7b708d0de970325d6 data/biomesoplenty/worldgen/placed_feature/trees_shrubland.json
 af1b4603a980d2cb58a6c24682f3a0766d143929 data/biomesoplenty/worldgen/placed_feature/trees_snowblossom_grove.json

diff --git a/...enty/worldgen/biome/seasonal_orchard.json → ...soplenty/worldgen/biome/aspen_forest.json b/...enty/worldgen/biome/seasonal_orchard.json → ...soplenty/worldgen/biome/aspen_forest.json
@@ -84,7 +84,7 @@
       "minecraft:brown_mushroom_normal",
       "minecraft:red_mushroom_normal",
       "minecraft:patch_pumpkin",
-      "biomesoplenty:trees_seasonal_orchard",
+      "biomesoplenty:trees_aspen_forest",
       "biomesoplenty:patch_barley_sparse",
       "biomesoplenty:patch_fern_4",
       "biomesoplenty:patch_large_fern_normal",

diff --git a/...lenty/worldgen/biome/lavender_forest.json → ...enty/worldgen/biome/jacaranda_forest.json b/...lenty/worldgen/biome/lavender_forest.json → ...enty/worldgen/biome/jacaranda_forest.json
@@ -80,9 +80,9 @@
       "minecraft:patch_sugar_cane",
       "biomesoplenty:patch_grass_24",
       "biomesoplenty:patch_tall_grass_64",
-      "biomesoplenty:flower_lavender_forest",
+      "biomesoplenty:flower_jacaranda_forest",
       "biomesoplenty:patch_tall_lavender_forest",
-      "biomesoplenty:trees_lavender_forest"
+      "biomesoplenty:trees_jacaranda_forest"
     ],
     [
       "minecraft:freeze_top_layer"

diff --git a/...gured_feature/trees_seasonal_orchard.json → ...onfigured_feature/trees_aspen_forest.json b/...gured_feature/trees_seasonal_orchard.json → ...onfigured_feature/trees_aspen_forest.json
diff --git a/...igured_feature/trees_lavender_forest.json → ...gured_feature/trees_jacaranda_forest.json b/...igured_feature/trees_lavender_forest.json → ...gured_feature/trees_jacaranda_forest.json
diff --git a/...laced_feature/flower_lavender_forest.json → ...aced_feature/flower_jacaranda_forest.json b/...laced_feature/flower_lavender_forest.json → ...aced_feature/flower_jacaranda_forest.json
diff --git a/...laced_feature/trees_seasonal_orchard.json → ...en/placed_feature/trees_aspen_forest.json b/...laced_feature/trees_seasonal_orchard.json → ...en/placed_feature/trees_aspen_forest.json
@@ -1,5 +1,5 @@
 {
-  "feature": "biomesoplenty:trees_seasonal_orchard",
+  "feature": "biomesoplenty:trees_aspen_forest",
   "placement": [
     {
       "type": "minecraft:count",

diff --git a/...placed_feature/trees_lavender_forest.json → ...laced_feature/trees_jacaranda_forest.json b/...placed_feature/trees_lavender_forest.json → ...laced_feature/trees_jacaranda_forest.json
@@ -1,5 +1,5 @@
 {
-  "feature": "biomesoplenty:trees_lavender_forest",
+  "feature": "biomesoplenty:trees_jacaranda_forest",
   "placement": [
     {
       "type": "minecraft:count",

diff --git a/src/main/java/biomesoplenty/api/biome/BOPBiomes.java b/src/main/java/biomesoplenty/api/biome/BOPBiomes.java
@@ -19,6 +19,7 @@ public class BOPBiomes
     private static List<ResourceKey<Biome>> overworldBiomes = Lists.newArrayList();
     private static List<ResourceKey<Biome>> allBiomes = Lists.newArrayList();
 
+    public static final ResourceKey<Biome> ASPEN_FOREST = registerOverworld("aspen_forest");
     public static final ResourceKey<Biome> AURORAL_GARDEN = registerOverworld("auroral_garden");
     public static final ResourceKey<Biome> BAYOU = registerOverworld("bayou");
     public static final ResourceKey<Biome> BOG = registerOverworld("bog");
@@ -40,9 +41,9 @@ public class BOPBiomes
     public static final ResourceKey<Biome> GRASSLAND = registerOverworld("grassland");
     public static final ResourceKey<Biome> HIGHLAND = registerOverworld("highland");
     public static final ResourceKey<Biome> HOT_SPRINGS = registerOverworld("hot_springs");
+    public static final ResourceKey<Biome> JACARANDA_FOREST = registerOverworld("jacaranda_forest");
     public static final ResourceKey<Biome> JADE_CLIFFS = registerOverworld("jade_cliffs");
     public static final ResourceKey<Biome> LAVENDER_FIELD = registerOverworld("lavender_field");
-    public static final ResourceKey<Biome> LAVENDER_FOREST = registerOverworld("lavender_forest");
     public static final ResourceKey<Biome> LUSH_DESERT = registerOverworld("lush_desert");
     public static final ResourceKey<Biome> LUSH_SAVANNA = registerOverworld("lush_savanna");
     public static final ResourceKey<Biome> MAPLE_WOODS = registerOverworld("maple_woods");
@@ -65,7 +66,6 @@ public class BOPBiomes
     public static final ResourceKey<Biome> ROCKY_SHRUBLAND = registerOverworld("rocky_shrubland");
     public static final ResourceKey<Biome> SCRUBLAND = registerOverworld("scrubland");
     public static final ResourceKey<Biome> SEASONAL_FOREST = registerOverworld("seasonal_forest");
-    public static final ResourceKey<Biome> SEASONAL_ORCHARD = registerOverworld("seasonal_orchard");
     public static final ResourceKey<Biome> SHRUBLAND = registerOverworld("shrubland");
     public static final ResourceKey<Biome> SNOWBLOSSOM_GROVE = registerOverworld("snowblossom_grove");
     public static final ResourceKey<Biome> SNOWY_CONIFEROUS_FOREST = registerOverworld("snowy_coniferous_forest");