fix book on item

# Conflicts:
#	src/main/kotlin/xyz/alexcrea/cuanvil/listener/AnvilResultListener.kt

.github/workflows/gradle.yml

@@ -8,12 +8,9 @@
 name: Java CI with Gradle
 
 on:
-  push:
-    branches: [ "v1.x.x", "v2.x.x" ]
-  pull_request:
-    branches: [ "v1.x.x", "v2.x.x" ]
   release:
     types: [published]
+    branches: [ "v1.x.x" ]
 
 concurrency:
   group: ${{ github.workflow }}-${{ github.event_name }}-${{ github.ref }}
@@ -26,46 +23,37 @@ jobs:
       contents: write
 
     env:
-      MODRINTH_VERSIONS: '["1.18.x", "1.19.x", "1.20.x", "1.21.x", "26.1.x", "26.2.x"]'
+      MODRINTH_VERSIONS: '["1.18.x", "1.19.x", "1.20.x"]'
       MODRINTH_PLATFORMS: '["spigot", "paper", "purpur", "folia"]'
 
     steps:
-      - uses: actions/checkout@v4
+      - uses: actions/checkout@v6
       - name: Set up JDKs
-        uses: actions/setup-java@v4
+        uses: actions/setup-java@v5
         with:
           java-version: |
             21
           distribution: 'temurin'
-          cache: gradle
-
-      - name: Cache Gradle root and wrapper
-        uses: actions/cache@v3
-        with:
-          path: |
-            ~/.gradle/caches
-            ~/.gradle/wrapper
-          key: gradle-root-${{ runner.os }}-${{ hashFiles('build.gradle*') }}
-          restore-keys: gradle-root-${{ runner.os }}-
-
-      # Setup paperweight cache
-      - name: Cache paperweight
-        uses: actions/cache@v3
-        with:
-          path: |
-            ./nms/*/.gradle/caches/paperweight
-          key: paperweight-submodules-${{ runner.os }}-${{ hashFiles('nms/*/build.gradle*') }}
-          restore-keys: |
-            paperweight-submodules-${{ runner.os }}-
 
       # Configure Gradle for optimal use in GitHub Actions, including caching of downloaded dependencies.
       # See: https://github.com/gradle/actions/blob/main/setup-gradle/README.md
       - name: Setup Gradle
-        uses: gradle/actions/setup-gradle@v5
+        uses: gradle/actions/setup-gradle@v6
 
       - name: Make gradlew executable
         run: chmod +x ./gradlew
 
+      # Setup paperweight cache
+      - name: Cache paperweight
+        uses: actions/cache@v6
+        with:
+          path: |
+            ./nms/*/.gradle/caches/paperweight
+            ./.gradle/caches/paperweight
+          key: paperweight-submodules-${{ runner.os }}-${{ hashFiles('nms/*/build.gradle*') }}
+          restore-keys: |
+            paperweight-submodules-${{ runner.os }}-
+
       - name: Get small commit hash
         if: ${{ github.event_name != 'release' && success() }}
         run: echo "SMALL_COMMIT_HASH=$(git rev-parse --short ${{ github.sha }})" >> $GITHUB_ENV
@@ -75,7 +63,7 @@ jobs:
 
       # only submit dependency on push
       - name: Generate and submit dependency graph
-        uses: gradle/actions/dependency-submission@v4
+        uses: gradle/actions/dependency-submission@v6
         if: ${{ github.event_name == 'push' && success() }}
         continue-on-error: true
 
@@ -91,16 +79,16 @@ jobs:
 
       # upload the named jars as artifact
       - name: Upload online JAR artifact
-        uses: actions/upload-artifact@v4
+        uses: actions/upload-artifact@v7
         with:
-          name: CustomAnvil.jar
           path: build/libs/${{ env.ONLINE_JAR_NAME }}
+          archive: false
 
       - name: Upload offline JAR file
-        uses: actions/upload-artifact@v4
+        uses: actions/upload-artifact@v7
         with:
-          name: CustomAnvil-offline.jar
           path: build/libs/${{ env.OFFLINE_JAR_NAME }}
+          archive: false
 
       - name: Summarize tests results
         uses: jeantessier/test-summary-action@v1
@@ -109,33 +97,12 @@ jobs:
       # upload the jar to release
       - name: Upload jar to release
         if: ${{ github.event_name == 'release' && success() }}
-        uses: softprops/action-gh-release@v2
+        uses: softprops/action-gh-release@v3
         with:
           files: |
             build/libs/${{ env.ONLINE_JAR_NAME }}
             build/libs/${{ env.OFFLINE_JAR_NAME }}
 
-      - name: Hangar release
-        if: ${{ (github.event_name != 'release' || github.event_name != 'push') && github.repository_owner == 'alexcrea' && success() }}
-        env:
-          HANGAR_API_TOKEN: ${{ secrets.HANGAR_API_TOKEN }}
-          RELEASE_CHANGELOG: ${{ github.event.release.body }}
-        run: ./gradlew publishAllPublicationsToHangar --stacktrace
-
-      - name: Modrinth publish alpha
-        if: ${{ github.event_name == 'push' && github.repository_owner == 'alexcrea' && success() }}
-        uses: cloudnode-pro/modrinth-publish@v2
-        with:
-          token: ${{ secrets.MODRINTH_TOKEN }}
-          project: S75Ueiq9
-          name: dev-${{ env.SMALL_COMMIT_HASH }}
-          version: dev-${{ env.SMALL_COMMIT_HASH }}
-          loaders: ${{ env.MODRINTH_PLATFORMS }}
-          game-versions: ${{ env.MODRINTH_VERSIONS }}
-          channel: alpha
-          files: build/libs/${{ env.ONLINE_JAR_NAME }}
-          changelog: ${{ github.event.head_commit.message }}
-
       - name: Modrinth publish release
         if: ${{ github.event_name == 'release' && github.repository_owner == 'alexcrea' && success() }}
         uses: cloudnode-pro/modrinth-publish@v2
@@ -156,8 +123,7 @@ jobs:
         with:
           webhook-url: ${{ secrets.RELEASE_WEBHOOK_URL }}
           content: |
-            ${{ github.event.release.prerelease == false && '<@&1338546156325568642>' || '<@&1352296092989001768>' }}
-            # New ${{ github.event.release.prerelease && 'beta ' || '' }}version of custom anvil ! <:CustomAnvil:1262550667986342001>([Modrinth](https://modrinth.com/plugin/customanvil), [Hangar](https://hangar.papermc.io/alexcrea/CustomAnvil) and [GitHub](${{ github.event.release.html_url }}) links)
-            -# note: automated release. spigot is not uploaded yet.
+            <@&1525259349423947867>
+            # 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 }}

COMPATIBILITY.md

@@ -17,7 +17,7 @@ These plugins have compatibility handled by custom anvil. seek help on custom an
   Also use ExcellentEnchant max enchant limit
 
 - [EcoEnchant](https://www.spigotmc.org/resources/ecoenchants-%E2%AD%95-250-enchantments-%E2%9C%85-create-custom-enchants-%E2%9C%A8-essentials-cmi-support.79573/) by Auxilor:
-  Need to use /anvilconfigreload or a server restart to add newly added enchantment.
+  Need to use /ca reload or a server restart to add newly added enchantment.
   Use EcoEnchant restriction system but new restriction can be added in custom anvil
 
 - [Enchantment²](https://www.spigotmc.org/resources/enchants-squared-the-enchantsplus-rewrite-custom-enchantments-that-act-like-vanilla-ones.86747/) by Athlaeos:
@@ -40,6 +40,8 @@ Custom Items support is considered unstable. If you find issue please report it
 - [Disenchantment](https://www.spigotmc.org/resources/disenchantment-1-21-1-1-20-6-new-book-splitting-mechanics.110741/) by H7KZ
   Partially use Custom Anvil maximum XP settings (>= 6.1.5)
 
+- [EnchantedBook](https://modrinth.com/plugin/enchantedbook) by Minacle
+
 - [HavenBags](https://www.spigotmc.org/resources/havenbags-shulker-like-player-bound-bags-1-17-1-21-4.110420/) by hyperdefined
   For bag upgrade and skin via anvil. (version >= 1.31.0)
 

README.md

@@ -39,7 +39,8 @@ ca.bypass.level: Allow player to bypass every level limit (no custom limit)
 
 # Command permissions
 ca.command.reload: Allow administrator to reload the plugin's configs
-ca.command.diagnostic: Allow adminastator to diagnistic some simple problem with the plugin
+ca.command.diagnostic: Get debug information about the plugin and server
+ca.command.enchantment: Allows to set enchantment to holden item
 ca.config.edit: Allow administrator to edit the plugin's config in game
 
 # -----------------------------------------------------------------------------

build.gradle.kts

@@ -5,24 +5,23 @@ 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.3.0"
+    kotlin("jvm") version "2.4.0"
     java
-    id("org.jetbrains.dokka").version("1.9.20")
-    id("com.gradleup.shadow").version("9.3.0")
+    id("org.jetbrains.dokka").version("2.2.0")
+    id("com.gradleup.shadow").version("9.6.1")
     // Maven publish
     `maven-publish`
     signing
-    id("cn.lalaki.central").version("1.2.8")
+    id("cn.lalaki.central").version("2.0.8")
     // Paper
-    id("io.papermc.paperweight.userdev") version "2.0.0-beta.17" apply false
-    id("io.papermc.hangar-publish-plugin") version "0.1.2"
+    id("io.papermc.paperweight.userdev") version "2.0.0-beta.21" apply false
+    id("io.papermc.hangar-publish-plugin") version "0.1.4"
 }
 
 group = "xyz.alexcrea"
-version = "1.17.6"
+version = "1.20.1"
 
 val isDevBuild = System.getenv("SMALL_COMMIT_HASH") != null
 val isPreRelease = System.getenv("IS_GITHUB_PRERELEASE") == "true"
@@ -34,9 +33,6 @@ repositories {
     // EcoEnchants
     maven(url = "https://repo.auxilor.io/repository/maven-public/")
 
-    // ExcellentEnchants
-    maven(url = "https://repo.nightexpressdev.com/releases")
-
     // ItemsAdder
     maven(url = "https://maven.devs.beer/")
 
@@ -58,7 +54,7 @@ dependencies {
     compileOnly("org.spigotmc:spigot-api:1.18-R0.1-SNAPSHOT")
 
     // fast stats
-    implementation("dev.faststats.metrics:bukkit:0.27.0")
+    implementation("dev.faststats.metrics:bukkit:0.29.0")
 
     // minimessage
     implementation("net.kyori:adventure-text-minimessage:4.25.0")
@@ -72,21 +68,22 @@ dependencies {
     compileOnly(files("libs/EnchantsSquared.jar"))
 
     // EcoEnchants & item
-    compileOnly("com.willfp:libreforge:4.79.0:all")
-    compileOnly("com.willfp:eco:6.74.5")
+    compileOnly("com.willfp:libreforge:2026.32:all")
+    compileOnly("com.willfp:eco:2026.32")
 
-    compileOnly("com.willfp:EcoEnchants:12.11.1")
+    compileOnly("com.willfp:EcoEnchants:2026.32:all")
     compileOnly(project(":impl:LegacyEcoEnchant"))
 
     compileOnly("com.willfp:EcoItems:5.66.0")
 
     // ExcellentEnchants
     implementation(project(":impl:ExcellentEnchant5_4"))
-    compileOnly("su.nightexpress.excellentenchants:Core:5.1.0") {
-        exclude("org.spigotmc")
-    }
-    compileOnly(files("libs/ExcellentEnchants-4.3.3-striped.jar")) // For pre v5 excellent enchants
-    compileOnly(files("libs/ExcellentEnchants-4.1.0-striped.jar")) // For legacy excellent enchants
+    compileOnly(files("libs/ExcellentEnchants/ExcellentEnchants-4.3.3-striped.jar")) // For pre v5 excellent enchants
+    compileOnly(files("libs/ExcellentEnchants/ExcellentEnchants-4.1.0-striped.jar")) // For legacy excellent enchants
+    // early v5 excellent enchants
+    compileOnly(files("libs/ExcellentEnchants/Core-5.1.0.jar"))
+    compileOnly(files("libs/ExcellentEnchants/API-5.1.0.jar"))
+    compileOnly(files("libs/ExcellentEnchants/main-2.7.9.jar"))
 
     // Disenchantment
     compileOnly(files("libs/Disenchantment-6.1.5.jar"))
@@ -168,7 +165,7 @@ allprojects {
 
     kotlin {
         compilerOptions {
-            apiVersion.set(org.jetbrains.kotlin.gradle.dsl.KotlinVersion.KOTLIN_2_2)
+            apiVersion.set(org.jetbrains.kotlin.gradle.dsl.KotlinVersion.KOTLIN_2_4)
             jvmTarget.set(JvmTarget.JVM_16)
         }
     }
@@ -180,7 +177,10 @@ tasks {
 
     fun ShadowJar.configureBaseShadow(suffix: String, libraries: Array<String>) {
         val processedSuffix = if(suffix.isEmpty()) "" else "-$suffix"
-        val name = "${rootProject.name}-${effectiveVersion}${processedSuffix}.jar"
+        val version = effectiveVersion
+        val name = "${rootProject.name}-${version}${processedSuffix}.jar"
+        val librariesExpendTo = libraries.joinToString(transform = { "\"$it\"" })
+
         archiveFileName.set(name)
 
         // Shadow necessary dependency
@@ -189,8 +189,8 @@ tasks {
 
         filesMatching("plugin.yml") {
             expand(
-                "version" to effectiveVersion + processedSuffix,
-                "libraries" to libraries.joinToString(transform = { "\"$it\"" }),
+                "version" to version + processedSuffix,
+                "libraries" to librariesExpendTo,
             )
         }
 
@@ -202,7 +202,7 @@ tasks {
     shadowJar {
         configureBaseShadow("",
             arrayOf(
-                "org.jetbrains.kotlin:kotlin-stdlib:2.3.0",
+                "org.jetbrains.kotlin:kotlin-stdlib:2.4.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 +214,7 @@ tasks {
         exclude("net/kyori/**")
     }
 
-    val offlineJar by registering(ShadowJar::class) {
+    val offlineJar = register<ShadowJar>("offlineJar") {
         configureBaseShadow("offline", emptyArray())
 
         from(sourceSets.main.get().output)
@@ -228,12 +228,12 @@ tasks {
 
 }
 
-val sourcesJar by tasks.registering(Jar::class) {
+val sourcesJar = tasks.register<Jar>("sourcesJar") {
     archiveClassifier.set("sources")
     from(kotlin.sourceSets.main.get().kotlin)
 }
 
-val javadocJar by tasks.registering(Jar::class, fun Jar.() {
+val javadocJar = tasks.register<Jar>("javadocJar", fun Jar.() {
     group = JavaBasePlugin.DOCUMENTATION_GROUP
     description = "Assembles Javadoc JAR"
     archiveClassifier.set("javadoc")
@@ -357,36 +357,25 @@ publishing {
 }
 
 // hangar publish
-
-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 latestCommitMessage(): Provider<String> {
+    return providers.exec {
+        commandLine("git", "log", "-1", "--pretty=%B")
+    }.standardOutput.asText.map(String::trim)
 }
 
-
-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"
-    }
+fun changelog(isOnline: Boolean): Provider<String> {
+    val changelog = if(isDevBuild) latestCommitMessage()
+    else providers.environmentVariable("RELEASE_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 {
@@ -400,6 +389,7 @@ hangarPublish {
         channel.set(if (isDevBuild || isPreRelease) devChannel else releaseChannel)
 
         changelog.set(changelog(isOnline))
+
         id.set("CustomAnvil")
         apiKey.set(System.getenv("HANGAR_API_TOKEN"))
 

defaultconfigs/1.18/config.yml

@@ -1,6 +1,6 @@
 #
-# It is recommended that you use /configanvil to edit theses config.
-# You can still manually edit here if you like to. but if you do, don't forget to /anvilconfigreload after you changes !
+# It is recommended that you use /ca config to edit theses config.
+# You can still manually edit here if you like to. but if you do, don't forget to /ca reload after you changes !
 #
 
 # What service of metric should custom anvil use

defaultconfigs/1.18/enchant_conflict.yml

@@ -1,6 +1,6 @@
 #
-# It is recommended that you use /configanvil to edit theses config.
-# You can still manually edit here if you like to. but if you do, don't forget to /anvilconfigreload after you changes !
+# It is recommended that you use /ca config to edit theses config.
+# You can still manually edit here if you like to. but if you do, don't forget to /ca reload after you changes !
 #
 
 # material conflicts
@@ -160,13 +160,6 @@ restriction_sweeping_edge:
   enchantments: [ minecraft:sweeping, minecraft:sweeping_edge ]
   notAffectedGroups: [ enchanted_book, swords ]
 
-# Do not exist in 1.18,  that mean useInFuture will be set to true
-# useInFuture set to true also mean it will not warn if there is an issue
-restriction_swift_sneak:
-  useInFuture: true
-  enchantments: [ minecraft:swift_sneak ]
-  notAffectedGroups: [ enchanted_book, leggings ]
-
 restriction_thorns:
   enchantments: [ minecraft:thorns ]
   notAffectedGroups: [ enchanted_book, armors ]

defaultconfigs/1.18/item_groups.yml

@@ -1,6 +1,6 @@
 #
-# It is recommended that you use /configanvil to edit theses config.
-# You can still manually edit here if you like to. but if you do, don't forget to /anvilconfigreload after you changes !
+# It is recommended that you use /ca config to edit theses config.
+# You can still manually edit here if you like to. but if you do, don't forget to /ca reload after you changes !
 #
 
 # Please note this config use spigot material names.

defaultconfigs/1.18/unit_repair_item.yml

@@ -1,6 +1,6 @@
 #
-# It is recommended that you use /configanvil to edit theses config.
-# You can still manually edit here if you like to. but if you do, don't forget to /anvilconfigreload after you changes !
+# It is recommended that you use /ca config to edit theses config.
+# You can still manually edit here if you like to. but if you do, don't forget to /ca reload after you changes !
 #
 
 # Unit repair configuration

defaultconfigs/1.21.11/config.yml

@@ -1,6 +1,6 @@
 #
-# It is recommended that you use /configanvil to edit theses config.
-# You can still manually edit here if you like to. but if you do, don't forget to /anvilconfigreload after you changes !
+# It is recommended that you use /ca config to edit theses config.
+# You can still manually edit here if you like to. but if you do, don't forget to /ca reload after you changes !
 #
 
 # What service of metric should custom anvil use
@@ -154,7 +154,6 @@ enchant_limits:
   minecraft:knockback: 2
   minecraft:fire_aspect: 2
   minecraft:looting: 3
-  minecraft:sweeping: 3
   minecraft:sweeping_edge: 3
   minecraft:efficiency: 5
   minecraft:unbreaking: 3
@@ -293,9 +292,6 @@ enchant_values:
   minecraft:swift_sneak:
     item: 8
     book: 4
-  minecraft:sweeping:
-    item: 4
-    book: 2
   minecraft:sweeping_edge:
     item: 4
     book: 2
@@ -480,6 +476,32 @@ monetary_cost:
     work_penalty: 1.0 # for work penalty (aka use penalty)
     recipe: 1.0 # for custom anvil recipe cost
 
+# Chance that an anvil get degraded
+# set it to zero if you wish to disable it
+anvil_degradation: 0.12
+
+# see https://www.digminecraft.com/lists/sound_list_pc.php
+# for a list of most of the sounds
+anvil_sound:
+  enabled: true
+  # The sound are weighted so if there is multiples of them one is selected randomly
+  # so if you want to add a "rare sound" as an easter egg you can !
+  # If invalid, it will be removed from the list. and if empty it will use the default
+  use:
+    default:
+      sound: block.anvil.use
+      category: blocks
+      volume: 1.0
+      pitch: 1.0
+      weight: 1.0
+  destroy:
+    default:
+      sound: block.anvil.destroy
+      category: blocks
+      volume: 1.0
+      pitch: 1.0
+      weight: 1.0
+
 # Whether to show debug logging
 debug_log: false
 
@@ -489,5 +511,5 @@ debug_log_verbose: false
 # Whether to show inside the console or require to run /ca debug get
 display_debug_in_console: false
 
-configVersion: 1.15.5
+configVersion: 1.17.7
 lowMinecraftVersion: 1.21.11

defaultconfigs/1.21.11/enchant_conflict.yml

@@ -1,6 +1,6 @@
 #
-# It is recommended that you use /configanvil to edit theses config.
-# You can still manually edit here if you like to. but if you do, don't forget to /anvilconfigreload after you changes !
+# It is recommended that you use /ca config to edit theses config.
+# You can still manually edit here if you like to. but if you do, don't forget to /ca reload after you changes !
 #
 
 # material conflicts
@@ -270,16 +270,12 @@ restriction_soul_speed:
 
 restriction_sweeping_edge:
   enchantments:
-  - minecraft:sweeping
   - minecraft:sweeping_edge
   notAffectedGroups:
   - enchanted_book
   - swords
 
-# Do not exist in 1.18,  that mean useInFuture will be set to true
-# useInFuture set to true also mean it will not warn if there is an issue
 restriction_swift_sneak:
-  useInFuture: true
   enchantments:
   - minecraft:swift_sneak
   notAffectedGroups:

defaultconfigs/1.21.11/item_groups.yml

@@ -1,6 +1,6 @@
 #
-# It is recommended that you use /configanvil to edit theses config.
-# You can still manually edit here if you like to. but if you do, don't forget to /anvilconfigreload after you changes !
+# It is recommended that you use /ca config to edit theses config.
+# You can still manually edit here if you like to. but if you do, don't forget to /ca reload after you changes !
 #
 
 # Please note this config use spigot material names.

defaultconfigs/1.21.11/unit_repair_item.yml

@@ -1,6 +1,6 @@
 #
-# It is recommended that you use /configanvil to edit theses config.
-# You can still manually edit here if you like to. but if you do, don't forget to /anvilconfigreload after you changes !
+# It is recommended that you use /ca config to edit theses config.
+# You can still manually edit here if you like to. but if you do, don't forget to /ca reload after you changes !
 #
 
 # Unit repair configuration
@@ -104,7 +104,7 @@ leather:
 phantom_membrane:
   elytra: 0.25
 
-scute:
+turtle_scute:
   turtle_helmet: 0.25
 
 oak_planks:

defaultconfigs/1.21.9/config.yml

@@ -1,6 +1,6 @@
 #
-# It is recommended that you use /configanvil to edit theses config.
-# You can still manually edit here if you like to. but if you do, don't forget to /anvilconfigreload after you changes !
+# It is recommended that you use /ca config to edit theses config.
+# You can still manually edit here if you like to. but if you do, don't forget to /ca reload after you changes !
 #
 
 # What service of metric should custom anvil use
@@ -152,7 +152,6 @@ enchant_limits:
   minecraft:knockback: 2
   minecraft:fire_aspect: 2
   minecraft:looting: 3
-  minecraft:sweeping: 3
   minecraft:sweeping_edge: 3
   minecraft:efficiency: 5
   minecraft:unbreaking: 3
@@ -290,9 +289,6 @@ enchant_values:
   minecraft:swift_sneak:
     item: 8
     book: 4
-  minecraft:sweeping:
-    item: 4
-    book: 2
   minecraft:sweeping_edge:
     item: 4
     book: 2
@@ -472,6 +468,33 @@ monetary_cost:
     work_penalty: 1.0 # for work penalty (aka use penalty)
     recipe: 1.0 # for custom anvil recipe cost
 
+# Chance that an anvil get degraded
+# set it to zero if you wish to disable it
+anvil_degradation: 0.12
+
+# see https://www.digminecraft.com/lists/sound_list_pc.php
+# for a list of most of the sounds
+anvil_sound:
+  enabled: true
+  # The sound are weighted so if there is multiples of them one is selected randomly
+  # so if you want to add a "rare sound" as an easter egg you can !
+  # If invalid, it will be removed from the list. and if empty it will use the default
+  use:
+    default:
+      sound: block.anvil.use
+      category: blocks
+      volume: 1.0
+      pitch: 1.0
+      weight: 1.0
+  destroy:
+    default:
+      sound: block.anvil.destroy
+      category: blocks
+      volume: 1.0
+      pitch: 1.0
+      weight: 1.0
+
+
 # Whether to show debug logging
 debug_log: false
 

defaultconfigs/1.21.9/enchant_conflict.yml

@@ -1,6 +1,6 @@
 #
-# It is recommended that you use /configanvil to edit theses config.
-# You can still manually edit here if you like to. but if you do, don't forget to /anvilconfigreload after you changes !
+# It is recommended that you use /ca config to edit theses config.
+# You can still manually edit here if you like to. but if you do, don't forget to /ca reload after you changes !
 #
 
 # material conflicts
@@ -267,16 +267,12 @@ restriction_soul_speed:
 
 restriction_sweeping_edge:
   enchantments:
-  - minecraft:sweeping
   - minecraft:sweeping_edge
   notAffectedGroups:
   - enchanted_book
   - swords
 
-# Do not exist in 1.18,  that mean useInFuture will be set to true
-# useInFuture set to true also mean it will not warn if there is an issue
 restriction_swift_sneak:
-  useInFuture: true
   enchantments:
   - minecraft:swift_sneak
   notAffectedGroups:

defaultconfigs/1.21.9/item_groups.yml

@@ -1,6 +1,6 @@
 #
-# It is recommended that you use /configanvil to edit theses config.
-# You can still manually edit here if you like to. but if you do, don't forget to /anvilconfigreload after you changes !
+# It is recommended that you use /ca config to edit theses config.
+# You can still manually edit here if you like to. but if you do, don't forget to /ca reload after you changes !
 #
 
 # Please note this config use spigot material names.

defaultconfigs/1.21.9/unit_repair_item.yml

@@ -1,6 +1,6 @@
 #
-# It is recommended that you use /configanvil to edit theses config.
-# You can still manually edit here if you like to. but if you do, don't forget to /anvilconfigreload after you changes !
+# It is recommended that you use /ca config to edit theses config.
+# You can still manually edit here if you like to. but if you do, don't forget to /ca reload after you changes !
 #
 
 # Unit repair configuration
@@ -98,7 +98,7 @@ leather:
 phantom_membrane:
   elytra: 0.25
 
-scute:
+turtle_scute:
   turtle_helmet: 0.25
 
 oak_planks:

defaultconfigs/1.21/config.yml

@@ -1,6 +1,6 @@
 #
-# It is recommended that you use /configanvil to edit theses config.
-# You can still manually edit here if you like to. but if you do, don't forget to /anvilconfigreload after you changes !
+# It is recommended that you use /ca config to edit theses config.
+# You can still manually edit here if you like to. but if you do, don't forget to /ca reload after you changes !
 #
 
 # What service of metric should custom anvil use
@@ -152,7 +152,6 @@ enchant_limits:
   minecraft:knockback: 2
   minecraft:fire_aspect: 2
   minecraft:looting: 3
-  minecraft:sweeping: 3
   minecraft:sweeping_edge: 3
   minecraft:efficiency: 5
   minecraft:unbreaking: 3
@@ -287,9 +286,6 @@ enchant_values:
   minecraft:swift_sneak:
     item: 8
     book: 4
-  minecraft:sweeping:
-    item: 4
-    book: 2
   minecraft:sweeping_edge:
     item: 4
     book: 2
@@ -460,6 +456,33 @@ monetary_cost:
     work_penalty: 1.0 # for work penalty (aka use penalty)
     recipe: 1.0 # for custom anvil recipe cost
 
+# Chance that an anvil get degraded
+# set it to zero if you wish to disable it
+anvil_degradation: 0.12
+
+# see https://www.digminecraft.com/lists/sound_list_pc.php
+# for a list of most of the sounds
+anvil_sound:
+  enabled: true
+  # The sound are weighted so if there is multiples of them one is selected randomly
+  # so if you want to add a "rare sound" as an easter egg you can !
+  # If invalid, it will be removed from the list. and if empty it will use the default
+  use:
+    default:
+      sound: block.anvil.use
+      category: blocks
+      volume: 1.0
+      pitch: 1.0
+      weight: 1.0
+  destroy:
+    default:
+      sound: block.anvil.destroy
+      category: blocks
+      volume: 1.0
+      pitch: 1.0
+      weight: 1.0
+
+
 # Whether to show debug logging
 debug_log: false
 

defaultconfigs/1.21/enchant_conflict.yml

@@ -1,6 +1,6 @@
 #
-# It is recommended that you use /configanvil to edit theses config.
-# You can still manually edit here if you like to. but if you do, don't forget to /anvilconfigreload after you changes !
+# It is recommended that you use /ca config to edit theses config.
+# You can still manually edit here if you like to. but if you do, don't forget to /ca reload after you changes !
 #
 
 # material conflicts
@@ -157,13 +157,10 @@ restriction_soul_speed:
   notAffectedGroups: [ enchanted_book, boots ]
 
 restriction_sweeping_edge:
-  enchantments: [ minecraft:sweeping, minecraft:sweeping_edge ]
+  enchantments: [ minecraft:sweeping_edge ]
   notAffectedGroups: [ enchanted_book, swords ]
 
-# Do not exist in 1.18,  that mean useInFuture will be set to true
-# useInFuture set to true also mean it will not warn if there is an issue
 restriction_swift_sneak:
-  useInFuture: true
   enchantments: [ minecraft:swift_sneak ]
   notAffectedGroups: [ enchanted_book, leggings ]
 

defaultconfigs/1.21/item_groups.yml

@@ -1,6 +1,6 @@
 #
-# It is recommended that you use /configanvil to edit theses config.
-# You can still manually edit here if you like to. but if you do, don't forget to /anvilconfigreload after you changes !
+# It is recommended that you use /ca config to edit theses config.
+# You can still manually edit here if you like to. but if you do, don't forget to /ca reload after you changes !
 #
 
 # Please note this config use spigot material names.

defaultconfigs/1.21/unit_repair_item.yml

@@ -1,6 +1,6 @@
 #
-# It is recommended that you use /configanvil to edit theses config.
-# You can still manually edit here if you like to. but if you do, don't forget to /anvilconfigreload after you changes !
+# It is recommended that you use /ca config to edit theses config.
+# You can still manually edit here if you like to. but if you do, don't forget to /ca reload after you changes !
 #
 
 # Unit repair configuration
@@ -98,7 +98,7 @@ leather:
 phantom_membrane:
   elytra: 0.25
 
-scute:
+turtle_scute:
   turtle_helmet: 0.25
 
 oak_planks:

gradle.properties

@@ -1,4 +1,5 @@
 kotlin.code.style=official
+org.gradle.configuration-cache=true
 
 # Signing
 signing.secretKeyRingFile=~/.gnupg/secring.gpg
@@ -6,8 +7,8 @@ signing.secretKeyRingFile=~/.gnupg/secring.gpg
 kotlin.daemon.jvmargs=-Xmx8G
 
 # list of nms
-subprojects.reobfnms=v1_17R1,v1_18R1,v1_18R2,v1_19R1,v1_19R2,v1_19R3,v1_20R1,v1_20R2,v1_20R3,v1_20R4,v1_21R1,v1_21R2,v1_21R3,v1_21R4,v1_21R5,v1_21R6,v1_21R7
+subprojects.reobfnms=v1_17R1,v1_18R1,v1_18R2
 
 # list of version for hangar release
-paperVersion=1.18-26.2
+paperVersion=1.18-1.20.5
 

gradle/wrapper/gradle-wrapper.properties

@@ -1,5 +1,5 @@
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-8.14.2-bin.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-9.7.0-bin.zip
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists

impl/ExcellentEnchant5_4/build.gradle.kts

@@ -2,7 +2,7 @@ group = rootProject.group
 version = rootProject.version
 
 plugins {
-    kotlin("jvm") version "2.3.0"
+    kotlin("jvm") version "2.4.0"
 }
 
 repositories {

impl/LegacyEcoEnchant/build.gradle.kts

@@ -2,7 +2,7 @@ group = rootProject.group
 version = rootProject.version
 
 plugins {
-    kotlin("jvm") version "2.3.0"
+    kotlin("jvm") version "2.4.0"
 }
 
 // Imitate needed class and method to support legacy version of EcoEnchant

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_2)
+        apiVersion.set(org.jetbrains.kotlin.gradle.dsl.KotlinVersion.KOTLIN_2_4)
         jvmTarget.set(JvmTarget.JVM_16)
     }
 }

nms/nms-common/src/main/kotlin/xyz/alexcrea/cuanvil/dependency/util/PlatformUtil.kt

@@ -37,7 +37,7 @@ object PlatformUtil {
     // Lore
     fun ItemMeta.componentLore(): MutableList<Component> {
         val lore: List<Component>?
-        if(isPaper){
+        if (isPaper) {
             lore = this.lore()
         } else {
             val legacyLores = this.lore ?: return ArrayList()
@@ -52,49 +52,41 @@ object PlatformUtil {
     }
 
     fun ItemMeta.setComponentLore(lore: List<Component?>) {
-        if(isPaper){
+        if (isPaper) {
             this.lore(lore)
         } else {
             val legacyLore = ArrayList<String?>(lore.size)
             for (component in lore) {
-                legacyLore.add(if(component == null) null
-                else legacy_mm.serialize(component))
+                legacyLore.add(
+                    if (component == null) null
+                    else legacy_mm.serialize(component)
+                )
             }
 
             this.lore = legacyLore
         }
     }
 
-    // Display name
-    private val useCustomName = hasMethod(ItemStack::class.java, "customName")
-
     fun ItemMeta.componentDisplayName(): Component? {
-        if(useCustomName){
-            if(!this.hasCustomName()) return null
-            return this.customName()
-        }else if(isPaper){
-            if(!this.hasDisplayName()) return null
-            return this.displayName()
+        if (!this.hasDisplayName()) return null
+
+        return if (isPaper) {
+            this.displayName()
         } else {
-            if(!this.hasDisplayName()) return null
-
-            val legacy = this.displayName
-            return legacy_mm.deserialize(legacy)
+            legacy_mm.deserialize(this.displayName)
         }
     }
 
-    fun ItemMeta.setComponentDisplayName(component: Component?) {
-        if(useCustomName){
-            this.customName(component)
-        }else if(isPaper){
+    fun ItemMeta.setComponentDisplayName(component: Component?, fallback: String? = null) {
+        if (isPaper) {
             this.displayName(component)
         } else {
-            if(component == null){
+            if (component == null) {
                 this.setDisplayName(null)
                 return
             }
 
-            val legacy = legacy_mm.serialize(component)
+            val legacy = fallback ?: legacy_mm.serialize(component)
             this.setDisplayName(legacy)
         }
     }

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_2)
+        apiVersion.set(org.jetbrains.kotlin.gradle.dsl.KotlinVersion.KOTLIN_2_4)
         jvmTarget.set(JvmTarget.JVM_18)
     }
 }

nms/nms-paper/src/main/kotlin/xyz/alexcrea/cuanvil/dependency/datapack/DataPackTester.kt

@@ -1,3 +1,4 @@
+@file:Suppress("DEPRECATION", "removal")
 package xyz.alexcrea.cuanvil.dependency.datapack
 
 import io.papermc.paper.datapack.Datapack
@@ -21,18 +22,21 @@ object DataPackTester {
                 return Bukkit.getDatapackManager().enabledPacks
                     .stream().map { obj: Datapack -> obj.name }
                     .toList()
-            } catch (e: NoSuchMethodException) {
+            } catch (_: NoSuchMethodException) {
                 try {
                     DataPack::class.java.getDeclaredMethod("getKey")
-                } catch (e: NoSuchMethodException) {
+                } 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 (e: Exception){
+            } catch (_: Exception){
                 // Assume cause UnimplementedOperationException on mock server
                 return Collections.emptyList()
+            } catch(_: NoSuchMethodError) {
+                // Idk newer spigot may not have that ?
+                return Collections.emptyList()
             }
         }
 }

nms/nms-paper/src/main/kotlin/xyz/alexcrea/cuanvil/util/AnvilTitleUtil.kt

@@ -12,6 +12,7 @@ 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

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_2)
+        apiVersion.set(org.jetbrains.kotlin.gradle.dsl.KotlinVersion.KOTLIN_2_4)
         jvmTarget.set(JvmTarget.JVM_16)
     }
 }

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_2)
+        apiVersion.set(org.jetbrains.kotlin.gradle.dsl.KotlinVersion.KOTLIN_2_4)
         jvmTarget.set(JvmTarget.JVM_17)
     }
 }

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_2)
+        apiVersion.set(org.jetbrains.kotlin.gradle.dsl.KotlinVersion.KOTLIN_2_4)
         jvmTarget.set(JvmTarget.JVM_17)
     }
 }

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_2)
+        apiVersion.set(org.jetbrains.kotlin.gradle.dsl.KotlinVersion.KOTLIN_2_4)
         jvmTarget.set(JvmTarget.JVM_17)
     }
 }

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_2)
+        apiVersion.set(org.jetbrains.kotlin.gradle.dsl.KotlinVersion.KOTLIN_2_4)
         jvmTarget.set(JvmTarget.JVM_17)
     }
 }

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_2)
+        apiVersion.set(org.jetbrains.kotlin.gradle.dsl.KotlinVersion.KOTLIN_2_4)
         jvmTarget.set(JvmTarget.JVM_17)
     }
 }

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_2)
+        apiVersion.set(org.jetbrains.kotlin.gradle.dsl.KotlinVersion.KOTLIN_2_4)
         jvmTarget.set(JvmTarget.JVM_18)
     }
 }

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_2)
+        apiVersion.set(org.jetbrains.kotlin.gradle.dsl.KotlinVersion.KOTLIN_2_4)
         jvmTarget.set(JvmTarget.JVM_18)
     }
 }

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_2)
+        apiVersion.set(org.jetbrains.kotlin.gradle.dsl.KotlinVersion.KOTLIN_2_4)
         jvmTarget.set(JvmTarget.JVM_18)
     }
 }

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_0)
+        apiVersion.set(org.jetbrains.kotlin.gradle.dsl.KotlinVersion.KOTLIN_2_4)
         jvmTarget.set(JvmTarget.JVM_18)
     }
 }

nms/v1_20R4/src/main/kotlin/xyz/alexcrea/cuanvil/util/MaxDamageCheckerUtil.kt

@@ -1,5 +1,6 @@
 package xyz.alexcrea.cuanvil.util
 
+import org.bukkit.Material
 import org.bukkit.inventory.meta.Damageable
 
 // I LOVE support of old versions and needing to do modules like that
@@ -10,8 +11,8 @@ object MaxDamageCheckerUtil {
     /**
      * @return max damage or int max if not set
       */
-    fun getMaxDamage(meta: Damageable): Int {
-        if(!meta.hasMaxDamage()) return Integer.MAX_VALUE
+    fun getMaxDamage(type: Material, meta: Damageable): Int {
+        if(!meta.hasMaxDamage()) return type.maxDurability.toInt()
         return meta.maxDamage
     }
 

nms/v1_21R1/.gitignore

@@ -1 +0,0 @@
-.lastDeploymentsId

nms/v1_21R1/build.gradle.kts

@@ -1,35 +0,0 @@
-import org.jetbrains.kotlin.gradle.dsl.JvmTarget
-
-group = rootProject.group
-version = rootProject.version
-
-plugins {
-    id("io.papermc.paperweight.userdev")
-}
-
-dependencies {
-    implementation(project(":nms:nms-common"))
-
-    // Used for nms
-    paperweight.paperDevBundle("1.21.1-R0.1-SNAPSHOT")
-}
-
-repositories {
-    maven("https://repo.papermc.io/repository/maven-public/")
-
-}
-
-// Set target version
-tasks.withType<JavaCompile>().configureEach {
-    sourceCompatibility = "21"
-    targetCompatibility = "21"
-
-    options.encoding = "UTF-8"
-}
-
-kotlin {
-    compilerOptions {
-        apiVersion.set(org.jetbrains.kotlin.gradle.dsl.KotlinVersion.KOTLIN_2_2)
-        jvmTarget.set(JvmTarget.JVM_21)
-    }
-}

nms/v1_21R1/src/main/kotlin/xyz/alexcrea/cuanvil/dependency/packet/versions/V1_21R1_PacketManager.kt

@@ -1,33 +0,0 @@
-package xyz.alexcrea.cuanvil.dependency.packet.versions
-
-import net.minecraft.network.protocol.game.ClientboundPlayerAbilitiesPacket
-import net.minecraft.world.entity.player.Abilities
-import org.bukkit.craftbukkit.entity.CraftPlayer
-import org.bukkit.entity.Player
-import xyz.alexcrea.cuanvil.dependency.packet.PacketManager
-import xyz.alexcrea.cuanvil.dependency.packet.PacketManagerBase
-
-class V1_21R1_PacketManager : PacketManagerBase(), PacketManager {
-    override val canSetInstantBuild: Boolean
-        get() = true
-
-    override fun setInstantBuild(player: Player, instantBuild: Boolean) {
-        val nmsPlayer = (player as CraftPlayer).handle
-        val playerAbilities = nmsPlayer.abilities
-        val sendedAbilities: Abilities
-        if (playerAbilities.instabuild == instantBuild) {
-            sendedAbilities = playerAbilities
-        } else {
-            sendedAbilities = Abilities()
-            sendedAbilities.invulnerable = playerAbilities.invulnerable
-            sendedAbilities.flying = playerAbilities.flying
-            sendedAbilities.mayfly = playerAbilities.mayfly
-            sendedAbilities.instabuild = instantBuild
-            sendedAbilities.mayBuild = playerAbilities.mayBuild
-            sendedAbilities.flyingSpeed = playerAbilities.flyingSpeed
-            sendedAbilities.walkingSpeed = playerAbilities.walkingSpeed
-        }
-        val packet = ClientboundPlayerAbilitiesPacket(sendedAbilities)
-        nmsPlayer.connection.send(packet)
-    }
-}

nms/v1_21R2/.gitignore

@@ -1 +0,0 @@
-.lastDeploymentsId

nms/v1_21R2/build.gradle.kts

@@ -1,35 +0,0 @@
-import org.jetbrains.kotlin.gradle.dsl.JvmTarget
-
-group = rootProject.group
-version = rootProject.version
-
-plugins {
-    id("io.papermc.paperweight.userdev")
-}
-
-dependencies {
-    implementation(project(":nms:nms-common"))
-
-    // Used for nms
-    paperweight.paperDevBundle("1.21.3-R0.1-SNAPSHOT")
-}
-
-repositories {
-    maven("https://repo.papermc.io/repository/maven-public/")
-
-}
-
-// Set target version
-tasks.withType<JavaCompile>().configureEach {
-    sourceCompatibility = "21"
-    targetCompatibility = "21"
-
-    options.encoding = "UTF-8"
-}
-
-kotlin {
-    compilerOptions {
-        apiVersion.set(org.jetbrains.kotlin.gradle.dsl.KotlinVersion.KOTLIN_2_2)
-        jvmTarget.set(JvmTarget.JVM_21)
-    }
-}

nms/v1_21R2/src/main/kotlin/xyz/alexcrea/cuanvil/dependency/packet/versions/V1_21R2_PacketManager.kt

@@ -1,33 +0,0 @@
-package xyz.alexcrea.cuanvil.dependency.packet.versions
-
-import net.minecraft.network.protocol.game.ClientboundPlayerAbilitiesPacket
-import net.minecraft.world.entity.player.Abilities
-import org.bukkit.craftbukkit.entity.CraftPlayer
-import org.bukkit.entity.Player
-import xyz.alexcrea.cuanvil.dependency.packet.PacketManager
-import xyz.alexcrea.cuanvil.dependency.packet.PacketManagerBase
-
-class V1_21R2_PacketManager : PacketManagerBase(), PacketManager {
-    override val canSetInstantBuild: Boolean
-        get() = true
-
-    override fun setInstantBuild(player: Player, instantBuild: Boolean) {
-        val nmsPlayer = (player as CraftPlayer).handle
-        val playerAbilities = nmsPlayer.abilities
-        val sendedAbilities: Abilities
-        if (playerAbilities.instabuild == instantBuild) {
-            sendedAbilities = playerAbilities
-        } else {
-            sendedAbilities = Abilities()
-            sendedAbilities.invulnerable = playerAbilities.invulnerable
-            sendedAbilities.flying = playerAbilities.flying
-            sendedAbilities.mayfly = playerAbilities.mayfly
-            sendedAbilities.instabuild = instantBuild
-            sendedAbilities.mayBuild = playerAbilities.mayBuild
-            sendedAbilities.flyingSpeed = playerAbilities.flyingSpeed
-            sendedAbilities.walkingSpeed = playerAbilities.walkingSpeed
-        }
-        val packet = ClientboundPlayerAbilitiesPacket(sendedAbilities)
-        nmsPlayer.connection.send(packet)
-    }
-}

nms/v1_21R3/.gitignore

@@ -1 +0,0 @@
-.lastDeploymentsId

nms/v1_21R3/build.gradle.kts

@@ -1,35 +0,0 @@
-import org.jetbrains.kotlin.gradle.dsl.JvmTarget
-
-group = rootProject.group
-version = rootProject.version
-
-plugins {
-    id("io.papermc.paperweight.userdev")
-}
-
-dependencies {
-    implementation(project(":nms:nms-common"))
-
-    // Used for nms
-    paperweight.paperDevBundle("1.21.4-R0.1-SNAPSHOT")
-}
-
-repositories {
-    maven("https://repo.papermc.io/repository/maven-public/")
-
-}
-
-// Set target version
-tasks.withType<JavaCompile>().configureEach {
-    sourceCompatibility = "21"
-    targetCompatibility = "21"
-
-    options.encoding = "UTF-8"
-}
-
-kotlin {
-    compilerOptions {
-        apiVersion.set(org.jetbrains.kotlin.gradle.dsl.KotlinVersion.KOTLIN_2_2)
-        jvmTarget.set(JvmTarget.JVM_21)
-    }
-}

nms/v1_21R3/src/main/kotlin/xyz/alexcrea/cuanvil/dependency/packet/versions/V1_21R3_PacketManager.kt

@@ -1,33 +0,0 @@
-package xyz.alexcrea.cuanvil.dependency.packet.versions
-
-import net.minecraft.network.protocol.game.ClientboundPlayerAbilitiesPacket
-import net.minecraft.world.entity.player.Abilities
-import org.bukkit.craftbukkit.entity.CraftPlayer
-import org.bukkit.entity.Player
-import xyz.alexcrea.cuanvil.dependency.packet.PacketManager
-import xyz.alexcrea.cuanvil.dependency.packet.PacketManagerBase
-
-class V1_21R3_PacketManager : PacketManagerBase(), PacketManager {
-    override val canSetInstantBuild: Boolean
-        get() = true
-
-    override fun setInstantBuild(player: Player, instantBuild: Boolean) {
-        val nmsPlayer = (player as CraftPlayer).handle
-        val playerAbilities = nmsPlayer.abilities
-        val sendedAbilities: Abilities
-        if (playerAbilities.instabuild == instantBuild) {
-            sendedAbilities = playerAbilities
-        } else {
-            sendedAbilities = Abilities()
-            sendedAbilities.invulnerable = playerAbilities.invulnerable
-            sendedAbilities.flying = playerAbilities.flying
-            sendedAbilities.mayfly = playerAbilities.mayfly
-            sendedAbilities.instabuild = instantBuild
-            sendedAbilities.mayBuild = playerAbilities.mayBuild
-            sendedAbilities.flyingSpeed = playerAbilities.flyingSpeed
-            sendedAbilities.walkingSpeed = playerAbilities.walkingSpeed
-        }
-        val packet = ClientboundPlayerAbilitiesPacket(sendedAbilities)
-        nmsPlayer.connection.send(packet)
-    }
-}

nms/v1_21R4/.gitignore

@@ -1 +0,0 @@
-.lastDeploymentsId

nms/v1_21R4/build.gradle.kts

@@ -1,34 +0,0 @@
-import org.jetbrains.kotlin.gradle.dsl.JvmTarget
-
-group = rootProject.group
-version = rootProject.version
-
-plugins {
-    id("io.papermc.paperweight.userdev")
-}
-
-dependencies {
-    implementation(project(":nms:nms-common"))
-
-    // Used for nms
-    paperweight.paperDevBundle("1.21.5-R0.1-SNAPSHOT")
-}
-
-repositories {
-    maven("https://repo.papermc.io/repository/maven-public/")
-}
-
-// Set target version
-tasks.withType<JavaCompile>().configureEach {
-    sourceCompatibility = "21"
-    targetCompatibility = "21"
-
-    options.encoding = "UTF-8"
-}
-
-kotlin {
-    compilerOptions {
-        apiVersion.set(org.jetbrains.kotlin.gradle.dsl.KotlinVersion.KOTLIN_2_2)
-        jvmTarget.set(JvmTarget.JVM_21)
-    }
-}

nms/v1_21R4/src/main/kotlin/xyz/alexcrea/cuanvil/dependency/packet/versions/V1_21R4_PacketManager.kt

@@ -1,33 +0,0 @@
-package xyz.alexcrea.cuanvil.dependency.packet.versions
-
-import net.minecraft.network.protocol.game.ClientboundPlayerAbilitiesPacket
-import net.minecraft.world.entity.player.Abilities
-import org.bukkit.craftbukkit.entity.CraftPlayer
-import org.bukkit.entity.Player
-import xyz.alexcrea.cuanvil.dependency.packet.PacketManager
-import xyz.alexcrea.cuanvil.dependency.packet.PacketManagerBase
-
-class V1_21R4_PacketManager : PacketManagerBase(), PacketManager {
-    override val canSetInstantBuild: Boolean
-        get() = true
-
-    override fun setInstantBuild(player: Player, instantBuild: Boolean) {
-        val nmsPlayer = (player as CraftPlayer).handle
-        val playerAbilities = nmsPlayer.abilities
-        val sendedAbilities: Abilities
-        if (playerAbilities.instabuild == instantBuild) {
-            sendedAbilities = playerAbilities
-        } else {
-            sendedAbilities = Abilities()
-            sendedAbilities.invulnerable = playerAbilities.invulnerable
-            sendedAbilities.flying = playerAbilities.flying
-            sendedAbilities.mayfly = playerAbilities.mayfly
-            sendedAbilities.instabuild = instantBuild
-            sendedAbilities.mayBuild = playerAbilities.mayBuild
-            sendedAbilities.flyingSpeed = playerAbilities.flyingSpeed
-            sendedAbilities.walkingSpeed = playerAbilities.walkingSpeed
-        }
-        val packet = ClientboundPlayerAbilitiesPacket(sendedAbilities)
-        nmsPlayer.connection.send(packet)
-    }
-}

nms/v1_21R5/.gitignore

@@ -1 +0,0 @@
-.lastDeploymentsId

nms/v1_21R5/build.gradle.kts

@@ -1,34 +0,0 @@
-import org.jetbrains.kotlin.gradle.dsl.JvmTarget
-
-group = rootProject.group
-version = rootProject.version
-
-plugins {
-    id("io.papermc.paperweight.userdev")
-}
-
-dependencies {
-    implementation(project(":nms:nms-common"))
-
-    // Used for nms
-    paperweight.paperDevBundle("1.21.6-R0.1-SNAPSHOT")
-}
-
-repositories {
-    maven("https://repo.papermc.io/repository/maven-public/")
-}
-
-// Set target version
-tasks.withType<JavaCompile>().configureEach {
-    sourceCompatibility = "21"
-    targetCompatibility = "21"
-
-    options.encoding = "UTF-8"
-}
-
-kotlin {
-    compilerOptions {
-        apiVersion.set(org.jetbrains.kotlin.gradle.dsl.KotlinVersion.KOTLIN_2_2)
-        jvmTarget.set(JvmTarget.JVM_21)
-    }
-}

nms/v1_21R5/src/main/kotlin/xyz/alexcrea/cuanvil/dependency/packet/versions/V1_21R5_PacketManager.kt

@@ -1,33 +0,0 @@
-package xyz.alexcrea.cuanvil.dependency.packet.versions
-
-import net.minecraft.network.protocol.game.ClientboundPlayerAbilitiesPacket
-import net.minecraft.world.entity.player.Abilities
-import org.bukkit.craftbukkit.entity.CraftPlayer
-import org.bukkit.entity.Player
-import xyz.alexcrea.cuanvil.dependency.packet.PacketManager
-import xyz.alexcrea.cuanvil.dependency.packet.PacketManagerBase
-
-class V1_21R5_PacketManager : PacketManagerBase(), PacketManager {
-    override val canSetInstantBuild: Boolean
-        get() = true
-
-    override fun setInstantBuild(player: Player, instantBuild: Boolean) {
-        val nmsPlayer = (player as CraftPlayer).handle
-        val playerAbilities = nmsPlayer.abilities
-        val sendedAbilities: Abilities
-        if (playerAbilities.instabuild == instantBuild) {
-            sendedAbilities = playerAbilities
-        } else {
-            sendedAbilities = Abilities()
-            sendedAbilities.invulnerable = playerAbilities.invulnerable
-            sendedAbilities.flying = playerAbilities.flying
-            sendedAbilities.mayfly = playerAbilities.mayfly
-            sendedAbilities.instabuild = instantBuild
-            sendedAbilities.mayBuild = playerAbilities.mayBuild
-            sendedAbilities.flyingSpeed = playerAbilities.flyingSpeed
-            sendedAbilities.walkingSpeed = playerAbilities.walkingSpeed
-        }
-        val packet = ClientboundPlayerAbilitiesPacket(sendedAbilities)
-        nmsPlayer.connection.send(packet)
-    }
-}

nms/v1_21R6/.gitignore

@@ -1 +0,0 @@
-.lastDeploymentsId

nms/v1_21R6/build.gradle.kts

@@ -1,34 +0,0 @@
-import org.jetbrains.kotlin.gradle.dsl.JvmTarget
-
-group = rootProject.group
-version = rootProject.version
-
-plugins {
-    id("io.papermc.paperweight.userdev")
-}
-
-dependencies {
-    implementation(project(":nms:nms-common"))
-
-    // Used for nms
-    paperweight.paperDevBundle("1.21.10-R0.1-SNAPSHOT")
-}
-
-repositories {
-    maven("https://repo.papermc.io/repository/maven-public/")
-}
-
-// Set target version
-tasks.withType<JavaCompile>().configureEach {
-    sourceCompatibility = "21"
-    targetCompatibility = "21"
-
-    options.encoding = "UTF-8"
-}
-
-kotlin {
-    compilerOptions {
-        apiVersion.set(org.jetbrains.kotlin.gradle.dsl.KotlinVersion.KOTLIN_2_2)
-        jvmTarget.set(JvmTarget.JVM_21)
-    }
-}

nms/v1_21R6/src/main/kotlin/xyz/alexcrea/cuanvil/dependency/packet/versions/PaperPacketManager.kt

@@ -1,33 +0,0 @@
-package xyz.alexcrea.cuanvil.dependency.packet.versions
-
-import net.minecraft.network.protocol.game.ClientboundPlayerAbilitiesPacket
-import net.minecraft.world.entity.player.Abilities
-import org.bukkit.craftbukkit.entity.CraftPlayer
-import org.bukkit.entity.Player
-import xyz.alexcrea.cuanvil.dependency.packet.PacketManager
-import xyz.alexcrea.cuanvil.dependency.packet.PacketManagerBase
-
-class V1_21R6_PacketManager : PacketManagerBase(), PacketManager {
-    override val canSetInstantBuild: Boolean
-        get() = true
-
-    override fun setInstantBuild(player: Player, instantBuild: Boolean) {
-        val nmsPlayer = (player as CraftPlayer).handle
-        val playerAbilities = nmsPlayer.abilities
-        val sendedAbilities: Abilities
-        if (playerAbilities.instabuild == instantBuild) {
-            sendedAbilities = playerAbilities
-        } else {
-            sendedAbilities = Abilities()
-            sendedAbilities.invulnerable = playerAbilities.invulnerable
-            sendedAbilities.flying = playerAbilities.flying
-            sendedAbilities.mayfly = playerAbilities.mayfly
-            sendedAbilities.instabuild = instantBuild
-            sendedAbilities.mayBuild = playerAbilities.mayBuild
-            sendedAbilities.flyingSpeed = playerAbilities.flyingSpeed
-            sendedAbilities.walkingSpeed = playerAbilities.walkingSpeed
-        }
-        val packet = ClientboundPlayerAbilitiesPacket(sendedAbilities)
-        nmsPlayer.connection.send(packet)
-    }
-}

nms/v1_21R7/.gitignore

@@ -1 +0,0 @@
-.lastDeploymentsId

nms/v1_21R7/build.gradle.kts

@@ -1,34 +0,0 @@
-import org.jetbrains.kotlin.gradle.dsl.JvmTarget
-
-group = rootProject.group
-version = rootProject.version
-
-plugins {
-    id("io.papermc.paperweight.userdev")
-}
-
-dependencies {
-    implementation(project(":nms:nms-common"))
-
-    // Used for nms
-    paperweight.paperDevBundle("1.21.11-R0.1-SNAPSHOT")
-}
-
-repositories {
-    maven("https://repo.papermc.io/repository/maven-public/")
-}
-
-// Set target version
-tasks.withType<JavaCompile>().configureEach {
-    sourceCompatibility = "21"
-    targetCompatibility = "21"
-
-    options.encoding = "UTF-8"
-}
-
-kotlin {
-    compilerOptions {
-        apiVersion.set(org.jetbrains.kotlin.gradle.dsl.KotlinVersion.KOTLIN_2_2)
-        jvmTarget.set(JvmTarget.JVM_21)
-    }
-}

nms/v1_21R7/src/main/kotlin/xyz/alexcrea/cuanvil/dependency/packet/versions/V1_21R7_PacketManager.kt

@@ -1,33 +0,0 @@
-package xyz.alexcrea.cuanvil.dependency.packet.versions
-
-import net.minecraft.network.protocol.game.ClientboundPlayerAbilitiesPacket
-import net.minecraft.world.entity.player.Abilities
-import org.bukkit.craftbukkit.entity.CraftPlayer
-import org.bukkit.entity.Player
-import xyz.alexcrea.cuanvil.dependency.packet.PacketManager
-import xyz.alexcrea.cuanvil.dependency.packet.PacketManagerBase
-
-class V1_21R7_PacketManager : PacketManagerBase(), PacketManager {
-    override val canSetInstantBuild: Boolean
-        get() = true
-
-    override fun setInstantBuild(player: Player, instantBuild: Boolean) {
-        val nmsPlayer = (player as CraftPlayer).handle
-        val playerAbilities = nmsPlayer.abilities
-        val sendedAbilities: Abilities
-        if (playerAbilities.instabuild == instantBuild) {
-            sendedAbilities = playerAbilities
-        } else {
-            sendedAbilities = Abilities()
-            sendedAbilities.invulnerable = playerAbilities.invulnerable
-            sendedAbilities.flying = playerAbilities.flying
-            sendedAbilities.mayfly = playerAbilities.mayfly
-            sendedAbilities.instabuild = instantBuild
-            sendedAbilities.mayBuild = playerAbilities.mayBuild
-            sendedAbilities.flyingSpeed = playerAbilities.flyingSpeed
-            sendedAbilities.walkingSpeed = playerAbilities.walkingSpeed
-        }
-        val packet = ClientboundPlayerAbilitiesPacket(sendedAbilities)
-        nmsPlayer.connection.send(packet)
-    }
-}

src/main/java/xyz/alexcrea/cuanvil/api/EnchantmentApi.java

@@ -128,7 +128,7 @@ public class EnchantmentApi {
      * @return The custom anvil enchantment of this key. null if not found.
      */
     @Nullable
-    public static CAEnchantment getByKey(@NotNull NamespacedKey key) {
+    public static CAEnchantment getByKey(@Nullable NamespacedKey key) {
         return CAEnchantment.getByKey(key);
     }
 

src/main/java/xyz/alexcrea/cuanvil/api/UnitRepairApi.java

@@ -3,18 +3,16 @@ package xyz.alexcrea.cuanvil.api;
 import io.delilaheve.CustomAnvil;
 import kotlin.Triple;
 import org.bukkit.Material;
+import org.bukkit.NamespacedKey;
 import org.bukkit.configuration.ConfigurationSection;
 import org.bukkit.configuration.file.FileConfiguration;
 import org.jetbrains.annotations.NotNull;
 import xyz.alexcrea.cuanvil.config.ConfigHolder;
 import xyz.alexcrea.cuanvil.dependency.DependencyManager;
 import xyz.alexcrea.cuanvil.gui.config.global.UnitRepairConfigGui;
-import xyz.alexcrea.cuanvil.gui.config.list.MappedGuiListConfigGui;
 import xyz.alexcrea.cuanvil.gui.config.list.UnitRepairElementListGui;
 
-import java.util.ArrayList;
-import java.util.Collections;
-import java.util.List;
+import java.util.*;
 
 /**
  * Custom Anvil api for unit repair.
@@ -22,7 +20,8 @@ import java.util.List;
 @SuppressWarnings("unused")
 public class UnitRepairApi {
 
-    private UnitRepairApi(){}
+    private UnitRepairApi() {
+    }
 
     private static Object saveChangeTask = null;
 
@@ -35,7 +34,20 @@ public class UnitRepairApi {
      * @param repairable The item to be repaired.
      * @return true if successful.
      */
-    public static boolean addUnitRepair(@NotNull Material unit, @NotNull Material repairable){
+    public static boolean addUnitRepair(@NotNull Material unit, @NotNull Material repairable) {
+        return addUnitRepair(unit, repairable, 0.25, false);
+    }
+
+    /**
+     * Write and add a custom anvil unit repair recipe.
+     * Will not write the recipe if it already exists or was deleted.
+     * Set the value to minecraft default value (0.25 = 25%)
+     *
+     * @param unit       The unit material used to repair the bellow item.
+     * @param repairable The item to be repaired.
+     * @return true if successful.
+     */
+    public static boolean addUnitRepair(@NotNull NamespacedKey unit, @NotNull NamespacedKey repairable) {
         return addUnitRepair(unit, repairable, 0.25, false);
     }
 
@@ -48,7 +60,7 @@ public class UnitRepairApi {
      * @param value      The amount to be repaired by every unit. (1% = 0.01)
      * @return true if successful.
      */
-    public static boolean addUnitRepair(@NotNull Material unit, @NotNull Material repairable, double value){
+    public static boolean addUnitRepair(@NotNull Material unit, @NotNull Material repairable, double value) {
         return addUnitRepair(unit, repairable, value, false);
     }
 
@@ -62,12 +74,26 @@ public class UnitRepairApi {
      * @param overrideDeleted If we should write even if the recipe was previously deleted.
      * @return true if successful.
      */
-    public static boolean addUnitRepair(@NotNull Material unit, @NotNull Material repairable, double value, boolean overrideDeleted){
-        FileConfiguration config = ConfigHolder.UNIT_REPAIR_HOLDER.getConfig();
-        String path = unit.name().toLowerCase() + "." + repairable.name().toLowerCase();
+    public static boolean addUnitRepair(@NotNull Material unit, @NotNull Material repairable, double value, boolean overrideDeleted) {
+        return addUnitRepair(unit.getKey(), repairable.getKey(), value, overrideDeleted);
+    }
 
-        if(!overrideDeleted && ConfigHolder.UNIT_REPAIR_HOLDER.isDeleted(path)) return false;
-        if(config.contains(path)) return false;
+    /**
+     * Write and add a custom anvil unit repair recipe.
+     * Will not write the recipe if it already exists.
+     *
+     * @param unit            The unit material used to repair the bellow item.
+     * @param repairable      The item to be repaired.
+     * @param value           The amount to be repaired by every unit. (1% = 0.01)
+     * @param overrideDeleted If we should write even if the recipe was previously deleted.
+     * @return true if successful.
+     */
+    public static boolean addUnitRepair(@NotNull NamespacedKey unit, @NotNull NamespacedKey repairable, double value, boolean overrideDeleted) {
+        FileConfiguration config = ConfigHolder.UNIT_REPAIR_HOLDER.getConfig();
+        String path = unit.toString().toLowerCase() + "." + repairable.toString().toLowerCase();
+
+        if (!overrideDeleted && ConfigHolder.UNIT_REPAIR_HOLDER.isDeleted(path)) return false;
+        if (config.contains(path)) return false;
 
         // Set unit repair
         return setUnitRepair(unit, repairable, value);
@@ -82,11 +108,24 @@ public class UnitRepairApi {
      * @param value      The amount to be repaired by every unit. (1% = 0.01)
      * @return true if successful.
      */
-    public static boolean setUnitRepair(@NotNull Material unit, @NotNull Material repairable, double value){
+    public static boolean setUnitRepair(@NotNull Material unit, @NotNull Material repairable, double value) {
+        return setUnitRepair(unit.getKey(), repairable.getKey(), value);
+    }
+
+    /**
+     * Write and add a custom anvil unit repair recipe.
+     * Do not check if it previously existed or exist.
+     *
+     * @param unit       The unit material used to repair the bellow item.
+     * @param repairable The item to be repaired.
+     * @param value      The amount to be repaired by every unit. (1% = 0.01)
+     * @return true if successful.
+     */
+    public static boolean setUnitRepair(@NotNull NamespacedKey unit, @NotNull NamespacedKey repairable, double value) {
         FileConfiguration config = ConfigHolder.UNIT_REPAIR_HOLDER.getConfig();
 
-        String repairableName = repairable.name().toLowerCase();
-        String path = unit.name().toLowerCase() + "." + repairableName;
+        String repairableName = repairable.toString().toLowerCase();
+        String path = unit.toString().toLowerCase() + "." + repairableName;
 
         // Add to config then prepare save
         config.set(path, value);
@@ -94,10 +133,10 @@ public class UnitRepairApi {
 
         // Add to gui
         UnitRepairConfigGui repairConfigGui = UnitRepairConfigGui.getCurrentInstance();
-        if(repairConfigGui != null) {
+        if (repairConfigGui != null) {
             UnitRepairElementListGui elementGui = repairConfigGui.getInstanceOrCreate(unit).getStored();
 
-            if(elementGui != null) elementGui.updateValueForGeneric(repairableName, true);
+            if (elementGui != null) elementGui.updateValueForGeneric(repairable, true);
             repairConfigGui.updateValueForGeneric(unit, true);
         }
 
@@ -111,48 +150,56 @@ public class UnitRepairApi {
      * @param repairable The item used to be repaired.
      * @return true if successful.
      */
-    public static boolean removeUnitRepair(@NotNull Material unit, @NotNull Material repairable){
+    public static boolean removeUnitRepair(@NotNull Material unit, @NotNull Material repairable) {
+        return removeUnitRepair(unit.getKey(), repairable.getKey());
+    }
+
+    /**
+     * Remove a custom anvil unit repair recipe.
+     *
+     * @param unit       The unit material used to repair the bellow item.
+     * @param repairable The item used to be repaired.
+     * @return true if successful.
+     */
+    public static boolean removeUnitRepair(@NotNull NamespacedKey unit, @NotNull NamespacedKey repairable) {
         // Delete every possible variation and save to file
-        String unitName = unit.name();
-        String repairableName = repairable.name();
 
         FileConfiguration config = ConfigHolder.UNIT_REPAIR_HOLDER.getConfig();
-        config.set(unitName.toLowerCase() + "." + repairableName.toUpperCase(), null);
-        config.set(unitName.toUpperCase() + "." + repairableName.toLowerCase(), null);
-        config.set(unitName.toUpperCase() + "." + repairableName.toUpperCase(), null);
-        config.set(unitName.toLowerCase() + "." + repairableName.toLowerCase(), null);
+        config.set(unit.getKey() + "." + repairable.getKey(), null);
+        config.set(unit.getKey() + "." + repairable, null);
+        config.set(unit + "." + repairable.getKey(), null);
+        config.set(unit + "." + repairable, null);
 
         // Test if it was the last value of this section
         boolean lastValue = false;
-        if(config.isConfigurationSection(unitName.toLowerCase())) {
-            ConfigurationSection section = config.getConfigurationSection(unitName.toLowerCase());
+        if (config.isConfigurationSection(unit.toString())) {
+            ConfigurationSection section = config.getConfigurationSection(unit.toString());
 
-            if(section != null && section.getKeys(false).isEmpty()) {
+            if (section != null && section.getKeys(false).isEmpty()) {
                 lastValue = true;
-                config.set(unitName.toLowerCase(), null);
+                config.set(unit.toString(), null);
             }
 
-        } else if (config.isConfigurationSection(unitName.toUpperCase())) {
-            ConfigurationSection section = config.getConfigurationSection(unitName.toUpperCase());
-            if(section != null && section.getKeys(false).isEmpty()) {
+        } else if (config.isConfigurationSection(unit.getKey())) {
+            ConfigurationSection section = config.getConfigurationSection(unit.getKey());
+            if (section != null && section.getKeys(false).isEmpty()) {
                 lastValue = true;
-                config.set(unitName.toUpperCase(), null);
+                config.set(unit.getKey(), null);
             }
 
         } else lastValue = true;
 
 
-        // We only need to "delete" as the lower case to be counted as deleted
-        ConfigHolder.UNIT_REPAIR_HOLDER.delete(unitName.toLowerCase() + "." + repairableName.toLowerCase());
+        ConfigHolder.UNIT_REPAIR_HOLDER.delete(unit.toString().toLowerCase() + "." + repairable.toString().toLowerCase());
         prepareSaveTask();
 
         // Remove from gui
         UnitRepairConfigGui repairConfigGui = UnitRepairConfigGui.getCurrentInstance();
-        if(repairConfigGui != null) {
+        if (repairConfigGui != null) {
             UnitRepairElementListGui elementGui = repairConfigGui.getInstanceOrCreate(unit).getStored();
 
-            if(elementGui != null) elementGui.removeGeneric(repairableName);
-            if(lastValue){
+            if (elementGui != null) elementGui.removeGeneric(repairable);
+            if (lastValue) {
                 repairConfigGui.removeGeneric(unit);
             }
         }
@@ -164,9 +211,9 @@ public class UnitRepairApi {
      * Prepare a task to save custom unit repair recipe configuration.
      */
     private static void prepareSaveTask() {
-        if(saveChangeTask != null) return;
+        if (saveChangeTask != null) return;
 
-        saveChangeTask = DependencyManager.scheduler.scheduleGlobally(CustomAnvil.instance, ()->{
+        saveChangeTask = DependencyManager.scheduler.scheduleGlobally(CustomAnvil.instance, () -> {
             ConfigHolder.UNIT_REPAIR_HOLDER.saveToDisk(true);
             saveChangeTask = null;
         });
@@ -174,6 +221,7 @@ public class UnitRepairApi {
 
     /**
      * Get every unit repair recipes.
+     *
      * @return An immutable collection of unit repair recipes.
      * <p>
      * Each element of the provided triple represent a part of the recipe
@@ -182,29 +230,32 @@ public class UnitRepairApi {
      *    <li>Second object is the item to be repaired.
      *    <li>Last object is the amount to be repaired by every unit. (1% = 0.01)
      * </ul>
+     * @deprecated some may be missing. use {@link #getModernUnitRepairs()}
+     *
      */
+    @Deprecated
     @NotNull
-    public static List<Triple<Material, Material, Double>> getUnitRepairs(){
+    public static List<Triple<Material, Material, Double>> getUnitRepairs() {
         List<Triple<Material, Material, Double>> mutableList = new ArrayList<>();
 
         FileConfiguration config = ConfigHolder.UNIT_REPAIR_HOLDER.getConfig();
         for (String unitKey : config.getKeys(false)) {
             // Test if config section exist
-            if(!config.isConfigurationSection(unitKey)) continue;
+            if (!config.isConfigurationSection(unitKey)) continue;
 
             // Test if unit is a material
             Material unit = Material.getMaterial(unitKey.toUpperCase());
-            if(unit == null) continue;
+            if (unit == null) continue;
 
             // Iterate over reparable items
             ConfigurationSection section = config.getConfigurationSection(unitKey);
             for (String repairableKey : section.getKeys(false)) {
                 // Test if value section exist
-                if(!section.isDouble(repairableKey)) continue;
+                if (!section.isDouble(repairableKey)) continue;
 
                 // Test if repairable is valid a material
                 Material repairable = Material.getMaterial(repairableKey.toUpperCase());
-                if(repairable == null) continue;
+                if (repairable == null) continue;
 
                 // Add the values
                 mutableList.add(new Triple<>(unit, repairable, section.getDouble(repairableKey)));
@@ -215,4 +266,53 @@ public class UnitRepairApi {
         return Collections.unmodifiableList(mutableList);
     }
 
+    /**
+     * Get every unit repair recipes.
+     *
+     * @return An immutable collection of unit repair recipes.
+     * <p>
+     * <li>First map contain a key the unit material used to repair the bellow item and value the second map
+     * <li>Second map contain as key the item to be repaired and as value the amount to be repaired by every unit. (1% = 0.01)
+     * </ul>
+     */
+    @NotNull
+    public static Map<NamespacedKey, Map<NamespacedKey, Double>> getModernUnitRepairs() {
+        Map<NamespacedKey, Map<NamespacedKey, Double>> mutableList = new HashMap<>();
+
+        FileConfiguration config = ConfigHolder.UNIT_REPAIR_HOLDER.getConfig();
+        for (String unitKey : config.getKeys(false)) {
+            // Test if config section exist
+            if (!config.isConfigurationSection(unitKey)) continue;
+
+            // Test if unit is a material
+            NamespacedKey unit = NamespacedKey.fromString(unitKey.toLowerCase());
+            if (unit == null) continue;
+
+            Map<NamespacedKey, Double> map;
+            if (!mutableList.containsKey(unit)) {
+                map = new HashMap<>();
+                mutableList.put(unit, map);
+            } else {
+                map = mutableList.get(unit);
+            }
+
+            // Iterate over reparable items
+            ConfigurationSection section = config.getConfigurationSection(unitKey);
+            for (String repairableKey : section.getKeys(false)) {
+                // Test if value section exist
+                if (!section.isDouble(repairableKey)) continue;
+
+                // Test if repairable is valid a material
+                NamespacedKey repairable = NamespacedKey.fromString(repairableKey.toLowerCase());
+                if (repairable == null) continue;
+
+                // Add the values
+                map.put(repairable, section.getDouble(repairableKey));
+
+            }
+        }
+
+        return mutableList;
+    }
+
 }

src/main/java/xyz/alexcrea/cuanvil/enchant/CAEnchantment.java

@@ -9,6 +9,7 @@ import org.jetbrains.annotations.Nullable;
 import xyz.alexcrea.cuanvil.enchant.bulk.BulkCleanEnchantOperation;
 import xyz.alexcrea.cuanvil.enchant.bulk.BulkGetEnchantOperation;
 import xyz.alexcrea.cuanvil.group.EnchantConflictGroup;
+import xyz.alexcrea.cuanvil.util.CasedStringUtil;
 
 import java.util.Collection;
 import java.util.HashMap;
@@ -45,6 +46,14 @@ public interface CAEnchantment {
     @NotNull
     String getName();
 
+    /**
+     * Get the enchantment name prettified (upper spaced case)
+     * @return Prettier enchantment name
+     */
+    default String getPrettyName() {
+        return CasedStringUtil.snakeToUpperSpacedCase(getName());
+    }
+
     /**
      * Get the default maximum level of this enchantment.
      * @return The default maximum level of this enchantment.
@@ -221,7 +230,7 @@ public interface CAEnchantment {
      * @param key The enchantment key
      * @return Array of enchantment.
      */
-    static @Nullable CAEnchantment getByKey(@NotNull NamespacedKey key){
+    static @Nullable CAEnchantment getByKey(@Nullable NamespacedKey key){
         return CAEnchantmentRegistry.getInstance().getByKey(key);
     }
 

src/main/java/xyz/alexcrea/cuanvil/enchant/CAEnchantmentRegistry.java

@@ -99,8 +99,7 @@ public class CAEnchantmentRegistry {
         if ((!hasWarnedRegistering) && byNameMap.containsKey(enchantment.getName())) {
             hasWarnedRegistering = true;
 
-            CustomAnvil.instance.getLogger().log(Level.WARNING,
-                    "Duplicate registered enchantment name. Please check that configuration is using namespace.");
+            CustomAnvil.Companion.log("Duplicate registered enchantment name. Please check that configuration is using namespace.");
         }
 
         byKeyMap.put(enchantment.getKey(), enchantment);
@@ -151,7 +150,7 @@ public class CAEnchantmentRegistry {
      * @return Registered enchantment. null if absent.
      */
     @Nullable
-    public CAEnchantment getByKey(@NotNull NamespacedKey key) {
+    public CAEnchantment getByKey(@Nullable NamespacedKey key) {
         return byKeyMap.get(key);
     }
 

src/main/java/xyz/alexcrea/cuanvil/gui/config/MainConfigGui.java

@@ -2,6 +2,7 @@ package xyz.alexcrea.cuanvil.gui.config;
 
 import com.github.stefvanschie.inventoryframework.gui.GuiItem;
 import com.github.stefvanschie.inventoryframework.gui.type.ChestGui;
+import com.github.stefvanschie.inventoryframework.gui.type.util.Gui;
 import com.github.stefvanschie.inventoryframework.pane.PatternPane;
 import com.github.stefvanschie.inventoryframework.pane.util.Pattern;
 import io.delilaheve.CustomAnvil;
@@ -39,116 +40,142 @@ public class MainConfigGui extends ChestGui {
         GuiGlobalItems.addBackgroundItem(pane);
 
         // Basic config item
-        ItemStack basicConfigItemstack = new ItemStack(Material.COMMAND_BLOCK);
-        ItemMeta basicConfigMeta = basicConfigItemstack.getItemMeta();
-        assert basicConfigMeta != null;
-
-        basicConfigMeta.setDisplayName("§aBasic Config Menu");
-        basicConfigMeta.setLore(Collections.singletonList("§7Click here to open basic config menu"));
-        basicConfigItemstack.setItemMeta(basicConfigMeta);
-
-        GuiItem basicConfigItem = GuiGlobalItems.goToGuiItem(basicConfigItemstack, new BasicConfigGui(packetManager));
+        var basicConfigItem = basicConfigItem(new BasicConfigGui(packetManager));
         pane.bindItem('1', basicConfigItem);
 
         // enchant level limit item
-        ItemStack enchantLimitItemstack = new ItemStack(Material.ENCHANTED_BOOK);
-        ItemMeta enchantLimitMeta = enchantLimitItemstack.getItemMeta();
-        assert enchantLimitMeta != null;
-
-        enchantLimitMeta.setDisplayName("§aEnchantment Level Limit");
-        enchantLimitMeta.setLore(Collections.singletonList("§7Click here to open enchantment level limit menu"));
-        enchantLimitItemstack.setItemMeta(enchantLimitMeta);
-
-        GuiItem enchantLimitItem = GuiGlobalItems.goToGuiItem(enchantLimitItemstack, new EnchantLimitConfigGui());
+        var enchantLimitItem = enchantLimitItem(new EnchantLimitConfigGui());
         pane.bindItem('2', enchantLimitItem);
 
         // enchant level limit item
-        ItemStack enchantMergeLimitItemstack = new ItemStack(Material.ENCHANTED_BOOK);
-        ItemMeta enchantMergeLimitMeta = enchantMergeLimitItemstack.getItemMeta();
-        assert enchantMergeLimitMeta != null;
-
-        enchantMergeLimitMeta.setDisplayName("§aEnchantment Merge Limit");
-        enchantMergeLimitMeta.setLore(Collections.singletonList("§7Click here to open enchantment merge limit menu"));
-        enchantMergeLimitItemstack.setItemMeta(enchantMergeLimitMeta);
-
-        GuiItem enchantMergeLimitItem = GuiGlobalItems.goToGuiItem(enchantMergeLimitItemstack, new EnchantMergeLimitConfigGui());
+        var enchantMergeLimitItem = enchantMergeLimitItem(new EnchantMergeLimitConfigGui());
         pane.bindItem('3', enchantMergeLimitItem);
 
         // enchant cost item
-        ItemStack enchantCostItemstack = new ItemStack(Material.EXPERIENCE_BOTTLE);
-        ItemMeta enchantCostMeta = enchantCostItemstack.getItemMeta();
-        assert enchantCostMeta != null;
-
-        enchantCostMeta.setDisplayName("§aEnchantment Cost");
-        enchantCostMeta.setLore(Collections.singletonList("§7Click here to open enchantment costs menu"));
-        enchantCostItemstack.setItemMeta(enchantCostMeta);
-
-        GuiItem enchantCostItem = GuiGlobalItems.goToGuiItem(enchantCostItemstack, new EnchantCostConfigGui());
+        var enchantCostItem = enchantCostItem(new EnchantCostConfigGui());
         pane.bindItem('4', enchantCostItem);
 
         // Enchantment Conflicts item
-        ItemStack enchantConflictItemstack = new ItemStack(Material.OAK_FENCE);
-        ItemMeta enchantConflictMeta = enchantConflictItemstack.getItemMeta();
-        assert enchantConflictMeta != null;
-
-        enchantConflictMeta.setDisplayName("§aEnchantment Conflict");
-        enchantConflictMeta.setLore(Collections.singletonList("§7Click here to open enchantment conflict menu"));
-        enchantConflictItemstack.setItemMeta(enchantConflictMeta);
-
-        GuiItem enchantConflictItem = GuiGlobalItems.goToGuiItem(enchantConflictItemstack, EnchantConflictGui.getInstance());
+        var enchantConflictItem = enchantConflictItem(EnchantConflictGui.getInstance());
         pane.bindItem('5', enchantConflictItem);
 
         // Group config items
-        ItemStack groupItemstack = new ItemStack(Material.CHEST);
-        ItemMeta groupMeta = groupItemstack.getItemMeta();
-        assert groupMeta != null;
-
-        groupMeta.setDisplayName("§aItem Groups");
-        groupMeta.setLore(Collections.singletonList("§7Click here to open item group menu"));
-        groupItemstack.setItemMeta(groupMeta);
-
-        GuiItem groupConfigItem = GuiGlobalItems.goToGuiItem(groupItemstack, GroupConfigGui.getInstance());
-
+        var groupConfigItem = groupConfigItem(GroupConfigGui.getInstance());
         pane.bindItem('6', groupConfigItem);
 
         // Unit repair item
-        ItemStack unirRepairItemstack = new ItemStack(Material.DIAMOND);
-        ItemMeta unitRepairMeta = unirRepairItemstack.getItemMeta();
-        assert unitRepairMeta != null;
-
-        unitRepairMeta.setDisplayName("§aUnit Repair");
-        unitRepairMeta.setLore(Collections.singletonList("§7Click here to open anvil unit repair menu"));
-        unirRepairItemstack.setItemMeta(unitRepairMeta);
-
-        GuiItem unitRepairItem = GuiGlobalItems.goToGuiItem(unirRepairItemstack, UnitRepairConfigGui.getInstance());
+        var unitRepairItem = unitRepairItem(UnitRepairConfigGui.getInstance());
         pane.bindItem('7', unitRepairItem);
 
         // Custom recipe item
-        ItemStack customRecipeItemstack = new ItemStack(Material.CRAFTING_TABLE);
-        ItemMeta customRecipeMeta = customRecipeItemstack.getItemMeta();
-        assert customRecipeMeta != null;
-
-        customRecipeMeta.setDisplayName("§aCustom recipes");
-        customRecipeMeta.setLore(Collections.singletonList("§7Click here to open anvil custom recipe menu"));
-        customRecipeItemstack.setItemMeta(customRecipeMeta);
-
-        GuiItem customRecipeItem = GuiGlobalItems.goToGuiItem(customRecipeItemstack, CustomRecipeConfigGui.getInstance());
+        var customRecipeItem = customRecipeItem(CustomRecipeConfigGui.getInstance());
         pane.bindItem('8', customRecipeItem);
 
         // quit item
-        ItemStack quitItemstack = new ItemStack(Material.BARRIER);
-        ItemMeta quitMeta = quitItemstack.getItemMeta();
-        assert quitMeta != null;
+        pane.bindItem('Q', quitItem());
+    }
 
-        quitMeta.setDisplayName("§cQuit");
-        quitItemstack.setItemMeta(quitMeta);
+    public static GuiItem basicConfigItem(Gui target) {
+        var item = new ItemStack(Material.COMMAND_BLOCK);
+        var meta = item.getItemMeta();
+        assert meta != null;
 
-        GuiItem quitItem = new GuiItem(quitItemstack, event -> {
+        meta.setDisplayName("§aBasic Config Menu");
+        meta.setLore(Collections.singletonList("§7Click here to open basic config menu"));
+        item.setItemMeta(meta);
+        return GuiGlobalItems.goToGuiItem(item, target);
+    }
+
+    public static GuiItem enchantLimitItem(Gui target) {
+        var item = new ItemStack(Material.ENCHANTED_BOOK);
+        var meta = item.getItemMeta();
+        assert meta != null;
+
+        meta.setDisplayName("§aEnchantment Level Limit");
+        meta.setLore(Collections.singletonList("§7Click here to open enchantment level limit menu"));
+        item.setItemMeta(meta);
+        return GuiGlobalItems.goToGuiItem(item, target);
+    }
+
+    public static GuiItem enchantMergeLimitItem(Gui target) {
+        ItemStack item = new ItemStack(Material.ENCHANTED_BOOK);
+        ItemMeta meta = item.getItemMeta();
+        assert meta != null;
+
+        meta.setDisplayName("§aEnchantment Merge Limit");
+        meta.setLore(Collections.singletonList("§7Click here to open enchantment merge limit menu"));
+        item.setItemMeta(meta);
+        return GuiGlobalItems.goToGuiItem(item, target);
+    }
+
+    public static GuiItem enchantCostItem(Gui target) {
+        ItemStack item = new ItemStack(Material.EXPERIENCE_BOTTLE);
+        ItemMeta meta = item.getItemMeta();
+        assert meta != null;
+
+        meta.setDisplayName("§aEnchantment Cost");
+        meta.setLore(Collections.singletonList("§7Click here to open enchantment costs menu"));
+        item.setItemMeta(meta);
+        return GuiGlobalItems.goToGuiItem(item, target);
+    }
+
+    public static GuiItem enchantConflictItem(Gui target) {
+        var item = new ItemStack(Material.OAK_FENCE);
+        var meta = item.getItemMeta();
+        assert meta != null;
+
+        meta.setDisplayName("§aEnchantment Conflict");
+        meta.setLore(Collections.singletonList("§7Click here to open enchantment conflict menu"));
+        item.setItemMeta(meta);
+        return GuiGlobalItems.goToGuiItem(item, target);
+    }
+
+    public static GuiItem groupConfigItem(Gui target) {
+        var item = new ItemStack(Material.CHEST);
+        var meta = item.getItemMeta();
+        assert meta != null;
+
+        meta.setDisplayName("§aItem Groups");
+        meta.setLore(Collections.singletonList("§7Click here to open item group menu"));
+        item.setItemMeta(meta);
+        return GuiGlobalItems.goToGuiItem(item, target);
+    }
+
+    public static GuiItem unitRepairItem(Gui target) {
+        var item = new ItemStack(Material.DIAMOND);
+        var meta = item.getItemMeta();
+        assert meta != null;
+
+        meta.setDisplayName("§aUnit Repair");
+        meta.setLore(Collections.singletonList("§7Click here to open anvil unit repair menu"));
+        item.setItemMeta(meta);
+
+        return GuiGlobalItems.goToGuiItem(item, target);
+    }
+
+    public static GuiItem customRecipeItem(Gui target) {
+        var item = new ItemStack(Material.CRAFTING_TABLE);
+        var meta = item.getItemMeta();
+        assert meta != null;
+
+        meta.setDisplayName("§aCustom recipes");
+        meta.setLore(Collections.singletonList("§7Click here to open anvil custom recipe menu"));
+        item.setItemMeta(meta);
+        return GuiGlobalItems.goToGuiItem(item, target);
+    }
+
+    public static GuiItem quitItem() {
+        var item = new ItemStack(Material.BARRIER);
+        var meta = item.getItemMeta();
+        assert meta != null;
+
+        meta.setDisplayName("§cQuit");
+        item.setItemMeta(meta);
+
+        return new GuiItem(item, event -> {
             event.setCancelled(true);
             event.getWhoClicked().closeInventory();
         }, CustomAnvil.instance);
-        pane.bindItem('Q', quitItem);
-
     }
 
 }

src/main/java/xyz/alexcrea/cuanvil/gui/config/global/AbstractEnchantConfigGui.java

@@ -1,11 +1,11 @@
 package xyz.alexcrea.cuanvil.gui.config.global;
 
 import com.github.stefvanschie.inventoryframework.gui.GuiItem;
+import com.github.stefvanschie.inventoryframework.gui.type.util.Gui;
 import com.github.stefvanschie.inventoryframework.pane.util.Pattern;
 import org.bukkit.event.inventory.InventoryClickEvent;
 import xyz.alexcrea.cuanvil.enchant.CAEnchantment;
 import xyz.alexcrea.cuanvil.enchant.CAEnchantmentRegistry;
-import xyz.alexcrea.cuanvil.gui.ValueUpdatableGui;
 import xyz.alexcrea.cuanvil.gui.config.list.SettingGuiListConfigGui;
 import xyz.alexcrea.cuanvil.gui.config.settings.SettingGui;
 import xyz.alexcrea.cuanvil.gui.util.GuiSharedConstant;
@@ -31,13 +31,17 @@ public abstract class AbstractEnchantConfigGui<T extends SettingGui.SettingGuiFa
         super(title);
     }
 
+    protected AbstractEnchantConfigGui(String title, Gui parent) {
+        super(title, parent);
+    }
+
     @Override
     public void updateGuiValues() { //TODO maybe optimise it.
         reloadValues();
     }
 
     @Override
-    protected Collection<CAEnchantment> getEveryDisplayableInstanceOfGeneric() {
+    protected Collection<CAEnchantment> getEveryInstanceOfGeneric() {
         return CAEnchantmentRegistry.getInstance().getNameSortedEnchantments();
     }
 
@@ -73,7 +77,7 @@ public abstract class AbstractEnchantConfigGui<T extends SettingGui.SettingGuiFa
             this.pages.clear();
             this.pages.add(this.firstPage);
 
-            for (CAEnchantment enchantment : getEveryDisplayableInstanceOfGeneric()) {
+            for (CAEnchantment enchantment : getDisplayableInstanceOfGeneric()) {
                 GuiItem item = this.guiItemMap.get(enchantment);
 
                 if(item == null) {

src/main/java/xyz/alexcrea/cuanvil/gui/config/global/CustomRecipeConfigGui.java

@@ -1,6 +1,7 @@
 package xyz.alexcrea.cuanvil.gui.config.global;
 
 import com.github.stefvanschie.inventoryframework.gui.GuiItem;
+import com.github.stefvanschie.inventoryframework.gui.type.util.Gui;
 import org.bukkit.Material;
 import org.bukkit.inventory.ItemFlag;
 import org.bukkit.inventory.ItemStack;
@@ -40,6 +41,10 @@ public class CustomRecipeConfigGui extends MappedGuiListConfigGui<AnvilCustomRec
         init();
     }
 
+    public CustomRecipeConfigGui(Gui parent) {
+        super("Custom Recipe Config", parent);
+    }
+
     @Override
     protected ItemStack createItemForGeneric(AnvilCustomRecipe recipe) {
         // Get base item to display
@@ -113,7 +118,7 @@ public class CustomRecipeConfigGui extends MappedGuiListConfigGui<AnvilCustomRec
 
 
     @Override
-    protected Collection<AnvilCustomRecipe> getEveryDisplayableInstanceOfGeneric() {
+    protected Collection<AnvilCustomRecipe> getEveryInstanceOfGeneric() {
         return ConfigHolder.CUSTOM_RECIPE_HOLDER.getRecipeManager().getRecipeList();
     }
 }

src/main/java/xyz/alexcrea/cuanvil/gui/config/global/EnchantConfigGui.java

@@ -0,0 +1,196 @@
+package xyz.alexcrea.cuanvil.gui.config.global;
+
+import com.github.stefvanschie.inventoryframework.gui.GuiItem;
+import com.github.stefvanschie.inventoryframework.gui.type.ChestGui;
+import com.github.stefvanschie.inventoryframework.gui.type.util.Gui;
+import com.github.stefvanschie.inventoryframework.pane.PatternPane;
+import com.github.stefvanschie.inventoryframework.pane.util.Pattern;
+import io.delilaheve.CustomAnvil;
+import org.bukkit.Material;
+import org.bukkit.inventory.ItemStack;
+import org.bukkit.inventory.meta.ItemMeta;
+import org.jetbrains.annotations.Contract;
+import org.jetbrains.annotations.NotNull;
+import xyz.alexcrea.cuanvil.api.EnchantmentApi;
+import xyz.alexcrea.cuanvil.config.ConfigHolder;
+import xyz.alexcrea.cuanvil.enchant.CAEnchantment;
+import xyz.alexcrea.cuanvil.group.EnchantConflictGroup;
+import xyz.alexcrea.cuanvil.gui.ValueUpdatableGui;
+import xyz.alexcrea.cuanvil.gui.config.MainConfigGui;
+import xyz.alexcrea.cuanvil.gui.util.GuiGlobalActions;
+import xyz.alexcrea.cuanvil.gui.util.GuiGlobalItems;
+
+import java.util.HashMap;
+import java.util.Set;
+import java.util.function.Predicate;
+import java.util.stream.Collectors;
+
+public class EnchantConfigGui extends ChestGui implements ValueUpdatableGui {
+
+    private final Set<CAEnchantment> enchantments;
+    private final PatternPane pane;
+
+    private EnchantLimitConfigGui enchantLimitConfigGui;
+    private EnchantMergeLimitConfigGui enchantMergeLimitConfigGui;
+    private EnchantCostConfigGui enchantCostConfigGui;
+
+    private EnchantConflictGui enchantConflictGui;
+    private GroupConfigGui groupConfigGui;
+
+    public EnchantConfigGui(@NotNull Set<CAEnchantment> enchantments) {
+        super(3,
+                "Configuring Enchantments",
+                CustomAnvil.instance);
+        this.enchantments = enchantments;
+
+        Pattern pattern = new Pattern(
+                "0000D0000",
+                "023405600",
+                "Q00000000"
+        );
+        pane = new PatternPane(0, 0, 9, 3, pattern);
+        addPane(pane);
+
+        GuiGlobalItems.addBackgroundItem(pane);
+
+        ItemStack displayItemstack = new ItemStack(Material.ENCHANTED_BOOK);
+        ItemMeta displayMeta = displayItemstack.getItemMeta();
+        assert displayMeta != null;
+
+        displayMeta.setDisplayName("§aConfiguring Enchantments:");
+        displayItemstack.setItemMeta(displayMeta);
+
+        // Set enchantments
+        HashMap<CAEnchantment, Integer> enchantmentMap = new HashMap<>();
+        for (CAEnchantment enchantment : enchantments) {
+            enchantmentMap.put(enchantment, 1);
+        }
+        EnchantmentApi.setEnchantments(displayItemstack, enchantmentMap);
+
+        pane.bindItem('D', new GuiItem(displayItemstack, GuiGlobalActions.stayInPlace, CustomAnvil.instance));
+
+        updateGuiValues();
+
+        // Enchantment Conflicts item
+        var enchantConflictItem = MainConfigGui.enchantConflictItem(getEnchantConflictGui());
+        pane.bindItem('5', enchantConflictItem);
+
+        // Group config items
+        var groupConfigItem = MainConfigGui.groupConfigItem(getGroupConfigGui());
+        pane.bindItem('6', groupConfigItem);
+
+        // quit item
+        pane.bindItem('Q', MainConfigGui.quitItem());
+    }
+
+    private GuiItem enchantLimitConfigGui() {
+        if (enchantLimitConfigGui == null) {
+            enchantLimitConfigGui = new EnchantLimitConfigGui(this);
+            enchantLimitConfigGui.setFilter(enchantments::contains);
+            enchantLimitConfigGui.init();
+        }
+
+        // Bypass
+        if(enchantments.size() == 1) {
+            var enchant = enchantments.iterator().next();
+            var factory = EnchantLimitConfigGui.createFactory(enchant, this);
+
+            return enchantLimitConfigGui.itemFromFactory(enchant, factory);
+        }
+
+        return MainConfigGui.enchantLimitItem(enchantLimitConfigGui);
+    }
+
+    private GuiItem enchantMergeLimitConfigGui() {
+        if (enchantMergeLimitConfigGui == null) {
+            enchantMergeLimitConfigGui = new EnchantMergeLimitConfigGui(this);
+            enchantMergeLimitConfigGui.setFilter(enchantments::contains);
+            enchantMergeLimitConfigGui.init();
+        }
+
+        // Bypass
+        if(enchantments.size() == 1) {
+            var enchant = enchantments.iterator().next();
+            var factory = EnchantMergeLimitConfigGui.createFactory(enchant, this);
+
+            return enchantMergeLimitConfigGui.itemFromFactory(enchant, factory);
+        }
+
+        return MainConfigGui.enchantMergeLimitItem(enchantMergeLimitConfigGui);
+    }
+
+    private GuiItem enchantCostConfigGui() {
+        if (enchantCostConfigGui == null) {
+            enchantCostConfigGui = new EnchantCostConfigGui(this);
+            enchantCostConfigGui.setFilter(enchantments::contains);
+            enchantCostConfigGui.init();
+        }
+
+        // Bypass
+        if(enchantments.size() == 1) {
+            var enchant = enchantments.iterator().next();
+            var factory = EnchantCostConfigGui.createFactory(enchant, this);
+
+            return enchantCostConfigGui.itemFromFactory(enchant, factory);
+        }
+
+        return MainConfigGui.enchantCostItem(enchantCostConfigGui);
+    }
+
+    @NotNull
+    @Contract(pure = true)
+    private Predicate<EnchantConflictGroup> getGroupFilter() {
+        return group -> group.getEnchants()
+                .stream()
+                .anyMatch(enchantments::contains);
+    }
+
+    private EnchantConflictGui getEnchantConflictGui() {
+        if (enchantConflictGui == null) {
+            enchantConflictGui = new EnchantConflictGui(this);
+            enchantConflictGui.setFilter(getGroupFilter());
+            enchantConflictGui.init();
+        }
+
+        return enchantConflictGui;
+    }
+
+    private GroupConfigGui getGroupConfigGui() {
+        if (groupConfigGui == null) {
+            groupConfigGui = new GroupConfigGui(this);
+
+            // Get all the conflict related to this enchantment
+            var groups = ConfigHolder.CONFLICT_HOLDER
+                    .getConflictManager()
+                    .getConflictList()
+                    .stream()
+                    .filter(getGroupFilter())
+                    .map(EnchantConflictGroup::getCantConflictGroup)
+                    .collect(Collectors.toSet());
+
+            groupConfigGui.setFilter(group ->
+                groups.stream().anyMatch(other -> other.isReferencing(group))
+            );
+            groupConfigGui.init();
+        }
+
+        return groupConfigGui;
+    }
+
+    @Override
+    public void updateGuiValues() {
+        // enchant level limit item
+        pane.bindItem('2', enchantLimitConfigGui());
+
+        // enchant level limit item
+        pane.bindItem('3', enchantMergeLimitConfigGui());
+
+        // enchant cost item
+        pane.bindItem('4', enchantCostConfigGui());
+    }
+
+    @Override
+    public Gui getConnectedGui() {
+        return this;
+    }
+}

src/main/java/xyz/alexcrea/cuanvil/gui/config/global/EnchantConflictGui.java

@@ -1,6 +1,7 @@
 package xyz.alexcrea.cuanvil.gui.config.global;
 
 import com.github.stefvanschie.inventoryframework.gui.GuiItem;
+import com.github.stefvanschie.inventoryframework.gui.type.util.Gui;
 import org.bukkit.configuration.file.FileConfiguration;
 import org.bukkit.inventory.ItemFlag;
 import org.bukkit.inventory.ItemStack;
@@ -24,26 +25,30 @@ public class EnchantConflictGui extends MappedGuiListConfigGui<EnchantConflictGr
     private static EnchantConflictGui INSTANCE;
 
     @Nullable
-    public static EnchantConflictGui getCurrentInstance(){
+    public static EnchantConflictGui getCurrentInstance() {
         return INSTANCE;
     }
 
     @NotNull
-    public static EnchantConflictGui getInstance(){
-        if(INSTANCE == null) INSTANCE = new EnchantConflictGui();
+    public static EnchantConflictGui getInstance() {
+        if (INSTANCE == null) INSTANCE = new EnchantConflictGui();
 
         return INSTANCE;
     }
 
+    // Need to init myself
+    public EnchantConflictGui(Gui parent) {
+        super("Conflict Config", parent);
+    }
 
     private EnchantConflictGui() {
-        super( "Conflict Config");
+        super("Conflict Config");
 
         init();
     }
 
     @Override
-    protected EnchantConflictGroup createAndSaveNewEmptyGeneric(String name){
+    protected EnchantConflictGroup createAndSaveNewEmptyGeneric(String name) {
         // Create new empty conflict and display it to the admin
         EnchantConflictGroup conflict = new EnchantConflictGroup(
                 name,
@@ -97,7 +102,7 @@ public class EnchantConflictGui extends MappedGuiListConfigGui<EnchantConflictGr
     }
 
     @Override
-    protected Collection<EnchantConflictGroup> getEveryDisplayableInstanceOfGeneric() {
+    protected Collection<EnchantConflictGroup> getEveryInstanceOfGeneric() {
         return ConfigHolder.CONFLICT_HOLDER.getConflictManager().getConflictList();
     }
 

src/main/java/xyz/alexcrea/cuanvil/gui/config/global/EnchantCostConfigGui.java

@@ -1,14 +1,14 @@
 package xyz.alexcrea.cuanvil.gui.config.global;
 
 import com.github.stefvanschie.inventoryframework.gui.GuiItem;
+import com.github.stefvanschie.inventoryframework.gui.type.util.Gui;
 import org.bukkit.Material;
 import org.bukkit.inventory.ItemStack;
 import org.bukkit.inventory.meta.ItemMeta;
 import org.jetbrains.annotations.Nullable;
 import xyz.alexcrea.cuanvil.config.ConfigHolder;
 import xyz.alexcrea.cuanvil.enchant.CAEnchantment;
-import xyz.alexcrea.cuanvil.enchant.EnchantmentProperties;
-import xyz.alexcrea.cuanvil.enchant.EnchantmentRarity;
+import xyz.alexcrea.cuanvil.gui.ValueUpdatableGui;
 import xyz.alexcrea.cuanvil.gui.config.settings.EnchantCostSettingsGui;
 import xyz.alexcrea.cuanvil.gui.util.GuiGlobalItems;
 import xyz.alexcrea.cuanvil.util.CasedStringUtil;
@@ -18,13 +18,13 @@ import java.util.Arrays;
 import java.util.List;
 import java.util.Locale;
 
+import static io.delilaheve.util.ConfigOptions.ENCHANT_VALUES_ROOT;
+
 /**
  * Global Config gui for enchantment cost settings.
  */
 public class EnchantCostConfigGui extends AbstractEnchantConfigGui<EnchantCostSettingsGui.EnchantCostSettingFactory> {
 
-    private static final String SECTION_NAME = "enchant_values";
-
     private static EnchantCostConfigGui INSTANCE = null;
 
     @Nullable
@@ -37,18 +37,29 @@ public class EnchantCostConfigGui extends AbstractEnchantConfigGui<EnchantCostSe
      */
     public EnchantCostConfigGui() {
         super("§8Enchantment Level Cost");
-        if(INSTANCE == null) INSTANCE = this;
+        if (INSTANCE == null) INSTANCE = this;
 
         init();
     }
 
+    /**
+     * Constructor of this Global gui for enchantment cost settings.
+     */
+    public EnchantCostConfigGui(Gui parent) {
+        super("§8Enchantment Level Cost", parent);
+    }
+
     @Override
     public EnchantCostSettingsGui.EnchantCostSettingFactory createFactory(CAEnchantment enchant) {
+        return createFactory(enchant, this);
+    }
+
+    public static EnchantCostSettingsGui.EnchantCostSettingFactory createFactory(CAEnchantment enchant, ValueUpdatableGui parent) {
         String key = enchant.getKey().toString().toLowerCase(Locale.ENGLISH);
         String prettyKey = CasedStringUtil.snakeToUpperSpacedCase(key.replace(":", "_"));
 
-        return new EnchantCostSettingsGui.EnchantCostSettingFactory(prettyKey + " Cost", this,
-                SECTION_NAME + '.' + key, ConfigHolder.DEFAULT_CONFIG,
+        return new EnchantCostSettingsGui.EnchantCostSettingFactory(prettyKey + " Cost", parent,
+                ENCHANT_VALUES_ROOT + '.' + key, ConfigHolder.DEFAULT_CONFIG,
                 Arrays.asList(
                         "§7How many level should " + prettyKey,
                         "§7cost when applied by book or by another item."
@@ -74,7 +85,7 @@ public class EnchantCostConfigGui extends AbstractEnchantConfigGui<EnchantCostSe
         lore.add("§7Book Cost: §e" + bookCost);
 
         List<String> displayLore = factory.getDisplayLore();
-        if(!displayLore.isEmpty()){
+        if (!displayLore.isEmpty()) {
             lore.add("");
             lore.addAll(displayLore);
         }

src/main/java/xyz/alexcrea/cuanvil/gui/config/global/EnchantLimitConfigGui.java

@@ -1,11 +1,13 @@
 package xyz.alexcrea.cuanvil.gui.config.global;
 
 import com.github.stefvanschie.inventoryframework.gui.GuiItem;
+import com.github.stefvanschie.inventoryframework.gui.type.util.Gui;
 import io.delilaheve.util.ConfigOptions;
 import org.bukkit.Material;
 import org.jetbrains.annotations.Nullable;
 import xyz.alexcrea.cuanvil.config.ConfigHolder;
 import xyz.alexcrea.cuanvil.enchant.CAEnchantment;
+import xyz.alexcrea.cuanvil.gui.ValueUpdatableGui;
 import xyz.alexcrea.cuanvil.gui.config.settings.IntSettingsGui;
 import xyz.alexcrea.cuanvil.util.CasedStringUtil;
 
@@ -36,14 +38,22 @@ public class EnchantLimitConfigGui extends AbstractEnchantConfigGui<IntSettingsG
         init();
     }
 
+    public EnchantLimitConfigGui(Gui parent) {
+        super("§8Enchantment Level Limit", parent);
+    }
+
     @Override
     public IntSettingsGui.IntSettingFactory createFactory(CAEnchantment enchant) {
+        return createFactory(enchant, this);
+    }
+
+    public static IntSettingsGui.IntSettingFactory createFactory(CAEnchantment enchant, ValueUpdatableGui parent) {
         String key = enchant.getKey().toString().toLowerCase(Locale.ROOT);
         String prettyKey = CasedStringUtil.snakeToUpperSpacedCase(key.replace(":", "_"));
 
         var defaultValue = enchant.defaultMaxLevel();
 
-        return new IntSettingsGui.IntSettingFactory(prettyKey + " Limit", this,
+        return new IntSettingsGui.IntSettingFactory(prettyKey + " Limit", parent,
                 SECTION_NAME + '.' + key, ConfigHolder.DEFAULT_CONFIG,
                 Collections.singletonList(
                         "§7Maximum applied level of " + prettyKey

src/main/java/xyz/alexcrea/cuanvil/gui/config/global/EnchantMergeLimitConfigGui.java

@@ -1,11 +1,13 @@
 package xyz.alexcrea.cuanvil.gui.config.global;
 
 import com.github.stefvanschie.inventoryframework.gui.GuiItem;
+import com.github.stefvanschie.inventoryframework.gui.type.util.Gui;
 import io.delilaheve.util.ConfigOptions;
 import org.bukkit.Material;
 import org.jetbrains.annotations.Nullable;
 import xyz.alexcrea.cuanvil.config.ConfigHolder;
 import xyz.alexcrea.cuanvil.enchant.CAEnchantment;
+import xyz.alexcrea.cuanvil.gui.ValueUpdatableGui;
 import xyz.alexcrea.cuanvil.gui.config.settings.IntSettingsGui;
 import xyz.alexcrea.cuanvil.util.CasedStringUtil;
 
@@ -33,12 +35,24 @@ public class EnchantMergeLimitConfigGui extends AbstractEnchantConfigGui<IntSett
         init();
     }
 
+    /**
+     * Constructor of this Global gui for enchantment level limit settings.
+     */
+    public EnchantMergeLimitConfigGui(Gui parent) {
+        super("§8Enchantment Maximum Merge Level", parent);
+    }
+
+
     @Override
     public IntSettingsGui.IntSettingFactory createFactory(CAEnchantment enchant) {
+        return createFactory(enchant, this);
+    }
+
+    public static IntSettingsGui.IntSettingFactory createFactory(CAEnchantment enchant, ValueUpdatableGui parent) {
         String key = enchant.getKey().toString().toLowerCase(Locale.ROOT);
         String prettyKey = CasedStringUtil.snakeToUpperSpacedCase(key.replace(":", "_"));
 
-        return new IntSettingsGui.IntSettingFactory(prettyKey + " Merge Limit", this,
+        return new IntSettingsGui.IntSettingFactory(prettyKey + " Merge Limit", parent,
                 SECTION_NAME + '.' + key, ConfigHolder.DEFAULT_CONFIG,
                 Arrays.asList(
                         "§7Maximum merge level for for " + prettyKey,

src/main/java/xyz/alexcrea/cuanvil/gui/config/global/GroupConfigGui.java

@@ -1,6 +1,7 @@
 package xyz.alexcrea.cuanvil.gui.config.global;
 
 import com.github.stefvanschie.inventoryframework.gui.GuiItem;
+import com.github.stefvanschie.inventoryframework.gui.type.util.Gui;
 import org.bukkit.configuration.ConfigurationSection;
 import org.bukkit.inventory.ItemFlag;
 import org.bukkit.inventory.ItemStack;
@@ -43,6 +44,10 @@ public class GroupConfigGui extends MappedGuiListConfigGui<IncludeGroup, MappedG
         init();
     }
 
+    public GroupConfigGui(Gui parent) {
+        super("Group Config", parent);
+    }
+
     @Override
     protected ItemStack createItemForGeneric(IncludeGroup group) {
         ItemStack item = new ItemStack(group.getRepresentativeMaterial());
@@ -62,7 +67,7 @@ public class GroupConfigGui extends MappedGuiListConfigGui<IncludeGroup, MappedG
     }
 
     @Override
-    protected Collection<IncludeGroup> getEveryDisplayableInstanceOfGeneric() {
+    protected Collection<IncludeGroup> getEveryInstanceOfGeneric() {
         ArrayList<IncludeGroup> includeGroups = new ArrayList<>();
 
         for (AbstractMaterialGroup group : ConfigHolder.ITEM_GROUP_HOLDER.getItemGroupsManager().getGroupMap().values()) {

src/main/java/xyz/alexcrea/cuanvil/gui/config/global/ItemConfigGui.java

@@ -0,0 +1,132 @@
+package xyz.alexcrea.cuanvil.gui.config.global;
+
+import com.github.stefvanschie.inventoryframework.gui.GuiItem;
+import com.github.stefvanschie.inventoryframework.gui.type.ChestGui;
+import com.github.stefvanschie.inventoryframework.pane.PatternPane;
+import com.github.stefvanschie.inventoryframework.pane.util.Pattern;
+import io.delilaheve.CustomAnvil;
+import org.bukkit.Material;
+import org.bukkit.NamespacedKey;
+import org.bukkit.inventory.ItemStack;
+import org.bukkit.inventory.meta.ItemMeta;
+import org.jetbrains.annotations.NotNull;
+import org.jetbrains.annotations.Nullable;
+import xyz.alexcrea.cuanvil.config.ConfigHolder;
+import xyz.alexcrea.cuanvil.gui.config.MainConfigGui;
+import xyz.alexcrea.cuanvil.gui.util.GuiGlobalActions;
+import xyz.alexcrea.cuanvil.gui.util.GuiGlobalItems;
+import xyz.alexcrea.cuanvil.util.CasedStringUtil;
+import xyz.alexcrea.cuanvil.util.MaterialUtil;
+import xyz.alexcrea.cuanvil.util.UnitRepairUtil;
+
+public class ItemConfigGui extends ChestGui {
+
+    private EnchantConflictGui enchantConflictGui;
+    private GroupConfigGui groupConfigGui;
+    private UnitRepairConfigGui unitRepairConfigGui;
+    private CustomRecipeConfigGui customRecipeConfigGui;
+
+    public ItemConfigGui(@NotNull Material display, @NotNull NamespacedKey material) {
+        super(3,
+                CasedStringUtil.snakeToUpperSpacedCase(
+                        material.getKey().toLowerCase()
+                ) + " Config",
+                CustomAnvil.instance);
+
+        Pattern pattern = new Pattern(
+                "0000D0000",
+                "056000780",
+                "Q00000000"
+        );
+        PatternPane pane = new PatternPane(0, 0, 9, 3, pattern);
+        addPane(pane);
+
+        GuiGlobalItems.addBackgroundItem(pane);
+
+        ItemStack displayItemstack = new ItemStack(display);
+        ItemMeta displayMeta = displayItemstack.getItemMeta();
+        assert displayMeta != null;
+
+        displayMeta.setDisplayName("§aConfiguring " + material);
+        displayItemstack.setItemMeta(displayMeta);
+        pane.bindItem('D', new GuiItem(displayItemstack, GuiGlobalActions.stayInPlace, CustomAnvil.instance));
+
+        // Enchantment Conflicts item
+        GuiItem enchantConflictItem = MainConfigGui.enchantConflictItem(getEnchantConflictGui(material));
+        pane.bindItem('5', enchantConflictItem);
+
+        // Group config items
+        GuiItem groupConfigItem = MainConfigGui.groupConfigItem(getGroupConfigGui(material));
+        pane.bindItem('6', groupConfigItem);
+
+        // Unit repair item
+        GuiItem unitRepairItem = MainConfigGui.unitRepairItem(getUnitRepairConfigGui(material));
+        pane.bindItem('7', unitRepairItem);
+
+        // Custom recipe item
+        GuiItem customRecipeItem = MainConfigGui.customRecipeItem(getCustomRecipeConfigGui(material));
+        pane.bindItem('8', customRecipeItem);
+
+        // quit item
+        pane.bindItem('Q', MainConfigGui.quitItem());
+    }
+
+    private EnchantConflictGui getEnchantConflictGui(@NotNull NamespacedKey material) {
+        if (enchantConflictGui == null) {
+            enchantConflictGui = new EnchantConflictGui(this);
+            enchantConflictGui.setFilter(group ->
+                    group.getCantConflictGroup().contain(material)
+            );
+            enchantConflictGui.init();
+        }
+
+        return enchantConflictGui;
+    }
+
+    private GroupConfigGui getGroupConfigGui(@NotNull NamespacedKey material) {
+        if (groupConfigGui == null) {
+            groupConfigGui = new GroupConfigGui(this);
+            groupConfigGui.setFilter(group ->
+                    group.contain(material)
+            );
+            groupConfigGui.init();
+        }
+
+        return groupConfigGui;
+    }
+
+    private UnitRepairConfigGui getUnitRepairConfigGui(@NotNull NamespacedKey material) {
+        if (unitRepairConfigGui == null) {
+            unitRepairConfigGui = new UnitRepairConfigGui(this);
+            unitRepairConfigGui.setFilter(otherMat ->
+                    otherMat.equals(material) || UnitRepairUtil.INSTANCE.findRawRepairValue(
+                            material, otherMat, ConfigHolder.UNIT_REPAIR_HOLDER.getConfig()) != null
+            );
+            unitRepairConfigGui.init();
+        }
+
+        return unitRepairConfigGui;
+    }
+
+    private CustomRecipeConfigGui getCustomRecipeConfigGui(@NotNull NamespacedKey material) {
+        if (customRecipeConfigGui == null) {
+            customRecipeConfigGui = new CustomRecipeConfigGui(this);
+            customRecipeConfigGui.setFilter(recipe -> {
+                        if (isMaterial(recipe.getLeftItem(), material)) return true;
+                        if (isMaterial(recipe.getRightItem(), material)) return true;
+                        return isMaterial(recipe.getResultItem(), material);
+                    }
+            );
+            customRecipeConfigGui.init();
+        }
+
+        return customRecipeConfigGui;
+    }
+
+    private boolean isMaterial(@Nullable ItemStack item, @NotNull NamespacedKey material) {
+        if (item == null) return false;
+
+        return material.equals(MaterialUtil.INSTANCE.getCustomType(item));
+    }
+
+}

src/main/java/xyz/alexcrea/cuanvil/gui/config/global/UnitRepairConfigGui.java

@@ -1,9 +1,10 @@
 package xyz.alexcrea.cuanvil.gui.config.global;
 
 import com.github.stefvanschie.inventoryframework.gui.GuiItem;
+import com.github.stefvanschie.inventoryframework.gui.type.util.Gui;
 import io.delilaheve.CustomAnvil;
 import org.bukkit.Material;
-import org.bukkit.configuration.ConfigurationSection;
+import org.bukkit.NamespacedKey;
 import org.bukkit.inventory.ItemStack;
 import org.bukkit.inventory.meta.ItemMeta;
 import org.jetbrains.annotations.NotNull;
@@ -13,24 +14,25 @@ import xyz.alexcrea.cuanvil.gui.config.ask.SelectItemTypeGui;
 import xyz.alexcrea.cuanvil.gui.config.list.MappedGuiListConfigGui;
 import xyz.alexcrea.cuanvil.gui.config.list.UnitRepairElementListGui;
 import xyz.alexcrea.cuanvil.util.CasedStringUtil;
+import xyz.alexcrea.cuanvil.util.MaterialUtil;
 
-import java.util.ArrayList;
 import java.util.Arrays;
 import java.util.Collection;
+import java.util.HashSet;
 
 public class UnitRepairConfigGui extends
-        MappedGuiListConfigGui<Material, MappedGuiListConfigGui.LazyElement<UnitRepairElementListGui>> {
+        MappedGuiListConfigGui<NamespacedKey, MappedGuiListConfigGui.LazyElement<UnitRepairElementListGui>> {
 
     private static UnitRepairConfigGui INSTANCE;
 
     @Nullable
-    public static UnitRepairConfigGui getCurrentInstance(){
+    public static UnitRepairConfigGui getCurrentInstance() {
         return INSTANCE;
     }
 
     @NotNull
-    public static UnitRepairConfigGui getInstance(){
-        if(INSTANCE == null) INSTANCE = new UnitRepairConfigGui();
+    public static UnitRepairConfigGui getInstance() {
+        if (INSTANCE == null) INSTANCE = new UnitRepairConfigGui();
 
         return INSTANCE;
     }
@@ -41,8 +43,12 @@ public class UnitRepairConfigGui extends
         init();
     }
 
+    public UnitRepairConfigGui(Gui parent) {
+        super("Unit Repair Config", parent);
+    }
+
     @Override
-    protected LazyElement<UnitRepairElementListGui> newInstanceOfGui(Material material, GuiItem item) {
+    protected LazyElement<UnitRepairElementListGui> newInstanceOfGui(NamespacedKey material, GuiItem item) {
         return new LazyElement<>(item, () -> {
             UnitRepairElementListGui element = new UnitRepairElementListGui(material, this);
             element.init();
@@ -51,23 +57,34 @@ public class UnitRepairConfigGui extends
     }
 
     @Override
-    protected ItemStack createItemForGeneric(Material material) {
-        ConfigurationSection materialSection = ConfigHolder.UNIT_REPAIR_HOLDER.getConfig().getConfigurationSection(material.name().toLowerCase());
-        String materialName = CasedStringUtil.snakeToUpperSpacedCase(material.name().toLowerCase());
+    protected ItemStack createItemForGeneric(@NotNull NamespacedKey material) {
+        var unitConfig = ConfigHolder.UNIT_REPAIR_HOLDER.getConfig();
+        var section = unitConfig.getConfigurationSection(material.toString().toLowerCase());
+        var legacySection = unitConfig.getConfigurationSection(material.getKey().toLowerCase());
 
-        if(material.isAir()){
-            material = Material.BARRIER;
+        String materialName = CasedStringUtil.snakeToUpperSpacedCase(material.getKey().toLowerCase());
+
+        var display = MaterialUtil.INSTANCE.getMatFromKey(material);
+
+        if (display == null || display.isAir()) {
+            display = Material.BARRIER;
         }
 
-        int reparableItemCount = materialSection == null ? 0 : materialSection.getKeys(false).size(); // Probably an expensive call but... why not
+        var reparable = new HashSet<String>();
+        if (section != null)
+            reparable.addAll(section.getKeys(false));
+        if (legacySection != null)
+            reparable.addAll(legacySection.getKeys(false));
 
-        ItemStack item = new ItemStack(material);
+        var reparableItemCount = reparable.size();
+
+        ItemStack item = new ItemStack(display);
         ItemMeta meta = item.getItemMeta();
         assert meta != null;
 
-        meta.setDisplayName("§eRepaired by " +materialName);
+        meta.setDisplayName("§eRepaired by " + materialName);
         meta.setLore(Arrays.asList(
-                "§7There is currently §e" +reparableItemCount+ " §7reparable item with "+materialName,
+                "§7There is currently §e" + reparableItemCount + " §7reparable item with " + materialName,
                 "§7Click here to open the menu to edit reparable item by " + materialName
         ));
 
@@ -77,13 +94,16 @@ public class UnitRepairConfigGui extends
     }
 
     @Override
-    protected Collection<Material> getEveryDisplayableInstanceOfGeneric() {
-        ArrayList<Material> materials = new ArrayList<>();
+    protected Collection<NamespacedKey> getEveryInstanceOfGeneric() {
+        var materials = new HashSet<NamespacedKey>();
+        var config = ConfigHolder.UNIT_REPAIR_HOLDER.getConfig();
 
-        for (String matName : ConfigHolder.UNIT_REPAIR_HOLDER.getConfig().getKeys(false)) {
-            Material mat = Material.getMaterial(matName.toUpperCase());
-            if(mat != null){
-                materials.add(mat);
+        for (String matName : config.getKeys(false)) {
+            if(!config.isConfigurationSection(matName)) continue;
+
+            NamespacedKey material = NamespacedKey.fromString(matName.toLowerCase());
+            if (material != null) {
+                materials.add(material);
             }
         }
         return materials;
@@ -113,7 +133,7 @@ public class UnitRepairConfigGui extends
                             "§7You like to be an unit repair item",
                     this,
                     (itemStack, player) -> {
-                        Material type = itemStack.getType();
+                        NamespacedKey type = MaterialUtil.INSTANCE.getCustomType(itemStack);
                         // Add new material
                         updateValueForGeneric(type, true);
 
@@ -126,9 +146,9 @@ public class UnitRepairConfigGui extends
     }
 
     @NotNull
-    public LazyElement<UnitRepairElementListGui> getInstanceOrCreate(Material mat){
+    public LazyElement<UnitRepairElementListGui> getInstanceOrCreate(NamespacedKey mat) {
         LazyElement<UnitRepairElementListGui> element = this.elementGuiMap.get(mat);
-        if(element == null){
+        if (element == null) {
             updateValueForGeneric(mat, false);
 
             element = this.elementGuiMap.get(mat);
@@ -141,8 +161,10 @@ public class UnitRepairConfigGui extends
     protected String genericDisplayedName() {
         return "this function Should not be used.";
     }
+
     @Override // Not used in this implementation.
-    protected Material createAndSaveNewEmptyGeneric(String name) {
+    protected NamespacedKey createAndSaveNewEmptyGeneric(String name) {
         return null;
     }
+
 }

src/main/java/xyz/alexcrea/cuanvil/gui/config/list/ElementListConfigGui.java

@@ -23,18 +23,22 @@ import java.util.ArrayList;
 import java.util.Collection;
 import java.util.HashMap;
 import java.util.UUID;
+import java.util.function.Predicate;
 
-public abstract class ElementListConfigGui< T > extends ChestGui implements ValueUpdatableGui {
-
-    private final String namePrefix;
-
-    protected PatternPane backgroundPane;
+public abstract class ElementListConfigGui<T> extends ChestGui implements ValueUpdatableGui {
 
     public static final int LIST_FILLER_START_X = 1;
     public static final int LIST_FILLER_START_Y = 1;
     public static final int LIST_FILLER_LENGTH = 7;
     public static final int LIST_FILLER_HEIGHT = 4;
 
+    private final String namePrefix;
+
+    protected PatternPane backgroundPane;
+
+    private Predicate<T> filter = (t) -> true;
+    private boolean hasDefaultFilter = true;
+
     protected ElementListConfigGui(@NotNull String title, Gui parent) {
         super(6, title, CustomAnvil.instance);
         this.namePrefix = title;
@@ -46,7 +50,12 @@ public abstract class ElementListConfigGui< T > extends ChestGui implements Valu
 
     }
 
-    protected Pattern getBackgroundPattern(){
+    public void setFilter(Predicate<T> filter) {
+        this.filter = filter;
+        this.hasDefaultFilter = false;
+    }
+
+    protected Pattern getBackgroundPattern() {
         return new Pattern(
                 GuiSharedConstant.UPPER_FILLER_FULL_PLANE,
                 GuiSharedConstant.EMPTY_FILLER_FULL_LINE,
@@ -61,7 +70,7 @@ public abstract class ElementListConfigGui< T > extends ChestGui implements Valu
     protected ArrayList<OutlinePane> pages;
     protected HashMap<UUID, Integer> pageMap;
 
-    public void init() { // Why I'm using an init function ? //TODO determine why is it using a init function and not used on constructor.
+    public void init() {
         GuiGlobalItems.addBackgroundItem(this.backgroundPane);
         this.backgroundPane.bindItem('1', GuiSharedConstant.SECONDARY_BACKGROUND_ITEM);
         addPane(this.backgroundPane);
@@ -81,7 +90,7 @@ public abstract class ElementListConfigGui< T > extends ChestGui implements Valu
     protected GuiItem goLeftItem;
     protected GuiItem goRightItem;
 
-    protected void prepareStaticValues(){
+    protected void prepareStaticValues() {
         // Left item creation for consumer & bind
         this.goLeftItem = new GuiItem(new ItemStack(Material.RED_STAINED_GLASS_PANE), event -> {
             HumanEntity viewer = event.getWhoClicked();
@@ -112,17 +121,23 @@ public abstract class ElementListConfigGui< T > extends ChestGui implements Valu
             viewer.setItemOnCursor(cursor);
         }, CustomAnvil.instance);
 
-        GuiItem createNew = prepareCreateNewItem();
-        if(createNew != null){
+        GuiItem createNew;
+        if(hasDefaultFilter)
+            createNew = prepareCreateNewItem();
+        else
+            createNew = GuiSharedConstant.SECONDARY_BACKGROUND_ITEM;
+
+        if (createNew != null) {
             this.backgroundPane.bindItem('C', createNew);
         }
     }
-    protected void reloadValues(){
+
+    protected void reloadValues() {
         this.firstPage.clear();
         this.pages.clear();
         this.pages.add(this.firstPage);
 
-        for (T generic : getEveryDisplayableInstanceOfGeneric()) {
+        for (T generic : getDisplayableInstanceOfGeneric()) {
             updateValueForGeneric(generic, false);
         }
 
@@ -247,7 +262,7 @@ public abstract class ElementListConfigGui< T > extends ChestGui implements Valu
         // set title
         StringBuilder title = new StringBuilder(this.namePrefix);
         int pagesSize = this.pages.size();
-        if(pagesSize > 1){
+        if (pagesSize > 1) {
             title.append(" (").append(pageID + 1).append('/').append(pagesSize).append(')');
         }
         setTitle(title.toString());
@@ -288,7 +303,7 @@ public abstract class ElementListConfigGui< T > extends ChestGui implements Valu
 
     public void removeGeneric(T generic) {
         GuiItem item = findGuiItemForRemoval(generic);
-        if(item == null) return;
+        if (item == null) return;
         removeFromPage(item);
 
         update();
@@ -300,7 +315,11 @@ public abstract class ElementListConfigGui< T > extends ChestGui implements Valu
 
     protected abstract void updateGeneric(T generic, ItemStack usedItem);
 
-    protected abstract Collection<T> getEveryDisplayableInstanceOfGeneric();
+    protected abstract Collection<T> getEveryInstanceOfGeneric();
+
+    protected Collection<T> getDisplayableInstanceOfGeneric() {
+        return getEveryInstanceOfGeneric().stream().filter(filter).toList();
+    }
 
     @Override
     public void updateGuiValues() {

src/main/java/xyz/alexcrea/cuanvil/gui/config/list/MappedElementListConfigGui.java

@@ -1,6 +1,7 @@
 package xyz.alexcrea.cuanvil.gui.config.list;
 
 import com.github.stefvanschie.inventoryframework.gui.GuiItem;
+import com.github.stefvanschie.inventoryframework.gui.type.util.Gui;
 import io.delilaheve.CustomAnvil;
 import org.bukkit.Material;
 import org.bukkit.entity.HumanEntity;
@@ -14,27 +15,32 @@ import java.util.Arrays;
 import java.util.HashMap;
 import java.util.function.Consumer;
 
-public abstract class MappedElementListConfigGui< T, S > extends ElementListConfigGui< T > {
+public abstract class MappedElementListConfigGui<T, S> extends ElementListConfigGui<T> {
 
     protected final HashMap<T, S> elementGuiMap;
-    protected MappedElementListConfigGui(@NotNull String title) {
-        super(title, MainConfigGui.getInstance());
+
+    protected MappedElementListConfigGui(@NotNull String title, @NotNull Gui parent) {
+        super(title, parent);
         this.elementGuiMap = new HashMap<>();
 
     }
 
+    protected MappedElementListConfigGui(@NotNull String title) {
+        this(title, MainConfigGui.getInstance());
+    }
+
     @Override
-    protected GuiItem prepareCreateNewItem(){
+    protected GuiItem prepareCreateNewItem() {
         // Create new conflict item
         ItemStack createItem = new ItemStack(Material.PAPER);
         ItemMeta createMeta = createItem.getItemMeta();
         assert createMeta != null;
 
-        createMeta.setDisplayName("§aCreate new "+genericDisplayedName());
+        createMeta.setDisplayName("§aCreate new " + genericDisplayedName());
         createMeta.setLore(Arrays.asList(
-                "§7Create a new "+genericDisplayedName()+".",
-                "§7You will be asked to name the "+genericDisplayedName()+" in chat.",
-                "§7Then, you should edit the "+genericDisplayedName()+" config as you need"
+                "§7Create a new " + genericDisplayedName() + ".",
+                "§7You will be asked to name the " + genericDisplayedName() + " in chat.",
+                "§7Then, you should edit the " + genericDisplayedName() + " config as you need"
         ));
 
         createItem.setItemMeta(createMeta);
@@ -51,8 +57,8 @@ public abstract class MappedElementListConfigGui< T, S > extends ElementListConf
             }
             player.closeInventory();
 
-            player.sendMessage("§eWrite the "+genericDisplayedName()+" name you want to create in the chat.\n" +
-                    "§eOr write §ccancel §eto go back to "+genericDisplayedName()+" config menu");
+            player.sendMessage("§eWrite the " + genericDisplayedName() + " name you want to create in the chat.\n" +
+                    "§eOr write §ccancel §eto go back to " + genericDisplayedName() + " config menu");
 
             CustomAnvil.Companion.getChatListener().setListenedCallback(player, prepareCreateItemConsumer(player));
 

src/main/java/xyz/alexcrea/cuanvil/gui/config/list/MappedGuiListConfigGui.java

@@ -1,6 +1,7 @@
 package xyz.alexcrea.cuanvil.gui.config.list;
 
 import com.github.stefvanschie.inventoryframework.gui.GuiItem;
+import com.github.stefvanschie.inventoryframework.gui.type.util.Gui;
 import io.delilaheve.CustomAnvil;
 import org.bukkit.entity.HumanEntity;
 import org.bukkit.event.inventory.InventoryClickEvent;
@@ -14,19 +15,22 @@ import java.util.concurrent.atomic.AtomicReference;
 import java.util.function.Consumer;
 import java.util.function.Supplier;
 
-public abstract class MappedGuiListConfigGui< T, S extends MappedGuiListConfigGui.LazyElement<?>>
-        extends MappedElementListConfigGui< T, S > {
+public abstract class MappedGuiListConfigGui<T, S extends MappedGuiListConfigGui.LazyElement<?>>
+        extends MappedElementListConfigGui<T, S> {
 
     protected MappedGuiListConfigGui(@NotNull String title) {
         super(title);
+    }
 
+    protected MappedGuiListConfigGui(@NotNull String title, @NotNull Gui parent) {
+        super(title, parent);
     }
 
     @Override
     public void reloadValues() {
         this.elementGuiMap.forEach((conflict, element) -> {
             ElementMappedToListGui gui = element.getStored();
-            if(gui != null) gui.cleanAndBeUnusable();
+            if (gui != null) gui.cleanAndBeUnusable();
         });
         this.elementGuiMap.clear();
 
@@ -49,7 +53,7 @@ public abstract class MappedGuiListConfigGui< T, S extends MappedGuiListConfigGu
     @Override
     protected void updateElement(T generic, S element) {
         ElementMappedToListGui gui = element.getStored();
-        if(gui != null) gui.updateLocal();
+        if (gui != null) gui.updateLocal();
     }
 
     @Override
@@ -58,7 +62,7 @@ public abstract class MappedGuiListConfigGui< T, S extends MappedGuiListConfigGu
     }
 
     @Override
-    protected Consumer<String> prepareCreateItemConsumer(HumanEntity player){
+    protected Consumer<String> prepareCreateItemConsumer(HumanEntity player) {
         AtomicReference<Consumer<String>> selfRef = new AtomicReference<>();
         Consumer<String> selfCallback = (message) -> {
             if (message == null) return;
@@ -71,7 +75,7 @@ public abstract class MappedGuiListConfigGui< T, S extends MappedGuiListConfigGu
 
             message = message.toLowerCase(Locale.ROOT);
             if ("cancel".equalsIgnoreCase(message)) {
-                player.sendMessage(genericDisplayedName()+" creation cancelled...");
+                player.sendMessage(genericDisplayedName() + " creation cancelled...");
                 show(player);
                 return;
             }
@@ -80,9 +84,9 @@ public abstract class MappedGuiListConfigGui< T, S extends MappedGuiListConfigGu
 
             // Try to find if it already exists in a for loop
             // Not the most efficient on large number of conflict, but it should not run often.
-            for (T generic : getEveryDisplayableInstanceOfGeneric()) {
+            for (T generic : getDisplayableInstanceOfGeneric()) {
                 if (generic.toString().equalsIgnoreCase(message)) {
-                    player.sendMessage("§cPlease enter a "+genericDisplayedName()+" name that do not already exist...");
+                    player.sendMessage("§cPlease enter a " + genericDisplayedName() + " name that do not already exist...");
                     // wait next message.
                     CustomAnvil.Companion.getChatListener().setListenedCallback(player, selfRef.get());
                     return;
@@ -90,7 +94,7 @@ public abstract class MappedGuiListConfigGui< T, S extends MappedGuiListConfigGu
             }
 
             T generic = createAndSaveNewEmptyGeneric(message);
-            if(generic == null) {// we don't know what to do. so we back up by opening this gui.
+            if (generic == null) {// we don't know what to do. so we back up by opening this gui.
                 this.show(player);
                 return;
             }
@@ -117,6 +121,7 @@ public abstract class MappedGuiListConfigGui< T, S extends MappedGuiListConfigGu
 
         private final GuiItem parentItem;
         private final LazyValue<Consumer<InventoryClickEvent>> lazyOpenConsumer;
+
         public LazyElement(GuiItem parentItem, Supplier<T> valueSupplier) {
             super(valueSupplier);
             this.parentItem = parentItem;
@@ -131,7 +136,7 @@ public abstract class MappedGuiListConfigGui< T, S extends MappedGuiListConfigGu
         }
 
         @NotNull
-        public Consumer<InventoryClickEvent> openAction(){
+        public Consumer<InventoryClickEvent> openAction() {
             return event -> lazyOpenConsumer.get().accept(event);
         }
 

src/main/java/xyz/alexcrea/cuanvil/gui/config/list/SettingGuiListConfigGui.java

@@ -15,10 +15,11 @@ import java.util.HashMap;
 import java.util.List;
 import java.util.function.Consumer;
 
-public abstract class SettingGuiListConfigGui< T, S extends SettingGui.SettingGuiFactory> extends ElementListConfigGui< T >{
+public abstract class SettingGuiListConfigGui<T, S extends SettingGui.SettingGuiFactory> extends ElementListConfigGui<T> {
 
     protected HashMap<T, GuiItem> guiItemMap;
     protected HashMap<T, S> factoryMap;
+
     protected SettingGuiListConfigGui(@NotNull String title, Gui parent) {
         super(title, parent);
         this.guiItemMap = new HashMap<>();
@@ -44,7 +45,7 @@ public abstract class SettingGuiListConfigGui< T, S extends SettingGui.SettingGu
 
     @Override
     public void updateValueForGeneric(T generic, boolean shouldUpdate) {
-        if(!this.factoryMap.containsKey(generic)){
+        if (!this.factoryMap.containsKey(generic)) {
             // Create new item & factory
             S factory = createFactory(generic);
             GuiItem newItem = itemFromFactory(generic, factory);
@@ -52,7 +53,7 @@ public abstract class SettingGuiListConfigGui< T, S extends SettingGui.SettingGu
             addToPage(newItem);
             this.guiItemMap.put(generic, newItem);
             this.factoryMap.put(generic, factory);
-        }else{
+        } else {
             S factory = this.factoryMap.get(generic);
             // Update old item
             GuiItem oldItem = this.guiItemMap.get(generic);
@@ -61,7 +62,7 @@ public abstract class SettingGuiListConfigGui< T, S extends SettingGui.SettingGu
             updateGuiItem(oldItem, newItem);
         }
 
-        if(shouldUpdate){
+        if (shouldUpdate) {
             update();
         }
     }
@@ -74,7 +75,7 @@ public abstract class SettingGuiListConfigGui< T, S extends SettingGui.SettingGu
         super.reloadValues();
     }
 
-    private void updateGuiItem(GuiItem oldITem, GuiItem newItem){
+    private void updateGuiItem(GuiItem oldITem, GuiItem newItem) {
         oldITem.setItem(newItem.getItem());
         oldITem.setProperties(newItem.getProperties());
         oldITem.setVisible(newItem.isVisible());
@@ -86,17 +87,22 @@ public abstract class SettingGuiListConfigGui< T, S extends SettingGui.SettingGu
     }
 
     @Override // Not used
-    protected void updateGeneric(T generic, ItemStack usedItem) {}
+    protected void updateGeneric(T generic, ItemStack usedItem) {
+    }
+
     @Override // Not used
     protected ItemStack createItemForGeneric(T generic) {
         return null;
     }
 
     protected abstract List<String> getCreateItemLore();
+
     protected abstract Consumer<InventoryClickEvent> getCreateClickConsumer();
+
     protected abstract String createItemName();
 
     protected abstract S createFactory(T generic);
+
     protected abstract GuiItem itemFromFactory(T generic, S factory);
 
 

src/main/java/xyz/alexcrea/cuanvil/gui/config/list/UnitRepairElementListGui.java

@@ -3,12 +3,14 @@ package xyz.alexcrea.cuanvil.gui.config.list;
 import com.github.stefvanschie.inventoryframework.gui.GuiItem;
 import com.github.stefvanschie.inventoryframework.gui.type.util.Gui;
 import org.bukkit.Material;
+import org.bukkit.NamespacedKey;
 import org.bukkit.configuration.ConfigurationSection;
 import org.bukkit.entity.HumanEntity;
 import org.bukkit.event.inventory.InventoryClickEvent;
 import org.bukkit.inventory.meta.Damageable;
 import org.bukkit.inventory.meta.ItemMeta;
 import org.jetbrains.annotations.NotNull;
+import org.jetbrains.annotations.Nullable;
 import xyz.alexcrea.cuanvil.config.ConfigHolder;
 import xyz.alexcrea.cuanvil.gui.config.ask.SelectItemTypeGui;
 import xyz.alexcrea.cuanvil.gui.config.global.UnitRepairConfigGui;
@@ -17,26 +19,25 @@ import xyz.alexcrea.cuanvil.gui.config.settings.DoubleSettingGui;
 import xyz.alexcrea.cuanvil.gui.util.GuiGlobalItems;
 import xyz.alexcrea.cuanvil.gui.util.GuiSharedConstant;
 import xyz.alexcrea.cuanvil.util.CasedStringUtil;
+import xyz.alexcrea.cuanvil.util.MaterialUtil;
 
-import java.util.ArrayList;
-import java.util.Arrays;
-import java.util.Collection;
-import java.util.List;
+import java.util.*;
 import java.util.function.Consumer;
 
-public class UnitRepairElementListGui extends SettingGuiListConfigGui<String, DoubleSettingGui.DoubleSettingFactory> implements ElementMappedToListGui {
+public class UnitRepairElementListGui extends SettingGuiListConfigGui<NamespacedKey, DoubleSettingGui.DoubleSettingFactory> implements ElementMappedToListGui {
 
-    private final Material parentMaterial;
+    private final NamespacedKey parentMaterial;
     private final UnitRepairConfigGui parentGui;
     private final String materialName;
 
     private boolean shouldWork = true;
-    public UnitRepairElementListGui(@NotNull Material parentMaterial,
+
+    public UnitRepairElementListGui(@NotNull NamespacedKey parentMaterial,
                                     @NotNull UnitRepairConfigGui parentGui) {
-        super("§e" + CasedStringUtil.snakeToUpperSpacedCase(parentMaterial.name().toLowerCase()) + " §rUnit repair");
+        super("§e" + CasedStringUtil.snakeToUpperSpacedCase(parentMaterial.getKey().toLowerCase()) + " §rUnit repair");
         this.parentMaterial = parentMaterial;
         this.parentGui = parentGui;
-        this.materialName = CasedStringUtil.snakeToUpperSpacedCase(parentMaterial.name().toLowerCase());
+        this.materialName = CasedStringUtil.snakeToUpperSpacedCase(parentMaterial.getKey().toLowerCase());
 
         GuiGlobalItems.addBackItem(this.backgroundPane, parentGui);
     }
@@ -54,7 +55,7 @@ public class UnitRepairElementListGui extends SettingGuiListConfigGui<String, Do
     protected Consumer<InventoryClickEvent> getCreateClickConsumer() {
         return event -> {
             event.setCancelled(true);
-            if(!this.shouldWork){
+            if (!this.shouldWork) {
                 return;
             }
             event.setCancelled(true);
@@ -66,28 +67,28 @@ public class UnitRepairElementListGui extends SettingGuiListConfigGui<String, Do
                     this,
                     (itemStack, player) -> {
                         ItemMeta meta = itemStack.getItemMeta();
-                        Material type = itemStack.getType();
+                        NamespacedKey type = MaterialUtil.INSTANCE.getCustomType(itemStack);
 
-                        if(!(meta instanceof Damageable) || (type.getMaxDurability() <= 0)) {
+                        if (!(meta instanceof Damageable)) {
                             player.sendMessage("§cThis item can't be damaged, so it can't be repaired.");
                             return;
                         }
-                        if(type == this.parentMaterial){
+                        if (type.equals(this.parentMaterial)) {
                             player.sendMessage("§cItem can't repair something of the same type.");
                             return;
                         }
 
-                        String materialName = type.name().toLowerCase();
+                        String materialName = type.toString();
 
                         // Add new material
-                        ConfigHolder.UNIT_REPAIR_HOLDER.getConfig().set(parentMaterial.name().toLowerCase() + "." + materialName,0.25);
+                        ConfigHolder.UNIT_REPAIR_HOLDER.getConfig().set(parentMaterial.toString().toLowerCase() + "." + materialName, 0.25);
 
                         if (GuiSharedConstant.TEMPORARY_DO_SAVE_TO_DISK_EVERY_CHANGE) {
                             ConfigHolder.UNIT_REPAIR_HOLDER.saveToDisk(GuiSharedConstant.TEMPORARY_DO_BACKUP_EVERY_SAVE);
                         }
 
                         // Update gui
-                        updateValueForGeneric(materialName, true);
+                        updateValueForGeneric(type, true);
                         this.parentGui.updateValueForGeneric(this.parentMaterial, true);
 
 
@@ -106,17 +107,17 @@ public class UnitRepairElementListGui extends SettingGuiListConfigGui<String, Do
     }
 
     @Override
-    protected DoubleSettingGui.DoubleSettingFactory createFactory(String materialName) {
-        String materialDisplayName = CasedStringUtil.snakeToUpperSpacedCase(materialName);
+    protected DoubleSettingGui.DoubleSettingFactory createFactory(NamespacedKey materialName) {
+        String materialDisplayName = CasedStringUtil.snakeToUpperSpacedCase(materialName.getKey());
 
         return new DoubleSettingGui.DoubleSettingFactory(
-                "§0%§8" + materialDisplayName +" Repair",
+                "§0%§8" + materialDisplayName + " Repair",
                 this,
                 ConfigHolder.UNIT_REPAIR_HOLDER,
-                this.parentMaterial.name().toLowerCase()+"."+materialName,
+                this.parentMaterial.toString().toLowerCase() + "." + materialName,
                 Arrays.asList(
                         "§7Click here to change how many §e% §7of §a" + materialDisplayName,
-                        "§7Should get repaired by §e"+this.materialName
+                        "§7Should get repaired by §e" + this.materialName
                 ),
                 2,
                 true, true,
@@ -128,29 +129,40 @@ public class UnitRepairElementListGui extends SettingGuiListConfigGui<String, Do
     }
 
     @Override
-    protected GuiItem itemFromFactory(String materialName, DoubleSettingGui.DoubleSettingFactory factory) {
+    protected GuiItem itemFromFactory(NamespacedKey materialName, DoubleSettingGui.DoubleSettingFactory factory) {
         return factory.getItem(materialFromName(materialName),
-                "§7%§a" + CasedStringUtil.snakeToUpperSpacedCase(materialName)+ " §erepaired by §a" + this.materialName);
+                "§7%§a" + CasedStringUtil.snakeToUpperSpacedCase(materialName.getKey()) + " §erepaired by §a" + this.materialName);
     }
 
     @Override
-    protected Collection<String> getEveryDisplayableInstanceOfGeneric() {
-        ArrayList<String> keys = new ArrayList<>();
-        if(!this.shouldWork){
+    protected Collection<NamespacedKey> getEveryInstanceOfGeneric() {
+        Set<NamespacedKey> keys = new HashSet<>();
+        if (!this.shouldWork) {
             return keys;
         }
 
-        ConfigurationSection materialSection = ConfigHolder.UNIT_REPAIR_HOLDER.getConfig().getConfigurationSection(parentMaterial.name().toLowerCase());
-        if(materialSection == null){
-            return keys;
-        }
-        keys.addAll(materialSection.getKeys(false));
+        ConfigurationSection legacySection = ConfigHolder.UNIT_REPAIR_HOLDER.getConfig().getConfigurationSection(parentMaterial.getKey().toLowerCase());
+        ConfigurationSection materialSection = ConfigHolder.UNIT_REPAIR_HOLDER.getConfig().getConfigurationSection(parentMaterial.toString().toLowerCase());
+
+        addAllKeys(legacySection, keys);
+        addAllKeys(materialSection, keys);
+
         return keys;
     }
 
-    private Material materialFromName(String materialName){
-        Material mat = Material.getMaterial(materialName.toUpperCase());
-        if(mat == null || mat.isAir()) return Material.BARRIER;
+    private void addAllKeys(@Nullable ConfigurationSection section, @NotNull Set<NamespacedKey> keys) {
+        if (section == null) return;
+        for (var key : section.getKeys(false)) {
+            var material = NamespacedKey.fromString(key);
+            if (material == null) continue;
+
+            keys.add(material);
+        }
+    }
+
+    private Material materialFromName(NamespacedKey material) {
+        Material mat = MaterialUtil.INSTANCE.getMatFromKey(material);
+        if (mat == null || mat.isAir()) return Material.BARRIER;
         return mat;
     }
 
@@ -163,7 +175,8 @@ public class UnitRepairElementListGui extends SettingGuiListConfigGui<String, Do
     // ElementMappedToListGui methods
 
     @Override // Not used in this implementation
-    public void updateLocal() {}
+    public void updateLocal() {
+    }
 
     @Override
     public void cleanAndBeUnusable() {
@@ -185,7 +198,7 @@ public class UnitRepairElementListGui extends SettingGuiListConfigGui<String, Do
 
     @Override
     public void show(@NotNull HumanEntity humanEntity) {
-        if(!this.shouldWork){
+        if (!this.shouldWork) {
             humanEntity.closeInventory();
             return;
         }

src/main/java/xyz/alexcrea/cuanvil/gui/config/settings/EnchantCostSettingsGui.java

@@ -183,7 +183,7 @@ public class EnchantCostSettingsGui extends IntSettingsGui {
         assert nowMeta != null;
 
         nowMeta.setDisplayName("§fValue: §e" + nowBook);
-        if(!holder.displayLore.isEmpty()){
+        if (!holder.displayLore.isEmpty()) {
             nowMeta.setLore(holder.displayLore);
         }
 
@@ -202,7 +202,6 @@ public class EnchantCostSettingsGui extends IntSettingsGui {
         }
         pane.bindItem('D', returnToDefault);
 
-
     }
 
     /**
@@ -285,14 +284,14 @@ public class EnchantCostSettingsGui extends IntSettingsGui {
          */
         @Override
         public int getConfiguredValue() {
-            return ConfigOptions.INSTANCE.enchantmentValue(enchantment, false);
+            return ConfigOptions.INSTANCE.enchantmentValue(enchantment, false, false);
         }
 
         /**
          * @return The configured value for the enchant setting book value.
          */
         public int getConfiguredBookValue() {
-            return ConfigOptions.INSTANCE.enchantmentValue(enchantment, true);
+            return ConfigOptions.INSTANCE.enchantmentValue(enchantment, false, true);
         }
 
         @Override

src/main/java/xyz/alexcrea/cuanvil/gui/config/settings/EnchantSelectSettingGui.java

@@ -63,7 +63,7 @@ public class EnchantSelectSettingGui extends SettingGuiListConfigGui<CAEnchantme
     }
 
     @Override
-    protected Collection<CAEnchantment> getEveryDisplayableInstanceOfGeneric() {
+    protected Collection<CAEnchantment> getEveryInstanceOfGeneric() {
         Stream<CAEnchantment> toDisplayStream;
         if(this.displayUnselected){
             toDisplayStream = CAEnchantmentRegistry.getInstance().getNameSortedEnchantments().stream();

src/main/java/xyz/alexcrea/cuanvil/gui/config/settings/IntSettingsGui.java

@@ -318,9 +318,9 @@ public class IntSettingsGui extends AbstractSettingGui {
             this.defaultVal = defaultVal;
             this.steps = steps;
 
-            if(displayLore == null){
+            if (displayLore == null) {
                 this.displayLore = Collections.emptyList();
-            }else {
+            } else {
                 this.displayLore = displayLore;
             }
         }
@@ -392,7 +392,7 @@ public class IntSettingsGui extends AbstractSettingGui {
 
         protected String deltaDisplay(ValueDisplayType type, int now, int planned) {
             var delta = planned - now;
-            if(delta < 0) return "§c" + delta;
+            if (delta < 0) return "§c" + delta;
             else return "§a+" + delta;
         }
 

src/main/java/xyz/alexcrea/cuanvil/gui/config/settings/MaterialSelectSettingGui.java

@@ -217,7 +217,7 @@ public class MaterialSelectSettingGui extends MappedElementListConfigGui<Namespa
     }
 
     @Override
-    protected Collection<NamespacedKey> getEveryDisplayableInstanceOfGeneric() {
+    protected Collection<NamespacedKey> getEveryInstanceOfGeneric() {
         return this.defaultMaterials;
     }
 

src/main/java/xyz/alexcrea/cuanvil/update/UpdateHandler.java

@@ -2,10 +2,7 @@ package xyz.alexcrea.cuanvil.update;
 
 import io.delilaheve.CustomAnvil;
 import xyz.alexcrea.cuanvil.config.ConfigHolder;
-import xyz.alexcrea.cuanvil.update.minecraft.MCUpdate;
-import xyz.alexcrea.cuanvil.update.minecraft.Update_1_21;
-import xyz.alexcrea.cuanvil.update.minecraft.Update_1_21_11;
-import xyz.alexcrea.cuanvil.update.minecraft.Update_1_21_9;
+import xyz.alexcrea.cuanvil.update.minecraft.*;
 import xyz.alexcrea.cuanvil.update.plugin.*;
 
 import javax.annotation.Nonnull;
@@ -32,10 +29,13 @@ public class UpdateHandler {
             new Version(1, 8, 0), PUpdate_1_8_0::handleUpdate,
             new Version(1, 11, 0), PUpdate_1_11_0::handleUpdate,
             new Version(1, 15, 5), PUpdate_1_15_5::handleUpdate,
-            new Version(1, 15, 6), PUpdate_1_15_6::handleUpdate
+            new Version(1, 15, 6), PUpdate_1_15_6::handleUpdate,
+            new Version(1, 18, 0), PUpdate_1_18::handleUpdate
     );
 
     private static final List<MCUpdate> mcUpdateMap = List.of(
+            new Update_1_19(),
+            new Update_1_20_5(),
             new Update_1_21(),
             new Update_1_21_9(),
             new Update_1_21_11()

src/main/java/xyz/alexcrea/cuanvil/update/UpdateUtils.java

@@ -1,6 +1,7 @@
 package xyz.alexcrea.cuanvil.update;
 
 import org.bukkit.Bukkit;
+import org.bukkit.configuration.ConfigurationSection;
 import org.bukkit.configuration.file.FileConfiguration;
 
 import java.util.ArrayList;
@@ -33,4 +34,20 @@ public class UpdateUtils {
 
     }
 
+    public static boolean removeFromList(FileConfiguration config, String path, String toRemove) {
+        List<String> groups = new ArrayList<>(config.getStringList(path));
+        if (!groups.remove(toRemove)) return false;
+
+        config.set(path, groups);
+        return true;
+    }
+
+    public static void mergeSections(ConfigurationSection source, ConfigurationSection target) {
+        for (String key : source.getKeys(false)) {
+            if(target.contains(key)) continue;
+            target.set(key, source.get(key));
+        }
+    }
+
+
 }

src/main/java/xyz/alexcrea/cuanvil/update/minecraft/Update_1_19.java

@@ -0,0 +1,40 @@
+package xyz.alexcrea.cuanvil.update.minecraft;
+
+import org.jetbrains.annotations.NotNull;
+import xyz.alexcrea.cuanvil.config.ConfigHolder;
+import xyz.alexcrea.cuanvil.update.Version;
+
+import java.util.HashSet;
+import java.util.Set;
+
+import static xyz.alexcrea.cuanvil.update.UpdateUtils.addAbsentToList;
+
+public class Update_1_19 extends MCUpdate {
+
+    public Update_1_19() {
+        super(new Version(1, 19));
+    }
+
+    @Override
+    protected void doUpdate() {
+        var tosave = new HashSet<ConfigHolder>();
+        updateName(tosave);
+
+        for (ConfigHolder holder : tosave) {
+            holder.saveToDisk(true);
+        }
+    }
+
+    public static void updateName(@NotNull Set<ConfigHolder> tosave) {
+        var conflict = ConfigHolder.CONFLICT_HOLDER.getConfig();
+
+        addAbsentToList(conflict, "restriction_swift_sneak.enchantments", "minecraft:swift_sneak");
+        addAbsentToList(conflict, "restriction_swift_sneak.notAffectedGroups", "leggings", "enchanted_book");
+
+        ConfigHolder.ITEM_GROUP_HOLDER.reload();
+
+        tosave.add(ConfigHolder.DEFAULT_CONFIG);
+        tosave.add(ConfigHolder.CONFLICT_HOLDER);
+    }
+
+}

src/main/java/xyz/alexcrea/cuanvil/update/minecraft/Update_1_20_5.java

@@ -0,0 +1,98 @@
+package xyz.alexcrea.cuanvil.update.minecraft;
+
+import org.bukkit.configuration.file.FileConfiguration;
+import org.jetbrains.annotations.NotNull;
+import xyz.alexcrea.cuanvil.config.ConfigHolder;
+import xyz.alexcrea.cuanvil.update.Version;
+
+import java.util.HashSet;
+import java.util.Set;
+
+import static xyz.alexcrea.cuanvil.update.UpdateUtils.*;
+
+public class Update_1_20_5 extends MCUpdate {
+
+    public Update_1_20_5() {
+        super(new Version(1, 20, 5));
+    }
+
+    @Override
+    protected void doUpdate() {
+        var tosave = new HashSet<ConfigHolder>();
+        updateName(tosave);
+
+        for (ConfigHolder holder : tosave) {
+            holder.saveToDisk(true);
+        }
+    }
+
+    private static String SWEEPING_ENCHANTS = "restriction_sweeping_edge.enchantments";
+
+    public static void updateName(@NotNull Set<ConfigHolder> tosave) {
+        var config = ConfigHolder.DEFAULT_CONFIG.getConfig();
+        var unitConfig = ConfigHolder.UNIT_REPAIR_HOLDER.getConfig();
+        var conflict = ConfigHolder.CONFLICT_HOLDER.getConfig();
+
+        // Rename sweeping to sweeping_edge
+        migrateEnchantLimit(config, "minecraft:sweeping");
+        migrateEnchantLimit(config, "sweeping");
+
+        migrateEnchantValues(config, "minecraft:sweeping");
+        migrateEnchantValues(config, "sweeping");
+
+        if (removeFromList(conflict, SWEEPING_ENCHANTS, "minecraft:sweeping"))
+            addAbsentToList(conflict, SWEEPING_ENCHANTS, "minecraft:sweeping_edge");
+        if (removeFromList(conflict, SWEEPING_ENCHANTS, "sweeping"))
+            addAbsentToList(conflict, SWEEPING_ENCHANTS, "minecraft:sweeping_edge");
+
+        // Rename scute to turtle_scute
+        migrateUnitRepair(unitConfig, "minecraft:scute");
+        migrateUnitRepair(unitConfig, "scute");
+
+        ConfigHolder.ITEM_GROUP_HOLDER.reload();
+
+        tosave.add(ConfigHolder.DEFAULT_CONFIG);
+        tosave.add(ConfigHolder.UNIT_REPAIR_HOLDER);
+        tosave.add(ConfigHolder.CONFLICT_HOLDER);
+    }
+
+    private static void migrateEnchantLimit(FileConfiguration config, String path) {
+        var finalPath = "enchant_limits." + path;
+        if (!config.isInt(finalPath)) return;
+        var value = config.getInt(finalPath);
+
+        config.set(finalPath, null);
+        if (!config.contains("enchant_limits.minecraft:sweeping_edge")) return;
+        if (!config.contains("enchant_limits.sweeping_edge")) return;
+
+        config.set("enchant_limits.minecraft:sweeping_edge", value);
+    }
+
+    private static void migrateEnchantValues(FileConfiguration config, String path) {
+        migrateEnchantValues(config, path, "item");
+        migrateEnchantValues(config, path, "book");
+    }
+
+    private static void migrateEnchantValues(FileConfiguration config, String path, String child) {
+        var finalPath = "enchant_values." + path + "." + child;
+        if (config.isInt(finalPath)) return;
+        var value = config.getInt(finalPath);
+
+        config.set(finalPath, null);
+        if (!config.contains("enchant_values.minecraft:sweeping_edge." + child)) return;
+        if (!config.contains("enchant_values.sweeping_edge." + child)) return;
+
+        config.set("enchant_values.minecraft:sweeping_edge." + child, value);
+    }
+
+    private static void migrateUnitRepair(FileConfiguration config, String path) {
+        var section = config.getConfigurationSection(path);
+        if (section == null) return;
+
+        config.set(path, null);
+        var turtle_scute = config.getConfigurationSection("minecraft:turtle_scute");
+        if (turtle_scute == null) config.set("minecraft:turtle_scute", section);
+        else mergeSections(section, turtle_scute);
+    }
+
+}

src/main/java/xyz/alexcrea/cuanvil/update/minecraft/Update_1_21.java

@@ -1,6 +1,5 @@
 package xyz.alexcrea.cuanvil.update.minecraft;
 
-import io.delilaheve.CustomAnvil;
 import xyz.alexcrea.cuanvil.config.ConfigHolder;
 import xyz.alexcrea.cuanvil.update.UpdateUtils;
 import xyz.alexcrea.cuanvil.update.Version;

src/main/java/xyz/alexcrea/cuanvil/update/minecraft/Update_1_21_11.java

@@ -38,26 +38,26 @@ public class Update_1_21_11 extends MCUpdate{
         addAbsentToList(conflictConfig, "restriction_fire_aspect.notAffectedGroups", "spears");
 
         // Unit repair for spears
-        unitConfig.set("gold_ingot.golden_spear", 0.25);
-        unitConfig.set("copper_ingot.copper_spear", 0.25);
-        unitConfig.set("iron_ingot.iron_spear", 0.25);
-        unitConfig.set("diamond.diamond_spear", 0.25);
-        unitConfig.set("netherite_ingot.netherite_spear", 0.25);
+        unitConfig.set("minecraft:gold_ingot.minecraft:golden_spear", 0.25);
+        unitConfig.set("minecraft:copper_ingot.minecraft:copper_spear", 0.25);
+        unitConfig.set("minecraft:iron_ingot.minecraft:iron_spear", 0.25);
+        unitConfig.set("minecraft:diamond.minecraft:diamond_spear", 0.25);
+        unitConfig.set("minecraft:netherite_ingot.minecraft:netherite_spear", 0.25);
 
-        unitConfig.set("cobblestone.stone_spear", 0.25);
-        unitConfig.set("cobbled_deepslate.stone_spear", 0.25);
+        unitConfig.set("minecraft:cobblestone.stone_spear", 0.25);
+        unitConfig.set("minecraft:cobbled_deepslate.stone_spear", 0.25);
 
-        unitConfig.set("oak_planks.wooden_spear", 0.25);
-        unitConfig.set("spruce_planks.wooden_spear", 0.25);
-        unitConfig.set("birch_planks.wooden_spear", 0.25);
-        unitConfig.set("jungle_planks.wooden_spear", 0.25);
-        unitConfig.set("acacia_planks.wooden_spear", 0.25);
-        unitConfig.set("dark_oak_planks.wooden_spear", 0.25);
-        unitConfig.set("mangrove_planks.wooden_spear", 0.25);
-        unitConfig.set("cherry_planks.wooden_spear", 0.25);
-        unitConfig.set("bamboo_planks.wooden_spear", 0.25);
-        unitConfig.set("crimson_planks.wooden_spear", 0.25);
-        unitConfig.set("warped_planks.wooden_spear", 0.25);
+        unitConfig.set("minecraft:oak_planks.minecraft:wooden_spear", 0.25);
+        unitConfig.set("minecraft:spruce_planks.minecraft:wooden_spear", 0.25);
+        unitConfig.set("minecraft:birch_planks.minecraft:wooden_spear", 0.25);
+        unitConfig.set("minecraft:jungle_planks.minecraft:wooden_spear", 0.25);
+        unitConfig.set("minecraft:acacia_planks.minecraft:wooden_spear", 0.25);
+        unitConfig.set("minecraft:dark_oak_planks.minecraft:wooden_spear", 0.25);
+        unitConfig.set("minecraft:mangrove_planks.minecraft:wooden_spear", 0.25);
+        unitConfig.set("minecraft:cherry_planks.minecraft:wooden_spear", 0.25);
+        unitConfig.set("minecraft:bamboo_planks.minecraft:wooden_spear", 0.25);
+        unitConfig.set("minecraft:crimson_planks.minecraft:wooden_spear", 0.25);
+        unitConfig.set("minecraft:warped_planks.minecraft:wooden_spear", 0.25);
 
         // Create lunge enchant value and group
         baseConfig.set("enchant_limits.minecraft:lunge", 3);

src/main/java/xyz/alexcrea/cuanvil/update/minecraft/Update_1_21_9.java

@@ -49,16 +49,16 @@ public class Update_1_21_9 extends MCUpdate{
 
     public static void addCopperUnitRepair(FileConfiguration unitConfig) {
         // Add unit repair
-        unitConfig.set("copper_ingot.copper_helmet", 0.25);
-        unitConfig.set("copper_ingot.copper_chestplate", 0.25);
-        unitConfig.set("copper_ingot.copper_leggings", 0.25);
-        unitConfig.set("copper_ingot.copper_boots", 0.25);
+        unitConfig.set("minecraft:copper_ingot.minecraft:copper_helmet", 0.25);
+        unitConfig.set("minecraft:copper_ingot.minecraft:copper_chestplate", 0.25);
+        unitConfig.set("minecraft:copper_ingot.minecraft:copper_leggings", 0.25);
+        unitConfig.set("minecraft:copper_ingot.minecraft:copper_boots", 0.25);
 
-        unitConfig.set("copper_ingot.copper_pickaxe", 0.25);
-        unitConfig.set("copper_ingot.copper_shovel", 0.25);
-        unitConfig.set("copper_ingot.copper_hoe", 0.25);
-        unitConfig.set("copper_ingot.copper_axe", 0.25);
-        unitConfig.set("copper_ingot.copper_sword", 0.25);
+        unitConfig.set("minecraft:copper_ingot.minecraft:copper_pickaxe", 0.25);
+        unitConfig.set("minecraft:copper_ingot.minecraft:copper_shovel", 0.25);
+        unitConfig.set("minecraft:copper_ingot.minecraft:copper_hoe", 0.25);
+        unitConfig.set("minecraft:copper_ingot.minecraft:copper_axe", 0.25);
+        unitConfig.set("minecraft:copper_ingot.minecraft:copper_sword", 0.25);
     }
 
 }

src/main/java/xyz/alexcrea/cuanvil/update/plugin/PUpdate_1_18.java

@@ -0,0 +1,22 @@
+package xyz.alexcrea.cuanvil.update.plugin;
+
+import xyz.alexcrea.cuanvil.config.ConfigHolder;
+import xyz.alexcrea.cuanvil.update.UpdateUtils;
+import xyz.alexcrea.cuanvil.update.Version;
+import xyz.alexcrea.cuanvil.update.minecraft.Update_1_19;
+import xyz.alexcrea.cuanvil.update.minecraft.Update_1_20_5;
+
+import javax.annotation.Nonnull;
+import java.util.Set;
+
+public class PUpdate_1_18 {
+
+    public static void handleUpdate(@Nonnull Set<ConfigHolder> toSave) {
+        Version current = UpdateUtils.currentMinecraftVersion();
+        if (new Version(1, 19, 0).greaterThan(current)) return;
+        Update_1_19.updateName(toSave);
+
+        if (new Version(1, 20, 5).greaterThan(current)) return;
+        Update_1_20_5.updateName(toSave);
+    }
+}

src/main/kotlin/io/delilaheve/CustomAnvil.kt

@@ -11,7 +11,6 @@ import xyz.alexcrea.cuanvil.command.EditConfigExecutor
 import xyz.alexcrea.cuanvil.command.ReloadExecutor
 import xyz.alexcrea.cuanvil.config.ConfigHolder
 import xyz.alexcrea.cuanvil.dependency.DependencyManager
-import xyz.alexcrea.cuanvil.dependency.MinecraftVersionUtil
 import xyz.alexcrea.cuanvil.dependency.economy.EconomyManager
 import xyz.alexcrea.cuanvil.dependency.util.PlatformUtil
 import xyz.alexcrea.cuanvil.enchant.CAEnchantmentRegistry
@@ -24,6 +23,8 @@ import xyz.alexcrea.cuanvil.listener.PrepareAnvilListener
 import xyz.alexcrea.cuanvil.update.ModrinthUpdateChecker
 import xyz.alexcrea.cuanvil.update.PluginSetDefault
 import xyz.alexcrea.cuanvil.update.UpdateHandler
+import xyz.alexcrea.cuanvil.update.UpdateUtils
+import xyz.alexcrea.cuanvil.update.Version
 import xyz.alexcrea.cuanvil.util.MetricsUtil
 import java.io.File
 import java.io.FileReader
@@ -56,6 +57,8 @@ open class CustomAnvil : JavaPlugin() {
         // Permission string required to edit the plugin's config
         const val editConfigPermission = "ca.config.edit"
 
+        // Permission string required to edit the plugin's config
+        const val giveEnchantmentPermission = "ca.command.enchantment"
 
         // Command Name to reload the config
         const val commandReloadName = "anvilconfigreload"
@@ -133,7 +136,7 @@ open class CustomAnvil : JavaPlugin() {
     override fun onEnable() {
         instance = this
         try {
-            legacyCheck()
+            if(legacyCheck()) return
         } catch (e: Exception) {
             logger.log(Level.SEVERE, "error trying to check for legacy system", e)
             MetricsUtil.trackError(e)
@@ -199,7 +202,16 @@ open class CustomAnvil : JavaPlugin() {
         }
     }
 
-    private fun legacyCheck() {
+    private fun legacyCheck(): Boolean {
+        val currentVersion = UpdateUtils.currentMinecraftVersion()
+        if (currentVersion.greaterEqual(Version(1, 21, 0))
+            && !DependencyManager.inTesting
+            && !"true".equals(System.getenv("CUSTOM_ANVIL_BYPASS_LEGACY_CHECK"), true)) {
+            logger.warning("You are running a Minecraft version above or equal to 1.21.0")
+            logger.warning("Please use CustomAnvil v2 instead if you wish to use the plugin with this version.")
+            Bukkit.getPluginManager().disablePlugin(this)
+            return true
+        }
         // Disable old plugin name if exist
         val potentialPlugin = Bukkit.getPluginManager().getPlugin("UnsafeEnchantsPlus")
         if (potentialPlugin != null) {
@@ -212,10 +224,6 @@ open class CustomAnvil : JavaPlugin() {
         if(!isPaper) {
             logger.warning("It seems you are using spigot")
             logger.warning("Please take notice that spigot is less supported than paper and derivatives")
-            if(MinecraftVersionUtil.isTooNewForSpigot) {
-                logger.warning("If replace too expensive is not working this is likely because of spigot")
-                logger.warning("As native nms is not supported for spigot starting 26.1")
-            }
         }
 
         val loader = if(isPaper) "paper" else "spigot"
@@ -223,7 +231,8 @@ open class CustomAnvil : JavaPlugin() {
         val version = description.version
         val featured = if(version.contains("dev")) null else true
 
-        ModrinthUpdateChecker(modrinthPluginID, loader, null)
+        ModrinthUpdateChecker(modrinthPluginID, loader,
+            UpdateUtils.currentMinecraftVersion().toString())
             .setFeatured(featured)
             .setOnError {
                 logger.log(Level.WARNING, "error trying to fetch latest update", it)
@@ -234,6 +243,7 @@ open class CustomAnvil : JavaPlugin() {
 
                 logger.warning("An update may be available: $latestVer")
             }
+        return false
     }
 
     private fun registerListeners() {

src/main/kotlin/io/delilaheve/util/ConfigOptions.kt

@@ -86,6 +86,7 @@ object ConfigOptions {
 
     // Keys for specific enchantment values
     private const val KEY_BOOK = "book"
+    private const val KEY_BOOK_ON_BOOK = "book_on_book"
     private const val KEY_ITEM = "item"
 
     // Debug flag
@@ -578,14 +579,15 @@ object ConfigOptions {
      */
     fun enchantmentValue(
         enchantment: CAEnchantment,
-        isFromBook: Boolean
+        isToBook: Boolean,
+        isFromBook: Boolean,
     ): Int {
         // Test namespace
-        var limit = enchantmentValue(enchantment.key.toString(), isFromBook)
+        var limit = enchantmentValue(enchantment.key.toString(), isToBook, isFromBook)
         if (limit != null) return limit
 
         // Test legacy (name only)
-        limit = enchantmentValue(enchantment.enchantmentName, isFromBook)
+        limit = enchantmentValue(enchantment.enchantmentName, isToBook, isFromBook)
         if (limit != null) return limit
 
         // get default (and test old legacy if present)
@@ -599,13 +601,22 @@ object ConfigOptions {
      */
     private fun enchantmentValue(
         enchantmentName: String,
-        isFromBook: Boolean
+        isToBook: Boolean,
+        isFromBook: Boolean,
     ): Int? {
         val typeKey = if (isFromBook) KEY_BOOK else KEY_ITEM
         val path = "${ENCHANT_VALUES_ROOT}.${enchantmentName}.$typeKey"
-        return CustomAnvil.instance
-            .config
-            .getInt(path, DEFAULT_ENCHANT_VALUE - 1)
+
+        val config = ConfigHolder.DEFAULT_CONFIG.config
+        if(isFromBook && isToBook) {
+            val specialPath = "${ENCHANT_VALUES_ROOT}.${enchantmentName}.$KEY_BOOK_ON_BOOK"
+
+            if(config.isInt(specialPath))
+                return config.getInt(specialPath)
+                    .takeIf { it >= DEFAULT_ENCHANT_VALUE }
+        }
+
+        return config.getInt(path, DEFAULT_ENCHANT_VALUE - 1)
             .takeIf { it >= DEFAULT_ENCHANT_VALUE }
     }
 
@@ -613,20 +624,9 @@ object ConfigOptions {
      * Get default value if enchantment do not exist on config
      */
     private fun getDefaultValue(
-        enchantment: CAEnchantment, // compatibility with 1.20.5. TODO better update system
+        enchantment: CAEnchantment,
         isFromBook: Boolean
     ): Int {
-
-        val enchantmentName = enchantment.key.toString()
-        if (enchantmentName == "minecraft:sweeping_edge") {
-            var limit = enchantmentValue("minecraft:sweeping", isFromBook)
-            if (limit != null) return limit
-
-            // legacy name
-            limit = enchantmentValue("sweeping", isFromBook)
-            if (limit != null) return limit
-        }
-
         val rarity = enchantment.defaultRarity()
         return if (isFromBook)
             rarity.bookValue
@@ -648,15 +648,6 @@ object ConfigOptions {
         value = maxBeforeMergeDisabled(legacy)
         if (value >= 0) return value
 
-        if (key == "minecraft:sweeping_edge") {
-            value = maxBeforeMergeDisabled("minecraft:sweeping")
-            if (value >= 0) return value
-
-            // legacy name of legacy enchantment name
-            value = maxBeforeMergeDisabled("sweeping")
-            if (value >= 0) return value
-        }
-
         return DEFAULT_MAX_BEFORE_MERGE_DISABLED
     }