Tidy up NeoForge/Forge mod init

1 files changed, 9 insertions, 17 deletions

diff --git a/spark-forge/src/main/java/me/lucko/spark/forge/ForgeSparkMod.java b/spark-forge/src/main/java/me/lucko/spark/forge/ForgeSparkMod.java
index 1a7b8e1..07dce65 100644
--- a/spark-forge/src/main/java/me/lucko/spark/forge/ForgeSparkMod.java
+++ b/spark-forge/src/main/java/me/lucko/spark/forge/ForgeSparkMod.java
@@ -27,10 +27,8 @@ import net.minecraftforge.event.server.ServerAboutToStartEvent;
 import net.minecraftforge.eventbus.api.SubscribeEvent;
 import net.minecraftforge.fml.IExtensionPoint;
 import net.minecraftforge.fml.ModContainer;
-import net.minecraftforge.fml.ModLoadingContext;
 import net.minecraftforge.fml.common.Mod;
 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;
 
@@ -39,26 +37,23 @@ import java.nio.file.Path;
 @Mod("spark")
 public class ForgeSparkMod {
 
-    private ModContainer container;
-    private Path configDirectory;
+    private final ModContainer container;
+    private final Path configDirectory;
 
-    public ForgeSparkMod() {
-        FMLJavaModLoadingContext.get().getModEventBus().addListener(this::setup);
-        FMLJavaModLoadingContext.get().getModEventBus().addListener(this::clientInit);
-        MinecraftForge.EVENT_BUS.register(this);
+    public ForgeSparkMod(FMLJavaModLoadingContext ctx) {
+        this.container = ctx.getContainer();
+        this.configDirectory = FMLPaths.CONFIGDIR.get().resolve(this.container.getModId());
 
-        ModLoadingContext.get().registerDisplayTest(IExtensionPoint.DisplayTest.IGNORE_ALL_VERSION);
+        ctx.getModEventBus().addListener(this::clientInit);
+        ctx.registerDisplayTest(IExtensionPoint.DisplayTest.IGNORE_ALL_VERSION);
+
+        MinecraftForge.EVENT_BUS.register(this);
     }
 
     public String getVersion() {
         return this.container.getModInfo().getVersion().toString();
     }
 
-    public void setup(FMLCommonSetupEvent e) {
-        this.container = ModLoadingContext.get().getActiveContainer();
-        this.configDirectory = FMLPaths.CONFIGDIR.get().resolve(this.container.getModId());
-    }
-
     public void clientInit(FMLClientSetupEvent e) {
         ForgeClientSparkPlugin.register(this, e);
     }
@@ -69,9 +64,6 @@ public class ForgeSparkMod {
     }
 
     public Path getConfigDirectory() {
-        if (this.configDirectory == null) {
-            throw new IllegalStateException("Config directory not set");
-        }
         return this.configDirectory;
     }
 }