Tweaked biome climates

src/main/java/biomesoplenty/common/biome/overworld/BiomeGenBorealForest.java

@@ -35,6 +35,7 @@ public class BiomeGenBorealForest extends BOPBiome
         this.setColor(0x9FB771);
         this.setTemperatureRainfall(0.5F, 0.6F);
         this.addWeight(BOPClimates.COOL_TEMPERATE, 10);
+        this.addWeight(BOPClimates.BOREAL, 3);
 
         this.canGenerateVillages = false;
         

src/main/java/biomesoplenty/common/biome/overworld/BiomeGenBrushland.java

@@ -36,7 +36,7 @@ public class BiomeGenBrushland extends BOPBiome
         this.fillerBlock = BOPBlocks.dirt.getDefaultState().withProperty(BlockBOPDirt.VARIANT, BlockBOPDirt.BOPDirtType.SANDY);
         this.setColor(0xC9C17F);
         this.setTemperatureRainfall(1.2F, 0.1F);
-        this.addWeight(BOPClimates.MEDITERANEAN, 10);
+        this.addWeight(BOPClimates.SAVANNA, 10);
         
         // quicksand
         this.addGenerator("quicksand_patches", GeneratorStage.SAND, (new GeneratorSplotches.Builder()).amountPerChunk(0.6F).splotchSize(16).with(BOPBlocks.sand.getDefaultState().withProperty(BlockBOPSand.VARIANT, BlockBOPSand.SandType.QUICKSAND)).splotchSize(20).scatterYMethod(ScatterYMethod.AT_SURFACE).create());

src/main/java/biomesoplenty/common/biome/overworld/BiomeGenCanyon.java

@@ -78,13 +78,13 @@ public class BiomeGenCanyon extends BOPBiome
         grassGenerator.add("tallgrass", 2, (new GeneratorGrass.Builder()).with(BlockTallGrass.EnumType.GRASS).create());
         
         // gem
-        this.addGenerator("ruby", GeneratorStage.SAND, (new GeneratorOreSingle.Builder()).amountPerChunk(12).with(BOPGems.RUBY).create());
+        this.addGenerator("emeralds", GeneratorStage.SAND, (new GeneratorOreSingle.Builder()).amountPerChunk(12).with(Blocks.emerald_ore.getDefaultState()).create());
     }
     
     @Override
     public void applySettings(BOPWorldSettings settings)
     {
-        if (!settings.generateBopGems) {this.removeGenerator("ruby");}
+        if (!settings.generateBopGems) {this.removeGenerator("emeralds");}
     }
 
     @Override

src/main/java/biomesoplenty/common/biome/overworld/BiomeGenChaparral.java

@@ -39,7 +39,7 @@ public class BiomeGenChaparral extends BOPBiome
         this.setColor(0xC0D85D);
         this.setTemperatureRainfall(0.8F, 0.6F);
         
-        this.addWeight(BOPClimates.WARM_TEMPERATE, 10);
+        this.addWeight(BOPClimates.MEDITERANEAN, 10);
         
         this.spawnableCreatureList.clear(); // none of your regular farmyard critters here
         this.spawnableCreatureList.add(new SpawnListEntry(EntityHorse.class, 1, 2, 6));

src/main/java/biomesoplenty/common/biome/overworld/BiomeGenConiferousForest.java

@@ -40,7 +40,8 @@ public class BiomeGenConiferousForest extends BOPBiome
         
         this.canGenerateVillages = false;
     
-        this.addWeight(BOPClimates.COOL_TEMPERATE, 10);
+        this.addWeight(BOPClimates.COOL_TEMPERATE, 7);
+        this.addWeight(BOPClimates.BOREAL, 7);
         
         this.topBlock = BOPBlocks.grass.getDefaultState().withProperty(BlockBOPGrass.VARIANT, BlockBOPGrass.BOPGrassType.LOAMY);
         this.fillerBlock = BOPBlocks.dirt.getDefaultState().withProperty(BlockBOPDirt.VARIANT, BlockBOPDirt.BOPDirtType.LOAMY);

src/main/java/biomesoplenty/common/biome/overworld/BiomeGenCrag.java

@@ -24,13 +24,13 @@ public class BiomeGenCrag extends BOPBiome
         this.terrainSettings.avgHeight(80).heightVariation(80, 200).minHeight(40).sidewaysNoise(0.7F);
         
         this.setColor(5209457);
-        this.setTemperatureRainfall(1.0F, 0.0F);
+        this.setTemperatureRainfall(0.5F, 0.0F);
 
         this.canSpawnInBiome = false;
         this.canGenerateVillages = false;
         this.canGenerateRivers = false;
         
-        this.addWeight(BOPClimates.WET_TEMPERATE, 3);
+        this.addWeight(BOPClimates.TUNDRA, 3);
 
         this.spawnableCreatureList.clear();
         this.spawnableWaterCreatureList.clear();

src/main/java/biomesoplenty/common/biome/overworld/BiomeGenDeadForest.java

@@ -47,6 +47,7 @@ public class BiomeGenDeadForest extends BOPBiome
         this.setTemperatureRainfall(0.4F, 0.3F);
         
         this.addWeight(BOPClimates.COOL_TEMPERATE, 5);
+        this.addWeight(BOPClimates.BOREAL, 1);
         
         // gravel
         this.addGenerator("gravel", GeneratorStage.SAND_PASS2, (new GeneratorWaterside.Builder()).amountPerChunk(4).maxRadius(7).with(Blocks.gravel.getDefaultState()).create());

src/main/java/biomesoplenty/common/biome/overworld/BiomeGenDenseForest.java

@@ -47,7 +47,7 @@ public class BiomeGenDenseForest extends BOPBiome
         
         this.canGenerateVillages = false;
         
-        this.addWeight(BOPClimates.WARM_TEMPERATE, 7);
+        this.addWeight(BOPClimates.WARM_TEMPERATE, 3);
         
         this.topBlock = Blocks.grass.getDefaultState();
         this.fillerBlock = Blocks.dirt.getDefaultState();

src/main/java/biomesoplenty/common/biome/overworld/BiomeGenEucalyptusForest.java

@@ -38,7 +38,8 @@ public class BiomeGenEucalyptusForest extends BOPBiome
         
         this.canGenerateVillages = false;
         
-        this.addWeight(BOPClimates.SAVANNA, 7);
+        this.addWeight(BOPClimates.WET_TEMPERATE, 3);
+        this.addWeight(BOPClimates.TROPICAL, 5);
                             
         // trees
         GeneratorWeighted treeGenerator = new GeneratorWeighted(5);
@@ -78,13 +79,13 @@ public class BiomeGenEucalyptusForest extends BOPBiome
     @Override
     public int getGrassColorAtPos(BlockPos pos)
     {
-        return 0x9DCC70;
+        return 0x84D168;
     }
     
     @Override
     public int getFoliageColorAtPos(BlockPos pos)
     {
-        return 0x71CE52;
+        return 0x67CE52;
     }
     
     /*

src/main/java/biomesoplenty/common/biome/overworld/BiomeGenFen.java

@@ -58,7 +58,7 @@ public class BiomeGenFen extends BOPBiome
         
         this.canGenerateRivers = false;
         
-        this.addWeight(BOPClimates.WET_TEMPERATE, 10);
+        this.addWeight(BOPClimates.COLD_SWAMP, 7);
 
         // TODO: this.theBiomeDecorator.bopFeatures.waterSpringsPerChunk = 99;
         

src/main/java/biomesoplenty/common/biome/overworld/BiomeGenFlowerField.java

@@ -35,7 +35,7 @@ public class BiomeGenFlowerField extends BOPBiome
         
         this.canGenerateVillages = false;
 
-        this.addWeight(BOPClimates.COOL_TEMPERATE, 3);
+        this.addWeight(BOPClimates.WARM_TEMPERATE, 3);
         
         // flowers
         GeneratorWeighted flowerGenerator = new GeneratorWeighted(99);

src/main/java/biomesoplenty/common/biome/overworld/BiomeGenFrostForest.java

@@ -43,7 +43,7 @@ public class BiomeGenFrostForest extends BOPBiome
         this.setEnableSnow();
         this.setTemperatureRainfall(0.0F, 0.5F);
 
-        this.addWeight(BOPClimates.TUNDRA, 10);
+        this.addWeight(BOPClimates.TUNDRA, 7);
          
         // trees
         GeneratorWeighted treeGenerator = new GeneratorWeighted(3);

src/main/java/biomesoplenty/common/biome/overworld/BiomeGenFungiForest.java

@@ -52,7 +52,7 @@ public class BiomeGenFungiForest extends BOPBiome
         
         this.canGenerateVillages = false;
 
-        this.addWeight(BOPClimates.WARM_TEMPERATE, 3);
+        this.addWeight(BOPClimates.WET_TEMPERATE, 2);
         
         this.spawnableCreatureList.clear();
         this.spawnableWaterCreatureList.clear();

src/main/java/biomesoplenty/common/biome/overworld/BiomeGenGrassland.java

@@ -43,7 +43,7 @@ public class BiomeGenGrassland extends BOPBiome {
         this.setTemperatureRainfall(0.6F, 0.7F);
 
         this.addWeight(BOPClimates.COOL_TEMPERATE, 7);
-        this.addWeight(BOPClimates.DRY_TEMPERATE, 7);
+        this.addWeight(BOPClimates.WET_TEMPERATE, 7);
         
         this.spawnableCreatureList.add(new SpawnListEntry(EntityHorse.class, 5, 2, 6));
         

src/main/java/biomesoplenty/common/biome/overworld/BiomeGenGrove.java

@@ -38,7 +38,8 @@ public class BiomeGenGrove extends BOPBiome
         this.setColor(0x517F51);
         this.setTemperatureRainfall(0.7F, 0.8F);
         
-        this.addWeight(BOPClimates.WET_TEMPERATE, 10);
+        this.addWeight(BOPClimates.WET_TEMPERATE, 7);
+        this.addWeight(BOPClimates.COOL_TEMPERATE, 7);
                  
         // other plants
         this.addGenerator("sprouts", GeneratorStage.FLOWERS,(new GeneratorFlora.Builder()).amountPerChunk(0.1F).with(BOPPlants.SPROUT).create());

src/main/java/biomesoplenty/common/biome/overworld/BiomeGenHeathland.java

@@ -49,7 +49,7 @@ public class BiomeGenHeathland extends BOPBiome
         this.setColor(0xCEC577);
         this.setTemperatureRainfall(0.8F, 0.2F);
         
-        this.addWeight(BOPClimates.WARM_TEMPERATE, 10);
+        this.addWeight(BOPClimates.MEDITERANEAN, 10);
         
         this.spawnableCreatureList.clear(); // none of your regular farmyard critters here
         // TODO: why is there SO many horses?

src/main/java/biomesoplenty/common/biome/overworld/BiomeGenLavenderFields.java

@@ -38,7 +38,7 @@ public class BiomeGenLavenderFields extends BOPBiome
         
         this.canGenerateVillages = false;
     
-        this.addWeight(BOPClimates.WARM_TEMPERATE, 3);
+        this.addWeight(BOPClimates.MEDITERANEAN, 3);
         
         // flowers
         this.addGenerator("lavender", GeneratorStage.FLOWERS, (new GeneratorFlora.Builder()).amountPerChunk(99).with(BOPFlowers.LAVENDER).create());

src/main/java/biomesoplenty/common/biome/overworld/BiomeGenMapleWoods.java

@@ -35,7 +35,7 @@ public class BiomeGenMapleWoods extends BOPBiome
 
         this.setColor(0x6AA369);
         this.setTemperatureRainfall(0.2F, 0.8F);
-        this.addWeight(BOPClimates.COOL_TEMPERATE, 10);
+        this.addWeight(BOPClimates.BOREAL, 10);
 
         this.canGenerateVillages = false;
         

src/main/java/biomesoplenty/common/biome/overworld/BiomeGenMarsh.java

@@ -52,7 +52,7 @@ public class BiomeGenMarsh extends BOPBiome
         this.canGenerateRivers = false;
         this.canGenerateVillages = false;
         
-        this.addWeight(BOPClimates.COLD_SWAMP, 7);
+        this.addWeight(BOPClimates.WET_TEMPERATE, 7);
         
         this.spawnableCreatureList.clear(); // none of your regular farmyard critters here
         this.spawnableWaterCreatureList.clear();

src/main/java/biomesoplenty/common/biome/overworld/BiomeGenMountain.java

@@ -83,7 +83,8 @@ public class BiomeGenMountain extends BOPBiome
             this.canGenerateVillages = false;
             
             // peaks are created in the biome gen layer, foothills don't have a weight - they only appear later around the peaks (in the biome edge layer)
-            this.addWeight(BOPClimates.DRY_TEMPERATE, 10);
+            this.addWeight(BOPClimates.DRY_TEMPERATE, 7);
+            this.addWeight(BOPClimates.COOL_TEMPERATE, 7);
             
             // only sheep and wolves on the peaks
             this.spawnableCreatureList.clear();

src/main/java/biomesoplenty/common/biome/overworld/BiomeGenPrairie.java

@@ -36,7 +36,8 @@ public class BiomeGenPrairie extends BOPBiome
         this.setColor(0xC8E580);
         this.setTemperatureRainfall(0.8F, 0.3F);
         
-        this.addWeight(BOPClimates.WARM_TEMPERATE, 10);
+        this.addWeight(BOPClimates.WARM_TEMPERATE, 7);
+        this.addWeight(BOPClimates.DRY_TEMPERATE, 7);
         
         this.spawnableCreatureList.add(new SpawnListEntry(EntityHorse.class, 1, 2, 6));
         

src/main/java/biomesoplenty/common/biome/overworld/BiomeGenRainforest.java

@@ -38,7 +38,7 @@ public class BiomeGenRainforest extends BOPBiome
 
         this.setColor(0x14E26F);
         this.setTemperatureRainfall(1.0F, 1.0F);
-        this.addWeight(BOPClimates.TROPICAL, 10);
+        this.addWeight(BOPClimates.TROPICAL, 7);
         
         this.canGenerateVillages = false;
         

src/main/java/biomesoplenty/common/biome/overworld/BiomeGenSacredSprings.java

@@ -35,7 +35,7 @@ public class BiomeGenSacredSprings extends BOPBiome
         this.canGenerateRivers = false;
         this.canGenerateVillages = false;
         
-        this.addWeight(BOPClimates.WARM_TEMPERATE, 3);
+        this.addWeight(BOPClimates.TROPICAL, 2);
         
         // trees
         this.addGenerator("sacred_oak_trees", GeneratorStage.POST, (new GeneratorBigTree.Builder()).amountPerChunk(0.2F).log(BOPWoods.SACRED_OAK).leaves(BOPTrees.SACRED_OAK).minHeight(35).maxHeight(40).trunkWidth(2).foliageDensity(2.0D).create());

src/main/java/biomesoplenty/common/biome/overworld/BiomeGenShrubland.java

@@ -44,6 +44,7 @@ public class BiomeGenShrubland extends BOPBiome
         this.setTemperatureRainfall(0.6F, 0.05F);
         
         this.addWeight(BOPClimates.DRY_TEMPERATE, 10);
+        this.addWeight(BOPClimates.MEDITERANEAN, 5);
         
         this.spawnableCreatureList.add(new SpawnListEntry(EntityHorse.class, 5, 2, 6));
         

src/main/java/biomesoplenty/common/biome/overworld/BiomeGenSnowyConiferousForest.java

@@ -41,7 +41,7 @@ public class BiomeGenSnowyConiferousForest extends BOPBiome
     
         this.canGenerateVillages = false;
         
-        this.addWeight(BOPClimates.TUNDRA, 10);
+        this.addWeight(BOPClimates.TUNDRA, 7);
         
         this.topBlock = BOPBlocks.grass.getDefaultState().withProperty(BlockBOPGrass.VARIANT, BlockBOPGrass.BOPGrassType.LOAMY);
         this.fillerBlock = BOPBlocks.dirt.getDefaultState().withProperty(BlockBOPDirt.VARIANT, BlockBOPDirt.BOPDirtType.LOAMY);

src/main/java/biomesoplenty/common/biome/overworld/BiomeGenThicket.java

@@ -42,7 +42,8 @@ public class BiomeGenThicket extends BOPBiome
         
         this.canGenerateVillages = false;
         
-        this.addWeight(BOPClimates.DRY_TEMPERATE, 5);
+        this.addWeight(BOPClimates.DRY_TEMPERATE, 3);
+        this.addWeight(BOPClimates.COOL_TEMPERATE, 3);
         
         // trees
         GeneratorWeighted treeGenerator = new GeneratorWeighted(17);

src/main/java/biomesoplenty/common/biome/overworld/BiomeGenWasteland.java

@@ -65,9 +65,9 @@ public class BiomeGenWasteland extends BOPBiome
         this.spawnableWaterCreatureList.clear();
         
         // trees
-        GeneratorWeighted treeGenerator = new GeneratorWeighted(2.0F);
+        GeneratorWeighted treeGenerator = new GeneratorWeighted(0.5F);
         this.addGenerator("trees", GeneratorStage.TREE, treeGenerator);
-        treeGenerator.add("dead_tree", 1, (new GeneratorBigTree.Builder()).amountPerChunk(1.0F).minHeight(5).maxHeight(12).foliageHeight(0).foliageDensity(0.5D).log(BOPWoods.DEAD).leaves(Blocks.air.getDefaultState()).create());
+        treeGenerator.add("dead_tree", 1, (new GeneratorBigTree.Builder()).amountPerChunk(0.5F).minHeight(5).maxHeight(12).foliageHeight(0).foliageDensity(0.5D).log(BOPWoods.DEAD).leaves(Blocks.air.getDefaultState()).create());
         
         // grasses
         GeneratorWeighted grassGenerator = new GeneratorWeighted(0.2F);
@@ -82,7 +82,7 @@ public class BiomeGenWasteland extends BOPBiome
         this.addGenerator("poison_lakes", GeneratorStage.SAND, (new GeneratorLakes.Builder()).amountPerChunk(0.2F).waterLakeForBiome(this).liquid(BOPBlocks.poison).frozenLiquid((IBlockState)null).create());
         
         // spikes
-        this.addGenerator("spikes", GeneratorStage.PRE, (new GeneratorSpike.Builder()).amountPerChunk(0.5F).create());
+        this.addGenerator("spikes", GeneratorStage.PRE, (new GeneratorSpike.Builder()).amountPerChunk(0.6F).create());
         
         // gem
         this.addGenerator("malachite", GeneratorStage.SAND, (new GeneratorOreSingle.Builder()).amountPerChunk(12).with(BOPGems.MALACHITE).create());

src/main/java/biomesoplenty/common/biome/overworld/BiomeGenWetland.java

@@ -60,7 +60,7 @@ public class BiomeGenWetland extends BOPBiome
         this.canGenerateRivers = false;
         this.canGenerateVillages = false;
         
-        this.addWeight(BOPClimates.WET_TEMPERATE, 10);
+        this.addWeight(BOPClimates.WET_TEMPERATE, 7);
         
         this.spawnableWaterCreatureList.clear();
         this.spawnableMonsterList.add(new SpawnListEntry(EntitySlime.class, 10, 1, 3));

src/main/java/biomesoplenty/common/biome/overworld/BiomeGenWoodland.java

@@ -42,8 +42,9 @@ public class BiomeGenWoodland extends BOPBiome
         this.terrainSettings.avgHeight(64).heightVariation(6, 25);
         
         this.setColor(0x84A92D);
-        this.setTemperatureRainfall(0.6F, 0.4F);
+        this.setTemperatureRainfall(0.6F, 0.3F);
         
+        this.addWeight(BOPClimates.DRY_TEMPERATE, 5);
         this.addWeight(BOPClimates.COOL_TEMPERATE, 10);
         
         // trees

src/main/java/biomesoplenty/common/biome/overworld/BiomeGenXericShrubland.java

@@ -45,6 +45,7 @@ public class BiomeGenXericShrubland extends BOPBiome
         this.canSpawnInBiome = false;
         
         this.addWeight(BOPClimates.HOT_DESERT, 3);
+        this.addWeight(BOPClimates.SAVANNA, 1);
         
         this.spawnableCreatureList.clear();
         

src/main/java/biomesoplenty/common/enums/BOPClimates.java

@@ -79,17 +79,17 @@ public enum BOPClimates {
         
         BOPClimates.ICE_CAP.addLandBiome(5,BiomeGenBase.icePlains);
         BOPClimates.FROZEN_DESERT.addLandBiome(5, BiomeGenBase.icePlains);
-        BOPClimates.TUNDRA.addLandBiome(5, BiomeGenBase.icePlains).addLandBiome(5, BiomeGenBase.coldTaiga);
-        BOPClimates.COLD_DESERT.addLandBiome(10, BiomeGenBase.extremeHills);
-        BOPClimates.BOREAL.addLandBiome(30, BiomeGenBase.coldTaiga);
-        BOPClimates.COLD_SWAMP.addLandBiome(1, BiomeGenBase.swampland);
-        BOPClimates.WET_TEMPERATE.addLandBiome(10, BiomeGenBase.forest).addLandBiome(10, BiomeGenBase.birchForest);
-        BOPClimates.DRY_TEMPERATE.addLandBiome(10, BiomeGenBase.extremeHills).addLandBiome(10, BiomeGenBase.plains);
-        BOPClimates.COOL_TEMPERATE.addLandBiome(20, BiomeGenBase.plains).addLandBiome(10, BiomeGenBase.taiga).addLandBiome(10, BiomeGenBase.forest).addLandBiome(10, BiomeGenBase.birchForest);
-        BOPClimates.WARM_TEMPERATE.addLandBiome(20, BiomeGenBase.plains).addLandBiome(10, BiomeGenBase.roofedForest).addLandBiome(10, BiomeGenBase.forest).addLandBiome(10, BiomeGenBase.birchForest);
-        BOPClimates.HOT_SWAMP.addLandBiome(10, BiomeGenBase.swampland);
+        BOPClimates.TUNDRA.addLandBiome(5, BiomeGenBase.icePlains).addLandBiome(10, BiomeGenBase.coldTaiga);
+        BOPClimates.COLD_DESERT.addLandBiome(5, BiomeGenBase.extremeHills);
+        BOPClimates.BOREAL.addLandBiome(10, BiomeGenBase.coldTaiga).addLandBiome(10, BiomeGenBase.extremeHills).addLandBiome(10, BiomeGenBase.taiga);
+        BOPClimates.COLD_SWAMP.addLandBiome(3, BiomeGenBase.swampland);
+        BOPClimates.WET_TEMPERATE.addLandBiome(10, BiomeGenBase.forest).addLandBiome(20, BiomeGenBase.roofedForest);
+        BOPClimates.DRY_TEMPERATE.addLandBiome(10, BiomeGenBase.plains);
+        BOPClimates.COOL_TEMPERATE.addLandBiome(5, BiomeGenBase.taiga).addLandBiome(10, BiomeGenBase.forest).addLandBiome(20, BiomeGenBase.birchForest);
+        BOPClimates.WARM_TEMPERATE.addLandBiome(20, BiomeGenBase.plains).addLandBiome(5, BiomeGenBase.forest).addLandBiome(5, BiomeGenBase.birchForest);
+        BOPClimates.HOT_SWAMP.addLandBiome(7, BiomeGenBase.swampland);
         BOPClimates.TROPICAL.addLandBiome(10, BiomeGenBase.jungle);
-        BOPClimates.MEDITERANEAN.addLandBiome(5, BiomeGenBase.plains).addLandBiome(5, BiomeGenBase.mesaPlateau);
+        BOPClimates.MEDITERANEAN.addLandBiome(5, BiomeGenBase.plains);
         BOPClimates.SAVANNA.addLandBiome(20, BiomeGenBase.savanna).addLandBiome(5, BiomeGenBase.mesaPlateau);
         BOPClimates.HOT_DESERT.addLandBiome(30, BiomeGenBase.desert);
     }