Fix an oversight where Loader can try to open a GUI in a headless env…

…ironment
QuiltMC · Jul 14, 2024 · 785b695 · 785b695
1 parent 09b6423
commit 785b695
Show file tree

Hide file tree

Showing 5 changed files with 8 additions and 3 deletions.
diff --git a/gradle.properties b/gradle.properties
@@ -5,7 +5,7 @@ group = org.quiltmc
 description = The mod loading component of Quilt
 url = https://github.com/quiltmc/quilt-loader
 # Don't forget to change this in QuiltLoaderImpl as well
-quilt_loader = 0.26.3
+quilt_loader = 0.26.4-beta.1
 
 # Fabric & Quilt Libraries
 asm = 9.6

diff --git a/src/main/java/org/quiltmc/loader/impl/QuiltLoaderImpl.java b/src/main/java/org/quiltmc/loader/impl/QuiltLoaderImpl.java
@@ -132,7 +132,7 @@ public final class QuiltLoaderImpl {
 
 	public static final int ASM_VERSION = Opcodes.ASM9;
 
-	public static final String VERSION = "0.26.3";
+	public static final String VERSION = "0.26.4-beta.1";
 	public static final String MOD_ID = "quilt_loader";
 	public static final String DEFAULT_MODS_DIR = "mods";
 	public static final String DEFAULT_CACHE_DIR = ".cache";

diff --git a/src/main/java/org/quiltmc/loader/impl/gui/QuiltFork.java b/src/main/java/org/quiltmc/loader/impl/gui/QuiltFork.java
@@ -16,6 +16,7 @@
 
 package org.quiltmc.loader.impl.gui;
 
+import java.awt.*;
 import java.awt.image.BufferedImage;
 import java.io.ByteArrayOutputStream;
 import java.io.File;
@@ -60,7 +61,7 @@ public class QuiltFork {
 
 	static {
 		GameProvider provider = QuiltLoaderImpl.INSTANCE.getGameProvider();
-		if (Boolean.getBoolean(SystemProperties.DISABLE_FORKED_GUIS) || !provider.canOpenGui()) {
+		if (Boolean.getBoolean(SystemProperties.DISABLE_FORKED_GUIS) || !provider.canOpenGui() || GraphicsEnvironment.isHeadless()) {
 			COMMS = null;
 			FORK_EXCEPTION = null;
 		} else {

diff --git a/src/main/resources/changelog/0.26.3.txt b/src/main/resources/changelog/0.26.3.txt
@@ -0,0 +1 @@
+Reverted all changes from 0.26.2
diff --git a/src/main/resources/changelog/0.26.4.txt b/src/main/resources/changelog/0.26.4.txt
@@ -0,0 +1,3 @@
+Bug fixes:
+
+- Fixed an oversight where Loader can try to open a GUI in a headless environment
Original file line number	Diff line number	Diff line change
		@@ -0,0 +1,3 @@
		Bug fixes:

		- Fixed an oversight where Loader can try to open a GUI in a headless environment