From 6984125beece20504e90692c7ce5c6556e67a8d5 Mon Sep 17 00:00:00 2001 From: Adubbz Date: Wed, 17 Apr 2013 10:09:59 +1000 Subject: [PATCH] Fixed the blocks, hopefully there are no crashes anymore :) --- src/minecraft/biomesoplenty/blocks/BlockAcaciaLog.java | 3 ++- src/minecraft/biomesoplenty/blocks/BlockAcaciaSapling.java | 3 ++- src/minecraft/biomesoplenty/blocks/BlockAppleLeaves.java | 3 ++- .../biomesoplenty/blocks/BlockAppleLeavesFruitless.java | 5 +++-- src/minecraft/biomesoplenty/blocks/BlockAppleSapling.java | 3 ++- src/minecraft/biomesoplenty/blocks/BlockAutumnLeaves.java | 3 ++- src/minecraft/biomesoplenty/blocks/BlockBambooLeaves.java | 3 ++- src/minecraft/biomesoplenty/blocks/BlockBambooSapling.java | 3 ++- src/minecraft/biomesoplenty/blocks/BlockBlueLeaves.java | 3 ++- src/minecraft/biomesoplenty/blocks/BlockBrownSapling.java | 3 ++- src/minecraft/biomesoplenty/blocks/BlockCherryLog.java | 3 ++- src/minecraft/biomesoplenty/blocks/BlockDarkLeaves.java | 3 ++- src/minecraft/biomesoplenty/blocks/BlockDarkLog.java | 3 ++- src/minecraft/biomesoplenty/blocks/BlockDarkSapling.java | 3 ++- src/minecraft/biomesoplenty/blocks/BlockDeadLeaves.java | 3 ++- src/minecraft/biomesoplenty/blocks/BlockDeadLog.java | 3 ++- src/minecraft/biomesoplenty/blocks/BlockFirLeaves.java | 3 ++- src/minecraft/biomesoplenty/blocks/BlockFirLog.java | 3 ++- src/minecraft/biomesoplenty/blocks/BlockFirSapling.java | 3 ++- src/minecraft/biomesoplenty/blocks/BlockGiantFlowerStem.java | 3 ++- src/minecraft/biomesoplenty/blocks/BlockHolyGrass.java | 3 ++- src/minecraft/biomesoplenty/blocks/BlockHolyLeaves.java | 3 ++- src/minecraft/biomesoplenty/blocks/BlockHolyLog.java | 3 ++- src/minecraft/biomesoplenty/blocks/BlockHolySapling.java | 3 ++- src/minecraft/biomesoplenty/blocks/BlockMagicLog.java | 3 ++- src/minecraft/biomesoplenty/blocks/BlockMagicSapling.java | 3 ++- src/minecraft/biomesoplenty/blocks/BlockMangroveLeaves.java | 3 ++- src/minecraft/biomesoplenty/blocks/BlockMangroveLog.java | 3 ++- src/minecraft/biomesoplenty/blocks/BlockMangroveSapling.java | 3 ++- src/minecraft/biomesoplenty/blocks/BlockOrangeLeaves.java | 3 ++- src/minecraft/biomesoplenty/blocks/BlockOrangeSapling.java | 3 ++- src/minecraft/biomesoplenty/blocks/BlockOriginGrass.java | 3 ++- src/minecraft/biomesoplenty/blocks/BlockOriginLeaves.java | 3 ++- src/minecraft/biomesoplenty/blocks/BlockOriginSapling.java | 3 ++- src/minecraft/biomesoplenty/blocks/BlockPalmLeaves.java | 3 ++- src/minecraft/biomesoplenty/blocks/BlockPalmLog.java | 3 ++- src/minecraft/biomesoplenty/blocks/BlockPalmSapling.java | 3 ++- src/minecraft/biomesoplenty/blocks/BlockPinkLeaves.java | 3 ++- src/minecraft/biomesoplenty/blocks/BlockPinkSapling.java | 3 ++- src/minecraft/biomesoplenty/blocks/BlockRedLeaves.java | 3 ++- src/minecraft/biomesoplenty/blocks/BlockRedSapling.java | 3 ++- src/minecraft/biomesoplenty/blocks/BlockRedwoodLeaves.java | 3 ++- src/minecraft/biomesoplenty/blocks/BlockRedwoodLog.java | 3 ++- src/minecraft/biomesoplenty/blocks/BlockRedwoodSapling.java | 3 ++- src/minecraft/biomesoplenty/blocks/BlockSmolderingGrass.java | 3 ++- src/minecraft/biomesoplenty/blocks/BlockWhiteLeaves.java | 3 ++- src/minecraft/biomesoplenty/blocks/BlockWhiteSapling.java | 3 ++- src/minecraft/biomesoplenty/blocks/BlockWillowLeaves.java | 3 ++- src/minecraft/biomesoplenty/blocks/BlockWillowLog.java | 3 ++- src/minecraft/biomesoplenty/blocks/BlockWillowSapling.java | 3 ++- src/minecraft/biomesoplenty/blocks/BlockYellowSapling.java | 3 ++- 51 files changed, 103 insertions(+), 52 deletions(-) diff --git a/src/minecraft/biomesoplenty/blocks/BlockAcaciaLog.java b/src/minecraft/biomesoplenty/blocks/BlockAcaciaLog.java index 2d573e1a9..a068777a9 100644 --- a/src/minecraft/biomesoplenty/blocks/BlockAcaciaLog.java +++ b/src/minecraft/biomesoplenty/blocks/BlockAcaciaLog.java @@ -33,7 +33,8 @@ public class BlockAcaciaLog extends Block this.blockIcon[1] = par1IconRegister.registerIcon("BiomesOPlenty:acacialog"); } - public Icon getBlockTextureFromSideAndMetadata(int par1, int par2) + @Override + public Icon getIcon(int par1, int par2) { int pos = par2 & 12; if (pos == 0 && (par1 == 1 || par1 == 0) || pos == 4 && (par1 == 5 || par1 == 4) || pos == 8 && (par1 == 2 || par1 == 3)) diff --git a/src/minecraft/biomesoplenty/blocks/BlockAcaciaSapling.java b/src/minecraft/biomesoplenty/blocks/BlockAcaciaSapling.java index a567580e6..030b2fc19 100644 --- a/src/minecraft/biomesoplenty/blocks/BlockAcaciaSapling.java +++ b/src/minecraft/biomesoplenty/blocks/BlockAcaciaSapling.java @@ -34,7 +34,8 @@ public class BlockAcaciaSapling extends BlockSapling this.blockIcon[0] = par1IconRegister.registerIcon("BiomesOPlenty:acaciasapling"); } - public Icon getBlockTextureFromSideAndMetadata(int par1, int par2) + @Override + public Icon getIcon(int par1, int par2) { return this.blockIcon[0]; } diff --git a/src/minecraft/biomesoplenty/blocks/BlockAppleLeaves.java b/src/minecraft/biomesoplenty/blocks/BlockAppleLeaves.java index 0bbd96685..74cdcf674 100644 --- a/src/minecraft/biomesoplenty/blocks/BlockAppleLeaves.java +++ b/src/minecraft/biomesoplenty/blocks/BlockAppleLeaves.java @@ -47,8 +47,9 @@ public class BlockAppleLeaves extends BlockLeavesBase implements IShearable this.blockIcon[1] = par1IconRegister.registerIcon("BiomesOPlenty:appleleaves2"); } + @Override @SideOnly(Side.CLIENT) - public Icon getBlockTextureFromSideAndMetadata(int par1, int par2) + public Icon getIcon(int par1, int par2) { return blockIcon[(!isOpaqueCube() ? 0 : 1)]; } diff --git a/src/minecraft/biomesoplenty/blocks/BlockAppleLeavesFruitless.java b/src/minecraft/biomesoplenty/blocks/BlockAppleLeavesFruitless.java index 4e3ac126c..6665c3e86 100644 --- a/src/minecraft/biomesoplenty/blocks/BlockAppleLeavesFruitless.java +++ b/src/minecraft/biomesoplenty/blocks/BlockAppleLeavesFruitless.java @@ -46,9 +46,10 @@ public class BlockAppleLeavesFruitless extends BlockLeavesBase implements IShear this.blockIcon[0] = par1IconRegister.registerIcon("BiomesOPlenty:appleleaves3"); this.blockIcon[1] = par1IconRegister.registerIcon("BiomesOPlenty:appleleaves4"); } - + + @Override @SideOnly(Side.CLIENT) - public Icon getBlockTextureFromSideAndMetadata(int par1, int par2) + public Icon getIcon(int par1, int par2) { return blockIcon[(!isOpaqueCube() ? 0 : 1)]; } diff --git a/src/minecraft/biomesoplenty/blocks/BlockAppleSapling.java b/src/minecraft/biomesoplenty/blocks/BlockAppleSapling.java index 29443db84..6f879b00e 100644 --- a/src/minecraft/biomesoplenty/blocks/BlockAppleSapling.java +++ b/src/minecraft/biomesoplenty/blocks/BlockAppleSapling.java @@ -33,7 +33,8 @@ public class BlockAppleSapling extends BlockSapling this.blockIcon[0] = par1IconRegister.registerIcon("BiomesOPlenty:applesapling"); } - public Icon getBlockTextureFromSideAndMetadata(int par1, int par2) + @Override + public Icon getIcon(int par1, int par2) { return this.blockIcon[0]; } diff --git a/src/minecraft/biomesoplenty/blocks/BlockAutumnLeaves.java b/src/minecraft/biomesoplenty/blocks/BlockAutumnLeaves.java index 14c2a1d09..613526b11 100644 --- a/src/minecraft/biomesoplenty/blocks/BlockAutumnLeaves.java +++ b/src/minecraft/biomesoplenty/blocks/BlockAutumnLeaves.java @@ -47,8 +47,9 @@ public class BlockAutumnLeaves extends BlockLeavesBase implements IShearable this.blockIcon[1] = par1IconRegister.registerIcon("BiomesOPlenty:autumnleaves2"); } + @Override @SideOnly(Side.CLIENT) - public Icon getBlockTextureFromSideAndMetadata(int par1, int par2) + public Icon getIcon(int par1, int par2) { return blockIcon[(!isOpaqueCube() ? 0 : 1)]; } diff --git a/src/minecraft/biomesoplenty/blocks/BlockBambooLeaves.java b/src/minecraft/biomesoplenty/blocks/BlockBambooLeaves.java index ade5ee9b3..b42350768 100644 --- a/src/minecraft/biomesoplenty/blocks/BlockBambooLeaves.java +++ b/src/minecraft/biomesoplenty/blocks/BlockBambooLeaves.java @@ -47,8 +47,9 @@ public class BlockBambooLeaves extends BlockLeavesBase implements IShearable this.blockIcon[1] = par1IconRegister.registerIcon("BiomesOPlenty:bambooleaves2"); } + @Override @SideOnly(Side.CLIENT) - public Icon getBlockTextureFromSideAndMetadata(int par1, int par2) + public Icon getIcon(int par1, int par2) { return blockIcon[(!isOpaqueCube() ? 0 : 1)]; } diff --git a/src/minecraft/biomesoplenty/blocks/BlockBambooSapling.java b/src/minecraft/biomesoplenty/blocks/BlockBambooSapling.java index aca52f4ca..963b8c1e4 100644 --- a/src/minecraft/biomesoplenty/blocks/BlockBambooSapling.java +++ b/src/minecraft/biomesoplenty/blocks/BlockBambooSapling.java @@ -36,7 +36,8 @@ public class BlockBambooSapling extends BlockSapling this.blockIcon[0] = par1IconRegister.registerIcon("BiomesOPlenty:bamboosapling"); } - public Icon getBlockTextureFromSideAndMetadata(int par1, int par2) + @Override + public Icon getIcon(int par1, int par2) { return this.blockIcon[0]; } diff --git a/src/minecraft/biomesoplenty/blocks/BlockBlueLeaves.java b/src/minecraft/biomesoplenty/blocks/BlockBlueLeaves.java index 99b8afb8b..62a0fd34b 100644 --- a/src/minecraft/biomesoplenty/blocks/BlockBlueLeaves.java +++ b/src/minecraft/biomesoplenty/blocks/BlockBlueLeaves.java @@ -47,8 +47,9 @@ public class BlockBlueLeaves extends BlockLeavesBase implements IShearable this.blockIcon[1] = par1IconRegister.registerIcon("BiomesOPlenty:blueleaves2"); } + @Override @SideOnly(Side.CLIENT) - public Icon getBlockTextureFromSideAndMetadata(int par1, int par2) + public Icon getIcon(int par1, int par2) { return blockIcon[(!isOpaqueCube() ? 0 : 1)]; } diff --git a/src/minecraft/biomesoplenty/blocks/BlockBrownSapling.java b/src/minecraft/biomesoplenty/blocks/BlockBrownSapling.java index 8ac7d776a..818cd7184 100644 --- a/src/minecraft/biomesoplenty/blocks/BlockBrownSapling.java +++ b/src/minecraft/biomesoplenty/blocks/BlockBrownSapling.java @@ -34,7 +34,8 @@ public class BlockBrownSapling extends BlockSapling this.blockIcon[0] = par1IconRegister.registerIcon("BiomesOPlenty:brownsapling"); } - public Icon getBlockTextureFromSideAndMetadata(int par1, int par2) + @Override + public Icon getIcon(int par1, int par2) { return this.blockIcon[0]; } diff --git a/src/minecraft/biomesoplenty/blocks/BlockCherryLog.java b/src/minecraft/biomesoplenty/blocks/BlockCherryLog.java index fdf9b1e57..8d0b49a62 100644 --- a/src/minecraft/biomesoplenty/blocks/BlockCherryLog.java +++ b/src/minecraft/biomesoplenty/blocks/BlockCherryLog.java @@ -33,7 +33,8 @@ public class BlockCherryLog extends Block this.blockIcon[1] = par1IconRegister.registerIcon("BiomesOPlenty:cherrylog"); } - public Icon getBlockTextureFromSideAndMetadata(int par1, int par2) + @Override + public Icon getIcon(int par1, int par2) { int pos = par2 & 12; if (pos == 0 && (par1 == 1 || par1 == 0) || pos == 4 && (par1 == 5 || par1 == 4) || pos == 8 && (par1 == 2 || par1 == 3)) diff --git a/src/minecraft/biomesoplenty/blocks/BlockDarkLeaves.java b/src/minecraft/biomesoplenty/blocks/BlockDarkLeaves.java index 83df0c60a..f4c1af1ba 100644 --- a/src/minecraft/biomesoplenty/blocks/BlockDarkLeaves.java +++ b/src/minecraft/biomesoplenty/blocks/BlockDarkLeaves.java @@ -47,8 +47,9 @@ public class BlockDarkLeaves extends BlockLeavesBase implements IShearable this.blockIcon[1] = par1IconRegister.registerIcon("BiomesOPlenty:darkleaves2"); } + @Override @SideOnly(Side.CLIENT) - public Icon getBlockTextureFromSideAndMetadata(int par1, int par2) + public Icon getIcon(int par1, int par2) { return blockIcon[(!isOpaqueCube() ? 0 : 1)]; } diff --git a/src/minecraft/biomesoplenty/blocks/BlockDarkLog.java b/src/minecraft/biomesoplenty/blocks/BlockDarkLog.java index faa105181..a2fb21269 100644 --- a/src/minecraft/biomesoplenty/blocks/BlockDarkLog.java +++ b/src/minecraft/biomesoplenty/blocks/BlockDarkLog.java @@ -33,7 +33,8 @@ public class BlockDarkLog extends Block this.blockIcon[1] = par1IconRegister.registerIcon("BiomesOPlenty:darklog"); } - public Icon getBlockTextureFromSideAndMetadata(int par1, int par2) + @Override + public Icon getIcon(int par1, int par2) { int pos = par2 & 12; if (pos == 0 && (par1 == 1 || par1 == 0) || pos == 4 && (par1 == 5 || par1 == 4) || pos == 8 && (par1 == 2 || par1 == 3)) diff --git a/src/minecraft/biomesoplenty/blocks/BlockDarkSapling.java b/src/minecraft/biomesoplenty/blocks/BlockDarkSapling.java index 409c40fea..571b040fd 100644 --- a/src/minecraft/biomesoplenty/blocks/BlockDarkSapling.java +++ b/src/minecraft/biomesoplenty/blocks/BlockDarkSapling.java @@ -35,7 +35,8 @@ public class BlockDarkSapling extends BlockSapling this.blockIcon[0] = par1IconRegister.registerIcon("BiomesOPlenty:darksapling"); } - public Icon getBlockTextureFromSideAndMetadata(int par1, int par2) + @Override + public Icon getIcon(int par1, int par2) { return this.blockIcon[0]; } diff --git a/src/minecraft/biomesoplenty/blocks/BlockDeadLeaves.java b/src/minecraft/biomesoplenty/blocks/BlockDeadLeaves.java index 1e1259324..b9c7583c6 100644 --- a/src/minecraft/biomesoplenty/blocks/BlockDeadLeaves.java +++ b/src/minecraft/biomesoplenty/blocks/BlockDeadLeaves.java @@ -47,8 +47,9 @@ public class BlockDeadLeaves extends BlockLeavesBase implements IShearable this.blockIcon[1] = par1IconRegister.registerIcon("BiomesOPlenty:deadleaves2"); } + @Override @SideOnly(Side.CLIENT) - public Icon getBlockTextureFromSideAndMetadata(int par1, int par2) + public Icon getIcon(int par1, int par2) { return blockIcon[(!isOpaqueCube() ? 0 : 1)]; } diff --git a/src/minecraft/biomesoplenty/blocks/BlockDeadLog.java b/src/minecraft/biomesoplenty/blocks/BlockDeadLog.java index 6b4209b80..faa1f7fda 100644 --- a/src/minecraft/biomesoplenty/blocks/BlockDeadLog.java +++ b/src/minecraft/biomesoplenty/blocks/BlockDeadLog.java @@ -33,7 +33,8 @@ public class BlockDeadLog extends Block this.blockIcon[1] = par1IconRegister.registerIcon("BiomesOPlenty:deadlog"); } - public Icon getBlockTextureFromSideAndMetadata(int par1, int par2) + @Override + public Icon getIcon(int par1, int par2) { int pos = par2 & 12; if (pos == 0 && (par1 == 1 || par1 == 0) || pos == 4 && (par1 == 5 || par1 == 4) || pos == 8 && (par1 == 2 || par1 == 3)) diff --git a/src/minecraft/biomesoplenty/blocks/BlockFirLeaves.java b/src/minecraft/biomesoplenty/blocks/BlockFirLeaves.java index ab5ce0d3f..cbb4d9064 100644 --- a/src/minecraft/biomesoplenty/blocks/BlockFirLeaves.java +++ b/src/minecraft/biomesoplenty/blocks/BlockFirLeaves.java @@ -47,8 +47,9 @@ public class BlockFirLeaves extends BlockLeavesBase implements IShearable this.blockIcon[1] = par1IconRegister.registerIcon("BiomesOPlenty:firleaves2"); } + @Override @SideOnly(Side.CLIENT) - public Icon getBlockTextureFromSideAndMetadata(int par1, int par2) + public Icon getIcon(int par1, int par2) { return blockIcon[(!isOpaqueCube() ? 0 : 1)]; } diff --git a/src/minecraft/biomesoplenty/blocks/BlockFirLog.java b/src/minecraft/biomesoplenty/blocks/BlockFirLog.java index 587825afa..e020aba0c 100644 --- a/src/minecraft/biomesoplenty/blocks/BlockFirLog.java +++ b/src/minecraft/biomesoplenty/blocks/BlockFirLog.java @@ -33,7 +33,8 @@ public class BlockFirLog extends Block this.blockIcon[1] = par1IconRegister.registerIcon("BiomesOPlenty:firlog"); } - public Icon getBlockTextureFromSideAndMetadata(int par1, int par2) + @Override + public Icon getIcon(int par1, int par2) { int pos = par2 & 12; if (pos == 0 && (par1 == 1 || par1 == 0) || pos == 4 && (par1 == 5 || par1 == 4) || pos == 8 && (par1 == 2 || par1 == 3)) diff --git a/src/minecraft/biomesoplenty/blocks/BlockFirSapling.java b/src/minecraft/biomesoplenty/blocks/BlockFirSapling.java index ea3e0fd3a..5b8a63b01 100644 --- a/src/minecraft/biomesoplenty/blocks/BlockFirSapling.java +++ b/src/minecraft/biomesoplenty/blocks/BlockFirSapling.java @@ -34,7 +34,8 @@ public class BlockFirSapling extends BlockSapling this.blockIcon[0] = par1IconRegister.registerIcon("BiomesOPlenty:firsapling"); } - public Icon getBlockTextureFromSideAndMetadata(int par1, int par2) + @Override + public Icon getIcon(int par1, int par2) { return this.blockIcon[0]; } diff --git a/src/minecraft/biomesoplenty/blocks/BlockGiantFlowerStem.java b/src/minecraft/biomesoplenty/blocks/BlockGiantFlowerStem.java index 5b7ffa577..45a87e937 100644 --- a/src/minecraft/biomesoplenty/blocks/BlockGiantFlowerStem.java +++ b/src/minecraft/biomesoplenty/blocks/BlockGiantFlowerStem.java @@ -32,7 +32,8 @@ public class BlockGiantFlowerStem extends Block this.blockIcon[1] = par1IconRegister.registerIcon("BiomesOPlenty:bigflowerstem"); } - public Icon getBlockTextureFromSideAndMetadata(int par1, int par2) + @Override + public Icon getIcon(int par1, int par2) { if(par1 == 0 || par1 == 1) { diff --git a/src/minecraft/biomesoplenty/blocks/BlockHolyGrass.java b/src/minecraft/biomesoplenty/blocks/BlockHolyGrass.java index da3b6b507..55bab0dcd 100644 --- a/src/minecraft/biomesoplenty/blocks/BlockHolyGrass.java +++ b/src/minecraft/biomesoplenty/blocks/BlockHolyGrass.java @@ -42,7 +42,8 @@ public class BlockHolyGrass extends Block /** * From the specified side and block metadata retrieves the blocks texture. Args: side, metadata */ - public Icon getBlockTextureFromSideAndMetadata(int par1, int par2) + @Override + public Icon getIcon(int par1, int par2) { return blockIcon[par1]; } diff --git a/src/minecraft/biomesoplenty/blocks/BlockHolyLeaves.java b/src/minecraft/biomesoplenty/blocks/BlockHolyLeaves.java index 252798bcd..6f30041d0 100644 --- a/src/minecraft/biomesoplenty/blocks/BlockHolyLeaves.java +++ b/src/minecraft/biomesoplenty/blocks/BlockHolyLeaves.java @@ -47,8 +47,9 @@ public class BlockHolyLeaves extends BlockLeavesBase implements IShearable this.blockIcon[1] = par1IconRegister.registerIcon("BiomesOPlenty:holyleaves2"); } + @Override @SideOnly(Side.CLIENT) - public Icon getBlockTextureFromSideAndMetadata(int par1, int par2) + public Icon getIcon(int par1, int par2) { return blockIcon[(!isOpaqueCube() ? 0 : 1)]; } diff --git a/src/minecraft/biomesoplenty/blocks/BlockHolyLog.java b/src/minecraft/biomesoplenty/blocks/BlockHolyLog.java index d6e446af2..26ad5a448 100644 --- a/src/minecraft/biomesoplenty/blocks/BlockHolyLog.java +++ b/src/minecraft/biomesoplenty/blocks/BlockHolyLog.java @@ -33,7 +33,8 @@ public class BlockHolyLog extends Block this.blockIcon[1] = par1IconRegister.registerIcon("BiomesOPlenty:holylog"); } - public Icon getBlockTextureFromSideAndMetadata(int par1, int par2) + @Override + public Icon getIcon(int par1, int par2) { int pos = par2 & 12; if (pos == 0 && (par1 == 1 || par1 == 0) || pos == 4 && (par1 == 5 || par1 == 4) || pos == 8 && (par1 == 2 || par1 == 3)) diff --git a/src/minecraft/biomesoplenty/blocks/BlockHolySapling.java b/src/minecraft/biomesoplenty/blocks/BlockHolySapling.java index bbf474e19..ff693db6e 100644 --- a/src/minecraft/biomesoplenty/blocks/BlockHolySapling.java +++ b/src/minecraft/biomesoplenty/blocks/BlockHolySapling.java @@ -36,7 +36,8 @@ public class BlockHolySapling extends BlockSapling this.blockIcon[0] = par1IconRegister.registerIcon("BiomesOPlenty:holysapling"); } - public Icon getBlockTextureFromSideAndMetadata(int par1, int par2) + @Override + public Icon getIcon(int par1, int par2) { return this.blockIcon[0]; } diff --git a/src/minecraft/biomesoplenty/blocks/BlockMagicLog.java b/src/minecraft/biomesoplenty/blocks/BlockMagicLog.java index 74a8d8d64..cb3eb824c 100644 --- a/src/minecraft/biomesoplenty/blocks/BlockMagicLog.java +++ b/src/minecraft/biomesoplenty/blocks/BlockMagicLog.java @@ -32,7 +32,8 @@ public class BlockMagicLog extends Block this.blockIcon[1] = par1IconRegister.registerIcon("BiomesOPlenty:magiclog"); } - public Icon getBlockTextureFromSideAndMetadata(int par1, int par2) + @Override + public Icon getIcon(int par1, int par2) { int pos = par2 & 12; if (pos == 0 && (par1 == 1 || par1 == 0) || pos == 4 && (par1 == 5 || par1 == 4) || pos == 8 && (par1 == 2 || par1 == 3)) diff --git a/src/minecraft/biomesoplenty/blocks/BlockMagicSapling.java b/src/minecraft/biomesoplenty/blocks/BlockMagicSapling.java index 433e17c94..cf28f3b2b 100644 --- a/src/minecraft/biomesoplenty/blocks/BlockMagicSapling.java +++ b/src/minecraft/biomesoplenty/blocks/BlockMagicSapling.java @@ -36,7 +36,8 @@ public class BlockMagicSapling extends BlockSapling this.blockIcon[0] = par1IconRegister.registerIcon("BiomesOPlenty:magicsapling"); } - public Icon getBlockTextureFromSideAndMetadata(int par1, int par2) + @Override + public Icon getIcon(int par1, int par2) { return this.blockIcon[0]; } diff --git a/src/minecraft/biomesoplenty/blocks/BlockMangroveLeaves.java b/src/minecraft/biomesoplenty/blocks/BlockMangroveLeaves.java index 722a703b7..d2b5d9d9f 100644 --- a/src/minecraft/biomesoplenty/blocks/BlockMangroveLeaves.java +++ b/src/minecraft/biomesoplenty/blocks/BlockMangroveLeaves.java @@ -48,8 +48,9 @@ public class BlockMangroveLeaves extends BlockLeavesBase implements IShearable this.blockIcon[1] = par1IconRegister.registerIcon("BiomesOPlenty:mangroveleaves2"); } + @Override @SideOnly(Side.CLIENT) - public Icon getBlockTextureFromSideAndMetadata(int par1, int par2) + public Icon getIcon(int par1, int par2) { return blockIcon[(!isOpaqueCube() ? 0 : 1)]; } diff --git a/src/minecraft/biomesoplenty/blocks/BlockMangroveLog.java b/src/minecraft/biomesoplenty/blocks/BlockMangroveLog.java index ded92751d..5130b6ebf 100644 --- a/src/minecraft/biomesoplenty/blocks/BlockMangroveLog.java +++ b/src/minecraft/biomesoplenty/blocks/BlockMangroveLog.java @@ -33,7 +33,8 @@ public class BlockMangroveLog extends Block this.blockIcon[1] = par1IconRegister.registerIcon("BiomesOPlenty:mangrovelog"); } - public Icon getBlockTextureFromSideAndMetadata(int par1, int par2) + @Override + public Icon getIcon(int par1, int par2) { int pos = par2 & 12; if (pos == 0 && (par1 == 1 || par1 == 0) || pos == 4 && (par1 == 5 || par1 == 4) || pos == 8 && (par1 == 2 || par1 == 3)) diff --git a/src/minecraft/biomesoplenty/blocks/BlockMangroveSapling.java b/src/minecraft/biomesoplenty/blocks/BlockMangroveSapling.java index a87160263..de8741df2 100644 --- a/src/minecraft/biomesoplenty/blocks/BlockMangroveSapling.java +++ b/src/minecraft/biomesoplenty/blocks/BlockMangroveSapling.java @@ -35,7 +35,8 @@ public class BlockMangroveSapling extends BlockSapling this.blockIcon[0] = par1IconRegister.registerIcon("BiomesOPlenty:mangrovesapling"); } - public Icon getBlockTextureFromSideAndMetadata(int par1, int par2) + @Override + public Icon getIcon(int par1, int par2) { return this.blockIcon[0]; } diff --git a/src/minecraft/biomesoplenty/blocks/BlockOrangeLeaves.java b/src/minecraft/biomesoplenty/blocks/BlockOrangeLeaves.java index 2735387d7..f5f464817 100644 --- a/src/minecraft/biomesoplenty/blocks/BlockOrangeLeaves.java +++ b/src/minecraft/biomesoplenty/blocks/BlockOrangeLeaves.java @@ -48,8 +48,9 @@ public class BlockOrangeLeaves extends BlockLeavesBase implements IShearable this.blockIcon[1] = par1IconRegister.registerIcon("BiomesOPlenty:orangeleaves2"); } + @Override @SideOnly(Side.CLIENT) - public Icon getBlockTextureFromSideAndMetadata(int par1, int par2) + public Icon getIcon(int par1, int par2) { return blockIcon[(!isOpaqueCube() ? 0 : 1)]; } diff --git a/src/minecraft/biomesoplenty/blocks/BlockOrangeSapling.java b/src/minecraft/biomesoplenty/blocks/BlockOrangeSapling.java index 5510a9d66..52adda49e 100644 --- a/src/minecraft/biomesoplenty/blocks/BlockOrangeSapling.java +++ b/src/minecraft/biomesoplenty/blocks/BlockOrangeSapling.java @@ -34,7 +34,8 @@ public class BlockOrangeSapling extends BlockSapling this.blockIcon[0] = par1IconRegister.registerIcon("BiomesOPlenty:orangesapling"); } - public Icon getBlockTextureFromSideAndMetadata(int par1, int par2) + @Override + public Icon getIcon(int par1, int par2) { return this.blockIcon[0]; } diff --git a/src/minecraft/biomesoplenty/blocks/BlockOriginGrass.java b/src/minecraft/biomesoplenty/blocks/BlockOriginGrass.java index 9d397cdcd..15d210a41 100644 --- a/src/minecraft/biomesoplenty/blocks/BlockOriginGrass.java +++ b/src/minecraft/biomesoplenty/blocks/BlockOriginGrass.java @@ -39,7 +39,8 @@ public class BlockOriginGrass extends Block /** * From the specified side and block metadata retrieves the blocks texture. Args: side, metadata */ - public Icon getBlockTextureFromSideAndMetadata(int par1, int par2) + @Override + public Icon getIcon(int par1, int par2) { return blockIcon[par1]; } diff --git a/src/minecraft/biomesoplenty/blocks/BlockOriginLeaves.java b/src/minecraft/biomesoplenty/blocks/BlockOriginLeaves.java index 2e7c1d38f..607e75eff 100644 --- a/src/minecraft/biomesoplenty/blocks/BlockOriginLeaves.java +++ b/src/minecraft/biomesoplenty/blocks/BlockOriginLeaves.java @@ -47,8 +47,9 @@ public class BlockOriginLeaves extends BlockLeavesBase implements IShearable this.blockIcon[1] = par1IconRegister.registerIcon("BiomesOPlenty:originleaves2"); } + @Override @SideOnly(Side.CLIENT) - public Icon getBlockTextureFromSideAndMetadata(int par1, int par2) + public Icon getIcon(int par1, int par2) { return blockIcon[(!isOpaqueCube() ? 0 : 1)]; } diff --git a/src/minecraft/biomesoplenty/blocks/BlockOriginSapling.java b/src/minecraft/biomesoplenty/blocks/BlockOriginSapling.java index bdbbfe47a..48122d14d 100644 --- a/src/minecraft/biomesoplenty/blocks/BlockOriginSapling.java +++ b/src/minecraft/biomesoplenty/blocks/BlockOriginSapling.java @@ -36,7 +36,8 @@ public class BlockOriginSapling extends BlockSapling this.blockIcon[0] = par1IconRegister.registerIcon("BiomesOPlenty:originsapling"); } - public Icon getBlockTextureFromSideAndMetadata(int par1, int par2) + @Override + public Icon getIcon(int par1, int par2) { return this.blockIcon[0]; } diff --git a/src/minecraft/biomesoplenty/blocks/BlockPalmLeaves.java b/src/minecraft/biomesoplenty/blocks/BlockPalmLeaves.java index ea06c2479..c2c3c44a3 100644 --- a/src/minecraft/biomesoplenty/blocks/BlockPalmLeaves.java +++ b/src/minecraft/biomesoplenty/blocks/BlockPalmLeaves.java @@ -48,8 +48,9 @@ public class BlockPalmLeaves extends BlockLeavesBase implements IShearable this.blockIcon[1] = par1IconRegister.registerIcon("BiomesOPlenty:palmleaves2"); } + @Override @SideOnly(Side.CLIENT) - public Icon getBlockTextureFromSideAndMetadata(int par1, int par2) + public Icon getIcon(int par1, int par2) { return blockIcon[(!isOpaqueCube() ? 0 : 1)]; } diff --git a/src/minecraft/biomesoplenty/blocks/BlockPalmLog.java b/src/minecraft/biomesoplenty/blocks/BlockPalmLog.java index eeb88e565..d53c45cf8 100644 --- a/src/minecraft/biomesoplenty/blocks/BlockPalmLog.java +++ b/src/minecraft/biomesoplenty/blocks/BlockPalmLog.java @@ -33,7 +33,8 @@ public class BlockPalmLog extends Block this.blockIcon[1] = par1IconRegister.registerIcon("BiomesOPlenty:palmlog"); } - public Icon getBlockTextureFromSideAndMetadata(int par1, int par2) + @Override + public Icon getIcon(int par1, int par2) { int pos = par2 & 12; if (pos == 0 && (par1 == 1 || par1 == 0) || pos == 4 && (par1 == 5 || par1 == 4) || pos == 8 && (par1 == 2 || par1 == 3)) diff --git a/src/minecraft/biomesoplenty/blocks/BlockPalmSapling.java b/src/minecraft/biomesoplenty/blocks/BlockPalmSapling.java index f43647828..be2635680 100644 --- a/src/minecraft/biomesoplenty/blocks/BlockPalmSapling.java +++ b/src/minecraft/biomesoplenty/blocks/BlockPalmSapling.java @@ -35,7 +35,8 @@ public class BlockPalmSapling extends BlockSapling this.blockIcon[0] = par1IconRegister.registerIcon("BiomesOPlenty:palmsapling"); } - public Icon getBlockTextureFromSideAndMetadata(int par1, int par2) + @Override + public Icon getIcon(int par1, int par2) { return this.blockIcon[0]; } diff --git a/src/minecraft/biomesoplenty/blocks/BlockPinkLeaves.java b/src/minecraft/biomesoplenty/blocks/BlockPinkLeaves.java index db0446e01..159b567a3 100644 --- a/src/minecraft/biomesoplenty/blocks/BlockPinkLeaves.java +++ b/src/minecraft/biomesoplenty/blocks/BlockPinkLeaves.java @@ -47,8 +47,9 @@ public class BlockPinkLeaves extends BlockLeavesBase implements IShearable this.blockIcon[1] = par1IconRegister.registerIcon("BiomesOPlenty:pinkleaves2"); } + @Override @SideOnly(Side.CLIENT) - public Icon getBlockTextureFromSideAndMetadata(int par1, int par2) + public Icon getIcon(int par1, int par2) { return blockIcon[(!isOpaqueCube() ? 0 : 1)]; } diff --git a/src/minecraft/biomesoplenty/blocks/BlockPinkSapling.java b/src/minecraft/biomesoplenty/blocks/BlockPinkSapling.java index 26a2c616f..3c92509af 100644 --- a/src/minecraft/biomesoplenty/blocks/BlockPinkSapling.java +++ b/src/minecraft/biomesoplenty/blocks/BlockPinkSapling.java @@ -34,7 +34,8 @@ public class BlockPinkSapling extends BlockSapling this.blockIcon[0] = par1IconRegister.registerIcon("BiomesOPlenty:pinksapling"); } - public Icon getBlockTextureFromSideAndMetadata(int par1, int par2) + @Override + public Icon getIcon(int par1, int par2) { return this.blockIcon[0]; } diff --git a/src/minecraft/biomesoplenty/blocks/BlockRedLeaves.java b/src/minecraft/biomesoplenty/blocks/BlockRedLeaves.java index 7870679a3..e1f94f625 100644 --- a/src/minecraft/biomesoplenty/blocks/BlockRedLeaves.java +++ b/src/minecraft/biomesoplenty/blocks/BlockRedLeaves.java @@ -47,8 +47,9 @@ public class BlockRedLeaves extends BlockLeavesBase implements IShearable this.blockIcon[1] = par1IconRegister.registerIcon("BiomesOPlenty:redleaves2"); } + @Override @SideOnly(Side.CLIENT) - public Icon getBlockTextureFromSideAndMetadata(int par1, int par2) + public Icon getIcon(int par1, int par2) { return blockIcon[(!isOpaqueCube() ? 0 : 1)]; } diff --git a/src/minecraft/biomesoplenty/blocks/BlockRedSapling.java b/src/minecraft/biomesoplenty/blocks/BlockRedSapling.java index 0b014b6c7..3e8c152d3 100644 --- a/src/minecraft/biomesoplenty/blocks/BlockRedSapling.java +++ b/src/minecraft/biomesoplenty/blocks/BlockRedSapling.java @@ -34,7 +34,8 @@ public class BlockRedSapling extends BlockSapling this.blockIcon[0] = par1IconRegister.registerIcon("BiomesOPlenty:redsapling"); } - public Icon getBlockTextureFromSideAndMetadata(int par1, int par2) + @Override + public Icon getIcon(int par1, int par2) { return this.blockIcon[0]; } diff --git a/src/minecraft/biomesoplenty/blocks/BlockRedwoodLeaves.java b/src/minecraft/biomesoplenty/blocks/BlockRedwoodLeaves.java index 5b72d137d..7e32e946c 100644 --- a/src/minecraft/biomesoplenty/blocks/BlockRedwoodLeaves.java +++ b/src/minecraft/biomesoplenty/blocks/BlockRedwoodLeaves.java @@ -48,8 +48,9 @@ public class BlockRedwoodLeaves extends BlockLeavesBase implements IShearable this.blockIcon[1] = par1IconRegister.registerIcon("BiomesOPlenty:redwoodleaves2"); } + @Override @SideOnly(Side.CLIENT) - public Icon getBlockTextureFromSideAndMetadata(int par1, int par2) + public Icon getIcon(int par1, int par2) { return blockIcon[(!isOpaqueCube() ? 0 : 1)]; } diff --git a/src/minecraft/biomesoplenty/blocks/BlockRedwoodLog.java b/src/minecraft/biomesoplenty/blocks/BlockRedwoodLog.java index 7426bf00a..007dcb6ad 100644 --- a/src/minecraft/biomesoplenty/blocks/BlockRedwoodLog.java +++ b/src/minecraft/biomesoplenty/blocks/BlockRedwoodLog.java @@ -33,7 +33,8 @@ public class BlockRedwoodLog extends Block this.blockIcon[1] = par1IconRegister.registerIcon("BiomesOPlenty:redwoodlog"); } - public Icon getBlockTextureFromSideAndMetadata(int par1, int par2) + @Override + public Icon getIcon(int par1, int par2) { int pos = par2 & 12; if (pos == 0 && (par1 == 1 || par1 == 0) || pos == 4 && (par1 == 5 || par1 == 4) || pos == 8 && (par1 == 2 || par1 == 3)) diff --git a/src/minecraft/biomesoplenty/blocks/BlockRedwoodSapling.java b/src/minecraft/biomesoplenty/blocks/BlockRedwoodSapling.java index a9c95bf28..555fc4b4e 100644 --- a/src/minecraft/biomesoplenty/blocks/BlockRedwoodSapling.java +++ b/src/minecraft/biomesoplenty/blocks/BlockRedwoodSapling.java @@ -34,7 +34,8 @@ public class BlockRedwoodSapling extends BlockSapling this.blockIcon[0] = par1IconRegister.registerIcon("BiomesOPlenty:redwoodsapling"); } - public Icon getBlockTextureFromSideAndMetadata(int par1, int par2) + @Override + public Icon getIcon(int par1, int par2) { return this.blockIcon[0]; } diff --git a/src/minecraft/biomesoplenty/blocks/BlockSmolderingGrass.java b/src/minecraft/biomesoplenty/blocks/BlockSmolderingGrass.java index 88296c45b..e801b8f5a 100644 --- a/src/minecraft/biomesoplenty/blocks/BlockSmolderingGrass.java +++ b/src/minecraft/biomesoplenty/blocks/BlockSmolderingGrass.java @@ -34,7 +34,8 @@ public class BlockSmolderingGrass extends Block this.blockIcon[5] = par1IconRegister.registerIcon("BiomesOPlenty:smolderinggrass2"); } - public Icon getBlockTextureFromSideAndMetadata(int par1, int par2) + @Override + public Icon getIcon(int par1, int par2) { return blockIcon[par1]; } diff --git a/src/minecraft/biomesoplenty/blocks/BlockWhiteLeaves.java b/src/minecraft/biomesoplenty/blocks/BlockWhiteLeaves.java index 914d2e65f..f7e142302 100644 --- a/src/minecraft/biomesoplenty/blocks/BlockWhiteLeaves.java +++ b/src/minecraft/biomesoplenty/blocks/BlockWhiteLeaves.java @@ -47,8 +47,9 @@ public class BlockWhiteLeaves extends BlockLeavesBase implements IShearable this.blockIcon[1] = par1IconRegister.registerIcon("BiomesOPlenty:whiteleaves2"); } + @Override @SideOnly(Side.CLIENT) - public Icon getBlockTextureFromSideAndMetadata(int par1, int par2) + public Icon getIcon(int par1, int par2) { return blockIcon[(!isOpaqueCube() ? 0 : 1)]; } diff --git a/src/minecraft/biomesoplenty/blocks/BlockWhiteSapling.java b/src/minecraft/biomesoplenty/blocks/BlockWhiteSapling.java index ac217b471..62876d544 100644 --- a/src/minecraft/biomesoplenty/blocks/BlockWhiteSapling.java +++ b/src/minecraft/biomesoplenty/blocks/BlockWhiteSapling.java @@ -34,7 +34,8 @@ public class BlockWhiteSapling extends BlockSapling this.blockIcon[0] = par1IconRegister.registerIcon("BiomesOPlenty:whitesapling"); } - public Icon getBlockTextureFromSideAndMetadata(int par1, int par2) + @Override + public Icon getIcon(int par1, int par2) { return this.blockIcon[0]; } diff --git a/src/minecraft/biomesoplenty/blocks/BlockWillowLeaves.java b/src/minecraft/biomesoplenty/blocks/BlockWillowLeaves.java index 2a7a220fd..3f709c543 100644 --- a/src/minecraft/biomesoplenty/blocks/BlockWillowLeaves.java +++ b/src/minecraft/biomesoplenty/blocks/BlockWillowLeaves.java @@ -48,8 +48,9 @@ public class BlockWillowLeaves extends BlockLeavesBase implements IShearable this.blockIcon[1] = par1IconRegister.registerIcon("BiomesOPlenty:willowleaves4"); } + @Override @SideOnly(Side.CLIENT) - public Icon getBlockTextureFromSideAndMetadata(int par1, int par2) + public Icon getIcon(int par1, int par2) { return blockIcon[(!isOpaqueCube() ? 0 : 1)]; } diff --git a/src/minecraft/biomesoplenty/blocks/BlockWillowLog.java b/src/minecraft/biomesoplenty/blocks/BlockWillowLog.java index e34f63fef..9a8c89318 100644 --- a/src/minecraft/biomesoplenty/blocks/BlockWillowLog.java +++ b/src/minecraft/biomesoplenty/blocks/BlockWillowLog.java @@ -33,7 +33,8 @@ public class BlockWillowLog extends Block this.blockIcon[1] = par1IconRegister.registerIcon("BiomesOPlenty:willowlog"); } - public Icon getBlockTextureFromSideAndMetadata(int par1, int par2) + @Override + public Icon getIcon(int par1, int par2) { int pos = par2 & 12; if (pos == 0 && (par1 == 1 || par1 == 0) || pos == 4 && (par1 == 5 || par1 == 4) || pos == 8 && (par1 == 2 || par1 == 3)) diff --git a/src/minecraft/biomesoplenty/blocks/BlockWillowSapling.java b/src/minecraft/biomesoplenty/blocks/BlockWillowSapling.java index 6e0cf9916..52fe0aa1c 100644 --- a/src/minecraft/biomesoplenty/blocks/BlockWillowSapling.java +++ b/src/minecraft/biomesoplenty/blocks/BlockWillowSapling.java @@ -34,7 +34,8 @@ public class BlockWillowSapling extends BlockSapling this.blockIcon[0] = par1IconRegister.registerIcon("BiomesOPlenty:willowsapling"); } - public Icon getBlockTextureFromSideAndMetadata(int par1, int par2) + @Override + public Icon getIcon(int par1, int par2) { return this.blockIcon[0]; } diff --git a/src/minecraft/biomesoplenty/blocks/BlockYellowSapling.java b/src/minecraft/biomesoplenty/blocks/BlockYellowSapling.java index 7396b58d5..a43b9d259 100644 --- a/src/minecraft/biomesoplenty/blocks/BlockYellowSapling.java +++ b/src/minecraft/biomesoplenty/blocks/BlockYellowSapling.java @@ -34,7 +34,8 @@ public class BlockYellowSapling extends BlockSapling this.blockIcon[0] = par1IconRegister.registerIcon("BiomesOPlenty:yellowsapling"); } - public Icon getBlockTextureFromSideAndMetadata(int par1, int par2) + @Override + public Icon getIcon(int par1, int par2) { return this.blockIcon[0]; }