From 87958ff213180bd87ff5784d20757bfd762d3b8a Mon Sep 17 00:00:00 2001
From: embeddedt <42941056+embeddedt@users.noreply.github.com>
Date: Tue, 2 May 2023 10:47:07 -0400
Subject: [PATCH 1/3] Make sure JEI doesn't reload without a client world

---
 .../forge/mixin/perf/async_jei/ClientLifecycleHandlerMixin.java | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/forge/src/main/java/org/embeddedt/modernfix/forge/mixin/perf/async_jei/ClientLifecycleHandlerMixin.java b/forge/src/main/java/org/embeddedt/modernfix/forge/mixin/perf/async_jei/ClientLifecycleHandlerMixin.java
index f245b7f6..dad3426e 100644
--- a/forge/src/main/java/org/embeddedt/modernfix/forge/mixin/perf/async_jei/ClientLifecycleHandlerMixin.java
+++ b/forge/src/main/java/org/embeddedt/modernfix/forge/mixin/perf/async_jei/ClientLifecycleHandlerMixin.java
@@ -82,6 +82,8 @@ public class ClientLifecycleHandlerMixin {
 
     private void startJEIAsync(Runnable whenFinishedCb) {
         cancelPreviousStart();
+        if(Minecraft.getInstance().level == null)
+            return;
         ModernFix.LOGGER.info("Starting new JEI thread.");
         JEIReloadThread newThread = new JEIReloadThread(() -> {
             if(((JEIReloadThread)Thread.currentThread()).isStopRequested())

From a29ffb252c97d51325ffb468d9959a154fb58add Mon Sep 17 00:00:00 2001
From: embeddedt <42941056+embeddedt@users.noreply.github.com>
Date: Tue, 2 May 2023 11:18:30 -0400
Subject: [PATCH 2/3] Fix some configs not being available

---
 .../embeddedt/modernfix/core/config/ModernFixEarlyConfig.java    | 1 +
 1 file changed, 1 insertion(+)

diff --git a/common/src/main/java/org/embeddedt/modernfix/core/config/ModernFixEarlyConfig.java b/common/src/main/java/org/embeddedt/modernfix/core/config/ModernFixEarlyConfig.java
index d91e5fc5..28733531 100644
--- a/common/src/main/java/org/embeddedt/modernfix/core/config/ModernFixEarlyConfig.java
+++ b/common/src/main/java/org/embeddedt/modernfix/core/config/ModernFixEarlyConfig.java
@@ -157,6 +157,7 @@ public class ModernFixEarlyConfig {
         this.configFile = file;
 
         this.scanForAndBuildMixinOptions();
+        mixinOptions.addAll(DEFAULT_SETTING_OVERRIDES.keySet());
         for(String optionName : mixinOptions) {
             boolean defaultEnabled = DEFAULT_SETTING_OVERRIDES.getOrDefault(optionName, true);
             this.options.putIfAbsent(optionName, new Option(optionName, defaultEnabled, false));

From 28f73454c311ce3cd11962cd15876da60bb29775 Mon Sep 17 00:00:00 2001
From: embeddedt <42941056+embeddedt@users.noreply.github.com>
Date: Tue, 2 May 2023 11:18:39 -0400
Subject: [PATCH 3/3] Universal output directory

---
 .github/workflows/gradle.yml | 8 ++------
 .gitignore                   | 1 -
 bin/.gitignore               | 1 +
 fabric/build.gradle          | 7 +++++++
 forge/build.gradle           | 7 +++++++
 5 files changed, 17 insertions(+), 7 deletions(-)
 create mode 100644 bin/.gitignore

diff --git a/.github/workflows/gradle.yml b/.github/workflows/gradle.yml
index af3fe6c9..e14c3237 100644
--- a/.github/workflows/gradle.yml
+++ b/.github/workflows/gradle.yml
@@ -22,9 +22,5 @@ jobs:
         run: ./gradlew --no-daemon build
       - uses: actions/upload-artifact@v2
         with:
-          name: Forge
-          path: forge/build/libs
-      - uses: actions/upload-artifact@v2
-        with:
-          name: Fabric
-          path: fabric/build/libs
\ No newline at end of file
+          name: Package
+          path: bin
\ No newline at end of file
diff --git a/.gitignore b/.gitignore
index bcd10106..c70bdc40 100644
--- a/.gitignore
+++ b/.gitignore
@@ -77,7 +77,6 @@ fabric.properties
 ### Eclipse ###
 *.pydevproject
 .metadata
-bin/
 tmp/
 *.tmp
 *.bak
diff --git a/bin/.gitignore b/bin/.gitignore
new file mode 100644
index 00000000..d392f0e8
--- /dev/null
+++ b/bin/.gitignore
@@ -0,0 +1 @@
+*.jar
diff --git a/fabric/build.gradle b/fabric/build.gradle
index e09df301..8cedb676 100644
--- a/fabric/build.gradle
+++ b/fabric/build.gradle
@@ -61,6 +61,13 @@ remapJar {
     classifier null
 }
 
+task copyJarToBin(type: Copy) {
+    from remapJar // shortcut for createJar.outputs.files
+    into rootProject.file("bin")
+}
+
+tasks.build.dependsOn(copyJarToBin)
+
 jar {
     classifier "dev"
 }
diff --git a/forge/build.gradle b/forge/build.gradle
index a5d86be3..ec6202c7 100644
--- a/forge/build.gradle
+++ b/forge/build.gradle
@@ -80,6 +80,13 @@ remapJar {
     classifier null
 }
 
+task copyJarToBin(type: Copy) {
+    from remapJar // shortcut for createJar.outputs.files
+    into rootProject.file("bin")
+}
+
+tasks.build.dependsOn(copyJarToBin)
+
 jar {
     classifier "dev"
     manifest {