Improve code readability in binnie.extratrees package

This commit is contained in:
kordum authored and mezz committed 2017-05-03 14:10:02 -07:00
1 parent adccdd181a
commit 96e4814ae3
225 files changed
+8968 -9306

No files matched your search

@@ -28,22 +28,6 @@ import java.util.ArrayList;
import java.util.List;
public class BlockETDoor extends BlockDoor implements IBlockMetadata {
private IIcon getFlippedIcon(final boolean upper, final boolean flip, final int tileMeta) {
final DoorType type = getDoorType(tileMeta);
if (upper) {
return flip ? type.iconDoorUpperFlip : type.iconDoorUpper;
}
return flip ? type.iconDoorLowerFlip : type.iconDoorLower;
}
public static DoorType getDoorType(final int tileMeta) {
final int type = (tileMeta & 0xF00) >> 8;
if (type >= 0 && type < DoorType.values().length) {
return DoorType.values()[type];
}
return DoorType.Standard;
}
protected BlockETDoor() {
super(Material.wood);
setHardness(3.0f).setStepSound(Block.soundTypeWood);
@@ -51,20 +35,36 @@ public class BlockETDoor extends BlockDoor implements IBlockMetadata {
setBlockName("door");
}
public static DoorType getDoorType(int tileMeta) {
int type = (tileMeta & 0xF00) >> 8;
if (type >= 0 && type < DoorType.values().length) {
return DoorType.values()[type];
}
return DoorType.Standard;
}
private IIcon getFlippedIcon(boolean upper, boolean flip, int tileMeta) {
DoorType type = getDoorType(tileMeta);
if (upper) {
return flip ? type.iconDoorUpperFlip : type.iconDoorUpper;
}
return flip ? type.iconDoorLowerFlip : type.iconDoorLower;
}
@Override
public IIcon getIcon(final int side, final int meta) {
public IIcon getIcon(int side, int meta) {
return DoorType.Standard.iconDoorLower;
}
@Override
@SideOnly(Side.CLIENT)
public IIcon getIcon(final IBlockAccess blockAccess, final int x, final int y, final int z, final int par5) {
public IIcon getIcon(IBlockAccess blockAccess, int x, int y, int z, int par5) {
if (par5 != 1 && par5 != 0) {
final int i1 = getFullMetadata(blockAccess, x, y, z);
final int j1 = i1 & 0x3;
final boolean flag = (i1 & 0x4) != 0;
int i1 = getFullMetadata(blockAccess, x, y, z);
int j1 = i1 & 0x3;
boolean flag = (i1 & 0x4) != 0;
boolean flag2;
final boolean flag3 = (i1 & 0x8) != 0;
boolean flag3 = (i1 & 0x8) != 0;
if (flag) {
flag2 = (j1 == 0 && par5 == 2)
|| (j1 == 1 && par5 == 5)
@@ -80,6 +80,7 @@ public class BlockETDoor extends BlockDoor implements IBlockMetadata {
flag2 = !flag2;
}
}
int tileMeta;
if (flag3) {
tileMeta = TileEntityMetadata.getTileMetadata(blockAccess, x, y - 1, z);
@@ -93,8 +94,8 @@ public class BlockETDoor extends BlockDoor implements IBlockMetadata {
@Override
@SideOnly(Side.CLIENT)
public void registerBlockIcons(final IIconRegister register) {
for (final DoorType type : DoorType.values()) {
public void registerBlockIcons(IIconRegister register) {
for (DoorType type : DoorType.values()) {
type.iconDoorLower = ExtraTrees.proxy.getIcon(register, "door." + type.id + ".lower");
type.iconDoorUpper = ExtraTrees.proxy.getIcon(register, "door." + type.id + ".upper");
type.iconDoorLowerFlip = new IconFlipped(type.iconDoorLower, true, false);
@@ -109,19 +110,20 @@ public class BlockETDoor extends BlockDoor implements IBlockMetadata {
@Override
@SideOnly(Side.CLIENT)
public int colorMultiplier(final IBlockAccess blockAccess, final int x, final int y, final int z) {
final int i1 = getFullMetadata(blockAccess, x, y, z);
public int colorMultiplier(IBlockAccess blockAccess, int x, int y, int z) {
int i1 = getFullMetadata(blockAccess, x, y, z);
if ((i1 & 0x8) != 0) {
final int meta = TileEntityMetadata.getTileMetadata(blockAccess, x, y - 1, z);
int meta = TileEntityMetadata.getTileMetadata(blockAccess, x, y - 1, z);
return WoodManager.getPlankType(meta & 0xFF).getColour();
}
final int meta = TileEntityMetadata.getTileMetadata(blockAccess, x, y, z);
int meta = TileEntityMetadata.getTileMetadata(blockAccess, x, y, z);
return WoodManager.getPlankType(meta & 0xFF).getColour();
}
public int getFullMetadata(final IBlockAccess blockAccess, final int x, final int y, final int pzr4) {
final int l = blockAccess.getBlockMetadata(x, y, pzr4);
final boolean flag = (l & 0x8) != 0x0;
public int getFullMetadata(IBlockAccess blockAccess, int x, int y, int pzr4) {
int l = blockAccess.getBlockMetadata(x, y, pzr4);
boolean flag = (l & 0x8) != 0x0;
int i1;
int j1;
if (flag) {
@@ -131,65 +133,66 @@ public class BlockETDoor extends BlockDoor implements IBlockMetadata {
i1 = l;
j1 = blockAccess.getBlockMetadata(x, y + 1, pzr4);
}
final boolean flag2 = (j1 & 0x1) != 0x0;
boolean flag2 = (j1 & 0x1) != 0x0;
return (i1 & 0x7) | (flag ? 8 : 0) | (flag2 ? 16 : 0);
}
@Override
@SideOnly(Side.CLIENT)
public void onBlockHarvested(final World world, final int x, final int y, final int z, final int par5, final EntityPlayer player) {
if (player.capabilities.isCreativeMode && (par5 & 0x8) != 0x0 && world.getBlock(x, y - 1, z) == this) {
public void onBlockHarvested(World world, int x, int y, int z, int meta, EntityPlayer player) {
if (player.capabilities.isCreativeMode && (meta & 0x8) != 0x0 && world.getBlock(x, y - 1, z) == this) {
world.setBlockToAir(x, y - 1, z);
}
}
@Override
public ArrayList<ItemStack> getDrops(final World world, final int x, final int y, final int z, final int blockMeta, final int fortune) {
public ArrayList<ItemStack> getDrops(World world, int x, int y, int z, int meta, int fortune) {
int yCoord = y;
if ((blockMeta & 0x08) != 0) {
if ((meta & 0x08) != 0) {
yCoord -= 1;
}
return BlockMetadata.getBlockDropped(this, world, x, yCoord, z, blockMeta);
return BlockMetadata.getBlockDropped(this, world, x, yCoord, z, meta);
}
@Override
// TODO fix deprecated code
public boolean removedByPlayer(final World world, final EntityPlayer player, final int x, final int y, final int z) {
public boolean removedByPlayer(World world, EntityPlayer player, int x, int y, int z) {
return BlockMetadata.breakBlock(this, player, world, x, y, z);
}
@Override
public TileEntity createNewTileEntity(final World world, final int k) {
public TileEntity createNewTileEntity(World world, int k) {
return new TileEntityMetadata();
}
@Override
public boolean hasTileEntity(final int meta) {
public boolean hasTileEntity(int meta) {
return true;
}
@Override
public boolean onBlockEventReceived(final World world, final int x, final int y, final int z, final int eventId, final int eventType) {
public boolean onBlockEventReceived(World world, int x, int y, int z, int eventId, int eventType) {
super.onBlockEventReceived(world, x, y, z, eventId, eventType);
final TileEntity tileentity = world.getTileEntity(x, y, z);
TileEntity tileentity = world.getTileEntity(x, y, z);
return tileentity != null && tileentity.receiveClientEvent(eventId, eventType);
}
@Override
public int getPlacedMeta(final ItemStack stack, final World world, final int x, final int y, final int z, final ForgeDirection direction) {
public int getPlacedMeta(ItemStack stack, World world, int x, int y, int z, ForgeDirection direction) {
return TileEntityMetadata.getItemDamage(stack);
}
@Override
public int getDroppedMeta(final int blockMeta, final int tileMeta) {
public int getDroppedMeta(int blockMeta, int tileMeta) {
return tileMeta;
}
@Override
public String getBlockName(final ItemStack itemStack) {
final int meta = TileEntityMetadata.getItemDamage(itemStack);
final String typeName = getDoorType(meta).getName();
final String woodName = WoodManager.getPlankType(meta & 0xFF).getName();
public String getBlockName(ItemStack itemStack) {
int meta = TileEntityMetadata.getItemDamage(itemStack);
String typeName = getDoorType(meta).getName();
String woodName = WoodManager.getPlankType(meta & 0xFF).getName();
if (typeName.equals("")) {
return Binnie.Language.localise(ExtraTrees.instance, "block.door.name", woodName);
}
@@ -197,61 +200,61 @@ public class BlockETDoor extends BlockDoor implements IBlockMetadata {
}
@Override
public void getBlockTooltip(final ItemStack itemStack, final List tooltip) {
public void getBlockTooltip(ItemStack itemStack, List tooltip) {
// ignored
}
@Override
public void dropAsStack(final World world, final int x, final int y, final int z, final ItemStack itemStack) {
public void dropAsStack(World world, int x, int y, int z, ItemStack itemStack) {
dropBlockAsItem(world, x, y, z, itemStack);
}
@Override
public void getSubBlocks(final Item item, final CreativeTabs tab, final List itemList) {
for (final IPlankType type : PlankType.ExtraTreePlanks.values()) {
public void getSubBlocks(Item item, CreativeTabs tab, List itemList) {
for (IPlankType type : PlankType.ExtraTreePlanks.values()) {
itemList.add(WoodManager.getDoor(type, DoorType.Standard));
}
for (final IPlankType type : PlankType.ForestryPlanks.values()) {
for (IPlankType type : PlankType.ForestryPlanks.values()) {
itemList.add(WoodManager.getDoor(type, DoorType.Standard));
}
for (final IPlankType type : PlankType.ExtraBiomesPlank.values()) {
for (IPlankType type : PlankType.ExtraBiomesPlank.values()) {
if (type.getStack() != null) {
itemList.add(WoodManager.getDoor(type, DoorType.Standard));
}
}
for (final IPlankType type : PlankType.VanillaPlanks.values()) {
for (IPlankType type : PlankType.VanillaPlanks.values()) {
itemList.add(WoodManager.getDoor(type, DoorType.Standard));
}
}
@Override
public boolean isWood(final IBlockAccess world, final int x, final int y, final int z) {
public boolean isWood(IBlockAccess world, int x, int y, int z) {
return true;
}
@Override
public int getFlammability(final IBlockAccess world, final int x, final int y, final int z, final ForgeDirection face) {
public int getFlammability(IBlockAccess world, int x, int y, int z, ForgeDirection face) {
return 20;
}
@Override
public boolean isFlammable(final IBlockAccess world, final int x, final int y, final int z, final ForgeDirection face) {
public boolean isFlammable(IBlockAccess world, int x, int y, int z, ForgeDirection face) {
return true;
}
@Override
public int getFireSpreadSpeed(final IBlockAccess world, final int x, final int y, final int z, final ForgeDirection face) {
public int getFireSpreadSpeed(IBlockAccess world, int x, int y, int z, ForgeDirection face) {
return 5;
}
@Override
public void breakBlock(final World world, final int x, final int y, final int z, final Block block, final int par6) {
public void breakBlock(World world, int x, int y, int z, Block block, int par6) {
super.breakBlock(world, x, y, z, block, par6);
world.removeTileEntity(x, y, z);
}
@Override
public ItemStack getPickBlock(final MovingObjectPosition target, final World world, final int x, final int y, final int z) {
public ItemStack getPickBlock(MovingObjectPosition target, World world, int x, int y, int z) {
return BlockMetadata.getPickBlock(world, x, y, z);
}
}