diff options
Diffstat (limited to 'src/main/java/de/hysky')
| -rw-r--r-- | src/main/java/de/hysky/skyblocker/injected/ItemStackInternalIdGetter.java | 5 | ||||
| -rw-r--r-- | src/main/java/de/hysky/skyblocker/mixins/ItemStackMixin.java | 6 |
2 files changed, 10 insertions, 1 deletions
diff --git a/src/main/java/de/hysky/skyblocker/injected/ItemStackInternalIdGetter.java b/src/main/java/de/hysky/skyblocker/injected/ItemStackInternalIdGetter.java index 87c1304b..d1992705 100644 --- a/src/main/java/de/hysky/skyblocker/injected/ItemStackInternalIdGetter.java +++ b/src/main/java/de/hysky/skyblocker/injected/ItemStackInternalIdGetter.java @@ -1,14 +1,19 @@ package de.hysky.skyblocker.injected; +import org.jetbrains.annotations.Nullable; + public interface ItemStackInternalIdGetter { + @Nullable default String getInternalId() { return ""; } + @Nullable default String getInternalName() { return ""; } + @Nullable default String getNeuName() { return ""; } diff --git a/src/main/java/de/hysky/skyblocker/mixins/ItemStackMixin.java b/src/main/java/de/hysky/skyblocker/mixins/ItemStackMixin.java index 8b5dd31d..e4550a5c 100644 --- a/src/main/java/de/hysky/skyblocker/mixins/ItemStackMixin.java +++ b/src/main/java/de/hysky/skyblocker/mixins/ItemStackMixin.java @@ -15,6 +15,7 @@ import net.minecraft.item.TooltipAppender; import net.minecraft.nbt.NbtCompound; import net.minecraft.nbt.NbtElement; import net.minecraft.text.Text; +import org.jetbrains.annotations.Nullable; import org.spongepowered.asm.mixin.Mixin; import org.spongepowered.asm.mixin.Shadow; import org.spongepowered.asm.mixin.Unique; @@ -123,6 +124,7 @@ public abstract class ItemStackMixin implements ItemStackInternalIdGetter { } @Override + @Nullable public String getInternalId() { if (internalId != null && !internalId.isEmpty()) return internalId; internalId = skyblocker$getInternalNameFromNBT(true); @@ -130,6 +132,7 @@ public abstract class ItemStackMixin implements ItemStackInternalIdGetter { } @Override + @Nullable public String getInternalName() { if (internalName != null && !internalName.isEmpty()) return internalName; internalName = skyblocker$getInternalNameFromNBT(false); @@ -137,11 +140,12 @@ public abstract class ItemStackMixin implements ItemStackInternalIdGetter { } @Override + @Nullable public String getNeuName() { if (neuName != null && !neuName.isEmpty()) return neuName; String name = getInternalName(); String id = getInternalId(); - if (name == null || id == null) return ""; + if (name == null || id == null) return null; if (name.startsWith("ISSHINY_")) name = id; |