修复快速关闭的问题

CaaMoe · Apr 27, 2023 · 7ee2781 · 7ee2781
1 parent 24120a7
commit 7ee2781
Show file tree

Hide file tree

Showing 3 changed files with 23 additions and 3 deletions.
diff --git a/src/main/java/moe/caa/fabric/quitconfirm/client/mixin/MixinButtonWidget.java b/src/main/java/moe/caa/fabric/quitconfirm/client/mixin/MixinButtonWidget.java
@@ -15,7 +15,11 @@
 public class MixinButtonWidget {
     @Inject(method = "onPress", at = @At("HEAD"), cancellable = true)
     private void onOnPress(CallbackInfo ci) {
-        if (MinecraftClient.getInstance().currentScreen instanceof ConfirmScreen) return;
+        if (MinecraftClient.getInstance().currentScreen instanceof ConfirmScreen){
+            if (((ConfirmScreen) MinecraftClient.getInstance().currentScreen).isConfirmed()) {
+                return;
+            }
+        }
         EventResult result = ButtonPressEvent.BUTTON_PRESS.invoker().onPress((ButtonWidget) (Object) this);
         if(result == EventResult.CANCEL){
             ci.cancel();

diff --git a/src/main/java/moe/caa/fabric/quitconfirm/client/mixin/MixinMinecraftClient.java b/src/main/java/moe/caa/fabric/quitconfirm/client/mixin/MixinMinecraftClient.java
@@ -26,7 +26,13 @@ public class MixinMinecraftClient {
 
     @Inject(method = "scheduleStop", at = @At("HEAD"), cancellable = true)
     private void onScheduleStop(CallbackInfo ci) {
-        if (currentScreen instanceof ConfirmScreen) return;
+        if (currentScreen instanceof ConfirmScreen) {
+            if (((ConfirmScreen) currentScreen).isConfirmed()) {
+                return;
+            }
+            ci.cancel();
+            return;
+        }
         EventResult result = ClientScheduleStopEvent.CLIENT_SCHEDULE_STOP.invoker().onScheduleStop();
         if (result == EventResult.CANCEL) {
             GLFW.glfwSetWindowShouldClose(this.window.getHandle(), false);

diff --git a/src/main/java/moe/caa/fabric/quitconfirm/client/screen/confirm/ConfirmScreen.java b/src/main/java/moe/caa/fabric/quitconfirm/client/screen/confirm/ConfirmScreen.java
@@ -16,6 +16,12 @@ public class ConfirmScreen extends Screen {
     private ButtonWidget cancel;
     private ButtonWidget confirm;
 
+    private boolean confirmed = false;
+
+    public boolean isConfirmed() {
+        return confirmed;
+    }
+
     public ConfirmScreen(Screen parentScreen, Text message, Runnable confirm) {
         this(parentScreen, message, button -> confirm.run());
     }
@@ -42,7 +48,11 @@ public void tick() {
     }
 
     private void initButton() {
-        confirm = style.generateConfirmButtons(this, onConfirm);
+        confirm = style.generateConfirmButtons(this, button -> {
+            confirmed = true;
+            confirm.onPress();
+        });
+
         cancel = style.generateCancelButtons(this, onCancel);
 
         confirm.active = false;