From b64f19c42134d8026e385746f96d2426d359640e Mon Sep 17 00:00:00 2001
From: ineanto <ineanto@ineanto.xyz>
Date: Sat, 6 Sep 2025 11:31:52 +0200
Subject: [PATCH] fix: reobf with spigot mappings

---
 .../kotlin-compiler-15622463553617690747.salive       |  0
 build.gradle.kts                                      | 10 +++++++++-
 src/main/kotlin/xyz/ineanto/dragon/RunnerDragon.kt    |  7 ++++---
 .../kotlin/xyz/ineanto/dragon/RunnerDragonLoader.kt   |  4 ++--
 .../kotlin/xyz/ineanto/dragon/world/WorldManager.kt   | 11 ++---------
 5 files changed, 17 insertions(+), 15 deletions(-)
 create mode 100644 .kotlin/sessions/kotlin-compiler-15622463553617690747.salive

diff --git a/.kotlin/sessions/kotlin-compiler-15622463553617690747.salive b/.kotlin/sessions/kotlin-compiler-15622463553617690747.salive
new file mode 100644
index 0000000..e69de29
diff --git a/build.gradle.kts b/build.gradle.kts
index 3199756..13bb9aa 100644
--- a/build.gradle.kts
+++ b/build.gradle.kts
@@ -21,7 +21,7 @@ dependencies {
 
     // Inventory UI
     compileOnly(libs.invui)
-    implementation(libs.invui.kotlin)
+    compileOnly(libs.invui.kotlin)
 
     // Resource Pack (unused)
     implementation(libs.glyphs.api)
@@ -35,7 +35,15 @@ kotlin {
     jvmToolchain(21)
 }
 
+paperweight.reobfArtifactConfiguration = io.papermc.paperweight.userdev.ReobfArtifactConfiguration.REOBF_PRODUCTION
+
 tasks {
+    shadowJar {
+        manifest {
+            attributes["paperweight-mappings-namespace"] = "spigot"
+        }
+    }
+
     runServer {
         minecraftVersion("1.21.8")
     }
diff --git a/src/main/kotlin/xyz/ineanto/dragon/RunnerDragon.kt b/src/main/kotlin/xyz/ineanto/dragon/RunnerDragon.kt
index 19d3af5..3d86b38 100644
--- a/src/main/kotlin/xyz/ineanto/dragon/RunnerDragon.kt
+++ b/src/main/kotlin/xyz/ineanto/dragon/RunnerDragon.kt
@@ -7,7 +7,9 @@ import net.kyori.adventure.text.Component
 import net.kyori.adventure.text.format.NamedTextColor
 import net.kyori.adventure.text.format.TextDecoration
 import net.kyori.adventure.text.minimessage.MiniMessage
-import org.bukkit.*
+import org.bukkit.Bukkit
+import org.bukkit.GameMode
+import org.bukkit.Location
 import org.bukkit.attribute.Attribute
 import org.bukkit.plugin.java.JavaPlugin
 import org.bukkit.scheduler.BukkitTask
@@ -67,7 +69,6 @@ class RunnerDragon : JavaPlugin() {
 
     private lateinit var scoreboardTeams: ScoreboardTeams
 
-    @Suppress("UnstableApiUsage")
     override fun onEnable() {
         instance = this
         InvUI.getInstance().setPlugin(this)
@@ -142,7 +143,7 @@ class RunnerDragon : JavaPlugin() {
                     it.respawnLocation = WorldManager.LIMBO_SPAWN
                     it.inventory.clear()
                     it.clearActivePotionEffects()
-                    it.health = it.getAttribute(Attribute.GENERIC_MAX_HEALTH)!!.value
+                    it.health = it.getAttribute(Attribute.MAX_HEALTH)!!.value
                     it.foodLevel = 20
                     it.level = 0
                     it.exp = 0.0f
diff --git a/src/main/kotlin/xyz/ineanto/dragon/RunnerDragonLoader.kt b/src/main/kotlin/xyz/ineanto/dragon/RunnerDragonLoader.kt
index f8f91f2..8455498 100644
--- a/src/main/kotlin/xyz/ineanto/dragon/RunnerDragonLoader.kt
+++ b/src/main/kotlin/xyz/ineanto/dragon/RunnerDragonLoader.kt
@@ -15,8 +15,8 @@ class RunnerDragonLoader : PluginLoader {
             RemoteRepository.Builder("xenondevs", "default", "https://repo.xenondevs.xyz/releases/").build()
         )
 
-        resolver.addDependency(Dependency(DefaultArtifact("xyz.xenondevs.invui:invui:pom:1.33"), null))
-        resolver.addDependency(Dependency(DefaultArtifact("xyz.xenondevs.invui:invui-kotlin:pom:1.33"), null))
+        resolver.addDependency(Dependency(DefaultArtifact("xyz.xenondevs.invui:invui:pom:1.46"), null))
+        resolver.addDependency(Dependency(DefaultArtifact("xyz.xenondevs.invui:invui-kotlin:pom:1.46"), null))
 
         classpathBuilder.addLibrary(resolver)
     }
diff --git a/src/main/kotlin/xyz/ineanto/dragon/world/WorldManager.kt b/src/main/kotlin/xyz/ineanto/dragon/world/WorldManager.kt
index c4edef0..5e0aab9 100644
--- a/src/main/kotlin/xyz/ineanto/dragon/world/WorldManager.kt
+++ b/src/main/kotlin/xyz/ineanto/dragon/world/WorldManager.kt
@@ -1,13 +1,7 @@
 package xyz.ineanto.dragon.world
 
 import org.apache.commons.io.FileUtils
-import org.bukkit.Bukkit
-import org.bukkit.Difficulty
-import org.bukkit.GameRule
-import org.bukkit.Location
-import org.bukkit.World
-import org.bukkit.WorldCreator
-import org.bukkit.WorldType
+import org.bukkit.*
 import xyz.ineanto.dragon.RunnerDragon
 import java.io.File
 
@@ -82,8 +76,7 @@ class WorldManager(private val instance: RunnerDragon) {
     }
 
     private fun deleteWorld(name: String) {
-        val world = Bukkit.getWorld(name)
-        if (world == null) return
+        val world = Bukkit.getWorld(name) ?: return
         world.loadedChunks.forEach { it.unload(false) }
         Bukkit.unloadWorld(world, false)
         FileUtils.deleteDirectory(world.worldFolder)