From a4ee7e95a138b32bad02a6a70b782d95ffc09c0c Mon Sep 17 00:00:00 2001 From: Matt Caughey Date: Tue, 7 May 2013 10:19:54 -0400 Subject: [PATCH] Added Polar biome in place of the old Ice Sheet biome. --- src/minecraft/biomesoplenty/api/Biomes.java | 2 +- .../biomes/BiomeGenIceSheet.java | 24 ------- .../biomesoplenty/biomes/BiomeGenMoor.java | 28 ++++---- .../biomesoplenty/biomes/BiomeGenPolar.java | 42 +++++++++++ .../configuration/BOPBiomes.java | 22 +++--- .../configuration/BOPConfiguration.java | 48 ++++++------- .../integration/BWG4Integration.java | 2 +- .../integration/ForestryIntegration.java | 4 +- .../worldgen/WorldGenIceSheet.java | 69 +++++++++++++++++++ .../biomesoplenty/worldtype/WTBiomesOP.java | 8 +-- 10 files changed, 168 insertions(+), 81 deletions(-) delete mode 100644 src/minecraft/biomesoplenty/biomes/BiomeGenIceSheet.java create mode 100644 src/minecraft/biomesoplenty/biomes/BiomeGenPolar.java create mode 100644 src/minecraft/biomesoplenty/worldgen/WorldGenIceSheet.java diff --git a/src/minecraft/biomesoplenty/api/Biomes.java b/src/minecraft/biomesoplenty/api/Biomes.java index 4308eb9b5..252f0edf9 100644 --- a/src/minecraft/biomesoplenty/api/Biomes.java +++ b/src/minecraft/biomesoplenty/api/Biomes.java @@ -35,7 +35,6 @@ public class Biomes public static Optional grove = Optional.absent(); public static Optional heathland = Optional.absent(); public static Optional highland = Optional.absent(); - public static Optional iceSheet = Optional.absent(); public static Optional icyHills = Optional.absent(); public static Optional jadeCliffs = Optional.absent(); public static Optional lushDesert = Optional.absent(); @@ -54,6 +53,7 @@ public class Biomes public static Optional originValley = Optional.absent(); public static Optional outback = Optional.absent(); public static Optional pasture = Optional.absent(); + public static Optional polar = Optional.absent(); public static Optional prairie = Optional.absent(); public static Optional promisedLand = Optional.absent(); public static Optional quagmire = Optional.absent(); diff --git a/src/minecraft/biomesoplenty/biomes/BiomeGenIceSheet.java b/src/minecraft/biomesoplenty/biomes/BiomeGenIceSheet.java deleted file mode 100644 index a8ac17d6f..000000000 --- a/src/minecraft/biomesoplenty/biomes/BiomeGenIceSheet.java +++ /dev/null @@ -1,24 +0,0 @@ -package biomesoplenty.biomes; - -import net.minecraft.block.Block; -import net.minecraft.world.biome.BiomeGenBase; - -public class BiomeGenIceSheet extends BiomeGenBase -{ - private BiomeDecoratorBOP customBiomeDecorator; - - public BiomeGenIceSheet(int par1) - { - super(par1); - this.spawnableCreatureList.clear(); - this.topBlock = (byte)Block.ice.blockID; - this.fillerBlock = (byte)Block.ice.blockID; - this.theBiomeDecorator = new BiomeDecoratorBOP(this); - this.customBiomeDecorator = (BiomeDecoratorBOP)theBiomeDecorator; - this.customBiomeDecorator.treesPerChunk = -999; - this.customBiomeDecorator.flowersPerChunk = -999; - this.customBiomeDecorator.grassPerChunk = -999; - this.customBiomeDecorator.sandPerChunk = -999; - this.customBiomeDecorator.sandPerChunk2 = -999; - } -} diff --git a/src/minecraft/biomesoplenty/biomes/BiomeGenMoor.java b/src/minecraft/biomesoplenty/biomes/BiomeGenMoor.java index 54bf2e088..148c1add6 100644 --- a/src/minecraft/biomesoplenty/biomes/BiomeGenMoor.java +++ b/src/minecraft/biomesoplenty/biomes/BiomeGenMoor.java @@ -33,24 +33,24 @@ public class BiomeGenMoor extends BiomeGenBase this.customBiomeDecorator.sandPerChunk2 = -999; this.customBiomeDecorator.mudPerChunk = 1; this.customBiomeDecorator.mudPerChunk2 = 1; - this.customBiomeDecorator.waterLakesPerChunk = 5; + this.customBiomeDecorator.waterLakesPerChunk = 10; this.waterColorMultiplier = 5800566; this.customBiomeDecorator.generatePumpkins = false; } - public void decorate(World par1World, Random par2Random, int par3, int par4) - { - super.decorate(par1World, par2Random, par3, par4); - WorldGenMoor var5 = new WorldGenMoor(); - - for (int var6 = 0; var6 < 16; ++var6) - { - int var7 = par3 + par2Random.nextInt(16) + 8; - byte var8 = 64; - int var9 = par4 + par2Random.nextInt(16) + 8; - var5.generate(par1World, par2Random, var7, var8, var9); - } - } + //public void decorate(World par1World, Random par2Random, int par3, int par4) + //{ + // super.decorate(par1World, par2Random, par3, par4); + // WorldGenMoor var5 = new WorldGenMoor(); + // + // for (int var6 = 0; var6 < 16; ++var6) + // { + // int var7 = par3 + par2Random.nextInt(16) + 8; + // byte var8 = 64; + // int var9 = par4 + par2Random.nextInt(16) + 8; + // var5.generate(par1World, par2Random, var7, var8, var9); + // } + //} /** * Gets a WorldGen appropriate for this biome. diff --git a/src/minecraft/biomesoplenty/biomes/BiomeGenPolar.java b/src/minecraft/biomesoplenty/biomes/BiomeGenPolar.java new file mode 100644 index 000000000..f3f00f214 --- /dev/null +++ b/src/minecraft/biomesoplenty/biomes/BiomeGenPolar.java @@ -0,0 +1,42 @@ +package biomesoplenty.biomes; + +import java.util.Random; + +import biomesoplenty.worldgen.WorldGenIceSheet; + +import net.minecraft.block.Block; +import net.minecraft.world.World; +import net.minecraft.world.biome.BiomeGenBase; + +public class BiomeGenPolar extends BiomeGenBase +{ + private BiomeDecoratorBOP customBiomeDecorator; + + public BiomeGenPolar(int par1) + { + super(par1); + this.spawnableCreatureList.clear(); + this.theBiomeDecorator = new BiomeDecoratorBOP(this); + this.customBiomeDecorator = (BiomeDecoratorBOP)theBiomeDecorator; + this.customBiomeDecorator.treesPerChunk = -999; + this.customBiomeDecorator.flowersPerChunk = -999; + this.customBiomeDecorator.grassPerChunk = -999; + this.customBiomeDecorator.sandPerChunk = -999; + this.customBiomeDecorator.sandPerChunk2 = -999; + this.waterColorMultiplier = 3685739; + } + + public void decorate(World par1World, Random par2Random, int par3, int par4) + { + super.decorate(par1World, par2Random, par3, par4); + WorldGenIceSheet var5 = new WorldGenIceSheet(); + + for (int var6 = 0; var6 < 75; ++var6) + { + int var7 = par3 + par2Random.nextInt(16) + 8; + byte var8 = 62; + int var9 = par4 + par2Random.nextInt(16) + 8; + var5.generate(par1World, par2Random, var7, var8, var9); + } + } +} diff --git a/src/minecraft/biomesoplenty/configuration/BOPBiomes.java b/src/minecraft/biomesoplenty/configuration/BOPBiomes.java index a821b3708..d0eda8af0 100644 --- a/src/minecraft/biomesoplenty/configuration/BOPBiomes.java +++ b/src/minecraft/biomesoplenty/configuration/BOPBiomes.java @@ -92,7 +92,6 @@ public class BOPBiomes { Biomes.grove = Optional.of((new BiomeGenGrove(BOPConfiguration.groveID)).setColor(9286496).setBiomeName("Grove").setTemperatureRainfall(0.4F, 0.8F).setMinMaxHeight(0.0F, 0.1F)); Biomes.heathland = Optional.of((new BiomeGenHeathland(BOPConfiguration.heathlandID)).setColor(353825).setBiomeName("Heathland").func_76733_a(5159473).setTemperatureRainfall(0.8F, 0.1F).setMinMaxHeight(0.1F, 0.3F)); Biomes.highland = Optional.of((new BiomeGenHighland(BOPConfiguration.highlandID)).setColor(6316128).setBiomeName("Highland").setMinMaxHeight(0.9F, 1.9F).setTemperatureRainfall(0.5F, 0.5F)); - Biomes.iceSheet = Optional.of((new BiomeGenIceSheet(BOPConfiguration.iceSheetID)).setColor(6316128).setBiomeName("Ice Sheet").setEnableSnow().setMinMaxHeight(0.1F, 0.2F).setTemperatureRainfall(0.0F, 0.0F)); Biomes.icyHills = Optional.of((new BiomeGenIcyHills(BOPConfiguration.icyHillsID)).setColor(14090235).setBiomeName("Icy Hills").setEnableSnow().setTemperatureRainfall(0.0F, 0.0F).setMinMaxHeight(-0.2F, 0.5F)); Biomes.jadeCliffs = Optional.of((new BiomeGenJadeCliffs(BOPConfiguration.jadeCliffsID)).setColor(14090235).setBiomeName("Jade Cliffs").setTemperatureRainfall(0.5F, 0.1F).setMinMaxHeight(0.1F, 2.0F)); Biomes.lushDesert = Optional.of((new BiomeGenLushDesert(BOPConfiguration.lushDesertID)).setColor(16421912).setBiomeName("Lush Desert").setTemperatureRainfall(0.8F, 0.2F).setMinMaxHeight(0.0F, 0.9F)); @@ -111,6 +110,7 @@ public class BOPBiomes { Biomes.originValley = Optional.of((new BiomeGenOriginValley(BOPConfiguration.originValleyID)).setColor(353825).setBiomeName("Origin Valley").func_76733_a(5159473).setTemperatureRainfall(0.7F, 0.8F).setMinMaxHeight(-0.1F, 0.6F)); Biomes.outback = Optional.of((new BiomeGenOutback(BOPConfiguration.outbackID)).setColor(9286496).setBiomeName("Outback").setTemperatureRainfall(0.8F, 0.0F).setMinMaxHeight(0.1F, 0.1F)); Biomes.pasture = Optional.of((new BiomeGenPasture(BOPConfiguration.pastureID)).setColor(9286496).setBiomeName("Pasture").setTemperatureRainfall(0.8F, 0.4F).setMinMaxHeight(0.1F, 0.2F)); + Biomes.polar = Optional.of((new BiomeGenPolar(BOPConfiguration.polarID)).setColor(6316128).setBiomeName("Polar").setMinMaxHeight(-0.5F, 0.0F).setTemperatureRainfall(0.2F, 0.8F)); Biomes.prairie = Optional.of((new BiomeGenPrairie(BOPConfiguration.prairieID)).setColor(353825).setBiomeName("Prairie").func_76733_a(5159473).setTemperatureRainfall(0.9F, 0.6F).setMinMaxHeight(0.1F, 0.1F)); Biomes.promisedLand = Optional.of((new BiomeGenPromisedLand(BOPConfiguration.promisedLandID)).setColor(112).setBiomeName("Promised Land").setTemperatureRainfall(2.0F, 2.0F).setMinMaxHeight(0.1F, 2.0F)); Biomes.quagmire = Optional.of((new BiomeGenQuagmire(BOPConfiguration.quagmireID)).setColor(522674).setBiomeName("Quagmire").func_76733_a(9154376).setMinMaxHeight(-0.1F, 0.3F).setTemperatureRainfall(0.8F, 0.9F)); @@ -176,7 +176,6 @@ public class BOPBiomes { BiomeDictionary.registerBiomeType(Biomes.grove.get(), Type.FOREST); BiomeDictionary.registerBiomeType(Biomes.heathland.get(), Type.PLAINS); BiomeDictionary.registerBiomeType(Biomes.highland.get(), Type.HILLS, Type.MOUNTAIN); - BiomeDictionary.registerBiomeType(Biomes.iceSheet.get(), Type.FROZEN, Type.WASTELAND); BiomeDictionary.registerBiomeType(Biomes.icyHills.get(), Type.FROZEN, Type.HILLS); BiomeDictionary.registerBiomeType(Biomes.jadeCliffs.get(), Type.FOREST, Type.MOUNTAIN); BiomeDictionary.registerBiomeType(Biomes.lushDesert.get(), Type.DESERT, Type.PLAINS); @@ -194,6 +193,7 @@ public class BOPBiomes { BiomeDictionary.registerBiomeType(Biomes.orchard.get(), Type.FOREST, Type.PLAINS); BiomeDictionary.registerBiomeType(Biomes.outback.get(), Type.DESERT, Type.PLAINS); BiomeDictionary.registerBiomeType(Biomes.pasture.get(), Type.PLAINS); + BiomeDictionary.registerBiomeType(Biomes.polar.get(), Type.FROZEN, Type.WATER); BiomeDictionary.registerBiomeType(Biomes.prairie.get(), Type.PLAINS); BiomeDictionary.registerBiomeType(Biomes.promisedLand.get(), Type.FOREST, Type.MAGICAL); BiomeDictionary.registerBiomeType(Biomes.quagmire.get(), Type.WASTELAND); @@ -254,7 +254,6 @@ public class BOPBiomes { addSpawnBiome(Biomes.grove); addSpawnBiome(Biomes.heathland); addSpawnBiome(Biomes.highland); - addSpawnBiome(Biomes.iceSheet); addSpawnBiome(Biomes.jadeCliffs); addSpawnBiome(Biomes.lushDesert); addSpawnBiome(Biomes.lushSwamp); @@ -269,6 +268,7 @@ public class BOPBiomes { addSpawnBiome(Biomes.orchard); addSpawnBiome(Biomes.outback); addSpawnBiome(Biomes.pasture); + addSpawnBiome(Biomes.polar); addSpawnBiome(Biomes.prairie); addSpawnBiome(Biomes.quagmire); addSpawnBiome(Biomes.rainforest); @@ -325,7 +325,6 @@ public class BOPBiomes { addVillageBiome(Biomes.grove, BOPConfiguration.groveVillage); addVillageBiome(Biomes.heathland, BOPConfiguration.heathlandVillage); addVillageBiome(Biomes.highland, BOPConfiguration.highlandVillage); - addVillageBiome(Biomes.iceSheet, BOPConfiguration.iceSheetVillage); addVillageBiome(Biomes.jadeCliffs, BOPConfiguration.jadeCliffsVillage); addVillageBiome(Biomes.lushDesert, BOPConfiguration.lushDesertVillage); addVillageBiome(Biomes.lushSwamp, BOPConfiguration.lushSwampVillage); @@ -340,6 +339,7 @@ public class BOPBiomes { addVillageBiome(Biomes.orchard, BOPConfiguration.orchardVillage); addVillageBiome(Biomes.outback, BOPConfiguration.outbackVillage); addVillageBiome(Biomes.pasture, BOPConfiguration.pastureVillage); + addVillageBiome(Biomes.polar, BOPConfiguration.polarVillage); addVillageBiome(Biomes.prairie, BOPConfiguration.prairieVillage); addVillageBiome(Biomes.quagmire, BOPConfiguration.quagmireVillage); addVillageBiome(Biomes.rainforest, BOPConfiguration.rainforestVillage); @@ -400,7 +400,6 @@ public class BOPBiomes { addStrongholdBiome(Biomes.grove); addStrongholdBiome(Biomes.heathland); addStrongholdBiome(Biomes.highland); - addStrongholdBiome(Biomes.iceSheet); addStrongholdBiome(Biomes.icyHills); addStrongholdBiome(Biomes.jadeCliffs); addStrongholdBiome(Biomes.lushDesert); @@ -418,6 +417,7 @@ public class BOPBiomes { addStrongholdBiome(Biomes.orchard); addStrongholdBiome(Biomes.outback); addStrongholdBiome(Biomes.pasture); + addStrongholdBiome(Biomes.polar); addStrongholdBiome(Biomes.prairie); addStrongholdBiome(Biomes.quagmire); addStrongholdBiome(Biomes.rainforest); @@ -541,9 +541,6 @@ public class BOPBiomes { if (BOPConfiguration.highlandGen) registerBiome(Biomes.highland); - if (BOPConfiguration.iceSheetGen) - registerBiome(Biomes.iceSheet); - if (BOPConfiguration.icyHillsGen) registerBiome(Biomes.icyHills); @@ -600,6 +597,9 @@ public class BOPBiomes { if (BOPConfiguration.pastureGen) registerBiome(Biomes.pasture); + + if (BOPConfiguration.polarGen) + registerBiome(Biomes.polar); if (BOPConfiguration.prairieGen) registerBiome(Biomes.prairie); @@ -839,9 +839,6 @@ public class BOPBiomes { if (BOPConfiguration.highlandGen) addBiomeToWorldTypes(getWorldTypes(), Biomes.highland); - if (BOPConfiguration.iceSheetGen) - addBiomeToWorldTypes(getWorldTypes(), Biomes.iceSheet); - if (BOPConfiguration.icyHillsGen) addBiomeToWorldTypes(getWorldTypes(), Biomes.icyHills); @@ -895,6 +892,9 @@ public class BOPBiomes { if (BOPConfiguration.pastureGen) addBiomeToWorldTypes(getWorldTypes(), Biomes.pasture); + + if (BOPConfiguration.polarGen) + addBiomeToWorldTypes(getWorldTypes(), Biomes.polar); if (BOPConfiguration.prairieGen) addBiomeToWorldTypes(getWorldTypes(), Biomes.prairie); diff --git a/src/minecraft/biomesoplenty/configuration/BOPConfiguration.java b/src/minecraft/biomesoplenty/configuration/BOPConfiguration.java index cc9febf70..a7740bcb4 100644 --- a/src/minecraft/biomesoplenty/configuration/BOPConfiguration.java +++ b/src/minecraft/biomesoplenty/configuration/BOPConfiguration.java @@ -50,7 +50,6 @@ public class BOPConfiguration { public static boolean groveGen; public static boolean heathlandGen; public static boolean highlandGen; - public static boolean iceSheetGen; public static boolean icyHillsGen; public static boolean jadeCliffsGen; public static boolean lushDesertGen; @@ -70,6 +69,7 @@ public class BOPConfiguration { public static boolean originValleyGen; public static boolean outbackGen; public static boolean pastureGen; + public static boolean polarGen; public static boolean prairieGen; public static boolean quagmireGen; public static boolean rainforestGen; @@ -241,7 +241,6 @@ public class BOPConfiguration { public static int groveThinID; public static int heathlandID; public static int highlandID; - public static int iceSheetID; public static int icyHillsID; public static int jadeCliffsID; public static int lushDesertID; @@ -261,6 +260,7 @@ public class BOPConfiguration { public static int originValleyID; public static int outbackID; public static int pastureID; + public static int polarID; public static int prairieID; public static int promisedLandID; public static int promisedLandHillsID; @@ -339,7 +339,6 @@ public class BOPConfiguration { public static boolean groveVillage; public static boolean heathlandVillage; public static boolean highlandVillage; - public static boolean iceSheetVillage; public static boolean icyHillsVillage; public static boolean jadeCliffsVillage; public static boolean lushDesertVillage; @@ -359,6 +358,7 @@ public class BOPConfiguration { public static boolean originValleyVillage; public static boolean outbackVillage; public static boolean pastureVillage; + public static boolean polarVillage; public static boolean prairieVillage; public static boolean quagmireVillage; public static boolean rainforestVillage; @@ -439,7 +439,6 @@ public class BOPConfiguration { groveGen = config.get("Biomes To Generate", "Grove", true).getBoolean(false); heathlandGen = config.get("Biomes To Generate", "Heathland", true).getBoolean(false); highlandGen = config.get("Biomes To Generate", "Highland", true).getBoolean(false); - iceSheetGen = config.get("Biomes To Generate", "IcySheet", true).getBoolean(false); icyHillsGen = config.get("Biomes To Generate", "IcyHills", true).getBoolean(false); jadeCliffsGen = config.get("Biomes To Generate", "JadeCliffs", true).getBoolean(false); lushDesertGen = config.get("Biomes To Generate", "LushDesert", true).getBoolean(false); @@ -459,6 +458,7 @@ public class BOPConfiguration { originValleyGen = config.get("Biomes To Generate", "OriginValley", true).getBoolean(false); outbackGen = config.get("Biomes To Generate", "Outback", true).getBoolean(false); pastureGen = config.get("Biomes To Generate", "Pasture", true).getBoolean(false); + polarGen = config.get("Biomes To Generate", "Polar", true).getBoolean(false); prairieGen = config.get("Biomes To Generate", "Prairie", true).getBoolean(false); quagmireGen = config.get("Biomes To Generate", "Quagmire", true).getBoolean(false); rainforestGen = config.get("Biomes To Generate", "Rainforest", true).getBoolean(false); @@ -522,7 +522,6 @@ public class BOPConfiguration { groveVillage = config.get("Allow Villages", "Grove", true).getBoolean(false); heathlandVillage = config.get("Allow Villages", "Heathland", true).getBoolean(false); highlandVillage = config.get("Allow Villages", "Highland", false).getBoolean(false); - iceSheetVillage = config.get("Allow Villages", "IcySheet", false).getBoolean(false); icyHillsVillage = config.get("Allow Villages", "IcyHills", false).getBoolean(false); jadeCliffsVillage = config.get("Allow Villages", "JadeCliffs", false).getBoolean(false); lushDesertVillage = config.get("Allow Villages", "LushDesert", true).getBoolean(false); @@ -542,6 +541,7 @@ public class BOPConfiguration { originValleyVillage = config.get("Allow Villages", "OriginValley", false).getBoolean(false); outbackVillage = config.get("Allow Villages", "Outback", true).getBoolean(false); pastureVillage = config.get("Allow Villages", "Pasture", false).getBoolean(false); + polarVillage = config.get("Allow Villages", "Polar", false).getBoolean(false); prairieVillage = config.get("Allow Villages", "Prairie", true).getBoolean(false); quagmireVillage = config.get("Allow Villages", "Quagmire", false).getBoolean(false); rainforestVillage = config.get("Allow Villages", "Rainforest", false).getBoolean(false); @@ -714,28 +714,28 @@ public class BOPConfiguration { groveID = config.get("Biome IDs", "Grove ID", 198).getInt(); heathlandID = config.get("Biome IDs", "Heathland ID", 199).getInt(); highlandID = config.get("Biome IDs", "Highland ID", 200).getInt(); - iceSheetID = config.get("Biome IDs", "Ice Sheet ID", 201).getInt(); - icyHillsID = config.get("Biome IDs", "Icy Hills ID", 202).getInt(); - jadeCliffsID = config.get("Biome IDs", "Jade Cliffs ID", 203).getInt(); - lushDesertID = config.get("Biome IDs", "Lush Desert ID", 204).getInt(); - lushSwampID = config.get("Biome IDs", "Lush Swamp ID", 205).getInt(); - mangroveID = config.get("Biome IDs", "Mangrove ID", 206).getInt(); + icyHillsID = config.get("Biome IDs", "Icy Hills ID", 201).getInt(); + jadeCliffsID = config.get("Biome IDs", "Jade Cliffs ID", 202).getInt(); + lushDesertID = config.get("Biome IDs", "Lush Desert ID", 203).getInt(); + lushSwampID = config.get("Biome IDs", "Lush Swamp ID", 204).getInt(); + mangroveID = config.get("Biome IDs", "Mangrove ID", 205).getInt(); + mapleWoodsID = config.get("Biome IDs", "Maple Woods ID", 206).getInt(); //207-209 left for Mo Creatures - mapleWoodsID = config.get("Biome IDs", "Maple Woods ID", 210).getInt(); - marshID = config.get("Biome IDs", "Marsh ID", 211).getInt(); - meadowID = config.get("Biome IDs", "Meadow ID", 212).getInt(); - mesaID = config.get("Biome IDs", "Mesa ID", 213).getInt(); - moorID = config.get("Biome IDs", "Moor ID", 214).getInt(); - mountainID = config.get("Biome IDs", "Mountain ID", 215).getInt(); - mysticGroveID = config.get("Biome IDs", "Mystic Grove ID", 216).getInt(); - oasisID = config.get("Biome IDs", "Oasis ID", 217).getInt(); - ominousWoodsID = config.get("Biome IDs", "Ominous Woods ID", 218).getInt(); - orchardID = config.get("Biome IDs", "Orchard ID", 219).getInt(); - originValleyID = config.get("Biome IDs", "Origin Valley ID", 220).getInt(); - outbackID = config.get("Biome IDs", "Outback ID", 221).getInt(); - pastureID = config.get("Biome IDs", "Pasture ID", 222).getInt(); + marshID = config.get("Biome IDs", "Marsh ID", 210).getInt(); + meadowID = config.get("Biome IDs", "Meadow ID", 211).getInt(); + mesaID = config.get("Biome IDs", "Mesa ID", 212).getInt(); + moorID = config.get("Biome IDs", "Moor ID", 213).getInt(); + mountainID = config.get("Biome IDs", "Mountain ID", 214).getInt(); + mysticGroveID = config.get("Biome IDs", "Mystic Grove ID", 215).getInt(); + oasisID = config.get("Biome IDs", "Oasis ID", 216).getInt(); + ominousWoodsID = config.get("Biome IDs", "Ominous Woods ID", 217).getInt(); + orchardID = config.get("Biome IDs", "Orchard ID", 218).getInt(); + originValleyID = config.get("Biome IDs", "Origin Valley ID", 219).getInt(); + outbackID = config.get("Biome IDs", "Outback ID", 220).getInt(); + pastureID = config.get("Biome IDs", "Pasture ID", 221).getInt(); + polarID = config.get("Biome IDs", "Polar ID", 222).getInt(); prairieID = config.get("Biome IDs", "Prairie ID", 223).getInt(); promisedLandID = config.get("Biome IDs", "Promised Land ID", 224).getInt(); quagmireID = config.get("Biome IDs", "Quagmire ID", 225).getInt(); diff --git a/src/minecraft/biomesoplenty/integration/BWG4Integration.java b/src/minecraft/biomesoplenty/integration/BWG4Integration.java index 711d25c9c..6c264802f 100644 --- a/src/minecraft/biomesoplenty/integration/BWG4Integration.java +++ b/src/minecraft/biomesoplenty/integration/BWG4Integration.java @@ -35,6 +35,7 @@ public class BWG4Integration if(Biomes.rainforest.isPresent()) { DefaultBiomeList.addBiome("BoP: Rainforest", Biomes.rainforest.get(), 3); } if(Biomes.quagmire.isPresent()) { DefaultBiomeList.addBiome("BoP: Quagmire", Biomes.quagmire.get(), 4); } if(Biomes.prairie.isPresent()) { DefaultBiomeList.addBiome("BoP: Prairie", Biomes.prairie.get(), 2); } + if(Biomes.polar.isPresent()) { DefaultBiomeList.addBiome("BoP: Polar", Biomes.polar.get(), 1); } if(Biomes.pasture.isPresent()) { DefaultBiomeList.addBiome("BoP: Pasture", Biomes.pasture.get(), 2); } if(Biomes.outback.isPresent()) { DefaultBiomeList.addBiome("BoP: Outback", Biomes.outback.get(), 4); } if(Biomes.originValley.isPresent()) { DefaultBiomeList.addBiome("BoP: Origin Valley", Biomes.originValley.get(), 2); } @@ -53,7 +54,6 @@ public class BWG4Integration if(Biomes.lushDesert.isPresent()) { DefaultBiomeList.addBiome("BoP: Lush Desert", Biomes.lushDesert.get(), 4); } if(Biomes.jadeCliffs.isPresent()) { DefaultBiomeList.addBiome("BoP: Jade Cliffs", Biomes.jadeCliffs.get(), 2); } if(Biomes.icyHills.isPresent()) { DefaultBiomeList.addBiome("BoP: Icy Hills", Biomes.icyHills.get(), 1); } - if(Biomes.iceSheet.isPresent()) { DefaultBiomeList.addBiome("BoP: Ice Sheet", Biomes.iceSheet.get(), 1); } if(Biomes.highland.isPresent()) { DefaultBiomeList.addBiome("BoP: Highland", Biomes.highland.get(), 2); } if(Biomes.heathland.isPresent()) { DefaultBiomeList.addBiome("BoP: Heathland", Biomes.heathland.get(), 4); } if(Biomes.grove.isPresent()) { DefaultBiomeList.addBiome("BoP: Grove", Biomes.grove.get(), 2); } diff --git a/src/minecraft/biomesoplenty/integration/ForestryIntegration.java b/src/minecraft/biomesoplenty/integration/ForestryIntegration.java index 6109bbd88..066ca3a17 100644 --- a/src/minecraft/biomesoplenty/integration/ForestryIntegration.java +++ b/src/minecraft/biomesoplenty/integration/ForestryIntegration.java @@ -196,15 +196,15 @@ public class ForestryIntegration EnumTemperature.icyBiomeIds.add(BOPConfiguration.arcticID); EnumTemperature.icyBiomeIds.add(BOPConfiguration.frostForestID); EnumTemperature.icyBiomeIds.add(BOPConfiguration.glacierID); - EnumTemperature.icyBiomeIds.add(BOPConfiguration.iceSheetID); EnumTemperature.icyBiomeIds.add(BOPConfiguration.icyHillsID); + EnumTemperature.icyBiomeIds.add(BOPConfiguration.polarID); EnumHumidity.aridBiomeIds.add(BOPConfiguration.alpsID); EnumHumidity.aridBiomeIds.add(BOPConfiguration.arcticID); EnumHumidity.aridBiomeIds.add(BOPConfiguration.frostForestID); EnumHumidity.aridBiomeIds.add(BOPConfiguration.glacierID); - EnumHumidity.aridBiomeIds.add(BOPConfiguration.iceSheetID); EnumHumidity.aridBiomeIds.add(BOPConfiguration.icyHillsID); + EnumHumidity.aridBiomeIds.add(BOPConfiguration.polarID); //New vanilla biomes EnumTemperature.normalBiomeIds.add(BOPConfiguration.plainsNewID); diff --git a/src/minecraft/biomesoplenty/worldgen/WorldGenIceSheet.java b/src/minecraft/biomesoplenty/worldgen/WorldGenIceSheet.java new file mode 100644 index 000000000..431b5185a --- /dev/null +++ b/src/minecraft/biomesoplenty/worldgen/WorldGenIceSheet.java @@ -0,0 +1,69 @@ +package biomesoplenty.worldgen; + +import java.util.Random; + +import biomesoplenty.api.Blocks; +import biomesoplenty.configuration.BOPBlocks; + +import net.minecraft.block.Block; +import net.minecraft.world.World; +import net.minecraft.world.gen.feature.WorldGenerator; + +public class WorldGenIceSheet extends WorldGenerator +{ + public boolean generate(World par1World, Random par2Random, int par3, int par4, int par5) + { + int var6 = par3; + int var89; + + for (int var7 = par5; par4 < 63; ++par4) + { + var89 = par1World.getBlockId(par3, par4 - 1, par5); + + if ((var89 == Block.waterStill.blockID) && par4 < 256 - var6 - 1) + { + for (int var8 = 2; var8 <= 5; ++var8) + { + par1World.setBlock(par3, par4, par5, Block.ice.blockID); + par1World.setBlock(par3 - 1, par4, par5, Block.ice.blockID); + par1World.setBlock(par3 + 1, par4, par5, Block.ice.blockID); + par1World.setBlock(par3, par4, par5 - 1, Block.ice.blockID); + par1World.setBlock(par3, par4, par5 + 1, Block.ice.blockID); + + if (par2Random.nextInt(30) == 0) + { + par1World.setBlock(par3 - 1, par4, par5 - 1, Block.ice.blockID); + par1World.setBlock(par3 + 1, par4, par5 + 1, Block.ice.blockID); + par1World.setBlock(par3 + 1, par4, par5 - 1, Block.ice.blockID); + par1World.setBlock(par3 - 1, par4, par5 + 1, Block.ice.blockID); + + par1World.setBlock(par3, par4 + 1, par5, Block.ice.blockID); + par1World.setBlock(par3 - 1, par4 + 1, par5, Block.ice.blockID); + par1World.setBlock(par3 + 1, par4 + 1, par5, Block.ice.blockID); + par1World.setBlock(par3, par4 + 1, par5 - 1, Block.ice.blockID); + par1World.setBlock(par3, par4 + 1, par5 + 1, Block.ice.blockID); + + par1World.setBlock(par3, par4 + 2, par5, Block.ice.blockID); + + par1World.setBlock(par3, par4 - 1, par5, Block.ice.blockID); + par1World.setBlock(par3 - 1, par4 - 1, par5, Block.ice.blockID); + par1World.setBlock(par3 + 1, par4 - 1, par5, Block.ice.blockID); + par1World.setBlock(par3, par4 - 1, par5 - 1, Block.ice.blockID); + par1World.setBlock(par3, par4 - 1, par5 + 1, Block.ice.blockID); + + par1World.setBlock(par3, par4 - 2, par5, Block.ice.blockID); + } + + break; + } + } + else + { + par3 = var6 + par2Random.nextInt(4) - par2Random.nextInt(4); + par5 = var7 + par2Random.nextInt(4) - par2Random.nextInt(4); + } + } + + return true; + } +} diff --git a/src/minecraft/biomesoplenty/worldtype/WTBiomesOP.java b/src/minecraft/biomesoplenty/worldtype/WTBiomesOP.java index 311500dce..9bc7b3e1d 100644 --- a/src/minecraft/biomesoplenty/worldtype/WTBiomesOP.java +++ b/src/minecraft/biomesoplenty/worldtype/WTBiomesOP.java @@ -138,10 +138,6 @@ public class WTBiomesOP extends WorldTypeBase { addNewBiome(Biomes.highland); } - if (BOPConfiguration.iceSheetGen == true) - { - addNewBiome(Biomes.iceSheet); - } if (BOPConfiguration.icyHillsGen == true) { addNewBiome(Biomes.icyHills); @@ -214,6 +210,10 @@ public class WTBiomesOP extends WorldTypeBase { addNewBiome(Biomes.pasture); } + if (BOPConfiguration.polarGen == true) + { + addNewBiome(Biomes.polar); + } if (BOPConfiguration.prairieGen == true) { addNewBiome(Biomes.prairie);