Renamed Aspen Forest to Aspen Glade, renamed Jacaranda Forest to Jaca…

…randa Glade, changed where Gravel Beaches can generate, tweaked Clover texture
Glitchfiend · Nov 28, 2023 · e80362c · e80362c
1 parent 146343b
commit e80362c
Show file tree

Hide file tree

Showing 28 changed files with 157 additions and 71 deletions.
diff --git a/src/generated/resources/.cache/103d9f3f36b01595f1aa5172191e60eff02e6924 b/src/generated/resources/.cache/103d9f3f36b01595f1aa5172191e60eff02e6924
@@ -1,7 +1,7 @@
-// 1.20.2	2023-11-28T04:00:07.2205709	Registries
+// 1.20.2	2023-11-28T17:54:03.0124249	Registries
 a09ddf53150a7fcf8767a311dd5cf040fa2e9221 data/biomesoplenty/damage_type/bramble.json
 2d0eab2cc85c4c6397fdc41dd0cedefbc4a7a150 data/biomesoplenty/damage_type/fumarole.json
-b8dc803c8b669f1676bca4cf741dd201cf95119e data/biomesoplenty/worldgen/biome/aspen_forest.json
+42dc67e3613c63df42c6d4326f4ecdc9dfeb6338 data/biomesoplenty/worldgen/biome/aspen_glade.json
 42e40aad7b302a8852edbfd224ed40d346601171 data/biomesoplenty/worldgen/biome/auroral_garden.json
 2f83184d9ae2b17e8fbf9cf587de7c26a92b2a0e data/biomesoplenty/worldgen/biome/bayou.json
 db0c1c6cd86c593a9d97a250a93f78eb31cb964e data/biomesoplenty/worldgen/biome/bog.json
@@ -21,10 +21,10 @@ a9636d9d8c3cbbb4afcf2f57615b9762318e87e1 data/biomesoplenty/worldgen/biome/fores
 b50746f2c174b41608eaf7b9a4ea927ed2ac0a03 data/biomesoplenty/worldgen/biome/fungal_jungle.json
 d9000040ce4407e603b2089bb386181a6f4c4427 data/biomesoplenty/worldgen/biome/glowing_grotto.json
 7a1c57597ceed578a6a9ad29bb5475d766eeb4ed data/biomesoplenty/worldgen/biome/grassland.json
-72776c2315490fac1ed59c279df1a47b09ab6130 data/biomesoplenty/worldgen/biome/gravel_beach.json
+68d0bdff8955c4da298a63ffb12bfdb98ba7495e data/biomesoplenty/worldgen/biome/gravel_beach.json
 c60852465ebacbddccba4c8a3ecc7fc7c958ece2 data/biomesoplenty/worldgen/biome/highland.json
 95bfe311c5f232012863d1047022f609d6c26cee data/biomesoplenty/worldgen/biome/hot_springs.json
-4154a4e77331837da4b3db36a98c5c017d279853 data/biomesoplenty/worldgen/biome/jacaranda_forest.json
+d5e61be39cb6f315020381f986c2f48f258001b5 data/biomesoplenty/worldgen/biome/jacaranda_glade.json
 db467c12d72e4d7c68e40849a87a19d4f07a7547 data/biomesoplenty/worldgen/biome/jade_cliffs.json
 dbd2116f54e13f7637b0b6ea569506f7d9a66f14 data/biomesoplenty/worldgen/biome/lavender_field.json
 87d65c53fd5cff3ce46df5ae1f969b93187efcc9 data/biomesoplenty/worldgen/biome/lush_desert.json
@@ -264,7 +264,7 @@ b48440fe4a0cf0efdf35cd32d746772b45afda08 data/biomesoplenty/worldgen/configured_
 55cac49cd61cd3a2391e3c1da3bc4ff3ce4c11c8 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
+cf39ea65f0f723b4ef342e35c9eab27fc8a87c8d data/biomesoplenty/worldgen/configured_feature/trees_aspen_glade.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
@@ -276,7 +276,7 @@ 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
+da92b358ef1cd592d3cf980abe497a8d49791562 data/biomesoplenty/worldgen/configured_feature/trees_jacaranda_glade.json
 d6dd1c0f2df75191098f1c740f68a15eb30ea75e data/biomesoplenty/worldgen/configured_feature/trees_jade_cliffs.json
 47557e3af86dd7d440314f0b782a83ae2b095416 data/biomesoplenty/worldgen/configured_feature/trees_lavender_field.json
 5889f8d18aa98f2749e21a9b1989d48f1216f350 data/biomesoplenty/worldgen/configured_feature/trees_lush_desert.json
@@ -382,7 +382,7 @@ 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
+a4a9cd4878aca00842f94b3dde08e75024a60055 data/biomesoplenty/worldgen/placed_feature/flower_jacaranda_glade.json
 5841cb63baca82268d21b60ad615e979991693bc data/biomesoplenty/worldgen/placed_feature/flower_lavender.json
 83a50c7343493e08ecd4550c2cabf1e2540f010b data/biomesoplenty/worldgen/placed_feature/flower_lush_desert.json
 8b708c3304f0d1972b4fea59c23fca59f5c5889a data/biomesoplenty/worldgen/placed_feature/flower_moor.json
@@ -552,7 +552,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
+9cd523c68c7c453f25b2fe484634e06e5aeaaa29 data/biomesoplenty/worldgen/placed_feature/trees_aspen_glade.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
@@ -565,7 +565,7 @@ 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
+d315c6e5aa001686afa6b06aabad7aec1cf78b3a data/biomesoplenty/worldgen/placed_feature/trees_jacaranda_glade.json
 8a6840044f92e01a6bb78e8d6904fae7fc3703e7 data/biomesoplenty/worldgen/placed_feature/trees_jade_cliffs.json
 d3d805c5107b32626b8f3d658fdeb671512db581 data/biomesoplenty/worldgen/placed_feature/trees_lavender_field.json
 b4fe6b6e47c2a605e7a3ac56544f53b7b01be919 data/biomesoplenty/worldgen/placed_feature/trees_lush_desert.json

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

diff --git a/src/generated/resources/data/biomesoplenty/worldgen/biome/gravel_beach.json b/src/generated/resources/data/biomesoplenty/worldgen/biome/gravel_beach.json
@@ -15,7 +15,7 @@
       "sound": "minecraft:ambient.cave",
       "tick_delay": 6000
     },
-    "sky_color": 8037887,
+    "sky_color": 8103167,
     "water_color": 4020182,
     "water_fog_color": 329011
   },
@@ -61,7 +61,8 @@
       "minecraft:ore_lapis_buried",
       "minecraft:ore_copper",
       "minecraft:underwater_magma",
-      "minecraft:disk_clay"
+      "minecraft:disk_clay",
+      "minecraft:disk_gravel"
     ],
     [],
     [
@@ -150,5 +151,5 @@
     "water_ambient": [],
     "water_creature": []
   },
-  "temperature": 0.6
+  "temperature": 0.45
 }
diff --git a/...enty/worldgen/biome/jacaranda_forest.json → ...lenty/worldgen/biome/jacaranda_glade.json b/...enty/worldgen/biome/jacaranda_forest.json → ...lenty/worldgen/biome/jacaranda_glade.json
@@ -80,9 +80,9 @@
       "minecraft:patch_sugar_cane",
       "biomesoplenty:patch_grass_24",
       "biomesoplenty:patch_tall_grass_64",
-      "biomesoplenty:flower_jacaranda_forest",
+      "biomesoplenty:flower_jacaranda_glade",
       "biomesoplenty:patch_tall_lavender_forest",
-      "biomesoplenty:trees_jacaranda_forest"
+      "biomesoplenty:trees_jacaranda_glade"
     ],
     [
       "minecraft:freeze_top_layer"

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

diff --git a/...laced_feature/trees_jacaranda_forest.json → ...placed_feature/trees_jacaranda_glade.json b/...laced_feature/trees_jacaranda_forest.json → ...placed_feature/trees_jacaranda_glade.json
@@ -1,5 +1,5 @@
 {
-  "feature": "biomesoplenty:trees_jacaranda_forest",
+  "feature": "biomesoplenty:trees_jacaranda_glade",
   "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,7 +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> ASPEN_GLADE = registerOverworld("aspen_glade");
     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");
@@ -42,7 +42,7 @@ public class BOPBiomes
     public static final ResourceKey<Biome> GRAVEL_BEACH = registerOverworld("gravel_beach");
     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> JACARANDA_GLADE = registerOverworld("jacaranda_glade");
     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> LUSH_DESERT = registerOverworld("lush_desert");

diff --git a/src/main/java/biomesoplenty/common/biome/BOPOverworldBiomes.java b/src/main/java/biomesoplenty/common/biome/BOPOverworldBiomes.java
@@ -115,7 +115,7 @@ private static void globalOverworldGenerationNoLavaLakes(BiomeGenerationSettings
         BiomeDefaultFeatures.addSurfaceFreezing(builder);
     }
 
-    public static Biome aspenForest(HolderGetter<PlacedFeature> placedFeatureGetter, HolderGetter<ConfiguredWorldCarver<?>> carverGetter)
+    public static Biome aspenGlade(HolderGetter<PlacedFeature> placedFeatureGetter, HolderGetter<ConfiguredWorldCarver<?>> carverGetter)
     {
         // Mob spawns
         MobSpawnSettings.Builder spawnBuilder = new MobSpawnSettings.Builder();
@@ -132,7 +132,7 @@ public static Biome aspenForest(HolderGetter<PlacedFeature> placedFeatureGetter,
         BiomeDefaultFeatures.addDefaultFlowers(biomeBuilder);
         BiomeDefaultFeatures.addDefaultMushrooms(biomeBuilder);
         addFeature(biomeBuilder, GenerationStep.Decoration.VEGETAL_DECORATION, VegetationPlacements.PATCH_PUMPKIN);
-        addFeature(biomeBuilder, GenerationStep.Decoration.VEGETAL_DECORATION, BOPVegetationPlacements.TREES_ASPEN_FOREST);
+        addFeature(biomeBuilder, GenerationStep.Decoration.VEGETAL_DECORATION, BOPVegetationPlacements.TREES_ASPEN_GLADE);
         addFeature(biomeBuilder, GenerationStep.Decoration.VEGETAL_DECORATION, BOPVegetationPlacements.PATCH_BARLEY_SPARSE);
         addFeature(biomeBuilder, GenerationStep.Decoration.VEGETAL_DECORATION, BOPVegetationPlacements.PATCH_FERN_4);
         addFeature(biomeBuilder, GenerationStep.Decoration.VEGETAL_DECORATION, BOPVegetationPlacements.PATCH_LARGE_FERN_NORMAL);
@@ -559,8 +559,9 @@ public static Biome gravelBeach(HolderGetter<PlacedFeature> placedFeatureGetter,
         globalOverworldGeneration(biomeBuilder);
         BiomeDefaultFeatures.addDefaultOres(biomeBuilder);
         addFeature(biomeBuilder, GenerationStep.Decoration.UNDERGROUND_ORES, MiscOverworldPlacements.DISK_CLAY);
+        addFeature(biomeBuilder, GenerationStep.Decoration.UNDERGROUND_ORES, MiscOverworldPlacements.DISK_GRAVEL);
 
-        return biome(true, 0.6F, 0.5F, 4020182, 329011, spawnBuilder, biomeBuilder, NORMAL_MUSIC);
+        return biome(true, 0.45F, 0.5F, 4020182, 329011, spawnBuilder, biomeBuilder, NORMAL_MUSIC);
     }
 
     public static Biome highland(HolderGetter<PlacedFeature> placedFeatureGetter, HolderGetter<ConfiguredWorldCarver<?>> carverGetter)
@@ -617,7 +618,7 @@ public static Biome hotSprings(HolderGetter<PlacedFeature> placedFeatureGetter,
         return biomeWithColorOverrides(true, 0.17F, 0.5F, 4445678, 270131, 0x80B497, 0x60A17B, spawnBuilder, biomeBuilder, NORMAL_MUSIC);
     }
 
-    public static Biome jacarandaForest(HolderGetter<PlacedFeature> placedFeatureGetter, HolderGetter<ConfiguredWorldCarver<?>> carverGetter)
+    public static Biome jacarandaGlade(HolderGetter<PlacedFeature> placedFeatureGetter, HolderGetter<ConfiguredWorldCarver<?>> carverGetter)
     {
         // Mob spawns
         MobSpawnSettings.Builder spawnBuilder = new MobSpawnSettings.Builder();
@@ -631,9 +632,9 @@ public static Biome jacarandaForest(HolderGetter<PlacedFeature> placedFeatureGet
         addFeature(biomeBuilder, GenerationStep.Decoration.VEGETAL_DECORATION, VegetationPlacements.PATCH_SUGAR_CANE);
         addFeature(biomeBuilder, GenerationStep.Decoration.VEGETAL_DECORATION, BOPVegetationPlacements.PATCH_GRASS_24);
         addFeature(biomeBuilder, GenerationStep.Decoration.VEGETAL_DECORATION, BOPVegetationPlacements.PATCH_TALL_GRASS_64);
-        addFeature(biomeBuilder, GenerationStep.Decoration.VEGETAL_DECORATION, BOPVegetationPlacements.FLOWER_JACARANDA_FOREST);
+        addFeature(biomeBuilder, GenerationStep.Decoration.VEGETAL_DECORATION, BOPVegetationPlacements.FLOWER_JACARANDA_GLADE);
         addFeature(biomeBuilder, GenerationStep.Decoration.VEGETAL_DECORATION, BOPVegetationPlacements.PATCH_TALL_LAVENDER_FOREST);
-        addFeature(biomeBuilder, GenerationStep.Decoration.VEGETAL_DECORATION, BOPVegetationPlacements.TREES_JACARANDA_FOREST);
+        addFeature(biomeBuilder, GenerationStep.Decoration.VEGETAL_DECORATION, BOPVegetationPlacements.TREES_JACARANDA_GLADE);
 
         return biomeWithColorOverrides(true, 0.8F, 0.7F, 0xA1C36D, 0xA1C36D, spawnBuilder, biomeBuilder, MAGICAL_MUSIC);
     }

diff --git a/src/main/java/biomesoplenty/common/biome/BOPSecondaryOverworldBiomeBuilder.java b/src/main/java/biomesoplenty/common/biome/BOPSecondaryOverworldBiomeBuilder.java
@@ -24,15 +24,15 @@ public class BOPSecondaryOverworldBiomeBuilder extends BOPOverworldBiomeBuilder
 
     private final ResourceKey<Biome>[][] MIDDLE_BIOMES_VARIANT_BOP = new ResourceKey[][]{
             {null, null,                       null,                          BOPBiomes.SNOWBLOSSOM_GROVE, BOPBiomes.OLD_GROWTH_DEAD_FOREST},
-            {null, BOPBiomes.ASPEN_FOREST,     BOPBiomes.PUMPKIN_PATCH,       null,                        null},
-            {null, BOPBiomes.JACARANDA_FOREST, BOPBiomes.ORCHARD,             null,                        null},
+            {null, BOPBiomes.ASPEN_GLADE,      BOPBiomes.PUMPKIN_PATCH,       null,                        null},
+            {null, BOPBiomes.JACARANDA_GLADE,  BOPBiomes.ORCHARD,             null,                        null},
             {null, null,                       BOPBiomes.OLD_GROWTH_WOODLAND, BOPBiomes.VOLCANIC_PLAINS,   null},
             {null, null,                       null,                          null,                        null}
     };
 
     private final ResourceKey<Biome>[][] PLATEAU_BIOMES_BOP = new ResourceKey[][]{
             {BOPBiomes.TUNDRA,               BOPBiomes.TUNDRA,               BOPBiomes.SNOWBLOSSOM_GROVE, BOPBiomes.SNOWY_MAPLE_WOODS, BOPBiomes.DEAD_FOREST},
-            {BOPBiomes.SEASONAL_FOREST,      BOPBiomes.ASPEN_FOREST,         BOPBiomes.HIGHLAND,          BOPBiomes.HIGHLAND,          BOPBiomes.HIGHLAND},
+            {BOPBiomes.SEASONAL_FOREST,      BOPBiomes.ASPEN_GLADE,          BOPBiomes.HIGHLAND,          BOPBiomes.HIGHLAND,          BOPBiomes.HIGHLAND},
             {BOPBiomes.LAVENDER_FIELD,       BOPBiomes.LAVENDER_FIELD,       BOPBiomes.HIGHLAND,          BOPBiomes.HIGHLAND,          BOPBiomes.HIGHLAND},
             {BOPBiomes.MEDITERRANEAN_FOREST, BOPBiomes.MEDITERRANEAN_FOREST, BOPBiomes.WOODLAND,          BOPBiomes.ROCKY_RAINFOREST,  BOPBiomes.VOLCANO},
             {BOPBiomes.WASTELAND_STEPPE,     BOPBiomes.WASTELAND_STEPPE,     BOPBiomes.WASTELAND_STEPPE,  BOPBiomes.WASTELAND_STEPPE,  BOPBiomes.WASTELAND_STEPPE}
@@ -41,7 +41,7 @@ public class BOPSecondaryOverworldBiomeBuilder extends BOPOverworldBiomeBuilder
     private final ResourceKey<Biome>[][] PLATEAU_BIOMES_VARIANT_BOP = new ResourceKey[][]{
             {null, null,                       null,                          BOPBiomes.SNOWBLOSSOM_GROVE, BOPBiomes.OLD_GROWTH_DEAD_FOREST},
             {null, null,                       null,                          BOPBiomes.MAPLE_WOODS,       null},
-            {null, BOPBiomes.JACARANDA_FOREST, null,                          null,                        BOPBiomes.MOOR},
+            {null, BOPBiomes.JACARANDA_GLADE,  null,                          null,                        BOPBiomes.MOOR},
             {null, null,                       BOPBiomes.OLD_GROWTH_WOODLAND, BOPBiomes.VOLCANO,           null},
             {null, null,                       null,                          null,                        null}
     };
@@ -63,7 +63,7 @@ public class BOPSecondaryOverworldBiomeBuilder extends BOPOverworldBiomeBuilder
     };
 
     private final ResourceKey<Biome>[][] BEACH_BIOMES_BOP = new ResourceKey[][]{
-            {BOPBiomes.GRAVEL_BEACH,         BOPBiomes.GRAVEL_BEACH,         Biomes.SNOWY_BEACH,     Biomes.SNOWY_BEACH,     BOPBiomes.GRAVEL_BEACH},
+            {Biomes.SNOWY_BEACH,             Biomes.SNOWY_BEACH,             Biomes.SNOWY_BEACH,     Biomes.SNOWY_BEACH,     BOPBiomes.GRAVEL_BEACH},
             {BOPBiomes.GRAVEL_BEACH,         BOPBiomes.GRAVEL_BEACH,         BOPBiomes.GRAVEL_BEACH, BOPBiomes.GRAVEL_BEACH, BOPBiomes.GRAVEL_BEACH},
             {BOPBiomes.DUNE_BEACH,           BOPBiomes.DUNE_BEACH,           BOPBiomes.DUNE_BEACH,   Biomes.BEACH,           Biomes.BEACH},
             {BOPBiomes.MEDITERRANEAN_FOREST, BOPBiomes.MEDITERRANEAN_FOREST, Biomes.BEACH,           BOPBiomes.FLOODPLAIN,   BOPBiomes.VOLCANIC_PLAINS},

diff --git a/src/main/java/biomesoplenty/common/handler/MissingMappingsHandler.java b/src/main/java/biomesoplenty/common/handler/MissingMappingsHandler.java
@@ -119,10 +119,11 @@ public static void onMissingMapping(MissingMappingsEvent event)
                 .remap("alps", Biomes.JAGGED_PEAKS)
                 .remap("alps_foothills", Biomes.GROVE)
                 .remap("ashen_inferno", BOPBiomes.ERUPTING_INFERNO)
+                .remap("aspen_forest", BOPBiomes.ASPEN_GLADE)
                 .remap("bamboo_grove", Biomes.CHERRY_GROVE)
                 .remap("bamboo_blossom_grove", Biomes.CHERRY_GROVE)
                 .remap("bayou_mangrove", BOPBiomes.BAYOU)
-                .remap("boreal_forest", BOPBiomes.ASPEN_FOREST)
+                .remap("boreal_forest", BOPBiomes.ASPEN_GLADE)
                 .remap("brushland", BOPBiomes.DRYLAND)
                 .remap("burnt_forest", BOPBiomes.OLD_GROWTH_DEAD_FOREST)
                 .remap("chaparral", BOPBiomes.ROCKY_SHRUBLAND)
@@ -149,7 +150,8 @@ public static void onMissingMapping(MissingMappingsEvent event)
                 .remap("highland_crag", BOPBiomes.CRAG)
                 .remap("highland_moor", BOPBiomes.MOOR)
                 .remap("infernal_ashlands", BOPBiomes.ERUPTING_INFERNO)
-                .remap("lavender_forest", BOPBiomes.JACARANDA_FOREST)
+                .remap("jacaranda_forest", BOPBiomes.JACARANDA_GLADE)
+                .remap("lavender_forest", BOPBiomes.JACARANDA_GLADE)
                 .remap("lush_grassland", Biomes.SPARSE_JUNGLE)
                 .remap("lush_swamp", Biomes.SWAMP)
                 .remap("mangrove", Biomes.MANGROVE_SWAMP)
@@ -171,7 +173,7 @@ public static void onMissingMapping(MissingMappingsEvent event)
                 .remap("rainforest_floodplain", BOPBiomes.FLOODPLAIN)
                 .remap("redwood_forest_edge", BOPBiomes.REDWOOD_FOREST)
                 .remap("redwood_hills", BOPBiomes.REDWOOD_FOREST)
-                .remap("seasonal_orchard", BOPBiomes.ASPEN_FOREST)
+                .remap("seasonal_orchard", BOPBiomes.ASPEN_GLADE)
                 .remap("seasonal_pumpkin_patch", BOPBiomes.PUMPKIN_PATCH)
                 .remap("shadowlands", BOPBiomes.WITHERED_ABYSS)
                 .remap("shield", BOPBiomes.CONIFEROUS_FOREST)