AstralTransRocketries/HMCL
1
0
Fork 0
mirror of https://github.com/HMCL-dev/HMCL.git synced 2025-09-13 13:56:55 -04:00
Code Issues Packages Projects Releases Wiki Activity

Remove Settings.logLines

Browse Source
This commit is contained in:
yushijinhun 2018-09-15 23:18:59 +08:00
parent afad520669
commit 4a5ac1b899
No known key found for this signature in database
GPG Key ID: 5BC167F73EA558E4
3 changed files with 6 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
HMCL/src/main/java/org/jackhuang/hmcl/game/LauncherHelper.java
View File

@ -32,7 +32,6 @@ import org.jackhuang.hmcl.mod.CurseCompletionTask;
import org.jackhuang.hmcl.mod.ModpackConfiguration; import org.jackhuang.hmcl.mod.ModpackConfiguration;
import org.jackhuang.hmcl.setting.LauncherVisibility; import org.jackhuang.hmcl.setting.LauncherVisibility;
import org.jackhuang.hmcl.setting.Profile; import org.jackhuang.hmcl.setting.Profile;
import org.jackhuang.hmcl.setting.Settings;
import org.jackhuang.hmcl.setting.VersionSetting; import org.jackhuang.hmcl.setting.VersionSetting;
import org.jackhuang.hmcl.task.*; import org.jackhuang.hmcl.task.*;
import org.jackhuang.hmcl.ui.Controllers; import org.jackhuang.hmcl.ui.Controllers;
@ -50,6 +49,7 @@ import java.util.concurrent.ConcurrentLinkedQueue;
import java.util.concurrent.CountDownLatch; import java.util.concurrent.CountDownLatch;
import java.util.concurrent.atomic.AtomicInteger; import java.util.concurrent.atomic.AtomicInteger;
import static org.jackhuang.hmcl.setting.ConfigHolder.config;
import static org.jackhuang.hmcl.util.Lang.mapOf; import static org.jackhuang.hmcl.util.Lang.mapOf;
import static org.jackhuang.hmcl.util.Pair.pair; import static org.jackhuang.hmcl.util.Pair.pair;
import static org.jackhuang.hmcl.util.i18n.I18n.i18n; import static org.jackhuang.hmcl.util.i18n.I18n.i18n;
@ -443,7 +443,7 @@ public final class LauncherHelper {
System.out.print(log); System.out.print(log);
logs.add(pair(log, level)); logs.add(pair(log, level));
if (logs.size() > Settings.instance().getLogLines()) if (logs.size() > config().getLogLines())
logs.removeFirst(); logs.removeFirst();
if (setting.isShowLogs()) { if (setting.isShowLogs()) {

8
HMCL/src/main/java/org/jackhuang/hmcl/setting/Settings.java
View File

@ -61,14 +61,6 @@ public class Settings {
config().setFontSize(font.getSize()); config().setFontSize(font.getSize());
} }
public int getLogLines() {
return Math.max(config().getLogLines(), 100);
}
public void setLogLines(int logLines) {
config().setLogLines(logLines);
}
public static String getDefaultCommonDirectory() { public static String getDefaultCommonDirectory() {
return Launcher.MINECRAFT_DIRECTORY.getAbsolutePath(); return Launcher.MINECRAFT_DIRECTORY.getAbsolutePath();
} }

8
HMCL/src/main/java/org/jackhuang/hmcl/ui/LogWindow.java
View File

@ -181,7 +181,7 @@ public final class LogWindow extends Stage {
if (newValue == Worker.State.SUCCEEDED) { if (newValue == Worker.State.SUCCEEDED) {
document = engine.getDocument(); document = engine.getDocument();
body = document.getElementsByTagName("body").item(0); body = document.getElementsByTagName("body").item(0);
engine.executeScript("limitedLogs=" + Settings.instance().getLogLines()); engine.executeScript("limitedLogs=" + config().getLogLines());
latch.countDown(); latch.countDown();
onDone.fireEvent(new Event(LogWindow.this)); onDone.fireEvent(new Event(LogWindow.this));
} }
@ -189,14 +189,14 @@ public final class LogWindow extends Stage {
boolean flag = false; boolean flag = false;
for (String i : cboLines.getItems()) for (String i : cboLines.getItems())
if (Integer.toString(Settings.instance().getLogLines()).equals(i)) { if (Integer.toString(config().getLogLines()).equals(i)) {
cboLines.getSelectionModel().select(i); cboLines.getSelectionModel().select(i);
flag = true; flag = true;
} }
cboLines.getSelectionModel().selectedItemProperty().addListener((a, b, newValue) -> { cboLines.getSelectionModel().selectedItemProperty().addListener((a, b, newValue) -> {
Settings.instance().setLogLines(newValue == null ? 100 : Integer.parseInt(newValue)); config().setLogLines(newValue == null ? 100 : Integer.parseInt(newValue));
engine.executeScript("limitedLogs=" + Settings.instance().getLogLines()); engine.executeScript("limitedLogs=" + config().getLogLines());
}); });
if (!flag) if (!flag)