diff --git a/eco-core/core-plugin/src/main/kotlin/com/willfp/ecoenchants/enchants/EcoEnchant.kt b/eco-core/core-plugin/src/main/kotlin/com/willfp/ecoenchants/enchants/EcoEnchant.kt index 051bc8d4..3d371fd2 100644 --- a/eco-core/core-plugin/src/main/kotlin/com/willfp/ecoenchants/enchants/EcoEnchant.kt +++ b/eco-core/core-plugin/src/main/kotlin/com/willfp/ecoenchants/enchants/EcoEnchant.kt @@ -65,8 +65,9 @@ abstract class EcoEnchant( private val conflictNames = config.getStrings("conflicts") - val conflictsWithEverything = conflictNames.containsIgnoreCase("all") - || conflictNames.containsIgnoreCase("everything") + val conflictsWithEverything: Boolean + get() = conflictNames.containsIgnoreCase("all") + || conflictNames.containsIgnoreCase("everything") val conflicts: Collection get() = if (conflictsWithEverything) values().toList() @@ -228,7 +229,7 @@ abstract class EcoEnchant( } fun conflictsWithDirectly(other: Enchantment): Boolean { - return conflictNames.containsIgnoreCase(other.key.key) + return conflictNames.containsIgnoreCase(other.key.key) || conflictsWithEverything } override fun conflictsWith(other: Enchantment): Boolean { diff --git a/eco-core/core-plugin/src/main/kotlin/com/willfp/ecoenchants/enchants/EnchantGUI.kt b/eco-core/core-plugin/src/main/kotlin/com/willfp/ecoenchants/enchants/EnchantGUI.kt index f04c7fe3..9cd359a4 100644 --- a/eco-core/core-plugin/src/main/kotlin/com/willfp/ecoenchants/enchants/EnchantGUI.kt +++ b/eco-core/core-plugin/src/main/kotlin/com/willfp/ecoenchants/enchants/EnchantGUI.kt @@ -7,6 +7,7 @@ import com.willfp.eco.core.gui.GUIComponent import com.willfp.eco.core.gui.menu import com.willfp.eco.core.gui.menu.Menu import com.willfp.eco.core.gui.menu.MenuLayer +import com.willfp.eco.core.gui.onRender import com.willfp.eco.core.gui.page.Page import com.willfp.eco.core.gui.page.PageChanger import com.willfp.eco.core.gui.slot @@ -152,7 +153,6 @@ object EnchantGUI { setSlot( plugin.configYml.getInt("enchantinfo.item.row"), plugin.configYml.getInt("enchantinfo.item.column"), - enchant.getInformationSlot(plugin) ) diff --git a/eco-core/core-plugin/src/main/kotlin/com/willfp/ecoenchants/mechanics/GrindstoneSupport.kt b/eco-core/core-plugin/src/main/kotlin/com/willfp/ecoenchants/mechanics/GrindstoneSupport.kt index e7116bee..5a674e5a 100644 --- a/eco-core/core-plugin/src/main/kotlin/com/willfp/ecoenchants/mechanics/GrindstoneSupport.kt +++ b/eco-core/core-plugin/src/main/kotlin/com/willfp/ecoenchants/mechanics/GrindstoneSupport.kt @@ -49,7 +49,6 @@ class GrindstoneSupport( val toKeep = mutableMapOf() for ((enchant, level) in topEnchants) { - println("Enchantment $enchant can grindstone? ${enchant.wrap().type.noGrindstone}") if (enchant.wrap().type.noGrindstone) { toKeep[enchant] = level } diff --git a/eco-core/core-plugin/src/main/resources/lang.yml b/eco-core/core-plugin/src/main/resources/lang.yml index 746be8c2..def0d310 100644 --- a/eco-core/core-plugin/src/main/resources/lang.yml +++ b/eco-core/core-plugin/src/main/resources/lang.yml @@ -20,4 +20,4 @@ messages: all: "All" no-conflicts: "No Conflicts" -all-conficts: "All Other Enchantments" \ No newline at end of file +all-conflicts: "All Other Enchantments" \ No newline at end of file