mirror of
https://github.com/GTNewHorizons/StorageDrawers.git
synced 2026-11-21 12:42:24 +00:00
Formalized integration system; AE2 integration; Cleanup
This commit is contained in:
1 parent
b4bd9f28a9
commit
045adbd572
12 files changed
+210
-289
No files matched your search
@@ -0,0 +1,3 @@
|
||||
[submodule "api/appeng/api"]
|
||||
path = api/appeng/api
|
||||
url = https://github.com/AppliedEnergistics/Applied-Energistics-2-API.git
|
||||
+17
-8
@@ -14,18 +14,18 @@
|
||||
<orderEntry type="module-library" exported="">
|
||||
<library>
|
||||
<CLASSES>
|
||||
<root url="jar://$USER_HOME$/.gradle/caches/minecraft/net/minecraftforge/forge/1.7.10-10.13.0.1208/forgeSrc-1.7.10-10.13.0.1208.jar!/" />
|
||||
<root url="jar://$USER_HOME$/.gradle/caches/minecraft/net/minecraftforge/forge/1.7.10-10.13.2.1232/forgeSrc-1.7.10-10.13.2.1232.jar!/" />
|
||||
</CLASSES>
|
||||
<JAVADOC />
|
||||
<SOURCES>
|
||||
<root url="jar://$USER_HOME$/.gradle/caches/minecraft/net/minecraftforge/forge/1.7.10-10.13.0.1208/forgeSrc-1.7.10-10.13.0.1208-sources.jar!/" />
|
||||
<root url="jar://$USER_HOME$/.gradle/caches/minecraft/net/minecraftforge/forge/1.7.10-10.13.2.1232/forgeSrc-1.7.10-10.13.2.1232-sources.jar!/" />
|
||||
</SOURCES>
|
||||
</library>
|
||||
</orderEntry>
|
||||
<orderEntry type="module-library" exported="">
|
||||
<library>
|
||||
<CLASSES>
|
||||
<root url="jar://$USER_HOME$/.gradle/caches/modules-2/files-2.1/net.minecraft/launchwrapper/1.9/116f2aad5b0c68353ebed66cd463517db6522f7e/launchwrapper-1.9.jar!/" />
|
||||
<root url="jar://$USER_HOME$/.gradle/caches/modules-2/files-2.1/net.minecraft/launchwrapper/1.11/9c0592c6e1e9ea296a70948081bd4cc84dda1289/launchwrapper-1.11.jar!/" />
|
||||
</CLASSES>
|
||||
<JAVADOC />
|
||||
<SOURCES />
|
||||
@@ -34,13 +34,22 @@
|
||||
<orderEntry type="module-library" exported="">
|
||||
<library>
|
||||
<CLASSES>
|
||||
<root url="jar://$USER_HOME$/.gradle/caches/modules-2/files-2.1/org.ow2.asm/asm-debug-all/4.1/dd6ba5c392d4102458494e29f54f70ac534ec2a2/asm-debug-all-4.1.jar!/" />
|
||||
<root url="jar://$USER_HOME$/.gradle/caches/modules-2/files-2.1/com.google.code.findbugs/jsr305/1.3.9/40719ea6961c0cb6afaeb6a921eaa1f6afd4cfdf/jsr305-1.3.9.jar!/" />
|
||||
</CLASSES>
|
||||
<JAVADOC />
|
||||
<SOURCES />
|
||||
</library>
|
||||
</orderEntry>
|
||||
<orderEntry type="module-library" exported="">
|
||||
<library>
|
||||
<CLASSES>
|
||||
<root url="jar://$USER_HOME$/.gradle/caches/modules-2/files-2.1/org.ow2.asm/asm-debug-all/5.0.3/f9e364ae2a66ce2a543012a4668856e84e5dab74/asm-debug-all-5.0.3.jar!/" />
|
||||
</CLASSES>
|
||||
<JAVADOC>
|
||||
<root url="jar://$USER_HOME$/.gradle/caches/modules-2/files-2.1/org.ow2.asm/asm-debug-all/4.1/7fb1108a191ea7b62b03225ced300ca8832dbe7a/asm-debug-all-4.1-javadoc.jar!/" />
|
||||
<root url="jar://$USER_HOME$/.gradle/caches/modules-2/files-2.1/org.ow2.asm/asm-debug-all/5.0.3/c87547fa477f7dc22c5e3c5ddfc6dfac726e5b15/asm-debug-all-5.0.3-javadoc.jar!/" />
|
||||
</JAVADOC>
|
||||
<SOURCES>
|
||||
<root url="jar://$USER_HOME$/.gradle/caches/modules-2/files-2.1/org.ow2.asm/asm-debug-all/4.1/1c218d5a0b8b932a1528b74069aa6973dcfcea74/asm-debug-all-4.1-sources.jar!/" />
|
||||
<root url="jar://$USER_HOME$/.gradle/caches/modules-2/files-2.1/org.ow2.asm/asm-debug-all/5.0.3/f0f24f6666c1a15c7e202e91610476bd4ce59368/asm-debug-all-5.0.3-sources.jar!/" />
|
||||
</SOURCES>
|
||||
</library>
|
||||
</orderEntry>
|
||||
@@ -200,7 +209,7 @@
|
||||
<orderEntry type="module-library" exported="">
|
||||
<library>
|
||||
<CLASSES>
|
||||
<root url="jar://$USER_HOME$/.gradle/caches/modules-2/files-2.1/com.mojang/realms/1.3.1/f78f5a841b1cf9d50c3382acdbeb7d3078e454d6/realms-1.3.1.jar!/" />
|
||||
<root url="jar://$USER_HOME$/.gradle/caches/modules-2/files-2.1/com.mojang/realms/1.3.5/807ae355ee63583becd7ea60e76aab1532bb42e/realms-1.3.5.jar!/" />
|
||||
</CLASSES>
|
||||
<JAVADOC />
|
||||
<SOURCES />
|
||||
@@ -649,7 +658,7 @@
|
||||
<orderEntry type="module-library" exported="" scope="RUNTIME">
|
||||
<library>
|
||||
<CLASSES>
|
||||
<root url="file://$USER_HOME$/.gradle/caches/minecraft/net/minecraftforge/forge/1.7.10-10.13.0.1208/start" />
|
||||
<root url="file://$USER_HOME$/.gradle/caches/minecraft/net/minecraftforge/forge/1.7.10-10.13.2.1232/start" />
|
||||
</CLASSES>
|
||||
<JAVADOC />
|
||||
<SOURCES />
|
||||
|
||||
Submodule
+1
Submodule api/appeng/api added at 0656cc696f.
@@ -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
|
||||
|
||||
@@ -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<IAEItemStack> createStorageBusMonitor (IMEInventory<IAEItemStack> inventory, BaseActionSource src) {
|
||||
try {
|
||||
Object adaptor = constMEAdaptor.newInstance(inventory, src);
|
||||
Object monitor = constMonitor.newInstance(adaptor);
|
||||
|
||||
return (IMEMonitor<IAEItemStack>) 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));
|
||||
}
|
||||
}
|
||||
@@ -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 ();
|
||||
}
|
||||
@@ -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<IntegrationModule> registry;
|
||||
|
||||
static {
|
||||
IntegrationRegistry reg = instance();
|
||||
reg.add(new AppliedEnergistics());
|
||||
reg.add(new Waila());
|
||||
}
|
||||
|
||||
private IntegrationRegistry () {
|
||||
registry = new ArrayList<IntegrationModule>();
|
||||
}
|
||||
|
||||
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();
|
||||
}
|
||||
}
|
||||
+18
-2
@@ -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);
|
||||
}
|
||||
+8
-19
@@ -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;
|
||||
}
|
||||
|
||||
@@ -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<IAEItemStack>
|
||||
{
|
||||
private final MEAdaptor adaptor;
|
||||
|
||||
//private final IMEInventoryHandler<StackType> internalHandler;
|
||||
private final IItemList<IAEItemStack> cachedList;
|
||||
private final HashMap<IMEMonitorHandlerReceiver<IAEItemStack>, Object> listeners = new HashMap<IMEMonitorHandlerReceiver<IAEItemStack>, Object>();
|
||||
|
||||
protected boolean hasChanged = true;
|
||||
|
||||
/*protected IMEInventoryHandler<StackType> getHandler()
|
||||
{
|
||||
return internalHandler;
|
||||
}*/
|
||||
|
||||
protected Iterator<Map.Entry<IMEMonitorHandlerReceiver<IAEItemStack>, Object>> getListeners()
|
||||
{
|
||||
return listeners.entrySet().iterator();
|
||||
}
|
||||
|
||||
protected void postChangesToListeners( Iterable<IAEItemStack> changes, BaseActionSource src)
|
||||
{
|
||||
notifyListenersOfChange( changes, src );
|
||||
}
|
||||
|
||||
protected void notifyListenersOfChange(Iterable<IAEItemStack> diff, BaseActionSource src)
|
||||
{
|
||||
hasChanged = true;// need to update the cache.
|
||||
Iterator<Map.Entry<IMEMonitorHandlerReceiver<IAEItemStack>, Object>> i = getListeners();
|
||||
while (i.hasNext())
|
||||
{
|
||||
Map.Entry<IMEMonitorHandlerReceiver<IAEItemStack>, Object> o = i.next();
|
||||
IMEMonitorHandlerReceiver<IAEItemStack> 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<StackType> t) {
|
||||
internalHandler = t;
|
||||
cachedList = (IItemList<StackType>) t.getChannel().createList();
|
||||
}
|
||||
|
||||
public DrawerMonitorHandler(IMEInventoryHandler<StackType> t, StorageChannel chan) {
|
||||
internalHandler = t;
|
||||
cachedList = (IItemList<StackType>) chan.createList();
|
||||
}*/
|
||||
|
||||
@Override
|
||||
public void addListener(IMEMonitorHandlerReceiver<IAEItemStack> l, Object verificationToken)
|
||||
{
|
||||
listeners.put( l, verificationToken );
|
||||
}
|
||||
|
||||
@Override
|
||||
public void removeListener(IMEMonitorHandlerReceiver<IAEItemStack> 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<IAEItemStack> getStorageList()
|
||||
{
|
||||
if ( hasChanged )
|
||||
{
|
||||
hasChanged = false;
|
||||
cachedList.resetStatus();
|
||||
return getAvailableItems( cachedList );
|
||||
}
|
||||
|
||||
return cachedList;
|
||||
}
|
||||
|
||||
@Override
|
||||
public IItemList<IAEItemStack> 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;
|
||||
}
|
||||
}
|
||||
+11
@@ -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<IAEItemStack> createStorageBusMonitor (IMEInventory<IAEItemStack> inventory, BaseActionSource src);
|
||||
}
|
||||
@@ -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<IAEItemStack> target;
|
||||
private final BaseActionSource source;
|
||||
int maxSlots = 0;
|
||||
|
||||
public MEAdaptor (IMEInventory<IAEItemStack> input, BaseActionSource src) {
|
||||
target = input;
|
||||
source = src;
|
||||
}
|
||||
|
||||
IItemList<IAEItemStack> 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<IAEItemStack> list = getList();
|
||||
if (!list.isEmpty())
|
||||
req = list.getFirstItem();
|
||||
}
|
||||
|
||||
IAEItemStack out = null;
|
||||
if (req != null)
|
||||
out = target.extractItems(req, actionType, source);
|
||||
|
||||
return out;
|
||||
}
|
||||
}
|
||||
Reference in new issue
Block a user