Fix: method desc in addCrashReportHeader

xfl03 · Jan 7, 2023 · 2358995 · 2358995
1 parent c18451d
commit 2358995
Show file tree

Hide file tree

Showing 5 changed files with 24 additions and 6 deletions.
diff --git a/build.gradle b/build.gradle
@@ -76,7 +76,7 @@ dependencies {
 }
 
 jar {
-    exclude('net/minecraftforge/**')
+    exclude('net/**')
     manifest {
         attributes([
             "Specification-Title": "morecrashinfo",

diff --git a/src/main/java/me/xfl03/morecrashinfo/crash/CoreModList.java b/src/main/java/me/xfl03/morecrashinfo/crash/CoreModList.java
@@ -44,7 +44,7 @@ public String get() {
         try {
             return call();
         } catch (Exception e) {
-            return null;
+            return e.toString();
         }
     }
 }
diff --git a/src/main/java/me/xfl03/morecrashinfo/crash/ModList.java b/src/main/java/me/xfl03/morecrashinfo/crash/ModList.java
@@ -38,7 +38,7 @@ public String get() {
         try {
             return call();
         } catch (Exception e) {
-            return null;
+            return e.toString();
         }
     }
 }
diff --git a/src/main/resources/META-INF/mods.toml b/src/main/resources/META-INF/mods.toml
@@ -1,14 +1,14 @@
 modLoader="javafml"
 loaderVersion="[25,)"
 issueTrackerURL="http://github.com/xfl03/MoreCrashInfo/issues"
+license="GPL-3.0-only"
 [[mods]]
 modId="morecrashinfo"
 version="1.1.0"
 displayName="MoreCrashInfo"
 displayURL="http://github.com/xfl03/MoreCrashInfo"
 credits=""
 authors="xfl03"
-license="GPL-3.0-only"
 description='''
 Display more info in crash report.
 '''

diff --git a/src/main/resources/crashtransformers.js b/src/main/resources/crashtransformers.js
@@ -1,12 +1,15 @@
 var InsnNode = Java.type('org.objectweb.asm.tree.InsnNode');
 var MethodInsnNode = Java.type('org.objectweb.asm.tree.MethodInsnNode');
 var VarInsnNode = Java.type('org.objectweb.asm.tree.VarInsnNode');
-
 var Opcodes = Java.type('org.objectweb.asm.Opcodes');
 
+var ASMAPI = Java.type('net.minecraftforge.coremod.api.ASMAPI');
+
 function transformCrashReportExtenderTransformer(cn) {
+    ASMAPI.log("INFO", "Transform class {}", cn.name);
     cn.methods.forEach(function (mn) {
-        if (mn.name === 'addCrashReportHeader') {
+        if (mn.name === 'addCrashReportHeader' && mn.desc === '(Ljava/lang/StringBuilder;Lnet/minecraft/crash/CrashReport;)V') {
+            ASMAPI.log("INFO", "Transform method {} {}", mn.name, mn.desc);
             mn.instructions.clear();
             mn.instructions.add(new VarInsnNode(Opcodes.ALOAD, 0));
             mn.instructions.add(new VarInsnNode(Opcodes.ALOAD, 1));
@@ -15,16 +18,31 @@ function transformCrashReportExtenderTransformer(cn) {
                 "addCrashReportHeader",
                 "(Ljava/lang/StringBuilder;Lnet/minecraft/crash/CrashReport;)V", false));
             mn.instructions.add(new InsnNode(Opcodes.RETURN));
+            ASMAPI.log("INFO", "Transform method finished");
+        } else if (mn.name === 'addCrashReportHeader' && mn.desc === '(Ljava/lang/StringBuilder;Lnet/minecraft/CrashReport;)V') {
+            ASMAPI.log("INFO", "Transform method {} {}", mn.name, mn.desc);
+            mn.instructions.clear();
+            mn.instructions.add(new VarInsnNode(Opcodes.ALOAD, 0));
+            mn.instructions.add(new VarInsnNode(Opcodes.ALOAD, 1));
+            mn.instructions.add(new MethodInsnNode(Opcodes.INVOKESTATIC,
+                "me/xfl03/morecrashinfo/handler/CrashHandler",
+                "addCrashReportHeader",
+                "(Ljava/lang/StringBuilder;Lnet/minecraft/CrashReport;)V", false));
+            mn.instructions.add(new InsnNode(Opcodes.RETURN));
+            ASMAPI.log("INFO", "Transform method finished");
         } else if (mn.name === 'generateEnhancedStackTrace' && mn.desc === '(Ljava/lang/Throwable;)Ljava/lang/String;') {
+            ASMAPI.log("INFO", "Transform method {} {}", mn.name, mn.desc);
             mn.instructions.clear();
             mn.instructions.add(new VarInsnNode(Opcodes.ALOAD, 0));
             mn.instructions.add(new MethodInsnNode(Opcodes.INVOKESTATIC,
                 "me/xfl03/morecrashinfo/handler/CrashHandler",
                 "generateEnhancedStackTrace",
                 "(Ljava/lang/Throwable;)Ljava/lang/String;", false));
             mn.instructions.add(new InsnNode(Opcodes.ARETURN));
+            ASMAPI.log("INFO", "Transform method finished");
         }
     });
+    ASMAPI.log("INFO", "Transform class finished");
     return cn;
 }