diff options
author | Rime <81419447+Emirlol@users.noreply.github.com> | 2024-06-07 16:54:36 +0300 |
---|---|---|
committer | Rime <81419447+Emirlol@users.noreply.github.com> | 2024-06-08 04:13:47 +0300 |
commit | 25ee7d7419ecd1dccdb06f0b0718fd20bebc0d14 (patch) | |
tree | e8cfcc14e06f23d7bbbab39b505147a131eafb17 /src/main/java/de/hysky/skyblocker/mixins/ItemStackMixin.java | |
parent | e5702972380417c65e2a3750401fb95b96bd4d31 (diff) | |
download | Skyblocker-25ee7d7419ecd1dccdb06f0b0718fd20bebc0d14.tar.gz Skyblocker-25ee7d7419ecd1dccdb06f0b0718fd20bebc0d14.tar.bz2 Skyblocker-25ee7d7419ecd1dccdb06f0b0718fd20bebc0d14.zip |
Rename ItemStackInternalIdGetter and its methods to be more distinguishable
Diffstat (limited to 'src/main/java/de/hysky/skyblocker/mixins/ItemStackMixin.java')
-rw-r--r-- | src/main/java/de/hysky/skyblocker/mixins/ItemStackMixin.java | 28 |
1 files changed, 14 insertions, 14 deletions
diff --git a/src/main/java/de/hysky/skyblocker/mixins/ItemStackMixin.java b/src/main/java/de/hysky/skyblocker/mixins/ItemStackMixin.java index e4550a5c..1e5cff10 100644 --- a/src/main/java/de/hysky/skyblocker/mixins/ItemStackMixin.java +++ b/src/main/java/de/hysky/skyblocker/mixins/ItemStackMixin.java @@ -4,7 +4,7 @@ import com.google.gson.JsonObject; import com.llamalad7.mixinextras.injector.ModifyReturnValue; import de.hysky.skyblocker.SkyblockerMod; import de.hysky.skyblocker.config.SkyblockerConfigManager; -import de.hysky.skyblocker.injected.ItemStackInternalIdGetter; +import de.hysky.skyblocker.injected.SkyblockerStack; import de.hysky.skyblocker.skyblock.item.tooltip.ItemTooltip; import de.hysky.skyblocker.utils.ItemUtils; import de.hysky.skyblocker.utils.Utils; @@ -28,7 +28,7 @@ import java.util.Locale; import java.util.Optional; @Mixin(ItemStack.class) -public abstract class ItemStackMixin implements ItemStackInternalIdGetter { +public abstract class ItemStackMixin implements SkyblockerStack { @Shadow public abstract int getDamage(); @@ -40,10 +40,10 @@ public abstract class ItemStackMixin implements ItemStackInternalIdGetter { private int maxDamage; @Unique - private String internalId; + private String skyblockId; @Unique - private String internalName; + private String skyblockName; @Unique private String neuName; @@ -125,26 +125,26 @@ public abstract class ItemStackMixin implements ItemStackInternalIdGetter { @Override @Nullable - public String getInternalId() { - if (internalId != null && !internalId.isEmpty()) return internalId; - internalId = skyblocker$getInternalNameFromNBT(true); - return internalId; + public String getSkyblockId() { + if (skyblockId != null && !skyblockId.isEmpty()) return skyblockId; + skyblockId = skyblocker$getInternalNameFromNBT(true); + return skyblockId; } @Override @Nullable - public String getInternalName() { - if (internalName != null && !internalName.isEmpty()) return internalName; - internalName = skyblocker$getInternalNameFromNBT(false); - return internalName; + public String getSkyblockName() { + if (skyblockName != null && !skyblockName.isEmpty()) return skyblockName; + skyblockName = skyblocker$getInternalNameFromNBT(false); + return skyblockName; } @Override @Nullable public String getNeuName() { if (neuName != null && !neuName.isEmpty()) return neuName; - String name = getInternalName(); - String id = getInternalId(); + String name = getSkyblockName(); + String id = getSkyblockId(); if (name == null || id == null) return null; if (name.startsWith("ISSHINY_")) name = id; |