From 78d0406327b4a69de7d9dae67bb8d197a2029b8f Mon Sep 17 00:00:00 2001 From: Bernhard Bonigl Date: Sun, 1 May 2016 11:35:45 +0200 Subject: [PATCH] More flexible and save name handling of containers --- .../java/slimeknights/mantle/inventory/BaseContainer.java | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/src/main/java/slimeknights/mantle/inventory/BaseContainer.java b/src/main/java/slimeknights/mantle/inventory/BaseContainer.java index 32930a5..1128a4b 100644 --- a/src/main/java/slimeknights/mantle/inventory/BaseContainer.java +++ b/src/main/java/slimeknights/mantle/inventory/BaseContainer.java @@ -13,6 +13,7 @@ import net.minecraft.item.ItemStack; import net.minecraft.tileentity.TileEntity; import net.minecraft.util.EnumFacing; import net.minecraft.util.math.BlockPos; +import net.minecraft.util.text.ITextComponent; import net.minecraft.world.IWorldNameable; import net.minecraft.world.World; import net.minecraft.world.WorldServer; @@ -121,7 +122,9 @@ public abstract class BaseContainer extends Container { public String getInventoryDisplayName() { if(tile instanceof IWorldNameable) { - return ((IWorldNameable) tile).getDisplayName().getFormattedText(); + IWorldNameable nameable = (IWorldNameable) tile; + ITextComponent textName = ((IWorldNameable) tile).getDisplayName(); + return textName != null ? textName.getFormattedText() : nameable.getName(); } return null; }