Fully support 1.21.6+ for Spigot

Author: BlueTree242

README.md

@@ -43,7 +43,7 @@ You can specify a list of visible commands or block specific ones from showing u
 
 ### Spigot & Paper
 
-- Supported versions: **1.8 – 1.21.5**
+- Supported versions: **1.8 – 1.21.8**+
 - Requires: [ProtocolLib](https://github.com/dmulloy2/ProtocolLib)
 
 ### Paper 1.20.6+
@@ -64,6 +64,11 @@ Check out the [documentation](https://github.com/BlueTree242/AdvancedPlHide/wiki
 - This plugin is actively updated for the latest Minecraft versions until v3 is released.
 - No new features will be added to v2 — only bug fixes and compatibility updates.
 - The plugin works immediately after installation, but advanced features require configuration.
+- Sometimes Mojang does some breaking changes and plugin has to be updated to support those newer versions, this is not very common so you should test if plugin works before opening an issue. This is strictly for **Spigot** only (even Paper is unaffected).
+
+
+> Occasionally, Mojang introduces breaking changes that may require the plugin to be updated for compatibility with newer versions. While this is relatively rare, you should always test the plugin on the target version before reporting any issues.  
+> This notice applies **strictly to Spigot**—Paper, Bungee and Velocity are unaffected.
 
 > It is recommended to set the permission `bukkit.command.*` to `false` for all players.
 

settings.gradle

@@ -42,6 +42,8 @@ include 'spigot:modern:V1_19_3_NMS'
 findProject(':spigot:modern:V1_19_3_NMS')?.name = 'V1_19_3_NMS'
 include 'spigot:modern:V1_20_5_NMS'
 findProject(':spigot:modern:V1_20_5_NMS')?.name = 'V1_20_5_NMS'
+include 'spigot:modern:V1_21_6_NMS'
+findProject(':spigot:modern:V1_21_6_NMS')?.name = 'V1_21_6_NMS'
 
 
 include 'spigot:paper'

spigot/build.gradle.kts

@@ -19,11 +19,13 @@
  * <http://www.gnu.org/licenses/gpl-3.0.html>.
  * END
  */
+
 plugins {
     id("net.minecrell.plugin-yml.bukkit") version "0.6.0"
     id("com.github.johnrengelman.shadow")
 }
 repositories {
+    maven("https://repo.papermc.io/repository/maven-public/")
     maven("https://hub.spigotmc.org/nexus/content/repositories/snapshots/")
     maven("https://repo.dmulloy2.net/repository/public/")
     maven("https://repo.destroystokyo.com/repository/maven-public/")
@@ -35,6 +37,7 @@ dependencies {
     implementation(project(":spigot:modern:V1_19_NMS", "reobf"))
     implementation(project(":spigot:modern:V1_19_3_NMS", "reobf"))
     implementation(project(":spigot:modern:V1_20_5_NMS", "reobf"))
+    implementation(project(":spigot:modern:V1_21_6_NMS", "reobf"))
     implementation(project(":spigot:paper"))
     compileOnly(libs.brigadier)
     compileOnly(libs.spigot)

spigot/modern/V1_20_5_NMS/build.gradle.kts

@@ -29,7 +29,7 @@ java {
 }
 
 tasks.compileJava {
-    options.release.set(17) // So that it compiles, otherwise it thinks Record class doesn't exist
+    options.release.set(17)
 }
 
 dependencies {

spigot/modern/V1_21_6_NMS/build.gradle.kts

@@ -0,0 +1,37 @@
+/*
+ *  LICENSE
+ * AdvancedPlHide
+ * -------------
+ * Copyright (C) 2021 - 2024 BlueTree242
+ * -------------
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as
+ * published by the Free Software Foundation, either version 3 of the
+ * License, or (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public
+ * License along with this program.  If not, see
+ * <http://www.gnu.org/licenses/gpl-3.0.html>.
+ *  END
+ */
+
+plugins {
+    id("io.papermc.paperweight.userdev")
+}
+
+java {
+    toolchain.languageVersion.set(JavaLanguageVersion.of(21))
+}
+
+tasks.compileJava {
+    options.release.set(17)
+}
+
+dependencies {
+    paperweight.paperDevBundle("1.21.6-R0.1-SNAPSHOT")
+}

spigot/modern/V1_21_6_NMS/src/main/java/dev/bluetree242/advancedplhide/spigot/modern/V1_21_6_Handler.java

@@ -0,0 +1,93 @@
+package dev.bluetree242.advancedplhide.spigot.modern;
+
+import com.comphenix.protocol.PacketType;
+import com.comphenix.protocol.events.PacketContainer;
+import com.comphenix.protocol.events.PacketEvent;
+import com.comphenix.protocol.reflect.StructureModifier;
+import com.mojang.brigadier.arguments.ArgumentType;
+import com.mojang.brigadier.builder.ArgumentBuilder;
+import com.mojang.brigadier.builder.LiteralArgumentBuilder;
+import com.mojang.brigadier.builder.RequiredArgumentBuilder;
+import com.mojang.brigadier.suggestion.Suggestions;
+import com.mojang.brigadier.tree.RootCommandNode;
+import dev.bluetree242.advancedplhide.CompleterModifier;
+import dev.bluetree242.advancedplhide.Group;
+import dev.bluetree242.advancedplhide.impl.completer.RootNodeCommandCompleter;
+import net.minecraft.commands.Commands;
+import net.minecraft.commands.SharedSuggestionProvider;
+import net.minecraft.commands.synchronization.SuggestionProviders;
+import net.minecraft.data.registries.VanillaRegistries;
+import net.minecraft.network.protocol.game.ClientboundCommandSuggestionsPacket;
+import net.minecraft.network.protocol.game.ClientboundCommandsPacket;
+import net.minecraft.resources.ResourceLocation;
+import org.jetbrains.annotations.NotNull;
+import org.jetbrains.annotations.Nullable;
+
+import java.lang.reflect.Field;
+import java.util.ArrayList;
+
+public class V1_21_6_Handler implements ModernHandler {
+    public static ClientboundCommandsPacket.NodeInspector<?> getCommandNodeInspector() {
+        Field field = null;
+        for (Field f : Commands.class.getDeclaredFields()) {
+            if (ClientboundCommandsPacket.NodeInspector.class.isAssignableFrom(f.getType())) {
+                field = f;
+                field.setAccessible(true);
+                break;
+            }
+        }
+        if (field == null) throw new RuntimeException("COMMAND_NODE_INSPECTOR field not found");
+        try {
+            return (ClientboundCommandsPacket.NodeInspector<?>) field.get(null);
+        } catch (IllegalAccessException e) {
+            throw new RuntimeException(e);
+        }
+    }
+
+    @Override
+    public void handleCommands(PacketEvent packetEvent, Group group, boolean whitelist) {
+        ClientboundCommandsPacket packet = (ClientboundCommandsPacket) packetEvent.getPacket().getHandle();
+        RootCommandNode<SharedSuggestionProvider> nodeOrigin = packet.getRoot(Commands.createValidationContext(VanillaRegistries.createLookup()), new CustomNodeBuilder());
+        RootNodeCommandCompleter node = new RootNodeCommandCompleter(nodeOrigin);
+        CompleterModifier.handleCompleter(node, group, whitelist);
+        //noinspection unchecked
+        packetEvent.setPacket(new PacketContainer(PacketType.Play.Server.COMMANDS, new ClientboundCommandsPacket(node.export(), getCommandNodeInspector())));
+    }
+
+    @Override
+    public Suggestions getSuggestions(PacketEvent packetEvent) {
+        ClientboundCommandSuggestionsPacket packet = (ClientboundCommandSuggestionsPacket) packetEvent.getPacket().getHandle();
+        Suggestions suggestions = packet.toSuggestions();
+        return new Suggestions(suggestions.getRange(), new ArrayList<>(suggestions.getList()));
+    }
+
+    @Override
+    public void writeSuggestions(PacketEvent packetEvent, StructureModifier<Suggestions> modifier, Suggestions suggestions) {
+        ClientboundCommandSuggestionsPacket packet = (ClientboundCommandSuggestionsPacket) packetEvent.getPacket().getHandle();
+        packetEvent.setPacket(new PacketContainer(PacketType.Play.Server.TAB_COMPLETE, new ClientboundCommandSuggestionsPacket(packet.id(), suggestions)));
+    }
+
+    private static class CustomNodeBuilder implements ClientboundCommandsPacket.NodeBuilder<SharedSuggestionProvider> {
+        @Override
+        public @NotNull ArgumentBuilder<SharedSuggestionProvider, ?> createLiteral(@NotNull String s) {
+            return LiteralArgumentBuilder.literal(s);
+        }
+
+        @Override
+        public @NotNull ArgumentBuilder<SharedSuggestionProvider, ?> createArgument(@NotNull String s, @NotNull ArgumentType<?> argumentType, @Nullable ResourceLocation resourceLocation) {
+            RequiredArgumentBuilder<SharedSuggestionProvider, ?> requiredArgumentBuilder = RequiredArgumentBuilder.argument(s, argumentType);
+            if (resourceLocation != null) {
+                requiredArgumentBuilder.suggests(SuggestionProviders.getProvider(resourceLocation));
+            }
+            return requiredArgumentBuilder;
+        }
+
+        @Override
+        public @NotNull ArgumentBuilder<SharedSuggestionProvider, ?> configure(@NotNull ArgumentBuilder<SharedSuggestionProvider, ?> argumentBuilder, boolean b, boolean b1) {
+            if (b) {
+                argumentBuilder.executes(context -> 0);
+            }
+            return argumentBuilder;
+        }
+    }
+}

spigot/paper/src/main/java/dev/bluetree242/advancedplhide/spigot/paper/PaperEventListener.java

@@ -67,7 +67,6 @@ public void onSuggestions(AsyncPlayerSendSuggestionsEvent e) {
         if (!notCompleted.contains(" ")) {
             SuggestionCommandCompleterList suggestions = new SuggestionCommandCompleterList(e.getSuggestions());
             CompleterModifier.handleCompleter(suggestions, getGroup.apply(e.getPlayer()), e.getPlayer().hasPermission(Constants.WHITELIST_MODE_PERMISSION));
-            suggestions.export();
         } else {
             SuggestionSubCommandCompleterList suggestions = new SuggestionSubCommandCompleterList(e.getSuggestions(), notCompleted);
             CompleterModifier.handleSubCompleter(suggestions, getGroup.apply(e.getPlayer()), e.getPlayer().hasPermission(Constants.WHITELIST_MODE_PERMISSION));

spigot/src/main/java/dev/bluetree242/advancedplhide/spigot/AdvancedPlHideSpigot.java

@@ -28,10 +28,7 @@
 import dev.bluetree242.advancedplhide.impl.version.UpdateCheckResult;
 import dev.bluetree242.advancedplhide.spigot.listener.event.SpigotEventListener;
 import dev.bluetree242.advancedplhide.spigot.listener.packet.SpigotPacketListener;
-import dev.bluetree242.advancedplhide.spigot.modern.ModernHandler;
-import dev.bluetree242.advancedplhide.spigot.modern.V1_19_3_Handler;
-import dev.bluetree242.advancedplhide.spigot.modern.V1_19_Handler;
-import dev.bluetree242.advancedplhide.spigot.modern.V1_20_5_Handler;
+import dev.bluetree242.advancedplhide.spigot.modern.*;
 import dev.bluetree242.advancedplhide.spigot.paper.PaperEventListener;
 import dev.bluetree242.advancedplhide.utils.Constants;
 import org.bukkit.Bukkit;
@@ -99,25 +96,41 @@ public void onEnable() {
 
     public void useProtocolLib() {
         String mv = Bukkit.getServer().getBukkitVersion();
-        legacy = (mv.startsWith("1.8") || mv.startsWith("1.9") || mv.startsWith("1.10") || mv.startsWith("1.11") || mv.startsWith("1.12"));
+        legacy = isLegacyVersion(mv);
         if (!legacy) {
-            boolean modernNeeded = !(mv.startsWith("1.13") || mv.startsWith("1.14") || mv.startsWith("1.15") || mv.startsWith("1.16") || mv.startsWith("1.17") || mv.startsWith("1.18"));
-            if (!modernNeeded) {
-                modernHandler = (packetEvent, group, whitelist) -> {
-                    throw new UnsupportedOperationException();
-                };
-            } else if (mv.startsWith("1.19.1")) {
-                modernHandler = new V1_19_Handler();
-            } else if (mv.startsWith("1.19.3") || mv.startsWith("1.19.4") || (mv.startsWith("1.20") && Integer.parseInt(mv.substring(5, 6)) <= 4)) { // Expect 1.19.3+
-                modernHandler = new V1_19_3_Handler();
-            } else {
-                modernHandler = new V1_20_5_Handler();
-            }
+            modernHandler = resolveModernHandler(mv);
         }
         protocolLibHookHandler = new ProtocolLibHookHandler();
         protocolLibHookHandler.hook();
     }
 
+    private boolean isLegacyVersion(String mv) {
+        return mv.startsWith("1.8") || mv.startsWith("1.9") || mv.startsWith("1.10") ||
+                mv.startsWith("1.11") || mv.startsWith("1.12");
+    }
+
+    private ModernHandler resolveModernHandler(String mv) {
+        if (!isModernNeeded(mv)) {
+            return (packetEvent, group, whitelist) -> {
+                throw new UnsupportedOperationException();
+            };
+        } else if (mv.startsWith("1.19.1")) {
+            return new V1_19_Handler();
+        } else if (mv.startsWith("1.19.3") || mv.startsWith("1.19.4") ||
+                (mv.startsWith("1.20") && Integer.parseInt(mv.substring(5, 6)) <= 4)) {
+            return new V1_19_3_Handler();
+        } else if (mv.startsWith("1.21") && Integer.parseInt(mv.substring(5, 6)) <= 5) {
+            return new V1_20_5_Handler();
+        } else {
+            return new V1_21_6_Handler();
+        }
+    }
+
+    private boolean isModernNeeded(String mv) {
+        return !(mv.startsWith("1.13") || mv.startsWith("1.14") || mv.startsWith("1.15") ||
+                mv.startsWith("1.16") || mv.startsWith("1.17") || mv.startsWith("1.18"));
+    }
+
     public void onDisable() {
         if (protocolLibHookHandler != null) protocolLibHookHandler.unhook();
     }
@@ -244,4 +257,4 @@ public Type getType() {
             return Type.SPIGOT;
         }
     }
-}
+}