diff --git a/src/main/java/vfyjxf/bettercrashes/mixins/minecraft/CrashReportMixin.java b/src/main/java/vfyjxf/bettercrashes/mixins/minecraft/CrashReportMixin.java index 563f545..4c0572e 100644 --- a/src/main/java/vfyjxf/bettercrashes/mixins/minecraft/CrashReportMixin.java +++ b/src/main/java/vfyjxf/bettercrashes/mixins/minecraft/CrashReportMixin.java @@ -111,7 +111,7 @@ public class CrashReportMixin implements IPatchedCrashReport { .append("Time: ").append(new SimpleDateFormat("yyyy-MM-dd HH:mm:ss z").format(new Date())).append("\n") .append("Description: ").append(description).append("\n\n") .append(stacktraceToString(cause).replace("\t", " ")) // Vanilla's getCauseStackTraceOrString doesn't - // print causes and suppressed + // print causes and suppressed // exceptions .append( "\n\nA detailed walkthrough of the error, its code path and all known details is as follows:\n"); diff --git a/src/main/java/vfyjxf/bettercrashes/mixins/minecraft/MinecraftMixin.java b/src/main/java/vfyjxf/bettercrashes/mixins/minecraft/MinecraftMixin.java index ff928cc..bd2a6c8 100644 --- a/src/main/java/vfyjxf/bettercrashes/mixins/minecraft/MinecraftMixin.java +++ b/src/main/java/vfyjxf/bettercrashes/mixins/minecraft/MinecraftMixin.java @@ -12,7 +12,11 @@ import java.util.Queue; import net.minecraft.client.Minecraft; import net.minecraft.client.audio.SoundHandler; -import net.minecraft.client.gui.*; +import net.minecraft.client.gui.FontRenderer; +import net.minecraft.client.gui.GuiIngame; +import net.minecraft.client.gui.GuiMainMenu; +import net.minecraft.client.gui.GuiScreen; +import net.minecraft.client.gui.ScaledResolution; import net.minecraft.client.multiplayer.WorldClient; import net.minecraft.client.network.NetHandlerPlayClient; import net.minecraft.client.renderer.EntityRenderer; @@ -209,8 +213,8 @@ public abstract class MinecraftMixin { } /** - * @author Runemoro * @param report + * @author Runemoro */ public void displayCrashScreen(CrashReport report) { try { @@ -290,8 +294,8 @@ public abstract class MinecraftMixin { } /** - * @author Runemoro * @param report + * @author Runemoro */ public void displayInitErrorScreen(CrashReport report) { if (shouldGenerateCrashLog()) { @@ -332,8 +336,8 @@ public abstract class MinecraftMixin { } /** - * @author Runemoro * @param screen + * @author Runemoro */ private void runGUILoop(GuiScreen screen) throws IOException { displayGuiScreen(screen); @@ -395,9 +399,9 @@ public abstract class MinecraftMixin { } /** + * @param report * @author Runemoro * @reason - * @param report */ @Overwrite public void displayCrashReport(CrashReport report) { diff --git a/src/main/java/vfyjxf/bettercrashes/utils/CrashUtils.java b/src/main/java/vfyjxf/bettercrashes/utils/CrashUtils.java index b530ffd..d24f025 100644 --- a/src/main/java/vfyjxf/bettercrashes/utils/CrashUtils.java +++ b/src/main/java/vfyjxf/bettercrashes/utils/CrashUtils.java @@ -6,7 +6,7 @@ package vfyjxf.bettercrashes.utils; -import java.awt.*; +import java.awt.Desktop; import java.io.File; import java.io.IOException; import java.net.URI; @@ -25,8 +25,8 @@ import vfyjxf.bettercrashes.BetterCrashes; public class CrashUtils { /** - * @author Runemoro * @param report + * @author Runemoro */ public static void outputReport(CrashReport report) { try { @@ -63,9 +63,9 @@ public class CrashUtils { } /** - * @author vfyjxf * @param crashReport * @throws IOException + * @author vfyjxf */ public static void openCrashReport(CrashReport crashReport) throws IOException { diff --git a/src/main/java/vfyjxf/bettercrashes/utils/ModIdentifier.java b/src/main/java/vfyjxf/bettercrashes/utils/ModIdentifier.java index cd627fa..b93ab6e 100644 --- a/src/main/java/vfyjxf/bettercrashes/utils/ModIdentifier.java +++ b/src/main/java/vfyjxf/bettercrashes/utils/ModIdentifier.java @@ -12,7 +12,12 @@ import java.lang.reflect.Method; import java.net.URI; import java.net.URISyntaxException; import java.net.URL; -import java.util.*; +import java.util.Collections; +import java.util.HashMap; +import java.util.HashSet; +import java.util.LinkedHashSet; +import java.util.Map; +import java.util.Set; import net.minecraft.launchwrapper.Launch; import net.minecraft.launchwrapper.LaunchClassLoader; @@ -98,7 +103,7 @@ public final class ModIdentifier { try { modMap.remove(Loader.instance().getMinecraftModContainer().getSource()); // Ignore minecraft jar (minecraft) modMap.remove(Loader.instance().getIndexedModList().get("FML").getSource()); // Ignore forge jar (FML, - // forge) + // forge) } catch (NullPointerException ignored) { // Workaround for https://github.com/MinecraftForge/MinecraftForge/issues/4919 } diff --git a/src/main/java/vfyjxf/bettercrashes/utils/StacktraceDeobfuscator.java b/src/main/java/vfyjxf/bettercrashes/utils/StacktraceDeobfuscator.java index e215e9e..7ffe6b7 100644 --- a/src/main/java/vfyjxf/bettercrashes/utils/StacktraceDeobfuscator.java +++ b/src/main/java/vfyjxf/bettercrashes/utils/StacktraceDeobfuscator.java @@ -12,7 +12,12 @@ import java.io.IOException; import java.io.InputStream; import java.net.HttpURLConnection; import java.net.URL; -import java.util.*; +import java.util.ArrayDeque; +import java.util.Collections; +import java.util.Deque; +import java.util.HashMap; +import java.util.Map; +import java.util.Scanner; import com.google.common.hash.Hasher; import com.google.common.hash.Hashing; @@ -28,7 +33,7 @@ public final class StacktraceDeobfuscator { private static final String MAPPING_METHODS_CSV_HASH = "63de115ead3e848e529de81e81ada9dff694e50fb5c6d92ec1e9037fe50ca191"; // sha256 private static final boolean DEBUG_IN_DEV = false; // Makes this MCP -> SRG for testing in dev. Don't forget to set - // to false when done! + // to false when done! private static HashMap srgMcpMethodMap = null; /**