From 2991374e6b394d4ec0a5c7a1a41f8d84e2e0bc80 Mon Sep 17 00:00:00 2001 From: Justin Aquadro Date: Sun, 19 Jun 2016 00:33:50 -0400 Subject: [PATCH] Fix dupe bug with compacting drawers and AE2 --- build.gradle | 2 +- .../storagedrawers/api/storage/IDrawer.java | 11 +++++ .../block/tile/TileEntityDrawersComp.java | 17 ++++++-- .../integration/ae2/DrawerMEInventory.java | 40 ++++++++++++++----- .../storage/CompDrawerData.java | 9 +++++ .../storagedrawers/storage/DrawerData.java | 7 ++++ .../storage/ICentralInventory.java | 3 +- 7 files changed, 73 insertions(+), 16 deletions(-) diff --git a/build.gradle b/build.gradle index 62e1d53..01e82b6 100644 --- a/build.gradle +++ b/build.gradle @@ -17,7 +17,7 @@ buildscript { apply plugin: 'forge' -version = "1.7.10-1.9.8" +version = "1.7.10-1.9.9" group= "com.jaquadro.minecraft.storagedrawers" // http://maven.apache.org/guides/mini/guide-naming-conventions.html archivesBaseName = "StorageDrawers" diff --git a/src/com/jaquadro/minecraft/storagedrawers/api/storage/IDrawer.java b/src/com/jaquadro/minecraft/storagedrawers/api/storage/IDrawer.java index 9afb8b2..8105438 100644 --- a/src/com/jaquadro/minecraft/storagedrawers/api/storage/IDrawer.java +++ b/src/com/jaquadro/minecraft/storagedrawers/api/storage/IDrawer.java @@ -22,9 +22,20 @@ public interface IDrawer * * @param itemPrototype An ItemStack representing the type, metadata, and tags of the item to store. * @param amount The amount to initialize the stored item count to. + * @deprecated setStoredItem may redirect its set to another IDrawer, so use setStoredItemRedir instead. */ + @Deprecated void setStoredItem (ItemStack itemPrototype, int amount); + /** + * Sets the type of the stored item and initializes it to the given amount. Any existing item will be replaced. + * + * @param itemPrototype An ItemStack representing the type, metadata, and tags of the item to store. + * @param amount The amount to initialize the stored item count to. + * @return The IDrawer actually set with the prototype. Some drawer groups can redirect a set operation to another member. + */ + IDrawer setStoredItemRedir (ItemStack itemPrototype, int amount); + /** * Gets the number of items stored in this drawer. */ diff --git a/src/com/jaquadro/minecraft/storagedrawers/block/tile/TileEntityDrawersComp.java b/src/com/jaquadro/minecraft/storagedrawers/block/tile/TileEntityDrawersComp.java index 583dca2..359129d 100644 --- a/src/com/jaquadro/minecraft/storagedrawers/block/tile/TileEntityDrawersComp.java +++ b/src/com/jaquadro/minecraft/storagedrawers/block/tile/TileEntityDrawersComp.java @@ -503,12 +503,15 @@ public class TileEntityDrawersComp extends TileEntityDrawers } @Override - public void setStoredItem (int slot, ItemStack itemPrototype, int amount) { + public IDrawer setStoredItem (int slot, ItemStack itemPrototype, int amount) { if (itemPrototype != null && convRate != null && convRate[0] == 0) { + IDrawer target = null; populateSlots(itemPrototype); for (int i = 0; i < getDrawerCount(); i++) { - if (BaseDrawerData.areItemsEqual(protoStack[i], itemPrototype)) + if (BaseDrawerData.areItemsEqual(protoStack[i], itemPrototype)) { + target = getDrawer(i); pooledCount = (pooledCount % convRate[i]) + convRate[i] * amount; + } } for (int i = 0; i < getDrawerCount(); i++) { @@ -524,10 +527,18 @@ public class TileEntityDrawersComp extends TileEntityDrawers //TileEntityDrawersComp.this.markDirty(); worldObj.markBlockForUpdate(xCoord, yCoord, zCoord); } + + return target; } else if (itemPrototype == null) { - setStoredItemCount(slot, 0); + //setStoredItemCount(slot, 0); + pooledCount = 0; + clear(); + if (worldObj != null && !worldObj.isRemote) + worldObj.markBlockForUpdate(xCoord, yCoord, zCoord); } + + return getDrawer(slot); } @Override diff --git a/src/com/jaquadro/minecraft/storagedrawers/integration/ae2/DrawerMEInventory.java b/src/com/jaquadro/minecraft/storagedrawers/integration/ae2/DrawerMEInventory.java index 1671857..af27f27 100644 --- a/src/com/jaquadro/minecraft/storagedrawers/integration/ae2/DrawerMEInventory.java +++ b/src/com/jaquadro/minecraft/storagedrawers/integration/ae2/DrawerMEInventory.java @@ -13,7 +13,9 @@ import com.jaquadro.minecraft.storagedrawers.api.storage.attribute.IVoidable; import com.jaquadro.minecraft.storagedrawers.api.storage.attribute.LockAttribute; import net.minecraft.item.ItemStack; +import java.util.ArrayList; import java.util.Iterator; +import java.util.List; public class DrawerMEInventory implements IMEInventory { @@ -28,18 +30,34 @@ public class DrawerMEInventory implements IMEInventory long itemsLeft = input.getStackSize(); if (group instanceof ISmartGroup) { - for (int slot : ((ISmartGroup) group).enumerateDrawersForInsertion(input.getItemStack(), false)) { - IDrawer drawer = group.getDrawer(slot); - ItemStack itemProto = drawer.getStoredItemPrototype(); - if (itemProto == null) - drawer.setStoredItem(input.getItemStack(), 0); + List clearSet = null; + if (type == Actionable.SIMULATE) + clearSet = new ArrayList(); - itemsLeft = injectItemsIntoDrawer(drawer, itemsLeft, type); + try { + for (int slot : ((ISmartGroup) group).enumerateDrawersForInsertion(input.getItemStack(), false)) { + IDrawer drawer = group.getDrawer(slot); + ItemStack itemProto = drawer.getStoredItemPrototype(); + if (itemProto == null) { + drawer = drawer.setStoredItemRedir(input.getItemStack(), 0); + if (clearSet != null) + clearSet.add(drawer); + } - if (drawer instanceof IVoidable && ((IVoidable) drawer).isVoid()) - itemsLeft = 0; - if (itemsLeft == 0) - return null; + if (drawer.canItemBeStored(input.getItemStack())) + itemsLeft = injectItemsIntoDrawer(drawer, itemsLeft, type); + + if (drawer instanceof IVoidable && ((IVoidable) drawer).isVoid()) + itemsLeft = 0; + if (itemsLeft == 0) + return null; + } + } + finally { + if (clearSet != null) { + for (IDrawer drawer : clearSet) + drawer.setStoredItemRedir(null, 0); + } } } else { @@ -83,7 +101,7 @@ public class DrawerMEInventory implements IMEInventory if (itemProto == null) { itemProto = input.getItemStack(); if (drawer.canItemBeStored(itemProto)) { - drawer.setStoredItem(itemProto, 0); + drawer = drawer.setStoredItemRedir(itemProto, 0); itemsLeft = injectItemsIntoDrawer(drawer, itemsLeft, type); if (drawer instanceof IVoidable && ((IVoidable) drawer).isVoid()) itemsLeft = 0; diff --git a/src/com/jaquadro/minecraft/storagedrawers/storage/CompDrawerData.java b/src/com/jaquadro/minecraft/storagedrawers/storage/CompDrawerData.java index f4526e4..c3b0a1d 100644 --- a/src/com/jaquadro/minecraft/storagedrawers/storage/CompDrawerData.java +++ b/src/com/jaquadro/minecraft/storagedrawers/storage/CompDrawerData.java @@ -1,5 +1,6 @@ package com.jaquadro.minecraft.storagedrawers.storage; +import com.jaquadro.minecraft.storagedrawers.api.storage.IDrawer; 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.IShroudable; @@ -34,6 +35,14 @@ public class CompDrawerData extends BaseDrawerData implements IFractionalDrawer, // markDirty } + @Override + public IDrawer setStoredItemRedir (ItemStack itemPrototype, int amount) { + IDrawer target = central.setStoredItem(slot, itemPrototype, amount); + refresh(); + + return target; + } + @Override public int getStoredItemCount () { return central.getStoredItemCount(slot); diff --git a/src/com/jaquadro/minecraft/storagedrawers/storage/DrawerData.java b/src/com/jaquadro/minecraft/storagedrawers/storage/DrawerData.java index 5a77467..1d852ef 100644 --- a/src/com/jaquadro/minecraft/storagedrawers/storage/DrawerData.java +++ b/src/com/jaquadro/minecraft/storagedrawers/storage/DrawerData.java @@ -1,6 +1,7 @@ package com.jaquadro.minecraft.storagedrawers.storage; import com.jaquadro.minecraft.storagedrawers.api.event.DrawerPopulatedEvent; +import com.jaquadro.minecraft.storagedrawers.api.storage.IDrawer; import com.jaquadro.minecraft.storagedrawers.api.storage.attribute.ILockable; import com.jaquadro.minecraft.storagedrawers.api.storage.attribute.IShroudable; import com.jaquadro.minecraft.storagedrawers.api.storage.attribute.IVoidable; @@ -41,6 +42,12 @@ public class DrawerData extends BaseDrawerData implements IVoidable, IShroudable setStoredItem(itemPrototype, amount, true); } + @Override + public IDrawer setStoredItemRedir (ItemStack itemPrototype, int amount) { + setStoredItem(itemPrototype, amount, true); + return this; + } + private void setStoredItem (ItemStack itemPrototype, int amount, boolean mark) { if (itemPrototype == null) { setStoredItemCount(0, false, true); diff --git a/src/com/jaquadro/minecraft/storagedrawers/storage/ICentralInventory.java b/src/com/jaquadro/minecraft/storagedrawers/storage/ICentralInventory.java index 01b8119..b701be7 100644 --- a/src/com/jaquadro/minecraft/storagedrawers/storage/ICentralInventory.java +++ b/src/com/jaquadro/minecraft/storagedrawers/storage/ICentralInventory.java @@ -1,5 +1,6 @@ package com.jaquadro.minecraft.storagedrawers.storage; +import com.jaquadro.minecraft.storagedrawers.api.storage.IDrawer; import com.jaquadro.minecraft.storagedrawers.api.storage.attribute.LockAttribute; import net.minecraft.item.ItemStack; import net.minecraft.nbt.NBTTagCompound; @@ -8,7 +9,7 @@ public interface ICentralInventory { public ItemStack getStoredItemPrototype (int slot); - public void setStoredItem (int slot, ItemStack itemPrototype, int amount); + public IDrawer setStoredItem (int slot, ItemStack itemPrototype, int amount); public int getStoredItemCount (int slot);