refactor: use components instead of itemmeta

Author: Boy0000

gradle.properties

@@ -1,4 +1,4 @@
 group=com.mineinabyss
 version=0.11
-idofrontVersion=0.26.0
+idofrontVersion=0.26.2
 

src/main/kotlin/com/mineinabyss/blocky/BlockyConfig.kt

@@ -2,12 +2,12 @@ package com.mineinabyss.blocky
 
 import com.charleskorn.kaml.YamlComment
 import com.mineinabyss.blocky.helpers.FurnitureOutlineType
-import com.mineinabyss.idofront.items.editItemMeta
+import com.mineinabyss.blocky.menus.emptyItemModel
 import com.mineinabyss.idofront.serialization.MiniMessageSerializer
-import com.mineinabyss.idofront.serialization.SerializableDataTypes
 import com.mineinabyss.idofront.serialization.SerializableItemStack
 import com.mineinabyss.idofront.serialization.toSerializable
 import com.mineinabyss.idofront.textcomponents.miniMsg
+import io.papermc.paper.datacomponent.DataComponentTypes
 import kotlinx.serialization.Serializable
 import kotlinx.serialization.Transient
 import net.kyori.adventure.text.Component
@@ -84,8 +84,17 @@ data class BlockyConfig(
     @Serializable data class DefaultBlockyMenu(
         val title: @Serializable(MiniMessageSerializer::class) Component = Component.empty(),
         val height: Int = 5,
-        val blockButton: SerializableItemStack = ItemStack(Material.PAPER).editItemMeta { setCustomModelData(1); itemName("<gradient:gold:yellow>Block Menu".miniMsg()) }.toSerializable(),
-        val wireButton: SerializableItemStack = ItemStack(Material.PAPER).editItemMeta { setCustomModelData(1); itemName("<gradient:gold:yellow>Wire Menu".miniMsg()) }.toSerializable(),
-        val furnitureButton: SerializableItemStack = ItemStack(Material.PAPER).editItemMeta { setCustomModelData(1); itemName("<gradient:gold:yellow>Furniture Menu".miniMsg()) }.toSerializable(),
+        val blockButton: SerializableItemStack = ItemStack(Material.PAPER).apply {
+            setData(DataComponentTypes.ITEM_NAME, "<gradient:gold:yellow>Block Menu".miniMsg())
+            setData(DataComponentTypes.ITEM_MODEL, emptyItemModel)
+        }.toSerializable(),
+        val wireButton: SerializableItemStack = ItemStack(Material.PAPER).apply {
+            setData(DataComponentTypes.ITEM_NAME, "<gradient:gold:yellow>Wire Menu".miniMsg())
+            setData(DataComponentTypes.ITEM_MODEL, emptyItemModel)
+        }.toSerializable(),
+        val furnitureButton: SerializableItemStack = ItemStack(Material.PAPER).apply {
+            setData(DataComponentTypes.ITEM_NAME, "<gradient:gold:yellow>Furniture Menu".miniMsg())
+            setData(DataComponentTypes.ITEM_MODEL, emptyItemModel)
+        }.toSerializable(),
     )
 }

src/main/kotlin/com/mineinabyss/blocky/helpers/FurnitureHelpers.kt

@@ -93,7 +93,7 @@ object FurnitureHelpers {
         }
 
         // Try to get held item's color, used to dye furniture
-        val color = item?.itemMeta?.asColorable()?.color
+        val color = item?.asColorable()?.color
         return spawnLoc.spawnFromPrefab(prefabKey) {
             color?.let { set(BlockyFurniture.Color(it)) }
         }.getOrThrow() as? ItemDisplay

src/main/kotlin/com/mineinabyss/blocky/menus/BlockyNavigation.kt

@@ -22,8 +22,9 @@ import com.mineinabyss.guiy.modifiers.height
 import com.mineinabyss.guiy.modifiers.placement.absolute.at
 import com.mineinabyss.guiy.modifiers.size
 import com.mineinabyss.guiy.navigation.Navigator
-import com.mineinabyss.idofront.items.editItemMeta
 import com.mineinabyss.idofront.textcomponents.miniMsg
+import io.papermc.paper.datacomponent.DataComponentTypes
+import net.kyori.adventure.key.Key
 import net.kyori.adventure.text.Component
 import org.bukkit.Material
 import org.bukkit.entity.Player
@@ -105,28 +106,29 @@ private fun handleTitle(screen: BlockyScreen, page: Int, hasMultiplePages: Boole
     }.miniMsg())
 }
 
+val emptyItemModel = Key.key("minecraft:empty")
 @Composable
 fun ScrollDownButton(modifier: Modifier = Modifier) {
-    Item(ItemStack(Material.PAPER).editItemMeta {
-        itemName("<green><b>Scroll Down".miniMsg())
-        setCustomModelData(1)
+    Item(ItemStack.of(Material.PAPER).apply {
+        setData(DataComponentTypes.ITEM_NAME, "<green><b>Scroll Down".miniMsg())
+        setData(DataComponentTypes.ITEM_MODEL, emptyItemModel)
     }, modifier)
 }
 
 @Composable
 fun ScrollUpButton(modifier: Modifier = Modifier) {
-    Item(ItemStack(Material.PAPER).editItemMeta {
-        itemName("<blue><b>Scroll Up".miniMsg())
-        setCustomModelData(1)
+    Item(ItemStack(Material.PAPER).apply {
+        setData(DataComponentTypes.ITEM_NAME, "<blue><b>Scroll Up".miniMsg())
+        setData(DataComponentTypes.ITEM_MODEL, emptyItemModel)
     }, modifier)
 }
 
 @Composable
 fun BlockyUIScope.BackButton(modifier: Modifier = Modifier, onClick: () -> Unit = { nav.back() }) {
     Button(onClick = onClick, modifier = modifier) {
-        Item(ItemStack(Material.PAPER).editItemMeta {
-            itemName("<red><b>Back".miniMsg())
-            setCustomModelData(1)
+        Item(ItemStack(Material.PAPER).apply {
+            setData(DataComponentTypes.ITEM_NAME, "<red><b>Back".miniMsg())
+            setData(DataComponentTypes.ITEM_MODEL, emptyItemModel)
         })
     }
 }

src/main/kotlin/com/mineinabyss/blocky/systems/actions/SetItemOnFurnitureSystem.kt

@@ -7,17 +7,17 @@ import com.mineinabyss.geary.observers.events.OnSet
 import com.mineinabyss.geary.papermc.tracking.items.components.SetItem
 import com.mineinabyss.geary.systems.query.query
 import com.mineinabyss.idofront.items.asColorable
-import com.mineinabyss.idofront.items.editItemMeta
+import io.papermc.paper.datacomponent.DataComponentTypes
 import net.kyori.adventure.text.Component
 import org.bukkit.entity.ItemDisplay
 
 fun Geary.createFurnitureItemSetter() = observe<OnSet>()
     .involving<SetItem, ItemDisplay, BlockyFurniture>()
     .exec(query<ItemDisplay, BlockyFurniture, BlockyFurniture.Color?, SetItem>()) { (itemDisplay, furniture, color, setItem) ->
         val itemStack = furniture.properties.itemStack?.toItemStackOrNull() ?: setItem.item.toItemStack()
-        val furnitureItem = itemStack.clone().editItemMeta {
-            itemName(Component.empty())
-            displayName(Component.empty())
+        val furnitureItem = itemStack.clone().apply {
+            setData(DataComponentTypes.ITEM_NAME, Component.empty())
+            unsetData(DataComponentTypes.CUSTOM_NAME)
             color?.color?.also { c -> asColorable()?.color = c }
         }
         itemDisplay.setItemStack(furnitureItem)