Fix #1034

9 files changed, 109 insertions, 12 deletions

diff --git a/api/src/main/java/me/shedaniel/rei/api/client/config/ConfigObject.java b/api/src/main/java/me/shedaniel/rei/api/client/config/ConfigObject.java
index 4da17b6c0..c994980cd 100644
--- a/api/src/main/java/me/shedaniel/rei/api/client/config/ConfigObject.java
+++ b/api/src/main/java/me/shedaniel/rei/api/client/config/ConfigObject.java
@@ -317,6 +317,9 @@ public interface ConfigObject {
     int getAsyncSearchPartitionSize();
     
     @ApiStatus.Experimental
+    boolean isPatchingAsyncThreadCrash();
+    
+    @ApiStatus.Experimental
     boolean doDebugSearchTimeRequired();
     
     @Deprecated(forRemoval = true)
diff --git a/fabric/src/main/java/me/shedaniel/rei/mixin/fabric/MixinInputConstants.java b/fabric/src/main/java/me/shedaniel/rei/mixin/fabric/MixinInputConstants.java
new file mode 100644
index 000000000..6fa7979e4
--- /dev/null
+++ b/fabric/src/main/java/me/shedaniel/rei/mixin/fabric/MixinInputConstants.java
@@ -0,0 +1,48 @@
+/*
+ * This file is licensed under the MIT License, part of Roughly Enough Items.
+ * Copyright (c) 2018, 2019, 2020, 2021, 2022 shedaniel
+ *
+ * Permission is hereby granted, free of charge, to any person obtaining a copy
+ * of this software and associated documentation files (the "Software"), to deal
+ * in the Software without restriction, including without limitation the rights
+ * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+ * copies of the Software, and to permit persons to whom the Software is
+ * furnished to do so, subject to the following conditions:
+ *
+ * The above copyright notice and this permission notice shall be included in all
+ * copies or substantial portions of the Software.
+ *
+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+ * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+ * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+ * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+ * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
+ * SOFTWARE.
+ */
+
+package me.shedaniel.rei.mixin.fabric;
+
+import com.mojang.blaze3d.platform.InputConstants;
+import com.mojang.blaze3d.systems.RenderSystem;
+import me.shedaniel.rei.api.client.config.ConfigObject;
+import org.spongepowered.asm.mixin.Mixin;
+import org.spongepowered.asm.mixin.Unique;
+import org.spongepowered.asm.mixin.injection.At;
+import org.spongepowered.asm.mixin.injection.Inject;
+import org.spongepowered.asm.mixin.injection.callback.CallbackInfoReturnable;
+
+@Mixin(InputConstants.class)
+public class MixinInputConstants {
+    @Inject(method = "isKeyDown", at = @At("HEAD"), cancellable = true)
+    private static void isKeyDown(long windowId, int key, CallbackInfoReturnable<Boolean> cir) {
+        if (isPatchingAsyncThreadCrash() && !RenderSystem.isOnRenderThread()) {
+            cir.setReturnValue(false);
+        }
+    }
+    
+    @Unique
+    private static boolean isPatchingAsyncThreadCrash() {
+        return ConfigObject.getInstance().isPatchingAsyncThreadCrash();
+    }
+}
diff --git a/fabric/src/main/resources/rei.mixins.json b/fabric/src/main/resources/rei.mixins.json
index 17048486a..89a733346 100644
--- a/fabric/src/main/resources/rei.mixins.json
+++ b/fabric/src/main/resources/rei.mixins.json
@@ -6,6 +6,7 @@
   "client": [
     "MixinClientPacketListener",
     "MixinEffectRenderingInventoryScreen",
+    "MixinInputConstants",
     "MixinRecipeToast",
     "MixinScreen"
   ],
diff --git a/forge/build.gradle b/forge/build.gradle
index 37cf85e1f..b62ac7829 100644
--- a/forge/build.gradle
+++ b/forge/build.gradle
@@ -56,13 +56,6 @@ loom {
     }
 
     forge {
-        localMods {
-            jeiInternalsWorkaround {
-                add(project(":jei-compatibility-layer").sourceSets.main)
-                add(project(":jei-internals-workaround").sourceSets.main)
-            }
-        }
-
         mixinConfig "rei.mixins.json"
     }
 }
@@ -74,8 +67,6 @@ dependencies {
     modApi("me.shedaniel.cloth:cloth-config-forge:${cloth_config_version}")
     modApi("dev.architectury:architectury-forge:${architectury_version}")
 
-    runtimeClasspath(project(path: ":jei-internals-workaround", configuration: "namedElements")) { transitive false }
-
     depProjects.forEach {
         common(project(path: it, configuration: "namedElements")) { transitive false }
         shadowCommon(project(path: it, configuration: "transformProductionForge")) { transitive false }
diff --git a/forge/src/main/java/me/shedaniel/rei/mixin/forge/MixinInputConstants.java b/forge/src/main/java/me/shedaniel/rei/mixin/forge/MixinInputConstants.java
new file mode 100644
index 000000000..7d6b31a65
--- /dev/null
+++ b/forge/src/main/java/me/shedaniel/rei/mixin/forge/MixinInputConstants.java
@@ -0,0 +1,48 @@
+/*
+ * This file is licensed under the MIT License, part of Roughly Enough Items.
+ * Copyright (c) 2018, 2019, 2020, 2021, 2022 shedaniel
+ *
+ * Permission is hereby granted, free of charge, to any person obtaining a copy
+ * of this software and associated documentation files (the "Software"), to deal
+ * in the Software without restriction, including without limitation the rights
+ * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+ * copies of the Software, and to permit persons to whom the Software is
+ * furnished to do so, subject to the following conditions:
+ *
+ * The above copyright notice and this permission notice shall be included in all
+ * copies or substantial portions of the Software.
+ *
+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+ * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+ * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+ * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+ * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
+ * SOFTWARE.
+ */
+
+package me.shedaniel.rei.mixin.forge;
+
+import com.mojang.blaze3d.platform.InputConstants;
+import com.mojang.blaze3d.systems.RenderSystem;
+import me.shedaniel.rei.api.client.config.ConfigObject;
+import org.spongepowered.asm.mixin.Mixin;
+import org.spongepowered.asm.mixin.Unique;
+import org.spongepowered.asm.mixin.injection.At;
+import org.spongepowered.asm.mixin.injection.Inject;
+import org.spongepowered.asm.mixin.injection.callback.CallbackInfoReturnable;
+
+@Mixin(InputConstants.class)
+public class MixinInputConstants {
+    @Inject(method = "isKeyDown", at = @At("HEAD"), cancellable = true)
+    private static void isKeyDown(long windowId, int key, CallbackInfoReturnable<Boolean> cir) {
+        if (isPatchingAsyncThreadCrash() && !RenderSystem.isOnRenderThread()) {
+            cir.setReturnValue(false);
+        }
+    }
+    
+    @Unique
+    private static boolean isPatchingAsyncThreadCrash() {
+        return ConfigObject.getInstance().isPatchingAsyncThreadCrash();
+    }
+}
diff --git a/forge/src/main/resources/rei.mixins.json b/forge/src/main/resources/rei.mixins.json
index 1eabc9229..d729d79f9 100644
--- a/forge/src/main/resources/rei.mixins.json
+++ b/forge/src/main/resources/rei.mixins.json
@@ -5,6 +5,7 @@
   "client": [
     "MixinClientPacketListener",
     "MixinEffectRenderingInventoryScreen",
+    "MixinInputConstants",
     "MixinRecipeToast"
   ],
   "mixins": [
diff --git a/runtime/src/main/java/me/shedaniel/rei/impl/client/config/ConfigObjectImpl.java b/runtime/src/main/java/me/shedaniel/rei/impl/client/config/ConfigObjectImpl.java
index 83964e65c..f65e67dcb 100644
--- a/runtime/src/main/java/me/shedaniel/rei/impl/client/config/ConfigObjectImpl.java
+++ b/runtime/src/main/java/me/shedaniel/rei/impl/client/config/ConfigObjectImpl.java
@@ -427,6 +427,12 @@ public class ConfigObjectImpl implements ConfigObject, ConfigData {
     
     @Override
     @ApiStatus.Experimental
+    public boolean isPatchingAsyncThreadCrash() {
+        return advanced.search.patchAsyncThreadCrash;
+    }
+    
+    @Override
+    @ApiStatus.Experimental
     public boolean doDebugSearchTimeRequired() {
         return advanced.search.debugSearchTimeRequired;
     }
@@ -673,6 +679,7 @@ public class ConfigObjectImpl implements ConfigObject, ConfigData {
             @Comment("Declares whether REI should search async.") private boolean asyncSearch = true;
             @Comment("Declares how many entries should be grouped one async search.") @ConfigEntry.BoundedDiscrete(min = 25, max = 400)
             private int asyncSearchPartitionSize = 100;
+            private boolean patchAsyncThreadCrash = true;
             @ConfigEntry.Gui.EnumHandler(option = ConfigEntry.Gui.EnumHandler.EnumDisplayOption.BUTTON)
             private SearchMode tooltipSearch = SearchMode.ALWAYS;
             @ConfigEntry.Gui.EnumHandler(option = ConfigEntry.Gui.EnumHandler.EnumDisplayOption.BUTTON)
diff --git a/runtime/src/main/resources/assets/roughlyenoughitems/lang/en_us.json b/runtime/src/main/resources/assets/roughlyenoughitems/lang/en_us.json
index c701e1e10..9b4606603 100755
--- a/runtime/src/main/resources/assets/roughlyenoughitems/lang/en_us.json
+++ b/runtime/src/main/resources/assets/roughlyenoughitems/lang/en_us.json
@@ -249,6 +249,7 @@
   "config.roughlyenoughitems.accessibility.entrySize": "Entry Size:",
   "config.roughlyenoughitems.search.asyncSearch": "Async Search:",
   "config.roughlyenoughitems.search.asyncSearchPartitionSize": "Async Search Partition Size:",
+  "config.roughlyenoughitems.search.patchAsyncThreadCrash": "Patch Async Thread Crash:",
   "config.roughlyenoughitems.accessibility.useCompactTabs": "Compact Tabs:",
   "config.roughlyenoughitems.accessibility.useCompactTabButtons": "Compact Tab Arrow Buttons:",
   "config.roughlyenoughitems.theme": "Appearance Theme:",
diff --git a/settings.gradle b/settings.gradle
index be97e596c..937a949bf 100755
--- a/settings.gradle
+++ b/settings.gradle
@@ -14,6 +14,3 @@ include "default-plugin"
 include "runtime"
 include "fabric"
 include "forge"
-
-include "jei-compatibility-layer"
-include "jei-internals-workaround"