From c035b6487e6a9b1fcdfa3f4bcf81d3d8f88e2976 Mon Sep 17 00:00:00 2001
From: embeddedt <42941056+embeddedt@users.noreply.github.com>
Date: Tue, 29 Apr 2025 18:28:15 -0400
Subject: [PATCH] Merge remote-tracking branch 'origin/1.20' into 1.21.1

---
 .../platform/neoforge/ModernFixPlatformHooksImpl.java       | 6 ++++++
 1 file changed, 6 insertions(+)

diff --git a/neoforge/src/main/java/org/embeddedt/modernfix/platform/neoforge/ModernFixPlatformHooksImpl.java b/neoforge/src/main/java/org/embeddedt/modernfix/platform/neoforge/ModernFixPlatformHooksImpl.java
index 3d717c7c..ee8aee0d 100644
--- a/neoforge/src/main/java/org/embeddedt/modernfix/platform/neoforge/ModernFixPlatformHooksImpl.java
+++ b/neoforge/src/main/java/org/embeddedt/modernfix/platform/neoforge/ModernFixPlatformHooksImpl.java
@@ -13,6 +13,7 @@ import net.neoforged.fml.ModLoadingIssue;
 import net.neoforged.fml.loading.FMLLoader;
 import net.neoforged.fml.loading.FMLPaths;
 import net.neoforged.fml.loading.LoadingModList;
+import net.neoforged.fml.loading.TracingPrintStream;
 import net.neoforged.fml.loading.moddiscovery.ModInfo;
 import net.neoforged.neoforge.common.NeoForge;
 import net.neoforged.neoforge.event.RegisterCommandsEvent;
@@ -25,6 +26,7 @@ import org.embeddedt.modernfix.platform.ModernFixPlatformHooks;
 import org.embeddedt.modernfix.spark.SparkLaunchProfiler;
 import org.embeddedt.modernfix.util.CommonModUtil;
 import org.objectweb.asm.tree.ClassNode;
+import org.slf4j.LoggerFactory;
 
 import java.nio.file.Path;
 import java.util.Map;
@@ -86,6 +88,10 @@ public class ModernFixPlatformHooksImpl implements ModernFixPlatformHooks {
             CommonModUtil.runWithoutCrash(() -> SparkLaunchProfiler.start("launch"), "Failed to start profiler");
         }
 
+        if(ModernFixMixinPlugin.instance.isOptionEnabled("feature.log_stdout_in_log_files.PrintStreamReplacement")) {
+            System.setOut(new TracingPrintStream(LoggerFactory.getLogger("STDOUT"), System.out));
+            System.setErr(new TracingPrintStream(LoggerFactory.getLogger("STDERR"), System.err));
+        }
     }
 
     public void applyASMTransformers(String mixinClassName, ClassNode targetClass) {