Lazily get game thread when needed (#547)

Author: SirYwell

spark-fabric/src/main/java/me/lucko/spark/fabric/plugin/FabricClientSparkPlugin.java

@@ -58,7 +58,7 @@ public static void init(FabricSparkMod mod, Minecraft client) {
     }
 
     public FabricClientSparkPlugin(FabricSparkMod mod, Minecraft minecraft) {
-        super(mod, minecraft, ((MinecraftAccessor) minecraft).getGameThread());
+        super(mod, minecraft, ((MinecraftAccessor) minecraft)::getGameThread);
     }
 
     @Override

spark-forge/src/main/java/me/lucko/spark/forge/plugin/ForgeClientSparkPlugin.java

@@ -62,7 +62,7 @@ public static void init(ForgeSparkMod mod, FMLClientSetupEvent event) {
     private Collection<EventListener> listeners = Collections.emptyList();
 
     public ForgeClientSparkPlugin(ForgeSparkMod mod, Minecraft minecraft) {
-        super(mod, minecraft, minecraft.gameThread);
+        super(mod, minecraft, () -> minecraft.gameThread);
     }
 
     @Override

spark-minecraft/src/main/java/me/lucko/spark/minecraft/plugin/MinecraftClientSparkPlugin.java

@@ -32,16 +32,17 @@
 import net.minecraft.client.Minecraft;
 
 import java.util.concurrent.CompletableFuture;
+import java.util.function.Supplier;
 
 public abstract class MinecraftClientSparkPlugin<M extends SparkMinecraftMod, CS> extends MinecraftSparkPlugin<M> implements Command<CS>, SuggestionProvider<CS> {
 
     protected final Minecraft minecraft;
     private final ThreadDumper.GameThread gameThreadDumper;
 
-    public MinecraftClientSparkPlugin(M mod, Minecraft minecraft, Thread gameThread) {
+    public MinecraftClientSparkPlugin(M mod, Minecraft minecraft, Supplier<Thread> gameThreadSupplier) {
         super(mod);
         this.minecraft = minecraft;
-        this.gameThreadDumper = new ThreadDumper.GameThread(() -> gameThread);
+        this.gameThreadDumper = new ThreadDumper.GameThread(gameThreadSupplier);
     }
 
     protected abstract CommandSender createCommandSender(CS source);

spark-neoforge/src/main/java/me/lucko/spark/neoforge/plugin/NeoForgeClientSparkPlugin.java

@@ -56,7 +56,7 @@ public static void init(NeoForgeSparkMod mod, FMLClientSetupEvent event) {
     }
 
     public NeoForgeClientSparkPlugin(NeoForgeSparkMod mod, Minecraft minecraft) {
-        super(mod, minecraft, minecraft.gameThread);
+        super(mod, minecraft, () -> minecraft.gameThread);
     }
 
     @Override