diff --git a/src/main/java/appeng/client/render/blocks/RenderBlockAssembler.java b/src/main/java/appeng/client/render/blocks/RenderBlockAssembler.java index 5f8d7ee42..e94c9fa5c 100644 --- a/src/main/java/appeng/client/render/blocks/RenderBlockAssembler.java +++ b/src/main/java/appeng/client/render/blocks/RenderBlockAssembler.java @@ -103,10 +103,9 @@ public class RenderBlockAssembler extends BaseBlockRender @Override public void renderTile( BlockCrank blk, TileCrank tile, Tessellator tess, double x, double y, double z, float f, RenderBlocks renderBlocks ) { - TileCrank tc = (TileCrank) tile; - if( tc.getUp() == null || tc.getUp() == ForgeDirection.UNKNOWN ) + if( tile.getUp() == null || tile.getUp() == ForgeDirection.UNKNOWN ) { return; } @@ -90,21 +89,21 @@ public class RenderBlockCrank extends BaseBlockRender this.applyTESRRotation( x, y, z, tile.getForward(), tile.getUp() ); GL11.glTranslated( 0.5, 0, 0.5 ); - GL11.glRotatef( tc.visibleRotation, 0, 1, 0 ); + GL11.glRotatef( tile.visibleRotation, 0, 1, 0 ); GL11.glTranslated( -0.5, 0, -0.5 ); - tess.setTranslation( -tc.xCoord, -tc.yCoord, -tc.zCoord ); + tess.setTranslation( -tile.xCoord, -tile.yCoord, -tile.zCoord ); tess.startDrawingQuads(); renderBlocks.renderAllFaces = true; - renderBlocks.blockAccess = tc.getWorldObj(); + renderBlocks.blockAccess = tile.getWorldObj(); renderBlocks.setRenderBounds( 0.5D - 0.05, 0.5D - 0.5, 0.5D - 0.05, 0.5D + 0.05, 0.5D + 0.1, 0.5D + 0.05 ); - renderBlocks.renderStandardBlock( blk, tc.xCoord, tc.yCoord, tc.zCoord ); + renderBlocks.renderStandardBlock( blk, tile.xCoord, tile.yCoord, tile.zCoord ); renderBlocks.setRenderBounds( 0.70D - 0.15, 0.55D - 0.05, 0.5D - 0.05, 0.70D + 0.15, 0.55D + 0.05, 0.5D + 0.05 ); - renderBlocks.renderStandardBlock( blk, tc.xCoord, tc.yCoord, tc.zCoord ); + renderBlocks.renderStandardBlock( blk, tile.xCoord, tile.yCoord, tile.zCoord ); tess.draw(); tess.setTranslation( 0, 0, 0 ); diff --git a/src/main/java/appeng/client/render/blocks/RenderBlockInscriber.java b/src/main/java/appeng/client/render/blocks/RenderBlockInscriber.java index dcd5e994f..72c7a588d 100644 --- a/src/main/java/appeng/client/render/blocks/RenderBlockInscriber.java +++ b/src/main/java/appeng/client/render/blocks/RenderBlockInscriber.java @@ -108,8 +108,6 @@ public class RenderBlockInscriber extends BaseBlockRender 800 ) { - inv.smash = false; + tile.smash = false; } } - float relativeProgress = absoluteProgress % 800 / 400.0f; + final float relativeProgress = absoluteProgress % 800 / 400.0f; float progress = relativeProgress; if( progress > 1.0f ) { progress = 1.0f - ( progress - 1.0f ); } + float press = 0.2f; press -= progress / 5.0f; - IIcon ic = ExtraBlockTextures.BlockInscriberInside.getIcon(); + final IIcon ic = ExtraBlockTextures.BlockInscriberInside.getIcon(); tess.startDrawingQuads(); + float middle = 0.5f; middle += 0.02f; + final float TwoPx = 2.0f / 16.0f; 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, 1.0 - TwoPx, ic.getInterpolatedU( 14 ), ic.getInterpolatedV( 13 ) ); @@ -209,6 +202,7 @@ public class RenderBlockInscriber extends BaseBlockRender 1.0f || items == 0 ) { - ItemStack is = inv.getStackInSlot( 3 ); + ItemStack is = tile.getStackInSlot( 3 ); if( is == null ) { - IInscriberRecipe ir = inv.getTask(); + final IInscriberRecipe ir = tile.getTask(); if( ir != null ) { is = ir.getOutput().copy(); @@ -261,9 +255,9 @@ public class RenderBlockInscriber extends BaseBlockRender } @Override - public boolean renderInWorld( OreQuartz block, IBlockAccess world, int x, int y, int z, RenderBlocks renderer ) + public boolean renderInWorld( OreQuartz quartz, IBlockAccess world, int x, int y, int z, RenderBlocks renderer ) { - OreQuartz blk = (OreQuartz) block; - blk.setEnhanceBrightness( true ); - super.renderInWorld( block, world, x, y, z, renderer ); - blk.setEnhanceBrightness( false ); + quartz.setEnhanceBrightness( true ); + super.renderInWorld( quartz, world, x, y, z, renderer ); + quartz.setEnhanceBrightness( false ); - blk.getRendererInstance().setTemporaryRenderIcon( ExtraBlockTextures.OreQuartzStone.getIcon() ); - boolean out = super.renderInWorld( block, world, x, y, z, renderer ); - blk.getRendererInstance().setTemporaryRenderIcon( null ); + quartz.getRendererInstance().setTemporaryRenderIcon( ExtraBlockTextures.OreQuartzStone.getIcon() ); + final boolean out = super.renderInWorld( quartz, world, x, y, z, renderer ); + quartz.getRendererInstance().setTemporaryRenderIcon( null ); return out; } diff --git a/src/main/java/appeng/client/render/blocks/RendererCableBus.java b/src/main/java/appeng/client/render/blocks/RendererCableBus.java index 99a45d081..5d1eaea4d 100644 --- a/src/main/java/appeng/client/render/blocks/RendererCableBus.java +++ b/src/main/java/appeng/client/render/blocks/RendererCableBus.java @@ -65,12 +65,12 @@ public class RendererCableBus extends BaseBlockRender