When the window is closed during loading, exit the game quickly (Mine…

…craftForge#3858)
28Smiles · May 2, 2017 · e4d04af · e4d04af
1 parent 91cc592
commit e4d04af
Show file tree

Hide file tree

Showing 5 changed files with 25 additions and 0 deletions.
diff --git a/src/main/java/net/minecraftforge/fml/client/FMLClientHandler.java b/src/main/java/net/minecraftforge/fml/client/FMLClientHandler.java
@@ -637,6 +637,12 @@ public boolean isLoading()
         return loading;
     }
 
+    @Override
+    public boolean isDisplayCloseRequested()
+    {
+        return Display.isCreated() && Display.isCloseRequested();
+    }
+
     @Override
     public boolean shouldServerShouldBeKilledQuietly()
     {

diff --git a/src/main/java/net/minecraftforge/fml/common/FMLCommonHandler.java b/src/main/java/net/minecraftforge/fml/common/FMLCommonHandler.java
@@ -438,6 +438,11 @@ public void confirmBackupLevelDatUse(SaveHandler handler)
         if (!confirmed) StartupQuery.abort();
     }
 
+    public boolean isDisplayCloseRequested()
+    {
+        return sidedDelegate != null && sidedDelegate.isDisplayCloseRequested();
+    }
+
     public boolean shouldServerBeKilledQuietly()
     {
         if (sidedDelegate == null)

diff --git a/src/main/java/net/minecraftforge/fml/common/IFMLSidedHandler.java b/src/main/java/net/minecraftforge/fml/common/IFMLSidedHandler.java
@@ -51,6 +51,8 @@ public interface IFMLSidedHandler
 
     MinecraftServer getServer();
 
+    boolean isDisplayCloseRequested();
+
     boolean shouldServerShouldBeKilledQuietly();
 
     void addModAsResource(ModContainer container);

diff --git a/src/main/java/net/minecraftforge/fml/common/LoadController.java b/src/main/java/net/minecraftforge/fml/common/LoadController.java
@@ -150,6 +150,12 @@ public void distributeStateMessage(LoaderState state, Object... eventData)
 
     public void transition(LoaderState desiredState, boolean forceState)
     {
+        if (FMLCommonHandler.instance().isDisplayCloseRequested())
+        {
+            FMLLog.info("The game window is being closed by the player, exiting.");
+            FMLCommonHandler.instance().exitJava(0, false);
+        }
+
         LoaderState oldState = state;
         state = state.transition(!errors.isEmpty());
         if (state != desiredState && !forceState)

diff --git a/src/main/java/net/minecraftforge/fml/server/FMLServerHandler.java b/src/main/java/net/minecraftforge/fml/server/FMLServerHandler.java
@@ -222,6 +222,12 @@ else if (cmd.equals("/stop"))
         }
     }
 
+    @Override
+    public boolean isDisplayCloseRequested()
+    {
+        return false;
+    }
+
     @Override
     public boolean shouldServerShouldBeKilledQuietly()
     {