diff --git a/common/biomesoplenty/api/BlockReferences.java b/common/biomesoplenty/api/BlockReferences.java
index e41df5df0..ac119eacb 100644
--- a/common/biomesoplenty/api/BlockReferences.java
+++ b/common/biomesoplenty/api/BlockReferences.java
@@ -185,7 +185,9 @@ public class BlockReferences {
hibiscus (Blocks.flowers2, 0),
lilyofthevalley (Blocks.flowers2, 1),
burningblossom (Blocks.flowers2, 2),
- lavender (Blocks.flowers2, 2),
+ lavender (Blocks.flowers2, 3),
+ goldenrod (Blocks.flowers2, 4),
+ bluebells (Blocks.flowers2, 5),
;
public Optional extends Block> block;
diff --git a/common/biomesoplenty/biomes/BiomeDecoratorBOP.java b/common/biomesoplenty/biomes/BiomeDecoratorBOP.java
index 789f43bf6..e0c9b09eb 100644
--- a/common/biomesoplenty/biomes/BiomeDecoratorBOP.java
+++ b/common/biomesoplenty/biomes/BiomeDecoratorBOP.java
@@ -223,6 +223,8 @@ public class BiomeDecoratorBOP extends BiomeDecorator
public WorldGenerator lilyOfTheValleyGen;
public WorldGenerator burningBlossomGen;
public WorldGenerator lavenderGen;
+ public WorldGenerator goldenrodGen;
+ public WorldGenerator bluebellGen;
public WorldGenerator boneSpineGen;
public WorldGenerator boneSpine2Gen;
@@ -312,6 +314,8 @@ public class BiomeDecoratorBOP extends BiomeDecorator
public int lilyOfTheValleysPerChunk;
public int burningBlossomsPerChunk;
public int lavenderPerChunk;
+ public int goldenrodsPerChunk;
+ public int bluebellsPerChunk;
public int boneSpinesPerChunk;
public int boneSpines2PerChunk;
@@ -465,6 +469,8 @@ public class BiomeDecoratorBOP extends BiomeDecorator
lilyOfTheValleyGen = new WorldGenBOPFlowers(Blocks.flowers2.get().blockID, 1);
burningBlossomGen = new WorldGenBOPFlowers(Blocks.flowers2.get().blockID, 2);
lavenderGen = new WorldGenBOPFlowers(Blocks.flowers2.get().blockID, 3);
+ goldenrodGen = new WorldGenBOPFlowers(Blocks.flowers2.get().blockID, 4);
+ bluebellGen = new WorldGenBOPFlowers(Blocks.flowers2.get().blockID, 5);
lilyflowerGen = new WorldGenLilyflower();
deathbloomGen = new WorldGenBOPFlowers(Blocks.flowers.get().blockID, 2);
hydrangeaGen = new WorldGenBOPFlowers(Blocks.flowers.get().blockID, 4);
@@ -594,6 +600,8 @@ public class BiomeDecoratorBOP extends BiomeDecorator
lilyOfTheValleysPerChunk = 0;
burningBlossomsPerChunk = 0;
lavenderPerChunk = 0;
+ goldenrodsPerChunk = 0;
+ bluebellsPerChunk = 0;
generateLakes = true;
generateAsh = false;
generateMycelium = false;
@@ -1146,6 +1154,22 @@ public class BiomeDecoratorBOP extends BiomeDecorator
var5 = chunk_Z + randomGenerator.nextInt(16) + 8;
lavenderGen.generate(currentWorld, randomGenerator, var3, var4, var5);
}
+
+ for (var2 = 0; var2 < goldenrodsPerChunk; ++var2)
+ {
+ var3 = chunk_X + randomGenerator.nextInt(16) + 8;
+ var4 = randomGenerator.nextInt(256);
+ var5 = chunk_Z + randomGenerator.nextInt(16) + 8;
+ goldenrodGen.generate(currentWorld, randomGenerator, var3, var4, var5);
+ }
+
+ for (var2 = 0; var2 < bluebellsPerChunk; ++var2)
+ {
+ var3 = chunk_X + randomGenerator.nextInt(16) + 8;
+ var4 = randomGenerator.nextInt(256);
+ var5 = chunk_Z + randomGenerator.nextInt(16) + 8;
+ bluebellGen.generate(currentWorld, randomGenerator, var3, var4, var5);
+ }
for (var2 = 0; var2 < hydrangeasPerChunk; ++var2)
{
diff --git a/common/biomesoplenty/biomes/BiomeGenPrairie.java b/common/biomesoplenty/biomes/BiomeGenPrairie.java
index 5d847931a..2b3491744 100644
--- a/common/biomesoplenty/biomes/BiomeGenPrairie.java
+++ b/common/biomesoplenty/biomes/BiomeGenPrairie.java
@@ -23,7 +23,8 @@ public class BiomeGenPrairie extends BiomeGenBase
customBiomeDecorator = (BiomeDecoratorBOP)theBiomeDecorator;
customBiomeDecorator.treesPerChunk = 1;
customBiomeDecorator.grassPerChunk = 999;
- customBiomeDecorator.whiteFlowersPerChunk = 45;
+ customBiomeDecorator.whiteFlowersPerChunk = 20;
+ customBiomeDecorator.goldenrodsPerChunk = 40;
customBiomeDecorator.portobellosPerChunk = 2;
customBiomeDecorator.berryBushesPerChunk = 2;
customBiomeDecorator.carrotsPerChunk = 1;
diff --git a/common/biomesoplenty/biomes/BiomeGenSpruceWoods.java b/common/biomesoplenty/biomes/BiomeGenSpruceWoods.java
index bdf113111..cbff7ac01 100644
--- a/common/biomesoplenty/biomes/BiomeGenSpruceWoods.java
+++ b/common/biomesoplenty/biomes/BiomeGenSpruceWoods.java
@@ -28,6 +28,7 @@ public class BiomeGenSpruceWoods extends BiomeGenBase
customBiomeDecorator.poisonIvyPerChunk = 1;
customBiomeDecorator.berryBushesPerChunk = 3;
customBiomeDecorator.carrotsPerChunk = 1;
+ customBiomeDecorator.bluebellsPerChunk = 100;
}
/**
diff --git a/common/biomesoplenty/blocks/BlockBOPFlower2.java b/common/biomesoplenty/blocks/BlockBOPFlower2.java
index 089557a17..08a392975 100644
--- a/common/biomesoplenty/blocks/BlockBOPFlower2.java
+++ b/common/biomesoplenty/blocks/BlockBOPFlower2.java
@@ -22,7 +22,7 @@ import cpw.mods.fml.relauncher.SideOnly;
public class BlockBOPFlower2 extends BlockFlower
{
- private static final String[] plants2 = new String[] {"hibiscus", "lilyofthevalley", "burningblossom", "lavender"};
+ private static final String[] plants2 = new String[] {"hibiscus", "lilyofthevalley", "burningblossom", "lavender", "goldenrod", "bluebells"};
private Icon[] textures;
protected BlockBOPFlower2(int blockID, Material material)
diff --git a/common/biomesoplenty/integration/ThaumcraftIntegration.java b/common/biomesoplenty/integration/ThaumcraftIntegration.java
index a27c35e5c..9ac620f3f 100644
--- a/common/biomesoplenty/integration/ThaumcraftIntegration.java
+++ b/common/biomesoplenty/integration/ThaumcraftIntegration.java
@@ -226,6 +226,9 @@ public class ThaumcraftIntegration {
ThaumcraftApi.registerObjectTag(getBID("hibiscus"), getBMeta("hibiscus"), (new AspectList()).add(Aspect.PLANT, 4));
ThaumcraftApi.registerObjectTag(getBID("lilyofthevalley"), getBMeta("lilyofthevalley"), (new AspectList()).add(Aspect.PLANT, 4).add(Aspect.POISON, 1));
ThaumcraftApi.registerObjectTag(getBID("burningblossom"), getBMeta("burningblossom"), (new AspectList()).add(Aspect.PLANT, 4).add(Aspect.FIRE, 2));
+ ThaumcraftApi.registerObjectTag(getBID("lavender"), getBMeta("lavender"), (new AspectList()).add(Aspect.PLANT, 4));
+ ThaumcraftApi.registerObjectTag(getBID("goldenrod"), getBMeta("goldenrod"), (new AspectList()).add(Aspect.PLANT, 4));
+ ThaumcraftApi.registerObjectTag(getBID("bluebells"), getBMeta("bluebells"), (new AspectList()).add(Aspect.PLANT, 4));
}
diff --git a/common/biomesoplenty/itemblocks/ItemBlockFlower2.java b/common/biomesoplenty/itemblocks/ItemBlockFlower2.java
index 426466fa6..9bf57957b 100644
--- a/common/biomesoplenty/itemblocks/ItemBlockFlower2.java
+++ b/common/biomesoplenty/itemblocks/ItemBlockFlower2.java
@@ -18,7 +18,7 @@ import cpw.mods.fml.relauncher.SideOnly;
public class ItemBlockFlower2 extends ItemBlock
{
- private static final String[] plants = new String[] {"hibiscus", "lilyofthevalley", "burningblossom", "lavender"};
+ private static final String[] plants = new String[] {"hibiscus", "lilyofthevalley", "burningblossom", "lavender", "goldenrod", "bluebells"};
@SideOnly(Side.CLIENT)
private Icon[] textures;
diff --git a/common/biomesoplenty/worldgen/tree/WorldGenTaiga3.java b/common/biomesoplenty/worldgen/tree/WorldGenTaiga3.java
index 5b158728f..e27446de7 100644
--- a/common/biomesoplenty/worldgen/tree/WorldGenTaiga3.java
+++ b/common/biomesoplenty/worldgen/tree/WorldGenTaiga3.java
@@ -20,7 +20,7 @@ public class WorldGenTaiga3 extends WorldGenerator
int var6 = var2.nextInt(10) + 35;
int var7 = var2.nextInt(5) + 10;
int var8 = var6 - var7;
- int var9 = 4;
+ int var9 = 3;
boolean var10 = true;
if (var4 >= 1 && var4 + var6 + 1 <= 256)
diff --git a/common/biomesoplenty/worldgen/tree/WorldGenTaiga4.java b/common/biomesoplenty/worldgen/tree/WorldGenTaiga4.java
index d75b17484..0d148768b 100644
--- a/common/biomesoplenty/worldgen/tree/WorldGenTaiga4.java
+++ b/common/biomesoplenty/worldgen/tree/WorldGenTaiga4.java
@@ -20,7 +20,7 @@ public class WorldGenTaiga4 extends WorldGenerator
int var6 = var2.nextInt(15) + 20;
int var7 = var2.nextInt(3) + 5;
int var8 = var6 - var7;
- int var9 = 2 + var2.nextInt(3);
+ int var9 = 2 + var2.nextInt(2);
boolean var10 = true;
if (var4 >= 1 && var4 + var6 + 1 <= 256)
diff --git a/resources/assets/biomesoplenty/lang/en_US.xml b/resources/assets/biomesoplenty/lang/en_US.xml
index 4b3718936..487823e5f 100644
--- a/resources/assets/biomesoplenty/lang/en_US.xml
+++ b/resources/assets/biomesoplenty/lang/en_US.xml
@@ -58,6 +58,8 @@
Lily of the Valley
Burning Blossom
Lavender
+ Goldenrod
+ Bluebells
Algae
Short Grass
diff --git a/resources/assets/biomesoplenty/textures/blocks/bluebells.png b/resources/assets/biomesoplenty/textures/blocks/bluebells.png
new file mode 100644
index 000000000..66cbf117f
Binary files /dev/null and b/resources/assets/biomesoplenty/textures/blocks/bluebells.png differ
diff --git a/resources/assets/biomesoplenty/textures/blocks/goldenrod.png b/resources/assets/biomesoplenty/textures/blocks/goldenrod.png
new file mode 100644
index 000000000..e70aff367
Binary files /dev/null and b/resources/assets/biomesoplenty/textures/blocks/goldenrod.png differ
diff --git a/resources/assets/biomesoplenty/textures/blocks/swampflower.png b/resources/assets/biomesoplenty/textures/blocks/swampflower.png
index 1c9ccf242..dea98a029 100644
Binary files a/resources/assets/biomesoplenty/textures/blocks/swampflower.png and b/resources/assets/biomesoplenty/textures/blocks/swampflower.png differ