Skip to content

Commit f828fdf

Browse files
committed
fix: Add back MiniMessageSerializer for SerializableItemStack, some components like lore still need it!
1 parent d4521ff commit f828fdf

1 file changed

Lines changed: 15 additions & 8 deletions

File tree

idofront-serializers/src/main/kotlin/com/mineinabyss/idofront/serialization/SerializableItemStack.kt

Lines changed: 15 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,5 @@
1+
@file:UseSerializers(MiniMessageSerializer::class)
2+
13
package com.mineinabyss.idofront.serialization
24

35
import com.mineinabyss.idofront.di.DI
@@ -12,11 +14,8 @@ import dev.lone.itemsadder.api.CustomStack
1214
import io.lumine.mythiccrucible.MythicCrucible
1315
import io.th0rgal.oraxen.OraxenPlugin
1416
import io.th0rgal.oraxen.api.OraxenItems
15-
import kotlinx.serialization.EncodeDefault
17+
import kotlinx.serialization.*
1618
import kotlinx.serialization.EncodeDefault.Mode.NEVER
17-
import kotlinx.serialization.SerialName
18-
import kotlinx.serialization.Serializable
19-
import kotlinx.serialization.Transient
2019
import net.kyori.adventure.text.Component
2120
import net.kyori.adventure.text.format.TextDecoration
2221
import org.bukkit.*
@@ -82,8 +81,10 @@ data class BaseSerializableItemStack(
8281
@EncodeDefault(NEVER) val itemsadderItem: String? = null,
8382
) {
8483

85-
@Transient val itemName = _itemName?.miniMsg()
86-
@Transient val customName = _customName?.miniMsg()
84+
@Transient
85+
val itemName = _itemName?.miniMsg()
86+
@Transient
87+
val customName = _customName?.miniMsg()
8788

8889
/**
8990
* Converts this serialized item's data to an [ItemStack], optionally applying the changes to an
@@ -138,7 +139,11 @@ data class BaseSerializableItemStack(
138139
itemName?.let(meta::itemName)
139140
customName?.let(meta::displayName)
140141
customModelData?.let(meta::setCustomModelData)
141-
lore?.let { meta.lore(it.map { l -> l.decorationIfAbsent(TextDecoration.ITALIC, TextDecoration.State.FALSE) }) }
142+
lore?.let {
143+
meta.lore(it.map { line ->
144+
line.decorationIfAbsent(TextDecoration.ITALIC, TextDecoration.State.FALSE)
145+
})
146+
}
142147

143148
unbreakable?.let(meta::setUnbreakable)
144149
damage?.let { (meta as? Damageable)?.damage = damage }
@@ -150,7 +155,9 @@ data class BaseSerializableItemStack(
150155
enchantments?.forEach { meta.addEnchant(it.enchant, it.level, true) }
151156
attributeModifiers?.forEach { meta.addAttributeModifier(it.attribute, it.modifier) }
152157

153-
knowledgeBookRecipes?.let { (meta as? KnowledgeBookMeta)?.recipes = knowledgeBookRecipes.map { it.getSubRecipeIDs() }.flatten() }
158+
knowledgeBookRecipes?.let {
159+
(meta as? KnowledgeBookMeta)?.recipes = knowledgeBookRecipes.map { it.getSubRecipeIDs() }.flatten()
160+
}
154161

155162
enchantmentGlintOverride?.let(meta::setEnchantmentGlintOverride)
156163
food?.let(meta::setFood)

0 commit comments

Comments
 (0)