Chieri/Firmament
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

fix: item exporter overwriting wiki links

Browse Source
This commit is contained in:
Linnea Gräf
2025-07-05 16:05:55 +02:00
parent da0be52225
commit ef97e9eeff
1 changed files with 18 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

20
src/main/kotlin/features/debug/itemeditor/ItemExporter.kt
View File

@@ -48,11 +48,27 @@ object ItemExporter {
fun exportItem(itemStack: ItemStack): Text { fun exportItem(itemStack: ItemStack): Text {
val exporter = LegacyItemExporter.createExporter(itemStack) val exporter = LegacyItemExporter.createExporter(itemStack)
val json = exporter.exportJson() var json = exporter.exportJson()
val jsonFormatted = Firmament.twoSpaceJson.encodeToString(json)
val fileName = json.jsonObject["internalname"]!!.jsonPrimitive.content val fileName = json.jsonObject["internalname"]!!.jsonPrimitive.content
val itemFile = RepoDownloadManager.repoSavedLocation.resolve("items").resolve("${fileName}.json") val itemFile = RepoDownloadManager.repoSavedLocation.resolve("items").resolve("${fileName}.json")
itemFile.createParentDirectories() itemFile.createParentDirectories()
if (itemFile.exists()) {
val existing = try {
Firmament.json.decodeFromString<JsonObject>(itemFile.readText())
} catch (ex: Exception) {
ex.printStackTrace()
JsonObject(mapOf())
}
val mut = json.jsonObject.toMutableMap()
for (prop in existing) {
if (prop.key !in mut || mut[prop.key]!!.let {
(it is JsonPrimitive && (it.content.isEmpty() || it.content == "0")) || (it is JsonArray && it.isEmpty()) || (it is JsonObject && it.isEmpty())
})
mut[prop.key] = prop.value
}
json = JsonObject(mut)
}
val jsonFormatted = Firmament.twoSpaceJson.encodeToString(json)
itemFile.writeText(jsonFormatted) itemFile.writeText(jsonFormatted)
val overlayFile = RepoDownloadManager.repoSavedLocation.resolve("itemsOverlay") val overlayFile = RepoDownloadManager.repoSavedLocation.resolve("itemsOverlay")
.resolve(ExportedTestConstantMeta.current.dataVersion.toString()) .resolve(ExportedTestConstantMeta.current.dataVersion.toString())