From 5c422ac240e67feec3f202471bfbb5933a9b40e4 Mon Sep 17 00:00:00 2001 From: Will FP Date: Wed, 27 Dec 2023 15:32:16 +0100 Subject: [PATCH] Removed FoundEcoEnchantLevel --- .../kotlin/com/willfp/ecoenchants/EcoEnchantsPlugin.kt | 8 -------- .../com/willfp/ecoenchants/enchant/EcoEnchantLevel.kt | 9 --------- eco-core/core-plugin/src/main/resources/config.yml | 6 ------ 3 files changed, 23 deletions(-) diff --git a/eco-core/core-plugin/src/main/kotlin/com/willfp/ecoenchants/EcoEnchantsPlugin.kt b/eco-core/core-plugin/src/main/kotlin/com/willfp/ecoenchants/EcoEnchantsPlugin.kt index e4e9d622..eb5492b0 100644 --- a/eco-core/core-plugin/src/main/kotlin/com/willfp/ecoenchants/EcoEnchantsPlugin.kt +++ b/eco-core/core-plugin/src/main/kotlin/com/willfp/ecoenchants/EcoEnchantsPlugin.kt @@ -17,7 +17,6 @@ import com.willfp.ecoenchants.display.EnchantSorter import com.willfp.ecoenchants.enchant.EcoEnchantLevel import com.willfp.ecoenchants.enchant.EcoEnchants import com.willfp.ecoenchants.enchant.EnchantGUI -import com.willfp.ecoenchants.enchant.FoundEcoEnchantLevel import com.willfp.ecoenchants.enchant.LoreConversion import com.willfp.ecoenchants.enchant.legacyRegisterVanillaEnchantmentData import com.willfp.ecoenchants.enchant.registration.EnchantmentRegisterer @@ -81,13 +80,6 @@ class EcoEnchantsPlugin : LibreforgePlugin() { it.clearEnchantmentCache() } - registerHolderPlaceholderProvider { it, _ -> - listOf( - NamedValue("level", it.level.level), - NamedValue("active_level", it.activeLevel) - ) - } - registerHolderPlaceholderProvider { it, _ -> listOf( NamedValue("level", it.level), diff --git a/eco-core/core-plugin/src/main/kotlin/com/willfp/ecoenchants/enchant/EcoEnchantLevel.kt b/eco-core/core-plugin/src/main/kotlin/com/willfp/ecoenchants/enchant/EcoEnchantLevel.kt index 55eda49b..5b6051a1 100644 --- a/eco-core/core-plugin/src/main/kotlin/com/willfp/ecoenchants/enchant/EcoEnchantLevel.kt +++ b/eco-core/core-plugin/src/main/kotlin/com/willfp/ecoenchants/enchant/EcoEnchantLevel.kt @@ -31,12 +31,3 @@ class EcoEnchantLevel( return Objects.hash(this.id) } } - -data class FoundEcoEnchantLevel( - val level: EcoEnchantLevel, - val activeLevel: Int -): Holder { - override val effects = level.effects - override val conditions = level.conditions - override val id = level.id -} diff --git a/eco-core/core-plugin/src/main/resources/config.yml b/eco-core/core-plugin/src/main/resources/config.yml index 95fd6a36..492114ca 100644 --- a/eco-core/core-plugin/src/main/resources/config.yml +++ b/eco-core/core-plugin/src/main/resources/config.yml @@ -167,9 +167,3 @@ enchant-gui: lore-conversion: enabled: false # If lore conversion should be enabled aggressive: false # Will convert all items in all inventories when opened, likely to use a lot of performance - -# Extra placeholders for enchantment configs -extra-placeholders: - # Enable or disable %active_level% placeholder. - # It's disabled by default to save CPU time, enable if you want to use it. - active-level: false \ No newline at end of file