diff --git a/common/biomesoplenty/api/BlockReferences.java b/common/biomesoplenty/api/BlockReferences.java
index 312ab8dc4..b52de3be1 100644
--- a/common/biomesoplenty/api/BlockReferences.java
+++ b/common/biomesoplenty/api/BlockReferences.java
@@ -69,6 +69,7 @@ public class BlockReferences {
bamboo (Blocks.bamboo, 0),
+ dryGrassItem (Blocks.foliage, 11),
wheatGrassItem (Blocks.foliage, 10),
taroItem (Blocks.foliage, 9),
poisonIvyItem (Blocks.foliage, 7),
diff --git a/common/biomesoplenty/biomes/BiomeDecoratorBOP.java b/common/biomesoplenty/biomes/BiomeDecoratorBOP.java
index cea707b88..27064405b 100644
--- a/common/biomesoplenty/biomes/BiomeDecoratorBOP.java
+++ b/common/biomesoplenty/biomes/BiomeDecoratorBOP.java
@@ -201,6 +201,7 @@ public class BiomeDecoratorBOP extends BiomeDecorator
public WorldGenerator bushGen;
public WorldGenerator taroGen;
public WorldGenerator wheatGrassGen;
+ public WorldGenerator wetGrassGen;
public WorldGenerator berryBushGen;
public WorldGenerator tinyCactusGen;
public WorldGenerator aloeGen;
@@ -469,6 +470,7 @@ public class BiomeDecoratorBOP extends BiomeDecorator
berryBushGen = new WorldGenBOPFlowers(Blocks.foliage.get().blockID, 8);
taroGen = new WorldGenBOPBush(Blocks.foliage.get().blockID, 9);
wheatGrassGen = new WorldGenTallGrass(Blocks.foliage.get().blockID, 10);
+ wetGrassGen = new WorldGenTallGrass(Blocks.foliage.get().blockID, 11);
tinyCactusGen = new WorldGenBOPFlowers(Blocks.plants.get().blockID, 12);
aloeGen = new WorldGenBOPFlowers(Blocks.flowers.get().blockID, 12);
coralGen = new WorldGenCoral(Blocks.coral.get().blockID, 4);
@@ -1265,7 +1267,16 @@ public class BiomeDecoratorBOP extends BiomeDecorator
var3 = chunk_X + randomGenerator.nextInt(16) + 8;
var4 = randomGenerator.nextInt(256);
var5 = chunk_Z + randomGenerator.nextInt(16) + 8;
- wheatGrassGen.generate(currentWorld, randomGenerator, var3, var4, var5);
+ int var99999 = randomGenerator.nextInt(2);
+
+ if (var99999 == 0)
+ {
+ wetGrassGen.generate(currentWorld, randomGenerator, var3, var4, var5);
+ }
+ else
+ {
+ wheatGrassGen.generate(currentWorld, randomGenerator, var3, var4, var5);
+ }
}
for (var2 = 0; var2 < poisonIvyPerChunk; ++var2)
diff --git a/common/biomesoplenty/biomes/BiomeGenAutumnHills.java b/common/biomesoplenty/biomes/BiomeGenAutumnHills.java
index d44ba6246..e45671d49 100644
--- a/common/biomesoplenty/biomes/BiomeGenAutumnHills.java
+++ b/common/biomesoplenty/biomes/BiomeGenAutumnHills.java
@@ -30,6 +30,7 @@ public class BiomeGenAutumnHills extends BiomeGenBase
customBiomeDecorator.bushesPerChunk = 45;
customBiomeDecorator.berryBushesPerChunk = 5;
customBiomeDecorator.sproutsPerChunk = 2;
+ customBiomeDecorator.wheatGrassPerChunk = 16;
}
/**
diff --git a/common/biomesoplenty/biomes/BiomeGenBambooForest.java b/common/biomesoplenty/biomes/BiomeGenBambooForest.java
index 8c4e175d4..9db2cc1a4 100644
--- a/common/biomesoplenty/biomes/BiomeGenBambooForest.java
+++ b/common/biomesoplenty/biomes/BiomeGenBambooForest.java
@@ -25,6 +25,7 @@ public class BiomeGenBambooForest extends BiomeGenBase
customBiomeDecorator.flowersPerChunk = -999;
customBiomeDecorator.bushesPerChunk = 5;
customBiomeDecorator.reedsBOPPerChunk = 6;
+ customBiomeDecorator.wheatGrassPerChunk = 3;
customBiomeDecorator.generatePumpkins = false;
}
diff --git a/common/biomesoplenty/biomes/BiomeGenBirchForest.java b/common/biomesoplenty/biomes/BiomeGenBirchForest.java
index 5a0e6fdee..a10ad2078 100644
--- a/common/biomesoplenty/biomes/BiomeGenBirchForest.java
+++ b/common/biomesoplenty/biomes/BiomeGenBirchForest.java
@@ -24,6 +24,7 @@ public class BiomeGenBirchForest extends BiomeGenBase
customBiomeDecorator.tinyFlowersPerChunk = 6;
customBiomeDecorator.poisonIvyPerChunk = 3;
customBiomeDecorator.lilyOfTheValleysPerChunk = 15;
+ customBiomeDecorator.wheatGrassPerChunk = 1;
}
/**
diff --git a/common/biomesoplenty/biomes/BiomeGenBorealForest.java b/common/biomesoplenty/biomes/BiomeGenBorealForest.java
index 159a70f4a..036e37bdc 100644
--- a/common/biomesoplenty/biomes/BiomeGenBorealForest.java
+++ b/common/biomesoplenty/biomes/BiomeGenBorealForest.java
@@ -27,6 +27,7 @@ public class BiomeGenBorealForest extends BiomeGenBase
customBiomeDecorator = (BiomeDecoratorBOP)theBiomeDecorator;
customBiomeDecorator.treesPerChunk = 20;
customBiomeDecorator.grassPerChunk = 50;
+ customBiomeDecorator.wheatGrassPerChunk = 25;
}
/**
diff --git a/common/biomesoplenty/biomes/BiomeGenBrushland.java b/common/biomesoplenty/biomes/BiomeGenBrushland.java
index e728df5f2..ae8895088 100644
--- a/common/biomesoplenty/biomes/BiomeGenBrushland.java
+++ b/common/biomesoplenty/biomes/BiomeGenBrushland.java
@@ -21,6 +21,7 @@ public class BiomeGenBrushland extends BiomeGenBase
customBiomeDecorator.grassPerChunk = 6;
customBiomeDecorator.thornsPerChunk = 4;
customBiomeDecorator.flowersPerChunk = -999;
+ customBiomeDecorator.wheatGrassPerChunk = 3;
customBiomeDecorator.generateQuicksand = true;
}
diff --git a/common/biomesoplenty/biomes/BiomeGenChaparral.java b/common/biomesoplenty/biomes/BiomeGenChaparral.java
index 088b2c077..4d08e986b 100644
--- a/common/biomesoplenty/biomes/BiomeGenChaparral.java
+++ b/common/biomesoplenty/biomes/BiomeGenChaparral.java
@@ -31,6 +31,7 @@ public class BiomeGenChaparral extends BiomeGenBase
customBiomeDecorator.generateStoneInGrass = true;
customBiomeDecorator.generatePumpkins = false;
customBiomeDecorator.carrotsPerChunk = 1;
+ customBiomeDecorator.wheatGrassPerChunk = 10;
spawnableCreatureList.add(new SpawnListEntry(EntityHorse.class, 5, 2, 6));
}
diff --git a/common/biomesoplenty/biomes/BiomeGenCherryBlossomGrove.java b/common/biomesoplenty/biomes/BiomeGenCherryBlossomGrove.java
index 8eff316ec..ead1e7f97 100644
--- a/common/biomesoplenty/biomes/BiomeGenCherryBlossomGrove.java
+++ b/common/biomesoplenty/biomes/BiomeGenCherryBlossomGrove.java
@@ -25,6 +25,7 @@ public class BiomeGenCherryBlossomGrove extends BiomeGenBase
customBiomeDecorator.tinyFlowersPerChunk = 25;
customBiomeDecorator.grassPerChunk = 15;
customBiomeDecorator.lilyflowersPerChunk = 9;
+ customBiomeDecorator.wheatGrassPerChunk = 1;
customBiomeDecorator.generatePumpkins = false;
}
diff --git a/common/biomesoplenty/biomes/BiomeGenConiferousForest.java b/common/biomesoplenty/biomes/BiomeGenConiferousForest.java
index 33a5efd0e..2625bc798 100644
--- a/common/biomesoplenty/biomes/BiomeGenConiferousForest.java
+++ b/common/biomesoplenty/biomes/BiomeGenConiferousForest.java
@@ -35,6 +35,7 @@ public class BiomeGenConiferousForest extends BiomeGenBase
customBiomeDecorator.blueMilksPerChunk = 1;
customBiomeDecorator.poisonIvyPerChunk = 1;
customBiomeDecorator.berryBushesPerChunk = 1;
+ customBiomeDecorator.wheatGrassPerChunk = 5;
}
/**
diff --git a/common/biomesoplenty/biomes/BiomeGenConiferousForestSnow.java b/common/biomesoplenty/biomes/BiomeGenConiferousForestSnow.java
index 6dd8780f6..165c02f51 100644
--- a/common/biomesoplenty/biomes/BiomeGenConiferousForestSnow.java
+++ b/common/biomesoplenty/biomes/BiomeGenConiferousForestSnow.java
@@ -26,6 +26,7 @@ public class BiomeGenConiferousForestSnow extends BiomeGenBase
customBiomeDecorator.flowersPerChunk = -999;
customBiomeDecorator.sandPerChunk = -999;
customBiomeDecorator.sandPerChunk2 = -999;
+ customBiomeDecorator.wheatGrassPerChunk = 1;
}
@Override
diff --git a/common/biomesoplenty/biomes/BiomeGenDeadForest.java b/common/biomesoplenty/biomes/BiomeGenDeadForest.java
index 84c1bf9ae..ad038eb65 100644
--- a/common/biomesoplenty/biomes/BiomeGenDeadForest.java
+++ b/common/biomesoplenty/biomes/BiomeGenDeadForest.java
@@ -27,6 +27,7 @@ public class BiomeGenDeadForest extends BiomeGenBase
customBiomeDecorator.thornsPerChunk = 2;
customBiomeDecorator.flowersPerChunk = -999;
customBiomeDecorator.reedsPerChunk = -999;
+ customBiomeDecorator.wheatGrassPerChunk = 1;
}
/**
diff --git a/common/biomesoplenty/biomes/BiomeGenDeadForestSnow.java b/common/biomesoplenty/biomes/BiomeGenDeadForestSnow.java
index 0ce27c60b..7f4c623a9 100644
--- a/common/biomesoplenty/biomes/BiomeGenDeadForestSnow.java
+++ b/common/biomesoplenty/biomes/BiomeGenDeadForestSnow.java
@@ -26,6 +26,7 @@ public class BiomeGenDeadForestSnow extends BiomeGenBase
customBiomeDecorator.treesPerChunk = 2;
customBiomeDecorator.flowersPerChunk = -999;
customBiomeDecorator.reedsPerChunk = -999;
+ customBiomeDecorator.wheatGrassPerChunk = 1;
}
@Override
diff --git a/common/biomesoplenty/biomes/BiomeGenDeadSwamp.java b/common/biomesoplenty/biomes/BiomeGenDeadSwamp.java
index e5ddd6eb1..d8975a423 100644
--- a/common/biomesoplenty/biomes/BiomeGenDeadSwamp.java
+++ b/common/biomesoplenty/biomes/BiomeGenDeadSwamp.java
@@ -31,6 +31,7 @@ public class BiomeGenDeadSwamp extends BiomeGenBase
customBiomeDecorator.sandPerChunk = -999;
customBiomeDecorator.sandPerChunk2 = -999;
customBiomeDecorator.reedsBOPPerChunk = 2;
+ customBiomeDecorator.wheatGrassPerChunk = 10;
spawnableCreatureList.clear();
spawnableWaterCreatureList.clear();
waterColorMultiplier = 10661201;
diff --git a/common/biomesoplenty/biomes/BiomeGenDeciduousForest.java b/common/biomesoplenty/biomes/BiomeGenDeciduousForest.java
index 0db947f02..db01c0226 100644
--- a/common/biomesoplenty/biomes/BiomeGenDeciduousForest.java
+++ b/common/biomesoplenty/biomes/BiomeGenDeciduousForest.java
@@ -28,6 +28,7 @@ public class BiomeGenDeciduousForest extends BiomeGenBase
customBiomeDecorator.berryBushesPerChunk = 2;
customBiomeDecorator.blueMilksPerChunk = 2;
customBiomeDecorator.poisonIvyPerChunk = 1;
+ customBiomeDecorator.wheatGrassPerChunk = 10;
}
/**
diff --git a/common/biomesoplenty/biomes/BiomeGenFen.java b/common/biomesoplenty/biomes/BiomeGenFen.java
index 3ff5dc44a..0480f560e 100644
--- a/common/biomesoplenty/biomes/BiomeGenFen.java
+++ b/common/biomesoplenty/biomes/BiomeGenFen.java
@@ -40,6 +40,7 @@ public class BiomeGenFen extends BiomeGenBase
customBiomeDecorator.reedsBOPPerChunk = 5;
customBiomeDecorator.algaePerChunk = 1;
customBiomeDecorator.portobellosPerChunk = 1;
+ customBiomeDecorator.wheatGrassPerChunk = 8;
spawnableMonsterList.add(new SpawnListEntry(EntitySlime.class, 10, 1, 3));
}
diff --git a/common/biomesoplenty/biomes/BiomeGenField.java b/common/biomesoplenty/biomes/BiomeGenField.java
index cf24782da..097e42440 100644
--- a/common/biomesoplenty/biomes/BiomeGenField.java
+++ b/common/biomesoplenty/biomes/BiomeGenField.java
@@ -24,6 +24,7 @@ public class BiomeGenField extends BiomeGenBase
customBiomeDecorator.grassPerChunk = 8;
customBiomeDecorator.bushesPerChunk = 8;
customBiomeDecorator.berryBushesPerChunk = 5;
+ customBiomeDecorator.wheatGrassPerChunk = 4;
customBiomeDecorator.generatePumpkins = true;
spawnableCreatureList.add(new SpawnListEntry(EntityHorse.class, 5, 2, 6));
}
diff --git a/common/biomesoplenty/biomes/BiomeGenFieldForest.java b/common/biomesoplenty/biomes/BiomeGenFieldForest.java
index df4c587de..e644967ac 100644
--- a/common/biomesoplenty/biomes/BiomeGenFieldForest.java
+++ b/common/biomesoplenty/biomes/BiomeGenFieldForest.java
@@ -26,6 +26,7 @@ public class BiomeGenFieldForest extends BiomeGenBase
customBiomeDecorator.grassPerChunk = 5;
customBiomeDecorator.bushesPerChunk = 8;
customBiomeDecorator.berryBushesPerChunk = 5;
+ customBiomeDecorator.wheatGrassPerChunk = 4;
customBiomeDecorator.generatePumpkins = true;
spawnableCreatureList.add(new SpawnListEntry(EntityHorse.class, 5, 2, 6));
}
diff --git a/common/biomesoplenty/biomes/BiomeGenFungiForest.java b/common/biomesoplenty/biomes/BiomeGenFungiForest.java
index a065d7d96..ea0239276 100644
--- a/common/biomesoplenty/biomes/BiomeGenFungiForest.java
+++ b/common/biomesoplenty/biomes/BiomeGenFungiForest.java
@@ -44,6 +44,7 @@ public class BiomeGenFungiForest extends BiomeGenBase
customBiomeDecorator.reedsBOPPerChunk = 1;
customBiomeDecorator.lilyflowersPerChunk = 2;
customBiomeDecorator.carrotsPerChunk = 1;
+ customBiomeDecorator.wheatGrassPerChunk = 3;
customBiomeDecorator.generateMycelium = true;
customBiomeDecorator.generatePumpkins = true;
waterColorMultiplier = 65326;
diff --git a/common/biomesoplenty/biomes/BiomeGenGarden.java b/common/biomesoplenty/biomes/BiomeGenGarden.java
index 0f7f2d555..5a0a69142 100644
--- a/common/biomesoplenty/biomes/BiomeGenGarden.java
+++ b/common/biomesoplenty/biomes/BiomeGenGarden.java
@@ -38,6 +38,7 @@ public class BiomeGenGarden extends BiomeGenBase
customBiomeDecorator.sandPerChunk = -999;
customBiomeDecorator.sandPerChunk2 = -999;
customBiomeDecorator.lilyflowersPerChunk = 4;
+ customBiomeDecorator.wheatGrassPerChunk = 10;
customBiomeDecorator.generatePumpkins = true;
customBiomeDecorator.generateMelons = true;
spawnableCreatureList.clear();
diff --git a/common/biomesoplenty/biomes/BiomeGenGrassland.java b/common/biomesoplenty/biomes/BiomeGenGrassland.java
index 24f69ecc8..d647cfb4f 100644
--- a/common/biomesoplenty/biomes/BiomeGenGrassland.java
+++ b/common/biomesoplenty/biomes/BiomeGenGrassland.java
@@ -28,6 +28,7 @@ public class BiomeGenGrassland extends BiomeGenBase
customBiomeDecorator.treesPerChunk = -999;
customBiomeDecorator.flowersPerChunk = -999;
customBiomeDecorator.grassPerChunk = 2;
+ customBiomeDecorator.wheatGrassPerChunk = 0;
customBiomeDecorator.reedsPerChunk = 35;
customBiomeDecorator.mushroomsPerChunk = 20;
customBiomeDecorator.sandPerChunk = -999;
diff --git a/common/biomesoplenty/biomes/BiomeGenGrove.java b/common/biomesoplenty/biomes/BiomeGenGrove.java
index cb1054762..78f01bd14 100644
--- a/common/biomesoplenty/biomes/BiomeGenGrove.java
+++ b/common/biomesoplenty/biomes/BiomeGenGrove.java
@@ -26,6 +26,7 @@ public class BiomeGenGrove extends BiomeGenBase
customBiomeDecorator.tinyFlowersPerChunk = 80;
customBiomeDecorator.whiteFlowersPerChunk = 15;
customBiomeDecorator.grassPerChunk = 8;
+ customBiomeDecorator.wheatGrassPerChunk = 4;
customBiomeDecorator.sproutsPerChunk = 1;
customBiomeDecorator.lilyflowersPerChunk = 3;
customBiomeDecorator.berryBushesPerChunk = 2;
diff --git a/common/biomesoplenty/biomes/BiomeGenHeathland.java b/common/biomesoplenty/biomes/BiomeGenHeathland.java
index 723bd7181..de10bd7bb 100644
--- a/common/biomesoplenty/biomes/BiomeGenHeathland.java
+++ b/common/biomesoplenty/biomes/BiomeGenHeathland.java
@@ -24,6 +24,7 @@ public class BiomeGenHeathland extends BiomeGenBase
customBiomeDecorator = (BiomeDecoratorBOP)theBiomeDecorator;
customBiomeDecorator.treesPerChunk = 3;
customBiomeDecorator.grassPerChunk = 10;
+ customBiomeDecorator.wheatGrassPerChunk = 5;
customBiomeDecorator.purpleFlowersPerChunk = 30;
customBiomeDecorator.deadBushPerChunk = 2;
customBiomeDecorator.berryBushesPerChunk = 1;
diff --git a/common/biomesoplenty/biomes/BiomeGenHighland.java b/common/biomesoplenty/biomes/BiomeGenHighland.java
index 6f7918fb1..0110955d0 100644
--- a/common/biomesoplenty/biomes/BiomeGenHighland.java
+++ b/common/biomesoplenty/biomes/BiomeGenHighland.java
@@ -18,6 +18,7 @@ public class BiomeGenHighland extends BiomeGenBase
customBiomeDecorator.treesPerChunk = -999;
customBiomeDecorator.highGrassPerChunk = 25;
customBiomeDecorator.grassPerChunk = 25;
+ customBiomeDecorator.wheatGrassPerChunk = 10;
customBiomeDecorator.potatoesPerChunk = -999;
customBiomeDecorator.generateBoulders = false;
customBiomeDecorator.carrotsPerChunk = 1;
diff --git a/common/biomesoplenty/biomes/BiomeGenJadeCliffs.java b/common/biomesoplenty/biomes/BiomeGenJadeCliffs.java
index d6cbac8fd..2748368a9 100644
--- a/common/biomesoplenty/biomes/BiomeGenJadeCliffs.java
+++ b/common/biomesoplenty/biomes/BiomeGenJadeCliffs.java
@@ -22,6 +22,7 @@ public class BiomeGenJadeCliffs extends BiomeGenBase
customBiomeDecorator = (BiomeDecoratorBOP)theBiomeDecorator;
customBiomeDecorator.treesPerChunk = 12;
customBiomeDecorator.grassPerChunk = 3;
+ customBiomeDecorator.wheatGrassPerChunk = 1;
customBiomeDecorator.carrotsPerChunk = 1;
}
diff --git a/common/biomesoplenty/biomes/BiomeGenLavenderFields.java b/common/biomesoplenty/biomes/BiomeGenLavenderFields.java
index cedb91a67..646003bb5 100644
--- a/common/biomesoplenty/biomes/BiomeGenLavenderFields.java
+++ b/common/biomesoplenty/biomes/BiomeGenLavenderFields.java
@@ -23,6 +23,7 @@ public class BiomeGenLavenderFields extends BiomeGenBase
customBiomeDecorator.treesPerChunk = 1;
customBiomeDecorator.flowersPerChunk = -999;
customBiomeDecorator.grassPerChunk = 20;
+ customBiomeDecorator.wheatGrassPerChunk = 5;
customBiomeDecorator.lavenderPerChunk = 999;
customBiomeDecorator.generatePumpkins = true;
}
diff --git a/common/biomesoplenty/biomes/BiomeGenLushDesert.java b/common/biomesoplenty/biomes/BiomeGenLushDesert.java
index 2a5afeae6..5e64104ea 100644
--- a/common/biomesoplenty/biomes/BiomeGenLushDesert.java
+++ b/common/biomesoplenty/biomes/BiomeGenLushDesert.java
@@ -26,6 +26,7 @@ public class BiomeGenLushDesert extends BiomeGenBase
customBiomeDecorator = (BiomeDecoratorBOP)theBiomeDecorator;
customBiomeDecorator.treesPerChunk = 12;
customBiomeDecorator.grassPerChunk = 8;
+ customBiomeDecorator.wheatGrassPerChunk = 4;
customBiomeDecorator.oasesPerChunk = 999;
customBiomeDecorator.oasesPerChunk2 = 999;
customBiomeDecorator.deadBushPerChunk = 2;
diff --git a/common/biomesoplenty/biomes/BiomeGenLushSwamp.java b/common/biomesoplenty/biomes/BiomeGenLushSwamp.java
index dd6f946e0..a1b08d7b9 100644
--- a/common/biomesoplenty/biomes/BiomeGenLushSwamp.java
+++ b/common/biomesoplenty/biomes/BiomeGenLushSwamp.java
@@ -23,6 +23,7 @@ public class BiomeGenLushSwamp extends BiomeGenBase
customBiomeDecorator = (BiomeDecoratorBOP)theBiomeDecorator;
customBiomeDecorator.treesPerChunk = 10;
customBiomeDecorator.grassPerChunk = 4;
+ customBiomeDecorator.wheatGrassPerChunk = 4;
customBiomeDecorator.mushroomsPerChunk = 8;
customBiomeDecorator.reedsPerChunk = 16;
customBiomeDecorator.cattailsPerChunk = 10;
diff --git a/common/biomesoplenty/biomes/BiomeGenMapleWoods.java b/common/biomesoplenty/biomes/BiomeGenMapleWoods.java
index ef6808044..a6780f670 100644
--- a/common/biomesoplenty/biomes/BiomeGenMapleWoods.java
+++ b/common/biomesoplenty/biomes/BiomeGenMapleWoods.java
@@ -20,6 +20,7 @@ public class BiomeGenMapleWoods extends BiomeGenBase
customBiomeDecorator = (BiomeDecoratorBOP)theBiomeDecorator;
customBiomeDecorator.treesPerChunk = 9;
customBiomeDecorator.grassPerChunk = 1;
+ customBiomeDecorator.wheatGrassPerChunk = 0;
customBiomeDecorator.violetsPerChunk = 1;
customBiomeDecorator.poisonIvyPerChunk = 1;
}
diff --git a/common/biomesoplenty/biomes/BiomeGenMeadow.java b/common/biomesoplenty/biomes/BiomeGenMeadow.java
index e4f4cdeab..b09597a09 100644
--- a/common/biomesoplenty/biomes/BiomeGenMeadow.java
+++ b/common/biomesoplenty/biomes/BiomeGenMeadow.java
@@ -23,6 +23,7 @@ public class BiomeGenMeadow extends BiomeGenBase
customBiomeDecorator = (BiomeDecoratorBOP)theBiomeDecorator;
customBiomeDecorator.treesPerChunk = 2;
customBiomeDecorator.grassPerChunk = 10;
+ customBiomeDecorator.wheatGrassPerChunk = 5;
customBiomeDecorator.tinyFlowersPerChunk = 14;
customBiomeDecorator.flowersPerChunk = 10;
customBiomeDecorator.carrotsPerChunk = 1;
diff --git a/common/biomesoplenty/biomes/BiomeGenMeadowForest.java b/common/biomesoplenty/biomes/BiomeGenMeadowForest.java
index ece545cb3..ae0d4cf80 100644
--- a/common/biomesoplenty/biomes/BiomeGenMeadowForest.java
+++ b/common/biomesoplenty/biomes/BiomeGenMeadowForest.java
@@ -20,6 +20,7 @@ public class BiomeGenMeadowForest extends BiomeGenBase
customBiomeDecorator = (BiomeDecoratorBOP)theBiomeDecorator;
customBiomeDecorator.treesPerChunk = 7;
customBiomeDecorator.grassPerChunk = 10;
+ customBiomeDecorator.wheatGrassPerChunk = 10;
customBiomeDecorator.tinyFlowersPerChunk = 7;
customBiomeDecorator.flowersPerChunk = 10;
customBiomeDecorator.carrotsPerChunk = 1;
diff --git a/common/biomesoplenty/biomes/BiomeGenMountain.java b/common/biomesoplenty/biomes/BiomeGenMountain.java
index fa8d93215..e1bbdb585 100644
--- a/common/biomesoplenty/biomes/BiomeGenMountain.java
+++ b/common/biomesoplenty/biomes/BiomeGenMountain.java
@@ -22,6 +22,7 @@ public class BiomeGenMountain extends BiomeGenBase
customBiomeDecorator = (BiomeDecoratorBOP)theBiomeDecorator;
customBiomeDecorator.treesPerChunk = 2;
customBiomeDecorator.grassPerChunk = 3;
+ customBiomeDecorator.wheatGrassPerChunk = 1;
customBiomeDecorator.berryBushesPerChunk = 3;
}
diff --git a/common/biomesoplenty/biomes/BiomeGenMysticGrove.java b/common/biomesoplenty/biomes/BiomeGenMysticGrove.java
index fc121d248..1698786fe 100644
--- a/common/biomesoplenty/biomes/BiomeGenMysticGrove.java
+++ b/common/biomesoplenty/biomes/BiomeGenMysticGrove.java
@@ -36,6 +36,7 @@ public class BiomeGenMysticGrove extends BiomeGenBase
}
customBiomeDecorator.grassPerChunk = 7;
+ customBiomeDecorator.wheatGrassPerChunk = 3;
customBiomeDecorator.flowersPerChunk = 8;
customBiomeDecorator.pinkFlowersPerChunk = 6;
customBiomeDecorator.glowFlowersPerChunk = 15;
diff --git a/common/biomesoplenty/biomes/BiomeGenOasis.java b/common/biomesoplenty/biomes/BiomeGenOasis.java
index a16635a29..eca8c5a9c 100644
--- a/common/biomesoplenty/biomes/BiomeGenOasis.java
+++ b/common/biomesoplenty/biomes/BiomeGenOasis.java
@@ -23,6 +23,7 @@ public class BiomeGenOasis extends BiomeGenBase
customBiomeDecorator = (BiomeDecoratorBOP)theBiomeDecorator;
customBiomeDecorator.treesPerChunk = 3;
customBiomeDecorator.grassPerChunk = 8;
+ customBiomeDecorator.wheatGrassPerChunk = 4;
customBiomeDecorator.reedsPerChunk = 100;
customBiomeDecorator.oasesPerChunk = 15;
customBiomeDecorator.oasesPerChunk2 = 15;
diff --git a/common/biomesoplenty/biomes/BiomeGenOminousWoods.java b/common/biomesoplenty/biomes/BiomeGenOminousWoods.java
index c688b3c51..ece3a7cb9 100644
--- a/common/biomesoplenty/biomes/BiomeGenOminousWoods.java
+++ b/common/biomesoplenty/biomes/BiomeGenOminousWoods.java
@@ -27,6 +27,7 @@ public class BiomeGenOminousWoods extends BiomeGenBase
customBiomeDecorator = (BiomeDecoratorBOP)theBiomeDecorator;
customBiomeDecorator.treesPerChunk = 10;
customBiomeDecorator.grassPerChunk = 1;
+ customBiomeDecorator.wheatGrassPerChunk = 0;
customBiomeDecorator.flowersPerChunk = -999;
customBiomeDecorator.deathbloomsPerChunk = 1;
customBiomeDecorator.mushroomsPerChunk = 8;
diff --git a/common/biomesoplenty/biomes/BiomeGenOminousWoodsThick.java b/common/biomesoplenty/biomes/BiomeGenOminousWoodsThick.java
index 561ef9472..668441ba8 100644
--- a/common/biomesoplenty/biomes/BiomeGenOminousWoodsThick.java
+++ b/common/biomesoplenty/biomes/BiomeGenOminousWoodsThick.java
@@ -29,6 +29,7 @@ public class BiomeGenOminousWoodsThick extends BiomeGenBase
customBiomeDecorator = (BiomeDecoratorBOP)theBiomeDecorator;
customBiomeDecorator.treesPerChunk = 14;
customBiomeDecorator.grassPerChunk = 4;
+ customBiomeDecorator.wheatGrassPerChunk = 2;
customBiomeDecorator.highGrassPerChunk = 4;
customBiomeDecorator.flowersPerChunk = -999;
customBiomeDecorator.deathbloomsPerChunk = 2;
diff --git a/common/biomesoplenty/biomes/BiomeGenOrchard.java b/common/biomesoplenty/biomes/BiomeGenOrchard.java
index a2c1fa177..357b9dc44 100644
--- a/common/biomesoplenty/biomes/BiomeGenOrchard.java
+++ b/common/biomesoplenty/biomes/BiomeGenOrchard.java
@@ -22,6 +22,7 @@ public class BiomeGenOrchard extends BiomeGenBase
customBiomeDecorator = (BiomeDecoratorBOP)theBiomeDecorator;
customBiomeDecorator.treesPerChunk = 2;
customBiomeDecorator.flowersPerChunk = 20;
+ customBiomeDecorator.wheatGrassPerChunk = 8;
customBiomeDecorator.whiteFlowersPerChunk = 20;
customBiomeDecorator.tinyFlowersPerChunk = 20;
customBiomeDecorator.grassPerChunk = 15;
diff --git a/common/biomesoplenty/biomes/BiomeGenOvergrownGreens.java b/common/biomesoplenty/biomes/BiomeGenOvergrownGreens.java
index dbd9be5c8..d8eed10ba 100644
--- a/common/biomesoplenty/biomes/BiomeGenOvergrownGreens.java
+++ b/common/biomesoplenty/biomes/BiomeGenOvergrownGreens.java
@@ -24,6 +24,7 @@ public class BiomeGenOvergrownGreens extends BiomeGenBase
customBiomeDecorator.treesPerChunk = 1;
customBiomeDecorator.flowersPerChunk = -999;
customBiomeDecorator.grassPerChunk = 10;
+ customBiomeDecorator.wheatGrassPerChunk = 10;
customBiomeDecorator.highGrassPerChunk = 15;
}
diff --git a/common/biomesoplenty/biomes/BiomeGenPastureMeadow.java b/common/biomesoplenty/biomes/BiomeGenPastureMeadow.java
index 345bc56c3..7b1588507 100644
--- a/common/biomesoplenty/biomes/BiomeGenPastureMeadow.java
+++ b/common/biomesoplenty/biomes/BiomeGenPastureMeadow.java
@@ -21,6 +21,7 @@ public class BiomeGenPastureMeadow extends BiomeGenBase
customBiomeDecorator = (BiomeDecoratorBOP)theBiomeDecorator;
customBiomeDecorator.treesPerChunk = 1;
customBiomeDecorator.grassPerChunk = 15;
+ customBiomeDecorator.wheatGrassPerChunk = 5;
customBiomeDecorator.sunflowersPerChunk = 99;
customBiomeDecorator.whiteFlowersPerChunk = 20;
spawnableCreatureList.clear();
diff --git a/common/biomesoplenty/biomes/BiomeGenPastureThin.java b/common/biomesoplenty/biomes/BiomeGenPastureThin.java
index c0fa1ba09..065f7ed8e 100644
--- a/common/biomesoplenty/biomes/BiomeGenPastureThin.java
+++ b/common/biomesoplenty/biomes/BiomeGenPastureThin.java
@@ -21,6 +21,7 @@ public class BiomeGenPastureThin extends BiomeGenBase
customBiomeDecorator = (BiomeDecoratorBOP)theBiomeDecorator;
customBiomeDecorator.treesPerChunk = 0;
customBiomeDecorator.grassPerChunk = 50;
+ customBiomeDecorator.wheatGrassPerChunk = 10;
customBiomeDecorator.sunflowersPerChunk = 10;
customBiomeDecorator.flowersPerChunk = -999;
spawnableCreatureList.clear();
diff --git a/common/biomesoplenty/biomes/BiomeGenPrairie.java b/common/biomesoplenty/biomes/BiomeGenPrairie.java
index c37017d35..7a348e9e9 100644
--- a/common/biomesoplenty/biomes/BiomeGenPrairie.java
+++ b/common/biomesoplenty/biomes/BiomeGenPrairie.java
@@ -27,6 +27,7 @@ public class BiomeGenPrairie extends BiomeGenBase
customBiomeDecorator.goldenrodsPerChunk = 40;
customBiomeDecorator.portobellosPerChunk = 2;
customBiomeDecorator.berryBushesPerChunk = 2;
+ customBiomeDecorator.wheatGrassPerChunk = 25;
customBiomeDecorator.carrotsPerChunk = 1;
spawnableCreatureList.add(new SpawnListEntry(EntityHorse.class, 5, 2, 6));
}
@@ -67,7 +68,7 @@ public class BiomeGenPrairie extends BiomeGenBase
@Override
public WorldGenerator getRandomWorldGenForGrass(Random par1Random)
{
- return (par1Random.nextInt(4) == 0 ? new WorldGenTallGrass(Block.tallGrass.blockID, 1) : (par1Random.nextInt(3) == 0 ? new WorldGenTallGrass(Blocks.foliage.get().blockID, 2) : new WorldGenTallGrass(Blocks.foliage.get().blockID, 1)));
+ return (par1Random.nextInt(5) == 0 ? new WorldGenTallGrass(Blocks.foliage.get().blockID, 1) : (par1Random.nextInt(3) == 0 ? new WorldGenTallGrass(Blocks.foliage.get().blockID, 2) : new WorldGenTallGrass(Block.tallGrass.blockID, 1)));
}
/**
diff --git a/common/biomesoplenty/biomes/BiomeGenQuagmire.java b/common/biomesoplenty/biomes/BiomeGenQuagmire.java
index 3b5db2d0c..60f5ba5a0 100644
--- a/common/biomesoplenty/biomes/BiomeGenQuagmire.java
+++ b/common/biomesoplenty/biomes/BiomeGenQuagmire.java
@@ -29,6 +29,7 @@ public class BiomeGenQuagmire extends BiomeGenBase
customBiomeDecorator.flowersPerChunk = -999;
customBiomeDecorator.sandPerChunk = -999;
customBiomeDecorator.sandPerChunk2 = -999;
+ customBiomeDecorator.wheatGrassPerChunk = 3;
waterColorMultiplier = 13390080;
customBiomeDecorator.generateQuagmire = true;
}
diff --git a/common/biomesoplenty/biomes/BiomeGenRainforest.java b/common/biomesoplenty/biomes/BiomeGenRainforest.java
index de9b7135e..e394dbe96 100644
--- a/common/biomesoplenty/biomes/BiomeGenRainforest.java
+++ b/common/biomesoplenty/biomes/BiomeGenRainforest.java
@@ -30,6 +30,7 @@ public class BiomeGenRainforest extends BiomeGenBase
customBiomeDecorator.rosesPerChunk = 10;
customBiomeDecorator.mushroomsPerChunk = 25;
customBiomeDecorator.orangeFlowersPerChunk = 6;
+ customBiomeDecorator.wheatGrassPerChunk = 10;
customBiomeDecorator.generatePumpkins = false;
spawnableMonsterList.add(new SpawnListEntry(EntityOcelot.class, 2, 1, 1));
spawnableMonsterList.add(new SpawnListEntry(EntityJungleSpider.class, 12, 6, 6));
diff --git a/common/biomesoplenty/biomes/BiomeGenRedwoodForest.java b/common/biomesoplenty/biomes/BiomeGenRedwoodForest.java
index bd1375789..5521cdeb4 100644
--- a/common/biomesoplenty/biomes/BiomeGenRedwoodForest.java
+++ b/common/biomesoplenty/biomes/BiomeGenRedwoodForest.java
@@ -27,6 +27,7 @@ public class BiomeGenRedwoodForest extends BiomeGenBase
customBiomeDecorator.grassPerChunk = 16;
customBiomeDecorator.bushesPerChunk = 4;
customBiomeDecorator.berryBushesPerChunk = 1;
+ customBiomeDecorator.wheatGrassPerChunk = 7;
customBiomeDecorator.generatePumpkins = false;
}
diff --git a/common/biomesoplenty/biomes/BiomeGenSacredSprings.java b/common/biomesoplenty/biomes/BiomeGenSacredSprings.java
index 41a35af0b..684ff7e95 100644
--- a/common/biomesoplenty/biomes/BiomeGenSacredSprings.java
+++ b/common/biomesoplenty/biomes/BiomeGenSacredSprings.java
@@ -25,6 +25,7 @@ public class BiomeGenSacredSprings extends BiomeGenBase
customBiomeDecorator = (BiomeDecoratorBOP)theBiomeDecorator;
customBiomeDecorator.treesPerChunk = 30;
customBiomeDecorator.grassPerChunk = 4;
+ customBiomeDecorator.wheatGrassPerChunk = 1;
customBiomeDecorator.waterlilyPerChunk = 5;
customBiomeDecorator.violetsPerChunk = 1;
customBiomeDecorator.hotSpringsPerChunk = 1;
diff --git a/common/biomesoplenty/biomes/BiomeGenSavanna.java b/common/biomesoplenty/biomes/BiomeGenSavanna.java
index b60e1b05b..c9fc64bd6 100644
--- a/common/biomesoplenty/biomes/BiomeGenSavanna.java
+++ b/common/biomesoplenty/biomes/BiomeGenSavanna.java
@@ -25,6 +25,7 @@ public class BiomeGenSavanna extends BiomeGenBase
customBiomeDecorator.purpleFlowersPerChunk = 10;
customBiomeDecorator.tinyFlowersPerChunk = 2;
customBiomeDecorator.grassPerChunk = 25;
+ customBiomeDecorator.wheatGrassPerChunk = 10;
customBiomeDecorator.bushesPerChunk = 10;
customBiomeDecorator.generatePumpkins = false;
}
diff --git a/common/biomesoplenty/biomes/BiomeGenSavannaPlateau.java b/common/biomesoplenty/biomes/BiomeGenSavannaPlateau.java
index d5623d4ea..7da58d788 100644
--- a/common/biomesoplenty/biomes/BiomeGenSavannaPlateau.java
+++ b/common/biomesoplenty/biomes/BiomeGenSavannaPlateau.java
@@ -25,6 +25,7 @@ public class BiomeGenSavannaPlateau extends BiomeGenBase
customBiomeDecorator.purpleFlowersPerChunk = 5;
customBiomeDecorator.tinyFlowersPerChunk = 1;
customBiomeDecorator.grassPerChunk = 10;
+ customBiomeDecorator.wheatGrassPerChunk = 5;
customBiomeDecorator.bushesPerChunk = 5;
customBiomeDecorator.generatePumpkins = false;
}
diff --git a/common/biomesoplenty/biomes/BiomeGenScrubland.java b/common/biomesoplenty/biomes/BiomeGenScrubland.java
index c7e99259c..88408c4b7 100644
--- a/common/biomesoplenty/biomes/BiomeGenScrubland.java
+++ b/common/biomesoplenty/biomes/BiomeGenScrubland.java
@@ -24,6 +24,7 @@ public class BiomeGenScrubland extends BiomeGenBase
customBiomeDecorator.flowersPerChunk = -999;
customBiomeDecorator.highGrassPerChunk = 2;
customBiomeDecorator.grassPerChunk = 30;
+ customBiomeDecorator.wheatGrassPerChunk = 10;
customBiomeDecorator.generatePumpkins = false;
}
diff --git a/common/biomesoplenty/biomes/BiomeGenSeasonalForest.java b/common/biomesoplenty/biomes/BiomeGenSeasonalForest.java
index 895404104..b6dae59c5 100644
--- a/common/biomesoplenty/biomes/BiomeGenSeasonalForest.java
+++ b/common/biomesoplenty/biomes/BiomeGenSeasonalForest.java
@@ -32,6 +32,7 @@ public class BiomeGenSeasonalForest extends BiomeGenBase
customBiomeDecorator.grassPerChunk = 8;
customBiomeDecorator.flowersPerChunk = -999;
customBiomeDecorator.toadstoolsPerChunk = 4;
+ customBiomeDecorator.wheatGrassPerChunk = 4;
}
/**
diff --git a/common/biomesoplenty/biomes/BiomeGenSeasonalSpruceForest.java b/common/biomesoplenty/biomes/BiomeGenSeasonalSpruceForest.java
index 1e67ac763..ee0a2f54e 100644
--- a/common/biomesoplenty/biomes/BiomeGenSeasonalSpruceForest.java
+++ b/common/biomesoplenty/biomes/BiomeGenSeasonalSpruceForest.java
@@ -32,6 +32,7 @@ public class BiomeGenSeasonalSpruceForest extends BiomeGenBase
customBiomeDecorator.grassPerChunk = 8;
customBiomeDecorator.flowersPerChunk = -999;
customBiomeDecorator.toadstoolsPerChunk = 4;
+ customBiomeDecorator.wheatGrassPerChunk = 4;
}
/**
diff --git a/common/biomesoplenty/biomes/BiomeGenShield.java b/common/biomesoplenty/biomes/BiomeGenShield.java
index 521d6128c..168917961 100644
--- a/common/biomesoplenty/biomes/BiomeGenShield.java
+++ b/common/biomesoplenty/biomes/BiomeGenShield.java
@@ -22,6 +22,7 @@ public class BiomeGenShield extends BiomeGenBase
customBiomeDecorator = (BiomeDecoratorBOP)theBiomeDecorator;
customBiomeDecorator.treesPerChunk = 7;
customBiomeDecorator.grassPerChunk = 12;
+ customBiomeDecorator.wheatGrassPerChunk = 6;
customBiomeDecorator.sandPerChunk = -999;
customBiomeDecorator.sandPerChunk2 = -999;
customBiomeDecorator.gravelPerChunk = 6;
diff --git a/common/biomesoplenty/biomes/BiomeGenShrubland.java b/common/biomesoplenty/biomes/BiomeGenShrubland.java
index f0801473d..7ead8b754 100644
--- a/common/biomesoplenty/biomes/BiomeGenShrubland.java
+++ b/common/biomesoplenty/biomes/BiomeGenShrubland.java
@@ -24,6 +24,7 @@ public class BiomeGenShrubland extends BiomeGenBase
customBiomeDecorator.treesPerChunk = 0;
customBiomeDecorator.flowersPerChunk = 0;
customBiomeDecorator.grassPerChunk = 5;
+ customBiomeDecorator.wheatGrassPerChunk = 2;
customBiomeDecorator.bushesPerChunk = 7;
customBiomeDecorator.generatePumpkins = false;
spawnableCreatureList.add(new SpawnListEntry(EntityHorse.class, 5, 2, 6));
diff --git a/common/biomesoplenty/biomes/BiomeGenShrublandForest.java b/common/biomesoplenty/biomes/BiomeGenShrublandForest.java
index 93cd2897d..6741913bb 100644
--- a/common/biomesoplenty/biomes/BiomeGenShrublandForest.java
+++ b/common/biomesoplenty/biomes/BiomeGenShrublandForest.java
@@ -25,6 +25,7 @@ public class BiomeGenShrublandForest extends BiomeGenBase
customBiomeDecorator.flowersPerChunk = 0;
customBiomeDecorator.grassPerChunk = 10;
customBiomeDecorator.bushesPerChunk = 7;
+ customBiomeDecorator.wheatGrassPerChunk = 5;
customBiomeDecorator.generatePumpkins = false;
spawnableCreatureList.add(new SpawnListEntry(EntityHorse.class, 5, 2, 6));
}
diff --git a/common/biomesoplenty/biomes/BiomeGenSilkglades.java b/common/biomesoplenty/biomes/BiomeGenSilkglades.java
index acbeb3954..6861b8c3f 100644
--- a/common/biomesoplenty/biomes/BiomeGenSilkglades.java
+++ b/common/biomesoplenty/biomes/BiomeGenSilkglades.java
@@ -28,6 +28,7 @@ public class BiomeGenSilkglades extends BiomeGenBase
customBiomeDecorator = (BiomeDecoratorBOP)theBiomeDecorator;
customBiomeDecorator.treesPerChunk = 6;
customBiomeDecorator.grassPerChunk = 2;
+ customBiomeDecorator.wheatGrassPerChunk = 1;
customBiomeDecorator.flowersPerChunk = -999;
customBiomeDecorator.reedsPerChunk = -999;
customBiomeDecorator.sandPerChunk = -999;
diff --git a/common/biomesoplenty/biomes/BiomeGenSludgepit.java b/common/biomesoplenty/biomes/BiomeGenSludgepit.java
index 10fb0328c..45bd496cf 100644
--- a/common/biomesoplenty/biomes/BiomeGenSludgepit.java
+++ b/common/biomesoplenty/biomes/BiomeGenSludgepit.java
@@ -29,6 +29,7 @@ public class BiomeGenSludgepit extends BiomeGenBase
customBiomeDecorator = (BiomeDecoratorBOP)theBiomeDecorator;
customBiomeDecorator.treesPerChunk = 30;
customBiomeDecorator.grassPerChunk = 30;
+ customBiomeDecorator.wheatGrassPerChunk = 10;
customBiomeDecorator.flowersPerChunk = -999;
customBiomeDecorator.sandPerChunk = -999;
customBiomeDecorator.sandPerChunk2 = -999;
diff --git a/common/biomesoplenty/biomes/BiomeGenSpruceWoods.java b/common/biomesoplenty/biomes/BiomeGenSpruceWoods.java
index 12afaa1ca..72467d396 100644
--- a/common/biomesoplenty/biomes/BiomeGenSpruceWoods.java
+++ b/common/biomesoplenty/biomes/BiomeGenSpruceWoods.java
@@ -27,6 +27,7 @@ public class BiomeGenSpruceWoods extends BiomeGenBase
customBiomeDecorator.sproutsPerChunk = 3;
customBiomeDecorator.poisonIvyPerChunk = 1;
customBiomeDecorator.berryBushesPerChunk = 3;
+ customBiomeDecorator.wheatGrassPerChunk = 10;
customBiomeDecorator.carrotsPerChunk = 1;
customBiomeDecorator.bluebellsPerChunk = 100;
}
diff --git a/common/biomesoplenty/biomes/BiomeGenTemperateRainforest.java b/common/biomesoplenty/biomes/BiomeGenTemperateRainforest.java
index 1bc551475..98bb8a706 100644
--- a/common/biomesoplenty/biomes/BiomeGenTemperateRainforest.java
+++ b/common/biomesoplenty/biomes/BiomeGenTemperateRainforest.java
@@ -25,6 +25,7 @@ public class BiomeGenTemperateRainforest extends BiomeGenBase
customBiomeDecorator = (BiomeDecoratorBOP)theBiomeDecorator;
customBiomeDecorator.treesPerChunk = 22;
customBiomeDecorator.grassPerChunk = 25;
+ customBiomeDecorator.wheatGrassPerChunk = 10;
customBiomeDecorator.generatePumpkins = false;
customBiomeDecorator.blueMilksPerChunk = 3;
customBiomeDecorator.poisonIvyPerChunk = 1;
diff --git a/common/biomesoplenty/biomes/BiomeGenThicket.java b/common/biomesoplenty/biomes/BiomeGenThicket.java
index 56fbace13..9a7f31d44 100644
--- a/common/biomesoplenty/biomes/BiomeGenThicket.java
+++ b/common/biomesoplenty/biomes/BiomeGenThicket.java
@@ -17,6 +17,7 @@ public class BiomeGenThicket extends BiomeGenBase
customBiomeDecorator = (BiomeDecoratorBOP)theBiomeDecorator;
customBiomeDecorator.treesPerChunk = 17;
customBiomeDecorator.grassPerChunk = 1;
+ customBiomeDecorator.wheatGrassPerChunk = 0;
customBiomeDecorator.thornsPerChunk = 25;
}
diff --git a/common/biomesoplenty/biomes/BiomeGenTimber.java b/common/biomesoplenty/biomes/BiomeGenTimber.java
index 7f3286731..5a15c2ea5 100644
--- a/common/biomesoplenty/biomes/BiomeGenTimber.java
+++ b/common/biomesoplenty/biomes/BiomeGenTimber.java
@@ -23,6 +23,7 @@ public class BiomeGenTimber extends BiomeGenBase
customBiomeDecorator = (BiomeDecoratorBOP)theBiomeDecorator;
customBiomeDecorator.treesPerChunk = 20;
customBiomeDecorator.grassPerChunk = 8;
+ customBiomeDecorator.wheatGrassPerChunk = 4;
customBiomeDecorator.thornsPerChunk = 2;
customBiomeDecorator.flowersPerChunk = -999;
customBiomeDecorator.toadstoolsPerChunk = 2;
diff --git a/common/biomesoplenty/biomes/BiomeGenTimberThin.java b/common/biomesoplenty/biomes/BiomeGenTimberThin.java
index c9e33ba4b..20c172fe0 100644
--- a/common/biomesoplenty/biomes/BiomeGenTimberThin.java
+++ b/common/biomesoplenty/biomes/BiomeGenTimberThin.java
@@ -21,8 +21,9 @@ public class BiomeGenTimberThin extends BiomeGenBase
super(par1);
theBiomeDecorator = new BiomeDecoratorBOP(this);
customBiomeDecorator = (BiomeDecoratorBOP)theBiomeDecorator;
- customBiomeDecorator.treesPerChunk = 5;
+ customBiomeDecorator.treesPerChunk = 4;
customBiomeDecorator.grassPerChunk = 8;
+ customBiomeDecorator.wheatGrassPerChunk = 4;
customBiomeDecorator.thornsPerChunk = 2;
customBiomeDecorator.flowersPerChunk = -999;
customBiomeDecorator.toadstoolsPerChunk = 2;
diff --git a/common/biomesoplenty/biomes/BiomeGenTropicalRainforest.java b/common/biomesoplenty/biomes/BiomeGenTropicalRainforest.java
index 651eb41e4..f026d0a4e 100644
--- a/common/biomesoplenty/biomes/BiomeGenTropicalRainforest.java
+++ b/common/biomesoplenty/biomes/BiomeGenTropicalRainforest.java
@@ -27,7 +27,7 @@ public class BiomeGenTropicalRainforest extends BiomeGenBase
theBiomeDecorator = new BiomeDecoratorBOP(this);
customBiomeDecorator = (BiomeDecoratorBOP)theBiomeDecorator;
customBiomeDecorator.treesPerChunk = 12;
- customBiomeDecorator.grassPerChunk = 7;
+ customBiomeDecorator.grassPerChunk = 9;
customBiomeDecorator.highGrassPerChunk = 4;
customBiomeDecorator.reedsPerChunk = 10;
customBiomeDecorator.waterlilyPerChunk = 2;
@@ -39,6 +39,7 @@ public class BiomeGenTropicalRainforest extends BiomeGenBase
customBiomeDecorator.poisonIvyPerChunk = 4;
customBiomeDecorator.lilyflowersPerChunk = 2;
customBiomeDecorator.taroPerChunk = 15;
+ customBiomeDecorator.wheatGrassPerChunk = 5;
spawnableMonsterList.add(new SpawnListEntry(EntityJungleSpider.class, 12, 6, 6));
waterColorMultiplier = 6160128;
}
diff --git a/common/biomesoplenty/biomes/BiomeGenTropics.java b/common/biomesoplenty/biomes/BiomeGenTropics.java
index 60988d16f..b02559183 100644
--- a/common/biomesoplenty/biomes/BiomeGenTropics.java
+++ b/common/biomesoplenty/biomes/BiomeGenTropics.java
@@ -26,6 +26,7 @@ public class BiomeGenTropics extends BiomeGenBase
customBiomeDecorator = (BiomeDecoratorBOP)theBiomeDecorator;
customBiomeDecorator.treesPerChunk = 4;
customBiomeDecorator.grassPerChunk = 7;
+ customBiomeDecorator.wheatGrassPerChunk = 4;
customBiomeDecorator.flowersPerChunk = 10;
customBiomeDecorator.sandPerChunk = 50;
customBiomeDecorator.sandPerChunk2 = 50;
diff --git a/common/biomesoplenty/biomes/BiomeGenTundra.java b/common/biomesoplenty/biomes/BiomeGenTundra.java
index 096f2eb6c..0c9639bdc 100644
--- a/common/biomesoplenty/biomes/BiomeGenTundra.java
+++ b/common/biomesoplenty/biomes/BiomeGenTundra.java
@@ -23,6 +23,7 @@ public class BiomeGenTundra extends BiomeGenBase
customBiomeDecorator = (BiomeDecoratorBOP)theBiomeDecorator;
customBiomeDecorator.treesPerChunk = 5;
customBiomeDecorator.grassPerChunk = 8;
+ customBiomeDecorator.wheatGrassPerChunk = 3;
customBiomeDecorator.flowersPerChunk = -999;
customBiomeDecorator.reedsPerChunk = -999;
customBiomeDecorator.gravelPerChunk = 8;
diff --git a/common/biomesoplenty/biomes/BiomeGenWetland.java b/common/biomesoplenty/biomes/BiomeGenWetland.java
index 51dd5ab95..adc7f7412 100644
--- a/common/biomesoplenty/biomes/BiomeGenWetland.java
+++ b/common/biomesoplenty/biomes/BiomeGenWetland.java
@@ -25,6 +25,7 @@ public class BiomeGenWetland extends BiomeGenBase
customBiomeDecorator = (BiomeDecoratorBOP)theBiomeDecorator;
customBiomeDecorator.treesPerChunk = 10;
customBiomeDecorator.grassPerChunk = 10;
+ customBiomeDecorator.wheatGrassPerChunk = 5;
customBiomeDecorator.flowersPerChunk = -999;
customBiomeDecorator.mushroomsPerChunk = 5;
customBiomeDecorator.toadstoolsPerChunk = 1;
diff --git a/common/biomesoplenty/biomes/BiomeGenWoodland.java b/common/biomesoplenty/biomes/BiomeGenWoodland.java
index 2c3979a74..739f2f4e2 100644
--- a/common/biomesoplenty/biomes/BiomeGenWoodland.java
+++ b/common/biomesoplenty/biomes/BiomeGenWoodland.java
@@ -19,6 +19,7 @@ public class BiomeGenWoodland extends BiomeGenBase
customBiomeDecorator = (BiomeDecoratorBOP)theBiomeDecorator;
customBiomeDecorator.treesPerChunk = 9;
customBiomeDecorator.grassPerChunk = 7;
+ customBiomeDecorator.wheatGrassPerChunk = 3;
customBiomeDecorator.toadstoolsPerChunk = 3;
}
diff --git a/common/biomesoplenty/biomes/vanilla/BiomeGenForestNew.java b/common/biomesoplenty/biomes/vanilla/BiomeGenForestNew.java
index c19525468..14ce19719 100644
--- a/common/biomesoplenty/biomes/vanilla/BiomeGenForestNew.java
+++ b/common/biomesoplenty/biomes/vanilla/BiomeGenForestNew.java
@@ -31,6 +31,7 @@ public class BiomeGenForestNew extends BiomeGenBase
customBiomeDecorator.sunflowersPerChunk = 1;
customBiomeDecorator.berryBushesPerChunk = 2;
customBiomeDecorator.carrotsPerChunk = 1;
+ customBiomeDecorator.wheatGrassPerChunk = 1;
}
/**
diff --git a/common/biomesoplenty/biomes/vanilla/BiomeGenHillsNew.java b/common/biomesoplenty/biomes/vanilla/BiomeGenHillsNew.java
index f270b801e..429c82841 100644
--- a/common/biomesoplenty/biomes/vanilla/BiomeGenHillsNew.java
+++ b/common/biomesoplenty/biomes/vanilla/BiomeGenHillsNew.java
@@ -21,6 +21,7 @@ public class BiomeGenHillsNew extends BiomeGenBase
theBiomeDecorator = new BiomeDecoratorBOP(this);
customBiomeDecorator = (BiomeDecoratorBOP)theBiomeDecorator;
customBiomeDecorator.treesPerChunk = 1;
+ customBiomeDecorator.wheatGrassPerChunk = 0;
customBiomeDecorator.violetsPerChunk = 5;
theWorldGenerator = new WorldGenMinable(Block.silverfish.blockID, 8);
}
diff --git a/common/biomesoplenty/biomes/vanilla/BiomeGenJungleNew.java b/common/biomesoplenty/biomes/vanilla/BiomeGenJungleNew.java
index 9dea8109e..6aceae878 100644
--- a/common/biomesoplenty/biomes/vanilla/BiomeGenJungleNew.java
+++ b/common/biomesoplenty/biomes/vanilla/BiomeGenJungleNew.java
@@ -32,6 +32,7 @@ public class BiomeGenJungleNew extends BiomeGenBase
customBiomeDecorator = (BiomeDecoratorBOP)theBiomeDecorator;
customBiomeDecorator.treesPerChunk = 45;
customBiomeDecorator.grassPerChunk = 25;
+ customBiomeDecorator.wheatGrassPerChunk = 10;
customBiomeDecorator.flowersPerChunk = 4;
customBiomeDecorator.orangeFlowersPerChunk = 5;
customBiomeDecorator.poisonIvyPerChunk = 1;
diff --git a/common/biomesoplenty/biomes/vanilla/BiomeGenPlainsNew.java b/common/biomesoplenty/biomes/vanilla/BiomeGenPlainsNew.java
index 7ef5b423e..6497f2922 100644
--- a/common/biomesoplenty/biomes/vanilla/BiomeGenPlainsNew.java
+++ b/common/biomesoplenty/biomes/vanilla/BiomeGenPlainsNew.java
@@ -24,6 +24,7 @@ public class BiomeGenPlainsNew extends BiomeGenBase
customBiomeDecorator.treesPerChunk = -999;
customBiomeDecorator.flowersPerChunk = 4;
customBiomeDecorator.grassPerChunk = 10;
+ customBiomeDecorator.wheatGrassPerChunk = 5;
customBiomeDecorator.tinyFlowersPerChunk = 1;
customBiomeDecorator.portobellosPerChunk = 1;
customBiomeDecorator.sunflowersPerChunk = 2;
diff --git a/common/biomesoplenty/biomes/vanilla/BiomeGenSwampNew.java b/common/biomesoplenty/biomes/vanilla/BiomeGenSwampNew.java
index 8f5d01757..3d7740431 100644
--- a/common/biomesoplenty/biomes/vanilla/BiomeGenSwampNew.java
+++ b/common/biomesoplenty/biomes/vanilla/BiomeGenSwampNew.java
@@ -35,6 +35,7 @@ public class BiomeGenSwampNew extends BiomeGenBase
customBiomeDecorator.reedsPerChunk = 10;
customBiomeDecorator.clayPerChunk = 1;
customBiomeDecorator.waterlilyPerChunk = 4;
+ customBiomeDecorator.wheatGrassPerChunk = 0;
customBiomeDecorator.mudPerChunk = 9;
customBiomeDecorator.mudPerChunk2 = 9;
customBiomeDecorator.portobellosPerChunk = 1;
diff --git a/common/biomesoplenty/biomes/vanilla/BiomeGenTaigaNew.java b/common/biomesoplenty/biomes/vanilla/BiomeGenTaigaNew.java
index 3edf38d7a..9584ea47f 100644
--- a/common/biomesoplenty/biomes/vanilla/BiomeGenTaigaNew.java
+++ b/common/biomesoplenty/biomes/vanilla/BiomeGenTaigaNew.java
@@ -27,6 +27,7 @@ public class BiomeGenTaigaNew extends BiomeGenBase
customBiomeDecorator = (BiomeDecoratorBOP)theBiomeDecorator;
customBiomeDecorator.treesPerChunk = 10;
customBiomeDecorator.grassPerChunk = 1;
+ customBiomeDecorator.wheatGrassPerChunk = 0;
customBiomeDecorator.violetsPerChunk = 1;
}
diff --git a/common/biomesoplenty/blocks/BlockBOPFoliage.java b/common/biomesoplenty/blocks/BlockBOPFoliage.java
index a5118c2fd..2227a2039 100644
--- a/common/biomesoplenty/blocks/BlockBOPFoliage.java
+++ b/common/biomesoplenty/blocks/BlockBOPFoliage.java
@@ -36,7 +36,7 @@ import cpw.mods.fml.relauncher.SideOnly;
public class BlockBOPFoliage extends BlockFlower implements IShearable
{
- private static final String[] foliageTypes = new String[] {"algae", "shortgrass", "mediumgrass", "highgrassbottom", "bush", "sprout", "highgrasstop", "poisonivy", "berrybush", "taro", "wheatgrass"};
+ private static final String[] foliageTypes = new String[] {"algae", "shortgrass", "mediumgrass", "highgrassbottom", "bush", "sprout", "highgrasstop", "poisonivy", "berrybush", "taro", "wheatgrass", "dampgrass"};
private Icon[] textures;
diff --git a/common/biomesoplenty/itemblocks/ItemBlockFoliage.java b/common/biomesoplenty/itemblocks/ItemBlockFoliage.java
index 255125f8e..0be648d26 100644
--- a/common/biomesoplenty/itemblocks/ItemBlockFoliage.java
+++ b/common/biomesoplenty/itemblocks/ItemBlockFoliage.java
@@ -17,7 +17,7 @@ import cpw.mods.fml.relauncher.SideOnly;
public class ItemBlockFoliage extends ItemColored
{
- private static final String[] foliageTypes = new String[] {"algae", "shortgrass", "mediumgrass", "highgrassbottom", "bush", "sprout", "highgrasstop", "poisonivy", "berrybush", "taro", "wheatgrass"};
+ private static final String[] foliageTypes = new String[] {"algae", "shortgrass", "mediumgrass", "highgrassbottom", "bush", "sprout", "highgrasstop", "poisonivy", "berrybush", "taro", "wheatgrass", "dampgrass"};
@SideOnly(Side.CLIENT)
private Icon[] textures;
private static final int GRASSTOP = 6;
diff --git a/resources/assets/biomesoplenty/lang/en_US.xml b/resources/assets/biomesoplenty/lang/en_US.xml
index 7b1d9c310..d270819d5 100644
--- a/resources/assets/biomesoplenty/lang/en_US.xml
+++ b/resources/assets/biomesoplenty/lang/en_US.xml
@@ -72,6 +72,7 @@
Berry Bush
Taro
Wheat Grass
+ Damp Grass
Giant Red Flower
Giant Yellow Flower
diff --git a/resources/assets/biomesoplenty/textures/blocks/dampgrass.png b/resources/assets/biomesoplenty/textures/blocks/dampgrass.png
new file mode 100644
index 000000000..f9796679e
Binary files /dev/null and b/resources/assets/biomesoplenty/textures/blocks/dampgrass.png differ
diff --git a/resources/assets/biomesoplenty/textures/blocks/wheatgrass.png b/resources/assets/biomesoplenty/textures/blocks/wheatgrass.png
index fd7b44c37..c0ec1a8da 100644
Binary files a/resources/assets/biomesoplenty/textures/blocks/wheatgrass.png and b/resources/assets/biomesoplenty/textures/blocks/wheatgrass.png differ