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

Reduces visibility of internal fields/methods

Browse Source 
Reduces the visibility of all fields to private and create setters/getters
when necessary. Exceptions are fields with GuiSync as these need to be
public.

Reduces the visibility of internal methods to private/protected/default when possible.
This commit is contained in:
yueh
2015-10-08 15:42:42 +02:00
parent 1ea48fb389
commit 500fc47490
463 changed files with 5670 additions and 3757 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/main/java/appeng/tile/grid/AENetworkInvTile.java
+15 -10
View File
@@ -34,24 +34,24 @@ import appeng.tile.events.TileEventType;
public abstract class AENetworkInvTile extends AEBaseInvTile implements IActionHost, IGridProxyable
{
protected final AENetworkProxy gridProxy = new AENetworkProxy( this, "proxy", this.getItemFromTile( this ), true );
private final AENetworkProxy gridProxy = new AENetworkProxy( this, "proxy", this.getItemFromTile( this ), true );
@TileEvent( TileEventType.WORLD_NBT_READ )
public void readFromNBT_AENetwork( final NBTTagCompound data )
{
this.gridProxy.readFromNBT( data );
this.getGridProxy().readFromNBT( data );
}
@TileEvent( TileEventType.WORLD_NBT_WRITE )
public void writeToNBT_AENetwork( final NBTTagCompound data )
{
this.gridProxy.writeToNBT( data );
this.getGridProxy().writeToNBT( data );
}
@Override
public AENetworkProxy getProxy()
{
return this.gridProxy;
return this.getGridProxy();
}
@Override
@@ -63,40 +63,45 @@ public abstract class AENetworkInvTile extends AEBaseInvTile implements IActionH
@Override
public IGridNode getGridNode( final ForgeDirection dir )
{
return this.gridProxy.getNode();
return this.getGridProxy().getNode();
}
@Override
public void onChunkUnload()
{
super.onChunkUnload();
this.gridProxy.onChunkUnload();
this.getGridProxy().onChunkUnload();
}
@Override
public void onReady()
{
super.onReady();
this.gridProxy.onReady();
this.getGridProxy().onReady();
}
@Override
public void invalidate()
{
super.invalidate();
this.gridProxy.invalidate();
this.getGridProxy().invalidate();
}
@Override
public void validate()
{
super.validate();
this.gridProxy.validate();
this.getGridProxy().validate();
}
@Override
public IGridNode getActionableNode()
{
return this.gridProxy.getNode();
return this.getGridProxy().getNode();
}
public AENetworkProxy getGridProxy()
{
return this.gridProxy;
}
}
src/main/java/appeng/tile/grid/AENetworkPowerTile.java
+10 -9
View File
@@ -36,18 +36,18 @@ import appeng.tile.powersink.AEBasePoweredTile;
public abstract class AENetworkPowerTile extends AEBasePoweredTile implements IActionHost, IGridProxyable
{
protected final AENetworkProxy gridProxy = new AENetworkProxy( this, "proxy", this.getItemFromTile( this ), true );
private final AENetworkProxy gridProxy = new AENetworkProxy( this, "proxy", this.getItemFromTile( this ), true );
@TileEvent( TileEventType.WORLD_NBT_READ )
public void readFromNBT_AENetwork( final NBTTagCompound data )
{
this.gridProxy.readFromNBT( data );
this.getProxy().readFromNBT( data );
}
@TileEvent( TileEventType.WORLD_NBT_WRITE )
public void writeToNBT_AENetwork( final NBTTagCompound data )
{
this.gridProxy.writeToNBT( data );
this.getProxy().writeToNBT( data );
}
@Override
@@ -71,7 +71,7 @@ public abstract class AENetworkPowerTile extends AEBasePoweredTile implements IA
@Override
public IGridNode getGridNode( final ForgeDirection dir )
{
return this.gridProxy.getNode();
return this.getProxy().getNode();
}
@Override
@@ -84,33 +84,34 @@ public abstract class AENetworkPowerTile extends AEBasePoweredTile implements IA
public void validate()
{
super.validate();
this.gridProxy.validate();
this.getProxy().validate();
}
@Override
public void invalidate()
{
super.invalidate();
this.gridProxy.invalidate();
this.getProxy().invalidate();
}
@Override
public void onChunkUnload()
{
super.onChunkUnload();
this.gridProxy.onChunkUnload();
this.getProxy().onChunkUnload();
}
@Override
public void onReady()
{
super.onReady();
this.gridProxy.onReady();
this.getProxy().onReady();
}
@Override
public IGridNode getActionableNode()
{
return this.gridProxy.getNode();
return this.getProxy().getNode();
}
}
src/main/java/appeng/tile/grid/AENetworkTile.java
+9 -9
View File
@@ -36,18 +36,18 @@ import appeng.tile.events.TileEventType;
public class AENetworkTile extends AEBaseTile implements IActionHost, IGridProxyable
{
protected final AENetworkProxy gridProxy = this.createProxy();
private final AENetworkProxy gridProxy = this.createProxy();
@TileEvent( TileEventType.WORLD_NBT_READ )
public void readFromNBT_AENetwork( final NBTTagCompound data )
{
this.gridProxy.readFromNBT( data );
this.getProxy().readFromNBT( data );
}
@TileEvent( TileEventType.WORLD_NBT_WRITE )
public void writeToNBT_AENetwork( final NBTTagCompound data )
{
this.gridProxy.writeToNBT( data );
this.getProxy().writeToNBT( data );
}
protected AENetworkProxy createProxy()
@@ -58,7 +58,7 @@ public class AENetworkTile extends AEBaseTile implements IActionHost, IGridProxy
@Override
public IGridNode getGridNode( final ForgeDirection dir )
{
return this.gridProxy.getNode();
return this.getProxy().getNode();
}
@Override
@@ -71,28 +71,28 @@ public class AENetworkTile extends AEBaseTile implements IActionHost, IGridProxy
public void onChunkUnload()
{
super.onChunkUnload();
this.gridProxy.onChunkUnload();
this.getProxy().onChunkUnload();
}
@Override
public void onReady()
{
super.onReady();
this.gridProxy.onReady();
this.getProxy().onReady();
}
@Override
public void invalidate()
{
super.invalidate();
this.gridProxy.invalidate();
this.getProxy().invalidate();
}
@Override
public void validate()
{
super.validate();
this.gridProxy.validate();
this.getProxy().validate();
}
@Override
@@ -116,6 +116,6 @@ public class AENetworkTile extends AEBaseTile implements IActionHost, IGridProxy
@Override
public IGridNode getActionableNode()
{
return this.gridProxy.getNode();
return this.getProxy().getNode();
}
}