From 045adbd572a5dda910616cd636885f0b32fd0d22 Mon Sep 17 00:00:00 2001 From: Justin Aquadro Date: Wed, 12 Nov 2014 01:29:10 -0500 Subject: [PATCH] Formalized integration system; AE2 integration; Cleanup --- .gitmodules | 3 + StorageDrawers.iml | 25 ++- api/appeng/api | 1 + .../storagedrawers/StorageDrawers.java | 13 +- .../integration/AppliedEnergistics.java | 74 +++++++ .../integration/IntegrationModule.java | 12 ++ .../integration/IntegrationRegistry.java | 60 ++++++ .../Waila.java} | 20 +- .../ae2/DrawerExternalStorageHandler.java | 27 +-- .../integration/ae2/DrawerMEMonitor.java | 183 ------------------ .../ae2/IStorageBusMonitorFactory.java | 11 ++ .../integration/ae2/MEAdaptor.java | 70 ------- 12 files changed, 210 insertions(+), 289 deletions(-) create mode 100644 .gitmodules create mode 160000 api/appeng/api create mode 100644 src/com/jaquadro/minecraft/storagedrawers/integration/AppliedEnergistics.java create mode 100644 src/com/jaquadro/minecraft/storagedrawers/integration/IntegrationModule.java create mode 100644 src/com/jaquadro/minecraft/storagedrawers/integration/IntegrationRegistry.java rename src/com/jaquadro/minecraft/storagedrawers/{compat/WailaProvider.java => integration/Waila.java} (82%) delete mode 100644 src/com/jaquadro/minecraft/storagedrawers/integration/ae2/DrawerMEMonitor.java create mode 100644 src/com/jaquadro/minecraft/storagedrawers/integration/ae2/IStorageBusMonitorFactory.java delete mode 100644 src/com/jaquadro/minecraft/storagedrawers/integration/ae2/MEAdaptor.java diff --git a/.gitmodules b/.gitmodules new file mode 100644 index 0000000..615de57 --- /dev/null +++ b/.gitmodules @@ -0,0 +1,3 @@ +[submodule "api/appeng/api"] + path = api/appeng/api + url = https://github.com/AppliedEnergistics/Applied-Energistics-2-API.git diff --git a/StorageDrawers.iml b/StorageDrawers.iml index be787e7..d23af49 100644 --- a/StorageDrawers.iml +++ b/StorageDrawers.iml @@ -14,18 +14,18 @@ - + - + - + @@ -34,13 +34,22 @@ - + + + + + + + + + + - + - + @@ -200,7 +209,7 @@ - + @@ -649,7 +658,7 @@ - + diff --git a/api/appeng/api b/api/appeng/api new file mode 160000 index 0000000..0656cc6 --- /dev/null +++ b/api/appeng/api @@ -0,0 +1 @@ +Subproject commit 0656cc696ff1cd841dce89e0b5382ff56279dfae diff --git a/src/com/jaquadro/minecraft/storagedrawers/StorageDrawers.java b/src/com/jaquadro/minecraft/storagedrawers/StorageDrawers.java index 9552376..f1398dc 100644 --- a/src/com/jaquadro/minecraft/storagedrawers/StorageDrawers.java +++ b/src/com/jaquadro/minecraft/storagedrawers/StorageDrawers.java @@ -4,15 +4,14 @@ import com.jaquadro.minecraft.storagedrawers.config.CompTierRegistry; import com.jaquadro.minecraft.storagedrawers.config.ConfigManager; import com.jaquadro.minecraft.storagedrawers.config.OreDictRegistry; import com.jaquadro.minecraft.storagedrawers.core.*; +import com.jaquadro.minecraft.storagedrawers.integration.IntegrationRegistry; import com.jaquadro.minecraft.storagedrawers.network.BlockClickMessage; import com.jaquadro.minecraft.storagedrawers.network.CountUpdateMessage; import cpw.mods.fml.client.event.ConfigChangedEvent; import cpw.mods.fml.common.FMLCommonHandler; -import cpw.mods.fml.common.Loader; import cpw.mods.fml.common.Mod; import cpw.mods.fml.common.SidedProxy; import cpw.mods.fml.common.event.FMLInitializationEvent; -import cpw.mods.fml.common.event.FMLInterModComms; import cpw.mods.fml.common.event.FMLPostInitializationEvent; import cpw.mods.fml.common.event.FMLPreInitializationEvent; import cpw.mods.fml.common.eventhandler.SubscribeEvent; @@ -29,7 +28,7 @@ public class StorageDrawers public static final String MOD_ID = "StorageDrawers"; public static final String MOD_NAME = "Storage Drawers"; public static final String MOD_VERSION = "1.2.0"; - static final String SOURCE_PATH = "com.jaquadro.minecraft.storagedrawers."; + public static final String SOURCE_PATH = "com.jaquadro.minecraft.storagedrawers."; public static final ModBlocks blocks = new ModBlocks(); public static final ModItems items = new ModItems(); @@ -59,10 +58,6 @@ public class StorageDrawers blocks.init(); items.init(); - - if (Loader.isModLoaded("Waila")) { - FMLInterModComms.sendMessage("Waila", "register", SOURCE_PATH + "compat.WailaProvider.registerProvider"); - } } @Mod.EventHandler @@ -71,11 +66,15 @@ public class StorageDrawers FMLCommonHandler.instance().bus().register(instance); MinecraftForge.EVENT_BUS.register(new ForgeEventHandler()); + + IntegrationRegistry.instance().init(); } @Mod.EventHandler public void postInit (FMLPostInitializationEvent event) { recipes.init(); + + IntegrationRegistry.instance().postInit(); } @SubscribeEvent diff --git a/src/com/jaquadro/minecraft/storagedrawers/integration/AppliedEnergistics.java b/src/com/jaquadro/minecraft/storagedrawers/integration/AppliedEnergistics.java new file mode 100644 index 0000000..0e116bb --- /dev/null +++ b/src/com/jaquadro/minecraft/storagedrawers/integration/AppliedEnergistics.java @@ -0,0 +1,74 @@ +package com.jaquadro.minecraft.storagedrawers.integration; + +import appeng.api.AEApi; +import appeng.api.networking.security.BaseActionSource; +import appeng.api.storage.IMEInventory; +import appeng.api.storage.IMEMonitor; +import appeng.api.storage.data.IAEItemStack; +import com.jaquadro.minecraft.storagedrawers.integration.ae2.DrawerExternalStorageHandler; +import com.jaquadro.minecraft.storagedrawers.integration.ae2.IStorageBusMonitorFactory; + +import java.lang.reflect.Constructor; + +public class AppliedEnergistics extends IntegrationModule +{ + private static class ReflectionFactory implements IStorageBusMonitorFactory + { + private Class classInventoryAdaptor; + private Class classMEAdaptor; + private Class classMonitor; + + private Constructor constMEAdaptor; + private Constructor constMonitor; + + public boolean init () { + try { + classInventoryAdaptor = Class.forName("appeng.util.InventoryAdaptor"); + classMEAdaptor = Class.forName("appeng.util.inv.IMEAdaptor"); + classMonitor = Class.forName("appeng.me.storage.MEMonitorIInventory"); + + constMEAdaptor = classMEAdaptor.getConstructor(IMEInventory.class, BaseActionSource.class); + constMonitor = classMonitor.getConstructor(classInventoryAdaptor); + + return true; + } + catch (Throwable t) { + return false; + } + } + + @Override + public IMEMonitor createStorageBusMonitor (IMEInventory inventory, BaseActionSource src) { + try { + Object adaptor = constMEAdaptor.newInstance(inventory, src); + Object monitor = constMonitor.newInstance(adaptor); + + return (IMEMonitor) monitor; + } + catch (Throwable t) { + return null; + } + } + } + + private IStorageBusMonitorFactory factory; + + @Override + public String getModID () { + return "appliedenergistics2"; + } + + @Override + public void init () throws Throwable { + ReflectionFactory rfactory = new ReflectionFactory(); + if (!rfactory.init()) + throw new Exception("No valid Storage Bus Monitor factory"); + + factory = rfactory; + } + + @Override + public void postInit () { + AEApi.instance().registries().externalStorage().addExternalStorageInterface(new DrawerExternalStorageHandler(factory)); + } +} diff --git a/src/com/jaquadro/minecraft/storagedrawers/integration/IntegrationModule.java b/src/com/jaquadro/minecraft/storagedrawers/integration/IntegrationModule.java new file mode 100644 index 0000000..e9e173a --- /dev/null +++ b/src/com/jaquadro/minecraft/storagedrawers/integration/IntegrationModule.java @@ -0,0 +1,12 @@ +package com.jaquadro.minecraft.storagedrawers.integration; + +public abstract class IntegrationModule +{ + public String getModID () { + return null; + } + + public abstract void init () throws Throwable; + + public abstract void postInit (); +} diff --git a/src/com/jaquadro/minecraft/storagedrawers/integration/IntegrationRegistry.java b/src/com/jaquadro/minecraft/storagedrawers/integration/IntegrationRegistry.java new file mode 100644 index 0000000..2d19f09 --- /dev/null +++ b/src/com/jaquadro/minecraft/storagedrawers/integration/IntegrationRegistry.java @@ -0,0 +1,60 @@ +package com.jaquadro.minecraft.storagedrawers.integration; + +import com.jaquadro.minecraft.storagedrawers.StorageDrawers; +import cpw.mods.fml.common.FMLLog; +import cpw.mods.fml.common.Loader; +import org.apache.logging.log4j.Level; + +import java.util.ArrayList; +import java.util.List; + +public class IntegrationRegistry +{ + private static IntegrationRegistry instance; + + private List registry; + + static { + IntegrationRegistry reg = instance(); + reg.add(new AppliedEnergistics()); + reg.add(new Waila()); + } + + private IntegrationRegistry () { + registry = new ArrayList(); + } + + public static IntegrationRegistry instance () { + if (instance == null) + instance = new IntegrationRegistry(); + + return instance; + } + + public void add (IntegrationModule module) { + registry.add(module); + } + + public void init () { + for (int i = 0; i < registry.size(); i++) { + IntegrationModule module = registry.get(i); + if (module.getModID() != null && !Loader.isModLoaded(module.getModID())) { + registry.remove(i--); + continue; + } + + try { + module.init(); + } + catch (Throwable t) { + registry.remove(i--); + FMLLog.log(StorageDrawers.MOD_ID, Level.INFO, "Could not load integration module: " + module.getClass().getName()); + } + } + } + + public void postInit () { + for (IntegrationModule module : registry) + module.postInit(); + } +} diff --git a/src/com/jaquadro/minecraft/storagedrawers/compat/WailaProvider.java b/src/com/jaquadro/minecraft/storagedrawers/integration/Waila.java similarity index 82% rename from src/com/jaquadro/minecraft/storagedrawers/compat/WailaProvider.java rename to src/com/jaquadro/minecraft/storagedrawers/integration/Waila.java index 2babd35..9858173 100644 --- a/src/com/jaquadro/minecraft/storagedrawers/compat/WailaProvider.java +++ b/src/com/jaquadro/minecraft/storagedrawers/integration/Waila.java @@ -1,9 +1,11 @@ -package com.jaquadro.minecraft.storagedrawers.compat; +package com.jaquadro.minecraft.storagedrawers.integration; +import com.jaquadro.minecraft.storagedrawers.StorageDrawers; import com.jaquadro.minecraft.storagedrawers.api.storage.IDrawer; import com.jaquadro.minecraft.storagedrawers.block.BlockDrawers; import com.jaquadro.minecraft.storagedrawers.block.tile.TileEntityDrawers; import com.jaquadro.minecraft.storagedrawers.block.tile.TileEntityDrawersComp; +import cpw.mods.fml.common.event.FMLInterModComms; import mcp.mobius.waila.api.IWailaConfigHandler; import mcp.mobius.waila.api.IWailaDataAccessor; import mcp.mobius.waila.api.IWailaDataProvider; @@ -15,9 +17,23 @@ import java.util.List; /** * @author dmillerw + * @author jaquadro */ -public class WailaProvider +public class Waila extends IntegrationModule { + @Override + public String getModID () { + return "Waila"; + } + + @Override + public void init () throws Throwable { + FMLInterModComms.sendMessage("Waila", "register", StorageDrawers.SOURCE_PATH + "integration.Waila.registerProvider"); + } + + @Override + public void postInit () { } + public static void registerProvider(IWailaRegistrar registrar) { registrar.registerBodyProvider(new WailaDrawer(), BlockDrawers.class); } diff --git a/src/com/jaquadro/minecraft/storagedrawers/integration/ae2/DrawerExternalStorageHandler.java b/src/com/jaquadro/minecraft/storagedrawers/integration/ae2/DrawerExternalStorageHandler.java index 7be4c2d..a58755a 100644 --- a/src/com/jaquadro/minecraft/storagedrawers/integration/ae2/DrawerExternalStorageHandler.java +++ b/src/com/jaquadro/minecraft/storagedrawers/integration/ae2/DrawerExternalStorageHandler.java @@ -1,17 +1,21 @@ package com.jaquadro.minecraft.storagedrawers.integration.ae2; -import appeng.api.AEApi; 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; public class DrawerExternalStorageHandler implements IExternalStorageHandler { + private IStorageBusMonitorFactory sbmFactory; + + public DrawerExternalStorageHandler (IStorageBusMonitorFactory factory) { + sbmFactory = factory; + } + @Override public boolean canHandle (TileEntity te, ForgeDirection d, StorageChannel channel, BaseActionSource mySrc) { return channel == StorageChannel.ITEMS && te instanceof IDrawerGroup; @@ -19,23 +23,8 @@ 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 - - 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; - } + if (sbmFactory != null && channel == StorageChannel.ITEMS) + return sbmFactory.createStorageBusMonitor(new DrawerMEInventory((IDrawerGroup) te), src); return null; } diff --git a/src/com/jaquadro/minecraft/storagedrawers/integration/ae2/DrawerMEMonitor.java b/src/com/jaquadro/minecraft/storagedrawers/integration/ae2/DrawerMEMonitor.java deleted file mode 100644 index 21ddb37..0000000 --- a/src/com/jaquadro/minecraft/storagedrawers/integration/ae2/DrawerMEMonitor.java +++ /dev/null @@ -1,183 +0,0 @@ -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/IStorageBusMonitorFactory.java b/src/com/jaquadro/minecraft/storagedrawers/integration/ae2/IStorageBusMonitorFactory.java new file mode 100644 index 0000000..19214fd --- /dev/null +++ b/src/com/jaquadro/minecraft/storagedrawers/integration/ae2/IStorageBusMonitorFactory.java @@ -0,0 +1,11 @@ +package com.jaquadro.minecraft.storagedrawers.integration.ae2; + +import appeng.api.networking.security.BaseActionSource; +import appeng.api.storage.IMEInventory; +import appeng.api.storage.IMEMonitor; +import appeng.api.storage.data.IAEItemStack; + +public interface IStorageBusMonitorFactory +{ + public IMEMonitor createStorageBusMonitor (IMEInventory inventory, BaseActionSource src); +} diff --git a/src/com/jaquadro/minecraft/storagedrawers/integration/ae2/MEAdaptor.java b/src/com/jaquadro/minecraft/storagedrawers/integration/ae2/MEAdaptor.java deleted file mode 100644 index 44eca7a..0000000 --- a/src/com/jaquadro/minecraft/storagedrawers/integration/ae2/MEAdaptor.java +++ /dev/null @@ -1,70 +0,0 @@ -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; - } -}