Make recipes with higher stack counts properly display

1 files changed, 9 insertions, 6 deletions

diff --git a/src/main/kotlin/moe/nea/firmament/rei/NEUItemEntrySerializer.kt b/src/main/kotlin/moe/nea/firmament/rei/NEUItemEntrySerializer.kt
index 15731cb..3e9d543 100644
--- a/src/main/kotlin/moe/nea/firmament/rei/NEUItemEntrySerializer.kt
+++ b/src/main/kotlin/moe/nea/firmament/rei/NEUItemEntrySerializer.kt
@@ -1,25 +1,28 @@
 package moe.nea.firmament.rei
 
-import io.github.moulberry.repo.data.NEUItem
 import me.shedaniel.rei.api.common.entry.EntrySerializer
 import me.shedaniel.rei.api.common.entry.EntryStack
 import net.minecraft.nbt.NbtCompound
 import moe.nea.firmament.repo.RepoManager
 import moe.nea.firmament.util.SkyblockId
 
-object NEUItemEntrySerializer : EntrySerializer<NEUItem?> {
+object NEUItemEntrySerializer : EntrySerializer<SBItemStack> {
     const val SKYBLOCK_ID_ENTRY = "SKYBLOCK_ID"
+    const val SKYBLOCK_ITEM_COUNT = "SKYBLOCK_ITEM_COUNT"
 
     override fun supportSaving(): Boolean = true
     override fun supportReading(): Boolean = true
 
-    override fun read(tag: NbtCompound): NEUItem? {
-        return RepoManager.getNEUItem(SkyblockId(tag.getString(SKYBLOCK_ID_ENTRY)))
+    override fun read(tag: NbtCompound): SBItemStack {
+        val id = SkyblockId(tag.getString(SKYBLOCK_ID_ENTRY))
+        val count = if (tag.contains(SKYBLOCK_ITEM_COUNT)) tag.getInt(SKYBLOCK_ITEM_COUNT) else 1
+        return SBItemStack(id, RepoManager.getNEUItem(id), count)
     }
 
-    override fun save(entry: EntryStack<NEUItem?>, value: NEUItem?): NbtCompound {
+    override fun save(entry: EntryStack<SBItemStack>, value: SBItemStack): NbtCompound {
         return NbtCompound().apply {
-            putString(SKYBLOCK_ID_ENTRY, value?.skyblockItemId ?: "null")
+            putString(SKYBLOCK_ID_ENTRY, value.skyblockId.neuItem)
+            putInt(SKYBLOCK_ITEM_COUNT, value.stackSize)
         }
     }
 }