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

First update pass (1/3) - ~1400 -> 82 errors

Browse Source 
This is first update pass, which is mainly import reorganization, name
fixes, etc... Although some parts of second were done where changes
aren't important.
Errors: ~1400 -> 82.
This commit is contained in:
elix-x
2016-06-19 14:43:27 +02:00
parent d9725a7d9b
commit 5498eb6d7c
288 changed files with 1637 additions and 1420 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/main/java/appeng/entity/RenderTinyTNTPrimed.java
+7 -7
View File
@@ -62,9 +62,9 @@ public class RenderTinyTNTPrimed extends Render
GlStateManager.translate( (float) x, (float) y + 0.5F, (float) z );
float f2;
if( tnt.fuse - life + 1.0F < 10.0F )
if( tnt.getFuse() - life + 1.0F < 10.0F )
{
f2 = 1.0F - ( tnt.fuse - life + 1.0F ) / 10.0F;
f2 = 1.0F - ( tnt.getFuse() - life + 1.0F ) / 10.0F;
if( f2 < 0.0F )
{
@@ -83,13 +83,13 @@ public class RenderTinyTNTPrimed extends Render
}
GL11.glScalef( 0.5f, 0.5f, 0.5f );
f2 = ( 1.0F - ( tnt.fuse - life + 1.0F ) / 100.0F ) * 0.8F;
f2 = ( 1.0F - ( tnt.getFuse() - life + 1.0F ) / 100.0F ) * 0.8F;
this.bindEntityTexture( tnt );
GlStateManager.translate( -0.5F, -0.5F, 0.5F );
blockrendererdispatcher.renderBlockBrightness( Blocks.tnt.getDefaultState(), tnt.getBrightness( life ) );
blockrendererdispatcher.renderBlockBrightness( Blocks.TNT.getDefaultState(), tnt.getBrightness( life ) );
GlStateManager.translate( 0.0F, 0.0F, 1.0F );
if( tnt.fuse / 5 % 2 == 0 )
if( tnt.getFuse() / 5 % 2 == 0 )
{
GlStateManager.disableTexture2D();
GlStateManager.disableLighting();
@@ -98,7 +98,7 @@ public class RenderTinyTNTPrimed extends Render
GlStateManager.color( 1.0F, 1.0F, 1.0F, f2 );
GlStateManager.doPolygonOffset( -3.0F, -3.0F );
GlStateManager.enablePolygonOffset();
blockrendererdispatcher.renderBlockBrightness( Blocks.tnt.getDefaultState(), 1.0F );
blockrendererdispatcher.renderBlockBrightness( Blocks.TNT.getDefaultState(), 1.0F );
GlStateManager.doPolygonOffset( 0.0F, 0.0F );
GlStateManager.disablePolygonOffset();
GlStateManager.color( 1.0F, 1.0F, 1.0F, 1.0F );
@@ -114,6 +114,6 @@ public class RenderTinyTNTPrimed extends Render
@Override
protected ResourceLocation getEntityTexture( final Entity entity )
{
return TextureMap.locationBlocksTexture;
return TextureMap.LOCATION_BLOCKS_TEXTURE;
}
}