Added Unmapped End Stone to the End Corruption, made Null End Stone m…

…odels dynamic, added particles to our End biomes
Glitchfiend · Jan 17, 2024 · 95b9ce5 · 95b9ce5
1 parent d804e4c
commit 95b9ce5
Show file tree

Hide file tree

Showing 52 changed files with 409 additions and 80 deletions.
diff --git a/README.md b/README.md
@@ -2,7 +2,7 @@
 
 <p align="center"><img src="https://i.imgur.com/5Qzjnjl.png"> <a href="https://github.com/Glitchfiend/TerraBlender"><img src="https://i.imgur.com/bm33WkP.png"></a> <a href="https://discord.gg/GyyzU6T"><img src="https://i.imgur.com/DcQnyAG.png"></a></p>
 
-**Biomes O' Plenty** is an expansive biome mod for Minecraft that adds a slew of **new, unique biomes to the Overworld and Nether!** To go along with the new biomes, it adds **new plants, flowers, trees, building blocks, and much more!**
+**Biomes O' Plenty** is an expansive biome mod for Minecraft that adds a slew of **new, unique biomes to the Overworld, Nether, and End!** To go along with the new biomes, it adds **new plants, flowers, trees, building blocks, and much more!**
 
 -----------------
 

diff --git a/common/src/generated/resources/.cache/103d9f3f36b01595f1aa5172191e60eff02e6924 b/common/src/generated/resources/.cache/103d9f3f36b01595f1aa5172191e60eff02e6924
@@ -1,4 +1,4 @@
-// 1.20.4	2024-01-16T17:51:31.850639	Registries
+// 1.20.4	2024-01-17T16:45:12.9697103	Registries
 bec08031dc5126119d3c7a1033703f8235bdf56e data/biomesoplenty/damage_type/bramble.json
 41f8df67f585538edc9847b6754275d24b813e06 data/biomesoplenty/damage_type/fumarole.json
 1db19ce8d33b8c131955b60ed830200bbee6a912 data/biomesoplenty/worldgen/biome/aspen_glade.json
@@ -13,9 +13,9 @@ d0c0bdd9fc7b09e7d046e35faea8cc6d752b468a data/biomesoplenty/worldgen/biome/crag.
 401cb408a8b99f3fd8b696f9759d9f1f8a1a945e data/biomesoplenty/worldgen/biome/dead_forest.json
 506de7d82a9bf0a7caea3390590dc9d1fa2028b0 data/biomesoplenty/worldgen/biome/dryland.json
 d4a9226ceaef3cf4eed45892e027c1eabf9fcd72 data/biomesoplenty/worldgen/biome/dune_beach.json
-b483b45bfe2934381accd8001723f45f08356c87 data/biomesoplenty/worldgen/biome/end_corruption.json
-85c3f472e2c8c0fcc91a949b1d0210bf2b4e45cc data/biomesoplenty/worldgen/biome/end_reef.json
-c8da42275f3e77f30df81eea9d0cfcf22f00cde1 data/biomesoplenty/worldgen/biome/end_wilds.json
+0f7c6770ec15ea90b29d58f7427fedf2ecd5a227 data/biomesoplenty/worldgen/biome/end_corruption.json
+5db4bd37b86665f55da93298806849f2285d5060 data/biomesoplenty/worldgen/biome/end_reef.json
+5e761da3260f04936defe5a580d015e8d109e7c7 data/biomesoplenty/worldgen/biome/end_wilds.json
 a89d541384f1a879bb82d9c984d98c512474d27c data/biomesoplenty/worldgen/biome/erupting_inferno.json
 d662a9e04a7840345595d343cc34426393c04699 data/biomesoplenty/worldgen/biome/field.json
 0ca60f25f9961787ec5f174f8be6f29463c4decc data/biomesoplenty/worldgen/biome/fir_clearing.json
@@ -491,7 +491,7 @@ eaafc116edf17b5a3c48e7bdc68f62ba84fd2deb data/biomesoplenty/worldgen/placed_feat
 a0515b53a5b94f2ed1d7dbd87db0585612d83dda data/biomesoplenty/worldgen/placed_feature/nether_bramble.json
 1a38b33f693e7e19b9e5975269ae2ab5cf1c2472 data/biomesoplenty/worldgen/placed_feature/nether_vines.json
 f3b33fbd598ab935e868bab7a4875ee1380220b0 data/biomesoplenty/worldgen/placed_feature/null_lake.json
-b6593e87126d0d5ee1b9117723911931e9d2bef2 data/biomesoplenty/worldgen/placed_feature/null_tree.json
+a3d701df3a8d022e81b0abe17a6f635938ae0d19 data/biomesoplenty/worldgen/placed_feature/null_tree.json
 062fefe110d24798d1df521817e98394fe648a62 data/biomesoplenty/worldgen/placed_feature/oak_bush.json
 2669995131b210204c99f3f718cae309ba9e822f data/biomesoplenty/worldgen/placed_feature/obsidian_splatter.json
 7fcd3ef78b62a0c814a8e780b79f63c9cf9aaa87 data/biomesoplenty/worldgen/placed_feature/orange_maple_leaf_piles.json
@@ -558,7 +558,7 @@ aa0d904e7a1f35d576717565f0442d01000453cc data/biomesoplenty/worldgen/placed_feat
 51bf1f3cd23c08e9fa2c2189d39fd90371762bc3 data/biomesoplenty/worldgen/placed_feature/porous_flesh.json
 5778dd543e43fb9e71c08554abb7f350253643cf data/biomesoplenty/worldgen/placed_feature/pumpkin_patch.json
 db09e9654c16f52e231da2d5b8f06e7939ea5d69 data/biomesoplenty/worldgen/placed_feature/pus_bubbles.json
-01445a026f89b9644601c266db1b387144c32cb3 data/biomesoplenty/worldgen/placed_feature/radiant_hands.json
+fcdffc2c2a3ff4d45d0a2855b4efb0fd1bbd664c data/biomesoplenty/worldgen/placed_feature/radiant_hands.json
 717eb46bdca44e52128033b627f0fb8aefe886a8 data/biomesoplenty/worldgen/placed_feature/rainbow_birch_tree.json
 87d9d03e05cd26120e64be061b4133c09059aa1b data/biomesoplenty/worldgen/placed_feature/rainforest_cliffs_vines.json
 11e26339d0c1be09f94db502d5da6a780af69e7d data/biomesoplenty/worldgen/placed_feature/redwood_tree.json

diff --git a/common/src/generated/resources/data/biomesoplenty/worldgen/biome/end_corruption.json b/common/src/generated/resources/data/biomesoplenty/worldgen/biome/end_corruption.json
@@ -9,6 +9,12 @@
       "sound": "minecraft:ambient.cave",
       "tick_delay": 6000
     },
+    "particle": {
+      "options": {
+        "type": "biomesoplenty:binary"
+      },
+      "probability": 3.75E-4
+    },
     "sky_color": 0,
     "water_color": 4159204,
     "water_fog_color": 329011
@@ -40,14 +46,7 @@
     "axolotls": [],
     "creature": [],
     "misc": [],
-    "monster": [
-      {
-        "type": "minecraft:enderman",
-        "maxCount": 4,
-        "minCount": 4,
-        "weight": 10
-      }
-    ],
+    "monster": [],
     "underground_water_creature": [],
     "water_ambient": [],
     "water_creature": []

diff --git a/common/src/generated/resources/data/biomesoplenty/worldgen/biome/end_reef.json b/common/src/generated/resources/data/biomesoplenty/worldgen/biome/end_reef.json
@@ -9,6 +9,12 @@
       "sound": "minecraft:ambient.cave",
       "tick_delay": 6000
     },
+    "particle": {
+      "options": {
+        "type": "minecraft:mycelium"
+      },
+      "probability": 0.0075
+    },
     "sky_color": 0,
     "water_color": 16777215,
     "water_fog_color": 3355443

diff --git a/common/src/generated/resources/data/biomesoplenty/worldgen/biome/end_wilds.json b/common/src/generated/resources/data/biomesoplenty/worldgen/biome/end_wilds.json
@@ -9,6 +9,12 @@
       "sound": "minecraft:ambient.cave",
       "tick_delay": 6000
     },
+    "particle": {
+      "options": {
+        "type": "biomesoplenty:end_spore"
+      },
+      "probability": 0.005
+    },
     "sky_color": 0,
     "water_color": 4159204,
     "water_fog_color": 329011

diff --git a/common/src/generated/resources/data/biomesoplenty/worldgen/placed_feature/null_tree.json b/common/src/generated/resources/data/biomesoplenty/worldgen/placed_feature/null_tree.json
@@ -5,7 +5,7 @@
       "type": "minecraft:block_predicate_filter",
       "predicate": {
         "type": "minecraft:matching_blocks",
-        "blocks": "minecraft:end_stone",
+        "blocks": "biomesoplenty:unmapped_end_stone",
         "offset": [
           0,
           -1,

diff --git a/common/src/generated/resources/data/biomesoplenty/worldgen/placed_feature/radiant_hands.json b/common/src/generated/resources/data/biomesoplenty/worldgen/placed_feature/radiant_hands.json
@@ -3,7 +3,7 @@
   "placement": [
     {
       "type": "minecraft:rarity_filter",
-      "chance": 3
+      "chance": 2
     },
     {
       "type": "minecraft:in_square"

diff --git a/common/src/main/java/biomesoplenty/api/block/BOPBlocks.java b/common/src/main/java/biomesoplenty/api/block/BOPBlocks.java
@@ -74,6 +74,7 @@ public class BOPBlocks
     public static Block SMALL_ROSE_QUARTZ_BUD;
 
     public static Block ALGAL_END_STONE;
+    public static Block UNMAPPED_END_STONE;
     public static Block NULL_END_STONE;
     public static Block NULL_BLOCK;
     public static Block ANOMALY;

diff --git a/common/src/main/java/biomesoplenty/api/item/BOPItems.java b/common/src/main/java/biomesoplenty/api/item/BOPItems.java
@@ -81,6 +81,7 @@ public class BOPItems
     public static Item ROSE_QUARTZ_CHUNK;
 
     public static Item ALGAL_END_STONE;
+    public static Item UNMAPPED_END_STONE;
     public static Item NULL_END_STONE;
     public static Item NULL_BLOCK;
     public static Item ANOMALY;

diff --git a/common/src/main/java/biomesoplenty/biome/BOPEndBiomes.java b/common/src/main/java/biomesoplenty/biome/BOPEndBiomes.java
@@ -4,9 +4,11 @@
  ******************************************************************************/
 package biomesoplenty.biome;
 
+import biomesoplenty.init.ModParticles;
 import biomesoplenty.worldgen.placement.BOPEndPlacements;
 import biomesoplenty.worldgen.placement.BOPVegetationPlacements;
 import net.minecraft.core.HolderGetter;
+import net.minecraft.core.particles.ParticleTypes;
 import net.minecraft.data.worldgen.BiomeDefaultFeatures;
 import net.minecraft.data.worldgen.placement.EndPlacements;
 import net.minecraft.world.level.biome.*;
@@ -16,25 +18,6 @@
 
 public class BOPEndBiomes
 {
-    private static Biome baseEndBiome(BiomeGenerationSettings.Builder biomeBuilder, MobSpawnSettings.Builder mobSpawnBuilder, int waterColor, int waterFogColor) {
-        return new Biome.BiomeBuilder()
-            .hasPrecipitation(false)
-            .temperature(0.5F)
-            .downfall(0.5F)
-            .specialEffects(
-                new BiomeSpecialEffects.Builder()
-                    .waterColor(waterColor)
-                    .waterFogColor(waterFogColor)
-                    .fogColor(10518688)
-                    .skyColor(0)
-                    .ambientMoodSound(AmbientMoodSettings.LEGACY_CAVE_SETTINGS)
-                    .build()
-            )
-            .mobSpawnSettings(mobSpawnBuilder.build())
-            .generationSettings(biomeBuilder.build())
-            .build();
-    }
-
     public static Biome endWilds(HolderGetter<PlacedFeature> placedFeatureGetter, HolderGetter<ConfiguredWorldCarver<?>> carverGetter)
     {
         MobSpawnSettings.Builder mobSpawnBuilder = new MobSpawnSettings.Builder();
@@ -45,7 +28,11 @@ public static Biome endWilds(HolderGetter<PlacedFeature> placedFeatureGetter, Ho
         biomeBuilder.addFeature(GenerationStep.Decoration.VEGETAL_DECORATION, BOPEndPlacements.FLOWER_END_WILDS);
         biomeBuilder.addFeature(GenerationStep.Decoration.VEGETAL_DECORATION, BOPEndPlacements.PATCH_ENDERPHYTES);
         biomeBuilder.addFeature(GenerationStep.Decoration.VEGETAL_DECORATION, BOPEndPlacements.RADIANT_HANDS);
-        return baseEndBiome(biomeBuilder, mobSpawnBuilder, 4159204, 329011);
+
+        return new Biome.BiomeBuilder()
+            .hasPrecipitation(false).temperature(0.5F).downfall(0.5F)
+            .specialEffects(new BiomeSpecialEffects.Builder().waterColor(4159204).waterFogColor(329011).fogColor(10518688).skyColor(0).ambientParticle(new AmbientParticleSettings(ModParticles.END_SPORE, 0.005F)).ambientMoodSound(AmbientMoodSettings.LEGACY_CAVE_SETTINGS).build())
+            .mobSpawnSettings(mobSpawnBuilder.build()).generationSettings(biomeBuilder.build()).build();
     }
 
     public static Biome endReef(HolderGetter<PlacedFeature> placedFeatureGetter, HolderGetter<ConfiguredWorldCarver<?>> carverGetter)
@@ -59,18 +46,25 @@ public static Biome endReef(HolderGetter<PlacedFeature> placedFeatureGetter, Hol
         biomeBuilder.addFeature(GenerationStep.Decoration.VEGETAL_DECORATION, BOPEndPlacements.DEAD_CORAL_PATCH);
         biomeBuilder.addFeature(GenerationStep.Decoration.VEGETAL_DECORATION, BOPEndPlacements.BARNACLES);
         biomeBuilder.addFeature(GenerationStep.Decoration.VEGETAL_DECORATION, BOPVegetationPlacements.PATCH_DEAD_GRASS);
-        return baseEndBiome(biomeBuilder, mobSpawnBuilder, 0xFFFFFF, 0x333333);
+
+        return new Biome.BiomeBuilder()
+            .hasPrecipitation(false).temperature(0.5F).downfall(0.5F)
+            .specialEffects(new BiomeSpecialEffects.Builder().waterColor(0xFFFFFF).waterFogColor(0x333333).fogColor(10518688).skyColor(0).ambientParticle(new AmbientParticleSettings(ParticleTypes.MYCELIUM, 0.0075F)).ambientMoodSound(AmbientMoodSettings.LEGACY_CAVE_SETTINGS).build())
+            .mobSpawnSettings(mobSpawnBuilder.build()).generationSettings(biomeBuilder.build()).build();
     }
 
     public static Biome endCorruption(HolderGetter<PlacedFeature> placedFeatureGetter, HolderGetter<ConfiguredWorldCarver<?>> carverGetter)
     {
         MobSpawnSettings.Builder mobSpawnBuilder = new MobSpawnSettings.Builder();
-        BiomeDefaultFeatures.endSpawns(mobSpawnBuilder);
         BiomeGenerationSettings.Builder biomeBuilder = new BiomeGenerationSettings.Builder(placedFeatureGetter, carverGetter);
         biomeBuilder.addFeature(GenerationStep.Decoration.SURFACE_STRUCTURES, EndPlacements.END_GATEWAY_RETURN);
         biomeBuilder.addFeature(GenerationStep.Decoration.LOCAL_MODIFICATIONS, BOPEndPlacements.ANOMALY);
         biomeBuilder.addFeature(GenerationStep.Decoration.UNDERGROUND_DECORATION, BOPEndPlacements.NULL_LAKE);
         biomeBuilder.addFeature(GenerationStep.Decoration.VEGETAL_DECORATION, BOPEndPlacements.TREES_END_CORRUPTION);
-        return baseEndBiome(biomeBuilder, mobSpawnBuilder, 4159204, 329011);
+
+        return new Biome.BiomeBuilder()
+            .hasPrecipitation(false).temperature(0.5F).downfall(0.5F)
+            .specialEffects(new BiomeSpecialEffects.Builder().waterColor(4159204).waterFogColor(329011).fogColor(10518688).skyColor(0).ambientParticle(new AmbientParticleSettings(ModParticles.BINARY, 0.000375F)).ambientMoodSound(AmbientMoodSettings.LEGACY_CAVE_SETTINGS).build())
+            .mobSpawnSettings(mobSpawnBuilder.build()).generationSettings(biomeBuilder.build()).build();
     }
 }
diff --git a/common/src/main/java/biomesoplenty/biome/BOPNetherBiomes.java b/common/src/main/java/biomesoplenty/biome/BOPNetherBiomes.java
@@ -53,9 +53,9 @@ public static Biome crystallineChasm(HolderGetter<PlacedFeature> placedFeatureGe
         addFeature(biomeBuilder, GenerationStep.Decoration.UNDERGROUND_DECORATION, BOPNetherPlacements.SMALL_CRYSTAL);
 
         return new Biome.BiomeBuilder()
-                .hasPrecipitation(false).temperature(2.0F).downfall(0.0F)
-                .specialEffects((new BiomeSpecialEffects.Builder()).waterColor(4159204).waterFogColor(329011).fogColor(0x59002C).skyColor(BOPOverworldBiomes.calculateSkyColor(2.0F)).ambientParticle(new AmbientParticleSettings(ParticleTypes.ELECTRIC_SPARK, 0.0008925F)).ambientLoopSound(SoundEvents.AMBIENT_CRIMSON_FOREST_LOOP).ambientMoodSound(new AmbientMoodSettings(SoundEvents.AMBIENT_BASALT_DELTAS_MOOD, 6000, 8, 2.0D)).backgroundMusic(Musics.createGameMusic(BOPSounds.MUSIC_BIOME_CRYSTALLINE_CHASM)).build())
-                .mobSpawnSettings(spawnBuilder.build()).generationSettings(biomeBuilder.build()).build();
+            .hasPrecipitation(false).temperature(2.0F).downfall(0.0F)
+            .specialEffects((new BiomeSpecialEffects.Builder()).waterColor(4159204).waterFogColor(329011).fogColor(0x59002C).skyColor(BOPOverworldBiomes.calculateSkyColor(2.0F)).ambientParticle(new AmbientParticleSettings(ParticleTypes.ELECTRIC_SPARK, 0.0008925F)).ambientLoopSound(SoundEvents.AMBIENT_CRIMSON_FOREST_LOOP).ambientMoodSound(new AmbientMoodSettings(SoundEvents.AMBIENT_BASALT_DELTAS_MOOD, 6000, 8, 2.0D)).backgroundMusic(Musics.createGameMusic(BOPSounds.MUSIC_BIOME_CRYSTALLINE_CHASM)).build())
+            .mobSpawnSettings(spawnBuilder.build()).generationSettings(biomeBuilder.build()).build();
     }
 
     public static Biome eruptingInferno(HolderGetter<PlacedFeature> placedFeatureGetter, HolderGetter<ConfiguredWorldCarver<?>> carverGetter)
@@ -89,9 +89,9 @@ public static Biome eruptingInferno(HolderGetter<PlacedFeature> placedFeatureGet
         addFeature(biomeBuilder, GenerationStep.Decoration.UNDERGROUND_DECORATION, BOPNetherPlacements.BRIMSTONE_CLUSTER);
 
         return new Biome.BiomeBuilder()
-                .hasPrecipitation(false).temperature(2.0F).downfall(0.0F)
-                .specialEffects((new BiomeSpecialEffects.Builder()).waterColor(4159204).waterFogColor(329011).fogColor(0x4F2B13).skyColor(BOPOverworldBiomes.calculateSkyColor(2.0F)).ambientParticle(new AmbientParticleSettings(ParticleTypes.SMOKE, 0.00023065104F)).ambientLoopSound(SoundEvents.AMBIENT_BASALT_DELTAS_LOOP).ambientMoodSound(new AmbientMoodSettings(SoundEvents.AMBIENT_BASALT_DELTAS_MOOD, 6000, 8, 2.0D)).ambientAdditionsSound(new AmbientAdditionsSettings(SoundEvents.AMBIENT_BASALT_DELTAS_ADDITIONS, 0.0111D)).backgroundMusic(Musics.createGameMusic(BOPSounds.MUSIC_BIOME_ERUPTING_INFERNO)).build())
-                .mobSpawnSettings(spawnBuilder.build()).generationSettings(biomeBuilder.build()).build();
+            .hasPrecipitation(false).temperature(2.0F).downfall(0.0F)
+            .specialEffects((new BiomeSpecialEffects.Builder()).waterColor(4159204).waterFogColor(329011).fogColor(0x4F2B13).skyColor(BOPOverworldBiomes.calculateSkyColor(2.0F)).ambientParticle(new AmbientParticleSettings(ParticleTypes.SMOKE, 0.00023065104F)).ambientLoopSound(SoundEvents.AMBIENT_BASALT_DELTAS_LOOP).ambientMoodSound(new AmbientMoodSettings(SoundEvents.AMBIENT_BASALT_DELTAS_MOOD, 6000, 8, 2.0D)).ambientAdditionsSound(new AmbientAdditionsSettings(SoundEvents.AMBIENT_BASALT_DELTAS_ADDITIONS, 0.0111D)).backgroundMusic(Musics.createGameMusic(BOPSounds.MUSIC_BIOME_ERUPTING_INFERNO)).build())
+            .mobSpawnSettings(spawnBuilder.build()).generationSettings(biomeBuilder.build()).build();
     }
 
     public static Biome undergrowth(HolderGetter<PlacedFeature> placedFeatureGetter, HolderGetter<ConfiguredWorldCarver<?>> carverGetter)
@@ -124,9 +124,9 @@ public static Biome undergrowth(HolderGetter<PlacedFeature> placedFeatureGetter,
         addFeature(biomeBuilder, GenerationStep.Decoration.UNDERGROUND_DECORATION, BOPNetherPlacements.NETHER_VINES);
 
         return new Biome.BiomeBuilder()
-                .hasPrecipitation(false).temperature(2.0F).downfall(0.0F)
-                .specialEffects((new BiomeSpecialEffects.Builder()).waterColor(4159204).waterFogColor(329011).fogColor(0x1C2109).skyColor(BOPOverworldBiomes.calculateSkyColor(2.0F)).ambientParticle(new AmbientParticleSettings(ParticleTypes.SPORE_BLOSSOM_AIR, 0.00357F)).ambientLoopSound(SoundEvents.AMBIENT_WARPED_FOREST_LOOP).ambientMoodSound(new AmbientMoodSettings(SoundEvents.AMBIENT_CRIMSON_FOREST_MOOD, 6000, 8, 2.0D)).ambientAdditionsSound(new AmbientAdditionsSettings(SoundEvents.AMBIENT_NETHER_WASTES_ADDITIONS, 0.0111D)).backgroundMusic(Musics.createGameMusic(BOPSounds.MUSIC_BIOME_UNDERGROWTH)).build())
-                .mobSpawnSettings(spawnBuilder.build()).generationSettings(biomeBuilder.build()).build();
+            .hasPrecipitation(false).temperature(2.0F).downfall(0.0F)
+            .specialEffects((new BiomeSpecialEffects.Builder()).waterColor(4159204).waterFogColor(329011).fogColor(0x1C2109).skyColor(BOPOverworldBiomes.calculateSkyColor(2.0F)).ambientParticle(new AmbientParticleSettings(ParticleTypes.SPORE_BLOSSOM_AIR, 0.00357F)).ambientLoopSound(SoundEvents.AMBIENT_WARPED_FOREST_LOOP).ambientMoodSound(new AmbientMoodSettings(SoundEvents.AMBIENT_CRIMSON_FOREST_MOOD, 6000, 8, 2.0D)).ambientAdditionsSound(new AmbientAdditionsSettings(SoundEvents.AMBIENT_NETHER_WASTES_ADDITIONS, 0.0111D)).backgroundMusic(Musics.createGameMusic(BOPSounds.MUSIC_BIOME_UNDERGROWTH)).build())
+            .mobSpawnSettings(spawnBuilder.build()).generationSettings(biomeBuilder.build()).build();
     }
 
     public static Biome visceralHeap(HolderGetter<PlacedFeature> placedFeatureGetter, HolderGetter<ConfiguredWorldCarver<?>> carverGetter)
@@ -155,9 +155,9 @@ public static Biome visceralHeap(HolderGetter<PlacedFeature> placedFeatureGetter
         addFeature(biomeBuilder, GenerationStep.Decoration.UNDERGROUND_DECORATION, BOPNetherPlacements.HAIR);
 
         return new Biome.BiomeBuilder()
-                .hasPrecipitation(false).temperature(2.0F).downfall(0.0F)
-                .specialEffects((new BiomeSpecialEffects.Builder()).waterColor(4159204).waterFogColor(329011).fogColor(0x601F18).skyColor(BOPOverworldBiomes.calculateSkyColor(2.0F)).ambientLoopSound(SoundEvents.AMBIENT_NETHER_WASTES_LOOP).ambientMoodSound(new AmbientMoodSettings(SoundEvents.AMBIENT_SOUL_SAND_VALLEY_MOOD, 6000, 8, 2.0D)).ambientAdditionsSound(new AmbientAdditionsSettings(SoundEvents.AMBIENT_CRIMSON_FOREST_ADDITIONS, 0.0111D)).backgroundMusic(Musics.createGameMusic(BOPSounds.MUSIC_BIOME_VISCERAL_HEAP)).build())
-                .mobSpawnSettings(spawnBuilder.build()).generationSettings(biomeBuilder.build()).build();
+            .hasPrecipitation(false).temperature(2.0F).downfall(0.0F)
+            .specialEffects((new BiomeSpecialEffects.Builder()).waterColor(4159204).waterFogColor(329011).fogColor(0x601F18).skyColor(BOPOverworldBiomes.calculateSkyColor(2.0F)).ambientLoopSound(SoundEvents.AMBIENT_NETHER_WASTES_LOOP).ambientMoodSound(new AmbientMoodSettings(SoundEvents.AMBIENT_SOUL_SAND_VALLEY_MOOD, 6000, 8, 2.0D)).ambientAdditionsSound(new AmbientAdditionsSettings(SoundEvents.AMBIENT_CRIMSON_FOREST_ADDITIONS, 0.0111D)).backgroundMusic(Musics.createGameMusic(BOPSounds.MUSIC_BIOME_VISCERAL_HEAP)).build())
+            .mobSpawnSettings(spawnBuilder.build()).generationSettings(biomeBuilder.build()).build();
     }
 
     public static Biome witheredAbyss(HolderGetter<PlacedFeature> placedFeatureGetter, HolderGetter<ConfiguredWorldCarver<?>> carverGetter)

diff --git a/common/src/main/java/biomesoplenty/block/FlowerBlockBOP.java b/common/src/main/java/biomesoplenty/block/FlowerBlockBOP.java
@@ -76,7 +76,7 @@ else if (this == BOPBlocks.WILTED_LILY)
         }
         else if (this == BOPBlocks.ENDBLOOM)
         {
-            return ground == BOPBlocks.ALGAL_END_STONE || ground == Blocks.END_STONE || super.canSurvive(state, worldIn, pos);
+            return ground == BOPBlocks.ALGAL_END_STONE || ground == BOPBlocks.UNMAPPED_END_STONE || ground == BOPBlocks.NULL_END_STONE || ground == Blocks.END_STONE || super.canSurvive(state, worldIn, pos);
         }
 
         return super.canSurvive(state, worldIn, pos);

diff --git a/common/src/main/java/biomesoplenty/block/FoliageBlockBOP.java b/common/src/main/java/biomesoplenty/block/FoliageBlockBOP.java
@@ -90,7 +90,7 @@ public boolean canSurvive(BlockState state, LevelReader worldIn, BlockPos pos)
         }
         if (this == BOPBlocks.ENDERPHYTE)
         {
-            return ground == BOPBlocks.ALGAL_END_STONE || ground == Blocks.END_STONE;
+            return ground == BOPBlocks.ALGAL_END_STONE || ground == BOPBlocks.UNMAPPED_END_STONE || ground == BOPBlocks.NULL_END_STONE || ground == Blocks.END_STONE;
         }
 
         return super.canSurvive(state, worldIn, pos);
-Original file line number
+Diff line change
@@ Expand Up / @@ -2,7 +2,7 @@ @@
     <p align="center"><img src="https://i.imgur.com/5Qzjnjl.png"> <a href="https://github.com/Glitchfiend/TerraBlender"><img src="https://i.imgur.com/bm33WkP.png"></a> <a href="https://discord.gg/GyyzU6T"><img src="https://i.imgur.com/DcQnyAG.png"></a></p>
-    **Biomes O' Plenty** is an expansive biome mod for Minecraft that adds a slew of **new, unique biomes to the Overworld and Nether!** To go along with the new biomes, it adds **new plants, flowers, trees, building blocks, and much more!**
+    **Biomes O' Plenty** is an expansive biome mod for Minecraft that adds a slew of **new, unique biomes to the Overworld, Nether, and End!** To go along with the new biomes, it adds **new plants, flowers, trees, building blocks, and much more!**
     -----------------
@@ Expand Down @@