diff --git a/src/api/java/appeng/api/client/BakingPipeline.java b/src/api/java/appeng/api/client/BakingPipeline.java index 37418c08e..37468d116 100644 --- a/src/api/java/appeng/api/client/BakingPipeline.java +++ b/src/api/java/appeng/api/client/BakingPipeline.java @@ -54,7 +54,7 @@ public class BakingPipeline implements BakingPipelineElement @Override public List pipe( List things, IBakedModel parent, IBlockState state, EnumFacing side, long rand ) { - for( BakingPipelineElement pipe : pipeline ) + for( BakingPipelineElement pipe : this.pipeline ) { things = pipe.pipe( things, parent, state, side, rand ); } diff --git a/src/api/java/appeng/api/util/AEColor.java b/src/api/java/appeng/api/util/AEColor.java index cd650cc80..025540b06 100644 --- a/src/api/java/appeng/api/util/AEColor.java +++ b/src/api/java/appeng/api/util/AEColor.java @@ -146,14 +146,14 @@ public enum AEColor case 0: return -1; case TINTINDEX_DARK: - return blackVariant; + return this.blackVariant; case TINTINDEX_MEDIUM: - return mediumVariant; + return this.mediumVariant; case TINTINDEX_BRIGHT: - return whiteVariant; + return this.whiteVariant; case TINTINDEX_MEDIUM_BRIGHT: - final int light = whiteVariant; - final int dark = mediumVariant; + final int light = this.whiteVariant; + final int dark = this.mediumVariant; return ( ( ( ( ( light >> 16 ) & 0xff ) + ( ( dark >> 16 ) & 0xff ) ) / 2 ) << 16 ) | ( ( ( ( ( light >> 8 ) & 0xff ) + ( ( dark >> 8 ) & 0xff ) ) / 2 ) << 8 ) | ( ( ( ( light ) & 0xff ) + ( ( dark ) & 0xff ) ) / 2 ); default: return -1; diff --git a/src/main/java/appeng/block/AEBaseBlock.java b/src/main/java/appeng/block/AEBaseBlock.java index 4a93043af..48bb9b8d6 100644 --- a/src/main/java/appeng/block/AEBaseBlock.java +++ b/src/main/java/appeng/block/AEBaseBlock.java @@ -111,7 +111,7 @@ public abstract class AEBaseBlock extends Block @Override public AxisAlignedBB getBoundingBox( IBlockState state, IBlockAccess source, BlockPos pos ) { - return boundingBox; + return this.boundingBox; } @SuppressWarnings( "deprecation" ) @@ -421,8 +421,8 @@ public abstract class AEBaseBlock extends Block @Override public String toString() { - String regName = getRegistryName() != null ? getRegistryName().getResourcePath() : "unregistered"; - return getClass().getSimpleName() + "[" + regName + "]"; + String regName = this.getRegistryName() != null ? this.getRegistryName().getResourcePath() : "unregistered"; + return this.getClass().getSimpleName() + "[" + regName + "]"; } protected String getUnlocalizedName( final ItemStack is ) diff --git a/src/main/java/appeng/block/AEBaseStairBlock.java b/src/main/java/appeng/block/AEBaseStairBlock.java index 009ee5a83..b426dd23b 100644 --- a/src/main/java/appeng/block/AEBaseStairBlock.java +++ b/src/main/java/appeng/block/AEBaseStairBlock.java @@ -43,8 +43,8 @@ public abstract class AEBaseStairBlock extends BlockStairs @Override public String toString() { - String regName = getRegistryName() != null ? getRegistryName().getResourcePath() : "unregistered"; - return getClass().getSimpleName() + "[" + regName + "]"; + String regName = this.getRegistryName() != null ? this.getRegistryName().getResourcePath() : "unregistered"; + return this.getClass().getSimpleName() + "[" + regName + "]"; } } diff --git a/src/main/java/appeng/block/AEBaseTileBlock.java b/src/main/java/appeng/block/AEBaseTileBlock.java index c7775a208..5bf4ae07b 100644 --- a/src/main/java/appeng/block/AEBaseTileBlock.java +++ b/src/main/java/appeng/block/AEBaseTileBlock.java @@ -86,7 +86,7 @@ public abstract class AEBaseTileBlock extends AEBaseBlock implements ITileEntity return state; } - AEBaseTile tile = getTileEntity( world, pos ); + AEBaseTile tile = this.getTileEntity( world, pos ); if( tile == null ) { return state; // No info available @@ -99,7 +99,7 @@ public abstract class AEBaseTileBlock extends AEBaseBlock implements ITileEntity @Override protected BlockStateContainer createBlockState() { - return new ExtendedBlockState( this, getAEStates(), new IUnlistedProperty[] { + return new ExtendedBlockState( this, this.getAEStates(), new IUnlistedProperty[] { FORWARD, UP } ); @@ -121,7 +121,7 @@ public abstract class AEBaseTileBlock extends AEBaseBlock implements ITileEntity @Override public boolean hasTileEntity( IBlockState state ) { - return hasBlockTileEntity(); + return this.hasBlockTileEntity(); } private boolean hasBlockTileEntity() diff --git a/src/main/java/appeng/block/UnlistedDirection.java b/src/main/java/appeng/block/UnlistedDirection.java index ab79ab18a..3e4639d80 100644 --- a/src/main/java/appeng/block/UnlistedDirection.java +++ b/src/main/java/appeng/block/UnlistedDirection.java @@ -36,7 +36,7 @@ public class UnlistedDirection implements IUnlistedProperty @Override public String getName() { - return name; + return this.name; } @Override diff --git a/src/main/java/appeng/block/crafting/BlockCraftingMonitor.java b/src/main/java/appeng/block/crafting/BlockCraftingMonitor.java index 843fec8b9..a237a0af6 100644 --- a/src/main/java/appeng/block/crafting/BlockCraftingMonitor.java +++ b/src/main/java/appeng/block/crafting/BlockCraftingMonitor.java @@ -51,7 +51,7 @@ public class BlockCraftingMonitor extends BlockCraftingUnit @Override protected BlockStateContainer createBlockState() { - return new ExtendedBlockState( this, getAEStates(), new IUnlistedProperty[] { + return new ExtendedBlockState( this, this.getAEStates(), new IUnlistedProperty[] { STATE, COLOR, FORWARD, @@ -66,7 +66,7 @@ public class BlockCraftingMonitor extends BlockCraftingUnit EnumFacing forward = EnumFacing.NORTH; EnumFacing up = EnumFacing.UP; - TileCraftingMonitorTile te = getTileEntity( world, pos ); + TileCraftingMonitorTile te = this.getTileEntity( world, pos ); if( te != null ) { color = te.getColor(); diff --git a/src/main/java/appeng/block/crafting/BlockCraftingUnit.java b/src/main/java/appeng/block/crafting/BlockCraftingUnit.java index 1dd86e549..0cb8ce7f7 100644 --- a/src/main/java/appeng/block/crafting/BlockCraftingUnit.java +++ b/src/main/java/appeng/block/crafting/BlockCraftingUnit.java @@ -76,7 +76,7 @@ public class BlockCraftingUnit extends AEBaseTileBlock for( EnumFacing facing : EnumFacing.values() ) { - if( isConnected( world, pos, facing ) ) + if( this.isConnected( world, pos, facing ) ) { connections.add( facing ); } @@ -96,7 +96,7 @@ public class BlockCraftingUnit extends AEBaseTileBlock @Override protected BlockStateContainer createBlockState() { - return new ExtendedBlockState( this, getAEStates(), new IUnlistedProperty[] { STATE } ); + return new ExtendedBlockState( this, this.getAEStates(), new IUnlistedProperty[] { STATE } ); } @Override diff --git a/src/main/java/appeng/block/crafting/BlockMolecularAssembler.java b/src/main/java/appeng/block/crafting/BlockMolecularAssembler.java index 71ec2a114..e9734217f 100644 --- a/src/main/java/appeng/block/crafting/BlockMolecularAssembler.java +++ b/src/main/java/appeng/block/crafting/BlockMolecularAssembler.java @@ -63,7 +63,7 @@ public class BlockMolecularAssembler extends AEBaseTileBlock public IBlockState getActualState( IBlockState state, IBlockAccess worldIn, BlockPos pos ) { boolean powered = false; - TileMolecularAssembler te = getTileEntity( worldIn, pos ); + TileMolecularAssembler te = this.getTileEntity( worldIn, pos ); if( te != null ) { powered = te.isPowered(); diff --git a/src/main/java/appeng/block/grindstone/BlockCrank.java b/src/main/java/appeng/block/grindstone/BlockCrank.java index 2d60cf188..f749ef92e 100644 --- a/src/main/java/appeng/block/grindstone/BlockCrank.java +++ b/src/main/java/appeng/block/grindstone/BlockCrank.java @@ -78,7 +78,7 @@ public class BlockCrank extends AEBaseTileBlock private void dropCrank( final World world, final BlockPos pos ) { world.destroyBlock( pos, true ); // w.destroyBlock( x, y, z, true ); - world.notifyBlockUpdate( pos, getDefaultState(), world.getBlockState( pos ), 3 ); + world.notifyBlockUpdate( pos, this.getDefaultState(), world.getBlockState( pos ), 3 ); } @Override diff --git a/src/main/java/appeng/block/misc/BlockInterface.java b/src/main/java/appeng/block/misc/BlockInterface.java index e69ed2c10..879e3586a 100644 --- a/src/main/java/appeng/block/misc/BlockInterface.java +++ b/src/main/java/appeng/block/misc/BlockInterface.java @@ -61,7 +61,7 @@ public class BlockInterface extends AEBaseTileBlock public IBlockState getActualState( IBlockState state, IBlockAccess world, BlockPos pos ) { // Determine whether the interface is omni-directional or not - TileInterface te = getTileEntity( world, pos ); + TileInterface te = this.getTileEntity( world, pos ); boolean omniDirectional = true; // The default if( te != null ) { diff --git a/src/main/java/appeng/block/misc/BlockLightDetector.java b/src/main/java/appeng/block/misc/BlockLightDetector.java index cde176d7d..832d828f2 100644 --- a/src/main/java/appeng/block/misc/BlockLightDetector.java +++ b/src/main/java/appeng/block/misc/BlockLightDetector.java @@ -76,7 +76,7 @@ public class BlockLightDetector extends AEBaseTileBlock implements IOrientableBl public IBlockState getStateFromMeta( final int meta ) { EnumFacing facing = EnumFacing.values()[meta]; - return getDefaultState().withProperty( FACING, facing ); + return this.getDefaultState().withProperty( FACING, facing ); } @Override diff --git a/src/main/java/appeng/block/misc/BlockQuartzFixture.java b/src/main/java/appeng/block/misc/BlockQuartzFixture.java index 0eda96f87..0ea0d171b 100644 --- a/src/main/java/appeng/block/misc/BlockQuartzFixture.java +++ b/src/main/java/appeng/block/misc/BlockQuartzFixture.java @@ -92,7 +92,7 @@ public class BlockQuartzFixture extends AEBaseBlock implements IOrientableBlock, public IBlockState getStateFromMeta( final int meta ) { EnumFacing facing = EnumFacing.values()[meta]; - return getDefaultState().withProperty( FACING, facing ); + return this.getDefaultState().withProperty( FACING, facing ); } @Override diff --git a/src/main/java/appeng/block/misc/BlockQuartzGrowthAccelerator.java b/src/main/java/appeng/block/misc/BlockQuartzGrowthAccelerator.java index e754fae68..c732a3ed0 100644 --- a/src/main/java/appeng/block/misc/BlockQuartzGrowthAccelerator.java +++ b/src/main/java/appeng/block/misc/BlockQuartzGrowthAccelerator.java @@ -52,13 +52,13 @@ public class BlockQuartzGrowthAccelerator extends AEBaseTileBlock implements IOr { super( Material.ROCK ); this.setSoundType( SoundType.METAL ); - this.setDefaultState( getDefaultState().withProperty( POWERED, false ) ); + this.setDefaultState( this.getDefaultState().withProperty( POWERED, false ) ); } @Override public IBlockState getActualState( IBlockState state, IBlockAccess world, BlockPos pos ) { - TileQuartzGrowthAccelerator te = getTileEntity( world, pos ); + TileQuartzGrowthAccelerator te = this.getTileEntity( world, pos ); boolean powered = te != null && te.isPowered(); return super.getActualState( state, world, pos ) diff --git a/src/main/java/appeng/block/misc/BlockSecurityStation.java b/src/main/java/appeng/block/misc/BlockSecurityStation.java index 9b06c82f8..4b26e2648 100644 --- a/src/main/java/appeng/block/misc/BlockSecurityStation.java +++ b/src/main/java/appeng/block/misc/BlockSecurityStation.java @@ -50,7 +50,7 @@ public class BlockSecurityStation extends AEBaseTileBlock { super( Material.IRON ); - this.setDefaultState( getDefaultState().withProperty( POWERED, false ) ); + this.setDefaultState( this.getDefaultState().withProperty( POWERED, false ) ); } @Override @@ -69,7 +69,7 @@ public class BlockSecurityStation extends AEBaseTileBlock public IBlockState getActualState( IBlockState state, IBlockAccess world, BlockPos pos ) { boolean powered = false; - TileSecurityStation te = getTileEntity( world, pos ); + TileSecurityStation te = this.getTileEntity( world, pos ); if( te != null ) { powered = te.isActive(); diff --git a/src/main/java/appeng/block/misc/BlockSkyCompass.java b/src/main/java/appeng/block/misc/BlockSkyCompass.java index 783cbddc7..9c941b4bc 100644 --- a/src/main/java/appeng/block/misc/BlockSkyCompass.java +++ b/src/main/java/appeng/block/misc/BlockSkyCompass.java @@ -58,7 +58,7 @@ public class BlockSkyCompass extends AEBaseTileBlock implements ICustomCollision @Override protected BlockStateContainer createBlockState() { - return new ExtendedBlockState( this, getAEStates(), new IUnlistedProperty[] { FORWARD, UP, ROTATION } ); + return new ExtendedBlockState( this, this.getAEStates(), new IUnlistedProperty[] { FORWARD, UP, ROTATION } ); } @Override diff --git a/src/main/java/appeng/block/misc/BlockVibrationChamber.java b/src/main/java/appeng/block/misc/BlockVibrationChamber.java index 6fb68872d..94c80c84d 100644 --- a/src/main/java/appeng/block/misc/BlockVibrationChamber.java +++ b/src/main/java/appeng/block/misc/BlockVibrationChamber.java @@ -55,7 +55,7 @@ public final class BlockVibrationChamber extends AEBaseTileBlock { super( Material.IRON ); this.setHardness( 4.2F ); - this.setDefaultState( getDefaultState().withProperty( ACTIVE, false ) ); + this.setDefaultState( this.getDefaultState().withProperty( ACTIVE, false ) ); } @Override diff --git a/src/main/java/appeng/block/networking/BlockCableBus.java b/src/main/java/appeng/block/networking/BlockCableBus.java index 764528e31..96cf8fe08 100644 --- a/src/main/java/appeng/block/networking/BlockCableBus.java +++ b/src/main/java/appeng/block/networking/BlockCableBus.java @@ -118,7 +118,7 @@ public class BlockCableBus extends AEBaseTileBlock @Override public IBlockState getExtendedState( IBlockState state, IBlockAccess world, BlockPos pos ) { - CableBusRenderState renderState = cb( world, pos ).getRenderState(); + CableBusRenderState renderState = this.cb( world, pos ).getRenderState(); return ( (IExtendedBlockState) state ).withProperty( RENDER_STATE_PROPERTY, renderState ); } @@ -255,7 +255,7 @@ public class BlockCableBus extends AEBaseTileBlock ICableBusContainer cb = this.cb( world, target.getBlockPos() ); // Our built-in model has the actual baked sprites we need - IBakedModel model = Minecraft.getMinecraft().getBlockRendererDispatcher().getModelForState( getDefaultState() ); + IBakedModel model = Minecraft.getMinecraft().getBlockRendererDispatcher().getModelForState( this.getDefaultState() ); // We cannot add the effect if we don't have the model if( !( model instanceof CableBusBakedModel ) ) @@ -290,7 +290,7 @@ public class BlockCableBus extends AEBaseTileBlock ICableBusContainer cb = this.cb( world, pos ); // Our built-in model has the actual baked sprites we need - IBakedModel model = Minecraft.getMinecraft().getBlockRendererDispatcher().getModelForState( getDefaultState() ); + IBakedModel model = Minecraft.getMinecraft().getBlockRendererDispatcher().getModelForState( this.getDefaultState() ); // We cannot add the effect if we dont have the model if( !( model instanceof CableBusBakedModel ) ) @@ -320,7 +320,7 @@ public class BlockCableBus extends AEBaseTileBlock double d1 = (double) pos.getY() + ( (double) k + 0.5D ) / 4.0D; double d2 = (double) pos.getZ() + ( (double) l + 0.5D ) / 4.0D; ParticleDigging particle = new DestroyFX( world, d0, d1, d2, d0 - (double) pos.getX() - 0.5D, d1 - (double) pos - .getY() - 0.5D, d2 - (double) pos.getZ() - 0.5D, getDefaultState() ).setBlockPos( pos ); + .getY() - 0.5D, d2 - (double) pos.getZ() - 0.5D, this.getDefaultState() ).setBlockPos( pos ); particle.setParticleTexture( texture ); effectRenderer.addEffect( particle ); } diff --git a/src/main/java/appeng/block/networking/BlockController.java b/src/main/java/appeng/block/networking/BlockController.java index 35211507b..6074b1a41 100644 --- a/src/main/java/appeng/block/networking/BlockController.java +++ b/src/main/java/appeng/block/networking/BlockController.java @@ -75,7 +75,7 @@ public class BlockController extends AEBaseTileBlock { super( Material.IRON ); this.setHardness( 6 ); - this.setDefaultState( getDefaultState() + this.setDefaultState( this.getDefaultState() .withProperty( CONTROLLER_STATE, ControllerBlockState.offline ) .withProperty( CONTROLLER_TYPE, ControllerRenderType.block ) ); } @@ -89,7 +89,7 @@ public class BlockController extends AEBaseTileBlock @Override protected BlockStateContainer createBlockState() { - return new BlockStateContainer( this, getAEStates() ); + return new BlockStateContainer( this, this.getAEStates() ); } /** diff --git a/src/main/java/appeng/block/networking/BlockEnergyCellRendering.java b/src/main/java/appeng/block/networking/BlockEnergyCellRendering.java index 8e12d3ffc..90cdd1d50 100644 --- a/src/main/java/appeng/block/networking/BlockEnergyCellRendering.java +++ b/src/main/java/appeng/block/networking/BlockEnergyCellRendering.java @@ -57,7 +57,7 @@ public class BlockEnergyCellRendering extends BlockRenderingCustomizer double fillFactor = getFillFactor( is ); int storageLevel = TileEnergyCell.getStorageLevelFromFillFactor( fillFactor ); - return new ModelResourceLocation( baseModel, "fullness=" + storageLevel ); + return new ModelResourceLocation( this.baseModel, "fullness=" + storageLevel ); } /** diff --git a/src/main/java/appeng/block/networking/BlockWireless.java b/src/main/java/appeng/block/networking/BlockWireless.java index dc0f11bec..92be630d3 100644 --- a/src/main/java/appeng/block/networking/BlockWireless.java +++ b/src/main/java/appeng/block/networking/BlockWireless.java @@ -57,7 +57,7 @@ public class BlockWireless extends AEBaseTileBlock implements ICustomCollision @Override public String getName() { - return name().toLowerCase(); + return this.name().toLowerCase(); } } @@ -69,7 +69,7 @@ public class BlockWireless extends AEBaseTileBlock implements ICustomCollision this.setLightOpacity( 0 ); this.setFullSize( false ); this.setOpaque( false ); - this.setDefaultState( getDefaultState().withProperty( STATE, State.OFF ) ); + this.setDefaultState( this.getDefaultState().withProperty( STATE, State.OFF ) ); } @Override @@ -83,7 +83,7 @@ public class BlockWireless extends AEBaseTileBlock implements ICustomCollision { State teState = State.OFF; - TileWireless te = getTileEntity( worldIn, pos ); + TileWireless te = this.getTileEntity( worldIn, pos ); if( te != null ) { if( te.isActive() ) diff --git a/src/main/java/appeng/block/networking/CableBusRendering.java b/src/main/java/appeng/block/networking/CableBusRendering.java index 6e5b5fddc..faea932a9 100644 --- a/src/main/java/appeng/block/networking/CableBusRendering.java +++ b/src/main/java/appeng/block/networking/CableBusRendering.java @@ -45,7 +45,7 @@ public class CableBusRendering extends BlockRenderingCustomizer @SideOnly( Side.CLIENT ) public void customize( IBlockRendering rendering, IItemRendering itemRendering ) { - rendering.builtInModel( "models/block/builtin/cable_bus", new CableBusModel( partModels ) ); + rendering.builtInModel( "models/block/builtin/cable_bus", new CableBusModel( this.partModels ) ); rendering.blockColor( new CableBusColor() ); rendering.modelCustomizer( ( loc, model ) -> model ); } diff --git a/src/main/java/appeng/block/paint/BlockPaint.java b/src/main/java/appeng/block/paint/BlockPaint.java index 7659addd0..be0af2a8d 100644 --- a/src/main/java/appeng/block/paint/BlockPaint.java +++ b/src/main/java/appeng/block/paint/BlockPaint.java @@ -75,7 +75,7 @@ public class BlockPaint extends AEBaseTileBlock { IExtendedBlockState extState = (IExtendedBlockState) state; - TilePaint te = getTileEntity( world, pos ); + TilePaint te = this.getTileEntity( world, pos ); Collection splotches = Collections.emptyList(); if( te != null ) diff --git a/src/main/java/appeng/block/paint/PaintBakedModel.java b/src/main/java/appeng/block/paint/PaintBakedModel.java index 3f0a54617..da133ab25 100644 --- a/src/main/java/appeng/block/paint/PaintBakedModel.java +++ b/src/main/java/appeng/block/paint/PaintBakedModel.java @@ -66,7 +66,7 @@ class PaintBakedModel implements IBakedModel // This is the inventory model which should usually not be used other than in special cases List quads = new ArrayList<>( 1 ); CubeBuilder builder = new CubeBuilder( this.vertexFormat, quads ); - builder.setTexture( textures[0] ); + builder.setTexture( this.textures[0] ); builder.addCube( 0, 0, 0, 16, 16, 16 ); return quads; } @@ -81,7 +81,7 @@ class PaintBakedModel implements IBakedModel List splotches = splotchesState.getSplotches(); - CubeBuilder builder = new CubeBuilder( vertexFormat ); + CubeBuilder builder = new CubeBuilder( this.vertexFormat ); float offsetConstant = 0.001f; for( final Splotch s : splotches ) @@ -109,7 +109,7 @@ class PaintBakedModel implements IBakedModel pos_x = Math.max( buffer, Math.min( 1.0f - buffer, pos_x ) ); pos_y = Math.max( buffer, Math.min( 1.0f - buffer, pos_y ) ); - TextureAtlasSprite ico = textures[s.getSeed() % textures.length]; + TextureAtlasSprite ico = this.textures[s.getSeed() % this.textures.length]; builder.setTexture( ico ); builder.setCustomUv( s.getSide().getOpposite(), 0, 0, 16, 16 ); @@ -176,7 +176,7 @@ class PaintBakedModel implements IBakedModel @Override public TextureAtlasSprite getParticleTexture() { - return textures[0]; + return this.textures[0]; } @Override diff --git a/src/main/java/appeng/block/paint/PaintSplotches.java b/src/main/java/appeng/block/paint/PaintSplotches.java index 2d03f75e3..5e86d64e3 100644 --- a/src/main/java/appeng/block/paint/PaintSplotches.java +++ b/src/main/java/appeng/block/paint/PaintSplotches.java @@ -25,7 +25,7 @@ class PaintSplotches List getSplotches() { - return splotches; + return this.splotches; } } diff --git a/src/main/java/appeng/block/qnb/BlockQuantumBase.java b/src/main/java/appeng/block/qnb/BlockQuantumBase.java index c1d10ea63..311f4501d 100644 --- a/src/main/java/appeng/block/qnb/BlockQuantumBase.java +++ b/src/main/java/appeng/block/qnb/BlockQuantumBase.java @@ -53,7 +53,7 @@ public abstract class BlockQuantumBase extends AEBaseTileBlock implements ICusto this.boundingBox = new AxisAlignedBB( shave, shave, shave, 1.0f - shave, 1.0f - shave, 1.0f - shave ); this.setLightOpacity( 0 ); this.setFullSize( this.setOpaque( false ) ); - this.setDefaultState( getDefaultState().withProperty( FORMED, false ) ); + this.setDefaultState( this.getDefaultState().withProperty( FORMED, false ) ); } @Override @@ -65,7 +65,7 @@ public abstract class BlockQuantumBase extends AEBaseTileBlock implements ICusto @Override protected BlockStateContainer createBlockState() { - return new ExtendedBlockState( this, getAEStates(), new IUnlistedProperty[] { FORMED_STATE } ); + return new ExtendedBlockState( this, this.getAEStates(), new IUnlistedProperty[] { FORMED_STATE } ); } @Override @@ -73,7 +73,7 @@ public abstract class BlockQuantumBase extends AEBaseTileBlock implements ICusto { IExtendedBlockState extState = (IExtendedBlockState) state; - TileQuantumBridge bridge = getTileEntity( world, pos ); + TileQuantumBridge bridge = this.getTileEntity( world, pos ); if( bridge != null ) { QnbFormedState formedState = new QnbFormedState( bridge.getAdjacentQuantumBridges(), bridge.isCorner(), bridge.isPowered() ); @@ -86,7 +86,7 @@ public abstract class BlockQuantumBase extends AEBaseTileBlock implements ICusto @Override public IBlockState getActualState( IBlockState state, IBlockAccess worldIn, BlockPos pos ) { - TileQuantumBridge bridge = getTileEntity( worldIn, pos ); + TileQuantumBridge bridge = this.getTileEntity( worldIn, pos ); if( bridge != null ) { state = state.withProperty( FORMED, bridge.isFormed() ); diff --git a/src/main/java/appeng/block/qnb/QnbFormedBakedModel.java b/src/main/java/appeng/block/qnb/QnbFormedBakedModel.java index 8c0127f12..39f290cae 100644 --- a/src/main/java/appeng/block/qnb/QnbFormedBakedModel.java +++ b/src/main/java/appeng/block/qnb/QnbFormedBakedModel.java @@ -79,42 +79,42 @@ class QnbFormedBakedModel implements IBakedModel // Get the correct base model if( !( state instanceof IExtendedBlockState ) ) { - return baseModel.getQuads( state, side, rand ); + return this.baseModel.getQuads( state, side, rand ); } IExtendedBlockState extendedBlockState = (IExtendedBlockState) state; QnbFormedState formedState = extendedBlockState.getValue( BlockQuantumBase.FORMED_STATE ); - return getQuads( formedState, state, side, rand ); + return this.getQuads( formedState, state, side, rand ); } private List getQuads( QnbFormedState formedState, IBlockState state, EnumFacing side, long rand ) { - CubeBuilder builder = new CubeBuilder( vertexFormat ); + CubeBuilder builder = new CubeBuilder( this.vertexFormat ); - if( state.getBlock() == linkBlock ) + if( state.getBlock() == this.linkBlock ) { Set sides = formedState.getAdjacentQuantumBridges(); - this.renderCableAt( builder, 0.11f * 16, glassCableTexture, 0.141f * 16, sides ); + this.renderCableAt( builder, 0.11f * 16, this.glassCableTexture, 0.141f * 16, sides ); - this.renderCableAt( builder, 0.188f * 16, coveredCableTexture, 0.1875f * 16, sides ); + this.renderCableAt( builder, 0.188f * 16, this.coveredCableTexture, 0.1875f * 16, sides ); - builder.setTexture( linkTexture ); + builder.setTexture( this.linkTexture ); builder.addCube( DEFAULT_RENDER_MIN, DEFAULT_RENDER_MIN, DEFAULT_RENDER_MIN, DEFAULT_RENDER_MAX, DEFAULT_RENDER_MAX, DEFAULT_RENDER_MAX ); } else { if( formedState.isCorner() ) { - this.renderCableAt( builder, 0.188f * 16, coveredCableTexture, 0.05f * 16, formedState.getAdjacentQuantumBridges() ); + this.renderCableAt( builder, 0.188f * 16, this.coveredCableTexture, 0.05f * 16, formedState.getAdjacentQuantumBridges() ); - builder.setTexture( ringTexture ); + builder.setTexture( this.ringTexture ); builder.addCube( DEFAULT_RENDER_MIN, DEFAULT_RENDER_MIN, DEFAULT_RENDER_MIN, DEFAULT_RENDER_MAX, DEFAULT_RENDER_MAX, DEFAULT_RENDER_MAX ); if( formedState.isPowered() ) { - builder.setTexture( lightCornerTexture ); + builder.setTexture( this.lightCornerTexture ); builder.setRenderFullBright( true ); for( EnumFacing facing : EnumFacing.values() ) { @@ -133,7 +133,7 @@ class QnbFormedBakedModel implements IBakedModel } else { - builder.setTexture( ringTexture ); + builder.setTexture( this.ringTexture ); builder.addCube( 0, DEFAULT_RENDER_MIN, DEFAULT_RENDER_MIN, 16, DEFAULT_RENDER_MAX, DEFAULT_RENDER_MAX ); @@ -143,7 +143,7 @@ class QnbFormedBakedModel implements IBakedModel if( formedState.isPowered() ) { - builder.setTexture( lightTexture ); + builder.setTexture( this.lightTexture ); builder.setRenderFullBright( true ); for( EnumFacing facing : EnumFacing.values() ) { @@ -203,7 +203,7 @@ class QnbFormedBakedModel implements IBakedModel @Override public boolean isAmbientOcclusion() { - return baseModel.isAmbientOcclusion(); + return this.baseModel.isAmbientOcclusion(); } @Override @@ -221,19 +221,19 @@ class QnbFormedBakedModel implements IBakedModel @Override public TextureAtlasSprite getParticleTexture() { - return baseModel.getParticleTexture(); + return this.baseModel.getParticleTexture(); } @Override public ItemCameraTransforms getItemCameraTransforms() { - return baseModel.getItemCameraTransforms(); + return this.baseModel.getItemCameraTransforms(); } @Override public ItemOverrideList getOverrides() { - return baseModel.getOverrides(); + return this.baseModel.getOverrides(); } public static List getRequiredTextures() diff --git a/src/main/java/appeng/block/qnb/QnbFormedModel.java b/src/main/java/appeng/block/qnb/QnbFormedModel.java index 1c10ed95c..e4884e650 100644 --- a/src/main/java/appeng/block/qnb/QnbFormedModel.java +++ b/src/main/java/appeng/block/qnb/QnbFormedModel.java @@ -39,7 +39,7 @@ public class QnbFormedModel implements IModel @Override public IBakedModel bake( IModelState state, VertexFormat format, Function bakedTextureGetter ) { - IBakedModel ringModel = getBaseModel( MODEL_RING, state, format, bakedTextureGetter ); + IBakedModel ringModel = this.getBaseModel( MODEL_RING, state, format, bakedTextureGetter ); return new QnbFormedBakedModel( format, ringModel, bakedTextureGetter ); } diff --git a/src/main/java/appeng/block/qnb/QnbFormedState.java b/src/main/java/appeng/block/qnb/QnbFormedState.java index efd8da088..43664dcff 100644 --- a/src/main/java/appeng/block/qnb/QnbFormedState.java +++ b/src/main/java/appeng/block/qnb/QnbFormedState.java @@ -25,17 +25,17 @@ public class QnbFormedState public Set getAdjacentQuantumBridges() { - return adjacentQuantumBridges; + return this.adjacentQuantumBridges; } public boolean isCorner() { - return corner; + return this.corner; } public boolean isPowered() { - return powered; + return this.powered; } } diff --git a/src/main/java/appeng/block/spatial/BlockSpatialPylon.java b/src/main/java/appeng/block/spatial/BlockSpatialPylon.java index eae3e9b38..ae465ebea 100644 --- a/src/main/java/appeng/block/spatial/BlockSpatialPylon.java +++ b/src/main/java/appeng/block/spatial/BlockSpatialPylon.java @@ -49,7 +49,7 @@ public class BlockSpatialPylon extends AEBaseTileBlock @Override protected BlockStateContainer createBlockState() { - return new ExtendedBlockState( this, getAEStates(), new IUnlistedProperty[] { STATE } ); + return new ExtendedBlockState( this, this.getAEStates(), new IUnlistedProperty[] { STATE } ); } @Override @@ -57,7 +57,7 @@ public class BlockSpatialPylon extends AEBaseTileBlock { IExtendedBlockState extState = (IExtendedBlockState) state; - return extState.withProperty( STATE, getDisplayState( world, pos ) ); + return extState.withProperty( STATE, this.getDisplayState( world, pos ) ); } @Override @@ -83,7 +83,7 @@ public class BlockSpatialPylon extends AEBaseTileBlock private int getDisplayState( IBlockAccess world, BlockPos pos ) { - TileSpatialPylon te = getTileEntity( world, pos ); + TileSpatialPylon te = this.getTileEntity( world, pos ); if( te == null ) { diff --git a/src/main/java/appeng/block/storage/BlockChest.java b/src/main/java/appeng/block/storage/BlockChest.java index bcab956d0..c450708da 100644 --- a/src/main/java/appeng/block/storage/BlockChest.java +++ b/src/main/java/appeng/block/storage/BlockChest.java @@ -52,7 +52,7 @@ public class BlockChest extends AEBaseTileBlock public BlockChest() { super( Material.IRON ); - this.setDefaultState( getDefaultState().withProperty( SLOT_STATE, DriveSlotState.EMPTY ) ); + this.setDefaultState( this.getDefaultState().withProperty( SLOT_STATE, DriveSlotState.EMPTY ) ); } @Override @@ -72,7 +72,7 @@ public class BlockChest extends AEBaseTileBlock { DriveSlotState slotState = DriveSlotState.EMPTY; - TileChest te = getTileEntity( worldIn, pos ); + TileChest te = this.getTileEntity( worldIn, pos ); if( te != null ) { diff --git a/src/main/java/appeng/block/storage/BlockDrive.java b/src/main/java/appeng/block/storage/BlockDrive.java index bd8f4c868..737fdac08 100644 --- a/src/main/java/appeng/block/storage/BlockDrive.java +++ b/src/main/java/appeng/block/storage/BlockDrive.java @@ -63,7 +63,7 @@ public class BlockDrive extends AEBaseTileBlock @Override protected BlockStateContainer createBlockState() { - return new ExtendedBlockState( this, getAEStates(), new IUnlistedProperty[] { + return new ExtendedBlockState( this, this.getAEStates(), new IUnlistedProperty[] { SLOTS_STATE, FORWARD, UP @@ -73,7 +73,7 @@ public class BlockDrive extends AEBaseTileBlock @Override public IBlockState getExtendedState( IBlockState state, IBlockAccess world, BlockPos pos ) { - TileDrive te = getTileEntity( world, pos ); + TileDrive te = this.getTileEntity( world, pos ); if( te == null ) { return super.getExtendedState( state, world, pos ); diff --git a/src/main/java/appeng/block/storage/BlockSkyChest.java b/src/main/java/appeng/block/storage/BlockSkyChest.java index aeceab6f9..351fa0bd2 100644 --- a/src/main/java/appeng/block/storage/BlockSkyChest.java +++ b/src/main/java/appeng/block/storage/BlockSkyChest.java @@ -88,7 +88,7 @@ public class BlockSkyChest extends AEBaseTileBlock implements ICustomCollision @Override public Iterable getSelectedBoundingBoxesFromPool( final World w, final BlockPos pos, final Entity thePlayer, final boolean b ) { - final AxisAlignedBB aabb = computeAABB( w, pos ); + final AxisAlignedBB aabb = this.computeAABB( w, pos ); return Collections.singletonList( aabb ); } @@ -96,7 +96,7 @@ public class BlockSkyChest extends AEBaseTileBlock implements ICustomCollision @Override public void addCollidingBlockToList( final World w, final BlockPos pos, final AxisAlignedBB bb, final List out, final Entity e ) { - final AxisAlignedBB aabb = computeAABB( w, pos ); + final AxisAlignedBB aabb = this.computeAABB( w, pos ); out.add( aabb ); } diff --git a/src/main/java/appeng/block/storage/DriveSlotState.java b/src/main/java/appeng/block/storage/DriveSlotState.java index 3b8d2521e..ffd8b9a2f 100644 --- a/src/main/java/appeng/block/storage/DriveSlotState.java +++ b/src/main/java/appeng/block/storage/DriveSlotState.java @@ -53,7 +53,7 @@ public enum DriveSlotState implements IStringSerializable @Override public String getName() { - return name; + return this.name; } public static DriveSlotState fromCellStatus( int cellStatus ) diff --git a/src/main/java/appeng/block/storage/DriveSlotsState.java b/src/main/java/appeng/block/storage/DriveSlotsState.java index 0919d1289..f72559b1b 100644 --- a/src/main/java/appeng/block/storage/DriveSlotsState.java +++ b/src/main/java/appeng/block/storage/DriveSlotsState.java @@ -37,16 +37,16 @@ public class DriveSlotsState public DriveSlotState getState( int index ) { - if( index >= slots.length ) + if( index >= this.slots.length ) { return DriveSlotState.EMPTY; } - return slots[index]; + return this.slots[index]; } public int getSlotCount() { - return slots.length; + return this.slots.length; } /** diff --git a/src/main/java/appeng/block/storage/SkyChestRenderingCustomizer.java b/src/main/java/appeng/block/storage/SkyChestRenderingCustomizer.java index fbf4c8709..59ec68cf9 100644 --- a/src/main/java/appeng/block/storage/SkyChestRenderingCustomizer.java +++ b/src/main/java/appeng/block/storage/SkyChestRenderingCustomizer.java @@ -46,7 +46,7 @@ public class SkyChestRenderingCustomizer extends BlockRenderingCustomizer rendering.tesr( new SkyChestTESR() ); // Register a custom non-tesr item model - String modelName = getModelFromType(); + String modelName = this.getModelFromType(); ModelResourceLocation model = new ModelResourceLocation( "appliedenergistics2:" + modelName, "inventory" ); itemRendering.model( model ).variants( model ); } @@ -54,7 +54,7 @@ public class SkyChestRenderingCustomizer extends BlockRenderingCustomizer private String getModelFromType() { final String modelName; - switch( type ) + switch( this.type ) { default: case STONE: diff --git a/src/main/java/appeng/bootstrap/BlockDefinitionBuilder.java b/src/main/java/appeng/bootstrap/BlockDefinitionBuilder.java index 4b4a662e3..ddc084eb3 100644 --- a/src/main/java/appeng/bootstrap/BlockDefinitionBuilder.java +++ b/src/main/java/appeng/bootstrap/BlockDefinitionBuilder.java @@ -97,36 +97,36 @@ class BlockDefinitionBuilder implements IBlockBuilder if( Platform.isClient() ) { - blockRendering = new BlockRendering(); - itemRendering = new ItemRendering(); + this.blockRendering = new BlockRendering(); + this.itemRendering = new ItemRendering(); } } @Override public BlockDefinitionBuilder preInit( BiConsumer callback ) { - preInitCallbacks.add( callback ); + this.preInitCallbacks.add( callback ); return this; } @Override public BlockDefinitionBuilder init( BiConsumer callback ) { - initCallbacks.add( callback ); + this.initCallbacks.add( callback ); return this; } @Override public BlockDefinitionBuilder modelRegInit( BiConsumer callback ) { - modelRegCallbacks.add( callback ); + this.modelRegCallbacks.add( callback ); return this; } @Override public BlockDefinitionBuilder postInit( BiConsumer callback ) { - postInitCallbacks.add( callback ); + this.postInitCallbacks.add( callback ); return this; } @@ -134,7 +134,7 @@ class BlockDefinitionBuilder implements IBlockBuilder public IBlockBuilder features( AEFeature... features ) { this.features.clear(); - addFeatures( features ); + this.addFeatures( features ); return this; } @@ -150,7 +150,7 @@ class BlockDefinitionBuilder implements IBlockBuilder { if( Platform.isClient() ) { - customizeForClient( callback ); + this.customizeForClient( callback ); } return this; @@ -166,13 +166,13 @@ class BlockDefinitionBuilder implements IBlockBuilder @Override public IBlockBuilder useCustomItemModel() { - rendering( new BlockRenderingCustomizer() + this.rendering( new BlockRenderingCustomizer() { @Override @SideOnly( Side.CLIENT ) public void customize( IBlockRendering rendering, IItemRendering itemRendering ) { - ModelResourceLocation model = new ModelResourceLocation( new ResourceLocation( AppEng.MOD_ID, registryName ), "inventory" ); + ModelResourceLocation model = new ModelResourceLocation( new ResourceLocation( AppEng.MOD_ID, BlockDefinitionBuilder.this.registryName ), "inventory" ); itemRendering.model( model ).variants( model ); } } ); @@ -197,31 +197,31 @@ class BlockDefinitionBuilder implements IBlockBuilder @SideOnly( Side.CLIENT ) private void customizeForClient( BlockRenderingCustomizer callback ) { - callback.customize( blockRendering, itemRendering ); + callback.customize( this.blockRendering, this.itemRendering ); } @SuppressWarnings( "unchecked" ) @Override public T build() { - if( !AEConfig.instance().areFeaturesEnabled( features ) ) + if( !AEConfig.instance().areFeaturesEnabled( this.features ) ) { - return (T) new TileDefinition( registryName, null, null ); + return (T) new TileDefinition( this.registryName, null, null ); } // Create block and matching item, and set factory name of both - Block block = blockSupplier.get(); - block.setRegistryName( AppEng.MOD_ID, registryName ); - block.setUnlocalizedName( "appliedenergistics2." + registryName ); + Block block = this.blockSupplier.get(); + block.setRegistryName( AppEng.MOD_ID, this.registryName ); + block.setUnlocalizedName( "appliedenergistics2." + this.registryName ); - ItemBlock item = constructItemFromBlock( block ); + ItemBlock item = this.constructItemFromBlock( block ); if( item != null ) { - item.setRegistryName( AppEng.MOD_ID, registryName ); + item.setRegistryName( AppEng.MOD_ID, this.registryName ); } // Register the item and block with the game - factory.addPreInit( side -> + this.factory.addPreInit( side -> { Registration.addBlockToRegister( block ); if( item != null ) @@ -230,20 +230,20 @@ class BlockDefinitionBuilder implements IBlockBuilder } } ); - block.setCreativeTab( creativeTab ); + block.setCreativeTab( this.creativeTab ); // Register all extra handlers - preInitCallbacks.forEach( consumer -> factory.addPreInit( side -> consumer.accept( block, item ) ) ); - initCallbacks.forEach( consumer -> factory.addInit( side -> consumer.accept( block, item ) ) ); - modelRegCallbacks.forEach( consumer -> factory.addModelReg( side -> consumer.accept( block, item ) ) ); - postInitCallbacks.forEach( consumer -> factory.addPostInit( side -> consumer.accept( block, item ) ) ); + this.preInitCallbacks.forEach( consumer -> this.factory.addPreInit( side -> consumer.accept( block, item ) ) ); + this.initCallbacks.forEach( consumer -> this.factory.addInit( side -> consumer.accept( block, item ) ) ); + this.modelRegCallbacks.forEach( consumer -> this.factory.addModelReg( side -> consumer.accept( block, item ) ) ); + this.postInitCallbacks.forEach( consumer -> this.factory.addPostInit( side -> consumer.accept( block, item ) ) ); - if( tileEntityDefinition != null && block instanceof AEBaseTileBlock ) + if( this.tileEntityDefinition != null && block instanceof AEBaseTileBlock ) { - ( (AEBaseTileBlock) block ).setTileEntity( tileEntityDefinition.getTileEntityClass() ); - if( tileEntityDefinition.getName() == null ) + ( (AEBaseTileBlock) block ).setTileEntity( this.tileEntityDefinition.getTileEntityClass() ); + if( this.tileEntityDefinition.getName() == null ) { - tileEntityDefinition.setName( registryName ); + this.tileEntityDefinition.setName( this.registryName ); } } @@ -253,52 +253,52 @@ class BlockDefinitionBuilder implements IBlockBuilder if( block instanceof AEBaseTileBlock ) { AEBaseTileBlock tileBlock = (AEBaseTileBlock) block; - blockRendering.apply( factory, block, tileBlock.getTileEntityClass() ); + this.blockRendering.apply( this.factory, block, tileBlock.getTileEntityClass() ); } else { - blockRendering.apply( factory, block, null ); + this.blockRendering.apply( this.factory, block, null ); } if( item != null ) { - itemRendering.apply( factory, item ); + this.itemRendering.apply( this.factory, item ); } } if( block instanceof AEBaseTileBlock ) { - factory.addPreInit( side -> + this.factory.addPreInit( side -> { AEBaseTile.registerTileItem( - tileEntityDefinition == null ? ( (AEBaseTileBlock) block ).getTileEntityClass() : tileEntityDefinition.getTileEntityClass(), + this.tileEntityDefinition == null ? ( (AEBaseTileBlock) block ).getTileEntityClass() : this.tileEntityDefinition.getTileEntityClass(), new BlockStackSrc( block, 0, ActivityState.Enabled ) ); } ); - if( tileEntityDefinition != null ) + if( this.tileEntityDefinition != null ) { - factory.tileEntityComponent.addTileEntity( tileEntityDefinition ); + this.factory.tileEntityComponent.addTileEntity( this.tileEntityDefinition ); } - return (T) new TileDefinition( registryName, (AEBaseTileBlock) block, item ); + return (T) new TileDefinition( this.registryName, (AEBaseTileBlock) block, item ); } else { - return (T) new BlockDefinition( registryName, block, item ); + return (T) new BlockDefinition( this.registryName, block, item ); } } @Nullable private ItemBlock constructItemFromBlock( Block block ) { - if( disableItem ) + if( this.disableItem ) { return null; } - if( itemFactory != null ) + if( this.itemFactory != null ) { - return itemFactory.apply( block ); + return this.itemFactory.apply( block ); } else if( block instanceof AEBaseBlock ) { diff --git a/src/main/java/appeng/bootstrap/BlockRendering.java b/src/main/java/appeng/bootstrap/BlockRendering.java index cfbf019df..905c2735c 100644 --- a/src/main/java/appeng/bootstrap/BlockRendering.java +++ b/src/main/java/appeng/bootstrap/BlockRendering.java @@ -62,7 +62,7 @@ class BlockRendering implements IBlockRendering @SideOnly( Side.CLIENT ) public IBlockRendering modelCustomizer( BiFunction customizer ) { - modelCustomizer = customizer; + this.modelCustomizer = customizer; return this; } @@ -99,18 +99,18 @@ class BlockRendering implements IBlockRendering void apply( FeatureFactory factory, Block block, Class tileEntityClass ) { - if( tesr != null ) + if( this.tesr != null ) { if( tileEntityClass == null ) { throw new IllegalStateException( "Tried to register a TESR for " + block + " even though no tile entity has been specified." ); } - factory.addBootstrapComponent( new TesrComponent( tileEntityClass, tesr ) ); + factory.addBootstrapComponent( new TesrComponent( tileEntityClass, this.tesr ) ); } - if( modelCustomizer != null ) + if( this.modelCustomizer != null ) { - factory.modelOverrideComponent.addOverride( block.getRegistryName().getResourcePath(), modelCustomizer ); + factory.modelOverrideComponent.addOverride( block.getRegistryName().getResourcePath(), this.modelCustomizer ); } else if( block instanceof AEBaseTileBlock ) { @@ -120,16 +120,16 @@ class BlockRendering implements IBlockRendering } // TODO : 1.12 - builtInModels.forEach( factory::addBuiltInModel ); + this.builtInModels.forEach( factory::addBuiltInModel ); - if( blockColor != null ) + if( this.blockColor != null ) { - factory.addBootstrapComponent( new BlockColorComponent( block, blockColor ) ); + factory.addBootstrapComponent( new BlockColorComponent( block, this.blockColor ) ); } - if( stateMapper != null ) + if( this.stateMapper != null ) { - factory.addBootstrapComponent( new StateMapperComponent( block, stateMapper ) ); + factory.addBootstrapComponent( new StateMapperComponent( block, this.stateMapper ) ); } } } diff --git a/src/main/java/appeng/bootstrap/FeatureFactory.java b/src/main/java/appeng/bootstrap/FeatureFactory.java index 124b56680..3409398b9 100644 --- a/src/main/java/appeng/bootstrap/FeatureFactory.java +++ b/src/main/java/appeng/bootstrap/FeatureFactory.java @@ -67,15 +67,15 @@ public class FeatureFactory this.bootstrapComponents = new ArrayList<>(); this.tileEntityComponent = new TileEntityComponent(); - this.bootstrapComponents.add( tileEntityComponent ); + this.bootstrapComponents.add( this.tileEntityComponent ); if( Platform.isClient() ) { - modelOverrideComponent = new ModelOverrideComponent(); - bootstrapComponents.add( modelOverrideComponent ); + this.modelOverrideComponent = new ModelOverrideComponent(); + this.bootstrapComponents.add( this.modelOverrideComponent ); - builtInModelComponent = new BuiltInModelComponent(); - bootstrapComponents.add( builtInModelComponent ); + this.builtInModelComponent = new BuiltInModelComponent(); + this.bootstrapComponents.add( this.builtInModelComponent ); } } @@ -93,12 +93,12 @@ public class FeatureFactory public IBlockBuilder block( String id, Supplier block ) { - return new BlockDefinitionBuilder( this, id, block ).features( defaultFeatures ); + return new BlockDefinitionBuilder( this, id, block ).features( this.defaultFeatures ); } public IItemBuilder item( String id, Supplier item ) { - return new ItemDefinitionBuilder( this, id, item ).features( defaultFeatures ); + return new ItemDefinitionBuilder( this, id, item ).features( this.defaultFeatures ); } public AEColoredItemDefinition colored( IItemDefinition target, int offset ) @@ -151,11 +151,11 @@ public class FeatureFactory @SideOnly( Side.CLIENT ) void addBuiltInModel( String path, IModel model ) { - builtInModelComponent.addModel( path, model ); + this.builtInModelComponent.addModel( path, model ); } public List getBootstrapComponents() { - return bootstrapComponents; + return this.bootstrapComponents; } } diff --git a/src/main/java/appeng/bootstrap/ItemDefinitionBuilder.java b/src/main/java/appeng/bootstrap/ItemDefinitionBuilder.java index 8271c3916..152319e43 100644 --- a/src/main/java/appeng/bootstrap/ItemDefinitionBuilder.java +++ b/src/main/java/appeng/bootstrap/ItemDefinitionBuilder.java @@ -75,28 +75,28 @@ class ItemDefinitionBuilder implements IItemBuilder this.itemSupplier = itemSupplier; if( Platform.isClient() ) { - itemRendering = new ItemRendering(); + this.itemRendering = new ItemRendering(); } } @Override public ItemDefinitionBuilder preInit( Consumer callback ) { - preInitCallbacks.add( callback ); + this.preInitCallbacks.add( callback ); return this; } @Override public ItemDefinitionBuilder init( Consumer callback ) { - initCallbacks.add( callback ); + this.initCallbacks.add( callback ); return this; } @Override public ItemDefinitionBuilder postInit( Consumer callback ) { - postInitCallbacks.add( callback ); + this.postInitCallbacks.add( callback ); return this; } @@ -104,7 +104,7 @@ class ItemDefinitionBuilder implements IItemBuilder public IItemBuilder features( AEFeature... features ) { this.features.clear(); - addFeatures( features ); + this.addFeatures( features ); return this; } @@ -127,7 +127,7 @@ class ItemDefinitionBuilder implements IItemBuilder { if( Platform.isClient() ) { - customizeForClient( callback ); + this.customizeForClient( callback ); } return this; @@ -143,46 +143,46 @@ class ItemDefinitionBuilder implements IItemBuilder @SideOnly( Side.CLIENT ) private void customizeForClient( ItemRenderingCustomizer callback ) { - callback.customize( itemRendering ); + callback.customize( this.itemRendering ); } @Override public ItemDefinition build() { - if( !AEConfig.instance().areFeaturesEnabled( features ) ) + if( !AEConfig.instance().areFeaturesEnabled( this.features ) ) { - return new ItemDefinition( registryName, null ); + return new ItemDefinition( this.registryName, null ); } - Item item = itemSupplier.get(); - item.setRegistryName( AppEng.MOD_ID, registryName ); + Item item = this.itemSupplier.get(); + item.setRegistryName( AppEng.MOD_ID, this.registryName ); - ItemDefinition definition = new ItemDefinition( registryName, item ); + ItemDefinition definition = new ItemDefinition( this.registryName, item ); - item.setUnlocalizedName( "appliedenergistics2." + registryName ); - item.setCreativeTab( creativeTab ); + item.setUnlocalizedName( "appliedenergistics2." + this.registryName ); + item.setCreativeTab( this.creativeTab ); // Register all extra handlers - preInitCallbacks.forEach( consumer -> factory.addPreInit( side -> consumer.accept( item ) ) ); - initCallbacks.forEach( consumer -> factory.addInit( side -> consumer.accept( item ) ) ); - modelRegCallbacks.forEach( consumer -> factory.addModelReg( side -> consumer.accept( item ) ) ); - postInitCallbacks.forEach( consumer -> factory.addPostInit( side -> consumer.accept( item ) ) ); + this.preInitCallbacks.forEach( consumer -> this.factory.addPreInit( side -> consumer.accept( item ) ) ); + this.initCallbacks.forEach( consumer -> this.factory.addInit( side -> consumer.accept( item ) ) ); + this.modelRegCallbacks.forEach( consumer -> this.factory.addModelReg( side -> consumer.accept( item ) ) ); + this.postInitCallbacks.forEach( consumer -> this.factory.addPostInit( side -> consumer.accept( item ) ) ); // Register custom dispenser behavior if requested - if( dispenserBehaviorSupplier != null ) + if( this.dispenserBehaviorSupplier != null ) { - factory.addPostInit( side -> + this.factory.addPostInit( side -> { - IBehaviorDispenseItem behavior = dispenserBehaviorSupplier.get(); + IBehaviorDispenseItem behavior = this.dispenserBehaviorSupplier.get(); BlockDispenser.DISPENSE_BEHAVIOR_REGISTRY.putObject( item, behavior ); } ); } - factory.addPreInit( side -> Registration.addItemToRegister( item ) ); + this.factory.addPreInit( side -> Registration.addItemToRegister( item ) ); if( Platform.isClient() ) { - itemRendering.apply( factory, item ); + this.itemRendering.apply( this.factory, item ); } return definition; diff --git a/src/main/java/appeng/bootstrap/ItemRendering.java b/src/main/java/appeng/bootstrap/ItemRendering.java index 15641663b..73b13854e 100644 --- a/src/main/java/appeng/bootstrap/ItemRendering.java +++ b/src/main/java/appeng/bootstrap/ItemRendering.java @@ -107,7 +107,7 @@ class ItemRendering implements IItemRendering { if( this.itemMeshDefinition != null ) { - factory.addBootstrapComponent( new ItemMeshDefinitionComponent( item, itemMeshDefinition ) ); + factory.addBootstrapComponent( new ItemMeshDefinitionComponent( item, this.itemMeshDefinition ) ); } if( !this.itemModels.isEmpty() ) @@ -115,7 +115,7 @@ class ItemRendering implements IItemRendering factory.addBootstrapComponent( new ItemModelComponent( item, this.itemModels ) ); } - Set resources = new HashSet<>( variants ); + Set resources = new HashSet<>( this.variants ); // Register a default item model if neither items by meta nor an item mesh definition exist if( this.itemMeshDefinition == null && this.itemModels.isEmpty() ) @@ -141,13 +141,13 @@ class ItemRendering implements IItemRendering } // TODO : 1.12 - builtInModels.forEach( factory::addBuiltInModel ); + this.builtInModels.forEach( factory::addBuiltInModel ); if( !resources.isEmpty() ) { factory.addBootstrapComponent( new ItemVariantsComponent( item, resources ) ); } - else if( !this.itemModels.isEmpty() || itemMeshDefinition != null ) + else if( !this.itemModels.isEmpty() || this.itemMeshDefinition != null ) { // Adding an empty variant list here will prevent Vanilla from trying to load the default item model in this // case @@ -159,9 +159,9 @@ class ItemRendering implements IItemRendering factory.addBootstrapComponent( new ItemVariantsComponent( item, Collections.emptyList() ) ); } - if( itemColor != null ) + if( this.itemColor != null ) { - factory.addBootstrapComponent( new ItemColorComponent( item, itemColor ) ); + factory.addBootstrapComponent( new ItemColorComponent( item, this.itemColor ) ); } } @@ -178,7 +178,7 @@ class ItemRendering implements IItemRendering @Override protected ModelResourceLocation getModelResourceLocation( IBlockState state ) { - return new ModelResourceLocation( registryName, getPropertyString( state.getProperties() ) ); + return new ModelResourceLocation( this.registryName, this.getPropertyString( state.getProperties() ) ); } } } diff --git a/src/main/java/appeng/bootstrap/components/BlockColorComponent.java b/src/main/java/appeng/bootstrap/components/BlockColorComponent.java index 41f46999d..9ae9de3dd 100644 --- a/src/main/java/appeng/bootstrap/components/BlockColorComponent.java +++ b/src/main/java/appeng/bootstrap/components/BlockColorComponent.java @@ -41,7 +41,7 @@ public class BlockColorComponent implements InitComponent @Override public void initialize( Side side ) { - Minecraft.getMinecraft().getBlockColors().registerBlockColorHandler( blockColor, block ); + Minecraft.getMinecraft().getBlockColors().registerBlockColorHandler( this.blockColor, this.block ); } } diff --git a/src/main/java/appeng/bootstrap/components/BuiltInModelComponent.java b/src/main/java/appeng/bootstrap/components/BuiltInModelComponent.java index 51a3e4988..5810b8ef6 100644 --- a/src/main/java/appeng/bootstrap/components/BuiltInModelComponent.java +++ b/src/main/java/appeng/bootstrap/components/BuiltInModelComponent.java @@ -42,16 +42,16 @@ public class BuiltInModelComponent implements PreInitComponent public void addModel( String path, IModel model ) { - Preconditions.checkState( !hasInitialized ); - builtInModels.put( path, model ); + Preconditions.checkState( !this.hasInitialized ); + this.builtInModels.put( path, model ); } @Override public void preInitialize( Side side ) { - hasInitialized = true; + this.hasInitialized = true; - BuiltInModelLoader loader = new BuiltInModelLoader( builtInModels ); + BuiltInModelLoader loader = new BuiltInModelLoader( this.builtInModels ); ModelLoaderRegistry.registerLoader( loader ); } } diff --git a/src/main/java/appeng/bootstrap/components/ItemColorComponent.java b/src/main/java/appeng/bootstrap/components/ItemColorComponent.java index 4a200e2ce..dd3540a9d 100644 --- a/src/main/java/appeng/bootstrap/components/ItemColorComponent.java +++ b/src/main/java/appeng/bootstrap/components/ItemColorComponent.java @@ -41,6 +41,6 @@ public class ItemColorComponent implements InitComponent @Override public void initialize( Side side ) { - Minecraft.getMinecraft().getItemColors().registerItemColorHandler( itemColor, item ); + Minecraft.getMinecraft().getItemColors().registerItemColorHandler( this.itemColor, this.item ); } } diff --git a/src/main/java/appeng/bootstrap/components/ItemMeshDefinitionComponent.java b/src/main/java/appeng/bootstrap/components/ItemMeshDefinitionComponent.java index 6697bae1d..308e24386 100644 --- a/src/main/java/appeng/bootstrap/components/ItemMeshDefinitionComponent.java +++ b/src/main/java/appeng/bootstrap/components/ItemMeshDefinitionComponent.java @@ -47,6 +47,6 @@ public class ItemMeshDefinitionComponent implements InitComponent @Override public void initialize( Side side ) { - Minecraft.getMinecraft().getRenderItem().getItemModelMesher().register( item, meshDefinition ); + Minecraft.getMinecraft().getRenderItem().getItemModelMesher().register( this.item, this.meshDefinition ); } } diff --git a/src/main/java/appeng/bootstrap/components/ItemModelComponent.java b/src/main/java/appeng/bootstrap/components/ItemModelComponent.java index 0d3968359..eb974fb12 100644 --- a/src/main/java/appeng/bootstrap/components/ItemModelComponent.java +++ b/src/main/java/appeng/bootstrap/components/ItemModelComponent.java @@ -52,9 +52,9 @@ public class ItemModelComponent implements InitComponent { ItemModelMesher itemMesher = Minecraft.getMinecraft().getRenderItem().getItemModelMesher(); - modelsByMeta.forEach( ( meta, model ) -> + this.modelsByMeta.forEach( ( meta, model ) -> { - itemMesher.register( item, meta, model ); + itemMesher.register( this.item, meta, model ); } ); } diff --git a/src/main/java/appeng/bootstrap/components/ItemVariantsComponent.java b/src/main/java/appeng/bootstrap/components/ItemVariantsComponent.java index dfad07e32..4ae04ad19 100644 --- a/src/main/java/appeng/bootstrap/components/ItemVariantsComponent.java +++ b/src/main/java/appeng/bootstrap/components/ItemVariantsComponent.java @@ -45,7 +45,7 @@ public class ItemVariantsComponent implements IBootstrapComponent @Override public void preInitialize( Side side ) { - ResourceLocation[] resourceArr = resources.toArray( new ResourceLocation[0] ); - ModelBakery.registerItemVariants( item, resourceArr ); + ResourceLocation[] resourceArr = this.resources.toArray( new ResourceLocation[0] ); + ModelBakery.registerItemVariants( this.item, resourceArr ); } } diff --git a/src/main/java/appeng/bootstrap/components/StateMapperComponent.java b/src/main/java/appeng/bootstrap/components/StateMapperComponent.java index 5d872e767..422bb1356 100644 --- a/src/main/java/appeng/bootstrap/components/StateMapperComponent.java +++ b/src/main/java/appeng/bootstrap/components/StateMapperComponent.java @@ -47,11 +47,11 @@ public class StateMapperComponent implements ModelRegComponent @Override public void modelReg( Side side ) { - ModelLoader.setCustomStateMapper( block, stateMapper ); - if( stateMapper instanceof IResourceManagerReloadListener ) + ModelLoader.setCustomStateMapper( this.block, this.stateMapper ); + if( this.stateMapper instanceof IResourceManagerReloadListener ) { ( (IReloadableResourceManager) Minecraft.getMinecraft().getResourceManager() ) - .registerReloadListener( (IResourceManagerReloadListener) stateMapper ); + .registerReloadListener( (IResourceManagerReloadListener) this.stateMapper ); } } } diff --git a/src/main/java/appeng/bootstrap/components/TesrComponent.java b/src/main/java/appeng/bootstrap/components/TesrComponent.java index 1cadc9531..5c7cef9ce 100644 --- a/src/main/java/appeng/bootstrap/components/TesrComponent.java +++ b/src/main/java/appeng/bootstrap/components/TesrComponent.java @@ -49,6 +49,6 @@ public class TesrComponent implements PreInitComponent // public void modelReg( Side side ) public void preInitialize( Side side ) { - ClientRegistry.bindTileEntitySpecialRenderer( tileEntityClass, tesr ); + ClientRegistry.bindTileEntitySpecialRenderer( this.tileEntityClass, this.tesr ); } } diff --git a/src/main/java/appeng/bootstrap/components/TileEntityComponent.java b/src/main/java/appeng/bootstrap/components/TileEntityComponent.java index 42cd451a8..4dfd017d3 100644 --- a/src/main/java/appeng/bootstrap/components/TileEntityComponent.java +++ b/src/main/java/appeng/bootstrap/components/TileEntityComponent.java @@ -25,16 +25,16 @@ public class TileEntityComponent implements PreInitComponent public void addTileEntity( TileEntityDefinition tileEntityDefinition ) { - if( !tileEntityDefinitions.contains( tileEntityDefinition ) ) + if( !this.tileEntityDefinitions.contains( tileEntityDefinition ) ) { - tileEntityDefinitions.add( tileEntityDefinition ); + this.tileEntityDefinitions.add( tileEntityDefinition ); } } @Override public void preInitialize( Side side ) { - for( TileEntityDefinition tileEntityDefinition : tileEntityDefinitions ) + for( TileEntityDefinition tileEntityDefinition : this.tileEntityDefinitions ) { if( !tileEntityDefinition.isRegistered() ) { diff --git a/src/main/java/appeng/bootstrap/definitions/TileEntityDefinition.java b/src/main/java/appeng/bootstrap/definitions/TileEntityDefinition.java index 210510fc5..e10113ce9 100644 --- a/src/main/java/appeng/bootstrap/definitions/TileEntityDefinition.java +++ b/src/main/java/appeng/bootstrap/definitions/TileEntityDefinition.java @@ -47,7 +47,7 @@ public class TileEntityDefinition public Class getTileEntityClass() { - return tileEntityClass; + return this.tileEntityClass; } public void setName( String name ) @@ -57,16 +57,16 @@ public class TileEntityDefinition public String getName() { - return name; + return this.name; } public boolean isRegistered() { - return isRegistered; + return this.isRegistered; } public void setRegistered( boolean registered ) { - isRegistered = registered; + this.isRegistered = registered; } } diff --git a/src/main/java/appeng/client/UnlistedProperty.java b/src/main/java/appeng/client/UnlistedProperty.java index a55d0701a..7c45fcca8 100644 --- a/src/main/java/appeng/client/UnlistedProperty.java +++ b/src/main/java/appeng/client/UnlistedProperty.java @@ -43,7 +43,7 @@ public class UnlistedProperty implements IUnlistedProperty @Override public String getName() { - return name; + return this.name; } @Override @@ -55,7 +55,7 @@ public class UnlistedProperty implements IUnlistedProperty @Override public Class getType() { - return clazz; + return this.clazz; } @Override diff --git a/src/main/java/appeng/client/gui/AEBaseGui.java b/src/main/java/appeng/client/gui/AEBaseGui.java index b875c9a1a..7b919c2c9 100644 --- a/src/main/java/appeng/client/gui/AEBaseGui.java +++ b/src/main/java/appeng/client/gui/AEBaseGui.java @@ -215,7 +215,7 @@ public abstract class AEBaseGui extends GuiContainer lines.set( i, TextFormatting.GRAY + lines.get( i ) ); } - this.drawHoveringText( lines, x, y, fontRenderer ); + this.drawHoveringText( lines, x, y, this.fontRenderer ); } @Override @@ -715,7 +715,7 @@ public abstract class AEBaseGui extends GuiContainer // Annoying but easier than trying to splice into render item super.drawSlot( new Size1Slot( s ) ); - stackSizeRenderer.renderStackSize( fontRenderer, ( (SlotME) s ).getAEStack(), s.getStack(), s.xPos, s.yPos ); + this.stackSizeRenderer.renderStackSize( this.fontRenderer, ( (SlotME) s ).getAEStack(), s.getStack(), s.xPos, s.yPos ); } catch( final Exception err ) diff --git a/src/main/java/appeng/client/gui/Size1Slot.java b/src/main/java/appeng/client/gui/Size1Slot.java index dcc26bfaa..13170958c 100644 --- a/src/main/java/appeng/client/gui/Size1Slot.java +++ b/src/main/java/appeng/client/gui/Size1Slot.java @@ -34,7 +34,7 @@ class Size1Slot extends Slot @Nonnull public ItemStack getStack() { - ItemStack orgStack = delegate.getStack(); + ItemStack orgStack = this.delegate.getStack(); if( !orgStack.isEmpty() ) { ItemStack modifiedStack = orgStack.copy(); @@ -48,25 +48,25 @@ class Size1Slot extends Slot @Override public boolean getHasStack() { - return delegate.getHasStack(); + return this.delegate.getHasStack(); } @Override public boolean isHere( IInventory inv, int slotIn ) { - return delegate.isHere( inv, slotIn ); + return this.delegate.isHere( inv, slotIn ); } @Override public int getSlotStackLimit() { - return delegate.getSlotStackLimit(); + return this.delegate.getSlotStackLimit(); } @Override public int getItemStackLimit( ItemStack stack ) { - return delegate.getItemStackLimit( stack ); + return this.delegate.getItemStackLimit( stack ); } @Override @@ -74,45 +74,45 @@ class Size1Slot extends Slot @SideOnly( Side.CLIENT ) public String getSlotTexture() { - return delegate.getSlotTexture(); + return this.delegate.getSlotTexture(); } @Override public boolean canTakeStack( EntityPlayer playerIn ) { - return delegate.canTakeStack( playerIn ); + return this.delegate.canTakeStack( playerIn ); } @Override @SideOnly( Side.CLIENT ) public boolean isEnabled() { - return delegate.isEnabled(); + return this.delegate.isEnabled(); } @Override @SideOnly( Side.CLIENT ) public ResourceLocation getBackgroundLocation() { - return delegate.getBackgroundLocation(); + return this.delegate.getBackgroundLocation(); } @Override @SideOnly( Side.CLIENT ) public TextureAtlasSprite getBackgroundSprite() { - return delegate.getBackgroundSprite(); + return this.delegate.getBackgroundSprite(); } @Override public int getSlotIndex() { - return delegate.getSlotIndex(); + return this.delegate.getSlotIndex(); } @Override public boolean isSameInventory( Slot other ) { - return delegate.isSameInventory( other ); + return this.delegate.isSameInventory( other ); } } diff --git a/src/main/java/appeng/client/gui/implementations/GuiCraftingStatus.java b/src/main/java/appeng/client/gui/implementations/GuiCraftingStatus.java index 4e156b1fe..b6257522b 100644 --- a/src/main/java/appeng/client/gui/implementations/GuiCraftingStatus.java +++ b/src/main/java/appeng/client/gui/implementations/GuiCraftingStatus.java @@ -70,28 +70,28 @@ public class GuiCraftingStatus extends GuiCraftingCPU if( target instanceof WirelessTerminalGuiObject ) { - myIcon = definitions.items().wirelessTerminal().maybeStack( 1 ).orElse( ItemStack.EMPTY ); + this.myIcon = definitions.items().wirelessTerminal().maybeStack( 1 ).orElse( ItemStack.EMPTY ); this.originalGui = GuiBridge.GUI_WIRELESS_TERM; } if( target instanceof PartTerminal ) { - myIcon = parts.terminal().maybeStack( 1 ).orElse( ItemStack.EMPTY ); + this.myIcon = parts.terminal().maybeStack( 1 ).orElse( ItemStack.EMPTY ); this.originalGui = GuiBridge.GUI_ME; } if( target instanceof PartCraftingTerminal ) { - myIcon = parts.craftingTerminal().maybeStack( 1 ).orElse( ItemStack.EMPTY ); + this.myIcon = parts.craftingTerminal().maybeStack( 1 ).orElse( ItemStack.EMPTY ); this.originalGui = GuiBridge.GUI_CRAFTING_TERMINAL; } if( target instanceof PartPatternTerminal ) { - myIcon = parts.patternTerminal().maybeStack( 1 ).orElse( ItemStack.EMPTY ); + this.myIcon = parts.patternTerminal().maybeStack( 1 ).orElse( ItemStack.EMPTY ); this.originalGui = GuiBridge.GUI_PATTERN_TERMINAL; } diff --git a/src/main/java/appeng/client/render/FacadeDispatcherBakedModel.java b/src/main/java/appeng/client/render/FacadeDispatcherBakedModel.java index d31377548..c2af39fa6 100644 --- a/src/main/java/appeng/client/render/FacadeDispatcherBakedModel.java +++ b/src/main/java/appeng/client/render/FacadeDispatcherBakedModel.java @@ -67,13 +67,13 @@ public class FacadeDispatcherBakedModel implements IBakedModel @Override public boolean isAmbientOcclusion() { - return baseModel.isAmbientOcclusion(); + return this.baseModel.isAmbientOcclusion(); } @Override public boolean isGui3d() { - return baseModel.isGui3d(); + return this.baseModel.isGui3d(); } @Override @@ -85,13 +85,13 @@ public class FacadeDispatcherBakedModel implements IBakedModel @Override public TextureAtlasSprite getParticleTexture() { - return baseModel.getParticleTexture(); + return this.baseModel.getParticleTexture(); } @Override public ItemCameraTransforms getItemCameraTransforms() { - return baseModel.getItemCameraTransforms(); + return this.baseModel.getItemCameraTransforms(); } @Override @@ -112,7 +112,7 @@ public class FacadeDispatcherBakedModel implements IBakedModel IBlockState state = itemFacade.getTextureBlockState( stack ); ItemStack textureItem = itemFacade.getTextureItem( stack ); - return new FacadeWithBlockBakedModel( baseModel, state, textureItem, format ); + return new FacadeWithBlockBakedModel( FacadeDispatcherBakedModel.this.baseModel, state, textureItem, FacadeDispatcherBakedModel.this.format ); } }; } diff --git a/src/main/java/appeng/client/render/FacadeWithBlockBakedModel.java b/src/main/java/appeng/client/render/FacadeWithBlockBakedModel.java index 92b5d46fd..ea51e5d84 100644 --- a/src/main/java/appeng/client/render/FacadeWithBlockBakedModel.java +++ b/src/main/java/appeng/client/render/FacadeWithBlockBakedModel.java @@ -73,13 +73,13 @@ public class FacadeWithBlockBakedModel implements IBakedModel if( side == EnumFacing.NORTH ) { List quads = new ArrayList<>( 1 ); - CubeBuilder builder = new CubeBuilder( format, quads ); - FacadeBuilder.TextureAtlasAndTint sprite = FacadeBuilder.getSprite( textureModel, blockState, side, rand ); + CubeBuilder builder = new CubeBuilder( this.format, quads ); + FacadeBuilder.TextureAtlasAndTint sprite = FacadeBuilder.getSprite( this.textureModel, this.blockState, side, rand ); if( sprite != null && sprite.getSprite() != null ) { if( sprite.getTint() != -1 ) { - builder.setColor( Minecraft.getMinecraft().getItemColors().getColorFromItemstack( textureItem, sprite.getTint() ) ); + builder.setColor( Minecraft.getMinecraft().getItemColors().getColorFromItemstack( this.textureItem, sprite.getTint() ) ); } builder.setTexture( sprite.getSprite() ); builder.setDrawFaces( EnumSet.of( EnumFacing.NORTH ) ); @@ -88,13 +88,13 @@ public class FacadeWithBlockBakedModel implements IBakedModel } } - 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 @@ -112,13 +112,13 @@ public class FacadeWithBlockBakedModel implements IBakedModel @Override public TextureAtlasSprite getParticleTexture() { - return baseModel.getParticleTexture(); + return this.baseModel.getParticleTexture(); } @Override public ItemCameraTransforms getItemCameraTransforms() { - return baseModel.getItemCameraTransforms(); + return this.baseModel.getItemCameraTransforms(); } @Override diff --git a/src/main/java/appeng/client/render/FacingToRotation.java b/src/main/java/appeng/client/render/FacingToRotation.java index 5ebac1d4c..e5a732829 100644 --- a/src/main/java/appeng/client/render/FacingToRotation.java +++ b/src/main/java/appeng/client/render/FacingToRotation.java @@ -87,7 +87,7 @@ public enum FacingToRotation public Vector3f getRot() { - return rot; + return this.rot; } public Matrix4f getMat() @@ -97,21 +97,21 @@ public enum FacingToRotation public void glRotateCurrentMat() { - GlStateManager.rotate( rot.x, 1, 0, 0 ); - GlStateManager.rotate( rot.y, 0, 1, 0 ); - GlStateManager.rotate( rot.z, 0, 0, 1 ); + GlStateManager.rotate( this.rot.x, 1, 0, 0 ); + GlStateManager.rotate( this.rot.y, 0, 1, 0 ); + GlStateManager.rotate( this.rot.z, 0, 0, 1 ); } public EnumFacing rotate( EnumFacing facing ) { - return TRSRTransformation.rotate( mat, facing ); + return TRSRTransformation.rotate( this.mat, facing ); } public EnumFacing resultingRotate( EnumFacing facing ) { for( EnumFacing face : EnumFacing.values() ) { - if( rotate( face ) == facing ) + if( this.rotate( face ) == facing ) { return face; } diff --git a/src/main/java/appeng/client/render/StaticBlockColor.java b/src/main/java/appeng/client/render/StaticBlockColor.java index bf5b89a95..366f9dd17 100644 --- a/src/main/java/appeng/client/render/StaticBlockColor.java +++ b/src/main/java/appeng/client/render/StaticBlockColor.java @@ -45,7 +45,7 @@ public class StaticBlockColor implements IBlockColor @Override public int colorMultiplier( IBlockState state, @Nullable IBlockAccess worldIn, @Nullable BlockPos pos, int tintIndex ) { - return color.getVariantByTintIndex( tintIndex ); + return this.color.getVariantByTintIndex( tintIndex ); } } diff --git a/src/main/java/appeng/client/render/StaticItemColor.java b/src/main/java/appeng/client/render/StaticItemColor.java index 33101d719..f6d408154 100644 --- a/src/main/java/appeng/client/render/StaticItemColor.java +++ b/src/main/java/appeng/client/render/StaticItemColor.java @@ -41,7 +41,7 @@ public class StaticItemColor implements IItemColor @Override public int getColorFromItemstack( ItemStack stack, int tintIndex ) { - return color.getVariantByTintIndex( tintIndex ); + return this.color.getVariantByTintIndex( tintIndex ); } } diff --git a/src/main/java/appeng/client/render/cablebus/CableBuilder.java b/src/main/java/appeng/client/render/cablebus/CableBuilder.java index 2aa93227e..e55dfc4dc 100644 --- a/src/main/java/appeng/client/render/cablebus/CableBuilder.java +++ b/src/main/java/appeng/client/render/cablebus/CableBuilder.java @@ -67,7 +67,7 @@ class CableBuilder colorTextures.put( color, bakedTextureGetter.apply( type.getTexture( color ) ) ); } - coreTextures.put( type, colorTextures ); + this.coreTextures.put( type, colorTextures ); } this.connectionTextures = new EnumMap<>( AECableType.class ); @@ -81,10 +81,10 @@ class CableBuilder colorTextures.put( color, bakedTextureGetter.apply( getConnectionTexture( type, color ) ) ); } - connectionTextures.put( type, colorTextures ); + this.connectionTextures.put( type, colorTextures ); } - smartCableTextures = new SmartCableTextures( bakedTextureGetter ); + this.smartCableTextures = new SmartCableTextures( bakedTextureGetter ); } static ResourceLocation getConnectionTexture( AECableType cableType, AEColor color ) @@ -121,14 +121,14 @@ class CableBuilder switch( cableType ) { case GLASS: - addCableCore( CableCoreType.GLASS, color, quadsOut ); + this.addCableCore( CableCoreType.GLASS, color, quadsOut ); break; case COVERED: case SMART: - addCableCore( CableCoreType.COVERED, color, quadsOut ); + this.addCableCore( CableCoreType.COVERED, color, quadsOut ); break; case DENSE_SMART: - addCableCore( CableCoreType.DENSE_SMART, color, quadsOut ); + this.addCableCore( CableCoreType.DENSE_SMART, color, quadsOut ); break; default: } @@ -136,9 +136,9 @@ class CableBuilder public void addCableCore( CableCoreType coreType, AEColor color, List quadsOut ) { - CubeBuilder cubeBuilder = new CubeBuilder( format, quadsOut ); + CubeBuilder cubeBuilder = new CubeBuilder( this.format, quadsOut ); - TextureAtlasSprite texture = coreTextures.get( coreType ).get( color ); + TextureAtlasSprite texture = this.coreTextures.get( coreType ).get( color ); cubeBuilder.setTexture( texture ); switch( coreType ) @@ -157,7 +157,7 @@ class CableBuilder public void addGlassConnection( EnumFacing facing, AEColor cableColor, AECableType connectionType, boolean cableBusAdjacent, List quadsOut ) { - CubeBuilder cubeBuilder = new CubeBuilder( format, quadsOut ); + CubeBuilder cubeBuilder = new CubeBuilder( this.format, quadsOut ); // We render all faces except the one on the connection side cubeBuilder.setDrawFaces( EnumSet.complementOf( EnumSet.of( facing ) ) ); @@ -165,13 +165,13 @@ class CableBuilder // For to-machine connections, use a thicker end-cap for the connection if( connectionType != AECableType.GLASS && !cableBusAdjacent ) { - TextureAtlasSprite texture = connectionTextures.get( AECableType.COVERED ).get( cableColor ); + TextureAtlasSprite texture = this.connectionTextures.get( AECableType.COVERED ).get( cableColor ); cubeBuilder.setTexture( texture ); - addBigCoveredCableSizedCube( facing, cubeBuilder ); + this.addBigCoveredCableSizedCube( facing, cubeBuilder ); } - TextureAtlasSprite texture = connectionTextures.get( AECableType.GLASS ).get( cableColor ); + TextureAtlasSprite texture = this.connectionTextures.get( AECableType.GLASS ).get( cableColor ); cubeBuilder.setTexture( texture ); switch( facing ) @@ -199,13 +199,13 @@ class CableBuilder public void addStraightGlassConnection( EnumFacing facing, AEColor cableColor, List quadsOut ) { - CubeBuilder cubeBuilder = new CubeBuilder( format, quadsOut ); + CubeBuilder cubeBuilder = new CubeBuilder( this.format, quadsOut ); // We render all faces except the connection caps. We can do this because the glass cable is the smallest one // and its ends will always be covered by something cubeBuilder.setDrawFaces( EnumSet.complementOf( EnumSet.of( facing, facing.getOpposite() ) ) ); - TextureAtlasSprite texture = connectionTextures.get( AECableType.GLASS ).get( cableColor ); + TextureAtlasSprite texture = this.connectionTextures.get( AECableType.GLASS ).get( cableColor ); cubeBuilder.setTexture( texture ); switch( facing ) @@ -234,9 +234,9 @@ class CableBuilder return; } - CubeBuilder cubeBuilder = new CubeBuilder( format, quadsOut ); + CubeBuilder cubeBuilder = new CubeBuilder( this.format, quadsOut ); - TextureAtlasSprite texture = connectionTextures.get( AECableType.GLASS ).get( cableColor ); + TextureAtlasSprite texture = this.connectionTextures.get( AECableType.GLASS ).get( cableColor ); cubeBuilder.setTexture( texture ); switch( facing ) @@ -265,18 +265,18 @@ class CableBuilder public void addCoveredConnection( EnumFacing facing, AEColor cableColor, AECableType connectionType, boolean cableBusAdjacent, List quadsOut ) { - CubeBuilder cubeBuilder = new CubeBuilder( format, quadsOut ); + CubeBuilder cubeBuilder = new CubeBuilder( this.format, quadsOut ); // We render all faces except the one on the connection side cubeBuilder.setDrawFaces( EnumSet.complementOf( EnumSet.of( facing ) ) ); - TextureAtlasSprite texture = connectionTextures.get( AECableType.COVERED ).get( cableColor ); + TextureAtlasSprite texture = this.connectionTextures.get( AECableType.COVERED ).get( cableColor ); cubeBuilder.setTexture( texture ); // Draw a covered connection, if anything but glass is requested if( connectionType != AECableType.GLASS && !cableBusAdjacent ) { - addBigCoveredCableSizedCube( facing, cubeBuilder ); + this.addBigCoveredCableSizedCube( facing, cubeBuilder ); } addCoveredCableSizedCube( facing, cubeBuilder ); @@ -284,9 +284,9 @@ class CableBuilder public void addStraightCoveredConnection( EnumFacing facing, AEColor cableColor, List quadsOut ) { - CubeBuilder cubeBuilder = new CubeBuilder( format, quadsOut ); + CubeBuilder cubeBuilder = new CubeBuilder( this.format, quadsOut ); - TextureAtlasSprite texture = connectionTextures.get( AECableType.COVERED ).get( cableColor ); + TextureAtlasSprite texture = this.connectionTextures.get( AECableType.COVERED ).get( cableColor ); cubeBuilder.setTexture( texture ); setStraightCableUVs( cubeBuilder, facing, 5, 11 ); @@ -333,9 +333,9 @@ class CableBuilder return; } - CubeBuilder cubeBuilder = new CubeBuilder( format, quadsOut ); + CubeBuilder cubeBuilder = new CubeBuilder( this.format, quadsOut ); - TextureAtlasSprite texture = connectionTextures.get( AECableType.COVERED ).get( cableColor ); + TextureAtlasSprite texture = this.connectionTextures.get( AECableType.COVERED ).get( cableColor ); cubeBuilder.setTexture( texture ); addCoveredCableSizedCube( facing, distanceFromEdge, cubeBuilder ); @@ -345,32 +345,32 @@ class CableBuilder public void addSmartConnection( EnumFacing facing, AEColor cableColor, AECableType connectionType, boolean cableBusAdjacent, int channels, List quadsOut ) { - CubeBuilder cubeBuilder = new CubeBuilder( format, quadsOut ); + CubeBuilder cubeBuilder = new CubeBuilder( this.format, quadsOut ); // We render all faces except the one on the connection side cubeBuilder.setDrawFaces( EnumSet.complementOf( EnumSet.of( facing ) ) ); - TextureAtlasSprite texture = connectionTextures.get( AECableType.SMART ).get( cableColor ); + TextureAtlasSprite texture = this.connectionTextures.get( AECableType.SMART ).get( cableColor ); cubeBuilder.setTexture( texture ); - TextureAtlasSprite oddChannel = smartCableTextures.getOddTextureForChannels( channels ); - TextureAtlasSprite evenChannel = smartCableTextures.getEvenTextureForChannels( channels ); + TextureAtlasSprite oddChannel = this.smartCableTextures.getOddTextureForChannels( channels ); + TextureAtlasSprite evenChannel = this.smartCableTextures.getEvenTextureForChannels( channels ); // For to-machine connections, use a thicker end-cap for the connection if( connectionType != AECableType.GLASS && !cableBusAdjacent ) { - addBigCoveredCableSizedCube( facing, cubeBuilder ); + this.addBigCoveredCableSizedCube( facing, cubeBuilder ); // Render the channel indicators brightly lit at night cubeBuilder.setRenderFullBright( true ); cubeBuilder.setTexture( oddChannel ); cubeBuilder.setColorRGB( cableColor.blackVariant ); - addBigCoveredCableSizedCube( facing, cubeBuilder ); + this.addBigCoveredCableSizedCube( facing, cubeBuilder ); cubeBuilder.setTexture( evenChannel ); cubeBuilder.setColorRGB( cableColor.whiteVariant ); - addBigCoveredCableSizedCube( facing, cubeBuilder ); + this.addBigCoveredCableSizedCube( facing, cubeBuilder ); // Reset back to normal rendering for the rest cubeBuilder.setRenderFullBright( false ); @@ -393,17 +393,17 @@ class CableBuilder public void addStraightSmartConnection( EnumFacing facing, AEColor cableColor, int channels, List quadsOut ) { - CubeBuilder cubeBuilder = new CubeBuilder( format, quadsOut ); + CubeBuilder cubeBuilder = new CubeBuilder( this.format, quadsOut ); - TextureAtlasSprite texture = connectionTextures.get( AECableType.SMART ).get( cableColor ); + TextureAtlasSprite texture = this.connectionTextures.get( AECableType.SMART ).get( cableColor ); cubeBuilder.setTexture( texture ); setStraightCableUVs( cubeBuilder, facing, 5, 11 ); addStraightCoveredCableSizedCube( facing, cubeBuilder ); - TextureAtlasSprite oddChannel = smartCableTextures.getOddTextureForChannels( channels ); - TextureAtlasSprite evenChannel = smartCableTextures.getEvenTextureForChannels( channels ); + TextureAtlasSprite oddChannel = this.smartCableTextures.getOddTextureForChannels( channels ); + TextureAtlasSprite evenChannel = this.smartCableTextures.getEvenTextureForChannels( channels ); // Render the channel indicators brightly lit at night cubeBuilder.setRenderFullBright( true ); @@ -426,15 +426,15 @@ class CableBuilder return; } - CubeBuilder cubeBuilder = new CubeBuilder( format, quadsOut ); + CubeBuilder cubeBuilder = new CubeBuilder( this.format, quadsOut ); - TextureAtlasSprite texture = connectionTextures.get( AECableType.SMART ).get( cableColor ); + TextureAtlasSprite texture = this.connectionTextures.get( AECableType.SMART ).get( cableColor ); cubeBuilder.setTexture( texture ); addCoveredCableSizedCube( facing, distanceFromEdge, cubeBuilder ); - TextureAtlasSprite oddChannel = smartCableTextures.getOddTextureForChannels( channels ); - TextureAtlasSprite evenChannel = smartCableTextures.getEvenTextureForChannels( channels ); + TextureAtlasSprite oddChannel = this.smartCableTextures.getOddTextureForChannels( channels ); + TextureAtlasSprite evenChannel = this.smartCableTextures.getEvenTextureForChannels( channels ); // Render the channel indicators brightly lit at night cubeBuilder.setRenderFullBright( true ); @@ -453,21 +453,21 @@ class CableBuilder // Dense cables only render their connections as dense if the adjacent blocks actually wants that if( connectionType == AECableType.SMART ) { - addSmartConnection( facing, cableColor, connectionType, cableBusAdjacent, channels, quadsOut ); + this.addSmartConnection( facing, cableColor, connectionType, cableBusAdjacent, channels, quadsOut ); return; } else if( connectionType != AECableType.DENSE_SMART ) { - addCoveredConnection( facing, cableColor, connectionType, cableBusAdjacent, quadsOut ); + this.addCoveredConnection( facing, cableColor, connectionType, cableBusAdjacent, quadsOut ); return; } - CubeBuilder cubeBuilder = new CubeBuilder( format, quadsOut ); + CubeBuilder cubeBuilder = new CubeBuilder( this.format, quadsOut ); // We render all faces except the one on the connection side cubeBuilder.setDrawFaces( EnumSet.complementOf( EnumSet.of( facing ) ) ); - TextureAtlasSprite texture = connectionTextures.get( AECableType.DENSE_SMART ).get( cableColor ); + TextureAtlasSprite texture = this.connectionTextures.get( AECableType.DENSE_SMART ).get( cableColor ); cubeBuilder.setTexture( texture ); addDenseCableSizedCube( facing, cubeBuilder ); @@ -475,8 +475,8 @@ class CableBuilder // Dense cables show used channels in groups of 4, rounded up channels = ( channels + 3 ) / 4; - TextureAtlasSprite oddChannel = smartCableTextures.getOddTextureForChannels( channels ); - TextureAtlasSprite evenChannel = smartCableTextures.getEvenTextureForChannels( channels ); + TextureAtlasSprite oddChannel = this.smartCableTextures.getOddTextureForChannels( channels ); + TextureAtlasSprite evenChannel = this.smartCableTextures.getEvenTextureForChannels( channels ); // Render the channel indicators brightly lit at night cubeBuilder.setRenderFullBright( true ); @@ -497,9 +497,9 @@ class CableBuilder public void addStraightDenseConnection( EnumFacing facing, AEColor cableColor, int channels, List quadsOut ) { - CubeBuilder cubeBuilder = new CubeBuilder( format, quadsOut ); + CubeBuilder cubeBuilder = new CubeBuilder( this.format, quadsOut ); - TextureAtlasSprite texture = connectionTextures.get( AECableType.DENSE_SMART ).get( cableColor ); + TextureAtlasSprite texture = this.connectionTextures.get( AECableType.DENSE_SMART ).get( cableColor ); cubeBuilder.setTexture( texture ); setStraightCableUVs( cubeBuilder, facing, 5, 11 ); @@ -509,8 +509,8 @@ class CableBuilder // Dense cables show used channels in groups of 4, rounded up channels = ( channels + 3 ) / 4; - TextureAtlasSprite oddChannel = smartCableTextures.getOddTextureForChannels( channels ); - TextureAtlasSprite evenChannel = smartCableTextures.getEvenTextureForChannels( channels ); + TextureAtlasSprite oddChannel = this.smartCableTextures.getOddTextureForChannels( channels ); + TextureAtlasSprite evenChannel = this.smartCableTextures.getEvenTextureForChannels( channels ); // Render the channel indicators brightly lit at night cubeBuilder.setRenderFullBright( true ); @@ -723,7 +723,7 @@ class CableBuilder public TextureAtlasSprite getCoreTexture( CableCoreType coreType, AEColor color ) { - return coreTextures.get( coreType ).get( color ); + return this.coreTextures.get( coreType ).get( color ); } } diff --git a/src/main/java/appeng/client/render/cablebus/CableBusBakedModel.java b/src/main/java/appeng/client/render/cablebus/CableBusBakedModel.java index 3bb2613df..177392f49 100644 --- a/src/main/java/appeng/client/render/cablebus/CableBusBakedModel.java +++ b/src/main/java/appeng/client/render/cablebus/CableBusBakedModel.java @@ -89,7 +89,7 @@ public class CableBusBakedModel implements IBakedModel if( layer == BlockRenderLayer.CUTOUT ) { // First, handle the cable at the center of the cable bus - addCableQuads( renderState, quads ); + this.addCableQuads( renderState, quads ); // Then handle attachments for( EnumFacing facing : EnumFacing.values() ) @@ -102,7 +102,7 @@ public class CableBusBakedModel implements IBakedModel for( ResourceLocation model : partModel.getModels() ) { - IBakedModel bakedModel = partModels.get( model ); + IBakedModel bakedModel = this.partModels.get( model ); if( bakedModel == null ) { @@ -120,7 +120,7 @@ public class CableBusBakedModel implements IBakedModel } } - facadeBuilder.addFacades( + this.facadeBuilder.addFacades( layer, renderState.getFacades(), renderState.getBoundingBoxes(), @@ -192,23 +192,23 @@ public class CableBusBakedModel implements IBakedModel switch( cableType ) { case GLASS: - cableBuilder.addStraightGlassConnection( facing, cableColor, quadsOut ); + this.cableBuilder.addStraightGlassConnection( facing, cableColor, quadsOut ); break; case COVERED: - cableBuilder.addStraightCoveredConnection( facing, cableColor, quadsOut ); + this.cableBuilder.addStraightCoveredConnection( facing, cableColor, quadsOut ); break; case SMART: - cableBuilder.addStraightSmartConnection( facing, cableColor, renderState.getChannelsOnSide().get( facing ), quadsOut ); + this.cableBuilder.addStraightSmartConnection( facing, cableColor, renderState.getChannelsOnSide().get( facing ), quadsOut ); break; case DENSE_SMART: - cableBuilder.addStraightDenseConnection( facing, cableColor, renderState.getChannelsOnSide().get( facing ), quadsOut ); + this.cableBuilder.addStraightDenseConnection( facing, cableColor, renderState.getChannelsOnSide().get( facing ), quadsOut ); break; } return; // Don't render the other form of connection } - cableBuilder.addCableCore( renderState.getCoreType(), cableColor, quadsOut ); + this.cableBuilder.addCableCore( renderState.getCoreType(), cableColor, quadsOut ); // Render all internal connections to attachments EnumMap attachmentConnections = renderState.getAttachmentConnections(); @@ -220,13 +220,13 @@ public class CableBusBakedModel implements IBakedModel switch( cableType ) { case GLASS: - cableBuilder.addConstrainedGlassConnection( facing, cableColor, distance, quadsOut ); + this.cableBuilder.addConstrainedGlassConnection( facing, cableColor, distance, quadsOut ); break; case COVERED: - cableBuilder.addConstrainedCoveredConnection( facing, cableColor, distance, quadsOut ); + this.cableBuilder.addConstrainedCoveredConnection( facing, cableColor, distance, quadsOut ); break; case SMART: - cableBuilder.addConstrainedSmartConnection( facing, cableColor, distance, channels, quadsOut ); + this.cableBuilder.addConstrainedSmartConnection( facing, cableColor, distance, channels, quadsOut ); break; case DENSE_SMART: // Dense cables do not render connections to parts since none can be attached @@ -245,16 +245,16 @@ public class CableBusBakedModel implements IBakedModel switch( cableType ) { case GLASS: - cableBuilder.addGlassConnection( facing, cableColor, connectionType, cableBusAdjacent, quadsOut ); + this.cableBuilder.addGlassConnection( facing, cableColor, connectionType, cableBusAdjacent, quadsOut ); break; case COVERED: - cableBuilder.addCoveredConnection( facing, cableColor, connectionType, cableBusAdjacent, quadsOut ); + this.cableBuilder.addCoveredConnection( facing, cableColor, connectionType, cableBusAdjacent, quadsOut ); break; case SMART: - cableBuilder.addSmartConnection( facing, cableColor, connectionType, cableBusAdjacent, channels, quadsOut ); + this.cableBuilder.addSmartConnection( facing, cableColor, connectionType, cableBusAdjacent, channels, quadsOut ); break; case DENSE_SMART: - cableBuilder.addDenseConnection( facing, cableColor, connectionType, cableBusAdjacent, channels, quadsOut ); + this.cableBuilder.addDenseConnection( facing, cableColor, connectionType, cableBusAdjacent, channels, quadsOut ); break; } } @@ -272,7 +272,7 @@ public class CableBusBakedModel implements IBakedModel if( coreType != null ) { - result.add( cableBuilder.getCoreTexture( coreType, cableColor ) ); + result.add( this.cableBuilder.getCoreTexture( coreType, cableColor ) ); } // If no core is present, just use the first part that comes into play @@ -282,7 +282,7 @@ public class CableBusBakedModel implements IBakedModel for( ResourceLocation model : partModel.getModels() ) { - IBakedModel bakedModel = partModels.get( model ); + IBakedModel bakedModel = this.partModels.get( model ); if( bakedModel == null ) { @@ -295,7 +295,7 @@ public class CableBusBakedModel implements IBakedModel // add // it, // so we don't get ugly missing texture break particles. - if( textureMap.getMissingSprite() != particleTexture ) + if( this.textureMap.getMissingSprite() != particleTexture ) { result.add( particleTexture ); } @@ -337,7 +337,7 @@ public class CableBusBakedModel implements IBakedModel @Override public TextureAtlasSprite getParticleTexture() { - return particleTexture; + return this.particleTexture; } @Override diff --git a/src/main/java/appeng/client/render/cablebus/CableBusModel.java b/src/main/java/appeng/client/render/cablebus/CableBusModel.java index 34396562d..67c9ef688 100644 --- a/src/main/java/appeng/client/render/cablebus/CableBusModel.java +++ b/src/main/java/appeng/client/render/cablebus/CableBusModel.java @@ -56,8 +56,8 @@ public class CableBusModel implements IModel @Override public Collection getDependencies() { - partModels.setInitialized( true ); - return partModels.getModels(); + this.partModels.setInitialized( true ); + return this.partModels.getModels(); } @Override @@ -72,7 +72,7 @@ public class CableBusModel implements IModel @Override public IBakedModel bake( IModelState state, VertexFormat format, Function bakedTextureGetter ) { - Map partModels = loadPartModels( state, format, bakedTextureGetter ); + Map partModels = this.loadPartModels( state, format, bakedTextureGetter ); CableBuilder cableBuilder = new CableBuilder( format, bakedTextureGetter ); FacadeBuilder facadeBuilder = new FacadeBuilder( format, bakedTextureGetter ); @@ -88,9 +88,9 @@ public class CableBusModel implements IModel { ImmutableMap.Builder result = ImmutableMap.builder(); - for( ResourceLocation location : partModels.getModels() ) + for( ResourceLocation location : this.partModels.getModels() ) { - IModel model = tryLoadPartModel( location ); + IModel model = this.tryLoadPartModel( location ); IBakedModel bakedModel = model.bake( state, format, bakedTextureGetter ); result.put( location, bakedModel ); } diff --git a/src/main/java/appeng/client/render/cablebus/CableBusRenderState.java b/src/main/java/appeng/client/render/cablebus/CableBusRenderState.java index bde17f527..11bd8840b 100644 --- a/src/main/java/appeng/client/render/cablebus/CableBusRenderState.java +++ b/src/main/java/appeng/client/render/cablebus/CableBusRenderState.java @@ -75,7 +75,7 @@ public class CableBusRenderState public CableCoreType getCoreType() { - return coreType; + return this.coreType; } public void setCoreType( CableCoreType coreType ) @@ -85,7 +85,7 @@ public class CableBusRenderState public AECableType getCableType() { - return cableType; + return this.cableType; } public void setCableType( AECableType cableType ) @@ -95,7 +95,7 @@ public class CableBusRenderState public AEColor getCableColor() { - return cableColor; + return this.cableColor; } public void setCableColor( AEColor cableColor ) @@ -105,12 +105,12 @@ public class CableBusRenderState public EnumMap getChannelsOnSide() { - return channelsOnSide; + return this.channelsOnSide; } public EnumMap getConnectionTypes() { - return connectionTypes; + return this.connectionTypes; } public void setConnectionTypes( EnumMap connectionTypes ) @@ -125,7 +125,7 @@ public class CableBusRenderState public EnumSet getCableBusAdjacent() { - return cableBusAdjacent; + return this.cableBusAdjacent; } public void setCableBusAdjacent( EnumSet cableBusAdjacent ) @@ -135,22 +135,22 @@ public class CableBusRenderState public EnumMap getAttachments() { - return attachments; + return this.attachments; } public EnumMap getAttachmentConnections() { - return attachmentConnections; + return this.attachmentConnections; } public EnumMap getFacades() { - return facades; + return this.facades; } public List getBoundingBoxes() { - return boundingBoxes; + return this.boundingBoxes; } } diff --git a/src/main/java/appeng/client/render/cablebus/CableCoreType.java b/src/main/java/appeng/client/render/cablebus/CableCoreType.java index 33f3ed704..fb89dba76 100644 --- a/src/main/java/appeng/client/render/cablebus/CableCoreType.java +++ b/src/main/java/appeng/client/render/cablebus/CableCoreType.java @@ -79,7 +79,7 @@ public enum CableCoreType public ResourceLocation getTexture( AEColor color ) { - return new ResourceLocation( AppEng.MOD_ID, textureFolder + "/" + color.name().toLowerCase() ); + return new ResourceLocation( AppEng.MOD_ID, this.textureFolder + "/" + color.name().toLowerCase() ); } } \ No newline at end of file diff --git a/src/main/java/appeng/client/render/cablebus/CubeBuilder.java b/src/main/java/appeng/client/render/cablebus/CubeBuilder.java index 2bf80ad1d..1f6ce5c8b 100644 --- a/src/main/java/appeng/client/render/cablebus/CubeBuilder.java +++ b/src/main/java/appeng/client/render/cablebus/CubeBuilder.java @@ -84,21 +84,21 @@ public class CubeBuilder // If brightness is forced to specific values, extend the vertex format to contain the multi-texturing lightmap // offset VertexFormat savedFormat = null; - if( renderFullBright ) + if( this.renderFullBright ) { - savedFormat = format; - format = VertexFormats.getFormatWithLightMap( format ); + savedFormat = this.format; + this.format = VertexFormats.getFormatWithLightMap( this.format ); } - for( EnumFacing face : drawFaces ) + for( EnumFacing face : this.drawFaces ) { - putFace( face, x1, y1, z1, x2, y2, z2 ); + this.putFace( face, x1, y1, z1, x2, y2, z2 ); } // Restore old format if( savedFormat != null ) { - format = savedFormat; + this.format = savedFormat; } } @@ -107,22 +107,22 @@ public class CubeBuilder // If brightness is forced to specific values, extend the vertex format to contain the multi-texturing lightmap // offset VertexFormat savedFormat = null; - if( renderFullBright ) + if( this.renderFullBright ) { - savedFormat = format; - format = new VertexFormat( savedFormat ); - if( !format.getElements().contains( DefaultVertexFormats.TEX_2S ) ) + savedFormat = this.format; + this.format = new VertexFormat( savedFormat ); + if( !this.format.getElements().contains( DefaultVertexFormats.TEX_2S ) ) { - format.addElement( DefaultVertexFormats.TEX_2S ); + this.format.addElement( DefaultVertexFormats.TEX_2S ); } } - putFace( face, x1, y1, z1, x2, y2, z2 ); + this.putFace( face, x1, y1, z1, x2, y2, z2 ); // Restore old format if( savedFormat != null ) { - format = savedFormat; + this.format = savedFormat; } } @@ -137,9 +137,9 @@ public class CubeBuilder private void putFace( EnumFacing face, float x1, float y1, float z1, float x2, float y2, float z2 ) { - TextureAtlasSprite texture = textures.get( face ); + TextureAtlasSprite texture = this.textures.get( face ); - UnpackedBakedQuad.Builder builder = new UnpackedBakedQuad.Builder( format ); + UnpackedBakedQuad.Builder builder = new UnpackedBakedQuad.Builder( this.format ); builder.setTexture( texture ); builder.setQuadOrientation( face ); @@ -156,51 +156,51 @@ public class CubeBuilder } else { - uv = getDefaultUv( face, texture, x1, y1, z1, x2, y2, z2 ); + uv = this.getDefaultUv( face, texture, x1, y1, z1, x2, y2, z2 ); } switch( face ) { case DOWN: - putVertexTR( builder, face, x2, y1, z1, uv ); - putVertexBR( builder, face, x2, y1, z2, uv ); - putVertexBL( builder, face, x1, y1, z2, uv ); - putVertexTL( builder, face, x1, y1, z1, uv ); + this.putVertexTR( builder, face, x2, y1, z1, uv ); + this.putVertexBR( builder, face, x2, y1, z2, uv ); + this.putVertexBL( builder, face, x1, y1, z2, uv ); + this.putVertexTL( builder, face, x1, y1, z1, uv ); break; case UP: - putVertexTL( builder, face, x1, y2, z1, uv ); - putVertexBL( builder, face, x1, y2, z2, uv ); - putVertexBR( builder, face, x2, y2, z2, uv ); - putVertexTR( builder, face, x2, y2, z1, uv ); + this.putVertexTL( builder, face, x1, y2, z1, uv ); + this.putVertexBL( builder, face, x1, y2, z2, uv ); + this.putVertexBR( builder, face, x2, y2, z2, uv ); + this.putVertexTR( builder, face, x2, y2, z1, uv ); break; case NORTH: - putVertexBR( builder, face, x2, y2, z1, uv ); - putVertexTR( builder, face, x2, y1, z1, uv ); - putVertexTL( builder, face, x1, y1, z1, uv ); - putVertexBL( builder, face, x1, y2, z1, uv ); + this.putVertexBR( builder, face, x2, y2, z1, uv ); + this.putVertexTR( builder, face, x2, y1, z1, uv ); + this.putVertexTL( builder, face, x1, y1, z1, uv ); + this.putVertexBL( builder, face, x1, y2, z1, uv ); break; case SOUTH: - putVertexBL( builder, face, x1, y2, z2, uv ); - putVertexTL( builder, face, x1, y1, z2, uv ); - putVertexTR( builder, face, x2, y1, z2, uv ); - putVertexBR( builder, face, x2, y2, z2, uv ); + this.putVertexBL( builder, face, x1, y2, z2, uv ); + this.putVertexTL( builder, face, x1, y1, z2, uv ); + this.putVertexTR( builder, face, x2, y1, z2, uv ); + this.putVertexBR( builder, face, x2, y2, z2, uv ); break; case WEST: - putVertexTL( builder, face, x1, y1, z1, uv ); - putVertexTR( builder, face, x1, y1, z2, uv ); - putVertexBR( builder, face, x1, y2, z2, uv ); - putVertexBL( builder, face, x1, y2, z1, uv ); + this.putVertexTL( builder, face, x1, y1, z1, uv ); + this.putVertexTR( builder, face, x1, y1, z2, uv ); + this.putVertexBR( builder, face, x1, y2, z2, uv ); + this.putVertexBL( builder, face, x1, y2, z1, uv ); break; case EAST: - putVertexBR( builder, face, x2, y2, z1, uv ); - putVertexBL( builder, face, x2, y2, z2, uv ); - putVertexTL( builder, face, x2, y1, z2, uv ); - putVertexTR( builder, face, x2, y1, z1, uv ); + this.putVertexBR( builder, face, x2, y2, z1, uv ); + this.putVertexBL( builder, face, x2, y2, z2, uv ); + this.putVertexTL( builder, face, x2, y1, z2, uv ); + this.putVertexTR( builder, face, x2, y1, z1, uv ); break; } int[] vertexData = builder.build().getVertexData(); - output.add( new BakedQuad( vertexData, -1, face, texture, true, format ) ); + this.output.add( new BakedQuad( vertexData, -1, face, texture, true, this.format ) ); } private UvVector getDefaultUv( EnumFacing face, TextureAtlasSprite texture, float x1, float y1, float z1, float x2, float y2, float z2 ) @@ -256,7 +256,7 @@ public class CubeBuilder { float u, v; - switch( uvRotations[face.ordinal()] ) + switch( this.uvRotations[face.ordinal()] ) { default: case 0: @@ -277,7 +277,7 @@ public class CubeBuilder break; } - putVertex( builder, face, x, y, z, u, v ); + this.putVertex( builder, face, x, y, z, u, v ); } // uv.u2, uv.v1 @@ -285,7 +285,7 @@ public class CubeBuilder { float u, v; - switch( uvRotations[face.ordinal()] ) + switch( this.uvRotations[face.ordinal()] ) { default: case 0: @@ -305,7 +305,7 @@ public class CubeBuilder v = uv.v2; break; } - putVertex( builder, face, x, y, z, u, v ); + this.putVertex( builder, face, x, y, z, u, v ); } // uv.u2, uv.v2 @@ -315,7 +315,7 @@ public class CubeBuilder float u; float v; - switch( uvRotations[face.ordinal()] ) + switch( this.uvRotations[face.ordinal()] ) { default: case 0: @@ -336,7 +336,7 @@ public class CubeBuilder break; } - putVertex( builder, face, x, y, z, u, v ); + this.putVertex( builder, face, x, y, z, u, v ); } // uv.u1, uv.v2 @@ -346,7 +346,7 @@ public class CubeBuilder float u; float v; - switch( uvRotations[face.ordinal()] ) + switch( this.uvRotations[face.ordinal()] ) { default: case 0: @@ -367,7 +367,7 @@ public class CubeBuilder break; } - putVertex( builder, face, x, y, z, u, v ); + this.putVertex( builder, face, x, y, z, u, v ); } private void putVertex( UnpackedBakedQuad.Builder builder, EnumFacing face, float x, float y, float z, float u, float v ) @@ -387,10 +387,10 @@ public class CubeBuilder break; case COLOR: // Color format is RGBA - float r = ( color >> 16 & 0xFF ) / 255f; - float g = ( color >> 8 & 0xFF ) / 255f; - float b = ( color & 0xFF ) / 255f; - float a = ( color >> 24 & 0xFF ) / 255f; + float r = ( this.color >> 16 & 0xFF ) / 255f; + float g = ( this.color >> 8 & 0xFF ) / 255f; + float b = ( this.color & 0xFF ) / 255f; + float a = ( this.color >> 24 & 0xFF ) / 255f; builder.put( i, r, g, b, a ); break; case UV: @@ -418,23 +418,23 @@ public class CubeBuilder { for( EnumFacing face : EnumFacing.values() ) { - textures.put( face, texture ); + this.textures.put( face, texture ); } } public void setTextures( TextureAtlasSprite up, TextureAtlasSprite down, TextureAtlasSprite north, TextureAtlasSprite south, TextureAtlasSprite east, TextureAtlasSprite west ) { - textures.put( EnumFacing.UP, up ); - textures.put( EnumFacing.DOWN, down ); - textures.put( EnumFacing.NORTH, north ); - textures.put( EnumFacing.SOUTH, south ); - textures.put( EnumFacing.EAST, east ); - textures.put( EnumFacing.WEST, west ); + this.textures.put( EnumFacing.UP, up ); + this.textures.put( EnumFacing.DOWN, down ); + this.textures.put( EnumFacing.NORTH, north ); + this.textures.put( EnumFacing.SOUTH, south ); + this.textures.put( EnumFacing.EAST, east ); + this.textures.put( EnumFacing.WEST, west ); } public void setTexture( EnumFacing facing, TextureAtlasSprite sprite ) { - textures.put( facing, sprite ); + this.textures.put( facing, sprite ); } public void setDrawFaces( EnumSet drawFaces ) @@ -452,12 +452,12 @@ public class CubeBuilder */ public void setColorRGB( int color ) { - setColor( color | 0xFF000000 ); + this.setColor( color | 0xFF000000 ); } public void setColorRGB( float r, float g, float b ) { - setColorRGB( (int) ( r * 255 ) << 16 | (int) ( g * 255 ) << 8 | (int) ( b * 255 ) ); + this.setColorRGB( (int) ( r * 255 ) << 16 | (int) ( g * 255 ) << 8 | (int) ( b * 255 ) ); } public void setRenderFullBright( boolean renderFullBright ) @@ -467,7 +467,7 @@ public class CubeBuilder public void setCustomUv( EnumFacing facing, float u1, float v1, float u2, float v2 ) { - customUv.put( facing, new Vector4f( u1, v1, u2, v2 ) ); + this.customUv.put( facing, new Vector4f( u1, v1, u2, v2 ) ); } public void setUvRotation( EnumFacing facing, int rotation ) @@ -481,11 +481,11 @@ public class CubeBuilder rotation = 2; } Preconditions.checkArgument( rotation >= 0 && rotation <= 3, "rotation" ); - uvRotations[facing.ordinal()] = (byte) rotation; + this.uvRotations[facing.ordinal()] = (byte) rotation; } public List getOutput() { - return output; + return this.output; } } diff --git a/src/main/java/appeng/client/render/cablebus/FacadeBuilder.java b/src/main/java/appeng/client/render/cablebus/FacadeBuilder.java index e563eb729..16d67546e 100644 --- a/src/main/java/appeng/client/render/cablebus/FacadeBuilder.java +++ b/src/main/java/appeng/client/render/cablebus/FacadeBuilder.java @@ -80,7 +80,7 @@ public class FacadeBuilder { boolean thinFacades = isUseThinFacades( partBoxes ); - CubeBuilder builder = new CubeBuilder( format, quads ); + CubeBuilder builder = new CubeBuilder( this.format, quads ); facadesState.forEach( ( side, state ) -> { @@ -90,7 +90,7 @@ public class FacadeBuilder try { - addFacade( layer, facadesState, side, cutOutBox, thinFacades, renderStilt, rand, builder ); + this.addFacade( layer, facadesState, side, cutOutBox, thinFacades, renderStilt, rand, builder ); } catch( Throwable t ) { @@ -179,7 +179,7 @@ public class FacadeBuilder // We only render the stilt if we don't intersect with any part directly, and if there's no part on our side if( renderStilt && busBounds == null && layer == BlockRenderLayer.CUTOUT ) { - builder.setTexture( facadeTexture ); + builder.setTexture( this.facadeTexture ); switch( side ) { case DOWN: @@ -251,7 +251,7 @@ public class FacadeBuilder else { builder.setColor( color ); - builder.setTexture( facing, facadeTexture ); + builder.setTexture( facing, this.facadeTexture ); } } @@ -478,12 +478,12 @@ public class FacadeBuilder public TextureAtlasSprite getSprite() { - return sprite; + return this.sprite; } public int getTint() { - return tint; + return this.tint; } } diff --git a/src/main/java/appeng/client/render/cablebus/FacadeRenderState.java b/src/main/java/appeng/client/render/cablebus/FacadeRenderState.java index 33491544c..8f215f995 100644 --- a/src/main/java/appeng/client/render/cablebus/FacadeRenderState.java +++ b/src/main/java/appeng/client/render/cablebus/FacadeRenderState.java @@ -34,17 +34,17 @@ public class FacadeRenderState public IBlockState getSourceBlock() { - return sourceBlock; + return this.sourceBlock; } public EnumSet getOpenFaces() { - return openFaces; + return this.openFaces; } public int resolveTintColor( int tintIndex ) { - return Minecraft.getMinecraft().getItemColors().getColorFromItemstack( textureItem, tintIndex ); + return Minecraft.getMinecraft().getItemColors().getColorFromItemstack( this.textureItem, tintIndex ); } } diff --git a/src/main/java/appeng/client/render/cablebus/QuadRotator.java b/src/main/java/appeng/client/render/cablebus/QuadRotator.java index 56357c562..69de80d7a 100644 --- a/src/main/java/appeng/client/render/cablebus/QuadRotator.java +++ b/src/main/java/appeng/client/render/cablebus/QuadRotator.java @@ -53,7 +53,7 @@ public class QuadRotator for( BakedQuad quad : quads ) { - result.add( rotateQuad( quad, newForward, newUp ) ); + result.add( this.rotateQuad( quad, newForward, newUp ) ); } return result; @@ -82,7 +82,7 @@ public class QuadRotator // Figure out where the position is in the array VertexFormat format = quad.getFormat(); - int posIdx = findPositionOffset( format ) / 4; + int posIdx = this.findPositionOffset( format ) / 4; int stride = format.getNextOffset() / 4; int normalIdx = format.getNormalOffset(); VertexFormatElement.EnumType normalType = null; diff --git a/src/main/java/appeng/client/render/cablebus/SmartCableTextures.java b/src/main/java/appeng/client/render/cablebus/SmartCableTextures.java index 30abe4414..1bbc7eb84 100644 --- a/src/main/java/appeng/client/render/cablebus/SmartCableTextures.java +++ b/src/main/java/appeng/client/render/cablebus/SmartCableTextures.java @@ -48,7 +48,7 @@ public class SmartCableTextures public SmartCableTextures( Function bakedTextureGetter ) { - textures = Arrays.stream( SMART_CHANNELS_TEXTURES ).map( bakedTextureGetter::apply ).toArray( TextureAtlasSprite[]::new ); + this.textures = Arrays.stream( SMART_CHANNELS_TEXTURES ).map( bakedTextureGetter::apply ).toArray( TextureAtlasSprite[]::new ); } /** @@ -58,15 +58,15 @@ public class SmartCableTextures { if( channels < 0 ) { - return textures[0]; + return this.textures[0]; } else if( channels <= 4 ) { - return textures[channels]; + return this.textures[channels]; } else { - return textures[4]; + return this.textures[4]; } } @@ -77,15 +77,15 @@ public class SmartCableTextures { if( channels < 5 ) { - return textures[5]; + return this.textures[5]; } else if( channels <= 8 ) { - return textures[1 + channels]; + return this.textures[1 + channels]; } else { - return textures[9]; + return this.textures[9]; } } } diff --git a/src/main/java/appeng/client/render/crafting/CraftingCubeBakedModel.java b/src/main/java/appeng/client/render/crafting/CraftingCubeBakedModel.java index 0e56a3d0e..2aa1c661a 100644 --- a/src/main/java/appeng/client/render/crafting/CraftingCubeBakedModel.java +++ b/src/main/java/appeng/client/render/crafting/CraftingCubeBakedModel.java @@ -76,12 +76,12 @@ abstract class CraftingCubeBakedModel implements IBakedModel EnumSet connections = getConnections( state ); List 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 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 diff --git a/src/main/java/appeng/client/render/crafting/CraftingCubeModel.java b/src/main/java/appeng/client/render/crafting/CraftingCubeModel.java index 27ea8a4bd..b55624611 100644 --- a/src/main/java/appeng/client/render/crafting/CraftingCubeModel.java +++ b/src/main/java/appeng/client/render/crafting/CraftingCubeModel.java @@ -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 ); } } diff --git a/src/main/java/appeng/client/render/crafting/CraftingCubeRendering.java b/src/main/java/appeng/client/render/crafting/CraftingCubeRendering.java index fd6e7dceb..17f540271 100644 --- a/src/main/java/appeng/client/render/crafting/CraftingCubeRendering.java +++ b/src/main/java/appeng/client/render/crafting/CraftingCubeRendering.java @@ -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() ); } diff --git a/src/main/java/appeng/client/render/crafting/CraftingCubeState.java b/src/main/java/appeng/client/render/crafting/CraftingCubeState.java index b03311819..fec1f8c9d 100644 --- a/src/main/java/appeng/client/render/crafting/CraftingCubeState.java +++ b/src/main/java/appeng/client/render/crafting/CraftingCubeState.java @@ -40,6 +40,6 @@ public final class CraftingCubeState public EnumSet getConnections() { - return connections; + return this.connections; } } diff --git a/src/main/java/appeng/client/render/crafting/ItemEncodedPatternBakedModel.java b/src/main/java/appeng/client/render/crafting/ItemEncodedPatternBakedModel.java index 843651194..951c04938 100644 --- a/src/main/java/appeng/client/render/crafting/ItemEncodedPatternBakedModel.java +++ b/src/main/java/appeng/client/render/crafting/ItemEncodedPatternBakedModel.java @@ -55,55 +55,55 @@ class ItemEncodedPatternBakedModel implements IBakedModel @Override public List 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 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 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 ); } } } diff --git a/src/main/java/appeng/client/render/crafting/LightBakedModel.java b/src/main/java/appeng/client/render/crafting/LightBakedModel.java index aed6c924f..7c7774607 100644 --- a/src/main/java/appeng/client/render/crafting/LightBakedModel.java +++ b/src/main/java/appeng/client/render/crafting/LightBakedModel.java @@ -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 ); } } diff --git a/src/main/java/appeng/client/render/crafting/MonitorBakedModel.java b/src/main/java/appeng/client/render/crafting/MonitorBakedModel.java index 6eb42a33f..00785c7e0 100644 --- a/src/main/java/appeng/client/render/crafting/MonitorBakedModel.java +++ b/src/main/java/appeng/client/render/crafting/MonitorBakedModel.java @@ -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 ); } diff --git a/src/main/java/appeng/client/render/crafting/UnitBakedModel.java b/src/main/java/appeng/client/render/crafting/UnitBakedModel.java index 0d097bac0..b85e10f7f 100644 --- a/src/main/java/appeng/client/render/crafting/UnitBakedModel.java +++ b/src/main/java/appeng/client/render/crafting/UnitBakedModel.java @@ -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 ); } } diff --git a/src/main/java/appeng/client/render/effects/AssemblerFX.java b/src/main/java/appeng/client/render/effects/AssemblerFX.java index 096b7af17..1704e90df 100644 --- a/src/main/java/appeng/client/render/effects/AssemblerFX.java +++ b/src/main/java/appeng/client/render/effects/AssemblerFX.java @@ -53,7 +53,7 @@ public class AssemblerFX extends Particle implements ICanDie @Override public boolean isDead() { - return isExpired; + return this.isExpired; } @Override diff --git a/src/main/java/appeng/client/render/model/AutoRotatingCacheKey.java b/src/main/java/appeng/client/render/model/AutoRotatingCacheKey.java index c6159c950..45ab4a532 100644 --- a/src/main/java/appeng/client/render/model/AutoRotatingCacheKey.java +++ b/src/main/java/appeng/client/render/model/AutoRotatingCacheKey.java @@ -43,22 +43,22 @@ final class AutoRotatingCacheKey public IBlockState getBlockState() { - return blockState; + return this.blockState; } public EnumFacing getForward() { - return forward; + return this.forward; } public EnumFacing getUp() { - return up; + return this.up; } public EnumFacing getSide() { - return side; + return this.side; } @Override @@ -68,22 +68,22 @@ final class AutoRotatingCacheKey { return true; } - if( o == null || getClass() != o.getClass() ) + if( o == null || this.getClass() != o.getClass() ) { return false; } AutoRotatingCacheKey cacheKey = (AutoRotatingCacheKey) o; - return blockState.equals( cacheKey.blockState ) && forward == cacheKey.forward && up == cacheKey.up && side == cacheKey.side; + return this.blockState.equals( cacheKey.blockState ) && this.forward == cacheKey.forward && this.up == cacheKey.up && this.side == cacheKey.side; } @Override public int hashCode() { - int result = blockState.hashCode(); - result = 31 * result + forward.hashCode(); - result = 31 * result + up.hashCode(); - result = 31 * result + ( side != null ? side.hashCode() : 0 ); + int result = this.blockState.hashCode(); + result = 31 * result + this.forward.hashCode(); + result = 31 * result + this.up.hashCode(); + result = 31 * result + ( this.side != null ? this.side.hashCode() : 0 ); return result; } } diff --git a/src/main/java/appeng/client/render/model/AutoRotatingModel.java b/src/main/java/appeng/client/render/model/AutoRotatingModel.java index ab06215fb..ce98fa1cc 100644 --- a/src/main/java/appeng/client/render/model/AutoRotatingModel.java +++ b/src/main/java/appeng/client/render/model/AutoRotatingModel.java @@ -64,7 +64,7 @@ public class AutoRotatingModel implements IBakedModel @Override public List load( AutoRotatingCacheKey key ) throws Exception { - return getRotatedModel( key.getBlockState(), key.getSide(), key.getForward(), key.getUp() ); + return AutoRotatingModel.this.getRotatedModel( key.getBlockState(), key.getSide(), key.getForward(), key.getUp() ); } } ); } @@ -109,37 +109,37 @@ public class AutoRotatingModel implements IBakedModel @Override public boolean isAmbientOcclusion() { - return parent.isAmbientOcclusion(); + return this.parent.isAmbientOcclusion(); } @Override public boolean isGui3d() { - return parent.isGui3d(); + return this.parent.isGui3d(); } @Override public boolean isBuiltInRenderer() { - return parent.isBuiltInRenderer(); + return this.parent.isBuiltInRenderer(); } @Override public TextureAtlasSprite getParticleTexture() { - return parent.getParticleTexture(); + return this.parent.getParticleTexture(); } @Override public ItemCameraTransforms getItemCameraTransforms() { - return parent.getItemCameraTransforms(); + return this.parent.getItemCameraTransforms(); } @Override public ItemOverrideList getOverrides() { - return parent.getOverrides(); + return this.parent.getOverrides(); } @Override @@ -147,7 +147,7 @@ public class AutoRotatingModel implements IBakedModel { if( !( state instanceof IExtendedBlockState ) ) { - return parent.getQuads( state, side, rand ); + return this.parent.getQuads( state, side, rand ); } IExtendedBlockState extState = (IExtendedBlockState) state; @@ -157,7 +157,7 @@ public class AutoRotatingModel implements IBakedModel if( forward == null || up == null ) { - return parent.getQuads( state, side, rand ); + return this.parent.getQuads( state, side, rand ); } // The model has other properties than just forward/up, so it would cause our cache to inadvertendly also cache @@ -166,12 +166,12 @@ public class AutoRotatingModel implements IBakedModel // equals/hashCode correctly if( extState.getUnlistedProperties().size() != 2 ) { - return getRotatedModel( extState, side, forward, up ); + return this.getRotatedModel( extState, side, forward, up ); } AutoRotatingCacheKey key = new AutoRotatingCacheKey( extState.getClean(), forward, up, side ); - return quadCache.getUnchecked( key ); + return this.quadCache.getUnchecked( key ); } public static class VertexRotator extends QuadGatheringTransformer @@ -189,17 +189,17 @@ public class AutoRotatingModel implements IBakedModel public void setParent( IVertexConsumer parent ) { super.setParent( parent ); - if( Objects.equal( getVertexFormat(), parent.getVertexFormat() ) ) + if( Objects.equal( this.getVertexFormat(), parent.getVertexFormat() ) ) { return; } - setVertexFormat( parent.getVertexFormat() ); + this.setVertexFormat( parent.getVertexFormat() ); } @Override protected void processQuad() { - VertexFormat format = parent.getVertexFormat(); + VertexFormat format = this.parent.getVertexFormat(); int count = format.getElementCount(); for( int v = 0; v < 4; v++ ) @@ -209,15 +209,15 @@ public class AutoRotatingModel implements IBakedModel VertexFormatElement element = format.getElement( e ); if( element.getUsage() == VertexFormatElement.EnumUsage.POSITION ) { - parent.put( e, transform( quadData[e][v] ) ); + this.parent.put( e, this.transform( this.quadData[e][v] ) ); } else if( element.getUsage() == VertexFormatElement.EnumUsage.NORMAL ) { - parent.put( e, transformNormal( quadData[e][v] ) ); + this.parent.put( e, this.transformNormal( this.quadData[e][v] ) ); } else { - parent.put( e, quadData[e][v] ); + this.parent.put( e, this.quadData[e][v] ); } } } @@ -232,7 +232,7 @@ public class AutoRotatingModel implements IBakedModel vec.x -= 0.5f; vec.y -= 0.5f; vec.z -= 0.5f; - f2r.getMat().transform( vec ); + this.f2r.getMat().transform( vec ); vec.x += 0.5f; vec.y += 0.5f; vec.z += 0.5f; @@ -243,7 +243,7 @@ public class AutoRotatingModel implements IBakedModel vecc.x -= 0.5f; vecc.y -= 0.5f; vecc.z -= 0.5f; - f2r.getMat().transform( vecc ); + this.f2r.getMat().transform( vecc ); vecc.x += 0.5f; vecc.y += 0.5f; vecc.z += 0.5f; @@ -257,13 +257,13 @@ public class AutoRotatingModel implements IBakedModel private float[] transformNormal( float[] fs ) { - if( face == null ) + if( this.face == null ) { switch( fs.length ) { case 3: Vector3f vec = new Vector3f( fs ); - f2r.getMat().transform( vec ); + this.f2r.getMat().transform( vec ); return new float[] { vec.getX(), vec.getY(), @@ -271,7 +271,7 @@ public class AutoRotatingModel implements IBakedModel }; case 4: Vector4f vec4 = new Vector4f( fs ); - f2r.getMat().transform( vec4 ); + this.f2r.getMat().transform( vec4 ); return new float[] { vec4.getX(), vec4.getY(), @@ -288,7 +288,7 @@ public class AutoRotatingModel implements IBakedModel switch( fs.length ) { case 3: - Vec3i vec = f2r.rotate( face ).getDirectionVec(); + Vec3i vec = this.f2r.rotate( this.face ).getDirectionVec(); return new float[] { vec.getX(), vec.getY(), @@ -296,7 +296,7 @@ public class AutoRotatingModel implements IBakedModel }; case 4: Vector4f veccc = new Vector4f( fs[0], fs[1], fs[2], fs[3] ); - Vec3i vecc = f2r.rotate( face ).getDirectionVec(); + Vec3i vecc = this.f2r.rotate( this.face ).getDirectionVec(); return new float[] { vecc.getX(), vecc.getY(), @@ -313,25 +313,25 @@ public class AutoRotatingModel implements IBakedModel @Override public void setQuadTint( int tint ) { - parent.setQuadTint( tint ); + this.parent.setQuadTint( tint ); } @Override public void setQuadOrientation( EnumFacing orientation ) { - parent.setQuadOrientation( orientation ); + this.parent.setQuadOrientation( orientation ); } @Override public void setApplyDiffuseLighting( boolean diffuse ) { - parent.setApplyDiffuseLighting( diffuse ); + this.parent.setApplyDiffuseLighting( diffuse ); } @Override public void setTexture( TextureAtlasSprite texture ) { - parent.setTexture( texture ); + this.parent.setTexture( texture ); } } } diff --git a/src/main/java/appeng/client/render/model/BiometricCardBakedModel.java b/src/main/java/appeng/client/render/model/BiometricCardBakedModel.java index 34860a8b7..a8c17b8f0 100644 --- a/src/main/java/appeng/client/render/model/BiometricCardBakedModel.java +++ b/src/main/java/appeng/client/render/model/BiometricCardBakedModel.java @@ -63,7 +63,7 @@ class BiometricCardBakedModel implements IBakedModel this.baseModel = baseModel; this.texture = texture; this.hash = hash; - this.generalQuads = ImmutableList.copyOf( buildGeneralQuads() ); + this.generalQuads = ImmutableList.copyOf( this.buildGeneralQuads() ); this.modelCache = modelCache; } @@ -78,16 +78,16 @@ class BiometricCardBakedModel implements IBakedModel public List getQuads( @Nullable IBlockState state, @Nullable EnumFacing side, long rand ) { - List quads = baseModel.getQuads( state, side, rand ); + List quads = this.baseModel.getQuads( state, side, rand ); if( side != null ) { return quads; } - List result = new ArrayList<>( quads.size() + generalQuads.size() ); + List result = new ArrayList<>( quads.size() + this.generalQuads.size() ); result.addAll( quads ); - result.addAll( generalQuads ); + result.addAll( this.generalQuads ); return result; } @@ -95,10 +95,10 @@ class BiometricCardBakedModel implements IBakedModel { CubeBuilder builder = new CubeBuilder( this.format ); - builder.setTexture( texture ); + builder.setTexture( this.texture ); - AEColor col = AEColor.values()[Math.abs( 3 + hash ) % AEColor.values().length]; - if( hash == 0 ) + AEColor col = AEColor.values()[Math.abs( 3 + this.hash ) % AEColor.values().length]; + if( this.hash == 0 ) { col = AEColor.BLACK; } @@ -116,7 +116,7 @@ class BiometricCardBakedModel implements IBakedModel } else { - isLit = ( hash & ( 1 << x ) ) != 0 || ( hash & ( 1 << y ) ) != 0; + isLit = ( this.hash & ( 1 << x ) ) != 0 || ( this.hash & ( 1 << y ) ) != 0; } if( isLit ) @@ -139,31 +139,31 @@ class BiometricCardBakedModel implements IBakedModel @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 public ItemCameraTransforms getItemCameraTransforms() { - return baseModel.getItemCameraTransforms(); + return this.baseModel.getItemCameraTransforms(); } @Override @@ -200,7 +200,7 @@ class BiometricCardBakedModel implements IBakedModel try { - return modelCache.get( hash, () -> new BiometricCardBakedModel( format, baseModel, texture, hash, modelCache ) ); + return BiometricCardBakedModel.this.modelCache.get( hash, () -> new BiometricCardBakedModel( BiometricCardBakedModel.this.format, BiometricCardBakedModel.this.baseModel, BiometricCardBakedModel.this.texture, hash, BiometricCardBakedModel.this.modelCache ) ); } catch( ExecutionException e ) { @@ -215,9 +215,9 @@ class BiometricCardBakedModel implements IBakedModel public Pair handlePerspective( ItemCameraTransforms.TransformType type ) { // Delegate to the base model if possible - if( baseModel instanceof IModel ) + if( this.baseModel instanceof IModel ) { - IBakedModel pam = (IBakedModel) baseModel; + IBakedModel pam = (IBakedModel) this.baseModel; Pair pair = pam.handlePerspective( type ); return Pair.of( this, pair.getValue() ); } diff --git a/src/main/java/appeng/client/render/model/BiometricCardModel.java b/src/main/java/appeng/client/render/model/BiometricCardModel.java index 434440c76..9ebf4c879 100644 --- a/src/main/java/appeng/client/render/model/BiometricCardModel.java +++ b/src/main/java/appeng/client/render/model/BiometricCardModel.java @@ -45,7 +45,7 @@ public class BiometricCardModel implements IModel { TextureAtlasSprite texture = bakedTextureGetter.apply( TEXTURE ); - IBakedModel baseModel = getBaseModel( state, format, bakedTextureGetter ); + IBakedModel baseModel = this.getBaseModel( state, format, bakedTextureGetter ); return new BiometricCardBakedModel( format, baseModel, texture ); } diff --git a/src/main/java/appeng/client/render/model/BuiltInModelLoader.java b/src/main/java/appeng/client/render/model/BuiltInModelLoader.java index 653e4f6b1..1dc76da83 100644 --- a/src/main/java/appeng/client/render/model/BuiltInModelLoader.java +++ b/src/main/java/appeng/client/render/model/BuiltInModelLoader.java @@ -53,19 +53,19 @@ public class BuiltInModelLoader implements ICustomModelLoader return false; } - return builtInModels.containsKey( modelLocation.getResourcePath() ); + return this.builtInModels.containsKey( modelLocation.getResourcePath() ); } @Override public IModel loadModel( ResourceLocation modelLocation ) throws Exception { - return builtInModels.get( modelLocation.getResourcePath() ); + return this.builtInModels.get( modelLocation.getResourcePath() ); } @Override public void onResourceManagerReload( IResourceManager resourceManager ) { - for( IModel model : builtInModels.values() ) + for( IModel model : this.builtInModels.values() ) { if( model instanceof IResourceManagerReloadListener ) { diff --git a/src/main/java/appeng/client/render/model/ColorApplicatorBakedModel.java b/src/main/java/appeng/client/render/model/ColorApplicatorBakedModel.java index 1471b5ece..3657a9025 100644 --- a/src/main/java/appeng/client/render/model/ColorApplicatorBakedModel.java +++ b/src/main/java/appeng/client/render/model/ColorApplicatorBakedModel.java @@ -41,17 +41,17 @@ class ColorApplicatorBakedModel implements IBakedModel this.transforms = map; // Put the tint indices in... Since this is an item model, we are ignoring rand - this.generalQuads = fixQuadTint( null, texDark, texMedium, texBright ); + this.generalQuads = this.fixQuadTint( null, texDark, texMedium, texBright ); this.quadsBySide = new EnumMap<>( EnumFacing.class ); for( EnumFacing facing : EnumFacing.values() ) { - this.quadsBySide.put( facing, fixQuadTint( facing, texDark, texMedium, texBright ) ); + this.quadsBySide.put( facing, this.fixQuadTint( facing, texDark, texMedium, texBright ) ); } } private List fixQuadTint( EnumFacing facing, TextureAtlasSprite texDark, TextureAtlasSprite texMedium, TextureAtlasSprite texBright ) { - List quads = baseModel.getQuads( null, facing, 0 ); + List quads = this.baseModel.getQuads( null, facing, 0 ); List result = new ArrayList<>( quads.size() ); for( BakedQuad quad : quads ) { @@ -88,7 +88,7 @@ class ColorApplicatorBakedModel implements IBakedModel { if( side == null ) { - return generalQuads; + return this.generalQuads; } return this.quadsBySide.get( side ); } @@ -96,42 +96,42 @@ class ColorApplicatorBakedModel implements IBakedModel @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 public ItemCameraTransforms getItemCameraTransforms() { - return baseModel.getItemCameraTransforms(); + return this.baseModel.getItemCameraTransforms(); } @Override public ItemOverrideList getOverrides() { - return baseModel.getOverrides(); + return this.baseModel.getOverrides(); } @Override public Pair handlePerspective( ItemCameraTransforms.TransformType type ) { - return PerspectiveMapWrapper.handlePerspective( this, transforms, type ); + return PerspectiveMapWrapper.handlePerspective( this, this.transforms, type ); } } diff --git a/src/main/java/appeng/client/render/model/ColorApplicatorModel.java b/src/main/java/appeng/client/render/model/ColorApplicatorModel.java index 457e452ac..23a5fa9d9 100644 --- a/src/main/java/appeng/client/render/model/ColorApplicatorModel.java +++ b/src/main/java/appeng/client/render/model/ColorApplicatorModel.java @@ -54,7 +54,7 @@ public class ColorApplicatorModel implements IModel @Override public IBakedModel bake( IModelState state, VertexFormat format, Function bakedTextureGetter ) { - IBakedModel baseModel = getBaseModel( state, format, bakedTextureGetter ); + IBakedModel baseModel = this.getBaseModel( state, format, bakedTextureGetter ); TextureAtlasSprite texDark = bakedTextureGetter.apply( TEXTURE_DARK ); TextureAtlasSprite texMedium = bakedTextureGetter.apply( TEXTURE_MEDIUM ); diff --git a/src/main/java/appeng/client/render/model/DriveBakedModel.java b/src/main/java/appeng/client/render/model/DriveBakedModel.java index 083109478..085ecac3f 100644 --- a/src/main/java/appeng/client/render/model/DriveBakedModel.java +++ b/src/main/java/appeng/client/render/model/DriveBakedModel.java @@ -59,7 +59,7 @@ public class DriveBakedModel implements IBakedModel List result = new ArrayList<>(); - result.addAll( bakedBase.getQuads( state, side, rand ) ); + result.addAll( this.bakedBase.getQuads( state, side, rand ) ); if( side == null && state instanceof IExtendedBlockState ) { @@ -72,7 +72,7 @@ public class DriveBakedModel implements IBakedModel { DriveSlotState slotState = slotsState.getState( row * 2 + col ); - IBakedModel bakedCell = bakedCells.get( slotState ); + IBakedModel bakedCell = this.bakedCells.get( slotState ); Matrix4f transform = new Matrix4f(); transform.setIdentity(); @@ -103,36 +103,36 @@ public class DriveBakedModel implements IBakedModel @Override public boolean isAmbientOcclusion() { - return bakedBase.isAmbientOcclusion(); + return this.bakedBase.isAmbientOcclusion(); } @Override public boolean isGui3d() { - return bakedBase.isGui3d(); + return this.bakedBase.isGui3d(); } @Override public boolean isBuiltInRenderer() { - return bakedBase.isGui3d(); + return this.bakedBase.isGui3d(); } @Override public TextureAtlasSprite getParticleTexture() { - return bakedBase.getParticleTexture(); + return this.bakedBase.getParticleTexture(); } @Override public ItemCameraTransforms getItemCameraTransforms() { - return bakedBase.getItemCameraTransforms(); + return this.bakedBase.getItemCameraTransforms(); } @Override public ItemOverrideList getOverrides() { - return bakedBase.getOverrides(); + return this.bakedBase.getOverrides(); } } diff --git a/src/main/java/appeng/client/render/model/GlassBakedModel.java b/src/main/java/appeng/client/render/model/GlassBakedModel.java index d71c83a99..246ac4816 100644 --- a/src/main/java/appeng/client/render/model/GlassBakedModel.java +++ b/src/main/java/appeng/client/render/model/GlassBakedModel.java @@ -125,13 +125,13 @@ class GlassBakedModel implements IBakedModel v /= 2; } - TextureAtlasSprite glassTexture = glassTextures[texIdx]; + TextureAtlasSprite glassTexture = this.glassTextures[texIdx]; // Render the glass side List quads = new ArrayList<>( 5 ); // At most 5 List corners = RenderHelper.getFaceCorners( side ); - quads.add( createQuad( side, corners, glassTexture, u, v ) ); + quads.add( this.createQuad( side, corners, glassTexture, u, v ) ); /* * This needs some explanation: @@ -144,10 +144,10 @@ class GlassBakedModel implements IBakedModel * That texture had "0101" in its filename to indicate this. */ int edgeBitmask = makeBitmask( glassState, side ); - TextureAtlasSprite sideSprite = frameTextures[edgeBitmask]; + TextureAtlasSprite sideSprite = this.frameTextures[edgeBitmask]; if( sideSprite != null ) { - quads.add( createQuad( side, corners, sideSprite, 0, 0 ) ); + quads.add( this.createQuad( side, corners, sideSprite, 0, 0 ) ); } return quads; @@ -203,7 +203,7 @@ class GlassBakedModel implements IBakedModel private BakedQuad createQuad( EnumFacing side, List corners, TextureAtlasSprite sprite, float uOffset, float vOffset ) { - return createQuad( side, corners.get( 0 ), corners.get( 1 ), corners.get( 2 ), corners.get( 3 ), sprite, uOffset, vOffset ); + return this.createQuad( side, corners.get( 0 ), corners.get( 1 ), corners.get( 2 ), corners.get( 3 ), sprite, uOffset, vOffset ); } private BakedQuad createQuad( EnumFacing side, Vec3d c1, Vec3d c2, Vec3d c3, Vec3d c4, TextureAtlasSprite sprite, float uOffset, float vOffset ) @@ -217,12 +217,12 @@ class GlassBakedModel implements IBakedModel float v1 = MathHelper.clamp( 0 - vOffset, 0, 16 ); float v2 = MathHelper.clamp( 16 - vOffset, 0, 16 ); - UnpackedBakedQuad.Builder builder = new UnpackedBakedQuad.Builder( vertexFormat ); + UnpackedBakedQuad.Builder builder = new UnpackedBakedQuad.Builder( this.vertexFormat ); builder.setTexture( sprite ); - putVertex( builder, normal, c1.x, c1.y, c1.z, sprite, u1, v1 ); - putVertex( builder, normal, c2.x, c2.y, c2.z, sprite, u1, v2 ); - putVertex( builder, normal, c3.x, c3.y, c3.z, sprite, u2, v2 ); - putVertex( builder, normal, c4.x, c4.y, c4.z, sprite, u2, v1 ); + this.putVertex( builder, normal, c1.x, c1.y, c1.z, sprite, u1, v1 ); + this.putVertex( builder, normal, c2.x, c2.y, c2.z, sprite, u1, v2 ); + this.putVertex( builder, normal, c3.x, c3.y, c3.z, sprite, u2, v2 ); + this.putVertex( builder, normal, c4.x, c4.y, c4.z, sprite, u2, v1 ); return builder.build(); } @@ -233,9 +233,9 @@ class GlassBakedModel implements IBakedModel */ private void putVertex( UnpackedBakedQuad.Builder builder, Vec3d normal, double x, double y, double z, TextureAtlasSprite sprite, float u, float v ) { - for( int e = 0; e < vertexFormat.getElementCount(); e++ ) + for( int e = 0; e < this.vertexFormat.getElementCount(); e++ ) { - switch( vertexFormat.getElement( e ).getUsage() ) + switch( this.vertexFormat.getElement( e ).getUsage() ) { case POSITION: builder.put( e, (float) x, (float) y, (float) z, 1.0f ); @@ -244,7 +244,7 @@ class GlassBakedModel implements IBakedModel builder.put( e, 1.0f, 1.0f, 1.0f, 1.0f ); break; case UV: - if( vertexFormat.getElement( e ).getIndex() == 0 ) + if( this.vertexFormat.getElement( e ).getIndex() == 0 ) { u = sprite.getInterpolatedU( u ); v = sprite.getInterpolatedV( v ); @@ -288,7 +288,7 @@ class GlassBakedModel implements IBakedModel @Override public TextureAtlasSprite getParticleTexture() { - return frameTextures[frameTextures.length - 1]; + return this.frameTextures[this.frameTextures.length - 1]; } @Override diff --git a/src/main/java/appeng/client/render/model/MatrixVertexTransformer.java b/src/main/java/appeng/client/render/model/MatrixVertexTransformer.java index 822c58de2..961b3c103 100644 --- a/src/main/java/appeng/client/render/model/MatrixVertexTransformer.java +++ b/src/main/java/appeng/client/render/model/MatrixVertexTransformer.java @@ -45,7 +45,7 @@ final class MatrixVertexTransformer extends QuadGatheringTransformer @Override protected void processQuad() { - VertexFormat format = parent.getVertexFormat(); + VertexFormat format = this.parent.getVertexFormat(); int count = format.getElementCount(); for( int v = 0; v < 4; v++ ) @@ -55,15 +55,15 @@ final class MatrixVertexTransformer extends QuadGatheringTransformer VertexFormatElement element = format.getElement( e ); if( element.getUsage() == VertexFormatElement.EnumUsage.POSITION ) { - parent.put( e, transform( quadData[e][v], element.getElementCount() ) ); + this.parent.put( e, this.transform( this.quadData[e][v], element.getElementCount() ) ); } else if( element.getUsage() == VertexFormatElement.EnumUsage.NORMAL ) { - parent.put( e, transformNormal( quadData[e][v] ) ); + this.parent.put( e, this.transformNormal( this.quadData[e][v] ) ); } else { - parent.put( e, quadData[e][v] ); + this.parent.put( e, this.quadData[e][v] ); } } } @@ -72,25 +72,25 @@ final class MatrixVertexTransformer extends QuadGatheringTransformer @Override public void setQuadTint( int tint ) { - parent.setQuadTint( tint ); + this.parent.setQuadTint( tint ); } @Override public void setQuadOrientation( EnumFacing orientation ) { - parent.setQuadOrientation( orientation ); + this.parent.setQuadOrientation( orientation ); } @Override public void setApplyDiffuseLighting( boolean diffuse ) { - parent.setApplyDiffuseLighting( diffuse ); + this.parent.setApplyDiffuseLighting( diffuse ); } @Override public void setTexture( TextureAtlasSprite texture ) { - parent.setTexture( texture ); + this.parent.setTexture( texture ); } private float[] transform( float[] fs, int elemCount ) @@ -102,7 +102,7 @@ final class MatrixVertexTransformer extends QuadGatheringTransformer vec.x -= 0.5f; vec.y -= 0.5f; vec.z -= 0.5f; - transform.transform( vec ); + this.transform.transform( vec ); vec.x += 0.5f; vec.y += 0.5f; vec.z += 0.5f; @@ -121,7 +121,7 @@ final class MatrixVertexTransformer extends QuadGatheringTransformer vecc.x -= 0.5f; vecc.y -= 0.5f; vecc.z -= 0.5f; - transform.transform( vecc ); + this.transform.transform( vecc ); vecc.x += 0.5f; vecc.y += 0.5f; vecc.z += 0.5f; diff --git a/src/main/java/appeng/client/render/model/SkyCompassBakedModel.java b/src/main/java/appeng/client/render/model/SkyCompassBakedModel.java index d1157ce5b..04676c512 100644 --- a/src/main/java/appeng/client/render/model/SkyCompassBakedModel.java +++ b/src/main/java/appeng/client/render/model/SkyCompassBakedModel.java @@ -83,13 +83,13 @@ public class SkyCompassBakedModel implements IBakedModel else if( state == null ) { // This is used to render a compass pointing in a specific direction when being held in hand - rotation = fallbackRotation; + rotation = this.fallbackRotation; } // Pre-compute the quad count to avoid list resizes List quads = new ArrayList<>(); - quads.addAll( base.getQuads( state, side, rand ) ); + quads.addAll( this.base.getQuads( state, side, rand ) ); // We'll add the pointer as "sideless" if( side == null ) @@ -100,7 +100,7 @@ public class SkyCompassBakedModel implements IBakedModel matrix.setRotation( new AxisAngle4f( 0, 1, 0, rotation ) ); MatrixVertexTransformer transformer = new MatrixVertexTransformer( matrix ); - for( BakedQuad bakedQuad : pointer.getQuads( state, side, rand ) ) + for( BakedQuad bakedQuad : this.pointer.getQuads( state, side, rand ) ) { UnpackedBakedQuad.Builder builder = new UnpackedBakedQuad.Builder( bakedQuad.getFormat() ); @@ -120,7 +120,7 @@ public class SkyCompassBakedModel implements IBakedModel @Override public boolean isAmbientOcclusion() { - return base.isAmbientOcclusion(); + return this.base.isAmbientOcclusion(); } @Override @@ -138,13 +138,13 @@ public class SkyCompassBakedModel implements IBakedModel @Override public TextureAtlasSprite getParticleTexture() { - return base.getParticleTexture(); + return this.base.getParticleTexture(); } @Override public ItemCameraTransforms getItemCameraTransforms() { - return base.getItemCameraTransforms(); + return this.base.getItemCameraTransforms(); } @Override @@ -167,11 +167,11 @@ public class SkyCompassBakedModel implements IBakedModel float offRads = (float) ( player.rotationYaw / 180.0f * (float) Math.PI + Math.PI ); - fallbackRotation = offRads + getAnimatedRotation( player.getPosition(), true ); + SkyCompassBakedModel.this.fallbackRotation = offRads + getAnimatedRotation( player.getPosition(), true ); } else { - fallbackRotation = getAnimatedRotation( null, false ); + SkyCompassBakedModel.this.fallbackRotation = getAnimatedRotation( null, false ); } return originalModel; diff --git a/src/main/java/appeng/client/render/model/UVLModelLoader.java b/src/main/java/appeng/client/render/model/UVLModelLoader.java index df683e362..33a327fd5 100644 --- a/src/main/java/appeng/client/render/model/UVLModelLoader.java +++ b/src/main/java/appeng/client/render/model/UVLModelLoader.java @@ -234,7 +234,7 @@ public enum UVLModelLoader implements ICustomModelLoader modelPath = modelPath.substring( "models/".length() ); } ResourceLocation armatureLocation = new ResourceLocation( modelLocation.getResourceDomain(), "armatures/" + modelPath + ".json" ); - ModelBlockAnimation animation = ModelBlockAnimation.loadVanillaAnimation( resourceManager, armatureLocation ); + ModelBlockAnimation animation = ModelBlockAnimation.loadVanillaAnimation( UVLModelLoader.this.resourceManager, armatureLocation ); ModelBlock model; { Reader reader = null; @@ -249,7 +249,7 @@ public enum UVLModelLoader implements ICustomModelLoader new ResourceLocation( modelLocation.getResourceDomain(), "models/" + modelPath + ".json" ) ); reader = new InputStreamReader( iresource.getInputStream(), Charsets.UTF_8 ); - lvt_5_1_ = JsonUtils.gsonDeserialize( UVLSERIALIZER, reader, ModelBlock.class, false ); + lvt_5_1_ = JsonUtils.gsonDeserialize( this.UVLSERIALIZER, reader, ModelBlock.class, false ); lvt_5_1_.name = modelLocation.toString(); } catch( IOException e ) @@ -265,34 +265,34 @@ public enum UVLModelLoader implements ICustomModelLoader model = lvt_5_1_; } - this.parent = vanillaModelWrapper( getLoader(), modelLocation, model, false, animation ); + this.parent = vanillaModelWrapper( UVLModelLoader.this.getLoader(), modelLocation, model, false, animation ); } @Override public Collection getDependencies() { - return parent.getDependencies(); + return this.parent.getDependencies(); } @Override public Collection getTextures() { - return parent.getTextures(); + return this.parent.getTextures(); } @Override public IBakedModel bake( IModelState state, VertexFormat format, Function bakedTextureGetter ) { - setFaceBakery( getLoader(), new FaceBakeryOverride() ); - IBakedModel model = parent.bake( state, format, bakedTextureGetter ); - setFaceBakery( getLoader(), new FaceBakery() ); + setFaceBakery( UVLModelLoader.this.getLoader(), new FaceBakeryOverride() ); + IBakedModel model = this.parent.bake( state, format, bakedTextureGetter ); + setFaceBakery( UVLModelLoader.this.getLoader(), new FaceBakery() ); return model; } @Override public IModelState getDefaultState() { - return parent.getDefaultState(); + return this.parent.getDefaultState(); } public class BlockPartFaceOverrideSerializer implements JsonDeserializer @@ -306,7 +306,7 @@ public enum UVLModelLoader implements ICustomModelLoader String s = this.parseTexture( jsonobject ); BlockFaceUV blockfaceuv = (BlockFaceUV) p_deserialize_3_.deserialize( jsonobject, BlockFaceUV.class ); BlockPartFace blockFace = new BlockPartFace( enumfacing, i, s, blockfaceuv ); - uvlightmap.put( blockFace, parseUVL( jsonobject ) ); + UVLModelWrapper.this.uvlightmap.put( blockFace, this.parseUVL( jsonobject ) ); return blockFace; } @@ -346,7 +346,7 @@ public enum UVLModelLoader implements ICustomModelLoader { BakedQuad quad = super.makeBakedQuad( posFrom, posTo, face, sprite, facing, modelRotationIn, partRotation, uvLocked, shade ); - Pair brightness = uvlightmap.get( face ); + Pair brightness = UVLModelWrapper.this.uvlightmap.get( face ); if( brightness != null ) { VertexFormat newFormat = VertexFormats.getFormatWithLightMap( quad.getFormat() ); diff --git a/src/main/java/appeng/client/render/renderable/ItemRenderable.java b/src/main/java/appeng/client/render/renderable/ItemRenderable.java index 9d4146571..6a0ffa2b0 100644 --- a/src/main/java/appeng/client/render/renderable/ItemRenderable.java +++ b/src/main/java/appeng/client/render/renderable/ItemRenderable.java @@ -47,7 +47,7 @@ public class ItemRenderable implements Renderable @Override public void renderTileEntityAt( T te, double x, double y, double z, float partialTicks, int destroyStage ) { - Pair pair = f.apply( te ); + Pair pair = this.f.apply( te ); if( pair != null && pair.getLeft() != null ) { GlStateManager.pushMatrix(); diff --git a/src/main/java/appeng/client/render/spatial/SpatialPylonBakedModel.java b/src/main/java/appeng/client/render/spatial/SpatialPylonBakedModel.java index 075f4b638..8f37f299e 100644 --- a/src/main/java/appeng/client/render/spatial/SpatialPylonBakedModel.java +++ b/src/main/java/appeng/client/render/spatial/SpatialPylonBakedModel.java @@ -60,9 +60,9 @@ class SpatialPylonBakedModel implements IBakedModel @Override public List getQuads( @Nullable IBlockState state, @Nullable EnumFacing side, long rand ) { - int flags = getFlags( state ); + int flags = this.getFlags( state ); - CubeBuilder builder = new CubeBuilder( format ); + CubeBuilder builder = new CubeBuilder( this.format ); if( flags != 0 ) { @@ -129,12 +129,12 @@ class SpatialPylonBakedModel implements IBakedModel } } - builder.setTextures( textures.get( getTextureTypeFromSideOutside( flags, ori, EnumFacing.UP ) ), - textures.get( getTextureTypeFromSideOutside( flags, ori, EnumFacing.DOWN ) ), - textures.get( getTextureTypeFromSideOutside( flags, ori, EnumFacing.NORTH ) ), - textures.get( getTextureTypeFromSideOutside( flags, ori, EnumFacing.SOUTH ) ), - textures.get( getTextureTypeFromSideOutside( flags, ori, EnumFacing.EAST ) ), - textures.get( getTextureTypeFromSideOutside( flags, ori, EnumFacing.WEST ) ) ); + builder.setTextures( this.textures.get( getTextureTypeFromSideOutside( flags, ori, EnumFacing.UP ) ), + this.textures.get( getTextureTypeFromSideOutside( flags, ori, EnumFacing.DOWN ) ), + this.textures.get( getTextureTypeFromSideOutside( flags, ori, EnumFacing.NORTH ) ), + this.textures.get( getTextureTypeFromSideOutside( flags, ori, EnumFacing.SOUTH ) ), + this.textures.get( getTextureTypeFromSideOutside( flags, ori, EnumFacing.EAST ) ), + this.textures.get( getTextureTypeFromSideOutside( flags, ori, EnumFacing.WEST ) ) ); builder.addCube( 0, 0, 0, 16, 16, 16 ); if( ( flags & TileSpatialPylon.DISPLAY_POWERED_ENABLED ) == TileSpatialPylon.DISPLAY_POWERED_ENABLED ) @@ -142,20 +142,20 @@ class SpatialPylonBakedModel implements IBakedModel builder.setRenderFullBright( true ); } - builder.setTextures( textures.get( getTextureTypeFromSideInside( flags, ori, EnumFacing.UP ) ), - textures.get( getTextureTypeFromSideInside( flags, ori, EnumFacing.DOWN ) ), - textures.get( getTextureTypeFromSideInside( flags, ori, EnumFacing.NORTH ) ), - textures.get( getTextureTypeFromSideInside( flags, ori, EnumFacing.SOUTH ) ), - textures.get( getTextureTypeFromSideInside( flags, ori, EnumFacing.EAST ) ), - textures.get( getTextureTypeFromSideInside( flags, ori, EnumFacing.WEST ) ) ); + builder.setTextures( this.textures.get( getTextureTypeFromSideInside( flags, ori, EnumFacing.UP ) ), + this.textures.get( getTextureTypeFromSideInside( flags, ori, EnumFacing.DOWN ) ), + this.textures.get( getTextureTypeFromSideInside( flags, ori, EnumFacing.NORTH ) ), + this.textures.get( getTextureTypeFromSideInside( flags, ori, EnumFacing.SOUTH ) ), + this.textures.get( getTextureTypeFromSideInside( flags, ori, EnumFacing.EAST ) ), + this.textures.get( getTextureTypeFromSideInside( flags, ori, EnumFacing.WEST ) ) ); builder.addCube( 0, 0, 0, 16, 16, 16 ); } else { - builder.setTexture( textures.get( SpatialPylonTextureType.BASE ) ); + builder.setTexture( this.textures.get( SpatialPylonTextureType.BASE ) ); builder.addCube( 0, 0, 0, 16, 16, 16 ); - builder.setTexture( textures.get( SpatialPylonTextureType.DIM ) ); + builder.setTexture( this.textures.get( SpatialPylonTextureType.DIM ) ); builder.addCube( 0, 0, 0, 16, 16, 16 ); } diff --git a/src/main/java/appeng/client/render/tesr/ModularTESR.java b/src/main/java/appeng/client/render/tesr/ModularTESR.java index 6f8c921e5..972ce8dda 100644 --- a/src/main/java/appeng/client/render/tesr/ModularTESR.java +++ b/src/main/java/appeng/client/render/tesr/ModularTESR.java @@ -49,7 +49,7 @@ public class ModularTESR extends TileEntitySpecialRenderer GlStateManager.translate( 0.5, 0.5, 0.5 ); FacingToRotation.get( te.getForward(), te.getUp() ).glRotateCurrentMat(); GlStateManager.translate( -0.5, -0.5, -0.5 ); - for( Renderable renderable : renderables ) + for( Renderable renderable : this.renderables ) { renderable.renderTileEntityAt( te, x, y, z, partialTicks, destroyStage ); } @@ -64,7 +64,7 @@ public class ModularTESR extends TileEntitySpecialRenderer GlStateManager.translate( 0.5, 0.5, 0.5 ); FacingToRotation.get( te.getForward(), te.getUp() ).glRotateCurrentMat(); GlStateManager.translate( -0.5, -0.5, -0.5 ); - for( Renderable renderable : renderables ) + for( Renderable renderable : this.renderables ) { renderable.renderTileEntityFast( te, x, y, z, partialTicks, destroyStage, buffer ); } diff --git a/src/main/java/appeng/core/AEConfig.java b/src/main/java/appeng/core/AEConfig.java index 1fac9c96e..c720adb4c 100644 --- a/src/main/java/appeng/core/AEConfig.java +++ b/src/main/java/appeng/core/AEConfig.java @@ -566,82 +566,82 @@ public final class AEConfig extends Configuration implements IConfigurableObject // Getters public boolean isRemoveCrashingItemsOnLoad() { - return removeCrashingItemsOnLoad; + return this.removeCrashingItemsOnLoad; } public int getFormationPlaneEntityLimit() { - return formationPlaneEntityLimit; + return this.formationPlaneEntityLimit; } public boolean isEnableEffects() { - return enableEffects; + return this.enableEffects; } public boolean isUseLargeFonts() { - return useLargeFonts; + return this.useLargeFonts; } public boolean isUseColoredCraftingStatus() { - return useColoredCraftingStatus; + return this.useColoredCraftingStatus; } public boolean isDisableColoredCableRecipesInJEI() { - return disableColoredCableRecipesInJEI; + return this.disableColoredCableRecipesInJEI; } public int getCraftingCalculationTimePerTick() { - return craftingCalculationTimePerTick; + return this.craftingCalculationTimePerTick; } public PowerUnits getSelectedPowerUnit() { - return selectedPowerUnit; + return this.selectedPowerUnit; } public int[] getCraftByStacks() { - return craftByStacks; + return this.craftByStacks; } public int[] getPriorityByStacks() { - return priorityByStacks; + return this.priorityByStacks; } public int[] getLevelByStacks() { - return levelByStacks; + return this.levelByStacks; } public int getStorageBiomeID() { - return storageBiomeID; + return this.storageBiomeID; } public int getStorageProviderID() { - return storageProviderID; + return this.storageProviderID; } public double getSpatialPowerExponent() { - return spatialPowerExponent; + return this.spatialPowerExponent; } public double getSpatialPowerMultiplier() { - return spatialPowerMultiplier; + return this.spatialPowerMultiplier; } public String[] getGrinderOres() { - return grinderOres; + return this.grinderOres; } public Set getGrinderBlackList() @@ -651,117 +651,117 @@ public final class AEConfig extends Configuration implements IConfigurableObject public double getOreDoublePercentage() { - return oreDoublePercentage; + return this.oreDoublePercentage; } public int getWirelessTerminalBattery() { - return wirelessTerminalBattery; + return this.wirelessTerminalBattery; } public int getEntropyManipulatorBattery() { - return entropyManipulatorBattery; + return this.entropyManipulatorBattery; } public int getMatterCannonBattery() { - return matterCannonBattery; + return this.matterCannonBattery; } public int getPortableCellBattery() { - return portableCellBattery; + return this.portableCellBattery; } public int getColorApplicatorBattery() { - return colorApplicatorBattery; + return this.colorApplicatorBattery; } public int getChargedStaffBattery() { - return chargedStaffBattery; + return this.chargedStaffBattery; } public float getSpawnChargedChance() { - return spawnChargedChance; + return this.spawnChargedChance; } public int getQuartzOresPerCluster() { - return quartzOresPerCluster; + return this.quartzOresPerCluster; } public int getQuartzOresClusterAmount() { - return quartzOresClusterAmount; + return this.quartzOresClusterAmount; } public int getChargedChange() { - return chargedChange; + return this.chargedChange; } public int getMinMeteoriteDistance() { - return minMeteoriteDistance; + return this.minMeteoriteDistance; } public int getMinMeteoriteDistanceSq() { - return minMeteoriteDistanceSq; + return this.minMeteoriteDistanceSq; } public double getMeteoriteClusterChance() { - return meteoriteClusterChance; + return this.meteoriteClusterChance; } public int getMeteoriteMaximumSpawnHeight() { - return meteoriteMaximumSpawnHeight; + return this.meteoriteMaximumSpawnHeight; } public int[] getMeteoriteDimensionWhitelist() { - return meteoriteDimensionWhitelist; + return this.meteoriteDimensionWhitelist; } public double getWirelessBaseCost() { - return wirelessBaseCost; + return this.wirelessBaseCost; } public double getWirelessCostMultiplier() { - return wirelessCostMultiplier; + return this.wirelessCostMultiplier; } public double getWirelessTerminalDrainMultiplier() { - return wirelessTerminalDrainMultiplier; + return this.wirelessTerminalDrainMultiplier; } public double getWirelessBaseRange() { - return wirelessBaseRange; + return this.wirelessBaseRange; } public double getWirelessBoosterRangeMultiplier() { - return wirelessBoosterRangeMultiplier; + return this.wirelessBoosterRangeMultiplier; } public double getWirelessBoosterExp() { - return wirelessBoosterExp; + return this.wirelessBoosterExp; } public double getWirelessHighWirelessCount() { - return wirelessHighWirelessCount; + return this.wirelessHighWirelessCount; } // Setters keep visibility as low as possible. diff --git a/src/main/java/appeng/core/ApiDefinitions.java b/src/main/java/appeng/core/ApiDefinitions.java index 34bfeabdf..62e2ebda1 100644 --- a/src/main/java/appeng/core/ApiDefinitions.java +++ b/src/main/java/appeng/core/ApiDefinitions.java @@ -43,10 +43,10 @@ public final class ApiDefinitions implements IDefinitions public ApiDefinitions( final PartModels partModels ) { - this.blocks = new ApiBlocks( registry, partModels ); - this.items = new ApiItems( registry ); - this.materials = new ApiMaterials( registry ); - this.parts = new ApiParts( registry, partModels ); + this.blocks = new ApiBlocks( this.registry, partModels ); + this.items = new ApiItems( this.registry ); + this.materials = new ApiMaterials( this.registry ); + this.parts = new ApiParts( this.registry, partModels ); } // // public void addBlocks( final PartModels partModels ) @@ -61,7 +61,7 @@ public final class ApiDefinitions implements IDefinitions public FeatureFactory getRegistry() { - return registry; + return this.registry; } @Override diff --git a/src/main/java/appeng/core/AppEng.java b/src/main/java/appeng/core/AppEng.java index 522f4f489..88901c33e 100644 --- a/src/main/java/appeng/core/AppEng.java +++ b/src/main/java/appeng/core/AppEng.java @@ -136,7 +136,7 @@ public final class AppEng { AppEng.proxy.missingCoreMod(); } - MinecraftForge.EVENT_BUS.register( registration ); + MinecraftForge.EVENT_BUS.register( this.registration ); final Stopwatch watch = Stopwatch.createStarted(); this.configDirectory = new File( event.getModConfigurationDirectory().getPath(), "AppliedEnergistics2" ); @@ -155,7 +155,7 @@ public final class AppEng this.customRecipeConfig = new CustomRecipeForgeConfiguration( recipeConfiguration ); this.exportConfig = new ForgeExportConfig( recipeConfiguration ); - this.registration.setRecipeInformation( recipeDirectory, customRecipeConfig ); + this.registration.setRecipeInformation( this.recipeDirectory, this.customRecipeConfig ); AELog.info( "Pre Initialization ( started )" ); diff --git a/src/main/java/appeng/core/Registration.java b/src/main/java/appeng/core/Registration.java index 4dba7fd44..cce15d42e 100644 --- a/src/main/java/appeng/core/Registration.java +++ b/src/main/java/appeng/core/Registration.java @@ -175,7 +175,7 @@ public final class Registration public DimensionType getStorageDimensionType() { - return storageDimensionType; + return this.storageDimensionType; } void preInitialize( final FMLPreInitializationEvent event ) @@ -241,7 +241,7 @@ public final class Registration if( config.getStorageProviderID() != -1 ) { - storageDimensionType = DimensionType.register( "Storage Cell", "_cell", config.getStorageProviderID(), StorageWorldProvider.class, false ); + this.storageDimensionType = DimensionType.register( "Storage Cell", "_cell", config.getStorageProviderID(), StorageWorldProvider.class, false ); } if( config.getStorageProviderID() == -1 && force ) @@ -259,7 +259,7 @@ public final class Registration config.setStorageProviderID( config.getStorageProviderID() - 1 ); } - storageDimensionType = DimensionType.register( "Storage Cell", "_cell", config.getStorageProviderID(), StorageWorldProvider.class, false ); + this.storageDimensionType = DimensionType.register( "Storage Cell", "_cell", config.getStorageProviderID(), StorageWorldProvider.class, false ); config.save(); } @@ -418,7 +418,7 @@ public final class Registration // Perform ore camouflage! ItemMaterial.instance.makeUnique(); - final Runnable recipeLoader = new RecipeLoader( recipeDirectory, customRecipeConfig, this.recipeHandler ); + final Runnable recipeLoader = new RecipeLoader( this.recipeDirectory, this.customRecipeConfig, this.recipeHandler ); recipeLoader.run(); this.recipeHandler.injectRecipes(); diff --git a/src/main/java/appeng/core/api/ApiPart.java b/src/main/java/appeng/core/api/ApiPart.java index 8bfaec1aa..a8b580674 100644 --- a/src/main/java/appeng/core/api/ApiPart.java +++ b/src/main/java/appeng/core/api/ApiPart.java @@ -70,7 +70,7 @@ public class ApiPart implements IPartHelper @Override public Class load( CacheKey key ) throws Exception { - return generateCombinedClass( key ); + return ApiPart.this.generateCombinedClass( key ); } } ); @@ -103,7 +103,7 @@ public class ApiPart implements IPartHelper return baseClass; } - return cache.getUnchecked( new CacheKey( baseClass, this.desc ) ); + return this.cache.getUnchecked( new CacheKey( baseClass, this.desc ) ); } private Class generateCombinedClass( CacheKey cacheKey ) @@ -117,7 +117,7 @@ public class ApiPart implements IPartHelper if( !remainingInterfaces.isEmpty() ) { CacheKey parentKey = new CacheKey( cacheKey.getBaseClass(), remainingInterfaces ); - parentClass = cache.getUnchecked( parentKey ); + parentClass = this.cache.getUnchecked( parentKey ); } else { @@ -370,12 +370,12 @@ public class ApiPart implements IPartHelper private Class getBaseClass() { - return baseClass; + return this.baseClass; } private List getInterfaces() { - return interfaces; + return this.interfaces; } @Override @@ -385,21 +385,21 @@ public class ApiPart implements IPartHelper { return true; } - if( o == null || getClass() != o.getClass() ) + if( o == null || this.getClass() != o.getClass() ) { return false; } CacheKey cacheKey = (CacheKey) o; - return baseClass.equals( cacheKey.baseClass ) && interfaces.equals( cacheKey.interfaces ); + return this.baseClass.equals( cacheKey.baseClass ) && this.interfaces.equals( cacheKey.interfaces ); } @Override public int hashCode() { - int result = baseClass.hashCode(); - result = 31 * result + interfaces.hashCode(); + int result = this.baseClass.hashCode(); + result = 31 * result + this.interfaces.hashCode(); return result; } } diff --git a/src/main/java/appeng/core/features/AEFeature.java b/src/main/java/appeng/core/features/AEFeature.java index 2dcb322d9..7af36163f 100644 --- a/src/main/java/appeng/core/features/AEFeature.java +++ b/src/main/java/appeng/core/features/AEFeature.java @@ -204,17 +204,17 @@ public enum AEFeature public String key() { - return key; + return this.key; } public String category() { - return category; + return this.category; } public boolean isEnabled() { - return enabled; + return this.enabled; } private enum Constants diff --git a/src/main/java/appeng/core/features/BlockDefinition.java b/src/main/java/appeng/core/features/BlockDefinition.java index 993deac54..d08d1bf3b 100644 --- a/src/main/java/appeng/core/features/BlockDefinition.java +++ b/src/main/java/appeng/core/features/BlockDefinition.java @@ -65,6 +65,6 @@ public class BlockDefinition extends ItemDefinition implements IBlockDefinition @Override public final boolean isSameAs( final IBlockAccess world, final BlockPos pos ) { - return block.isPresent() && world.getBlockState( pos ).getBlock() == this.block.get(); + return this.block.isPresent() && world.getBlockState( pos ).getBlock() == this.block.get(); } } diff --git a/src/main/java/appeng/core/features/ItemDefinition.java b/src/main/java/appeng/core/features/ItemDefinition.java index 1adb3ae81..b074906a0 100644 --- a/src/main/java/appeng/core/features/ItemDefinition.java +++ b/src/main/java/appeng/core/features/ItemDefinition.java @@ -73,7 +73,7 @@ public class ItemDefinition implements IItemDefinition @Override public final boolean isSameAs( final ItemStack comparableStack ) { - return isEnabled() && Platform.itemComparisons().isEqualItemType( comparableStack, this.maybeStack( 1 ).get() ); + return this.isEnabled() && Platform.itemComparisons().isEqualItemType( comparableStack, this.maybeStack( 1 ).get() ); } } diff --git a/src/main/java/appeng/core/features/registries/P2PTunnelRegistry.java b/src/main/java/appeng/core/features/registries/P2PTunnelRegistry.java index 4a6921fbc..d07c7e58d 100644 --- a/src/main/java/appeng/core/features/registries/P2PTunnelRegistry.java +++ b/src/main/java/appeng/core/features/registries/P2PTunnelRegistry.java @@ -270,6 +270,6 @@ public final class P2PTunnelRegistry implements IP2PTunnelRegistry private void addNewAttunement( final IItemDefinition definition, final TunnelType type ) { - definition.maybeStack( 1 ).ifPresent( definitionStack -> addNewAttunement( definitionStack, type ) ); + definition.maybeStack( 1 ).ifPresent( definitionStack -> this.addNewAttunement( definitionStack, type ) ); } } diff --git a/src/main/java/appeng/core/features/registries/PartModels.java b/src/main/java/appeng/core/features/registries/PartModels.java index f46277470..e90fae3e3 100644 --- a/src/main/java/appeng/core/features/registries/PartModels.java +++ b/src/main/java/appeng/core/features/registries/PartModels.java @@ -38,17 +38,17 @@ public class PartModels implements IPartModels @Override public void registerModels( Collection partModels ) { - if( initialized ) + if( this.initialized ) { throw new IllegalStateException( "Cannot register models after the pre-initialization phase!" ); } - models.addAll( partModels ); + this.models.addAll( partModels ); } public Set getModels() { - return models; + return this.models; } public void setInitialized( boolean initialized ) diff --git a/src/main/java/appeng/core/features/registries/RegistryContainer.java b/src/main/java/appeng/core/features/registries/RegistryContainer.java index dc3c5b3cc..5ddade926 100644 --- a/src/main/java/appeng/core/features/registries/RegistryContainer.java +++ b/src/main/java/appeng/core/features/registries/RegistryContainer.java @@ -144,7 +144,7 @@ public class RegistryContainer implements IRegistryContainer @Override public IPartModels partModels() { - return partModels; + return this.partModels; } } diff --git a/src/main/java/appeng/core/features/registries/grinder/GrinderRecipeManager.java b/src/main/java/appeng/core/features/registries/grinder/GrinderRecipeManager.java index 70d4a88ff..b8a89d725 100644 --- a/src/main/java/appeng/core/features/registries/grinder/GrinderRecipeManager.java +++ b/src/main/java/appeng/core/features/registries/grinder/GrinderRecipeManager.java @@ -353,8 +353,8 @@ public final class GrinderRecipeManager implements IGrinderRegistry, IOreListene { final int prime = 31; int result = 1; - result = prime * result + damage; - result = prime * result + ( ( item == null ) ? 0 : item.hashCode() ); + result = prime * result + this.damage; + result = prime * result + ( ( this.item == null ) ? 0 : this.item.hashCode() ); return result; } @@ -365,26 +365,26 @@ public final class GrinderRecipeManager implements IGrinderRegistry, IOreListene { return true; } - if( obj == null || getClass() != obj.getClass() ) + if( obj == null || this.getClass() != obj.getClass() ) { return false; } CacheKey other = (CacheKey) obj; - if( damage != other.damage ) + if( this.damage != other.damage ) { return false; } - if( item == null ) + if( this.item == null ) { if( other.item != null ) { return false; } } - else if( item != other.item ) + else if( this.item != other.item ) { return false; } diff --git a/src/main/java/appeng/core/features/registries/inscriber/InscriberRegistry.java b/src/main/java/appeng/core/features/registries/inscriber/InscriberRegistry.java index fe43794b1..b5ae2ff22 100644 --- a/src/main/java/appeng/core/features/registries/inscriber/InscriberRegistry.java +++ b/src/main/java/appeng/core/features/registries/inscriber/InscriberRegistry.java @@ -93,8 +93,8 @@ public final class InscriberRegistry implements IInscriberRegistry this.recipes.add( recipe ); - recipe.getTopOptional().ifPresent( optionals::add ); - recipe.getBottomOptional().ifPresent( optionals::add ); + recipe.getTopOptional().ifPresent( this.optionals::add ); + recipe.getBottomOptional().ifPresent( this.optionals::add ); this.inputs.addAll( recipe.getInputs() ); } diff --git a/src/main/java/appeng/core/sync/AppEngPacket.java b/src/main/java/appeng/core/sync/AppEngPacket.java index d6a53c836..dd8557c80 100644 --- a/src/main/java/appeng/core/sync/AppEngPacket.java +++ b/src/main/java/appeng/core/sync/AppEngPacket.java @@ -114,7 +114,7 @@ public abstract class AppEngPacket implements Packet public ByteArrayInputStream getPacketByteArray( ByteBuf stream ) { - return getPacketByteArray( stream, 0, stream.readableBytes() ); + return this.getPacketByteArray( stream, 0, stream.readableBytes() ); } public void setCallParam( final PacketCallState call ) diff --git a/src/main/java/appeng/core/sync/packets/PacketPartPlacement.java b/src/main/java/appeng/core/sync/packets/PacketPartPlacement.java index 189809eae..7e663ce6f 100644 --- a/src/main/java/appeng/core/sync/packets/PacketPartPlacement.java +++ b/src/main/java/appeng/core/sync/packets/PacketPartPlacement.java @@ -77,7 +77,7 @@ public class PacketPartPlacement extends AppEngPacket final EntityPlayerMP sender = (EntityPlayerMP) player; AppEng.proxy.updateRenderMode( sender ); PartPlacement.setEyeHeight( this.eyeHeight ); - PartPlacement.place( sender.getHeldItem( hand ), new BlockPos( this.x, this.y, this.z ), EnumFacing.VALUES[this.face], sender, hand, sender.world, + PartPlacement.place( sender.getHeldItem( this.hand ), new BlockPos( this.x, this.y, this.z ), EnumFacing.VALUES[this.face], sender, this.hand, sender.world, PartPlacement.PlaceType.INTERACT_FIRST_PASS, 0 ); AppEng.proxy.updateRenderMode( null ); } diff --git a/src/main/java/appeng/decorative/slab/BlockSlabCommon.java b/src/main/java/appeng/decorative/slab/BlockSlabCommon.java index 62f6a76e2..71c38ebf2 100644 --- a/src/main/java/appeng/decorative/slab/BlockSlabCommon.java +++ b/src/main/java/appeng/decorative/slab/BlockSlabCommon.java @@ -91,7 +91,7 @@ public abstract class BlockSlabCommon extends BlockSlab @Override public String getUnlocalizedName( int meta ) { - return getUnlocalizedName(); + return this.getUnlocalizedName(); } @Override @@ -125,12 +125,12 @@ public abstract class BlockSlabCommon extends BlockSlab @Nullable public Item getItemDropped( IBlockState state, Random rand, int fortune ) { - return Item.getItemFromBlock( halfSlabBlock ); + return Item.getItemFromBlock( this.halfSlabBlock ); } public ItemStack getItem( World worldIn, BlockPos pos, IBlockState state ) { - return new ItemStack( halfSlabBlock, 1, 0 ); + return new ItemStack( this.halfSlabBlock, 1, 0 ); } } diff --git a/src/main/java/appeng/decorative/solid/BlockQuartzPillar.java b/src/main/java/appeng/decorative/solid/BlockQuartzPillar.java index a1b223ae4..479c9e6c2 100644 --- a/src/main/java/appeng/decorative/solid/BlockQuartzPillar.java +++ b/src/main/java/appeng/decorative/solid/BlockQuartzPillar.java @@ -41,7 +41,7 @@ public class BlockQuartzPillar extends AEBaseBlock implements IOrientableBlock { super( Material.ROCK ); // The upwards facing pillar is the default (i.e. for the item model) - setDefaultState( getDefaultState().withProperty( AXIS_ORIENTATION, EnumFacing.Axis.Y ) ); + this.setDefaultState( this.getDefaultState().withProperty( AXIS_ORIENTATION, EnumFacing.Axis.Y ) ); } @Override diff --git a/src/main/java/appeng/decorative/solid/GlassState.java b/src/main/java/appeng/decorative/solid/GlassState.java index 1ef4ab862..11a4d93c9 100644 --- a/src/main/java/appeng/decorative/solid/GlassState.java +++ b/src/main/java/appeng/decorative/solid/GlassState.java @@ -47,22 +47,22 @@ public final class GlassState public int getX() { - return x; + return this.x; } public int getY() { - return y; + return this.y; } public int getZ() { - return z; + return this.z; } public boolean isFlushWith( EnumFacing side ) { - return flushWith.contains( side ); + return this.flushWith.contains( side ); } } diff --git a/src/main/java/appeng/entity/EntityTinyTNTPrimed.java b/src/main/java/appeng/entity/EntityTinyTNTPrimed.java index 7b12fb656..d9a462c76 100644 --- a/src/main/java/appeng/entity/EntityTinyTNTPrimed.java +++ b/src/main/java/appeng/entity/EntityTinyTNTPrimed.java @@ -122,7 +122,7 @@ public final class EntityTinyTNTPrimed extends EntityTNTPrimed implements IEntit { this.world.spawnParticle( EnumParticleTypes.SMOKE_NORMAL, this.posX, this.posY, this.posZ, 0.0D, 0.0D, 0.0D ); } - this.setFuse( getFuse() - 1 ); + this.setFuse( this.getFuse() - 1 ); } // override :P diff --git a/src/main/java/appeng/helpers/DualityInterface.java b/src/main/java/appeng/helpers/DualityInterface.java index 45e4e7c33..ba75575d6 100644 --- a/src/main/java/appeng/helpers/DualityInterface.java +++ b/src/main/java/appeng/helpers/DualityInterface.java @@ -1285,15 +1285,15 @@ public class DualityInterface implements IGridTickable, IStorageMonitorable, IIn { if( capabilityClass == CapabilityItemHandler.ITEM_HANDLER_CAPABILITY ) { - if( itemHandler == null ) + if( this.itemHandler == null ) { - itemHandler = new InvWrapper( storage ); + this.itemHandler = new InvWrapper( this.storage ); } - return (T) itemHandler; + return (T) this.itemHandler; } else if( capabilityClass == Capabilities.STORAGE_MONITORABLE_ACCESSOR ) { - return (T) accessor; + return (T) this.accessor; } return null; } @@ -1346,7 +1346,7 @@ public class DualityInterface implements IGridTickable, IStorageMonitorable, IIn @Override public IStorageMonitorable getInventory( BaseActionSource src ) { - return getMonitorable( src, DualityInterface.this ); + return DualityInterface.this.getMonitorable( src, DualityInterface.this ); } } diff --git a/src/main/java/appeng/helpers/MetaRotation.java b/src/main/java/appeng/helpers/MetaRotation.java index a743dfdc3..1ac643c3e 100644 --- a/src/main/java/appeng/helpers/MetaRotation.java +++ b/src/main/java/appeng/helpers/MetaRotation.java @@ -68,7 +68,7 @@ public class MetaRotation implements IOrientable if( this.facingProp != null ) { - return state.getValue( facingProp ); + return state.getValue( this.facingProp ); } // TODO 1.10.2-R - Temp @@ -96,9 +96,9 @@ public class MetaRotation implements IOrientable { if( this.w instanceof World ) { - if( facingProp != null ) + if( this.facingProp != null ) { - ( (World) this.w ).setBlockState( this.pos, this.w.getBlockState( this.pos ).withProperty( facingProp, up ) ); + ( (World) this.w ).setBlockState( this.pos, this.w.getBlockState( this.pos ).withProperty( this.facingProp, up ) ); } else { diff --git a/src/main/java/appeng/integration/IntegrationNode.java b/src/main/java/appeng/integration/IntegrationNode.java index ac34d3e1e..a205ec12e 100644 --- a/src/main/java/appeng/integration/IntegrationNode.java +++ b/src/main/java/appeng/integration/IntegrationNode.java @@ -92,7 +92,7 @@ final class IntegrationNode if( enabled ) { - this.mod = type.createInstance(); + this.mod = this.type.createInstance(); } else { diff --git a/src/main/java/appeng/integration/modules/ic2/IC2PowerSinkAdapter.java b/src/main/java/appeng/integration/modules/ic2/IC2PowerSinkAdapter.java index e9f9c0a02..5672d952d 100644 --- a/src/main/java/appeng/integration/modules/ic2/IC2PowerSinkAdapter.java +++ b/src/main/java/appeng/integration/modules/ic2/IC2PowerSinkAdapter.java @@ -70,19 +70,19 @@ public class IC2PowerSinkAdapter extends BasicSink implements IC2PowerSink @Override public double getDemandedEnergy() { - return powerSink.getExternalPowerDemand( PowerUnits.EU, Double.MAX_VALUE ); + return this.powerSink.getExternalPowerDemand( PowerUnits.EU, Double.MAX_VALUE ); } @Override public double injectEnergy( EnumFacing directionFrom, double amount, double voltage ) { - return PowerUnits.EU.convertTo( PowerUnits.AE, powerSink.injectExternalPower( PowerUnits.EU, amount ) ); + return PowerUnits.EU.convertTo( PowerUnits.AE, this.powerSink.injectExternalPower( PowerUnits.EU, amount ) ); } @Override public boolean acceptsEnergyFrom( IEnergyEmitter iEnergyEmitter, EnumFacing side ) { - return validFaces.contains( side ); + return this.validFaces.contains( side ); } @Override diff --git a/src/main/java/appeng/integration/modules/ic2/IC2RecipeInput.java b/src/main/java/appeng/integration/modules/ic2/IC2RecipeInput.java index 8e60f7042..b96693e5e 100644 --- a/src/main/java/appeng/integration/modules/ic2/IC2RecipeInput.java +++ b/src/main/java/appeng/integration/modules/ic2/IC2RecipeInput.java @@ -61,6 +61,6 @@ public class IC2RecipeInput implements IRecipeInput @Override public List getInputs() { - return Collections.unmodifiableList( Collections.singletonList( itemstack ) ); + return Collections.unmodifiableList( Collections.singletonList( this.itemstack ) ); } } diff --git a/src/main/java/appeng/integration/modules/jei/CondenserCategory.java b/src/main/java/appeng/integration/modules/jei/CondenserCategory.java index 275b5507c..7bd8cceb1 100644 --- a/src/main/java/appeng/integration/modules/jei/CondenserCategory.java +++ b/src/main/java/appeng/integration/modules/jei/CondenserCategory.java @@ -83,7 +83,7 @@ class CondenserCategory extends BlankRecipeCategory @Override public String getTitle() { - return localizedName; + return this.localizedName; } /** @@ -101,15 +101,15 @@ class CondenserCategory extends BlankRecipeCategory @Override public IDrawable getBackground() { - return background; + return this.background; } @Override public void drawExtras( Minecraft minecraft ) { - progress.draw( minecraft ); - iconTrash.draw( minecraft ); - iconButton.draw( minecraft ); + this.progress.draw( minecraft ); + this.iconTrash.draw( minecraft ); + this.iconButton.draw( minecraft ); } @Override @@ -120,7 +120,7 @@ class CondenserCategory extends BlankRecipeCategory // Get all storage cells and cycle them through a fake input slot itemStacks.init( 1, true, 50, 0 ); - itemStacks.set( 1, getViableStorageComponents( recipeWrapper ) ); + itemStacks.set( 1, this.getViableStorageComponents( recipeWrapper ) ); // This only sets the output itemStacks.set( ingredients ); @@ -131,10 +131,10 @@ class CondenserCategory extends BlankRecipeCategory CondenserOutput condenserOutput = recipeWrapper.getCondenserOutput(); IMaterials materials = AEApi.instance().definitions().materials(); List viableComponents = new ArrayList<>(); - materials.cell1kPart().maybeStack( 1 ).ifPresent( itemStack -> addViableComponent( condenserOutput, viableComponents, itemStack ) ); - materials.cell4kPart().maybeStack( 1 ).ifPresent( itemStack -> addViableComponent( condenserOutput, viableComponents, itemStack ) ); - materials.cell16kPart().maybeStack( 1 ).ifPresent( itemStack -> addViableComponent( condenserOutput, viableComponents, itemStack ) ); - materials.cell64kPart().maybeStack( 1 ).ifPresent( itemStack -> addViableComponent( condenserOutput, viableComponents, itemStack ) ); + materials.cell1kPart().maybeStack( 1 ).ifPresent( itemStack -> this.addViableComponent( condenserOutput, viableComponents, itemStack ) ); + materials.cell4kPart().maybeStack( 1 ).ifPresent( itemStack -> this.addViableComponent( condenserOutput, viableComponents, itemStack ) ); + materials.cell16kPart().maybeStack( 1 ).ifPresent( itemStack -> this.addViableComponent( condenserOutput, viableComponents, itemStack ) ); + materials.cell64kPart().maybeStack( 1 ).ifPresent( itemStack -> this.addViableComponent( condenserOutput, viableComponents, itemStack ) ); return viableComponents; } diff --git a/src/main/java/appeng/integration/modules/jei/CondenserOutputHandler.java b/src/main/java/appeng/integration/modules/jei/CondenserOutputHandler.java index 8f63fa901..cdaa2f42b 100644 --- a/src/main/java/appeng/integration/modules/jei/CondenserOutputHandler.java +++ b/src/main/java/appeng/integration/modules/jei/CondenserOutputHandler.java @@ -67,9 +67,9 @@ class CondenserOutputHandler implements IRecipeHandler switch( recipe ) { case MATTER_BALLS: - return new CondenserOutputWrapper( recipe, matterBall, iconButtonMatterBall ); + return new CondenserOutputWrapper( recipe, this.matterBall, this.iconButtonMatterBall ); case SINGULARITY: - return new CondenserOutputWrapper( recipe, singularity, iconButtonSingularity ); + return new CondenserOutputWrapper( recipe, this.singularity, this.iconButtonSingularity ); default: return null; } @@ -81,9 +81,9 @@ class CondenserOutputHandler implements IRecipeHandler switch( recipe ) { case MATTER_BALLS: - return matterBall != null; + return this.matterBall != null; case SINGULARITY: - return singularity != null; + return this.singularity != null; default: return false; } diff --git a/src/main/java/appeng/integration/modules/jei/CondenserOutputWrapper.java b/src/main/java/appeng/integration/modules/jei/CondenserOutputWrapper.java index ff5df6e95..cfc92e636 100644 --- a/src/main/java/appeng/integration/modules/jei/CondenserOutputWrapper.java +++ b/src/main/java/appeng/integration/modules/jei/CondenserOutputWrapper.java @@ -59,23 +59,23 @@ class CondenserOutputWrapper extends BlankRecipeWrapper @Override public void getIngredients( IIngredients ingredients ) { - ingredients.setOutput( ItemStack.class, outputItem ); + ingredients.setOutput( ItemStack.class, this.outputItem ); } public CondenserOutput getCondenserOutput() { - return condenserOutput; + return this.condenserOutput; } @Nullable @Override public List getTooltipStrings( int mouseX, int mouseY ) { - if( buttonHoverChecker.checkHover( mouseX, mouseY ) ) + if( this.buttonHoverChecker.checkHover( mouseX, mouseY ) ) { String key; - switch( condenserOutput ) + switch( this.condenserOutput ) { case MATTER_BALLS: key = "gui.tooltips.appliedenergistics2.MatterBalls"; @@ -87,7 +87,7 @@ class CondenserOutputWrapper extends BlankRecipeWrapper return Collections.emptyList(); } - return Splitter.on( "\\n" ).splitToList( I18n.format( key, condenserOutput.requiredPower ) ); + return Splitter.on( "\\n" ).splitToList( I18n.format( key, this.condenserOutput.requiredPower ) ); } return Collections.emptyList(); } @@ -95,6 +95,6 @@ class CondenserOutputWrapper extends BlankRecipeWrapper @Override public void drawInfo( Minecraft minecraft, int recipeWidth, int recipeHeight, int mouseX, int mouseY ) { - buttonIcon.draw( minecraft ); + this.buttonIcon.draw( minecraft ); } } diff --git a/src/main/java/appeng/integration/modules/jei/FacadeRecipeWrapper.java b/src/main/java/appeng/integration/modules/jei/FacadeRecipeWrapper.java index 635039992..b5658fb87 100644 --- a/src/main/java/appeng/integration/modules/jei/FacadeRecipeWrapper.java +++ b/src/main/java/appeng/integration/modules/jei/FacadeRecipeWrapper.java @@ -66,18 +66,18 @@ class FacadeRecipeWrapper extends BlankRecipeWrapper implements IShapedCraftingR List input = new ArrayList<>( 9 ); input.add( ItemStack.EMPTY ); - input.add( cableAnchor ); + input.add( this.cableAnchor ); input.add( ItemStack.EMPTY ); - input.add( cableAnchor ); - input.add( textureItem ); - input.add( cableAnchor ); + input.add( this.cableAnchor ); + input.add( this.textureItem ); + input.add( this.cableAnchor ); input.add( ItemStack.EMPTY ); - input.add( cableAnchor ); + input.add( this.cableAnchor ); input.add( ItemStack.EMPTY ); ingredients.setInputs( ItemStack.class, input ); - ingredients.setOutput( ItemStack.class, facade ); + ingredients.setOutput( ItemStack.class, this.facade ); } } diff --git a/src/main/java/appeng/integration/modules/jei/FacadeRegistryPlugin.java b/src/main/java/appeng/integration/modules/jei/FacadeRegistryPlugin.java index 016c5b3e8..3c20d5b23 100644 --- a/src/main/java/appeng/integration/modules/jei/FacadeRegistryPlugin.java +++ b/src/main/java/appeng/integration/modules/jei/FacadeRegistryPlugin.java @@ -66,7 +66,7 @@ class FacadeRegistryPlugin implements IRecipeRegistryPlugin // Looking up if a certain block can be used to make a facade ItemStack itemStack = (ItemStack) focus.getValue(); - if( !itemFacade.createFacadeForItem( itemStack, true ).isEmpty() ) + if( !this.itemFacade.createFacadeForItem( itemStack, true ).isEmpty() ) { return Collections.singletonList( VanillaRecipeCategoryUid.CRAFTING ); } @@ -92,7 +92,7 @@ class FacadeRegistryPlugin implements IRecipeRegistryPlugin { ItemFacade facadeItem = (ItemFacade) itemStack.getItem(); ItemStack textureItem = facadeItem.getTextureItem( itemStack ); - return Collections.singletonList( (T) new FacadeRecipeWrapper( textureItem, cableAnchor, itemStack ) ); + return Collections.singletonList( (T) new FacadeRecipeWrapper( textureItem, this.cableAnchor, itemStack ) ); } } else if( focus.getMode() == IFocus.Mode.INPUT && focus.getValue() instanceof ItemStack ) @@ -100,11 +100,11 @@ class FacadeRegistryPlugin implements IRecipeRegistryPlugin // Looking up if a certain block can be used to make a facade ItemStack itemStack = (ItemStack) focus.getValue(); - ItemStack facade = itemFacade.createFacadeForItem( itemStack, false ); + ItemStack facade = this.itemFacade.createFacadeForItem( itemStack, false ); if( !facade.isEmpty() ) { - return Collections.singletonList( (T) new FacadeRecipeWrapper( itemStack, cableAnchor, facade ) ); + return Collections.singletonList( (T) new FacadeRecipeWrapper( itemStack, this.cableAnchor, facade ) ); } } diff --git a/src/main/java/appeng/integration/modules/jei/GrinderRecipeCategory.java b/src/main/java/appeng/integration/modules/jei/GrinderRecipeCategory.java index b4dc1d7d1..3f5b0f749 100644 --- a/src/main/java/appeng/integration/modules/jei/GrinderRecipeCategory.java +++ b/src/main/java/appeng/integration/modules/jei/GrinderRecipeCategory.java @@ -64,13 +64,13 @@ class GrinderRecipeCategory extends BlankRecipeCategory @Override public String getTitle() { - return localizedName; + return this.localizedName; } @Override public IDrawable getBackground() { - return background; + return this.background; } @Override diff --git a/src/main/java/appeng/integration/modules/jei/GrinderRecipeWrapper.java b/src/main/java/appeng/integration/modules/jei/GrinderRecipeWrapper.java index 7752a5a6f..dcef260b0 100644 --- a/src/main/java/appeng/integration/modules/jei/GrinderRecipeWrapper.java +++ b/src/main/java/appeng/integration/modules/jei/GrinderRecipeWrapper.java @@ -47,11 +47,11 @@ class GrinderRecipeWrapper extends BlankRecipeWrapper @Override public void getIngredients( IIngredients ingredients ) { - ingredients.setInput( ItemStack.class, recipe.getInput() ); + ingredients.setInput( ItemStack.class, this.recipe.getInput() ); List outputs = new ArrayList<>( 3 ); - outputs.add( recipe.getOutput() ); - recipe.getOptionalOutput().ifPresent( outputs::add ); - recipe.getSecondOptionalOutput().ifPresent( outputs::add ); + outputs.add( this.recipe.getOutput() ); + this.recipe.getOptionalOutput().ifPresent( outputs::add ); + this.recipe.getSecondOptionalOutput().ifPresent( outputs::add ); ingredients.setOutputs( ItemStack.class, outputs ); } @@ -67,18 +67,18 @@ class GrinderRecipeWrapper extends BlankRecipeWrapper final float invScale = 1 / scale; GlStateManager.scale( scale, scale, 1 ); - if( recipe.getOptionalOutput() != null ) + if( this.recipe.getOptionalOutput() != null ) { - String text = String.format( "%d%%", (int) ( recipe.getOptionalChance() * 100 ) ); + String text = String.format( "%d%%", (int) ( this.recipe.getOptionalChance() * 100 ) ); float width = fr.getStringWidth( text ) * scale; int xScaled = (int) Math.round( ( x + ( 18 - width ) / 2 ) * invScale ); fr.drawString( text, xScaled, (int) ( 65 * invScale ), Color.gray.getRGB() ); x += 18; } - if( recipe.getSecondOptionalOutput() != null ) + if( this.recipe.getSecondOptionalOutput() != null ) { - String text = String.format( "%d%%", (int) ( recipe.getSecondOptionalChance() * 100 ) ); + String text = String.format( "%d%%", (int) ( this.recipe.getSecondOptionalChance() * 100 ) ); float width = fr.getStringWidth( text ) * scale; int xScaled = (int) Math.round( ( x + ( 18 - width ) / 2 ) * invScale ); fr.drawString( text, xScaled, (int) ( 65 * invScale ), Color.gray.getRGB() ); diff --git a/src/main/java/appeng/integration/modules/jei/InscriberRecipeCategory.java b/src/main/java/appeng/integration/modules/jei/InscriberRecipeCategory.java index 43b498fac..7b4607c8c 100644 --- a/src/main/java/appeng/integration/modules/jei/InscriberRecipeCategory.java +++ b/src/main/java/appeng/integration/modules/jei/InscriberRecipeCategory.java @@ -70,7 +70,7 @@ class InscriberRecipeCategory extends BlankRecipeCategory> inputSlots = new ArrayList<>( 3 ); - inputSlots.add( Collections.singletonList( recipe.getTopOptional().orElse( ItemStack.EMPTY ) ) ); - inputSlots.add( recipe.getInputs() ); - inputSlots.add( Collections.singletonList( recipe.getBottomOptional().orElse( ItemStack.EMPTY ) ) ); + inputSlots.add( Collections.singletonList( this.recipe.getTopOptional().orElse( ItemStack.EMPTY ) ) ); + inputSlots.add( this.recipe.getInputs() ); + inputSlots.add( Collections.singletonList( this.recipe.getBottomOptional().orElse( ItemStack.EMPTY ) ) ); ingredients.setInputLists( ItemStack.class, inputSlots ); - ingredients.setOutput( ItemStack.class, recipe.getOutput() ); + ingredients.setOutput( ItemStack.class, this.recipe.getOutput() ); } } diff --git a/src/main/java/appeng/integration/modules/jei/InscriberRegistryPlugin.java b/src/main/java/appeng/integration/modules/jei/InscriberRegistryPlugin.java index 13e4aa7de..441cd6747 100644 --- a/src/main/java/appeng/integration/modules/jei/InscriberRegistryPlugin.java +++ b/src/main/java/appeng/integration/modules/jei/InscriberRegistryPlugin.java @@ -52,7 +52,7 @@ class InscriberRegistryPlugin implements IRecipeRegistryPlugin if( focus.getMode() == IFocus.Mode.INPUT ) { ItemStack input = (ItemStack) focus.getValue(); - for( ItemStack validInput : inscriber.getInputs() ) + for( ItemStack validInput : this.inscriber.getInputs() ) { } diff --git a/src/main/java/appeng/integration/modules/jei/JEIModule.java b/src/main/java/appeng/integration/modules/jei/JEIModule.java index 0c6273ffc..a20314f25 100644 --- a/src/main/java/appeng/integration/modules/jei/JEIModule.java +++ b/src/main/java/appeng/integration/modules/jei/JEIModule.java @@ -34,25 +34,25 @@ public class JEIModule implements IJEI public IJEI getJei() { - return jei; + return this.jei; } @Override public String getSearchText() { - return jei.getSearchText(); + return this.jei.getSearchText(); } @Override public void setSearchText( String searchText ) { - jei.setSearchText( searchText ); + this.jei.setSearchText( searchText ); } @Override public boolean isEnabled() { - return jei.isEnabled(); + return this.jei.isEnabled(); } } diff --git a/src/main/java/appeng/integration/modules/jei/JEIPlugin.java b/src/main/java/appeng/integration/modules/jei/JEIPlugin.java index 94d82ed96..b572b82ee 100644 --- a/src/main/java/appeng/integration/modules/jei/JEIPlugin.java +++ b/src/main/java/appeng/integration/modules/jei/JEIPlugin.java @@ -59,15 +59,15 @@ public class JEIPlugin extends BlankModPlugin IDefinitions definitions = AEApi.instance().definitions(); - registerFacadeRecipe( definitions, registry ); + this.registerFacadeRecipe( definitions, registry ); - registerInscriberRecipes( definitions, registry ); + this.registerInscriberRecipes( definitions, registry ); - registerCondenserRecipes( definitions, registry ); + this.registerCondenserRecipes( definitions, registry ); - registerGrinderRecipes( definitions, registry ); + this.registerGrinderRecipes( definitions, registry ); - registerDescriptions( definitions, registry ); + this.registerDescriptions( definitions, registry ); // Allow recipe transfer from JEI to crafting and pattern terminal registry.getRecipeTransferRegistry().addRecipeTransferHandler( new RecipeTransferHandler<>( ContainerCraftingTerm.class ), @@ -89,30 +89,30 @@ public class JEIPlugin extends BlankModPlugin { message = GuiText.ChargedQuartzFind.getLocal(); } - addDescription( registry, materials.certusQuartzCrystalCharged(), message ); + this.addDescription( registry, materials.certusQuartzCrystalCharged(), message ); if( AEConfig.instance().isFeatureEnabled( AEFeature.METEORITE_WORLD_GEN ) ) { - addDescription( registry, materials.logicProcessorPress(), GuiText.inWorldCraftingPresses.getLocal() ); - addDescription( registry, materials.calcProcessorPress(), GuiText.inWorldCraftingPresses.getLocal() ); - addDescription( registry, materials.engProcessorPress(), GuiText.inWorldCraftingPresses.getLocal() ); + this.addDescription( registry, materials.logicProcessorPress(), GuiText.inWorldCraftingPresses.getLocal() ); + this.addDescription( registry, materials.calcProcessorPress(), GuiText.inWorldCraftingPresses.getLocal() ); + this.addDescription( registry, materials.engProcessorPress(), GuiText.inWorldCraftingPresses.getLocal() ); } if( AEConfig.instance().isFeatureEnabled( AEFeature.IN_WORLD_FLUIX ) ) { - addDescription( registry, materials.fluixCrystal(), GuiText.inWorldFluix.getLocal() ); + this.addDescription( registry, materials.fluixCrystal(), GuiText.inWorldFluix.getLocal() ); } if( AEConfig.instance().isFeatureEnabled( AEFeature.IN_WORLD_SINGULARITY ) ) { - addDescription( registry, materials.qESingularity(), GuiText.inWorldSingularity.getLocal() ); + this.addDescription( registry, materials.qESingularity(), GuiText.inWorldSingularity.getLocal() ); } if( AEConfig.instance().isFeatureEnabled( AEFeature.IN_WORLD_PURIFICATION ) ) { - addDescription( registry, materials.purifiedCertusQuartzCrystal(), GuiText.inWorldPurificationCertus.getLocal() ); - addDescription( registry, materials.purifiedNetherQuartzCrystal(), GuiText.inWorldPurificationNether.getLocal() ); - addDescription( registry, materials.purifiedFluixCrystal(), GuiText.inWorldPurificationFluix.getLocal() ); + this.addDescription( registry, materials.purifiedCertusQuartzCrystal(), GuiText.inWorldPurificationCertus.getLocal() ); + this.addDescription( registry, materials.purifiedNetherQuartzCrystal(), GuiText.inWorldPurificationNether.getLocal() ); + this.addDescription( registry, materials.purifiedFluixCrystal(), GuiText.inWorldPurificationFluix.getLocal() ); } } diff --git a/src/main/java/appeng/integration/modules/jei/JeiRuntimeAdapter.java b/src/main/java/appeng/integration/modules/jei/JeiRuntimeAdapter.java index 633f17728..5e67a42b2 100644 --- a/src/main/java/appeng/integration/modules/jei/JeiRuntimeAdapter.java +++ b/src/main/java/appeng/integration/modules/jei/JeiRuntimeAdapter.java @@ -45,12 +45,12 @@ class JeiRuntimeAdapter implements IJEI @Override public String getSearchText() { - return Strings.nullToEmpty( runtime.getItemListOverlay().getFilterText() ); + return Strings.nullToEmpty( this.runtime.getItemListOverlay().getFilterText() ); } @Override public void setSearchText( String searchText ) { - runtime.getItemListOverlay().setFilterText( Strings.nullToEmpty( searchText ) ); + this.runtime.getItemListOverlay().setFilterText( Strings.nullToEmpty( searchText ) ); } } diff --git a/src/main/java/appeng/integration/modules/jei/RecipeTransferHandler.java b/src/main/java/appeng/integration/modules/jei/RecipeTransferHandler.java index f78e487f0..7432d031b 100644 --- a/src/main/java/appeng/integration/modules/jei/RecipeTransferHandler.java +++ b/src/main/java/appeng/integration/modules/jei/RecipeTransferHandler.java @@ -59,7 +59,7 @@ class RecipeTransferHandler implements IRecipeTransferHandl @Override public Class getContainerClass() { - return containerClass; + return this.containerClass; } @Nullable diff --git a/src/main/java/appeng/integration/modules/jei/ShapedRecipeWrapper.java b/src/main/java/appeng/integration/modules/jei/ShapedRecipeWrapper.java index 716e25f35..603f1766f 100644 --- a/src/main/java/appeng/integration/modules/jei/ShapedRecipeWrapper.java +++ b/src/main/java/appeng/integration/modules/jei/ShapedRecipeWrapper.java @@ -53,9 +53,9 @@ class ShapedRecipeWrapper extends BlankRecipeWrapper implements IShapedCraftingR { final boolean useSingleItems = AEConfig.instance().disableColoredCableRecipesInJEI(); - Object[] items = recipe.getIIngredients(); - int width = recipe.getWidth(); - int height = recipe.getHeight(); + Object[] items = this.recipe.getIIngredients(); + int width = this.recipe.getWidth(); + int height = this.recipe.getHeight(); List> in = new ArrayList<>( width * height ); @@ -86,18 +86,18 @@ class ShapedRecipeWrapper extends BlankRecipeWrapper implements IShapedCraftingR } ingredients.setInputLists( ItemStack.class, in ); - ingredients.setOutput( ItemStack.class, recipe.getRecipeOutput() ); + ingredients.setOutput( ItemStack.class, this.recipe.getRecipeOutput() ); } @Override public int getWidth() { - return recipe.getWidth(); + return this.recipe.getWidth(); } @Override public int getHeight() { - return recipe.getHeight(); + return this.recipe.getHeight(); } } diff --git a/src/main/java/appeng/items/AEBaseItem.java b/src/main/java/appeng/items/AEBaseItem.java index 35dd7b9a6..2ca11180d 100644 --- a/src/main/java/appeng/items/AEBaseItem.java +++ b/src/main/java/appeng/items/AEBaseItem.java @@ -42,8 +42,8 @@ public abstract class AEBaseItem extends Item @Override public String toString() { - String regName = getRegistryName() != null ? getRegistryName().getResourcePath() : "unregistered"; - return getClass().getSimpleName() + "[" + regName + "]"; + String regName = this.getRegistryName() != null ? this.getRegistryName().getResourcePath() : "unregistered"; + return this.getClass().getSimpleName() + "[" + regName + "]"; } @SideOnly( Side.CLIENT ) @@ -58,7 +58,7 @@ public abstract class AEBaseItem extends Item @SuppressWarnings( "unchecked" ) public final void getSubItems( final CreativeTabs creativeTab, final NonNullList itemStacks ) { - if( isInCreativeTab( creativeTab ) ) + if( this.isInCreativeTab( creativeTab ) ) { this.getCheckedSubItems( creativeTab, itemStacks ); } diff --git a/src/main/java/appeng/items/materials/MaterialType.java b/src/main/java/appeng/items/materials/MaterialType.java index 1b4833cfe..f55ddd9e8 100644 --- a/src/main/java/appeng/items/materials/MaterialType.java +++ b/src/main/java/appeng/items/materials/MaterialType.java @@ -233,7 +233,7 @@ public enum MaterialType public ModelResourceLocation getModel() { - return model; + return this.model; } } diff --git a/src/main/java/appeng/items/misc/ItemCrystalSeedRendering.java b/src/main/java/appeng/items/misc/ItemCrystalSeedRendering.java index 4d8fc3dbb..d44529829 100644 --- a/src/main/java/appeng/items/misc/ItemCrystalSeedRendering.java +++ b/src/main/java/appeng/items/misc/ItemCrystalSeedRendering.java @@ -55,7 +55,7 @@ public class ItemCrystalSeedRendering extends ItemRenderingCustomizer public void customize( IItemRendering rendering ) { rendering.variants( ImmutableList.builder().add( MODELS_CERTUS ).add( MODELS_FLUIX ).add( MODELS_NETHER ).build() ); - rendering.meshDefinition( getItemMeshDefinition() ); + rendering.meshDefinition( this.getItemMeshDefinition() ); } private ItemMeshDefinition getItemMeshDefinition() diff --git a/src/main/java/appeng/items/parts/ItemFacade.java b/src/main/java/appeng/items/parts/ItemFacade.java index 1ec0da45a..ef9b31566 100644 --- a/src/main/java/appeng/items/parts/ItemFacade.java +++ b/src/main/java/appeng/items/parts/ItemFacade.java @@ -267,7 +267,7 @@ public class ItemFacade extends AEBaseItem implements IFacadeItem, IAlphaPassIte public IBlockState getTextureBlockState( ItemStack is ) { - ItemStack baseItemStack = getTextureItem( is ); + ItemStack baseItemStack = this.getTextureItem( is ); if( baseItemStack.isEmpty() ) { diff --git a/src/main/java/appeng/items/parts/ItemPart.java b/src/main/java/appeng/items/parts/ItemPart.java index d54b3aff0..f9f07846b 100644 --- a/src/main/java/appeng/items/parts/ItemPart.java +++ b/src/main/java/appeng/items/parts/ItemPart.java @@ -166,7 +166,7 @@ public final class ItemPart extends AEBaseItem implements IPartItem, IItemGroup public String getUnlocalizedName( final ItemStack is ) { Preconditions.checkNotNull( is ); - return "item.appliedenergistics2.multi_part." + getTypeByStack( is ).getUnlocalizedName().toLowerCase(); + return "item.appliedenergistics2.multi_part." + this.getTypeByStack( is ).getUnlocalizedName().toLowerCase(); } @Override diff --git a/src/main/java/appeng/items/parts/ItemPartRendering.java b/src/main/java/appeng/items/parts/ItemPartRendering.java index a60d361cb..b87349b56 100644 --- a/src/main/java/appeng/items/parts/ItemPartRendering.java +++ b/src/main/java/appeng/items/parts/ItemPartRendering.java @@ -111,13 +111,13 @@ public class ItemPartRendering extends ItemRenderingCustomizer List partResourceLocs = modelNames.stream() .map( name -> new ResourceLocation( AppEng.MOD_ID, name ) ) .collect( Collectors.toList() ); - partModels.registerModels( partResourceLocs ); + this.partModels.registerModels( partResourceLocs ); } private ModelResourceLocation getItemMeshDefinition( ItemStack is ) { - PartType partType = item.getTypeByStack( is ); - int variant = item.variantOf( is.getItemDamage() ); + PartType partType = this.item.getTypeByStack( is ); + int variant = this.item.variantOf( is.getItemDamage() ); return partType.getItemModels().get( variant ); } } diff --git a/src/main/java/appeng/items/parts/PartType.java b/src/main/java/appeng/items/parts/PartType.java index 92acb0a1f..bb2b609a7 100644 --- a/src/main/java/appeng/items/parts/PartType.java +++ b/src/main/java/appeng/items/parts/PartType.java @@ -314,13 +314,13 @@ public enum PartType this.enabled = features.stream().allMatch( AEConfig.instance()::isFeatureEnabled ) && integrations.stream() .allMatch( IntegrationRegistry.INSTANCE::isEnabled ); - if( enabled ) + if( this.enabled ) { // Only load models if the part is enabled, otherwise we also run into class-loading issues while // scanning for annotations if( Platform.isClientInstall() ) { - this.itemModels = createItemModels( itemModel ); + this.itemModels = this.createItemModels( itemModel ); } if( c != null ) { @@ -355,7 +355,7 @@ public enum PartType public boolean isEnabled() { - return enabled; + return this.enabled; } int getBaseDamage() @@ -385,7 +385,7 @@ public enum PartType String getUnlocalizedName() { - return name().toLowerCase(); + return this.name().toLowerCase(); } GuiText getExtraName() @@ -406,12 +406,12 @@ public enum PartType @SideOnly( Side.CLIENT ) public List getItemModels() { - return itemModels; + return this.itemModels; } public Set getModels() { - return models; + return this.models; } } diff --git a/src/main/java/appeng/items/tools/powered/powersink/PoweredItemCapabilities.java b/src/main/java/appeng/items/tools/powered/powersink/PoweredItemCapabilities.java index 7a75b7921..fa0acd31c 100644 --- a/src/main/java/appeng/items/tools/powered/powersink/PoweredItemCapabilities.java +++ b/src/main/java/appeng/items/tools/powered/powersink/PoweredItemCapabilities.java @@ -77,7 +77,7 @@ class PoweredItemCapabilities implements ICapabilityProvider, IEnergyStorage } else if( capability == Capabilities.TESLA_CONSUMER || capability == Capabilities.TESLA_HOLDER ) { - return (T) teslaAdapter; + return (T) this.teslaAdapter; } return null; } @@ -87,7 +87,7 @@ class PoweredItemCapabilities implements ICapabilityProvider, IEnergyStorage { if( simulate ) { - final int required = (int) PowerUnits.AE.convertTo( PowerUnits.RF, item.getAEMaxPower( is ) - item.getAECurrentPower( is ) ); + final int required = (int) PowerUnits.AE.convertTo( PowerUnits.RF, this.item.getAEMaxPower( this.is ) - this.item.getAECurrentPower( this.is ) ); if( maxReceive < required ) { @@ -97,7 +97,7 @@ class PoweredItemCapabilities implements ICapabilityProvider, IEnergyStorage } else { - final double powerRemainder = item.injectAEPower( is, PowerUnits.RF.convertTo( PowerUnits.AE, maxReceive ) ); + final double powerRemainder = this.item.injectAEPower( this.is, PowerUnits.RF.convertTo( PowerUnits.AE, maxReceive ) ); return maxReceive - (int) PowerUnits.AE.convertTo( PowerUnits.RF, powerRemainder ); } } @@ -111,13 +111,13 @@ class PoweredItemCapabilities implements ICapabilityProvider, IEnergyStorage @Override public int getEnergyStored() { - return (int) PowerUnits.AE.convertTo( PowerUnits.RF, item.getAECurrentPower( is ) ); + return (int) PowerUnits.AE.convertTo( PowerUnits.RF, this.item.getAECurrentPower( this.is ) ); } @Override public int getMaxEnergyStored() { - return (int) PowerUnits.AE.convertTo( PowerUnits.RF, item.getAEMaxPower( is ) ); + return (int) PowerUnits.AE.convertTo( PowerUnits.RF, this.item.getAEMaxPower( this.is ) ); } @Override @@ -138,19 +138,19 @@ class PoweredItemCapabilities implements ICapabilityProvider, IEnergyStorage @Override public long givePower( long power, boolean simulated ) { - return receiveEnergy( (int) power, simulated ); + return PoweredItemCapabilities.this.receiveEnergy( (int) power, simulated ); } @Override public long getStoredPower() { - return getEnergyStored(); + return PoweredItemCapabilities.this.getEnergyStored(); } @Override public long getCapacity() { - return getMaxEnergyStored(); + return PoweredItemCapabilities.this.getMaxEnergyStored(); } } } diff --git a/src/main/java/appeng/me/cache/NetworkMonitor.java b/src/main/java/appeng/me/cache/NetworkMonitor.java index 76bab5c9f..553d6decf 100644 --- a/src/main/java/appeng/me/cache/NetworkMonitor.java +++ b/src/main/java/appeng/me/cache/NetworkMonitor.java @@ -93,11 +93,11 @@ public class NetworkMonitor> implements IMEMonitor return this.getHandler().extractItems( request, mode, src ); } - localDepthSemaphore++; + this.localDepthSemaphore++; final T leftover = this.getHandler().extractItems( request, mode, src ); - localDepthSemaphore--; + this.localDepthSemaphore--; - if( localDepthSemaphore == 0 ) + if( this.localDepthSemaphore == 0 ) { this.monitorDifference( request.copy(), leftover, true, src ); } @@ -157,11 +157,11 @@ public class NetworkMonitor> implements IMEMonitor return this.getHandler().injectItems( input, mode, src ); } - localDepthSemaphore++; + this.localDepthSemaphore++; final T leftover = this.getHandler().injectItems( input, mode, src ); - localDepthSemaphore--; + this.localDepthSemaphore--; - if( localDepthSemaphore == 0 ) + if( this.localDepthSemaphore == 0 ) { this.monitorDifference( input.copy(), leftover, false, src ); } @@ -255,13 +255,13 @@ public class NetworkMonitor> implements IMEMonitor protected void postChange( final boolean add, final Iterable changes, final BaseActionSource src ) { - if( localDepthSemaphore > 0 || GLOBAL_DEPTH.contains( this ) ) + if( this.localDepthSemaphore > 0 || GLOBAL_DEPTH.contains( this ) ) { return; } GLOBAL_DEPTH.push( this ); - localDepthSemaphore++; + this.localDepthSemaphore++; this.sendEvent = true; @@ -304,7 +304,7 @@ public class NetworkMonitor> implements IMEMonitor } final NetworkMonitor last = GLOBAL_DEPTH.pop(); - localDepthSemaphore--; + this.localDepthSemaphore--; if( last != this ) { diff --git a/src/main/java/appeng/me/energy/EnergyThreshold.java b/src/main/java/appeng/me/energy/EnergyThreshold.java index 1bbc88756..cc97bacb7 100644 --- a/src/main/java/appeng/me/energy/EnergyThreshold.java +++ b/src/main/java/appeng/me/energy/EnergyThreshold.java @@ -51,7 +51,7 @@ public class EnergyThreshold implements Comparable public IEnergyWatcher getEnergyWatcher() { - return watcher; + return this.watcher; } @Override @@ -73,9 +73,9 @@ public class EnergyThreshold implements Comparable final int prime = 31; int result = 1; long temp; - temp = Double.doubleToLongBits( threshold ); + temp = Double.doubleToLongBits( this.threshold ); result = prime * result + (int) ( temp ^ ( temp >>> 32 ) ); - result = prime * result + ( ( watcher == null ) ? 0 : watcher.hashCode() ); + result = prime * result + ( ( this.watcher == null ) ? 0 : this.watcher.hashCode() ); return result; } @@ -90,25 +90,25 @@ public class EnergyThreshold implements Comparable { return false; } - if( getClass() != obj.getClass() ) + if( this.getClass() != obj.getClass() ) { return false; } EnergyThreshold other = (EnergyThreshold) obj; - if( Double.doubleToLongBits( threshold ) != Double.doubleToLongBits( other.threshold ) ) + if( Double.doubleToLongBits( this.threshold ) != Double.doubleToLongBits( other.threshold ) ) { return false; } - if( watcher == null ) + if( this.watcher == null ) { if( other.watcher != null ) { return false; } } - else if( !watcher.equals( other.watcher ) ) + else if( !this.watcher.equals( other.watcher ) ) { return false; } diff --git a/src/main/java/appeng/me/energy/EnergyWatcher.java b/src/main/java/appeng/me/energy/EnergyWatcher.java index 881279f45..45be0a95b 100644 --- a/src/main/java/appeng/me/energy/EnergyWatcher.java +++ b/src/main/java/appeng/me/energy/EnergyWatcher.java @@ -79,7 +79,7 @@ public class EnergyWatcher implements IEnergyWatcher @Override public void reset() { - for( Iterator iterator = myInterests.iterator(); iterator.hasNext(); ) + for( Iterator iterator = this.myInterests.iterator(); iterator.hasNext(); ) { final EnergyThreshold threshold = iterator.next(); diff --git a/src/main/java/appeng/me/storage/CellInventory.java b/src/main/java/appeng/me/storage/CellInventory.java index 22c9ef67c..cbcedd19f 100644 --- a/src/main/java/appeng/me/storage/CellInventory.java +++ b/src/main/java/appeng/me/storage/CellInventory.java @@ -448,7 +448,7 @@ public class CellInventory implements ICellInventory { NBTTagCompound compoundTag = this.tagCompound.getCompoundTag( itemSlots[slot] ); int stackSize = this.tagCompound.getInteger( itemSlotCount[slot] ); - loadCellItem( compoundTag, stackSize ); + this.loadCellItem( compoundTag, stackSize ); } // cellItems.clean(); diff --git a/src/main/java/appeng/parts/AEBasePart.java b/src/main/java/appeng/parts/AEBasePart.java index 3933bdecf..a6601a22b 100644 --- a/src/main/java/appeng/parts/AEBasePart.java +++ b/src/main/java/appeng/parts/AEBasePart.java @@ -101,7 +101,7 @@ public abstract class AEBasePart implements IPart, IGridProxyable, IActionHost, public PartType getType() { - return ItemPart.instance.getTypeByStack( is ); + return ItemPart.instance.getTypeByStack( this.is ); } @Override diff --git a/src/main/java/appeng/parts/CableBusContainer.java b/src/main/java/appeng/parts/CableBusContainer.java index 18cd5ebcb..f54376c15 100644 --- a/src/main/java/appeng/parts/CableBusContainer.java +++ b/src/main/java/appeng/parts/CableBusContainer.java @@ -716,7 +716,7 @@ public class CableBusContainer extends CableBusStorage implements AEMultiTile, I @Override public float getCableConnectionLength( AECableType cable ) { - return getPart( AEPartLocation.INTERNAL ) instanceof IPartCable ? getPart( AEPartLocation.INTERNAL ).getCableConnectionLength( cable ) : -1; + return this.getPart( AEPartLocation.INTERNAL ) instanceof IPartCable ? this.getPart( AEPartLocation.INTERNAL ).getCableConnectionLength( cable ) : -1; } @Override @@ -1150,7 +1150,7 @@ public class CableBusContainer extends CableBusStorage implements AEMultiTile, I @Override public CableBusRenderState getRenderState() { - PartCable cable = (PartCable) getCenter(); + PartCable cable = (PartCable) this.getCenter(); CableBusRenderState renderState = new CableBusRenderState(); @@ -1209,13 +1209,13 @@ public class CableBusContainer extends CableBusStorage implements AEMultiTile, I for( EnumFacing facing : EnumFacing.values() ) { - FacadeRenderState facadeState = getFacadeRenderState( facing ); + FacadeRenderState facadeState = this.getFacadeRenderState( facing ); if( facadeState != null ) { renderState.getFacades().put( facing, facadeState ); } - IPart part = getPart( facing ); + IPart part = this.getPart( facing ); if( part == null ) { @@ -1253,14 +1253,14 @@ public class CableBusContainer extends CableBusStorage implements AEMultiTile, I private FacadeRenderState getFacadeRenderState( EnumFacing side ) { // Store the "masqueraded" itemstack for the given side, if there is a facade - IFacadePart facade = getFacade( side.ordinal() ); + IFacadePart facade = this.getFacade( side.ordinal() ); if( facade != null ) { ItemStack textureItem = facade.getTextureItem(); IBlockState blockState = facade.getBlockState(); if( blockState != null && textureItem != null ) { - EnumSet openFaces = calculateFaceOpenFaces( side ); + EnumSet openFaces = this.calculateFaceOpenFaces( side ); return new FacadeRenderState( blockState, openFaces, textureItem ); } } @@ -1271,10 +1271,10 @@ public class CableBusContainer extends CableBusStorage implements AEMultiTile, I private EnumSet calculateFaceOpenFaces( EnumFacing side ) { final EnumSet out = EnumSet.of( side, side.getOpposite() ); - final IFacadePart facade = getFacade( side.ordinal() ); + final IFacadePart facade = this.getFacade( side.ordinal() ); - IBlockAccess blockAccess = getTile().getWorld(); - BlockPos pos = getTile().getPos(); + IBlockAccess blockAccess = this.getTile().getWorld(); + BlockPos pos = this.getTile().getPos(); for( final EnumFacing it : EnumFacing.values() ) { if( !out.contains( it ) && this.hasAlphaDiff( blockAccess.getTileEntity( pos.offset( it ) ), side, facade ) ) @@ -1285,7 +1285,7 @@ public class CableBusContainer extends CableBusStorage implements AEMultiTile, I if( out.contains( EnumFacing.UP ) && ( side.getFrontOffsetX() != 0 || side.getFrontOffsetZ() != 0 ) ) { - final IFacadePart fp = getFacade( EnumFacing.UP.ordinal() ); + final IFacadePart fp = this.getFacade( EnumFacing.UP.ordinal() ); if( fp != null && ( fp.isTransparent() == facade.isTransparent() ) ) { out.remove( EnumFacing.UP ); @@ -1294,7 +1294,7 @@ public class CableBusContainer extends CableBusStorage implements AEMultiTile, I if( out.contains( EnumFacing.DOWN ) && ( side.getFrontOffsetX() != 0 || side.getFrontOffsetZ() != 0 ) ) { - final IFacadePart fp = getFacade( EnumFacing.DOWN.ordinal() ); + final IFacadePart fp = this.getFacade( EnumFacing.DOWN.ordinal() ); if( fp != null && ( fp.isTransparent() == facade.isTransparent() ) ) { out.remove( EnumFacing.DOWN ); @@ -1303,7 +1303,7 @@ public class CableBusContainer extends CableBusStorage implements AEMultiTile, I if( out.contains( EnumFacing.SOUTH ) && ( side.getFrontOffsetX() != 0 ) ) { - final IFacadePart fp = getFacade( EnumFacing.SOUTH.ordinal() ); + final IFacadePart fp = this.getFacade( EnumFacing.SOUTH.ordinal() ); if( fp != null && ( fp.isTransparent() == facade.isTransparent() ) ) { out.remove( EnumFacing.SOUTH ); @@ -1312,7 +1312,7 @@ public class CableBusContainer extends CableBusStorage implements AEMultiTile, I if( out.contains( EnumFacing.NORTH ) && ( side.getFrontOffsetX() != 0 ) ) { - final IFacadePart fp = getFacade( EnumFacing.NORTH.ordinal() ); + final IFacadePart fp = this.getFacade( EnumFacing.NORTH.ordinal() ); if( fp != null && ( fp.isTransparent() == facade.isTransparent() ) ) { out.remove( EnumFacing.NORTH ); diff --git a/src/main/java/appeng/parts/automation/PartAnnihilationPlane.java b/src/main/java/appeng/parts/automation/PartAnnihilationPlane.java index 84678becf..9d1ea39ed 100644 --- a/src/main/java/appeng/parts/automation/PartAnnihilationPlane.java +++ b/src/main/java/appeng/parts/automation/PartAnnihilationPlane.java @@ -146,7 +146,7 @@ public class PartAnnihilationPlane extends PartBasicState implements IGridTickab { final EnumFacing facingRight, facingUp; - AEPartLocation location = getSide(); + AEPartLocation location = this.getSide(); switch( location ) { case UP: @@ -598,7 +598,7 @@ public class PartAnnihilationPlane extends PartBasicState implements IGridTickab @Override public IPartModel getStaticModels() { - return MODELS.getModel( getConnections(), isPowered(), isActive() ); + return MODELS.getModel( this.getConnections(), this.isPowered(), this.isActive() ); } } diff --git a/src/main/java/appeng/parts/automation/PartExportBus.java b/src/main/java/appeng/parts/automation/PartExportBus.java index 1c87bd020..f9539ee6d 100644 --- a/src/main/java/appeng/parts/automation/PartExportBus.java +++ b/src/main/java/appeng/parts/automation/PartExportBus.java @@ -360,11 +360,11 @@ public class PartExportBus extends PartSharedItemBus implements ICraftingRequest @Override public IPartModel getStaticModels() { - if( isActive() && isPowered() ) + if( this.isActive() && this.isPowered() ) { return MODELS_HAS_CHANNEL; } - else if( isPowered() ) + else if( this.isPowered() ) { return MODELS_ON; } diff --git a/src/main/java/appeng/parts/automation/PartFormationPlane.java b/src/main/java/appeng/parts/automation/PartFormationPlane.java index 6d79bb373..c10e5db71 100644 --- a/src/main/java/appeng/parts/automation/PartFormationPlane.java +++ b/src/main/java/appeng/parts/automation/PartFormationPlane.java @@ -281,7 +281,7 @@ public class PartFormationPlane extends PartUpgradeable implements ICellContaine { final EnumFacing facingRight, facingUp; - AEPartLocation location = getSide(); + AEPartLocation location = this.getSide(); switch( location ) { case UP: @@ -617,7 +617,7 @@ public class PartFormationPlane extends PartUpgradeable implements ICellContaine @Override public IPartModel getStaticModels() { - return MODELS.getModel( getConnections(), isPowered(), isActive() ); + return MODELS.getModel( this.getConnections(), this.isPowered(), this.isActive() ); } } diff --git a/src/main/java/appeng/parts/automation/PartIdentityAnnihilationPlane.java b/src/main/java/appeng/parts/automation/PartIdentityAnnihilationPlane.java index 96b94b702..a987537d5 100644 --- a/src/main/java/appeng/parts/automation/PartIdentityAnnihilationPlane.java +++ b/src/main/java/appeng/parts/automation/PartIdentityAnnihilationPlane.java @@ -108,7 +108,7 @@ public class PartIdentityAnnihilationPlane extends PartAnnihilationPlane @Override public IPartModel getStaticModels() { - return MODELS.getModel( getConnections(), isPowered(), isActive() ); + return MODELS.getModel( this.getConnections(), this.isPowered(), this.isActive() ); } } diff --git a/src/main/java/appeng/parts/automation/PartImportBus.java b/src/main/java/appeng/parts/automation/PartImportBus.java index ccea6dc83..1cec6aa36 100644 --- a/src/main/java/appeng/parts/automation/PartImportBus.java +++ b/src/main/java/appeng/parts/automation/PartImportBus.java @@ -317,11 +317,11 @@ public class PartImportBus extends PartSharedItemBus implements IInventoryDestin @Override public IPartModel getStaticModels() { - if( isActive() && isPowered() ) + if( this.isActive() && this.isPowered() ) { return MODELS_HAS_CHANNEL; } - else if( isPowered() ) + else if( this.isPowered() ) { return MODELS_ON; } diff --git a/src/main/java/appeng/parts/automation/PartLevelEmitter.java b/src/main/java/appeng/parts/automation/PartLevelEmitter.java index ab5d2aee2..8df0be712 100644 --- a/src/main/java/appeng/parts/automation/PartLevelEmitter.java +++ b/src/main/java/appeng/parts/automation/PartLevelEmitter.java @@ -563,17 +563,17 @@ public class PartLevelEmitter extends PartUpgradeable implements IEnergyWatcherH @Override public IPartModel getStaticModels() { - if( isActive() && isPowered() ) + if( this.isActive() && this.isPowered() ) { - return isLevelEmitterOn() ? MODEL_ON_HAS_CHANNEL : MODEL_OFF_HAS_CHANNEL; + return this.isLevelEmitterOn() ? MODEL_ON_HAS_CHANNEL : MODEL_OFF_HAS_CHANNEL; } - else if( isPowered() ) + else if( this.isPowered() ) { - return isLevelEmitterOn() ? MODEL_ON_ON : MODEL_OFF_ON; + return this.isLevelEmitterOn() ? MODEL_ON_ON : MODEL_OFF_ON; } else { - return isLevelEmitterOn() ? MODEL_ON_OFF : MODEL_OFF_OFF; + return this.isLevelEmitterOn() ? MODEL_ON_OFF : MODEL_OFF_OFF; } } } diff --git a/src/main/java/appeng/parts/automation/PlaneBakedModel.java b/src/main/java/appeng/parts/automation/PlaneBakedModel.java index 62d6394b5..62a04236b 100644 --- a/src/main/java/appeng/parts/automation/PlaneBakedModel.java +++ b/src/main/java/appeng/parts/automation/PlaneBakedModel.java @@ -76,7 +76,7 @@ public class PlaneBakedModel implements IBakedModel { if( side == null ) { - return quads; + return this.quads; } else { @@ -105,7 +105,7 @@ public class PlaneBakedModel implements IBakedModel @Override public TextureAtlasSprite getParticleTexture() { - return frontTexture; + return this.frontTexture; } @Override diff --git a/src/main/java/appeng/parts/automation/PlaneConnections.java b/src/main/java/appeng/parts/automation/PlaneConnections.java index 7b3075da3..a5b294815 100644 --- a/src/main/java/appeng/parts/automation/PlaneConnections.java +++ b/src/main/java/appeng/parts/automation/PlaneConnections.java @@ -76,28 +76,28 @@ public final class PlaneConnections public boolean isUp() { - return up; + return this.up; } public boolean isRight() { - return right; + return this.right; } public boolean isDown() { - return down; + return this.down; } public boolean isLeft() { - return left; + return this.left; } // The combination of connections expressed as a number ranging from [0,15] public int getIndex() { - return getIndex( up, right, down, left ); + return getIndex( this.up, this.right, this.down, this.left ); } private static int getIndex( boolean up, boolean right, boolean down, boolean left ) @@ -108,7 +108,7 @@ public final class PlaneConnections // Returns a suffix that expresses the connection states as a string public String getFilenameSuffix() { - String suffix = Integer.toBinaryString( getIndex() ); + String suffix = Integer.toBinaryString( this.getIndex() ); return Strings.padStart( suffix, 4, '0' ); } @@ -119,22 +119,22 @@ public final class PlaneConnections { return true; } - if( o == null || getClass() != o.getClass() ) + if( o == null || this.getClass() != o.getClass() ) { return false; } PlaneConnections that = (PlaneConnections) o; - return up == that.up && right == that.right && down == that.down && left == that.left; + return this.up == that.up && this.right == that.right && this.down == that.down && this.left == that.left; } @Override public int hashCode() { - int result = ( up ? 1 : 0 ); - result = 31 * result + ( right ? 1 : 0 ); - result = 31 * result + ( down ? 1 : 0 ); - result = 31 * result + ( left ? 1 : 0 ); + int result = ( this.up ? 1 : 0 ); + result = 31 * result + ( this.right ? 1 : 0 ); + result = 31 * result + ( this.down ? 1 : 0 ); + result = 31 * result + ( this.left ? 1 : 0 ); return result; } } diff --git a/src/main/java/appeng/parts/automation/PlaneModel.java b/src/main/java/appeng/parts/automation/PlaneModel.java index 1a37e2aae..43bf6047a 100644 --- a/src/main/java/appeng/parts/automation/PlaneModel.java +++ b/src/main/java/appeng/parts/automation/PlaneModel.java @@ -62,17 +62,17 @@ public class PlaneModel implements IModel @Override public Collection getTextures() { - return Lists.newArrayList( frontTexture, sidesTexture, backTexture ); + return Lists.newArrayList( this.frontTexture, this.sidesTexture, this.backTexture ); } @Override public IBakedModel bake( IModelState state, VertexFormat format, Function bakedTextureGetter ) { - TextureAtlasSprite frontSprite = bakedTextureGetter.apply( frontTexture ); - TextureAtlasSprite sidesSprite = bakedTextureGetter.apply( sidesTexture ); - TextureAtlasSprite backSprite = bakedTextureGetter.apply( backTexture ); + TextureAtlasSprite frontSprite = bakedTextureGetter.apply( this.frontTexture ); + TextureAtlasSprite sidesSprite = bakedTextureGetter.apply( this.sidesTexture ); + TextureAtlasSprite backSprite = bakedTextureGetter.apply( this.backTexture ); - return new PlaneBakedModel( format, frontSprite, sidesSprite, backSprite, connections ); + return new PlaneBakedModel( format, frontSprite, sidesSprite, backSprite, this.connections ); } @Override diff --git a/src/main/java/appeng/parts/automation/PlaneModels.java b/src/main/java/appeng/parts/automation/PlaneModels.java index c8c5611d0..340e2b045 100644 --- a/src/main/java/appeng/parts/automation/PlaneModels.java +++ b/src/main/java/appeng/parts/automation/PlaneModels.java @@ -74,24 +74,24 @@ class PlaneModels { if( hasPower && hasChannel ) { - return modelsHasChannel.get( connections ); + return this.modelsHasChannel.get( connections ); } else if( hasPower ) { - return modelsOn.get( connections ); + return this.modelsOn.get( connections ); } else { - return modelsOff.get( connections ); + return this.modelsOff.get( connections ); } } public List getModels() { List result = new ArrayList<>(); - modelsOff.values().forEach( result::add ); - modelsOn.values().forEach( result::add ); - modelsHasChannel.values().forEach( result::add ); + this.modelsOff.values().forEach( result::add ); + this.modelsOn.values().forEach( result::add ); + this.modelsHasChannel.values().forEach( result::add ); return result; } diff --git a/src/main/java/appeng/parts/misc/ItemHandlerAdapter.java b/src/main/java/appeng/parts/misc/ItemHandlerAdapter.java index bb0e7ec16..6ee6070e9 100644 --- a/src/main/java/appeng/parts/misc/ItemHandlerAdapter.java +++ b/src/main/java/appeng/parts/misc/ItemHandlerAdapter.java @@ -71,13 +71,13 @@ class ItemHandlerAdapter implements IMEInventory, IBaseMonitor, IBaseMonitor, IBaseMonitor remainingCurrentSlot ) @@ -132,7 +132,7 @@ class ItemHandlerAdapter implements IMEInventory, IBaseMonitor, IBaseMonitor cachedStacks.length ) + if( pos > this.cachedStacks.length ) { return ItemStack.EMPTY; } - if( cachedStacks[pos] == null ) + if( this.cachedStacks[pos] == null ) { return ItemStack.EMPTY; } - return cachedStacks[pos]; + return this.cachedStacks[pos]; } @Override @@ -192,39 +192,39 @@ class ItemHandlerAdapter implements IMEInventory, IBaseMonitor changes = new LinkedList<>(); - int slots = itemHandler.getSlots(); + int slots = this.itemHandler.getSlots(); // Make room for new slots - if( slots > cachedStacks.length ) + if( slots > this.cachedStacks.length ) { - cachedStacks = Arrays.copyOf( cachedStacks, slots ); - cachedAeStacks = Arrays.copyOf( cachedAeStacks, slots ); + this.cachedStacks = Arrays.copyOf( this.cachedStacks, slots ); + this.cachedAeStacks = Arrays.copyOf( this.cachedAeStacks, slots ); } for( int slot = 0; slot < slots; slot++ ) { // Save the old stuff - ItemStack oldIS = getItemStackInCachedSlot( slot ); - IAEItemStack oldAeIS = cachedAeStacks[slot]; + ItemStack oldIS = this.getItemStackInCachedSlot( slot ); + IAEItemStack oldAeIS = this.cachedAeStacks[slot]; - ItemStack newIS = itemHandler.getStackInSlot( slot ); + ItemStack newIS = this.itemHandler.getStackInSlot( slot ); if( this.isDifferent( newIS, oldIS ) ) { - addItemChange( slot, oldAeIS, newIS, changes ); + this.addItemChange( slot, oldAeIS, newIS, changes ); } else if( !newIS.isEmpty() && !oldIS.isEmpty() ) { - addPossibleStackSizeChange( slot, oldAeIS, newIS, changes ); + this.addPossibleStackSizeChange( slot, oldAeIS, newIS, changes ); } } // Handle cases where the number of slots actually is lower now than before - if( slots < cachedStacks.length ) + if( slots < this.cachedStacks.length ) { - for( int slot = slots; slot < cachedStacks.length; slot++ ) + for( int slot = slots; slot < this.cachedStacks.length; slot++ ) { - IAEItemStack aeStack = cachedAeStacks[slot]; + IAEItemStack aeStack = this.cachedAeStacks[slot]; if( aeStack != null ) { IAEItemStack a = aeStack.copy(); @@ -234,8 +234,8 @@ class ItemHandlerAdapter implements IMEInventory, IBaseMonitor, IBaseMonitor changes ) { // Completely different item - cachedStacks[slot] = newIS; - cachedAeStacks[slot] = AEItemStack.create( newIS ); + this.cachedStacks[slot] = newIS; + this.cachedAeStacks[slot] = AEItemStack.create( newIS ); // If we had a stack previously in this slot, notify the newtork about its disappearance if( oldAeIS != null ) @@ -263,9 +263,9 @@ class ItemHandlerAdapter implements IMEInventory, IBaseMonitor, IBaseMonitor, IBaseMonitor key = l.getKey(); if( key.isValid( l.getValue() ) ) { - key.postChange( this, a, mySource ); + key.postChange( this, a, this.mySource ); } else { @@ -326,9 +326,9 @@ class ItemHandlerAdapter implements IMEInventory, IBaseMonitor getAvailableItems( IItemList out ) { - for( int i = 0; i < itemHandler.getSlots(); i++ ) + for( int i = 0; i < this.itemHandler.getSlots(); i++ ) { - out.addStorage( AEItemStack.create( itemHandler.getStackInSlot( i ) ) ); + out.addStorage( AEItemStack.create( this.itemHandler.getStackInSlot( i ) ) ); } return out; diff --git a/src/main/java/appeng/parts/misc/PartInterface.java b/src/main/java/appeng/parts/misc/PartInterface.java index 267756704..4c61ff1be 100644 --- a/src/main/java/appeng/parts/misc/PartInterface.java +++ b/src/main/java/appeng/parts/misc/PartInterface.java @@ -418,11 +418,11 @@ public class PartInterface extends PartBasicState implements IGridTickable, ISto @Override public IPartModel getStaticModels() { - if( isActive() && isPowered() ) + if( this.isActive() && this.isPowered() ) { return MODELS_HAS_CHANNEL; } - else if( isPowered() ) + else if( this.isPowered() ) { return MODELS_ON; } @@ -435,13 +435,13 @@ public class PartInterface extends PartBasicState implements IGridTickable, ISto @Override public boolean hasCapability( Capability capabilityClass ) { - return this.duality.hasCapability( capabilityClass, getSide().getFacing() ); + return this.duality.hasCapability( capabilityClass, this.getSide().getFacing() ); } @Override public T getCapability( Capability capabilityClass ) { - return this.duality.getCapability( capabilityClass, getSide().getFacing() ); + return this.duality.getCapability( capabilityClass, this.getSide().getFacing() ); } @Override diff --git a/src/main/java/appeng/parts/misc/PartInvertedToggleBus.java b/src/main/java/appeng/parts/misc/PartInvertedToggleBus.java index 0d8f670e3..9614318c1 100644 --- a/src/main/java/appeng/parts/misc/PartInvertedToggleBus.java +++ b/src/main/java/appeng/parts/misc/PartInvertedToggleBus.java @@ -57,11 +57,11 @@ public class PartInvertedToggleBus extends PartToggleBus @Override public IPartModel getStaticModels() { - if( hasRedstoneFlag() && isActive() && isPowered() ) + if( this.hasRedstoneFlag() && this.isActive() && this.isPowered() ) { return MODELS_HAS_CHANNEL; } - else if( hasRedstoneFlag() && isPowered() ) + else if( this.hasRedstoneFlag() && this.isPowered() ) { return MODELS_ON; } diff --git a/src/main/java/appeng/parts/misc/PartStorageBus.java b/src/main/java/appeng/parts/misc/PartStorageBus.java index 6bf8c8ab2..59797a4c1 100644 --- a/src/main/java/appeng/parts/misc/PartStorageBus.java +++ b/src/main/java/appeng/parts/misc/PartStorageBus.java @@ -374,7 +374,7 @@ public class PartStorageBus extends PartUpgradeable implements IGridTickable, IC if( accessor != null ) { - IStorageMonitorable inventory = accessor.getInventory( mySrc ); + IStorageMonitorable inventory = accessor.getInventory( this.mySrc ); if( inventory != null ) { return inventory.getItemInventory(); @@ -422,7 +422,7 @@ public class PartStorageBus extends PartUpgradeable implements IGridTickable, IC this.monitor = null; if( target != null ) { - IMEInventory inv = getInventoryWrapper( target ); + IMEInventory inv = this.getInventoryWrapper( target ); if( inv instanceof MEMonitorIInventory ) { @@ -586,11 +586,11 @@ public class PartStorageBus extends PartUpgradeable implements IGridTickable, IC @Override public IPartModel getStaticModels() { - if( isActive() && isPowered() ) + if( this.isActive() && this.isPowered() ) { return MODELS_HAS_CHANNEL; } - else if( isPowered() ) + else if( this.isPowered() ) { return MODELS_ON; } diff --git a/src/main/java/appeng/parts/misc/PartToggleBus.java b/src/main/java/appeng/parts/misc/PartToggleBus.java index fdc789a2f..4a5875a36 100644 --- a/src/main/java/appeng/parts/misc/PartToggleBus.java +++ b/src/main/java/appeng/parts/misc/PartToggleBus.java @@ -88,7 +88,7 @@ public class PartToggleBus extends PartBasicState public boolean hasRedstoneFlag() { - return ( getClientFlags() & REDSTONE_FLAG ) == REDSTONE_FLAG; + return ( this.getClientFlags() & REDSTONE_FLAG ) == REDSTONE_FLAG; } protected boolean getIntention() @@ -225,11 +225,11 @@ public class PartToggleBus extends PartBasicState @Override public IPartModel getStaticModels() { - if( hasRedstoneFlag() && isActive() && isPowered() ) + if( this.hasRedstoneFlag() && this.isActive() && this.isPowered() ) { return MODELS_HAS_CHANNEL; } - else if( hasRedstoneFlag() && isPowered() ) + else if( this.hasRedstoneFlag() && this.isPowered() ) { return MODELS_ON; } diff --git a/src/main/java/appeng/parts/networking/PartCable.java b/src/main/java/appeng/parts/networking/PartCable.java index 86b863fe0..017b22cd0 100644 --- a/src/main/java/appeng/parts/networking/PartCable.java +++ b/src/main/java/appeng/parts/networking/PartCable.java @@ -384,7 +384,7 @@ public class PartCable extends AEBasePart implements IPartCable // Only read channels if there's a part on this side or a cable connection // This works only because cables are always read *last* from the packet update for // a cable bus - if( conOnSide || getHost().getPart( d ) != null ) + if( conOnSide || this.getHost().getPart( d ) != null ) { ch = ( (int) data.readByte() ) & 0xFF; } @@ -407,7 +407,7 @@ public class PartCable extends AEBasePart implements IPartCable public int getChannelsOnSide( EnumFacing side ) { - if( !powered ) + if( !this.powered ) { return 0; } diff --git a/src/main/java/appeng/parts/p2p/P2PModels.java b/src/main/java/appeng/parts/p2p/P2PModels.java index b6265c868..fc5b96a84 100644 --- a/src/main/java/appeng/parts/p2p/P2PModels.java +++ b/src/main/java/appeng/parts/p2p/P2PModels.java @@ -46,33 +46,33 @@ class P2PModels public P2PModels( String frontModelPath ) { ResourceLocation frontModel = new ResourceLocation( AppEng.MOD_ID, frontModelPath ); - modelsOff = new PartModel( MODEL_STATUS_OFF, frontModel ); - modelsOn = new PartModel( MODEL_STATUS_ON, frontModel ); - modelsHasChannel = new PartModel( MODEL_STATUS_HAS_CHANNEL, frontModel ); + this.modelsOff = new PartModel( MODEL_STATUS_OFF, frontModel ); + this.modelsOn = new PartModel( MODEL_STATUS_ON, frontModel ); + this.modelsHasChannel = new PartModel( MODEL_STATUS_HAS_CHANNEL, frontModel ); } public IPartModel getModel( boolean hasPower, boolean hasChannel ) { if( hasPower && hasChannel ) { - return modelsHasChannel; + return this.modelsHasChannel; } else if( hasPower ) { - return modelsOn; + return this.modelsOn; } else { - return modelsOff; + return this.modelsOff; } } public List getModels() { List result = new ArrayList<>(); - result.add( modelsOff ); - result.add( modelsOn ); - result.add( modelsHasChannel ); + result.add( this.modelsOff ); + result.add( this.modelsOn ); + result.add( this.modelsHasChannel ); return result; } diff --git a/src/main/java/appeng/parts/p2p/PartP2PFEPower.java b/src/main/java/appeng/parts/p2p/PartP2PFEPower.java index f1da59ecd..488fdc6fa 100644 --- a/src/main/java/appeng/parts/p2p/PartP2PFEPower.java +++ b/src/main/java/appeng/parts/p2p/PartP2PFEPower.java @@ -60,7 +60,7 @@ public class PartP2PFEPower extends PartP2PTunnel implements IEn @Override public IPartModel getStaticModels() { - return MODELS.getModel( isPowered(), isActive() ); + return MODELS.getModel( this.isPowered(), this.isActive() ); } public PartP2PFEPower( ItemStack is ) diff --git a/src/main/java/appeng/parts/p2p/PartP2PFluids.java b/src/main/java/appeng/parts/p2p/PartP2PFluids.java index ef1fbfb40..6c971dce5 100644 --- a/src/main/java/appeng/parts/p2p/PartP2PFluids.java +++ b/src/main/java/appeng/parts/p2p/PartP2PFluids.java @@ -113,7 +113,7 @@ public class PartP2PFluids extends PartP2PTunnel implements IFlui @Override public IPartModel getStaticModels() { - return MODELS.getModel( isPowered(), isActive() ); + return MODELS.getModel( this.isPowered(), this.isActive() ); } @Override diff --git a/src/main/java/appeng/parts/p2p/PartP2PIC2Power.java b/src/main/java/appeng/parts/p2p/PartP2PIC2Power.java index 3a9d480e6..dabc2ff2c 100644 --- a/src/main/java/appeng/parts/p2p/PartP2PIC2Power.java +++ b/src/main/java/appeng/parts/p2p/PartP2PIC2Power.java @@ -257,7 +257,7 @@ public class PartP2PIC2Power extends PartP2PTunnel implements I @Override public IPartModel getStaticModels() { - return MODELS.getModel( isPowered(), isActive() ); + return MODELS.getModel( this.isPowered(), this.isActive() ); } } \ No newline at end of file diff --git a/src/main/java/appeng/parts/p2p/PartP2PItems.java b/src/main/java/appeng/parts/p2p/PartP2PItems.java index 0aca2c959..294246962 100644 --- a/src/main/java/appeng/parts/p2p/PartP2PItems.java +++ b/src/main/java/appeng/parts/p2p/PartP2PItems.java @@ -306,7 +306,7 @@ public class PartP2PItems extends PartP2PTunnel implements /* IPip public ItemStack insertItem( int slot, @Nonnull ItemStack stack, boolean simulate ) { - if( isItemValidForSlot( slot, stack ) ) + if( this.isItemValidForSlot( slot, stack ) ) { AdaptorIInventory adaptor = new AdaptorIInventory( this.getDestination() ); @@ -348,7 +348,7 @@ public class PartP2PItems extends PartP2PTunnel implements /* IPip @Override public int getSlotLimit( int slot ) { - if( slot >= 0 && slot < getDestination().getSizeInventory() ) + if( slot >= 0 && slot < this.getDestination().getSizeInventory() ) { return this.getDestination().getInventoryStackLimit(); } @@ -498,7 +498,7 @@ public class PartP2PItems extends PartP2PTunnel implements /* IPip @Override public IPartModel getStaticModels() { - return MODELS.getModel( isPowered(), isActive() ); + return MODELS.getModel( this.isPowered(), this.isActive() ); } @Override diff --git a/src/main/java/appeng/parts/p2p/PartP2PLight.java b/src/main/java/appeng/parts/p2p/PartP2PLight.java index 95f831bd8..f0789cfa3 100644 --- a/src/main/java/appeng/parts/p2p/PartP2PLight.java +++ b/src/main/java/appeng/parts/p2p/PartP2PLight.java @@ -228,7 +228,7 @@ public class PartP2PLight extends PartP2PTunnel implements IGridTi @Override public IPartModel getStaticModels() { - return MODELS.getModel( isPowered(), isActive() ); + return MODELS.getModel( this.isPowered(), this.isActive() ); } } diff --git a/src/main/java/appeng/parts/p2p/PartP2PRFPower.java b/src/main/java/appeng/parts/p2p/PartP2PRFPower.java index fd077841b..73a0967d6 100644 --- a/src/main/java/appeng/parts/p2p/PartP2PRFPower.java +++ b/src/main/java/appeng/parts/p2p/PartP2PRFPower.java @@ -61,7 +61,7 @@ public final class PartP2PRFPower extends PartP2PTunnel implemen @Override public IPartModel getStaticModels() { - return MODELS.getModel( isPowered(), isActive() ); + return MODELS.getModel( this.isPowered(), this.isActive() ); } @Override diff --git a/src/main/java/appeng/parts/p2p/PartP2PRedstone.java b/src/main/java/appeng/parts/p2p/PartP2PRedstone.java index 60a8f3046..aa3d9d051 100644 --- a/src/main/java/appeng/parts/p2p/PartP2PRedstone.java +++ b/src/main/java/appeng/parts/p2p/PartP2PRedstone.java @@ -211,7 +211,7 @@ public class PartP2PRedstone extends PartP2PTunnel @Override public IPartModel getStaticModels() { - return MODELS.getModel( isPowered(), isActive() ); + return MODELS.getModel( this.isPowered(), this.isActive() ); } } diff --git a/src/main/java/appeng/parts/p2p/PartP2PTunnelME.java b/src/main/java/appeng/parts/p2p/PartP2PTunnelME.java index e3185c57d..b31a06e3e 100644 --- a/src/main/java/appeng/parts/p2p/PartP2PTunnelME.java +++ b/src/main/java/appeng/parts/p2p/PartP2PTunnelME.java @@ -264,7 +264,7 @@ public class PartP2PTunnelME extends PartP2PTunnel implements I @Override public IPartModel getStaticModels() { - return MODELS.getModel( isPowered(), isActive() ); + return MODELS.getModel( this.isPowered(), this.isActive() ); } } diff --git a/src/main/java/appeng/parts/reporting/AbstractPartMonitor.java b/src/main/java/appeng/parts/reporting/AbstractPartMonitor.java index bc0955d19..b6241079b 100644 --- a/src/main/java/appeng/parts/reporting/AbstractPartMonitor.java +++ b/src/main/java/appeng/parts/reporting/AbstractPartMonitor.java @@ -254,7 +254,7 @@ public abstract class AbstractPartMonitor extends AbstractPartDisplay implements EnumFacing facing = this.getSide().getFacing(); TesrRenderHelper.moveToFace( facing ); - TesrRenderHelper.rotateToFace( facing, getSpin() ); + TesrRenderHelper.rotateToFace( facing, this.getSpin() ); TesrRenderHelper.renderItem2dWithAmount( ais, 0.8f, 0.17f ); GlStateManager.popMatrix(); @@ -319,9 +319,9 @@ public abstract class AbstractPartMonitor extends AbstractPartDisplay implements protected IPartModel selectModel( IPartModel off, IPartModel on, IPartModel hasChannel, IPartModel lockedOff, IPartModel lockedOn, IPartModel lockedHasChannel ) { - if( isActive() ) + if( this.isActive() ) { - if( isLocked() ) + if( this.isLocked() ) { return lockedHasChannel; } @@ -330,9 +330,9 @@ public abstract class AbstractPartMonitor extends AbstractPartDisplay implements return hasChannel; } } - else if( isPowered() ) + else if( this.isPowered() ) { - if( isLocked() ) + if( this.isLocked() ) { return lockedOn; } @@ -343,7 +343,7 @@ public abstract class AbstractPartMonitor extends AbstractPartDisplay implements } else { - if( isLocked() ) + if( this.isLocked() ) { return lockedOff; } diff --git a/src/main/java/appeng/parts/reporting/AbstractPartReporting.java b/src/main/java/appeng/parts/reporting/AbstractPartReporting.java index 2e232f49e..924d4abe4 100644 --- a/src/main/java/appeng/parts/reporting/AbstractPartReporting.java +++ b/src/main/java/appeng/parts/reporting/AbstractPartReporting.java @@ -292,11 +292,11 @@ public abstract class AbstractPartReporting extends AEBasePart implements IPartM protected IPartModel selectModel( IPartModel offModels, IPartModel onModels, IPartModel hasChannelModels ) { - if( isActive() ) + if( this.isActive() ) { return hasChannelModels; } - else if( isPowered() ) + else if( this.isPowered() ) { return onModels; } diff --git a/src/main/java/appeng/parts/reporting/PartConversionMonitor.java b/src/main/java/appeng/parts/reporting/PartConversionMonitor.java index b48df58ac..ac0e28bbf 100644 --- a/src/main/java/appeng/parts/reporting/PartConversionMonitor.java +++ b/src/main/java/appeng/parts/reporting/PartConversionMonitor.java @@ -187,7 +187,7 @@ public class PartConversionMonitor extends AbstractPartMonitor @Override public IPartModel getStaticModels() { - return selectModel( MODELS_OFF, MODELS_ON, MODELS_HAS_CHANNEL, + return this.selectModel( MODELS_OFF, MODELS_ON, MODELS_HAS_CHANNEL, MODELS_LOCKED_OFF, MODELS_LOCKED_ON, MODELS_LOCKED_HAS_CHANNEL ); } diff --git a/src/main/java/appeng/parts/reporting/PartCraftingTerminal.java b/src/main/java/appeng/parts/reporting/PartCraftingTerminal.java index d14c9d734..2fa7aaeb7 100644 --- a/src/main/java/appeng/parts/reporting/PartCraftingTerminal.java +++ b/src/main/java/appeng/parts/reporting/PartCraftingTerminal.java @@ -117,7 +117,7 @@ public class PartCraftingTerminal extends AbstractPartTerminal @Override public IPartModel getStaticModels() { - return selectModel( MODELS_OFF, MODELS_ON, MODELS_HAS_CHANNEL ); + return this.selectModel( MODELS_OFF, MODELS_ON, MODELS_HAS_CHANNEL ); } } diff --git a/src/main/java/appeng/parts/reporting/PartDarkPanel.java b/src/main/java/appeng/parts/reporting/PartDarkPanel.java index c75b7e8f0..268a0684a 100644 --- a/src/main/java/appeng/parts/reporting/PartDarkPanel.java +++ b/src/main/java/appeng/parts/reporting/PartDarkPanel.java @@ -55,7 +55,7 @@ public class PartDarkPanel extends AbstractPartPanel @Override public IPartModel getStaticModels() { - return isPowered() ? MODELS_ON : MODELS_OFF; + return this.isPowered() ? MODELS_ON : MODELS_OFF; } } diff --git a/src/main/java/appeng/parts/reporting/PartInterfaceTerminal.java b/src/main/java/appeng/parts/reporting/PartInterfaceTerminal.java index 280e1a9a0..b381005b7 100644 --- a/src/main/java/appeng/parts/reporting/PartInterfaceTerminal.java +++ b/src/main/java/appeng/parts/reporting/PartInterfaceTerminal.java @@ -74,7 +74,7 @@ public class PartInterfaceTerminal extends AbstractPartDisplay @Override public IPartModel getStaticModels() { - return selectModel( MODELS_OFF, MODELS_ON, MODELS_HAS_CHANNEL ); + return this.selectModel( MODELS_OFF, MODELS_ON, MODELS_HAS_CHANNEL ); } } diff --git a/src/main/java/appeng/parts/reporting/PartPanel.java b/src/main/java/appeng/parts/reporting/PartPanel.java index 3807c5aed..78410476f 100644 --- a/src/main/java/appeng/parts/reporting/PartPanel.java +++ b/src/main/java/appeng/parts/reporting/PartPanel.java @@ -55,7 +55,7 @@ public class PartPanel extends AbstractPartPanel @Override public IPartModel getStaticModels() { - return isPowered() ? MODELS_ON : MODELS_OFF; + return this.isPowered() ? MODELS_ON : MODELS_OFF; } } diff --git a/src/main/java/appeng/parts/reporting/PartPatternTerminal.java b/src/main/java/appeng/parts/reporting/PartPatternTerminal.java index 282646e2c..d03e83100 100644 --- a/src/main/java/appeng/parts/reporting/PartPatternTerminal.java +++ b/src/main/java/appeng/parts/reporting/PartPatternTerminal.java @@ -216,6 +216,6 @@ public class PartPatternTerminal extends AbstractPartTerminal @Override public IPartModel getStaticModels() { - return selectModel( MODELS_OFF, MODELS_ON, MODELS_HAS_CHANNEL ); + return this.selectModel( MODELS_OFF, MODELS_ON, MODELS_HAS_CHANNEL ); } } diff --git a/src/main/java/appeng/parts/reporting/PartSemiDarkPanel.java b/src/main/java/appeng/parts/reporting/PartSemiDarkPanel.java index 07daf0380..0a6f3d0ef 100644 --- a/src/main/java/appeng/parts/reporting/PartSemiDarkPanel.java +++ b/src/main/java/appeng/parts/reporting/PartSemiDarkPanel.java @@ -56,7 +56,7 @@ public class PartSemiDarkPanel extends AbstractPartPanel @Override public IPartModel getStaticModels() { - return isPowered() ? MODELS_ON : MODELS_OFF; + return this.isPowered() ? MODELS_ON : MODELS_OFF; } } diff --git a/src/main/java/appeng/parts/reporting/PartStorageMonitor.java b/src/main/java/appeng/parts/reporting/PartStorageMonitor.java index 12b5d2134..06d1fd604 100644 --- a/src/main/java/appeng/parts/reporting/PartStorageMonitor.java +++ b/src/main/java/appeng/parts/reporting/PartStorageMonitor.java @@ -64,7 +64,7 @@ public class PartStorageMonitor extends AbstractPartMonitor @Override public IPartModel getStaticModels() { - return selectModel( MODELS_OFF, MODELS_ON, MODELS_HAS_CHANNEL, + return this.selectModel( MODELS_OFF, MODELS_ON, MODELS_HAS_CHANNEL, MODELS_LOCKED_OFF, MODELS_LOCKED_ON, MODELS_LOCKED_HAS_CHANNEL ); } } diff --git a/src/main/java/appeng/parts/reporting/PartTerminal.java b/src/main/java/appeng/parts/reporting/PartTerminal.java index f131a5a3a..cc582b1a5 100644 --- a/src/main/java/appeng/parts/reporting/PartTerminal.java +++ b/src/main/java/appeng/parts/reporting/PartTerminal.java @@ -48,6 +48,6 @@ public class PartTerminal extends AbstractPartTerminal @Override public IPartModel getStaticModels() { - return selectModel( MODELS_OFF, MODELS_ON, MODELS_HAS_CHANNEL ); + return this.selectModel( MODELS_OFF, MODELS_ON, MODELS_HAS_CHANNEL ); } } diff --git a/src/main/java/appeng/recipes/game/DisassembleRecipe.java b/src/main/java/appeng/recipes/game/DisassembleRecipe.java index 868d51300..3e460b1e0 100644 --- a/src/main/java/appeng/recipes/game/DisassembleRecipe.java +++ b/src/main/java/appeng/recipes/game/DisassembleRecipe.java @@ -119,7 +119,7 @@ public final class DisassembleRecipe extends net.minecraftforge.registries.IForg } // handle crafting storage blocks - output = getNonCellOutput( stackInSlot ).orElse( output ); + output = this.getNonCellOutput( stackInSlot ).orElse( output ); } } diff --git a/src/main/java/appeng/recipes/game/FacadeRecipe.java b/src/main/java/appeng/recipes/game/FacadeRecipe.java index cf233834a..47d2d0119 100644 --- a/src/main/java/appeng/recipes/game/FacadeRecipe.java +++ b/src/main/java/appeng/recipes/game/FacadeRecipe.java @@ -62,7 +62,7 @@ public final class FacadeRecipe extends net.minecraftforge.registries.IForgeRegi if( this.anchor.isSameAs( inv.getStackInSlot( 1 ) ) && this.anchor.isSameAs( inv.getStackInSlot( 3 ) ) && this.anchor .isSameAs( inv.getStackInSlot( 5 ) ) && this.anchor.isSameAs( inv.getStackInSlot( 7 ) ) ) { - final ItemStack facades = facade.createFacadeForItem( inv.getStackInSlot( 4 ), !createFacade ); + final ItemStack facades = this.facade.createFacadeForItem( inv.getStackInSlot( 4 ), !createFacade ); if( !facades.isEmpty() && createFacade ) { facades.setCount( 4 ); diff --git a/src/main/java/appeng/spatial/CachedPlane.java b/src/main/java/appeng/spatial/CachedPlane.java index 4a2510b2d..63ab4786a 100644 --- a/src/main/java/appeng/spatial/CachedPlane.java +++ b/src/main/java/appeng/spatial/CachedPlane.java @@ -418,7 +418,7 @@ public class CachedPlane private void setBlockIDWithMetadata( final int y, final Object[] blk ) { - if( blk[0] == matrixBlockState ) + if( blk[0] == CachedPlane.this.matrixBlockState ) { blk[0] = Platform.AIR_BLOCK.getDefaultState(); } diff --git a/src/main/java/appeng/spatial/StorageChunkProvider.java b/src/main/java/appeng/spatial/StorageChunkProvider.java index a38ec8aba..b51bb9b82 100644 --- a/src/main/java/appeng/spatial/StorageChunkProvider.java +++ b/src/main/java/appeng/spatial/StorageChunkProvider.java @@ -59,7 +59,7 @@ public class StorageChunkProvider extends ChunkGeneratorOverworld biomes[k] = biomeId; } - AEApi.instance().definitions().blocks().matrixFrame().maybeBlock().ifPresent( block -> fillChunk( chunk, block.getDefaultState() ) ); + AEApi.instance().definitions().blocks().matrixFrame().maybeBlock().ifPresent( block -> this.fillChunk( chunk, block.getDefaultState() ) ); chunk.setModified( false ); diff --git a/src/main/java/appeng/spatial/StorageHelper.java b/src/main/java/appeng/spatial/StorageHelper.java index ae91f58e7..b573aedf4 100644 --- a/src/main/java/appeng/spatial/StorageHelper.java +++ b/src/main/java/appeng/spatial/StorageHelper.java @@ -101,7 +101,7 @@ public class StorageHelper for( Entity passanger : passangers ) { passanger.dismountRidingEntity(); - passangersOnOtherSide.add( teleportEntity( passanger, link ) ); + passangersOnOtherSide.add( this.teleportEntity( passanger, link ) ); } // We keep track of all so we can remount them on the other side. } diff --git a/src/main/java/appeng/spatial/StorageWorldProvider.java b/src/main/java/appeng/spatial/StorageWorldProvider.java index c38f62c5b..162fae613 100644 --- a/src/main/java/appeng/spatial/StorageWorldProvider.java +++ b/src/main/java/appeng/spatial/StorageWorldProvider.java @@ -44,8 +44,8 @@ public class StorageWorldProvider extends WorldProvider public StorageWorldProvider() { this.hasSkyLight = true; - biome = AppEng.instance().getRegistration().getStorageBiome(); - this.biomeProvider = new BiomeProviderSingle( biome ); + this.biome = AppEng.instance().getRegistration().getStorageBiome(); + this.biomeProvider = new BiomeProviderSingle( this.biome ); } @Override @@ -155,7 +155,7 @@ public class StorageWorldProvider extends WorldProvider @Override public Biome getBiomeForCoords( BlockPos pos ) { - return biome; + return this.biome; } } diff --git a/src/main/java/appeng/tile/AEBaseInvTile.java b/src/main/java/appeng/tile/AEBaseInvTile.java index 03ee8d72f..265cf565b 100644 --- a/src/main/java/appeng/tile/AEBaseInvTile.java +++ b/src/main/java/appeng/tile/AEBaseInvTile.java @@ -246,15 +246,15 @@ public abstract class AEBaseInvTile extends AEBaseTile implements ISidedInventor { if( facing == null ) { - if( itemHandler == null ) + if( this.itemHandler == null ) { - itemHandler = new InvWrapper( getInternalInventory() ); + this.itemHandler = new InvWrapper( this.getInternalInventory() ); } - return (T) itemHandler; + return (T) this.itemHandler; } else { - return (T) sidedItemHandler.computeIfAbsent( facing, side -> new SidedInvWrapper( this, side ) ); + return (T) this.sidedItemHandler.computeIfAbsent( facing, side -> new SidedInvWrapper( this, side ) ); } } return super.getCapability( capability, facing ); diff --git a/src/main/java/appeng/tile/AEBaseTile.java b/src/main/java/appeng/tile/AEBaseTile.java index 94734de91..c0cb24272 100644 --- a/src/main/java/appeng/tile/AEBaseTile.java +++ b/src/main/java/appeng/tile/AEBaseTile.java @@ -118,11 +118,11 @@ public class AEBaseTile extends TileEntity implements IOrientable, ICommonTile, @Nonnull public IBlockState getBlockState() { - if( state == null ) + if( this.state == null ) { - state = world.getBlockState( getPos() ); + this.state = this.world.getBlockState( this.getPos() ); } - return state; + return this.state; } /** @@ -197,7 +197,7 @@ public class AEBaseTile extends TileEntity implements IOrientable, ICommonTile, @Override public SPacketUpdateTileEntity getUpdatePacket() { - return new SPacketUpdateTileEntity( this.pos, 64, getUpdateTag() ); + return new SPacketUpdateTileEntity( this.pos, 64, this.getUpdateTag() ); } private boolean hasHandlerFor( final TileEventType type ) @@ -213,7 +213,7 @@ public class AEBaseTile extends TileEntity implements IOrientable, ICommonTile, // / pkt.actionType if( pkt.getTileEntityType() == 64 ) { - handleUpdateTag( pkt.getNbtCompound() ); + this.handleUpdateTag( pkt.getNbtCompound() ); } } @@ -260,16 +260,16 @@ public class AEBaseTile extends TileEntity implements IOrientable, ICommonTile, @Override public NBTTagCompound getUpdateTag() { - final NBTTagCompound data = writeUpdateData(); + final NBTTagCompound data = this.writeUpdateData(); if( data == null ) { return new NBTTagCompound(); } - data.setInteger( "x", pos.getX() ); - data.setInteger( "y", pos.getY() ); - data.setInteger( "z", pos.getZ() ); + data.setInteger( "x", this.pos.getX() ); + data.setInteger( "y", this.pos.getY() ); + data.setInteger( "z", this.pos.getZ() ); return data; } @@ -340,7 +340,7 @@ public class AEBaseTile extends TileEntity implements IOrientable, ICommonTile, if( this.world != null ) { AELog.blockUpdate( this.pos, this ); - this.world.notifyBlockUpdate( this.pos, getBlockState(), getBlockState(), 3 ); + this.world.notifyBlockUpdate( this.pos, this.getBlockState(), this.getBlockState(), 3 ); } } } diff --git a/src/main/java/appeng/tile/inventory/AppEngInternalInventory.java b/src/main/java/appeng/tile/inventory/AppEngInternalInventory.java index ba9a314ed..2504c3b0f 100644 --- a/src/main/java/appeng/tile/inventory/AppEngInternalInventory.java +++ b/src/main/java/appeng/tile/inventory/AppEngInternalInventory.java @@ -126,7 +126,7 @@ public class AppEngInternalInventory implements IInventory, Iterable @Override public void setInventorySlotContents( final int slot, final ItemStack newItemStack ) { - final ItemStack oldStack = getOldStack( slot ); + final ItemStack oldStack = this.getOldStack( slot ); this.inv[slot] = newItemStack; if( this.getTileEntity() != null && this.eventsEnabled() ) diff --git a/src/main/java/appeng/tile/misc/TileCharger.java b/src/main/java/appeng/tile/misc/TileCharger.java index 6ad82f314..0e66d082b 100644 --- a/src/main/java/appeng/tile/misc/TileCharger.java +++ b/src/main/java/appeng/tile/misc/TileCharger.java @@ -245,7 +245,7 @@ public class TileCharger extends AENetworkPowerTile implements ICrankable, IGrid @Override public TickRateModulation tickingRequest( IGridNode node, int TicksSinceLastCall ) { - return doWork() ? TickRateModulation.FASTER : TickRateModulation.SLEEP; + return this.doWork() ? TickRateModulation.FASTER : TickRateModulation.SLEEP; } private boolean doWork() diff --git a/src/main/java/appeng/tile/misc/TileCondenser.java b/src/main/java/appeng/tile/misc/TileCondenser.java index 1b9be6e6f..ecdb70d40 100644 --- a/src/main/java/appeng/tile/misc/TileCondenser.java +++ b/src/main/java/appeng/tile/misc/TileCondenser.java @@ -287,15 +287,15 @@ public class TileCondenser extends AEBaseInvTile implements IConfigManagerHost, { if( capability == CapabilityItemHandler.ITEM_HANDLER_CAPABILITY ) { - return (T) itemHandler; + return (T) this.itemHandler; } else if( capability == CapabilityFluidHandler.FLUID_HANDLER_CAPABILITY ) { - return (T) fluidHandler; + return (T) this.fluidHandler; } else if( capability == Capabilities.STORAGE_MONITORABLE_ACCESSOR ) { - return (T) meHandler; + return (T) this.meHandler; } return super.getCapability( capability, facing ); } @@ -326,7 +326,7 @@ public class TileCondenser extends AEBaseInvTile implements IConfigManagerHost, } if( !simulate && !stack.isEmpty() ) { - addPower( stack.getCount() ); + TileCondenser.this.addPower( stack.getCount() ); } return ItemStack.EMPTY; } @@ -364,7 +364,7 @@ public class TileCondenser extends AEBaseInvTile implements IConfigManagerHost, { if( doFill ) { - addPower( ( resource == null ? 0.0 : (double) resource.amount ) / 500.0 ); + TileCondenser.this.addPower( ( resource == null ? 0.0 : (double) resource.amount ) / 500.0 ); } return resource == null ? 0 : resource.amount; @@ -408,13 +408,13 @@ public class TileCondenser extends AEBaseInvTile implements IConfigManagerHost, @Override public IMEMonitor getItemInventory() { - return itemInventory; + return this.itemInventory; } @Override public IMEMonitor getFluidInventory() { - return fluidInventory; + return this.fluidInventory; } } diff --git a/src/main/java/appeng/tile/misc/TileInscriber.java b/src/main/java/appeng/tile/misc/TileInscriber.java index b2b7b9f84..71b41c6e4 100644 --- a/src/main/java/appeng/tile/misc/TileInscriber.java +++ b/src/main/java/appeng/tile/misc/TileInscriber.java @@ -589,17 +589,17 @@ public class TileInscriber extends AENetworkPowerTile implements IGridTickable, { if( capability == CapabilityItemHandler.ITEM_HANDLER_CAPABILITY ) { - if( facing == getUp() ) + if( facing == this.getUp() ) { - return (T) topItemHandler; + return (T) this.topItemHandler; } - else if( facing == getUp().getOpposite() ) + else if( facing == this.getUp().getOpposite() ) { - return (T) bottomItemHandler; + return (T) this.bottomItemHandler; } else { - return (T) sideItemHandler; + return (T) this.sideItemHandler; } } @@ -673,7 +673,7 @@ public class TileInscriber extends AENetworkPowerTile implements IGridTickable, @Override public int getSlots() { - return insertSlot != extractSlot ? 2 : 1; + return this.insertSlot != this.extractSlot ? 2 : 1; } @Override @@ -682,11 +682,11 @@ public class TileInscriber extends AENetworkPowerTile implements IGridTickable, { if( slot == 0 ) { - return inv.getStackInSlot( insertSlot ); + return TileInscriber.this.inv.getStackInSlot( this.insertSlot ); } - else if( insertSlot != extractSlot && slot == 1 ) + else if( this.insertSlot != this.extractSlot && slot == 1 ) { - return inv.getStackInSlot( extractSlot ); + return TileInscriber.this.inv.getStackInSlot( this.extractSlot ); } return ItemStack.EMPTY; } @@ -701,12 +701,12 @@ public class TileInscriber extends AENetworkPowerTile implements IGridTickable, } // If there's already an item stack in the slot, we don't allow insertion and don't do any other checks - if( !inv.getStackInSlot( insertSlot ).isEmpty() ) + if( !TileInscriber.this.inv.getStackInSlot( this.insertSlot ).isEmpty() ) { return stack; } - AdaptorIInventory adapter = new AdaptorIInventory( new WrapperInventoryRange( TileInscriber.this, insertSlot, 1, true ) ); + AdaptorIInventory adapter = new AdaptorIInventory( new WrapperInventoryRange( TileInscriber.this, this.insertSlot, 1, true ) ); if( simulate ) { @@ -722,14 +722,14 @@ public class TileInscriber extends AENetworkPowerTile implements IGridTickable, @Nonnull public ItemStack extractItem( int slot, int amount, boolean simulate ) { - final int validExtractSlot = ( insertSlot == extractSlot ) ? 0 : 1; + final int validExtractSlot = ( this.insertSlot == this.extractSlot ) ? 0 : 1; if( slot != validExtractSlot || amount == 0 ) { return ItemStack.EMPTY; } - AdaptorIInventory adapter = new AdaptorIInventory( new WrapperInventoryRange( TileInscriber.this, extractSlot, 1, true ) ); + AdaptorIInventory adapter = new AdaptorIInventory( new WrapperInventoryRange( TileInscriber.this, this.extractSlot, 1, true ) ); if( simulate ) { diff --git a/src/main/java/appeng/tile/misc/TileInterface.java b/src/main/java/appeng/tile/misc/TileInterface.java index 3267bb0d0..2632f458b 100644 --- a/src/main/java/appeng/tile/misc/TileInterface.java +++ b/src/main/java/appeng/tile/misc/TileInterface.java @@ -95,25 +95,25 @@ public class TileInterface extends AENetworkInvTile implements IGridTickable, II EnumFacing newForward = facing; - if( !omniDirectional && getForward() == facing.getOpposite() ) + if( !this.omniDirectional && this.getForward() == facing.getOpposite() ) { newForward = facing; } - else if( !omniDirectional && ( getForward() == facing || getForward() == facing.getOpposite() ) ) + else if( !this.omniDirectional && ( this.getForward() == facing || this.getForward() == facing.getOpposite() ) ) { - omniDirectional = true; + this.omniDirectional = true; } - else if( omniDirectional ) + else if( this.omniDirectional ) { newForward = facing.getOpposite(); - omniDirectional = false; + this.omniDirectional = false; } else { - newForward = Platform.rotateAround( getForward(), facing ); + newForward = Platform.rotateAround( this.getForward(), facing ); } - if( omniDirectional ) + if( this.omniDirectional ) { this.setOrientation( EnumFacing.NORTH, EnumFacing.UP ); } @@ -134,13 +134,13 @@ public class TileInterface extends AENetworkInvTile implements IGridTickable, II private void configureNodeSides() { - if( omniDirectional ) + if( this.omniDirectional ) { this.getProxy().setValidSides( EnumSet.allOf( EnumFacing.class ) ); } else { - this.getProxy().setValidSides( EnumSet.complementOf( EnumSet.of( getForward() ) ) ); + this.getProxy().setValidSides( EnumSet.complementOf( EnumSet.of( this.getForward() ) ) ); } } @@ -174,7 +174,7 @@ public class TileInterface extends AENetworkInvTile implements IGridTickable, II @TileEvent( TileEventType.WORLD_NBT_WRITE ) public void writeToNBT_TileInterface( final NBTTagCompound data ) { - data.setBoolean( "omniDirectional", omniDirectional ); + data.setBoolean( "omniDirectional", this.omniDirectional ); this.duality.writeToNBT( data ); } @@ -191,13 +191,13 @@ public class TileInterface extends AENetworkInvTile implements IGridTickable, II { boolean oldOmniDirectional = this.omniDirectional; this.omniDirectional = data.readBoolean(); - return oldOmniDirectional != omniDirectional; + return oldOmniDirectional != this.omniDirectional; } @TileEvent( TileEventType.NETWORK_WRITE ) public void writeToStream_TileInterface( final ByteBuf data ) { - data.writeBoolean( omniDirectional ); + data.writeBoolean( this.omniDirectional ); } @Override @@ -263,11 +263,11 @@ public class TileInterface extends AENetworkInvTile implements IGridTickable, II @Override public EnumSet getTargets() { - if( omniDirectional ) + if( this.omniDirectional ) { return EnumSet.allOf( EnumFacing.class ); } - return EnumSet.of( getForward() ); + return EnumSet.of( this.getForward() ); } @Override diff --git a/src/main/java/appeng/tile/networking/TileCableBus.java b/src/main/java/appeng/tile/networking/TileCableBus.java index f9b1b13bb..3a4296550 100644 --- a/src/main/java/appeng/tile/networking/TileCableBus.java +++ b/src/main/java/appeng/tile/networking/TileCableBus.java @@ -105,7 +105,7 @@ public class TileCableBus extends AEBaseTile implements AEMultiTile, ICustomColl { final TileCableBus tcb = (TileCableBus) BlockCableBus.getTesrTile().newInstance(); tcb.copyFrom( this ); - this.getWorld().setTileEntity( pos, tcb ); + this.getWorld().setTileEntity( this.pos, tcb ); } catch( final Throwable ignored ) { @@ -388,7 +388,7 @@ public class TileCableBus extends AEBaseTile implements AEMultiTile, ICustomColl // Note that null will be translated to INTERNAL here AEPartLocation partLocation = AEPartLocation.fromFacing( fromSide ); - IPart part = getPart( partLocation ); + IPart part = this.getPart( partLocation ); boolean result = part != null && part.hasCapability( capabilityClass ); return result || super.hasCapability( capabilityClass, fromSide ); @@ -400,7 +400,7 @@ public class TileCableBus extends AEBaseTile implements AEMultiTile, ICustomColl // Note that null will be translated to INTERNAL here AEPartLocation partLocation = AEPartLocation.fromFacing( fromSide ); - IPart part = getPart( partLocation ); + IPart part = this.getPart( partLocation ); T result = part == null ? null : part.getCapability( capabilityClass ); if( result != null ) diff --git a/src/main/java/appeng/tile/networking/TileCableBusTESR.java b/src/main/java/appeng/tile/networking/TileCableBusTESR.java index 47f6989df..b775765ec 100644 --- a/src/main/java/appeng/tile/networking/TileCableBusTESR.java +++ b/src/main/java/appeng/tile/networking/TileCableBusTESR.java @@ -37,7 +37,7 @@ public class TileCableBusTESR extends TileCableBus { final TileCableBus tcb = (TileCableBus) BlockCableBus.getNoTesrTile().newInstance(); tcb.copyFrom( this ); - this.getWorld().setTileEntity( pos, tcb ); + this.getWorld().setTileEntity( this.pos, tcb ); } catch( final Throwable ignored ) { diff --git a/src/main/java/appeng/tile/powersink/AERootPoweredTile.java b/src/main/java/appeng/tile/powersink/AERootPoweredTile.java index bcceda8b9..74526eed2 100644 --- a/src/main/java/appeng/tile/powersink/AERootPoweredTile.java +++ b/src/main/java/appeng/tile/powersink/AERootPoweredTile.java @@ -61,13 +61,13 @@ public abstract class AERootPoweredTile extends AEBaseInvTile implements IAEPowe public AERootPoweredTile() { - forgeEnergyAdapter = new ForgeEnergyAdapter( this ); + this.forgeEnergyAdapter = new ForgeEnergyAdapter( this ); if( Capabilities.TESLA_CONSUMER != null ) { - teslaEnergyAdapter = new TeslaEnergyAdapter( this ); + this.teslaEnergyAdapter = new TeslaEnergyAdapter( this ); } - ic2Sink = Integrations.ic2().createPowerSink( this, this ); - ic2Sink.setValidFaces( internalPowerSides ); + this.ic2Sink = Integrations.ic2().createPowerSink( this, this ); + this.ic2Sink.setValidFaces( this.internalPowerSides ); } protected EnumSet getPowerSides() @@ -78,7 +78,7 @@ public abstract class AERootPoweredTile extends AEBaseInvTile implements IAEPowe protected void setPowerSides( final EnumSet sides ) { this.internalPowerSides = sides; - ic2Sink.setValidFaces( sides ); + this.ic2Sink.setValidFaces( sides ); // trigger re-calc! } @@ -262,7 +262,7 @@ public abstract class AERootPoweredTile extends AEBaseInvTile implements IAEPowe { super.onReady(); - ic2Sink.onLoad(); + this.ic2Sink.onLoad(); } @Override @@ -270,7 +270,7 @@ public abstract class AERootPoweredTile extends AEBaseInvTile implements IAEPowe { super.onChunkUnload(); - ic2Sink.onChunkUnload(); + this.ic2Sink.onChunkUnload(); } @Override @@ -278,7 +278,7 @@ public abstract class AERootPoweredTile extends AEBaseInvTile implements IAEPowe { super.invalidate(); - ic2Sink.invalidate(); + this.ic2Sink.invalidate(); } @Override @@ -310,14 +310,14 @@ public abstract class AERootPoweredTile extends AEBaseInvTile implements IAEPowe { if( this.getPowerSides().contains( facing ) ) { - return (T) forgeEnergyAdapter; + return (T) this.forgeEnergyAdapter; } } else if( capability == Capabilities.TESLA_CONSUMER ) { if( this.getPowerSides().contains( facing ) ) { - return (T) teslaEnergyAdapter; + return (T) this.teslaEnergyAdapter; } } diff --git a/src/main/java/appeng/tile/powersink/ForgeEnergyAdapter.java b/src/main/java/appeng/tile/powersink/ForgeEnergyAdapter.java index c6e3380a5..3c257375a 100644 --- a/src/main/java/appeng/tile/powersink/ForgeEnergyAdapter.java +++ b/src/main/java/appeng/tile/powersink/ForgeEnergyAdapter.java @@ -23,12 +23,12 @@ class ForgeEnergyAdapter implements IEnergyStorage @Override public final int receiveEnergy( int maxReceive, boolean simulate ) { - final int networkDemand = (int) Math.floor( sink.getExternalPowerDemand( PowerUnits.RF, maxReceive ) ); + final int networkDemand = (int) Math.floor( this.sink.getExternalPowerDemand( PowerUnits.RF, maxReceive ) ); final int used = Math.min( maxReceive, networkDemand ); if( !simulate ) { - sink.injectExternalPower( PowerUnits.RF, used ); + this.sink.injectExternalPower( PowerUnits.RF, used ); } return used; @@ -37,13 +37,13 @@ class ForgeEnergyAdapter implements IEnergyStorage @Override public final int getEnergyStored() { - return (int) Math.floor( PowerUnits.AE.convertTo( PowerUnits.RF, sink.getAECurrentPower() ) ); + return (int) Math.floor( PowerUnits.AE.convertTo( PowerUnits.RF, this.sink.getAECurrentPower() ) ); } @Override public final int getMaxEnergyStored() { - return (int) Math.floor( PowerUnits.AE.convertTo( PowerUnits.RF, sink.getAEMaxPower() ) ); + return (int) Math.floor( PowerUnits.AE.convertTo( PowerUnits.RF, this.sink.getAEMaxPower() ) ); } @Override diff --git a/src/main/java/appeng/tile/powersink/TeslaEnergyAdapter.java b/src/main/java/appeng/tile/powersink/TeslaEnergyAdapter.java index 1fba255df..6d3c71dc8 100644 --- a/src/main/java/appeng/tile/powersink/TeslaEnergyAdapter.java +++ b/src/main/java/appeng/tile/powersink/TeslaEnergyAdapter.java @@ -43,12 +43,12 @@ class TeslaEnergyAdapter implements ITeslaConsumer // Cut it down to what we can represent in a double double powerDbl = (double) power; - double networkDemand = sink.getExternalPowerDemand( PowerUnits.RF, powerDbl ); + double networkDemand = this.sink.getExternalPowerDemand( PowerUnits.RF, powerDbl ); long used = (long) Math.min( powerDbl, networkDemand ); if( !simulated ) { - sink.injectExternalPower( PowerUnits.RF, used ); + this.sink.injectExternalPower( PowerUnits.RF, used ); } return used; diff --git a/src/main/java/appeng/tile/qnb/TileQuantumBridge.java b/src/main/java/appeng/tile/qnb/TileQuantumBridge.java index fde14bd2f..746f8998b 100644 --- a/src/main/java/appeng/tile/qnb/TileQuantumBridge.java +++ b/src/main/java/appeng/tile/qnb/TileQuantumBridge.java @@ -147,7 +147,7 @@ public class TileQuantumBridge extends AENetworkInvTile implements IAEMultiBlock .blocks() .quantumLink() .maybeBlock() - .map( link -> getBlockType() == link ) + .map( link -> this.getBlockType() == link ) .orElse( false ); } diff --git a/src/main/java/appeng/tile/storage/TileChest.java b/src/main/java/appeng/tile/storage/TileChest.java index 83c41b0e3..3585b8136 100644 --- a/src/main/java/appeng/tile/storage/TileChest.java +++ b/src/main/java/appeng/tile/storage/TileChest.java @@ -931,11 +931,11 @@ public class TileChest extends AENetworkPowerTile implements IMEChest, ITerminal @Override public boolean hasCapability( Capability capability, EnumFacing facing ) { - if( capability == CapabilityFluidHandler.FLUID_HANDLER_CAPABILITY && this.fluidHandler != null && facing != getForward() ) + if( capability == CapabilityFluidHandler.FLUID_HANDLER_CAPABILITY && this.fluidHandler != null && facing != this.getForward() ) { return true; } - if( capability == Capabilities.STORAGE_MONITORABLE_ACCESSOR && this.accessor != null && facing != getForward() ) + if( capability == Capabilities.STORAGE_MONITORABLE_ACCESSOR && this.accessor != null && facing != this.getForward() ) { return true; } @@ -946,13 +946,13 @@ public class TileChest extends AENetworkPowerTile implements IMEChest, ITerminal @Override public T getCapability( Capability capability, @Nullable EnumFacing facing ) { - if( capability == CapabilityFluidHandler.FLUID_HANDLER_CAPABILITY && this.fluidHandler != null && facing != getForward() ) + if( capability == CapabilityFluidHandler.FLUID_HANDLER_CAPABILITY && this.fluidHandler != null && facing != this.getForward() ) { return (T) this.fluidHandler; } - if( capability == Capabilities.STORAGE_MONITORABLE_ACCESSOR && this.accessor != null && facing != getForward() ) + if( capability == Capabilities.STORAGE_MONITORABLE_ACCESSOR && this.accessor != null && facing != this.getForward() ) { - return (T) accessor; + return (T) this.accessor; } return super.getCapability( capability, facing ); } @@ -963,7 +963,7 @@ public class TileChest extends AENetworkPowerTile implements IMEChest, ITerminal @Override public IStorageMonitorable getInventory( BaseActionSource src ) { - if( Platform.canAccess( getProxy(), src ) ) + if( Platform.canAccess( TileChest.this.getProxy(), src ) ) { return TileChest.this; } diff --git a/src/main/java/appeng/tile/storage/TileSkyChest.java b/src/main/java/appeng/tile/storage/TileSkyChest.java index f19221be4..916311dd0 100644 --- a/src/main/java/appeng/tile/storage/TileSkyChest.java +++ b/src/main/java/appeng/tile/storage/TileSkyChest.java @@ -227,7 +227,7 @@ public class TileSkyChest extends AEBaseInvTile implements ITickable public float getPrevLidAngle() { - return prevLidAngle; + return this.prevLidAngle; } public void setPrevLidAngle( float prevLidAngle ) diff --git a/src/main/java/appeng/util/helpers/ItemComparisonHelper.java b/src/main/java/appeng/util/helpers/ItemComparisonHelper.java index 3587b4cc5..cbfa5c551 100644 --- a/src/main/java/appeng/util/helpers/ItemComparisonHelper.java +++ b/src/main/java/appeng/util/helpers/ItemComparisonHelper.java @@ -108,7 +108,7 @@ public class ItemComparisonHelper */ public boolean isSameItem( @Nonnull final ItemStack is, @Nonnull final ItemStack filter ) { - return isEqualItem( is, filter ) && hasSameNbtTag( is, filter ); + return this.isEqualItem( is, filter ) && this.hasSameNbtTag( is, filter ); } /** @@ -240,7 +240,7 @@ public class ItemComparisonHelper return false; } - if( !isNbtTagEqual( tag, aTag ) ) + if( !this.isNbtTagEqual( tag, aTag ) ) { return false; } @@ -258,8 +258,8 @@ public class ItemComparisonHelper return false; } - final List tag = tagList( lA ); - final List aTag = tagList( lB ); + final List tag = this.tagList( lA ); + final List aTag = this.tagList( lB ); if( tag.size() != aTag.size() ) { return false; @@ -272,7 +272,7 @@ public class ItemComparisonHelper return false; } - if( !isNbtTagEqual( tag.get( x ), aTag.get( x ) ) ) + if( !this.isNbtTagEqual( tag.get( x ), aTag.get( x ) ) ) { return false; } @@ -327,7 +327,7 @@ public class ItemComparisonHelper for( final String name : cA ) { - hash += name.hashCode() ^ createUnorderedNbtHash( ctA.getTag( name ) ); + hash += name.hashCode() ^ this.createUnorderedNbtHash( ctA.getTag( name ) ); } return hash; @@ -338,10 +338,10 @@ public class ItemComparisonHelper final NBTTagList lA = (NBTTagList) nbt; hash += 9 * lA.tagCount(); - final List l = tagList( lA ); + final List l = this.tagList( lA ); for( int x = 0; x < l.size(); x++ ) { - hash += ( (Integer) x ).hashCode() ^ createUnorderedNbtHash( l.get( x ) ); + hash += ( (Integer) x ).hashCode() ^ this.createUnorderedNbtHash( l.get( x ) ); } return hash; @@ -413,7 +413,7 @@ public class ItemComparisonHelper return ta == tb; } - return isNbtTagEqual( ta, tb ); + return this.isNbtTagEqual( ta, tb ); } private List tagList( final NBTTagList lB ) diff --git a/src/main/java/appeng/util/inv/AdaptorItemHandler.java b/src/main/java/appeng/util/inv/AdaptorItemHandler.java index 6025d7400..afd7bb31c 100644 --- a/src/main/java/appeng/util/inv/AdaptorItemHandler.java +++ b/src/main/java/appeng/util/inv/AdaptorItemHandler.java @@ -41,12 +41,12 @@ public class AdaptorItemHandler extends InventoryAdaptor @Override public ItemStack removeItems( int amount, ItemStack filter, IInventoryDestination destination ) { - int slots = itemHandler.getSlots(); + int slots = this.itemHandler.getSlots(); ItemStack rv = ItemStack.EMPTY; for( int slot = 0; slot < slots && amount > 0; slot++ ) { - final ItemStack is = itemHandler.getStackInSlot( slot ); + final ItemStack is = this.itemHandler.getStackInSlot( slot ); if( is.isEmpty() || ( !filter.isEmpty() && !Platform.itemComparisons().isSameItem( is, filter ) ) ) { continue; @@ -54,7 +54,7 @@ public class AdaptorItemHandler extends InventoryAdaptor if( destination != null ) { - ItemStack extracted = itemHandler.extractItem( slot, amount, true ); + ItemStack extracted = this.itemHandler.extractItem( slot, amount, true ); if( extracted.isEmpty() ) { continue; @@ -67,7 +67,7 @@ public class AdaptorItemHandler extends InventoryAdaptor } // Attempt extracting it - ItemStack extracted = itemHandler.extractItem( slot, amount, false ); + ItemStack extracted = this.itemHandler.extractItem( slot, amount, false ); if( extracted.isEmpty() ) { @@ -95,15 +95,15 @@ public class AdaptorItemHandler extends InventoryAdaptor @Override public ItemStack simulateRemove( int amount, ItemStack filter, IInventoryDestination destination ) { - int slots = itemHandler.getSlots(); + int slots = this.itemHandler.getSlots(); ItemStack rv = ItemStack.EMPTY; for( int slot = 0; slot < slots && amount > 0; slot++ ) { - final ItemStack is = itemHandler.getStackInSlot( slot ); + final ItemStack is = this.itemHandler.getStackInSlot( slot ); if( !is.isEmpty() && ( filter.isEmpty() || Platform.itemComparisons().isSameItem( is, filter ) ) ) { - ItemStack extracted = itemHandler.extractItem( slot, amount, true ); + ItemStack extracted = this.itemHandler.extractItem( slot, amount, true ); if( extracted.isEmpty() ) { @@ -144,12 +144,12 @@ public class AdaptorItemHandler extends InventoryAdaptor @Override public ItemStack removeSimilarItems( int amount, ItemStack filter, FuzzyMode fuzzyMode, IInventoryDestination destination ) { - int slots = itemHandler.getSlots(); + int slots = this.itemHandler.getSlots(); ItemStack extracted = ItemStack.EMPTY; for( int slot = 0; slot < slots && extracted.isEmpty(); slot++ ) { - final ItemStack is = itemHandler.getStackInSlot( slot ); + final ItemStack is = this.itemHandler.getStackInSlot( slot ); if( is.isEmpty() || ( !filter.isEmpty() && !Platform.itemComparisons().isFuzzyEqualItem( is, filter, fuzzyMode ) ) ) { continue; @@ -157,7 +157,7 @@ public class AdaptorItemHandler extends InventoryAdaptor if( destination != null ) { - ItemStack simulated = itemHandler.extractItem( slot, amount, true ); + ItemStack simulated = this.itemHandler.extractItem( slot, amount, true ); if( simulated.isEmpty() ) { continue; @@ -170,7 +170,7 @@ public class AdaptorItemHandler extends InventoryAdaptor } // Attempt extracting it - extracted = itemHandler.extractItem( slot, amount, false ); + extracted = this.itemHandler.extractItem( slot, amount, false ); } return extracted; @@ -179,19 +179,19 @@ public class AdaptorItemHandler extends InventoryAdaptor @Override public ItemStack simulateSimilarRemove( int amount, ItemStack filter, FuzzyMode fuzzyMode, IInventoryDestination destination ) { - int slots = itemHandler.getSlots(); + int slots = this.itemHandler.getSlots(); ItemStack extracted = ItemStack.EMPTY; for( int slot = 0; slot < slots && extracted.isEmpty(); slot++ ) { - final ItemStack is = itemHandler.getStackInSlot( slot ); + final ItemStack is = this.itemHandler.getStackInSlot( slot ); if( is.isEmpty() || ( !filter.isEmpty() && !Platform.itemComparisons().isFuzzyEqualItem( is, filter, fuzzyMode ) ) ) { continue; } // Attempt extracting it - extracted = itemHandler.extractItem( slot, amount, true ); + extracted = this.itemHandler.extractItem( slot, amount, true ); if( !extracted.isEmpty() && destination != null ) { @@ -208,13 +208,13 @@ public class AdaptorItemHandler extends InventoryAdaptor @Override public ItemStack addItems( ItemStack toBeAdded ) { - return addItems( toBeAdded, false ); + return this.addItems( toBeAdded, false ); } @Override public ItemStack simulateAdd( ItemStack toBeSimulated ) { - return addItems( toBeSimulated, true ); + return this.addItems( toBeSimulated, true ); } private ItemStack addItems( final ItemStack itemsToAdd, final boolean simulate ) @@ -226,13 +226,13 @@ public class AdaptorItemHandler extends InventoryAdaptor ItemStack left = itemsToAdd.copy(); - for( int slot = 0; slot < itemHandler.getSlots(); slot++ ) + for( int slot = 0; slot < this.itemHandler.getSlots(); slot++ ) { - ItemStack is = itemHandler.getStackInSlot( slot ); + ItemStack is = this.itemHandler.getStackInSlot( slot ); if( is.isEmpty() || Platform.itemComparisons().isSameItem( is, left ) ) { - left = itemHandler.insertItem( slot, left, simulate ); + left = this.itemHandler.insertItem( slot, left, simulate ); if( left.isEmpty() || left.getCount() <= 0 ) { @@ -247,10 +247,10 @@ public class AdaptorItemHandler extends InventoryAdaptor @Override public boolean containsItems() { - int slots = itemHandler.getSlots(); + int slots = this.itemHandler.getSlots(); for( int slot = 0; slot < slots; slot++ ) { - if( !itemHandler.getStackInSlot( slot ).isEmpty() ) + if( !this.itemHandler.getStackInSlot( slot ).isEmpty() ) { return true; } @@ -261,6 +261,6 @@ public class AdaptorItemHandler extends InventoryAdaptor @Override public Iterator iterator() { - return new ItemHandlerIterator( itemHandler ); + return new ItemHandlerIterator( this.itemHandler ); } } diff --git a/src/main/java/appeng/util/inv/ItemHandlerIterator.java b/src/main/java/appeng/util/inv/ItemHandlerIterator.java index 77110d5dc..6994cbbb4 100644 --- a/src/main/java/appeng/util/inv/ItemHandlerIterator.java +++ b/src/main/java/appeng/util/inv/ItemHandlerIterator.java @@ -42,21 +42,21 @@ class ItemHandlerIterator implements Iterator @Override public boolean hasNext() { - return slot < itemHandler.getSlots(); + return this.slot < this.itemHandler.getSlots(); } @Override public ItemSlot next() { - if( slot >= itemHandler.getSlots() ) + if( this.slot >= this.itemHandler.getSlots() ) { throw new NoSuchElementException(); } - itemSlot.setExtractable( !itemHandler.extractItem( slot, 1, true ).isEmpty() ); - itemSlot.setItemStack( itemHandler.getStackInSlot( slot ) ); - itemSlot.setSlot( slot ); - slot++; - return itemSlot; + this.itemSlot.setExtractable( !this.itemHandler.extractItem( this.slot, 1, true ).isEmpty() ); + this.itemSlot.setItemStack( this.itemHandler.getStackInSlot( this.slot ) ); + this.itemSlot.setSlot( this.slot ); + this.slot++; + return this.itemSlot; } } diff --git a/src/main/java/appeng/worldgen/MeteoritePlacer.java b/src/main/java/appeng/worldgen/MeteoritePlacer.java index de28aeaa8..f5c19c35e 100644 --- a/src/main/java/appeng/worldgen/MeteoritePlacer.java +++ b/src/main/java/appeng/worldgen/MeteoritePlacer.java @@ -216,7 +216,7 @@ public final class MeteoritePlacer { // spawn meteor - this.skyStoneDefinition.maybeBlock().ifPresent( block -> placeMeteoriteSkyStone( w, x, y, z, block ) ); + this.skyStoneDefinition.maybeBlock().ifPresent( block -> this.placeMeteoriteSkyStone( w, x, y, z, block ) ); if( AEConfig.instance().isFeatureEnabled( AEFeature.SPAWN_PRESSES_IN_METEORITES ) ) { diff --git a/src/main/java/appeng/worldgen/meteorite/Fallout.java b/src/main/java/appeng/worldgen/meteorite/Fallout.java index 82dd34c60..955d0e37e 100644 --- a/src/main/java/appeng/worldgen/meteorite/Fallout.java +++ b/src/main/java/appeng/worldgen/meteorite/Fallout.java @@ -79,7 +79,7 @@ public class Fallout } else if( a > 0.6 ) { - skyStoneDefinition.maybeBlock().ifPresent( block -> this.putter.put( w, x, y, z, block ) ); + this.skyStoneDefinition.maybeBlock().ifPresent( block -> this.putter.put( w, x, y, z, block ) ); } else if( a > 0.5 ) { diff --git a/src/test/java/appeng/client/render/UVLightmapJsonTest.java b/src/test/java/appeng/client/render/UVLightmapJsonTest.java index 7ed4ff184..490bbd6ab 100644 --- a/src/test/java/appeng/client/render/UVLightmapJsonTest.java +++ b/src/test/java/appeng/client/render/UVLightmapJsonTest.java @@ -76,7 +76,7 @@ public class UVLightmapJsonTest @Override public AxisAlignedBB getBoundingBox( IBlockState state, IBlockAccess source, BlockPos pos ) { - return box; + return this.box; } @SuppressWarnings( "deprecation" ) diff --git a/src/test/java/appeng/coremod/AppEngCoreTest.java b/src/test/java/appeng/coremod/AppEngCoreTest.java index 45458d2a1..a4df14ac4 100644 --- a/src/test/java/appeng/coremod/AppEngCoreTest.java +++ b/src/test/java/appeng/coremod/AppEngCoreTest.java @@ -38,19 +38,19 @@ public class AppEngCoreTest @Test public void testTransformerStringsMatchActualClasses() { - assertArrayEquals( EXPECTED_TRANSFORMERS, coreModContainer.getASMTransformerClass() ); + assertArrayEquals( EXPECTED_TRANSFORMERS, this.coreModContainer.getASMTransformerClass() ); } @Test public void testContainerClassExists() { - assertEquals( EXPECTED_CONTAINER_CLASS_NAME, coreModContainer.getModContainerClass() ); + assertEquals( EXPECTED_CONTAINER_CLASS_NAME, this.coreModContainer.getModContainerClass() ); } @Test public void testContainerModId() { - assertEquals( EXPECTED_CONTAINER_MOD_ID, coreModContainer.getModId() ); + assertEquals( EXPECTED_CONTAINER_MOD_ID, this.coreModContainer.getModId() ); } }