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

Use qualified access

Browse Source
This commit is contained in:
yueh
2016-01-01 01:50:28 +01:00
parent 7134e851e4
commit 98234f9935
7 changed files with 48 additions and 48 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/main/java/appeng/client/SmartModel.java
+4 -4
View File
@@ -34,7 +34,7 @@ public class SmartModel implements IBakedModel, ISmartBlockModel, ISmartItemMode
public SmartModel(
final BlockRenderInfo rendererInstance )
{
aeRenderer = rendererInstance;
this.aeRenderer = rendererInstance;
}
@Override
@@ -71,7 +71,7 @@ public class SmartModel implements IBakedModel, ISmartBlockModel, ISmartItemMode
@Override
public TextureAtlasSprite getParticleTexture()
{
return aeRenderer != null ? aeRenderer.getTexture( AEPartLocation.UP ).getAtlas() : MissingIcon.getMissing();
return this.aeRenderer != null ? this.aeRenderer.getTexture( AEPartLocation.UP ).getAtlas() : MissingIcon.getMissing();
}
@Override
@@ -87,7 +87,7 @@ public class SmartModel implements IBakedModel, ISmartBlockModel, ISmartItemMode
final ModelGenerator helper = new ModelGenerator();
final Block blk = Block.getBlockFromItem( stack.getItem() );
helper.setRenderBoundsFromBlock( blk );
aeRenderer.getRendererInstance().renderInventory( blk instanceof AEBaseBlock ? (AEBaseBlock) blk : null, stack, helper, ItemRenderType.INVENTORY, null );
this.aeRenderer.getRendererInstance().renderInventory( blk instanceof AEBaseBlock ? (AEBaseBlock) blk : null, stack, helper, ItemRenderType.INVENTORY, null );
helper.finalizeModel( true );
return helper.getOutput();
}
@@ -103,7 +103,7 @@ public class SmartModel implements IBakedModel, ISmartBlockModel, ISmartItemMode
helper.setTranslation( -pos.getX(), -pos.getY(), -pos.getZ() );
helper.setRenderBoundsFromBlock( blk );
helper.setBlockAccess( world );
aeRenderer.getRendererInstance().renderInWorld( blk instanceof AEBaseBlock ? (AEBaseBlock) blk : null, world, pos, helper );
this.aeRenderer.getRendererInstance().renderInWorld( blk instanceof AEBaseBlock ? (AEBaseBlock) blk : null, world, pos, helper );
helper.finalizeModel( false );
return helper.getOutput();
}
src/main/java/appeng/client/render/BusRenderer.java
+2 -2
View File
@@ -28,13 +28,13 @@ public class BusRenderer
public ModelGenerator getRenderer()
{
return mg;
return this.mg;
}
public void setRenderer(
ModelGenerator renderer )
{
mg = renderer;
this.mg = renderer;
}
}
src/main/java/appeng/client/render/effects/LightningFX.java
+4 -4
View File
@@ -214,10 +214,10 @@ public class LightningFX extends EntityFX
{
if( this.hasData )
{
tess.color( red, green, blue, particleAlpha ).pos( a[0], a[1], a[2] ).tex( f6, f8 ).endVertex();
tess.color( red, green, blue, particleAlpha ).pos( this.vertices[0], this.vertices[1], this.vertices[2] ).tex( f6, f8 ).endVertex();
tess.color( red, green, blue, particleAlpha ).pos( this.verticesWithUV[0], this.verticesWithUV[1], this.verticesWithUV[2] ).tex( f6, f8 ).endVertex();
tess.color( red, green, blue, particleAlpha ).pos( b[0], b[1], b[2] ).tex( f6, f8 ).endVertex();
tess.color( red, green, blue, this.particleAlpha ).pos( a[0], a[1], a[2] ).tex( f6, f8 ).endVertex();
tess.color( red, green, blue, this.particleAlpha ).pos( this.vertices[0], this.vertices[1], this.vertices[2] ).tex( f6, f8 ).endVertex();
tess.color( red, green, blue, this.particleAlpha ).pos( this.verticesWithUV[0], this.verticesWithUV[1], this.verticesWithUV[2] ).tex( f6, f8 ).endVertex();
tess.color( red, green, blue, this.particleAlpha ).pos( b[0], b[1], b[2] ).tex( f6, f8 ).endVertex();
}
this.hasData = true;
for( int x = 0; x < 3; x++ )