aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--forge/build.gradle5
-rw-r--r--runtime/src/main/java/me/shedaniel/rei/RoughlyEnoughItemsCoreClient.java4
2 files changed, 6 insertions, 3 deletions
diff --git a/forge/build.gradle b/forge/build.gradle
index 9f5b1ca68..dc61dde24 100644
--- a/forge/build.gradle
+++ b/forge/build.gradle
@@ -92,7 +92,8 @@ dependencies {
// modRuntime("curse.maven:jer-240630:3489131")
// modRuntime("curse.maven:jep-417645:3478254")
// modRuntime("curse.maven:simple-storage-network-268495:3476722")
- // modRuntime("curse.maven:create-328085:3278516")
+ // modRuntime("curse.maven:create-328085:3536025")
+ // modRuntime("curse.maven:flywheel-486392:3535459")
// modRuntime("curse.maven:industrial-foregoing-266515:3446262")
// modRuntime("curse.maven:titanium-287342:3346366")
// modRuntime("curse.maven:extended-crafting-268387:3470453")
@@ -222,7 +223,7 @@ curseforge {
requiredDependency "architectury-forge"
requiredDependency "cloth-config-forge"
}
- mainArtifact(tasks.getByName("remapJar")) {
+ mainArtifact(tasks.getByName("serverOnlyJar")) {
displayName = "[Forge $project.supported_version] v$project.version"
}
}
diff --git a/runtime/src/main/java/me/shedaniel/rei/RoughlyEnoughItemsCoreClient.java b/runtime/src/main/java/me/shedaniel/rei/RoughlyEnoughItemsCoreClient.java
index 35add837a..e35f0e3c2 100644
--- a/runtime/src/main/java/me/shedaniel/rei/RoughlyEnoughItemsCoreClient.java
+++ b/runtime/src/main/java/me/shedaniel/rei/RoughlyEnoughItemsCoreClient.java
@@ -281,7 +281,9 @@ public class RoughlyEnoughItemsCoreClient {
});
ClientGuiEvent.INIT_POST.register((screen, access) -> {
REIRuntime.getInstance().getOverlay(false, true);
- REIRuntimeImpl.getInstance().setPreviousScreen(screen);
+ if (Minecraft.getInstance().screen == screen) {
+ REIRuntimeImpl.getInstance().setPreviousScreen(screen);
+ }
if (ConfigObject.getInstance().doesDisableRecipeBook() && screen instanceof AbstractContainerScreen) {
access.getRenderables().removeIf(widget -> widget instanceof ImageButton button && button.resourceLocation.equals(recipeButtonTex));
access.getNarratables().removeIf(widget -> widget instanceof ImageButton button && button.resourceLocation.equals(recipeButtonTex));