From 0b58c16bbed19ed897bd80e5cbff8776218ae122 Mon Sep 17 00:00:00 2001 From: Stackulate <180084054+Stackulate@users.noreply.github.com> Date: Mon, 8 Dec 2025 11:28:14 +0100 Subject: [PATCH 1/2] Add v1_21_R6 MDFIVEMAGICLETTER --- .../src/main/java/net/ess3/nms/refl/ReflUtil.java | 1 + .../net/ess3/nms/refl/providers/ReflServerStateProvider.java | 4 +++- 2 files changed, 4 insertions(+), 1 deletion(-) diff --git a/providers/NMSReflectionProvider/src/main/java/net/ess3/nms/refl/ReflUtil.java b/providers/NMSReflectionProvider/src/main/java/net/ess3/nms/refl/ReflUtil.java index 07d8123e643..18b9d0f86da 100644 --- a/providers/NMSReflectionProvider/src/main/java/net/ess3/nms/refl/ReflUtil.java +++ b/providers/NMSReflectionProvider/src/main/java/net/ess3/nms/refl/ReflUtil.java @@ -23,6 +23,7 @@ public final class ReflUtil { public static final NMSVersion V1_19_R1 = NMSVersion.fromString("v1_19_R1"); public static final NMSVersion V1_19_R2 = NMSVersion.fromString("v1_19_R2"); public static final NMSVersion V1_20_R4 = NMSVersion.fromString("v1_20_R4"); + public static final NMSVersion V1_21_R6 = NMSVersion.fromString("v1_21_R6"); private static final Map> classCache = new HashMap<>(); private static final Table, String, Method> methodCache = HashBasedTable.create(); private static final Table, MethodParams, Method> methodParamCache = HashBasedTable.create(); diff --git a/providers/NMSReflectionProvider/src/main/java/net/ess3/nms/refl/providers/ReflServerStateProvider.java b/providers/NMSReflectionProvider/src/main/java/net/ess3/nms/refl/providers/ReflServerStateProvider.java index 81e445f1d91..2c0acfe9ea8 100644 --- a/providers/NMSReflectionProvider/src/main/java/net/ess3/nms/refl/providers/ReflServerStateProvider.java +++ b/providers/NMSReflectionProvider/src/main/java/net/ess3/nms/refl/providers/ReflServerStateProvider.java @@ -18,7 +18,9 @@ public ReflServerStateProvider() { MethodHandle isRunning = null; final String MDFIVEMAGICLETTER; - if (ReflUtil.getNmsVersionObject().isHigherThanOrEqualTo(ReflUtil.V1_20_R4)) { + if (ReflUtil.getNmsVersionObject().isHigherThanOrEqualTo(ReflUtil.V1_21_R6)) { + MDFIVEMAGICLETTER = "B"; + } else if (ReflUtil.getNmsVersionObject().isHigherThanOrEqualTo(ReflUtil.V1_20_R4)) { MDFIVEMAGICLETTER = "x"; } else if (ReflUtil.getNmsVersionObject().isHigherThanOrEqualTo(ReflUtil.V1_19_R2)) { MDFIVEMAGICLETTER = "v"; From fa73dcea748f8843607e36fa66775a560995ccf5 Mon Sep 17 00:00:00 2001 From: Stackulate <180084054+Stackulate@users.noreply.github.com> Date: Wed, 10 Dec 2025 11:46:51 +0100 Subject: [PATCH 2/2] Add v1_21_R7 MDFIVEMAGICLETTER --- .../src/main/java/net/ess3/nms/refl/ReflUtil.java | 1 + .../net/ess3/nms/refl/providers/ReflServerStateProvider.java | 4 +++- 2 files changed, 4 insertions(+), 1 deletion(-) diff --git a/providers/NMSReflectionProvider/src/main/java/net/ess3/nms/refl/ReflUtil.java b/providers/NMSReflectionProvider/src/main/java/net/ess3/nms/refl/ReflUtil.java index 18b9d0f86da..833f5d49c6e 100644 --- a/providers/NMSReflectionProvider/src/main/java/net/ess3/nms/refl/ReflUtil.java +++ b/providers/NMSReflectionProvider/src/main/java/net/ess3/nms/refl/ReflUtil.java @@ -24,6 +24,7 @@ public final class ReflUtil { public static final NMSVersion V1_19_R2 = NMSVersion.fromString("v1_19_R2"); public static final NMSVersion V1_20_R4 = NMSVersion.fromString("v1_20_R4"); public static final NMSVersion V1_21_R6 = NMSVersion.fromString("v1_21_R6"); + public static final NMSVersion V1_21_R7 = NMSVersion.fromString("v1_21_R7"); private static final Map> classCache = new HashMap<>(); private static final Table, String, Method> methodCache = HashBasedTable.create(); private static final Table, MethodParams, Method> methodParamCache = HashBasedTable.create(); diff --git a/providers/NMSReflectionProvider/src/main/java/net/ess3/nms/refl/providers/ReflServerStateProvider.java b/providers/NMSReflectionProvider/src/main/java/net/ess3/nms/refl/providers/ReflServerStateProvider.java index 2c0acfe9ea8..2d28b03efd7 100644 --- a/providers/NMSReflectionProvider/src/main/java/net/ess3/nms/refl/providers/ReflServerStateProvider.java +++ b/providers/NMSReflectionProvider/src/main/java/net/ess3/nms/refl/providers/ReflServerStateProvider.java @@ -18,7 +18,9 @@ public ReflServerStateProvider() { MethodHandle isRunning = null; final String MDFIVEMAGICLETTER; - if (ReflUtil.getNmsVersionObject().isHigherThanOrEqualTo(ReflUtil.V1_21_R6)) { + if (ReflUtil.getNmsVersionObject().isHigherThanOrEqualTo(ReflUtil.V1_21_R7)) { + MDFIVEMAGICLETTER = "z"; + } else if (ReflUtil.getNmsVersionObject().isHigherThanOrEqualTo(ReflUtil.V1_21_R6)) { MDFIVEMAGICLETTER = "B"; } else if (ReflUtil.getNmsVersionObject().isHigherThanOrEqualTo(ReflUtil.V1_20_R4)) { MDFIVEMAGICLETTER = "x";