Changed access to use this qualifier

This commit is contained in:
yueh
2014-12-29 15:13:47 +01:00
parent 2a5e57a59b
commit f471513bd0
604 changed files with 11573 additions and 11573 deletions
@@ -102,7 +102,7 @@ public class AppEngRenderItem extends RenderItem
GL11.glEnable( GL11.GL_DEPTH_TEST );
}
long amount = aeStack != null ? aeStack.getStackSize() : is.stackSize;
long amount = this.aeStack != null ? this.aeStack.getStackSize() : is.stackSize;
if ( amount > 999999999999L )
amount = 999999999999L;
@@ -276,14 +276,14 @@ public class BaseBlockRender
}
public BaseBlockRender(boolean enableTESR, double tileEntitySpecialRendererRange) {
hasTESR = enableTESR;
MAX_DISTANCE = tileEntitySpecialRendererRange;
this.hasTESR = enableTESR;
this.MAX_DISTANCE = tileEntitySpecialRendererRange;
setOriMap();
}
public double getTesrRenderDistance()
{
return MAX_DISTANCE;
return this.MAX_DISTANCE;
}
public IIcon firstNotNull(IIcon... s)
@@ -313,7 +313,7 @@ public class BaseBlockRender
0.0D,
0.0D,
0.0D,
firstNotNull( renderer.overrideBlockTexture, block.getRendererInstance().getTexture( ForgeDirection.DOWN ),
this.firstNotNull( renderer.overrideBlockTexture, block.getRendererInstance().getTexture( ForgeDirection.DOWN ),
block.getIcon( ForgeDirection.DOWN.ordinal(), meta ) ) );
tess.draw();
}
@@ -328,7 +328,7 @@ public class BaseBlockRender
0.0D,
0.0D,
0.0D,
firstNotNull( renderer.overrideBlockTexture, block.getRendererInstance().getTexture( ForgeDirection.UP ),
this.firstNotNull( renderer.overrideBlockTexture, block.getRendererInstance().getTexture( ForgeDirection.UP ),
block.getIcon( ForgeDirection.UP.ordinal(), meta ) ) );
tess.draw();
}
@@ -343,7 +343,7 @@ public class BaseBlockRender
0.0D,
0.0D,
0.0D,
firstNotNull( renderer.overrideBlockTexture, block.getRendererInstance().getTexture( ForgeDirection.NORTH ),
this.firstNotNull( renderer.overrideBlockTexture, block.getRendererInstance().getTexture( ForgeDirection.NORTH ),
block.getIcon( ForgeDirection.NORTH.ordinal(), meta ) ) );
tess.draw();
}
@@ -358,7 +358,7 @@ public class BaseBlockRender
0.0D,
0.0D,
0.0D,
firstNotNull( renderer.overrideBlockTexture, block.getRendererInstance().getTexture( ForgeDirection.SOUTH ),
this.firstNotNull( renderer.overrideBlockTexture, block.getRendererInstance().getTexture( ForgeDirection.SOUTH ),
block.getIcon( ForgeDirection.SOUTH.ordinal(), meta ) ) );
tess.draw();
}
@@ -373,7 +373,7 @@ public class BaseBlockRender
0.0D,
0.0D,
0.0D,
firstNotNull( renderer.overrideBlockTexture, block.getRendererInstance().getTexture( ForgeDirection.WEST ),
this.firstNotNull( renderer.overrideBlockTexture, block.getRendererInstance().getTexture( ForgeDirection.WEST ),
block.getIcon( ForgeDirection.WEST.ordinal(), meta ) ) );
tess.draw();
}
@@ -388,7 +388,7 @@ public class BaseBlockRender
0.0D,
0.0D,
0.0D,
firstNotNull( renderer.overrideBlockTexture, block.getRendererInstance().getTexture( ForgeDirection.EAST ),
this.firstNotNull( renderer.overrideBlockTexture, block.getRendererInstance().getTexture( ForgeDirection.EAST ),
block.getIcon( ForgeDirection.EAST.ordinal(), meta ) ) );
tess.draw();
}
@@ -419,7 +419,7 @@ public class BaseBlockRender
getOrientation( ForgeDirection.SOUTH, ForgeDirection.SOUTH, ForgeDirection.UP ) );
}
renderInvBlock( EnumSet.allOf( ForgeDirection.class ), block, item, tess, 0xffffff, renderer );
this.renderInvBlock( EnumSet.allOf( ForgeDirection.class ), block, item, tess, 0xffffff, renderer );
if ( block.hasSubtypes() )
info.setTemporaryRenderIcon( null );
@@ -442,7 +442,7 @@ public class BaseBlockRender
ForgeDirection up = ForgeDirection.UP;
BlockRenderInfo info = block.getRendererInstance();
IOrientable te = getOrientable( block, world, x, y, z );
IOrientable te = this.getOrientable( block, world, x, y, z );
if ( te != null )
{
forward = te.getForward();
@@ -467,11 +467,11 @@ public class BaseBlockRender
public boolean renderInWorld(AEBaseBlock block, IBlockAccess world, int x, int y, int z, RenderBlocks renderer)
{
preRenderInWorld( block, world, x, y, z, renderer );
this.preRenderInWorld( block, world, x, y, z, renderer );
boolean o = renderer.renderStandardBlock( block, x, y, z );
postRenderInWorld( renderer );
this.postRenderInWorld( renderer );
return o;
}
@@ -489,27 +489,27 @@ public class BaseBlockRender
ForgeDirection west = Platform.crossProduct( forward, up );
rotMat.put( 0, west.offsetX );
rotMat.put( 1, west.offsetY );
rotMat.put( 2, west.offsetZ );
rotMat.put( 3, 0 );
this.rotMat.put( 0, west.offsetX );
this.rotMat.put( 1, west.offsetY );
this.rotMat.put( 2, west.offsetZ );
this.rotMat.put( 3, 0 );
rotMat.put( 4, up.offsetX );
rotMat.put( 5, up.offsetY );
rotMat.put( 6, up.offsetZ );
rotMat.put( 7, 0 );
this.rotMat.put( 4, up.offsetX );
this.rotMat.put( 5, up.offsetY );
this.rotMat.put( 6, up.offsetZ );
this.rotMat.put( 7, 0 );
rotMat.put( 8, forward.offsetX );
rotMat.put( 9, forward.offsetY );
rotMat.put( 10, forward.offsetZ );
rotMat.put( 11, 0 );
this.rotMat.put( 8, forward.offsetX );
this.rotMat.put( 9, forward.offsetY );
this.rotMat.put( 10, forward.offsetZ );
this.rotMat.put( 11, 0 );
rotMat.put( 12, 0 );
rotMat.put( 13, 0 );
rotMat.put( 14, 0 );
rotMat.put( 15, 1 );
this.rotMat.put( 12, 0 );
this.rotMat.put( 13, 0 );
this.rotMat.put( 14, 0 );
this.rotMat.put( 15, 1 );
GL11.glTranslated( x + 0.5, y + 0.5, z + 0.5 );
GL11.glMultMatrix( rotMat );
GL11.glMultMatrix( this.rotMat );
GL11.glTranslated( -0.5, -0.5, -0.5 );
GL11.glCullFace( GL11.GL_FRONT );
}
@@ -663,25 +663,25 @@ public class BaseBlockRender
offsetY += y;
offsetZ += z;
renderFace( tess, offsetX, offsetY, offsetZ, layerAX, layerAY, layerAZ, layerBX, layerBY, layerBZ,
this.renderFace( tess, offsetX, offsetY, offsetZ, layerAX, layerAY, layerAZ, layerBX, layerBY, layerBZ,
// u -> u
0, 1.0,
// v -> v
0, edgeThickness, ico, flip );
renderFace( tess, offsetX, offsetY, offsetZ, layerAX, layerAY, layerAZ, layerBX, layerBY, layerBZ,
this.renderFace( tess, offsetX, offsetY, offsetZ, layerAX, layerAY, layerAZ, layerBX, layerBY, layerBZ,
// u -> u
0.0, edgeThickness,
// v -> v
edgeThickness, 1.0 - edgeThickness, ico, flip );
renderFace( tess, offsetX, offsetY, offsetZ, layerAX, layerAY, layerAZ, layerBX, layerBY, layerBZ,
this.renderFace( tess, offsetX, offsetY, offsetZ, layerAX, layerAY, layerAZ, layerBX, layerBY, layerBZ,
// u -> u
1.0 - edgeThickness, 1.0,
// v -> v
edgeThickness, 1.0 - edgeThickness, ico, flip );
renderFace( tess, offsetX, offsetY, offsetZ, layerAX, layerAY, layerAZ, layerBX, layerBY, layerBZ,
this.renderFace( tess, offsetX, offsetY, offsetZ, layerAX, layerAY, layerAZ, layerBX, layerBY, layerBZ,
// u -> u
0, 1.0,
// v -> v
@@ -721,13 +721,13 @@ public class BaseBlockRender
v1 = 16 - v1;
v2 = 16 - v2;
double minX = (forward.offsetX > 0 ? 1 : 0) + mapFaceUV( west.offsetX, u1 ) + mapFaceUV( up.offsetX, v1 );
double minY = (forward.offsetY > 0 ? 1 : 0) + mapFaceUV( west.offsetY, u1 ) + mapFaceUV( up.offsetY, v1 );
double minZ = (forward.offsetZ > 0 ? 1 : 0) + mapFaceUV( west.offsetZ, u1 ) + mapFaceUV( up.offsetZ, v1 );
double minX = (forward.offsetX > 0 ? 1 : 0) + this.mapFaceUV( west.offsetX, u1 ) + this.mapFaceUV( up.offsetX, v1 );
double minY = (forward.offsetY > 0 ? 1 : 0) + this.mapFaceUV( west.offsetY, u1 ) + this.mapFaceUV( up.offsetY, v1 );
double minZ = (forward.offsetZ > 0 ? 1 : 0) + this.mapFaceUV( west.offsetZ, u1 ) + this.mapFaceUV( up.offsetZ, v1 );
double maxX = (forward.offsetX > 0 ? 1 : 0) + mapFaceUV( west.offsetX, u2 ) + mapFaceUV( up.offsetX, v2 );
double maxY = (forward.offsetY > 0 ? 1 : 0) + mapFaceUV( west.offsetY, u2 ) + mapFaceUV( up.offsetY, v2 );
double maxZ = (forward.offsetZ > 0 ? 1 : 0) + mapFaceUV( west.offsetZ, u2 ) + mapFaceUV( up.offsetZ, v2 );
double maxX = (forward.offsetX > 0 ? 1 : 0) + this.mapFaceUV( west.offsetX, u2 ) + this.mapFaceUV( up.offsetX, v2 );
double maxY = (forward.offsetY > 0 ? 1 : 0) + this.mapFaceUV( west.offsetY, u2 ) + this.mapFaceUV( up.offsetY, v2 );
double maxZ = (forward.offsetZ > 0 ? 1 : 0) + this.mapFaceUV( west.offsetZ, u2 ) + this.mapFaceUV( up.offsetZ, v2 );
renderer.renderMinX = Math.max( 0.0, Math.min( minX, maxX ) - (forward.offsetX != 0 ? 0 : 0.001) );
renderer.renderMaxX = Math.min( 1.0, Math.max( minX, maxX ) + (forward.offsetX != 0 ? 0 : 0.001) );
@@ -757,7 +757,7 @@ public class BaseBlockRender
renderer.uvRotateBottom = renderer.uvRotateTop = renderer.uvRotateEast = renderer.uvRotateWest = renderer.uvRotateNorth = renderer.uvRotateSouth = 0;
applyTESRRotation( x, y, z, forward, up );
this.applyTESRRotation( x, y, z, forward, up );
Minecraft.getMinecraft().getTextureManager().bindTexture( TextureMap.locationBlocksTexture );
RenderHelper.disableStandardItemLighting();
@@ -27,7 +27,7 @@ public class BlockRenderInfo
{
public BlockRenderInfo(BaseBlockRender inst) {
rendererInstance = inst;
this.rendererInstance = inst;
}
final public BaseBlockRender rendererInstance;
@@ -49,60 +49,60 @@ public class BlockRenderInfo
public void updateIcons(FlippableIcon Bottom, FlippableIcon Top, FlippableIcon North, FlippableIcon South, FlippableIcon East, FlippableIcon West)
{
topIcon = Top;
bottomIcon = Bottom;
southIcon = South;
northIcon = North;
eastIcon = East;
westIcon = West;
this.topIcon = Top;
this.bottomIcon = Bottom;
this.southIcon = South;
this.northIcon = North;
this.eastIcon = East;
this.westIcon = West;
}
public void setTemporaryRenderIcon(IIcon IIcon)
{
if ( IIcon == null )
useTmp = false;
this.useTmp = false;
else
{
useTmp = true;
tmpTopIcon.setOriginal( IIcon );
tmpBottomIcon.setOriginal( IIcon );
tmpSouthIcon.setOriginal( IIcon );
tmpNorthIcon.setOriginal( IIcon );
tmpEastIcon.setOriginal( IIcon );
tmpWestIcon.setOriginal( IIcon );
this.useTmp = true;
this.tmpTopIcon.setOriginal( IIcon );
this.tmpBottomIcon.setOriginal( IIcon );
this.tmpSouthIcon.setOriginal( IIcon );
this.tmpNorthIcon.setOriginal( IIcon );
this.tmpEastIcon.setOriginal( IIcon );
this.tmpWestIcon.setOriginal( IIcon );
}
}
public void setTemporaryRenderIcons(IIcon nTopIcon, IIcon nBottomIcon, IIcon nSouthIcon, IIcon nNorthIcon, IIcon nEastIcon, IIcon nWestIcon)
{
tmpTopIcon.setOriginal( nTopIcon == null ? getTexture( ForgeDirection.UP ) : nTopIcon );
tmpBottomIcon.setOriginal( nBottomIcon == null ? getTexture( ForgeDirection.DOWN ) : nBottomIcon );
tmpSouthIcon.setOriginal( nSouthIcon == null ? getTexture( ForgeDirection.SOUTH ) : nSouthIcon );
tmpNorthIcon.setOriginal( nNorthIcon == null ? getTexture( ForgeDirection.NORTH ) : nNorthIcon );
tmpEastIcon.setOriginal( nEastIcon == null ? getTexture( ForgeDirection.EAST ) : nEastIcon );
tmpWestIcon.setOriginal( nWestIcon == null ? getTexture( ForgeDirection.WEST ) : nWestIcon );
useTmp = true;
this.tmpTopIcon.setOriginal( nTopIcon == null ? this.getTexture( ForgeDirection.UP ) : nTopIcon );
this.tmpBottomIcon.setOriginal( nBottomIcon == null ? this.getTexture( ForgeDirection.DOWN ) : nBottomIcon );
this.tmpSouthIcon.setOriginal( nSouthIcon == null ? this.getTexture( ForgeDirection.SOUTH ) : nSouthIcon );
this.tmpNorthIcon.setOriginal( nNorthIcon == null ? this.getTexture( ForgeDirection.NORTH ) : nNorthIcon );
this.tmpEastIcon.setOriginal( nEastIcon == null ? this.getTexture( ForgeDirection.EAST ) : nEastIcon );
this.tmpWestIcon.setOriginal( nWestIcon == null ? this.getTexture( ForgeDirection.WEST ) : nWestIcon );
this.useTmp = true;
}
public FlippableIcon getTexture(ForgeDirection dir)
{
if ( useTmp )
if ( this.useTmp )
{
switch (dir)
{
case DOWN:
return tmpBottomIcon;
return this.tmpBottomIcon;
case UP:
return tmpTopIcon;
return this.tmpTopIcon;
case NORTH:
return tmpNorthIcon;
return this.tmpNorthIcon;
case SOUTH:
return tmpSouthIcon;
return this.tmpSouthIcon;
case EAST:
return tmpEastIcon;
return this.tmpEastIcon;
case WEST:
return tmpWestIcon;
return this.tmpWestIcon;
default:
break;
}
@@ -111,27 +111,27 @@ public class BlockRenderInfo
switch (dir)
{
case DOWN:
return bottomIcon;
return this.bottomIcon;
case UP:
return topIcon;
return this.topIcon;
case NORTH:
return northIcon;
return this.northIcon;
case SOUTH:
return southIcon;
return this.southIcon;
case EAST:
return eastIcon;
return this.eastIcon;
case WEST:
return westIcon;
return this.westIcon;
default:
break;
}
return topIcon;
return this.topIcon;
}
public boolean isValid()
{
return topIcon != null && bottomIcon != null && southIcon != null && northIcon != null && eastIcon != null && westIcon != null;
return this.topIcon != null && this.bottomIcon != null && this.southIcon != null && this.northIcon != null && this.eastIcon != null && this.westIcon != null;
}
}
@@ -75,7 +75,7 @@ public class BusRenderHelper implements IPartRenderHelper
@Override
public void addBox(double minX, double minY, double minZ, double maxX, double maxY, double maxZ)
{
if ( started )
if ( this.started )
{
this.minX = Math.min( this.minX, (float) minX );
this.minY = Math.min( this.minY, (float) minY );
@@ -86,7 +86,7 @@ public class BusRenderHelper implements IPartRenderHelper
}
else
{
started = true;
this.started = true;
this.minX = (float) minX;
this.minY = (float) minY;
this.minZ = (float) minZ;
@@ -99,19 +99,19 @@ public class BusRenderHelper implements IPartRenderHelper
@Override
public ForgeDirection getWorldX()
{
return ax;
return BusRenderHelper.this.ax;
}
@Override
public ForgeDirection getWorldY()
{
return ay;
return BusRenderHelper.this.ay;
}
@Override
public ForgeDirection getWorldZ()
{
return az;
return BusRenderHelper.this.az;
}
@Override
@@ -131,27 +131,27 @@ public class BusRenderHelper implements IPartRenderHelper
public int getItemsRendered()
{
return itemsRendered;
return this.itemsRendered;
}
public void setPass(int pass)
{
renderingForPass = 0;
currentPass = pass;
itemsRendered = 0;
this.renderingForPass = 0;
this.currentPass = pass;
this.itemsRendered = 0;
}
@Override
public void renderForPass(int pass)
{
renderingForPass = pass;
this.renderingForPass = pass;
}
public boolean renderThis()
{
if ( renderingForPass == currentPass || noAlphaPass )
if ( this.renderingForPass == this.currentPass || this.noAlphaPass )
{
itemsRendered++;
this.itemsRendered++;
return true;
}
return false;
@@ -171,7 +171,7 @@ public class BusRenderHelper implements IPartRenderHelper
{
RenderBlocksWorkaround rbw = BusRenderer.instance.renderer;
if ( sim != null && rbw.similarLighting( blk, rbw.blockAccess, x, y, z, sim ) )
if ( sim != null && rbw.similarLighting( this.blk, rbw.blockAccess, x, y, z, sim ) )
{
rbw.populate( sim );
rbw.faces = EnumSet.allOf( ForgeDirection.class );
@@ -187,35 +187,35 @@ public class BusRenderHelper implements IPartRenderHelper
rbw.calculations = true;
rbw.faces.clear();
bbc.started = false;
this.bbc.started = false;
if ( p == null )
{
bbc.minX = bbc.minY = bbc.minZ = 0;
bbc.maxX = bbc.maxY = bbc.maxZ = 16;
this.bbc.minX = this.bbc.minY = this.bbc.minZ = 0;
this.bbc.maxX = this.bbc.maxY = this.bbc.maxZ = 16;
}
else
{
p.getBoxes( bbc );
p.getBoxes( this.bbc );
if ( bbc.minX < 1 )
bbc.minX = 1;
if ( bbc.minY < 1 )
bbc.minY = 1;
if ( bbc.minZ < 1 )
bbc.minZ = 1;
if ( this.bbc.minX < 1 )
this.bbc.minX = 1;
if ( this.bbc.minY < 1 )
this.bbc.minY = 1;
if ( this.bbc.minZ < 1 )
this.bbc.minZ = 1;
if ( bbc.maxX > 15 )
bbc.maxX = 15;
if ( bbc.maxY > 15 )
bbc.maxY = 15;
if ( bbc.maxZ > 15 )
bbc.maxZ = 15;
if ( this.bbc.maxX > 15 )
this.bbc.maxX = 15;
if ( this.bbc.maxY > 15 )
this.bbc.maxY = 15;
if ( this.bbc.maxZ > 15 )
this.bbc.maxZ = 15;
}
setBounds( bbc.minX, bbc.minY, bbc.minZ, bbc.maxX, bbc.maxY, bbc.maxZ );
this.setBounds( this.bbc.minX, this.bbc.minY, this.bbc.minZ, this.bbc.maxX, this.bbc.maxY, this.bbc.maxZ );
bbr.renderBlockBounds( rbw, minX, minY, minZ, maxX, maxY, maxZ, ax, ay, az );
rbw.renderStandardBlock( blk, x, y, z );
this.bbr.renderBlockBounds( rbw, this.minX, this.minY, this.minZ, this.maxX, this.maxY, this.maxZ, this.ax, this.ay, this.az );
rbw.renderStandardBlock( this.blk, x, y, z );
rbw.faces = EnumSet.allOf( ForgeDirection.class );
rbw.renderAllFaces = allFaces;
@@ -245,17 +245,17 @@ public class BusRenderHelper implements IPartRenderHelper
case UNKNOWN:
return 0.5;
case DOWN:
return minY;
return this.minY;
case EAST:
return maxX;
return this.maxX;
case NORTH:
return minZ;
return this.minZ;
case SOUTH:
return maxZ;
return this.maxZ;
case UP:
return maxY;
return this.maxY;
case WEST:
return minX;
return this.minX;
}
}
@@ -263,13 +263,13 @@ public class BusRenderHelper implements IPartRenderHelper
@Override
public void setInvColor(int newColor)
{
color = newColor;
this.color = newColor;
}
@Override
public void setTexture(IIcon ico)
{
blk.getRendererInstance().setTemporaryRenderIcon( ico );
this.blk.getRendererInstance().setTemporaryRenderIcon( ico );
}
@Override
@@ -284,16 +284,16 @@ public class BusRenderHelper implements IPartRenderHelper
list[4] = West;
list[5] = East;
blk.getRendererInstance().setTemporaryRenderIcons( list[mapRotation( ForgeDirection.UP ).ordinal()],
list[mapRotation( ForgeDirection.DOWN ).ordinal()], list[mapRotation( ForgeDirection.SOUTH ).ordinal()],
list[mapRotation( ForgeDirection.NORTH ).ordinal()], list[mapRotation( ForgeDirection.EAST ).ordinal()],
list[mapRotation( ForgeDirection.WEST ).ordinal()] );
this.blk.getRendererInstance().setTemporaryRenderIcons( list[this.mapRotation( ForgeDirection.UP ).ordinal()],
list[this.mapRotation( ForgeDirection.DOWN ).ordinal()], list[this.mapRotation( ForgeDirection.SOUTH ).ordinal()],
list[this.mapRotation( ForgeDirection.NORTH ).ordinal()], list[this.mapRotation( ForgeDirection.EAST ).ordinal()],
list[this.mapRotation( ForgeDirection.WEST ).ordinal()] );
}
public ForgeDirection mapRotation(ForgeDirection dir)
{
ForgeDirection forward = az;
ForgeDirection up = ay;
ForgeDirection forward = this.az;
ForgeDirection up = this.ay;
ForgeDirection west = ForgeDirection.UNKNOWN;
if ( forward == null || up == null )
@@ -328,22 +328,22 @@ public class BusRenderHelper implements IPartRenderHelper
@Override
public void renderInventoryBox(RenderBlocks renderer)
{
renderer.setRenderBounds( minX / 16.0, minY / 16.0, minZ / 16.0, maxX / 16.0, maxY / 16.0, maxZ / 16.0 );
bbr.renderInvBlock( EnumSet.allOf( ForgeDirection.class ), blk, null, Tessellator.instance, color, renderer );
renderer.setRenderBounds( this.minX / 16.0, this.minY / 16.0, this.minZ / 16.0, this.maxX / 16.0, this.maxY / 16.0, this.maxZ / 16.0 );
this.bbr.renderInvBlock( EnumSet.allOf( ForgeDirection.class ), this.blk, null, Tessellator.instance, this.color, renderer );
}
@Override
public void renderInventoryFace(IIcon IIcon, ForgeDirection face, RenderBlocks renderer)
{
renderer.setRenderBounds( minX / 16.0, minY / 16.0, minZ / 16.0, maxX / 16.0, maxY / 16.0, maxZ / 16.0 );
setTexture( IIcon );
bbr.renderInvBlock( EnumSet.of( face ), blk, null, Tessellator.instance, color, renderer );
renderer.setRenderBounds( this.minX / 16.0, this.minY / 16.0, this.minZ / 16.0, this.maxX / 16.0, this.maxY / 16.0, this.maxZ / 16.0 );
this.setTexture( IIcon );
this.bbr.renderInvBlock( EnumSet.of( face ), this.blk, null, Tessellator.instance, this.color, renderer );
}
@Override
public void renderBlock(int x, int y, int z, RenderBlocks renderer)
{
if ( !renderThis() )
if ( !this.renderThis() )
return;
AEBaseBlock blk = (AEBaseBlock) AEApi.instance().blocks().blockMultiPart.block();
@@ -360,7 +360,7 @@ public class BusRenderHelper implements IPartRenderHelper
renderer.uvRotateNorth = info.getTexture( ForgeDirection.NORTH ).setFlip( BaseBlockRender.getOrientation( ForgeDirection.NORTH, forward, up ) );
renderer.uvRotateSouth = info.getTexture( ForgeDirection.SOUTH ).setFlip( BaseBlockRender.getOrientation( ForgeDirection.SOUTH, forward, up ) );
bbr.renderBlockBounds( renderer, minX, minY, minZ, maxX, maxY, maxZ, ax, ay, az );
this.bbr.renderBlockBounds( renderer, this.minX, this.minY, this.minZ, this.maxX, this.maxY, this.maxZ, this.ax, this.ay, this.az );
renderer.renderStandardBlock( blk, x, y, z );
}
@@ -379,7 +379,7 @@ public class BusRenderHelper implements IPartRenderHelper
public void prepareBounds(RenderBlocks renderer)
{
bbr.renderBlockBounds( renderer, minX, minY, minZ, maxX, maxY, maxZ, ax, ay, az );
this.bbr.renderBlockBounds( renderer, this.minX, this.minY, this.minZ, this.maxX, this.maxY, this.maxZ, this.ax, this.ay, this.az );
}
@Override
@@ -391,37 +391,37 @@ public class BusRenderHelper implements IPartRenderHelper
@Override
public void renderBlockCurrentBounds(int x, int y, int z, RenderBlocks renderer)
{
if ( !renderThis() )
if ( !this.renderThis() )
return;
renderer.renderStandardBlock( blk, x, y, z );
renderer.renderStandardBlock( this.blk, x, y, z );
}
@Override
public void renderFaceCutout(int x, int y, int z, IIcon ico, ForgeDirection face, float edgeThickness, RenderBlocks renderer)
{
if ( !renderThis() )
if ( !this.renderThis() )
return;
switch (face)
{
case DOWN:
face = ay.getOpposite();
face = this.ay.getOpposite();
break;
case EAST:
face = ax;
face = this.ax;
break;
case NORTH:
face = az.getOpposite();
face = this.az.getOpposite();
break;
case SOUTH:
face = az;
face = this.az;
break;
case UP:
face = ay;
face = this.ay;
break;
case WEST:
face = ax.getOpposite();
face = this.ax.getOpposite();
break;
case UNKNOWN:
break;
@@ -429,35 +429,35 @@ public class BusRenderHelper implements IPartRenderHelper
break;
}
bbr.renderCutoutFace( blk, ico, x, y, z, renderer, face, edgeThickness );
this.bbr.renderCutoutFace( this.blk, ico, x, y, z, renderer, face, edgeThickness );
}
@Override
public void renderFace(int x, int y, int z, IIcon ico, ForgeDirection face, RenderBlocks renderer)
{
if ( !renderThis() )
if ( !this.renderThis() )
return;
prepareBounds( renderer );
this.prepareBounds( renderer );
switch (face)
{
case DOWN:
face = ay.getOpposite();
face = this.ay.getOpposite();
break;
case EAST:
face = ax;
face = this.ax;
break;
case NORTH:
face = az.getOpposite();
face = this.az.getOpposite();
break;
case SOUTH:
face = az;
face = this.az;
break;
case UP:
face = ay;
face = this.ay;
break;
case WEST:
face = ax.getOpposite();
face = this.ax.getOpposite();
break;
case UNKNOWN:
break;
@@ -465,37 +465,37 @@ public class BusRenderHelper implements IPartRenderHelper
break;
}
bbr.renderFace( x, y, z, blk, ico, renderer, face );
this.bbr.renderFace( x, y, z, this.blk, ico, renderer, face );
}
@Override
public ForgeDirection getWorldX()
{
return ax;
return this.ax;
}
@Override
public ForgeDirection getWorldY()
{
return ay;
return this.ay;
}
@Override
public ForgeDirection getWorldZ()
{
return az;
return this.az;
}
public void setOrientation(ForgeDirection dx, ForgeDirection dy, ForgeDirection dz)
{
ax = dx == null ? ForgeDirection.EAST : dx;
ay = dy == null ? ForgeDirection.UP : dy;
az = dz == null ? ForgeDirection.SOUTH : dz;
this.ax = dx == null ? ForgeDirection.EAST : dx;
this.ay = dy == null ? ForgeDirection.UP : dy;
this.az = dz == null ? ForgeDirection.SOUTH : dz;
}
public double[] getBounds()
{
return new double[] { minX, minY, minZ, maxX, maxY, maxZ };
return new double[] { this.minX, this.minY, this.minZ, this.maxX, this.maxY, this.maxZ };
}
public void setBounds(double[] bounds)
@@ -503,12 +503,12 @@ public class BusRenderHelper implements IPartRenderHelper
if ( bounds == null || bounds.length != 6 )
return;
minX = bounds[0];
minY = bounds[1];
minZ = bounds[2];
maxX = bounds[3];
maxY = bounds[4];
maxZ = bounds[5];
this.minX = bounds[0];
this.minY = bounds[1];
this.minZ = bounds[2];
this.maxX = bounds[3];
this.maxY = bounds[4];
this.maxZ = bounds[5];
}
}
@@ -128,13 +128,13 @@ public class BusRenderer implements IItemRenderer
BusRenderHelper.instance.setBounds( 0, 0, 0, 1, 1, 1 );
BusRenderHelper.instance.setTexture( null );
BusRenderHelper.instance.setInvColor( 0xffffff );
renderer.blockAccess = ClientHelper.proxy.getWorld();
this.renderer.blockAccess = ClientHelper.proxy.getWorld();
BusRenderHelper.instance.setOrientation( ForgeDirection.EAST, ForgeDirection.UP, ForgeDirection.SOUTH );
renderer.uvRotateBottom = renderer.uvRotateEast = renderer.uvRotateNorth = renderer.uvRotateSouth = renderer.uvRotateTop = renderer.uvRotateWest = 0;
renderer.useInventoryTint = false;
renderer.overrideBlockTexture = null;
this.renderer.uvRotateBottom = this.renderer.uvRotateEast = this.renderer.uvRotateNorth = this.renderer.uvRotateSouth = this.renderer.uvRotateTop = this.renderer.uvRotateWest = 0;
this.renderer.useInventoryTint = false;
this.renderer.overrideBlockTexture = null;
if ( item.getItem() instanceof IFacadeItem )
{
@@ -148,11 +148,11 @@ public class BusRenderer implements IItemRenderer
}
if ( fp != null )
fp.renderInventory( BusRenderHelper.instance, renderer );
fp.renderInventory( BusRenderHelper.instance, this.renderer );
}
else
{
IPart ip = getRenderer( item, (IPartItem) item.getItem() );
IPart ip = this.getRenderer( item, (IPartItem) item.getItem() );
if ( ip != null )
{
if ( type == ItemRenderType.ENTITY )
@@ -161,11 +161,11 @@ public class BusRenderer implements IItemRenderer
GL11.glTranslatef( 0.0f, 0.0f, -0.04f * (8 - depth) - 0.06f );
}
ip.renderInventory( BusRenderHelper.instance, renderer );
ip.renderInventory( BusRenderHelper.instance, this.renderer );
}
}
renderer.uvRotateBottom = renderer.uvRotateEast = renderer.uvRotateNorth = renderer.uvRotateSouth = renderer.uvRotateTop = renderer.uvRotateWest = 0;
this.renderer.uvRotateBottom = this.renderer.uvRotateEast = this.renderer.uvRotateNorth = this.renderer.uvRotateSouth = this.renderer.uvRotateTop = this.renderer.uvRotateWest = 0;
GL11.glPopAttrib();
GL11.glPopMatrix();
@@ -105,7 +105,7 @@ public class CableRenderHelper
IPart part = cableBusContainer.getPart( s );
if ( part != null )
{
setSide( s );
this.setSide( s );
renderer.renderAllFaces = true;
renderer.flipTexture = false;
@@ -130,7 +130,7 @@ public class CableRenderHelper
IPart part = cableBusContainer.getPart( s );
if ( part != null )
{
setSide( s );
this.setSide( s );
BusRenderHelper brh = BusRenderHelper.instance;
BusCollisionHelper bch = new BusCollisionHelper( boxes, brh.getWorldX(), brh.getWorldY(), brh.getWorldZ(), null, true );
part.getBoxes( bch );
@@ -184,7 +184,7 @@ public class CableRenderHelper
renderer.flipTexture = false;
renderer.uvRotateBottom = renderer.uvRotateEast = renderer.uvRotateNorth = renderer.uvRotateSouth = renderer.uvRotateTop = renderer.uvRotateWest = 0;
setSide( s );
this.setSide( s );
fPart.renderStatic( te.xCoord, te.yCoord, te.zCoord, BusRenderHelper.instance, renderer, iFacadeContainer, b,
cableBusContainer.getPart( s ) == null );
}
@@ -77,71 +77,71 @@ public class RenderBlocksWorkaround extends RenderBlocks
public int lightHash;
public LightingCache(LightingCache secondCSrc) {
rXPos = secondCSrc.rXPos;
rXNeg = secondCSrc.rXNeg;
rYPos = secondCSrc.rYPos;
rYNeg = secondCSrc.rYNeg;
rZPos = secondCSrc.rZPos;
rZNeg = secondCSrc.rZNeg;
this.rXPos = secondCSrc.rXPos;
this.rXNeg = secondCSrc.rXNeg;
this.rYPos = secondCSrc.rYPos;
this.rYNeg = secondCSrc.rYNeg;
this.rZPos = secondCSrc.rZPos;
this.rZNeg = secondCSrc.rZNeg;
isAO = secondCSrc.isAO;
this.isAO = secondCSrc.isAO;
bXPos = secondCSrc.bXPos;
bXNeg = secondCSrc.bXNeg;
bYPos = secondCSrc.bYPos;
bYNeg = secondCSrc.bYNeg;
bZPos = secondCSrc.bZPos;
bZNeg = secondCSrc.bZNeg;
this.bXPos = secondCSrc.bXPos;
this.bXNeg = secondCSrc.bXNeg;
this.bYPos = secondCSrc.bYPos;
this.bYNeg = secondCSrc.bYNeg;
this.bZPos = secondCSrc.bZPos;
this.bZNeg = secondCSrc.bZNeg;
aoXPos = secondCSrc.aoXPos.clone();
aoXNeg = secondCSrc.aoXNeg.clone();
aoYPos = secondCSrc.aoYPos.clone();
aoYNeg = secondCSrc.aoYNeg.clone();
aoZPos = secondCSrc.aoZPos.clone();
aoZNeg = secondCSrc.aoZNeg.clone();
this.aoXPos = secondCSrc.aoXPos.clone();
this.aoXNeg = secondCSrc.aoXNeg.clone();
this.aoYPos = secondCSrc.aoYPos.clone();
this.aoYNeg = secondCSrc.aoYNeg.clone();
this.aoZPos = secondCSrc.aoZPos.clone();
this.aoZNeg = secondCSrc.aoZNeg.clone();
foXPos = secondCSrc.foXPos.clone();
foXNeg = secondCSrc.foXNeg.clone();
foYPos = secondCSrc.foYPos.clone();
foYNeg = secondCSrc.foYNeg.clone();
foZPos = secondCSrc.foZPos.clone();
foZNeg = secondCSrc.foZNeg.clone();
this.foXPos = secondCSrc.foXPos.clone();
this.foXNeg = secondCSrc.foXNeg.clone();
this.foYPos = secondCSrc.foYPos.clone();
this.foYNeg = secondCSrc.foYNeg.clone();
this.foZPos = secondCSrc.foZPos.clone();
this.foZNeg = secondCSrc.foZNeg.clone();
lightHash = secondCSrc.lightHash;
this.lightHash = secondCSrc.lightHash;
}
public LightingCache() {
rXPos = null;
rXNeg = null;
rYPos = null;
rYNeg = null;
rZPos = null;
rZNeg = null;
this.rXPos = null;
this.rXNeg = null;
this.rYPos = null;
this.rYNeg = null;
this.rZPos = null;
this.rZNeg = null;
isAO = false;
this.isAO = false;
bXPos = 0;
bXNeg = 0;
bYPos = 0;
bYNeg = 0;
bZPos = 0;
bZNeg = 0;
this.bXPos = 0;
this.bXNeg = 0;
this.bYPos = 0;
this.bYNeg = 0;
this.bZPos = 0;
this.bZNeg = 0;
aoXPos = new int[5];
aoXNeg = new int[5];
aoYPos = new int[5];
aoYNeg = new int[5];
aoZPos = new int[5];
aoZNeg = new int[5];
this.aoXPos = new int[5];
this.aoXNeg = new int[5];
this.aoYPos = new int[5];
this.aoYNeg = new int[5];
this.aoZPos = new int[5];
this.aoZNeg = new int[5];
foXPos = new float[12];
foXNeg = new float[12];
foYPos = new float[12];
foYNeg = new float[12];
foZPos = new float[12];
foZNeg = new float[12];
this.foXPos = new float[12];
this.foXNeg = new float[12];
this.foYPos = new float[12];
this.foYNeg = new float[12];
this.foZPos = new float[12];
this.foZNeg = new float[12];
lightHash = 0;
this.lightHash = 0;
}
}
@@ -158,19 +158,19 @@ public class RenderBlocksWorkaround extends RenderBlocks
{
try
{
if ( fColor == null )
if ( this.fColor == null )
{
try
{
fColor = Tessellator.class.getDeclaredField( "color" );
this.fColor = Tessellator.class.getDeclaredField( "color" );
}
catch (Throwable t)
{
fColor = Tessellator.class.getDeclaredField( "field_78402_m" );
this.fColor = Tessellator.class.getDeclaredField( "field_78402_m" );
}
fColor.setAccessible( true );
this.fColor.setAccessible( true );
}
return (Integer) fColor.get( Tessellator.instance );
return (Integer) this.fColor.get( Tessellator.instance );
}
catch (Throwable t)
{
@@ -182,19 +182,19 @@ public class RenderBlocksWorkaround extends RenderBlocks
{
try
{
if ( fBrightness == null )
if ( this.fBrightness == null )
{
try
{
fBrightness = Tessellator.class.getDeclaredField( "brightness" );
this.fBrightness = Tessellator.class.getDeclaredField( "brightness" );
}
catch (Throwable t)
{
fBrightness = Tessellator.class.getDeclaredField( "field_78401_l" );
this.fBrightness = Tessellator.class.getDeclaredField( "field_78401_l" );
}
fBrightness.setAccessible( true );
this.fBrightness.setAccessible( true );
}
return (Integer) fBrightness.get( Tessellator.instance );
return (Integer) this.fBrightness.get( Tessellator.instance );
}
catch (Throwable t)
{
@@ -204,90 +204,90 @@ public class RenderBlocksWorkaround extends RenderBlocks
public void setTexture(IIcon ico)
{
lightState.rXPos = lightState.rXNeg = lightState.rYPos = lightState.rYNeg = lightState.rZPos = lightState.rZNeg = ico;
this.lightState.rXPos = this.lightState.rXNeg = this.lightState.rYPos = this.lightState.rYNeg = this.lightState.rZPos = this.lightState.rZNeg = ico;
}
public void setTexture(IIcon rYNeg, IIcon rYPos, IIcon rZNeg, IIcon rZPos, IIcon rXNeg, IIcon rXPos)
{
lightState.rXPos = rXPos;
lightState.rXNeg = rXNeg;
lightState.rYPos = rYPos;
lightState.rYNeg = rYNeg;
lightState.rZPos = rZPos;
lightState.rZNeg = rZNeg;
this.lightState.rXPos = rXPos;
this.lightState.rXNeg = rXNeg;
this.lightState.rYPos = rYPos;
this.lightState.rYNeg = rYNeg;
this.lightState.rZPos = rZPos;
this.lightState.rZNeg = rZNeg;
}
public boolean renderStandardBlockNoCalculations(Block b, int x, int y, int z)
{
Tessellator.instance.setBrightness( lightState.bXPos );
restoreAO( lightState.aoXPos, lightState.foXPos );
renderFaceXPos( b, x, y, z, useTextures ? lightState.rXPos : getBlockIcon( b, this.blockAccess, x, y, z, ForgeDirection.EAST.ordinal() ) );
Tessellator.instance.setBrightness( this.lightState.bXPos );
this.restoreAO( this.lightState.aoXPos, this.lightState.foXPos );
this.renderFaceXPos( b, x, y, z, this.useTextures ? this.lightState.rXPos : this.getBlockIcon( b, this.blockAccess, x, y, z, ForgeDirection.EAST.ordinal() ) );
Tessellator.instance.setBrightness( lightState.bXNeg );
restoreAO( lightState.aoXNeg, lightState.foXNeg );
renderFaceXNeg( b, x, y, z, useTextures ? lightState.rXNeg : getBlockIcon( b, this.blockAccess, x, y, z, ForgeDirection.WEST.ordinal() ) );
Tessellator.instance.setBrightness( this.lightState.bXNeg );
this.restoreAO( this.lightState.aoXNeg, this.lightState.foXNeg );
this.renderFaceXNeg( b, x, y, z, this.useTextures ? this.lightState.rXNeg : this.getBlockIcon( b, this.blockAccess, x, y, z, ForgeDirection.WEST.ordinal() ) );
Tessellator.instance.setBrightness( lightState.bYPos );
restoreAO( lightState.aoYPos, lightState.foYPos );
renderFaceYPos( b, x, y, z, useTextures ? lightState.rYPos : getBlockIcon( b, this.blockAccess, x, y, z, ForgeDirection.UP.ordinal() ) );
Tessellator.instance.setBrightness( this.lightState.bYPos );
this.restoreAO( this.lightState.aoYPos, this.lightState.foYPos );
this.renderFaceYPos( b, x, y, z, this.useTextures ? this.lightState.rYPos : this.getBlockIcon( b, this.blockAccess, x, y, z, ForgeDirection.UP.ordinal() ) );
Tessellator.instance.setBrightness( lightState.bYNeg );
restoreAO( lightState.aoYNeg, lightState.foYNeg );
renderFaceYNeg( b, x, y, z, useTextures ? lightState.rYNeg : getBlockIcon( b, this.blockAccess, x, y, z, ForgeDirection.DOWN.ordinal() ) );
Tessellator.instance.setBrightness( this.lightState.bYNeg );
this.restoreAO( this.lightState.aoYNeg, this.lightState.foYNeg );
this.renderFaceYNeg( b, x, y, z, this.useTextures ? this.lightState.rYNeg : this.getBlockIcon( b, this.blockAccess, x, y, z, ForgeDirection.DOWN.ordinal() ) );
Tessellator.instance.setBrightness( lightState.bZPos );
restoreAO( lightState.aoZPos, lightState.foZPos );
renderFaceZPos( b, x, y, z, useTextures ? lightState.rZPos : getBlockIcon( b, this.blockAccess, x, y, z, ForgeDirection.SOUTH.ordinal() ) );
Tessellator.instance.setBrightness( this.lightState.bZPos );
this.restoreAO( this.lightState.aoZPos, this.lightState.foZPos );
this.renderFaceZPos( b, x, y, z, this.useTextures ? this.lightState.rZPos : this.getBlockIcon( b, this.blockAccess, x, y, z, ForgeDirection.SOUTH.ordinal() ) );
Tessellator.instance.setBrightness( lightState.bZNeg );
restoreAO( lightState.aoZNeg, lightState.foZNeg );
renderFaceZNeg( b, x, y, z, useTextures ? lightState.rZNeg : getBlockIcon( b, this.blockAccess, x, y, z, ForgeDirection.NORTH.ordinal() ) );
Tessellator.instance.setBrightness( this.lightState.bZNeg );
this.restoreAO( this.lightState.aoZNeg, this.lightState.foZNeg );
this.renderFaceZNeg( b, x, y, z, this.useTextures ? this.lightState.rZNeg : this.getBlockIcon( b, this.blockAccess, x, y, z, ForgeDirection.NORTH.ordinal() ) );
return true;
}
private void restoreAO(int[] z, float[] c)
{
brightnessBottomLeft = z[0];
brightnessBottomRight = z[1];
brightnessTopLeft = z[2];
brightnessTopRight = z[3];
Tessellator.instance.setColorRGBA_I( z[4], (int) (opacity * 255) );
this.brightnessBottomLeft = z[0];
this.brightnessBottomRight = z[1];
this.brightnessTopLeft = z[2];
this.brightnessTopRight = z[3];
Tessellator.instance.setColorRGBA_I( z[4], (int) (this.opacity * 255) );
colorRedTopLeft = c[0];
colorGreenTopLeft = c[1];
colorBlueTopLeft = c[2];
colorRedBottomLeft = c[3];
colorGreenBottomLeft = c[4];
colorBlueBottomLeft = c[5];
colorRedBottomRight = c[6];
colorGreenBottomRight = c[7];
colorBlueBottomRight = c[8];
colorRedTopRight = c[9];
colorGreenTopRight = c[10];
colorBlueTopRight = c[11];
this.colorRedTopLeft = c[0];
this.colorGreenTopLeft = c[1];
this.colorBlueTopLeft = c[2];
this.colorRedBottomLeft = c[3];
this.colorGreenBottomLeft = c[4];
this.colorBlueBottomLeft = c[5];
this.colorRedBottomRight = c[6];
this.colorGreenBottomRight = c[7];
this.colorBlueBottomRight = c[8];
this.colorRedTopRight = c[9];
this.colorGreenTopRight = c[10];
this.colorBlueTopRight = c[11];
}
private void saveAO(int[] z, float[] c)
{
z[0] = brightnessBottomLeft;
z[1] = brightnessBottomRight;
z[2] = brightnessTopLeft;
z[3] = brightnessTopRight;
z[4] = getCurrentColor();
z[0] = this.brightnessBottomLeft;
z[1] = this.brightnessBottomRight;
z[2] = this.brightnessTopLeft;
z[3] = this.brightnessTopRight;
z[4] = this.getCurrentColor();
c[0] = colorRedTopLeft;
c[1] = colorGreenTopLeft;
c[2] = colorBlueTopLeft;
c[3] = colorRedBottomLeft;
c[4] = colorGreenBottomLeft;
c[5] = colorBlueBottomLeft;
c[6] = colorRedBottomRight;
c[7] = colorGreenBottomRight;
c[8] = colorBlueBottomRight;
c[9] = colorRedTopRight;
c[10] = colorGreenTopRight;
c[11] = colorBlueTopRight;
c[0] = this.colorRedTopLeft;
c[1] = this.colorGreenTopLeft;
c[2] = this.colorBlueTopLeft;
c[3] = this.colorRedBottomLeft;
c[4] = this.colorGreenBottomLeft;
c[5] = this.colorBlueBottomLeft;
c[6] = this.colorRedBottomRight;
c[7] = this.colorGreenBottomRight;
c[8] = this.colorBlueBottomRight;
c[9] = this.colorRedTopRight;
c[10] = this.colorGreenTopRight;
c[11] = this.colorBlueTopRight;
}
@Override
@@ -295,16 +295,16 @@ public class RenderBlocksWorkaround extends RenderBlocks
{
try
{
if ( calculations )
if ( this.calculations )
{
lightState.lightHash = getLightingHash( blk, this.blockAccess, x, y, z );
this.lightState.lightHash = this.getLightingHash( blk, this.blockAccess, x, y, z );
return super.renderStandardBlock( blk, x, y, z );
}
else
{
enableAO = lightState.isAO;
boolean out = renderStandardBlockNoCalculations( blk, x, y, z );
enableAO = false;
this.enableAO = this.lightState.isAO;
boolean out = this.renderStandardBlockNoCalculations( blk, x, y, z );
this.enableAO = false;
return out;
}
}
@@ -319,12 +319,12 @@ public class RenderBlocksWorkaround extends RenderBlocks
@Override
public void renderFaceXNeg(Block par1Block, double par2, double par4, double par6, IIcon par8Icon)
{
if ( faces.contains( ForgeDirection.WEST ) )
if ( this.faces.contains( ForgeDirection.WEST ) )
{
if ( !renderFaces.contains( ForgeDirection.WEST ) )
if ( !this.renderFaces.contains( ForgeDirection.WEST ) )
return;
if ( isFacade )
if ( this.isFacade )
{
Tessellator tessellator = Tessellator.instance;
@@ -341,13 +341,13 @@ public class RenderBlocksWorkaround extends RenderBlocks
if ( this.enableAO )
{
partialLightingColoring( renderMaxY, renderMaxZ );
this.partialLightingColoring( this.renderMaxY, this.renderMaxZ );
tessellator.addVertexWithUV( d11, d13, d15, d4, d5 );
partialLightingColoring( renderMaxY, renderMinZ );
this.partialLightingColoring( this.renderMaxY, this.renderMinZ );
tessellator.addVertexWithUV( d11, d13, d14, d3, d5 );
partialLightingColoring( renderMinY, renderMinZ );
this.partialLightingColoring( this.renderMinY, this.renderMinZ );
tessellator.addVertexWithUV( d11, d12, d14, d3, d6 );
partialLightingColoring( renderMinY, renderMaxZ );
this.partialLightingColoring( this.renderMinY, this.renderMaxZ );
tessellator.addVertexWithUV( d11, d12, d15, d4, d6 );
}
else
@@ -363,22 +363,22 @@ public class RenderBlocksWorkaround extends RenderBlocks
}
else
{
lightState.isAO = enableAO;
lightState.rXNeg = par8Icon;
saveAO( lightState.aoXNeg, lightState.foXNeg );
lightState.bXNeg = getCurrentBrightness();
this.lightState.isAO = this.enableAO;
this.lightState.rXNeg = par8Icon;
this.saveAO( this.lightState.aoXNeg, this.lightState.foXNeg );
this.lightState.bXNeg = this.getCurrentBrightness();
}
}
@Override
public void renderFaceXPos(Block par1Block, double par2, double par4, double par6, IIcon par8Icon)
{
if ( faces.contains( ForgeDirection.EAST ) )
if ( this.faces.contains( ForgeDirection.EAST ) )
{
if ( !renderFaces.contains( ForgeDirection.EAST ) )
if ( !this.renderFaces.contains( ForgeDirection.EAST ) )
return;
if ( isFacade )
if ( this.isFacade )
{
Tessellator tessellator = Tessellator.instance;
@@ -395,13 +395,13 @@ public class RenderBlocksWorkaround extends RenderBlocks
if ( this.enableAO )
{
partialLightingColoring( 1.0 - renderMinY, renderMaxZ );
this.partialLightingColoring( 1.0 - this.renderMinY, this.renderMaxZ );
tessellator.addVertexWithUV( d11, d12, d15, d4, d6 );
partialLightingColoring( 1.0 - renderMinY, renderMinZ );
this.partialLightingColoring( 1.0 - this.renderMinY, this.renderMinZ );
tessellator.addVertexWithUV( d11, d12, d14, d3, d6 );
partialLightingColoring( 1.0 - renderMaxY, renderMinZ );
this.partialLightingColoring( 1.0 - this.renderMaxY, this.renderMinZ );
tessellator.addVertexWithUV( d11, d13, d14, d3, d5 );
partialLightingColoring( 1.0 - renderMaxY, renderMaxZ );
this.partialLightingColoring( 1.0 - this.renderMaxY, this.renderMaxZ );
tessellator.addVertexWithUV( d11, d13, d15, d4, d5 );
}
else
@@ -417,50 +417,50 @@ public class RenderBlocksWorkaround extends RenderBlocks
}
else
{
lightState.isAO = enableAO;
lightState.rXPos = par8Icon;
saveAO( lightState.aoXPos, lightState.foXPos );
lightState.bXPos = getCurrentBrightness();
this.lightState.isAO = this.enableAO;
this.lightState.rXPos = par8Icon;
this.saveAO( this.lightState.aoXPos, this.lightState.foXPos );
this.lightState.bXPos = this.getCurrentBrightness();
}
}
private void partialLightingColoring(double u, double v)
{
double rA = colorRedTopLeft * u + (1.0 - u) * colorRedTopRight;
double rB = colorRedBottomLeft * u + (1.0 - u) * colorRedBottomRight;
double rA = this.colorRedTopLeft * u + (1.0 - u) * this.colorRedTopRight;
double rB = this.colorRedBottomLeft * u + (1.0 - u) * this.colorRedBottomRight;
float r = (float) (rA * v + rB * (1.0 - v));
double gA = colorGreenTopLeft * u + (1.0 - u) * colorGreenTopRight;
double gB = colorGreenBottomLeft * u + (1.0 - u) * colorGreenBottomRight;
double gA = this.colorGreenTopLeft * u + (1.0 - u) * this.colorGreenTopRight;
double gB = this.colorGreenBottomLeft * u + (1.0 - u) * this.colorGreenBottomRight;
float g = (float) (gA * v + gB * (1.0 - v));
double bA = colorBlueTopLeft * u + (1.0 - u) * colorBlueTopRight;
double bB = colorBlueBottomLeft * u + (1.0 - u) * colorBlueBottomRight;
double bA = this.colorBlueTopLeft * u + (1.0 - u) * this.colorBlueTopRight;
double bB = this.colorBlueBottomLeft * u + (1.0 - u) * this.colorBlueBottomRight;
float b = (float) (bA * v + bB * (1.0 - v));
double highA = (brightnessTopLeft >> 16 & 255) * u + (1.0 - u) * (brightnessTopRight >> 16 & 255);
double highB = (brightnessBottomLeft >> 16 & 255) * u + (1.0 - u) * (brightnessBottomRight >> 16 & 255);
double highA = (this.brightnessTopLeft >> 16 & 255) * u + (1.0 - u) * (this.brightnessTopRight >> 16 & 255);
double highB = (this.brightnessBottomLeft >> 16 & 255) * u + (1.0 - u) * (this.brightnessBottomRight >> 16 & 255);
int high = ((int) (highA * v + highB * (1.0 - v))) & 255;
double lowA = ((brightnessTopLeft & 255)) * u + (1.0 - u) * ((brightnessTopRight & 255));
double lowB = ((brightnessBottomLeft & 255)) * u + (1.0 - u) * ((brightnessBottomRight & 255));
double lowA = ((this.brightnessTopLeft & 255)) * u + (1.0 - u) * ((this.brightnessTopRight & 255));
double lowB = ((this.brightnessBottomLeft & 255)) * u + (1.0 - u) * ((this.brightnessBottomRight & 255));
int low = ((int) (lowA * v + lowB * (1.0 - v))) & 255;
int out = (high << 16) | low;
Tessellator.instance.setColorRGBA_F( r, g, b, opacity );
Tessellator.instance.setColorRGBA_F( r, g, b, this.opacity );
Tessellator.instance.setBrightness( out );
}
@Override
public void renderFaceYNeg(Block par1Block, double par2, double par4, double par6, IIcon par8Icon)
{
if ( faces.contains( ForgeDirection.DOWN ) )
if ( this.faces.contains( ForgeDirection.DOWN ) )
{
if ( !renderFaces.contains( ForgeDirection.DOWN ) )
if ( !this.renderFaces.contains( ForgeDirection.DOWN ) )
return;
if ( isFacade )
if ( this.isFacade )
{
Tessellator tessellator = Tessellator.instance;
@@ -477,13 +477,13 @@ public class RenderBlocksWorkaround extends RenderBlocks
if ( this.enableAO )
{
partialLightingColoring( 1.0 - renderMinX, renderMaxZ );
this.partialLightingColoring( 1.0 - this.renderMinX, this.renderMaxZ );
tessellator.addVertexWithUV( d11, d13, d15, d3, d6 );
partialLightingColoring( 1.0 - renderMinX, renderMinZ );
this.partialLightingColoring( 1.0 - this.renderMinX, this.renderMinZ );
tessellator.addVertexWithUV( d11, d13, d14, d3, d5 );
partialLightingColoring( 1.0 - renderMaxX, renderMinZ );
this.partialLightingColoring( 1.0 - this.renderMaxX, this.renderMinZ );
tessellator.addVertexWithUV( d12, d13, d14, d4, d5 );
partialLightingColoring( 1.0 - renderMaxX, renderMaxZ );
this.partialLightingColoring( 1.0 - this.renderMaxX, this.renderMaxZ );
tessellator.addVertexWithUV( d12, d13, d15, d4, d6 );
}
else
@@ -499,22 +499,22 @@ public class RenderBlocksWorkaround extends RenderBlocks
}
else
{
lightState.isAO = enableAO;
lightState.rYNeg = par8Icon;
saveAO( lightState.aoYNeg, lightState.foYNeg );
lightState.bYNeg = getCurrentBrightness();
this.lightState.isAO = this.enableAO;
this.lightState.rYNeg = par8Icon;
this.saveAO( this.lightState.aoYNeg, this.lightState.foYNeg );
this.lightState.bYNeg = this.getCurrentBrightness();
}
}
@Override
public void renderFaceYPos(Block par1Block, double par2, double par4, double par6, IIcon par8Icon)
{
if ( faces.contains( ForgeDirection.UP ) )
if ( this.faces.contains( ForgeDirection.UP ) )
{
if ( !renderFaces.contains( ForgeDirection.UP ) )
if ( !this.renderFaces.contains( ForgeDirection.UP ) )
return;
if ( isFacade )
if ( this.isFacade )
{
Tessellator tessellator = Tessellator.instance;
@@ -531,13 +531,13 @@ public class RenderBlocksWorkaround extends RenderBlocks
if ( this.enableAO )
{
partialLightingColoring( this.renderMaxX, renderMaxZ );
this.partialLightingColoring( this.renderMaxX, this.renderMaxZ );
tessellator.addVertexWithUV( d12, d13, d15, d4, d6 );
partialLightingColoring( this.renderMaxX, renderMinZ );
this.partialLightingColoring( this.renderMaxX, this.renderMinZ );
tessellator.addVertexWithUV( d12, d13, d14, d4, d5 );
partialLightingColoring( this.renderMinX, renderMinZ );
this.partialLightingColoring( this.renderMinX, this.renderMinZ );
tessellator.addVertexWithUV( d11, d13, d14, d3, d5 );
partialLightingColoring( this.renderMinX, renderMaxZ );
this.partialLightingColoring( this.renderMinX, this.renderMaxZ );
tessellator.addVertexWithUV( d11, d13, d15, d3, d6 );
}
else
@@ -553,22 +553,22 @@ public class RenderBlocksWorkaround extends RenderBlocks
}
else
{
lightState.isAO = enableAO;
lightState.rYPos = par8Icon;
saveAO( lightState.aoYPos, lightState.foYPos );
lightState.bYPos = getCurrentBrightness();
this.lightState.isAO = this.enableAO;
this.lightState.rYPos = par8Icon;
this.saveAO( this.lightState.aoYPos, this.lightState.foYPos );
this.lightState.bYPos = this.getCurrentBrightness();
}
}
@Override
public void renderFaceZNeg(Block par1Block, double par2, double par4, double par6, IIcon par8Icon)
{
if ( faces.contains( ForgeDirection.NORTH ) )
if ( this.faces.contains( ForgeDirection.NORTH ) )
{
if ( !renderFaces.contains( ForgeDirection.NORTH ) )
if ( !this.renderFaces.contains( ForgeDirection.NORTH ) )
return;
if ( isFacade )
if ( this.isFacade )
{
Tessellator tessellator = Tessellator.instance;
@@ -585,13 +585,13 @@ public class RenderBlocksWorkaround extends RenderBlocks
if ( this.enableAO )
{
partialLightingColoring( renderMaxY, 1.0 - renderMinX );
this.partialLightingColoring( this.renderMaxY, 1.0 - this.renderMinX );
tessellator.addVertexWithUV( d11, d14, d15, d3, d5 );
partialLightingColoring( renderMaxY, 1.0 - renderMaxX );
this.partialLightingColoring( this.renderMaxY, 1.0 - this.renderMaxX );
tessellator.addVertexWithUV( d12, d14, d15, d4, d5 );
partialLightingColoring( renderMinY, 1.0 - renderMaxX );
this.partialLightingColoring( this.renderMinY, 1.0 - this.renderMaxX );
tessellator.addVertexWithUV( d12, d13, d15, d4, d6 );
partialLightingColoring( renderMinY, 1.0 - renderMinX );
this.partialLightingColoring( this.renderMinY, 1.0 - this.renderMinX );
tessellator.addVertexWithUV( d11, d13, d15, d3, d6 );
}
else
@@ -607,22 +607,22 @@ public class RenderBlocksWorkaround extends RenderBlocks
}
else
{
lightState.isAO = enableAO;
lightState.rZNeg = par8Icon;
saveAO( lightState.aoZNeg, lightState.foZNeg );
lightState.bZNeg = getCurrentBrightness();
this.lightState.isAO = this.enableAO;
this.lightState.rZNeg = par8Icon;
this.saveAO( this.lightState.aoZNeg, this.lightState.foZNeg );
this.lightState.bZNeg = this.getCurrentBrightness();
}
}
@Override
public void renderFaceZPos(Block par1Block, double par2, double par4, double par6, IIcon par8Icon)
{
if ( faces.contains( ForgeDirection.SOUTH ) )
if ( this.faces.contains( ForgeDirection.SOUTH ) )
{
if ( !renderFaces.contains( ForgeDirection.SOUTH ) )
if ( !this.renderFaces.contains( ForgeDirection.SOUTH ) )
return;
if ( isFacade )
if ( this.isFacade )
{
Tessellator tessellator = Tessellator.instance;
@@ -639,13 +639,13 @@ public class RenderBlocksWorkaround extends RenderBlocks
if ( this.enableAO )
{
partialLightingColoring( 1.0 - renderMinX, renderMaxY );
this.partialLightingColoring( 1.0 - this.renderMinX, this.renderMaxY );
tessellator.addVertexWithUV( d11, d14, d15, d3, d5 );
partialLightingColoring( 1.0 - renderMinX, renderMinY );
this.partialLightingColoring( 1.0 - this.renderMinX, this.renderMinY );
tessellator.addVertexWithUV( d11, d13, d15, d3, d6 );
partialLightingColoring( 1.0 - renderMaxX, renderMinY );
this.partialLightingColoring( 1.0 - this.renderMaxX, this.renderMinY );
tessellator.addVertexWithUV( d12, d13, d15, d4, d6 );
partialLightingColoring( 1.0 - renderMaxX, renderMaxY );
this.partialLightingColoring( 1.0 - this.renderMaxX, this.renderMaxY );
tessellator.addVertexWithUV( d12, d14, d15, d4, d5 );
}
else
@@ -661,16 +661,16 @@ public class RenderBlocksWorkaround extends RenderBlocks
}
else
{
lightState.isAO = enableAO;
lightState.rZPos = par8Icon;
saveAO( lightState.aoZPos, lightState.foZPos );
lightState.bZPos = getCurrentBrightness();
this.lightState.isAO = this.enableAO;
this.lightState.rZPos = par8Icon;
this.saveAO( this.lightState.aoZPos, this.lightState.foZPos );
this.lightState.bZPos = this.getCurrentBrightness();
}
}
public boolean similarLighting(Block blk, IBlockAccess w, int x, int y, int z, ISimplifiedBundle sim)
{
int lh = getLightingHash( blk, w, x, y, z );
int lh = this.getLightingHash( blk, w, x, y, z );
return ((LightingCache) sim).lightHash == lh;
}
@@ -686,19 +686,19 @@ public class RenderBlocksWorkaround extends RenderBlocks
for (int k = -1; k <= 1; k++)
{
lightHashTmp[o++] = blk.getMixedBrightnessForBlock( this.blockAccess, x + i, y + j, z + k );
this.lightHashTmp[o++] = blk.getMixedBrightnessForBlock( this.blockAccess, x + i, y + j, z + k );
}
return Arrays.hashCode( lightHashTmp );
return Arrays.hashCode( this.lightHashTmp );
}
public void populate(ISimplifiedBundle sim)
{
lightState = new LightingCache( (LightingCache) sim );
this.lightState = new LightingCache( (LightingCache) sim );
}
public ISimplifiedBundle getLightingCache()
{
return new LightingCache( lightState );
return new LightingCache( this.lightState );
}
}
@@ -40,22 +40,22 @@ public class SpatialSkyRender extends IRenderHandler
private final int dspList;
public SpatialSkyRender() {
dspList = GLAllocation.generateDisplayLists( 1 );
this.dspList = GLAllocation.generateDisplayLists( 1 );
}
@Override
public void render(float partialTicks, WorldClient world, Minecraft mc)
{
long now = System.currentTimeMillis();
if ( now - cycle > 2000 )
if ( now - this.cycle > 2000 )
{
cycle = now;
GL11.glNewList( dspList, GL11.GL_COMPILE );
renderTwinkles();
this.cycle = now;
GL11.glNewList( this.dspList, GL11.GL_COMPILE );
this.renderTwinkles();
GL11.glEndList();
}
float fade = now - cycle;
float fade = now - this.cycle;
fade /= 1000;
fade = 0.15f * (1.0f - Math.abs( (fade - 1.0f) * (fade - 1.0f) ));
@@ -124,7 +124,7 @@ public class SpatialSkyRender extends IRenderHandler
GL11.glDepthMask( false );
GL11.glColor4f( fade, fade, fade, 1.0f );
GL11.glCallList( dspList );
GL11.glCallList( this.dspList );
}
GL11.glPopAttrib();
@@ -139,10 +139,10 @@ public class SpatialSkyRender extends IRenderHandler
for (int i = 0; i < 50; ++i)
{
double iX = random.nextFloat() * 2.0F - 1.0F;
double iY = random.nextFloat() * 2.0F - 1.0F;
double iZ = random.nextFloat() * 2.0F - 1.0F;
double d3 = 0.05F + random.nextFloat() * 0.1F;
double iX = this.random.nextFloat() * 2.0F - 1.0F;
double iY = this.random.nextFloat() * 2.0F - 1.0F;
double iZ = this.random.nextFloat() * 2.0F - 1.0F;
double d3 = 0.05F + this.random.nextFloat() * 0.1F;
double dist = iX * iX + iY * iY + iZ * iZ;
if ( dist < 1.0D && dist > 0.01D )
@@ -160,7 +160,7 @@ public class SpatialSkyRender extends IRenderHandler
double d11 = Math.atan2( Math.sqrt( iX * iX + iZ * iZ ), iY );
double d12 = Math.sin( d11 );
double d13 = Math.cos( d11 );
double d14 = random.nextDouble() * Math.PI * 2.0D;
double d14 = this.random.nextDouble() * Math.PI * 2.0D;
double d15 = Math.sin( d14 );
double d16 = Math.cos( d14 );
@@ -43,8 +43,8 @@ public class TESRWrapper extends TileEntitySpecialRenderer
final double MAX_DISTANCE;
public TESRWrapper(BaseBlockRender render) {
blkRender = render;
MAX_DISTANCE = blkRender.getTesrRenderDistance();
this.blkRender = render;
this.MAX_DISTANCE = this.blkRender.getTesrRenderDistance();
}
@Override
@@ -56,7 +56,7 @@ public class TESRWrapper extends TileEntitySpecialRenderer
if ( b instanceof AEBaseBlock && ((AEBaseTile) te).requiresTESR() )
{
if ( Math.abs( x ) > MAX_DISTANCE || Math.abs( y ) > MAX_DISTANCE || Math.abs( z ) > MAX_DISTANCE )
if ( Math.abs( x ) > this.MAX_DISTANCE || Math.abs( y ) > this.MAX_DISTANCE || Math.abs( z ) > this.MAX_DISTANCE )
return;
Tessellator tess = Tessellator.instance;
@@ -69,8 +69,8 @@ public class TESRWrapper extends TileEntitySpecialRenderer
GL11.glPushMatrix();
GL11.glPushAttrib( GL11.GL_ALL_ATTRIB_BITS );
renderBlocksInstance.blockAccess = te.getWorldObj();
blkRender.renderTile( (AEBaseBlock) b, (AEBaseTile) te, tess, x, y, z, f, renderBlocksInstance );
this.renderBlocksInstance.blockAccess = te.getWorldObj();
this.blkRender.renderTile( (AEBaseBlock) b, (AEBaseTile) te, tess, x, y, z, f, this.renderBlocksInstance );
if ( Platform.isDrawing( tess ) )
throw new RuntimeException( "Error during rendering." );
@@ -45,7 +45,7 @@ public class WorldRender implements ISimpleBlockRenderingHandler
void setRender(AEBaseBlock in, BaseBlockRender r)
{
blockRenders.put( in, r );
this.blockRenders.put( in, r );
}
private WorldRender() {
@@ -62,7 +62,7 @@ public class WorldRender implements ISimpleBlockRenderingHandler
{
AEBaseBlock blk = (AEBaseBlock) block;
renderer.setRenderBoundsFromBlock( block );
return getRender( blk ).renderInWorld( blk, world, x, y, z, renderer );
return this.getRender( blk ).renderInWorld( blk, world, x, y, z, renderer );
}
@Override
@@ -74,7 +74,7 @@ public class WorldRender implements ISimpleBlockRenderingHandler
@Override
public int getRenderId()
{
return renderID;
return this.renderID;
}
public void renderItemBlock(ItemStack item, ItemRenderType type, Object[] data)
@@ -83,17 +83,17 @@ public class WorldRender implements ISimpleBlockRenderingHandler
if ( blk instanceof AEBaseBlock )
{
AEBaseBlock block = (AEBaseBlock) blk;
renderer.setRenderBoundsFromBlock( block );
this.renderer.setRenderBoundsFromBlock( block );
renderer.uvRotateBottom = renderer.uvRotateEast = renderer.uvRotateNorth = renderer.uvRotateSouth = renderer.uvRotateTop = renderer.uvRotateWest = 0;
getRender( block ).renderInventory( block, item, renderer, type, data );
renderer.uvRotateBottom = renderer.uvRotateEast = renderer.uvRotateNorth = renderer.uvRotateSouth = renderer.uvRotateTop = renderer.uvRotateWest = 0;
this.renderer.uvRotateBottom = this.renderer.uvRotateEast = this.renderer.uvRotateNorth = this.renderer.uvRotateSouth = this.renderer.uvRotateTop = this.renderer.uvRotateWest = 0;
this.getRender( block ).renderInventory( block, item, this.renderer, type, data );
this.renderer.uvRotateBottom = this.renderer.uvRotateEast = this.renderer.uvRotateNorth = this.renderer.uvRotateSouth = this.renderer.uvRotateTop = this.renderer.uvRotateWest = 0;
}
else
{
if ( !hasError )
if ( !this.hasError )
{
hasError = true;
this.hasError = true;
AELog.severe( "Invalid render - item/block mismatch" );
AELog.severe( " item: " + item.getUnlocalizedName() );
AELog.severe( " block: " + blk.getUnlocalizedName() );
@@ -80,42 +80,42 @@ public class RenderBlockAssembler extends BaseBlockRender implements IBoxProvide
{
IIcon texture = null;
block.getRendererInstance().setTemporaryRenderIcon( texture = getConnectedCable( world, x, y, z, ForgeDirection.WEST, covered ) );
block.getRendererInstance().setTemporaryRenderIcon( texture = this.getConnectedCable( world, x, y, z, ForgeDirection.WEST, covered ) );
if ( texture != null )
{
renderer.setRenderBounds( 0.0D, 0.5D - Thickness, 0.5D - Thickness, 0.5D - Thickness - pull, 0.5D + Thickness, 0.5D + Thickness );
renderer.renderStandardBlock( block, x, y, z );
}
block.getRendererInstance().setTemporaryRenderIcon( texture = getConnectedCable( world, x, y, z, ForgeDirection.EAST, covered ) );
block.getRendererInstance().setTemporaryRenderIcon( texture = this.getConnectedCable( world, x, y, z, ForgeDirection.EAST, covered ) );
if ( texture != null )
{
renderer.setRenderBounds( 0.5D + Thickness + pull, 0.5D - Thickness, 0.5D - Thickness, 1.0D, 0.5D + Thickness, 0.5D + Thickness );
renderer.renderStandardBlock( block, x, y, z );
}
block.getRendererInstance().setTemporaryRenderIcon( texture = getConnectedCable( world, x, y, z, ForgeDirection.NORTH, covered ) );
block.getRendererInstance().setTemporaryRenderIcon( texture = this.getConnectedCable( world, x, y, z, ForgeDirection.NORTH, covered ) );
if ( texture != null )
{
renderer.setRenderBounds( 0.5D - Thickness, 0.5D - Thickness, 0.0D, 0.5D + Thickness, 0.5D + Thickness, 0.5D - Thickness - pull );
renderer.renderStandardBlock( block, x, y, z );
}
block.getRendererInstance().setTemporaryRenderIcon( texture = getConnectedCable( world, x, y, z, ForgeDirection.SOUTH, covered ) );
block.getRendererInstance().setTemporaryRenderIcon( texture = this.getConnectedCable( world, x, y, z, ForgeDirection.SOUTH, covered ) );
if ( texture != null )
{
renderer.setRenderBounds( 0.5D - Thickness, 0.5D - Thickness, 0.5D + Thickness + pull, 0.5D + Thickness, 0.5D + Thickness, 1.0D );
renderer.renderStandardBlock( block, x, y, z );
}
block.getRendererInstance().setTemporaryRenderIcon( texture = getConnectedCable( world, x, y, z, ForgeDirection.DOWN, covered ) );
block.getRendererInstance().setTemporaryRenderIcon( texture = this.getConnectedCable( world, x, y, z, ForgeDirection.DOWN, covered ) );
if ( texture != null )
{
renderer.setRenderBounds( 0.5D - Thickness, 0.0D, 0.5D - Thickness, 0.5D + Thickness, 0.5D - Thickness - pull, 0.5D + Thickness );
renderer.renderStandardBlock( block, x, y, z );
}
block.getRendererInstance().setTemporaryRenderIcon( texture = getConnectedCable( world, x, y, z, ForgeDirection.UP, covered ) );
block.getRendererInstance().setTemporaryRenderIcon( texture = this.getConnectedCable( world, x, y, z, ForgeDirection.UP, covered ) );
if ( texture != null )
{
renderer.setRenderBounds( 0.5D - Thickness, 0.5D + Thickness + pull, 0.5D - Thickness, 0.5D + Thickness, 1.0D, 0.5D + Thickness );
@@ -134,44 +134,44 @@ public class RenderBlockAssembler extends BaseBlockRender implements IBoxProvide
{
renderer.setOverrideBlockTexture( blk.getIcon( 0, 0 ) );
setInvRenderBounds( renderer, 2, 14, 0, 14, 16, 2 );
renderInvBlock( EnumSet.allOf( ForgeDirection.class ), blk, is, Tessellator.instance, 0xffffff, renderer );
this.setInvRenderBounds( renderer, 2, 14, 0, 14, 16, 2 );
this.renderInvBlock( EnumSet.allOf( ForgeDirection.class ), blk, is, Tessellator.instance, 0xffffff, renderer );
setInvRenderBounds( renderer, 0, 14, 2, 2, 16, 14 );
renderInvBlock( EnumSet.allOf( ForgeDirection.class ), blk, is, Tessellator.instance, 0xffffff, renderer );
this.setInvRenderBounds( renderer, 0, 14, 2, 2, 16, 14 );
this.renderInvBlock( EnumSet.allOf( ForgeDirection.class ), blk, is, Tessellator.instance, 0xffffff, renderer );
setInvRenderBounds( renderer, 2, 0, 14, 14, 2, 16 );
renderInvBlock( EnumSet.allOf( ForgeDirection.class ), blk, is, Tessellator.instance, 0xffffff, renderer );
this.setInvRenderBounds( renderer, 2, 0, 14, 14, 2, 16 );
this.renderInvBlock( EnumSet.allOf( ForgeDirection.class ), blk, is, Tessellator.instance, 0xffffff, renderer );
setInvRenderBounds( renderer, 14, 0, 2, 16, 2, 14 );
renderInvBlock( EnumSet.allOf( ForgeDirection.class ), blk, is, Tessellator.instance, 0xffffff, renderer );
this.setInvRenderBounds( renderer, 14, 0, 2, 16, 2, 14 );
this.renderInvBlock( EnumSet.allOf( ForgeDirection.class ), blk, is, Tessellator.instance, 0xffffff, renderer );
setInvRenderBounds( renderer, 0, 0, 0, 16, 2, 2 );
renderInvBlock( EnumSet.allOf( ForgeDirection.class ), blk, is, Tessellator.instance, 0xffffff, renderer );
this.setInvRenderBounds( renderer, 0, 0, 0, 16, 2, 2 );
this.renderInvBlock( EnumSet.allOf( ForgeDirection.class ), blk, is, Tessellator.instance, 0xffffff, renderer );
setInvRenderBounds( renderer, 0, 2, 0, 2, 16, 2 );
renderInvBlock( EnumSet.allOf( ForgeDirection.class ), blk, is, Tessellator.instance, 0xffffff, renderer );
this.setInvRenderBounds( renderer, 0, 2, 0, 2, 16, 2 );
this.renderInvBlock( EnumSet.allOf( ForgeDirection.class ), blk, is, Tessellator.instance, 0xffffff, renderer );
setInvRenderBounds( renderer, 0, 0, 2, 2, 2, 16 );
renderInvBlock( EnumSet.allOf( ForgeDirection.class ), blk, is, Tessellator.instance, 0xffffff, renderer );
this.setInvRenderBounds( renderer, 0, 0, 2, 2, 2, 16 );
this.renderInvBlock( EnumSet.allOf( ForgeDirection.class ), blk, is, Tessellator.instance, 0xffffff, renderer );
setInvRenderBounds( renderer, 0, 14, 14, 16, 16, 16 );
renderInvBlock( EnumSet.allOf( ForgeDirection.class ), blk, is, Tessellator.instance, 0xffffff, renderer );
this.setInvRenderBounds( renderer, 0, 14, 14, 16, 16, 16 );
this.renderInvBlock( EnumSet.allOf( ForgeDirection.class ), blk, is, Tessellator.instance, 0xffffff, renderer );
setInvRenderBounds( renderer, 14, 0, 14, 16, 14, 16 );
renderInvBlock( EnumSet.allOf( ForgeDirection.class ), blk, is, Tessellator.instance, 0xffffff, renderer );
this.setInvRenderBounds( renderer, 14, 0, 14, 16, 14, 16 );
this.renderInvBlock( EnumSet.allOf( ForgeDirection.class ), blk, is, Tessellator.instance, 0xffffff, renderer );
setInvRenderBounds( renderer, 14, 14, 0, 16, 16, 14 );
renderInvBlock( EnumSet.allOf( ForgeDirection.class ), blk, is, Tessellator.instance, 0xffffff, renderer );
this.setInvRenderBounds( renderer, 14, 14, 0, 16, 16, 14 );
this.renderInvBlock( EnumSet.allOf( ForgeDirection.class ), blk, is, Tessellator.instance, 0xffffff, renderer );
setInvRenderBounds( renderer, 14, 2, 0, 16, 14, 2 );
renderInvBlock( EnumSet.allOf( ForgeDirection.class ), blk, is, Tessellator.instance, 0xffffff, renderer );
this.setInvRenderBounds( renderer, 14, 2, 0, 16, 14, 2 );
this.renderInvBlock( EnumSet.allOf( ForgeDirection.class ), blk, is, Tessellator.instance, 0xffffff, renderer );
setInvRenderBounds( renderer, 0, 2, 14, 2, 14, 16 );
renderInvBlock( EnumSet.allOf( ForgeDirection.class ), blk, is, Tessellator.instance, 0xffffff, renderer );
this.setInvRenderBounds( renderer, 0, 2, 14, 2, 14, 16 );
this.renderInvBlock( EnumSet.allOf( ForgeDirection.class ), blk, is, Tessellator.instance, 0xffffff, renderer );
setInvRenderBounds( renderer, 1, 1, 1, 15, 15, 15 );
renderInvBlock( EnumSet.allOf( ForgeDirection.class ), blk, is, Tessellator.instance, 0xffffff, renderer );
this.setInvRenderBounds( renderer, 1, 1, 1, 15, 15, 15 );
this.renderInvBlock( EnumSet.allOf( ForgeDirection.class ), blk, is, Tessellator.instance, 0xffffff, renderer );
renderer.setOverrideBlockTexture( null );
}
@@ -186,7 +186,7 @@ public class RenderBlockAssembler extends BaseBlockRender implements IBoxProvide
{
if ( tma.isPowered() )
{
renderBlockBounds( renderer, 1, 1, 1, 15, 15, 15, ForgeDirection.WEST, ForgeDirection.UP, ForgeDirection.SOUTH );
this.renderBlockBounds( renderer, 1, 1, 1, 15, 15, 15, ForgeDirection.WEST, ForgeDirection.UP, ForgeDirection.SOUTH );
TaughtIcon lights = new TaughtIcon( ExtraBlockTextures.BlockMolecularAssemblerLights.getIcon(), -2.0f );
Tessellator.instance.setColorRGBA_F( 1, 1, 1, 0.3f );
Tessellator.instance.setBrightness( 14 << 20 | 14 << 4 );
@@ -204,12 +204,12 @@ public class RenderBlockAssembler extends BaseBlockRender implements IBoxProvide
BusRenderer.instance.renderer.blockAccess = renderer.blockAccess;
renderer = BusRenderer.instance.renderer;
preRenderInWorld( block, world, x, y, z, renderer );
this.preRenderInWorld( block, world, x, y, z, renderer );
tma.lightCache = BusRenderHelper.instance.useSimplifiedRendering( x, y, z, this, tma.lightCache );
BusRenderer.instance.renderer.isFacade = true;
IOrientable te = getOrientable( block, world, x, y, z );
IOrientable te = this.getOrientable( block, world, x, y, z );
ForgeDirection fdy = te.getUp();
ForgeDirection fdz = te.getForward();
@@ -217,49 +217,49 @@ public class RenderBlockAssembler extends BaseBlockRender implements IBoxProvide
renderer.renderAllFaces = true;
renderCableAt( 0.11D, world, x, y, z, block, renderer, 0.141D, false );
renderCableAt( 0.188D, world, x, y, z, block, renderer, 0.1875D, true );
this.renderCableAt( 0.11D, world, x, y, z, block, renderer, 0.141D, false );
this.renderCableAt( 0.188D, world, x, y, z, block, renderer, 0.1875D, true );
blk.getRendererInstance().setTemporaryRenderIcon( blk.getIcon( 0, 0 ) );
renderBlockBounds( renderer, 2, 14, 0, 14, 16, 2, fdx, fdy, fdz );
this.renderBlockBounds( renderer, 2, 14, 0, 14, 16, 2, fdx, fdy, fdz );
renderer.renderStandardBlock( blk, x, y, z );
renderBlockBounds( renderer, 0, 14, 2, 2, 16, 14, fdx, fdy, fdz );
this.renderBlockBounds( renderer, 0, 14, 2, 2, 16, 14, fdx, fdy, fdz );
renderer.renderStandardBlock( blk, x, y, z );
renderBlockBounds( renderer, 2, 0, 14, 14, 2, 16, fdx, fdy, fdz );
this.renderBlockBounds( renderer, 2, 0, 14, 14, 2, 16, fdx, fdy, fdz );
renderer.renderStandardBlock( blk, x, y, z );
renderBlockBounds( renderer, 14, 0, 2, 16, 2, 14, fdx, fdy, fdz );
this.renderBlockBounds( renderer, 14, 0, 2, 16, 2, 14, fdx, fdy, fdz );
renderer.renderStandardBlock( blk, x, y, z );
// sides...
renderBlockBounds( renderer, 0, 0, 0, 16, 2, 2, fdx, fdy, fdz );
this.renderBlockBounds( renderer, 0, 0, 0, 16, 2, 2, fdx, fdy, fdz );
renderer.renderStandardBlock( blk, x, y, z );
renderBlockBounds( renderer, 0, 2, 0, 2, 16, 2, fdx, fdy, fdz );
this.renderBlockBounds( renderer, 0, 2, 0, 2, 16, 2, fdx, fdy, fdz );
renderer.renderStandardBlock( blk, x, y, z );
renderBlockBounds( renderer, 0, 0, 2, 2, 2, 16, fdx, fdy, fdz );
this.renderBlockBounds( renderer, 0, 0, 2, 2, 2, 16, fdx, fdy, fdz );
renderer.renderStandardBlock( blk, x, y, z );
renderBlockBounds( renderer, 0, 14, 14, 16, 16, 16, fdx, fdy, fdz );
this.renderBlockBounds( renderer, 0, 14, 14, 16, 16, 16, fdx, fdy, fdz );
renderer.renderStandardBlock( blk, x, y, z );
renderBlockBounds( renderer, 14, 0, 14, 16, 14, 16, fdx, fdy, fdz );
this.renderBlockBounds( renderer, 14, 0, 14, 16, 14, 16, fdx, fdy, fdz );
renderer.renderStandardBlock( blk, x, y, z );
renderBlockBounds( renderer, 14, 14, 0, 16, 16, 14, fdx, fdy, fdz );
this.renderBlockBounds( renderer, 14, 14, 0, 16, 16, 14, fdx, fdy, fdz );
renderer.renderStandardBlock( blk, x, y, z );
renderBlockBounds( renderer, 14, 2, 0, 16, 14, 2, fdx, fdy, fdz );
this.renderBlockBounds( renderer, 14, 2, 0, 16, 14, 2, fdx, fdy, fdz );
renderer.renderStandardBlock( blk, x, y, z );
renderBlockBounds( renderer, 0, 2, 14, 2, 14, 16, fdx, fdy, fdz );
this.renderBlockBounds( renderer, 0, 2, 14, 2, 14, 16, fdx, fdy, fdz );
renderer.renderStandardBlock( blk, x, y, z );
renderBlockBounds( renderer, 1, 1, 1, 15, 15, 15, fdx, fdy, fdz );
this.renderBlockBounds( renderer, 1, 1, 1, 15, 15, 15, fdx, fdy, fdz );
renderer.renderStandardBlock( blk, x, y, z );
BusRenderHelper.instance.normalRendering();
@@ -269,7 +269,7 @@ public class RenderBlockAssembler extends BaseBlockRender implements IBoxProvide
renderer.renderAllFaces = false;
BusRenderer.instance.renderer.isFacade = false;
postRenderInWorld( renderer );
this.postRenderInWorld( renderer );
return true;
}
@@ -55,26 +55,26 @@ public class RenderBlockCharger extends BaseBlockRender
Tessellator tess = Tessellator.instance;
renderer.renderAllFaces = true;
setInvRenderBounds( renderer, 6, 1, 0, 10, 15, 2 );
renderInvBlock( EnumSet.allOf( ForgeDirection.class ), blk, is, tess, 0xffffff, renderer );
this.setInvRenderBounds( renderer, 6, 1, 0, 10, 15, 2 );
this.renderInvBlock( EnumSet.allOf( ForgeDirection.class ), blk, is, tess, 0xffffff, renderer );
blk.getRendererInstance().setTemporaryRenderIcons( ExtraBlockTextures.BlockChargerInside.getIcon(), null, null, null, null, null );
setInvRenderBounds( renderer, 2, 0, 2, 14, 3, 14 );
renderInvBlock( EnumSet.allOf( ForgeDirection.class ), blk, is, tess, 0xffffff, renderer );
this.setInvRenderBounds( renderer, 2, 0, 2, 14, 3, 14 );
this.renderInvBlock( EnumSet.allOf( ForgeDirection.class ), blk, is, tess, 0xffffff, renderer );
setInvRenderBounds( renderer, 3, 3, 3, 13, 4, 13 );
renderInvBlock( EnumSet.allOf( ForgeDirection.class ), blk, is, tess, 0xffffff, renderer );
this.setInvRenderBounds( renderer, 3, 3, 3, 13, 4, 13 );
this.renderInvBlock( EnumSet.allOf( ForgeDirection.class ), blk, is, tess, 0xffffff, renderer );
blk.getRendererInstance().setTemporaryRenderIcon( null );
blk.getRendererInstance().setTemporaryRenderIcons( null, ExtraBlockTextures.BlockChargerInside.getIcon(), null, null, null, null );
setInvRenderBounds( renderer, 2, 13, 2, 14, 16, 14 );
renderInvBlock( EnumSet.allOf( ForgeDirection.class ), blk, is, tess, 0xffffff, renderer );
this.setInvRenderBounds( renderer, 2, 13, 2, 14, 16, 14 );
this.renderInvBlock( EnumSet.allOf( ForgeDirection.class ), blk, is, tess, 0xffffff, renderer );
setInvRenderBounds( renderer, 3, 12, 3, 13, 13, 13 );
renderInvBlock( EnumSet.allOf( ForgeDirection.class ), blk, is, tess, 0xffffff, renderer );
this.setInvRenderBounds( renderer, 3, 12, 3, 13, 13, 13 );
this.renderInvBlock( EnumSet.allOf( ForgeDirection.class ), blk, is, tess, 0xffffff, renderer );
renderer.renderAllFaces = false;
blk.getRendererInstance().setTemporaryRenderIcon( null );
@@ -84,42 +84,42 @@ public class RenderBlockCharger extends BaseBlockRender
@Override
public boolean renderInWorld(AEBaseBlock block, IBlockAccess world, int x, int y, int z, RenderBlocks renderer)
{
preRenderInWorld( block, world, x, y, z, renderer );
this.preRenderInWorld( block, world, x, y, z, renderer );
BlockCharger blk = (BlockCharger) block;
IOrientable te = getOrientable( block, world, x, y, z );
IOrientable te = this.getOrientable( block, world, x, y, z );
ForgeDirection fdy = te.getUp();
ForgeDirection fdz = te.getForward();
ForgeDirection fdx = Platform.crossProduct( fdz, fdy ).getOpposite();
renderer.renderAllFaces = true;
renderBlockBounds( renderer, 6, 1, 0, 10, 15, 2, fdx, fdy, fdz );
this.renderBlockBounds( renderer, 6, 1, 0, 10, 15, 2, fdx, fdy, fdz );
boolean out = renderer.renderStandardBlock( blk, x, y, z );
blk.getRendererInstance().setTemporaryRenderIcons( ExtraBlockTextures.BlockChargerInside.getIcon(), null, null, null, null, null );
renderBlockBounds( renderer, 2, 0, 2, 14, 3, 14, fdx, fdy, fdz );
this.renderBlockBounds( renderer, 2, 0, 2, 14, 3, 14, fdx, fdy, fdz );
out = renderer.renderStandardBlock( blk, x, y, z );
renderBlockBounds( renderer, 3, 3, 3, 13, 4, 13, fdx, fdy, fdz );
this.renderBlockBounds( renderer, 3, 3, 3, 13, 4, 13, fdx, fdy, fdz );
out = renderer.renderStandardBlock( blk, x, y, z );
blk.getRendererInstance().setTemporaryRenderIcon( null );
blk.getRendererInstance().setTemporaryRenderIcons( null, ExtraBlockTextures.BlockChargerInside.getIcon(), null, null, null, null );
renderBlockBounds( renderer, 2, 13, 2, 14, 16, 14, fdx, fdy, fdz );
this.renderBlockBounds( renderer, 2, 13, 2, 14, 16, 14, fdx, fdy, fdz );
out = renderer.renderStandardBlock( blk, x, y, z );
renderBlockBounds( renderer, 3, 12, 3, 13, 13, 13, fdx, fdy, fdz );
this.renderBlockBounds( renderer, 3, 12, 3, 13, 13, 13, fdx, fdy, fdz );
out = renderer.renderStandardBlock( blk, x, y, z );
renderer.renderAllFaces = false;
blk.getRendererInstance().setTemporaryRenderIcon( null );
postRenderInWorld( renderer );
this.postRenderInWorld( renderer );
return out;
}
@@ -133,7 +133,7 @@ public class RenderBlockCharger extends BaseBlockRender
if ( sis != null )
{
GL11.glPushMatrix();
applyTESRRotation( x, y, z, tile.getForward(), tile.getUp() );
this.applyTESRRotation( x, y, z, tile.getForward(), tile.getUp() );
try
{
@@ -160,7 +160,7 @@ public class RenderBlockCharger extends BaseBlockRender
GL11.glDisable( GL12.GL_RESCALE_NORMAL );
tess.setColorOpaque_F( 1.0f, 1.0f, 1.0f );
doRenderItem( sis, tile );
this.doRenderItem( sis, tile );
}
catch (Exception err)
{
@@ -38,9 +38,9 @@ public class RenderBlockController extends BaseBlockRender
public boolean renderInWorld(AEBaseBlock blk, IBlockAccess world, int x, int y, int z, RenderBlocks renderer)
{
boolean xx = getTileEntity( world, x - 1, y, z ) instanceof TileController && getTileEntity( world, x + 1, y, z ) instanceof TileController;
boolean yy = getTileEntity( world, x, y - 1, z ) instanceof TileController && getTileEntity( world, x, y + 1, z ) instanceof TileController;
boolean zz = getTileEntity( world, x, y, z - 1 ) instanceof TileController && getTileEntity( world, x, y, z + 1 ) instanceof TileController;
boolean xx = this.getTileEntity( world, x - 1, y, z ) instanceof TileController && this.getTileEntity( world, x + 1, y, z ) instanceof TileController;
boolean yy = this.getTileEntity( world, x, y - 1, z ) instanceof TileController && this.getTileEntity( world, x, y + 1, z ) instanceof TileController;
boolean zz = this.getTileEntity( world, x, y, z - 1 ) instanceof TileController && this.getTileEntity( world, x, y, z + 1 ) instanceof TileController;
int meta = world.getBlockMetadata( x, y, z );
boolean hasPower = meta > 0;
@@ -90,35 +90,35 @@ public class RenderBlockCraftingCPU extends BaseBlockRender
}
float highX = isConnected( w, x, y, z, ForgeDirection.EAST ) ? 16 : 13.01f;
float lowX = isConnected( w, x, y, z, ForgeDirection.WEST ) ? 0 : 2.99f;
float highX = this.isConnected( w, x, y, z, ForgeDirection.EAST ) ? 16 : 13.01f;
float lowX = this.isConnected( w, x, y, z, ForgeDirection.WEST ) ? 0 : 2.99f;
float highY = isConnected( w, x, y, z, ForgeDirection.UP ) ? 16 : 13.01f;
float lowY = isConnected( w, x, y, z, ForgeDirection.DOWN ) ? 0 : 2.99f;
float highY = this.isConnected( w, x, y, z, ForgeDirection.UP ) ? 16 : 13.01f;
float lowY = this.isConnected( w, x, y, z, ForgeDirection.DOWN ) ? 0 : 2.99f;
float highZ = isConnected( w, x, y, z, ForgeDirection.SOUTH ) ? 16 : 13.01f;
float lowZ = isConnected( w, x, y, z, ForgeDirection.NORTH ) ? 0 : 2.99f;
float highZ = this.isConnected( w, x, y, z, ForgeDirection.SOUTH ) ? 16 : 13.01f;
float lowZ = this.isConnected( w, x, y, z, ForgeDirection.NORTH ) ? 0 : 2.99f;
renderCorner( i, renderer, w, x, y, z, ForgeDirection.UP, ForgeDirection.EAST, ForgeDirection.NORTH );
renderCorner( i, renderer, w, x, y, z, ForgeDirection.UP, ForgeDirection.EAST, ForgeDirection.SOUTH );
renderCorner( i, renderer, w, x, y, z, ForgeDirection.UP, ForgeDirection.WEST, ForgeDirection.NORTH );
renderCorner( i, renderer, w, x, y, z, ForgeDirection.UP, ForgeDirection.WEST, ForgeDirection.SOUTH );
renderCorner( i, renderer, w, x, y, z, ForgeDirection.DOWN, ForgeDirection.EAST, ForgeDirection.NORTH );
renderCorner( i, renderer, w, x, y, z, ForgeDirection.DOWN, ForgeDirection.EAST, ForgeDirection.SOUTH );
renderCorner( i, renderer, w, x, y, z, ForgeDirection.DOWN, ForgeDirection.WEST, ForgeDirection.NORTH );
renderCorner( i, renderer, w, x, y, z, ForgeDirection.DOWN, ForgeDirection.WEST, ForgeDirection.SOUTH );
this.renderCorner( i, renderer, w, x, y, z, ForgeDirection.UP, ForgeDirection.EAST, ForgeDirection.NORTH );
this.renderCorner( i, renderer, w, x, y, z, ForgeDirection.UP, ForgeDirection.EAST, ForgeDirection.SOUTH );
this.renderCorner( i, renderer, w, x, y, z, ForgeDirection.UP, ForgeDirection.WEST, ForgeDirection.NORTH );
this.renderCorner( i, renderer, w, x, y, z, ForgeDirection.UP, ForgeDirection.WEST, ForgeDirection.SOUTH );
this.renderCorner( i, renderer, w, x, y, z, ForgeDirection.DOWN, ForgeDirection.EAST, ForgeDirection.NORTH );
this.renderCorner( i, renderer, w, x, y, z, ForgeDirection.DOWN, ForgeDirection.EAST, ForgeDirection.SOUTH );
this.renderCorner( i, renderer, w, x, y, z, ForgeDirection.DOWN, ForgeDirection.WEST, ForgeDirection.NORTH );
this.renderCorner( i, renderer, w, x, y, z, ForgeDirection.DOWN, ForgeDirection.WEST, ForgeDirection.SOUTH );
for (ForgeDirection side : ForgeDirection.VALID_DIRECTIONS)
{
i.setBounds( fso( side, lowX, ForgeDirection.WEST ), fso( side, lowY, ForgeDirection.DOWN ), fso( side, lowZ, ForgeDirection.NORTH ),
fso( side, highX, ForgeDirection.EAST ), fso( side, highY, ForgeDirection.UP ), fso( side, highZ, ForgeDirection.SOUTH ) );
i.setBounds( this.fso( side, lowX, ForgeDirection.WEST ), this.fso( side, lowY, ForgeDirection.DOWN ), this.fso( side, lowZ, ForgeDirection.NORTH ),
this.fso( side, highX, ForgeDirection.EAST ), this.fso( side, highY, ForgeDirection.UP ), this.fso( side, highZ, ForgeDirection.SOUTH ) );
i.prepareBounds( renderer );
boolean LocalEmit = emitsLight;
if ( blk instanceof BlockCraftingMonitor && !ct.getForward().equals( side ) )
LocalEmit = false;
handleSide( blk, meta, x, y, z, i, renderer, ct.getForward().equals( side ) ? theIcon : nonForward, LocalEmit, isMonitor, side, w );
this.handleSide( blk, meta, x, y, z, i, renderer, ct.getForward().equals( side ) ? theIcon : nonForward, LocalEmit, isMonitor, side, w );
}
BusRenderer.instance.renderer.isFacade = false;
@@ -140,15 +140,15 @@ public class RenderBlockCraftingCPU extends BaseBlockRender
private void renderCorner(BusRenderHelper i, RenderBlocks renderer, IBlockAccess w, int x, int y, int z, ForgeDirection up, ForgeDirection east,
ForgeDirection south)
{
if ( isConnected( w, x, y, z, up ) )
if ( this.isConnected( w, x, y, z, up ) )
return;
if ( isConnected( w, x, y, z, east ) )
if ( this.isConnected( w, x, y, z, east ) )
return;
if ( isConnected( w, x, y, z, south ) )
if ( this.isConnected( w, x, y, z, south ) )
return;
i.setBounds( gso( east, 3, ForgeDirection.WEST ), gso( up, 3, ForgeDirection.DOWN ), gso( south, 3, ForgeDirection.NORTH ),
gso( east, 13, ForgeDirection.EAST ), gso( up, 13, ForgeDirection.UP ), gso( south, 13, ForgeDirection.SOUTH ) );
i.setBounds( this.gso( east, 3, ForgeDirection.WEST ), this.gso( up, 3, ForgeDirection.DOWN ), this.gso( south, 3, ForgeDirection.NORTH ),
this.gso( east, 13, ForgeDirection.EAST ), this.gso( up, 13, ForgeDirection.UP ), this.gso( south, 13, ForgeDirection.SOUTH ) );
i.prepareBounds( renderer );
i.setTexture( ExtraBlockTextures.BlockCraftingUnitRing.getIcon() );
i.renderBlockCurrentBounds( x, y, z, renderer );
@@ -179,7 +179,7 @@ public class RenderBlockCraftingCPU extends BaseBlockRender
private void handleSide(AEBaseBlock blk, int meta, int x, int y, int z, BusRenderHelper i, RenderBlocks renderer, IIcon color, boolean emitsLight,
boolean isMonitor, ForgeDirection side, IBlockAccess w)
{
if ( isConnected( w, x, y, z, side ) )
if ( this.isConnected( w, x, y, z, side ) )
return;
i.setFacesToRender( EnumSet.of( side ) );
@@ -72,7 +72,7 @@ public class RenderBlockCraftingCPUMonitor extends RenderBlockCraftingCPU
{
cmt.updateList = false;
GL11.glNewList( cmt.dspList, GL11.GL_COMPILE_AND_EXECUTE );
tesrRenderScreen( tess, cmt, ais );
this.tesrRenderScreen( tess, cmt, ais );
GL11.glEndList();
}
else
@@ -79,7 +79,7 @@ public class RenderBlockCrank extends BaseBlockRender
GL11.glColor4f( 1.0f, 1.0f, 1.0f, 1.0f );
applyTESRRotation( x, y, z, tile.getForward(), tile.getUp() );
this.applyTESRRotation( x, y, z, tile.getForward(), tile.getUp() );
GL11.glTranslated( 0.5, 0, 0.5 );
GL11.glRotatef( tc.visibleRotation, 0, 1, 0 );
@@ -59,33 +59,33 @@ public class RenderBlockInscriber extends BaseBlockRender
Tessellator tess = Tessellator.instance;
renderer.renderAllFaces = true;
setInvRenderBounds( renderer, 6, 1, 0, 10, 15, 2 );
renderInvBlock( EnumSet.allOf( ForgeDirection.class ), blk, is, tess, 0xffffff, renderer );
this.setInvRenderBounds( renderer, 6, 1, 0, 10, 15, 2 );
this.renderInvBlock( EnumSet.allOf( ForgeDirection.class ), blk, is, tess, 0xffffff, renderer );
// sides...
setInvRenderBounds( renderer, 3, 1, 0, 13, 15, 3 );
renderInvBlock( EnumSet.allOf( ForgeDirection.class ), blk, is, tess, 0xffffff, renderer );
this.setInvRenderBounds( renderer, 3, 1, 0, 13, 15, 3 );
this.renderInvBlock( EnumSet.allOf( ForgeDirection.class ), blk, is, tess, 0xffffff, renderer );
setInvRenderBounds( renderer, 0, 1, 0, 3, 15, 16 );
renderInvBlock( EnumSet.allOf( ForgeDirection.class ), blk, is, tess, 0xffffff, renderer );
this.setInvRenderBounds( renderer, 0, 1, 0, 3, 15, 16 );
this.renderInvBlock( EnumSet.allOf( ForgeDirection.class ), blk, is, tess, 0xffffff, renderer );
setInvRenderBounds( renderer, 13, 1, 0, 16, 15, 16 );
renderInvBlock( EnumSet.allOf( ForgeDirection.class ), blk, is, tess, 0xffffff, renderer );
this.setInvRenderBounds( renderer, 13, 1, 0, 16, 15, 16 );
this.renderInvBlock( EnumSet.allOf( ForgeDirection.class ), blk, is, tess, 0xffffff, renderer );
setInvRenderBounds( renderer, 1, 0, 1, 15, 2, 15 );
renderInvBlock( EnumSet.allOf( ForgeDirection.class ), blk, is, tess, 0xffffff, renderer );
this.setInvRenderBounds( renderer, 1, 0, 1, 15, 2, 15 );
this.renderInvBlock( EnumSet.allOf( ForgeDirection.class ), blk, is, tess, 0xffffff, renderer );
setInvRenderBounds( renderer, 1, 14, 1, 15, 16, 15 );
renderInvBlock( EnumSet.allOf( ForgeDirection.class ), blk, is, tess, 0xffffff, renderer );
this.setInvRenderBounds( renderer, 1, 14, 1, 15, 16, 15 );
this.renderInvBlock( EnumSet.allOf( ForgeDirection.class ), blk, is, tess, 0xffffff, renderer );
blk.getRendererInstance().setTemporaryRenderIcon( ExtraBlockTextures.BlockInscriberInside.getIcon() );
// press
setInvRenderBounds( renderer, 3, 2, 3, 13, 3, 13 );
renderInvBlock( EnumSet.allOf( ForgeDirection.class ), blk, is, tess, 0xffffff, renderer );
this.setInvRenderBounds( renderer, 3, 2, 3, 13, 3, 13 );
this.renderInvBlock( EnumSet.allOf( ForgeDirection.class ), blk, is, tess, 0xffffff, renderer );
setInvRenderBounds( renderer, 3, 13, 3, 13, 15, 13 );
renderInvBlock( EnumSet.allOf( ForgeDirection.class ), blk, is, tess, 0xffffff, renderer );
this.setInvRenderBounds( renderer, 3, 13, 3, 13, 15, 13 );
this.renderInvBlock( EnumSet.allOf( ForgeDirection.class ), blk, is, tess, 0xffffff, renderer );
blk.getRendererInstance().setTemporaryRenderIcon( null );
@@ -97,11 +97,11 @@ public class RenderBlockInscriber extends BaseBlockRender
@Override
public boolean renderInWorld(AEBaseBlock block, IBlockAccess world, int x, int y, int z, RenderBlocks renderer)
{
preRenderInWorld( block, world, x, y, z, renderer );
this.preRenderInWorld( block, world, x, y, z, renderer );
BlockInscriber blk = (BlockInscriber) block;
IOrientable te = getOrientable( block, world, x, y, z );
IOrientable te = this.getOrientable( block, world, x, y, z );
ForgeDirection fdy = te.getUp();
ForgeDirection fdz = te.getForward();
@@ -110,20 +110,20 @@ public class RenderBlockInscriber extends BaseBlockRender
renderer.renderAllFaces = true;
// sides...
renderBlockBounds( renderer, 3, 1, 0, 13, 15, 3, fdx, fdy, fdz );
this.renderBlockBounds( renderer, 3, 1, 0, 13, 15, 3, fdx, fdy, fdz );
boolean out = renderer.renderStandardBlock( blk, x, y, z );
renderBlockBounds( renderer, 0, 1, 0, 3, 15, 16, fdx, fdy, fdz );
this.renderBlockBounds( renderer, 0, 1, 0, 3, 15, 16, fdx, fdy, fdz );
out = renderer.renderStandardBlock( blk, x, y, z );
renderBlockBounds( renderer, 13, 1, 0, 16, 15, 16, fdx, fdy, fdz );
this.renderBlockBounds( renderer, 13, 1, 0, 16, 15, 16, fdx, fdy, fdz );
out = renderer.renderStandardBlock( blk, x, y, z );
// top bottom..
renderBlockBounds( renderer, 1, 0, 1, 15, 4, 15, fdx, fdy, fdz );
this.renderBlockBounds( renderer, 1, 0, 1, 15, 4, 15, fdx, fdy, fdz );
out = renderer.renderStandardBlock( blk, x, y, z );
renderBlockBounds( renderer, 1, 12, 1, 15, 16, 15, fdx, fdy, fdz );
this.renderBlockBounds( renderer, 1, 12, 1, 15, 16, 15, fdx, fdy, fdz );
out = renderer.renderStandardBlock( blk, x, y, z );
blk.getRendererInstance().setTemporaryRenderIcon( null );
@@ -131,7 +131,7 @@ public class RenderBlockInscriber extends BaseBlockRender
renderer.renderAllFaces = false;
blk.getRendererInstance().setTemporaryRenderIcon( null );
postRenderInWorld( renderer );
this.postRenderInWorld( renderer );
return out;
}
@@ -141,7 +141,7 @@ public class RenderBlockInscriber extends BaseBlockRender
TileInscriber inv = (TileInscriber) tile;
GL11.glPushMatrix();
applyTESRRotation( x, y, z, tile.getForward(), tile.getUp() );
this.applyTESRRotation( x, y, z, tile.getForward(), tile.getUp() );
GL11.glColor4f( 1.0F, 1.0F, 1.0F, 1.0F );
GL11.glDisable( GL11.GL_LIGHTING );
@@ -225,13 +225,13 @@ public class RenderBlockInscriber extends BaseBlockRender
is = ir.output.copy();
}
renderItem( is, 0.0f, block, tile, tess, x, y, z, f, renderer );
this.renderItem( is, 0.0f, block, tile, tess, x, y, z, f, renderer );
}
else
{
renderItem( inv.getStackInSlot( 0 ), press, block, tile, tess, x, y, z, f, renderer );
renderItem( inv.getStackInSlot( 1 ), -press, block, tile, tess, x, y, z, f, renderer );
renderItem( inv.getStackInSlot( 2 ), 0.0f, block, tile, tess, x, y, z, f, renderer );
this.renderItem( inv.getStackInSlot( 0 ), press, block, tile, tess, x, y, z, f, renderer );
this.renderItem( inv.getStackInSlot( 1 ), -press, block, tile, tess, x, y, z, f, renderer );
this.renderItem( inv.getStackInSlot( 2 ), 0.0f, block, tile, tess, x, y, z, f, renderer );
}
}
@@ -243,7 +243,7 @@ public class RenderBlockInscriber extends BaseBlockRender
{
sis = sis.copy();
GL11.glPushMatrix();
applyTESRRotation( x, y, z, tile.getForward(), tile.getUp() );
this.applyTESRRotation( x, y, z, tile.getForward(), tile.getUp() );
try
{
@@ -272,7 +272,7 @@ public class RenderBlockInscriber extends BaseBlockRender
GL11.glDisable( GL12.GL_RESCALE_NORMAL );
tess.setColorOpaque_F( 1.0f, 1.0f, 1.0f );
doRenderItem( sis, tile );
this.doRenderItem( sis, tile );
}
catch (Exception err)
{
@@ -62,9 +62,9 @@ public class RenderBlockSkyChest extends BaseBlockRender
GL11.glScalef( 1.0F, -1F, -1F );
GL11.glTranslatef( -0.0F, -1.0F, -1.0F );
model.chestLid.offsetY = -(0.9f / 16.0f);
model.chestLid.rotateAngleX = -((lidAngle * 3.141593F) / 2.0F);
model.renderAll();
this.model.chestLid.offsetY = -(0.9f / 16.0f);
this.model.chestLid.rotateAngleX = -((lidAngle * 3.141593F) / 2.0F);
this.model.renderAll();
GL11.glDisable( 32826 /* GL_RESCALE_NORMAL_EXT */);
GL11.glColor4f( 1.0F, 1.0F, 1.0F, 1.0F );
@@ -122,9 +122,9 @@ public class RenderBlockSkyChest extends BaseBlockRender
lidAngle = 1.0F - lidAngle;
lidAngle = 1.0F - lidAngle * lidAngle * lidAngle;
model.chestLid.offsetY = -(1.01f / 16.0f);
model.chestLid.rotateAngleX = -((lidAngle * 3.141593F) / 2.0F);
model.renderAll();
this.model.chestLid.offsetY = -(1.01f / 16.0f);
this.model.chestLid.rotateAngleX = -((lidAngle * 3.141593F) / 2.0F);
this.model.renderAll();
GL11.glDisable( 32826 /* GL_RESCALE_NORMAL_EXT */);
GL11.glColor4f( 1.0F, 1.0F, 1.0F, 1.0F );
@@ -119,7 +119,7 @@ public class RenderBlockSkyCompass extends BaseBlockRender
if ( cr.spin )
{
now = now % 100000;
model.renderAll( (now / 50000.0f) * (float) Math.PI * 500.0f );
this.model.renderAll( (now / 50000.0f) * (float) Math.PI * 500.0f );
}
else
{
@@ -127,27 +127,27 @@ public class RenderBlockSkyCompass extends BaseBlockRender
{
float offRads = rYaw / 180.0f * (float) Math.PI;
float adjustment = (float) Math.PI * 0.74f;
model.renderAll( (float) flipidiy( cr.rad + offRads + adjustment ) );
this.model.renderAll( (float) this.flipidiy( cr.rad + offRads + adjustment ) );
}
else
{
float offRads = rYaw / 180.0f * (float) Math.PI;
float adjustment = (float) Math.PI * -0.74f;
model.renderAll( (float) flipidiy( cr.rad + offRads + adjustment ) );
this.model.renderAll( (float) this.flipidiy( cr.rad + offRads + adjustment ) );
}
}
}
else
{
now = now % 1000000;
model.renderAll( (now / 500000.0f) * (float) Math.PI * 500.0f );
this.model.renderAll( (now / 500000.0f) * (float) Math.PI * 500.0f );
}
}
else
{
now = now % 100000;
model.renderAll( (now / 50000.0f) * (float) Math.PI * 500.0f );
this.model.renderAll( (now / 50000.0f) * (float) Math.PI * 500.0f );
}
GL11.glDisable( 32826 /* GL_RESCALE_NORMAL_EXT */);
@@ -196,16 +196,16 @@ public class RenderBlockSkyCompass extends BaseBlockRender
if ( cr.spin )
{
now = now % 100000;
model.renderAll( (now / 50000.0f) * (float) Math.PI * 500.0f );
this.model.renderAll( (now / 50000.0f) * (float) Math.PI * 500.0f );
}
else
model.renderAll( (float) (skyCompass.getForward() == ForgeDirection.DOWN ? flipidiy( cr.rad ) : cr.rad) );
this.model.renderAll( (float) (skyCompass.getForward() == ForgeDirection.DOWN ? this.flipidiy( cr.rad ) : cr.rad) );
}
else
{
now = now % 1000000;
model.renderAll( (now / 500000.0f) * (float) Math.PI * 500.0f );
this.model.renderAll( (now / 500000.0f) * (float) Math.PI * 500.0f );
}
GL11.glDisable( 32826 /* GL_RESCALE_NORMAL_EXT */);
@@ -48,11 +48,11 @@ public class RenderBlockWireless extends BaseBlockRender
public void renderInventory(AEBaseBlock blk, ItemStack is, RenderBlocks renderer, ItemRenderType type, Object[] obj)
{
this.blk = blk;
centerX = 0;
centerY = 0;
centerZ = 0;
hasChan = false;
hasPower = false;
this.centerX = 0;
this.centerY = 0;
this.centerZ = 0;
this.hasChan = false;
this.hasPower = false;
BlockRenderInfo ri = blk.getRendererInstance();
Tessellator tess = Tessellator.instance;
@@ -60,17 +60,17 @@ public class RenderBlockWireless extends BaseBlockRender
IIcon r = CableBusTextures.PartMonitorSidesStatus.getIcon();
ri.setTemporaryRenderIcons( r, r, CableBusTextures.PartMonitorSides.getIcon(), CableBusTextures.PartMonitorSides.getIcon(), r, r );
renderBlockBounds( renderer, 5, 5, 0, 11, 11, 1, ForgeDirection.EAST, ForgeDirection.UP, ForgeDirection.SOUTH );
renderInvBlock( EnumSet.allOf( ForgeDirection.class ), blk, is, tess, 0xffffff, renderer );
this.renderBlockBounds( renderer, 5, 5, 0, 11, 11, 1, ForgeDirection.EAST, ForgeDirection.UP, ForgeDirection.SOUTH );
this.renderInvBlock( EnumSet.allOf( ForgeDirection.class ), blk, is, tess, 0xffffff, renderer );
r = CableBusTextures.PartWirelessSides.getIcon();
ri.setTemporaryRenderIcons( r, r, ExtraBlockTextures.BlockWirelessInside.getIcon(), ExtraBlockTextures.BlockWirelessInside.getIcon(), r, r );
renderBlockBounds( renderer, 5, 5, 1, 11, 11, 2, ForgeDirection.EAST, ForgeDirection.UP, ForgeDirection.SOUTH );
renderInvBlock( EnumSet.allOf( ForgeDirection.class ), blk, is, tess, 0xffffff, renderer );
this.renderBlockBounds( renderer, 5, 5, 1, 11, 11, 2, ForgeDirection.EAST, ForgeDirection.UP, ForgeDirection.SOUTH );
this.renderInvBlock( EnumSet.allOf( ForgeDirection.class ), blk, is, tess, 0xffffff, renderer );
tess.startDrawingQuads();
ri.setTemporaryRenderIcon( null );
renderTorchAtAngle( renderer, ForgeDirection.EAST, ForgeDirection.UP, ForgeDirection.SOUTH );
this.renderTorchAtAngle( renderer, ForgeDirection.EAST, ForgeDirection.UP, ForgeDirection.SOUTH );
super.postRenderInWorld( renderer );
tess.draw();
@@ -82,22 +82,22 @@ public class RenderBlockWireless extends BaseBlockRender
for (ForgeDirection side : sides)
{
renderBlockBounds( renderer, 8 + (side.offsetX != 0 ? side.offsetX * 2 : -2), 8 + (side.offsetY != 0 ? side.offsetY * 2 : -2), 2
this.renderBlockBounds( renderer, 8 + (side.offsetX != 0 ? side.offsetX * 2 : -2), 8 + (side.offsetY != 0 ? side.offsetY * 2 : -2), 2
+ (side.offsetZ != 0 ? side.offsetZ * 2 : -1) + s, 8 + (side.offsetX != 0 ? side.offsetX * 4 : 2),
8 + (side.offsetY != 0 ? side.offsetY * 4 : 2), 2 + (side.offsetZ != 0 ? side.offsetZ * 5 : 1) + s, ForgeDirection.EAST, ForgeDirection.UP,
ForgeDirection.SOUTH );
renderInvBlock( EnumSet.allOf( ForgeDirection.class ), blk, is, tess, 0xffffff, renderer );
this.renderInvBlock( EnumSet.allOf( ForgeDirection.class ), blk, is, tess, 0xffffff, renderer );
}
s = 3;
for (ForgeDirection side : sides)
{
renderBlockBounds( renderer, 8 + (side.offsetX != 0 ? side.offsetX * 4 : -1), 8 + (side.offsetY != 0 ? side.offsetY * 4 : -1), 1
this.renderBlockBounds( renderer, 8 + (side.offsetX != 0 ? side.offsetX * 4 : -1), 8 + (side.offsetY != 0 ? side.offsetY * 4 : -1), 1
+ (side.offsetZ != 0 ? side.offsetZ * 4 : -1) + s, 8 + (side.offsetX != 0 ? side.offsetX * 5 : 1),
8 + (side.offsetY != 0 ? side.offsetY * 5 : 1), 2 + (side.offsetZ != 0 ? side.offsetZ * 5 : 1) + s, ForgeDirection.EAST, ForgeDirection.UP,
ForgeDirection.SOUTH );
renderInvBlock( EnumSet.allOf( ForgeDirection.class ), blk, is, tess, 0xffffff, renderer );
this.renderInvBlock( EnumSet.allOf( ForgeDirection.class ), blk, is, tess, 0xffffff, renderer );
}
}
@@ -115,8 +115,8 @@ public class RenderBlockWireless extends BaseBlockRender
this.blk = blk;
if ( tw != null )
{
hasChan = (tw.clientFlags & (TileWireless.POWERED_FLAG | TileWireless.CHANNEL_FLAG)) == (TileWireless.POWERED_FLAG | TileWireless.CHANNEL_FLAG);
hasPower = (tw.clientFlags & TileWireless.POWERED_FLAG) == TileWireless.POWERED_FLAG;
this.hasChan = (tw.clientFlags & (TileWireless.POWERED_FLAG | TileWireless.CHANNEL_FLAG)) == (TileWireless.POWERED_FLAG | TileWireless.CHANNEL_FLAG);
this.hasPower = (tw.clientFlags & TileWireless.POWERED_FLAG) == TileWireless.POWERED_FLAG;
BlockRenderInfo ri = blk.getRendererInstance();
@@ -128,20 +128,20 @@ public class RenderBlockWireless extends BaseBlockRender
IIcon r = CableBusTextures.PartMonitorSidesStatus.getIcon();
ri.setTemporaryRenderIcons( r, r, CableBusTextures.PartMonitorSides.getIcon(), CableBusTextures.PartMonitorSides.getIcon(), r, r );
renderBlockBounds( renderer, 5, 5, 0, 11, 11, 1, fdx, fdy, fdz );
this.renderBlockBounds( renderer, 5, 5, 0, 11, 11, 1, fdx, fdy, fdz );
super.renderInWorld( blk, world, x, y, z, renderer );
r = CableBusTextures.PartWirelessSides.getIcon();
ri.setTemporaryRenderIcons( r, r, ExtraBlockTextures.BlockWirelessInside.getIcon(), ExtraBlockTextures.BlockWirelessInside.getIcon(), r, r );
renderBlockBounds( renderer, 5, 5, 1, 11, 11, 2, fdx, fdy, fdz );
this.renderBlockBounds( renderer, 5, 5, 1, 11, 11, 2, fdx, fdy, fdz );
super.renderInWorld( blk, world, x, y, z, renderer );
centerX = x;
centerY = y;
centerZ = z;
this.centerX = x;
this.centerY = y;
this.centerZ = z;
ri.setTemporaryRenderIcon( null );
renderTorchAtAngle( renderer, fdx, fdy, fdz );
this.renderTorchAtAngle( renderer, fdx, fdy, fdz );
super.postRenderInWorld( renderer );
ri.setTemporaryRenderIcons( r, r, ExtraBlockTextures.BlockWirelessInside.getIcon(), ExtraBlockTextures.BlockWirelessInside.getIcon(), r, r );
@@ -152,7 +152,7 @@ public class RenderBlockWireless extends BaseBlockRender
for (ForgeDirection side : sides)
{
renderBlockBounds( renderer, 8 + (side.offsetX != 0 ? side.offsetX * 2 : -2), 8 + (side.offsetY != 0 ? side.offsetY * 2 : -2), 2
this.renderBlockBounds( renderer, 8 + (side.offsetX != 0 ? side.offsetX * 2 : -2), 8 + (side.offsetY != 0 ? side.offsetY * 2 : -2), 2
+ (side.offsetZ != 0 ? side.offsetZ * 2 : -1) + s, 8 + (side.offsetX != 0 ? side.offsetX * 4 : 2),
8 + (side.offsetY != 0 ? side.offsetY * 4 : 2), 2 + (side.offsetZ != 0 ? side.offsetZ * 5 : 1) + s, fdx, fdy, fdz );
super.renderInWorld( blk, world, x, y, z, renderer );
@@ -161,7 +161,7 @@ public class RenderBlockWireless extends BaseBlockRender
s = 3;
for (ForgeDirection side : sides)
{
renderBlockBounds( renderer, 8 + (side.offsetX != 0 ? side.offsetX * 4 : -1), 8 + (side.offsetY != 0 ? side.offsetY * 4 : -1), 1
this.renderBlockBounds( renderer, 8 + (side.offsetX != 0 ? side.offsetX * 4 : -1), 8 + (side.offsetY != 0 ? side.offsetY * 4 : -1), 1
+ (side.offsetZ != 0 ? side.offsetZ * 4 : -1) + s, 8 + (side.offsetX != 0 ? side.offsetX * 5 : 1),
8 + (side.offsetY != 0 ? side.offsetY * 5 : 1), 2 + (side.offsetZ != 0 ? side.offsetZ * 5 : 1) + s, fdx, fdy, fdz );
super.renderInWorld( blk, world, x, y, z, renderer );
@@ -170,15 +170,15 @@ public class RenderBlockWireless extends BaseBlockRender
r = CableBusTextures.PartMonitorSidesStatusLights.getIcon();
// ri.setTemporaryRenderIcons( r, r, ExtraTextures.BlockChargerInside.getIcon(),
// ExtraTextures.BlockChargerInside.getIcon(), r, r );
renderBlockBounds( renderer, 5, 5, 0, 11, 11, 1, fdx, fdy, fdz );
this.renderBlockBounds( renderer, 5, 5, 0, 11, 11, 1, fdx, fdy, fdz );
if ( hasChan )
if ( this.hasChan )
{
int l = 14;
Tessellator.instance.setBrightness( l << 20 | l << 4 );
Tessellator.instance.setColorOpaque_I( AEColor.Transparent.blackVariant );
}
else if ( hasPower )
else if ( this.hasPower )
{
int l = 9;
Tessellator.instance.setBrightness( l << 20 | l << 4 );
@@ -212,7 +212,7 @@ public class RenderBlockWireless extends BaseBlockRender
private void renderTorchAtAngle(RenderBlocks renderer, ForgeDirection x, ForgeDirection y, ForgeDirection z)
{
IIcon r = (hasChan ? CableBusTextures.BlockWirelessOn.getIcon() : blk.getIcon( 0, 0 ));
IIcon r = (this.hasChan ? CableBusTextures.BlockWirelessOn.getIcon() : this.blk.getIcon( 0, 0 ));
IIcon sides = new OffsetIcon( r, 0.0f, -2.0f );
switch (z)
@@ -252,15 +252,15 @@ public class RenderBlockWireless extends BaseBlockRender
}
Tessellator.instance.setColorOpaque_I( 0xffffff );
renderBlockBounds( renderer, 0, 7, 1, 16, 9, 16, x, y, z );
renderFace( centerX, centerY, centerZ, blk, sides, renderer, y );
renderFace( centerX, centerY, centerZ, blk, sides, renderer, y.getOpposite() );
this.renderBlockBounds( renderer, 0, 7, 1, 16, 9, 16, x, y, z );
this.renderFace( this.centerX, this.centerY, this.centerZ, this.blk, sides, renderer, y );
this.renderFace( this.centerX, this.centerY, this.centerZ, this.blk, sides, renderer, y.getOpposite() );
renderBlockBounds( renderer, 7, 0, 1, 9, 16, 16, x, y, z );
renderFace( centerX, centerY, centerZ, blk, sides, renderer, x );
renderFace( centerX, centerY, centerZ, blk, sides, renderer, x.getOpposite() );
this.renderBlockBounds( renderer, 7, 0, 1, 9, 16, 16, x, y, z );
this.renderFace( this.centerX, this.centerY, this.centerZ, this.blk, sides, renderer, x );
this.renderFace( this.centerX, this.centerY, this.centerZ, this.blk, sides, renderer, x.getOpposite() );
renderBlockBounds( renderer, 7, 7, 1, 9, 9, 10.6, x, y, z );
renderFace( centerX, centerY, centerZ, blk, r, renderer, z );
this.renderBlockBounds( renderer, 7, 7, 1, 9, 9, 10.6, x, y, z );
this.renderFace( this.centerX, this.centerY, this.centerZ, this.blk, r, renderer, z );
}
}
@@ -72,7 +72,7 @@ public class RenderDrive extends BaseBlockRender
for (int xx = 0; xx < 2; xx++)
{
int stat = sp.getCellStatus( yy * 2 + (1 - xx) );
selectFace( renderer, west, up, forward, 2 + xx * 7, 7 + xx * 7, 1 + yy * 3, 3 + yy * 3 );
this.selectFace( renderer, west, up, forward, 2 + xx * 7, 7 + xx * 7, 1 + yy * 3, 3 + yy * 3 );
int spin = 0;
@@ -249,9 +249,9 @@ public class RenderDrive extends BaseBlockRender
}
if ( (forward == ForgeDirection.UP && up == ForgeDirection.SOUTH) || forward == ForgeDirection.DOWN )
selectFace( renderer, west, up, forward, 3 + xx * 7, 4 + xx * 7, 1 + yy * 3, 2 + yy * 3 );
this.selectFace( renderer, west, up, forward, 3 + xx * 7, 4 + xx * 7, 1 + yy * 3, 2 + yy * 3 );
else
selectFace( renderer, west, up, forward, 5 + xx * 7, 6 + xx * 7, 2 + yy * 3, 3 + yy * 3 );
this.selectFace( renderer, west, up, forward, 5 + xx * 7, 6 + xx * 7, 2 + yy * 3, 3 + yy * 3 );
if ( stat != 0 )
{
@@ -53,7 +53,7 @@ public class RenderMEChest extends BaseBlockRender
this.renderInvBlock( EnumSet.of( ForgeDirection.SOUTH ), block, is, Tessellator.instance, 0x000000, renderer );
renderer.overrideBlockTexture = ExtraBlockTextures.MEChest.getIcon();
this.renderInvBlock( EnumSet.of( ForgeDirection.UP ), block, is, Tessellator.instance, adjustBrightness( AEColor.Transparent.whiteVariant, 0.7 ),
this.renderInvBlock( EnumSet.of( ForgeDirection.UP ), block, is, Tessellator.instance, this.adjustBrightness( AEColor.Transparent.whiteVariant, 0.7 ),
renderer );
renderer.overrideBlockTexture = null;
@@ -70,12 +70,12 @@ public class RenderMEChest extends BaseBlockRender
ForgeDirection forward = sp.getForward();
ForgeDirection west = Platform.crossProduct( forward, up );
preRenderInWorld( imb, world, x, y, z, renderer );
this.preRenderInWorld( imb, world, x, y, z, renderer );
int stat = sp.getCellStatus( 0 );
boolean result = renderer.renderStandardBlock( imb, x, y, z );
selectFace( renderer, west, up, forward, 5, 16 - 5, 9, 12 );
this.selectFace( renderer, west, up, forward, 5, 16 - 5, 9, 12 );
int offsetU = -4;
int offsetV = 8;
@@ -105,7 +105,7 @@ public class RenderMEChest extends BaseBlockRender
* forward == ForgeDirection.NORTH && up == ForgeDirection.UP ) flippableIcon.setFlip( true, false );
*/
renderFace( x, y, z, imb, flippableIcon, renderer, forward );
this.renderFace( x, y, z, imb, flippableIcon, renderer, forward );
if ( stat != 0 )
{
@@ -122,8 +122,8 @@ public class RenderMEChest extends BaseBlockRender
Tessellator.instance.setColorOpaque_I( 0xffaa00 );
if ( stat == 3 )
Tessellator.instance.setColorOpaque_I( 0xff0000 );
selectFace( renderer, west, up, forward, 9, 10, 11, 12 );
renderFace( x, y, z, imb, ExtraBlockTextures.White.getIcon(), renderer, forward );
this.selectFace( renderer, west, up, forward, 9, 10, 11, 12 );
this.renderFace( x, y, z, imb, ExtraBlockTextures.White.getIcon(), renderer, forward );
}
b = world.getLightBrightnessForSkyBlocks( x + up.offsetX, y + up.offsetY, z + up.offsetZ, 0 );
@@ -140,21 +140,21 @@ public class RenderMEChest extends BaseBlockRender
Tessellator.instance.setColorOpaque_I( sp.getColor().whiteVariant );
IIcon ico = ch == null ? null : ch.getTopTexture_Light();
renderFace( x, y, z, imb, ico == null ? ExtraBlockTextures.MEChest.getIcon() : ico, renderer, up );
this.renderFace( x, y, z, imb, ico == null ? ExtraBlockTextures.MEChest.getIcon() : ico, renderer, up );
if ( ico != null )
{
Tessellator.instance.setColorOpaque_I( sp.getColor().mediumVariant );
ico = ch == null ? null : ch.getTopTexture_Medium();
renderFace( x, y, z, imb, ico == null ? ExtraBlockTextures.MEChest.getIcon() : ico, renderer, up );
this.renderFace( x, y, z, imb, ico == null ? ExtraBlockTextures.MEChest.getIcon() : ico, renderer, up );
Tessellator.instance.setColorOpaque_I( sp.getColor().blackVariant );
ico = ch == null ? null : ch.getTopTexture_Dark();
renderFace( x, y, z, imb, ico == null ? ExtraBlockTextures.MEChest.getIcon() : ico, renderer, up );
this.renderFace( x, y, z, imb, ico == null ? ExtraBlockTextures.MEChest.getIcon() : ico, renderer, up );
}
renderer.overrideBlockTexture = null;
postRenderInWorld( renderer );
this.postRenderInWorld( renderer );
return result;
}
@@ -119,8 +119,8 @@ public class RenderQNB extends BaseBlockRender
Item transparentCoveredCable = coveredCableDefinition.item( AEColor.Transparent );
EnumSet<ForgeDirection> sides = tqb.getConnections();
renderCableAt( 0.11D, world, x, y, z, block, renderer, transparentGlassCable.getIconIndex( glassCableDefinition.stack( AEColor.Transparent, 1 ) ), 0.141D, sides );
renderCableAt( 0.188D, world, x, y, z, block, renderer, transparentCoveredCable.getIconIndex( coveredCableDefinition.stack( AEColor.Transparent, 1 ) ), 0.1875D, sides );
this.renderCableAt( 0.11D, world, x, y, z, block, renderer, transparentGlassCable.getIconIndex( glassCableDefinition.stack( AEColor.Transparent, 1 ) ), 0.141D, sides );
this.renderCableAt( 0.188D, world, x, y, z, block, renderer, transparentCoveredCable.getIconIndex( coveredCableDefinition.stack( AEColor.Transparent, 1 ) ), 0.1875D, sides );
}
float renderMin = 2.0f / 16.0f;
@@ -146,7 +146,7 @@ public class RenderQNB extends BaseBlockRender
AEColoredItemDefinition coveredCableDefinition = AEApi.instance().parts().partCableCovered;
Item transparentCoveredCable = coveredCableDefinition.item( AEColor.Transparent );
renderCableAt( 0.188D, world, x, y, z, block, renderer, transparentCoveredCable.getIconIndex( coveredCableDefinition.stack( AEColor.Transparent, 1 ) ), 0.05D,
this.renderCableAt( 0.188D, world, x, y, z, block, renderer, transparentCoveredCable.getIconIndex( coveredCableDefinition.stack( AEColor.Transparent, 1 ) ), 0.05D,
tqb.getConnections() );
float renderMin = 4.0f / 16.0f;
@@ -166,7 +166,7 @@ public class RenderQNB extends BaseBlockRender
Tessellator.instance.setColorOpaque_F( 1.0F, 1.0F, 1.0F );
Tessellator.instance.setBrightness( bn << 20 | bn << 4 );
for (ForgeDirection side : ForgeDirection.VALID_DIRECTIONS)
renderFace( x, y, z, block, ExtraBlockTextures.BlockQRingCornerLight.getIcon(), renderer, side );
this.renderFace( x, y, z, block, ExtraBlockTextures.BlockQRingCornerLight.getIcon(), renderer, side );
}
}
@@ -193,7 +193,7 @@ public class RenderQNB extends BaseBlockRender
Tessellator.instance.setColorOpaque_F( 1.0F, 1.0F, 1.0F );
Tessellator.instance.setBrightness( bn << 20 | bn << 4 );
for (ForgeDirection side : ForgeDirection.VALID_DIRECTIONS)
renderFace( x, y, z, block, ExtraBlockTextures.BlockQRingEdgeLight.getIcon(), renderer, side );
this.renderFace( x, y, z, block, ExtraBlockTextures.BlockQRingEdgeLight.getIcon(), renderer, side );
}
}
}
@@ -50,7 +50,7 @@ public class RenderQuartzGlass extends BaseBlockRender
boolean isFlush(AEBaseBlock imb, IBlockAccess world, int x, int y, int z)
{
return isGlass( imb, world, x, y, z );
return this.isGlass( imb, world, x, y, z );
}
boolean isGlass(AEBaseBlock imb, IBlockAccess world, int x, int y, int z)
@@ -61,9 +61,9 @@ public class RenderQuartzGlass extends BaseBlockRender
void renderEdge(AEBaseBlock imb, IBlockAccess world, int x, int y, int z, RenderBlocks renderer, ForgeDirection side, ForgeDirection direction)
{
if ( !isFlush( imb, world, x + side.offsetX, y + side.offsetY, z + side.offsetZ ) )
if ( !this.isFlush( imb, world, x + side.offsetX, y + side.offsetY, z + side.offsetZ ) )
{
if ( !isFlush( imb, world, x + direction.offsetX, y + direction.offsetY, z + direction.offsetZ ) )
if ( !this.isFlush( imb, world, x + direction.offsetX, y + direction.offsetY, z + direction.offsetZ ) )
{
float minX = 0.5f + (side.offsetX + direction.offsetX) / 2.0f;
float minY = 0.5f + (side.offsetY + direction.offsetY) / 2.0f;
@@ -171,35 +171,35 @@ public class RenderQuartzGlass extends BaseBlockRender
boolean result = renderer.renderStandardBlock( imb, x, y, z );
renderer.overrideBlockTexture = null;
renderEdge( imb, world, x, y, z, renderer, ForgeDirection.UP, ForgeDirection.EAST );
renderEdge( imb, world, x, y, z, renderer, ForgeDirection.UP, ForgeDirection.WEST );
renderEdge( imb, world, x, y, z, renderer, ForgeDirection.UP, ForgeDirection.NORTH );
renderEdge( imb, world, x, y, z, renderer, ForgeDirection.UP, ForgeDirection.SOUTH );
this.renderEdge( imb, world, x, y, z, renderer, ForgeDirection.UP, ForgeDirection.EAST );
this.renderEdge( imb, world, x, y, z, renderer, ForgeDirection.UP, ForgeDirection.WEST );
this.renderEdge( imb, world, x, y, z, renderer, ForgeDirection.UP, ForgeDirection.NORTH );
this.renderEdge( imb, world, x, y, z, renderer, ForgeDirection.UP, ForgeDirection.SOUTH );
renderEdge( imb, world, x, y, z, renderer, ForgeDirection.DOWN, ForgeDirection.EAST );
renderEdge( imb, world, x, y, z, renderer, ForgeDirection.DOWN, ForgeDirection.WEST );
renderEdge( imb, world, x, y, z, renderer, ForgeDirection.DOWN, ForgeDirection.NORTH );
renderEdge( imb, world, x, y, z, renderer, ForgeDirection.DOWN, ForgeDirection.SOUTH );
this.renderEdge( imb, world, x, y, z, renderer, ForgeDirection.DOWN, ForgeDirection.EAST );
this.renderEdge( imb, world, x, y, z, renderer, ForgeDirection.DOWN, ForgeDirection.WEST );
this.renderEdge( imb, world, x, y, z, renderer, ForgeDirection.DOWN, ForgeDirection.NORTH );
this.renderEdge( imb, world, x, y, z, renderer, ForgeDirection.DOWN, ForgeDirection.SOUTH );
renderEdge( imb, world, x, y, z, renderer, ForgeDirection.EAST, ForgeDirection.UP );
renderEdge( imb, world, x, y, z, renderer, ForgeDirection.EAST, ForgeDirection.DOWN );
renderEdge( imb, world, x, y, z, renderer, ForgeDirection.EAST, ForgeDirection.NORTH );
renderEdge( imb, world, x, y, z, renderer, ForgeDirection.EAST, ForgeDirection.SOUTH );
this.renderEdge( imb, world, x, y, z, renderer, ForgeDirection.EAST, ForgeDirection.UP );
this.renderEdge( imb, world, x, y, z, renderer, ForgeDirection.EAST, ForgeDirection.DOWN );
this.renderEdge( imb, world, x, y, z, renderer, ForgeDirection.EAST, ForgeDirection.NORTH );
this.renderEdge( imb, world, x, y, z, renderer, ForgeDirection.EAST, ForgeDirection.SOUTH );
renderEdge( imb, world, x, y, z, renderer, ForgeDirection.WEST, ForgeDirection.UP );
renderEdge( imb, world, x, y, z, renderer, ForgeDirection.WEST, ForgeDirection.DOWN );
renderEdge( imb, world, x, y, z, renderer, ForgeDirection.WEST, ForgeDirection.NORTH );
renderEdge( imb, world, x, y, z, renderer, ForgeDirection.WEST, ForgeDirection.SOUTH );
this.renderEdge( imb, world, x, y, z, renderer, ForgeDirection.WEST, ForgeDirection.UP );
this.renderEdge( imb, world, x, y, z, renderer, ForgeDirection.WEST, ForgeDirection.DOWN );
this.renderEdge( imb, world, x, y, z, renderer, ForgeDirection.WEST, ForgeDirection.NORTH );
this.renderEdge( imb, world, x, y, z, renderer, ForgeDirection.WEST, ForgeDirection.SOUTH );
renderEdge( imb, world, x, y, z, renderer, ForgeDirection.NORTH, ForgeDirection.EAST );
renderEdge( imb, world, x, y, z, renderer, ForgeDirection.NORTH, ForgeDirection.WEST );
renderEdge( imb, world, x, y, z, renderer, ForgeDirection.NORTH, ForgeDirection.UP );
renderEdge( imb, world, x, y, z, renderer, ForgeDirection.NORTH, ForgeDirection.DOWN );
this.renderEdge( imb, world, x, y, z, renderer, ForgeDirection.NORTH, ForgeDirection.EAST );
this.renderEdge( imb, world, x, y, z, renderer, ForgeDirection.NORTH, ForgeDirection.WEST );
this.renderEdge( imb, world, x, y, z, renderer, ForgeDirection.NORTH, ForgeDirection.UP );
this.renderEdge( imb, world, x, y, z, renderer, ForgeDirection.NORTH, ForgeDirection.DOWN );
renderEdge( imb, world, x, y, z, renderer, ForgeDirection.SOUTH, ForgeDirection.EAST );
renderEdge( imb, world, x, y, z, renderer, ForgeDirection.SOUTH, ForgeDirection.WEST );
renderEdge( imb, world, x, y, z, renderer, ForgeDirection.SOUTH, ForgeDirection.UP );
renderEdge( imb, world, x, y, z, renderer, ForgeDirection.SOUTH, ForgeDirection.DOWN );
this.renderEdge( imb, world, x, y, z, renderer, ForgeDirection.SOUTH, ForgeDirection.EAST );
this.renderEdge( imb, world, x, y, z, renderer, ForgeDirection.SOUTH, ForgeDirection.WEST );
this.renderEdge( imb, world, x, y, z, renderer, ForgeDirection.SOUTH, ForgeDirection.UP );
this.renderEdge( imb, world, x, y, z, renderer, ForgeDirection.SOUTH, ForgeDirection.DOWN );
return result;
}
@@ -62,30 +62,30 @@ public class RenderQuartzTorch extends BaseBlockRender
float zOff = 0.0f;
renderer.setRenderBounds( Point3 + xOff, renderBottom + yOff, Point3 + zOff, Point12 + xOff, renderTop + yOff, Point12 + zOff );
renderInvBlock( EnumSet.allOf( ForgeDirection.class ), blk, is, tess, 0xffffff, renderer );
this.renderInvBlock( EnumSet.allOf( ForgeDirection.class ), blk, is, tess, 0xffffff, renderer );
renderer.setRenderBounds( Point3 + xOff, renderTop + yOff, Point3 + zOff, Point3 + singlePixel + xOff, renderTop + singlePixel + yOff, Point3 + singlePixel + zOff );
renderInvBlock( EnumSet.allOf( ForgeDirection.class ), blk, is, tess, 0xffffff, renderer );
this.renderInvBlock( EnumSet.allOf( ForgeDirection.class ), blk, is, tess, 0xffffff, renderer );
renderer.setRenderBounds( Point12 - singlePixel + xOff, renderBottom - singlePixel + yOff, Point12 - singlePixel + zOff, Point12 + xOff, renderBottom + yOff, Point12 + zOff );
renderInvBlock( EnumSet.allOf( ForgeDirection.class ), blk, is, tess, 0xffffff, renderer );
this.renderInvBlock( EnumSet.allOf( ForgeDirection.class ), blk, is, tess, 0xffffff, renderer );
blk.getRendererInstance().setTemporaryRenderIcon( Blocks.hopper.getIcon( 0, 0 ) );
renderer.renderAllFaces = true;
renderer.setRenderBounds( Point2 + xOff, bottom + yOff, Point2 + zOff, Point13 + xOff, top + yOff, Point3 + zOff );
renderInvBlock( EnumSet.allOf( ForgeDirection.class ), blk, is, tess, 0xffffff, renderer );
this.renderInvBlock( EnumSet.allOf( ForgeDirection.class ), blk, is, tess, 0xffffff, renderer );
renderer.setRenderBounds( Point2 + xOff, bottom + yOff, Point12 + zOff, Point13 + xOff, top + yOff, Point13 + zOff );
renderInvBlock( EnumSet.allOf( ForgeDirection.class ), blk, is, tess, 0xffffff, renderer );
this.renderInvBlock( EnumSet.allOf( ForgeDirection.class ), blk, is, tess, 0xffffff, renderer );
renderer.setRenderBounds( Point2 + xOff, bottom + yOff, Point3 + zOff, Point3 + xOff, top + yOff, Point12 + zOff );
renderInvBlock( EnumSet.allOf( ForgeDirection.class ), blk, is, tess, 0xffffff, renderer );
this.renderInvBlock( EnumSet.allOf( ForgeDirection.class ), blk, is, tess, 0xffffff, renderer );
renderer.setRenderBounds( Point12 + xOff, bottom + yOff, Point3 + zOff, Point13 + xOff, top + yOff, Point12 + zOff );
renderInvBlock( EnumSet.allOf( ForgeDirection.class ), blk, is, tess, 0xffffff, renderer );
this.renderInvBlock( EnumSet.allOf( ForgeDirection.class ), blk, is, tess, 0xffffff, renderer );
renderer.renderAllFaces = false;
blk.getRendererInstance().setTemporaryRenderIcon( null );
@@ -121,12 +121,12 @@ public class RenderSpatialPylon extends BaseBlockRender
BlockRenderInfo bri = imb.getRendererInstance();
bri.setTemporaryRenderIcon( null );
bri.setTemporaryRenderIcons( getBlockTextureFromSideOutside( imb, sp, displayBits, ori, ForgeDirection.UP ),
getBlockTextureFromSideOutside( imb, sp, displayBits, ori, ForgeDirection.DOWN ),
getBlockTextureFromSideOutside( imb, sp, displayBits, ori, ForgeDirection.SOUTH ),
getBlockTextureFromSideOutside( imb, sp, displayBits, ori, ForgeDirection.NORTH ),
getBlockTextureFromSideOutside( imb, sp, displayBits, ori, ForgeDirection.EAST ),
getBlockTextureFromSideOutside( imb, sp, displayBits, ori, ForgeDirection.WEST ) );
bri.setTemporaryRenderIcons( this.getBlockTextureFromSideOutside( imb, sp, displayBits, ori, ForgeDirection.UP ),
this.getBlockTextureFromSideOutside( imb, sp, displayBits, ori, ForgeDirection.DOWN ),
this.getBlockTextureFromSideOutside( imb, sp, displayBits, ori, ForgeDirection.SOUTH ),
this.getBlockTextureFromSideOutside( imb, sp, displayBits, ori, ForgeDirection.NORTH ),
this.getBlockTextureFromSideOutside( imb, sp, displayBits, ori, ForgeDirection.EAST ),
this.getBlockTextureFromSideOutside( imb, sp, displayBits, ori, ForgeDirection.WEST ) );
boolean r = renderer.renderStandardBlock( imb, x, y, z );
@@ -137,17 +137,17 @@ public class RenderSpatialPylon extends BaseBlockRender
Tessellator.instance.setColorOpaque_I( 0xffffff );
for (ForgeDirection d : ForgeDirection.VALID_DIRECTIONS)
renderFace( x, y, z, imb, getBlockTextureFromSideInside( imb, sp, displayBits, ori, d ), renderer, d );
this.renderFace( x, y, z, imb, this.getBlockTextureFromSideInside( imb, sp, displayBits, ori, d ), renderer, d );
}
else
{
bri.setTemporaryRenderIcon( null );
bri.setTemporaryRenderIcons( getBlockTextureFromSideInside( imb, sp, displayBits, ori, ForgeDirection.UP ),
getBlockTextureFromSideInside( imb, sp, displayBits, ori, ForgeDirection.DOWN ),
getBlockTextureFromSideInside( imb, sp, displayBits, ori, ForgeDirection.SOUTH ),
getBlockTextureFromSideInside( imb, sp, displayBits, ori, ForgeDirection.NORTH ),
getBlockTextureFromSideInside( imb, sp, displayBits, ori, ForgeDirection.EAST ),
getBlockTextureFromSideInside( imb, sp, displayBits, ori, ForgeDirection.WEST ) );
bri.setTemporaryRenderIcons( this.getBlockTextureFromSideInside( imb, sp, displayBits, ori, ForgeDirection.UP ),
this.getBlockTextureFromSideInside( imb, sp, displayBits, ori, ForgeDirection.DOWN ),
this.getBlockTextureFromSideInside( imb, sp, displayBits, ori, ForgeDirection.SOUTH ),
this.getBlockTextureFromSideInside( imb, sp, displayBits, ori, ForgeDirection.NORTH ),
this.getBlockTextureFromSideInside( imb, sp, displayBits, ori, ForgeDirection.EAST ),
this.getBlockTextureFromSideInside( imb, sp, displayBits, ori, ForgeDirection.WEST ) );
renderer.renderStandardBlock( imb, x, y, z );
}
@@ -47,7 +47,7 @@ public class RendererSecurity extends BaseBlockRender
this.renderInvBlock( EnumSet.of( ForgeDirection.SOUTH ), block, is, Tessellator.instance, 0x000000, renderer );
renderer.overrideBlockTexture = ExtraBlockTextures.MEChest.getIcon();
this.renderInvBlock( EnumSet.of( ForgeDirection.UP ), block, is, Tessellator.instance, adjustBrightness( AEColor.Transparent.whiteVariant, 0.7 ),
this.renderInvBlock( EnumSet.of( ForgeDirection.UP ), block, is, Tessellator.instance, this.adjustBrightness( AEColor.Transparent.whiteVariant, 0.7 ),
renderer );
renderer.overrideBlockTexture = null;
@@ -62,7 +62,7 @@ public class RendererSecurity extends BaseBlockRender
ForgeDirection up = sp.getUp();
preRenderInWorld( imb, world, x, y, z, renderer );
this.preRenderInWorld( imb, world, x, y, z, renderer );
boolean result = renderer.renderStandardBlock( imb, x, y, z );
@@ -78,20 +78,20 @@ public class RendererSecurity extends BaseBlockRender
Tessellator.instance.setColorOpaque_I( sp.getColor().whiteVariant );
IIcon ico = sp.isActive() ? ExtraBlockTextures.BlockMESecurityOn_Light.getIcon() : ExtraBlockTextures.MEChest.getIcon();
renderFace( x, y, z, imb, ico, renderer, up );
this.renderFace( x, y, z, imb, ico, renderer, up );
if ( sp.isActive() )
{
Tessellator.instance.setColorOpaque_I( sp.getColor().mediumVariant );
ico = sp.isActive() ? ExtraBlockTextures.BlockMESecurityOn_Medium.getIcon() : ExtraBlockTextures.MEChest.getIcon();
renderFace( x, y, z, imb, ico, renderer, up );
this.renderFace( x, y, z, imb, ico, renderer, up );
Tessellator.instance.setColorOpaque_I( sp.getColor().blackVariant );
ico = sp.isActive() ? ExtraBlockTextures.BlockMESecurityOn_Dark.getIcon() : ExtraBlockTextures.MEChest.getIcon();
renderFace( x, y, z, imb, ico, renderer, up );
this.renderFace( x, y, z, imb, ico, renderer, up );
}
renderer.overrideBlockTexture = null;
postRenderInWorld( renderer );
this.postRenderInWorld( renderer );
return result;
}
@@ -36,14 +36,14 @@ public class AssemblerFX extends EntityFX
public AssemblerFX(World w, double x, double y, double z, double r, double g, double b, float speed, IAEItemStack is) {
super( w, x, y, z, r, g, b );
motionX = 0;
motionY = 0;
motionZ = 0;
item = is;
this.motionX = 0;
this.motionY = 0;
this.motionZ = 0;
this.item = is;
this.speed = speed;
fi = new EntityFloatingItem( this, w, x, y, z, is.getItemStack() );
w.spawnEntityInWorld( fi );
particleMaxAge = (int) Math.ceil( Math.max( 1, 100.0f / speed ) ) + 2;
this.fi = new EntityFloatingItem( this, w, x, y, z, is.getItemStack() );
w.spawnEntityInWorld( this.fi );
this.particleMaxAge = (int) Math.ceil( Math.max( 1, 100.0f / speed ) ) + 2;
}
@Override
@@ -58,25 +58,25 @@ public class AssemblerFX extends EntityFX
{
super.onUpdate();
if ( isDead )
fi.setDead();
if ( this.isDead )
this.fi.setDead();
else
{
float lifeSpan = (float) this.particleAge / (float) this.particleMaxAge;
fi.setProgress( lifeSpan );
this.fi.setProgress( lifeSpan );
}
}
@Override
public void renderParticle(Tessellator tess, float l, float rX, float rY, float rZ, float rYZ, float rXY)
{
time += l;
if ( time > 4.0 )
this.time += l;
if ( this.time > 4.0 )
{
time -= 4.0;
this.time -= 4.0;
// if ( CommonHelper.proxy.shouldAddParticles( r ) )
for (int x = 0; x < (int) Math.ceil( speed / 5 ); x++)
CommonHelper.proxy.spawnEffect( EffectType.Crafting, worldObj, posX, posY, posZ, null );
for (int x = 0; x < (int) Math.ceil( this.speed / 5 ); x++)
CommonHelper.proxy.spawnEffect( EffectType.Crafting, this.worldObj, this.posX, this.posY, this.posZ, null );
}
}
@@ -47,18 +47,18 @@ public class CraftingFx extends EntityBreakingFX
public CraftingFx(World par1World, double par2, double par4, double par6, Item par8Item) {
super( par1World, par2, par4, par6, par8Item );
particleGravity = 0;
this.particleGravity = 0;
this.particleBlue = 1;
this.particleGreen = 0.9f;
this.particleRed = 1;
this.particleAlpha = 1.3f;
this.particleScale = 1.5f;
this.particleTextureIndex = ExtraBlockTextures.BlockEnergyParticle.getIcon();
particleMaxAge /= 1.2;
this.particleMaxAge /= 1.2;
startBlkX = MathHelper.floor_double( posX );
startBlkY = MathHelper.floor_double( posY );
startBlkZ = MathHelper.floor_double( posZ );
this.startBlkX = MathHelper.floor_double( this.posX );
this.startBlkY = MathHelper.floor_double( this.posY );
this.startBlkZ = MathHelper.floor_double( this.posZ );
}
public void fromItem(ForgeDirection d)
@@ -97,7 +97,7 @@ public class CraftingFx extends EntityBreakingFX
int blkX = MathHelper.floor_double( offX );
int blkY = MathHelper.floor_double( offY );
int blkZ = MathHelper.floor_double( offZ );
if ( blkX == startBlkX && blkY == startBlkY && blkZ == startBlkZ )
if ( blkX == this.startBlkX && blkY == this.startBlkY && blkZ == this.startBlkZ )
{
offX -= interpPosX;
offY -= interpPosY;
@@ -47,7 +47,7 @@ public class EnergyFx extends EntityBreakingFX
public EnergyFx(World par1World, double par2, double par4, double par6, Item par8Item) {
super( par1World, par2, par4, par6, par8Item );
particleGravity = 0;
this.particleGravity = 0;
this.particleBlue = 255;
this.particleGreen = 255;
this.particleRed = 255;
@@ -55,9 +55,9 @@ public class EnergyFx extends EntityBreakingFX
this.particleScale = 3.5f;
this.particleTextureIndex = ExtraBlockTextures.BlockEnergyParticle.getIcon();
startBlkX = MathHelper.floor_double( posX );
startBlkY = MathHelper.floor_double( posY );
startBlkZ = MathHelper.floor_double( posZ );
this.startBlkX = MathHelper.floor_double( this.posX );
this.startBlkY = MathHelper.floor_double( this.posY );
this.startBlkZ = MathHelper.floor_double( this.posZ );
}
public void fromItem(ForgeDirection d)
@@ -90,11 +90,11 @@ public class EnergyFx extends EntityBreakingFX
float f13 = (float) (this.prevPosZ + (this.posZ - this.prevPosZ) * par2 - interpPosZ);
float f14 = 1.0F;
int blkX = MathHelper.floor_double( posX );
int blkY = MathHelper.floor_double( posY );
int blkZ = MathHelper.floor_double( posZ );
int blkX = MathHelper.floor_double( this.posX );
int blkY = MathHelper.floor_double( this.posY );
int blkZ = MathHelper.floor_double( this.posZ );
if ( blkX == startBlkX && blkY == startBlkY && blkZ == startBlkZ )
if ( blkX == this.startBlkX && blkY == this.startBlkY && blkZ == this.startBlkZ )
{
par1Tessellator.setColorRGBA_F( this.particleRed * f14, this.particleGreen * f14, this.particleBlue * f14, this.particleAlpha );
par1Tessellator.addVertexWithUV( f11 - par3 * f10 - par6 * f10, f12 - par4 * f10, f13 - par5 * f10 - par7 * f10,
@@ -34,23 +34,23 @@ public class LightningArcFX extends LightningFX
this.ry = ey - y;
this.rz = ez - z;
regen();
this.regen();
}
@Override
protected void regen()
{
double i = 1.0 / (steps - 1);
double lastDirectionX = rx * i;
double lastDirectionY = ry * i;
double lastDirectionZ = rz * i;
double i = 1.0 / (this.steps - 1);
double lastDirectionX = this.rx * i;
double lastDirectionY = this.ry * i;
double lastDirectionZ = this.rz * i;
double len = Math.sqrt( lastDirectionX * lastDirectionX + lastDirectionY * lastDirectionY + lastDirectionZ * lastDirectionZ );
for (int s = 0; s < steps; s++)
for (int s = 0; s < this.steps; s++)
{
Steps[s][0] = (lastDirectionX + (rng.nextDouble() - 0.5) * len * 1.2) / 2.0;
Steps[s][1] = (lastDirectionY + (rng.nextDouble() - 0.5) * len * 1.2) / 2.0;
Steps[s][2] = (lastDirectionZ + (rng.nextDouble() - 0.5) * len * 1.2) / 2.0;
this.Steps[s][0] = (lastDirectionX + (rng.nextDouble() - 0.5) * len * 1.2) / 2.0;
this.Steps[s][1] = (lastDirectionY + (rng.nextDouble() - 0.5) * len * 1.2) / 2.0;
this.Steps[s][2] = (lastDirectionZ + (rng.nextDouble() - 0.5) * len * 1.2) / 2.0;
}
}
@@ -30,17 +30,17 @@ import net.minecraft.world.World;
public class LightningFX extends EntityFX
{
final int steps = getSteps();
final int steps = this.getSteps();
static final Random rng = new Random();
final double[][] Steps;
protected LightningFX(World w, double x, double y, double z, double r, double g, double b, int maxAge) {
super( w, x, y, z, r, g, b );
Steps = new double[steps][3];
motionX = 0;
motionY = 0;
motionZ = 0;
particleMaxAge = maxAge;
this.Steps = new double[this.steps][3];
this.motionX = 0;
this.motionY = 0;
this.motionZ = 0;
this.particleMaxAge = maxAge;
}
private int getSteps()
@@ -50,7 +50,7 @@ public class LightningFX extends EntityFX
public LightningFX(World w, double x, double y, double z, double r, double g, double b) {
this( w, x, y, z, r, g, b, 6 );
regen();
this.regen();
}
float currentPoint = 0;
@@ -67,11 +67,11 @@ public class LightningFX extends EntityFX
double lastDirectionX = (rng.nextDouble() - 0.5) * 0.9;
double lastDirectionY = (rng.nextDouble() - 0.5) * 0.9;
double lastDirectionZ = (rng.nextDouble() - 0.5) * 0.9;
for (int s = 0; s < steps; s++)
for (int s = 0; s < this.steps; s++)
{
Steps[s][0] = lastDirectionX = (lastDirectionX + (rng.nextDouble() - 0.5) * 0.9) / 2.0;
Steps[s][1] = lastDirectionY = (lastDirectionY + (rng.nextDouble() - 0.5) * 0.9) / 2.0;
Steps[s][2] = lastDirectionZ = (lastDirectionZ + (rng.nextDouble() - 0.5) * 0.9) / 2.0;
this.Steps[s][0] = lastDirectionX = (lastDirectionX + (rng.nextDouble() - 0.5) * 0.9) / 2.0;
this.Steps[s][1] = lastDirectionY = (lastDirectionY + (rng.nextDouble() - 0.5) * 0.9) / 2.0;
this.Steps[s][2] = lastDirectionZ = (lastDirectionZ + (rng.nextDouble() - 0.5) * 0.9) / 2.0;
}
}
@@ -80,9 +80,9 @@ public class LightningFX extends EntityFX
{
float j = 1.0f;
tess.setColorRGBA_F( this.particleRed * j * 0.9f, this.particleGreen * j * 0.95f, this.particleBlue * j, this.particleAlpha );
if ( particleAge == 3 )
if ( this.particleAge == 3 )
{
regen();
this.regen();
}
double f6 = this.particleTextureIndexX / 16.0;
double f7 = f6 + 0.0324375F;
@@ -127,17 +127,17 @@ public class LightningFX extends EntityFX
for (int cycle = 0; cycle < 3; cycle++)
{
clear();
this.clear();
double x = (this.prevPosX + (this.posX - this.prevPosX) * l - interpPosX) - offX;
double y = (this.prevPosY + (this.posY - this.prevPosY) * l - interpPosY) - offY;
double z = (this.prevPosZ + (this.posZ - this.prevPosZ) * l - interpPosZ) - offZ;
for (int s = 0; s < steps; s++)
for (int s = 0; s < this.steps; s++)
{
double xN = x + Steps[s][0];
double yN = y + Steps[s][1];
double zN = z + Steps[s][2];
double xN = x + this.Steps[s][0];
double yN = y + this.Steps[s][1];
double zN = z + this.Steps[s][2];
double xD = xN - x;
double yD = yN - y;
@@ -162,7 +162,7 @@ public class LightningFX extends EntityFX
oz = (xD * 0) - (1 * yD);
}
double ss = Math.sqrt( ox * ox + oy * oy + oz * oz ) / ((((double) steps - (double) s) / steps) * scale);
double ss = Math.sqrt( ox * ox + oy * oy + oz * oz ) / ((((double) this.steps - (double) s) / this.steps) * scale);
ox /= ss;
oy /= ss;
oz /= ss;
@@ -175,7 +175,7 @@ public class LightningFX extends EntityFX
b[1] = y;
b[2] = z;
draw( tess, a, b, f6, f8 );
this.draw( tess, a, b, f6, f8 );
x = xN;
y = yN;
@@ -195,23 +195,23 @@ public class LightningFX extends EntityFX
private void draw(Tessellator tess, double[] a, double[] b, double f6, double f8)
{
if ( hasData )
if ( this.hasData )
{
tess.addVertexWithUV( a[0], a[1], a[2], f6, f8 );
tess.addVertexWithUV( I[0], I[1], I[2], f6, f8 );
tess.addVertexWithUV( K[0], K[1], K[2], f6, f8 );
tess.addVertexWithUV( this.I[0], this.I[1], this.I[2], f6, f8 );
tess.addVertexWithUV( this.K[0], this.K[1], this.K[2], f6, f8 );
tess.addVertexWithUV( b[0], b[1], b[2], f6, f8 );
}
hasData = true;
this.hasData = true;
for (int x = 0; x < 3; x++)
{
I[x] = a[x];
K[x] = b[x];
this.I[x] = a[x];
this.K[x] = b[x];
}
}
private void clear()
{
hasData = false;
this.hasData = false;
}
}
@@ -33,7 +33,7 @@ public class MatterCannonFX extends EntityBreakingFX
public MatterCannonFX(World par1World, double par2, double par4, double par6, Item par8Item) {
super( par1World, par2, par4, par6, par8Item );
particleGravity = 0;
this.particleGravity = 0;
this.particleBlue = 255;
this.particleGreen = 255;
this.particleRed = 255;
@@ -40,7 +40,7 @@ public class ItemEncodedPatternRenderer implements IItemRenderer
{
boolean isShiftHeld = Keyboard.isKeyDown( Keyboard.KEY_LSHIFT ) || Keyboard.isKeyDown( Keyboard.KEY_RSHIFT );
if ( !recursive && type == IItemRenderer.ItemRenderType.INVENTORY && isShiftHeld )
if ( !this.recursive && type == IItemRenderer.ItemRenderType.INVENTORY && isShiftHeld )
{
ItemEncodedPattern iep = (ItemEncodedPattern) item.getItem();
if ( iep.getOutput( item ) != null )
@@ -59,7 +59,7 @@ public class ItemEncodedPatternRenderer implements IItemRenderer
@Override
public void renderItem(ItemRenderType type, ItemStack item, Object... data)
{
recursive = true;
this.recursive = true;
ItemEncodedPattern iep = (ItemEncodedPattern) item.getItem();
@@ -68,10 +68,10 @@ public class ItemEncodedPatternRenderer implements IItemRenderer
GL11.glPushAttrib( GL11.GL_ALL_ATTRIB_BITS );
RenderHelper.enableGUIStandardItemLighting();
ri.renderItemAndEffectIntoGUI( mc.fontRenderer, mc.getTextureManager(), is, 0, 0 );
this.ri.renderItemAndEffectIntoGUI( mc.fontRenderer, mc.getTextureManager(), is, 0, 0 );
RenderHelper.disableStandardItemLighting();
GL11.glPopAttrib();
recursive = false;
this.recursive = false;
}
}
@@ -34,60 +34,60 @@ public class ModelCompass extends ModelBase
final ModelRenderer Pointer;
public ModelCompass() {
textureWidth = 16;
textureHeight = 8;
this.textureWidth = 16;
this.textureHeight = 8;
Ring1 = new ModelRenderer( this, 0, 0 );
Ring1.addBox( 0F, 0F, 0F, 4, 1, 1 );
Ring1.setRotationPoint( -2F, 22F, 2F );
Ring1.setTextureSize( 16, 8 );
Ring1.mirror = true;
setRotation( Ring1, 0F, 0F, 0F );
this.Ring1 = new ModelRenderer( this, 0, 0 );
this.Ring1.addBox( 0F, 0F, 0F, 4, 1, 1 );
this.Ring1.setRotationPoint( -2F, 22F, 2F );
this.Ring1.setTextureSize( 16, 8 );
this.Ring1.mirror = true;
this.setRotation( this.Ring1, 0F, 0F, 0F );
Ring2 = new ModelRenderer( this, 0, 0 );
Ring2.addBox( 0F, 0F, 0F, 1, 1, 4 );
Ring2.setRotationPoint( -3F, 22F, -2F );
Ring2.setTextureSize( 16, 8 );
Ring2.mirror = true;
setRotation( Ring2, 0F, 0F, 0F );
this.Ring2 = new ModelRenderer( this, 0, 0 );
this.Ring2.addBox( 0F, 0F, 0F, 1, 1, 4 );
this.Ring2.setRotationPoint( -3F, 22F, -2F );
this.Ring2.setTextureSize( 16, 8 );
this.Ring2.mirror = true;
this.setRotation( this.Ring2, 0F, 0F, 0F );
Ring3 = new ModelRenderer( this, 0, 0 );
Ring3.addBox( 0F, 0F, 0F, 4, 1, 1 );
Ring3.setRotationPoint( -2F, 22F, -3F );
Ring3.setTextureSize( 16, 8 );
Ring3.mirror = true;
setRotation( Ring3, 0F, 0F, 0F );
this.Ring3 = new ModelRenderer( this, 0, 0 );
this.Ring3.addBox( 0F, 0F, 0F, 4, 1, 1 );
this.Ring3.setRotationPoint( -2F, 22F, -3F );
this.Ring3.setTextureSize( 16, 8 );
this.Ring3.mirror = true;
this.setRotation( this.Ring3, 0F, 0F, 0F );
Ring4 = new ModelRenderer( this, 0, 0 );
Ring4.addBox( 0F, 0F, 0F, 1, 1, 4 );
Ring4.setRotationPoint( 2F, 22F, -2F );
Ring4.setTextureSize( 16, 8 );
Ring4.mirror = true;
setRotation( Ring4, 0F, 0F, 0F );
this.Ring4 = new ModelRenderer( this, 0, 0 );
this.Ring4.addBox( 0F, 0F, 0F, 1, 1, 4 );
this.Ring4.setRotationPoint( 2F, 22F, -2F );
this.Ring4.setTextureSize( 16, 8 );
this.Ring4.mirror = true;
this.setRotation( this.Ring4, 0F, 0F, 0F );
Middle = new ModelRenderer( this, 0, 0 );
Middle.addBox( 0F, 0F, 0F, 1, 1, 1 );
Middle.setRotationPoint( -0.5333334F, 22F, -0.5333334F );
Middle.setTextureSize( 16, 8 );
Middle.mirror = true;
setRotation( Middle, 0F, 0F, 0F );
this.Middle = new ModelRenderer( this, 0, 0 );
this.Middle.addBox( 0F, 0F, 0F, 1, 1, 1 );
this.Middle.setRotationPoint( -0.5333334F, 22F, -0.5333334F );
this.Middle.setTextureSize( 16, 8 );
this.Middle.mirror = true;
this.setRotation( this.Middle, 0F, 0F, 0F );
Pointer = new ModelRenderer( this, 0, 0 );
Pointer.setTextureOffset( 0, 5 );
Pointer.addBox( -0.5F, 0F, 0F, 1, 1, 2 );
Pointer.setRotationPoint( 0.5F, 22.5F, 0.5F );
Pointer.setTextureSize( 16, 8 );
Pointer.mirror = true;
Pointer.offsetZ = -0.034f;
Pointer.offsetX = -0.034f;
setRotation( Pointer, 0F, 0F, 0F );
this.Pointer = new ModelRenderer( this, 0, 0 );
this.Pointer.setTextureOffset( 0, 5 );
this.Pointer.addBox( -0.5F, 0F, 0F, 1, 1, 2 );
this.Pointer.setRotationPoint( 0.5F, 22.5F, 0.5F );
this.Pointer.setTextureSize( 16, 8 );
this.Pointer.mirror = true;
this.Pointer.offsetZ = -0.034f;
this.Pointer.offsetX = -0.034f;
this.setRotation( this.Pointer, 0F, 0F, 0F );
Base = new ModelRenderer( this, 0, 0 );
Base.addBox( 0F, 0F, 0F, 4, 1, 4 );
Base.setRotationPoint( -2F, 23F, -2F );
Base.setTextureSize( 16, 8 );
Base.mirror = true;
setRotation( Base, 0F, 0F, 0F );
this.Base = new ModelRenderer( this, 0, 0 );
this.Base.addBox( 0F, 0F, 0F, 4, 1, 4 );
this.Base.setRotationPoint( -2F, 23F, -2F );
this.Base.setTextureSize( 16, 8 );
this.Base.mirror = true;
this.setRotation( this.Base, 0F, 0F, 0F );
}
private void setRotation(ModelRenderer model, float x, float y, float z)
@@ -99,18 +99,18 @@ public class ModelCompass extends ModelBase
public void renderAll(float rad)
{
setRotation( Pointer, 0F, 0F, 0F );
this.setRotation( this.Pointer, 0F, 0F, 0F );
Pointer.rotateAngleY = rad;
this.Pointer.rotateAngleY = rad;
Base.render( 0.0625F );
Middle.render( 0.0625F );
this.Base.render( 0.0625F );
this.Middle.render( 0.0625F );
Pointer.render( 0.0625F );
this.Pointer.render( 0.0625F );
Ring1.render( 0.0625F );
Ring2.render( 0.0625F );
Ring3.render( 0.0625F );
Ring4.render( 0.0625F );
this.Ring1.render( 0.0625F );
this.Ring2.render( 0.0625F );
this.Ring3.render( 0.0625F );
this.Ring4.render( 0.0625F );
}
}