From 5eb7eee7756dfced2881821416f009668ee21116 Mon Sep 17 00:00:00 2001
From: jimchen5209 <jimchen5209@gmail.com>
Date: Thu, 25 Apr 2024 23:27:06 +0800
Subject: [PATCH] fix: common itemStack nbts

---
 .../galaxy/block/entity/HarvestBlockEntity.kt    |  4 ++--
 src/main/kotlin/one/oktw/galaxy/gui/GUI.kt       |  2 +-
 .../kotlin/one/oktw/galaxy/item/CustomItem.kt    | 16 ++++++++--------
 3 files changed, 11 insertions(+), 11 deletions(-)

diff --git a/src/main/kotlin/one/oktw/galaxy/block/entity/HarvestBlockEntity.kt b/src/main/kotlin/one/oktw/galaxy/block/entity/HarvestBlockEntity.kt
index f5a36cd3b..9998f3e9f 100644
--- a/src/main/kotlin/one/oktw/galaxy/block/entity/HarvestBlockEntity.kt
+++ b/src/main/kotlin/one/oktw/galaxy/block/entity/HarvestBlockEntity.kt
@@ -104,7 +104,7 @@ class HarvestBlockEntity(type: BlockEntityType<*>, pos: BlockPos, modelItem: Ite
                     if (originItem.isEmpty) {
                         setStack(slot, item)
                         break
-                    } else if (originItem.count < originItem.maxCount && ItemStack.canCombine(originItem, item)) {
+                    } else if (originItem.count < originItem.maxCount && ItemStack.areItemsAndComponentsEqual(originItem, item)) {
                         val count = item.count.coerceAtMost(originItem.maxCount - originItem.count)
                         item.decrement(count)
                         originItem.increment(count)
@@ -112,7 +112,7 @@ class HarvestBlockEntity(type: BlockEntityType<*>, pos: BlockPos, modelItem: Ite
                     }
                 }
             }
-            if (tool.damage(1, world.random, null)) {
+            tool.damage(1, world.random, null) {
                 tool.decrement(1)
                 tool.damage = 0
             }
diff --git a/src/main/kotlin/one/oktw/galaxy/gui/GUI.kt b/src/main/kotlin/one/oktw/galaxy/gui/GUI.kt
index c7b6ba0b5..0fb4dccbf 100644
--- a/src/main/kotlin/one/oktw/galaxy/gui/GUI.kt
+++ b/src/main/kotlin/one/oktw/galaxy/gui/GUI.kt
@@ -265,7 +265,7 @@ class GUI private constructor(private val type: ScreenHandlerType<out ScreenHand
                 for (index in slots) {
                     val slot = slotBindings[index]!!
                     val originItem = slot.stack
-                    if (!originItem.isEmpty && slot.canInsert(item) && ItemStack.canCombine(item, originItem)) {
+                    if (!originItem.isEmpty && slot.canInsert(item) && ItemStack.areItemsAndComponentsEqual(item, originItem)) {
                         val count = originItem.count + item.count
                         if (count <= item.maxCount) {
                             item.count = 0
diff --git a/src/main/kotlin/one/oktw/galaxy/item/CustomItem.kt b/src/main/kotlin/one/oktw/galaxy/item/CustomItem.kt
index 9e65e50a0..fee0366f7 100644
--- a/src/main/kotlin/one/oktw/galaxy/item/CustomItem.kt
+++ b/src/main/kotlin/one/oktw/galaxy/item/CustomItem.kt
@@ -18,10 +18,13 @@
 
 package one.oktw.galaxy.item
 
+import net.minecraft.component.DataComponentTypes
+import net.minecraft.component.type.AttributeModifiersComponent
+import net.minecraft.component.type.CustomModelDataComponent
+import net.minecraft.component.type.UnbreakableComponent
 import net.minecraft.item.Item
 import net.minecraft.item.ItemStack
 import net.minecraft.nbt.NbtCompound
-import net.minecraft.nbt.NbtList
 import net.minecraft.text.Text
 import net.minecraft.util.Identifier
 import one.oktw.galaxy.util.CustomRegistry
@@ -61,13 +64,10 @@ abstract class CustomItem(override val identifier: Identifier, private val baseI
         if (cacheable && this::cacheItemStack.isInitialized) return cacheItemStack.copy()
 
         return ItemStack(baseItem).apply {
-            orCreateNbt.apply {
-                putInt("HideFlags", ItemStack.TooltipSection.values().map(ItemStack.TooltipSection::getFlag).reduce { acc, i -> acc or i }) // ALL
-                putInt("CustomModelData", modelData)
-                putBoolean("Unbreakable", true)
-                put("AttributeModifiers", NbtList())
-            }
-            setCustomName(this@CustomItem.getName())
+            set(DataComponentTypes.CUSTOM_MODEL_DATA, CustomModelDataComponent(modelData))
+            set(DataComponentTypes.UNBREAKABLE, UnbreakableComponent(false))
+            set(DataComponentTypes.ATTRIBUTE_MODIFIERS, AttributeModifiersComponent(listOf<AttributeModifiersComponent.Entry>(), false))
+            set(DataComponentTypes.CUSTOM_NAME, this@CustomItem.getName())
             writeCustomNbt(getOrCreateSubNbt("GalaxyData"))
         }.also { if (cacheable) cacheItemStack = it.copy() }
     }