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

Reduce scope of variables

Browse Source
This commit is contained in:
thatsIch
2015-09-30 14:22:21 +02:00
parent dca09fe0a6
commit 059523f543
70 changed files with 151 additions and 199 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/main/java/appeng/client/render/BaseBlockRender.java
+7 -10
View File
@@ -332,10 +332,9 @@ public class BaseBlockRender<B extends AEBaseBlock, T extends AEBaseTile>
public void renderInvBlock( EnumSet<AEPartLocation> sides, B block, ItemStack item, int color, ModelGenerator tess )
{
int meta = 0;
if( block != null && block.hasSubtypes() && item != null )
{
meta = item.getItemDamage();
int meta = item.getItemDamage();
}
IAESprite[] icons = tess.getIcon( item == null ? block.getDefaultState() : block.getStateFromMeta( item.getMetadata() ) );
@@ -408,15 +407,13 @@ public class BaseBlockRender<B extends AEBaseBlock, T extends AEBaseTile>
public void preRenderInWorld( B block, IBlockAccess world, BlockPos pos, ModelGenerator renderer )
{
EnumFacing forward = EnumFacing.SOUTH;
EnumFacing up = EnumFacing.UP;
BlockRenderInfo info = block.getRendererInstance();
IOrientable te = this.getOrientable( block, world, pos );
if( te != null )
{
forward = te.getForward() ;
up = te.getUp() ;
EnumFacing forward = te.getForward();
EnumFacing up = te.getUp();
renderer.uvRotateBottom = info.getTexture( AEPartLocation.DOWN ).setFlip( getOrientation( EnumFacing.DOWN, forward, up ) );
renderer.uvRotateTop = info.getTexture( AEPartLocation.UP ).setFlip( getOrientation( EnumFacing.UP, forward, up ) );
@@ -501,9 +498,7 @@ public class BaseBlockRender<B extends AEBaseBlock, T extends AEBaseTile>
double offsetY = 0.0;
double offsetZ = 0.0;
double layerAX = 0.0;
double layerAY = 0.0;
double layerAZ = 0.0;
double layerBX = 0.0;
double layerBY = 0.0;
double layerBZ = 0.0;
@@ -560,6 +555,8 @@ public class BaseBlockRender<B extends AEBaseBlock, T extends AEBaseTile>
offsetY += pos.getY();
offsetZ += pos.getZ();
double layerBX = 0.0;
double layerAY = 0.0;
this.renderFace(orientation, tess, offsetX, offsetY, offsetZ, layerAX, layerAY, layerAZ, layerBX, layerBY, layerBZ,
// u -> u
0, 1.0,
@@ -672,11 +669,11 @@ public class BaseBlockRender<B extends AEBaseBlock, T extends AEBaseTile>
public void renderTile( B block, T tile, WorldRenderer tess, double x, double y, double z, float f, ModelGenerator renderer )
{
AEPartLocation forward = AEPartLocation.SOUTH;
AEPartLocation up = AEPartLocation.UP;
renderer.uvRotateBottom = renderer.uvRotateTop = renderer.uvRotateEast = renderer.uvRotateWest = renderer.uvRotateNorth = renderer.uvRotateSouth = 0;
AEPartLocation up = AEPartLocation.UP;
AEPartLocation forward = AEPartLocation.SOUTH;
this.applyTESRRotation( x, y, z, forward.getFacing(), up.getFacing() );
Minecraft.getMinecraft().getTextureManager().bindTexture( TextureMap.locationBlocksTexture );
src/main/java/appeng/client/render/BusRenderHelper.java
+1 -1
View File
@@ -308,7 +308,6 @@ public final class BusRenderHelper implements IPartRenderHelper
{
EnumFacing forward = this.az;
EnumFacing up = this.ay;
EnumFacing west = null;
if( forward == null || up == null )
{
@@ -319,6 +318,7 @@ public final class BusRenderHelper implements IPartRenderHelper
int west_y = forward.getFrontOffsetZ() * up.getFrontOffsetX() - forward.getFrontOffsetX() * up.getFrontOffsetZ();
int west_z = forward.getFrontOffsetX() * up.getFrontOffsetY() - forward.getFrontOffsetY() * up.getFrontOffsetX();
EnumFacing west = null;
for( EnumFacing dx : EnumFacing.VALUES )
{
if( dx.getFrontOffsetX() == west_x && dx.getFrontOffsetY() == west_y && dx.getFrontOffsetZ() == west_z )
src/main/java/appeng/client/render/CableRenderHelper.java
+1 -1
View File
@@ -128,9 +128,9 @@ public class CableRenderHelper
IFacadePart fPart = iFacadeContainer.getFacade( s );
if( fPart != null )
{
AEAxisAlignedBB b = null;
fPart.setThinFacades( useThinFacades );
AxisAlignedBB pb = fPart.getPrimaryBox();
AEAxisAlignedBB b = null;
for( AxisAlignedBB bb : boxes )
{
if( bb.intersectsWith( pb ) )
src/main/java/appeng/client/render/blocks/RenderBlockCraftingCPU.java
+2 -4
View File
@@ -59,7 +59,6 @@ public class RenderBlockCraftingCPU<B extends BlockCraftingUnit, T extends TileC
@Override
public boolean renderInWorld( B blk, IBlockAccess w, BlockPos pos, ModelGenerator renderer )
{
IAESprite theIcon = null;
boolean formed = false;
boolean emitsLight = false;
@@ -71,7 +70,7 @@ public class RenderBlockCraftingCPU<B extends BlockCraftingUnit, T extends TileC
}
boolean isMonitor = blk.getClass() == BlockCraftingMonitor.class;
theIcon = renderer.getIcon( w.getBlockState( pos ) )[EnumFacing.SOUTH.ordinal()];// blk.getIcon( AEPartLocation.SOUTH.ordinal(), meta | ( formed ? 8 : 0 ) );
IAESprite theIcon = renderer.getIcon( w.getBlockState( pos ) )[EnumFacing.SOUTH.ordinal()];
int meta = 1;
for( Block craftingBlock : AEApi.instance().definitions().blocks().craftingUnit().maybeBlock().asSet() )
@@ -299,11 +298,10 @@ public class RenderBlockCraftingCPU<B extends BlockCraftingUnit, T extends TileC
i.setTexture( ExtraBlockTextures.BlockCraftingUnitRingLong.getIcon() );
}
double width = 3.0 / 16.0;
AEPartLocation dir = AEPartLocation.fromFacing( a );
if( !( i.getBound( dir ) < 0.001 || i.getBound( dir ) > 15.999 ) )
{
double width = 3.0 / 16.0;
switch( a )
{
case DOWN:
src/main/java/appeng/client/render/blocks/RenderBlockPaint.java
+2 -3
View File
@@ -63,11 +63,8 @@ public class RenderBlockPaint extends BaseBlockRender<BlockPaint, TilePaint>
IAESprite[] icoSet = { imb.getIcon( EnumFacing.UP, imb.getDefaultState() ), ExtraBlockTextures.BlockPaint2.getIcon(), ExtraBlockTextures.BlockPaint3.getIcon() };
int lumen = 14 << 20 | 14 << 4;
int brightness = imb.getMixedBrightnessForBlock( world, pos );
double offsetConstant = 0.001;
EnumSet<EnumFacing> validSides = EnumSet.noneOf( EnumFacing.class );
for( EnumFacing side : EnumFacing.VALUES )
@@ -78,6 +75,8 @@ public class RenderBlockPaint extends BaseBlockRender<BlockPaint, TilePaint>
}
}
double offsetConstant = 0.001;
int lumen = 14 << 20 | 14 << 4;
for( Splotch s : tp.getDots() )
{
if( !validSides.contains( s.side ) )
src/main/java/appeng/client/render/blocks/RenderMEChest.java
+1 -1
View File
@@ -85,7 +85,6 @@ public class RenderMEChest extends BaseBlockRender<BlockChest, TileChest>
this.selectFace( renderer, west, up, forward, 5, 16 - 5, 9, 12 );
int offsetU = -4;
int offsetV = 8;
if( stat == 0 )
{
@@ -96,6 +95,7 @@ public class RenderMEChest extends BaseBlockRender<BlockChest, TileChest>
renderer.setBrightness( b );
renderer.setColorOpaque_I( 0xffffff );
int offsetU = -4;
FlippableIcon flippableIcon = new FlippableIcon( new OffsetIcon( ExtraBlockTextures.MEStorageCellTextures.getIcon(), offsetU, offsetV ) );
if( forward == EnumFacing.EAST && ( up == EnumFacing.NORTH || up == EnumFacing.SOUTH ) )
{
src/main/java/appeng/client/render/blocks/RenderQNB.java
+2 -2
View File
@@ -117,8 +117,8 @@ public class RenderQNB extends BaseBlockRender<BlockQuantumBase, TileQuantumBrid
renderMax = 12.1f / 16.0f;
renderer.setRenderBounds( renderMin, renderMin, renderMin, renderMax, renderMax, renderMax );
int bn = 15;
renderer.setColorOpaque_F( 1.0F, 1.0F, 1.0F );
int bn = 15;
renderer.setBrightness( bn << 20 | bn << 4 );
for( EnumFacing side : EnumFacing.VALUES )
{
@@ -145,8 +145,8 @@ public class RenderQNB extends BaseBlockRender<BlockQuantumBase, TileQuantumBrid
renderMax = 16.01f / 16.0f;
renderer.setRenderBounds( renderMin, renderMin, renderMin, renderMax, renderMax, renderMax );
int bn = 15;
renderer.setColorOpaque_F( 1.0F, 1.0F, 1.0F );
int bn = 15;
renderer.setBrightness( bn << 20 | bn << 4 );
for( EnumFacing side : EnumFacing.VALUES )
{
src/main/java/appeng/client/render/blocks/RenderQuartzTorch.java
+17 -22
View File
@@ -46,18 +46,12 @@ public class RenderQuartzTorch extends BaseBlockRender<AEBaseBlock, AEBaseTile>
@Override
public void renderInventory( AEBaseBlock blk, ItemStack is, ModelGenerator renderer, ItemRenderType type, Object[] obj )
{
float Point2 = 6.0f / 16.0f;
float Point3 = 7.0f / 16.0f;
float Point13 = 10.0f / 16.0f;
float Point12 = 9.0f / 16.0f;
float singlePixel = 1.0f / 16.0f;
float renderBottom = 5.0f / 16.0f;
float renderTop = 10.0f / 16.0f;
float bottom = 7.0f / 16.0f;
float top = 8.0f / 16.0f;
float xOff = 0.0f;
float yOff = 0.0f;
float zOff = 0.0f;
@@ -65,6 +59,7 @@ public class RenderQuartzTorch extends BaseBlockRender<AEBaseBlock, AEBaseTile>
renderer.setRenderBounds( Point3 + xOff, renderBottom + yOff, Point3 + zOff, Point12 + xOff, renderTop + yOff, Point12 + zOff );
this.renderInvBlock( EnumSet.allOf( AEPartLocation.class ), blk, is, 0xffffff, renderer );
float singlePixel = 1.0f / 16.0f;
renderer.setRenderBounds( Point3 + xOff, renderTop + yOff, Point3 + zOff, Point3 + singlePixel + xOff, renderTop + singlePixel + yOff, Point3 + singlePixel + zOff );
this.renderInvBlock( EnumSet.allOf( AEPartLocation.class ), blk, is, 0xffffff, renderer );
@@ -75,6 +70,10 @@ public class RenderQuartzTorch extends BaseBlockRender<AEBaseBlock, AEBaseTile>
blk.getRendererInstance().setTemporaryRenderIcon( renderer.getIcon( Blocks.hopper.getDefaultState() )[0] );
renderer.renderAllFaces = true;
float top = 8.0f / 16.0f;
float bottom = 7.0f / 16.0f;
float Point13 = 10.0f / 16.0f;
float Point2 = 6.0f / 16.0f;
renderer.setRenderBounds( Point2 + xOff, bottom + yOff, Point2 + zOff, Point13 + xOff, top + yOff, Point3 + zOff );
this.renderInvBlock( EnumSet.allOf( AEPartLocation.class ), blk, is, 0xffffff, renderer );
@@ -97,23 +96,10 @@ public class RenderQuartzTorch extends BaseBlockRender<AEBaseBlock, AEBaseTile>
{
IOrientable te = ( (IOrientableBlock) block ).getOrientable( world, pos );
float Point2 = 6.0f / 16.0f;
float Point3 = 7.0f / 16.0f;
float Point13 = 10.0f / 16.0f;
float Point12 = 9.0f / 16.0f;
float singlePixel = 1.0f / 16.0f;
float renderBottom = 5.0f / 16.0f;
float renderTop = 10.0f / 16.0f;
float bottom = 7.0f / 16.0f;
float top = 8.0f / 16.0f;
float xOff = 0.0f;
float yOff = 0.0f;
float zOff = 0.0f;
renderer.renderAllFaces = true;
float zOff = 0.0f;
float yOff = 0.0f;
float xOff = 0.0f;
if( te != null )
{
AEPartLocation forward = AEPartLocation.fromFacing( te.getUp() );
@@ -122,10 +108,15 @@ public class RenderQuartzTorch extends BaseBlockRender<AEBaseBlock, AEBaseTile>
zOff = forward.zOffset * -( 4.0f / 16.0f );
}
float renderTop = 10.0f / 16.0f;
float renderBottom = 5.0f / 16.0f;
float Point12 = 9.0f / 16.0f;
float Point3 = 7.0f / 16.0f;
renderer.setRenderBounds( Point3 + xOff, renderBottom + yOff, Point3 + zOff, Point12 + xOff, renderTop + yOff, Point12 + zOff );
super.renderInWorld( block, world, pos, renderer );
int r = ( pos.getX() + pos.getY() + pos.getZ() ) % 2;
float singlePixel = 1.0f / 16.0f;
if( r == 0 )
{
renderer.setRenderBounds( Point3 + xOff, renderTop + yOff, Point3 + zOff, Point3 + singlePixel + xOff, renderTop + singlePixel + yOff, Point3 + singlePixel + zOff );
@@ -145,6 +136,10 @@ public class RenderQuartzTorch extends BaseBlockRender<AEBaseBlock, AEBaseTile>
block.getRendererInstance().setTemporaryRenderIcon( renderer.getIcon( Blocks.hopper.getDefaultState() )[0] );
float top = 8.0f / 16.0f;
float bottom = 7.0f / 16.0f;
float Point13 = 10.0f / 16.0f;
float Point2 = 6.0f / 16.0f;
renderer.setRenderBounds( Point2 + xOff, bottom + yOff, Point2 + zOff, Point13 + xOff, top + yOff, Point3 + zOff );
boolean out = renderer.renderStandardBlock( block, pos );
src/main/java/appeng/client/render/blocks/RenderSpatialPylon.java
+1 -1
View File
@@ -59,10 +59,10 @@ public class RenderSpatialPylon extends BaseBlockRender<BlockSpatialPylon, TileS
TileSpatialPylon sp = imb.getTileEntity( world, pos );
int displayBits = ( sp == null ) ? 0 : sp.getDisplayBits();
EnumFacing ori = null;//AEPartLocation.INTERNAL;
if( displayBits != 0 )
{
EnumFacing ori = null;//AEPartLocation.INTERNAL;
if( ( displayBits & TileSpatialPylon.DISPLAY_Z ) == TileSpatialPylon.DISPLAY_X )
{
ori = EnumFacing.EAST;
src/main/java/appeng/client/render/effects/CraftingFx.java
+1 -1
View File
@@ -84,7 +84,6 @@ public class CraftingFx extends EntityBreakingFX
float offX = (float) ( this.prevPosX + ( this.posX - this.prevPosX ) * partialTick );
float offY = (float) ( this.prevPosY + ( this.posY - this.prevPosY ) * partialTick );
float offZ = (float) ( this.prevPosZ + ( this.posZ - this.prevPosZ ) * partialTick );
float f14 = 1.0F;
int blkX = MathHelper.floor_double( offX );
int blkY = MathHelper.floor_double( offY );
@@ -96,6 +95,7 @@ public class CraftingFx extends EntityBreakingFX
offZ -= interpPosZ;
// AELog.info( "" + partialTick );
float f14 = 1.0F;
par1Tessellator.setColorRGBA_F( this.particleRed * f14, this.particleGreen * f14, this.particleBlue * f14, this.particleAlpha );
par1Tessellator.addVertexWithUV( offX - x * scale - rx * scale, offY - y * scale, offZ - z * scale - rz * scale, f7, f9 );
par1Tessellator.addVertexWithUV( offX - x * scale + rx * scale, offY + y * scale, offZ - z * scale + rz * scale, f7, f8 );
src/main/java/appeng/client/render/effects/EnergyFx.java
+1 -1
View File
@@ -78,7 +78,6 @@ public class EnergyFx extends EntityBreakingFX
float f11 = (float) ( this.prevPosX + ( this.posX - this.prevPosX ) * par2 - interpPosX );
float f12 = (float) ( this.prevPosY + ( this.posY - this.prevPosY ) * par2 - interpPosY );
float f13 = (float) ( this.prevPosZ + ( this.posZ - this.prevPosZ ) * par2 - interpPosZ );
float f14 = 1.0F;
int blkX = MathHelper.floor_double( this.posX );
int blkY = MathHelper.floor_double( this.posY );
@@ -86,6 +85,7 @@ public class EnergyFx extends EntityBreakingFX
if( blkX == this.startBlkX && blkY == this.startBlkY && blkZ == this.startBlkZ )
{
float f14 = 1.0F;
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, f7, f9 );
par1Tessellator.addVertexWithUV( f11 - par3 * f10 + par6 * f10, f12 + par4 * f10, f13 - par5 * f10 + par7 * f10, f7, f8 );