Skip to content

Commit f5cacf6

Browse files
committed
added support for 1.20
1 parent 2d64cc8 commit f5cacf6

3 files changed

Lines changed: 11 additions & 4 deletions

File tree

pom.xml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -115,7 +115,7 @@
115115
<dependency>
116116
<groupId>org.jetbrains</groupId>
117117
<artifactId>annotations</artifactId>
118-
<version>23.1.0</version>
118+
<version>24.0.1</version>
119119
<scope>compile</scope>
120120
</dependency>
121121

src/main/java/org/brokenarrow/menu/library/NMS/UpdateTittleContainers.java

Lines changed: 9 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -48,8 +48,11 @@ public static void update(final Player p, final String title) {
4848

4949
if (ServerVersion.atLeast(ServerVersion.v1_19)) {
5050
if (ServerVersion.atLeast(ServerVersion.v1_19_4))
51-
newNmsData = new NmsData("bP", "j",
52-
"a", "a", inventorySizeNames);
51+
if (ServerVersion.atLeast(ServerVersion.v1_20))
52+
newNmsData = new NmsData("bR", "j", "a", "a", inventorySizeNames);
53+
else
54+
newNmsData = new NmsData("bP", "j",
55+
"a", "a", inventorySizeNames);
5356
else
5457
newNmsData = new NmsData("bU", "j",
5558
"a", "a", inventorySizeNames);
@@ -124,7 +127,10 @@ private static void loadNmsClasses1_17() throws ClassNotFoundException, NoSuchMe
124127
if (handle == null)
125128
handle = Class.forName(versionCheckBukkit("entity.CraftPlayer")).getMethod("getHandle");
126129
if (playerConnection == null)
127-
playerConnection = Class.forName("net.minecraft.server.level.EntityPlayer").getField("b");
130+
if (ServerVersion.atLeast(ServerVersion.v1_20))
131+
playerConnection = Class.forName("net.minecraft.server.level.EntityPlayer").getField("c");
132+
else
133+
playerConnection = Class.forName("net.minecraft.server.level.EntityPlayer").getField("b");
128134
if (packetConnectionClass == null)
129135
packetConnectionClass = Class.forName("net.minecraft.server.network.PlayerConnection");
130136
if (chatBaseCompenent == null)

src/main/java/org/brokenarrow/menu/library/utility/ServerVersion.java

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -3,6 +3,7 @@
33
import org.bukkit.plugin.Plugin;
44

55
public enum ServerVersion {
6+
v1_20((float) 20.0),
67
v1_19_4((float) 19.4),
78
v1_19((float) 19.0),
89
v1_18_2((float) 18.2),

0 commit comments

Comments
 (0)