diff --git a/src/main/java/forestry/core/EventHandlerCore.java b/src/main/java/forestry/core/EventHandlerCore.java index 3e5702b0a..7d3c429ca 100755 --- a/src/main/java/forestry/core/EventHandlerCore.java +++ b/src/main/java/forestry/core/EventHandlerCore.java @@ -47,7 +47,7 @@ public class EventHandlerCore { } for (IPickupHandler handler : PluginManager.pickupHandlers) { - if (!handler.onItemPickup(event.entityPlayer, event.item)) { + if (handler.onItemPickup(event.entityPlayer, event.item)) { event.setResult(Result.ALLOW); return; } diff --git a/src/main/java/forestry/core/PickupHandlerCore.java b/src/main/java/forestry/core/PickupHandlerCore.java index 07c2c50e7..78129905d 100755 --- a/src/main/java/forestry/core/PickupHandlerCore.java +++ b/src/main/java/forestry/core/PickupHandlerCore.java @@ -32,7 +32,7 @@ public class PickupHandlerCore implements IPickupHandler { root.getBreedingTracker(entityitem.worldObj, entityPlayer.getGameProfile()).registerPickup(root.getMember(itemstack)); } - return true; + return false; } } diff --git a/src/main/java/forestry/core/interfaces/IPickupHandler.java b/src/main/java/forestry/core/interfaces/IPickupHandler.java index ec59b2d11..3409eeaf3 100755 --- a/src/main/java/forestry/core/interfaces/IPickupHandler.java +++ b/src/main/java/forestry/core/interfaces/IPickupHandler.java @@ -15,6 +15,7 @@ import net.minecraft.entity.player.EntityPlayer; public interface IPickupHandler { + /** Returns true if the item was picked up completely */ boolean onItemPickup(EntityPlayer entityPlayer, EntityItem item); } diff --git a/src/main/java/forestry/storage/BackpackDefinition.java b/src/main/java/forestry/storage/BackpackDefinition.java index a955ad0ea..4dc5bce0a 100755 --- a/src/main/java/forestry/storage/BackpackDefinition.java +++ b/src/main/java/forestry/storage/BackpackDefinition.java @@ -11,7 +11,9 @@ package forestry.storage; import java.util.ArrayList; +import java.util.LinkedHashMap; import java.util.List; +import java.util.Map; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.item.Item; @@ -79,7 +81,7 @@ public class BackpackDefinition implements IBackpackDefinition { @Override public void addValidItem(ItemStack validItem) { - if (validItem.getItem() != null) { + if (validItem.getItem() != null && !isValidItem(validItem)) { this.validItems.add(validItem); } } @@ -94,6 +96,16 @@ public class BackpackDefinition implements IBackpackDefinition { return validItems; } + // 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 Map isValidItemCache = new LinkedHashMap() { + @Override + protected boolean removeEldestEntry(Map.Entry eldest) { + return size() > 64; + } + }; + @Override public boolean isValidItem(EntityPlayer player, ItemStack itemstack) { return isValidItem(itemstack); @@ -101,12 +113,19 @@ public class BackpackDefinition implements IBackpackDefinition { @Override public boolean isValidItem(ItemStack itemstack) { + Boolean cached = isValidItemCache.get(itemstack); + if (cached != null) { + return cached; + } + for (ItemStack stack : getValidItems()) { if (StackUtils.isCraftingEquivalent(stack, itemstack, true, false)) { + isValidItemCache.put(itemstack, true); return true; } } + isValidItemCache.put(itemstack, false); return false; } } diff --git a/src/main/java/forestry/storage/PickupHandlerStorage.java b/src/main/java/forestry/storage/PickupHandlerStorage.java index feadadd2f..049ec924c 100755 --- a/src/main/java/forestry/storage/PickupHandlerStorage.java +++ b/src/main/java/forestry/storage/PickupHandlerStorage.java @@ -31,7 +31,7 @@ public class PickupHandlerStorage implements IPickupHandler { // Do not pick up if a backpack is open if (player.openContainer instanceof ContainerBackpack || player.openContainer instanceof ContainerNaturalistBackpack) { - return true; + return false; } // Make sure to top off manually placed itemstacks in player inventory first @@ -57,7 +57,7 @@ public class PickupHandlerStorage implements IPickupHandler { } } - return itemstack.stackSize > 0; + return itemstack.stackSize == 0; } /**