Cleanups related to sided events, fix server potential crash

Author: coderbot16

patchwork-dispatcher/src/main/java/com/patchworkmc/impl/Patchwork.java

@@ -22,7 +22,9 @@
 import java.util.HashMap;
 import java.util.Map;
 import java.util.function.Function;
+import java.util.function.Supplier;
 
+import net.minecraftforge.api.distmarker.Dist;
 import net.minecraftforge.common.MinecraftForge;
 import net.minecraftforge.eventbus.api.Event;
 import net.minecraftforge.fml.DistExecutor;
@@ -41,6 +43,7 @@
 import org.apache.logging.log4j.Logger;
 
 import net.minecraft.client.MinecraftClient;
+import net.minecraft.server.dedicated.DedicatedServer;
 
 import net.fabricmc.api.ModInitializer;
 import net.fabricmc.loader.api.FabricLoader;
@@ -90,19 +93,18 @@ public void onInitialize() {
 
 		RegistryEventDispatcher.dispatchRegistryEvents(event -> dispatch(mods, event));
 		dispatch(mods, FMLCommonSetupEvent::new);
-		DistExecutor.runForDist(
-				() -> () -> {
-					dispatch(mods, container -> new FMLClientSetupEvent(MinecraftClient::getInstance, container));
-
-					return "void isn't a valid return value...";
-				},
-				() -> () -> {
-					// TODO: Get the server, the LogicalSidedProvider that's needed for this to be done easily will be merged in the networking PR
-					dispatch(mods, container -> new FMLDedicatedServerSetupEvent(null, container));
-
-					return "void isn't a valid return value...";
-				}
-		);
+
+		DistExecutor.runWhenOn(Dist.CLIENT, () -> () -> {
+			dispatch(mods, container -> new FMLClientSetupEvent(MinecraftClient::getInstance, container));
+		});
+
+		DistExecutor.runWhenOn(Dist.DEDICATED_SERVER, () -> () -> {
+			Object gameInstance = FabricLoader.getInstance().getGameInstance();
+			Supplier<DedicatedServer> supplier = () -> (DedicatedServer) gameInstance;
+
+			dispatch(mods, container -> new FMLDedicatedServerSetupEvent(supplier, container));
+		});
+
 		dispatch(mods, InterModEnqueueEvent::new);
 		dispatch(mods, InterModProcessEvent::new);
 		dispatch(mods, FMLLoadCompleteEvent::new);

patchwork-fml/src/main/java/com/patchworkmc/impl/fml/PatchworkFML.java

@@ -19,16 +19,27 @@
 
 package com.patchworkmc.impl.fml;
 
+import net.minecraftforge.api.distmarker.Dist;
+import net.minecraftforge.fml.DistExecutor;
 import net.minecraftforge.fml.LogicalSidedProvider;
 
+import net.minecraft.client.MinecraftClient;
+import net.minecraft.server.MinecraftServer;
+
 import net.fabricmc.api.ModInitializer;
 import net.fabricmc.fabric.api.event.server.ServerStartCallback;
 import net.fabricmc.fabric.api.event.server.ServerStopCallback;
+import net.fabricmc.loader.api.FabricLoader;
 
 public class PatchworkFML implements ModInitializer {
 	@Override
 	public void onInitialize() {
 		ServerStartCallback.EVENT.register(server -> LogicalSidedProvider.setServer(() -> server));
 		ServerStopCallback.EVENT.register(server -> LogicalSidedProvider.setServer(null));
+
+		Object instance = FabricLoader.getInstance().getGameInstance();
+
+		DistExecutor.runWhenOn(Dist.CLIENT, () -> () -> LogicalSidedProvider.setClient(() -> (MinecraftClient) instance));
+		DistExecutor.runWhenOn(Dist.DEDICATED_SERVER, () -> () -> LogicalSidedProvider.setServer(() -> (MinecraftServer) instance));
 	}
 }

patchwork-fml/src/main/java/net/minecraftforge/fml/LogicalSidedProvider.java

@@ -27,9 +27,6 @@
 import net.minecraft.server.MinecraftServer;
 import net.minecraft.world.World;
 
-import net.fabricmc.api.EnvType;
-import net.fabricmc.loader.api.FabricLoader;
-
 import com.patchworkmc.impl.fml.PatchworkFML;
 
 public enum LogicalSidedProvider {
@@ -43,13 +40,6 @@ public enum LogicalSidedProvider {
 	private static Supplier<MinecraftClient> client;
 	private static Supplier<MinecraftServer> server;
 
-	// Patchwork: since the client never changes we can just set it directly
-	static {
-		if (FabricLoader.getInstance().getEnvironmentType().equals(EnvType.CLIENT)) {
-			client = () -> (MinecraftClient) FabricLoader.getInstance().getGameInstance();
-		}
-	}
-
 	private final Function<Supplier<MinecraftClient>, ?> clientSide;
 	private final Function<Supplier<MinecraftServer>, ?> serverSide;
 
@@ -58,6 +48,10 @@ public enum LogicalSidedProvider {
 		this.serverSide = serverSide;
 	}
 
+	public static void setClient(Supplier<MinecraftClient> client) {
+		LogicalSidedProvider.client = client;
+	}
+
 	/**
 	 * Called by callbacks registered in {@link PatchworkFML}.
 	 */