Upstream/EcoEnchants
1
0
Fork 0
mirror of https://github.com/Auxilor/EcoEnchants.git synced 2024-11-25 15:35:11 +01:00
Code Issues Actions Packages Projects Releases Wiki Activity

Fixed hardcoded enchantments not working

Browse Source
This commit is contained in:
Will FP 2023-12-24 14:37:47 +01:00
parent 046895fbf6
commit 1e690c8eac
4 changed files with 36 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
eco-core/core-nms/v1_20_R3/src/main/kotlin/com/willfp/ecoenchants/proxy/v1_20_R3/registration/EcoEnchantsCraftEnchantment.kt
View File

@ -22,6 +22,14 @@ class EcoEnchantsCraftEnchantment(
enchant.enchantment = this
}
override fun onRegister() {
enchant.onRegister()
}
override fun onRemove() {
enchant.onRemove()
}
override fun canEnchantItem(item: ItemStack): Boolean {
return enchant.canEnchantItem(item)
}
@ -105,12 +113,11 @@ class EcoEnchantsCraftEnchantment(
override fun getActiveSlots() = emptySet<EquipmentSlot>()
override fun equals(other: Any?): Boolean {
return other is EcoEnchantsCraftEnchantment &&
other.key == this.key
return other is EcoEnchant && this.enchantmentKey == other.enchantmentKey
}
override fun hashCode(): Int {
return Objects.hash(this.key)
return this.enchantmentKey.hashCode()
}
override fun toString(): String {

3
eco-core/core-plugin/src/main/kotlin/com/willfp/ecoenchants/enchant/EcoEnchants.kt
View File

@ -95,7 +95,8 @@ object EcoEnchants : RegistrableCategory<EcoEnchant>("enchant", "enchants") {
)
for (enchantment in hardcodedEnchantments) {
if (enchantment.isPresent) {
// Only register if not already registered (so hardcode can be overridden)
if (enchantment.isPresent && registry[enchantment.id] == null) {
doRegister(plugin, enchantment)
}
}

8
eco-core/core-plugin/src/main/kotlin/com/willfp/ecoenchants/enchant/impl/EcoEnchantBase.kt
View File

@ -126,4 +126,12 @@ abstract class EcoEnchantBase(
override fun conflictsWithDirectly(other: Enchantment): Boolean {
return other.key.key in conflictIds
}
final override fun equals(other: Any?): Boolean {
return other is EcoEnchant && this.enchantmentKey == other.enchantmentKey
}
final override fun hashCode(): Int {
return this.enchantmentKey.hashCode()
}
}

16
eco-core/core-plugin/src/main/kotlin/com/willfp/ecoenchants/enchant/registration/legacy/LegacyDelegatedEnchantment.kt
View File

@ -21,6 +21,14 @@ class LegacyDelegatedEnchantment(
enchant.enchantment = this
}
override fun onRegister() {
enchant.onRegister()
}
override fun onRemove() {
enchant.onRemove()
}
override fun translationKey(): String {
return "ecoenchants:enchantment.$id"
}
@ -89,4 +97,12 @@ class LegacyDelegatedEnchantment(
replaceWith = ReplaceWith("this.slots")
)
override fun getActiveSlots() = emptySet<EquipmentSlot>()
override fun equals(other: Any?): Boolean {
return other is EcoEnchant && this.enchantmentKey == other.enchantmentKey
}
override fun hashCode(): Int {
return this.enchantmentKey.hashCode()
}
}