Added kelp stuff, change some flower names/textures

src/minecraft/assets/biomesoplenty/lang/en_US.xml

@@ -40,18 +40,18 @@
 	<entry key="tile.bop.flowers.swampflower.name">Swampflower</entry>
 	<entry key="tile.bop.flowers.deadbloom.name">Deathbloom</entry>
 	<entry key="tile.bop.flowers.glowflower.name">Glowflower</entry>
-	<entry key="tile.bop.flowers.hydrangea.name">Hydrangea</entry>
-	<entry key="tile.bop.flowers.daisy.name">Daisy</entry>
-	<entry key="tile.bop.flowers.tulip.name">Tulip</entry>
+	<entry key="tile.bop.flowers.hydrangea.name">Blue Hydrangea</entry>
+	<entry key="tile.bop.flowers.cosmos.name">Orange Cosmos</entry>
+	<entry key="tile.bop.flowers.daffodil.name">Pink Daffodil</entry>
 	<entry key="tile.bop.flowers.wildflower.name">Wildflower</entry>
 	<entry key="tile.bop.flowers.violet.name">Violet</entry>
-	<entry key="tile.bop.flowers.anemone.name">Anemone</entry>
+	<entry key="tile.bop.flowers.anemone.name">White Anemone</entry>
 	<entry key="tile.bop.flowers.lilyflower.name">Waterlily</entry>
 	<entry key="tile.bop.flowers.rainbowflower.name">Chromaflora</entry>
 	<entry key="tile.bop.flowers.aloe.name">Aloe</entry>
 	<entry key="tile.bop.flowers.sunflowerbottom.name">Sunflower</entry>
 	<entry key="tile.bop.flowers.sunflowertop.name">Sunflower</entry>
-	<entry key="tile.bop.flowers.dandelion.name">Dandelion</entry>
+	<entry key="tile.bop.flowers.dandelion.name">White Dandelion</entry>
 
 	<entry key="tile.bop.foliage.algae.name">Algae</entry>
 	<entry key="tile.bop.foliage.shortgrass.name">Short Grass</entry>
@@ -153,7 +153,7 @@
 	
 	<entry key="tile.bop.puddle.name">Puddle</entry>
 	
-    <entry key="tile.bop.grave.name">Grave</entry>
+    <entry key="tile.bop.grave.name">Gravestone</entry>
 
 	<entry key="tile.bop.stoneDoubleSlab.redcobbleSlab.name">Red Rock Cobblestone Slab</entry>
 	<entry key="tile.bop.stoneDoubleSlab.redbrickSlab.name">Red Rock Bricks Slab</entry>

src/minecraft/biomesoplenty/api/BlockReferences.java

@@ -167,8 +167,8 @@ public class BlockReferences {
 		deathbloom (Blocks.flowers, 2),
 		glowFlower (Blocks.flowers, 3),
 		hydrangea (Blocks.flowers, 4),
-		daisy (Blocks.flowers, 5),
-		tulip (Blocks.flowers, 6),
+		cosmos (Blocks.flowers, 5),
+		daffodil (Blocks.flowers, 6),
 		wildFlower (Blocks.flowers, 7),
 		violet (Blocks.flowers, 8),
 		anenome (Blocks.flowers, 9),

src/minecraft/biomesoplenty/biomes/BiomeGenDunes.java

@@ -20,10 +20,10 @@ public class BiomeGenDunes extends BiomeGenBase
 		theBiomeDecorator = new BiomeDecoratorBOP(this);
 		customBiomeDecorator = (BiomeDecoratorBOP)theBiomeDecorator;
 		customBiomeDecorator.treesPerChunk = -999;
-		customBiomeDecorator.deadBushPerChunk = -999;
-		customBiomeDecorator.duneGrassPerChunk = 10;
-		customBiomeDecorator.desertSproutsPerChunk = 5;
-		customBiomeDecorator.aloePerChunk = 1;
+		customBiomeDecorator.deadBushPerChunk = 5;
+		customBiomeDecorator.duneGrassPerChunk = 75;
+		customBiomeDecorator.desertSproutsPerChunk = 25;
+		customBiomeDecorator.aloePerChunk = 5;
 		customBiomeDecorator.reedsPerChunk = -999;
 		customBiomeDecorator.generateLakes = false;
 	}

src/minecraft/biomesoplenty/blocks/BlockBOPCoral.java

@@ -12,12 +12,13 @@ import net.minecraft.item.ItemStack;
 import net.minecraft.util.Icon;
 import net.minecraft.world.World;
 import biomesoplenty.BiomesOPlenty;
+import biomesoplenty.api.Blocks;
 import cpw.mods.fml.relauncher.Side;
 import cpw.mods.fml.relauncher.SideOnly;
 
 public class BlockBOPCoral extends BlockFlower
 {
-	private static final String[] coral = new String[] {"kelp"};
+	private static final String[] coral = new String[] {"kelpbottom", "kelpmiddle", "kelptop", "pinkcoral", "orangecoral", "bluecoral", "glowcoral"};
 	private Icon[] textures;
 
 	protected BlockBOPCoral(int blockID, Material material)
@@ -76,12 +77,17 @@ public class BlockBOPCoral extends BlockFlower
 	@Override
 	protected boolean canThisPlantGrowOnThisBlockID(int id)
 	{
-		return id == Block.dirt.blockID || id == Block.sand.blockID;
+		return id == Block.dirt.blockID || id == Block.sand.blockID || id == blockID;
 	}
 
 	protected boolean canThisPlantGrowOnThisBlockID(int id, int metadata)
 	{
-		return id == Block.dirt.blockID || id == Block.sand.blockID;
+		if (metadata == 1)
+			return id == blockID;
+		if (metadata == 2)
+			return id == blockID || id == Block.dirt.blockID || id == Block.sand.blockID;
+		else
+			return id == Block.dirt.blockID || id == Block.sand.blockID;
 	}
 
 	@Override
@@ -91,9 +97,19 @@ public class BlockBOPCoral extends BlockFlower
 		int meta = itemStack.getItemDamage();
 		//boolean sky = world.getFullBlockLightValue(x, y, z) >= 8 || world.canBlockSeeTheSky(x, y, z);
 
-		if (itemStack.itemID == blockID)
-			return id == Block.dirt.blockID || id == Block.sand.blockID;
-		else
+		if (itemStack.itemID == blockID) {
+			switch (meta)
+			{
+			case 1: // Kelp Middle
+				return id == blockID;
+
+			case 2: // Kelp Bottom
+				return id == blockID;
+
+			default:
+				return id == Block.dirt.blockID || id == Block.sand.blockID;
+			}
+		} else
 			return this.canPlaceBlockOnSide(world, x, y, z, side);
 	}
 
@@ -127,11 +143,9 @@ public class BlockBOPCoral extends BlockFlower
 	public boolean canBlockStay(World world, int x, int y, int z)
 	{
 		if (world.getBlockId(x, y, z) != blockID)
-			return (world.getFullBlockLightValue(x, y, z) >= 8 || world.canBlockSeeTheSky(x, y, z))
-					&& this.canThisPlantGrowOnThisBlockID(world.getBlockId(x, y - 1, z));
+			return this.canThisPlantGrowOnThisBlockID(world.getBlockId(x, y - 1, z));
 		else
-			return (world.getFullBlockLightValue(x, y, z) >= 8 || world.canBlockSeeTheSky(x, y, z))
-					&& this.canThisPlantGrowOnThisBlockID(world.getBlockId(x, y - 1, z), world.getBlockMetadata(x, y, z));
+			return this.canThisPlantGrowOnThisBlockID(world.getBlockId(x, y - 1, z), world.getBlockMetadata(x, y, z));
 	}
 
 	@Override

src/minecraft/biomesoplenty/blocks/BlockBOPFlower.java

@@ -24,7 +24,7 @@ import cpw.mods.fml.relauncher.SideOnly;
 
 public class BlockBOPFlower extends BlockFlower
 {
-	private static final String[] plants = new String[] {"clover", "swampflower", "deadbloom", "glowflower", "hydrangea", "daisy", "tulip", "wildflower", "violet", "anemone", "lilyflower", "rainbowflower", "aloe", "sunflowerbottom", "sunflowertop", "dandelion"};
+	private static final String[] plants = new String[] {"clover", "swampflower", "deadbloom", "glowflower", "hydrangea", "cosmos", "daffodil", "wildflower", "violet", "anemone", "lilyflower", "rainbowflower", "aloe", "sunflowerbottom", "sunflowertop", "dandelion"};
 	private Icon[] textures;
 
 	private static final int SUNFLOWERTOP = 14;

src/minecraft/biomesoplenty/itemblocks/ItemBlockCoral.java

@@ -12,7 +12,7 @@ import cpw.mods.fml.relauncher.SideOnly;
 
 public class ItemBlockCoral extends ItemBlock
 {
-	private static final String[] coral = new String[] {"kelp"};
+	private static final String[] coral = new String[] {"kelpbottom", "kelpmiddle", "kelptop", "pinkcoral", "orangecoral", "bluecoral", "glowcoral"};
 	@SideOnly(Side.CLIENT)
 	private Icon[] textures;
 

src/minecraft/biomesoplenty/itemblocks/ItemBlockFlower.java

@@ -18,7 +18,7 @@ import cpw.mods.fml.relauncher.SideOnly;
 
 public class ItemBlockFlower extends ItemBlock
 {
-	private static final String[] plants = new String[] {"clover", "swampflower", "deadbloom", "glowflower", "hydrangea", "daisy", "tulip", "wildflower", "violet", "anemone", "lilyflower", "rainbowflower", "aloe", "sunflowerbottom", "sunflowertop", "dandelion"};
+	private static final String[] plants = new String[] {"clover", "swampflower", "deadbloom", "glowflower", "hydrangea", "cosmos", "daffodil", "wildflower", "violet", "anemone", "lilyflower", "rainbowflower", "aloe", "sunflowerbottom", "sunflowertop", "dandelion"};
 	@SideOnly(Side.CLIENT)
 	private Icon[] textures;
 	private static final int SUNFLOWERTOP = 14;

src/minecraft/biomesoplenty/world/layer/BiomeLayerCreate.java

@@ -2,6 +2,7 @@ package biomesoplenty.world.layer;
 
 import net.minecraft.world.gen.layer.IntCache;
 import biomesoplenty.configuration.BOPConfiguration;
+import biomesoplenty.api.Biomes;
 
 public class BiomeLayerCreate extends BiomeLayer
 {
@@ -16,8 +17,8 @@ public class BiomeLayerCreate extends BiomeLayer
 		int[] var5 = IntCache.getIntCache(par3 * par4);
 
 		boolean ocean = BOPConfiguration.BiomeGen.oceanGen;
-		//boolean coral = Biomes.oceanCoral.isPresent();
-		//boolean kelp = Biomes.oceanKelp.isPresent();
+		boolean coral = Biomes.oceanCoral.isPresent();
+		boolean kelp = Biomes.oceanKelp.isPresent();
 
 		for (int var6 = 0; var6 < par4; ++var6)
 		{
@@ -26,9 +27,9 @@ public class BiomeLayerCreate extends BiomeLayer
 				this.initChunkSeed(par1 + var7, par2 + var6);
 				if(ocean)
 				{
-					/*if(coral) { var5[var7 + var6 * par3] = this.nextInt(10) == 0 ? 1 : Biomes.oceanCoral.get().biomeID; }
+					if(coral) { var5[var7 + var6 * par3] = this.nextInt(10) == 0 ? 1 : Biomes.oceanCoral.get().biomeID; }
 					else if(kelp) { var5[var7 + var6 * par3] = this.nextInt(10) == 0 ? 1 : Biomes.oceanKelp.get().biomeID; }
-					else {*/ var5[var7 + var6 * par3] = this.nextInt(10) == 0 ? 1 : 0; //}
+					else { var5[var7 + var6 * par3] = this.nextInt(10) == 0 ? 1 : 0;}
 				}
 				else
 				{

src/minecraft/biomesoplenty/world/layer/BiomeLayerSub.java

@@ -44,10 +44,6 @@ public class BiomeLayerSub extends BiomeLayer
                 if (k1 == Biomes.forestNew.get().biomeID && nextInt(3) == 0) { l1 = Biomes.forestHillsNew.get().biomeID; }
                 if (k1 == Biomes.taigaNew.get().biomeID && nextInt(3) == 0) { l1 = Biomes.taigaHillsNew.get().biomeID; }
                 if (k1 == Biomes.jungleNew.get().biomeID && nextInt(3) == 0) { l1 = Biomes.jungleHillsNew.get().biomeID; }
-                
-                //if (k1 == BiomeGenBase.ocean.biomeID && nextInt(2) == 0) { l1 = Biomes.tropics.get().biomeID; }
-                //if (k1 == BiomeGenBase.ocean.biomeID && nextInt(3) == 0) { l1 = Biomes.volcano.get().biomeID; }
-                //if (k1 == BiomeGenBase.ocean.biomeID && nextInt(3) == 0) { l1 = Biomes.polar.get().biomeID; }
 
                 if (l1 == k1)
                 {