diff --git a/src/api/java/appeng/api/util/AEAxisAlignedBB.java b/src/api/java/appeng/api/util/AEAxisAlignedBB.java index 6b36252a..415c67f9 100644 --- a/src/api/java/appeng/api/util/AEAxisAlignedBB.java +++ b/src/api/java/appeng/api/util/AEAxisAlignedBB.java @@ -16,17 +16,17 @@ public class AEAxisAlignedBB public AxisAlignedBB getBoundingBox() { - return AxisAlignedBB.fromBounds( minX, minY, minZ, maxX, maxY, maxZ ); + return AxisAlignedBB.fromBounds( this.minX, this.minY, this.minZ, this.maxX, this.maxY, this.maxZ ); } public AEAxisAlignedBB( final double a, final double b, final double c, final double d, final double e, final double f) { - minX=a; - minY=b; - minZ=c; - maxX=d; - maxY=e; - maxZ=f; + this.minX =a; + this.minY =b; + this.minZ =c; + this.maxX =d; + this.maxY =e; + this.maxZ =f; } public static AEAxisAlignedBB fromBounds( diff --git a/src/api/java/appeng/api/util/AEPartLocation.java b/src/api/java/appeng/api/util/AEPartLocation.java index 9364d6f7..5409ef5a 100644 --- a/src/api/java/appeng/api/util/AEPartLocation.java +++ b/src/api/java/appeng/api/util/AEPartLocation.java @@ -53,9 +53,9 @@ public enum AEPartLocation private AEPartLocation( final int x, final int y, final int z) { - xOffset = x; - yOffset = y; - zOffset = z; + this.xOffset = x; + this.yOffset = y; + this.zOffset = z; } /** @@ -86,7 +86,7 @@ public enum AEPartLocation */ public AEPartLocation getOpposite() { - return fromOrdinal(OPPOSITES[ordinal()]); + return fromOrdinal(OPPOSITES[this.ordinal()]); } /** @@ -94,7 +94,7 @@ public enum AEPartLocation */ public EnumFacing getFacing() { - return facings[ordinal()]; + return facings[this.ordinal()]; } } diff --git a/src/api/java/appeng/api/util/WorldCoord.java b/src/api/java/appeng/api/util/WorldCoord.java index 0d207018..854ac827 100644 --- a/src/api/java/appeng/api/util/WorldCoord.java +++ b/src/api/java/appeng/api/util/WorldCoord.java @@ -54,9 +54,9 @@ public class WorldCoord public WorldCoord( final BlockPos pos ) { - x = pos.getX(); - y = pos.getY(); - z = pos.getZ(); + this.x = pos.getX(); + this.y = pos.getY(); + this.z = pos.getZ(); } public WorldCoord subtract( final AEPartLocation direction, final int length ) @@ -177,7 +177,7 @@ public class WorldCoord public BlockPos getPos() { - return new BlockPos(x,y,z); + return new BlockPos( this.x, this.y, this.z ); } @Override diff --git a/src/main/java/appeng/block/AEBaseBlock.java b/src/main/java/appeng/block/AEBaseBlock.java index 0fe49df4..e798ac39 100644 --- a/src/main/java/appeng/block/AEBaseBlock.java +++ b/src/main/java/appeng/block/AEBaseBlock.java @@ -90,7 +90,7 @@ public abstract class AEBaseBlock extends Block implements IAEFeature @Override public boolean isVisuallyOpaque() { - return isOpaque && isFullSize; + return this.isOpaque && this.isFullSize; } protected AEBaseBlock( final Material mat ) @@ -139,7 +139,7 @@ public abstract class AEBaseBlock extends Block implements IAEFeature @Override final protected BlockState createBlockState() { - return new ExtendedBlockState( this, getAEStates(), new IUnlistedProperty[] { AE_BLOCK_POS, AE_BLOCK_ACCESS} ); + return new ExtendedBlockState( this, this.getAEStates(), new IUnlistedProperty[] { AE_BLOCK_POS, AE_BLOCK_ACCESS} ); } @Override @@ -245,10 +245,10 @@ public abstract class AEBaseBlock extends Block implements IAEFeature public IAESprite getIcon( final IBlockAccess w, final BlockPos pos, final EnumFacing side ) { final IBlockState state =w.getBlockState( pos ); - final IOrientable ori = getOrientable( w, pos ); + final IOrientable ori = this.getOrientable( w, pos ); if ( ori == null ) - return getIcon( side,state ); + return this.getIcon( side,state ); return this.getIcon( this.mapRotation( ori, side ), state ); } @@ -680,12 +680,12 @@ public abstract class AEBaseBlock extends Block implements IAEFeature String textureName; public void setBlockTextureName( final String texture ) { - textureName = texture; + this.textureName = texture; } private String getTextureName() { - return textureName; + return this.textureName; } } diff --git a/src/main/java/appeng/block/AEBaseTileBlock.java b/src/main/java/appeng/block/AEBaseTileBlock.java index 85bb67bd..e81e01fb 100644 --- a/src/main/java/appeng/block/AEBaseTileBlock.java +++ b/src/main/java/appeng/block/AEBaseTileBlock.java @@ -115,7 +115,7 @@ public abstract class AEBaseTileBlock extends AEBaseBlock implements IAEFeature, @Nullable public T getTileEntity( final IBlockAccess w, final int x, final int y, final int z ) { - return getTileEntity( w, new BlockPos(x,y,z) ); + return this.getTileEntity( w, new BlockPos(x,y,z) ); } @Nullable diff --git a/src/main/java/appeng/block/crafting/BlockCraftingUnit.java b/src/main/java/appeng/block/crafting/BlockCraftingUnit.java index 0e4752a3..2f2e3ddd 100644 --- a/src/main/java/appeng/block/crafting/BlockCraftingUnit.java +++ b/src/main/java/appeng/block/crafting/BlockCraftingUnit.java @@ -73,7 +73,7 @@ public class BlockCraftingUnit extends AEBaseTileBlock @Override public IBlockState getStateFromMeta( final int meta ) { - return getDefaultState().withProperty( POWERED, ( meta & 1 ) == 1 ).withProperty( FORMED, ( meta & 2 ) == 2 ); + return this.getDefaultState().withProperty( POWERED, ( meta & 1 ) == 1 ).withProperty( FORMED, ( meta & 2 ) == 2 ); } @Override @@ -153,7 +153,7 @@ public class BlockCraftingUnit extends AEBaseTileBlock @Override public appeng.client.texture.IAESprite getIcon( final EnumFacing side, final IBlockState state ) { - if( type == CraftingUnitType.ACCELERATOR ) + if( this.type == CraftingUnitType.ACCELERATOR ) { if( (boolean) state.getValue( FORMED ) ) { diff --git a/src/main/java/appeng/block/misc/BlockLightDetector.java b/src/main/java/appeng/block/misc/BlockLightDetector.java index d7b74088..bba01102 100644 --- a/src/main/java/appeng/block/misc/BlockLightDetector.java +++ b/src/main/java/appeng/block/misc/BlockLightDetector.java @@ -71,7 +71,7 @@ public class BlockLightDetector extends AEBaseTileBlock implements IOrientableBl public IBlockState getStateFromMeta( final int meta ) { - return getDefaultState(); + return this.getDefaultState(); } @Override diff --git a/src/main/java/appeng/block/misc/BlockQuartzTorch.java b/src/main/java/appeng/block/misc/BlockQuartzTorch.java index e2e2dd02..512dc0da 100644 --- a/src/main/java/appeng/block/misc/BlockQuartzTorch.java +++ b/src/main/java/appeng/block/misc/BlockQuartzTorch.java @@ -75,7 +75,7 @@ public class BlockQuartzTorch extends AEBaseBlock implements IOrientableBlock, I public IBlockState getStateFromMeta( final int meta ) { - return getDefaultState(); + return this.getDefaultState(); } @Override diff --git a/src/main/java/appeng/block/networking/BlockController.java b/src/main/java/appeng/block/networking/BlockController.java index c1a9b3fc..50380335 100644 --- a/src/main/java/appeng/block/networking/BlockController.java +++ b/src/main/java/appeng/block/networking/BlockController.java @@ -47,7 +47,7 @@ public class BlockController extends AEBaseTileBlock @Override public String getName() { - return name(); + return this.name(); } }; @@ -70,7 +70,7 @@ public class BlockController extends AEBaseTileBlock @Override public IBlockState getStateFromMeta( final int meta ) { - return getDefaultState().withProperty( CONTROLLER_STATE, ControllerBlockState.OFFLINE ); + return this.getDefaultState().withProperty( CONTROLLER_STATE, ControllerBlockState.OFFLINE ); } @Override diff --git a/src/main/java/appeng/block/networking/BlockEnergyCell.java b/src/main/java/appeng/block/networking/BlockEnergyCell.java index 7ccee8d3..f210c963 100644 --- a/src/main/java/appeng/block/networking/BlockEnergyCell.java +++ b/src/main/java/appeng/block/networking/BlockEnergyCell.java @@ -58,7 +58,7 @@ public class BlockEnergyCell extends AEBaseTileBlock @Override public IBlockState getStateFromMeta( final int meta ) { - return getDefaultState().withProperty( ENERGY_STORAGE, Math.min( 7, Math.max( 0, meta ) ) ); + return this.getDefaultState().withProperty( ENERGY_STORAGE, Math.min( 7, Math.max( 0, meta ) ) ); } public BlockEnergyCell() diff --git a/src/main/java/appeng/client/ClientHelper.java b/src/main/java/appeng/client/ClientHelper.java index d64d8986..3632ed69 100644 --- a/src/main/java/appeng/client/ClientHelper.java +++ b/src/main/java/appeng/client/ClientHelper.java @@ -111,7 +111,7 @@ public class ClientHelper extends ServerHelper @Override public void configureIcon( final Object item, final String name ) { - iconTmp.add( new IconReg( item, 0, name ) ); + this.iconTmp.add( new IconReg( item, 0, name ) ); } @Override @@ -271,11 +271,11 @@ public class ClientHelper extends ServerHelper @Override public ModelResourceLocation getModelLocation( final ItemStack stack ) { - return partRenderer; + return ClientHelper.this.partRenderer; } }; - for( final IconReg reg : iconTmp ) + for( final IconReg reg : this.iconTmp ) { if( reg.item instanceof IPartItem || reg.item instanceof IFacadeItem ) { @@ -291,7 +291,7 @@ public class ClientHelper extends ServerHelper continue; } - addIcon( reg.name ); + this.addIcon( reg.name ); mesher.register( reg.item instanceof Item ? (Item) reg.item : Item.getItemFromBlock( (Block) reg.item ), stack -> renderer.rendererInstance.getResourcePath() ); continue; @@ -313,7 +313,7 @@ public class ClientHelper extends ServerHelper } final String MODID = AppEng.MOD_ID + ":"; - for( final List reg : iconRegistrations.values() ) + for( final List reg : this.iconRegistrations.values() ) { final String[] names = new String[reg.size()]; @@ -380,16 +380,16 @@ public class ClientHelper extends ServerHelper public ResourceLocation addIcon( final String string ) { final ModelResourceLocation n = new ModelResourceLocation( new ResourceLocation( AppEng.MOD_ID, string ), "inventory" ); - extraIcons.add( n ); + this.extraIcons.add( n ); return n; } public ModelResourceLocation setIcon( final Item item, final String name ) { - List reg = iconRegistrations.get( item ); + List reg = this.iconRegistrations.get( item ); if( reg == null ) { - iconRegistrations.put( item, reg = new LinkedList<>() ); + this.iconRegistrations.put( item, reg = new LinkedList<>() ); } final ModelResourceLocation res = new ModelResourceLocation( new ResourceLocation( AppEng.MOD_ID, name ), "inventory" ); @@ -399,10 +399,10 @@ public class ClientHelper extends ServerHelper public ModelResourceLocation setIcon( final Item item, final int meta, final String name ) { - List reg = iconRegistrations.get( item ); + List reg = this.iconRegistrations.get( item ); if( reg == null ) { - iconRegistrations.put( item, reg = new LinkedList<>() ); + this.iconRegistrations.put( item, reg = new LinkedList<>() ); } final ModelResourceLocation res = new ModelResourceLocation( new ResourceLocation( AppEng.MOD_ID, name ), "inventory" ); @@ -493,9 +493,9 @@ public class ClientHelper extends ServerHelper { // inventory renderer final SmartModel buses = new SmartModel( new BlockRenderInfo( ( new RendererCableBus() ) ) ); - event.modelRegistry.putObject( partRenderer, buses ); + event.modelRegistry.putObject( this.partRenderer, buses ); - for( final IconReg reg : iconTmp ) + for( final IconReg reg : this.iconTmp ) { if( reg.item instanceof IPartItem || reg.item instanceof IFacadeItem ) { @@ -553,7 +553,7 @@ public class ClientHelper extends ServerHelper @SubscribeEvent public void updateTextureSheet( final TextureStitchEvent.Pre ev ) { - for( final IconReg reg : iconTmp ) + for( final IconReg reg : this.iconTmp ) { if( reg.item instanceof AEBaseItem ) { @@ -571,7 +571,7 @@ public class ClientHelper extends ServerHelper } } - extraIcons.forEach( ev.map::registerSprite ); + this.extraIcons.forEach( ev.map::registerSprite ); //if( ev.map.getTextureType() == ITEM_RENDERER ) { @@ -604,18 +604,18 @@ public class ClientHelper extends ServerHelper public IconReg( final Object item2, final int meta2, final String name2 ) { - meta = meta2; - name = name2; - item = item2; - loc = null; + this.meta = meta2; + this.name = name2; + this.item = item2; + this.loc = null; } public IconReg( final Item item2, final int meta2, final String name2, final ModelResourceLocation res ) { - meta = meta2; - name = name2; - item = item2; - loc = res; + this.meta = meta2; + this.name = name2; + this.item = item2; + this.loc = res; } } } \ No newline at end of file diff --git a/src/main/java/appeng/client/SmartModel.java b/src/main/java/appeng/client/SmartModel.java index a3ac36bd..5ad198cd 100644 --- a/src/main/java/appeng/client/SmartModel.java +++ b/src/main/java/appeng/client/SmartModel.java @@ -47,7 +47,7 @@ public class SmartModel implements IBakedModel, ISmartBlockModel,ISmartItemModel public SmartModel( final BlockRenderInfo rendererInstance ) { - AERenderer = rendererInstance; + this.AERenderer = rendererInstance; } @Override @@ -84,7 +84,7 @@ public class SmartModel implements IBakedModel, ISmartBlockModel,ISmartItemModel @Override public TextureAtlasSprite getTexture() { - return AERenderer != null ? AERenderer.getTexture( AEPartLocation.UP ).getAtlas() : MissingIcon.getMissing(); + return this.AERenderer != null ? this.AERenderer.getTexture( AEPartLocation.UP ).getAtlas() : MissingIcon.getMissing(); } @Override @@ -100,7 +100,7 @@ public class SmartModel implements IBakedModel, ISmartBlockModel,ISmartItemModel final ModelGenerator helper = new ModelGenerator(); final Block blk = Block.getBlockFromItem( stack.getItem() ); helper.setRenderBoundsFromBlock( blk ); - AERenderer.rendererInstance.renderInventory( blk instanceof AEBaseBlock ? (AEBaseBlock) blk : null, stack, helper, ItemRenderType.INVENTORY, null ); + this.AERenderer.rendererInstance.renderInventory( blk instanceof AEBaseBlock ? (AEBaseBlock) blk : null, stack, helper, ItemRenderType.INVENTORY, null ); helper.finalizeModel( true ); return helper.getOutput(); } @@ -116,7 +116,7 @@ public class SmartModel implements IBakedModel, ISmartBlockModel,ISmartItemModel helper.setTranslation( -pos.getX(), -pos.getY(), -pos.getZ() ); helper.setRenderBoundsFromBlock( blk ); helper.blockAccess = world; - AERenderer.rendererInstance.renderInWorld( blk instanceof AEBaseBlock ? (AEBaseBlock) blk : null, world, pos, helper); + this.AERenderer.rendererInstance.renderInWorld( blk instanceof AEBaseBlock ? (AEBaseBlock) blk : null, world, pos, helper); helper.finalizeModel( false ); return helper.getOutput(); } diff --git a/src/main/java/appeng/client/gui/AEBaseGui.java b/src/main/java/appeng/client/gui/AEBaseGui.java index 85dc6c75..a6379da7 100644 --- a/src/main/java/appeng/client/gui/AEBaseGui.java +++ b/src/main/java/appeng/client/gui/AEBaseGui.java @@ -239,7 +239,7 @@ public abstract class AEBaseGui extends GuiContainer } this.zLevel = 300.0F; - itemRender.zLevel = 300.0F; + this.itemRender.zLevel = 300.0F; final int var10 = -267386864; this.drawGradientRect( var6 - 3, var7 - 4, var6 + var5 + 3, var7 - 3, var10, var10 ); this.drawGradientRect( var6 - 3, var7 + var9 + 3, var6 + var5 + 3, var7 + var9 + 4, var10, var10 ); @@ -277,7 +277,7 @@ public abstract class AEBaseGui extends GuiContainer } this.zLevel = 0.0F; - itemRender.zLevel = 0.0F; + this.itemRender.zLevel = 0.0F; } RenderHelper.enableStandardItemLighting(); GL11.glPopAttrib(); @@ -722,17 +722,17 @@ public abstract class AEBaseGui extends GuiContainer protected void drawItem( final int x, final int y, final ItemStack is ) { this.zLevel = 100.0F; - itemRender.zLevel = 100.0F; + this.itemRender.zLevel = 100.0F; GL11.glPushAttrib( GL11.GL_ALL_ATTRIB_BITS ); GL11.glEnable( GL11.GL_LIGHTING ); GL11.glEnable( GL12.GL_RESCALE_NORMAL ); GL11.glEnable( GL11.GL_DEPTH_TEST ); RenderHelper.enableGUIStandardItemLighting(); - itemRender.renderItemAndEffectIntoGUI( is, x, y ); + this.itemRender.renderItemAndEffectIntoGUI( is, x, y ); GL11.glPopAttrib(); - itemRender.zLevel = 0.0F; + this.itemRender.zLevel = 0.0F; this.zLevel = 0.0F; } @@ -768,7 +768,7 @@ public abstract class AEBaseGui extends GuiContainer try { this.zLevel = 100.0F; - itemRender.zLevel = 100.0F; + this.itemRender.zLevel = 100.0F; if( !this.isPowered() ) { @@ -778,7 +778,7 @@ public abstract class AEBaseGui extends GuiContainer } this.zLevel = 0.0F; - itemRender.zLevel = 0.0F; + this.itemRender.zLevel = 0.0F; this.aeRenderItem.aeStack = ( (SlotME) s ).getAEStack(); @@ -864,14 +864,14 @@ public abstract class AEBaseGui extends GuiContainer if( ( (AppEngSlot) s ).isValid == hasCalculatedValidness.Invalid ) { this.zLevel = 100.0F; - itemRender.zLevel = 100.0F; + this.itemRender.zLevel = 100.0F; GL11.glDisable( GL11.GL_LIGHTING ); drawRect( s.xDisplayPosition, s.yDisplayPosition, 16 + s.xDisplayPosition, 16 + s.yDisplayPosition, 0x66ff6666 ); GL11.glEnable( GL11.GL_LIGHTING ); this.zLevel = 0.0F; - itemRender.zLevel = 0.0F; + this.itemRender.zLevel = 0.0F; } } @@ -904,8 +904,8 @@ public abstract class AEBaseGui extends GuiContainer } else { - final RenderItem ri = itemRender; - itemRender = item; + final RenderItem ri = this.itemRender; + this.itemRender = item; return ri; } } diff --git a/src/main/java/appeng/client/gui/implementations/GuiChest.java b/src/main/java/appeng/client/gui/implementations/GuiChest.java index 6b932858..4623968c 100644 --- a/src/main/java/appeng/client/gui/implementations/GuiChest.java +++ b/src/main/java/appeng/client/gui/implementations/GuiChest.java @@ -60,7 +60,7 @@ public class GuiChest extends AEBaseGui { super.initGui(); - this.buttonList.add( this.priority = new GuiTabButton( this.guiLeft + 154, this.guiTop, 2 + 4 * 16, GuiText.Priority.getLocal(), itemRender ) ); + this.buttonList.add( this.priority = new GuiTabButton( this.guiLeft + 154, this.guiTop, 2 + 4 * 16, GuiText.Priority.getLocal(), this.itemRender ) ); } @Override diff --git a/src/main/java/appeng/client/gui/implementations/GuiCraftAmount.java b/src/main/java/appeng/client/gui/implementations/GuiCraftAmount.java index 27e84269..bd6523a1 100644 --- a/src/main/java/appeng/client/gui/implementations/GuiCraftAmount.java +++ b/src/main/java/appeng/client/gui/implementations/GuiCraftAmount.java @@ -136,7 +136,7 @@ public class GuiCraftAmount extends AEBaseGui if( this.originalGui != null && myIcon != null ) { - this.buttonList.add( this.originalGuiBtn = new GuiTabButton( this.guiLeft + 154, this.guiTop, myIcon, myIcon.getDisplayName(), itemRender ) ); + this.buttonList.add( this.originalGuiBtn = new GuiTabButton( this.guiLeft + 154, this.guiTop, myIcon, myIcon.getDisplayName(), this.itemRender ) ); } this.amountToCraft = new GuiNumberBox( this.fontRendererObj, this.guiLeft + 62, this.guiTop + 57, 59, this.fontRendererObj.FONT_HEIGHT, Integer.class ); diff --git a/src/main/java/appeng/client/gui/implementations/GuiCraftingStatus.java b/src/main/java/appeng/client/gui/implementations/GuiCraftingStatus.java index b257ae2a..d7914098 100644 --- a/src/main/java/appeng/client/gui/implementations/GuiCraftingStatus.java +++ b/src/main/java/appeng/client/gui/implementations/GuiCraftingStatus.java @@ -142,7 +142,7 @@ public class GuiCraftingStatus extends GuiCraftingCPU if( this.myIcon != null ) { - this.buttonList.add( this.originalGuiBtn = new GuiTabButton( this.guiLeft + 213, this.guiTop - 4, this.myIcon, this.myIcon.getDisplayName(), itemRender ) ); + this.buttonList.add( this.originalGuiBtn = new GuiTabButton( this.guiLeft + 213, this.guiTop - 4, this.myIcon, this.myIcon.getDisplayName(), this.itemRender ) ); this.originalGuiBtn.hideEdge = 13; } } diff --git a/src/main/java/appeng/client/gui/implementations/GuiDrive.java b/src/main/java/appeng/client/gui/implementations/GuiDrive.java index 40fa4d94..dbfa6aa2 100644 --- a/src/main/java/appeng/client/gui/implementations/GuiDrive.java +++ b/src/main/java/appeng/client/gui/implementations/GuiDrive.java @@ -60,7 +60,7 @@ public class GuiDrive extends AEBaseGui { super.initGui(); - this.buttonList.add( this.priority = new GuiTabButton( this.guiLeft + 154, this.guiTop, 2 + 4 * 16, GuiText.Priority.getLocal(), itemRender ) ); + this.buttonList.add( this.priority = new GuiTabButton( this.guiLeft + 154, this.guiTop, 2 + 4 * 16, GuiText.Priority.getLocal(), this.itemRender ) ); } @Override diff --git a/src/main/java/appeng/client/gui/implementations/GuiFormationPlane.java b/src/main/java/appeng/client/gui/implementations/GuiFormationPlane.java index abe2dade..cf7bd9a3 100644 --- a/src/main/java/appeng/client/gui/implementations/GuiFormationPlane.java +++ b/src/main/java/appeng/client/gui/implementations/GuiFormationPlane.java @@ -58,7 +58,7 @@ public class GuiFormationPlane extends GuiUpgradeable this.placeMode = new GuiImgButton( this.guiLeft - 18, this.guiTop + 28, Settings.PLACE_BLOCK, YesNo.YES ); this.fuzzyMode = new GuiImgButton( this.guiLeft - 18, this.guiTop + 48, Settings.FUZZY_MODE, FuzzyMode.IGNORE_ALL ); - this.buttonList.add( this.priority = new GuiTabButton( this.guiLeft + 154, this.guiTop, 2 + 4 * 16, GuiText.Priority.getLocal(), itemRender ) ); + this.buttonList.add( this.priority = new GuiTabButton( this.guiLeft + 154, this.guiTop, 2 + 4 * 16, GuiText.Priority.getLocal(), this.itemRender ) ); this.buttonList.add( this.placeMode ); this.buttonList.add( this.fuzzyMode ); diff --git a/src/main/java/appeng/client/gui/implementations/GuiInterface.java b/src/main/java/appeng/client/gui/implementations/GuiInterface.java index 97127689..fc4a30f1 100644 --- a/src/main/java/appeng/client/gui/implementations/GuiInterface.java +++ b/src/main/java/appeng/client/gui/implementations/GuiInterface.java @@ -56,7 +56,7 @@ public class GuiInterface extends GuiUpgradeable @Override protected void addButtons() { - this.priority = new GuiTabButton( this.guiLeft + 154, this.guiTop, 2 + 4 * 16, GuiText.Priority.getLocal(), itemRender ); + this.priority = new GuiTabButton( this.guiLeft + 154, this.guiTop, 2 + 4 * 16, GuiText.Priority.getLocal(), this.itemRender ); this.buttonList.add( this.priority ); this.BlockMode = new GuiImgButton( this.guiLeft - 18, this.guiTop + 8, Settings.BLOCK, YesNo.NO ); diff --git a/src/main/java/appeng/client/gui/implementations/GuiMEMonitorable.java b/src/main/java/appeng/client/gui/implementations/GuiMEMonitorable.java index e1d98721..d01c7b59 100644 --- a/src/main/java/appeng/client/gui/implementations/GuiMEMonitorable.java +++ b/src/main/java/appeng/client/gui/implementations/GuiMEMonitorable.java @@ -310,7 +310,7 @@ public class GuiMEMonitorable extends AEBaseMEGui implements ISortSource, IConfi if( this.viewCell || this instanceof GuiWirelessTerm ) { - this.buttonList.add( this.craftingStatusBtn = new GuiTabButton( this.guiLeft + 170, this.guiTop - 4, 2 + 11 * 16, GuiText.CraftingStatus.getLocal(), itemRender ) ); + this.buttonList.add( this.craftingStatusBtn = new GuiTabButton( this.guiLeft + 170, this.guiTop - 4, 2 + 11 * 16, GuiText.CraftingStatus.getLocal(), this.itemRender ) ); this.craftingStatusBtn.hideEdge = 13; } diff --git a/src/main/java/appeng/client/gui/implementations/GuiPatternTerm.java b/src/main/java/appeng/client/gui/implementations/GuiPatternTerm.java index cc015e1e..71f63b98 100644 --- a/src/main/java/appeng/client/gui/implementations/GuiPatternTerm.java +++ b/src/main/java/appeng/client/gui/implementations/GuiPatternTerm.java @@ -94,8 +94,8 @@ public class GuiPatternTerm extends GuiMEMonitorable public void initGui() { super.initGui(); - this.buttonList.add( this.tabCraftButton = new GuiTabButton( this.guiLeft + 173, this.guiTop + this.ySize - 177, new ItemStack( Blocks.crafting_table ), GuiText.CraftingPattern.getLocal(), itemRender ) ); - this.buttonList.add( this.tabProcessButton = new GuiTabButton( this.guiLeft + 173, this.guiTop + this.ySize - 177, new ItemStack( Blocks.furnace ), GuiText.ProcessingPattern.getLocal(), itemRender ) ); + this.buttonList.add( this.tabCraftButton = new GuiTabButton( this.guiLeft + 173, this.guiTop + this.ySize - 177, new ItemStack( Blocks.crafting_table ), GuiText.CraftingPattern.getLocal(), this.itemRender ) ); + this.buttonList.add( this.tabProcessButton = new GuiTabButton( this.guiLeft + 173, this.guiTop + this.ySize - 177, new ItemStack( Blocks.furnace ), GuiText.ProcessingPattern.getLocal(), this.itemRender ) ); // buttonList.add( substitutionsBtn = new GuiImgButton( this.guiLeft + 84, this.guiTop + this.ySize - 163, // Settings.ACTIONS, ActionItems.SUBSTITUTION ) ); diff --git a/src/main/java/appeng/client/gui/implementations/GuiPriority.java b/src/main/java/appeng/client/gui/implementations/GuiPriority.java index 9a67bf07..b3385a88 100644 --- a/src/main/java/appeng/client/gui/implementations/GuiPriority.java +++ b/src/main/java/appeng/client/gui/implementations/GuiPriority.java @@ -156,7 +156,7 @@ public class GuiPriority extends AEBaseGui if( this.OriginalGui != null && myIcon != null ) { - this.buttonList.add( this.originalGuiBtn = new GuiTabButton( this.guiLeft + 154, this.guiTop, myIcon, myIcon.getDisplayName(), itemRender ) ); + this.buttonList.add( this.originalGuiBtn = new GuiTabButton( this.guiLeft + 154, this.guiTop, myIcon, myIcon.getDisplayName(), this.itemRender ) ); } this.priority = new GuiNumberBox( this.fontRendererObj, this.guiLeft + 62, this.guiTop + 57, 59, this.fontRendererObj.FONT_HEIGHT, Long.class ); diff --git a/src/main/java/appeng/client/gui/implementations/GuiStorageBus.java b/src/main/java/appeng/client/gui/implementations/GuiStorageBus.java index a610a701..bc1c5a09 100644 --- a/src/main/java/appeng/client/gui/implementations/GuiStorageBus.java +++ b/src/main/java/appeng/client/gui/implementations/GuiStorageBus.java @@ -68,7 +68,7 @@ public class GuiStorageBus extends GuiUpgradeable this.storageFilter = new GuiImgButton( this.guiLeft - 18, this.guiTop + 68, Settings.STORAGE_FILTER, StorageFilter.EXTRACTABLE_ONLY ); this.fuzzyMode = new GuiImgButton( this.guiLeft - 18, this.guiTop + 88, Settings.FUZZY_MODE, FuzzyMode.IGNORE_ALL ); - this.buttonList.add( this.priority = new GuiTabButton( this.guiLeft + 154, this.guiTop, 2 + 4 * 16, GuiText.Priority.getLocal(), itemRender ) ); + this.buttonList.add( this.priority = new GuiTabButton( this.guiLeft + 154, this.guiTop, 2 + 4 * 16, GuiText.Priority.getLocal(), this.itemRender ) ); this.buttonList.add( this.storageFilter ); this.buttonList.add( this.fuzzyMode ); diff --git a/src/main/java/appeng/client/render/BaseBlockRender.java b/src/main/java/appeng/client/render/BaseBlockRender.java index 0ba71bb5..9b129236 100644 --- a/src/main/java/appeng/client/render/BaseBlockRender.java +++ b/src/main/java/appeng/client/render/BaseBlockRender.java @@ -763,6 +763,6 @@ public class BaseBlockRender public ModelResourceLocation getResourcePath() { - return modelPath; + return this.modelPath; } } diff --git a/src/main/java/appeng/client/render/BusRenderer.java b/src/main/java/appeng/client/render/BusRenderer.java index 25804ffc..84dffc0e 100644 --- a/src/main/java/appeng/client/render/BusRenderer.java +++ b/src/main/java/appeng/client/render/BusRenderer.java @@ -113,8 +113,8 @@ public class BusRenderer implements IItemRenderer GL11.glScaled( 1.2, 1.2, 1. ); GL11.glColor4f( 1, 1, 1, 1 ); - renderer.setColorOpaque_F( 1, 1, 1 ); - renderer.setBrightness( 14 << 20 | 14 << 4 ); + this.renderer.setColorOpaque_F( 1, 1, 1 ); + this.renderer.setBrightness( 14 << 20 | 14 << 4 ); BusRenderHelper.INSTANCE.setBounds( 0, 0, 0, 1, 1, 1 ); BusRenderHelper.INSTANCE.setTexture( null ); diff --git a/src/main/java/appeng/client/render/IconUnwrapper.java b/src/main/java/appeng/client/render/IconUnwrapper.java index 00356a78..daaf8124 100644 --- a/src/main/java/appeng/client/render/IconUnwrapper.java +++ b/src/main/java/appeng/client/render/IconUnwrapper.java @@ -20,42 +20,42 @@ public class IconUnwrapper extends TextureAtlasSprite final IAESprite src ) { super( src.getIconName() ); - width = src.getIconWidth(); - height = src.getIconHeight(); - min_u = src.getMinU(); - max_u = src.getMaxU(); - min_v = src.getMinV(); - max_v = src.getMaxV(); + this.width = src.getIconWidth(); + this.height = src.getIconHeight(); + this.min_u = src.getMinU(); + this.max_u = src.getMaxU(); + this.min_v = src.getMinV(); + this.max_v = src.getMaxV(); } @Override public int getIconWidth() { - return width; + return this.width; } @Override public int getIconHeight() { - return height; + return this.height; } @Override public float getMaxU() { - return max_u; + return this.max_u; } @Override public float getMinV() { - return min_v; + return this.min_v; } @Override public float getMaxV() { - return max_v; + return this.max_v; } @Override @@ -67,7 +67,7 @@ public class IconUnwrapper extends TextureAtlasSprite @Override public float getMinU() { - return min_u; + return this.min_u; } @Override diff --git a/src/main/java/appeng/client/render/ModelGenerator.java b/src/main/java/appeng/client/render/ModelGenerator.java index 8f3a9646..c3e6f8cb 100644 --- a/src/main/java/appeng/client/render/ModelGenerator.java +++ b/src/main/java/appeng/client/render/ModelGenerator.java @@ -42,9 +42,9 @@ public class ModelGenerator public CachedModel() { - general = new ArrayList(); + this.general = new ArrayList(); for ( final EnumFacing f : EnumFacing.VALUES ) - faces[f.ordinal()] = new ArrayList(); + this.faces[f.ordinal()] = new ArrayList(); } @Override @@ -80,14 +80,14 @@ public class ModelGenerator @Override public List getGeneralQuads() { - return general; + return this.general; } @Override public List getFaceQuads( final EnumFacing p_177551_1_ ) { - return faces[p_177551_1_.ordinal()]; + return this.faces[p_177551_1_.ordinal()]; } } @@ -123,13 +123,13 @@ public class ModelGenerator final Block block ) { if ( block == null ) return; - - renderMinX = block.getBlockBoundsMinX(); - renderMinY = block.getBlockBoundsMinY(); - renderMinZ = block.getBlockBoundsMinZ(); - renderMaxX = block.getBlockBoundsMaxX(); - renderMaxY = block.getBlockBoundsMaxY(); - renderMaxZ = block.getBlockBoundsMaxZ(); + + this.renderMinX = block.getBlockBoundsMinX(); + this.renderMinY = block.getBlockBoundsMinY(); + this.renderMinZ = block.getBlockBoundsMinZ(); + this.renderMaxX = block.getBlockBoundsMaxX(); + this.renderMaxY = block.getBlockBoundsMaxY(); + this.renderMaxZ = block.getBlockBoundsMaxZ(); } public void setRenderBounds( @@ -140,12 +140,12 @@ public class ModelGenerator final double h, final double i ) { - renderMinX = d; - renderMinY = e; - renderMinZ = f; - renderMaxX = g; - renderMaxY = h; - renderMaxZ = i; + this.renderMinX = d; + this.renderMinY = e; + this.renderMinZ = f; + this.renderMaxX = g; + this.renderMaxY = h; + this.renderMaxZ = i; } int color = -1; @@ -153,7 +153,7 @@ public class ModelGenerator public void setBrightness( final int i ) { - brightness=i; + this.brightness =i; } public void setColorRGBA_F( @@ -163,7 +163,7 @@ public class ModelGenerator final float a ) { final int alpha = ( int ) ( a * 0xff ); - color = alpha << 24 | + this.color = alpha << 24 | r << 16 | b << 8 | b; @@ -173,7 +173,7 @@ public class ModelGenerator final int whiteVariant ) { final int alpha = 0xff; - color = //alpha << 24 | + this.color = //alpha << 24 | whiteVariant; } public void setColorOpaque( @@ -182,7 +182,7 @@ public class ModelGenerator final int b ) { final int alpha = 0xff; - color =// alpha << 24 | + this.color =// alpha << 24 | r << 16 | g << 8 | b; @@ -194,7 +194,7 @@ public class ModelGenerator final int b ) { final int alpha = 0xff; - color = //alpha << 24 | + this.color = //alpha << 24 | Math.min( 0xff, Math.max( 0, r ) ) << 16 | Math.min( 0xff, Math.max( 0, g ) ) << 8 | Math.min( 0xff, Math.max( 0, b ) ); @@ -209,7 +209,7 @@ public class ModelGenerator final int g = (int)( gf * 0xff ); final int b = (int)( bf * 0xff ); final int alpha = 0xff; - color = //alpha << 24 | + this.color = //alpha << 24 | Math.min( 0xff, Math.max( 0, r ) ) << 16 | Math.min( 0xff, Math.max( 0, g ) ) << 8 | Math.min( 0xff, Math.max( 0, b ) ); @@ -226,7 +226,7 @@ public class ModelGenerator final Block blk = Block.getBlockFromItem( it ); if ( blk != null ) - return getIcon(blk.getStateFromMeta( is.getMetadata() ))[0]; + return this.getIcon(blk.getStateFromMeta( is.getMetadata() ))[0]; if ( it instanceof AEBaseItem ) { @@ -293,7 +293,7 @@ public class ModelGenerator return out; } - return getIcon( state ); + return this.getIcon( state ); } int point =0; @@ -308,48 +308,48 @@ public class ModelGenerator final double u, final double v ) { - points[point++] = new float[]{ (float)x+tx, (float)y+ty, (float)z+tz, (float)u, (float)v }; + this.points[this.point++] = new float[]{ (float)x+ this.tx, (float)y+ this.ty, (float)z+ this.tz, (float)u, (float)v }; - if ( point == 4 ) + if ( this.point == 4 ) { - brightness = -1; + this.brightness = -1; final int[] vertData = { - Float.floatToRawIntBits( points[0][0] ), - Float.floatToRawIntBits( points[0][1] ), - Float.floatToRawIntBits( points[0][2] ), - brightness, - Float.floatToRawIntBits( points[0][3] ), - Float.floatToRawIntBits( points[0][4] ), + Float.floatToRawIntBits( this.points[0][0] ), + Float.floatToRawIntBits( this.points[0][1] ), + Float.floatToRawIntBits( this.points[0][2] ), + this.brightness, + Float.floatToRawIntBits( this.points[0][3] ), + Float.floatToRawIntBits( this.points[0][4] ), 0, - Float.floatToRawIntBits( points[1][0] ), - Float.floatToRawIntBits( points[1][1] ), - Float.floatToRawIntBits( points[1][2] ), - brightness, - Float.floatToRawIntBits( points[1][3] ), - Float.floatToRawIntBits( points[1][4] ), + Float.floatToRawIntBits( this.points[1][0] ), + Float.floatToRawIntBits( this.points[1][1] ), + Float.floatToRawIntBits( this.points[1][2] ), + this.brightness, + Float.floatToRawIntBits( this.points[1][3] ), + Float.floatToRawIntBits( this.points[1][4] ), 0, - Float.floatToRawIntBits( points[2][0] ), - Float.floatToRawIntBits( points[2][1] ), - Float.floatToRawIntBits( points[2][2] ), - brightness, - Float.floatToRawIntBits( points[2][3] ), - Float.floatToRawIntBits( points[2][4] ), + Float.floatToRawIntBits( this.points[2][0] ), + Float.floatToRawIntBits( this.points[2][1] ), + Float.floatToRawIntBits( this.points[2][2] ), + this.brightness, + Float.floatToRawIntBits( this.points[2][3] ), + Float.floatToRawIntBits( this.points[2][4] ), 0, - Float.floatToRawIntBits( points[3][0] ), - Float.floatToRawIntBits( points[3][1] ), - Float.floatToRawIntBits( points[3][2] ), - brightness, - Float.floatToRawIntBits( points[3][3] ), - Float.floatToRawIntBits( points[3][4] ), + Float.floatToRawIntBits( this.points[3][0] ), + Float.floatToRawIntBits( this.points[3][1] ), + Float.floatToRawIntBits( this.points[3][2] ), + this.brightness, + Float.floatToRawIntBits( this.points[3][3] ), + Float.floatToRawIntBits( this.points[3][4] ), 0, }; - - generatedModel.general.add( new IColoredBakedQuad.ColoredBakedQuad( vertData, color, face )); - - point=0; + + this.generatedModel.general.add( new IColoredBakedQuad.ColoredBakedQuad( vertData, this.color, face )); + + this.point =0; } } @@ -359,15 +359,15 @@ public class ModelGenerator { //setRenderBoundsFromBlock( block ); - final IAESprite[] textures = getIcon( blockAccess,pos ); - setColorOpaque_I( 0xffffff ); + final IAESprite[] textures = this.getIcon( this.blockAccess,pos ); + this.setColorOpaque_I( 0xffffff ); - renderFaceXNeg( block, pos, textures[EnumFacing.WEST.ordinal()] ); - renderFaceXPos( block, pos, textures[EnumFacing.EAST.ordinal()] ); - renderFaceYNeg( block, pos, textures[EnumFacing.DOWN.ordinal()] ); - renderFaceYPos( block, pos, textures[EnumFacing.UP.ordinal()] ); - renderFaceZNeg( block, pos, textures[EnumFacing.NORTH.ordinal()] ); - renderFaceZPos( block, pos, textures[EnumFacing.SOUTH.ordinal()] ); + this.renderFaceXNeg( block, pos, textures[EnumFacing.WEST.ordinal()] ); + this.renderFaceXPos( block, pos, textures[EnumFacing.EAST.ordinal()] ); + this.renderFaceYNeg( block, pos, textures[EnumFacing.DOWN.ordinal()] ); + this.renderFaceYPos( block, pos, textures[EnumFacing.UP.ordinal()] ); + this.renderFaceZNeg( block, pos, textures[EnumFacing.NORTH.ordinal()] ); + this.renderFaceZPos( block, pos, textures[EnumFacing.SOUTH.ordinal()] ); return false; } @@ -377,9 +377,9 @@ public class ModelGenerator final int y, final int z ) { - tx=x; - ty=y; - tz=z; + this.tx =x; + this.ty =y; + this.tz =z; } public boolean isAlphaPass() @@ -458,17 +458,17 @@ public class ModelGenerator to_b = 1.0f - to_b; final float[] afloat = {// :P - 16.0f * ( quadsUV[0] + quadsUV[2] * from_a + quadsUV[4] * from_b ), // 0 - 16.0f * ( quadsUV[1] + quadsUV[3] * from_a + quadsUV[5] * from_b ), // 1 + 16.0f * ( this.quadsUV[0] + this.quadsUV[2] * from_a + this.quadsUV[4] * from_b ), // 0 + 16.0f * ( this.quadsUV[1] + this.quadsUV[3] * from_a + this.quadsUV[5] * from_b ), // 1 - 16.0f * ( quadsUV[0] + quadsUV[2] * to_a + quadsUV[4] * from_b ), // 2 - 16.0f * ( quadsUV[1] + quadsUV[3] * to_a + quadsUV[5] * from_b ), // 3 + 16.0f * ( this.quadsUV[0] + this.quadsUV[2] * to_a + this.quadsUV[4] * from_b ), // 2 + 16.0f * ( this.quadsUV[1] + this.quadsUV[3] * to_a + this.quadsUV[5] * from_b ), // 3 - 16.0f * ( quadsUV[0] + quadsUV[2] * to_a + quadsUV[4] * to_b ), // 2 - 16.0f * ( quadsUV[1] + quadsUV[3] * to_a + quadsUV[5] * to_b ), // 3 + 16.0f * ( this.quadsUV[0] + this.quadsUV[2] * to_a + this.quadsUV[4] * to_b ), // 2 + 16.0f * ( this.quadsUV[1] + this.quadsUV[3] * to_a + this.quadsUV[5] * to_b ), // 3 - 16.0f * ( quadsUV[0] + quadsUV[2] * from_a + quadsUV[4] * to_b ), // 0 - 16.0f * ( quadsUV[1] + quadsUV[3] * from_a + quadsUV[5] * to_b ), // 1 + 16.0f * ( this.quadsUV[0] + this.quadsUV[2] * from_a + this.quadsUV[4] * to_b ), // 0 + 16.0f * ( this.quadsUV[1] + this.quadsUV[3] * from_a + this.quadsUV[5] * to_b ), // 1 }; return afloat; @@ -479,12 +479,12 @@ public class ModelGenerator final BlockPos pos, final IAESprite lights ) { - final boolean isEdge = renderMinX < 0.0001; - final Vector3f to = new Vector3f( (float)renderMinX* 16.0f, (float)renderMinY* 16.0f, (float)renderMinZ * 16.0f); - final Vector3f from = new Vector3f( (float)renderMinX* 16.0f, (float)renderMaxY* 16.0f, (float)renderMaxZ * 16.0f); + final boolean isEdge = this.renderMinX < 0.0001; + final Vector3f to = new Vector3f( (float) this.renderMinX * 16.0f, (float) this.renderMinY * 16.0f, (float) this.renderMinZ * 16.0f); + final Vector3f from = new Vector3f( (float) this.renderMinX * 16.0f, (float) this.renderMaxY * 16.0f, (float) this.renderMaxZ * 16.0f); final EnumFacing myFace = EnumFacing.WEST; - addFace(myFace, isEdge,to,from,defUVs,lights ); + this.addFace(myFace, isEdge,to,from, this.defUVs,lights ); } public void renderFaceYNeg( @@ -492,12 +492,12 @@ public class ModelGenerator final BlockPos pos, final IAESprite lights ) { - final boolean isEdge = renderMinY < 0.0001; - final Vector3f to = new Vector3f( (float)renderMinX* 16.0f, (float)renderMinY* 16.0f, (float)renderMinZ* 16.0f ); - final Vector3f from = new Vector3f( (float)renderMaxX* 16.0f, (float)renderMinY* 16.0f, (float)renderMaxZ* 16.0f ); + final boolean isEdge = this.renderMinY < 0.0001; + final Vector3f to = new Vector3f( (float) this.renderMinX * 16.0f, (float) this.renderMinY * 16.0f, (float) this.renderMinZ * 16.0f ); + final Vector3f from = new Vector3f( (float) this.renderMaxX * 16.0f, (float) this.renderMinY * 16.0f, (float) this.renderMaxZ * 16.0f ); final EnumFacing myFace = EnumFacing.DOWN; - addFace(myFace, isEdge,to,from,defUVs, lights ); + this.addFace(myFace, isEdge,to,from, this.defUVs, lights ); } public void renderFaceZNeg( @@ -505,12 +505,12 @@ public class ModelGenerator final BlockPos pos, final IAESprite lights ) { - final boolean isEdge = renderMinZ < 0.0001; - final Vector3f to = new Vector3f( (float)renderMinX* 16.0f, (float)renderMinY* 16.0f, (float)renderMinZ* 16.0f ); - final Vector3f from = new Vector3f( (float)renderMaxX* 16.0f, (float)renderMaxY* 16.0f, (float)renderMinZ* 16.0f ); + final boolean isEdge = this.renderMinZ < 0.0001; + final Vector3f to = new Vector3f( (float) this.renderMinX * 16.0f, (float) this.renderMinY * 16.0f, (float) this.renderMinZ * 16.0f ); + final Vector3f from = new Vector3f( (float) this.renderMaxX * 16.0f, (float) this.renderMaxY * 16.0f, (float) this.renderMinZ * 16.0f ); final EnumFacing myFace = EnumFacing.NORTH; - addFace(myFace, isEdge,to,from,defUVs, lights ); + this.addFace(myFace, isEdge,to,from, this.defUVs, lights ); } public void renderFaceYPos( @@ -518,12 +518,12 @@ public class ModelGenerator final BlockPos pos, final IAESprite lights ) { - final boolean isEdge = renderMaxY > 0.9999; - final Vector3f to = new Vector3f( (float)renderMinX* 16.0f, (float)renderMaxY* 16.0f, (float)renderMinZ* 16.0f ); - final Vector3f from = new Vector3f( (float)renderMaxX* 16.0f, (float)renderMaxY* 16.0f, (float)renderMaxZ * 16.0f); + final boolean isEdge = this.renderMaxY > 0.9999; + final Vector3f to = new Vector3f( (float) this.renderMinX * 16.0f, (float) this.renderMaxY * 16.0f, (float) this.renderMinZ * 16.0f ); + final Vector3f from = new Vector3f( (float) this.renderMaxX * 16.0f, (float) this.renderMaxY * 16.0f, (float) this.renderMaxZ * 16.0f); final EnumFacing myFace = EnumFacing.UP; - addFace(myFace, isEdge,to,from,defUVs,lights ); + this.addFace(myFace, isEdge,to,from, this.defUVs,lights ); } public void renderFaceZPos( @@ -531,12 +531,12 @@ public class ModelGenerator final BlockPos pos, final IAESprite lights ) { - final boolean isEdge = renderMaxZ > 0.9999; - final Vector3f to = new Vector3f( (float)renderMinX* 16.0f, (float)renderMinY* 16.0f, (float)renderMaxZ* 16.0f ); - final Vector3f from = new Vector3f( (float)renderMaxX* 16.0f, (float)renderMaxY* 16.0f, (float)renderMaxZ* 16.0f ); + final boolean isEdge = this.renderMaxZ > 0.9999; + final Vector3f to = new Vector3f( (float) this.renderMinX * 16.0f, (float) this.renderMinY * 16.0f, (float) this.renderMaxZ * 16.0f ); + final Vector3f from = new Vector3f( (float) this.renderMaxX * 16.0f, (float) this.renderMaxY * 16.0f, (float) this.renderMaxZ * 16.0f ); final EnumFacing myFace = EnumFacing.SOUTH; - addFace(myFace, isEdge,to,from,defUVs,lights ); + this.addFace(myFace, isEdge,to,from, this.defUVs,lights ); } public void renderFaceXPos( @@ -544,12 +544,12 @@ public class ModelGenerator final BlockPos pos, final IAESprite lights ) { - final boolean isEdge = renderMaxX > 0.9999; - final Vector3f to = new Vector3f( (float)renderMaxX * 16.0f, (float)renderMinY* 16.0f, (float)renderMinZ* 16.0f ); - final Vector3f from = new Vector3f( (float)renderMaxX* 16.0f, (float)renderMaxY* 16.0f, (float)renderMaxZ* 16.0f ); + final boolean isEdge = this.renderMaxX > 0.9999; + final Vector3f to = new Vector3f( (float) this.renderMaxX * 16.0f, (float) this.renderMinY * 16.0f, (float) this.renderMinZ * 16.0f ); + final Vector3f from = new Vector3f( (float) this.renderMaxX * 16.0f, (float) this.renderMaxY * 16.0f, (float) this.renderMaxZ * 16.0f ); final EnumFacing myFace = EnumFacing.EAST; - addFace(myFace, isEdge,to,from,defUVs, lights ); + this.addFace(myFace, isEdge,to,from, this.defUVs, lights ); } private void addFace( @@ -559,10 +559,10 @@ public class ModelGenerator final float[] defUVs2, IAESprite texture ) { - if ( overrideBlockTexture != null ) - texture = overrideBlockTexture; - - faces.add( new SMFace(face,isEdge,color,to,from,defUVs2,new IconUnwrapper(texture))); + if ( this.overrideBlockTexture != null ) + texture = this.overrideBlockTexture; + + this.faces.add( new SMFace( face, isEdge, this.color, to, from, defUVs2, new IconUnwrapper( texture ) ) ); } EnumFacing currentFace = EnumFacing.UP; @@ -572,18 +572,24 @@ public class ModelGenerator final float y, final float z ) { - if ( x > 0.5 ) currentFace = EnumFacing.EAST; - if ( x < -0.5 ) currentFace = EnumFacing.WEST; - if ( y > 0.5 ) currentFace = EnumFacing.UP; - if ( y < -0.5 ) currentFace = EnumFacing.DOWN; - if ( z > 0.5 ) currentFace = EnumFacing.SOUTH; - if ( z < -0.5 ) currentFace = EnumFacing.NORTH; + if ( x > 0.5 ) + this.currentFace = EnumFacing.EAST; + if ( x < -0.5 ) + this.currentFace = EnumFacing.WEST; + if ( y > 0.5 ) + this.currentFace = EnumFacing.UP; + if ( y < -0.5 ) + this.currentFace = EnumFacing.DOWN; + if ( z > 0.5 ) + this.currentFace = EnumFacing.SOUTH; + if ( z < -0.5 ) + this.currentFace = EnumFacing.NORTH; } public void setOverrideBlockTexture( final IAESprite object ) { - overrideBlockTexture = object; + this.overrideBlockTexture = object; } public void finalizeModel( final boolean Flip ) @@ -593,15 +599,15 @@ public class ModelGenerator if ( Flip ) mr = ModelRotation.X0_Y180; - for ( final SMFace face : faces ) + for ( final SMFace face : this.faces ) { final EnumFacing myFace = face.face; - final float[] uvs = getFaceUvs( myFace, face.from, face.to ); + final float[] uvs = this.getFaceUvs( myFace, face.from, face.to ); final BlockFaceUV uv = new BlockFaceUV( uvs, 0 ); final BlockPartFace bpf = new BlockPartFace( myFace, face.color, "", uv ); - BakedQuad bf = faceBakery.makeBakedQuad( face.to, face.from, bpf, face.spite, myFace, mr, null, true, true ); + BakedQuad bf = this.faceBakery.makeBakedQuad( face.to, face.from, bpf, face.spite, myFace, mr, null, true, true ); bf = new IColoredBakedQuad.ColoredBakedQuad( bf.getVertexData(), face.color, bf.getFace() ); if ( face.isEdge ) @@ -613,7 +619,7 @@ public class ModelGenerator public IBakedModel getOutput() { - return generatedModel; + return this.generatedModel; } } diff --git a/src/main/java/appeng/client/render/blocks/RenderBlockWireless.java b/src/main/java/appeng/client/render/blocks/RenderBlockWireless.java index 4b61dc22..ff277f60 100644 --- a/src/main/java/appeng/client/render/blocks/RenderBlockWireless.java +++ b/src/main/java/appeng/client/render/blocks/RenderBlockWireless.java @@ -57,7 +57,7 @@ public class RenderBlockWireless extends BaseBlockRender= 3 || event.originalSpeed > BREAK_SPEAK_THRESHOLD ) + if( this.type != SkystoneType.STONE || level >= 3 || event.originalSpeed > BREAK_SPEAK_THRESHOLD ) { event.newSpeed /= BREAK_SPEAK_SCALAR; } @@ -106,7 +106,7 @@ public class SkyStoneBlock extends AEBaseBlock @Override public String getUnlocalizedName( final ItemStack is ) { - switch( type ) + switch( this.type ) { case BLOCK: return this.getUnlocalizedName() + ".Block"; diff --git a/src/main/java/appeng/facade/FacadePart.java b/src/main/java/appeng/facade/FacadePart.java index 09e9e44c..3fc34474 100644 --- a/src/main/java/appeng/facade/FacadePart.java +++ b/src/main/java/appeng/facade/FacadePart.java @@ -352,7 +352,7 @@ public class FacadePart implements IFacadePart, IBoxProvider { final ItemStack randomItem = fi.getTextureItem( this.facade ); - instance.setTexture( renderer.getIcon( facade ) ); + instance.setTexture( renderer.getIcon( this.facade ) ); instance.setBounds( 7, 7, 4, 9, 9, 14 ); instance.renderInventoryBox( renderer ); instance.setTexture( null ); @@ -376,7 +376,7 @@ public class FacadePart implements IFacadePart, IBoxProvider renderer.setBrightness( 15 << 20 | 15 << 4 ); renderer.setColorOpaque_F( 1, 1, 1 ); - instance.setTexture( renderer.getIcon( blk.getDefaultState() )[side.ordinal()] ); + instance.setTexture( renderer.getIcon( blk.getDefaultState() )[this.side.ordinal()] ); instance.setBounds( 0, 0, 14, 16, 16, 16 ); instance.renderInventoryBox( renderer ); diff --git a/src/main/java/appeng/helpers/MetaRotation.java b/src/main/java/appeng/helpers/MetaRotation.java index 1be3176b..e70ea8eb 100644 --- a/src/main/java/appeng/helpers/MetaRotation.java +++ b/src/main/java/appeng/helpers/MetaRotation.java @@ -63,9 +63,9 @@ public class MetaRotation implements IOrientable @Override public EnumFacing getUp() { - final IBlockState state = w.getBlockState( pos ); + final IBlockState state = this.w.getBlockState( this.pos ); - if (useFacing ) + if ( this.useFacing ) { final EnumFacing f = state == null ? EnumFacing.UP : (EnumFacing) state.getValue( BlockTorch.FACING ); return f; @@ -93,10 +93,10 @@ public class MetaRotation implements IOrientable { if( this.w instanceof World ) { - if ( useFacing ) - ( (World) this.w ).setBlockState( pos, w.getBlockState( pos ).withProperty( BlockTorch.FACING, up ) ); + if ( this.useFacing ) + ( (World) this.w ).setBlockState( this.pos, this.w.getBlockState( this.pos ).withProperty( BlockTorch.FACING, up ) ); else - ( (World) this.w ).setBlockState( pos, w.getBlockState( pos ).withProperty( AEBaseBlock.AXIS_ORIENTATION, up.getAxis() ) ); + ( (World) this.w ).setBlockState( this.pos, this.w.getBlockState( this.pos ).withProperty( AEBaseBlock.AXIS_ORIENTATION, up.getAxis() ) ); } else { diff --git a/src/main/java/appeng/helpers/MultiCraftingTracker.java b/src/main/java/appeng/helpers/MultiCraftingTracker.java index 04e1eee6..290eb476 100644 --- a/src/main/java/appeng/helpers/MultiCraftingTracker.java +++ b/src/main/java/appeng/helpers/MultiCraftingTracker.java @@ -55,7 +55,7 @@ public class MultiCraftingTracker public int getFailedCraftingAttempts() { - return failedCraftingAttempts; + return this.failedCraftingAttempts; } public void readFromNBT( final NBTTagCompound extra ) diff --git a/src/main/java/appeng/items/AEBaseItem.java b/src/main/java/appeng/items/AEBaseItem.java index d5fe66c5..e124f584 100644 --- a/src/main/java/appeng/items/AEBaseItem.java +++ b/src/main/java/appeng/items/AEBaseItem.java @@ -121,7 +121,7 @@ public abstract class AEBaseItem extends Item implements IAEFeature public IAESprite getIcon( final ItemStack is ) { - return myIcon; + return this.myIcon; } @SideOnly(Side.CLIENT) diff --git a/src/main/java/appeng/items/contents/NetworkToolViewer.java b/src/main/java/appeng/items/contents/NetworkToolViewer.java index 6376eea6..be0e9c5d 100644 --- a/src/main/java/appeng/items/contents/NetworkToolViewer.java +++ b/src/main/java/appeng/items/contents/NetworkToolViewer.java @@ -142,7 +142,7 @@ public class NetworkToolViewer implements INetworkTool public int getField( final int id ) { - return inv.getField( id ); + return this.inv.getField( id ); } @Override @@ -150,24 +150,24 @@ public class NetworkToolViewer implements INetworkTool final int id, final int value ) { - inv.setField( id, value ); + this.inv.setField( id, value ); } @Override public int getFieldCount() { - return inv.getFieldCount(); + return this.inv.getFieldCount(); } @Override public void clear() { - inv.clear(); + this.inv.clear(); } @Override public IChatComponent getDisplayName() { - return inv.getDisplayName(); + return this.inv.getDisplayName(); } } diff --git a/src/main/java/appeng/items/misc/ItemCrystalSeed.java b/src/main/java/appeng/items/misc/ItemCrystalSeed.java index 20ac0660..4052b317 100644 --- a/src/main/java/appeng/items/misc/ItemCrystalSeed.java +++ b/src/main/java/appeng/items/misc/ItemCrystalSeed.java @@ -103,22 +103,22 @@ public class ItemCrystalSeed extends AEBaseItem implements IGrowableCrystal { ModelResourceLocation[] list = null; - int damage = getProgress( stack ); + int damage = ItemCrystalSeed.this.getProgress( stack ); if( damage < CERTUS + SINGLE_OFFSET ) { - list = certus; + list = ItemCrystalSeed.this.certus; } else if( damage < NETHER + SINGLE_OFFSET ) { damage -= NETHER; - list = nether; + list = ItemCrystalSeed.this.nether; } else if( damage < FLUIX + SINGLE_OFFSET ) { damage -= FLUIX; - list = fluix; + list = ItemCrystalSeed.this.fluix; } if( list == null ) diff --git a/src/main/java/appeng/items/misc/ItemEncodedPattern.java b/src/main/java/appeng/items/misc/ItemEncodedPattern.java index 83d58330..bb0341d4 100644 --- a/src/main/java/appeng/items/misc/ItemEncodedPattern.java +++ b/src/main/java/appeng/items/misc/ItemEncodedPattern.java @@ -71,7 +71,7 @@ public class ItemEncodedPattern extends AEBaseItem implements ICraftingPatternIt final ClientHelper proxy, final String name ) { - encodedPatternModel = res = proxy.setIcon( this, name ); + this.encodedPatternModel = this.res = proxy.setIcon( this, name ); Minecraft.getMinecraft().getRenderItem().getItemModelMesher().register( this, new ItemMeshDefinition(){ @@ -81,7 +81,7 @@ public class ItemEncodedPattern extends AEBaseItem implements ICraftingPatternIt public ModelResourceLocation getModelLocation( final ItemStack stack ) { - if ( recursive == false ) + if ( this.recursive == false ) { this.recursive = true; @@ -90,13 +90,13 @@ public class ItemEncodedPattern extends AEBaseItem implements ICraftingPatternIt final ItemStack is = iep.getOutput( stack ); if ( Minecraft.getMinecraft().thePlayer.isSneaking() ) { - return encodedPatternModel; + return ItemEncodedPattern.this.encodedPatternModel; } this.recursive = false; } - return res; + return ItemEncodedPattern.this.res; } }); diff --git a/src/main/java/appeng/items/misc/ItemPaintBall.java b/src/main/java/appeng/items/misc/ItemPaintBall.java index edd906da..dab8bd22 100644 --- a/src/main/java/appeng/items/misc/ItemPaintBall.java +++ b/src/main/java/appeng/items/misc/ItemPaintBall.java @@ -62,7 +62,7 @@ public class ItemPaintBall extends AEBaseItem public ModelResourceLocation getModelLocation( final ItemStack stack ) { - if ( isLumen(stack) ) + if ( ItemPaintBall.this.isLumen(stack) ) return sloc; return loc; @@ -86,7 +86,7 @@ public class ItemPaintBall extends AEBaseItem final ItemStack stack, final int renderPass ) { - final AEColor col = getColor(stack); + final AEColor col = this.getColor(stack); final int colorValue = stack.getItemDamage() >= 20 ? col.mediumVariant : col.mediumVariant; final int r = ( colorValue >> 16 ) & 0xff; diff --git a/src/main/java/appeng/items/parts/ItemFacade.java b/src/main/java/appeng/items/parts/ItemFacade.java index ccd34bf6..83d2919c 100644 --- a/src/main/java/appeng/items/parts/ItemFacade.java +++ b/src/main/java/appeng/items/parts/ItemFacade.java @@ -299,6 +299,6 @@ public class ItemFacade extends AEBaseItem implements IFacadeItem, IAlphaPassIte public void registerCustomIcon( final TextureMap map ) { - myIcon = new BaseIcon( map.registerSprite( new ResourceLocation( AppEng.MOD_ID, "blocks/ItemFacade" ) )); + this.myIcon = new BaseIcon( map.registerSprite( new ResourceLocation( AppEng.MOD_ID, "blocks/ItemFacade" ) )); } } diff --git a/src/main/java/appeng/items/tools/powered/ToolEntropyManipulator.java b/src/main/java/appeng/items/tools/powered/ToolEntropyManipulator.java index 1204c4a4..32a1d470 100644 --- a/src/main/java/appeng/items/tools/powered/ToolEntropyManipulator.java +++ b/src/main/java/appeng/items/tools/powered/ToolEntropyManipulator.java @@ -101,21 +101,21 @@ public class ToolEntropyManipulator extends AEBasePoweredItem implements IBlockT public InWorldToolOperationIngredient( final IBlockState state ) { this.state = state; - blockOnly = false; + this.blockOnly = false; } public InWorldToolOperationIngredient( final Block blk, final boolean b ) { - state = blk.getDefaultState(); - blockOnly = b; + this.state = blk.getDefaultState(); + this.blockOnly = b; } @Override public int hashCode() { - return state.getBlock().hashCode(); + return this.state.getBlock().hashCode(); } @Override @@ -130,7 +130,7 @@ public class ToolEntropyManipulator extends AEBasePoweredItem implements IBlockT return false; } final InWorldToolOperationIngredient other = (InWorldToolOperationIngredient) obj; - return state == other.state && ( blockOnly && state.getBlock() == other.state.getBlock() ); + return this.state == other.state && ( this.blockOnly && this.state.getBlock() == other.state.getBlock() ); } } diff --git a/src/main/java/appeng/me/GridNode.java b/src/main/java/appeng/me/GridNode.java index 81ef4751..530e7e8b 100644 --- a/src/main/java/appeng/me/GridNode.java +++ b/src/main/java/appeng/me/GridNode.java @@ -668,7 +668,7 @@ public class GridNode implements IGridNode, IPathItem public int getLastUsedChannels() { - return lastUsedChannels; + return this.lastUsedChannels; } private static class MachineSecurityBreak implements IWorldCallable diff --git a/src/main/java/appeng/me/cluster/implementations/CraftingCPUCluster.java b/src/main/java/appeng/me/cluster/implementations/CraftingCPUCluster.java index 4b0a8797..630e1af3 100644 --- a/src/main/java/appeng/me/cluster/implementations/CraftingCPUCluster.java +++ b/src/main/java/appeng/me/cluster/implementations/CraftingCPUCluster.java @@ -1308,24 +1308,24 @@ public final class CraftingCPUCluster implements IAECluster, ICraftingCPU private void updateElapsedTime( final IAEItemStack is ) { final long nextStartTime = System.nanoTime(); - this.elapsedTime = this.getElapsedTime() + nextStartTime - lastTime; + this.elapsedTime = this.getElapsedTime() + nextStartTime - this.lastTime; this.lastTime = nextStartTime; this.remainingItemCount = this.getRemainingItemCount() - is.getStackSize(); } public long getElapsedTime() { - return elapsedTime; + return this.elapsedTime; } public long getRemainingItemCount() { - return remainingItemCount; + return this.remainingItemCount; } public long getStartItemCount() { - return startItemCount; + return this.startItemCount; } static class TaskProgress diff --git a/src/main/java/appeng/parts/automation/PartAnnihilationPlane.java b/src/main/java/appeng/parts/automation/PartAnnihilationPlane.java index c3362d30..02c1ec8a 100644 --- a/src/main/java/appeng/parts/automation/PartAnnihilationPlane.java +++ b/src/main/java/appeng/parts/automation/PartAnnihilationPlane.java @@ -141,7 +141,7 @@ public class PartAnnihilationPlane extends PartBasicState implements IGridTickab @SideOnly( Side.CLIENT ) public void renderInventory( final IPartRenderHelper rh, final ModelGenerator renderer ) { - rh.setTexture( SIDE_ICON, SIDE_ICON, BACK_ICON, renderer.getIcon( is ), SIDE_ICON, SIDE_ICON ); + rh.setTexture( SIDE_ICON, SIDE_ICON, BACK_ICON, renderer.getIcon( this.is ), SIDE_ICON, SIDE_ICON ); rh.setBounds( 1, 1, 15, 15, 15, 16 ); rh.renderInventoryBox( renderer ); @@ -192,12 +192,12 @@ public class PartAnnihilationPlane extends PartBasicState implements IGridTickab final boolean isActive = ( this.clientFlags & ( PartBasicState.POWERED_FLAG | PartBasicState.CHANNEL_FLAG ) ) == ( PartBasicState.POWERED_FLAG | PartBasicState.CHANNEL_FLAG ); - rh.setTexture( SIDE_ICON, SIDE_ICON, BACK_ICON, isActive ? activeIcon : renderer.getIcon( is ), SIDE_ICON, SIDE_ICON ); + rh.setTexture( SIDE_ICON, SIDE_ICON, BACK_ICON, isActive ? activeIcon : renderer.getIcon( this.is ), SIDE_ICON, SIDE_ICON ); rh.setBounds( minX, minY, 15, maxX, maxY, 16 ); rh.renderBlock( opos, renderer ); - rh.setTexture( STATUS_ICON, STATUS_ICON, BACK_ICON, isActive ? activeIcon : renderer.getIcon( is ), STATUS_ICON, STATUS_ICON ); + rh.setTexture( STATUS_ICON, STATUS_ICON, BACK_ICON, isActive ? activeIcon : renderer.getIcon( this.is ), STATUS_ICON, STATUS_ICON ); rh.setBounds( 5, 5, 14, 11, 11, 15 ); rh.renderBlock( opos, renderer ); @@ -225,7 +225,7 @@ public class PartAnnihilationPlane extends PartBasicState implements IGridTickab if( this.isAccepting && entity instanceof EntityItem && !entity.isDead && Platform.isServer() && this.proxy.isActive() ) { boolean capture = false; - final BlockPos pos = tile.getPos(); + final BlockPos pos = this.tile.getPos(); switch( this.side ) { @@ -424,7 +424,7 @@ public class PartAnnihilationPlane extends PartBasicState implements IGridTickab final TileEntity te = this.getTile(); final WorldServer w = (WorldServer) te.getWorld(); - final BlockPos pos = te.getPos().offset( side.getFacing() ); + final BlockPos pos = te.getPos().offset( this.side.getFacing() ); final IEnergyGrid energy = this.proxy.getEnergy(); diff --git a/src/main/java/appeng/parts/automation/PartExportBus.java b/src/main/java/appeng/parts/automation/PartExportBus.java index 1c94bf18..18d02cd4 100644 --- a/src/main/java/appeng/parts/automation/PartExportBus.java +++ b/src/main/java/appeng/parts/automation/PartExportBus.java @@ -198,7 +198,7 @@ public class PartExportBus extends PartSharedItemBus implements ICraftingRequest @SideOnly( Side.CLIENT ) public void renderInventory( final IPartRenderHelper rh, final ModelGenerator renderer ) { - rh.setTexture( CableBusTextures.PartExportSides.getIcon(), CableBusTextures.PartExportSides.getIcon(), CableBusTextures.PartMonitorBack.getIcon(), renderer.getIcon( is ), CableBusTextures.PartExportSides.getIcon(), CableBusTextures.PartExportSides.getIcon() ); + rh.setTexture( CableBusTextures.PartExportSides.getIcon(), CableBusTextures.PartExportSides.getIcon(), CableBusTextures.PartMonitorBack.getIcon(), renderer.getIcon( this.is ), CableBusTextures.PartExportSides.getIcon(), CableBusTextures.PartExportSides.getIcon() ); rh.setBounds( 4, 4, 12, 12, 12, 14 ); rh.renderInventoryBox( renderer ); @@ -214,7 +214,7 @@ public class PartExportBus extends PartSharedItemBus implements ICraftingRequest @SideOnly( Side.CLIENT ) public void renderStatic( final BlockPos pos, final IPartRenderHelper rh, final ModelGenerator renderer ) { - rh.setTexture( CableBusTextures.PartExportSides.getIcon(), CableBusTextures.PartExportSides.getIcon(), CableBusTextures.PartMonitorBack.getIcon(), renderer.getIcon( is ), CableBusTextures.PartExportSides.getIcon(), CableBusTextures.PartExportSides.getIcon() ); + rh.setTexture( CableBusTextures.PartExportSides.getIcon(), CableBusTextures.PartExportSides.getIcon(), CableBusTextures.PartMonitorBack.getIcon(), renderer.getIcon( this.is ), CableBusTextures.PartExportSides.getIcon(), CableBusTextures.PartExportSides.getIcon() ); rh.setBounds( 4, 4, 12, 12, 12, 14 ); rh.renderBlock( pos, renderer ); @@ -225,7 +225,7 @@ public class PartExportBus extends PartSharedItemBus implements ICraftingRequest rh.setBounds( 6, 6, 15, 10, 10, 16 ); rh.renderBlock( pos, renderer ); - rh.setTexture( CableBusTextures.PartMonitorSidesStatus.getIcon(), CableBusTextures.PartMonitorSidesStatus.getIcon(), CableBusTextures.PartMonitorBack.getIcon(), renderer.getIcon( is ), CableBusTextures.PartMonitorSidesStatus.getIcon(), CableBusTextures.PartMonitorSidesStatus.getIcon() ); + rh.setTexture( CableBusTextures.PartMonitorSidesStatus.getIcon(), CableBusTextures.PartMonitorSidesStatus.getIcon(), CableBusTextures.PartMonitorBack.getIcon(), renderer.getIcon( this.is ), CableBusTextures.PartMonitorSidesStatus.getIcon(), CableBusTextures.PartMonitorSidesStatus.getIcon() ); rh.setBounds( 6, 6, 11, 10, 10, 12 ); rh.renderBlock( pos, renderer ); diff --git a/src/main/java/appeng/parts/automation/PartFormationPlane.java b/src/main/java/appeng/parts/automation/PartFormationPlane.java index 0ef492e1..3cfb95b6 100644 --- a/src/main/java/appeng/parts/automation/PartFormationPlane.java +++ b/src/main/java/appeng/parts/automation/PartFormationPlane.java @@ -268,7 +268,7 @@ public class PartFormationPlane extends PartUpgradeable implements ICellContaine @SideOnly( Side.CLIENT ) public void renderInventory( final IPartRenderHelper rh, final ModelGenerator renderer ) { - rh.setTexture( CableBusTextures.PartPlaneSides.getIcon(), CableBusTextures.PartPlaneSides.getIcon(), CableBusTextures.PartTransitionPlaneBack.getIcon(), renderer.getIcon( is ), CableBusTextures.PartPlaneSides.getIcon(), CableBusTextures.PartPlaneSides.getIcon() ); + rh.setTexture( CableBusTextures.PartPlaneSides.getIcon(), CableBusTextures.PartPlaneSides.getIcon(), CableBusTextures.PartTransitionPlaneBack.getIcon(), renderer.getIcon( this.is ), CableBusTextures.PartPlaneSides.getIcon(), CableBusTextures.PartPlaneSides.getIcon() ); rh.setBounds( 1, 1, 15, 15, 15, 16 ); rh.renderInventoryBox( renderer ); @@ -314,12 +314,12 @@ public class PartFormationPlane extends PartUpgradeable implements ICellContaine final boolean isActive = ( this.clientFlags & ( PartBasicState.POWERED_FLAG | PartBasicState.CHANNEL_FLAG ) ) == ( PartBasicState.POWERED_FLAG | PartBasicState.CHANNEL_FLAG ); - rh.setTexture( CableBusTextures.PartPlaneSides.getIcon(), CableBusTextures.PartPlaneSides.getIcon(), CableBusTextures.PartTransitionPlaneBack.getIcon(), isActive ? CableBusTextures.BlockFormPlaneOn.getIcon() : renderer.getIcon( is ), CableBusTextures.PartPlaneSides.getIcon(), CableBusTextures.PartPlaneSides.getIcon() ); + rh.setTexture( CableBusTextures.PartPlaneSides.getIcon(), CableBusTextures.PartPlaneSides.getIcon(), CableBusTextures.PartTransitionPlaneBack.getIcon(), isActive ? CableBusTextures.BlockFormPlaneOn.getIcon() : renderer.getIcon( this.is ), CableBusTextures.PartPlaneSides.getIcon(), CableBusTextures.PartPlaneSides.getIcon() ); rh.setBounds( minX, minY, 15, maxX, maxY, 16 ); rh.renderBlock( opos, renderer ); - rh.setTexture( CableBusTextures.PartMonitorSidesStatus.getIcon(), CableBusTextures.PartMonitorSidesStatus.getIcon(), CableBusTextures.PartTransitionPlaneBack.getIcon(), isActive ? CableBusTextures.BlockFormPlaneOn.getIcon() : renderer.getIcon( is ), CableBusTextures.PartMonitorSidesStatus.getIcon(), CableBusTextures.PartMonitorSidesStatus.getIcon() ); + rh.setTexture( CableBusTextures.PartMonitorSidesStatus.getIcon(), CableBusTextures.PartMonitorSidesStatus.getIcon(), CableBusTextures.PartTransitionPlaneBack.getIcon(), isActive ? CableBusTextures.BlockFormPlaneOn.getIcon() : renderer.getIcon( this.is ), CableBusTextures.PartMonitorSidesStatus.getIcon(), CableBusTextures.PartMonitorSidesStatus.getIcon() ); rh.setBounds( 5, 5, 14, 11, 11, 15 ); rh.renderBlock( opos, renderer ); diff --git a/src/main/java/appeng/parts/automation/PartImportBus.java b/src/main/java/appeng/parts/automation/PartImportBus.java index 6c719ec6..a481f144 100644 --- a/src/main/java/appeng/parts/automation/PartImportBus.java +++ b/src/main/java/appeng/parts/automation/PartImportBus.java @@ -102,7 +102,7 @@ public class PartImportBus extends PartSharedItemBus implements IInventoryDestin @SideOnly( Side.CLIENT ) public void renderInventory( final IPartRenderHelper rh, final ModelGenerator renderer ) { - rh.setTexture( CableBusTextures.PartImportSides.getIcon(), CableBusTextures.PartImportSides.getIcon(), CableBusTextures.PartMonitorBack.getIcon(), renderer.getIcon( is ), CableBusTextures.PartImportSides.getIcon(), CableBusTextures.PartImportSides.getIcon() ); + rh.setTexture( CableBusTextures.PartImportSides.getIcon(), CableBusTextures.PartImportSides.getIcon(), CableBusTextures.PartMonitorBack.getIcon(), renderer.getIcon( this.is ), CableBusTextures.PartImportSides.getIcon(), CableBusTextures.PartImportSides.getIcon() ); rh.setBounds( 3, 3, 15, 13, 13, 16 ); rh.renderInventoryBox( renderer ); @@ -118,7 +118,7 @@ public class PartImportBus extends PartSharedItemBus implements IInventoryDestin @SideOnly( Side.CLIENT ) public void renderStatic( final BlockPos pos, final IPartRenderHelper rh, final ModelGenerator renderer ) { - rh.setTexture( CableBusTextures.PartImportSides.getIcon(), CableBusTextures.PartImportSides.getIcon(), CableBusTextures.PartMonitorBack.getIcon(), renderer.getIcon( is ), CableBusTextures.PartImportSides.getIcon(), CableBusTextures.PartImportSides.getIcon() ); + rh.setTexture( CableBusTextures.PartImportSides.getIcon(), CableBusTextures.PartImportSides.getIcon(), CableBusTextures.PartMonitorBack.getIcon(), renderer.getIcon( this.is ), CableBusTextures.PartImportSides.getIcon(), CableBusTextures.PartImportSides.getIcon() ); rh.setBounds( 4, 4, 14, 12, 12, 16 ); rh.renderBlock( pos, renderer ); @@ -128,7 +128,7 @@ public class PartImportBus extends PartSharedItemBus implements IInventoryDestin rh.setBounds( 6, 6, 12, 10, 10, 13 ); rh.renderBlock( pos, renderer ); - rh.setTexture( CableBusTextures.PartMonitorSidesStatus.getIcon(), CableBusTextures.PartMonitorSidesStatus.getIcon(), CableBusTextures.PartMonitorBack.getIcon(), renderer.getIcon( is ), CableBusTextures.PartMonitorSidesStatus.getIcon(), CableBusTextures.PartMonitorSidesStatus.getIcon() ); + rh.setTexture( CableBusTextures.PartMonitorSidesStatus.getIcon(), CableBusTextures.PartMonitorSidesStatus.getIcon(), CableBusTextures.PartMonitorBack.getIcon(), renderer.getIcon( this.is ), CableBusTextures.PartMonitorSidesStatus.getIcon(), CableBusTextures.PartMonitorSidesStatus.getIcon() ); rh.setBounds( 6, 6, 11, 10, 10, 12 ); rh.renderBlock( pos, renderer ); diff --git a/src/main/java/appeng/parts/automation/PartLevelEmitter.java b/src/main/java/appeng/parts/automation/PartLevelEmitter.java index 1c6ac91a..bef418ff 100644 --- a/src/main/java/appeng/parts/automation/PartLevelEmitter.java +++ b/src/main/java/appeng/parts/automation/PartLevelEmitter.java @@ -145,7 +145,7 @@ public class PartLevelEmitter extends PartUpgradeable implements IEnergyWatcherH final TileEntity te = this.host.getTile(); this.prevState = isOn; Platform.notifyBlocksOfNeighbors( te.getWorld(), te.getPos() ); - Platform.notifyBlocksOfNeighbors( te.getWorld(), te.getPos().offset( side.getFacing() ) ); + Platform.notifyBlocksOfNeighbors( te.getWorld(), te.getPos().offset( this.side.getFacing() ) ); } } @@ -194,7 +194,7 @@ public class PartLevelEmitter extends PartUpgradeable implements IEnergyWatcherH @Override public TextureAtlasSprite getBreakingTexture( final ModelGenerator renderer ) { - return renderer.getIcon( is ).getAtlas(); + return renderer.getIcon( this.is ).getAtlas(); } @Override @@ -414,14 +414,14 @@ public class PartLevelEmitter extends PartUpgradeable implements IEnergyWatcherH @SideOnly( Side.CLIENT ) public void renderInventory( final IPartRenderHelper rh, final ModelGenerator renderer ) { - rh.setTexture( renderer.getIcon( is ) ); + rh.setTexture( renderer.getIcon( this.is ) ); this.renderTorchAtAngle( 0, -0.5, 0, renderer ); } public void renderTorchAtAngle( double baseX, double baseY, double baseZ, final ModelGenerator renderer ) { final boolean isOn = this.isLevelEmitterOn(); - final IAESprite offTexture = renderer.getIcon( is ); + final IAESprite offTexture = renderer.getIcon( this.is ); final IAESprite IIcon = ( isOn ? CableBusTextures.LevelEmitterTorchOn.getIcon() : offTexture ); // this.centerX = baseX + 0.5; @@ -580,7 +580,7 @@ public class PartLevelEmitter extends PartUpgradeable implements IEnergyWatcherH @SideOnly( Side.CLIENT ) public void renderStatic( final BlockPos pos, final IPartRenderHelper rh, final ModelGenerator renderer ) { - rh.setTexture( renderer.getIcon( is ) ); + rh.setTexture( renderer.getIcon( this.is ) ); // rh.setTexture( CableBusTextures.ItemPartLevelEmitterOn.getIcon() ); // rh.setBounds( 2, 2, 14, 14, 14, 16 ); diff --git a/src/main/java/appeng/parts/automation/PartSharedItemBus.java b/src/main/java/appeng/parts/automation/PartSharedItemBus.java index 1ccd31fc..bd1fd76a 100644 --- a/src/main/java/appeng/parts/automation/PartSharedItemBus.java +++ b/src/main/java/appeng/parts/automation/PartSharedItemBus.java @@ -95,7 +95,7 @@ public abstract class PartSharedItemBus extends PartUpgradeable implements IGrid protected InventoryAdaptor getHandler() { final TileEntity self = this.getHost().getTile(); - final TileEntity target = this.getTileEntity( self, self.getPos().offset( side.getFacing() ) ); + final TileEntity target = this.getTileEntity( self, self.getPos().offset( this.side.getFacing() ) ); final int newAdaptorHash = Platform.generateTileHash( target ); diff --git a/src/main/java/appeng/parts/misc/PartCableAnchor.java b/src/main/java/appeng/parts/misc/PartCableAnchor.java index 24b55a21..6c207d4b 100644 --- a/src/main/java/appeng/parts/misc/PartCableAnchor.java +++ b/src/main/java/appeng/parts/misc/PartCableAnchor.java @@ -84,7 +84,7 @@ public class PartCableAnchor implements IPart @SideOnly( Side.CLIENT ) public void renderInventory( final IPartRenderHelper instance, final ModelGenerator renderer ) { - instance.setTexture( renderer.getIcon( is ) ); + instance.setTexture( renderer.getIcon( this.is ) ); instance.setBounds( 7, 7, 4, 9, 9, 14 ); instance.renderInventoryBox( renderer ); instance.setTexture( null ); @@ -94,7 +94,7 @@ public class PartCableAnchor implements IPart @SideOnly( Side.CLIENT ) public void renderStatic( final BlockPos pos, final IPartRenderHelper rh, final ModelGenerator renderer ) { - final IAESprite myIcon = renderer.getIcon( is ); + final IAESprite myIcon = renderer.getIcon( this.is ); rh.setTexture( myIcon ); if( this.host != null && this.host.getFacadeContainer().getFacade( this.mySide ) != null ) { diff --git a/src/main/java/appeng/parts/misc/PartInterface.java b/src/main/java/appeng/parts/misc/PartInterface.java index 158d8cee..8b2995a2 100644 --- a/src/main/java/appeng/parts/misc/PartInterface.java +++ b/src/main/java/appeng/parts/misc/PartInterface.java @@ -114,7 +114,7 @@ public class PartInterface extends PartBasicState implements IGridTickable, ISto @SideOnly( Side.CLIENT ) public void renderInventory( final IPartRenderHelper rh, final ModelGenerator renderer ) { - rh.setTexture( CableBusTextures.PartMonitorSides.getIcon(), CableBusTextures.PartMonitorSides.getIcon(), CableBusTextures.PartMonitorBack.getIcon(), renderer.getIcon( is ), CableBusTextures.PartMonitorSides.getIcon(), CableBusTextures.PartMonitorSides.getIcon() ); + rh.setTexture( CableBusTextures.PartMonitorSides.getIcon(), CableBusTextures.PartMonitorSides.getIcon(), CableBusTextures.PartMonitorBack.getIcon(), renderer.getIcon( this.is ), CableBusTextures.PartMonitorSides.getIcon(), CableBusTextures.PartMonitorSides.getIcon() ); rh.setBounds( 2, 2, 14, 14, 14, 16 ); rh.renderInventoryBox( renderer ); @@ -136,17 +136,17 @@ public class PartInterface extends PartBasicState implements IGridTickable, ISto @SideOnly( Side.CLIENT ) public void renderStatic( final BlockPos pos, final IPartRenderHelper rh, final ModelGenerator renderer ) { - rh.setTexture( CableBusTextures.PartMonitorSides.getIcon(), CableBusTextures.PartMonitorSides.getIcon(), CableBusTextures.PartMonitorBack.getIcon(), renderer.getIcon( is ), CableBusTextures.PartMonitorSides.getIcon(), CableBusTextures.PartMonitorSides.getIcon() ); + rh.setTexture( CableBusTextures.PartMonitorSides.getIcon(), CableBusTextures.PartMonitorSides.getIcon(), CableBusTextures.PartMonitorBack.getIcon(), renderer.getIcon( this.is ), CableBusTextures.PartMonitorSides.getIcon(), CableBusTextures.PartMonitorSides.getIcon() ); rh.setBounds( 2, 2, 14, 14, 14, 16 ); rh.renderBlock( pos, renderer ); - rh.setTexture( CableBusTextures.PartMonitorSides.getIcon(), CableBusTextures.PartMonitorSides.getIcon(), CableBusTextures.PartMonitorBack.getIcon(), renderer.getIcon( is ), CableBusTextures.PartMonitorSides.getIcon(), CableBusTextures.PartMonitorSides.getIcon() ); + rh.setTexture( CableBusTextures.PartMonitorSides.getIcon(), CableBusTextures.PartMonitorSides.getIcon(), CableBusTextures.PartMonitorBack.getIcon(), renderer.getIcon( this.is ), CableBusTextures.PartMonitorSides.getIcon(), CableBusTextures.PartMonitorSides.getIcon() ); rh.setBounds( 5, 5, 12, 11, 11, 13 ); rh.renderBlock( pos, renderer ); - rh.setTexture( CableBusTextures.PartMonitorSidesStatus.getIcon(), CableBusTextures.PartMonitorSidesStatus.getIcon(), CableBusTextures.PartMonitorBack.getIcon(), renderer.getIcon( is ), CableBusTextures.PartMonitorSidesStatus.getIcon(), CableBusTextures.PartMonitorSidesStatus.getIcon() ); + rh.setTexture( CableBusTextures.PartMonitorSidesStatus.getIcon(), CableBusTextures.PartMonitorSidesStatus.getIcon(), CableBusTextures.PartMonitorBack.getIcon(), renderer.getIcon( this.is ), CableBusTextures.PartMonitorSidesStatus.getIcon(), CableBusTextures.PartMonitorSidesStatus.getIcon() ); rh.setBounds( 5, 5, 13, 11, 11, 14 ); rh.renderBlock( pos, renderer ); @@ -218,7 +218,7 @@ public class PartInterface extends PartBasicState implements IGridTickable, ISto @Override public TextureAtlasSprite getBreakingTexture( final ModelGenerator renderer) { - return renderer.getIcon( is ).getAtlas(); + return renderer.getIcon( this.is ).getAtlas(); } @Override diff --git a/src/main/java/appeng/parts/misc/PartStorageBus.java b/src/main/java/appeng/parts/misc/PartStorageBus.java index 4c6cb9ff..b1246e4c 100644 --- a/src/main/java/appeng/parts/misc/PartStorageBus.java +++ b/src/main/java/appeng/parts/misc/PartStorageBus.java @@ -264,7 +264,7 @@ public class PartStorageBus extends PartUpgradeable implements IGridTickable, IC @SideOnly( Side.CLIENT ) public void renderInventory( final IPartRenderHelper rh, final ModelGenerator renderer ) { - rh.setTexture( CableBusTextures.PartStorageSides.getIcon(), CableBusTextures.PartStorageSides.getIcon(), CableBusTextures.PartStorageBack.getIcon(), renderer.getIcon( is ), CableBusTextures.PartStorageSides.getIcon(), CableBusTextures.PartStorageSides.getIcon() ); + rh.setTexture( CableBusTextures.PartStorageSides.getIcon(), CableBusTextures.PartStorageSides.getIcon(), CableBusTextures.PartStorageBack.getIcon(), renderer.getIcon( this.is ), CableBusTextures.PartStorageSides.getIcon(), CableBusTextures.PartStorageSides.getIcon() ); rh.setBounds( 3, 3, 15, 13, 13, 16 ); rh.renderInventoryBox( renderer ); @@ -280,7 +280,7 @@ public class PartStorageBus extends PartUpgradeable implements IGridTickable, IC @SideOnly( Side.CLIENT ) public void renderStatic( final BlockPos pos, final IPartRenderHelper rh, final ModelGenerator renderer ) { - rh.setTexture( CableBusTextures.PartStorageSides.getIcon(), CableBusTextures.PartStorageSides.getIcon(), CableBusTextures.PartStorageBack.getIcon(), renderer.getIcon( is ), CableBusTextures.PartStorageSides.getIcon(), CableBusTextures.PartStorageSides.getIcon() ); + rh.setTexture( CableBusTextures.PartStorageSides.getIcon(), CableBusTextures.PartStorageSides.getIcon(), CableBusTextures.PartStorageBack.getIcon(), renderer.getIcon( this.is ), CableBusTextures.PartStorageSides.getIcon(), CableBusTextures.PartStorageSides.getIcon() ); rh.setBounds( 3, 3, 15, 13, 13, 16 ); rh.renderBlock( pos, renderer ); @@ -288,12 +288,12 @@ public class PartStorageBus extends PartUpgradeable implements IGridTickable, IC rh.setBounds( 2, 2, 14, 14, 14, 15 ); rh.renderBlock( pos, renderer ); - rh.setTexture( CableBusTextures.PartStorageSides.getIcon(), CableBusTextures.PartStorageSides.getIcon(), CableBusTextures.PartStorageBack.getIcon(), renderer.getIcon( is ), CableBusTextures.PartStorageSides.getIcon(), CableBusTextures.PartStorageSides.getIcon() ); + rh.setTexture( CableBusTextures.PartStorageSides.getIcon(), CableBusTextures.PartStorageSides.getIcon(), CableBusTextures.PartStorageBack.getIcon(), renderer.getIcon( this.is ), CableBusTextures.PartStorageSides.getIcon(), CableBusTextures.PartStorageSides.getIcon() ); rh.setBounds( 5, 5, 12, 11, 11, 13 ); rh.renderBlock( pos, renderer ); - rh.setTexture( CableBusTextures.PartMonitorSidesStatus.getIcon(), CableBusTextures.PartMonitorSidesStatus.getIcon(), CableBusTextures.PartMonitorBack.getIcon(), renderer.getIcon( is ), CableBusTextures.PartMonitorSidesStatus.getIcon(), CableBusTextures.PartMonitorSidesStatus.getIcon() ); + rh.setTexture( CableBusTextures.PartMonitorSidesStatus.getIcon(), CableBusTextures.PartMonitorSidesStatus.getIcon(), CableBusTextures.PartMonitorBack.getIcon(), renderer.getIcon( this.is ), CableBusTextures.PartMonitorSidesStatus.getIcon(), CableBusTextures.PartMonitorSidesStatus.getIcon() ); rh.setBounds( 5, 5, 13, 11, 11, 14 ); rh.renderBlock( pos, renderer ); @@ -397,7 +397,7 @@ public class PartStorageBus extends PartUpgradeable implements IGridTickable, IC this.cached = true; final TileEntity self = this.getHost().getTile(); - final TileEntity target = self.getWorld().getTileEntity( self.getPos().offset( side.getFacing() ) ); + final TileEntity target = self.getWorld().getTileEntity( self.getPos().offset( this.side.getFacing() ) ); final int newHandlerHash = Platform.generateTileHash( target ); diff --git a/src/main/java/appeng/parts/misc/PartToggleBus.java b/src/main/java/appeng/parts/misc/PartToggleBus.java index adf893f6..1c93f8d5 100644 --- a/src/main/java/appeng/parts/misc/PartToggleBus.java +++ b/src/main/java/appeng/parts/misc/PartToggleBus.java @@ -90,7 +90,7 @@ public class PartToggleBus extends PartBasicState @Override public TextureAtlasSprite getBreakingTexture( final ModelGenerator renderer ) { - return renderer.getIcon( is ).getAtlas(); + return renderer.getIcon( this.is ).getAtlas(); } @Override @@ -124,7 +124,7 @@ public class PartToggleBus extends PartBasicState { GL11.glTranslated( -0.2, -0.3, 0.0 ); - rh.setTexture( renderer.getIcon( is ) ); + rh.setTexture( renderer.getIcon( this.is ) ); rh.setBounds( 6, 6, 14 - 4, 10, 10, 16 - 4 ); rh.renderInventoryBox( renderer ); @@ -147,7 +147,7 @@ public class PartToggleBus extends PartBasicState @SideOnly( Side.CLIENT ) public void renderStatic( final BlockPos pos, final IPartRenderHelper rh, final ModelGenerator renderer ) { - rh.setTexture( renderer.getIcon( is ) ); + rh.setTexture( renderer.getIcon( this.is ) ); rh.setBounds( 6, 6, 14, 10, 10, 16 ); rh.renderBlock( pos, renderer ); @@ -155,7 +155,7 @@ public class PartToggleBus extends PartBasicState rh.setBounds( 6, 6, 11, 10, 10, 13 ); rh.renderBlock( pos, renderer ); - rh.setTexture( CableBusTextures.PartMonitorSidesStatus.getIcon(), CableBusTextures.PartMonitorSidesStatus.getIcon(), CableBusTextures.PartMonitorBack.getIcon(), renderer.getIcon( is ), CableBusTextures.PartMonitorSidesStatus.getIcon(), CableBusTextures.PartMonitorSidesStatus.getIcon() ); + rh.setTexture( CableBusTextures.PartMonitorSidesStatus.getIcon(), CableBusTextures.PartMonitorSidesStatus.getIcon(), CableBusTextures.PartMonitorBack.getIcon(), renderer.getIcon( this.is ), CableBusTextures.PartMonitorSidesStatus.getIcon(), CableBusTextures.PartMonitorSidesStatus.getIcon() ); rh.setBounds( 6, 6, 13, 10, 10, 14 ); rh.renderBlock( pos, renderer ); diff --git a/src/main/java/appeng/parts/networking/PartDenseCable.java b/src/main/java/appeng/parts/networking/PartDenseCable.java index 1bf4e48d..9ad1db29 100644 --- a/src/main/java/appeng/parts/networking/PartDenseCable.java +++ b/src/main/java/appeng/parts/networking/PartDenseCable.java @@ -504,7 +504,7 @@ public class PartDenseCable extends PartCable default: } - return renderer.getIcon( is ); + return renderer.getIcon( this.is ); } private boolean isDense( final AEPartLocation of ) diff --git a/src/main/java/appeng/parts/networking/PartQuartzFiber.java b/src/main/java/appeng/parts/networking/PartQuartzFiber.java index 23e4d02c..8b99404f 100644 --- a/src/main/java/appeng/parts/networking/PartQuartzFiber.java +++ b/src/main/java/appeng/parts/networking/PartQuartzFiber.java @@ -81,7 +81,7 @@ public class PartQuartzFiber extends AEBasePart implements IEnergyGridProvider { GL11.glTranslated( -0.2, -0.3, 0.0 ); - rh.setTexture( renderer.getIcon( is ) ); + rh.setTexture( renderer.getIcon( this.is ) ); rh.setBounds( 6.0f, 6.0f, 5.0f, 10.0f, 10.0f, 11.0f ); rh.renderInventoryBox( renderer ); rh.setTexture( null ); @@ -91,7 +91,7 @@ public class PartQuartzFiber extends AEBasePart implements IEnergyGridProvider @SideOnly( Side.CLIENT ) public void renderStatic( final BlockPos pos, final IPartRenderHelper rh, final ModelGenerator renderer ) { - final IAESprite myIcon = renderer.getIcon( is ); + final IAESprite myIcon = renderer.getIcon( this.is ); rh.setTexture( myIcon ); rh.setBounds( 6, 6, 10, 10, 10, 16 ); rh.renderBlock( pos, renderer ); diff --git a/src/main/java/appeng/parts/p2p/PartP2PItems.java b/src/main/java/appeng/parts/p2p/PartP2PItems.java index 4a77cfb3..85fea1d7 100644 --- a/src/main/java/appeng/parts/p2p/PartP2PItems.java +++ b/src/main/java/appeng/parts/p2p/PartP2PItems.java @@ -124,7 +124,7 @@ public class PartP2PItems extends PartP2PTunnel implements /*IPipe if( this.proxy.isActive() ) { - final TileEntity te = this.tile.getWorld().getTileEntity( this.tile.getPos().offset( side.getFacing() ) ); + final TileEntity te = this.tile.getWorld().getTileEntity( this.tile.getPos().offset( this.side.getFacing() ) ); if( this.which.contains( this ) ) { diff --git a/src/main/java/appeng/parts/p2p/PartP2PLight.java b/src/main/java/appeng/parts/p2p/PartP2PLight.java index f0bfb15f..fbacf297 100644 --- a/src/main/java/appeng/parts/p2p/PartP2PLight.java +++ b/src/main/java/appeng/parts/p2p/PartP2PLight.java @@ -88,7 +88,7 @@ public class PartP2PLight extends PartP2PTunnel implements IGridTi final TileEntity te = this.getTile(); final World w = te.getWorld(); - final int newLevel = w.getLight( te.getPos().offset( side.getFacing() ) ); + final int newLevel = w.getLight( te.getPos().offset( this.side.getFacing() ) ); if( this.lastValue != newLevel && this.proxy.isActive() ) { @@ -144,7 +144,7 @@ public class PartP2PLight extends PartP2PTunnel implements IGridTi if( this.opacity < 0 ) { final TileEntity te = this.getTile(); - this.opacity = 255 - te.getWorld().getBlockLightOpacity( te.getPos().offset( side.getFacing() ) ); + this.opacity = 255 - te.getWorld().getBlockLightOpacity( te.getPos().offset( this.side.getFacing() ) ); } return (int) ( emit * ( this.opacity / 255.0f ) ); diff --git a/src/main/java/appeng/parts/p2p/PartP2PLiquids.java b/src/main/java/appeng/parts/p2p/PartP2PLiquids.java index a0d73c98..4c045a6b 100644 --- a/src/main/java/appeng/parts/p2p/PartP2PLiquids.java +++ b/src/main/java/appeng/parts/p2p/PartP2PLiquids.java @@ -222,7 +222,7 @@ public class PartP2PLiquids extends PartP2PTunnel implements IFl return this.cachedTank; } - final TileEntity te = this.tile.getWorld().getTileEntity( this.tile.getPos().offset( side.getFacing() ) ); + final TileEntity te = this.tile.getWorld().getTileEntity( this.tile.getPos().offset( this.side.getFacing() ) ); if( te instanceof IFluidHandler ) { return this.cachedTank = (IFluidHandler) te; diff --git a/src/main/java/appeng/parts/p2p/PartP2PRedstone.java b/src/main/java/appeng/parts/p2p/PartP2PRedstone.java index 3e79c43b..f8aaed06 100644 --- a/src/main/java/appeng/parts/p2p/PartP2PRedstone.java +++ b/src/main/java/appeng/parts/p2p/PartP2PRedstone.java @@ -88,11 +88,11 @@ public class PartP2PRedstone extends PartP2PTunnel { final World worldObj = this.tile.getWorld(); - Platform.notifyBlocksOfNeighbors( worldObj,tile.getPos()); + Platform.notifyBlocksOfNeighbors( worldObj, this.tile.getPos()); // and this cause sometimes it can go thought walls. for ( final EnumFacing face : EnumFacing.VALUES ) - Platform.notifyBlocksOfNeighbors( worldObj,tile.getPos().offset( face ) ); + Platform.notifyBlocksOfNeighbors( worldObj, this.tile.getPos().offset( face ) ); } @MENetworkEventSubscribe @@ -137,7 +137,7 @@ public class PartP2PRedstone extends PartP2PTunnel { if( !this.output ) { - final BlockPos target = tile.getPos().offset( side.getFacing() ); + final BlockPos target = this.tile.getPos().offset( this.side.getFacing() ); final IBlockState state = this.tile.getWorld().getBlockState( target ); final Block b = state.getBlock(); diff --git a/src/main/java/appeng/parts/p2p/PartP2PTunnel.java b/src/main/java/appeng/parts/p2p/PartP2PTunnel.java index a475c10f..ff35a901 100644 --- a/src/main/java/appeng/parts/p2p/PartP2PTunnel.java +++ b/src/main/java/appeng/parts/p2p/PartP2PTunnel.java @@ -129,7 +129,7 @@ public abstract class PartP2PTunnel extends PartBasicSt rh.setBounds( 2, 2, 14, 14, 14, 16 ); rh.renderInventoryBox( renderer ); - rh.setTexture( CableBusTextures.PartTunnelSides.getIcon(), CableBusTextures.PartTunnelSides.getIcon(), CableBusTextures.BlockP2PTunnel2.getIcon(), renderer.getIcon( is ), CableBusTextures.PartTunnelSides.getIcon(), CableBusTextures.PartTunnelSides.getIcon() ); + rh.setTexture( CableBusTextures.PartTunnelSides.getIcon(), CableBusTextures.PartTunnelSides.getIcon(), CableBusTextures.BlockP2PTunnel2.getIcon(), renderer.getIcon( this.is ), CableBusTextures.PartTunnelSides.getIcon(), CableBusTextures.PartTunnelSides.getIcon() ); rh.setBounds( 2, 2, 14, 14, 14, 16 ); rh.renderInventoryBox( renderer ); @@ -161,7 +161,7 @@ public abstract class PartP2PTunnel extends PartBasicSt rh.setBounds( 2, 2, 14, 14, 14, 16 ); rh.renderBlock( pos, renderer ); - rh.setTexture( CableBusTextures.PartTunnelSides.getIcon(), CableBusTextures.PartTunnelSides.getIcon(), CableBusTextures.BlockP2PTunnel2.getIcon(), renderer.getIcon( is ), CableBusTextures.PartTunnelSides.getIcon(), CableBusTextures.PartTunnelSides.getIcon() ); + rh.setTexture( CableBusTextures.PartTunnelSides.getIcon(), CableBusTextures.PartTunnelSides.getIcon(), CableBusTextures.BlockP2PTunnel2.getIcon(), renderer.getIcon( this.is ), CableBusTextures.PartTunnelSides.getIcon(), CableBusTextures.PartTunnelSides.getIcon() ); rh.setBounds( 2, 2, 14, 14, 14, 16 ); rh.renderBlock( pos, renderer ); diff --git a/src/main/java/appeng/parts/reporting/AbstractPartReporting.java b/src/main/java/appeng/parts/reporting/AbstractPartReporting.java index 9413ffa3..3271d6b5 100644 --- a/src/main/java/appeng/parts/reporting/AbstractPartReporting.java +++ b/src/main/java/appeng/parts/reporting/AbstractPartReporting.java @@ -250,7 +250,7 @@ public abstract class AbstractPartReporting extends AEBasePart implements IPartM if( this.opacity < 0 ) { final TileEntity te = this.getTile(); - this.opacity = 255 - te.getWorld().getBlockLightOpacity( te.getPos().offset( side.getFacing() ) ); + this.opacity = 255 - te.getWorld().getBlockLightOpacity( te.getPos().offset( this.side.getFacing() ) ); } return (int) ( emit * ( this.opacity / 255.0f ) ); diff --git a/src/main/java/appeng/parts/reporting/PartConversionMonitor.java b/src/main/java/appeng/parts/reporting/PartConversionMonitor.java index 6771d6a1..34a567d7 100644 --- a/src/main/java/appeng/parts/reporting/PartConversionMonitor.java +++ b/src/main/java/appeng/parts/reporting/PartConversionMonitor.java @@ -149,7 +149,7 @@ public class PartConversionMonitor extends AbstractPartMonitor { final TileEntity te = this.tile; final List list = Collections.singletonList( newItems ); - Platform.spawnDrops( player.worldObj, te.getPos().offset( side.getFacing() ), list ); + Platform.spawnDrops( player.worldObj, te.getPos().offset( this.side.getFacing() ), list ); } if( player.openContainer != null ) diff --git a/src/main/java/appeng/spatial/StorageHelper.java b/src/main/java/appeng/spatial/StorageHelper.java index 5685377c..f174abe9 100644 --- a/src/main/java/appeng/spatial/StorageHelper.java +++ b/src/main/java/appeng/spatial/StorageHelper.java @@ -295,7 +295,7 @@ public class StorageHelper @Override public void visit( final BlockPos pos ) { - this.dst.setBlockState( pos, state ); + this.dst.setBlockState( pos, this.state ); } } diff --git a/src/main/java/appeng/tile/AEBaseInvTile.java b/src/main/java/appeng/tile/AEBaseInvTile.java index 3de09325..64f894c7 100644 --- a/src/main/java/appeng/tile/AEBaseInvTile.java +++ b/src/main/java/appeng/tile/AEBaseInvTile.java @@ -114,7 +114,7 @@ public abstract class AEBaseInvTile extends AEBaseTile implements ISidedInventor @Override public boolean hasCustomName() { - return getInternalInventory().hasCustomName(); + return this.getInternalInventory().hasCustomName(); } @Override @@ -128,7 +128,7 @@ public abstract class AEBaseInvTile extends AEBaseTile implements ISidedInventor { final double squaredMCReach = 64.0D; - return this.worldObj.getTileEntity( pos ) == this && p.getDistanceSq( pos.getX() + 0.5D, pos.getY() + 0.5D, pos.getZ() + 0.5D ) <= squaredMCReach; + return this.worldObj.getTileEntity( this.pos ) == this && p.getDistanceSq( this.pos.getX() + 0.5D, this.pos.getY() + 0.5D, this.pos.getZ() + 0.5D ) <= squaredMCReach; } @Override @@ -157,7 +157,7 @@ public abstract class AEBaseInvTile extends AEBaseTile implements ISidedInventor @Override public int[] getSlotsForFace( final EnumFacing side ) { - final Block blk = this.worldObj.getBlockState( pos ).getBlock(); + final Block blk = this.worldObj.getBlockState( this.pos ).getBlock(); if( blk instanceof AEBaseBlock ) { return this.getAccessibleSlotsBySide( ( (AEBaseBlock) blk ).mapRotation( this, side ) ); @@ -204,11 +204,11 @@ public abstract class AEBaseInvTile extends AEBaseTile implements ISidedInventor @Override public IChatComponent getDisplayName() { - if( hasCustomName() ) + if( this.hasCustomName() ) { return new ChatComponentText( this.getCustomName() ); } - return new ChatComponentTranslation( getBlockType().getUnlocalizedName() ); + return new ChatComponentTranslation( this.getBlockType().getUnlocalizedName() ); } public abstract int[] getAccessibleSlotsBySide( EnumFacing whichSide ); diff --git a/src/main/java/appeng/tile/AEBaseTile.java b/src/main/java/appeng/tile/AEBaseTile.java index 017d455c..6486945c 100644 --- a/src/main/java/appeng/tile/AEBaseTile.java +++ b/src/main/java/appeng/tile/AEBaseTile.java @@ -97,7 +97,7 @@ public class AEBaseTile extends TileEntity implements IOrientable, ICommonTile, public boolean notLoaded() { - return !this.worldObj.isBlockLoaded( pos ); + return !this.worldObj.isBlockLoaded( this.pos ); } @Nonnull @@ -214,7 +214,7 @@ public class AEBaseTile extends TileEntity implements IOrientable, ICommonTile, stream.capacity( stream.readableBytes() ); data.setByteArray( "X", stream.array() ); - return new S35PacketUpdateTileEntity( pos, 64, data ); + return new S35PacketUpdateTileEntity( this.pos, 64, data ); } private boolean hasHandlerFor( final TileEventType type ) @@ -300,8 +300,8 @@ public class AEBaseTile extends TileEntity implements IOrientable, ICommonTile, // TODO: Optimize Network Load if( this.worldObj != null ) { - AELog.blockUpdate( pos, this ); - this.worldObj.markBlockForUpdate( pos ); + AELog.blockUpdate( this.pos, this ); + this.worldObj.markBlockForUpdate( this.pos ); } } } @@ -424,7 +424,7 @@ public class AEBaseTile extends TileEntity implements IOrientable, ICommonTile, this.forward = inForward; this.up = inUp; this.markForUpdate(); - Platform.notifyBlocksOfNeighbors( this.worldObj, pos ); + Platform.notifyBlocksOfNeighbors( this.worldObj, this.pos ); } public void onPlacement( final ItemStack stack, final EntityPlayer player, final EnumFacing side ) @@ -570,7 +570,7 @@ public class AEBaseTile extends TileEntity implements IOrientable, ICommonTile, public void securityBreak() { - this.worldObj.destroyBlock( pos, true ); + this.worldObj.destroyBlock( this.pos, true ); this.disableDrops(); } diff --git a/src/main/java/appeng/tile/crafting/TileCraftingStorageTile.java b/src/main/java/appeng/tile/crafting/TileCraftingStorageTile.java index 68439441..56fdbefb 100644 --- a/src/main/java/appeng/tile/crafting/TileCraftingStorageTile.java +++ b/src/main/java/appeng/tile/crafting/TileCraftingStorageTile.java @@ -80,7 +80,7 @@ public class TileCraftingStorageTile extends TileCraftingTile return 0; } - final BlockCraftingUnit unit = (BlockCraftingUnit)this.worldObj.getBlockState( pos ).getBlock(); + final BlockCraftingUnit unit = (BlockCraftingUnit)this.worldObj.getBlockState( this.pos ).getBlock(); switch( unit.type ) { default: diff --git a/src/main/java/appeng/tile/crafting/TileCraftingTile.java b/src/main/java/appeng/tile/crafting/TileCraftingTile.java index 140f081a..2f3b86ae 100644 --- a/src/main/java/appeng/tile/crafting/TileCraftingTile.java +++ b/src/main/java/appeng/tile/crafting/TileCraftingTile.java @@ -114,7 +114,7 @@ public class TileCraftingTile extends AENetworkTile implements IAEMultiBlock, IP return false; } - final BlockCraftingUnit unit = (BlockCraftingUnit)this.worldObj.getBlockState( pos ).getBlock(); + final BlockCraftingUnit unit = (BlockCraftingUnit)this.worldObj.getBlockState( this.pos ).getBlock(); return unit.type == CraftingUnitType.ACCELERATOR; } @@ -157,12 +157,12 @@ public class TileCraftingTile extends AENetworkTile implements IAEMultiBlock, IP power = this.gridProxy.isActive(); } - final IBlockState current = this.worldObj.getBlockState( pos ); + final IBlockState current = this.worldObj.getBlockState( this.pos ); final IBlockState newState = current.withProperty( BlockCraftingUnit.POWERED, power ).withProperty( BlockCraftingUnit.FORMED, formed ); if( current != newState ) { - this.worldObj.setBlockState( pos, newState ); + this.worldObj.setBlockState( this.pos, newState ); } if( updateFormed ) @@ -182,7 +182,7 @@ public class TileCraftingTile extends AENetworkTile implements IAEMultiBlock, IP { if( Platform.isClient() ) { - return (boolean)this.worldObj.getBlockState( pos ).getValue( BlockCraftingUnit.FORMED ); + return (boolean)this.worldObj.getBlockState( this.pos ).getValue( BlockCraftingUnit.FORMED ); } return this.cluster != null; } @@ -334,7 +334,7 @@ public class TileCraftingTile extends AENetworkTile implements IAEMultiBlock, IP { if( Platform.isClient() ) { - return (boolean)this.worldObj.getBlockState( pos ).getValue( BlockCraftingUnit.POWERED ); + return (boolean)this.worldObj.getBlockState( this.pos ).getValue( BlockCraftingUnit.POWERED ); } return this.gridProxy.isActive(); } diff --git a/src/main/java/appeng/tile/crafting/TileMolecularAssembler.java b/src/main/java/appeng/tile/crafting/TileMolecularAssembler.java index b1692757..47023e6f 100644 --- a/src/main/java/appeng/tile/crafting/TileMolecularAssembler.java +++ b/src/main/java/appeng/tile/crafting/TileMolecularAssembler.java @@ -511,9 +511,9 @@ public class TileMolecularAssembler extends AENetworkInvTile implements IUpgrade try { - final TargetPoint where = new TargetPoint( this.worldObj.provider.getDimensionId(), pos.getX(), pos.getY(), pos.getZ(), 32 ); + final TargetPoint where = new TargetPoint( this.worldObj.provider.getDimensionId(), this.pos.getX(), this.pos.getY(), this.pos.getZ(), 32 ); final IAEItemStack item = AEItemStack.create( output ); - NetworkHandler.instance.sendToAllAround( new PacketAssemblerAnimation( pos, (byte) speed, item ), where ); + NetworkHandler.instance.sendToAllAround( new PacketAssemblerAnimation( this.pos, (byte) speed, item ), where ); } catch( final IOException e ) { @@ -592,7 +592,7 @@ public class TileMolecularAssembler extends AENetworkInvTile implements IUpgrade return output; } - final TileEntity te = this.getWorld().getTileEntity( pos.offset( d ) ); + final TileEntity te = this.getWorld().getTileEntity( this.pos.offset( d ) ); if( te == null ) { diff --git a/src/main/java/appeng/tile/grindstone/TileCrank.java b/src/main/java/appeng/tile/grindstone/TileCrank.java index c0d94a4c..793b0283 100644 --- a/src/main/java/appeng/tile/grindstone/TileCrank.java +++ b/src/main/java/appeng/tile/grindstone/TileCrank.java @@ -81,7 +81,7 @@ public class TileCrank extends AEBaseTile implements ICustomCollision, IUpdatePl } final EnumFacing grinder = this.getUp().getOpposite(); - final TileEntity te = this.worldObj.getTileEntity( pos.offset( grinder ) ); + final TileEntity te = this.worldObj.getTileEntity( this.pos.offset( grinder ) ); if( te instanceof ICrankable ) { return (ICrankable) te; @@ -106,8 +106,8 @@ public class TileCrank extends AEBaseTile implements ICustomCollision, IUpdatePl public void setOrientation( final EnumFacing inForward, final EnumFacing inUp ) { super.setOrientation( inForward, inUp ); - final IBlockState state = this.worldObj.getBlockState( pos ); - this.getBlockType().onNeighborBlockChange( this.worldObj, pos, state, state.getBlock() ); + final IBlockState state = this.worldObj.getBlockState( this.pos ); + this.getBlockType().onNeighborBlockChange( this.worldObj, this.pos, state, state.getBlock() ); } @Override @@ -143,7 +143,7 @@ public class TileCrank extends AEBaseTile implements ICustomCollision, IUpdatePl this.hits++; if( this.hits > 10 ) { - this.worldObj.destroyBlock( pos, false ); + this.worldObj.destroyBlock( this.pos, false ); } } } diff --git a/src/main/java/appeng/tile/grindstone/TileGrinder.java b/src/main/java/appeng/tile/grindstone/TileGrinder.java index fc435424..c3aeeb89 100644 --- a/src/main/java/appeng/tile/grindstone/TileGrinder.java +++ b/src/main/java/appeng/tile/grindstone/TileGrinder.java @@ -49,8 +49,8 @@ public class TileGrinder extends AEBaseInvTile implements ICrankable public void setOrientation( final EnumFacing inForward, final EnumFacing inUp ) { super.setOrientation( inForward, inUp ); - final IBlockState state = worldObj.getBlockState( pos ); - this.getBlockType().onNeighborBlockChange( this.worldObj, pos, state, state.getBlock() ); + final IBlockState state = this.worldObj.getBlockState( this.pos ); + this.getBlockType().onNeighborBlockChange( this.worldObj, this.pos, state, state.getBlock() ); } @Override @@ -185,7 +185,7 @@ public class TileGrinder extends AEBaseInvTile implements ICrankable final List out = new ArrayList(); out.add( notAdded ); - Platform.spawnDrops( this.worldObj, pos.offset( this.getForward() ), out ); + Platform.spawnDrops( this.worldObj, this.pos.offset( this.getForward() ), out ); } } diff --git a/src/main/java/appeng/tile/inventory/AppEngInternalAEInventory.java b/src/main/java/appeng/tile/inventory/AppEngInternalAEInventory.java index 04d1b694..5f445df8 100644 --- a/src/main/java/appeng/tile/inventory/AppEngInternalAEInventory.java +++ b/src/main/java/appeng/tile/inventory/AppEngInternalAEInventory.java @@ -313,7 +313,7 @@ public class AppEngInternalAEInventory implements IInventory, Iterable { for( int x = 0; x < this.size; x++ ) { - setInventorySlotContents( x,null ); + this.setInventorySlotContents( x,null ); } } } diff --git a/src/main/java/appeng/tile/misc/TileCharger.java b/src/main/java/appeng/tile/misc/TileCharger.java index c2ac5d19..ac4f8c01 100644 --- a/src/main/java/appeng/tile/misc/TileCharger.java +++ b/src/main/java/appeng/tile/misc/TileCharger.java @@ -292,7 +292,7 @@ public class TileCharger extends AENetworkPowerTile implements ICrankable, IUpda final List drops = new ArrayList(); drops.add( myItem ); this.setInventorySlotContents( 0, null ); - Platform.spawnDrops( this.worldObj, pos.offset( getForward() ), drops ); + Platform.spawnDrops( this.worldObj, this.pos.offset( this.getForward() ), drops ); } } } diff --git a/src/main/java/appeng/tile/misc/TileInterface.java b/src/main/java/appeng/tile/misc/TileInterface.java index 7dd4c5ba..cdbf01b9 100644 --- a/src/main/java/appeng/tile/misc/TileInterface.java +++ b/src/main/java/appeng/tile/misc/TileInterface.java @@ -116,7 +116,7 @@ public class TileInterface extends AENetworkInvTile implements IGridTickable, IT this.setOrientation( this.pointAt.yOffset != 0 ? EnumFacing.SOUTH : EnumFacing.UP, this.pointAt.getOpposite().getFacing() ); } - configureNodeSides(); + this.configureNodeSides(); this.markForUpdate(); this.markDirty(); } @@ -153,7 +153,7 @@ public class TileInterface extends AENetworkInvTile implements IGridTickable, IT @Override public void onReady() { - configureNodeSides(); + this.configureNodeSides(); super.onReady(); this.duality.initialize(); } diff --git a/src/main/java/appeng/tile/misc/TileLightDetector.java b/src/main/java/appeng/tile/misc/TileLightDetector.java index 51dde87d..37f55e02 100644 --- a/src/main/java/appeng/tile/misc/TileLightDetector.java +++ b/src/main/java/appeng/tile/misc/TileLightDetector.java @@ -50,12 +50,12 @@ public class TileLightDetector extends AEBaseTile implements IUpdatePlayerListBo public void updateLight() { - final int val = this.worldObj.getLight( pos ); + final int val = this.worldObj.getLight( this.pos ); if( this.lastLight != val ) { this.lastLight = val; - Platform.notifyBlocksOfNeighbors( this.worldObj, pos ); + Platform.notifyBlocksOfNeighbors( this.worldObj, this.pos ); } } diff --git a/src/main/java/appeng/tile/misc/TilePaint.java b/src/main/java/appeng/tile/misc/TilePaint.java index 07858830..dc65f6d7 100644 --- a/src/main/java/appeng/tile/misc/TilePaint.java +++ b/src/main/java/appeng/tile/misc/TilePaint.java @@ -132,7 +132,7 @@ public class TilePaint extends AEBaseTile if( this.worldObj != null ) { - this.worldObj.getLightFor( EnumSkyBlock.BLOCK, pos ); + this.worldObj.getLightFor( EnumSkyBlock.BLOCK, this.pos ); } } @@ -169,7 +169,7 @@ public class TilePaint extends AEBaseTile public boolean isSideValid( final EnumFacing side ) { - final BlockPos p = pos.offset( side ); + final BlockPos p = this.pos.offset( side ); final IBlockState blk = this.worldObj.getBlockState( p ); return blk.getBlock().isSideSolid( this.worldObj, p, side.getOpposite() ); } @@ -210,7 +210,7 @@ public class TilePaint extends AEBaseTile if( this.dots == null ) { - this.worldObj.setBlockToAir( pos ); + this.worldObj.setBlockToAir( this.pos ); } } @@ -233,7 +233,7 @@ public class TilePaint extends AEBaseTile public void addBlot( final ItemStack type, final EnumFacing side, final Vec3 hitVec ) { - final BlockPos p = pos.offset(side); + final BlockPos p = this.pos.offset( side ); final IBlockState blk = this.worldObj.getBlockState( p ); if( blk.getBlock().isSideSolid( this.worldObj, p, side.getOpposite() ) ) diff --git a/src/main/java/appeng/tile/misc/TileVibrationChamber.java b/src/main/java/appeng/tile/misc/TileVibrationChamber.java index e9e575c1..3b570bda 100644 --- a/src/main/java/appeng/tile/misc/TileVibrationChamber.java +++ b/src/main/java/appeng/tile/misc/TileVibrationChamber.java @@ -291,7 +291,7 @@ public class TileVibrationChamber extends AENetworkInvTile implements IGridTicka if ( this.hasWorldObj() ) { - Platform.notifyBlocksOfNeighbors( this.worldObj, pos ); + Platform.notifyBlocksOfNeighbors( this.worldObj, this.pos ); } } } diff --git a/src/main/java/appeng/tile/networking/TileCableBus.java b/src/main/java/appeng/tile/networking/TileCableBus.java index 1fd92cb9..6885ce56 100644 --- a/src/main/java/appeng/tile/networking/TileCableBus.java +++ b/src/main/java/appeng/tile/networking/TileCableBus.java @@ -89,7 +89,7 @@ public class TileCableBus extends AEBaseTile implements AEMultiTile, ICustomColl if( newLV != this.oldLV ) { this.oldLV = newLV; - this.worldObj.checkLight( pos ); + this.worldObj.checkLight( this.pos ); } this.updateTileSetting(); @@ -104,7 +104,7 @@ public class TileCableBus extends AEBaseTile implements AEMultiTile, ICustomColl { final TileCableBus tcb = (TileCableBus) BlockCableBus.tesrTile.newInstance(); tcb.copyFrom( this ); - this.getWorld().setTileEntity( pos, tcb ); + this.getWorld().setTileEntity( this.pos, tcb ); } catch( final Throwable ignored ) { @@ -178,7 +178,7 @@ public class TileCableBus extends AEBaseTile implements AEMultiTile, ICustomColl if( newLV != this.oldLV ) { this.oldLV = newLV; - this.worldObj.getLight( pos ); + this.worldObj.getLight( this.pos ); // worldObj.updateAllLightTypes( xCoord, yCoord, zCoord ); } @@ -209,9 +209,9 @@ public class TileCableBus extends AEBaseTile implements AEMultiTile, ICustomColl super.onReady(); if( this.cb.isEmpty() ) { - if( this.worldObj.getTileEntity( pos ) == this ) + if( this.worldObj.getTileEntity( this.pos ) == this ) { - this.worldObj.destroyBlock( pos, true ); + this.worldObj.destroyBlock( this.pos, true ); } } else @@ -340,7 +340,7 @@ public class TileCableBus extends AEBaseTile implements AEMultiTile, ICustomColl } } - this.getWorld().setBlockToAir( pos ); + this.getWorld().setBlockToAir( this.pos ); } @Override @@ -360,9 +360,9 @@ public class TileCableBus extends AEBaseTile implements AEMultiTile, ICustomColl @Override public void notifyNeighbors() { - if( this.worldObj != null && this.worldObj.isBlockLoaded( pos ) && !CableBusContainer.isLoading() ) + if( this.worldObj != null && this.worldObj.isBlockLoaded( this.pos ) && !CableBusContainer.isLoading() ) { - Platform.notifyBlocksOfNeighbors( this.worldObj, pos ); + Platform.notifyBlocksOfNeighbors( this.worldObj, this.pos ); } } diff --git a/src/main/java/appeng/tile/networking/TileCableBusTESR.java b/src/main/java/appeng/tile/networking/TileCableBusTESR.java index f8feb69a..e153453e 100644 --- a/src/main/java/appeng/tile/networking/TileCableBusTESR.java +++ b/src/main/java/appeng/tile/networking/TileCableBusTESR.java @@ -34,7 +34,7 @@ public class TileCableBusTESR extends TileCableBus { final TileCableBus tcb = (TileCableBus) BlockCableBus.noTesrTile.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/networking/TileController.java b/src/main/java/appeng/tile/networking/TileController.java index 5a1ba10f..48286b69 100644 --- a/src/main/java/appeng/tile/networking/TileController.java +++ b/src/main/java/appeng/tile/networking/TileController.java @@ -73,9 +73,9 @@ public class TileController extends AENetworkPowerTile public void onNeighborChange( final boolean force ) { - final boolean xx = checkController( pos.offset( EnumFacing.EAST ) ) && checkController( pos.offset( EnumFacing.WEST ) ); - final boolean yy = checkController( pos.offset( EnumFacing.UP ) ) && checkController( pos.offset( EnumFacing.DOWN ) ); - final boolean zz = checkController( pos.offset( EnumFacing.NORTH ) ) && checkController( pos.offset( EnumFacing.SOUTH ) ); + final boolean xx = this.checkController( this.pos.offset( EnumFacing.EAST ) ) && this.checkController( this.pos.offset( EnumFacing.WEST ) ); + final boolean yy = this.checkController( this.pos.offset( EnumFacing.UP ) ) && this.checkController( this.pos.offset( EnumFacing.DOWN ) ); + final boolean zz = this.checkController( this.pos.offset( EnumFacing.NORTH ) ) && this.checkController( this.pos.offset( EnumFacing.SOUTH ) ); // int meta = world.getBlockMetadata( xCoord, yCoord, zCoord ); // boolean hasPower = meta > 0; @@ -127,9 +127,9 @@ public class TileController extends AENetworkPowerTile metaState = ControllerBlockState.OFFLINE; } - if( checkController( pos ) && this.worldObj.getBlockState( pos ).getValue( BlockController.CONTROLLER_STATE ) != metaState ) + if( this.checkController( this.pos ) && this.worldObj.getBlockState( this.pos ).getValue( BlockController.CONTROLLER_STATE ) != metaState ) { - this.worldObj.setBlockState( pos, worldObj.getBlockState( pos ).withProperty( BlockController.CONTROLLER_STATE, metaState ) ); + this.worldObj.setBlockState( this.pos, this.worldObj.getBlockState( this.pos ).withProperty( BlockController.CONTROLLER_STATE, metaState ) ); } } diff --git a/src/main/java/appeng/tile/networking/TileEnergyCell.java b/src/main/java/appeng/tile/networking/TileEnergyCell.java index 8b1c0e75..67906cb3 100644 --- a/src/main/java/appeng/tile/networking/TileEnergyCell.java +++ b/src/main/java/appeng/tile/networking/TileEnergyCell.java @@ -60,8 +60,8 @@ public class TileEnergyCell extends AENetworkTile implements IAEPowerStorage public void onReady() { super.onReady(); - final int value = ( Integer ) this.worldObj.getBlockState( pos ).getValue( BlockEnergyCell.ENERGY_STORAGE ); - currentMeta = (byte)value; + final int value = ( Integer ) this.worldObj.getBlockState( this.pos ).getValue( BlockEnergyCell.ENERGY_STORAGE ); + this.currentMeta = (byte)value; this.changePowerLevel(); } @@ -86,7 +86,7 @@ public class TileEnergyCell extends AENetworkTile implements IAEPowerStorage if( this.currentMeta != boundMetadata ) { this.currentMeta = boundMetadata; - this.worldObj.setBlockState( pos, this.worldObj.getBlockState( pos ).withProperty( BlockEnergyCell.ENERGY_STORAGE, (int)boundMetadata ) ); + this.worldObj.setBlockState( this.pos, this.worldObj.getBlockState( this.pos ).withProperty( BlockEnergyCell.ENERGY_STORAGE, (int)boundMetadata ) ); } } diff --git a/src/main/java/appeng/tile/qnb/TileQuantumBridge.java b/src/main/java/appeng/tile/qnb/TileQuantumBridge.java index 0270b495..0c8e0553 100644 --- a/src/main/java/appeng/tile/qnb/TileQuantumBridge.java +++ b/src/main/java/appeng/tile/qnb/TileQuantumBridge.java @@ -264,7 +264,7 @@ public class TileQuantumBridge extends AENetworkInvTile implements IAEMultiBlock for( final AEPartLocation d : AEPartLocation.values() ) { - final TileEntity te = this.worldObj.getTileEntity( d == AEPartLocation.INTERNAL ? pos : pos.offset( d.getFacing() ) ); + final TileEntity te = this.worldObj.getTileEntity( d == AEPartLocation.INTERNAL ? this.pos : this.pos.offset( d.getFacing() ) ); if( te instanceof TileQuantumBridge ) { set.add( d ); diff --git a/src/main/java/appeng/tile/spatial/TileSpatialIOPort.java b/src/main/java/appeng/tile/spatial/TileSpatialIOPort.java index b6bc5bee..7b76256d 100644 --- a/src/main/java/appeng/tile/spatial/TileSpatialIOPort.java +++ b/src/main/java/appeng/tile/spatial/TileSpatialIOPort.java @@ -89,7 +89,7 @@ public class TileSpatialIOPort extends AENetworkInvTile implements IWorldCallabl public void updateRedstoneState() { - final YesNo currentState = this.worldObj.isBlockIndirectlyGettingPowered( pos ) != 0 ? YesNo.YES : YesNo.NO; + final YesNo currentState = this.worldObj.isBlockIndirectlyGettingPowered( this.pos ) != 0 ? YesNo.YES : YesNo.NO; if( this.lastRedstoneState != currentState ) { this.lastRedstoneState = currentState; diff --git a/src/main/java/appeng/tile/spatial/TileSpatialPylon.java b/src/main/java/appeng/tile/spatial/TileSpatialPylon.java index 69620eed..bc119dac 100644 --- a/src/main/java/appeng/tile/spatial/TileSpatialPylon.java +++ b/src/main/java/appeng/tile/spatial/TileSpatialPylon.java @@ -195,7 +195,7 @@ public class TileSpatialPylon extends AENetworkTile implements IAEMultiBlock if( hasLight != this.didHaveLight ) { this.didHaveLight = hasLight; - this.worldObj.checkLight( pos ); + this.worldObj.checkLight( this.pos ); // worldObj.updateAllLightTypes( xCoord, yCoord, zCoord ); } } diff --git a/src/main/java/appeng/tile/storage/TileChest.java b/src/main/java/appeng/tile/storage/TileChest.java index 0d445f0d..280dfc30 100644 --- a/src/main/java/appeng/tile/storage/TileChest.java +++ b/src/main/java/appeng/tile/storage/TileChest.java @@ -544,7 +544,7 @@ public class TileChest extends AENetworkPowerTile implements IMEChest, IFluidHan // update the neighbors if( this.worldObj != null ) { - Platform.notifyBlocksOfNeighbors( this.worldObj, pos ); + Platform.notifyBlocksOfNeighbors( this.worldObj, this.pos ); this.markForUpdate(); } } @@ -860,7 +860,7 @@ public class TileChest extends AENetworkPowerTile implements IMEChest, IFluidHan @Override public void saveChanges( final IMEInventory cellInventory ) { - this.worldObj.markChunkDirty( pos, this ); + this.worldObj.markChunkDirty( this.pos, this ); } private static class ChestNoHandler extends Exception diff --git a/src/main/java/appeng/tile/storage/TileDrive.java b/src/main/java/appeng/tile/storage/TileDrive.java index 556597b7..58f0aebc 100644 --- a/src/main/java/appeng/tile/storage/TileDrive.java +++ b/src/main/java/appeng/tile/storage/TileDrive.java @@ -417,6 +417,6 @@ public class TileDrive extends AENetworkInvTile implements IChestOrDrive, IPrior @Override public void saveChanges( final IMEInventory cellInventory ) { - this.worldObj.markChunkDirty( pos, this ); + this.worldObj.markChunkDirty( this.pos, this ); } } diff --git a/src/main/java/appeng/tile/storage/TileIOPort.java b/src/main/java/appeng/tile/storage/TileIOPort.java index b2a510d4..e0e371a7 100644 --- a/src/main/java/appeng/tile/storage/TileIOPort.java +++ b/src/main/java/appeng/tile/storage/TileIOPort.java @@ -174,7 +174,7 @@ public class TileIOPort extends AENetworkInvTile implements IUpgradeableHost, IC public void updateRedstoneState() { - final YesNo currentState = this.worldObj.isBlockIndirectlyGettingPowered( pos ) != 0 ? YesNo.YES : YesNo.NO; + final YesNo currentState = this.worldObj.isBlockIndirectlyGettingPowered( this.pos ) != 0 ? YesNo.YES : YesNo.NO; if( this.lastRedstoneState != currentState ) { this.lastRedstoneState = currentState; diff --git a/src/main/java/appeng/tile/storage/TileSkyChest.java b/src/main/java/appeng/tile/storage/TileSkyChest.java index 487a91e6..0a2ecaf2 100644 --- a/src/main/java/appeng/tile/storage/TileSkyChest.java +++ b/src/main/java/appeng/tile/storage/TileSkyChest.java @@ -87,7 +87,7 @@ public class TileSkyChest extends AEBaseInvTile if( this.playerOpen == 1 ) { - this.getWorld().playSoundEffect( pos.getX() + 0.5D, pos.getY() + 0.5D, pos.getZ() + 0.5D, "random.chestopen", 0.5F, this.getWorld().rand.nextFloat() * 0.1F + 0.9F ); + this.getWorld().playSoundEffect( this.pos.getX() + 0.5D, this.pos.getY() + 0.5D, this.pos.getZ() + 0.5D, "random.chestopen", 0.5F, this.getWorld().rand.nextFloat() * 0.1F + 0.9F ); this.markForUpdate(); } } @@ -109,7 +109,7 @@ public class TileSkyChest extends AEBaseInvTile if( this.playerOpen == 0 ) { - this.getWorld().playSoundEffect( pos.getX() + 0.5D, pos.getY() + 0.5D, pos.getZ() + 0.5D, "random.chestclosed", 0.5F, this.getWorld().rand.nextFloat() * 0.1F + 0.9F ); + this.getWorld().playSoundEffect( this.pos.getX() + 0.5D, this.pos.getY() + 0.5D, this.pos.getZ() + 0.5D, "random.chestclosed", 0.5F, this.getWorld().rand.nextFloat() * 0.1F + 0.9F ); this.markForUpdate(); } } diff --git a/src/main/java/appeng/util/inv/AdaptorPlayerInventory.java b/src/main/java/appeng/util/inv/AdaptorPlayerInventory.java index fd410e22..bd40e0f6 100644 --- a/src/main/java/appeng/util/inv/AdaptorPlayerInventory.java +++ b/src/main/java/appeng/util/inv/AdaptorPlayerInventory.java @@ -128,14 +128,14 @@ public class AdaptorPlayerInventory implements IInventory @Override public String getCommandSenderName() { - return src.getCommandSenderName(); + return this.src.getCommandSenderName(); } @Override public int getField( final int id ) { - return src.getField( id ); + return this.src.getField( id ); } @Override @@ -143,18 +143,18 @@ public class AdaptorPlayerInventory implements IInventory final int id, final int value ) { - src.setField( id, value ); + this.src.setField( id, value ); } @Override public int getFieldCount() { - return src.getFieldCount(); + return this.src.getFieldCount(); } @Override public void clear() { - src.clear(); + this.src.clear(); } } diff --git a/src/main/java/appeng/util/inv/WrapperInvSlot.java b/src/main/java/appeng/util/inv/WrapperInvSlot.java index 80ab02dd..8203f850 100644 --- a/src/main/java/appeng/util/inv/WrapperInvSlot.java +++ b/src/main/java/appeng/util/inv/WrapperInvSlot.java @@ -141,7 +141,7 @@ public class WrapperInvSlot public int getField( final int id ) { - return inv.getField( id ); + return this.inv.getField( id ); } @Override @@ -159,7 +159,7 @@ public class WrapperInvSlot @Override public IChatComponent getDisplayName() { - return inv.getDisplayName(); + return this.inv.getDisplayName(); } @Override @@ -167,7 +167,7 @@ public class WrapperInvSlot final int id, final int value ) { - inv.setField( id, value ); + this.inv.setField( id, value ); } } } diff --git a/src/main/java/appeng/util/inv/WrapperInventoryRange.java b/src/main/java/appeng/util/inv/WrapperInventoryRange.java index d359af37..dbe1dd6c 100644 --- a/src/main/java/appeng/util/inv/WrapperInventoryRange.java +++ b/src/main/java/appeng/util/inv/WrapperInventoryRange.java @@ -158,7 +158,7 @@ public class WrapperInventoryRange implements IInventory public int getField( final int id ) { - return src.getField( id ); + return this.src.getField( id ); } @Override @@ -170,7 +170,7 @@ public class WrapperInventoryRange implements IInventory @Override public IChatComponent getDisplayName() { - return src.getDisplayName(); + return this.src.getDisplayName(); } @Override @@ -178,7 +178,7 @@ public class WrapperInventoryRange implements IInventory final int id, final int value ) { - src.setField( id, value ); + this.src.setField( id, value ); } @Override public boolean isItemValidForSlot( final int i, final ItemStack itemstack )