From 446e9e2214c24f67c1e6bb8d7a29214e72e51707 Mon Sep 17 00:00:00 2001
From: Rime <81419447+Emirlol@users.noreply.github.com>
Date: Tue, 4 Jun 2024 20:24:12 +0300
Subject: Rename injected methods and separate internalId and internalName into
 2 methods

---
 .../de/hysky/skyblocker/mixins/ItemStackMixin.java | 26 ++++++++++++----------
 1 file changed, 14 insertions(+), 12 deletions(-)

(limited to 'src/main/java/de/hysky/skyblocker/mixins')

diff --git a/src/main/java/de/hysky/skyblocker/mixins/ItemStackMixin.java b/src/main/java/de/hysky/skyblocker/mixins/ItemStackMixin.java
index 48710bc0..8b5dd31d 100644
--- a/src/main/java/de/hysky/skyblocker/mixins/ItemStackMixin.java
+++ b/src/main/java/de/hysky/skyblocker/mixins/ItemStackMixin.java
@@ -123,27 +123,29 @@ public abstract class ItemStackMixin implements ItemStackInternalIdGetter {
 	}
 
 	@Override
-	public String skyblocker$getInternalId(boolean internalIDOnly) {
-		if (internalIDOnly) {
-			if (internalId != null && !internalId.isEmpty()) return internalId;
-			internalId = skyblocker$getInternalNameFromNBT(true);
-			return internalId;
-		} // else
+	public String getInternalId() {
+		if (internalId != null && !internalId.isEmpty()) return internalId;
+		internalId = skyblocker$getInternalNameFromNBT(true);
+		return internalId;
+	}
+
+	@Override
+	public String getInternalName() {
 		if (internalName != null && !internalName.isEmpty()) return internalName;
 		internalName = skyblocker$getInternalNameFromNBT(false);
 		return internalName;
 	}
 
 	@Override
-	public String skyblocker$getNeuName() {
+	public String getNeuName() {
 		if (neuName != null && !neuName.isEmpty()) return neuName;
-		String name = skyblocker$getInternalId(false);
-		String internalId = skyblocker$getInternalId(true);
-		if (name == null || internalId == null) return "";
+		String name = getInternalName();
+		String id = getInternalId();
+		if (name == null || id == null) return "";
 
-		if (name.startsWith("ISSHINY_")) name = internalId;
+		if (name.startsWith("ISSHINY_")) name = id;
 
-		neuName = ItemTooltip.getNeuName(internalId, name);
+		neuName = ItemTooltip.getNeuName(id, name);
 		return neuName;
 	}
 
-- 
cgit