From eac11b1c1b98fd590fc3e74f010cace8e407e806 Mon Sep 17 00:00:00 2001 From: Matt Caughey Date: Sat, 25 May 2013 19:46:48 -0400 Subject: [PATCH] Added Hellbark leaves --- Planned Features.txt | 20 ---------- .../biomesoplenty/api/BlockReferences.java | 2 + .../blocks/BlockBOPColorizedLeaves.java | 2 +- .../blocks/BlockBOPColorizedSapling.java | 7 +++- .../configuration/BOPBlocks.java | 5 ++- .../worldgen/WorldGenNetherBush.java | 16 ++++---- .../worldgen/WorldGenNetherGrass.java | 28 ++++++------- .../worldgen/WorldGenPineTree.java | 40 +++++++++---------- 8 files changed, 55 insertions(+), 65 deletions(-) diff --git a/Planned Features.txt b/Planned Features.txt index a7df47980..bb822fa5a 100644 --- a/Planned Features.txt +++ b/Planned Features.txt @@ -1,11 +1,3 @@ -GENERATION: - -Jacaranda Tree: Purple-leafed trees that generate in the Extreme Hills, Heathland, and Mystic Grove. - -Pine Tree: Pine trees that generate in the Canyon, Jade Cliffs, and Mountain. - ---- - BLOCKS: Pebbles: Small rocks scattered around forest biomes. @@ -32,8 +24,6 @@ BIOMES CHANGES: Bayou: Trees in the water. -Canyon: Tweak the tree generation. - Heathland: Change tree generation. Mangrove: Tweak the tree generation. Change height values. @@ -44,8 +34,6 @@ OVERWORLD BIOMES: Hot Springs: Geysers, pools of water and lava, and decaying spruce trees. -Timber: Tall, decaying deciduous trees, thorns, and small bushes. - --- NETHER BIOMES: @@ -56,14 +44,6 @@ Boneyard: Skulls, bones sticking out of the ground, large bone structures, --- -BEACH BIOMES: - -Gravel Beach: A beach covered in gravel. - -Overgrown Beach: A beach with small trees and shrubs, dune grass, and patches of medium grass. - ---- - OCEAN BIOMES: Coral Reef: Different types of coral, with reef stone on the ocean floor. diff --git a/src/minecraft/biomesoplenty/api/BlockReferences.java b/src/minecraft/biomesoplenty/api/BlockReferences.java index 5150fbf70..5ed84528c 100644 --- a/src/minecraft/biomesoplenty/api/BlockReferences.java +++ b/src/minecraft/biomesoplenty/api/BlockReferences.java @@ -44,6 +44,7 @@ public class BlockReferences { redwoodLeaves (Blocks.leavesColorized, 3), willowLeaves (Blocks.leavesColorized, 4), pineLeaves (Blocks.leavesColorized, 5), + hellbarkLeaves (Blocks.leavesColorized, 6), yellowAutumnLeaves (Blocks.leaves1, 0), bambooLeaves (Blocks.leaves1, 1), @@ -82,6 +83,7 @@ public class BlockReferences { redwoodSapling (Blocks.colorizedSaplings, 3), willowSapling (Blocks.colorizedSaplings, 4), pineSapling (Blocks.colorizedSaplings, 5), + hellbarkSapling (Blocks.colorizedSaplings, 6), mapleSapling (Blocks.saplings, 11), orangeAutumnSapling (Blocks.saplings, 8), pinkCherrySapling (Blocks.saplings, 10), diff --git a/src/minecraft/biomesoplenty/blocks/BlockBOPColorizedLeaves.java b/src/minecraft/biomesoplenty/blocks/BlockBOPColorizedLeaves.java index a63ec2964..92f3ceb3f 100644 --- a/src/minecraft/biomesoplenty/blocks/BlockBOPColorizedLeaves.java +++ b/src/minecraft/biomesoplenty/blocks/BlockBOPColorizedLeaves.java @@ -22,7 +22,7 @@ import cpw.mods.fml.relauncher.SideOnly; public class BlockBOPColorizedLeaves extends BlockLeavesBase implements IShearable { - private static final String[] leaves = new String[] {"acacia", "mangrove", "palm", "redwood", "willow", "pine"}; + private static final String[] leaves = new String[] {"acacia", "mangrove", "palm", "redwood", "willow", "pine", "hellbark"}; private Icon[][] textures; int[] adjacentTreeBlocks; diff --git a/src/minecraft/biomesoplenty/blocks/BlockBOPColorizedSapling.java b/src/minecraft/biomesoplenty/blocks/BlockBOPColorizedSapling.java index 95b51edf3..784d79193 100644 --- a/src/minecraft/biomesoplenty/blocks/BlockBOPColorizedSapling.java +++ b/src/minecraft/biomesoplenty/blocks/BlockBOPColorizedSapling.java @@ -16,6 +16,7 @@ import biomesoplenty.BiomesOPlenty; import biomesoplenty.api.Blocks; import biomesoplenty.worldgen.WorldGenAcacia; import biomesoplenty.worldgen.WorldGenMangrove; +import biomesoplenty.worldgen.WorldGenNetherBush; import biomesoplenty.worldgen.WorldGenPalmTree1; import biomesoplenty.worldgen.WorldGenPalmTree3; import biomesoplenty.worldgen.WorldGenPineTree; @@ -26,7 +27,7 @@ import cpw.mods.fml.relauncher.SideOnly; public class BlockBOPColorizedSapling extends BlockSapling { - private static final String[] saplings = new String[] {"acacia", "mangrove", "palm", "redwood", "willow", "pine"}; + private static final String[] saplings = new String[] {"acacia", "mangrove", "palm", "redwood", "willow", "pine", "hellbark"}; private Icon[] textures; private static final int TYPES = 15; @@ -143,6 +144,10 @@ public class BlockBOPColorizedSapling extends BlockSapling case 5: // Pine Tree obj = new WorldGenPineTree(); + break; + + case 6: // Hellbark + obj = new WorldGenNetherBush(); break; } } diff --git a/src/minecraft/biomesoplenty/configuration/BOPBlocks.java b/src/minecraft/biomesoplenty/configuration/BOPBlocks.java index b76479b45..c7de4a3cf 100644 --- a/src/minecraft/biomesoplenty/configuration/BOPBlocks.java +++ b/src/minecraft/biomesoplenty/configuration/BOPBlocks.java @@ -337,6 +337,8 @@ public class BOPBlocks { LanguageRegistry.addName(new ItemStack(Blocks.saplings.get(),1,1), "Yellow Autumn Sapling"); LanguageRegistry.addName(new ItemStack(Blocks.saplings.get(),1,5), "Dying Sapling"); LanguageRegistry.addName(new ItemStack(Blocks.colorizedSaplings.get(),1,4), "Willow Sapling"); + LanguageRegistry.addName(new ItemStack(Blocks.colorizedSaplings.get(),1,5), "Pine Sapling"); + LanguageRegistry.addName(new ItemStack(Blocks.colorizedSaplings.get(),1,6), "Hellbark Sapling"); LanguageRegistry.addName(new ItemStack(Blocks.saplings.get(),1,0), "Apple Sapling"); LanguageRegistry.addName(new ItemStack(Blocks.saplings.get(),1,9), "Origin Sapling"); LanguageRegistry.addName(new ItemStack(Blocks.saplings.get(),1,10), "Pink Cherry Sapling"); @@ -420,7 +422,7 @@ public class BOPBlocks { LanguageRegistry.addName(new ItemStack(Blocks.logs3.get(),1,3), "Giant Flower Stem"); LanguageRegistry.addName(new ItemStack(Blocks.logs4.get(),1,0), "Pine Wood"); - LanguageRegistry.addName(new ItemStack(Blocks.logs4.get(),1,1), "Hellbark"); + LanguageRegistry.addName(new ItemStack(Blocks.logs4.get(),1,1), "Hellbark Wood"); LanguageRegistry.addName(new ItemStack(Blocks.logs4.get(),1,2), "Jacaranda Wood"); LanguageRegistry.addName(new ItemStack(Blocks.woodenDoubleSlab1.get(),1,0), "Acacia Wood Slab"); @@ -459,6 +461,7 @@ public class BOPBlocks { LanguageRegistry.addName(new ItemStack(Blocks.leavesColorized.get(),1,3), "Redwood Leaves"); LanguageRegistry.addName(new ItemStack(Blocks.leavesColorized.get(),1,4), "Willow Leaves"); LanguageRegistry.addName(new ItemStack(Blocks.leavesColorized.get(),1,5), "Pine Leaves"); + LanguageRegistry.addName(new ItemStack(Blocks.leavesColorized.get(),1,6), "Hellbark Leaves"); LanguageRegistry.addName(new ItemStack(Blocks.leaves1.get(),1,5), "Fir Leaves"); LanguageRegistry.addName(new ItemStack(Blocks.leavesColorized.get(),1,0), "Acacia Leaves"); LanguageRegistry.addName(new ItemStack(Blocks.leaves1.get(),1,3), "Dark Leaves"); diff --git a/src/minecraft/biomesoplenty/worldgen/WorldGenNetherBush.java b/src/minecraft/biomesoplenty/worldgen/WorldGenNetherBush.java index aa7701395..448d07fc1 100644 --- a/src/minecraft/biomesoplenty/worldgen/WorldGenNetherBush.java +++ b/src/minecraft/biomesoplenty/worldgen/WorldGenNetherBush.java @@ -21,7 +21,7 @@ public class WorldGenNetherBush extends WorldGenerator int var6 = var1.getBlockId(var3, var4, var5); int var99 = var1.getBlockId(var3, var4 + 1, var5); - if (var6 != Block.netherrack.blockID && var99 != 0) + if (var6 != Block.netherrack.blockID && var6 != Block.grass.blockID && var99 != 0) { return false; } @@ -39,13 +39,13 @@ public class WorldGenNetherBush extends WorldGenerator } var1.setBlock(var3, var4, var5, Block.netherrack.blockID); - this.setBlockAndMetadata(var1, var3, var4 + 1, var5, Block.wood.blockID,0); - this.setBlockAndMetadata(var1, var3, var4 + 2, var5, Block.wood.blockID,0); - this.setBlockAndMetadata(var1, var3 + 1, var4 + 2, var5, Block.leaves.blockID, 0); - this.setBlockAndMetadata(var1, var3 - 1, var4 + 2, var5, Block.leaves.blockID, 0); - this.setBlockAndMetadata(var1, var3, var4 + 2, var5 + 1, Block.leaves.blockID, 0); - this.setBlockAndMetadata(var1, var3, var4 + 2, var5 - 1, Block.leaves.blockID, 0); - this.setBlockAndMetadata(var1, var3, var4 + 3, var5, Block.leaves.blockID, 0); + this.setBlockAndMetadata(var1, var3, var4 + 1, var5, Blocks.logs4.get().blockID, 1); + this.setBlockAndMetadata(var1, var3, var4 + 2, var5, Blocks.logs4.get().blockID, 1); + this.setBlockAndMetadata(var1, var3 + 1, var4 + 2, var5, Blocks.leavesColorized.get().blockID, 6); + this.setBlockAndMetadata(var1, var3 - 1, var4 + 2, var5, Blocks.leavesColorized.get().blockID, 6); + this.setBlockAndMetadata(var1, var3, var4 + 2, var5 + 1, Blocks.leavesColorized.get().blockID, 6); + this.setBlockAndMetadata(var1, var3, var4 + 2, var5 - 1, Blocks.leavesColorized.get().blockID, 6); + this.setBlockAndMetadata(var1, var3, var4 + 3, var5, Blocks.leavesColorized.get().blockID, 6); return true; } } diff --git a/src/minecraft/biomesoplenty/worldgen/WorldGenNetherGrass.java b/src/minecraft/biomesoplenty/worldgen/WorldGenNetherGrass.java index 6297135d9..c0312e8dc 100644 --- a/src/minecraft/biomesoplenty/worldgen/WorldGenNetherGrass.java +++ b/src/minecraft/biomesoplenty/worldgen/WorldGenNetherGrass.java @@ -58,59 +58,59 @@ public class WorldGenNetherGrass extends WorldGenerator if (var99 == 3) { - par1World.setBlock(var8, var9, var10, Block.wood.blockID, 0, 2); + par1World.setBlock(var8, var9, var10, Blocks.logs4.get().blockID, 1, 2); if (par1World.isAirBlock(var8, var9 + 1, var10)) { - par1World.setBlock(var8, var9 + 1, var10, Block.wood.blockID, 0, 2); + par1World.setBlock(var8, var9 + 1, var10, Blocks.logs4.get().blockID, 1, 2); } if (par1World.isAirBlock(var8 + 1, var9 + 1, var10)) { - par1World.setBlock(var8 + 1, var9 + 1, var10, Block.leaves.blockID, 0, 2); + par1World.setBlock(var8 + 1, var9 + 1, var10, Blocks.leavesColorized.get().blockID, 6, 2); } if (par1World.isAirBlock(var8 - 1, var9 + 1, var10)) { - par1World.setBlock(var8 - 1, var9 + 1, var10, Block.leaves.blockID, 0, 2); + par1World.setBlock(var8 - 1, var9 + 1, var10, Blocks.leavesColorized.get().blockID, 6, 2); } if (par1World.isAirBlock(var8, var9 + 1, var10 + 1)) { - par1World.setBlock(var8, var9 + 1, var10 + 1, Block.leaves.blockID, 0, 2); + par1World.setBlock(var8, var9 + 1, var10 + 1, Blocks.leavesColorized.get().blockID, 6, 2); } if (par1World.isAirBlock(var8, var9 + 1, var10 - 1)) { - par1World.setBlock(var8, var9 + 1, var10 - 1, Block.leaves.blockID, 0, 2); + par1World.setBlock(var8, var9 + 1, var10 - 1, Blocks.leavesColorized.get().blockID, 6, 2); } if (par1World.isAirBlock(var8, var9 + 2, var10)) { - par1World.setBlock(var8, var9 + 2, var10, Block.leaves.blockID, 0, 2); + par1World.setBlock(var8, var9 + 2, var10, Blocks.leavesColorized.get().blockID, 6, 2); } } if (var99 == 4) { - par1World.setBlock(var8, var9, var10, Block.wood.blockID, 0, 2); + par1World.setBlock(var8, var9, var10, Blocks.logs4.get().blockID, 1, 2); if (par1World.isAirBlock(var8, var9 + 1, var10)) { - par1World.setBlock(var8, var9 + 1, var10, Block.wood.blockID, 0, 2); + par1World.setBlock(var8, var9 + 1, var10, Blocks.logs4.get().blockID, 1, 2); } if (par1World.isAirBlock(var8 + 1, var9 + 1, var10)) { - par1World.setBlock(var8 + 1, var9 + 1, var10, Block.leaves.blockID, 0, 2); + par1World.setBlock(var8 + 1, var9 + 1, var10, Blocks.leavesColorized.get().blockID, 6, 2); } if (par1World.isAirBlock(var8 - 1, var9 + 1, var10)) { - par1World.setBlock(var8 - 1, var9 + 1, var10, Block.leaves.blockID, 0, 2); + par1World.setBlock(var8 - 1, var9 + 1, var10, Blocks.leavesColorized.get().blockID, 6, 2); } if (par1World.isAirBlock(var8, var9 + 1, var10 + 1)) { - par1World.setBlock(var8, var9 + 1, var10 + 1, Block.leaves.blockID, 0, 2); + par1World.setBlock(var8, var9 + 1, var10 + 1, Blocks.leavesColorized.get().blockID, 6, 2); } if (par1World.isAirBlock(var8, var9 + 1, var10 - 1)) { - par1World.setBlock(var8, var9 + 1, var10 - 1, Block.leaves.blockID, 0, 2); + par1World.setBlock(var8, var9 + 1, var10 - 1, Blocks.leavesColorized.get().blockID, 6, 2); } if (par1World.isAirBlock(var8, var9 + 2, var10)) { - par1World.setBlock(var8, var9 + 2, var10, Block.leaves.blockID, 0, 2); + par1World.setBlock(var8, var9 + 2, var10, Blocks.leavesColorized.get().blockID, 6, 2); } } } diff --git a/src/minecraft/biomesoplenty/worldgen/WorldGenPineTree.java b/src/minecraft/biomesoplenty/worldgen/WorldGenPineTree.java index 00a0ed3c4..4112af342 100644 --- a/src/minecraft/biomesoplenty/worldgen/WorldGenPineTree.java +++ b/src/minecraft/biomesoplenty/worldgen/WorldGenPineTree.java @@ -42,16 +42,16 @@ public class WorldGenPineTree extends WorldGenerator if (var99 == 0) { var1.setBlock(var3, var4, var5, Block.dirt.blockID); - var1.setBlock(var3, var4 + 1, var5, Block.wood.blockID, 0, 2); - var1.setBlock(var3, var4 + 2, var5, Block.wood.blockID, 0, 2); - var1.setBlock(var3, var4 + 3, var5, Block.wood.blockID, 0, 2); - var1.setBlock(var3, var4 + 4, var5, Block.wood.blockID, 0, 2); - var1.setBlock(var3, var4 + 5, var5, Block.wood.blockID, 0, 2); - var1.setBlock(var3, var4 + 6, var5, Block.wood.blockID, 0, 2); - var1.setBlock(var3, var4 + 7, var5, Block.wood.blockID, 0, 2); - var1.setBlock(var3, var4 + 8, var5, Block.wood.blockID, 0, 2); - var1.setBlock(var3, var4 + 9, var5, Block.wood.blockID, 0, 2); - var1.setBlock(var3, var4 + 10, var5, Block.wood.blockID, 0, 2); + var1.setBlock(var3, var4 + 1, var5, Blocks.logs4.get().blockID, 0, 2); + var1.setBlock(var3, var4 + 2, var5, Blocks.logs4.get().blockID, 0, 2); + var1.setBlock(var3, var4 + 3, var5, Blocks.logs4.get().blockID, 0, 2); + var1.setBlock(var3, var4 + 4, var5, Blocks.logs4.get().blockID, 0, 2); + var1.setBlock(var3, var4 + 5, var5, Blocks.logs4.get().blockID, 0, 2); + var1.setBlock(var3, var4 + 6, var5, Blocks.logs4.get().blockID, 0, 2); + var1.setBlock(var3, var4 + 7, var5, Blocks.logs4.get().blockID, 0, 2); + var1.setBlock(var3, var4 + 8, var5, Blocks.logs4.get().blockID, 0, 2); + var1.setBlock(var3, var4 + 9, var5, Blocks.logs4.get().blockID, 0, 2); + var1.setBlock(var3, var4 + 10, var5, Blocks.logs4.get().blockID, 0, 2); var1.setBlock(var3 + 1, var4 + 6, var5, Blocks.leavesColorized.get().blockID, 5, 2); var1.setBlock(var3 - 1, var4 + 6, var5, Blocks.leavesColorized.get().blockID, 5, 2); @@ -103,16 +103,16 @@ public class WorldGenPineTree extends WorldGenerator if (var99 == 1) { var1.setBlock(var3, var4, var5, Block.dirt.blockID); - var1.setBlock(var3, var4 + 1, var5, Block.wood.blockID, 0, 2); - var1.setBlock(var3, var4 + 2, var5, Block.wood.blockID, 0, 2); - var1.setBlock(var3, var4 + 3, var5, Block.wood.blockID, 0, 2); - var1.setBlock(var3, var4 + 4, var5, Block.wood.blockID, 0, 2); - var1.setBlock(var3, var4 + 5, var5, Block.wood.blockID, 0, 2); - var1.setBlock(var3, var4 + 6, var5, Block.wood.blockID, 0, 2); - var1.setBlock(var3, var4 + 7, var5, Block.wood.blockID, 0, 2); - var1.setBlock(var3, var4 + 8, var5, Block.wood.blockID, 0, 2); - var1.setBlock(var3, var4 + 9, var5, Block.wood.blockID, 0, 2); - var1.setBlock(var3, var4 + 10, var5, Block.wood.blockID, 0, 2); + var1.setBlock(var3, var4 + 1, var5, Blocks.logs4.get().blockID, 0, 2); + var1.setBlock(var3, var4 + 2, var5, Blocks.logs4.get().blockID, 0, 2); + var1.setBlock(var3, var4 + 3, var5, Blocks.logs4.get().blockID, 0, 2); + var1.setBlock(var3, var4 + 4, var5, Blocks.logs4.get().blockID, 0, 2); + var1.setBlock(var3, var4 + 5, var5, Blocks.logs4.get().blockID, 0, 2); + var1.setBlock(var3, var4 + 6, var5, Blocks.logs4.get().blockID, 0, 2); + var1.setBlock(var3, var4 + 7, var5, Blocks.logs4.get().blockID, 0, 2); + var1.setBlock(var3, var4 + 8, var5, Blocks.logs4.get().blockID, 0, 2); + var1.setBlock(var3, var4 + 9, var5, Blocks.logs4.get().blockID, 0, 2); + var1.setBlock(var3, var4 + 10, var5, Blocks.logs4.get().blockID, 0, 2); var1.setBlock(var3 + 1, var4 + 6, var5, Blocks.leavesColorized.get().blockID, 5, 2); var1.setBlock(var3 - 1, var4 + 6, var5, Blocks.leavesColorized.get().blockID, 5, 2);