From 5dcd185f9fa317b654d5c490bb137c49d505d5e0 Mon Sep 17 00:00:00 2001 From: Adubbz Date: Thu, 20 Aug 2020 20:18:53 +1000 Subject: [PATCH] Updated the boreal forest --- .../biomesoplenty/api/enums/BOPClimates.java | 46 +++---- .../common/biome/BiomeRegistry.java | 12 +- .../{BiomeBOP.java => BiomeTemplate.java} | 50 +++++--- .../common/biome/NetherBiomeBOP.java | 7 +- .../common/biome/overworld/AlpsBiome.java | 8 +- .../biome/overworld/AlpsFoothillsBiome.java | 8 +- .../common/biome/overworld/BayouBiome.java | 7 +- .../common/biome/overworld/BogBiome.java | 9 +- .../biome/overworld/BorealForestBiome.java | 115 ++++++++--------- .../biome/overworld/BrushlandBiome.java | 7 +- .../biome/overworld/ChaparralBiome.java | 6 +- .../overworld/CherryBlossomGroveBiome.java | 7 +- .../biome/overworld/ColdDesertBiome.java | 8 +- .../overworld/ConiferousForestBiome.java | 7 +- .../biome/overworld/DeadForestBiome.java | 7 +- .../biome/overworld/FirClearingBiome.java | 7 +- .../biome/overworld/FloodplainBiome.java | 6 +- .../biome/overworld/FlowerMeadowBiome.java | 7 +- .../biome/overworld/FungalJungleBiome.java | 9 +- .../biome/overworld/GrasslandBiome.java | 11 +- .../biome/overworld/GravelBeachBiome.java | 8 +- .../common/biome/overworld/GroveBiome.java | 7 +- .../common/biome/overworld/HighlandBiome.java | 6 +- .../biome/overworld/HighlandMoorBiome.java | 10 +- .../biome/overworld/LavenderFieldBiome.java | 7 +- .../biome/overworld/LushGrasslandBiome.java | 6 +- .../biome/overworld/LushSwampBiome.java | 6 +- .../common/biome/overworld/MangroveBiome.java | 6 +- .../biome/overworld/MapleWoodsBiome.java | 7 +- .../common/biome/overworld/MarshBiome.java | 6 +- .../common/biome/overworld/MeadowBiome.java | 8 +- .../common/biome/overworld/MireBiome.java | 8 +- .../common/biome/overworld/MuskegBiome.java | 4 +- .../biome/overworld/MysticGroveBiome.java | 7 +- .../common/biome/overworld/OasisBiome.java | 7 +- .../biome/overworld/OminousWoodsBiome.java | 7 +- .../common/biome/overworld/OrchardBiome.java | 7 +- .../biome/overworld/OriginHillsBiome.java | 9 +- .../common/biome/overworld/OutbackBiome.java | 7 +- .../biome/overworld/OvergrownCliffsBiome.java | 6 +- .../common/biome/overworld/PastureBiome.java | 7 +- .../biome/overworld/PoppyFieldBiome.java | 8 +- .../common/biome/overworld/PrairieBiome.java | 8 +- .../biome/overworld/PumpkinPatchBiome.java | 7 +- .../biome/overworld/RainbowValleyBiome.java | 12 +- .../biome/overworld/RainforestBiome.java | 8 +- .../biome/overworld/RedwoodForestBiome.java | 6 +- .../overworld/RedwoodForestEdgeBiome.java | 6 +- .../biome/overworld/ScrublandBiome.java | 7 +- .../biome/overworld/SeasonalForestBiome.java | 7 +- .../common/biome/overworld/ShieldBiome.java | 7 +- .../biome/overworld/ShrublandBiome.java | 7 +- .../biome/overworld/SilkgladeBiome.java | 7 +- .../overworld/SnowyConiferousForestBiome.java | 6 +- .../overworld/SnowyFirClearingBiome.java | 7 +- .../biome/overworld/SnowyForestBiome.java | 8 +- .../common/biome/overworld/SteppeBiome.java | 7 +- .../overworld/TemperateRainforestBiome.java | 7 +- .../TemperateRainforestHillsBiome.java | 8 +- .../biome/overworld/TropicBeachBiome.java | 4 +- .../overworld/TropicalRainforestBiome.java | 7 +- .../common/biome/overworld/TropicsBiome.java | 4 +- .../common/biome/overworld/TundraBiome.java | 8 +- .../biome/overworld/VolcanicPlainsBiome.java | 11 +- .../common/biome/overworld/VolcanoBiome.java | 7 +- .../biome/overworld/WastelandBiome.java | 7 +- .../common/biome/overworld/WetlandBiome.java | 7 +- .../common/biome/overworld/WoodlandBiome.java | 8 +- .../biome/overworld/XericShrublandBiome.java | 7 +- .../common/util/biome/BiomeUtil.java | 53 +------- .../common/world/layer/BOPRiverMixLayer.java | 10 +- .../common/world/layer/BOPShoreLayer.java | 16 +-- .../java/biomesoplenty/init/ModBiomes.java | 83 +----------- .../biomesoplenty/init/ModCompatibility.java | 119 ------------------ 74 files changed, 269 insertions(+), 705 deletions(-) rename src/main/java/biomesoplenty/common/biome/{BiomeBOP.java => BiomeTemplate.java} (54%) delete mode 100644 src/main/java/biomesoplenty/init/ModCompatibility.java diff --git a/src/main/java/biomesoplenty/api/enums/BOPClimates.java b/src/main/java/biomesoplenty/api/enums/BOPClimates.java index 5099348b8..b3317c8ae 100644 --- a/src/main/java/biomesoplenty/api/enums/BOPClimates.java +++ b/src/main/java/biomesoplenty/api/enums/BOPClimates.java @@ -13,10 +13,10 @@ import com.google.common.collect.ImmutableList; import com.google.common.collect.ImmutableSet; import com.google.common.collect.Lists; import com.google.common.collect.Sets; +import net.minecraft.util.RegistryKey; import net.minecraft.world.biome.Biome; import net.minecraft.world.biome.Biomes; import net.minecraft.world.gen.INoiseRandom; -import net.minecraftforge.common.BiomeManager.BiomeType; import java.util.ArrayList; import java.util.Iterator; @@ -25,35 +25,29 @@ import java.util.stream.Collectors; public enum BOPClimates { - ICE_CAP (BiomeType.ICY), - TUNDRA (BiomeType.ICY), - WET_BOREAL (BiomeType.COOL), - DRY_BOREAL (BiomeType.COOL), - WET_TEMPERATE (BiomeType.COOL), - DRY_TEMPERATE (BiomeType.WARM), - COOL_TEMPERATE (BiomeType.COOL), - WARM_TEMPERATE (BiomeType.WARM), - SUBTROPICAL (BiomeType.WARM), - TROPICAL (BiomeType.DESERT), - MEDITERRANEAN (BiomeType.WARM), - SAVANNA (BiomeType.DESERT), - HOT_DESERT (BiomeType.DESERT), - WASTELAND (null), - NETHER (null); + ICE_CAP, + TUNDRA, + WET_BOREAL, + DRY_BOREAL, + WET_TEMPERATE, + DRY_TEMPERATE, + COOL_TEMPERATE, + WARM_TEMPERATE, + SUBTROPICAL, + TROPICAL, + MEDITERRANEAN, + SAVANNA, + HOT_DESERT, + WASTELAND, + NETHER; - public final BiomeType biomeType; private int totalBiomesWeight; private int totalIslandBiomesWeight; private ArrayList landBiomes = Lists.newArrayList(); private ArrayList islandBiomes = Lists.newArrayList(); - BOPClimates(BiomeType biomeType) - { - this.biomeType = biomeType; - } - - public BOPClimates addBiome(int weight, Biome biome) + public BOPClimates addBiome(int weight, RegistryKey biome) { return this.addBiome(new WeightedBiomeEntry(weight, biome)); } @@ -111,7 +105,7 @@ public enum BOPClimates return item.biome; } - public Biome getRandomOceanBiome(INoiseRandom context, boolean deep) + public RegistryKey getRandomOceanBiome(INoiseRandom context, boolean deep) { return (deep ? Biomes.DEEP_OCEAN : Biomes.OCEAN); } @@ -184,9 +178,9 @@ public enum BOPClimates public static class WeightedBiomeEntry { public final int weight; - public final Biome biome; + public final RegistryKey biome; - public WeightedBiomeEntry(int weight, Biome biome) + public WeightedBiomeEntry(int weight, RegistryKey biome) { this.weight = weight; this.biome = biome; diff --git a/src/main/java/biomesoplenty/common/biome/BiomeRegistry.java b/src/main/java/biomesoplenty/common/biome/BiomeRegistry.java index 05b9405a9..8de51ccf8 100644 --- a/src/main/java/biomesoplenty/common/biome/BiomeRegistry.java +++ b/src/main/java/biomesoplenty/common/biome/BiomeRegistry.java @@ -37,12 +37,12 @@ public class BiomeRegistry private static Map> deferrances = Maps.newHashMap(); - public static void deferStandardRegistration(BiomeBOP biome, String name) + public static void deferStandardRegistration(BiomeTemplate biome, String name) { defer(RegistrationType.STANDARD_BIOME, new StandardBiomeRegistrationData(biome, name)); } - public static void deferTechnicalBiomeRegistration(BiomeBOP biome, String name) + public static void deferTechnicalBiomeRegistration(BiomeTemplate biome, String name) { defer(RegistrationType.TECHNICAL_BIOME, new ToggleableStandardBiomeRegistrationData(biome, name, true)); } @@ -73,7 +73,7 @@ public class BiomeRegistry StandardBiomeRegistrationData regData = registration.regData; // Ignore biomes which don't have any weights set by default - if (((BiomeBOP)regData.getBiome()).hasWeights()) + if (((BiomeTemplate)regData.getBiome()).hasWeights()) { String biomeName = new ResourceLocation(BiomesOPlenty.MOD_ID, regData.getName()).toString(); Pair primaryWeight = regData.getPrimaryWeight(); @@ -361,7 +361,7 @@ public class BiomeRegistry public enum RegistrationType { STANDARD_BIOME((StandardBiomeRegistrationData data) -> { - BiomeBOP biome = (BiomeBOP)data.getBiome(); + BiomeTemplate biome = (BiomeTemplate)data.getBiome(); String name = data.getName(); // Don't register biomes with their weight set to 0, that normally have weights that are non-zero @@ -401,7 +401,7 @@ public class BiomeRegistry } }), TECHNICAL_BIOME((ToggleableStandardBiomeRegistrationData data) -> { - BiomeBOP biome = (BiomeBOP)data.getBiome(); + BiomeTemplate biome = (BiomeTemplate)data.getBiome(); String name = data.getName(); if (!data.getEnabled()) @@ -489,7 +489,7 @@ public class BiomeRegistry private final String name; private Map weightMap; - public StandardBiomeRegistrationData(BiomeBOP biome, String name) + public StandardBiomeRegistrationData(BiomeTemplate biome, String name) { super(biome); this.name = name; diff --git a/src/main/java/biomesoplenty/common/biome/BiomeBOP.java b/src/main/java/biomesoplenty/common/biome/BiomeTemplate.java similarity index 54% rename from src/main/java/biomesoplenty/common/biome/BiomeBOP.java rename to src/main/java/biomesoplenty/common/biome/BiomeTemplate.java index fd60fcfb1..e2812eeef 100644 --- a/src/main/java/biomesoplenty/common/biome/BiomeBOP.java +++ b/src/main/java/biomesoplenty/common/biome/BiomeTemplate.java @@ -8,33 +8,51 @@ package biomesoplenty.common.biome; import biomesoplenty.api.enums.BOPClimates; -import net.minecraft.util.registry.Registry; +import biomesoplenty.common.util.biome.BiomeUtil; import net.minecraft.world.biome.Biome; +import net.minecraft.world.biome.BiomeGenerationSettings; import net.minecraft.world.biome.Biomes; -import net.minecraft.world.gen.feature.ConfiguredFeature; -import net.minecraft.world.gen.feature.Feature; -import net.minecraft.world.gen.feature.IFeatureConfig; -import net.minecraft.world.gen.placement.ConfiguredPlacement; -import net.minecraft.world.gen.placement.IPlacementConfig; -import net.minecraft.world.gen.placement.Placement; +import net.minecraft.world.biome.MobSpawnInfo; import java.util.HashMap; import java.util.Map; import java.util.Optional; -public class BiomeBOP extends Biome +public class BiomeTemplate { protected Map weightMap = new HashMap(); public boolean canSpawnInBiome; - public int beachBiomeId = Registry.BIOME.getId(Biomes.BEACH); - public int riverBiomeId = Registry.BIOME.getId(Biomes.RIVER); + public int beachBiomeId = BiomeUtil.getBiomeId(Biomes.BEACH); + public int riverBiomeId = BiomeUtil.getBiomeId(Biomes.RIVER); - public BiomeBOP(Builder builder) + public BiomeTemplate() { - super(builder); this.canSpawnInBiome = true; } + protected void configureBiome(Biome.Builder builder) {} + protected void configureGeneration(BiomeGenerationSettings.Builder builder) {} + protected void configureMobSpawns(MobSpawnInfo.Builder builder) {} + + public final Biome build() + { + Biome.Builder biomeBuilder = new Biome.Builder(); + + // Configure the biome generation + BiomeGenerationSettings.Builder biomeGenBuilder = new BiomeGenerationSettings.Builder(); + this.configureGeneration(biomeGenBuilder); + biomeBuilder.generationSettings(biomeGenBuilder.build()); + + // Configure mob spawning + MobSpawnInfo.Builder mobSpawnBuilder = new MobSpawnInfo.Builder(); + this.configureMobSpawns(mobSpawnBuilder); + biomeBuilder.mobSpawnSettings(mobSpawnBuilder.build()); + + // Configure and build the biome + this.configureBiome(biomeBuilder); + return biomeBuilder.build(); + } + public void addWeight(BOPClimates climate, int weight) { this.weightMap.put(climate, weight); @@ -43,7 +61,7 @@ public class BiomeBOP extends Biome public void setBeachBiome(Optional biome) { if (biome.isPresent()) - this.beachBiomeId = Registry.BIOME.getId(biome.get()); + this.beachBiomeId = BiomeUtil.getBiomeId(biome.get()); else this.beachBiomeId = -1; } @@ -51,7 +69,7 @@ public class BiomeBOP extends Biome public void setBeachBiome(Biome biome) { if (biome != null) - this.beachBiomeId = Registry.BIOME.getId(biome); + this.beachBiomeId = BiomeUtil.getBiomeId(biome); else this.beachBiomeId = -1; } @@ -59,7 +77,7 @@ public class BiomeBOP extends Biome public void setRiverBiome(Optional biome) { if (biome.isPresent()) - this.riverBiomeId = Registry.BIOME.getId(biome.get()); + this.riverBiomeId = BiomeUtil.getBiomeId(biome.get()); else this.riverBiomeId = -1; } @@ -67,7 +85,7 @@ public class BiomeBOP extends Biome public void setRiverBiome(Biome biome) { if (biome != null) - this.riverBiomeId = Registry.BIOME.getId(biome); + this.riverBiomeId = BiomeUtil.getBiomeId(biome); else this.riverBiomeId = -1; } diff --git a/src/main/java/biomesoplenty/common/biome/NetherBiomeBOP.java b/src/main/java/biomesoplenty/common/biome/NetherBiomeBOP.java index b3258a459..50c2dc1b6 100644 --- a/src/main/java/biomesoplenty/common/biome/NetherBiomeBOP.java +++ b/src/main/java/biomesoplenty/common/biome/NetherBiomeBOP.java @@ -7,12 +7,7 @@ ******************************************************************************/ package biomesoplenty.common.biome; -import biomesoplenty.api.enums.BOPClimates; - -import java.util.HashMap; -import java.util.Map; - -public class NetherBiomeBOP extends BiomeBOP +public class NetherBiomeBOP extends BiomeTemplate { public NetherBiomeBOP(Builder builder) { diff --git a/src/main/java/biomesoplenty/common/biome/overworld/AlpsBiome.java b/src/main/java/biomesoplenty/common/biome/overworld/AlpsBiome.java index 91f77366e..1a700f1ce 100644 --- a/src/main/java/biomesoplenty/common/biome/overworld/AlpsBiome.java +++ b/src/main/java/biomesoplenty/common/biome/overworld/AlpsBiome.java @@ -8,7 +8,7 @@ package biomesoplenty.common.biome.overworld; import biomesoplenty.api.enums.BOPClimates; -import biomesoplenty.common.biome.BiomeBOP; +import biomesoplenty.common.biome.BiomeTemplate; import biomesoplenty.common.world.gen.feature.BOPBiomeFeatures; import net.minecraft.entity.EntityClassification; import net.minecraft.entity.EntityType; @@ -16,13 +16,9 @@ import net.minecraft.world.biome.Biome; import net.minecraft.world.biome.BiomeAmbience; import net.minecraft.world.biome.DefaultBiomeFeatures; import net.minecraft.world.biome.MoodSoundAmbience; -import net.minecraft.world.gen.feature.Feature; -import net.minecraft.world.gen.feature.IFeatureConfig; -import net.minecraft.world.gen.feature.structure.MineshaftConfig; -import net.minecraft.world.gen.feature.structure.MineshaftStructure; import net.minecraft.world.gen.surfacebuilders.ConfiguredSurfaceBuilder; -public class AlpsBiome extends BiomeBOP +public class AlpsBiome extends BiomeTemplate { public AlpsBiome() { diff --git a/src/main/java/biomesoplenty/common/biome/overworld/AlpsFoothillsBiome.java b/src/main/java/biomesoplenty/common/biome/overworld/AlpsFoothillsBiome.java index fbb63a251..4a3011ef1 100644 --- a/src/main/java/biomesoplenty/common/biome/overworld/AlpsFoothillsBiome.java +++ b/src/main/java/biomesoplenty/common/biome/overworld/AlpsFoothillsBiome.java @@ -7,7 +7,7 @@ ******************************************************************************/ package biomesoplenty.common.biome.overworld; -import biomesoplenty.common.biome.BiomeBOP; +import biomesoplenty.common.biome.BiomeTemplate; import biomesoplenty.common.world.gen.feature.BOPBiomeFeatures; import net.minecraft.entity.EntityClassification; import net.minecraft.entity.EntityType; @@ -16,16 +16,12 @@ import net.minecraft.world.biome.BiomeAmbience; import net.minecraft.world.biome.DefaultBiomeFeatures; import net.minecraft.world.biome.MoodSoundAmbience; import net.minecraft.world.gen.GenerationStage; -import net.minecraft.world.gen.feature.Feature; -import net.minecraft.world.gen.feature.IFeatureConfig; -import net.minecraft.world.gen.feature.structure.MineshaftConfig; -import net.minecraft.world.gen.feature.structure.MineshaftStructure; 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; -public class AlpsFoothillsBiome extends BiomeBOP +public class AlpsFoothillsBiome extends BiomeTemplate { public AlpsFoothillsBiome() { diff --git a/src/main/java/biomesoplenty/common/biome/overworld/BayouBiome.java b/src/main/java/biomesoplenty/common/biome/overworld/BayouBiome.java index 6ad8a4e54..bb75c0e93 100644 --- a/src/main/java/biomesoplenty/common/biome/overworld/BayouBiome.java +++ b/src/main/java/biomesoplenty/common/biome/overworld/BayouBiome.java @@ -10,7 +10,7 @@ package biomesoplenty.common.biome.overworld; import biomesoplenty.api.biome.BOPBiomes; import biomesoplenty.api.block.BOPBlocks; import biomesoplenty.api.enums.BOPClimates; -import biomesoplenty.common.biome.BiomeBOP; +import biomesoplenty.common.biome.BiomeTemplate; import biomesoplenty.common.world.biome.BiomeFeatureHelper; import biomesoplenty.common.world.gen.feature.BOPBiomeFeatures; import biomesoplenty.common.world.gen.feature.FernGrassFeature; @@ -18,22 +18,19 @@ import com.google.common.collect.ImmutableList; import net.minecraft.block.Blocks; import net.minecraft.entity.EntityClassification; import net.minecraft.entity.EntityType; -import net.minecraft.util.math.BlockPos; import net.minecraft.world.biome.Biome; import net.minecraft.world.biome.BiomeAmbience; import net.minecraft.world.biome.DefaultBiomeFeatures; import net.minecraft.world.biome.MoodSoundAmbience; import net.minecraft.world.gen.GenerationStage; import net.minecraft.world.gen.feature.*; -import net.minecraft.world.gen.feature.structure.MineshaftConfig; -import net.minecraft.world.gen.feature.structure.MineshaftStructure; import net.minecraft.world.gen.placement.*; import net.minecraft.world.gen.surfacebuilders.ConfiguredSurfaceBuilder; import net.minecraft.world.gen.surfacebuilders.SurfaceBuilder; import net.minecraftforge.api.distmarker.Dist; import net.minecraftforge.api.distmarker.OnlyIn; -public class BayouBiome extends BiomeBOP +public class BayouBiome extends BiomeTemplate { public BayouBiome() { diff --git a/src/main/java/biomesoplenty/common/biome/overworld/BogBiome.java b/src/main/java/biomesoplenty/common/biome/overworld/BogBiome.java index c8fd187ea..3d99d149a 100644 --- a/src/main/java/biomesoplenty/common/biome/overworld/BogBiome.java +++ b/src/main/java/biomesoplenty/common/biome/overworld/BogBiome.java @@ -9,32 +9,27 @@ package biomesoplenty.common.biome.overworld; import biomesoplenty.api.block.BOPBlocks; import biomesoplenty.api.enums.BOPClimates; -import biomesoplenty.common.biome.BiomeBOP; +import biomesoplenty.common.biome.BiomeTemplate; import biomesoplenty.common.world.biome.BiomeFeatureHelper; import biomesoplenty.common.world.gen.feature.BOPBiomeFeatures; import biomesoplenty.common.world.gen.feature.StandardGrassFeature; import com.google.common.collect.ImmutableList; -import com.google.common.collect.Lists; -import net.minecraft.block.BlockState; import net.minecraft.block.Blocks; import net.minecraft.entity.EntityClassification; import net.minecraft.entity.EntityType; -import net.minecraft.util.math.BlockPos; import net.minecraft.world.biome.Biome; import net.minecraft.world.biome.BiomeAmbience; import net.minecraft.world.biome.DefaultBiomeFeatures; import net.minecraft.world.biome.MoodSoundAmbience; import net.minecraft.world.gen.GenerationStage; import net.minecraft.world.gen.feature.*; -import net.minecraft.world.gen.feature.structure.MineshaftConfig; -import net.minecraft.world.gen.feature.structure.MineshaftStructure; import net.minecraft.world.gen.placement.*; import net.minecraft.world.gen.surfacebuilders.ConfiguredSurfaceBuilder; import net.minecraft.world.gen.surfacebuilders.SurfaceBuilder; import net.minecraftforge.api.distmarker.Dist; import net.minecraftforge.api.distmarker.OnlyIn; -public class BogBiome extends BiomeBOP +public class BogBiome extends BiomeTemplate { public BogBiome() { diff --git a/src/main/java/biomesoplenty/common/biome/overworld/BorealForestBiome.java b/src/main/java/biomesoplenty/common/biome/overworld/BorealForestBiome.java index 6c88ec865..f635e2eff 100644 --- a/src/main/java/biomesoplenty/common/biome/overworld/BorealForestBiome.java +++ b/src/main/java/biomesoplenty/common/biome/overworld/BorealForestBiome.java @@ -10,98 +10,99 @@ package biomesoplenty.common.biome.overworld; import biomesoplenty.api.biome.BOPBiomes; import biomesoplenty.api.block.BOPBlocks; import biomesoplenty.api.enums.BOPClimates; -import biomesoplenty.common.biome.BiomeBOP; +import biomesoplenty.common.biome.BiomeTemplate; import biomesoplenty.common.world.biome.BiomeFeatureHelper; import biomesoplenty.common.world.gen.feature.BOPBiomeFeatures; import biomesoplenty.common.world.gen.feature.FernGrassFeature; import com.google.common.collect.ImmutableList; +import com.google.common.collect.ImmutableSet; import net.minecraft.entity.EntityClassification; import net.minecraft.entity.EntityType; -import net.minecraft.util.math.BlockPos; -import net.minecraft.world.biome.Biome; -import net.minecraft.world.biome.BiomeAmbience; -import net.minecraft.world.biome.DefaultBiomeFeatures; -import net.minecraft.world.biome.MoodSoundAmbience; +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.MineshaftConfig; -import net.minecraft.world.gen.feature.structure.MineshaftStructure; +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.FrequencyConfig; import net.minecraft.world.gen.placement.Placement; import net.minecraft.world.gen.surfacebuilders.ConfiguredSurfaceBuilder; import net.minecraft.world.gen.surfacebuilders.SurfaceBuilder; import net.minecraftforge.api.distmarker.Dist; import net.minecraftforge.api.distmarker.OnlyIn; -public class BorealForestBiome extends BiomeBOP +public class BorealForestBiome extends BiomeTemplate { public BorealForestBiome() { - super((new Biome.Builder()).surfaceBuilder(new ConfiguredSurfaceBuilder(SurfaceBuilder.DEFAULT, SurfaceBuilder.CONFIG_GRASS)).precipitation(Biome.RainType.RAIN).biomeCategory(Biome.Category.TAIGA).depth(0.3F).scale(0.3F).temperature(0.3F).downfall(0.6F).specialEffects((new BiomeAmbience.Builder()).waterColor(4159204).waterFogColor(329011).fogColor(12638463).ambientMoodSound(MoodSoundAmbience.LEGACY_CAVE_SETTINGS).build()).parent((String)null)); + this.addWeight(BOPClimates.DRY_BOREAL, 7); + this.setBeachBiome(BOPBiomes.gravel_beach); + } + + @Override + protected void configureBiome(Biome.Builder builder) + { + // Base properties + builder.precipitation(Biome.RainType.RAIN).biomeCategory(Biome.Category.TAIGA).depth(0.3F).scale(0.3F).temperature(0.3F).downfall(0.6F); + + // Special effects + builder.specialEffects((new BiomeAmbience.Builder()).grassColorOverride(0x9FB771).foliageColorOverride(0xC9CE65).waterColor(4159204).waterFogColor(329011).fogColor(12638463).ambientMoodSound(MoodSoundAmbience.LEGACY_CAVE_SETTINGS).build()); + } + + @Override + protected void configureGeneration(BiomeGenerationSettings.Builder builder) + { + // Surface builder + builder.surfaceBuilder(new ConfiguredSurfaceBuilder(SurfaceBuilder.DEFAULT, SurfaceBuilder.CONFIG_GRASS)); // Structures - DefaultBiomeFeatures.addDefaultOverworldLandStructures(this); - this.addStructureStart(DefaultBiomeFeatures.RUINED_PORTAL_STANDARD); + DefaultBiomeFeatures.addDefaultOverworldLandStructures(builder); + builder.addStructureStart(StructureFeatures.RUINED_PORTAL_STANDARD); // Underground - DefaultBiomeFeatures.addDefaultCarvers(this); - DefaultBiomeFeatures.addDefaultLakes(this); - DefaultBiomeFeatures.addDefaultMonsterRoom(this); - DefaultBiomeFeatures.addDefaultUndergroundVariety(this); - DefaultBiomeFeatures.addDefaultOres(this); - DefaultBiomeFeatures.addDefaultSoftDisks(this); + DefaultBiomeFeatures.addDefaultCarvers(builder); + DefaultBiomeFeatures.addDefaultLakes(builder); + DefaultBiomeFeatures.addDefaultMonsterRoom(builder); + DefaultBiomeFeatures.addDefaultUndergroundVariety(builder); + DefaultBiomeFeatures.addDefaultOres(builder); + DefaultBiomeFeatures.addDefaultSoftDisks(builder); //////////////////////////////////////////////////////////// // Vegetation - this.addFeature(GenerationStage.Decoration.VEGETAL_DECORATION, Feature.RANDOM_SELECTOR.configured(new MultipleRandomFeatureConfig(ImmutableList.of(BOPBiomeFeatures.BIG_OAK_TREE.configured(DefaultBiomeFeatures.NORMAL_TREE_CONFIG).weighted(0.075F), Feature.TREE.configured(DefaultBiomeFeatures.NORMAL_TREE_CONFIG).weighted(0.15F), BOPBiomeFeatures.YELLOW_POPLAR_TREE.configured(DefaultBiomeFeatures.NORMAL_TREE_CONFIG).weighted(0.3F), BOPBiomeFeatures.YELLOW_AUTUMN_TREE.configured(DefaultBiomeFeatures.NORMAL_TREE_CONFIG).weighted(0.15F)), BOPBiomeFeatures.TALL_SPRUCE_TREE.configured(DefaultBiomeFeatures.NORMAL_TREE_CONFIG))).decorated(Placement.COUNT_EXTRA_HEIGHTMAP.configured(new AtSurfaceWithExtraConfig(10, 0.4F, 1)))); + builder.addFeature(GenerationStage.Decoration.VEGETAL_DECORATION, Feature.RANDOM_SELECTOR.configured(new MultipleRandomFeatureConfig(ImmutableList.of(BOPBiomeFeatures.BIG_OAK_TREE.configured(Features.OAK.config()).weighted(0.075F), Feature.TREE.configured(Features.OAK.config()).weighted(0.15F), BOPBiomeFeatures.YELLOW_POPLAR_TREE.configured(Features.OAK.config()).weighted(0.3F), BOPBiomeFeatures.YELLOW_AUTUMN_TREE.configured(Features.OAK.config()).weighted(0.15F)), BOPBiomeFeatures.TALL_SPRUCE_TREE.configured(Features.OAK.config()))).decorated(Placement.COUNT_EXTRA.configured(new AtSurfaceWithExtraConfig(10, 0.4F, 1)))); - this.addFeature(GenerationStage.Decoration.VEGETAL_DECORATION, new FernGrassFeature(NoFeatureConfig.CODEC).configured(IFeatureConfig.NONE).decorated(Placement.COUNT_HEIGHTMAP_DOUBLE.configured(new FrequencyConfig(8)))); - this.addFeature(GenerationStage.Decoration.VEGETAL_DECORATION, Feature.RANDOM_PATCH.configured(BiomeFeatureHelper.createClusterConfiguration(BOPBlocks.bush.defaultBlockState())).decorated(Placement.COUNT_HEIGHTMAP_DOUBLE.configured(new FrequencyConfig(7)))); - this.addFeature(GenerationStage.Decoration.VEGETAL_DECORATION, Feature.FLOWER.configured(DefaultBiomeFeatures.DEFAULT_FLOWER_CONFIG).decorated(Placement.COUNT_HEIGHTMAP_32.configured(new FrequencyConfig(6)))); - this.addFeature(GenerationStage.Decoration.VEGETAL_DECORATION, Feature.RANDOM_PATCH.configured(DefaultBiomeFeatures.PUMPKIN_CONFIG).decorated(Placement.CHANCE_HEIGHTMAP_DOUBLE.configured(new ChanceConfig(32)))); + builder.addFeature(GenerationStage.Decoration.VEGETAL_DECORATION, new FernGrassFeature(NoFeatureConfig.CODEC).configured(IFeatureConfig.NONE).decorated(Features.Placements.HEIGHTMAP_DOUBLE_SQUARE).count(7)); + builder.addFeature(GenerationStage.Decoration.VEGETAL_DECORATION, Feature.RANDOM_PATCH.configured(BiomeFeatureHelper.createClusterConfiguration(BOPBlocks.bush.defaultBlockState())).decorated(Features.Placements.HEIGHTMAP_DOUBLE_SQUARE).count(7)); + builder.addFeature(GenerationStage.Decoration.VEGETAL_DECORATION, Features.FLOWER_DEFAULT); + builder.addFeature(GenerationStage.Decoration.VEGETAL_DECORATION, Features.PATCH_PUMPKIN); //////////////////////////////////////////////////////////// // Other Features - DefaultBiomeFeatures.addDefaultSprings(this); - DefaultBiomeFeatures.addSurfaceFreezing(this); - - // Entities - this.addSpawn(EntityClassification.CREATURE, new Biome.SpawnListEntry(EntityType.RABBIT, 4, 2, 3)); - this.addSpawn(EntityClassification.CREATURE, new Biome.SpawnListEntry(EntityType.SHEEP, 12, 4, 4)); - this.addSpawn(EntityClassification.CREATURE, new Biome.SpawnListEntry(EntityType.PIG, 10, 4, 4)); - this.addSpawn(EntityClassification.CREATURE, new Biome.SpawnListEntry(EntityType.CHICKEN, 10, 4, 4)); - this.addSpawn(EntityClassification.CREATURE, new Biome.SpawnListEntry(EntityType.COW, 8, 4, 4)); - this.addSpawn(EntityClassification.CREATURE, new Biome.SpawnListEntry(EntityType.WOLF, 5, 4, 4)); - this.addSpawn(EntityClassification.CREATURE, new Biome.SpawnListEntry(EntityType.FOX, 8, 2, 4)); - this.addSpawn(EntityClassification.AMBIENT, new Biome.SpawnListEntry(EntityType.BAT, 10, 8, 8)); - this.addSpawn(EntityClassification.MONSTER, new Biome.SpawnListEntry(EntityType.SPIDER, 100, 4, 4)); - this.addSpawn(EntityClassification.MONSTER, new Biome.SpawnListEntry(EntityType.ZOMBIE, 95, 4, 4)); - this.addSpawn(EntityClassification.MONSTER, new Biome.SpawnListEntry(EntityType.ZOMBIE_VILLAGER, 5, 1, 1)); - this.addSpawn(EntityClassification.MONSTER, new Biome.SpawnListEntry(EntityType.SKELETON, 100, 4, 4)); - this.addSpawn(EntityClassification.MONSTER, new Biome.SpawnListEntry(EntityType.CREEPER, 100, 4, 4)); - this.addSpawn(EntityClassification.MONSTER, new Biome.SpawnListEntry(EntityType.SLIME, 100, 4, 4)); - this.addSpawn(EntityClassification.MONSTER, new Biome.SpawnListEntry(EntityType.ENDERMAN, 10, 1, 4)); - this.addSpawn(EntityClassification.MONSTER, new Biome.SpawnListEntry(EntityType.WITCH, 5, 1, 1)); - - this.addWeight(BOPClimates.DRY_BOREAL, 7); - this.setBeachBiome(BOPBiomes.gravel_beach); - } - - @OnlyIn(Dist.CLIENT) - @Override - public int getGrassColor(double x, double z) - { - return 0x9FB771; + DefaultBiomeFeatures.addDefaultSprings(builder); + DefaultBiomeFeatures.addSurfaceFreezing(builder); } - @OnlyIn(Dist.CLIENT) @Override - public int getFoliageColor() + protected void configureMobSpawns(MobSpawnInfo.Builder builder) { - return 0xC9CE65; + builder.addSpawn(EntityClassification.CREATURE, new MobSpawnInfo.Spawners(EntityType.RABBIT, 4, 2, 3)); + builder.addSpawn(EntityClassification.CREATURE, new MobSpawnInfo.Spawners(EntityType.SHEEP, 12, 4, 4)); + builder.addSpawn(EntityClassification.CREATURE, new MobSpawnInfo.Spawners(EntityType.PIG, 10, 4, 4)); + builder.addSpawn(EntityClassification.CREATURE, new MobSpawnInfo.Spawners(EntityType.CHICKEN, 10, 4, 4)); + builder.addSpawn(EntityClassification.CREATURE, new MobSpawnInfo.Spawners(EntityType.COW, 8, 4, 4)); + builder.addSpawn(EntityClassification.CREATURE, new MobSpawnInfo.Spawners(EntityType.WOLF, 5, 4, 4)); + builder.addSpawn(EntityClassification.CREATURE, new MobSpawnInfo.Spawners(EntityType.FOX, 8, 2, 4)); + builder.addSpawn(EntityClassification.AMBIENT, new MobSpawnInfo.Spawners(EntityType.BAT, 10, 8, 8)); + builder.addSpawn(EntityClassification.MONSTER, new MobSpawnInfo.Spawners(EntityType.SPIDER, 100, 4, 4)); + builder.addSpawn(EntityClassification.MONSTER, new MobSpawnInfo.Spawners(EntityType.ZOMBIE, 95, 4, 4)); + builder.addSpawn(EntityClassification.MONSTER, new MobSpawnInfo.Spawners(EntityType.ZOMBIE_VILLAGER, 5, 1, 1)); + builder.addSpawn(EntityClassification.MONSTER, new MobSpawnInfo.Spawners(EntityType.SKELETON, 100, 4, 4)); + builder.addSpawn(EntityClassification.MONSTER, new MobSpawnInfo.Spawners(EntityType.CREEPER, 100, 4, 4)); + builder.addSpawn(EntityClassification.MONSTER, new MobSpawnInfo.Spawners(EntityType.SLIME, 100, 4, 4)); + builder.addSpawn(EntityClassification.MONSTER, new MobSpawnInfo.Spawners(EntityType.ENDERMAN, 10, 1, 4)); + builder.addSpawn(EntityClassification.MONSTER, new MobSpawnInfo.Spawners(EntityType.WITCH, 5, 1, 1)); } } diff --git a/src/main/java/biomesoplenty/common/biome/overworld/BrushlandBiome.java b/src/main/java/biomesoplenty/common/biome/overworld/BrushlandBiome.java index d424d474c..9fad1705d 100644 --- a/src/main/java/biomesoplenty/common/biome/overworld/BrushlandBiome.java +++ b/src/main/java/biomesoplenty/common/biome/overworld/BrushlandBiome.java @@ -9,7 +9,7 @@ package biomesoplenty.common.biome.overworld; import biomesoplenty.api.block.BOPBlocks; import biomesoplenty.api.enums.BOPClimates; -import biomesoplenty.common.biome.BiomeBOP; +import biomesoplenty.common.biome.BiomeTemplate; import biomesoplenty.common.world.biome.BiomeFeatureHelper; import biomesoplenty.common.world.gen.feature.BOPBiomeFeatures; import biomesoplenty.common.world.gen.feature.StandardGrassFeature; @@ -23,9 +23,6 @@ import net.minecraft.world.biome.DefaultBiomeFeatures; import net.minecraft.world.biome.MoodSoundAmbience; import net.minecraft.world.gen.GenerationStage; import net.minecraft.world.gen.feature.*; -import net.minecraft.world.gen.feature.structure.MineshaftConfig; -import net.minecraft.world.gen.feature.structure.MineshaftStructure; -import net.minecraft.world.gen.feature.structure.VillageConfig; import net.minecraft.world.gen.placement.AtSurfaceWithExtraConfig; import net.minecraft.world.gen.placement.ChanceConfig; import net.minecraft.world.gen.placement.FrequencyConfig; @@ -35,7 +32,7 @@ import net.minecraft.world.gen.surfacebuilders.SurfaceBuilder; import net.minecraftforge.api.distmarker.Dist; import net.minecraftforge.api.distmarker.OnlyIn; -public class BrushlandBiome extends BiomeBOP +public class BrushlandBiome extends BiomeTemplate { public BrushlandBiome() { diff --git a/src/main/java/biomesoplenty/common/biome/overworld/ChaparralBiome.java b/src/main/java/biomesoplenty/common/biome/overworld/ChaparralBiome.java index c35040c2e..30c71a7c6 100644 --- a/src/main/java/biomesoplenty/common/biome/overworld/ChaparralBiome.java +++ b/src/main/java/biomesoplenty/common/biome/overworld/ChaparralBiome.java @@ -9,7 +9,7 @@ package biomesoplenty.common.biome.overworld; import biomesoplenty.api.block.BOPBlocks; import biomesoplenty.api.enums.BOPClimates; -import biomesoplenty.common.biome.BiomeBOP; +import biomesoplenty.common.biome.BiomeTemplate; import biomesoplenty.common.world.biome.BiomeFeatureHelper; import biomesoplenty.common.world.gen.feature.BOPBiomeFeatures; import biomesoplenty.common.world.gen.feature.StandardGrassFeature; @@ -22,15 +22,13 @@ import net.minecraft.world.biome.DefaultBiomeFeatures; import net.minecraft.world.biome.MoodSoundAmbience; import net.minecraft.world.gen.GenerationStage; import net.minecraft.world.gen.feature.*; -import net.minecraft.world.gen.feature.structure.MineshaftConfig; -import net.minecraft.world.gen.feature.structure.MineshaftStructure; import net.minecraft.world.gen.placement.AtSurfaceWithExtraConfig; import net.minecraft.world.gen.placement.FrequencyConfig; import net.minecraft.world.gen.placement.Placement; import net.minecraft.world.gen.surfacebuilders.ConfiguredSurfaceBuilder; import net.minecraft.world.gen.surfacebuilders.SurfaceBuilder; -public class ChaparralBiome extends BiomeBOP +public class ChaparralBiome extends BiomeTemplate { public ChaparralBiome() { diff --git a/src/main/java/biomesoplenty/common/biome/overworld/CherryBlossomGroveBiome.java b/src/main/java/biomesoplenty/common/biome/overworld/CherryBlossomGroveBiome.java index c98a078b3..358139831 100644 --- a/src/main/java/biomesoplenty/common/biome/overworld/CherryBlossomGroveBiome.java +++ b/src/main/java/biomesoplenty/common/biome/overworld/CherryBlossomGroveBiome.java @@ -9,7 +9,7 @@ package biomesoplenty.common.biome.overworld; import biomesoplenty.api.block.BOPBlocks; import biomesoplenty.api.enums.BOPClimates; -import biomesoplenty.common.biome.BiomeBOP; +import biomesoplenty.common.biome.BiomeTemplate; import biomesoplenty.common.world.biome.BiomeFeatureHelper; import biomesoplenty.common.world.gen.feature.BOPBiomeFeatures; import biomesoplenty.common.world.gen.feature.StandardGrassFeature; @@ -17,22 +17,19 @@ import com.google.common.collect.ImmutableList; import net.minecraft.block.Blocks; import net.minecraft.entity.EntityClassification; import net.minecraft.entity.EntityType; -import net.minecraft.util.math.BlockPos; import net.minecraft.world.biome.Biome; import net.minecraft.world.biome.BiomeAmbience; import net.minecraft.world.biome.DefaultBiomeFeatures; import net.minecraft.world.biome.MoodSoundAmbience; import net.minecraft.world.gen.GenerationStage; import net.minecraft.world.gen.feature.*; -import net.minecraft.world.gen.feature.structure.MineshaftConfig; -import net.minecraft.world.gen.feature.structure.MineshaftStructure; import net.minecraft.world.gen.placement.*; import net.minecraft.world.gen.surfacebuilders.ConfiguredSurfaceBuilder; import net.minecraft.world.gen.surfacebuilders.SurfaceBuilder; import net.minecraftforge.api.distmarker.Dist; import net.minecraftforge.api.distmarker.OnlyIn; -public class CherryBlossomGroveBiome extends BiomeBOP +public class CherryBlossomGroveBiome extends BiomeTemplate { public CherryBlossomGroveBiome() { diff --git a/src/main/java/biomesoplenty/common/biome/overworld/ColdDesertBiome.java b/src/main/java/biomesoplenty/common/biome/overworld/ColdDesertBiome.java index a623c5017..cc8c49ff9 100644 --- a/src/main/java/biomesoplenty/common/biome/overworld/ColdDesertBiome.java +++ b/src/main/java/biomesoplenty/common/biome/overworld/ColdDesertBiome.java @@ -8,13 +8,12 @@ package biomesoplenty.common.biome.overworld; import biomesoplenty.api.enums.BOPClimates; -import biomesoplenty.common.biome.BiomeBOP; +import biomesoplenty.common.biome.BiomeTemplate; import biomesoplenty.common.world.gen.feature.BOPBiomeFeatures; import biomesoplenty.common.world.gen.feature.WastelandGrassFeature; import net.minecraft.block.Blocks; import net.minecraft.entity.EntityClassification; import net.minecraft.entity.EntityType; -import net.minecraft.util.math.BlockPos; import net.minecraft.world.biome.Biome; import net.minecraft.world.biome.BiomeAmbience; import net.minecraft.world.biome.DefaultBiomeFeatures; @@ -24,9 +23,6 @@ import net.minecraft.world.gen.feature.BlockStateFeatureConfig; import net.minecraft.world.gen.feature.Feature; import net.minecraft.world.gen.feature.IFeatureConfig; import net.minecraft.world.gen.feature.NoFeatureConfig; -import net.minecraft.world.gen.feature.structure.MineshaftConfig; -import net.minecraft.world.gen.feature.structure.MineshaftStructure; -import net.minecraft.world.gen.feature.structure.VillageConfig; import net.minecraft.world.gen.placement.ChanceConfig; import net.minecraft.world.gen.placement.FrequencyConfig; import net.minecraft.world.gen.placement.Placement; @@ -35,7 +31,7 @@ import net.minecraft.world.gen.surfacebuilders.SurfaceBuilder; import net.minecraftforge.api.distmarker.Dist; import net.minecraftforge.api.distmarker.OnlyIn; -public class ColdDesertBiome extends BiomeBOP +public class ColdDesertBiome extends BiomeTemplate { public ColdDesertBiome() { diff --git a/src/main/java/biomesoplenty/common/biome/overworld/ConiferousForestBiome.java b/src/main/java/biomesoplenty/common/biome/overworld/ConiferousForestBiome.java index 63ac5b769..2395a61d3 100644 --- a/src/main/java/biomesoplenty/common/biome/overworld/ConiferousForestBiome.java +++ b/src/main/java/biomesoplenty/common/biome/overworld/ConiferousForestBiome.java @@ -10,7 +10,7 @@ package biomesoplenty.common.biome.overworld; import biomesoplenty.api.biome.BOPBiomes; import biomesoplenty.api.block.BOPBlocks; import biomesoplenty.api.enums.BOPClimates; -import biomesoplenty.common.biome.BiomeBOP; +import biomesoplenty.common.biome.BiomeTemplate; import biomesoplenty.common.world.biome.BiomeFeatureHelper; import biomesoplenty.common.world.gen.feature.BOPBiomeFeatures; import biomesoplenty.common.world.gen.feature.FernGrassFeature; @@ -24,14 +24,11 @@ import net.minecraft.world.biome.DefaultBiomeFeatures; import net.minecraft.world.biome.MoodSoundAmbience; import net.minecraft.world.gen.GenerationStage; import net.minecraft.world.gen.feature.*; -import net.minecraft.world.gen.feature.structure.MineshaftConfig; -import net.minecraft.world.gen.feature.structure.MineshaftStructure; -import net.minecraft.world.gen.feature.structure.VillageConfig; import net.minecraft.world.gen.placement.*; import net.minecraft.world.gen.surfacebuilders.ConfiguredSurfaceBuilder; import net.minecraft.world.gen.surfacebuilders.SurfaceBuilder; -public class ConiferousForestBiome extends BiomeBOP +public class ConiferousForestBiome extends BiomeTemplate { public ConiferousForestBiome() { diff --git a/src/main/java/biomesoplenty/common/biome/overworld/DeadForestBiome.java b/src/main/java/biomesoplenty/common/biome/overworld/DeadForestBiome.java index 3a0df4b01..f87b5f267 100644 --- a/src/main/java/biomesoplenty/common/biome/overworld/DeadForestBiome.java +++ b/src/main/java/biomesoplenty/common/biome/overworld/DeadForestBiome.java @@ -9,13 +9,12 @@ package biomesoplenty.common.biome.overworld; import biomesoplenty.api.biome.BOPBiomes; import biomesoplenty.api.enums.BOPClimates; -import biomesoplenty.common.biome.BiomeBOP; +import biomesoplenty.common.biome.BiomeTemplate; import biomesoplenty.common.world.gen.feature.BOPBiomeFeatures; import biomesoplenty.common.world.gen.feature.StandardGrassFeature; import com.google.common.collect.ImmutableList; import net.minecraft.entity.EntityClassification; import net.minecraft.entity.EntityType; -import net.minecraft.util.math.BlockPos; import net.minecraft.world.biome.Biome; import net.minecraft.world.biome.BiomeAmbience; import net.minecraft.world.biome.DefaultBiomeFeatures; @@ -25,8 +24,6 @@ import net.minecraft.world.gen.feature.Feature; import net.minecraft.world.gen.feature.IFeatureConfig; import net.minecraft.world.gen.feature.MultipleRandomFeatureConfig; import net.minecraft.world.gen.feature.NoFeatureConfig; -import net.minecraft.world.gen.feature.structure.MineshaftConfig; -import net.minecraft.world.gen.feature.structure.MineshaftStructure; import net.minecraft.world.gen.placement.AtSurfaceWithExtraConfig; import net.minecraft.world.gen.placement.ChanceConfig; import net.minecraft.world.gen.placement.FrequencyConfig; @@ -36,7 +33,7 @@ import net.minecraft.world.gen.surfacebuilders.SurfaceBuilder; import net.minecraftforge.api.distmarker.Dist; import net.minecraftforge.api.distmarker.OnlyIn; -public class DeadForestBiome extends BiomeBOP +public class DeadForestBiome extends BiomeTemplate { public DeadForestBiome() { diff --git a/src/main/java/biomesoplenty/common/biome/overworld/FirClearingBiome.java b/src/main/java/biomesoplenty/common/biome/overworld/FirClearingBiome.java index c601f7e40..8b9081890 100644 --- a/src/main/java/biomesoplenty/common/biome/overworld/FirClearingBiome.java +++ b/src/main/java/biomesoplenty/common/biome/overworld/FirClearingBiome.java @@ -9,26 +9,23 @@ package biomesoplenty.common.biome.overworld; import biomesoplenty.api.biome.BOPBiomes; import biomesoplenty.api.block.BOPBlocks; -import biomesoplenty.common.biome.BiomeBOP; +import biomesoplenty.common.biome.BiomeTemplate; import biomesoplenty.common.world.biome.BiomeFeatureHelper; import biomesoplenty.common.world.gen.feature.BOPBiomeFeatures; import biomesoplenty.common.world.gen.feature.FernGrassFeature; import net.minecraft.block.Blocks; import net.minecraft.entity.EntityClassification; import net.minecraft.entity.EntityType; -import net.minecraft.world.biome.Biome; import net.minecraft.world.biome.BiomeAmbience; import net.minecraft.world.biome.DefaultBiomeFeatures; import net.minecraft.world.biome.MoodSoundAmbience; import net.minecraft.world.gen.GenerationStage; import net.minecraft.world.gen.feature.*; -import net.minecraft.world.gen.feature.structure.MineshaftConfig; -import net.minecraft.world.gen.feature.structure.MineshaftStructure; import net.minecraft.world.gen.placement.*; import net.minecraft.world.gen.surfacebuilders.ConfiguredSurfaceBuilder; import net.minecraft.world.gen.surfacebuilders.SurfaceBuilder; -public class FirClearingBiome extends BiomeBOP +public class FirClearingBiome extends BiomeTemplate { public FirClearingBiome() { diff --git a/src/main/java/biomesoplenty/common/biome/overworld/FloodplainBiome.java b/src/main/java/biomesoplenty/common/biome/overworld/FloodplainBiome.java index 4155d71a6..b705497e1 100644 --- a/src/main/java/biomesoplenty/common/biome/overworld/FloodplainBiome.java +++ b/src/main/java/biomesoplenty/common/biome/overworld/FloodplainBiome.java @@ -9,7 +9,7 @@ package biomesoplenty.common.biome.overworld; import biomesoplenty.api.block.BOPBlocks; import biomesoplenty.api.enums.BOPClimates; -import biomesoplenty.common.biome.BiomeBOP; +import biomesoplenty.common.biome.BiomeTemplate; import biomesoplenty.common.world.biome.BiomeFeatureHelper; import biomesoplenty.common.world.gen.feature.BOPBiomeFeatures; import biomesoplenty.common.world.gen.feature.StandardGrassFeature; @@ -23,13 +23,11 @@ import net.minecraft.world.biome.DefaultBiomeFeatures; import net.minecraft.world.biome.MoodSoundAmbience; import net.minecraft.world.gen.GenerationStage; import net.minecraft.world.gen.feature.*; -import net.minecraft.world.gen.feature.structure.MineshaftConfig; -import net.minecraft.world.gen.feature.structure.MineshaftStructure; import net.minecraft.world.gen.placement.*; import net.minecraft.world.gen.surfacebuilders.ConfiguredSurfaceBuilder; import net.minecraft.world.gen.surfacebuilders.SurfaceBuilder; -public class FloodplainBiome extends BiomeBOP +public class FloodplainBiome extends BiomeTemplate { public FloodplainBiome() { diff --git a/src/main/java/biomesoplenty/common/biome/overworld/FlowerMeadowBiome.java b/src/main/java/biomesoplenty/common/biome/overworld/FlowerMeadowBiome.java index daf6429dd..776ec8fd0 100644 --- a/src/main/java/biomesoplenty/common/biome/overworld/FlowerMeadowBiome.java +++ b/src/main/java/biomesoplenty/common/biome/overworld/FlowerMeadowBiome.java @@ -9,7 +9,7 @@ package biomesoplenty.common.biome.overworld; import biomesoplenty.api.biome.BOPBiomes; import biomesoplenty.api.block.BOPBlocks; -import biomesoplenty.common.biome.BiomeBOP; +import biomesoplenty.common.biome.BiomeTemplate; import biomesoplenty.common.world.biome.BiomeFeatureHelper; import biomesoplenty.common.world.gen.feature.BOPBiomeFeatures; import biomesoplenty.common.world.gen.feature.StandardGrassFeature; @@ -17,15 +17,12 @@ import com.google.common.collect.ImmutableList; import net.minecraft.block.Blocks; import net.minecraft.entity.EntityClassification; import net.minecraft.entity.EntityType; -import net.minecraft.util.math.BlockPos; import net.minecraft.world.biome.Biome; import net.minecraft.world.biome.BiomeAmbience; import net.minecraft.world.biome.DefaultBiomeFeatures; import net.minecraft.world.biome.MoodSoundAmbience; import net.minecraft.world.gen.GenerationStage; import net.minecraft.world.gen.feature.*; -import net.minecraft.world.gen.feature.structure.MineshaftConfig; -import net.minecraft.world.gen.feature.structure.MineshaftStructure; import net.minecraft.world.gen.placement.AtSurfaceWithExtraConfig; import net.minecraft.world.gen.placement.FrequencyConfig; import net.minecraft.world.gen.placement.Placement; @@ -34,7 +31,7 @@ import net.minecraft.world.gen.surfacebuilders.SurfaceBuilder; import net.minecraftforge.api.distmarker.Dist; import net.minecraftforge.api.distmarker.OnlyIn; -public class FlowerMeadowBiome extends BiomeBOP +public class FlowerMeadowBiome extends BiomeTemplate { public FlowerMeadowBiome() { diff --git a/src/main/java/biomesoplenty/common/biome/overworld/FungalJungleBiome.java b/src/main/java/biomesoplenty/common/biome/overworld/FungalJungleBiome.java index 74e9f4274..8412b6a2a 100644 --- a/src/main/java/biomesoplenty/common/biome/overworld/FungalJungleBiome.java +++ b/src/main/java/biomesoplenty/common/biome/overworld/FungalJungleBiome.java @@ -9,13 +9,10 @@ package biomesoplenty.common.biome.overworld; import biomesoplenty.api.block.BOPBlocks; import biomesoplenty.api.enums.BOPClimates; -import biomesoplenty.common.biome.BiomeBOP; +import biomesoplenty.common.biome.BiomeTemplate; import biomesoplenty.common.world.biome.BiomeFeatureHelper; import biomesoplenty.common.world.gen.feature.BOPBiomeFeatures; import biomesoplenty.common.world.gen.feature.FernGrassFeature; -import biomesoplenty.common.world.gen.feature.StandardGrassFeature; -import com.google.common.collect.ImmutableList; -import com.google.common.collect.Lists; import net.minecraft.block.Blocks; import net.minecraft.entity.EntityClassification; import net.minecraft.entity.EntityType; @@ -25,15 +22,13 @@ import net.minecraft.world.biome.DefaultBiomeFeatures; import net.minecraft.world.biome.MoodSoundAmbience; import net.minecraft.world.gen.GenerationStage; import net.minecraft.world.gen.feature.*; -import net.minecraft.world.gen.feature.structure.MineshaftConfig; -import net.minecraft.world.gen.feature.structure.MineshaftStructure; import net.minecraft.world.gen.placement.*; import net.minecraft.world.gen.surfacebuilders.ConfiguredSurfaceBuilder; import net.minecraft.world.gen.surfacebuilders.SurfaceBuilder; import net.minecraftforge.api.distmarker.Dist; import net.minecraftforge.api.distmarker.OnlyIn; -public class FungalJungleBiome extends BiomeBOP +public class FungalJungleBiome extends BiomeTemplate { public FungalJungleBiome() { diff --git a/src/main/java/biomesoplenty/common/biome/overworld/GrasslandBiome.java b/src/main/java/biomesoplenty/common/biome/overworld/GrasslandBiome.java index 68a2e8323..1ff33e44e 100644 --- a/src/main/java/biomesoplenty/common/biome/overworld/GrasslandBiome.java +++ b/src/main/java/biomesoplenty/common/biome/overworld/GrasslandBiome.java @@ -8,24 +8,17 @@ package biomesoplenty.common.biome.overworld; import biomesoplenty.api.biome.BOPBiomes; -import biomesoplenty.api.block.BOPBlocks; import biomesoplenty.api.enums.BOPClimates; -import biomesoplenty.common.biome.BiomeBOP; -import biomesoplenty.common.world.biome.BiomeFeatureHelper; -import biomesoplenty.common.world.gen.feature.BOPBiomeFeatures; +import biomesoplenty.common.biome.BiomeTemplate; import biomesoplenty.common.world.gen.feature.StandardGrassFeature; import net.minecraft.entity.EntityClassification; import net.minecraft.entity.EntityType; -import net.minecraft.util.math.BlockPos; import net.minecraft.world.biome.Biome; import net.minecraft.world.biome.BiomeAmbience; import net.minecraft.world.biome.DefaultBiomeFeatures; import net.minecraft.world.biome.MoodSoundAmbience; import net.minecraft.world.gen.GenerationStage; import net.minecraft.world.gen.feature.*; -import net.minecraft.world.gen.feature.structure.MineshaftConfig; -import net.minecraft.world.gen.feature.structure.MineshaftStructure; -import net.minecraft.world.gen.feature.structure.VillageConfig; import net.minecraft.world.gen.placement.FrequencyConfig; import net.minecraft.world.gen.placement.Placement; import net.minecraft.world.gen.surfacebuilders.ConfiguredSurfaceBuilder; @@ -33,7 +26,7 @@ import net.minecraft.world.gen.surfacebuilders.SurfaceBuilder; import net.minecraftforge.api.distmarker.Dist; import net.minecraftforge.api.distmarker.OnlyIn; -public class GrasslandBiome extends BiomeBOP +public class GrasslandBiome extends BiomeTemplate { public GrasslandBiome() { diff --git a/src/main/java/biomesoplenty/common/biome/overworld/GravelBeachBiome.java b/src/main/java/biomesoplenty/common/biome/overworld/GravelBeachBiome.java index f7af09c45..8e1c37aa1 100644 --- a/src/main/java/biomesoplenty/common/biome/overworld/GravelBeachBiome.java +++ b/src/main/java/biomesoplenty/common/biome/overworld/GravelBeachBiome.java @@ -7,22 +7,18 @@ ******************************************************************************/ package biomesoplenty.common.biome.overworld; -import biomesoplenty.common.biome.BiomeBOP; +import biomesoplenty.common.biome.BiomeTemplate; import net.minecraft.entity.EntityClassification; import net.minecraft.entity.EntityType; import net.minecraft.world.biome.Biome; import net.minecraft.world.biome.BiomeAmbience; import net.minecraft.world.biome.DefaultBiomeFeatures; import net.minecraft.world.biome.MoodSoundAmbience; -import net.minecraft.world.gen.feature.Feature; import net.minecraft.world.gen.feature.structure.BuriedTreasureConfig; -import net.minecraft.world.gen.feature.structure.MineshaftConfig; -import net.minecraft.world.gen.feature.structure.MineshaftStructure; -import net.minecraft.world.gen.feature.structure.ShipwreckConfig; import net.minecraft.world.gen.surfacebuilders.ConfiguredSurfaceBuilder; import net.minecraft.world.gen.surfacebuilders.SurfaceBuilder; -public class GravelBeachBiome extends BiomeBOP +public class GravelBeachBiome extends BiomeTemplate { public GravelBeachBiome() { diff --git a/src/main/java/biomesoplenty/common/biome/overworld/GroveBiome.java b/src/main/java/biomesoplenty/common/biome/overworld/GroveBiome.java index ebad1425c..738be39a1 100644 --- a/src/main/java/biomesoplenty/common/biome/overworld/GroveBiome.java +++ b/src/main/java/biomesoplenty/common/biome/overworld/GroveBiome.java @@ -9,7 +9,7 @@ package biomesoplenty.common.biome.overworld; import biomesoplenty.api.block.BOPBlocks; import biomesoplenty.api.enums.BOPClimates; -import biomesoplenty.common.biome.BiomeBOP; +import biomesoplenty.common.biome.BiomeTemplate; import biomesoplenty.common.world.biome.BiomeFeatureHelper; import biomesoplenty.common.world.gen.feature.BOPBiomeFeatures; import biomesoplenty.common.world.gen.feature.StandardGrassFeature; @@ -23,9 +23,6 @@ import net.minecraft.world.biome.DefaultBiomeFeatures; import net.minecraft.world.biome.MoodSoundAmbience; import net.minecraft.world.gen.GenerationStage; import net.minecraft.world.gen.feature.*; -import net.minecraft.world.gen.feature.structure.MineshaftConfig; -import net.minecraft.world.gen.feature.structure.MineshaftStructure; -import net.minecraft.world.gen.feature.structure.VillageConfig; import net.minecraft.world.gen.placement.AtSurfaceWithExtraConfig; import net.minecraft.world.gen.placement.ChanceConfig; import net.minecraft.world.gen.placement.FrequencyConfig; @@ -33,7 +30,7 @@ import net.minecraft.world.gen.placement.Placement; import net.minecraft.world.gen.surfacebuilders.ConfiguredSurfaceBuilder; import net.minecraft.world.gen.surfacebuilders.SurfaceBuilder; -public class GroveBiome extends BiomeBOP +public class GroveBiome extends BiomeTemplate { public GroveBiome() { diff --git a/src/main/java/biomesoplenty/common/biome/overworld/HighlandBiome.java b/src/main/java/biomesoplenty/common/biome/overworld/HighlandBiome.java index 3beb76203..068b6760f 100644 --- a/src/main/java/biomesoplenty/common/biome/overworld/HighlandBiome.java +++ b/src/main/java/biomesoplenty/common/biome/overworld/HighlandBiome.java @@ -8,7 +8,7 @@ package biomesoplenty.common.biome.overworld; import biomesoplenty.api.enums.BOPClimates; -import biomesoplenty.common.biome.BiomeBOP; +import biomesoplenty.common.biome.BiomeTemplate; import biomesoplenty.common.world.biome.BiomeFeatureHelper; import biomesoplenty.common.world.gen.feature.StandardGrassFeature; import net.minecraft.block.Blocks; @@ -22,14 +22,12 @@ import net.minecraft.world.gen.GenerationStage; import net.minecraft.world.gen.feature.Feature; import net.minecraft.world.gen.feature.IFeatureConfig; import net.minecraft.world.gen.feature.NoFeatureConfig; -import net.minecraft.world.gen.feature.structure.MineshaftConfig; -import net.minecraft.world.gen.feature.structure.MineshaftStructure; import net.minecraft.world.gen.placement.FrequencyConfig; import net.minecraft.world.gen.placement.Placement; import net.minecraft.world.gen.surfacebuilders.ConfiguredSurfaceBuilder; import net.minecraft.world.gen.surfacebuilders.SurfaceBuilder; -public class HighlandBiome extends BiomeBOP +public class HighlandBiome extends BiomeTemplate { public HighlandBiome() { diff --git a/src/main/java/biomesoplenty/common/biome/overworld/HighlandMoorBiome.java b/src/main/java/biomesoplenty/common/biome/overworld/HighlandMoorBiome.java index e654f91fc..6ed95c9c6 100644 --- a/src/main/java/biomesoplenty/common/biome/overworld/HighlandMoorBiome.java +++ b/src/main/java/biomesoplenty/common/biome/overworld/HighlandMoorBiome.java @@ -7,32 +7,26 @@ ******************************************************************************/ package biomesoplenty.common.biome.overworld; -import biomesoplenty.api.block.BOPBlocks; -import biomesoplenty.common.biome.BiomeBOP; +import biomesoplenty.common.biome.BiomeTemplate; import biomesoplenty.common.world.biome.BiomeFeatureHelper; import biomesoplenty.common.world.gen.feature.BOPBiomeFeatures; import biomesoplenty.common.world.gen.feature.StandardGrassFeature; -import com.google.common.collect.Lists; -import net.minecraft.block.BlockState; import net.minecraft.block.Blocks; import net.minecraft.entity.EntityClassification; import net.minecraft.entity.EntityType; -import net.minecraft.util.math.BlockPos; import net.minecraft.world.biome.Biome; import net.minecraft.world.biome.BiomeAmbience; import net.minecraft.world.biome.DefaultBiomeFeatures; import net.minecraft.world.biome.MoodSoundAmbience; import net.minecraft.world.gen.GenerationStage; import net.minecraft.world.gen.feature.*; -import net.minecraft.world.gen.feature.structure.MineshaftConfig; -import net.minecraft.world.gen.feature.structure.MineshaftStructure; import net.minecraft.world.gen.placement.*; import net.minecraft.world.gen.surfacebuilders.ConfiguredSurfaceBuilder; import net.minecraft.world.gen.surfacebuilders.SurfaceBuilder; import net.minecraftforge.api.distmarker.Dist; import net.minecraftforge.api.distmarker.OnlyIn; -public class HighlandMoorBiome extends BiomeBOP +public class HighlandMoorBiome extends BiomeTemplate { public HighlandMoorBiome() { diff --git a/src/main/java/biomesoplenty/common/biome/overworld/LavenderFieldBiome.java b/src/main/java/biomesoplenty/common/biome/overworld/LavenderFieldBiome.java index 585d6d3e3..c10919c5a 100644 --- a/src/main/java/biomesoplenty/common/biome/overworld/LavenderFieldBiome.java +++ b/src/main/java/biomesoplenty/common/biome/overworld/LavenderFieldBiome.java @@ -8,13 +8,12 @@ package biomesoplenty.common.biome.overworld; import biomesoplenty.api.enums.BOPClimates; -import biomesoplenty.common.biome.BiomeBOP; +import biomesoplenty.common.biome.BiomeTemplate; import biomesoplenty.common.world.gen.feature.BOPBiomeFeatures; import biomesoplenty.common.world.gen.feature.StandardGrassFeature; import com.google.common.collect.ImmutableList; import net.minecraft.entity.EntityClassification; import net.minecraft.entity.EntityType; -import net.minecraft.util.math.BlockPos; import net.minecraft.world.biome.Biome; import net.minecraft.world.biome.BiomeAmbience; import net.minecraft.world.biome.DefaultBiomeFeatures; @@ -24,8 +23,6 @@ import net.minecraft.world.gen.feature.Feature; import net.minecraft.world.gen.feature.IFeatureConfig; import net.minecraft.world.gen.feature.MultipleRandomFeatureConfig; import net.minecraft.world.gen.feature.NoFeatureConfig; -import net.minecraft.world.gen.feature.structure.MineshaftConfig; -import net.minecraft.world.gen.feature.structure.MineshaftStructure; import net.minecraft.world.gen.placement.AtSurfaceWithExtraConfig; import net.minecraft.world.gen.placement.FrequencyConfig; import net.minecraft.world.gen.placement.Placement; @@ -34,7 +31,7 @@ import net.minecraft.world.gen.surfacebuilders.SurfaceBuilder; import net.minecraftforge.api.distmarker.Dist; import net.minecraftforge.api.distmarker.OnlyIn; -public class LavenderFieldBiome extends BiomeBOP +public class LavenderFieldBiome extends BiomeTemplate { public LavenderFieldBiome() { diff --git a/src/main/java/biomesoplenty/common/biome/overworld/LushGrasslandBiome.java b/src/main/java/biomesoplenty/common/biome/overworld/LushGrasslandBiome.java index 297db0a46..400eac146 100644 --- a/src/main/java/biomesoplenty/common/biome/overworld/LushGrasslandBiome.java +++ b/src/main/java/biomesoplenty/common/biome/overworld/LushGrasslandBiome.java @@ -10,7 +10,7 @@ package biomesoplenty.common.biome.overworld; import biomesoplenty.api.biome.BOPBiomes; import biomesoplenty.api.block.BOPBlocks; import biomesoplenty.api.enums.BOPClimates; -import biomesoplenty.common.biome.BiomeBOP; +import biomesoplenty.common.biome.BiomeTemplate; import biomesoplenty.common.world.biome.BiomeFeatureHelper; import biomesoplenty.common.world.gen.feature.BOPBiomeFeatures; import biomesoplenty.common.world.gen.feature.StandardGrassFeature; @@ -24,13 +24,11 @@ import net.minecraft.world.biome.DefaultBiomeFeatures; import net.minecraft.world.biome.MoodSoundAmbience; import net.minecraft.world.gen.GenerationStage; import net.minecraft.world.gen.feature.*; -import net.minecraft.world.gen.feature.structure.MineshaftConfig; -import net.minecraft.world.gen.feature.structure.MineshaftStructure; import net.minecraft.world.gen.placement.*; import net.minecraft.world.gen.surfacebuilders.ConfiguredSurfaceBuilder; import net.minecraft.world.gen.surfacebuilders.SurfaceBuilder; -public class LushGrasslandBiome extends BiomeBOP +public class LushGrasslandBiome extends BiomeTemplate { public LushGrasslandBiome() { diff --git a/src/main/java/biomesoplenty/common/biome/overworld/LushSwampBiome.java b/src/main/java/biomesoplenty/common/biome/overworld/LushSwampBiome.java index e988e02f7..1d2dc5dea 100644 --- a/src/main/java/biomesoplenty/common/biome/overworld/LushSwampBiome.java +++ b/src/main/java/biomesoplenty/common/biome/overworld/LushSwampBiome.java @@ -9,7 +9,7 @@ package biomesoplenty.common.biome.overworld; import biomesoplenty.api.block.BOPBlocks; import biomesoplenty.api.enums.BOPClimates; -import biomesoplenty.common.biome.BiomeBOP; +import biomesoplenty.common.biome.BiomeTemplate; import biomesoplenty.common.world.biome.BiomeFeatureHelper; import biomesoplenty.common.world.gen.feature.BOPBiomeFeatures; import biomesoplenty.common.world.gen.feature.StandardGrassFeature; @@ -22,13 +22,11 @@ import net.minecraft.world.biome.DefaultBiomeFeatures; import net.minecraft.world.biome.MoodSoundAmbience; import net.minecraft.world.gen.GenerationStage; import net.minecraft.world.gen.feature.*; -import net.minecraft.world.gen.feature.structure.MineshaftConfig; -import net.minecraft.world.gen.feature.structure.MineshaftStructure; import net.minecraft.world.gen.placement.*; import net.minecraft.world.gen.surfacebuilders.ConfiguredSurfaceBuilder; import net.minecraft.world.gen.surfacebuilders.SurfaceBuilder; -public class LushSwampBiome extends BiomeBOP +public class LushSwampBiome extends BiomeTemplate { public LushSwampBiome() { diff --git a/src/main/java/biomesoplenty/common/biome/overworld/MangroveBiome.java b/src/main/java/biomesoplenty/common/biome/overworld/MangroveBiome.java index 2e37793da..e2a668bbc 100644 --- a/src/main/java/biomesoplenty/common/biome/overworld/MangroveBiome.java +++ b/src/main/java/biomesoplenty/common/biome/overworld/MangroveBiome.java @@ -9,7 +9,7 @@ package biomesoplenty.common.biome.overworld; import biomesoplenty.api.block.BOPBlocks; import biomesoplenty.api.enums.BOPClimates; -import biomesoplenty.common.biome.BiomeBOP; +import biomesoplenty.common.biome.BiomeTemplate; import biomesoplenty.common.world.biome.BiomeFeatureHelper; import biomesoplenty.common.world.gen.feature.BOPBiomeFeatures; import biomesoplenty.common.world.gen.feature.StandardGrassFeature; @@ -24,13 +24,11 @@ import net.minecraft.world.biome.DefaultBiomeFeatures; import net.minecraft.world.biome.MoodSoundAmbience; import net.minecraft.world.gen.GenerationStage; import net.minecraft.world.gen.feature.*; -import net.minecraft.world.gen.feature.structure.MineshaftConfig; -import net.minecraft.world.gen.feature.structure.MineshaftStructure; import net.minecraft.world.gen.placement.*; import net.minecraft.world.gen.surfacebuilders.ConfiguredSurfaceBuilder; import net.minecraft.world.gen.surfacebuilders.SurfaceBuilder; -public class MangroveBiome extends BiomeBOP +public class MangroveBiome extends BiomeTemplate { public MangroveBiome() { diff --git a/src/main/java/biomesoplenty/common/biome/overworld/MapleWoodsBiome.java b/src/main/java/biomesoplenty/common/biome/overworld/MapleWoodsBiome.java index f612adf56..bf4581a34 100644 --- a/src/main/java/biomesoplenty/common/biome/overworld/MapleWoodsBiome.java +++ b/src/main/java/biomesoplenty/common/biome/overworld/MapleWoodsBiome.java @@ -9,7 +9,7 @@ package biomesoplenty.common.biome.overworld; import biomesoplenty.api.biome.BOPBiomes; import biomesoplenty.api.enums.BOPClimates; -import biomesoplenty.common.biome.BiomeBOP; +import biomesoplenty.common.biome.BiomeTemplate; import biomesoplenty.common.world.gen.feature.BOPBiomeFeatures; import biomesoplenty.common.world.gen.feature.StandardGrassFeature; import com.google.common.collect.ImmutableList; @@ -24,9 +24,6 @@ import net.minecraft.world.gen.feature.Feature; import net.minecraft.world.gen.feature.IFeatureConfig; import net.minecraft.world.gen.feature.MultipleRandomFeatureConfig; import net.minecraft.world.gen.feature.NoFeatureConfig; -import net.minecraft.world.gen.feature.structure.MineshaftConfig; -import net.minecraft.world.gen.feature.structure.MineshaftStructure; -import net.minecraft.world.gen.feature.structure.VillageConfig; import net.minecraft.world.gen.placement.AtSurfaceWithExtraConfig; import net.minecraft.world.gen.placement.ChanceConfig; import net.minecraft.world.gen.placement.FrequencyConfig; @@ -34,7 +31,7 @@ import net.minecraft.world.gen.placement.Placement; import net.minecraft.world.gen.surfacebuilders.ConfiguredSurfaceBuilder; import net.minecraft.world.gen.surfacebuilders.SurfaceBuilder; -public class MapleWoodsBiome extends BiomeBOP +public class MapleWoodsBiome extends BiomeTemplate { public MapleWoodsBiome() { diff --git a/src/main/java/biomesoplenty/common/biome/overworld/MarshBiome.java b/src/main/java/biomesoplenty/common/biome/overworld/MarshBiome.java index fe5686844..d2fedc3a8 100644 --- a/src/main/java/biomesoplenty/common/biome/overworld/MarshBiome.java +++ b/src/main/java/biomesoplenty/common/biome/overworld/MarshBiome.java @@ -9,7 +9,7 @@ package biomesoplenty.common.biome.overworld; import biomesoplenty.api.block.BOPBlocks; import biomesoplenty.api.enums.BOPClimates; -import biomesoplenty.common.biome.BiomeBOP; +import biomesoplenty.common.biome.BiomeTemplate; import biomesoplenty.common.world.biome.BiomeFeatureHelper; import biomesoplenty.common.world.gen.feature.BOPBiomeFeatures; import biomesoplenty.common.world.gen.feature.StandardGrassFeature; @@ -22,8 +22,6 @@ import net.minecraft.world.biome.DefaultBiomeFeatures; import net.minecraft.world.biome.MoodSoundAmbience; import net.minecraft.world.gen.GenerationStage; import net.minecraft.world.gen.feature.*; -import net.minecraft.world.gen.feature.structure.MineshaftConfig; -import net.minecraft.world.gen.feature.structure.MineshaftStructure; import net.minecraft.world.gen.placement.ChanceConfig; import net.minecraft.world.gen.placement.FrequencyConfig; import net.minecraft.world.gen.placement.IPlacementConfig; @@ -31,7 +29,7 @@ import net.minecraft.world.gen.placement.Placement; import net.minecraft.world.gen.surfacebuilders.ConfiguredSurfaceBuilder; import net.minecraft.world.gen.surfacebuilders.SurfaceBuilder; -public class MarshBiome extends BiomeBOP +public class MarshBiome extends BiomeTemplate { public MarshBiome() { diff --git a/src/main/java/biomesoplenty/common/biome/overworld/MeadowBiome.java b/src/main/java/biomesoplenty/common/biome/overworld/MeadowBiome.java index e30cd89f1..829f11823 100644 --- a/src/main/java/biomesoplenty/common/biome/overworld/MeadowBiome.java +++ b/src/main/java/biomesoplenty/common/biome/overworld/MeadowBiome.java @@ -10,7 +10,7 @@ package biomesoplenty.common.biome.overworld; import biomesoplenty.api.biome.BOPBiomes; import biomesoplenty.api.block.BOPBlocks; import biomesoplenty.api.enums.BOPClimates; -import biomesoplenty.common.biome.BiomeBOP; +import biomesoplenty.common.biome.BiomeTemplate; import biomesoplenty.common.world.biome.BiomeFeatureHelper; import biomesoplenty.common.world.gen.feature.BOPBiomeFeatures; import biomesoplenty.common.world.gen.feature.StandardGrassFeature; @@ -18,16 +18,12 @@ import com.google.common.collect.ImmutableList; import net.minecraft.block.Blocks; import net.minecraft.entity.EntityClassification; import net.minecraft.entity.EntityType; -import net.minecraft.util.math.BlockPos; import net.minecraft.world.biome.Biome; import net.minecraft.world.biome.BiomeAmbience; import net.minecraft.world.biome.DefaultBiomeFeatures; import net.minecraft.world.biome.MoodSoundAmbience; import net.minecraft.world.gen.GenerationStage; import net.minecraft.world.gen.feature.*; -import net.minecraft.world.gen.feature.structure.MineshaftConfig; -import net.minecraft.world.gen.feature.structure.MineshaftStructure; -import net.minecraft.world.gen.feature.structure.VillageConfig; import net.minecraft.world.gen.placement.AtSurfaceWithExtraConfig; import net.minecraft.world.gen.placement.ChanceConfig; import net.minecraft.world.gen.placement.FrequencyConfig; @@ -37,7 +33,7 @@ import net.minecraft.world.gen.surfacebuilders.SurfaceBuilder; import net.minecraftforge.api.distmarker.Dist; import net.minecraftforge.api.distmarker.OnlyIn; -public class MeadowBiome extends BiomeBOP +public class MeadowBiome extends BiomeTemplate { public MeadowBiome() { diff --git a/src/main/java/biomesoplenty/common/biome/overworld/MireBiome.java b/src/main/java/biomesoplenty/common/biome/overworld/MireBiome.java index bc3cbcc22..f920e6264 100644 --- a/src/main/java/biomesoplenty/common/biome/overworld/MireBiome.java +++ b/src/main/java/biomesoplenty/common/biome/overworld/MireBiome.java @@ -9,25 +9,21 @@ package biomesoplenty.common.biome.overworld; import biomesoplenty.api.block.BOPBlocks; import biomesoplenty.api.enums.BOPClimates; -import biomesoplenty.common.biome.BiomeBOP; +import biomesoplenty.common.biome.BiomeTemplate; import biomesoplenty.common.world.biome.BiomeFeatureHelper; import biomesoplenty.common.world.gen.feature.BOPBiomeFeatures; import biomesoplenty.common.world.gen.feature.StandardGrassFeature; -import com.google.common.collect.ImmutableList; import com.google.common.collect.Lists; import net.minecraft.block.BlockState; import net.minecraft.block.Blocks; import net.minecraft.entity.EntityClassification; import net.minecraft.entity.EntityType; -import net.minecraft.util.math.BlockPos; import net.minecraft.world.biome.Biome; import net.minecraft.world.biome.BiomeAmbience; import net.minecraft.world.biome.DefaultBiomeFeatures; import net.minecraft.world.biome.MoodSoundAmbience; import net.minecraft.world.gen.GenerationStage; import net.minecraft.world.gen.feature.*; -import net.minecraft.world.gen.feature.structure.MineshaftConfig; -import net.minecraft.world.gen.feature.structure.MineshaftStructure; import net.minecraft.world.gen.placement.AtSurfaceWithExtraConfig; import net.minecraft.world.gen.placement.ChanceConfig; import net.minecraft.world.gen.placement.FrequencyConfig; @@ -37,7 +33,7 @@ import net.minecraft.world.gen.surfacebuilders.SurfaceBuilder; import net.minecraftforge.api.distmarker.Dist; import net.minecraftforge.api.distmarker.OnlyIn; -public class MireBiome extends BiomeBOP +public class MireBiome extends BiomeTemplate { public MireBiome() { diff --git a/src/main/java/biomesoplenty/common/biome/overworld/MuskegBiome.java b/src/main/java/biomesoplenty/common/biome/overworld/MuskegBiome.java index 9169bc52d..41a0e61e4 100644 --- a/src/main/java/biomesoplenty/common/biome/overworld/MuskegBiome.java +++ b/src/main/java/biomesoplenty/common/biome/overworld/MuskegBiome.java @@ -9,7 +9,7 @@ package biomesoplenty.common.biome.overworld; import biomesoplenty.api.block.BOPBlocks; import biomesoplenty.api.enums.BOPClimates; -import biomesoplenty.common.biome.BiomeBOP; +import biomesoplenty.common.biome.BiomeTemplate; import biomesoplenty.common.world.biome.BiomeFeatureHelper; import biomesoplenty.common.world.gen.feature.BOPBiomeFeatures; import biomesoplenty.common.world.gen.feature.StandardGrassFeature; @@ -34,7 +34,7 @@ import net.minecraft.world.gen.surfacebuilders.SurfaceBuilder; import net.minecraftforge.api.distmarker.Dist; import net.minecraftforge.api.distmarker.OnlyIn; -public class MuskegBiome extends BiomeBOP +public class MuskegBiome extends BiomeTemplate { public MuskegBiome() { diff --git a/src/main/java/biomesoplenty/common/biome/overworld/MysticGroveBiome.java b/src/main/java/biomesoplenty/common/biome/overworld/MysticGroveBiome.java index ba7f203b9..8ee484dec 100644 --- a/src/main/java/biomesoplenty/common/biome/overworld/MysticGroveBiome.java +++ b/src/main/java/biomesoplenty/common/biome/overworld/MysticGroveBiome.java @@ -9,7 +9,7 @@ package biomesoplenty.common.biome.overworld; import biomesoplenty.api.block.BOPBlocks; import biomesoplenty.api.enums.BOPClimates; -import biomesoplenty.common.biome.BiomeBOP; +import biomesoplenty.common.biome.BiomeTemplate; import biomesoplenty.common.world.biome.BiomeFeatureHelper; import biomesoplenty.common.world.gen.feature.BOPBiomeFeatures; import biomesoplenty.common.world.gen.feature.StandardGrassFeature; @@ -18,22 +18,19 @@ import com.google.common.collect.Lists; import net.minecraft.block.Blocks; import net.minecraft.entity.EntityClassification; import net.minecraft.entity.EntityType; -import net.minecraft.util.math.BlockPos; import net.minecraft.world.biome.Biome; import net.minecraft.world.biome.BiomeAmbience; import net.minecraft.world.biome.DefaultBiomeFeatures; import net.minecraft.world.biome.MoodSoundAmbience; import net.minecraft.world.gen.GenerationStage; import net.minecraft.world.gen.feature.*; -import net.minecraft.world.gen.feature.structure.MineshaftConfig; -import net.minecraft.world.gen.feature.structure.MineshaftStructure; import net.minecraft.world.gen.placement.*; import net.minecraft.world.gen.surfacebuilders.ConfiguredSurfaceBuilder; import net.minecraft.world.gen.surfacebuilders.SurfaceBuilder; import net.minecraftforge.api.distmarker.Dist; import net.minecraftforge.api.distmarker.OnlyIn; -public class MysticGroveBiome extends BiomeBOP +public class MysticGroveBiome extends BiomeTemplate { public MysticGroveBiome() { diff --git a/src/main/java/biomesoplenty/common/biome/overworld/OasisBiome.java b/src/main/java/biomesoplenty/common/biome/overworld/OasisBiome.java index 0cf4319f5..099286f50 100644 --- a/src/main/java/biomesoplenty/common/biome/overworld/OasisBiome.java +++ b/src/main/java/biomesoplenty/common/biome/overworld/OasisBiome.java @@ -8,7 +8,7 @@ package biomesoplenty.common.biome.overworld; import biomesoplenty.api.block.BOPBlocks; -import biomesoplenty.common.biome.BiomeBOP; +import biomesoplenty.common.biome.BiomeTemplate; import biomesoplenty.common.world.biome.BiomeFeatureHelper; import biomesoplenty.common.world.gen.feature.BOPBiomeFeatures; import com.google.common.collect.ImmutableList; @@ -20,17 +20,14 @@ import net.minecraft.world.biome.DefaultBiomeFeatures; import net.minecraft.world.biome.MoodSoundAmbience; import net.minecraft.world.gen.GenerationStage; import net.minecraft.world.gen.feature.Feature; -import net.minecraft.world.gen.feature.IFeatureConfig; import net.minecraft.world.gen.feature.MultipleRandomFeatureConfig; -import net.minecraft.world.gen.feature.structure.MineshaftConfig; -import net.minecraft.world.gen.feature.structure.MineshaftStructure; import net.minecraft.world.gen.placement.AtSurfaceWithExtraConfig; import net.minecraft.world.gen.placement.FrequencyConfig; import net.minecraft.world.gen.placement.Placement; import net.minecraft.world.gen.surfacebuilders.ConfiguredSurfaceBuilder; import net.minecraft.world.gen.surfacebuilders.SurfaceBuilder; -public class OasisBiome extends BiomeBOP +public class OasisBiome extends BiomeTemplate { public OasisBiome() { diff --git a/src/main/java/biomesoplenty/common/biome/overworld/OminousWoodsBiome.java b/src/main/java/biomesoplenty/common/biome/overworld/OminousWoodsBiome.java index 61ef99f38..01432ad9b 100644 --- a/src/main/java/biomesoplenty/common/biome/overworld/OminousWoodsBiome.java +++ b/src/main/java/biomesoplenty/common/biome/overworld/OminousWoodsBiome.java @@ -9,7 +9,7 @@ package biomesoplenty.common.biome.overworld; import biomesoplenty.api.block.BOPBlocks; import biomesoplenty.api.enums.BOPClimates; -import biomesoplenty.common.biome.BiomeBOP; +import biomesoplenty.common.biome.BiomeTemplate; import biomesoplenty.common.world.biome.BiomeFeatureHelper; import biomesoplenty.common.world.gen.feature.BOPBiomeFeatures; import biomesoplenty.common.world.gen.feature.StandardGrassFeature; @@ -19,22 +19,19 @@ import net.minecraft.block.BlockState; import net.minecraft.block.Blocks; import net.minecraft.entity.EntityClassification; import net.minecraft.entity.EntityType; -import net.minecraft.util.math.BlockPos; import net.minecraft.world.biome.Biome; import net.minecraft.world.biome.BiomeAmbience; import net.minecraft.world.biome.DefaultBiomeFeatures; import net.minecraft.world.biome.MoodSoundAmbience; import net.minecraft.world.gen.GenerationStage; import net.minecraft.world.gen.feature.*; -import net.minecraft.world.gen.feature.structure.MineshaftConfig; -import net.minecraft.world.gen.feature.structure.MineshaftStructure; import net.minecraft.world.gen.placement.*; import net.minecraft.world.gen.surfacebuilders.ConfiguredSurfaceBuilder; import net.minecraft.world.gen.surfacebuilders.SurfaceBuilder; import net.minecraftforge.api.distmarker.Dist; import net.minecraftforge.api.distmarker.OnlyIn; -public class OminousWoodsBiome extends BiomeBOP +public class OminousWoodsBiome extends BiomeTemplate { public OminousWoodsBiome() { diff --git a/src/main/java/biomesoplenty/common/biome/overworld/OrchardBiome.java b/src/main/java/biomesoplenty/common/biome/overworld/OrchardBiome.java index 58ef9d0c5..781034e2d 100644 --- a/src/main/java/biomesoplenty/common/biome/overworld/OrchardBiome.java +++ b/src/main/java/biomesoplenty/common/biome/overworld/OrchardBiome.java @@ -8,7 +8,7 @@ package biomesoplenty.common.biome.overworld; import biomesoplenty.api.block.BOPBlocks; -import biomesoplenty.common.biome.BiomeBOP; +import biomesoplenty.common.biome.BiomeTemplate; import biomesoplenty.common.world.biome.BiomeFeatureHelper; import biomesoplenty.common.world.gen.feature.BOPBiomeFeatures; import biomesoplenty.common.world.gen.feature.StandardGrassFeature; @@ -16,15 +16,12 @@ import com.google.common.collect.ImmutableList; import net.minecraft.block.Blocks; import net.minecraft.entity.EntityClassification; import net.minecraft.entity.EntityType; -import net.minecraft.util.math.BlockPos; import net.minecraft.world.biome.Biome; import net.minecraft.world.biome.BiomeAmbience; import net.minecraft.world.biome.DefaultBiomeFeatures; import net.minecraft.world.biome.MoodSoundAmbience; import net.minecraft.world.gen.GenerationStage; import net.minecraft.world.gen.feature.*; -import net.minecraft.world.gen.feature.structure.MineshaftConfig; -import net.minecraft.world.gen.feature.structure.MineshaftStructure; import net.minecraft.world.gen.placement.AtSurfaceWithExtraConfig; import net.minecraft.world.gen.placement.FrequencyConfig; import net.minecraft.world.gen.placement.Placement; @@ -33,7 +30,7 @@ import net.minecraft.world.gen.surfacebuilders.SurfaceBuilder; import net.minecraftforge.api.distmarker.Dist; import net.minecraftforge.api.distmarker.OnlyIn; -public class OrchardBiome extends BiomeBOP +public class OrchardBiome extends BiomeTemplate { public OrchardBiome() { diff --git a/src/main/java/biomesoplenty/common/biome/overworld/OriginHillsBiome.java b/src/main/java/biomesoplenty/common/biome/overworld/OriginHillsBiome.java index 646d05300..44d4ede0c 100644 --- a/src/main/java/biomesoplenty/common/biome/overworld/OriginHillsBiome.java +++ b/src/main/java/biomesoplenty/common/biome/overworld/OriginHillsBiome.java @@ -7,30 +7,25 @@ ******************************************************************************/ package biomesoplenty.common.biome.overworld; -import biomesoplenty.api.biome.BOPBiomes; -import biomesoplenty.api.block.BOPBlocks; -import biomesoplenty.common.biome.BiomeBOP; +import biomesoplenty.common.biome.BiomeTemplate; import biomesoplenty.common.world.gen.feature.BOPBiomeFeatures; import com.google.common.collect.ImmutableList; import com.google.common.collect.Lists; import net.minecraft.block.Blocks; import net.minecraft.entity.EntityClassification; import net.minecraft.entity.EntityType; -import net.minecraft.util.math.BlockPos; import net.minecraft.world.biome.Biome; import net.minecraft.world.biome.BiomeAmbience; import net.minecraft.world.biome.DefaultBiomeFeatures; import net.minecraft.world.biome.MoodSoundAmbience; import net.minecraft.world.gen.GenerationStage; -import net.minecraft.world.gen.carver.WorldCarver; import net.minecraft.world.gen.feature.*; import net.minecraft.world.gen.placement.*; import net.minecraft.world.gen.surfacebuilders.ConfiguredSurfaceBuilder; -import net.minecraft.world.gen.surfacebuilders.SurfaceBuilder; import net.minecraftforge.api.distmarker.Dist; import net.minecraftforge.api.distmarker.OnlyIn; -public class OriginHillsBiome extends BiomeBOP +public class OriginHillsBiome extends BiomeTemplate { public OriginHillsBiome() { diff --git a/src/main/java/biomesoplenty/common/biome/overworld/OutbackBiome.java b/src/main/java/biomesoplenty/common/biome/overworld/OutbackBiome.java index 9f81f474a..c92ed198f 100644 --- a/src/main/java/biomesoplenty/common/biome/overworld/OutbackBiome.java +++ b/src/main/java/biomesoplenty/common/biome/overworld/OutbackBiome.java @@ -9,7 +9,7 @@ package biomesoplenty.common.biome.overworld; import biomesoplenty.api.block.BOPBlocks; import biomesoplenty.api.enums.BOPClimates; -import biomesoplenty.common.biome.BiomeBOP; +import biomesoplenty.common.biome.BiomeTemplate; import biomesoplenty.common.world.biome.BiomeFeatureHelper; import biomesoplenty.common.world.gen.feature.BOPBiomeFeatures; import com.google.common.collect.ImmutableList; @@ -22,9 +22,6 @@ import net.minecraft.world.biome.DefaultBiomeFeatures; import net.minecraft.world.biome.MoodSoundAmbience; import net.minecraft.world.gen.GenerationStage; import net.minecraft.world.gen.feature.*; -import net.minecraft.world.gen.feature.structure.MineshaftConfig; -import net.minecraft.world.gen.feature.structure.MineshaftStructure; -import net.minecraft.world.gen.feature.structure.VillageConfig; import net.minecraft.world.gen.placement.AtSurfaceWithExtraConfig; import net.minecraft.world.gen.placement.ChanceConfig; import net.minecraft.world.gen.placement.FrequencyConfig; @@ -32,7 +29,7 @@ import net.minecraft.world.gen.placement.Placement; import net.minecraft.world.gen.surfacebuilders.ConfiguredSurfaceBuilder; import net.minecraft.world.gen.surfacebuilders.SurfaceBuilder; -public class OutbackBiome extends BiomeBOP +public class OutbackBiome extends BiomeTemplate { public OutbackBiome() { diff --git a/src/main/java/biomesoplenty/common/biome/overworld/OvergrownCliffsBiome.java b/src/main/java/biomesoplenty/common/biome/overworld/OvergrownCliffsBiome.java index 1c76f30ac..bdc74899a 100644 --- a/src/main/java/biomesoplenty/common/biome/overworld/OvergrownCliffsBiome.java +++ b/src/main/java/biomesoplenty/common/biome/overworld/OvergrownCliffsBiome.java @@ -9,7 +9,7 @@ package biomesoplenty.common.biome.overworld; import biomesoplenty.api.block.BOPBlocks; import biomesoplenty.api.enums.BOPClimates; -import biomesoplenty.common.biome.BiomeBOP; +import biomesoplenty.common.biome.BiomeTemplate; import biomesoplenty.common.world.biome.BiomeFeatureHelper; import biomesoplenty.common.world.gen.feature.BOPBiomeFeatures; import biomesoplenty.common.world.gen.feature.StandardGrassFeature; @@ -23,15 +23,13 @@ import net.minecraft.world.biome.DefaultBiomeFeatures; import net.minecraft.world.biome.MoodSoundAmbience; import net.minecraft.world.gen.GenerationStage; import net.minecraft.world.gen.feature.*; -import net.minecraft.world.gen.feature.structure.MineshaftConfig; -import net.minecraft.world.gen.feature.structure.MineshaftStructure; import net.minecraft.world.gen.placement.AtSurfaceWithExtraConfig; import net.minecraft.world.gen.placement.FrequencyConfig; import net.minecraft.world.gen.placement.Placement; import net.minecraft.world.gen.surfacebuilders.ConfiguredSurfaceBuilder; import net.minecraft.world.gen.surfacebuilders.SurfaceBuilder; -public class OvergrownCliffsBiome extends BiomeBOP +public class OvergrownCliffsBiome extends BiomeTemplate { public OvergrownCliffsBiome() { diff --git a/src/main/java/biomesoplenty/common/biome/overworld/PastureBiome.java b/src/main/java/biomesoplenty/common/biome/overworld/PastureBiome.java index 8b961f841..046ab2e20 100644 --- a/src/main/java/biomesoplenty/common/biome/overworld/PastureBiome.java +++ b/src/main/java/biomesoplenty/common/biome/overworld/PastureBiome.java @@ -8,13 +8,12 @@ package biomesoplenty.common.biome.overworld; import biomesoplenty.api.block.BOPBlocks; -import biomesoplenty.common.biome.BiomeBOP; +import biomesoplenty.common.biome.BiomeTemplate; import biomesoplenty.common.world.biome.BiomeFeatureHelper; import biomesoplenty.common.world.gen.feature.StandardGrassFeature; import net.minecraft.block.Blocks; import net.minecraft.entity.EntityClassification; import net.minecraft.entity.EntityType; -import net.minecraft.util.math.BlockPos; import net.minecraft.world.biome.Biome; import net.minecraft.world.biome.BiomeAmbience; import net.minecraft.world.biome.DefaultBiomeFeatures; @@ -23,8 +22,6 @@ import net.minecraft.world.gen.GenerationStage; import net.minecraft.world.gen.feature.Feature; import net.minecraft.world.gen.feature.IFeatureConfig; import net.minecraft.world.gen.feature.NoFeatureConfig; -import net.minecraft.world.gen.feature.structure.MineshaftConfig; -import net.minecraft.world.gen.feature.structure.MineshaftStructure; import net.minecraft.world.gen.placement.FrequencyConfig; import net.minecraft.world.gen.placement.Placement; import net.minecraft.world.gen.surfacebuilders.ConfiguredSurfaceBuilder; @@ -32,7 +29,7 @@ import net.minecraft.world.gen.surfacebuilders.SurfaceBuilder; import net.minecraftforge.api.distmarker.Dist; import net.minecraftforge.api.distmarker.OnlyIn; -public class PastureBiome extends BiomeBOP +public class PastureBiome extends BiomeTemplate { public PastureBiome() { diff --git a/src/main/java/biomesoplenty/common/biome/overworld/PoppyFieldBiome.java b/src/main/java/biomesoplenty/common/biome/overworld/PoppyFieldBiome.java index 22718408c..d9ff3d01b 100644 --- a/src/main/java/biomesoplenty/common/biome/overworld/PoppyFieldBiome.java +++ b/src/main/java/biomesoplenty/common/biome/overworld/PoppyFieldBiome.java @@ -9,7 +9,7 @@ package biomesoplenty.common.biome.overworld; import biomesoplenty.api.block.BOPBlocks; import biomesoplenty.api.enums.BOPClimates; -import biomesoplenty.common.biome.BiomeBOP; +import biomesoplenty.common.biome.BiomeTemplate; import biomesoplenty.common.world.biome.BiomeFeatureHelper; import biomesoplenty.common.world.gen.feature.BOPBiomeFeatures; import biomesoplenty.common.world.gen.feature.StandardGrassFeature; @@ -20,19 +20,15 @@ import net.minecraft.world.biome.BiomeAmbience; import net.minecraft.world.biome.DefaultBiomeFeatures; import net.minecraft.world.biome.MoodSoundAmbience; import net.minecraft.world.gen.GenerationStage; -import net.minecraft.world.gen.feature.BlockStateFeatureConfig; import net.minecraft.world.gen.feature.Feature; import net.minecraft.world.gen.feature.IFeatureConfig; import net.minecraft.world.gen.feature.NoFeatureConfig; -import net.minecraft.world.gen.feature.structure.MineshaftConfig; -import net.minecraft.world.gen.feature.structure.MineshaftStructure; -import net.minecraft.world.gen.placement.ChanceConfig; import net.minecraft.world.gen.placement.FrequencyConfig; import net.minecraft.world.gen.placement.Placement; import net.minecraft.world.gen.surfacebuilders.ConfiguredSurfaceBuilder; import net.minecraft.world.gen.surfacebuilders.SurfaceBuilder; -public class PoppyFieldBiome extends BiomeBOP +public class PoppyFieldBiome extends BiomeTemplate { public PoppyFieldBiome() { diff --git a/src/main/java/biomesoplenty/common/biome/overworld/PrairieBiome.java b/src/main/java/biomesoplenty/common/biome/overworld/PrairieBiome.java index 48584fda9..97923cc61 100644 --- a/src/main/java/biomesoplenty/common/biome/overworld/PrairieBiome.java +++ b/src/main/java/biomesoplenty/common/biome/overworld/PrairieBiome.java @@ -9,23 +9,19 @@ package biomesoplenty.common.biome.overworld; import biomesoplenty.api.block.BOPBlocks; import biomesoplenty.api.enums.BOPClimates; -import biomesoplenty.common.biome.BiomeBOP; +import biomesoplenty.common.biome.BiomeTemplate; import biomesoplenty.common.world.biome.BiomeFeatureHelper; import biomesoplenty.common.world.gen.feature.BOPBiomeFeatures; import biomesoplenty.common.world.gen.feature.StandardGrassFeature; import com.google.common.collect.ImmutableList; import net.minecraft.entity.EntityClassification; import net.minecraft.entity.EntityType; -import net.minecraft.util.math.BlockPos; import net.minecraft.world.biome.Biome; import net.minecraft.world.biome.BiomeAmbience; import net.minecraft.world.biome.DefaultBiomeFeatures; import net.minecraft.world.biome.MoodSoundAmbience; import net.minecraft.world.gen.GenerationStage; import net.minecraft.world.gen.feature.*; -import net.minecraft.world.gen.feature.structure.MineshaftConfig; -import net.minecraft.world.gen.feature.structure.MineshaftStructure; -import net.minecraft.world.gen.feature.structure.VillageConfig; import net.minecraft.world.gen.placement.AtSurfaceWithExtraConfig; import net.minecraft.world.gen.placement.FrequencyConfig; import net.minecraft.world.gen.placement.Placement; @@ -34,7 +30,7 @@ import net.minecraft.world.gen.surfacebuilders.SurfaceBuilder; import net.minecraftforge.api.distmarker.Dist; import net.minecraftforge.api.distmarker.OnlyIn; -public class PrairieBiome extends BiomeBOP +public class PrairieBiome extends BiomeTemplate { public PrairieBiome() { diff --git a/src/main/java/biomesoplenty/common/biome/overworld/PumpkinPatchBiome.java b/src/main/java/biomesoplenty/common/biome/overworld/PumpkinPatchBiome.java index 12d715b5b..0ff946381 100644 --- a/src/main/java/biomesoplenty/common/biome/overworld/PumpkinPatchBiome.java +++ b/src/main/java/biomesoplenty/common/biome/overworld/PumpkinPatchBiome.java @@ -9,7 +9,7 @@ package biomesoplenty.common.biome.overworld; import biomesoplenty.api.biome.BOPBiomes; import biomesoplenty.api.block.BOPBlocks; -import biomesoplenty.common.biome.BiomeBOP; +import biomesoplenty.common.biome.BiomeTemplate; import biomesoplenty.common.world.biome.BiomeFeatureHelper; import biomesoplenty.common.world.gen.feature.BOPBiomeFeatures; import biomesoplenty.common.world.gen.feature.StandardGrassFeature; @@ -17,15 +17,12 @@ import com.google.common.collect.ImmutableList; import net.minecraft.block.Blocks; import net.minecraft.entity.EntityClassification; import net.minecraft.entity.EntityType; -import net.minecraft.util.math.BlockPos; import net.minecraft.world.biome.Biome; import net.minecraft.world.biome.BiomeAmbience; import net.minecraft.world.biome.DefaultBiomeFeatures; import net.minecraft.world.biome.MoodSoundAmbience; import net.minecraft.world.gen.GenerationStage; import net.minecraft.world.gen.feature.*; -import net.minecraft.world.gen.feature.structure.MineshaftConfig; -import net.minecraft.world.gen.feature.structure.MineshaftStructure; import net.minecraft.world.gen.placement.AtSurfaceWithExtraConfig; import net.minecraft.world.gen.placement.ChanceConfig; import net.minecraft.world.gen.placement.FrequencyConfig; @@ -35,7 +32,7 @@ import net.minecraft.world.gen.surfacebuilders.SurfaceBuilder; import net.minecraftforge.api.distmarker.Dist; import net.minecraftforge.api.distmarker.OnlyIn; -public class PumpkinPatchBiome extends BiomeBOP +public class PumpkinPatchBiome extends BiomeTemplate { public PumpkinPatchBiome() { diff --git a/src/main/java/biomesoplenty/common/biome/overworld/RainbowValleyBiome.java b/src/main/java/biomesoplenty/common/biome/overworld/RainbowValleyBiome.java index 1bece4782..01f4f78dd 100644 --- a/src/main/java/biomesoplenty/common/biome/overworld/RainbowValleyBiome.java +++ b/src/main/java/biomesoplenty/common/biome/overworld/RainbowValleyBiome.java @@ -7,13 +7,10 @@ ******************************************************************************/ package biomesoplenty.common.biome.overworld; -import biomesoplenty.api.biome.BOPBiomes; import biomesoplenty.api.block.BOPBlocks; -import biomesoplenty.api.enums.BOPClimates; -import biomesoplenty.common.biome.BiomeBOP; +import biomesoplenty.common.biome.BiomeTemplate; import biomesoplenty.common.world.biome.BiomeFeatureHelper; import biomesoplenty.common.world.gen.feature.BOPBiomeFeatures; -import biomesoplenty.common.world.gen.feature.FernGrassFeature; import biomesoplenty.common.world.gen.feature.StandardGrassFeature; import biomesoplenty.core.ClientProxy; import com.google.common.collect.ImmutableList; @@ -29,8 +26,6 @@ import net.minecraft.world.gen.feature.Feature; import net.minecraft.world.gen.feature.IFeatureConfig; import net.minecraft.world.gen.feature.MultipleRandomFeatureConfig; import net.minecraft.world.gen.feature.NoFeatureConfig; -import net.minecraft.world.gen.feature.structure.MineshaftConfig; -import net.minecraft.world.gen.feature.structure.MineshaftStructure; import net.minecraft.world.gen.placement.AtSurfaceWithExtraConfig; import net.minecraft.world.gen.placement.ChanceConfig; import net.minecraft.world.gen.placement.FrequencyConfig; @@ -40,10 +35,7 @@ import net.minecraft.world.gen.surfacebuilders.SurfaceBuilder; import net.minecraftforge.api.distmarker.Dist; import net.minecraftforge.api.distmarker.OnlyIn; -import java.awt.*; -import java.util.Calendar; - -public class RainbowValleyBiome extends BiomeBOP +public class RainbowValleyBiome extends BiomeTemplate { public RainbowValleyBiome() { diff --git a/src/main/java/biomesoplenty/common/biome/overworld/RainforestBiome.java b/src/main/java/biomesoplenty/common/biome/overworld/RainforestBiome.java index 7d1fad634..ec8aba91b 100644 --- a/src/main/java/biomesoplenty/common/biome/overworld/RainforestBiome.java +++ b/src/main/java/biomesoplenty/common/biome/overworld/RainforestBiome.java @@ -8,9 +8,8 @@ package biomesoplenty.common.biome.overworld; import biomesoplenty.api.biome.BOPBiomes; -import biomesoplenty.api.block.BOPBlocks; import biomesoplenty.api.enums.BOPClimates; -import biomesoplenty.common.biome.BiomeBOP; +import biomesoplenty.common.biome.BiomeTemplate; import biomesoplenty.common.world.biome.BiomeFeatureHelper; import biomesoplenty.common.world.gen.feature.BOPBiomeFeatures; import biomesoplenty.common.world.gen.feature.FernGrassFeature; @@ -18,15 +17,12 @@ import com.google.common.collect.ImmutableList; import net.minecraft.block.Blocks; import net.minecraft.entity.EntityClassification; import net.minecraft.entity.EntityType; -import net.minecraft.util.math.BlockPos; import net.minecraft.world.biome.Biome; import net.minecraft.world.biome.BiomeAmbience; import net.minecraft.world.biome.DefaultBiomeFeatures; import net.minecraft.world.biome.MoodSoundAmbience; import net.minecraft.world.gen.GenerationStage; import net.minecraft.world.gen.feature.*; -import net.minecraft.world.gen.feature.structure.MineshaftConfig; -import net.minecraft.world.gen.feature.structure.MineshaftStructure; import net.minecraft.world.gen.placement.AtSurfaceWithExtraConfig; import net.minecraft.world.gen.placement.ChanceConfig; import net.minecraft.world.gen.placement.FrequencyConfig; @@ -36,7 +32,7 @@ import net.minecraft.world.gen.surfacebuilders.SurfaceBuilder; import net.minecraftforge.api.distmarker.Dist; import net.minecraftforge.api.distmarker.OnlyIn; -public class RainforestBiome extends BiomeBOP +public class RainforestBiome extends BiomeTemplate { public RainforestBiome() { diff --git a/src/main/java/biomesoplenty/common/biome/overworld/RedwoodForestBiome.java b/src/main/java/biomesoplenty/common/biome/overworld/RedwoodForestBiome.java index 6822a0eec..095ae5932 100644 --- a/src/main/java/biomesoplenty/common/biome/overworld/RedwoodForestBiome.java +++ b/src/main/java/biomesoplenty/common/biome/overworld/RedwoodForestBiome.java @@ -8,7 +8,7 @@ package biomesoplenty.common.biome.overworld; import biomesoplenty.api.enums.BOPClimates; -import biomesoplenty.common.biome.BiomeBOP; +import biomesoplenty.common.biome.BiomeTemplate; import biomesoplenty.common.world.biome.BiomeFeatureHelper; import biomesoplenty.common.world.gen.feature.BOPBiomeFeatures; import biomesoplenty.common.world.gen.feature.FernGrassFeature; @@ -22,13 +22,11 @@ import net.minecraft.world.biome.DefaultBiomeFeatures; import net.minecraft.world.biome.MoodSoundAmbience; import net.minecraft.world.gen.GenerationStage; import net.minecraft.world.gen.feature.*; -import net.minecraft.world.gen.feature.structure.MineshaftConfig; -import net.minecraft.world.gen.feature.structure.MineshaftStructure; import net.minecraft.world.gen.placement.*; import net.minecraft.world.gen.surfacebuilders.ConfiguredSurfaceBuilder; import net.minecraft.world.gen.surfacebuilders.SurfaceBuilder; -public class RedwoodForestBiome extends BiomeBOP +public class RedwoodForestBiome extends BiomeTemplate { public RedwoodForestBiome() { diff --git a/src/main/java/biomesoplenty/common/biome/overworld/RedwoodForestEdgeBiome.java b/src/main/java/biomesoplenty/common/biome/overworld/RedwoodForestEdgeBiome.java index f3a224e8b..8354a02c9 100644 --- a/src/main/java/biomesoplenty/common/biome/overworld/RedwoodForestEdgeBiome.java +++ b/src/main/java/biomesoplenty/common/biome/overworld/RedwoodForestEdgeBiome.java @@ -7,7 +7,7 @@ ******************************************************************************/ package biomesoplenty.common.biome.overworld; -import biomesoplenty.common.biome.BiomeBOP; +import biomesoplenty.common.biome.BiomeTemplate; import biomesoplenty.common.world.biome.BiomeFeatureHelper; import biomesoplenty.common.world.gen.feature.BOPBiomeFeatures; import biomesoplenty.common.world.gen.feature.FernGrassFeature; @@ -21,13 +21,11 @@ import net.minecraft.world.biome.DefaultBiomeFeatures; import net.minecraft.world.biome.MoodSoundAmbience; import net.minecraft.world.gen.GenerationStage; import net.minecraft.world.gen.feature.*; -import net.minecraft.world.gen.feature.structure.MineshaftConfig; -import net.minecraft.world.gen.feature.structure.MineshaftStructure; import net.minecraft.world.gen.placement.*; import net.minecraft.world.gen.surfacebuilders.ConfiguredSurfaceBuilder; import net.minecraft.world.gen.surfacebuilders.SurfaceBuilder; -public class RedwoodForestEdgeBiome extends BiomeBOP +public class RedwoodForestEdgeBiome extends BiomeTemplate { public RedwoodForestEdgeBiome() { diff --git a/src/main/java/biomesoplenty/common/biome/overworld/ScrublandBiome.java b/src/main/java/biomesoplenty/common/biome/overworld/ScrublandBiome.java index 5f1fb474f..3c70eb5b8 100644 --- a/src/main/java/biomesoplenty/common/biome/overworld/ScrublandBiome.java +++ b/src/main/java/biomesoplenty/common/biome/overworld/ScrublandBiome.java @@ -8,7 +8,7 @@ package biomesoplenty.common.biome.overworld; import biomesoplenty.api.enums.BOPClimates; -import biomesoplenty.common.biome.BiomeBOP; +import biomesoplenty.common.biome.BiomeTemplate; import biomesoplenty.common.world.biome.BiomeFeatureHelper; import biomesoplenty.common.world.gen.feature.BOPBiomeFeatures; import biomesoplenty.common.world.gen.feature.StandardGrassFeature; @@ -22,16 +22,13 @@ import net.minecraft.world.biome.DefaultBiomeFeatures; import net.minecraft.world.biome.MoodSoundAmbience; import net.minecraft.world.gen.GenerationStage; import net.minecraft.world.gen.feature.*; -import net.minecraft.world.gen.feature.structure.MineshaftConfig; -import net.minecraft.world.gen.feature.structure.MineshaftStructure; -import net.minecraft.world.gen.feature.structure.VillageConfig; import net.minecraft.world.gen.placement.AtSurfaceWithExtraConfig; import net.minecraft.world.gen.placement.FrequencyConfig; import net.minecraft.world.gen.placement.Placement; import net.minecraft.world.gen.surfacebuilders.ConfiguredSurfaceBuilder; import net.minecraft.world.gen.surfacebuilders.SurfaceBuilder; -public class ScrublandBiome extends BiomeBOP +public class ScrublandBiome extends BiomeTemplate { public ScrublandBiome() { diff --git a/src/main/java/biomesoplenty/common/biome/overworld/SeasonalForestBiome.java b/src/main/java/biomesoplenty/common/biome/overworld/SeasonalForestBiome.java index e07da2e2f..5b38add79 100644 --- a/src/main/java/biomesoplenty/common/biome/overworld/SeasonalForestBiome.java +++ b/src/main/java/biomesoplenty/common/biome/overworld/SeasonalForestBiome.java @@ -10,7 +10,7 @@ package biomesoplenty.common.biome.overworld; import biomesoplenty.api.biome.BOPBiomes; import biomesoplenty.api.block.BOPBlocks; import biomesoplenty.api.enums.BOPClimates; -import biomesoplenty.common.biome.BiomeBOP; +import biomesoplenty.common.biome.BiomeTemplate; import biomesoplenty.common.world.biome.BiomeFeatureHelper; import biomesoplenty.common.world.gen.feature.BOPBiomeFeatures; import biomesoplenty.common.world.gen.feature.StandardGrassFeature; @@ -18,15 +18,12 @@ import com.google.common.collect.ImmutableList; import net.minecraft.block.Blocks; import net.minecraft.entity.EntityClassification; import net.minecraft.entity.EntityType; -import net.minecraft.util.math.BlockPos; import net.minecraft.world.biome.Biome; import net.minecraft.world.biome.BiomeAmbience; import net.minecraft.world.biome.DefaultBiomeFeatures; import net.minecraft.world.biome.MoodSoundAmbience; import net.minecraft.world.gen.GenerationStage; import net.minecraft.world.gen.feature.*; -import net.minecraft.world.gen.feature.structure.MineshaftConfig; -import net.minecraft.world.gen.feature.structure.MineshaftStructure; import net.minecraft.world.gen.placement.AtSurfaceWithExtraConfig; import net.minecraft.world.gen.placement.ChanceConfig; import net.minecraft.world.gen.placement.FrequencyConfig; @@ -36,7 +33,7 @@ import net.minecraft.world.gen.surfacebuilders.SurfaceBuilder; import net.minecraftforge.api.distmarker.Dist; import net.minecraftforge.api.distmarker.OnlyIn; -public class SeasonalForestBiome extends BiomeBOP +public class SeasonalForestBiome extends BiomeTemplate { public SeasonalForestBiome() { diff --git a/src/main/java/biomesoplenty/common/biome/overworld/ShieldBiome.java b/src/main/java/biomesoplenty/common/biome/overworld/ShieldBiome.java index c2ffa541a..cadff4c74 100644 --- a/src/main/java/biomesoplenty/common/biome/overworld/ShieldBiome.java +++ b/src/main/java/biomesoplenty/common/biome/overworld/ShieldBiome.java @@ -10,7 +10,7 @@ package biomesoplenty.common.biome.overworld; import biomesoplenty.api.biome.BOPBiomes; import biomesoplenty.api.block.BOPBlocks; import biomesoplenty.api.enums.BOPClimates; -import biomesoplenty.common.biome.BiomeBOP; +import biomesoplenty.common.biome.BiomeTemplate; import biomesoplenty.common.world.biome.BiomeFeatureHelper; import biomesoplenty.common.world.gen.feature.BOPBiomeFeatures; import biomesoplenty.common.world.gen.feature.StandardGrassFeature; @@ -20,22 +20,19 @@ import net.minecraft.block.BlockState; import net.minecraft.block.Blocks; import net.minecraft.entity.EntityClassification; import net.minecraft.entity.EntityType; -import net.minecraft.util.math.BlockPos; import net.minecraft.world.biome.Biome; import net.minecraft.world.biome.BiomeAmbience; import net.minecraft.world.biome.DefaultBiomeFeatures; import net.minecraft.world.biome.MoodSoundAmbience; import net.minecraft.world.gen.GenerationStage; import net.minecraft.world.gen.feature.*; -import net.minecraft.world.gen.feature.structure.MineshaftConfig; -import net.minecraft.world.gen.feature.structure.MineshaftStructure; import net.minecraft.world.gen.placement.*; import net.minecraft.world.gen.surfacebuilders.ConfiguredSurfaceBuilder; import net.minecraft.world.gen.surfacebuilders.SurfaceBuilder; import net.minecraftforge.api.distmarker.Dist; import net.minecraftforge.api.distmarker.OnlyIn; -public class ShieldBiome extends BiomeBOP +public class ShieldBiome extends BiomeTemplate { public ShieldBiome() { diff --git a/src/main/java/biomesoplenty/common/biome/overworld/ShrublandBiome.java b/src/main/java/biomesoplenty/common/biome/overworld/ShrublandBiome.java index fe6273c0c..25f8c4268 100644 --- a/src/main/java/biomesoplenty/common/biome/overworld/ShrublandBiome.java +++ b/src/main/java/biomesoplenty/common/biome/overworld/ShrublandBiome.java @@ -10,7 +10,7 @@ package biomesoplenty.common.biome.overworld; import biomesoplenty.api.biome.BOPBiomes; import biomesoplenty.api.block.BOPBlocks; import biomesoplenty.api.enums.BOPClimates; -import biomesoplenty.common.biome.BiomeBOP; +import biomesoplenty.common.biome.BiomeTemplate; import biomesoplenty.common.world.biome.BiomeFeatureHelper; import biomesoplenty.common.world.gen.feature.BOPBiomeFeatures; import biomesoplenty.common.world.gen.feature.StandardGrassFeature; @@ -23,16 +23,13 @@ import net.minecraft.world.biome.DefaultBiomeFeatures; import net.minecraft.world.biome.MoodSoundAmbience; import net.minecraft.world.gen.GenerationStage; import net.minecraft.world.gen.feature.*; -import net.minecraft.world.gen.feature.structure.MineshaftConfig; -import net.minecraft.world.gen.feature.structure.MineshaftStructure; -import net.minecraft.world.gen.feature.structure.VillageConfig; import net.minecraft.world.gen.placement.AtSurfaceWithExtraConfig; import net.minecraft.world.gen.placement.FrequencyConfig; import net.minecraft.world.gen.placement.Placement; import net.minecraft.world.gen.surfacebuilders.ConfiguredSurfaceBuilder; import net.minecraft.world.gen.surfacebuilders.SurfaceBuilder; -public class ShrublandBiome extends BiomeBOP +public class ShrublandBiome extends BiomeTemplate { public ShrublandBiome() { diff --git a/src/main/java/biomesoplenty/common/biome/overworld/SilkgladeBiome.java b/src/main/java/biomesoplenty/common/biome/overworld/SilkgladeBiome.java index f09f91227..30be15a38 100644 --- a/src/main/java/biomesoplenty/common/biome/overworld/SilkgladeBiome.java +++ b/src/main/java/biomesoplenty/common/biome/overworld/SilkgladeBiome.java @@ -9,7 +9,7 @@ package biomesoplenty.common.biome.overworld; import biomesoplenty.api.block.BOPBlocks; import biomesoplenty.api.enums.BOPClimates; -import biomesoplenty.common.biome.BiomeBOP; +import biomesoplenty.common.biome.BiomeTemplate; import biomesoplenty.common.world.biome.BiomeFeatureHelper; import biomesoplenty.common.world.gen.feature.BOPBiomeFeatures; import biomesoplenty.common.world.gen.feature.StandardGrassFeature; @@ -17,15 +17,12 @@ import com.google.common.collect.ImmutableList; import net.minecraft.block.Blocks; import net.minecraft.entity.EntityClassification; import net.minecraft.entity.EntityType; -import net.minecraft.util.math.BlockPos; import net.minecraft.world.biome.Biome; import net.minecraft.world.biome.BiomeAmbience; import net.minecraft.world.biome.DefaultBiomeFeatures; import net.minecraft.world.biome.MoodSoundAmbience; import net.minecraft.world.gen.GenerationStage; import net.minecraft.world.gen.feature.*; -import net.minecraft.world.gen.feature.structure.MineshaftConfig; -import net.minecraft.world.gen.feature.structure.MineshaftStructure; import net.minecraft.world.gen.placement.AtSurfaceWithExtraConfig; import net.minecraft.world.gen.placement.ChanceConfig; import net.minecraft.world.gen.placement.FrequencyConfig; @@ -35,7 +32,7 @@ import net.minecraft.world.gen.surfacebuilders.SurfaceBuilder; import net.minecraftforge.api.distmarker.Dist; import net.minecraftforge.api.distmarker.OnlyIn; -public class SilkgladeBiome extends BiomeBOP +public class SilkgladeBiome extends BiomeTemplate { public SilkgladeBiome() { diff --git a/src/main/java/biomesoplenty/common/biome/overworld/SnowyConiferousForestBiome.java b/src/main/java/biomesoplenty/common/biome/overworld/SnowyConiferousForestBiome.java index c4f7d57c5..34b82e661 100644 --- a/src/main/java/biomesoplenty/common/biome/overworld/SnowyConiferousForestBiome.java +++ b/src/main/java/biomesoplenty/common/biome/overworld/SnowyConiferousForestBiome.java @@ -8,7 +8,7 @@ package biomesoplenty.common.biome.overworld; import biomesoplenty.api.enums.BOPClimates; -import biomesoplenty.common.biome.BiomeBOP; +import biomesoplenty.common.biome.BiomeTemplate; import biomesoplenty.common.world.biome.BiomeFeatureHelper; import biomesoplenty.common.world.gen.feature.BOPBiomeFeatures; import biomesoplenty.common.world.gen.feature.FernGrassFeature; @@ -22,13 +22,11 @@ import net.minecraft.world.biome.DefaultBiomeFeatures; import net.minecraft.world.biome.MoodSoundAmbience; import net.minecraft.world.gen.GenerationStage; import net.minecraft.world.gen.feature.*; -import net.minecraft.world.gen.feature.structure.MineshaftConfig; -import net.minecraft.world.gen.feature.structure.MineshaftStructure; import net.minecraft.world.gen.placement.*; import net.minecraft.world.gen.surfacebuilders.ConfiguredSurfaceBuilder; import net.minecraft.world.gen.surfacebuilders.SurfaceBuilder; -public class SnowyConiferousForestBiome extends BiomeBOP +public class SnowyConiferousForestBiome extends BiomeTemplate { public SnowyConiferousForestBiome() { diff --git a/src/main/java/biomesoplenty/common/biome/overworld/SnowyFirClearingBiome.java b/src/main/java/biomesoplenty/common/biome/overworld/SnowyFirClearingBiome.java index 3ce3d68f4..840690ed5 100644 --- a/src/main/java/biomesoplenty/common/biome/overworld/SnowyFirClearingBiome.java +++ b/src/main/java/biomesoplenty/common/biome/overworld/SnowyFirClearingBiome.java @@ -7,26 +7,23 @@ ******************************************************************************/ package biomesoplenty.common.biome.overworld; -import biomesoplenty.common.biome.BiomeBOP; +import biomesoplenty.common.biome.BiomeTemplate; import biomesoplenty.common.world.biome.BiomeFeatureHelper; import biomesoplenty.common.world.gen.feature.BOPBiomeFeatures; import biomesoplenty.common.world.gen.feature.FernGrassFeature; import net.minecraft.block.Blocks; import net.minecraft.entity.EntityClassification; import net.minecraft.entity.EntityType; -import net.minecraft.world.biome.Biome; import net.minecraft.world.biome.BiomeAmbience; import net.minecraft.world.biome.DefaultBiomeFeatures; import net.minecraft.world.biome.MoodSoundAmbience; import net.minecraft.world.gen.GenerationStage; import net.minecraft.world.gen.feature.*; -import net.minecraft.world.gen.feature.structure.MineshaftConfig; -import net.minecraft.world.gen.feature.structure.MineshaftStructure; import net.minecraft.world.gen.placement.*; import net.minecraft.world.gen.surfacebuilders.ConfiguredSurfaceBuilder; import net.minecraft.world.gen.surfacebuilders.SurfaceBuilder; -public class SnowyFirClearingBiome extends BiomeBOP +public class SnowyFirClearingBiome extends BiomeTemplate { public SnowyFirClearingBiome() { diff --git a/src/main/java/biomesoplenty/common/biome/overworld/SnowyForestBiome.java b/src/main/java/biomesoplenty/common/biome/overworld/SnowyForestBiome.java index 7aff17879..57b68e289 100644 --- a/src/main/java/biomesoplenty/common/biome/overworld/SnowyForestBiome.java +++ b/src/main/java/biomesoplenty/common/biome/overworld/SnowyForestBiome.java @@ -8,13 +8,12 @@ package biomesoplenty.common.biome.overworld; import biomesoplenty.api.enums.BOPClimates; -import biomesoplenty.common.biome.BiomeBOP; +import biomesoplenty.common.biome.BiomeTemplate; import biomesoplenty.common.world.gen.feature.BOPBiomeFeatures; import biomesoplenty.common.world.gen.feature.StandardGrassFeature; import com.google.common.collect.ImmutableList; import net.minecraft.entity.EntityClassification; import net.minecraft.entity.EntityType; -import net.minecraft.util.math.BlockPos; import net.minecraft.world.biome.Biome; import net.minecraft.world.biome.BiomeAmbience; import net.minecraft.world.biome.DefaultBiomeFeatures; @@ -24,9 +23,6 @@ import net.minecraft.world.gen.feature.Feature; import net.minecraft.world.gen.feature.IFeatureConfig; import net.minecraft.world.gen.feature.MultipleRandomFeatureConfig; import net.minecraft.world.gen.feature.NoFeatureConfig; -import net.minecraft.world.gen.feature.structure.MineshaftConfig; -import net.minecraft.world.gen.feature.structure.MineshaftStructure; -import net.minecraft.world.gen.feature.structure.VillageConfig; import net.minecraft.world.gen.placement.AtSurfaceWithExtraConfig; import net.minecraft.world.gen.placement.ChanceConfig; import net.minecraft.world.gen.placement.FrequencyConfig; @@ -36,7 +32,7 @@ import net.minecraft.world.gen.surfacebuilders.SurfaceBuilder; import net.minecraftforge.api.distmarker.Dist; import net.minecraftforge.api.distmarker.OnlyIn; -public class SnowyForestBiome extends BiomeBOP +public class SnowyForestBiome extends BiomeTemplate { public SnowyForestBiome() { diff --git a/src/main/java/biomesoplenty/common/biome/overworld/SteppeBiome.java b/src/main/java/biomesoplenty/common/biome/overworld/SteppeBiome.java index ac9f6bcbc..ce8bacf40 100644 --- a/src/main/java/biomesoplenty/common/biome/overworld/SteppeBiome.java +++ b/src/main/java/biomesoplenty/common/biome/overworld/SteppeBiome.java @@ -9,9 +9,8 @@ package biomesoplenty.common.biome.overworld; import biomesoplenty.api.block.BOPBlocks; import biomesoplenty.api.enums.BOPClimates; -import biomesoplenty.common.biome.BiomeBOP; +import biomesoplenty.common.biome.BiomeTemplate; import biomesoplenty.common.world.biome.BiomeFeatureHelper; -import biomesoplenty.common.world.gen.feature.BOPBiomeFeatures; import biomesoplenty.common.world.gen.feature.StandardGrassFeature; import net.minecraft.block.Blocks; import net.minecraft.entity.EntityClassification; @@ -22,14 +21,12 @@ import net.minecraft.world.biome.DefaultBiomeFeatures; import net.minecraft.world.biome.MoodSoundAmbience; import net.minecraft.world.gen.GenerationStage; import net.minecraft.world.gen.feature.*; -import net.minecraft.world.gen.feature.structure.MineshaftConfig; -import net.minecraft.world.gen.feature.structure.MineshaftStructure; import net.minecraft.world.gen.placement.FrequencyConfig; import net.minecraft.world.gen.placement.Placement; import net.minecraft.world.gen.surfacebuilders.ConfiguredSurfaceBuilder; import net.minecraft.world.gen.surfacebuilders.SurfaceBuilder; -public class SteppeBiome extends BiomeBOP +public class SteppeBiome extends BiomeTemplate { public SteppeBiome() { diff --git a/src/main/java/biomesoplenty/common/biome/overworld/TemperateRainforestBiome.java b/src/main/java/biomesoplenty/common/biome/overworld/TemperateRainforestBiome.java index bb3f8dde2..ba00a238a 100644 --- a/src/main/java/biomesoplenty/common/biome/overworld/TemperateRainforestBiome.java +++ b/src/main/java/biomesoplenty/common/biome/overworld/TemperateRainforestBiome.java @@ -10,7 +10,7 @@ package biomesoplenty.common.biome.overworld; import biomesoplenty.api.biome.BOPBiomes; import biomesoplenty.api.block.BOPBlocks; import biomesoplenty.api.enums.BOPClimates; -import biomesoplenty.common.biome.BiomeBOP; +import biomesoplenty.common.biome.BiomeTemplate; import biomesoplenty.common.world.biome.BiomeFeatureHelper; import biomesoplenty.common.world.gen.feature.BOPBiomeFeatures; import biomesoplenty.common.world.gen.feature.FernGrassFeature; @@ -18,22 +18,19 @@ import com.google.common.collect.ImmutableList; import net.minecraft.block.Blocks; import net.minecraft.entity.EntityClassification; import net.minecraft.entity.EntityType; -import net.minecraft.util.math.BlockPos; import net.minecraft.world.biome.Biome; import net.minecraft.world.biome.BiomeAmbience; import net.minecraft.world.biome.DefaultBiomeFeatures; import net.minecraft.world.biome.MoodSoundAmbience; import net.minecraft.world.gen.GenerationStage; import net.minecraft.world.gen.feature.*; -import net.minecraft.world.gen.feature.structure.MineshaftConfig; -import net.minecraft.world.gen.feature.structure.MineshaftStructure; import net.minecraft.world.gen.placement.*; import net.minecraft.world.gen.surfacebuilders.ConfiguredSurfaceBuilder; import net.minecraft.world.gen.surfacebuilders.SurfaceBuilder; import net.minecraftforge.api.distmarker.Dist; import net.minecraftforge.api.distmarker.OnlyIn; -public class TemperateRainforestBiome extends BiomeBOP +public class TemperateRainforestBiome extends BiomeTemplate { public TemperateRainforestBiome() { diff --git a/src/main/java/biomesoplenty/common/biome/overworld/TemperateRainforestHillsBiome.java b/src/main/java/biomesoplenty/common/biome/overworld/TemperateRainforestHillsBiome.java index 21d192fd1..d248352cf 100644 --- a/src/main/java/biomesoplenty/common/biome/overworld/TemperateRainforestHillsBiome.java +++ b/src/main/java/biomesoplenty/common/biome/overworld/TemperateRainforestHillsBiome.java @@ -9,7 +9,7 @@ package biomesoplenty.common.biome.overworld; import biomesoplenty.api.biome.BOPBiomes; import biomesoplenty.api.block.BOPBlocks; -import biomesoplenty.common.biome.BiomeBOP; +import biomesoplenty.common.biome.BiomeTemplate; import biomesoplenty.common.world.biome.BiomeFeatureHelper; import biomesoplenty.common.world.gen.feature.BOPBiomeFeatures; import biomesoplenty.common.world.gen.feature.FernGrassFeature; @@ -17,22 +17,18 @@ import com.google.common.collect.ImmutableList; import net.minecraft.block.Blocks; import net.minecraft.entity.EntityClassification; import net.minecraft.entity.EntityType; -import net.minecraft.util.math.BlockPos; -import net.minecraft.world.biome.Biome; import net.minecraft.world.biome.BiomeAmbience; import net.minecraft.world.biome.DefaultBiomeFeatures; import net.minecraft.world.biome.MoodSoundAmbience; import net.minecraft.world.gen.GenerationStage; import net.minecraft.world.gen.feature.*; -import net.minecraft.world.gen.feature.structure.MineshaftConfig; -import net.minecraft.world.gen.feature.structure.MineshaftStructure; import net.minecraft.world.gen.placement.*; import net.minecraft.world.gen.surfacebuilders.ConfiguredSurfaceBuilder; import net.minecraft.world.gen.surfacebuilders.SurfaceBuilder; import net.minecraftforge.api.distmarker.Dist; import net.minecraftforge.api.distmarker.OnlyIn; -public class TemperateRainforestHillsBiome extends BiomeBOP +public class TemperateRainforestHillsBiome extends BiomeTemplate { public TemperateRainforestHillsBiome() { diff --git a/src/main/java/biomesoplenty/common/biome/overworld/TropicBeachBiome.java b/src/main/java/biomesoplenty/common/biome/overworld/TropicBeachBiome.java index 75fae87ab..61b7c31df 100644 --- a/src/main/java/biomesoplenty/common/biome/overworld/TropicBeachBiome.java +++ b/src/main/java/biomesoplenty/common/biome/overworld/TropicBeachBiome.java @@ -7,7 +7,7 @@ ******************************************************************************/ package biomesoplenty.common.biome.overworld; -import biomesoplenty.common.biome.BiomeBOP; +import biomesoplenty.common.biome.BiomeTemplate; import biomesoplenty.common.world.gen.feature.BOPBiomeFeatures; import biomesoplenty.common.world.gen.feature.StandardGrassFeature; import com.google.common.collect.ImmutableList; @@ -28,7 +28,7 @@ import net.minecraft.world.gen.surfacebuilders.ConfiguredSurfaceBuilder; import net.minecraftforge.api.distmarker.Dist; import net.minecraftforge.api.distmarker.OnlyIn; -public class TropicBeachBiome extends BiomeBOP +public class TropicBeachBiome extends BiomeTemplate { public TropicBeachBiome() { diff --git a/src/main/java/biomesoplenty/common/biome/overworld/TropicalRainforestBiome.java b/src/main/java/biomesoplenty/common/biome/overworld/TropicalRainforestBiome.java index bde8ecf31..53ce6e000 100644 --- a/src/main/java/biomesoplenty/common/biome/overworld/TropicalRainforestBiome.java +++ b/src/main/java/biomesoplenty/common/biome/overworld/TropicalRainforestBiome.java @@ -10,7 +10,7 @@ package biomesoplenty.common.biome.overworld; import biomesoplenty.api.biome.BOPBiomes; import biomesoplenty.api.block.BOPBlocks; import biomesoplenty.api.enums.BOPClimates; -import biomesoplenty.common.biome.BiomeBOP; +import biomesoplenty.common.biome.BiomeTemplate; import biomesoplenty.common.world.biome.BiomeFeatureHelper; import biomesoplenty.common.world.gen.feature.BOPBiomeFeatures; import biomesoplenty.common.world.gen.feature.FernGrassFeature; @@ -18,22 +18,19 @@ import com.google.common.collect.ImmutableList; import net.minecraft.block.Blocks; import net.minecraft.entity.EntityClassification; import net.minecraft.entity.EntityType; -import net.minecraft.util.math.BlockPos; import net.minecraft.world.biome.Biome; import net.minecraft.world.biome.BiomeAmbience; import net.minecraft.world.biome.DefaultBiomeFeatures; import net.minecraft.world.biome.MoodSoundAmbience; import net.minecraft.world.gen.GenerationStage; import net.minecraft.world.gen.feature.*; -import net.minecraft.world.gen.feature.structure.MineshaftConfig; -import net.minecraft.world.gen.feature.structure.MineshaftStructure; import net.minecraft.world.gen.placement.*; import net.minecraft.world.gen.surfacebuilders.ConfiguredSurfaceBuilder; import net.minecraft.world.gen.surfacebuilders.SurfaceBuilder; import net.minecraftforge.api.distmarker.Dist; import net.minecraftforge.api.distmarker.OnlyIn; -public class TropicalRainforestBiome extends BiomeBOP +public class TropicalRainforestBiome extends BiomeTemplate { public TropicalRainforestBiome() { diff --git a/src/main/java/biomesoplenty/common/biome/overworld/TropicsBiome.java b/src/main/java/biomesoplenty/common/biome/overworld/TropicsBiome.java index 120c040de..db6cc67c8 100644 --- a/src/main/java/biomesoplenty/common/biome/overworld/TropicsBiome.java +++ b/src/main/java/biomesoplenty/common/biome/overworld/TropicsBiome.java @@ -9,7 +9,7 @@ package biomesoplenty.common.biome.overworld; import biomesoplenty.api.biome.BOPBiomes; import biomesoplenty.api.block.BOPBlocks; -import biomesoplenty.common.biome.BiomeBOP; +import biomesoplenty.common.biome.BiomeTemplate; import biomesoplenty.common.world.biome.BiomeFeatureHelper; import biomesoplenty.common.world.gen.feature.BOPBiomeFeatures; import biomesoplenty.common.world.gen.feature.StandardGrassFeature; @@ -33,7 +33,7 @@ import net.minecraft.world.gen.surfacebuilders.SurfaceBuilder; import net.minecraftforge.api.distmarker.Dist; import net.minecraftforge.api.distmarker.OnlyIn; -public class TropicsBiome extends BiomeBOP +public class TropicsBiome extends BiomeTemplate { public TropicsBiome() { diff --git a/src/main/java/biomesoplenty/common/biome/overworld/TundraBiome.java b/src/main/java/biomesoplenty/common/biome/overworld/TundraBiome.java index 4d39cfd52..9f770f52d 100644 --- a/src/main/java/biomesoplenty/common/biome/overworld/TundraBiome.java +++ b/src/main/java/biomesoplenty/common/biome/overworld/TundraBiome.java @@ -10,7 +10,7 @@ package biomesoplenty.common.biome.overworld; import biomesoplenty.api.biome.BOPBiomes; import biomesoplenty.api.block.BOPBlocks; import biomesoplenty.api.enums.BOPClimates; -import biomesoplenty.common.biome.BiomeBOP; +import biomesoplenty.common.biome.BiomeTemplate; import biomesoplenty.common.world.biome.BiomeFeatureHelper; import biomesoplenty.common.world.gen.feature.BOPBiomeFeatures; import biomesoplenty.common.world.gen.feature.StandardGrassFeature; @@ -20,16 +20,12 @@ import net.minecraft.block.BlockState; import net.minecraft.block.Blocks; import net.minecraft.entity.EntityClassification; import net.minecraft.entity.EntityType; -import net.minecraft.util.math.BlockPos; import net.minecraft.world.biome.Biome; import net.minecraft.world.biome.BiomeAmbience; import net.minecraft.world.biome.DefaultBiomeFeatures; import net.minecraft.world.biome.MoodSoundAmbience; import net.minecraft.world.gen.GenerationStage; import net.minecraft.world.gen.feature.*; -import net.minecraft.world.gen.feature.structure.MineshaftConfig; -import net.minecraft.world.gen.feature.structure.MineshaftStructure; -import net.minecraft.world.gen.feature.structure.VillageConfig; import net.minecraft.world.gen.placement.AtSurfaceWithExtraConfig; import net.minecraft.world.gen.placement.FrequencyConfig; import net.minecraft.world.gen.placement.Placement; @@ -38,7 +34,7 @@ import net.minecraft.world.gen.surfacebuilders.SurfaceBuilder; import net.minecraftforge.api.distmarker.Dist; import net.minecraftforge.api.distmarker.OnlyIn; -public class TundraBiome extends BiomeBOP +public class TundraBiome extends BiomeTemplate { public TundraBiome() { diff --git a/src/main/java/biomesoplenty/common/biome/overworld/VolcanicPlainsBiome.java b/src/main/java/biomesoplenty/common/biome/overworld/VolcanicPlainsBiome.java index 7a72a9fd3..0ef1c1b26 100644 --- a/src/main/java/biomesoplenty/common/biome/overworld/VolcanicPlainsBiome.java +++ b/src/main/java/biomesoplenty/common/biome/overworld/VolcanicPlainsBiome.java @@ -8,14 +8,10 @@ package biomesoplenty.common.biome.overworld; import biomesoplenty.api.block.BOPBlocks; -import biomesoplenty.api.enums.BOPClimates; -import biomesoplenty.common.biome.BiomeBOP; +import biomesoplenty.common.biome.BiomeTemplate; import biomesoplenty.common.world.biome.BiomeFeatureHelper; import biomesoplenty.common.world.gen.feature.BOPBiomeFeatures; import biomesoplenty.common.world.gen.feature.StandardGrassFeature; -import com.google.common.collect.ImmutableList; -import com.google.common.collect.Lists; -import net.minecraft.block.BlockState; import net.minecraft.block.Blocks; import net.minecraft.entity.EntityClassification; import net.minecraft.entity.EntityType; @@ -25,15 +21,12 @@ import net.minecraft.world.biome.DefaultBiomeFeatures; import net.minecraft.world.biome.MoodSoundAmbience; import net.minecraft.world.gen.GenerationStage; import net.minecraft.world.gen.feature.*; -import net.minecraft.world.gen.feature.structure.MineshaftConfig; -import net.minecraft.world.gen.feature.structure.MineshaftStructure; import net.minecraft.world.gen.placement.*; import net.minecraft.world.gen.surfacebuilders.ConfiguredSurfaceBuilder; -import net.minecraft.world.gen.surfacebuilders.SurfaceBuilder; import net.minecraftforge.api.distmarker.Dist; import net.minecraftforge.api.distmarker.OnlyIn; -public class VolcanicPlainsBiome extends BiomeBOP +public class VolcanicPlainsBiome extends BiomeTemplate { public VolcanicPlainsBiome() { diff --git a/src/main/java/biomesoplenty/common/biome/overworld/VolcanoBiome.java b/src/main/java/biomesoplenty/common/biome/overworld/VolcanoBiome.java index 3aab12e7b..15ac9fd2d 100644 --- a/src/main/java/biomesoplenty/common/biome/overworld/VolcanoBiome.java +++ b/src/main/java/biomesoplenty/common/biome/overworld/VolcanoBiome.java @@ -8,22 +8,19 @@ package biomesoplenty.common.biome.overworld; import biomesoplenty.api.biome.BOPBiomes; -import biomesoplenty.common.biome.BiomeBOP; +import biomesoplenty.common.biome.BiomeTemplate; import biomesoplenty.common.world.gen.feature.BOPBiomeFeatures; import com.google.common.collect.Lists; import net.minecraft.block.BlockState; import net.minecraft.block.Blocks; import net.minecraft.entity.EntityClassification; import net.minecraft.entity.EntityType; -import net.minecraft.util.math.BlockPos; import net.minecraft.world.biome.Biome; import net.minecraft.world.biome.BiomeAmbience; import net.minecraft.world.biome.DefaultBiomeFeatures; import net.minecraft.world.biome.MoodSoundAmbience; import net.minecraft.world.gen.GenerationStage; import net.minecraft.world.gen.feature.*; -import net.minecraft.world.gen.feature.structure.MineshaftConfig; -import net.minecraft.world.gen.feature.structure.MineshaftStructure; import net.minecraft.world.gen.placement.ChanceConfig; import net.minecraft.world.gen.placement.CountRangeConfig; import net.minecraft.world.gen.placement.FrequencyConfig; @@ -32,7 +29,7 @@ import net.minecraft.world.gen.surfacebuilders.ConfiguredSurfaceBuilder; import net.minecraftforge.api.distmarker.Dist; import net.minecraftforge.api.distmarker.OnlyIn; -public class VolcanoBiome extends BiomeBOP +public class VolcanoBiome extends BiomeTemplate { public VolcanoBiome() { diff --git a/src/main/java/biomesoplenty/common/biome/overworld/WastelandBiome.java b/src/main/java/biomesoplenty/common/biome/overworld/WastelandBiome.java index 10005e951..75542f64a 100644 --- a/src/main/java/biomesoplenty/common/biome/overworld/WastelandBiome.java +++ b/src/main/java/biomesoplenty/common/biome/overworld/WastelandBiome.java @@ -8,21 +8,18 @@ package biomesoplenty.common.biome.overworld; import biomesoplenty.api.enums.BOPClimates; -import biomesoplenty.common.biome.BiomeBOP; +import biomesoplenty.common.biome.BiomeTemplate; import biomesoplenty.common.world.gen.feature.BOPBiomeFeatures; import biomesoplenty.common.world.gen.feature.WastelandGrassFeature; import com.google.common.collect.ImmutableList; import net.minecraft.entity.EntityClassification; import net.minecraft.entity.EntityType; -import net.minecraft.util.math.BlockPos; import net.minecraft.world.biome.*; import net.minecraft.world.gen.GenerationStage; import net.minecraft.world.gen.feature.Feature; import net.minecraft.world.gen.feature.IFeatureConfig; import net.minecraft.world.gen.feature.MultipleRandomFeatureConfig; import net.minecraft.world.gen.feature.NoFeatureConfig; -import net.minecraft.world.gen.feature.structure.MineshaftConfig; -import net.minecraft.world.gen.feature.structure.MineshaftStructure; import net.minecraft.world.gen.placement.AtSurfaceWithExtraConfig; import net.minecraft.world.gen.placement.FrequencyConfig; import net.minecraft.world.gen.placement.Placement; @@ -31,7 +28,7 @@ import net.minecraft.world.gen.surfacebuilders.SurfaceBuilder; import net.minecraftforge.api.distmarker.Dist; import net.minecraftforge.api.distmarker.OnlyIn; -public class WastelandBiome extends BiomeBOP +public class WastelandBiome extends BiomeTemplate { public WastelandBiome() { diff --git a/src/main/java/biomesoplenty/common/biome/overworld/WetlandBiome.java b/src/main/java/biomesoplenty/common/biome/overworld/WetlandBiome.java index 03e376bf3..ebc95d543 100644 --- a/src/main/java/biomesoplenty/common/biome/overworld/WetlandBiome.java +++ b/src/main/java/biomesoplenty/common/biome/overworld/WetlandBiome.java @@ -9,7 +9,7 @@ package biomesoplenty.common.biome.overworld; import biomesoplenty.api.block.BOPBlocks; import biomesoplenty.api.enums.BOPClimates; -import biomesoplenty.common.biome.BiomeBOP; +import biomesoplenty.common.biome.BiomeTemplate; import biomesoplenty.common.world.biome.BiomeFeatureHelper; import biomesoplenty.common.world.gen.feature.BOPBiomeFeatures; import biomesoplenty.common.world.gen.feature.FernGrassFeature; @@ -19,22 +19,19 @@ import net.minecraft.block.BlockState; import net.minecraft.block.Blocks; import net.minecraft.entity.EntityClassification; import net.minecraft.entity.EntityType; -import net.minecraft.util.math.BlockPos; import net.minecraft.world.biome.Biome; import net.minecraft.world.biome.BiomeAmbience; import net.minecraft.world.biome.DefaultBiomeFeatures; import net.minecraft.world.biome.MoodSoundAmbience; import net.minecraft.world.gen.GenerationStage; import net.minecraft.world.gen.feature.*; -import net.minecraft.world.gen.feature.structure.MineshaftConfig; -import net.minecraft.world.gen.feature.structure.MineshaftStructure; import net.minecraft.world.gen.placement.*; import net.minecraft.world.gen.surfacebuilders.ConfiguredSurfaceBuilder; import net.minecraft.world.gen.surfacebuilders.SurfaceBuilder; import net.minecraftforge.api.distmarker.Dist; import net.minecraftforge.api.distmarker.OnlyIn; -public class WetlandBiome extends BiomeBOP +public class WetlandBiome extends BiomeTemplate { public WetlandBiome() { diff --git a/src/main/java/biomesoplenty/common/biome/overworld/WoodlandBiome.java b/src/main/java/biomesoplenty/common/biome/overworld/WoodlandBiome.java index cd968092e..ae2c18383 100644 --- a/src/main/java/biomesoplenty/common/biome/overworld/WoodlandBiome.java +++ b/src/main/java/biomesoplenty/common/biome/overworld/WoodlandBiome.java @@ -9,23 +9,19 @@ package biomesoplenty.common.biome.overworld; import biomesoplenty.api.block.BOPBlocks; import biomesoplenty.api.enums.BOPClimates; -import biomesoplenty.common.biome.BiomeBOP; +import biomesoplenty.common.biome.BiomeTemplate; import biomesoplenty.common.world.biome.BiomeFeatureHelper; import biomesoplenty.common.world.gen.feature.BOPBiomeFeatures; import biomesoplenty.common.world.gen.feature.StandardGrassFeature; import net.minecraft.block.Blocks; import net.minecraft.entity.EntityClassification; import net.minecraft.entity.EntityType; -import net.minecraft.util.math.BlockPos; import net.minecraft.world.biome.Biome; import net.minecraft.world.biome.BiomeAmbience; import net.minecraft.world.biome.DefaultBiomeFeatures; import net.minecraft.world.biome.MoodSoundAmbience; import net.minecraft.world.gen.GenerationStage; import net.minecraft.world.gen.feature.*; -import net.minecraft.world.gen.feature.structure.MineshaftConfig; -import net.minecraft.world.gen.feature.structure.MineshaftStructure; -import net.minecraft.world.gen.feature.structure.VillageConfig; import net.minecraft.world.gen.placement.AtSurfaceWithExtraConfig; import net.minecraft.world.gen.placement.ChanceConfig; import net.minecraft.world.gen.placement.FrequencyConfig; @@ -35,7 +31,7 @@ import net.minecraft.world.gen.surfacebuilders.SurfaceBuilder; import net.minecraftforge.api.distmarker.Dist; import net.minecraftforge.api.distmarker.OnlyIn; -public class WoodlandBiome extends BiomeBOP +public class WoodlandBiome extends BiomeTemplate { public WoodlandBiome() { diff --git a/src/main/java/biomesoplenty/common/biome/overworld/XericShrublandBiome.java b/src/main/java/biomesoplenty/common/biome/overworld/XericShrublandBiome.java index 7cca7bb5f..a83b8da3b 100644 --- a/src/main/java/biomesoplenty/common/biome/overworld/XericShrublandBiome.java +++ b/src/main/java/biomesoplenty/common/biome/overworld/XericShrublandBiome.java @@ -8,7 +8,7 @@ package biomesoplenty.common.biome.overworld; import biomesoplenty.api.block.BOPBlocks; -import biomesoplenty.common.biome.BiomeBOP; +import biomesoplenty.common.biome.BiomeTemplate; import biomesoplenty.common.world.biome.BiomeFeatureHelper; import biomesoplenty.common.world.gen.feature.BOPBiomeFeatures; import net.minecraft.block.Blocks; @@ -22,9 +22,6 @@ import net.minecraft.world.gen.GenerationStage; import net.minecraft.world.gen.feature.BlockStateFeatureConfig; import net.minecraft.world.gen.feature.Feature; import net.minecraft.world.gen.feature.IFeatureConfig; -import net.minecraft.world.gen.feature.structure.MineshaftConfig; -import net.minecraft.world.gen.feature.structure.MineshaftStructure; -import net.minecraft.world.gen.feature.structure.VillageConfig; import net.minecraft.world.gen.placement.AtSurfaceWithExtraConfig; import net.minecraft.world.gen.placement.ChanceConfig; import net.minecraft.world.gen.placement.FrequencyConfig; @@ -34,7 +31,7 @@ import net.minecraft.world.gen.surfacebuilders.SurfaceBuilder; import net.minecraftforge.api.distmarker.Dist; import net.minecraftforge.api.distmarker.OnlyIn; -public class XericShrublandBiome extends BiomeBOP +public class XericShrublandBiome extends BiomeTemplate { public XericShrublandBiome() { diff --git a/src/main/java/biomesoplenty/common/util/biome/BiomeUtil.java b/src/main/java/biomesoplenty/common/util/biome/BiomeUtil.java index 1f0b88568..a2ba13435 100644 --- a/src/main/java/biomesoplenty/common/util/biome/BiomeUtil.java +++ b/src/main/java/biomesoplenty/common/util/biome/BiomeUtil.java @@ -7,60 +7,19 @@ ******************************************************************************/ package biomesoplenty.common.util.biome; -import biomesoplenty.common.world.BOPOverworldGenSettings; -import biomesoplenty.core.BiomesOPlenty; -import net.minecraft.util.math.BlockPos; -import net.minecraft.world.World; +import net.minecraft.util.RegistryKey; +import net.minecraft.util.registry.WorldGenRegistries; import net.minecraft.world.biome.Biome; public class BiomeUtil { - public static int getBiomeSize(World world) + public static int getBiomeId(Biome biome) { - // TODO - return BOPOverworldGenSettings.BiomeSize.MEDIUM.getValue(); + return WorldGenRegistries.BIOME.getId(biome); } - public static BlockPos spiralOutwardsLookingForBiome(World world, Biome biomeToFind, double startX, double startZ) + public static int getBiomeId(RegistryKey key) { - int sampleSpacing = 4 << BiomeUtil.getBiomeSize(world); - int maxDist = sampleSpacing * 100; - return spiralOutwardsLookingForBiome(world, biomeToFind, startX, startZ, maxDist, sampleSpacing); - } - - // sample points in an archimedean spiral starting from startX,startY each one sampleSpace apart - // stop when the specified biome is found (and return the position it was found at) or when we reach maxDistance (and return null) - public static BlockPos spiralOutwardsLookingForBiome(World world, Biome biomeToFind, double startX, double startZ, int maxDist, int sampleSpace) - { - if (maxDist <= 0 || sampleSpace <= 0) {throw new IllegalArgumentException("maxDist and sampleSpace must be positive");} - - if (world.isClientSide) - return null; - - double a = sampleSpace / Math.sqrt(Math.PI); - double b = 2 * Math.sqrt(Math.PI); - double x = 0; - double z = 0; - double dist = 0; - int n = 0; - String biomeName = "biome"; - for (n = 0; dist < maxDist; ++n) - { - double rootN = Math.sqrt(n); - dist = a * rootN; - x = startX + (dist * Math.sin(b * rootN)); - z = startZ + (dist * Math.cos(b * rootN)); - // chunkManager.genBiomes is the first layer returned from initializeAllBiomeGenerators() - // chunkManager.biomeIndexLayer is the second layer returned from initializeAllBiomeGenerators(), it's zoomed twice from genBiomes (>> 2) this one is actual size - // chunkManager.getBiomeGenAt uses biomeIndexLayer to get the biome - Biome biomeAtSample = world.getBiomeManager().getBiome(new BlockPos(x, 0, z)); - if (biomeAtSample == biomeToFind) - { - BiomesOPlenty.logger.info("Found "+ biomeName +" after "+n+" samples, spaced "+sampleSpace+" blocks apart at ("+((int)x)+","+((int)z)+") distance "+((int)dist)); - return new BlockPos((int)x, 0, (int)z); - } - } - BiomesOPlenty.logger.info("Failed to find "+biomeName+" gave up after "+n+" samples, spaced "+sampleSpace+" blocks apart distance "+((int)dist)); - return null; + return getBiomeId(WorldGenRegistries.BIOME.get(key)); } } diff --git a/src/main/java/biomesoplenty/common/world/layer/BOPRiverMixLayer.java b/src/main/java/biomesoplenty/common/world/layer/BOPRiverMixLayer.java index 20bf4112e..2711efcd9 100644 --- a/src/main/java/biomesoplenty/common/world/layer/BOPRiverMixLayer.java +++ b/src/main/java/biomesoplenty/common/world/layer/BOPRiverMixLayer.java @@ -7,7 +7,7 @@ ******************************************************************************/ package biomesoplenty.common.world.layer; -import biomesoplenty.common.biome.BiomeBOP; +import biomesoplenty.common.biome.BiomeTemplate; import biomesoplenty.common.world.BOPLayerUtil; import net.minecraft.util.registry.Registry; import net.minecraft.world.biome.Biome; @@ -44,12 +44,12 @@ public enum BOPRiverMixLayer implements IAreaTransformer2, IDimOffset0Transforme { return FROZEN_RIVER; } - else if (biome instanceof BiomeBOP) + else if (biome instanceof BiomeTemplate) { - BiomeBOP biomeBOP = (BiomeBOP)biome; + BiomeTemplate biomeTemplate = (BiomeTemplate)biome; - if (biomeBOP.riverBiomeId != -1) - return biomeBOP.riverBiomeId; + if (biomeTemplate.riverBiomeId != -1) + return biomeTemplate.riverBiomeId; else return biomeId; } diff --git a/src/main/java/biomesoplenty/common/world/layer/BOPShoreLayer.java b/src/main/java/biomesoplenty/common/world/layer/BOPShoreLayer.java index 085eecbc5..ba63d794c 100644 --- a/src/main/java/biomesoplenty/common/world/layer/BOPShoreLayer.java +++ b/src/main/java/biomesoplenty/common/world/layer/BOPShoreLayer.java @@ -8,7 +8,7 @@ package biomesoplenty.common.world.layer; import biomesoplenty.api.biome.BOPBiomes; -import biomesoplenty.common.biome.BiomeBOP; +import biomesoplenty.common.biome.BiomeTemplate; import biomesoplenty.common.world.BOPLayerUtil; import net.minecraft.util.registry.Registry; import net.minecraft.world.biome.Biome; @@ -75,11 +75,11 @@ public enum BOPShoreLayer implements ICastleTransformer { if (!BOPLayerUtil.isOcean(biomeId) && (BOPLayerUtil.isOcean(northBiomeId) || BOPLayerUtil.isOcean(eastBiomeId) || BOPLayerUtil.isOcean(southBiomeId) || BOPLayerUtil.isOcean(westBiomeId))) { - if (biome instanceof BiomeBOP) + if (biome instanceof BiomeTemplate) { - BiomeBOP biomeBOP = (BiomeBOP)biome; + BiomeTemplate biomeTemplate = (BiomeTemplate)biome; - if (biomeBOP.beachBiomeId == -1) + if (biomeTemplate.beachBiomeId == -1) return biomeId; } @@ -90,13 +90,13 @@ public enum BOPShoreLayer implements ICastleTransformer { if (!BOPLayerUtil.isOcean(biomeId) && biomeId != RIVER && biomeId != SWAMP && (BOPLayerUtil.isOcean(northBiomeId) || BOPLayerUtil.isOcean(eastBiomeId) || BOPLayerUtil.isOcean(southBiomeId) || BOPLayerUtil.isOcean(westBiomeId))) { - if (biome instanceof BiomeBOP) + if (biome instanceof BiomeTemplate) { - BiomeBOP biomeBOP = (BiomeBOP)biome; + BiomeTemplate biomeTemplate = (BiomeTemplate)biome; - if (biomeBOP.beachBiomeId != -1) + if (biomeTemplate.beachBiomeId != -1) { - return biomeBOP.beachBiomeId; + return biomeTemplate.beachBiomeId; } else { diff --git a/src/main/java/biomesoplenty/init/ModBiomes.java b/src/main/java/biomesoplenty/init/ModBiomes.java index 58e32ea0d..19992c872 100644 --- a/src/main/java/biomesoplenty/init/ModBiomes.java +++ b/src/main/java/biomesoplenty/init/ModBiomes.java @@ -8,7 +8,7 @@ package biomesoplenty.init; import biomesoplenty.api.enums.BOPClimates; -import biomesoplenty.common.biome.BiomeBOP; +import biomesoplenty.common.biome.BiomeTemplate; import biomesoplenty.common.biome.BiomeRegistry; import biomesoplenty.common.biome.nether.*; import biomesoplenty.common.biome.overworld.*; @@ -202,85 +202,8 @@ public class ModBiomes BiomeRegistry.configureVanillaBiomes(); BiomeRegistry.finalizeRegistrations(BiomeRegistry.RegistrationType.VANILLA_BIOME); - registerBiomeDictionaryTags(); registerVillagerTypes(); } - - private static void registerBiomeDictionaryTags() - { - //Overworld Biomes - registerBiomeToDictionary(alps, Type.OVERWORLD, Type.MOUNTAIN, Type.SNOWY, Type.COLD); - registerBiomeToDictionary(alps_foothills, Type.OVERWORLD, Type.MOUNTAIN, Type.SNOWY, Type.FOREST, Type.SPARSE, Type.COLD); - registerBiomeToDictionary(bayou, Type.OVERWORLD, Type.SWAMP, Type.HOT, Type.WET, Type.DENSE); - registerBiomeToDictionary(bog, Type.OVERWORLD, Type.CONIFEROUS, Type.WET); - registerBiomeToDictionary(boreal_forest, Type.OVERWORLD, Type.FOREST, Type.CONIFEROUS, Type.HILLS, Type.COLD, Type.DENSE); - registerBiomeToDictionary(brushland, Type.OVERWORLD, Type.SAVANNA, Type.HOT, Type.DRY, Type.SPARSE); - registerBiomeToDictionary(chaparral, Type.OVERWORLD, Type.PLAINS, Type.DRY, Type.HILLS); - registerBiomeToDictionary(cherry_blossom_grove, Type.OVERWORLD, Type.FOREST, Type.MAGICAL, Type.LUSH, Type.DENSE); - registerBiomeToDictionary(cold_desert, Type.OVERWORLD, Type.SNOWY, Type.DRY, Type.COLD); - registerBiomeToDictionary(coniferous_forest, Type.OVERWORLD, Type.CONIFEROUS, Type.FOREST, Type.DENSE); - registerBiomeToDictionary(dead_forest, Type.OVERWORLD, Type.FOREST, Type.DEAD, Type.COLD, Type.DRY, Type.SPARSE); - registerBiomeToDictionary(fir_clearing, Type.OVERWORLD, Type.CONIFEROUS, Type.FOREST, Type.SPARSE); - registerBiomeToDictionary(floodplain, Type.OVERWORLD, Type.JUNGLE, Type.WATER, Type.HOT, Type.WET); - registerBiomeToDictionary(flower_meadow, Type.OVERWORLD, Type.PLAINS); - registerBiomeToDictionary(fungal_jungle, Type.OVERWORLD, Type.MAGICAL, Type.MUSHROOM, Type.JUNGLE, Type.HOT, Type.LUSH, Type.RARE); - registerBiomeToDictionary(grassland, Type.OVERWORLD, Type.PLAINS, Type.HILLS, Type.WET); - registerBiomeToDictionary(gravel_beach, Type.OVERWORLD, Type.BEACH); - registerBiomeToDictionary(grove, Type.OVERWORLD, Type.FOREST, Type.PLAINS, Type.SPARSE); - registerBiomeToDictionary(highland, Type.OVERWORLD, Type.MOUNTAIN, Type.HILLS, Type.WET); - registerBiomeToDictionary(highland_moor, Type.OVERWORLD, Type.HILLS, Type.WET); - registerBiomeToDictionary(lavender_field, Type.OVERWORLD, Type.PLAINS, Type.MAGICAL); - registerBiomeToDictionary(lush_grassland, Type.OVERWORLD, Type.JUNGLE, Type.PLAINS, Type.HILLS, Type.WET, Type.HOT, Type.LUSH); - registerBiomeToDictionary(lush_swamp, Type.OVERWORLD, Type.SWAMP, Type.LUSH, Type.HOT, Type.WET); - registerBiomeToDictionary(mangrove, Type.OVERWORLD, Type.WATER, Type.WET, Type.HOT, Type.DENSE, Type.LUSH); - registerBiomeToDictionary(maple_woods, Type.OVERWORLD, Type.FOREST, Type.CONIFEROUS, Type.COLD, Type.DENSE); - registerBiomeToDictionary(marsh, Type.OVERWORLD, Type.WET); - registerBiomeToDictionary(meadow, Type.OVERWORLD, Type.PLAINS, Type.FOREST); - registerBiomeToDictionary(mire, Type.OVERWORLD, Type.SWAMP, Type.DEAD, Type.WET); - registerBiomeToDictionary(muskeg, Type.OVERWORLD, Type.FOREST, Type.SWAMP, Type.COLD, Type.SNOWY, Type.SPARSE, Type.DEAD, Type.WET); - registerBiomeToDictionary(mystic_grove, Type.OVERWORLD, Type.MAGICAL, Type.FOREST, Type.LUSH, Type.DENSE, Type.RARE); - registerBiomeToDictionary(oasis, Type.OVERWORLD, Type.SANDY, Type.LUSH, Type.JUNGLE, Type.HOT, Type.SPARSE); - registerBiomeToDictionary(ominous_woods, Type.OVERWORLD, Type.MAGICAL, Type.FOREST, Type.SPOOKY, Type.DEAD, Type.DENSE, Type.RARE); - registerBiomeToDictionary(orchard, Type.OVERWORLD, Type.PLAINS); - registerBiomeToDictionary(origin_hills, Type.OVERWORLD, Type.RARE); - registerBiomeToDictionary(outback, Type.OVERWORLD, Type.SANDY, Type.SAVANNA, Type.HOT, Type.DRY, Type.SPARSE); - registerBiomeToDictionary(overgrown_cliffs, Type.OVERWORLD, Type.MOUNTAIN, Type.HILLS, Type.LUSH, Type.JUNGLE, Type.DENSE, Type.HOT); - registerBiomeToDictionary(pasture, Type.OVERWORLD, Type.PLAINS, Type.DRY); - registerBiomeToDictionary(poppy_field, Type.OVERWORLD, Type.PLAINS, Type.DRY, Type.SPARSE); - registerBiomeToDictionary(prairie, Type.OVERWORLD, Type.PLAINS, Type.DRY, Type.SPARSE); - registerBiomeToDictionary(pumpkin_patch, Type.OVERWORLD, Type.FOREST); - registerBiomeToDictionary(rainbow_valley, Type.OVERWORLD, Type.FOREST, Type.LUSH, Type.DENSE, Type.MAGICAL, Type.RARE); - registerBiomeToDictionary(rainforest, Type.OVERWORLD, Type.JUNGLE, Type.FOREST, Type.HOT, Type.LUSH, Type.HILLS, Type.WET, Type.DENSE); - registerBiomeToDictionary(redwood_forest, Type.OVERWORLD, Type.FOREST, Type.DENSE); - registerBiomeToDictionary(redwood_forest_edge, Type.OVERWORLD, Type.FOREST, Type.DENSE); - registerBiomeToDictionary(scrubland, Type.OVERWORLD, Type.SAVANNA, Type.HOT, Type.SPARSE, Type.DRY); - registerBiomeToDictionary(seasonal_forest, Type.OVERWORLD, Type.FOREST); - registerBiomeToDictionary(shield, Type.OVERWORLD, Type.FOREST, Type.COLD, Type.WET); - registerBiomeToDictionary(shrubland, Type.OVERWORLD, Type.PLAINS, Type.DRY, Type.SPARSE); - registerBiomeToDictionary(silkglade, Type.OVERWORLD, Type.FOREST, Type.DEAD, Type.SPOOKY, Type.DRY); - registerBiomeToDictionary(snowy_coniferous_forest, Type.OVERWORLD, Type.FOREST, Type.CONIFEROUS, Type.SNOWY, Type.COLD, Type.DENSE); - registerBiomeToDictionary(snowy_fir_clearing, Type.OVERWORLD, Type.FOREST, Type.CONIFEROUS, Type.SNOWY, Type.COLD, Type.SPARSE); - registerBiomeToDictionary(snowy_forest, Type.OVERWORLD, Type.SNOWY, Type.FOREST, Type.COLD, Type.SPARSE); - registerBiomeToDictionary(steppe, Type.OVERWORLD, Type.PLAINS, Type.HILLS, Type.DRY); - registerBiomeToDictionary(temperate_rainforest, Type.OVERWORLD, Type.FOREST, Type.LUSH, Type.WET); - registerBiomeToDictionary(temperate_rainforest_hills, Type.OVERWORLD, Type.FOREST, Type.HILLS, Type.LUSH, Type.WET, Type.DENSE); - registerBiomeToDictionary(tropical_rainforest, Type.OVERWORLD, Type.JUNGLE, Type.LUSH, Type.HOT, Type.WET, Type.DENSE); - registerBiomeToDictionary(tropic_beach, Type.OVERWORLD, Type.BEACH, Type.HOT); - registerBiomeToDictionary(tropics, Type.OVERWORLD, Type.JUNGLE, Type.LUSH, Type.HOT); - registerBiomeToDictionary(tundra, Type.OVERWORLD, Type.COLD, Type.WASTELAND, Type.DEAD, Type.SPARSE); - registerBiomeToDictionary(volcanic_plains, Type.OVERWORLD, Type.DEAD, Type.WASTELAND, Type.MOUNTAIN, Type.HOT, Type.DRY); - registerBiomeToDictionary(volcano, Type.OVERWORLD, Type.DEAD, Type.WASTELAND, Type.MOUNTAIN, Type.HOT, Type.DRY); - registerBiomeToDictionary(wasteland, Type.OVERWORLD, Type.WASTELAND, Type.DEAD, Type.DRY, Type.SPARSE, Type.HOT); - registerBiomeToDictionary(wetland, Type.OVERWORLD, Type.SWAMP, Type.FOREST, Type.LUSH, Type.WET, Type.DENSE); - registerBiomeToDictionary(woodland, Type.OVERWORLD, Type.FOREST); - registerBiomeToDictionary(xeric_shrubland, Type.OVERWORLD, Type.SANDY, Type.SAVANNA, Type.LUSH, Type.HOT, Type.DRY, Type.SPARSE); - - //Nether Biomes - registerBiomeToDictionary(crystalline_chasm, Type.NETHER, Type.HOT); - registerBiomeToDictionary(undergrowth, Type.NETHER, Type.HOT); - registerBiomeToDictionary(visceral_heap, Type.NETHER, Type.HOT); - registerBiomeToDictionary(withered_abyss, Type.NETHER, Type.HOT); - } private static void registerVillagerTypes() { @@ -371,12 +294,12 @@ public class ModBiomes * Biome registration helpers */ - public static void registerBiome(BiomeBOP biome, String name) + public static void registerBiome(BiomeTemplate biome, String name) { BiomeRegistry.deferStandardRegistration(biome, name); } - public static void registerTechnicalBiome(BiomeBOP biome, String name) + public static void registerTechnicalBiome(BiomeTemplate biome, String name) { BiomeRegistry.deferTechnicalBiomeRegistration(biome, name); } diff --git a/src/main/java/biomesoplenty/init/ModCompatibility.java b/src/main/java/biomesoplenty/init/ModCompatibility.java deleted file mode 100644 index 2865bdddc..000000000 --- a/src/main/java/biomesoplenty/init/ModCompatibility.java +++ /dev/null @@ -1,119 +0,0 @@ -/******************************************************************************* - * Copyright 2014-2019, the Biomes O' Plenty Team - * - * This work is licensed under a Creative Commons Attribution-NonCommercial-NoDerivatives 4.0 International Public License. - * - * To view a copy of this license, visit http://creativecommons.org/licenses/by-nc-nd/4.0/. - ******************************************************************************/ -package biomesoplenty.init; - -import biomesoplenty.api.enums.BOPClimates; -import biomesoplenty.core.BiomesOPlenty; -import com.google.common.collect.Lists; -import net.minecraft.world.biome.Biome; -import net.minecraftforge.common.BiomeManager; -import net.minecraftforge.fml.common.ObfuscationReflectionHelper; - -import java.util.List; - -public class ModCompatibility -{ - public static void setup() - { - copyModBiomeWeights(); - } - - private static void copyModBiomeWeights() - { - try - { - // An array containing lists of default biome entries for only standard BiomeTypes - List[] vanillaBiomes = (List[]) ObfuscationReflectionHelper.findMethod(BiomeManager.class, "setupBiomes").invoke(null); - - for (BiomeManager.BiomeType type : BiomeManager.BiomeType.values()) - { - // Creates a mutable version of the current biome type's biome array and wraps entries to support .equals() - List entries = Lists.newArrayList(); - List vanillaEntries = Lists.newArrayList(); - - for (BiomeManager.BiomeEntry entry : BiomeManager.getBiomes(type)) - { - entries.add(new WrappedBiomeEntry(entry)); - } - - for (BiomeManager.BiomeEntry entry : vanillaBiomes[type.ordinal()]) - { - vanillaEntries.add(new WrappedBiomeEntry(entry)); - } - - //Remove all default biomes from the entries list - entries.removeAll(vanillaEntries); - - for (WrappedBiomeEntry wrappedEntry : entries) - { - remapBiomeToBoP(wrappedEntry.biomeEntry.biome, type, wrappedEntry.biomeEntry.weight); - } - } - } - catch (Exception e) - { - BiomesOPlenty.logger.error("An error has occurred whilst copying mod biomes"); - e.printStackTrace(); - return; - } - } - - // TODO: Make this more accurate, possibly analyze heights, temps, rainfall and/or biome dictionary tags - private static void remapBiomeToBoP(Biome biome, BiomeManager.BiomeType type, int weight) - { - /* If any of our climates already have the biome (from a mod using our api), then skip this biome */ - for (BOPClimates climate : BOPClimates.values()) - { - List entries = Lists.newArrayList(); - entries.addAll(climate.getLandBiomes()); - entries.addAll(climate.getIslandBiomes()); - - for (BOPClimates.WeightedBiomeEntry entry : entries) - { - if (entry.biome == biome) - { - return; - } - } - } - - - for (BOPClimates climate : BOPClimates.values()) - { - if (climate.biomeType == type) - { - climate.addBiome(weight, biome); - } - } - } - - /** - * Provides working equals functionality for BiomeEntries - * */ - private static class WrappedBiomeEntry - { - private BiomeManager.BiomeEntry biomeEntry; - - private WrappedBiomeEntry(BiomeManager.BiomeEntry biomeEntry) - { - this.biomeEntry = biomeEntry; - } - - @Override - public boolean equals(Object input) - { - if (input == null) return false; - if (input == this) return true; - if (!(input instanceof WrappedBiomeEntry)) return false; - - WrappedBiomeEntry other = (WrappedBiomeEntry)input; - - return other.biomeEntry.weight == this.biomeEntry.weight && other.biomeEntry.biome == this.biomeEntry.biome; - } - } -}