diff --git a/src/main/java/gregtech/GregTechMod.java b/src/main/java/gregtech/GregTechMod.java index e408788d975..bcafe779d87 100644 --- a/src/main/java/gregtech/GregTechMod.java +++ b/src/main/java/gregtech/GregTechMod.java @@ -190,7 +190,7 @@ public void postInit(FMLPostInitializationEvent event) { @Mod.EventHandler public void loadComplete(FMLLoadCompleteEvent event) { - proxy.onLoadComplete(); + proxy.onLoadComplete(event); } @Mod.EventHandler diff --git a/src/main/java/gregtech/common/CommonProxy.java b/src/main/java/gregtech/common/CommonProxy.java index c085ae8ee4b..cec2c34cec1 100644 --- a/src/main/java/gregtech/common/CommonProxy.java +++ b/src/main/java/gregtech/common/CommonProxy.java @@ -52,8 +52,10 @@ import net.minecraftforge.fml.client.event.ConfigChangedEvent; import net.minecraftforge.fml.common.Mod; import net.minecraftforge.fml.common.ObfuscationReflectionHelper; +import net.minecraftforge.fml.common.event.FMLLoadCompleteEvent; import net.minecraftforge.fml.common.eventhandler.EventPriority; import net.minecraftforge.fml.common.eventhandler.SubscribeEvent; +import net.minecraftforge.fml.relauncher.Side; import net.minecraftforge.registries.IForgeRegistry; import java.lang.reflect.InvocationTargetException; @@ -291,8 +293,9 @@ public void onPostLoad() { TerminalRegistry.init(); } - public void onLoadComplete() { - if(GTValues.isModLoaded(GTValues.MODID_JEI)) + public void onLoadComplete(FMLLoadCompleteEvent event) { + if(GTValues.isModLoaded(GTValues.MODID_JEI) && event.getSide() == Side.CLIENT) { GTJeiPlugin.setupInputHandler(); + } } }