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

Changed access to use this qualifier

Browse Source
This commit is contained in:
yueh
2014-12-29 15:13:47 +01:00
parent 2a5e57a59b
commit f471513bd0
604 changed files with 11573 additions and 11573 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/main/java/appeng/integration/modules/helpers/BSCrate.java
+6 -6
View File
@@ -36,8 +36,8 @@ public class BSCrate implements IMEInventory<IAEItemStack>
final ForgeDirection side;
public BSCrate(Object object, ForgeDirection d) {
cs = (ICrateStorage) object;
side = d;
this.cs = (ICrateStorage) object;
this.side = d;
}
@Override
@@ -52,7 +52,7 @@ public class BSCrate implements IMEInventory<IAEItemStack>
if ( mode == Actionable.SIMULATE )
return null;
ItemStack failed = cs.insertItems( input.getItemStack() );
ItemStack failed = this.cs.insertItems( input.getItemStack() );
if ( failed == null )
return null;
input.setStackSize( failed.stackSize );
@@ -64,18 +64,18 @@ public class BSCrate implements IMEInventory<IAEItemStack>
{
if ( mode == Actionable.SIMULATE )
{
int howMany = cs.getItemCount( request.getItemStack() );
int howMany = this.cs.getItemCount( request.getItemStack() );
return howMany > request.getStackSize() ? request : request.copy().setStackSize( howMany );
}
ItemStack Obtained = cs.extractItems( request.getItemStack(), (int) request.getStackSize() );
ItemStack Obtained = this.cs.extractItems( request.getItemStack(), (int) request.getStackSize() );
return AEItemStack.create( Obtained );
}
@Override
public IItemList getAvailableItems(IItemList out)
{
for (ItemStack is : cs.getContents())
for (ItemStack is : this.cs.getContents())
{
out.add( AEItemStack.create( is ) );
}
src/main/java/appeng/integration/modules/helpers/BSCrateStorageAdaptor.java
+14 -14
View File
@@ -37,8 +37,8 @@ public class BSCrateStorageAdaptor extends InventoryAdaptor
final ForgeDirection side;
public BSCrateStorageAdaptor(Object te, ForgeDirection d) {
cs = (ICrateStorage) te;
side = d;
this.cs = (ICrateStorage) te;
this.side = d;
}
@Override
@@ -46,7 +46,7 @@ public class BSCrateStorageAdaptor extends InventoryAdaptor
{
ItemStack target = null;
for (ItemStack is : cs.getContents())
for (ItemStack is : this.cs.getContents())
{
if ( is != null )
{
@@ -65,7 +65,7 @@ public class BSCrateStorageAdaptor extends InventoryAdaptor
{
ItemStack f = Platform.cloneItemStack( target );
f.stackSize = how_many;
return cs.extractItems( f, how_many );
return this.cs.extractItems( f, how_many );
}
return null;
@@ -76,7 +76,7 @@ public class BSCrateStorageAdaptor extends InventoryAdaptor
{
ItemStack target = null;
for (ItemStack is : cs.getContents())
for (ItemStack is : this.cs.getContents())
{
if ( is != null )
{
@@ -93,7 +93,7 @@ public class BSCrateStorageAdaptor extends InventoryAdaptor
if ( target != null )
{
int cnt = cs.getItemCount( target );
int cnt = this.cs.getItemCount( target );
if ( cnt == 0 )
return null;
if ( cnt > how_many )
@@ -111,7 +111,7 @@ public class BSCrateStorageAdaptor extends InventoryAdaptor
{
ItemStack target = null;
for (ItemStack is : cs.getContents())
for (ItemStack is : this.cs.getContents())
{
if ( is != null )
{
@@ -130,7 +130,7 @@ public class BSCrateStorageAdaptor extends InventoryAdaptor
{
ItemStack f = Platform.cloneItemStack( target );
f.stackSize = amount;
return cs.extractItems( f, amount );
return this.cs.extractItems( f, amount );
}
return null;
@@ -141,7 +141,7 @@ public class BSCrateStorageAdaptor extends InventoryAdaptor
{
ItemStack target = null;
for (ItemStack is : cs.getContents())
for (ItemStack is : this.cs.getContents())
{
if ( is != null )
{
@@ -158,7 +158,7 @@ public class BSCrateStorageAdaptor extends InventoryAdaptor
if ( target != null )
{
int cnt = cs.getItemCount( target );
int cnt = this.cs.getItemCount( target );
if ( cnt == 0 )
return null;
if ( cnt > how_many )
@@ -174,13 +174,13 @@ public class BSCrateStorageAdaptor extends InventoryAdaptor
@Override
public ItemStack addItems(ItemStack A)
{
return cs.insertItems( A );
return this.cs.insertItems( A );
}
@Override
public ItemStack simulateAdd(ItemStack A)
{
int items = cs.getSpaceForItem( A );
int items = this.cs.getSpaceForItem( A );
ItemStack B = Platform.cloneItemStack( A );
if ( A.stackSize <= items )
return null;
@@ -191,13 +191,13 @@ public class BSCrateStorageAdaptor extends InventoryAdaptor
@Override
public boolean containsItems()
{
return cs.getUniqueItems() > 0;
return this.cs.getUniqueItems() > 0;
}
@Override
public Iterator<ItemSlot> iterator()
{
return new StackToSlotIterator( cs.getContents().iterator() );
return new StackToSlotIterator( this.cs.getContents().iterator() );
}
}
src/main/java/appeng/integration/modules/helpers/FactorizationBarrel.java
+20 -20
View File
@@ -36,8 +36,8 @@ public class FactorizationBarrel implements IMEInventory<IAEItemStack>
final IFZ fProxy;
public FactorizationBarrel(IFZ proxy, TileEntity tile) {
te = tile;
fProxy = proxy;
this.te = tile;
this.fProxy = proxy;
}
@Override
@@ -48,17 +48,17 @@ public class FactorizationBarrel implements IMEInventory<IAEItemStack>
public long remainingItemTypes()
{
return fProxy.barrelGetItem( te ) == null ? 1 : 0;
return this.fProxy.barrelGetItem( this.te ) == null ? 1 : 0;
}
public long remainingItemCount()
{
return fProxy.barrelGetMaxItemCount( te ) - fProxy.barrelGetItemCount( te );
return this.fProxy.barrelGetMaxItemCount( this.te ) - this.fProxy.barrelGetItemCount( this.te );
}
public boolean containsItemType(IAEItemStack i, boolean acceptEmpty)
{
ItemStack currentItem = fProxy.barrelGetItem( te );
ItemStack currentItem = this.fProxy.barrelGetItem( this.te );
// empty barrels want your love too!
if ( acceptEmpty && currentItem == null )
@@ -69,7 +69,7 @@ public class FactorizationBarrel implements IMEInventory<IAEItemStack>
public long storedItemCount()
{
return fProxy.barrelGetItemCount( te );
return this.fProxy.barrelGetItemCount( this.te );
}
@Override
@@ -84,20 +84,20 @@ public class FactorizationBarrel implements IMEInventory<IAEItemStack>
if ( shared.isItemDamaged() )
return input;
if ( remainingItemTypes() > 0 )
if ( this.remainingItemTypes() > 0 )
{
if ( mode == Actionable.MODULATE )
fProxy.setItemType( te, input.getItemStack() );
this.fProxy.setItemType( this.te, input.getItemStack() );
}
if ( containsItemType( input, mode == Actionable.SIMULATE ) )
if ( this.containsItemType( input, mode == Actionable.SIMULATE ) )
{
int max = fProxy.barrelGetMaxItemCount( te );
int newTotal = (int) storedItemCount() + (int) input.getStackSize();
int max = this.fProxy.barrelGetMaxItemCount( this.te );
int newTotal = (int) this.storedItemCount() + (int) input.getStackSize();
if ( newTotal > max )
{
if ( mode == Actionable.MODULATE )
fProxy.barrelSetCount( te, max );
this.fProxy.barrelSetCount( this.te, max );
IAEItemStack result = input.copy();
result.setStackSize( newTotal - max );
return result;
@@ -105,7 +105,7 @@ public class FactorizationBarrel implements IMEInventory<IAEItemStack>
else
{
if ( mode == Actionable.MODULATE )
fProxy.barrelSetCount( te, newTotal );
this.fProxy.barrelSetCount( this.te, newTotal );
return null;
}
}
@@ -116,15 +116,15 @@ public class FactorizationBarrel implements IMEInventory<IAEItemStack>
@Override
public IAEItemStack extractItems(IAEItemStack request, Actionable mode, BaseActionSource src)
{
if ( containsItemType( request, false ) )
if ( this.containsItemType( request, false ) )
{
int howMany = (int) storedItemCount();
int howMany = (int) this.storedItemCount();
if ( request.getStackSize() >= howMany )
{
if ( mode == Actionable.MODULATE )
{
fProxy.setItemType( te, null );
fProxy.barrelSetCount( te, 0 );
this.fProxy.setItemType( this.te, null );
this.fProxy.barrelSetCount( this.te, 0 );
}
IAEItemStack r = request.copy();
@@ -134,7 +134,7 @@ public class FactorizationBarrel implements IMEInventory<IAEItemStack>
else
{
if ( mode == Actionable.MODULATE )
fProxy.barrelSetCount( te, (int) (howMany - request.getStackSize()) );
this.fProxy.barrelSetCount( this.te, (int) (howMany - request.getStackSize()) );
return request.copy();
}
}
@@ -144,10 +144,10 @@ public class FactorizationBarrel implements IMEInventory<IAEItemStack>
@Override
public IItemList<IAEItemStack> getAvailableItems(IItemList out)
{
ItemStack i = fProxy.barrelGetItem( te );
ItemStack i = this.fProxy.barrelGetItem( this.te );
if ( i != null )
{
i.stackSize = fProxy.barrelGetItemCount( te );
i.stackSize = this.fProxy.barrelGetItemCount( this.te );
out.addStorage( AEItemStack.create( i ) );
}
src/main/java/appeng/integration/modules/helpers/MJPerdition.java
+8 -8
View File
@@ -31,49 +31,49 @@ public class MJPerdition extends BaseMJPerdition
final protected PowerHandler bcPowerHandler;
public MJPerdition(IPowerReceptor te) {
bcPowerHandler = new PowerHandler( te, Type.MACHINE );
this.bcPowerHandler = new PowerHandler( te, Type.MACHINE );
}
@Override
public void Tick()
{
bcPowerHandler.update();
this.bcPowerHandler.update();
}
@Override
public void writeToNBT(NBTTagCompound data)
{
bcPowerHandler.writeToNBT( data, "bcPowerHandler" );
this.bcPowerHandler.writeToNBT( data, "bcPowerHandler" );
}
@Override
public void readFromNBT(NBTTagCompound data)
{
bcPowerHandler.readFromNBT( data, "bcPowerHandler" );
this.bcPowerHandler.readFromNBT( data, "bcPowerHandler" );
}
@Override
public PowerReceiver getPowerReceiver()
{
return bcPowerHandler.getPowerReceiver();
return this.bcPowerHandler.getPowerReceiver();
}
@Override
public double useEnergy(double min, double max, boolean doUse)
{
return bcPowerHandler.useEnergy( min, max, doUse );
return this.bcPowerHandler.useEnergy( min, max, doUse );
}
@Override
public void addEnergy(float failed)
{
bcPowerHandler.addEnergy( failed );
this.bcPowerHandler.addEnergy( failed );
}
@Override
public void configure(int i, int j, float f, int k)
{
bcPowerHandler.configure( i, j, f, k );
this.bcPowerHandler.configure( i, j, f, k );
}
}
src/main/java/appeng/integration/modules/helpers/MinefactoryReloadedDeepStorageUnit.java
+11 -11
View File
@@ -36,8 +36,8 @@ public class MinefactoryReloadedDeepStorageUnit implements IMEInventory<IAEItemS
final TileEntity te;
public MinefactoryReloadedDeepStorageUnit(TileEntity ta) {
te = ta;
dsu = (IDeepStorageUnit) ta;
this.te = ta;
this.dsu = (IDeepStorageUnit) ta;
}
@Override
@@ -49,12 +49,12 @@ public class MinefactoryReloadedDeepStorageUnit implements IMEInventory<IAEItemS
@Override
public IAEItemStack injectItems(IAEItemStack input, Actionable mode, BaseActionSource src)
{
ItemStack is = dsu.getStoredItemType();
ItemStack is = this.dsu.getStoredItemType();
if ( is != null )
{
if ( input.equals( is ) )
{
long max = dsu.getMaxStoredCount();
long max = this.dsu.getMaxStoredCount();
long storedItems = is.stackSize;
if ( max == storedItems )
return input;
@@ -65,13 +65,13 @@ public class MinefactoryReloadedDeepStorageUnit implements IMEInventory<IAEItemS
IAEItemStack overflow = AEItemStack.create( is );
overflow.setStackSize( (int) (storedItems - max) );
if ( mode == Actionable.MODULATE )
dsu.setStoredItemCount( (int) max );
this.dsu.setStoredItemCount( (int) max );
return overflow;
}
else
{
if ( mode == Actionable.MODULATE )
dsu.setStoredItemCount( is.stackSize + (int) input.getStackSize() );
this.dsu.setStoredItemCount( is.stackSize + (int) input.getStackSize() );
return null;
}
}
@@ -81,7 +81,7 @@ public class MinefactoryReloadedDeepStorageUnit implements IMEInventory<IAEItemS
if ( input.getTagCompound() != null )
return input;
if ( mode == Actionable.MODULATE )
dsu.setStoredItemType( input.getItemStack(), (int) input.getStackSize() );
this.dsu.setStoredItemType( input.getItemStack(), (int) input.getStackSize() );
return null;
}
return input;
@@ -90,20 +90,20 @@ public class MinefactoryReloadedDeepStorageUnit implements IMEInventory<IAEItemS
@Override
public IAEItemStack extractItems(IAEItemStack request, Actionable mode, BaseActionSource src)
{
ItemStack is = dsu.getStoredItemType();
ItemStack is = this.dsu.getStoredItemType();
if ( request.equals( is ) )
{
if ( request.getStackSize() >= is.stackSize )
{
is = is.copy();
if ( mode == Actionable.MODULATE )
dsu.setStoredItemCount( 0 );
this.dsu.setStoredItemCount( 0 );
return AEItemStack.create( is );
}
else
{
if ( mode == Actionable.MODULATE )
dsu.setStoredItemCount( is.stackSize - (int) request.getStackSize() );
this.dsu.setStoredItemCount( is.stackSize - (int) request.getStackSize() );
return request.copy();
}
}
@@ -113,7 +113,7 @@ public class MinefactoryReloadedDeepStorageUnit implements IMEInventory<IAEItemS
@Override
public IItemList<IAEItemStack> getAvailableItems(IItemList<IAEItemStack> out)
{
ItemStack is = dsu.getStoredItemType();
ItemStack is = this.dsu.getStoredItemType();
if ( is != null )
{
out.add( AEItemStack.create( is ) );