diff --git a/build.gradle.kts b/build.gradle.kts index 6025f87c..5fa04408 100644 --- a/build.gradle.kts +++ b/build.gradle.kts @@ -3,12 +3,12 @@ import org.jetbrains.kotlin.gradle.tasks.KotlinCompile val githubRepo = "jakobkmar/KSpigot" group = "net.axay" -version = "1.20.1" +version = "1.20.2" description = "A Kotlin API for Minecraft plugins using the Spigot or Paper toolchain" plugins { - kotlin("jvm") version "1.8.22" + kotlin("jvm") version "1.9.21" kotlin("plugin.serialization") version "1.8.22" `java-library` @@ -17,7 +17,7 @@ plugins { id("org.jetbrains.dokka") version "1.8.20" - id("io.papermc.paperweight.userdev") version "1.5.5" + id("io.papermc.paperweight.userdev") version "1.5.11" } repositories { @@ -25,7 +25,7 @@ repositories { } dependencies { - paperweight.paperDevBundle("1.20.1-R0.1-SNAPSHOT") + paperweight.paperDevBundle("1.20.2-R0.1-SNAPSHOT") api("org.jetbrains.kotlinx:kotlinx-serialization-json:1.5.1") api("org.jetbrains.kotlinx:kotlinx-coroutines-core:1.7.1") @@ -74,7 +74,7 @@ publishing { artifact(tasks.jar.get().outputs.files.single()) this.groupId = project.group.toString() - this.artifactId = project.name.toLowerCase() + this.artifactId = project.name.lowercase() this.version = project.version.toString() pom { diff --git a/src/main/kotlin/net/axay/kspigot/commands/internal/BrigardierSupport.kt b/src/main/kotlin/net/axay/kspigot/commands/internal/BrigardierSupport.kt index c5dcaa6b..0f847c6a 100644 --- a/src/main/kotlin/net/axay/kspigot/commands/internal/BrigardierSupport.kt +++ b/src/main/kotlin/net/axay/kspigot/commands/internal/BrigardierSupport.kt @@ -33,7 +33,7 @@ object BrigardierSupport { } @Suppress("HasPlatformType") - fun resolveCommandManager() = (server as org.bukkit.craftbukkit.v1_20_R1.CraftServer) + fun resolveCommandManager() = (server as org.bukkit.craftbukkit.v1_20_R2.CraftServer) .server.vanillaCommandDispatcher internal fun registerAll() { @@ -52,7 +52,7 @@ object BrigardierSupport { fun updateCommandTree() { onlinePlayers.forEach { // send the command tree - resolveCommandManager().sendCommands((it as org.bukkit.craftbukkit.v1_20_R1.entity.CraftPlayer).handle) + resolveCommandManager().sendCommands((it as org.bukkit.craftbukkit.v1_20_R2.entity.CraftPlayer).handle) } } } diff --git a/src/main/kotlin/net/axay/kspigot/data/NBTDataLoader.kt b/src/main/kotlin/net/axay/kspigot/data/NBTDataLoader.kt index 805865e4..b43de7f1 100644 --- a/src/main/kotlin/net/axay/kspigot/data/NBTDataLoader.kt +++ b/src/main/kotlin/net/axay/kspigot/data/NBTDataLoader.kt @@ -4,8 +4,8 @@ package net.axay.kspigot.data import net.axay.kspigot.annotations.NMS_General import net.minecraft.nbt.CompoundTag -import org.bukkit.craftbukkit.v1_20_R1.entity.CraftEntity -import org.bukkit.craftbukkit.v1_20_R1.inventory.CraftItemStack +import org.bukkit.craftbukkit.v1_20_R2.entity.CraftEntity +import org.bukkit.craftbukkit.v1_20_R2.inventory.CraftItemStack import org.bukkit.entity.Entity import org.bukkit.inventory.ItemStack diff --git a/src/main/kotlin/net/axay/kspigot/extensions/bukkit/EntityExtensions.kt b/src/main/kotlin/net/axay/kspigot/extensions/bukkit/EntityExtensions.kt index 2027927c..3c145daa 100644 --- a/src/main/kotlin/net/axay/kspigot/extensions/bukkit/EntityExtensions.kt +++ b/src/main/kotlin/net/axay/kspigot/extensions/bukkit/EntityExtensions.kt @@ -138,7 +138,7 @@ fun Player.showOnlinePlayers() { @Deprecated("This function is unstable and it cannot be guaranteed that it will work at any time in the future.") @NMS_General fun Location.spawnCleanEntity(entityType: EntityType): Entity? { - val craftWorld = world as? org.bukkit.craftbukkit.v1_20_R1.CraftWorld ?: return null + val craftWorld = world as? org.bukkit.craftbukkit.v1_20_R2.CraftWorld ?: return null return craftWorld.createEntity(this, entityType.entityClass)?.let { craftWorld.handle.addFreshEntity(it) return@let it.bukkitEntity diff --git a/src/main/kotlin/net/axay/kspigot/structures/Structure.kt b/src/main/kotlin/net/axay/kspigot/structures/Structure.kt index 920168be..c1e2b8b6 100644 --- a/src/main/kotlin/net/axay/kspigot/structures/Structure.kt +++ b/src/main/kotlin/net/axay/kspigot/structures/Structure.kt @@ -10,7 +10,7 @@ import org.bukkit.Location import org.bukkit.Material import org.bukkit.block.Block import org.bukkit.block.data.BlockData -import org.bukkit.craftbukkit.v1_20_R1.entity.CraftEntity +import org.bukkit.craftbukkit.v1_20_R2.entity.CraftEntity import org.bukkit.entity.Entity import org.bukkit.entity.EntityType