diff --git a/src/com/jaquadro/minecraft/storagedrawers/api/inventory/SlotType.java b/src/com/jaquadro/minecraft/storagedrawers/api/inventory/SlotType.java index 5b66f88..dbb002e 100644 --- a/src/com/jaquadro/minecraft/storagedrawers/api/inventory/SlotType.java +++ b/src/com/jaquadro/minecraft/storagedrawers/api/inventory/SlotType.java @@ -5,9 +5,6 @@ package com.jaquadro.minecraft.storagedrawers.api.inventory; */ public enum SlotType { - /** An inventory slot for native StorageDrawers operations; stack sizes exceed 64. */ - STORAGE, - /** An inventory slot for input-only operations; stack sizes artificially held low. */ INPUT, diff --git a/src/com/jaquadro/minecraft/storagedrawers/inventory/InventoryStack.java b/src/com/jaquadro/minecraft/storagedrawers/inventory/InventoryStack.java index 9d9dcce..bca15e9 100644 --- a/src/com/jaquadro/minecraft/storagedrawers/inventory/InventoryStack.java +++ b/src/com/jaquadro/minecraft/storagedrawers/inventory/InventoryStack.java @@ -4,11 +4,9 @@ import net.minecraft.item.ItemStack; public abstract class InventoryStack { - private ItemStack nativeStack; private ItemStack inStack; private ItemStack outStack; - private int nativeCount; private int inCount; private int outCount; @@ -17,21 +15,15 @@ public abstract class InventoryStack } public void reset () { - nativeStack = getNewItemStack(); inStack = getNewItemStack(); outStack = getNewItemStack(); - nativeCount = 0; inCount = 0; outCount = 0; refresh(); } - public ItemStack getNativeStack () { - return nativeStack; - } - public ItemStack getInStack () { if (inStack == null || inStack.stackSize == 0) return null; @@ -121,14 +113,10 @@ public abstract class InventoryStack } public int getDiff () { - if (nativeStack == null) - return 0; + int diffIn = ((inStack == null) ? 0 : inStack.stackSize) - inCount; + int diffOut = ((outStack == null) ? 0 : outStack.stackSize) - outCount; - int diffNative = nativeStack.stackSize - nativeCount; - int diffIn = inStack.stackSize - inCount; - int diffOut = outStack.stackSize - outCount; - - return diffNative + diffIn + diffOut; + return diffIn + diffOut; } protected abstract void applyDiff (int diff); @@ -138,11 +126,6 @@ public abstract class InventoryStack int itemCount = getItemCount(); int remainingLimit = getItemCapacity() - itemCount; - if (nativeStack != null) { - nativeCount = itemCount; - nativeStack.stackSize = nativeCount; - } - if (inStack != null) { inCount = itemStackLimit - Math.min(itemStackLimit, remainingLimit); inStack.stackSize = inCount; diff --git a/src/com/jaquadro/minecraft/storagedrawers/inventory/StorageInventory.java b/src/com/jaquadro/minecraft/storagedrawers/inventory/StorageInventory.java index 839aecc..94e4da6 100644 --- a/src/com/jaquadro/minecraft/storagedrawers/inventory/StorageInventory.java +++ b/src/com/jaquadro/minecraft/storagedrawers/inventory/StorageInventory.java @@ -157,7 +157,6 @@ public class StorageInventory implements IDrawerInventory ItemStack stack = drawer.getStoredItemCopy(); if (stack.stackSize <= count) { drawer.setStoredItemCount(0); -// drawer.setStoredItem(null, 0); } else { stack.stackSize = count; @@ -197,9 +196,6 @@ public class StorageInventory implements IDrawerInventory case OUTPUT: adapter.setOutStack(item); break; - case STORAGE: - setInventorySlotContents(drawer, item); - return; } } diff --git a/src/com/jaquadro/minecraft/storagedrawers/storage/BaseDrawerData.java b/src/com/jaquadro/minecraft/storagedrawers/storage/BaseDrawerData.java index d07557d..fb8a860 100644 --- a/src/com/jaquadro/minecraft/storagedrawers/storage/BaseDrawerData.java +++ b/src/com/jaquadro/minecraft/storagedrawers/storage/BaseDrawerData.java @@ -76,7 +76,7 @@ public abstract class BaseDrawerData implements IDrawer, IInventoryAdapter case OUTPUT: return inventoryStack.getOutStack(); default: - return inventoryStack.getNativeStack(); + return null; } }