diff --git a/core b/core index 1fc648737..c7a84831e 160000 --- a/core +++ b/core @@ -1 +1 @@ -Subproject commit 1fc6487374d36adf6c355b3dda6ad35d408d20f2 +Subproject commit c7a84831e9d66d48598145d0b283934507b1c8c1 diff --git a/fabric/src/main/java/com/seibel/lod/FabricMain.java b/fabric/src/main/java/com/seibel/lod/FabricMain.java index a47cb1856..a0607057a 100644 --- a/fabric/src/main/java/com/seibel/lod/FabricMain.java +++ b/fabric/src/main/java/com/seibel/lod/FabricMain.java @@ -21,6 +21,9 @@ package com.seibel.lod; import com.seibel.lod.common.LodCommonMain; import com.seibel.lod.core.ModInfo; +import com.seibel.lod.core.api.external.methods.events.abstractEvents.DhApiAfterDhInitEvent; +import com.seibel.lod.core.api.external.methods.events.abstractEvents.DhApiBeforeDhInitEvent; +import com.seibel.lod.core.handlers.dependencyInjection.DhApiEventInjector; import com.seibel.lod.core.handlers.dependencyInjection.ModAccessorInjector; import com.seibel.lod.core.handlers.dependencyInjection.SingletonInjector; import com.seibel.lod.core.logging.DhLoggerBuilder; @@ -42,7 +45,7 @@ import org.apache.logging.log4j.Logger; * * @author coolGi * @author Ran - * @version 12-1-2021 + * @version 8-15-2022 */ public class FabricMain { @@ -57,7 +60,10 @@ public class FabricMain // This loads the mod after minecraft loads which doesn't causes a lot of issues - public static void init() { + public static void init() + { + DhApiEventInjector.INSTANCE.fireAllEvents(DhApiBeforeDhInitEvent.class, null); + LOGGER.info("Initializing Mod"); LodCommonMain.startup(null); FabricDependencySetup.createInitialBindings(); @@ -73,5 +79,7 @@ public class FabricMain ModAccessorInjector.INSTANCE.bind(IOptifineAccessor.class, new OptifineAccessor()); } LOGGER.info(ModInfo.READABLE_NAME + " Initialized"); + + DhApiEventInjector.INSTANCE.fireAllEvents(DhApiAfterDhInitEvent.class, null); } } diff --git a/forge/src/main/java/com/seibel/lod/ForgeMain.java b/forge/src/main/java/com/seibel/lod/ForgeMain.java index e1fd38948..dd1c55eea 100644 --- a/forge/src/main/java/com/seibel/lod/ForgeMain.java +++ b/forge/src/main/java/com/seibel/lod/ForgeMain.java @@ -25,7 +25,10 @@ import com.seibel.lod.common.wrappers.DependencySetup; import com.seibel.lod.common.wrappers.config.GetConfigScreen; import com.seibel.lod.common.wrappers.minecraft.MinecraftClientWrapper; import com.seibel.lod.core.ModInfo; +import com.seibel.lod.core.api.external.methods.events.abstractEvents.DhApiAfterDhInitEvent; +import com.seibel.lod.core.api.external.methods.events.abstractEvents.DhApiBeforeDhInitEvent; import com.seibel.lod.core.handlers.ReflectionHandler; +import com.seibel.lod.core.handlers.dependencyInjection.DhApiEventInjector; import com.seibel.lod.core.handlers.dependencyInjection.ModAccessorInjector; import com.seibel.lod.core.handlers.dependencyInjection.SingletonInjector; import com.seibel.lod.core.logging.DhLoggerBuilder; @@ -66,9 +69,11 @@ import java.util.Random; * Initialize and setup the Mod.
* If you are looking for the real start of the mod * check out the ClientProxy. - * + * + * @author coolGi + * @author Ran * @author James Seibel - * @version 11-21-2021 + * @version 8-15-2022 */ @Mod(ModInfo.ID) public class ForgeMain implements LodForgeMethodCaller @@ -108,7 +113,10 @@ public class ForgeMain implements LodForgeMethodCaller postInitCommon(); } - private void initCommon() { + private void initCommon() + { + DhApiEventInjector.INSTANCE.fireAllEvents(DhApiBeforeDhInitEvent.class, null); + LodCommonMain.startup(this); ForgeDependencySetup.createInitialBindings(); LOGGER.info(ModInfo.READABLE_NAME + ", Version: " + ModInfo.VERSION); @@ -125,11 +133,14 @@ public class ForgeMain implements LodForgeMethodCaller #endif } - private void postInitCommon() { + private void postInitCommon() + { LOGGER.info("Post-Initializing Mod"); SingletonInjector.INSTANCE.runDelayedSetup(); LodCommonMain.initConfig(); LOGGER.info("Mod Post-Initialized"); + + DhApiEventInjector.INSTANCE.fireAllEvents(DhApiAfterDhInitEvent.class, null); } private final ModelDataMap dataMap = new ModelDataMap.Builder().build();