From dfa48edd520b8cd2fa44cf160bbe043a9ee909be Mon Sep 17 00:00:00 2001 From: Adubbz Date: Thu, 24 Sep 2020 14:37:44 +1000 Subject: [PATCH] Removed now unnecessary workaround for configured features --- .../common/biome/BiomeTemplate.java | 27 ++----------------- .../biome/nether/CrystallineChasmBiome.java | 4 +-- .../common/biome/nether/UndergrowthBiome.java | 7 +---- .../biome/nether/VisceralHeapBiome.java | 4 +-- .../biome/nether/WitheredAbyssBiome.java | 5 +--- .../common/biome/overworld/AlpsBiome.java | 2 +- .../biome/overworld/AlpsFoothillsBiome.java | 6 +---- .../common/biome/overworld/BayouBiome.java | 10 +------ .../common/biome/overworld/BogBiome.java | 10 +------ .../biome/overworld/BorealForestBiome.java | 8 +----- .../biome/overworld/BrushlandBiome.java | 9 +------ .../biome/overworld/ChaparralBiome.java | 9 +------ .../overworld/CherryBlossomGroveBiome.java | 10 +------ .../biome/overworld/ColdDesertBiome.java | 3 +-- .../overworld/ConiferousForestBiome.java | 8 +----- .../biome/overworld/DeadForestBiome.java | 6 +---- .../biome/overworld/FirClearingBiome.java | 7 +---- .../biome/overworld/FloodplainBiome.java | 10 +------ .../biome/overworld/FlowerMeadowBiome.java | 10 +------ .../biome/overworld/FungalJungleBiome.java | 8 +----- .../biome/overworld/GrasslandBiome.java | 5 +--- .../biome/overworld/GravelBeachBiome.java | 2 +- .../common/biome/overworld/GroveBiome.java | 9 +------ .../common/biome/overworld/HighlandBiome.java | 8 +----- .../biome/overworld/HighlandMoorBiome.java | 7 +---- .../biome/overworld/LavenderFieldBiome.java | 7 +---- .../biome/overworld/LushGrasslandBiome.java | 10 +------ .../biome/overworld/LushSwampBiome.java | 9 +------ .../common/biome/overworld/MangroveBiome.java | 8 +----- .../biome/overworld/MapleWoodsBiome.java | 6 +---- .../common/biome/overworld/MarshBiome.java | 8 +----- .../common/biome/overworld/MeadowBiome.java | 9 +------ .../common/biome/overworld/MireBiome.java | 10 +------ .../common/biome/overworld/MuskegBiome.java | 10 +------ .../biome/overworld/MysticGroveBiome.java | 9 +------ .../common/biome/overworld/OasisBiome.java | 10 +------ .../biome/overworld/OminousWoodsBiome.java | 9 +------ .../common/biome/overworld/OrchardBiome.java | 9 +------ .../biome/overworld/OriginHillsBiome.java | 6 +---- .../common/biome/overworld/OutbackBiome.java | 10 +------ .../biome/overworld/OvergrownCliffsBiome.java | 9 +------ .../common/biome/overworld/PastureBiome.java | 9 +------ .../biome/overworld/PoppyFieldBiome.java | 8 +----- .../common/biome/overworld/PrairieBiome.java | 9 +------ .../biome/overworld/PumpkinPatchBiome.java | 9 +------ .../biome/overworld/RainbowValleyBiome.java | 9 +------ .../biome/overworld/RainforestBiome.java | 8 +----- .../biome/overworld/RedwoodForestBiome.java | 7 +---- .../overworld/RedwoodForestEdgeBiome.java | 7 +---- .../biome/overworld/ScrublandBiome.java | 9 +------ .../biome/overworld/SeasonalForestBiome.java | 9 +------ .../common/biome/overworld/ShieldBiome.java | 9 +------ .../biome/overworld/ShrublandBiome.java | 11 +------- .../biome/overworld/SilkgladeBiome.java | 10 +------ .../overworld/SnowyConiferousForestBiome.java | 7 +---- .../overworld/SnowyFirClearingBiome.java | 6 +---- .../biome/overworld/SnowyForestBiome.java | 6 +---- .../common/biome/overworld/SteppeBiome.java | 9 +------ .../overworld/TemperateRainforestBiome.java | 11 +------- .../TemperateRainforestHillsBiome.java | 9 +------ .../biome/overworld/TropicBeachBiome.java | 4 +-- .../overworld/TropicalRainforestBiome.java | 11 +------- .../common/biome/overworld/TropicsBiome.java | 9 +------ .../common/biome/overworld/TundraBiome.java | 10 +------ .../biome/overworld/VolcanicPlainsBiome.java | 6 +---- .../common/biome/overworld/VolcanoBiome.java | 8 +----- .../biome/overworld/WastelandBiome.java | 7 +---- .../common/biome/overworld/WetlandBiome.java | 12 +-------- .../common/biome/overworld/WoodlandBiome.java | 10 +------ .../biome/overworld/XericShrublandBiome.java | 9 +------ 70 files changed, 71 insertions(+), 510 deletions(-) diff --git a/src/main/java/biomesoplenty/common/biome/BiomeTemplate.java b/src/main/java/biomesoplenty/common/biome/BiomeTemplate.java index d92fbaab9..3cc3e2c05 100644 --- a/src/main/java/biomesoplenty/common/biome/BiomeTemplate.java +++ b/src/main/java/biomesoplenty/common/biome/BiomeTemplate.java @@ -8,20 +8,12 @@ package biomesoplenty.common.biome; import biomesoplenty.api.enums.BOPClimates; -import biomesoplenty.core.BiomesOPlenty; import net.minecraft.util.RegistryKey; -import net.minecraft.util.ResourceLocation; import net.minecraft.util.math.MathHelper; -import net.minecraft.util.registry.DynamicRegistries; -import net.minecraft.util.registry.Registry; -import net.minecraft.util.registry.WorldGenRegistries; import net.minecraft.world.biome.Biome; import net.minecraft.world.biome.BiomeGenerationSettings; import net.minecraft.world.biome.Biomes; import net.minecraft.world.biome.MobSpawnInfo; -import net.minecraft.world.gen.GenerationStage; -import net.minecraft.world.gen.feature.ConfiguredFeature; -import net.minecraftforge.registries.ForgeRegistries; import java.util.HashMap; import java.util.Map; @@ -37,7 +29,7 @@ public class BiomeTemplate private BiFunction waterColorFunction; protected void configureBiome(Biome.Builder builder) {} - protected void configureGeneration(BiomeGenerationSettingsRegistryBuilder builder) {} + protected void configureGeneration(BiomeGenerationSettings.Builder builder) {} protected void configureMobSpawns(MobSpawnInfo.Builder builder) {} protected void configureDefaultMobSpawns(MobSpawnInfo.Builder builder) @@ -50,7 +42,7 @@ public class BiomeTemplate Biome.Builder biomeBuilder = new Biome.Builder(); // Configure the biome generation - BiomeGenerationSettingsRegistryBuilder biomeGenBuilder = new BiomeGenerationSettingsRegistryBuilder(); + BiomeGenerationSettings.Builder biomeGenBuilder = new BiomeGenerationSettings.Builder(); this.configureGeneration(biomeGenBuilder); biomeBuilder.generationSettings(biomeGenBuilder.build()); @@ -106,19 +98,4 @@ public class BiomeTemplate lvt_1_1_ = MathHelper.clamp(lvt_1_1_, -1.0F, 1.0F); return MathHelper.hsvToRgb(0.62222224F - lvt_1_1_ * 0.05F, 0.5F + lvt_1_1_ * 0.1F, 1.0F); } - - protected static class BiomeGenerationSettingsRegistryBuilder extends BiomeGenerationSettings.Builder - { - public BiomeGenerationSettings.Builder addFeature(GenerationStage.Decoration stage, ConfiguredFeature feature) - { - // As a temporary measure, register configured features as we go - // Thanks for continuing to fuck us over Mojang. - if (!WorldGenRegistries.CONFIGURED_FEATURE.getResourceKey(feature).isPresent()) - { - Registry.register(WorldGenRegistries.CONFIGURED_FEATURE, new ResourceLocation(BiomesOPlenty.MOD_ID, "" + feature.hashCode()), feature); - } - - return super.addFeature(stage, feature); - } - } } diff --git a/src/main/java/biomesoplenty/common/biome/nether/CrystallineChasmBiome.java b/src/main/java/biomesoplenty/common/biome/nether/CrystallineChasmBiome.java index 9d03bf3d9..35fd550f7 100644 --- a/src/main/java/biomesoplenty/common/biome/nether/CrystallineChasmBiome.java +++ b/src/main/java/biomesoplenty/common/biome/nether/CrystallineChasmBiome.java @@ -3,7 +3,6 @@ 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.feature.BOPFeatures; import net.minecraft.client.audio.BackgroundMusicTracks; import net.minecraft.entity.EntityClassification; import net.minecraft.entity.EntityType; @@ -13,7 +12,6 @@ import net.minecraft.world.biome.*; import net.minecraft.world.gen.GenerationStage; import net.minecraft.world.gen.carver.ConfiguredCarvers; import net.minecraft.world.gen.feature.Features; -import net.minecraft.world.gen.feature.IFeatureConfig; import net.minecraft.world.gen.feature.structure.StructureFeatures; import net.minecraft.world.gen.surfacebuilders.ConfiguredSurfaceBuilder; import net.minecraft.world.gen.surfacebuilders.SurfaceBuilder; @@ -34,7 +32,7 @@ public class CrystallineChasmBiome extends NetherBiomeTemplate } @Override - protected void configureGeneration(BiomeGenerationSettingsRegistryBuilder builder) + protected void configureGeneration(BiomeGenerationSettings.Builder builder) { builder.surfaceBuilder(new ConfiguredSurfaceBuilder(SurfaceBuilder.NETHER, SurfaceBuilder.CONFIG_HELL)); diff --git a/src/main/java/biomesoplenty/common/biome/nether/UndergrowthBiome.java b/src/main/java/biomesoplenty/common/biome/nether/UndergrowthBiome.java index 63210c7c1..786376d8d 100644 --- a/src/main/java/biomesoplenty/common/biome/nether/UndergrowthBiome.java +++ b/src/main/java/biomesoplenty/common/biome/nether/UndergrowthBiome.java @@ -1,11 +1,8 @@ package biomesoplenty.common.biome.nether; -import biomesoplenty.api.block.BOPBlocks; import biomesoplenty.api.enums.BOPClimates; import biomesoplenty.common.biome.NetherBiomeTemplate; -import biomesoplenty.common.world.biome.BiomeFeatureHelper; import biomesoplenty.common.world.gen.feature.BOPConfiguredFeatures; -import biomesoplenty.common.world.gen.feature.BOPFeatures; import net.minecraft.client.audio.BackgroundMusicTracks; import net.minecraft.entity.EntityClassification; import net.minecraft.entity.EntityType; @@ -14,9 +11,7 @@ import net.minecraft.util.SoundEvents; import net.minecraft.world.biome.*; import net.minecraft.world.gen.GenerationStage; import net.minecraft.world.gen.carver.ConfiguredCarvers; -import net.minecraft.world.gen.feature.Feature; import net.minecraft.world.gen.feature.Features; -import net.minecraft.world.gen.feature.IFeatureConfig; import net.minecraft.world.gen.feature.structure.StructureFeatures; import net.minecraft.world.gen.surfacebuilders.ConfiguredSurfaceBuilder; import net.minecraft.world.gen.surfacebuilders.SurfaceBuilder; @@ -37,7 +32,7 @@ public class UndergrowthBiome extends NetherBiomeTemplate } @Override - protected void configureGeneration(BiomeGenerationSettingsRegistryBuilder builder) + protected void configureGeneration(BiomeGenerationSettings.Builder builder) { builder.surfaceBuilder(new ConfiguredSurfaceBuilder(SurfaceBuilder.NETHER, SurfaceBuilder.CONFIG_HELL)); diff --git a/src/main/java/biomesoplenty/common/biome/nether/VisceralHeapBiome.java b/src/main/java/biomesoplenty/common/biome/nether/VisceralHeapBiome.java index 370785b5e..13d0910a8 100644 --- a/src/main/java/biomesoplenty/common/biome/nether/VisceralHeapBiome.java +++ b/src/main/java/biomesoplenty/common/biome/nether/VisceralHeapBiome.java @@ -3,7 +3,6 @@ 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.feature.BOPFeatures; import biomesoplenty.common.world.gen.surfacebuilders.BOPSurfaceBuilders; import net.minecraft.client.audio.BackgroundMusicTracks; import net.minecraft.entity.EntityClassification; @@ -14,7 +13,6 @@ import net.minecraft.world.biome.*; import net.minecraft.world.gen.GenerationStage; import net.minecraft.world.gen.carver.ConfiguredCarvers; import net.minecraft.world.gen.feature.Features; -import net.minecraft.world.gen.feature.IFeatureConfig; import net.minecraft.world.gen.feature.structure.StructureFeatures; import net.minecraft.world.gen.surfacebuilders.ConfiguredSurfaceBuilder; import net.minecraft.world.gen.surfacebuilders.SurfaceBuilder; @@ -35,7 +33,7 @@ public class VisceralHeapBiome extends NetherBiomeTemplate } @Override - protected void configureGeneration(BiomeGenerationSettingsRegistryBuilder builder) + protected void configureGeneration(BiomeGenerationSettings.Builder builder) { builder.surfaceBuilder(new ConfiguredSurfaceBuilder(BOPSurfaceBuilders.FLESH, SurfaceBuilder.CONFIG_HELL)); diff --git a/src/main/java/biomesoplenty/common/biome/nether/WitheredAbyssBiome.java b/src/main/java/biomesoplenty/common/biome/nether/WitheredAbyssBiome.java index 422ec7ac4..8708dea1e 100644 --- a/src/main/java/biomesoplenty/common/biome/nether/WitheredAbyssBiome.java +++ b/src/main/java/biomesoplenty/common/biome/nether/WitheredAbyssBiome.java @@ -3,7 +3,6 @@ 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.feature.BOPFeatures; import biomesoplenty.common.world.gen.surfacebuilders.BOPSurfaceBuilders; import net.minecraft.client.audio.BackgroundMusicTracks; import net.minecraft.entity.EntityClassification; @@ -13,8 +12,6 @@ import net.minecraft.util.SoundEvents; import net.minecraft.world.biome.*; import net.minecraft.world.gen.GenerationStage; import net.minecraft.world.gen.carver.ConfiguredCarvers; -import net.minecraft.world.gen.feature.Features; -import net.minecraft.world.gen.feature.IFeatureConfig; import net.minecraft.world.gen.feature.structure.StructureFeatures; import net.minecraft.world.gen.surfacebuilders.ConfiguredSurfaceBuilder; @@ -34,7 +31,7 @@ public class WitheredAbyssBiome extends NetherBiomeTemplate } @Override - protected void configureGeneration(BiomeGenerationSettingsRegistryBuilder builder) + protected void configureGeneration(BiomeGenerationSettings.Builder builder) { builder.surfaceBuilder(new ConfiguredSurfaceBuilder(BOPSurfaceBuilders.WITHERED_ABYSS, BOPSurfaceBuilders.BLACKSTONE_SURFACE)); diff --git a/src/main/java/biomesoplenty/common/biome/overworld/AlpsBiome.java b/src/main/java/biomesoplenty/common/biome/overworld/AlpsBiome.java index 93123ae5c..eedaeff22 100644 --- a/src/main/java/biomesoplenty/common/biome/overworld/AlpsBiome.java +++ b/src/main/java/biomesoplenty/common/biome/overworld/AlpsBiome.java @@ -34,7 +34,7 @@ public class AlpsBiome extends BiomeTemplate } @Override - protected void configureGeneration(BiomeGenerationSettingsRegistryBuilder builder) + protected void configureGeneration(BiomeGenerationSettings.Builder builder) { builder.surfaceBuilder(new ConfiguredSurfaceBuilder(BOPSurfaceBuilders.DEEP_TOP_LAYER, BOPSurfaceBuilders.SNOW_SNOW_GRAVEL_SURFACE)); diff --git a/src/main/java/biomesoplenty/common/biome/overworld/AlpsFoothillsBiome.java b/src/main/java/biomesoplenty/common/biome/overworld/AlpsFoothillsBiome.java index 8c02a5b48..9c352f48d 100644 --- a/src/main/java/biomesoplenty/common/biome/overworld/AlpsFoothillsBiome.java +++ b/src/main/java/biomesoplenty/common/biome/overworld/AlpsFoothillsBiome.java @@ -9,15 +9,11 @@ package biomesoplenty.common.biome.overworld; import biomesoplenty.common.biome.BiomeTemplate; import biomesoplenty.common.world.gen.feature.BOPConfiguredFeatures; -import biomesoplenty.common.world.gen.feature.BOPFeatures; import net.minecraft.entity.EntityClassification; import net.minecraft.entity.EntityType; import net.minecraft.world.biome.*; 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.placement.AtSurfaceWithExtraConfig; -import net.minecraft.world.gen.placement.Placement; import net.minecraft.world.gen.surfacebuilders.ConfiguredSurfaceBuilder; import net.minecraft.world.gen.surfacebuilders.SurfaceBuilder; @@ -38,7 +34,7 @@ public class AlpsFoothillsBiome extends BiomeTemplate } @Override - protected void configureGeneration(BiomeGenerationSettingsRegistryBuilder builder) + protected void configureGeneration(BiomeGenerationSettings.Builder builder) { builder.surfaceBuilder(new ConfiguredSurfaceBuilder(SurfaceBuilder.DEFAULT, SurfaceBuilder.CONFIG_STONE)); diff --git a/src/main/java/biomesoplenty/common/biome/overworld/BayouBiome.java b/src/main/java/biomesoplenty/common/biome/overworld/BayouBiome.java index 2cd6d006c..dd2b278da 100644 --- a/src/main/java/biomesoplenty/common/biome/overworld/BayouBiome.java +++ b/src/main/java/biomesoplenty/common/biome/overworld/BayouBiome.java @@ -8,23 +8,15 @@ package biomesoplenty.common.biome.overworld; import biomesoplenty.api.biome.BOPBiomes; -import biomesoplenty.api.block.BOPBlocks; import biomesoplenty.api.enums.BOPClimates; import biomesoplenty.common.biome.BiomeTemplate; -import biomesoplenty.common.world.biome.BiomeFeatureHelper; import biomesoplenty.common.world.gen.feature.BOPConfiguredFeatures; -import biomesoplenty.common.world.gen.feature.BOPFeatures; -import com.google.common.collect.ImmutableList; -import net.minecraft.block.Blocks; import net.minecraft.entity.EntityClassification; import net.minecraft.entity.EntityType; import net.minecraft.world.biome.*; import net.minecraft.world.gen.GenerationStage; -import net.minecraft.world.gen.blockplacer.SimpleBlockPlacer; -import net.minecraft.world.gen.blockstateprovider.SimpleBlockStateProvider; import net.minecraft.world.gen.feature.*; import net.minecraft.world.gen.feature.structure.StructureFeatures; -import net.minecraft.world.gen.placement.*; import net.minecraft.world.gen.surfacebuilders.ConfiguredSurfaceBuilder; import net.minecraft.world.gen.surfacebuilders.SurfaceBuilder; @@ -45,7 +37,7 @@ public class BayouBiome extends BiomeTemplate } @Override - protected void configureGeneration(BiomeGenerationSettingsRegistryBuilder builder) + protected void configureGeneration(BiomeGenerationSettings.Builder builder) { builder.surfaceBuilder(new ConfiguredSurfaceBuilder(SurfaceBuilder.DEFAULT, SurfaceBuilder.CONFIG_GRASS)); diff --git a/src/main/java/biomesoplenty/common/biome/overworld/BogBiome.java b/src/main/java/biomesoplenty/common/biome/overworld/BogBiome.java index e5a1d4b51..9248d2575 100644 --- a/src/main/java/biomesoplenty/common/biome/overworld/BogBiome.java +++ b/src/main/java/biomesoplenty/common/biome/overworld/BogBiome.java @@ -7,23 +7,15 @@ ******************************************************************************/ package biomesoplenty.common.biome.overworld; -import biomesoplenty.api.block.BOPBlocks; import biomesoplenty.api.enums.BOPClimates; import biomesoplenty.common.biome.BiomeTemplate; -import biomesoplenty.common.world.biome.BiomeFeatureHelper; import biomesoplenty.common.world.gen.feature.BOPConfiguredFeatures; -import biomesoplenty.common.world.gen.feature.BOPFeatures; -import com.google.common.collect.ImmutableList; -import net.minecraft.block.Blocks; import net.minecraft.entity.EntityClassification; import net.minecraft.entity.EntityType; import net.minecraft.world.biome.*; 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.placement.AtSurfaceWithExtraConfig; -import net.minecraft.world.gen.placement.ChanceConfig; -import net.minecraft.world.gen.placement.Placement; import net.minecraft.world.gen.surfacebuilders.ConfiguredSurfaceBuilder; import net.minecraft.world.gen.surfacebuilders.SurfaceBuilder; @@ -44,7 +36,7 @@ public class BogBiome extends BiomeTemplate } @Override - protected void configureGeneration(BiomeGenerationSettingsRegistryBuilder builder) + protected void configureGeneration(BiomeGenerationSettings.Builder builder) { builder.surfaceBuilder(new ConfiguredSurfaceBuilder(SurfaceBuilder.DEFAULT, SurfaceBuilder.CONFIG_GRASS)); diff --git a/src/main/java/biomesoplenty/common/biome/overworld/BorealForestBiome.java b/src/main/java/biomesoplenty/common/biome/overworld/BorealForestBiome.java index 2b056b918..32257e0a6 100644 --- a/src/main/java/biomesoplenty/common/biome/overworld/BorealForestBiome.java +++ b/src/main/java/biomesoplenty/common/biome/overworld/BorealForestBiome.java @@ -8,21 +8,15 @@ package biomesoplenty.common.biome.overworld; import biomesoplenty.api.biome.BOPBiomes; -import biomesoplenty.api.block.BOPBlocks; import biomesoplenty.api.enums.BOPClimates; import biomesoplenty.common.biome.BiomeTemplate; -import biomesoplenty.common.world.biome.BiomeFeatureHelper; import biomesoplenty.common.world.gen.feature.BOPConfiguredFeatures; -import biomesoplenty.common.world.gen.feature.BOPFeatures; -import com.google.common.collect.ImmutableList; import net.minecraft.entity.EntityClassification; import net.minecraft.entity.EntityType; import net.minecraft.world.biome.*; 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.placement.AtSurfaceWithExtraConfig; -import net.minecraft.world.gen.placement.Placement; import net.minecraft.world.gen.surfacebuilders.ConfiguredSurfaceBuilder; import net.minecraft.world.gen.surfacebuilders.SurfaceBuilder; @@ -45,7 +39,7 @@ public class BorealForestBiome extends BiomeTemplate } @Override - protected void configureGeneration(BiomeGenerationSettingsRegistryBuilder builder) + protected void configureGeneration(BiomeGenerationSettings.Builder builder) { // Surface builder builder.surfaceBuilder(new ConfiguredSurfaceBuilder(SurfaceBuilder.DEFAULT, SurfaceBuilder.CONFIG_GRASS)); diff --git a/src/main/java/biomesoplenty/common/biome/overworld/BrushlandBiome.java b/src/main/java/biomesoplenty/common/biome/overworld/BrushlandBiome.java index 14bd98625..286715bc2 100644 --- a/src/main/java/biomesoplenty/common/biome/overworld/BrushlandBiome.java +++ b/src/main/java/biomesoplenty/common/biome/overworld/BrushlandBiome.java @@ -7,23 +7,16 @@ ******************************************************************************/ package biomesoplenty.common.biome.overworld; -import biomesoplenty.api.block.BOPBlocks; import biomesoplenty.api.enums.BOPClimates; import biomesoplenty.common.biome.BiomeTemplate; -import biomesoplenty.common.world.biome.BiomeFeatureHelper; import biomesoplenty.common.world.gen.feature.BOPConfiguredFeatures; -import biomesoplenty.common.world.gen.feature.BOPFeatures; import biomesoplenty.common.world.gen.surfacebuilders.BOPSurfaceBuilders; -import com.google.common.collect.ImmutableList; -import net.minecraft.block.Blocks; import net.minecraft.entity.EntityClassification; import net.minecraft.entity.EntityType; import net.minecraft.world.biome.*; 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.placement.AtSurfaceWithExtraConfig; -import net.minecraft.world.gen.placement.Placement; import net.minecraft.world.gen.surfacebuilders.ConfiguredSurfaceBuilder; import net.minecraft.world.gen.surfacebuilders.SurfaceBuilder; @@ -43,7 +36,7 @@ public class BrushlandBiome extends BiomeTemplate } @Override - protected void configureGeneration(BiomeGenerationSettingsRegistryBuilder builder) + protected void configureGeneration(BiomeGenerationSettings.Builder builder) { builder.surfaceBuilder(new ConfiguredSurfaceBuilder(BOPSurfaceBuilders.BRUSHLAND, SurfaceBuilder.CONFIG_GRASS)); diff --git a/src/main/java/biomesoplenty/common/biome/overworld/ChaparralBiome.java b/src/main/java/biomesoplenty/common/biome/overworld/ChaparralBiome.java index 7171ace8f..491afca15 100644 --- a/src/main/java/biomesoplenty/common/biome/overworld/ChaparralBiome.java +++ b/src/main/java/biomesoplenty/common/biome/overworld/ChaparralBiome.java @@ -7,22 +7,15 @@ ******************************************************************************/ package biomesoplenty.common.biome.overworld; -import biomesoplenty.api.block.BOPBlocks; import biomesoplenty.api.enums.BOPClimates; import biomesoplenty.common.biome.BiomeTemplate; -import biomesoplenty.common.world.biome.BiomeFeatureHelper; import biomesoplenty.common.world.gen.feature.BOPConfiguredFeatures; -import biomesoplenty.common.world.gen.feature.BOPFeatures; import biomesoplenty.common.world.gen.surfacebuilders.BOPSurfaceBuilders; -import com.google.common.collect.ImmutableList; import net.minecraft.entity.EntityClassification; import net.minecraft.entity.EntityType; import net.minecraft.world.biome.*; 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.placement.AtSurfaceWithExtraConfig; -import net.minecraft.world.gen.placement.Placement; import net.minecraft.world.gen.surfacebuilders.ConfiguredSurfaceBuilder; import net.minecraft.world.gen.surfacebuilders.SurfaceBuilder; @@ -42,7 +35,7 @@ public class ChaparralBiome extends BiomeTemplate } @Override - protected void configureGeneration(BiomeGenerationSettingsRegistryBuilder builder) + protected void configureGeneration(BiomeGenerationSettings.Builder builder) { builder.surfaceBuilder(new ConfiguredSurfaceBuilder(BOPSurfaceBuilders.CHAPARRAL, SurfaceBuilder.CONFIG_GRASS)); diff --git a/src/main/java/biomesoplenty/common/biome/overworld/CherryBlossomGroveBiome.java b/src/main/java/biomesoplenty/common/biome/overworld/CherryBlossomGroveBiome.java index e15aee029..e7bd0046e 100644 --- a/src/main/java/biomesoplenty/common/biome/overworld/CherryBlossomGroveBiome.java +++ b/src/main/java/biomesoplenty/common/biome/overworld/CherryBlossomGroveBiome.java @@ -7,23 +7,15 @@ ******************************************************************************/ package biomesoplenty.common.biome.overworld; -import biomesoplenty.api.block.BOPBlocks; import biomesoplenty.api.enums.BOPClimates; import biomesoplenty.common.biome.BiomeTemplate; -import biomesoplenty.common.world.biome.BiomeFeatureHelper; import biomesoplenty.common.world.gen.feature.BOPConfiguredFeatures; -import biomesoplenty.common.world.gen.feature.BOPFeatures; -import com.google.common.collect.ImmutableList; -import net.minecraft.block.Blocks; import net.minecraft.entity.EntityClassification; import net.minecraft.entity.EntityType; import net.minecraft.world.biome.*; import net.minecraft.world.gen.GenerationStage; -import net.minecraft.world.gen.blockplacer.SimpleBlockPlacer; -import net.minecraft.world.gen.blockstateprovider.SimpleBlockStateProvider; import net.minecraft.world.gen.feature.*; import net.minecraft.world.gen.feature.structure.StructureFeatures; -import net.minecraft.world.gen.placement.*; import net.minecraft.world.gen.surfacebuilders.ConfiguredSurfaceBuilder; import net.minecraft.world.gen.surfacebuilders.SurfaceBuilder; @@ -43,7 +35,7 @@ public class CherryBlossomGroveBiome extends BiomeTemplate } @Override - protected void configureGeneration(BiomeGenerationSettingsRegistryBuilder builder) + protected void configureGeneration(BiomeGenerationSettings.Builder builder) { builder.surfaceBuilder(new ConfiguredSurfaceBuilder(SurfaceBuilder.DEFAULT, SurfaceBuilder.CONFIG_GRASS)); diff --git a/src/main/java/biomesoplenty/common/biome/overworld/ColdDesertBiome.java b/src/main/java/biomesoplenty/common/biome/overworld/ColdDesertBiome.java index 697859226..9f04b5b0d 100644 --- a/src/main/java/biomesoplenty/common/biome/overworld/ColdDesertBiome.java +++ b/src/main/java/biomesoplenty/common/biome/overworld/ColdDesertBiome.java @@ -10,7 +10,6 @@ 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.feature.BOPFeatures; import biomesoplenty.common.world.gen.surfacebuilders.BOPSurfaceBuilders; import net.minecraft.entity.EntityClassification; import net.minecraft.entity.EntityType; @@ -39,7 +38,7 @@ public class ColdDesertBiome extends BiomeTemplate } @Override - protected void configureGeneration(BiomeGenerationSettingsRegistryBuilder builder) + protected void configureGeneration(BiomeGenerationSettings.Builder builder) { builder.surfaceBuilder(new ConfiguredSurfaceBuilder(BOPSurfaceBuilders.COLD_DESERT, SurfaceBuilder.CONFIG_GRAVEL)); diff --git a/src/main/java/biomesoplenty/common/biome/overworld/ConiferousForestBiome.java b/src/main/java/biomesoplenty/common/biome/overworld/ConiferousForestBiome.java index 04fe9b1e2..026409556 100644 --- a/src/main/java/biomesoplenty/common/biome/overworld/ConiferousForestBiome.java +++ b/src/main/java/biomesoplenty/common/biome/overworld/ConiferousForestBiome.java @@ -8,21 +8,15 @@ package biomesoplenty.common.biome.overworld; import biomesoplenty.api.biome.BOPBiomes; -import biomesoplenty.api.block.BOPBlocks; import biomesoplenty.api.enums.BOPClimates; import biomesoplenty.common.biome.BiomeTemplate; -import biomesoplenty.common.world.biome.BiomeFeatureHelper; import biomesoplenty.common.world.gen.feature.BOPConfiguredFeatures; -import biomesoplenty.common.world.gen.feature.BOPFeatures; -import com.google.common.collect.ImmutableList; -import net.minecraft.block.Blocks; import net.minecraft.entity.EntityClassification; import net.minecraft.entity.EntityType; import net.minecraft.world.biome.*; 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.placement.*; import net.minecraft.world.gen.surfacebuilders.ConfiguredSurfaceBuilder; import net.minecraft.world.gen.surfacebuilders.SurfaceBuilder; @@ -43,7 +37,7 @@ public class ConiferousForestBiome extends BiomeTemplate } @Override - protected void configureGeneration(BiomeGenerationSettingsRegistryBuilder builder) + protected void configureGeneration(BiomeGenerationSettings.Builder builder) { builder.surfaceBuilder(new ConfiguredSurfaceBuilder(SurfaceBuilder.DEFAULT, SurfaceBuilder.CONFIG_GRASS)); diff --git a/src/main/java/biomesoplenty/common/biome/overworld/DeadForestBiome.java b/src/main/java/biomesoplenty/common/biome/overworld/DeadForestBiome.java index 6d28ea095..0c229ae17 100644 --- a/src/main/java/biomesoplenty/common/biome/overworld/DeadForestBiome.java +++ b/src/main/java/biomesoplenty/common/biome/overworld/DeadForestBiome.java @@ -11,16 +11,12 @@ 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.feature.BOPFeatures; -import com.google.common.collect.ImmutableList; import net.minecraft.entity.EntityClassification; import net.minecraft.entity.EntityType; import net.minecraft.world.biome.*; 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.placement.AtSurfaceWithExtraConfig; -import net.minecraft.world.gen.placement.Placement; import net.minecraft.world.gen.surfacebuilders.ConfiguredSurfaceBuilder; import net.minecraft.world.gen.surfacebuilders.SurfaceBuilder; @@ -41,7 +37,7 @@ public class DeadForestBiome extends BiomeTemplate } @Override - protected void configureGeneration(BiomeGenerationSettingsRegistryBuilder builder) + protected void configureGeneration(BiomeGenerationSettings.Builder builder) { builder.surfaceBuilder(new ConfiguredSurfaceBuilder(SurfaceBuilder.DEFAULT, SurfaceBuilder.CONFIG_GRASS)); diff --git a/src/main/java/biomesoplenty/common/biome/overworld/FirClearingBiome.java b/src/main/java/biomesoplenty/common/biome/overworld/FirClearingBiome.java index 169eb42e1..333276e0f 100644 --- a/src/main/java/biomesoplenty/common/biome/overworld/FirClearingBiome.java +++ b/src/main/java/biomesoplenty/common/biome/overworld/FirClearingBiome.java @@ -8,19 +8,14 @@ package biomesoplenty.common.biome.overworld; import biomesoplenty.api.biome.BOPBiomes; -import biomesoplenty.api.block.BOPBlocks; import biomesoplenty.common.biome.BiomeTemplate; -import biomesoplenty.common.world.biome.BiomeFeatureHelper; import biomesoplenty.common.world.gen.feature.BOPConfiguredFeatures; -import biomesoplenty.common.world.gen.feature.BOPFeatures; -import net.minecraft.block.Blocks; import net.minecraft.entity.EntityClassification; import net.minecraft.entity.EntityType; import net.minecraft.world.biome.*; 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.placement.*; import net.minecraft.world.gen.surfacebuilders.ConfiguredSurfaceBuilder; import net.minecraft.world.gen.surfacebuilders.SurfaceBuilder; @@ -40,7 +35,7 @@ public class FirClearingBiome extends BiomeTemplate } @Override - protected void configureGeneration(BiomeGenerationSettingsRegistryBuilder builder) + protected void configureGeneration(BiomeGenerationSettings.Builder builder) { builder.surfaceBuilder(new ConfiguredSurfaceBuilder(SurfaceBuilder.DEFAULT, SurfaceBuilder.CONFIG_GRASS)); diff --git a/src/main/java/biomesoplenty/common/biome/overworld/FloodplainBiome.java b/src/main/java/biomesoplenty/common/biome/overworld/FloodplainBiome.java index 0752d1754..d5ae95b28 100644 --- a/src/main/java/biomesoplenty/common/biome/overworld/FloodplainBiome.java +++ b/src/main/java/biomesoplenty/common/biome/overworld/FloodplainBiome.java @@ -7,23 +7,15 @@ ******************************************************************************/ package biomesoplenty.common.biome.overworld; -import biomesoplenty.api.block.BOPBlocks; import biomesoplenty.api.enums.BOPClimates; import biomesoplenty.common.biome.BiomeTemplate; -import biomesoplenty.common.world.biome.BiomeFeatureHelper; import biomesoplenty.common.world.gen.feature.BOPConfiguredFeatures; -import biomesoplenty.common.world.gen.feature.BOPFeatures; -import com.google.common.collect.ImmutableList; -import net.minecraft.block.Blocks; import net.minecraft.entity.EntityClassification; import net.minecraft.entity.EntityType; import net.minecraft.world.biome.*; import net.minecraft.world.gen.GenerationStage; -import net.minecraft.world.gen.blockplacer.SimpleBlockPlacer; -import net.minecraft.world.gen.blockstateprovider.SimpleBlockStateProvider; import net.minecraft.world.gen.feature.*; import net.minecraft.world.gen.feature.structure.StructureFeatures; -import net.minecraft.world.gen.placement.*; import net.minecraft.world.gen.surfacebuilders.ConfiguredSurfaceBuilder; import net.minecraft.world.gen.surfacebuilders.SurfaceBuilder; @@ -44,7 +36,7 @@ public class FloodplainBiome extends BiomeTemplate } @Override - protected void configureGeneration(BiomeGenerationSettingsRegistryBuilder builder) + protected void configureGeneration(BiomeGenerationSettings.Builder builder) { builder.surfaceBuilder(new ConfiguredSurfaceBuilder(SurfaceBuilder.SWAMP, SurfaceBuilder.CONFIG_GRASS)); diff --git a/src/main/java/biomesoplenty/common/biome/overworld/FlowerMeadowBiome.java b/src/main/java/biomesoplenty/common/biome/overworld/FlowerMeadowBiome.java index 2df1adf2f..322ca9dbe 100644 --- a/src/main/java/biomesoplenty/common/biome/overworld/FlowerMeadowBiome.java +++ b/src/main/java/biomesoplenty/common/biome/overworld/FlowerMeadowBiome.java @@ -8,21 +8,13 @@ package biomesoplenty.common.biome.overworld; import biomesoplenty.api.biome.BOPBiomes; -import biomesoplenty.api.block.BOPBlocks; import biomesoplenty.common.biome.BiomeTemplate; -import biomesoplenty.common.world.biome.BiomeFeatureHelper; import biomesoplenty.common.world.gen.feature.BOPConfiguredFeatures; -import biomesoplenty.common.world.gen.feature.BOPFeatures; -import com.google.common.collect.ImmutableList; -import net.minecraft.block.Blocks; import net.minecraft.entity.EntityClassification; import net.minecraft.entity.EntityType; import net.minecraft.world.biome.*; 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.placement.AtSurfaceWithExtraConfig; -import net.minecraft.world.gen.placement.Placement; import net.minecraft.world.gen.surfacebuilders.ConfiguredSurfaceBuilder; import net.minecraft.world.gen.surfacebuilders.SurfaceBuilder; @@ -42,7 +34,7 @@ public class FlowerMeadowBiome extends BiomeTemplate } @Override - protected void configureGeneration(BiomeGenerationSettingsRegistryBuilder builder) + protected void configureGeneration(BiomeGenerationSettings.Builder builder) { builder.surfaceBuilder(new ConfiguredSurfaceBuilder(SurfaceBuilder.DEFAULT, SurfaceBuilder.CONFIG_GRASS)); diff --git a/src/main/java/biomesoplenty/common/biome/overworld/FungalJungleBiome.java b/src/main/java/biomesoplenty/common/biome/overworld/FungalJungleBiome.java index 54491c629..12a0e7a9d 100644 --- a/src/main/java/biomesoplenty/common/biome/overworld/FungalJungleBiome.java +++ b/src/main/java/biomesoplenty/common/biome/overworld/FungalJungleBiome.java @@ -7,21 +7,15 @@ ******************************************************************************/ package biomesoplenty.common.biome.overworld; -import biomesoplenty.api.block.BOPBlocks; import biomesoplenty.api.enums.BOPClimates; import biomesoplenty.common.biome.BiomeTemplate; -import biomesoplenty.common.world.biome.BiomeFeatureHelper; import biomesoplenty.common.world.gen.feature.BOPConfiguredFeatures; -import biomesoplenty.common.world.gen.feature.BOPFeatures; -import net.minecraft.block.Blocks; import net.minecraft.entity.EntityClassification; import net.minecraft.entity.EntityType; import net.minecraft.world.biome.*; 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.placement.AtSurfaceWithExtraConfig; -import net.minecraft.world.gen.placement.Placement; import net.minecraft.world.gen.surfacebuilders.ConfiguredSurfaceBuilder; import net.minecraft.world.gen.surfacebuilders.SurfaceBuilder; @@ -43,7 +37,7 @@ public class FungalJungleBiome extends BiomeTemplate } @Override - protected void configureGeneration(BiomeGenerationSettingsRegistryBuilder builder) + protected void configureGeneration(BiomeGenerationSettings.Builder builder) { builder.surfaceBuilder(new ConfiguredSurfaceBuilder(SurfaceBuilder.DEFAULT, SurfaceBuilder.CONFIG_GRASS)); diff --git a/src/main/java/biomesoplenty/common/biome/overworld/GrasslandBiome.java b/src/main/java/biomesoplenty/common/biome/overworld/GrasslandBiome.java index b5ead6bfc..44a6fbb63 100644 --- a/src/main/java/biomesoplenty/common/biome/overworld/GrasslandBiome.java +++ b/src/main/java/biomesoplenty/common/biome/overworld/GrasslandBiome.java @@ -11,14 +11,11 @@ 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.feature.BOPFeatures; import net.minecraft.entity.EntityClassification; import net.minecraft.entity.EntityType; import net.minecraft.world.biome.*; import net.minecraft.world.gen.GenerationStage; -import net.minecraft.world.gen.feature.Feature; import net.minecraft.world.gen.feature.Features; -import net.minecraft.world.gen.feature.IFeatureConfig; import net.minecraft.world.gen.feature.structure.StructureFeatures; import net.minecraft.world.gen.surfacebuilders.ConfiguredSurfaceBuilder; import net.minecraft.world.gen.surfacebuilders.SurfaceBuilder; @@ -40,7 +37,7 @@ public class GrasslandBiome extends BiomeTemplate } @Override - protected void configureGeneration(BiomeGenerationSettingsRegistryBuilder builder) + protected void configureGeneration(BiomeGenerationSettings.Builder builder) { builder.surfaceBuilder(new ConfiguredSurfaceBuilder(SurfaceBuilder.DEFAULT, SurfaceBuilder.CONFIG_GRASS)); diff --git a/src/main/java/biomesoplenty/common/biome/overworld/GravelBeachBiome.java b/src/main/java/biomesoplenty/common/biome/overworld/GravelBeachBiome.java index 1fe2e9959..97b1dbb82 100644 --- a/src/main/java/biomesoplenty/common/biome/overworld/GravelBeachBiome.java +++ b/src/main/java/biomesoplenty/common/biome/overworld/GravelBeachBiome.java @@ -31,7 +31,7 @@ public class GravelBeachBiome extends BiomeTemplate } @Override - protected void configureGeneration(BiomeGenerationSettingsRegistryBuilder builder) + protected void configureGeneration(BiomeGenerationSettings.Builder builder) { builder.surfaceBuilder(new ConfiguredSurfaceBuilder(SurfaceBuilder.DEFAULT, SurfaceBuilder.CONFIG_GRAVEL)); diff --git a/src/main/java/biomesoplenty/common/biome/overworld/GroveBiome.java b/src/main/java/biomesoplenty/common/biome/overworld/GroveBiome.java index ea7345c9a..2edc076fe 100644 --- a/src/main/java/biomesoplenty/common/biome/overworld/GroveBiome.java +++ b/src/main/java/biomesoplenty/common/biome/overworld/GroveBiome.java @@ -7,23 +7,16 @@ ******************************************************************************/ package biomesoplenty.common.biome.overworld; -import biomesoplenty.api.block.BOPBlocks; import biomesoplenty.api.enums.BOPClimates; import biomesoplenty.common.biome.BiomeTemplate; -import biomesoplenty.common.world.biome.BiomeFeatureHelper; import biomesoplenty.common.world.gen.feature.BOPConfiguredFeatures; -import biomesoplenty.common.world.gen.feature.BOPFeatures; import biomesoplenty.common.world.gen.surfacebuilders.BOPSurfaceBuilders; -import com.google.common.collect.ImmutableList; -import net.minecraft.block.Blocks; import net.minecraft.entity.EntityClassification; import net.minecraft.entity.EntityType; import net.minecraft.world.biome.*; 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.placement.AtSurfaceWithExtraConfig; -import net.minecraft.world.gen.placement.Placement; import net.minecraft.world.gen.surfacebuilders.ConfiguredSurfaceBuilder; import net.minecraft.world.gen.surfacebuilders.SurfaceBuilder; @@ -44,7 +37,7 @@ public class GroveBiome extends BiomeTemplate } @Override - protected void configureGeneration(BiomeGenerationSettingsRegistryBuilder builder) + protected void configureGeneration(BiomeGenerationSettings.Builder builder) { builder.surfaceBuilder(new ConfiguredSurfaceBuilder(BOPSurfaceBuilders.PODZOL, SurfaceBuilder.CONFIG_GRASS)); diff --git a/src/main/java/biomesoplenty/common/biome/overworld/HighlandBiome.java b/src/main/java/biomesoplenty/common/biome/overworld/HighlandBiome.java index 2c1ac69e2..c1cd34338 100644 --- a/src/main/java/biomesoplenty/common/biome/overworld/HighlandBiome.java +++ b/src/main/java/biomesoplenty/common/biome/overworld/HighlandBiome.java @@ -9,17 +9,11 @@ package biomesoplenty.common.biome.overworld; import biomesoplenty.api.enums.BOPClimates; import biomesoplenty.common.biome.BiomeTemplate; -import biomesoplenty.common.world.biome.BiomeFeatureHelper; import biomesoplenty.common.world.gen.feature.BOPConfiguredFeatures; -import biomesoplenty.common.world.gen.feature.BOPFeatures; -import net.minecraft.block.Blocks; import net.minecraft.entity.EntityClassification; import net.minecraft.entity.EntityType; import net.minecraft.world.biome.*; import net.minecraft.world.gen.GenerationStage; -import net.minecraft.world.gen.feature.Feature; -import net.minecraft.world.gen.feature.Features; -import net.minecraft.world.gen.feature.IFeatureConfig; import net.minecraft.world.gen.feature.structure.StructureFeatures; import net.minecraft.world.gen.surfacebuilders.ConfiguredSurfaceBuilder; import net.minecraft.world.gen.surfacebuilders.SurfaceBuilder; @@ -41,7 +35,7 @@ public class HighlandBiome extends BiomeTemplate } @Override - protected void configureGeneration(BiomeGenerationSettingsRegistryBuilder builder) + protected void configureGeneration(BiomeGenerationSettings.Builder builder) { builder.surfaceBuilder(new ConfiguredSurfaceBuilder(SurfaceBuilder.DEFAULT, SurfaceBuilder.CONFIG_GRASS)); diff --git a/src/main/java/biomesoplenty/common/biome/overworld/HighlandMoorBiome.java b/src/main/java/biomesoplenty/common/biome/overworld/HighlandMoorBiome.java index 9ce44e196..aff1936dc 100644 --- a/src/main/java/biomesoplenty/common/biome/overworld/HighlandMoorBiome.java +++ b/src/main/java/biomesoplenty/common/biome/overworld/HighlandMoorBiome.java @@ -8,18 +8,13 @@ package biomesoplenty.common.biome.overworld; import biomesoplenty.common.biome.BiomeTemplate; -import biomesoplenty.common.world.biome.BiomeFeatureHelper; import biomesoplenty.common.world.gen.feature.BOPConfiguredFeatures; -import biomesoplenty.common.world.gen.feature.BOPFeatures; -import net.minecraft.block.Blocks; import net.minecraft.entity.EntityClassification; import net.minecraft.entity.EntityType; import net.minecraft.world.biome.*; 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.placement.ChanceConfig; -import net.minecraft.world.gen.placement.Placement; import net.minecraft.world.gen.surfacebuilders.ConfiguredSurfaceBuilder; import net.minecraft.world.gen.surfacebuilders.SurfaceBuilder; @@ -39,7 +34,7 @@ public class HighlandMoorBiome extends BiomeTemplate } @Override - protected void configureGeneration(BiomeGenerationSettingsRegistryBuilder builder) + protected void configureGeneration(BiomeGenerationSettings.Builder builder) { builder.surfaceBuilder(new ConfiguredSurfaceBuilder(SurfaceBuilder.DEFAULT, SurfaceBuilder.CONFIG_GRASS)); diff --git a/src/main/java/biomesoplenty/common/biome/overworld/LavenderFieldBiome.java b/src/main/java/biomesoplenty/common/biome/overworld/LavenderFieldBiome.java index fb30a5785..cb1144521 100644 --- a/src/main/java/biomesoplenty/common/biome/overworld/LavenderFieldBiome.java +++ b/src/main/java/biomesoplenty/common/biome/overworld/LavenderFieldBiome.java @@ -9,18 +9,13 @@ package biomesoplenty.common.biome.overworld; import biomesoplenty.api.enums.BOPClimates; import biomesoplenty.common.biome.BiomeTemplate; -import biomesoplenty.common.util.biome.FeatureUtil; import biomesoplenty.common.world.gen.feature.BOPConfiguredFeatures; -import biomesoplenty.common.world.gen.feature.BOPFeatures; -import com.google.common.collect.ImmutableList; import net.minecraft.entity.EntityClassification; import net.minecraft.entity.EntityType; import net.minecraft.world.biome.*; 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.placement.AtSurfaceWithExtraConfig; -import net.minecraft.world.gen.placement.Placement; import net.minecraft.world.gen.surfacebuilders.ConfiguredSurfaceBuilder; import net.minecraft.world.gen.surfacebuilders.SurfaceBuilder; @@ -40,7 +35,7 @@ public class LavenderFieldBiome extends BiomeTemplate } @Override - protected void configureGeneration(BiomeGenerationSettingsRegistryBuilder builder) + protected void configureGeneration(BiomeGenerationSettings.Builder builder) { builder.surfaceBuilder(new ConfiguredSurfaceBuilder(SurfaceBuilder.DEFAULT, SurfaceBuilder.CONFIG_GRASS)); diff --git a/src/main/java/biomesoplenty/common/biome/overworld/LushGrasslandBiome.java b/src/main/java/biomesoplenty/common/biome/overworld/LushGrasslandBiome.java index b892e9fe0..fac8be698 100644 --- a/src/main/java/biomesoplenty/common/biome/overworld/LushGrasslandBiome.java +++ b/src/main/java/biomesoplenty/common/biome/overworld/LushGrasslandBiome.java @@ -8,23 +8,15 @@ package biomesoplenty.common.biome.overworld; import biomesoplenty.api.biome.BOPBiomes; -import biomesoplenty.api.block.BOPBlocks; import biomesoplenty.api.enums.BOPClimates; import biomesoplenty.common.biome.BiomeTemplate; -import biomesoplenty.common.world.biome.BiomeFeatureHelper; import biomesoplenty.common.world.gen.feature.BOPConfiguredFeatures; -import biomesoplenty.common.world.gen.feature.BOPFeatures; -import com.google.common.collect.ImmutableList; -import net.minecraft.block.Blocks; import net.minecraft.entity.EntityClassification; import net.minecraft.entity.EntityType; import net.minecraft.world.biome.*; import net.minecraft.world.gen.GenerationStage; -import net.minecraft.world.gen.blockplacer.SimpleBlockPlacer; -import net.minecraft.world.gen.blockstateprovider.SimpleBlockStateProvider; import net.minecraft.world.gen.feature.*; import net.minecraft.world.gen.feature.structure.StructureFeatures; -import net.minecraft.world.gen.placement.*; import net.minecraft.world.gen.surfacebuilders.ConfiguredSurfaceBuilder; import net.minecraft.world.gen.surfacebuilders.SurfaceBuilder; @@ -45,7 +37,7 @@ public class LushGrasslandBiome extends BiomeTemplate } @Override - protected void configureGeneration(BiomeGenerationSettingsRegistryBuilder builder) + protected void configureGeneration(BiomeGenerationSettings.Builder builder) { builder.surfaceBuilder(new ConfiguredSurfaceBuilder(SurfaceBuilder.DEFAULT, SurfaceBuilder.CONFIG_GRASS)); diff --git a/src/main/java/biomesoplenty/common/biome/overworld/LushSwampBiome.java b/src/main/java/biomesoplenty/common/biome/overworld/LushSwampBiome.java index 244ac90ef..4d2992a34 100644 --- a/src/main/java/biomesoplenty/common/biome/overworld/LushSwampBiome.java +++ b/src/main/java/biomesoplenty/common/biome/overworld/LushSwampBiome.java @@ -7,22 +7,15 @@ ******************************************************************************/ package biomesoplenty.common.biome.overworld; -import biomesoplenty.api.block.BOPBlocks; import biomesoplenty.api.enums.BOPClimates; import biomesoplenty.common.biome.BiomeTemplate; -import biomesoplenty.common.world.biome.BiomeFeatureHelper; import biomesoplenty.common.world.gen.feature.BOPConfiguredFeatures; -import biomesoplenty.common.world.gen.feature.BOPFeatures; -import net.minecraft.block.Blocks; import net.minecraft.entity.EntityClassification; import net.minecraft.entity.EntityType; import net.minecraft.world.biome.*; import net.minecraft.world.gen.GenerationStage; -import net.minecraft.world.gen.blockplacer.SimpleBlockPlacer; -import net.minecraft.world.gen.blockstateprovider.SimpleBlockStateProvider; import net.minecraft.world.gen.feature.*; import net.minecraft.world.gen.feature.structure.StructureFeatures; -import net.minecraft.world.gen.placement.*; import net.minecraft.world.gen.surfacebuilders.ConfiguredSurfaceBuilder; import net.minecraft.world.gen.surfacebuilders.SurfaceBuilder; @@ -43,7 +36,7 @@ public class LushSwampBiome extends BiomeTemplate } @Override - protected void configureGeneration(BiomeGenerationSettingsRegistryBuilder builder) + protected void configureGeneration(BiomeGenerationSettings.Builder builder) { builder.surfaceBuilder(new ConfiguredSurfaceBuilder(SurfaceBuilder.DEFAULT, SurfaceBuilder.CONFIG_GRASS)); diff --git a/src/main/java/biomesoplenty/common/biome/overworld/MangroveBiome.java b/src/main/java/biomesoplenty/common/biome/overworld/MangroveBiome.java index 79543b49b..ad87241b4 100644 --- a/src/main/java/biomesoplenty/common/biome/overworld/MangroveBiome.java +++ b/src/main/java/biomesoplenty/common/biome/overworld/MangroveBiome.java @@ -7,22 +7,16 @@ ******************************************************************************/ package biomesoplenty.common.biome.overworld; -import biomesoplenty.api.block.BOPBlocks; import biomesoplenty.api.enums.BOPClimates; import biomesoplenty.common.biome.BiomeTemplate; -import biomesoplenty.common.world.biome.BiomeFeatureHelper; import biomesoplenty.common.world.gen.feature.BOPConfiguredFeatures; -import biomesoplenty.common.world.gen.feature.BOPFeatures; import biomesoplenty.common.world.gen.surfacebuilders.BOPSurfaceBuilders; -import com.google.common.collect.ImmutableList; -import net.minecraft.block.Blocks; import net.minecraft.entity.EntityClassification; import net.minecraft.entity.EntityType; import net.minecraft.world.biome.*; 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.placement.*; import net.minecraft.world.gen.surfacebuilders.ConfiguredSurfaceBuilder; import net.minecraft.world.gen.surfacebuilders.SurfaceBuilder; @@ -43,7 +37,7 @@ public class MangroveBiome extends BiomeTemplate } @Override - protected void configureGeneration(BiomeGenerationSettingsRegistryBuilder builder) + protected void configureGeneration(BiomeGenerationSettings.Builder builder) { builder.surfaceBuilder(new ConfiguredSurfaceBuilder(BOPSurfaceBuilders.MANGROVE, SurfaceBuilder.CONFIG_GRASS)); diff --git a/src/main/java/biomesoplenty/common/biome/overworld/MapleWoodsBiome.java b/src/main/java/biomesoplenty/common/biome/overworld/MapleWoodsBiome.java index 6f1b6065b..0c0a3d385 100644 --- a/src/main/java/biomesoplenty/common/biome/overworld/MapleWoodsBiome.java +++ b/src/main/java/biomesoplenty/common/biome/overworld/MapleWoodsBiome.java @@ -11,16 +11,12 @@ 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.feature.BOPFeatures; -import com.google.common.collect.ImmutableList; import net.minecraft.entity.EntityClassification; import net.minecraft.entity.EntityType; import net.minecraft.world.biome.*; 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.placement.AtSurfaceWithExtraConfig; -import net.minecraft.world.gen.placement.Placement; import net.minecraft.world.gen.surfacebuilders.ConfiguredSurfaceBuilder; import net.minecraft.world.gen.surfacebuilders.SurfaceBuilder; @@ -41,7 +37,7 @@ public class MapleWoodsBiome extends BiomeTemplate } @Override - protected void configureGeneration(BiomeGenerationSettingsRegistryBuilder builder) + protected void configureGeneration(BiomeGenerationSettings.Builder builder) { builder.surfaceBuilder(new ConfiguredSurfaceBuilder(SurfaceBuilder.DEFAULT, SurfaceBuilder.CONFIG_GRASS)); diff --git a/src/main/java/biomesoplenty/common/biome/overworld/MarshBiome.java b/src/main/java/biomesoplenty/common/biome/overworld/MarshBiome.java index 073c96a0d..7e9467389 100644 --- a/src/main/java/biomesoplenty/common/biome/overworld/MarshBiome.java +++ b/src/main/java/biomesoplenty/common/biome/overworld/MarshBiome.java @@ -7,22 +7,16 @@ ******************************************************************************/ package biomesoplenty.common.biome.overworld; -import biomesoplenty.api.block.BOPBlocks; import biomesoplenty.api.enums.BOPClimates; import biomesoplenty.common.biome.BiomeTemplate; -import biomesoplenty.common.world.biome.BiomeFeatureHelper; import biomesoplenty.common.world.gen.feature.BOPConfiguredFeatures; -import biomesoplenty.common.world.gen.feature.BOPFeatures; import biomesoplenty.common.world.gen.surfacebuilders.BOPSurfaceBuilders; -import net.minecraft.block.Blocks; import net.minecraft.entity.EntityClassification; import net.minecraft.entity.EntityType; import net.minecraft.world.biome.*; 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.placement.ChanceConfig; -import net.minecraft.world.gen.placement.Placement; import net.minecraft.world.gen.surfacebuilders.ConfiguredSurfaceBuilder; import net.minecraft.world.gen.surfacebuilders.SurfaceBuilder; @@ -43,7 +37,7 @@ public class MarshBiome extends BiomeTemplate } @Override - protected void configureGeneration(BiomeGenerationSettingsRegistryBuilder builder) + protected void configureGeneration(BiomeGenerationSettings.Builder builder) { builder.surfaceBuilder(new ConfiguredSurfaceBuilder(BOPSurfaceBuilders.MARSH, SurfaceBuilder.CONFIG_GRASS)); diff --git a/src/main/java/biomesoplenty/common/biome/overworld/MeadowBiome.java b/src/main/java/biomesoplenty/common/biome/overworld/MeadowBiome.java index 270f44909..fc91787bb 100644 --- a/src/main/java/biomesoplenty/common/biome/overworld/MeadowBiome.java +++ b/src/main/java/biomesoplenty/common/biome/overworld/MeadowBiome.java @@ -8,22 +8,15 @@ package biomesoplenty.common.biome.overworld; import biomesoplenty.api.biome.BOPBiomes; -import biomesoplenty.api.block.BOPBlocks; import biomesoplenty.api.enums.BOPClimates; import biomesoplenty.common.biome.BiomeTemplate; -import biomesoplenty.common.world.biome.BiomeFeatureHelper; import biomesoplenty.common.world.gen.feature.BOPConfiguredFeatures; -import biomesoplenty.common.world.gen.feature.BOPFeatures; -import com.google.common.collect.ImmutableList; -import net.minecraft.block.Blocks; import net.minecraft.entity.EntityClassification; import net.minecraft.entity.EntityType; import net.minecraft.world.biome.*; 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.placement.AtSurfaceWithExtraConfig; -import net.minecraft.world.gen.placement.Placement; import net.minecraft.world.gen.surfacebuilders.ConfiguredSurfaceBuilder; import net.minecraft.world.gen.surfacebuilders.SurfaceBuilder; @@ -44,7 +37,7 @@ public class MeadowBiome extends BiomeTemplate } @Override - protected void configureGeneration(BiomeGenerationSettingsRegistryBuilder builder) + protected void configureGeneration(BiomeGenerationSettings.Builder builder) { builder.surfaceBuilder(new ConfiguredSurfaceBuilder(SurfaceBuilder.DEFAULT, SurfaceBuilder.CONFIG_GRASS)); diff --git a/src/main/java/biomesoplenty/common/biome/overworld/MireBiome.java b/src/main/java/biomesoplenty/common/biome/overworld/MireBiome.java index 93693e3b5..f730df302 100644 --- a/src/main/java/biomesoplenty/common/biome/overworld/MireBiome.java +++ b/src/main/java/biomesoplenty/common/biome/overworld/MireBiome.java @@ -7,24 +7,16 @@ ******************************************************************************/ package biomesoplenty.common.biome.overworld; -import biomesoplenty.api.block.BOPBlocks; import biomesoplenty.api.enums.BOPClimates; import biomesoplenty.common.biome.BiomeTemplate; -import biomesoplenty.common.world.biome.BiomeFeatureHelper; import biomesoplenty.common.world.gen.feature.BOPConfiguredFeatures; -import biomesoplenty.common.world.gen.feature.BOPFeatures; import biomesoplenty.common.world.gen.surfacebuilders.BOPSurfaceBuilders; -import com.google.common.collect.ImmutableList; -import net.minecraft.block.Blocks; import net.minecraft.entity.EntityClassification; import net.minecraft.entity.EntityType; import net.minecraft.world.biome.*; 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.placement.AtSurfaceWithExtraConfig; -import net.minecraft.world.gen.placement.ChanceConfig; -import net.minecraft.world.gen.placement.Placement; import net.minecraft.world.gen.surfacebuilders.ConfiguredSurfaceBuilder; import net.minecraft.world.gen.surfacebuilders.SurfaceBuilder; @@ -45,7 +37,7 @@ public class MireBiome extends BiomeTemplate } @Override - protected void configureGeneration(BiomeGenerationSettingsRegistryBuilder builder) + protected void configureGeneration(BiomeGenerationSettings.Builder builder) { builder.surfaceBuilder(new ConfiguredSurfaceBuilder(BOPSurfaceBuilders.MUD, SurfaceBuilder.CONFIG_GRASS)); diff --git a/src/main/java/biomesoplenty/common/biome/overworld/MuskegBiome.java b/src/main/java/biomesoplenty/common/biome/overworld/MuskegBiome.java index 6b7215484..3a97c8a29 100644 --- a/src/main/java/biomesoplenty/common/biome/overworld/MuskegBiome.java +++ b/src/main/java/biomesoplenty/common/biome/overworld/MuskegBiome.java @@ -7,24 +7,16 @@ ******************************************************************************/ package biomesoplenty.common.biome.overworld; -import biomesoplenty.api.block.BOPBlocks; import biomesoplenty.api.enums.BOPClimates; import biomesoplenty.common.biome.BiomeTemplate; -import biomesoplenty.common.world.biome.BiomeFeatureHelper; import biomesoplenty.common.world.gen.feature.BOPConfiguredFeatures; -import biomesoplenty.common.world.gen.feature.BOPFeatures; import biomesoplenty.common.world.gen.surfacebuilders.BOPSurfaceBuilders; -import com.google.common.collect.ImmutableList; -import net.minecraft.block.Blocks; import net.minecraft.entity.EntityClassification; import net.minecraft.entity.EntityType; import net.minecraft.world.biome.*; 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.placement.AtSurfaceWithExtraConfig; -import net.minecraft.world.gen.placement.ChanceConfig; -import net.minecraft.world.gen.placement.Placement; import net.minecraft.world.gen.surfacebuilders.ConfiguredSurfaceBuilder; import net.minecraft.world.gen.surfacebuilders.SurfaceBuilder; @@ -45,7 +37,7 @@ public class MuskegBiome extends BiomeTemplate } @Override - protected void configureGeneration(BiomeGenerationSettingsRegistryBuilder builder) + protected void configureGeneration(BiomeGenerationSettings.Builder builder) { builder.surfaceBuilder(new ConfiguredSurfaceBuilder(BOPSurfaceBuilders.PODZOL, SurfaceBuilder.CONFIG_GRASS)); diff --git a/src/main/java/biomesoplenty/common/biome/overworld/MysticGroveBiome.java b/src/main/java/biomesoplenty/common/biome/overworld/MysticGroveBiome.java index e62c7ef2f..74ea5edb5 100644 --- a/src/main/java/biomesoplenty/common/biome/overworld/MysticGroveBiome.java +++ b/src/main/java/biomesoplenty/common/biome/overworld/MysticGroveBiome.java @@ -7,22 +7,15 @@ ******************************************************************************/ package biomesoplenty.common.biome.overworld; -import biomesoplenty.api.block.BOPBlocks; import biomesoplenty.api.enums.BOPClimates; import biomesoplenty.common.biome.BiomeTemplate; -import biomesoplenty.common.world.biome.BiomeFeatureHelper; import biomesoplenty.common.world.gen.feature.BOPConfiguredFeatures; -import biomesoplenty.common.world.gen.feature.BOPFeatures; -import com.google.common.collect.ImmutableList; -import net.minecraft.block.Blocks; import net.minecraft.entity.EntityClassification; import net.minecraft.entity.EntityType; import net.minecraft.world.biome.*; 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.placement.AtSurfaceWithExtraConfig; -import net.minecraft.world.gen.placement.Placement; import net.minecraft.world.gen.surfacebuilders.ConfiguredSurfaceBuilder; import net.minecraft.world.gen.surfacebuilders.SurfaceBuilder; @@ -44,7 +37,7 @@ public class MysticGroveBiome extends BiomeTemplate } @Override - protected void configureGeneration(BiomeGenerationSettingsRegistryBuilder builder) + protected void configureGeneration(BiomeGenerationSettings.Builder builder) { builder.surfaceBuilder(new ConfiguredSurfaceBuilder(SurfaceBuilder.DEFAULT, SurfaceBuilder.CONFIG_GRASS)); diff --git a/src/main/java/biomesoplenty/common/biome/overworld/OasisBiome.java b/src/main/java/biomesoplenty/common/biome/overworld/OasisBiome.java index 5b9ec6ff5..9e475f6c1 100644 --- a/src/main/java/biomesoplenty/common/biome/overworld/OasisBiome.java +++ b/src/main/java/biomesoplenty/common/biome/overworld/OasisBiome.java @@ -7,22 +7,14 @@ ******************************************************************************/ package biomesoplenty.common.biome.overworld; -import biomesoplenty.api.block.BOPBlocks; import biomesoplenty.common.biome.BiomeTemplate; -import biomesoplenty.common.world.biome.BiomeFeatureHelper; import biomesoplenty.common.world.gen.feature.BOPConfiguredFeatures; -import biomesoplenty.common.world.gen.feature.BOPFeatures; -import com.google.common.collect.ImmutableList; import net.minecraft.entity.EntityClassification; import net.minecraft.entity.EntityType; import net.minecraft.world.biome.*; import net.minecraft.world.gen.GenerationStage; -import net.minecraft.world.gen.feature.Feature; import net.minecraft.world.gen.feature.Features; -import net.minecraft.world.gen.feature.MultipleRandomFeatureConfig; import net.minecraft.world.gen.feature.structure.StructureFeatures; -import net.minecraft.world.gen.placement.AtSurfaceWithExtraConfig; -import net.minecraft.world.gen.placement.Placement; import net.minecraft.world.gen.surfacebuilders.ConfiguredSurfaceBuilder; import net.minecraft.world.gen.surfacebuilders.SurfaceBuilder; @@ -39,7 +31,7 @@ public class OasisBiome extends BiomeTemplate } @Override - protected void configureGeneration(BiomeGenerationSettingsRegistryBuilder builder) + protected void configureGeneration(BiomeGenerationSettings.Builder builder) { builder.surfaceBuilder(new ConfiguredSurfaceBuilder(SurfaceBuilder.DEFAULT, SurfaceBuilder.CONFIG_FULL_SAND)); diff --git a/src/main/java/biomesoplenty/common/biome/overworld/OminousWoodsBiome.java b/src/main/java/biomesoplenty/common/biome/overworld/OminousWoodsBiome.java index ebc80adf8..1f36756f5 100644 --- a/src/main/java/biomesoplenty/common/biome/overworld/OminousWoodsBiome.java +++ b/src/main/java/biomesoplenty/common/biome/overworld/OminousWoodsBiome.java @@ -7,22 +7,15 @@ ******************************************************************************/ package biomesoplenty.common.biome.overworld; -import biomesoplenty.api.block.BOPBlocks; import biomesoplenty.api.enums.BOPClimates; import biomesoplenty.common.biome.BiomeTemplate; -import biomesoplenty.common.world.biome.BiomeFeatureHelper; import biomesoplenty.common.world.gen.feature.BOPConfiguredFeatures; -import biomesoplenty.common.world.gen.feature.BOPFeatures; -import com.google.common.collect.ImmutableList; -import net.minecraft.block.Blocks; import net.minecraft.entity.EntityClassification; import net.minecraft.entity.EntityType; import net.minecraft.world.biome.*; 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.placement.AtSurfaceWithExtraConfig; -import net.minecraft.world.gen.placement.Placement; import net.minecraft.world.gen.surfacebuilders.ConfiguredSurfaceBuilder; import net.minecraft.world.gen.surfacebuilders.SurfaceBuilder; @@ -44,7 +37,7 @@ public class OminousWoodsBiome extends BiomeTemplate } @Override - protected void configureGeneration(BiomeGenerationSettingsRegistryBuilder builder) + protected void configureGeneration(BiomeGenerationSettings.Builder builder) { builder.surfaceBuilder(new ConfiguredSurfaceBuilder(SurfaceBuilder.DEFAULT, SurfaceBuilder.CONFIG_GRASS)); diff --git a/src/main/java/biomesoplenty/common/biome/overworld/OrchardBiome.java b/src/main/java/biomesoplenty/common/biome/overworld/OrchardBiome.java index 4f89e2ed2..92a4e550b 100644 --- a/src/main/java/biomesoplenty/common/biome/overworld/OrchardBiome.java +++ b/src/main/java/biomesoplenty/common/biome/overworld/OrchardBiome.java @@ -7,21 +7,14 @@ ******************************************************************************/ package biomesoplenty.common.biome.overworld; -import biomesoplenty.api.block.BOPBlocks; import biomesoplenty.common.biome.BiomeTemplate; -import biomesoplenty.common.world.biome.BiomeFeatureHelper; import biomesoplenty.common.world.gen.feature.BOPConfiguredFeatures; -import biomesoplenty.common.world.gen.feature.BOPFeatures; -import com.google.common.collect.ImmutableList; -import net.minecraft.block.Blocks; import net.minecraft.entity.EntityClassification; import net.minecraft.entity.EntityType; import net.minecraft.world.biome.*; 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.placement.AtSurfaceWithExtraConfig; -import net.minecraft.world.gen.placement.Placement; import net.minecraft.world.gen.surfacebuilders.ConfiguredSurfaceBuilder; import net.minecraft.world.gen.surfacebuilders.SurfaceBuilder; @@ -38,7 +31,7 @@ public class OrchardBiome extends BiomeTemplate } @Override - protected void configureGeneration(BiomeGenerationSettingsRegistryBuilder builder) + protected void configureGeneration(BiomeGenerationSettings.Builder builder) { builder.surfaceBuilder(new ConfiguredSurfaceBuilder(SurfaceBuilder.DEFAULT, SurfaceBuilder.CONFIG_GRASS)); diff --git a/src/main/java/biomesoplenty/common/biome/overworld/OriginHillsBiome.java b/src/main/java/biomesoplenty/common/biome/overworld/OriginHillsBiome.java index 445b3fda0..c59294308 100644 --- a/src/main/java/biomesoplenty/common/biome/overworld/OriginHillsBiome.java +++ b/src/main/java/biomesoplenty/common/biome/overworld/OriginHillsBiome.java @@ -11,15 +11,11 @@ import biomesoplenty.common.biome.BiomeTemplate; import biomesoplenty.common.world.gen.feature.BOPConfiguredFeatures; import biomesoplenty.common.world.gen.feature.BOPFeatures; import biomesoplenty.common.world.gen.surfacebuilders.BOPSurfaceBuilders; -import com.google.common.collect.ImmutableList; -import net.minecraft.block.Blocks; import net.minecraft.entity.EntityClassification; import net.minecraft.entity.EntityType; import net.minecraft.world.biome.*; import net.minecraft.world.gen.GenerationStage; import net.minecraft.world.gen.feature.*; -import net.minecraft.world.gen.placement.AtSurfaceWithExtraConfig; -import net.minecraft.world.gen.placement.Placement; import net.minecraft.world.gen.surfacebuilders.ConfiguredSurfaceBuilder; public class OriginHillsBiome extends BiomeTemplate @@ -39,7 +35,7 @@ public class OriginHillsBiome extends BiomeTemplate } @Override - protected void configureGeneration(BiomeGenerationSettingsRegistryBuilder builder) + protected void configureGeneration(BiomeGenerationSettings.Builder builder) { builder.surfaceBuilder(new ConfiguredSurfaceBuilder(BOPSurfaceBuilders.ORIGIN_HILLS, BOPSurfaceBuilders.ORIGIN_GRASS_SURFACE)); diff --git a/src/main/java/biomesoplenty/common/biome/overworld/OutbackBiome.java b/src/main/java/biomesoplenty/common/biome/overworld/OutbackBiome.java index 534de6db8..f7f8fd64c 100644 --- a/src/main/java/biomesoplenty/common/biome/overworld/OutbackBiome.java +++ b/src/main/java/biomesoplenty/common/biome/overworld/OutbackBiome.java @@ -7,24 +7,16 @@ ******************************************************************************/ package biomesoplenty.common.biome.overworld; -import biomesoplenty.api.block.BOPBlocks; import biomesoplenty.api.enums.BOPClimates; import biomesoplenty.common.biome.BiomeTemplate; -import biomesoplenty.common.world.biome.BiomeFeatureHelper; import biomesoplenty.common.world.gen.feature.BOPConfiguredFeatures; -import biomesoplenty.common.world.gen.feature.BOPFeatures; import biomesoplenty.common.world.gen.surfacebuilders.BOPSurfaceBuilders; -import com.google.common.collect.ImmutableList; import net.minecraft.entity.EntityClassification; import net.minecraft.entity.EntityType; import net.minecraft.world.biome.*; import net.minecraft.world.gen.GenerationStage; -import net.minecraft.world.gen.feature.Feature; import net.minecraft.world.gen.feature.Features; -import net.minecraft.world.gen.feature.MultipleRandomFeatureConfig; import net.minecraft.world.gen.feature.structure.StructureFeatures; -import net.minecraft.world.gen.placement.AtSurfaceWithExtraConfig; -import net.minecraft.world.gen.placement.Placement; import net.minecraft.world.gen.surfacebuilders.ConfiguredSurfaceBuilder; import net.minecraft.world.gen.surfacebuilders.SurfaceBuilder; @@ -44,7 +36,7 @@ public class OutbackBiome extends BiomeTemplate } @Override - protected void configureGeneration(BiomeGenerationSettingsRegistryBuilder builder) + protected void configureGeneration(BiomeGenerationSettings.Builder builder) { builder.surfaceBuilder(new ConfiguredSurfaceBuilder(SurfaceBuilder.DEFAULT, BOPSurfaceBuilders.RED_SAND_SURFACE)); diff --git a/src/main/java/biomesoplenty/common/biome/overworld/OvergrownCliffsBiome.java b/src/main/java/biomesoplenty/common/biome/overworld/OvergrownCliffsBiome.java index 576686079..0cbf53b9e 100644 --- a/src/main/java/biomesoplenty/common/biome/overworld/OvergrownCliffsBiome.java +++ b/src/main/java/biomesoplenty/common/biome/overworld/OvergrownCliffsBiome.java @@ -7,23 +7,16 @@ ******************************************************************************/ package biomesoplenty.common.biome.overworld; -import biomesoplenty.api.block.BOPBlocks; import biomesoplenty.api.enums.BOPClimates; import biomesoplenty.common.biome.BiomeTemplate; -import biomesoplenty.common.world.biome.BiomeFeatureHelper; import biomesoplenty.common.world.gen.feature.BOPConfiguredFeatures; -import biomesoplenty.common.world.gen.feature.BOPFeatures; import biomesoplenty.common.world.gen.surfacebuilders.BOPSurfaceBuilders; -import com.google.common.collect.ImmutableList; -import net.minecraft.block.Blocks; import net.minecraft.entity.EntityClassification; import net.minecraft.entity.EntityType; import net.minecraft.world.biome.*; 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.placement.AtSurfaceWithExtraConfig; -import net.minecraft.world.gen.placement.Placement; import net.minecraft.world.gen.surfacebuilders.ConfiguredSurfaceBuilder; import net.minecraft.world.gen.surfacebuilders.SurfaceBuilder; @@ -44,7 +37,7 @@ public class OvergrownCliffsBiome extends BiomeTemplate } @Override - protected void configureGeneration(BiomeGenerationSettingsRegistryBuilder builder) + protected void configureGeneration(BiomeGenerationSettings.Builder builder) { builder.surfaceBuilder(new ConfiguredSurfaceBuilder(BOPSurfaceBuilders.TERRACOTTA, SurfaceBuilder.CONFIG_GRASS)); diff --git a/src/main/java/biomesoplenty/common/biome/overworld/PastureBiome.java b/src/main/java/biomesoplenty/common/biome/overworld/PastureBiome.java index 67c2738b3..dd8b309aa 100644 --- a/src/main/java/biomesoplenty/common/biome/overworld/PastureBiome.java +++ b/src/main/java/biomesoplenty/common/biome/overworld/PastureBiome.java @@ -7,19 +7,12 @@ ******************************************************************************/ package biomesoplenty.common.biome.overworld; -import biomesoplenty.api.block.BOPBlocks; import biomesoplenty.common.biome.BiomeTemplate; -import biomesoplenty.common.world.biome.BiomeFeatureHelper; import biomesoplenty.common.world.gen.feature.BOPConfiguredFeatures; -import biomesoplenty.common.world.gen.feature.BOPFeatures; -import net.minecraft.block.Blocks; import net.minecraft.entity.EntityClassification; import net.minecraft.entity.EntityType; import net.minecraft.world.biome.*; import net.minecraft.world.gen.GenerationStage; -import net.minecraft.world.gen.feature.Feature; -import net.minecraft.world.gen.feature.Features; -import net.minecraft.world.gen.feature.IFeatureConfig; import net.minecraft.world.gen.feature.structure.StructureFeatures; import net.minecraft.world.gen.surfacebuilders.ConfiguredSurfaceBuilder; import net.minecraft.world.gen.surfacebuilders.SurfaceBuilder; @@ -37,7 +30,7 @@ public class PastureBiome extends BiomeTemplate } @Override - protected void configureGeneration(BiomeGenerationSettingsRegistryBuilder builder) + protected void configureGeneration(BiomeGenerationSettings.Builder builder) { builder.surfaceBuilder(new ConfiguredSurfaceBuilder(SurfaceBuilder.DEFAULT, SurfaceBuilder.CONFIG_GRASS)); diff --git a/src/main/java/biomesoplenty/common/biome/overworld/PoppyFieldBiome.java b/src/main/java/biomesoplenty/common/biome/overworld/PoppyFieldBiome.java index e173d4093..81758e736 100644 --- a/src/main/java/biomesoplenty/common/biome/overworld/PoppyFieldBiome.java +++ b/src/main/java/biomesoplenty/common/biome/overworld/PoppyFieldBiome.java @@ -7,21 +7,15 @@ ******************************************************************************/ package biomesoplenty.common.biome.overworld; -import biomesoplenty.api.block.BOPBlocks; import biomesoplenty.api.enums.BOPClimates; import biomesoplenty.common.biome.BiomeTemplate; -import biomesoplenty.common.world.biome.BiomeFeatureHelper; import biomesoplenty.common.world.gen.feature.BOPConfiguredFeatures; -import biomesoplenty.common.world.gen.feature.BOPFeatures; import biomesoplenty.common.world.gen.surfacebuilders.BOPSurfaceBuilders; -import net.minecraft.block.Blocks; import net.minecraft.entity.EntityClassification; import net.minecraft.entity.EntityType; import net.minecraft.world.biome.*; import net.minecraft.world.gen.GenerationStage; -import net.minecraft.world.gen.feature.Feature; import net.minecraft.world.gen.feature.Features; -import net.minecraft.world.gen.feature.IFeatureConfig; import net.minecraft.world.gen.feature.structure.StructureFeatures; import net.minecraft.world.gen.surfacebuilders.ConfiguredSurfaceBuilder; import net.minecraft.world.gen.surfacebuilders.SurfaceBuilder; @@ -42,7 +36,7 @@ public class PoppyFieldBiome extends BiomeTemplate } @Override - protected void configureGeneration(BiomeGenerationSettingsRegistryBuilder builder) + protected void configureGeneration(BiomeGenerationSettings.Builder builder) { builder.surfaceBuilder(new ConfiguredSurfaceBuilder(BOPSurfaceBuilders.POPPY_FIELD, SurfaceBuilder.CONFIG_GRASS)); diff --git a/src/main/java/biomesoplenty/common/biome/overworld/PrairieBiome.java b/src/main/java/biomesoplenty/common/biome/overworld/PrairieBiome.java index af5b4072a..4c77f862a 100644 --- a/src/main/java/biomesoplenty/common/biome/overworld/PrairieBiome.java +++ b/src/main/java/biomesoplenty/common/biome/overworld/PrairieBiome.java @@ -7,21 +7,14 @@ ******************************************************************************/ package biomesoplenty.common.biome.overworld; -import biomesoplenty.api.block.BOPBlocks; import biomesoplenty.api.enums.BOPClimates; import biomesoplenty.common.biome.BiomeTemplate; -import biomesoplenty.common.world.biome.BiomeFeatureHelper; import biomesoplenty.common.world.gen.feature.BOPConfiguredFeatures; -import biomesoplenty.common.world.gen.feature.BOPFeatures; -import com.google.common.collect.ImmutableList; import net.minecraft.entity.EntityClassification; import net.minecraft.entity.EntityType; import net.minecraft.world.biome.*; 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.placement.AtSurfaceWithExtraConfig; -import net.minecraft.world.gen.placement.Placement; import net.minecraft.world.gen.surfacebuilders.ConfiguredSurfaceBuilder; import net.minecraft.world.gen.surfacebuilders.SurfaceBuilder; @@ -41,7 +34,7 @@ public class PrairieBiome extends BiomeTemplate } @Override - protected void configureGeneration(BiomeGenerationSettingsRegistryBuilder builder) + protected void configureGeneration(BiomeGenerationSettings.Builder builder) { builder.surfaceBuilder(new ConfiguredSurfaceBuilder(SurfaceBuilder.DEFAULT, SurfaceBuilder.CONFIG_GRASS)); diff --git a/src/main/java/biomesoplenty/common/biome/overworld/PumpkinPatchBiome.java b/src/main/java/biomesoplenty/common/biome/overworld/PumpkinPatchBiome.java index f22ce7a4c..87ce04b49 100644 --- a/src/main/java/biomesoplenty/common/biome/overworld/PumpkinPatchBiome.java +++ b/src/main/java/biomesoplenty/common/biome/overworld/PumpkinPatchBiome.java @@ -8,21 +8,14 @@ package biomesoplenty.common.biome.overworld; import biomesoplenty.api.biome.BOPBiomes; -import biomesoplenty.api.block.BOPBlocks; import biomesoplenty.common.biome.BiomeTemplate; -import biomesoplenty.common.world.biome.BiomeFeatureHelper; import biomesoplenty.common.world.gen.feature.BOPConfiguredFeatures; -import biomesoplenty.common.world.gen.feature.BOPFeatures; -import com.google.common.collect.ImmutableList; -import net.minecraft.block.Blocks; import net.minecraft.entity.EntityClassification; import net.minecraft.entity.EntityType; import net.minecraft.world.biome.*; 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.placement.AtSurfaceWithExtraConfig; -import net.minecraft.world.gen.placement.Placement; import net.minecraft.world.gen.surfacebuilders.ConfiguredSurfaceBuilder; import net.minecraft.world.gen.surfacebuilders.SurfaceBuilder; @@ -42,7 +35,7 @@ public class PumpkinPatchBiome extends BiomeTemplate } @Override - protected void configureGeneration(BiomeGenerationSettingsRegistryBuilder builder) + protected void configureGeneration(BiomeGenerationSettings.Builder builder) { builder.surfaceBuilder(new ConfiguredSurfaceBuilder(SurfaceBuilder.DEFAULT, SurfaceBuilder.CONFIG_GRASS)); diff --git a/src/main/java/biomesoplenty/common/biome/overworld/RainbowValleyBiome.java b/src/main/java/biomesoplenty/common/biome/overworld/RainbowValleyBiome.java index 11ee34fcb..c0c65fc90 100644 --- a/src/main/java/biomesoplenty/common/biome/overworld/RainbowValleyBiome.java +++ b/src/main/java/biomesoplenty/common/biome/overworld/RainbowValleyBiome.java @@ -7,21 +7,14 @@ ******************************************************************************/ package biomesoplenty.common.biome.overworld; -import biomesoplenty.api.block.BOPBlocks; import biomesoplenty.common.biome.BiomeTemplate; -import biomesoplenty.common.world.biome.BiomeFeatureHelper; import biomesoplenty.common.world.gen.feature.BOPConfiguredFeatures; -import biomesoplenty.common.world.gen.feature.BOPFeatures; import biomesoplenty.core.ClientProxy; -import com.google.common.collect.ImmutableList; -import net.minecraft.block.Blocks; import net.minecraft.entity.EntityClassification; import net.minecraft.entity.EntityType; import net.minecraft.world.biome.*; import net.minecraft.world.gen.GenerationStage; import net.minecraft.world.gen.feature.*; -import net.minecraft.world.gen.placement.AtSurfaceWithExtraConfig; -import net.minecraft.world.gen.placement.Placement; import net.minecraft.world.gen.surfacebuilders.ConfiguredSurfaceBuilder; import net.minecraft.world.gen.surfacebuilders.SurfaceBuilder; @@ -42,7 +35,7 @@ public class RainbowValleyBiome extends BiomeTemplate } @Override - protected void configureGeneration(BiomeGenerationSettingsRegistryBuilder builder) + protected void configureGeneration(BiomeGenerationSettings.Builder builder) { builder.surfaceBuilder(new ConfiguredSurfaceBuilder(SurfaceBuilder.DEFAULT, SurfaceBuilder.CONFIG_GRASS)); diff --git a/src/main/java/biomesoplenty/common/biome/overworld/RainforestBiome.java b/src/main/java/biomesoplenty/common/biome/overworld/RainforestBiome.java index 801345107..a2f323918 100644 --- a/src/main/java/biomesoplenty/common/biome/overworld/RainforestBiome.java +++ b/src/main/java/biomesoplenty/common/biome/overworld/RainforestBiome.java @@ -10,19 +10,13 @@ package biomesoplenty.common.biome.overworld; import biomesoplenty.api.biome.BOPBiomes; import biomesoplenty.api.enums.BOPClimates; import biomesoplenty.common.biome.BiomeTemplate; -import biomesoplenty.common.world.biome.BiomeFeatureHelper; import biomesoplenty.common.world.gen.feature.BOPConfiguredFeatures; -import biomesoplenty.common.world.gen.feature.BOPFeatures; -import com.google.common.collect.ImmutableList; -import net.minecraft.block.Blocks; import net.minecraft.entity.EntityClassification; import net.minecraft.entity.EntityType; import net.minecraft.world.biome.*; 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.placement.AtSurfaceWithExtraConfig; -import net.minecraft.world.gen.placement.Placement; import net.minecraft.world.gen.surfacebuilders.ConfiguredSurfaceBuilder; import net.minecraft.world.gen.surfacebuilders.SurfaceBuilder; @@ -43,7 +37,7 @@ public class RainforestBiome extends BiomeTemplate } @Override - protected void configureGeneration(BiomeGenerationSettingsRegistryBuilder builder) + protected void configureGeneration(BiomeGenerationSettings.Builder builder) { builder.surfaceBuilder(new ConfiguredSurfaceBuilder(SurfaceBuilder.DEFAULT, SurfaceBuilder.CONFIG_GRASS)); diff --git a/src/main/java/biomesoplenty/common/biome/overworld/RedwoodForestBiome.java b/src/main/java/biomesoplenty/common/biome/overworld/RedwoodForestBiome.java index 8a3c5071b..28b2d29b0 100644 --- a/src/main/java/biomesoplenty/common/biome/overworld/RedwoodForestBiome.java +++ b/src/main/java/biomesoplenty/common/biome/overworld/RedwoodForestBiome.java @@ -9,18 +9,13 @@ package biomesoplenty.common.biome.overworld; import biomesoplenty.api.enums.BOPClimates; import biomesoplenty.common.biome.BiomeTemplate; -import biomesoplenty.common.world.biome.BiomeFeatureHelper; import biomesoplenty.common.world.gen.feature.BOPConfiguredFeatures; -import biomesoplenty.common.world.gen.feature.BOPFeatures; -import com.google.common.collect.ImmutableList; -import net.minecraft.block.Blocks; import net.minecraft.entity.EntityClassification; import net.minecraft.entity.EntityType; import net.minecraft.world.biome.*; 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.placement.*; import net.minecraft.world.gen.surfacebuilders.ConfiguredSurfaceBuilder; import net.minecraft.world.gen.surfacebuilders.SurfaceBuilder; @@ -40,7 +35,7 @@ public class RedwoodForestBiome extends BiomeTemplate } @Override - protected void configureGeneration(BiomeGenerationSettingsRegistryBuilder builder) + protected void configureGeneration(BiomeGenerationSettings.Builder builder) { builder.surfaceBuilder(new ConfiguredSurfaceBuilder(SurfaceBuilder.DEFAULT, SurfaceBuilder.CONFIG_PODZOL)); diff --git a/src/main/java/biomesoplenty/common/biome/overworld/RedwoodForestEdgeBiome.java b/src/main/java/biomesoplenty/common/biome/overworld/RedwoodForestEdgeBiome.java index 3bbd07f86..2e418c815 100644 --- a/src/main/java/biomesoplenty/common/biome/overworld/RedwoodForestEdgeBiome.java +++ b/src/main/java/biomesoplenty/common/biome/overworld/RedwoodForestEdgeBiome.java @@ -8,19 +8,14 @@ package biomesoplenty.common.biome.overworld; import biomesoplenty.common.biome.BiomeTemplate; -import biomesoplenty.common.world.biome.BiomeFeatureHelper; import biomesoplenty.common.world.gen.feature.BOPConfiguredFeatures; -import biomesoplenty.common.world.gen.feature.BOPFeatures; import biomesoplenty.common.world.gen.surfacebuilders.BOPSurfaceBuilders; -import com.google.common.collect.ImmutableList; -import net.minecraft.block.Blocks; import net.minecraft.entity.EntityClassification; import net.minecraft.entity.EntityType; import net.minecraft.world.biome.*; 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.placement.*; import net.minecraft.world.gen.surfacebuilders.ConfiguredSurfaceBuilder; import net.minecraft.world.gen.surfacebuilders.SurfaceBuilder; @@ -37,7 +32,7 @@ public class RedwoodForestEdgeBiome extends BiomeTemplate } @Override - protected void configureGeneration(BiomeGenerationSettingsRegistryBuilder builder) + protected void configureGeneration(BiomeGenerationSettings.Builder builder) { builder.surfaceBuilder(new ConfiguredSurfaceBuilder(BOPSurfaceBuilders.PODZOL, SurfaceBuilder.CONFIG_PODZOL)); diff --git a/src/main/java/biomesoplenty/common/biome/overworld/ScrublandBiome.java b/src/main/java/biomesoplenty/common/biome/overworld/ScrublandBiome.java index 94a7c3130..b3db9d42d 100644 --- a/src/main/java/biomesoplenty/common/biome/overworld/ScrublandBiome.java +++ b/src/main/java/biomesoplenty/common/biome/overworld/ScrublandBiome.java @@ -9,19 +9,12 @@ package biomesoplenty.common.biome.overworld; import biomesoplenty.api.enums.BOPClimates; import biomesoplenty.common.biome.BiomeTemplate; -import biomesoplenty.common.world.biome.BiomeFeatureHelper; import biomesoplenty.common.world.gen.feature.BOPConfiguredFeatures; -import biomesoplenty.common.world.gen.feature.BOPFeatures; -import com.google.common.collect.ImmutableList; -import net.minecraft.block.Blocks; import net.minecraft.entity.EntityClassification; import net.minecraft.entity.EntityType; import net.minecraft.world.biome.*; 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.placement.AtSurfaceWithExtraConfig; -import net.minecraft.world.gen.placement.Placement; import net.minecraft.world.gen.surfacebuilders.ConfiguredSurfaceBuilder; import net.minecraft.world.gen.surfacebuilders.SurfaceBuilder; @@ -41,7 +34,7 @@ public class ScrublandBiome extends BiomeTemplate } @Override - protected void configureGeneration(BiomeGenerationSettingsRegistryBuilder builder) + protected void configureGeneration(BiomeGenerationSettings.Builder builder) { builder.surfaceBuilder(new ConfiguredSurfaceBuilder(SurfaceBuilder.DEFAULT, SurfaceBuilder.CONFIG_GRASS)); diff --git a/src/main/java/biomesoplenty/common/biome/overworld/SeasonalForestBiome.java b/src/main/java/biomesoplenty/common/biome/overworld/SeasonalForestBiome.java index f897204b6..a704500b9 100644 --- a/src/main/java/biomesoplenty/common/biome/overworld/SeasonalForestBiome.java +++ b/src/main/java/biomesoplenty/common/biome/overworld/SeasonalForestBiome.java @@ -8,22 +8,15 @@ package biomesoplenty.common.biome.overworld; import biomesoplenty.api.biome.BOPBiomes; -import biomesoplenty.api.block.BOPBlocks; import biomesoplenty.api.enums.BOPClimates; import biomesoplenty.common.biome.BiomeTemplate; -import biomesoplenty.common.world.biome.BiomeFeatureHelper; import biomesoplenty.common.world.gen.feature.BOPConfiguredFeatures; -import biomesoplenty.common.world.gen.feature.BOPFeatures; -import com.google.common.collect.ImmutableList; -import net.minecraft.block.Blocks; import net.minecraft.entity.EntityClassification; import net.minecraft.entity.EntityType; import net.minecraft.world.biome.*; 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.placement.AtSurfaceWithExtraConfig; -import net.minecraft.world.gen.placement.Placement; import net.minecraft.world.gen.surfacebuilders.ConfiguredSurfaceBuilder; import net.minecraft.world.gen.surfacebuilders.SurfaceBuilder; @@ -44,7 +37,7 @@ public class SeasonalForestBiome extends BiomeTemplate } @Override - protected void configureGeneration(BiomeGenerationSettingsRegistryBuilder builder) + protected void configureGeneration(BiomeGenerationSettings.Builder builder) { builder.surfaceBuilder(new ConfiguredSurfaceBuilder(SurfaceBuilder.DEFAULT, SurfaceBuilder.CONFIG_GRASS)); diff --git a/src/main/java/biomesoplenty/common/biome/overworld/ShieldBiome.java b/src/main/java/biomesoplenty/common/biome/overworld/ShieldBiome.java index 3bac96331..52a3472c5 100644 --- a/src/main/java/biomesoplenty/common/biome/overworld/ShieldBiome.java +++ b/src/main/java/biomesoplenty/common/biome/overworld/ShieldBiome.java @@ -8,23 +8,16 @@ package biomesoplenty.common.biome.overworld; import biomesoplenty.api.biome.BOPBiomes; -import biomesoplenty.api.block.BOPBlocks; import biomesoplenty.api.enums.BOPClimates; import biomesoplenty.common.biome.BiomeTemplate; -import biomesoplenty.common.world.biome.BiomeFeatureHelper; import biomesoplenty.common.world.gen.feature.BOPConfiguredFeatures; -import biomesoplenty.common.world.gen.feature.BOPFeatures; import biomesoplenty.common.world.gen.surfacebuilders.BOPSurfaceBuilders; -import com.google.common.collect.ImmutableList; -import net.minecraft.block.Blocks; import net.minecraft.entity.EntityClassification; import net.minecraft.entity.EntityType; import net.minecraft.world.biome.*; 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.placement.AtSurfaceWithExtraConfig; -import net.minecraft.world.gen.placement.Placement; import net.minecraft.world.gen.surfacebuilders.ConfiguredSurfaceBuilder; import net.minecraft.world.gen.surfacebuilders.SurfaceBuilder; @@ -45,7 +38,7 @@ public class ShieldBiome extends BiomeTemplate } @Override - protected void configureGeneration(BiomeGenerationSettingsRegistryBuilder builder) + protected void configureGeneration(BiomeGenerationSettings.Builder builder) { builder.surfaceBuilder(new ConfiguredSurfaceBuilder(BOPSurfaceBuilders.CHAPARRAL, SurfaceBuilder.CONFIG_GRASS)); diff --git a/src/main/java/biomesoplenty/common/biome/overworld/ShrublandBiome.java b/src/main/java/biomesoplenty/common/biome/overworld/ShrublandBiome.java index 17d2577c3..355012e1a 100644 --- a/src/main/java/biomesoplenty/common/biome/overworld/ShrublandBiome.java +++ b/src/main/java/biomesoplenty/common/biome/overworld/ShrublandBiome.java @@ -8,23 +8,14 @@ package biomesoplenty.common.biome.overworld; import biomesoplenty.api.biome.BOPBiomes; -import biomesoplenty.api.block.BOPBlocks; import biomesoplenty.api.enums.BOPClimates; import biomesoplenty.common.biome.BiomeTemplate; -import biomesoplenty.common.world.biome.BiomeFeatureHelper; import biomesoplenty.common.world.gen.feature.BOPConfiguredFeatures; -import biomesoplenty.common.world.gen.feature.BOPFeatures; -import net.minecraft.block.Blocks; import net.minecraft.entity.EntityClassification; import net.minecraft.entity.EntityType; import net.minecraft.world.biome.*; import net.minecraft.world.gen.GenerationStage; -import net.minecraft.world.gen.feature.Feature; -import net.minecraft.world.gen.feature.Features; -import net.minecraft.world.gen.feature.IFeatureConfig; import net.minecraft.world.gen.feature.structure.StructureFeatures; -import net.minecraft.world.gen.placement.AtSurfaceWithExtraConfig; -import net.minecraft.world.gen.placement.Placement; import net.minecraft.world.gen.surfacebuilders.ConfiguredSurfaceBuilder; import net.minecraft.world.gen.surfacebuilders.SurfaceBuilder; @@ -45,7 +36,7 @@ public class ShrublandBiome extends BiomeTemplate } @Override - protected void configureGeneration(BiomeGenerationSettingsRegistryBuilder builder) + protected void configureGeneration(BiomeGenerationSettings.Builder builder) { builder.surfaceBuilder(new ConfiguredSurfaceBuilder(SurfaceBuilder.DEFAULT, SurfaceBuilder.CONFIG_GRASS)); diff --git a/src/main/java/biomesoplenty/common/biome/overworld/SilkgladeBiome.java b/src/main/java/biomesoplenty/common/biome/overworld/SilkgladeBiome.java index cdebee0a5..e10a3a3f4 100644 --- a/src/main/java/biomesoplenty/common/biome/overworld/SilkgladeBiome.java +++ b/src/main/java/biomesoplenty/common/biome/overworld/SilkgladeBiome.java @@ -7,23 +7,15 @@ ******************************************************************************/ package biomesoplenty.common.biome.overworld; -import biomesoplenty.api.block.BOPBlocks; import biomesoplenty.api.enums.BOPClimates; import biomesoplenty.common.biome.BiomeTemplate; -import biomesoplenty.common.world.biome.BiomeFeatureHelper; import biomesoplenty.common.world.gen.feature.BOPConfiguredFeatures; -import biomesoplenty.common.world.gen.feature.BOPFeatures; -import biomesoplenty.core.BiomesOPlenty; -import com.google.common.collect.ImmutableList; -import net.minecraft.block.Blocks; import net.minecraft.entity.EntityClassification; import net.minecraft.entity.EntityType; import net.minecraft.world.biome.*; 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.placement.AtSurfaceWithExtraConfig; -import net.minecraft.world.gen.placement.Placement; import net.minecraft.world.gen.surfacebuilders.ConfiguredSurfaceBuilder; import net.minecraft.world.gen.surfacebuilders.SurfaceBuilder; @@ -46,7 +38,7 @@ public class SilkgladeBiome extends BiomeTemplate } @Override - protected void configureGeneration(BiomeGenerationSettingsRegistryBuilder builder) + protected void configureGeneration(BiomeGenerationSettings.Builder builder) { builder.surfaceBuilder(new ConfiguredSurfaceBuilder(SurfaceBuilder.DEFAULT, SurfaceBuilder.CONFIG_GRASS)); diff --git a/src/main/java/biomesoplenty/common/biome/overworld/SnowyConiferousForestBiome.java b/src/main/java/biomesoplenty/common/biome/overworld/SnowyConiferousForestBiome.java index 8350fe705..aeb02710d 100644 --- a/src/main/java/biomesoplenty/common/biome/overworld/SnowyConiferousForestBiome.java +++ b/src/main/java/biomesoplenty/common/biome/overworld/SnowyConiferousForestBiome.java @@ -9,18 +9,13 @@ package biomesoplenty.common.biome.overworld; import biomesoplenty.api.enums.BOPClimates; import biomesoplenty.common.biome.BiomeTemplate; -import biomesoplenty.common.world.biome.BiomeFeatureHelper; import biomesoplenty.common.world.gen.feature.BOPConfiguredFeatures; -import biomesoplenty.common.world.gen.feature.BOPFeatures; -import com.google.common.collect.ImmutableList; -import net.minecraft.block.Blocks; import net.minecraft.entity.EntityClassification; import net.minecraft.entity.EntityType; import net.minecraft.world.biome.*; 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.placement.*; import net.minecraft.world.gen.surfacebuilders.ConfiguredSurfaceBuilder; import net.minecraft.world.gen.surfacebuilders.SurfaceBuilder; @@ -40,7 +35,7 @@ public class SnowyConiferousForestBiome extends BiomeTemplate } @Override - protected void configureGeneration(BiomeGenerationSettingsRegistryBuilder builder) + protected void configureGeneration(BiomeGenerationSettings.Builder builder) { builder.surfaceBuilder(new ConfiguredSurfaceBuilder(SurfaceBuilder.DEFAULT, SurfaceBuilder.CONFIG_GRASS)); diff --git a/src/main/java/biomesoplenty/common/biome/overworld/SnowyFirClearingBiome.java b/src/main/java/biomesoplenty/common/biome/overworld/SnowyFirClearingBiome.java index c8c5f16d1..0a4830cc0 100644 --- a/src/main/java/biomesoplenty/common/biome/overworld/SnowyFirClearingBiome.java +++ b/src/main/java/biomesoplenty/common/biome/overworld/SnowyFirClearingBiome.java @@ -8,17 +8,13 @@ package biomesoplenty.common.biome.overworld; import biomesoplenty.common.biome.BiomeTemplate; -import biomesoplenty.common.world.biome.BiomeFeatureHelper; import biomesoplenty.common.world.gen.feature.BOPConfiguredFeatures; -import biomesoplenty.common.world.gen.feature.BOPFeatures; -import net.minecraft.block.Blocks; import net.minecraft.entity.EntityClassification; import net.minecraft.entity.EntityType; import net.minecraft.world.biome.*; 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.placement.*; import net.minecraft.world.gen.surfacebuilders.ConfiguredSurfaceBuilder; import net.minecraft.world.gen.surfacebuilders.SurfaceBuilder; @@ -35,7 +31,7 @@ public class SnowyFirClearingBiome extends BiomeTemplate } @Override - protected void configureGeneration(BiomeGenerationSettingsRegistryBuilder builder) + protected void configureGeneration(BiomeGenerationSettings.Builder builder) { builder.surfaceBuilder(new ConfiguredSurfaceBuilder(SurfaceBuilder.DEFAULT, SurfaceBuilder.CONFIG_GRASS)); diff --git a/src/main/java/biomesoplenty/common/biome/overworld/SnowyForestBiome.java b/src/main/java/biomesoplenty/common/biome/overworld/SnowyForestBiome.java index dacbb7752..d06b558a5 100644 --- a/src/main/java/biomesoplenty/common/biome/overworld/SnowyForestBiome.java +++ b/src/main/java/biomesoplenty/common/biome/overworld/SnowyForestBiome.java @@ -10,16 +10,12 @@ 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.feature.BOPFeatures; -import com.google.common.collect.ImmutableList; import net.minecraft.entity.EntityClassification; import net.minecraft.entity.EntityType; import net.minecraft.world.biome.*; 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.placement.AtSurfaceWithExtraConfig; -import net.minecraft.world.gen.placement.Placement; import net.minecraft.world.gen.surfacebuilders.ConfiguredSurfaceBuilder; import net.minecraft.world.gen.surfacebuilders.SurfaceBuilder; @@ -39,7 +35,7 @@ public class SnowyForestBiome extends BiomeTemplate } @Override - protected void configureGeneration(BiomeGenerationSettingsRegistryBuilder builder) + protected void configureGeneration(BiomeGenerationSettings.Builder builder) { builder.surfaceBuilder(new ConfiguredSurfaceBuilder(SurfaceBuilder.DEFAULT, SurfaceBuilder.CONFIG_GRASS)); diff --git a/src/main/java/biomesoplenty/common/biome/overworld/SteppeBiome.java b/src/main/java/biomesoplenty/common/biome/overworld/SteppeBiome.java index 4ffd62f6e..1a104cfa2 100644 --- a/src/main/java/biomesoplenty/common/biome/overworld/SteppeBiome.java +++ b/src/main/java/biomesoplenty/common/biome/overworld/SteppeBiome.java @@ -7,20 +7,13 @@ ******************************************************************************/ package biomesoplenty.common.biome.overworld; -import biomesoplenty.api.block.BOPBlocks; import biomesoplenty.api.enums.BOPClimates; import biomesoplenty.common.biome.BiomeTemplate; -import biomesoplenty.common.world.biome.BiomeFeatureHelper; import biomesoplenty.common.world.gen.feature.BOPConfiguredFeatures; -import biomesoplenty.common.world.gen.feature.BOPFeatures; -import net.minecraft.block.Blocks; import net.minecraft.entity.EntityClassification; import net.minecraft.entity.EntityType; import net.minecraft.world.biome.*; import net.minecraft.world.gen.GenerationStage; -import net.minecraft.world.gen.feature.Feature; -import net.minecraft.world.gen.feature.Features; -import net.minecraft.world.gen.feature.IFeatureConfig; import net.minecraft.world.gen.feature.structure.StructureFeatures; import net.minecraft.world.gen.surfacebuilders.ConfiguredSurfaceBuilder; import net.minecraft.world.gen.surfacebuilders.SurfaceBuilder; @@ -42,7 +35,7 @@ public class SteppeBiome extends BiomeTemplate } @Override - protected void configureGeneration(BiomeGenerationSettingsRegistryBuilder builder) + protected void configureGeneration(BiomeGenerationSettings.Builder builder) { builder.surfaceBuilder(new ConfiguredSurfaceBuilder(SurfaceBuilder.DEFAULT, SurfaceBuilder.CONFIG_GRASS)); diff --git a/src/main/java/biomesoplenty/common/biome/overworld/TemperateRainforestBiome.java b/src/main/java/biomesoplenty/common/biome/overworld/TemperateRainforestBiome.java index 92d13570c..73e724ff4 100644 --- a/src/main/java/biomesoplenty/common/biome/overworld/TemperateRainforestBiome.java +++ b/src/main/java/biomesoplenty/common/biome/overworld/TemperateRainforestBiome.java @@ -8,24 +8,15 @@ package biomesoplenty.common.biome.overworld; import biomesoplenty.api.biome.BOPBiomes; -import biomesoplenty.api.block.BOPBlocks; import biomesoplenty.api.enums.BOPClimates; import biomesoplenty.common.biome.BiomeTemplate; -import biomesoplenty.common.world.biome.BiomeFeatureHelper; import biomesoplenty.common.world.gen.feature.BOPConfiguredFeatures; -import biomesoplenty.common.world.gen.feature.BOPFeatures; -import com.google.common.collect.ImmutableList; -import net.minecraft.block.Blocks; import net.minecraft.entity.EntityClassification; import net.minecraft.entity.EntityType; import net.minecraft.world.biome.*; import net.minecraft.world.gen.GenerationStage; -import net.minecraft.world.gen.blockplacer.SimpleBlockPlacer; -import net.minecraft.world.gen.blockstateprovider.SimpleBlockStateProvider; import net.minecraft.world.gen.feature.*; import net.minecraft.world.gen.feature.structure.StructureFeatures; -import net.minecraft.world.gen.placement.AtSurfaceWithExtraConfig; -import net.minecraft.world.gen.placement.Placement; import net.minecraft.world.gen.surfacebuilders.ConfiguredSurfaceBuilder; import net.minecraft.world.gen.surfacebuilders.SurfaceBuilder; @@ -46,7 +37,7 @@ public class TemperateRainforestBiome extends BiomeTemplate } @Override - protected void configureGeneration(BiomeGenerationSettingsRegistryBuilder builder) + protected void configureGeneration(BiomeGenerationSettings.Builder builder) { builder.surfaceBuilder(new ConfiguredSurfaceBuilder(SurfaceBuilder.DEFAULT, SurfaceBuilder.CONFIG_GRASS)); diff --git a/src/main/java/biomesoplenty/common/biome/overworld/TemperateRainforestHillsBiome.java b/src/main/java/biomesoplenty/common/biome/overworld/TemperateRainforestHillsBiome.java index d25d8e0cd..e15c822bf 100644 --- a/src/main/java/biomesoplenty/common/biome/overworld/TemperateRainforestHillsBiome.java +++ b/src/main/java/biomesoplenty/common/biome/overworld/TemperateRainforestHillsBiome.java @@ -8,21 +8,14 @@ package biomesoplenty.common.biome.overworld; import biomesoplenty.api.biome.BOPBiomes; -import biomesoplenty.api.block.BOPBlocks; import biomesoplenty.common.biome.BiomeTemplate; -import biomesoplenty.common.world.biome.BiomeFeatureHelper; import biomesoplenty.common.world.gen.feature.BOPConfiguredFeatures; -import biomesoplenty.common.world.gen.feature.BOPFeatures; -import com.google.common.collect.ImmutableList; -import net.minecraft.block.Blocks; import net.minecraft.entity.EntityClassification; import net.minecraft.entity.EntityType; import net.minecraft.world.biome.*; 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.placement.AtSurfaceWithExtraConfig; -import net.minecraft.world.gen.placement.Placement; import net.minecraft.world.gen.surfacebuilders.ConfiguredSurfaceBuilder; import net.minecraft.world.gen.surfacebuilders.SurfaceBuilder; @@ -42,7 +35,7 @@ public class TemperateRainforestHillsBiome extends BiomeTemplate } @Override - protected void configureGeneration(BiomeGenerationSettingsRegistryBuilder builder) + protected void configureGeneration(BiomeGenerationSettings.Builder builder) { builder.surfaceBuilder(new ConfiguredSurfaceBuilder(SurfaceBuilder.DEFAULT, SurfaceBuilder.CONFIG_GRASS)); diff --git a/src/main/java/biomesoplenty/common/biome/overworld/TropicBeachBiome.java b/src/main/java/biomesoplenty/common/biome/overworld/TropicBeachBiome.java index 5012a707c..98051714b 100644 --- a/src/main/java/biomesoplenty/common/biome/overworld/TropicBeachBiome.java +++ b/src/main/java/biomesoplenty/common/biome/overworld/TropicBeachBiome.java @@ -9,14 +9,12 @@ package biomesoplenty.common.biome.overworld; import biomesoplenty.common.biome.BiomeTemplate; import biomesoplenty.common.world.gen.feature.BOPConfiguredFeatures; -import biomesoplenty.common.world.gen.feature.BOPFeatures; import biomesoplenty.common.world.gen.surfacebuilders.BOPSurfaceBuilders; import net.minecraft.entity.EntityClassification; import net.minecraft.entity.EntityType; import net.minecraft.world.biome.*; import net.minecraft.world.gen.GenerationStage; import net.minecraft.world.gen.feature.Features; -import net.minecraft.world.gen.feature.IFeatureConfig; import net.minecraft.world.gen.feature.structure.StructureFeatures; import net.minecraft.world.gen.surfacebuilders.ConfiguredSurfaceBuilder; @@ -37,7 +35,7 @@ public class TropicBeachBiome extends BiomeTemplate } @Override - protected void configureGeneration(BiomeGenerationSettingsRegistryBuilder builder) + protected void configureGeneration(BiomeGenerationSettings.Builder builder) { builder.surfaceBuilder(new ConfiguredSurfaceBuilder(BOPSurfaceBuilders.TROPICS, BOPSurfaceBuilders.WHITE_SAND_SURFACE)); diff --git a/src/main/java/biomesoplenty/common/biome/overworld/TropicalRainforestBiome.java b/src/main/java/biomesoplenty/common/biome/overworld/TropicalRainforestBiome.java index fad53df60..9da10cf1a 100644 --- a/src/main/java/biomesoplenty/common/biome/overworld/TropicalRainforestBiome.java +++ b/src/main/java/biomesoplenty/common/biome/overworld/TropicalRainforestBiome.java @@ -8,24 +8,15 @@ package biomesoplenty.common.biome.overworld; import biomesoplenty.api.biome.BOPBiomes; -import biomesoplenty.api.block.BOPBlocks; import biomesoplenty.api.enums.BOPClimates; import biomesoplenty.common.biome.BiomeTemplate; -import biomesoplenty.common.world.biome.BiomeFeatureHelper; import biomesoplenty.common.world.gen.feature.BOPConfiguredFeatures; -import biomesoplenty.common.world.gen.feature.BOPFeatures; -import com.google.common.collect.ImmutableList; -import net.minecraft.block.Blocks; import net.minecraft.entity.EntityClassification; import net.minecraft.entity.EntityType; import net.minecraft.world.biome.*; import net.minecraft.world.gen.GenerationStage; -import net.minecraft.world.gen.blockplacer.SimpleBlockPlacer; -import net.minecraft.world.gen.blockstateprovider.SimpleBlockStateProvider; import net.minecraft.world.gen.feature.*; import net.minecraft.world.gen.feature.structure.StructureFeatures; -import net.minecraft.world.gen.placement.AtSurfaceWithExtraConfig; -import net.minecraft.world.gen.placement.Placement; import net.minecraft.world.gen.surfacebuilders.ConfiguredSurfaceBuilder; import net.minecraft.world.gen.surfacebuilders.SurfaceBuilder; @@ -46,7 +37,7 @@ public class TropicalRainforestBiome extends BiomeTemplate } @Override - protected void configureGeneration(BiomeGenerationSettingsRegistryBuilder builder) + protected void configureGeneration(BiomeGenerationSettings.Builder builder) { builder.surfaceBuilder(new ConfiguredSurfaceBuilder(SurfaceBuilder.DEFAULT, SurfaceBuilder.CONFIG_GRASS)); diff --git a/src/main/java/biomesoplenty/common/biome/overworld/TropicsBiome.java b/src/main/java/biomesoplenty/common/biome/overworld/TropicsBiome.java index e6a3ac1b6..1ddc19447 100644 --- a/src/main/java/biomesoplenty/common/biome/overworld/TropicsBiome.java +++ b/src/main/java/biomesoplenty/common/biome/overworld/TropicsBiome.java @@ -8,22 +8,15 @@ package biomesoplenty.common.biome.overworld; import biomesoplenty.api.biome.BOPBiomes; -import biomesoplenty.api.block.BOPBlocks; import biomesoplenty.common.biome.BiomeTemplate; -import biomesoplenty.common.world.biome.BiomeFeatureHelper; import biomesoplenty.common.world.gen.feature.BOPConfiguredFeatures; -import biomesoplenty.common.world.gen.feature.BOPFeatures; import biomesoplenty.common.world.gen.surfacebuilders.BOPSurfaceBuilders; -import com.google.common.collect.ImmutableList; -import net.minecraft.block.Blocks; import net.minecraft.entity.EntityClassification; import net.minecraft.entity.EntityType; import net.minecraft.world.biome.*; 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.placement.AtSurfaceWithExtraConfig; -import net.minecraft.world.gen.placement.Placement; import net.minecraft.world.gen.surfacebuilders.ConfiguredSurfaceBuilder; import net.minecraft.world.gen.surfacebuilders.SurfaceBuilder; @@ -44,7 +37,7 @@ public class TropicsBiome extends BiomeTemplate } @Override - protected void configureGeneration(BiomeGenerationSettingsRegistryBuilder builder) + protected void configureGeneration(BiomeGenerationSettings.Builder builder) { builder.surfaceBuilder(new ConfiguredSurfaceBuilder(BOPSurfaceBuilders.TROPICS, SurfaceBuilder.CONFIG_GRASS)); diff --git a/src/main/java/biomesoplenty/common/biome/overworld/TundraBiome.java b/src/main/java/biomesoplenty/common/biome/overworld/TundraBiome.java index ab4d842bc..3411dccf2 100644 --- a/src/main/java/biomesoplenty/common/biome/overworld/TundraBiome.java +++ b/src/main/java/biomesoplenty/common/biome/overworld/TundraBiome.java @@ -8,22 +8,14 @@ package biomesoplenty.common.biome.overworld; import biomesoplenty.api.biome.BOPBiomes; -import biomesoplenty.api.block.BOPBlocks; import biomesoplenty.api.enums.BOPClimates; import biomesoplenty.common.biome.BiomeTemplate; -import biomesoplenty.common.world.biome.BiomeFeatureHelper; import biomesoplenty.common.world.gen.feature.BOPConfiguredFeatures; -import biomesoplenty.common.world.gen.feature.BOPFeatures; -import com.google.common.collect.ImmutableList; -import net.minecraft.block.Blocks; import net.minecraft.entity.EntityClassification; import net.minecraft.entity.EntityType; import net.minecraft.world.biome.*; 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.placement.AtSurfaceWithExtraConfig; -import net.minecraft.world.gen.placement.Placement; import net.minecraft.world.gen.surfacebuilders.ConfiguredSurfaceBuilder; import net.minecraft.world.gen.surfacebuilders.SurfaceBuilder; @@ -44,7 +36,7 @@ public class TundraBiome extends BiomeTemplate } @Override - protected void configureGeneration(BiomeGenerationSettingsRegistryBuilder builder) + protected void configureGeneration(BiomeGenerationSettings.Builder builder) { builder.surfaceBuilder(new ConfiguredSurfaceBuilder(SurfaceBuilder.DEFAULT, SurfaceBuilder.CONFIG_GRASS)) ; diff --git a/src/main/java/biomesoplenty/common/biome/overworld/VolcanicPlainsBiome.java b/src/main/java/biomesoplenty/common/biome/overworld/VolcanicPlainsBiome.java index 4e7d06ecc..c0004a31c 100644 --- a/src/main/java/biomesoplenty/common/biome/overworld/VolcanicPlainsBiome.java +++ b/src/main/java/biomesoplenty/common/biome/overworld/VolcanicPlainsBiome.java @@ -7,11 +7,8 @@ ******************************************************************************/ package biomesoplenty.common.biome.overworld; -import biomesoplenty.api.block.BOPBlocks; import biomesoplenty.common.biome.BiomeTemplate; -import biomesoplenty.common.world.biome.BiomeFeatureHelper; import biomesoplenty.common.world.gen.feature.BOPConfiguredFeatures; -import biomesoplenty.common.world.gen.feature.BOPFeatures; import biomesoplenty.common.world.gen.surfacebuilders.BOPSurfaceBuilders; import net.minecraft.entity.EntityClassification; import net.minecraft.entity.EntityType; @@ -19,7 +16,6 @@ import net.minecraft.world.biome.*; 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.placement.*; import net.minecraft.world.gen.surfacebuilders.ConfiguredSurfaceBuilder; public class VolcanicPlainsBiome extends BiomeTemplate @@ -39,7 +35,7 @@ public class VolcanicPlainsBiome extends BiomeTemplate } @Override - protected void configureGeneration(BiomeGenerationSettingsRegistryBuilder builder) + protected void configureGeneration(BiomeGenerationSettings.Builder builder) { builder.surfaceBuilder(new ConfiguredSurfaceBuilder(BOPSurfaceBuilders.BLACK_SAND, BOPSurfaceBuilders.BLACK_SAND_SURFACE)); diff --git a/src/main/java/biomesoplenty/common/biome/overworld/VolcanoBiome.java b/src/main/java/biomesoplenty/common/biome/overworld/VolcanoBiome.java index 56eca9f1c..69b3ac63f 100644 --- a/src/main/java/biomesoplenty/common/biome/overworld/VolcanoBiome.java +++ b/src/main/java/biomesoplenty/common/biome/overworld/VolcanoBiome.java @@ -10,19 +10,13 @@ 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.feature.BOPFeatures; import biomesoplenty.common.world.gen.surfacebuilders.BOPSurfaceBuilders; -import com.google.common.collect.ImmutableList; -import net.minecraft.block.Blocks; import net.minecraft.entity.EntityClassification; import net.minecraft.entity.EntityType; import net.minecraft.world.biome.*; 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.placement.ChanceConfig; -import net.minecraft.world.gen.placement.Placement; -import net.minecraft.world.gen.placement.TopSolidRangeConfig; import net.minecraft.world.gen.surfacebuilders.ConfiguredSurfaceBuilder; public class VolcanoBiome extends BiomeTemplate @@ -42,7 +36,7 @@ public class VolcanoBiome extends BiomeTemplate } @Override - protected void configureGeneration(BiomeGenerationSettingsRegistryBuilder builder) + protected void configureGeneration(BiomeGenerationSettings.Builder builder) { builder.surfaceBuilder(new ConfiguredSurfaceBuilder(BOPSurfaceBuilders.VOLCANO, BOPSurfaceBuilders.BASALT_SURFACE)); diff --git a/src/main/java/biomesoplenty/common/biome/overworld/WastelandBiome.java b/src/main/java/biomesoplenty/common/biome/overworld/WastelandBiome.java index d18bc3aaa..e68362c40 100644 --- a/src/main/java/biomesoplenty/common/biome/overworld/WastelandBiome.java +++ b/src/main/java/biomesoplenty/common/biome/overworld/WastelandBiome.java @@ -10,17 +10,12 @@ 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.feature.BOPFeatures; import biomesoplenty.common.world.gen.surfacebuilders.BOPSurfaceBuilders; -import com.google.common.collect.ImmutableList; import net.minecraft.entity.EntityClassification; import net.minecraft.entity.EntityType; import net.minecraft.world.biome.*; 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.placement.AtSurfaceWithExtraConfig; -import net.minecraft.world.gen.placement.Placement; import net.minecraft.world.gen.surfacebuilders.ConfiguredSurfaceBuilder; import net.minecraft.world.gen.surfacebuilders.SurfaceBuilder; @@ -42,7 +37,7 @@ public class WastelandBiome extends BiomeTemplate } @Override - protected void configureGeneration(BiomeGenerationSettingsRegistryBuilder builder) + protected void configureGeneration(BiomeGenerationSettings.Builder builder) { builder.surfaceBuilder(new ConfiguredSurfaceBuilder(SurfaceBuilder.DEFAULT, BOPSurfaceBuilders.DRIED_SALT_SURFACE)); diff --git a/src/main/java/biomesoplenty/common/biome/overworld/WetlandBiome.java b/src/main/java/biomesoplenty/common/biome/overworld/WetlandBiome.java index c6d7dbc65..280b29a14 100644 --- a/src/main/java/biomesoplenty/common/biome/overworld/WetlandBiome.java +++ b/src/main/java/biomesoplenty/common/biome/overworld/WetlandBiome.java @@ -7,25 +7,15 @@ ******************************************************************************/ package biomesoplenty.common.biome.overworld; -import biomesoplenty.api.block.BOPBlocks; import biomesoplenty.api.enums.BOPClimates; import biomesoplenty.common.biome.BiomeTemplate; -import biomesoplenty.common.world.biome.BiomeFeatureHelper; import biomesoplenty.common.world.gen.feature.BOPConfiguredFeatures; -import biomesoplenty.common.world.gen.feature.BOPFeatures; -import com.google.common.collect.ImmutableList; -import net.minecraft.block.Blocks; import net.minecraft.entity.EntityClassification; import net.minecraft.entity.EntityType; import net.minecraft.world.biome.*; import net.minecraft.world.gen.GenerationStage; -import net.minecraft.world.gen.blockplacer.SimpleBlockPlacer; -import net.minecraft.world.gen.blockstateprovider.SimpleBlockStateProvider; import net.minecraft.world.gen.feature.*; import net.minecraft.world.gen.feature.structure.StructureFeatures; -import net.minecraft.world.gen.placement.AtSurfaceWithExtraConfig; -import net.minecraft.world.gen.placement.ChanceConfig; -import net.minecraft.world.gen.placement.Placement; import net.minecraft.world.gen.surfacebuilders.ConfiguredSurfaceBuilder; import net.minecraft.world.gen.surfacebuilders.SurfaceBuilder; @@ -46,7 +36,7 @@ public class WetlandBiome extends BiomeTemplate } @Override - protected void configureGeneration(BiomeGenerationSettingsRegistryBuilder builder) + protected void configureGeneration(BiomeGenerationSettings.Builder builder) { builder.surfaceBuilder(new ConfiguredSurfaceBuilder(SurfaceBuilder.DEFAULT, SurfaceBuilder.CONFIG_GRASS)); diff --git a/src/main/java/biomesoplenty/common/biome/overworld/WoodlandBiome.java b/src/main/java/biomesoplenty/common/biome/overworld/WoodlandBiome.java index c57d27d50..4843398c0 100644 --- a/src/main/java/biomesoplenty/common/biome/overworld/WoodlandBiome.java +++ b/src/main/java/biomesoplenty/common/biome/overworld/WoodlandBiome.java @@ -7,23 +7,15 @@ ******************************************************************************/ package biomesoplenty.common.biome.overworld; -import biomesoplenty.api.block.BOPBlocks; import biomesoplenty.api.enums.BOPClimates; import biomesoplenty.common.biome.BiomeTemplate; -import biomesoplenty.common.world.biome.BiomeFeatureHelper; import biomesoplenty.common.world.gen.feature.BOPConfiguredFeatures; -import biomesoplenty.common.world.gen.feature.BOPFeatures; -import net.minecraft.block.Blocks; import net.minecraft.entity.EntityClassification; import net.minecraft.entity.EntityType; import net.minecraft.world.biome.*; import net.minecraft.world.gen.GenerationStage; -import net.minecraft.world.gen.feature.Feature; import net.minecraft.world.gen.feature.Features; -import net.minecraft.world.gen.feature.IFeatureConfig; import net.minecraft.world.gen.feature.structure.StructureFeatures; -import net.minecraft.world.gen.placement.AtSurfaceWithExtraConfig; -import net.minecraft.world.gen.placement.Placement; import net.minecraft.world.gen.surfacebuilders.ConfiguredSurfaceBuilder; import net.minecraft.world.gen.surfacebuilders.SurfaceBuilder; @@ -43,7 +35,7 @@ public class WoodlandBiome extends BiomeTemplate } @Override - protected void configureGeneration(BiomeGenerationSettingsRegistryBuilder builder) + protected void configureGeneration(BiomeGenerationSettings.Builder builder) { builder.surfaceBuilder(new ConfiguredSurfaceBuilder(SurfaceBuilder.DEFAULT, SurfaceBuilder.CONFIG_GRASS)); diff --git a/src/main/java/biomesoplenty/common/biome/overworld/XericShrublandBiome.java b/src/main/java/biomesoplenty/common/biome/overworld/XericShrublandBiome.java index 9a68d8e90..c52c86584 100644 --- a/src/main/java/biomesoplenty/common/biome/overworld/XericShrublandBiome.java +++ b/src/main/java/biomesoplenty/common/biome/overworld/XericShrublandBiome.java @@ -7,21 +7,14 @@ ******************************************************************************/ package biomesoplenty.common.biome.overworld; -import biomesoplenty.api.block.BOPBlocks; import biomesoplenty.common.biome.BiomeTemplate; -import biomesoplenty.common.world.biome.BiomeFeatureHelper; import biomesoplenty.common.world.gen.feature.BOPConfiguredFeatures; -import biomesoplenty.common.world.gen.feature.BOPFeatures; import net.minecraft.entity.EntityClassification; import net.minecraft.entity.EntityType; import net.minecraft.world.biome.*; import net.minecraft.world.gen.GenerationStage; -import net.minecraft.world.gen.feature.Feature; import net.minecraft.world.gen.feature.Features; -import net.minecraft.world.gen.feature.IFeatureConfig; import net.minecraft.world.gen.feature.structure.StructureFeatures; -import net.minecraft.world.gen.placement.AtSurfaceWithExtraConfig; -import net.minecraft.world.gen.placement.Placement; import net.minecraft.world.gen.surfacebuilders.ConfiguredSurfaceBuilder; import net.minecraft.world.gen.surfacebuilders.SurfaceBuilder; @@ -38,7 +31,7 @@ public class XericShrublandBiome extends BiomeTemplate } @Override - protected void configureGeneration(BiomeGenerationSettingsRegistryBuilder builder) + protected void configureGeneration(BiomeGenerationSettings.Builder builder) { builder.surfaceBuilder(new ConfiguredSurfaceBuilder(SurfaceBuilder.DEFAULT, SurfaceBuilder.CONFIG_FULL_SAND));