From 98d4fa6dc27b8a41997781d65cc55d9b3e3f4649 Mon Sep 17 00:00:00 2001 From: Marc Hermans Date: Wed, 20 Jul 2022 19:56:38 +0200 Subject: [PATCH] Output the full path in a crash report so it is easier to find the outer mod when a crash in Jar-In-Jar occurs. (#8856) --- .../logging/CrashReportExtender.java | 2 +- .../resources/META-INF/jarjar/jijroot-1.3.jar | Bin 0 -> 26207 bytes .../resources/META-INF/jarjar/metadata.json | 3 ++- 3 files changed, 3 insertions(+), 2 deletions(-) create mode 100644 src/test/resources/META-INF/jarjar/jijroot-1.3.jar diff --git a/src/main/java/net/minecraftforge/logging/CrashReportExtender.java b/src/main/java/net/minecraftforge/logging/CrashReportExtender.java index ce2e2e46ef..736896112c 100644 --- a/src/main/java/net/minecraftforge/logging/CrashReportExtender.java +++ b/src/main/java/net/minecraftforge/logging/CrashReportExtender.java @@ -64,7 +64,7 @@ public class CrashReportExtender } if (cause != null) category.applyStackTrace(cause); - category.setDetail("Mod File", () -> modInfo.map(IModInfo::getOwningFile).map(t-> t.getFile().getFileName()).orElse("NO FILE INFO")); + category.setDetail("Mod File", () -> modInfo.map(IModInfo::getOwningFile).map(t-> t.getFile().getFilePath().toUri().getPath()).orElse("NO FILE INFO")); category.setDetail("Failure message", () -> mle.getCleanMessage().replace("\n", "\n\t\t")); category.setDetail("Mod Version", () -> modInfo.map(IModInfo::getVersion).map(Object::toString).orElse("NO MOD INFO AVAILABLE")); category.setDetail("Mod Issue URL", () -> modInfo.map(IModInfo::getOwningFile).map(IModFileInfo.class::cast).flatMap(mfi->mfi.getConfig().getConfigElement("issueTrackerURL")).orElse("NOT PROVIDED")); diff --git a/src/test/resources/META-INF/jarjar/jijroot-1.3.jar b/src/test/resources/META-INF/jarjar/jijroot-1.3.jar new file mode 100644 index 0000000000000000000000000000000000000000..31093ce15cbf7e487ac042a8a4ceef77b7f76085 GIT binary patch literal 26207 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 U=J!RUw<8D=46Oa_G8owZ1DlflvH$=8 literal 0 HcmV?d00001 diff --git a/src/test/resources/META-INF/jarjar/metadata.json b/src/test/resources/META-INF/jarjar/metadata.json index 4b0210ed9c..e0fb91ebeb 100644 --- a/src/test/resources/META-INF/jarjar/metadata.json +++ b/src/test/resources/META-INF/jarjar/metadata.json @@ -9,7 +9,8 @@ "range": "[1.0,)", "artifactVersion": "1.2" }, - "path": "META-INF/jarjar/ForgeJiJTestMod-1.2.jar" + "path": "META-INF/jarjar/ForgeJiJTestMod-1.2.jar", + "_Broken_path": "META-INF/jarjar/jijroot-1.3.jar" } ] } \ No newline at end of file