From 5384d0bc1028b46d4ab1ace9608b2b72b5068255 Mon Sep 17 00:00:00 2001
From: jani270 <69345714+jani270@users.noreply.github.com>
Date: Wed, 10 Apr 2024 12:40:58 +0200
Subject: Add Potions to ItemResolutionQuery (#1067)

---
 .../java/io/github/moulberry/notenoughupdates/NEUManager.java    | 4 +++-
 .../moulberry/notenoughupdates/util/ItemResolutionQuery.java     | 9 +++++++++
 2 files changed, 12 insertions(+), 1 deletion(-)

(limited to 'src')

diff --git a/src/main/java/io/github/moulberry/notenoughupdates/NEUManager.java b/src/main/java/io/github/moulberry/notenoughupdates/NEUManager.java
index 82603cb7..cf95b081 100644
--- a/src/main/java/io/github/moulberry/notenoughupdates/NEUManager.java
+++ b/src/main/java/io/github/moulberry/notenoughupdates/NEUManager.java
@@ -895,7 +895,9 @@ public class NEUManager {
 				displayGuiItemRecipe(internalName);
 				break;
 			case "viewpotion":
-				neu.sendChatMessage("/viewpotion " + internalName.split(";")[0].toLowerCase(Locale.ROOT));
+				String potionName = internalName.split(";")[0];
+				potionName = potionName.replace("POTION_", "");
+				neu.sendChatMessage("/viewpotion " + potionName.toLowerCase(Locale.ROOT));
 				break;
 			default:
 				displayGuiItemRecipe(internalName);
diff --git a/src/main/java/io/github/moulberry/notenoughupdates/util/ItemResolutionQuery.java b/src/main/java/io/github/moulberry/notenoughupdates/util/ItemResolutionQuery.java
index 2cccce72..9d279824 100644
--- a/src/main/java/io/github/moulberry/notenoughupdates/util/ItemResolutionQuery.java
+++ b/src/main/java/io/github/moulberry/notenoughupdates/util/ItemResolutionQuery.java
@@ -126,6 +126,9 @@ public class ItemResolutionQuery {
 				case "PARTY_HAT_SLOTH":
 					resolvedName = resolveSlothHatName();
 					break;
+				case "POTION":
+					resolvedName = resolvePotionName();
+					break;
 			}
 		}
 
@@ -337,6 +340,12 @@ public class ItemResolutionQuery {
 		}
 	}
 
+	private String resolvePotionName() {
+		String potion = getExtraAttributes().getString("potion");
+		int potionLvl = getExtraAttributes().getInteger("potion_level");
+		return "POTION_" + potion.toUpperCase(Locale.ROOT) + ";" + potionLvl;
+	}
+
 	private NBTTagCompound getExtraAttributes() {
 		if (compound == null) return new NBTTagCompound();
 		return compound.getCompoundTag(EXTRA_ATTRIBUTES);
-- 
cgit