1.17 update

build.gradle.kts

@@ -5,10 +5,10 @@ group = ""
 version = execute("git", "describe", "--long", "--dirty")
 
 plugins {
-    val kotlinVersion = "1.4.21"
+    val kotlinVersion = "1.6.0"
     kotlin("jvm") version kotlinVersion
     kotlin("kapt") version kotlinVersion
-    id("com.github.johnrengelman.shadow") version "2.0.4"
+    id("com.github.johnrengelman.shadow") version "7.1.0"
     id("net.minecrell.plugin-yml.bukkit") version "0.3.0"
 }
 
@@ -23,25 +23,25 @@ repositories {
 }
 
 dependencies {
-    implementation(kotlin("stdlib-jdk8"))
+    implementation(kotlin("stdlib"))
     implementation(kotlin("reflect"))
     implementation("co.aikar:acf-paper:0.5.0-SNAPSHOT")
-    implementation("com.google.re2j:re2j:1.5")
-    implementation("org.jetbrains.kotlinx:kotlinx-coroutines-core:1.4.2")
+    implementation("com.google.re2j:re2j:1.6")
+    implementation("org.jetbrains.kotlinx:kotlinx-coroutines-core:1.6.0-RC")
 
-    compileOnly("de.tr7zw:item-nbt-api-plugin:2.5.0")
-    compileOnly("org.spigotmc:spigot-api:1.15-R0.1-SNAPSHOT")
+    compileOnly("de.tr7zw:item-nbt-api-plugin:2.8.0")
+    compileOnly("org.spigotmc:spigot-api:1.17-R0.1-SNAPSHOT")
     compileOnly("com.sk89q.worldedit:worldedit-bukkit:7.2.0-SNAPSHOT")
-    compileOnly("com.comphenix.protocol:ProtocolLib:4.5.0")
+    compileOnly("com.comphenix.protocol:ProtocolLib:4.7.0")
 
     testImplementation("org.junit.jupiter:junit-jupiter-api:5.3.1")
     testRuntimeOnly("org.junit.jupiter:junit-jupiter-engine:5.3.1")
 }
 
 bukkit {
     main = "redstonetools.RedstoneTools"
-    apiVersion = "1.15"
-    depend = listOf("WorldEdit")
+    apiVersion = "1.17"
+    depend = listOf("WorldEdit", "ProtocolLib", "NBTAPI")
 }
 
 tasks.test {
@@ -54,7 +54,7 @@ tasks.shadowJar {
 
 tasks.withType<KotlinCompile> {
     kotlinOptions {
-        jvmTarget = "1.8"
+        jvmTarget = "11"
         javaParameters = true
         freeCompilerArgs = listOf(
             "-Xopt-in=kotlin.ExperimentalStdlibApi",

gradle/wrapper/gradle-wrapper.properties

@@ -1,5 +1,5 @@
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-6.5.1-bin.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-7.3.1-all.zip
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists

src/main/kotlin/Autowire.kt

@@ -9,6 +9,8 @@ import com.comphenix.protocol.PacketType
 import com.comphenix.protocol.ProtocolManager
 import com.comphenix.protocol.wrappers.EnumWrappers
 import com.comphenix.protocol.wrappers.WrappedChatComponent
+import net.md_5.bungee.api.ChatMessageType
+import net.md_5.bungee.api.chat.TextComponent
 import org.bukkit.GameMode
 import org.bukkit.Material
 import org.bukkit.block.data.type.RedstoneWire
@@ -25,7 +27,6 @@ import java.util.*
 @Description("Get that there redstone automagically!")
 @CommandPermission("redstonetools.autowire")
 class Autowire(
-    private val protocolManager: ProtocolManager,
     private val pluginManager: PluginManager,
 ) : BaseCommand(), Listener {
     private val autos = mutableSetOf<UUID>()
@@ -42,11 +43,7 @@ class Autowire(
     }
 
     private fun Player.sendActionBarTitle(message: String) {
-        val titlePacket = protocolManager.createPacket(PacketType.Play.Server.TITLE).apply {
-            titleActions.write(0, EnumWrappers.TitleAction.ACTIONBAR)
-            chatComponents.write(0, WrappedChatComponent.fromText(message))
-        }
-        protocolManager.sendServerPacket(this, titlePacket)
+        spigot().sendMessage(ChatMessageType.ACTION_BAR, TextComponent(message))
     }
 
     @EventHandler
@@ -62,7 +59,7 @@ class Autowire(
                 player.gameMode != GameMode.CREATIVE,
                 !block.blockData.material.isSolid,
                 blockPlaced.type.hasGravity(),
-            ).any().ifTrue { return }
+            ).any { it }.ifTrue { return }
         }
         val wirePosition = event.blockPlaced.location.add(0.0, 1.0, 0.0)
         if (wirePosition.block.type != Material.AIR) return
@@ -89,4 +86,4 @@ class Autowire(
 
 private inline fun Boolean.ifTrue(block: () -> Unit) {
     if (this) block()
-}
+}

src/main/kotlin/RStack.kt

@@ -152,7 +152,7 @@ class RStack(private val worldEdit: WorldEdit) : BaseCommand() {
 
     private fun isDiagDirStr(direction: String, upOrDown: Char) =
         // check length, because 'd' and 'u' alone are not diagonal directions (they're just up or down)
-        direction.length > 1 && direction.last().toLowerCase() == upOrDown
+        direction.length > 1 && direction.last().lowercaseChar() == upOrDown
 }
 
 private fun <E> List<E>.getOrDefault(index: Int, default: E): E = getOrNull(index) ?: default

src/main/kotlin/RedstoneTools.kt

@@ -49,7 +49,7 @@ class RedstoneTools : JavaPlugin() {
         }
         val worldEdit = wePlugin.worldEdit
         val protocolManager = ProtocolLibrary.getProtocolManager()
-        val autowire = Autowire(protocolManager, server.pluginManager)
+        val autowire = Autowire(server.pluginManager)
         arrayOf(
             WorldEditHelper(this, worldEdit),
             SlabListener(),
@@ -89,7 +89,7 @@ private interface Thing<T> {
 }
 
 private fun <T> PaperCommandManager.registerThing(thing: Thing<T>) {
-    val name = thing.readableName.replace(" ", "_").toLowerCase()
+    val name = thing.readableName.replace(" ", "_").lowercase()
     val errorMessage = "${thing.readableName} must be one of ${thing.values}"
     commandContexts.registerContext(thing.valueClass) { context ->
         thing.of(context.popFirstArg()) ?: throw InvalidCommandArgument(errorMessage)

src/main/kotlin/Slab.kt

@@ -39,7 +39,7 @@ class Slab : BaseCommand() {
     }
 
     private fun getSlab(type: String): ItemStack? {
-        val material = Material.getMaterial(type.toUpperCase()) ?: return null
+        val material = Material.getMaterial(type.uppercase()) ?: return null
         if (!material.isBlock) return null
         val blockData = material.createBlockData() as? Slab ?: return null
         val itemStack = ItemStack(material, 1)
@@ -76,5 +76,5 @@ class SlabCompletionHandler :
     override fun getCompletions(context: BukkitCommandCompletionContext): Collection<String> = Material
         .values()
         .filter { it.isBlock && it.createBlockData() is Slab }
-        .map { it.toString().toLowerCase() }
+        .map { it.toString().lowercase() }
 }