Updated GitHub repository. Fixed NoSuchElementException on Forge client connection. Added permission to plugin.yml. Added new client type for Forge Modern. Changed plugin version to 2.5.9.

Author: BuildTools

pom.xml

@@ -6,7 +6,7 @@
 
     <groupId>de.sportkanone123</groupId>
     <artifactId>ClientDetector</artifactId>
-    <version>2.5.8</version>
+    <version>2.5.9</version>
 
     <properties>
         <maven.compiler.source>8</maven.compiler.source>

src/main/java/de/sportkanone123/clientdetector/spigot/forgemod/newerversion/ForgeHandler.java

@@ -49,11 +49,12 @@ public class ForgeHandler {
     public static void handle(PacketLoginReceiveEvent event){
         if(ConfigManager.getConfig("config").getBoolean("forge.enableNewerVersionDetection")){
             if(event.getPacketType() == PacketType.Login.Client.LOGIN_START ) {
-                if(ConfigManager.getConfig("config").getBoolean("forge.simulateForgeHandshake") && PacketEvents.getAPI().getServerManager().getVersion().isNewerThanOrEquals(ServerVersion.V_1_13) && !ClientDetector.forgeMods.containsKey(new WrapperLoginClientLoginStart(event).getPlayerUUID().get()) && !ConfigManager.getConfig("config").getBoolean("velocity.enableVelocitySupport")) {
-                    ForgeHandshake.sendModList(event.getChannel());
-                    channelToName.put(event.getChannel(), new WrapperLoginClientLoginStart(event).getUsername());
+                if(ConfigManager.getConfig("config").getBoolean("forge.simulateForgeHandshake") && PacketEvents.getAPI().getServerManager().getVersion().isNewerThanOrEquals(ServerVersion.V_1_13)) {
+                    if (!ClientDetector.forgeMods.containsKey(event.getUser().getUUID()) && !ConfigManager.getConfig("config").getBoolean("velocity.enableVelocitySupport")) {
+                        ForgeHandshake.sendModList(event.getChannel());
+                        channelToName.put(event.getChannel(), new WrapperLoginClientLoginStart(event).getUsername());
+                    }
                 }
-
             }else if(event.getPacketType() == PacketType.Login.Client.LOGIN_PLUGIN_RESPONSE) {
                 if(!ConfigManager.getConfig("config").getBoolean("velocity.enableVelocitySupport"))
                     event.setCancelled(true);

src/main/java/de/sportkanone123/clientdetector/spigot/manager/ClientManager.java

@@ -40,6 +40,7 @@ public static void load(){
         Tested
          */
         ClientDetector.CLIENTS.add(new Client(Arrays.asList("FML|HS", "l:fmlhs"), "", "Forge", true, false, null, null));
+        ClientDetector.CLIENTS.add(new Client("fml:handshake", "", "Forge Modern", true, false, null, null));
         ClientDetector.CLIENTS.add(new Client(Arrays.asList("5zig_Set", "l:5zig_set"), "", "5zig Mod", true, false, null, null));
         ClientDetector.CLIENTS.add(new Client(Arrays.asList("LABYMOD", "LMC", "labymod3:main"), "", "LabyMod", true, false, null, null));
         ClientDetector.CLIENTS.add(new Client("vanilla", "vanilla", "Aristois (Experimental)", false, false, null, null));

src/main/java/de/sportkanone123/clientdetector/velocity/ClientDetectorVelocity.java

@@ -23,7 +23,7 @@
 @com.velocitypowered.api.plugin.Plugin(
         id = "clientdetector",
         name = "ClientDetector",
-        version = "2.5.8",
+        version = "2.5.9",
         description = "A simple plugin to detect and manage a player's client/mods",
         authors = {"Sportkanone123", "Loving11ish"}
 )

src/main/resources/bungee.yml

@@ -1,5 +1,5 @@
 name: ClientDetector
-version: 2.5.8
+version: '${project.version}'
 author: Loving11ish
 main: de.sportkanone123.clientdetector.bungeecord.ClientDetectorBungee
 description: A simple plugin to detect and manage a player's client/mods

src/main/resources/plugin.yml

@@ -1,5 +1,5 @@
 name: ClientDetector
-version: 2.5.8
+version: '${project.version}'
 authors: [ Sportkanone123, Loving11ish ]
 main: de.sportkanone123.clientdetector.spigot.ClientDetector
 description: A simple plugin to detect and manage a player's client/mods
@@ -11,7 +11,27 @@ softdepend: [PlaceholderAPI, ProtocolLib, ViaVersion]
 
 commands:
   clientdetector:
-    aliases: cd
+    description: The main command that accesses all other commands for the plugin.
+    permission: clientdetector.command
+    aliases:
+      - cd
   client:
+    description: The command to access the client based commands.
+    permission: clientdetector.command
   forge:
-  mods:
+    description: The command to access the Forge based commands.
+    permission: clientdetector.command
+  mods:
+    description: The command to access the mods based commands.
+    permission: clientdetector.command
+
+permissions:
+  clientdetector.*:
+    default: op
+    children:
+      clientdetector.command:
+        default: op
+      clientdetector.bypass:
+        default: op
+      clientdetector.notify:
+        default: op