Replaced taro with a shrub

common/biomesoplenty/api/BlockReferences.java

@@ -71,7 +71,7 @@ public class BlockReferences {
 
 		dryGrassItem (Blocks.foliage, 11),
 		wheatGrassItem (Blocks.foliage, 10),
-		taroItem (Blocks.foliage, 9),
+		shrubItem (Blocks.foliage, 9),
 		poisonIvyItem (Blocks.foliage, 7),
 		sproutItem (Blocks.foliage, 5),
 		bushItem (Blocks.foliage, 4),

common/biomesoplenty/biomes/BiomeDecoratorBOP.java

@@ -199,7 +199,7 @@ public class BiomeDecoratorBOP extends BiomeDecorator
 	public WorldGenerator potatoGen;
 	public WorldGenerator sproutGen;
 	public WorldGenerator bushGen;
-	public WorldGenerator taroGen;
+	public WorldGenerator shrubGen;
 	public WorldGenerator wheatGrassGen;
 	public WorldGenerator wetGrassGen;
 	public WorldGenerator berryBushGen;
@@ -294,7 +294,7 @@ public class BiomeDecoratorBOP extends BiomeDecorator
 	public int sproutsPerChunk;
 	public int bushesPerChunk;
 	public int berryBushesPerChunk;
-	public int taroPerChunk;
+	public int shrubsPerChunk;
 	public int wheatGrassPerChunk;
 	public int tinyCactiPerChunk;
 	public int aloePerChunk;
@@ -468,7 +468,7 @@ public class BiomeDecoratorBOP extends BiomeDecorator
 		thornGen = new WorldGenBOPFlowers(Blocks.plants.get().blockID, 5);
 		bushGen = new WorldGenBOPBush(Blocks.foliage.get().blockID, 4);
 		berryBushGen = new WorldGenBOPFlowers(Blocks.foliage.get().blockID, 8);
-		taroGen = new WorldGenBOPBush(Blocks.foliage.get().blockID, 9);
+		shrubGen = new WorldGenBOPBush(Blocks.foliage.get().blockID, 9);
 		wheatGrassGen = new WorldGenTallGrass(Blocks.foliage.get().blockID, 10);
 		wetGrassGen = new WorldGenTallGrass(Blocks.foliage.get().blockID, 11);
 		tinyCactusGen = new WorldGenBOPFlowers(Blocks.plants.get().blockID, 12);
@@ -568,7 +568,7 @@ public class BiomeDecoratorBOP extends BiomeDecorator
 		sproutsPerChunk = 0;
 		bushesPerChunk = 0;
 		berryBushesPerChunk = 0;
-		taroPerChunk = 0;
+		shrubsPerChunk = 0;
 		wheatGrassPerChunk = 0;
 		tinyCactiPerChunk = 0;
 		poisonIvyPerChunk = 0;
@@ -1254,12 +1254,12 @@ public class BiomeDecoratorBOP extends BiomeDecorator
 			 berryBushGen.generate(currentWorld, randomGenerator, var3, var4, var5);
 		 }
 		 
-		 for (var2 = 0; var2 < taroPerChunk; ++var2)
+		 for (var2 = 0; var2 < shrubsPerChunk; ++var2)
 		 {
 			 var3 = chunk_X + randomGenerator.nextInt(16) + 8;
 			 var4 = randomGenerator.nextInt(256);
 			 var5 = chunk_Z + randomGenerator.nextInt(16) + 8;
-			 taroGen.generate(currentWorld, randomGenerator, var3, var4, var5);
+			 shrubGen.generate(currentWorld, randomGenerator, var3, var4, var5);
 		 }
 		 
 		 for (var2 = 0; var2 < wheatGrassPerChunk; ++var2)

common/biomesoplenty/biomes/BiomeGenConiferousForest.java

@@ -36,6 +36,7 @@ public class BiomeGenConiferousForest extends BiomeGenBase
 		customBiomeDecorator.poisonIvyPerChunk = 1;
 		customBiomeDecorator.berryBushesPerChunk = 1;
 		customBiomeDecorator.wheatGrassPerChunk = 5;
+		customBiomeDecorator.shrubsPerChunk = 8;
 	}
 
 	/**

common/biomesoplenty/biomes/BiomeGenShrubland.java

@@ -26,6 +26,7 @@ public class BiomeGenShrubland extends BiomeGenBase
 		customBiomeDecorator.grassPerChunk = 5;
 		customBiomeDecorator.wheatGrassPerChunk = 2;
 		customBiomeDecorator.bushesPerChunk = 7;
+		customBiomeDecorator.shrubsPerChunk = 5;
 		customBiomeDecorator.generatePumpkins = false;
 		spawnableCreatureList.add(new SpawnListEntry(EntityHorse.class, 5, 2, 6));
 	}

common/biomesoplenty/biomes/BiomeGenShrublandForest.java

@@ -26,6 +26,7 @@ public class BiomeGenShrublandForest extends BiomeGenBase
 		customBiomeDecorator.grassPerChunk = 10;
 		customBiomeDecorator.bushesPerChunk = 7;
 		customBiomeDecorator.wheatGrassPerChunk = 5;
+		customBiomeDecorator.shrubsPerChunk = 10;
 		customBiomeDecorator.generatePumpkins = false;
 		spawnableCreatureList.add(new SpawnListEntry(EntityHorse.class, 5, 2, 6));
 	}

common/biomesoplenty/biomes/BiomeGenTropicalRainforest.java

@@ -38,7 +38,7 @@ public class BiomeGenTropicalRainforest extends BiomeGenBase
 		customBiomeDecorator.generateQuicksand = true;
 		customBiomeDecorator.poisonIvyPerChunk = 4;
 		customBiomeDecorator.lilyflowersPerChunk = 2;
-		customBiomeDecorator.taroPerChunk = 15;
+		customBiomeDecorator.shrubsPerChunk = 15;
 		customBiomeDecorator.wheatGrassPerChunk = 5;
 		spawnableMonsterList.add(new SpawnListEntry(EntityJungleSpider.class, 12, 6, 6));
 		waterColorMultiplier = 6160128;

common/biomesoplenty/blocks/BlockBOPFoliage.java

@@ -36,7 +36,7 @@ import cpw.mods.fml.relauncher.SideOnly;
 
 public class BlockBOPFoliage extends BlockFlower implements IShearable
 {
-	private static final String[] foliageTypes = new String[] {"algae", "shortgrass", "mediumgrass", "highgrassbottom", "bush", "sprout", "highgrasstop", "poisonivy", "berrybush", "taro", "wheatgrass", "dampgrass"};
+	private static final String[] foliageTypes = new String[] {"algae", "shortgrass", "mediumgrass", "highgrassbottom", "bush", "sprout", "highgrasstop", "poisonivy", "berrybush", "shrub", "wheatgrass", "dampgrass"};
 
 	private Icon[] textures;
 

common/biomesoplenty/itemblocks/ItemBlockFoliage.java

@@ -17,7 +17,7 @@ import cpw.mods.fml.relauncher.SideOnly;
 
 public class ItemBlockFoliage extends ItemColored
 {
-	private static final String[] foliageTypes = new String[] {"algae", "shortgrass", "mediumgrass", "highgrassbottom", "bush", "sprout", "highgrasstop", "poisonivy", "berrybush", "taro", "wheatgrass", "dampgrass"};
+	private static final String[] foliageTypes = new String[] {"algae", "shortgrass", "mediumgrass", "highgrassbottom", "bush", "sprout", "highgrasstop", "poisonivy", "berrybush", "shrub", "wheatgrass", "dampgrass"};
 	@SideOnly(Side.CLIENT)
 	private Icon[] textures;
 	private static final int GRASSTOP = 6;

resources/assets/biomesoplenty/lang/en_US.xml

@@ -70,7 +70,7 @@
     <entry key="tile.bop.foliage.highgrasstop.name">High Grass</entry>
     <entry key="tile.bop.foliage.poisonivy.name">Poison Ivy</entry>
     <entry key="tile.bop.foliage.berrybush.name">Berry Bush</entry>
-    <entry key="tile.bop.foliage.taro.name">Taro</entry>
+    <entry key="tile.bop.foliage.shrub.name">Shrub</entry>
     <entry key="tile.bop.foliage.wheatgrass.name">Wheat Grass</entry>
     <entry key="tile.bop.foliage.dampgrass.name">Damp Grass</entry>