diff --git a/build.gradle.kts b/build.gradle.kts
index 1d807537..4e9eb467 100644
--- a/build.gradle.kts
+++ b/build.gradle.kts
@@ -8,17 +8,17 @@ import org.jetbrains.kotlin.gradle.dsl.JvmTarget
 import java.io.ByteArrayOutputStream
 
 plugins {
-    kotlin("jvm") version "2.4.0"
+    kotlin("jvm") version "2.3.0"
     java
-    id("org.jetbrains.dokka").version("2.2.0")
-    id("com.gradleup.shadow").version("9.6.1")
+    id("org.jetbrains.dokka").version("1.9.20")
+    id("com.gradleup.shadow").version("9.3.0")
     // Maven publish
     `maven-publish`
     signing
-    id("cn.lalaki.central").version("2.0.8")
+    id("cn.lalaki.central").version("1.2.8")
     // Paper
-    id("io.papermc.paperweight.userdev") version "2.0.0-beta.21" apply false
-    id("io.papermc.hangar-publish-plugin") version "0.1.4"
+    id("io.papermc.paperweight.userdev") version "2.0.0-beta.17" apply false
+    id("io.papermc.hangar-publish-plugin") version "0.1.2"
 }
 
 group = "xyz.alexcrea"
@@ -166,7 +166,7 @@ allprojects {
 
     kotlin {
         compilerOptions {
-            apiVersion.set(org.jetbrains.kotlin.gradle.dsl.KotlinVersion.KOTLIN_2_4)
+            apiVersion.set(org.jetbrains.kotlin.gradle.dsl.KotlinVersion.KOTLIN_2_2)
             jvmTarget.set(JvmTarget.JVM_21)
         }
     }
@@ -178,10 +178,7 @@ tasks {
 
     fun ShadowJar.configureBaseShadow(suffix: String, libraries: Array<String>) {
         val processedSuffix = if(suffix.isEmpty()) "" else "-$suffix"
-        val version = effectiveVersion
-        val name = "${rootProject.name}-${version}${processedSuffix}.jar"
-        val librariesExpendTo = libraries.joinToString(transform = { "\"$it\"" })
-
+        val name = "${rootProject.name}-${effectiveVersion}${processedSuffix}.jar"
         archiveFileName.set(name)
 
         // Shadow necessary dependency
@@ -190,8 +187,8 @@ tasks {
 
         filesMatching("plugin.yml") {
             expand(
-                "version" to version + processedSuffix,
-                "libraries" to librariesExpendTo,
+                "version" to effectiveVersion + processedSuffix,
+                "libraries" to libraries.joinToString(transform = { "\"$it\"" }),
             )
         }
 
@@ -203,7 +200,7 @@ tasks {
     shadowJar {
         configureBaseShadow("",
             arrayOf(
-                "org.jetbrains.kotlin:kotlin-stdlib:2.4.0",
+                "org.jetbrains.kotlin:kotlin-stdlib:2.3.0",
                 "net.kyori:adventure-text-minimessage:4.25.0",
                 "net.kyori:adventure-text-serializer-plain:4.25.0",
                 "net.kyori:adventure-text-serializer-legacy:4.25.0",
diff --git a/gradle.properties b/gradle.properties
index 50a6ad2d..8bf9e80a 100644
--- a/gradle.properties
+++ b/gradle.properties
@@ -1,5 +1,4 @@
 kotlin.code.style=official
-org.gradle.configuration-cache=true
 
 # Signing
 signing.secretKeyRingFile=~/.gnupg/secring.gpg
diff --git a/impl/ExcellentEnchant5_4/build.gradle.kts b/impl/ExcellentEnchant5_4/build.gradle.kts
index e624d159..9fe598b1 100644
--- a/impl/ExcellentEnchant5_4/build.gradle.kts
+++ b/impl/ExcellentEnchant5_4/build.gradle.kts
@@ -2,7 +2,7 @@ group = rootProject.group
 version = rootProject.version
 
 plugins {
-    kotlin("jvm") version "2.4.0"
+    kotlin("jvm") version "2.3.0"
 }
 
 repositories {
diff --git a/impl/LegacyEcoEnchant/build.gradle.kts b/impl/LegacyEcoEnchant/build.gradle.kts
index 71c62a78..3c3f1aeb 100644
--- a/impl/LegacyEcoEnchant/build.gradle.kts
+++ b/impl/LegacyEcoEnchant/build.gradle.kts
@@ -2,7 +2,7 @@ group = rootProject.group
 version = rootProject.version
 
 plugins {
-    kotlin("jvm") version "2.4.0"
+    kotlin("jvm") version "2.3.0"
 }
 
 // Imitate needed class and method to support legacy version of EcoEnchant
diff --git a/nms/nms-common/build.gradle.kts b/nms/nms-common/build.gradle.kts
index 69777bae..46f684d7 100644
--- a/nms/nms-common/build.gradle.kts
+++ b/nms/nms-common/build.gradle.kts
@@ -29,7 +29,7 @@ tasks.withType<JavaCompile>().configureEach {
 
 kotlin {
     compilerOptions {
-        apiVersion.set(org.jetbrains.kotlin.gradle.dsl.KotlinVersion.KOTLIN_2_4)
+        apiVersion.set(org.jetbrains.kotlin.gradle.dsl.KotlinVersion.KOTLIN_2_2)
         jvmTarget.set(JvmTarget.JVM_21)
     }
 }
diff --git a/nms/nms-paper/build.gradle.kts b/nms/nms-paper/build.gradle.kts
index 1fc283d7..19033be7 100644
--- a/nms/nms-paper/build.gradle.kts
+++ b/nms/nms-paper/build.gradle.kts
@@ -29,7 +29,7 @@ tasks.withType<JavaCompile>().configureEach {
 
 kotlin {
     compilerOptions {
-        apiVersion.set(org.jetbrains.kotlin.gradle.dsl.KotlinVersion.KOTLIN_2_4)
+        apiVersion.set(org.jetbrains.kotlin.gradle.dsl.KotlinVersion.KOTLIN_2_2)
         jvmTarget.set(JvmTarget.JVM_21)
     }
 }
diff --git a/nms/nms-paper/src/main/kotlin/xyz/alexcrea/cuanvil/dependency/datapack/DataPackTester.kt b/nms/nms-paper/src/main/kotlin/xyz/alexcrea/cuanvil/dependency/datapack/DataPackTester.kt
index 043c25f8..221dd2fa 100644
--- a/nms/nms-paper/src/main/kotlin/xyz/alexcrea/cuanvil/dependency/datapack/DataPackTester.kt
+++ b/nms/nms-paper/src/main/kotlin/xyz/alexcrea/cuanvil/dependency/datapack/DataPackTester.kt
@@ -1,39 +1,20 @@
-@file:Suppress("DEPRECATION", "removal")
 package xyz.alexcrea.cuanvil.dependency.datapack
 
 import io.papermc.paper.datapack.Datapack
 import org.bukkit.Bukkit
-import org.bukkit.packs.DataPack
 import java.util.*
 
 object DataPackTester {
-    val legacyNames: List<String>
-        get() = Bukkit.getDataPackManager().dataPacks
-            .stream().filter { obj -> obj.isEnabled }
-            .map { pack -> pack.key.key }
-            .toList()
 
     val enabledPacks: List<String>
         get() {
-            try {
-                // will throw error if do not exist
-                Bukkit::class.java.getDeclaredMethod("getDatapackManager")
-
-                return Bukkit.getDatapackManager().enabledPacks
+            return try {
+                Bukkit.getDatapackManager().enabledPacks
                     .stream().map { obj: Datapack -> obj.name }
                     .toList()
-            } catch(_: NoSuchMethodException) {
-                try {
-                    DataPack::class.java.getDeclaredMethod("getKey")
-                } catch(_: NoSuchMethodException) {
-                    System.err.println("Could not find compatible datapack manager")
-                    System.err.println("If you are using a datapack that should be compatible with CustomAnvil. It will not get detected...")
-                    return emptyList()
-                }
-                return legacyNames
-            } catch(_: Exception) {
+            } catch (_: Exception){
                 // Assume cause UnimplementedOperationException on mock server
-                return Collections.emptyList()
+                Collections.emptyList()
             }
         }
 }
diff --git a/nms/nms-paper/src/main/kotlin/xyz/alexcrea/cuanvil/util/AnvilTitleUtil.kt b/nms/nms-paper/src/main/kotlin/xyz/alexcrea/cuanvil/util/AnvilTitleUtil.kt
index 447b06e6..dc8ac092 100644
--- a/nms/nms-paper/src/main/kotlin/xyz/alexcrea/cuanvil/util/AnvilTitleUtil.kt
+++ b/nms/nms-paper/src/main/kotlin/xyz/alexcrea/cuanvil/util/AnvilTitleUtil.kt
@@ -13,7 +13,6 @@ object AnvilTitleUtil {
 
     private val runTaskMap = HashMap<UUID, ScheduledTask>()
 
-    @Suppress("DEPRECATION")
     private fun actualRename(view: AnvilView, name: String, player: HumanEntity, anvilDialog: AnvilRenameDialog) {
         runTaskMap.remove(player.uniqueId)
         if (view.title == name) return
diff --git a/nms/v1_21R1/build.gradle.kts b/nms/v1_21R1/build.gradle.kts
index ba86048f..bf2152cc 100644
--- a/nms/v1_21R1/build.gradle.kts
+++ b/nms/v1_21R1/build.gradle.kts
@@ -29,7 +29,7 @@ tasks.withType<JavaCompile>().configureEach {
 
 kotlin {
     compilerOptions {
-        apiVersion.set(org.jetbrains.kotlin.gradle.dsl.KotlinVersion.KOTLIN_2_4)
+        apiVersion.set(org.jetbrains.kotlin.gradle.dsl.KotlinVersion.KOTLIN_2_2)
         jvmTarget.set(JvmTarget.JVM_21)
     }
 }
diff --git a/nms/v1_21R2/build.gradle.kts b/nms/v1_21R2/build.gradle.kts
index cbb75718..e65f6fd8 100644
--- a/nms/v1_21R2/build.gradle.kts
+++ b/nms/v1_21R2/build.gradle.kts
@@ -29,7 +29,7 @@ tasks.withType<JavaCompile>().configureEach {
 
 kotlin {
     compilerOptions {
-        apiVersion.set(org.jetbrains.kotlin.gradle.dsl.KotlinVersion.KOTLIN_2_4)
+        apiVersion.set(org.jetbrains.kotlin.gradle.dsl.KotlinVersion.KOTLIN_2_2)
         jvmTarget.set(JvmTarget.JVM_21)
     }
 }
diff --git a/nms/v1_21R3/build.gradle.kts b/nms/v1_21R3/build.gradle.kts
index 4b54abc6..d06816cc 100644
--- a/nms/v1_21R3/build.gradle.kts
+++ b/nms/v1_21R3/build.gradle.kts
@@ -29,7 +29,7 @@ tasks.withType<JavaCompile>().configureEach {
 
 kotlin {
     compilerOptions {
-        apiVersion.set(org.jetbrains.kotlin.gradle.dsl.KotlinVersion.KOTLIN_2_4)
+        apiVersion.set(org.jetbrains.kotlin.gradle.dsl.KotlinVersion.KOTLIN_2_2)
         jvmTarget.set(JvmTarget.JVM_21)
     }
 }
diff --git a/nms/v1_21R4/build.gradle.kts b/nms/v1_21R4/build.gradle.kts
index 9e2f6e31..8bd22b9f 100644
--- a/nms/v1_21R4/build.gradle.kts
+++ b/nms/v1_21R4/build.gradle.kts
@@ -28,7 +28,7 @@ tasks.withType<JavaCompile>().configureEach {
 
 kotlin {
     compilerOptions {
-        apiVersion.set(org.jetbrains.kotlin.gradle.dsl.KotlinVersion.KOTLIN_2_4)
+        apiVersion.set(org.jetbrains.kotlin.gradle.dsl.KotlinVersion.KOTLIN_2_2)
         jvmTarget.set(JvmTarget.JVM_21)
     }
 }
diff --git a/nms/v1_21R5/build.gradle.kts b/nms/v1_21R5/build.gradle.kts
index 2b5520ef..e7f7c47c 100644
--- a/nms/v1_21R5/build.gradle.kts
+++ b/nms/v1_21R5/build.gradle.kts
@@ -28,7 +28,7 @@ tasks.withType<JavaCompile>().configureEach {
 
 kotlin {
     compilerOptions {
-        apiVersion.set(org.jetbrains.kotlin.gradle.dsl.KotlinVersion.KOTLIN_2_4)
+        apiVersion.set(org.jetbrains.kotlin.gradle.dsl.KotlinVersion.KOTLIN_2_2)
         jvmTarget.set(JvmTarget.JVM_21)
     }
 }
diff --git a/nms/v1_21R6/build.gradle.kts b/nms/v1_21R6/build.gradle.kts
index 69af3d8f..3189b5cb 100644
--- a/nms/v1_21R6/build.gradle.kts
+++ b/nms/v1_21R6/build.gradle.kts
@@ -28,7 +28,7 @@ tasks.withType<JavaCompile>().configureEach {
 
 kotlin {
     compilerOptions {
-        apiVersion.set(org.jetbrains.kotlin.gradle.dsl.KotlinVersion.KOTLIN_2_4)
+        apiVersion.set(org.jetbrains.kotlin.gradle.dsl.KotlinVersion.KOTLIN_2_2)
         jvmTarget.set(JvmTarget.JVM_21)
     }
 }
diff --git a/nms/v1_21R7/build.gradle.kts b/nms/v1_21R7/build.gradle.kts
index 0b39eee9..91c3111a 100644
--- a/nms/v1_21R7/build.gradle.kts
+++ b/nms/v1_21R7/build.gradle.kts
@@ -28,7 +28,7 @@ tasks.withType<JavaCompile>().configureEach {
 
 kotlin {
     compilerOptions {
-        apiVersion.set(org.jetbrains.kotlin.gradle.dsl.KotlinVersion.KOTLIN_2_4)
+        apiVersion.set(org.jetbrains.kotlin.gradle.dsl.KotlinVersion.KOTLIN_2_2)
         jvmTarget.set(JvmTarget.JVM_21)
     }
 }
diff --git a/src/main/kotlin/xyz/alexcrea/cuanvil/dependency/DependencyManager.kt b/src/main/kotlin/xyz/alexcrea/cuanvil/dependency/DependencyManager.kt
index fc715a44..66dd5db4 100644
--- a/src/main/kotlin/xyz/alexcrea/cuanvil/dependency/DependencyManager.kt
+++ b/src/main/kotlin/xyz/alexcrea/cuanvil/dependency/DependencyManager.kt
@@ -30,7 +30,7 @@ import xyz.alexcrea.cuanvil.dependency.util.PlatformUtil
 import xyz.alexcrea.cuanvil.dependency.util.PlatformUtil.componentLore
 import xyz.alexcrea.cuanvil.listener.PrepareAnvilListener.Companion.ANVIL_OUTPUT_SLOT
 import xyz.alexcrea.cuanvil.util.MetricsUtil.trackError
-import java.lang.IllegalStateException
+import java.lang.reflect.Constructor
 import java.util.logging.Level
 
 @Suppress("UnstableApiUsage")
@@ -337,14 +337,10 @@ object DependencyManager {
 
 
     private val prepareAnvilConstructor =
-        PrepareAnvilEvent::class.java.constructors.first()
+        PrepareAnvilEvent::class.java.constructors.first() as Constructor<PrepareAnvilEvent>
 
     fun createFakeEvent(view: AnvilView, result: ItemStack?): PrepareAnvilEvent {
-        val result = prepareAnvilConstructor.newInstance(view, result)
-        if(result !is PrepareAnvilEvent)
-            throw IllegalStateException("Could not create a PrepareAnvilEvent ?")
-
-        return result
+        return prepareAnvilConstructor.newInstance(view, result)
     }
 
 }
diff --git a/src/main/kotlin/xyz/alexcrea/cuanvil/dependency/plugins/ItemsAdderDependency.kt b/src/main/kotlin/xyz/alexcrea/cuanvil/dependency/plugins/ItemsAdderDependency.kt
index 6ef257bb..9f366b20 100644
--- a/src/main/kotlin/xyz/alexcrea/cuanvil/dependency/plugins/ItemsAdderDependency.kt
+++ b/src/main/kotlin/xyz/alexcrea/cuanvil/dependency/plugins/ItemsAdderDependency.kt
@@ -6,7 +6,6 @@ import org.bukkit.NamespacedKey
 import org.bukkit.inventory.ItemStack
 import org.bukkit.plugin.Plugin
 
-@Suppress("DEPRECATION")
 class ItemsAdderDependency(plugin: Plugin) : GenericPluginDependency(plugin) {
     var isLoaded: Boolean = false
         get() {
diff --git a/src/main/kotlin/xyz/alexcrea/cuanvil/dependency/plugins/LegacyEcoEnchantDependency.kt b/src/main/kotlin/xyz/alexcrea/cuanvil/dependency/plugins/LegacyEcoEnchantDependency.kt
index 7f4196cf..60f00b85 100644
--- a/src/main/kotlin/xyz/alexcrea/cuanvil/dependency/plugins/LegacyEcoEnchantDependency.kt
+++ b/src/main/kotlin/xyz/alexcrea/cuanvil/dependency/plugins/LegacyEcoEnchantDependency.kt
@@ -10,20 +10,13 @@ class LegacyEcoEnchantDependency {
 
 
     private var ecoEnchantOldEnchantments: MutableSet<EcoEnchant>? = null
-    private fun unregisterEnchantment(enchant: Any) {
-        EnchantmentApi.unregisterEnchantment((enchant as Enchantment).key)
-    }
-
-    private fun registerEnchantment(ecoEnchant: EcoEnchant, enchant: Any) {
-        EnchantmentApi.registerEnchantment(CALegacyEcoEnchant(ecoEnchant, enchant as Enchantment))
-    }
-
     fun registerEnchantments() {
         val enchantments = EcoEnchants.values()
         for (ecoEnchant in enchantments) {
-            // As eco enchants is loaded before custom anvil and register enchantment to registry, we need to unregister old "vanilla" enchant.
-            unregisterEnchantment(ecoEnchant)
-            registerEnchantment(ecoEnchant, ecoEnchant)
+            ecoEnchant as Enchantment
+
+            EnchantmentApi.unregisterEnchantment(ecoEnchant) // As eco enchants is loaded before custom anvil and register enchantment to registry, we need to unregister old "vanilla" enchant.
+            EnchantmentApi.registerEnchantment(CALegacyEcoEnchant(ecoEnchant, ecoEnchant))
         }
 
         ecoEnchantOldEnchantments = HashSet(enchantments)
@@ -38,13 +31,13 @@ class LegacyEcoEnchantDependency {
         // Add new enchantments
         for (ecoEnchant in newEnchantments)
             if (!this.ecoEnchantOldEnchantments!!.contains(ecoEnchant))
-                registerEnchantment(ecoEnchant, ecoEnchant)
+                EnchantmentApi.registerEnchantment(CALegacyEcoEnchant(ecoEnchant, ecoEnchant as Enchantment))
 
 
         // Remove old enchantments that not now currently used
         this.ecoEnchantOldEnchantments!!.removeAll(newEnchantments)
         for (oldEnchantment in this.ecoEnchantOldEnchantments!!) {
-            unregisterEnchantment(oldEnchantment)
+            EnchantmentApi.unregisterEnchantment(oldEnchantment as Enchantment)
         }
 
         this.ecoEnchantOldEnchantments = HashSet(newEnchantments)
diff --git a/src/main/kotlin/xyz/alexcrea/cuanvil/dependency/plugins/ToolStatsDependency.kt b/src/main/kotlin/xyz/alexcrea/cuanvil/dependency/plugins/ToolStatsDependency.kt
index 8456ec87..f1193d17 100644
--- a/src/main/kotlin/xyz/alexcrea/cuanvil/dependency/plugins/ToolStatsDependency.kt
+++ b/src/main/kotlin/xyz/alexcrea/cuanvil/dependency/plugins/ToolStatsDependency.kt
@@ -18,13 +18,9 @@ class ToolStatsDependency(plugin: Plugin) : GenericPluginDependency(plugin) {
         getTokenMethod.trySetAccessible()
     }
 
-    private fun ItemChecker.getTokenSafe(item: ItemStack?): Array<*> {
-        if (item == null) return arrayOf<Any>()
-        val result = getTokenMethod.invoke(this, item)
-        if(result !is Array<*>)
-            throw IllegalStateException("Could not get token from ToolStats")
-
-        return result
+    private fun ItemChecker.getTokenSafe(item: ItemStack?): Array<String> {
+        if (item == null) return arrayOf()
+        return getTokenMethod.invoke(this, item) as Array<String>
     }
 
     override fun testAnvilResult(event: InventoryClickEvent): Boolean {