From b4bd9f28a994f8df543c7a72714d6ba44d2dd01d Mon Sep 17 00:00:00 2001 From: Justin Aquadro Date: Tue, 11 Nov 2014 01:08:23 -0500 Subject: [PATCH] AE2 API turns out to be incomplete, need to reflect into an existing monitor rather than use my own. --- .../ae2/DrawerExternalStorageHandler.java | 19 +- .../integration/ae2/DrawerMEMonitor.java | 183 ++++++++++++++++++ .../integration/ae2/MEAdaptor.java | 70 +++++++ 3 files changed, 270 insertions(+), 2 deletions(-) create mode 100644 src/com/jaquadro/minecraft/storagedrawers/integration/ae2/DrawerMEMonitor.java create mode 100644 src/com/jaquadro/minecraft/storagedrawers/integration/ae2/MEAdaptor.java diff --git a/src/com/jaquadro/minecraft/storagedrawers/integration/ae2/DrawerExternalStorageHandler.java b/src/com/jaquadro/minecraft/storagedrawers/integration/ae2/DrawerExternalStorageHandler.java index 9c5d46d..7be4c2d 100644 --- a/src/com/jaquadro/minecraft/storagedrawers/integration/ae2/DrawerExternalStorageHandler.java +++ b/src/com/jaquadro/minecraft/storagedrawers/integration/ae2/DrawerExternalStorageHandler.java @@ -5,6 +5,7 @@ import appeng.api.networking.security.BaseActionSource; import appeng.api.storage.IExternalStorageHandler; import appeng.api.storage.IMEInventory; import appeng.api.storage.StorageChannel; +import appeng.api.storage.data.IAEItemStack; import com.jaquadro.minecraft.storagedrawers.api.storage.IDrawerGroup; import net.minecraft.tileentity.TileEntity; import net.minecraftforge.common.util.ForgeDirection; @@ -19,8 +20,22 @@ public class DrawerExternalStorageHandler implements IExternalStorageHandler @Override public IMEInventory getInventory (TileEntity te, ForgeDirection d, StorageChannel channel, BaseActionSource src) { // TODO: Needs to be MEMonitor; DSU implementation uses non-API - if (channel == StorageChannel.ITEMS) - return new DrawerMEInventory((IDrawerGroup)te); + + try { + Class adaptorClass = Class.forName("appeng.util.inv.IMEAdaptor"); + Object adaptor = adaptorClass.getConstructor(IMEInventory.class, BaseActionSource.class).newInstance(new DrawerMEInventory((IDrawerGroup) te), src); + + Class monitorClass = Class.forName("appeng.me.storage.MEMonitorIInventory"); + Class iadaptor = Class.forName("appeng.util.InventoryAdaptor"); + Object monitor = monitorClass.getConstructor(iadaptor).newInstance(adaptor); + + if (channel == StorageChannel.ITEMS) + return (IMEInventory) monitor; + //return new DrawerMonitorHandler(new MEAdaptor(new DrawerMEInventory((IDrawerGroup) te), src)); + } + catch (Throwable t) { + Throwable u = t; + } return null; } diff --git a/src/com/jaquadro/minecraft/storagedrawers/integration/ae2/DrawerMEMonitor.java b/src/com/jaquadro/minecraft/storagedrawers/integration/ae2/DrawerMEMonitor.java new file mode 100644 index 0000000..21ddb37 --- /dev/null +++ b/src/com/jaquadro/minecraft/storagedrawers/integration/ae2/DrawerMEMonitor.java @@ -0,0 +1,183 @@ +package com.jaquadro.minecraft.storagedrawers.integration.ae2; + +import appeng.api.config.AccessRestriction; +import appeng.api.config.Actionable; +import appeng.api.networking.security.BaseActionSource; +import appeng.api.storage.IMEInventoryHandler; +import appeng.api.storage.IMEMonitor; +import appeng.api.storage.IMEMonitorHandlerReceiver; +import appeng.api.storage.StorageChannel; +import appeng.api.storage.data.IAEItemStack; +import appeng.api.storage.data.IAEStack; +import appeng.api.storage.data.IItemList; +import com.google.common.collect.ImmutableList; +import net.minecraft.item.ItemStack; + +import java.util.HashMap; +import java.util.Iterator; +import java.util.Map; + +public class DrawerMEMonitor implements IMEMonitor +{ + private final MEAdaptor adaptor; + + //private final IMEInventoryHandler internalHandler; + private final IItemList cachedList; + private final HashMap, Object> listeners = new HashMap, Object>(); + + protected boolean hasChanged = true; + + /*protected IMEInventoryHandler getHandler() + { + return internalHandler; + }*/ + + protected Iterator, Object>> getListeners() + { + return listeners.entrySet().iterator(); + } + + protected void postChangesToListeners( Iterable changes, BaseActionSource src) + { + notifyListenersOfChange( changes, src ); + } + + protected void notifyListenersOfChange(Iterable diff, BaseActionSource src) + { + hasChanged = true;// need to update the cache. + Iterator, Object>> i = getListeners(); + while (i.hasNext()) + { + Map.Entry, Object> o = i.next(); + IMEMonitorHandlerReceiver recv = o.getKey(); + if ( recv.isValid( o.getValue() ) ) + recv.postChange( this, diff, src ); + else + i.remove(); + } + } + + private IAEItemStack monitorDiffrence(IAEStack original, IAEItemStack leftOvers, boolean extraction, BaseActionSource src) + { + IAEItemStack diff = (IAEItemStack) original.copy(); + + if ( extraction ) + diff.setStackSize( leftOvers == null ? 0 : -leftOvers.getStackSize() ); + else if ( leftOvers != null ) + diff.decStackSize( leftOvers.getStackSize() ); + + if ( diff.getStackSize() != 0 ) + postChangesToListeners( ImmutableList.of(diff), src ); + + return leftOvers; + } + + public DrawerMEMonitor (MEAdaptor adaptor) { + this.adaptor = adaptor; + cachedList = StorageChannel.ITEMS.createList(); + } + + /*public DrawerMonitorHandler(IMEInventoryHandler t) { + internalHandler = t; + cachedList = (IItemList) t.getChannel().createList(); + } + + public DrawerMonitorHandler(IMEInventoryHandler t, StorageChannel chan) { + internalHandler = t; + cachedList = (IItemList) chan.createList(); + }*/ + + @Override + public void addListener(IMEMonitorHandlerReceiver l, Object verificationToken) + { + listeners.put( l, verificationToken ); + } + + @Override + public void removeListener(IMEMonitorHandlerReceiver l) + { + listeners.remove( l ); + } + + @Override + public IAEItemStack injectItems(IAEItemStack input, Actionable mode, BaseActionSource src) + { + if (mode == Actionable.SIMULATE) + return adaptor.simulateAdd(input); + + return monitorDiffrence(input.copy(), adaptor.addItems(input), false, src); + } + + @Override + public IAEItemStack extractItems(IAEItemStack request, Actionable mode, BaseActionSource src) + { + if ( mode == Actionable.SIMULATE ) + return adaptor.simulateRemove(request); + + return monitorDiffrence(request.copy(), adaptor.removeItems(request), true, src); + } + + @Override + public IItemList getStorageList() + { + if ( hasChanged ) + { + hasChanged = false; + cachedList.resetStatus(); + return getAvailableItems( cachedList ); + } + + return cachedList; + } + + @Override + public IItemList getAvailableItems(IItemList out) + { + for (IAEItemStack item : adaptor.getList()) + out.add(item); + + return out; + } + + @Override + public StorageChannel getChannel() + { + return StorageChannel.ITEMS; + } + + @Override + public AccessRestriction getAccess() + { + return AccessRestriction.READ_WRITE; + } + + @Override + public boolean isPrioritized(IAEItemStack input) + { + return false; + } + + @Override + public boolean canAccept(IAEItemStack input) + { + return true; + } + + @Override + public int getPriority() + { + return 0; + } + + @Override + public int getSlot() + { + return 0; + } + + @Override + public boolean validForPass(int i) + { + return true; + } +} diff --git a/src/com/jaquadro/minecraft/storagedrawers/integration/ae2/MEAdaptor.java b/src/com/jaquadro/minecraft/storagedrawers/integration/ae2/MEAdaptor.java new file mode 100644 index 0000000..44eca7a --- /dev/null +++ b/src/com/jaquadro/minecraft/storagedrawers/integration/ae2/MEAdaptor.java @@ -0,0 +1,70 @@ +package com.jaquadro.minecraft.storagedrawers.integration.ae2; + +import appeng.api.AEApi; +import appeng.api.config.Actionable; +import appeng.api.networking.security.BaseActionSource; +import appeng.api.storage.IMEInventory; +import appeng.api.storage.data.IAEItemStack; +import appeng.api.storage.data.IItemList; +import net.minecraft.item.ItemStack; + +/** + * Created by Justin on 11/10/2014. + */ +public class MEAdaptor +{ + private final IMEInventory target; + private final BaseActionSource source; + int maxSlots = 0; + + public MEAdaptor (IMEInventory input, BaseActionSource src) { + target = input; + source = src; + } + + IItemList getList () { + return target.getAvailableItems(AEApi.instance().storage().createItemList()); + } + + // Iterator + + public IAEItemStack addItems (IAEItemStack stack) { + return addItems(stack, Actionable.MODULATE); + } + + public IAEItemStack simulateAdd (IAEItemStack stack) { + return addItems(stack, Actionable.SIMULATE); + } + + private IAEItemStack addItems (IAEItemStack in, Actionable actionType) { + if (in != null) { + IAEItemStack out = target.injectItems(in, actionType, source); + if (out != null) + return out; + } + + return null; + } + + public IAEItemStack removeItems (IAEItemStack req) { + return removeItems(req, Actionable.MODULATE); + } + + public IAEItemStack simulateRemove (IAEItemStack req) { + return removeItems(req, Actionable.SIMULATE); + } + + private IAEItemStack removeItems (IAEItemStack req, Actionable actionType) { + if (req == null) { + IItemList list = getList(); + if (!list.isEmpty()) + req = list.getFirstItem(); + } + + IAEItemStack out = null; + if (req != null) + out = target.extractItems(req, actionType, source); + + return out; + } +}