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

Merge branch 'master' of https://bitbucket.org/AlgorithmX2/appliedenergistics2

Browse Source
This commit is contained in:
AlgorithmX2
2014-02-12 23:33:38 -06:00
parent 22c575f06a 118f13edff
commit 09cee7b9f5
9 changed files with 29 additions and 29 deletions
Download Patch File Download Diff File Expand all files Collapse all files
api
+1 -1
Submodule api updated: e9440a4d13...abd2deac47
container/implementations/ContainerMEMonitorable.java
+2 -2
View File
@@ -18,7 +18,7 @@ import appeng.api.networking.energy.IEnergyGrid;
import appeng.api.networking.security.BaseActionSource; import appeng.api.networking.security.BaseActionSource;
import appeng.api.parts.IPart; import appeng.api.parts.IPart;
import appeng.api.storage.IMEMonitor; import appeng.api.storage.IMEMonitor;
import appeng.api.storage.IMEMonitorHandlerReciever; import appeng.api.storage.IMEMonitorHandlerReceiver;
import appeng.api.storage.IStorageMonitorable; import appeng.api.storage.IStorageMonitorable;
import appeng.api.storage.data.IAEItemStack; import appeng.api.storage.data.IAEItemStack;
import appeng.api.storage.data.IItemList; import appeng.api.storage.data.IItemList;
@@ -29,7 +29,7 @@ import appeng.core.sync.packets.PacketMEInventoryUpdate;
import appeng.util.Platform; import appeng.util.Platform;
import appeng.util.item.ItemList; import appeng.util.item.ItemList;
public class ContainerMEMonitorable extends AEBaseContainer implements IMEMonitorHandlerReciever<IAEItemStack> public class ContainerMEMonitorable extends AEBaseContainer implements IMEMonitorHandlerReceiver<IAEItemStack>
{ {
final IMEMonitor<IAEItemStack> monitor; final IMEMonitor<IAEItemStack> monitor;
helpers/WirelessTerminalGuiObject.java
+3 -3
View File
@@ -17,7 +17,7 @@ import appeng.api.networking.IMachineSet;
import appeng.api.networking.security.BaseActionSource; import appeng.api.networking.security.BaseActionSource;
import appeng.api.networking.storage.IStorageGrid; import appeng.api.networking.storage.IStorageGrid;
import appeng.api.storage.IMEMonitor; import appeng.api.storage.IMEMonitor;
import appeng.api.storage.IMEMonitorHandlerReciever; import appeng.api.storage.IMEMonitorHandlerReceiver;
import appeng.api.storage.StorageChannel; import appeng.api.storage.StorageChannel;
import appeng.api.storage.data.IAEFluidStack; import appeng.api.storage.data.IAEFluidStack;
import appeng.api.storage.data.IAEItemStack; import appeng.api.storage.data.IAEItemStack;
@@ -154,14 +154,14 @@ public class WirelessTerminalGuiObject implements IPortableCell
} }
@Override @Override
public void addListener(IMEMonitorHandlerReciever<IAEItemStack> l, Object verificationToken) public void addListener(IMEMonitorHandlerReceiver<IAEItemStack> l, Object verificationToken)
{ {
if ( itemStorage != null ) if ( itemStorage != null )
itemStorage.addListener( l, verificationToken ); itemStorage.addListener( l, verificationToken );
} }
@Override @Override
public void removeListener(IMEMonitorHandlerReciever<IAEItemStack> l) public void removeListener(IMEMonitorHandlerReceiver<IAEItemStack> l)
{ {
if ( itemStorage != null ) if ( itemStorage != null )
itemStorage.removeListener( l ); itemStorage.removeListener( l );
me/storage/MEMonitorIInventory.java
+7 -7
View File
@@ -15,7 +15,7 @@ import appeng.api.networking.security.BaseActionSource;
import appeng.api.networking.ticking.TickRateModulation; import appeng.api.networking.ticking.TickRateModulation;
import appeng.api.storage.IMEInventory; import appeng.api.storage.IMEInventory;
import appeng.api.storage.IMEMonitor; import appeng.api.storage.IMEMonitor;
import appeng.api.storage.IMEMonitorHandlerReciever; import appeng.api.storage.IMEMonitorHandlerReceiver;
import appeng.api.storage.StorageChannel; import appeng.api.storage.StorageChannel;
import appeng.api.storage.data.IAEItemStack; import appeng.api.storage.data.IAEItemStack;
import appeng.api.storage.data.IItemList; import appeng.api.storage.data.IItemList;
@@ -54,18 +54,18 @@ public class MEMonitorIInventory implements IMEInventory<IAEItemStack>, IMEMonit
final TreeMap<Integer, CachedItemStack> memory; final TreeMap<Integer, CachedItemStack> memory;
final IItemList<IAEItemStack> list = new ItemList(); final IItemList<IAEItemStack> list = new ItemList();
final HashMap<IMEMonitorHandlerReciever<IAEItemStack>, Object> listeners = new HashMap(); final HashMap<IMEMonitorHandlerReceiver<IAEItemStack>, Object> listeners = new HashMap();
public BaseActionSource mySource; public BaseActionSource mySource;
@Override @Override
public void addListener(IMEMonitorHandlerReciever<IAEItemStack> l, Object verificationToken) public void addListener(IMEMonitorHandlerReceiver<IAEItemStack> l, Object verificationToken)
{ {
listeners.put( l, verificationToken ); listeners.put( l, verificationToken );
} }
@Override @Override
public void removeListener(IMEMonitorHandlerReciever<IAEItemStack> l) public void removeListener(IMEMonitorHandlerReceiver<IAEItemStack> l)
{ {
listeners.remove( l ); listeners.remove( l );
} }
@@ -234,11 +234,11 @@ public class MEMonitorIInventory implements IMEInventory<IAEItemStack>, IMEMonit
// AELog.info( a.getItemStack().getUnlocalizedName() + " @ " + a.getStackSize() ); // AELog.info( a.getItemStack().getUnlocalizedName() + " @ " + a.getStackSize() );
if ( a != null ) if ( a != null )
{ {
Iterator<Entry<IMEMonitorHandlerReciever<IAEItemStack>, Object>> i = listeners.entrySet().iterator(); Iterator<Entry<IMEMonitorHandlerReceiver<IAEItemStack>, Object>> i = listeners.entrySet().iterator();
while (i.hasNext()) while (i.hasNext())
{ {
Entry<IMEMonitorHandlerReciever<IAEItemStack>, Object> l = i.next(); Entry<IMEMonitorHandlerReceiver<IAEItemStack>, Object> l = i.next();
IMEMonitorHandlerReciever<IAEItemStack> key = l.getKey(); IMEMonitorHandlerReceiver<IAEItemStack> key = l.getKey();
if ( key.isValid( l.getValue() ) ) if ( key.isValid( l.getValue() ) )
key.postChange( this, a, mySource ); key.postChange( this, a, mySource );
else else
me/storage/MEMonitorPassthu.java
+8 -8
View File
@@ -7,16 +7,16 @@ import java.util.Map.Entry;
import appeng.api.networking.security.BaseActionSource; import appeng.api.networking.security.BaseActionSource;
import appeng.api.storage.IMEInventory; import appeng.api.storage.IMEInventory;
import appeng.api.storage.IMEMonitor; import appeng.api.storage.IMEMonitor;
import appeng.api.storage.IMEMonitorHandlerReciever; import appeng.api.storage.IMEMonitorHandlerReceiver;
import appeng.api.storage.data.IAEStack; import appeng.api.storage.data.IAEStack;
import appeng.api.storage.data.IItemList; import appeng.api.storage.data.IItemList;
import appeng.util.Platform; import appeng.util.Platform;
import appeng.util.item.ItemList; import appeng.util.item.ItemList;
public class MEMonitorPassthu<T extends IAEStack<T>> extends MEPassthru<T> implements IMEMonitor<T>, IMEMonitorHandlerReciever<T> public class MEMonitorPassthu<T extends IAEStack<T>> extends MEPassthru<T> implements IMEMonitor<T>, IMEMonitorHandlerReceiver<T>
{ {
HashMap<IMEMonitorHandlerReciever<T>, Object> listeners = new HashMap(); HashMap<IMEMonitorHandlerReceiver<T>, Object> listeners = new HashMap();
IMEMonitor<T> monitor; IMEMonitor<T> monitor;
public BaseActionSource changeSource; public BaseActionSource changeSource;
@@ -49,13 +49,13 @@ public class MEMonitorPassthu<T extends IAEStack<T>> extends MEPassthru<T> imple
} }
@Override @Override
public void addListener(IMEMonitorHandlerReciever<T> l, Object verificationToken) public void addListener(IMEMonitorHandlerReceiver<T> l, Object verificationToken)
{ {
listeners.put( l, verificationToken ); listeners.put( l, verificationToken );
} }
@Override @Override
public void removeListener(IMEMonitorHandlerReciever<T> l) public void removeListener(IMEMonitorHandlerReceiver<T> l)
{ {
listeners.remove( l ); listeners.remove( l );
} }
@@ -77,11 +77,11 @@ public class MEMonitorPassthu<T extends IAEStack<T>> extends MEPassthru<T> imple
@Override @Override
public void postChange(IMEMonitor<T> monitor, T change, BaseActionSource source) public void postChange(IMEMonitor<T> monitor, T change, BaseActionSource source)
{ {
Iterator<Entry<IMEMonitorHandlerReciever<T>, Object>> i = listeners.entrySet().iterator(); Iterator<Entry<IMEMonitorHandlerReceiver<T>, Object>> i = listeners.entrySet().iterator();
while (i.hasNext()) while (i.hasNext())
{ {
Entry<IMEMonitorHandlerReciever<T>, Object> e = i.next(); Entry<IMEMonitorHandlerReceiver<T>, Object> e = i.next();
IMEMonitorHandlerReciever<T> recv = e.getKey(); IMEMonitorHandlerReceiver<T> recv = e.getKey();
if ( recv.isValid( e.getValue() ) ) if ( recv.isValid( e.getValue() ) )
recv.postChange( this, change, source ); recv.postChange( this, change, source );
else else
parts/automation/PartLevelEmitter.java
+2 -2
View File
@@ -27,7 +27,7 @@ import appeng.api.networking.storage.IStackWatcherHost;
import appeng.api.parts.IPartCollsionHelper; import appeng.api.parts.IPartCollsionHelper;
import appeng.api.parts.IPartRenderHelper; import appeng.api.parts.IPartRenderHelper;
import appeng.api.storage.IMEMonitor; import appeng.api.storage.IMEMonitor;
import appeng.api.storage.IMEMonitorHandlerReciever; import appeng.api.storage.IMEMonitorHandlerReceiver;
import appeng.api.storage.StorageChannel; import appeng.api.storage.StorageChannel;
import appeng.api.storage.data.IAEItemStack; import appeng.api.storage.data.IAEItemStack;
import appeng.api.storage.data.IAEStack; import appeng.api.storage.data.IAEStack;
@@ -42,7 +42,7 @@ import appeng.util.Platform;
import cpw.mods.fml.relauncher.Side; import cpw.mods.fml.relauncher.Side;
import cpw.mods.fml.relauncher.SideOnly; import cpw.mods.fml.relauncher.SideOnly;
public class PartLevelEmitter extends PartUpgradeable implements IStackWatcherHost, IMEMonitorHandlerReciever<IAEItemStack> public class PartLevelEmitter extends PartUpgradeable implements IStackWatcherHost, IMEMonitorHandlerReceiver<IAEItemStack>
{ {
final int FLAG_ON = 4; final int FLAG_ON = 4;
parts/misc/PartStorageBus.java
+2 -2
View File
@@ -34,7 +34,7 @@ import appeng.api.storage.IExternalStorageHandler;
import appeng.api.storage.IMEInventory; import appeng.api.storage.IMEInventory;
import appeng.api.storage.IMEInventoryHandler; import appeng.api.storage.IMEInventoryHandler;
import appeng.api.storage.IMEMonitor; import appeng.api.storage.IMEMonitor;
import appeng.api.storage.IMEMonitorHandlerReciever; import appeng.api.storage.IMEMonitorHandlerReceiver;
import appeng.api.storage.StorageChannel; import appeng.api.storage.StorageChannel;
import appeng.api.storage.data.IAEItemStack; import appeng.api.storage.data.IAEItemStack;
import appeng.api.storage.data.IItemList; import appeng.api.storage.data.IItemList;
@@ -59,7 +59,7 @@ import cpw.mods.fml.relauncher.Side;
import cpw.mods.fml.relauncher.SideOnly; import cpw.mods.fml.relauncher.SideOnly;
@Interface(modid = "BuildCraft|Transport", iface = "buildcraft.api.transport.IPipeConnection") @Interface(modid = "BuildCraft|Transport", iface = "buildcraft.api.transport.IPipeConnection")
public class PartStorageBus extends PartUpgradeable implements IGridTickable, ICellContainer, IMEMonitorHandlerReciever<IAEItemStack>, IPipeConnection, public class PartStorageBus extends PartUpgradeable implements IGridTickable, ICellContainer, IMEMonitorHandlerReceiver<IAEItemStack>, IPipeConnection,
IPriorityHost IPriorityHost
{ {
tile/storage/TileChest.java
+2 -2
View File
@@ -37,7 +37,7 @@ import appeng.api.storage.ICellHandler;
import appeng.api.storage.IMEInventory; import appeng.api.storage.IMEInventory;
import appeng.api.storage.IMEInventoryHandler; import appeng.api.storage.IMEInventoryHandler;
import appeng.api.storage.IMEMonitor; import appeng.api.storage.IMEMonitor;
import appeng.api.storage.IMEMonitorHandlerReciever; import appeng.api.storage.IMEMonitorHandlerReceiver;
import appeng.api.storage.IStorageMonitorable; import appeng.api.storage.IStorageMonitorable;
import appeng.api.storage.MEMonitorHandler; import appeng.api.storage.MEMonitorHandler;
import appeng.api.storage.StorageChannel; import appeng.api.storage.StorageChannel;
@@ -259,7 +259,7 @@ public class TileChest extends AENetworkPowerTile implements IMEChest, IFluidHan
return fcell; return fcell;
} }
class ChestNetNotifier<T extends IAEStack<T>> implements IMEMonitorHandlerReciever<T> class ChestNetNotifier<T extends IAEStack<T>> implements IMEMonitorHandlerReceiver<T>
{ {
final StorageChannel chan; final StorageChannel chan;
util/Platform.java
+2 -2
View File
@@ -63,7 +63,7 @@ import appeng.api.networking.security.BaseActionSource;
import appeng.api.networking.security.ISecurityGrid; import appeng.api.networking.security.ISecurityGrid;
import appeng.api.networking.storage.IStorageGrid; import appeng.api.networking.storage.IStorageGrid;
import appeng.api.storage.IMEInventory; import appeng.api.storage.IMEInventory;
import appeng.api.storage.IMEMonitorHandlerReciever; import appeng.api.storage.IMEMonitorHandlerReceiver;
import appeng.api.storage.StorageChannel; import appeng.api.storage.StorageChannel;
import appeng.api.storage.data.IAEFluidStack; import appeng.api.storage.data.IAEFluidStack;
import appeng.api.storage.data.IAEItemStack; import appeng.api.storage.data.IAEItemStack;
@@ -1333,7 +1333,7 @@ public class Platform
} }
} }
static public <T extends IAEStack<T>> void postListChanges(IItemList<T> before, IItemList<T> after, IMEMonitorHandlerReciever<T> meMonitorPassthu, static public <T extends IAEStack<T>> void postListChanges(IItemList<T> before, IItemList<T> after, IMEMonitorHandlerReceiver<T> meMonitorPassthu,
BaseActionSource source) BaseActionSource source)
{ {
for (T is : before) for (T is : before)