From faf6c22b71f847af2df85c84b226a75cb984b79d Mon Sep 17 00:00:00 2001 From: Choonster TheMage Date: Tue, 6 Jun 2017 07:04:10 +1000 Subject: [PATCH] Fix IItemHandler wrappers returned by EntityLivingBase (#3942) --- .../entity/EntityLivingBase.java.patch | 4 +- .../items/wrapper/EntityArmorInvWrapper.java | 17 ++ .../wrapper/EntityEquipmentInvWrapper.java | 170 ++++++++++++++++++ .../items/wrapper/EntityHandsInvWrapper.java | 17 ++ 4 files changed, 206 insertions(+), 2 deletions(-) create mode 100644 src/main/java/net/minecraftforge/items/wrapper/EntityArmorInvWrapper.java create mode 100644 src/main/java/net/minecraftforge/items/wrapper/EntityEquipmentInvWrapper.java create mode 100644 src/main/java/net/minecraftforge/items/wrapper/EntityHandsInvWrapper.java diff --git a/patches/minecraft/net/minecraft/entity/EntityLivingBase.java.patch b/patches/minecraft/net/minecraft/entity/EntityLivingBase.java.patch index 686dd3f609..092240b92d 100644 --- a/patches/minecraft/net/minecraft/entity/EntityLivingBase.java.patch +++ b/patches/minecraft/net/minecraft/entity/EntityLivingBase.java.patch @@ -340,8 +340,8 @@ } + + // FORGE -+ private final net.minecraftforge.items.IItemHandlerModifiable handHandler = new net.minecraftforge.items.ItemStackHandler(field_184630_bs); -+ private final net.minecraftforge.items.IItemHandlerModifiable armorHandler = new net.minecraftforge.items.ItemStackHandler(field_184631_bt); ++ private final net.minecraftforge.items.IItemHandlerModifiable handHandler = new net.minecraftforge.items.wrapper.EntityHandsInvWrapper(this); ++ private final net.minecraftforge.items.IItemHandlerModifiable armorHandler = new net.minecraftforge.items.wrapper.EntityArmorInvWrapper(this); + private final net.minecraftforge.items.IItemHandler joinedHandler = new net.minecraftforge.items.wrapper.CombinedInvWrapper(armorHandler, handHandler); + + @SuppressWarnings("unchecked") diff --git a/src/main/java/net/minecraftforge/items/wrapper/EntityArmorInvWrapper.java b/src/main/java/net/minecraftforge/items/wrapper/EntityArmorInvWrapper.java new file mode 100644 index 0000000000..a14c4f8e5d --- /dev/null +++ b/src/main/java/net/minecraftforge/items/wrapper/EntityArmorInvWrapper.java @@ -0,0 +1,17 @@ +package net.minecraftforge.items.wrapper; + +import net.minecraft.entity.EntityLivingBase; +import net.minecraft.inventory.EntityEquipmentSlot; +import net.minecraftforge.items.IItemHandler; + +/** + * Exposes the armor inventory of an {@link EntityLivingBase} as an {@link IItemHandler} using {@link EntityLivingBase#getItemStackFromSlot} and + * {@link EntityLivingBase#setItemStackToSlot}. + */ +public class EntityArmorInvWrapper extends EntityEquipmentInvWrapper +{ + public EntityArmorInvWrapper(final EntityLivingBase entity) + { + super(entity, EntityEquipmentSlot.Type.ARMOR); + } +} diff --git a/src/main/java/net/minecraftforge/items/wrapper/EntityEquipmentInvWrapper.java b/src/main/java/net/minecraftforge/items/wrapper/EntityEquipmentInvWrapper.java new file mode 100644 index 0000000000..362c543c2e --- /dev/null +++ b/src/main/java/net/minecraftforge/items/wrapper/EntityEquipmentInvWrapper.java @@ -0,0 +1,170 @@ +package net.minecraftforge.items.wrapper; + +import com.google.common.collect.ImmutableList; +import net.minecraft.entity.EntityLivingBase; +import net.minecraft.inventory.EntityEquipmentSlot; +import net.minecraft.item.ItemStack; +import net.minecraftforge.items.IItemHandler; +import net.minecraftforge.items.IItemHandlerModifiable; +import net.minecraftforge.items.ItemHandlerHelper; + +import javax.annotation.Nonnull; +import java.util.ArrayList; +import java.util.List; + +/** + * Exposes the armor or hands inventory of an {@link EntityLivingBase} as an {@link IItemHandler} using {@link EntityLivingBase#getItemStackFromSlot} and + * {@link EntityLivingBase#setItemStackToSlot}. + */ +public abstract class EntityEquipmentInvWrapper implements IItemHandlerModifiable +{ + /** + * The entity. + */ + protected final EntityLivingBase entity; + + /** + * The slots exposed by this wrapper, with {@link EntityEquipmentSlot#index} as the index. + */ + protected final List slots; + + /** + * @param entity The entity. + * @param slotType The slot type to expose. + */ + public EntityEquipmentInvWrapper(final EntityLivingBase entity, final EntityEquipmentSlot.Type slotType) + { + this.entity = entity; + + final List slots = new ArrayList(); + + for (final EntityEquipmentSlot slot : EntityEquipmentSlot.values()) + { + if (slot.getSlotType() == slotType) + { + slots.add(slot); + } + } + + this.slots = ImmutableList.copyOf(slots); + } + + @Override + public int getSlots() + { + return slots.size(); + } + + @Nonnull + @Override + public ItemStack getStackInSlot(final int slot) + { + return entity.getItemStackFromSlot(validateSlotIndex(slot)); + } + + @Nonnull + @Override + public ItemStack insertItem(final int slot, @Nonnull final ItemStack stack, final boolean simulate) + { + if (stack.isEmpty()) + return ItemStack.EMPTY; + + final EntityEquipmentSlot equipmentSlot = validateSlotIndex(slot); + + final ItemStack existing = entity.getItemStackFromSlot(equipmentSlot); + + int limit = getStackLimit(slot, stack); + + if (!existing.isEmpty()) + { + if (!ItemHandlerHelper.canItemStacksStack(stack, existing)) + return stack; + + limit -= existing.getCount(); + } + + if (limit <= 0) + return stack; + + boolean reachedLimit = stack.getCount() > limit; + + if (!simulate) + { + if (existing.isEmpty()) + { + entity.setItemStackToSlot(equipmentSlot, reachedLimit ? ItemHandlerHelper.copyStackWithSize(stack, limit) : stack); + } + else + { + existing.grow(reachedLimit ? limit : stack.getCount()); + } + } + + return reachedLimit ? ItemHandlerHelper.copyStackWithSize(stack, stack.getCount() - limit) : ItemStack.EMPTY; + } + + @Nonnull + @Override + public ItemStack extractItem(final int slot, final int amount, final boolean simulate) + { + if (amount == 0) + return ItemStack.EMPTY; + + final EntityEquipmentSlot equipmentSlot = validateSlotIndex(slot); + + final ItemStack existing = entity.getItemStackFromSlot(equipmentSlot); + + if (existing.isEmpty()) + return ItemStack.EMPTY; + + final int toExtract = Math.min(amount, existing.getMaxStackSize()); + + if (existing.getCount() <= toExtract) + { + if (!simulate) + { + entity.setItemStackToSlot(equipmentSlot, ItemStack.EMPTY); + } + + return existing; + } + else + { + if (!simulate) + { + entity.setItemStackToSlot(equipmentSlot, ItemHandlerHelper.copyStackWithSize(existing, existing.getCount() - toExtract)); + } + + return ItemHandlerHelper.copyStackWithSize(existing, toExtract); + } + } + + @Override + public int getSlotLimit(final int slot) + { + final EntityEquipmentSlot equipmentSlot = validateSlotIndex(slot); + return equipmentSlot.getSlotType() == EntityEquipmentSlot.Type.ARMOR ? 1 : 64; + } + + protected int getStackLimit(final int slot, @Nonnull final ItemStack stack) + { + return Math.min(getSlotLimit(slot), stack.getMaxStackSize()); + } + + @Override + public void setStackInSlot(final int slot, @Nonnull final ItemStack stack) + { + final EntityEquipmentSlot equipmentSlot = validateSlotIndex(slot); + if (ItemStack.areItemStacksEqual(entity.getItemStackFromSlot(equipmentSlot), stack)) + return; + entity.setItemStackToSlot(equipmentSlot, stack); + } + + protected EntityEquipmentSlot validateSlotIndex(final int slot) + { + if (slot < 0 || slot >= slots.size()) + throw new IllegalArgumentException("Slot " + slot + " not in valid range - [0," + slots.size() + ")"); + + return slots.get(slot); + } +} diff --git a/src/main/java/net/minecraftforge/items/wrapper/EntityHandsInvWrapper.java b/src/main/java/net/minecraftforge/items/wrapper/EntityHandsInvWrapper.java new file mode 100644 index 0000000000..e7e704620f --- /dev/null +++ b/src/main/java/net/minecraftforge/items/wrapper/EntityHandsInvWrapper.java @@ -0,0 +1,17 @@ +package net.minecraftforge.items.wrapper; + +import net.minecraft.entity.EntityLivingBase; +import net.minecraft.inventory.EntityEquipmentSlot; +import net.minecraftforge.items.IItemHandler; + +/** + * Exposes the hands inventory of an {@link EntityLivingBase} as an {@link IItemHandler} using {@link EntityLivingBase#getItemStackFromSlot} and + * {@link EntityLivingBase#setItemStackToSlot}. + */ +public class EntityHandsInvWrapper extends EntityEquipmentInvWrapper +{ + public EntityHandsInvWrapper(EntityLivingBase entity) + { + super(entity, EntityEquipmentSlot.Type.HAND); + } +}