diff --git a/src/main/java/biomesoplenty/common/biome/BOPBiome.java b/src/main/java/biomesoplenty/common/biome/BOPBiome.java new file mode 100644 index 000000000..a5f45b95c --- /dev/null +++ b/src/main/java/biomesoplenty/common/biome/BOPBiome.java @@ -0,0 +1,334 @@ +/******************************************************************************* + * Copyright 2014-2017, the Biomes O' Plenty Team + * + * This work is licensed under a Creative Commons Attribution-NonCommercial-NoDerivatives 4.0 International Public License. + * + * To view a copy of this license, visit http://creativecommons.org/licenses/by-nc-nd/4.0/. + ******************************************************************************/ +package biomesoplenty.common.biome; + +import biomesoplenty.api.biome.BiomeOwner; +import biomesoplenty.api.biome.IExtendedBiome; +import biomesoplenty.api.config.IConfigObj; +import biomesoplenty.api.enums.BOPClimates; +import biomesoplenty.api.generation.GeneratorStage; +import biomesoplenty.api.generation.IGenerator; +import biomesoplenty.common.biome.overworld.BOPOverworldBiome; +import biomesoplenty.common.init.ModBiomes; +import biomesoplenty.common.world.GenerationManager; +import biomesoplenty.core.BiomesOPlenty; +import net.minecraft.entity.Entity; +import net.minecraft.entity.EntityLiving; +import net.minecraft.entity.EnumCreatureType; +import net.minecraft.util.ResourceLocation; +import net.minecraft.util.math.BlockPos; +import net.minecraft.world.biome.Biome; +import net.minecraftforge.fml.common.registry.ForgeRegistries; + +import java.util.*; + +public abstract class BOPBiome extends Biome implements IExtendedBiome +{ + protected GenerationManager generationManager = new GenerationManager(); + protected Map weightMap = new HashMap(); + + // defaults + + // -1 indicates the defaults as set by Vanilla will be used for the below fields + public int skyColor = -1; + public int fogColor = -1; + + /** 1.0 is the lowest possible amount of fog. 0.0 is the greatest.*/ + public float fogDensity = 1.0F; + + public boolean hasBiomeEssence = true; + + public final ResourceLocation location; + public IConfigObj conf; + + private BOPBiome(ResourceLocation idLoc, PropsBuilder defaultBuilder, IConfigObj conf) + { + super(configureBiomeProps(idLoc, defaultBuilder, conf)); + + this.location = idLoc; + this.conf = conf; + + this.theBiomeDecorator.treesPerChunk = -999; + this.theBiomeDecorator.flowersPerChunk = -999; + this.theBiomeDecorator.grassPerChunk = -999; + this.theBiomeDecorator.sandPerChunk = -999; + this.theBiomeDecorator.sandPerChunk2 = -999; + //this.theBiomeDecorator.generateLakes = false; + } + + protected BOPBiome(String idName, PropsBuilder defaultBuilder) + { + this(new ResourceLocation(BiomesOPlenty.MOD_ID, idName), defaultBuilder, ModBiomes.readConfigFile(idName)); + } + + public static BOPBiome.BiomeProps configureBiomeProps(ResourceLocation idLoc, BOPBiome.PropsBuilder defaultBuilder, IConfigObj conf) + { + // If there isn't a valid config file, don't use it to configure the biome + if (conf.isEmpty()) + return defaultBuilder.build(); + + defaultBuilder.withTemperature(conf.getFloat("temperature")); + defaultBuilder.withRainfall(conf.getFloat("rainfall")); + defaultBuilder.withWaterColor(conf.getInt("waterColor")); + + Boolean enableRain = conf.getBool("enableRain"); + if (enableRain != null && !enableRain) defaultBuilder.withRainDisabled(); + + Boolean enableSnow = conf.getBool("enableSnow"); + if (enableSnow != null && enableSnow) defaultBuilder.withSnowEnabled(); + + defaultBuilder.withBaseBiome(conf.getString("baseBiome")); + defaultBuilder.withGuiColour(conf.getInt("guiColour")); + + return defaultBuilder.build(); + } + + @Override + public void configure(IConfigObj conf) + { + this.topBlock = conf.getBlockState("topBlock", this.topBlock); + this.fillerBlock = conf.getBlockState("fillerBlock", this.fillerBlock); + + this.skyColor = conf.getInt("skyColor", this.skyColor); + this.fogColor = conf.getInt("fogColor", this.fogColor); + this.fogDensity = conf.getFloat("fogDensity", this.fogDensity); + this.hasBiomeEssence = conf.getBool("hasBiomeEssence", this.hasBiomeEssence); + + // Allow weights to be overridden + IConfigObj confWeights = conf.getObject("weights"); + if (confWeights != null) + { + for (BOPClimates climate : BOPClimates.values()) + { + Integer weight = confWeights.getInt(climate.name().toLowerCase(), null); + if (weight == null) {continue;} + if (weight.intValue() < 1) + { + this.weightMap.remove(climate); + } + else + { + this.weightMap.put(climate, weight); + } + } + } + + // Allow generators to be configured + IConfigObj confGenerators = conf.getObject("generators"); + if (confGenerators != null) + { + for (String name : confGenerators.getKeys()) + { + this.generationManager.configureWith(name, confGenerators.getObject(name)); + } + } + + // Allow spawnable entites to be configured + ArrayList confEntities = conf.getObjectArray("entities"); + if (confEntities != null) + { + for (IConfigObj confEntity : confEntities) + { + String entityName = confEntity.getString("name"); + EnumCreatureType creatureType = confEntity.getEnum("creatureType", EnumCreatureType.class); + if (entityName == null || creatureType == null) {continue;} + + // Look for an entity class matching this name + // case insensitive, dot used as mod delimiter, no spaces or underscores + // eg 'villager', 'Zombie', 'SQUID', 'enderdragon', 'biomesoplenty.wasp' all ok + Class entityClazz = ForgeRegistries.ENTITIES.getValue(new ResourceLocation(entityName)).getEntityClass(); + Class livingClazz = null; + if (!(entityClazz.isAssignableFrom(EntityLiving.class))) { + confEntity.addMessage("Entity " + entityName + " is not of type EntityLiving"); + continue; + } + else { + livingClazz = (Class )entityClazz; + } + + if (livingClazz == null) + { + confEntity.addMessage("No entity registered called " + entityName); + continue; + } + if (!creatureType.getCreatureClass().isAssignableFrom(livingClazz)) + { + confEntity.addMessage("Entity " + entityName + " is not of type " + creatureType); + continue; + } + + List spawns = this.getSpawnableList(creatureType); + Integer weight = confEntity.getInt("weight"); + if (weight != null && weight < 1) + { + // weight was set to zero (or negative) so find and remove this spawn + Iterator spawnIterator = spawns.iterator(); + while (spawnIterator.hasNext()) + { + SpawnListEntry entry = spawnIterator.next(); + if (entry.entityClass == livingClazz) + { + spawnIterator.remove(); + } + } + } + else + { + // weight was positive, or omitted, so update an existing spawn or add a new spawn + boolean foundIt = false; + for (SpawnListEntry entry : spawns) + { + if (entry.entityClass == entityClazz) + { + // the entry already exists - adjust the params + entry.itemWeight = confEntity.getInt("weight", entry.itemWeight); + entry.minGroupCount = confEntity.getInt("minGroupCount", entry.minGroupCount); + entry.maxGroupCount = confEntity.getInt("maxGroupCount", entry.maxGroupCount); + foundIt = true; + } + } + if (!foundIt) + { + // the entry does not exist - add it + SpawnListEntry entry = new SpawnListEntry(livingClazz, confEntity.getInt("weight", 10), confEntity.getInt("minGroupCount", 4), confEntity.getInt("maxGroupCount", 4)); + spawns.add(entry); + } + } + } + } + } + + @Override + public BiomeOwner getBiomeOwner() + { + return BiomeOwner.BIOMESOPLENTY; + } + + @Override + public void addGenerator(String name, GeneratorStage stage, IGenerator generator) + { + this.generationManager.addGenerator(name, stage, generator); + } + + public IGenerator getGenerator(String name) + { + return this.generationManager.getGenerator(name); + } + + public void removeGenerator(String name) + { + this.generationManager.removeGenerator(name); + } + + @Override + public GenerationManager getGenerationManager() + { + return this.generationManager; + } + + @Override + public Map getWeightMap() + { + return this.weightMap; + } + + @Override + public void addWeight(BOPClimates climate, int weight) + { + this.weightMap.put(climate, weight); + } + + @Override + public void clearWeights() + { + this.weightMap.clear(); + } + + // whether or not a biome essence item corresponding to this biome should be able to drop from biome blocks + public boolean hasBiomeEssence() + { + return this.hasBiomeEssence; + } + + public int getFogColor(BlockPos pos) { return this.fogColor; } + + public float getFogDensity(BlockPos pos) { return this.fogDensity; } + + @Override + public int getSkyColorByTemp(float temperature) + { + return (this.skyColor == -1) ? super.getSkyColorByTemp(temperature) : this.skyColor; + } + + @Override + public Biome getBaseBiome() + { + return this; + } + + @Override + public ResourceLocation getResourceLocation() + { + return this.location; + } + + public static class PropsBuilder + { + private final String biomeName; + + /**The colour of this biome as seen in guis**/ + private int guiColour = 0xffffff; + private float baseHeight = 0.1F; + private float heightVariation = 0.2F; + private float temperature = 0.5F; + private float rainfall = 0.5F; + private int waterColor = 16777215; + private boolean enableSnow = false; + private boolean enableRain = true; + private String baseBiomeRegName; + + public PropsBuilder(String name) { this.biomeName = name; } + + public PropsBuilder withGuiColour(Integer colour) { if (colour != null) this.guiColour = colour; return this; } + public PropsBuilder withTemperature(Float temperature) { if (temperature != null) this.temperature = temperature; return this; } + public PropsBuilder withRainfall(Float rainfall) { if (rainfall != null) this.rainfall = rainfall; return this; } + public PropsBuilder withBaseHeight(Float baseHeight) { if (baseHeight != null) this.baseHeight = baseHeight; return this; } + public PropsBuilder withHeightVariation(Float heightVariation) { if (heightVariation != null) this.heightVariation = heightVariation; return this; } + public PropsBuilder withRainDisabled() { this.enableRain = false; return this; } + public PropsBuilder withSnowEnabled() { this.enableSnow = true; return this; } + public PropsBuilder withWaterColor(Integer waterColor) { if (waterColor != null) this.waterColor = waterColor; return this; } + public PropsBuilder withBaseBiome(String name) { if (name != null) this.baseBiomeRegName = name; return this; } + + public BiomeProps build() + { + return new BiomeProps(this.biomeName, this.temperature, this.rainfall, this.baseHeight, this.heightVariation, this.enableRain, this.enableSnow, this.waterColor, this.baseBiomeRegName, this.guiColour); + } + } + + public static class BiomeProps extends BiomeProperties + { + /**The colour of this biome as seen in guis**/ + private int guiColour = 0xffffff; + + private BiomeProps(String name, float temperature, float rainfall, float baseHeight, float heightVariation, boolean enableRain, boolean enableSnow, int waterColor, String baseBiomeRegName, int guiColour) + { + super(name); + + this.setTemperature(temperature); + this.setRainfall(rainfall); + this.setBaseHeight(baseHeight); + this.setHeightVariation(heightVariation); + if (!enableRain) this.setRainDisabled(); + if (enableSnow) this.setSnowEnabled(); + this.setWaterColor(waterColor); + this.setBaseBiome(baseBiomeRegName); + + this.guiColour = guiColour; + } + } +} diff --git a/src/main/java/biomesoplenty/common/biome/overworld/BOPBiome.java b/src/main/java/biomesoplenty/common/biome/overworld/BOPOverworldBiome.java similarity index 98% rename from src/main/java/biomesoplenty/common/biome/overworld/BOPBiome.java rename to src/main/java/biomesoplenty/common/biome/overworld/BOPOverworldBiome.java index af5038f5d..7c7305832 100644 --- a/src/main/java/biomesoplenty/common/biome/overworld/BOPBiome.java +++ b/src/main/java/biomesoplenty/common/biome/overworld/BOPOverworldBiome.java @@ -54,7 +54,7 @@ import net.minecraft.world.biome.Biome; import net.minecraft.world.chunk.ChunkPrimer; import net.minecraftforge.fml.common.registry.ForgeRegistries; -public class BOPBiome extends Biome implements IExtendedBiome +public class BOPOverworldBiome extends Biome implements IExtendedBiome { private GenerationManager generationManager = new GenerationManager(); private Map weightMap = new HashMap(); @@ -84,7 +84,7 @@ public class BOPBiome extends Biome implements IExtendedBiome public final ResourceLocation location; public IConfigObj conf; - private BOPBiome(ResourceLocation idLoc, PropsBuilder defaultBuilder, IConfigObj conf) + private BOPOverworldBiome(ResourceLocation idLoc, PropsBuilder defaultBuilder, IConfigObj conf) { super(configureBiomeProps(idLoc, defaultBuilder, conf)); @@ -108,7 +108,7 @@ public class BOPBiome extends Biome implements IExtendedBiome this.addGenerator("stone_formations", GeneratorStage.FLOWERS,(new GeneratorColumns.Builder()).amountPerChunk(30.0F).generationAttempts(32).placeOn(suitableStonePosition).with(BOPBlocks.stone_formations.getDefaultState()).minHeight(1).maxHeight(5).randomDirection(true).scatterYMethod(ScatterYMethod.BELOW_GROUND).create()); } - public BOPBiome(String idName, PropsBuilder defaultBuilder) + public BOPOverworldBiome(String idName, PropsBuilder defaultBuilder) { this(new ResourceLocation(BiomesOPlenty.MOD_ID, idName), defaultBuilder, ModBiomes.readConfigFile(idName)); } diff --git a/src/main/java/biomesoplenty/common/biome/overworld/BiomeGenAlps.java b/src/main/java/biomesoplenty/common/biome/overworld/BiomeGenAlps.java index 8c13404df..29cb5a9dd 100644 --- a/src/main/java/biomesoplenty/common/biome/overworld/BiomeGenAlps.java +++ b/src/main/java/biomesoplenty/common/biome/overworld/BiomeGenAlps.java @@ -18,7 +18,7 @@ import biomesoplenty.common.world.generator.GeneratorOreSingle; import net.minecraft.block.state.IBlockState; import net.minecraft.init.Blocks; -public class BiomeGenAlps extends BOPBiome +public class BiomeGenAlps extends BOPOverworldBiome { public BiomeGenAlps() { diff --git a/src/main/java/biomesoplenty/common/biome/overworld/BiomeGenBambooForest.java b/src/main/java/biomesoplenty/common/biome/overworld/BiomeGenBambooForest.java index 0969f3002..8a7df7613 100644 --- a/src/main/java/biomesoplenty/common/biome/overworld/BiomeGenBambooForest.java +++ b/src/main/java/biomesoplenty/common/biome/overworld/BiomeGenBambooForest.java @@ -42,7 +42,7 @@ import net.minecraft.util.math.BlockPos; import net.minecraft.world.World; import net.minecraft.world.chunk.ChunkPrimer; -public class BiomeGenBambooForest extends BOPBiome +public class BiomeGenBambooForest extends BOPOverworldBiome { public IBlockState usualTopBlock; diff --git a/src/main/java/biomesoplenty/common/biome/overworld/BiomeGenBayou.java b/src/main/java/biomesoplenty/common/biome/overworld/BiomeGenBayou.java index 1c34d249d..26438ab2f 100644 --- a/src/main/java/biomesoplenty/common/biome/overworld/BiomeGenBayou.java +++ b/src/main/java/biomesoplenty/common/biome/overworld/BiomeGenBayou.java @@ -41,7 +41,7 @@ import net.minecraft.entity.monster.EntitySlime; import net.minecraft.init.Blocks; import net.minecraft.util.math.BlockPos; -public class BiomeGenBayou extends BOPBiome +public class BiomeGenBayou extends BOPOverworldBiome { public BiomeGenBayou() diff --git a/src/main/java/biomesoplenty/common/biome/overworld/BiomeGenBog.java b/src/main/java/biomesoplenty/common/biome/overworld/BiomeGenBog.java index 2c5c982e8..738278540 100644 --- a/src/main/java/biomesoplenty/common/biome/overworld/BiomeGenBog.java +++ b/src/main/java/biomesoplenty/common/biome/overworld/BiomeGenBog.java @@ -43,7 +43,7 @@ import net.minecraft.entity.monster.EntitySlime; import net.minecraft.init.Blocks; import net.minecraft.util.math.BlockPos; -public class BiomeGenBog extends BOPBiome +public class BiomeGenBog extends BOPOverworldBiome { public BiomeGenBog() @@ -61,7 +61,7 @@ public class BiomeGenBog extends BOPBiome if (BOPBiomes.gravel_beach.isPresent()) { - this.beachBiomeLocation = ((BOPBiome)BOPBiomes.gravel_beach.get()).getResourceLocation(); + this.beachBiomeLocation = ((BOPOverworldBiome)BOPBiomes.gravel_beach.get()).getResourceLocation(); } this.addWeight(BOPClimates.COLD_SWAMP, 7); diff --git a/src/main/java/biomesoplenty/common/biome/overworld/BiomeGenBorealForest.java b/src/main/java/biomesoplenty/common/biome/overworld/BiomeGenBorealForest.java index 59f4a3dcb..d3ef2ee83 100644 --- a/src/main/java/biomesoplenty/common/biome/overworld/BiomeGenBorealForest.java +++ b/src/main/java/biomesoplenty/common/biome/overworld/BiomeGenBorealForest.java @@ -26,7 +26,7 @@ import net.minecraft.entity.passive.EntityWolf; import net.minecraft.init.Blocks; import net.minecraft.util.math.BlockPos; -public class BiomeGenBorealForest extends BOPBiome +public class BiomeGenBorealForest extends BOPOverworldBiome { public BiomeGenBorealForest() { @@ -41,7 +41,7 @@ public class BiomeGenBorealForest extends BOPBiome if (BOPBiomes.gravel_beach.isPresent()) { - this.beachBiomeLocation = ((BOPBiome)BOPBiomes.gravel_beach.get()).getResourceLocation(); + this.beachBiomeLocation = ((BOPOverworldBiome)BOPBiomes.gravel_beach.get()).getResourceLocation(); } this.spawnableCreatureList.add(new SpawnListEntry(EntityWolf.class, 5, 4, 4)); diff --git a/src/main/java/biomesoplenty/common/biome/overworld/BiomeGenBrushland.java b/src/main/java/biomesoplenty/common/biome/overworld/BiomeGenBrushland.java index 45da6ebdd..7167c789f 100644 --- a/src/main/java/biomesoplenty/common/biome/overworld/BiomeGenBrushland.java +++ b/src/main/java/biomesoplenty/common/biome/overworld/BiomeGenBrushland.java @@ -27,7 +27,7 @@ import net.minecraft.block.state.IBlockState; import net.minecraft.init.Blocks; import net.minecraft.util.math.BlockPos; -public class BiomeGenBrushland extends BOPBiome +public class BiomeGenBrushland extends BOPOverworldBiome { public BiomeGenBrushland() diff --git a/src/main/java/biomesoplenty/common/biome/overworld/BiomeGenChaparral.java b/src/main/java/biomesoplenty/common/biome/overworld/BiomeGenChaparral.java index 3b13c8478..7d04eec63 100644 --- a/src/main/java/biomesoplenty/common/biome/overworld/BiomeGenChaparral.java +++ b/src/main/java/biomesoplenty/common/biome/overworld/BiomeGenChaparral.java @@ -33,7 +33,7 @@ import net.minecraft.entity.passive.EntityHorse; import net.minecraft.init.Blocks; import net.minecraft.util.math.BlockPos; -public class BiomeGenChaparral extends BOPBiome +public class BiomeGenChaparral extends BOPOverworldBiome { public BiomeGenChaparral() { diff --git a/src/main/java/biomesoplenty/common/biome/overworld/BiomeGenCherryBlossomGrove.java b/src/main/java/biomesoplenty/common/biome/overworld/BiomeGenCherryBlossomGrove.java index 130838844..8fd3b873b 100644 --- a/src/main/java/biomesoplenty/common/biome/overworld/BiomeGenCherryBlossomGrove.java +++ b/src/main/java/biomesoplenty/common/biome/overworld/BiomeGenCherryBlossomGrove.java @@ -37,7 +37,7 @@ import net.minecraft.block.BlockTallGrass; import net.minecraft.init.Blocks; import net.minecraft.util.math.BlockPos; -public class BiomeGenCherryBlossomGrove extends BOPBiome +public class BiomeGenCherryBlossomGrove extends BOPOverworldBiome { public BiomeGenCherryBlossomGrove() { diff --git a/src/main/java/biomesoplenty/common/biome/overworld/BiomeGenColdDesert.java b/src/main/java/biomesoplenty/common/biome/overworld/BiomeGenColdDesert.java index 91c52f0a9..5692f56aa 100644 --- a/src/main/java/biomesoplenty/common/biome/overworld/BiomeGenColdDesert.java +++ b/src/main/java/biomesoplenty/common/biome/overworld/BiomeGenColdDesert.java @@ -31,7 +31,7 @@ import net.minecraft.world.World; import net.minecraft.world.biome.Biome; import net.minecraft.world.chunk.ChunkPrimer; -public class BiomeGenColdDesert extends BOPBiome +public class BiomeGenColdDesert extends BOPOverworldBiome { public IBlockState usualTopBlock; diff --git a/src/main/java/biomesoplenty/common/biome/overworld/BiomeGenConiferousForest.java b/src/main/java/biomesoplenty/common/biome/overworld/BiomeGenConiferousForest.java index 7bbf977e5..e1b76072a 100644 --- a/src/main/java/biomesoplenty/common/biome/overworld/BiomeGenConiferousForest.java +++ b/src/main/java/biomesoplenty/common/biome/overworld/BiomeGenConiferousForest.java @@ -28,7 +28,7 @@ import net.minecraft.block.BlockTallGrass; import net.minecraft.entity.passive.EntityWolf; import net.minecraft.init.Blocks; -public class BiomeGenConiferousForest extends BOPBiome +public class BiomeGenConiferousForest extends BOPOverworldBiome { public BiomeGenConiferousForest() @@ -42,7 +42,7 @@ public class BiomeGenConiferousForest extends BOPBiome if (BOPBiomes.gravel_beach.isPresent()) { - this.beachBiomeLocation = ((BOPBiome)BOPBiomes.gravel_beach.get()).getResourceLocation(); + this.beachBiomeLocation = ((BOPOverworldBiome)BOPBiomes.gravel_beach.get()).getResourceLocation(); } this.addWeight(BOPClimates.BOREAL, 10); diff --git a/src/main/java/biomesoplenty/common/biome/overworld/BiomeGenCoralReef.java b/src/main/java/biomesoplenty/common/biome/overworld/BiomeGenCoralReef.java index b5a77e460..3aa6abf1c 100644 --- a/src/main/java/biomesoplenty/common/biome/overworld/BiomeGenCoralReef.java +++ b/src/main/java/biomesoplenty/common/biome/overworld/BiomeGenCoralReef.java @@ -21,7 +21,7 @@ import biomesoplenty.common.world.generator.GeneratorOreSingle; import net.minecraft.init.Biomes; import net.minecraft.init.Blocks; -public class BiomeGenCoralReef extends BOPBiome +public class BiomeGenCoralReef extends BOPOverworldBiome { public BiomeGenCoralReef() { diff --git a/src/main/java/biomesoplenty/common/biome/overworld/BiomeGenCrag.java b/src/main/java/biomesoplenty/common/biome/overworld/BiomeGenCrag.java index cb952915c..362514989 100644 --- a/src/main/java/biomesoplenty/common/biome/overworld/BiomeGenCrag.java +++ b/src/main/java/biomesoplenty/common/biome/overworld/BiomeGenCrag.java @@ -16,7 +16,7 @@ import biomesoplenty.api.generation.GeneratorStage; import biomesoplenty.common.world.generator.GeneratorOreSingle; import net.minecraft.init.Blocks; -public class BiomeGenCrag extends BOPBiome +public class BiomeGenCrag extends BOPOverworldBiome { public BiomeGenCrag() { diff --git a/src/main/java/biomesoplenty/common/biome/overworld/BiomeGenDeadForest.java b/src/main/java/biomesoplenty/common/biome/overworld/BiomeGenDeadForest.java index fa3f00110..45128ea29 100644 --- a/src/main/java/biomesoplenty/common/biome/overworld/BiomeGenDeadForest.java +++ b/src/main/java/biomesoplenty/common/biome/overworld/BiomeGenDeadForest.java @@ -33,7 +33,7 @@ import net.minecraft.block.BlockTallGrass; import net.minecraft.init.Blocks; import net.minecraft.util.math.BlockPos; -public class BiomeGenDeadForest extends BOPBiome +public class BiomeGenDeadForest extends BOPOverworldBiome { public BiomeGenDeadForest() { @@ -50,7 +50,7 @@ public class BiomeGenDeadForest extends BOPBiome if (BOPBiomes.gravel_beach.isPresent()) { - this.beachBiomeLocation = ((BOPBiome)BOPBiomes.gravel_beach.get()).getResourceLocation(); + this.beachBiomeLocation = ((BOPOverworldBiome)BOPBiomes.gravel_beach.get()).getResourceLocation(); } this.addWeight(BOPClimates.BOREAL, 3); diff --git a/src/main/java/biomesoplenty/common/biome/overworld/BiomeGenDeadSwamp.java b/src/main/java/biomesoplenty/common/biome/overworld/BiomeGenDeadSwamp.java index 8d7bc38ce..a9372d096 100644 --- a/src/main/java/biomesoplenty/common/biome/overworld/BiomeGenDeadSwamp.java +++ b/src/main/java/biomesoplenty/common/biome/overworld/BiomeGenDeadSwamp.java @@ -39,7 +39,7 @@ import net.minecraft.block.BlockTallGrass; import net.minecraft.init.Blocks; import net.minecraft.util.math.BlockPos; -public class BiomeGenDeadSwamp extends BOPBiome +public class BiomeGenDeadSwamp extends BOPOverworldBiome { public BiomeGenDeadSwamp() diff --git a/src/main/java/biomesoplenty/common/biome/overworld/BiomeGenDummyTemplate.java b/src/main/java/biomesoplenty/common/biome/overworld/BiomeGenDummyTemplate.java index 7bdef588f..60cdcd566 100644 --- a/src/main/java/biomesoplenty/common/biome/overworld/BiomeGenDummyTemplate.java +++ b/src/main/java/biomesoplenty/common/biome/overworld/BiomeGenDummyTemplate.java @@ -40,7 +40,7 @@ import net.minecraft.util.math.BlockPos; // This class is not intended to be used in the game // It just contains one of every common generator, so it can be used as a template when creating new biomes - just delete lines you don't want and adjust weightings -public class BiomeGenDummyTemplate extends BOPBiome +public class BiomeGenDummyTemplate extends BOPOverworldBiome { public BiomeGenDummyTemplate() diff --git a/src/main/java/biomesoplenty/common/biome/overworld/BiomeGenEucalyptusForest.java b/src/main/java/biomesoplenty/common/biome/overworld/BiomeGenEucalyptusForest.java index 1b7f02064..77b7dfd03 100644 --- a/src/main/java/biomesoplenty/common/biome/overworld/BiomeGenEucalyptusForest.java +++ b/src/main/java/biomesoplenty/common/biome/overworld/BiomeGenEucalyptusForest.java @@ -30,7 +30,7 @@ import net.minecraft.block.BlockTallGrass; import net.minecraft.entity.passive.EntityOcelot; import net.minecraft.init.Blocks; -public class BiomeGenEucalyptusForest extends BOPBiome +public class BiomeGenEucalyptusForest extends BOPOverworldBiome { public BiomeGenEucalyptusForest() diff --git a/src/main/java/biomesoplenty/common/biome/overworld/BiomeGenFen.java b/src/main/java/biomesoplenty/common/biome/overworld/BiomeGenFen.java index a37bd1108..e279fe303 100644 --- a/src/main/java/biomesoplenty/common/biome/overworld/BiomeGenFen.java +++ b/src/main/java/biomesoplenty/common/biome/overworld/BiomeGenFen.java @@ -44,7 +44,7 @@ import net.minecraft.block.BlockTallGrass; import net.minecraft.init.Blocks; import net.minecraft.util.math.BlockPos; -public class BiomeGenFen extends BOPBiome +public class BiomeGenFen extends BOPOverworldBiome { public BiomeGenFen() @@ -63,7 +63,7 @@ public class BiomeGenFen extends BOPBiome if (BOPBiomes.gravel_beach.isPresent()) { - this.beachBiomeLocation = ((BOPBiome)BOPBiomes.gravel_beach.get()).getResourceLocation(); + this.beachBiomeLocation = ((BOPOverworldBiome)BOPBiomes.gravel_beach.get()).getResourceLocation(); } this.addWeight(BOPClimates.COLD_SWAMP, 7); diff --git a/src/main/java/biomesoplenty/common/biome/overworld/BiomeGenFlowerField.java b/src/main/java/biomesoplenty/common/biome/overworld/BiomeGenFlowerField.java index 59b41a0a7..2a5fcc129 100644 --- a/src/main/java/biomesoplenty/common/biome/overworld/BiomeGenFlowerField.java +++ b/src/main/java/biomesoplenty/common/biome/overworld/BiomeGenFlowerField.java @@ -23,7 +23,7 @@ import net.minecraft.block.BlockFlower.EnumFlowerType; import net.minecraft.block.BlockTallGrass; import net.minecraft.util.math.BlockPos; -public class BiomeGenFlowerField extends BOPBiome +public class BiomeGenFlowerField extends BOPOverworldBiome { public BiomeGenFlowerField() { diff --git a/src/main/java/biomesoplenty/common/biome/overworld/BiomeGenFlowerIsland.java b/src/main/java/biomesoplenty/common/biome/overworld/BiomeGenFlowerIsland.java index 0dd165177..119480799 100644 --- a/src/main/java/biomesoplenty/common/biome/overworld/BiomeGenFlowerIsland.java +++ b/src/main/java/biomesoplenty/common/biome/overworld/BiomeGenFlowerIsland.java @@ -36,7 +36,7 @@ import net.minecraft.block.BlockTallGrass; import net.minecraft.init.Blocks; import net.minecraft.util.math.BlockPos; -public class BiomeGenFlowerIsland extends BOPBiome +public class BiomeGenFlowerIsland extends BOPOverworldBiome { public BiomeGenFlowerIsland() diff --git a/src/main/java/biomesoplenty/common/biome/overworld/BiomeGenGlacier.java b/src/main/java/biomesoplenty/common/biome/overworld/BiomeGenGlacier.java index 5a2525113..a31a905b3 100644 --- a/src/main/java/biomesoplenty/common/biome/overworld/BiomeGenGlacier.java +++ b/src/main/java/biomesoplenty/common/biome/overworld/BiomeGenGlacier.java @@ -18,7 +18,7 @@ import net.minecraft.entity.monster.EntityPolarBear; import net.minecraft.init.Blocks; import net.minecraft.world.biome.Biome; -public class BiomeGenGlacier extends BOPBiome +public class BiomeGenGlacier extends BOPOverworldBiome { public BiomeGenGlacier() diff --git a/src/main/java/biomesoplenty/common/biome/overworld/BiomeGenGrassland.java b/src/main/java/biomesoplenty/common/biome/overworld/BiomeGenGrassland.java index 7cde92ca2..83aa01443 100644 --- a/src/main/java/biomesoplenty/common/biome/overworld/BiomeGenGrassland.java +++ b/src/main/java/biomesoplenty/common/biome/overworld/BiomeGenGrassland.java @@ -33,7 +33,7 @@ import net.minecraft.entity.passive.EntityHorse; import net.minecraft.init.Blocks; import net.minecraft.util.math.BlockPos; -public class BiomeGenGrassland extends BOPBiome { +public class BiomeGenGrassland extends BOPOverworldBiome { public BiomeGenGrassland() { @@ -47,7 +47,7 @@ public class BiomeGenGrassland extends BOPBiome { if (BOPBiomes.gravel_beach.isPresent()) { - this.beachBiomeLocation = ((BOPBiome)BOPBiomes.gravel_beach.get()).getResourceLocation(); + this.beachBiomeLocation = ((BOPOverworldBiome)BOPBiomes.gravel_beach.get()).getResourceLocation(); } this.canGenerateVillages = true; diff --git a/src/main/java/biomesoplenty/common/biome/overworld/BiomeGenGravelBeach.java b/src/main/java/biomesoplenty/common/biome/overworld/BiomeGenGravelBeach.java index 6a101deec..ef74e3a24 100644 --- a/src/main/java/biomesoplenty/common/biome/overworld/BiomeGenGravelBeach.java +++ b/src/main/java/biomesoplenty/common/biome/overworld/BiomeGenGravelBeach.java @@ -13,7 +13,7 @@ import biomesoplenty.api.config.IBOPWorldSettings.GeneratorType; import biomesoplenty.common.world.generator.GeneratorWeighted; import net.minecraft.init.Blocks; -public class BiomeGenGravelBeach extends BOPBiome +public class BiomeGenGravelBeach extends BOPOverworldBiome { public BiomeGenGravelBeach() { diff --git a/src/main/java/biomesoplenty/common/biome/overworld/BiomeGenGrove.java b/src/main/java/biomesoplenty/common/biome/overworld/BiomeGenGrove.java index 468f650f2..fbe35f04d 100644 --- a/src/main/java/biomesoplenty/common/biome/overworld/BiomeGenGrove.java +++ b/src/main/java/biomesoplenty/common/biome/overworld/BiomeGenGrove.java @@ -30,7 +30,7 @@ import net.minecraft.block.BlockPlanks; import net.minecraft.block.BlockTallGrass; import net.minecraft.util.math.BlockPos; -public class BiomeGenGrove extends BOPBiome +public class BiomeGenGrove extends BOPOverworldBiome { public BiomeGenGrove() diff --git a/src/main/java/biomesoplenty/common/biome/overworld/BiomeGenHeathland.java b/src/main/java/biomesoplenty/common/biome/overworld/BiomeGenHeathland.java index 647b644fb..7f6d903cb 100644 --- a/src/main/java/biomesoplenty/common/biome/overworld/BiomeGenHeathland.java +++ b/src/main/java/biomesoplenty/common/biome/overworld/BiomeGenHeathland.java @@ -36,7 +36,7 @@ import net.minecraft.entity.passive.EntityHorse; import net.minecraft.init.Blocks; import net.minecraft.util.math.BlockPos; -public class BiomeGenHeathland extends BOPBiome +public class BiomeGenHeathland extends BOPOverworldBiome { public BiomeGenHeathland() { diff --git a/src/main/java/biomesoplenty/common/biome/overworld/BiomeGenHighland.java b/src/main/java/biomesoplenty/common/biome/overworld/BiomeGenHighland.java index 25248899d..a700c021e 100644 --- a/src/main/java/biomesoplenty/common/biome/overworld/BiomeGenHighland.java +++ b/src/main/java/biomesoplenty/common/biome/overworld/BiomeGenHighland.java @@ -23,7 +23,7 @@ import net.minecraft.block.BlockDoublePlant; import net.minecraft.block.BlockTallGrass; import net.minecraft.init.Blocks; -public class BiomeGenHighland extends BOPBiome +public class BiomeGenHighland extends BOPOverworldBiome { public BiomeGenHighland() diff --git a/src/main/java/biomesoplenty/common/biome/overworld/BiomeGenKelpForest.java b/src/main/java/biomesoplenty/common/biome/overworld/BiomeGenKelpForest.java index 5faacc7b4..3efaa5407 100644 --- a/src/main/java/biomesoplenty/common/biome/overworld/BiomeGenKelpForest.java +++ b/src/main/java/biomesoplenty/common/biome/overworld/BiomeGenKelpForest.java @@ -23,7 +23,7 @@ import biomesoplenty.common.world.generator.GeneratorOreSingle; import net.minecraft.init.Biomes; import net.minecraft.init.Blocks; -public class BiomeGenKelpForest extends BOPBiome +public class BiomeGenKelpForest extends BOPOverworldBiome { public BiomeGenKelpForest() { diff --git a/src/main/java/biomesoplenty/common/biome/overworld/BiomeGenLandOfLakes.java b/src/main/java/biomesoplenty/common/biome/overworld/BiomeGenLandOfLakes.java index 970fd6147..3d8fd7a3f 100644 --- a/src/main/java/biomesoplenty/common/biome/overworld/BiomeGenLandOfLakes.java +++ b/src/main/java/biomesoplenty/common/biome/overworld/BiomeGenLandOfLakes.java @@ -35,7 +35,7 @@ import net.minecraft.block.BlockTallGrass; import net.minecraft.init.Blocks; import net.minecraft.util.math.BlockPos; -public class BiomeGenLandOfLakes extends BOPBiome +public class BiomeGenLandOfLakes extends BOPOverworldBiome { // TODO: fog color / closeness? what's that? @@ -58,7 +58,7 @@ public class BiomeGenLandOfLakes extends BOPBiome if (BOPBiomes.gravel_beach.isPresent()) { - this.beachBiomeLocation = ((BOPBiome)BOPBiomes.gravel_beach.get()).getResourceLocation(); + this.beachBiomeLocation = ((BOPOverworldBiome)BOPBiomes.gravel_beach.get()).getResourceLocation(); } this.spawnableWaterCreatureList.clear(); diff --git a/src/main/java/biomesoplenty/common/biome/overworld/BiomeGenLavenderFields.java b/src/main/java/biomesoplenty/common/biome/overworld/BiomeGenLavenderFields.java index 5d5e56c01..0f44f8579 100644 --- a/src/main/java/biomesoplenty/common/biome/overworld/BiomeGenLavenderFields.java +++ b/src/main/java/biomesoplenty/common/biome/overworld/BiomeGenLavenderFields.java @@ -31,7 +31,7 @@ import net.minecraft.block.BlockTallGrass; import net.minecraft.init.Blocks; import net.minecraft.util.math.BlockPos; -public class BiomeGenLavenderFields extends BOPBiome +public class BiomeGenLavenderFields extends BOPOverworldBiome { public BiomeGenLavenderFields() { diff --git a/src/main/java/biomesoplenty/common/biome/overworld/BiomeGenLushDesert.java b/src/main/java/biomesoplenty/common/biome/overworld/BiomeGenLushDesert.java index 3fb657df9..fa9c2928f 100644 --- a/src/main/java/biomesoplenty/common/biome/overworld/BiomeGenLushDesert.java +++ b/src/main/java/biomesoplenty/common/biome/overworld/BiomeGenLushDesert.java @@ -35,7 +35,7 @@ import net.minecraft.block.BlockPlanks; import net.minecraft.block.BlockTallGrass; import net.minecraft.init.Blocks; -public class BiomeGenLushDesert extends BOPBiome +public class BiomeGenLushDesert extends BOPOverworldBiome { public BiomeGenLushDesert() { diff --git a/src/main/java/biomesoplenty/common/biome/overworld/BiomeGenLushSwamp.java b/src/main/java/biomesoplenty/common/biome/overworld/BiomeGenLushSwamp.java index fac79d807..79e9720d2 100644 --- a/src/main/java/biomesoplenty/common/biome/overworld/BiomeGenLushSwamp.java +++ b/src/main/java/biomesoplenty/common/biome/overworld/BiomeGenLushSwamp.java @@ -41,7 +41,7 @@ import net.minecraft.block.state.IBlockState; import net.minecraft.entity.monster.EntitySlime; import net.minecraft.init.Blocks; -public class BiomeGenLushSwamp extends BOPBiome +public class BiomeGenLushSwamp extends BOPOverworldBiome { public BiomeGenLushSwamp() diff --git a/src/main/java/biomesoplenty/common/biome/overworld/BiomeGenMangrove.java b/src/main/java/biomesoplenty/common/biome/overworld/BiomeGenMangrove.java index c0493f17f..d519440eb 100644 --- a/src/main/java/biomesoplenty/common/biome/overworld/BiomeGenMangrove.java +++ b/src/main/java/biomesoplenty/common/biome/overworld/BiomeGenMangrove.java @@ -31,7 +31,7 @@ import net.minecraft.init.Blocks; import net.minecraft.world.World; import net.minecraft.world.chunk.ChunkPrimer; -public class BiomeGenMangrove extends BOPBiome +public class BiomeGenMangrove extends BOPOverworldBiome { public IBlockState usualTopBlock; public IBlockState alternateTopBlock; diff --git a/src/main/java/biomesoplenty/common/biome/overworld/BiomeGenMapleWoods.java b/src/main/java/biomesoplenty/common/biome/overworld/BiomeGenMapleWoods.java index 62a43b68d..46b2e2225 100644 --- a/src/main/java/biomesoplenty/common/biome/overworld/BiomeGenMapleWoods.java +++ b/src/main/java/biomesoplenty/common/biome/overworld/BiomeGenMapleWoods.java @@ -22,7 +22,7 @@ import net.minecraft.block.BlockTallGrass; import net.minecraft.entity.passive.EntityWolf; import net.minecraft.init.Blocks; -public class BiomeGenMapleWoods extends BOPBiome +public class BiomeGenMapleWoods extends BOPOverworldBiome { public BiomeGenMapleWoods() { @@ -37,7 +37,7 @@ public class BiomeGenMapleWoods extends BOPBiome if (BOPBiomes.gravel_beach.isPresent()) { - this.beachBiomeLocation = ((BOPBiome)BOPBiomes.gravel_beach.get()).getResourceLocation(); + this.beachBiomeLocation = ((BOPOverworldBiome)BOPBiomes.gravel_beach.get()).getResourceLocation(); } this.spawnableCreatureList.add(new SpawnListEntry(EntityWolf.class, 5, 4, 4)); diff --git a/src/main/java/biomesoplenty/common/biome/overworld/BiomeGenMarsh.java b/src/main/java/biomesoplenty/common/biome/overworld/BiomeGenMarsh.java index 54d5e1f35..13d8115e4 100644 --- a/src/main/java/biomesoplenty/common/biome/overworld/BiomeGenMarsh.java +++ b/src/main/java/biomesoplenty/common/biome/overworld/BiomeGenMarsh.java @@ -32,7 +32,7 @@ import net.minecraft.block.BlockTallGrass; import net.minecraft.entity.monster.EntitySlime; import net.minecraft.init.Blocks; -public class BiomeGenMarsh extends BOPBiome +public class BiomeGenMarsh extends BOPOverworldBiome { // TODO: fog color / closeness? what's that? diff --git a/src/main/java/biomesoplenty/common/biome/overworld/BiomeGenMeadow.java b/src/main/java/biomesoplenty/common/biome/overworld/BiomeGenMeadow.java index ccb0e2fee..81d1fca59 100644 --- a/src/main/java/biomesoplenty/common/biome/overworld/BiomeGenMeadow.java +++ b/src/main/java/biomesoplenty/common/biome/overworld/BiomeGenMeadow.java @@ -30,7 +30,7 @@ import net.minecraft.block.BlockTallGrass; import net.minecraft.init.Blocks; import net.minecraft.util.math.BlockPos; -public class BiomeGenMeadow extends BOPBiome +public class BiomeGenMeadow extends BOPOverworldBiome { public BiomeGenMeadow() { @@ -46,7 +46,7 @@ public class BiomeGenMeadow extends BOPBiome if (BOPBiomes.gravel_beach.isPresent()) { - this.beachBiomeLocation = ((BOPBiome)BOPBiomes.gravel_beach.get()).getResourceLocation(); + this.beachBiomeLocation = ((BOPOverworldBiome)BOPBiomes.gravel_beach.get()).getResourceLocation(); } this.spawnableCreatureList.add(new SpawnListEntry(EntitySnail.class, 6, 1, 2)); diff --git a/src/main/java/biomesoplenty/common/biome/overworld/BiomeGenMoor.java b/src/main/java/biomesoplenty/common/biome/overworld/BiomeGenMoor.java index 4078a4974..09b36c346 100644 --- a/src/main/java/biomesoplenty/common/biome/overworld/BiomeGenMoor.java +++ b/src/main/java/biomesoplenty/common/biome/overworld/BiomeGenMoor.java @@ -33,7 +33,7 @@ import net.minecraft.block.BlockTallGrass; import net.minecraft.init.Blocks; import net.minecraft.util.math.BlockPos; -public class BiomeGenMoor extends BOPBiome +public class BiomeGenMoor extends BOPOverworldBiome { public BiomeGenMoor() diff --git a/src/main/java/biomesoplenty/common/biome/overworld/BiomeGenMountain.java b/src/main/java/biomesoplenty/common/biome/overworld/BiomeGenMountain.java index fb2c814e3..91e2135b4 100644 --- a/src/main/java/biomesoplenty/common/biome/overworld/BiomeGenMountain.java +++ b/src/main/java/biomesoplenty/common/biome/overworld/BiomeGenMountain.java @@ -47,7 +47,7 @@ import net.minecraft.world.World; import net.minecraft.world.biome.Biome; import net.minecraft.world.chunk.ChunkPrimer; -public class BiomeGenMountain extends BOPBiome +public class BiomeGenMountain extends BOPOverworldBiome { public static enum MountainType {PEAKS, FOOTHILLS} diff --git a/src/main/java/biomesoplenty/common/biome/overworld/BiomeGenMysticGrove.java b/src/main/java/biomesoplenty/common/biome/overworld/BiomeGenMysticGrove.java index 459902bfe..f6d41c504 100644 --- a/src/main/java/biomesoplenty/common/biome/overworld/BiomeGenMysticGrove.java +++ b/src/main/java/biomesoplenty/common/biome/overworld/BiomeGenMysticGrove.java @@ -45,7 +45,7 @@ import net.minecraft.entity.monster.EntityWitch; import net.minecraft.init.Blocks; import net.minecraft.util.math.BlockPos; -public class BiomeGenMysticGrove extends BOPBiome +public class BiomeGenMysticGrove extends BOPOverworldBiome { public BiomeGenMysticGrove() diff --git a/src/main/java/biomesoplenty/common/biome/overworld/BiomeGenOasis.java b/src/main/java/biomesoplenty/common/biome/overworld/BiomeGenOasis.java index 154b3bd2c..3360c272c 100644 --- a/src/main/java/biomesoplenty/common/biome/overworld/BiomeGenOasis.java +++ b/src/main/java/biomesoplenty/common/biome/overworld/BiomeGenOasis.java @@ -40,7 +40,7 @@ import net.minecraft.init.Blocks; import net.minecraft.world.World; import net.minecraft.world.chunk.ChunkPrimer; -public class BiomeGenOasis extends BOPBiome +public class BiomeGenOasis extends BOPOverworldBiome { public IBlockState usualTopBlock; public IBlockState alternateTopBlock; diff --git a/src/main/java/biomesoplenty/common/biome/overworld/BiomeGenOminousWoods.java b/src/main/java/biomesoplenty/common/biome/overworld/BiomeGenOminousWoods.java index 3a9fc42d2..841630b19 100644 --- a/src/main/java/biomesoplenty/common/biome/overworld/BiomeGenOminousWoods.java +++ b/src/main/java/biomesoplenty/common/biome/overworld/BiomeGenOminousWoods.java @@ -36,7 +36,7 @@ import net.minecraft.block.state.IBlockState; import net.minecraft.init.Blocks; import net.minecraft.util.math.BlockPos; -public class BiomeGenOminousWoods extends BOPBiome +public class BiomeGenOminousWoods extends BOPOverworldBiome { public BiomeGenOminousWoods() diff --git a/src/main/java/biomesoplenty/common/biome/overworld/BiomeGenOrchard.java b/src/main/java/biomesoplenty/common/biome/overworld/BiomeGenOrchard.java index 826abe8ec..260ad263d 100644 --- a/src/main/java/biomesoplenty/common/biome/overworld/BiomeGenOrchard.java +++ b/src/main/java/biomesoplenty/common/biome/overworld/BiomeGenOrchard.java @@ -23,7 +23,7 @@ import net.minecraft.block.BlockTallGrass; import net.minecraft.entity.passive.EntityHorse; import net.minecraft.util.math.BlockPos; -public class BiomeGenOrchard extends BOPBiome +public class BiomeGenOrchard extends BOPOverworldBiome { public BiomeGenOrchard() { diff --git a/src/main/java/biomesoplenty/common/biome/overworld/BiomeGenOriginIsland.java b/src/main/java/biomesoplenty/common/biome/overworld/BiomeGenOriginIsland.java index 117c90c66..923ef7e48 100644 --- a/src/main/java/biomesoplenty/common/biome/overworld/BiomeGenOriginIsland.java +++ b/src/main/java/biomesoplenty/common/biome/overworld/BiomeGenOriginIsland.java @@ -31,7 +31,7 @@ import net.minecraft.entity.passive.EntitySheep; import net.minecraft.util.math.BlockPos; import net.minecraft.world.biome.Biome; -public class BiomeGenOriginIsland extends BOPBiome +public class BiomeGenOriginIsland extends BOPOverworldBiome { public BiomeGenOriginIsland() { diff --git a/src/main/java/biomesoplenty/common/biome/overworld/BiomeGenOutback.java b/src/main/java/biomesoplenty/common/biome/overworld/BiomeGenOutback.java index a99b55915..2199e97d0 100644 --- a/src/main/java/biomesoplenty/common/biome/overworld/BiomeGenOutback.java +++ b/src/main/java/biomesoplenty/common/biome/overworld/BiomeGenOutback.java @@ -31,7 +31,7 @@ import net.minecraft.block.BlockSand; import net.minecraft.block.BlockTallGrass; import net.minecraft.init.Blocks; -public class BiomeGenOutback extends BOPBiome +public class BiomeGenOutback extends BOPOverworldBiome { public BiomeGenOutback() { diff --git a/src/main/java/biomesoplenty/common/biome/overworld/BiomeGenOvergrownCliffs.java b/src/main/java/biomesoplenty/common/biome/overworld/BiomeGenOvergrownCliffs.java index bf875fb92..7d14ff40b 100644 --- a/src/main/java/biomesoplenty/common/biome/overworld/BiomeGenOvergrownCliffs.java +++ b/src/main/java/biomesoplenty/common/biome/overworld/BiomeGenOvergrownCliffs.java @@ -27,7 +27,7 @@ import net.minecraft.block.BlockTallGrass; import net.minecraft.entity.passive.EntityOcelot; import net.minecraft.init.Blocks; -public class BiomeGenOvergrownCliffs extends BOPBiome +public class BiomeGenOvergrownCliffs extends BOPOverworldBiome { public BiomeGenOvergrownCliffs() { diff --git a/src/main/java/biomesoplenty/common/biome/overworld/BiomeGenPrairie.java b/src/main/java/biomesoplenty/common/biome/overworld/BiomeGenPrairie.java index 2d31a380e..abc450595 100644 --- a/src/main/java/biomesoplenty/common/biome/overworld/BiomeGenPrairie.java +++ b/src/main/java/biomesoplenty/common/biome/overworld/BiomeGenPrairie.java @@ -27,7 +27,7 @@ import net.minecraft.entity.passive.EntityHorse; import net.minecraft.init.Blocks; import net.minecraft.util.math.BlockPos; -public class BiomeGenPrairie extends BOPBiome +public class BiomeGenPrairie extends BOPOverworldBiome { public BiomeGenPrairie() { diff --git a/src/main/java/biomesoplenty/common/biome/overworld/BiomeGenQuagmire.java b/src/main/java/biomesoplenty/common/biome/overworld/BiomeGenQuagmire.java index 03476574d..3573c568b 100644 --- a/src/main/java/biomesoplenty/common/biome/overworld/BiomeGenQuagmire.java +++ b/src/main/java/biomesoplenty/common/biome/overworld/BiomeGenQuagmire.java @@ -39,7 +39,7 @@ import net.minecraft.util.math.BlockPos; import net.minecraft.world.World; import net.minecraft.world.chunk.ChunkPrimer; -public class BiomeGenQuagmire extends BOPBiome +public class BiomeGenQuagmire extends BOPOverworldBiome { public IBlockState usualTopBlock; public IBlockState usualFillerBlock; diff --git a/src/main/java/biomesoplenty/common/biome/overworld/BiomeGenRainforest.java b/src/main/java/biomesoplenty/common/biome/overworld/BiomeGenRainforest.java index 79ceddfbd..403e1b44a 100644 --- a/src/main/java/biomesoplenty/common/biome/overworld/BiomeGenRainforest.java +++ b/src/main/java/biomesoplenty/common/biome/overworld/BiomeGenRainforest.java @@ -25,7 +25,7 @@ import net.minecraft.entity.passive.EntityOcelot; import net.minecraft.init.Blocks; import net.minecraft.util.math.BlockPos; -public class BiomeGenRainforest extends BOPBiome +public class BiomeGenRainforest extends BOPOverworldBiome { public BiomeGenRainforest() { diff --git a/src/main/java/biomesoplenty/common/biome/overworld/BiomeGenRedwoodForest.java b/src/main/java/biomesoplenty/common/biome/overworld/BiomeGenRedwoodForest.java index 1ca10719d..34a7b573c 100644 --- a/src/main/java/biomesoplenty/common/biome/overworld/BiomeGenRedwoodForest.java +++ b/src/main/java/biomesoplenty/common/biome/overworld/BiomeGenRedwoodForest.java @@ -30,7 +30,7 @@ import net.minecraft.init.Blocks; import net.minecraft.world.World; import net.minecraft.world.chunk.ChunkPrimer; -public class BiomeGenRedwoodForest extends BOPBiome +public class BiomeGenRedwoodForest extends BOPOverworldBiome { public IBlockState usualTopBlock; diff --git a/src/main/java/biomesoplenty/common/biome/overworld/BiomeGenSacredSprings.java b/src/main/java/biomesoplenty/common/biome/overworld/BiomeGenSacredSprings.java index 32f696a1b..a24ea4d6e 100644 --- a/src/main/java/biomesoplenty/common/biome/overworld/BiomeGenSacredSprings.java +++ b/src/main/java/biomesoplenty/common/biome/overworld/BiomeGenSacredSprings.java @@ -29,7 +29,7 @@ import net.minecraft.entity.passive.EntityOcelot; import net.minecraft.init.Blocks; import net.minecraft.util.math.BlockPos; -public class BiomeGenSacredSprings extends BOPBiome +public class BiomeGenSacredSprings extends BOPOverworldBiome { public BiomeGenSacredSprings() { diff --git a/src/main/java/biomesoplenty/common/biome/overworld/BiomeGenSeasonalForest.java b/src/main/java/biomesoplenty/common/biome/overworld/BiomeGenSeasonalForest.java index f69c97950..2a56261ef 100644 --- a/src/main/java/biomesoplenty/common/biome/overworld/BiomeGenSeasonalForest.java +++ b/src/main/java/biomesoplenty/common/biome/overworld/BiomeGenSeasonalForest.java @@ -26,7 +26,7 @@ import net.minecraft.entity.passive.EntityWolf; import net.minecraft.init.Blocks; import net.minecraft.util.math.BlockPos; -public class BiomeGenSeasonalForest extends BOPBiome +public class BiomeGenSeasonalForest extends BOPOverworldBiome { public BiomeGenSeasonalForest() { @@ -41,7 +41,7 @@ public class BiomeGenSeasonalForest extends BOPBiome if (BOPBiomes.gravel_beach.isPresent()) { - this.beachBiomeLocation = ((BOPBiome)BOPBiomes.gravel_beach.get()).getResourceLocation(); + this.beachBiomeLocation = ((BOPOverworldBiome)BOPBiomes.gravel_beach.get()).getResourceLocation(); } this.spawnableCreatureList.add(new SpawnListEntry(EntityWolf.class, 5, 4, 4)); diff --git a/src/main/java/biomesoplenty/common/biome/overworld/BiomeGenShield.java b/src/main/java/biomesoplenty/common/biome/overworld/BiomeGenShield.java index ab04fbef1..a2c91eb91 100644 --- a/src/main/java/biomesoplenty/common/biome/overworld/BiomeGenShield.java +++ b/src/main/java/biomesoplenty/common/biome/overworld/BiomeGenShield.java @@ -41,7 +41,7 @@ import net.minecraft.util.math.BlockPos; import net.minecraft.world.World; import net.minecraft.world.chunk.ChunkPrimer; -public class BiomeGenShield extends BOPBiome +public class BiomeGenShield extends BOPOverworldBiome { public IBlockState usualTopBlock; public IBlockState alternateTopBlock; @@ -61,7 +61,7 @@ public class BiomeGenShield extends BOPBiome if (BOPBiomes.gravel_beach.isPresent()) { - this.beachBiomeLocation = ((BOPBiome)BOPBiomes.gravel_beach.get()).getResourceLocation(); + this.beachBiomeLocation = ((BOPOverworldBiome)BOPBiomes.gravel_beach.get()).getResourceLocation(); } this.addWeight(BOPClimates.BOREAL, 5); diff --git a/src/main/java/biomesoplenty/common/biome/overworld/BiomeGenShrubland.java b/src/main/java/biomesoplenty/common/biome/overworld/BiomeGenShrubland.java index 89a8479d9..5a0f4b72f 100644 --- a/src/main/java/biomesoplenty/common/biome/overworld/BiomeGenShrubland.java +++ b/src/main/java/biomesoplenty/common/biome/overworld/BiomeGenShrubland.java @@ -29,7 +29,7 @@ import net.minecraft.entity.passive.EntityHorse; import net.minecraft.entity.passive.EntityLlama; import net.minecraft.init.Blocks; -public class BiomeGenShrubland extends BOPBiome +public class BiomeGenShrubland extends BOPOverworldBiome { public BiomeGenShrubland() @@ -46,7 +46,7 @@ public class BiomeGenShrubland extends BOPBiome if (BOPBiomes.gravel_beach.isPresent()) { - this.beachBiomeLocation = ((BOPBiome)BOPBiomes.gravel_beach.get()).getResourceLocation(); + this.beachBiomeLocation = ((BOPOverworldBiome)BOPBiomes.gravel_beach.get()).getResourceLocation(); } this.spawnableCreatureList.add(new SpawnListEntry(EntityHorse.class, 5, 2, 6)); diff --git a/src/main/java/biomesoplenty/common/biome/overworld/BiomeGenSnowyConiferousForest.java b/src/main/java/biomesoplenty/common/biome/overworld/BiomeGenSnowyConiferousForest.java index 8fabc4ca3..164e62c3b 100644 --- a/src/main/java/biomesoplenty/common/biome/overworld/BiomeGenSnowyConiferousForest.java +++ b/src/main/java/biomesoplenty/common/biome/overworld/BiomeGenSnowyConiferousForest.java @@ -24,7 +24,7 @@ import net.minecraft.block.BlockTallGrass; import net.minecraft.entity.passive.EntityWolf; import net.minecraft.init.Blocks; -public class BiomeGenSnowyConiferousForest extends BOPBiome +public class BiomeGenSnowyConiferousForest extends BOPOverworldBiome { public BiomeGenSnowyConiferousForest() diff --git a/src/main/java/biomesoplenty/common/biome/overworld/BiomeGenSnowyForest.java b/src/main/java/biomesoplenty/common/biome/overworld/BiomeGenSnowyForest.java index 8adf2d466..0f3c2424c 100644 --- a/src/main/java/biomesoplenty/common/biome/overworld/BiomeGenSnowyForest.java +++ b/src/main/java/biomesoplenty/common/biome/overworld/BiomeGenSnowyForest.java @@ -31,7 +31,7 @@ import net.minecraft.init.Blocks; import net.minecraft.util.math.BlockPos; -public class BiomeGenSnowyForest extends BOPBiome +public class BiomeGenSnowyForest extends BOPOverworldBiome { public BiomeGenSnowyForest() { diff --git a/src/main/java/biomesoplenty/common/biome/overworld/BiomeGenSteppe.java b/src/main/java/biomesoplenty/common/biome/overworld/BiomeGenSteppe.java index a79d8c436..d9a4baf07 100644 --- a/src/main/java/biomesoplenty/common/biome/overworld/BiomeGenSteppe.java +++ b/src/main/java/biomesoplenty/common/biome/overworld/BiomeGenSteppe.java @@ -35,7 +35,7 @@ import net.minecraft.util.math.BlockPos; import net.minecraft.world.World; import net.minecraft.world.chunk.ChunkPrimer; -public class BiomeGenSteppe extends BOPBiome +public class BiomeGenSteppe extends BOPOverworldBiome { public IBlockState usualTopBlock; public IBlockState alternateTopBlock; @@ -59,7 +59,7 @@ public class BiomeGenSteppe extends BOPBiome if (BOPBiomes.gravel_beach.isPresent()) { - this.beachBiomeLocation = ((BOPBiome)BOPBiomes.gravel_beach.get()).getResourceLocation(); + this.beachBiomeLocation = ((BOPOverworldBiome)BOPBiomes.gravel_beach.get()).getResourceLocation(); } this.spawnableCreatureList.add(new SpawnListEntry(EntityHorse.class, 5, 2, 6)); diff --git a/src/main/java/biomesoplenty/common/biome/overworld/BiomeGenTemperateRainforest.java b/src/main/java/biomesoplenty/common/biome/overworld/BiomeGenTemperateRainforest.java index 7fac588b2..1eaabf460 100644 --- a/src/main/java/biomesoplenty/common/biome/overworld/BiomeGenTemperateRainforest.java +++ b/src/main/java/biomesoplenty/common/biome/overworld/BiomeGenTemperateRainforest.java @@ -34,7 +34,7 @@ import net.minecraft.block.BlockTallGrass; import net.minecraft.init.Blocks; import net.minecraft.util.math.BlockPos; -public class BiomeGenTemperateRainforest extends BOPBiome +public class BiomeGenTemperateRainforest extends BOPOverworldBiome { public BiomeGenTemperateRainforest() @@ -50,7 +50,7 @@ public class BiomeGenTemperateRainforest extends BOPBiome if (BOPBiomes.gravel_beach.isPresent()) { - this.beachBiomeLocation = ((BOPBiome)BOPBiomes.gravel_beach.get()).getResourceLocation(); + this.beachBiomeLocation = ((BOPOverworldBiome)BOPBiomes.gravel_beach.get()).getResourceLocation(); } this.spawnableCreatureList.add(new SpawnListEntry(EntitySnail.class, 6, 1, 2)); diff --git a/src/main/java/biomesoplenty/common/biome/overworld/BiomeGenTropicalIsland.java b/src/main/java/biomesoplenty/common/biome/overworld/BiomeGenTropicalIsland.java index cecdf7807..8142b9190 100644 --- a/src/main/java/biomesoplenty/common/biome/overworld/BiomeGenTropicalIsland.java +++ b/src/main/java/biomesoplenty/common/biome/overworld/BiomeGenTropicalIsland.java @@ -31,7 +31,7 @@ import net.minecraft.block.BlockPlanks; import net.minecraft.block.BlockTallGrass; import net.minecraft.init.Blocks; -public class BiomeGenTropicalIsland extends BOPBiome +public class BiomeGenTropicalIsland extends BOPOverworldBiome { public BiomeGenTropicalIsland() { diff --git a/src/main/java/biomesoplenty/common/biome/overworld/BiomeGenTropicalRainforest.java b/src/main/java/biomesoplenty/common/biome/overworld/BiomeGenTropicalRainforest.java index 0cfbfa1c3..dcff520c3 100644 --- a/src/main/java/biomesoplenty/common/biome/overworld/BiomeGenTropicalRainforest.java +++ b/src/main/java/biomesoplenty/common/biome/overworld/BiomeGenTropicalRainforest.java @@ -29,7 +29,7 @@ import net.minecraft.entity.passive.EntityOcelot; import net.minecraft.init.Blocks; import net.minecraft.util.math.BlockPos; -public class BiomeGenTropicalRainforest extends BOPBiome +public class BiomeGenTropicalRainforest extends BOPOverworldBiome { public BiomeGenTropicalRainforest() diff --git a/src/main/java/biomesoplenty/common/biome/overworld/BiomeGenTundra.java b/src/main/java/biomesoplenty/common/biome/overworld/BiomeGenTundra.java index 87f1eaf43..0dab75046 100644 --- a/src/main/java/biomesoplenty/common/biome/overworld/BiomeGenTundra.java +++ b/src/main/java/biomesoplenty/common/biome/overworld/BiomeGenTundra.java @@ -32,7 +32,7 @@ import net.minecraft.block.BlockTallGrass; import net.minecraft.init.Blocks; import net.minecraft.util.math.BlockPos; -public class BiomeGenTundra extends BOPBiome +public class BiomeGenTundra extends BOPOverworldBiome { public BiomeGenTundra() { @@ -52,7 +52,7 @@ public class BiomeGenTundra extends BOPBiome if (BOPBiomes.gravel_beach.isPresent()) { - this.beachBiomeLocation = ((BOPBiome)BOPBiomes.gravel_beach.get()).getResourceLocation(); + this.beachBiomeLocation = ((BOPOverworldBiome)BOPBiomes.gravel_beach.get()).getResourceLocation(); } this.spawnableCreatureList.clear(); diff --git a/src/main/java/biomesoplenty/common/biome/overworld/BiomeGenVolcanicIsland.java b/src/main/java/biomesoplenty/common/biome/overworld/BiomeGenVolcanicIsland.java index c272cd96a..1eca62b12 100644 --- a/src/main/java/biomesoplenty/common/biome/overworld/BiomeGenVolcanicIsland.java +++ b/src/main/java/biomesoplenty/common/biome/overworld/BiomeGenVolcanicIsland.java @@ -21,7 +21,7 @@ import biomesoplenty.common.world.generator.GeneratorOreSingle; import biomesoplenty.common.world.generator.GeneratorSplotches; import net.minecraft.init.Blocks; -public class BiomeGenVolcanicIsland extends BOPBiome +public class BiomeGenVolcanicIsland extends BOPOverworldBiome { public BiomeGenVolcanicIsland() { diff --git a/src/main/java/biomesoplenty/common/biome/overworld/BiomeGenWasteland.java b/src/main/java/biomesoplenty/common/biome/overworld/BiomeGenWasteland.java index ee68fb524..141376da1 100644 --- a/src/main/java/biomesoplenty/common/biome/overworld/BiomeGenWasteland.java +++ b/src/main/java/biomesoplenty/common/biome/overworld/BiomeGenWasteland.java @@ -30,7 +30,7 @@ import net.minecraft.block.state.IBlockState; import net.minecraft.init.Blocks; import net.minecraft.util.math.BlockPos; -public class BiomeGenWasteland extends BOPBiome +public class BiomeGenWasteland extends BOPOverworldBiome { public BiomeGenWasteland() diff --git a/src/main/java/biomesoplenty/common/biome/overworld/BiomeGenWetland.java b/src/main/java/biomesoplenty/common/biome/overworld/BiomeGenWetland.java index 3bf7c12d3..8558b1b26 100644 --- a/src/main/java/biomesoplenty/common/biome/overworld/BiomeGenWetland.java +++ b/src/main/java/biomesoplenty/common/biome/overworld/BiomeGenWetland.java @@ -45,7 +45,7 @@ import net.minecraft.entity.monster.EntitySlime; import net.minecraft.init.Blocks; import net.minecraft.util.math.BlockPos; -public class BiomeGenWetland extends BOPBiome +public class BiomeGenWetland extends BOPOverworldBiome { public BiomeGenWetland() diff --git a/src/main/java/biomesoplenty/common/biome/overworld/BiomeGenWoodland.java b/src/main/java/biomesoplenty/common/biome/overworld/BiomeGenWoodland.java index 5c63f1823..95e8f6246 100644 --- a/src/main/java/biomesoplenty/common/biome/overworld/BiomeGenWoodland.java +++ b/src/main/java/biomesoplenty/common/biome/overworld/BiomeGenWoodland.java @@ -32,7 +32,7 @@ import net.minecraft.block.BlockTallGrass; import net.minecraft.init.Blocks; import net.minecraft.util.math.BlockPos; -public class BiomeGenWoodland extends BOPBiome +public class BiomeGenWoodland extends BOPOverworldBiome { public BiomeGenWoodland() @@ -48,7 +48,7 @@ public class BiomeGenWoodland extends BOPBiome if (BOPBiomes.gravel_beach.isPresent()) { - this.beachBiomeLocation = ((BOPBiome)BOPBiomes.gravel_beach.get()).getResourceLocation(); + this.beachBiomeLocation = ((BOPOverworldBiome)BOPBiomes.gravel_beach.get()).getResourceLocation(); } this.spawnableCreatureList.add(new SpawnListEntry(EntitySnail.class, 6, 1, 2)); diff --git a/src/main/java/biomesoplenty/common/biome/overworld/BiomeGenXericShrubland.java b/src/main/java/biomesoplenty/common/biome/overworld/BiomeGenXericShrubland.java index fe0776345..8ee1bcdfc 100644 --- a/src/main/java/biomesoplenty/common/biome/overworld/BiomeGenXericShrubland.java +++ b/src/main/java/biomesoplenty/common/biome/overworld/BiomeGenXericShrubland.java @@ -36,7 +36,7 @@ import net.minecraft.util.math.BlockPos; import net.minecraft.world.World; import net.minecraft.world.chunk.ChunkPrimer; -public class BiomeGenXericShrubland extends BOPBiome +public class BiomeGenXericShrubland extends BOPOverworldBiome { public IBlockState usualTopBlock; public IBlockState alternateTopBlock; diff --git a/src/main/java/biomesoplenty/common/biome/vanilla/BiomeExtBirchForest.java b/src/main/java/biomesoplenty/common/biome/vanilla/BiomeExtBirchForest.java index 34d35b51a..6593c1d81 100644 --- a/src/main/java/biomesoplenty/common/biome/vanilla/BiomeExtBirchForest.java +++ b/src/main/java/biomesoplenty/common/biome/vanilla/BiomeExtBirchForest.java @@ -7,7 +7,7 @@ import biomesoplenty.api.enums.BOPFlowers; import biomesoplenty.api.enums.BOPGems; import biomesoplenty.api.enums.BOPPlants; import biomesoplenty.api.generation.GeneratorStage; -import biomesoplenty.common.biome.overworld.BOPBiome; +import biomesoplenty.common.biome.overworld.BOPOverworldBiome; import biomesoplenty.common.block.BlockBOPDoublePlant; import biomesoplenty.common.block.BlockBOPMushroom; import biomesoplenty.common.world.generator.GeneratorDoubleFlora; @@ -25,7 +25,7 @@ public class BiomeExtBirchForest extends ExtendedBiomeWrapper if (BOPBiomes.gravel_beach.isPresent()) { - this.beachBiomeLocation = ((BOPBiome)BOPBiomes.gravel_beach.get()).getResourceLocation(); + this.beachBiomeLocation = ((BOPOverworldBiome)BOPBiomes.gravel_beach.get()).getResourceLocation(); } // grasses diff --git a/src/main/java/biomesoplenty/common/biome/vanilla/BiomeExtBirchForestHills.java b/src/main/java/biomesoplenty/common/biome/vanilla/BiomeExtBirchForestHills.java index c3bde07dc..0449c2fac 100644 --- a/src/main/java/biomesoplenty/common/biome/vanilla/BiomeExtBirchForestHills.java +++ b/src/main/java/biomesoplenty/common/biome/vanilla/BiomeExtBirchForestHills.java @@ -7,7 +7,7 @@ import biomesoplenty.api.enums.BOPFlowers; import biomesoplenty.api.enums.BOPGems; import biomesoplenty.api.enums.BOPPlants; import biomesoplenty.api.generation.GeneratorStage; -import biomesoplenty.common.biome.overworld.BOPBiome; +import biomesoplenty.common.biome.overworld.BOPOverworldBiome; import biomesoplenty.common.block.BlockBOPDoublePlant; import biomesoplenty.common.block.BlockBOPMushroom; import biomesoplenty.common.world.generator.GeneratorDoubleFlora; @@ -25,7 +25,7 @@ public class BiomeExtBirchForestHills extends ExtendedBiomeWrapper if (BOPBiomes.gravel_beach.isPresent()) { - this.beachBiomeLocation = ((BOPBiome)BOPBiomes.gravel_beach.get()).getResourceLocation(); + this.beachBiomeLocation = ((BOPOverworldBiome)BOPBiomes.gravel_beach.get()).getResourceLocation(); } // grasses diff --git a/src/main/java/biomesoplenty/common/biome/vanilla/BiomeExtForest.java b/src/main/java/biomesoplenty/common/biome/vanilla/BiomeExtForest.java index d25805f1a..75eb315c9 100644 --- a/src/main/java/biomesoplenty/common/biome/vanilla/BiomeExtForest.java +++ b/src/main/java/biomesoplenty/common/biome/vanilla/BiomeExtForest.java @@ -8,7 +8,7 @@ import biomesoplenty.api.enums.BOPGems; import biomesoplenty.api.enums.BOPPlants; import biomesoplenty.api.enums.BOPTrees; import biomesoplenty.api.generation.GeneratorStage; -import biomesoplenty.common.biome.overworld.BOPBiome; +import biomesoplenty.common.biome.overworld.BOPOverworldBiome; import biomesoplenty.common.block.BlockBOPDoublePlant; import biomesoplenty.common.block.BlockBOPMushroom; import biomesoplenty.common.world.generator.GeneratorDoubleFlora; @@ -27,7 +27,7 @@ public class BiomeExtForest extends ExtendedBiomeWrapper if (BOPBiomes.gravel_beach.isPresent()) { - this.beachBiomeLocation = ((BOPBiome)BOPBiomes.gravel_beach.get()).getResourceLocation(); + this.beachBiomeLocation = ((BOPOverworldBiome)BOPBiomes.gravel_beach.get()).getResourceLocation(); } // trees diff --git a/src/main/java/biomesoplenty/common/biome/vanilla/BiomeExtForestHills.java b/src/main/java/biomesoplenty/common/biome/vanilla/BiomeExtForestHills.java index 5b3508616..58b3dd795 100644 --- a/src/main/java/biomesoplenty/common/biome/vanilla/BiomeExtForestHills.java +++ b/src/main/java/biomesoplenty/common/biome/vanilla/BiomeExtForestHills.java @@ -8,7 +8,7 @@ import biomesoplenty.api.enums.BOPGems; import biomesoplenty.api.enums.BOPPlants; import biomesoplenty.api.enums.BOPTrees; import biomesoplenty.api.generation.GeneratorStage; -import biomesoplenty.common.biome.overworld.BOPBiome; +import biomesoplenty.common.biome.overworld.BOPOverworldBiome; import biomesoplenty.common.block.BlockBOPDoublePlant; import biomesoplenty.common.block.BlockBOPMushroom; import biomesoplenty.common.world.generator.GeneratorDoubleFlora; @@ -27,7 +27,7 @@ public class BiomeExtForestHills extends ExtendedBiomeWrapper if (BOPBiomes.gravel_beach.isPresent()) { - this.beachBiomeLocation = ((BOPBiome)BOPBiomes.gravel_beach.get()).getResourceLocation(); + this.beachBiomeLocation = ((BOPOverworldBiome)BOPBiomes.gravel_beach.get()).getResourceLocation(); } // trees diff --git a/src/main/java/biomesoplenty/common/biome/vanilla/BiomeExtMegaTaiga.java b/src/main/java/biomesoplenty/common/biome/vanilla/BiomeExtMegaTaiga.java index 5efe10b5b..61ef1941a 100644 --- a/src/main/java/biomesoplenty/common/biome/vanilla/BiomeExtMegaTaiga.java +++ b/src/main/java/biomesoplenty/common/biome/vanilla/BiomeExtMegaTaiga.java @@ -7,7 +7,7 @@ import biomesoplenty.api.enums.BOPFlowers; import biomesoplenty.api.enums.BOPGems; import biomesoplenty.api.enums.BOPPlants; import biomesoplenty.api.generation.GeneratorStage; -import biomesoplenty.common.biome.overworld.BOPBiome; +import biomesoplenty.common.biome.overworld.BOPOverworldBiome; import biomesoplenty.common.world.generator.GeneratorFlora; import biomesoplenty.common.world.generator.GeneratorGrass; import biomesoplenty.common.world.generator.GeneratorOreSingle; @@ -22,7 +22,7 @@ public class BiomeExtMegaTaiga extends ExtendedBiomeWrapper if (BOPBiomes.gravel_beach.isPresent()) { - this.beachBiomeLocation = ((BOPBiome)BOPBiomes.gravel_beach.get()).getResourceLocation(); + this.beachBiomeLocation = ((BOPOverworldBiome)BOPBiomes.gravel_beach.get()).getResourceLocation(); } // grasses diff --git a/src/main/java/biomesoplenty/common/biome/vanilla/BiomeExtMegaTaigaHills.java b/src/main/java/biomesoplenty/common/biome/vanilla/BiomeExtMegaTaigaHills.java index d93f2a2b2..84ff8744d 100644 --- a/src/main/java/biomesoplenty/common/biome/vanilla/BiomeExtMegaTaigaHills.java +++ b/src/main/java/biomesoplenty/common/biome/vanilla/BiomeExtMegaTaigaHills.java @@ -7,7 +7,7 @@ import biomesoplenty.api.enums.BOPFlowers; import biomesoplenty.api.enums.BOPGems; import biomesoplenty.api.enums.BOPPlants; import biomesoplenty.api.generation.GeneratorStage; -import biomesoplenty.common.biome.overworld.BOPBiome; +import biomesoplenty.common.biome.overworld.BOPOverworldBiome; import biomesoplenty.common.world.generator.GeneratorFlora; import biomesoplenty.common.world.generator.GeneratorGrass; import biomesoplenty.common.world.generator.GeneratorOreSingle; @@ -22,7 +22,7 @@ public class BiomeExtMegaTaigaHills extends ExtendedBiomeWrapper if (BOPBiomes.gravel_beach.isPresent()) { - this.beachBiomeLocation = ((BOPBiome)BOPBiomes.gravel_beach.get()).getResourceLocation(); + this.beachBiomeLocation = ((BOPOverworldBiome)BOPBiomes.gravel_beach.get()).getResourceLocation(); } // grasses diff --git a/src/main/java/biomesoplenty/common/biome/vanilla/BiomeExtTaiga.java b/src/main/java/biomesoplenty/common/biome/vanilla/BiomeExtTaiga.java index 149dbca00..b4a054cce 100644 --- a/src/main/java/biomesoplenty/common/biome/vanilla/BiomeExtTaiga.java +++ b/src/main/java/biomesoplenty/common/biome/vanilla/BiomeExtTaiga.java @@ -7,7 +7,7 @@ import biomesoplenty.api.enums.BOPFlowers; import biomesoplenty.api.enums.BOPGems; import biomesoplenty.api.enums.BOPPlants; import biomesoplenty.api.generation.GeneratorStage; -import biomesoplenty.common.biome.overworld.BOPBiome; +import biomesoplenty.common.biome.overworld.BOPOverworldBiome; import biomesoplenty.common.world.generator.GeneratorFlora; import biomesoplenty.common.world.generator.GeneratorGrass; import biomesoplenty.common.world.generator.GeneratorOreSingle; @@ -22,7 +22,7 @@ public class BiomeExtTaiga extends ExtendedBiomeWrapper if (BOPBiomes.gravel_beach.isPresent()) { - this.beachBiomeLocation = ((BOPBiome)BOPBiomes.gravel_beach.get()).getResourceLocation(); + this.beachBiomeLocation = ((BOPOverworldBiome)BOPBiomes.gravel_beach.get()).getResourceLocation(); } // grasses diff --git a/src/main/java/biomesoplenty/common/biome/vanilla/BiomeExtTaigaHills.java b/src/main/java/biomesoplenty/common/biome/vanilla/BiomeExtTaigaHills.java index 8dff5bb79..f6736fdb9 100644 --- a/src/main/java/biomesoplenty/common/biome/vanilla/BiomeExtTaigaHills.java +++ b/src/main/java/biomesoplenty/common/biome/vanilla/BiomeExtTaigaHills.java @@ -7,7 +7,7 @@ import biomesoplenty.api.enums.BOPFlowers; import biomesoplenty.api.enums.BOPGems; import biomesoplenty.api.enums.BOPPlants; import biomesoplenty.api.generation.GeneratorStage; -import biomesoplenty.common.biome.overworld.BOPBiome; +import biomesoplenty.common.biome.overworld.BOPOverworldBiome; import biomesoplenty.common.world.generator.GeneratorFlora; import biomesoplenty.common.world.generator.GeneratorGrass; import biomesoplenty.common.world.generator.GeneratorOreSingle; @@ -22,7 +22,7 @@ public class BiomeExtTaigaHills extends ExtendedBiomeWrapper if (BOPBiomes.gravel_beach.isPresent()) { - this.beachBiomeLocation = ((BOPBiome)BOPBiomes.gravel_beach.get()).getResourceLocation(); + this.beachBiomeLocation = ((BOPOverworldBiome)BOPBiomes.gravel_beach.get()).getResourceLocation(); } // grasses diff --git a/src/main/java/biomesoplenty/common/block/BlockBOPBiomeBlock.java b/src/main/java/biomesoplenty/common/block/BlockBOPBiomeBlock.java index 4b51d5db9..0a374385b 100644 --- a/src/main/java/biomesoplenty/common/block/BlockBOPBiomeBlock.java +++ b/src/main/java/biomesoplenty/common/block/BlockBOPBiomeBlock.java @@ -14,7 +14,7 @@ import java.util.List; import java.util.Random; import biomesoplenty.api.item.BOPItems; -import biomesoplenty.common.biome.overworld.BOPBiome; +import biomesoplenty.common.biome.BOPBiome; import biomesoplenty.common.util.biome.BiomeUtils; import net.minecraft.block.SoundType; import net.minecraft.block.material.Material; diff --git a/src/main/java/biomesoplenty/common/handler/FogEventHandler.java b/src/main/java/biomesoplenty/common/handler/FogEventHandler.java index a80475fa9..4ea0cc426 100644 --- a/src/main/java/biomesoplenty/common/handler/FogEventHandler.java +++ b/src/main/java/biomesoplenty/common/handler/FogEventHandler.java @@ -1,6 +1,6 @@ package biomesoplenty.common.handler; -import biomesoplenty.common.biome.overworld.BOPBiome; +import biomesoplenty.common.biome.BOPBiome; import biomesoplenty.common.config.MiscConfigurationHandler; import net.minecraft.block.material.Material; import net.minecraft.block.state.IBlockState; diff --git a/src/main/java/biomesoplenty/common/init/ModBiomes.java b/src/main/java/biomesoplenty/common/init/ModBiomes.java index 2ad9ddd36..4758eb8db 100644 --- a/src/main/java/biomesoplenty/common/init/ModBiomes.java +++ b/src/main/java/biomesoplenty/common/init/ModBiomes.java @@ -111,6 +111,7 @@ import java.util.Map; import java.util.Map.Entry; import java.util.Set; +import biomesoplenty.common.biome.overworld.*; import biomesoplenty.common.world.WorldProviderBOPHell; import com.google.common.base.Optional; import com.google.common.collect.ImmutableSet; @@ -120,69 +121,7 @@ import biomesoplenty.api.biome.BOPBiomes; import biomesoplenty.api.biome.IExtendedBiome; import biomesoplenty.api.config.IConfigObj; import biomesoplenty.api.enums.BOPClimates; -import biomesoplenty.common.biome.overworld.BOPBiome; -import biomesoplenty.common.biome.overworld.BiomeGenAlps; -import biomesoplenty.common.biome.overworld.BiomeGenBambooForest; -import biomesoplenty.common.biome.overworld.BiomeGenBayou; -import biomesoplenty.common.biome.overworld.BiomeGenBog; -import biomesoplenty.common.biome.overworld.BiomeGenBorealForest; -import biomesoplenty.common.biome.overworld.BiomeGenBrushland; -import biomesoplenty.common.biome.overworld.BiomeGenChaparral; -import biomesoplenty.common.biome.overworld.BiomeGenCherryBlossomGrove; -import biomesoplenty.common.biome.overworld.BiomeGenColdDesert; -import biomesoplenty.common.biome.overworld.BiomeGenConiferousForest; -import biomesoplenty.common.biome.overworld.BiomeGenCoralReef; -import biomesoplenty.common.biome.overworld.BiomeGenCrag; -import biomesoplenty.common.biome.overworld.BiomeGenDeadForest; -import biomesoplenty.common.biome.overworld.BiomeGenDeadSwamp; -import biomesoplenty.common.biome.overworld.BiomeGenEucalyptusForest; -import biomesoplenty.common.biome.overworld.BiomeGenFen; -import biomesoplenty.common.biome.overworld.BiomeGenFlowerField; -import biomesoplenty.common.biome.overworld.BiomeGenFlowerIsland; -import biomesoplenty.common.biome.overworld.BiomeGenGlacier; -import biomesoplenty.common.biome.overworld.BiomeGenGrassland; -import biomesoplenty.common.biome.overworld.BiomeGenGravelBeach; -import biomesoplenty.common.biome.overworld.BiomeGenGrove; -import biomesoplenty.common.biome.overworld.BiomeGenHeathland; -import biomesoplenty.common.biome.overworld.BiomeGenHighland; -import biomesoplenty.common.biome.overworld.BiomeGenKelpForest; -import biomesoplenty.common.biome.overworld.BiomeGenLandOfLakes; -import biomesoplenty.common.biome.overworld.BiomeGenLavenderFields; -import biomesoplenty.common.biome.overworld.BiomeGenLushDesert; -import biomesoplenty.common.biome.overworld.BiomeGenLushSwamp; -import biomesoplenty.common.biome.overworld.BiomeGenMangrove; -import biomesoplenty.common.biome.overworld.BiomeGenMapleWoods; -import biomesoplenty.common.biome.overworld.BiomeGenMarsh; -import biomesoplenty.common.biome.overworld.BiomeGenMeadow; -import biomesoplenty.common.biome.overworld.BiomeGenMoor; -import biomesoplenty.common.biome.overworld.BiomeGenMountain; -import biomesoplenty.common.biome.overworld.BiomeGenMysticGrove; -import biomesoplenty.common.biome.overworld.BiomeGenOasis; -import biomesoplenty.common.biome.overworld.BiomeGenOminousWoods; -import biomesoplenty.common.biome.overworld.BiomeGenOrchard; -import biomesoplenty.common.biome.overworld.BiomeGenOriginIsland; -import biomesoplenty.common.biome.overworld.BiomeGenOutback; -import biomesoplenty.common.biome.overworld.BiomeGenOvergrownCliffs; -import biomesoplenty.common.biome.overworld.BiomeGenPrairie; -import biomesoplenty.common.biome.overworld.BiomeGenQuagmire; -import biomesoplenty.common.biome.overworld.BiomeGenRainforest; -import biomesoplenty.common.biome.overworld.BiomeGenRedwoodForest; -import biomesoplenty.common.biome.overworld.BiomeGenSacredSprings; -import biomesoplenty.common.biome.overworld.BiomeGenSeasonalForest; -import biomesoplenty.common.biome.overworld.BiomeGenShield; -import biomesoplenty.common.biome.overworld.BiomeGenShrubland; -import biomesoplenty.common.biome.overworld.BiomeGenSnowyConiferousForest; -import biomesoplenty.common.biome.overworld.BiomeGenSnowyForest; -import biomesoplenty.common.biome.overworld.BiomeGenSteppe; -import biomesoplenty.common.biome.overworld.BiomeGenTemperateRainforest; -import biomesoplenty.common.biome.overworld.BiomeGenTropicalIsland; -import biomesoplenty.common.biome.overworld.BiomeGenTropicalRainforest; -import biomesoplenty.common.biome.overworld.BiomeGenTundra; -import biomesoplenty.common.biome.overworld.BiomeGenVolcanicIsland; -import biomesoplenty.common.biome.overworld.BiomeGenWasteland; -import biomesoplenty.common.biome.overworld.BiomeGenWetland; -import biomesoplenty.common.biome.overworld.BiomeGenWoodland; -import biomesoplenty.common.biome.overworld.BiomeGenXericShrubland; +import biomesoplenty.common.biome.BOPBiome; import biomesoplenty.common.biome.vanilla.BiomeExtBirchForest; import biomesoplenty.common.biome.vanilla.BiomeExtBirchForestHills; import biomesoplenty.common.biome.vanilla.BiomeExtColdTaiga; @@ -328,69 +267,69 @@ public class ModBiomes implements BOPBiomes.IBiomeRegistry { // beach biomes (normal biomes rely on these being registered first) - gravel_beach = registerBOPBiome(new BiomeGenGravelBeach()); + gravel_beach = registerOverworldBiome(new BiomeGenGravelBeach()); // normal biomes which have weights - alps = registerBOPBiome(new BiomeGenAlps()); - bamboo_forest = registerBOPBiome(new BiomeGenBambooForest()); - bayou = registerBOPBiome(new BiomeGenBayou()); - bog = registerBOPBiome(new BiomeGenBog()); - boreal_forest = registerBOPBiome(new BiomeGenBorealForest()); - brushland = registerBOPBiome(new BiomeGenBrushland()); - chaparral = registerBOPBiome(new BiomeGenChaparral()); - cherry_blossom_grove = registerBOPBiome(new BiomeGenCherryBlossomGrove()); - cold_desert = registerBOPBiome(new BiomeGenColdDesert()); - coniferous_forest = registerBOPBiome(new BiomeGenConiferousForest()); - crag = registerBOPBiome(new BiomeGenCrag()); - dead_forest = registerBOPBiome(new BiomeGenDeadForest()); - dead_swamp = registerBOPBiome(new BiomeGenDeadSwamp()); - eucalyptus_forest = registerBOPBiome(new BiomeGenEucalyptusForest()); - fen = registerBOPBiome(new BiomeGenFen()); - flower_field = registerBOPBiome(new BiomeGenFlowerField()); - grassland = registerBOPBiome(new BiomeGenGrassland()); - grove = registerBOPBiome(new BiomeGenGrove()); - heathland = registerBOPBiome(new BiomeGenHeathland()); - highland = registerBOPBiome(new BiomeGenHighland()); - land_of_lakes = registerBOPBiome(new BiomeGenLandOfLakes()); - lavender_fields = registerBOPBiome(new BiomeGenLavenderFields()); - lush_desert = registerBOPBiome(new BiomeGenLushDesert()); - lush_swamp = registerBOPBiome(new BiomeGenLushSwamp()); - maple_woods = registerBOPBiome(new BiomeGenMapleWoods()); - marsh = registerBOPBiome(new BiomeGenMarsh()); - meadow = registerBOPBiome(new BiomeGenMeadow()); - moor = registerBOPBiome(new BiomeGenMoor()); - mountain = registerBOPBiome(new BiomeGenMountain(BiomeGenMountain.MountainType.PEAKS)); - mystic_grove = registerBOPBiome(new BiomeGenMysticGrove()); - ominous_woods = registerBOPBiome(new BiomeGenOminousWoods()); - orchard = registerBOPBiome(new BiomeGenOrchard()); - outback = registerBOPBiome(new BiomeGenOutback()); - overgrown_cliffs = registerBOPBiome(new BiomeGenOvergrownCliffs()); - prairie = registerBOPBiome(new BiomeGenPrairie()); - quagmire = registerBOPBiome(new BiomeGenQuagmire()); - rainforest = registerBOPBiome(new BiomeGenRainforest()); - redwood_forest = registerBOPBiome(new BiomeGenRedwoodForest()); - sacred_springs = registerBOPBiome(new BiomeGenSacredSprings()); - seasonal_forest = registerBOPBiome(new BiomeGenSeasonalForest()); - shield = registerBOPBiome(new BiomeGenShield()); - shrubland = registerBOPBiome(new BiomeGenShrubland()); - snowy_coniferous_forest = registerBOPBiome(new BiomeGenSnowyConiferousForest()); - snowy_forest = registerBOPBiome(new BiomeGenSnowyForest()); - steppe = registerBOPBiome(new BiomeGenSteppe()); - temperate_rainforest = registerBOPBiome(new BiomeGenTemperateRainforest()); - tropical_rainforest = registerBOPBiome(new BiomeGenTropicalRainforest()); - tundra = registerBOPBiome(new BiomeGenTundra()); - wasteland = registerBOPBiome(new BiomeGenWasteland()); - wetland = registerBOPBiome(new BiomeGenWetland()); - woodland = registerBOPBiome(new BiomeGenWoodland()); - xeric_shrubland = registerBOPBiome(new BiomeGenXericShrubland()); + alps = registerOverworldBiome(new BiomeGenAlps()); + bamboo_forest = registerOverworldBiome(new BiomeGenBambooForest()); + bayou = registerOverworldBiome(new BiomeGenBayou()); + bog = registerOverworldBiome(new BiomeGenBog()); + boreal_forest = registerOverworldBiome(new BiomeGenBorealForest()); + brushland = registerOverworldBiome(new BiomeGenBrushland()); + chaparral = registerOverworldBiome(new BiomeGenChaparral()); + cherry_blossom_grove = registerOverworldBiome(new BiomeGenCherryBlossomGrove()); + cold_desert = registerOverworldBiome(new BiomeGenColdDesert()); + coniferous_forest = registerOverworldBiome(new BiomeGenConiferousForest()); + crag = registerOverworldBiome(new BiomeGenCrag()); + dead_forest = registerOverworldBiome(new BiomeGenDeadForest()); + dead_swamp = registerOverworldBiome(new BiomeGenDeadSwamp()); + eucalyptus_forest = registerOverworldBiome(new BiomeGenEucalyptusForest()); + fen = registerOverworldBiome(new BiomeGenFen()); + flower_field = registerOverworldBiome(new BiomeGenFlowerField()); + grassland = registerOverworldBiome(new BiomeGenGrassland()); + grove = registerOverworldBiome(new BiomeGenGrove()); + heathland = registerOverworldBiome(new BiomeGenHeathland()); + highland = registerOverworldBiome(new BiomeGenHighland()); + land_of_lakes = registerOverworldBiome(new BiomeGenLandOfLakes()); + lavender_fields = registerOverworldBiome(new BiomeGenLavenderFields()); + lush_desert = registerOverworldBiome(new BiomeGenLushDesert()); + lush_swamp = registerOverworldBiome(new BiomeGenLushSwamp()); + maple_woods = registerOverworldBiome(new BiomeGenMapleWoods()); + marsh = registerOverworldBiome(new BiomeGenMarsh()); + meadow = registerOverworldBiome(new BiomeGenMeadow()); + moor = registerOverworldBiome(new BiomeGenMoor()); + mountain = registerOverworldBiome(new BiomeGenMountain(BiomeGenMountain.MountainType.PEAKS)); + mystic_grove = registerOverworldBiome(new BiomeGenMysticGrove()); + ominous_woods = registerOverworldBiome(new BiomeGenOminousWoods()); + orchard = registerOverworldBiome(new BiomeGenOrchard()); + outback = registerOverworldBiome(new BiomeGenOutback()); + overgrown_cliffs = registerOverworldBiome(new BiomeGenOvergrownCliffs()); + prairie = registerOverworldBiome(new BiomeGenPrairie()); + quagmire = registerOverworldBiome(new BiomeGenQuagmire()); + rainforest = registerOverworldBiome(new BiomeGenRainforest()); + redwood_forest = registerOverworldBiome(new BiomeGenRedwoodForest()); + sacred_springs = registerOverworldBiome(new BiomeGenSacredSprings()); + seasonal_forest = registerOverworldBiome(new BiomeGenSeasonalForest()); + shield = registerOverworldBiome(new BiomeGenShield()); + shrubland = registerOverworldBiome(new BiomeGenShrubland()); + snowy_coniferous_forest = registerOverworldBiome(new BiomeGenSnowyConiferousForest()); + snowy_forest = registerOverworldBiome(new BiomeGenSnowyForest()); + steppe = registerOverworldBiome(new BiomeGenSteppe()); + temperate_rainforest = registerOverworldBiome(new BiomeGenTemperateRainforest()); + tropical_rainforest = registerOverworldBiome(new BiomeGenTropicalRainforest()); + tundra = registerOverworldBiome(new BiomeGenTundra()); + wasteland = registerOverworldBiome(new BiomeGenWasteland()); + wetland = registerOverworldBiome(new BiomeGenWetland()); + woodland = registerOverworldBiome(new BiomeGenWoodland()); + xeric_shrubland = registerOverworldBiome(new BiomeGenXericShrubland()); // edge-biomes, sub-biomes and mutated-biomes - mountain_foothills = registerBOPBiome(new BiomeGenMountain(BiomeGenMountain.MountainType.FOOTHILLS)); - glacier = registerBOPBiome(new BiomeGenGlacier()); - oasis = registerBOPBiome(new BiomeGenOasis()); - coral_reef = registerBOPBiome(new BiomeGenCoralReef()); - kelp_forest = registerBOPBiome(new BiomeGenKelpForest()); + mountain_foothills = registerOverworldBiome(new BiomeGenMountain(BiomeGenMountain.MountainType.FOOTHILLS)); + glacier = registerOverworldBiome(new BiomeGenGlacier()); + oasis = registerOverworldBiome(new BiomeGenOasis()); + coral_reef = registerOverworldBiome(new BiomeGenCoralReef()); + kelp_forest = registerOverworldBiome(new BiomeGenKelpForest()); setSubBiome(Optional.of(Biomes.ICE_PLAINS), BOPBiomes.glacier); setSubBiome(Optional.of(Biomes.DESERT), BOPBiomes.oasis); @@ -399,11 +338,11 @@ public class ModBiomes implements BOPBiomes.IBiomeRegistry // island biomes - mangrove = registerBOPBiome(new BiomeGenMangrove()); - origin_island = registerBOPBiome(new BiomeGenOriginIsland()); - tropical_island = registerBOPBiome(new BiomeGenTropicalIsland()); - volcanic_island = registerBOPBiome(new BiomeGenVolcanicIsland()); - flower_island = registerBOPBiome(new BiomeGenFlowerIsland()); + mangrove = registerOverworldBiome(new BiomeGenMangrove()); + origin_island = registerOverworldBiome(new BiomeGenOriginIsland()); + tropical_island = registerOverworldBiome(new BiomeGenTropicalIsland()); + volcanic_island = registerOverworldBiome(new BiomeGenVolcanicIsland()); + flower_island = registerOverworldBiome(new BiomeGenFlowerIsland()); addIslandBiome(origin_island, 1); addIslandBiome(tropical_island, 3); @@ -646,7 +585,7 @@ public class ModBiomes implements BOPBiomes.IBiomeRegistry return BOPBiomes.REG_INSTANCE.registerBiome(extendedBiome, idName); } - private static Optional registerBOPBiome(BOPBiome biome) + private static Optional registerOverworldBiome(BOPOverworldBiome biome) { String idName = biome.getResourceLocation().getResourcePath(); Integer id = biomeIdMapConf.getInt(idName, null); diff --git a/src/main/java/biomesoplenty/common/world/ChunkProviderGenerateBOP.java b/src/main/java/biomesoplenty/common/world/ChunkProviderGenerateBOP.java index 3da781c1d..7999194f7 100644 --- a/src/main/java/biomesoplenty/common/world/ChunkProviderGenerateBOP.java +++ b/src/main/java/biomesoplenty/common/world/ChunkProviderGenerateBOP.java @@ -26,7 +26,7 @@ import java.util.List; import java.util.Map; import java.util.Random; -import biomesoplenty.common.biome.overworld.BOPBiome; +import biomesoplenty.common.biome.overworld.BOPOverworldBiome; import biomesoplenty.common.util.biome.BiomeUtils; import net.minecraft.block.BlockFalling; import net.minecraft.block.state.IBlockState; @@ -118,7 +118,7 @@ public class ChunkProviderGenerateBOP implements IChunkGenerator for (Biome biome : BiomeUtils.getRegisteredBiomes()) { if (biome == null) {continue;} - this.biomeTerrainSettings.put(biome, (biome instanceof BOPBiome) ? ((BOPBiome)biome).terrainSettings : TerrainSettings.forVanillaBiome(biome)); + this.biomeTerrainSettings.put(biome, (biome instanceof BOPOverworldBiome) ? ((BOPOverworldBiome)biome).terrainSettings : TerrainSettings.forVanillaBiome(biome)); } } @@ -345,7 +345,7 @@ public class ChunkProviderGenerateBOP implements IChunkGenerator // Rivers shouldn't be influenced by the neighbors Biome centerBiome = biomes[localX + 2 + (localZ + 2) * 10]; - if (centerBiome == Biomes.RIVER || centerBiome == Biomes.FROZEN_RIVER || ((centerBiome instanceof BOPBiome) && ((BOPBiome)centerBiome).noNeighborTerrainInfuence)) + if (centerBiome == Biomes.RIVER || centerBiome == Biomes.FROZEN_RIVER || ((centerBiome instanceof BOPOverworldBiome) && ((BOPOverworldBiome)centerBiome).noNeighborTerrainInfuence)) { return this.biomeTerrainSettings.get(centerBiome); } diff --git a/src/main/java/biomesoplenty/common/world/layer/GenLayerRiverMixBOP.java b/src/main/java/biomesoplenty/common/world/layer/GenLayerRiverMixBOP.java index 13c7381a1..f61f99501 100644 --- a/src/main/java/biomesoplenty/common/world/layer/GenLayerRiverMixBOP.java +++ b/src/main/java/biomesoplenty/common/world/layer/GenLayerRiverMixBOP.java @@ -10,7 +10,7 @@ package biomesoplenty.common.world.layer; import biomesoplenty.api.biome.BOPBiomes; import biomesoplenty.api.generation.BOPGenLayer; -import biomesoplenty.common.biome.overworld.BOPBiome; +import biomesoplenty.common.biome.overworld.BOPOverworldBiome; import net.minecraft.init.Biomes; import net.minecraft.world.biome.Biome; import net.minecraft.world.gen.layer.GenLayer; @@ -80,9 +80,9 @@ public class GenLayerRiverMixBOP extends BOPGenLayer { Biome biome = Biome.getBiome(biomeId); - if (biome != null && biome instanceof BOPBiome) + if (biome != null && biome instanceof BOPOverworldBiome) { - BOPBiome bopBiome = (BOPBiome)biome; + BOPOverworldBiome bopBiome = (BOPOverworldBiome)biome; return bopBiome.canGenerateRivers; }