From e2e25f404ed231e1da06856da2231608dcb27dac Mon Sep 17 00:00:00 2001 From: way-zer Date: Sat, 18 Oct 2025 23:57:26 +0800 Subject: [PATCH] =?UTF-8?q?=F0=9F=90=9B=20=E9=94=99=E8=AF=AF=E6=A0=BC?= =?UTF-8?q?=E5=BC=8F=E7=9A=84content=E4=BC=9A=E5=AF=BC=E8=87=B4=E6=9C=AA?= =?UTF-8?q?=E6=8D=95=E8=8E=B7=E6=8A=A5=E9=94=99?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- build.gradle.kts | 4 ++-- .../kotlin/cf/wayzer/contentsTweaker/ContentsTweaker.kt | 9 ++++++++- 2 files changed, 10 insertions(+), 3 deletions(-) diff --git a/build.gradle.kts b/build.gradle.kts index 8186d41..9c85e8f 100644 --- a/build.gradle.kts +++ b/build.gradle.kts @@ -16,8 +16,8 @@ repositories { dependencies { implementation(kotlin("stdlib")) - compileOnly("com.github.Anuken.Arc:arc-core:v149") - compileOnly("com.github.anuken.mindustry:core:v149") { + compileOnly("com.github.Anuken.Arc:arc-core:v152") + compileOnly("com.github.anuken.mindustry:core:v152") { exclude(group = "com.github.Anuken.Arc") } } diff --git a/src/main/kotlin/cf/wayzer/contentsTweaker/ContentsTweaker.kt b/src/main/kotlin/cf/wayzer/contentsTweaker/ContentsTweaker.kt index 3bcc05f..ce5897f 100644 --- a/src/main/kotlin/cf/wayzer/contentsTweaker/ContentsTweaker.kt +++ b/src/main/kotlin/cf/wayzer/contentsTweaker/ContentsTweaker.kt @@ -2,6 +2,7 @@ package cf.wayzer.contentsTweaker import arc.util.Log import arc.util.serialization.BaseJsonWriter +import arc.util.serialization.JsonValue import arc.util.serialization.JsonWriter import cf.wayzer.contentsTweaker.resolvers.* import mindustry.Vars @@ -43,7 +44,13 @@ object ContentsTweaker { fun loadPatch(name: String, content: String, doAfter: Boolean = true) { val time = measureTimeMillis { - CTNode.PatchHandler.handle(JsonIO.read(null, content)) + val data = try { + JsonIO.read(null, content) as JsonValue + } catch (e: Exception) { + Log.err("[ContentsTweaker]Failed to parse patch for '$name': $content", e) + return + } + CTNode.PatchHandler.handle(data) if (doAfter) afterHandle() } Log.infoTag("ContentsTweaker", "Load Content Patch '$name' costs $time ms")