From 17de47801f92b594509814b4635f5e3a28dfb565 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Florian=20N=C3=BCcke?= Date: Sun, 10 Jan 2021 22:09:53 +0100 Subject: [PATCH] Skip suffix if size not present. --- .../oc2/common/item/AbstractStorageItem.java | 25 ++++++++++++++----- 1 file changed, 19 insertions(+), 6 deletions(-) diff --git a/src/main/java/li/cil/oc2/common/item/AbstractStorageItem.java b/src/main/java/li/cil/oc2/common/item/AbstractStorageItem.java index 92c3ac73..f211d3b7 100644 --- a/src/main/java/li/cil/oc2/common/item/AbstractStorageItem.java +++ b/src/main/java/li/cil/oc2/common/item/AbstractStorageItem.java @@ -9,6 +9,8 @@ import net.minecraft.nbt.CompoundNBT; import net.minecraft.util.text.ITextComponent; import net.minecraft.util.text.StringTextComponent; +import javax.annotation.Nullable; + public abstract class AbstractStorageItem extends Item { private static final String CAPACITY_TAG_NAME = "size"; @@ -49,16 +51,27 @@ public abstract class AbstractStorageItem extends Item { @Override public ITextComponent getDisplayName(final ItemStack stack) { - return new StringTextComponent("") - .append(super.getDisplayName(stack)) - .appendString(" (") - .append(getDisplayNameSuffix(stack)) - .appendString(")"); + final ITextComponent suffix = getDisplayNameSuffix(stack); + if (suffix != null) { + return new StringTextComponent("") + .append(super.getDisplayName(stack)) + .appendString(" (") + .append(suffix) + .appendString(")"); + } else { + return super.getDisplayName(stack); + } } /////////////////////////////////////////////////////////////////// + @Nullable protected ITextComponent getDisplayNameSuffix(final ItemStack stack) { - return new StringTextComponent(TextFormatUtils.formatSize(getCapacity(stack))); + final int capacity = getCapacity(stack); + if (capacity > 0) { + return new StringTextComponent(TextFormatUtils.formatSize(capacity)); + } else { + return null; + } } }