star/KSpigot
1
0
Fork 0
Code Pull Requests Packages Activity

Bump to 1.20.2 (#59)

Browse Source 
* chore: Bump versions of kotlin and paperweight/bukkit

* chore: Bump craftbukkit version

* chore: Replace deprecated toLowerCase with lowercase

* chore: Bump project version to 1.20.2
This commit is contained in:
kilian
2023-12-17 18:54:17 +01:00
committed by GitHub
parent 89aef519b9
commit 89351c808d
5 changed files with 11 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
build.gradle.kts
View File

@@ -3,12 +3,12 @@ import org.jetbrains.kotlin.gradle.tasks.KotlinCompile
val githubRepo = "jakobkmar/KSpigot" val githubRepo = "jakobkmar/KSpigot"
group = "net.axay" group = "net.axay"
version = "1.20.1" version = "1.20.2"
description = "A Kotlin API for Minecraft plugins using the Spigot or Paper toolchain" description = "A Kotlin API for Minecraft plugins using the Spigot or Paper toolchain"
plugins { plugins {
kotlin("jvm") version "1.8.22" kotlin("jvm") version "1.9.21"
kotlin("plugin.serialization") version "1.8.22" kotlin("plugin.serialization") version "1.8.22"
`java-library` `java-library`
@@ -17,7 +17,7 @@ plugins {
id("org.jetbrains.dokka") version "1.8.20" 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 { repositories {
@@ -25,7 +25,7 @@ repositories {
} }
dependencies { 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-serialization-json:1.5.1")
api("org.jetbrains.kotlinx:kotlinx-coroutines-core:1.7.1") api("org.jetbrains.kotlinx:kotlinx-coroutines-core:1.7.1")
@@ -74,7 +74,7 @@ publishing {
artifact(tasks.jar.get().outputs.files.single()) artifact(tasks.jar.get().outputs.files.single())
this.groupId = project.group.toString() this.groupId = project.group.toString()
this.artifactId = project.name.toLowerCase() this.artifactId = project.name.lowercase()
this.version = project.version.toString() this.version = project.version.toString()
pom { pom {

4
src/main/kotlin/net/axay/kspigot/commands/internal/BrigardierSupport.kt
View File

@@ -33,7 +33,7 @@ object BrigardierSupport {
} }
@Suppress("HasPlatformType") @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 .server.vanillaCommandDispatcher
internal fun registerAll() { internal fun registerAll() {
@@ -52,7 +52,7 @@ object BrigardierSupport {
fun updateCommandTree() { fun updateCommandTree() {
onlinePlayers.forEach { onlinePlayers.forEach {
// send the command tree // 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)
} }
} }
} }

4
src/main/kotlin/net/axay/kspigot/data/NBTDataLoader.kt
View File

@@ -4,8 +4,8 @@ package net.axay.kspigot.data
import net.axay.kspigot.annotations.NMS_General import net.axay.kspigot.annotations.NMS_General
import net.minecraft.nbt.CompoundTag import net.minecraft.nbt.CompoundTag
import org.bukkit.craftbukkit.v1_20_R1.entity.CraftEntity import org.bukkit.craftbukkit.v1_20_R2.entity.CraftEntity
import org.bukkit.craftbukkit.v1_20_R1.inventory.CraftItemStack import org.bukkit.craftbukkit.v1_20_R2.inventory.CraftItemStack
import org.bukkit.entity.Entity import org.bukkit.entity.Entity
import org.bukkit.inventory.ItemStack import org.bukkit.inventory.ItemStack

2
src/main/kotlin/net/axay/kspigot/extensions/bukkit/EntityExtensions.kt
View File

@@ -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.") @Deprecated("This function is unstable and it cannot be guaranteed that it will work at any time in the future.")
@NMS_General @NMS_General
fun Location.spawnCleanEntity(entityType: EntityType): Entity? { 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 { return craftWorld.createEntity(this, entityType.entityClass)?.let {
craftWorld.handle.addFreshEntity(it) craftWorld.handle.addFreshEntity(it)
return@let it.bukkitEntity return@let it.bukkitEntity

2
src/main/kotlin/net/axay/kspigot/structures/Structure.kt
View File

@@ -10,7 +10,7 @@ import org.bukkit.Location
import org.bukkit.Material import org.bukkit.Material
import org.bukkit.block.Block import org.bukkit.block.Block
import org.bukkit.block.data.BlockData 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.Entity
import org.bukkit.entity.EntityType import org.bukkit.entity.EntityType