Merge branch 'Auxilor:master' into master

LangZongz · Dec 9, 2023 · 7f4bbcd · 7f4bbcd
2 parents b74c503 + 48fd2dd
commit 7f4bbcd
Show file tree

Hide file tree

Showing 2 changed files with 19 additions and 2 deletions.
diff --git a/...in/kotlin/com/willfp/ecoenchants/proxy/v1_20_R3/registration/DelegatedCraftEnchantment.kt b/...in/kotlin/com/willfp/ecoenchants/proxy/v1_20_R3/registration/DelegatedCraftEnchantment.kt
@@ -1,6 +1,6 @@
 package com.willfp.ecoenchants.proxy.v1_20_R3.registration
 
-import com.willfp.eco.util.StringUtils
+import com.willfp.eco.util.toComponent
 import com.willfp.ecoenchants.display.getFormattedName
 import com.willfp.ecoenchants.enchant.EcoEnchant
 import io.papermc.paper.enchantments.EnchantmentRarity
@@ -64,7 +64,7 @@ class DelegatedCraftEnchantment(
     }
 
     override fun displayName(level: Int): Component {
-        return StringUtils.toComponent(enchant.getFormattedName(level))
+        return enchant.getFormattedName(level).toComponent()
     }
 
     override fun isTradeable(): Boolean {
@@ -111,4 +111,8 @@ class DelegatedCraftEnchantment(
     override fun hashCode(): Int {
         return Objects.hash(this.key)
     }
+
+    override fun toString(): String {
+        return "DelegatedCraftEnchantment(key=$key)"
+    }
 }
diff --git a/...otlin/com/willfp/ecoenchants/proxy/v1_20_R3/registration/VanillaEcoEnchantsEnchantment.kt b/...otlin/com/willfp/ecoenchants/proxy/v1_20_R3/registration/VanillaEcoEnchantsEnchantment.kt
@@ -12,6 +12,7 @@ import net.minecraft.world.item.enchantment.Enchantment
 import net.minecraft.world.item.enchantment.EnchantmentCategory
 import org.bukkit.craftbukkit.v1_20_R3.enchantments.CraftEnchantment
 import org.bukkit.craftbukkit.v1_20_R3.inventory.CraftItemStack
+import java.util.Objects
 
 class VanillaEcoEnchantsEnchantment(
     private val id: String
@@ -81,4 +82,16 @@ class VanillaEcoEnchantsEnchantment(
     override fun getSlotItems(entity: LivingEntity): MutableMap<EquipmentSlot, ItemStack> {
         return mutableMapOf()
     }
+
+    override fun toString(): String {
+        return "VanillaEcoEnchantsEnchantment(id='$id')"
+    }
+
+    override fun equals(other: Any?): Boolean {
+        return other is VanillaEcoEnchantsEnchantment && other.id == this.id
+    }
+
+    override fun hashCode(): Int {
+        return Objects.hash(id)
+    }
 }