diff --git a/coreSubProjects b/coreSubProjects index 6e229b86b..92a98aba9 160000 --- a/coreSubProjects +++ b/coreSubProjects @@ -1 +1 @@ -Subproject commit 6e229b86b0427f24089448085932bbf4c3f2c45c +Subproject commit 92a98aba96c87cff92fad838509a1cc048792d07 diff --git a/fabric/src/main/java/com/seibel/lod/FabricMain.java b/fabric/src/main/java/com/seibel/lod/FabricMain.java index b74987cf2..5700f4fe9 100644 --- a/fabric/src/main/java/com/seibel/lod/FabricMain.java +++ b/fabric/src/main/java/com/seibel/lod/FabricMain.java @@ -19,9 +19,12 @@ package com.seibel.lod; +import com.seibel.lod.api.methods.events.abstractEvents.DhApiAfterDhInitEvent; +import com.seibel.lod.api.methods.events.abstractEvents.DhApiBeforeDhInitEvent; import com.seibel.lod.common.LodCommonMain; import com.seibel.lod.core.ModInfo; import com.seibel.lod.core.config.Config; +import com.seibel.lod.core.DependencyInjection.DhApiEventInjector; import com.seibel.lod.core.dependencyInjection.ModAccessorInjector; import com.seibel.lod.core.dependencyInjection.SingletonInjector; import com.seibel.lod.core.logging.DhLoggerBuilder; @@ -62,7 +65,7 @@ public class FabricMain // This loads the mod after minecraft loads which doesn't causes a lot of issues public static void init() { -// DhApiEventInjector.INSTANCE.fireAllEvents(DhApiBeforeDhInitEvent.class, null); + DhApiEventInjector.INSTANCE.fireAllEvents(DhApiBeforeDhInitEvent.class, null); LOGGER.info("Initializing Mod"); LodCommonMain.startup(null); @@ -83,6 +86,6 @@ public class FabricMain } LOGGER.info(ModInfo.READABLE_NAME + " Initialized"); -// DhApiEventInjector.INSTANCE.fireAllEvents(DhApiAfterDhInitEvent.class, null); + 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 54ad519b9..ebfb45d34 100644 --- a/forge/src/main/java/com/seibel/lod/ForgeMain.java +++ b/forge/src/main/java/com/seibel/lod/ForgeMain.java @@ -19,11 +19,14 @@ package com.seibel.lod; +import com.seibel.lod.api.methods.events.abstractEvents.DhApiAfterDhInitEvent; +import com.seibel.lod.api.methods.events.abstractEvents.DhApiBeforeDhInitEvent; import com.seibel.lod.common.LodCommonMain; import com.seibel.lod.common.forge.LodForgeMethodCaller; import com.seibel.lod.common.wrappers.DependencySetup; import com.seibel.lod.common.wrappers.gui.GetConfigScreen; import com.seibel.lod.common.wrappers.minecraft.MinecraftClientWrapper; +import com.seibel.lod.core.DependencyInjection.DhApiEventInjector; import com.seibel.lod.core.ModInfo; import com.seibel.lod.core.ReflectionHandler; import com.seibel.lod.core.dependencyInjection.ModAccessorInjector; @@ -112,7 +115,7 @@ public class ForgeMain implements LodForgeMethodCaller private void initCommon() { -// DhApiEventInjector.INSTANCE.fireAllEvents(DhApiBeforeDhInitEvent.class, null); + DhApiEventInjector.INSTANCE.fireAllEvents(DhApiBeforeDhInitEvent.class, null); LodCommonMain.startup(this); ForgeDependencySetup.createInitialBindings(); @@ -137,7 +140,7 @@ public class ForgeMain implements LodForgeMethodCaller LodCommonMain.initConfig(); LOGGER.info("Mod Post-Initialized"); -// DhApiEventInjector.INSTANCE.fireAllEvents(DhApiAfterDhInitEvent.class, null); + DhApiEventInjector.INSTANCE.fireAllEvents(DhApiAfterDhInitEvent.class, null); } private final ModelDataMap dataMap = new ModelDataMap.Builder().build();