Typos eeeek
This commit is contained in:
parent
47f4946279
commit
0acbefbfaa
7 changed files with 30 additions and 30 deletions
|
@ -15,7 +15,7 @@ import appeng.api.networking.IGridHost;
|
||||||
import appeng.api.networking.IGridNode;
|
import appeng.api.networking.IGridNode;
|
||||||
import appeng.api.networking.energy.IEnergyGrid;
|
import appeng.api.networking.energy.IEnergyGrid;
|
||||||
import appeng.api.storage.IMEMonitor;
|
import appeng.api.storage.IMEMonitor;
|
||||||
import appeng.api.storage.IMEMontorHandlerReciever;
|
import appeng.api.storage.IMEMonitorHandlerReciever;
|
||||||
import appeng.api.storage.data.IAEItemStack;
|
import appeng.api.storage.data.IAEItemStack;
|
||||||
import appeng.api.storage.data.IItemList;
|
import appeng.api.storage.data.IItemList;
|
||||||
import appeng.container.AEBaseContainer;
|
import appeng.container.AEBaseContainer;
|
||||||
|
@ -25,7 +25,7 @@ import appeng.util.item.ItemList;
|
||||||
import cpw.mods.fml.common.network.PacketDispatcher;
|
import cpw.mods.fml.common.network.PacketDispatcher;
|
||||||
import cpw.mods.fml.common.network.Player;
|
import cpw.mods.fml.common.network.Player;
|
||||||
|
|
||||||
public class ContainerMEMonitorable extends AEBaseContainer implements IMEMontorHandlerReciever<IAEItemStack>
|
public class ContainerMEMonitorable extends AEBaseContainer implements IMEMonitorHandlerReciever<IAEItemStack>
|
||||||
{
|
{
|
||||||
|
|
||||||
final IMEMonitor<IAEItemStack> monitor;
|
final IMEMonitor<IAEItemStack> monitor;
|
||||||
|
|
4
me/cache/NetworkMonitor.java
vendored
4
me/cache/NetworkMonitor.java
vendored
|
@ -4,11 +4,11 @@ import java.util.LinkedList;
|
||||||
|
|
||||||
import appeng.api.networking.events.MENetworkStorageEvent;
|
import appeng.api.networking.events.MENetworkStorageEvent;
|
||||||
import appeng.api.storage.IMEInventoryHandler;
|
import appeng.api.storage.IMEInventoryHandler;
|
||||||
import appeng.api.storage.MEMontorHandler;
|
import appeng.api.storage.MEMonitorHandler;
|
||||||
import appeng.api.storage.StorageChannel;
|
import appeng.api.storage.StorageChannel;
|
||||||
import appeng.api.storage.data.IAEStack;
|
import appeng.api.storage.data.IAEStack;
|
||||||
|
|
||||||
public class NetworkMonitor<T extends IAEStack<T>> extends MEMontorHandler<T>
|
public class NetworkMonitor<T extends IAEStack<T>> extends MEMonitorHandler<T>
|
||||||
{
|
{
|
||||||
|
|
||||||
final private GridStorageCache myGridCache;
|
final private GridStorageCache myGridCache;
|
||||||
|
|
|
@ -14,7 +14,7 @@ import appeng.api.config.Actionable;
|
||||||
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.IMEMontorHandlerReciever;
|
import appeng.api.storage.IMEMonitorHandlerReciever;
|
||||||
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,16 +54,16 @@ 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<IMEMontorHandlerReciever<IAEItemStack>, Object> listeners = new HashMap();
|
final HashMap<IMEMonitorHandlerReciever<IAEItemStack>, Object> listeners = new HashMap();
|
||||||
|
|
||||||
@Override
|
@Override
|
||||||
public void addListener(IMEMontorHandlerReciever<IAEItemStack> l, Object verificationToken)
|
public void addListener(IMEMonitorHandlerReciever<IAEItemStack> l, Object verificationToken)
|
||||||
{
|
{
|
||||||
listeners.put( l, verificationToken );
|
listeners.put( l, verificationToken );
|
||||||
}
|
}
|
||||||
|
|
||||||
@Override
|
@Override
|
||||||
public void removeListener(IMEMontorHandlerReciever<IAEItemStack> l)
|
public void removeListener(IMEMonitorHandlerReciever<IAEItemStack> l)
|
||||||
{
|
{
|
||||||
listeners.remove( l );
|
listeners.remove( l );
|
||||||
}
|
}
|
||||||
|
@ -235,11 +235,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<IMEMontorHandlerReciever<IAEItemStack>, Object>> i = listeners.entrySet().iterator();
|
Iterator<Entry<IMEMonitorHandlerReciever<IAEItemStack>, Object>> i = listeners.entrySet().iterator();
|
||||||
while (i.hasNext())
|
while (i.hasNext())
|
||||||
{
|
{
|
||||||
Entry<IMEMontorHandlerReciever<IAEItemStack>, Object> l = i.next();
|
Entry<IMEMonitorHandlerReciever<IAEItemStack>, Object> l = i.next();
|
||||||
IMEMontorHandlerReciever<IAEItemStack> key = l.getKey();
|
IMEMonitorHandlerReciever<IAEItemStack> key = l.getKey();
|
||||||
if ( key.isValid( l.getValue() ) )
|
if ( key.isValid( l.getValue() ) )
|
||||||
key.postChange( a );
|
key.postChange( a );
|
||||||
else
|
else
|
||||||
|
|
|
@ -6,16 +6,16 @@ import java.util.Map.Entry;
|
||||||
|
|
||||||
import appeng.api.storage.IMEInventory;
|
import appeng.api.storage.IMEInventory;
|
||||||
import appeng.api.storage.IMEMonitor;
|
import appeng.api.storage.IMEMonitor;
|
||||||
import appeng.api.storage.IMEMontorHandlerReciever;
|
import appeng.api.storage.IMEMonitorHandlerReciever;
|
||||||
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>, IMEMontorHandlerReciever<T>
|
public class MEMonitorPassthu<T extends IAEStack<T>> extends MEPassthru<T> implements IMEMonitor<T>, IMEMonitorHandlerReciever<T>
|
||||||
{
|
{
|
||||||
|
|
||||||
HashMap<IMEMontorHandlerReciever<T>, Object> listeners = new HashMap();
|
HashMap<IMEMonitorHandlerReciever<T>, Object> listeners = new HashMap();
|
||||||
IMEMonitor<T> monitor;
|
IMEMonitor<T> monitor;
|
||||||
|
|
||||||
public MEMonitorPassthu(IMEInventory<T> i) {
|
public MEMonitorPassthu(IMEInventory<T> i) {
|
||||||
|
@ -46,13 +46,13 @@ public class MEMonitorPassthu<T extends IAEStack<T>> extends MEPassthru<T> imple
|
||||||
}
|
}
|
||||||
|
|
||||||
@Override
|
@Override
|
||||||
public void addListener(IMEMontorHandlerReciever<T> l, Object verificationToken)
|
public void addListener(IMEMonitorHandlerReciever<T> l, Object verificationToken)
|
||||||
{
|
{
|
||||||
listeners.put( l, verificationToken );
|
listeners.put( l, verificationToken );
|
||||||
}
|
}
|
||||||
|
|
||||||
@Override
|
@Override
|
||||||
public void removeListener(IMEMontorHandlerReciever<T> l)
|
public void removeListener(IMEMonitorHandlerReciever<T> l)
|
||||||
{
|
{
|
||||||
listeners.remove( l );
|
listeners.remove( l );
|
||||||
}
|
}
|
||||||
|
@ -74,11 +74,11 @@ public class MEMonitorPassthu<T extends IAEStack<T>> extends MEPassthru<T> imple
|
||||||
@Override
|
@Override
|
||||||
public void postChange(T change)
|
public void postChange(T change)
|
||||||
{
|
{
|
||||||
Iterator<Entry<IMEMontorHandlerReciever<T>, Object>> i = listeners.entrySet().iterator();
|
Iterator<Entry<IMEMonitorHandlerReciever<T>, Object>> i = listeners.entrySet().iterator();
|
||||||
while (i.hasNext())
|
while (i.hasNext())
|
||||||
{
|
{
|
||||||
Entry<IMEMontorHandlerReciever<T>, Object> e = i.next();
|
Entry<IMEMonitorHandlerReciever<T>, Object> e = i.next();
|
||||||
IMEMontorHandlerReciever<T> recv = e.getKey();
|
IMEMonitorHandlerReciever<T> recv = e.getKey();
|
||||||
if ( recv.isValid( e.getValue() ) )
|
if ( recv.isValid( e.getValue() ) )
|
||||||
recv.postChange( change );
|
recv.postChange( change );
|
||||||
else
|
else
|
||||||
|
|
|
@ -22,7 +22,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.IMEMontorHandlerReciever;
|
import appeng.api.storage.IMEMonitorHandlerReciever;
|
||||||
import appeng.api.storage.StorageChannel;
|
import appeng.api.storage.StorageChannel;
|
||||||
import appeng.api.storage.data.IAEItemStack;
|
import appeng.api.storage.data.IAEItemStack;
|
||||||
import appeng.client.texture.CableBusTextures;
|
import appeng.client.texture.CableBusTextures;
|
||||||
|
@ -37,7 +37,7 @@ import cpw.mods.fml.common.Optional.Interface;
|
||||||
import cpw.mods.fml.common.Optional.Method;
|
import cpw.mods.fml.common.Optional.Method;
|
||||||
|
|
||||||
@Interface(modid = "BuildCraft|Transport", iface = "buildcraft.api.transport.IPipeConnection")
|
@Interface(modid = "BuildCraft|Transport", iface = "buildcraft.api.transport.IPipeConnection")
|
||||||
public class PartStorageBus extends PartBasicState implements IGridTickable, ICellContainer, IMEMontorHandlerReciever<IAEItemStack>, IPipeConnection
|
public class PartStorageBus extends PartBasicState implements IGridTickable, ICellContainer, IMEMonitorHandlerReciever<IAEItemStack>, IPipeConnection
|
||||||
{
|
{
|
||||||
|
|
||||||
int priority = 0;
|
int priority = 0;
|
||||||
|
|
|
@ -34,8 +34,8 @@ 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.IMEMontorHandlerReciever;
|
import appeng.api.storage.IMEMonitorHandlerReciever;
|
||||||
import appeng.api.storage.MEMontorHandler;
|
import appeng.api.storage.MEMonitorHandler;
|
||||||
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;
|
||||||
|
@ -224,8 +224,8 @@ public class TileChest extends AENetworkPowerTile implements IMEChest, IFluidHan
|
||||||
boolean isCached = false;
|
boolean isCached = false;
|
||||||
|
|
||||||
private ICellHandler cellHandler;
|
private ICellHandler cellHandler;
|
||||||
private MEMontorHandler icell;
|
private MEMonitorHandler icell;
|
||||||
private MEMontorHandler fcell;
|
private MEMonitorHandler fcell;
|
||||||
|
|
||||||
@Override
|
@Override
|
||||||
public IMEMonitor getItemInventory()
|
public IMEMonitor getItemInventory()
|
||||||
|
@ -239,7 +239,7 @@ public class TileChest extends AENetworkPowerTile implements IMEChest, IFluidHan
|
||||||
return fcell;
|
return fcell;
|
||||||
}
|
}
|
||||||
|
|
||||||
class ChestNetNotifier<T extends IAEStack<T>> implements IMEMontorHandlerReciever<T>
|
class ChestNetNotifier<T extends IAEStack<T>> implements IMEMonitorHandlerReciever<T>
|
||||||
{
|
{
|
||||||
|
|
||||||
final StorageChannel chan;
|
final StorageChannel chan;
|
||||||
|
@ -273,7 +273,7 @@ public class TileChest extends AENetworkPowerTile implements IMEChest, IFluidHan
|
||||||
|
|
||||||
};
|
};
|
||||||
|
|
||||||
private <StackType extends IAEStack> MEMontorHandler<StackType> wrap(IMEInventoryHandler h)
|
private <StackType extends IAEStack> MEMonitorHandler<StackType> wrap(IMEInventoryHandler h)
|
||||||
{
|
{
|
||||||
if ( h == null )
|
if ( h == null )
|
||||||
return null;
|
return null;
|
||||||
|
@ -281,7 +281,7 @@ public class TileChest extends AENetworkPowerTile implements IMEChest, IFluidHan
|
||||||
MEInventoryHandler ih = new MEInventoryHandler( h );
|
MEInventoryHandler ih = new MEInventoryHandler( h );
|
||||||
ih.myPriority = priority;
|
ih.myPriority = priority;
|
||||||
|
|
||||||
MEMontorHandler<StackType> g = new MEMontorHandler<StackType>( ih );
|
MEMonitorHandler<StackType> g = new MEMonitorHandler<StackType>( ih );
|
||||||
g.addListener( new ChestNetNotifier( h.getChannel() ), g );
|
g.addListener( new ChestNetNotifier( h.getChannel() ), g );
|
||||||
|
|
||||||
return g;
|
return g;
|
||||||
|
|
|
@ -52,7 +52,7 @@ import appeng.api.implementations.IAEWrench;
|
||||||
import appeng.api.networking.energy.IEnergySource;
|
import appeng.api.networking.energy.IEnergySource;
|
||||||
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.IMEMontorHandlerReciever;
|
import appeng.api.storage.IMEMonitorHandlerReciever;
|
||||||
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;
|
||||||
|
@ -1231,7 +1231,7 @@ public class Platform
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
static public <T extends IAEStack<T>> void postListChanges(IItemList<T> before, IItemList<T> after, IMEMontorHandlerReciever<T> meMonitorPassthu)
|
static public <T extends IAEStack<T>> void postListChanges(IItemList<T> before, IItemList<T> after, IMEMonitorHandlerReciever<T> meMonitorPassthu)
|
||||||
{
|
{
|
||||||
for (T is : before)
|
for (T is : before)
|
||||||
is.setStackSize( -is.getStackSize() );
|
is.setStackSize( -is.getStackSize() );
|
||||||
|
|
Loading…
Reference in a new issue