feat: 允许输出调试日志

ShirosakiMio · ShirosakiMio · commit 6935728aa9a4 · 2026-01-05T20:24:11.000+08:00
diff --git a/FCL/src/main/assets/game/log4j2-1.12-debug.xml b/FCL/src/main/assets/game/log4j2-1.12-debug.xml
@@ -0,0 +1,37 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<Configuration status="warn" packages="">
+    <Appenders>
+        <Console name="SysOut" target="SYSTEM_OUT">
+            <PatternLayout pattern="[%d{HH:mm:ss}] [%t/%level]: %msg{nolookups}%n" />
+        </Console>
+        <Queue name="ServerGuiConsole">
+            <PatternLayout pattern="[%d{HH:mm:ss} %level]: %msg{nolookups}%n" />
+        </Queue>
+        <RollingRandomAccessFile name="File" fileName="logs/latest.log" filePattern="logs/%d{yyyy-MM-dd}-%i.log.gz">
+            <PatternLayout pattern="[%d{HH:mm:ss}] [%t/%level] [%logger]: %msg{nolookups}%n"/>
+            <Policies>
+                <TimeBasedTriggeringPolicy/>
+                <OnStartupTriggeringPolicy/>
+            </Policies>
+        </RollingRandomAccessFile>
+        <RollingRandomAccessFile name="DebugFile" fileName="logs/debug.log" filePattern="logs/debug-%d{yyyy-MM-dd}-%i.log.gz">
+            <PatternLayout pattern="[%d{yyyy-MM-dd HH:mm:ss}] [%t/%level] [%logger]: %msg{nolookups}%n"/>
+            <Policies>
+                <TimeBasedTriggeringPolicy/>
+                <OnStartupTriggeringPolicy/>
+            </Policies>
+            <DefaultRolloverStrategy max="999" fileIndex="min"/>
+        </RollingRandomAccessFile>
+    </Appenders>
+    <Loggers>
+        <Root level="all">
+            <filters>
+                <MarkerFilter marker="NETWORK_PACKETS" onMatch="DENY" onMismatch="NEUTRAL"/>
+            </filters>
+            <AppenderRef ref="SysOut" level="info"/>
+            <AppenderRef ref="ServerGuiConsole" level="info"/>
+            <AppenderRef ref="File" level="info"/>
+            <AppenderRef ref="DebugFile" level="all"/>
+        </Root>
+    </Loggers>
+</Configuration>
diff --git a/FCL/src/main/assets/game/log4j2-1.7-debug.xml b/FCL/src/main/assets/game/log4j2-1.7-debug.xml
@@ -0,0 +1,36 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<Configuration status="WARN">
+    <Appenders>
+        <Console name="SysOut" target="SYSTEM_OUT">
+            <PatternLayout pattern="[%d{HH:mm:ss}] [%t/%level]: %msg%n" />
+        </Console>
+        <Queue name="ServerGuiConsole">
+            <PatternLayout pattern="[%d{HH:mm:ss} %level]: %msg%n" />
+        </Queue>
+        <RollingRandomAccessFile name="File" fileName="logs/latest.log" filePattern="logs/%d{yyyy-MM-dd}-%i.log.gz">
+            <PatternLayout pattern="[%d{HH:mm:ss}] [%t/%level] [%logger]: %msg%n"/>
+            <Policies>
+                <TimeBasedTriggeringPolicy/>
+                <OnStartupTriggeringPolicy/>
+            </Policies>
+        </RollingRandomAccessFile>
+        <RollingRandomAccessFile name="DebugFile" fileName="logs/debug.log" filePattern="logs/debug-%d{yyyy-MM-dd}-%i.log.gz">
+            <PatternLayout pattern="[%d{yyyy-MM-dd HH:mm:ss}] [%t/%level] [%logger]: %msg%n"/>
+            <Policies>
+                <TimeBasedTriggeringPolicy/>
+                <OnStartupTriggeringPolicy/>
+            </Policies>
+        </RollingRandomAccessFile>
+    </Appenders>
+    <Loggers>
+        <Root level="all">
+            <filters>
+                <MarkerFilter marker="NETWORK_PACKETS" onMatch="DENY" onMismatch="NEUTRAL"/>
+            </filters>
+            <AppenderRef ref="SysOut" level="info"/>
+            <AppenderRef ref="ServerGuiConsole" level="info"/>
+            <AppenderRef ref="File" level="info"/>
+            <AppenderRef ref="DebugFile" level="all"/>
+        </Root>
+    </Loggers>
+</Configuration>
diff --git a/FCL/src/main/java/com/tungsten/fcl/game/FCLGameRepository.java b/FCL/src/main/java/com/tungsten/fcl/game/FCLGameRepository.java
@@ -360,7 +360,8 @@ public LaunchOptions getLaunchOptions(String version, JavaVersion javaVersion, F
                 .setBEGesture(vs.isBeGesture())
                 .setVkDriverSystem(vs.isVKDriverSystem())
                 .setPojavBigCore(vs.isPojavBigCore())
-                .setRenderer(RendererManager.getRenderer(vs.getRenderer()));
+                .setRenderer(RendererManager.getRenderer(vs.getRenderer()))
+                .setDebugLog(vs.isDebugLog());
 
         File json = getModpackConfiguration(version);
         if (json.exists()) {
diff --git a/FCL/src/main/java/com/tungsten/fcl/setting/VersionSetting.kt b/FCL/src/main/java/com/tungsten/fcl/setting/VersionSetting.kt
@@ -239,6 +239,13 @@ class VersionSetting : Cloneable {
             notCheckModProperty.set(value)
         }
 
+    var debugLogProperty: BooleanProperty = SimpleBooleanProperty(this, "debugLog", false)
+    var isDebugLog: Boolean
+        get() = debugLogProperty.get()
+        set(value) {
+            debugLogProperty.set(value)
+        }
+
     fun checkController() {
         Controllers.addCallback {
             Controllers.checkControllers()
@@ -271,6 +278,7 @@ class VersionSetting : Cloneable {
         pojavBigCoreProperty.addListener(listener)
         uuidProperty.addListener(listener)
         notCheckModProperty.addListener(listener)
+        debugLogProperty.addListener(listener)
     }
 
     public override fun clone(): VersionSetting {
@@ -295,6 +303,7 @@ class VersionSetting : Cloneable {
             it.isPojavBigCore = isPojavBigCore
             it.uuid = uuid
             it.isNotCheckMod = isNotCheckMod
+            it.isDebugLog = isDebugLog
         }
     }
 
@@ -329,6 +338,7 @@ class VersionSetting : Cloneable {
                 addProperty("pojavBigCore", src.isPojavBigCore)
                 addProperty("uuid", src.uuid)
                 addProperty("notCheckMod", src.isNotCheckMod)
+                addProperty("debugLog", src.isDebugLog)
             }
         }
 
@@ -369,6 +379,7 @@ class VersionSetting : Cloneable {
                 vs.isPojavBigCore = json["pojavBigCore"]?.asBoolean ?: false
                 vs.uuid = json["uuid"]?.asString ?: ""
                 vs.isNotCheckMod = json["notCheckMod"]?.asBoolean ?: false
+                vs.isDebugLog = json["debugLog"]?.asBoolean ?: false
             }
         }
 
diff --git a/FCL/src/main/java/com/tungsten/fcl/ui/manage/VersionSettingPage.java b/FCL/src/main/java/com/tungsten/fcl/ui/manage/VersionSettingPage.java
@@ -94,6 +94,7 @@ public class VersionSettingPage extends FCLCommonPage implements ManageUI.Versio
     private FCLSwitch noGameCheckSwitch;
     private FCLSwitch noJVMCheckSwitch;
     private FCLSwitch noModCheckSwitch;
+    private FCLSwitch debugLogSwitch;
 
     private FCLImageButton javaButton;
     private FCLImageButton javaInstallButton;
@@ -150,6 +151,7 @@ private void create() {
         noGameCheckSwitch = findViewById(R.id.edit_not_check_game);
         noJVMCheckSwitch = findViewById(R.id.edit_not_check_java);
         noModCheckSwitch = findViewById(R.id.not_check_mod);
+        debugLogSwitch = findViewById(R.id.debug_log);
 
         isolateWorkingDirSwitch.disableProperty().bind(modpack);
         scaleFactorSeekbar.addProgressListener();
@@ -294,6 +296,7 @@ public void loadVersion(Profile profile, String versionId) {
             FXUtils.unbindBoolean(noGameCheckSwitch, lastVersionSetting.getNotCheckGameProperty());
             FXUtils.unbindBoolean(noJVMCheckSwitch, lastVersionSetting.getNotCheckJVMProperty());
             FXUtils.unbindBoolean(noModCheckSwitch, lastVersionSetting.getNotCheckModProperty());
+            FXUtils.unbindBoolean(debugLogSwitch, lastVersionSetting.getDebugLogProperty());
             FXUtils.unbindBoolean(beGestureSwitch, lastVersionSetting.getBeGestureProperty());
             FXUtils.unbindBoolean(vulkanDriverSystemSwitch, lastVersionSetting.getVkDriverSystemProperty());
             scaleFactorSeekbar.progressProperty().unbindBidirectional(lastVersionSetting.getScaleFactorProperty());
@@ -316,6 +319,7 @@ public void loadVersion(Profile profile, String versionId) {
         FXUtils.bindBoolean(noGameCheckSwitch, versionSetting.getNotCheckGameProperty());
         FXUtils.bindBoolean(noJVMCheckSwitch, versionSetting.getNotCheckJVMProperty());
         FXUtils.bindBoolean(noModCheckSwitch, versionSetting.getNotCheckModProperty());
+        FXUtils.bindBoolean(debugLogSwitch, versionSetting.getDebugLogProperty());
         FXUtils.bindBoolean(beGestureSwitch, versionSetting.getBeGestureProperty());
         FXUtils.bindBoolean(vulkanDriverSystemSwitch, versionSetting.getVkDriverSystemProperty());
         scaleFactorSeekbar.progressProperty().bindBidirectional(versionSetting.getScaleFactorProperty());
diff --git a/FCL/src/main/res/layout/page_version_setting.xml b/FCL/src/main/res/layout/page_version_setting.xml
@@ -578,6 +578,18 @@
                         android:layout_height="1dp"
                         android:background="@android:color/darker_gray" />
 
+                    <com.tungsten.fcllibrary.component.view.FCLSwitch
+                        android:id="@+id/debug_log"
+                        android:layout_width="match_parent"
+                        android:layout_height="wrap_content"
+                        android:layout_gravity="center"
+                        android:text="@string/settings_advanced_debug_log" />
+
+                    <View
+                        android:layout_width="match_parent"
+                        android:layout_height="1dp"
+                        android:background="@android:color/darker_gray" />
+
                     <androidx.appcompat.widget.LinearLayoutCompat
                         android:layout_width="match_parent"
                         android:layout_height="wrap_content"
diff --git a/FCL/src/main/res/values-zh/strings.xml b/FCL/src/main/res/values-zh/strings.xml
@@ -781,6 +781,7 @@
     <string name="settings_advanced_dont_check_game_completeness">不检查游戏完整性</string>
     <string name="settings_advanced_dont_check_jvm_validity">不检查 JVM 兼容性</string>
     <string name="settings_advanced_dont_check_mod">不检查模组兼容性</string>
+    <string name="settings_advanced_debug_log">输出调试日志</string>
     <string name="settings_advanced_game_dir_default">默认 (.minecraft/)</string>
     <string name="settings_advanced_game_dir_independent">各版本独立 (存放在 .minecraft/versions/&#60;版本名>/，除 assets、libraries 外)</string>
     <string name="settings_advanced_jvm_args">Java 虚拟机参数</string>
diff --git a/FCL/src/main/res/values/strings.xml b/FCL/src/main/res/values/strings.xml
@@ -828,6 +828,7 @@
     <string name="settings_advanced_dont_check_game_completeness">Do not check game integrity</string>
     <string name="settings_advanced_dont_check_jvm_validity">Do not check JVM compatibility</string>
     <string name="settings_advanced_dont_check_mod">Do not check Mod compatibility</string>
+    <string name="settings_advanced_debug_log">Output debug log</string>
     <string name="settings_advanced_game_dir_default">Default (.minecraft/)</string>
     <string name="settings_advanced_game_dir_independent">Isolated (.minecraft/versions/&#60;instance name>/, except for assets and libraries)</string>
     <string name="settings_advanced_jvm_args">Java VM arguments</string>
diff --git a/FCLCore/src/main/java/com/tungsten/fclcore/game/LaunchOptions.java b/FCLCore/src/main/java/com/tungsten/fclcore/game/LaunchOptions.java
@@ -48,6 +48,7 @@ public class LaunchOptions implements Serializable {
     private boolean pojavBigCore;
     private Renderer renderer;
     private String uuid;
+    private boolean debugLog;
 
     /**
      * The game directory
@@ -179,6 +180,10 @@ public String getUuid() {
         return uuid;
     }
 
+    public boolean isDebugLog() {
+        return debugLog;
+    }
+
     public static class Builder {
 
         private final LaunchOptions options = new LaunchOptions();
@@ -187,123 +192,20 @@ public LaunchOptions create() {
             return options;
         }
 
-        /**
-         * The game directory
-         */
-        public File getGameDir() {
-            return options.gameDir;
-        }
-
-        /**
-         * The Java Environment that Minecraft runs on.
-         */
-        public JavaVersion getJava() {
-            return options.java;
-        }
-
-        /**
-         * Will shown in the left bottom corner of the main menu of Minecraft.
-         * null if use the id of launch version.
-         */
-        public String getVersionName() {
-            return options.versionName;
-        }
-
-        /**
-         * Will shown in the left bottom corner of the main menu of Minecraft.
-         * null if use Version.versionType.
-         */
-        public String getVersionType() {
-            return options.versionType;
-        }
-
-        /**
-         * Don't know what the hell this is.
-         */
-        public String getProfileName() {
-            return options.profileName;
-        }
-
         /**
          * User custom additional minecraft command line arguments.
          */
         public List<String> getGameArguments() {
             return options.gameArguments;
         }
 
-        /**
-         * The highest priority JVM arguments (overrides the version setting)
-         */
-        public List<String> getOverrideJavaArguments() {
-            return options.overrideJavaArguments;
-        }
-
         /**
          * User custom additional java virtual machine command line arguments.
          */
         public List<String> getJavaArguments() {
             return options.javaArguments;
         }
 
-        public List<String> getJavaAgents() {
-            return options.javaAgents;
-        }
-
-        /**
-         * The minimum memory that the JVM can allocate.
-         */
-        public Integer getMinMemory() {
-            return options.minMemory;
-        }
-
-        /**
-         * The maximum memory that the JVM can allocate.
-         */
-        public Integer getMaxMemory() {
-            return options.maxMemory;
-        }
-
-        /**
-         * The initial game window width
-         */
-        public Integer getWidth() {
-            return options.width;
-        }
-
-        /**
-         * The initial game window height
-         */
-        public Integer getHeight() {
-            return options.height;
-        }
-
-        /**
-         * The server ip that will connect to when enter game main menu.
-         */
-        public String getServerIp() {
-            return options.serverIp;
-        }
-
-        /**
-         * BE Gesture
-         */
-        public boolean isBeGesture() {
-            return options.beGesture;
-        }
-
-        /**
-         * vulkanDriverSystem
-         */
-        public boolean isVKDriverSystem() {
-            return options.vulkanDriverSystem;
-        }
-
-        /**
-         * Renderer
-         */
-        public Renderer getRenderer() {
-            return options.renderer;
-        }
 
         public Builder setGameDir(File gameDir) {
             options.gameDir = gameDir;
@@ -404,5 +306,10 @@ public Builder setUUid(String uuid) {
             return this;
         }
 
+        public Builder setDebugLog(boolean debugLog) {
+            options.debugLog = debugLog;
+            return this;
+        }
+
     }
 }
diff --git a/FCLCore/src/main/java/com/tungsten/fclcore/launch/DefaultLauncher.java b/FCLCore/src/main/java/com/tungsten/fclcore/launch/DefaultLauncher.java
@@ -117,7 +117,7 @@ private CommandBuilder generateCommandLine() throws IOException {
         res.addDefault("-Dcom.sun.jndi.cosnaming.object.trustURLCodebase=", "false");
 
         String formatMsgNoLookups = res.addDefault("-Dlog4j2.formatMsgNoLookups=", "true");
-        if (!"-Dlog4j2.formatMsgNoLookups=false".equals(formatMsgNoLookups) && isUsingLog4j()) {
+        if (isUsingLog4j() && (options.isDebugLog() || !"-Dlog4j2.formatMsgNoLookups=false".equals(formatMsgNoLookups))) {
             res.addDefault("-Dlog4j.configurationFile=", getLog4jConfigurationFile().getAbsolutePath());
         }
 
@@ -412,12 +412,20 @@ public File getLog4jConfigurationFile() {
 
     public void extractLog4jConfigurationFile() throws IOException {
         File targetFile = getLog4jConfigurationFile();
-        if (targetFile.exists()) return;
         InputStream source;
-        if (GameVersionNumber.compare(repository.getGameVersion(version).orElse("0.0"), "1.12") < 0) {
-            source = DefaultLauncher.class.getResourceAsStream("/assets/game/log4j2-1.7.xml");
+
+        if (GameVersionNumber.asGameVersion(repository.getGameVersion(version)).compareTo("1.12") < 0) {
+            if (options.isDebugLog()) {
+                source = DefaultLauncher.class.getResourceAsStream("/assets/game/log4j2-1.7-debug.xml");
+            } else {
+                source = DefaultLauncher.class.getResourceAsStream("/assets/game/log4j2-1.7.xml");
+            }
         } else {
-            source = DefaultLauncher.class.getResourceAsStream("/assets/game/log4j2-1.12.xml");
+            if (options.isDebugLog()) {
+                source = DefaultLauncher.class.getResourceAsStream("/assets/game/log4j2-1.12-debug.xml");
+            } else {
+                source = DefaultLauncher.class.getResourceAsStream("/assets/game/log4j2-1.12.xml");
+            }
         }
 
         try (InputStream input = source; OutputStream output = new FileOutputStream(targetFile)) {

Original file line number	Diff line number	Diff line change
`@@ -239,6 +239,13 @@ class VersionSetting : Cloneable {`
`239`	`239`	`notCheckModProperty.set(value)`
`240`	`240`	`}`
`241`	`241`
	`242`	`+ var debugLogProperty: BooleanProperty = SimpleBooleanProperty(this, "debugLog", false)`
	`243`	`+ var isDebugLog: Boolean`
	`244`	`+ get() = debugLogProperty.get()`
	`245`	`+ set(value) {`
	`246`	`+ debugLogProperty.set(value)`
	`247`	`+ }`
	`248`	`+`
`242`	`249`	`fun checkController() {`
`243`	`250`	`Controllers.addCallback {`
`244`	`251`	`Controllers.checkControllers()`
`@@ -271,6 +278,7 @@ class VersionSetting : Cloneable {`
`271`	`278`	`pojavBigCoreProperty.addListener(listener)`
`272`	`279`	`uuidProperty.addListener(listener)`
`273`	`280`	`notCheckModProperty.addListener(listener)`
	`281`	`+ debugLogProperty.addListener(listener)`
`274`	`282`	`}`
`275`	`283`
`276`	`284`	`public override fun clone(): VersionSetting {`
`@@ -295,6 +303,7 @@ class VersionSetting : Cloneable {`
`295`	`303`	`it.isPojavBigCore = isPojavBigCore`
`296`	`304`	`it.uuid = uuid`
`297`	`305`	`it.isNotCheckMod = isNotCheckMod`
	`306`	`+ it.isDebugLog = isDebugLog`
`298`	`307`	`}`
`299`	`308`	`}`
`300`	`309`
`@@ -329,6 +338,7 @@ class VersionSetting : Cloneable {`
`329`	`338`	`addProperty("pojavBigCore", src.isPojavBigCore)`
`330`	`339`	`addProperty("uuid", src.uuid)`
`331`	`340`	`addProperty("notCheckMod", src.isNotCheckMod)`
	`341`	`+ addProperty("debugLog", src.isDebugLog)`
`332`	`342`	`}`
`333`	`343`	`}`
`334`	`344`
`@@ -369,6 +379,7 @@ class VersionSetting : Cloneable {`
`369`	`379`	`vs.isPojavBigCore = json["pojavBigCore"]?.asBoolean ?: false`
`370`	`380`	`vs.uuid = json["uuid"]?.asString ?: ""`
`371`	`381`	`vs.isNotCheckMod = json["notCheckMod"]?.asBoolean ?: false`
	`382`	`+ vs.isDebugLog = json["debugLog"]?.asBoolean ?: false`
`372`	`383`	`}`
`373`	`384`	`}`
`374`	`385`