Removed villages and rivers from certain biomes

src/main/java/biomesoplenty/api/biome/BOPBiome.java

@@ -98,7 +98,7 @@ public class BOPBiome extends BiomeGenBase implements IExtendedBiome
         
         this.canSpawnInBiome = conf.getBool("canSpawnInBiome", this.canSpawnInBiome);
         this.canGenerateVillages = conf.getBool("canGenerateVillages", this.canGenerateVillages);
-        this.canGenerateRivers = conf.getBool("canGenerateRivers", this.canGenerateVillages);
+        this.canGenerateRivers = conf.getBool("canGenerateRivers", this.canGenerateRivers);
         
         // Allow weights to be overridden
         IConfigObj confWeights = conf.getObject("weights");

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

@@ -56,6 +56,8 @@ public class BiomeGenBambooForest extends BOPBiome
         this.setColor(0xA3E053);
         this.setTemperatureRainfall(1.2F, 0.9F);
 
+        this.canGenerateVillages = false;
+        
         this.addWeight(BOPClimates.TROPICAL, 5);
         
         this.topBlock = Blocks.dirt.getDefaultState().withProperty(BlockDirt.VARIANT, BlockDirt.DirtType.PODZOL);

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

@@ -54,6 +54,9 @@ public class BiomeGenBayou extends BOPBiome
         this.skyColor = 0xACC4BC;
         this.seaFloorBlock = BOPBlocks.mud.getDefaultState();
         
+        this.canGenerateRivers = false;
+        this.canGenerateVillages = false;
+
         this.addWeight(BOPClimates.HOT_SWAMP, 10);
         
         this.spawnableWaterCreatureList.clear();

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

@@ -52,6 +52,8 @@ public class BiomeGenBog extends BOPBiome
         this.topBlock = BOPBlocks.grass.getDefaultState().withProperty(BlockBOPGrass.VARIANT, BlockBOPGrass.BOPGrassType.LOAMY);
         this.fillerBlock = BOPBlocks.dirt.getDefaultState().withProperty(BlockBOPDirt.VARIANT, BlockBOPDirt.BOPDirtType.LOAMY);
 
+        this.canGenerateRivers = false;
+        
         this.addWeight(BOPClimates.COLD_SWAMP, 7);
         
         this.spawnableCreatureList.clear();

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

@@ -36,6 +36,7 @@ public class BiomeGenBorealForest extends BOPBiome
         this.setTemperatureRainfall(0.5F, 0.6F);
         this.addWeight(BOPClimates.COOL_TEMPERATE, 10);
 
+        this.canGenerateVillages = false;
         
         this.spawnableCreatureList.add(new SpawnListEntry(EntityWolf.class, 5, 4, 4));
         

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

@@ -40,6 +40,8 @@ public class BiomeGenCherryBlossomGrove extends BOPBiome
         this.setColor(0xF88F8F);
         this.setTemperatureRainfall(0.6F, 0.8F);
         
+        this.canGenerateVillages = false;
+    
         this.addWeight(BOPClimates.COOL_TEMPERATE, 3);
         
         // flowers

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

@@ -38,6 +38,8 @@ public class BiomeGenConiferousForest extends BOPBiome
         this.setColor(0x528F60);
         this.setTemperatureRainfall(0.5F, 0.5F);
         
+        this.canGenerateVillages = false;
+    
         this.addWeight(BOPClimates.COOL_TEMPERATE, 10);
         
         this.topBlock = BOPBlocks.grass.getDefaultState().withProperty(BlockBOPGrass.VARIANT, BlockBOPGrass.BOPGrassType.LOAMY);

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

@@ -28,6 +28,7 @@ public class BiomeGenCrag extends BOPBiome
 
         this.canSpawnInBiome = false;
         this.canGenerateVillages = false;
+        this.canGenerateRivers = false;
         
         this.addWeight(BOPClimates.WET_TEMPERATE, 3);
 

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

@@ -41,6 +41,8 @@ public class BiomeGenDeadForest extends BOPBiome
         this.topBlock = BOPBlocks.grass.getDefaultState().withProperty(BlockBOPGrass.VARIANT, BlockBOPGrass.BOPGrassType.LOAMY);
         this.fillerBlock = BOPBlocks.dirt.getDefaultState().withProperty(BlockBOPDirt.VARIANT, BlockBOPDirt.BOPDirtType.LOAMY);
         
+        this.canGenerateVillages = false;
+        
         this.setColor(0xBCA165);
         this.setTemperatureRainfall(0.4F, 0.3F);
         

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

@@ -52,6 +52,9 @@ public class BiomeGenDeadSwamp extends BOPBiome
         this.topBlock = BOPBlocks.grass.getDefaultState().withProperty(BlockBOPGrass.VARIANT, BlockBOPGrass.BOPGrassType.LOAMY);
         this.fillerBlock = BOPBlocks.dirt.getDefaultState().withProperty(BlockBOPDirt.VARIANT, BlockBOPDirt.BOPDirtType.LOAMY);
         
+        this.canGenerateRivers = false;
+        this.canGenerateVillages = false;
+        
         this.addWeight(BOPClimates.COLD_SWAMP, 5);
         
         this.spawnableCreatureList.clear();

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

@@ -31,6 +31,8 @@ public class BiomeGenDeciduousForest extends BOPBiome
         this.setTemperatureRainfall(0.6F, 0.8F);
         this.addWeight(BOPClimates.WARM_TEMPERATE, 10);  
         
+        this.canGenerateVillages = false;
+         
         // trees & logs
         GeneratorWeighted treeGenerator = new GeneratorWeighted(18);
         this.addGenerator("trees", GeneratorStage.TREE, treeGenerator);

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

@@ -45,6 +45,8 @@ public class BiomeGenDenseForest extends BOPBiome
         this.setColor(8246897);
         this.setTemperatureRainfall(0.7F, 0.7F);
         
+        this.canGenerateVillages = false;
+        
         this.addWeight(BOPClimates.WARM_TEMPERATE, 7);
         
         this.topBlock = Blocks.grass.getDefaultState();

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

@@ -36,6 +36,8 @@ public class BiomeGenEucalyptusForest extends BOPBiome
         this.setColor(0x9DCC70);
         this.setTemperatureRainfall(0.9F, 0.1F);
         
+        this.canGenerateVillages = false;
+        
         this.addWeight(BOPClimates.SAVANNA, 7);
                             
         // trees

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

@@ -56,6 +56,8 @@ public class BiomeGenFen extends BOPBiome
         this.setColor(0xBAC481);
         this.setTemperatureRainfall(0.4F, 0.4F);
         
+        this.canGenerateRivers = false;
+        
         this.addWeight(BOPClimates.WET_TEMPERATE, 10);
 
         // TODO: this.theBiomeDecorator.bopFeatures.waterSpringsPerChunk = 99;

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

@@ -33,6 +33,8 @@ public class BiomeGenFlowerField extends BOPBiome
         this.setColor(4044093);
         this.setTemperatureRainfall(0.6F, 0.7F);
         
+        this.canGenerateVillages = false;
+
         this.addWeight(BOPClimates.COOL_TEMPERATE, 3);
         
         // flowers

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

@@ -50,6 +50,8 @@ public class BiomeGenFungiForest extends BOPBiome
         this.waterColorMultiplier = 0x00FF2E;
         this.setTemperatureRainfall(0.5F, 0.5F);
         
+        this.canGenerateVillages = false;
+
         this.addWeight(BOPClimates.WARM_TEMPERATE, 3);
         
         this.spawnableCreatureList.clear();

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

@@ -43,6 +43,8 @@ public class BiomeGenGarden extends BOPBiome
         this.setTemperatureRainfall(0.7F, 0.8F);
         this.topBlock = BOPBlocks.grass.getDefaultState().withProperty(BlockBOPGrass.VARIANT, BlockBOPGrass.BOPGrassType.DAISY);
 
+        this.canGenerateVillages = false;
+        
         this.addWeight(BOPClimates.COOL_TEMPERATE, 1);
         
         this.spawnableCreatureList.clear();

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

@@ -27,6 +27,8 @@ public class BiomeGenGlacier extends BiomeGenArctic
         
         this.setColor(0xB0BBD9);
         
+        this.canGenerateVillages = false;
+        
         this.topBlock = BOPBlocks.hard_ice.getDefaultState();
         this.fillerBlock = BOPBlocks.hard_ice.getDefaultState();
 

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

@@ -36,6 +36,8 @@ public class BiomeGenLavenderFields extends BOPBiome
         this.setColor(11035852);
         this.setTemperatureRainfall(0.6F, 0.7F);
         
+        this.canGenerateVillages = false;
+    
         this.addWeight(BOPClimates.WARM_TEMPERATE, 3);
         
         // flowers

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

@@ -37,6 +37,7 @@ public class BiomeGenMapleWoods extends BOPBiome
         this.setTemperatureRainfall(0.2F, 0.8F);
         this.addWeight(BOPClimates.COOL_TEMPERATE, 10);
 
+        this.canGenerateVillages = false;
         
         this.spawnableCreatureList.add(new SpawnListEntry(EntityWolf.class, 5, 4, 4));
         

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

@@ -49,6 +49,9 @@ public class BiomeGenMarsh extends BOPBiome
         this.setColor(0x66A06E);
         this.setTemperatureRainfall(0.5F, 0.9F);
         
+        this.canGenerateRivers = false;
+        this.canGenerateVillages = false;
+        
         this.addWeight(BOPClimates.COLD_SWAMP, 7);
         
         this.spawnableCreatureList.clear(); // none of your regular farmyard critters here

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

@@ -43,6 +43,8 @@ public class BiomeGenMoor extends BOPBiome
         this.topBlock = BOPBlocks.grass.getDefaultState().withProperty(BlockBOPGrass.VARIANT, BlockBOPGrass.BOPGrassType.LOAMY);
         this.fillerBlock = BOPBlocks.dirt.getDefaultState().withProperty(BlockBOPDirt.VARIANT, BlockBOPDirt.BOPDirtType.LOAMY);
         
+        this.canGenerateVillages = false;
+        
         this.addWeight(BOPClimates.COLD_SWAMP, 7);
         
         this.spawnableCreatureList.clear();

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

@@ -74,11 +74,14 @@ public class BiomeGenMountain extends BOPBiome
                 break;
         }
         
+        this.canGenerateVillages = false;
         this.setColor(0x80A355);
         this.setTemperatureRainfall(0.5F, 0.1F);
         
         if (type == MountainType.PEAKS)
         {
+            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);
             

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

@@ -34,6 +34,7 @@ public class BiomeGenOriginValley extends BOPBiome
         this.skyColor = 8441086;
         
         this.canGenerateVillages = false;
+        this.canGenerateRivers = false;
         
         this.addWeight(BOPClimates.WARM_TEMPERATE, 1);
         

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

@@ -47,6 +47,9 @@ public class BiomeGenQuagmire extends BOPBiome
         this.skyColor = 0xBDC4BE;
         this.seaFloorBlock = BOPBlocks.mud.getDefaultState();
 
+        this.canGenerateRivers = false;
+        this.canGenerateVillages = false;
+        
         this.addWeight(BOPClimates.COLD_SWAMP, 5);
         
         this.spawnableWaterCreatureList.clear();

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

@@ -40,6 +40,8 @@ public class BiomeGenRainforest extends BOPBiome
         this.setTemperatureRainfall(1.0F, 1.0F);
         this.addWeight(BOPClimates.TROPICAL, 10);
         
+        this.canGenerateVillages = false;
+        
         this.spawnableCreatureList.add(new SpawnListEntry(EntityOcelot.class, 2, 1, 1));
         
         // trees & logs

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

@@ -32,6 +32,9 @@ public class BiomeGenSacredSprings extends BOPBiome
         this.setColor(39259);
         this.setTemperatureRainfall(1.2F, 0.9F);
         
+        this.canGenerateRivers = false;
+        this.canGenerateVillages = false;
+        
         this.addWeight(BOPClimates.WARM_TEMPERATE, 3);
         
         // trees

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

@@ -34,6 +34,7 @@ public class BiomeGenSeasonalForest extends BOPBiome
         this.setTemperatureRainfall(0.5F, 0.8F);
         this.addWeight(BOPClimates.COOL_TEMPERATE, 7);
 
+        this.canGenerateVillages = false;
         
         this.spawnableCreatureList.add(new SpawnListEntry(EntityWolf.class, 5, 4, 4));
 

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

@@ -39,6 +39,8 @@ public class BiomeGenSnowyConiferousForest extends BOPBiome
         this.setEnableSnow();
         this.setTemperatureRainfall(0.0F, 0.5F);
     
+        this.canGenerateVillages = false;
+        
         this.addWeight(BOPClimates.TUNDRA, 10);
         
         this.topBlock = BOPBlocks.grass.getDefaultState().withProperty(BlockBOPGrass.VARIANT, BlockBOPGrass.BOPGrassType.LOAMY);

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

@@ -40,6 +40,8 @@ public class BiomeGenThicket extends BOPBiome
         this.setColor(7248193);
         this.setTemperatureRainfall(0.6F, 0.2F);
         
+        this.canGenerateVillages = false;
+        
         this.addWeight(BOPClimates.DRY_TEMPERATE, 5);
         
         // trees

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

@@ -57,6 +57,9 @@ public class BiomeGenWetland extends BOPBiome
         this.waterColorMultiplier = 0x636084;
         this.seaFloorBlock = BOPBlocks.mud.getDefaultState();
 
+        this.canGenerateRivers = false;
+        this.canGenerateVillages = false;
+        
         this.addWeight(BOPClimates.WET_TEMPERATE, 10);
         
         this.spawnableWaterCreatureList.clear();