From 965808f8feae457dbeed3e8890fd2c658215a355 Mon Sep 17 00:00:00 2001
From: NotStevy <63160089+Command435-CRM@users.noreply.github.com>
Date: Wed, 14 Jun 2023 12:40:05 +0200
Subject: [PATCH] Update to 1.20.1 (#58)

* Port to 1.20.1

---------

Co-authored-by: notstevy <notstevy@ultrabuildmc.de>
---
 build.gradle.kts                                       | 10 +++++-----
 .../kspigot/commands/internal/BrigardierSupport.kt     |  4 ++--
 src/main/kotlin/net/axay/kspigot/data/NBTDataLoader.kt |  4 ++--
 .../axay/kspigot/extensions/bukkit/EntityExtensions.kt |  2 +-
 .../kotlin/net/axay/kspigot/structures/Structure.kt    |  2 +-
 5 files changed, 11 insertions(+), 11 deletions(-)

diff --git a/build.gradle.kts b/build.gradle.kts
index 5fb8a118..4a5d0f63 100644
--- a/build.gradle.kts
+++ b/build.gradle.kts
@@ -3,19 +3,19 @@ import org.jetbrains.kotlin.gradle.tasks.KotlinCompile
 val githubRepo = "jakobkmar/KSpigot"
 
 group = "net.axay"
-version = "1.19.2"
+version = "1.20.1"
 
 description = "A Kotlin API for Minecraft plugins using the Spigot or Paper toolchain"
 
 plugins {
-    kotlin("jvm") version "1.8.10"
-    kotlin("plugin.serialization") version "1.8.10"
+    kotlin("jvm") version "1.8.20"
+    kotlin("plugin.serialization") version "1.8.20"
 
     `java-library`
     `maven-publish`
     signing
 
-    id("org.jetbrains.dokka") version "1.8.10"
+    id("org.jetbrains.dokka") version "1.8.20"
 
     id("io.papermc.paperweight.userdev") version "1.5.3"
 }
@@ -25,7 +25,7 @@ repositories {
 }
 
 dependencies {
-    paperweight.paperDevBundle("1.19.4-R0.1-SNAPSHOT")
+    paperweight.paperDevBundle("1.20.1-R0.1-SNAPSHOT")
 
     api("org.jetbrains.kotlinx:kotlinx-serialization-json:1.5.0")
     api("org.jetbrains.kotlinx:kotlinx-coroutines-core: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 b3c95dd1..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_19_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_19_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 c3522270..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_19_R3.entity.CraftEntity
-import org.bukkit.craftbukkit.v1_19_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 78e0348a..2027927c 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_R3.CraftWorld ?: return null
+    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
diff --git a/src/main/kotlin/net/axay/kspigot/structures/Structure.kt b/src/main/kotlin/net/axay/kspigot/structures/Structure.kt
index d1a39536..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_19_R3.entity.CraftEntity
+import org.bukkit.craftbukkit.v1_20_R1.entity.CraftEntity
 import org.bukkit.entity.Entity
 import org.bukkit.entity.EntityType