From bc220573e8946ac410e23b92361b60d9d7a7519f Mon Sep 17 00:00:00 2001 From: Ellpeck Date: Fri, 25 Nov 2016 22:05:19 +0100 Subject: [PATCH] Added display tool tip to bags Closes #407 --- .../actuallyadditions/mod/items/ItemBag.java | 21 ++++++++++++------- 1 file changed, 14 insertions(+), 7 deletions(-) diff --git a/src/main/java/de/ellpeck/actuallyadditions/mod/items/ItemBag.java b/src/main/java/de/ellpeck/actuallyadditions/mod/items/ItemBag.java index e06fecd14..4efd37cff 100644 --- a/src/main/java/de/ellpeck/actuallyadditions/mod/items/ItemBag.java +++ b/src/main/java/de/ellpeck/actuallyadditions/mod/items/ItemBag.java @@ -53,7 +53,19 @@ public class ItemBag extends ItemBase{ @Override public void addInformation(ItemStack stack, EntityPlayer playerIn, List tooltip, boolean advanced){ - tooltip.add(TextFormatting.ITALIC+StringUtil.localize("tooltip."+ModUtil.MOD_ID+".previously"+(this.isVoid ? "VoidBag" : "Bag"))); + NonNullList slots = StackUtil.createSlots(ContainerBag.getSlotAmount(this.isVoid)); + ItemDrill.loadSlotsFromNBT(slots, stack); + + int slotsTotal = slots.size(); + int slotsFilled = 0; + + for(ItemStack slotStack : slots){ + if(StackUtil.isValid(slotStack)){ + slotsFilled++; + } + } + + tooltip.add(TextFormatting.ITALIC.toString()+slotsFilled+"/"+slotsTotal+" filled slots"); } @SubscribeEvent @@ -124,12 +136,7 @@ public class ItemBag extends ItemBase{ } } - if(!StackUtil.isValid(stack)){ - item.setDead(); - } - else{ - item.setEntityItemStack(stack); - } + item.setEntityItemStack(stack); } }