diff --git a/src/main/kotlin/xyz/alexcrea/cuanvil/dependency/DependencyManager.kt b/src/main/kotlin/xyz/alexcrea/cuanvil/dependency/DependencyManager.kt index b52bd167..1c68676d 100644 --- a/src/main/kotlin/xyz/alexcrea/cuanvil/dependency/DependencyManager.kt +++ b/src/main/kotlin/xyz/alexcrea/cuanvil/dependency/DependencyManager.kt @@ -46,6 +46,7 @@ object DependencyManager { var enchantmentSquaredCompatibility: EnchantmentSquaredDependency? = null var ecoEnchantCompatibility: EcoEnchantDependency? = null + var hasEcoItem: Boolean = false var excellentEnchantsCompatibility: ExcellentEnchantsDependency? = null var disenchantmentCompatibility: DisenchantmentDependency? = null @@ -82,6 +83,10 @@ object DependencyManager { ecoEnchantCompatibility = EcoEnchantDependency(pluginManager.getPlugin("EcoEnchants")!!) ecoEnchantCompatibility!!.disableAnvilListener() } + // EcoItem check + if (pluginManager.isPluginEnabled("EcoItems")) { + hasEcoItem = true + } // Excellent Enchants dependency if (pluginManager.isPluginEnabled("ExcellentEnchants")) { diff --git a/src/main/kotlin/xyz/alexcrea/cuanvil/util/MaterialUtil.kt b/src/main/kotlin/xyz/alexcrea/cuanvil/util/MaterialUtil.kt index af5020c7..f9a6acc3 100644 --- a/src/main/kotlin/xyz/alexcrea/cuanvil/util/MaterialUtil.kt +++ b/src/main/kotlin/xyz/alexcrea/cuanvil/util/MaterialUtil.kt @@ -21,7 +21,7 @@ object MaterialUtil { val ItemStack.customType: NamespacedKey get() { - if(DependencyManager.ecoEnchantCompatibility != null) { + if(DependencyManager.hasEcoItem) { val result = EcoItemDependencyUtil.ecoItemNamespace(this) if(result != null) return result } @@ -43,7 +43,7 @@ object MaterialUtil { @Nullable fun getMatFromKey(key: NamespacedKey): Material? { - if(DependencyManager.ecoEnchantCompatibility != null) { + if(DependencyManager.hasEcoItem) { val result = EcoItemDependencyUtil.ecoItemMaterialFromKey(key) if(result != null) return result } @@ -58,7 +58,7 @@ object MaterialUtil { } fun itemFromKey(key: NamespacedKey): ItemStack { - if(DependencyManager.ecoEnchantCompatibility != null) { + if(DependencyManager.hasEcoItem) { val result = EcoItemDependencyUtil.newEcoItemstack(key) if(result != null) return result } @@ -78,7 +78,7 @@ object MaterialUtil { fun getMaterialCount(): Int { var count = Material.entries.size - if(DependencyManager.ecoEnchantCompatibility != null) { + if(DependencyManager.hasEcoItem) { count += EcoItemDependencyUtil.getItems().size } @@ -92,7 +92,7 @@ object MaterialUtil { fun getMaterials(): MutableList { val all = ArrayList(Material.entries.map { it.key }) - if(DependencyManager.ecoEnchantCompatibility != null) { + if(DependencyManager.hasEcoItem) { all.addAll(EcoItemDependencyUtil.getItems()) } diff --git a/src/main/resources/plugin.yml b/src/main/resources/plugin.yml index 97188e14..a8d98c8c 100644 --- a/src/main/resources/plugin.yml +++ b/src/main/resources/plugin.yml @@ -80,6 +80,7 @@ softdepend: - Disenchantment - EnchantsSquared - EcoEnchants + - EcoItems - eco - ExcellentEnchants - HavenBags