From 2c57aef3b3b1a408cf5bbc704db7753c804f03c6 Mon Sep 17 00:00:00 2001 From: mezz Date: Sun, 6 Nov 2016 17:14:06 -0800 Subject: [PATCH] Fix backpack IMC handling --- .../java/forestry/storage/PluginStorage.java | 19 ++++++++++--------- 1 file changed, 10 insertions(+), 9 deletions(-) diff --git a/src/main/java/forestry/storage/PluginStorage.java b/src/main/java/forestry/storage/PluginStorage.java index 4c872a3d9..c884808f9 100644 --- a/src/main/java/forestry/storage/PluginStorage.java +++ b/src/main/java/forestry/storage/PluginStorage.java @@ -15,6 +15,7 @@ import java.awt.*; import java.io.File; import java.util.ArrayList; import java.util.Arrays; +import java.util.Collection; import java.util.Collections; import java.util.HashSet; import java.util.List; @@ -542,19 +543,19 @@ public class PluginStorage extends BlankForestryPlugin { return true; } - IBackpackDefinition backpackDefinition = BackpackManager.backpackInterface.getBackpackDefinition(tokens[0]); + String backpackUid = tokens[0]; + String itemStackStrings = tokens[1]; + + IBackpackDefinition backpackDefinition = BackpackManager.backpackInterface.getBackpackDefinition(backpackUid); if (backpackDefinition == null) { String errorMessage = IMCUtil.getInvalidIMCMessageText(message); - Log.warning("{} For non-existent backpack {}.", errorMessage, tokens[0]); + Log.error("{} For non-existent backpack {}.", errorMessage, backpackUid); return true; } - List itemStacks = ItemStackUtil.parseItemStackStrings(tokens[1], 0); - Predicate filter = backpackDefinition.getFilter(); - if (filter instanceof IBackpackFilterConfigurable) { - IBackpackFilterConfigurable backpackFilter = (IBackpackFilterConfigurable) filter; - for (ItemStack itemStack : itemStacks) { - backpackFilter.acceptItem(itemStack); - } + + List itemStacks = ItemStackUtil.parseItemStackStrings(itemStackStrings, 0); + for (ItemStack itemStack : itemStacks) { + BackpackManager.backpackInterface.addItemToForestryBackpack(backpackUid, itemStack); } return true;