From eae73b5c2c2d063ac20453426b2cb70a7c2fe2c6 Mon Sep 17 00:00:00 2001 From: Lance5057 Date: Fri, 8 Dec 2017 03:23:38 -0600 Subject: Straps work, Time to work on armor --- .../tDefense/core/tools/TDToolEvents.java | 6 +++- .../core/tools/armor/straps/ItemStraps.java | 2 +- .../core/tools/armor/straps/ItemStrapsInv.java | 41 +++++++++++++++++++++- 3 files changed, 46 insertions(+), 3 deletions(-) (limited to 'src/main/java/lance5057/tDefense') diff --git a/src/main/java/lance5057/tDefense/core/tools/TDToolEvents.java b/src/main/java/lance5057/tDefense/core/tools/TDToolEvents.java index 8747d1a..30876a0 100644 --- a/src/main/java/lance5057/tDefense/core/tools/TDToolEvents.java +++ b/src/main/java/lance5057/tDefense/core/tools/TDToolEvents.java @@ -1,9 +1,13 @@ package lance5057.tDefense.core.tools; +import lance5057.tDefense.Reference; +import lance5057.tDefense.core.tools.armor.straps.ItemStraps; +import lance5057.tDefense.core.tools.armor.straps.ItemStrapsInv; import lance5057.tDefense.core.tools.bases.Shield; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.item.ItemStack; -import net.minecraft.util.DamageSource; +import net.minecraft.util.ResourceLocation; +import net.minecraftforge.event.AttachCapabilitiesEvent; import net.minecraftforge.event.entity.living.LivingHurtEvent; import net.minecraftforge.fml.common.eventhandler.EventPriority; import net.minecraftforge.fml.common.eventhandler.SubscribeEvent; diff --git a/src/main/java/lance5057/tDefense/core/tools/armor/straps/ItemStraps.java b/src/main/java/lance5057/tDefense/core/tools/armor/straps/ItemStraps.java index ef71827..5055f56 100644 --- a/src/main/java/lance5057/tDefense/core/tools/armor/straps/ItemStraps.java +++ b/src/main/java/lance5057/tDefense/core/tools/armor/straps/ItemStraps.java @@ -46,7 +46,7 @@ public class ItemStraps extends ItemArmor implements ISpecialArmor return new InvProvider(); } - private static class InvProvider implements ICapabilitySerializable + public static class InvProvider implements ICapabilitySerializable { private final IItemHandler inv = new ItemStackHandler(1); diff --git a/src/main/java/lance5057/tDefense/core/tools/armor/straps/ItemStrapsInv.java b/src/main/java/lance5057/tDefense/core/tools/armor/straps/ItemStrapsInv.java index 4eb5e70..3880e6f 100644 --- a/src/main/java/lance5057/tDefense/core/tools/armor/straps/ItemStrapsInv.java +++ b/src/main/java/lance5057/tDefense/core/tools/armor/straps/ItemStrapsInv.java @@ -4,7 +4,7 @@ import javax.annotation.Nonnull; import net.minecraft.item.ItemStack; import net.minecraftforge.items.CapabilityItemHandler; -import net.minecraftforge.items.IItemHandler; +import net.minecraftforge.items.IItemHandlerModifiable; import net.minecraftforge.items.ItemStackHandler; public class ItemStrapsInv extends ItemStackHandler @@ -21,4 +21,43 @@ public class ItemStrapsInv extends ItemStackHandler invItem = stack; inventory = (ItemStackHandler) invItem.getCapability(CapabilityItemHandler.ITEM_HANDLER_CAPABILITY, null); } + + @Override + public void setStackInSlot(int slot, @Nonnull ItemStack stack) + { + inventory.setStackInSlot(slot, stack); + } + + @Override + public int getSlots() + { + return inventory.getSlots(); + } + + @Nonnull + @Override + public ItemStack getStackInSlot(int slot) + { + return inventory.getStackInSlot(slot); + } + + @Nonnull + @Override + public ItemStack insertItem(int slot, @Nonnull ItemStack stack, boolean simulate) + { + return inventory.insertItem(slot, stack, simulate); + } + + @Nonnull + @Override + public ItemStack extractItem(int slot, int amount, boolean simulate) + { + return inventory.extractItem(slot, amount, simulate); + } + + @Override + public int getSlotLimit(int slot) + { + return inventory.getSlotLimit(slot); + } } -- cgit v1.2.3