Fix #745 backpack item config gets the wrong meta value

This commit is contained in:
mezz committed 2015-06-30 20:50:01 -07:00
1 parent dea639cee2
commit a972287513
4 files changed
+16 -37

No files matched your search

@@ -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);
}
}
@@ -421,7 +421,7 @@ public class PluginStorage extends ForestryPlugin {
List<String> backpackOreDict = new ArrayList<String>();
{
List<String> validItems = backpackDefinition.getValidItemStacks();
List<String> validItems = new ArrayList<String>(backpackDefinition.getValidItemStacks());
Collections.sort(validItems);
String[] defaultValidItems = validItems.toArray(new String[validItems.size()]);
@@ -433,7 +433,7 @@ public class PluginStorage extends ForestryPlugin {
}
{
List<Integer> oreIds = backpackDefinition.getValidOreIds();
List<Integer> oreIds = new ArrayList<Integer>(backpackDefinition.getValidOreIds());
String[] defaultOreNames = new String[oreIds.size()];
for (int i = 0; i < oreIds.size(); i++) {
int oreId = oreIds.get(i);
@@ -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<String> validItemStacks = new ArrayList<String>();
private final List<Integer> validOreIds = new ArrayList<Integer>();
private final List<Class> validItemClasses = new ArrayList<Class>();
private final List<Class> validBlockClasses = new ArrayList<Class>();
private final Set<String> validItemStacks = new HashSet<String>();
private final Set<Integer> validOreIds = new HashSet<Integer>();
private final Set<Class> validItemClasses = new HashSet<Class>();
private final Set<Class> validBlockClasses = new HashSet<Class>();
public BackpackDefinition(String name, int primaryColor) {
this(name, primaryColor, 0xffffff);
@@ -148,44 +147,28 @@ public class BackpackDefinition implements IBackpackDefinition {
}
}
public List<String> getValidItemStacks() {
public Set<String> getValidItemStacks() {
return validItemStacks;
}
public List<Integer> getValidOreIds() {
public Set<Integer> getValidOreIds() {
return validOreIds;
}
public List<Class> getValidBlockClasses() {
public Set<Class> getValidBlockClasses() {
return validBlockClasses;
}
public List<Class> getValidItemClasses() {
public Set<Class> 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<ItemStack, Boolean> 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<ItemStack, Boolean> {
@Override
protected boolean removeEldestEntry(Map.Entry<ItemStack, Boolean> eldest) {
return size() > 64;
}
}
}
@@ -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);
}
}