Fixed technical biomes not being registered under our namespace

* Update es_ar.json, es_es.json, es_mx.json

* Update es_ar.json, es_es.json, es_mx.json

Orange sandstone, Lush desert

gradle.properties

@@ -7,7 +7,7 @@ mod_version=12.0.0
 
 minecraft_version=1.16.3
 minecraft_version_toml=16
-forge_version=34.0.9
+forge_version=34.1.33
 forge_version_toml=34
 forge_group=net.minecraftforge
 mappings_version=2-1.16.2

src/main/java/biomesoplenty/client/handler/GuiEventHandler.java

@@ -1,38 +1,23 @@
 package biomesoplenty.client.handler;
 
-import biomesoplenty.common.world.BOPWorldTypeUtil;
-import biomesoplenty.core.BiomesOPlenty;
 import biomesoplenty.init.ModBiomes;
 import biomesoplenty.init.ModConfig;
-import com.mojang.datafixers.util.Function4;
 import net.minecraft.client.Minecraft;
-import net.minecraft.client.gui.screen.*;
-import net.minecraft.command.Commands;
-import net.minecraft.resources.*;
-import net.minecraft.util.datafix.codec.DatapackCodec;
-import net.minecraft.util.registry.DynamicRegistries;
-import net.minecraft.util.text.ITextComponent;
-import net.minecraft.util.text.TranslationTextComponent;
-import net.minecraft.world.gen.settings.DimensionGeneratorSettings;
-import net.minecraft.world.storage.FolderName;
-import net.minecraft.world.storage.IServerConfiguration;
-import net.minecraft.world.storage.SaveFormat;
+import net.minecraft.client.gui.screen.CreateWorldScreen;
+import net.minecraft.client.gui.screen.Screen;
+import net.minecraft.client.gui.screen.WorldOptionsScreen;
+import net.minecraft.client.gui.screen.WorldSelectionScreen;
 import net.minecraftforge.api.distmarker.Dist;
 import net.minecraftforge.api.distmarker.OnlyIn;
 import net.minecraftforge.client.event.GuiOpenEvent;
-import net.minecraftforge.client.event.GuiScreenEvent;
 import net.minecraftforge.eventbus.api.SubscribeEvent;
 import net.minecraftforge.fml.common.Mod;
 
 import java.util.Optional;
-import java.util.function.Function;
 
 @Mod.EventBusSubscriber(bus = Mod.EventBusSubscriber.Bus.FORGE)
 public class GuiEventHandler
 {
-    private static String levelId = null;
-    private static ConfirmBackupScreen confirmScreen = null;
-
     @OnlyIn(Dist.CLIENT)
     @SubscribeEvent
     public static void onGuiOpened(GuiOpenEvent event)
@@ -41,36 +26,6 @@ public class GuiEventHandler
         Minecraft mc = Minecraft.getInstance();
         Screen prevScreen = mc.screen;
 
-        // Retain the last level that was selected
-        if (isDataReadScreen(gui))
-        {
-            if (prevScreen instanceof WorldSelectionScreen)
-            {
-                WorldSelectionScreen worldSelectionScreen = (WorldSelectionScreen)prevScreen;
-                Optional<WorldSelectionList.Entry> entry = worldSelectionScreen.list.getSelectedOpt();
-
-                if (entry.isPresent())
-                {
-                    levelId = entry.get().summary.getLevelId();
-                }
-            }
-            else
-            {
-                cleanupGuiTracking();
-            }
-        }
-        else if (gui instanceof ConfirmBackupScreen && levelId != null)
-        {
-            confirmScreen = (ConfirmBackupScreen)gui;
-
-            // Don't show the confirmation screen immediately
-            event.setCanceled(true);
-        }
-        else
-        {
-            cleanupGuiTracking();
-        }
-
         // Default to the bop worldtype
         if (ModConfig.ClientConfig.useWorldType.get() && gui instanceof CreateWorldScreen && prevScreen instanceof WorldSelectionScreen)
         {
@@ -79,81 +34,4 @@ public class GuiEventHandler
             optionsScreen.settings = optionsScreen.preset.get().create(optionsScreen.registryHolder, optionsScreen.settings.seed(), optionsScreen.settings.generateFeatures(), optionsScreen.settings.generateBonusChest());
         }
     }
-
-    @OnlyIn(Dist.CLIENT)
-    @SubscribeEvent
-    public static void onGuiDraw(GuiScreenEvent.DrawScreenEvent event)
-    {
-        Screen gui = event.getGui();
-        Minecraft mc = Minecraft.getInstance();
-
-        // We need to check if the bop world type is being used after the save has been unlocked.
-        // It is still locked during GuiOpenEvent.
-        if (isDataReadScreen(gui) && levelId != null && confirmScreen != null)
-        {
-            // Skip the confirm screen if this is the bop world type
-            if (isBopWorldType(mc, levelId))
-            {
-                confirmScreen.listener.proceed(false, false);
-            }
-            else
-            {
-                // Otherwise show the confirm screen
-                mc.setScreen(confirmScreen);
-            }
-
-            event.setCanceled(true);
-            cleanupGuiTracking();
-        }
-    }
-
-    private static void cleanupGuiTracking()
-    {
-        levelId = null;
-        confirmScreen = null;
-    }
-
-    private static boolean isDataReadScreen(Screen gui)
-    {
-        // The data read screen is a dirt message screen.
-        if (!(gui instanceof DirtMessageScreen))
-            return false;
-
-        ITextComponent title = gui.getTitle();
-
-        // Ensure text component is set as expected
-        if (!(title instanceof TranslationTextComponent) || !((TranslationTextComponent)title).getKey().equals("selectWorld.data_read"))
-        {
-            return false;
-        }
-
-        return true;
-    }
-
-    private static boolean isBopWorldType(Minecraft mc, String levelId)
-    {
-        try
-        (
-            SaveFormat.LevelSave save = mc.getLevelSource().createAccess(levelId);
-            Minecraft.PackManager packManager = createPackManager(DynamicRegistries.builtin(), Minecraft::loadDataPacks, Minecraft::loadWorldData, save);
-        )
-        {
-            DimensionGeneratorSettings settings = packManager.worldData().worldGenSettings();
-            return BOPWorldTypeUtil.isUsingBopWorldType(settings);
-        }
-        catch (Exception exception)
-        {
-            BiomesOPlenty.logger.warn("Failed to load save.", (Throwable)exception);
-            return false;
-        }
-    }
-
-    private static Minecraft.PackManager createPackManager(DynamicRegistries.Impl registries, Function<SaveFormat.LevelSave, DatapackCodec> dataPackLoader, Function4<SaveFormat.LevelSave, DynamicRegistries.Impl, IResourceManager, DatapackCodec, IServerConfiguration> worldDataLoader, SaveFormat.LevelSave save)
-    {
-        DatapackCodec dataPackCodec = dataPackLoader.apply(save);
-        ResourcePackList resourcePackList = new ResourcePackList(ResourcePackInfo::new, new ServerPackFinder(), new FolderPackFinder(save.getLevelPath(FolderName.DATAPACK_DIR).toFile(), IPackNameDecorator.WORLD));
-        DataPackRegistries dataPackRegistries = new DataPackRegistries(Commands.EnvironmentType.INTEGRATED, 2);
-        IServerConfiguration serverConfiguration = worldDataLoader.apply(save, registries, dataPackRegistries.getResourceManager(), dataPackCodec);
-        return new Minecraft.PackManager(resourcePackList, dataPackRegistries, serverConfiguration);
-    }
-}
+}

src/main/java/biomesoplenty/common/biome/BiomeRegistry.java

@@ -384,7 +384,7 @@ public class BiomeRegistry
                 return;
             }
 
-            biome.setRegistryName(name);
+            biome.setRegistryName(new ResourceLocation(BiomesOPlenty.MOD_ID, name));
             ForgeRegistries.BIOMES.register(biome);
 
             for (Map.Entry<BOPClimates, Integer> entry : data.getWeights().entrySet())
@@ -413,7 +413,7 @@ public class BiomeRegistry
                 return;
             }
 
-            biome.setRegistryName(name);
+            biome.setRegistryName(new ResourceLocation(BiomesOPlenty.MOD_ID, name));
             ForgeRegistries.BIOMES.register(biome);
 
             if (data.getMetadata() != null)

src/main/java/biomesoplenty/common/biome/nether/CrystallineChasmBiome.java

@@ -14,6 +14,7 @@ import net.minecraft.world.gen.carver.ConfiguredCarvers;
 import net.minecraft.world.gen.feature.Features;
 import net.minecraft.world.gen.feature.structure.StructureFeatures;
 import net.minecraft.world.gen.surfacebuilders.ConfiguredSurfaceBuilder;
+import net.minecraft.world.gen.surfacebuilders.ConfiguredSurfaceBuilders;
 import net.minecraft.world.gen.surfacebuilders.SurfaceBuilder;
 
 public class CrystallineChasmBiome extends NetherBiomeTemplate
@@ -34,7 +35,7 @@ public class CrystallineChasmBiome extends NetherBiomeTemplate
     @Override
     protected void configureGeneration(BiomeGenerationSettings.Builder builder)
     {
-        builder.surfaceBuilder(new ConfiguredSurfaceBuilder(SurfaceBuilder.NETHER, SurfaceBuilder.CONFIG_HELL));
+        builder.surfaceBuilder(ConfiguredSurfaceBuilders.NETHER);
 
         //Terrain
         builder.addStructureStart(StructureFeatures.RUINED_PORTAL_NETHER);

src/main/java/biomesoplenty/common/biome/nether/UndergrowthBiome.java

@@ -14,6 +14,7 @@ import net.minecraft.world.gen.carver.ConfiguredCarvers;
 import net.minecraft.world.gen.feature.Features;
 import net.minecraft.world.gen.feature.structure.StructureFeatures;
 import net.minecraft.world.gen.surfacebuilders.ConfiguredSurfaceBuilder;
+import net.minecraft.world.gen.surfacebuilders.ConfiguredSurfaceBuilders;
 import net.minecraft.world.gen.surfacebuilders.SurfaceBuilder;
 
 public class UndergrowthBiome extends NetherBiomeTemplate
@@ -34,7 +35,7 @@ public class UndergrowthBiome extends NetherBiomeTemplate
     @Override
     protected void configureGeneration(BiomeGenerationSettings.Builder builder)
     {
-        builder.surfaceBuilder(new ConfiguredSurfaceBuilder(SurfaceBuilder.NETHER, SurfaceBuilder.CONFIG_HELL));
+        builder.surfaceBuilder(ConfiguredSurfaceBuilders.NETHER);
 
         //Terrain
         builder.addStructureStart(StructureFeatures.RUINED_PORTAL_NETHER);

src/main/java/biomesoplenty/common/biome/nether/VisceralHeapBiome.java

@@ -3,6 +3,7 @@ package biomesoplenty.common.biome.nether;
 import biomesoplenty.api.enums.BOPClimates;
 import biomesoplenty.common.biome.NetherBiomeTemplate;
 import biomesoplenty.common.world.gen.feature.BOPConfiguredFeatures;
+import biomesoplenty.common.world.gen.surfacebuilders.BOPConfiguredSurfaceBuilders;
 import biomesoplenty.common.world.gen.surfacebuilders.BOPSurfaceBuilders;
 import net.minecraft.client.audio.BackgroundMusicTracks;
 import net.minecraft.entity.EntityClassification;
@@ -35,7 +36,7 @@ public class VisceralHeapBiome extends NetherBiomeTemplate
     @Override
     protected void configureGeneration(BiomeGenerationSettings.Builder builder)
     {
-        builder.surfaceBuilder(new ConfiguredSurfaceBuilder(BOPSurfaceBuilders.FLESH, SurfaceBuilder.CONFIG_HELL));
+        builder.surfaceBuilder(BOPConfiguredSurfaceBuilders.VISCERAL_HEAP);
 
         //Terrain
         builder.addStructureStart(StructureFeatures.RUINED_PORTAL_NETHER);

src/main/java/biomesoplenty/common/biome/nether/WitheredAbyssBiome.java

@@ -3,6 +3,7 @@ package biomesoplenty.common.biome.nether;
 import biomesoplenty.api.enums.BOPClimates;
 import biomesoplenty.common.biome.NetherBiomeTemplate;
 import biomesoplenty.common.world.gen.feature.BOPConfiguredFeatures;
+import biomesoplenty.common.world.gen.surfacebuilders.BOPConfiguredSurfaceBuilders;
 import biomesoplenty.common.world.gen.surfacebuilders.BOPSurfaceBuilders;
 import net.minecraft.client.audio.BackgroundMusicTracks;
 import net.minecraft.entity.EntityClassification;
@@ -33,7 +34,7 @@ public class WitheredAbyssBiome extends NetherBiomeTemplate
     @Override
     protected void configureGeneration(BiomeGenerationSettings.Builder builder)
     {
-        builder.surfaceBuilder(new ConfiguredSurfaceBuilder(BOPSurfaceBuilders.WITHERED_ABYSS, BOPSurfaceBuilders.BLACKSTONE_SURFACE));
+        builder.surfaceBuilder(BOPConfiguredSurfaceBuilders.WITHERED_ABYSS);
 
         //Terrain
         builder.addStructureStart(StructureFeatures.RUINED_PORTAL_NETHER);

src/main/java/biomesoplenty/common/biome/overworld/AlpsBiome.java

@@ -9,6 +9,7 @@ package biomesoplenty.common.biome.overworld;
 
 import biomesoplenty.api.enums.BOPClimates;
 import biomesoplenty.common.biome.BiomeTemplate;
+import biomesoplenty.common.world.gen.surfacebuilders.BOPConfiguredSurfaceBuilders;
 import biomesoplenty.common.world.gen.surfacebuilders.BOPSurfaceBuilders;
 import net.minecraft.entity.EntityClassification;
 import net.minecraft.entity.EntityType;
@@ -36,7 +37,7 @@ public class AlpsBiome extends BiomeTemplate
     @Override
     protected void configureGeneration(BiomeGenerationSettings.Builder builder)
     {
-        builder.surfaceBuilder(new ConfiguredSurfaceBuilder(BOPSurfaceBuilders.DEEP_TOP_LAYER, BOPSurfaceBuilders.SNOW_SNOW_GRAVEL_SURFACE));
+        builder.surfaceBuilder(BOPConfiguredSurfaceBuilders.ALPS);
 
         // Structures
         DefaultBiomeFeatures.addDefaultOverworldLandStructures(builder);

src/main/java/biomesoplenty/common/biome/overworld/AlpsFoothillsBiome.java

@@ -9,6 +9,7 @@ package biomesoplenty.common.biome.overworld;
 
 import biomesoplenty.common.biome.BiomeTemplate;
 import biomesoplenty.common.world.gen.feature.BOPConfiguredFeatures;
+import biomesoplenty.common.world.gen.surfacebuilders.BOPConfiguredSurfaceBuilders;
 import net.minecraft.entity.EntityClassification;
 import net.minecraft.entity.EntityType;
 import net.minecraft.world.biome.*;
@@ -36,7 +37,7 @@ public class AlpsFoothillsBiome extends BiomeTemplate
     @Override
     protected void configureGeneration(BiomeGenerationSettings.Builder builder)
     {
-        builder.surfaceBuilder(new ConfiguredSurfaceBuilder(SurfaceBuilder.DEFAULT, SurfaceBuilder.CONFIG_STONE));
+        builder.surfaceBuilder(BOPConfiguredSurfaceBuilders.ALPS_FOOTHILLS);
 
         // Structures
         DefaultBiomeFeatures.addDefaultOverworldLandStructures(builder);

src/main/java/biomesoplenty/common/biome/overworld/BayouBiome.java

@@ -18,6 +18,7 @@ import net.minecraft.world.gen.GenerationStage;
 import net.minecraft.world.gen.feature.*;
 import net.minecraft.world.gen.feature.structure.StructureFeatures;
 import net.minecraft.world.gen.surfacebuilders.ConfiguredSurfaceBuilder;
+import net.minecraft.world.gen.surfacebuilders.ConfiguredSurfaceBuilders;
 import net.minecraft.world.gen.surfacebuilders.SurfaceBuilder;
 
 public class BayouBiome extends BiomeTemplate
@@ -39,7 +40,7 @@ public class BayouBiome extends BiomeTemplate
     @Override
     protected void configureGeneration(BiomeGenerationSettings.Builder builder)
     {
-        builder.surfaceBuilder(new ConfiguredSurfaceBuilder(SurfaceBuilder.DEFAULT, SurfaceBuilder.CONFIG_GRASS));
+        builder.surfaceBuilder(ConfiguredSurfaceBuilders.GRASS);
 
         // Structures
         DefaultBiomeFeatures.addDefaultOverworldLandStructures(builder);

src/main/java/biomesoplenty/common/biome/overworld/BogBiome.java

@@ -17,6 +17,7 @@ import net.minecraft.world.gen.GenerationStage;
 import net.minecraft.world.gen.feature.*;
 import net.minecraft.world.gen.feature.structure.StructureFeatures;
 import net.minecraft.world.gen.surfacebuilders.ConfiguredSurfaceBuilder;
+import net.minecraft.world.gen.surfacebuilders.ConfiguredSurfaceBuilders;
 import net.minecraft.world.gen.surfacebuilders.SurfaceBuilder;
 
 public class BogBiome extends BiomeTemplate
@@ -38,7 +39,7 @@ public class BogBiome extends BiomeTemplate
     @Override
     protected void configureGeneration(BiomeGenerationSettings.Builder builder)
     {
-        builder.surfaceBuilder(new ConfiguredSurfaceBuilder(SurfaceBuilder.DEFAULT, SurfaceBuilder.CONFIG_GRASS));
+        builder.surfaceBuilder(ConfiguredSurfaceBuilders.GRASS);
 
         // Structures
         DefaultBiomeFeatures.addDefaultOverworldLandStructures(builder);

src/main/java/biomesoplenty/common/biome/overworld/BorealForestBiome.java

@@ -18,6 +18,7 @@ import net.minecraft.world.gen.GenerationStage;
 import net.minecraft.world.gen.feature.*;
 import net.minecraft.world.gen.feature.structure.StructureFeatures;
 import net.minecraft.world.gen.surfacebuilders.ConfiguredSurfaceBuilder;
+import net.minecraft.world.gen.surfacebuilders.ConfiguredSurfaceBuilders;
 import net.minecraft.world.gen.surfacebuilders.SurfaceBuilder;
 
 public class BorealForestBiome extends BiomeTemplate
@@ -42,7 +43,7 @@ public class BorealForestBiome extends BiomeTemplate
     protected void configureGeneration(BiomeGenerationSettings.Builder builder)
     {
         // Surface builder
-        builder.surfaceBuilder(new ConfiguredSurfaceBuilder(SurfaceBuilder.DEFAULT, SurfaceBuilder.CONFIG_GRASS));
+        builder.surfaceBuilder(ConfiguredSurfaceBuilders.GRASS);
 
         // Structures
         DefaultBiomeFeatures.addDefaultOverworldLandStructures(builder);

src/main/java/biomesoplenty/common/biome/overworld/ChaparralBiome.java

@@ -10,6 +10,7 @@ package biomesoplenty.common.biome.overworld;
 import biomesoplenty.api.enums.BOPClimates;
 import biomesoplenty.common.biome.BiomeTemplate;
 import biomesoplenty.common.world.gen.feature.BOPConfiguredFeatures;
+import biomesoplenty.common.world.gen.surfacebuilders.BOPConfiguredSurfaceBuilders;
 import biomesoplenty.common.world.gen.surfacebuilders.BOPSurfaceBuilders;
 import net.minecraft.entity.EntityClassification;
 import net.minecraft.entity.EntityType;
@@ -37,7 +38,7 @@ public class ChaparralBiome extends BiomeTemplate
     @Override
     protected void configureGeneration(BiomeGenerationSettings.Builder builder)
     {
-        builder.surfaceBuilder(new ConfiguredSurfaceBuilder(BOPSurfaceBuilders.CHAPARRAL, SurfaceBuilder.CONFIG_GRASS));
+        builder.surfaceBuilder(BOPConfiguredSurfaceBuilders.CHAPARRAL);
 
         // Structures
         DefaultBiomeFeatures.addDefaultOverworldLandStructures(builder);

src/main/java/biomesoplenty/common/biome/overworld/CherryBlossomGroveBiome.java

@@ -17,6 +17,7 @@ import net.minecraft.world.gen.GenerationStage;
 import net.minecraft.world.gen.feature.*;
 import net.minecraft.world.gen.feature.structure.StructureFeatures;
 import net.minecraft.world.gen.surfacebuilders.ConfiguredSurfaceBuilder;
+import net.minecraft.world.gen.surfacebuilders.ConfiguredSurfaceBuilders;
 import net.minecraft.world.gen.surfacebuilders.SurfaceBuilder;
 
 public class CherryBlossomGroveBiome extends BiomeTemplate
@@ -37,7 +38,7 @@ public class CherryBlossomGroveBiome extends BiomeTemplate
     @Override
     protected void configureGeneration(BiomeGenerationSettings.Builder builder)
     {
-        builder.surfaceBuilder(new ConfiguredSurfaceBuilder(SurfaceBuilder.DEFAULT, SurfaceBuilder.CONFIG_GRASS));
+        builder.surfaceBuilder(ConfiguredSurfaceBuilders.GRASS);
 
         // Structures
         DefaultBiomeFeatures.addDefaultOverworldLandStructures(builder);

src/main/java/biomesoplenty/common/biome/overworld/ColdDesertBiome.java

@@ -10,6 +10,7 @@ package biomesoplenty.common.biome.overworld;
 import biomesoplenty.api.enums.BOPClimates;
 import biomesoplenty.common.biome.BiomeTemplate;
 import biomesoplenty.common.world.gen.feature.BOPConfiguredFeatures;
+import biomesoplenty.common.world.gen.surfacebuilders.BOPConfiguredSurfaceBuilders;
 import biomesoplenty.common.world.gen.surfacebuilders.BOPSurfaceBuilders;
 import net.minecraft.entity.EntityClassification;
 import net.minecraft.entity.EntityType;
@@ -40,7 +41,7 @@ public class ColdDesertBiome extends BiomeTemplate
     @Override
     protected void configureGeneration(BiomeGenerationSettings.Builder builder)
     {
-        builder.surfaceBuilder(new ConfiguredSurfaceBuilder(BOPSurfaceBuilders.COLD_DESERT, SurfaceBuilder.CONFIG_GRAVEL));
+        builder.surfaceBuilder(BOPConfiguredSurfaceBuilders.COLD_DESERT);
 
         // Structures
         builder.addStructureStart(StructureFeatures.VILLAGE_SNOWY);

src/main/java/biomesoplenty/common/biome/overworld/ConiferousForestBiome.java

@@ -18,6 +18,7 @@ import net.minecraft.world.gen.GenerationStage;
 import net.minecraft.world.gen.feature.*;
 import net.minecraft.world.gen.feature.structure.StructureFeatures;
 import net.minecraft.world.gen.surfacebuilders.ConfiguredSurfaceBuilder;
+import net.minecraft.world.gen.surfacebuilders.ConfiguredSurfaceBuilders;
 import net.minecraft.world.gen.surfacebuilders.SurfaceBuilder;
 
 public class ConiferousForestBiome extends BiomeTemplate
@@ -39,7 +40,7 @@ public class ConiferousForestBiome extends BiomeTemplate
     @Override
     protected void configureGeneration(BiomeGenerationSettings.Builder builder)
     {
-        builder.surfaceBuilder(new ConfiguredSurfaceBuilder(SurfaceBuilder.DEFAULT, SurfaceBuilder.CONFIG_GRASS));
+        builder.surfaceBuilder(ConfiguredSurfaceBuilders.GRASS);
 
         // Structures
         DefaultBiomeFeatures.addDefaultOverworldLandStructures(builder);

src/main/java/biomesoplenty/common/biome/overworld/DeadForestBiome.java

@@ -18,6 +18,7 @@ import net.minecraft.world.gen.GenerationStage;
 import net.minecraft.world.gen.feature.*;
 import net.minecraft.world.gen.feature.structure.StructureFeatures;
 import net.minecraft.world.gen.surfacebuilders.ConfiguredSurfaceBuilder;
+import net.minecraft.world.gen.surfacebuilders.ConfiguredSurfaceBuilders;
 import net.minecraft.world.gen.surfacebuilders.SurfaceBuilder;
 
 public class DeadForestBiome extends BiomeTemplate
@@ -39,7 +40,7 @@ public class DeadForestBiome extends BiomeTemplate
     @Override
     protected void configureGeneration(BiomeGenerationSettings.Builder builder)
     {
-        builder.surfaceBuilder(new ConfiguredSurfaceBuilder(SurfaceBuilder.DEFAULT, SurfaceBuilder.CONFIG_GRASS));
+        builder.surfaceBuilder(ConfiguredSurfaceBuilders.GRASS);
 
         // Structures
         builder.addStructureStart(StructureFeatures.WOODLAND_MANSION);

src/main/java/biomesoplenty/common/biome/overworld/DrylandBiome.java

@@ -18,6 +18,7 @@ import net.minecraft.world.gen.GenerationStage;
 import net.minecraft.world.gen.feature.*;
 import net.minecraft.world.gen.feature.structure.StructureFeatures;
 import net.minecraft.world.gen.surfacebuilders.ConfiguredSurfaceBuilder;
+import net.minecraft.world.gen.surfacebuilders.ConfiguredSurfaceBuilders;
 import net.minecraft.world.gen.surfacebuilders.SurfaceBuilder;
 
 public class DrylandBiome extends BiomeTemplate
@@ -40,7 +41,7 @@ public class DrylandBiome extends BiomeTemplate
     @Override
     protected void configureGeneration(BiomeGenerationSettings.Builder builder)
     {
-        builder.surfaceBuilder(new ConfiguredSurfaceBuilder(SurfaceBuilder.DEFAULT, SurfaceBuilder.CONFIG_GRASS));
+        builder.surfaceBuilder(ConfiguredSurfaceBuilders.GRASS);
 
         // Structures
         builder.addStructureStart(StructureFeatures.VILLAGE_DESERT);

src/main/java/biomesoplenty/common/biome/overworld/FirClearingBiome.java

@@ -17,6 +17,7 @@ import net.minecraft.world.gen.GenerationStage;
 import net.minecraft.world.gen.feature.*;
 import net.minecraft.world.gen.feature.structure.StructureFeatures;
 import net.minecraft.world.gen.surfacebuilders.ConfiguredSurfaceBuilder;
+import net.minecraft.world.gen.surfacebuilders.ConfiguredSurfaceBuilders;
 import net.minecraft.world.gen.surfacebuilders.SurfaceBuilder;
 
 public class FirClearingBiome extends BiomeTemplate
@@ -37,7 +38,7 @@ public class FirClearingBiome extends BiomeTemplate
     @Override
     protected void configureGeneration(BiomeGenerationSettings.Builder builder)
     {
-        builder.surfaceBuilder(new ConfiguredSurfaceBuilder(SurfaceBuilder.DEFAULT, SurfaceBuilder.CONFIG_GRASS));
+        builder.surfaceBuilder(ConfiguredSurfaceBuilders.GRASS);
 
         // Structures
         DefaultBiomeFeatures.addDefaultOverworldLandStructures(builder);

src/main/java/biomesoplenty/common/biome/overworld/FloodplainBiome.java

@@ -17,6 +17,7 @@ import net.minecraft.world.gen.GenerationStage;
 import net.minecraft.world.gen.feature.*;
 import net.minecraft.world.gen.feature.structure.StructureFeatures;
 import net.minecraft.world.gen.surfacebuilders.ConfiguredSurfaceBuilder;
+import net.minecraft.world.gen.surfacebuilders.ConfiguredSurfaceBuilders;
 import net.minecraft.world.gen.surfacebuilders.SurfaceBuilder;
 
 public class FloodplainBiome extends BiomeTemplate
@@ -38,7 +39,7 @@ public class FloodplainBiome extends BiomeTemplate
     @Override
     protected void configureGeneration(BiomeGenerationSettings.Builder builder)
     {
-        builder.surfaceBuilder(new ConfiguredSurfaceBuilder(SurfaceBuilder.SWAMP, SurfaceBuilder.CONFIG_GRASS));
+        builder.surfaceBuilder(ConfiguredSurfaceBuilders.SWAMP);
 
         // Structures
         builder.addStructureStart(StructureFeatures.JUNGLE_TEMPLE);

src/main/java/biomesoplenty/common/biome/overworld/FlowerMeadowBiome.java

@@ -16,6 +16,7 @@ import net.minecraft.world.biome.*;
 import net.minecraft.world.gen.GenerationStage;
 import net.minecraft.world.gen.feature.structure.StructureFeatures;
 import net.minecraft.world.gen.surfacebuilders.ConfiguredSurfaceBuilder;
+import net.minecraft.world.gen.surfacebuilders.ConfiguredSurfaceBuilders;
 import net.minecraft.world.gen.surfacebuilders.SurfaceBuilder;
 
 public class FlowerMeadowBiome extends BiomeTemplate
@@ -36,7 +37,7 @@ public class FlowerMeadowBiome extends BiomeTemplate
     @Override
     protected void configureGeneration(BiomeGenerationSettings.Builder builder)
     {
-        builder.surfaceBuilder(new ConfiguredSurfaceBuilder(SurfaceBuilder.DEFAULT, SurfaceBuilder.CONFIG_GRASS));
+        builder.surfaceBuilder(ConfiguredSurfaceBuilders.GRASS);
 
         // Structures
         DefaultBiomeFeatures.addDefaultOverworldLandStructures(builder);

src/main/java/biomesoplenty/common/biome/overworld/FungalJungleBiome.java

@@ -17,6 +17,7 @@ import net.minecraft.world.gen.GenerationStage;
 import net.minecraft.world.gen.feature.*;
 import net.minecraft.world.gen.feature.structure.StructureFeatures;
 import net.minecraft.world.gen.surfacebuilders.ConfiguredSurfaceBuilder;
+import net.minecraft.world.gen.surfacebuilders.ConfiguredSurfaceBuilders;
 import net.minecraft.world.gen.surfacebuilders.SurfaceBuilder;
 
 public class FungalJungleBiome extends BiomeTemplate
@@ -39,7 +40,7 @@ public class FungalJungleBiome extends BiomeTemplate
     @Override
     protected void configureGeneration(BiomeGenerationSettings.Builder builder)
     {
-        builder.surfaceBuilder(new ConfiguredSurfaceBuilder(SurfaceBuilder.DEFAULT, SurfaceBuilder.CONFIG_GRASS));
+        builder.surfaceBuilder(ConfiguredSurfaceBuilders.GRASS);
 
         // Structures
         DefaultBiomeFeatures.addDefaultOverworldLandStructures(builder);

src/main/java/biomesoplenty/common/biome/overworld/GrasslandBiome.java

@@ -18,6 +18,7 @@ import net.minecraft.world.gen.GenerationStage;
 import net.minecraft.world.gen.feature.Features;
 import net.minecraft.world.gen.feature.structure.StructureFeatures;
 import net.minecraft.world.gen.surfacebuilders.ConfiguredSurfaceBuilder;
+import net.minecraft.world.gen.surfacebuilders.ConfiguredSurfaceBuilders;
 import net.minecraft.world.gen.surfacebuilders.SurfaceBuilder;
 
 public class GrasslandBiome extends BiomeTemplate
@@ -39,7 +40,7 @@ public class GrasslandBiome extends BiomeTemplate
     @Override
     protected void configureGeneration(BiomeGenerationSettings.Builder builder)
     {
-        builder.surfaceBuilder(new ConfiguredSurfaceBuilder(SurfaceBuilder.DEFAULT, SurfaceBuilder.CONFIG_GRASS));
+        builder.surfaceBuilder(ConfiguredSurfaceBuilders.GRASS);
 
         // Structures
         builder.addStructureStart(StructureFeatures.VILLAGE_PLAINS);

src/main/java/biomesoplenty/common/biome/overworld/GravelBeachBiome.java

@@ -8,6 +8,7 @@
 package biomesoplenty.common.biome.overworld;
 
 import biomesoplenty.common.biome.BiomeTemplate;
+import biomesoplenty.common.world.gen.surfacebuilders.BOPConfiguredSurfaceBuilders;
 import net.minecraft.entity.EntityClassification;
 import net.minecraft.entity.EntityType;
 import net.minecraft.world.biome.*;
@@ -33,7 +34,7 @@ public class GravelBeachBiome extends BiomeTemplate
     @Override
     protected void configureGeneration(BiomeGenerationSettings.Builder builder)
     {
-        builder.surfaceBuilder(new ConfiguredSurfaceBuilder(SurfaceBuilder.DEFAULT, SurfaceBuilder.CONFIG_GRAVEL));
+        builder.surfaceBuilder(BOPConfiguredSurfaceBuilders.GRAVEL_BEACH);
 
         // Structures
         builder.addStructureStart(StructureFeatures.MINESHAFT);

src/main/java/biomesoplenty/common/biome/overworld/GroveBiome.java

@@ -10,6 +10,7 @@ package biomesoplenty.common.biome.overworld;
 import biomesoplenty.api.enums.BOPClimates;
 import biomesoplenty.common.biome.BiomeTemplate;
 import biomesoplenty.common.world.gen.feature.BOPConfiguredFeatures;
+import biomesoplenty.common.world.gen.surfacebuilders.BOPConfiguredSurfaceBuilders;
 import biomesoplenty.common.world.gen.surfacebuilders.BOPSurfaceBuilders;
 import net.minecraft.entity.EntityClassification;
 import net.minecraft.entity.EntityType;
@@ -39,7 +40,7 @@ public class GroveBiome extends BiomeTemplate
     @Override
     protected void configureGeneration(BiomeGenerationSettings.Builder builder)
     {
-        builder.surfaceBuilder(new ConfiguredSurfaceBuilder(BOPSurfaceBuilders.PODZOL, SurfaceBuilder.CONFIG_GRASS));
+        builder.surfaceBuilder(BOPConfiguredSurfaceBuilders.PODZOL_MIXED);
 
         // Structures
         builder.addStructureStart(StructureFeatures.VILLAGE_PLAINS);

src/main/java/biomesoplenty/common/biome/overworld/HighlandBiome.java

@@ -16,6 +16,7 @@ import net.minecraft.world.biome.*;
 import net.minecraft.world.gen.GenerationStage;
 import net.minecraft.world.gen.feature.structure.StructureFeatures;
 import net.minecraft.world.gen.surfacebuilders.ConfiguredSurfaceBuilder;
+import net.minecraft.world.gen.surfacebuilders.ConfiguredSurfaceBuilders;
 import net.minecraft.world.gen.surfacebuilders.SurfaceBuilder;
 
 public class HighlandBiome extends BiomeTemplate
@@ -37,7 +38,7 @@ public class HighlandBiome extends BiomeTemplate
     @Override
     protected void configureGeneration(BiomeGenerationSettings.Builder builder)
     {
-        builder.surfaceBuilder(new ConfiguredSurfaceBuilder(SurfaceBuilder.DEFAULT, SurfaceBuilder.CONFIG_GRASS));
+        builder.surfaceBuilder(ConfiguredSurfaceBuilders.GRASS);
 
         // Structures
         DefaultBiomeFeatures.addDefaultOverworldLandStructures(builder);

src/main/java/biomesoplenty/common/biome/overworld/HighlandMoorBiome.java

@@ -16,6 +16,7 @@ import net.minecraft.world.gen.GenerationStage;
 import net.minecraft.world.gen.feature.*;
 import net.minecraft.world.gen.feature.structure.StructureFeatures;
 import net.minecraft.world.gen.surfacebuilders.ConfiguredSurfaceBuilder;
+import net.minecraft.world.gen.surfacebuilders.ConfiguredSurfaceBuilders;
 import net.minecraft.world.gen.surfacebuilders.SurfaceBuilder;
 
 public class HighlandMoorBiome extends BiomeTemplate
@@ -36,7 +37,7 @@ public class HighlandMoorBiome extends BiomeTemplate
     @Override
     protected void configureGeneration(BiomeGenerationSettings.Builder builder)
     {
-        builder.surfaceBuilder(new ConfiguredSurfaceBuilder(SurfaceBuilder.DEFAULT, SurfaceBuilder.CONFIG_GRASS));
+        builder.surfaceBuilder(ConfiguredSurfaceBuilders.GRASS);
 
         // Structures
         DefaultBiomeFeatures.addDefaultOverworldLandStructures(builder);

src/main/java/biomesoplenty/common/biome/overworld/JadeCliffsBiome.java

@@ -10,6 +10,7 @@ package biomesoplenty.common.biome.overworld;
 import biomesoplenty.api.enums.BOPClimates;
 import biomesoplenty.common.biome.BiomeTemplate;
 import biomesoplenty.common.world.gen.feature.BOPConfiguredFeatures;
+import biomesoplenty.common.world.gen.surfacebuilders.BOPConfiguredSurfaceBuilders;
 import biomesoplenty.common.world.gen.surfacebuilders.BOPSurfaceBuilders;
 import net.minecraft.entity.EntityClassification;
 import net.minecraft.entity.EntityType;
@@ -39,7 +40,7 @@ public class JadeCliffsBiome extends BiomeTemplate
     @Override
     protected void configureGeneration(BiomeGenerationSettings.Builder builder)
     {
-        builder.surfaceBuilder(new ConfiguredSurfaceBuilder(BOPSurfaceBuilders.DEEP_TOP_LAYER, SurfaceBuilder.CONFIG_GRASS));
+        builder.surfaceBuilder(BOPConfiguredSurfaceBuilders.JADE_CLIFFS);
 
         // Structures
         DefaultBiomeFeatures.addDefaultOverworldLandStructures(builder);

src/main/java/biomesoplenty/common/biome/overworld/LavenderFieldBiome.java

@@ -17,6 +17,7 @@ import net.minecraft.world.gen.GenerationStage;
 import net.minecraft.world.gen.feature.*;
 import net.minecraft.world.gen.feature.structure.StructureFeatures;
 import net.minecraft.world.gen.surfacebuilders.ConfiguredSurfaceBuilder;
+import net.minecraft.world.gen.surfacebuilders.ConfiguredSurfaceBuilders;
 import net.minecraft.world.gen.surfacebuilders.SurfaceBuilder;
 
 public class LavenderFieldBiome extends BiomeTemplate
@@ -37,7 +38,7 @@ public class LavenderFieldBiome extends BiomeTemplate
     @Override
     protected void configureGeneration(BiomeGenerationSettings.Builder builder)
     {
-        builder.surfaceBuilder(new ConfiguredSurfaceBuilder(SurfaceBuilder.DEFAULT, SurfaceBuilder.CONFIG_GRASS));
+        builder.surfaceBuilder(ConfiguredSurfaceBuilders.GRASS);
 
         // Structures
         DefaultBiomeFeatures.addDefaultOverworldLandStructures(builder);

src/main/java/biomesoplenty/common/biome/overworld/LushDesertBiome.java

@@ -11,6 +11,7 @@ import biomesoplenty.api.biome.BOPBiomes;
 import biomesoplenty.api.enums.BOPClimates;
 import biomesoplenty.common.biome.BiomeTemplate;
 import biomesoplenty.common.world.gen.feature.BOPConfiguredFeatures;
+import biomesoplenty.common.world.gen.surfacebuilders.BOPConfiguredSurfaceBuilders;
 import biomesoplenty.common.world.gen.surfacebuilders.BOPSurfaceBuilders;
 import net.minecraft.entity.EntityClassification;
 import net.minecraft.entity.EntityType;
@@ -40,7 +41,7 @@ public class LushDesertBiome extends BiomeTemplate
     @Override
     protected void configureGeneration(BiomeGenerationSettings.Builder builder)
     {
-        builder.surfaceBuilder(new ConfiguredSurfaceBuilder(BOPSurfaceBuilders.LUSH_DESERT, BOPSurfaceBuilders.ORANGE_SAND_SURFACE));
+        builder.surfaceBuilder(BOPConfiguredSurfaceBuilders.LUSH_DESERT);
 
         // Structures
         DefaultBiomeFeatures.addDefaultOverworldLandStructures(builder);

src/main/java/biomesoplenty/common/biome/overworld/LushGrasslandBiome.java

@@ -18,6 +18,7 @@ import net.minecraft.world.gen.GenerationStage;
 import net.minecraft.world.gen.feature.*;
 import net.minecraft.world.gen.feature.structure.StructureFeatures;
 import net.minecraft.world.gen.surfacebuilders.ConfiguredSurfaceBuilder;
+import net.minecraft.world.gen.surfacebuilders.ConfiguredSurfaceBuilders;
 import net.minecraft.world.gen.surfacebuilders.SurfaceBuilder;
 
 public class LushGrasslandBiome extends BiomeTemplate
@@ -39,7 +40,7 @@ public class LushGrasslandBiome extends BiomeTemplate
     @Override
     protected void configureGeneration(BiomeGenerationSettings.Builder builder)
     {
-        builder.surfaceBuilder(new ConfiguredSurfaceBuilder(SurfaceBuilder.DEFAULT, SurfaceBuilder.CONFIG_GRASS));
+        builder.surfaceBuilder(ConfiguredSurfaceBuilders.GRASS);
 
         // Structures
         DefaultBiomeFeatures.addDefaultOverworldLandStructures(builder);

src/main/java/biomesoplenty/common/biome/overworld/LushSwampBiome.java

@@ -17,6 +17,7 @@ import net.minecraft.world.gen.GenerationStage;
 import net.minecraft.world.gen.feature.*;
 import net.minecraft.world.gen.feature.structure.StructureFeatures;
 import net.minecraft.world.gen.surfacebuilders.ConfiguredSurfaceBuilder;
+import net.minecraft.world.gen.surfacebuilders.ConfiguredSurfaceBuilders;
 import net.minecraft.world.gen.surfacebuilders.SurfaceBuilder;
 
 public class LushSwampBiome extends BiomeTemplate
@@ -38,7 +39,7 @@ public class LushSwampBiome extends BiomeTemplate
     @Override
     protected void configureGeneration(BiomeGenerationSettings.Builder builder)
     {
-        builder.surfaceBuilder(new ConfiguredSurfaceBuilder(SurfaceBuilder.DEFAULT, SurfaceBuilder.CONFIG_GRASS));
+        builder.surfaceBuilder(ConfiguredSurfaceBuilders.GRASS);
 
         // Structures
         builder.addStructureStart(StructureFeatures.SWAMP_HUT);

src/main/java/biomesoplenty/common/biome/overworld/MangroveBiome.java

@@ -10,6 +10,7 @@ package biomesoplenty.common.biome.overworld;
 import biomesoplenty.api.enums.BOPClimates;
 import biomesoplenty.common.biome.BiomeTemplate;
 import biomesoplenty.common.world.gen.feature.BOPConfiguredFeatures;
+import biomesoplenty.common.world.gen.surfacebuilders.BOPConfiguredSurfaceBuilders;
 import biomesoplenty.common.world.gen.surfacebuilders.BOPSurfaceBuilders;
 import net.minecraft.entity.EntityClassification;
 import net.minecraft.entity.EntityType;
@@ -39,7 +40,7 @@ public class MangroveBiome extends BiomeTemplate
     @Override
     protected void configureGeneration(BiomeGenerationSettings.Builder builder)
     {
-        builder.surfaceBuilder(new ConfiguredSurfaceBuilder(BOPSurfaceBuilders.MANGROVE, SurfaceBuilder.CONFIG_GRASS));
+        builder.surfaceBuilder(BOPConfiguredSurfaceBuilders.MANGROVE);
 
         // Structures
         DefaultBiomeFeatures.addDefaultOverworldLandStructures(builder);

src/main/java/biomesoplenty/common/biome/overworld/MapleWoodsBiome.java

@@ -18,6 +18,7 @@ import net.minecraft.world.gen.GenerationStage;
 import net.minecraft.world.gen.feature.*;
 import net.minecraft.world.gen.feature.structure.StructureFeatures;
 import net.minecraft.world.gen.surfacebuilders.ConfiguredSurfaceBuilder;
+import net.minecraft.world.gen.surfacebuilders.ConfiguredSurfaceBuilders;
 import net.minecraft.world.gen.surfacebuilders.SurfaceBuilder;
 
 public class MapleWoodsBiome extends BiomeTemplate
@@ -39,7 +40,7 @@ public class MapleWoodsBiome extends BiomeTemplate
     @Override
     protected void configureGeneration(BiomeGenerationSettings.Builder builder)
     {
-        builder.surfaceBuilder(new ConfiguredSurfaceBuilder(SurfaceBuilder.DEFAULT, SurfaceBuilder.CONFIG_GRASS));
+        builder.surfaceBuilder(ConfiguredSurfaceBuilders.GRASS);
 
         // Structures
         builder.addStructureStart(StructureFeatures.VILLAGE_TAIGA);

src/main/java/biomesoplenty/common/biome/overworld/MarshBiome.java

@@ -10,6 +10,7 @@ package biomesoplenty.common.biome.overworld;
 import biomesoplenty.api.enums.BOPClimates;
 import biomesoplenty.common.biome.BiomeTemplate;
 import biomesoplenty.common.world.gen.feature.BOPConfiguredFeatures;
+import biomesoplenty.common.world.gen.surfacebuilders.BOPConfiguredSurfaceBuilders;
 import biomesoplenty.common.world.gen.surfacebuilders.BOPSurfaceBuilders;
 import net.minecraft.entity.EntityClassification;
 import net.minecraft.entity.EntityType;
@@ -39,7 +40,7 @@ public class MarshBiome extends BiomeTemplate
     @Override
     protected void configureGeneration(BiomeGenerationSettings.Builder builder)
     {
-        builder.surfaceBuilder(new ConfiguredSurfaceBuilder(BOPSurfaceBuilders.MARSH, SurfaceBuilder.CONFIG_GRASS));
+        builder.surfaceBuilder(BOPConfiguredSurfaceBuilders.MARSH);
 
         // Structures
         DefaultBiomeFeatures.addDefaultOverworldLandStructures(builder);

src/main/java/biomesoplenty/common/biome/overworld/MeadowBiome.java

@@ -18,6 +18,7 @@ import net.minecraft.world.gen.GenerationStage;
 import net.minecraft.world.gen.feature.*;
 import net.minecraft.world.gen.feature.structure.StructureFeatures;
 import net.minecraft.world.gen.surfacebuilders.ConfiguredSurfaceBuilder;
+import net.minecraft.world.gen.surfacebuilders.ConfiguredSurfaceBuilders;
 import net.minecraft.world.gen.surfacebuilders.SurfaceBuilder;
 
 public class MeadowBiome extends BiomeTemplate
@@ -39,7 +40,7 @@ public class MeadowBiome extends BiomeTemplate
     @Override
     protected void configureGeneration(BiomeGenerationSettings.Builder builder)
     {
-        builder.surfaceBuilder(new ConfiguredSurfaceBuilder(SurfaceBuilder.DEFAULT, SurfaceBuilder.CONFIG_GRASS));
+        builder.surfaceBuilder(ConfiguredSurfaceBuilders.GRASS);
 
         // Structures
         builder.addStructureStart(StructureFeatures.VILLAGE_TAIGA);

src/main/java/biomesoplenty/common/biome/overworld/MireBiome.java

@@ -10,6 +10,7 @@ package biomesoplenty.common.biome.overworld;
 import biomesoplenty.api.enums.BOPClimates;
 import biomesoplenty.common.biome.BiomeTemplate;
 import biomesoplenty.common.world.gen.feature.BOPConfiguredFeatures;
+import biomesoplenty.common.world.gen.surfacebuilders.BOPConfiguredSurfaceBuilders;
 import biomesoplenty.common.world.gen.surfacebuilders.BOPSurfaceBuilders;
 import net.minecraft.entity.EntityClassification;
 import net.minecraft.entity.EntityType;
@@ -39,7 +40,7 @@ public class MireBiome extends BiomeTemplate
     @Override
     protected void configureGeneration(BiomeGenerationSettings.Builder builder)
     {
-        builder.surfaceBuilder(new ConfiguredSurfaceBuilder(BOPSurfaceBuilders.MUD, SurfaceBuilder.CONFIG_GRASS));
+        builder.surfaceBuilder(BOPConfiguredSurfaceBuilders.MIRE);
 
         // Structures
         builder.addStructureStart(StructureFeatures.SWAMP_HUT);

src/main/java/biomesoplenty/common/biome/overworld/MuskegBiome.java

@@ -10,6 +10,7 @@ package biomesoplenty.common.biome.overworld;
 import biomesoplenty.api.enums.BOPClimates;
 import biomesoplenty.common.biome.BiomeTemplate;
 import biomesoplenty.common.world.gen.feature.BOPConfiguredFeatures;
+import biomesoplenty.common.world.gen.surfacebuilders.BOPConfiguredSurfaceBuilders;
 import biomesoplenty.common.world.gen.surfacebuilders.BOPSurfaceBuilders;
 import net.minecraft.entity.EntityClassification;
 import net.minecraft.entity.EntityType;
@@ -39,7 +40,7 @@ public class MuskegBiome extends BiomeTemplate
     @Override
     protected void configureGeneration(BiomeGenerationSettings.Builder builder)
     {
-        builder.surfaceBuilder(new ConfiguredSurfaceBuilder(BOPSurfaceBuilders.PODZOL, SurfaceBuilder.CONFIG_GRASS));
+        builder.surfaceBuilder(BOPConfiguredSurfaceBuilders.PODZOL_MIXED);
 
         // Structures
         DefaultBiomeFeatures.addDefaultOverworldLandStructures(builder);

src/main/java/biomesoplenty/common/biome/overworld/MysticGroveBiome.java

@@ -17,6 +17,7 @@ import net.minecraft.world.gen.GenerationStage;
 import net.minecraft.world.gen.feature.*;
 import net.minecraft.world.gen.feature.structure.StructureFeatures;
 import net.minecraft.world.gen.surfacebuilders.ConfiguredSurfaceBuilder;
+import net.minecraft.world.gen.surfacebuilders.ConfiguredSurfaceBuilders;
 import net.minecraft.world.gen.surfacebuilders.SurfaceBuilder;
 
 public class MysticGroveBiome extends BiomeTemplate
@@ -39,7 +40,7 @@ public class MysticGroveBiome extends BiomeTemplate
     @Override
     protected void configureGeneration(BiomeGenerationSettings.Builder builder)
     {
-        builder.surfaceBuilder(new ConfiguredSurfaceBuilder(SurfaceBuilder.DEFAULT, SurfaceBuilder.CONFIG_GRASS));
+        builder.surfaceBuilder(ConfiguredSurfaceBuilders.GRASS);
 
         // Structures
         DefaultBiomeFeatures.addDefaultOverworldLandStructures(builder);

src/main/java/biomesoplenty/common/biome/overworld/OminousWoodsBiome.java

@@ -17,6 +17,7 @@ import net.minecraft.world.gen.GenerationStage;
 import net.minecraft.world.gen.feature.*;
 import net.minecraft.world.gen.feature.structure.StructureFeatures;
 import net.minecraft.world.gen.surfacebuilders.ConfiguredSurfaceBuilder;
+import net.minecraft.world.gen.surfacebuilders.ConfiguredSurfaceBuilders;
 import net.minecraft.world.gen.surfacebuilders.SurfaceBuilder;
 
 public class OminousWoodsBiome extends BiomeTemplate
@@ -39,7 +40,7 @@ public class OminousWoodsBiome extends BiomeTemplate
     @Override
     protected void configureGeneration(BiomeGenerationSettings.Builder builder)
     {
-        builder.surfaceBuilder(new ConfiguredSurfaceBuilder(SurfaceBuilder.DEFAULT, SurfaceBuilder.CONFIG_GRASS));
+        builder.surfaceBuilder(ConfiguredSurfaceBuilders.GRASS);
 
         // Structures
         builder.addStructureStart(StructureFeatures.WOODLAND_MANSION);

src/main/java/biomesoplenty/common/biome/overworld/OrchardBiome.java

@@ -16,6 +16,7 @@ import net.minecraft.world.gen.GenerationStage;
 import net.minecraft.world.gen.feature.*;
 import net.minecraft.world.gen.feature.structure.StructureFeatures;
 import net.minecraft.world.gen.surfacebuilders.ConfiguredSurfaceBuilder;
+import net.minecraft.world.gen.surfacebuilders.ConfiguredSurfaceBuilders;
 import net.minecraft.world.gen.surfacebuilders.SurfaceBuilder;
 
 public class OrchardBiome extends BiomeTemplate
@@ -33,7 +34,7 @@ public class OrchardBiome extends BiomeTemplate
     @Override
     protected void configureGeneration(BiomeGenerationSettings.Builder builder)
     {
-        builder.surfaceBuilder(new ConfiguredSurfaceBuilder(SurfaceBuilder.DEFAULT, SurfaceBuilder.CONFIG_GRASS));
+        builder.surfaceBuilder(ConfiguredSurfaceBuilders.GRASS);
 
         // Structures
         DefaultBiomeFeatures.addDefaultOverworldLandStructures(builder);

src/main/java/biomesoplenty/common/biome/overworld/OriginValleyBiome.java

@@ -12,6 +12,7 @@ import biomesoplenty.common.world.gen.carver.BOPConfiguredCarvers;
 import biomesoplenty.common.world.gen.carver.BOPWorldCarvers;
 import biomesoplenty.common.world.gen.feature.BOPConfiguredFeatures;
 import biomesoplenty.common.world.gen.feature.BOPFeatures;
+import biomesoplenty.common.world.gen.surfacebuilders.BOPConfiguredSurfaceBuilders;
 import biomesoplenty.common.world.gen.surfacebuilders.BOPSurfaceBuilders;
 import net.minecraft.entity.EntityClassification;
 import net.minecraft.entity.EntityType;
@@ -39,7 +40,7 @@ public class OriginValleyBiome extends BiomeTemplate
     @Override
     protected void configureGeneration(BiomeGenerationSettings.Builder builder)
     {
-        builder.surfaceBuilder(new ConfiguredSurfaceBuilder(BOPSurfaceBuilders.ORIGIN_VALLEY, BOPSurfaceBuilders.ORIGIN_GRASS_SURFACE));
+        builder.surfaceBuilder(BOPConfiguredSurfaceBuilders.ORIGIN_VALLEY);
 
         // Underground
         builder.addCarver(GenerationStage.Carving.AIR, BOPConfiguredCarvers.ORIGIN_CAVE);

src/main/java/biomesoplenty/common/biome/overworld/OutbackBiome.java

@@ -10,6 +10,7 @@ package biomesoplenty.common.biome.overworld;
 import biomesoplenty.api.enums.BOPClimates;
 import biomesoplenty.common.biome.BiomeTemplate;
 import biomesoplenty.common.world.gen.feature.BOPConfiguredFeatures;
+import biomesoplenty.common.world.gen.surfacebuilders.BOPConfiguredSurfaceBuilders;
 import biomesoplenty.common.world.gen.surfacebuilders.BOPSurfaceBuilders;
 import net.minecraft.entity.EntityClassification;
 import net.minecraft.entity.EntityType;
@@ -38,7 +39,7 @@ public class OutbackBiome extends BiomeTemplate
     @Override
     protected void configureGeneration(BiomeGenerationSettings.Builder builder)
     {
-        builder.surfaceBuilder(new ConfiguredSurfaceBuilder(SurfaceBuilder.DEFAULT, BOPSurfaceBuilders.RED_SAND_SURFACE));
+        builder.surfaceBuilder(BOPConfiguredSurfaceBuilders.OUTBACK);
 
         // Structures
         builder.addStructureStart(StructureFeatures.VILLAGE_SAVANNA);

src/main/java/biomesoplenty/common/biome/overworld/OvergrownCliffsBiome.java

@@ -10,6 +10,7 @@ package biomesoplenty.common.biome.overworld;
 import biomesoplenty.api.enums.BOPClimates;
 import biomesoplenty.common.biome.BiomeTemplate;
 import biomesoplenty.common.world.gen.feature.BOPConfiguredFeatures;
+import biomesoplenty.common.world.gen.surfacebuilders.BOPConfiguredSurfaceBuilders;
 import biomesoplenty.common.world.gen.surfacebuilders.BOPSurfaceBuilders;
 import net.minecraft.entity.EntityClassification;
 import net.minecraft.entity.EntityType;
@@ -39,7 +40,7 @@ public class OvergrownCliffsBiome extends BiomeTemplate
     @Override
     protected void configureGeneration(BiomeGenerationSettings.Builder builder)
     {
-        builder.surfaceBuilder(new ConfiguredSurfaceBuilder(BOPSurfaceBuilders.TERRACOTTA, SurfaceBuilder.CONFIG_GRASS));
+        builder.surfaceBuilder(BOPConfiguredSurfaceBuilders.OVERGROWN_CLIFFS);
 
         // Structures
         builder.addStructureStart(StructureFeatures.JUNGLE_TEMPLE);

src/main/java/biomesoplenty/common/biome/overworld/PastureBiome.java

@@ -15,6 +15,7 @@ import net.minecraft.world.biome.*;
 import net.minecraft.world.gen.GenerationStage;
 import net.minecraft.world.gen.feature.structure.StructureFeatures;
 import net.minecraft.world.gen.surfacebuilders.ConfiguredSurfaceBuilder;
+import net.minecraft.world.gen.surfacebuilders.ConfiguredSurfaceBuilders;
 import net.minecraft.world.gen.surfacebuilders.SurfaceBuilder;
 
 public class PastureBiome extends BiomeTemplate
@@ -32,7 +33,7 @@ public class PastureBiome extends BiomeTemplate
     @Override
     protected void configureGeneration(BiomeGenerationSettings.Builder builder)
     {
-        builder.surfaceBuilder(new ConfiguredSurfaceBuilder(SurfaceBuilder.DEFAULT, SurfaceBuilder.CONFIG_GRASS));
+        builder.surfaceBuilder(ConfiguredSurfaceBuilders.GRASS);
 
         // Structures
         DefaultBiomeFeatures.addDefaultOverworldLandStructures(builder);

src/main/java/biomesoplenty/common/biome/overworld/PoppyFieldBiome.java

@@ -10,6 +10,7 @@ package biomesoplenty.common.biome.overworld;
 import biomesoplenty.api.enums.BOPClimates;
 import biomesoplenty.common.biome.BiomeTemplate;
 import biomesoplenty.common.world.gen.feature.BOPConfiguredFeatures;
+import biomesoplenty.common.world.gen.surfacebuilders.BOPConfiguredSurfaceBuilders;
 import biomesoplenty.common.world.gen.surfacebuilders.BOPSurfaceBuilders;
 import net.minecraft.entity.EntityClassification;
 import net.minecraft.entity.EntityType;
@@ -38,7 +39,7 @@ public class PoppyFieldBiome extends BiomeTemplate
     @Override
     protected void configureGeneration(BiomeGenerationSettings.Builder builder)
     {
-        builder.surfaceBuilder(new ConfiguredSurfaceBuilder(BOPSurfaceBuilders.POPPY_FIELD, SurfaceBuilder.CONFIG_GRASS));
+        builder.surfaceBuilder(BOPConfiguredSurfaceBuilders.POPPY_FIELD);
 
         // Structures
         DefaultBiomeFeatures.addDefaultOverworldLandStructures(builder);

src/main/java/biomesoplenty/common/biome/overworld/PrairieBiome.java

@@ -16,6 +16,7 @@ import net.minecraft.world.biome.*;
 import net.minecraft.world.gen.GenerationStage;
 import net.minecraft.world.gen.feature.structure.StructureFeatures;
 import net.minecraft.world.gen.surfacebuilders.ConfiguredSurfaceBuilder;
+import net.minecraft.world.gen.surfacebuilders.ConfiguredSurfaceBuilders;
 import net.minecraft.world.gen.surfacebuilders.SurfaceBuilder;
 
 public class PrairieBiome extends BiomeTemplate
@@ -36,7 +37,7 @@ public class PrairieBiome extends BiomeTemplate
     @Override
     protected void configureGeneration(BiomeGenerationSettings.Builder builder)
     {
-        builder.surfaceBuilder(new ConfiguredSurfaceBuilder(SurfaceBuilder.DEFAULT, SurfaceBuilder.CONFIG_GRASS));
+        builder.surfaceBuilder(ConfiguredSurfaceBuilders.GRASS);
 
         // Structures
         builder.addStructureStart(StructureFeatures.VILLAGE_PLAINS);

src/main/java/biomesoplenty/common/biome/overworld/PumpkinPatchBiome.java

@@ -17,6 +17,7 @@ import net.minecraft.world.gen.GenerationStage;
 import net.minecraft.world.gen.feature.*;
 import net.minecraft.world.gen.feature.structure.StructureFeatures;
 import net.minecraft.world.gen.surfacebuilders.ConfiguredSurfaceBuilder;
+import net.minecraft.world.gen.surfacebuilders.ConfiguredSurfaceBuilders;
 import net.minecraft.world.gen.surfacebuilders.SurfaceBuilder;
 
 public class PumpkinPatchBiome extends BiomeTemplate
@@ -37,7 +38,7 @@ public class PumpkinPatchBiome extends BiomeTemplate
     @Override
     protected void configureGeneration(BiomeGenerationSettings.Builder builder)
     {
-        builder.surfaceBuilder(new ConfiguredSurfaceBuilder(SurfaceBuilder.DEFAULT, SurfaceBuilder.CONFIG_GRASS));
+        builder.surfaceBuilder(ConfiguredSurfaceBuilders.GRASS);
 
         // Structures
         DefaultBiomeFeatures.addDefaultOverworldLandStructures(builder);

src/main/java/biomesoplenty/common/biome/overworld/RainbowHillsBiome.java

@@ -16,6 +16,7 @@ import net.minecraft.world.biome.*;
 import net.minecraft.world.gen.GenerationStage;
 import net.minecraft.world.gen.feature.*;
 import net.minecraft.world.gen.surfacebuilders.ConfiguredSurfaceBuilder;
+import net.minecraft.world.gen.surfacebuilders.ConfiguredSurfaceBuilders;
 import net.minecraft.world.gen.surfacebuilders.SurfaceBuilder;
 
 public class RainbowHillsBiome extends BiomeTemplate
@@ -37,7 +38,7 @@ public class RainbowHillsBiome extends BiomeTemplate
     @Override
     protected void configureGeneration(BiomeGenerationSettings.Builder builder)
     {
-        builder.surfaceBuilder(new ConfiguredSurfaceBuilder(SurfaceBuilder.DEFAULT, SurfaceBuilder.CONFIG_GRASS));
+        builder.surfaceBuilder(ConfiguredSurfaceBuilders.GRASS);
 
         // Structures
         DefaultBiomeFeatures.addDefaultOverworldLandStructures(builder);

src/main/java/biomesoplenty/common/biome/overworld/RainforestBiome.java

@@ -18,6 +18,7 @@ import net.minecraft.world.gen.GenerationStage;
 import net.minecraft.world.gen.feature.*;
 import net.minecraft.world.gen.feature.structure.StructureFeatures;
 import net.minecraft.world.gen.surfacebuilders.ConfiguredSurfaceBuilder;
+import net.minecraft.world.gen.surfacebuilders.ConfiguredSurfaceBuilders;
 import net.minecraft.world.gen.surfacebuilders.SurfaceBuilder;
 
 public class RainforestBiome extends BiomeTemplate
@@ -39,7 +40,7 @@ public class RainforestBiome extends BiomeTemplate
     @Override
     protected void configureGeneration(BiomeGenerationSettings.Builder builder)
     {
-        builder.surfaceBuilder(new ConfiguredSurfaceBuilder(SurfaceBuilder.DEFAULT, SurfaceBuilder.CONFIG_GRASS));
+        builder.surfaceBuilder(ConfiguredSurfaceBuilders.GRASS);
 
         // Structures
         DefaultBiomeFeatures.addDefaultOverworldLandStructures(builder);

src/main/java/biomesoplenty/common/biome/overworld/RedwoodForestBiome.java

@@ -10,6 +10,7 @@ package biomesoplenty.common.biome.overworld;
 import biomesoplenty.api.enums.BOPClimates;
 import biomesoplenty.common.biome.BiomeTemplate;
 import biomesoplenty.common.world.gen.feature.BOPConfiguredFeatures;
+import biomesoplenty.common.world.gen.surfacebuilders.BOPConfiguredSurfaceBuilders;
 import net.minecraft.entity.EntityClassification;
 import net.minecraft.entity.EntityType;
 import net.minecraft.world.biome.*;
@@ -37,7 +38,7 @@ public class RedwoodForestBiome extends BiomeTemplate
     @Override
     protected void configureGeneration(BiomeGenerationSettings.Builder builder)
     {
-        builder.surfaceBuilder(new ConfiguredSurfaceBuilder(SurfaceBuilder.DEFAULT, SurfaceBuilder.CONFIG_PODZOL));
+        builder.surfaceBuilder(BOPConfiguredSurfaceBuilders.PODZOL_FULL);
 
         // Structures
         DefaultBiomeFeatures.addDefaultOverworldLandStructures(builder);

src/main/java/biomesoplenty/common/biome/overworld/RedwoodForestEdgeBiome.java

@@ -9,6 +9,7 @@ package biomesoplenty.common.biome.overworld;
 
 import biomesoplenty.common.biome.BiomeTemplate;
 import biomesoplenty.common.world.gen.feature.BOPConfiguredFeatures;
+import biomesoplenty.common.world.gen.surfacebuilders.BOPConfiguredSurfaceBuilders;
 import biomesoplenty.common.world.gen.surfacebuilders.BOPSurfaceBuilders;
 import net.minecraft.entity.EntityClassification;
 import net.minecraft.entity.EntityType;
@@ -34,7 +35,7 @@ public class RedwoodForestEdgeBiome extends BiomeTemplate
     @Override
     protected void configureGeneration(BiomeGenerationSettings.Builder builder)
     {
-        builder.surfaceBuilder(new ConfiguredSurfaceBuilder(BOPSurfaceBuilders.PODZOL, SurfaceBuilder.CONFIG_PODZOL));
+        builder.surfaceBuilder(BOPConfiguredSurfaceBuilders.PODZOL_MIXED);
 
         // Structures
         DefaultBiomeFeatures.addDefaultOverworldLandStructures(builder);

src/main/java/biomesoplenty/common/biome/overworld/ScrublandBiome.java

@@ -18,8 +18,8 @@ import net.minecraft.world.gen.GenerationStage;
 import net.minecraft.world.gen.feature.Features;
 import net.minecraft.world.gen.feature.structure.StructureFeatures;
 import net.minecraft.world.gen.surfacebuilders.ConfiguredSurfaceBuilder;
+import net.minecraft.world.gen.surfacebuilders.ConfiguredSurfaceBuilders;
 import net.minecraft.world.gen.surfacebuilders.SurfaceBuilder;
-import sun.java2d.Surface;
 
 public class ScrublandBiome extends BiomeTemplate
 {
@@ -39,7 +39,7 @@ public class ScrublandBiome extends BiomeTemplate
     @Override
     protected void configureGeneration(BiomeGenerationSettings.Builder builder)
     {
-        builder.surfaceBuilder(new ConfiguredSurfaceBuilder(SurfaceBuilder.DEFAULT, SurfaceBuilder.CONFIG_GRASS));
+        builder.surfaceBuilder(ConfiguredSurfaceBuilders.GRASS);
 
         // Structures
         builder.addStructureStart(StructureFeatures.VILLAGE_SAVANNA);

src/main/java/biomesoplenty/common/biome/overworld/SeasonalForestBiome.java

@@ -18,6 +18,7 @@ import net.minecraft.world.gen.GenerationStage;
 import net.minecraft.world.gen.feature.*;
 import net.minecraft.world.gen.feature.structure.StructureFeatures;
 import net.minecraft.world.gen.surfacebuilders.ConfiguredSurfaceBuilder;
+import net.minecraft.world.gen.surfacebuilders.ConfiguredSurfaceBuilders;
 import net.minecraft.world.gen.surfacebuilders.SurfaceBuilder;
 
 public class SeasonalForestBiome extends BiomeTemplate
@@ -39,7 +40,7 @@ public class SeasonalForestBiome extends BiomeTemplate
     @Override
     protected void configureGeneration(BiomeGenerationSettings.Builder builder)
     {
-        builder.surfaceBuilder(new ConfiguredSurfaceBuilder(SurfaceBuilder.DEFAULT, SurfaceBuilder.CONFIG_GRASS));
+        builder.surfaceBuilder(ConfiguredSurfaceBuilders.GRASS);
 
         // Structures
         builder.addStructureStart(StructureFeatures.WOODLAND_MANSION);

src/main/java/biomesoplenty/common/biome/overworld/ShieldBiome.java

@@ -11,6 +11,7 @@ import biomesoplenty.api.biome.BOPBiomes;
 import biomesoplenty.api.enums.BOPClimates;
 import biomesoplenty.common.biome.BiomeTemplate;
 import biomesoplenty.common.world.gen.feature.BOPConfiguredFeatures;
+import biomesoplenty.common.world.gen.surfacebuilders.BOPConfiguredSurfaceBuilders;
 import biomesoplenty.common.world.gen.surfacebuilders.BOPSurfaceBuilders;
 import net.minecraft.entity.EntityClassification;
 import net.minecraft.entity.EntityType;
@@ -40,7 +41,7 @@ public class ShieldBiome extends BiomeTemplate
     @Override
     protected void configureGeneration(BiomeGenerationSettings.Builder builder)
     {
-        builder.surfaceBuilder(new ConfiguredSurfaceBuilder(BOPSurfaceBuilders.CHAPARRAL, SurfaceBuilder.CONFIG_GRASS));
+        builder.surfaceBuilder(BOPConfiguredSurfaceBuilders.CHAPARRAL);
 
         // Structures
         DefaultBiomeFeatures.addDefaultOverworldLandStructures(builder);

src/main/java/biomesoplenty/common/biome/overworld/ShrublandBiome.java

@@ -17,6 +17,7 @@ import net.minecraft.world.biome.*;
 import net.minecraft.world.gen.GenerationStage;
 import net.minecraft.world.gen.feature.structure.StructureFeatures;
 import net.minecraft.world.gen.surfacebuilders.ConfiguredSurfaceBuilder;
+import net.minecraft.world.gen.surfacebuilders.ConfiguredSurfaceBuilders;
 import net.minecraft.world.gen.surfacebuilders.SurfaceBuilder;
 
 public class ShrublandBiome extends BiomeTemplate
@@ -38,7 +39,7 @@ public class ShrublandBiome extends BiomeTemplate
     @Override
     protected void configureGeneration(BiomeGenerationSettings.Builder builder)
     {
-        builder.surfaceBuilder(new ConfiguredSurfaceBuilder(SurfaceBuilder.DEFAULT, SurfaceBuilder.CONFIG_GRASS));
+        builder.surfaceBuilder(ConfiguredSurfaceBuilders.GRASS);
 
         // Structures
         builder.addStructureStart(StructureFeatures.VILLAGE_PLAINS);

src/main/java/biomesoplenty/common/biome/overworld/SilkgladeBiome.java

@@ -17,6 +17,7 @@ import net.minecraft.world.gen.GenerationStage;
 import net.minecraft.world.gen.feature.*;
 import net.minecraft.world.gen.feature.structure.StructureFeatures;
 import net.minecraft.world.gen.surfacebuilders.ConfiguredSurfaceBuilder;
+import net.minecraft.world.gen.surfacebuilders.ConfiguredSurfaceBuilders;
 import net.minecraft.world.gen.surfacebuilders.SurfaceBuilder;
 
 public class SilkgladeBiome extends BiomeTemplate
@@ -40,7 +41,7 @@ public class SilkgladeBiome extends BiomeTemplate
     @Override
     protected void configureGeneration(BiomeGenerationSettings.Builder builder)
     {
-        builder.surfaceBuilder(new ConfiguredSurfaceBuilder(SurfaceBuilder.DEFAULT, SurfaceBuilder.CONFIG_GRASS));
+        builder.surfaceBuilder(ConfiguredSurfaceBuilders.GRASS);
 
         // Structures
         builder.addStructureStart(StructureFeatures.SWAMP_HUT);

src/main/java/biomesoplenty/common/biome/overworld/SnowyConiferousForestBiome.java

@@ -17,6 +17,7 @@ import net.minecraft.world.gen.GenerationStage;
 import net.minecraft.world.gen.feature.*;
 import net.minecraft.world.gen.feature.structure.StructureFeatures;
 import net.minecraft.world.gen.surfacebuilders.ConfiguredSurfaceBuilder;
+import net.minecraft.world.gen.surfacebuilders.ConfiguredSurfaceBuilders;
 import net.minecraft.world.gen.surfacebuilders.SurfaceBuilder;
 
 public class SnowyConiferousForestBiome extends BiomeTemplate
@@ -37,7 +38,7 @@ public class SnowyConiferousForestBiome extends BiomeTemplate
     @Override
     protected void configureGeneration(BiomeGenerationSettings.Builder builder)
     {
-        builder.surfaceBuilder(new ConfiguredSurfaceBuilder(SurfaceBuilder.DEFAULT, SurfaceBuilder.CONFIG_GRASS));
+        builder.surfaceBuilder(ConfiguredSurfaceBuilders.GRASS);
 
         // Structures
         builder.addStructureStart(StructureFeatures.IGLOO);

src/main/java/biomesoplenty/common/biome/overworld/SnowyFirClearingBiome.java

@@ -16,6 +16,7 @@ import net.minecraft.world.gen.GenerationStage;
 import net.minecraft.world.gen.feature.*;
 import net.minecraft.world.gen.feature.structure.StructureFeatures;
 import net.minecraft.world.gen.surfacebuilders.ConfiguredSurfaceBuilder;
+import net.minecraft.world.gen.surfacebuilders.ConfiguredSurfaceBuilders;
 import net.minecraft.world.gen.surfacebuilders.SurfaceBuilder;
 
 public class SnowyFirClearingBiome extends BiomeTemplate
@@ -33,7 +34,7 @@ public class SnowyFirClearingBiome extends BiomeTemplate
     @Override
     protected void configureGeneration(BiomeGenerationSettings.Builder builder)
     {
-        builder.surfaceBuilder(new ConfiguredSurfaceBuilder(SurfaceBuilder.DEFAULT, SurfaceBuilder.CONFIG_GRASS));
+        builder.surfaceBuilder(ConfiguredSurfaceBuilders.GRASS);
 
         // Structures
         builder.addStructureStart(StructureFeatures.IGLOO);

src/main/java/biomesoplenty/common/biome/overworld/SnowyForestBiome.java

@@ -17,6 +17,7 @@ import net.minecraft.world.gen.GenerationStage;
 import net.minecraft.world.gen.feature.*;
 import net.minecraft.world.gen.feature.structure.StructureFeatures;
 import net.minecraft.world.gen.surfacebuilders.ConfiguredSurfaceBuilder;
+import net.minecraft.world.gen.surfacebuilders.ConfiguredSurfaceBuilders;
 import net.minecraft.world.gen.surfacebuilders.SurfaceBuilder;
 
 public class SnowyForestBiome extends BiomeTemplate
@@ -37,7 +38,7 @@ public class SnowyForestBiome extends BiomeTemplate
     @Override
     protected void configureGeneration(BiomeGenerationSettings.Builder builder)
     {
-        builder.surfaceBuilder(new ConfiguredSurfaceBuilder(SurfaceBuilder.DEFAULT, SurfaceBuilder.CONFIG_GRASS));
+        builder.surfaceBuilder(ConfiguredSurfaceBuilders.GRASS);
 
         // Structures
         builder.addStructureStart(StructureFeatures.VILLAGE_SNOWY);

src/main/java/biomesoplenty/common/biome/overworld/SteppeBiome.java

@@ -16,6 +16,7 @@ import net.minecraft.world.biome.*;
 import net.minecraft.world.gen.GenerationStage;
 import net.minecraft.world.gen.feature.structure.StructureFeatures;
 import net.minecraft.world.gen.surfacebuilders.ConfiguredSurfaceBuilder;
+import net.minecraft.world.gen.surfacebuilders.ConfiguredSurfaceBuilders;
 import net.minecraft.world.gen.surfacebuilders.SurfaceBuilder;
 
 public class SteppeBiome extends BiomeTemplate
@@ -37,7 +38,7 @@ public class SteppeBiome extends BiomeTemplate
     @Override
     protected void configureGeneration(BiomeGenerationSettings.Builder builder)
     {
-        builder.surfaceBuilder(new ConfiguredSurfaceBuilder(SurfaceBuilder.DEFAULT, SurfaceBuilder.CONFIG_GRASS));
+        builder.surfaceBuilder(ConfiguredSurfaceBuilders.GRASS);
 
         // Structures
         DefaultBiomeFeatures.addDefaultOverworldLandStructures(builder);

src/main/java/biomesoplenty/common/biome/overworld/TemperateRainforestBiome.java

@@ -18,6 +18,7 @@ import net.minecraft.world.gen.GenerationStage;
 import net.minecraft.world.gen.feature.*;
 import net.minecraft.world.gen.feature.structure.StructureFeatures;
 import net.minecraft.world.gen.surfacebuilders.ConfiguredSurfaceBuilder;
+import net.minecraft.world.gen.surfacebuilders.ConfiguredSurfaceBuilders;
 import net.minecraft.world.gen.surfacebuilders.SurfaceBuilder;
 
 public class TemperateRainforestBiome extends BiomeTemplate
@@ -39,7 +40,7 @@ public class TemperateRainforestBiome extends BiomeTemplate
     @Override
     protected void configureGeneration(BiomeGenerationSettings.Builder builder)
     {
-        builder.surfaceBuilder(new ConfiguredSurfaceBuilder(SurfaceBuilder.DEFAULT, SurfaceBuilder.CONFIG_GRASS));
+        builder.surfaceBuilder(ConfiguredSurfaceBuilders.GRASS);
 
         // Structures
         DefaultBiomeFeatures.addDefaultOverworldLandStructures(builder);

src/main/java/biomesoplenty/common/biome/overworld/TemperateRainforestHillsBiome.java

@@ -17,6 +17,7 @@ import net.minecraft.world.gen.GenerationStage;
 import net.minecraft.world.gen.feature.*;
 import net.minecraft.world.gen.feature.structure.StructureFeatures;
 import net.minecraft.world.gen.surfacebuilders.ConfiguredSurfaceBuilder;
+import net.minecraft.world.gen.surfacebuilders.ConfiguredSurfaceBuilders;
 import net.minecraft.world.gen.surfacebuilders.SurfaceBuilder;
 
 public class TemperateRainforestHillsBiome extends BiomeTemplate
@@ -37,7 +38,7 @@ public class TemperateRainforestHillsBiome extends BiomeTemplate
     @Override
     protected void configureGeneration(BiomeGenerationSettings.Builder builder)
     {
-        builder.surfaceBuilder(new ConfiguredSurfaceBuilder(SurfaceBuilder.DEFAULT, SurfaceBuilder.CONFIG_GRASS));
+        builder.surfaceBuilder(ConfiguredSurfaceBuilders.GRASS);
 
         // Structures
         DefaultBiomeFeatures.addDefaultOverworldLandStructures(builder);

src/main/java/biomesoplenty/common/biome/overworld/TropicBeachBiome.java

@@ -9,6 +9,7 @@ package biomesoplenty.common.biome.overworld;
 
 import biomesoplenty.common.biome.BiomeTemplate;
 import biomesoplenty.common.world.gen.feature.BOPConfiguredFeatures;
+import biomesoplenty.common.world.gen.surfacebuilders.BOPConfiguredSurfaceBuilders;
 import biomesoplenty.common.world.gen.surfacebuilders.BOPSurfaceBuilders;
 import net.minecraft.entity.EntityClassification;
 import net.minecraft.entity.EntityType;
@@ -37,8 +38,7 @@ public class TropicBeachBiome extends BiomeTemplate
     @Override
     protected void configureGeneration(BiomeGenerationSettings.Builder builder)
     {
-        builder.surfaceBuilder(new ConfiguredSurfaceBuilder(BOPSurfaceBuilders.TROPICS, BOPSurfaceBuilders.WHITE_SAND_SURFACE));
-
+        builder.surfaceBuilder(BOPConfiguredSurfaceBuilders.TROPIC_BEACH);
 
         // Structures
         builder.addStructureStart(StructureFeatures.BURIED_TREASURE);

src/main/java/biomesoplenty/common/biome/overworld/TropicalRainforestBiome.java

@@ -18,6 +18,7 @@ import net.minecraft.world.gen.GenerationStage;
 import net.minecraft.world.gen.feature.*;
 import net.minecraft.world.gen.feature.structure.StructureFeatures;
 import net.minecraft.world.gen.surfacebuilders.ConfiguredSurfaceBuilder;
+import net.minecraft.world.gen.surfacebuilders.ConfiguredSurfaceBuilders;
 import net.minecraft.world.gen.surfacebuilders.SurfaceBuilder;
 
 public class TropicalRainforestBiome extends BiomeTemplate
@@ -39,7 +40,7 @@ public class TropicalRainforestBiome extends BiomeTemplate
     @Override
     protected void configureGeneration(BiomeGenerationSettings.Builder builder)
     {
-        builder.surfaceBuilder(new ConfiguredSurfaceBuilder(SurfaceBuilder.DEFAULT, SurfaceBuilder.CONFIG_GRASS));
+        builder.surfaceBuilder(ConfiguredSurfaceBuilders.GRASS);
 
         // Structures
         builder.addStructureStart(StructureFeatures.JUNGLE_TEMPLE);

src/main/java/biomesoplenty/common/biome/overworld/TropicsBiome.java

@@ -10,6 +10,7 @@ package biomesoplenty.common.biome.overworld;
 import biomesoplenty.api.biome.BOPBiomes;
 import biomesoplenty.common.biome.BiomeTemplate;
 import biomesoplenty.common.world.gen.feature.BOPConfiguredFeatures;
+import biomesoplenty.common.world.gen.surfacebuilders.BOPConfiguredSurfaceBuilders;
 import biomesoplenty.common.world.gen.surfacebuilders.BOPSurfaceBuilders;
 import net.minecraft.entity.EntityClassification;
 import net.minecraft.entity.EntityType;
@@ -39,7 +40,7 @@ public class TropicsBiome extends BiomeTemplate
     @Override
     protected void configureGeneration(BiomeGenerationSettings.Builder builder)
     {
-        builder.surfaceBuilder(new ConfiguredSurfaceBuilder(BOPSurfaceBuilders.TROPICS, SurfaceBuilder.CONFIG_GRASS));
+        builder.surfaceBuilder(BOPConfiguredSurfaceBuilders.TROPICS);
 
         // Structures
         DefaultBiomeFeatures.addDefaultOverworldLandStructures(builder);

src/main/java/biomesoplenty/common/biome/overworld/TundraBiome.java

@@ -17,6 +17,7 @@ import net.minecraft.world.biome.*;
 import net.minecraft.world.gen.GenerationStage;
 import net.minecraft.world.gen.feature.structure.StructureFeatures;
 import net.minecraft.world.gen.surfacebuilders.ConfiguredSurfaceBuilder;
+import net.minecraft.world.gen.surfacebuilders.ConfiguredSurfaceBuilders;
 import net.minecraft.world.gen.surfacebuilders.SurfaceBuilder;
 
 public class TundraBiome extends BiomeTemplate
@@ -38,7 +39,7 @@ public class TundraBiome extends BiomeTemplate
     @Override
     protected void configureGeneration(BiomeGenerationSettings.Builder builder)
     {
-        builder.surfaceBuilder(new ConfiguredSurfaceBuilder(SurfaceBuilder.DEFAULT, SurfaceBuilder.CONFIG_GRASS)) ;
+        builder.surfaceBuilder(ConfiguredSurfaceBuilders.GRASS);
 
         // Structures
         builder.addStructureStart(StructureFeatures.VILLAGE_TAIGA);

src/main/java/biomesoplenty/common/biome/overworld/VolcanicPlainsBiome.java

@@ -9,6 +9,7 @@ package biomesoplenty.common.biome.overworld;
 
 import biomesoplenty.common.biome.BiomeTemplate;
 import biomesoplenty.common.world.gen.feature.BOPConfiguredFeatures;
+import biomesoplenty.common.world.gen.surfacebuilders.BOPConfiguredSurfaceBuilders;
 import biomesoplenty.common.world.gen.surfacebuilders.BOPSurfaceBuilders;
 import net.minecraft.entity.EntityClassification;
 import net.minecraft.entity.EntityType;
@@ -37,7 +38,7 @@ public class VolcanicPlainsBiome extends BiomeTemplate
     @Override
     protected void configureGeneration(BiomeGenerationSettings.Builder builder)
     {
-        builder.surfaceBuilder(new ConfiguredSurfaceBuilder(BOPSurfaceBuilders.BLACK_SAND, BOPSurfaceBuilders.BLACK_SAND_SURFACE));
+        builder.surfaceBuilder(BOPConfiguredSurfaceBuilders.VOLCANIC_PLAINS);
 
         // Structures
         DefaultBiomeFeatures.addDefaultOverworldLandStructures(builder);

src/main/java/biomesoplenty/common/biome/overworld/VolcanoBiome.java

@@ -10,6 +10,7 @@ package biomesoplenty.common.biome.overworld;
 import biomesoplenty.api.biome.BOPBiomes;
 import biomesoplenty.common.biome.BiomeTemplate;
 import biomesoplenty.common.world.gen.feature.BOPConfiguredFeatures;
+import biomesoplenty.common.world.gen.surfacebuilders.BOPConfiguredSurfaceBuilders;
 import biomesoplenty.common.world.gen.surfacebuilders.BOPSurfaceBuilders;
 import net.minecraft.entity.EntityClassification;
 import net.minecraft.entity.EntityType;
@@ -38,7 +39,7 @@ public class VolcanoBiome extends BiomeTemplate
     @Override
     protected void configureGeneration(BiomeGenerationSettings.Builder builder)
     {
-        builder.surfaceBuilder(new ConfiguredSurfaceBuilder(BOPSurfaceBuilders.VOLCANO, BOPSurfaceBuilders.BASALT_SURFACE));
+        builder.surfaceBuilder(BOPConfiguredSurfaceBuilders.VOLCANO);
 
         // Structures
         DefaultBiomeFeatures.addDefaultOverworldLandStructures(builder);

src/main/java/biomesoplenty/common/biome/overworld/WastelandBiome.java

@@ -10,6 +10,7 @@ package biomesoplenty.common.biome.overworld;
 import biomesoplenty.api.enums.BOPClimates;
 import biomesoplenty.common.biome.BiomeTemplate;
 import biomesoplenty.common.world.gen.feature.BOPConfiguredFeatures;
+import biomesoplenty.common.world.gen.surfacebuilders.BOPConfiguredSurfaceBuilders;
 import biomesoplenty.common.world.gen.surfacebuilders.BOPSurfaceBuilders;
 import net.minecraft.entity.EntityClassification;
 import net.minecraft.entity.EntityType;
@@ -39,7 +40,7 @@ public class WastelandBiome extends BiomeTemplate
     @Override
     protected void configureGeneration(BiomeGenerationSettings.Builder builder)
     {
-        builder.surfaceBuilder(new ConfiguredSurfaceBuilder(SurfaceBuilder.DEFAULT, BOPSurfaceBuilders.DRIED_SALT_SURFACE));
+        builder.surfaceBuilder(BOPConfiguredSurfaceBuilders.WASTELAND);
 
         // Structures
         DefaultBiomeFeatures.addDefaultOverworldLandStructures(builder);

src/main/java/biomesoplenty/common/biome/overworld/WetlandBiome.java

@@ -17,6 +17,7 @@ import net.minecraft.world.gen.GenerationStage;
 import net.minecraft.world.gen.feature.*;
 import net.minecraft.world.gen.feature.structure.StructureFeatures;
 import net.minecraft.world.gen.surfacebuilders.ConfiguredSurfaceBuilder;
+import net.minecraft.world.gen.surfacebuilders.ConfiguredSurfaceBuilders;
 import net.minecraft.world.gen.surfacebuilders.SurfaceBuilder;
 
 public class WetlandBiome extends BiomeTemplate
@@ -38,7 +39,7 @@ public class WetlandBiome extends BiomeTemplate
     @Override
     protected void configureGeneration(BiomeGenerationSettings.Builder builder)
     {
-        builder.surfaceBuilder(new ConfiguredSurfaceBuilder(SurfaceBuilder.DEFAULT, SurfaceBuilder.CONFIG_GRASS));
+        builder.surfaceBuilder(ConfiguredSurfaceBuilders.GRASS);
 
         // Structures
         builder.addStructureStart(StructureFeatures.SWAMP_HUT);

src/main/java/biomesoplenty/common/biome/overworld/WoodlandBiome.java

@@ -17,6 +17,7 @@ import net.minecraft.world.gen.GenerationStage;
 import net.minecraft.world.gen.feature.Features;
 import net.minecraft.world.gen.feature.structure.StructureFeatures;
 import net.minecraft.world.gen.surfacebuilders.ConfiguredSurfaceBuilder;
+import net.minecraft.world.gen.surfacebuilders.ConfiguredSurfaceBuilders;
 import net.minecraft.world.gen.surfacebuilders.SurfaceBuilder;
 
 public class WoodlandBiome extends BiomeTemplate
@@ -37,7 +38,7 @@ public class WoodlandBiome extends BiomeTemplate
     @Override
     protected void configureGeneration(BiomeGenerationSettings.Builder builder)
     {
-        builder.surfaceBuilder(new ConfiguredSurfaceBuilder(SurfaceBuilder.DEFAULT, SurfaceBuilder.CONFIG_GRASS));
+        builder.surfaceBuilder(ConfiguredSurfaceBuilders.GRASS);
 
         // Structures
         builder.addStructureStart(StructureFeatures.VILLAGE_PLAINS);

src/main/java/biomesoplenty/common/util/biome/BiomeUtil.java

@@ -18,6 +18,8 @@ import net.minecraft.world.biome.Biome;
 import net.minecraftforge.registries.ForgeRegistries;
 import net.minecraftforge.registries.ForgeRegistry;
 
+import javax.annotation.Nullable;
+
 public class BiomeUtil
 {
     public static RegistryKey<Biome> createKey(Biome biome)
@@ -86,8 +88,9 @@ public class BiomeUtil
         return getBiome(id) != null;
     }
 
+    @Nullable
     public static RegistryKey<Biome> getClientKey(Biome biome)
     {
-        return Minecraft.getInstance().level.registryAccess().registryOrThrow(Registry.BIOME_REGISTRY).getResourceKey(biome).get();
+        return Minecraft.getInstance().level.registryAccess().registryOrThrow(Registry.BIOME_REGISTRY).getResourceKey(biome).orElse(null);
     }
 }

src/main/java/biomesoplenty/common/world/BOPBiomeProvider.java

@@ -11,6 +11,7 @@ import biomesoplenty.api.enums.BOPClimates;
 import biomesoplenty.common.util.biome.BiomeUtil;
 import com.google.common.collect.ImmutableList;
 import com.mojang.serialization.Codec;
+import com.mojang.serialization.Lifecycle;
 import com.mojang.serialization.codecs.RecordCodecBuilder;
 import net.minecraft.util.RegistryKey;
 import net.minecraft.util.registry.DynamicRegistries;
@@ -20,6 +21,7 @@ import net.minecraft.util.registry.WorldGenRegistries;
 import net.minecraft.world.biome.Biome;
 import net.minecraft.world.biome.Biomes;
 import net.minecraft.world.biome.provider.BiomeProvider;
+import net.minecraft.world.biome.provider.OverworldBiomeProvider;
 import net.minecraft.world.gen.layer.Layer;
 import net.minecraft.world.gen.layer.LayerUtil;
 import net.minecraftforge.registries.ForgeRegistries;
@@ -46,7 +48,7 @@ public class BOPBiomeProvider extends BiomeProvider
 
     public BOPBiomeProvider(long seed, Registry<Biome> biomes)
     {
-        super(Stream.concat(VANILLA_POSSIBLE_BIOMES.stream(), BOPClimates.getOverworldBiomes().stream()).map(BiomeUtil::getBiome).collect(Collectors.toList()));
+        super(Stream.concat(VANILLA_POSSIBLE_BIOMES.stream(), BOPClimates.getOverworldBiomes().stream()).map(biomes::get).collect(Collectors.toList()));
         this.seed = seed;
         this.noiseBiomeLayer = BOPLayerUtil.createGenLayers(seed, new BOPOverworldGenSettings());
         this.biomes = biomes;

src/main/java/biomesoplenty/common/world/BOPNetherBiomeProvider.java

@@ -43,7 +43,7 @@ public class BOPNetherBiomeProvider extends BiomeProvider
 
     public BOPNetherBiomeProvider(long seed, Registry<Biome> biomes)
     {
-        super(Stream.concat(VANILLA_POSSIBLE_BIOMES.stream(), BOPClimates.NETHER.getLandBiomes().stream().map((entry) -> entry.biome)).map(BiomeUtil::getBiome).collect(Collectors.toList()));
+        super(Stream.concat(VANILLA_POSSIBLE_BIOMES.stream(), BOPClimates.NETHER.getLandBiomes().stream().map((entry) -> entry.biome)).map(biomes::get).collect(Collectors.toList()));
         this.seed = seed;
         this.noiseBiomeLayer = BOPNetherLayerUtil.createGenLayers(seed);
         this.biomes = biomes;

src/main/java/biomesoplenty/common/world/BOPWorldTypeUtil.java

@@ -95,11 +95,19 @@ public class BOPWorldTypeUtil
 
         if (server.getWorldData() instanceof ServerWorldInfo)
         {
-            ServerWorldInfo worldInfo  = (ServerWorldInfo)server.getWorldData();
-            worldInfo.worldGenSettings = createDimensionGeneratorSettings(DynamicRegistries.builtin(), worldInfo.worldGenSettings.seed(), worldInfo.worldGenSettings.generateFeatures(), worldInfo.worldGenSettings.generateBonusChest());
+            ServerWorldInfo worldInfo = (ServerWorldInfo) server.getWorldData();
+
+            // Only replace the worldGenSettings if it doesn't appear to already be the bop world type
+            if (!isUsingBopWorldType(worldInfo.worldGenSettings))
+            {
+                worldInfo.worldGenSettings = createDimensionGeneratorSettings(server.registryAccess(), worldInfo.worldGenSettings.seed(), worldInfo.worldGenSettings.generateFeatures(), worldInfo.worldGenSettings.generateBonusChest());
+            }
         }
 
-        // Replace the world gen settings in server.properties
-        properties.worldGenSettings = createDimensionGeneratorSettings(DynamicRegistries.builtin(), properties.worldGenSettings.seed(), properties.worldGenSettings.generateFeatures(), properties.worldGenSettings.generateBonusChest());
+        // Replace the world gen settings in server.properties if it doesn't already appear to be the bop world type
+        if (!isUsingBopWorldType(properties.worldGenSettings))
+        {
+            properties.worldGenSettings = createDimensionGeneratorSettings(server.registryAccess(), properties.worldGenSettings.seed(), properties.worldGenSettings.generateFeatures(), properties.worldGenSettings.generateBonusChest());
+        }
     }
 }

src/main/java/biomesoplenty/common/world/gen/carver/BOPWorldCarvers.java

@@ -13,6 +13,7 @@ import net.minecraft.util.registry.Registry;
 import net.minecraft.world.gen.carver.ICarverConfig;
 import net.minecraft.world.gen.carver.WorldCarver;
 import net.minecraft.world.gen.feature.ProbabilityConfig;
+import net.minecraftforge.registries.ForgeRegistries;
 
 public class BOPWorldCarvers
 {
@@ -21,6 +22,8 @@ public class BOPWorldCarvers
 
     private static <C extends ICarverConfig, F extends WorldCarver<C>> F register(String key, F carver)
     {
-        return Registry.register(Registry.CARVER, new ResourceLocation(BiomesOPlenty.MOD_ID, key), carver);
+        carver.setRegistryName(new ResourceLocation(BiomesOPlenty.MOD_ID, key));
+        ForgeRegistries.WORLD_CARVERS.register(carver);
+        return carver;
     }
 }

src/main/java/biomesoplenty/common/world/gen/feature/BOPFeatures.java

@@ -19,6 +19,7 @@ import net.minecraft.util.Direction;
 import net.minecraft.util.ResourceLocation;
 import net.minecraft.util.registry.Registry;
 import net.minecraft.world.gen.feature.*;
+import net.minecraftforge.registries.ForgeRegistries;
 
 public class BOPFeatures
 {
@@ -179,6 +180,8 @@ public class BOPFeatures
 
 	private static <C extends IFeatureConfig, F extends Feature<C>> F register(String key, F value)
 	{
-		return Registry.register(Registry.FEATURE, new ResourceLocation(BiomesOPlenty.MOD_ID, key), value);
+		value.setRegistryName(new ResourceLocation(BiomesOPlenty.MOD_ID, key));
+		ForgeRegistries.FEATURES.register(value);
+		return value;
 	}
 }

src/main/java/biomesoplenty/common/world/gen/placement/BOPPlacements.java

@@ -14,6 +14,7 @@ import net.minecraft.util.ResourceLocation;
 import net.minecraft.util.registry.Registry;
 import net.minecraft.world.gen.feature.FeatureSpreadConfig;
 import net.minecraft.world.gen.placement.*;
+import net.minecraftforge.registries.ForgeRegistries;
 
 public class BOPPlacements
 {
@@ -22,6 +23,8 @@ public class BOPPlacements
 
     private static <T extends IPlacementConfig, G extends Placement<T>> G register(String key, G placement)
     {
-        return Registry.register(Registry.DECORATOR, new ResourceLocation(BiomesOPlenty.MOD_ID, key), placement);
+        placement.setRegistryName(new ResourceLocation(BiomesOPlenty.MOD_ID, key));
+        ForgeRegistries.DECORATORS.register(placement);
+        return placement;
     }
 }

src/main/java/biomesoplenty/common/world/gen/surfacebuilders/BOPConfiguredSurfaceBuilders.java

@@ -0,0 +1,50 @@
+/*******************************************************************************
+ * Copyright 2014-2020, the Biomes O' Plenty Team
+ *
+ * This work is licensed under a Creative Commons Attribution-NonCommercial-NoDerivatives 4.0 International Public License.
+ *
+ * To view a copy of this license, visit http://creativecommons.org/licenses/by-nc-nd/4.0/.
+ ******************************************************************************/
+package biomesoplenty.common.world.gen.surfacebuilders;
+
+import biomesoplenty.core.BiomesOPlenty;
+import net.minecraft.util.ResourceLocation;
+import net.minecraft.util.registry.Registry;
+import net.minecraft.util.registry.WorldGenRegistries;
+import net.minecraft.world.gen.surfacebuilders.ConfiguredSurfaceBuilder;
+import net.minecraft.world.gen.surfacebuilders.ISurfaceBuilderConfig;
+import net.minecraft.world.gen.surfacebuilders.SurfaceBuilder;
+import net.minecraft.world.gen.surfacebuilders.SurfaceBuilderConfig;
+
+public class BOPConfiguredSurfaceBuilders
+{
+    public static final ConfiguredSurfaceBuilder<SurfaceBuilderConfig> ALPS = register("alps", new ConfiguredSurfaceBuilder(BOPSurfaceBuilders.DEEP_TOP_LAYER, BOPSurfaceBuilders.SNOW_SNOW_GRAVEL_SURFACE));
+    public static final ConfiguredSurfaceBuilder<SurfaceBuilderConfig> ALPS_FOOTHILLS = register("alps_foothills", new ConfiguredSurfaceBuilder(SurfaceBuilder.DEFAULT, SurfaceBuilder.CONFIG_STONE));
+    public static final ConfiguredSurfaceBuilder<SurfaceBuilderConfig> CHAPARRAL = register("chaparral", new ConfiguredSurfaceBuilder(BOPSurfaceBuilders.CHAPARRAL, SurfaceBuilder.CONFIG_GRASS));
+    public static final ConfiguredSurfaceBuilder<SurfaceBuilderConfig> COLD_DESERT = register("cold_desert", new ConfiguredSurfaceBuilder(BOPSurfaceBuilders.COLD_DESERT, SurfaceBuilder.CONFIG_GRAVEL));
+    public static final ConfiguredSurfaceBuilder<SurfaceBuilderConfig> GRAVEL_BEACH = register("gravel_beach", new ConfiguredSurfaceBuilder(SurfaceBuilder.DEFAULT, SurfaceBuilder.CONFIG_GRAVEL));
+    public static final ConfiguredSurfaceBuilder<SurfaceBuilderConfig> PODZOL_MIXED = register("podzol_mixed", new ConfiguredSurfaceBuilder(BOPSurfaceBuilders.PODZOL, SurfaceBuilder.CONFIG_GRASS));
+    public static final ConfiguredSurfaceBuilder<SurfaceBuilderConfig> PODZOL_FULL = register("podzol_full", new ConfiguredSurfaceBuilder(SurfaceBuilder.DEFAULT, SurfaceBuilder.CONFIG_PODZOL));
+    public static final ConfiguredSurfaceBuilder<SurfaceBuilderConfig> JADE_CLIFFS = register("jade_cliffs", new ConfiguredSurfaceBuilder(BOPSurfaceBuilders.DEEP_TOP_LAYER, SurfaceBuilder.CONFIG_GRASS));
+    public static final ConfiguredSurfaceBuilder<SurfaceBuilderConfig> LUSH_DESERT = register("lush_desert", new ConfiguredSurfaceBuilder(BOPSurfaceBuilders.LUSH_DESERT, BOPSurfaceBuilders.ORANGE_SAND_SURFACE));
+    public static final ConfiguredSurfaceBuilder<SurfaceBuilderConfig> MANGROVE = register("mangrove", new ConfiguredSurfaceBuilder(BOPSurfaceBuilders.MANGROVE, SurfaceBuilder.CONFIG_GRASS));
+    public static final ConfiguredSurfaceBuilder<SurfaceBuilderConfig> MARSH = register("marsh", new ConfiguredSurfaceBuilder(BOPSurfaceBuilders.MARSH, SurfaceBuilder.CONFIG_GRASS));
+    public static final ConfiguredSurfaceBuilder<SurfaceBuilderConfig> MIRE = register("mire", new ConfiguredSurfaceBuilder(BOPSurfaceBuilders.MUD, SurfaceBuilder.CONFIG_GRASS));
+    public static final ConfiguredSurfaceBuilder<SurfaceBuilderConfig> ORIGIN_VALLEY = register("origin_valley", new ConfiguredSurfaceBuilder(BOPSurfaceBuilders.ORIGIN_VALLEY, BOPSurfaceBuilders.ORIGIN_GRASS_SURFACE));
+    public static final ConfiguredSurfaceBuilder<SurfaceBuilderConfig> OUTBACK = register("outback", new ConfiguredSurfaceBuilder(SurfaceBuilder.DEFAULT, BOPSurfaceBuilders.RED_SAND_SURFACE));
+    public static final ConfiguredSurfaceBuilder<SurfaceBuilderConfig> OVERGROWN_CLIFFS = register("overgrown_cliffs", new ConfiguredSurfaceBuilder(BOPSurfaceBuilders.TERRACOTTA, SurfaceBuilder.CONFIG_GRASS));
+    public static final ConfiguredSurfaceBuilder<SurfaceBuilderConfig> POPPY_FIELD = register("poppy_field", new ConfiguredSurfaceBuilder(BOPSurfaceBuilders.POPPY_FIELD, SurfaceBuilder.CONFIG_GRASS));
+    public static final ConfiguredSurfaceBuilder<SurfaceBuilderConfig> TROPICS = register("tropics", new ConfiguredSurfaceBuilder(BOPSurfaceBuilders.TROPICS, SurfaceBuilder.CONFIG_GRASS));
+    public static final ConfiguredSurfaceBuilder<SurfaceBuilderConfig> TROPIC_BEACH = register("tropic_beach", new ConfiguredSurfaceBuilder(BOPSurfaceBuilders.TROPICS, BOPSurfaceBuilders.WHITE_SAND_SURFACE));
+    public static final ConfiguredSurfaceBuilder<SurfaceBuilderConfig> VOLCANIC_PLAINS = register("volcanic_plains", new ConfiguredSurfaceBuilder(BOPSurfaceBuilders.BLACK_SAND, BOPSurfaceBuilders.BLACK_SAND_SURFACE));
+    public static final ConfiguredSurfaceBuilder<SurfaceBuilderConfig> VOLCANO = register("volcano", new ConfiguredSurfaceBuilder(BOPSurfaceBuilders.VOLCANO, BOPSurfaceBuilders.BASALT_SURFACE));
+    public static final ConfiguredSurfaceBuilder<SurfaceBuilderConfig> WASTELAND = register("wasteland", new ConfiguredSurfaceBuilder(SurfaceBuilder.DEFAULT, BOPSurfaceBuilders.DRIED_SALT_SURFACE));
+
+    public static final ConfiguredSurfaceBuilder<SurfaceBuilderConfig> VISCERAL_HEAP = register("visceral_heap", new ConfiguredSurfaceBuilder(BOPSurfaceBuilders.FLESH, SurfaceBuilder.CONFIG_HELL));
+    public static final ConfiguredSurfaceBuilder<SurfaceBuilderConfig> WITHERED_ABYSS = register("withered_abyss", new ConfiguredSurfaceBuilder(BOPSurfaceBuilders.WITHERED_ABYSS, BOPSurfaceBuilders.BLACKSTONE_SURFACE));
+
+    private static <C extends ISurfaceBuilderConfig, F extends ConfiguredSurfaceBuilder<C>> F register(String key, F builder)
+    {
+        return Registry.register(WorldGenRegistries.CONFIGURED_SURFACE_BUILDER, new ResourceLocation(BiomesOPlenty.MOD_ID, key), builder);
+    }
+}

src/main/java/biomesoplenty/common/world/gen/surfacebuilders/BOPSurfaceBuilders.java

@@ -15,6 +15,7 @@ import net.minecraft.util.registry.Registry;
 import net.minecraft.world.gen.surfacebuilders.ISurfaceBuilderConfig;
 import net.minecraft.world.gen.surfacebuilders.SurfaceBuilder;
 import net.minecraft.world.gen.surfacebuilders.SurfaceBuilderConfig;
+import net.minecraftforge.registries.ForgeRegistries;
 
 public class BOPSurfaceBuilders
 {
@@ -52,6 +53,8 @@ public class BOPSurfaceBuilders
 
     private static <C extends ISurfaceBuilderConfig, F extends SurfaceBuilder<C>> F register(String key, F builder)
     {
-        return Registry.register(Registry.SURFACE_BUILDER, new ResourceLocation(BiomesOPlenty.MOD_ID, key), builder);
+        builder.setRegistryName(new ResourceLocation(BiomesOPlenty.MOD_ID, key));
+        ForgeRegistries.SURFACE_BUILDERS.register(builder);
+        return builder;
     }
 }

src/main/resources/META-INF/mods.toml

@@ -17,6 +17,6 @@ logoFile="bop_logo.png"
 [[dependencies.biomesoplenty]]
     modId="forge"
     mandatory=true
-    versionRange="[32.0.61,)"
+    versionRange="[34.1.33,)"
     ordering="NONE"
     side="BOTH"

src/main/resources/assets/biomesoplenty/lang/es_ar.json

@@ -12,13 +12,13 @@
   "biome.biomesoplenty.bayou": "Bayou",
   "biome.biomesoplenty.bog": "Turbera",
   "biome.biomesoplenty.boreal_forest": "Bosque boreal",
-  "biome.biomesoplenty.brushland": "Brushland",
   "biome.biomesoplenty.chaparral": "Chaparral",
   "biome.biomesoplenty.cherry_blossom_grove": "Arboleda de cerezos",
   "biome.biomesoplenty.cold_desert": "Desierto frío",
   "biome.biomesoplenty.coniferous_forest": "Bosque de coníferas",
-  "biome.biomesoplenty.crystalline_chasm": "Sima cristalina",
+  "biome.biomesoplenty.crystalline_chasm": "Grieta cristalina",
   "biome.biomesoplenty.dead_forest": "Bosque muerto",
+  "biome.biomesoplenty.dryland": "Tierras secas",
   "biome.biomesoplenty.fir_clearing": "Claro de abetos blancos",
   "biome.biomesoplenty.floodplain": "Llanura aluvial",
   "biome.biomesoplenty.flower_meadow": "Prado floral",
@@ -30,6 +30,7 @@
   "biome.biomesoplenty.highland_moor": "Páramo de elevaciones",
   "biome.biomesoplenty.jade_cliffs": "Acantilados de jade",
   "biome.biomesoplenty.lavender_field": "Campo de lavandas",
+  "biome.biomesoplenty.lush_desert": "Desierto exuberante",
   "biome.biomesoplenty.lush_grassland": "Pastizal exuberante",
   "biome.biomesoplenty.lush_swamp": "Pantano exuberante",
   "biome.biomesoplenty.mangrove": "Manglar",
@@ -42,14 +43,14 @@
   "biome.biomesoplenty.oasis": "Oasis",
   "biome.biomesoplenty.ominous_woods": "Bosque siniestro",
   "biome.biomesoplenty.orchard": "Huerto",
-  "biome.biomesoplenty.origin_hills": "Colinas primigenias",
+  "biome.biomesoplenty.origin_valley": "Valle del origen",
   "biome.biomesoplenty.outback": "Outback",
   "biome.biomesoplenty.overgrown_cliffs": "Acantilados cubiertos",
   "biome.biomesoplenty.pasture": "Pastura",
   "biome.biomesoplenty.poppy_field": "Campo de amapolas",
   "biome.biomesoplenty.prairie": "Pradera",
   "biome.biomesoplenty.pumpkin_patch": "Huerto de zapallos",
-  "biome.biomesoplenty.rainbow_valley": "Valle arcoíris",
+  "biome.biomesoplenty.rainbow_hills": "Colinas arcoíris",
   "biome.biomesoplenty.rainforest": "Selva",
   "biome.biomesoplenty.redwood_forest": "Bosque de secoyas",
   "biome.biomesoplenty.redwood_forest_edge": "Borde de bosque de secoyas",
@@ -76,7 +77,6 @@
   "biome.biomesoplenty.wetland": "Humedal",
   "biome.biomesoplenty.withered_abyss": "Abismo marchito",
   "biome.biomesoplenty.woodland": "Bosque",
-  "biome.biomesoplenty.xeric_shrubland": "Matorral xerófilo",
 
   "item.biomesoplenty.bop_icon": "Ícono  de BOP",
   "item.biomesoplenty.cherry_boat": "Bote de cerezo",
@@ -122,6 +122,9 @@
   "block.biomesoplenty.chiseled_black_sandstone": "Arenisca negra cincelada",
   "block.biomesoplenty.cut_black_sandstone": "Arenisca negra cortada",
   "block.biomesoplenty.cut_black_sandstone_slab": "Baldosa de arenisca negra cortada",
+  "block.biomesoplenty.chiseled_orange_sandstone": "Arenisca naranja cincelada",
+  "block.biomesoplenty.cut_orange_sandstone": "Arenisca naranja cortada",
+  "block.biomesoplenty.cut_orange_sandstone_slab": "Baldosa de arenisca naranja cortada",
   "block.biomesoplenty.chiseled_white_sandstone": "Arenisca blanca cincelada",
   "block.biomesoplenty.cut_white_sandstone": "Arenisca blanca cortada",
   "block.biomesoplenty.cut_white_sandstone_slab": "Baldosa de arenisca blanca cortada",
@@ -241,9 +244,14 @@
   "block.biomesoplenty.orange_autumn_leaves": "Hojas de otoño naranjas",
   "block.biomesoplenty.orange_autumn_sapling": "Brote de otoño naranja",
   "block.biomesoplenty.orange_cosmos": "Cosmos naranja",
-  "block.biomesoplenty.origin_grass_block": "Bloque de pasto primigenio",
-  "block.biomesoplenty.origin_leaves": "Hojas primigenias",
-  "block.biomesoplenty.origin_sapling": "Brote primigenio",
+  "block.biomesoplenty.orange_sand": "Arena naranja",
+  "block.biomesoplenty.orange_sandstone": "Arenisca naranja",
+  "block.biomesoplenty.orange_sandstone_slab": "Baldosa de arenisca naranja",
+  "block.biomesoplenty.orange_sandstone_stairs": "Escaleras de arenisca naranja",
+  "block.biomesoplenty.orange_sandstone_wall": "Pared de arenisca naranja",
+  "block.biomesoplenty.origin_grass_block": "Bloque de pasto del origen",
+  "block.biomesoplenty.origin_leaves": "Hojas del origen",
+  "block.biomesoplenty.origin_sapling": "Brote del origen",
   "block.biomesoplenty.palm_button": "Botón de palmera",
   "block.biomesoplenty.palm_door": "Puerta de palmera",
   "block.biomesoplenty.palm_fence": "Valla de palmera",
@@ -277,7 +285,7 @@
   "block.biomesoplenty.potted_maple_sapling": "Maceta con brote de arce",
   "block.biomesoplenty.potted_orange_autumn_sapling": "Maceta con brote de otoño naranja",
   "block.biomesoplenty.potted_orange_cosmos": "Maceta con cosmos naranja",
-  "block.biomesoplenty.potted_origin_sapling": "Maceta con brote primigenio",
+  "block.biomesoplenty.potted_origin_sapling": "Maceta con brote del origen",
   "block.biomesoplenty.potted_palm_sapling": "Maceta con brote de palmera",
   "block.biomesoplenty.potted_pink_cherry_sapling": "Maceta con brote de cerezo rosa",
   "block.biomesoplenty.potted_pink_daffodil": "Maceta con narciso rosa",
@@ -312,11 +320,13 @@
   "block.biomesoplenty.redwood_wall_sign": "Cartel de secoya en pared",
   "block.biomesoplenty.redwood_wood": "Leño de secoya",
   "block.biomesoplenty.reed": "Carrizo",
-  "block.biomesoplenty.root": "Raíz",
   "block.biomesoplenty.rose": "Rosa",
   "block.biomesoplenty.smooth_black_sandstone": "Arenisca negra lisa",
   "block.biomesoplenty.smooth_black_sandstone_slab": "Baldosa de arenisca negra lisa",
   "block.biomesoplenty.smooth_black_sandstone_stairs": "Escaleras de arenisca negra lisa",
+  "block.biomesoplenty.smooth_orange_sandstone": "Arenisca naranja lisa",
+  "block.biomesoplenty.smooth_orange_sandstone_slab": "Baldosa de arenisca naranja lisa",
+  "block.biomesoplenty.smooth_orange_sandstone_stairs": "Escaleras de arenisca naranja lisa",
   "block.biomesoplenty.smooth_white_sandstone": "Arenisca blanca lisa",
   "block.biomesoplenty.smooth_white_sandstone_slab": "Baldosa de arenisca blanca lisa",
   "block.biomesoplenty.smooth_white_sandstone_stairs": "Escaleras de arenisca blanca lisa",
@@ -324,7 +334,7 @@
   "block.biomesoplenty.stripped_cherry_log": "Tronco de cerezo sin corteza",
   "block.biomesoplenty.stripped_cherry_wood": "Leño de cerezo sin corteza",
   "block.biomesoplenty.stripped_dead_log": "Tronco muerto sin corteza",
-  "block.biomesoplenty.stripped_dead_wood": "Leño muerta sin corteza",
+  "block.biomesoplenty.stripped_dead_wood": "Leño muerto sin corteza",
   "block.biomesoplenty.stripped_fir_log": "Tronco de abeto blanco sin corteza",
   "block.biomesoplenty.stripped_fir_wood": "Leño de abeto blanco sin corteza",
   "block.biomesoplenty.stripped_hellbark_log": "Tronco de corteza infernal sin corteza",
@@ -332,7 +342,7 @@
   "block.biomesoplenty.stripped_jacaranda_log": "Tronco de jacarandá sin corteza",
   "block.biomesoplenty.stripped_jacaranda_wood": "Leño de jacarandá sin corteza",
   "block.biomesoplenty.stripped_magic_log": "Tronco mágico sin corteza",
-  "block.biomesoplenty.stripped_magic_wood": "Leño mágica sin corteza",
+  "block.biomesoplenty.stripped_magic_wood": "Leño mágico sin corteza",
   "block.biomesoplenty.stripped_mahogany_log": "Tronco de caoba sin corteza",
   "block.biomesoplenty.stripped_mahogany_wood": "Leño de caoba sin corteza",
   "block.biomesoplenty.stripped_palm_log": "Tronco de palmera sin corteza",
@@ -340,7 +350,7 @@
   "block.biomesoplenty.stripped_redwood_log": "Tronco de secoya sin corteza",
   "block.biomesoplenty.stripped_redwood_wood": "Leño de secoya sin corteza",
   "block.biomesoplenty.stripped_umbran_log": "Tronco sombrío sin corteza",
-  "block.biomesoplenty.stripped_umbran_wood": "Leño sombría sin corteza",
+  "block.biomesoplenty.stripped_umbran_wood": "Leño sombrío sin corteza",
   "block.biomesoplenty.stripped_willow_log": "Tronco de sauce sin corteza",
   "block.biomesoplenty.stripped_willow_wood": "Leño de sauce sin corteza",
   "block.biomesoplenty.tall_cattail": "Totora alta",

src/main/resources/assets/biomesoplenty/lang/es_es.json

@@ -12,13 +12,13 @@
   "biome.biomesoplenty.bayou": "Bayou",
   "biome.biomesoplenty.bog": "Turbera",
   "biome.biomesoplenty.boreal_forest": "Bosque boreal",
-  "biome.biomesoplenty.brushland": "Brushland",
   "biome.biomesoplenty.chaparral": "Chaparral",
   "biome.biomesoplenty.cherry_blossom_grove": "Arboleda de cerezos",
   "biome.biomesoplenty.cold_desert": "Desierto frío",
   "biome.biomesoplenty.coniferous_forest": "Bosque de coníferas",
-  "biome.biomesoplenty.crystalline_chasm": "Sima cristalina",
+  "biome.biomesoplenty.crystalline_chasm": "Grieta cristalina",
   "biome.biomesoplenty.dead_forest": "Bosque muerto",
+  "biome.biomesoplenty.dryland": "Tierras secas",
   "biome.biomesoplenty.fir_clearing": "Claro de abetos blancos",
   "biome.biomesoplenty.floodplain": "Llanura aluvial",
   "biome.biomesoplenty.flower_meadow": "Prado florecido",
@@ -30,6 +30,7 @@
   "biome.biomesoplenty.highland_moor": "Páramo de elevaciones",
   "biome.biomesoplenty.jade_cliffs": "Acantilados de jade",
   "biome.biomesoplenty.lavender_field": "Campo de lavandas",
+  "biome.biomesoplenty.lush_desert": "Desierto exuberante",
   "biome.biomesoplenty.lush_grassland": "Pastizal exuberante",
   "biome.biomesoplenty.lush_swamp": "Pantano exuberante",
   "biome.biomesoplenty.mangrove": "Manglar",
@@ -42,14 +43,14 @@
   "biome.biomesoplenty.oasis": "Oasis",
   "biome.biomesoplenty.ominous_woods": "Bosque siniestro",
   "biome.biomesoplenty.orchard": "Huerto",
-  "biome.biomesoplenty.origin_hills": "Colinas primigenias",
+  "biome.biomesoplenty.origin_valley": "Valle del origen",
   "biome.biomesoplenty.outback": "Outback",
   "biome.biomesoplenty.overgrown_cliffs": "Acantilados cubiertos",
   "biome.biomesoplenty.pasture": "Pastura",
   "biome.biomesoplenty.poppy_field": "Campo de amapolas",
   "biome.biomesoplenty.prairie": "Pradera",
   "biome.biomesoplenty.pumpkin_patch": "Huerto de calabazas",
-  "biome.biomesoplenty.rainbow_valley": "Valle arcoíris",
+  "biome.biomesoplenty.rainbow_hills": "Colinas arcoíris",
   "biome.biomesoplenty.rainforest": "Selva",
   "biome.biomesoplenty.redwood_forest": "Bosque de secoyas",
   "biome.biomesoplenty.redwood_forest_edge": "Borde de bosque de secoyas",
@@ -76,7 +77,6 @@
   "biome.biomesoplenty.wetland": "Humedal",
   "biome.biomesoplenty.withered_abyss": "Abismo marchito",
   "biome.biomesoplenty.woodland": "Bosque",
-  "biome.biomesoplenty.xeric_shrubland": "Matorral xerófilo",
 
   "item.biomesoplenty.bop_icon": "Ícono  de BOP",
   "item.biomesoplenty.cherry_boat": "Barca de cerezo",
@@ -122,6 +122,9 @@
   "block.biomesoplenty.chiseled_black_sandstone": "Arenisca negra cincelada",
   "block.biomesoplenty.cut_black_sandstone": "Arenisca negra cortada",
   "block.biomesoplenty.cut_black_sandstone_slab": "Losa de arenisca negra cortada",
+  "block.biomesoplenty.chiseled_orange_sandstone": "Arenisca naranja cincelada",
+  "block.biomesoplenty.cut_orange_sandstone": "Arenisca naranja cortada",
+  "block.biomesoplenty.cut_orange_sandstone_slab": "Losa de arenisca naranja cortada",
   "block.biomesoplenty.chiseled_white_sandstone": "Arenisca blanca cincelada",
   "block.biomesoplenty.cut_white_sandstone": "Arenisca blanca cortada",
   "block.biomesoplenty.cut_white_sandstone_slab": "Losa de arenisca blanca cortada",
@@ -241,9 +244,14 @@
   "block.biomesoplenty.orange_autumn_leaves": "Hojas de otoño naranjas",
   "block.biomesoplenty.orange_autumn_sapling": "Brote de otoño naranja",
   "block.biomesoplenty.orange_cosmos": "Cosmos naranja",
-  "block.biomesoplenty.origin_grass_block": "Bloque de césped primigenio",
-  "block.biomesoplenty.origin_leaves": "Hojas primigenias",
-  "block.biomesoplenty.origin_sapling": "Brote primigenio",
+  "block.biomesoplenty.orange_sand": "Arena naranja",
+  "block.biomesoplenty.orange_sandstone": "Arenisca naranja",
+  "block.biomesoplenty.orange_sandstone_slab": "Losa de arenisca naranja",
+  "block.biomesoplenty.orange_sandstone_stairs": "Escaleras de arenisca naranja",
+  "block.biomesoplenty.orange_sandstone_wall": "Muro de arenisca naranja",
+  "block.biomesoplenty.origin_grass_block": "Césped del origen",
+  "block.biomesoplenty.origin_leaves": "Hojas del origen",
+  "block.biomesoplenty.origin_sapling": "Brote del origen",
   "block.biomesoplenty.palm_button": "Botón de palmera",
   "block.biomesoplenty.palm_door": "Puerta de palmera",
   "block.biomesoplenty.palm_fence": "Valla de palmera",
@@ -277,7 +285,7 @@
   "block.biomesoplenty.potted_maple_sapling": "Maceta con brote de arce",
   "block.biomesoplenty.potted_orange_autumn_sapling": "Maceta con brote de otoño naranja",
   "block.biomesoplenty.potted_orange_cosmos": "Maceta con cosmos naranja",
-  "block.biomesoplenty.potted_origin_sapling": "Maceta con brote primigenio",
+  "block.biomesoplenty.potted_origin_sapling": "Maceta con brote del origen",
   "block.biomesoplenty.potted_palm_sapling": "Maceta con brote de palmera",
   "block.biomesoplenty.potted_pink_cherry_sapling": "Maceta con brote de cerezo rosa",
   "block.biomesoplenty.potted_pink_daffodil": "Maceta con narciso rosa",
@@ -312,11 +320,13 @@
   "block.biomesoplenty.redwood_wall_sign": "Cartel de secoya en pared",
   "block.biomesoplenty.redwood_wood": "Leño de secoya",
   "block.biomesoplenty.reed": "Carrizo",
-  "block.biomesoplenty.root": "Raíz",
   "block.biomesoplenty.rose": "Rosa",
   "block.biomesoplenty.smooth_black_sandstone": "Arenisca negra lisa",
-  "block.biomesoplenty.smooth_black_sandstone_slab": "Baldosa de arenisca negra lisa",
+  "block.biomesoplenty.smooth_black_sandstone_slab": "Losa de arenisca negra lisa",
   "block.biomesoplenty.smooth_black_sandstone_stairs": "Escaleras de arenisca negra lisa",
+  "block.biomesoplenty.smooth_orange_sandstone": "Arenisca naranja lisa",
+  "block.biomesoplenty.smooth_orange_sandstone_slab": "Losa de arenisca naranja lisa",
+  "block.biomesoplenty.smooth_orange_sandstone_stairs": "Escaleras de arenisca naranja lisa",
   "block.biomesoplenty.smooth_white_sandstone": "Arenisca blanca lisa",
   "block.biomesoplenty.smooth_white_sandstone_slab": "Losa de arenisca blanca lisa",
   "block.biomesoplenty.smooth_white_sandstone_stairs": "Escaleras de arenisca blanca lisa",
@@ -324,7 +334,7 @@
   "block.biomesoplenty.stripped_cherry_log": "Tronco de cerezo sin corteza",
   "block.biomesoplenty.stripped_cherry_wood": "Leño de cerezo sin corteza",
   "block.biomesoplenty.stripped_dead_log": "Tronco muerto sin corteza",
-  "block.biomesoplenty.stripped_dead_wood": "Leño muerta sin corteza",
+  "block.biomesoplenty.stripped_dead_wood": "Leño muerto sin corteza",
   "block.biomesoplenty.stripped_fir_log": "Tronco de abeto blanco sin corteza",
   "block.biomesoplenty.stripped_fir_wood": "Leño de abeto blanco sin corteza",
   "block.biomesoplenty.stripped_hellbark_log": "Tronco de corteza infernal sin corteza",
@@ -332,7 +342,7 @@
   "block.biomesoplenty.stripped_jacaranda_log": "Tronco de jacarandá sin corteza",
   "block.biomesoplenty.stripped_jacaranda_wood": "Leño de jacarandá sin corteza",
   "block.biomesoplenty.stripped_magic_log": "Tronco mágico sin corteza",
-  "block.biomesoplenty.stripped_magic_wood": "Leño mágica sin corteza",
+  "block.biomesoplenty.stripped_magic_wood": "Leño mágico sin corteza",
   "block.biomesoplenty.stripped_mahogany_log": "Tronco de caoba sin corteza",
   "block.biomesoplenty.stripped_mahogany_wood": "Leño de caoba sin corteza",
   "block.biomesoplenty.stripped_palm_log": "Tronco de palmera sin corteza",
@@ -340,7 +350,7 @@
   "block.biomesoplenty.stripped_redwood_log": "Tronco de secoya sin corteza",
   "block.biomesoplenty.stripped_redwood_wood": "Leño de secoya sin corteza",
   "block.biomesoplenty.stripped_umbran_log": "Tronco sombrío sin corteza",
-  "block.biomesoplenty.stripped_umbran_wood": "Leño sombría sin corteza",
+  "block.biomesoplenty.stripped_umbran_wood": "Leño sombrío sin corteza",
   "block.biomesoplenty.stripped_willow_log": "Tronco de sauce sin corteza",
   "block.biomesoplenty.stripped_willow_wood": "Leño de sauce sin corteza",
   "block.biomesoplenty.tall_cattail": "Totora alta",

src/main/resources/assets/biomesoplenty/lang/es_mx.json

@@ -12,13 +12,13 @@
   "biome.biomesoplenty.bayou": "Bayou",
   "biome.biomesoplenty.bog": "Turbera",
   "biome.biomesoplenty.boreal_forest": "Bosque boreal",
-  "biome.biomesoplenty.brushland": "Brushland",
   "biome.biomesoplenty.chaparral": "Chaparral",
   "biome.biomesoplenty.cherry_blossom_grove": "Arboleda de cerezos",
   "biome.biomesoplenty.cold_desert": "Desierto frío",
   "biome.biomesoplenty.coniferous_forest": "Bosque de coníferas",
-  "biome.biomesoplenty.crystalline_chasm": "Sima cristalina",
+  "biome.biomesoplenty.crystalline_chasm": "Grieta cristalina",
   "biome.biomesoplenty.dead_forest": "Bosque muerto",
+  "biome.biomesoplenty.dryland": "Tierras secas",
   "biome.biomesoplenty.fir_clearing": "Claro de abetos blancos",
   "biome.biomesoplenty.floodplain": "Llanura aluvial",
   "biome.biomesoplenty.flower_meadow": "Prado floral",
@@ -30,6 +30,7 @@
   "biome.biomesoplenty.highland_moor": "Páramo de elevaciones",
   "biome.biomesoplenty.jade_cliffs": "Acantilados de jade",
   "biome.biomesoplenty.lavender_field": "Campo de lavandas",
+  "biome.biomesoplenty.lush_desert": "Desierto exuberante",
   "biome.biomesoplenty.lush_grassland": "Pastizal exuberante",
   "biome.biomesoplenty.lush_swamp": "Pantano exuberante",
   "biome.biomesoplenty.mangrove": "Manglar",
@@ -42,14 +43,14 @@
   "biome.biomesoplenty.oasis": "Oasis",
   "biome.biomesoplenty.ominous_woods": "Bosque siniestro",
   "biome.biomesoplenty.orchard": "Huerta",
-  "biome.biomesoplenty.origin_hills": "Colinas primigenias",
+  "biome.biomesoplenty.origin_valley": "Valle del origen",
   "biome.biomesoplenty.outback": "Outback",
   "biome.biomesoplenty.overgrown_cliffs": "Acantilados cubiertos",
   "biome.biomesoplenty.pasture": "Pastura",
   "biome.biomesoplenty.poppy_field": "Campo de amapolas",
   "biome.biomesoplenty.prairie": "Pradera",
   "biome.biomesoplenty.pumpkin_patch": "Huerto de calabazas",
-  "biome.biomesoplenty.rainbow_valley": "Valle arcoíris",
+  "biome.biomesoplenty.rainbow_hills": "Colinas arcoíris",
   "biome.biomesoplenty.rainforest": "Selva",
   "biome.biomesoplenty.redwood_forest": "Bosque de secoyas",
   "biome.biomesoplenty.redwood_forest_edge": "Borde de bosque de secoyas",
@@ -76,7 +77,6 @@
   "biome.biomesoplenty.wetland": "Humedal",
   "biome.biomesoplenty.withered_abyss": "Abismo marchito",
   "biome.biomesoplenty.woodland": "Bosque",
-  "biome.biomesoplenty.xeric_shrubland": "Matorral xerófilo",
 
   "item.biomesoplenty.bop_icon": "Ícono  de BOP",
   "item.biomesoplenty.cherry_boat": "Bote de cerezo",
@@ -122,6 +122,9 @@
   "block.biomesoplenty.chiseled_black_sandstone": "Arenisca negra grabada",
   "block.biomesoplenty.cut_black_sandstone": "Arenisca negra cortada",
   "block.biomesoplenty.cut_black_sandstone_slab": "Losa de arenisca negra cortada",
+  "block.biomesoplenty.chiseled_orange_sandstone": "Arenisca naranja grabada",
+  "block.biomesoplenty.cut_orange_sandstone": "Arenisca naranja cortada",
+  "block.biomesoplenty.cut_orange_sandstone_slab": "Losa de arenisca naranja cortada",
   "block.biomesoplenty.chiseled_white_sandstone": "Arenisca blanca grabada",
   "block.biomesoplenty.cut_white_sandstone": "Arenisca blanca cortada",
   "block.biomesoplenty.cut_white_sandstone_slab": "Losa de arenisca blanca cortada",
@@ -241,9 +244,14 @@
   "block.biomesoplenty.orange_autumn_leaves": "Hojas de otoño naranjas",
   "block.biomesoplenty.orange_autumn_sapling": "Retoño de otoño naranja",
   "block.biomesoplenty.orange_cosmos": "Cosmos naranja",
-  "block.biomesoplenty.origin_grass_block": "Bloque de pasto primigenio",
-  "block.biomesoplenty.origin_leaves": "Hojas primigenias",
-  "block.biomesoplenty.origin_sapling": "Retoño primigenio",
+  "block.biomesoplenty.orange_sand": "Arena naranja",
+  "block.biomesoplenty.orange_sandstone": "Arenisca naranja",
+  "block.biomesoplenty.orange_sandstone_slab": "Losa de arenisca naranja",
+  "block.biomesoplenty.orange_sandstone_stairs": "Escaleras de arenisca naranja",
+  "block.biomesoplenty.orange_sandstone_wall": "Pared de arenisca naranja",
+  "block.biomesoplenty.origin_grass_block": "Bloque de pasto del origen",
+  "block.biomesoplenty.origin_leaves": "Hojas del origen",
+  "block.biomesoplenty.origin_sapling": "Retoño del origen",
   "block.biomesoplenty.palm_button": "Botón de palmera",
   "block.biomesoplenty.palm_door": "Puerta de palmera",
   "block.biomesoplenty.palm_fence": "Valla de palmera",
@@ -277,7 +285,7 @@
   "block.biomesoplenty.potted_maple_sapling": "Maceta con retoño de arce",
   "block.biomesoplenty.potted_orange_autumn_sapling": "Maceta con retoño de otoño naranja",
   "block.biomesoplenty.potted_orange_cosmos": "Maceta con cosmos naranja",
-  "block.biomesoplenty.potted_origin_sapling": "Maceta con retoño primigenio",
+  "block.biomesoplenty.potted_origin_sapling": "Maceta con retoño del origen",
   "block.biomesoplenty.potted_palm_sapling": "Maceta con retoño de palmera",
   "block.biomesoplenty.potted_pink_cherry_sapling": "Maceta con retoño de cerezo rosa",
   "block.biomesoplenty.potted_pink_daffodil": "Maceta con narciso rosa",
@@ -312,11 +320,13 @@
   "block.biomesoplenty.redwood_wall_sign": "Letrero de secoya en pared",
   "block.biomesoplenty.redwood_wood": "Leño de secoya",
   "block.biomesoplenty.reed": "Carrizo",
-  "block.biomesoplenty.root": "Raíz",
   "block.biomesoplenty.rose": "Rosa",
   "block.biomesoplenty.smooth_black_sandstone": "Arenisca negra lisa",
-  "block.biomesoplenty.smooth_black_sandstone_slab": "Baldosa de arenisca negra lisa",
+  "block.biomesoplenty.smooth_black_sandstone_slab": "Losa de arenisca negra lisa",
   "block.biomesoplenty.smooth_black_sandstone_stairs": "Escaleras de arenisca negra lisa",
+  "block.biomesoplenty.smooth_orange_sandstone": "Arenisca naranja lisa",
+  "block.biomesoplenty.smooth_orange_sandstone_slab": "Losa de arenisca naranja lisa",
+  "block.biomesoplenty.smooth_orange_sandstone_stairs": "Escaleras de arenisca naranja lisa",
   "block.biomesoplenty.smooth_white_sandstone": "Arenisca blanca lisa",
   "block.biomesoplenty.smooth_white_sandstone_slab": "Losa de arenisca blanca lisa",
   "block.biomesoplenty.smooth_white_sandstone_stairs": "Escaleras de arenisca blanca lisa",
@@ -324,7 +334,7 @@
   "block.biomesoplenty.stripped_cherry_log": "Tronco de cerezo sin corteza",
   "block.biomesoplenty.stripped_cherry_wood": "Leño de cerezo sin corteza",
   "block.biomesoplenty.stripped_dead_log": "Tronco muerto sin corteza",
-  "block.biomesoplenty.stripped_dead_wood": "Leño muerta sin corteza",
+  "block.biomesoplenty.stripped_dead_wood": "Leño muerto sin corteza",
   "block.biomesoplenty.stripped_fir_log": "Tronco de abeto blanco sin corteza",
   "block.biomesoplenty.stripped_fir_wood": "Leño de abeto blanco sin corteza",
   "block.biomesoplenty.stripped_hellbark_log": "Tronco de corteza infernal sin corteza",
@@ -332,7 +342,7 @@
   "block.biomesoplenty.stripped_jacaranda_log": "Tronco de jacarandá sin corteza",
   "block.biomesoplenty.stripped_jacaranda_wood": "Leño de jacarandá sin corteza",
   "block.biomesoplenty.stripped_magic_log": "Tronco mágico sin corteza",
-  "block.biomesoplenty.stripped_magic_wood": "Leño mágica sin corteza",
+  "block.biomesoplenty.stripped_magic_wood": "Leño mágico sin corteza",
   "block.biomesoplenty.stripped_mahogany_log": "Tronco de caoba sin corteza",
   "block.biomesoplenty.stripped_mahogany_wood": "Leño de caoba sin corteza",
   "block.biomesoplenty.stripped_palm_log": "Tronco de palmera sin corteza",
@@ -340,7 +350,7 @@
   "block.biomesoplenty.stripped_redwood_log": "Tronco de secoya sin corteza",
   "block.biomesoplenty.stripped_redwood_wood": "Leño de secoya sin corteza",
   "block.biomesoplenty.stripped_umbran_log": "Tronco sombrío sin corteza",
-  "block.biomesoplenty.stripped_umbran_wood": "Leño sombría sin corteza",
+  "block.biomesoplenty.stripped_umbran_wood": "Leño sombrío sin corteza",
   "block.biomesoplenty.stripped_willow_log": "Tronco de sauce sin corteza",
   "block.biomesoplenty.stripped_willow_wood": "Leño de sauce sin corteza",
   "block.biomesoplenty.tall_cattail": "Totora alta",

src/main/resources/assets/biomesoplenty/lang/it_it.json

@@ -12,23 +12,25 @@
   "biome.biomesoplenty.bayou": "Palude",
   "biome.biomesoplenty.bog": "Torbiera",
   "biome.biomesoplenty.boreal_forest": "Foresta Boreale",
-  "biome.biomesoplenty.brushland": "Boscaglia",
   "biome.biomesoplenty.chaparral": "Boscaglia",
-  "biome.biomesoplenty.cherry_blossom_grove": "Foresta di Ciliegi in Fiore",
+  "biome.biomesoplenty.cherry_blossom_grove": "Foresta Di Ciliegi In Fiore",
   "biome.biomesoplenty.cold_desert": "Deserto Freddo",
-  "biome.biomesoplenty.coniferous_forest": "Foresta di Conifere",
+  "biome.biomesoplenty.coniferous_forest": "Foresta Di Conifere",
   "biome.biomesoplenty.crystalline_chasm": "Abisso Cristallino",
   "biome.biomesoplenty.dead_forest": "Foresta Morta",
-  "biome.biomesoplenty.fir_clearing": "Raduna di Abeti",
+  "biome.biomesoplenty.dryland": "zona Arida",
+  "biome.biomesoplenty.fir_clearing": "Raduna Di Abeti",
   "biome.biomesoplenty.floodplain": "Pianura Alluvionale",
   "biome.biomesoplenty.flower_meadow": "Prato Fiorito",
   "biome.biomesoplenty.fungal_jungle": "Giungla Fungina",
   "biome.biomesoplenty.grassland": "Prateria",
-  "biome.biomesoplenty.gravel_beach": "Spiaggia di Ghiaia",
+  "biome.biomesoplenty.gravel_beach": "Spiaggia Di Ghiaia",
   "biome.biomesoplenty.grove": "Boschetto",
   "biome.biomesoplenty.highland": "Montanaro",
   "biome.biomesoplenty.highland_moor": "Montanaro Moro",
+  "biome.biomesoplenty.jade_cliffs": "Scogliere Di Giada",
   "biome.biomesoplenty.lavender_field": "Campo Di Lavanda",
+  "biome.biomesoplenty.lush_desert": "Deserto Lussureggiante",
   "biome.biomesoplenty.lush_grassland": "Prati Rigogliosi",
   "biome.biomesoplenty.lush_swamp": "Palude Lussureggiante",
   "biome.biomesoplenty.mangrove": "Mangrovia",
@@ -36,29 +38,30 @@
   "biome.biomesoplenty.marsh": "Acquitrino",
   "biome.biomesoplenty.meadow": "Prato",
   "biome.biomesoplenty.mire": "Fango",
+  "biome.biomesoplenty.muskeg": "Muschiato",
   "biome.biomesoplenty.mystic_grove": "Boschetto Mistico",
-  "biome.biomesoplenty.oasis": "Oasi",
   "biome.biomesoplenty.ominous_woods": "Bosco Minaccioso",
   "biome.biomesoplenty.orchard": "Frutteto",
-  "biome.biomesoplenty.origin_beach": "Origine Spiaggia",
-  "biome.biomesoplenty.origin_hills": "Origine Colline",
+  "biome.biomesoplenty.origin_beach": "Spiaggia D'Origine",
+  "biome.biomesoplenty.origin_hills": "Colline D'Origine",
+  "biome.biomesoplenty.origin_valley": "Valle D'Origine",
   "biome.biomesoplenty.outback": "Entroterra",
-  "biome.biomesoplenty.overgrown_cliffs": "Scogliere Ricoperte di Vegetazione",
+  "biome.biomesoplenty.overgrown_cliffs": "Scogliere Ricoperte Di Vegetazione",
   "biome.biomesoplenty.pasture": "Pascolo",
-  "biome.biomesoplenty.poppy_field": "Campo di Papaveri",
+  "biome.biomesoplenty.poppy_field": "Campo Di Papaveri",
   "biome.biomesoplenty.prairie": "Praterie",
-  "biome.biomesoplenty.pumpkin_patch": "Chiazza di Zucche",
-  "biome.biomesoplenty.rainbow_valley": "Valle Arcobaleno",
+  "biome.biomesoplenty.pumpkin_patch": "Chiazza Di Zucche",
+  "biome.biomesoplenty.rainbow_hills": "Colline Arcobaleno",
   "biome.biomesoplenty.rainforest": "Foresta Pluviale",
-  "biome.biomesoplenty.redwood_forest": "Foresta di Sequoie",
-  "biome.biomesoplenty.redwood_forest_edge": "Bordo Foresta di Sequoie",
+  "biome.biomesoplenty.redwood_forest": "Foresta Di Sequoie",
+  "biome.biomesoplenty.redwood_forest_edge": "Bordo Foresta Di Sequoie",
   "biome.biomesoplenty.scrubland": "Boscaglia",
   "biome.biomesoplenty.seasonal_forest": "Foresta Stagionale",
-  "biome.biomesoplenty.shield": "Shield",
+  "biome.biomesoplenty.shield": "Scudo",
   "biome.biomesoplenty.shrubland": "Boscaglia",
-  "biome.biomesoplenty.silkglade": "Radura di Seta",
-  "biome.biomesoplenty.snowy_coniferous_forest": "Bosco di Conifere Innevate",
-  "biome.biomesoplenty.snowy_fir_clearing": "Raduna di Abeti Innevata",
+  "biome.biomesoplenty.silkglade": "Radura Di Seta",
+  "biome.biomesoplenty.snowy_coniferous_forest": "Bosco Di Conifere Innevate",
+  "biome.biomesoplenty.snowy_fir_clearing": "Raduna Di Abeti Innevata",
   "biome.biomesoplenty.snowy_forest": "Foresta Innevata",
   "biome.biomesoplenty.steppe": "Steppa",
   "biome.biomesoplenty.temperate_rainforest": "Foresta Pluviale Temperata",
@@ -75,7 +78,6 @@
   "biome.biomesoplenty.wetland": "Palude",
   "biome.biomesoplenty.white_beach": "Spiaggia Bianca",
   "biome.biomesoplenty.woodland": "Bosco",
-  "biome.biomesoplenty.xeric_shrubland": "Boscaglia Xerica",
 
   "item.biomesoplenty.bop_icon": "Icona BOP",
   "item.biomesoplenty.cherry_boat": "Barca di ciliegio",
@@ -120,6 +122,9 @@
   "block.biomesoplenty.chiseled_black_sandstone": "Arenaria nera cesellata",
   "block.biomesoplenty.cut_black_sandstone": "Arenaria nera incisa",
   "block.biomesoplenty.cut_black_sandstone_slab": "Lastra di arenaria nera incisa",
+  "block.biomesoplenty.chiseled_orange_sandstone": "Chiseled Orange Sandstone",
+  "block.biomesoplenty.cut_orange_sandstone": "Cut Orange Sandstone",
+  "block.biomesoplenty.cut_orange_sandstone_slab": "Cut Orange Sandstone Slab",
   "block.biomesoplenty.chiseled_white_sandstone": "Arenaria bianca cesellata",
   "block.biomesoplenty.cut_white_sandstone": "Arenaria bianca incisa",
   "block.biomesoplenty.cut_white_sandstone_slab": "Lastra di arenaria bianca incisa",
@@ -239,6 +244,11 @@
   "block.biomesoplenty.orange_autumn_leaves": "Foglie autunnali arancioni",
   "block.biomesoplenty.orange_autumn_sapling": "Arboscello di foglie autunnali",
   "block.biomesoplenty.orange_cosmos": "Cosmos arancione",
+  "block.biomesoplenty.orange_sand": "Sabbia arancione",
+  "block.biomesoplenty.orange_sandstone": "Arenaria arancione",
+  "block.biomesoplenty.orange_sandstone_slab": "Lastra di arenaria arancione",
+  "block.biomesoplenty.orange_sandstone_stairs": "Scalini di arenaria arancione",
+  "block.biomesoplenty.orange_sandstone_wall": "Muretto di arenaria arancione",
   "block.biomesoplenty.origin_grass_block": "Blocco origine d'erba",
   "block.biomesoplenty.origin_leaves": "Foglie origine",
   "block.biomesoplenty.origin_sapling": "Arboscello origine",
@@ -310,11 +320,13 @@
   "block.biomesoplenty.redwood_wall_sign": "Muretto cartello di sequoia",
   "block.biomesoplenty.redwood_wood": "Legno di sequoia",
   "block.biomesoplenty.reed": "Canna",
-  "block.biomesoplenty.root": "Radice",
   "block.biomesoplenty.rose": "Rosa",
   "block.biomesoplenty.smooth_black_sandstone": "Arenaria nera levigata",
-  "block.biomesoplenty.smooth_black_sandstone_slab": "Lastra di arenaria nera levigat",
+  "block.biomesoplenty.smooth_black_sandstone_slab": "Lastra di arenaria nera levigata",
   "block.biomesoplenty.smooth_black_sandstone_stairs": "Scalini di arenaria nera levigata",
+  "block.biomesoplenty.smooth_orange_sandstone": "Arenaria arancione levigata",
+  "block.biomesoplenty.smooth_orange_sandstone_slab": "Lastra di arenaria arancione levigata",
+  "block.biomesoplenty.smooth_orange_sandstone_stairs": "Scalini di arenaria arancione levigata",
   "block.biomesoplenty.smooth_white_sandstone": "Arenaria bianca levigata",
   "block.biomesoplenty.smooth_white_sandstone_slab": "Lastra di arenaria bianca levigata",
   "block.biomesoplenty.smooth_white_sandstone_stairs": "Scalini di arenaria bianca levigata",
@@ -341,7 +353,6 @@
   "block.biomesoplenty.stripped_umbran_wood": "Legno di umbrano scortecciato",
   "block.biomesoplenty.stripped_willow_log": "Tronco di salice scortecciato",
   "block.biomesoplenty.stripped_willow_wood": "Legno di salice scortecciato",
-  "block.biomesoplenty.tall_cattail": "Stiancia alta",
   "block.biomesoplenty.tall_wheat": "Grano alto",
   "block.biomesoplenty.toadstool": "Fungo velenoso",
   "block.biomesoplenty.toadstool_block": "Blocco di funghi velevosi",
@@ -388,7 +399,7 @@
   "block.biomesoplenty.willow_wood": "Legno di salice",
   "block.biomesoplenty.wilted_lily": "Giglio appassito",
   "block.biomesoplenty.yellow_autumn_leaves": "Foglie autunnali gialle",
-  "block.biomesoplenty.yellow_autumn_sapling": "Arboscello autunno giallo",
+  "block.biomesoplenty.yellow_autumn_sapling": "Arboscello autunnale giallo",
 
   "argument.biomesoplenty.biome.invalid": "Argomento bioma non valido",
   "commands.biomesoplenty.tpbiome.success": "É stato teletrasportato %s al bioma %s a (%s, %s, %s)",

src/main/resources/assets/biomesoplenty/lang/ko_kr.json

@@ -2,35 +2,35 @@
   "advancements.biomesoplenty.root.title": "Biomes O' Plenty",
   "advancements.biomesoplenty.root.description": "세계를 탐험합니다.",
   "advancements.biomesoplenty.all_biomes.title": "방랑자",
-  "advancements.biomesoplenty.all_biomes.description": "바이옴스 오 플렌티에 있는 모든 생물군계를 탐험합니다.",
+  "advancements.biomesoplenty.all_biomes.description": "Biomes O' Plenty에 있는 모든 생물군계를 탐험합니다.",
 
   "generator.biomesoplenty": "Biomes O' Plenty",
   "itemGroup.biomesoplenty": "Biomes O' Plenty",
   
   "biome.biomesoplenty.alps": "알프스",
   "biome.biomesoplenty.alps_foothills": "알프스 산기슭",
-  "biome.biomesoplenty.ashen_inferno": "잿빛 지옥",
   "biome.biomesoplenty.bayou": "강어귀",
   "biome.biomesoplenty.bog": "습원",
   "biome.biomesoplenty.boreal_forest": "북방 수림대",
-  "biome.biomesoplenty.brushland": "관목림 지대",
   "biome.biomesoplenty.chaparral": "수풀 지대",
-  "biome.biomesoplenty.cherry_blossom_grove": "벚꽃 작은 숲",
-  "biome.biomesoplenty.cold_desert": "차가운 사막",
+  "biome.biomesoplenty.cherry_blossom_grove": "작은 벚꽃 숲",
+  "biome.biomesoplenty.cold_desert": "추운 사막",
   "biome.biomesoplenty.coniferous_forest": "침엽수림",
+  "biome.biomesoplenty.crystalline_chasm": "수정 틈",
   "biome.biomesoplenty.dead_forest": "죽은 숲",
-  "biome.biomesoplenty.fir_clearing": "전나무 개척지",
+  "biome.biomesoplenty.dryland": "마른 땅",
+  "biome.biomesoplenty.fir_clearing": "전나무 빈터",
   "biome.biomesoplenty.floodplain": "범람원",
   "biome.biomesoplenty.flower_meadow": "꽃의 초원",
   "biome.biomesoplenty.fungal_jungle": "버섯 정글",
-  "biome.biomesoplenty.ghost_forest": "유령 숲",
-  "biome.biomesoplenty.glowstone_grotto": "발광석 작은 동굴",
   "biome.biomesoplenty.grassland": "초원",
   "biome.biomesoplenty.gravel_beach": "자갈 해변",
   "biome.biomesoplenty.grove": "작은 숲",
   "biome.biomesoplenty.highland": "고원",
   "biome.biomesoplenty.highland_moor": "고원 황무지",
+  "biome.biomesoplenty.jade_cliffs": "비취 절벽",
   "biome.biomesoplenty.lavender_field": "라벤더 들판",
+  "biome.biomesoplenty.lush_desert": "무성한 사막",
   "biome.biomesoplenty.lush_grassland": "무성한 초원",
   "biome.biomesoplenty.lush_swamp": "무성한 늪",
   "biome.biomesoplenty.mangrove": "맹그로브 숲",
@@ -38,19 +38,18 @@
   "biome.biomesoplenty.marsh": "습지",
   "biome.biomesoplenty.meadow": "목초지",
   "biome.biomesoplenty.mire": "저습지",
+  "biome.biomesoplenty.muskeg": "물이끼로 뒤덮인 소택지",
   "biome.biomesoplenty.mystic_grove": "신비의 작은 숲",
-  "biome.biomesoplenty.oasis": "오아시스",
   "biome.biomesoplenty.ominous_woods": "불길한 숲",
   "biome.biomesoplenty.orchard": "과수원",
-  "biome.biomesoplenty.origin_beach": "원조 해변",
-  "biome.biomesoplenty.origin_hills": "원조 언덕",
+  "biome.biomesoplenty.origin_valley": "원조 계곡",
   "biome.biomesoplenty.outback": "오지",
   "biome.biomesoplenty.overgrown_cliffs": "거대 절벽",
   "biome.biomesoplenty.pasture": "목초지",
   "biome.biomesoplenty.poppy_field": "양귀비 들판",
   "biome.biomesoplenty.prairie": "대초원",
   "biome.biomesoplenty.pumpkin_patch": "호박 밭",
-  "biome.biomesoplenty.rainbow_valley": "무지개 계곡",
+  "biome.biomesoplenty.rainbow_hills": "무지개 언덕",
   "biome.biomesoplenty.rainforest": "우림",
   "biome.biomesoplenty.redwood_forest": "삼나무 숲",
   "biome.biomesoplenty.redwood_forest_edge": "삼나무 숲 가장자리",
@@ -60,23 +59,23 @@
   "biome.biomesoplenty.shrubland": "관목지",
   "biome.biomesoplenty.silkglade": "비단숲",
   "biome.biomesoplenty.snowy_coniferous_forest": "눈 덮인 침엽수림",
-  "biome.biomesoplenty.snowy_fir_clearing": "눈 덮인 전나무 개척지",
+  "biome.biomesoplenty.snowy_fir_clearing": "눈 덮인 전나무 빈터",
   "biome.biomesoplenty.snowy_forest": "눈 덮인 숲",
   "biome.biomesoplenty.steppe": "스텝 지대",
   "biome.biomesoplenty.temperate_rainforest": "온대강우림",
   "biome.biomesoplenty.temperate_rainforest_hills": "온대강우림 언덕",
   "biome.biomesoplenty.tropical_rainforest": "열대우림",
+  "biome.biomesoplenty.tropic_beach": "열대 해변",
   "biome.biomesoplenty.tropics": "열대 섬",
   "biome.biomesoplenty.tundra": "툰드라",
-  "biome.biomesoplenty.undergarden": "지하 정원",
-  "biome.biomesoplenty.visceral_heap": "내장 더미",
+  "biome.biomesoplenty.undergrowth": "덤불 지대",
+  "biome.biomesoplenty.visceral_heap": "본능 더미",
+  "biome.biomesoplenty.volcanic_plains": "화산 평원",
   "biome.biomesoplenty.volcano": "화산",
-  "biome.biomesoplenty.volcano_edge": "화산 가장자리",
   "biome.biomesoplenty.wasteland": "황무지",
   "biome.biomesoplenty.wetland": "습지대",
-  "biome.biomesoplenty.white_beach": "흰색 해변",
+  "biome.biomesoplenty.withered_abyss": "시든 심연",
   "biome.biomesoplenty.woodland": "삼림 지대",
-  "biome.biomesoplenty.xeric_shrubland": "건조 관목지",
 
   "item.biomesoplenty.bop_icon": "BOP 아이콘",
   "item.biomesoplenty.cherry_boat": "벚나무 보트",
@@ -95,8 +94,11 @@
   "item.biomesoplenty.umbran_boat": "엄브란나무 보트",
   "item.biomesoplenty.willow_boat": "버드나무 보트",
 
-  "block.biomesoplenty.ash_block": "재 블록",
-  "block.biomesoplenty.barley": "보리",
+  "block.biomesoplenty.black_sand": "검은 모래",
+  "block.biomesoplenty.black_sandstone": "검은 사암",
+  "block.biomesoplenty.black_sandstone_slab": "검은 사암 반 블록",
+  "block.biomesoplenty.black_sandstone_stairs": "검은 사암 계단",
+  "block.biomesoplenty.black_sandstone_wall": "검은 사암 담장",
   "block.biomesoplenty.blue_hydrangea": "파란 수국",
   "block.biomesoplenty.bramble": "가시나무",
   "block.biomesoplenty.burning_blossom": "불타는 꽃",
@@ -115,6 +117,12 @@
   "block.biomesoplenty.cherry_trapdoor": "벚나무 다락문",
   "block.biomesoplenty.cherry_wall_sign": "벚나무 간판",
   "block.biomesoplenty.cherry_wood": "벚나무",
+  "block.biomesoplenty.chiseled_black_sandstone": "조각된 검은 사암",
+  "block.biomesoplenty.cut_black_sandstone": "깎인 검은 사암",
+  "block.biomesoplenty.cut_black_sandstone_slab": "깎인 검은 사암 반 블록",
+  "block.biomesoplenty.chiseled_orange_sandstone": "조각된 주황 사암",
+  "block.biomesoplenty.cut_orange_sandstone": "깎인 주황 사암",
+  "block.biomesoplenty.cut_orange_sandstone_slab": "깎인 주황 사암 반 블록",
   "block.biomesoplenty.chiseled_white_sandstone": "조각된 하얀 사암",
   "block.biomesoplenty.cut_white_sandstone": "깍인 하얀 사암",
   "block.biomesoplenty.cut_white_sandstone_slab": "깎인 하얀 사암 반 블록",
@@ -229,9 +237,17 @@
   "block.biomesoplenty.mud_brick_stairs": "진흙 벽돌 계단",
   "block.biomesoplenty.mud_brick_wall": "진흙 벽돌 담장",
   "block.biomesoplenty.mud_bricks": "진흙 벽돌",
+  "block.biomesoplenty.nether_crystal": "네더 수정",
+  "block.biomesoplenty.nether_crystal_block": "네더 수정 블록",
   "block.biomesoplenty.orange_autumn_leaves": "주황가을나무 잎",
   "block.biomesoplenty.orange_autumn_sapling": "주황가을나무 묘목",
   "block.biomesoplenty.orange_cosmos": "주황 코스모스",
+  "block.biomesoplenty.orange_sand": "주황 모래",
+  "block.biomesoplenty.orange_sandstone": "주황 사암",
+  "block.biomesoplenty.orange_sandstone_slab": "주황 사암 반 블록",
+  "block.biomesoplenty.orange_sandstone_stairs": "주황 사암 계단",
+  "block.biomesoplenty.orange_sandstone_wall": "주황 사암 담장",
+  "block.biomesoplenty.origin_grass_block": "원조 유리 블록",
   "block.biomesoplenty.origin_leaves": "원조나무 잎",
   "block.biomesoplenty.origin_sapling": "원조나무 묘목",
   "block.biomesoplenty.palm_button": "야자나무 버튼",
@@ -303,6 +319,12 @@
   "block.biomesoplenty.redwood_wood": "삼나무",
   "block.biomesoplenty.reed": "갈대",
   "block.biomesoplenty.rose": "장미",
+  "block.biomesoplenty.smooth_black_sandstone": "매끄러운 검은 사암",
+  "block.biomesoplenty.smooth_black_sandstone_slab": "매끄러운 검은 사암 반 블록",
+  "block.biomesoplenty.smooth_black_sandstone_stairs": "매끄러운 검은 사암 계단",
+  "block.biomesoplenty.smooth_orange_sandstone": "매끄러운 주황 사암",
+  "block.biomesoplenty.smooth_orange_sandstone_slab": "매끄러운 주황 사암 반 블록",
+  "block.biomesoplenty.smooth_orange_sandstone_stairs": "매끄러운 주황 사암 계단",
   "block.biomesoplenty.smooth_white_sandstone": "매끄러운 하얀 사암",
   "block.biomesoplenty.smooth_white_sandstone_slab": "매끄러운 하얀 사암 반 블록",
   "block.biomesoplenty.smooth_white_sandstone_stairs": "매끄러운 하얀 사암 계단",

src/main/resources/assets/biomesoplenty/lang/ru_ru.json

@@ -12,13 +12,13 @@
   "biome.biomesoplenty.bayou": "Байу",
   "biome.biomesoplenty.bog": "Верховое болото",
   "biome.biomesoplenty.boreal_forest": "Северный лес",
-  "biome.biomesoplenty.brushland": "Кустарниковое сообщество",
   "biome.biomesoplenty.chaparral": "Чапараль",
   "biome.biomesoplenty.cherry_blossom_grove": "Цветущая вишнёвая роща",
   "biome.biomesoplenty.cold_desert": "Холодная пустыня",
   "biome.biomesoplenty.coniferous_forest": "Хвойный лес",
   "biome.biomesoplenty.crystalline_chasm": "Кристаллическая пропасть",
   "biome.biomesoplenty.dead_forest": "Мёртвый лес",
+  "biome.biomesoplenty.dryland": "Сухие земли",
   "biome.biomesoplenty.fir_clearing": "Пихтовая поляна",
   "biome.biomesoplenty.floodplain": "Пойма",
   "biome.biomesoplenty.flower_meadow": "Цветочный луг",
@@ -28,7 +28,9 @@
   "biome.biomesoplenty.grove": "Роща",
   "biome.biomesoplenty.highland": "Нагорье",
   "biome.biomesoplenty.highland_moor": "Влажное нагорье",
+  "biome.biomesoplenty.jade_cliffs": "Нефритовые скалы",
   "biome.biomesoplenty.lavender_field": "Лавандовое поле",
+  "biome.biomesoplenty.lush_desert": "Пышная пустыня",
   "biome.biomesoplenty.lush_grassland": "Пышное травянистое сообщество",
   "biome.biomesoplenty.lush_swamp": "Пышное болото",
   "biome.biomesoplenty.mangrove": "Мангры",
@@ -41,14 +43,14 @@
   "biome.biomesoplenty.oasis": "Оазис",
   "biome.biomesoplenty.ominous_woods": "Зловещий лес",
   "biome.biomesoplenty.orchard": "Плодовый сад",
-  "biome.biomesoplenty.origin_hills": "Холмы зарождения",
+  "biome.biomesoplenty.origin_valley": "Долина зарождения",
   "biome.biomesoplenty.outback": "Аутбэк",
   "biome.biomesoplenty.overgrown_cliffs": "Заросшие скалы",
   "biome.biomesoplenty.pasture": "Пастбище",
   "biome.biomesoplenty.poppy_field": "Маковое поле",
   "biome.biomesoplenty.prairie": "Прерия",
   "biome.biomesoplenty.pumpkin_patch": "Тыквенное поле",
-  "biome.biomesoplenty.rainbow_valley": "Радужная долина",
+  "biome.biomesoplenty.rainbow_hills": "Радужные холмы",
   "biome.biomesoplenty.rainforest": "Дождевой лес",
   "biome.biomesoplenty.redwood_forest": "Красный лес",
   "biome.biomesoplenty.redwood_forest_edge": "Окраина красного леса",
@@ -75,7 +77,6 @@
   "biome.biomesoplenty.wetland": "Водно-болотное угодье",
   "biome.biomesoplenty.withered_abyss": "Иссохшая Бездна",
   "biome.biomesoplenty.woodland": "Редколесье",
-  "biome.biomesoplenty.xeric_shrubland": "Засухоустойчивая кустарниковая степь",
 
   "item.biomesoplenty.bop_icon": "BOP Icon",
   "item.biomesoplenty.cherry_boat": "Вишнёвая лодка",
@@ -120,6 +121,9 @@
   "block.biomesoplenty.chiseled_black_sandstone": "Чёрный резной песчаник",
   "block.biomesoplenty.cut_black_sandstone": "Чёрный пиленый песчаник",
   "block.biomesoplenty.cut_black_sandstone_slab": "Чёрная плита из пиленого песчаника",
+  "block.biomesoplenty.chiseled_orange_sandstone": "Оранжевый резной песчаник",
+  "block.biomesoplenty.cut_orange_sandstone": "Оранжевый пиленый песчаник",
+  "block.biomesoplenty.cut_orange_sandstone_slab": "Оранжевая плита из пиленого песчаника",
   "block.biomesoplenty.chiseled_white_sandstone": "Белоснежный резной песчаник",
   "block.biomesoplenty.cut_white_sandstone": "Белоснежный пиленый песчаник",
   "block.biomesoplenty.cut_white_sandstone_slab": "Белоснежная плита из пиленого песчаника",
@@ -184,7 +188,7 @@
   "block.biomesoplenty.jacaranda_door": "Жакарандовая дверь",
   "block.biomesoplenty.jacaranda_fence": "Жакарандовый забор",
   "block.biomesoplenty.jacaranda_fence_gate": "Жакарандовая калитка",
-  "block.biomesoplenty.jacaranda_leaves": "Жакарандовые листья",
+  "block.biomesoplenty.jacaranda_leaves": "Жакарандовое цветение",
   "block.biomesoplenty.jacaranda_log": "Жакарандовое бревно",
   "block.biomesoplenty.jacaranda_planks": "Жакарандовые доски",
   "block.biomesoplenty.jacaranda_pressure_plate": "Жакарандовая нажимная плита",
@@ -239,6 +243,11 @@
   "block.biomesoplenty.orange_autumn_leaves": "Оранжевые осенние листья",
   "block.biomesoplenty.orange_autumn_sapling": "Саженец осеннего тёмного дуба",
   "block.biomesoplenty.orange_cosmos": "Оранжевая космея",
+  "block.biomesoplenty.orange_sand": "Оранжевый песок",
+  "block.biomesoplenty.orange_sandstone": "Оранжевый песчаник",
+  "block.biomesoplenty.orange_sandstone_slab": "Оранжевая плита из песчаника",
+  "block.biomesoplenty.orange_sandstone_stairs": "Оранжевые ступеньки из песчаника",
+  "block.biomesoplenty.orange_sandstone_wall": "Оранжевая ограда из песчаника",
   "block.biomesoplenty.origin_grass_block": "Блок травы зарождения",
   "block.biomesoplenty.origin_leaves": "Листья зарождения",
   "block.biomesoplenty.origin_sapling": "Саженец зарождения",
@@ -257,7 +266,7 @@
   "block.biomesoplenty.palm_trapdoor": "Пальмовый люк",
   "block.biomesoplenty.palm_wall_sign": "Пальмовая настенная табличка",
   "block.biomesoplenty.palm_wood": "Пальма",
-  "block.biomesoplenty.pink_cherry_leaves": "Розовые вишнёвые листья",
+  "block.biomesoplenty.pink_cherry_leaves": "Розовое вишнёвое цветение",
   "block.biomesoplenty.pink_cherry_sapling": "Саженец розовой вишни",
   "block.biomesoplenty.pink_daffodil": "Розовый нарцисс",
   "block.biomesoplenty.pink_hibiscus": "Розовый гибискус",
@@ -310,11 +319,13 @@
   "block.biomesoplenty.redwood_wall_sign": "Настенная табличка из красного дерева",
   "block.biomesoplenty.redwood_wood": "Красное дерево",
   "block.biomesoplenty.reed": "Камыш",
-  "block.biomesoplenty.root": "Корень",
   "block.biomesoplenty.rose": "Роза",
   "block.biomesoplenty.smooth_black_sandstone": "Чёрный гладкий песчаник",
   "block.biomesoplenty.smooth_black_sandstone_slab": "Чёрная плита из гладкого песчаника",
   "block.biomesoplenty.smooth_black_sandstone_stairs": "Чёрные ступеньки из гладкого песчаника",
+  "block.biomesoplenty.smooth_orange_sandstone": "Оранжевый гладкий песчаник",
+  "block.biomesoplenty.smooth_orange_sandstone_slab": "Оранжевая плита из гладкого песчаника",
+  "block.biomesoplenty.smooth_orange_sandstone_stairs": "Оранжевые ступеньки из гладкого песчаника",
   "block.biomesoplenty.smooth_white_sandstone": "Белоснежный гладкий песчаник",
   "block.biomesoplenty.smooth_white_sandstone_slab": "Белоснежная плита из гладкого песчаника",
   "block.biomesoplenty.smooth_white_sandstone_stairs": "Белоснежные ступеньки из гладкого песчаника",
@@ -341,7 +352,6 @@
   "block.biomesoplenty.stripped_umbran_wood": "Обтёсанная зловещая древесина",
   "block.biomesoplenty.stripped_willow_log": "Обтёсанное ивовое бревно",
   "block.biomesoplenty.stripped_willow_wood": "Обтёсанная ивовая древесина",
-  "block.biomesoplenty.tall_cattail": "Высокий рогоз",
   "block.biomesoplenty.tall_wheat": "Высокая пшеница",
   "block.biomesoplenty.toadstool": "Поганка",
   "block.biomesoplenty.toadstool_block": "Блок поганки",
@@ -362,7 +372,7 @@
   "block.biomesoplenty.umbran_wood": "Зловещее дерево",
   "block.biomesoplenty.violet": "Фиалка",
   "block.biomesoplenty.watergrass": "Водная трава",
-  "block.biomesoplenty.white_cherry_leaves": "Белые вишнёвые листья",
+  "block.biomesoplenty.white_cherry_leaves": "Белое вишнёвое цветение",
   "block.biomesoplenty.white_cherry_sapling": "Саженец белой вишни",
   "block.biomesoplenty.white_sand": "Белоснежный песок",
   "block.biomesoplenty.white_sandstone": "Белоснежный песчаник",