From fa9e6e3362693aaf5fcdd62bca05bbec1e88dc8b Mon Sep 17 00:00:00 2001 From: 3arthqu4ke <56741599+3arthqu4ke@users.noreply.github.com> Date: Sat, 24 Aug 2024 00:10:02 +0200 Subject: [PATCH] Propagate JLine ENABLED better --- .../main/java/me/earth/headlessmc/jline/JLineProperties.java | 1 + .../headlessmc/launcher/launch/JavaLaunchCommandBuilder.java | 3 ++- 2 files changed, 3 insertions(+), 1 deletion(-) diff --git a/headlessmc-jline/src/main/java/me/earth/headlessmc/jline/JLineProperties.java b/headlessmc-jline/src/main/java/me/earth/headlessmc/jline/JLineProperties.java index adbc5fc..a5b789a 100644 --- a/headlessmc-jline/src/main/java/me/earth/headlessmc/jline/JLineProperties.java +++ b/headlessmc-jline/src/main/java/me/earth/headlessmc/jline/JLineProperties.java @@ -8,6 +8,7 @@ */ public interface JLineProperties { Property ENABLED = PropertyTypes.bool("hmc.jline.enabled"); + Property PROPAGATE_ENABLED = PropertyTypes.bool("hmc.jline.propagate.enabled"); Property PROVIDERS = PropertyTypes.string("hmc.jline.providers"); Property READ_PREFIX = PropertyTypes.string("hmc.jline.read.prefix"); diff --git a/headlessmc-launcher/src/main/java/me/earth/headlessmc/launcher/launch/JavaLaunchCommandBuilder.java b/headlessmc-launcher/src/main/java/me/earth/headlessmc/launcher/launch/JavaLaunchCommandBuilder.java index 9a1a05f..29f5398 100644 --- a/headlessmc-launcher/src/main/java/me/earth/headlessmc/launcher/launch/JavaLaunchCommandBuilder.java +++ b/headlessmc-launcher/src/main/java/me/earth/headlessmc/launcher/launch/JavaLaunchCommandBuilder.java @@ -86,7 +86,8 @@ public List build() throws LaunchException, AuthException { } CommandLineReader commandLineReader = launcher.getCommandLine().getCommandLineReader(); - if (runtime && commandLineReader instanceof JLineCommandLineReader && ((JLineCommandLineReader) commandLineReader).isDumb()) { + if (runtime && commandLineReader instanceof JLineCommandLineReader && ((JLineCommandLineReader) commandLineReader).isDumb() + || config.get(JLineProperties.PROPAGATE_ENABLED, true) && !config.get(JLineProperties.ENABLED, true)) { result.add(SystemPropertyHelper.toSystemProperty(JLineProperties.ENABLED.getName(), "false")); }