From bb72175452d6298486e015b557332994eeac18fe Mon Sep 17 00:00:00 2001 From: Matt Caughey Date: Tue, 7 May 2013 07:31:20 -0400 Subject: [PATCH] Added white dandelions. --- .../biomesoplenty/api/BlockReferences.java | 1 + .../biomesoplenty/biomes/BiomeDecoratorBOP.java | 10 ++++++++++ .../biomesoplenty/blocks/BlockBOPFlower.java | 2 +- .../biomesoplenty/configuration/BOPBlocks.java | 2 ++ .../biomesoplenty/configuration/BOPCrafting.java | 2 +- .../integration/ThaumcraftIntegration.java | 1 + .../biomesoplenty/items/ItemBOPFlower.java | 2 +- .../BiomesOPlenty/textures/blocks/dandelion.png | Bin 0 -> 335 bytes 8 files changed, 17 insertions(+), 3 deletions(-) create mode 100644 src/minecraft/mods/BiomesOPlenty/textures/blocks/dandelion.png diff --git a/src/minecraft/biomesoplenty/api/BlockReferences.java b/src/minecraft/biomesoplenty/api/BlockReferences.java index 7946ed0b4..5a912e926 100644 --- a/src/minecraft/biomesoplenty/api/BlockReferences.java +++ b/src/minecraft/biomesoplenty/api/BlockReferences.java @@ -115,6 +115,7 @@ public class BlockReferences { yucca (Blocks.flowers, 12), portobello (Blocks.flowers, 13), bluemilk (Blocks.flowers, 14), + dandelion (Blocks.flowers, 15), holyTallGrass (Blocks.plants, 4), desertSprouts (Blocks.plants, 2), duneGrass (Blocks.plants, 3), diff --git a/src/minecraft/biomesoplenty/biomes/BiomeDecoratorBOP.java b/src/minecraft/biomesoplenty/biomes/BiomeDecoratorBOP.java index 773caa0d8..2cc4efa61 100644 --- a/src/minecraft/biomesoplenty/biomes/BiomeDecoratorBOP.java +++ b/src/minecraft/biomesoplenty/biomes/BiomeDecoratorBOP.java @@ -142,6 +142,7 @@ public class BiomeDecoratorBOP extends BiomeDecorator /** Field that holds one of the plantYellow WorldGenFlowers */ protected WorldGenerator plantYellowGen; + protected WorldGenerator dandelionGen; /** Field that holds one of the plantRed WorldGenFlowers */ protected WorldGenerator plantRedGen; @@ -358,6 +359,7 @@ public class BiomeDecoratorBOP extends BiomeDecorator this.diamondGen = new WorldGenMinable(Block.oreDiamond.blockID, 7); this.lapisGen = new WorldGenMinable(Block.oreLapis.blockID, 6); this.plantYellowGen = new WorldGenBOPFlowers(Block.plantYellow.blockID, 0); + this.dandelionGen = new WorldGenBOPFlowers(Blocks.flowers.get().blockID, 15); this.plantRedGen = new WorldGenBOPFlowers(Block.plantRed.blockID, 0); this.plantWhiteGen = new WorldGenBOPFlowers(Blocks.flowers.get().blockID, 9); this.plantBlueGen = new WorldGenBOPFlowers(Blocks.flowers.get().blockID, 1); @@ -721,6 +723,14 @@ public class BiomeDecoratorBOP extends BiomeDecorator var4 = this.randomGenerator.nextInt(128); var5 = this.chunk_Z + this.randomGenerator.nextInt(16) + 8; this.plantYellowGen.generate(this.currentWorld, this.randomGenerator, var3, var4, var5); + + if (this.randomGenerator.nextInt(6) == 0) + { + var3 = this.chunk_X + this.randomGenerator.nextInt(16) + 8; + var4 = this.randomGenerator.nextInt(128); + var5 = this.chunk_Z + this.randomGenerator.nextInt(16) + 8; + this.dandelionGen.generate(this.currentWorld, this.randomGenerator, var3, var4, var5); + } if (this.randomGenerator.nextInt(4) == 0) { diff --git a/src/minecraft/biomesoplenty/blocks/BlockBOPFlower.java b/src/minecraft/biomesoplenty/blocks/BlockBOPFlower.java index 362ac00c1..9d573a6fa 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"}; + private static final String[] plants = new String[] {"clover", "swampflower", "deadbloom", "glowflower", "hydrangea", "daisy", "tulip", "wildflower", "violet", "anemone", "toadstool", "cactus", "yucca", "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 26d358c64..dd71a37d0 100644 --- a/src/minecraft/biomesoplenty/configuration/BOPBlocks.java +++ b/src/minecraft/biomesoplenty/configuration/BOPBlocks.java @@ -282,6 +282,7 @@ public class BOPBlocks { LanguageRegistry.addName(new ItemStack(Blocks.flowers.get(),1,12), "Yucca"); 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"); LanguageRegistry.addName(new ItemStack(Blocks.saplings.get(),1,6), "Fir Sapling"); LanguageRegistry.addName(new ItemStack(Blocks.colorizedSaplings.get(),1,3), "Redwood Sapling"); LanguageRegistry.addName(new ItemStack(Blocks.colorizedSaplings.get(),1,2), "Palm Sapling"); @@ -412,6 +413,7 @@ public class BOPBlocks { MinecraftForge.addGrassPlant(Blocks.flowers.get(), 7, 5); MinecraftForge.addGrassPlant(Blocks.flowers.get(), 8, 5); MinecraftForge.addGrassPlant(Blocks.flowers.get(), 9, 5); + MinecraftForge.addGrassPlant(Blocks.flowers.get(), 15, 20); MinecraftForge.addGrassPlant(Blocks.foliage.get(), 5, 10); } diff --git a/src/minecraft/biomesoplenty/configuration/BOPCrafting.java b/src/minecraft/biomesoplenty/configuration/BOPCrafting.java index c0b1b584b..dfb1822db 100644 --- a/src/minecraft/biomesoplenty/configuration/BOPCrafting.java +++ b/src/minecraft/biomesoplenty/configuration/BOPCrafting.java @@ -28,7 +28,7 @@ public class BOPCrafting GameRegistry.addShapelessRecipe(new ItemStack(Item.dyePowder, 2, 13), new Object[] {new ItemStack(Blocks.flowers.get(),1,7)}); GameRegistry.addShapelessRecipe(new ItemStack(Item.dyePowder, 2, 14), new Object[] {new ItemStack(Blocks.flowers.get(),1,5)}); GameRegistry.addShapelessRecipe(new ItemStack(Item.dyePowder, 2, 9), new Object[] {new ItemStack(Blocks.flowers.get(),1,6)}); - GameRegistry.addShapelessRecipe(new ItemStack(Item.dyePowder, 2, 7), new Object[] {new ItemStack(Blocks.flowers.get(),1,9)}); + GameRegistry.addShapelessRecipe(new ItemStack(Item.dyePowder, 2, 7), new Object[] {new ItemStack(Blocks.flowers.get(),1,15)}); GameRegistry.addShapelessRecipe(new ItemStack(Item.dyePowder, 2, 12), new Object[] {new ItemStack(Blocks.flowers.get(),1,4)}); GameRegistry.addShapelessRecipe(new ItemStack(Item.dyePowder, 2, 5), new Object[] {new ItemStack(Blocks.flowers.get(),1,8)}); GameRegistry.addShapelessRecipe(new ItemStack(Item.dyePowder, 2, 8), new Object[] {new ItemStack(Items.miscItems.get(), 1, 1)}); diff --git a/src/minecraft/biomesoplenty/integration/ThaumcraftIntegration.java b/src/minecraft/biomesoplenty/integration/ThaumcraftIntegration.java index 8b1140ae8..ec7a6b543 100644 --- a/src/minecraft/biomesoplenty/integration/ThaumcraftIntegration.java +++ b/src/minecraft/biomesoplenty/integration/ThaumcraftIntegration.java @@ -163,6 +163,7 @@ public class ThaumcraftIntegration { ThaumcraftApi.registerObjectTag(getBID("swampFlower"), getBMeta("swampFlower"), (new ObjectTags()).add(EnumTag.FLOWER, 4)); ThaumcraftApi.registerObjectTag(getBID("wildFlower"), getBMeta("wildFlower"), (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("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("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 0b5ef9193..743a5dda9 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"}; + private static final String[] plants = new String[] {"clover", "swampflower", "deadbloom", "glowflower", "hydrangea", "daisy", "tulip", "wildflower", "violet", "anemone", "toadstool", "cactus", "yucca", "portobello", "bluemilk", "dandelion"}; public ItemBOPFlower(int par1) { diff --git a/src/minecraft/mods/BiomesOPlenty/textures/blocks/dandelion.png b/src/minecraft/mods/BiomesOPlenty/textures/blocks/dandelion.png new file mode 100644 index 0000000000000000000000000000000000000000..c938f7c75d3d3402ca6454f66ff3739494d91f77 GIT binary patch literal 335 zcmeAS@N?(olHy`uVBq!ia0vp^0wB!61|;P_|4#%`Ea{HEjtmSN`?>!lvI6;>1s;*b z3=DkxL735kHCP2GC{^MbQ4*Y=R#Ki=l*$m0n3-3i=jR%tP-d)Ws%L0m@TF)WP}ONq z7sn6_|F;tixta|`+UidzSwzU}vZ!2qZ(;Zg*{UgiTOYhy&=er*WhU6PR9s-s!R$}7 zoTeukmAq!}pZ@qe2kD c9YY1v_J3*ZAC+>S1HHxI>FVdQ&MBb@0KY$ijQ{`u literal 0 HcmV?d00001