Added Icy Iris flower and Flat Mushroom

common/biomesoplenty/api/BlockReferences.java

@@ -151,6 +151,7 @@ public class BlockReferences {
 		portobello (Blocks.mushrooms, 1),
 		bluemilk (Blocks.mushrooms, 2),
 		glowshroom (Blocks.mushrooms, 3),
+		flatmushroom (Blocks.mushrooms, 4),
 
 		deadGrass (Blocks.plants, 0),
 		desertGrass (Blocks.plants, 1),
@@ -192,6 +193,7 @@ public class BlockReferences {
 		goldenrod (Blocks.flowers2, 4),
 		bluebells (Blocks.flowers2, 5),
 		minersdelight (Blocks.flowers2, 6),
+		icyiris (Blocks.flowers2, 7),
 		;
 
 		public Optional<? extends Block> block;

common/biomesoplenty/biomes/BiomeDecoratorBOP.java

@@ -231,6 +231,7 @@ public class BiomeDecoratorBOP extends BiomeDecorator
 	public WorldGenerator goldenrodGen;
 	public WorldGenerator bluebellGen;
 	public WorldGenerator minersDelightGen;
+	public WorldGenerator icyIrisGen;
 
 	public WorldGenerator boneSpineGen;
 	public WorldGenerator boneSpine2Gen;
@@ -240,6 +241,7 @@ public class BiomeDecoratorBOP extends BiomeDecorator
 
 	/** Field that holds mushroomRed WorldGenFlowers */
 	public WorldGenerator mushroomRedGen;
+	public WorldGenerator flatMushroomGen;
 
 	/** Field that holds big mushroom generator */
 	public WorldGenerator bigMushroomGen;
@@ -325,6 +327,7 @@ public class BiomeDecoratorBOP extends BiomeDecorator
 	public int goldenrodsPerChunk;
 	public int bluebellsPerChunk;
 	public int minersDelightPerChunk;
+	public int icyIrisPerChunk;
 
 	public int boneSpinesPerChunk;
 	public int boneSpines2PerChunk;
@@ -484,6 +487,7 @@ public class BiomeDecoratorBOP extends BiomeDecorator
 		goldenrodGen = new WorldGenBOPFlowers(Blocks.flowers2.get().blockID, 4);
 		bluebellGen = new WorldGenBOPFlowers(Blocks.flowers2.get().blockID, 5);
 		minersDelightGen = new WorldGenBOPDarkFlowers(Blocks.flowers2.get().blockID, 6);
+		icyIrisGen = new WorldGenBOPFlowers(Blocks.flowers2.get().blockID, 7);
 		lilyflowerGen = new WorldGenLilyflower();
 		deathbloomGen = new WorldGenBOPFlowers(Blocks.flowers.get().blockID, 2);
 		hydrangeaGen = new WorldGenBOPFlowers(Blocks.flowers.get().blockID, 4);
@@ -505,6 +509,7 @@ public class BiomeDecoratorBOP extends BiomeDecorator
 		graveGen = new WorldGenGrave();
 		mushroomBrownGen = new WorldGenBOPFlowers(Block.mushroomBrown.blockID, 0);
 		mushroomRedGen = new WorldGenBOPFlowers(Block.mushroomRed.blockID, 0);
+		flatMushroomGen = new WorldGenBOPFlowers(Blocks.mushrooms.get().blockID, 4);
 		toadstoolGen = new WorldGenBOPFlowers(Blocks.mushrooms.get().blockID, 0);
 		portobelloGen = new WorldGenBOPFlowers(Blocks.mushrooms.get().blockID, 1);
 		blueMilkGen = new WorldGenBOPFlowers(Blocks.mushrooms.get().blockID, 2);
@@ -534,7 +539,6 @@ public class BiomeDecoratorBOP extends BiomeDecorator
 		flowersPerChunk = 2;
 		grassPerChunk = 1;
 		deadBushPerChunk = 0;
-		mushroomsPerChunk = 0;
 		reedsPerChunk = 0;
 		reedsBOPPerChunk = 0;
 		cactiPerChunk = 0;
@@ -618,6 +622,7 @@ public class BiomeDecoratorBOP extends BiomeDecorator
 		goldenrodsPerChunk = 0;
 		bluebellsPerChunk = 0;
 		minersDelightPerChunk = 2;
+		icyIrisPerChunk = 0;
 		generateLakes = true;
 		generateAsh = false;
 		generateMycelium = false;
@@ -1197,6 +1202,14 @@ public class BiomeDecoratorBOP extends BiomeDecorator
 			 var5 = chunk_Z + randomGenerator.nextInt(16) + 8;
 			 minersDelightGen.generate(currentWorld, randomGenerator, var3, var4, var5);
 		 }
+		 
+		 for (var2 = 0; var2 < icyIrisPerChunk; ++var2)
+		 {
+			 var3 = chunk_X + randomGenerator.nextInt(16) + 8;
+			 var4 = randomGenerator.nextInt(256);
+			 var5 = chunk_Z + randomGenerator.nextInt(16) + 8;
+			 icyIrisGen.generate(currentWorld, randomGenerator, var3, var4, var5);
+		 }
 
 		 for (var2 = 0; var2 < hydrangeasPerChunk; ++var2)
 		 {
@@ -1549,6 +1562,14 @@ public class BiomeDecoratorBOP extends BiomeDecorator
 				 var5 = currentWorld.getHeightValue(var3, var4);
 				 mushroomBrownGen.generate(currentWorld, randomGenerator, var3, var5, var4);
 			 }
+			 
+			 if (randomGenerator.nextInt(6) == 0)
+			 {
+				 var3 = chunk_X + randomGenerator.nextInt(16) + 8;
+				 var4 = chunk_Z + randomGenerator.nextInt(16) + 8;
+				 var5 = randomGenerator.nextInt(256);
+				 flatMushroomGen.generate(currentWorld, randomGenerator, var3, var5, var4);
+			 }
 
 			 if (randomGenerator.nextInt(8) == 0)
 			 {

common/biomesoplenty/biomes/BiomeGenBayou.java

@@ -32,6 +32,7 @@ public class BiomeGenBayou extends BiomeGenBase
 		customBiomeDecorator.mudPerChunk = 1;
 		customBiomeDecorator.mudPerChunk2 = 1;
 		customBiomeDecorator.toadstoolsPerChunk = 2;
+		customBiomeDecorator.mushroomsPerChunk = 4;
 		customBiomeDecorator.sandPerChunk = -999;
 		customBiomeDecorator.sandPerChunk2 = -999;
 		customBiomeDecorator.waterlilyPerChunk = 2;

common/biomesoplenty/biomes/BiomeGenBog.java

@@ -26,6 +26,7 @@ public class BiomeGenBog extends BiomeGenBase
 		customBiomeDecorator = (BiomeDecoratorBOP)theBiomeDecorator;
 		customBiomeDecorator.treesPerChunk = 12;
 		customBiomeDecorator.flowersPerChunk = -999;
+		customBiomeDecorator.mushroomsPerChunk = 8;
 		customBiomeDecorator.grassPerChunk = 5;
 		customBiomeDecorator.bushesPerChunk = 6;
 		customBiomeDecorator.mudPerChunk = 2;

common/biomesoplenty/biomes/BiomeGenConiferousForest.java

@@ -31,6 +31,7 @@ public class BiomeGenConiferousForest extends BiomeGenBase
 		customBiomeDecorator = (BiomeDecoratorBOP)theBiomeDecorator;
 		customBiomeDecorator.treesPerChunk = 6;
 		customBiomeDecorator.grassPerChunk = 10;
+		customBiomeDecorator.mushroomsPerChunk = 8;
 		customBiomeDecorator.toadstoolsPerChunk = 3;
 		customBiomeDecorator.blueMilksPerChunk = 1;
 		customBiomeDecorator.poisonIvyPerChunk = 1;

common/biomesoplenty/biomes/BiomeGenConiferousForestSnow.java

@@ -23,6 +23,7 @@ public class BiomeGenConiferousForestSnow extends BiomeGenBase
 		theBiomeDecorator = new BiomeDecoratorBOP(this);
 		customBiomeDecorator = (BiomeDecoratorBOP)theBiomeDecorator;
 		customBiomeDecorator.treesPerChunk = 2;
+		customBiomeDecorator.mushroomsPerChunk = 4;
 		customBiomeDecorator.flowersPerChunk = -999;
 		customBiomeDecorator.sandPerChunk = -999;
 		customBiomeDecorator.sandPerChunk2 = -999;

common/biomesoplenty/biomes/BiomeGenFrostForest.java

@@ -24,6 +24,7 @@ public class BiomeGenFrostForest extends BiomeGenBase
 		customBiomeDecorator.flowersPerChunk = -999;
 		customBiomeDecorator.mushroomsPerChunk = -999;
 		customBiomeDecorator.shrubsPerChunk = 1;
+		customBiomeDecorator.icyIrisPerChunk = 3;
 		customBiomeDecorator.generatePumpkins = false;
 	}
 	

common/biomesoplenty/biomes/BiomeGenMeadow.java

@@ -25,6 +25,7 @@ public class BiomeGenMeadow extends BiomeGenBase
 		customBiomeDecorator.grassPerChunk = 10;
 		customBiomeDecorator.wheatGrassPerChunk = 5;
 		customBiomeDecorator.tinyFlowersPerChunk = 14;
+		customBiomeDecorator.mushroomsPerChunk = 2;
 		customBiomeDecorator.flowersPerChunk = 10;
 		customBiomeDecorator.carrotsPerChunk = 1;
 		customBiomeDecorator.sandPerChunk = -999;

common/biomesoplenty/biomes/BiomeGenMoor.java

@@ -25,6 +25,7 @@ public class BiomeGenMoor extends BiomeGenBase
 		customBiomeDecorator.treesPerChunk = -999;
 		customBiomeDecorator.flowersPerChunk = -999;
 		customBiomeDecorator.grassPerChunk = 15;
+		customBiomeDecorator.mushroomsPerChunk = 2;
 		customBiomeDecorator.sandPerChunk = -999;
 		customBiomeDecorator.sandPerChunk2 = -999;
 		customBiomeDecorator.mudPerChunk = 1;

common/biomesoplenty/biomes/BiomeGenQuagmire.java

@@ -26,6 +26,7 @@ public class BiomeGenQuagmire extends BiomeGenBase
 		customBiomeDecorator = (BiomeDecoratorBOP)theBiomeDecorator;
 		customBiomeDecorator.treesPerChunk = 0;
 		customBiomeDecorator.grassPerChunk = 10;
+		customBiomeDecorator.mushroomsPerChunk = 3;
 		customBiomeDecorator.flowersPerChunk = -999;
 		customBiomeDecorator.sandPerChunk = -999;
 		customBiomeDecorator.sandPerChunk2 = -999;

common/biomesoplenty/biomes/BiomeGenShield.java

@@ -23,6 +23,7 @@ public class BiomeGenShield extends BiomeGenBase
 		customBiomeDecorator.treesPerChunk = 7;
 		customBiomeDecorator.grassPerChunk = 12;
 		customBiomeDecorator.wheatGrassPerChunk = 6;
+		customBiomeDecorator.mushroomsPerChunk = 4;
 		customBiomeDecorator.sandPerChunk = -999;
 		customBiomeDecorator.sandPerChunk2 = -999;
 		customBiomeDecorator.gravelPerChunk = 6;

common/biomesoplenty/biomes/BiomeGenSilkglades.java

@@ -29,6 +29,7 @@ public class BiomeGenSilkglades extends BiomeGenBase
 		customBiomeDecorator.treesPerChunk = 6;
 		customBiomeDecorator.grassPerChunk = 2;
 		customBiomeDecorator.wheatGrassPerChunk = 1;
+		customBiomeDecorator.mushroomsPerChunk = 4;
 		customBiomeDecorator.flowersPerChunk = -999;
 		customBiomeDecorator.reedsPerChunk = -999;
 		customBiomeDecorator.sandPerChunk = -999;

common/biomesoplenty/biomes/BiomeGenSludgepit.java

@@ -30,6 +30,7 @@ public class BiomeGenSludgepit extends BiomeGenBase
 		customBiomeDecorator.treesPerChunk = 30;
 		customBiomeDecorator.grassPerChunk = 30;
 		customBiomeDecorator.wheatGrassPerChunk = 10;
+		customBiomeDecorator.mushroomsPerChunk = 8;
 		customBiomeDecorator.flowersPerChunk = -999;
 		customBiomeDecorator.sandPerChunk = -999;
 		customBiomeDecorator.sandPerChunk2 = -999;

common/biomesoplenty/biomes/BiomeGenSpruceWoods.java

@@ -25,6 +25,7 @@ public class BiomeGenSpruceWoods extends BiomeGenBase
 		customBiomeDecorator.treesPerChunk = 10;
 		customBiomeDecorator.grassPerChunk = 6;
 		customBiomeDecorator.sproutsPerChunk = 3;
+		customBiomeDecorator.mushroomsPerChunk = 4;
 		customBiomeDecorator.poisonIvyPerChunk = 1;
 		customBiomeDecorator.berryBushesPerChunk = 3;
 		customBiomeDecorator.wheatGrassPerChunk = 10;

common/biomesoplenty/biomes/BiomeGenTemperateRainforest.java

@@ -27,6 +27,7 @@ public class BiomeGenTemperateRainforest extends BiomeGenBase
 		customBiomeDecorator.grassPerChunk = 25;
 		customBiomeDecorator.wheatGrassPerChunk = 10;
 		customBiomeDecorator.generatePumpkins = false;
+		customBiomeDecorator.mushroomsPerChunk = 4;
 		customBiomeDecorator.blueMilksPerChunk = 3;
 		customBiomeDecorator.poisonIvyPerChunk = 1;
 		customBiomeDecorator.carrotsPerChunk = 1;

common/biomesoplenty/biomes/BiomeGenWetland.java

@@ -27,7 +27,7 @@ public class BiomeGenWetland extends BiomeGenBase
 		customBiomeDecorator.grassPerChunk = 10;
 		customBiomeDecorator.wheatGrassPerChunk = 5;
 		customBiomeDecorator.flowersPerChunk = -999;
-		customBiomeDecorator.mushroomsPerChunk = 5;
+		customBiomeDecorator.mushroomsPerChunk = 8;
 		customBiomeDecorator.toadstoolsPerChunk = 1;
 		customBiomeDecorator.reedsPerChunk = 15;
 		customBiomeDecorator.reedsBOPPerChunk = 15;

common/biomesoplenty/biomes/BiomeGenWoodland.java

@@ -19,6 +19,7 @@ public class BiomeGenWoodland extends BiomeGenBase
 		customBiomeDecorator = (BiomeDecoratorBOP)theBiomeDecorator;
 		customBiomeDecorator.treesPerChunk = 9;
 		customBiomeDecorator.grassPerChunk = 7;
+		customBiomeDecorator.mushroomsPerChunk = 4;
 		customBiomeDecorator.wheatGrassPerChunk = 3;
 		customBiomeDecorator.toadstoolsPerChunk = 3;
 		customBiomeDecorator.shrubsPerChunk = 20;

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", "goldenrod", "bluebells", "minersdelight"};
+	private static final String[] plants2 = new String[] {"hibiscus", "lilyofthevalley", "burningblossom", "lavender", "goldenrod", "bluebells", "minersdelight", "icyiris"};
 	private Icon[] textures;
 
 	protected BlockBOPFlower2(int blockID, Material material)

common/biomesoplenty/blocks/BlockBOPMushroom.java

@@ -18,7 +18,7 @@ import cpw.mods.fml.relauncher.SideOnly;
 
 public class BlockBOPMushroom extends BlockFlower
 {
-	private static final String[] plants = new String[] {"toadstool", "portobello", "bluemilk", "glowshroom"};
+	private static final String[] plants = new String[] {"toadstool", "portobello", "bluemilk", "glowshroom", "flatmushroom"};
 	private Icon[] textures;
 
 	protected BlockBOPMushroom(int blockID, Material material)

common/biomesoplenty/configuration/BOPCrafting.java

@@ -35,6 +35,8 @@ public class BOPCrafting
 		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.mushrooms.get(),1,3)});
 		GameRegistry.addShapelessRecipe(new ItemStack(Item.dyePowder, 2, 8), new Object[] {new ItemStack(Items.miscItems.get(), 1, 1)});
+		GameRegistry.addShapelessRecipe(new ItemStack(Item.dyePowder, 2, 12), new Object[] {new ItemStack(Blocks.flowers2.get(),1,7)});
+		GameRegistry.addShapelessRecipe(new ItemStack(Items.miscItems.get(), 2, 6), new Object[] {new ItemStack(Blocks.mushrooms.get(),1,4)});
 		
 		GameRegistry.addShapelessRecipe(new ItemStack(Item.dyePowder, 2, 9), new Object[] {new ItemStack(Blocks.flowers2.get(),1,0)});
 		GameRegistry.addShapelessRecipe(new ItemStack(Items.miscItems.get(), 2, 8), new Object[] {new ItemStack(Blocks.flowers2.get(),1,1)});

common/biomesoplenty/helpers/AchievementHelper.java

@@ -148,7 +148,7 @@ public class AchievementHelper
 		
 		achFen = (new Achievement(3104, "achFen", -10, -2, new ItemStack(Blocks.plants.get(), 1, 8), achBOP)).registerAchievement(); 
 		achField = (new Achievement(3105, "achField", -8, -2, new ItemStack(Block.tallGrass, 1, 1), achBOP)).registerAchievement();
-		achFrostForest = (new Achievement(3106, "achFrostForest", -6, -2, new ItemStack(Block.blockSnow, 1, 0), achBOP)).registerAchievement();
+		achFrostForest = (new Achievement(3106, "achFrostForest", -6, -2, new ItemStack(Blocks.flowers2.get(), 1, 7), achBOP)).registerAchievement();
 		achFungiForest = (new Achievement(3107, "achFungiForest", -4, -2, new ItemStack(Blocks.mushrooms.get(), 1, 3), achBOP)).registerAchievement().setSpecial();
 		achGarden = (new Achievement(3108, "achGarden", -2, -2, new ItemStack(Block.plantRed, 1, 1), achBOP)).registerAchievement().setSpecial();
 		achGlacier = (new Achievement(3109, "achGlacier", 0, -2, new ItemStack(Blocks.hardIce.get(), 1, 0), achBOP)).registerAchievement(); 
@@ -179,7 +179,7 @@ public class AchievementHelper
 		achOvergrownGreens = (new Achievement(3132, "achOvergrownGreens", 2, 2, new ItemStack(Blocks.foliage.get(), 1, 3), achBOP)).registerAchievement();
 		achPasture = (new Achievement(3133, "achPasture", 4, 2, new ItemStack(Blocks.plants.get(), 1, 6), achBOP)).registerAchievement();
 		achPolar = (new Achievement(3134, "achPolar", 6, 2, new ItemStack(Block.ice, 1, 0), achBOP)).registerAchievement();
-		achPrairie = (new Achievement(3135, "achPrairie", 8, 2, new ItemStack(Blocks.mushrooms.get(), 1, 1), achBOP)).registerAchievement();
+		achPrairie = (new Achievement(3135, "achPrairie", 8, 2, new ItemStack(Blocks.flowers2.get(), 1, 4), achBOP)).registerAchievement();
 		achQuagmire = (new Achievement(3136, "achQuagmire", 10, 2, new ItemStack(Items.mudball.get(), 1, 0), achBOP)).registerAchievement();
 
 		achRainforest = (new Achievement(3137, "achRainforest", -10, 4, new ItemStack(Blocks.flowers.get(), 1, 6), achBOP)).registerAchievement();
@@ -192,7 +192,7 @@ public class AchievementHelper
 		achShrubland = (new Achievement(3144, "achShrubland", 4, 4, new ItemStack(Blocks.foliage.get(), 1, 1), achBOP)).registerAchievement();
 		achSilkglades = (new Achievement(3145, "achSilkglades", 6, 4, new ItemStack(Block.web, 1, 0), achBOP)).registerAchievement();
 		achSludgepit = (new Achievement(3146, "achSludgepit", 8, 4, new ItemStack(Blocks.foliage.get(), 1, 0), achBOP)).registerAchievement().setSpecial();
-		achSpruceWoods = (new Achievement(3147, "achSpruceWoods", 10, 4, new ItemStack(Block.sapling, 1, 1), achBOP)).registerAchievement();
+		achSpruceWoods = (new Achievement(3147, "achSpruceWoods", 10, 4, new ItemStack(Blocks.flowers2.get(), 1, 5), achBOP)).registerAchievement();
 		
 		achSteppe = (new Achievement(3148, "achSteppe", -10, 6, new ItemStack(Blocks.flowers.get(), 1, 12), achBOP)).registerAchievement();
 		achTemperateRainforest = (new Achievement(3149, "achTemperateRainforest", -8, 6, new ItemStack(Block.tallGrass, 1, 2), achBOP)).registerAchievement();

common/biomesoplenty/integration/ThaumcraftIntegration.java

@@ -230,6 +230,7 @@ public class ThaumcraftIntegration {
 		ThaumcraftApi.registerObjectTag(getBID("goldenrod"), getBMeta("goldenrod"), (new AspectList()).add(Aspect.PLANT, 4));
 		ThaumcraftApi.registerObjectTag(getBID("bluebells"), getBMeta("bluebells"), (new AspectList()).add(Aspect.PLANT, 4));
 		ThaumcraftApi.registerObjectTag(getBID("minersdelight"), getBMeta("minersdelight"), (new AspectList()).add(Aspect.PLANT, 2).add(Aspect.EARTH, 1));
+		ThaumcraftApi.registerObjectTag(getBID("icyiris"), getBMeta("icyiris"), (new AspectList()).add(Aspect.PLANT, 4).add(Aspect.ICE, 2));
 
 	}
 

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", "goldenrod", "bluebells", "minersdelight"};
+	private static final String[] plants = new String[] {"hibiscus", "lilyofthevalley", "burningblossom", "lavender", "goldenrod", "bluebells", "minersdelight", "icyiris"};
 	@SideOnly(Side.CLIENT)
 	private Icon[] textures;
 

common/biomesoplenty/itemblocks/ItemBlockMushroom.java

@@ -10,7 +10,7 @@ import net.minecraft.world.World;
 
 public class ItemBlockMushroom extends ItemBlock
 {
-	private static final String[] plants = new String[] {"toadstool", "portobello", "bluemilk", "glowshroom"};
+	private static final String[] plants = new String[] {"toadstool", "portobello", "bluemilk", "glowshroom", "flatmushroom"};
 
 	public ItemBlockMushroom(int par1)
 	{

resources/assets/biomesoplenty/lang/en_US.xml

@@ -61,6 +61,7 @@
     <entry key="tile.bop.flowers2.goldenrod.name">Goldenrod</entry>
     <entry key="tile.bop.flowers2.bluebells.name">Bluebells</entry>
     <entry key="tile.bop.flowers2.minersdelight.name">Miner's Delight</entry>
+    <entry key="tile.bop.flowers2.icyiris.name">Icy Iris</entry>
 
     <entry key="tile.bop.foliage.algae.name">Algae</entry>
     <entry key="tile.bop.foliage.shortgrass.name">Short Grass</entry>
@@ -82,6 +83,7 @@
     <entry key="tile.bop.mushrooms.portobello.name">Portobello</entry>
     <entry key="tile.bop.mushrooms.bluemilk.name">Blue Milk Cap</entry>
     <entry key="tile.bop.mushrooms.glowshroom.name">Glowshroom</entry>
+    <entry key="tile.bop.mushrooms.flatmushroom.name">Flat Mushroom</entry>
 
     <entry key="tile.bop.saplings.appleSapling.name">Apple Sapling</entry>
     <entry key="tile.bop.saplings.yellowautumnSapling.name">Yellow Autumn Sapling</entry>