Merge branch 'master' of https://github.com/BiomesOPlenty/BiomesOPlenty

src/main/java/biomesoplenty/common/biomes/BiomeGenBorealForest.java

@@ -52,7 +52,7 @@ public class BiomeGenBorealForest extends BOPBiome
     {
         HashMap<WorldGenerator, Double> flowerMap = new HashMap();
         
-        flowerMap.put(new WorldGenBOPDoubleFlora(Blocks.double_plant, Blocks.double_plant, 4, 10, 5), 1D);
+        flowerMap.put(new WorldGenBOPDoubleFlora(Blocks.double_plant, Blocks.double_plant, 4, 10, 5), 10D);
         
         return flowerMap;
     }

src/main/java/biomesoplenty/common/biomes/BiomeGenBrushland.java

@@ -49,7 +49,7 @@ public class BiomeGenBrushland extends BOPBiome
     {
         HashMap<WorldGenerator, Double> flowerMap = new HashMap();
         
-        flowerMap.put(new WorldGenBOPFlora(Blocks.red_flower, 2), 0.5D);
+        flowerMap.put(new WorldGenBOPFlora(Blocks.red_flower, 2), 5D);
         
         return flowerMap;
     }

src/main/java/biomesoplenty/common/biomes/BiomeGenChaparral.java

@@ -61,8 +61,8 @@ public class BiomeGenChaparral extends BOPBiome
     {
         HashMap<WorldGenerator, Double> flowerMap = new HashMap();
         
-        flowerMap.put(new WorldGenBOPDoubleFlora(Blocks.double_plant, Blocks.double_plant, 4, 10, 5), 1D);
-        flowerMap.put(new WorldGenBOPDoubleFlora(Blocks.double_plant, Blocks.double_plant, 1, 7, 5), 0.5D);
+        flowerMap.put(new WorldGenBOPDoubleFlora(Blocks.double_plant, Blocks.double_plant, 4, 10, 5), 8D);
+        flowerMap.put(new WorldGenBOPDoubleFlora(Blocks.double_plant, Blocks.double_plant, 1, 7, 5), 4D);
         
         return flowerMap;
     }

src/main/java/biomesoplenty/common/biomes/BiomeGenCherryBlossomGrove.java

@@ -51,10 +51,10 @@ public class BiomeGenCherryBlossomGrove extends BOPBiome
     {
     	HashMap<WorldGenerator, Double> flowerMap = new HashMap();
     	
-    	flowerMap.put(new WorldGenBOPFlora(BOPBlockHelper.get("flowers"), 6), 3D);
-    	flowerMap.put(new WorldGenBOPFlora(BOPBlockHelper.get("flowers"), 9), 6D);
-    	flowerMap.put(new WorldGenBOPFlora(BOPBlockHelper.get("flowers"), 0), 5D);
-    	flowerMap.put(new WorldGenBOPDoubleFlora(Blocks.double_plant, Blocks.double_plant, 1, 7, 5), 1D);
+    	flowerMap.put(new WorldGenBOPFlora(BOPBlockHelper.get("flowers"), 6), 12D);
+    	flowerMap.put(new WorldGenBOPFlora(BOPBlockHelper.get("flowers"), 9), 8D);
+    	flowerMap.put(new WorldGenBOPFlora(BOPBlockHelper.get("flowers"), 0), 6D);
+    	flowerMap.put(new WorldGenBOPDoubleFlora(Blocks.double_plant, Blocks.double_plant, 1, 7, 5), 4D);
     	
     	return flowerMap;
     }

src/main/java/biomesoplenty/common/biomes/BiomeGenConiferousForestSnow.java

@@ -58,7 +58,7 @@ public class BiomeGenConiferousForestSnow extends BOPBiome
     {
         HashMap<WorldGenerator, Double> flowerMap = new HashMap();
         
-        flowerMap.put(new WorldGenBOPFlora(BOPBlockHelper.get("flowers"), 8), 1D);
+        flowerMap.put(new WorldGenBOPFlora(BOPBlockHelper.get("flowers"), 8), 8D);
         
         return flowerMap;
     }

src/main/java/biomesoplenty/common/biomes/BiomeGenFen.java

@@ -67,7 +67,7 @@ public class BiomeGenFen extends BOPBiome
     {
         HashMap<WorldGenerator, Double> flowerMap = new HashMap();
         
-        flowerMap.put(new WorldGenBOPFlora(Blocks.red_flower, 2), 0.5D);
+        flowerMap.put(new WorldGenBOPFlora(Blocks.red_flower, 2), 6D);
         
         return flowerMap;
     }

src/main/java/biomesoplenty/common/biomes/BiomeGenGrove.java

@@ -56,8 +56,8 @@ public class BiomeGenGrove extends BOPBiome
         HashMap<WorldGenerator, Double> flowerMap = new HashMap();
         
         flowerMap.put(new WorldGenBOPFlora(BOPBlockHelper.get("flowers"), 0), 16D);
-        flowerMap.put(new WorldGenBOPFlora(BOPBlockHelper.get("flowers"), 9), 3D);
-        flowerMap.put(new WorldGenBOPDoubleFlora(Blocks.double_plant, Blocks.double_plant, 5, 11, 3), 2D);
+        flowerMap.put(new WorldGenBOPFlora(BOPBlockHelper.get("flowers"), 9), 6D);
+        flowerMap.put(new WorldGenBOPDoubleFlora(Blocks.double_plant, Blocks.double_plant, 5, 11, 3), 4D);
         
         return flowerMap;
     }

src/main/java/biomesoplenty/common/biomes/BiomeGenHeathland.java

@@ -56,9 +56,9 @@ public class BiomeGenHeathland extends BOPBiome
     {
         HashMap<WorldGenerator, Double> flowerMap = new HashMap();
         
-        flowerMap.put(new WorldGenBOPFlora(BOPBlockHelper.get("flowers"), 7), 1D);
-        flowerMap.put(new WorldGenBOPFlora(Blocks.red_flower, 2), 0.5D);
-        flowerMap.put(new WorldGenBOPDoubleFlora(Blocks.double_plant, Blocks.double_plant, 1, 7, 5), 0.5D);
+        flowerMap.put(new WorldGenBOPFlora(BOPBlockHelper.get("flowers"), 7), 8D);
+        flowerMap.put(new WorldGenBOPFlora(Blocks.red_flower, 2), 6D);
+        flowerMap.put(new WorldGenBOPDoubleFlora(Blocks.double_plant, Blocks.double_plant, 1, 7, 5), 4D);
         
         return flowerMap;
     }

src/main/java/biomesoplenty/common/biomes/BiomeGenJadeCliffs.java

@@ -50,7 +50,7 @@ public class BiomeGenJadeCliffs extends BOPBiome
     {
         HashMap<WorldGenerator, Double> flowerMap = new HashMap();
         
-        flowerMap.put(new WorldGenBOPDoubleFlora(Blocks.double_plant, Blocks.double_plant, 1, 7, 5), 0.5D);
+        flowerMap.put(new WorldGenBOPDoubleFlora(Blocks.double_plant, Blocks.double_plant, 1, 7, 5), 6D);
         
         return flowerMap;
     }

src/main/java/biomesoplenty/common/biomes/BiomeGenLushDesert.java

@@ -68,8 +68,8 @@ public class BiomeGenLushDesert extends BOPBiome
     {
         HashMap<WorldGenerator, Double> flowerMap = new HashMap();
         
-        flowerMap.put(new WorldGenBOPDoubleFlora(Blocks.double_plant, Blocks.double_plant, 4, 10, 5), 0.5D);
-        flowerMap.put(new WorldGenBOPFlora(BOPBlockHelper.get("flowers"), 7), 1D);
+        flowerMap.put(new WorldGenBOPDoubleFlora(Blocks.double_plant, Blocks.double_plant, 4, 10, 5), 4D);
+        flowerMap.put(new WorldGenBOPFlora(BOPBlockHelper.get("flowers"), 7), 8D);
         
         return flowerMap;
     }

src/main/java/biomesoplenty/common/biomes/BiomeGenLushSwamp.java

@@ -60,9 +60,9 @@ public class BiomeGenLushSwamp extends BOPBiome
     {
         HashMap<WorldGenerator, Double> flowerMap = new HashMap();
         
-        flowerMap.put(new WorldGenBOPFlora(BOPBlockHelper.get("flowers"), 4), 1D);
-        flowerMap.put(new WorldGenBOPFlora(Blocks.red_flower, 2), 0.5D);
-        flowerMap.put(new WorldGenBOPFlora(Blocks.red_flower, 1), 0.75D);
+        flowerMap.put(new WorldGenBOPFlora(BOPBlockHelper.get("flowers"), 4), 8D);
+        flowerMap.put(new WorldGenBOPFlora(Blocks.red_flower, 2), 4D);
+        flowerMap.put(new WorldGenBOPFlora(Blocks.red_flower, 1), 6D);
         
         return flowerMap;
     }

src/main/java/biomesoplenty/common/biomes/BiomeGenMeadow.java

@@ -57,10 +57,10 @@ public class BiomeGenMeadow extends BOPBiome
     {
         HashMap<WorldGenerator, Double> flowerMap = new HashMap();
         
-        flowerMap.put(new WorldGenBOPFlora(BOPBlockHelper.get("flowers"), 0), 3D);
-        flowerMap.put(new WorldGenBOPFlora(BOPBlockHelper.get("flowers"), 4), 1D);
-        flowerMap.put(new WorldGenBOPDoubleFlora(Blocks.double_plant, Blocks.double_plant, 5, 11, 3), 0.5D);
-        flowerMap.put(new WorldGenBOPDoubleFlora(Blocks.double_plant, Blocks.double_plant, 1, 7, 5), 0.5D);
+        flowerMap.put(new WorldGenBOPFlora(BOPBlockHelper.get("flowers"), 0), 10D);
+        flowerMap.put(new WorldGenBOPFlora(BOPBlockHelper.get("flowers"), 4), 8D);
+        flowerMap.put(new WorldGenBOPDoubleFlora(Blocks.double_plant, Blocks.double_plant, 5, 11, 3), 5D);
+        flowerMap.put(new WorldGenBOPDoubleFlora(Blocks.double_plant, Blocks.double_plant, 1, 7, 5), 4D);
         
         return flowerMap;
     }

src/main/java/biomesoplenty/common/biomes/BiomeGenMoor.java

@@ -42,7 +42,7 @@ public class BiomeGenMoor extends BOPBiome
 		this.bopWorldFeatures.mudPerChunk = 1;
 		this.bopWorldFeatures.waterLakesPerChunk = 10;
 		this.bopWorldFeatures.bopFlowersPerChunk = 6;
-		this.bopWorldFeatures.koruPerChunk = 3;
+		this.bopWorldFeatures.koruPerChunk = 6;
 		this.bopWorldFeatures.generatePumpkins = false;
 	}
 	
@@ -51,7 +51,7 @@ public class BiomeGenMoor extends BOPBiome
     {
         HashMap<WorldGenerator, Double> flowerMap = new HashMap();
         
-        flowerMap.put(new WorldGenBOPFlora(BOPBlockHelper.get("flowers"), 1), 1D);
+        flowerMap.put(new WorldGenBOPFlora(BOPBlockHelper.get("flowers"), 1), 14D);
         
         return flowerMap;
     }

src/main/java/biomesoplenty/common/biomes/BiomeGenMysticGrove.java

@@ -68,12 +68,12 @@ public class BiomeGenMysticGrove extends BOPBiome
     {
         HashMap<WorldGenerator, Double> flowerMap = new HashMap();
         
-        flowerMap.put(new WorldGenBOPFlora(BOPBlockHelper.get("flowers"), 6), 3D);
-        flowerMap.put(new WorldGenBOPFlora(BOPBlockHelper.get("flowers"), 3), 4D);
-        flowerMap.put(new WorldGenBOPFlora(BOPBlockHelper.get("flowers"), 4), 1D);
-        flowerMap.put(new WorldGenBOPFlora(Blocks.red_flower, 3), 2D);
-        flowerMap.put(new WorldGenBOPFlora(Blocks.red_flower, 2), 1D);
-        flowerMap.put(new WorldGenBOPDoubleFlora(Blocks.double_plant, Blocks.double_plant, 1, 7, 5), 1D);
+        flowerMap.put(new WorldGenBOPFlora(BOPBlockHelper.get("flowers"), 6), 12D);
+        flowerMap.put(new WorldGenBOPFlora(BOPBlockHelper.get("flowers"), 3), 10D);
+        flowerMap.put(new WorldGenBOPFlora(BOPBlockHelper.get("flowers"), 4), 8D);
+        flowerMap.put(new WorldGenBOPFlora(Blocks.red_flower, 3), 6D);
+        flowerMap.put(new WorldGenBOPFlora(Blocks.red_flower, 2), 6D);
+        flowerMap.put(new WorldGenBOPDoubleFlora(Blocks.double_plant, Blocks.double_plant, 1, 7, 5), 4D);
         
         return flowerMap;
     }

src/main/java/biomesoplenty/common/biomes/BiomeGenPrairie.java

@@ -52,8 +52,8 @@ public class BiomeGenPrairie extends BOPBiome
     {
         HashMap<WorldGenerator, Double> flowerMap = new HashMap();
         
-        flowerMap.put(new WorldGenBOPFlora(BOPBlockHelper.get("flowers2"), 4), 1D);
-        flowerMap.put(new WorldGenBOPFlora(BOPBlockHelper.get("flowers"), 9), 0.5D);
+        flowerMap.put(new WorldGenBOPFlora(BOPBlockHelper.get("flowers2"), 4), 12D);
+        flowerMap.put(new WorldGenBOPFlora(BOPBlockHelper.get("flowers"), 9), 6D);
         
         return flowerMap;
     }

src/main/java/biomesoplenty/common/biomes/BiomeGenRainforest.java

@@ -54,10 +54,10 @@ public class BiomeGenRainforest extends BOPBiome
     {
         HashMap<WorldGenerator, Double> flowerMap = new HashMap();
         
-        flowerMap.put(new WorldGenBOPFlora(BOPBlockHelper.get("flowers"), 6), 3D);
-        flowerMap.put(new WorldGenBOPFlora(Blocks.red_flower, 1), 0.5D);
-        flowerMap.put(new WorldGenBOPDoubleFlora(Blocks.double_plant, Blocks.double_plant, 4, 10, 5), 1D);
-        flowerMap.put(new WorldGenBOPDoubleFlora(Blocks.double_plant, Blocks.double_plant, 1, 7, 5), 0.5D);
+        flowerMap.put(new WorldGenBOPFlora(BOPBlockHelper.get("flowers"), 6), 12D);
+        flowerMap.put(new WorldGenBOPFlora(Blocks.red_flower, 1), 6D);
+        flowerMap.put(new WorldGenBOPDoubleFlora(Blocks.double_plant, Blocks.double_plant, 4, 10, 5), 4D);
+        flowerMap.put(new WorldGenBOPDoubleFlora(Blocks.double_plant, Blocks.double_plant, 1, 7, 5), 6D);
         
         return flowerMap;
     }

src/main/java/biomesoplenty/common/biomes/BiomeGenRedwoodForest.java

@@ -53,8 +53,8 @@ public class BiomeGenRedwoodForest extends BOPBiome
     {
         HashMap<WorldGenerator, Double> flowerMap = new HashMap();
         
-        flowerMap.put(new WorldGenBOPDoubleFlora(Blocks.double_plant, Blocks.double_plant, 4, 10, 5), 1D);
-        flowerMap.put(new WorldGenBOPFlora(Blocks.red_flower, 1), 0.5D);
+        flowerMap.put(new WorldGenBOPDoubleFlora(Blocks.double_plant, Blocks.double_plant, 4, 10, 5), 10D);
+        flowerMap.put(new WorldGenBOPFlora(Blocks.red_flower, 1), 8D);
         
         return flowerMap;
     }

src/main/java/biomesoplenty/common/biomes/BiomeGenSacredSprings.java

@@ -55,9 +55,9 @@ public class BiomeGenSacredSprings extends BOPBiome
     {
     	HashMap<WorldGenerator, Double> flowerMap = new HashMap();
     	
-    	flowerMap.put(new WorldGenBOPFlora(BOPBlockHelper.get("flowers"), 6), 3D);
+    	flowerMap.put(new WorldGenBOPFlora(BOPBlockHelper.get("flowers"), 6), 10D);
     	flowerMap.put(new WorldGenBOPFlora(Blocks.red_flower, 1), 6D);
-    	flowerMap.put(new WorldGenBOPDoubleFlora(Blocks.double_plant, Blocks.double_plant, 5, 11, 5), 1D);
+    	flowerMap.put(new WorldGenBOPDoubleFlora(Blocks.double_plant, Blocks.double_plant, 5, 11, 5), 5D);
     	
     	return flowerMap;
     }

src/main/java/biomesoplenty/common/biomes/BiomeGenShrubland.java

@@ -54,7 +54,7 @@ public class BiomeGenShrubland extends BOPBiome
     {
         HashMap<WorldGenerator, Double> flowerMap = new HashMap();
         
-        flowerMap.put(new WorldGenBOPFlora(Blocks.red_flower, 2), 0.5D);
+        flowerMap.put(new WorldGenBOPFlora(Blocks.red_flower, 2), 4D);
         
         return flowerMap;
     }

src/main/java/biomesoplenty/common/biomes/BiomeGenSpruceWoods.java

@@ -54,7 +54,7 @@ public class BiomeGenSpruceWoods extends BOPBiome
     {
         HashMap<WorldGenerator, Double> flowerMap = new HashMap();
         
-        flowerMap.put(new WorldGenBOPFlora(BOPBlockHelper.get("flowers2"), 5), 1D);
+        flowerMap.put(new WorldGenBOPFlora(BOPBlockHelper.get("flowers2"), 5), 15D);
         
         return flowerMap;
     }

src/main/java/biomesoplenty/common/biomes/BiomeGenTropicalRainforest.java

@@ -66,7 +66,7 @@ public class BiomeGenTropicalRainforest extends BOPBiome
     {
         HashMap<WorldGenerator, Double> flowerMap = new HashMap();
         
-        flowerMap.put(new WorldGenBOPFlora(BOPBlockHelper.get("flowers"), 5), 1D);
+        flowerMap.put(new WorldGenBOPFlora(BOPBlockHelper.get("flowers"), 5), 12D);
         
         return flowerMap;
     }

src/main/java/biomesoplenty/common/biomes/BiomeGenTropics.java

@@ -62,11 +62,11 @@ public class BiomeGenTropics extends BOPBiome
     {
         HashMap<WorldGenerator, Double> flowerMap = new HashMap();
         
-        flowerMap.put(new WorldGenBOPFlora(BOPBlockHelper.get("flowers"), 9), 0.5D);
-        flowerMap.put(new WorldGenBOPFlora(BOPBlockHelper.get("flowers"), 5), 0.75D);
-        flowerMap.put(new WorldGenBOPFlora(BOPBlockHelper.get("flowers2"), 0), 5D);
-        flowerMap.put(new WorldGenBOPFlora(Blocks.red_flower, 1), 0.5D);
-        flowerMap.put(new WorldGenBOPDoubleFlora(Blocks.double_plant, Blocks.double_plant, 4, 10, 5), 1D);
+        flowerMap.put(new WorldGenBOPFlora(BOPBlockHelper.get("flowers"), 9), 8D);
+        flowerMap.put(new WorldGenBOPFlora(BOPBlockHelper.get("flowers"), 5), 10D);
+        flowerMap.put(new WorldGenBOPFlora(BOPBlockHelper.get("flowers2"), 0), 15D);
+        flowerMap.put(new WorldGenBOPFlora(Blocks.red_flower, 1), 7D);
+        flowerMap.put(new WorldGenBOPDoubleFlora(Blocks.double_plant, Blocks.double_plant, 4, 10, 5), 6D);
         
         return flowerMap;
     }

src/main/java/biomesoplenty/common/biomes/BiomeGenTundra.java

@@ -55,7 +55,7 @@ public class BiomeGenTundra extends BOPBiome
     {
         HashMap<WorldGenerator, Double> flowerMap = new HashMap();
         
-        flowerMap.put(new WorldGenBOPFlora(BOPBlockHelper.get("flowers"), 8), 1D);
+        flowerMap.put(new WorldGenBOPFlora(BOPBlockHelper.get("flowers"), 8), 4D);
         
         return flowerMap;
     }

src/main/java/biomesoplenty/common/biomes/BiomeGenWetland.java

@@ -78,8 +78,8 @@ public class BiomeGenWetland extends BOPBiome
     {
         HashMap<WorldGenerator, Double> flowerMap = new HashMap();
         
-        flowerMap.put(new WorldGenBOPFlora(BOPBlockHelper.get("flowers"), 1), 1D);
-        flowerMap.put(new WorldGenBOPFlora(Blocks.red_flower, 1), 0.5D);
+        flowerMap.put(new WorldGenBOPFlora(BOPBlockHelper.get("flowers"), 1), 10D);
+        flowerMap.put(new WorldGenBOPFlora(Blocks.red_flower, 1), 6D);
         
         return flowerMap;
     }

src/main/java/biomesoplenty/common/biomes/BiomeGenWoodland.java

@@ -54,7 +54,7 @@ public class BiomeGenWoodland extends BOPBiome
     {
         HashMap<WorldGenerator, Double> flowerMap = new HashMap();
         
-        flowerMap.put(new WorldGenBOPDoubleFlora(Blocks.double_plant, Blocks.double_plant, 4, 10, 5), 1D);
+        flowerMap.put(new WorldGenBOPDoubleFlora(Blocks.double_plant, Blocks.double_plant, 4, 10, 5), 6D);
         
         return flowerMap;
     }