fujin/Applied-Energistics-2
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Renamed constants

Browse Source
This commit is contained in:
thatsIch
2015-01-01 22:13:10 +01:00
parent e0175bac98
commit 52c512635d
118 changed files with 511 additions and 508 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/main/java/appeng/client/render/blocks/RenderBlockAssembler.java
+6 -6
View File
@@ -201,14 +201,14 @@ public class RenderBlockAssembler extends BaseBlockRender implements IBoxProvide
return false;
}
BusRenderer.instance.renderer.blockAccess = renderer.blockAccess;
renderer = BusRenderer.instance.renderer;
BusRenderer.INSTANCE.renderer.blockAccess = renderer.blockAccess;
renderer = BusRenderer.INSTANCE.renderer;
this.preRenderInWorld( block, world, x, y, z, renderer );
tma.lightCache = BusRenderHelper.instance.useSimplifiedRendering( x, y, z, this, tma.lightCache );
tma.lightCache = BusRenderHelper.INSTANCE.useSimplifiedRendering( x, y, z, this, tma.lightCache );
BusRenderer.instance.renderer.isFacade = true;
BusRenderer.INSTANCE.renderer.isFacade = true;
IOrientable te = this.getOrientable( block, world, x, y, z );
ForgeDirection fdy = te.getUp();
@@ -262,12 +262,12 @@ public class RenderBlockAssembler extends BaseBlockRender implements IBoxProvide
this.renderBlockBounds( renderer, 1, 1, 1, 15, 15, 15, fdx, fdy, fdz );
renderer.renderStandardBlock( blk, x, y, z );
BusRenderHelper.instance.normalRendering();
BusRenderHelper.INSTANCE.normalRendering();
blk.getRendererInstance().setTemporaryRenderIcon( null );
renderer.renderAllFaces = false;
BusRenderer.instance.renderer.isFacade = false;
BusRenderer.INSTANCE.renderer.isFacade = false;
this.postRenderInWorld( renderer );
src/main/java/appeng/client/render/blocks/RenderBlockCraftingCPU.java
+4 -4
View File
@@ -74,9 +74,9 @@ public class RenderBlockCraftingCPU extends BaseBlockRender
if ( formed && renderer.overrideBlockTexture == null )
{
renderer = BusRenderer.instance.renderer;
BusRenderHelper i = BusRenderHelper.instance;
BusRenderer.instance.renderer.isFacade = true;
renderer = BusRenderer.INSTANCE.renderer;
BusRenderHelper i = BusRenderHelper.INSTANCE;
BusRenderer.INSTANCE.renderer.isFacade = true;
renderer.blockAccess = w;
i.setPass( 0 );
@@ -122,7 +122,7 @@ public class RenderBlockCraftingCPU extends BaseBlockRender
this.handleSide( blk, meta, x, y, z, i, renderer, ct.getForward() == side ? theIcon : nonForward, LocalEmit, isMonitor, side, w );
}
BusRenderer.instance.renderer.isFacade = false;
BusRenderer.INSTANCE.renderer.isFacade = false;
i.setFacesToRender( EnumSet.allOf( ForgeDirection.class ) );
i.normalRendering();
src/main/java/appeng/client/render/blocks/RenderBlockSkyCompass.java
+3 -3
View File
@@ -108,11 +108,11 @@ public class RenderBlockSkyCompass extends BaseBlockRender
int x = (int) p.posX;
int y = (int) p.posY;
int z = (int) p.posZ;
CompassResult cr = CompassManager.instance.getCompassDirection( 0, x, y, z );
CompassResult cr = CompassManager.INSTANCE.getCompassDirection( 0, x, y, z );
for (int i = 0; i < 3; i++)
for (int j = 0; j < 3; j++)
CompassManager.instance.getCompassDirection( 0, x + i - 1, y, z + j - 1 );
CompassManager.INSTANCE.getCompassDirection( 0, x + i - 1, y, z + j - 1 );
if ( cr.hasResult )
{
@@ -187,7 +187,7 @@ public class RenderBlockSkyCompass extends BaseBlockRender
CompassResult cr = null;
if ( skyCompass.getForward() == ForgeDirection.UP || skyCompass.getForward() == ForgeDirection.DOWN )
cr = CompassManager.instance.getCompassDirection( 0, tile.xCoord, tile.yCoord, tile.zCoord );
cr = CompassManager.INSTANCE.getCompassDirection( 0, tile.xCoord, tile.yCoord, tile.zCoord );
else
cr = new CompassResult( false, true, 0 );
src/main/java/appeng/client/render/blocks/RendererCableBus.java
+6 -6
View File
@@ -51,14 +51,14 @@ public class RendererCableBus extends BaseBlockRender
if ( t instanceof TileCableBus )
{
BusRenderer.instance.renderer.renderAllFaces = true;
BusRenderer.instance.renderer.blockAccess = renderer.blockAccess;
BusRenderer.instance.renderer.overrideBlockTexture = renderer.overrideBlockTexture;
BusRenderer.INSTANCE.renderer.renderAllFaces = true;
BusRenderer.INSTANCE.renderer.blockAccess = renderer.blockAccess;
BusRenderer.INSTANCE.renderer.overrideBlockTexture = renderer.overrideBlockTexture;
((TileCableBus) t).cb.renderStatic( x, y, z );
BusRenderer.instance.renderer.renderAllFaces = false;
BusRenderer.INSTANCE.renderer.renderAllFaces = false;
}
return BusRenderHelper.instance.getItemsRendered() > 0;
return BusRenderHelper.INSTANCE.getItemsRendered() > 0;
}
@Override
@@ -66,7 +66,7 @@ public class RendererCableBus extends BaseBlockRender
{
if ( t instanceof TileCableBus )
{
BusRenderer.instance.renderer.overrideBlockTexture = null;
BusRenderer.INSTANCE.renderer.overrideBlockTexture = null;
((TileCableBus) t).cb.renderDynamic( x, y, z );
}
}