From 3e7643e13c8f9ef51fdb2e6007ffb1ed5277f913 Mon Sep 17 00:00:00 2001 From: Justin Aquadro Date: Tue, 9 Jun 2015 00:44:33 -0400 Subject: [PATCH] Fix AE2 partial material loss when filling compacting drawer through terminal --- .../api/storage/IFractionalDrawer.java | 6 +++++ .../block/tile/TileEntityDrawersComp.java | 8 ++++++ .../integration/ae2/DrawerMEInventory.java | 27 ++++++++++--------- .../storage/CompDrawerData.java | 5 ++++ .../storage/ICentralInventory.java | 2 ++ 5 files changed, 36 insertions(+), 12 deletions(-) diff --git a/src/com/jaquadro/minecraft/storagedrawers/api/storage/IFractionalDrawer.java b/src/com/jaquadro/minecraft/storagedrawers/api/storage/IFractionalDrawer.java index efcf6df..bd87a80 100644 --- a/src/com/jaquadro/minecraft/storagedrawers/api/storage/IFractionalDrawer.java +++ b/src/com/jaquadro/minecraft/storagedrawers/api/storage/IFractionalDrawer.java @@ -19,4 +19,10 @@ public interface IFractionalDrawer extends IDrawer * The equivalency is determined by the next compression tier, and not necessarily the conversion rate. */ int getStoredItemRemainder (); + + /** + * Gets whether or not the stored item represents the smallest granularity of material that can be stored within + * the drawer group. + */ + boolean isSmallestUnit (); } diff --git a/src/com/jaquadro/minecraft/storagedrawers/block/tile/TileEntityDrawersComp.java b/src/com/jaquadro/minecraft/storagedrawers/block/tile/TileEntityDrawersComp.java index 10f13f3..474c672 100644 --- a/src/com/jaquadro/minecraft/storagedrawers/block/tile/TileEntityDrawersComp.java +++ b/src/com/jaquadro/minecraft/storagedrawers/block/tile/TileEntityDrawersComp.java @@ -504,6 +504,14 @@ public class TileEntityDrawersComp extends TileEntityDrawers return TileEntityDrawersComp.this.getStoredItemRemainder(slot); } + @Override + public boolean isSmallestUnit (int slot) { + if (protoStack[slot] == null || convRate == null || convRate[slot] == 0) + return false; + + return convRate[slot] == 1; + } + @Override public boolean isVoidSlot (int slot) { return isVoid(); diff --git a/src/com/jaquadro/minecraft/storagedrawers/integration/ae2/DrawerMEInventory.java b/src/com/jaquadro/minecraft/storagedrawers/integration/ae2/DrawerMEInventory.java index 19a31f1..ea76c72 100644 --- a/src/com/jaquadro/minecraft/storagedrawers/integration/ae2/DrawerMEInventory.java +++ b/src/com/jaquadro/minecraft/storagedrawers/integration/ae2/DrawerMEInventory.java @@ -9,6 +9,7 @@ import appeng.api.storage.data.IAEItemStack; import appeng.api.storage.data.IItemList; import com.jaquadro.minecraft.storagedrawers.api.storage.IDrawer; import com.jaquadro.minecraft.storagedrawers.api.storage.IDrawerGroup; +import com.jaquadro.minecraft.storagedrawers.api.storage.IFractionalDrawer; import com.jaquadro.minecraft.storagedrawers.api.storage.attribute.ILockable; import com.jaquadro.minecraft.storagedrawers.api.storage.attribute.IVoidable; import com.jaquadro.minecraft.storagedrawers.api.storage.attribute.LockAttribute; @@ -81,22 +82,24 @@ public class DrawerMEInventory implements IMEInventory private long injectItemsIntoDrawer (IDrawer drawer, long itemCount, Actionable type) { int capacity = drawer.getMaxCapacity(); int storedItems = drawer.getStoredItemCount(); - if (capacity == storedItems) + + int storableItems = capacity - storedItems; + if (drawer instanceof IFractionalDrawer) { + IFractionalDrawer fracDrawer = (IFractionalDrawer)drawer; + if (!fracDrawer.isSmallestUnit() && fracDrawer.getStoredItemRemainder() > 0) + storableItems--; + } + + if (storableItems == 0) return itemCount; - storedItems += itemCount; - if (storedItems > capacity) { - if (type == Actionable.MODULATE) - drawer.setStoredItemCount(capacity); + long remainder = Math.max(itemCount - storableItems, 0); + storedItems += Math.min(itemCount, storableItems); - return storedItems - capacity; - } - else { - if (type == Actionable.MODULATE) - drawer.setStoredItemCount(storedItems); + if (type == Actionable.MODULATE) + drawer.setStoredItemCount(storedItems); - return 0; - } + return remainder; } @Override diff --git a/src/com/jaquadro/minecraft/storagedrawers/storage/CompDrawerData.java b/src/com/jaquadro/minecraft/storagedrawers/storage/CompDrawerData.java index 054e585..36105a8 100644 --- a/src/com/jaquadro/minecraft/storagedrawers/storage/CompDrawerData.java +++ b/src/com/jaquadro/minecraft/storagedrawers/storage/CompDrawerData.java @@ -108,6 +108,11 @@ public class CompDrawerData extends BaseDrawerData implements IFractionalDrawer, return central.getStoredItemRemainder(slot); } + @Override + public boolean isSmallestUnit () { + return central.isSmallestUnit(slot); + } + public void refresh () { reset(); refreshOreDictMatches(); diff --git a/src/com/jaquadro/minecraft/storagedrawers/storage/ICentralInventory.java b/src/com/jaquadro/minecraft/storagedrawers/storage/ICentralInventory.java index 28c03aa..01b8119 100644 --- a/src/com/jaquadro/minecraft/storagedrawers/storage/ICentralInventory.java +++ b/src/com/jaquadro/minecraft/storagedrawers/storage/ICentralInventory.java @@ -28,6 +28,8 @@ public interface ICentralInventory public int getStoredItemRemainder (int slot); + public boolean isSmallestUnit (int slot); + public boolean isVoidSlot (int slot); public boolean isShroudedSlot (int slot);