Update to 1.21.11

Author: DrexHD

build.gradle.kts

@@ -3,11 +3,11 @@ import org.jetbrains.changelog.Changelog
 plugins {
     java
     id("maven-publish")
-    id("fabric-loom") version "1.11.+"
+    id("fabric-loom") version "1.14.+"
     kotlin("jvm") version "2.2.21"
     id("io.github.goooler.shadow") version "8.1.7"
     kotlin("plugin.serialization") version "2.2.21"
-    id("me.modmuss50.mod-publish-plugin") version "0.8.4"
+    id("me.modmuss50.mod-publish-plugin") version "1.1.0"
     id("org.jetbrains.changelog") version "2.+"
 }
 

gradle/wrapper/gradle-wrapper.properties

@@ -1,6 +1,6 @@
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-8.14.3-bin.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-9.2.1-bin.zip
 networkTimeout=10000
 validateDistributionUrl=true
 zipStoreBase=GRADLE_USER_HOME

libs.versions.toml

@@ -1,10 +1,10 @@
 [versions]
-minecraft = "1.21.10"
-curseforge-minecraft="1.21.10"
-fabric-loader = "0.17.3"
-yarn-mappings = "1.21.10+build.1"
+minecraft = "1.21.11"
+curseforge-minecraft="1.21.11"
+fabric-loader = "0.18.4"
+yarn-mappings = "1.21.11+build.3"
 
-fabric-api = "0.136.0+1.21.10"
+fabric-api = "0.140.2+1.21.11"
 
 # Kotlin
 fabric-kotlin = "1.13.7+kotlin.2.2.21"
@@ -16,8 +16,8 @@ emoji-java = "5.1.1"
 adventure-gson = "4.25.0"
 
 placeholder-api = "2.8.1+1.21.10"
-permission-api = "0.4.1"
-vanish-api = "1.6.1+1.21.10"
+permission-api = "0.6.1"
+vanish-api = "1.6.5+1.21.11"
 konf = "1.1.2"
 
 [libraries]

src/main/kotlin/io/github/quiltservertools/blockbotdiscord/extensions/ConsoleExtension.kt

@@ -11,6 +11,7 @@ import io.github.quiltservertools.blockbotdiscord.config.config
 import io.github.quiltservertools.blockbotdiscord.config.getChannel
 import kotlinx.coroutines.launch
 import kotlinx.datetime.DateTimeUnit
+import net.minecraft.command.permission.LeveledPermissionPredicate
 import net.minecraft.server.MinecraftServer
 import net.minecraft.server.command.ServerCommandSource
 import net.minecraft.server.dedicated.MinecraftDedicatedServer
@@ -65,7 +66,7 @@ class ConsoleExtension : Extension() {
                     Vec3d.ZERO,
                     Vec2f.ZERO,
                     serverWorld,
-                    4,
+                    LeveledPermissionPredicate.OWNERS,
                     sender.id,
                     Text.literal(sender.id),
                     server,

src/main/kotlin/io/github/quiltservertools/blockbotdiscord/extensions/inline/InlineCommandsExtension.kt

@@ -8,6 +8,8 @@ import dev.kordex.core.i18n.types.Key
 import io.github.quiltservertools.blockbotdiscord.config.InlineCommandsSpec
 import io.github.quiltservertools.blockbotdiscord.config.config
 import io.github.quiltservertools.blockbotdiscord.config.guildId
+import net.minecraft.command.permission.LeveledPermissionPredicate
+import net.minecraft.command.permission.PermissionLevel
 import net.minecraft.server.MinecraftServer
 import net.minecraft.server.command.ServerCommandSource
 import net.minecraft.server.dedicated.MinecraftDedicatedServer
@@ -38,14 +40,14 @@ class InlineCommandsExtension : Extension() {
                     Vec3d.ZERO,
                     Vec2f.ZERO,
                     serverWorld,
-                    config[InlineCommandsSpec.opLevel],
+                    LeveledPermissionPredicate.fromLevel(PermissionLevel.fromLevel(config[InlineCommandsSpec.opLevel])),
                     member!!.asMember().tag,
                     Text.literal(member!!.asMember().tag),
                     server,
                     null
                 )
 
-                (server as MinecraftDedicatedServer).commandManager.executeWithPrefix(source, arguments.command)
+                (server as MinecraftDedicatedServer).commandManager.parseAndExecute(source, arguments.command)
                 output.sendBuffer()
             }
         }

src/main/kotlin/io/github/quiltservertools/blockbotdiscord/extensions/linking/LinkCommand.kt

@@ -16,6 +16,7 @@ import io.github.quiltservertools.blockbotdiscord.utility.formatText
 import kotlinx.coroutines.launch
 import net.minecraft.command.argument.GameProfileArgumentType
 import net.minecraft.server.PlayerConfigEntry
+import net.minecraft.server.command.CommandManager
 import net.minecraft.server.command.CommandManager.argument
 import net.minecraft.server.command.CommandManager.literal
 import net.minecraft.server.command.ServerCommandSource
@@ -37,7 +38,7 @@ class LinkCommand(private val dispatcher: Dispatcher) {
                         .executes { unlinkAccount(it, it.source.playerOrThrow) })
                 .then(
                     literal("get")
-                        .requires { it.hasPermissionLevel(2) }
+                        .requires (CommandManager.requirePermissionLevel(CommandManager.GAMEMASTERS_CHECK))
                         .then(
                             literal("minecraft")
                             .then(

src/main/kotlin/io/github/quiltservertools/blockbotdiscord/extensions/linking/LinkingExtension.kt

@@ -28,6 +28,7 @@ import kotlinx.coroutines.launch
 import kotlinx.coroutines.runBlocking
 import me.lucko.fabric.api.permissions.v0.Permissions
 import net.fabricmc.fabric.api.networking.v1.ServerPlayConnectionEvents
+import net.minecraft.command.permission.PermissionLevel
 import net.minecraft.server.MinecraftServer
 import net.minecraft.server.PlayerConfigEntry
 import net.minecraft.server.network.ServerPlayerEntity
@@ -160,7 +161,7 @@ suspend fun ServerPlayerEntity.syncLinkedRoles() {
     config[LinkingSpec.syncedRoles].entries
         .forEach { syncedRole ->
             val hasPermission =
-                Permissions.check(this@syncLinkedRoles.commandSource, "blockbot.sync.roles.${syncedRole.key}", 4)
+                Permissions.check(this@syncLinkedRoles.commandSource, "blockbot.sync.roles.${syncedRole.key}", PermissionLevel.OWNERS)
             if (roles.contains(syncedRole.value) && !hasPermission) {
                 member.removeRole(Snowflake(syncedRole.value), "blockbot role sync")
             } else if (!roles.contains(syncedRole.value) && hasPermission) {