From 09be003d614ba01dc1202fc85a059e0f79380784 Mon Sep 17 00:00:00 2001
From: cpw <cpw+github@weeksfamily.ca>
Date: Sun, 4 Oct 2020 16:40:38 -0400
Subject: [PATCH] Remove redundant call to CrashReport generator - Vanilla is
 doing a crashreport for itself at startup now.

Add a UUID into crashreport that is also logged in all channels at crash report generation time. This will allow to associate crash reports and the logs.

Signed-off-by: cpw <cpw+github@weeksfamily.ca>
---
 src/main/java/net/minecraftforge/common/ForgeMod.java     | 6 ++++++
 .../java/net/minecraftforge/common/MinecraftForge.java    | 3 ---
 src/main/java/net/minecraftforge/fml/ModLoader.java       | 8 +-------
 3 files changed, 7 insertions(+), 10 deletions(-)

diff --git a/src/main/java/net/minecraftforge/common/ForgeMod.java b/src/main/java/net/minecraftforge/common/ForgeMod.java
index 3a928cfe6..1cd28a8c5 100644
--- a/src/main/java/net/minecraftforge/common/ForgeMod.java
+++ b/src/main/java/net/minecraftforge/common/ForgeMod.java
@@ -75,6 +75,7 @@ import org.apache.logging.log4j.MarkerManager;
 
 import java.util.Arrays;
 import java.util.List;
+import java.util.UUID;
 
 @Mod("forge")
 public class ForgeMod implements WorldPersistenceHooks.WorldPersistenceHook
@@ -102,6 +103,11 @@ public class ForgeMod implements WorldPersistenceHooks.WorldPersistenceHook
         LOGGER.info(FORGEMOD,"Forge mod loading, version {}, for MC {} with MCP {}", ForgeVersion.getVersion(), MCPVersion.getMCVersion(), MCPVersion.getMCPVersion());
         INSTANCE = this;
         MinecraftForge.initialize();
+        CrashReportExtender.registerCrashCallable("Crash Report UUID", ()-> {
+            final UUID uuid = UUID.randomUUID();
+            LOGGER.fatal("Preparing crash report with UUID {}", uuid);
+            return uuid.toString();
+        });
         WorldPersistenceHooks.addHook(this);
         WorldPersistenceHooks.addHook(new FMLWorldPersistenceHook());
         final IEventBus modEventBus = FMLJavaModLoadingContext.get().getModEventBus();
diff --git a/src/main/java/net/minecraftforge/common/MinecraftForge.java b/src/main/java/net/minecraftforge/common/MinecraftForge.java
index 1ee2063c2..e6ebdde06 100644
--- a/src/main/java/net/minecraftforge/common/MinecraftForge.java
+++ b/src/main/java/net/minecraftforge/common/MinecraftForge.java
@@ -53,9 +53,6 @@ public class MinecraftForge
 
        UsernameCache.load();
        ForgeHooks.initTools();
-
-       //For all the normal CrashReport classes to be defined. We're in MC's classloader so this should all be fine
-       new CrashReport("ThisIsFake", new Exception("Not real"));
    }
 
 
diff --git a/src/main/java/net/minecraftforge/fml/ModLoader.java b/src/main/java/net/minecraftforge/fml/ModLoader.java
index 3d0d7fdcd..b49c197ae 100644
--- a/src/main/java/net/minecraftforge/fml/ModLoader.java
+++ b/src/main/java/net/minecraftforge/fml/ModLoader.java
@@ -44,13 +44,7 @@ import net.minecraftforge.versions.forge.ForgeVersion;
 import org.apache.logging.log4j.LogManager;
 import org.apache.logging.log4j.Logger;
 
-import java.util.Arrays;
-import java.util.Collection;
-import java.util.Collections;
-import java.util.List;
-import java.util.Map;
-import java.util.Objects;
-import java.util.Optional;
+import java.util.*;
 import java.util.concurrent.CompletableFuture;
 import java.util.concurrent.CompletionException;
 import java.util.concurrent.Executor;