added support for 1.20

broken1arrow · Jun 14, 2023 · f5cacf6 · f5cacf6
1 parent 2d64cc8
commit f5cacf6
Show file tree

Hide file tree

Showing 3 changed files with 11 additions and 4 deletions.
diff --git a/pom.xml b/pom.xml
@@ -115,7 +115,7 @@
         <dependency>
             <groupId>org.jetbrains</groupId>
             <artifactId>annotations</artifactId>
-            <version>23.1.0</version>
+            <version>24.0.1</version>
             <scope>compile</scope>
         </dependency>
 

diff --git a/src/main/java/org/brokenarrow/menu/library/NMS/UpdateTittleContainers.java b/src/main/java/org/brokenarrow/menu/library/NMS/UpdateTittleContainers.java
@@ -48,8 +48,11 @@ public static void update(final Player p, final String title) {
 
 						if (ServerVersion.atLeast(ServerVersion.v1_19)) {
 							if (ServerVersion.atLeast(ServerVersion.v1_19_4))
-								newNmsData = new NmsData("bP", "j",
-										"a", "a", inventorySizeNames);
+								if (ServerVersion.atLeast(ServerVersion.v1_20))
+									newNmsData = new NmsData("bR", "j", "a", "a", inventorySizeNames);
+								else
+									newNmsData = new NmsData("bP", "j",
+											"a", "a", inventorySizeNames);
 							else
 								newNmsData = new NmsData("bU", "j",
 										"a", "a", inventorySizeNames);
@@ -124,7 +127,10 @@ private static void loadNmsClasses1_17() throws ClassNotFoundException, NoSuchMe
 		if (handle == null)
 			handle = Class.forName(versionCheckBukkit("entity.CraftPlayer")).getMethod("getHandle");
 		if (playerConnection == null)
-			playerConnection = Class.forName("net.minecraft.server.level.EntityPlayer").getField("b");
+			if (ServerVersion.atLeast(ServerVersion.v1_20))
+				playerConnection = Class.forName("net.minecraft.server.level.EntityPlayer").getField("c");
+			else
+				playerConnection = Class.forName("net.minecraft.server.level.EntityPlayer").getField("b");
 		if (packetConnectionClass == null)
 			packetConnectionClass = Class.forName("net.minecraft.server.network.PlayerConnection");
 		if (chatBaseCompenent == null)

diff --git a/src/main/java/org/brokenarrow/menu/library/utility/ServerVersion.java b/src/main/java/org/brokenarrow/menu/library/utility/ServerVersion.java
@@ -3,6 +3,7 @@
 import org.bukkit.plugin.Plugin;
 
 public enum ServerVersion {
+	v1_20((float) 20.0),
 	v1_19_4((float) 19.4),
 	v1_19((float) 19.0),
 	v1_18_2((float) 18.2),