Fix crash reporting

Mumfrey
1 parent 9174b3b0
Showing 4 changed files with 19 additions and 23 deletions
src/main/java/com/mumfrey/liteloader/core/LiteLoader.java
src/main/java/com/mumfrey/liteloader/crashreport/CallableLaunchWrapper.java → src/main/java/com/mumfrey/liteloader/crashreport/CrashSectionLaunchWrapper.java
src/main/java/com/mumfrey/liteloader/crashreport/CallableLiteLoaderBrand.java → src/main/java/com/mumfrey/liteloader/crashreport/CrashSectionLiteLoaderBrand.java
src/main/java/com/mumfrey/liteloader/crashreport/CallableLiteLoaderMods.java → src/main/java/com/mumfrey/liteloader/crashreport/CrashSectionLiteLoaderMods.java
@@ -32,9 +32,9 @@ import com.mumfrey.liteloader.common.LoadingProgress;
 import com.mumfrey.liteloader.core.api.LiteLoaderCoreAPI;
 import com.mumfrey.liteloader.core.event.EventProxy;
 import com.mumfrey.liteloader.core.event.HandlerList;
-import com.mumfrey.liteloader.crashreport.CallableLaunchWrapper;
-import com.mumfrey.liteloader.crashreport.CallableLiteLoaderBrand;
-import com.mumfrey.liteloader.crashreport.CallableLiteLoaderMods;
+import com.mumfrey.liteloader.crashreport.CrashSectionLaunchWrapper;
+import com.mumfrey.liteloader.crashreport.CrashSectionLiteLoaderBrand;
+import com.mumfrey.liteloader.crashreport.CrashSectionLiteLoaderMods;
 import com.mumfrey.liteloader.interfaces.FastIterableDeque;
 import com.mumfrey.liteloader.interfaces.Loadable;
 import com.mumfrey.liteloader.interfaces.LoadableMod;
@@ -1022,9 +1022,9 @@ public final class LiteLoader
     private static void populateCrashReport(CrashReport crashReport)
     {
         CrashReportCategory category = crashReport.getCategory(); // crashReport.makeCategoryDepth("Mod System Details", 1);
-        category.addCrashSection("Mod Pack",        new CallableLiteLoaderBrand(crashReport));
-        category.addCrashSection("LiteLoader Mods", new CallableLiteLoaderMods(crashReport));
-        category.addCrashSection("LaunchWrapper",   new CallableLaunchWrapper(crashReport));
+        category.addCrashSection("LiteLoader Brand", new CrashSectionLiteLoaderBrand(crashReport));
+        category.addCrashSection("LiteLoader Mods", new CrashSectionLiteLoaderMods(crashReport));
+        category.addCrashSection("LaunchWrapper", new CrashSectionLaunchWrapper(crashReport));
     }
     static final void createInstance(LoaderEnvironment environment, LoaderProperties properties, LaunchClassLoader classLoader)
@@ -12,22 +12,22 @@ import net.minecraft.crash.CrashReport;
 import net.minecraft.launchwrapper.IClassTransformer;
 import net.minecraft.launchwrapper.Launch;
-public class CallableLaunchWrapper implements Callable<String>
+public class CrashSectionLaunchWrapper
 {
     final CrashReport crashReport;
-    public CallableLaunchWrapper(CrashReport report)
+    public CrashSectionLaunchWrapper(CrashReport report)
     {
         this.crashReport = report;
     }
     /* (non-Javadoc)
-     * @see java.util.concurrent.Callable#call()
+     * @see java.lang.Object#toString()
      */
     @Override
-    public String call() throws Exception
+    public String toString()
     {
-        return CallableLaunchWrapper.generateTransformerList();
+        return CrashSectionLaunchWrapper.generateTransformerList();
     }
     /**
@@ -5,26 +5,24 @@
  */
 package com.mumfrey.liteloader.crashreport;
-import java.util.concurrent.Callable;
-
 import com.mumfrey.liteloader.core.LiteLoader;
 import net.minecraft.crash.CrashReport;
-public class CallableLiteLoaderBrand implements Callable<String>
+public class CrashSectionLiteLoaderBrand
 {
     final CrashReport crashReport;
-    public CallableLiteLoaderBrand(CrashReport report)
+    public CrashSectionLiteLoaderBrand(CrashReport report)
     {
         this.crashReport = report;
     }
     /* (non-Javadoc)
-     * @see java.util.concurrent.Callable#call()
+     * @see java.lang.Object#toString()
      */
     @Override
-    public String call() throws Exception
+    public String toString()
     {
         String brand = null;
         try
@@ -5,26 +5,24 @@
  */
 package com.mumfrey.liteloader.crashreport;
-import java.util.concurrent.Callable;
-
 import com.mumfrey.liteloader.core.LiteLoader;
 import net.minecraft.crash.CrashReport;
-public class CallableLiteLoaderMods implements Callable<String>
+public class CrashSectionLiteLoaderMods
 {
     final CrashReport crashReport;
-    public CallableLiteLoaderMods(CrashReport report)
+    public CrashSectionLiteLoaderMods(CrashReport report)
     {
         this.crashReport = report;
     }
     /* (non-Javadoc)
-     * @see java.util.concurrent.Callable#call()
+     * @see java.lang.Object#toString()
      */
     @Override
-    public String call() throws Exception
+    public String toString()
     {
         try
         {