Propagate JLine ENABLED better

3arthqu4ke · Aug 23, 2024 · fa9e6e3 · fa9e6e3
1 parent 06cb20d
commit fa9e6e3
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 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
@@ -8,6 +8,7 @@
  */
 public interface JLineProperties {
     Property<Boolean> ENABLED = PropertyTypes.bool("hmc.jline.enabled");
+    Property<Boolean> PROPAGATE_ENABLED = PropertyTypes.bool("hmc.jline.propagate.enabled");
 
     Property<String> PROVIDERS = PropertyTypes.string("hmc.jline.providers");
     Property<String> READ_PREFIX = PropertyTypes.string("hmc.jline.read.prefix");

diff --git a/...-launcher/src/main/java/me/earth/headlessmc/launcher/launch/JavaLaunchCommandBuilder.java b/...-launcher/src/main/java/me/earth/headlessmc/launcher/launch/JavaLaunchCommandBuilder.java
@@ -86,7 +86,8 @@ public List<String> 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"));
         }