Update to 1.21.2-rc2

QuiltServerTools · Oct 22, 2024 · 6047de3 · 6047de3
1 parent c171db2
commit 6047de3
Show file tree

Hide file tree

Showing 3 changed files with 11 additions and 9 deletions.
diff --git a/build.gradle.kts b/build.gradle.kts
@@ -132,10 +132,11 @@ publishMods {
     modLoaders.add("quilt")
 
     val minecraftVersion = rootProject.libs.versions.minecraft.get()
+    val curseForgeMinecraftVersion = rootProject.libs.versions.curseforge.minecraft.get()
     curseforge {
         accessToken.set(providers.environmentVariable("CF_API_TOKEN"))
         projectId.set("482904")
-        minecraftVersions.add(minecraftVersion)
+        minecraftVersions.add(curseForgeMinecraftVersion)
     }
     modrinth {
         accessToken.set(providers.environmentVariable("MODRINTH_TOKEN"))

diff --git a/libs.versions.toml b/libs.versions.toml
@@ -1,9 +1,10 @@
 [versions]
-minecraft = "24w39a"
-fabric-loader = "0.16.5"
-yarn-mappings = "24w39a+build.8"
+minecraft = "1.21.2-rc2"
+curseforge-minecraft="1.21.2-Snapshot"
+fabric-loader = "0.16.7"
+yarn-mappings = "1.21.2-rc2+build.2"
 
-fabric-api = "0.105.1+1.21.2"
+fabric-api = "0.106.1+1.21.2"
 
 # Kotlin
 fabric-kotlin = "1.12.1+kotlin.2.0.20"
@@ -14,9 +15,9 @@ mc-discord-reserializer = "4.3.0"
 emoji-java = "5.1.1"
 adventure-gson = "4.16.0"
 
-placeholder-api = "2.4.1+1.21"
+placeholder-api = "2.5.0+1.21.2"
 permission-api = "0.3.1"
-vanish-api = "1.5.7+1.21.1"
+vanish-api = "1.5.7+1.21.2-rc2"
 konf = "1.1.2"
 
 [libraries]

diff --git a/.../kotlin/io/github/quiltservertools/blockbotdiscord/extensions/linking/LinkingExtension.kt b/.../kotlin/io/github/quiltservertools/blockbotdiscord/extensions/linking/LinkingExtension.kt
@@ -143,7 +143,7 @@ suspend fun ServerPlayerEntity.syncDiscord() {
 }
 
 suspend fun ServerPlayerEntity.syncLinkedName() {
-    if (!config[LinkingSpec.nicknameSync] || !Permissions.check(this, "blockbot.sync.name", true)) return
+    if (!config[LinkingSpec.nicknameSync] || !Permissions.check(this.commandSource, "blockbot.sync.name", true)) return
     val member = getLinkedAccount()?.asMemberOrNull(Snowflake(config[BotSpec.guild]))
     member?.edit {
         nickname = name.string
@@ -155,7 +155,7 @@ suspend fun ServerPlayerEntity.syncLinkedRoles() {
     val roles = member.roles.map { it.id.value }.toList()
     config[LinkingSpec.syncedRoles].entries
         .forEach { syncedRole ->
-            val hasPermission = Permissions.check(this@syncLinkedRoles, "blockbot.sync.roles.${syncedRole.key}", 4)
+            val hasPermission = Permissions.check(this@syncLinkedRoles.commandSource, "blockbot.sync.roles.${syncedRole.key}", 4)
             if (roles.contains(syncedRole.value) && !hasPermission) {
                 member.removeRole(Snowflake(syncedRole.value), "blockbot role sync")
             } else if (!roles.contains(syncedRole.value) && hasPermission) {