The great format and clean up. IMPORTANT: Read below.

All devs and contributors should use the provided formatter settings. 
If your IDE does not support the format, the rules are simple, it is the
default java formatting rules, with 200char line lengths and 1 extra
line after class definitions.
This commit is contained in:
tterrag1098 committed 2015-01-07 19:50:18 -05:00
1 parent 06c5f5930f
commit 82792ed22e
136 files changed
+10365 -11272

No files matched your search

@@ -5,158 +5,140 @@ import net.minecraft.client.renderer.RenderBlocks;
import net.minecraft.util.IIcon;
import net.minecraft.world.IBlockAccess;
public class RenderBlocksColumn extends RenderBlocks
{
TextureSubmap submap;
IIcon iconTop;
IIcon sides[] = new IIcon[6];
public class RenderBlocksColumn extends RenderBlocks {
RenderBlocksColumn()
{
super();
}
TextureSubmap submap;
IIcon iconTop;
IIcon sides[] = new IIcon[6];
boolean connected(IBlockAccess world, int x, int y, int z, Block block, int meta)
{
return world.getBlock(x, y, z).equals(block) && world.getBlockMetadata(x, y, z) == meta;
}
RenderBlocksColumn() {
super();
}
@Override
public boolean renderStandardBlock(Block block, int x, int y, int z)
{
int metadata = blockAccess.getBlockMetadata(x, y, z);
boolean connected(IBlockAccess world, int x, int y, int z, Block block, int meta) {
return world.getBlock(x, y, z).equals(block) && world.getBlockMetadata(x, y, z) == meta;
}
boolean yp = connected(blockAccess, x, y + 1, z, block, metadata);
boolean yn = connected(blockAccess, x, y - 1, z, block, metadata);
@Override
public boolean renderStandardBlock(Block block, int x, int y, int z) {
int metadata = blockAccess.getBlockMetadata(x, y, z);
if(yp || yn)
{
sides[0] = iconTop;
sides[1] = iconTop;
boolean yp = connected(blockAccess, x, y + 1, z, block, metadata);
boolean yn = connected(blockAccess, x, y - 1, z, block, metadata);
if(yp && yn)
sides[2] = submap.icons[2];
else if(yp)
sides[2] = submap.icons[3];
else
sides[2] = submap.icons[1];
if (yp || yn) {
sides[0] = iconTop;
sides[1] = iconTop;
sides[3] = sides[4] = sides[5] = sides[2];
} else
{
boolean xp = connected(blockAccess, x + 1, y, z, block, metadata);
boolean xn = connected(blockAccess, x - 1, y, z, block, metadata);
if (yp && yn)
sides[2] = submap.icons[2];
else if (yp)
sides[2] = submap.icons[3];
else
sides[2] = submap.icons[1];
if(xp && (connected(blockAccess, x + 1, y + 1, z, block, metadata) || connected(blockAccess, x + 1, y - 1, z, block, metadata)))
xp = false;
if(xn && (connected(blockAccess, x - 1, y + 1, z, block, metadata) || connected(blockAccess, x - 1, y - 1, z, block, metadata)))
xn = false;
sides[3] = sides[4] = sides[5] = sides[2];
} else {
boolean xp = connected(blockAccess, x + 1, y, z, block, metadata);
boolean xn = connected(blockAccess, x - 1, y, z, block, metadata);
if(xp || xn)
{
uvRotateEast = 2;
uvRotateWest = 1;
uvRotateTop = 1;
uvRotateBottom = 1;
if (xp && (connected(blockAccess, x + 1, y + 1, z, block, metadata) || connected(blockAccess, x + 1, y - 1, z, block, metadata)))
xp = false;
if (xn && (connected(blockAccess, x - 1, y + 1, z, block, metadata) || connected(blockAccess, x - 1, y - 1, z, block, metadata)))
xn = false;
sides[4] = iconTop;
sides[5] = iconTop;
if (xp || xn) {
uvRotateEast = 2;
uvRotateWest = 1;
uvRotateTop = 1;
uvRotateBottom = 1;
if(xp && xn)
sides[0] = submap.icons[2];
else if(xp)
sides[0] = submap.icons[3];
else
sides[0] = submap.icons[1];
sides[4] = iconTop;
sides[5] = iconTop;
sides[1] = sides[2] = sides[3] = sides[0];
} else
{
boolean zp = connected(blockAccess, x, y, z + 1, block, metadata);
boolean zn = connected(blockAccess, x, y, z - 1, block, metadata);
if (xp && xn)
sides[0] = submap.icons[2];
else if (xp)
sides[0] = submap.icons[3];
else
sides[0] = submap.icons[1];
if(zp && (connected(blockAccess, x, y + 1, z + 1, block, metadata) || connected(blockAccess, x, y - 1, z + 1, block, metadata)))
zp = false;
if(zp && (connected(blockAccess, x + 1, y, z + 1, block, metadata) || connected(blockAccess, x - 1, y, z + 1, block, metadata)))
zp = false;
if(zn && (connected(blockAccess, x, y + 1, z - 1, block, metadata) || connected(blockAccess, x, y - 1, z - 1, block, metadata)))
zn = false;
if(zn && (connected(blockAccess, x + 1, y, z - 1, block, metadata) || connected(blockAccess, x - 1, y, z - 1, block, metadata)))
zn = false;
sides[1] = sides[2] = sides[3] = sides[0];
} else {
boolean zp = connected(blockAccess, x, y, z + 1, block, metadata);
boolean zn = connected(blockAccess, x, y, z - 1, block, metadata);
if(zp || zn)
{
uvRotateSouth = 1;
uvRotateNorth = 2;
if (zp && (connected(blockAccess, x, y + 1, z + 1, block, metadata) || connected(blockAccess, x, y - 1, z + 1, block, metadata)))
zp = false;
if (zp && (connected(blockAccess, x + 1, y, z + 1, block, metadata) || connected(blockAccess, x - 1, y, z + 1, block, metadata)))
zp = false;
if (zn && (connected(blockAccess, x, y + 1, z - 1, block, metadata) || connected(blockAccess, x, y - 1, z - 1, block, metadata)))
zn = false;
if (zn && (connected(blockAccess, x + 1, y, z - 1, block, metadata) || connected(blockAccess, x - 1, y, z - 1, block, metadata)))
zn = false;
sides[2] = iconTop;
sides[3] = iconTop;
if (zp || zn) {
uvRotateSouth = 1;
uvRotateNorth = 2;
if(zp && zn)
sides[0] = submap.icons[2];
else if(zp)
sides[0] = submap.icons[1];
else
sides[0] = submap.icons[3];
sides[2] = iconTop;
sides[3] = iconTop;
sides[1] = sides[4] = sides[5] = sides[0];
} else
{
sides[0] = sides[1] = iconTop;
sides[2] = sides[3] = sides[4] = sides[5] = submap.icons[0];
}
}
}
if (zp && zn)
sides[0] = submap.icons[2];
else if (zp)
sides[0] = submap.icons[1];
else
sides[0] = submap.icons[3];
sides[1] = sides[4] = sides[5] = sides[0];
} else {
sides[0] = sides[1] = iconTop;
sides[2] = sides[3] = sides[4] = sides[5] = submap.icons[0];
}
}
}
boolean flag = super.renderStandardBlock(block, x, y, z);
boolean flag = super.renderStandardBlock(block, x, y, z);
uvRotateSouth = 0;
uvRotateEast = 0;
uvRotateWest = 0;
uvRotateNorth = 0;
uvRotateTop = 0;
uvRotateBottom = 0;
uvRotateSouth = 0;
uvRotateEast = 0;
uvRotateWest = 0;
uvRotateNorth = 0;
uvRotateTop = 0;
uvRotateBottom = 0;
return flag;
}
return flag;
}
@Override
public void renderFaceXNeg(Block block, double x, double y, double z, IIcon icon) {
super.renderFaceXNeg(block, x, y, z, sides[4]);
}
@Override
public void renderFaceXNeg(Block block, double x, double y, double z, IIcon icon)
{
super.renderFaceXNeg(block, x, y, z, sides[4]);
}
@Override
public void renderFaceXPos(Block block, double x, double y, double z, IIcon icon) {
super.renderFaceXPos(block, x, y, z, sides[5]);
}
@Override
public void renderFaceXPos(Block block, double x, double y, double z, IIcon icon)
{
super.renderFaceXPos(block, x, y, z, sides[5]);
}
@Override
public void renderFaceZNeg(Block block, double x, double y, double z, IIcon icon) {
super.renderFaceZNeg(block, x, y, z, sides[2]);
}
@Override
public void renderFaceZNeg(Block block, double x, double y, double z, IIcon icon)
{
super.renderFaceZNeg(block, x, y, z, sides[2]);
}
@Override
public void renderFaceZPos(Block block, double x, double y, double z, IIcon icon) {
super.renderFaceZPos(block, x, y, z, sides[3]);
}
@Override
public void renderFaceYNeg(Block block, double x, double y, double z, IIcon icon) {
super.renderFaceYNeg(block, x, y, z, sides[0]);
}
@Override
public void renderFaceZPos(Block block, double x, double y, double z, IIcon icon)
{
super.renderFaceZPos(block, x, y, z, sides[3]);
}
@Override
public void renderFaceYNeg(Block block, double x, double y, double z, IIcon icon)
{
super.renderFaceYNeg(block, x, y, z, sides[0]);
}
@Override
public void renderFaceYPos(Block block, double x, double y, double z, IIcon icon)
{
super.renderFaceYPos(block, x, y, z, sides[1]);
}
@Override
public void renderFaceYPos(Block block, double x, double y, double z, IIcon icon) {
super.renderFaceYPos(block, x, y, z, sides[1]);
}
}