From 785b695c9cc504bb6f587e1f6e652855cd61855e Mon Sep 17 00:00:00 2001 From: glitch Date: Sun, 14 Jul 2024 09:23:02 -0500 Subject: [PATCH] Fix an oversight where Loader can try to open a GUI in a headless environment --- gradle.properties | 2 +- src/main/java/org/quiltmc/loader/impl/QuiltLoaderImpl.java | 2 +- src/main/java/org/quiltmc/loader/impl/gui/QuiltFork.java | 3 ++- src/main/resources/changelog/0.26.3.txt | 1 + src/main/resources/changelog/0.26.4.txt | 3 +++ 5 files changed, 8 insertions(+), 3 deletions(-) create mode 100644 src/main/resources/changelog/0.26.3.txt create mode 100644 src/main/resources/changelog/0.26.4.txt diff --git a/gradle.properties b/gradle.properties index 4898377aa..ca3788281 100644 --- 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 index b19ec26dd..202390d5a 100644 --- 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 index cd86c53b2..6a9735eb2 100644 --- 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 new file mode 100644 index 000000000..53a9ee0e0 --- /dev/null +++ b/src/main/resources/changelog/0.26.3.txt @@ -0,0 +1 @@ +Reverted all changes from 0.26.2 \ No newline at end of file diff --git a/src/main/resources/changelog/0.26.4.txt b/src/main/resources/changelog/0.26.4.txt new file mode 100644 index 000000000..f1af64ab5 --- /dev/null +++ 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 \ No newline at end of file