Merge pull request #25 from SLNE-Development/fix/fix-some-stuff

Fix/fix some stuff

Author: Keviro

gradle.properties

@@ -1,4 +1,4 @@
 kotlin.code.style=official
 kotlin.stdlib.default.dependency=false
 org.gradle.parallel=true
-version=1.21.11-2.0.10-SNAPSHOT
+version=1.21.11-2.0.11-SNAPSHOT

src/main/kotlin/dev/slne/surf/essentials/command/argument/GameruleArgument.kt

@@ -4,14 +4,15 @@ import dev.jorel.commandapi.CommandTree
 import dev.jorel.commandapi.arguments.Argument
 import dev.jorel.commandapi.arguments.ArgumentSuggestions
 import dev.jorel.commandapi.arguments.CustomArgument
-import dev.jorel.commandapi.arguments.StringArgument
+import dev.jorel.commandapi.arguments.NamespacedKeyArgument
 import dev.slne.surf.essentials.util.GameRuleWrapper
 import dev.slne.surf.surfapi.core.api.messages.adventure.buildText
 import org.bukkit.GameRule
+import org.bukkit.NamespacedKey
 
 class GameruleArgument(nodeName: String) :
-    CustomArgument<GameRule<*>, String>(StringArgument(nodeName), { info ->
-        GameRuleWrapper.getByName(info.input)
+    CustomArgument<GameRule<*>, NamespacedKey>(NamespacedKeyArgument(nodeName), { info ->
+        GameRuleWrapper.getByKey(info.input)
             ?: throw CustomArgumentException.fromAdventureComponent {
                 buildText {
                     appendErrorPrefix()

src/main/kotlin/dev/slne/surf/essentials/listener/GameModeSwitcherCorrectionListener.kt

@@ -8,6 +8,14 @@ import org.bukkit.event.Listener
 import org.bukkit.event.player.PlayerChangedWorldEvent
 import org.bukkit.event.player.PlayerJoinEvent
 
+
+/**
+ * As of Minecraft 1.21.6, this is no longer possible. There is a PR to Paper to reintroduce this functionality.
+ *
+ * @see [Paper Issue #13489](https://github.com/PaperMC/Paper/issues/13489)
+ * @see [Paper PR #13507](https://github.com/PaperMC/Paper/pull/13507)
+ */
+
 object GameModeSwitcherCorrectionListener : Listener {
     @EventHandler
     fun onJoin(event: PlayerJoinEvent) {

src/main/kotlin/dev/slne/surf/essentials/util/GameRuleWrapper.kt

@@ -7,6 +7,6 @@ object GameRuleWrapper {
     private val registryAccess = RegistryAccess.registryAccess().getRegistry(RegistryKey.GAME_RULE)
 
     fun all() = registryAccess.toList()
-    fun getByName(namespacedKey: String) =
+    fun getByKey(namespacedKey: String) =
         registryAccess.firstOrNull { it.key.asString() == namespacedKey }
 }