diff options
| author | shedaniel <daniel@shedaniel.me> | 2021-12-12 22:05:02 +0800 |
|---|---|---|
| committer | shedaniel <daniel@shedaniel.me> | 2021-12-12 22:05:02 +0800 |
| commit | 14d4b4157d839c94cef6d44d96675d2f93257373 (patch) | |
| tree | bd61e64ca6e992e20b3520eb3994570958f32e3a | |
| parent | 1da4f6db847ef781da8a45a1951cad11f9c0449a (diff) | |
| parent | 4eb0290bb40c1a5ca5ec27161c73d8965f062bb2 (diff) | |
| download | architectury-loom-14d4b4157d839c94cef6d44d96675d2f93257373.tar.gz architectury-loom-14d4b4157d839c94cef6d44d96675d2f93257373.tar.bz2 architectury-loom-14d4b4157d839c94cef6d44d96675d2f93257373.zip | |
Merge remote-tracking branch 'FabricMC/dev/0.10' into dev/0.10.0
| -rw-r--r-- | src/main/java/net/fabricmc/loom/configuration/providers/LaunchProvider.java | 1 | ||||
| -rw-r--r-- | src/main/resources/log4j2.fabric.xml | 12 |
2 files changed, 7 insertions, 6 deletions
diff --git a/src/main/java/net/fabricmc/loom/configuration/providers/LaunchProvider.java b/src/main/java/net/fabricmc/loom/configuration/providers/LaunchProvider.java index 4ce6fb6a..2ea5c812 100644 --- a/src/main/java/net/fabricmc/loom/configuration/providers/LaunchProvider.java +++ b/src/main/java/net/fabricmc/loom/configuration/providers/LaunchProvider.java @@ -61,6 +61,7 @@ public class LaunchProvider extends DependencyProvider { .property("fabric.development", "true") .property("fabric.remapClasspathFile", getRemapClasspathFile().getAbsolutePath()) .property("log4j.configurationFile", getAllLog4JConfigFiles()) + .property("log4j2.formatMsgNoLookups", "true") .property("client", "java.library.path", getExtension().getMinecraftProvider().nativesDir().getAbsolutePath()) .property("client", "org.lwjgl.librarypath", getExtension().getMinecraftProvider().nativesDir().getAbsolutePath()); diff --git a/src/main/resources/log4j2.fabric.xml b/src/main/resources/log4j2.fabric.xml index 1feeddd6..c009f9fb 100644 --- a/src/main/resources/log4j2.fabric.xml +++ b/src/main/resources/log4j2.fabric.xml @@ -7,7 +7,7 @@ <PatternLayout> <LoggerNamePatternSelector defaultPattern="%style{[%d{HH:mm:ss}]}{blue} %highlight{[%t/%level]}{FATAL=red, ERROR=red, WARN=yellow, INFO=green, DEBUG=green, TRACE=blue} %style{(%logger{1})}{cyan} %highlight{%msg%n}{FATAL=red, ERROR=red, WARN=normal, INFO=normal, DEBUG=normal, TRACE=normal}" disableAnsi="${sys:fabric.log.disableAnsi:-true}"> <!-- Dont show the logger name for minecraft classes--> - <PatternMatch key="net.minecraft.,com.mojang." pattern="%style{[%d{HH:mm:ss}]}{blue} %highlight{[%t/%level]}{FATAL=red, ERROR=red, WARN=yellow, INFO=green, DEBUG=green, TRACE=blue} %style{(Minecraft)}{cyan} %highlight{%msg%n}{FATAL=red, ERROR=red, WARN=normal, INFO=normal, DEBUG=normal, TRACE=normal}"/> + <PatternMatch key="net.minecraft.,com.mojang." pattern="%style{[%d{HH:mm:ss}]}{blue} %highlight{[%t/%level]}{FATAL=red, ERROR=red, WARN=yellow, INFO=green, DEBUG=green, TRACE=blue} %style{(Minecraft)}{cyan} %highlight{%msg{nolookups}%n}{FATAL=red, ERROR=red, WARN=normal, INFO=normal, DEBUG=normal, TRACE=normal}"/> </LoggerNamePatternSelector> </PatternLayout> </Console> @@ -15,9 +15,9 @@ <!-- Vanilla server gui --> <Queue name="ServerGuiConsole" ignoreExceptions="true"> <PatternLayout> - <LoggerNamePatternSelector defaultPattern="[%d{HH:mm:ss} %level] (%logger{1}) %msg%n"> + <LoggerNamePatternSelector defaultPattern="[%d{HH:mm:ss} %level] (%logger{1}) %msg{nolookups}%n"> <!-- Dont show the logger name for minecraft classes--> - <PatternMatch key="net.minecraft.,com.mojang." pattern="[%d{HH:mm:ss} %level] %msg%n"/> + <PatternMatch key="net.minecraft.,com.mojang." pattern="[%d{HH:mm:ss} %level] %msg{nolookups}%n"/> </LoggerNamePatternSelector> </PatternLayout> </Queue> @@ -25,9 +25,9 @@ <!-- latest.log same as vanilla --> <RollingRandomAccessFile name="LatestFile" fileName="logs/latest.log" filePattern="logs/%d{yyyy-MM-dd}-%i.log.gz"> <PatternLayout> - <LoggerNamePatternSelector defaultPattern="[%d{HH:mm:ss}] [%t/%level] (%logger{1}) %msg%n"> + <LoggerNamePatternSelector defaultPattern="[%d{HH:mm:ss}] [%t/%level] (%logger{1}) %msg{nolookups}%n"> <!-- Dont show the logger name for minecraft classes--> - <PatternMatch key="net.minecraft.,com.mojang." pattern="[%d{HH:mm:ss}] [%t/%level] (Minecraft) %msg%n"/> + <PatternMatch key="net.minecraft.,com.mojang." pattern="[%d{HH:mm:ss}] [%t/%level] (Minecraft) %msg{nolookups}%n"/> </LoggerNamePatternSelector> </PatternLayout> <Policies> @@ -38,7 +38,7 @@ <!-- Debug log file --> <RollingRandomAccessFile name="DebugFile" fileName="logs/debug.log" filePattern="logs/debug-%i.log.gz"> - <PatternLayout pattern="[%d{HH:mm:ss}] [%t/%level] (%logger) %msg%n" /> + <PatternLayout pattern="[%d{HH:mm:ss}] [%t/%level] (%logger) %msg{nolookups}%n" /> <!-- Keep 5 files max --> <DefaultRolloverStrategy max="5" fileIndex="min"/> |