Fixed the blocks, hopefully there are no crashes anymore :)
This commit is contained in:
parent
5d568b5a83
commit
6984125bee
51 changed files with 103 additions and 52 deletions
|
@ -33,7 +33,8 @@ public class BlockAcaciaLog extends Block
|
||||||
this.blockIcon[1] = par1IconRegister.registerIcon("BiomesOPlenty:acacialog");
|
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;
|
int pos = par2 & 12;
|
||||||
if (pos == 0 && (par1 == 1 || par1 == 0) || pos == 4 && (par1 == 5 || par1 == 4) || pos == 8 && (par1 == 2 || par1 == 3))
|
if (pos == 0 && (par1 == 1 || par1 == 0) || pos == 4 && (par1 == 5 || par1 == 4) || pos == 8 && (par1 == 2 || par1 == 3))
|
||||||
|
|
|
@ -34,7 +34,8 @@ public class BlockAcaciaSapling extends BlockSapling
|
||||||
this.blockIcon[0] = par1IconRegister.registerIcon("BiomesOPlenty:acaciasapling");
|
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];
|
return this.blockIcon[0];
|
||||||
}
|
}
|
||||||
|
|
|
@ -47,8 +47,9 @@ public class BlockAppleLeaves extends BlockLeavesBase implements IShearable
|
||||||
this.blockIcon[1] = par1IconRegister.registerIcon("BiomesOPlenty:appleleaves2");
|
this.blockIcon[1] = par1IconRegister.registerIcon("BiomesOPlenty:appleleaves2");
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@Override
|
||||||
@SideOnly(Side.CLIENT)
|
@SideOnly(Side.CLIENT)
|
||||||
public Icon getBlockTextureFromSideAndMetadata(int par1, int par2)
|
public Icon getIcon(int par1, int par2)
|
||||||
{
|
{
|
||||||
return blockIcon[(!isOpaqueCube() ? 0 : 1)];
|
return blockIcon[(!isOpaqueCube() ? 0 : 1)];
|
||||||
}
|
}
|
||||||
|
|
|
@ -47,8 +47,9 @@ public class BlockAppleLeavesFruitless extends BlockLeavesBase implements IShear
|
||||||
this.blockIcon[1] = par1IconRegister.registerIcon("BiomesOPlenty:appleleaves4");
|
this.blockIcon[1] = par1IconRegister.registerIcon("BiomesOPlenty:appleleaves4");
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@Override
|
||||||
@SideOnly(Side.CLIENT)
|
@SideOnly(Side.CLIENT)
|
||||||
public Icon getBlockTextureFromSideAndMetadata(int par1, int par2)
|
public Icon getIcon(int par1, int par2)
|
||||||
{
|
{
|
||||||
return blockIcon[(!isOpaqueCube() ? 0 : 1)];
|
return blockIcon[(!isOpaqueCube() ? 0 : 1)];
|
||||||
}
|
}
|
||||||
|
|
|
@ -33,7 +33,8 @@ public class BlockAppleSapling extends BlockSapling
|
||||||
this.blockIcon[0] = par1IconRegister.registerIcon("BiomesOPlenty:applesapling");
|
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];
|
return this.blockIcon[0];
|
||||||
}
|
}
|
||||||
|
|
|
@ -47,8 +47,9 @@ public class BlockAutumnLeaves extends BlockLeavesBase implements IShearable
|
||||||
this.blockIcon[1] = par1IconRegister.registerIcon("BiomesOPlenty:autumnleaves2");
|
this.blockIcon[1] = par1IconRegister.registerIcon("BiomesOPlenty:autumnleaves2");
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@Override
|
||||||
@SideOnly(Side.CLIENT)
|
@SideOnly(Side.CLIENT)
|
||||||
public Icon getBlockTextureFromSideAndMetadata(int par1, int par2)
|
public Icon getIcon(int par1, int par2)
|
||||||
{
|
{
|
||||||
return blockIcon[(!isOpaqueCube() ? 0 : 1)];
|
return blockIcon[(!isOpaqueCube() ? 0 : 1)];
|
||||||
}
|
}
|
||||||
|
|
|
@ -47,8 +47,9 @@ public class BlockBambooLeaves extends BlockLeavesBase implements IShearable
|
||||||
this.blockIcon[1] = par1IconRegister.registerIcon("BiomesOPlenty:bambooleaves2");
|
this.blockIcon[1] = par1IconRegister.registerIcon("BiomesOPlenty:bambooleaves2");
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@Override
|
||||||
@SideOnly(Side.CLIENT)
|
@SideOnly(Side.CLIENT)
|
||||||
public Icon getBlockTextureFromSideAndMetadata(int par1, int par2)
|
public Icon getIcon(int par1, int par2)
|
||||||
{
|
{
|
||||||
return blockIcon[(!isOpaqueCube() ? 0 : 1)];
|
return blockIcon[(!isOpaqueCube() ? 0 : 1)];
|
||||||
}
|
}
|
||||||
|
|
|
@ -36,7 +36,8 @@ public class BlockBambooSapling extends BlockSapling
|
||||||
this.blockIcon[0] = par1IconRegister.registerIcon("BiomesOPlenty:bamboosapling");
|
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];
|
return this.blockIcon[0];
|
||||||
}
|
}
|
||||||
|
|
|
@ -47,8 +47,9 @@ public class BlockBlueLeaves extends BlockLeavesBase implements IShearable
|
||||||
this.blockIcon[1] = par1IconRegister.registerIcon("BiomesOPlenty:blueleaves2");
|
this.blockIcon[1] = par1IconRegister.registerIcon("BiomesOPlenty:blueleaves2");
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@Override
|
||||||
@SideOnly(Side.CLIENT)
|
@SideOnly(Side.CLIENT)
|
||||||
public Icon getBlockTextureFromSideAndMetadata(int par1, int par2)
|
public Icon getIcon(int par1, int par2)
|
||||||
{
|
{
|
||||||
return blockIcon[(!isOpaqueCube() ? 0 : 1)];
|
return blockIcon[(!isOpaqueCube() ? 0 : 1)];
|
||||||
}
|
}
|
||||||
|
|
|
@ -34,7 +34,8 @@ public class BlockBrownSapling extends BlockSapling
|
||||||
this.blockIcon[0] = par1IconRegister.registerIcon("BiomesOPlenty:brownsapling");
|
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];
|
return this.blockIcon[0];
|
||||||
}
|
}
|
||||||
|
|
|
@ -33,7 +33,8 @@ public class BlockCherryLog extends Block
|
||||||
this.blockIcon[1] = par1IconRegister.registerIcon("BiomesOPlenty:cherrylog");
|
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;
|
int pos = par2 & 12;
|
||||||
if (pos == 0 && (par1 == 1 || par1 == 0) || pos == 4 && (par1 == 5 || par1 == 4) || pos == 8 && (par1 == 2 || par1 == 3))
|
if (pos == 0 && (par1 == 1 || par1 == 0) || pos == 4 && (par1 == 5 || par1 == 4) || pos == 8 && (par1 == 2 || par1 == 3))
|
||||||
|
|
|
@ -47,8 +47,9 @@ public class BlockDarkLeaves extends BlockLeavesBase implements IShearable
|
||||||
this.blockIcon[1] = par1IconRegister.registerIcon("BiomesOPlenty:darkleaves2");
|
this.blockIcon[1] = par1IconRegister.registerIcon("BiomesOPlenty:darkleaves2");
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@Override
|
||||||
@SideOnly(Side.CLIENT)
|
@SideOnly(Side.CLIENT)
|
||||||
public Icon getBlockTextureFromSideAndMetadata(int par1, int par2)
|
public Icon getIcon(int par1, int par2)
|
||||||
{
|
{
|
||||||
return blockIcon[(!isOpaqueCube() ? 0 : 1)];
|
return blockIcon[(!isOpaqueCube() ? 0 : 1)];
|
||||||
}
|
}
|
||||||
|
|
|
@ -33,7 +33,8 @@ public class BlockDarkLog extends Block
|
||||||
this.blockIcon[1] = par1IconRegister.registerIcon("BiomesOPlenty:darklog");
|
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;
|
int pos = par2 & 12;
|
||||||
if (pos == 0 && (par1 == 1 || par1 == 0) || pos == 4 && (par1 == 5 || par1 == 4) || pos == 8 && (par1 == 2 || par1 == 3))
|
if (pos == 0 && (par1 == 1 || par1 == 0) || pos == 4 && (par1 == 5 || par1 == 4) || pos == 8 && (par1 == 2 || par1 == 3))
|
||||||
|
|
|
@ -35,7 +35,8 @@ public class BlockDarkSapling extends BlockSapling
|
||||||
this.blockIcon[0] = par1IconRegister.registerIcon("BiomesOPlenty:darksapling");
|
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];
|
return this.blockIcon[0];
|
||||||
}
|
}
|
||||||
|
|
|
@ -47,8 +47,9 @@ public class BlockDeadLeaves extends BlockLeavesBase implements IShearable
|
||||||
this.blockIcon[1] = par1IconRegister.registerIcon("BiomesOPlenty:deadleaves2");
|
this.blockIcon[1] = par1IconRegister.registerIcon("BiomesOPlenty:deadleaves2");
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@Override
|
||||||
@SideOnly(Side.CLIENT)
|
@SideOnly(Side.CLIENT)
|
||||||
public Icon getBlockTextureFromSideAndMetadata(int par1, int par2)
|
public Icon getIcon(int par1, int par2)
|
||||||
{
|
{
|
||||||
return blockIcon[(!isOpaqueCube() ? 0 : 1)];
|
return blockIcon[(!isOpaqueCube() ? 0 : 1)];
|
||||||
}
|
}
|
||||||
|
|
|
@ -33,7 +33,8 @@ public class BlockDeadLog extends Block
|
||||||
this.blockIcon[1] = par1IconRegister.registerIcon("BiomesOPlenty:deadlog");
|
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;
|
int pos = par2 & 12;
|
||||||
if (pos == 0 && (par1 == 1 || par1 == 0) || pos == 4 && (par1 == 5 || par1 == 4) || pos == 8 && (par1 == 2 || par1 == 3))
|
if (pos == 0 && (par1 == 1 || par1 == 0) || pos == 4 && (par1 == 5 || par1 == 4) || pos == 8 && (par1 == 2 || par1 == 3))
|
||||||
|
|
|
@ -47,8 +47,9 @@ public class BlockFirLeaves extends BlockLeavesBase implements IShearable
|
||||||
this.blockIcon[1] = par1IconRegister.registerIcon("BiomesOPlenty:firleaves2");
|
this.blockIcon[1] = par1IconRegister.registerIcon("BiomesOPlenty:firleaves2");
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@Override
|
||||||
@SideOnly(Side.CLIENT)
|
@SideOnly(Side.CLIENT)
|
||||||
public Icon getBlockTextureFromSideAndMetadata(int par1, int par2)
|
public Icon getIcon(int par1, int par2)
|
||||||
{
|
{
|
||||||
return blockIcon[(!isOpaqueCube() ? 0 : 1)];
|
return blockIcon[(!isOpaqueCube() ? 0 : 1)];
|
||||||
}
|
}
|
||||||
|
|
|
@ -33,7 +33,8 @@ public class BlockFirLog extends Block
|
||||||
this.blockIcon[1] = par1IconRegister.registerIcon("BiomesOPlenty:firlog");
|
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;
|
int pos = par2 & 12;
|
||||||
if (pos == 0 && (par1 == 1 || par1 == 0) || pos == 4 && (par1 == 5 || par1 == 4) || pos == 8 && (par1 == 2 || par1 == 3))
|
if (pos == 0 && (par1 == 1 || par1 == 0) || pos == 4 && (par1 == 5 || par1 == 4) || pos == 8 && (par1 == 2 || par1 == 3))
|
||||||
|
|
|
@ -34,7 +34,8 @@ public class BlockFirSapling extends BlockSapling
|
||||||
this.blockIcon[0] = par1IconRegister.registerIcon("BiomesOPlenty:firsapling");
|
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];
|
return this.blockIcon[0];
|
||||||
}
|
}
|
||||||
|
|
|
@ -32,7 +32,8 @@ public class BlockGiantFlowerStem extends Block
|
||||||
this.blockIcon[1] = par1IconRegister.registerIcon("BiomesOPlenty:bigflowerstem");
|
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)
|
if(par1 == 0 || par1 == 1)
|
||||||
{
|
{
|
||||||
|
|
|
@ -42,7 +42,8 @@ public class BlockHolyGrass extends Block
|
||||||
/**
|
/**
|
||||||
* From the specified side and block metadata retrieves the blocks texture. Args: side, metadata
|
* 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];
|
return blockIcon[par1];
|
||||||
}
|
}
|
||||||
|
|
|
@ -47,8 +47,9 @@ public class BlockHolyLeaves extends BlockLeavesBase implements IShearable
|
||||||
this.blockIcon[1] = par1IconRegister.registerIcon("BiomesOPlenty:holyleaves2");
|
this.blockIcon[1] = par1IconRegister.registerIcon("BiomesOPlenty:holyleaves2");
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@Override
|
||||||
@SideOnly(Side.CLIENT)
|
@SideOnly(Side.CLIENT)
|
||||||
public Icon getBlockTextureFromSideAndMetadata(int par1, int par2)
|
public Icon getIcon(int par1, int par2)
|
||||||
{
|
{
|
||||||
return blockIcon[(!isOpaqueCube() ? 0 : 1)];
|
return blockIcon[(!isOpaqueCube() ? 0 : 1)];
|
||||||
}
|
}
|
||||||
|
|
|
@ -33,7 +33,8 @@ public class BlockHolyLog extends Block
|
||||||
this.blockIcon[1] = par1IconRegister.registerIcon("BiomesOPlenty:holylog");
|
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;
|
int pos = par2 & 12;
|
||||||
if (pos == 0 && (par1 == 1 || par1 == 0) || pos == 4 && (par1 == 5 || par1 == 4) || pos == 8 && (par1 == 2 || par1 == 3))
|
if (pos == 0 && (par1 == 1 || par1 == 0) || pos == 4 && (par1 == 5 || par1 == 4) || pos == 8 && (par1 == 2 || par1 == 3))
|
||||||
|
|
|
@ -36,7 +36,8 @@ public class BlockHolySapling extends BlockSapling
|
||||||
this.blockIcon[0] = par1IconRegister.registerIcon("BiomesOPlenty:holysapling");
|
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];
|
return this.blockIcon[0];
|
||||||
}
|
}
|
||||||
|
|
|
@ -32,7 +32,8 @@ public class BlockMagicLog extends Block
|
||||||
this.blockIcon[1] = par1IconRegister.registerIcon("BiomesOPlenty:magiclog");
|
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;
|
int pos = par2 & 12;
|
||||||
if (pos == 0 && (par1 == 1 || par1 == 0) || pos == 4 && (par1 == 5 || par1 == 4) || pos == 8 && (par1 == 2 || par1 == 3))
|
if (pos == 0 && (par1 == 1 || par1 == 0) || pos == 4 && (par1 == 5 || par1 == 4) || pos == 8 && (par1 == 2 || par1 == 3))
|
||||||
|
|
|
@ -36,7 +36,8 @@ public class BlockMagicSapling extends BlockSapling
|
||||||
this.blockIcon[0] = par1IconRegister.registerIcon("BiomesOPlenty:magicsapling");
|
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];
|
return this.blockIcon[0];
|
||||||
}
|
}
|
||||||
|
|
|
@ -48,8 +48,9 @@ public class BlockMangroveLeaves extends BlockLeavesBase implements IShearable
|
||||||
this.blockIcon[1] = par1IconRegister.registerIcon("BiomesOPlenty:mangroveleaves2");
|
this.blockIcon[1] = par1IconRegister.registerIcon("BiomesOPlenty:mangroveleaves2");
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@Override
|
||||||
@SideOnly(Side.CLIENT)
|
@SideOnly(Side.CLIENT)
|
||||||
public Icon getBlockTextureFromSideAndMetadata(int par1, int par2)
|
public Icon getIcon(int par1, int par2)
|
||||||
{
|
{
|
||||||
return blockIcon[(!isOpaqueCube() ? 0 : 1)];
|
return blockIcon[(!isOpaqueCube() ? 0 : 1)];
|
||||||
}
|
}
|
||||||
|
|
|
@ -33,7 +33,8 @@ public class BlockMangroveLog extends Block
|
||||||
this.blockIcon[1] = par1IconRegister.registerIcon("BiomesOPlenty:mangrovelog");
|
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;
|
int pos = par2 & 12;
|
||||||
if (pos == 0 && (par1 == 1 || par1 == 0) || pos == 4 && (par1 == 5 || par1 == 4) || pos == 8 && (par1 == 2 || par1 == 3))
|
if (pos == 0 && (par1 == 1 || par1 == 0) || pos == 4 && (par1 == 5 || par1 == 4) || pos == 8 && (par1 == 2 || par1 == 3))
|
||||||
|
|
|
@ -35,7 +35,8 @@ public class BlockMangroveSapling extends BlockSapling
|
||||||
this.blockIcon[0] = par1IconRegister.registerIcon("BiomesOPlenty:mangrovesapling");
|
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];
|
return this.blockIcon[0];
|
||||||
}
|
}
|
||||||
|
|
|
@ -48,8 +48,9 @@ public class BlockOrangeLeaves extends BlockLeavesBase implements IShearable
|
||||||
this.blockIcon[1] = par1IconRegister.registerIcon("BiomesOPlenty:orangeleaves2");
|
this.blockIcon[1] = par1IconRegister.registerIcon("BiomesOPlenty:orangeleaves2");
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@Override
|
||||||
@SideOnly(Side.CLIENT)
|
@SideOnly(Side.CLIENT)
|
||||||
public Icon getBlockTextureFromSideAndMetadata(int par1, int par2)
|
public Icon getIcon(int par1, int par2)
|
||||||
{
|
{
|
||||||
return blockIcon[(!isOpaqueCube() ? 0 : 1)];
|
return blockIcon[(!isOpaqueCube() ? 0 : 1)];
|
||||||
}
|
}
|
||||||
|
|
|
@ -34,7 +34,8 @@ public class BlockOrangeSapling extends BlockSapling
|
||||||
this.blockIcon[0] = par1IconRegister.registerIcon("BiomesOPlenty:orangesapling");
|
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];
|
return this.blockIcon[0];
|
||||||
}
|
}
|
||||||
|
|
|
@ -39,7 +39,8 @@ public class BlockOriginGrass extends Block
|
||||||
/**
|
/**
|
||||||
* From the specified side and block metadata retrieves the blocks texture. Args: side, metadata
|
* 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];
|
return blockIcon[par1];
|
||||||
}
|
}
|
||||||
|
|
|
@ -47,8 +47,9 @@ public class BlockOriginLeaves extends BlockLeavesBase implements IShearable
|
||||||
this.blockIcon[1] = par1IconRegister.registerIcon("BiomesOPlenty:originleaves2");
|
this.blockIcon[1] = par1IconRegister.registerIcon("BiomesOPlenty:originleaves2");
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@Override
|
||||||
@SideOnly(Side.CLIENT)
|
@SideOnly(Side.CLIENT)
|
||||||
public Icon getBlockTextureFromSideAndMetadata(int par1, int par2)
|
public Icon getIcon(int par1, int par2)
|
||||||
{
|
{
|
||||||
return blockIcon[(!isOpaqueCube() ? 0 : 1)];
|
return blockIcon[(!isOpaqueCube() ? 0 : 1)];
|
||||||
}
|
}
|
||||||
|
|
|
@ -36,7 +36,8 @@ public class BlockOriginSapling extends BlockSapling
|
||||||
this.blockIcon[0] = par1IconRegister.registerIcon("BiomesOPlenty:originsapling");
|
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];
|
return this.blockIcon[0];
|
||||||
}
|
}
|
||||||
|
|
|
@ -48,8 +48,9 @@ public class BlockPalmLeaves extends BlockLeavesBase implements IShearable
|
||||||
this.blockIcon[1] = par1IconRegister.registerIcon("BiomesOPlenty:palmleaves2");
|
this.blockIcon[1] = par1IconRegister.registerIcon("BiomesOPlenty:palmleaves2");
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@Override
|
||||||
@SideOnly(Side.CLIENT)
|
@SideOnly(Side.CLIENT)
|
||||||
public Icon getBlockTextureFromSideAndMetadata(int par1, int par2)
|
public Icon getIcon(int par1, int par2)
|
||||||
{
|
{
|
||||||
return blockIcon[(!isOpaqueCube() ? 0 : 1)];
|
return blockIcon[(!isOpaqueCube() ? 0 : 1)];
|
||||||
}
|
}
|
||||||
|
|
|
@ -33,7 +33,8 @@ public class BlockPalmLog extends Block
|
||||||
this.blockIcon[1] = par1IconRegister.registerIcon("BiomesOPlenty:palmlog");
|
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;
|
int pos = par2 & 12;
|
||||||
if (pos == 0 && (par1 == 1 || par1 == 0) || pos == 4 && (par1 == 5 || par1 == 4) || pos == 8 && (par1 == 2 || par1 == 3))
|
if (pos == 0 && (par1 == 1 || par1 == 0) || pos == 4 && (par1 == 5 || par1 == 4) || pos == 8 && (par1 == 2 || par1 == 3))
|
||||||
|
|
|
@ -35,7 +35,8 @@ public class BlockPalmSapling extends BlockSapling
|
||||||
this.blockIcon[0] = par1IconRegister.registerIcon("BiomesOPlenty:palmsapling");
|
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];
|
return this.blockIcon[0];
|
||||||
}
|
}
|
||||||
|
|
|
@ -47,8 +47,9 @@ public class BlockPinkLeaves extends BlockLeavesBase implements IShearable
|
||||||
this.blockIcon[1] = par1IconRegister.registerIcon("BiomesOPlenty:pinkleaves2");
|
this.blockIcon[1] = par1IconRegister.registerIcon("BiomesOPlenty:pinkleaves2");
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@Override
|
||||||
@SideOnly(Side.CLIENT)
|
@SideOnly(Side.CLIENT)
|
||||||
public Icon getBlockTextureFromSideAndMetadata(int par1, int par2)
|
public Icon getIcon(int par1, int par2)
|
||||||
{
|
{
|
||||||
return blockIcon[(!isOpaqueCube() ? 0 : 1)];
|
return blockIcon[(!isOpaqueCube() ? 0 : 1)];
|
||||||
}
|
}
|
||||||
|
|
|
@ -34,7 +34,8 @@ public class BlockPinkSapling extends BlockSapling
|
||||||
this.blockIcon[0] = par1IconRegister.registerIcon("BiomesOPlenty:pinksapling");
|
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];
|
return this.blockIcon[0];
|
||||||
}
|
}
|
||||||
|
|
|
@ -47,8 +47,9 @@ public class BlockRedLeaves extends BlockLeavesBase implements IShearable
|
||||||
this.blockIcon[1] = par1IconRegister.registerIcon("BiomesOPlenty:redleaves2");
|
this.blockIcon[1] = par1IconRegister.registerIcon("BiomesOPlenty:redleaves2");
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@Override
|
||||||
@SideOnly(Side.CLIENT)
|
@SideOnly(Side.CLIENT)
|
||||||
public Icon getBlockTextureFromSideAndMetadata(int par1, int par2)
|
public Icon getIcon(int par1, int par2)
|
||||||
{
|
{
|
||||||
return blockIcon[(!isOpaqueCube() ? 0 : 1)];
|
return blockIcon[(!isOpaqueCube() ? 0 : 1)];
|
||||||
}
|
}
|
||||||
|
|
|
@ -34,7 +34,8 @@ public class BlockRedSapling extends BlockSapling
|
||||||
this.blockIcon[0] = par1IconRegister.registerIcon("BiomesOPlenty:redsapling");
|
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];
|
return this.blockIcon[0];
|
||||||
}
|
}
|
||||||
|
|
|
@ -48,8 +48,9 @@ public class BlockRedwoodLeaves extends BlockLeavesBase implements IShearable
|
||||||
this.blockIcon[1] = par1IconRegister.registerIcon("BiomesOPlenty:redwoodleaves2");
|
this.blockIcon[1] = par1IconRegister.registerIcon("BiomesOPlenty:redwoodleaves2");
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@Override
|
||||||
@SideOnly(Side.CLIENT)
|
@SideOnly(Side.CLIENT)
|
||||||
public Icon getBlockTextureFromSideAndMetadata(int par1, int par2)
|
public Icon getIcon(int par1, int par2)
|
||||||
{
|
{
|
||||||
return blockIcon[(!isOpaqueCube() ? 0 : 1)];
|
return blockIcon[(!isOpaqueCube() ? 0 : 1)];
|
||||||
}
|
}
|
||||||
|
|
|
@ -33,7 +33,8 @@ public class BlockRedwoodLog extends Block
|
||||||
this.blockIcon[1] = par1IconRegister.registerIcon("BiomesOPlenty:redwoodlog");
|
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;
|
int pos = par2 & 12;
|
||||||
if (pos == 0 && (par1 == 1 || par1 == 0) || pos == 4 && (par1 == 5 || par1 == 4) || pos == 8 && (par1 == 2 || par1 == 3))
|
if (pos == 0 && (par1 == 1 || par1 == 0) || pos == 4 && (par1 == 5 || par1 == 4) || pos == 8 && (par1 == 2 || par1 == 3))
|
||||||
|
|
|
@ -34,7 +34,8 @@ public class BlockRedwoodSapling extends BlockSapling
|
||||||
this.blockIcon[0] = par1IconRegister.registerIcon("BiomesOPlenty:redwoodsapling");
|
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];
|
return this.blockIcon[0];
|
||||||
}
|
}
|
||||||
|
|
|
@ -34,7 +34,8 @@ public class BlockSmolderingGrass extends Block
|
||||||
this.blockIcon[5] = par1IconRegister.registerIcon("BiomesOPlenty:smolderinggrass2");
|
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];
|
return blockIcon[par1];
|
||||||
}
|
}
|
||||||
|
|
|
@ -47,8 +47,9 @@ public class BlockWhiteLeaves extends BlockLeavesBase implements IShearable
|
||||||
this.blockIcon[1] = par1IconRegister.registerIcon("BiomesOPlenty:whiteleaves2");
|
this.blockIcon[1] = par1IconRegister.registerIcon("BiomesOPlenty:whiteleaves2");
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@Override
|
||||||
@SideOnly(Side.CLIENT)
|
@SideOnly(Side.CLIENT)
|
||||||
public Icon getBlockTextureFromSideAndMetadata(int par1, int par2)
|
public Icon getIcon(int par1, int par2)
|
||||||
{
|
{
|
||||||
return blockIcon[(!isOpaqueCube() ? 0 : 1)];
|
return blockIcon[(!isOpaqueCube() ? 0 : 1)];
|
||||||
}
|
}
|
||||||
|
|
|
@ -34,7 +34,8 @@ public class BlockWhiteSapling extends BlockSapling
|
||||||
this.blockIcon[0] = par1IconRegister.registerIcon("BiomesOPlenty:whitesapling");
|
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];
|
return this.blockIcon[0];
|
||||||
}
|
}
|
||||||
|
|
|
@ -48,8 +48,9 @@ public class BlockWillowLeaves extends BlockLeavesBase implements IShearable
|
||||||
this.blockIcon[1] = par1IconRegister.registerIcon("BiomesOPlenty:willowleaves4");
|
this.blockIcon[1] = par1IconRegister.registerIcon("BiomesOPlenty:willowleaves4");
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@Override
|
||||||
@SideOnly(Side.CLIENT)
|
@SideOnly(Side.CLIENT)
|
||||||
public Icon getBlockTextureFromSideAndMetadata(int par1, int par2)
|
public Icon getIcon(int par1, int par2)
|
||||||
{
|
{
|
||||||
return blockIcon[(!isOpaqueCube() ? 0 : 1)];
|
return blockIcon[(!isOpaqueCube() ? 0 : 1)];
|
||||||
}
|
}
|
||||||
|
|
|
@ -33,7 +33,8 @@ public class BlockWillowLog extends Block
|
||||||
this.blockIcon[1] = par1IconRegister.registerIcon("BiomesOPlenty:willowlog");
|
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;
|
int pos = par2 & 12;
|
||||||
if (pos == 0 && (par1 == 1 || par1 == 0) || pos == 4 && (par1 == 5 || par1 == 4) || pos == 8 && (par1 == 2 || par1 == 3))
|
if (pos == 0 && (par1 == 1 || par1 == 0) || pos == 4 && (par1 == 5 || par1 == 4) || pos == 8 && (par1 == 2 || par1 == 3))
|
||||||
|
|
|
@ -34,7 +34,8 @@ public class BlockWillowSapling extends BlockSapling
|
||||||
this.blockIcon[0] = par1IconRegister.registerIcon("BiomesOPlenty:willowsapling");
|
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];
|
return this.blockIcon[0];
|
||||||
}
|
}
|
||||||
|
|
|
@ -34,7 +34,8 @@ public class BlockYellowSapling extends BlockSapling
|
||||||
this.blockIcon[0] = par1IconRegister.registerIcon("BiomesOPlenty:yellowsapling");
|
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];
|
return this.blockIcon[0];
|
||||||
}
|
}
|
||||||
|
|
Loading…
Reference in a new issue