aboutsummaryrefslogtreecommitdiff
path: root/src/main/java/de/hysky/skyblocker/mixins
diff options
context:
space:
mode:
authorRime <81419447+Emirlol@users.noreply.github.com>2024-06-05 00:05:36 +0300
committerRime <81419447+Emirlol@users.noreply.github.com>2024-06-08 04:13:47 +0300
commit94f3d4f3cdcc63b6b3d95724a18ebba6521e4f53 (patch)
tree13a6e6c59fa2a73fdf55da4d829df9c1698cbec2 /src/main/java/de/hysky/skyblocker/mixins
parent673933a9a412088b774c22c87a9e08061bcf5e59 (diff)
downloadSkyblocker-94f3d4f3cdcc63b6b3d95724a18ebba6521e4f53.tar.gz
Skyblocker-94f3d4f3cdcc63b6b3d95724a18ebba6521e4f53.tar.bz2
Skyblocker-94f3d4f3cdcc63b6b3d95724a18ebba6521e4f53.zip
Add proper nullability indicators for internal id/name stuff
Diffstat (limited to 'src/main/java/de/hysky/skyblocker/mixins')
-rw-r--r--src/main/java/de/hysky/skyblocker/mixins/ItemStackMixin.java6
1 files changed, 5 insertions, 1 deletions
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;