Remove redundant type casts
This commit is contained in:
parent
3b495c35d7
commit
209298bb4d
|
@ -102,10 +102,9 @@ public class RenderBlockAssembler extends BaseBlockRender<BlockMolecularAssemble
|
||||||
}
|
}
|
||||||
|
|
||||||
@Override
|
@Override
|
||||||
public boolean renderInWorld( BlockMolecularAssembler block, IBlockAccess world, BlockPos pos, ModelGenerator renderer )
|
public boolean renderInWorld( BlockMolecularAssembler maBlock, IBlockAccess world, BlockPos pos, ModelGenerator renderer )
|
||||||
{
|
{
|
||||||
BlockMolecularAssembler blk = block;
|
TileMolecularAssembler tma = maBlock.getTileEntity( world, pos );
|
||||||
TileMolecularAssembler tma = blk.getTileEntity( world, pos );
|
|
||||||
|
|
||||||
if ( renderer.isAlphaPass() )
|
if ( renderer.isAlphaPass() )
|
||||||
{
|
{
|
||||||
|
@ -115,12 +114,12 @@ public class RenderBlockAssembler extends BaseBlockRender<BlockMolecularAssemble
|
||||||
TaughtIcon lights = new TaughtIcon( ExtraBlockTextures.BlockMolecularAssemblerLights.getIcon(), -2.0f );
|
TaughtIcon lights = new TaughtIcon( ExtraBlockTextures.BlockMolecularAssemblerLights.getIcon(), -2.0f );
|
||||||
renderer.setColorRGBA_F( 1, 1, 1, 0.3f );
|
renderer.setColorRGBA_F( 1, 1, 1, 0.3f );
|
||||||
renderer.setBrightness( 14 << 20 | 14 << 4 );
|
renderer.setBrightness( 14 << 20 | 14 << 4 );
|
||||||
renderer.renderFaceXNeg( blk, pos, lights );
|
renderer.renderFaceXNeg( maBlock, pos, lights );
|
||||||
renderer.renderFaceXPos( blk, pos, lights );
|
renderer.renderFaceXPos( maBlock, pos, lights );
|
||||||
renderer.renderFaceYNeg( blk, pos, lights );
|
renderer.renderFaceYNeg( maBlock, pos, lights );
|
||||||
renderer.renderFaceYPos( blk, pos, lights );
|
renderer.renderFaceYPos( maBlock, pos, lights );
|
||||||
renderer.renderFaceZNeg( blk, pos, lights );
|
renderer.renderFaceZNeg( maBlock, pos, lights );
|
||||||
renderer.renderFaceZPos( blk, pos, lights );
|
renderer.renderFaceZPos( maBlock, pos, lights );
|
||||||
return true;
|
return true;
|
||||||
}
|
}
|
||||||
return false;
|
return false;
|
||||||
|
@ -130,9 +129,9 @@ public class RenderBlockAssembler extends BaseBlockRender<BlockMolecularAssemble
|
||||||
//renderer = BusRenderer.INSTANCE.renderer;
|
//renderer = BusRenderer.INSTANCE.renderer;
|
||||||
BusRenderer.INSTANCE.renderer=renderer;
|
BusRenderer.INSTANCE.renderer=renderer;
|
||||||
|
|
||||||
this.preRenderInWorld( block, world, pos, renderer );
|
this.preRenderInWorld( maBlock, world, pos, renderer );
|
||||||
|
|
||||||
IOrientable te = this.getOrientable( block, world, pos );
|
IOrientable te = this.getOrientable( maBlock, world, pos );
|
||||||
|
|
||||||
EnumFacing fdy = te.getUp();
|
EnumFacing fdy = te.getUp();
|
||||||
EnumFacing fdz = te.getForward();
|
EnumFacing fdz = te.getForward();
|
||||||
|
@ -140,52 +139,52 @@ public class RenderBlockAssembler extends BaseBlockRender<BlockMolecularAssemble
|
||||||
|
|
||||||
renderer.renderAllFaces = true;
|
renderer.renderAllFaces = true;
|
||||||
|
|
||||||
this.renderCableAt( 0.11D, world, pos, block, renderer, 0.141D, false );
|
this.renderCableAt( 0.11D, world, pos, maBlock, renderer, 0.141D, false );
|
||||||
this.renderCableAt( 0.188D, world, pos, block, renderer, 0.1875D, true );
|
this.renderCableAt( 0.188D, world, pos, maBlock, renderer, 0.1875D, true );
|
||||||
|
|
||||||
blk.getRendererInstance().setTemporaryRenderIcon( renderer.getIcon( world.getBlockState( pos ) )[0] );
|
maBlock.getRendererInstance().setTemporaryRenderIcon( renderer.getIcon( world.getBlockState( pos ) )[0] );
|
||||||
|
|
||||||
this.renderBlockBounds( renderer, 2, 14, 0, 14, 16, 2, fdx, fdy, fdz );
|
this.renderBlockBounds( renderer, 2, 14, 0, 14, 16, 2, fdx, fdy, fdz );
|
||||||
renderer.renderStandardBlock( blk, pos );
|
renderer.renderStandardBlock( maBlock, pos );
|
||||||
|
|
||||||
this.renderBlockBounds( renderer, 0, 14, 2, 2, 16, 14, fdx, fdy, fdz );
|
this.renderBlockBounds( renderer, 0, 14, 2, 2, 16, 14, fdx, fdy, fdz );
|
||||||
renderer.renderStandardBlock( blk, pos );
|
renderer.renderStandardBlock( maBlock, pos );
|
||||||
|
|
||||||
this.renderBlockBounds( renderer, 2, 0, 14, 14, 2, 16, fdx, fdy, fdz );
|
this.renderBlockBounds( renderer, 2, 0, 14, 14, 2, 16, fdx, fdy, fdz );
|
||||||
renderer.renderStandardBlock( blk, pos );
|
renderer.renderStandardBlock( maBlock, pos );
|
||||||
|
|
||||||
this.renderBlockBounds( renderer, 14, 0, 2, 16, 2, 14, fdx, fdy, fdz );
|
this.renderBlockBounds( renderer, 14, 0, 2, 16, 2, 14, fdx, fdy, fdz );
|
||||||
renderer.renderStandardBlock( blk, pos );
|
renderer.renderStandardBlock( maBlock, pos );
|
||||||
|
|
||||||
// sides...
|
// sides...
|
||||||
this.renderBlockBounds( renderer, 0, 0, 0, 16, 2, 2, fdx, fdy, fdz );
|
this.renderBlockBounds( renderer, 0, 0, 0, 16, 2, 2, fdx, fdy, fdz );
|
||||||
renderer.renderStandardBlock( blk, pos );
|
renderer.renderStandardBlock( maBlock, pos );
|
||||||
|
|
||||||
this.renderBlockBounds( renderer, 0, 2, 0, 2, 16, 2, fdx, fdy, fdz );
|
this.renderBlockBounds( renderer, 0, 2, 0, 2, 16, 2, fdx, fdy, fdz );
|
||||||
renderer.renderStandardBlock( blk, pos );
|
renderer.renderStandardBlock( maBlock, pos );
|
||||||
|
|
||||||
this.renderBlockBounds( renderer, 0, 0, 2, 2, 2, 16, fdx, fdy, fdz );
|
this.renderBlockBounds( renderer, 0, 0, 2, 2, 2, 16, fdx, fdy, fdz );
|
||||||
renderer.renderStandardBlock( blk, pos );
|
renderer.renderStandardBlock( maBlock, pos );
|
||||||
|
|
||||||
this.renderBlockBounds( renderer, 0, 14, 14, 16, 16, 16, fdx, fdy, fdz );
|
this.renderBlockBounds( renderer, 0, 14, 14, 16, 16, 16, fdx, fdy, fdz );
|
||||||
renderer.renderStandardBlock( blk, pos );
|
renderer.renderStandardBlock( maBlock, pos );
|
||||||
|
|
||||||
this.renderBlockBounds( renderer, 14, 0, 14, 16, 14, 16, fdx, fdy, fdz );
|
this.renderBlockBounds( renderer, 14, 0, 14, 16, 14, 16, fdx, fdy, fdz );
|
||||||
renderer.renderStandardBlock( blk, pos );
|
renderer.renderStandardBlock( maBlock, pos );
|
||||||
|
|
||||||
this.renderBlockBounds( renderer, 14, 14, 0, 16, 16, 14, fdx, fdy, fdz );
|
this.renderBlockBounds( renderer, 14, 14, 0, 16, 16, 14, fdx, fdy, fdz );
|
||||||
renderer.renderStandardBlock( blk, pos );
|
renderer.renderStandardBlock( maBlock, pos );
|
||||||
|
|
||||||
this.renderBlockBounds( renderer, 14, 2, 0, 16, 14, 2, fdx, fdy, fdz );
|
this.renderBlockBounds( renderer, 14, 2, 0, 16, 14, 2, fdx, fdy, fdz );
|
||||||
renderer.renderStandardBlock( blk, pos );
|
renderer.renderStandardBlock( maBlock, pos );
|
||||||
|
|
||||||
this.renderBlockBounds( renderer, 0, 2, 14, 2, 14, 16, fdx, fdy, fdz );
|
this.renderBlockBounds( renderer, 0, 2, 14, 2, 14, 16, fdx, fdy, fdz );
|
||||||
renderer.renderStandardBlock( blk, pos );
|
renderer.renderStandardBlock( maBlock, pos );
|
||||||
|
|
||||||
this.renderBlockBounds( renderer, 1, 1, 1, 15, 15, 15, fdx, fdy, fdz );
|
this.renderBlockBounds( renderer, 1, 1, 1, 15, 15, 15, fdx, fdy, fdz );
|
||||||
renderer.renderStandardBlock( blk, pos );
|
renderer.renderStandardBlock( maBlock, pos );
|
||||||
|
|
||||||
blk.getRendererInstance().setTemporaryRenderIcon( null );
|
maBlock.getRendererInstance().setTemporaryRenderIcon( null );
|
||||||
|
|
||||||
renderer.renderAllFaces = false;
|
renderer.renderAllFaces = false;
|
||||||
|
|
||||||
|
|
|
@ -87,8 +87,6 @@ public class RenderBlockCharger extends BaseBlockRender<BlockCharger, TileCharge
|
||||||
{
|
{
|
||||||
this.preRenderInWorld( block, world, pos, renderer );
|
this.preRenderInWorld( block, world, pos, renderer );
|
||||||
|
|
||||||
final BlockCharger blk = block;
|
|
||||||
|
|
||||||
final IOrientable te = this.getOrientable( block, world, pos );
|
final IOrientable te = this.getOrientable( block, world, pos );
|
||||||
|
|
||||||
final EnumFacing fdy = te.getUp();
|
final EnumFacing fdy = te.getUp();
|
||||||
|
@ -97,28 +95,28 @@ public class RenderBlockCharger extends BaseBlockRender<BlockCharger, TileCharge
|
||||||
|
|
||||||
renderer.renderAllFaces = true;
|
renderer.renderAllFaces = true;
|
||||||
this.renderBlockBounds( renderer, 6, 1, 0, 10, 15, 2, fdx, fdy, fdz );
|
this.renderBlockBounds( renderer, 6, 1, 0, 10, 15, 2, fdx, fdy, fdz );
|
||||||
boolean out = renderer.renderStandardBlock( blk, pos );
|
boolean out = renderer.renderStandardBlock( block, pos );
|
||||||
|
|
||||||
blk.getRendererInstance().setTemporaryRenderIcons( ExtraBlockTextures.BlockChargerInside.getIcon(), null, null, null, null, null );
|
block.getRendererInstance().setTemporaryRenderIcons( ExtraBlockTextures.BlockChargerInside.getIcon(), null, null, null, null, null );
|
||||||
|
|
||||||
this.renderBlockBounds( renderer, 2, 0, 2, 14, 3, 14, fdx, fdy, fdz );
|
this.renderBlockBounds( renderer, 2, 0, 2, 14, 3, 14, fdx, fdy, fdz );
|
||||||
out = renderer.renderStandardBlock( blk, pos );
|
out = renderer.renderStandardBlock( block, pos );
|
||||||
|
|
||||||
this.renderBlockBounds( renderer, 3, 3, 3, 13, 4, 13, fdx, fdy, fdz );
|
this.renderBlockBounds( renderer, 3, 3, 3, 13, 4, 13, fdx, fdy, fdz );
|
||||||
out = renderer.renderStandardBlock( blk, pos );
|
out = renderer.renderStandardBlock( block, pos );
|
||||||
|
|
||||||
blk.getRendererInstance().setTemporaryRenderIcon( null );
|
block.getRendererInstance().setTemporaryRenderIcon( null );
|
||||||
|
|
||||||
blk.getRendererInstance().setTemporaryRenderIcons( null, ExtraBlockTextures.BlockChargerInside.getIcon(), null, null, null, null );
|
block.getRendererInstance().setTemporaryRenderIcons( null, ExtraBlockTextures.BlockChargerInside.getIcon(), null, null, null, null );
|
||||||
|
|
||||||
this.renderBlockBounds( renderer, 2, 13, 2, 14, 16, 14, fdx, fdy, fdz );
|
this.renderBlockBounds( renderer, 2, 13, 2, 14, 16, 14, fdx, fdy, fdz );
|
||||||
out = renderer.renderStandardBlock( blk, pos );
|
out = renderer.renderStandardBlock( block, pos );
|
||||||
|
|
||||||
this.renderBlockBounds( renderer, 3, 12, 3, 13, 13, 13, fdx, fdy, fdz );
|
this.renderBlockBounds( renderer, 3, 12, 3, 13, 13, 13, fdx, fdy, fdz );
|
||||||
out = renderer.renderStandardBlock( blk, pos );
|
out = renderer.renderStandardBlock( block, pos );
|
||||||
|
|
||||||
renderer.renderAllFaces = false;
|
renderer.renderAllFaces = false;
|
||||||
blk.getRendererInstance().setTemporaryRenderIcon( null );
|
block.getRendererInstance().setTemporaryRenderIcon( null );
|
||||||
|
|
||||||
this.postRenderInWorld( renderer );
|
this.postRenderInWorld( renderer );
|
||||||
return out;
|
return out;
|
||||||
|
@ -127,11 +125,7 @@ public class RenderBlockCharger extends BaseBlockRender<BlockCharger, TileCharge
|
||||||
@Override
|
@Override
|
||||||
public void renderTile( BlockCharger block, TileCharger tile, WorldRenderer tess, double x, double y, double z, float f, ModelGenerator renderer )
|
public void renderTile( BlockCharger block, TileCharger tile, WorldRenderer tess, double x, double y, double z, float f, ModelGenerator renderer )
|
||||||
{
|
{
|
||||||
ItemStack sis = null;
|
final ItemStack sis = tile.getStackInSlot( 0 );
|
||||||
if( tile instanceof IInventory )
|
|
||||||
{
|
|
||||||
sis = ( (IInventory) tile ).getStackInSlot( 0 );
|
|
||||||
}
|
|
||||||
|
|
||||||
if( sis != null )
|
if( sis != null )
|
||||||
{
|
{
|
||||||
|
|
|
@ -59,15 +59,14 @@ public class RenderBlockCraftingCPUMonitor extends RenderBlockCraftingCPU<BlockC
|
||||||
@Override
|
@Override
|
||||||
public void renderTile( BlockCraftingMonitor block, TileCraftingMonitorTile tile, WorldRenderer tess, double x, double y, double z, float f, ModelGenerator renderer )
|
public void renderTile( BlockCraftingMonitor block, TileCraftingMonitorTile tile, WorldRenderer tess, double x, double y, double z, float f, ModelGenerator renderer )
|
||||||
{
|
{
|
||||||
if( tile instanceof TileCraftingMonitorTile )
|
if( tile != null )
|
||||||
{
|
{
|
||||||
TileCraftingMonitorTile cmt = tile;
|
final IAEItemStack ais = tile.getJobProgress();
|
||||||
IAEItemStack ais = cmt.getJobProgress();
|
|
||||||
|
|
||||||
if( cmt.dspList == null )
|
if( tile.dspList == null )
|
||||||
{
|
{
|
||||||
cmt.updateList = true;
|
tile.updateList = true;
|
||||||
cmt.dspList = GLAllocation.generateDisplayLists( 1 );
|
tile.dspList = GLAllocation.generateDisplayLists( 1 );
|
||||||
}
|
}
|
||||||
|
|
||||||
if( ais != null )
|
if( ais != null )
|
||||||
|
@ -75,16 +74,16 @@ public class RenderBlockCraftingCPUMonitor extends RenderBlockCraftingCPU<BlockC
|
||||||
GL11.glPushMatrix();
|
GL11.glPushMatrix();
|
||||||
GL11.glTranslated( x + 0.5, y + 0.5, z + 0.5 );
|
GL11.glTranslated( x + 0.5, y + 0.5, z + 0.5 );
|
||||||
|
|
||||||
if( cmt.updateList )
|
if( tile.updateList )
|
||||||
{
|
{
|
||||||
cmt.updateList = false;
|
tile.updateList = false;
|
||||||
GL11.glNewList( cmt.dspList, GL11.GL_COMPILE_AND_EXECUTE );
|
GL11.glNewList( tile.dspList, GL11.GL_COMPILE_AND_EXECUTE );
|
||||||
this.tesrRenderScreen( tess, cmt, ais );
|
this.tesrRenderScreen( tess, tile, ais );
|
||||||
GL11.glEndList();
|
GL11.glEndList();
|
||||||
}
|
}
|
||||||
else
|
else
|
||||||
{
|
{
|
||||||
GL11.glCallList( cmt.dspList );
|
GL11.glCallList( tile.dspList );
|
||||||
}
|
}
|
||||||
|
|
||||||
GL11.glPopMatrix();
|
GL11.glPopMatrix();
|
||||||
|
|
|
@ -69,8 +69,7 @@ public class RenderBlockCrank extends BaseBlockRender<BlockCrank, TileCrank>
|
||||||
@Override
|
@Override
|
||||||
public void renderTile( BlockCrank blk, TileCrank tile, WorldRenderer tess, double x, double y, double z, float f, ModelGenerator renderBlocks )
|
public void renderTile( BlockCrank blk, TileCrank tile, WorldRenderer tess, double x, double y, double z, float f, ModelGenerator renderBlocks )
|
||||||
{
|
{
|
||||||
TileCrank tc = tile;
|
if( tile.getUp() == null )
|
||||||
if( tc.getUp() == null || tc.getUp() == null )
|
|
||||||
{
|
{
|
||||||
return;
|
return;
|
||||||
}
|
}
|
||||||
|
@ -91,7 +90,7 @@ public class RenderBlockCrank extends BaseBlockRender<BlockCrank, TileCrank>
|
||||||
this.applyTESRRotation( x, y, z, tile.getForward(), tile.getUp() );
|
this.applyTESRRotation( x, y, z, tile.getForward(), tile.getUp() );
|
||||||
|
|
||||||
GL11.glTranslated( 0.5, 0, 0.5 );
|
GL11.glTranslated( 0.5, 0, 0.5 );
|
||||||
GL11.glRotatef( tc.visibleRotation, 0, 1, 0 );
|
GL11.glRotatef( tile.visibleRotation, 0, 1, 0 );
|
||||||
GL11.glScalef( -1, 1, 1 );
|
GL11.glScalef( -1, 1, 1 );
|
||||||
GL11.glTranslated( -0.5, 0, -0.5 );
|
GL11.glTranslated( -0.5, 0, -0.5 );
|
||||||
|
|
||||||
|
|
|
@ -109,8 +109,6 @@ public class RenderBlockInscriber extends BaseBlockRender<BlockInscriber, TileIn
|
||||||
{
|
{
|
||||||
this.preRenderInWorld( block, world, pos, renderer );
|
this.preRenderInWorld( block, world, pos, renderer );
|
||||||
|
|
||||||
final BlockInscriber blk = block;
|
|
||||||
|
|
||||||
final IOrientable te = this.getOrientable( block, world, pos );
|
final IOrientable te = this.getOrientable( block, world, pos );
|
||||||
if( te == null )
|
if( te == null )
|
||||||
{
|
{
|
||||||
|
@ -125,25 +123,25 @@ public class RenderBlockInscriber extends BaseBlockRender<BlockInscriber, TileIn
|
||||||
|
|
||||||
// sides...
|
// sides...
|
||||||
this.renderBlockBounds( renderer, 3, 1, 0, 13, 15, 3, fdx, fdy, fdz );
|
this.renderBlockBounds( renderer, 3, 1, 0, 13, 15, 3, fdx, fdy, fdz );
|
||||||
boolean out = renderer.renderStandardBlock( blk, pos );
|
boolean out = renderer.renderStandardBlock( block, pos );
|
||||||
|
|
||||||
this.renderBlockBounds( renderer, 0, 1, 0, 3, 15, 16, fdx, fdy, fdz );
|
this.renderBlockBounds( renderer, 0, 1, 0, 3, 15, 16, fdx, fdy, fdz );
|
||||||
out = renderer.renderStandardBlock( blk, pos );
|
out = renderer.renderStandardBlock( block, pos );
|
||||||
|
|
||||||
this.renderBlockBounds( renderer, 13, 1, 0, 16, 15, 16, fdx, fdy, fdz );
|
this.renderBlockBounds( renderer, 13, 1, 0, 16, 15, 16, fdx, fdy, fdz );
|
||||||
out = renderer.renderStandardBlock( blk, pos );
|
out = renderer.renderStandardBlock( block, pos );
|
||||||
|
|
||||||
// top bottom..
|
// top bottom..
|
||||||
this.renderBlockBounds( renderer, 1, 0, 1, 15, 4, 15, fdx, fdy, fdz );
|
this.renderBlockBounds( renderer, 1, 0, 1, 15, 4, 15, fdx, fdy, fdz );
|
||||||
out = renderer.renderStandardBlock( blk, pos );
|
out = renderer.renderStandardBlock( block, pos );
|
||||||
|
|
||||||
this.renderBlockBounds( renderer, 1, 12, 1, 15, 16, 15, fdx, fdy, fdz );
|
this.renderBlockBounds( renderer, 1, 12, 1, 15, 16, 15, fdx, fdy, fdz );
|
||||||
out = renderer.renderStandardBlock( blk, pos );
|
out = renderer.renderStandardBlock( block, pos );
|
||||||
|
|
||||||
blk.getRendererInstance().setTemporaryRenderIcon( null );
|
block.getRendererInstance().setTemporaryRenderIcon( null );
|
||||||
|
|
||||||
renderer.renderAllFaces = false;
|
renderer.renderAllFaces = false;
|
||||||
blk.getRendererInstance().setTemporaryRenderIcon( null );
|
block.getRendererInstance().setTemporaryRenderIcon( null );
|
||||||
|
|
||||||
this.postRenderInWorld( renderer );
|
this.postRenderInWorld( renderer );
|
||||||
return out;
|
return out;
|
||||||
|
@ -152,8 +150,6 @@ public class RenderBlockInscriber extends BaseBlockRender<BlockInscriber, TileIn
|
||||||
@Override
|
@Override
|
||||||
public void renderTile( BlockInscriber block, TileInscriber tile, WorldRenderer tess, double x, double y, double z, float f, ModelGenerator renderer )
|
public void renderTile( BlockInscriber block, TileInscriber tile, WorldRenderer tess, double x, double y, double z, float f, ModelGenerator renderer )
|
||||||
{
|
{
|
||||||
TileInscriber inv = tile;
|
|
||||||
|
|
||||||
GL11.glPushMatrix();
|
GL11.glPushMatrix();
|
||||||
this.applyTESRRotation( x, y, z, tile.getForward(), tile.getUp() );
|
this.applyTESRRotation( x, y, z, tile.getForward(), tile.getUp() );
|
||||||
|
|
||||||
|
@ -162,7 +158,7 @@ public class RenderBlockInscriber extends BaseBlockRender<BlockInscriber, TileIn
|
||||||
GL11.glDisable( GL12.GL_RESCALE_NORMAL );
|
GL11.glDisable( GL12.GL_RESCALE_NORMAL );
|
||||||
GL11.glCullFace( GL11.GL_FRONT );
|
GL11.glCullFace( GL11.GL_FRONT );
|
||||||
|
|
||||||
Minecraft mc = Minecraft.getMinecraft();
|
final Minecraft mc = Minecraft.getMinecraft();
|
||||||
mc.renderEngine.bindTexture( TextureMap.locationBlocksTexture );
|
mc.renderEngine.bindTexture( TextureMap.locationBlocksTexture );
|
||||||
|
|
||||||
// << 20 | light << 4;
|
// << 20 | light << 4;
|
||||||
|
@ -172,37 +168,34 @@ public class RenderBlockInscriber extends BaseBlockRender<BlockInscriber, TileIn
|
||||||
|
|
||||||
OpenGlHelper.setLightmapTextureCoords( OpenGlHelper.lightmapTexUnit, var11, var12 );
|
OpenGlHelper.setLightmapTextureCoords( OpenGlHelper.lightmapTexUnit, var11, var12 );
|
||||||
|
|
||||||
final float TwoPx = 2.0f / 16.0f;
|
|
||||||
float middle = 0.5f;
|
|
||||||
|
|
||||||
float press = 0.2f;
|
|
||||||
final float base = 0.4f;
|
|
||||||
|
|
||||||
long absoluteProgress = 0;
|
long absoluteProgress = 0;
|
||||||
|
|
||||||
if( inv.smash )
|
if( tile.smash )
|
||||||
{
|
{
|
||||||
long currentTime = System.currentTimeMillis();
|
final long currentTime = System.currentTimeMillis();
|
||||||
absoluteProgress = currentTime - inv.clientStart;
|
absoluteProgress = currentTime - tile.clientStart;
|
||||||
if( absoluteProgress > 800 )
|
if( absoluteProgress > 800 )
|
||||||
{
|
{
|
||||||
inv.smash = false;
|
tile.smash = false;
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
float relativeProgress = absoluteProgress % 800 / 400.0f;
|
final float relativeProgress = absoluteProgress % 800 / 400.0f;
|
||||||
float progress = relativeProgress;
|
float progress = relativeProgress;
|
||||||
|
|
||||||
if( progress > 1.0f )
|
if( progress > 1.0f )
|
||||||
{
|
{
|
||||||
progress = 1.0f - ( progress - 1.0f );
|
progress = 1.0f - ( progress - 1.0f );
|
||||||
}
|
}
|
||||||
|
float press = 0.2f;
|
||||||
press -= progress / 5.0f;
|
press -= progress / 5.0f;
|
||||||
|
|
||||||
IAESprite ic = ExtraBlockTextures.BlockInscriberInside.getIcon();
|
IAESprite ic = ExtraBlockTextures.BlockInscriberInside.getIcon();
|
||||||
tess.startDrawingQuads();
|
tess.startDrawingQuads();
|
||||||
|
|
||||||
|
float middle = 0.5f;
|
||||||
middle += 0.02f;
|
middle += 0.02f;
|
||||||
|
final float TwoPx = 2.0f / 16.0f;
|
||||||
tess.addVertexWithUV( TwoPx, middle + press, TwoPx, ic.getInterpolatedU( 2 ), ic.getInterpolatedV( 2 ) );
|
tess.addVertexWithUV( TwoPx, middle + press, TwoPx, ic.getInterpolatedU( 2 ), ic.getInterpolatedV( 2 ) );
|
||||||
tess.addVertexWithUV( 1.0 - TwoPx, middle + press, TwoPx, ic.getInterpolatedU( 14 ), ic.getInterpolatedV( 2 ) );
|
tess.addVertexWithUV( 1.0 - TwoPx, middle + press, TwoPx, ic.getInterpolatedU( 14 ), ic.getInterpolatedV( 2 ) );
|
||||||
tess.addVertexWithUV( 1.0 - TwoPx, middle + press, 1.0 - TwoPx, ic.getInterpolatedU( 14 ), ic.getInterpolatedV( 13 ) );
|
tess.addVertexWithUV( 1.0 - TwoPx, middle + press, 1.0 - TwoPx, ic.getInterpolatedU( 14 ), ic.getInterpolatedV( 13 ) );
|
||||||
|
@ -210,6 +203,7 @@ public class RenderBlockInscriber extends BaseBlockRender<BlockInscriber, TileIn
|
||||||
|
|
||||||
tess.addVertexWithUV( TwoPx, middle + press, 1.0 - TwoPx, ic.getInterpolatedU( 2 ), ic.getInterpolatedV( 3 ) );
|
tess.addVertexWithUV( TwoPx, middle + press, 1.0 - TwoPx, ic.getInterpolatedU( 2 ), ic.getInterpolatedV( 3 ) );
|
||||||
tess.addVertexWithUV( 1.0 - TwoPx, middle + press, 1.0 - TwoPx, ic.getInterpolatedU( 14 ), ic.getInterpolatedV( 3 ) );
|
tess.addVertexWithUV( 1.0 - TwoPx, middle + press, 1.0 - TwoPx, ic.getInterpolatedU( 14 ), ic.getInterpolatedV( 3 ) );
|
||||||
|
final float base = 0.4f;
|
||||||
tess.addVertexWithUV( 1.0 - TwoPx, middle + base, 1.0 - TwoPx, ic.getInterpolatedU( 14 ), ic.getInterpolatedV( 3 - 16 * ( press - base ) ) );
|
tess.addVertexWithUV( 1.0 - TwoPx, middle + base, 1.0 - TwoPx, ic.getInterpolatedU( 14 ), ic.getInterpolatedV( 3 - 16 * ( press - base ) ) );
|
||||||
tess.addVertexWithUV( TwoPx, middle + base, 1.0 - TwoPx, ic.getInterpolatedU( 2 ), ic.getInterpolatedV( 3 - 16 * ( press - base ) ) );
|
tess.addVertexWithUV( TwoPx, middle + base, 1.0 - TwoPx, ic.getInterpolatedU( 2 ), ic.getInterpolatedV( 3 - 16 * ( press - base ) ) );
|
||||||
|
|
||||||
|
@ -232,26 +226,26 @@ public class RenderBlockInscriber extends BaseBlockRender<BlockInscriber, TileIn
|
||||||
GL11.glPopMatrix();
|
GL11.glPopMatrix();
|
||||||
|
|
||||||
int items = 0;
|
int items = 0;
|
||||||
if( inv.getStackInSlot( 0 ) != null )
|
if( tile.getStackInSlot( 0 ) != null )
|
||||||
{
|
{
|
||||||
items++;
|
items++;
|
||||||
}
|
}
|
||||||
if( inv.getStackInSlot( 1 ) != null )
|
if( tile.getStackInSlot( 1 ) != null )
|
||||||
{
|
{
|
||||||
items++;
|
items++;
|
||||||
}
|
}
|
||||||
if( inv.getStackInSlot( 2 ) != null )
|
if( tile.getStackInSlot( 2 ) != null )
|
||||||
{
|
{
|
||||||
items++;
|
items++;
|
||||||
}
|
}
|
||||||
|
|
||||||
if( relativeProgress > 1.0f || items == 0 )
|
if( relativeProgress > 1.0f || items == 0 )
|
||||||
{
|
{
|
||||||
ItemStack is = inv.getStackInSlot( 3 );
|
ItemStack is = tile.getStackInSlot( 3 );
|
||||||
|
|
||||||
if( is == null )
|
if( is == null )
|
||||||
{
|
{
|
||||||
IInscriberRecipe ir = inv.getTask();
|
final IInscriberRecipe ir = tile.getTask();
|
||||||
if( ir != null )
|
if( ir != null )
|
||||||
{
|
{
|
||||||
is = ir.getOutput().copy();
|
is = ir.getOutput().copy();
|
||||||
|
@ -262,9 +256,9 @@ public class RenderBlockInscriber extends BaseBlockRender<BlockInscriber, TileIn
|
||||||
}
|
}
|
||||||
else
|
else
|
||||||
{
|
{
|
||||||
this.renderItem( inv.getStackInSlot( 0 ), press, block, tile, tess, x, y, z, f, renderer );
|
this.renderItem( tile.getStackInSlot( 0 ), press, block, tile, tess, x, y, z, f, renderer );
|
||||||
this.renderItem( inv.getStackInSlot( 1 ), -press, block, tile, tess, x, y, z, f, renderer );
|
this.renderItem( tile.getStackInSlot( 1 ), -press, block, tile, tess, x, y, z, f, renderer );
|
||||||
this.renderItem( inv.getStackInSlot( 2 ), 0.0f, block, tile, tess, x, y, z, f, renderer );
|
this.renderItem( tile.getStackInSlot( 2 ), 0.0f, block, tile, tess, x, y, z, f, renderer );
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
|
@ -84,15 +84,13 @@ public class RenderBlockSkyChest extends BaseBlockRender<BlockSkyChest, TileSkyC
|
||||||
}
|
}
|
||||||
|
|
||||||
@Override
|
@Override
|
||||||
public void renderTile( BlockSkyChest block, TileSkyChest tile, WorldRenderer tess, double x, double y, double z, float partialTick, ModelGenerator renderer )
|
public void renderTile( BlockSkyChest block, TileSkyChest skyChest, WorldRenderer tess, double x, double y, double z, float partialTick, ModelGenerator renderer )
|
||||||
{
|
{
|
||||||
if( !( tile instanceof TileSkyChest ) )
|
if( skyChest == null )
|
||||||
{
|
{
|
||||||
return;
|
return;
|
||||||
}
|
}
|
||||||
|
|
||||||
final TileSkyChest skyChest = tile;
|
|
||||||
|
|
||||||
if( !skyChest.hasWorldObj() )
|
if( !skyChest.hasWorldObj() )
|
||||||
{
|
{
|
||||||
return;
|
return;
|
||||||
|
@ -101,7 +99,7 @@ public class RenderBlockSkyChest extends BaseBlockRender<BlockSkyChest, TileSkyC
|
||||||
GL11.glEnable( GL12.GL_RESCALE_NORMAL );
|
GL11.glEnable( GL12.GL_RESCALE_NORMAL );
|
||||||
GL11.glColor4f( 1.0F, 1.0F, 1.0F, 1.0F );
|
GL11.glColor4f( 1.0F, 1.0F, 1.0F, 1.0F );
|
||||||
|
|
||||||
final IBlockState metaData = tile.getWorld().getBlockState( tile.getPos() );
|
final IBlockState metaData = skyChest.getWorld().getBlockState( skyChest.getPos() );
|
||||||
final ResourceLocation loc = METADATA_TO_TEXTURE[ ((BlockSkyChest)metaData.getBlock()).type == SkyChestType.BLOCK ? 1 : 0 ];
|
final ResourceLocation loc = METADATA_TO_TEXTURE[ ((BlockSkyChest)metaData.getBlock()).type == SkyChestType.BLOCK ? 1 : 0 ];
|
||||||
|
|
||||||
Minecraft.getMinecraft().getTextureManager().bindTexture( loc );
|
Minecraft.getMinecraft().getTextureManager().bindTexture( loc );
|
||||||
|
|
|
@ -182,15 +182,13 @@ public class RenderBlockSkyCompass extends BaseBlockRender<BlockSkyCompass, Tile
|
||||||
}
|
}
|
||||||
|
|
||||||
@Override
|
@Override
|
||||||
public void renderTile( BlockSkyCompass block, TileSkyCompass tile, WorldRenderer tess, double x, double y, double z, float partialTick, ModelGenerator renderer )
|
public void renderTile( BlockSkyCompass block, TileSkyCompass skyCompass, WorldRenderer tess, double x, double y, double z, float partialTick, ModelGenerator renderer )
|
||||||
{
|
{
|
||||||
if( !( tile instanceof TileSkyCompass ) )
|
if( skyCompass == null )
|
||||||
{
|
{
|
||||||
return;
|
return;
|
||||||
}
|
}
|
||||||
|
|
||||||
TileSkyCompass skyCompass = tile;
|
|
||||||
|
|
||||||
if( !skyCompass.hasWorldObj() )
|
if( !skyCompass.hasWorldObj() )
|
||||||
{
|
{
|
||||||
return;
|
return;
|
||||||
|
@ -200,7 +198,7 @@ public class RenderBlockSkyCompass extends BaseBlockRender<BlockSkyCompass, Tile
|
||||||
GL11.glColor4f( 1.0F, 1.0F, 1.0F, 1.0F );
|
GL11.glColor4f( 1.0F, 1.0F, 1.0F, 1.0F );
|
||||||
GL11.glCullFace( GL11.GL_FRONT );
|
GL11.glCullFace( GL11.GL_FRONT );
|
||||||
|
|
||||||
ResourceLocation loc = new ResourceLocation( "appliedenergistics2", "textures/models/compass.png" );
|
final ResourceLocation loc = new ResourceLocation( "appliedenergistics2", "textures/models/compass.png" );
|
||||||
|
|
||||||
Minecraft.getMinecraft().getTextureManager().bindTexture( loc );
|
Minecraft.getMinecraft().getTextureManager().bindTexture( loc );
|
||||||
|
|
||||||
|
@ -214,7 +212,8 @@ public class RenderBlockSkyCompass extends BaseBlockRender<BlockSkyCompass, Tile
|
||||||
CompassResult cr = null;
|
CompassResult cr = null;
|
||||||
if( skyCompass.getForward() == EnumFacing.UP || skyCompass.getForward() == EnumFacing.DOWN )
|
if( skyCompass.getForward() == EnumFacing.UP || skyCompass.getForward() == EnumFacing.DOWN )
|
||||||
{
|
{
|
||||||
cr = CompassManager.INSTANCE.getCompassDirection( 0, tile.getPos().getX(), tile.getPos().getY(),tile.getPos().getZ());
|
final BlockPos compassPos = skyCompass.getPos();
|
||||||
|
cr = CompassManager.INSTANCE.getCompassDirection( 0, compassPos.getX(), compassPos.getY(), compassPos.getZ());
|
||||||
}
|
}
|
||||||
else
|
else
|
||||||
{
|
{
|
||||||
|
|
|
@ -48,16 +48,15 @@ public class RenderQuartzOre extends BaseBlockRender<QuartzOreBlock, AEBaseTile>
|
||||||
}
|
}
|
||||||
|
|
||||||
@Override
|
@Override
|
||||||
public boolean renderInWorld( QuartzOreBlock block, IBlockAccess world, BlockPos pos, ModelGenerator renderer )
|
public boolean renderInWorld( QuartzOreBlock quartz, IBlockAccess world, BlockPos pos, ModelGenerator renderer )
|
||||||
{
|
{
|
||||||
QuartzOreBlock blk = block;
|
quartz.setEnhanceBrightness( true );
|
||||||
blk.setEnhanceBrightness( true );
|
super.renderInWorld( quartz, world, pos, renderer );
|
||||||
super.renderInWorld( block, world, pos, renderer );
|
quartz.setEnhanceBrightness( false );
|
||||||
blk.setEnhanceBrightness( false );
|
|
||||||
|
|
||||||
blk.getRendererInstance().setTemporaryRenderIcon( ExtraBlockTextures.OreQuartzStone.getIcon() );
|
quartz.getRendererInstance().setTemporaryRenderIcon( ExtraBlockTextures.OreQuartzStone.getIcon() );
|
||||||
boolean out = super.renderInWorld( block, world, pos, renderer );
|
boolean out = super.renderInWorld( quartz, world, pos, renderer );
|
||||||
blk.getRendererInstance().setTemporaryRenderIcon( null );
|
quartz.getRendererInstance().setTemporaryRenderIcon( null );
|
||||||
|
|
||||||
return out;
|
return out;
|
||||||
}
|
}
|
||||||
|
|
|
@ -136,12 +136,12 @@ public class RendererCableBus extends BaseBlockRender<BlockCableBus, TileCableBu
|
||||||
}
|
}
|
||||||
|
|
||||||
@Override
|
@Override
|
||||||
public void renderTile( BlockCableBus block, TileCableBus t, WorldRenderer tess, double x, double y, double z, float f, ModelGenerator renderer )
|
public void renderTile( BlockCableBus block, TileCableBus cableBus, WorldRenderer tess, double x, double y, double z, float f, ModelGenerator renderer )
|
||||||
{
|
{
|
||||||
if( t instanceof TileCableBus )
|
if( cableBus != null )
|
||||||
{
|
{
|
||||||
BusRenderer.INSTANCE.renderer.overrideBlockTexture = null;
|
BusRenderer.INSTANCE.renderer.overrideBlockTexture = null;
|
||||||
t.cb.renderDynamic( x, y, z );
|
cableBus.cb.renderDynamic( x, y, z );
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
Loading…
Reference in a new issue