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

API Sync, IBaseMonitor

Browse Source
This commit is contained in:
AlgorithmX2
2014-06-27 00:44:56 -05:00
parent d47bc43af5
commit 115c3e597a
5 changed files with 11 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files
container/implementations/ContainerMEMonitorable.java
+2 -1
View File
@@ -27,6 +27,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.networking.security.BaseActionSource; import appeng.api.networking.security.BaseActionSource;
import appeng.api.networking.storage.IBaseMonitor;
import appeng.api.parts.IPart; import appeng.api.parts.IPart;
import appeng.api.storage.IMEMonitor; import appeng.api.storage.IMEMonitor;
import appeng.api.storage.IMEMonitorHandlerReceiver; import appeng.api.storage.IMEMonitorHandlerReceiver;
@@ -318,7 +319,7 @@ public class ContainerMEMonitorable extends AEBaseContainer implements IConfigMa
} }
@Override @Override
public void postChange(IMEMonitor<IAEItemStack> monitor, IAEItemStack change, BaseActionSource source) public void postChange(IBaseMonitor<IAEItemStack> monitor, IAEItemStack change, BaseActionSource source)
{ {
items.add( change ); items.add( change );
} }
me/storage/MEMonitorPassthu.java
+2 -1
View File
@@ -5,6 +5,7 @@ import java.util.Iterator;
import java.util.Map.Entry; import java.util.Map.Entry;
import appeng.api.networking.security.BaseActionSource; import appeng.api.networking.security.BaseActionSource;
import appeng.api.networking.storage.IBaseMonitor;
import appeng.api.storage.IMEInventory; import appeng.api.storage.IMEInventory;
import appeng.api.storage.IMEMonitor; import appeng.api.storage.IMEMonitor;
import appeng.api.storage.IMEMonitorHandlerReceiver; import appeng.api.storage.IMEMonitorHandlerReceiver;
@@ -75,7 +76,7 @@ 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(IBaseMonitor<T> monitor, T change, BaseActionSource source)
{ {
Iterator<Entry<IMEMonitorHandlerReceiver<T>, Object>> i = listeners.entrySet().iterator(); Iterator<Entry<IMEMonitorHandlerReceiver<T>, Object>> i = listeners.entrySet().iterator();
while (i.hasNext()) while (i.hasNext())
parts/automation/PartLevelEmitter.java
+3 -2
View File
@@ -26,6 +26,7 @@ import appeng.api.networking.events.MENetworkChannelsChanged;
import appeng.api.networking.events.MENetworkEventSubscribe; import appeng.api.networking.events.MENetworkEventSubscribe;
import appeng.api.networking.events.MENetworkPowerStatusChange; import appeng.api.networking.events.MENetworkPowerStatusChange;
import appeng.api.networking.security.BaseActionSource; import appeng.api.networking.security.BaseActionSource;
import appeng.api.networking.storage.IBaseMonitor;
import appeng.api.networking.storage.IStackWatcher; import appeng.api.networking.storage.IStackWatcher;
import appeng.api.networking.storage.IStackWatcherHost; import appeng.api.networking.storage.IStackWatcherHost;
import appeng.api.parts.IPartCollsionHelper; import appeng.api.parts.IPartCollsionHelper;
@@ -214,9 +215,9 @@ public class PartLevelEmitter extends PartUpgradeable implements IEnergyWatcherH
} }
@Override @Override
public void postChange(IMEMonitor<IAEItemStack> monitor, IAEItemStack change, BaseActionSource actionSource) public void postChange(IBaseMonitor<IAEItemStack> monitor, IAEItemStack change, BaseActionSource actionSource)
{ {
updateReportingValue( monitor ); updateReportingValue( (IMEMonitor<IAEItemStack>) monitor );
} }
@Override @Override
parts/misc/PartStorageBus.java
+2 -1
View File
@@ -24,6 +24,7 @@ import appeng.api.networking.events.MENetworkEventSubscribe;
import appeng.api.networking.events.MENetworkPowerStatusChange; import appeng.api.networking.events.MENetworkPowerStatusChange;
import appeng.api.networking.security.BaseActionSource; import appeng.api.networking.security.BaseActionSource;
import appeng.api.networking.security.MachineSource; import appeng.api.networking.security.MachineSource;
import appeng.api.networking.storage.IBaseMonitor;
import appeng.api.networking.ticking.IGridTickable; import appeng.api.networking.ticking.IGridTickable;
import appeng.api.networking.ticking.ITickManager; import appeng.api.networking.ticking.ITickManager;
import appeng.api.networking.ticking.TickRateModulation; import appeng.api.networking.ticking.TickRateModulation;
@@ -416,7 +417,7 @@ public class PartStorageBus extends PartUpgradeable implements IGridTickable, IC
} }
@Override @Override
public void postChange(IMEMonitor<IAEItemStack> monitor, IAEItemStack change, BaseActionSource source) public void postChange(IBaseMonitor<IAEItemStack> monitor, IAEItemStack change, BaseActionSource source)
{ {
try try
{ {
tile/storage/TileChest.java
+2 -1
View File
@@ -37,6 +37,7 @@ import appeng.api.networking.events.MENetworkPowerStorage.PowerEventType;
import appeng.api.networking.security.BaseActionSource; import appeng.api.networking.security.BaseActionSource;
import appeng.api.networking.security.MachineSource; import appeng.api.networking.security.MachineSource;
import appeng.api.networking.security.PlayerSource; import appeng.api.networking.security.PlayerSource;
import appeng.api.networking.storage.IBaseMonitor;
import appeng.api.networking.storage.IStorageGrid; import appeng.api.networking.storage.IStorageGrid;
import appeng.api.storage.ICellHandler; import appeng.api.storage.ICellHandler;
import appeng.api.storage.IMEInventory; import appeng.api.storage.IMEInventory;
@@ -292,7 +293,7 @@ public class TileChest extends AENetworkPowerTile implements IMEChest, IFluidHan
} }
@Override @Override
public void postChange(IMEMonitor<T> monitor, T change, BaseActionSource source) public void postChange(IBaseMonitor<T> monitor, T change, BaseActionSource source)
{ {
if ( source == mySrc || (source instanceof PlayerSource && ((PlayerSource) source).via == TileChest.this) ) if ( source == mySrc || (source instanceof PlayerSource && ((PlayerSource) source).via == TileChest.this) )
{ {