Refactor initializer code

fabric/src/main/java/com/seibel/distanthorizons/fabric/FabricClientMain.java

@@ -1,35 +0,0 @@
-package com.seibel.distanthorizons.fabric;
-
-import com.seibel.distanthorizons.common.LodCommonMain;
-import com.seibel.distanthorizons.common.wrappers.DependencySetup;
-import net.fabricmc.api.ClientModInitializer;
-import net.fabricmc.api.EnvType;
-import net.fabricmc.api.Environment;
-import net.fabricmc.fabric.api.client.event.lifecycle.v1.ClientLifecycleEvents;
-
-@Environment(EnvType.CLIENT)
-public class FabricClientMain implements ClientModInitializer
-{
-	public static FabricClientProxy client_proxy;
-	public static FabricServerProxy server_proxy;
-	
-	
-	// Do if implements ClientModInitializer
-	// This loads the mod before minecraft loads which causes a lot of issues
-	@Override
-	public void onInitializeClient()
-	{
-		DependencySetup.createClientBindings();
-		FabricMain.init();
-		LodCommonMain.initConfig();
-		
-		server_proxy = new FabricServerProxy(false);
-		server_proxy.registerEvents();
-		
-		client_proxy = new FabricClientProxy();
-		client_proxy.registerEvents();
-		
-		ClientLifecycleEvents.CLIENT_STARTED.register((mc) -> FabricMain.postInit());
-	}
-	
-}

fabric/src/main/java/com/seibel/distanthorizons/fabric/FabricClientProxy.java

@@ -19,6 +19,7 @@
 
 package com.seibel.distanthorizons.fabric;
 
+import com.seibel.distanthorizons.common.IEventProxy;
 import com.seibel.distanthorizons.common.rendering.SeamlessOverdraw;
 import com.seibel.distanthorizons.common.wrappers.McObjectConverter;
 import com.seibel.distanthorizons.common.wrappers.world.ClientLevelWrapper;
@@ -72,7 +73,7 @@ import org.lwjgl.opengl.GL15;
  * @version 2023-7-27
  */
 @Environment(EnvType.CLIENT)
-public class FabricClientProxy
+public class FabricClientProxy implements IEventProxy
 {
 	private final ClientApi clientApi = ClientApi.INSTANCE;
 	private static final IMinecraftClientWrapper MC = SingletonInjector.INSTANCE.get(IMinecraftClientWrapper.class);

fabric/src/main/java/com/seibel/distanthorizons/fabric/FabricDedicatedServerMain.java

@@ -1,56 +0,0 @@
-package com.seibel.distanthorizons.fabric;
-
-import com.seibel.distanthorizons.common.LodCommonMain;
-import com.seibel.distanthorizons.common.wrappers.DependencySetup;
-import com.seibel.distanthorizons.common.wrappers.minecraft.MinecraftDedicatedServerWrapper;
-import com.seibel.distanthorizons.core.config.eventHandlers.presets.ThreadPresetConfigEventHandler;
-import com.seibel.distanthorizons.core.util.LodUtil;
-import net.fabricmc.api.DedicatedServerModInitializer;
-import net.fabricmc.api.EnvType;
-import net.fabricmc.api.Environment;
-import net.fabricmc.fabric.api.event.lifecycle.v1.ServerLifecycleEvents;
-import net.minecraft.server.dedicated.DedicatedServer;
-import org.apache.logging.log4j.LogManager;
-import org.apache.logging.log4j.Logger;
-
-@Environment(EnvType.SERVER)
-public class FabricDedicatedServerMain implements DedicatedServerModInitializer
-{
-	private static final Logger LOGGER = LogManager.getLogger(FabricDedicatedServerMain.class.getSimpleName());
-	
-	public static FabricServerProxy server_proxy;
-	public boolean hasPostSetupDone = false;
-	
-	@Override
-	public void onInitializeServer()
-	{
-		DependencySetup.createServerBindings();
-		FabricMain.init();
-		
-		// FIXME this prevents returning uninitialized Config values
-		//  resulting from a circular reference mid-initialization in a static class
-		// ThreadPresetConfigEventHandler <-> Config
-		ThreadPresetConfigEventHandler.INSTANCE.toString();
-		
-		server_proxy = new FabricServerProxy(true);
-		server_proxy.registerEvents();
-		
-		ServerLifecycleEvents.SERVER_STARTING.register((server) ->
-		{
-			if (this.hasPostSetupDone)
-			{
-				return;
-			}
-			
-			this.hasPostSetupDone = true;
-			LodUtil.assertTrue(server instanceof DedicatedServer);
-			
-			MinecraftDedicatedServerWrapper.INSTANCE.dedicatedServer = (DedicatedServer) server;
-			LodCommonMain.initConfig();
-			FabricMain.postInit();
-			
-			LOGGER.info("Dedicated server initialized at " + server.getServerDirectory());
-		});
-	}
-	
-}

fabric/src/main/java/com/seibel/distanthorizons/fabric/FabricMain.java

@@ -19,25 +19,29 @@
 
 package com.seibel.distanthorizons.fabric;
 
-import com.seibel.distanthorizons.api.methods.events.abstractEvents.DhApiAfterDhInitEvent;
-import com.seibel.distanthorizons.api.methods.events.abstractEvents.DhApiBeforeDhInitEvent;
-import com.seibel.distanthorizons.core.config.ConfigBase;
-import com.seibel.distanthorizons.core.jar.ModJarInfo;
-import com.seibel.distanthorizons.core.wrapperInterfaces.minecraft.IMinecraftClientWrapper;
-import com.seibel.distanthorizons.core.wrapperInterfaces.modAccessor.*;
-import com.seibel.distanthorizons.common.LodCommonMain;
-import com.seibel.distanthorizons.coreapi.ModInfo;
+import com.mojang.brigadier.CommandDispatcher;
+import com.seibel.distanthorizons.common.AbstractModInitializer;
+import com.seibel.distanthorizons.common.IEventProxy;
 import com.seibel.distanthorizons.core.config.Config;
-import com.seibel.distanthorizons.coreapi.DependencyInjection.ApiEventInjector;
+import com.seibel.distanthorizons.core.config.ConfigBase;
 import com.seibel.distanthorizons.core.dependencyInjection.ModAccessorInjector;
 import com.seibel.distanthorizons.core.dependencyInjection.SingletonInjector;
-import com.seibel.distanthorizons.core.logging.DhLoggerBuilder;
+import com.seibel.distanthorizons.core.wrapperInterfaces.minecraft.IMinecraftClientWrapper;
+import com.seibel.distanthorizons.core.wrapperInterfaces.modAccessor.*;
+import com.seibel.distanthorizons.coreapi.ModInfo;
 import com.seibel.distanthorizons.fabric.wrappers.FabricDependencySetup;
 import com.seibel.distanthorizons.fabric.wrappers.modAccessor.*;
-
-import org.apache.logging.log4j.Logger;
+import net.fabricmc.api.ClientModInitializer;
+import net.fabricmc.api.DedicatedServerModInitializer;
+import net.fabricmc.fabric.api.client.event.lifecycle.v1.ClientLifecycleEvents;
+import net.fabricmc.fabric.api.event.Event;
+import net.fabricmc.fabric.api.event.lifecycle.v1.ServerLifecycleEvents;
+import net.minecraft.commands.CommandSourceStack;
+import net.minecraft.resources.ResourceLocation;
+import net.minecraft.server.MinecraftServer;
 
 import javax.swing.*;
+import java.util.function.Consumer;
 
 /**
  * Initialize and setup the Mod. <br>
@@ -48,44 +52,33 @@ import javax.swing.*;
  * @author Ran
  * @version 9-2-2022
  */
-public class FabricMain
+public class FabricMain extends AbstractModInitializer implements ClientModInitializer, DedicatedServerModInitializer
 {
-	private static final Logger LOGGER = DhLoggerBuilder.getLogger();
+	private static final ResourceLocation INITIAL_PHASE = ResourceLocation.tryParse("distanthorizons:dedicated_server_initial");
 	
-	public static void postInit()
+	
+	
+	@Override
+	protected void createInitialBindings()
 	{
-		LOGGER.info("Post-Initializing Mod");
-		FabricDependencySetup.runDelayedSetup();
-		
-		if (Config.Client.Advanced.Graphics.Fog.disableVanillaFog.get() && SingletonInjector.INSTANCE.get(IModChecker.class).isModLoaded("bclib"))
-			ModAccessorInjector.INSTANCE.get(IBCLibAccessor.class).setRenderCustomFog(false); // Remove BCLib's fog
-		#if MC_VER >= MC_1_20_1
-		if (SingletonInjector.INSTANCE.get(IModChecker.class).isModLoaded("sodium"))
-			ModAccessorInjector.INSTANCE.get(ISodiumAccessor.class).setFogOcclusion(false); // FIXME: This is a tmp fix for sodium 0.5.0, and 0.5.1. This is fixed in sodium 0.5.2
-		#endif
-		
-		if (ConfigBase.INSTANCE == null)
-			throw new IllegalStateException("Config was not initialized. Make sure to call LodCommonMain.initConfig() before calling this method.");
-		
-		LOGGER.info("Mod Post-Initialized");
+		FabricDependencySetup.createInitialBindings();
 	}
 	
-	
-	// This loads the mod after minecraft loads which doesn't causes a lot of issues
-	public static void init()
+	@Override
+	protected IEventProxy createClientProxy()
+	{
+		return new FabricClientProxy();
+	}
+	
+	@Override
+	protected IEventProxy createServerProxy(boolean isDedicated)
+	{
+		return new FabricServerProxy(isDedicated);
+	}
+	
+	@Override
+	protected void initializeModCompat()
 	{
-		ApiEventInjector.INSTANCE.fireAllEvents(DhApiBeforeDhInitEvent.class, null);
-		
-		LOGGER.info("Initializing Mod");
-		LodCommonMain.startup(null);
-		FabricDependencySetup.createInitialBindings();
-		LOGGER.info(ModInfo.READABLE_NAME + ", Version: " + ModInfo.VERSION);
-		
-		// Print git info (Useful for dev builds)
-		LOGGER.info("DH Branch: " + ModJarInfo.Git_Branch);
-		LOGGER.info("DH Commit: " + ModJarInfo.Git_Commit);
-		LOGGER.info("DH Jar Build Source: " + ModJarInfo.Build_Source);
-		
 		IModChecker modChecker = SingletonInjector.INSTANCE.get(IModChecker.class);
 		if (modChecker.isModLoaded("sodium"))
 		{
@@ -105,30 +98,52 @@ public class FabricMain
 				mc.crashMinecraft(errorMessage, new Exception(exceptionError));
 			}
 		}
-		if (modChecker.isModLoaded("starlight"))
-		{
-			ModAccessorInjector.INSTANCE.bind(IStarlightAccessor.class, new StarlightAccessor());
-		}
-		if (modChecker.isModLoaded("optifine"))
-		{
-			ModAccessorInjector.INSTANCE.bind(IOptifineAccessor.class, new OptifineAccessor());
-		}
-		if (modChecker.isModLoaded("bclib"))
-		{
-			ModAccessorInjector.INSTANCE.bind(IBCLibAccessor.class, new BCLibAccessor());
-		}
 		
+		this.tryCreateModCompatAccessor("starlight", IStarlightAccessor.class, StarlightAccessor::new);
+		this.tryCreateModCompatAccessor("optifine", IOptifineAccessor.class, OptifineAccessor::new);
+		this.tryCreateModCompatAccessor("bclib", IBCLibAccessor.class, BCLibAccessor::new);
 		#if MC_VER != MC_1_17_1 && MC_VER <= MC_1_20_1
 		// 1.17.1 won't support this since there isn't a matching Iris version
-		if (modChecker.isModLoaded("iris"))
-		{
-			ModAccessorInjector.INSTANCE.bind(IIrisAccessor.class, new IrisAccessor());
-		}
+		this.tryCreateModCompatAccessor("iris", IIrisAccessor.class, IrisAccessor::new);
+		#endif
+	}
+	
+	@Override
+	protected void subscribeRegisterCommandsEvent(Consumer<CommandDispatcher<CommandSourceStack>> eventHandler)
+	{
+		// fabric-command-api-v1/v2
+		//CommandRegistrationCallback.EVENT.register((dispatcher, registryAccess #if MC_VER >= MC_1_19_2 , environment #endif ) -> {
+		//	eventHandler.accept(dispatcher);
+		//});
+	}
+	
+	@Override
+	protected void subscribeClientStartedEvent(Runnable eventHandler)
+	{
+		ClientLifecycleEvents.CLIENT_STARTED.register((mc) -> eventHandler.run());
+	}
+	
+	@Override
+	protected void subscribeServerStartingEvent(Consumer<MinecraftServer> eventHandler)
+	{
+		ServerLifecycleEvents.SERVER_STARTING.addPhaseOrdering(INITIAL_PHASE, Event.DEFAULT_PHASE);
+		ServerLifecycleEvents.SERVER_STARTING.register(INITIAL_PHASE, eventHandler::accept);
+	}
+	
+	@Override
+	protected void runDelayedSetup()
+	{
+		FabricDependencySetup.runDelayedSetup();
+		
+		if (Config.Client.Advanced.Graphics.Fog.disableVanillaFog.get() && SingletonInjector.INSTANCE.get(IModChecker.class).isModLoaded("bclib"))
+			ModAccessorInjector.INSTANCE.get(IBCLibAccessor.class).setRenderCustomFog(false); // Remove BCLib's fog
+		#if MC_VER >= MC_1_20_1
+		if (SingletonInjector.INSTANCE.get(IModChecker.class).isModLoaded("sodium"))
+			ModAccessorInjector.INSTANCE.get(ISodiumAccessor.class).setFogOcclusion(false); // FIXME: This is a tmp fix for sodium 0.5.0, and 0.5.1. This is fixed in sodium 0.5.2
 		#endif
 		
-		LOGGER.info(ModInfo.READABLE_NAME + " Initialized");
-		
-		ApiEventInjector.INSTANCE.fireAllEvents(DhApiAfterDhInitEvent.class, null);
+		if (ConfigBase.INSTANCE == null)
+			throw new IllegalStateException("Config was not initialized. Make sure to call LodCommonMain.initConfig() before calling this method.");
 	}
 	
 }

fabric/src/main/java/com/seibel/distanthorizons/fabric/FabricServerProxy.java

@@ -1,5 +1,6 @@
 package com.seibel.distanthorizons.fabric;
 
+import com.seibel.distanthorizons.common.IEventProxy;
 import com.seibel.distanthorizons.common.wrappers.chunk.ChunkWrapper;
 import com.seibel.distanthorizons.common.wrappers.misc.ServerPlayerWrapper;
 import com.seibel.distanthorizons.common.wrappers.world.ClientLevelWrapper;
@@ -32,7 +33,7 @@ import java.util.function.Supplier;
  * @author Tomlee
  * @version 5-11-2022
  */
-public class FabricServerProxy
+public class FabricServerProxy implements IEventProxy
 {
 	private static final ServerApi SERVER_API = ServerApi.INSTANCE;
 	private static final Logger LOGGER = DhLoggerBuilder.getLogger();

fabric/src/main/resources/fabric.mod.json

@@ -24,10 +24,10 @@
     "environment": "*",
     "entrypoints": {
         "client": [
-            "com.seibel.distanthorizons.fabric.FabricClientMain"
+            "com.seibel.distanthorizons.fabric.FabricMain"
         ],
         "server": [
-            "com.seibel.distanthorizons.fabric.FabricDedicatedServerMain"
+            "com.seibel.distanthorizons.fabric.FabricMain"
         ],
         "modmenu": [
             "com.seibel.distanthorizons.fabric.wrappers.config.ModMenuIntegration"