From 3d081408b102697117a883d1f84ae8bf9bc24ae9 Mon Sep 17 00:00:00 2001 From: Matt Caughey Date: Sat, 21 Sep 2013 05:00:30 -0400 Subject: [PATCH] Added Miner's Delight (underground flower) --- common/biomesoplenty/api/BlockReferences.java | 1 + .../biomesoplenty/biomes/BiomeDecoratorBOP.java | 12 ++++++++++++ common/biomesoplenty/blocks/BlockBOPFlower2.java | 13 +++++++++---- .../integration/ThaumcraftIntegration.java | 1 + .../itemblocks/ItemBlockFlower2.java | 2 +- resources/assets/biomesoplenty/lang/en_US.xml | 1 + .../textures/blocks/minersdelight.png | Bin 0 -> 574 bytes 7 files changed, 25 insertions(+), 5 deletions(-) create mode 100644 resources/assets/biomesoplenty/textures/blocks/minersdelight.png diff --git a/common/biomesoplenty/api/BlockReferences.java b/common/biomesoplenty/api/BlockReferences.java index 6a14c219d..18f11cd3f 100644 --- a/common/biomesoplenty/api/BlockReferences.java +++ b/common/biomesoplenty/api/BlockReferences.java @@ -191,6 +191,7 @@ public class BlockReferences { lavender (Blocks.flowers2, 3), goldenrod (Blocks.flowers2, 4), bluebells (Blocks.flowers2, 5), + minersdelight (Blocks.flowers2, 6), ; public Optional block; diff --git a/common/biomesoplenty/biomes/BiomeDecoratorBOP.java b/common/biomesoplenty/biomes/BiomeDecoratorBOP.java index e6f62b134..12484a2cb 100644 --- a/common/biomesoplenty/biomes/BiomeDecoratorBOP.java +++ b/common/biomesoplenty/biomes/BiomeDecoratorBOP.java @@ -229,6 +229,7 @@ public class BiomeDecoratorBOP extends BiomeDecorator public WorldGenerator lavenderGen; public WorldGenerator goldenrodGen; public WorldGenerator bluebellGen; + public WorldGenerator minersDelightGen; public WorldGenerator boneSpineGen; public WorldGenerator boneSpine2Gen; @@ -322,6 +323,7 @@ public class BiomeDecoratorBOP extends BiomeDecorator public int lavenderPerChunk; public int goldenrodsPerChunk; public int bluebellsPerChunk; + public int minersDelightPerChunk; public int boneSpinesPerChunk; public int boneSpines2PerChunk; @@ -480,6 +482,7 @@ public class BiomeDecoratorBOP extends BiomeDecorator lavenderGen = new WorldGenBOPFlowers(Blocks.flowers2.get().blockID, 3); goldenrodGen = new WorldGenBOPFlowers(Blocks.flowers2.get().blockID, 4); bluebellGen = new WorldGenBOPFlowers(Blocks.flowers2.get().blockID, 5); + minersDelightGen = new WorldGenBOPFlowers(Blocks.flowers2.get().blockID, 6); lilyflowerGen = new WorldGenLilyflower(); deathbloomGen = new WorldGenBOPFlowers(Blocks.flowers.get().blockID, 2); hydrangeaGen = new WorldGenBOPFlowers(Blocks.flowers.get().blockID, 4); @@ -613,6 +616,7 @@ public class BiomeDecoratorBOP extends BiomeDecorator lavenderPerChunk = 0; goldenrodsPerChunk = 0; bluebellsPerChunk = 0; + minersDelightPerChunk = 3; generateLakes = true; generateAsh = false; generateMycelium = false; @@ -1181,6 +1185,14 @@ public class BiomeDecoratorBOP extends BiomeDecorator var5 = chunk_Z + randomGenerator.nextInt(16) + 8; bluebellGen.generate(currentWorld, randomGenerator, var3, var4, var5); } + + for (var2 = 0; var2 < minersDelightPerChunk; ++var2) + { + var3 = chunk_X + randomGenerator.nextInt(16) + 8; + var4 = randomGenerator.nextInt(64); + var5 = chunk_Z + randomGenerator.nextInt(16) + 8; + minersDelightGen.generate(currentWorld, randomGenerator, var3, var4, var5); + } for (var2 = 0; var2 < hydrangeasPerChunk; ++var2) { diff --git a/common/biomesoplenty/blocks/BlockBOPFlower2.java b/common/biomesoplenty/blocks/BlockBOPFlower2.java index 08a392975..b9f8e084a 100644 --- a/common/biomesoplenty/blocks/BlockBOPFlower2.java +++ b/common/biomesoplenty/blocks/BlockBOPFlower2.java @@ -22,7 +22,7 @@ import cpw.mods.fml.relauncher.SideOnly; public class BlockBOPFlower2 extends BlockFlower { - private static final String[] plants2 = new String[] {"hibiscus", "lilyofthevalley", "burningblossom", "lavender", "goldenrod", "bluebells"}; + private static final String[] plants2 = new String[] {"hibiscus", "lilyofthevalley", "burningblossom", "lavender", "goldenrod", "bluebells", "minersdelight"}; private Icon[] textures; protected BlockBOPFlower2(int blockID, Material material) @@ -156,13 +156,15 @@ public class BlockBOPFlower2 extends BlockFlower @Override protected boolean canThisPlantGrowOnThisBlockID(int id) { - return id == Block.grass.blockID || id == Block.dirt.blockID || id == Block.tilledField.blockID || id == Block.netherrack.blockID || id == Blocks.longGrass.get().blockID; + return id == Block.grass.blockID || id == Block.dirt.blockID || id == Block.tilledField.blockID || id == Block.netherrack.blockID || id == Blocks.longGrass.get().blockID || id == Block.stone.blockID; } protected boolean canThisPlantGrowOnThisBlockID(int id, int metadata) { if (metadata == 2) // Burning Blossom return id == Block.netherrack.blockID; + else if (metadata == 6) // Burning Blossom + return id == Block.stone.blockID; else return id == Block.grass.blockID || id == Block.dirt.blockID || id == Block.tilledField.blockID || id == Blocks.longGrass.get().blockID; } @@ -179,6 +181,9 @@ public class BlockBOPFlower2 extends BlockFlower { case 2: // Burning Blossom return id == Block.netherrack.blockID; + + case 6: // Miner's Delight + return id == Block.stone.blockID; default: return id == Block.grass.blockID || id == Block.dirt.blockID || id == Block.tilledField.blockID || id == Blocks.longGrass.get().blockID; @@ -215,14 +220,14 @@ public class BlockBOPFlower2 extends BlockFlower if (world.getBlockId(x, y, z) != blockID) { - if (meta == 2) + if (meta == 2 || meta == 6) return this.canThisPlantGrowOnThisBlockID(world.getBlockId(x, y - 1, z)); else return (world.getFullBlockLightValue(x, y, z) >= 8 || world.canBlockSeeTheSky(x, y, z)) && this.canThisPlantGrowOnThisBlockID(world.getBlockId(x, y - 1, z)); } else { - if (meta == 2) + if (meta == 2 || meta == 6) return this.canThisPlantGrowOnThisBlockID(world.getBlockId(x, y - 1, z), world.getBlockMetadata(x, y, z)); else return (world.getFullBlockLightValue(x, y, z) >= 8 || world.canBlockSeeTheSky(x, y, z)) && this.canThisPlantGrowOnThisBlockID(world.getBlockId(x, y - 1, z), world.getBlockMetadata(x, y, z)); diff --git a/common/biomesoplenty/integration/ThaumcraftIntegration.java b/common/biomesoplenty/integration/ThaumcraftIntegration.java index 9ac620f3f..53603073a 100644 --- a/common/biomesoplenty/integration/ThaumcraftIntegration.java +++ b/common/biomesoplenty/integration/ThaumcraftIntegration.java @@ -229,6 +229,7 @@ public class ThaumcraftIntegration { ThaumcraftApi.registerObjectTag(getBID("lavender"), getBMeta("lavender"), (new AspectList()).add(Aspect.PLANT, 4)); ThaumcraftApi.registerObjectTag(getBID("goldenrod"), getBMeta("goldenrod"), (new AspectList()).add(Aspect.PLANT, 4)); ThaumcraftApi.registerObjectTag(getBID("bluebells"), getBMeta("bluebells"), (new AspectList()).add(Aspect.PLANT, 4)); + ThaumcraftApi.registerObjectTag(getBID("minersdelight"), getBMeta("minersdelight"), (new AspectList()).add(Aspect.PLANT, 2).add(Aspect.EARTH, 1)); } diff --git a/common/biomesoplenty/itemblocks/ItemBlockFlower2.java b/common/biomesoplenty/itemblocks/ItemBlockFlower2.java index 9bf57957b..168a11fb1 100644 --- a/common/biomesoplenty/itemblocks/ItemBlockFlower2.java +++ b/common/biomesoplenty/itemblocks/ItemBlockFlower2.java @@ -18,7 +18,7 @@ import cpw.mods.fml.relauncher.SideOnly; public class ItemBlockFlower2 extends ItemBlock { - private static final String[] plants = new String[] {"hibiscus", "lilyofthevalley", "burningblossom", "lavender", "goldenrod", "bluebells"}; + private static final String[] plants = new String[] {"hibiscus", "lilyofthevalley", "burningblossom", "lavender", "goldenrod", "bluebells", "minersdelight"}; @SideOnly(Side.CLIENT) private Icon[] textures; diff --git a/resources/assets/biomesoplenty/lang/en_US.xml b/resources/assets/biomesoplenty/lang/en_US.xml index 2943a880d..baa71dc36 100644 --- a/resources/assets/biomesoplenty/lang/en_US.xml +++ b/resources/assets/biomesoplenty/lang/en_US.xml @@ -60,6 +60,7 @@ Lavender Goldenrod Bluebells + Miner's Delight Algae Short Grass diff --git a/resources/assets/biomesoplenty/textures/blocks/minersdelight.png b/resources/assets/biomesoplenty/textures/blocks/minersdelight.png new file mode 100644 index 0000000000000000000000000000000000000000..fbc75bf1438290de0ee844da90d4b87fcde8d621 GIT binary patch literal 574 zcmV-E0>S->P)N2bPDNB8 zb~7$DE-^7j^FlWO00Fv5L_t(IPkmBND}+%PedqI?&mUuLBZMv+RT5R1ixjIlCLLDzNd3+$tyUi}IBFaQ7m M07*qoM6N<$f<++rX#fBK literal 0 HcmV?d00001