Renamed the Yucca to Aloe. Changed moss item texture.

This commit is contained in:
Matt Caughey 2013-05-07 23:25:14 -04:00
parent 94d64d53a8
commit 37fb9e1370
15 changed files with 17 additions and 17 deletions

View File

@ -112,7 +112,7 @@ public class BlockReferences {
toadstool (Blocks.flowers, 10), toadstool (Blocks.flowers, 10),
tinyCactus (Blocks.flowers, 11), tinyCactus (Blocks.flowers, 11),
yucca (Blocks.flowers, 12), aloe (Blocks.flowers, 12),
portobello (Blocks.flowers, 13), portobello (Blocks.flowers, 13),
bluemilk (Blocks.flowers, 14), bluemilk (Blocks.flowers, 14),
dandelion (Blocks.flowers, 15), dandelion (Blocks.flowers, 15),

View File

@ -170,7 +170,7 @@ public class BiomeDecoratorBOP extends BiomeDecorator
protected WorldGenerator sproutGen; protected WorldGenerator sproutGen;
protected WorldGenerator bushGen; protected WorldGenerator bushGen;
protected WorldGenerator tinyCactusGen; protected WorldGenerator tinyCactusGen;
protected WorldGenerator yuccaGen; protected WorldGenerator aloeGen;
protected WorldGenerator deathbloomGen; protected WorldGenerator deathbloomGen;
protected WorldGenerator hydrangeaGen; protected WorldGenerator hydrangeaGen;
protected WorldGenerator violetGen; protected WorldGenerator violetGen;
@ -238,7 +238,7 @@ public class BiomeDecoratorBOP extends BiomeDecorator
protected int sproutsPerChunk; protected int sproutsPerChunk;
protected int bushesPerChunk; protected int bushesPerChunk;
protected int tinyCactiPerChunk; protected int tinyCactiPerChunk;
protected int yuccaPerChunk; protected int aloePerChunk;
protected int deathbloomsPerChunk; protected int deathbloomsPerChunk;
protected int hydrangeasPerChunk; protected int hydrangeasPerChunk;
protected int violetsPerChunk; protected int violetsPerChunk;
@ -373,7 +373,7 @@ public class BiomeDecoratorBOP extends BiomeDecorator
this.thornGen = new WorldGenBOPFlowers(Blocks.plants.get().blockID, 5); this.thornGen = new WorldGenBOPFlowers(Blocks.plants.get().blockID, 5);
this.bushGen = new WorldGenBush(Blocks.foliage.get().blockID, 4); this.bushGen = new WorldGenBush(Blocks.foliage.get().blockID, 4);
this.tinyCactusGen = new WorldGenBOPFlowers(Blocks.flowers.get().blockID, 11); 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.deathbloomGen = new WorldGenBOPFlowers(Blocks.flowers.get().blockID, 2);
this.hydrangeaGen = new WorldGenBOPFlowers(Blocks.flowers.get().blockID, 4); this.hydrangeaGen = new WorldGenBOPFlowers(Blocks.flowers.get().blockID, 4);
this.violetGen = new WorldGenBOPFlowers(Blocks.flowers.get().blockID, 8); this.violetGen = new WorldGenBOPFlowers(Blocks.flowers.get().blockID, 8);
@ -447,7 +447,7 @@ public class BiomeDecoratorBOP extends BiomeDecorator
this.bushesPerChunk = 0; this.bushesPerChunk = 0;
this.tinyCactiPerChunk = 0; this.tinyCactiPerChunk = 0;
this.poisonIvyPerChunk = 0; this.poisonIvyPerChunk = 0;
this.yuccaPerChunk = 0; this.aloePerChunk = 0;
this.deathbloomsPerChunk = 0; this.deathbloomsPerChunk = 0;
this.hydrangeasPerChunk = 0; this.hydrangeasPerChunk = 0;
this.violetsPerChunk = 0; this.violetsPerChunk = 0;
@ -861,12 +861,12 @@ public class BiomeDecoratorBOP extends BiomeDecorator
this.tinyCactusGen.generate(this.currentWorld, this.randomGenerator, var3, var4, var5); 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; var3 = this.chunk_X + this.randomGenerator.nextInt(16) + 8;
var4 = this.randomGenerator.nextInt(128); var4 = this.randomGenerator.nextInt(128);
var5 = this.chunk_Z + this.randomGenerator.nextInt(16) + 8; 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) for (var2 = 0; var2 < this.deathbloomsPerChunk; ++var2)

View File

@ -25,7 +25,7 @@ public class BiomeGenCanyon extends BiomeGenBase
this.customBiomeDecorator.treesPerChunk = 10; this.customBiomeDecorator.treesPerChunk = 10;
this.customBiomeDecorator.flowersPerChunk = -999; this.customBiomeDecorator.flowersPerChunk = -999;
this.customBiomeDecorator.canyonGrassPerChunk = 5; this.customBiomeDecorator.canyonGrassPerChunk = 5;
this.customBiomeDecorator.yuccaPerChunk = 2; this.customBiomeDecorator.aloePerChunk = 2;
this.customBiomeDecorator.generatePumpkins = false; this.customBiomeDecorator.generatePumpkins = false;
this.customBiomeDecorator.generateCanyon = true; this.customBiomeDecorator.generateCanyon = true;
} }

View File

@ -26,7 +26,7 @@ public class BiomeGenDesertNew extends BiomeGenBase
this.customBiomeDecorator.desertSproutsPerChunk = 1; this.customBiomeDecorator.desertSproutsPerChunk = 1;
this.customBiomeDecorator.tinyCactiPerChunk = 5; this.customBiomeDecorator.tinyCactiPerChunk = 5;
this.customBiomeDecorator.quicksand2PerChunk = 3; this.customBiomeDecorator.quicksand2PerChunk = 3;
this.customBiomeDecorator.yuccaPerChunk = 2; this.customBiomeDecorator.aloePerChunk = 2;
} }
public void decorate(World par1World, Random par2Random, int par3, int par4) public void decorate(World par1World, Random par2Random, int par3, int par4)

View File

@ -23,7 +23,7 @@ public class BiomeGenDunes extends BiomeGenBase
this.customBiomeDecorator.deadBushPerChunk = -999; this.customBiomeDecorator.deadBushPerChunk = -999;
this.customBiomeDecorator.duneGrassPerChunk = 10; this.customBiomeDecorator.duneGrassPerChunk = 10;
this.customBiomeDecorator.desertSproutsPerChunk = 5; this.customBiomeDecorator.desertSproutsPerChunk = 5;
this.customBiomeDecorator.yuccaPerChunk = 1; this.customBiomeDecorator.aloePerChunk = 1;
this.customBiomeDecorator.reedsPerChunk = -999; this.customBiomeDecorator.reedsPerChunk = -999;
this.customBiomeDecorator.generateLakes = false; this.customBiomeDecorator.generateLakes = false;
} }

View File

@ -32,7 +32,7 @@ public class BiomeGenLushDesert extends BiomeGenBase
this.customBiomeDecorator.desertCactiPerChunk = 10; this.customBiomeDecorator.desertCactiPerChunk = 10;
this.customBiomeDecorator.cactiPerChunk = 20; this.customBiomeDecorator.cactiPerChunk = 20;
this.customBiomeDecorator.tinyCactiPerChunk = 5; this.customBiomeDecorator.tinyCactiPerChunk = 5;
this.customBiomeDecorator.yuccaPerChunk = 3; this.customBiomeDecorator.aloePerChunk = 3;
this.customBiomeDecorator.generateGrass = true; this.customBiomeDecorator.generateGrass = true;
this.customBiomeDecorator.generateSand = true; this.customBiomeDecorator.generateSand = true;
this.customBiomeDecorator.generatePumpkins = false; this.customBiomeDecorator.generatePumpkins = false;

View File

@ -32,7 +32,7 @@ public class BiomeGenOasis extends BiomeGenBase
this.customBiomeDecorator.generateMelons = true; this.customBiomeDecorator.generateMelons = true;
this.customBiomeDecorator.waterLakesPerChunk = 10; this.customBiomeDecorator.waterLakesPerChunk = 10;
this.customBiomeDecorator.quicksand2PerChunk = 2; this.customBiomeDecorator.quicksand2PerChunk = 2;
this.customBiomeDecorator.yuccaPerChunk = 4; this.customBiomeDecorator.aloePerChunk = 4;
} }
/** /**

View File

@ -28,7 +28,7 @@ public class BiomeGenSteppe extends BiomeGenBase
this.customBiomeDecorator.tinyCactiPerChunk = 1; this.customBiomeDecorator.tinyCactiPerChunk = 1;
this.customBiomeDecorator.quicksandPerChunk = 1; this.customBiomeDecorator.quicksandPerChunk = 1;
this.customBiomeDecorator.steppePerChunk = 6; this.customBiomeDecorator.steppePerChunk = 6;
this.customBiomeDecorator.yuccaPerChunk = 2; this.customBiomeDecorator.aloePerChunk = 2;
this.customBiomeDecorator.generatePumpkins = false; this.customBiomeDecorator.generatePumpkins = false;
} }

View File

@ -22,7 +22,7 @@ import cpw.mods.fml.relauncher.SideOnly;
public class BlockBOPFlower extends BlockFlower 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; private Icon[] textures;
protected BlockBOPFlower(int blockID, Material material) protected BlockBOPFlower(int blockID, Material material)

View File

@ -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,0), "Giant Red Flower");
LanguageRegistry.addName(new ItemStack(Blocks.petals.get(),1,1), "Giant Yellow 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,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,13), "Portobello");
LanguageRegistry.addName(new ItemStack(Blocks.flowers.get(),1,14), "Blue Milk Cap"); 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,15), "Dandelion");

View File

@ -165,7 +165,7 @@ public class ThaumcraftIntegration {
ThaumcraftApi.registerObjectTag(getBID("daisy"), getBMeta("daisy"), (new ObjectTags()).add(EnumTag.FLOWER, 4)); 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("dandelion"), getBMeta("dandelion"), (new ObjectTags()).add(EnumTag.FLOWER, 4));
ThaumcraftApi.registerObjectTag(getBID("tulip"), getBMeta("tulip"), (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)); ThaumcraftApi.registerObjectTag(getBID("clover"), getBMeta("clover"), (new ObjectTags()).add(EnumTag.FLOWER, 1).add(EnumTag.PLANT, 1));
} }

View File

@ -10,7 +10,7 @@ import net.minecraft.world.World;
public class ItemBOPFlower extends ItemBlock 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) public ItemBOPFlower(int par1)
{ {

View File

Before

Width:  |  Height:  |  Size: 550 B

After

Width:  |  Height:  |  Size: 550 B

Binary file not shown.

After

Width:  |  Height:  |  Size: 467 B

Binary file not shown.

Before

Width:  |  Height:  |  Size: 299 B

After

Width:  |  Height:  |  Size: 371 B