mirror of
https://github.com/KAMKEEL/CustomNPC-Plus.git
synced 2026-11-20 04:09:57 +00:00
Removed token EnumConstantInfo as no longer needed
This commit is contained in:
1 parent
ca11c3c9f6
commit
5e13f580bb
3 files changed
+8
-26
No files matched your search
@@ -191,13 +191,6 @@ public class ScriptLine {
|
||||
FieldInfo.ArgInfo ctx = (FieldInfo.ArgInfo) metadata;
|
||||
token.setFieldInfo(ctx.fieldInfo);
|
||||
token.setMethodCallInfo(ctx.methodCallInfo);
|
||||
} else if (metadata instanceof EnumConstantInfo) {
|
||||
EnumConstantInfo enumInfo = (EnumConstantInfo) metadata;
|
||||
token.setEnumConstantInfo(enumInfo);
|
||||
token.setFieldInfo(enumInfo.getFieldInfo());
|
||||
if (enumInfo.getConstructorCall() != null)
|
||||
token.setMethodCallInfo(enumInfo.getConstructorCall());
|
||||
|
||||
} else if (metadata instanceof FieldInfo) {
|
||||
token.setFieldInfo((FieldInfo) metadata);
|
||||
} else if (metadata instanceof MethodInfo) {
|
||||
@@ -205,7 +198,9 @@ public class ScriptLine {
|
||||
} else if (metadata instanceof ImportData) {
|
||||
token.setImportData((ImportData) metadata);
|
||||
} else if (metadata instanceof FieldAccessInfo) {
|
||||
token.setFieldAccessInfo((FieldAccessInfo) metadata);
|
||||
FieldAccessInfo accessInfo = (FieldAccessInfo) metadata;
|
||||
token.setFieldAccessInfo(accessInfo);
|
||||
token.setFieldInfo(accessInfo.getResolvedField());
|
||||
} else if (metadata instanceof TokenErrorMessage) {
|
||||
token.setErrorMessage((TokenErrorMessage) metadata);
|
||||
}
|
||||
|
||||
+5
-5
@@ -764,13 +764,13 @@ public class TokenHoverInfo {
|
||||
}
|
||||
|
||||
private void extractEnumConstantInfo(Token token) {
|
||||
EnumConstantInfo enumInfo = token.getEnumConstantInfo();
|
||||
if (enumInfo == null)
|
||||
return;
|
||||
|
||||
FieldInfo fieldInfo = enumInfo.getFieldInfo();
|
||||
FieldInfo fieldInfo = token.getFieldInfo();
|
||||
if (fieldInfo == null)
|
||||
return;
|
||||
|
||||
EnumConstantInfo enumInfo = fieldInfo.getEnumInfo();
|
||||
if (enumInfo == null)
|
||||
return;
|
||||
|
||||
iconIndicator = "e";
|
||||
|
||||
|
||||
@@ -33,8 +33,6 @@ public class Token {
|
||||
private MethodCallInfo methodCallInfo; // For method calls with argument info
|
||||
private ImportData importData; // For import statements
|
||||
private FieldAccessInfo fieldAccessInfo; //For fields like Minecraft.getMinecraft.thePlayer
|
||||
private EnumConstantInfo enumConstantInfo; // For enum constant references
|
||||
|
||||
private TokenErrorMessage errorMessage;
|
||||
|
||||
|
||||
@@ -112,15 +110,6 @@ public class Token {
|
||||
return t;
|
||||
}
|
||||
|
||||
public static Token enumConstant(String text, int start, int end, EnumConstantInfo info) {
|
||||
Token t = new Token(text, start, end, TokenType.ENUM_CONSTANT);
|
||||
t.enumConstantInfo = info;
|
||||
if (info != null) {
|
||||
t.fieldInfo = info.getFieldInfo();
|
||||
}
|
||||
return t;
|
||||
}
|
||||
|
||||
public static Token undefined(String text, int start, int end) {
|
||||
return new Token(text, start, end, TokenType.UNDEFINED_VAR);
|
||||
}
|
||||
@@ -138,7 +127,6 @@ public class Token {
|
||||
public MethodCallInfo getMethodCallInfo() { return methodCallInfo; }
|
||||
public FieldAccessInfo getFieldAccessInfo() { return fieldAccessInfo; }
|
||||
public ImportData getImportData() { return importData; }
|
||||
public EnumConstantInfo getEnumConstantInfo() { return enumConstantInfo; }
|
||||
public TokenErrorMessage getErrorMessage() { return errorMessage; }
|
||||
public ScriptLine getParentLine() { return parentLine; }
|
||||
|
||||
@@ -151,7 +139,6 @@ public class Token {
|
||||
public void setMethodInfo(MethodInfo info) { this.methodInfo = info; }
|
||||
public void setMethodCallInfo(MethodCallInfo info) { this.methodCallInfo = info; }
|
||||
public void setImportData(ImportData data) { this.importData = data; }
|
||||
public void setEnumConstantInfo(EnumConstantInfo info) { this.enumConstantInfo = info; }
|
||||
public void setErrorMessage(TokenErrorMessage message) { this.errorMessage = message; }
|
||||
|
||||
public void setParentLine(ScriptLine line) { this.parentLine = line; }
|
||||
|
||||
Reference in new issue
Block a user