diff --git a/.github/workflows/gradle.yml b/.github/workflows/gradle.yml
index a68ab4d8..9fa1712c 100644
--- a/.github/workflows/gradle.yml
+++ b/.github/workflows/gradle.yml
@@ -23,7 +23,7 @@ jobs:
       contents: write
 
     env:
-      MODRINTH_VERSIONS: '["1.18.x", "1.19.x", "1.20.x"]'
+      MODRINTH_VERSIONS: '["1.18.x", "1.19.x", "1.20.x", "1.21.x", "26.1.x", "26.2.x"]'
       MODRINTH_PLATFORMS: '["spigot", "paper", "purpur", "folia"]'
 
     steps:
@@ -124,6 +124,6 @@ jobs:
           webhook-url: ${{ secrets.RELEASE_WEBHOOK_URL }}
           content: |
             <@&1525259349423947867>
-            # New bugfix for CustomAnvil v1 ! <:CustomAnvil:1262550667986342001> [Modrinth](https://modrinth.com/plugin/customanvil) and [GitHub](${{ github.event.release.html_url }}) links
+            # New bugfix for CustomAnvil v1 ! <:CustomAnvil:1262550667986342001> [Modrinth](https://modrinth.com/plugin/customanvil) and [GitHub](${{ github.event.release.html_url }}) links)
 
             ${{ github.event.release.body }}
diff --git a/build.gradle.kts b/build.gradle.kts
index fcde08c8..11bfb00a 100644
--- a/build.gradle.kts
+++ b/build.gradle.kts
@@ -5,23 +5,24 @@ import groovy.util.NodeList
 import io.papermc.hangarpublishplugin.model.HangarPublication
 import io.papermc.hangarpublishplugin.model.Platforms
 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"
-version = "1.20.1"
+version = "1.19.0"
 
 val isDevBuild = System.getenv("SMALL_COMMIT_HASH") != null
 val isPreRelease = System.getenv("IS_GITHUB_PRERELEASE") == "true"
@@ -165,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_16)
         }
     }
@@ -177,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
@@ -189,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\"" }),
             )
         }
 
@@ -202,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",
@@ -214,7 +212,7 @@ tasks {
         exclude("net/kyori/**")
     }
 
-    val offlineJar = register<ShadowJar>("offlineJar") {
+    val offlineJar by registering(ShadowJar::class) {
         configureBaseShadow("offline", emptyArray())
 
         from(sourceSets.main.get().output)
@@ -228,12 +226,12 @@ tasks {
 
 }
 
-val sourcesJar = tasks.register<Jar>("sourcesJar") {
+val sourcesJar by tasks.registering(Jar::class) {
     archiveClassifier.set("sources")
     from(kotlin.sourceSets.main.get().kotlin)
 }
 
-val javadocJar = tasks.register<Jar>("javadocJar", fun Jar.() {
+val javadocJar by tasks.registering(Jar::class, fun Jar.() {
     group = JavaBasePlugin.DOCUMENTATION_GROUP
     description = "Assembles Javadoc JAR"
     archiveClassifier.set("javadoc")
@@ -357,25 +355,36 @@ publishing {
 }
 
 // hangar publish
-fun latestCommitMessage(): Provider<String> {
-    return providers.exec {
-        commandLine("git", "log", "-1", "--pretty=%B")
-    }.standardOutput.asText.map(String::trim)
+
+fun executeGitCommand(vararg command: String): String {
+    val byteOut = ByteArrayOutputStream()
+    exec {
+        commandLine = listOf("git", *command)
+        standardOutput = byteOut
+    }
+    return byteOut.toString(Charsets.UTF_8.name()).trim()
 }
 
-fun changelog(isOnline: Boolean): Provider<String> {
-    val changelog = if(isDevBuild) latestCommitMessage()
-    else providers.environmentVariable("RELEASE_CHANGELOG")
+
+fun latestCommitMessage(): String {
+    return executeGitCommand("log", "-1", "--pretty=%B")
+}
+
+fun changelog(isOnline: Boolean): String {
+    var changelog = if(isDevBuild) latestCommitMessage()
+    else System.getenv("RELEASE_CHANGELOG")
+
+    if(!isOnline) {
+        changelog = "This is an offline version of the plugin. \\\n" +
+                "This mean that this plugin libraries are shaded into this plugin \\\n" +
+                "You likely want to use the normal version of this plugin\n\n" + changelog
+    }
+
+    if(changelog == null || changelog.isEmpty()) {
+        changelog = "empty changelog"
+    }
 
     return changelog
-        .filter{!it.isEmpty()}
-        .map {
-        if(!isOnline)
-            return@map "This is an offline version of the plugin. \\\n" +
-                    "This mean that this plugin libraries are shaded into this plugin \\\n" +
-                    "You likely want to use the normal version of this plugin\n\n" + it
-        else return@map it
-    }.orElse("empty changelog")
 }
 
 hangarPublish {
@@ -389,7 +398,6 @@ hangarPublish {
         channel.set(if (isDevBuild || isPreRelease) devChannel else releaseChannel)
 
         changelog.set(changelog(isOnline))
-
         id.set("CustomAnvil")
         apiKey.set(System.getenv("HANGAR_API_TOKEN"))
 
diff --git a/gradle.properties b/gradle.properties
index b9c47c92..30842b68 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/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties
index 8bf5ce26..0b55a3bd 100644
--- a/gradle/wrapper/gradle-wrapper.properties
+++ b/gradle/wrapper/gradle-wrapper.properties
@@ -1,5 +1,5 @@
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-9.7.0-bin.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-8.14.2-bin.zip
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists
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 00ecd1b8..83057a73 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 a75f9477..950d8072 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_16)
     }
 }
diff --git a/nms/nms-paper/build.gradle.kts b/nms/nms-paper/build.gradle.kts
index 85a5537e..d0e12a76 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_18)
     }
 }
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 4ec2349b..9003fdf4 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,4 +1,3 @@
-@file:Suppress("DEPRECATION", "removal")
 package xyz.alexcrea.cuanvil.dependency.datapack
 
 import io.papermc.paper.datapack.Datapack
@@ -22,21 +21,18 @@ object DataPackTester {
                 return Bukkit.getDatapackManager().enabledPacks
                     .stream().map { obj: Datapack -> obj.name }
                     .toList()
-            } catch (_: NoSuchMethodException) {
+            } catch (e: NoSuchMethodException) {
                 try {
                     DataPack::class.java.getDeclaredMethod("getKey")
-                } catch (_: NoSuchMethodException) {
+                } catch (e: 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 (e: Exception){
                 // Assume cause UnimplementedOperationException on mock server
                 return Collections.emptyList()
-            } catch(_: NoSuchMethodError) {
-                // Idk newer spigot may not have that ?
-                return 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 cf9686c4..e40e7ede 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
@@ -12,7 +12,6 @@ object AnvilTitleUtil {
 
     private val runTaskMap = HashMap<UUID, ScheduledTask>()
 
-    @Suppress("DEPRECATION")
     private fun actualRename(view: InventoryView, name: String, player: HumanEntity, anvilDialog: AnvilRenameDialog) {
         runTaskMap.remove(player.uniqueId)
         if (view.title == name) return
diff --git a/nms/v1_17R1/build.gradle.kts b/nms/v1_17R1/build.gradle.kts
index 45599335..c354b1ce 100644
--- a/nms/v1_17R1/build.gradle.kts
+++ b/nms/v1_17R1/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_16)
     }
 }
diff --git a/nms/v1_18R1/build.gradle.kts b/nms/v1_18R1/build.gradle.kts
index 9c334f3c..44873d5a 100644
--- a/nms/v1_18R1/build.gradle.kts
+++ b/nms/v1_18R1/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_17)
     }
 }
diff --git a/nms/v1_18R2/build.gradle.kts b/nms/v1_18R2/build.gradle.kts
index 3d31ad63..cf349ec6 100644
--- a/nms/v1_18R2/build.gradle.kts
+++ b/nms/v1_18R2/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_17)
     }
 }
diff --git a/nms/v1_19R1/build.gradle.kts b/nms/v1_19R1/build.gradle.kts
index fdd9d07a..9791b9b9 100644
--- a/nms/v1_19R1/build.gradle.kts
+++ b/nms/v1_19R1/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_17)
     }
 }
diff --git a/nms/v1_19R2/build.gradle.kts b/nms/v1_19R2/build.gradle.kts
index bab486de..88f1a8ad 100644
--- a/nms/v1_19R2/build.gradle.kts
+++ b/nms/v1_19R2/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_17)
     }
 }
diff --git a/nms/v1_19R3/build.gradle.kts b/nms/v1_19R3/build.gradle.kts
index 41d70647..3d609af4 100644
--- a/nms/v1_19R3/build.gradle.kts
+++ b/nms/v1_19R3/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_17)
     }
 }
diff --git a/nms/v1_20R1/build.gradle.kts b/nms/v1_20R1/build.gradle.kts
index 3bec3f81..67b46b5e 100644
--- a/nms/v1_20R1/build.gradle.kts
+++ b/nms/v1_20R1/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_18)
     }
 }
diff --git a/nms/v1_20R2/build.gradle.kts b/nms/v1_20R2/build.gradle.kts
index 0b28d317..e8417cd8 100644
--- a/nms/v1_20R2/build.gradle.kts
+++ b/nms/v1_20R2/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_18)
     }
 }
diff --git a/nms/v1_20R3/build.gradle.kts b/nms/v1_20R3/build.gradle.kts
index 2a6d822d..c49ff48d 100644
--- a/nms/v1_20R3/build.gradle.kts
+++ b/nms/v1_20R3/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_18)
     }
 }
diff --git a/nms/v1_20R4/build.gradle.kts b/nms/v1_20R4/build.gradle.kts
index 821c3cd3..3b98361e 100644
--- a/nms/v1_20R4/build.gradle.kts
+++ b/nms/v1_20R4/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_0)
         jvmTarget.set(JvmTarget.JVM_18)
     }
 }
diff --git a/src/main/kotlin/xyz/alexcrea/cuanvil/dependency/DependencyManager.kt b/src/main/kotlin/xyz/alexcrea/cuanvil/dependency/DependencyManager.kt
index e736a8fa..1c68676d 100644
--- a/src/main/kotlin/xyz/alexcrea/cuanvil/dependency/DependencyManager.kt
+++ b/src/main/kotlin/xyz/alexcrea/cuanvil/dependency/DependencyManager.kt
@@ -33,7 +33,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
 
 object DependencyManager {
@@ -342,14 +342,10 @@ object DependencyManager {
 
 
     private val prepareAnvilConstructor =
-        PrepareAnvilEvent::class.java.constructors.first()
+        PrepareAnvilEvent::class.java.constructors.first() as Constructor<PrepareAnvilEvent>
 
     fun createFakeEvent(view: InventoryView, 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/economy/VaultEconomyManager.kt b/src/main/kotlin/xyz/alexcrea/cuanvil/dependency/economy/VaultEconomyManager.kt
index 23d22b52..058485e2 100644
--- a/src/main/kotlin/xyz/alexcrea/cuanvil/dependency/economy/VaultEconomyManager.kt
+++ b/src/main/kotlin/xyz/alexcrea/cuanvil/dependency/economy/VaultEconomyManager.kt
@@ -1,5 +1,3 @@
-@file:Suppress("DEPRECATION")
-
 package xyz.alexcrea.cuanvil.dependency.economy
 
 import net.milkbowl.vault.economy.Economy
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 548080fb..7f977e18 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..255f7373 100644
--- a/src/main/kotlin/xyz/alexcrea/cuanvil/dependency/plugins/ToolStatsDependency.kt
+++ b/src/main/kotlin/xyz/alexcrea/cuanvil/dependency/plugins/ToolStatsDependency.kt
@@ -5,6 +5,7 @@ import lol.hyper.toolstats.tools.ItemChecker
 import org.bukkit.event.inventory.InventoryClickEvent
 import org.bukkit.inventory.ItemStack
 import org.bukkit.plugin.Plugin
+import org.bukkit.plugin.RegisteredListener
 import xyz.alexcrea.cuanvil.listener.PrepareAnvilListener
 import java.lang.reflect.Method
 
@@ -18,13 +19,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 {
diff --git a/src/main/kotlin/xyz/alexcrea/cuanvil/listener/AnvilResultListener.kt b/src/main/kotlin/xyz/alexcrea/cuanvil/listener/AnvilResultListener.kt
index 11dc1936..5cfe46d6 100644
--- a/src/main/kotlin/xyz/alexcrea/cuanvil/listener/AnvilResultListener.kt
+++ b/src/main/kotlin/xyz/alexcrea/cuanvil/listener/AnvilResultListener.kt
@@ -197,9 +197,6 @@ class AnvilResultListener : Listener {
                 result
             )
         ) return
-        else if(player.gameMode != GameMode.CREATIVE) {
-            return
-        }
 
         // Finally, we add the item to the player
         if (slotDestination.type == SlotType.CURSOR) {
@@ -354,8 +351,6 @@ class AnvilResultListener : Listener {
 
             inventory.setItem(ANVIL_OUTPUT_SLOT, null)
 
-        } else if(player.gameMode != GameMode.CREATIVE) {
-            return false
         }
 
         // Finally, we add the item to the player
diff --git a/src/main/kotlin/xyz/alexcrea/cuanvil/util/anvil/AnvilXpUtil.kt b/src/main/kotlin/xyz/alexcrea/cuanvil/util/anvil/AnvilXpUtil.kt
index 379694f2..78ea8830 100644
--- a/src/main/kotlin/xyz/alexcrea/cuanvil/util/anvil/AnvilXpUtil.kt
+++ b/src/main/kotlin/xyz/alexcrea/cuanvil/util/anvil/AnvilXpUtil.kt
@@ -277,7 +277,7 @@ object AnvilXpUtil {
             // We know "enchantment.key in resultEnchs" true
             val resultLevel = resultEnchs[enchantment.key]!!
 
-            val enchantmentMultiplier = ConfigOptions.enchantmentValue(enchantment.key, isToBook, isFromBook)
+            val enchantmentMultiplier = ConfigOptions.enchantmentValue(enchantment.key, isFromBook, isToBook)
             val value = resultLevel * enchantmentMultiplier
             CustomAnvil.log("Value for sacrifice item ${enchantment.key.enchantmentName} level ${enchantment.value} is $value ($resultLevel * $enchantmentMultiplier)")
             rightValue += value
@@ -291,7 +291,7 @@ object AnvilXpUtil {
 
                 val resultLevel = resultEnchs.getOrDefault(enchantment.key, 0)
 
-                val enchantmentMultiplier = ConfigOptions.enchantmentValue(enchantment.key, isToBook, isFromBook)
+                val enchantmentMultiplier = ConfigOptions.enchantmentValue(enchantment.key, isFromBook, isToBook)
                 val value = resultLevel * enchantmentMultiplier
                 CustomAnvil.log("Value for left item ${enchantment.key.enchantmentName} level ${enchantment.value} is $value ($resultLevel * $enchantmentMultiplier)")
                 leftValue += value