1 files changed, 12 insertions, 24 deletions

diff --git a/src/main/java/cc/polyfrost/oneconfig/OneConfig.java b/src/main/java/cc/polyfrost/oneconfig/OneConfig.java
index 0d6763f..2dfca40 100644
--- a/src/main/java/cc/polyfrost/oneconfig/OneConfig.java
+++ b/src/main/java/cc/polyfrost/oneconfig/OneConfig.java
@@ -11,16 +11,14 @@ import cc.polyfrost.oneconfig.lwjgl.RenderManager;
 import cc.polyfrost.oneconfig.lwjgl.font.Fonts;
 import cc.polyfrost.oneconfig.lwjgl.image.Images;
 import cc.polyfrost.oneconfig.test.TestConfig;
-import net.minecraft.client.Minecraft;
-import net.minecraft.client.gui.ScaledResolution;
+import cc.polyfrost.oneconfig.utils.InputUtils;
+import net.minecraft.launchwrapper.Launch;
 import net.minecraftforge.client.ClientCommandHandler;
 import net.minecraftforge.common.MinecraftForge;
+import net.minecraftforge.fml.common.DummyModContainer;
 import net.minecraftforge.fml.common.Loader;
 import net.minecraftforge.fml.common.ModContainer;
 import net.minecraftforge.fml.common.ModMetadata;
-import net.minecraftforge.fml.common.event.FMLInitializationEvent;
-import net.minecraftforge.fml.common.event.FMLPostInitializationEvent;
-import net.minecraftforge.fml.common.event.FMLPreInitializationEvent;
 
 import java.io.File;
 import java.util.ArrayList;
@@ -29,9 +27,8 @@ import java.util.List;
 
 @net.minecraftforge.fml.common.Mod(modid = "@ID@", name = "@NAME@", version = "@VER@")
 public class OneConfig {
-    private static final Minecraft mc = Minecraft.getMinecraft();
     public static File jarFile;
-    public static File oneConfigDir = new File(mc.mcDataDir, "OneConfig/");
+    public static File oneConfigDir = new File("./OneConfig/");
     public static File themesDir = new File(oneConfigDir, "themes/");
     public static OneConfigConfig config;
     public static TestConfig testConfig;
@@ -39,7 +36,10 @@ public class OneConfig {
     public static List<ModMetadata> loadedOtherMods = new ArrayList<>();
 
     @net.minecraftforge.fml.common.Mod.EventHandler
-    public void onPreFMLInit(FMLPreInitializationEvent event) {
+    public void onPreFMLInit(net.minecraftforge.fml.common.event.FMLPreInitializationEvent event) {
+        if (!Launch.blackboard.containsKey("oneconfig.initialized")) {
+            throw new RuntimeException("OneConfig has not been initialized! Please add the OneConfig tweaker or call OneConfigInit via an ITweaker or a FMLLoadingPlugin!");
+        }
         jarFile = event.getSourceFile();
         oneConfigDir.mkdirs();
         themesDir.mkdirs();
@@ -47,12 +47,13 @@ public class OneConfig {
     }
 
     @net.minecraftforge.fml.common.Mod.EventHandler
-    public void onFMLInitialization(FMLInitializationEvent event) {
+    public void onFMLInitialization(net.minecraftforge.fml.common.event.FMLInitializationEvent event) {
         BlurHandler.INSTANCE.load();
         testConfig = new TestConfig();
         ClientCommandHandler.instance.registerCommand(new OneConfigCommand());
         MinecraftForge.EVENT_BUS.register(this);
         MinecraftForge.EVENT_BUS.register(new HudCore());
+        MinecraftForge.EVENT_BUS.register(new InputUtils());
         RenderManager.setupAndDraw((vg) -> {
             RenderManager.drawRoundedRect(vg, -100, -100, 50, 50, -1, 12f);
             RenderManager.drawString(vg, "OneConfig loading...", -100, -100, -1, 12f, Fonts.MEDIUM);
@@ -61,7 +62,7 @@ public class OneConfig {
     }
 
     @net.minecraftforge.fml.common.Mod.EventHandler
-    public void onPostFMLInit(FMLPostInitializationEvent event) {
+    public void onPostFMLInit(net.minecraftforge.fml.common.event.FMLPostInitializationEvent event) {
         reloadModsList();
     }
 
@@ -74,22 +75,9 @@ public class OneConfig {
             String author = metadata.authorList.size() > 0 ? metadata.authorList.get(0) : "";
             Mod newMod = new Mod(metadata.name, ModType.THIRD_PARTY, author, metadata.version);
             newMod.isShortCut = true;
-            if (newMod.name.equals("Minecraft Coder Pack") || newMod.name.equals("Forge Mod Loader") || newMod.name.equals("Minecraft Forge") || newMod.name.equals("OneConfig"))
+            if (mod instanceof DummyModContainer || newMod.name.equals("OneConfig"))
                 continue;
             if (modData.add(newMod)) loadedMods.add(newMod);
         }
     }
-
-    public static int[] getScaledResolution() {
-        ScaledResolution resolution = new ScaledResolution(mc);
-        return new int[]{resolution.getScaledWidth(), resolution.getScaledHeight()};
-    }
-
-    public static int getDisplayWidth() {
-        return mc.displayWidth;
-    }
-
-    public static int getDisplayHeight() {
-        return mc.displayHeight;
-    }
 }