From 4bc959d76f37b8abec60c6f05d838d351ec731e8 Mon Sep 17 00:00:00 2001
From: alexcrea <42614139+alexcrea@users.noreply.github.com>
Date: Sun, 29 Sep 2024 19:42:29 +0200
Subject: [PATCH] Use namespace for disable merge over

---
 .../global/EnchantMergeLimitConfigGui.java    | 13 ++++--
 .../io/delilaheve/util/ConfigOptions.kt       | 43 +++++++++++++------
 src/main/resources/config.yml                 |  4 +-
 3 files changed, 41 insertions(+), 19 deletions(-)

diff --git a/src/main/java/xyz/alexcrea/cuanvil/gui/config/global/EnchantMergeLimitConfigGui.java b/src/main/java/xyz/alexcrea/cuanvil/gui/config/global/EnchantMergeLimitConfigGui.java
index a657cf6..0d391e7 100644
--- a/src/main/java/xyz/alexcrea/cuanvil/gui/config/global/EnchantMergeLimitConfigGui.java
+++ b/src/main/java/xyz/alexcrea/cuanvil/gui/config/global/EnchantMergeLimitConfigGui.java
@@ -1,6 +1,7 @@
 package xyz.alexcrea.cuanvil.gui.config.global;
 
 import com.github.stefvanschie.inventoryframework.gui.GuiItem;
+import io.delilaheve.util.ConfigOptions;
 import org.bukkit.Material;
 import org.jetbrains.annotations.Nullable;
 import xyz.alexcrea.cuanvil.config.ConfigHolder;
@@ -34,8 +35,8 @@ public class EnchantMergeLimitConfigGui extends AbstractEnchantConfigGui<IntSett
 
     @Override
     public IntSettingsGui.IntSettingFactory createFactory(CAEnchantment enchant) {
-        String key = enchant.getKey().getKey().toLowerCase(Locale.ROOT);
-        String prettyKey = CasedStringUtil.snakeToUpperSpacedCase(key);
+        String key = enchant.getKey().toString().toLowerCase(Locale.ROOT);
+        String prettyKey = CasedStringUtil.snakeToUpperSpacedCase(key.replace(":", "_"));
 
         return new IntSettingsGui.IntSettingFactory(prettyKey + " Merge Limit", this,
                 SECTION_NAME + '.' + key, ConfigHolder.DEFAULT_CONFIG,
@@ -48,7 +49,13 @@ public class EnchantMergeLimitConfigGui extends AbstractEnchantConfigGui<IntSett
                         "§e-1 §7(default) will set the merge limit to enchantment's maximum level"
                 ),
                 -1, 255, -1,
-                1, 5, 10, 50, 100);
+                1, 5, 10, 50, 100){
+
+            @Override
+            public int getConfiguredValue() {
+                return ConfigOptions.INSTANCE.maxBeforeMergeDisabled(enchant);
+            }
+        };
     }
 
     @Override
diff --git a/src/main/kotlin/io/delilaheve/util/ConfigOptions.kt b/src/main/kotlin/io/delilaheve/util/ConfigOptions.kt
index 64602c2..f192ff9 100644
--- a/src/main/kotlin/io/delilaheve/util/ConfigOptions.kt
+++ b/src/main/kotlin/io/delilaheve/util/ConfigOptions.kt
@@ -381,9 +381,13 @@ object ConfigOptions {
     private fun getDefaultValue(enchantment: CAEnchantment, // compatibility with 1.20.5. TODO better update system
                                 isFromBook: Boolean) : Int {
 
-        val enchantmentName = enchantment.enchantmentName
-        if(enchantmentName == "sweeping_edge"){
-            val limit = enchantmentValue("sweeping", isFromBook)
+        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
         }
 
@@ -399,28 +403,39 @@ object ConfigOptions {
      * a negative value would mean never disabled
      */
     fun maxBeforeMergeDisabled(enchantment: CAEnchantment): Int {
-        return maxBeforeMergeDisabled(enchantment.enchantmentName)
+        val key = enchantment.key.toString()
+        var value = maxBeforeMergeDisabled(key)
+        if(value != null) return value
+
+        // Legacy name
+        val legacy = enchantment.enchantmentName
+        value = maxBeforeMergeDisabled(legacy)
+        if(value != null) return value
+
+        if(key == "minecraft:sweeping_edge"){
+            value = maxBeforeMergeDisabled("minecraft:sweeping")
+            if(value != null) return value
+
+            // legacy name of legacy enchantment name
+            value = maxBeforeMergeDisabled("sweeping")
+            if(value != null) return value
+        }
+
+        return DEFAULT_MAX_BEFORE_MERGE_DISABLED
     }
 
     /**
      * Get the given [enchantmentName]'s level before merge is disabled
      * a negative value would mean never disabled
      */
-    private fun maxBeforeMergeDisabled(enchantmentName: String) : Int {
+    private fun maxBeforeMergeDisabled(enchantmentName: String) : Int? {
         // find if set
         val path = "${DISABLE_MERGE_OVER_ROOT}.$enchantmentName"
 
-        val value = CustomAnvil.instance
+        return CustomAnvil.instance
             .config
-            .getInt(path, DEFAULT_MAX_BEFORE_MERGE_DISABLED)
+            .getInt(path, ENCHANT_LIMIT_RANGE.min() - 1)
             .takeIf { it in ENCHANT_LIMIT_RANGE }
-            ?: DEFAULT_MAX_BEFORE_MERGE_DISABLED;
-
-        if((value == DEFAULT_MAX_BEFORE_MERGE_DISABLED) && (enchantmentName == "sweeping_edge")){
-            return maxBeforeMergeDisabled("sweeping")
-        }
-
-        return value
     }
 
 }
diff --git a/src/main/resources/config.yml b/src/main/resources/config.yml
index 2730f2b..dd24558 100644
--- a/src/main/resources/config.yml
+++ b/src/main/resources/config.yml
@@ -278,9 +278,9 @@ enchant_values:
 # -1 mean enchantment merge for this enchantment is not disabled. default to -1 if absent.
 disable-merge-over:
   # Sharpness is set to -1. it equivalent to it not being set to anything (and work as vanilla)
-  sharpness: -1
+  minecraft:sharpness: -1
   # If uncommented. 2 unbreaking II book would not give an unbreaking III book. but unbreaking III book can still be applied
-  #unbreaking: 2
+  #minecraft:unbreaking: 2
 
 # Whether to show debug logging
 debug_log: false