Added alternate black and white dye. Added glowshrooms. Tweaked some textures.

src/minecraft/biomesoplenty/api/BlockReferences.java

@@ -120,6 +120,7 @@ public class BlockReferences {
 		portobello (Blocks.flowers, 13),
 		bluemilk (Blocks.flowers, 14),
 		dandelion (Blocks.flowers, 15),
+		glowshroom (Blocks.flowers, 16),
 		holyTallGrass (Blocks.plants, 4),
 		desertSprouts (Blocks.plants, 2),
 		duneGrass (Blocks.plants, 3),

src/minecraft/biomesoplenty/biomes/BiomeDecoratorBOP.java

@@ -168,6 +168,7 @@ public class BiomeDecoratorBOP extends BiomeDecorator
     protected WorldGenerator toadstoolGen;
 	protected WorldGenerator portobelloGen;
 	protected WorldGenerator blueMilkGen;
+	protected WorldGenerator glowshroomGen;
     protected WorldGenerator highGrassGen;
     protected WorldGenerator carrotGen;
     protected WorldGenerator potatoGen;
@@ -243,6 +244,7 @@ public class BiomeDecoratorBOP extends BiomeDecorator
     protected int toadstoolsPerChunk;
 	protected int portobellosPerChunk;
 	protected int blueMilksPerChunk;
+	protected int glowshroomsPerChunk;
     protected int sproutsPerChunk;
     protected int bushesPerChunk;
 	protected int tinyCactiPerChunk;
@@ -402,6 +404,7 @@ public class BiomeDecoratorBOP extends BiomeDecorator
         this.toadstoolGen = new WorldGenBOPFlowers(Blocks.flowers.get().blockID, 10);
 		this.portobelloGen = new WorldGenBOPFlowers(Blocks.flowers.get().blockID, 13);
 		this.blueMilkGen = new WorldGenBOPFlowers(Blocks.flowers.get().blockID, 14);
+		this.glowshroomGen = new WorldGenBOPFlowers(Blocks.flowers.get().blockID, 16);
         this.sproutGen = new WorldGenSprout(Blocks.foliage.get().blockID, 5);
         this.highGrassGen = new WorldGenHighGrass(Blocks.foliage.get().blockID, 3);
 		this.highCattailGen = new WorldGenHighCattail(Blocks.plants.get().blockID, 9);
@@ -455,6 +458,7 @@ public class BiomeDecoratorBOP extends BiomeDecorator
         this.toadstoolsPerChunk = 0;
 		this.portobellosPerChunk = 0;
 		this.blueMilksPerChunk = 0;
+		this.glowshroomsPerChunk = 0;
         this.sproutsPerChunk = 0;
         this.bushesPerChunk = 0;
 		this.tinyCactiPerChunk = 0;
@@ -938,6 +942,14 @@ public class BiomeDecoratorBOP extends BiomeDecorator
             var5 = this.chunk_Z + this.randomGenerator.nextInt(16) + 8;
             this.blueMilkGen.generate(this.currentWorld, this.randomGenerator, var3, var4, var5);
         }
+		
+		for (var2 = 0; var2 < this.glowshroomsPerChunk; ++var2)
+        {
+            var3 = this.chunk_X + this.randomGenerator.nextInt(16) + 8;
+            var4 = this.randomGenerator.nextInt(80);
+            var5 = this.chunk_Z + this.randomGenerator.nextInt(16) + 8;
+            this.glowshroomGen.generate(this.currentWorld, this.randomGenerator, var3, var4, var5);
+        }
 
         for (var2 = 0; var2 < this.sproutsPerChunk; ++var2)
         {

src/minecraft/biomesoplenty/biomes/BiomeGenFungiForest.java

@@ -39,6 +39,7 @@ public class BiomeGenFungiForest extends BiomeGenBase
 		this.customBiomeDecorator.toadstoolsPerChunk = 5;
 		this.customBiomeDecorator.portobellosPerChunk = 7;
 		this.customBiomeDecorator.blueMilksPerChunk = 4;
+		this.customBiomeDecorator.glowshroomsPerChunk = 2;
         this.customBiomeDecorator.blueFlowersPerChunk = 3;
 		this.customBiomeDecorator.cattailsPerChunk = 1;
 		this.customBiomeDecorator.highCattailsPerChunk = 2;

src/minecraft/biomesoplenty/biomes/BiomeGenMysticGrove.java

@@ -35,6 +35,7 @@ public class BiomeGenMysticGrove extends BiomeGenBase
 		this.customBiomeDecorator.sproutsPerChunk = 3;
 		this.customBiomeDecorator.hydrangeasPerChunk = 3;
 		this.customBiomeDecorator.blueMilksPerChunk = 4;
+		this.customBiomeDecorator.glowshroomsPerChunk = 2;
         this.waterColorMultiplier = 15349914;
 		this.spawnableMonsterList.clear();
         this.spawnableCreatureList.clear();

src/minecraft/biomesoplenty/blocks/BlockBOPFlower.java

@@ -22,7 +22,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", "toadstool", "cactus", "aloe", "portobello", "bluemilk", "dandelion"};
+    private static final String[] plants = new String[] {"clover", "swampflower", "deadbloom", "glowflower", "hydrangea", "daisy", "tulip", "wildflower", "violet", "anemone", "toadstool", "cactus", "aloe", "portobello", "bluemilk", "dandelion", "glowshroom"};
     private Icon[] textures;
     
     protected BlockBOPFlower(int blockID, Material material)
@@ -68,6 +68,8 @@ public class BlockBOPFlower extends BlockFlower
         int meta = world.getBlockMetadata(x, y, z);
         if (meta == 3)
             return 9;
+		if (meta == 16)
+            return 6;
         else
             return 0;
     }
@@ -143,6 +145,8 @@ public class BlockBOPFlower extends BlockFlower
     		return id == Block.grass.blockID || id == Block.dirt.blockID || id == Block.mycelium.blockID | id == Blocks.holyGrass.get().blockID;
 		if (metadata == 14) //Blue Milk Cap
     		return id == Block.grass.blockID || id == Block.dirt.blockID || id == Block.mycelium.blockID || id == Blocks.holyGrass.get().blockID;
+		if (metadata == 16) //Glowshroom
+    		return id == Block.grass.blockID || id == Block.dirt.blockID || id == Block.mycelium.blockID || id == Block.stone.blockID;
     	else
     		return id == Block.grass.blockID || id == Block.dirt.blockID || id == Block.tilledField.blockID;
     }
@@ -174,6 +178,9 @@ public class BlockBOPFlower extends BlockFlower
 					
 				case 14: // Blue Milk Cap
                     return id == Block.grass.blockID || id == Block.dirt.blockID || id == Block.mycelium.blockID || id == Blocks.holyGrass.get().blockID;
+					
+				case 16: // Glowshroom
+                    return id == Block.grass.blockID || id == Block.dirt.blockID || id == Block.mycelium.blockID || id == Block.stone.blockID;
 
                 default:
                     return id == Block.grass.blockID || id == Block.dirt.blockID || id == Block.tilledField.blockID;

src/minecraft/biomesoplenty/configuration/BOPBlocks.java

@@ -300,6 +300,7 @@ public class BOPBlocks {
 		LanguageRegistry.addName(new ItemStack(Blocks.flowers.get(),1,13), "Portobello");
 		LanguageRegistry.addName(new ItemStack(Blocks.flowers.get(),1,14), "Blue Milk Cap");
 		LanguageRegistry.addName(new ItemStack(Blocks.flowers.get(),1,15), "Dandelion");
+		LanguageRegistry.addName(new ItemStack(Blocks.flowers.get(),1,16), "Glowshroom");
         LanguageRegistry.addName(new ItemStack(Blocks.saplings.get(),1,6), "Fir Sapling");
         LanguageRegistry.addName(new ItemStack(Blocks.colorizedSaplings.get(),1,3), "Redwood Sapling");
         LanguageRegistry.addName(new ItemStack(Blocks.colorizedSaplings.get(),1,2), "Palm Sapling");

src/minecraft/biomesoplenty/configuration/BOPCrafting.java

@@ -31,11 +31,14 @@ public class BOPCrafting
         GameRegistry.addShapelessRecipe(new ItemStack(Item.dyePowder, 2, 7), new Object[] {new ItemStack(Blocks.flowers.get(),1,15)});
         GameRegistry.addShapelessRecipe(new ItemStack(Item.dyePowder, 2, 12), new Object[] {new ItemStack(Blocks.flowers.get(),1,4)});
         GameRegistry.addShapelessRecipe(new ItemStack(Item.dyePowder, 2, 5), new Object[] {new ItemStack(Blocks.flowers.get(),1,8)});
+		GameRegistry.addShapelessRecipe(new ItemStack(Item.dyePowder, 2, 10), new Object[] {new ItemStack(Blocks.flowers.get(),1,16)});
         GameRegistry.addShapelessRecipe(new ItemStack(Item.dyePowder, 2, 8), new Object[] {new ItemStack(Items.miscItems.get(), 1, 1)});
 		
 		GameRegistry.addShapelessRecipe(new ItemStack(Items.miscItems.get(), 2, 5), new Object[] {new ItemStack(Blocks.flowers.get(),1,14)});
-		GameRegistry.addShapelessRecipe(new ItemStack(Items.miscItems.get(), 2, 6), new Object[] {new ItemStack(Items.mudball.get(),1,0)});
+		GameRegistry.addShapelessRecipe(new ItemStack(Items.miscItems.get(), 2, 6), new Object[] {new ItemStack(Blocks.plants.get(),1,7)});
 		GameRegistry.addShapelessRecipe(new ItemStack(Items.miscItems.get(), 2, 7), new Object[] {new ItemStack(Blocks.moss.get(),1,0)});
+		GameRegistry.addShapelessRecipe(new ItemStack(Items.miscItems.get(), 2, 8), new Object[] {new ItemStack(Blocks.flowers.get(),1,9)});
+		GameRegistry.addShapelessRecipe(new ItemStack(Items.miscItems.get(), 2, 9), new Object[] {new ItemStack(Blocks.flowers.get(),1,2)});
 
         //Brick stairs and slabs
         GameRegistry.addRecipe(new ItemStack(Blocks.stoneSingleSlab.get(), 6, 0), new Object[] {"RRR", 'R', new ItemStack(Blocks.redRock.get(),1,1)});
@@ -207,6 +210,8 @@ public class BOPCrafting
 		OreDictionary.registerOre("dyeBlue", new ItemStack(Items.miscItems.get(), 1, 5));
 		OreDictionary.registerOre("dyeBrown", new ItemStack(Items.miscItems.get(), 1, 6));
 		OreDictionary.registerOre("dyeGreen", new ItemStack(Items.miscItems.get(), 1, 7));
+		OreDictionary.registerOre("dyeWhite", new ItemStack(Items.miscItems.get(), 1, 8));
+		OreDictionary.registerOre("dyeBlack", new ItemStack(Items.miscItems.get(), 1, 9));
         
         OreDictionary.registerOre("treeSapling", new ItemStack(Blocks.saplings.get(), 1, OreDictionary.WILDCARD_VALUE));
         OreDictionary.registerOre("treeSapling", new ItemStack(Blocks.colorizedSaplings.get(), 1, OreDictionary.WILDCARD_VALUE));

src/minecraft/biomesoplenty/configuration/BOPItems.java

@@ -156,6 +156,8 @@ public class BOPItems {
 		LanguageRegistry.addName(new ItemStack(Items.miscItems.get(), 1, 5), "Blue Dye");
 		LanguageRegistry.addName(new ItemStack(Items.miscItems.get(), 1, 6), "Brown Dye");
 		LanguageRegistry.addName(new ItemStack(Items.miscItems.get(), 1, 7), "Green Dye");
+		LanguageRegistry.addName(new ItemStack(Items.miscItems.get(), 1, 8), "White Dye");
+		LanguageRegistry.addName(new ItemStack(Items.miscItems.get(), 1, 9), "Black Dye");
         
         LanguageRegistry.addName(Items.pickaxeMud.get(), "Muddy Pickaxe");
         LanguageRegistry.addName(Items.axeMud.get(), "Muddy Axe");

src/minecraft/biomesoplenty/configuration/BOPVanillaCompat.java

@@ -31,25 +31,17 @@ public class BOPVanillaCompat {
 		village = ChestGenHooks.getInfo(ChestGenHooks.VILLAGE_BLACKSMITH);
 
 		dungeon.addItem(new WeightedRandomChestContent(new ItemStack(Items.bopDisc.get()), 1, 1, 2));
-		dungeon.addItem(new WeightedRandomChestContent(new ItemStack(Blocks.moss.get()), 2, 8, 50));
-		dungeon.addItem(new WeightedRandomChestContent(new ItemStack(Item.dyePowder, 1, 2), 4, 12, 75));
 
 		mineshaft.addItem(new WeightedRandomChestContent(new ItemStack(Items.miscItems.get(), 1, 1), 2, 8, 25));
 		mineshaft.addItem(new WeightedRandomChestContent(new ItemStack(Blocks.plants.get(),1,5), 4, 6, 15));
-		mineshaft.addItem(new WeightedRandomChestContent(new ItemStack(Items.mudball.get(), 1, 0), 2, 8, 10));
-		mineshaft.addItem(new WeightedRandomChestContent(new ItemStack(Item.dyePowder, 1, 3), 4, 12, 75));
 
-		strongholdCorridor.addItem(new WeightedRandomChestContent(new ItemStack(Blocks.moss.get()), 2, 8, 50));
 		strongholdCorridor.addItem(new WeightedRandomChestContent(new ItemStack(Blocks.flowers.get(),1,3), 1, 4, 25));
 		strongholdCorridor.addItem(new WeightedRandomChestContent(new ItemStack(Blocks.flowers.get(),1,2), 1, 4, 25));
 
-		strongholdCrossing.addItem(new WeightedRandomChestContent(new ItemStack(Blocks.moss.get()), 2, 8, 50));
 		strongholdCrossing.addItem(new WeightedRandomChestContent(new ItemStack(Blocks.flowers.get(),1,3), 1, 4, 25));
 		strongholdCrossing.addItem(new WeightedRandomChestContent(new ItemStack(Blocks.flowers.get(),1,2), 1, 4, 25));
 
-		village.addItem(new WeightedRandomChestContent(new ItemStack(Items.shroomPowder.get()), 1, 5, 50));
 		village.addItem(new WeightedRandomChestContent(new ItemStack(Blocks.plants.get(),1,5), 2, 6, 25));
-		village.addItem(new WeightedRandomChestContent(new ItemStack(Item.dyePowder, 1, 2), 4, 12, 75));
-		village.addItem(new WeightedRandomChestContent(new ItemStack(Item.dyePowder, 1, 3), 4, 12, 75));
+		village.addItem(new WeightedRandomChestContent(new ItemStack(Items.miscItems.get(), 1, 1), 2, 8, 25));
 	}
 }

src/minecraft/biomesoplenty/items/ItemBOP.java

@@ -13,7 +13,7 @@ import cpw.mods.fml.relauncher.SideOnly;
 
 public class ItemBOP extends Item
 {
-    private static String[] items = {"mudbrick", "ash", "amethyst", "poison", "crystalshard", "bluedye", "browndye", "greendye"};
+    private static String[] items = {"mudbrick", "ash", "amethyst", "poison", "crystalshard", "bluedye", "browndye", "greendye", "whitedye", "blackdye"};
     @SideOnly(Side.CLIENT)
     private Icon[] textures;
 

src/minecraft/biomesoplenty/items/ItemBOPFlower.java

@@ -10,7 +10,7 @@ import net.minecraft.world.World;
 
 public class ItemBOPFlower extends ItemBlock
 {
-    private static final String[] plants = new String[] {"clover", "swampflower", "deadbloom", "glowflower", "hydrangea", "daisy", "tulip", "wildflower", "violet", "anemone", "toadstool", "cactus", "aloe", "portobello", "bluemilk", "dandelion"};
+    private static final String[] plants = new String[] {"clover", "swampflower", "deadbloom", "glowflower", "hydrangea", "daisy", "tulip", "wildflower", "violet", "anemone", "toadstool", "cactus", "aloe", "portobello", "bluemilk", "dandelion", "glowshroom"};
     
     public ItemBOPFlower(int par1)
     {