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

final variables and parameters

Browse Source
This commit is contained in:
thatsIch
2015-09-30 14:24:40 +02:00
parent 059523f543
commit 8b3a954f73
732 changed files with 9253 additions and 9256 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/main/java/appeng/client/render/blocks/RenderBlockAssembler.java
+15 -15
View File
@@ -55,7 +55,7 @@ public class RenderBlockAssembler extends BaseBlockRender<BlockMolecularAssemble
}
@Override
public void renderInventory( BlockMolecularAssembler blk, ItemStack is, ModelGenerator renderer, ItemRenderType type, Object[] obj )
public void renderInventory( final BlockMolecularAssembler blk, final ItemStack is, final ModelGenerator renderer, final ItemRenderType type, final Object[] obj )
{
renderer.setOverrideBlockTexture( renderer.getIcon( blk.getStateFromMeta( is.getMetadata() ) )[0] );
@@ -102,16 +102,16 @@ public class RenderBlockAssembler extends BaseBlockRender<BlockMolecularAssemble
}
@Override
public boolean renderInWorld( BlockMolecularAssembler maBlock, IBlockAccess world, BlockPos pos, ModelGenerator renderer )
public boolean renderInWorld( final BlockMolecularAssembler maBlock, final IBlockAccess world, final BlockPos pos, final ModelGenerator renderer )
{
TileMolecularAssembler tma = maBlock.getTileEntity( world, pos );
final TileMolecularAssembler tma = maBlock.getTileEntity( world, pos );
if ( renderer.isAlphaPass() )
{
if( tma.isPowered() )
{
this.renderBlockBounds( renderer, 1, 1, 1, 15, 15, 15, EnumFacing.WEST, EnumFacing.UP, EnumFacing.SOUTH );
TaughtIcon lights = new TaughtIcon( ExtraBlockTextures.BlockMolecularAssemblerLights.getIcon(), -2.0f );
final TaughtIcon lights = new TaughtIcon( ExtraBlockTextures.BlockMolecularAssemblerLights.getIcon(), -2.0f );
renderer.setColorRGBA_F( 1, 1, 1, 0.3f );
renderer.setBrightness( 14 << 20 | 14 << 4 );
renderer.renderFaceXNeg( maBlock, pos, lights );
@@ -131,11 +131,11 @@ public class RenderBlockAssembler extends BaseBlockRender<BlockMolecularAssemble
this.preRenderInWorld( maBlock, world, pos, renderer );
IOrientable te = this.getOrientable( maBlock, world, pos );
final IOrientable te = this.getOrientable( maBlock, world, pos );
EnumFacing fdy = te.getUp();
EnumFacing fdz = te.getForward();
EnumFacing fdx = Platform.crossProduct( fdz, fdy ).getOpposite();
final EnumFacing fdy = te.getUp();
final EnumFacing fdz = te.getForward();
final EnumFacing fdx = Platform.crossProduct( fdz, fdy ).getOpposite();
renderer.renderAllFaces = true;
@@ -193,7 +193,7 @@ public class RenderBlockAssembler extends BaseBlockRender<BlockMolecularAssemble
return true;
}
public void renderCableAt( double thickness, IBlockAccess world, BlockPos pos, BlockMolecularAssembler block, ModelGenerator renderer, double pull, boolean covered )
public void renderCableAt( final double thickness, final IBlockAccess world, final BlockPos pos, final BlockMolecularAssembler block, final ModelGenerator renderer, final double pull, final boolean covered )
{
IAESprite texture = null;
@@ -242,19 +242,19 @@ public class RenderBlockAssembler extends BaseBlockRender<BlockMolecularAssemble
block.getRendererInstance().setTemporaryRenderIcon( null );
}
IAESprite getConnectedCable( IBlockAccess world, BlockPos pos, EnumFacing side, boolean covered,ModelGenerator renderer )
IAESprite getConnectedCable( final IBlockAccess world, final BlockPos pos, final EnumFacing side, final boolean covered, final ModelGenerator renderer )
{
final int tileYPos = pos.getY() + side.getFrontOffsetY();
if( -1 < tileYPos && tileYPos < 256 )
{
TileEntity ne = world.getTileEntity( pos.offset( side ) );
final TileEntity ne = world.getTileEntity( pos.offset( side ) );
if( ne instanceof IGridHost && ne instanceof IPartHost )
{
IPartHost ph = (IPartHost) ne;
IPart pcx = ph.getPart( AEPartLocation.INTERNAL );
final IPartHost ph = (IPartHost) ne;
final IPart pcx = ph.getPart( AEPartLocation.INTERNAL );
if( pcx instanceof PartCable )
{
PartCable pc = (PartCable) pcx;
final PartCable pc = (PartCable) pcx;
if( pc.isConnected( side.getOpposite() ) )
{
if( covered )
@@ -271,7 +271,7 @@ public class RenderBlockAssembler extends BaseBlockRender<BlockMolecularAssemble
}
@Override
public void getBoxes( IPartCollisionHelper bch )
public void getBoxes( final IPartCollisionHelper bch )
{
bch.addBox( 0, 0, 0, 16, 16, 16 );
}
src/main/java/appeng/client/render/blocks/RenderBlockCharger.java
+4 -4
View File
@@ -54,7 +54,7 @@ public class RenderBlockCharger extends BaseBlockRender<BlockCharger, TileCharge
}
@Override
public void renderInventory( BlockCharger blk, ItemStack is, ModelGenerator renderer, ItemRenderType type, Object[] obj )
public void renderInventory( final BlockCharger blk, final ItemStack is, final ModelGenerator renderer, final ItemRenderType type, final Object[] obj )
{
renderer.renderAllFaces = true;
this.setInvRenderBounds( renderer, 6, 1, 0, 10, 15, 2 );
@@ -83,7 +83,7 @@ public class RenderBlockCharger extends BaseBlockRender<BlockCharger, TileCharge
}
@Override
public boolean renderInWorld( BlockCharger block, IBlockAccess world, BlockPos pos, ModelGenerator renderer )
public boolean renderInWorld( final BlockCharger block, final IBlockAccess world, final BlockPos pos, final ModelGenerator renderer )
{
this.preRenderInWorld( block, world, pos, renderer );
@@ -123,7 +123,7 @@ public class RenderBlockCharger extends BaseBlockRender<BlockCharger, TileCharge
}
@Override
public void renderTile( BlockCharger block, TileCharger tile, WorldRenderer tess, double x, double y, double z, float f, ModelGenerator renderer )
public void renderTile( final BlockCharger block, final TileCharger tile, final WorldRenderer tess, final double x, final double y, final double z, final float f, final ModelGenerator renderer )
{
final ItemStack sis = tile.getStackInSlot( 0 );
@@ -163,7 +163,7 @@ public class RenderBlockCharger extends BaseBlockRender<BlockCharger, TileCharge
this.doRenderItem( sis, tile );
}
catch( Exception err )
catch( final Exception err )
{
AELog.error( err );
}
src/main/java/appeng/client/render/blocks/RenderBlockController.java
+10 -10
View File
@@ -41,16 +41,16 @@ public class RenderBlockController extends BaseBlockRender<BlockController, Tile
}
@Override
public boolean renderInWorld( BlockController blk, IBlockAccess world, BlockPos pos, ModelGenerator renderer )
public boolean renderInWorld( final BlockController blk, final IBlockAccess world, final BlockPos pos, final ModelGenerator renderer )
{
boolean xx = this.getTileEntity( world, pos.offset( EnumFacing.WEST ) ) instanceof TileController && this.getTileEntity( world, pos.offset( EnumFacing.EAST ) ) instanceof TileController;
boolean yy = this.getTileEntity( world, pos.offset( EnumFacing.DOWN ) ) instanceof TileController && this.getTileEntity( world, pos.offset( EnumFacing.UP ) ) instanceof TileController;
boolean zz = this.getTileEntity( world, pos.offset( EnumFacing.SOUTH )) instanceof TileController && this.getTileEntity( world, pos.offset( EnumFacing.NORTH ) ) instanceof TileController;
final boolean xx = this.getTileEntity( world, pos.offset( EnumFacing.WEST ) ) instanceof TileController && this.getTileEntity( world, pos.offset( EnumFacing.EAST ) ) instanceof TileController;
final boolean yy = this.getTileEntity( world, pos.offset( EnumFacing.DOWN ) ) instanceof TileController && this.getTileEntity( world, pos.offset( EnumFacing.UP ) ) instanceof TileController;
final boolean zz = this.getTileEntity( world, pos.offset( EnumFacing.SOUTH )) instanceof TileController && this.getTileEntity( world, pos.offset( EnumFacing.NORTH ) ) instanceof TileController;
BlockController.ControllerBlockState meta = ( ControllerBlockState ) world.getBlockState( pos ).getValue( BlockController.CONTROLLER_STATE );
boolean hasPower = meta != BlockController.ControllerBlockState.OFFLINE;
boolean isConflict = meta == BlockController.ControllerBlockState.CONFLICTED;
final BlockController.ControllerBlockState meta = ( ControllerBlockState ) world.getBlockState( pos ).getValue( BlockController.CONTROLLER_STATE );
final boolean hasPower = meta != BlockController.ControllerBlockState.OFFLINE;
final boolean isConflict = meta == BlockController.ControllerBlockState.CONFLICTED;
ExtraBlockTextures lights = null;
@@ -125,7 +125,7 @@ public class RenderBlockController extends BaseBlockRender<BlockController, Tile
}
else if( ( xx ? 1 : 0 ) + ( yy ? 1 : 0 ) + ( zz ? 1 : 0 ) >= 2 )
{
int v = ( Math.abs( pos.getX() ) + Math.abs( pos.getY() ) + Math.abs( pos.getZ() ) ) % 2;
final int v = ( Math.abs( pos.getX() ) + Math.abs( pos.getY() ) + Math.abs( pos.getZ() ) ) % 2;
renderer.uvRotateEast = renderer.uvRotateBottom = renderer.uvRotateNorth = renderer.uvRotateSouth = renderer.uvRotateTop = renderer.uvRotateWest = 0;
if( v == 0 )
@@ -157,7 +157,7 @@ public class RenderBlockController extends BaseBlockRender<BlockController, Tile
}
}
boolean out = renderer.renderStandardBlock( blk, pos );
final boolean out = renderer.renderStandardBlock( blk, pos );
if( lights != null )
{
renderer.setColorOpaque_F( 1.0f, 1.0f, 1.0f );
@@ -175,7 +175,7 @@ public class RenderBlockController extends BaseBlockRender<BlockController, Tile
return out;
}
private TileEntity getTileEntity( IBlockAccess world, BlockPos pos )
private TileEntity getTileEntity( final IBlockAccess world, final BlockPos pos )
{
if( pos.getY() >= 0 )
{
src/main/java/appeng/client/render/blocks/RenderBlockCraftingCPU.java
+31 -31
View File
@@ -46,7 +46,7 @@ import appeng.tile.crafting.TileCraftingTile;
public class RenderBlockCraftingCPU<B extends BlockCraftingUnit, T extends TileCraftingTile> extends BaseBlockRender<B, T>
{
protected RenderBlockCraftingCPU( boolean useTESR, int range )
protected RenderBlockCraftingCPU( final boolean useTESR, final int range )
{
super( useTESR, range );
}
@@ -57,23 +57,23 @@ public class RenderBlockCraftingCPU<B extends BlockCraftingUnit, T extends TileC
}
@Override
public boolean renderInWorld( B blk, IBlockAccess w, BlockPos pos, ModelGenerator renderer )
public boolean renderInWorld( final B blk, final IBlockAccess w, final BlockPos pos, ModelGenerator renderer )
{
boolean formed = false;
boolean emitsLight = false;
TileCraftingTile ct = blk.getTileEntity( w, pos );
final TileCraftingTile ct = blk.getTileEntity( w, pos );
if( ct != null && ct.isFormed() )
{
formed = true;
emitsLight = ct.isPowered();
}
boolean isMonitor = blk.getClass() == BlockCraftingMonitor.class;
IAESprite theIcon = renderer.getIcon( w.getBlockState( pos ) )[EnumFacing.SOUTH.ordinal()];
final boolean isMonitor = blk.getClass() == BlockCraftingMonitor.class;
final IAESprite theIcon = renderer.getIcon( w.getBlockState( pos ) )[EnumFacing.SOUTH.ordinal()];
int meta = 1;
for( Block craftingBlock : AEApi.instance().definitions().blocks().craftingUnit().maybeBlock().asSet() )
for( final Block craftingBlock : AEApi.instance().definitions().blocks().craftingUnit().maybeBlock().asSet() )
{
if ( craftingBlock == blk )
meta = 0;
@@ -82,7 +82,7 @@ public class RenderBlockCraftingCPU<B extends BlockCraftingUnit, T extends TileC
IAESprite nonForward = theIcon;
if( isMonitor )
{
for( Block craftingBlock : AEApi.instance().definitions().blocks().craftingUnit().maybeBlock().asSet() )
for( final Block craftingBlock : AEApi.instance().definitions().blocks().craftingUnit().maybeBlock().asSet() )
{
nonForward = renderer.getIcon( craftingBlock.getDefaultState() )[EnumFacing.SOUTH.ordinal()]; // craftingBlock.getIcon( 0, meta | ( formed ? 8 : 0 ) );
}
@@ -91,20 +91,20 @@ public class RenderBlockCraftingCPU<B extends BlockCraftingUnit, T extends TileC
if( formed && renderer.overrideBlockTexture == null )
{
renderer = BusRenderer.INSTANCE.renderer;
BusRenderHelper i = BusRenderHelper.INSTANCE;
final BusRenderHelper i = BusRenderHelper.INSTANCE;
renderer.blockAccess = w;
i.setPass( MinecraftForgeClient.getRenderLayer() == EnumWorldBlockLayer.TRANSLUCENT ? 1 : 0 );
i.setOrientation( EnumFacing.EAST, EnumFacing.UP, EnumFacing.SOUTH );
float highX = this.isConnected( w, pos, EnumFacing.EAST ) ? 16 : 13.01f;
float lowX = this.isConnected( w, pos, EnumFacing.WEST ) ? 0 : 2.99f;
final float highX = this.isConnected( w, pos, EnumFacing.EAST ) ? 16 : 13.01f;
final float lowX = this.isConnected( w, pos, EnumFacing.WEST ) ? 0 : 2.99f;
float highY = this.isConnected( w, pos, EnumFacing.UP ) ? 16 : 13.01f;
float lowY = this.isConnected( w, pos, EnumFacing.DOWN ) ? 0 : 2.99f;
final float highY = this.isConnected( w, pos, EnumFacing.UP ) ? 16 : 13.01f;
final float lowY = this.isConnected( w, pos, EnumFacing.DOWN ) ? 0 : 2.99f;
float highZ = this.isConnected( w, pos, EnumFacing.SOUTH ) ? 16 : 13.01f;
float lowZ = this.isConnected( w, pos, EnumFacing.NORTH ) ? 0 : 2.99f;
final float highZ = this.isConnected( w, pos, EnumFacing.SOUTH ) ? 16 : 13.01f;
final float lowZ = this.isConnected( w, pos, EnumFacing.NORTH ) ? 0 : 2.99f;
this.renderCorner( i, renderer, w, pos, EnumFacing.UP, EnumFacing.EAST, EnumFacing.NORTH );
this.renderCorner( i, renderer, w, pos, EnumFacing.UP, EnumFacing.EAST, EnumFacing.SOUTH );
@@ -115,7 +115,7 @@ public class RenderBlockCraftingCPU<B extends BlockCraftingUnit, T extends TileC
this.renderCorner( i, renderer, w, pos, EnumFacing.DOWN, EnumFacing.WEST, EnumFacing.NORTH );
this.renderCorner( i, renderer, w, pos, EnumFacing.DOWN, EnumFacing.WEST, EnumFacing.SOUTH );
for( EnumFacing side : EnumFacing.VALUES )
for( final EnumFacing side : EnumFacing.VALUES )
{
i.setBounds( this.fso( side, lowX, EnumFacing.WEST ), this.fso( side, lowY, EnumFacing.DOWN ), this.fso( side, lowZ, EnumFacing.NORTH ), this.fso( side, highX, EnumFacing.EAST ), this.fso( side, highY, EnumFacing.UP ), this.fso( side, highZ, EnumFacing.SOUTH ) );
i.prepareBounds( renderer );
@@ -136,15 +136,15 @@ public class RenderBlockCraftingCPU<B extends BlockCraftingUnit, T extends TileC
}
else
{
double a = 0.0 / 16.0;
double o = 16.0 / 16.0;
final double a = 0.0 / 16.0;
final double o = 16.0 / 16.0;
renderer.setRenderBounds( a, a, a, o, o, o );
return renderer.renderStandardBlock( blk, pos );
}
}
private boolean isConnected( IBlockAccess w, BlockPos pos, EnumFacing side )
private boolean isConnected( final IBlockAccess w, final BlockPos pos, final EnumFacing side )
{
final int tileYPos = pos.getY() + side.getFrontOffsetY();
if( 0 <= tileYPos && tileYPos <= 255 )
@@ -159,7 +159,7 @@ public class RenderBlockCraftingCPU<B extends BlockCraftingUnit, T extends TileC
}
}
private void renderCorner( BusRenderHelper i, ModelGenerator renderer, IBlockAccess w, BlockPos pos, EnumFacing up, EnumFacing east, EnumFacing south )
private void renderCorner( final BusRenderHelper i, final ModelGenerator renderer, final IBlockAccess w, final BlockPos pos, final EnumFacing up, final EnumFacing east, final EnumFacing south )
{
if( this.isConnected( w, pos, up ) )
{
@@ -180,7 +180,7 @@ public class RenderBlockCraftingCPU<B extends BlockCraftingUnit, T extends TileC
i.renderBlockCurrentBounds( pos, renderer );
}
private float fso( EnumFacing side, float def, EnumFacing target )
private float fso( final EnumFacing side, final float def, final EnumFacing target )
{
if( side == target )
{
@@ -193,7 +193,7 @@ public class RenderBlockCraftingCPU<B extends BlockCraftingUnit, T extends TileC
return def;
}
private void handleSide( B blk, int meta, BlockPos pos, BusRenderHelper i, ModelGenerator renderer, IAESprite color, boolean emitsLight, boolean isMonitor, EnumFacing side, IBlockAccess w )
private void handleSide( final B blk, final int meta, final BlockPos pos, final BusRenderHelper i, final ModelGenerator renderer, final IAESprite color, final boolean emitsLight, final boolean isMonitor, final EnumFacing side, final IBlockAccess w )
{
if( this.isConnected( w, pos, side ) )
{
@@ -228,10 +228,10 @@ public class RenderBlockCraftingCPU<B extends BlockCraftingUnit, T extends TileC
{
if( color == ExtraBlockTextures.BlockCraftingMonitorFit_Light.getIcon() )
{
int b = w.getCombinedLight( pos.offset( side ), 0 );
final int b = w.getCombinedLight( pos.offset( side ), 0 );
TileCraftingMonitorTile sr = blk.getTileEntity( w, pos );
AEColor col = sr.getColor();
final TileCraftingMonitorTile sr = blk.getTileEntity( w, pos );
final AEColor col = sr.getColor();
renderer.setBrightness( b );
renderer.setColorOpaque_I( col.whiteVariant );
@@ -252,8 +252,8 @@ public class RenderBlockCraftingCPU<B extends BlockCraftingUnit, T extends TileC
{
if( isMonitor )
{
TileCraftingMonitorTile sr = blk.getTileEntity( w, pos );
AEColor col = sr.getColor();
final TileCraftingMonitorTile sr = blk.getTileEntity( w, pos );
final AEColor col = sr.getColor();
renderer.setColorOpaque_I( col.whiteVariant );
renderer.setBrightness( 13 << 20 | 13 << 4 );
@@ -269,7 +269,7 @@ public class RenderBlockCraftingCPU<B extends BlockCraftingUnit, T extends TileC
}
else
{
AEPartLocation aeDir = AEPartLocation.fromFacing( side );
final AEPartLocation aeDir = AEPartLocation.fromFacing( side );
renderer.setColorOpaque_F( 1.0f, 1.0f, 1.0f );
renderer.setBrightness( 13 << 20 | 13 << 4 );
i.renderFace( pos, color, side, renderer );
@@ -278,7 +278,7 @@ public class RenderBlockCraftingCPU<B extends BlockCraftingUnit, T extends TileC
}
}
for( EnumFacing a : EnumFacing.VALUES )
for( final EnumFacing a : EnumFacing.VALUES )
{
if( a == side || a == side.getOpposite() )
{
@@ -298,10 +298,10 @@ public class RenderBlockCraftingCPU<B extends BlockCraftingUnit, T extends TileC
i.setTexture( ExtraBlockTextures.BlockCraftingUnitRingLong.getIcon() );
}
AEPartLocation dir = AEPartLocation.fromFacing( a );
final AEPartLocation dir = AEPartLocation.fromFacing( a );
if( !( i.getBound( dir ) < 0.001 || i.getBound( dir ) > 15.999 ) )
{
double width = 3.0 / 16.0;
final double width = 3.0 / 16.0;
switch( a )
{
case DOWN:
@@ -350,7 +350,7 @@ public class RenderBlockCraftingCPU<B extends BlockCraftingUnit, T extends TileC
}
}
private float gso( EnumFacing side, float def, EnumFacing target )
private float gso( final EnumFacing side, final float def, final EnumFacing target )
{
if( side != target )
{
src/main/java/appeng/client/render/blocks/RenderBlockCraftingCPUMonitor.java
+11 -11
View File
@@ -57,7 +57,7 @@ public class RenderBlockCraftingCPUMonitor extends RenderBlockCraftingCPU<BlockC
}
@Override
public void renderTile( BlockCraftingMonitor block, TileCraftingMonitorTile tile, WorldRenderer tess, double x, double y, double z, float f, ModelGenerator renderer )
public void renderTile( final BlockCraftingMonitor block, final TileCraftingMonitorTile tile, final WorldRenderer tess, final double x, final double y, final double z, final float f, final ModelGenerator renderer )
{
if( tile != null )
{
@@ -91,9 +91,9 @@ public class RenderBlockCraftingCPUMonitor extends RenderBlockCraftingCPU<BlockC
}
}
private void tesrRenderScreen( WorldRenderer tess, TileCraftingMonitorTile cmt, IAEItemStack ais )
private void tesrRenderScreen( final WorldRenderer tess, final TileCraftingMonitorTile cmt, final IAEItemStack ais )
{
EnumFacing side = cmt.getForward();
final EnumFacing side = cmt.getForward();
EnumFacing walrus = side.getFrontOffsetY() != 0 ? EnumFacing.SOUTH : EnumFacing.UP;
int spin = 0;
@@ -110,7 +110,7 @@ public class RenderBlockCraftingCPUMonitor extends RenderBlockCraftingCPU<BlockC
GL11.glPushAttrib( GL11.GL_ALL_ATTRIB_BITS );
GL11.glTranslated( side.getFrontOffsetX() * 0.69, side.getFrontOffsetY() * 0.69, side.getFrontOffsetZ() * 0.69 );
float scale = 0.7f;
final float scale = 0.7f;
GL11.glScalef( scale, scale, scale );
if( side == EnumFacing.UP )
@@ -153,12 +153,12 @@ public class RenderBlockCraftingCPUMonitor extends RenderBlockCraftingCPU<BlockC
GL11.glPushMatrix();
try
{
ItemStack sis = ais.getItemStack();
final ItemStack sis = ais.getItemStack();
sis.stackSize = 1;
int br = 16 << 20 | 16 << 4;
int var11 = br % 65536;
int var12 = br / 65536;
final int br = 16 << 20 | 16 << 4;
final int var11 = br % 65536;
final int var12 = br / 65536;
OpenGlHelper.setLightmapTextureCoords( OpenGlHelper.lightmapTexUnit, var11 * 0.8F, var12 * 0.8F );
GL11.glColor4f( 1.0F, 1.0F, 1.0F, 1.0F );
@@ -170,7 +170,7 @@ public class RenderBlockCraftingCPUMonitor extends RenderBlockCraftingCPU<BlockC
ClientHelper.proxy.doRenderItem( sis, cmt.getWorld() );
}
catch( Exception e )
catch( final Exception e )
{
AELog.error( e );
}
@@ -183,8 +183,8 @@ public class RenderBlockCraftingCPUMonitor extends RenderBlockCraftingCPU<BlockC
final long stackSize = ais.getStackSize();
final String renderedStackSize = NUMBER_CONVERTER.toWideReadableForm( stackSize );
FontRenderer fr = Minecraft.getMinecraft().fontRendererObj;
int width = fr.getStringWidth( renderedStackSize );
final FontRenderer fr = Minecraft.getMinecraft().fontRendererObj;
final int width = fr.getStringWidth( renderedStackSize );
GL11.glTranslatef( -0.5f * width, 0.0f, -1.0f );
fr.drawString( renderedStackSize, 0, 0, 0 );
src/main/java/appeng/client/render/blocks/RenderBlockCrank.java
+7 -7
View File
@@ -47,7 +47,7 @@ public class RenderBlockCrank extends BaseBlockRender<BlockCrank, TileCrank>
}
@Override
public void renderInventory( BlockCrank blk, ItemStack is, ModelGenerator renderer, ItemRenderType type, Object[] obj )
public void renderInventory( final BlockCrank blk, final ItemStack is, final ModelGenerator renderer, final ItemRenderType type, final Object[] obj )
{
renderer.renderAllFaces = true;
@@ -61,13 +61,13 @@ public class RenderBlockCrank extends BaseBlockRender<BlockCrank, TileCrank>
}
@Override
public boolean renderInWorld( BlockCrank imb, IBlockAccess world, BlockPos pos, ModelGenerator renderer )
public boolean renderInWorld( final BlockCrank imb, final IBlockAccess world, final BlockPos pos, final ModelGenerator renderer )
{
return true;
}
@Override
public void renderTile( BlockCrank blk, TileCrank tile, WorldRenderer tess, double x, double y, double z, float f, ModelGenerator renderBlocks )
public void renderTile( final BlockCrank blk, final TileCrank tile, final WorldRenderer tess, final double x, final double y, final double z, final float f, final ModelGenerator renderBlocks )
{
if( tile.getUp() == null )
{
@@ -97,11 +97,11 @@ public class RenderBlockCrank extends BaseBlockRender<BlockCrank, TileCrank>
//tess.setTranslation( -tc.getPos().getX(), -tc.getPos().getY(), -tc.getPos().getZ() );
//tess.startDrawingQuads();
RenderItem ri = Minecraft.getMinecraft().getRenderItem();
final RenderItem ri = Minecraft.getMinecraft().getRenderItem();
ItemStack stack = new ItemStack( blk );
IBakedModel model = ri.getItemModelMesher().getItemModel( stack );
Minecraft.getMinecraft().getBlockRendererDispatcher().getBlockModelRenderer().renderModelBrightnessColor(model, 1.0F, 1.0F, 1.0F, 1.0F);
final ItemStack stack = new ItemStack( blk );
final IBakedModel model = ri.getItemModelMesher().getItemModel( stack );
Minecraft.getMinecraft().getBlockRendererDispatcher().getBlockModelRenderer().renderModelBrightnessColor( model, 1.0F, 1.0F, 1.0F, 1.0F );
/*
renderBlocks.renderAllFaces = true;
src/main/java/appeng/client/render/blocks/RenderBlockEnergyCube.java
+6 -6
View File
@@ -39,11 +39,11 @@ public class RenderBlockEnergyCube extends BaseBlockRender<BlockEnergyCell, Tile
}
@Override
public void renderInventory( BlockEnergyCell blk, ItemStack is, ModelGenerator renderer, ItemRenderType type, Object[] obj )
public void renderInventory( final BlockEnergyCell blk, final ItemStack is, final ModelGenerator renderer, final ItemRenderType type, final Object[] obj )
{
IAEItemPowerStorage myItem = (IAEItemPowerStorage) is.getItem();
double internalCurrentPower = myItem.getAECurrentPower( is );
double internalMaxPower = myItem.getAEMaxPower( is );
final IAEItemPowerStorage myItem = (IAEItemPowerStorage) is.getItem();
final double internalCurrentPower = myItem.getAECurrentPower( is );
final double internalMaxPower = myItem.getAEMaxPower( is );
int meta = (int) ( 8.0 * ( internalCurrentPower / internalMaxPower ) );
@@ -62,10 +62,10 @@ public class RenderBlockEnergyCube extends BaseBlockRender<BlockEnergyCell, Tile
}
@Override
public boolean renderInWorld( BlockEnergyCell blk, IBlockAccess world, BlockPos pos, ModelGenerator renderer )
public boolean renderInWorld( final BlockEnergyCell blk, final IBlockAccess world, final BlockPos pos, final ModelGenerator renderer )
{
renderer.overrideBlockTexture = renderer.getIcon( world.getBlockState( pos ) )[0];// blk.getIcon( 0, meta );
boolean out = renderer.renderStandardBlock( blk, pos );
final boolean out = renderer.renderStandardBlock( blk, pos );
renderer.overrideBlockTexture = null;
return out;
src/main/java/appeng/client/render/blocks/RenderBlockInscriber.java
+6 -6
View File
@@ -66,7 +66,7 @@ public class RenderBlockInscriber extends BaseBlockRender<BlockInscriber, TileIn
}
@Override
public void renderInventory( BlockInscriber blk, ItemStack is, ModelGenerator renderer, ItemRenderType type, Object[] obj )
public void renderInventory( final BlockInscriber blk, final ItemStack is, final ModelGenerator renderer, final ItemRenderType type, final Object[] obj )
{
renderer.renderAllFaces = true;
this.setInvRenderBounds( renderer, 6, 1, 0, 10, 15, 2 );
@@ -105,7 +105,7 @@ public class RenderBlockInscriber extends BaseBlockRender<BlockInscriber, TileIn
}
@Override
public boolean renderInWorld( BlockInscriber block, IBlockAccess world, BlockPos pos, ModelGenerator renderer )
public boolean renderInWorld( final BlockInscriber block, final IBlockAccess world, final BlockPos pos, final ModelGenerator renderer )
{
this.preRenderInWorld( block, world, pos, renderer );
@@ -148,7 +148,7 @@ public class RenderBlockInscriber extends BaseBlockRender<BlockInscriber, TileIn
}
@Override
public void renderTile( BlockInscriber block, TileInscriber tile, WorldRenderer tess, double x, double y, double z, float f, ModelGenerator renderer )
public void renderTile( final BlockInscriber block, final TileInscriber tile, final WorldRenderer tess, final double x, final double y, final double z, final float f, final ModelGenerator renderer )
{
GL11.glPushMatrix();
this.applyTESRRotation( x, y, z, tile.getForward(), tile.getUp() );
@@ -190,7 +190,7 @@ public class RenderBlockInscriber extends BaseBlockRender<BlockInscriber, TileIn
float press = 0.2f;
press -= progress / 5.0f;
IAESprite ic = ExtraBlockTextures.BlockInscriberInside.getIcon();
final IAESprite ic = ExtraBlockTextures.BlockInscriberInside.getIcon();
tess.startDrawingQuads();
float middle = 0.5f;
@@ -262,7 +262,7 @@ public class RenderBlockInscriber extends BaseBlockRender<BlockInscriber, TileIn
}
}
public void renderItem( ItemStack sis, float o, AEBaseBlock block, AEBaseTile tile, WorldRenderer tess, double x, double y, double z, float f, ModelGenerator renderer )
public void renderItem( ItemStack sis, final float o, final AEBaseBlock block, final AEBaseTile tile, final WorldRenderer tess, final double x, final double y, final double z, final float f, final ModelGenerator renderer )
{
if( sis != null )
{
@@ -303,7 +303,7 @@ public class RenderBlockInscriber extends BaseBlockRender<BlockInscriber, TileIn
this.doRenderItem( sis, tile );
}
catch( Exception err )
catch( final Exception err )
{
AELog.error( err );
}
src/main/java/appeng/client/render/blocks/RenderBlockInterface.java
+5 -5
View File
@@ -39,18 +39,18 @@ public class RenderBlockInterface extends BaseBlockRender<BlockInterface, TileIn
}
@Override
public boolean renderInWorld( BlockInterface block, IBlockAccess world, BlockPos pos, ModelGenerator renderer )
public boolean renderInWorld( final BlockInterface block, final IBlockAccess world, final BlockPos pos, final ModelGenerator renderer )
{
TileInterface ti = block.getTileEntity( world, pos );
BlockRenderInfo info = block.getRendererInstance();
final TileInterface ti = block.getTileEntity( world, pos );
final BlockRenderInfo info = block.getRendererInstance();
if( ti != null && ti.getForward() != null )
{
IAESprite side = ExtraBlockTextures.BlockInterfaceAlternateArrow.getIcon();
final IAESprite side = ExtraBlockTextures.BlockInterfaceAlternateArrow.getIcon();
info.setTemporaryRenderIcons( ExtraBlockTextures.BlockInterfaceAlternate.getIcon(), renderer.getIcon( world.getBlockState( pos ) )[0], side, side, side, side );
}
boolean fz = super.renderInWorld( block, world, pos, renderer );
final boolean fz = super.renderInWorld( block, world, pos, renderer );
info.setTemporaryRenderIcon( null );
src/main/java/appeng/client/render/blocks/RenderBlockPaint.java
+15 -15
View File
@@ -44,30 +44,30 @@ public class RenderBlockPaint extends BaseBlockRender<BlockPaint, TilePaint>
}
@Override
public void renderInventory( BlockPaint block, ItemStack is, ModelGenerator renderer, ItemRenderType type, Object[] obj )
public void renderInventory( final BlockPaint block, final ItemStack is, final ModelGenerator renderer, final ItemRenderType type, final Object[] obj )
{
}
@Override
public boolean renderInWorld( BlockPaint imb, IBlockAccess world, BlockPos pos, ModelGenerator tess )
public boolean renderInWorld( final BlockPaint imb, final IBlockAccess world, final BlockPos pos, final ModelGenerator tess )
{
TilePaint tp = imb.getTileEntity( world, pos );
final TilePaint tp = imb.getTileEntity( world, pos );
boolean out = false;
if( tp != null )
{
// super.renderInWorld( imb, world, x, y, z, renderer );
int x = pos.getX();
int y = pos.getY();
int z = pos.getZ();
final int x = pos.getX();
final int y = pos.getY();
final int z = pos.getZ();
IAESprite[] icoSet = { imb.getIcon( EnumFacing.UP, imb.getDefaultState() ), ExtraBlockTextures.BlockPaint2.getIcon(), ExtraBlockTextures.BlockPaint3.getIcon() };
final IAESprite[] icoSet = { imb.getIcon( EnumFacing.UP, imb.getDefaultState() ), ExtraBlockTextures.BlockPaint2.getIcon(), ExtraBlockTextures.BlockPaint3.getIcon() };
int brightness = imb.getMixedBrightnessForBlock( world, pos );
final int brightness = imb.getMixedBrightnessForBlock( world, pos );
EnumSet<EnumFacing> validSides = EnumSet.noneOf( EnumFacing.class );
final EnumSet<EnumFacing> validSides = EnumSet.noneOf( EnumFacing.class );
for( EnumFacing side : EnumFacing.VALUES )
for( final EnumFacing side : EnumFacing.VALUES )
{
if( tp.isSideValid( side ) )
{
@@ -76,8 +76,8 @@ public class RenderBlockPaint extends BaseBlockRender<BlockPaint, TilePaint>
}
double offsetConstant = 0.001;
int lumen = 14 << 20 | 14 << 4;
for( Splotch s : tp.getDots() )
final int lumen = 14 << 20 | 14 << 4;
for( final Splotch s : tp.getDots() )
{
if( !validSides.contains( s.side ) )
{
@@ -98,7 +98,7 @@ public class RenderBlockPaint extends BaseBlockRender<BlockPaint, TilePaint>
double offset = offsetConstant;
offsetConstant += 0.001;
double buffer = 0.1;
final double buffer = 0.1;
double pos_x = s.x();
double pos_y = s.y();
@@ -124,8 +124,8 @@ public class RenderBlockPaint extends BaseBlockRender<BlockPaint, TilePaint>
pos_y += z;
}
IAESprite ico = icoSet[s.getSeed() % icoSet.length];
EnumFacing rs = s.side.getOpposite();
final IAESprite ico = icoSet[s.getSeed() % icoSet.length];
final EnumFacing rs = s.side.getOpposite();
switch( s.side )
{
src/main/java/appeng/client/render/blocks/RenderBlockQuartzAccelerator.java
+5 -5
View File
@@ -39,20 +39,20 @@ public class RenderBlockQuartzAccelerator extends BaseBlockRender<BlockQuartzGro
}
@Override
public boolean renderInWorld( BlockQuartzGrowthAccelerator blk, IBlockAccess world, BlockPos pos, ModelGenerator renderer )
public boolean renderInWorld( final BlockQuartzGrowthAccelerator blk, final IBlockAccess world, final BlockPos pos, final ModelGenerator renderer )
{
TileEntity te = world.getTileEntity( pos );
final TileEntity te = world.getTileEntity( pos );
if( te instanceof TileQuartzGrowthAccelerator )
{
if( ( (TileQuartzGrowthAccelerator) te ).hasPower )
{
IAESprite top_Bottom = ExtraBlockTextures.BlockQuartzGrowthAcceleratorOn.getIcon();
IAESprite side = ExtraBlockTextures.BlockQuartzGrowthAcceleratorSideOn.getIcon();
final IAESprite top_Bottom = ExtraBlockTextures.BlockQuartzGrowthAcceleratorOn.getIcon();
final IAESprite side = ExtraBlockTextures.BlockQuartzGrowthAcceleratorSideOn.getIcon();
blk.getRendererInstance().setTemporaryRenderIcons( top_Bottom, top_Bottom, side, side, side, side );
}
}
boolean out = super.renderInWorld( blk, world, pos, renderer );
final boolean out = super.renderInWorld( blk, world, pos, renderer );
blk.getRendererInstance().setTemporaryRenderIcon( null );
return out;
src/main/java/appeng/client/render/blocks/RenderBlockSkyChest.java
+3 -3
View File
@@ -54,7 +54,7 @@ public class RenderBlockSkyChest extends BaseBlockRender<BlockSkyChest, TileSkyC
}
@Override
public void renderInventory( BlockSkyChest blk, ItemStack is, ModelGenerator renderer, ItemRenderType type, Object[] obj )
public void renderInventory( final BlockSkyChest blk, final ItemStack is, final ModelGenerator renderer, final ItemRenderType type, final Object[] obj )
{
//GL11.glEnable( GL12.GL_RESCALE_NORMAL );
//GL11.glColor4f( 1.0F, 1.0F, 1.0F, 1.0F );
@@ -78,13 +78,13 @@ public class RenderBlockSkyChest extends BaseBlockRender<BlockSkyChest, TileSkyC
}
@Override
public boolean renderInWorld( BlockSkyChest blk, IBlockAccess world, BlockPos pos, ModelGenerator renderer )
public boolean renderInWorld( final BlockSkyChest blk, final IBlockAccess world, final BlockPos pos, final ModelGenerator renderer )
{
return true;
}
@Override
public void renderTile( BlockSkyChest block, TileSkyChest skyChest, WorldRenderer tess, double x, double y, double z, float partialTick, ModelGenerator renderer )
public void renderTile( final BlockSkyChest block, final TileSkyChest skyChest, final WorldRenderer tess, final double x, final double y, final double z, final float partialTick, final ModelGenerator renderer )
{
if( skyChest == null )
{
src/main/java/appeng/client/render/blocks/RenderBlockSkyCompass.java
+6 -6
View File
@@ -54,7 +54,7 @@ public class RenderBlockSkyCompass extends BaseBlockRender<BlockSkyCompass, Tile
}
@Override
public void renderInventory( BlockSkyCompass blk, ItemStack is, ModelGenerator renderer, ItemRenderType type, Object[] obj )
public void renderInventory( final BlockSkyCompass blk, final ItemStack is, final ModelGenerator renderer, final ItemRenderType type, final Object[] obj )
{
/*
if( type == ItemRenderType.INVENTORY )
@@ -176,13 +176,13 @@ public class RenderBlockSkyCompass extends BaseBlockRender<BlockSkyCompass, Tile
}
@Override
public boolean renderInWorld( BlockSkyCompass blk, IBlockAccess world, BlockPos pos, ModelGenerator renderer )
public boolean renderInWorld( final BlockSkyCompass blk, final IBlockAccess world, final BlockPos pos, final ModelGenerator renderer )
{
return true;
}
@Override
public void renderTile( BlockSkyCompass block, TileSkyCompass skyCompass, WorldRenderer tess, double x, double y, double z, float partialTick, ModelGenerator renderer )
public void renderTile( final BlockSkyCompass block, final TileSkyCompass skyCompass, final WorldRenderer tess, final double x, final double y, final double z, final float partialTick, final ModelGenerator renderer )
{
if( skyCompass == null )
{
@@ -243,10 +243,10 @@ public class RenderBlockSkyCompass extends BaseBlockRender<BlockSkyCompass, Tile
GL11.glColor4f( 1.0F, 1.0F, 1.0F, 1.0F );
}
private double flipidiy( double rad )
private double flipidiy( final double rad )
{
double x = Math.cos( rad );
double y = Math.sin( rad );
final double x = Math.cos( rad );
final double y = Math.sin( rad );
return Math.atan2( -y, x );
}
}
src/main/java/appeng/client/render/blocks/RenderBlockWireless.java
+19 -19
View File
@@ -54,13 +54,13 @@ public class RenderBlockWireless extends BaseBlockRender<BlockWireless, TileWire
}
@Override
public void renderInventory( BlockWireless blk, ItemStack is, ModelGenerator renderer, ItemRenderType type, Object[] obj )
public void renderInventory( final BlockWireless blk, final ItemStack is, final ModelGenerator renderer, final ItemRenderType type, final Object[] obj )
{
this.blk = blk;
center = new BlockPos(0,0,0);
this.hasChan = false;
this.hasPower = false;
BlockRenderInfo ri = blk.getRendererInstance();
final BlockRenderInfo ri = blk.getRendererInstance();
renderer.renderAllFaces = true;
@@ -81,18 +81,18 @@ public class RenderBlockWireless extends BaseBlockRender<BlockWireless, TileWire
ri.setTemporaryRenderIcons( r, r, ExtraBlockTextures.BlockWirelessInside.getIcon(), ExtraBlockTextures.BlockWirelessInside.getIcon(), r, r );
AEPartLocation[] sides = { AEPartLocation.EAST, AEPartLocation.WEST, AEPartLocation.UP, AEPartLocation.DOWN };
final AEPartLocation[] sides = { AEPartLocation.EAST, AEPartLocation.WEST, AEPartLocation.UP, AEPartLocation.DOWN };
int s = 1;
for( AEPartLocation side : sides )
for( final AEPartLocation side : sides )
{
this.renderBlockBounds( renderer, 8 + ( side.xOffset != 0 ? side.xOffset * 2 : -2 ), 8 + ( side.yOffset != 0 ? side.yOffset * 2 : -2 ), 2 + ( side.zOffset != 0 ? side.zOffset * 2 : -1 ) + s, 8 + ( side.xOffset != 0 ? side.xOffset * 4 : 2 ), 8 + ( side.yOffset != 0 ? side.yOffset * 4 : 2 ), 2 + ( side.zOffset != 0 ? side.zOffset * 5 : 1 ) + s, EnumFacing.EAST, EnumFacing.UP, EnumFacing.SOUTH );
this.renderInvBlock( EnumSet.allOf( AEPartLocation.class ), blk, is, 0xffffff, renderer );
}
s = 3;
for( AEPartLocation side : sides )
for( final AEPartLocation side : sides )
{
this.renderBlockBounds( renderer, 8 + ( side.xOffset != 0 ? side.xOffset * 4 : -1 ), 8 + ( side.yOffset != 0 ? side.yOffset * 4 : -1 ), 1 + ( side.zOffset != 0 ? side.zOffset * 4 : -1 ) + s, 8 + ( side.xOffset != 0 ? side.xOffset * 5 : 1 ), 8 + ( side.yOffset != 0 ? side.yOffset * 5 : 1 ), 2 + ( side.zOffset != 0 ? side.zOffset * 5 : 1 ) + s, EnumFacing.EAST, EnumFacing.UP, EnumFacing.SOUTH );
@@ -101,20 +101,20 @@ public class RenderBlockWireless extends BaseBlockRender<BlockWireless, TileWire
}
@Override
public boolean renderInWorld( BlockWireless blk, IBlockAccess world, BlockPos pos, ModelGenerator renderer )
public boolean renderInWorld( final BlockWireless blk, final IBlockAccess world, final BlockPos pos, final ModelGenerator renderer )
{
TileWireless tw = blk.getTileEntity( world, pos );
final TileWireless tw = blk.getTileEntity( world, pos );
this.blk = blk;
if( tw != null )
{
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();
final BlockRenderInfo ri = blk.getRendererInstance();
EnumFacing fdy = tw.getUp();
EnumFacing fdz = tw.getForward();
EnumFacing fdx = Platform.crossProduct( fdz, fdy ).getOpposite();
final EnumFacing fdy = tw.getUp();
final EnumFacing fdz = tw.getForward();
final EnumFacing fdx = Platform.crossProduct( fdz, fdy ).getOpposite();
renderer.renderAllFaces = true;
@@ -136,18 +136,18 @@ public class RenderBlockWireless extends BaseBlockRender<BlockWireless, TileWire
ri.setTemporaryRenderIcons( r, r, ExtraBlockTextures.BlockWirelessInside.getIcon(), ExtraBlockTextures.BlockWirelessInside.getIcon(), r, r );
AEPartLocation[] sides = { AEPartLocation.EAST, AEPartLocation.WEST, AEPartLocation.UP, AEPartLocation.DOWN };
final AEPartLocation[] sides = { AEPartLocation.EAST, AEPartLocation.WEST, AEPartLocation.UP, AEPartLocation.DOWN };
int s = 1;
for( AEPartLocation side : sides )
for( final AEPartLocation side : sides )
{
this.renderBlockBounds( renderer, 8 + ( side.xOffset != 0 ? side.xOffset * 2 : -2 ), 8 + ( side.yOffset != 0 ? side.yOffset * 2 : -2 ), 2 + ( side.zOffset != 0 ? side.zOffset * 2 : -1 ) + s, 8 + ( side.xOffset != 0 ? side.xOffset * 4 : 2 ), 8 + ( side.yOffset != 0 ? side.yOffset * 4 : 2 ), 2 + ( side.zOffset != 0 ? side.zOffset * 5 : 1 ) + s, fdx, fdy, fdz );
super.renderInWorld( blk, world, pos, renderer );
}
s = 3;
for( AEPartLocation side : sides )
for( final AEPartLocation side : sides )
{
this.renderBlockBounds( renderer, 8 + ( side.xOffset != 0 ? side.xOffset * 4 : -1 ), 8 + ( side.yOffset != 0 ? side.yOffset * 4 : -1 ), 1 + ( side.zOffset != 0 ? side.zOffset * 4 : -1 ) + s, 8 + ( side.xOffset != 0 ? side.xOffset * 5 : 1 ), 8 + ( side.yOffset != 0 ? side.yOffset * 5 : 1 ), 2 + ( side.zOffset != 0 ? side.zOffset * 5 : 1 ) + s, fdx, fdy, fdz );
super.renderInWorld( blk, world, pos, renderer );
@@ -160,13 +160,13 @@ public class RenderBlockWireless extends BaseBlockRender<BlockWireless, TileWire
if( this.hasChan )
{
int l = 14;
final int l = 14;
renderer.setBrightness( l << 20 | l << 4 );
renderer.setColorOpaque_I( AEColor.Transparent.blackVariant );
}
else if( this.hasPower )
{
int l = 9;
final int l = 9;
renderer.setBrightness( l << 20 | l << 4 );
renderer.setColorOpaque_I( AEColor.Transparent.whiteVariant );
}
@@ -208,10 +208,10 @@ public class RenderBlockWireless extends BaseBlockRender<BlockWireless, TileWire
return true;
}
private void renderTorchAtAngle( ModelGenerator renderer, EnumFacing x, EnumFacing y, EnumFacing z )
private void renderTorchAtAngle( final ModelGenerator renderer, final EnumFacing x, final EnumFacing y, final EnumFacing z )
{
IAESprite r = ( this.hasChan ? CableBusTextures.BlockWirelessOn.getIcon() : renderer.getIcon( blk.getDefaultState() )[0] );
IAESprite sides = new OffsetIcon( r, 0.0f, -2.0f );
final IAESprite r = ( this.hasChan ? CableBusTextures.BlockWirelessOn.getIcon() : renderer.getIcon( blk.getDefaultState() )[0] );
final IAESprite sides = new OffsetIcon( r, 0.0f, -2.0f );
switch( z )
{
src/main/java/appeng/client/render/blocks/RenderDrive.java
+14 -14
View File
@@ -45,7 +45,7 @@ public class RenderDrive extends BaseBlockRender<BlockDrive, TileDrive>
}
@Override
public void renderInventory( BlockDrive block, ItemStack is, ModelGenerator renderer, ItemRenderType type, Object[] obj )
public void renderInventory( final BlockDrive block, final ItemStack is, final ModelGenerator renderer, final ItemRenderType type, final Object[] obj )
{
renderer.overrideBlockTexture = ExtraBlockTextures.White.getIcon();
this.renderInvBlock( EnumSet.of( AEPartLocation.SOUTH ), block, is, 0x000000, renderer );
@@ -55,26 +55,26 @@ public class RenderDrive extends BaseBlockRender<BlockDrive, TileDrive>
}
@Override
public boolean renderInWorld( BlockDrive imb, IBlockAccess world, BlockPos pos, ModelGenerator renderer )
public boolean renderInWorld( final BlockDrive imb, final IBlockAccess world, final BlockPos pos, final ModelGenerator renderer )
{
TileDrive sp = imb.getTileEntity( world, pos );
final TileDrive sp = imb.getTileEntity( world, pos );
renderer.setRenderBounds( 0, 0, 0, 1, 1, 1 );
EnumFacing up = sp.getUp();
EnumFacing forward = sp.getForward();
EnumFacing west = Platform.crossProduct( forward, up );
final EnumFacing up = sp.getUp();
final EnumFacing forward = sp.getForward();
final EnumFacing west = Platform.crossProduct( forward, up );
boolean result = super.renderInWorld( imb, world, pos, renderer );
final boolean result = super.renderInWorld( imb, world, pos, renderer );
IAESprite ico = ExtraBlockTextures.MEStorageCellTextures.getIcon();
final IAESprite ico = ExtraBlockTextures.MEStorageCellTextures.getIcon();
int b = world.getCombinedLight( pos.offset( forward ), 0 );
final int b = world.getCombinedLight( pos.offset( forward ), 0 );
for( int yy = 0; yy < 5; yy++ )
{
for( int xx = 0; xx < 2; xx++ )
{
int stat = sp.getCellStatus( yy * 2 + ( 1 - xx ) );
final int stat = sp.getCellStatus( yy * 2 + ( 1 - xx ) );
this.selectFace( renderer, west, up, forward, 2 + xx * 7, 7 + xx * 7, 1 + yy * 3, 3 + yy * 3 );
int spin = 0;
@@ -210,9 +210,9 @@ public class RenderDrive extends BaseBlockRender<BlockDrive, TileDrive>
double v3 = ico.getInterpolatedV( ( ( spin + 3 ) % 4 < 2 ) ? m : mx );
double v4 = ico.getInterpolatedV( ( ( spin ) % 4 < 2 ) ? m : mx );
int x= pos.getX();
int y= pos.getY();
int z= pos.getZ();
final int x= pos.getX();
final int y= pos.getY();
final int z= pos.getZ();
renderer.setBrightness( b );
renderer.setColorOpaque_I( 0xffffff );
@@ -267,7 +267,7 @@ public class RenderDrive extends BaseBlockRender<BlockDrive, TileDrive>
if( stat != 0 )
{
IAESprite whiteIcon = ExtraBlockTextures.White.getIcon();
final IAESprite whiteIcon = ExtraBlockTextures.White.getIcon();
u1 = whiteIcon.getInterpolatedU( ( spin % 4 < 2 ) ? 1 : 6 );
u2 = whiteIcon.getInterpolatedU( ( ( spin + 1 ) % 4 < 2 ) ? 1 : 6 );
u3 = whiteIcon.getInterpolatedU( ( ( spin + 2 ) % 4 < 2 ) ? 1 : 6 );
src/main/java/appeng/client/render/blocks/RenderMEChest.java
+11 -11
View File
@@ -50,7 +50,7 @@ public class RenderMEChest extends BaseBlockRender<BlockChest, TileChest>
}
@Override
public void renderInventory( BlockChest block, ItemStack is, ModelGenerator renderer, ItemRenderType type, Object[] obj )
public void renderInventory( final BlockChest block, final ItemStack is, final ModelGenerator renderer, final ItemRenderType type, final Object[] obj )
{
renderer.setBrightness( 0 );
renderer.overrideBlockTexture = ExtraBlockTextures.White.getIcon();
@@ -64,9 +64,9 @@ public class RenderMEChest extends BaseBlockRender<BlockChest, TileChest>
}
@Override
public boolean renderInWorld( BlockChest imb, IBlockAccess world, BlockPos pos, ModelGenerator renderer )
public boolean renderInWorld( final BlockChest imb, final IBlockAccess world, final BlockPos pos, final ModelGenerator renderer )
{
TileChest sp = imb.getTileEntity( world, pos );
final TileChest sp = imb.getTileEntity( world, pos );
renderer.setRenderBounds( 0, 0, 0, 1, 1, 1 );
if( sp == null )
@@ -74,14 +74,14 @@ public class RenderMEChest extends BaseBlockRender<BlockChest, TileChest>
return false;
}
EnumFacing up = sp.getUp();
EnumFacing forward = sp.getForward();
EnumFacing west = Platform.crossProduct( forward, up );
final EnumFacing up = sp.getUp();
final EnumFacing forward = sp.getForward();
final EnumFacing west = Platform.crossProduct( forward, up );
this.preRenderInWorld( imb, world, pos, renderer );
int stat = sp.getCellStatus( 0 );
boolean result = renderer.renderStandardBlock( imb, pos );
final int stat = sp.getCellStatus( 0 );
final boolean result = renderer.renderStandardBlock( imb, pos );
this.selectFace( renderer, west, up, forward, 5, 16 - 5, 9, 12 );
@@ -95,8 +95,8 @@ 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 ) );
final int offsetU = -4;
final FlippableIcon flippableIcon = new FlippableIcon( new OffsetIcon( ExtraBlockTextures.MEStorageCellTextures.getIcon(), offsetU, offsetV ) );
if( forward == EnumFacing.EAST && ( up == EnumFacing.NORTH || up == EnumFacing.SOUTH ) )
{
flippableIcon.setFlip( true, false );
@@ -162,7 +162,7 @@ public class RenderMEChest extends BaseBlockRender<BlockChest, TileChest>
renderer.setColorOpaque_I( 0xffffff );
renderer.setRenderBounds( 0, 0, 0, 1, 1, 1 );
ICellHandler ch = AEApi.instance().registries().cell().getHandler( sp.getStorageType() );
final ICellHandler ch = AEApi.instance().registries().cell().getHandler( sp.getStorageType() );
renderer.setColorOpaque_I( sp.getColor().whiteVariant );
IAESprite ico = ch == null ? null : ch.getTopTexture_Light();
src/main/java/appeng/client/render/blocks/RenderNull.java
+2 -2
View File
@@ -38,13 +38,13 @@ public class RenderNull extends BaseBlockRender<AEBaseBlock, AEBaseTile>
}
@Override
public void renderInventory( AEBaseBlock block, ItemStack is, ModelGenerator renderer, ItemRenderType type, Object[] obj )
public void renderInventory( final AEBaseBlock block, final ItemStack is, final ModelGenerator renderer, final ItemRenderType type, final Object[] obj )
{
}
@Override
public boolean renderInWorld( AEBaseBlock block, IBlockAccess world, BlockPos pos, ModelGenerator renderer )
public boolean renderInWorld( final AEBaseBlock block, final IBlockAccess world, final BlockPos pos, final ModelGenerator renderer )
{
return true;
}
src/main/java/appeng/client/render/blocks/RenderQNB.java
+18 -18
View File
@@ -47,19 +47,19 @@ public class RenderQNB extends BaseBlockRender<BlockQuantumBase, TileQuantumBrid
{
@Override
public void renderInventory( BlockQuantumBase block, ItemStack item, ModelGenerator renderer, ItemRenderType type, Object[] obj )
public void renderInventory( final BlockQuantumBase block, final ItemStack item, final ModelGenerator renderer, final ItemRenderType type, final Object[] obj )
{
float minPx = 2.0f / 16.0f;
float maxPx = 14.0f / 16.0f;
final float minPx = 2.0f / 16.0f;
final float maxPx = 14.0f / 16.0f;
renderer.setRenderBounds( minPx, minPx, minPx, maxPx, maxPx, maxPx );
super.renderInventory( block, item, renderer, type, obj );
}
@Override
public boolean renderInWorld( BlockQuantumBase block, IBlockAccess world, BlockPos pos, ModelGenerator renderer )
public boolean renderInWorld( final BlockQuantumBase block, final IBlockAccess world, final BlockPos pos, final ModelGenerator renderer )
{
TileQuantumBridge tqb = block.getTileEntity( world, pos );
final TileQuantumBridge tqb = block.getTileEntity( world, pos );
if( tqb == null )
{
return false;
@@ -71,22 +71,22 @@ public class RenderQNB extends BaseBlockRender<BlockQuantumBase, TileQuantumBrid
final IBlocks blocks = definitions.blocks();
final IParts parts = definitions.parts();
for( Block linkBlock : blocks.quantumLink().maybeBlock().asSet() )
for( final Block linkBlock : blocks.quantumLink().maybeBlock().asSet() )
{
if( tqb.getBlockType() == linkBlock )
{
if( tqb.isFormed() )
{
EnumSet<AEPartLocation> sides = tqb.getConnections();
final EnumSet<AEPartLocation> sides = tqb.getConnections();
this.renderCableAt( 0.11D, world, pos, block, renderer, renderer.getIcon( parts.cableGlass().stack( AEColor.Transparent, 1 ) ), 0.141D, sides );
Item transCoveredCable = parts.cableCovered().item( AEColor.Transparent );
final Item transCoveredCable = parts.cableCovered().item( AEColor.Transparent );
this.renderCableAt( 0.188D, world, pos, block, renderer, renderer.getIcon( parts.cableCovered().stack( AEColor.Transparent, 1 ) ), 0.1875D, sides );
}
float renderMin = 2.0f / 16.0f;
float renderMax = 14.0f / 16.0f;
final float renderMin = 2.0f / 16.0f;
final float renderMax = 14.0f / 16.0f;
renderer.setRenderBounds( renderMin, renderMin, renderMin, renderMax, renderMax, renderMax );
renderer.renderStandardBlock( block, pos );
}
@@ -94,14 +94,14 @@ public class RenderQNB extends BaseBlockRender<BlockQuantumBase, TileQuantumBrid
{
if( !tqb.isFormed() )
{
float renderMin = 2.0f / 16.0f;
float renderMax = 14.0f / 16.0f;
final float renderMin = 2.0f / 16.0f;
final float renderMax = 14.0f / 16.0f;
renderer.setRenderBounds( renderMin, renderMin, renderMin, renderMax, renderMax, renderMax );
renderer.renderStandardBlock( block, pos );
}
else if( tqb.isCorner() )
{
Item transCoveredCable = parts.cableCovered().item( AEColor.Transparent );
final Item transCoveredCable = parts.cableCovered().item( AEColor.Transparent );
this.renderCableAt( 0.188D, world, pos, block, renderer, renderer.getIcon( parts.cableCovered().stack( AEColor.Transparent, 1 ) ), 0.05D, tqb.getConnections() );
float renderMin = 4.0f / 16.0f;
@@ -118,9 +118,9 @@ public class RenderQNB extends BaseBlockRender<BlockQuantumBase, TileQuantumBrid
renderer.setRenderBounds( renderMin, renderMin, renderMin, renderMax, renderMax, renderMax );
renderer.setColorOpaque_F( 1.0F, 1.0F, 1.0F );
int bn = 15;
final int bn = 15;
renderer.setBrightness( bn << 20 | bn << 4 );
for( EnumFacing side : EnumFacing.VALUES )
for( final EnumFacing side : EnumFacing.VALUES )
{
this.renderFace( pos, block, ExtraBlockTextures.BlockQRingCornerLight.getIcon(), renderer, side );
}
@@ -146,9 +146,9 @@ public class RenderQNB extends BaseBlockRender<BlockQuantumBase, TileQuantumBrid
renderer.setRenderBounds( renderMin, renderMin, renderMin, renderMax, renderMax, renderMax );
renderer.setColorOpaque_F( 1.0F, 1.0F, 1.0F );
int bn = 15;
final int bn = 15;
renderer.setBrightness( bn << 20 | bn << 4 );
for( EnumFacing side : EnumFacing.VALUES )
for( final EnumFacing side : EnumFacing.VALUES )
{
this.renderFace( pos, block, ExtraBlockTextures.BlockQRingEdgeLight.getIcon(), renderer, side );
}
@@ -161,7 +161,7 @@ public class RenderQNB extends BaseBlockRender<BlockQuantumBase, TileQuantumBrid
return true;
}
private void renderCableAt( double thickness, IBlockAccess world, BlockPos pos, BlockQuantumBase block, ModelGenerator renderer, IAESprite texture, double pull, Collection<AEPartLocation> connections )
private void renderCableAt( final double thickness, final IBlockAccess world, final BlockPos pos, final BlockQuantumBase block, final ModelGenerator renderer, final IAESprite texture, final double pull, final Collection<AEPartLocation> connections )
{
block.getRendererInstance().setTemporaryRenderIcon( texture );
src/main/java/appeng/client/render/blocks/RenderQuartzGlass.java
+14 -14
View File
@@ -45,7 +45,7 @@ public class RenderQuartzGlass extends BaseBlockRender<QuartzGlassBlock, AEBaseT
super( false, 0 );
if( offsets == null )
{
Random r = new Random( 924 );
final Random r = new Random( 924 );
offsets = new byte[10][10][10];
for( int x = 0; x < 10; x++ )
{
@@ -58,7 +58,7 @@ public class RenderQuartzGlass extends BaseBlockRender<QuartzGlassBlock, AEBaseT
}
@Override
public void renderInventory( QuartzGlassBlock block, ItemStack is, ModelGenerator renderer, ItemRenderType type, Object[] obj )
public void renderInventory( final QuartzGlassBlock block, final ItemStack is, final ModelGenerator renderer, final ItemRenderType type, final Object[] obj )
{
renderer.overrideBlockTexture = ExtraBlockTextures.GlassFrame.getIcon();
super.renderInventory( block, is, renderer, type, obj );
@@ -67,16 +67,16 @@ public class RenderQuartzGlass extends BaseBlockRender<QuartzGlassBlock, AEBaseT
}
@Override
public boolean renderInWorld( QuartzGlassBlock imb, IBlockAccess world, BlockPos pos, ModelGenerator renderer )
public boolean renderInWorld( final QuartzGlassBlock imb, final IBlockAccess world, final BlockPos pos, final ModelGenerator renderer )
{
renderer.setRenderBounds( 0, 0, 0, 1, 1, 1 );
int cx = Math.abs( pos.getX() % 10 );
int cy = Math.abs( pos.getY() % 10 );
int cz = Math.abs( pos.getZ() % 10 );
final int cx = Math.abs( pos.getX() % 10 );
final int cy = Math.abs( pos.getY() % 10 );
final int cz = Math.abs( pos.getZ() % 10 );
int u = offsets[cx][cy][cz] % 4;
int v = offsets[9 - cx][9 - cy][9 - cz] % 4;
final int u = offsets[cx][cy][cz] % 4;
final int v = offsets[9 - cx][9 - cy][9 - cz] % 4;
switch( Math.abs( ( offsets[cx][cy][cz] + ( pos.getX()+pos.getY()+pos.getZ() ) ) % 4 ) )
{
@@ -94,7 +94,7 @@ public class RenderQuartzGlass extends BaseBlockRender<QuartzGlassBlock, AEBaseT
break;
}
boolean result = renderer.renderStandardBlock( imb, pos );
final boolean result = renderer.renderStandardBlock( imb, pos );
renderer.overrideBlockTexture = null;
this.renderEdge( imb, world, pos, renderer, AEPartLocation.UP, AEPartLocation.EAST );
@@ -130,7 +130,7 @@ public class RenderQuartzGlass extends BaseBlockRender<QuartzGlassBlock, AEBaseT
return result;
}
private void renderEdge( QuartzGlassBlock imb, IBlockAccess world, BlockPos pos, ModelGenerator renderer, AEPartLocation side, AEPartLocation direction )
private void renderEdge( final QuartzGlassBlock imb, final IBlockAccess world, final BlockPos pos, final ModelGenerator renderer, final AEPartLocation side, final AEPartLocation direction )
{
if( !this.isFlush( imb, world, pos.getX() + side.xOffset, pos.getY() + side.yOffset, pos.getZ() + side.zOffset ) )
{
@@ -214,22 +214,22 @@ public class RenderQuartzGlass extends BaseBlockRender<QuartzGlassBlock, AEBaseT
}
}
private boolean isFlush( QuartzGlassBlock imb, IBlockAccess world, int x, int y, int z )
private boolean isFlush( final QuartzGlassBlock imb, final IBlockAccess world, final int x, final int y, final int z )
{
return this.isGlass( imb, world, new BlockPos(x, y, z) );
}
private boolean isGlass( QuartzGlassBlock imb, IBlockAccess world,BlockPos pos)
private boolean isGlass( final QuartzGlassBlock imb, final IBlockAccess world, final BlockPos pos)
{
return this.isQuartzGlass( world, pos ) || this.isVibrantQuartzGlass( world, pos );
}
private boolean isQuartzGlass( IBlockAccess world,BlockPos pos)
private boolean isQuartzGlass( final IBlockAccess world, final BlockPos pos)
{
return AEApi.instance().definitions().blocks().quartzGlass().isSameAs( world, pos );
}
private boolean isVibrantQuartzGlass( IBlockAccess world,BlockPos pos)
private boolean isVibrantQuartzGlass( final IBlockAccess world, final BlockPos pos)
{
return AEApi.instance().definitions().blocks().quartzVibrantGlass().isSameAs( world, pos );
}
src/main/java/appeng/client/render/blocks/RenderQuartzOre.java
+3 -3
View File
@@ -39,7 +39,7 @@ public class RenderQuartzOre extends BaseBlockRender<QuartzOreBlock, AEBaseTile>
}
@Override
public void renderInventory( QuartzOreBlock blk, ItemStack is, ModelGenerator renderer, ItemRenderType type, Object[] obj )
public void renderInventory( final QuartzOreBlock blk, final ItemStack is, final ModelGenerator renderer, final ItemRenderType type, final Object[] obj )
{
super.renderInventory( blk, is, renderer, type, obj );
blk.getRendererInstance().setTemporaryRenderIcon( ExtraBlockTextures.OreQuartzStone.getIcon() );
@@ -48,14 +48,14 @@ public class RenderQuartzOre extends BaseBlockRender<QuartzOreBlock, AEBaseTile>
}
@Override
public boolean renderInWorld( QuartzOreBlock quartz, IBlockAccess world, BlockPos pos, ModelGenerator renderer )
public boolean renderInWorld( final QuartzOreBlock quartz, final IBlockAccess world, final BlockPos pos, final ModelGenerator renderer )
{
quartz.setEnhanceBrightness( true );
super.renderInWorld( quartz, world, pos, renderer );
quartz.setEnhanceBrightness( false );
quartz.getRendererInstance().setTemporaryRenderIcon( ExtraBlockTextures.OreQuartzStone.getIcon() );
boolean out = super.renderInWorld( quartz, world, pos, renderer );
final boolean out = super.renderInWorld( quartz, world, pos, renderer );
quartz.getRendererInstance().setTemporaryRenderIcon( null );
return out;
src/main/java/appeng/client/render/blocks/RenderQuartzTorch.java
+28 -28
View File
@@ -44,22 +44,22 @@ public class RenderQuartzTorch extends BaseBlockRender<AEBaseBlock, AEBaseTile>
}
@Override
public void renderInventory( AEBaseBlock blk, ItemStack is, ModelGenerator renderer, ItemRenderType type, Object[] obj )
public void renderInventory( final AEBaseBlock blk, final ItemStack is, final ModelGenerator renderer, final ItemRenderType type, final Object[] obj )
{
float Point3 = 7.0f / 16.0f;
float Point12 = 9.0f / 16.0f;
final float Point3 = 7.0f / 16.0f;
final float Point12 = 9.0f / 16.0f;
float renderBottom = 5.0f / 16.0f;
float renderTop = 10.0f / 16.0f;
final float renderBottom = 5.0f / 16.0f;
final float renderTop = 10.0f / 16.0f;
float xOff = 0.0f;
float yOff = 0.0f;
float zOff = 0.0f;
final float xOff = 0.0f;
final float yOff = 0.0f;
final float zOff = 0.0f;
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;
final 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 );
@@ -70,10 +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;
final float top = 8.0f / 16.0f;
final float bottom = 7.0f / 16.0f;
final float Point13 = 10.0f / 16.0f;
final 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 );
@@ -92,9 +92,9 @@ public class RenderQuartzTorch extends BaseBlockRender<AEBaseBlock, AEBaseTile>
}
@Override
public boolean renderInWorld( AEBaseBlock block, IBlockAccess world, BlockPos pos, ModelGenerator renderer )
public boolean renderInWorld( final AEBaseBlock block, final IBlockAccess world, final BlockPos pos, final ModelGenerator renderer )
{
IOrientable te = ( (IOrientableBlock) block ).getOrientable( world, pos );
final IOrientable te = ( (IOrientableBlock) block ).getOrientable( world, pos );
renderer.renderAllFaces = true;
float zOff = 0.0f;
@@ -102,21 +102,21 @@ public class RenderQuartzTorch extends BaseBlockRender<AEBaseBlock, AEBaseTile>
float xOff = 0.0f;
if( te != null )
{
AEPartLocation forward = AEPartLocation.fromFacing( te.getUp() );
final AEPartLocation forward = AEPartLocation.fromFacing( te.getUp() );
xOff = forward.xOffset * -( 4.0f / 16.0f );
yOff = forward.yOffset * -( 4.0f / 16.0f );
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;
final float renderTop = 10.0f / 16.0f;
final float renderBottom = 5.0f / 16.0f;
final float Point12 = 9.0f / 16.0f;
final 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;
final int r = ( pos.getX() + pos.getY() + pos.getZ() ) % 2;
final 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 );
@@ -136,12 +136,12 @@ 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;
final float top = 8.0f / 16.0f;
final float bottom = 7.0f / 16.0f;
final float Point13 = 10.0f / 16.0f;
final 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 );
final boolean out = renderer.renderStandardBlock( block, pos );
renderer.setRenderBounds( Point2 + xOff, bottom + yOff, Point12 + zOff, Point13 + xOff, top + yOff, Point13 + zOff );
renderer.renderStandardBlock( block, pos );
@@ -154,7 +154,7 @@ public class RenderQuartzTorch extends BaseBlockRender<AEBaseBlock, AEBaseTile>
if( te != null )
{
AEPartLocation forward = AEPartLocation.fromFacing( te.getUp());
final AEPartLocation forward = AEPartLocation.fromFacing( te.getUp());
switch( forward )
{
case EAST:
src/main/java/appeng/client/render/blocks/RenderSpatialPylon.java
+11 -11
View File
@@ -43,7 +43,7 @@ public class RenderSpatialPylon extends BaseBlockRender<BlockSpatialPylon, TileS
}
@Override
public void renderInventory( BlockSpatialPylon block, ItemStack is, ModelGenerator renderer, ItemRenderType type, Object[] obj )
public void renderInventory( final BlockSpatialPylon block, final ItemStack is, final ModelGenerator renderer, final ItemRenderType type, final Object[] obj )
{
renderer.overrideBlockTexture = ExtraBlockTextures.BlockSpatialPylon_dim.getIcon();
super.renderInventory( block, is, renderer, type, obj );
@@ -52,13 +52,13 @@ public class RenderSpatialPylon extends BaseBlockRender<BlockSpatialPylon, TileS
}
@Override
public boolean renderInWorld( BlockSpatialPylon imb, IBlockAccess world, BlockPos pos, ModelGenerator renderer )
public boolean renderInWorld( final BlockSpatialPylon imb, final IBlockAccess world, final BlockPos pos, final ModelGenerator renderer )
{
renderer.setRenderBounds( 0, 0, 0, 1, 1, 1 );
TileSpatialPylon sp = imb.getTileEntity( world, pos );
final TileSpatialPylon sp = imb.getTileEntity( world, pos );
int displayBits = ( sp == null ) ? 0 : sp.getDisplayBits();
final int displayBits = ( sp == null ) ? 0 : sp.getDisplayBits();
if( displayBits != 0 )
{
@@ -123,19 +123,19 @@ public class RenderSpatialPylon extends BaseBlockRender<BlockSpatialPylon, TileS
}
}
BlockRenderInfo bri = imb.getRendererInstance();
final BlockRenderInfo bri = imb.getRendererInstance();
bri.setTemporaryRenderIcon( null );
bri.setTemporaryRenderIcons( this.getBlockTextureFromSideOutside( imb, sp, displayBits, ori, EnumFacing.UP, renderer ), this.getBlockTextureFromSideOutside( imb, sp, displayBits, ori, EnumFacing.DOWN, renderer ), this.getBlockTextureFromSideOutside( imb, sp, displayBits, ori, EnumFacing.SOUTH, renderer ), this.getBlockTextureFromSideOutside( imb, sp, displayBits, ori, EnumFacing.NORTH, renderer ), this.getBlockTextureFromSideOutside( imb, sp, displayBits, ori, EnumFacing.EAST, renderer ), this.getBlockTextureFromSideOutside( imb, sp, displayBits, ori, EnumFacing.WEST , renderer) );
boolean r = renderer.renderStandardBlock( imb, pos );
final boolean r = renderer.renderStandardBlock( imb, pos );
if( ( displayBits & TileSpatialPylon.DISPLAY_POWERED_ENABLED ) == TileSpatialPylon.DISPLAY_POWERED_ENABLED )
{
int bn = 15;
final int bn = 15;
renderer.setBrightness( bn << 20 | bn << 4 );
renderer.setColorOpaque_I( 0xffffff );
for( EnumFacing d : EnumFacing.VALUES )
for( final EnumFacing d : EnumFacing.VALUES )
{
this.renderFace( pos, imb, this.getBlockTextureFromSideInside( imb, sp, displayBits, ori, d,renderer ), renderer, d );
}
@@ -164,7 +164,7 @@ public class RenderSpatialPylon extends BaseBlockRender<BlockSpatialPylon, TileS
return result;
}
private IAESprite getBlockTextureFromSideOutside( BlockSpatialPylon blk, TileSpatialPylon sp, int displayBits, EnumFacing ori, EnumFacing dir, ModelGenerator renderer )
private IAESprite getBlockTextureFromSideOutside( final BlockSpatialPylon blk, final TileSpatialPylon sp, final int displayBits, final EnumFacing ori, final EnumFacing dir, final ModelGenerator renderer )
{
if( ori == dir || ori.getOpposite() == dir )
@@ -188,9 +188,9 @@ public class RenderSpatialPylon extends BaseBlockRender<BlockSpatialPylon, TileS
return renderer.getIcon( blk.getDefaultState() )[0];// blk.getIcon( 0, 0 );
}
private IAESprite getBlockTextureFromSideInside( BlockSpatialPylon blk, TileSpatialPylon sp, int displayBits, EnumFacing ori, EnumFacing dir, ModelGenerator renderer )
private IAESprite getBlockTextureFromSideInside( final BlockSpatialPylon blk, final TileSpatialPylon sp, final int displayBits, final EnumFacing ori, final EnumFacing dir, final ModelGenerator renderer )
{
boolean good = ( displayBits & TileSpatialPylon.DISPLAY_ENABLED ) == TileSpatialPylon.DISPLAY_ENABLED;
final boolean good = ( displayBits & TileSpatialPylon.DISPLAY_ENABLED ) == TileSpatialPylon.DISPLAY_ENABLED;
if( ori == dir || ori.getOpposite() == dir )
{
src/main/java/appeng/client/render/blocks/RenderTinyTNT.java
+3 -3
View File
@@ -41,7 +41,7 @@ public class RenderTinyTNT extends BaseBlockRender<BlockTinyTNT, AEBaseTile>
}
@Override
public void renderInventory( BlockTinyTNT block, ItemStack is, ModelGenerator renderer, ItemRenderType type, Object[] obj )
public void renderInventory( final BlockTinyTNT block, final ItemStack is, final ModelGenerator renderer, final ItemRenderType type, final Object[] obj )
{
renderer.setOverrideBlockTexture( new FullIcon( Minecraft.getMinecraft().getBlockRendererDispatcher().getBlockModelShapes().getTexture( Blocks.tnt.getDefaultState() )) );
renderer.setRenderBounds( 0.25f, 0.0f, 0.25f, 0.75f, 0.5f, 0.75f );
@@ -49,12 +49,12 @@ public class RenderTinyTNT extends BaseBlockRender<BlockTinyTNT, AEBaseTile>
}
@Override
public boolean renderInWorld( BlockTinyTNT imb, IBlockAccess world, BlockPos pos, ModelGenerator renderer )
public boolean renderInWorld( final BlockTinyTNT imb, final IBlockAccess world, final BlockPos pos, final ModelGenerator renderer )
{
renderer.setOverrideBlockTexture( new FullIcon( Minecraft.getMinecraft().getBlockRendererDispatcher().getBlockModelShapes().getTexture( Blocks.tnt.getDefaultState() )) );
renderer.renderAllFaces = true;
renderer.setRenderBounds( 0.25f, 0.0f, 0.25f, 0.75f, 0.5f, 0.75f );
boolean out = super.renderInWorld( imb, world, pos, renderer );
final boolean out = super.renderInWorld( imb, world, pos, renderer );
renderer.renderAllFaces = false;
return out;
}
src/main/java/appeng/client/render/blocks/RendererCableBus.java
+10 -10
View File
@@ -54,7 +54,7 @@ public class RendererCableBus extends BaseBlockRender<BlockCableBus, TileCableBu
}
@Override
public void renderInventory( BlockCableBus blk, ItemStack item, ModelGenerator renderer, ItemRenderType type, Object[] obj )
public void renderInventory( final BlockCableBus blk, final ItemStack item, final ModelGenerator renderer, final ItemRenderType type, final Object[] obj )
{
renderer.setColorOpaque_F( 1, 1, 1 );
renderer.setBrightness( 14 << 20 | 14 << 4 );
@@ -72,8 +72,8 @@ public class RendererCableBus extends BaseBlockRender<BlockCableBus, TileCableBu
if( item.getItem() instanceof IFacadeItem )
{
IFacadeItem fi = (IFacadeItem) item.getItem();
IFacadePart fp = fi.createPartFromItemStack( item, AEPartLocation.SOUTH );
final IFacadeItem fi = (IFacadeItem) item.getItem();
final IFacadePart fp = fi.createPartFromItemStack( item, AEPartLocation.SOUTH );
if( fp != null )
{
@@ -82,12 +82,12 @@ public class RendererCableBus extends BaseBlockRender<BlockCableBus, TileCableBu
}
else
{
IPart ip = this.getRenderer( item, (IPartItem) item.getItem() );
final IPart ip = this.getRenderer( item, (IPartItem) item.getItem() );
if( ip != null )
{
if( type == ItemRenderType.ENTITY )
{
int depth = ip.cableConnectionRenderTo();
final int depth = ip.cableConnectionRenderTo();
}
ip.renderInventory( BusRenderHelper.INSTANCE, renderer );
@@ -97,9 +97,9 @@ public class RendererCableBus extends BaseBlockRender<BlockCableBus, TileCableBu
renderer.uvRotateBottom = renderer.uvRotateEast = renderer.uvRotateNorth = renderer.uvRotateSouth = renderer.uvRotateTop = renderer.uvRotateWest = 0;
}
public IPart getRenderer( ItemStack is, IPartItem c )
public IPart getRenderer( final ItemStack is, final IPartItem c )
{
int id = ( Item.getIdFromItem( is.getItem() ) << Platform.DEF_OFFSET ) | is.getItemDamage();
final int id = ( Item.getIdFromItem( is.getItem() ) << Platform.DEF_OFFSET ) | is.getItemDamage();
IPart part = RENDER_PART.get( id );
if( part == null )
@@ -118,9 +118,9 @@ public class RendererCableBus extends BaseBlockRender<BlockCableBus, TileCableBu
private static final Map<Integer, IPart> RENDER_PART = new HashMap<Integer, IPart>();
@Override
public boolean renderInWorld( BlockCableBus block, IBlockAccess world, BlockPos pos, ModelGenerator renderer )
public boolean renderInWorld( final BlockCableBus block, final IBlockAccess world, final BlockPos pos, final ModelGenerator renderer )
{
AEBaseTile t = block.getTileEntity( world, pos );
final AEBaseTile t = block.getTileEntity( world, pos );
if( t instanceof TileCableBus )
{
@@ -136,7 +136,7 @@ public class RendererCableBus extends BaseBlockRender<BlockCableBus, TileCableBu
}
@Override
public void renderTile( BlockCableBus block, TileCableBus cableBus, WorldRenderer tess, double x, double y, double z, float f, ModelGenerator renderer )
public void renderTile( final BlockCableBus block, final TileCableBus cableBus, final WorldRenderer tess, final double x, final double y, final double z, final float f, final ModelGenerator renderer )
{
if( cableBus != null )
{
src/main/java/appeng/client/render/blocks/RendererSecurity.java
+5 -5
View File
@@ -45,7 +45,7 @@ public class RendererSecurity extends BaseBlockRender<BlockSecurity, TileSecurit
}
@Override
public void renderInventory( BlockSecurity block, ItemStack is, ModelGenerator renderer, ItemRenderType type, Object[] obj )
public void renderInventory( final BlockSecurity block, final ItemStack is, final ModelGenerator renderer, final ItemRenderType type, final Object[] obj )
{
renderer.overrideBlockTexture = ExtraBlockTextures.getMissing();
this.renderInvBlock( EnumSet.of( AEPartLocation.SOUTH ), block, is, 0x000000, renderer );
@@ -58,16 +58,16 @@ public class RendererSecurity extends BaseBlockRender<BlockSecurity, TileSecurit
}
@Override
public boolean renderInWorld( BlockSecurity imb, IBlockAccess world, BlockPos pos, ModelGenerator renderer )
public boolean renderInWorld( final BlockSecurity imb, final IBlockAccess world, final BlockPos pos, final ModelGenerator renderer )
{
TileSecurity sp = imb.getTileEntity( world, pos );
final TileSecurity sp = imb.getTileEntity( world, pos );
renderer.setRenderBounds( 0, 0, 0, 1, 1, 1 );
EnumFacing up = sp.getUp();
final EnumFacing up = sp.getUp();
this.preRenderInWorld( imb, world, pos, renderer );
boolean result = renderer.renderStandardBlock( imb, pos );
final boolean result = renderer.renderStandardBlock( imb, pos );
int b = world.getCombinedLight( pos.offset( up ), 0 );
if( sp.isActive() )