lan/HMCL
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

将Settings中DEFAULT_PROFILE, HOME_PROFILE字段移至Profiles

Browse Source
This commit is contained in:
yushijinhun
2018-06-16 20:30:14 +08:00
parent 593159f4a6
commit 92e5eecaf2
2 changed files with 8 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -20,14 +20,18 @@ package org.jackhuang.hmcl.setting;
import org.jackhuang.hmcl.Launcher; import org.jackhuang.hmcl.Launcher;
public final class Profiles { public final class Profiles {
public static final String DEFAULT_PROFILE = "Default";
public static final String HOME_PROFILE = "Home";
private Profiles() { private Profiles() {
} }
public static String getProfileDisplayName(Profile profile) { public static String getProfileDisplayName(Profile profile) {
switch (profile.getName()) { switch (profile.getName()) {
case Settings.DEFAULT_PROFILE: case Profiles.DEFAULT_PROFILE:
return Launcher.i18n("profile.default"); return Launcher.i18n("profile.default");
case Settings.HOME_PROFILE: case Profiles.HOME_PROFILE:
return Launcher.i18n("profile.home"); return Launcher.i18n("profile.home");
default: default:
return profile.getName(); return profile.getName();

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

@@ -66,9 +66,6 @@ public class Settings {
.setPrettyPrinting() .setPrettyPrinting()
.create(); .create();
public static final String DEFAULT_PROFILE = "Default";
public static final String HOME_PROFILE = "Home";
public static final String SETTINGS_FILE_NAME = "hmcl.json"; public static final String SETTINGS_FILE_NAME = "hmcl.json";
public static final File SETTINGS_FILE = new File(SETTINGS_FILE_NAME).getAbsoluteFile(); public static final File SETTINGS_FILE = new File(SETTINGS_FILE_NAME).getAbsoluteFile();
@@ -562,8 +559,8 @@ public class Settings {
private void checkProfileMap() { private void checkProfileMap() {
if (getProfileMap().isEmpty()) { if (getProfileMap().isEmpty()) {
getProfileMap().put(DEFAULT_PROFILE, new Profile(DEFAULT_PROFILE)); getProfileMap().put(Profiles.DEFAULT_PROFILE, new Profile(Profiles.DEFAULT_PROFILE));
getProfileMap().put(HOME_PROFILE, new Profile(HOME_PROFILE, Launcher.MINECRAFT_DIRECTORY)); getProfileMap().put(Profiles.HOME_PROFILE, new Profile(Profiles.HOME_PROFILE, Launcher.MINECRAFT_DIRECTORY));
} }
} }