From 599083c8b0a43b4048bc6f8ea03f85d901ad5676 Mon Sep 17 00:00:00 2001 From: libraryaddict Date: Sat, 13 Jan 2024 13:04:30 +1300 Subject: [PATCH] Bump required nms version, some custom payload handling --- nms/v1_17_R1/pom.xml | 2 +- nms/v1_18_R1/pom.xml | 2 +- nms/v1_18_R2/pom.xml | 2 +- nms/v1_19_R1/pom.xml | 2 +- nms/v1_19_R2/pom.xml | 2 +- nms/v1_19_R3/pom.xml | 2 +- nms/v1_20_R1/pom.xml | 2 +- nms/v1_20_R2/pom.xml | 2 +- nms/v1_20_R3/pom.xml | 2 +- plugin/pom.xml | 2 +- .../disguise/utilities/DisguiseUtilities.java | 2 +- .../disguise/utilities/modded/ModdedManager.java | 6 ++++++ .../PacketListenerClientCustomPayload.java | 4 +++- .../packetlisteners/PacketListenerModdedClient.java | 2 +- pom.xml | 10 ++-------- shared/pom.xml | 2 +- 16 files changed, 24 insertions(+), 22 deletions(-) diff --git a/nms/v1_17_R1/pom.xml b/nms/v1_17_R1/pom.xml index 10347039..98768cb7 100644 --- a/nms/v1_17_R1/pom.xml +++ b/nms/v1_17_R1/pom.xml @@ -42,7 +42,7 @@ 1.0-SNAPSHOT - com.comphenix.protocol + com.github.dmulloy2 ProtocolLib diff --git a/nms/v1_18_R1/pom.xml b/nms/v1_18_R1/pom.xml index e406e663..575c67bc 100644 --- a/nms/v1_18_R1/pom.xml +++ b/nms/v1_18_R1/pom.xml @@ -41,7 +41,7 @@ 1.0-SNAPSHOT - com.comphenix.protocol + com.github.dmulloy2 ProtocolLib diff --git a/nms/v1_18_R2/pom.xml b/nms/v1_18_R2/pom.xml index f61c5a0d..62f7fa4a 100644 --- a/nms/v1_18_R2/pom.xml +++ b/nms/v1_18_R2/pom.xml @@ -41,7 +41,7 @@ 1.0-SNAPSHOT - com.comphenix.protocol + com.github.dmulloy2 ProtocolLib diff --git a/nms/v1_19_R1/pom.xml b/nms/v1_19_R1/pom.xml index 66952638..9fd69ebd 100644 --- a/nms/v1_19_R1/pom.xml +++ b/nms/v1_19_R1/pom.xml @@ -41,7 +41,7 @@ 1.0-SNAPSHOT - com.comphenix.protocol + com.github.dmulloy2 ProtocolLib diff --git a/nms/v1_19_R2/pom.xml b/nms/v1_19_R2/pom.xml index 8ef69bb5..8127006e 100644 --- a/nms/v1_19_R2/pom.xml +++ b/nms/v1_19_R2/pom.xml @@ -41,7 +41,7 @@ 1.0-SNAPSHOT - com.comphenix.protocol + com.github.dmulloy2 ProtocolLib diff --git a/nms/v1_19_R3/pom.xml b/nms/v1_19_R3/pom.xml index 69c865b3..f8a91153 100644 --- a/nms/v1_19_R3/pom.xml +++ b/nms/v1_19_R3/pom.xml @@ -41,7 +41,7 @@ 1.0-SNAPSHOT - com.comphenix.protocol + com.github.dmulloy2 ProtocolLib diff --git a/nms/v1_20_R1/pom.xml b/nms/v1_20_R1/pom.xml index 1e10ca51..95da51cf 100644 --- a/nms/v1_20_R1/pom.xml +++ b/nms/v1_20_R1/pom.xml @@ -41,7 +41,7 @@ 1.0-SNAPSHOT - com.comphenix.protocol + com.github.dmulloy2 ProtocolLib diff --git a/nms/v1_20_R2/pom.xml b/nms/v1_20_R2/pom.xml index a3651519..6b644c2e 100644 --- a/nms/v1_20_R2/pom.xml +++ b/nms/v1_20_R2/pom.xml @@ -41,7 +41,7 @@ 1.0-SNAPSHOT - com.comphenix.protocol + com.github.dmulloy2 ProtocolLib diff --git a/nms/v1_20_R3/pom.xml b/nms/v1_20_R3/pom.xml index 98b73f7b..6646acc3 100644 --- a/nms/v1_20_R3/pom.xml +++ b/nms/v1_20_R3/pom.xml @@ -41,7 +41,7 @@ 1.0-SNAPSHOT - com.comphenix.protocol + com.github.dmulloy2 ProtocolLib diff --git a/plugin/pom.xml b/plugin/pom.xml index 7006edf9..04f04d51 100644 --- a/plugin/pom.xml +++ b/plugin/pom.xml @@ -125,7 +125,7 @@ true - com.comphenix.protocol + com.github.dmulloy2 ProtocolLib diff --git a/plugin/src/main/java/me/libraryaddict/disguise/utilities/DisguiseUtilities.java b/plugin/src/main/java/me/libraryaddict/disguise/utilities/DisguiseUtilities.java index cabf0c64..a329ca0b 100644 --- a/plugin/src/main/java/me/libraryaddict/disguise/utilities/DisguiseUtilities.java +++ b/plugin/src/main/java/me/libraryaddict/disguise/utilities/DisguiseUtilities.java @@ -611,7 +611,7 @@ public class DisguiseUtilities { // If you're on 1.20.4 if (NmsVersion.v1_20_R3.isSupported()) { - requiredVersion = new String[]{"5.2.0", "676"}; + requiredVersion = new String[]{"5.2.0", "679"}; } return requiredVersion; diff --git a/plugin/src/main/java/me/libraryaddict/disguise/utilities/modded/ModdedManager.java b/plugin/src/main/java/me/libraryaddict/disguise/utilities/modded/ModdedManager.java index 612ebc47..b306847b 100644 --- a/plugin/src/main/java/me/libraryaddict/disguise/utilities/modded/ModdedManager.java +++ b/plugin/src/main/java/me/libraryaddict/disguise/utilities/modded/ModdedManager.java @@ -11,6 +11,7 @@ import me.libraryaddict.disguise.disguisetypes.DisguiseType; import me.libraryaddict.disguise.utilities.listeners.ModdedListener; import me.libraryaddict.disguise.utilities.packets.packetlisteners.PacketListenerModdedClient; import me.libraryaddict.disguise.utilities.parser.DisguisePerm; +import me.libraryaddict.disguise.utilities.reflection.NmsVersion; import me.libraryaddict.disguise.utilities.reflection.ReflectionManager; import org.bukkit.Bukkit; import org.bukkit.NamespacedKey; @@ -44,6 +45,11 @@ public class ModdedManager { return; } + // TODO Implement newer forge methods of registering a modded server + if (NmsVersion.v1_20_R2.isSupported()) { + return; + } + if (fmlRegistries == null && DisguiseConfig.isLoginPayloadPackets()) { ProtocolLibrary.getProtocolManager().addPacketListener(new PacketListenerModdedClient()); Bukkit.getPluginManager().registerEvents(new ModdedListener(), LibsDisguises.getInstance()); diff --git a/plugin/src/main/java/me/libraryaddict/disguise/utilities/packets/packetlisteners/PacketListenerClientCustomPayload.java b/plugin/src/main/java/me/libraryaddict/disguise/utilities/packets/packetlisteners/PacketListenerClientCustomPayload.java index a455b5ea..97a37da7 100644 --- a/plugin/src/main/java/me/libraryaddict/disguise/utilities/packets/packetlisteners/PacketListenerClientCustomPayload.java +++ b/plugin/src/main/java/me/libraryaddict/disguise/utilities/packets/packetlisteners/PacketListenerClientCustomPayload.java @@ -28,7 +28,9 @@ public class PacketListenerClientCustomPayload extends PacketAdapter { } if (NmsVersion.v1_20_R2.isSupported()) { - // TODO Add support when PL 5.1.1 is available in maven + if (!event.getPacket().getCustomPacketPayloads().read(0).getId().getFullKey().equals("minecraft:brand")) { + return; + } return; } else if (NmsVersion.v1_13.isSupported()) { if (!event.getPacket().getMinecraftKeys().read(0).getFullKey().equals("minecraft:brand")) { diff --git a/plugin/src/main/java/me/libraryaddict/disguise/utilities/packets/packetlisteners/PacketListenerModdedClient.java b/plugin/src/main/java/me/libraryaddict/disguise/utilities/packets/packetlisteners/PacketListenerModdedClient.java index 40e77459..db2a3fc4 100644 --- a/plugin/src/main/java/me/libraryaddict/disguise/utilities/packets/packetlisteners/PacketListenerModdedClient.java +++ b/plugin/src/main/java/me/libraryaddict/disguise/utilities/packets/packetlisteners/PacketListenerModdedClient.java @@ -98,7 +98,7 @@ public class PacketListenerModdedClient extends PacketAdapter { public void onPacketReceiving(PacketEvent event) { event.setCancelled(true); - if (event.getPacketType() != PacketType.Login.Client.START) { + if (event.getPacketType() == PacketType.Login.Client.CUSTOM_PAYLOAD) { String address = event.getPlayer().getAddress().toString(); String name = loginAttempts.getIfPresent(address); diff --git a/pom.xml b/pom.xml index 52f0ae87..16fd4c73 100644 --- a/pom.xml +++ b/pom.xml @@ -23,7 +23,7 @@ UTF-8 1.18.26 - 5.0.0 + 80aa420 1.20.3-R0.1-SNAPSHOT 4.13.2 5.9.3 @@ -35,14 +35,8 @@ - - com.comphenix.protocol + com.github.dmulloy2 ProtocolLib ${protocollib.version} true diff --git a/shared/pom.xml b/shared/pom.xml index 141e296f..b4861e85 100644 --- a/shared/pom.xml +++ b/shared/pom.xml @@ -35,7 +35,7 @@ spigot-api - com.comphenix.protocol + com.github.dmulloy2 ProtocolLib