TotalFreedomMC/TF-EssentialsX
1
0
Fork 0
mirror of https://github.com/TotalFreedomMC/TF-EssentialsX.git synced 2024-06-25 23:40:58 +00:00
Code Issues Projects Releases Wiki Activity

Fix reflection mappings for the ServerStateProvider in 1.18

Browse source
This commit is contained in:
Josh Roy 2021-11-21 23:20:35 -05:00 committed by MD
parent b6ba1768a1
commit 7a1e50d10f
2 changed files with 4 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
providers/NMSReflectionProvider/src/main/java/net/ess3/nms/refl/ReflUtil.java
View file

@ -19,6 +19,7 @@ public final class ReflUtil {
public static final NMSVersion V1_12_R1 = NMSVersion.fromString("v1_12_R1");
public static final NMSVersion V1_11_R1 = NMSVersion.fromString("v1_11_R1");
public static final NMSVersion V1_17_R1 = NMSVersion.fromString("v1_17_R1");
public static final NMSVersion V1_18_R1 = NMSVersion.fromString("v1_18_R1");
private static final Map<String, Class<?>> classCache = new HashMap<>();
private static final Table<Class<?>, String, Method> methodCache = HashBasedTable.create();
private static final Table<Class<?>, MethodParams, Method> methodParamCache = HashBasedTable.create();

4
providers/NMSReflectionProvider/src/main/java/net/ess3/nms/refl/providers/ReflServerStateProvider.java
View file

@ -17,7 +17,9 @@ public class ReflServerStateProvider implements ServerStateProvider {
final Class<?> nmsClass = ReflUtil.getNMSClass("MinecraftServer");
try {
serverObject = nmsClass.getMethod("getServer").invoke(null);
isRunning = MethodHandles.lookup().findVirtual(nmsClass, "isRunning", MethodType.methodType(boolean.class));
isRunning = MethodHandles.lookup().findVirtual(nmsClass,
ReflUtil.getNmsVersionObject().isHigherThanOrEqualTo(ReflUtil.V1_18_R1) ? "v" : "isRunning", //TODO jmp said he may make this better
MethodType.methodType(boolean.class));
} catch (final Exception e) {
e.printStackTrace();
}