Fix #1112 Improve IItemHandler Integration and Backpack

This commit is contained in:
mezz committed 2016-05-08 00:16:34 -07:00
1 parent a312afedd3
commit 0ae2e36e90
33 files changed
+312 -1157

No files matched your search

@@ -105,16 +105,8 @@ public class BackpackDefinition implements IBackpackDefinition {
}
}
public Set<String> getValidItemStacks() {
return validItemStacks;
}
public Set<Integer> getValidOreIds() {
return validOreIds;
}
@Override
public boolean isValidItem(ItemStack itemStack) {
public boolean test(ItemStack itemStack) {
if (itemStack == null) {
return false;
}
@@ -158,7 +150,7 @@ public class BackpackDefinition implements IBackpackDefinition {
}
@Override
public boolean isValidItem(ItemStack itemStack) {
public boolean test(ItemStack itemStack) {
ISpeciesRoot speciesRoot = AlleleManager.alleleRegistry.getSpeciesRoot(speciesRootUid);
return speciesRoot.isMember(itemStack);
}
@@ -10,6 +10,23 @@
******************************************************************************/
package forestry.storage;
import javax.annotation.Nullable;
public enum BackpackMode {
NORMAL, LOCKED, RECEIVE, RESUPPLY
NORMAL(null),
LOCKED("for.storage.backpack.mode.locked"),
RECEIVE("for.storage.backpack.mode.locked"),
RESUPPLY("for.storage.backpack.mode.locked");
@Nullable
private final String unlocalizedInfo;
BackpackMode(@Nullable String unlocalizedInfo) {
this.unlocalizedInfo = unlocalizedInfo;
}
@Nullable
public String getUnlocalizedInfo() {
return unlocalizedInfo;
}
}
@@ -54,7 +54,7 @@ public class PickupHandlerStorage implements IPickupHandler {
ItemBackpack backpack = (ItemBackpack) pack.getItem();
IBackpackDefinition backpackDefinition = backpack.getDefinition();
if (backpackDefinition.isValidItem(itemstack)) {
if (backpackDefinition.test(itemstack)) {
ItemBackpack.tryStowing(player, pack, itemstack);
}
}
@@ -33,6 +33,6 @@ public class ItemInventoryBackpack extends ItemInventory {
@Override
public boolean canSlotAccept(int slotIndex, ItemStack itemStack) {
return backpackDefinition.isValidItem(itemStack);
return backpackDefinition.test(itemStack);
}
}
@@ -17,22 +17,21 @@ import net.minecraft.client.renderer.ItemMeshDefinition;
import net.minecraft.client.renderer.block.model.ModelResourceLocation;
import net.minecraft.client.renderer.color.IItemColor;
import net.minecraft.entity.player.EntityPlayer;
import net.minecraft.inventory.IInventory;
import net.minecraft.item.Item;
import net.minecraft.item.ItemStack;
import net.minecraft.tileentity.TileEntity;
import net.minecraft.util.ActionResult;
import net.minecraft.util.EnumActionResult;
import net.minecraft.util.EnumHand;
import net.minecraft.util.math.BlockPos;
import net.minecraft.util.EnumFacing;
import net.minecraft.util.EnumHand;
import net.minecraft.util.ResourceLocation;
import net.minecraft.util.math.BlockPos;
import net.minecraft.world.World;
import net.minecraftforge.common.MinecraftForge;
import net.minecraftforge.fml.common.eventhandler.Event;
import net.minecraftforge.fml.relauncher.Side;
import net.minecraftforge.fml.relauncher.SideOnly;
import net.minecraftforge.items.IItemHandler;
import forestry.api.core.IModelManager;
import forestry.api.storage.BackpackStowEvent;
@@ -42,11 +41,10 @@ import forestry.core.config.Config;
import forestry.core.config.Constants;
import forestry.core.gui.GuiHandler;
import forestry.core.inventory.ItemInventory;
import forestry.core.inventory.iterators.IExtInvSlot;
import forestry.core.inventory.iterators.InventoryIterator;
import forestry.core.inventory.filters.StandardStackFilters;
import forestry.core.inventory.manipulators.ItemHandlerInventoryManipulator;
import forestry.core.items.ItemWithGui;
import forestry.core.tiles.TileUtil;
import forestry.core.utils.InventoryUtil;
import forestry.core.utils.Translator;
import forestry.storage.BackpackMode;
import forestry.storage.gui.ContainerBackpack;
@@ -102,30 +100,29 @@ public class ItemBackpack extends ItemWithGui implements IItemColor {
return EnumActionResult.FAIL;
}
return evaluateTileHit(stack, player, world, pos, side) ? EnumActionResult.SUCCESS : EnumActionResult.FAIL;
return evaluateTileHit(stack, player, world, pos, side) ? EnumActionResult.PASS : EnumActionResult.FAIL;
}
public static ItemStack tryStowing(EntityPlayer player, ItemStack backpackStack, ItemStack stack) {
public static void tryStowing(EntityPlayer player, ItemStack backpackStack, ItemStack stack) {
if (getMode(backpackStack) == BackpackMode.LOCKED) {
return;
}
ItemBackpack backpack = (ItemBackpack) backpackStack.getItem();
ItemInventory inventory = new ItemInventoryBackpack(player, backpack.getBackpackSize(), backpackStack);
if (backpackStack.getItemDamage() == 1) {
return stack;
}
Event event = new BackpackStowEvent(player, backpack.getDefinition(), inventory, stack);
MinecraftForge.EVENT_BUS.post(event);
if (MinecraftForge.EVENT_BUS.post(new BackpackStowEvent(player, backpack.getDefinition(), inventory, stack))) {
return;
}
if (stack.stackSize <= 0) {
return null;
}
if (event.isCanceled()) {
return stack;
return;
}
ItemStack remainder = InventoryUtil.moveItemStack(stack, inventory);
IItemHandler itemHandler = inventory.getItemHandler();
ItemHandlerInventoryManipulator manipulator = new ItemHandlerInventoryManipulator(itemHandler);
ItemStack remainder = manipulator.addStack(stack);
stack.stackSize = remainder == null ? 0 : remainder.stackSize;
return null;
}
private static void switchMode(ItemStack itemstack) {
@@ -138,7 +135,7 @@ public class ItemBackpack extends ItemWithGui implements IItemColor {
itemstack.setItemDamage(nextMode);
}
private static IInventory getInventoryHit(World world, BlockPos pos, EnumFacing side) {
private static IItemHandler getInventoryHit(World world, BlockPos pos, EnumFacing side) {
TileEntity targeted = world.getTileEntity(pos);
return TileUtil.getInventoryFromTile(targeted, side);
}
@@ -147,23 +144,25 @@ public class ItemBackpack extends ItemWithGui implements IItemColor {
// Shift right-clicking on an inventory tile will attempt to transfer
// items contained in the backpack
IInventory inventory = getInventoryHit(world, pos, side);
IItemHandler inventory = getInventoryHit(world, pos, side);
// Process only inventories
if (inventory != null) {
// Must have inventory slots
if (inventory.getSizeInventory() <= 0) {
if (inventory.getSlots() <= 0) {
return true;
}
// Create our own backpack inventory
ItemInventoryBackpack backpackInventory = new ItemInventoryBackpack(player, getBackpackSize(), stack);
if (!world.isRemote) {
// Create our own backpack inventory
ItemInventoryBackpack backpackInventory = new ItemInventoryBackpack(player, getBackpackSize(), stack);
BackpackMode mode = getMode(stack);
if (mode == BackpackMode.RECEIVE) {
tryChestReceive(backpackInventory, inventory);
} else {
tryChestTransfer(backpackInventory, inventory);
BackpackMode mode = getMode(stack);
if (mode == BackpackMode.RECEIVE) {
receiveFromChest(backpackInventory, inventory);
} else {
transferToChest(backpackInventory, inventory);
}
}
return true;
@@ -172,34 +171,14 @@ public class ItemBackpack extends ItemWithGui implements IItemColor {
return false;
}
private static void tryChestTransfer(ItemInventoryBackpack backpackInventory, IInventory target) {
for (IExtInvSlot slot : InventoryIterator.getIterable(backpackInventory)) {
ItemStack packStack = slot.getStackInSlot();
if (packStack == null) {
continue;
}
ItemStack remaining = InventoryUtil.moveItemStack(packStack, target);
slot.setStackInSlot(remaining);
}
private static void transferToChest(ItemInventoryBackpack backpackInventory, IItemHandler target) {
ItemHandlerInventoryManipulator manipulator = new ItemHandlerInventoryManipulator(backpackInventory.getItemHandler());
manipulator.transferStacks(target, StandardStackFilters.ALL);
}
private void tryChestReceive(ItemInventoryBackpack backpackInventory, IInventory target) {
for (IExtInvSlot slot : InventoryIterator.getIterable(target)) {
ItemStack targetStack = slot.getStackInSlot();
if (targetStack == null) {
continue;
}
if (!definition.isValidItem(targetStack)) {
continue;
}
ItemStack remaining = InventoryUtil.moveItemStack(targetStack, backpackInventory);
slot.setStackInSlot(remaining);
}
private void receiveFromChest(ItemInventoryBackpack backpackInventory, IItemHandler target) {
ItemHandlerInventoryManipulator manipulator = new ItemHandlerInventoryManipulator(target);
manipulator.transferStacks(backpackInventory.getItemHandler(), definition);
}
public int getBackpackSize() {
@@ -211,15 +190,11 @@ public class ItemBackpack extends ItemWithGui implements IItemColor {
int occupied = ItemInventory.getOccupiedSlotCount(itemstack);
BackpackMode mode = getMode(itemstack);
if (mode == BackpackMode.LOCKED) {
list.add(Translator.translateToLocal("for.storage.backpack.mode.locked"));
} else if (mode == BackpackMode.RECEIVE) {
list.add(Translator.translateToLocal("for.storage.backpack.mode.receiving"));
} else if (mode == BackpackMode.RESUPPLY) {
list.add(Translator.translateToLocal("for.storage.backpack.mode.resupply"));
String infoKey = mode.getUnlocalizedInfo();
if (infoKey != null) {
list.add(Translator.translateToLocal(infoKey));
}
list.add(Translator.translateToLocal("for.gui.slots").replaceAll("%USED", String.valueOf(occupied)).replaceAll("%SIZE", String.valueOf(getBackpackSize())));
}
@Override
@@ -253,7 +228,8 @@ public class ItemBackpack extends ItemWithGui implements IItemColor {
@Override
public ModelResourceLocation getModelLocation(ItemStack stack) {
return models[stack.getItemDamage()];
BackpackMode mode = getMode(stack);
return models[mode.ordinal()];
}
}
@@ -296,6 +272,11 @@ public class ItemBackpack extends ItemWithGui implements IItemColor {
}
}
@Override
public boolean shouldCauseReequipAnimation(ItemStack oldStack, ItemStack newStack, boolean slotChanged) {
return getMode(oldStack) != getMode(newStack);
}
@SuppressWarnings("incomplete-switch")
@Override
public Object getGui(EntityPlayer player, ItemStack heldItem, int data) {