From ab08a8d3f59dd5e354f4355b67e7d582da0ec043 Mon Sep 17 00:00:00 2001 From: huangyuhui Date: Tue, 19 Jan 2016 23:16:13 +0800 Subject: [PATCH] getting core 4 --- .../{settings => core}/LauncherVisibility.java | 2 +- .../hellominecraft/launcher/core/ModInfo.java | 6 ------ .../hellominecraft/launcher/core/Profile.java | 13 +++++-------- .../core/assets/AssetsMojangLoader.java | 1 - .../launcher/core/download/DownloadType.java | 13 +++++++++++++ .../installers/MinecraftInstallerService.java | 1 - .../forge/MinecraftForgeVersionList.java | 6 +++--- .../core/service/IMinecraftService.java | 2 +- .../launcher/settings/Settings.java | 18 ++++++------------ .../version => utils}/ModpackUpdater.java | 2 +- .../launcher/views/GameSettingsPanel.java | 8 ++++---- .../launcher/views/MainPagePanel.java | 2 +- .../hellominecraft/utils/system/Java.java | 14 ++++++++++++++ .../hellominecraft/views/SwingUtils.java | 4 +++- .../servers/ServerPlugin.java | 14 +++++++------- .../mfcraft/CheckModsMinecraftProvider.java | 7 +++---- .../servers/mfcraft/MFCraftAuthenticator.java | 11 +++++------ .../servers/mfcraft/ServerArea.java | 2 +- 18 files changed, 68 insertions(+), 58 deletions(-) rename HMCL/src/main/java/org/jackhuang/hellominecraft/launcher/{settings => core}/LauncherVisibility.java (93%) rename HMCL/src/main/java/org/jackhuang/hellominecraft/launcher/{core/version => utils}/ModpackUpdater.java (95%) diff --git a/HMCL/src/main/java/org/jackhuang/hellominecraft/launcher/settings/LauncherVisibility.java b/HMCL/src/main/java/org/jackhuang/hellominecraft/launcher/core/LauncherVisibility.java similarity index 93% rename from HMCL/src/main/java/org/jackhuang/hellominecraft/launcher/settings/LauncherVisibility.java rename to HMCL/src/main/java/org/jackhuang/hellominecraft/launcher/core/LauncherVisibility.java index 93a9d3eb2..161ff9fe7 100755 --- a/HMCL/src/main/java/org/jackhuang/hellominecraft/launcher/settings/LauncherVisibility.java +++ b/HMCL/src/main/java/org/jackhuang/hellominecraft/launcher/core/LauncherVisibility.java @@ -15,7 +15,7 @@ * You should have received a copy of the GNU General Public License * along with this program. If not, see {http://www.gnu.org/licenses/}. */ -package org.jackhuang.hellominecraft.launcher.settings; +package org.jackhuang.hellominecraft.launcher.core; /** * diff --git a/HMCL/src/main/java/org/jackhuang/hellominecraft/launcher/core/ModInfo.java b/HMCL/src/main/java/org/jackhuang/hellominecraft/launcher/core/ModInfo.java index fd24591f9..5768d4d63 100755 --- a/HMCL/src/main/java/org/jackhuang/hellominecraft/launcher/core/ModInfo.java +++ b/HMCL/src/main/java/org/jackhuang/hellominecraft/launcher/core/ModInfo.java @@ -28,7 +28,6 @@ import java.util.zip.ZipFile; import org.jackhuang.hellominecraft.C; import org.jackhuang.hellominecraft.HMCLog; import org.jackhuang.hellominecraft.utils.StrUtils; -import org.jackhuang.hellominecraft.views.SwingUtils; import org.jackhuang.hellominecraft.utils.system.FileUtils; /** @@ -55,11 +54,6 @@ public class ModInfo implements Comparable { location = newf; } - public void showURL() { - if (url != null) - SwingUtils.openLink(url); - } - @Override public int compareTo(ModInfo o) { return getFileName().toLowerCase().compareTo(o.getFileName().toLowerCase()); diff --git a/HMCL/src/main/java/org/jackhuang/hellominecraft/launcher/core/Profile.java b/HMCL/src/main/java/org/jackhuang/hellominecraft/launcher/core/Profile.java index 893c670a8..a1780decd 100755 --- a/HMCL/src/main/java/org/jackhuang/hellominecraft/launcher/core/Profile.java +++ b/HMCL/src/main/java/org/jackhuang/hellominecraft/launcher/core/Profile.java @@ -21,10 +21,7 @@ import java.io.File; import org.jackhuang.hellominecraft.launcher.api.PluginManager; import org.jackhuang.hellominecraft.launcher.core.service.IMinecraftService; import org.jackhuang.hellominecraft.utils.system.IOUtils; -import org.jackhuang.hellominecraft.launcher.core.MCUtils; import org.jackhuang.hellominecraft.launcher.core.version.GameDirType; -import org.jackhuang.hellominecraft.launcher.settings.LauncherVisibility; -import org.jackhuang.hellominecraft.launcher.settings.Settings; import org.jackhuang.hellominecraft.utils.StrUtils; import org.jackhuang.hellominecraft.utils.Utils; import org.jackhuang.hellominecraft.utils.EventHandler; @@ -112,7 +109,7 @@ public final class Profile { public void setSelectedMinecraftVersion(String selectedMinecraftVersion) { this.selectedMinecraftVersion = selectedMinecraftVersion; - Settings.save(); + propertyChanged.execute("selectedMinecraftVersion"); selectedVersionChangedEvent.execute(selectedMinecraftVersion); } @@ -163,13 +160,13 @@ public final class Profile { } public Java getJava() { - return Settings.JAVA.get(getJavaIndexInAllJavas()); + return Java.JAVA.get(getJavaIndexInAllJavas()); } public int getJavaIndexInAllJavas() { if (StrUtils.isBlank(java) && StrUtils.isNotBlank(javaDir)) java = "Custom"; - int idx = Settings.JAVA.indexOf(new Java(java, null)); + int idx = Java.JAVA.indexOf(new Java(java, null)); if (idx == -1) { java = "Default"; idx = 0; @@ -179,9 +176,9 @@ public final class Profile { public void setJava(Java java) { if (java == null) - this.java = Settings.JAVA.get(0).getName(); + this.java = Java.JAVA.get(0).getName(); else { - int idx = Settings.JAVA.indexOf(java); + int idx = Java.JAVA.indexOf(java); if (idx == -1) return; this.java = java.getName(); diff --git a/HMCL/src/main/java/org/jackhuang/hellominecraft/launcher/core/assets/AssetsMojangLoader.java b/HMCL/src/main/java/org/jackhuang/hellominecraft/launcher/core/assets/AssetsMojangLoader.java index e5b527f5a..759985fe2 100755 --- a/HMCL/src/main/java/org/jackhuang/hellominecraft/launcher/core/assets/AssetsMojangLoader.java +++ b/HMCL/src/main/java/org/jackhuang/hellominecraft/launcher/core/assets/AssetsMojangLoader.java @@ -24,7 +24,6 @@ import java.util.Map; import org.jackhuang.hellominecraft.C; import org.jackhuang.hellominecraft.HMCLog; import org.jackhuang.hellominecraft.launcher.core.service.IMinecraftAssetService; -import org.jackhuang.hellominecraft.launcher.core.service.IMinecraftProvider; import org.jackhuang.hellominecraft.tasks.Task; import org.jackhuang.hellominecraft.utils.system.FileUtils; import org.jackhuang.hellominecraft.utils.system.IOUtils; diff --git a/HMCL/src/main/java/org/jackhuang/hellominecraft/launcher/core/download/DownloadType.java b/HMCL/src/main/java/org/jackhuang/hellominecraft/launcher/core/download/DownloadType.java index e1355f7cc..8dddea9b8 100755 --- a/HMCL/src/main/java/org/jackhuang/hellominecraft/launcher/core/download/DownloadType.java +++ b/HMCL/src/main/java/org/jackhuang/hellominecraft/launcher/core/download/DownloadType.java @@ -44,4 +44,17 @@ public enum DownloadType { public String getName() { return name; } + + private static DownloadType suggestedDownloadType = Mojang; + + public static DownloadType getSuggestedDownloadType() { + return suggestedDownloadType; + } + + public static void setSuggestedDownloadType(DownloadType suggestedDownloadType) { + if (suggestedDownloadType == null) + throw new IllegalArgumentException("download type should not be null."); + DownloadType.suggestedDownloadType = suggestedDownloadType; + } + } diff --git a/HMCL/src/main/java/org/jackhuang/hellominecraft/launcher/core/installers/MinecraftInstallerService.java b/HMCL/src/main/java/org/jackhuang/hellominecraft/launcher/core/installers/MinecraftInstallerService.java index e4ddf6a1b..0eea51e8a 100755 --- a/HMCL/src/main/java/org/jackhuang/hellominecraft/launcher/core/installers/MinecraftInstallerService.java +++ b/HMCL/src/main/java/org/jackhuang/hellominecraft/launcher/core/installers/MinecraftInstallerService.java @@ -19,7 +19,6 @@ package org.jackhuang.hellominecraft.launcher.core.installers; import org.jackhuang.hellominecraft.launcher.core.service.IMinecraftInstallerService; import java.io.File; -import org.jackhuang.hellominecraft.launcher.core.service.IMinecraftBasicService; import org.jackhuang.hellominecraft.launcher.core.service.IMinecraftService; import org.jackhuang.hellominecraft.launcher.core.installers.InstallerVersionList.InstallerVersion; import org.jackhuang.hellominecraft.launcher.core.installers.forge.ForgeInstaller; diff --git a/HMCL/src/main/java/org/jackhuang/hellominecraft/launcher/core/installers/forge/MinecraftForgeVersionList.java b/HMCL/src/main/java/org/jackhuang/hellominecraft/launcher/core/installers/forge/MinecraftForgeVersionList.java index 108eaf66a..fb31fe20a 100755 --- a/HMCL/src/main/java/org/jackhuang/hellominecraft/launcher/core/installers/forge/MinecraftForgeVersionList.java +++ b/HMCL/src/main/java/org/jackhuang/hellominecraft/launcher/core/installers/forge/MinecraftForgeVersionList.java @@ -23,7 +23,7 @@ import java.util.HashMap; import java.util.List; import java.util.Map; import org.jackhuang.hellominecraft.C; -import org.jackhuang.hellominecraft.launcher.settings.Settings; +import org.jackhuang.hellominecraft.launcher.core.download.DownloadType; import org.jackhuang.hellominecraft.utils.StrUtils; import org.jackhuang.hellominecraft.launcher.core.installers.InstallerVersionList; import org.jackhuang.hellominecraft.launcher.core.installers.InstallerVersionNewerComparator; @@ -51,7 +51,7 @@ public class MinecraftForgeVersionList extends InstallerVersionList { public void refreshList(String[] needed) throws Exception { if (root != null) return; - String s = NetUtils.get(Settings.getInstance().getDownloadSource().getProvider().getParsedLibraryDownloadURL(C.URL_FORGE_LIST)); + String s = NetUtils.get(DownloadType.getSuggestedDownloadType().getProvider().getParsedLibraryDownloadURL(C.URL_FORGE_LIST)); root = C.gson.fromJson(s, MinecraftForgeVersionRoot.class); @@ -70,7 +70,7 @@ public class MinecraftForgeVersionList extends InstallerVersionList { if (!StrUtils.isBlank(v.branch)) ver = ver + "-" + v.branch; String filename = root.artifact + "-" + ver + "-" + f[1] + "." + f[0]; - String url = Settings.getInstance().getDownloadSource().getProvider().getParsedLibraryDownloadURL(root.webpath + ver + "/" + filename); + String url = DownloadType.getSuggestedDownloadType().getProvider().getParsedLibraryDownloadURL(root.webpath + ver + "/" + filename); switch (f[1]) { case "installer": iv.installer = url; diff --git a/HMCL/src/main/java/org/jackhuang/hellominecraft/launcher/core/service/IMinecraftService.java b/HMCL/src/main/java/org/jackhuang/hellominecraft/launcher/core/service/IMinecraftService.java index 032d5574f..3fd8f6100 100644 --- a/HMCL/src/main/java/org/jackhuang/hellominecraft/launcher/core/service/IMinecraftService.java +++ b/HMCL/src/main/java/org/jackhuang/hellominecraft/launcher/core/service/IMinecraftService.java @@ -37,7 +37,7 @@ public abstract class IMinecraftService { } public DownloadType getDownloadType() { - return Settings.getInstance().getDownloadSource(); + return DownloadType.getSuggestedDownloadType(); } public abstract IMinecraftAssetService asset(); diff --git a/HMCL/src/main/java/org/jackhuang/hellominecraft/launcher/settings/Settings.java b/HMCL/src/main/java/org/jackhuang/hellominecraft/launcher/settings/Settings.java index a16b48037..4d9e6d2bb 100755 --- a/HMCL/src/main/java/org/jackhuang/hellominecraft/launcher/settings/Settings.java +++ b/HMCL/src/main/java/org/jackhuang/hellominecraft/launcher/settings/Settings.java @@ -29,14 +29,13 @@ import java.util.Map; import org.jackhuang.hellominecraft.C; import org.jackhuang.hellominecraft.HMCLog; import org.jackhuang.hellominecraft.launcher.Main; +import org.jackhuang.hellominecraft.launcher.core.download.DownloadType; import org.jackhuang.hellominecraft.utils.CollectionUtils; import org.jackhuang.hellominecraft.utils.system.FileUtils; import org.jackhuang.hellominecraft.utils.system.IOUtils; import org.jackhuang.hellominecraft.utils.MessageBox; import org.jackhuang.hellominecraft.utils.UpdateChecker; import org.jackhuang.hellominecraft.utils.VersionNumber; -import org.jackhuang.hellominecraft.utils.system.Java; -import org.jackhuang.hellominecraft.utils.system.OS; /** * @@ -51,7 +50,6 @@ public final class Settings { private static final Config SETTINGS; public static final UpdateChecker UPDATE_CHECKER = new UpdateChecker(new VersionNumber(Main.VERSION_FIRST, Main.VERSION_SECOND, Main.VERSION_THIRD), "hmcl"); - public static final List JAVA; public static Config getInstance() { return SETTINGS; @@ -59,6 +57,11 @@ public final class Settings { static { SETTINGS = initSettings(); + SETTINGS.downloadTypeChangedEvent.register((s, t) -> { + DownloadType.setSuggestedDownloadType(t); + return true; + }); + DownloadType.setSuggestedDownloadType(SETTINGS.getDownloadSource()); if (!getProfiles().containsKey(DEFAULT_PROFILE)) getProfiles().put(DEFAULT_PROFILE, new Profile()); @@ -69,15 +72,6 @@ public final class Settings { return true; }); } - - List temp = new ArrayList<>(); - temp.add(new Java("Default", System.getProperty("java.home"))); - temp.add(new Java("Custom", null)); - if (OS.os() == OS.WINDOWS) - temp.addAll(Java.queryAllJavaHomeInWindowsByReg()); - if (OS.os() == OS.OSX) - temp.addAll(Java.queryAllJDKInMac()); - JAVA = Collections.unmodifiableList(temp); } private static Config initSettings() { diff --git a/HMCL/src/main/java/org/jackhuang/hellominecraft/launcher/core/version/ModpackUpdater.java b/HMCL/src/main/java/org/jackhuang/hellominecraft/launcher/utils/ModpackUpdater.java similarity index 95% rename from HMCL/src/main/java/org/jackhuang/hellominecraft/launcher/core/version/ModpackUpdater.java rename to HMCL/src/main/java/org/jackhuang/hellominecraft/launcher/utils/ModpackUpdater.java index a2e4f0079..d3ba5789b 100755 --- a/HMCL/src/main/java/org/jackhuang/hellominecraft/launcher/core/version/ModpackUpdater.java +++ b/HMCL/src/main/java/org/jackhuang/hellominecraft/launcher/utils/ModpackUpdater.java @@ -15,7 +15,7 @@ * You should have received a copy of the GNU General Public License * along with this program. If not, see {http://www.gnu.org/licenses/}. */ -package org.jackhuang.hellominecraft.launcher.core.version; +package org.jackhuang.hellominecraft.launcher.utils; import java.io.File; import java.util.ArrayList; diff --git a/HMCL/src/main/java/org/jackhuang/hellominecraft/launcher/views/GameSettingsPanel.java b/HMCL/src/main/java/org/jackhuang/hellominecraft/launcher/views/GameSettingsPanel.java index 788f0f326..91fe28c28 100755 --- a/HMCL/src/main/java/org/jackhuang/hellominecraft/launcher/views/GameSettingsPanel.java +++ b/HMCL/src/main/java/org/jackhuang/hellominecraft/launcher/views/GameSettingsPanel.java @@ -43,7 +43,7 @@ import javax.swing.event.TableModelEvent; import javax.swing.table.DefaultTableModel; import org.jackhuang.hellominecraft.C; import org.jackhuang.hellominecraft.HMCLog; -import org.jackhuang.hellominecraft.launcher.settings.LauncherVisibility; +import org.jackhuang.hellominecraft.launcher.core.LauncherVisibility; import org.jackhuang.hellominecraft.launcher.core.Profile; import org.jackhuang.hellominecraft.launcher.settings.Settings; import org.jackhuang.hellominecraft.launcher.utils.FileNameFilter; @@ -91,7 +91,7 @@ public final class GameSettingsPanel extends AnimatedPanel implements DropTarget initExternalModsTable(); initTabs(); - for (Java j : Settings.JAVA) + for (Java j : Java.JAVA) cboJava.addItem(j.getLocalizedName()); dropTarget = new DropTarget(lstExternalMods, DnDConstants.ACTION_COPY_OR_MOVE, this); @@ -1045,7 +1045,7 @@ public final class GameSettingsPanel extends AnimatedPanel implements DropTarget return; int idx = cboJava.getSelectedIndex(); if (idx != -1) { - Java j = Settings.JAVA.get(idx); + Java j = Java.JAVA.get(idx); getProfile().setJava(j); txtJavaDir.setEnabled(idx == 1); txtJavaDir.setText(j.getHome() == null ? getProfile().getSettingsJavaDir() : j.getJava()); @@ -1080,7 +1080,7 @@ public final class GameSettingsPanel extends AnimatedPanel implements DropTarget private void lblModInfoMouseClicked(java.awt.event.MouseEvent evt) {//GEN-FIRST:event_lblModInfoMouseClicked int idx = lstExternalMods.getSelectedRow(); if (idx > 0 && idx < getProfile().service().mod().getMods().size()) - getProfile().service().mod().getMods().get(idx).showURL(); + SwingUtils.openLink(getProfile().service().mod().getMods().get(idx).url); }//GEN-LAST:event_lblModInfoMouseClicked private void btnChoosingGameDirActionPerformed(java.awt.event.ActionEvent evt) {//GEN-FIRST:event_btnChoosingGameDirActionPerformed diff --git a/HMCL/src/main/java/org/jackhuang/hellominecraft/launcher/views/MainPagePanel.java b/HMCL/src/main/java/org/jackhuang/hellominecraft/launcher/views/MainPagePanel.java index 3b3af6a45..b7456bdd6 100755 --- a/HMCL/src/main/java/org/jackhuang/hellominecraft/launcher/views/MainPagePanel.java +++ b/HMCL/src/main/java/org/jackhuang/hellominecraft/launcher/views/MainPagePanel.java @@ -38,7 +38,7 @@ import org.jackhuang.hellominecraft.utils.MessageBox; import org.jackhuang.hellominecraft.utils.StrUtils; import org.jackhuang.hellominecraft.launcher.core.version.MinecraftVersion; import org.jackhuang.hellominecraft.launcher.core.launch.GameLauncher; -import org.jackhuang.hellominecraft.launcher.settings.LauncherVisibility; +import org.jackhuang.hellominecraft.launcher.core.LauncherVisibility; import org.jackhuang.hellominecraft.launcher.settings.Settings; import org.jackhuang.hellominecraft.launcher.core.auth.AuthenticationException; import org.jackhuang.hellominecraft.lookandfeel.GraphicsUtils; diff --git a/HMCLAPI/src/main/java/org/jackhuang/hellominecraft/utils/system/Java.java b/HMCLAPI/src/main/java/org/jackhuang/hellominecraft/utils/system/Java.java index be7fe1524..b046ffb05 100755 --- a/HMCLAPI/src/main/java/org/jackhuang/hellominecraft/utils/system/Java.java +++ b/HMCLAPI/src/main/java/org/jackhuang/hellominecraft/utils/system/Java.java @@ -20,6 +20,7 @@ package org.jackhuang.hellominecraft.utils.system; import java.io.File; import java.io.IOException; import java.util.ArrayList; +import java.util.Collections; import java.util.List; import org.jackhuang.hellominecraft.C; import org.jackhuang.hellominecraft.HMCLog; @@ -30,6 +31,19 @@ import org.jackhuang.hellominecraft.HMCLog; */ public class Java { + public static final List JAVA; + + static { + List temp = new ArrayList<>(); + temp.add(new Java("Default", System.getProperty("java.home"))); + temp.add(new Java("Custom", null)); + if (OS.os() == OS.WINDOWS) + temp.addAll(Java.queryAllJavaHomeInWindowsByReg()); + if (OS.os() == OS.OSX) + temp.addAll(Java.queryAllJDKInMac()); + JAVA = Collections.unmodifiableList(temp); + } + String name, home; public Java(String name, String home) { diff --git a/HMCLAPI/src/main/java/org/jackhuang/hellominecraft/views/SwingUtils.java b/HMCLAPI/src/main/java/org/jackhuang/hellominecraft/views/SwingUtils.java index ddd435597..31bcefb93 100755 --- a/HMCLAPI/src/main/java/org/jackhuang/hellominecraft/views/SwingUtils.java +++ b/HMCLAPI/src/main/java/org/jackhuang/hellominecraft/views/SwingUtils.java @@ -100,9 +100,11 @@ public class SwingUtils { /** * Open URL by java.awt.Desktop * - * @param link + * @param link null is allowed but will be ignored */ public static void openLink(String link) { + if (link == null) + return; try { java.awt.Desktop.getDesktop().browse(new URI(link)); } catch (Throwable e) { diff --git a/HMCLServer/src/main/java/org.jackhuang.hellominecraft.launcher/servers/ServerPlugin.java b/HMCLServer/src/main/java/org.jackhuang.hellominecraft.launcher/servers/ServerPlugin.java index 1cf32fcc7..b1a464371 100755 --- a/HMCLServer/src/main/java/org.jackhuang.hellominecraft.launcher/servers/ServerPlugin.java +++ b/HMCLServer/src/main/java/org.jackhuang.hellominecraft.launcher/servers/ServerPlugin.java @@ -18,17 +18,17 @@ package org.jackhuang.hellominecraft.launcher.servers; import org.jackhuang.hellominecraft.launcher.api.IPlugin; -import org.jackhuang.hellominecraft.launcher.launch.IMinecraftService; +import org.jackhuang.hellominecraft.launcher.core.Profile; +import org.jackhuang.hellominecraft.launcher.core.service.IMinecraftService; import org.jackhuang.hellominecraft.launcher.servers.mfcraft.MFCraftAuthenticator; import org.jackhuang.hellominecraft.launcher.servers.mfcraft.MFCraftMinecraftService; import org.jackhuang.hellominecraft.launcher.servers.mfcraft.Servers; -import org.jackhuang.hellominecraft.launcher.settings.Profile; import org.jackhuang.hellominecraft.launcher.settings.Settings; -import org.jackhuang.hellominecraft.launcher.utils.auth.AuthenticationException; -import org.jackhuang.hellominecraft.launcher.utils.auth.IAuthenticator; -import org.jackhuang.hellominecraft.launcher.utils.auth.UserProfileProvider; -import org.jackhuang.hellominecraft.launcher.utils.auth.YggdrasilAuthenticator; -import org.jackhuang.hellominecraft.launcher.version.ServerInfo; +import org.jackhuang.hellominecraft.launcher.core.auth.AuthenticationException; +import org.jackhuang.hellominecraft.launcher.core.auth.IAuthenticator; +import org.jackhuang.hellominecraft.launcher.core.auth.UserProfileProvider; +import org.jackhuang.hellominecraft.launcher.core.auth.YggdrasilAuthenticator; +import org.jackhuang.hellominecraft.launcher.core.version.ServerInfo; import org.jackhuang.hellominecraft.launcher.views.MainFrame; import org.jackhuang.hellominecraft.launcher.views.ServerListView; import org.jackhuang.hellominecraft.utils.functions.Consumer; diff --git a/HMCLServer/src/main/java/org.jackhuang.hellominecraft.launcher/servers/mfcraft/CheckModsMinecraftProvider.java b/HMCLServer/src/main/java/org.jackhuang.hellominecraft.launcher/servers/mfcraft/CheckModsMinecraftProvider.java index 165c3551c..d1a2d376a 100755 --- a/HMCLServer/src/main/java/org.jackhuang.hellominecraft.launcher/servers/mfcraft/CheckModsMinecraftProvider.java +++ b/HMCLServer/src/main/java/org.jackhuang.hellominecraft.launcher/servers/mfcraft/CheckModsMinecraftProvider.java @@ -19,11 +19,10 @@ package org.jackhuang.hellominecraft.launcher.servers.mfcraft; import java.io.IOException; import org.jackhuang.hellominecraft.HMCLog; -import org.jackhuang.hellominecraft.launcher.launch.IMinecraftService; +import org.jackhuang.hellominecraft.launcher.core.service.IMinecraftService; import org.jackhuang.hellominecraft.launcher.servers.ServerPlugin; -import org.jackhuang.hellominecraft.launcher.settings.Profile; -import org.jackhuang.hellominecraft.launcher.version.MinecraftModService; -import org.jackhuang.hellominecraft.launcher.version.MinecraftVersionManager; +import org.jackhuang.hellominecraft.launcher.core.version.MinecraftModService; +import org.jackhuang.hellominecraft.launcher.core.version.MinecraftVersionManager; import org.jackhuang.hellominecraft.utils.ArrayUtils; /** diff --git a/HMCLServer/src/main/java/org.jackhuang.hellominecraft.launcher/servers/mfcraft/MFCraftAuthenticator.java b/HMCLServer/src/main/java/org.jackhuang.hellominecraft.launcher/servers/mfcraft/MFCraftAuthenticator.java index 9fa5b8b47..246e242c6 100755 --- a/HMCLServer/src/main/java/org.jackhuang.hellominecraft.launcher/servers/mfcraft/MFCraftAuthenticator.java +++ b/HMCLServer/src/main/java/org.jackhuang.hellominecraft.launcher/servers/mfcraft/MFCraftAuthenticator.java @@ -20,12 +20,11 @@ package org.jackhuang.hellominecraft.launcher.servers.mfcraft; import com.google.gson.JsonSyntaxException; import java.io.IOException; import org.jackhuang.hellominecraft.C; -import org.jackhuang.hellominecraft.launcher.utils.auth.AuthenticationException; -import org.jackhuang.hellominecraft.launcher.utils.auth.IAuthenticator; -import org.jackhuang.hellominecraft.launcher.utils.auth.LoginInfo; -import static org.jackhuang.hellominecraft.launcher.utils.auth.OfflineAuthenticator.getUUIDFromUserName; -import org.jackhuang.hellominecraft.launcher.utils.auth.UserProfileProvider; -import org.jackhuang.hellominecraft.launcher.version.ServerInfo; +import org.jackhuang.hellominecraft.launcher.core.auth.AuthenticationException; +import org.jackhuang.hellominecraft.launcher.core.auth.IAuthenticator; +import org.jackhuang.hellominecraft.launcher.core.auth.LoginInfo; +import static org.jackhuang.hellominecraft.launcher.core.auth.OfflineAuthenticator.getUUIDFromUserName; +import org.jackhuang.hellominecraft.launcher.core.auth.UserProfileProvider; import org.jackhuang.hellominecraft.utils.NetUtils; /** diff --git a/HMCLServer/src/main/java/org.jackhuang.hellominecraft.launcher/servers/mfcraft/ServerArea.java b/HMCLServer/src/main/java/org.jackhuang.hellominecraft.launcher/servers/mfcraft/ServerArea.java index 638bc0a2a..037ed4de2 100755 --- a/HMCLServer/src/main/java/org.jackhuang.hellominecraft.launcher/servers/mfcraft/ServerArea.java +++ b/HMCLServer/src/main/java/org.jackhuang.hellominecraft.launcher/servers/mfcraft/ServerArea.java @@ -18,7 +18,7 @@ package org.jackhuang.hellominecraft.launcher.servers.mfcraft; import java.util.ArrayList; -import org.jackhuang.hellominecraft.launcher.version.ServerInfo; +import org.jackhuang.hellominecraft.launcher.core.version.ServerInfo; /** *