From dcee46d4d0039993466fc7c0e2d0be7b31af3d4b Mon Sep 17 00:00:00 2001
From: DeDiamondPro <67508414+DeDiamondPro@users.noreply.github.com>
Date: Wed, 29 Jun 2022 12:28:13 +0200
Subject: hud + fixes

---
 src/main/java/cc/polyfrost/oneconfig/internal/OneConfig.java           | 3 ---
 src/main/java/cc/polyfrost/oneconfig/internal/init/OneConfigInit.java  | 2 --
 .../cc/polyfrost/oneconfig/internal/plugin/asm/OneConfigTweaker.java   | 1 +
 3 files changed, 1 insertion(+), 5 deletions(-)

(limited to 'src/main/java/cc/polyfrost/oneconfig/internal')

diff --git a/src/main/java/cc/polyfrost/oneconfig/internal/OneConfig.java b/src/main/java/cc/polyfrost/oneconfig/internal/OneConfig.java
index c91b4e9..2a69cc5 100644
--- a/src/main/java/cc/polyfrost/oneconfig/internal/OneConfig.java
+++ b/src/main/java/cc/polyfrost/oneconfig/internal/OneConfig.java
@@ -49,9 +49,6 @@ public class OneConfig {
             isObfuscated = false;
         } catch (Exception ignored) {
         }
-        if (!net.minecraft.launchwrapper.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!");
-        }
         oneConfigDir.mkdirs();
         new File(oneConfigDir, "profiles").mkdirs();
         config = new OneConfigConfig();
diff --git a/src/main/java/cc/polyfrost/oneconfig/internal/init/OneConfigInit.java b/src/main/java/cc/polyfrost/oneconfig/internal/init/OneConfigInit.java
index 3d924ac..86fdb1f 100644
--- a/src/main/java/cc/polyfrost/oneconfig/internal/init/OneConfigInit.java
+++ b/src/main/java/cc/polyfrost/oneconfig/internal/init/OneConfigInit.java
@@ -8,8 +8,6 @@ import org.spongepowered.asm.mixin.Mixins;
 public class OneConfigInit {
 
     public static void initialize(String[] args) {
-        Launch.blackboard.put("oneconfig.initialized", true);
-        MixinBootstrap.init();
         Mixins.addConfiguration("mixins.oneconfig.json");
     }
 }
diff --git a/src/main/java/cc/polyfrost/oneconfig/internal/plugin/asm/OneConfigTweaker.java b/src/main/java/cc/polyfrost/oneconfig/internal/plugin/asm/OneConfigTweaker.java
index 8b822de..d302b9d 100644
--- a/src/main/java/cc/polyfrost/oneconfig/internal/plugin/asm/OneConfigTweaker.java
+++ b/src/main/java/cc/polyfrost/oneconfig/internal/plugin/asm/OneConfigTweaker.java
@@ -71,6 +71,7 @@ public class OneConfigTweaker implements ITweaker {
 
     @Override
     public void acceptOptions(List<String> args, File gameDir, File assetsDir, String profile) {
+        MixinBootstrap.init();
         boolean captureNext = false;
         for (String arg : args) {
             if (captureNext) {
-- 
cgit