diff --git a/common/biomesoplenty/api/BlockReferences.java b/common/biomesoplenty/api/BlockReferences.java index b52de3be1..6a14c219d 100644 --- a/common/biomesoplenty/api/BlockReferences.java +++ b/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), diff --git a/common/biomesoplenty/biomes/BiomeDecoratorBOP.java b/common/biomesoplenty/biomes/BiomeDecoratorBOP.java index 27064405b..e6f62b134 100644 --- a/common/biomesoplenty/biomes/BiomeDecoratorBOP.java +++ b/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) diff --git a/common/biomesoplenty/biomes/BiomeGenConiferousForest.java b/common/biomesoplenty/biomes/BiomeGenConiferousForest.java index 2625bc798..d6aa2a15f 100644 --- a/common/biomesoplenty/biomes/BiomeGenConiferousForest.java +++ b/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; } /** diff --git a/common/biomesoplenty/biomes/BiomeGenShrubland.java b/common/biomesoplenty/biomes/BiomeGenShrubland.java index 7ead8b754..466452f79 100644 --- a/common/biomesoplenty/biomes/BiomeGenShrubland.java +++ b/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)); } diff --git a/common/biomesoplenty/biomes/BiomeGenShrublandForest.java b/common/biomesoplenty/biomes/BiomeGenShrublandForest.java index 6741913bb..75bad005c 100644 --- a/common/biomesoplenty/biomes/BiomeGenShrublandForest.java +++ b/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)); } diff --git a/common/biomesoplenty/biomes/BiomeGenTropicalRainforest.java b/common/biomesoplenty/biomes/BiomeGenTropicalRainforest.java index f026d0a4e..980bd72bb 100644 --- a/common/biomesoplenty/biomes/BiomeGenTropicalRainforest.java +++ b/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; diff --git a/common/biomesoplenty/blocks/BlockBOPFoliage.java b/common/biomesoplenty/blocks/BlockBOPFoliage.java index 2227a2039..b6819438c 100644 --- a/common/biomesoplenty/blocks/BlockBOPFoliage.java +++ b/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; diff --git a/common/biomesoplenty/itemblocks/ItemBlockFoliage.java b/common/biomesoplenty/itemblocks/ItemBlockFoliage.java index 0be648d26..95cc5b321 100644 --- a/common/biomesoplenty/itemblocks/ItemBlockFoliage.java +++ b/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; diff --git a/resources/assets/biomesoplenty/lang/en_US.xml b/resources/assets/biomesoplenty/lang/en_US.xml index d270819d5..2943a880d 100644 --- a/resources/assets/biomesoplenty/lang/en_US.xml +++ b/resources/assets/biomesoplenty/lang/en_US.xml @@ -70,7 +70,7 @@ High Grass Poison Ivy Berry Bush - Taro + Shrub Wheat Grass Damp Grass diff --git a/resources/assets/biomesoplenty/textures/blocks/shrub.png b/resources/assets/biomesoplenty/textures/blocks/shrub.png new file mode 100644 index 000000000..5d0528bc8 Binary files /dev/null and b/resources/assets/biomesoplenty/textures/blocks/shrub.png differ diff --git a/resources/assets/biomesoplenty/textures/blocks/taro.png b/resources/assets/biomesoplenty/textures/blocks/taro.png deleted file mode 100644 index 12f967574..000000000 Binary files a/resources/assets/biomesoplenty/textures/blocks/taro.png and /dev/null differ