Refactor inventory

src/main/java/org/spongepowered/mod/item/inventory/adapter/IItemHandlerAdapter.java

@@ -0,0 +1,38 @@
+/*
+ * This file is part of Sponge, licensed under the MIT License (MIT).
+ *
+ * Copyright (c) SpongePowered <https://www.spongepowered.org>
+ * Copyright (c) contributors
+ *
+ * Permission is hereby granted, free of charge, to any person obtaining a copy
+ * of this software and associated documentation files (the "Software"), to deal
+ * in the Software without restriction, including without limitation the rights
+ * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+ * copies of the Software, and to permit persons to whom the Software is
+ * furnished to do so, subject to the following conditions:
+ *
+ * The above copyright notice and this permission notice shall be included in
+ * all copies or substantial portions of the Software.
+ *
+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+ * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+ * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+ * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+ * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
+ * THE SOFTWARE.
+ */
+package org.spongepowered.mod.item.inventory.adapter;
+
+import net.minecraftforge.items.IItemHandler;
+import org.spongepowered.common.item.inventory.adapter.impl.AbstractInventoryAdapter;
+import org.spongepowered.mod.item.inventory.fabric.IItemHandlerFabric;
+
+/**
+ * Basic Wrapper Adapter for {@link IItemHandler}
+ */
+public class IItemHandlerAdapter extends AbstractInventoryAdapter<IItemHandler> {
+    public IItemHandlerAdapter(IItemHandler inventory) {
+        super(new IItemHandlerFabric(inventory));
+    }
+}

src/main/java/org/spongepowered/mod/item/inventory/fabric/ItemStackHandlerFabric.java → src/main/java/org/spongepowered/mod/item/inventory/fabric/IItemHandlerFabric.java

@@ -27,27 +27,28 @@
 import com.google.common.collect.ImmutableSet;
 import net.minecraft.item.ItemStack;
 import net.minecraftforge.items.IItemHandler;
-import net.minecraftforge.items.ItemStackHandler;
 import org.spongepowered.api.text.translation.FixedTranslation;
 import org.spongepowered.api.text.translation.Translation;
+import org.spongepowered.common.item.inventory.adapter.InventoryAdapter;
 import org.spongepowered.common.item.inventory.lens.Fabric;
+import org.spongepowered.mod.item.inventory.adapter.IItemHandlerAdapter;
 
 import java.util.Collection;
 
-public class ItemStackHandlerFabric implements Fabric<ItemStackHandler> {
-    private final ItemStackHandler inventory;
+public class IItemHandlerFabric implements Fabric<IItemHandler> {
+    private final IItemHandler inventory;
 
-    public ItemStackHandlerFabric(ItemStackHandler inventory) {
+    public IItemHandlerFabric(IItemHandler inventory) {
         this.inventory = inventory;
     }
 
     @Override
-    public Collection<ItemStackHandler> allInventories() {
+    public Collection<IItemHandler> allInventories() {
         return ImmutableSet.of(this.inventory);
     }
 
     @Override
-    public ItemStackHandler get(int index) {
+    public IItemHandler get(int index) {
         return this.inventory;
     }
 
@@ -61,6 +62,29 @@ public void setStack(int index, ItemStack stack) {
         setIItemHandlerStack(this.inventory, index, stack);
     }
 
+    @Override
+    public int getMaxStackSize() {
+        return this.inventory.getSlotLimit(0);
+    }
+
+    @Override
+    public Translation getDisplayName() {
+        return new FixedTranslation(getClass().getName());
+    }
+
+    @Override
+    public int getSize() {
+        return this.inventory.getSlots();
+    }
+
+    @Override
+    public void clear() {
+    }
+
+    @Override
+    public void markDirty() {
+    }
+
     protected static void setIItemHandlerStack(IItemHandler handler, int index, ItemStack stack) {
         ItemStack prev = handler.getStackInSlot(index);
         if (prev != null) {
@@ -86,26 +110,4 @@ protected static void setIItemHandlerStack(IItemHandler handler, int index, Item
         }
     }
 
-    @Override
-    public int getMaxStackSize() {
-        return this.inventory.getSlotLimit(0);
-    }
-
-    @Override
-    public Translation getDisplayName() {
-        return new FixedTranslation(getClass().getName());
-    }
-
-    @Override
-    public int getSize() {
-        return this.inventory.getSlots();
-    }
-
-    @Override
-    public void clear() {
-    }
-
-    @Override
-    public void markDirty() {
-    }
 }

src/main/java/org/spongepowered/mod/mixin/core/forge/MixinVanillaInventoryCodeHooks.java

@@ -49,6 +49,7 @@
 import org.spongepowered.common.interfaces.IMixinInventory;
 import org.spongepowered.common.item.inventory.EmptyInventoryImpl;
 import org.spongepowered.common.item.inventory.util.InventoryUtil;
+import org.spongepowered.mod.item.inventory.adapter.IItemHandlerAdapter;
 
 import javax.annotation.Nullable;
 
@@ -88,10 +89,17 @@ private static void onTransferItemsOut(TileEntityHopper hopper, CallbackInfoRetu
             at = @At(value = "INVOKE", target = "Lorg/apache/commons/lang3/tuple/Pair;getKey()Ljava/lang/Object;"))
     private static void onExtractHook(IHopper hopper, CallbackInfoReturnable<Boolean> cir, Pair<IItemHandler, Object> itemHandlerResult) {
         if (ShouldFire.CHANGE_INVENTORY_EVENT_TRANSFER_PRE) {
-            Inventory source = toInventory(itemHandlerResult.getValue(), itemHandlerResult.getKey());
-            if (source.totalItems() != 0) {
-                if (SpongeCommonEventFactory.callTransferPre(source, toInventory(hopper)).isCancelled()) {
-                    cir.setReturnValue(false);
+            IItemHandler itemHandler = itemHandlerResult.getKey();
+            for (int i = 0; i < itemHandler.getSlots(); i++) {
+                // Find first item that can be extracted
+                if (!itemHandler.extractItem(i, 1, true).isEmpty()) {
+                    Inventory source = toInventory(itemHandlerResult.getValue(), itemHandler);
+                    if (source.totalItems() != 0) {
+                        if (SpongeCommonEventFactory.callTransferPre(source, toInventory(hopper)).isCancelled()) {
+                            cir.setReturnValue(false);
+                        }
+                    }
+                    break;
                 }
             }
         }
@@ -215,8 +223,7 @@ private static Inventory toInventory(Object te, IItemHandler itemHandler) {
         if (itemHandler instanceof Inventory) {
             return ((Inventory) itemHandler);
         }
-        // TODO handle IItemHandlers that were not mixed into
-        return new EmptyInventoryImpl(null);
+        return new IItemHandlerAdapter(itemHandler);
     }
 
     private static IMixinInventory forCapture(Object toCapture) {

src/main/java/org/spongepowered/mod/mixin/core/item/inventory/MixinInvWrapper.java

@@ -26,6 +26,7 @@
 
 import net.minecraft.inventory.IInventory;
 import net.minecraft.item.ItemStack;
+import net.minecraftforge.items.IItemHandler;
 import net.minecraftforge.items.wrapper.InvWrapper;
 import org.spongepowered.api.item.inventory.EmptyInventory;
 import org.spongepowered.api.item.inventory.Inventory;
@@ -35,9 +36,6 @@
 import org.spongepowered.asm.mixin.Interface;
 import org.spongepowered.asm.mixin.Intrinsic;
 import org.spongepowered.asm.mixin.Mixin;
-import org.spongepowered.asm.mixin.injection.At;
-import org.spongepowered.asm.mixin.injection.Inject;
-import org.spongepowered.asm.mixin.injection.callback.CallbackInfo;
 import org.spongepowered.common.interfaces.IMixinInventory;
 import org.spongepowered.common.item.inventory.EmptyInventoryImpl;
 import org.spongepowered.common.item.inventory.adapter.impl.MinecraftInventoryAdapter;
@@ -46,22 +44,22 @@
 import org.spongepowered.common.item.inventory.lens.SlotProvider;
 import org.spongepowered.common.item.inventory.lens.impl.collections.SlotCollection;
 import org.spongepowered.common.item.inventory.lens.impl.comp.OrderedInventoryLensImpl;
-import org.spongepowered.mod.item.inventory.fabric.InvWrapperFabric;
+import org.spongepowered.mod.item.inventory.fabric.IItemHandlerFabric;
 
 import java.util.ArrayList;
 import java.util.List;
 
 @Mixin(InvWrapper.class)
 @Implements(@Interface(iface = Inventory.class, prefix = "inventory$"))
-public abstract class MixinInvWrapper implements MinecraftInventoryAdapter, IMixinInventory {
+public abstract class MixinInvWrapper implements MinecraftInventoryAdapter<IInventory>, IMixinInventory {
 
     protected EmptyInventory empty;
     protected Inventory parent;
     protected Inventory next;
     protected SlotCollection slots;
     protected List<Inventory> children = new ArrayList<Inventory>();
     protected Iterable<Slot> slotIterator;
-    private Fabric<InvWrapper> fabric;
+    private Fabric<IItemHandler> fabric;
     protected Lens<IInventory, ItemStack> lens = null;
 
     private List<SlotTransaction> capturedTransactions = new ArrayList<>();
@@ -70,7 +68,7 @@ public abstract class MixinInvWrapper implements MinecraftInventoryAdapter, IMix
     private void init() {
         if (!initalized) {
             initalized = true;
-            this.fabric = new InvWrapperFabric(((InvWrapper)(Object) this));
+            this.fabric = new IItemHandlerFabric(((InvWrapper)(Object) this));
             this.slots = new SlotCollection.Builder().add(this.fabric.getSize()).build();
             this.lens = new OrderedInventoryLensImpl(0, this.fabric.getSize(), 1, slots);
         }
@@ -116,7 +114,7 @@ public Inventory getChild(int index) {
         }
         Inventory child = this.children.get(index);
         if (child == null) {
-            child = this.getRootLens().getChildren().get(index).getAdapter(this.getInventory(), this);
+            child = this.getRootLens().getChildren().get(index).getAdapter(this.getFabric(), this);
             this.children.set(index, child);
         }
         return child;
@@ -136,15 +134,15 @@ public <T extends Inventory> Iterable<T> slots() {
 
     @Intrinsic
     public void inventory$clear() {
-        this.getInventory().clear();
+        this.getFabric().clear();
     }
 
     public Lens<IInventory, ItemStack> getRootLens() {
         this.init();
         return this.lens;
     }
 
-    public Fabric<IInventory> getInventory() {
+    public Fabric<IInventory> getFabric() {
         this.init();
         return ((Fabric) this.fabric);
     }