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

Always use qualified access for fields and methods

Browse Source
This commit is contained in:
yueh
2017-07-20 21:27:22 +02:00
parent f9cad0758d
commit 15582fd1df
211 changed files with 1086 additions and 1086 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/main/java/appeng/client/render/crafting/CraftingCubeBakedModel.java
+16 -16
View File
@@ -76,12 +76,12 @@ abstract class CraftingCubeBakedModel implements IBakedModel
EnumSet<EnumFacing> connections = getConnections( state );
List<BakedQuad> quads = new ArrayList<>();
CubeBuilder builder = new CubeBuilder( format, quads );
CubeBuilder builder = new CubeBuilder( this.format, quads );
builder.setDrawFaces( EnumSet.of( side ) );
// Add the quads for the ring that frames the entire multi-block structure
addRing( builder, side, connections );
this.addRing( builder, side, connections );
// Calculate the bounds of the "inner" block that is framed by the border drawn above
float x2 = connections.contains( EnumFacing.EAST ) ? 16 : 13.01f;
@@ -114,7 +114,7 @@ abstract class CraftingCubeBakedModel implements IBakedModel
break;
}
addInnerCube( side, state, builder, x1, y1, z1, x2, y2, z2 );
this.addInnerCube( side, state, builder, x1, y1, z1, x2, y2, z2 );
return quads;
}
@@ -122,15 +122,15 @@ abstract class CraftingCubeBakedModel implements IBakedModel
private void addRing( CubeBuilder builder, @Nullable EnumFacing side, EnumSet<EnumFacing> connections )
{
// Fill in the corners
builder.setTexture( ringCorner );
addCornerCap( builder, connections, side, EnumFacing.UP, EnumFacing.EAST, EnumFacing.NORTH );
addCornerCap( builder, connections, side, EnumFacing.UP, EnumFacing.EAST, EnumFacing.SOUTH );
addCornerCap( builder, connections, side, EnumFacing.UP, EnumFacing.WEST, EnumFacing.NORTH );
addCornerCap( builder, connections, side, EnumFacing.UP, EnumFacing.WEST, EnumFacing.SOUTH );
addCornerCap( builder, connections, side, EnumFacing.DOWN, EnumFacing.EAST, EnumFacing.NORTH );
addCornerCap( builder, connections, side, EnumFacing.DOWN, EnumFacing.EAST, EnumFacing.SOUTH );
addCornerCap( builder, connections, side, EnumFacing.DOWN, EnumFacing.WEST, EnumFacing.NORTH );
addCornerCap( builder, connections, side, EnumFacing.DOWN, EnumFacing.WEST, EnumFacing.SOUTH );
builder.setTexture( this.ringCorner );
this.addCornerCap( builder, connections, side, EnumFacing.UP, EnumFacing.EAST, EnumFacing.NORTH );
this.addCornerCap( builder, connections, side, EnumFacing.UP, EnumFacing.EAST, EnumFacing.SOUTH );
this.addCornerCap( builder, connections, side, EnumFacing.UP, EnumFacing.WEST, EnumFacing.NORTH );
this.addCornerCap( builder, connections, side, EnumFacing.UP, EnumFacing.WEST, EnumFacing.SOUTH );
this.addCornerCap( builder, connections, side, EnumFacing.DOWN, EnumFacing.EAST, EnumFacing.NORTH );
this.addCornerCap( builder, connections, side, EnumFacing.DOWN, EnumFacing.EAST, EnumFacing.SOUTH );
this.addCornerCap( builder, connections, side, EnumFacing.DOWN, EnumFacing.WEST, EnumFacing.NORTH );
this.addCornerCap( builder, connections, side, EnumFacing.DOWN, EnumFacing.WEST, EnumFacing.SOUTH );
// Fill in the remaining stripes of the face
for( EnumFacing a : EnumFacing.values() )
@@ -143,15 +143,15 @@ abstract class CraftingCubeBakedModel implements IBakedModel
// Select the horizontal or vertical ring texture depending on which side we're filling in
if( ( side.getAxis() != EnumFacing.Axis.Y ) && ( a == EnumFacing.NORTH || a == EnumFacing.EAST || a == EnumFacing.WEST || a == EnumFacing.SOUTH ) )
{
builder.setTexture( ringVer );
builder.setTexture( this.ringVer );
}
else if( side.getAxis() == EnumFacing.Axis.Y && ( a == EnumFacing.EAST || a == EnumFacing.WEST ) )
{
builder.setTexture( ringVer );
builder.setTexture( this.ringVer );
}
else
{
builder.setTexture( ringHor );
builder.setTexture( this.ringHor );
}
// If there's an adjacent crafting cube block on side a, then the core of the block already extends
@@ -296,7 +296,7 @@ abstract class CraftingCubeBakedModel implements IBakedModel
@Override
public TextureAtlasSprite getParticleTexture()
{
return ringCorner;
return this.ringCorner;
}
@Override
src/main/java/appeng/client/render/crafting/CraftingCubeModel.java
+3 -3
View File
@@ -86,7 +86,7 @@ class CraftingCubeModel implements IModel
TextureAtlasSprite ringSideHor = bakedTextureGetter.apply( RING_SIDE_HOR );
TextureAtlasSprite ringSideVer = bakedTextureGetter.apply( RING_SIDE_VER );
switch( type )
switch( this.type )
{
case UNIT:
return new UnitBakedModel( format, ringCorner, ringSideHor, ringSideVer, bakedTextureGetter.apply( UNIT_BASE ) );
@@ -96,13 +96,13 @@ class CraftingCubeModel implements IModel
case STORAGE_16K:
case STORAGE_64K:
return new LightBakedModel( format, ringCorner, ringSideHor, ringSideVer, bakedTextureGetter
.apply( LIGHT_BASE ), getLightTexture( bakedTextureGetter, type ) );
.apply( LIGHT_BASE ), getLightTexture( bakedTextureGetter, this.type ) );
case MONITOR:
return new MonitorBakedModel( format, ringCorner, ringSideHor, ringSideVer, bakedTextureGetter.apply( UNIT_BASE ), bakedTextureGetter
.apply( MONITOR_BASE ), bakedTextureGetter.apply(
MONITOR_LIGHT_DARK ), bakedTextureGetter.apply( MONITOR_LIGHT_MEDIUM ), bakedTextureGetter.apply( MONITOR_LIGHT_BRIGHT ) );
default:
throw new IllegalArgumentException( "Unsupported crafting unit type: " + type );
throw new IllegalArgumentException( "Unsupported crafting unit type: " + this.type );
}
}
src/main/java/appeng/client/render/crafting/CraftingCubeRendering.java
+6 -6
View File
@@ -56,10 +56,10 @@ public class CraftingCubeRendering extends BlockRenderingCustomizer
@SideOnly( Side.CLIENT )
public void customize( IBlockRendering rendering, IItemRendering itemRendering )
{
ResourceLocation baseName = new ResourceLocation( AppEng.MOD_ID, registryName );
ResourceLocation baseName = new ResourceLocation( AppEng.MOD_ID, this.registryName );
// Disable auto-rotation
if( type != BlockCraftingUnit.CraftingUnitType.MONITOR )
if( this.type != BlockCraftingUnit.CraftingUnitType.MONITOR )
{
rendering.modelCustomizer( ( loc, model ) -> model );
}
@@ -68,14 +68,14 @@ public class CraftingCubeRendering extends BlockRenderingCustomizer
ModelResourceLocation defaultModel = new ModelResourceLocation( baseName, "normal" );
// This is the built-in model
String builtInName = "models/block/crafting/" + registryName + "/builtin";
String builtInName = "models/block/crafting/" + this.registryName + "/builtin";
ModelResourceLocation builtInModelName = new ModelResourceLocation( new ResourceLocation( AppEng.MOD_ID, builtInName ), "normal" );
rendering.builtInModel( builtInName, new CraftingCubeModel( type ) );
rendering.builtInModel( builtInName, new CraftingCubeModel( this.type ) );
rendering.stateMapper( block -> mapState( block, defaultModel, builtInModelName ) );
rendering.stateMapper( block -> this.mapState( block, defaultModel, builtInModelName ) );
if( type == BlockCraftingUnit.CraftingUnitType.MONITOR )
if( this.type == BlockCraftingUnit.CraftingUnitType.MONITOR )
{
rendering.tesr( new CraftingMonitorTESR() );
}
src/main/java/appeng/client/render/crafting/CraftingCubeState.java
+1 -1
View File
@@ -40,6 +40,6 @@ public final class CraftingCubeState
public EnumSet<EnumFacing> getConnections()
{
return connections;
return this.connections;
}
}
src/main/java/appeng/client/render/crafting/ItemEncodedPatternBakedModel.java
+23 -23
View File
@@ -55,55 +55,55 @@ class ItemEncodedPatternBakedModel implements IBakedModel
@Override
public List<BakedQuad> getQuads( @Nullable IBlockState state, @Nullable EnumFacing side, long rand )
{
return baseModel.getQuads( state, side, rand );
return this.baseModel.getQuads( state, side, rand );
}
@Override
public boolean isAmbientOcclusion()
{
return baseModel.isAmbientOcclusion();
return this.baseModel.isAmbientOcclusion();
}
@Override
public boolean isGui3d()
{
return baseModel.isGui3d();
return this.baseModel.isGui3d();
}
@Override
public boolean isBuiltInRenderer()
{
return baseModel.isBuiltInRenderer();
return this.baseModel.isBuiltInRenderer();
}
@Override
public TextureAtlasSprite getParticleTexture()
{
return baseModel.getParticleTexture();
return this.baseModel.getParticleTexture();
}
@Override
@Deprecated
public ItemCameraTransforms getItemCameraTransforms()
{
return baseModel.getItemCameraTransforms();
return this.baseModel.getItemCameraTransforms();
}
@Override
public ItemOverrideList getOverrides()
{
return overrides;
return this.overrides;
}
@Override
public Pair<? extends IBakedModel, Matrix4f> handlePerspective( ItemCameraTransforms.TransformType cameraTransformType )
{
if( baseModel instanceof IBakedModel )
if( this.baseModel instanceof IBakedModel )
{
return ( (IBakedModel) baseModel ).handlePerspective( cameraTransformType );
return ( (IBakedModel) this.baseModel ).handlePerspective( cameraTransformType );
}
return PerspectiveMapWrapper.handlePerspective( this, transforms, cameraTransformType );
return PerspectiveMapWrapper.handlePerspective( this, this.transforms, cameraTransformType );
}
/**
@@ -135,15 +135,15 @@ class ItemEncodedPatternBakedModel implements IBakedModel
// No need to re-check for shift being held since this model is only handed out in that case
if( cameraTransformType == ItemCameraTransforms.TransformType.GUI )
{
selectedModel = outputModel;
selectedModel = this.outputModel;
}
else
{
selectedModel = baseModel;
selectedModel = ItemEncodedPatternBakedModel.this.baseModel;
}
// Now retroactively handle the isGui3d call, for which we always return false below
if( selectedModel.isGui3d() != baseModel.isGui3d() )
if( selectedModel.isGui3d() != ItemEncodedPatternBakedModel.this.baseModel.isGui3d() )
{
GlStateManager.enableLighting();
}
@@ -153,55 +153,55 @@ class ItemEncodedPatternBakedModel implements IBakedModel
return ( (IBakedModel) selectedModel ).handlePerspective( cameraTransformType );
}
return PerspectiveMapWrapper.handlePerspective( this, transforms, cameraTransformType );
return PerspectiveMapWrapper.handlePerspective( this, ItemEncodedPatternBakedModel.this.transforms, cameraTransformType );
}
@Override
public List<BakedQuad> getQuads( @Nullable IBlockState state, @Nullable EnumFacing side, long rand )
{
// This may be called for items on the ground, in which case we will always fall back to the pattern
return baseModel.getQuads( state, side, rand );
return ItemEncodedPatternBakedModel.this.baseModel.getQuads( state, side, rand );
}
@Override
public boolean isAmbientOcclusion()
{
return baseModel.isAmbientOcclusion();
return ItemEncodedPatternBakedModel.this.baseModel.isAmbientOcclusion();
}
@Override
public boolean isGui3d()
{
// NOTE: Sadly, Forge will let Minecraft call this method before handling the perspective awareness
return baseModel.isGui3d();
return ItemEncodedPatternBakedModel.this.baseModel.isGui3d();
}
@Override
public boolean isBuiltInRenderer()
{
// This may be called for items on the ground, in which case we will always fall back to the pattern
return baseModel.isBuiltInRenderer();
return ItemEncodedPatternBakedModel.this.baseModel.isBuiltInRenderer();
}
@Override
public TextureAtlasSprite getParticleTexture()
{
// This may be called for items on the ground, in which case we will always fall back to the pattern
return baseModel.getParticleTexture();
return ItemEncodedPatternBakedModel.this.baseModel.getParticleTexture();
}
@Override
public ItemCameraTransforms getItemCameraTransforms()
{
// This may be called for items on the ground, in which case we will always fall back to the pattern
return baseModel.getItemCameraTransforms();
return ItemEncodedPatternBakedModel.this.baseModel.getItemCameraTransforms();
}
@Override
public ItemOverrideList getOverrides()
{
// This may be called for items on the ground, in which case we will always fall back to the pattern
return baseModel.getOverrides();
return ItemEncodedPatternBakedModel.this.baseModel.getOverrides();
}
}
@@ -216,7 +216,7 @@ class ItemEncodedPatternBakedModel implements IBakedModel
CustomOverrideList()
{
super( baseModel.getOverrides().getOverrides() );
super( ItemEncodedPatternBakedModel.this.baseModel.getOverrides().getOverrides() );
}
@Override
@@ -236,7 +236,7 @@ class ItemEncodedPatternBakedModel implements IBakedModel
}
}
return baseModel.getOverrides().handleItemState( originalModel, stack, world, entity );
return ItemEncodedPatternBakedModel.this.baseModel.getOverrides().handleItemState( originalModel, stack, world, entity );
}
}
}
src/main/java/appeng/client/render/crafting/LightBakedModel.java
+2 -2
View File
@@ -49,12 +49,12 @@ class LightBakedModel extends CraftingCubeBakedModel
@Override
protected void addInnerCube( EnumFacing facing, IBlockState state, CubeBuilder builder, float x1, float y1, float z1, float x2, float y2, float z2 )
{
builder.setTexture( baseTexture );
builder.setTexture( this.baseTexture );
builder.addCube( x1, y1, z1, x2, y2, z2 );
boolean powered = state.getValue( BlockCraftingUnit.POWERED );
builder.setRenderFullBright( powered );
builder.setTexture( lightTexture );
builder.setTexture( this.lightTexture );
builder.addCube( x1, y1, z1, x2, y2, z2 );
}
}
src/main/java/appeng/client/render/crafting/MonitorBakedModel.java
+5 -5
View File
@@ -68,12 +68,12 @@ class MonitorBakedModel extends CraftingCubeBakedModel
// For sides other than the front, use the chassis texture
if( side != forward )
{
builder.setTexture( chassisTexture );
builder.setTexture( this.chassisTexture );
builder.addCube( x1, y1, z1, x2, y2, z2 );
return;
}
builder.setTexture( baseTexture );
builder.setTexture( this.baseTexture );
builder.addCube( x1, y1, z1, x2, y2, z2 );
// Now add the three layered light textures
@@ -83,15 +83,15 @@ class MonitorBakedModel extends CraftingCubeBakedModel
builder.setRenderFullBright( powered );
builder.setColorRGB( color.whiteVariant );
builder.setTexture( lightBrightTexture );
builder.setTexture( this.lightBrightTexture );
builder.addCube( x1, y1, z1, x2, y2, z2 );
builder.setColorRGB( color.mediumVariant );
builder.setTexture( lightMediumTexture );
builder.setTexture( this.lightMediumTexture );
builder.addCube( x1, y1, z1, x2, y2, z2 );
builder.setColorRGB( color.blackVariant );
builder.setTexture( lightDarkTexture );
builder.setTexture( this.lightDarkTexture );
builder.addCube( x1, y1, z1, x2, y2, z2 );
}
src/main/java/appeng/client/render/crafting/UnitBakedModel.java
+1 -1
View File
@@ -44,7 +44,7 @@ class UnitBakedModel extends CraftingCubeBakedModel
@Override
protected void addInnerCube( EnumFacing facing, IBlockState state, CubeBuilder builder, float x1, float y1, float z1, float x2, float y2, float z2 )
{
builder.setTexture( unitTexture );
builder.setTexture( this.unitTexture );
builder.addCube( x1, y1, z1, x2, y2, z2 );
}
}