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

Hopefully fixed sapling metadata quirkiness

Browse source
This commit is contained in:
Adubbz 2014-06-09 12:22:12 +10:00
parent 6bddb667e3
commit 2f3b9f2946
1 changed files with 8 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

16
src/main/java/biomesoplenty/common/blocks/BlockBOPColorizedSapling.java
View file

@ -11,6 +11,7 @@ import net.minecraft.init.Blocks;
import net.minecraft.item.Item; import net.minecraft.item.Item;
import net.minecraft.item.ItemStack; import net.minecraft.item.ItemStack;
import net.minecraft.util.IIcon; import net.minecraft.util.IIcon;
import net.minecraft.util.MathHelper;
import net.minecraft.world.World; import net.minecraft.world.World;
import net.minecraft.world.gen.feature.WorldGenerator; import net.minecraft.world.gen.feature.WorldGenerator;
import net.minecraftforge.common.util.ForgeDirection; import net.minecraftforge.common.util.ForgeDirection;
@ -28,7 +29,6 @@ public class BlockBOPColorizedSapling extends BlockSapling
{ {
private static final String[] saplings = new String[] {"sacredoak", "mangrove", "palm", "redwood", "willow", "pine", "mahogany"}; private static final String[] saplings = new String[] {"sacredoak", "mangrove", "palm", "redwood", "willow", "pine", "mahogany"};
private IIcon[] textures; private IIcon[] textures;
private static final int TYPES = 15;
public BlockBOPColorizedSapling() public BlockBOPColorizedSapling()
{ {
@ -81,7 +81,8 @@ public class BlockBOPColorizedSapling extends BlockSapling
} }
} }
protected void checkAndDropBlock(World world, int x, int y, int z) @Override
protected void checkAndDropBlock(World world, int x, int y, int z)
{ {
if (!this.canBlockStay(world, x, y, z, world.getBlockMetadata(x, y, z))) if (!this.canBlockStay(world, x, y, z, world.getBlockMetadata(x, y, z)))
{ {
@ -129,7 +130,6 @@ public class BlockBOPColorizedSapling extends BlockSapling
switch (meta) switch (meta)
{ {
case 1: // Mangrove case 1: // Mangrove
System.out.println("H");
return block == Blocks.sand; return block == Blocks.sand;
default: default:
@ -141,7 +141,7 @@ public class BlockBOPColorizedSapling extends BlockSapling
//TODO: growTree() //TODO: growTree()
public void func_149878_d(World world, int x, int y, int z, Random random) public void func_149878_d(World world, int x, int y, int z, Random random)
{ {
int meta = world.getBlockMetadata(x, y, z) & TYPES; int meta = world.getBlockMetadata(x, y, z) & 7;
Object obj = null; Object obj = null;
int rnd = random.nextInt(8); int rnd = random.nextInt(8);
@ -194,9 +194,9 @@ public class BlockBOPColorizedSapling extends BlockSapling
} }
} }
@Override @Override
public int damageDropped(int meta) public int damageDropped(int meta)
{ {
return meta; return MathHelper.clamp_int(meta & 7, 0, saplings.length - 1);
} }
} }