diff --git a/build.gradle.kts b/build.gradle.kts index d80571bf..724102b4 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.20.3" +version = "1.20.1" description = "A Kotlin API for Minecraft plugins using the Spigot or Paper toolchain" plugins { - kotlin("jvm") version "1.9.21" - kotlin("plugin.serialization") version "1.9.21" + kotlin("jvm") version "1.8.22" + kotlin("plugin.serialization") version "1.8.22" `java-library` `maven-publish` signing - id("org.jetbrains.dokka") version "1.9.10" + id("org.jetbrains.dokka") version "1.8.20" - id("io.papermc.paperweight.userdev") version "1.5.11" + id("io.papermc.paperweight.userdev") version "1.5.5" } repositories { @@ -25,11 +25,11 @@ repositories { } dependencies { - paperweight.paperDevBundle("1.20.4-R0.1-SNAPSHOT") + paperweight.paperDevBundle("1.20.1-R0.1-SNAPSHOT") - api("org.jetbrains.kotlinx:kotlinx-serialization-json:1.6.2") - api("org.jetbrains.kotlinx:kotlinx-coroutines-core:1.7.3") - api("org.jetbrains.kotlinx:kotlinx-coroutines-jdk8:1.7.3") + api("org.jetbrains.kotlinx:kotlinx-serialization-json:1.5.1") + api("org.jetbrains.kotlinx:kotlinx-coroutines-core:1.7.1") + api("org.jetbrains.kotlinx:kotlinx-coroutines-jdk8:1.7.1") } tasks { @@ -56,9 +56,9 @@ java { withJavadocJar() } -signing { - sign(publishing.publications) -} +//signing { +// sign(publishing.publications) +//} publishing { repositories { 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 161be300..c5dcaa6b 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_R3.CraftServer) + fun resolveCommandManager() = (server as org.bukkit.craftbukkit.v1_20_R1.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_R3.entity.CraftPlayer).handle) + resolveCommandManager().sendCommands((it as org.bukkit.craftbukkit.v1_20_R1.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 b298690f..805865e4 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_R3.entity.CraftEntity -import org.bukkit.craftbukkit.v1_20_R3.inventory.CraftItemStack +import org.bukkit.craftbukkit.v1_20_R1.entity.CraftEntity +import org.bukkit.craftbukkit.v1_20_R1.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 3c087bee..e0628e41 100644 --- a/src/main/kotlin/net/axay/kspigot/extensions/bukkit/EntityExtensions.kt +++ b/src/main/kotlin/net/axay/kspigot/extensions/bukkit/EntityExtensions.kt @@ -138,8 +138,8 @@ 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_R3.CraftWorld ?: return null - return craftWorld.makeEntity(this, entityType.entityClass!!)?.let { + val craftWorld = world as? org.bukkit.craftbukkit.v1_20_R1.CraftWorld ?: return null + return craftWorld.createEntity(this, entityType.entityClass!!)?.let { craftWorld.handle.addFreshEntity(it) return@let it.bukkitEntity } @@ -197,7 +197,7 @@ fun Player.give(vararg itemStacks: ItemStack) = inventory.addItem(*itemStacks) * Adds all equipment locks to every equipment slot */ fun ArmorStand.fullLock() { - for (slot in EquipmentSlot.entries) { + for (slot in EquipmentSlot.values()) { lock(slot) } } @@ -207,7 +207,7 @@ fun ArmorStand.fullLock() { * @param slot the slot which gets locked */ fun ArmorStand.lock(slot: EquipmentSlot) { - for (lock in ArmorStand.LockType.entries) { + for (lock in ArmorStand.LockType.values()) { addEquipmentLock(slot, lock) } } \ No newline at end of file diff --git a/src/main/kotlin/net/axay/kspigot/structures/Structure.kt b/src/main/kotlin/net/axay/kspigot/structures/Structure.kt index 0f67ec5a..920168be 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_R3.entity.CraftEntity +import org.bukkit.craftbukkit.v1_20_R1.entity.CraftEntity import org.bukkit.entity.Entity import org.bukkit.entity.EntityType