diff --git a/src/minecraft/biomesoplenty/api/BlockReferences.java b/src/minecraft/biomesoplenty/api/BlockReferences.java index 5a912e926..a09340963 100644 --- a/src/minecraft/biomesoplenty/api/BlockReferences.java +++ b/src/minecraft/biomesoplenty/api/BlockReferences.java @@ -112,7 +112,7 @@ public class BlockReferences { toadstool (Blocks.flowers, 10), tinyCactus (Blocks.flowers, 11), - yucca (Blocks.flowers, 12), + aloe (Blocks.flowers, 12), portobello (Blocks.flowers, 13), bluemilk (Blocks.flowers, 14), dandelion (Blocks.flowers, 15), diff --git a/src/minecraft/biomesoplenty/biomes/BiomeDecoratorBOP.java b/src/minecraft/biomesoplenty/biomes/BiomeDecoratorBOP.java index 2cc4efa61..6076a7fce 100644 --- a/src/minecraft/biomesoplenty/biomes/BiomeDecoratorBOP.java +++ b/src/minecraft/biomesoplenty/biomes/BiomeDecoratorBOP.java @@ -170,7 +170,7 @@ public class BiomeDecoratorBOP extends BiomeDecorator protected WorldGenerator sproutGen; protected WorldGenerator bushGen; protected WorldGenerator tinyCactusGen; - protected WorldGenerator yuccaGen; + protected WorldGenerator aloeGen; protected WorldGenerator deathbloomGen; protected WorldGenerator hydrangeaGen; protected WorldGenerator violetGen; @@ -238,7 +238,7 @@ public class BiomeDecoratorBOP extends BiomeDecorator protected int sproutsPerChunk; protected int bushesPerChunk; protected int tinyCactiPerChunk; - protected int yuccaPerChunk; + protected int aloePerChunk; protected int deathbloomsPerChunk; protected int hydrangeasPerChunk; protected int violetsPerChunk; @@ -373,7 +373,7 @@ public class BiomeDecoratorBOP extends BiomeDecorator this.thornGen = new WorldGenBOPFlowers(Blocks.plants.get().blockID, 5); this.bushGen = new WorldGenBush(Blocks.foliage.get().blockID, 4); this.tinyCactusGen = new WorldGenBOPFlowers(Blocks.flowers.get().blockID, 11); - this.yuccaGen = new WorldGenBOPFlowers(Blocks.flowers.get().blockID, 12); + this.aloeGen = new WorldGenBOPFlowers(Blocks.flowers.get().blockID, 12); this.deathbloomGen = new WorldGenBOPFlowers(Blocks.flowers.get().blockID, 2); this.hydrangeaGen = new WorldGenBOPFlowers(Blocks.flowers.get().blockID, 4); this.violetGen = new WorldGenBOPFlowers(Blocks.flowers.get().blockID, 8); @@ -447,7 +447,7 @@ public class BiomeDecoratorBOP extends BiomeDecorator this.bushesPerChunk = 0; this.tinyCactiPerChunk = 0; this.poisonIvyPerChunk = 0; - this.yuccaPerChunk = 0; + this.aloePerChunk = 0; this.deathbloomsPerChunk = 0; this.hydrangeasPerChunk = 0; this.violetsPerChunk = 0; @@ -861,12 +861,12 @@ public class BiomeDecoratorBOP extends BiomeDecorator this.tinyCactusGen.generate(this.currentWorld, this.randomGenerator, var3, var4, var5); } - for (var2 = 0; var2 < this.yuccaPerChunk; ++var2) + for (var2 = 0; var2 < this.aloePerChunk; ++var2) { var3 = this.chunk_X + this.randomGenerator.nextInt(16) + 8; var4 = this.randomGenerator.nextInt(128); var5 = this.chunk_Z + this.randomGenerator.nextInt(16) + 8; - this.yuccaGen.generate(this.currentWorld, this.randomGenerator, var3, var4, var5); + this.aloeGen.generate(this.currentWorld, this.randomGenerator, var3, var4, var5); } for (var2 = 0; var2 < this.deathbloomsPerChunk; ++var2) diff --git a/src/minecraft/biomesoplenty/biomes/BiomeGenCanyon.java b/src/minecraft/biomesoplenty/biomes/BiomeGenCanyon.java index e217f2163..38a7a9891 100644 --- a/src/minecraft/biomesoplenty/biomes/BiomeGenCanyon.java +++ b/src/minecraft/biomesoplenty/biomes/BiomeGenCanyon.java @@ -25,7 +25,7 @@ public class BiomeGenCanyon extends BiomeGenBase this.customBiomeDecorator.treesPerChunk = 10; this.customBiomeDecorator.flowersPerChunk = -999; this.customBiomeDecorator.canyonGrassPerChunk = 5; - this.customBiomeDecorator.yuccaPerChunk = 2; + this.customBiomeDecorator.aloePerChunk = 2; this.customBiomeDecorator.generatePumpkins = false; this.customBiomeDecorator.generateCanyon = true; } diff --git a/src/minecraft/biomesoplenty/biomes/BiomeGenDesertNew.java b/src/minecraft/biomesoplenty/biomes/BiomeGenDesertNew.java index 3ed809920..5429c9123 100644 --- a/src/minecraft/biomesoplenty/biomes/BiomeGenDesertNew.java +++ b/src/minecraft/biomesoplenty/biomes/BiomeGenDesertNew.java @@ -26,7 +26,7 @@ public class BiomeGenDesertNew extends BiomeGenBase this.customBiomeDecorator.desertSproutsPerChunk = 1; this.customBiomeDecorator.tinyCactiPerChunk = 5; this.customBiomeDecorator.quicksand2PerChunk = 3; - this.customBiomeDecorator.yuccaPerChunk = 2; + this.customBiomeDecorator.aloePerChunk = 2; } public void decorate(World par1World, Random par2Random, int par3, int par4) diff --git a/src/minecraft/biomesoplenty/biomes/BiomeGenDunes.java b/src/minecraft/biomesoplenty/biomes/BiomeGenDunes.java index 820ad6b6e..8dd5ef7d7 100644 --- a/src/minecraft/biomesoplenty/biomes/BiomeGenDunes.java +++ b/src/minecraft/biomesoplenty/biomes/BiomeGenDunes.java @@ -23,7 +23,7 @@ public class BiomeGenDunes extends BiomeGenBase this.customBiomeDecorator.deadBushPerChunk = -999; this.customBiomeDecorator.duneGrassPerChunk = 10; this.customBiomeDecorator.desertSproutsPerChunk = 5; - this.customBiomeDecorator.yuccaPerChunk = 1; + this.customBiomeDecorator.aloePerChunk = 1; this.customBiomeDecorator.reedsPerChunk = -999; this.customBiomeDecorator.generateLakes = false; } diff --git a/src/minecraft/biomesoplenty/biomes/BiomeGenLushDesert.java b/src/minecraft/biomesoplenty/biomes/BiomeGenLushDesert.java index ab3b1488b..8770581f3 100644 --- a/src/minecraft/biomesoplenty/biomes/BiomeGenLushDesert.java +++ b/src/minecraft/biomesoplenty/biomes/BiomeGenLushDesert.java @@ -32,7 +32,7 @@ public class BiomeGenLushDesert extends BiomeGenBase this.customBiomeDecorator.desertCactiPerChunk = 10; this.customBiomeDecorator.cactiPerChunk = 20; this.customBiomeDecorator.tinyCactiPerChunk = 5; - this.customBiomeDecorator.yuccaPerChunk = 3; + this.customBiomeDecorator.aloePerChunk = 3; this.customBiomeDecorator.generateGrass = true; this.customBiomeDecorator.generateSand = true; this.customBiomeDecorator.generatePumpkins = false; diff --git a/src/minecraft/biomesoplenty/biomes/BiomeGenOasis.java b/src/minecraft/biomesoplenty/biomes/BiomeGenOasis.java index ecf130140..f5d3c13f0 100644 --- a/src/minecraft/biomesoplenty/biomes/BiomeGenOasis.java +++ b/src/minecraft/biomesoplenty/biomes/BiomeGenOasis.java @@ -32,7 +32,7 @@ public class BiomeGenOasis extends BiomeGenBase this.customBiomeDecorator.generateMelons = true; this.customBiomeDecorator.waterLakesPerChunk = 10; this.customBiomeDecorator.quicksand2PerChunk = 2; - this.customBiomeDecorator.yuccaPerChunk = 4; + this.customBiomeDecorator.aloePerChunk = 4; } /** diff --git a/src/minecraft/biomesoplenty/biomes/BiomeGenSteppe.java b/src/minecraft/biomesoplenty/biomes/BiomeGenSteppe.java index f7bfa070b..4b639bf4e 100644 --- a/src/minecraft/biomesoplenty/biomes/BiomeGenSteppe.java +++ b/src/minecraft/biomesoplenty/biomes/BiomeGenSteppe.java @@ -28,7 +28,7 @@ public class BiomeGenSteppe extends BiomeGenBase this.customBiomeDecorator.tinyCactiPerChunk = 1; this.customBiomeDecorator.quicksandPerChunk = 1; this.customBiomeDecorator.steppePerChunk = 6; - this.customBiomeDecorator.yuccaPerChunk = 2; + this.customBiomeDecorator.aloePerChunk = 2; this.customBiomeDecorator.generatePumpkins = false; } diff --git a/src/minecraft/biomesoplenty/blocks/BlockBOPFlower.java b/src/minecraft/biomesoplenty/blocks/BlockBOPFlower.java index 9d573a6fa..8da085b10 100644 --- a/src/minecraft/biomesoplenty/blocks/BlockBOPFlower.java +++ b/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", "yucca", "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"}; private Icon[] textures; protected BlockBOPFlower(int blockID, Material material) diff --git a/src/minecraft/biomesoplenty/configuration/BOPBlocks.java b/src/minecraft/biomesoplenty/configuration/BOPBlocks.java index dd71a37d0..06a3c4704 100644 --- a/src/minecraft/biomesoplenty/configuration/BOPBlocks.java +++ b/src/minecraft/biomesoplenty/configuration/BOPBlocks.java @@ -279,7 +279,7 @@ public class BOPBlocks { LanguageRegistry.addName(new ItemStack(Blocks.petals.get(),1,0), "Giant Red Flower"); LanguageRegistry.addName(new ItemStack(Blocks.petals.get(),1,1), "Giant Yellow Flower"); LanguageRegistry.addName(new ItemStack(Blocks.flowers.get(),1,11), "Tiny Cactus"); - LanguageRegistry.addName(new ItemStack(Blocks.flowers.get(),1,12), "Yucca"); + LanguageRegistry.addName(new ItemStack(Blocks.flowers.get(),1,12), "Aloe"); 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"); diff --git a/src/minecraft/biomesoplenty/integration/ThaumcraftIntegration.java b/src/minecraft/biomesoplenty/integration/ThaumcraftIntegration.java index ec7a6b543..e786342f8 100644 --- a/src/minecraft/biomesoplenty/integration/ThaumcraftIntegration.java +++ b/src/minecraft/biomesoplenty/integration/ThaumcraftIntegration.java @@ -165,7 +165,7 @@ public class ThaumcraftIntegration { ThaumcraftApi.registerObjectTag(getBID("daisy"), getBMeta("daisy"), (new ObjectTags()).add(EnumTag.FLOWER, 4)); ThaumcraftApi.registerObjectTag(getBID("dandelion"), getBMeta("dandelion"), (new ObjectTags()).add(EnumTag.FLOWER, 4)); ThaumcraftApi.registerObjectTag(getBID("tulip"), getBMeta("tulip"), (new ObjectTags()).add(EnumTag.FLOWER, 4)); - ThaumcraftApi.registerObjectTag(getBID("yucca"), getBMeta("yucca"), (new ObjectTags()).add(EnumTag.FLOWER, 4).add(EnumTag.PLANT, 4)); + ThaumcraftApi.registerObjectTag(getBID("aloe"), getBMeta("aloe"), (new ObjectTags()).add(EnumTag.FLOWER, 4).add(EnumTag.PLANT, 4)); ThaumcraftApi.registerObjectTag(getBID("clover"), getBMeta("clover"), (new ObjectTags()).add(EnumTag.FLOWER, 1).add(EnumTag.PLANT, 1)); } diff --git a/src/minecraft/biomesoplenty/items/ItemBOPFlower.java b/src/minecraft/biomesoplenty/items/ItemBOPFlower.java index 743a5dda9..1860e4b01 100644 --- a/src/minecraft/biomesoplenty/items/ItemBOPFlower.java +++ b/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", "yucca", "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"}; public ItemBOPFlower(int par1) { diff --git a/src/minecraft/mods/BiomesOPlenty/textures/blocks/yucca.png b/src/minecraft/mods/BiomesOPlenty/textures/blocks/aloe.png similarity index 100% rename from src/minecraft/mods/BiomesOPlenty/textures/blocks/yucca.png rename to src/minecraft/mods/BiomesOPlenty/textures/blocks/aloe.png diff --git a/src/minecraft/mods/BiomesOPlenty/textures/blocks/cloverleaf.png b/src/minecraft/mods/BiomesOPlenty/textures/blocks/cloverleaf.png new file mode 100644 index 000000000..12777ae9c Binary files /dev/null and b/src/minecraft/mods/BiomesOPlenty/textures/blocks/cloverleaf.png differ diff --git a/src/minecraft/mods/BiomesOPlenty/textures/blocks/item_moss.png b/src/minecraft/mods/BiomesOPlenty/textures/blocks/item_moss.png index bf259f03c..0286e9230 100644 Binary files a/src/minecraft/mods/BiomesOPlenty/textures/blocks/item_moss.png and b/src/minecraft/mods/BiomesOPlenty/textures/blocks/item_moss.png differ