From 1f300d2ce560837745e6e76be0d395a3dd45b5f8 Mon Sep 17 00:00:00 2001
From: Matt Caughey <Catcwe316@comcast.net>
Date: Sat, 21 Sep 2013 15:13:48 -0400
Subject: [PATCH] Fixed Miner's Delight and Burning Blossom gen

---
 .../biomes/BiomeDecoratorBOP.java             |   7 +--
 .../worldgen/WorldGenBOPDarkFlowers.java      |  40 ++++++++++++++++++
 .../textures/blocks/minersdelight.png         | Bin 574 -> 390 bytes
 3 files changed, 44 insertions(+), 3 deletions(-)
 create mode 100644 common/biomesoplenty/worldgen/WorldGenBOPDarkFlowers.java

diff --git a/common/biomesoplenty/biomes/BiomeDecoratorBOP.java b/common/biomesoplenty/biomes/BiomeDecoratorBOP.java
index 2dee61af3..2166463ad 100644
--- a/common/biomesoplenty/biomes/BiomeDecoratorBOP.java
+++ b/common/biomesoplenty/biomes/BiomeDecoratorBOP.java
@@ -49,6 +49,7 @@ import biomesoplenty.configuration.configfile.BOPConfigurationTerrainGen;
 import biomesoplenty.worldgen.WorldGenAlgae;
 import biomesoplenty.worldgen.WorldGenAsh;
 import biomesoplenty.worldgen.WorldGenBOPBush;
+import biomesoplenty.worldgen.WorldGenBOPDarkFlowers;
 import biomesoplenty.worldgen.WorldGenBOPFlowers;
 import biomesoplenty.worldgen.WorldGenBOPPumpkin;
 import biomesoplenty.worldgen.WorldGenBadlands;
@@ -478,11 +479,11 @@ public class BiomeDecoratorBOP extends BiomeDecorator
 		coralGen = new WorldGenCoral(Blocks.coral.get().blockID, 4);
 		hibiscusGen = new WorldGenBOPFlowers(Blocks.flowers2.get().blockID, 0);
 		lilyOfTheValleyGen = new WorldGenBOPFlowers(Blocks.flowers2.get().blockID, 1);
-		burningBlossomGen = new WorldGenBOPFlowers(Blocks.flowers2.get().blockID, 2);
+		burningBlossomGen = new WorldGenBOPDarkFlowers(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);
-		minersDelightGen = new WorldGenBOPFlowers(Blocks.flowers2.get().blockID, 6);
+		minersDelightGen = new WorldGenBOPDarkFlowers(Blocks.flowers2.get().blockID, 6);
 		lilyflowerGen = new WorldGenLilyflower();
 		deathbloomGen = new WorldGenBOPFlowers(Blocks.flowers.get().blockID, 2);
 		hydrangeaGen = new WorldGenBOPFlowers(Blocks.flowers.get().blockID, 4);
@@ -616,7 +617,7 @@ public class BiomeDecoratorBOP extends BiomeDecorator
 		lavenderPerChunk = 0;
 		goldenrodsPerChunk = 0;
 		bluebellsPerChunk = 0;
-		minersDelightPerChunk = 3;
+		minersDelightPerChunk = 2;
 		generateLakes = true;
 		generateAsh = false;
 		generateMycelium = false;
diff --git a/common/biomesoplenty/worldgen/WorldGenBOPDarkFlowers.java b/common/biomesoplenty/worldgen/WorldGenBOPDarkFlowers.java
new file mode 100644
index 000000000..f964b4bc8
--- /dev/null
+++ b/common/biomesoplenty/worldgen/WorldGenBOPDarkFlowers.java
@@ -0,0 +1,40 @@
+package biomesoplenty.worldgen;
+
+import java.util.Random;
+
+import net.minecraft.block.Block;
+import net.minecraft.item.ItemStack;
+import net.minecraft.world.World;
+import net.minecraft.world.gen.feature.WorldGenerator;
+
+public class WorldGenBOPDarkFlowers extends WorldGenerator
+{
+	/** The ID of the plant block used in this plant generator. */
+	private int plantBlockId;
+	private int plantBlockMeta;
+
+	public WorldGenBOPDarkFlowers(int par1, int meta)
+	{
+		plantBlockId = par1;
+		plantBlockMeta = meta;
+	}
+
+	@Override
+	public boolean generate(World par1World, Random par2Random, int par3, int par4, int par5)
+	{
+		for (int l = 0; l < 64; ++l)
+		{
+			int i1 = par3 + par2Random.nextInt(8) - par2Random.nextInt(8);
+			int j1 = par4 + par2Random.nextInt(4) - par2Random.nextInt(4);
+			int k1 = par5 + par2Random.nextInt(8) - par2Random.nextInt(8);
+
+			if (par1World.isAirBlock(i1, j1, k1) && (!par1World.provider.hasNoSky || j1 < 127)
+					&& Block.blocksList[plantBlockId].canPlaceBlockOnSide(par1World, i1, j1, k1, 1, new ItemStack(plantBlockId, 1, plantBlockMeta)))
+			{
+				par1World.setBlock(i1, j1, k1, plantBlockId, plantBlockMeta, 2);
+			}
+		}
+
+		return true;
+	}
+}
diff --git a/resources/assets/biomesoplenty/textures/blocks/minersdelight.png b/resources/assets/biomesoplenty/textures/blocks/minersdelight.png
index fbc75bf1438290de0ee844da90d4b87fcde8d621..05974f411680398870f3cd80e284adc64d906c8b 100644
GIT binary patch
delta 302
zcmV+}0nz@x1cn2UJPN=701m(bYSxJfkwz(h0!c(cR5(v#7zH!}t&<Y}Lz!Su-V%($
z#|aLs>-v9qW6%GcE1Lhura6H%wNFVVPV=snEntNpLl*R=|DRYJ{=cy=_J2~gJ7ELX
z&&UBQngG<aWI{HW-CG&*KR&~SINL#B&#JcnGusmWZ=99)e|k$CSYu~t!2jqJ2Qa&T
zZE_NR!(gtM+7yGLFfq&Re_eMJe$5~N(+KiAhz^Ul2Gh+G;{U_gcmc?{P$nFJ!l1S*
zlCWlU(AwJizpbqe9Eh-3m^g7FaRxOvH~(*MZ~vc?lJdW)sR^7OdV72S7Zw)&uc)XX
z&XAaxnE#QHk^fUuQ~yUrMS%?iv7yo#NPvL>09`<aB*7*_djJ3c07*qoM6N<$f>$q#
A`2YX_

delta 487
zcmV<D0T}*<1HJ^1JPN`901m<d6(~x8kwz(hx=BPqR5(w4QcWv_Q5b#a^PSHhV{Ide
z&1|U|qlsoDHfA@`h#50eG?-Y}C?BPeC|~(pu&^O^LXi|n+4up6^O*bgzVG1F?LPOp
z&pqe4=U&b4_iJXj-R^2+g~#KmMn7=5T-E3sT=1aN>C}8apFyJQy37g`s}ZmlnL$;5
zrA!eD5G3L7dcCr)Wi>&y8VCfmU@#~#>n&GM8-(2xJGiep5vUfK<aIvZ&+&Y}hj2J7
zd4+$8X&i|@UQTg#FoTze1N3JjsBR1FuTX>6$3vW-%z`AGw^m0nGSML<yfX>R=Bc%`
zc5^u|hql)WxHy}`-SrYSmWPq(X)?NhU|lE_l9-0lM8mt?^%CBmj&ZUxiQB719Bq~1
za5%Kpg+a6@8$f@G(_NM;S-=8zL6!Z@F-u`*Z!?C*V@8g|95mc`N+x)aE%EMrfk<ne
z9Li56(3Yr|ShfBuR^|r`6}}2V53*xX$y1R+e?om}I$J0dP%IY3#IC*;A*fVRD&h-=
z<s;c!%IEVal}bn^lgQ<A=;&@lxm-p%okk{;f${&%P`^yI9*@TnjYg45r4Wn7gp9E=
dPeIpp?F;OqpkDn6`Y-?h002ovPDHLkV1jJW<?jFh