diff --git a/src/main/java/appeng/client/render/blocks/RenderBlockAssembler.java b/src/main/java/appeng/client/render/blocks/RenderBlockAssembler.java index b6527dcd..4e523806 100644 --- a/src/main/java/appeng/client/render/blocks/RenderBlockAssembler.java +++ b/src/main/java/appeng/client/render/blocks/RenderBlockAssembler.java @@ -102,10 +102,9 @@ public class RenderBlockAssembler extends BaseBlockRender @Override public void renderTile( BlockCrank blk, TileCrank tile, WorldRenderer tess, double x, double y, double z, float f, ModelGenerator renderBlocks ) { - TileCrank tc = tile; - if( tc.getUp() == null || tc.getUp() == null ) + if( tile.getUp() == null ) { return; } @@ -91,7 +90,7 @@ 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.glScalef( -1, 1, 1 ); GL11.glTranslated( -0.5, 0, -0.5 ); diff --git a/src/main/java/appeng/client/render/blocks/RenderBlockInscriber.java b/src/main/java/appeng/client/render/blocks/RenderBlockInscriber.java index dff3e2b4..b08fa652 100644 --- a/src/main/java/appeng/client/render/blocks/RenderBlockInscriber.java +++ b/src/main/java/appeng/client/render/blocks/RenderBlockInscriber.java @@ -109,8 +109,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; IAESprite 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 ) ); @@ -210,6 +203,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(); @@ -262,9 +256,9 @@ public class RenderBlockInscriber extends BaseBlockRender } @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; - blk.setEnhanceBrightness( true ); - super.renderInWorld( block, world, pos, renderer ); - blk.setEnhanceBrightness( false ); + quartz.setEnhanceBrightness( true ); + super.renderInWorld( quartz, world, pos, renderer ); + quartz.setEnhanceBrightness( false ); - blk.getRendererInstance().setTemporaryRenderIcon( ExtraBlockTextures.OreQuartzStone.getIcon() ); - boolean out = super.renderInWorld( block, world, pos, renderer ); - blk.getRendererInstance().setTemporaryRenderIcon( null ); + quartz.getRendererInstance().setTemporaryRenderIcon( ExtraBlockTextures.OreQuartzStone.getIcon() ); + boolean out = super.renderInWorld( quartz, world, pos, 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 29909444..70826d42 100644 --- a/src/main/java/appeng/client/render/blocks/RendererCableBus.java +++ b/src/main/java/appeng/client/render/blocks/RendererCableBus.java @@ -136,12 +136,12 @@ public class RendererCableBus extends BaseBlockRender