From 258abeec0ba838cb4d444224001e031ab5f72275 Mon Sep 17 00:00:00 2001 From: bigguy345 Date: Fri, 26 Dec 2025 19:43:16 +0200 Subject: [PATCH] Rendered a chained field's correct package (of receiver) --- .../interpreter/hover/TokenHoverInfo.java | 36 +++++++++++++------ 1 file changed, 25 insertions(+), 11 deletions(-) diff --git a/src/main/java/noppes/npcs/client/gui/util/script/interpreter/hover/TokenHoverInfo.java b/src/main/java/noppes/npcs/client/gui/util/script/interpreter/hover/TokenHoverInfo.java index 5b5d06b41..55fdcf738 100644 --- a/src/main/java/noppes/npcs/client/gui/util/script/interpreter/hover/TokenHoverInfo.java +++ b/src/main/java/noppes/npcs/client/gui/util/script/interpreter/hover/TokenHoverInfo.java @@ -273,13 +273,18 @@ public class TokenHoverInfo { } if (containingType != null) { - // Show full package.ClassName for context (like IntelliJ) - String pkg = containingType.getPackageName(); - String className = containingType.getSimpleName(); - if (pkg != null && !pkg.isEmpty()) { - packageName = pkg + "." + className; + // Show full qualified class name (like IntelliJ) + String fullName = containingType.getFullName(); + if (fullName != null && !fullName.isEmpty()) { + packageName = fullName; } else { - packageName = className; + String pkg = containingType.getPackageName(); + String className = containingType.getSimpleName(); + if (pkg != null && !pkg.isEmpty()) { + packageName = pkg + "." + className; + } else { + packageName = className; + } } } @@ -313,18 +318,27 @@ public class TokenHoverInfo { private void extractGlobalFieldInfo(Token token) { FieldInfo fieldInfo = token.getFieldInfo(); - if (fieldInfo == null) return; - + FieldAccessInfo chainedField = token.getFieldAccessInfo(); + if (fieldInfo == null && chainedField != null) + fieldInfo = chainedField.getResolvedField(); + + if (fieldInfo == null) + return; + iconIndicator = "f"; TypeInfo declaredType = fieldInfo.getDeclaredType(); if (declaredType != null) { // Show field's type package.ClassName for context String pkg = declaredType.getPackageName(); - String className = declaredType.getSimpleName(); - if (pkg != null && !pkg.isEmpty()) { + + // For Minecraft.getMinecraft.thePlayer + // Return net.minecraft.client.Minecraft + if (chainedField != null) + pkg = chainedField.getReceiverType().getFullName(); + + if (pkg != null && !pkg.isEmpty()) packageName = pkg; - } // Type - check for actual type color int typeColor = getColorForTypeInfo(declaredType);