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,90 +1,97 @@
//
// Decompiled by Procyon v0.5.30
//
package binnie.extratrees.carpentry;
import binnie.Binnie;
import binnie.core.block.BlockMetadata;
import net.minecraft.block.Block;
import net.minecraftforge.common.util.ForgeDirection;
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.AxisAlignedBB;
import net.minecraft.world.World;
import binnie.extratrees.ExtraTrees;
import binnie.Binnie;
import binnie.core.block.TileEntityMetadata;
import net.minecraft.item.ItemStack;
import net.minecraft.world.IBlockAccess;
import java.util.List;
import net.minecraft.block.Block;
import net.minecraft.creativetab.CreativeTabs;
import net.minecraft.item.Item;
import net.minecraft.item.ItemStack;
import net.minecraft.util.AxisAlignedBB;
import net.minecraft.world.IBlockAccess;
import net.minecraft.world.World;
import net.minecraftforge.common.util.ForgeDirection;
public class BlockCarpentryPanel extends BlockCarpentry
{
import java.util.List;
public class BlockCarpentryPanel extends BlockCarpentry {
public BlockCarpentryPanel() {
this.useNeighborBrightness = true;
this.setBlockBounds(0.0f, 0.0f, 0.0f, 1.0f, 0.0625f, 1.0f);
this.setLightOpacity(0);
useNeighborBrightness = true;
setBlockBounds(0.0f, 0.0f, 0.0f, 1.0f, 0.0625f, 1.0f);
setLightOpacity(0);
}
public static boolean isValidPanelPlacement(World world, int x, int y, int z, ForgeDirection facing) {
if (facing == ForgeDirection.UNKNOWN) {
return false;
}
int bx = x - facing.offsetX;
int by = y - facing.offsetY;
int bz = z - facing.offsetZ;
Block block = world.getBlock(bx, by, bz);
return block != null && block.isSideSolid(world, bx, by, bz, facing);
}
@Override
public void getSubBlocks(final Item par1, final CreativeTabs par2CreativeTabs, final List itemList) {
public void getSubBlocks(Item item, CreativeTabs tab, List list) {
// ignored
}
@Override
public AxisAlignedBB getSelectedBoundingBoxFromPool(World world, int x, int y, int z)
{
this.setBlockBoundsBasedOnState(world, x, y, z);
public AxisAlignedBB getSelectedBoundingBoxFromPool(World world, int x, int y, int z) {
setBlockBoundsBasedOnState(world, x, y, z);
return super.getCollisionBoundingBoxFromPool(world, x, y, z);
}
@Override
public void setBlockBoundsBasedOnState(final IBlockAccess world, final int x, final int y, final int z) {
final DesignBlock block = this.getCarpentryBlock(world, x, y, z);
public void setBlockBoundsBasedOnState(IBlockAccess world, int x, int y, int z) {
DesignBlock block = getCarpentryBlock(world, x, y, z);
switch (block.getFacing()) {
case DOWN: {
this.setBlockBounds(0.0f, 0.9375f, 0.0f, 1.0f, 1.0f, 1.0f);
break;
}
case EAST: {
this.setBlockBounds(0.0f, 0.0f, 0.0f, 0.0625f, 1.0f, 1.0f);
break;
}
case NORTH: {
this.setBlockBounds(0.0f, 0.0f, 0.9375f, 1.0f, 1.0f, 1.0f);
break;
}
case SOUTH: {
this.setBlockBounds(0.0f, 0.0f, 0.0f, 1.0f, 1.0f, 0.0625f);
break;
}
case UP: {
this.setBlockBounds(0.0f, 0.0f, 0.0f, 1.0f, 0.0625f, 1.0f);
break;
}
case WEST: {
this.setBlockBounds(0.9375f, 0.0f, 0.0f, 1.0f, 1.0f, 1.0f);
break;
}
case DOWN:
setBlockBounds(0.0f, 0.9375f, 0.0f, 1.0f, 1.0f, 1.0f);
break;
case EAST:
setBlockBounds(0.0f, 0.0f, 0.0f, 0.0625f, 1.0f, 1.0f);
break;
case NORTH:
setBlockBounds(0.0f, 0.0f, 0.9375f, 1.0f, 1.0f, 1.0f);
break;
case SOUTH:
setBlockBounds(0.0f, 0.0f, 0.0f, 1.0f, 1.0f, 0.0625f);
break;
case UP:
setBlockBounds(0.0f, 0.0f, 0.0f, 1.0f, 0.0625f, 1.0f);
break;
case WEST:
setBlockBounds(0.9375f, 0.0f, 0.0f, 1.0f, 1.0f, 1.0f);
break;
}
}
@Override
public void setBlockBoundsForItemRender() {
this.setBlockBounds(0.0f, 0.0f, 0.0f, 1.0f, 0.0625f, 1.0f);
setBlockBounds(0.0f, 0.0f, 0.0f, 1.0f, 0.0625f, 1.0f);
}
@Override
public String getBlockName(final ItemStack itemStack) {
final DesignBlock block = ModuleCarpentry.getDesignBlock(this.getDesignSystem(), TileEntityMetadata.getItemDamage(itemStack));
public String getBlockName(ItemStack stack) {
DesignBlock block = ModuleCarpentry.getDesignBlock(getDesignSystem(), TileEntityMetadata.getItemDamage(stack));
return Binnie.Language.localise(ExtraTrees.instance, "block.woodenpanel.name", block.getDesign().getName());
}
@Override
public AxisAlignedBB getCollisionBoundingBoxFromPool(final World par1World, final int par2, final int par3, final int par4) {
this.setBlockBoundsBasedOnState(par1World, par2, par3, par4);
return AxisAlignedBB.getBoundingBox(par2 + this.minX, par3 + this.minY, par4 + this.minZ, par2 + this.maxX, par3 + this.maxY, par4 + this.maxZ);
public AxisAlignedBB getCollisionBoundingBoxFromPool(World par1World, int par2, int par3, int par4) {
setBlockBoundsBasedOnState(par1World, par2, par3, par4);
return AxisAlignedBB.getBoundingBox(par2 + minX, par3 + minY, par4 + minZ, par2 + maxX, par3 + maxY, par4 + maxZ);
}
@Override
@@ -99,34 +106,23 @@ public class BlockCarpentryPanel extends BlockCarpentry
@Override
@SideOnly(Side.CLIENT)
public boolean shouldSideBeRendered(final IBlockAccess world, final int x, final int y, final int z, final int side) {
public boolean shouldSideBeRendered(IBlockAccess world, int x, int y, int z, int side) {
return super.shouldSideBeRendered(world, x, y, z, side);
}
@Override
public DesignBlock getCarpentryBlock(final IBlockAccess world, final int x, final int y, final int z) {
return ModuleCarpentry.getCarpentryPanel(this.getDesignSystem(), TileEntityMetadata.getTileMetadata(world, x, y, z));
}
public static boolean isValidPanelPlacement(final World world, final int x, final int y, final int z, final ForgeDirection facing) {
if (facing == ForgeDirection.UNKNOWN) {
return false;
}
final int bx = x - facing.offsetX;
final int by = y - facing.offsetY;
final int bz = z - facing.offsetZ;
final Block block = world.getBlock(bx, by, bz);
return block != null && block.isSideSolid(world, bx, by, bz, facing);
public DesignBlock getCarpentryBlock(IBlockAccess world, int x, int y, int z) {
return ModuleCarpentry.getCarpentryPanel(getDesignSystem(), TileEntityMetadata.getTileMetadata(world, x, y, z));
}
@Override
public int getPlacedMeta(final ItemStack itemStack, final World world, final int x, final int y, final int z, final ForgeDirection clickedBlock) {
final DesignBlock block = ModuleCarpentry.getCarpentryPanel(this.getDesignSystem(), TileEntityMetadata.getItemDamage(itemStack));
public int getPlacedMeta(ItemStack itemStack, World world, int x, int y, int z, ForgeDirection clickedBlock) {
DesignBlock block = ModuleCarpentry.getCarpentryPanel(getDesignSystem(), TileEntityMetadata.getItemDamage(itemStack));
ForgeDirection facing = clickedBlock;
boolean valid = true;
if (!isValidPanelPlacement(world, x, y, z, facing)) {
valid = false;
for (final ForgeDirection direction : ForgeDirection.values()) {
for (ForgeDirection direction : ForgeDirection.values()) {
if (isValidPanelPlacement(world, x, y, z, direction)) {
facing = direction;
valid = true;
@@ -134,22 +130,25 @@ public class BlockCarpentryPanel extends BlockCarpentry
}
}
}
if (!valid) {
return -1;
}
block.setFacing(facing);
return block.getBlockMetadata(this.getDesignSystem());
return block.getBlockMetadata(getDesignSystem());
}
@Override
public void onNeighborBlockChange(final World world, final int x, final int y, final int z, final Block par5) {
super.onNeighborBlockChange(world, x, y, z, par5);
final DesignBlock block = this.getCarpentryBlock(world, x, y, z);
if (!isValidPanelPlacement(world, x, y, z, block.getFacing())) {
for (final ItemStack stack : BlockMetadata.getBlockDropped(this, world, x, y, z, 0)) {
this.dropBlockAsItem(world, x, y, z, stack);
}
world.setBlockToAir(x, y, z);
public void onNeighborBlockChange(World world, int x, int y, int z, Block block) {
super.onNeighborBlockChange(world, x, y, z, block);
DesignBlock carpentryBlock = getCarpentryBlock(world, x, y, z);
if (isValidPanelPlacement(world, x, y, z, carpentryBlock.getFacing())) {
return;
}
for (ItemStack stack : BlockMetadata.getBlockDropped(this, world, x, y, z, 0)) {
dropBlockAsItem(world, x, y, z, stack);
}
world.setBlockToAir(x, y, z);
}
}