fix ScreenshotScreen not closing when pressing escape

camnwalter · Sep 6, 2023 · c9f274b · c9f274b
1 parent 5cbcfdf
commit c9f274b
Show file tree

Hide file tree

Showing 3 changed files with 23 additions and 1 deletion.
diff --git a/src/main/java/com/squagward/screenshots/mixin/KeyboardMixin.java b/src/main/java/com/squagward/screenshots/mixin/KeyboardMixin.java
@@ -1,5 +1,6 @@
 package com.squagward.screenshots.mixin;
 
+import com.llamalad7.mixinextras.injector.WrapWithCondition;
 import com.llamalad7.mixinextras.injector.wrapoperation.Operation;
 import com.llamalad7.mixinextras.injector.wrapoperation.WrapOperation;
 import com.squagward.screenshots.Screenshots;
@@ -14,6 +15,7 @@
 import org.spongepowered.asm.mixin.Mixin;
 import org.spongepowered.asm.mixin.Shadow;
 import org.spongepowered.asm.mixin.injection.At;
+import org.spongepowered.asm.mixin.injection.Inject;
 
 import java.io.File;
 import java.util.function.Consumer;
@@ -42,7 +44,18 @@ public class KeyboardMixin {
         ScreenshotHud.INSTANCE.reset();
 
         if (client.currentScreen == null) {
-            client.send(() -> client.setScreen(new ScreenshotScreen()));
+            client.send(() -> {
+                client.setScreen(new ScreenshotScreen());
+                Screenshots.INSTANCE.setDisplayScreenshotScreen(true);
+            });
         }
     }
+
+    @WrapWithCondition(method = "onKey", at = @At(value = "INVOKE", target = "Lnet/minecraft/client/MinecraftClient;openPauseMenu(Z)V"))
+    private boolean screenshots$dontOpenPauseMenu(MinecraftClient client, boolean pause) {
+        boolean shouldOpenPauseMenu = !Screenshots.INSTANCE.getDisplayScreenshotScreen();
+        Screenshots.INSTANCE.setDisplayScreenshotScreen(false);
+
+        return shouldOpenPauseMenu;
+    }
 }
diff --git a/src/main/kotlin/com/squagward/screenshots/Screenshots.kt b/src/main/kotlin/com/squagward/screenshots/Screenshots.kt
@@ -18,6 +18,7 @@ import javax.imageio.ImageIO
 
 object Screenshots : ClientModInitializer {
     var displayScreenshotHud = false
+    var displayScreenshotScreen = false
     private val LOGGER: Logger = LogManager.getLogger("Screenshots")
 
     override fun onInitializeClient() {

diff --git a/src/main/kotlin/com/squagward/screenshots/hud/ScreenshotHud.kt b/src/main/kotlin/com/squagward/screenshots/hud/ScreenshotHud.kt
@@ -72,12 +72,20 @@ object ScreenshotHud {
 
                 if (screen is ScreenshotScreen) {
                     screen.close()
+                    Screenshots.displayScreenshotScreen = false
                 }
                 Screenshots.displayScreenshotHud = false
             }
 
             ScreenKeyboardEvents.afterKeyPress(screen).register { _, key, _, _ ->
                 if (Screenshots.displayScreenshotHud && key == GLFW.GLFW_KEY_ESCAPE) {
+                    if (screen is ScreenshotScreen) {
+                        screen.close()
+                        // can't set Screenshots.displayScreenshotScreen to false,
+                        // we need to keep the value as true so our mixin knows the ScreenshotScreen
+                        // was just closed. Otherwise, the pause menu will display as the current
+                        // screen would be null.
+                    }
                     Screenshots.displayScreenshotHud = false
                 }
             }