From e7d0624b968a55a5748921eea1467a8e688ee72d Mon Sep 17 00:00:00 2001 From: huangyuhui Date: Fri, 11 Mar 2016 23:05:31 +0800 Subject: [PATCH] Added default profile: Home whose default game directory is $USER/.minecraft --- .../jackhuang/hellominecraft/launcher/setting/Profile.java | 6 +++++- .../jackhuang/hellominecraft/launcher/setting/Settings.java | 6 +++++- 2 files changed, 10 insertions(+), 2 deletions(-) diff --git a/HMCL/src/main/java/org/jackhuang/hellominecraft/launcher/setting/Profile.java b/HMCL/src/main/java/org/jackhuang/hellominecraft/launcher/setting/Profile.java index df8b47182..b42672453 100755 --- a/HMCL/src/main/java/org/jackhuang/hellominecraft/launcher/setting/Profile.java +++ b/HMCL/src/main/java/org/jackhuang/hellominecraft/launcher/setting/Profile.java @@ -46,8 +46,12 @@ public final class Profile { } public Profile(String name) { + this(name, IOUtils.currentDir().getPath()); + } + + public Profile(String name, String gameDir) { this.name = name; - gameDir = MCUtils.getInitGameDir().getPath(); + this.gameDir = gameDir; } public Profile(String name, Profile v) { diff --git a/HMCL/src/main/java/org/jackhuang/hellominecraft/launcher/setting/Settings.java b/HMCL/src/main/java/org/jackhuang/hellominecraft/launcher/setting/Settings.java index 625702101..692e85585 100755 --- a/HMCL/src/main/java/org/jackhuang/hellominecraft/launcher/setting/Settings.java +++ b/HMCL/src/main/java/org/jackhuang/hellominecraft/launcher/setting/Settings.java @@ -25,6 +25,7 @@ import java.util.Map; import org.jackhuang.hellominecraft.util.C; import org.jackhuang.hellominecraft.util.logging.HMCLog; import org.jackhuang.hellominecraft.launcher.Main; +import org.jackhuang.hellominecraft.launcher.core.MCUtils; import org.jackhuang.hellominecraft.launcher.core.download.DownloadType; import org.jackhuang.hellominecraft.util.CollectionUtils; import org.jackhuang.hellominecraft.util.EventHandler; @@ -40,6 +41,7 @@ import org.jackhuang.hellominecraft.util.UpdateChecker; public final class Settings { public static final String DEFAULT_PROFILE = "Default"; + public static final String HOME_PROFILE = "Home"; public static final File SETTINGS_FILE = new File(IOUtils.currentDir(), "hmcl.json"); @@ -55,7 +57,9 @@ public final class Settings { SETTINGS.downloadTypeChangedEvent.register(DownloadType::setSuggestedDownloadType); DownloadType.setSuggestedDownloadType(SETTINGS.getDownloadSource()); if (!getProfiles().containsKey(DEFAULT_PROFILE)) - getProfiles().put(DEFAULT_PROFILE, new Profile()); + getProfiles().put(DEFAULT_PROFILE, new Profile(DEFAULT_PROFILE)); + if (!getProfiles().containsKey(HOME_PROFILE)) + getProfiles().put(HOME_PROFILE, new Profile(HOME_PROFILE, MCUtils.getLocation().getPath())); for (Map.Entry entry : getProfiles().entrySet()) { Profile e = entry.getValue();