diff --git a/build.gradle.kts b/build.gradle.kts index d702e8c1..5fb8a118 100644 --- a/build.gradle.kts +++ b/build.gradle.kts @@ -3,21 +3,21 @@ import org.jetbrains.kotlin.gradle.tasks.KotlinCompile val githubRepo = "jakobkmar/KSpigot" group = "net.axay" -version = "1.19.1" +version = "1.19.2" description = "A Kotlin API for Minecraft plugins using the Spigot or Paper toolchain" plugins { - kotlin("jvm") version "1.7.22" - kotlin("plugin.serialization") version "1.7.22" + kotlin("jvm") version "1.8.10" + kotlin("plugin.serialization") version "1.8.10" `java-library` `maven-publish` signing - id("org.jetbrains.dokka") version "1.7.20" + id("org.jetbrains.dokka") version "1.8.10" - id("io.papermc.paperweight.userdev") version "1.4.0" + id("io.papermc.paperweight.userdev") version "1.5.3" } repositories { @@ -25,9 +25,9 @@ repositories { } dependencies { - paperDevBundle("1.19.3-R0.1-SNAPSHOT") + paperweight.paperDevBundle("1.19.4-R0.1-SNAPSHOT") - api("org.jetbrains.kotlinx:kotlinx-serialization-json:1.4.1") + api("org.jetbrains.kotlinx:kotlinx-serialization-json:1.5.0") api("org.jetbrains.kotlinx:kotlinx-coroutines-core:1.6.4") api("org.jetbrains.kotlinx:kotlinx-coroutines-jdk8:1.6.4") } 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 141070c1..b3c95dd1 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_19_R2.CraftServer) + fun resolveCommandManager() = (server as org.bukkit.craftbukkit.v1_19_R3.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_19_R2.entity.CraftPlayer).handle) + resolveCommandManager().sendCommands((it as org.bukkit.craftbukkit.v1_19_R3.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 ec3ed132..c3522270 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_19_R2.entity.CraftEntity -import org.bukkit.craftbukkit.v1_19_R2.inventory.CraftItemStack +import org.bukkit.craftbukkit.v1_19_R3.entity.CraftEntity +import org.bukkit.craftbukkit.v1_19_R3.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 4323577d..78e0348a 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_19_R2.CraftWorld ?: return null + val craftWorld = world as? org.bukkit.craftbukkit.v1_19_R3.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 57b3b721..d1a39536 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_19_R2.entity.CraftEntity +import org.bukkit.craftbukkit.v1_19_R3.entity.CraftEntity import org.bukkit.entity.Entity import org.bukkit.entity.EntityType