From d67d998dc17be7fd767269f07f3f681d1b85da5f Mon Sep 17 00:00:00 2001
From: alexcrea <contact@alexcrea.xyz>
Date: Wed, 1 Jul 2026 12:16:04 +0200
Subject: [PATCH] remove legacy compatibility code

---
 .../io/delilaheve/util/ConfigOptions.kt       | 22 +------------------
 .../cuanvil/group/EnchantConflictManager.kt   | 15 -------------
 2 files changed, 1 insertion(+), 36 deletions(-)

diff --git a/src/main/kotlin/io/delilaheve/util/ConfigOptions.kt b/src/main/kotlin/io/delilaheve/util/ConfigOptions.kt
index fc8a53a9..dddb64d7 100644
--- a/src/main/kotlin/io/delilaheve/util/ConfigOptions.kt
+++ b/src/main/kotlin/io/delilaheve/util/ConfigOptions.kt
@@ -613,20 +613,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 +637,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
     }
 
diff --git a/src/main/kotlin/xyz/alexcrea/cuanvil/group/EnchantConflictManager.kt b/src/main/kotlin/xyz/alexcrea/cuanvil/group/EnchantConflictManager.kt
index 5b256dd8..39def31f 100644
--- a/src/main/kotlin/xyz/alexcrea/cuanvil/group/EnchantConflictManager.kt
+++ b/src/main/kotlin/xyz/alexcrea/cuanvil/group/EnchantConflictManager.kt
@@ -39,13 +39,6 @@ class EnchantConflictManager {
 
         // Default name for a joining group
         const val DEFAULT_GROUP_NAME = "joinedGroup"
-
-        // 1.20.5 compatibility TODO better update system
-        private val SWEEPING_EDGE_ENCHANT = Collections.singletonList<CAEnchantment>(
-            CAEnchantment.getByKey(NamespacedKey.minecraft("sweeping_edge"))
-                ?: CAEnchantment.getByKey(Enchantment.SWEEPING_EDGE.key)
-        )
-
     }
 
     lateinit var conflictList: ArrayList<EnchantConflictGroup>
@@ -172,14 +165,6 @@ class EnchantConflictManager {
 
         }
 
-        // Temporary solution for 1.20.5
-        when (enchantName) {
-            "minecraft:sweeping", "sweeping",
-            "minecraft:sweeping_edge", "sweeping_edge" -> {
-                return SWEEPING_EDGE_ENCHANT
-            }
-        }
-
         return CAEnchantment.getListByName(enchantName)
     }