From 59a4c96b3adbb26baef6fbad9d22b39592c7830e Mon Sep 17 00:00:00 2001
From: ev chang <wyvestbusiness@gmail.com>
Date: Wed, 16 Oct 2024 01:49:02 -0400
Subject: [PATCH] split bootstrap into constructor and init

---
 gradle.properties                             |  2 +-
 .../internal/bootstrap/Bootstrap.java         | 21 +++++++++++++++++--
 2 files changed, 20 insertions(+), 3 deletions(-)

diff --git a/gradle.properties b/gradle.properties
index 28f27afd4..4f0d63a24 100644
--- a/gradle.properties
+++ b/gradle.properties
@@ -3,7 +3,7 @@ name=OneConfig
 mod_id=oneconfig
 version_major=1
 version_minor=0
-version_patch=0-alpha.27
+version_patch=0-alpha.28
 
 polyfrost.defaults.loom=3
 
diff --git a/versions/src/main/java/org/polyfrost/oneconfig/internal/bootstrap/Bootstrap.java b/versions/src/main/java/org/polyfrost/oneconfig/internal/bootstrap/Bootstrap.java
index f48a19ded..2a961ba08 100644
--- a/versions/src/main/java/org/polyfrost/oneconfig/internal/bootstrap/Bootstrap.java
+++ b/versions/src/main/java/org/polyfrost/oneconfig/internal/bootstrap/Bootstrap.java
@@ -26,10 +26,27 @@
 
 package org.polyfrost.oneconfig.internal.bootstrap;
 
+import net.minecraft.launchwrapper.Launch;
+
+import java.util.ArrayList;
+import java.util.List;
+import java.util.Map;
+
 public class Bootstrap {
-    public static void init() {
+    //#if FORGE && MODERN==0
+    private org.polyfrost.oneconfig.internal.legacy.OneConfigTweaker tweaker = new org.polyfrost.oneconfig.internal.legacy.OneConfigTweaker();
+    //#endif
+
+    public void init() {
         //#if FORGE && MODERN==0
-        new org.polyfrost.oneconfig.internal.legacy.OneConfigTweaker().injectIntoClassLoader(net.minecraft.launchwrapper.Launch.classLoader);
+        Map<String, String> launchArgs = ((Map<String, String>) Launch.blackboard.get("launchArgs"));
+        List<String> args = new ArrayList<>();
+        for (Map.Entry<String, String> entry : launchArgs.entrySet()) {
+            args.add(entry.getKey());
+            args.add(entry.getValue());
+        }
+        tweaker.acceptOptions(args, Launch.minecraftHome, Launch.assetsDir, launchArgs.get("--version"));
+        tweaker.injectIntoClassLoader(net.minecraft.launchwrapper.Launch.classLoader);
         //#endif
     }
 }