etc
/
BiomesOPlenty
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Added Hellbark leaves

This commit is contained in:
Matt Caughey 2013-05-25 19:46:48 -04:00
parent 7ab6536a53
commit eac11b1c1b
8 changed files with 55 additions and 65 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
Planned Features.txt
View File

@ -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: BLOCKS:
Pebbles: Small rocks scattered around forest biomes. Pebbles: Small rocks scattered around forest biomes.
@ -32,8 +24,6 @@ BIOMES CHANGES:
Bayou: Trees in the water. Bayou: Trees in the water.
Canyon: Tweak the tree generation.
Heathland: Change tree generation. Heathland: Change tree generation.
Mangrove: Tweak the tree generation. Change height values. 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. Hot Springs: Geysers, pools of water and lava, and decaying spruce trees.
Timber: Tall, decaying deciduous trees, thorns, and small bushes.
--- ---
NETHER BIOMES: 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: OCEAN BIOMES:
Coral Reef: Different types of coral, with reef stone on the ocean floor. Coral Reef: Different types of coral, with reef stone on the ocean floor.

2
src/minecraft/biomesoplenty/api/BlockReferences.java
View File

@ -44,6 +44,7 @@ public class BlockReferences {
redwoodLeaves (Blocks.leavesColorized, 3), redwoodLeaves (Blocks.leavesColorized, 3),
willowLeaves (Blocks.leavesColorized, 4), willowLeaves (Blocks.leavesColorized, 4),
pineLeaves (Blocks.leavesColorized, 5), pineLeaves (Blocks.leavesColorized, 5),
hellbarkLeaves (Blocks.leavesColorized, 6),
yellowAutumnLeaves (Blocks.leaves1, 0), yellowAutumnLeaves (Blocks.leaves1, 0),
bambooLeaves (Blocks.leaves1, 1), bambooLeaves (Blocks.leaves1, 1),
@ -82,6 +83,7 @@ public class BlockReferences {
redwoodSapling (Blocks.colorizedSaplings, 3), redwoodSapling (Blocks.colorizedSaplings, 3),
willowSapling (Blocks.colorizedSaplings, 4), willowSapling (Blocks.colorizedSaplings, 4),
pineSapling (Blocks.colorizedSaplings, 5), pineSapling (Blocks.colorizedSaplings, 5),
hellbarkSapling (Blocks.colorizedSaplings, 6),
mapleSapling (Blocks.saplings, 11), mapleSapling (Blocks.saplings, 11),
orangeAutumnSapling (Blocks.saplings, 8), orangeAutumnSapling (Blocks.saplings, 8),
pinkCherrySapling (Blocks.saplings, 10), pinkCherrySapling (Blocks.saplings, 10),

2
src/minecraft/biomesoplenty/blocks/BlockBOPColorizedLeaves.java
View File

@ -22,7 +22,7 @@ import cpw.mods.fml.relauncher.SideOnly;
public class BlockBOPColorizedLeaves extends BlockLeavesBase implements IShearable 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; private Icon[][] textures;
int[] adjacentTreeBlocks; int[] adjacentTreeBlocks;

7
src/minecraft/biomesoplenty/blocks/BlockBOPColorizedSapling.java
View File

@ -16,6 +16,7 @@ import biomesoplenty.BiomesOPlenty;
import biomesoplenty.api.Blocks; import biomesoplenty.api.Blocks;
import biomesoplenty.worldgen.WorldGenAcacia; import biomesoplenty.worldgen.WorldGenAcacia;
import biomesoplenty.worldgen.WorldGenMangrove; import biomesoplenty.worldgen.WorldGenMangrove;
import biomesoplenty.worldgen.WorldGenNetherBush;
import biomesoplenty.worldgen.WorldGenPalmTree1; import biomesoplenty.worldgen.WorldGenPalmTree1;
import biomesoplenty.worldgen.WorldGenPalmTree3; import biomesoplenty.worldgen.WorldGenPalmTree3;
import biomesoplenty.worldgen.WorldGenPineTree; import biomesoplenty.worldgen.WorldGenPineTree;
@ -26,7 +27,7 @@ import cpw.mods.fml.relauncher.SideOnly;
public class BlockBOPColorizedSapling extends BlockSapling 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 Icon[] textures;
private static final int TYPES = 15; private static final int TYPES = 15;
@ -143,6 +144,10 @@ public class BlockBOPColorizedSapling extends BlockSapling
case 5: // Pine Tree case 5: // Pine Tree
obj = new WorldGenPineTree(); obj = new WorldGenPineTree();
break;
case 6: // Hellbark
obj = new WorldGenNetherBush();
break; break;
} }
} }

5
src/minecraft/biomesoplenty/configuration/BOPBlocks.java
View File

@ -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,1), "Yellow Autumn Sapling");
LanguageRegistry.addName(new ItemStack(Blocks.saplings.get(),1,5), "Dying 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,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,0), "Apple Sapling");
LanguageRegistry.addName(new ItemStack(Blocks.saplings.get(),1,9), "Origin Sapling"); LanguageRegistry.addName(new ItemStack(Blocks.saplings.get(),1,9), "Origin Sapling");
LanguageRegistry.addName(new ItemStack(Blocks.saplings.get(),1,10), "Pink Cherry 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.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,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.logs4.get(),1,2), "Jacaranda Wood");
LanguageRegistry.addName(new ItemStack(Blocks.woodenDoubleSlab1.get(),1,0), "Acacia Wood Slab"); 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,3), "Redwood Leaves");
LanguageRegistry.addName(new ItemStack(Blocks.leavesColorized.get(),1,4), "Willow 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,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.leaves1.get(),1,5), "Fir Leaves");
LanguageRegistry.addName(new ItemStack(Blocks.leavesColorized.get(),1,0), "Acacia Leaves"); LanguageRegistry.addName(new ItemStack(Blocks.leavesColorized.get(),1,0), "Acacia Leaves");
LanguageRegistry.addName(new ItemStack(Blocks.leaves1.get(),1,3), "Dark Leaves"); LanguageRegistry.addName(new ItemStack(Blocks.leaves1.get(),1,3), "Dark Leaves");

16
src/minecraft/biomesoplenty/worldgen/WorldGenNetherBush.java
View File

@ -21,7 +21,7 @@ public class WorldGenNetherBush extends WorldGenerator
int var6 = var1.getBlockId(var3, var4, var5); int var6 = var1.getBlockId(var3, var4, var5);
int var99 = var1.getBlockId(var3, var4 + 1, 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; return false;
} }
@ -39,13 +39,13 @@ public class WorldGenNetherBush extends WorldGenerator
} }
var1.setBlock(var3, var4, var5, Block.netherrack.blockID); var1.setBlock(var3, var4, var5, Block.netherrack.blockID);
this.setBlockAndMetadata(var1, var3, var4 + 1, var5, Block.wood.blockID,0); this.setBlockAndMetadata(var1, var3, var4 + 1, var5, Blocks.logs4.get().blockID, 1);
this.setBlockAndMetadata(var1, var3, var4 + 2, var5, Block.wood.blockID,0); this.setBlockAndMetadata(var1, var3, var4 + 2, var5, Blocks.logs4.get().blockID, 1);
this.setBlockAndMetadata(var1, var3 + 1, var4 + 2, var5, Block.leaves.blockID, 0); this.setBlockAndMetadata(var1, var3 + 1, var4 + 2, var5, Blocks.leavesColorized.get().blockID, 6);
this.setBlockAndMetadata(var1, var3 - 1, var4 + 2, var5, Block.leaves.blockID, 0); this.setBlockAndMetadata(var1, var3 - 1, var4 + 2, var5, Blocks.leavesColorized.get().blockID, 6);
this.setBlockAndMetadata(var1, var3, var4 + 2, var5 + 1, Block.leaves.blockID, 0); this.setBlockAndMetadata(var1, var3, var4 + 2, var5 + 1, Blocks.leavesColorized.get().blockID, 6);
this.setBlockAndMetadata(var1, var3, var4 + 2, var5 - 1, Block.leaves.blockID, 0); this.setBlockAndMetadata(var1, var3, var4 + 2, var5 - 1, Blocks.leavesColorized.get().blockID, 6);
this.setBlockAndMetadata(var1, var3, var4 + 3, var5, Block.leaves.blockID, 0); this.setBlockAndMetadata(var1, var3, var4 + 3, var5, Blocks.leavesColorized.get().blockID, 6);
return true; return true;
} }
} }

28
src/minecraft/biomesoplenty/worldgen/WorldGenNetherGrass.java
View File

@ -58,59 +58,59 @@ public class WorldGenNetherGrass extends WorldGenerator
if (var99 == 3) 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)) 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)) 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)) 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)) 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)) 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)) 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) 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)) 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)) 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)) 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)) 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)) 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)) 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);
} }
} }
} }

40
src/minecraft/biomesoplenty/worldgen/WorldGenPineTree.java
View File

@ -42,16 +42,16 @@ public class WorldGenPineTree extends WorldGenerator
if (var99 == 0) if (var99 == 0)
{ {
var1.setBlock(var3, var4, var5, Block.dirt.blockID); var1.setBlock(var3, var4, var5, Block.dirt.blockID);
var1.setBlock(var3, var4 + 1, var5, Block.wood.blockID, 0, 2); var1.setBlock(var3, var4 + 1, var5, Blocks.logs4.get().blockID, 0, 2);
var1.setBlock(var3, var4 + 2, var5, Block.wood.blockID, 0, 2); var1.setBlock(var3, var4 + 2, var5, Blocks.logs4.get().blockID, 0, 2);
var1.setBlock(var3, var4 + 3, var5, Block.wood.blockID, 0, 2); var1.setBlock(var3, var4 + 3, var5, Blocks.logs4.get().blockID, 0, 2);
var1.setBlock(var3, var4 + 4, var5, Block.wood.blockID, 0, 2); var1.setBlock(var3, var4 + 4, var5, Blocks.logs4.get().blockID, 0, 2);
var1.setBlock(var3, var4 + 5, var5, Block.wood.blockID, 0, 2); var1.setBlock(var3, var4 + 5, var5, Blocks.logs4.get().blockID, 0, 2);
var1.setBlock(var3, var4 + 6, var5, Block.wood.blockID, 0, 2); var1.setBlock(var3, var4 + 6, var5, Blocks.logs4.get().blockID, 0, 2);
var1.setBlock(var3, var4 + 7, var5, Block.wood.blockID, 0, 2); var1.setBlock(var3, var4 + 7, var5, Blocks.logs4.get().blockID, 0, 2);
var1.setBlock(var3, var4 + 8, var5, Block.wood.blockID, 0, 2); var1.setBlock(var3, var4 + 8, var5, Blocks.logs4.get().blockID, 0, 2);
var1.setBlock(var3, var4 + 9, var5, Block.wood.blockID, 0, 2); var1.setBlock(var3, var4 + 9, var5, Blocks.logs4.get().blockID, 0, 2);
var1.setBlock(var3, var4 + 10, var5, Block.wood.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);
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) if (var99 == 1)
{ {
var1.setBlock(var3, var4, var5, Block.dirt.blockID); var1.setBlock(var3, var4, var5, Block.dirt.blockID);
var1.setBlock(var3, var4 + 1, var5, Block.wood.blockID, 0, 2); var1.setBlock(var3, var4 + 1, var5, Blocks.logs4.get().blockID, 0, 2);
var1.setBlock(var3, var4 + 2, var5, Block.wood.blockID, 0, 2); var1.setBlock(var3, var4 + 2, var5, Blocks.logs4.get().blockID, 0, 2);
var1.setBlock(var3, var4 + 3, var5, Block.wood.blockID, 0, 2); var1.setBlock(var3, var4 + 3, var5, Blocks.logs4.get().blockID, 0, 2);
var1.setBlock(var3, var4 + 4, var5, Block.wood.blockID, 0, 2); var1.setBlock(var3, var4 + 4, var5, Blocks.logs4.get().blockID, 0, 2);
var1.setBlock(var3, var4 + 5, var5, Block.wood.blockID, 0, 2); var1.setBlock(var3, var4 + 5, var5, Blocks.logs4.get().blockID, 0, 2);
var1.setBlock(var3, var4 + 6, var5, Block.wood.blockID, 0, 2); var1.setBlock(var3, var4 + 6, var5, Blocks.logs4.get().blockID, 0, 2);
var1.setBlock(var3, var4 + 7, var5, Block.wood.blockID, 0, 2); var1.setBlock(var3, var4 + 7, var5, Blocks.logs4.get().blockID, 0, 2);
var1.setBlock(var3, var4 + 8, var5, Block.wood.blockID, 0, 2); var1.setBlock(var3, var4 + 8, var5, Blocks.logs4.get().blockID, 0, 2);
var1.setBlock(var3, var4 + 9, var5, Block.wood.blockID, 0, 2); var1.setBlock(var3, var4 + 9, var5, Blocks.logs4.get().blockID, 0, 2);
var1.setBlock(var3, var4 + 10, var5, Block.wood.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);
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);