From 45ec9bf30146f336fb250751ecab7e7e65ce6128 Mon Sep 17 00:00:00 2001 From: sigonasr2 Date: Tue, 17 Jan 2017 21:32:52 -0600 Subject: [PATCH] Make Item Pickups auto update Cube inventory lists. --- TwosideKeeper.jar | Bin 795729 -> 796463 bytes .../Utils/InventoryUtils.java | 17 +++++++++- .../HelperStructures/Utils/ItemCubeUtils.java | 31 ++++++++++++++++++ 3 files changed, 47 insertions(+), 1 deletion(-) diff --git a/TwosideKeeper.jar b/TwosideKeeper.jar index 91613ce14b4f31c7d1ec89b75ada5818bc8cd15b..f3842e4fc8ef2f37be163102bfef223be71bd84f 100644 GIT binary patch delta 12018 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 S*m?=Q0^lIu4`IOme*F*eL=ct$ delta 11276 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 diff --git a/src/sig/plugin/TwosideKeeper/HelperStructures/Utils/InventoryUtils.java b/src/sig/plugin/TwosideKeeper/HelperStructures/Utils/InventoryUtils.java index 321e023..70f8bdf 100644 --- a/src/sig/plugin/TwosideKeeper/HelperStructures/Utils/InventoryUtils.java +++ b/src/sig/plugin/TwosideKeeper/HelperStructures/Utils/InventoryUtils.java @@ -16,6 +16,7 @@ import sig.plugin.TwosideKeeper.HelperStructures.CubeType; import sig.plugin.TwosideKeeper.HelperStructures.CustomItem; import sig.plugin.TwosideKeeper.HelperStructures.ItemCube; import sig.plugin.TwosideKeeper.HelperStructures.Common.GenericFunctions; +import sig.plugin.TwosideKeeper.HelperStructures.Common.ItemContainer; import sig.plugin.TwosideKeeper.HolidayEvents.Christmas; public class InventoryUtils { @@ -43,12 +44,26 @@ public class InventoryUtils { //TwosideKeeper.log("Items: "+ArrayUtils.toString(remaining), 0); HashMap remainingitems = virtualinventory.addItem(remaining); List itemslist = new ArrayList(); + List itemcube_list = new ArrayList(); for (int i=0;i extras = cube_inv.addItem(it); if (extras.size()==0) { List itemslist = new ArrayList(); + List itemcube_list = new ArrayList(); for (int i=0;i itemslist = new ArrayList(); + List itemcube_list = new ArrayList(); for (int j=0;j