From 136452840da3aa338e079375178f80b995edee37 Mon Sep 17 00:00:00 2001
From: cpw <cpw+github@weeksfamily.ca>
Date: Sat, 28 Sep 2019 16:05:50 -0400
Subject: [PATCH] Remove forced ANSI terminal - it breaks the Eclipse terminal
 output. As a result, we can now support coloured log output again, by
 default.

Regen run configs to get the change (you should do this every update, you
know :D)

Signed-off-by: cpw <cpw+github@weeksfamily.ca>
---
 build.gradle                         | 7 -------
 src/fmllauncher/resources/log4j2.xml | 6 +++---
 2 files changed, 3 insertions(+), 10 deletions(-)

diff --git a/build.gradle b/build.gradle
index 8054a828c..52a6ba9ff 100644
--- a/build.gradle
+++ b/build.gradle
@@ -235,7 +235,6 @@ project(':forge') {
                 environment 'FORGE_SPEC', SPEC_VERSION
                 environment 'FORGE_VERSION', project.version.substring(MC_VERSION.length() + 1).toString()
                 environment 'LAUNCHER_VERSION', SPEC_VERSION
-                property 'terminal.ansi', 'true'
                 property 'org.lwjgl.system.SharedLibraryExtractDirectory', 'lwjgl_dll'
 
                 ideaModule "${rootProject.name}.${project.name}.userdev"
@@ -244,12 +243,6 @@ project(':forge') {
                 source sourceSets.userdev
             }
 
-            cpw_forge_client {
-                parent runs.forge_client
-                taskName 'cpw_forge_client'
-                property 'forge.logging.noansi', 'false'
-            }
-
             forge_test_client {
                 parent runs.forge_client
                 taskName 'forge_test_client'
diff --git a/src/fmllauncher/resources/log4j2.xml b/src/fmllauncher/resources/log4j2.xml
index 675b33c9d..e1a5e9ee2 100644
--- a/src/fmllauncher/resources/log4j2.xml
+++ b/src/fmllauncher/resources/log4j2.xml
@@ -20,10 +20,10 @@
     <Appenders>
         <TerminalConsole name="Console">
             <PatternLayout>
-                <LoggerNamePatternSelector defaultPattern="%highlight{[%d{HH:mm:ss}] [%t/%level] [%c{2.}/%markerSimpleName]: %minecraftFormatting{%msg}%n%tEx}" disableAnsi="${sys:forge.logging.noansi:-true}">
+                <LoggerNamePatternSelector defaultPattern="%highlightError{[%d{HH:mm:ss}] [%t/%level] [%c{2.}/%markerSimpleName]: %minecraftFormatting{%msg}%n%tEx}">
                     <!-- don't include the full logger name for Mojang's logs since they use full class names and it's very verbose -->
-                    <PatternMatch key="net.minecraft." pattern="%highlight{[%d{HH:mm:ss}] [%t/%level] [minecraft/%logger{1}]: %minecraftFormatting{%msg}%n%tEx}"/>
-                    <PatternMatch key="com.mojang." pattern="%highlight{[%d{HH:mm:ss}] [%t/%level] [mojang/%logger{1}]: %minecraftFormatting{%msg}%n%tEx}"/>
+                    <PatternMatch key="net.minecraft." pattern="%highlightError{[%d{HH:mm:ss}] [%t/%level] [minecraft/%logger{1}]: %minecraftFormatting{%msg}%n%tEx}"/>
+                    <PatternMatch key="com.mojang." pattern="%highlightError{[%d{HH:mm:ss}] [%t/%level] [mojang/%logger{1}]: %minecraftFormatting{%msg}%n%tEx}"/>
                 </LoggerNamePatternSelector>
             </PatternLayout>
         </TerminalConsole>