diff --git a/src/minecraft/biomesoplenty/api/Biomes.java b/src/minecraft/biomesoplenty/api/Biomes.java index 8e0422b43..8cfb69463 100644 --- a/src/minecraft/biomesoplenty/api/Biomes.java +++ b/src/minecraft/biomesoplenty/api/Biomes.java @@ -14,6 +14,7 @@ public class Biomes public static Optional birchForest = Optional.absent(); public static Optional bog = Optional.absent(); public static Optional borealForest = Optional.absent(); + public static Optional brushland = Optional.absent(); public static Optional canyon = Optional.absent(); public static Optional chaparral = Optional.absent(); public static Optional cherryBlossomGrove = Optional.absent(); @@ -25,7 +26,6 @@ public class Biomes public static Optional deadSwamp = Optional.absent(); public static Optional deadlands = Optional.absent(); public static Optional deciduousForest = Optional.absent(); - public static Optional drylands = Optional.absent(); public static Optional dunes = Optional.absent(); public static Optional fen = Optional.absent(); public static Optional field = Optional.absent(); @@ -50,6 +50,7 @@ public class Biomes public static Optional mountain = Optional.absent(); public static Optional mysticGrove = Optional.absent(); + public static Optional netherBase = Optional.absent(); public static Optional netherGarden = Optional.absent(); public static Optional netherDesert = Optional.absent(); public static Optional netherLava = Optional.absent(); diff --git a/src/minecraft/biomesoplenty/biomes/BiomeGenDrylands.java b/src/minecraft/biomesoplenty/biomes/BiomeGenBrushland.java similarity index 64% rename from src/minecraft/biomesoplenty/biomes/BiomeGenDrylands.java rename to src/minecraft/biomesoplenty/biomes/BiomeGenBrushland.java index 45b0a8cdc..21c026072 100644 --- a/src/minecraft/biomesoplenty/biomes/BiomeGenDrylands.java +++ b/src/minecraft/biomesoplenty/biomes/BiomeGenBrushland.java @@ -2,23 +2,27 @@ package biomesoplenty.biomes; import java.util.Random; +import biomesoplenty.worldgen.WorldGenBrush1; +import biomesoplenty.worldgen.WorldGenBrush2; +import biomesoplenty.worldgen.WorldGenChaparral2; + import net.minecraft.world.biome.BiomeGenBase; import net.minecraft.world.gen.feature.WorldGenShrub; import net.minecraft.world.gen.feature.WorldGenerator; -public class BiomeGenDrylands extends BiomeGenBase +public class BiomeGenBrushland extends BiomeGenBase { private BiomeDecoratorBOP customBiomeDecorator; - public BiomeGenDrylands(int par1) + public BiomeGenBrushland(int par1) { super(par1); this.theBiomeDecorator = new BiomeDecoratorBOP(this); this.customBiomeDecorator = (BiomeDecoratorBOP)theBiomeDecorator; - this.customBiomeDecorator.treesPerChunk = 4; + this.customBiomeDecorator.treesPerChunk = 10; + this.customBiomeDecorator.grassPerChunk = 6; this.customBiomeDecorator.thornsPerChunk = 4; this.customBiomeDecorator.flowersPerChunk = -999; - this.customBiomeDecorator.quicksandPerChunk = 4; } /** @@ -26,7 +30,7 @@ public class BiomeGenDrylands extends BiomeGenBase */ public WorldGenerator getRandomWorldGenForTrees(Random par1Random) { - return (WorldGenerator)(par1Random.nextInt(5) == 0 ? new WorldGenShrub(0, 0) : this.worldGeneratorTrees); + return (WorldGenerator)(par1Random.nextInt(2) == 0 ? new WorldGenBrush2() : (par1Random.nextInt(5) == 0 ? new WorldGenBrush1() : new WorldGenChaparral2())); } /** @@ -34,7 +38,7 @@ public class BiomeGenDrylands extends BiomeGenBase */ public int getBiomeGrassColor() { - return 13404780; + return 13222271; } /** @@ -42,6 +46,6 @@ public class BiomeGenDrylands extends BiomeGenBase */ public int getBiomeFoliageColor() { - return 13407596; + return 11716223; } } diff --git a/src/minecraft/biomesoplenty/biomes/BiomeGenDeadlands.java b/src/minecraft/biomesoplenty/biomes/BiomeGenDeadlands.java index 36cf061f0..ccb964f6d 100644 --- a/src/minecraft/biomesoplenty/biomes/BiomeGenDeadlands.java +++ b/src/minecraft/biomesoplenty/biomes/BiomeGenDeadlands.java @@ -29,7 +29,7 @@ public class BiomeGenDeadlands extends BiomeGenBase this.fillerBlock = (byte)Blocks.ash.get().blockID; this.theBiomeDecorator = new BiomeDecoratorBOP(this); this.customBiomeDecorator = (BiomeDecoratorBOP)theBiomeDecorator; - this.customBiomeDecorator.treesPerChunk = 1; + this.customBiomeDecorator.treesPerChunk = -999; this.customBiomeDecorator.grassPerChunk = 15; this.customBiomeDecorator.flowersPerChunk = -999; this.customBiomeDecorator.mushroomsPerChunk = -999; @@ -46,14 +46,6 @@ public class BiomeGenDeadlands extends BiomeGenBase this.theWorldGenerator = new WorldGenMinable(Block.silverfish.blockID, 8); } - /** - * Gets a WorldGen appropriate for this biome. - */ - public WorldGenerator getRandomWorldGenForTrees(Random par1Random) - { - return new WorldGenDeadTree3(false); - } - /** * Gets a WorldGen appropriate for this biome. */ diff --git a/src/minecraft/biomesoplenty/biomes/BiomeGenNetherBase.java b/src/minecraft/biomesoplenty/biomes/BiomeGenNetherBase.java new file mode 100644 index 000000000..3534a1c3e --- /dev/null +++ b/src/minecraft/biomesoplenty/biomes/BiomeGenNetherBase.java @@ -0,0 +1,31 @@ +package biomesoplenty.biomes; + +import biomesoplenty.configuration.BOPConfiguration; + +import net.minecraft.block.Block; +import net.minecraft.world.biome.BiomeGenBase; +import net.minecraft.world.biome.SpawnListEntry; +import net.minecraft.entity.monster.EntityGhast; +import net.minecraft.entity.monster.EntityMagmaCube; +import net.minecraft.entity.monster.EntityPigZombie; + +public class BiomeGenNetherBase extends BiomeGenBase +{ + private BiomeDecoratorBOP customBiomeDecorator; + + public BiomeGenNetherBase(int par1) + { + super(par1); + this.theBiomeDecorator = new BiomeDecoratorBOP(this); + this.customBiomeDecorator = (BiomeDecoratorBOP)theBiomeDecorator; + this.topBlock = (byte)Block.netherrack.blockID; + this.fillerBlock = (byte)Block.netherrack.blockID; + this.spawnableMonsterList.clear(); + this.spawnableCreatureList.clear(); + this.spawnableWaterCreatureList.clear(); + this.spawnableCaveCreatureList.clear(); + this.spawnableMonsterList.add(new SpawnListEntry(EntityGhast.class, 50, 4, 4)); + this.spawnableMonsterList.add(new SpawnListEntry(EntityPigZombie.class, 100, 4, 4)); + this.spawnableMonsterList.add(new SpawnListEntry(EntityMagmaCube.class, 1, 4, 4)); + } +} diff --git a/src/minecraft/biomesoplenty/biomes/BiomeGenWasteland.java b/src/minecraft/biomesoplenty/biomes/BiomeGenWasteland.java index f94938320..ca5567d62 100644 --- a/src/minecraft/biomesoplenty/biomes/BiomeGenWasteland.java +++ b/src/minecraft/biomesoplenty/biomes/BiomeGenWasteland.java @@ -1,12 +1,16 @@ package biomesoplenty.biomes; import java.awt.Color; +import java.util.Random; + +import biomesoplenty.worldgen.WorldGenDeadTree3; import biomesoplenty.api.Blocks; import biomesoplenty.configuration.BOPBlocks; import biomesoplenty.configuration.BOPConfiguration; import net.minecraft.world.biome.BiomeGenBase; +import net.minecraft.world.gen.feature.WorldGenerator; public class BiomeGenWasteland extends BiomeGenBase { @@ -19,12 +23,20 @@ public class BiomeGenWasteland extends BiomeGenBase this.fillerBlock = (byte)Blocks.driedDirt.get().blockID; this.theBiomeDecorator = new BiomeDecoratorBOP(this); this.customBiomeDecorator = (BiomeDecoratorBOP)theBiomeDecorator; - this.customBiomeDecorator.treesPerChunk = -999; + this.customBiomeDecorator.treesPerChunk = 0; this.customBiomeDecorator.deadGrassPerChunk = 14; this.waterColorMultiplier = 15073024; this.spawnableCreatureList.clear(); this.spawnableWaterCreatureList.clear(); } + + /** + * Gets a WorldGen appropriate for this biome. + */ + public WorldGenerator getRandomWorldGenForTrees(Random par1Random) + { + return new WorldGenDeadTree3(false); + } /** * Provides the basic grass color based on the biome temperature and rainfall diff --git a/src/minecraft/biomesoplenty/configuration/BOPBiomes.java b/src/minecraft/biomesoplenty/configuration/BOPBiomes.java index 96d14f318..bd8221d74 100644 --- a/src/minecraft/biomesoplenty/configuration/BOPBiomes.java +++ b/src/minecraft/biomesoplenty/configuration/BOPBiomes.java @@ -71,6 +71,7 @@ public class BOPBiomes { Biomes.birchForest = Optional.of((new BiomeGenBirchForest(BOPConfiguration.birchForestID)).setColor(353825).setBiomeName("Birch Forest").func_76733_a(5159473).setTemperatureRainfall(0.4F, 0.3F)); Biomes.bog = Optional.of((new BiomeGenBog(BOPConfiguration.bogID)).setColor(522674).setBiomeName("Bog").func_76733_a(9154376).setMinMaxHeight(-0.3F, -0.1F).setTemperatureRainfall(0.8F, 0.9F)); Biomes.borealForest = Optional.of((new BiomeGenBorealForest(BOPConfiguration.borealForestID)).setColor(353825).setBiomeName("Boreal Forest").func_76733_a(5159473).setMinMaxHeight(0.0F, 1.0F).setTemperatureRainfall(0.6F, 0.7F)); + Biomes.brushland = Optional.of((new BiomeGenBrushland(BOPConfiguration.brushlandID)).setColor(16421912).setBiomeName("Brushland").setTemperatureRainfall(2.0F, 0.0F).setMinMaxHeight(0.0F, 0.5F)); Biomes.canyon = Optional.of((new BiomeGenCanyon(BOPConfiguration.canyonID)).setColor(9286496).setBiomeName("Canyon").setTemperatureRainfall(0.8F, 0.4F).setMinMaxHeight(3.0F, 5.0F)); Biomes.chaparral = Optional.of((new BiomeGenChaparral(BOPConfiguration.chaparralID)).setColor(9286496).setBiomeName("Chaparral").setTemperatureRainfall(0.8F, 0.4F).setMinMaxHeight(0.3F, 0.6F)); Biomes.cherryBlossomGrove = Optional.of((new BiomeGenCherryBlossomGrove(BOPConfiguration.cherryBlossomGroveID)).setColor(9286496).setBiomeName("Cherry Blossom Grove").setMinMaxHeight(0.1F, 0.2F).setTemperatureRainfall(0.7F, 0.8F)); @@ -82,7 +83,6 @@ public class BOPBiomes { Biomes.deadSwamp = Optional.of((new BiomeGenDeadSwamp(BOPConfiguration.deadSwampID)).setColor(522674).setBiomeName("Dead Swamp").func_76733_a(9154376).setMinMaxHeight(-0.2F, 0.1F).setTemperatureRainfall(0.8F, 0.9F)); Biomes.deadlands = Optional.of((new BiomeGenDeadlands(BOPConfiguration.deadlandsID)).setColor(522674).setBiomeName("Deadlands").setDisableRain().func_76733_a(9154376).setMinMaxHeight(0.1F, 0.5F).setTemperatureRainfall(2.0F, 0.0F)); Biomes.deciduousForest = Optional.of((new BiomeGenDeciduousForest(BOPConfiguration.deciduousForestID)).setColor(353825).setBiomeName("Deciduous Forest").func_76733_a(5159473).setTemperatureRainfall(0.7F, 0.8F)); - Biomes.drylands = Optional.of((new BiomeGenDrylands(BOPConfiguration.drylandsID)).setColor(16421912).setBiomeName("Drylands").setTemperatureRainfall(2.0F, 0.0F).setMinMaxHeight(0.0F, 0.5F)); Biomes.dunes = Optional.of((new BiomeGenDunes(BOPConfiguration.dunesID)).setColor(13786898).setBiomeName("Dunes").setDisableRain().setTemperatureRainfall(2.0F, 0.0F).setMinMaxHeight(0.5F, 1.3F)); Biomes.fen = Optional.of((new BiomeGenFen(BOPConfiguration.fenID)).setColor(9286496).setBiomeName("Fen").setTemperatureRainfall(0.4F, 0.0F).setMinMaxHeight(-0.2F, 0.1F)); Biomes.field = Optional.of((new BiomeGenField(BOPConfiguration.fieldID)).setColor(9286496).setBiomeName("Field").setTemperatureRainfall(0.4F, 0.8F).setMinMaxHeight(0.0F, 0.1F)); @@ -106,7 +106,8 @@ public class BOPBiomes { Biomes.moor = Optional.of((new BiomeGenMoor(BOPConfiguration.moorID)).setColor(16421912).setBiomeName("Moor").setTemperatureRainfall(0.5F, 1.0F).setMinMaxHeight(0.7F, 0.8F)); Biomes.mountain = Optional.of((new BiomeGenMountain(BOPConfiguration.mountainID)).setColor(14090235).setBiomeName("Mountain").setTemperatureRainfall(0.5F, 0.1F).setMinMaxHeight(1.2F, 1.2F)); Biomes.mysticGrove = Optional.of((new BiomeGenMysticGrove(BOPConfiguration.mysticGroveID)).setColor(353825).setBiomeName("Mystic Grove").setDisableRain().func_76733_a(5159473).setTemperatureRainfall(0.9F, 1.0F)); - + + Biomes.netherBase = Optional.of((new BiomeGenNetherBase(BOPConfiguration.netherBaseID)).setColor(16711680).setBiomeName("Nether").setDisableRain().setTemperatureRainfall(2.0F, 0.0F)); Biomes.netherGarden = Optional.of((new BiomeGenNetherGarden(BOPConfiguration.netherGardenID)).setColor(16711680).setBiomeName("Undergarden").setDisableRain().setTemperatureRainfall(2.0F, 0.0F)); Biomes.netherDesert = Optional.of((new BiomeGenNetherDesert(BOPConfiguration.netherDesertID)).setColor(16711680).setBiomeName("Corrupted Sands").setDisableRain().setTemperatureRainfall(2.0F, 0.0F)); Biomes.netherLava = Optional.of((new BiomeGenNetherLava(BOPConfiguration.netherLavaID)).setColor(16711680).setBiomeName("Phantasmagoric Inferno").setDisableRain().setTemperatureRainfall(2.0F, 0.0F)); @@ -167,6 +168,7 @@ public class BOPBiomes { BiomeDictionary.registerBiomeType(Biomes.birchForest.get(), Type.FOREST); BiomeDictionary.registerBiomeType(Biomes.bog.get(), Type.SWAMP); BiomeDictionary.registerBiomeType(Biomes.borealForest.get(), Type.FOREST); + BiomeDictionary.registerBiomeType(Biomes.brushland.get(), Type.DESERT, Type.FOREST, Type.PLAINS); BiomeDictionary.registerBiomeType(Biomes.canyon.get(), Type.DESERT, Type.MOUNTAIN, Type.HILLS); BiomeDictionary.registerBiomeType(Biomes.chaparral.get(), Type.PLAINS); BiomeDictionary.registerBiomeType(Biomes.cherryBlossomGrove.get(), Type.MAGICAL, Type.FOREST); @@ -178,7 +180,6 @@ public class BOPBiomes { BiomeDictionary.registerBiomeType(Biomes.deadlands.get(), Type.WASTELAND); BiomeDictionary.registerBiomeType(Biomes.deadSwamp.get(), Type.SWAMP); BiomeDictionary.registerBiomeType(Biomes.deciduousForest.get(), Type.FOREST, Type.HILLS); - BiomeDictionary.registerBiomeType(Biomes.drylands.get(), Type.DESERT); BiomeDictionary.registerBiomeType(Biomes.dunes.get(), Type.BEACH, Type.DESERT); BiomeDictionary.registerBiomeType(Biomes.fen.get(), Type.FOREST, Type.SWAMP); BiomeDictionary.registerBiomeType(Biomes.field.get(), Type.PLAINS); @@ -203,6 +204,7 @@ public class BOPBiomes { BiomeDictionary.registerBiomeType(Biomes.mountain.get(), Type.MOUNTAIN, Type.HILLS); BiomeDictionary.registerBiomeType(Biomes.mysticGrove.get(), Type.MAGICAL, Type.FOREST); + BiomeDictionary.registerBiomeType(Biomes.netherBase.get(), Type.NETHER); BiomeDictionary.registerBiomeType(Biomes.netherGarden.get(), Type.NETHER, Type.FOREST); BiomeDictionary.registerBiomeType(Biomes.netherDesert.get(), Type.NETHER, Type.DESERT); BiomeDictionary.registerBiomeType(Biomes.netherLava.get(), Type.NETHER); @@ -261,6 +263,7 @@ public class BOPBiomes { addSpawnBiome(Biomes.birchForest); addSpawnBiome(Biomes.bog); addSpawnBiome(Biomes.borealForest); + addSpawnBiome(Biomes.brushland); addSpawnBiome(Biomes.canyon); addSpawnBiome(Biomes.chaparral); addSpawnBiome(Biomes.cherryBlossomGrove); @@ -270,7 +273,6 @@ public class BOPBiomes { addSpawnBiome(Biomes.deadForestSnow); addSpawnBiome(Biomes.deadSwamp); addSpawnBiome(Biomes.deciduousForest); - addSpawnBiome(Biomes.drylands); addSpawnBiome(Biomes.dunes); addSpawnBiome(Biomes.fen); addSpawnBiome(Biomes.field); @@ -334,6 +336,7 @@ public class BOPBiomes { addVillageBiome(Biomes.birchForest, BOPConfiguration.birchForestVillage); addVillageBiome(Biomes.bog, BOPConfiguration.bogVillage); addVillageBiome(Biomes.borealForest, BOPConfiguration.borealForestVillage); + addVillageBiome(Biomes.brushland, BOPConfiguration.brushlandVillage); addVillageBiome(Biomes.canyon, BOPConfiguration.canyonVillage); addVillageBiome(Biomes.chaparral, BOPConfiguration.chaparralVillage); addVillageBiome(Biomes.cherryBlossomGrove, BOPConfiguration.cherryBlossomGroveVillage); @@ -343,7 +346,6 @@ public class BOPBiomes { addVillageBiome(Biomes.deadForestSnow, BOPConfiguration.deadForestSnowVillage); addVillageBiome(Biomes.deadSwamp, BOPConfiguration.deadSwampVillage); addVillageBiome(Biomes.deciduousForest, BOPConfiguration.deciduousForestVillage); - addVillageBiome(Biomes.drylands, BOPConfiguration.drylandsVillage); addVillageBiome(Biomes.dunes, BOPConfiguration.dunesVillage); addVillageBiome(Biomes.fen, BOPConfiguration.fenVillage); addVillageBiome(Biomes.field, BOPConfiguration.fieldVillage); @@ -407,6 +409,7 @@ public class BOPBiomes { addStrongholdBiome(Biomes.birchForest); addStrongholdBiome(Biomes.bog); addStrongholdBiome(Biomes.borealForest); + addStrongholdBiome(Biomes.brushland); addStrongholdBiome(Biomes.canyon); addStrongholdBiome(Biomes.chaparral); addStrongholdBiome(Biomes.cherryBlossomGrove); @@ -418,7 +421,6 @@ public class BOPBiomes { addStrongholdBiome(Biomes.deadSwamp); addStrongholdBiome(Biomes.deadlands); addStrongholdBiome(Biomes.deciduousForest); - addStrongholdBiome(Biomes.drylands); addStrongholdBiome(Biomes.dunes); addStrongholdBiome(Biomes.fen); addStrongholdBiome(Biomes.field); @@ -507,6 +509,9 @@ public class BOPBiomes { if (BOPConfiguration.borealForestGen) registerBiome(Biomes.borealForest); + + if (BOPConfiguration.brushlandGen) + registerBiome(Biomes.brushland); if (BOPConfiguration.canyonGen) registerBiome(Biomes.canyon); @@ -541,9 +546,6 @@ public class BOPBiomes { if (BOPConfiguration.deciduousForestGen) registerBiome(Biomes.deciduousForest); - if (BOPConfiguration.drylandsGen) - registerBiome(Biomes.drylands); - if (BOPConfiguration.dunesGen) registerBiome(Biomes.dunes); @@ -808,6 +810,9 @@ public class BOPBiomes { if (BOPConfiguration.borealForestGen) addBiomeToWorldTypes(getWorldTypes(), Biomes.borealForest); + + if (BOPConfiguration.brushlandGen) + addBiomeToWorldTypes(getWorldTypes(), Biomes.brushland); if (BOPConfiguration.canyonGen) addBiomeToWorldTypes(getWorldTypes(), Biomes.canyon); @@ -842,9 +847,6 @@ public class BOPBiomes { if (BOPConfiguration.deciduousForestGen) addBiomeToWorldTypes(getWorldTypes(), Biomes.deciduousForest); - if (BOPConfiguration.drylandsGen) - addBiomeToWorldTypes(getWorldTypes(), Biomes.drylands); - if (BOPConfiguration.dunesGen) addBiomeToWorldTypes(getWorldTypes(), Biomes.dunes); diff --git a/src/minecraft/biomesoplenty/configuration/BOPConfiguration.java b/src/minecraft/biomesoplenty/configuration/BOPConfiguration.java index 7faca412b..e401bb404 100644 --- a/src/minecraft/biomesoplenty/configuration/BOPConfiguration.java +++ b/src/minecraft/biomesoplenty/configuration/BOPConfiguration.java @@ -31,6 +31,7 @@ public class BOPConfiguration { public static boolean birchForestGen; public static boolean bogGen; public static boolean borealForestGen; + public static boolean brushlandGen; public static boolean canyonGen; public static boolean chaparralGen; public static boolean cherryBlossomGroveGen; @@ -42,7 +43,6 @@ public class BOPConfiguration { public static boolean deadSwampGen; public static boolean deadlandsGen; public static boolean deciduousForestGen; - public static boolean drylandsGen; public static boolean dunesGen; public static boolean fenGen; public static boolean fieldGen; @@ -235,6 +235,7 @@ public class BOPConfiguration { public static int birchForestID; public static int bogID; public static int borealForestID; + public static int brushlandID; public static int canyonID; public static int chaparralID; public static int cherryBlossomGroveID; @@ -246,7 +247,6 @@ public class BOPConfiguration { public static int deadSwampID; public static int deadlandsID; public static int deciduousForestID; - public static int drylandsID; public static int dunesID; public static int fenID; public static int fieldID; @@ -271,6 +271,7 @@ public class BOPConfiguration { public static int mountainID; public static int mysticGroveID; + public static int netherBaseID; public static int netherGardenID; public static int netherDesertID; public static int netherLavaID; @@ -343,6 +344,7 @@ public class BOPConfiguration { public static boolean birchForestVillage; public static boolean bogVillage; public static boolean borealForestVillage; + public static boolean brushlandVillage; public static boolean canyonVillage; public static boolean chaparralVillage; public static boolean cherryBlossomGroveVillage; @@ -354,7 +356,6 @@ public class BOPConfiguration { public static boolean deadSwampVillage; public static boolean deadlandsVillage; public static boolean deciduousForestVillage; - public static boolean drylandsVillage; public static boolean dunesVillage; public static boolean fenVillage; public static boolean fieldVillage; @@ -449,6 +450,7 @@ public class BOPConfiguration { birchForestGen = config.get("Biomes To Generate", "BirchForest", true).getBoolean(false); bogGen = config.get("Biomes To Generate", "Bog", true).getBoolean(false); borealForestGen = config.get("Biomes To Generate", "BorealForest", true).getBoolean(false); + brushlandGen = config.get("Biomes To Generate", "Brushland", true).getBoolean(false); canyonGen = config.get("Biomes To Generate", "Canyon", true).getBoolean(false); chaparralGen = config.get("Biomes To Generate", "Chaparral", true).getBoolean(false); cherryBlossomGroveGen = config.get("Biomes To Generate", "CherryBlossomGrove", true).getBoolean(false); @@ -460,7 +462,6 @@ public class BOPConfiguration { deadSwampGen = config.get("Biomes To Generate", "DeadSwamp", true).getBoolean(false); deadlandsGen = config.get("Biomes To Generate", "Deadlands", true).getBoolean(false); deciduousForestGen = config.get("Biomes To Generate", "DeciduousForest", true).getBoolean(false); - drylandsGen = config.get("Biomes To Generate", "Drylands", true).getBoolean(false); dunesGen = config.get("Biomes To Generate", "Dunes", true).getBoolean(false); fenGen = config.get("Biomes To Generate", "Fen", true).getBoolean(false); fieldGen = config.get("Biomes To Generate", "Field", true).getBoolean(false); @@ -526,16 +527,17 @@ public class BOPConfiguration { // Biomes with villages alpsVillage = config.get("Allow Villages", "Alps", false).getBoolean(false); - arcticVillage = config.get("Allow Villages", "Arctic", true).getBoolean(false); + arcticVillage = config.get("Allow Villages", "Arctic", false).getBoolean(false); badlandsVillage = config.get("Allow Villages", "Badlands", false).getBoolean(false); bambooForestVillage = config.get("Allow Villages", "BambooForest", true).getBoolean(false); bayouVillage = config.get("Allow Villages", "Bayou", true).getBoolean(false); birchForestVillage = config.get("Allow Villages", "BirchForest", true).getBoolean(false); bogVillage = config.get("Allow Villages", "Bog", false).getBoolean(false); borealForestVillage = config.get("Allow Villages", "BorealForest", true).getBoolean(false); + brushlandVillage = config.get("Allow Villages", "Brushland", true).getBoolean(false); canyonVillage = config.get("Allow Villages", "Canyon", false).getBoolean(false); chaparralVillage = config.get("Allow Villages", "Chaparral", true).getBoolean(false); - cherryBlossomGroveVillage = config.get("Allow Villages", "CherryBlossomGrove", true).getBoolean(false); + cherryBlossomGroveVillage = config.get("Allow Villages", "CherryBlossomGrove", false).getBoolean(false); coniferousForestVillage = config.get("Allow Villages", "ConiferousForest", true).getBoolean(false); coniferousForestSnowVillage = config.get("Allow Villages", "ConiferousForestSnow", true).getBoolean(false); cragVillage = config.get("Allow Villages", "Crag", false).getBoolean(false); @@ -544,7 +546,6 @@ public class BOPConfiguration { deadSwampVillage = config.get("Allow Villages", "DeadSwamp", false).getBoolean(false); deadlandsVillage = config.get("Allow Villages", "Deadlands", false).getBoolean(false); deciduousForestVillage = config.get("Allow Villages", "DeciduousForest", true).getBoolean(false); - drylandsVillage = config.get("Allow Villages", "Drylands", true).getBoolean(false); dunesVillage = config.get("Allow Villages", "Dunes", false).getBoolean(false); fenVillage = config.get("Allow Villages", "Fen", false).getBoolean(false); fieldVillage = config.get("Allow Villages", "Field", true).getBoolean(false); @@ -571,9 +572,9 @@ public class BOPConfiguration { mysticGroveVillage = config.get("Allow Villages", "MysticGrove", false).getBoolean(false); oasisVillage = config.get("Allow Villages", "Oasis", true).getBoolean(false); ominousWoodsVillage = config.get("Allow Villages", "OminousWoods", false).getBoolean(false); - orchardVillage = config.get("Allow Villages", "Orchard", true).getBoolean(false); + orchardVillage = config.get("Allow Villages", "Orchard", false).getBoolean(false); originValleyVillage = config.get("Allow Villages", "OriginValley", false).getBoolean(false); - outbackVillage = config.get("Allow Villages", "Outback", true).getBoolean(false); + outbackVillage = config.get("Allow Villages", "Outback", false).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); @@ -583,29 +584,29 @@ public class BOPConfiguration { sacredSpringsVillage = config.get("Allow Villages", "SacredSprings", false).getBoolean(false); savannaVillage = config.get("Allow Villages", "Savanna", true).getBoolean(false); scrublandVillage = config.get("Allow Villages", "Scrubland", true).getBoolean(false); - seasonalForestVillage = config.get("Allow Villages", "SeasonalForest", true).getBoolean(false); + seasonalForestVillage = config.get("Allow Villages", "SeasonalForest", false).getBoolean(false); shieldVillage = config.get("Allow Villages", "Shield", true).getBoolean(false); shrublandVillage = config.get("Allow Villages", "Shrubland", true).getBoolean(false); spruceWoodsVillage = config.get("Allow Villages", "SpruceWoods", true).getBoolean(false); steppeVillage = config.get("Allow Villages", "Steppe", true).getBoolean(false); swampwoodsVillage = config.get("Allow Villages", "Swampwoods", false).getBoolean(false); temperateRainforestVillage = config.get("Allow Villages", "TemperateRainforest", true).getBoolean(false); - thicketVillage = config.get("Allow Villages", "Thicket", true).getBoolean(false); + thicketVillage = config.get("Allow Villages", "Thicket", false).getBoolean(false); tropicalRainforestVillage = config.get("Allow Villages", "TropicalRainforest", true).getBoolean(false); tropicsVillage = config.get("Allow Villages", "Tropics", false).getBoolean(false); tundraVillage = config.get("Allow Villages", "Tundra", true).getBoolean(false); volcanoVillage = config.get("Allow Villages", "Volcano", false).getBoolean(false); wastelandVillage = config.get("Allow Villages", "Wasteland", false).getBoolean(false); - wetlandVillage = config.get("Allow Villages", "Wetland", true).getBoolean(false); + wetlandVillage = config.get("Allow Villages", "Wetland", false).getBoolean(false); woodlandVillage = config.get("Allow Villages", "Woodland", true).getBoolean(false); // Vanilla biomes desertVillage = config.get("Allow Villages", "Desert", true).getBoolean(true); extremeHillsVillage = config.get("Allow Villages", "ExtremeHills", false).getBoolean(false); forestVillage = config.get("Allow Villages", "Forest", true).getBoolean(false); - jungleVillage = config.get("Allow Villages", "Jungle", true).getBoolean(false); + jungleVillage = config.get("Allow Villages", "Jungle", false).getBoolean(false); plainsVillage = config.get("Allow Villages", "Plains", true).getBoolean(true); - swamplandVillage = config.get("Allow Villages", "Swampland", true).getBoolean(false); + swamplandVillage = config.get("Allow Villages", "Swampland", false).getBoolean(false); taigaVillage = config.get("Allow Villages", "Taiga", true).getBoolean(false); // Get Terrain Block ID's @@ -740,14 +741,17 @@ public class BOPConfiguration { //23-79 ExtraBiomesXL - promisedLandForestID = config.get("Biome IDs", "Wonderous Woods (Promised Land) ID", 73).getInt(); - promisedLandPlainsID = config.get("Biome IDs", "Majestic Meadow (Promised Land) ID", 74).getInt(); - promisedLandSwampID = config.get("Biome IDs", "Blessed Bog (Promised Land) ID", 75).getInt(); + promisedLandForestID = config.get("Biome IDs", "Wonderous Woods (Promised Land) ID", 62).getInt(); + promisedLandPlainsID = config.get("Biome IDs", "Majestic Meadow (Promised Land) ID", 63).getInt(); + promisedLandSwampID = config.get("Biome IDs", "Blessed Bog (Promised Land) ID", 64).getInt(); - netherGardenID = config.get("Biome IDs", "Undergarden (Nether) ID", 76).getInt(); - netherDesertID = config.get("Biome IDs", "Corrupted Sands (Nether) ID", 77).getInt(); - netherLavaID = config.get("Biome IDs", "Phantasmagoric Inferno (Nether) ID", 78).getInt(); - netherBoneID = config.get("Biome IDs", "Boneyard (Nether) ID", 79).getInt(); + netherBaseID = config.get("Biome IDs", "Nether Base (Nether) ID", 65).getInt(); + netherGardenID = config.get("Biome IDs", "Undergarden (Nether) ID", 66).getInt(); + netherDesertID = config.get("Biome IDs", "Corrupted Sands (Nether) ID", 67).getInt(); + netherLavaID = config.get("Biome IDs", "Phantasmagoric Inferno (Nether) ID", 68).getInt(); + netherBoneID = config.get("Biome IDs", "Boneyard (Nether) ID", 69).getInt(); + + //70-87 Twilight Forest //80-169 Better World Generation 4 @@ -759,18 +763,18 @@ public class BOPConfiguration { birchForestID = config.get("Biome IDs", "Birch Forest ID", 177).getInt(); bogID = config.get("Biome IDs", "Bog ID", 178).getInt(); borealForestID = config.get("Biome IDs", "Boreal Forest ID", 179).getInt(); - canyonID = config.get("Biome IDs", "Canyon ID", 180).getInt(); - chaparralID = config.get("Biome IDs", "Chaparral ID", 181).getInt(); - cherryBlossomGroveID = config.get("Biome IDs", "Cherry Blossom Grove ID", 182).getInt(); - coniferousForestID = config.get("Biome IDs", "Coniferous Forest ID", 183).getInt(); - coniferousForestSnowID = config.get("Biome IDs", "Coniferous Forest (Snow) ID", 184).getInt(); - cragID = config.get("Biome IDs", "Crag ID", 185).getInt(); - deadForestID = config.get("Biome IDs", "Dead Forest ID", 186).getInt(); - deadForestSnowID = config.get("Biome IDs", "Dead Forest (Snow) ID", 187).getInt(); - deadSwampID = config.get("Biome IDs", "Dead Swamp ID", 188).getInt(); - deadlandsID = config.get("Biome IDs", "Deadlands ID", 189).getInt(); - deciduousForestID = config.get("Biome IDs", "Deciduous Forest ID", 190).getInt(); - drylandsID = config.get("Biome IDs", "Drylands ID", 191).getInt(); + brushlandID = config.get("Biome IDs", "Brushland ID", 180).getInt(); + canyonID = config.get("Biome IDs", "Canyon ID", 181).getInt(); + chaparralID = config.get("Biome IDs", "Chaparral ID", 182).getInt(); + cherryBlossomGroveID = config.get("Biome IDs", "Cherry Blossom Grove ID", 183).getInt(); + coniferousForestID = config.get("Biome IDs", "Coniferous Forest ID", 184).getInt(); + coniferousForestSnowID = config.get("Biome IDs", "Coniferous Forest (Snow) ID", 185).getInt(); + cragID = config.get("Biome IDs", "Crag ID", 186).getInt(); + deadForestID = config.get("Biome IDs", "Dead Forest ID", 187).getInt(); + deadForestSnowID = config.get("Biome IDs", "Dead Forest (Snow) ID", 188).getInt(); + deadSwampID = config.get("Biome IDs", "Dead Swamp ID", 189).getInt(); + deadlandsID = config.get("Biome IDs", "Deadlands ID", 190).getInt(); + deciduousForestID = config.get("Biome IDs", "Deciduous Forest ID", 191).getInt(); dunesID = config.get("Biome IDs", "Dunes ID", 192).getInt(); fenID = config.get("Biome IDs", "Fen ID", 193).getInt(); fieldID = config.get("Biome IDs", "Field ID", 194).getInt(); diff --git a/src/minecraft/biomesoplenty/integration/BWG4Integration.java b/src/minecraft/biomesoplenty/integration/BWG4Integration.java index 369d7095d..f70575167 100644 --- a/src/minecraft/biomesoplenty/integration/BWG4Integration.java +++ b/src/minecraft/biomesoplenty/integration/BWG4Integration.java @@ -64,7 +64,6 @@ public class BWG4Integration if(Biomes.field.isPresent()) { DefaultBiomeList.addBiome("BoP: Field", Biomes.field.get(), 2); } if(Biomes.fen.isPresent()) { DefaultBiomeList.addBiome("BoP: Fen", Biomes.fen.get(), 2); } if(Biomes.dunes.isPresent()) { DefaultBiomeList.addBiome("BoP: Dunes", Biomes.dunes.get(), 4); } - if(Biomes.drylands.isPresent()) { DefaultBiomeList.addBiome("BoP: Drylands", Biomes.drylands.get(), 4); } if(Biomes.deciduousForest.isPresent()) { DefaultBiomeList.addBiome("BoP: Deciduous Forest", Biomes.deciduousForest.get(), 2); } if(Biomes.deadlands.isPresent()) { DefaultBiomeList.addBiome("BoP: Deadlands", Biomes.deadlands.get(), 4); } if(Biomes.deadSwamp.isPresent()) { DefaultBiomeList.addBiome("BoP: Dead Swamp", Biomes.deadSwamp.get(), 2); } @@ -76,6 +75,7 @@ public class BWG4Integration if(Biomes.cherryBlossomGrove.isPresent()) { DefaultBiomeList.addBiome("BoP: Cherry Blossom Grove", Biomes.cherryBlossomGrove.get(), 2); } if(Biomes.chaparral.isPresent()) { DefaultBiomeList.addBiome("BoP: Chaparral", Biomes.chaparral.get(), 2); } if(Biomes.canyon.isPresent()) { DefaultBiomeList.addBiome("BoP: Canyon", Biomes.canyon.get(), 4); } + if(Biomes.brushland.isPresent()) { DefaultBiomeList.addBiome("BoP: Brushland", Biomes.brushland.get(), 4); } if(Biomes.borealForest.isPresent()) { DefaultBiomeList.addBiome("BoP: Boreal Forest", Biomes.borealForest.get(), 2); } if(Biomes.bog.isPresent()) { DefaultBiomeList.addBiome("BoP: Bog", Biomes.bog.get(), 3); } if(Biomes.birchForest.isPresent()) { DefaultBiomeList.addBiome("BoP: Birch Forest", Biomes.birchForest.get(), 2); } diff --git a/src/minecraft/biomesoplenty/integration/ForestryIntegration.java b/src/minecraft/biomesoplenty/integration/ForestryIntegration.java index e05e41011..a476f0bde 100644 --- a/src/minecraft/biomesoplenty/integration/ForestryIntegration.java +++ b/src/minecraft/biomesoplenty/integration/ForestryIntegration.java @@ -36,8 +36,8 @@ public class ForestryIntegration //Hot - Arid //Desert Hives EnumTemperature.hotBiomeIds.add(BOPConfiguration.badlandsID); + EnumTemperature.hotBiomeIds.add(BOPConfiguration.brushlandID); EnumTemperature.hotBiomeIds.add(BOPConfiguration.deadlandsID); - EnumTemperature.hotBiomeIds.add(BOPConfiguration.drylandsID); EnumTemperature.hotBiomeIds.add(BOPConfiguration.dunesID); EnumTemperature.hotBiomeIds.add(BOPConfiguration.mesaID); EnumTemperature.hotBiomeIds.add(BOPConfiguration.steppeID); @@ -48,8 +48,8 @@ public class ForestryIntegration EnumTemperature.hotBiomeIds.add(BOPConfiguration.desertNewID); EnumHumidity.aridBiomeIds.add(BOPConfiguration.badlandsID); + EnumHumidity.aridBiomeIds.add(BOPConfiguration.brushlandID); EnumHumidity.aridBiomeIds.add(BOPConfiguration.deadlandsID); - EnumHumidity.aridBiomeIds.add(BOPConfiguration.drylandsID); EnumHumidity.aridBiomeIds.add(BOPConfiguration.dunesID); EnumHumidity.aridBiomeIds.add(BOPConfiguration.mesaID); EnumHumidity.aridBiomeIds.add(BOPConfiguration.steppeID); diff --git a/src/minecraft/biomesoplenty/world/WorldChunkManagerBOP.java b/src/minecraft/biomesoplenty/world/WorldChunkManagerBOP.java index 33184dc67..c3ae1a13a 100644 --- a/src/minecraft/biomesoplenty/world/WorldChunkManagerBOP.java +++ b/src/minecraft/biomesoplenty/world/WorldChunkManagerBOP.java @@ -50,6 +50,7 @@ public class WorldChunkManagerBOP extends WorldChunkManager addSpawnBiomes(Biomes.birchForest); addSpawnBiomes(Biomes.bog); addSpawnBiomes(Biomes.borealForest); + addSpawnBiomes(Biomes.brushland); addSpawnBiomes(Biomes.chaparral); addSpawnBiomes(Biomes.cherryBlossomGrove); addSpawnBiomes(Biomes.coniferousForest); @@ -58,7 +59,6 @@ public class WorldChunkManagerBOP extends WorldChunkManager addSpawnBiomes(Biomes.deadForest); addSpawnBiomes(Biomes.deadForestSnow); addSpawnBiomes(Biomes.deciduousForest); - addSpawnBiomes(Biomes.drylands); addSpawnBiomes(Biomes.dunes); addSpawnBiomes(Biomes.frostForest); addSpawnBiomes(Biomes.glacier); diff --git a/src/minecraft/biomesoplenty/world/WorldTypeBOP.java b/src/minecraft/biomesoplenty/world/WorldTypeBOP.java index 6ce1884dd..a16785de9 100644 --- a/src/minecraft/biomesoplenty/world/WorldTypeBOP.java +++ b/src/minecraft/biomesoplenty/world/WorldTypeBOP.java @@ -50,6 +50,10 @@ public class WorldTypeBOP extends WorldType { addNewBiome(Biomes.borealForest); } + if (BOPConfiguration.brushlandGen == true) + { + addNewBiome(Biomes.brushland); + } if (BOPConfiguration.canyonGen == true) { addNewBiome(Biomes.canyon); @@ -94,10 +98,6 @@ public class WorldTypeBOP extends WorldType { addNewBiome(Biomes.deciduousForest); } - if (BOPConfiguration.drylandsGen == true) - { - addNewBiome(Biomes.drylands); - } if (BOPConfiguration.dunesGen == true) { addNewBiome(Biomes.dunes); diff --git a/src/minecraft/biomesoplenty/world/layer/BiomeLayerBiomes.java b/src/minecraft/biomesoplenty/world/layer/BiomeLayerBiomes.java index 42f6a3869..88c87126c 100644 --- a/src/minecraft/biomesoplenty/world/layer/BiomeLayerBiomes.java +++ b/src/minecraft/biomesoplenty/world/layer/BiomeLayerBiomes.java @@ -32,6 +32,10 @@ public class BiomeLayerBiomes extends BiomeLayer surfaceBiomes = par4WorldType.getBiomesForWorldType(); //NETHER BIOMES + if (Biomes.netherBase.isPresent()) + { + netherBiomes.add(Biomes.netherBase.get()); + } if (Biomes.netherGarden.isPresent()) { netherBiomes.add(Biomes.netherGarden.get()); diff --git a/src/minecraft/biomesoplenty/worldgen/WorldGenBrush1.java b/src/minecraft/biomesoplenty/worldgen/WorldGenBrush1.java new file mode 100644 index 000000000..8d9dfc37a --- /dev/null +++ b/src/minecraft/biomesoplenty/worldgen/WorldGenBrush1.java @@ -0,0 +1,65 @@ +package biomesoplenty.worldgen; + +import java.util.Random; + +import net.minecraft.block.Block; +import net.minecraft.world.World; +import net.minecraft.world.gen.feature.WorldGenerator; + +public class WorldGenBrush1 extends WorldGenerator +{ + public boolean generate(World var1, Random var2, int var3, int var4, int var5) + { + while (var1.isAirBlock(var3, var4, var5) && var4 > 2) + { + --var4; + } + + int var6 = var1.getBlockId(var3, var4, var5); + + if (var6 != Block.grass.blockID) + { + return false; + } + else + { + for (int var7 = -2; var7 <= 2; ++var7) + { + for (int var8 = -2; var8 <= 2; ++var8) + { + if (var1.isAirBlock(var3 + var7, var4 - 1, var5 + var8) && var1.isAirBlock(var3 + var7, var4 - 2, var5 + var8)) + { + return false; + } + } + } + + var1.setBlock(var3, var4, var5, Block.dirt.blockID); + var1.setBlock(var3, var4 + 1, var5, Block.wood.blockID); + var1.setBlock(var3, var4 + 2, var5, Block.wood.blockID); + var1.setBlock(var3, var4 + 3, var5, Block.wood.blockID); + var1.setBlock(var3, var4 + 4, var5, Block.wood.blockID); + var1.setBlock(var3, var4 + 5, var5, Block.wood.blockID); + var1.setBlock(var3, var4 + 6, var5, Block.wood.blockID); + var1.setBlock(var3, var4 + 7, var5, Block.wood.blockID); + var1.setBlock(var3 + 1, var4 + 7, var5, Block.leaves.blockID); + var1.setBlock(var3 - 1, var4 + 7, var5, Block.leaves.blockID); + var1.setBlock(var3, var4 + 7, var5 + 1, Block.leaves.blockID); + var1.setBlock(var3, var4 + 7, var5 - 1, Block.leaves.blockID); + + var1.setBlock(var3 + 1, var4 + 8, var5, Block.leaves.blockID); + var1.setBlock(var3 - 1, var4 + 8, var5, Block.leaves.blockID); + var1.setBlock(var3, var4 + 8, var5 + 1, Block.leaves.blockID); + var1.setBlock(var3, var4 + 8, var5 - 1, Block.leaves.blockID); + + var1.setBlock(var3 + 1, var4 + 8, var5 + 1, Block.leaves.blockID); + var1.setBlock(var3 + 1, var4 + 8, var5 - 1, Block.leaves.blockID); + var1.setBlock(var3 - 1, var4 + 8, var5 + 1, Block.leaves.blockID); + var1.setBlock(var3 - 1, var4 + 8, var5 - 1, Block.leaves.blockID); + var1.setBlock(var3, var4 + 8, var5, Block.leaves.blockID); + + var1.setBlock(var3, var4 + 9, var5, Block.leaves.blockID); + return true; + } + } +} diff --git a/src/minecraft/biomesoplenty/worldgen/WorldGenBrush2.java b/src/minecraft/biomesoplenty/worldgen/WorldGenBrush2.java new file mode 100644 index 000000000..fbef36fcc --- /dev/null +++ b/src/minecraft/biomesoplenty/worldgen/WorldGenBrush2.java @@ -0,0 +1,57 @@ +package biomesoplenty.worldgen; + +import java.util.Random; + +import net.minecraft.block.Block; +import net.minecraft.world.World; +import net.minecraft.world.gen.feature.WorldGenerator; + +public class WorldGenBrush2 extends WorldGenerator +{ + public boolean generate(World var1, Random var2, int var3, int var4, int var5) + { + while (var1.isAirBlock(var3, var4, var5) && var4 > 2) + { + --var4; + } + + int var6 = var1.getBlockId(var3, var4, var5); + + if (var6 != Block.grass.blockID) + { + return false; + } + else + { + for (int var7 = -2; var7 <= 2; ++var7) + { + for (int var8 = -2; var8 <= 2; ++var8) + { + if (var1.isAirBlock(var3 + var7, var4 - 1, var5 + var8) && var1.isAirBlock(var3 + var7, var4 - 2, var5 + var8)) + { + return false; + } + } + } + + var1.setBlock(var3, var4, var5, Block.dirt.blockID); + var1.setBlock(var3, var4 + 1, var5, Block.wood.blockID); + var1.setBlock(var3, var4 + 2, var5, Block.wood.blockID); + var1.setBlock(var3, var4 + 3, var5, Block.wood.blockID); + var1.setBlock(var3 + 1, var4 + 3, var5, Block.leaves.blockID); + var1.setBlock(var3 - 1, var4 + 3, var5, Block.leaves.blockID); + var1.setBlock(var3, var4 + 3, var5 + 1, Block.leaves.blockID); + var1.setBlock(var3, var4 + 3, var5 - 1, Block.leaves.blockID); + var1.setBlock(var3 + 1, var4 + 3, var5 + 1, Block.leaves.blockID); + var1.setBlock(var3 + 1, var4 + 3, var5 - 1, Block.leaves.blockID); + var1.setBlock(var3 - 1, var4 + 3, var5 + 1, Block.leaves.blockID); + var1.setBlock(var3 - 1, var4 + 3, var5 - 1, Block.leaves.blockID); + var1.setBlock(var3 + 1, var4 + 4, var5, Block.leaves.blockID); + var1.setBlock(var3 - 1, var4 + 4, var5, Block.leaves.blockID); + var1.setBlock(var3, var4 + 4, var5 + 1, Block.leaves.blockID); + var1.setBlock(var3, var4 + 4, var5 - 1, Block.leaves.blockID); + var1.setBlock(var3, var4 + 4, var5, Block.leaves.blockID); + return true; + } + } +} diff --git a/src/minecraft/biomesoplenty/worldgen/WorldGenDeadTree.java b/src/minecraft/biomesoplenty/worldgen/WorldGenDeadTree.java index 69fa14058..db9fdd7c1 100644 --- a/src/minecraft/biomesoplenty/worldgen/WorldGenDeadTree.java +++ b/src/minecraft/biomesoplenty/worldgen/WorldGenDeadTree.java @@ -27,9 +27,9 @@ public class WorldGenDeadTree extends WorldGenerator int[] basePos = new int[] {0, 0, 0}; int heightLimit = 0; int height; - double heightAttenuation = 0.618D; - double branchDensity = 1.0D; - double branchSlope = 0.381D; + double heightAttenuation = 0.45D; + double branchDensity = 0.25D; + double branchSlope = 0.2D; double scaleWidth = 1.0D; double leafDensity = 1.0D; diff --git a/src/minecraft/biomesoplenty/worldgen/WorldGenDeadTree3.java b/src/minecraft/biomesoplenty/worldgen/WorldGenDeadTree3.java index 2e84f32b5..9e8159de5 100644 --- a/src/minecraft/biomesoplenty/worldgen/WorldGenDeadTree3.java +++ b/src/minecraft/biomesoplenty/worldgen/WorldGenDeadTree3.java @@ -27,9 +27,9 @@ public class WorldGenDeadTree3 extends WorldGenerator int[] basePos = new int[] {0, 0, 0}; int heightLimit = 0; int height; - double heightAttenuation = 0.618D; - double branchDensity = 1.0D; - double branchSlope = 0.381D; + double heightAttenuation = 0.45D; + double branchDensity = 0.25D; + double branchSlope = 0.2D; double scaleWidth = 1.0D; double leafDensity = 1.0D; @@ -448,7 +448,7 @@ public class WorldGenDeadTree3 extends WorldGenerator int[] var2 = new int[] {this.basePos[0], this.basePos[1] + this.heightLimit - 1, this.basePos[2]}; int var3 = this.worldObj.getBlockId(this.basePos[0], this.basePos[1] - 1, this.basePos[2]); - if (var3 != 2 && var3 != 3 && var3 != Blocks.holyGrass.get().blockID && var3 != Blocks.ash.get().blockID && var3 != Blocks.redRock.get().blockID) + if (var3 != 2 && var3 != 3 && var3 != Blocks.holyGrass.get().blockID && var3 != Blocks.driedDirt.get().blockID && var3 != Blocks.redRock.get().blockID) { return false; }