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/parts/layers/InvLayerData.java
+22 -22
View File
@@ -36,9 +36,9 @@ public class InvLayerData
final private List<InvSot> slots;
public InvLayerData(int a[][], List<ISidedInventory> b, List<InvSot> c) {
sides = a;
inventories = b;
slots = c;
this.sides = a;
this.inventories = b;
this.slots = c;
}
/**
@@ -49,77 +49,77 @@ public class InvLayerData
*/
boolean isSlotValid(int slot)
{
return slots != null && slot >= 0 && slot < slots.size();
return this.slots != null && slot >= 0 && slot < this.slots.size();
}
public ItemStack decreaseStackSize(int slot, int amount)
{
if ( isSlotValid( slot ) )
return slots.get( slot ).decreaseStackSize( amount );
if ( this.isSlotValid( slot ) )
return this.slots.get( slot ).decreaseStackSize( amount );
return null;
}
public int getSizeInventory()
{
if ( slots == null )
if ( this.slots == null )
return 0;
return slots.size();
return this.slots.size();
}
public ItemStack getStackInSlot(int slot)
{
if ( isSlotValid( slot ) )
return slots.get( slot ).getStackInSlot();
if ( this.isSlotValid( slot ) )
return this.slots.get( slot ).getStackInSlot();
return null;
}
public boolean isItemValidForSlot(int slot, ItemStack itemstack)
{
if ( isSlotValid( slot ) )
return slots.get( slot ).isItemValidForSlot( itemstack );
if ( this.isSlotValid( slot ) )
return this.slots.get( slot ).isItemValidForSlot( itemstack );
return false;
}
public void setInventorySlotContents(int slot, ItemStack itemstack)
{
if ( isSlotValid( slot ) )
slots.get( slot ).setInventorySlotContents( itemstack );
if ( this.isSlotValid( slot ) )
this.slots.get( slot ).setInventorySlotContents( itemstack );
}
public boolean canExtractItem(int slot, ItemStack itemstack, int side)
{
if ( isSlotValid( slot ) )
return slots.get( slot ).canExtractItem( itemstack, side );
if ( this.isSlotValid( slot ) )
return this.slots.get( slot ).canExtractItem( itemstack, side );
return false;
}
public boolean canInsertItem(int slot, ItemStack itemstack, int side)
{
if ( isSlotValid( slot ) )
return slots.get( slot ).canInsertItem( itemstack, side );
if ( this.isSlotValid( slot ) )
return this.slots.get( slot ).canInsertItem( itemstack, side );
return false;
}
public void markDirty()
{
if ( inventories != null )
if ( this.inventories != null )
{
for (IInventory inv : inventories)
for (IInventory inv : this.inventories)
inv.markDirty();
}
}
public int[] getAccessibleSlotsFromSide(int side)
{
if ( sides == null || side < 0 || side > 5 )
if ( this.sides == null || side < 0 || side > 5 )
return nullSides;
return sides[side];
return this.sides[side];
}
}
src/main/java/appeng/parts/layers/InvSot.java
+8 -8
View File
@@ -28,38 +28,38 @@ public class InvSot
final public int index;
public InvSot(ISidedInventory part, int slot) {
partInv = part;
index = slot;
this.partInv = part;
this.index = slot;
}
public ItemStack decreaseStackSize(int j)
{
return partInv.decrStackSize( index, j );
return this.partInv.decrStackSize( this.index, j );
}
public ItemStack getStackInSlot()
{
return partInv.getStackInSlot( index );
return this.partInv.getStackInSlot( this.index );
}
public boolean isItemValidForSlot(ItemStack itemstack)
{
return partInv.isItemValidForSlot( index, itemstack );
return this.partInv.isItemValidForSlot( this.index, itemstack );
}
public void setInventorySlotContents(ItemStack itemstack)
{
partInv.setInventorySlotContents( index, itemstack );
this.partInv.setInventorySlotContents( this.index, itemstack );
}
public boolean canExtractItem(ItemStack itemstack, int side)
{
return partInv.canExtractItem( index, itemstack, side );
return this.partInv.canExtractItem( this.index, itemstack, side );
}
public boolean canInsertItem(ItemStack itemstack, int side)
{
return partInv.canInsertItem( index, itemstack, side );
return this.partInv.canInsertItem( this.index, itemstack, side );
}
}
src/main/java/appeng/parts/layers/LayerIBatteryProvider.java
+1 -1
View File
@@ -30,7 +30,7 @@ public class LayerIBatteryProvider extends LayerBase implements ISidedBatteryPro
@Override
public IBatteryObject getMjBattery(String kind, ForgeDirection direction)
{
IPart p = getPart( direction );
IPart p = this.getPart( direction );
if ( p instanceof ISidedBatteryProvider )
return ((ISidedBatteryProvider) p).getMjBattery( kind, direction );
src/main/java/appeng/parts/layers/LayerIEnergySink.java
+23 -23
View File
@@ -35,7 +35,7 @@ public class LayerIEnergySink extends LayerBase implements IEnergySink
private boolean isInIC2()
{
return getLayerFlags().contains( LayerFlags.IC2_ENET );
return this.getLayerFlags().contains( LayerFlags.IC2_ENET );
}
private TileEntity getEnergySinkTile()
@@ -46,15 +46,15 @@ public class LayerIEnergySink extends LayerBase implements IEnergySink
private World getEnergySinkWorld()
{
if ( getEnergySinkTile() == null )
if ( this.getEnergySinkTile() == null )
return null;
return getEnergySinkTile().getWorldObj();
return this.getEnergySinkTile().getWorldObj();
}
private boolean isTileValid()
{
TileEntity te = getEnergySinkTile();
TileEntity te = this.getEnergySinkTile();
if ( te == null )
return false;
@@ -64,28 +64,28 @@ public class LayerIEnergySink extends LayerBase implements IEnergySink
private void addToENet()
{
if ( getEnergySinkWorld() == null )
if ( this.getEnergySinkWorld() == null )
return;
// re-add
removeFromENet();
this.removeFromENet();
if ( !isInIC2() && Platform.isServer() && isTileValid() )
if ( !this.isInIC2() && Platform.isServer() && this.isTileValid() )
{
getLayerFlags().add( LayerFlags.IC2_ENET );
MinecraftForge.EVENT_BUS.post( new ic2.api.energy.event.EnergyTileLoadEvent( (IEnergySink) getEnergySinkTile() ) );
this.getLayerFlags().add( LayerFlags.IC2_ENET );
MinecraftForge.EVENT_BUS.post( new ic2.api.energy.event.EnergyTileLoadEvent( (IEnergySink) this.getEnergySinkTile() ) );
}
}
private void removeFromENet()
{
if ( getEnergySinkWorld() == null )
if ( this.getEnergySinkWorld() == null )
return;
if ( isInIC2() && Platform.isServer() )
if ( this.isInIC2() && Platform.isServer() )
{
getLayerFlags().remove( LayerFlags.IC2_ENET );
MinecraftForge.EVENT_BUS.post( new ic2.api.energy.event.EnergyTileUnloadEvent( (IEnergySink) getEnergySinkTile() ) );
this.getLayerFlags().remove( LayerFlags.IC2_ENET );
MinecraftForge.EVENT_BUS.post( new ic2.api.energy.event.EnergyTileUnloadEvent( (IEnergySink) this.getEnergySinkTile() ) );
}
}
@@ -97,7 +97,7 @@ public class LayerIEnergySink extends LayerBase implements IEnergySink
int interested = 0;
for (ForgeDirection dir : ForgeDirection.VALID_DIRECTIONS)
{
IPart part = getPart( dir );
IPart part = this.getPart( dir );
if ( part instanceof IEnergyTile )
{
interested++;
@@ -111,19 +111,19 @@ public class LayerIEnergySink extends LayerBase implements IEnergySink
{
super.partChanged();
if ( interestedInIC2() )
addToENet();
if ( this.interestedInIC2() )
this.addToENet();
else
removeFromENet();
this.removeFromENet();
}
@Override
public boolean acceptsEnergyFrom(TileEntity emitter, ForgeDirection direction)
{
if ( !isInIC2() )
if ( !this.isInIC2() )
return false;
IPart part = getPart( direction );
IPart part = this.getPart( direction );
if ( part instanceof IEnergySink )
return ((IEnergySink) part).acceptsEnergyFrom( emitter, direction );
return false;
@@ -132,14 +132,14 @@ public class LayerIEnergySink extends LayerBase implements IEnergySink
@Override
public double getDemandedEnergy()
{
if ( !isInIC2() )
if ( !this.isInIC2() )
return 0;
// this is a flawed implementation, that requires a change to the IC2 API.
for (ForgeDirection dir : ForgeDirection.VALID_DIRECTIONS)
{
IPart part = getPart( dir );
IPart part = this.getPart( dir );
if ( part instanceof IEnergySink )
{
// use lower number cause ic2 deletes power it sends that isn't received.
@@ -153,12 +153,12 @@ public class LayerIEnergySink extends LayerBase implements IEnergySink
@Override
public double injectEnergy(ForgeDirection directionFrom, double amount, double voltage)
{
if ( !isInIC2() )
if ( !this.isInIC2() )
return amount;
for (ForgeDirection dir : ForgeDirection.VALID_DIRECTIONS)
{
IPart part = getPart( dir );
IPart part = this.getPart( dir );
if ( part instanceof IEnergySink )
{
return ((IEnergySink) part).injectEnergy( directionFrom, amount, voltage );
src/main/java/appeng/parts/layers/LayerIEnergySource.java
+23 -23
View File
@@ -37,7 +37,7 @@ public class LayerIEnergySource extends LayerBase implements IEnergySource
private boolean isInIC2()
{
return getLayerFlags().contains( LayerFlags.IC2_ENET );
return this.getLayerFlags().contains( LayerFlags.IC2_ENET );
}
private TileEntity getEnergySourceTile()
@@ -48,14 +48,14 @@ public class LayerIEnergySource extends LayerBase implements IEnergySource
private World getEnergySourceWorld()
{
if ( getEnergySourceTile() == null )
if ( this.getEnergySourceTile() == null )
return null;
return getEnergySourceTile().getWorldObj();
return this.getEnergySourceTile().getWorldObj();
}
private boolean isTileValid()
{
TileEntity te = getEnergySourceTile();
TileEntity te = this.getEnergySourceTile();
if ( te == null )
return false;
return !te.isInvalid();
@@ -63,28 +63,28 @@ public class LayerIEnergySource extends LayerBase implements IEnergySource
private void addToENet()
{
if ( getEnergySourceWorld() == null )
if ( this.getEnergySourceWorld() == null )
return;
// re-add
removeFromENet();
this.removeFromENet();
if ( !isInIC2() && Platform.isServer() && isTileValid() )
if ( !this.isInIC2() && Platform.isServer() && this.isTileValid() )
{
getLayerFlags().add( LayerFlags.IC2_ENET );
MinecraftForge.EVENT_BUS.post( new ic2.api.energy.event.EnergyTileLoadEvent( (IEnergySink) getEnergySourceTile() ) );
this.getLayerFlags().add( LayerFlags.IC2_ENET );
MinecraftForge.EVENT_BUS.post( new ic2.api.energy.event.EnergyTileLoadEvent( (IEnergySink) this.getEnergySourceTile() ) );
}
}
private void removeFromENet()
{
if ( getEnergySourceWorld() == null )
if ( this.getEnergySourceWorld() == null )
return;
if ( isInIC2() && Platform.isServer() )
if ( this.isInIC2() && Platform.isServer() )
{
getLayerFlags().remove( LayerFlags.IC2_ENET );
MinecraftForge.EVENT_BUS.post( new ic2.api.energy.event.EnergyTileUnloadEvent( (IEnergySink) getEnergySourceTile() ) );
this.getLayerFlags().remove( LayerFlags.IC2_ENET );
MinecraftForge.EVENT_BUS.post( new ic2.api.energy.event.EnergyTileUnloadEvent( (IEnergySink) this.getEnergySourceTile() ) );
}
}
@@ -96,7 +96,7 @@ public class LayerIEnergySource extends LayerBase implements IEnergySource
int interested = 0;
for (ForgeDirection dir : ForgeDirection.VALID_DIRECTIONS)
{
IPart part = getPart( dir );
IPart part = this.getPart( dir );
if ( part instanceof IEnergyTile )
{
interested++;
@@ -110,19 +110,19 @@ public class LayerIEnergySource extends LayerBase implements IEnergySource
{
super.partChanged();
if ( interestedInIC2() )
addToENet();
if ( this.interestedInIC2() )
this.addToENet();
else
removeFromENet();
this.removeFromENet();
}
@Override
public boolean emitsEnergyTo(TileEntity receiver, ForgeDirection direction)
{
if ( !isInIC2() )
if ( !this.isInIC2() )
return false;
IPart part = getPart( direction );
IPart part = this.getPart( direction );
if ( part instanceof IEnergySink )
return ((IEnergyEmitter) part).emitsEnergyTo( receiver, direction );
return false;
@@ -131,14 +131,14 @@ public class LayerIEnergySource extends LayerBase implements IEnergySource
@Override
public double getOfferedEnergy()
{
if ( !isInIC2() )
if ( !this.isInIC2() )
return 0;
// this is a flawed implementation, that requires a change to the IC2 API.
for (ForgeDirection dir : ForgeDirection.VALID_DIRECTIONS)
{
IPart part = getPart( dir );
IPart part = this.getPart( dir );
if ( part instanceof IEnergySource )
{
// use lower number cause ic2 deletes power it sends that isn't received.
@@ -156,7 +156,7 @@ public class LayerIEnergySource extends LayerBase implements IEnergySource
for (ForgeDirection dir : ForgeDirection.VALID_DIRECTIONS)
{
IPart part = getPart( dir );
IPart part = this.getPart( dir );
if ( part instanceof IEnergySource )
{
((IEnergySource) part).drawEnergy( amount );
@@ -172,7 +172,7 @@ public class LayerIEnergySource extends LayerBase implements IEnergySource
for (ForgeDirection dir : ForgeDirection.VALID_DIRECTIONS)
{
IPart part = getPart( dir );
IPart part = this.getPart( dir );
if ( part instanceof IEnergySource )
{
return ((IEnergySource) part).getSourceTier();
src/main/java/appeng/parts/layers/LayerIFluidHandler.java
+6 -6
View File
@@ -33,7 +33,7 @@ public class LayerIFluidHandler extends LayerBase implements IFluidHandler
@Override
public int fill(ForgeDirection from, FluidStack resource, boolean doFill)
{
IPart part = getPart( from );
IPart part = this.getPart( from );
if ( part instanceof IFluidHandler )
return ((IFluidHandler) part).fill( from, resource, doFill );
return 0;
@@ -42,7 +42,7 @@ public class LayerIFluidHandler extends LayerBase implements IFluidHandler
@Override
public FluidStack drain(ForgeDirection from, FluidStack resource, boolean doDrain)
{
IPart part = getPart( from );
IPart part = this.getPart( from );
if ( part instanceof IFluidHandler )
return ((IFluidHandler) part).drain( from, resource, doDrain );
return null;
@@ -51,7 +51,7 @@ public class LayerIFluidHandler extends LayerBase implements IFluidHandler
@Override
public FluidStack drain(ForgeDirection from, int maxDrain, boolean doDrain)
{
IPart part = getPart( from );
IPart part = this.getPart( from );
if ( part instanceof IFluidHandler )
return ((IFluidHandler) part).drain( from, maxDrain, doDrain );
return null;
@@ -60,7 +60,7 @@ public class LayerIFluidHandler extends LayerBase implements IFluidHandler
@Override
public boolean canFill(ForgeDirection from, net.minecraftforge.fluids.Fluid fluid)
{
IPart part = getPart( from );
IPart part = this.getPart( from );
if ( part instanceof IFluidHandler )
return ((IFluidHandler) part).canFill( from, fluid );
return false;
@@ -69,7 +69,7 @@ public class LayerIFluidHandler extends LayerBase implements IFluidHandler
@Override
public boolean canDrain(ForgeDirection from, net.minecraftforge.fluids.Fluid fluid)
{
IPart part = getPart( from );
IPart part = this.getPart( from );
if ( part instanceof IFluidHandler )
return ((IFluidHandler) part).canDrain( from, fluid );
return false;
@@ -78,7 +78,7 @@ public class LayerIFluidHandler extends LayerBase implements IFluidHandler
@Override
public FluidTankInfo[] getTankInfo(ForgeDirection from)
{
IPart part = getPart( from );
IPart part = this.getPart( from );
if ( part instanceof IFluidHandler )
return ((IFluidHandler) part).getTankInfo( from );
return emptyList;
src/main/java/appeng/parts/layers/LayerIPipeConnection.java
+1 -1
View File
@@ -30,7 +30,7 @@ public class LayerIPipeConnection extends LayerBase implements IPipeConnection
@Override
public ConnectOverride overridePipeConnection(PipeType type, ForgeDirection with)
{
IPart part = getPart( with );
IPart part = this.getPart( with );
if ( part instanceof IPipeConnection )
return ((IPipeConnection) part).overridePipeConnection( type, with );
return ConnectOverride.DEFAULT;
src/main/java/appeng/parts/layers/LayerIPowerEmitter.java
+1 -1
View File
@@ -29,7 +29,7 @@ public class LayerIPowerEmitter extends LayerBase implements IPowerEmitter
@Override
public boolean canEmitPowerFrom(ForgeDirection side)
{
IPart part = getPart( side );
IPart part = this.getPart( side );
if ( part instanceof IPowerEmitter )
return ((IPowerEmitter) part).canEmitPowerFrom( side );
return false;
src/main/java/appeng/parts/layers/LayerIPowerReceptor.java
+1 -1
View File
@@ -33,7 +33,7 @@ public class LayerIPowerReceptor extends LayerBase implements IPowerReceptor
@Override
public PowerReceiver getPowerReceiver(ForgeDirection side)
{
IPart part = getPart( side );
IPart part = this.getPart( side );
if ( part instanceof IPowerReceptor )
return ((IPowerReceptor) part).getPowerReceiver( side );
return null;
src/main/java/appeng/parts/layers/LayerISidedInventory.java
+22 -22
View File
@@ -65,7 +65,7 @@ public class LayerISidedInventory extends LayerBase implements ISidedInventory
for (ForgeDirection side : ForgeDirection.VALID_DIRECTIONS)
{
IPart bp = getPart( side );
IPart bp = this.getPart( side );
if ( bp instanceof ISidedInventory )
{
ISidedInventory part = (ISidedInventory) bp;
@@ -92,7 +92,7 @@ public class LayerISidedInventory extends LayerBase implements ISidedInventory
ForgeDirection currentSide = ForgeDirection.UNKNOWN;
for (ForgeDirection side : ForgeDirection.VALID_DIRECTIONS)
if ( getPart( side ) == sides )
if ( this.getPart( side ) == sides )
{
currentSide = side;
break;
@@ -108,9 +108,9 @@ public class LayerISidedInventory extends LayerBase implements ISidedInventory
}
if ( sideData == null || slots == null )
invLayer = null;
this.invLayer = null;
else
invLayer = new InvLayerData( sideData, inventories, slots );
this.invLayer = new InvLayerData( sideData, inventories, slots );
// make sure inventory is updated before we call FMP.
super.notifyNeighbors();
@@ -119,71 +119,71 @@ public class LayerISidedInventory extends LayerBase implements ISidedInventory
@Override
public ItemStack decrStackSize(int slot, int amount)
{
if ( invLayer == null )
if ( this.invLayer == null )
return null;
return invLayer.decreaseStackSize( slot, amount );
return this.invLayer.decreaseStackSize( slot, amount );
}
@Override
public int getSizeInventory()
{
if ( invLayer == null )
if ( this.invLayer == null )
return 0;
return invLayer.getSizeInventory();
return this.invLayer.getSizeInventory();
}
@Override
public ItemStack getStackInSlot(int slot)
{
if ( invLayer == null )
if ( this.invLayer == null )
return null;
return invLayer.getStackInSlot( slot );
return this.invLayer.getStackInSlot( slot );
}
@Override
public boolean isItemValidForSlot(int slot, ItemStack itemstack)
{
if ( invLayer == null )
if ( this.invLayer == null )
return false;
return invLayer.isItemValidForSlot( slot, itemstack );
return this.invLayer.isItemValidForSlot( slot, itemstack );
}
@Override
public void setInventorySlotContents(int slot, ItemStack itemstack)
{
if ( invLayer == null )
if ( this.invLayer == null )
return;
invLayer.setInventorySlotContents( slot, itemstack );
this.invLayer.setInventorySlotContents( slot, itemstack );
}
@Override
public boolean canExtractItem(int slot, ItemStack itemstack, int side)
{
if ( invLayer == null )
if ( this.invLayer == null )
return false;
return invLayer.canExtractItem( slot, itemstack, side );
return this.invLayer.canExtractItem( slot, itemstack, side );
}
@Override
public boolean canInsertItem(int slot, ItemStack itemstack, int side)
{
if ( invLayer == null )
if ( this.invLayer == null )
return false;
return invLayer.canInsertItem( slot, itemstack, side );
return this.invLayer.canInsertItem( slot, itemstack, side );
}
@Override
public void markDirty()
{
if ( invLayer != null )
invLayer.markDirty();
if ( this.invLayer != null )
this.invLayer.markDirty();
super.markForSave();
}
@@ -191,8 +191,8 @@ public class LayerISidedInventory extends LayerBase implements ISidedInventory
@Override
public int[] getAccessibleSlotsFromSide(int side)
{
if ( invLayer != null )
return invLayer.getAccessibleSlotsFromSide( side );
if ( this.invLayer != null )
return this.invLayer.getAccessibleSlotsFromSide( side );
return nullSides;
}
src/main/java/appeng/parts/layers/LayerITileStorageMonitorable.java
+1 -1
View File
@@ -31,7 +31,7 @@ public class LayerITileStorageMonitorable extends LayerBase implements ITileStor
@Override
public IStorageMonitorable getMonitorable(ForgeDirection side, BaseActionSource src)
{
IPart part = getPart( side );
IPart part = this.getPart( side );
if ( part instanceof ITileStorageMonitorable )
return ((ITileStorageMonitorable) part).getMonitorable( side, src );
return null;