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/inventory/AppEngInternalInventory.java
+36 -16
View File
@@ -36,15 +36,15 @@ import appeng.util.iterators.InvIterator;
public class AppEngInternalInventory implements IInventory, Iterable<ItemStack>
{
protected final int size;
protected final ItemStack[] inv;
public boolean enableClientEvents = false;
protected IAEAppEngInventory te;
protected int maxStack;
private final int size;
private final ItemStack[] inv;
private boolean enableClientEvents = false;
private IAEAppEngInventory te;
private int maxStack;
public AppEngInternalInventory( final IAEAppEngInventory inventory, final int size )
{
this.te = inventory;
this.setTileEntity( inventory );
this.size = size;
this.maxStack = 64;
this.inv = new ItemStack[size];
@@ -97,9 +97,9 @@ public class AppEngInternalInventory implements IInventory, Iterable<ItemStack>
ns = split.splitStack( qty );
}
if( this.te != null && this.eventsEnabled() )
if( this.getTileEntity() != null && this.eventsEnabled() )
{
this.te.onChangeInventory( this, slot, InvOperation.decreaseStackSize, ns, null );
this.getTileEntity().onChangeInventory( this, slot, InvOperation.decreaseStackSize, ns, null );
}
this.markDirty();
@@ -111,7 +111,7 @@ public class AppEngInternalInventory implements IInventory, Iterable<ItemStack>
protected boolean eventsEnabled()
{
return Platform.isServer() || this.enableClientEvents;
return Platform.isServer() || this.isEnableClientEvents();
}
@Override
@@ -126,7 +126,7 @@ public class AppEngInternalInventory implements IInventory, Iterable<ItemStack>
final ItemStack oldStack = this.inv[slot];
this.inv[slot] = newItemStack;
if( this.te != null && this.eventsEnabled() )
if( this.getTileEntity() != null && this.eventsEnabled() )
{
ItemStack removed = oldStack;
ItemStack added = newItemStack;
@@ -151,7 +151,7 @@ public class AppEngInternalInventory implements IInventory, Iterable<ItemStack>
}
}
this.te.onChangeInventory( this, slot, InvOperation.setInventorySlotContents, removed, added );
this.getTileEntity().onChangeInventory( this, slot, InvOperation.setInventorySlotContents, removed, added );
this.markDirty();
}
@@ -178,9 +178,9 @@ public class AppEngInternalInventory implements IInventory, Iterable<ItemStack>
@Override
public void markDirty()
{
if( this.te != null && this.eventsEnabled() )
if( this.getTileEntity() != null && this.eventsEnabled() )
{
this.te.onChangeInventory( this, -1, InvOperation.markDirty, null, null );
this.getTileEntity().onChangeInventory( this, -1, InvOperation.markDirty, null, null );
}
}
@@ -214,9 +214,9 @@ public class AppEngInternalInventory implements IInventory, Iterable<ItemStack>
// for guis...
public void markDirty( final int slotIndex )
{
if( this.te != null && this.eventsEnabled() )
if( this.getTileEntity() != null && this.eventsEnabled() )
{
this.te.onChangeInventory( this, slotIndex, InvOperation.markDirty, null, null );
this.getTileEntity().onChangeInventory( this, slotIndex, InvOperation.markDirty, null, null );
}
}
@@ -227,7 +227,7 @@ public class AppEngInternalInventory implements IInventory, Iterable<ItemStack>
data.setTag( name, c );
}
public void writeToNBT( final NBTTagCompound target )
private void writeToNBT( final NBTTagCompound target )
{
for( int x = 0; x < this.size; x++ )
{
@@ -282,4 +282,24 @@ public class AppEngInternalInventory implements IInventory, Iterable<ItemStack>
{
return new InvIterator( this );
}
private boolean isEnableClientEvents()
{
return this.enableClientEvents;
}
public void setEnableClientEvents( final boolean enableClientEvents )
{
this.enableClientEvents = enableClientEvents;
}
private IAEAppEngInventory getTileEntity()
{
return this.te;
}
public void setTileEntity( final IAEAppEngInventory te )
{
this.te = te;
}
}