fix: export color in item exporter

1 files changed, 17 insertions, 3 deletions

diff --git a/src/main/kotlin/features/debug/itemeditor/LegacyItemExporter.kt b/src/main/kotlin/features/debug/itemeditor/LegacyItemExporter.kt
index 3cd1ce8..c35a892 100644
--- a/src/main/kotlin/features/debug/itemeditor/LegacyItemExporter.kt
+++ b/src/main/kotlin/features/debug/itemeditor/LegacyItemExporter.kt
@@ -11,6 +11,7 @@ import net.minecraft.nbt.NbtCompound
 import net.minecraft.nbt.NbtElement
 import net.minecraft.nbt.NbtInt
 import net.minecraft.nbt.NbtOps
+import net.minecraft.nbt.NbtPrimitive
 import net.minecraft.nbt.NbtString
 import net.minecraft.text.Text
 import net.minecraft.util.Unit
@@ -36,8 +37,9 @@ import moe.nea.firmament.util.unformattedString
 
 class LegacyItemExporter private constructor(var itemStack: ItemStack) {
 	init {
-	    require(!itemStack.isEmpty)
+		require(!itemStack.isEmpty)
 	}
+
 	var lore = itemStack.loreAccordingToNbt
 	var name = itemStack.displayNameAccordingToNbt
 	val extraAttribs = itemStack.extraAttributes.copy()
@@ -136,21 +138,33 @@ class LegacyItemExporter private constructor(var itemStack: ItemStack) {
 		copyExtraAttributes()
 		copyLegacySkullNbt()
 		copyDisplay()
+		copyColour()
 		copyEnchantments()
 		copyEnchantGlint()
 		// TODO: copyDisplay
 	}
 
+	fun NbtCompound.getOrPutCompound(name: String): NbtCompound {
+		val compound = getCompoundOrEmpty(name)
+		put(name, compound)
+		return compound
+	}
+
+	private fun copyColour() {
+		val leatherTint = itemStack.get(DataComponentTypes.DYED_COLOR) ?: return
+		legacyNbt.getOrPutCompound("display").put("color", NbtInt.of(leatherTint.rgb))
+	}
+
 	private fun copyItemModel() {
 		val itemModel = itemStack.get(DataComponentTypes.ITEM_MODEL) ?: return
 		legacyNbt.put("ItemModel", NbtString.of(itemModel.toString()))
 	}
 
 	private fun copyDisplay() {
-		legacyNbt.put("display", NbtCompound().apply {
+		legacyNbt.getOrPutCompound("display").apply {
 			put("Lore", lore.map { NbtString.of(it.getLegacyFormatString(trimmed = true)) }.toNbtList())
 			putString("Name", name.getLegacyFormatString(trimmed = true))
-		})
+		}
 	}
 
 	fun exportModernSnbt(): NbtElement {