feat: Add overlay item exporter

3 files changed, 80 insertions, 11 deletions

diff --git a/src/main/kotlin/repo/ItemCache.kt b/src/main/kotlin/repo/ItemCache.kt
index 15b3a27..3518257 100644
--- a/src/main/kotlin/repo/ItemCache.kt
+++ b/src/main/kotlin/repo/ItemCache.kt
@@ -16,6 +16,7 @@ import kotlinx.coroutines.awaitAll
 import kotlinx.coroutines.cancel
 import kotlinx.coroutines.launch
 import kotlinx.coroutines.withContext
+import kotlin.io.path.readText
 import kotlin.jvm.optionals.getOrNull
 import net.minecraft.SharedConstants
 import net.minecraft.component.DataComponentTypes
@@ -28,11 +29,13 @@ import net.minecraft.nbt.NbtCompound
 import net.minecraft.nbt.NbtElement
 import net.minecraft.nbt.NbtOps
 import net.minecraft.nbt.NbtString
+import net.minecraft.nbt.StringNbtReader
 import net.minecraft.text.MutableText
 import net.minecraft.text.Style
 import net.minecraft.text.Text
 import net.minecraft.util.Identifier
 import moe.nea.firmament.Firmament
+import moe.nea.firmament.features.debug.ExportedTestConstantMeta
 import moe.nea.firmament.repo.RepoManager.initialize
 import moe.nea.firmament.util.LegacyFormattingCode
 import moe.nea.firmament.util.LegacyTagParser
@@ -67,6 +70,7 @@ object ItemCache : IReloadable {
 
 	@ExpensiveItemCacheApi
 	private fun NbtCompound.transformFrom10809ToModern() = convert189ToModern(this@transformFrom10809ToModern)
+	val currentSaveVersion = SharedConstants.getGameVersion().saveVersion.id
 
 	@ExpensiveItemCacheApi
 	fun convert189ToModern(nbtComponent: NbtCompound): NbtCompound? =
@@ -75,7 +79,7 @@ object ItemCache : IReloadable {
 				TypeReferences.ITEM_STACK,
 				Dynamic(NbtOps.INSTANCE, nbtComponent),
 				-1,
-				SharedConstants.getGameVersion().saveVersion.id
+				currentSaveVersion
 			).value as NbtCompound
 		} catch (e: Exception) {
 			isFlawless = false
@@ -138,24 +142,48 @@ object ItemCache : IReloadable {
 		return base
 	}
 
+	fun tryFindFromModernFormat(skyblockId: SkyblockId): NbtCompound? {
+		val overlayFile =
+			RepoManager.overlayData.getMostModernReadableOverlay(skyblockId, currentSaveVersion) ?: return null
+		val overlay = StringNbtReader.readCompound(overlayFile.path.readText())
+		val result = ExportedTestConstantMeta.SOURCE_CODEC.decode(
+			NbtOps.INSTANCE, overlay
+		).result().getOrNull() ?: return null
+		val meta = result.first
+		return df.update(
+			TypeReferences.ITEM_STACK,
+			Dynamic(NbtOps.INSTANCE, result.second),
+			meta.dataVersion,
+			currentSaveVersion
+		).value as NbtCompound
+	}
+
 	@ExpensiveItemCacheApi
 	private fun NEUItem.asItemStackNow(): ItemStack {
+
 		try {
+			var modernItemTag = tryFindFromModernFormat(this.skyblockId)
 			val oldItemTag = get10809CompoundTag()
-			val modernItemTag = oldItemTag.transformFrom10809ToModern()
-				?: return brokenItemStack(this)
+			var usedOldNbt = false
+			if (modernItemTag == null) {
+				usedOldNbt = true
+				modernItemTag = oldItemTag.transformFrom10809ToModern()
+					?: return brokenItemStack(this)
+			}
 			val itemInstance =
 				ItemStack.fromNbt(MC.defaultRegistries, modernItemTag).getOrNull() ?: return brokenItemStack(this)
+			if (usedOldNbt) {
+				val tag = oldItemTag.getCompound("tag")
+				val extraAttributes = tag.flatMap { it.getCompound("ExtraAttributes") }
+					.getOrNull()
+				if (extraAttributes != null)
+					itemInstance.set(DataComponentTypes.CUSTOM_DATA, NbtComponent.of(extraAttributes))
+				val itemModel = tag.flatMap { it.getString("ItemModel") }.getOrNull()
+				if (itemModel != null)
+					itemInstance.set(DataComponentTypes.ITEM_MODEL, Identifier.of(itemModel))
+			}
 			itemInstance.loreAccordingToNbt = lore.map { un189Lore(it) }
 			itemInstance.displayNameAccordingToNbt = un189Lore(displayName)
-			val tag = oldItemTag.getCompound("tag")
-			val extraAttributes = tag.flatMap { it.getCompound("ExtraAttributes") }
-				.getOrNull()
-			if (extraAttributes != null)
-				itemInstance.set(DataComponentTypes.CUSTOM_DATA, NbtComponent.of(extraAttributes))
-			val itemModel = tag.flatMap { it.getString("ItemModel") }.getOrNull()
-			if (itemModel != null)
-				itemInstance.set(DataComponentTypes.ITEM_MODEL, Identifier.of(itemModel))
 			return itemInstance
 		} catch (e: Exception) {
 			e.printStackTrace()
diff --git a/src/main/kotlin/repo/ModernOverlaysData.kt b/src/main/kotlin/repo/ModernOverlaysData.kt
new file mode 100644
index 0000000..7e7acf1
--- /dev/null
+++ b/src/main/kotlin/repo/ModernOverlaysData.kt
@@ -0,0 +1,39 @@
+package moe.nea.firmament.repo
+
+import io.github.moulberry.repo.IReloadable
+import io.github.moulberry.repo.NEURepository
+import java.nio.file.Path
+import kotlin.io.path.extension
+import kotlin.io.path.listDirectoryEntries
+import kotlin.io.path.nameWithoutExtension
+import moe.nea.firmament.util.SkyblockId
+
+// TODO: move this over to the repo parser
+class ModernOverlaysData : IReloadable {
+	data class OverlayFile(
+		val version: Int,
+		val path: Path,
+	)
+
+	var overlays: Map<SkyblockId, List<OverlayFile>> = mapOf()
+	override fun reload(repo: NEURepository) {
+		val items = mutableMapOf<SkyblockId, MutableList<OverlayFile>>()
+		repo.baseFolder.resolve("itemsOverlay")
+			.listDirectoryEntries()
+			.forEach { versionFolder ->
+				val version = versionFolder.fileName.toString().toIntOrNull() ?: return@forEach
+				versionFolder.listDirectoryEntries()
+					.forEach { item ->
+						if (item.extension != "snbt") return@forEach
+						val itemId = item.nameWithoutExtension
+						items.getOrPut(SkyblockId(itemId)) { mutableListOf() }.add(OverlayFile(version, item))
+					}
+			}
+		this.overlays = items
+	}
+
+	fun getOverlayFiles(skyblockId: SkyblockId) = overlays[skyblockId] ?: listOf()
+	fun getMostModernReadableOverlay(skyblockId: SkyblockId, version: Int) = getOverlayFiles(skyblockId)
+		.filter { it.version <= version }
+		.maxByOrNull { it.version }
+}
diff --git a/src/main/kotlin/repo/RepoManager.kt b/src/main/kotlin/repo/RepoManager.kt
index f4146e0..df89092 100644
--- a/src/main/kotlin/repo/RepoManager.kt
+++ b/src/main/kotlin/repo/RepoManager.kt
@@ -66,9 +66,11 @@ object RepoManager {
 	val essenceRecipeProvider = EssenceRecipeProvider()
 	val recipeCache = BetterRepoRecipeCache(essenceRecipeProvider, ReforgeStore)
 	val miningData = MiningRepoData()
+	val overlayData = ModernOverlaysData()
 
 	fun makeNEURepository(path: Path): NEURepository {
 		return NEURepository.of(path).apply {
+			registerReloadListener(overlayData)
 			registerReloadListener(ItemCache)
 			registerReloadListener(RepoItemTypeCache)
 			registerReloadListener(ExpLadders)