Jika/oc2r
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Skip suffix if size not present.

Browse Source
This commit is contained in:
Florian Nücke
2021-01-10 22:09:53 +01:00
parent 8c5a79fe69
commit 17de47801f
1 changed files with 19 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

25
src/main/java/li/cil/oc2/common/item/AbstractStorageItem.java
View File

@@ -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;
}
}
}