stage2/ml9: remove boolean return type from RestartUI#waitForClose

Author: Sychic

stage2/modlauncher9/src/main/java/gg/essential/loader/stage2/components/ForkedRestartUI.java

@@ -35,15 +35,13 @@ public void show() {
         }
     }
 
-    public Boolean waitForClose() {
-        if (this.jvm == null) return null;
+    public void waitForClose() {
+        if (this.jvm == null) return;
 
         try {
-            int verdict = this.jvm.process.getInputStream().read();
-            return verdict == 1 ? Boolean.TRUE : verdict == 2 ? Boolean.FALSE : null;
-        } catch (IOException e) {
+            this.jvm.process.getInputStream().wait();
+        } catch (InterruptedException e) {
             LOGGER.warn("Failed to wait for RestartUI to close:", e);
-            return null;
         } finally {
             this.jvm.close();
             this.jvm = null;
@@ -58,23 +56,16 @@ public static void main(String[] args) throws IOException {
             mods.add(in.readUTF());
         }
 
-        Boolean verdict = null;
         try {
             RestartUI ui = new RestartUI(mods);
             ui.show();
 
-            verdict = ui.waitForClose();
+            ui.waitForClose();
         } catch (Throwable t) {
             t.printStackTrace();
         }
 
-        if (verdict == Boolean.TRUE) {
-            System.out.write(1);
-        } else if (verdict == Boolean.FALSE) {
-            System.out.write(2);
-        } else {
-            System.out.write(0);
-        }
         System.out.flush();
+        System.out.close();
     }
 }

stage2/modlauncher9/src/main/java/gg/essential/loader/stage2/components/RestartUI.java

@@ -11,7 +11,7 @@
 import static gg.essential.loader.stage2.components.ButtonShadowBorder.Y_SHADOW;
 
 public class RestartUI implements EssentialStyle {
-    private final CompletableFuture<Boolean> closedFuture = new CompletableFuture<>();
+    private final CompletableFuture<Void> closedFuture = new CompletableFuture<>();
 
     private final JFrame frame = makeFrame(it -> closedFuture.complete(null));
 
@@ -64,7 +64,7 @@ public void show() {
         final JPanel buttons = new JPanel();
         buttons.setOpaque(false);
         buttons.setLayout(new BoxLayout(buttons, BoxLayout.X_AXIS));
-        buttons.add(makeButton("Quit Game", COLOR_PRIMARY_BUTTON, COLOR_BUTTON_HOVER, () -> closedFuture.complete(true)));
+        buttons.add(makeButton("Quit Game", COLOR_PRIMARY_BUTTON, COLOR_BUTTON_HOVER, () -> closedFuture.complete(null)));
         content.add(buttons);
 
         content.add(Box.createVerticalStrut(32 - Y_SHADOW));
@@ -78,10 +78,9 @@ public void show() {
         frame.setVisible(true);
     }
 
-    public Boolean waitForClose() {
-        Boolean verdict = closedFuture.join();
+    public void waitForClose() {
+        closedFuture.join();
         close();
-        return verdict;
     }
 
     public void close() {
@@ -91,6 +90,6 @@ public void close() {
     public static void main(String[] args) {
         RestartUI ui = new RestartUI(List.of("Skytils"));
         ui.show();
-        System.out.println(ui.waitForClose());
+        ui.waitForClose();
     }
 }