Merge 34cbbc7d103843a88d6805b28e0921396de5c1e6 into bd9ae189f83e33a6977bbe056774c851e96fe0a7

HMCL/src/main/java/org/jackhuang/hmcl/game/HMCLGameRepository.java

@@ -418,6 +418,7 @@ public final class HMCLGameRepository extends DefaultGameRepository {
                 .setNativesDir(vs.getNativesDir())
                 .setProcessPriority(vs.getProcessPriority())
                 .setRenderer(vs.getRenderer())
+                .setShowDebugLog(vs.isShowDebugLogsOutput())
                 .setUseNativeGLFW(vs.isUseNativeGLFW())
                 .setUseNativeOpenAL(vs.isUseNativeOpenAL())
                 .setDaemon(!makeLaunchScript && vs.getLauncherVisibility().isDaemon())

HMCL/src/main/java/org/jackhuang/hmcl/setting/VersionSetting.java

@@ -459,6 +459,20 @@ public final class VersionSetting implements Cloneable, Observable {
         showLogsProperty.set(showLogs);
     }
 
+    private final BooleanProperty showDebugLogsProperty = new SimpleBooleanProperty(this, "showDebugLogs", false);
+
+    public BooleanProperty showDebugLogsProperty() {
+        return showDebugLogsProperty;
+    }
+
+    public boolean isShowDebugLogsOutput() {
+        return showDebugLogsProperty.get();
+    }
+
+    public void setShowDebugLogs(boolean u) {
+        this.showDebugLogsProperty.set(u);
+    }
+
     // Minecraft settings.
 
     private final StringProperty serverIpProperty = new SimpleStringProperty(this, "serverIp", "");
@@ -775,6 +789,7 @@ public final class VersionSetting implements Cloneable, Observable {
             obj.addProperty("notCheckJVM", src.isNotCheckJVM());
             obj.addProperty("notPatchNatives", src.isNotPatchNatives());
             obj.addProperty("showLogs", src.isShowLogs());
+            obj.addProperty("showDebugLogs", src.isShowDebugLogsOutput());
             obj.addProperty("gameDir", src.getGameDir());
             obj.addProperty("launcherVisibility", src.getLauncherVisibility().ordinal());
             obj.addProperty("processPriority", src.getProcessPriority().ordinal());
@@ -845,6 +860,7 @@ public final class VersionSetting implements Cloneable, Observable {
             vs.setNotCheckJVM(Optional.ofNullable(obj.get("notCheckJVM")).map(JsonElement::getAsBoolean).orElse(false));
             vs.setNotPatchNatives(Optional.ofNullable(obj.get("notPatchNatives")).map(JsonElement::getAsBoolean).orElse(false));
             vs.setShowLogs(Optional.ofNullable(obj.get("showLogs")).map(JsonElement::getAsBoolean).orElse(false));
+            vs.setShowDebugLogs(Optional.ofNullable(obj.get("showDebugLogs")).map(JsonElement::getAsBoolean).orElse(false));
             vs.setLauncherVisibility(parseJsonPrimitive(obj.getAsJsonPrimitive("launcherVisibility"), LauncherVisibility.class, LauncherVisibility.HIDE));
             vs.setProcessPriority(parseJsonPrimitive(obj.getAsJsonPrimitive("processPriority"), ProcessPriority.class, ProcessPriority.NORMAL));
             vs.setUseNativeGLFW(Optional.ofNullable(obj.get("useNativeGLFW")).map(JsonElement::getAsBoolean).orElse(false));

HMCL/src/main/java/org/jackhuang/hmcl/ui/versions/VersionSettingsPage.java

@@ -111,6 +111,7 @@ public final class VersionSettingsPage extends StackPane implements DecoratorPag
     private final MultiFileItem.FileOption<GameDirectoryType> gameDirCustomOption;
     private final JFXComboBox<ProcessPriority> cboProcessPriority;
     private final OptionToggleButton showLogsPane;
+    private final OptionToggleButton showDebugLogsPane;
     private final ImagePickerItem iconPickerItem;
 
     private final ChangeListener<Collection<JavaRuntime>> javaListChangeListener;
@@ -411,6 +412,9 @@ public final class VersionSettingsPage extends StackPane implements DecoratorPag
             showLogsPane = new OptionToggleButton();
             showLogsPane.setTitle(i18n("settings.show_log"));
 
+            showDebugLogsPane = new OptionToggleButton();
+            showDebugLogsPane.setTitle(i18n("settings.show_debug_log"));
+
             BorderPane processPriorityPane = new BorderPane();
             {
                 Label label = new Label(i18n("settings.advanced.process_priority"));
@@ -476,6 +480,7 @@ public final class VersionSettingsPage extends StackPane implements DecoratorPag
                     launcherVisibilityPane,
                     dimensionPane,
                     showLogsPane,
+                    showDebugLogsPane,
                     processPriorityPane,
                     serverPane,
                     showAdvancedSettingPane
@@ -553,6 +558,7 @@ public final class VersionSettingsPage extends StackPane implements DecoratorPag
             chkAutoAllocate.selectedProperty().unbindBidirectional(lastVersionSetting.autoMemoryProperty());
             chkFullscreen.selectedProperty().unbindBidirectional(lastVersionSetting.fullscreenProperty());
             showLogsPane.selectedProperty().unbindBidirectional(lastVersionSetting.showLogsProperty());
+            showDebugLogsPane.selectedProperty().unbindBidirectional(lastVersionSetting.showDebugLogsProperty());
             FXUtils.unbindEnum(cboLauncherVisibility, lastVersionSetting.launcherVisibilityProperty());
             FXUtils.unbindEnum(cboProcessPriority, lastVersionSetting.processPriorityProperty());
 
@@ -587,6 +593,7 @@ public final class VersionSettingsPage extends StackPane implements DecoratorPag
         chkAutoAllocate.selectedProperty().bindBidirectional(versionSetting.autoMemoryProperty());
         chkFullscreen.selectedProperty().bindBidirectional(versionSetting.fullscreenProperty());
         showLogsPane.selectedProperty().bindBidirectional(versionSetting.showLogsProperty());
+        showDebugLogsPane.selectedProperty().bindBidirectional(versionSetting.showDebugLogsProperty());
         FXUtils.bindEnum(cboLauncherVisibility, versionSetting.launcherVisibilityProperty());
         FXUtils.bindEnum(cboProcessPriority, versionSetting.processPriorityProperty());
 

HMCL/src/main/resources/assets/lang/I18N.properties

@@ -1395,6 +1395,7 @@ settings.memory.unit.mib=MiB
 settings.memory.used_per_total=%1$.1f GiB Used / %2$.1f GiB Total
 settings.physical_memory=Physical Memory Size
 settings.show_log=Show Logs
+settings.show_debug_log=Output debug log
 settings.tabs.installers=Loaders
 settings.take_effect_after_restart=Applies After Restart
 settings.type=Settings Type of Instance

HMCL/src/main/resources/assets/lang/I18N_zh.properties

@@ -1183,6 +1183,7 @@ settings.memory.unit.mib=MiB
 settings.memory.used_per_total=已使用 %1$.1f GiB / 總記憶體 %2$.1f GiB
 settings.physical_memory=實體記憶體大小
 settings.show_log=查看日誌
+settings.show_debug_log=输出除錯日誌
 settings.tabs.installers=自動安裝
 settings.take_effect_after_restart=重啟後生效
 settings.type=實例遊戲設定類型

HMCL/src/main/resources/assets/lang/I18N_zh_CN.properties

@@ -1194,6 +1194,7 @@ settings.memory.unit.mib=MiB
 settings.memory.used_per_total=设备中已使用 %1$.1f GiB / 设备总内存 %2$.1f GiB
 settings.physical_memory=物理内存大小
 settings.show_log=查看日志
+settings.show_debug_log=输出调试日志
 settings.tabs.installers=自动安装
 settings.take_effect_after_restart=重启后生效
 settings.type=实例游戏设置类型

HMCLCore/src/main/java/org/jackhuang/hmcl/game/LaunchOptions.java

@@ -64,6 +64,7 @@ public class LaunchOptions implements Serializable {
     private Renderer renderer = Renderer.DEFAULT;
     private boolean useNativeGLFW;
     private boolean useNativeOpenAL;
+    private boolean showDebugLog;
     private boolean daemon;
 
     /**
@@ -282,6 +283,10 @@ public class LaunchOptions implements Serializable {
         return useNativeOpenAL;
     }
 
+    public boolean isShowDebugLog() {
+        return showDebugLog;
+    }
+
     /**
      * Will launcher keeps alive after game launched or not.
      */
@@ -497,5 +502,9 @@ public class LaunchOptions implements Serializable {
             return this;
         }
 
+        public Builder setShowDebugLog(boolean u) {
+            options.showDebugLog = u;
+            return this;
+        }
     }
 }

HMCLCore/src/main/java/org/jackhuang/hmcl/launch/DefaultLauncher.java

@@ -148,10 +148,15 @@ public class DefaultLauncher extends Launcher {
         res.addDefault("-Dcom.sun.jndi.rmi.object.trustURLCodebase=", "false");
         res.addDefault("-Dcom.sun.jndi.cosnaming.object.trustURLCodebase=", "false");
 
+        if (options.isShowDebugLog()) {
+            res.addDefault("-Dlog4j2.formatMsgNoLookups=", "false");
+            res.addDefault("-Dlog4j.configurationFile=", FileUtils.getAbsolutePath(getLog4jConfigurationFile()));
+        } else {
             String formatMsgNoLookups = res.addDefault("-Dlog4j2.formatMsgNoLookups=", "true");
             if (!"-Dlog4j2.formatMsgNoLookups=false".equals(formatMsgNoLookups) && isUsingLog4j()) {
                 res.addDefault("-Dlog4j.configurationFile=", FileUtils.getAbsolutePath(getLog4jConfigurationFile()));
             }
+        }
 
         // Default JVM Args
         if (!options.isNoGeneratedJVMArgs()) {
@@ -421,13 +426,23 @@ public class DefaultLauncher extends Launcher {
 
     public void extractLog4jConfigurationFile() throws IOException {
         Path targetFile = getLog4jConfigurationFile();
-        InputStream source;
+
+        String sourcePath = "/assets/game/log4j2-";
+
         if (GameVersionNumber.asGameVersion(repository.getGameVersion(version)).compareTo("1.12") < 0) {
-            source = DefaultLauncher.class.getResourceAsStream("/assets/game/log4j2-1.7.xml");
+            sourcePath += "1.7";
         } else {
-            source = DefaultLauncher.class.getResourceAsStream("/assets/game/log4j2-1.12.xml");
+            sourcePath += "1.12";
         }
 
+        if (options.isShowDebugLog()) {
+            sourcePath += "-debug";
+        }
+
+        sourcePath += ".xml";
+
+        InputStream source = DefaultLauncher.class.getResourceAsStream(sourcePath);
+
         try (InputStream input = source) {
             Files.copy(input, targetFile, StandardCopyOption.REPLACE_EXISTING);
         }

HMCLCore/src/main/resources/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>

HMCLCore/src/main/resources/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>