Limework/skript-db
2
2
Fork 2
Code Issues 4 Pull Requests 1 Projects Releases 14 Wiki Activity

Fixed missing 'string' field in Skript 2.8

Browse Source
This commit is contained in:
szumielxd 2024-07-24 14:31:49 +02:00
parent 2dc1f70f4f
commit 41881dbb7d
Signed by untrusted user: szumielxd
GPG Key ID: 5D0CCFC4CB110524
1 changed files with 58 additions and 40 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

40
src/main/java/com/btk5h/skriptdb/SkriptUtil.java
View File

@ -14,24 +14,22 @@ public class SkriptUtil {
private static final Field EXPR; private static final Field EXPR;
static { static {
Field _FIELD = null; STRING = tryGetOldStringField()
try { .or(() -> tryGetNewStringField())
_FIELD = VariableString.class.getDeclaredField("string"); .orElseGet(() -> {
_FIELD.setAccessible(true);
} catch (NoSuchFieldException e) {
Skript.error("Skript's 'string' field could not be resolved."); Skript.error("Skript's 'string' field could not be resolved.");
e.printStackTrace(); return null;
} });
STRING = _FIELD;
Field f = null;
try { try {
Optional<Class<?>> expressionInfo = Arrays.stream(VariableString.class.getDeclaredClasses()) Optional<Class<?>> expressionInfo = Arrays.stream(VariableString.class.getDeclaredClasses())
.filter(cls -> cls.getSimpleName().equals("ExpressionInfo")) .filter(cls -> cls.getSimpleName().equals("ExpressionInfo"))
.findFirst(); .findFirst();
if (expressionInfo.isPresent()) { if (expressionInfo.isPresent()) {
Class<?> expressionInfoClass = expressionInfo.get(); Class<?> expressionInfoClass = expressionInfo.get();
_FIELD = expressionInfoClass.getDeclaredField("expr"); f = expressionInfoClass.getDeclaredField("expr");
_FIELD.setAccessible(true); f.setAccessible(true);
} else { } else {
Skript.error("Skript's 'ExpressionInfo' class could not be resolved."); Skript.error("Skript's 'ExpressionInfo' class could not be resolved.");
} }
@ -39,7 +37,7 @@ public class SkriptUtil {
e.printStackTrace(); e.printStackTrace();
Skript.error("Skript's 'expr' field could not be resolved."); Skript.error("Skript's 'expr' field could not be resolved.");
} }
EXPR = _FIELD; EXPR = f;
} }
public static Object[] getTemplateString(VariableString vs) { public static Object[] getTemplateString(VariableString vs) {
@ -58,4 +56,24 @@ public class SkriptUtil {
} }
} }
private static Optional<Field> tryGetOldStringField() {
try {
Field f = VariableString.class.getDeclaredField("string");
f.setAccessible(true);
return Optional.of(f);
} catch (NoSuchFieldException e) {
return Optional.empty();
}
}
private static Optional<Field> tryGetNewStringField() {
try {
Field f = VariableString.class.getDeclaredField("strings");
f.setAccessible(true);
return Optional.of(f);
} catch (NoSuchFieldException e) {
return Optional.empty();
}
}
} }