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

@@ -1,93 +1,86 @@
//
// Decompiled by Procyon v0.5.30
//
package binnie.extratrees.block;
import net.minecraft.util.MovingObjectPosition;
import net.minecraftforge.common.util.ForgeDirection;
import binnie.extratrees.ExtraTrees;
import binnie.Binnie;
import net.minecraft.tileentity.TileEntity;
import net.minecraft.entity.player.EntityPlayer;
import binnie.core.block.BlockMetadata;
import java.util.ArrayList;
import net.minecraft.item.ItemStack;
import net.minecraft.world.World;
import net.minecraft.client.renderer.texture.IIconRegister;
import binnie.core.block.IBlockMetadata;
import binnie.core.block.TileEntityMetadata;
import binnie.extratrees.ExtraTrees;
import cpw.mods.fml.relauncher.Side;
import cpw.mods.fml.relauncher.SideOnly;
import net.minecraft.util.IIcon;
import net.minecraft.world.IBlockAccess;
import net.minecraft.block.Block;
import binnie.core.block.TileEntityMetadata;
import java.util.List;
import net.minecraft.creativetab.CreativeTabs;
import net.minecraft.item.Item;
import forestry.api.core.Tabs;
import binnie.core.block.IBlockMetadata;
import net.minecraft.block.Block;
import net.minecraft.block.BlockLog;
import net.minecraft.client.renderer.texture.IIconRegister;
import net.minecraft.creativetab.CreativeTabs;
import net.minecraft.entity.player.EntityPlayer;
import net.minecraft.item.Item;
import net.minecraft.item.ItemStack;
import net.minecraft.tileentity.TileEntity;
import net.minecraft.util.IIcon;
import net.minecraft.util.MovingObjectPosition;
import net.minecraft.world.IBlockAccess;
import net.minecraft.world.World;
import net.minecraftforge.common.util.ForgeDirection;
public class BlockETLog extends BlockLog implements IBlockMetadata
{
import java.util.ArrayList;
import java.util.List;
public class BlockETLog extends BlockLog implements IBlockMetadata {
public BlockETLog() {
this.setCreativeTab(Tabs.tabArboriculture);
this.setBlockName("log");
this.setResistance(5.0f);
this.setHardness(2.0f);
this.setStepSound(Block.soundTypeWood);
setCreativeTab(Tabs.tabArboriculture);
setBlockName("log");
setResistance(5.0f);
setHardness(2.0f);
setStepSound(Block.soundTypeWood);
}
@Override
public void getSubBlocks(final Item par1, final CreativeTabs par2CreativeTabs, final List itemList) {
public void getSubBlocks(Item item, CreativeTabs tab, List list) {
for (int i = 0; i < ILogType.ExtraTreeLog.values().length; ++i) {
itemList.add(TileEntityMetadata.getItemStack(this, i));
list.add(TileEntityMetadata.getItemStack(this, i));
}
}
@Override
@SideOnly(Side.CLIENT)
public IIcon getIcon(final IBlockAccess world, final int x, final int y, final int z, final int side) {
final TileEntityMetadata tile = TileEntityMetadata.getTile(world, x, y, z);
public IIcon getIcon(IBlockAccess world, int x, int y, int z, int side) {
TileEntityMetadata tile = TileEntityMetadata.getTile(world, x, y, z);
if (tile != null) {
return this.getIcon(side, tile.getTileMetadata(), world.getBlockMetadata(x, y, z));
return getIcon(side, tile.getTileMetadata(), world.getBlockMetadata(x, y, z));
}
return super.getIcon(world, x, y, z, side);
}
public IIcon getIcon(final int side, final int tileMeta, final int blockMeta) {
final int oriented = blockMeta & 0xC;
final ILogType.ExtraTreeLog log = ILogType.ExtraTreeLog.values()[tileMeta];
public IIcon getIcon(int side, int tileMeta, int blockMeta) {
int oriented = blockMeta & 0xC;
ILogType.ExtraTreeLog log = ILogType.ExtraTreeLog.values()[tileMeta];
switch (oriented) {
case 4: {
if (side > 3) {
return log.getTrunk();
}
return log.getBark();
}
case 8: {
if (side == 2 || side == 3) {
return log.getTrunk();
}
return log.getBark();
}
default: {
if (side < 2) {
return log.getTrunk();
}
return log.getBark();
case 4:
if (side > 3) {
return log.getTrunk();
}
return log.getBark();
case 8:
if (side == 2 || side == 3) {
return log.getTrunk();
}
return log.getBark();
}
if (side < 2) {
return log.getTrunk();
}
return log.getBark();
}
@Override
public IIcon getIcon(final int side, final int tileMeta) {
return this.getIcon(side, tileMeta, 0);
public IIcon getIcon(int side, int tileMeta) {
return getIcon(side, tileMeta, 0);
}
@Override
@SideOnly(Side.CLIENT)
public void registerBlockIcons(final IIconRegister register) {
public void registerBlockIcons(IIconRegister register) {
ILogType.ExtraTreeLog.registerIcons(register);
}
@@ -97,113 +90,112 @@ public class BlockETLog extends BlockLog implements IBlockMetadata
}
@Override
public void dropAsStack(final World world, final int x, final int y, final int z, final ItemStack itemStack) {
this.dropBlockAsItem(world, x, y, z, itemStack);
public void dropAsStack(World world, int x, int y, int z, ItemStack itemStack) {
dropBlockAsItem(world, x, y, z, itemStack);
}
@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 blockMeta, int fortune) {
return BlockMetadata.getBlockDropped(this, world, x, y, z, blockMeta);
}
@Override
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 var1, final int i) {
public TileEntity createNewTileEntity(World var1, int i) {
return new TileEntityMetadata();
}
@Override
public boolean hasTileEntity(final int meta) {
public boolean hasTileEntity(int meta) {
return true;
}
@Override
public boolean onBlockEventReceived(final World par1World, final int par2, final int par3, final int par4, final int par5, final int par6) {
super.onBlockEventReceived(par1World, par2, par3, par4, par5, par6);
final TileEntity tileentity = par1World.getTileEntity(par2, par3, par4);
return tileentity != null && tileentity.receiveClientEvent(par5, par6);
public boolean onBlockEventReceived(World world, int x, int y, int z, int eventId, int eventType) {
super.onBlockEventReceived(world, x, y, z, eventId, eventType);
TileEntity tileentity = world.getTileEntity(x, y, z);
return tileentity != null && tileentity.receiveClientEvent(eventId, eventType);
}
@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);
public String getBlockName(ItemStack itemStack) {
int meta = TileEntityMetadata.getItemDamage(itemStack);
return Binnie.Language.localise(ExtraTrees.instance, "block.log.name", ILogType.ExtraTreeLog.values()[meta].getName());
}
@Override
public void getBlockTooltip(final ItemStack itemStack, final List tooltip) {
public void getBlockTooltip(ItemStack itemStack, List tooltip) {
}
@Override
public boolean canSustainLeaves(final IBlockAccess world, final int x, final int y, final int z) {
public boolean canSustainLeaves(IBlockAccess world, int x, int y, int z) {
return true;
}
@Override
public int getPlacedMeta(final ItemStack itemStack, final World world, final int x, final int y, final int z, final ForgeDirection direction) {
public int getPlacedMeta(ItemStack itemStack, World world, int x, int y, int z, ForgeDirection direction) {
return TileEntityMetadata.getItemDamage(itemStack);
}
@Override
public int onBlockPlaced(final World world, final int x, final int y, final int z, final int side, final float par6, final float par7, final float par8, final int meta) {
public int onBlockPlaced(World world, int x, int y, int z, int side, float par6, float par7, float par8, int meta) {
byte b0 = 0;
switch (side) {
case 0:
case 1: {
b0 = 0;
break;
}
case 2:
case 3: {
b0 = 8;
break;
}
case 4:
case 5: {
b0 = 4;
break;
}
case 0:
case 1:
b0 = 0;
break;
case 2:
case 3:
b0 = 8;
break;
case 4:
case 5:
b0 = 4;
break;
}
return b0;
}
@Override
public void breakBlock(final World par1World, final int par2, final int par3, final int par4, final Block par5, final int par6) {
super.breakBlock(par1World, par2, par3, par4, par5, par6);
par1World.removeTileEntity(par2, par3, par4);
public void breakBlock(World world, int x, int y, int z, Block block, int side) {
super.breakBlock(world, x, y, z, block, side);
world.removeTileEntity(x, y, z);
}
@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 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);
}
}