From 36d03067c8f1e283b9b3594a530ddedc0c01f81b Mon Sep 17 00:00:00 2001 From: ShetiPhian Date: Mon, 17 Oct 2016 16:59:25 -0400 Subject: [PATCH] Use an InvWrapper's display name when possible (#74) This enables a different name to be provided for each InvWrapper, and enables a name to be displayed even if the TileEntity doesn't implement IWorldNameable. --- .../mantle/inventory/BaseContainer.java | 17 ++++++++++++++--- 1 file changed, 14 insertions(+), 3 deletions(-) diff --git a/src/main/java/slimeknights/mantle/inventory/BaseContainer.java b/src/main/java/slimeknights/mantle/inventory/BaseContainer.java index 02d08fa..7d05698 100644 --- a/src/main/java/slimeknights/mantle/inventory/BaseContainer.java +++ b/src/main/java/slimeknights/mantle/inventory/BaseContainer.java @@ -20,6 +20,7 @@ import net.minecraft.world.WorldServer; import net.minecraftforge.items.CapabilityItemHandler; import net.minecraftforge.items.IItemHandler; import net.minecraftforge.items.wrapper.EmptyHandler; +import net.minecraftforge.items.wrapper.InvWrapper; import java.util.List; @@ -125,9 +126,19 @@ public abstract class BaseContainer extends Container { } public String getInventoryDisplayName() { - if(tile instanceof IWorldNameable) { - IWorldNameable nameable = (IWorldNameable) tile; - ITextComponent textName = ((IWorldNameable) tile).getDisplayName(); + IWorldNameable nameable = null; + if (itemHandler instanceof InvWrapper) { + nameable = ((InvWrapper) itemHandler).getInv(); + // if the inventory doesn't have a name fall back to checking the tileentity + if (nameable.getDisplayName() == null) { + nameable = null; + } + } + if(nameable == null && tile instanceof IWorldNameable) { + nameable = (IWorldNameable) tile; + } + if (nameable != null) { + ITextComponent textName = nameable.getDisplayName(); return textName != null ? textName.getFormattedText() : nameable.getName(); } return null;