diff --git a/src/fml/java/com/minelittlepony/PonyMod.java b/src/fml/java/com/minelittlepony/PonyMod.java
index 441708e4..591b44f8 100644
--- a/src/fml/java/com/minelittlepony/PonyMod.java
+++ b/src/fml/java/com/minelittlepony/PonyMod.java
@@ -1,8 +1,8 @@
 package com.minelittlepony;
 
-import net.minecraftforge.api.distmarker.Dist;
-import net.minecraftforge.fml.DistExecutor;
+import net.minecraftforge.eventbus.api.SubscribeEvent;
 import net.minecraftforge.fml.common.Mod;
+import net.minecraftforge.fml.event.lifecycle.FMLClientSetupEvent;
 import net.minecraftforge.fml.javafmlmod.FMLJavaModLoadingContext;
 
 import com.minelittlepony.client.ForgeModMineLittlePony;
@@ -15,11 +15,8 @@ import com.minelittlepony.client.ForgeModMineLittlePony;
  */
 @Mod("minelittlepony")
 public class PonyMod {
-    public PonyMod() {
-        DistExecutor.runWhenOn(Dist.CLIENT, () -> this::initOnClient);
-    }
-
-    void initOnClient() {
+    @SubscribeEvent
+    public void initOnClient(FMLClientSetupEvent event) {
         FMLJavaModLoadingContext.get().getModEventBus().register(new ForgeModMineLittlePony());
     }
 }
diff --git a/src/fml/java/com/minelittlepony/client/ForgeModMineLittlePony.java b/src/fml/java/com/minelittlepony/client/ForgeModMineLittlePony.java
index 19f658ed..780e1ea1 100644
--- a/src/fml/java/com/minelittlepony/client/ForgeModMineLittlePony.java
+++ b/src/fml/java/com/minelittlepony/client/ForgeModMineLittlePony.java
@@ -12,7 +12,6 @@ import net.minecraftforge.fml.client.registry.RenderingRegistry;
 import net.minecraftforge.fml.common.gameevent.TickEvent.ClientTickEvent;
 import net.minecraftforge.fml.event.lifecycle.FMLClientSetupEvent;
 import net.minecraftforge.fml.event.lifecycle.FMLCommonSetupEvent;
-import net.minecraftforge.fml.javafmlmod.FMLJavaModLoadingContext;
 import net.minecraftforge.fml.loading.FMLPaths;
 
 public class ForgeModMineLittlePony implements IModUtilities {
@@ -20,16 +19,15 @@ public class ForgeModMineLittlePony implements IModUtilities {
     private final MineLPClient mlp = new MineLPClient(this);
 
     public ForgeModMineLittlePony() {
-        FMLJavaModLoadingContext.get().getModEventBus().addListener(this::init);
-        FMLJavaModLoadingContext.get().getModEventBus().addListener(this::posInit);
         MinecraftForge.EVENT_BUS.register(this);
     }
 
+    @SubscribeEvent
     private void init(final FMLCommonSetupEvent event) {
-
         mlp.init(Config.of(FMLPaths.CONFIGDIR.get().resolve("minelittlepony.json")));
     }
 
+    @SubscribeEvent
     private void posInit(FMLClientSetupEvent event) {
         mlp.postInit(event.getMinecraftSupplier().get());
     }