diff --git a/src/main/java/forestry/core/utils/StackUtils.java b/src/main/java/forestry/core/utils/StackUtils.java index 4d3291d7a..6b9ed9c07 100755 --- a/src/main/java/forestry/core/utils/StackUtils.java +++ b/src/main/java/forestry/core/utils/StackUtils.java @@ -517,7 +517,7 @@ public class StackUtils { Item item = stack.getItem(); if (item != null) { int meta = stack.getMeta(); - ItemStack itemStack = new ItemStack(item, meta, 1); + ItemStack itemStack = new ItemStack(item, 1, meta); itemStacks.add(itemStack); } } diff --git a/src/main/java/forestry/plugins/PluginStorage.java b/src/main/java/forestry/plugins/PluginStorage.java index cc4fd8bfd..f837bb48b 100755 --- a/src/main/java/forestry/plugins/PluginStorage.java +++ b/src/main/java/forestry/plugins/PluginStorage.java @@ -421,7 +421,7 @@ public class PluginStorage extends ForestryPlugin { List backpackOreDict = new ArrayList(); { - List validItems = backpackDefinition.getValidItemStacks(); + List validItems = new ArrayList(backpackDefinition.getValidItemStacks()); Collections.sort(validItems); String[] defaultValidItems = validItems.toArray(new String[validItems.size()]); @@ -433,7 +433,7 @@ public class PluginStorage extends ForestryPlugin { } { - List oreIds = backpackDefinition.getValidOreIds(); + List oreIds = new ArrayList(backpackDefinition.getValidOreIds()); String[] defaultOreNames = new String[oreIds.size()]; for (int i = 0; i < oreIds.size(); i++) { int oreId = oreIds.get(i); diff --git a/src/main/java/forestry/storage/BackpackDefinition.java b/src/main/java/forestry/storage/BackpackDefinition.java index 680b65b2e..bce113baa 100755 --- a/src/main/java/forestry/storage/BackpackDefinition.java +++ b/src/main/java/forestry/storage/BackpackDefinition.java @@ -10,10 +10,9 @@ ******************************************************************************/ package forestry.storage; -import java.util.ArrayList; -import java.util.LinkedHashMap; +import java.util.HashSet; import java.util.List; -import java.util.Map; +import java.util.Set; import net.minecraft.block.Block; import net.minecraft.item.Item; @@ -32,10 +31,10 @@ public class BackpackDefinition implements IBackpackDefinition { private final int primaryColor; // - c03384 private final int secondaryColor; - private final List validItemStacks = new ArrayList(); - private final List validOreIds = new ArrayList(); - private final List validItemClasses = new ArrayList(); - private final List validBlockClasses = new ArrayList(); + private final Set validItemStacks = new HashSet(); + private final Set validOreIds = new HashSet(); + private final Set validItemClasses = new HashSet(); + private final Set validBlockClasses = new HashSet(); public BackpackDefinition(String name, int primaryColor) { this(name, primaryColor, 0xffffff); @@ -148,44 +147,28 @@ public class BackpackDefinition implements IBackpackDefinition { } } - public List getValidItemStacks() { + public Set getValidItemStacks() { return validItemStacks; } - public List getValidOreIds() { + public Set getValidOreIds() { return validOreIds; } - public List getValidBlockClasses() { + public Set getValidBlockClasses() { return validBlockClasses; } - public List getValidItemClasses() { + public Set getValidItemClasses() { return validItemClasses; } - // isValidItem can get called multiple times per tick if the player's inventory is full - // and they are standing on multiple items. - // It is a slow call, so we need a cache to make it fast - private final Map isValidItemCache = new ValidItemCache(); - @Override public boolean isValidItem(ItemStack itemStack) { if (itemStack == null) { return false; } - Boolean isValid = isValidItemCache.get(itemStack); - if (isValid != null) { - return isValid; - } - - isValid = isValidItemUncached(itemStack); - isValidItemCache.put(itemStack, isValid); - return isValid; - } - - private boolean isValidItemUncached(ItemStack itemStack) { Item item = itemStack.getItem(); if (item == null) { return false; @@ -232,10 +215,4 @@ public class BackpackDefinition implements IBackpackDefinition { return false; } - private static class ValidItemCache extends LinkedHashMap { - @Override - protected boolean removeEldestEntry(Map.Entry eldest) { - return size() > 64; - } - } } diff --git a/src/main/java/forestry/storage/PickupHandlerStorage.java b/src/main/java/forestry/storage/PickupHandlerStorage.java index 72adee7cd..0c89d2493 100755 --- a/src/main/java/forestry/storage/PickupHandlerStorage.java +++ b/src/main/java/forestry/storage/PickupHandlerStorage.java @@ -14,6 +14,7 @@ import net.minecraft.entity.item.EntityItem; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.item.ItemStack; +import forestry.api.storage.IBackpackDefinition; import forestry.core.interfaces.IPickupHandler; import forestry.storage.gui.ContainerBackpack; import forestry.storage.gui.ContainerNaturalistBackpack; @@ -52,7 +53,8 @@ public class PickupHandlerStorage implements IPickupHandler { } ItemBackpack backpack = ((ItemBackpack) pack.getItem()); - if (backpack.getDefinition().isValidItem(itemstack)) { + IBackpackDefinition backpackDefinition = backpack.getDefinition(); + if (backpackDefinition.isValidItem(itemstack)) { ItemBackpack.tryStowing(player, pack, itemstack); } }