proper eco item check
Some checks failed
Java CI with Gradle / build (push) Has been cancelled

This commit is contained in:
alexcrea 2026-08-12 07:24:21 +02:00
parent d18ee56ff1
commit ab47a9df93
Signed by: alexcrea
GPG key ID: E59DF23EE2A2266C
3 changed files with 11 additions and 5 deletions

View file

@ -42,6 +42,7 @@ object DependencyManager {
var enchantmentSquaredCompatibility: EnchantmentSquaredDependency? = null
var ecoEnchantCompatibility: EcoEnchantDependency? = null
var hasEcoItem: Boolean = false
var excellentEnchantsCompatibility: ExcellentEnchantsDependency? = null
var disenchantmentCompatibility: DisenchantmentDependency? = null
@ -78,6 +79,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")) {

View file

@ -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<NamespacedKey> {
val all = ArrayList(Material.entries.map { it.key })
if(DependencyManager.ecoEnchantCompatibility != null) {
if(DependencyManager.hasEcoItem) {
all.addAll(EcoItemDependencyUtil.getItems())
}

View file

@ -68,6 +68,7 @@ softdepend:
- Disenchantment
- EnchantsSquared
- EcoEnchants
- EcoItems
- eco
- ExcellentEnchants
- HavenBags