diff --git a/HMCL/build.gradle b/HMCL/build.gradle index 49b52dbdc..3ab9cb74b 100755 --- a/HMCL/build.gradle +++ b/HMCL/build.gradle @@ -26,7 +26,7 @@ if (!hasProperty('mainClass')) { ext.mainClass = 'org.jackhuang.hellominecraft.launcher.Main' } -def buildnumber = System.getenv("BUILD_NUMBER") == null ? ".8" : "."+System.getenv("BUILD_NUMBER") +def buildnumber = System.getenv("BUILD_NUMBER") == null ? ".9" : "."+System.getenv("BUILD_NUMBER") String mavenGroupId = 'HMCL' String mavenVersion = '2.3.5' + buildnumber diff --git a/HMCL/src/main/java/org/jackhuang/hellominecraft/launcher/Launcher.java b/HMCL/src/main/java/org/jackhuang/hellominecraft/launcher/Launcher.java index 5a01f708d..2314fd0c7 100755 --- a/HMCL/src/main/java/org/jackhuang/hellominecraft/launcher/Launcher.java +++ b/HMCL/src/main/java/org/jackhuang/hellominecraft/launcher/Launcher.java @@ -26,16 +26,16 @@ import java.net.URL; import java.net.URLClassLoader; import java.util.ArrayList; import javax.swing.SwingUtilities; -import org.jackhuang.hellominecraft.utils.C; -import org.jackhuang.hellominecraft.utils.logging.HMCLog; -import org.jackhuang.hellominecraft.utils.StrUtils; -import org.jackhuang.hellominecraft.utils.views.LogWindow; -import org.jackhuang.hellominecraft.launcher.utils.MinecraftCrashAdvicer; -import org.jackhuang.hellominecraft.utils.DoubleOutputStream; -import org.jackhuang.hellominecraft.utils.LauncherPrintStream; -import org.jackhuang.hellominecraft.utils.MathUtils; -import org.jackhuang.hellominecraft.utils.MessageBox; -import org.jackhuang.hellominecraft.utils.Utils; +import org.jackhuang.hellominecraft.util.C; +import org.jackhuang.hellominecraft.util.logging.HMCLog; +import org.jackhuang.hellominecraft.util.StrUtils; +import org.jackhuang.hellominecraft.util.ui.LogWindow; +import org.jackhuang.hellominecraft.launcher.util.MinecraftCrashAdvicer; +import org.jackhuang.hellominecraft.util.DoubleOutputStream; +import org.jackhuang.hellominecraft.util.LauncherPrintStream; +import org.jackhuang.hellominecraft.util.MathUtils; +import org.jackhuang.hellominecraft.util.MessageBox; +import org.jackhuang.hellominecraft.util.Utils; /** * diff --git a/HMCL/src/main/java/org/jackhuang/hellominecraft/launcher/Main.java b/HMCL/src/main/java/org/jackhuang/hellominecraft/launcher/Main.java index 1fbef0784..f4c0f9d1b 100755 --- a/HMCL/src/main/java/org/jackhuang/hellominecraft/launcher/Main.java +++ b/HMCL/src/main/java/org/jackhuang/hellominecraft/launcher/Main.java @@ -32,21 +32,21 @@ import javax.net.ssl.X509TrustManager; import javax.swing.ImageIcon; import javax.swing.UIManager; import javax.swing.UnsupportedLookAndFeelException; -import org.jackhuang.hellominecraft.utils.logging.HMCLog; +import org.jackhuang.hellominecraft.util.logging.HMCLog; import org.jackhuang.hellominecraft.launcher.api.PluginManager; import org.jackhuang.hellominecraft.launcher.core.launch.GameLauncher; -import org.jackhuang.hellominecraft.launcher.utils.CrashReporter; -import org.jackhuang.hellominecraft.utils.logging.Configuration; -import org.jackhuang.hellominecraft.utils.logging.appender.ConsoleAppender; -import org.jackhuang.hellominecraft.utils.logging.layout.DefaultLayout; -import org.jackhuang.hellominecraft.utils.views.LogWindow; -import org.jackhuang.hellominecraft.launcher.settings.Settings; -import org.jackhuang.hellominecraft.launcher.utils.upgrade.IUpgrader; -import org.jackhuang.hellominecraft.launcher.views.MainFrame; +import org.jackhuang.hellominecraft.launcher.util.CrashReporter; +import org.jackhuang.hellominecraft.util.logging.Configuration; +import org.jackhuang.hellominecraft.util.logging.appender.ConsoleAppender; +import org.jackhuang.hellominecraft.util.logging.layout.DefaultLayout; +import org.jackhuang.hellominecraft.util.ui.LogWindow; +import org.jackhuang.hellominecraft.launcher.setting.Settings; +import org.jackhuang.hellominecraft.launcher.util.upgrade.IUpgrader; +import org.jackhuang.hellominecraft.launcher.ui.MainFrame; import org.jackhuang.hellominecraft.lookandfeel.HelloMinecraftLookAndFeel; -import org.jackhuang.hellominecraft.utils.MathUtils; -import org.jackhuang.hellominecraft.utils.StrUtils; -import org.jackhuang.hellominecraft.utils.VersionNumber; +import org.jackhuang.hellominecraft.util.MathUtils; +import org.jackhuang.hellominecraft.util.StrUtils; +import org.jackhuang.hellominecraft.util.VersionNumber; /** * diff --git a/HMCL/src/main/java/org/jackhuang/hellominecraft/launcher/api/IPlugin.java b/HMCL/src/main/java/org/jackhuang/hellominecraft/launcher/api/IPlugin.java index 1cbe942fe..9b004edf7 100755 --- a/HMCL/src/main/java/org/jackhuang/hellominecraft/launcher/api/IPlugin.java +++ b/HMCL/src/main/java/org/jackhuang/hellominecraft/launcher/api/IPlugin.java @@ -17,12 +17,14 @@ */ package org.jackhuang.hellominecraft.launcher.api; +import org.jackhuang.hellominecraft.launcher.core.GameException; import org.jackhuang.hellominecraft.launcher.core.service.IMinecraftService; -import org.jackhuang.hellominecraft.launcher.settings.Profile; +import org.jackhuang.hellominecraft.launcher.setting.Profile; 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.utils.functions.Consumer; +import org.jackhuang.hellominecraft.launcher.core.launch.LaunchOptions; +import org.jackhuang.hellominecraft.util.func.Consumer; /** * @@ -59,5 +61,5 @@ public interface IPlugin { */ void onProcessingLoginResult(UserProfileProvider result) throws AuthenticationException; - void onInitializingProfile(Profile p); + void onProcessingLaunchOptions(LaunchOptions p) throws GameException; } diff --git a/HMCL/src/main/java/org/jackhuang/hellominecraft/launcher/api/PluginManager.java b/HMCL/src/main/java/org/jackhuang/hellominecraft/launcher/api/PluginManager.java index 1b60ff676..e6f30f2af 100755 --- a/HMCL/src/main/java/org/jackhuang/hellominecraft/launcher/api/PluginManager.java +++ b/HMCL/src/main/java/org/jackhuang/hellominecraft/launcher/api/PluginManager.java @@ -17,8 +17,8 @@ */ package org.jackhuang.hellominecraft.launcher.api; -import org.jackhuang.hellominecraft.utils.logging.HMCLog; -import org.jackhuang.hellominecraft.launcher.settings.DefaultPlugin; +import org.jackhuang.hellominecraft.util.logging.HMCLog; +import org.jackhuang.hellominecraft.launcher.setting.DefaultPlugin; /** * @@ -31,7 +31,7 @@ public class PluginManager { public static void getServerPlugin() { try { ClassLoader cl = Thread.currentThread().getContextClassLoader(); - Class c = cl.loadClass("org.jackhuang.hellominecraft.launcher.servers.ServerPlugin"); + Class c = cl.loadClass("org.jackhuang.hellominecraft.launcher.server.ServerPlugin"); IPlugin p = (IPlugin) c.newInstance(); NOW_PLUGIN = p; } catch (ClassNotFoundException ignore) { diff --git a/HMCL/src/main/java/org/jackhuang/hellominecraft/launcher/core/MCUtils.java b/HMCL/src/main/java/org/jackhuang/hellominecraft/launcher/core/MCUtils.java index 1d25c465a..7ded12ca0 100755 --- a/HMCL/src/main/java/org/jackhuang/hellominecraft/launcher/core/MCUtils.java +++ b/HMCL/src/main/java/org/jackhuang/hellominecraft/launcher/core/MCUtils.java @@ -19,9 +19,9 @@ package org.jackhuang.hellominecraft.launcher.core; import java.io.File; import java.io.IOException; -import org.jackhuang.hellominecraft.utils.system.FileUtils; -import org.jackhuang.hellominecraft.utils.system.IOUtils; -import org.jackhuang.hellominecraft.utils.system.OS; +import org.jackhuang.hellominecraft.util.system.FileUtils; +import org.jackhuang.hellominecraft.util.system.IOUtils; +import org.jackhuang.hellominecraft.util.system.OS; /** * 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 b74bed943..e0561e93f 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 @@ -25,10 +25,10 @@ import java.io.InputStreamReader; import java.util.List; import java.util.zip.ZipEntry; import java.util.zip.ZipFile; -import org.jackhuang.hellominecraft.utils.C; -import org.jackhuang.hellominecraft.utils.logging.HMCLog; -import org.jackhuang.hellominecraft.utils.StrUtils; -import org.jackhuang.hellominecraft.utils.system.FileUtils; +import org.jackhuang.hellominecraft.util.C; +import org.jackhuang.hellominecraft.util.logging.HMCLog; +import org.jackhuang.hellominecraft.util.StrUtils; +import org.jackhuang.hellominecraft.util.system.FileUtils; /** * diff --git a/HMCL/src/main/java/org/jackhuang/hellominecraft/launcher/core/assets/AssetsIndex.java b/HMCL/src/main/java/org/jackhuang/hellominecraft/launcher/core/asset/AssetsIndex.java similarity index 95% rename from HMCL/src/main/java/org/jackhuang/hellominecraft/launcher/core/assets/AssetsIndex.java rename to HMCL/src/main/java/org/jackhuang/hellominecraft/launcher/core/asset/AssetsIndex.java index f8120b3ff..f60cf506f 100755 --- a/HMCL/src/main/java/org/jackhuang/hellominecraft/launcher/core/assets/AssetsIndex.java +++ b/HMCL/src/main/java/org/jackhuang/hellominecraft/launcher/core/asset/AssetsIndex.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.assets; +package org.jackhuang.hellominecraft.launcher.core.asset; import java.util.HashSet; import java.util.LinkedHashMap; 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/asset/AssetsMojangLoader.java similarity index 88% rename from HMCL/src/main/java/org/jackhuang/hellominecraft/launcher/core/assets/AssetsMojangLoader.java rename to HMCL/src/main/java/org/jackhuang/hellominecraft/launcher/core/asset/AssetsMojangLoader.java index e93e9468c..9e4079a80 100755 --- a/HMCL/src/main/java/org/jackhuang/hellominecraft/launcher/core/assets/AssetsMojangLoader.java +++ b/HMCL/src/main/java/org/jackhuang/hellominecraft/launcher/core/asset/AssetsMojangLoader.java @@ -15,22 +15,22 @@ * 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.assets; +package org.jackhuang.hellominecraft.launcher.core.asset; import java.io.File; import java.util.ArrayList; import java.util.Map; -import org.jackhuang.hellominecraft.utils.C; -import org.jackhuang.hellominecraft.utils.logging.HMCLog; +import org.jackhuang.hellominecraft.util.C; +import org.jackhuang.hellominecraft.util.logging.HMCLog; import org.jackhuang.hellominecraft.launcher.core.service.IMinecraftAssetService; -import org.jackhuang.hellominecraft.utils.tasks.Task; -import org.jackhuang.hellominecraft.utils.system.FileUtils; -import org.jackhuang.hellominecraft.utils.system.IOUtils; -import org.jackhuang.hellominecraft.utils.StrUtils; +import org.jackhuang.hellominecraft.util.tasks.Task; +import org.jackhuang.hellominecraft.util.system.FileUtils; +import org.jackhuang.hellominecraft.util.system.IOUtils; +import org.jackhuang.hellominecraft.util.StrUtils; import org.jackhuang.hellominecraft.launcher.core.download.IDownloadProvider; import org.jackhuang.hellominecraft.launcher.core.version.MinecraftVersion; -import org.jackhuang.hellominecraft.utils.OverridableSwingWorker; -import org.jackhuang.hellominecraft.utils.VersionNumber; +import org.jackhuang.hellominecraft.util.OverridableSwingWorker; +import org.jackhuang.hellominecraft.util.VersionNumber; /** * diff --git a/HMCL/src/main/java/org/jackhuang/hellominecraft/launcher/core/assets/AssetsObject.java b/HMCL/src/main/java/org/jackhuang/hellominecraft/launcher/core/asset/AssetsObject.java similarity index 96% rename from HMCL/src/main/java/org/jackhuang/hellominecraft/launcher/core/assets/AssetsObject.java rename to HMCL/src/main/java/org/jackhuang/hellominecraft/launcher/core/asset/AssetsObject.java index d86cb8c50..d7df4f77a 100755 --- a/HMCL/src/main/java/org/jackhuang/hellominecraft/launcher/core/assets/AssetsObject.java +++ b/HMCL/src/main/java/org/jackhuang/hellominecraft/launcher/core/asset/AssetsObject.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.assets; +package org.jackhuang.hellominecraft.launcher.core.asset; /** * diff --git a/HMCL/src/main/java/org/jackhuang/hellominecraft/launcher/core/assets/Contents.java b/HMCL/src/main/java/org/jackhuang/hellominecraft/launcher/core/asset/Contents.java similarity index 93% rename from HMCL/src/main/java/org/jackhuang/hellominecraft/launcher/core/assets/Contents.java rename to HMCL/src/main/java/org/jackhuang/hellominecraft/launcher/core/asset/Contents.java index d405c7526..9b143cada 100755 --- a/HMCL/src/main/java/org/jackhuang/hellominecraft/launcher/core/assets/Contents.java +++ b/HMCL/src/main/java/org/jackhuang/hellominecraft/launcher/core/asset/Contents.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.assets; +package org.jackhuang.hellominecraft.launcher.core.asset; /** * diff --git a/HMCL/src/main/java/org/jackhuang/hellominecraft/launcher/core/assets/IAssetsHandler.java b/HMCL/src/main/java/org/jackhuang/hellominecraft/launcher/core/asset/IAssetsHandler.java similarity index 89% rename from HMCL/src/main/java/org/jackhuang/hellominecraft/launcher/core/assets/IAssetsHandler.java rename to HMCL/src/main/java/org/jackhuang/hellominecraft/launcher/core/asset/IAssetsHandler.java index 6333d8c4a..44ae1c681 100755 --- a/HMCL/src/main/java/org/jackhuang/hellominecraft/launcher/core/assets/IAssetsHandler.java +++ b/HMCL/src/main/java/org/jackhuang/hellominecraft/launcher/core/asset/IAssetsHandler.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.assets; +package org.jackhuang.hellominecraft.launcher.core.asset; import java.io.File; import java.io.FileInputStream; @@ -23,17 +23,17 @@ import java.io.IOException; import java.util.ArrayList; import java.util.Collection; import java.util.List; -import org.jackhuang.hellominecraft.utils.C; -import org.jackhuang.hellominecraft.utils.logging.HMCLog; +import org.jackhuang.hellominecraft.util.C; +import org.jackhuang.hellominecraft.util.logging.HMCLog; import org.jackhuang.hellominecraft.launcher.core.service.IMinecraftAssetService; import org.jackhuang.hellominecraft.launcher.core.download.IDownloadProvider; import org.jackhuang.hellominecraft.launcher.core.version.MinecraftVersion; -import org.jackhuang.hellominecraft.utils.tasks.Task; -import org.jackhuang.hellominecraft.utils.tasks.download.FileDownloadTask; -import org.jackhuang.hellominecraft.utils.code.DigestUtils; -import org.jackhuang.hellominecraft.utils.system.IOUtils; -import org.jackhuang.hellominecraft.utils.NetUtils; -import org.jackhuang.hellominecraft.utils.OverridableSwingWorker; +import org.jackhuang.hellominecraft.util.tasks.Task; +import org.jackhuang.hellominecraft.util.tasks.download.FileDownloadTask; +import org.jackhuang.hellominecraft.util.code.DigestUtils; +import org.jackhuang.hellominecraft.util.system.IOUtils; +import org.jackhuang.hellominecraft.util.NetUtils; +import org.jackhuang.hellominecraft.util.OverridableSwingWorker; /** * Assets diff --git a/HMCL/src/main/java/org/jackhuang/hellominecraft/launcher/core/assets/MinecraftAssetService.java b/HMCL/src/main/java/org/jackhuang/hellominecraft/launcher/core/asset/MinecraftAssetService.java similarity index 90% rename from HMCL/src/main/java/org/jackhuang/hellominecraft/launcher/core/assets/MinecraftAssetService.java rename to HMCL/src/main/java/org/jackhuang/hellominecraft/launcher/core/asset/MinecraftAssetService.java index 861f1d746..1dc4a919e 100755 --- a/HMCL/src/main/java/org/jackhuang/hellominecraft/launcher/core/assets/MinecraftAssetService.java +++ b/HMCL/src/main/java/org/jackhuang/hellominecraft/launcher/core/asset/MinecraftAssetService.java @@ -15,20 +15,20 @@ * 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.assets; +package org.jackhuang.hellominecraft.launcher.core.asset; import com.google.gson.JsonSyntaxException; import java.io.File; import java.io.IOException; -import org.jackhuang.hellominecraft.utils.C; +import org.jackhuang.hellominecraft.util.C; import org.jackhuang.hellominecraft.launcher.core.service.IMinecraftAssetService; import org.jackhuang.hellominecraft.launcher.core.service.IMinecraftService; import org.jackhuang.hellominecraft.launcher.core.version.MinecraftVersion; -import org.jackhuang.hellominecraft.utils.tasks.Task; -import org.jackhuang.hellominecraft.utils.tasks.TaskWindow; -import org.jackhuang.hellominecraft.utils.tasks.download.FileDownloadTask; -import org.jackhuang.hellominecraft.utils.system.FileUtils; -import org.jackhuang.hellominecraft.utils.system.IOUtils; +import org.jackhuang.hellominecraft.util.tasks.Task; +import org.jackhuang.hellominecraft.util.tasks.TaskWindow; +import org.jackhuang.hellominecraft.util.tasks.download.FileDownloadTask; +import org.jackhuang.hellominecraft.util.system.FileUtils; +import org.jackhuang.hellominecraft.util.system.IOUtils; /** * diff --git a/HMCL/src/main/java/org/jackhuang/hellominecraft/launcher/core/auth/BestLogin.java b/HMCL/src/main/java/org/jackhuang/hellominecraft/launcher/core/auth/BestLogin.java index c93861eb7..7122acb30 100755 --- a/HMCL/src/main/java/org/jackhuang/hellominecraft/launcher/core/auth/BestLogin.java +++ b/HMCL/src/main/java/org/jackhuang/hellominecraft/launcher/core/auth/BestLogin.java @@ -21,7 +21,7 @@ import java.io.IOException; import java.io.InputStream; import java.io.OutputStream; import java.net.Socket; -import org.jackhuang.hellominecraft.utils.code.DigestUtils; +import org.jackhuang.hellominecraft.util.code.DigestUtils; /** * diff --git a/HMCL/src/main/java/org/jackhuang/hellominecraft/launcher/core/auth/OfflineAuthenticator.java b/HMCL/src/main/java/org/jackhuang/hellominecraft/launcher/core/auth/OfflineAuthenticator.java index 80e090749..ab8372a97 100755 --- a/HMCL/src/main/java/org/jackhuang/hellominecraft/launcher/core/auth/OfflineAuthenticator.java +++ b/HMCL/src/main/java/org/jackhuang/hellominecraft/launcher/core/auth/OfflineAuthenticator.java @@ -19,9 +19,9 @@ package org.jackhuang.hellominecraft.launcher.core.auth; import java.util.HashMap; import java.util.Map; -import org.jackhuang.hellominecraft.utils.C; -import org.jackhuang.hellominecraft.utils.StrUtils; -import org.jackhuang.hellominecraft.utils.code.DigestUtils; +import org.jackhuang.hellominecraft.util.C; +import org.jackhuang.hellominecraft.util.StrUtils; +import org.jackhuang.hellominecraft.util.code.DigestUtils; /** * diff --git a/HMCL/src/main/java/org/jackhuang/hellominecraft/launcher/core/auth/SkinmeAuthenticator.java b/HMCL/src/main/java/org/jackhuang/hellominecraft/launcher/core/auth/SkinmeAuthenticator.java index 3647603ee..4356e1032 100755 --- a/HMCL/src/main/java/org/jackhuang/hellominecraft/launcher/core/auth/SkinmeAuthenticator.java +++ b/HMCL/src/main/java/org/jackhuang/hellominecraft/launcher/core/auth/SkinmeAuthenticator.java @@ -17,10 +17,10 @@ */ package org.jackhuang.hellominecraft.launcher.core.auth; -import org.jackhuang.hellominecraft.utils.C; -import org.jackhuang.hellominecraft.utils.code.DigestUtils; -import org.jackhuang.hellominecraft.utils.NetUtils; -import org.jackhuang.hellominecraft.utils.views.Selector; +import org.jackhuang.hellominecraft.util.C; +import org.jackhuang.hellominecraft.util.code.DigestUtils; +import org.jackhuang.hellominecraft.util.NetUtils; +import org.jackhuang.hellominecraft.util.ui.Selector; /** * diff --git a/HMCL/src/main/java/org/jackhuang/hellominecraft/launcher/core/auth/UserProfileProvider.java b/HMCL/src/main/java/org/jackhuang/hellominecraft/launcher/core/auth/UserProfileProvider.java index c2fd831ca..348bb02c2 100755 --- a/HMCL/src/main/java/org/jackhuang/hellominecraft/launcher/core/auth/UserProfileProvider.java +++ b/HMCL/src/main/java/org/jackhuang/hellominecraft/launcher/core/auth/UserProfileProvider.java @@ -17,8 +17,6 @@ */ package org.jackhuang.hellominecraft.launcher.core.auth; -import org.jackhuang.hellominecraft.launcher.core.version.ServerInfo; - /** * * @author huangyuhui @@ -108,13 +106,4 @@ public final class UserProfileProvider { private String otherInfo = ""; private String clientIdentifier = ""; private String userType = "Offline"; - private ServerInfo server = null; - - public ServerInfo getServer() { - return server; - } - - public void setServer(ServerInfo server) { - this.server = server; - } } diff --git a/HMCL/src/main/java/org/jackhuang/hellominecraft/launcher/core/auth/YggdrasilAuthenticator.java b/HMCL/src/main/java/org/jackhuang/hellominecraft/launcher/core/auth/YggdrasilAuthenticator.java index 7efd27c88..30a4d0fb6 100755 --- a/HMCL/src/main/java/org/jackhuang/hellominecraft/launcher/core/auth/YggdrasilAuthenticator.java +++ b/HMCL/src/main/java/org/jackhuang/hellominecraft/launcher/core/auth/YggdrasilAuthenticator.java @@ -21,9 +21,9 @@ import com.google.gson.GsonBuilder; import java.net.Proxy; import java.util.Map; import javax.swing.JOptionPane; -import org.jackhuang.hellominecraft.utils.C; -import org.jackhuang.hellominecraft.utils.ArrayUtils; -import org.jackhuang.hellominecraft.utils.views.Selector; +import org.jackhuang.hellominecraft.util.C; +import org.jackhuang.hellominecraft.util.ArrayUtils; +import org.jackhuang.hellominecraft.util.ui.Selector; import org.jackhuang.hellominecraft.launcher.core.auth.yggdrasil.GameProfile; import org.jackhuang.hellominecraft.launcher.core.auth.yggdrasil.PropertyMap; import org.jackhuang.hellominecraft.launcher.core.auth.yggdrasil.YggdrasilAuthentication; diff --git a/HMCL/src/main/java/org/jackhuang/hellominecraft/launcher/core/auth/yggdrasil/GameProfile.java b/HMCL/src/main/java/org/jackhuang/hellominecraft/launcher/core/auth/yggdrasil/GameProfile.java index f961a4088..74f7b7685 100755 --- a/HMCL/src/main/java/org/jackhuang/hellominecraft/launcher/core/auth/yggdrasil/GameProfile.java +++ b/HMCL/src/main/java/org/jackhuang/hellominecraft/launcher/core/auth/yggdrasil/GameProfile.java @@ -26,7 +26,7 @@ import com.google.gson.JsonSerializationContext; import com.google.gson.JsonSerializer; import java.lang.reflect.Type; import java.util.UUID; -import org.jackhuang.hellominecraft.utils.StrUtils; +import org.jackhuang.hellominecraft.util.StrUtils; public class GameProfile { diff --git a/HMCL/src/main/java/org/jackhuang/hellominecraft/launcher/core/auth/yggdrasil/PropertyMap.java b/HMCL/src/main/java/org/jackhuang/hellominecraft/launcher/core/auth/yggdrasil/PropertyMap.java index f02b041ef..724b82996 100755 --- a/HMCL/src/main/java/org/jackhuang/hellominecraft/launcher/core/auth/yggdrasil/PropertyMap.java +++ b/HMCL/src/main/java/org/jackhuang/hellominecraft/launcher/core/auth/yggdrasil/PropertyMap.java @@ -31,7 +31,7 @@ import java.util.ArrayList; import java.util.HashMap; import java.util.List; import java.util.Map; -import org.jackhuang.hellominecraft.utils.logging.HMCLog; +import org.jackhuang.hellominecraft.util.logging.HMCLog; public class PropertyMap extends HashMap { diff --git a/HMCL/src/main/java/org/jackhuang/hellominecraft/launcher/core/auth/yggdrasil/YggdrasilAuthentication.java b/HMCL/src/main/java/org/jackhuang/hellominecraft/launcher/core/auth/yggdrasil/YggdrasilAuthentication.java index 65bfe184a..0b642ecec 100755 --- a/HMCL/src/main/java/org/jackhuang/hellominecraft/launcher/core/auth/yggdrasil/YggdrasilAuthentication.java +++ b/HMCL/src/main/java/org/jackhuang/hellominecraft/launcher/core/auth/yggdrasil/YggdrasilAuthentication.java @@ -28,10 +28,10 @@ import java.util.HashMap; import java.util.List; import java.util.Map; import java.util.UUID; -import org.jackhuang.hellominecraft.utils.C; -import org.jackhuang.hellominecraft.utils.logging.HMCLog; -import org.jackhuang.hellominecraft.utils.NetUtils; -import org.jackhuang.hellominecraft.utils.StrUtils; +import org.jackhuang.hellominecraft.util.C; +import org.jackhuang.hellominecraft.util.logging.HMCLog; +import org.jackhuang.hellominecraft.util.NetUtils; +import org.jackhuang.hellominecraft.util.StrUtils; public class YggdrasilAuthentication { diff --git a/HMCL/src/main/java/org/jackhuang/hellominecraft/launcher/core/download/BMCLAPIDownloadProvider.java b/HMCL/src/main/java/org/jackhuang/hellominecraft/launcher/core/download/BMCLAPIDownloadProvider.java index af81402e0..6005a7b67 100755 --- a/HMCL/src/main/java/org/jackhuang/hellominecraft/launcher/core/download/BMCLAPIDownloadProvider.java +++ b/HMCL/src/main/java/org/jackhuang/hellominecraft/launcher/core/download/BMCLAPIDownloadProvider.java @@ -17,7 +17,7 @@ */ package org.jackhuang.hellominecraft.launcher.core.download; -import org.jackhuang.hellominecraft.launcher.core.installers.InstallerVersionList; +import org.jackhuang.hellominecraft.launcher.core.install.InstallerVersionList; /** * @@ -27,17 +27,17 @@ public class BMCLAPIDownloadProvider extends IDownloadProvider { @Override public InstallerVersionList getForgeInstaller() { - return org.jackhuang.hellominecraft.launcher.core.installers.forge.MinecraftForgeVersionList.getInstance(); + return org.jackhuang.hellominecraft.launcher.core.install.forge.MinecraftForgeVersionList.getInstance(); } @Override public InstallerVersionList getLiteLoaderInstaller() { - return org.jackhuang.hellominecraft.launcher.core.installers.liteloader.LiteLoaderVersionList.getInstance(); + return org.jackhuang.hellominecraft.launcher.core.install.liteloader.LiteLoaderVersionList.getInstance(); } @Override public InstallerVersionList getOptiFineInstaller() { - return org.jackhuang.hellominecraft.launcher.core.installers.optifine.bmcl.OptiFineBMCLVersionList.getInstance(); + return org.jackhuang.hellominecraft.launcher.core.install.optifine.bmcl.OptiFineBMCLVersionList.getInstance(); } @Override diff --git a/HMCL/src/main/java/org/jackhuang/hellominecraft/launcher/core/download/DownloadLibraryJob.java b/HMCL/src/main/java/org/jackhuang/hellominecraft/launcher/core/download/DownloadLibraryJob.java index 1c2fc7b38..d2ed929ec 100644 --- a/HMCL/src/main/java/org/jackhuang/hellominecraft/launcher/core/download/DownloadLibraryJob.java +++ b/HMCL/src/main/java/org/jackhuang/hellominecraft/launcher/core/download/DownloadLibraryJob.java @@ -18,7 +18,7 @@ package org.jackhuang.hellominecraft.launcher.core.download; import java.io.File; -import org.jackhuang.hellominecraft.utils.system.IOUtils; +import org.jackhuang.hellominecraft.util.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 0bba3760f..0f0a24e04 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 @@ -17,7 +17,7 @@ */ package org.jackhuang.hellominecraft.launcher.core.download; -import org.jackhuang.hellominecraft.utils.C; +import org.jackhuang.hellominecraft.util.C; /** * diff --git a/HMCL/src/main/java/org/jackhuang/hellominecraft/launcher/core/download/IDownloadProvider.java b/HMCL/src/main/java/org/jackhuang/hellominecraft/launcher/core/download/IDownloadProvider.java index c9093eec5..fc9e2f72e 100755 --- a/HMCL/src/main/java/org/jackhuang/hellominecraft/launcher/core/download/IDownloadProvider.java +++ b/HMCL/src/main/java/org/jackhuang/hellominecraft/launcher/core/download/IDownloadProvider.java @@ -17,8 +17,8 @@ */ package org.jackhuang.hellominecraft.launcher.core.download; -import org.jackhuang.hellominecraft.launcher.core.installers.InstallerType; -import org.jackhuang.hellominecraft.launcher.core.installers.InstallerVersionList; +import org.jackhuang.hellominecraft.launcher.core.install.InstallerType; +import org.jackhuang.hellominecraft.launcher.core.install.InstallerVersionList; /** * diff --git a/HMCL/src/main/java/org/jackhuang/hellominecraft/launcher/core/download/MinecraftDownloadService.java b/HMCL/src/main/java/org/jackhuang/hellominecraft/launcher/core/download/MinecraftDownloadService.java index 7ab25d1df..ed2f71da3 100755 --- a/HMCL/src/main/java/org/jackhuang/hellominecraft/launcher/core/download/MinecraftDownloadService.java +++ b/HMCL/src/main/java/org/jackhuang/hellominecraft/launcher/core/download/MinecraftDownloadService.java @@ -22,21 +22,21 @@ import com.google.gson.JsonSyntaxException; import java.io.File; import java.util.ArrayList; import java.util.List; -import org.jackhuang.hellominecraft.utils.C; -import org.jackhuang.hellominecraft.utils.logging.HMCLog; +import org.jackhuang.hellominecraft.util.C; +import org.jackhuang.hellominecraft.util.logging.HMCLog; import org.jackhuang.hellominecraft.launcher.core.GameException; import org.jackhuang.hellominecraft.launcher.core.service.IMinecraftService; import org.jackhuang.hellominecraft.launcher.core.version.IMinecraftLibrary; import org.jackhuang.hellominecraft.launcher.core.version.MinecraftVersion; -import org.jackhuang.hellominecraft.utils.tasks.TaskWindow; -import org.jackhuang.hellominecraft.utils.tasks.download.FileDownloadTask; -import org.jackhuang.hellominecraft.utils.NetUtils; -import org.jackhuang.hellominecraft.utils.OverridableSwingWorker; -import org.jackhuang.hellominecraft.utils.system.FileUtils; -import org.jackhuang.hellominecraft.utils.system.IOUtils; -import org.jackhuang.hellominecraft.utils.tasks.Task; -import org.jackhuang.hellominecraft.utils.version.MinecraftRemoteVersion; -import org.jackhuang.hellominecraft.utils.version.MinecraftRemoteVersions; +import org.jackhuang.hellominecraft.util.tasks.TaskWindow; +import org.jackhuang.hellominecraft.util.tasks.download.FileDownloadTask; +import org.jackhuang.hellominecraft.util.NetUtils; +import org.jackhuang.hellominecraft.util.OverridableSwingWorker; +import org.jackhuang.hellominecraft.util.system.FileUtils; +import org.jackhuang.hellominecraft.util.system.IOUtils; +import org.jackhuang.hellominecraft.util.tasks.Task; +import org.jackhuang.hellominecraft.util.version.MinecraftRemoteVersion; +import org.jackhuang.hellominecraft.util.version.MinecraftRemoteVersions; /** * diff --git a/HMCL/src/main/java/org/jackhuang/hellominecraft/launcher/core/download/MojangDownloadProvider.java b/HMCL/src/main/java/org/jackhuang/hellominecraft/launcher/core/download/MojangDownloadProvider.java index 9aebf0fc6..f3815e9a4 100755 --- a/HMCL/src/main/java/org/jackhuang/hellominecraft/launcher/core/download/MojangDownloadProvider.java +++ b/HMCL/src/main/java/org/jackhuang/hellominecraft/launcher/core/download/MojangDownloadProvider.java @@ -17,7 +17,7 @@ */ package org.jackhuang.hellominecraft.launcher.core.download; -import org.jackhuang.hellominecraft.launcher.core.installers.InstallerVersionList; +import org.jackhuang.hellominecraft.launcher.core.install.InstallerVersionList; /** * @@ -27,17 +27,17 @@ public class MojangDownloadProvider extends IDownloadProvider { @Override public InstallerVersionList getForgeInstaller() { - return org.jackhuang.hellominecraft.launcher.core.installers.forge.MinecraftForgeVersionList.getInstance(); + return org.jackhuang.hellominecraft.launcher.core.install.forge.MinecraftForgeVersionList.getInstance(); } @Override public InstallerVersionList getLiteLoaderInstaller() { - return org.jackhuang.hellominecraft.launcher.core.installers.liteloader.LiteLoaderVersionList.getInstance(); + return org.jackhuang.hellominecraft.launcher.core.install.liteloader.LiteLoaderVersionList.getInstance(); } @Override public InstallerVersionList getOptiFineInstaller() { - return org.jackhuang.hellominecraft.launcher.core.installers.optifine.vanilla.OptiFineVersionList.getInstance(); + return org.jackhuang.hellominecraft.launcher.core.install.optifine.vanilla.OptiFineVersionList.getInstance(); } @Override diff --git a/HMCL/src/main/java/org/jackhuang/hellominecraft/launcher/core/installers/InstallProfile.java b/HMCL/src/main/java/org/jackhuang/hellominecraft/launcher/core/install/InstallProfile.java similarity index 88% rename from HMCL/src/main/java/org/jackhuang/hellominecraft/launcher/core/installers/InstallProfile.java rename to HMCL/src/main/java/org/jackhuang/hellominecraft/launcher/core/install/InstallProfile.java index 66e16fb78..eace40039 100755 --- a/HMCL/src/main/java/org/jackhuang/hellominecraft/launcher/core/installers/InstallProfile.java +++ b/HMCL/src/main/java/org/jackhuang/hellominecraft/launcher/core/install/InstallProfile.java @@ -15,11 +15,11 @@ * 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.installers; +package org.jackhuang.hellominecraft.launcher.core.install; import com.google.gson.annotations.SerializedName; import org.jackhuang.hellominecraft.launcher.core.version.MinecraftVersion; -import org.jackhuang.hellominecraft.launcher.core.installers.forge.Install; +import org.jackhuang.hellominecraft.launcher.core.install.forge.Install; /** * diff --git a/HMCL/src/main/java/org/jackhuang/hellominecraft/launcher/core/installers/InstallerType.java b/HMCL/src/main/java/org/jackhuang/hellominecraft/launcher/core/install/InstallerType.java similarity index 94% rename from HMCL/src/main/java/org/jackhuang/hellominecraft/launcher/core/installers/InstallerType.java rename to HMCL/src/main/java/org/jackhuang/hellominecraft/launcher/core/install/InstallerType.java index 4486f148d..d8915a4a5 100755 --- a/HMCL/src/main/java/org/jackhuang/hellominecraft/launcher/core/installers/InstallerType.java +++ b/HMCL/src/main/java/org/jackhuang/hellominecraft/launcher/core/install/InstallerType.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.installers; +package org.jackhuang.hellominecraft.launcher.core.install; /** * diff --git a/HMCL/src/main/java/org/jackhuang/hellominecraft/launcher/core/installers/InstallerVersionList.java b/HMCL/src/main/java/org/jackhuang/hellominecraft/launcher/core/install/InstallerVersionList.java similarity index 96% rename from HMCL/src/main/java/org/jackhuang/hellominecraft/launcher/core/installers/InstallerVersionList.java rename to HMCL/src/main/java/org/jackhuang/hellominecraft/launcher/core/install/InstallerVersionList.java index c148dd3ad..48b947f81 100755 --- a/HMCL/src/main/java/org/jackhuang/hellominecraft/launcher/core/installers/InstallerVersionList.java +++ b/HMCL/src/main/java/org/jackhuang/hellominecraft/launcher/core/install/InstallerVersionList.java @@ -15,12 +15,12 @@ * 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.installers; +package org.jackhuang.hellominecraft.launcher.core.install; import java.util.ArrayList; import java.util.Comparator; import java.util.List; -import org.jackhuang.hellominecraft.utils.functions.Consumer; +import org.jackhuang.hellominecraft.util.func.Consumer; /** * diff --git a/HMCL/src/main/java/org/jackhuang/hellominecraft/launcher/core/installers/InstallerVersionNewerComparator.java b/HMCL/src/main/java/org/jackhuang/hellominecraft/launcher/core/install/InstallerVersionNewerComparator.java similarity index 86% rename from HMCL/src/main/java/org/jackhuang/hellominecraft/launcher/core/installers/InstallerVersionNewerComparator.java rename to HMCL/src/main/java/org/jackhuang/hellominecraft/launcher/core/install/InstallerVersionNewerComparator.java index cc60aae2e..158e00c96 100755 --- a/HMCL/src/main/java/org/jackhuang/hellominecraft/launcher/core/installers/InstallerVersionNewerComparator.java +++ b/HMCL/src/main/java/org/jackhuang/hellominecraft/launcher/core/install/InstallerVersionNewerComparator.java @@ -15,10 +15,10 @@ * 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.installers; +package org.jackhuang.hellominecraft.launcher.core.install; import java.util.Comparator; -import org.jackhuang.hellominecraft.launcher.core.installers.InstallerVersionList.InstallerVersion; +import org.jackhuang.hellominecraft.launcher.core.install.InstallerVersionList.InstallerVersion; /** * 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/install/MinecraftInstallerService.java similarity index 80% rename from HMCL/src/main/java/org/jackhuang/hellominecraft/launcher/core/installers/MinecraftInstallerService.java rename to HMCL/src/main/java/org/jackhuang/hellominecraft/launcher/core/install/MinecraftInstallerService.java index 5b4e393a1..9e7378efd 100755 --- a/HMCL/src/main/java/org/jackhuang/hellominecraft/launcher/core/installers/MinecraftInstallerService.java +++ b/HMCL/src/main/java/org/jackhuang/hellominecraft/launcher/core/install/MinecraftInstallerService.java @@ -15,22 +15,22 @@ * 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.installers; +package org.jackhuang.hellominecraft.launcher.core.install; import org.jackhuang.hellominecraft.launcher.core.service.IMinecraftInstallerService; import java.io.File; 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; -import org.jackhuang.hellominecraft.launcher.core.installers.liteloader.LiteLoaderInstaller; -import org.jackhuang.hellominecraft.launcher.core.installers.liteloader.LiteLoaderVersionList; -import org.jackhuang.hellominecraft.launcher.core.installers.optifine.OptiFineInstaller; -import org.jackhuang.hellominecraft.launcher.core.installers.optifine.vanilla.OptiFineDownloadFormatter; -import org.jackhuang.hellominecraft.utils.tasks.Task; -import org.jackhuang.hellominecraft.utils.tasks.TaskInfo; -import org.jackhuang.hellominecraft.utils.tasks.TaskWindow; -import org.jackhuang.hellominecraft.utils.tasks.download.FileDownloadTask; -import org.jackhuang.hellominecraft.utils.system.IOUtils; +import org.jackhuang.hellominecraft.launcher.core.install.InstallerVersionList.InstallerVersion; +import org.jackhuang.hellominecraft.launcher.core.install.forge.ForgeInstaller; +import org.jackhuang.hellominecraft.launcher.core.install.liteloader.LiteLoaderInstaller; +import org.jackhuang.hellominecraft.launcher.core.install.liteloader.LiteLoaderVersionList; +import org.jackhuang.hellominecraft.launcher.core.install.optifine.OptiFineInstaller; +import org.jackhuang.hellominecraft.launcher.core.install.optifine.vanilla.OptiFineDownloadFormatter; +import org.jackhuang.hellominecraft.util.tasks.Task; +import org.jackhuang.hellominecraft.util.tasks.TaskInfo; +import org.jackhuang.hellominecraft.util.tasks.TaskWindow; +import org.jackhuang.hellominecraft.util.tasks.download.FileDownloadTask; +import org.jackhuang.hellominecraft.util.system.IOUtils; /** * diff --git a/HMCL/src/main/java/org/jackhuang/hellominecraft/launcher/core/installers/PackMinecraftInstaller.java b/HMCL/src/main/java/org/jackhuang/hellominecraft/launcher/core/install/PackMinecraftInstaller.java similarity index 85% rename from HMCL/src/main/java/org/jackhuang/hellominecraft/launcher/core/installers/PackMinecraftInstaller.java rename to HMCL/src/main/java/org/jackhuang/hellominecraft/launcher/core/install/PackMinecraftInstaller.java index 0dc608e55..e19a52f0d 100755 --- a/HMCL/src/main/java/org/jackhuang/hellominecraft/launcher/core/installers/PackMinecraftInstaller.java +++ b/HMCL/src/main/java/org/jackhuang/hellominecraft/launcher/core/install/PackMinecraftInstaller.java @@ -15,14 +15,14 @@ * 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.installers; +package org.jackhuang.hellominecraft.launcher.core.install; import java.io.File; import java.io.IOException; import java.util.ArrayList; -import org.jackhuang.hellominecraft.utils.system.Compressor; -import org.jackhuang.hellominecraft.utils.system.FileUtils; -import org.jackhuang.hellominecraft.utils.system.IOUtils; +import org.jackhuang.hellominecraft.util.system.Compressor; +import org.jackhuang.hellominecraft.util.system.FileUtils; +import org.jackhuang.hellominecraft.util.system.IOUtils; /** * diff --git a/HMCL/src/main/java/org/jackhuang/hellominecraft/launcher/core/installers/forge/ForgeInstaller.java b/HMCL/src/main/java/org/jackhuang/hellominecraft/launcher/core/install/forge/ForgeInstaller.java similarity index 87% rename from HMCL/src/main/java/org/jackhuang/hellominecraft/launcher/core/installers/forge/ForgeInstaller.java rename to HMCL/src/main/java/org/jackhuang/hellominecraft/launcher/core/install/forge/ForgeInstaller.java index e19e85473..d8bdc8167 100755 --- a/HMCL/src/main/java/org/jackhuang/hellominecraft/launcher/core/installers/forge/ForgeInstaller.java +++ b/HMCL/src/main/java/org/jackhuang/hellominecraft/launcher/core/install/forge/ForgeInstaller.java @@ -15,24 +15,24 @@ * 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.installers.forge; +package org.jackhuang.hellominecraft.launcher.core.install.forge; -import org.jackhuang.hellominecraft.launcher.core.installers.InstallProfile; +import org.jackhuang.hellominecraft.launcher.core.install.InstallProfile; import java.io.BufferedOutputStream; import java.io.File; import java.io.FileOutputStream; import java.io.InputStream; import java.util.zip.ZipEntry; import java.util.zip.ZipFile; -import org.jackhuang.hellominecraft.utils.C; -import org.jackhuang.hellominecraft.utils.logging.HMCLog; +import org.jackhuang.hellominecraft.util.C; +import org.jackhuang.hellominecraft.util.logging.HMCLog; import org.jackhuang.hellominecraft.launcher.core.service.IMinecraftService; -import org.jackhuang.hellominecraft.launcher.core.installers.InstallerVersionList.InstallerVersion; -import org.jackhuang.hellominecraft.utils.tasks.Task; -import org.jackhuang.hellominecraft.utils.system.FileUtils; -import org.jackhuang.hellominecraft.utils.NetUtils; +import org.jackhuang.hellominecraft.launcher.core.install.InstallerVersionList.InstallerVersion; +import org.jackhuang.hellominecraft.util.tasks.Task; +import org.jackhuang.hellominecraft.util.system.FileUtils; +import org.jackhuang.hellominecraft.util.NetUtils; import org.jackhuang.hellominecraft.launcher.core.version.MinecraftLibrary; -import org.jackhuang.hellominecraft.utils.MessageBox; +import org.jackhuang.hellominecraft.util.MessageBox; /** * diff --git a/HMCL/src/main/java/org/jackhuang/hellominecraft/launcher/core/installers/forge/ForgeOldInstaller.java b/HMCL/src/main/java/org/jackhuang/hellominecraft/launcher/core/install/forge/ForgeOldInstaller.java similarity index 88% rename from HMCL/src/main/java/org/jackhuang/hellominecraft/launcher/core/installers/forge/ForgeOldInstaller.java rename to HMCL/src/main/java/org/jackhuang/hellominecraft/launcher/core/install/forge/ForgeOldInstaller.java index c817d6b89..8a84e41ba 100755 --- a/HMCL/src/main/java/org/jackhuang/hellominecraft/launcher/core/installers/forge/ForgeOldInstaller.java +++ b/HMCL/src/main/java/org/jackhuang/hellominecraft/launcher/core/install/forge/ForgeOldInstaller.java @@ -15,12 +15,12 @@ * 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.installers.forge; +package org.jackhuang.hellominecraft.launcher.core.install.forge; import java.io.File; import java.io.IOException; import java.util.ArrayList; -import org.jackhuang.hellominecraft.launcher.core.installers.PackMinecraftInstaller; +import org.jackhuang.hellominecraft.launcher.core.install.PackMinecraftInstaller; /** * diff --git a/HMCL/src/main/java/org/jackhuang/hellominecraft/launcher/core/installers/forge/Install.java b/HMCL/src/main/java/org/jackhuang/hellominecraft/launcher/core/install/forge/Install.java similarity index 93% rename from HMCL/src/main/java/org/jackhuang/hellominecraft/launcher/core/installers/forge/Install.java rename to HMCL/src/main/java/org/jackhuang/hellominecraft/launcher/core/install/forge/Install.java index dc4cfecbd..e6167bfdb 100755 --- a/HMCL/src/main/java/org/jackhuang/hellominecraft/launcher/core/installers/forge/Install.java +++ b/HMCL/src/main/java/org/jackhuang/hellominecraft/launcher/core/install/forge/Install.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.installers.forge; +package org.jackhuang.hellominecraft.launcher.core.install.forge; /** * diff --git a/HMCL/src/main/java/org/jackhuang/hellominecraft/launcher/core/installers/forge/MinecraftForgeVersion.java b/HMCL/src/main/java/org/jackhuang/hellominecraft/launcher/core/install/forge/MinecraftForgeVersion.java similarity index 93% rename from HMCL/src/main/java/org/jackhuang/hellominecraft/launcher/core/installers/forge/MinecraftForgeVersion.java rename to HMCL/src/main/java/org/jackhuang/hellominecraft/launcher/core/install/forge/MinecraftForgeVersion.java index ac65af989..a0ef63ccf 100755 --- a/HMCL/src/main/java/org/jackhuang/hellominecraft/launcher/core/installers/forge/MinecraftForgeVersion.java +++ b/HMCL/src/main/java/org/jackhuang/hellominecraft/launcher/core/install/forge/MinecraftForgeVersion.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.installers.forge; +package org.jackhuang.hellominecraft.launcher.core.install.forge; /** * 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/install/forge/MinecraftForgeVersionList.java similarity index 91% rename from HMCL/src/main/java/org/jackhuang/hellominecraft/launcher/core/installers/forge/MinecraftForgeVersionList.java rename to HMCL/src/main/java/org/jackhuang/hellominecraft/launcher/core/install/forge/MinecraftForgeVersionList.java index 5ca64ef6c..be577bdbc 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/install/forge/MinecraftForgeVersionList.java @@ -15,19 +15,19 @@ * 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.installers.forge; +package org.jackhuang.hellominecraft.launcher.core.install.forge; import java.util.ArrayList; import java.util.Collections; import java.util.HashMap; import java.util.List; import java.util.Map; -import org.jackhuang.hellominecraft.utils.C; +import org.jackhuang.hellominecraft.util.C; 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; -import org.jackhuang.hellominecraft.utils.NetUtils; +import org.jackhuang.hellominecraft.util.StrUtils; +import org.jackhuang.hellominecraft.launcher.core.install.InstallerVersionList; +import org.jackhuang.hellominecraft.launcher.core.install.InstallerVersionNewerComparator; +import org.jackhuang.hellominecraft.util.NetUtils; /** * diff --git a/HMCL/src/main/java/org/jackhuang/hellominecraft/launcher/core/installers/forge/MinecraftForgeVersionRoot.java b/HMCL/src/main/java/org/jackhuang/hellominecraft/launcher/core/install/forge/MinecraftForgeVersionRoot.java similarity index 93% rename from HMCL/src/main/java/org/jackhuang/hellominecraft/launcher/core/installers/forge/MinecraftForgeVersionRoot.java rename to HMCL/src/main/java/org/jackhuang/hellominecraft/launcher/core/install/forge/MinecraftForgeVersionRoot.java index e77748f8e..bab9a917b 100755 --- a/HMCL/src/main/java/org/jackhuang/hellominecraft/launcher/core/installers/forge/MinecraftForgeVersionRoot.java +++ b/HMCL/src/main/java/org/jackhuang/hellominecraft/launcher/core/install/forge/MinecraftForgeVersionRoot.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.installers.forge; +package org.jackhuang.hellominecraft.launcher.core.install.forge; import java.util.Map; diff --git a/HMCL/src/main/java/org/jackhuang/hellominecraft/launcher/core/installers/liteloader/LiteLoaderInstaller.java b/HMCL/src/main/java/org/jackhuang/hellominecraft/launcher/core/install/liteloader/LiteLoaderInstaller.java similarity index 89% rename from HMCL/src/main/java/org/jackhuang/hellominecraft/launcher/core/installers/liteloader/LiteLoaderInstaller.java rename to HMCL/src/main/java/org/jackhuang/hellominecraft/launcher/core/install/liteloader/LiteLoaderInstaller.java index 6e315c140..ef3c24492 100755 --- a/HMCL/src/main/java/org/jackhuang/hellominecraft/launcher/core/installers/liteloader/LiteLoaderInstaller.java +++ b/HMCL/src/main/java/org/jackhuang/hellominecraft/launcher/core/install/liteloader/LiteLoaderInstaller.java @@ -15,18 +15,18 @@ * 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.installers.liteloader; +package org.jackhuang.hellominecraft.launcher.core.install.liteloader; import java.io.File; import java.util.ArrayList; import java.util.Arrays; -import org.jackhuang.hellominecraft.utils.C; -import org.jackhuang.hellominecraft.utils.logging.HMCLog; +import org.jackhuang.hellominecraft.util.C; +import org.jackhuang.hellominecraft.util.logging.HMCLog; import org.jackhuang.hellominecraft.launcher.core.service.IMinecraftService; -import org.jackhuang.hellominecraft.utils.tasks.Task; -import org.jackhuang.hellominecraft.utils.tasks.communication.PreviousResult; -import org.jackhuang.hellominecraft.utils.tasks.communication.PreviousResultRegistrar; -import org.jackhuang.hellominecraft.utils.system.FileUtils; +import org.jackhuang.hellominecraft.util.tasks.Task; +import org.jackhuang.hellominecraft.util.tasks.communication.PreviousResult; +import org.jackhuang.hellominecraft.util.tasks.communication.PreviousResultRegistrar; +import org.jackhuang.hellominecraft.util.system.FileUtils; import org.jackhuang.hellominecraft.launcher.core.version.MinecraftLibrary; import org.jackhuang.hellominecraft.launcher.core.version.MinecraftVersion; diff --git a/HMCL/src/main/java/org/jackhuang/hellominecraft/launcher/core/installers/liteloader/LiteLoaderMCVersions.java b/HMCL/src/main/java/org/jackhuang/hellominecraft/launcher/core/install/liteloader/LiteLoaderMCVersions.java similarity index 92% rename from HMCL/src/main/java/org/jackhuang/hellominecraft/launcher/core/installers/liteloader/LiteLoaderMCVersions.java rename to HMCL/src/main/java/org/jackhuang/hellominecraft/launcher/core/install/liteloader/LiteLoaderMCVersions.java index 2fd4e18e5..f7fac6370 100755 --- a/HMCL/src/main/java/org/jackhuang/hellominecraft/launcher/core/installers/liteloader/LiteLoaderMCVersions.java +++ b/HMCL/src/main/java/org/jackhuang/hellominecraft/launcher/core/install/liteloader/LiteLoaderMCVersions.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.installers.liteloader; +package org.jackhuang.hellominecraft.launcher.core.install.liteloader; import java.util.Map; diff --git a/HMCL/src/main/java/org/jackhuang/hellominecraft/launcher/core/installers/liteloader/LiteLoaderVersion.java b/HMCL/src/main/java/org/jackhuang/hellominecraft/launcher/core/install/liteloader/LiteLoaderVersion.java similarity index 93% rename from HMCL/src/main/java/org/jackhuang/hellominecraft/launcher/core/installers/liteloader/LiteLoaderVersion.java rename to HMCL/src/main/java/org/jackhuang/hellominecraft/launcher/core/install/liteloader/LiteLoaderVersion.java index 28888010a..472e4d8c2 100755 --- a/HMCL/src/main/java/org/jackhuang/hellominecraft/launcher/core/installers/liteloader/LiteLoaderVersion.java +++ b/HMCL/src/main/java/org/jackhuang/hellominecraft/launcher/core/install/liteloader/LiteLoaderVersion.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.installers.liteloader; +package org.jackhuang.hellominecraft.launcher.core.install.liteloader; import org.jackhuang.hellominecraft.launcher.core.version.MinecraftLibrary; diff --git a/HMCL/src/main/java/org/jackhuang/hellominecraft/launcher/core/installers/liteloader/LiteLoaderVersionList.java b/HMCL/src/main/java/org/jackhuang/hellominecraft/launcher/core/install/liteloader/LiteLoaderVersionList.java similarity index 88% rename from HMCL/src/main/java/org/jackhuang/hellominecraft/launcher/core/installers/liteloader/LiteLoaderVersionList.java rename to HMCL/src/main/java/org/jackhuang/hellominecraft/launcher/core/install/liteloader/LiteLoaderVersionList.java index 16279c692..a723e51b3 100755 --- a/HMCL/src/main/java/org/jackhuang/hellominecraft/launcher/core/installers/liteloader/LiteLoaderVersionList.java +++ b/HMCL/src/main/java/org/jackhuang/hellominecraft/launcher/core/install/liteloader/LiteLoaderVersionList.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.installers.liteloader; +package org.jackhuang.hellominecraft.launcher.core.install.liteloader; import java.util.ArrayList; import java.util.Arrays; @@ -23,13 +23,13 @@ import java.util.Collections; import java.util.HashMap; import java.util.List; import java.util.Map; -import org.jackhuang.hellominecraft.utils.C; +import org.jackhuang.hellominecraft.util.C; import org.jackhuang.hellominecraft.launcher.core.version.MinecraftLibrary; -import org.jackhuang.hellominecraft.launcher.core.installers.InstallerVersionList; -import org.jackhuang.hellominecraft.launcher.core.installers.InstallerVersionList.InstallerVersion; -import org.jackhuang.hellominecraft.launcher.core.installers.InstallerVersionNewerComparator; -import org.jackhuang.hellominecraft.utils.NetUtils; -import org.jackhuang.hellominecraft.utils.StrUtils; +import org.jackhuang.hellominecraft.launcher.core.install.InstallerVersionList; +import org.jackhuang.hellominecraft.launcher.core.install.InstallerVersionList.InstallerVersion; +import org.jackhuang.hellominecraft.launcher.core.install.InstallerVersionNewerComparator; +import org.jackhuang.hellominecraft.util.NetUtils; +import org.jackhuang.hellominecraft.util.StrUtils; /** * diff --git a/HMCL/src/main/java/org/jackhuang/hellominecraft/launcher/core/installers/liteloader/LiteLoaderVersionsMeta.java b/HMCL/src/main/java/org/jackhuang/hellominecraft/launcher/core/install/liteloader/LiteLoaderVersionsMeta.java similarity index 92% rename from HMCL/src/main/java/org/jackhuang/hellominecraft/launcher/core/installers/liteloader/LiteLoaderVersionsMeta.java rename to HMCL/src/main/java/org/jackhuang/hellominecraft/launcher/core/install/liteloader/LiteLoaderVersionsMeta.java index cb4a1ac7c..d82371e4a 100755 --- a/HMCL/src/main/java/org/jackhuang/hellominecraft/launcher/core/installers/liteloader/LiteLoaderVersionsMeta.java +++ b/HMCL/src/main/java/org/jackhuang/hellominecraft/launcher/core/install/liteloader/LiteLoaderVersionsMeta.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.installers.liteloader; +package org.jackhuang.hellominecraft.launcher.core.install.liteloader; /** * diff --git a/HMCL/src/main/java/org/jackhuang/hellominecraft/launcher/core/installers/liteloader/LiteLoaderVersionsRoot.java b/HMCL/src/main/java/org/jackhuang/hellominecraft/launcher/core/install/liteloader/LiteLoaderVersionsRoot.java similarity index 92% rename from HMCL/src/main/java/org/jackhuang/hellominecraft/launcher/core/installers/liteloader/LiteLoaderVersionsRoot.java rename to HMCL/src/main/java/org/jackhuang/hellominecraft/launcher/core/install/liteloader/LiteLoaderVersionsRoot.java index 4172b7fa1..7fa67fb51 100755 --- a/HMCL/src/main/java/org/jackhuang/hellominecraft/launcher/core/installers/liteloader/LiteLoaderVersionsRoot.java +++ b/HMCL/src/main/java/org/jackhuang/hellominecraft/launcher/core/install/liteloader/LiteLoaderVersionsRoot.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.installers.liteloader; +package org.jackhuang.hellominecraft.launcher.core.install.liteloader; import java.util.Map; diff --git a/HMCL/src/main/java/org/jackhuang/hellominecraft/launcher/core/installers/optifine/OptiFineInstaller.java b/HMCL/src/main/java/org/jackhuang/hellominecraft/launcher/core/install/optifine/OptiFineInstaller.java similarity index 87% rename from HMCL/src/main/java/org/jackhuang/hellominecraft/launcher/core/installers/optifine/OptiFineInstaller.java rename to HMCL/src/main/java/org/jackhuang/hellominecraft/launcher/core/install/optifine/OptiFineInstaller.java index a13aaabdc..418b45a15 100755 --- a/HMCL/src/main/java/org/jackhuang/hellominecraft/launcher/core/installers/optifine/OptiFineInstaller.java +++ b/HMCL/src/main/java/org/jackhuang/hellominecraft/launcher/core/install/optifine/OptiFineInstaller.java @@ -15,18 +15,18 @@ * 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.installers.optifine; +package org.jackhuang.hellominecraft.launcher.core.install.optifine; import java.io.File; import java.util.ArrayList; import java.util.zip.ZipFile; -import org.jackhuang.hellominecraft.utils.C; -import org.jackhuang.hellominecraft.launcher.core.installers.InstallerVersionList; +import org.jackhuang.hellominecraft.util.C; +import org.jackhuang.hellominecraft.launcher.core.install.InstallerVersionList; import org.jackhuang.hellominecraft.launcher.core.service.IMinecraftService; -import org.jackhuang.hellominecraft.utils.tasks.Task; -import org.jackhuang.hellominecraft.utils.tasks.communication.PreviousResult; -import org.jackhuang.hellominecraft.utils.tasks.communication.PreviousResultRegistrar; -import org.jackhuang.hellominecraft.utils.system.FileUtils; +import org.jackhuang.hellominecraft.util.tasks.Task; +import org.jackhuang.hellominecraft.util.tasks.communication.PreviousResult; +import org.jackhuang.hellominecraft.util.tasks.communication.PreviousResultRegistrar; +import org.jackhuang.hellominecraft.util.system.FileUtils; import org.jackhuang.hellominecraft.launcher.core.version.MinecraftLibrary; import org.jackhuang.hellominecraft.launcher.core.version.MinecraftVersion; diff --git a/HMCL/src/main/java/org/jackhuang/hellominecraft/launcher/core/installers/optifine/OptiFineVersion.java b/HMCL/src/main/java/org/jackhuang/hellominecraft/launcher/core/install/optifine/OptiFineVersion.java similarity index 92% rename from HMCL/src/main/java/org/jackhuang/hellominecraft/launcher/core/installers/optifine/OptiFineVersion.java rename to HMCL/src/main/java/org/jackhuang/hellominecraft/launcher/core/install/optifine/OptiFineVersion.java index c342a5909..a62491e7c 100755 --- a/HMCL/src/main/java/org/jackhuang/hellominecraft/launcher/core/installers/optifine/OptiFineVersion.java +++ b/HMCL/src/main/java/org/jackhuang/hellominecraft/launcher/core/install/optifine/OptiFineVersion.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.installers.optifine; +package org.jackhuang.hellominecraft.launcher.core.install.optifine; /** * diff --git a/HMCL/src/main/java/org/jackhuang/hellominecraft/launcher/core/installers/optifine/bmcl/OptiFineBMCLVersionList.java b/HMCL/src/main/java/org/jackhuang/hellominecraft/launcher/core/install/optifine/bmcl/OptiFineBMCLVersionList.java similarity index 88% rename from HMCL/src/main/java/org/jackhuang/hellominecraft/launcher/core/installers/optifine/bmcl/OptiFineBMCLVersionList.java rename to HMCL/src/main/java/org/jackhuang/hellominecraft/launcher/core/install/optifine/bmcl/OptiFineBMCLVersionList.java index d257dfbcb..732746bbd 100755 --- a/HMCL/src/main/java/org/jackhuang/hellominecraft/launcher/core/installers/optifine/bmcl/OptiFineBMCLVersionList.java +++ b/HMCL/src/main/java/org/jackhuang/hellominecraft/launcher/core/install/optifine/bmcl/OptiFineBMCLVersionList.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.installers.optifine.bmcl; +package org.jackhuang.hellominecraft.launcher.core.install.optifine.bmcl; import com.google.gson.reflect.TypeToken; import java.util.ArrayList; @@ -25,12 +25,12 @@ import java.util.List; import java.util.Map; import java.util.regex.Matcher; import java.util.regex.Pattern; -import org.jackhuang.hellominecraft.utils.C; -import org.jackhuang.hellominecraft.utils.ArrayUtils; -import org.jackhuang.hellominecraft.launcher.core.installers.InstallerVersionList; -import org.jackhuang.hellominecraft.launcher.core.installers.optifine.OptiFineVersion; -import org.jackhuang.hellominecraft.utils.NetUtils; -import org.jackhuang.hellominecraft.utils.StrUtils; +import org.jackhuang.hellominecraft.util.C; +import org.jackhuang.hellominecraft.util.ArrayUtils; +import org.jackhuang.hellominecraft.launcher.core.install.InstallerVersionList; +import org.jackhuang.hellominecraft.launcher.core.install.optifine.OptiFineVersion; +import org.jackhuang.hellominecraft.util.NetUtils; +import org.jackhuang.hellominecraft.util.StrUtils; /** * diff --git a/HMCL/src/main/java/org/jackhuang/hellominecraft/launcher/core/installers/optifine/vanilla/OptiFineDownloadFormatter.java b/HMCL/src/main/java/org/jackhuang/hellominecraft/launcher/core/install/optifine/vanilla/OptiFineDownloadFormatter.java similarity index 83% rename from HMCL/src/main/java/org/jackhuang/hellominecraft/launcher/core/installers/optifine/vanilla/OptiFineDownloadFormatter.java rename to HMCL/src/main/java/org/jackhuang/hellominecraft/launcher/core/install/optifine/vanilla/OptiFineDownloadFormatter.java index 567ad25fc..107bacafc 100755 --- a/HMCL/src/main/java/org/jackhuang/hellominecraft/launcher/core/installers/optifine/vanilla/OptiFineDownloadFormatter.java +++ b/HMCL/src/main/java/org/jackhuang/hellominecraft/launcher/core/install/optifine/vanilla/OptiFineDownloadFormatter.java @@ -15,14 +15,14 @@ * 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.installers.optifine.vanilla; +package org.jackhuang.hellominecraft.launcher.core.install.optifine.vanilla; import java.util.regex.Matcher; import java.util.regex.Pattern; -import org.jackhuang.hellominecraft.utils.C; -import org.jackhuang.hellominecraft.utils.tasks.Task; -import org.jackhuang.hellominecraft.utils.tasks.communication.PreviousResult; -import org.jackhuang.hellominecraft.utils.NetUtils; +import org.jackhuang.hellominecraft.util.C; +import org.jackhuang.hellominecraft.util.tasks.Task; +import org.jackhuang.hellominecraft.util.tasks.communication.PreviousResult; +import org.jackhuang.hellominecraft.util.NetUtils; /** * diff --git a/HMCL/src/main/java/org/jackhuang/hellominecraft/launcher/core/installers/optifine/vanilla/OptiFineVersionList.java b/HMCL/src/main/java/org/jackhuang/hellominecraft/launcher/core/install/optifine/vanilla/OptiFineVersionList.java similarity index 93% rename from HMCL/src/main/java/org/jackhuang/hellominecraft/launcher/core/installers/optifine/vanilla/OptiFineVersionList.java rename to HMCL/src/main/java/org/jackhuang/hellominecraft/launcher/core/install/optifine/vanilla/OptiFineVersionList.java index e4c6a30d4..d42f4f833 100755 --- a/HMCL/src/main/java/org/jackhuang/hellominecraft/launcher/core/installers/optifine/vanilla/OptiFineVersionList.java +++ b/HMCL/src/main/java/org/jackhuang/hellominecraft/launcher/core/install/optifine/vanilla/OptiFineVersionList.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.installers.optifine.vanilla; +package org.jackhuang.hellominecraft.launcher.core.install.optifine.vanilla; import java.io.ByteArrayInputStream; import java.io.IOException; @@ -29,11 +29,11 @@ import java.util.regex.Pattern; import javax.xml.parsers.DocumentBuilder; import javax.xml.parsers.DocumentBuilderFactory; import javax.xml.parsers.ParserConfigurationException; -import org.jackhuang.hellominecraft.launcher.core.installers.InstallerVersionList; -import org.jackhuang.hellominecraft.launcher.core.installers.optifine.OptiFineVersion; -import org.jackhuang.hellominecraft.utils.ArrayUtils; -import org.jackhuang.hellominecraft.utils.NetUtils; -import org.jackhuang.hellominecraft.utils.StrUtils; +import org.jackhuang.hellominecraft.launcher.core.install.InstallerVersionList; +import org.jackhuang.hellominecraft.launcher.core.install.optifine.OptiFineVersion; +import org.jackhuang.hellominecraft.util.ArrayUtils; +import org.jackhuang.hellominecraft.util.NetUtils; +import org.jackhuang.hellominecraft.util.StrUtils; import org.w3c.dom.DOMException; import org.w3c.dom.Document; import org.w3c.dom.Element; diff --git a/HMCL/src/main/java/org/jackhuang/hellominecraft/launcher/core/launch/AbstractMinecraftLoader.java b/HMCL/src/main/java/org/jackhuang/hellominecraft/launcher/core/launch/AbstractMinecraftLoader.java index e0cf1163b..14946a91d 100755 --- a/HMCL/src/main/java/org/jackhuang/hellominecraft/launcher/core/launch/AbstractMinecraftLoader.java +++ b/HMCL/src/main/java/org/jackhuang/hellominecraft/launcher/core/launch/AbstractMinecraftLoader.java @@ -23,19 +23,19 @@ import java.io.File; import java.util.ArrayList; import java.util.Arrays; import java.util.List; -import org.jackhuang.hellominecraft.utils.C; -import org.jackhuang.hellominecraft.utils.logging.HMCLog; +import org.jackhuang.hellominecraft.util.C; +import org.jackhuang.hellominecraft.util.logging.HMCLog; import org.jackhuang.hellominecraft.launcher.Launcher; import org.jackhuang.hellominecraft.launcher.core.GameException; import org.jackhuang.hellominecraft.launcher.core.auth.UserProfileProvider; import org.jackhuang.hellominecraft.launcher.core.version.MinecraftVersion; -import org.jackhuang.hellominecraft.utils.system.JdkVersion; -import org.jackhuang.hellominecraft.utils.MathUtils; -import org.jackhuang.hellominecraft.utils.MessageBox; -import org.jackhuang.hellominecraft.utils.system.OS; -import org.jackhuang.hellominecraft.utils.system.Platform; -import org.jackhuang.hellominecraft.utils.StrUtils; -import org.jackhuang.hellominecraft.utils.Utils; +import org.jackhuang.hellominecraft.util.system.JdkVersion; +import org.jackhuang.hellominecraft.util.MathUtils; +import org.jackhuang.hellominecraft.util.MessageBox; +import org.jackhuang.hellominecraft.util.system.OS; +import org.jackhuang.hellominecraft.util.system.Platform; +import org.jackhuang.hellominecraft.util.StrUtils; +import org.jackhuang.hellominecraft.util.Utils; /** * @@ -150,8 +150,6 @@ public abstract class AbstractMinecraftLoader implements IMinecraftLoader { } String serverIp = options.getServerIp(); - if (lr.getServer() != null) - serverIp = lr.getServer().addr; if (StrUtils.isNotBlank(serverIp)) { String[] args = serverIp.split(":"); res.add("--server"); diff --git a/HMCL/src/main/java/org/jackhuang/hellominecraft/launcher/core/launch/DefaultGameLauncher.java b/HMCL/src/main/java/org/jackhuang/hellominecraft/launcher/core/launch/DefaultGameLauncher.java index c61fbf5c9..03d80b430 100755 --- a/HMCL/src/main/java/org/jackhuang/hellominecraft/launcher/core/launch/DefaultGameLauncher.java +++ b/HMCL/src/main/java/org/jackhuang/hellominecraft/launcher/core/launch/DefaultGameLauncher.java @@ -18,17 +18,17 @@ package org.jackhuang.hellominecraft.launcher.core.launch; import java.io.IOException; -import org.jackhuang.hellominecraft.utils.C; -import org.jackhuang.hellominecraft.utils.logging.HMCLog; +import org.jackhuang.hellominecraft.util.C; +import org.jackhuang.hellominecraft.util.logging.HMCLog; import org.jackhuang.hellominecraft.launcher.core.auth.IAuthenticator; import org.jackhuang.hellominecraft.launcher.core.auth.LoginInfo; import org.jackhuang.hellominecraft.launcher.core.download.DownloadLibraryJob; import org.jackhuang.hellominecraft.launcher.core.service.IMinecraftService; -import org.jackhuang.hellominecraft.utils.tasks.ParallelTask; -import org.jackhuang.hellominecraft.utils.tasks.TaskWindow; -import org.jackhuang.hellominecraft.utils.system.Compressor; -import org.jackhuang.hellominecraft.utils.MessageBox; -import org.jackhuang.hellominecraft.utils.StrUtils; +import org.jackhuang.hellominecraft.util.tasks.ParallelTask; +import org.jackhuang.hellominecraft.util.tasks.TaskWindow; +import org.jackhuang.hellominecraft.util.system.Compressor; +import org.jackhuang.hellominecraft.util.MessageBox; +import org.jackhuang.hellominecraft.util.StrUtils; public class DefaultGameLauncher extends GameLauncher { diff --git a/HMCL/src/main/java/org/jackhuang/hellominecraft/launcher/core/launch/GameLauncher.java b/HMCL/src/main/java/org/jackhuang/hellominecraft/launcher/core/launch/GameLauncher.java index 835146c7f..d7850d93e 100755 --- a/HMCL/src/main/java/org/jackhuang/hellominecraft/launcher/core/launch/GameLauncher.java +++ b/HMCL/src/main/java/org/jackhuang/hellominecraft/launcher/core/launch/GameLauncher.java @@ -26,8 +26,8 @@ import java.io.IOException; import java.io.OutputStreamWriter; import java.io.UnsupportedEncodingException; import java.util.List; -import org.jackhuang.hellominecraft.utils.C; -import org.jackhuang.hellominecraft.utils.logging.HMCLog; +import org.jackhuang.hellominecraft.util.C; +import org.jackhuang.hellominecraft.util.logging.HMCLog; import org.jackhuang.hellominecraft.launcher.api.PluginManager; import org.jackhuang.hellominecraft.launcher.core.GameException; import org.jackhuang.hellominecraft.launcher.core.auth.IAuthenticator; @@ -36,14 +36,14 @@ import org.jackhuang.hellominecraft.launcher.core.auth.UserProfileProvider; import org.jackhuang.hellominecraft.launcher.core.auth.AuthenticationException; import org.jackhuang.hellominecraft.launcher.core.download.DownloadLibraryJob; import org.jackhuang.hellominecraft.launcher.core.version.DecompressLibraryJob; -import org.jackhuang.hellominecraft.utils.system.FileUtils; -import org.jackhuang.hellominecraft.utils.system.IOUtils; -import org.jackhuang.hellominecraft.utils.system.JavaProcess; -import org.jackhuang.hellominecraft.utils.MessageBox; -import org.jackhuang.hellominecraft.utils.system.OS; -import org.jackhuang.hellominecraft.utils.StrUtils; -import org.jackhuang.hellominecraft.utils.EventHandler; -import org.jackhuang.hellominecraft.utils.system.ProcessManager; +import org.jackhuang.hellominecraft.util.system.FileUtils; +import org.jackhuang.hellominecraft.util.system.IOUtils; +import org.jackhuang.hellominecraft.util.system.JavaProcess; +import org.jackhuang.hellominecraft.util.MessageBox; +import org.jackhuang.hellominecraft.util.system.OS; +import org.jackhuang.hellominecraft.util.StrUtils; +import org.jackhuang.hellominecraft.util.EventHandler; +import org.jackhuang.hellominecraft.util.system.ProcessManager; public class GameLauncher { diff --git a/HMCL/src/main/java/org/jackhuang/hellominecraft/launcher/core/launch/LaunchOptions.java b/HMCL/src/main/java/org/jackhuang/hellominecraft/launcher/core/launch/LaunchOptions.java index d8ec937d6..11bcf309e 100644 --- a/HMCL/src/main/java/org/jackhuang/hellominecraft/launcher/core/launch/LaunchOptions.java +++ b/HMCL/src/main/java/org/jackhuang/hellominecraft/launcher/core/launch/LaunchOptions.java @@ -18,10 +18,9 @@ package org.jackhuang.hellominecraft.launcher.core.launch; import java.io.File; -import org.jackhuang.hellominecraft.launcher.core.service.IMinecraftService; import org.jackhuang.hellominecraft.launcher.core.version.GameDirType; -import org.jackhuang.hellominecraft.utils.StrUtils; -import org.jackhuang.hellominecraft.utils.system.JdkVersion; +import org.jackhuang.hellominecraft.util.StrUtils; +import org.jackhuang.hellominecraft.util.system.JdkVersion; /** * @@ -36,8 +35,6 @@ public class LaunchOptions { private File gameDir; private GameDirType gameDirType; - protected transient IMinecraftService service; - public String getVersionName() { return versionName; } diff --git a/HMCL/src/main/java/org/jackhuang/hellominecraft/launcher/core/launch/LibraryDownloadTask.java b/HMCL/src/main/java/org/jackhuang/hellominecraft/launcher/core/launch/LibraryDownloadTask.java index 2c7475774..817ac39d2 100755 --- a/HMCL/src/main/java/org/jackhuang/hellominecraft/launcher/core/launch/LibraryDownloadTask.java +++ b/HMCL/src/main/java/org/jackhuang/hellominecraft/launcher/core/launch/LibraryDownloadTask.java @@ -19,9 +19,9 @@ package org.jackhuang.hellominecraft.launcher.core.launch; import java.io.File; import java.net.URL; -import org.jackhuang.hellominecraft.utils.C; +import org.jackhuang.hellominecraft.util.C; import org.jackhuang.hellominecraft.launcher.core.download.DownloadLibraryJob; -import org.jackhuang.hellominecraft.utils.tasks.download.FileDownloadTask; +import org.jackhuang.hellominecraft.util.tasks.download.FileDownloadTask; /** * diff --git a/HMCL/src/main/java/org/jackhuang/hellominecraft/launcher/core/launch/MinecraftLoader.java b/HMCL/src/main/java/org/jackhuang/hellominecraft/launcher/core/launch/MinecraftLoader.java index 7dfec6efb..031325a7b 100755 --- a/HMCL/src/main/java/org/jackhuang/hellominecraft/launcher/core/launch/MinecraftLoader.java +++ b/HMCL/src/main/java/org/jackhuang/hellominecraft/launcher/core/launch/MinecraftLoader.java @@ -23,22 +23,22 @@ import java.io.File; import java.io.IOException; import java.util.List; import java.util.Map; -import org.jackhuang.hellominecraft.utils.C; -import org.jackhuang.hellominecraft.utils.logging.HMCLog; +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.GameException; import org.jackhuang.hellominecraft.launcher.core.auth.UserProfileProvider; -import org.jackhuang.hellominecraft.utils.system.IOUtils; -import org.jackhuang.hellominecraft.launcher.core.assets.AssetsIndex; -import org.jackhuang.hellominecraft.launcher.core.assets.AssetsObject; -import org.jackhuang.hellominecraft.launcher.core.assets.IAssetsHandler; +import org.jackhuang.hellominecraft.util.system.IOUtils; +import org.jackhuang.hellominecraft.launcher.core.asset.AssetsIndex; +import org.jackhuang.hellominecraft.launcher.core.asset.AssetsObject; +import org.jackhuang.hellominecraft.launcher.core.asset.IAssetsHandler; import org.jackhuang.hellominecraft.launcher.core.download.DownloadType; -import org.jackhuang.hellominecraft.utils.system.OS; +import org.jackhuang.hellominecraft.util.system.OS; import org.jackhuang.hellominecraft.launcher.core.version.MinecraftLibrary; -import org.jackhuang.hellominecraft.utils.tasks.TaskWindow; -import org.jackhuang.hellominecraft.utils.system.FileUtils; -import org.jackhuang.hellominecraft.utils.MessageBox; -import org.jackhuang.hellominecraft.utils.StrUtils; +import org.jackhuang.hellominecraft.util.tasks.TaskWindow; +import org.jackhuang.hellominecraft.util.system.FileUtils; +import org.jackhuang.hellominecraft.util.MessageBox; +import org.jackhuang.hellominecraft.util.StrUtils; /** * diff --git a/HMCL/src/main/java/org/jackhuang/hellominecraft/launcher/core/mod/MinecraftModService.java b/HMCL/src/main/java/org/jackhuang/hellominecraft/launcher/core/mod/MinecraftModService.java index a1b9ca094..ef3145cd1 100755 --- a/HMCL/src/main/java/org/jackhuang/hellominecraft/launcher/core/mod/MinecraftModService.java +++ b/HMCL/src/main/java/org/jackhuang/hellominecraft/launcher/core/mod/MinecraftModService.java @@ -25,12 +25,12 @@ import java.util.Collections; import java.util.HashMap; import java.util.List; import java.util.Map; -import org.jackhuang.hellominecraft.utils.logging.HMCLog; +import org.jackhuang.hellominecraft.util.logging.HMCLog; import org.jackhuang.hellominecraft.launcher.core.service.IMinecraftModService; import org.jackhuang.hellominecraft.launcher.core.service.IMinecraftService; import org.jackhuang.hellominecraft.launcher.core.ModInfo; -import org.jackhuang.hellominecraft.utils.code.DigestUtils; -import org.jackhuang.hellominecraft.utils.system.FileUtils; +import org.jackhuang.hellominecraft.util.code.DigestUtils; +import org.jackhuang.hellominecraft.util.system.FileUtils; /** * diff --git a/HMCL/src/main/java/org/jackhuang/hellominecraft/launcher/core/mod/ModpackManager.java b/HMCL/src/main/java/org/jackhuang/hellominecraft/launcher/core/mod/ModpackManager.java index ff4c208eb..d9d7bd40a 100644 --- a/HMCL/src/main/java/org/jackhuang/hellominecraft/launcher/core/mod/ModpackManager.java +++ b/HMCL/src/main/java/org/jackhuang/hellominecraft/launcher/core/mod/ModpackManager.java @@ -26,19 +26,19 @@ import java.util.Arrays; import java.util.Collection; import java.util.List; import java.util.concurrent.atomic.AtomicInteger; -import org.jackhuang.hellominecraft.utils.C; -import org.jackhuang.hellominecraft.utils.logging.HMCLog; +import org.jackhuang.hellominecraft.util.C; +import org.jackhuang.hellominecraft.util.logging.HMCLog; import org.jackhuang.hellominecraft.launcher.core.GameException; import org.jackhuang.hellominecraft.launcher.core.service.IMinecraftProvider; import org.jackhuang.hellominecraft.launcher.core.service.IMinecraftService; import org.jackhuang.hellominecraft.launcher.core.version.MinecraftVersion; -import org.jackhuang.hellominecraft.utils.functions.BiFunction; -import org.jackhuang.hellominecraft.utils.functions.Predicate; -import org.jackhuang.hellominecraft.utils.system.Compressor; -import org.jackhuang.hellominecraft.utils.system.FileUtils; -import org.jackhuang.hellominecraft.utils.system.ZipEngine; -import org.jackhuang.hellominecraft.utils.tasks.Task; -import org.jackhuang.hellominecraft.utils.version.MinecraftVersionRequest; +import org.jackhuang.hellominecraft.util.func.BiFunction; +import org.jackhuang.hellominecraft.util.func.Predicate; +import org.jackhuang.hellominecraft.util.system.Compressor; +import org.jackhuang.hellominecraft.util.system.FileUtils; +import org.jackhuang.hellominecraft.util.system.ZipEngine; +import org.jackhuang.hellominecraft.util.tasks.Task; +import org.jackhuang.hellominecraft.util.version.MinecraftVersionRequest; /** * A mod pack(*.zip) includes these things: diff --git a/HMCL/src/main/java/org/jackhuang/hellominecraft/launcher/core/service/IMinecraftAssetService.java b/HMCL/src/main/java/org/jackhuang/hellominecraft/launcher/core/service/IMinecraftAssetService.java index 1d53fe2fa..a475f033c 100755 --- a/HMCL/src/main/java/org/jackhuang/hellominecraft/launcher/core/service/IMinecraftAssetService.java +++ b/HMCL/src/main/java/org/jackhuang/hellominecraft/launcher/core/service/IMinecraftAssetService.java @@ -19,7 +19,7 @@ package org.jackhuang.hellominecraft.launcher.core.service; import java.io.File; import java.io.IOException; -import org.jackhuang.hellominecraft.utils.tasks.Task; +import org.jackhuang.hellominecraft.util.tasks.Task; /** * diff --git a/HMCL/src/main/java/org/jackhuang/hellominecraft/launcher/core/service/IMinecraftDownloadService.java b/HMCL/src/main/java/org/jackhuang/hellominecraft/launcher/core/service/IMinecraftDownloadService.java index 80c5b3fc4..d7e72f7a3 100755 --- a/HMCL/src/main/java/org/jackhuang/hellominecraft/launcher/core/service/IMinecraftDownloadService.java +++ b/HMCL/src/main/java/org/jackhuang/hellominecraft/launcher/core/service/IMinecraftDownloadService.java @@ -22,9 +22,9 @@ import java.util.List; import org.jackhuang.hellominecraft.launcher.core.GameException; import org.jackhuang.hellominecraft.launcher.core.download.DownloadLibraryJob; import org.jackhuang.hellominecraft.launcher.core.version.MinecraftVersion; -import org.jackhuang.hellominecraft.utils.OverridableSwingWorker; -import org.jackhuang.hellominecraft.utils.tasks.Task; -import org.jackhuang.hellominecraft.utils.version.MinecraftRemoteVersion; +import org.jackhuang.hellominecraft.util.OverridableSwingWorker; +import org.jackhuang.hellominecraft.util.tasks.Task; +import org.jackhuang.hellominecraft.util.version.MinecraftRemoteVersion; /** * diff --git a/HMCL/src/main/java/org/jackhuang/hellominecraft/launcher/core/service/IMinecraftInstallerService.java b/HMCL/src/main/java/org/jackhuang/hellominecraft/launcher/core/service/IMinecraftInstallerService.java index b2dd63f3b..79faba4dc 100644 --- a/HMCL/src/main/java/org/jackhuang/hellominecraft/launcher/core/service/IMinecraftInstallerService.java +++ b/HMCL/src/main/java/org/jackhuang/hellominecraft/launcher/core/service/IMinecraftInstallerService.java @@ -17,9 +17,9 @@ */ package org.jackhuang.hellominecraft.launcher.core.service; -import org.jackhuang.hellominecraft.launcher.core.installers.InstallerType; -import org.jackhuang.hellominecraft.launcher.core.installers.InstallerVersionList; -import org.jackhuang.hellominecraft.utils.tasks.Task; +import org.jackhuang.hellominecraft.launcher.core.install.InstallerType; +import org.jackhuang.hellominecraft.launcher.core.install.InstallerVersionList; +import org.jackhuang.hellominecraft.util.tasks.Task; /** * diff --git a/HMCL/src/main/java/org/jackhuang/hellominecraft/launcher/core/service/IMinecraftProvider.java b/HMCL/src/main/java/org/jackhuang/hellominecraft/launcher/core/service/IMinecraftProvider.java index 39aa1148c..8fbb98456 100755 --- a/HMCL/src/main/java/org/jackhuang/hellominecraft/launcher/core/service/IMinecraftProvider.java +++ b/HMCL/src/main/java/org/jackhuang/hellominecraft/launcher/core/service/IMinecraftProvider.java @@ -22,8 +22,8 @@ import java.util.Collection; import org.jackhuang.hellominecraft.launcher.core.GameException; import org.jackhuang.hellominecraft.launcher.core.version.DecompressLibraryJob; import org.jackhuang.hellominecraft.launcher.core.version.MinecraftVersion; -import org.jackhuang.hellominecraft.utils.EventHandler; -import org.jackhuang.hellominecraft.utils.functions.Consumer; +import org.jackhuang.hellominecraft.util.EventHandler; +import org.jackhuang.hellominecraft.util.func.Consumer; /** * Provide everything of the Minecraft of a Profile. diff --git a/HMCL/src/main/java/org/jackhuang/hellominecraft/launcher/core/version/MinecraftLibrary.java b/HMCL/src/main/java/org/jackhuang/hellominecraft/launcher/core/version/MinecraftLibrary.java index c83c373f4..08ed671a5 100755 --- a/HMCL/src/main/java/org/jackhuang/hellominecraft/launcher/core/version/MinecraftLibrary.java +++ b/HMCL/src/main/java/org/jackhuang/hellominecraft/launcher/core/version/MinecraftLibrary.java @@ -21,9 +21,9 @@ import java.io.File; import java.util.ArrayList; import java.util.Arrays; import org.jackhuang.hellominecraft.launcher.core.download.DownloadType; -import org.jackhuang.hellominecraft.utils.system.OS; -import org.jackhuang.hellominecraft.utils.system.Platform; -import org.jackhuang.hellominecraft.utils.StrUtils; +import org.jackhuang.hellominecraft.util.system.OS; +import org.jackhuang.hellominecraft.util.system.Platform; +import org.jackhuang.hellominecraft.util.StrUtils; /** * diff --git a/HMCL/src/main/java/org/jackhuang/hellominecraft/launcher/core/version/MinecraftVersion.java b/HMCL/src/main/java/org/jackhuang/hellominecraft/launcher/core/version/MinecraftVersion.java index 56e67f382..eaf89b6f3 100755 --- a/HMCL/src/main/java/org/jackhuang/hellominecraft/launcher/core/version/MinecraftVersion.java +++ b/HMCL/src/main/java/org/jackhuang/hellominecraft/launcher/core/version/MinecraftVersion.java @@ -22,11 +22,11 @@ import java.util.ArrayList; import java.util.HashSet; import java.util.List; import java.util.Set; -import org.jackhuang.hellominecraft.utils.C; +import org.jackhuang.hellominecraft.util.C; import org.jackhuang.hellominecraft.launcher.core.GameException; import org.jackhuang.hellominecraft.launcher.core.service.IMinecraftProvider; -import org.jackhuang.hellominecraft.launcher.core.assets.AssetsIndex; -import org.jackhuang.hellominecraft.utils.ArrayUtils; +import org.jackhuang.hellominecraft.launcher.core.asset.AssetsIndex; +import org.jackhuang.hellominecraft.util.ArrayUtils; /** * diff --git a/HMCL/src/main/java/org/jackhuang/hellominecraft/launcher/core/version/MinecraftVersionManager.java b/HMCL/src/main/java/org/jackhuang/hellominecraft/launcher/core/version/MinecraftVersionManager.java index 1ab8f7a70..a9fe25a49 100755 --- a/HMCL/src/main/java/org/jackhuang/hellominecraft/launcher/core/version/MinecraftVersionManager.java +++ b/HMCL/src/main/java/org/jackhuang/hellominecraft/launcher/core/version/MinecraftVersionManager.java @@ -24,21 +24,21 @@ import java.util.ArrayList; import java.util.Collection; import java.util.Map; import java.util.TreeMap; -import org.jackhuang.hellominecraft.utils.C; -import org.jackhuang.hellominecraft.utils.logging.HMCLog; +import org.jackhuang.hellominecraft.util.C; +import org.jackhuang.hellominecraft.util.logging.HMCLog; import org.jackhuang.hellominecraft.launcher.core.GameException; import org.jackhuang.hellominecraft.launcher.core.service.IMinecraftProvider; import org.jackhuang.hellominecraft.launcher.core.service.IMinecraftService; -import org.jackhuang.hellominecraft.utils.system.FileUtils; +import org.jackhuang.hellominecraft.util.system.FileUtils; import org.jackhuang.hellominecraft.launcher.core.MCUtils; -import org.jackhuang.hellominecraft.utils.tasks.DecompressTask; -import org.jackhuang.hellominecraft.utils.tasks.TaskWindow; -import org.jackhuang.hellominecraft.utils.tasks.download.FileDownloadTask; -import org.jackhuang.hellominecraft.utils.system.IOUtils; -import org.jackhuang.hellominecraft.utils.MessageBox; -import org.jackhuang.hellominecraft.utils.StrUtils; -import org.jackhuang.hellominecraft.utils.functions.Consumer; -import org.jackhuang.hellominecraft.utils.views.SwingUtils; +import org.jackhuang.hellominecraft.util.tasks.DecompressTask; +import org.jackhuang.hellominecraft.util.tasks.TaskWindow; +import org.jackhuang.hellominecraft.util.tasks.download.FileDownloadTask; +import org.jackhuang.hellominecraft.util.system.IOUtils; +import org.jackhuang.hellominecraft.util.MessageBox; +import org.jackhuang.hellominecraft.util.StrUtils; +import org.jackhuang.hellominecraft.util.func.Consumer; +import org.jackhuang.hellominecraft.util.ui.SwingUtils; /** * diff --git a/HMCL/src/main/java/org/jackhuang/hellominecraft/launcher/core/version/ServerInfo.java b/HMCL/src/main/java/org/jackhuang/hellominecraft/launcher/core/version/ServerInfo.java deleted file mode 100755 index 4b8b9ba4c..000000000 --- a/HMCL/src/main/java/org/jackhuang/hellominecraft/launcher/core/version/ServerInfo.java +++ /dev/null @@ -1,54 +0,0 @@ -/* - * Hello Minecraft! Launcher. - * Copyright (C) 2013 huangyuhui - * - * This program is free software: you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation, either version 3 of the License, or - * (at your option) any later version. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. - * - * 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; - -import java.io.File; -import java.util.HashMap; -import javax.swing.Icon; -import javax.swing.ImageIcon; -import org.jackhuang.hellominecraft.utils.tasks.download.FileDownloadTask; -import org.jackhuang.hellominecraft.utils.Utils; - -/** - * - * @author huangyuhui - */ -public class ServerInfo { - - public String name, addr, picurl, type, info, wfjc, tsjs, version, url, depend; - public String[] md5; - public int port; - - public Icon icon; - - public static final HashMap CACHE = new HashMap<>(); - - public void downloadIcon() { - if (icon == null && Utils.isURL(picurl)) - if (CACHE.containsKey(picurl)) - icon = CACHE.get(picurl); - else - try { - File tmp = File.createTempFile("HMCLSERVER", ".png"); - FileDownloadTask.download(picurl, tmp, null); - CACHE.put(picurl, icon = new ImageIcon(tmp.getAbsolutePath())); - } catch (Throwable e) { - throw new RuntimeException("Failed to download icon", e); - } - } -} diff --git a/HMCL/src/main/java/org/jackhuang/hellominecraft/launcher/settings/Config.java b/HMCL/src/main/java/org/jackhuang/hellominecraft/launcher/setting/Config.java similarity index 96% rename from HMCL/src/main/java/org/jackhuang/hellominecraft/launcher/settings/Config.java rename to HMCL/src/main/java/org/jackhuang/hellominecraft/launcher/setting/Config.java index 5704186c3..11024aea9 100755 --- a/HMCL/src/main/java/org/jackhuang/hellominecraft/launcher/settings/Config.java +++ b/HMCL/src/main/java/org/jackhuang/hellominecraft/launcher/setting/Config.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.setting; import org.jackhuang.hellominecraft.launcher.core.download.DownloadType; import com.google.gson.annotations.SerializedName; @@ -27,9 +27,9 @@ import java.util.TreeMap; import java.util.UUID; import org.jackhuang.hellominecraft.launcher.core.auth.IAuthenticator; import org.jackhuang.hellominecraft.lookandfeel.Theme; -import org.jackhuang.hellominecraft.utils.EventHandler; -import org.jackhuang.hellominecraft.utils.system.JdkVersion; -import org.jackhuang.hellominecraft.utils.system.OS; +import org.jackhuang.hellominecraft.util.EventHandler; +import org.jackhuang.hellominecraft.util.system.JdkVersion; +import org.jackhuang.hellominecraft.util.system.OS; /** * diff --git a/HMCL/src/main/java/org/jackhuang/hellominecraft/launcher/settings/DefaultMinecraftService.java b/HMCL/src/main/java/org/jackhuang/hellominecraft/launcher/setting/DefaultMinecraftService.java similarity index 93% rename from HMCL/src/main/java/org/jackhuang/hellominecraft/launcher/settings/DefaultMinecraftService.java rename to HMCL/src/main/java/org/jackhuang/hellominecraft/launcher/setting/DefaultMinecraftService.java index b197128de..afd517d84 100644 --- a/HMCL/src/main/java/org/jackhuang/hellominecraft/launcher/settings/DefaultMinecraftService.java +++ b/HMCL/src/main/java/org/jackhuang/hellominecraft/launcher/setting/DefaultMinecraftService.java @@ -15,14 +15,14 @@ * 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.setting; import java.io.File; import java.util.HashMap; import java.util.Map; import org.jackhuang.hellominecraft.launcher.core.GameException; -import org.jackhuang.hellominecraft.launcher.core.installers.MinecraftInstallerService; -import org.jackhuang.hellominecraft.launcher.core.assets.MinecraftAssetService; +import org.jackhuang.hellominecraft.launcher.core.install.MinecraftInstallerService; +import org.jackhuang.hellominecraft.launcher.core.asset.MinecraftAssetService; import org.jackhuang.hellominecraft.launcher.core.auth.UserProfileProvider; import org.jackhuang.hellominecraft.launcher.core.download.MinecraftDownloadService; import org.jackhuang.hellominecraft.launcher.core.launch.LaunchOptions; @@ -35,8 +35,8 @@ import org.jackhuang.hellominecraft.launcher.core.service.IMinecraftModService; import org.jackhuang.hellominecraft.launcher.core.service.IMinecraftProvider; import org.jackhuang.hellominecraft.launcher.core.service.IMinecraftService; import org.jackhuang.hellominecraft.launcher.core.mod.MinecraftModService; -import org.jackhuang.hellominecraft.utils.C; -import org.jackhuang.hellominecraft.utils.system.FileUtils; +import org.jackhuang.hellominecraft.util.C; +import org.jackhuang.hellominecraft.util.system.FileUtils; /** * diff --git a/HMCL/src/main/java/org/jackhuang/hellominecraft/launcher/settings/DefaultPlugin.java b/HMCL/src/main/java/org/jackhuang/hellominecraft/launcher/setting/DefaultPlugin.java similarity index 91% rename from HMCL/src/main/java/org/jackhuang/hellominecraft/launcher/settings/DefaultPlugin.java rename to HMCL/src/main/java/org/jackhuang/hellominecraft/launcher/setting/DefaultPlugin.java index 432269419..2da4e46c6 100755 --- a/HMCL/src/main/java/org/jackhuang/hellominecraft/launcher/settings/DefaultPlugin.java +++ b/HMCL/src/main/java/org/jackhuang/hellominecraft/launcher/setting/DefaultPlugin.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.setting; import org.jackhuang.hellominecraft.launcher.core.service.IMinecraftService; import org.jackhuang.hellominecraft.launcher.api.IPlugin; @@ -24,8 +24,9 @@ import org.jackhuang.hellominecraft.launcher.core.auth.OfflineAuthenticator; import org.jackhuang.hellominecraft.launcher.core.auth.SkinmeAuthenticator; import org.jackhuang.hellominecraft.launcher.core.auth.UserProfileProvider; import org.jackhuang.hellominecraft.launcher.core.auth.YggdrasilAuthenticator; -import org.jackhuang.hellominecraft.launcher.views.MainFrame; -import org.jackhuang.hellominecraft.utils.functions.Consumer; +import org.jackhuang.hellominecraft.launcher.core.launch.LaunchOptions; +import org.jackhuang.hellominecraft.launcher.ui.MainFrame; +import org.jackhuang.hellominecraft.util.func.Consumer; /** * @@ -75,8 +76,7 @@ public class DefaultPlugin implements IPlugin { } @Override - public void onInitializingProfile(Profile p) { - + public void onProcessingLaunchOptions(LaunchOptions p) { } } diff --git a/HMCL/src/main/java/org/jackhuang/hellominecraft/launcher/settings/HMCLGameProvider.java b/HMCL/src/main/java/org/jackhuang/hellominecraft/launcher/setting/HMCLGameProvider.java similarity index 96% rename from HMCL/src/main/java/org/jackhuang/hellominecraft/launcher/settings/HMCLGameProvider.java rename to HMCL/src/main/java/org/jackhuang/hellominecraft/launcher/setting/HMCLGameProvider.java index 54f56bb05..4376708ba 100644 --- a/HMCL/src/main/java/org/jackhuang/hellominecraft/launcher/settings/HMCLGameProvider.java +++ b/HMCL/src/main/java/org/jackhuang/hellominecraft/launcher/setting/HMCLGameProvider.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.setting; import java.io.File; import org.jackhuang.hellominecraft.launcher.core.version.GameDirType; diff --git a/HMCL/src/main/java/org/jackhuang/hellominecraft/launcher/settings/Profile.java b/HMCL/src/main/java/org/jackhuang/hellominecraft/launcher/setting/Profile.java similarity index 92% rename from HMCL/src/main/java/org/jackhuang/hellominecraft/launcher/settings/Profile.java rename to HMCL/src/main/java/org/jackhuang/hellominecraft/launcher/setting/Profile.java index fe7feccbe..e663723a5 100755 --- a/HMCL/src/main/java/org/jackhuang/hellominecraft/launcher/settings/Profile.java +++ b/HMCL/src/main/java/org/jackhuang/hellominecraft/launcher/setting/Profile.java @@ -15,16 +15,16 @@ * 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.setting; import java.io.File; import org.jackhuang.hellominecraft.launcher.api.PluginManager; import org.jackhuang.hellominecraft.launcher.core.MCUtils; import org.jackhuang.hellominecraft.launcher.core.service.IMinecraftService; -import org.jackhuang.hellominecraft.utils.system.IOUtils; -import org.jackhuang.hellominecraft.utils.StrUtils; -import org.jackhuang.hellominecraft.utils.EventHandler; -import org.jackhuang.hellominecraft.utils.system.OS; +import org.jackhuang.hellominecraft.util.system.IOUtils; +import org.jackhuang.hellominecraft.util.StrUtils; +import org.jackhuang.hellominecraft.util.EventHandler; +import org.jackhuang.hellominecraft.util.system.OS; /** * @@ -44,7 +44,6 @@ public final class Profile { public Profile(String name) { this.name = name; gameDir = MCUtils.getInitGameDir().getPath(); - PluginManager.NOW_PLUGIN.onInitializingProfile(this); } public Profile(Profile v) { diff --git a/HMCL/src/main/java/org/jackhuang/hellominecraft/launcher/settings/Settings.java b/HMCL/src/main/java/org/jackhuang/hellominecraft/launcher/setting/Settings.java similarity index 89% rename from HMCL/src/main/java/org/jackhuang/hellominecraft/launcher/settings/Settings.java rename to HMCL/src/main/java/org/jackhuang/hellominecraft/launcher/setting/Settings.java index 3a0b11d9c..c398748ac 100755 --- a/HMCL/src/main/java/org/jackhuang/hellominecraft/launcher/settings/Settings.java +++ b/HMCL/src/main/java/org/jackhuang/hellominecraft/launcher/setting/Settings.java @@ -15,25 +15,25 @@ * 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.setting; import com.google.gson.JsonSyntaxException; import java.io.File; import java.io.IOException; import java.util.Collection; import java.util.Map; -import org.jackhuang.hellominecraft.utils.C; -import org.jackhuang.hellominecraft.utils.logging.HMCLog; +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.download.DownloadType; -import org.jackhuang.hellominecraft.utils.CollectionUtils; -import org.jackhuang.hellominecraft.utils.Event; -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.functions.Predicate; +import org.jackhuang.hellominecraft.util.CollectionUtils; +import org.jackhuang.hellominecraft.util.Event; +import org.jackhuang.hellominecraft.util.system.FileUtils; +import org.jackhuang.hellominecraft.util.system.IOUtils; +import org.jackhuang.hellominecraft.util.MessageBox; +import org.jackhuang.hellominecraft.util.UpdateChecker; +import org.jackhuang.hellominecraft.util.VersionNumber; +import org.jackhuang.hellominecraft.util.func.Predicate; /** * diff --git a/HMCL/src/main/java/org/jackhuang/hellominecraft/launcher/settings/VersionSetting.java b/HMCL/src/main/java/org/jackhuang/hellominecraft/launcher/setting/VersionSetting.java similarity index 95% rename from HMCL/src/main/java/org/jackhuang/hellominecraft/launcher/settings/VersionSetting.java rename to HMCL/src/main/java/org/jackhuang/hellominecraft/launcher/setting/VersionSetting.java index 4bd83aca4..55c9e2d6e 100644 --- a/HMCL/src/main/java/org/jackhuang/hellominecraft/launcher/settings/VersionSetting.java +++ b/HMCL/src/main/java/org/jackhuang/hellominecraft/launcher/setting/VersionSetting.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.setting; import java.io.File; import java.io.IOException; @@ -23,13 +23,13 @@ import org.jackhuang.hellominecraft.launcher.Main; import org.jackhuang.hellominecraft.launcher.core.LauncherVisibility; import org.jackhuang.hellominecraft.launcher.core.launch.LaunchOptions; import org.jackhuang.hellominecraft.launcher.core.version.GameDirType; -import org.jackhuang.hellominecraft.utils.C; -import org.jackhuang.hellominecraft.utils.EventHandler; -import org.jackhuang.hellominecraft.utils.StrUtils; -import org.jackhuang.hellominecraft.utils.Utils; -import org.jackhuang.hellominecraft.utils.logging.HMCLog; -import org.jackhuang.hellominecraft.utils.system.Java; -import org.jackhuang.hellominecraft.utils.system.JdkVersion; +import org.jackhuang.hellominecraft.util.C; +import org.jackhuang.hellominecraft.util.EventHandler; +import org.jackhuang.hellominecraft.util.StrUtils; +import org.jackhuang.hellominecraft.util.Utils; +import org.jackhuang.hellominecraft.util.logging.HMCLog; +import org.jackhuang.hellominecraft.util.system.Java; +import org.jackhuang.hellominecraft.util.system.JdkVersion; /** * diff --git a/HMCL/src/main/java/org/jackhuang/hellominecraft/launcher/views/AnimatedPanel.java b/HMCL/src/main/java/org/jackhuang/hellominecraft/launcher/ui/AnimatedPanel.java similarity index 96% rename from HMCL/src/main/java/org/jackhuang/hellominecraft/launcher/views/AnimatedPanel.java rename to HMCL/src/main/java/org/jackhuang/hellominecraft/launcher/ui/AnimatedPanel.java index b391aeb88..1ebbe09c8 100755 --- a/HMCL/src/main/java/org/jackhuang/hellominecraft/launcher/views/AnimatedPanel.java +++ b/HMCL/src/main/java/org/jackhuang/hellominecraft/launcher/ui/AnimatedPanel.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.views; +package org.jackhuang.hellominecraft.launcher.ui; import java.awt.AlphaComposite; import java.awt.Graphics; @@ -24,7 +24,7 @@ import java.awt.image.BufferedImage; import javax.swing.JPanel; import javax.swing.SwingUtilities; import javax.swing.Timer; -import org.jackhuang.hellominecraft.launcher.settings.Settings; +import org.jackhuang.hellominecraft.launcher.setting.Settings; /** * diff --git a/HMCL/src/main/java/org/jackhuang/hellominecraft/launcher/views/DraggableFrame.java b/HMCL/src/main/java/org/jackhuang/hellominecraft/launcher/ui/DraggableFrame.java similarity index 97% rename from HMCL/src/main/java/org/jackhuang/hellominecraft/launcher/views/DraggableFrame.java rename to HMCL/src/main/java/org/jackhuang/hellominecraft/launcher/ui/DraggableFrame.java index ac22179e3..863807ffe 100755 --- a/HMCL/src/main/java/org/jackhuang/hellominecraft/launcher/views/DraggableFrame.java +++ b/HMCL/src/main/java/org/jackhuang/hellominecraft/launcher/ui/DraggableFrame.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.views; +package org.jackhuang.hellominecraft.launcher.ui; import java.awt.event.MouseEvent; import java.awt.event.MouseListener; diff --git a/HMCL/src/main/java/org/jackhuang/hellominecraft/launcher/views/GameDownloadPanel.form b/HMCL/src/main/java/org/jackhuang/hellominecraft/launcher/ui/GameDownloadPanel.form similarity index 100% rename from HMCL/src/main/java/org/jackhuang/hellominecraft/launcher/views/GameDownloadPanel.form rename to HMCL/src/main/java/org/jackhuang/hellominecraft/launcher/ui/GameDownloadPanel.form diff --git a/HMCL/src/main/java/org/jackhuang/hellominecraft/launcher/views/GameDownloadPanel.java b/HMCL/src/main/java/org/jackhuang/hellominecraft/launcher/ui/GameDownloadPanel.java similarity index 95% rename from HMCL/src/main/java/org/jackhuang/hellominecraft/launcher/views/GameDownloadPanel.java rename to HMCL/src/main/java/org/jackhuang/hellominecraft/launcher/ui/GameDownloadPanel.java index 3f9f0d4cb..30b01fe44 100755 --- a/HMCL/src/main/java/org/jackhuang/hellominecraft/launcher/views/GameDownloadPanel.java +++ b/HMCL/src/main/java/org/jackhuang/hellominecraft/launcher/ui/GameDownloadPanel.java @@ -15,14 +15,14 @@ * 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.views; +package org.jackhuang.hellominecraft.launcher.ui; import javax.swing.table.DefaultTableModel; -import org.jackhuang.hellominecraft.utils.C; -import org.jackhuang.hellominecraft.utils.logging.HMCLog; -import org.jackhuang.hellominecraft.utils.MessageBox; -import org.jackhuang.hellominecraft.utils.StrUtils; -import org.jackhuang.hellominecraft.utils.views.SwingUtils; +import org.jackhuang.hellominecraft.util.C; +import org.jackhuang.hellominecraft.util.logging.HMCLog; +import org.jackhuang.hellominecraft.util.MessageBox; +import org.jackhuang.hellominecraft.util.StrUtils; +import org.jackhuang.hellominecraft.util.ui.SwingUtils; /** * diff --git a/HMCL/src/main/java/org/jackhuang/hellominecraft/launcher/views/GameSettingsPanel.form b/HMCL/src/main/java/org/jackhuang/hellominecraft/launcher/ui/GameSettingsPanel.form similarity index 100% rename from HMCL/src/main/java/org/jackhuang/hellominecraft/launcher/views/GameSettingsPanel.form rename to HMCL/src/main/java/org/jackhuang/hellominecraft/launcher/ui/GameSettingsPanel.form diff --git a/HMCL/src/main/java/org/jackhuang/hellominecraft/launcher/views/GameSettingsPanel.java b/HMCL/src/main/java/org/jackhuang/hellominecraft/launcher/ui/GameSettingsPanel.java similarity index 98% rename from HMCL/src/main/java/org/jackhuang/hellominecraft/launcher/views/GameSettingsPanel.java rename to HMCL/src/main/java/org/jackhuang/hellominecraft/launcher/ui/GameSettingsPanel.java index 778a9e6b6..cd05ec5b2 100755 --- a/HMCL/src/main/java/org/jackhuang/hellominecraft/launcher/views/GameSettingsPanel.java +++ b/HMCL/src/main/java/org/jackhuang/hellominecraft/launcher/ui/GameSettingsPanel.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.views; +package org.jackhuang.hellominecraft.launcher.ui; import java.awt.Color; import java.awt.datatransfer.DataFlavor; @@ -42,32 +42,32 @@ import javax.swing.event.ChangeListener; import javax.swing.event.TableModelEvent; import javax.swing.filechooser.FileNameExtensionFilter; import javax.swing.table.DefaultTableModel; -import org.jackhuang.hellominecraft.utils.C; -import org.jackhuang.hellominecraft.utils.logging.HMCLog; +import org.jackhuang.hellominecraft.util.C; +import org.jackhuang.hellominecraft.util.logging.HMCLog; import org.jackhuang.hellominecraft.launcher.core.LauncherVisibility; -import org.jackhuang.hellominecraft.launcher.settings.Profile; -import org.jackhuang.hellominecraft.launcher.settings.Settings; -import org.jackhuang.hellominecraft.launcher.utils.FileNameFilter; +import org.jackhuang.hellominecraft.launcher.setting.Profile; +import org.jackhuang.hellominecraft.launcher.setting.Settings; +import org.jackhuang.hellominecraft.launcher.util.FileNameFilter; import org.jackhuang.hellominecraft.launcher.core.ModInfo; -import org.jackhuang.hellominecraft.launcher.core.installers.InstallerType; +import org.jackhuang.hellominecraft.launcher.core.install.InstallerType; import org.jackhuang.hellominecraft.launcher.core.mod.ModpackManager; import org.jackhuang.hellominecraft.launcher.core.version.GameDirType; import org.jackhuang.hellominecraft.launcher.core.version.MinecraftVersion; -import org.jackhuang.hellominecraft.launcher.settings.DefaultMinecraftService; -import org.jackhuang.hellominecraft.launcher.settings.VersionSetting; -import org.jackhuang.hellominecraft.launcher.views.modpack.ModpackWizard; -import org.jackhuang.hellominecraft.utils.tasks.TaskWindow; -import org.jackhuang.hellominecraft.utils.Event; -import org.jackhuang.hellominecraft.utils.system.IOUtils; -import org.jackhuang.hellominecraft.utils.MessageBox; -import org.jackhuang.hellominecraft.utils.OverridableSwingWorker; -import org.jackhuang.hellominecraft.utils.version.MinecraftVersionRequest; -import org.jackhuang.hellominecraft.utils.system.OS; -import org.jackhuang.hellominecraft.utils.StrUtils; -import org.jackhuang.hellominecraft.utils.system.FileUtils; -import org.jackhuang.hellominecraft.utils.views.SwingUtils; -import org.jackhuang.hellominecraft.utils.system.Java; -import org.jackhuang.hellominecraft.utils.views.wizard.api.WizardDisplayer; +import org.jackhuang.hellominecraft.launcher.setting.DefaultMinecraftService; +import org.jackhuang.hellominecraft.launcher.setting.VersionSetting; +import org.jackhuang.hellominecraft.launcher.ui.modpack.ModpackWizard; +import org.jackhuang.hellominecraft.util.tasks.TaskWindow; +import org.jackhuang.hellominecraft.util.Event; +import org.jackhuang.hellominecraft.util.system.IOUtils; +import org.jackhuang.hellominecraft.util.MessageBox; +import org.jackhuang.hellominecraft.util.OverridableSwingWorker; +import org.jackhuang.hellominecraft.util.version.MinecraftVersionRequest; +import org.jackhuang.hellominecraft.util.system.OS; +import org.jackhuang.hellominecraft.util.StrUtils; +import org.jackhuang.hellominecraft.util.system.FileUtils; +import org.jackhuang.hellominecraft.util.ui.SwingUtils; +import org.jackhuang.hellominecraft.util.system.Java; +import org.jackhuang.hellominecraft.util.ui.wizard.api.WizardDisplayer; /** * diff --git a/HMCL/src/main/java/org/jackhuang/hellominecraft/launcher/views/HeaderTab.java b/HMCL/src/main/java/org/jackhuang/hellominecraft/launcher/ui/HeaderTab.java similarity index 98% rename from HMCL/src/main/java/org/jackhuang/hellominecraft/launcher/views/HeaderTab.java rename to HMCL/src/main/java/org/jackhuang/hellominecraft/launcher/ui/HeaderTab.java index 92c21f2ad..f05e6860f 100755 --- a/HMCL/src/main/java/org/jackhuang/hellominecraft/launcher/views/HeaderTab.java +++ b/HMCL/src/main/java/org/jackhuang/hellominecraft/launcher/ui/HeaderTab.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.views; +package org.jackhuang.hellominecraft.launcher.ui; import java.awt.EventQueue; import java.awt.event.ActionListener; diff --git a/HMCL/src/main/java/org/jackhuang/hellominecraft/launcher/views/InstallerPanel.form b/HMCL/src/main/java/org/jackhuang/hellominecraft/launcher/ui/InstallerPanel.form similarity index 100% rename from HMCL/src/main/java/org/jackhuang/hellominecraft/launcher/views/InstallerPanel.form rename to HMCL/src/main/java/org/jackhuang/hellominecraft/launcher/ui/InstallerPanel.form diff --git a/HMCL/src/main/java/org/jackhuang/hellominecraft/launcher/views/InstallerPanel.java b/HMCL/src/main/java/org/jackhuang/hellominecraft/launcher/ui/InstallerPanel.java similarity index 89% rename from HMCL/src/main/java/org/jackhuang/hellominecraft/launcher/views/InstallerPanel.java rename to HMCL/src/main/java/org/jackhuang/hellominecraft/launcher/ui/InstallerPanel.java index 4fda450c3..e088a88a8 100755 --- a/HMCL/src/main/java/org/jackhuang/hellominecraft/launcher/views/InstallerPanel.java +++ b/HMCL/src/main/java/org/jackhuang/hellominecraft/launcher/ui/InstallerPanel.java @@ -15,22 +15,22 @@ * 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.views; +package org.jackhuang.hellominecraft.launcher.ui; import java.util.List; import javax.swing.SwingUtilities; import javax.swing.table.DefaultTableModel; -import org.jackhuang.hellominecraft.utils.C; -import org.jackhuang.hellominecraft.launcher.settings.Settings; -import org.jackhuang.hellominecraft.launcher.core.installers.InstallerType; -import org.jackhuang.hellominecraft.launcher.core.installers.InstallerVersionList; -import org.jackhuang.hellominecraft.utils.tasks.TaskRunnable; -import org.jackhuang.hellominecraft.utils.tasks.TaskRunnableArg1; -import org.jackhuang.hellominecraft.utils.tasks.TaskWindow; -import org.jackhuang.hellominecraft.utils.tasks.communication.DefaultPreviousResult; -import org.jackhuang.hellominecraft.utils.MessageBox; -import org.jackhuang.hellominecraft.utils.StrUtils; -import org.jackhuang.hellominecraft.utils.views.SwingUtils; +import org.jackhuang.hellominecraft.util.C; +import org.jackhuang.hellominecraft.launcher.setting.Settings; +import org.jackhuang.hellominecraft.launcher.core.install.InstallerType; +import org.jackhuang.hellominecraft.launcher.core.install.InstallerVersionList; +import org.jackhuang.hellominecraft.util.tasks.TaskRunnable; +import org.jackhuang.hellominecraft.util.tasks.TaskRunnableArg1; +import org.jackhuang.hellominecraft.util.tasks.TaskWindow; +import org.jackhuang.hellominecraft.util.tasks.communication.DefaultPreviousResult; +import org.jackhuang.hellominecraft.util.MessageBox; +import org.jackhuang.hellominecraft.util.StrUtils; +import org.jackhuang.hellominecraft.util.ui.SwingUtils; /** * diff --git a/HMCL/src/main/java/org/jackhuang/hellominecraft/launcher/views/LauncherSettingsPanel.form b/HMCL/src/main/java/org/jackhuang/hellominecraft/launcher/ui/LauncherSettingsPanel.form similarity index 100% rename from HMCL/src/main/java/org/jackhuang/hellominecraft/launcher/views/LauncherSettingsPanel.form rename to HMCL/src/main/java/org/jackhuang/hellominecraft/launcher/ui/LauncherSettingsPanel.form diff --git a/HMCL/src/main/java/org/jackhuang/hellominecraft/launcher/views/LauncherSettingsPanel.java b/HMCL/src/main/java/org/jackhuang/hellominecraft/launcher/ui/LauncherSettingsPanel.java similarity index 98% rename from HMCL/src/main/java/org/jackhuang/hellominecraft/launcher/views/LauncherSettingsPanel.java rename to HMCL/src/main/java/org/jackhuang/hellominecraft/launcher/ui/LauncherSettingsPanel.java index 1576e8068..83daaf9a3 100755 --- a/HMCL/src/main/java/org/jackhuang/hellominecraft/launcher/views/LauncherSettingsPanel.java +++ b/HMCL/src/main/java/org/jackhuang/hellominecraft/launcher/ui/LauncherSettingsPanel.java @@ -15,20 +15,20 @@ * 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.views; +package org.jackhuang.hellominecraft.launcher.ui; import java.awt.Color; import java.io.IOException; import javax.swing.DefaultComboBoxModel; import javax.swing.JFileChooser; import javax.swing.filechooser.FileNameExtensionFilter; -import org.jackhuang.hellominecraft.utils.C; -import org.jackhuang.hellominecraft.utils.logging.HMCLog; -import org.jackhuang.hellominecraft.launcher.settings.Settings; +import org.jackhuang.hellominecraft.util.C; +import org.jackhuang.hellominecraft.util.logging.HMCLog; +import org.jackhuang.hellominecraft.launcher.setting.Settings; import org.jackhuang.hellominecraft.launcher.core.download.DownloadType; -import org.jackhuang.hellominecraft.utils.system.IOUtils; -import org.jackhuang.hellominecraft.utils.MessageBox; -import org.jackhuang.hellominecraft.utils.views.SwingUtils; +import org.jackhuang.hellominecraft.util.system.IOUtils; +import org.jackhuang.hellominecraft.util.MessageBox; +import org.jackhuang.hellominecraft.util.ui.SwingUtils; /** * diff --git a/HMCL/src/main/java/org/jackhuang/hellominecraft/launcher/views/MainFrame.java b/HMCL/src/main/java/org/jackhuang/hellominecraft/launcher/ui/MainFrame.java similarity index 96% rename from HMCL/src/main/java/org/jackhuang/hellominecraft/launcher/views/MainFrame.java rename to HMCL/src/main/java/org/jackhuang/hellominecraft/launcher/ui/MainFrame.java index da4727cc3..6703362bb 100755 --- a/HMCL/src/main/java/org/jackhuang/hellominecraft/launcher/views/MainFrame.java +++ b/HMCL/src/main/java/org/jackhuang/hellominecraft/launcher/ui/MainFrame.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.views; +package org.jackhuang.hellominecraft.launcher.ui; import java.awt.BorderLayout; import java.awt.CardLayout; @@ -40,18 +40,18 @@ import javax.swing.JButton; import javax.swing.JLabel; import javax.swing.JPanel; import javax.swing.SwingUtilities; -import org.jackhuang.hellominecraft.utils.C; -import org.jackhuang.hellominecraft.utils.logging.HMCLog; +import org.jackhuang.hellominecraft.util.C; +import org.jackhuang.hellominecraft.util.logging.HMCLog; import org.jackhuang.hellominecraft.launcher.Main; -import org.jackhuang.hellominecraft.launcher.settings.Settings; +import org.jackhuang.hellominecraft.launcher.setting.Settings; import org.jackhuang.hellominecraft.launcher.core.auth.IAuthenticator; import org.jackhuang.hellominecraft.lookandfeel.GraphicsUtils; import org.jackhuang.hellominecraft.lookandfeel.Theme; -import org.jackhuang.hellominecraft.utils.StrUtils; -import org.jackhuang.hellominecraft.utils.Utils; -import org.jackhuang.hellominecraft.utils.views.DropShadowBorder; -import org.jackhuang.hellominecraft.utils.views.TintablePanel; -import org.jackhuang.hellominecraft.utils.views.BasicColors; +import org.jackhuang.hellominecraft.util.StrUtils; +import org.jackhuang.hellominecraft.util.Utils; +import org.jackhuang.hellominecraft.util.ui.DropShadowBorder; +import org.jackhuang.hellominecraft.util.ui.TintablePanel; +import org.jackhuang.hellominecraft.util.ui.BasicColors; /** * diff --git a/HMCL/src/main/java/org/jackhuang/hellominecraft/launcher/views/MainPagePanel.form b/HMCL/src/main/java/org/jackhuang/hellominecraft/launcher/ui/MainPagePanel.form similarity index 100% rename from HMCL/src/main/java/org/jackhuang/hellominecraft/launcher/views/MainPagePanel.form rename to HMCL/src/main/java/org/jackhuang/hellominecraft/launcher/ui/MainPagePanel.form diff --git a/HMCL/src/main/java/org/jackhuang/hellominecraft/launcher/views/MainPagePanel.java b/HMCL/src/main/java/org/jackhuang/hellominecraft/launcher/ui/MainPagePanel.java similarity index 94% rename from HMCL/src/main/java/org/jackhuang/hellominecraft/launcher/views/MainPagePanel.java rename to HMCL/src/main/java/org/jackhuang/hellominecraft/launcher/ui/MainPagePanel.java index 6de3aadd6..61950809d 100755 --- a/HMCL/src/main/java/org/jackhuang/hellominecraft/launcher/views/MainPagePanel.java +++ b/HMCL/src/main/java/org/jackhuang/hellominecraft/launcher/ui/MainPagePanel.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.views; +package org.jackhuang.hellominecraft.launcher.ui; import java.awt.CardLayout; import java.awt.Dimension; @@ -27,26 +27,28 @@ import java.io.IOException; import java.util.List; import javax.swing.JOptionPane; import javax.swing.SwingUtilities; -import org.jackhuang.hellominecraft.utils.C; -import org.jackhuang.hellominecraft.utils.logging.HMCLog; +import org.jackhuang.hellominecraft.launcher.api.PluginManager; +import org.jackhuang.hellominecraft.util.C; +import org.jackhuang.hellominecraft.util.logging.HMCLog; import org.jackhuang.hellominecraft.launcher.core.launch.DefaultGameLauncher; import org.jackhuang.hellominecraft.launcher.core.GameException; import org.jackhuang.hellominecraft.launcher.core.auth.IAuthenticator; import org.jackhuang.hellominecraft.launcher.core.auth.LoginInfo; -import org.jackhuang.hellominecraft.launcher.settings.Profile; -import org.jackhuang.hellominecraft.utils.MessageBox; -import org.jackhuang.hellominecraft.utils.StrUtils; +import org.jackhuang.hellominecraft.launcher.setting.Profile; +import org.jackhuang.hellominecraft.util.MessageBox; +import org.jackhuang.hellominecraft.util.StrUtils; import org.jackhuang.hellominecraft.launcher.core.version.MinecraftVersion; import org.jackhuang.hellominecraft.launcher.core.launch.GameLauncher; import org.jackhuang.hellominecraft.launcher.core.LauncherVisibility; -import org.jackhuang.hellominecraft.launcher.settings.Settings; +import org.jackhuang.hellominecraft.launcher.setting.Settings; import org.jackhuang.hellominecraft.launcher.core.auth.AuthenticationException; +import org.jackhuang.hellominecraft.launcher.core.launch.LaunchOptions; import org.jackhuang.hellominecraft.lookandfeel.GraphicsUtils; -import org.jackhuang.hellominecraft.utils.Event; +import org.jackhuang.hellominecraft.util.Event; import org.jackhuang.hellominecraft.lookandfeel.components.ConstomButton; -import org.jackhuang.hellominecraft.utils.functions.Consumer; -import org.jackhuang.hellominecraft.utils.system.JavaProcessMonitor; -import org.jackhuang.hellominecraft.utils.views.LogWindow; +import org.jackhuang.hellominecraft.util.func.Consumer; +import org.jackhuang.hellominecraft.util.system.JavaProcessMonitor; +import org.jackhuang.hellominecraft.util.ui.LogWindow; /** * @@ -118,7 +120,6 @@ public class MainPagePanel extends AnimatedPanel implements Event { pnlMore.setBackground(new java.awt.Color(204, 204, 204)); pnlMore.setOpaque(false); - txtPlayerName.setText(""); txtPlayerName.addFocusListener(new java.awt.event.FocusAdapter() { public void focusGained(java.awt.event.FocusEvent evt) { txtPlayerNameFocusGained(evt); @@ -215,7 +216,7 @@ public class MainPagePanel extends AnimatedPanel implements Event { ); jPanel3Layout.setVerticalGroup( jPanel3Layout.createParallelGroup(javax.swing.GroupLayout.Alignment.LEADING) - .addComponent(btnLogout, javax.swing.GroupLayout.PREFERRED_SIZE, 26, Short.MAX_VALUE) + .addComponent(btnLogout, javax.swing.GroupLayout.DEFAULT_SIZE, javax.swing.GroupLayout.DEFAULT_SIZE, Short.MAX_VALUE) ); pnlPassword.add(jPanel3, "card3"); @@ -408,19 +409,21 @@ public class MainPagePanel extends AnimatedPanel implements Event { @Override public void run() { Thread.currentThread().setName("Game Launcher"); - DefaultGameLauncher gl = new DefaultGameLauncher(getProfile().getSelectedVersionSetting().createLaunchOptions(getProfile().getCanonicalGameDirFile()), getProfile().service(), li, l); - gl.setTag(getProfile().getSelectedVersionSetting().getLauncherVisibility()); - gl.successEvent.register((sender, s) -> { - isLaunching = false; - return true; - }); - listener.accept(gl); try { + LaunchOptions options = getProfile().getSelectedVersionSetting().createLaunchOptions(getProfile().getCanonicalGameDirFile()); + PluginManager.NOW_PLUGIN.onProcessingLaunchOptions(options); + DefaultGameLauncher gl = new DefaultGameLauncher(options, getProfile().service(), li, l); + gl.setTag(getProfile().getSelectedVersionSetting().getLauncherVisibility()); + gl.successEvent.register((sender, s) -> { + isLaunching = false; + return true; + }); + listener.accept(gl); gl.makeLaunchCommand(); } catch (GameException e) { failed(C.i18n("launch.failed") + ", " + e.getMessage()); } catch (AuthenticationException e) { - failed(C.i18n("login.failed") + e.getMessage()); + failed(C.i18n("login.failed") + ", " + e.getMessage()); } } }.start(); diff --git a/HMCL/src/main/java/org/jackhuang/hellominecraft/launcher/views/NewProfileWindow.form b/HMCL/src/main/java/org/jackhuang/hellominecraft/launcher/ui/NewProfileWindow.form similarity index 100% rename from HMCL/src/main/java/org/jackhuang/hellominecraft/launcher/views/NewProfileWindow.form rename to HMCL/src/main/java/org/jackhuang/hellominecraft/launcher/ui/NewProfileWindow.form diff --git a/HMCL/src/main/java/org/jackhuang/hellominecraft/launcher/views/NewProfileWindow.java b/HMCL/src/main/java/org/jackhuang/hellominecraft/launcher/ui/NewProfileWindow.java similarity index 96% rename from HMCL/src/main/java/org/jackhuang/hellominecraft/launcher/views/NewProfileWindow.java rename to HMCL/src/main/java/org/jackhuang/hellominecraft/launcher/ui/NewProfileWindow.java index 14fdbdd04..9adabd826 100755 --- a/HMCL/src/main/java/org/jackhuang/hellominecraft/launcher/views/NewProfileWindow.java +++ b/HMCL/src/main/java/org/jackhuang/hellominecraft/launcher/ui/NewProfileWindow.java @@ -15,12 +15,12 @@ * 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.views; +package org.jackhuang.hellominecraft.launcher.ui; -import org.jackhuang.hellominecraft.utils.C; -import org.jackhuang.hellominecraft.launcher.settings.Profile; -import org.jackhuang.hellominecraft.launcher.settings.Settings; -import org.jackhuang.hellominecraft.utils.StrUtils; +import org.jackhuang.hellominecraft.util.C; +import org.jackhuang.hellominecraft.launcher.setting.Profile; +import org.jackhuang.hellominecraft.launcher.setting.Settings; +import org.jackhuang.hellominecraft.util.StrUtils; /** * diff --git a/HMCL/src/main/java/org/jackhuang/hellominecraft/launcher/views/NewTabPane.java b/HMCL/src/main/java/org/jackhuang/hellominecraft/launcher/ui/NewTabPane.java similarity index 96% rename from HMCL/src/main/java/org/jackhuang/hellominecraft/launcher/views/NewTabPane.java rename to HMCL/src/main/java/org/jackhuang/hellominecraft/launcher/ui/NewTabPane.java index 4a9fe7ae6..f36d5c74f 100755 --- a/HMCL/src/main/java/org/jackhuang/hellominecraft/launcher/views/NewTabPane.java +++ b/HMCL/src/main/java/org/jackhuang/hellominecraft/launcher/ui/NewTabPane.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.views; +package org.jackhuang.hellominecraft.launcher.ui; import javax.swing.JTabbedPane; import javax.swing.event.ChangeEvent; diff --git a/HMCL/src/main/java/org/jackhuang/hellominecraft/launcher/views/Selectable.java b/HMCL/src/main/java/org/jackhuang/hellominecraft/launcher/ui/Selectable.java similarity index 94% rename from HMCL/src/main/java/org/jackhuang/hellominecraft/launcher/views/Selectable.java rename to HMCL/src/main/java/org/jackhuang/hellominecraft/launcher/ui/Selectable.java index ba45940eb..a48350ff8 100755 --- a/HMCL/src/main/java/org/jackhuang/hellominecraft/launcher/views/Selectable.java +++ b/HMCL/src/main/java/org/jackhuang/hellominecraft/launcher/ui/Selectable.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.views; +package org.jackhuang.hellominecraft.launcher.ui; /** * diff --git a/HMCL/src/main/java/org/jackhuang/hellominecraft/launcher/views/modpack/ModpackFileSelectionPanel.form b/HMCL/src/main/java/org/jackhuang/hellominecraft/launcher/ui/modpack/ModpackFileSelectionPanel.form similarity index 100% rename from HMCL/src/main/java/org/jackhuang/hellominecraft/launcher/views/modpack/ModpackFileSelectionPanel.form rename to HMCL/src/main/java/org/jackhuang/hellominecraft/launcher/ui/modpack/ModpackFileSelectionPanel.form diff --git a/HMCL/src/main/java/org/jackhuang/hellominecraft/launcher/views/modpack/ModpackFileSelectionPanel.java b/HMCL/src/main/java/org/jackhuang/hellominecraft/launcher/ui/modpack/ModpackFileSelectionPanel.java similarity index 89% rename from HMCL/src/main/java/org/jackhuang/hellominecraft/launcher/views/modpack/ModpackFileSelectionPanel.java rename to HMCL/src/main/java/org/jackhuang/hellominecraft/launcher/ui/modpack/ModpackFileSelectionPanel.java index 69fd060fa..824811035 100644 --- a/HMCL/src/main/java/org/jackhuang/hellominecraft/launcher/views/modpack/ModpackFileSelectionPanel.java +++ b/HMCL/src/main/java/org/jackhuang/hellominecraft/launcher/ui/modpack/ModpackFileSelectionPanel.java @@ -15,19 +15,19 @@ * 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.views.modpack; +package org.jackhuang.hellominecraft.launcher.ui.modpack; import java.io.File; import java.util.HashSet; import java.util.Map; import java.util.Set; import javax.swing.tree.DefaultTreeModel; -import org.jackhuang.hellominecraft.utils.functions.BiFunction; -import org.jackhuang.hellominecraft.utils.system.FileUtils; -import org.jackhuang.hellominecraft.utils.views.checktree.CheckBoxTreeCellRenderer; -import org.jackhuang.hellominecraft.utils.views.checktree.CheckBoxTreeNode; -import org.jackhuang.hellominecraft.utils.views.checktree.CheckBoxTreeNodeSelectionListener; -import org.jackhuang.hellominecraft.utils.views.wizard.spi.WizardController; +import org.jackhuang.hellominecraft.util.func.BiFunction; +import org.jackhuang.hellominecraft.util.system.FileUtils; +import org.jackhuang.hellominecraft.util.ui.checktree.CheckBoxTreeCellRenderer; +import org.jackhuang.hellominecraft.util.ui.checktree.CheckBoxTreeNode; +import org.jackhuang.hellominecraft.util.ui.checktree.CheckBoxTreeNodeSelectionListener; +import org.jackhuang.hellominecraft.util.ui.wizard.spi.WizardController; /** * diff --git a/HMCL/src/main/java/org/jackhuang/hellominecraft/launcher/views/modpack/ModpackInitializationPanel.form b/HMCL/src/main/java/org/jackhuang/hellominecraft/launcher/ui/modpack/ModpackInitializationPanel.form similarity index 100% rename from HMCL/src/main/java/org/jackhuang/hellominecraft/launcher/views/modpack/ModpackInitializationPanel.form rename to HMCL/src/main/java/org/jackhuang/hellominecraft/launcher/ui/modpack/ModpackInitializationPanel.form diff --git a/HMCL/src/main/java/org/jackhuang/hellominecraft/launcher/views/modpack/ModpackInitializationPanel.java b/HMCL/src/main/java/org/jackhuang/hellominecraft/launcher/ui/modpack/ModpackInitializationPanel.java similarity index 97% rename from HMCL/src/main/java/org/jackhuang/hellominecraft/launcher/views/modpack/ModpackInitializationPanel.java rename to HMCL/src/main/java/org/jackhuang/hellominecraft/launcher/ui/modpack/ModpackInitializationPanel.java index 583991c8b..5145f7644 100644 --- a/HMCL/src/main/java/org/jackhuang/hellominecraft/launcher/views/modpack/ModpackInitializationPanel.java +++ b/HMCL/src/main/java/org/jackhuang/hellominecraft/launcher/ui/modpack/ModpackInitializationPanel.java @@ -15,14 +15,14 @@ * 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.views.modpack; +package org.jackhuang.hellominecraft.launcher.ui.modpack; import java.util.Map; import javax.swing.DefaultComboBoxModel; import javax.swing.JFileChooser; import javax.swing.filechooser.FileNameExtensionFilter; -import org.jackhuang.hellominecraft.utils.C; -import org.jackhuang.hellominecraft.utils.views.wizard.spi.WizardController; +import org.jackhuang.hellominecraft.util.C; +import org.jackhuang.hellominecraft.util.ui.wizard.spi.WizardController; /** * diff --git a/HMCL/src/main/java/org/jackhuang/hellominecraft/launcher/views/modpack/ModpackWizard.java b/HMCL/src/main/java/org/jackhuang/hellominecraft/launcher/ui/modpack/ModpackWizard.java similarity index 86% rename from HMCL/src/main/java/org/jackhuang/hellominecraft/launcher/views/modpack/ModpackWizard.java rename to HMCL/src/main/java/org/jackhuang/hellominecraft/launcher/ui/modpack/ModpackWizard.java index 032b0133e..adcbcbabb 100644 --- a/HMCL/src/main/java/org/jackhuang/hellominecraft/launcher/views/modpack/ModpackWizard.java +++ b/HMCL/src/main/java/org/jackhuang/hellominecraft/launcher/ui/modpack/ModpackWizard.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.views.modpack; +package org.jackhuang.hellominecraft.launcher.ui.modpack; import java.io.File; import java.io.IOException; @@ -29,16 +29,16 @@ import org.jackhuang.hellominecraft.launcher.core.GameException; import org.jackhuang.hellominecraft.launcher.core.mod.ModpackManager; import org.jackhuang.hellominecraft.launcher.core.service.IMinecraftService; import org.jackhuang.hellominecraft.launcher.core.version.MinecraftVersion; -import org.jackhuang.hellominecraft.utils.C; -import org.jackhuang.hellominecraft.utils.logging.HMCLog; -import org.jackhuang.hellominecraft.utils.views.checktree.CheckBoxTreeNode; -import org.jackhuang.hellominecraft.utils.views.wizard.spi.DeferredWizardResult; -import org.jackhuang.hellominecraft.utils.views.wizard.spi.ResultProgressHandle; -import org.jackhuang.hellominecraft.utils.views.wizard.spi.Summary; -import org.jackhuang.hellominecraft.utils.views.wizard.spi.WizardBranchController; -import org.jackhuang.hellominecraft.utils.views.wizard.spi.WizardController; -import org.jackhuang.hellominecraft.utils.views.wizard.spi.WizardException; -import org.jackhuang.hellominecraft.utils.views.wizard.spi.WizardPanelProvider; +import org.jackhuang.hellominecraft.util.C; +import org.jackhuang.hellominecraft.util.logging.HMCLog; +import org.jackhuang.hellominecraft.util.ui.checktree.CheckBoxTreeNode; +import org.jackhuang.hellominecraft.util.ui.wizard.spi.DeferredWizardResult; +import org.jackhuang.hellominecraft.util.ui.wizard.spi.ResultProgressHandle; +import org.jackhuang.hellominecraft.util.ui.wizard.spi.Summary; +import org.jackhuang.hellominecraft.util.ui.wizard.spi.WizardBranchController; +import org.jackhuang.hellominecraft.util.ui.wizard.spi.WizardController; +import org.jackhuang.hellominecraft.util.ui.wizard.spi.WizardException; +import org.jackhuang.hellominecraft.util.ui.wizard.spi.WizardPanelProvider; /** * diff --git a/HMCL/src/main/java/org/jackhuang/hellominecraft/launcher/utils/CrashReporter.java b/HMCL/src/main/java/org/jackhuang/hellominecraft/launcher/util/CrashReporter.java similarity index 92% rename from HMCL/src/main/java/org/jackhuang/hellominecraft/launcher/utils/CrashReporter.java rename to HMCL/src/main/java/org/jackhuang/hellominecraft/launcher/util/CrashReporter.java index e17caefce..01a4c877b 100755 --- a/HMCL/src/main/java/org/jackhuang/hellominecraft/launcher/utils/CrashReporter.java +++ b/HMCL/src/main/java/org/jackhuang/hellominecraft/launcher/util/CrashReporter.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.utils; +package org.jackhuang.hellominecraft.launcher.util; import java.io.IOException; import java.text.SimpleDateFormat; @@ -23,15 +23,15 @@ import java.util.Date; import java.util.HashMap; import java.util.HashSet; import javax.swing.SwingUtilities; -import org.jackhuang.hellominecraft.utils.C; -import org.jackhuang.hellominecraft.utils.logging.HMCLog; +import org.jackhuang.hellominecraft.util.C; +import org.jackhuang.hellominecraft.util.logging.HMCLog; import org.jackhuang.hellominecraft.launcher.Main; -import org.jackhuang.hellominecraft.launcher.settings.Settings; -import org.jackhuang.hellominecraft.utils.NetUtils; -import org.jackhuang.hellominecraft.utils.MessageBox; -import org.jackhuang.hellominecraft.utils.StrUtils; -import org.jackhuang.hellominecraft.utils.system.OS; -import org.jackhuang.hellominecraft.utils.views.LogWindow; +import org.jackhuang.hellominecraft.launcher.setting.Settings; +import org.jackhuang.hellominecraft.util.NetUtils; +import org.jackhuang.hellominecraft.util.MessageBox; +import org.jackhuang.hellominecraft.util.StrUtils; +import org.jackhuang.hellominecraft.util.system.OS; +import org.jackhuang.hellominecraft.util.ui.LogWindow; /** * diff --git a/HMCL/src/main/java/org/jackhuang/hellominecraft/launcher/utils/FileNameFilter.java b/HMCL/src/main/java/org/jackhuang/hellominecraft/launcher/util/FileNameFilter.java similarity index 91% rename from HMCL/src/main/java/org/jackhuang/hellominecraft/launcher/utils/FileNameFilter.java rename to HMCL/src/main/java/org/jackhuang/hellominecraft/launcher/util/FileNameFilter.java index 25ff55459..8799bf6f5 100755 --- a/HMCL/src/main/java/org/jackhuang/hellominecraft/launcher/utils/FileNameFilter.java +++ b/HMCL/src/main/java/org/jackhuang/hellominecraft/launcher/util/FileNameFilter.java @@ -15,11 +15,11 @@ * 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.utils; +package org.jackhuang.hellominecraft.launcher.util; import java.io.File; import javax.swing.filechooser.FileFilter; -import org.jackhuang.hellominecraft.utils.system.FileUtils; +import org.jackhuang.hellominecraft.util.system.FileUtils; /** * diff --git a/HMCL/src/main/java/org/jackhuang/hellominecraft/launcher/utils/MinecraftCrashAdvicer.java b/HMCL/src/main/java/org/jackhuang/hellominecraft/launcher/util/MinecraftCrashAdvicer.java similarity index 96% rename from HMCL/src/main/java/org/jackhuang/hellominecraft/launcher/utils/MinecraftCrashAdvicer.java rename to HMCL/src/main/java/org/jackhuang/hellominecraft/launcher/util/MinecraftCrashAdvicer.java index 276202c67..854e2c5e7 100755 --- a/HMCL/src/main/java/org/jackhuang/hellominecraft/launcher/utils/MinecraftCrashAdvicer.java +++ b/HMCL/src/main/java/org/jackhuang/hellominecraft/launcher/util/MinecraftCrashAdvicer.java @@ -15,9 +15,9 @@ * 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.utils; +package org.jackhuang.hellominecraft.launcher.util; -import org.jackhuang.hellominecraft.utils.C; +import org.jackhuang.hellominecraft.util.C; /** * Give the advice to solve the Minecraft crashing. diff --git a/HMCL/src/main/java/org/jackhuang/hellominecraft/launcher/utils/ModpackUpdater.java b/HMCL/src/main/java/org/jackhuang/hellominecraft/launcher/util/ModpackUpdater.java similarity index 96% rename from HMCL/src/main/java/org/jackhuang/hellominecraft/launcher/utils/ModpackUpdater.java rename to HMCL/src/main/java/org/jackhuang/hellominecraft/launcher/util/ModpackUpdater.java index d3ba5789b..aef55103b 100755 --- a/HMCL/src/main/java/org/jackhuang/hellominecraft/launcher/utils/ModpackUpdater.java +++ b/HMCL/src/main/java/org/jackhuang/hellominecraft/launcher/util/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.utils; +package org.jackhuang.hellominecraft.launcher.util; import java.io.File; import java.util.ArrayList; diff --git a/HMCL/src/main/java/org/jackhuang/hellominecraft/launcher/utils/upgrade/AppDataUpgrader.java b/HMCL/src/main/java/org/jackhuang/hellominecraft/launcher/util/upgrade/AppDataUpgrader.java similarity index 89% rename from HMCL/src/main/java/org/jackhuang/hellominecraft/launcher/utils/upgrade/AppDataUpgrader.java rename to HMCL/src/main/java/org/jackhuang/hellominecraft/launcher/util/upgrade/AppDataUpgrader.java index 93b70b515..58950b6a7 100755 --- a/HMCL/src/main/java/org/jackhuang/hellominecraft/launcher/utils/upgrade/AppDataUpgrader.java +++ b/HMCL/src/main/java/org/jackhuang/hellominecraft/launcher/util/upgrade/AppDataUpgrader.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.utils.upgrade; +package org.jackhuang.hellominecraft.launcher.util.upgrade; import java.io.File; import java.io.FileInputStream; @@ -34,21 +34,21 @@ import java.util.jar.JarFile; import java.util.jar.JarOutputStream; import java.util.jar.Pack200; import java.util.zip.GZIPInputStream; -import org.jackhuang.hellominecraft.utils.C; -import org.jackhuang.hellominecraft.utils.logging.HMCLog; +import org.jackhuang.hellominecraft.util.C; +import org.jackhuang.hellominecraft.util.logging.HMCLog; import org.jackhuang.hellominecraft.launcher.core.MCUtils; -import org.jackhuang.hellominecraft.utils.tasks.Task; -import org.jackhuang.hellominecraft.utils.tasks.TaskWindow; -import org.jackhuang.hellominecraft.utils.tasks.download.FileDownloadTask; -import org.jackhuang.hellominecraft.utils.ArrayUtils; -import org.jackhuang.hellominecraft.utils.MessageBox; -import org.jackhuang.hellominecraft.utils.UpdateChecker; -import org.jackhuang.hellominecraft.utils.Utils; -import org.jackhuang.hellominecraft.utils.VersionNumber; -import org.jackhuang.hellominecraft.utils.functions.Consumer; -import org.jackhuang.hellominecraft.utils.system.FileUtils; -import org.jackhuang.hellominecraft.utils.system.IOUtils; -import org.jackhuang.hellominecraft.utils.system.OS; +import org.jackhuang.hellominecraft.util.tasks.Task; +import org.jackhuang.hellominecraft.util.tasks.TaskWindow; +import org.jackhuang.hellominecraft.util.tasks.download.FileDownloadTask; +import org.jackhuang.hellominecraft.util.ArrayUtils; +import org.jackhuang.hellominecraft.util.MessageBox; +import org.jackhuang.hellominecraft.util.UpdateChecker; +import org.jackhuang.hellominecraft.util.Utils; +import org.jackhuang.hellominecraft.util.VersionNumber; +import org.jackhuang.hellominecraft.util.func.Consumer; +import org.jackhuang.hellominecraft.util.system.FileUtils; +import org.jackhuang.hellominecraft.util.system.IOUtils; +import org.jackhuang.hellominecraft.util.system.OS; /** * diff --git a/HMCL/src/main/java/org/jackhuang/hellominecraft/launcher/utils/upgrade/IUpgrader.java b/HMCL/src/main/java/org/jackhuang/hellominecraft/launcher/util/upgrade/IUpgrader.java similarity index 85% rename from HMCL/src/main/java/org/jackhuang/hellominecraft/launcher/utils/upgrade/IUpgrader.java rename to HMCL/src/main/java/org/jackhuang/hellominecraft/launcher/util/upgrade/IUpgrader.java index e722e261e..53faa90f5 100755 --- a/HMCL/src/main/java/org/jackhuang/hellominecraft/launcher/utils/upgrade/IUpgrader.java +++ b/HMCL/src/main/java/org/jackhuang/hellominecraft/launcher/util/upgrade/IUpgrader.java @@ -15,12 +15,12 @@ * 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.utils.upgrade; +package org.jackhuang.hellominecraft.launcher.util.upgrade; -import org.jackhuang.hellominecraft.utils.Event; -import org.jackhuang.hellominecraft.utils.Event; -import org.jackhuang.hellominecraft.utils.VersionNumber; -import org.jackhuang.hellominecraft.utils.VersionNumber; +import org.jackhuang.hellominecraft.util.Event; +import org.jackhuang.hellominecraft.util.Event; +import org.jackhuang.hellominecraft.util.VersionNumber; +import org.jackhuang.hellominecraft.util.VersionNumber; /** * diff --git a/HMCL/src/main/java/org/jackhuang/hellominecraft/launcher/utils/upgrade/NewFileUpgrader.java b/HMCL/src/main/java/org/jackhuang/hellominecraft/launcher/util/upgrade/NewFileUpgrader.java similarity index 80% rename from HMCL/src/main/java/org/jackhuang/hellominecraft/launcher/utils/upgrade/NewFileUpgrader.java rename to HMCL/src/main/java/org/jackhuang/hellominecraft/launcher/util/upgrade/NewFileUpgrader.java index 63b8b84ff..ed6bdcfb3 100755 --- a/HMCL/src/main/java/org/jackhuang/hellominecraft/launcher/utils/upgrade/NewFileUpgrader.java +++ b/HMCL/src/main/java/org/jackhuang/hellominecraft/launcher/util/upgrade/NewFileUpgrader.java @@ -15,19 +15,19 @@ * 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.utils.upgrade; +package org.jackhuang.hellominecraft.launcher.util.upgrade; import java.io.File; import java.io.IOException; import java.util.logging.Level; import java.util.logging.Logger; -import org.jackhuang.hellominecraft.utils.logging.HMCLog; -import org.jackhuang.hellominecraft.utils.tasks.TaskWindow; -import org.jackhuang.hellominecraft.utils.tasks.download.FileDownloadTask; -import org.jackhuang.hellominecraft.utils.ArrayUtils; -import org.jackhuang.hellominecraft.utils.VersionNumber; -import org.jackhuang.hellominecraft.utils.system.FileUtils; -import org.jackhuang.hellominecraft.utils.system.IOUtils; +import org.jackhuang.hellominecraft.util.logging.HMCLog; +import org.jackhuang.hellominecraft.util.tasks.TaskWindow; +import org.jackhuang.hellominecraft.util.tasks.download.FileDownloadTask; +import org.jackhuang.hellominecraft.util.ArrayUtils; +import org.jackhuang.hellominecraft.util.VersionNumber; +import org.jackhuang.hellominecraft.util.system.FileUtils; +import org.jackhuang.hellominecraft.util.system.IOUtils; /** * diff --git a/HMCL/src/main/java/org/jackhuang/hellominecraft/launcher/views/ServerListCellRenderer.form b/HMCL/src/main/java/org/jackhuang/hellominecraft/launcher/views/ServerListCellRenderer.form deleted file mode 100755 index b3ff854b1..000000000 --- a/HMCL/src/main/java/org/jackhuang/hellominecraft/launcher/views/ServerListCellRenderer.form +++ /dev/null @@ -1,70 +0,0 @@ - - -
- - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
diff --git a/HMCL/src/main/java/org/jackhuang/hellominecraft/launcher/views/ServerListCellRenderer.java b/HMCL/src/main/java/org/jackhuang/hellominecraft/launcher/views/ServerListCellRenderer.java deleted file mode 100755 index 0f63af9ac..000000000 --- a/HMCL/src/main/java/org/jackhuang/hellominecraft/launcher/views/ServerListCellRenderer.java +++ /dev/null @@ -1,127 +0,0 @@ -/* - * Hello Minecraft! Launcher. - * Copyright (C) 2013 huangyuhui - * - * This program is free software: you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation, either version 3 of the License, or - * (at your option) any later version. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. - * - * 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.views; - -import java.awt.Component; -import javax.swing.JLabel; -import javax.swing.JList; -import javax.swing.ListCellRenderer; -import org.jackhuang.hellominecraft.utils.C; -import org.jackhuang.hellominecraft.launcher.core.version.ServerInfo; - -/** - * - * @author huangyuhui - */ -public class ServerListCellRenderer extends javax.swing.JPanel implements ListCellRenderer { - - /** - * Creates new form ServerListCellRenderer - */ - public ServerListCellRenderer() { - initComponents(); - this.add(lblIcon, -1); - } - - /** - * This method is called from within the constructor to initialize the form. - * WARNING: Do NOT modify this code. The content of this method is always - * regenerated by the Form Editor. - */ - @SuppressWarnings("unchecked") - // //GEN-BEGIN:initComponents - private void initComponents() { - - lblName = new javax.swing.JLabel(); - lblInfo = new javax.swing.JLabel(); - lblVersion = new javax.swing.JLabel(); - lblType = new javax.swing.JLabel(); - - lblName.setText("Name"); - - lblInfo.setText("Info"); - lblInfo.setVerticalAlignment(javax.swing.SwingConstants.TOP); - - lblVersion.setText("Version"); - - lblType.setText("Type"); - - javax.swing.GroupLayout layout = new javax.swing.GroupLayout(this); - this.setLayout(layout); - layout.setHorizontalGroup( - layout.createParallelGroup(javax.swing.GroupLayout.Alignment.LEADING) - .addGroup(layout.createSequentialGroup() - .addContainerGap() - .addGroup(layout.createParallelGroup(javax.swing.GroupLayout.Alignment.LEADING) - .addComponent(lblName, javax.swing.GroupLayout.DEFAULT_SIZE, javax.swing.GroupLayout.DEFAULT_SIZE, Short.MAX_VALUE) - .addComponent(lblInfo, javax.swing.GroupLayout.DEFAULT_SIZE, 359, Short.MAX_VALUE) - .addComponent(lblVersion, javax.swing.GroupLayout.Alignment.TRAILING, javax.swing.GroupLayout.DEFAULT_SIZE, 359, Short.MAX_VALUE) - .addComponent(lblType, javax.swing.GroupLayout.Alignment.TRAILING, javax.swing.GroupLayout.DEFAULT_SIZE, 359, Short.MAX_VALUE)) - .addContainerGap()) - ); - layout.setVerticalGroup( - layout.createParallelGroup(javax.swing.GroupLayout.Alignment.LEADING) - .addGroup(layout.createSequentialGroup() - .addContainerGap() - .addComponent(lblName) - .addPreferredGap(javax.swing.LayoutStyle.ComponentPlacement.RELATED) - .addComponent(lblVersion) - .addPreferredGap(javax.swing.LayoutStyle.ComponentPlacement.RELATED) - .addComponent(lblType) - .addPreferredGap(javax.swing.LayoutStyle.ComponentPlacement.RELATED) - .addComponent(lblInfo, javax.swing.GroupLayout.DEFAULT_SIZE, 83, Short.MAX_VALUE) - .addContainerGap()) - ); - }// //GEN-END:initComponents - - JLabel lblIcon = new JLabel(); - - @Override - public Component getListCellRendererComponent(JList list, ServerInfo value, int index, boolean isSelected, boolean cellHasFocus) { - lblName.setText(C.i18n("serverlistview.name") + ": " + value.name); - lblType.setText(C.i18n("serverlistview.type") + ": " + value.type); - lblVersion.setText(C.i18n("serverlistview.version") + ": " + value.version); - lblInfo.setText("" + C.i18n("serverlistview.info") + ": " + value.info + ""); - if (value.icon != null) - lblIcon.setIcon(value.icon); - lblIcon.setBounds(0, 0, list.getWidth(), (int) (((double) list.getWidth()) / value.icon.getIconWidth() * value.icon.getIconHeight())); - if (isSelected) { - setBackground(list.getSelectionBackground()); - setForeground(list.getSelectionForeground()); - lblName.setForeground(list.getSelectionForeground()); - lblType.setForeground(list.getSelectionForeground()); - lblVersion.setForeground(list.getSelectionForeground()); - lblInfo.setForeground(list.getSelectionForeground()); - } else { - setBackground(list.getBackground()); - setForeground(list.getForeground()); - lblName.setForeground(list.getForeground()); - lblType.setForeground(list.getForeground()); - lblVersion.setForeground(list.getForeground()); - lblInfo.setForeground(list.getForeground()); - } - setFont(list.getFont()); - return this; - } - // Variables declaration - do not modify//GEN-BEGIN:variables - private javax.swing.JLabel lblInfo; - private javax.swing.JLabel lblName; - private javax.swing.JLabel lblType; - private javax.swing.JLabel lblVersion; - // End of variables declaration//GEN-END:variables -} diff --git a/HMCL/src/main/java/org/jackhuang/hellominecraft/launcher/views/ServerListView.form b/HMCL/src/main/java/org/jackhuang/hellominecraft/launcher/views/ServerListView.form deleted file mode 100755 index 06bd3c6d0..000000000 --- a/HMCL/src/main/java/org/jackhuang/hellominecraft/launcher/views/ServerListView.form +++ /dev/null @@ -1,81 +0,0 @@ - - -
- - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
diff --git a/HMCL/src/main/java/org/jackhuang/hellominecraft/launcher/views/ServerListView.java b/HMCL/src/main/java/org/jackhuang/hellominecraft/launcher/views/ServerListView.java deleted file mode 100755 index 1d70ecc93..000000000 --- a/HMCL/src/main/java/org/jackhuang/hellominecraft/launcher/views/ServerListView.java +++ /dev/null @@ -1,132 +0,0 @@ -/* - * Hello Minecraft! Launcher. - * Copyright (C) 2013 huangyuhui - * - * This program is free software: you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation, either version 3 of the License, or - * (at your option) any later version. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. - * - * 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.views; - -import java.awt.Color; -import javax.swing.DefaultListModel; -import javax.swing.JList; -import org.jackhuang.hellominecraft.utils.C; -import org.jackhuang.hellominecraft.launcher.core.version.ServerInfo; - -/** - * - * @author huangyuhui - */ -public class ServerListView extends javax.swing.JDialog { - - JList lstServer; - - public ServerListView(ServerInfo[] servers) { - setModal(true); - initComponents(); - setSize(800, 480); - setLocationRelativeTo(null); - lstServer = new JList<>(); - lstServer.setSelectionForeground(Color.ORANGE); - lstServer.setModel(new DefaultListModel<>()); - lstServer.setSelectionMode(javax.swing.ListSelectionModel.SINGLE_SELECTION); - srlList.setViewportView(lstServer); - - lstServer.setCellRenderer(new ServerListCellRenderer()); - DefaultListModel model = (DefaultListModel) lstServer.getModel(); - for (ServerInfo i : servers) - model.addElement(i); - } - - public int getChoice() { - setVisible(true); - return sel; - } - - public int sel = -1; - public static final int FAILED_TO_SELECT = -1; - - /** - * This method is called from within the constructor to initialize the form. - * WARNING: Do NOT modify this code. The content of this method is always - * regenerated by the Form Editor. - */ - @SuppressWarnings("unchecked") - // //GEN-BEGIN:initComponents - private void initComponents() { - - srlList = new javax.swing.JScrollPane(); - btnOK = new javax.swing.JButton(); - btnCancel = new javax.swing.JButton(); - - setDefaultCloseOperation(javax.swing.WindowConstants.DISPOSE_ON_CLOSE); - setTitle(C.i18n("serverlistview.title")); // NOI18N - - btnOK.setText(C.i18n("ui.button.ok")); // NOI18N - btnOK.setToolTipText(""); - btnOK.addActionListener(new java.awt.event.ActionListener() { - public void actionPerformed(java.awt.event.ActionEvent evt) { - btnOKActionPerformed(evt); - } - }); - - btnCancel.setText(C.i18n("button.cancel")); // NOI18N - btnCancel.setToolTipText(""); - btnCancel.addActionListener(new java.awt.event.ActionListener() { - public void actionPerformed(java.awt.event.ActionEvent evt) { - btnCancelActionPerformed(evt); - } - }); - - javax.swing.GroupLayout layout = new javax.swing.GroupLayout(getContentPane()); - getContentPane().setLayout(layout); - layout.setHorizontalGroup( - layout.createParallelGroup(javax.swing.GroupLayout.Alignment.LEADING) - .addComponent(srlList) - .addGroup(javax.swing.GroupLayout.Alignment.TRAILING, layout.createSequentialGroup() - .addContainerGap(298, Short.MAX_VALUE) - .addComponent(btnOK) - .addPreferredGap(javax.swing.LayoutStyle.ComponentPlacement.RELATED) - .addComponent(btnCancel) - .addContainerGap()) - ); - layout.setVerticalGroup( - layout.createParallelGroup(javax.swing.GroupLayout.Alignment.LEADING) - .addGroup(layout.createSequentialGroup() - .addComponent(srlList, javax.swing.GroupLayout.DEFAULT_SIZE, 257, Short.MAX_VALUE) - .addPreferredGap(javax.swing.LayoutStyle.ComponentPlacement.RELATED) - .addGroup(layout.createParallelGroup(javax.swing.GroupLayout.Alignment.BASELINE) - .addComponent(btnOK) - .addComponent(btnCancel)) - .addContainerGap()) - ); - - pack(); - }// //GEN-END:initComponents - - private void btnOKActionPerformed(java.awt.event.ActionEvent evt) {//GEN-FIRST:event_btnOKActionPerformed - sel = lstServer.getSelectedIndex(); - this.dispose(); - }//GEN-LAST:event_btnOKActionPerformed - - private void btnCancelActionPerformed(java.awt.event.ActionEvent evt) {//GEN-FIRST:event_btnCancelActionPerformed - sel = FAILED_TO_SELECT; - this.dispose(); - }//GEN-LAST:event_btnCancelActionPerformed - - // Variables declaration - do not modify//GEN-BEGIN:variables - private javax.swing.JButton btnCancel; - private javax.swing.JButton btnOK; - private javax.swing.JScrollPane srlList; - // End of variables declaration//GEN-END:variables -} diff --git a/HMCLAPI/src/main/java/org/jackhuang/hellominecraft/utils/ArrayUtils.java b/HMCLAPI/src/main/java/org/jackhuang/hellominecraft/util/ArrayUtils.java similarity index 98% rename from HMCLAPI/src/main/java/org/jackhuang/hellominecraft/utils/ArrayUtils.java rename to HMCLAPI/src/main/java/org/jackhuang/hellominecraft/util/ArrayUtils.java index 00bcf0800..39fa89fee 100755 --- a/HMCLAPI/src/main/java/org/jackhuang/hellominecraft/utils/ArrayUtils.java +++ b/HMCLAPI/src/main/java/org/jackhuang/hellominecraft/util/ArrayUtils.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.utils; +package org.jackhuang.hellominecraft.util; import java.util.ArrayList; import java.util.Arrays; diff --git a/HMCLAPI/src/main/java/org/jackhuang/hellominecraft/utils/C.java b/HMCLAPI/src/main/java/org/jackhuang/hellominecraft/util/C.java similarity index 96% rename from HMCLAPI/src/main/java/org/jackhuang/hellominecraft/utils/C.java rename to HMCLAPI/src/main/java/org/jackhuang/hellominecraft/util/C.java index 2b6eace29..c4222a270 100755 --- a/HMCLAPI/src/main/java/org/jackhuang/hellominecraft/utils/C.java +++ b/HMCLAPI/src/main/java/org/jackhuang/hellominecraft/util/C.java @@ -15,9 +15,9 @@ * 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.utils; +package org.jackhuang.hellominecraft.util; -import org.jackhuang.hellominecraft.utils.logging.HMCLog; +import org.jackhuang.hellominecraft.util.logging.HMCLog; import com.google.gson.Gson; import com.google.gson.GsonBuilder; import java.util.ResourceBundle; diff --git a/HMCLAPI/src/main/java/org/jackhuang/hellominecraft/utils/CollectionUtils.java b/HMCLAPI/src/main/java/org/jackhuang/hellominecraft/util/CollectionUtils.java similarity index 93% rename from HMCLAPI/src/main/java/org/jackhuang/hellominecraft/utils/CollectionUtils.java rename to HMCLAPI/src/main/java/org/jackhuang/hellominecraft/util/CollectionUtils.java index 6a9440cbe..601d8d9f0 100755 --- a/HMCLAPI/src/main/java/org/jackhuang/hellominecraft/utils/CollectionUtils.java +++ b/HMCLAPI/src/main/java/org/jackhuang/hellominecraft/util/CollectionUtils.java @@ -15,9 +15,9 @@ * 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.utils; +package org.jackhuang.hellominecraft.util; -import org.jackhuang.hellominecraft.utils.functions.Predicate; +import org.jackhuang.hellominecraft.util.func.Predicate; import java.util.ArrayList; import java.util.Collection; import java.util.Iterator; diff --git a/HMCLAPI/src/main/java/org/jackhuang/hellominecraft/utils/DoubleOutputStream.java b/HMCLAPI/src/main/java/org/jackhuang/hellominecraft/util/DoubleOutputStream.java similarity index 98% rename from HMCLAPI/src/main/java/org/jackhuang/hellominecraft/utils/DoubleOutputStream.java rename to HMCLAPI/src/main/java/org/jackhuang/hellominecraft/util/DoubleOutputStream.java index 07e728e5f..c5371e233 100755 --- a/HMCLAPI/src/main/java/org/jackhuang/hellominecraft/utils/DoubleOutputStream.java +++ b/HMCLAPI/src/main/java/org/jackhuang/hellominecraft/util/DoubleOutputStream.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.utils; +package org.jackhuang.hellominecraft.util; import java.io.IOException; import java.io.OutputStream; diff --git a/HMCLAPI/src/main/java/org/jackhuang/hellominecraft/utils/Event.java b/HMCLAPI/src/main/java/org/jackhuang/hellominecraft/util/Event.java similarity index 95% rename from HMCLAPI/src/main/java/org/jackhuang/hellominecraft/utils/Event.java rename to HMCLAPI/src/main/java/org/jackhuang/hellominecraft/util/Event.java index e66decd4c..a91d22518 100755 --- a/HMCLAPI/src/main/java/org/jackhuang/hellominecraft/utils/Event.java +++ b/HMCLAPI/src/main/java/org/jackhuang/hellominecraft/util/Event.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.utils; +package org.jackhuang.hellominecraft.util; /** * diff --git a/HMCLAPI/src/main/java/org/jackhuang/hellominecraft/utils/EventHandler.java b/HMCLAPI/src/main/java/org/jackhuang/hellominecraft/util/EventHandler.java similarity index 96% rename from HMCLAPI/src/main/java/org/jackhuang/hellominecraft/utils/EventHandler.java rename to HMCLAPI/src/main/java/org/jackhuang/hellominecraft/util/EventHandler.java index 8294d77ee..86e36df33 100755 --- a/HMCLAPI/src/main/java/org/jackhuang/hellominecraft/utils/EventHandler.java +++ b/HMCLAPI/src/main/java/org/jackhuang/hellominecraft/util/EventHandler.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.utils; +package org.jackhuang.hellominecraft.util; import java.util.HashSet; diff --git a/HMCLAPI/src/main/java/org/jackhuang/hellominecraft/utils/IUpdateChecker.java b/HMCLAPI/src/main/java/org/jackhuang/hellominecraft/util/IUpdateChecker.java similarity index 97% rename from HMCLAPI/src/main/java/org/jackhuang/hellominecraft/utils/IUpdateChecker.java rename to HMCLAPI/src/main/java/org/jackhuang/hellominecraft/util/IUpdateChecker.java index 110b7c653..00d444bed 100755 --- a/HMCLAPI/src/main/java/org/jackhuang/hellominecraft/utils/IUpdateChecker.java +++ b/HMCLAPI/src/main/java/org/jackhuang/hellominecraft/util/IUpdateChecker.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.utils; +package org.jackhuang.hellominecraft.util; import java.util.Map; diff --git a/HMCLAPI/src/main/java/org/jackhuang/hellominecraft/utils/LauncherPrintStream.java b/HMCLAPI/src/main/java/org/jackhuang/hellominecraft/util/LauncherPrintStream.java similarity index 93% rename from HMCLAPI/src/main/java/org/jackhuang/hellominecraft/utils/LauncherPrintStream.java rename to HMCLAPI/src/main/java/org/jackhuang/hellominecraft/util/LauncherPrintStream.java index 87e77a8b6..7f3e09492 100755 --- a/HMCLAPI/src/main/java/org/jackhuang/hellominecraft/utils/LauncherPrintStream.java +++ b/HMCLAPI/src/main/java/org/jackhuang/hellominecraft/util/LauncherPrintStream.java @@ -15,9 +15,9 @@ * 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.utils; +package org.jackhuang.hellominecraft.util; -import org.jackhuang.hellominecraft.utils.functions.Consumer; +import org.jackhuang.hellominecraft.util.func.Consumer; import java.io.OutputStream; import java.io.PrintStream; import java.util.ArrayList; diff --git a/HMCLAPI/src/main/java/org/jackhuang/hellominecraft/utils/MathUtils.java b/HMCLAPI/src/main/java/org/jackhuang/hellominecraft/util/MathUtils.java similarity index 97% rename from HMCLAPI/src/main/java/org/jackhuang/hellominecraft/utils/MathUtils.java rename to HMCLAPI/src/main/java/org/jackhuang/hellominecraft/util/MathUtils.java index 0323075a7..16ec46fec 100755 --- a/HMCLAPI/src/main/java/org/jackhuang/hellominecraft/utils/MathUtils.java +++ b/HMCLAPI/src/main/java/org/jackhuang/hellominecraft/util/MathUtils.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.utils; +package org.jackhuang.hellominecraft.util; /** * diff --git a/HMCLAPI/src/main/java/org/jackhuang/hellominecraft/utils/MessageBox.java b/HMCLAPI/src/main/java/org/jackhuang/hellominecraft/util/MessageBox.java similarity index 97% rename from HMCLAPI/src/main/java/org/jackhuang/hellominecraft/utils/MessageBox.java rename to HMCLAPI/src/main/java/org/jackhuang/hellominecraft/util/MessageBox.java index 1954fa76b..5cd670ed6 100755 --- a/HMCLAPI/src/main/java/org/jackhuang/hellominecraft/utils/MessageBox.java +++ b/HMCLAPI/src/main/java/org/jackhuang/hellominecraft/util/MessageBox.java @@ -15,9 +15,9 @@ * 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.utils; +package org.jackhuang.hellominecraft.util; -import org.jackhuang.hellominecraft.utils.views.SwingUtils; +import org.jackhuang.hellominecraft.util.ui.SwingUtils; import javax.swing.JOptionPane; /** diff --git a/HMCLAPI/src/main/java/org/jackhuang/hellominecraft/utils/NetUtils.java b/HMCLAPI/src/main/java/org/jackhuang/hellominecraft/util/NetUtils.java similarity index 97% rename from HMCLAPI/src/main/java/org/jackhuang/hellominecraft/utils/NetUtils.java rename to HMCLAPI/src/main/java/org/jackhuang/hellominecraft/util/NetUtils.java index f0c562408..812fc1743 100755 --- a/HMCLAPI/src/main/java/org/jackhuang/hellominecraft/utils/NetUtils.java +++ b/HMCLAPI/src/main/java/org/jackhuang/hellominecraft/util/NetUtils.java @@ -15,9 +15,9 @@ * 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.utils; +package org.jackhuang.hellominecraft.util; -import org.jackhuang.hellominecraft.utils.logging.HMCLog; +import org.jackhuang.hellominecraft.util.logging.HMCLog; import java.io.ByteArrayOutputStream; import java.io.IOException; import java.io.InputStream; @@ -28,7 +28,7 @@ import java.net.MalformedURLException; import java.net.Proxy; import java.net.URL; import java.util.Map; -import org.jackhuang.hellominecraft.utils.system.IOUtils; +import org.jackhuang.hellominecraft.util.system.IOUtils; /** * diff --git a/HMCLAPI/src/main/java/org/jackhuang/hellominecraft/utils/OverridableSwingWorker.java b/HMCLAPI/src/main/java/org/jackhuang/hellominecraft/util/OverridableSwingWorker.java similarity index 94% rename from HMCLAPI/src/main/java/org/jackhuang/hellominecraft/utils/OverridableSwingWorker.java rename to HMCLAPI/src/main/java/org/jackhuang/hellominecraft/util/OverridableSwingWorker.java index c33a6e358..3af98002d 100644 --- a/HMCLAPI/src/main/java/org/jackhuang/hellominecraft/utils/OverridableSwingWorker.java +++ b/HMCLAPI/src/main/java/org/jackhuang/hellominecraft/util/OverridableSwingWorker.java @@ -15,12 +15,12 @@ * 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.utils; +package org.jackhuang.hellominecraft.util; import java.util.ArrayList; import java.util.List; import javax.swing.SwingWorker; -import org.jackhuang.hellominecraft.utils.functions.Consumer; +import org.jackhuang.hellominecraft.util.func.Consumer; /** * diff --git a/HMCLAPI/src/main/java/org/jackhuang/hellominecraft/utils/Pair.java b/HMCLAPI/src/main/java/org/jackhuang/hellominecraft/util/Pair.java similarity index 97% rename from HMCLAPI/src/main/java/org/jackhuang/hellominecraft/utils/Pair.java rename to HMCLAPI/src/main/java/org/jackhuang/hellominecraft/util/Pair.java index 74268482a..81e9ed054 100755 --- a/HMCLAPI/src/main/java/org/jackhuang/hellominecraft/utils/Pair.java +++ b/HMCLAPI/src/main/java/org/jackhuang/hellominecraft/util/Pair.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.utils; +package org.jackhuang.hellominecraft.util; import java.util.Map; import java.util.Objects; diff --git a/HMCLAPI/src/main/java/org/jackhuang/hellominecraft/utils/StrUtils.java b/HMCLAPI/src/main/java/org/jackhuang/hellominecraft/util/StrUtils.java similarity index 99% rename from HMCLAPI/src/main/java/org/jackhuang/hellominecraft/utils/StrUtils.java rename to HMCLAPI/src/main/java/org/jackhuang/hellominecraft/util/StrUtils.java index 3a2a687ac..299623890 100755 --- a/HMCLAPI/src/main/java/org/jackhuang/hellominecraft/utils/StrUtils.java +++ b/HMCLAPI/src/main/java/org/jackhuang/hellominecraft/util/StrUtils.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.utils; +package org.jackhuang.hellominecraft.util; import java.awt.Dimension; import java.io.PrintWriter; diff --git a/HMCLAPI/src/main/java/org/jackhuang/hellominecraft/utils/UpdateChecker.java b/HMCLAPI/src/main/java/org/jackhuang/hellominecraft/util/UpdateChecker.java similarity index 96% rename from HMCLAPI/src/main/java/org/jackhuang/hellominecraft/utils/UpdateChecker.java rename to HMCLAPI/src/main/java/org/jackhuang/hellominecraft/util/UpdateChecker.java index 0f37183ce..e7a57b4dd 100755 --- a/HMCLAPI/src/main/java/org/jackhuang/hellominecraft/utils/UpdateChecker.java +++ b/HMCLAPI/src/main/java/org/jackhuang/hellominecraft/util/UpdateChecker.java @@ -15,9 +15,9 @@ * 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.utils; +package org.jackhuang.hellominecraft.util; -import org.jackhuang.hellominecraft.utils.logging.HMCLog; +import org.jackhuang.hellominecraft.util.logging.HMCLog; import java.util.Map; /** diff --git a/HMCLAPI/src/main/java/org/jackhuang/hellominecraft/utils/Utils.java b/HMCLAPI/src/main/java/org/jackhuang/hellominecraft/util/Utils.java similarity index 98% rename from HMCLAPI/src/main/java/org/jackhuang/hellominecraft/utils/Utils.java rename to HMCLAPI/src/main/java/org/jackhuang/hellominecraft/util/Utils.java index aae27b9b4..8fc7c229f 100755 --- a/HMCLAPI/src/main/java/org/jackhuang/hellominecraft/utils/Utils.java +++ b/HMCLAPI/src/main/java/org/jackhuang/hellominecraft/util/Utils.java @@ -15,9 +15,9 @@ * 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.utils; +package org.jackhuang.hellominecraft.util; -import org.jackhuang.hellominecraft.utils.logging.HMCLog; +import org.jackhuang.hellominecraft.util.logging.HMCLog; import com.sun.management.OperatingSystemMXBean; import java.awt.Image; import java.awt.Toolkit; diff --git a/HMCLAPI/src/main/java/org/jackhuang/hellominecraft/utils/VersionNumber.java b/HMCLAPI/src/main/java/org/jackhuang/hellominecraft/util/VersionNumber.java similarity index 96% rename from HMCLAPI/src/main/java/org/jackhuang/hellominecraft/utils/VersionNumber.java rename to HMCLAPI/src/main/java/org/jackhuang/hellominecraft/util/VersionNumber.java index 0773299aa..2d1806a4d 100755 --- a/HMCLAPI/src/main/java/org/jackhuang/hellominecraft/utils/VersionNumber.java +++ b/HMCLAPI/src/main/java/org/jackhuang/hellominecraft/util/VersionNumber.java @@ -15,9 +15,9 @@ * 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.utils; +package org.jackhuang.hellominecraft.util; -import org.jackhuang.hellominecraft.utils.logging.HMCLog; +import org.jackhuang.hellominecraft.util.logging.HMCLog; /** * diff --git a/HMCLAPI/src/main/java/org/jackhuang/hellominecraft/utils/code/Base64.java b/HMCLAPI/src/main/java/org/jackhuang/hellominecraft/util/code/Base64.java similarity index 98% rename from HMCLAPI/src/main/java/org/jackhuang/hellominecraft/utils/code/Base64.java rename to HMCLAPI/src/main/java/org/jackhuang/hellominecraft/util/code/Base64.java index e2cbe5226..fb6ad782d 100755 --- a/HMCLAPI/src/main/java/org/jackhuang/hellominecraft/utils/code/Base64.java +++ b/HMCLAPI/src/main/java/org/jackhuang/hellominecraft/util/code/Base64.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.utils.code; +package org.jackhuang.hellominecraft.util.code; import java.io.UnsupportedEncodingException; diff --git a/HMCLAPI/src/main/java/org/jackhuang/hellominecraft/utils/code/Charsets.java b/HMCLAPI/src/main/java/org/jackhuang/hellominecraft/util/code/Charsets.java similarity index 96% rename from HMCLAPI/src/main/java/org/jackhuang/hellominecraft/utils/code/Charsets.java rename to HMCLAPI/src/main/java/org/jackhuang/hellominecraft/util/code/Charsets.java index 0694f1583..1ea005adf 100755 --- a/HMCLAPI/src/main/java/org/jackhuang/hellominecraft/utils/code/Charsets.java +++ b/HMCLAPI/src/main/java/org/jackhuang/hellominecraft/util/code/Charsets.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.utils.code; +package org.jackhuang.hellominecraft.util.code; import java.nio.charset.Charset; diff --git a/HMCLAPI/src/main/java/org/jackhuang/hellominecraft/utils/code/DigestUtils.java b/HMCLAPI/src/main/java/org/jackhuang/hellominecraft/util/code/DigestUtils.java similarity index 99% rename from HMCLAPI/src/main/java/org/jackhuang/hellominecraft/utils/code/DigestUtils.java rename to HMCLAPI/src/main/java/org/jackhuang/hellominecraft/util/code/DigestUtils.java index 38231ef75..e086b451e 100755 --- a/HMCLAPI/src/main/java/org/jackhuang/hellominecraft/utils/code/DigestUtils.java +++ b/HMCLAPI/src/main/java/org/jackhuang/hellominecraft/util/code/DigestUtils.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.utils.code; +package org.jackhuang.hellominecraft.util.code; import java.io.IOException; import java.io.InputStream; diff --git a/HMCLAPI/src/main/java/org/jackhuang/hellominecraft/utils/code/Hex.java b/HMCLAPI/src/main/java/org/jackhuang/hellominecraft/util/code/Hex.java similarity index 98% rename from HMCLAPI/src/main/java/org/jackhuang/hellominecraft/utils/code/Hex.java rename to HMCLAPI/src/main/java/org/jackhuang/hellominecraft/util/code/Hex.java index 0b544982c..f71af9d3e 100755 --- a/HMCLAPI/src/main/java/org/jackhuang/hellominecraft/utils/code/Hex.java +++ b/HMCLAPI/src/main/java/org/jackhuang/hellominecraft/util/code/Hex.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.utils.code; +package org.jackhuang.hellominecraft.util.code; import java.nio.charset.Charset; diff --git a/HMCLAPI/src/main/java/org/jackhuang/hellominecraft/utils/functions/BiConsumer.java b/HMCLAPI/src/main/java/org/jackhuang/hellominecraft/util/func/BiConsumer.java similarity index 94% rename from HMCLAPI/src/main/java/org/jackhuang/hellominecraft/utils/functions/BiConsumer.java rename to HMCLAPI/src/main/java/org/jackhuang/hellominecraft/util/func/BiConsumer.java index 4f0ba4b1a..c2341520f 100755 --- a/HMCLAPI/src/main/java/org/jackhuang/hellominecraft/utils/functions/BiConsumer.java +++ b/HMCLAPI/src/main/java/org/jackhuang/hellominecraft/util/func/BiConsumer.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.utils.functions; +package org.jackhuang.hellominecraft.util.func; /** * @author huangyuhui diff --git a/HMCLAPI/src/main/java/org/jackhuang/hellominecraft/utils/functions/BiFunction.java b/HMCLAPI/src/main/java/org/jackhuang/hellominecraft/util/func/BiFunction.java similarity index 94% rename from HMCLAPI/src/main/java/org/jackhuang/hellominecraft/utils/functions/BiFunction.java rename to HMCLAPI/src/main/java/org/jackhuang/hellominecraft/util/func/BiFunction.java index 52be871be..12f83eb68 100755 --- a/HMCLAPI/src/main/java/org/jackhuang/hellominecraft/utils/functions/BiFunction.java +++ b/HMCLAPI/src/main/java/org/jackhuang/hellominecraft/util/func/BiFunction.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.utils.functions; +package org.jackhuang.hellominecraft.util.func; /** * diff --git a/HMCLAPI/src/main/java/org/jackhuang/hellominecraft/utils/functions/Consumer.java b/HMCLAPI/src/main/java/org/jackhuang/hellominecraft/util/func/Consumer.java similarity index 93% rename from HMCLAPI/src/main/java/org/jackhuang/hellominecraft/utils/functions/Consumer.java rename to HMCLAPI/src/main/java/org/jackhuang/hellominecraft/util/func/Consumer.java index b11705dd9..e9c07d6df 100755 --- a/HMCLAPI/src/main/java/org/jackhuang/hellominecraft/utils/functions/Consumer.java +++ b/HMCLAPI/src/main/java/org/jackhuang/hellominecraft/util/func/Consumer.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.utils.functions; +package org.jackhuang.hellominecraft.util.func; /** * diff --git a/HMCLAPI/src/main/java/org/jackhuang/hellominecraft/utils/functions/Function.java b/HMCLAPI/src/main/java/org/jackhuang/hellominecraft/util/func/Function.java similarity index 93% rename from HMCLAPI/src/main/java/org/jackhuang/hellominecraft/utils/functions/Function.java rename to HMCLAPI/src/main/java/org/jackhuang/hellominecraft/util/func/Function.java index 5de19613d..e714b5e45 100755 --- a/HMCLAPI/src/main/java/org/jackhuang/hellominecraft/utils/functions/Function.java +++ b/HMCLAPI/src/main/java/org/jackhuang/hellominecraft/util/func/Function.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.utils.functions; +package org.jackhuang.hellominecraft.util.func; /** * diff --git a/HMCLAPI/src/main/java/org/jackhuang/hellominecraft/utils/functions/NonFunction.java b/HMCLAPI/src/main/java/org/jackhuang/hellominecraft/util/func/NonFunction.java similarity index 93% rename from HMCLAPI/src/main/java/org/jackhuang/hellominecraft/utils/functions/NonFunction.java rename to HMCLAPI/src/main/java/org/jackhuang/hellominecraft/util/func/NonFunction.java index d36f0fb66..7f1706388 100755 --- a/HMCLAPI/src/main/java/org/jackhuang/hellominecraft/utils/functions/NonFunction.java +++ b/HMCLAPI/src/main/java/org/jackhuang/hellominecraft/util/func/NonFunction.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.utils.functions; +package org.jackhuang.hellominecraft.util.func; /** * diff --git a/HMCLAPI/src/main/java/org/jackhuang/hellominecraft/utils/functions/Predicate.java b/HMCLAPI/src/main/java/org/jackhuang/hellominecraft/util/func/Predicate.java similarity index 93% rename from HMCLAPI/src/main/java/org/jackhuang/hellominecraft/utils/functions/Predicate.java rename to HMCLAPI/src/main/java/org/jackhuang/hellominecraft/util/func/Predicate.java index 5171f9ac0..a4d9d418f 100755 --- a/HMCLAPI/src/main/java/org/jackhuang/hellominecraft/utils/functions/Predicate.java +++ b/HMCLAPI/src/main/java/org/jackhuang/hellominecraft/util/func/Predicate.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.utils.functions; +package org.jackhuang.hellominecraft.util.func; /** * diff --git a/HMCLAPI/src/main/java/org/jackhuang/hellominecraft/utils/functions/TriConsumer.java b/HMCLAPI/src/main/java/org/jackhuang/hellominecraft/util/func/TriConsumer.java similarity index 94% rename from HMCLAPI/src/main/java/org/jackhuang/hellominecraft/utils/functions/TriConsumer.java rename to HMCLAPI/src/main/java/org/jackhuang/hellominecraft/util/func/TriConsumer.java index 00c4fa2e5..1ac254fbc 100755 --- a/HMCLAPI/src/main/java/org/jackhuang/hellominecraft/utils/functions/TriConsumer.java +++ b/HMCLAPI/src/main/java/org/jackhuang/hellominecraft/util/func/TriConsumer.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.utils.functions; +package org.jackhuang.hellominecraft.util.func; /** * diff --git a/HMCLAPI/src/main/java/org/jackhuang/hellominecraft/utils/logging/AppenderControl.java b/HMCLAPI/src/main/java/org/jackhuang/hellominecraft/util/logging/AppenderControl.java similarity index 95% rename from HMCLAPI/src/main/java/org/jackhuang/hellominecraft/utils/logging/AppenderControl.java rename to HMCLAPI/src/main/java/org/jackhuang/hellominecraft/util/logging/AppenderControl.java index b194888c3..66d1cf4ae 100755 --- a/HMCLAPI/src/main/java/org/jackhuang/hellominecraft/utils/logging/AppenderControl.java +++ b/HMCLAPI/src/main/java/org/jackhuang/hellominecraft/util/logging/AppenderControl.java @@ -15,9 +15,9 @@ * 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.utils.logging; +package org.jackhuang.hellominecraft.util.logging; -import org.jackhuang.hellominecraft.utils.logging.appender.IAppender; +import org.jackhuang.hellominecraft.util.logging.appender.IAppender; public class AppenderControl { diff --git a/HMCLAPI/src/main/java/org/jackhuang/hellominecraft/utils/logging/Configuration.java b/HMCLAPI/src/main/java/org/jackhuang/hellominecraft/util/logging/Configuration.java similarity index 80% rename from HMCLAPI/src/main/java/org/jackhuang/hellominecraft/utils/logging/Configuration.java rename to HMCLAPI/src/main/java/org/jackhuang/hellominecraft/util/logging/Configuration.java index 8137cef3d..c9345b969 100755 --- a/HMCLAPI/src/main/java/org/jackhuang/hellominecraft/utils/logging/Configuration.java +++ b/HMCLAPI/src/main/java/org/jackhuang/hellominecraft/util/logging/Configuration.java @@ -15,12 +15,12 @@ * 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.utils.logging; +package org.jackhuang.hellominecraft.util.logging; import java.util.ArrayList; -import org.jackhuang.hellominecraft.utils.logging.appender.ConsoleAppender; -import org.jackhuang.hellominecraft.utils.logging.appender.IAppender; -import org.jackhuang.hellominecraft.utils.logging.layout.DefaultLayout; +import org.jackhuang.hellominecraft.util.logging.appender.ConsoleAppender; +import org.jackhuang.hellominecraft.util.logging.appender.IAppender; +import org.jackhuang.hellominecraft.util.logging.layout.DefaultLayout; /** * diff --git a/HMCLAPI/src/main/java/org/jackhuang/hellominecraft/utils/logging/HMCLog.java b/HMCLAPI/src/main/java/org/jackhuang/hellominecraft/util/logging/HMCLog.java similarity index 92% rename from HMCLAPI/src/main/java/org/jackhuang/hellominecraft/utils/logging/HMCLog.java rename to HMCLAPI/src/main/java/org/jackhuang/hellominecraft/util/logging/HMCLog.java index cb56f8f58..53a160a09 100755 --- a/HMCLAPI/src/main/java/org/jackhuang/hellominecraft/utils/logging/HMCLog.java +++ b/HMCLAPI/src/main/java/org/jackhuang/hellominecraft/util/logging/HMCLog.java @@ -15,9 +15,9 @@ * 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.utils.logging; +package org.jackhuang.hellominecraft.util.logging; -import org.jackhuang.hellominecraft.utils.logging.logger.Logger; +import org.jackhuang.hellominecraft.util.logging.logger.Logger; /** * diff --git a/HMCLAPI/src/main/java/org/jackhuang/hellominecraft/utils/logging/Level.java b/HMCLAPI/src/main/java/org/jackhuang/hellominecraft/util/logging/Level.java similarity index 98% rename from HMCLAPI/src/main/java/org/jackhuang/hellominecraft/utils/logging/Level.java rename to HMCLAPI/src/main/java/org/jackhuang/hellominecraft/util/logging/Level.java index 7e6c2011c..0f0fcc52b 100755 --- a/HMCLAPI/src/main/java/org/jackhuang/hellominecraft/utils/logging/Level.java +++ b/HMCLAPI/src/main/java/org/jackhuang/hellominecraft/util/logging/Level.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.utils.logging; +package org.jackhuang.hellominecraft.util.logging; import java.awt.Color; import java.util.regex.Matcher; diff --git a/HMCLAPI/src/main/java/org/jackhuang/hellominecraft/utils/logging/LogEvent.java b/HMCLAPI/src/main/java/org/jackhuang/hellominecraft/util/logging/LogEvent.java similarity index 88% rename from HMCLAPI/src/main/java/org/jackhuang/hellominecraft/utils/logging/LogEvent.java rename to HMCLAPI/src/main/java/org/jackhuang/hellominecraft/util/logging/LogEvent.java index 7f3912075..f4ee34b79 100755 --- a/HMCLAPI/src/main/java/org/jackhuang/hellominecraft/utils/logging/LogEvent.java +++ b/HMCLAPI/src/main/java/org/jackhuang/hellominecraft/util/logging/LogEvent.java @@ -15,9 +15,9 @@ * 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.utils.logging; +package org.jackhuang.hellominecraft.util.logging; -import org.jackhuang.hellominecraft.utils.logging.message.IMessage; +import org.jackhuang.hellominecraft.util.logging.message.IMessage; /** * diff --git a/HMCLAPI/src/main/java/org/jackhuang/hellominecraft/utils/logging/LoggingException.java b/HMCLAPI/src/main/java/org/jackhuang/hellominecraft/util/logging/LoggingException.java similarity index 94% rename from HMCLAPI/src/main/java/org/jackhuang/hellominecraft/utils/logging/LoggingException.java rename to HMCLAPI/src/main/java/org/jackhuang/hellominecraft/util/logging/LoggingException.java index b8d7c88a7..4159fb7d8 100755 --- a/HMCLAPI/src/main/java/org/jackhuang/hellominecraft/utils/logging/LoggingException.java +++ b/HMCLAPI/src/main/java/org/jackhuang/hellominecraft/util/logging/LoggingException.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.utils.logging; +package org.jackhuang.hellominecraft.util.logging; /** * diff --git a/HMCLAPI/src/main/java/org/jackhuang/hellominecraft/utils/logging/appender/AbstractAppender.java b/HMCLAPI/src/main/java/org/jackhuang/hellominecraft/util/logging/appender/AbstractAppender.java similarity index 92% rename from HMCLAPI/src/main/java/org/jackhuang/hellominecraft/utils/logging/appender/AbstractAppender.java rename to HMCLAPI/src/main/java/org/jackhuang/hellominecraft/util/logging/appender/AbstractAppender.java index a5af798c8..9c344230e 100755 --- a/HMCLAPI/src/main/java/org/jackhuang/hellominecraft/utils/logging/appender/AbstractAppender.java +++ b/HMCLAPI/src/main/java/org/jackhuang/hellominecraft/util/logging/appender/AbstractAppender.java @@ -15,10 +15,10 @@ * 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.utils.logging.appender; +package org.jackhuang.hellominecraft.util.logging.appender; import java.io.Serializable; -import org.jackhuang.hellominecraft.utils.logging.layout.ILayout; +import org.jackhuang.hellominecraft.util.logging.layout.ILayout; /** * diff --git a/HMCLAPI/src/main/java/org/jackhuang/hellominecraft/utils/logging/appender/ConsoleAppender.java b/HMCLAPI/src/main/java/org/jackhuang/hellominecraft/util/logging/appender/ConsoleAppender.java similarity index 94% rename from HMCLAPI/src/main/java/org/jackhuang/hellominecraft/utils/logging/appender/ConsoleAppender.java rename to HMCLAPI/src/main/java/org/jackhuang/hellominecraft/util/logging/appender/ConsoleAppender.java index c4f86870b..7e7469ad7 100755 --- a/HMCLAPI/src/main/java/org/jackhuang/hellominecraft/utils/logging/appender/ConsoleAppender.java +++ b/HMCLAPI/src/main/java/org/jackhuang/hellominecraft/util/logging/appender/ConsoleAppender.java @@ -15,12 +15,12 @@ * 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.utils.logging.appender; +package org.jackhuang.hellominecraft.util.logging.appender; import java.io.IOException; import java.io.OutputStream; import java.io.Serializable; -import org.jackhuang.hellominecraft.utils.logging.layout.ILayout; +import org.jackhuang.hellominecraft.util.logging.layout.ILayout; /** * diff --git a/HMCLAPI/src/main/java/org/jackhuang/hellominecraft/utils/logging/appender/IAppender.java b/HMCLAPI/src/main/java/org/jackhuang/hellominecraft/util/logging/appender/IAppender.java similarity index 84% rename from HMCLAPI/src/main/java/org/jackhuang/hellominecraft/utils/logging/appender/IAppender.java rename to HMCLAPI/src/main/java/org/jackhuang/hellominecraft/util/logging/appender/IAppender.java index 54da4e8f2..0cac419fd 100755 --- a/HMCLAPI/src/main/java/org/jackhuang/hellominecraft/utils/logging/appender/IAppender.java +++ b/HMCLAPI/src/main/java/org/jackhuang/hellominecraft/util/logging/appender/IAppender.java @@ -15,11 +15,11 @@ * 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.utils.logging.appender; +package org.jackhuang.hellominecraft.util.logging.appender; import java.io.Serializable; -import org.jackhuang.hellominecraft.utils.logging.LogEvent; -import org.jackhuang.hellominecraft.utils.logging.layout.ILayout; +import org.jackhuang.hellominecraft.util.logging.LogEvent; +import org.jackhuang.hellominecraft.util.logging.layout.ILayout; /** * diff --git a/HMCLAPI/src/main/java/org/jackhuang/hellominecraft/utils/logging/appender/OutputStreamAppender.java b/HMCLAPI/src/main/java/org/jackhuang/hellominecraft/util/logging/appender/OutputStreamAppender.java similarity index 89% rename from HMCLAPI/src/main/java/org/jackhuang/hellominecraft/utils/logging/appender/OutputStreamAppender.java rename to HMCLAPI/src/main/java/org/jackhuang/hellominecraft/util/logging/appender/OutputStreamAppender.java index e828e323a..95610f222 100755 --- a/HMCLAPI/src/main/java/org/jackhuang/hellominecraft/utils/logging/appender/OutputStreamAppender.java +++ b/HMCLAPI/src/main/java/org/jackhuang/hellominecraft/util/logging/appender/OutputStreamAppender.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.utils.logging.appender; +package org.jackhuang.hellominecraft.util.logging.appender; import java.io.IOException; import java.io.OutputStream; @@ -23,9 +23,9 @@ import java.io.PrintStream; import java.io.Serializable; import java.util.concurrent.locks.Lock; import java.util.concurrent.locks.ReentrantReadWriteLock; -import org.jackhuang.hellominecraft.utils.logging.LogEvent; -import org.jackhuang.hellominecraft.utils.logging.LoggingException; -import org.jackhuang.hellominecraft.utils.logging.layout.ILayout; +import org.jackhuang.hellominecraft.util.logging.LogEvent; +import org.jackhuang.hellominecraft.util.logging.LoggingException; +import org.jackhuang.hellominecraft.util.logging.layout.ILayout; /** * diff --git a/HMCLAPI/src/main/java/org/jackhuang/hellominecraft/utils/logging/layout/AbstractStringLayout.java b/HMCLAPI/src/main/java/org/jackhuang/hellominecraft/util/logging/layout/AbstractStringLayout.java similarity index 89% rename from HMCLAPI/src/main/java/org/jackhuang/hellominecraft/utils/logging/layout/AbstractStringLayout.java rename to HMCLAPI/src/main/java/org/jackhuang/hellominecraft/util/logging/layout/AbstractStringLayout.java index c7c738f0e..04d2a25ca 100755 --- a/HMCLAPI/src/main/java/org/jackhuang/hellominecraft/utils/logging/layout/AbstractStringLayout.java +++ b/HMCLAPI/src/main/java/org/jackhuang/hellominecraft/util/logging/layout/AbstractStringLayout.java @@ -15,9 +15,9 @@ * 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.utils.logging.layout; +package org.jackhuang.hellominecraft.util.logging.layout; -import org.jackhuang.hellominecraft.utils.logging.LogEvent; +import org.jackhuang.hellominecraft.util.logging.LogEvent; /** * diff --git a/HMCLAPI/src/main/java/org/jackhuang/hellominecraft/utils/logging/layout/DefaultLayout.java b/HMCLAPI/src/main/java/org/jackhuang/hellominecraft/util/logging/layout/DefaultLayout.java similarity index 91% rename from HMCLAPI/src/main/java/org/jackhuang/hellominecraft/utils/logging/layout/DefaultLayout.java rename to HMCLAPI/src/main/java/org/jackhuang/hellominecraft/util/logging/layout/DefaultLayout.java index 95f02f1fe..9c8467cab 100755 --- a/HMCLAPI/src/main/java/org/jackhuang/hellominecraft/utils/logging/layout/DefaultLayout.java +++ b/HMCLAPI/src/main/java/org/jackhuang/hellominecraft/util/logging/layout/DefaultLayout.java @@ -15,11 +15,11 @@ * 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.utils.logging.layout; +package org.jackhuang.hellominecraft.util.logging.layout; import java.text.SimpleDateFormat; import java.util.Date; -import org.jackhuang.hellominecraft.utils.logging.LogEvent; +import org.jackhuang.hellominecraft.util.logging.LogEvent; /** * diff --git a/HMCLAPI/src/main/java/org/jackhuang/hellominecraft/utils/logging/layout/ILayout.java b/HMCLAPI/src/main/java/org/jackhuang/hellominecraft/util/logging/layout/ILayout.java similarity index 88% rename from HMCLAPI/src/main/java/org/jackhuang/hellominecraft/utils/logging/layout/ILayout.java rename to HMCLAPI/src/main/java/org/jackhuang/hellominecraft/util/logging/layout/ILayout.java index c6f19d0cc..ed24a4749 100755 --- a/HMCLAPI/src/main/java/org/jackhuang/hellominecraft/utils/logging/layout/ILayout.java +++ b/HMCLAPI/src/main/java/org/jackhuang/hellominecraft/util/logging/layout/ILayout.java @@ -15,10 +15,10 @@ * 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.utils.logging.layout; +package org.jackhuang.hellominecraft.util.logging.layout; import java.io.Serializable; -import org.jackhuang.hellominecraft.utils.logging.LogEvent; +import org.jackhuang.hellominecraft.util.logging.LogEvent; /** * diff --git a/HMCLAPI/src/main/java/org/jackhuang/hellominecraft/utils/logging/logger/AbstractLogger.java b/HMCLAPI/src/main/java/org/jackhuang/hellominecraft/util/logging/logger/AbstractLogger.java similarity index 97% rename from HMCLAPI/src/main/java/org/jackhuang/hellominecraft/utils/logging/logger/AbstractLogger.java rename to HMCLAPI/src/main/java/org/jackhuang/hellominecraft/util/logging/logger/AbstractLogger.java index d4cfba049..f52c24197 100755 --- a/HMCLAPI/src/main/java/org/jackhuang/hellominecraft/utils/logging/logger/AbstractLogger.java +++ b/HMCLAPI/src/main/java/org/jackhuang/hellominecraft/util/logging/logger/AbstractLogger.java @@ -15,13 +15,13 @@ * 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.utils.logging.logger; +package org.jackhuang.hellominecraft.util.logging.logger; -import org.jackhuang.hellominecraft.utils.logging.Level; -import org.jackhuang.hellominecraft.utils.logging.message.IMessage; -import org.jackhuang.hellominecraft.utils.logging.message.IMessageFactory; -import org.jackhuang.hellominecraft.utils.logging.message.ParameterizedMessageFactory; -import org.jackhuang.hellominecraft.utils.logging.message.StringFormattedMessage; +import org.jackhuang.hellominecraft.util.logging.Level; +import org.jackhuang.hellominecraft.util.logging.message.IMessage; +import org.jackhuang.hellominecraft.util.logging.message.IMessageFactory; +import org.jackhuang.hellominecraft.util.logging.message.ParameterizedMessageFactory; +import org.jackhuang.hellominecraft.util.logging.message.StringFormattedMessage; public abstract class AbstractLogger implements ILogger { diff --git a/HMCLAPI/src/main/java/org/jackhuang/hellominecraft/utils/logging/logger/ILogger.java b/HMCLAPI/src/main/java/org/jackhuang/hellominecraft/util/logging/logger/ILogger.java similarity index 95% rename from HMCLAPI/src/main/java/org/jackhuang/hellominecraft/utils/logging/logger/ILogger.java rename to HMCLAPI/src/main/java/org/jackhuang/hellominecraft/util/logging/logger/ILogger.java index 3982883c4..e223f6640 100755 --- a/HMCLAPI/src/main/java/org/jackhuang/hellominecraft/utils/logging/logger/ILogger.java +++ b/HMCLAPI/src/main/java/org/jackhuang/hellominecraft/util/logging/logger/ILogger.java @@ -15,10 +15,10 @@ * 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.utils.logging.logger; +package org.jackhuang.hellominecraft.util.logging.logger; -import org.jackhuang.hellominecraft.utils.logging.Level; -import org.jackhuang.hellominecraft.utils.logging.message.IMessage; +import org.jackhuang.hellominecraft.util.logging.Level; +import org.jackhuang.hellominecraft.util.logging.message.IMessage; /** * diff --git a/HMCLAPI/src/main/java/org/jackhuang/hellominecraft/utils/logging/logger/Logger.java b/HMCLAPI/src/main/java/org/jackhuang/hellominecraft/util/logging/logger/Logger.java similarity index 90% rename from HMCLAPI/src/main/java/org/jackhuang/hellominecraft/utils/logging/logger/Logger.java rename to HMCLAPI/src/main/java/org/jackhuang/hellominecraft/util/logging/logger/Logger.java index d5b2a535a..22bde019a 100755 --- a/HMCLAPI/src/main/java/org/jackhuang/hellominecraft/utils/logging/logger/Logger.java +++ b/HMCLAPI/src/main/java/org/jackhuang/hellominecraft/util/logging/logger/Logger.java @@ -15,18 +15,18 @@ * 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.utils.logging.logger; +package org.jackhuang.hellominecraft.util.logging.logger; import java.util.HashMap; import java.util.Map; import java.util.concurrent.ConcurrentHashMap; -import org.jackhuang.hellominecraft.utils.logging.AppenderControl; -import org.jackhuang.hellominecraft.utils.logging.Configuration; -import org.jackhuang.hellominecraft.utils.logging.Level; -import org.jackhuang.hellominecraft.utils.logging.LogEvent; -import org.jackhuang.hellominecraft.utils.logging.appender.IAppender; -import org.jackhuang.hellominecraft.utils.logging.message.IMessage; -import org.jackhuang.hellominecraft.utils.logging.message.IMessageFactory; +import org.jackhuang.hellominecraft.util.logging.AppenderControl; +import org.jackhuang.hellominecraft.util.logging.Configuration; +import org.jackhuang.hellominecraft.util.logging.Level; +import org.jackhuang.hellominecraft.util.logging.LogEvent; +import org.jackhuang.hellominecraft.util.logging.appender.IAppender; +import org.jackhuang.hellominecraft.util.logging.message.IMessage; +import org.jackhuang.hellominecraft.util.logging.message.IMessageFactory; public class Logger extends AbstractLogger { diff --git a/HMCLAPI/src/main/java/org/jackhuang/hellominecraft/utils/logging/logger/SimpleLogger.java b/HMCLAPI/src/main/java/org/jackhuang/hellominecraft/util/logging/logger/SimpleLogger.java similarity index 94% rename from HMCLAPI/src/main/java/org/jackhuang/hellominecraft/utils/logging/logger/SimpleLogger.java rename to HMCLAPI/src/main/java/org/jackhuang/hellominecraft/util/logging/logger/SimpleLogger.java index be8da2aff..7caed9386 100755 --- a/HMCLAPI/src/main/java/org/jackhuang/hellominecraft/utils/logging/logger/SimpleLogger.java +++ b/HMCLAPI/src/main/java/org/jackhuang/hellominecraft/util/logging/logger/SimpleLogger.java @@ -15,16 +15,16 @@ * 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.utils.logging.logger; +package org.jackhuang.hellominecraft.util.logging.logger; import java.io.ByteArrayOutputStream; import java.io.PrintStream; import java.text.DateFormat; import java.text.SimpleDateFormat; import java.util.Date; -import org.jackhuang.hellominecraft.utils.logging.Level; -import org.jackhuang.hellominecraft.utils.logging.message.IMessage; -import org.jackhuang.hellominecraft.utils.logging.message.IMessageFactory; +import org.jackhuang.hellominecraft.util.logging.Level; +import org.jackhuang.hellominecraft.util.logging.message.IMessage; +import org.jackhuang.hellominecraft.util.logging.message.IMessageFactory; public class SimpleLogger extends AbstractLogger { diff --git a/HMCLAPI/src/main/java/org/jackhuang/hellominecraft/utils/logging/message/AbstractMessageFactory.java b/HMCLAPI/src/main/java/org/jackhuang/hellominecraft/util/logging/message/AbstractMessageFactory.java similarity index 94% rename from HMCLAPI/src/main/java/org/jackhuang/hellominecraft/utils/logging/message/AbstractMessageFactory.java rename to HMCLAPI/src/main/java/org/jackhuang/hellominecraft/util/logging/message/AbstractMessageFactory.java index b6a5bc777..2fc58c718 100755 --- a/HMCLAPI/src/main/java/org/jackhuang/hellominecraft/utils/logging/message/AbstractMessageFactory.java +++ b/HMCLAPI/src/main/java/org/jackhuang/hellominecraft/util/logging/message/AbstractMessageFactory.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.utils.logging.message; +package org.jackhuang.hellominecraft.util.logging.message; /** * diff --git a/HMCLAPI/src/main/java/org/jackhuang/hellominecraft/utils/logging/message/IMessage.java b/HMCLAPI/src/main/java/org/jackhuang/hellominecraft/util/logging/message/IMessage.java similarity index 94% rename from HMCLAPI/src/main/java/org/jackhuang/hellominecraft/utils/logging/message/IMessage.java rename to HMCLAPI/src/main/java/org/jackhuang/hellominecraft/util/logging/message/IMessage.java index 5f2a8dfc4..8c97f4155 100755 --- a/HMCLAPI/src/main/java/org/jackhuang/hellominecraft/utils/logging/message/IMessage.java +++ b/HMCLAPI/src/main/java/org/jackhuang/hellominecraft/util/logging/message/IMessage.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.utils.logging.message; +package org.jackhuang.hellominecraft.util.logging.message; import java.io.Serializable; diff --git a/HMCLAPI/src/main/java/org/jackhuang/hellominecraft/utils/logging/message/IMessageFactory.java b/HMCLAPI/src/main/java/org/jackhuang/hellominecraft/util/logging/message/IMessageFactory.java similarity index 94% rename from HMCLAPI/src/main/java/org/jackhuang/hellominecraft/utils/logging/message/IMessageFactory.java rename to HMCLAPI/src/main/java/org/jackhuang/hellominecraft/util/logging/message/IMessageFactory.java index 2e529dbb8..a4372a375 100755 --- a/HMCLAPI/src/main/java/org/jackhuang/hellominecraft/utils/logging/message/IMessageFactory.java +++ b/HMCLAPI/src/main/java/org/jackhuang/hellominecraft/util/logging/message/IMessageFactory.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.utils.logging.message; +package org.jackhuang.hellominecraft.util.logging.message; /** * diff --git a/HMCLAPI/src/main/java/org/jackhuang/hellominecraft/utils/logging/message/ObjectMessage.java b/HMCLAPI/src/main/java/org/jackhuang/hellominecraft/util/logging/message/ObjectMessage.java similarity index 97% rename from HMCLAPI/src/main/java/org/jackhuang/hellominecraft/utils/logging/message/ObjectMessage.java rename to HMCLAPI/src/main/java/org/jackhuang/hellominecraft/util/logging/message/ObjectMessage.java index eb6914bf5..f8faa3dee 100755 --- a/HMCLAPI/src/main/java/org/jackhuang/hellominecraft/utils/logging/message/ObjectMessage.java +++ b/HMCLAPI/src/main/java/org/jackhuang/hellominecraft/util/logging/message/ObjectMessage.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.utils.logging.message; +package org.jackhuang.hellominecraft.util.logging.message; public class ObjectMessage implements IMessage { diff --git a/HMCLAPI/src/main/java/org/jackhuang/hellominecraft/utils/logging/message/ParameterizedMessage.java b/HMCLAPI/src/main/java/org/jackhuang/hellominecraft/util/logging/message/ParameterizedMessage.java similarity index 99% rename from HMCLAPI/src/main/java/org/jackhuang/hellominecraft/utils/logging/message/ParameterizedMessage.java rename to HMCLAPI/src/main/java/org/jackhuang/hellominecraft/util/logging/message/ParameterizedMessage.java index 6df4d3c8a..9727a8373 100755 --- a/HMCLAPI/src/main/java/org/jackhuang/hellominecraft/utils/logging/message/ParameterizedMessage.java +++ b/HMCLAPI/src/main/java/org/jackhuang/hellominecraft/util/logging/message/ParameterizedMessage.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.utils.logging.message; +package org.jackhuang.hellominecraft.util.logging.message; import java.text.SimpleDateFormat; import java.util.Arrays; diff --git a/HMCLAPI/src/main/java/org/jackhuang/hellominecraft/utils/logging/message/ParameterizedMessageFactory.java b/HMCLAPI/src/main/java/org/jackhuang/hellominecraft/util/logging/message/ParameterizedMessageFactory.java similarity index 94% rename from HMCLAPI/src/main/java/org/jackhuang/hellominecraft/utils/logging/message/ParameterizedMessageFactory.java rename to HMCLAPI/src/main/java/org/jackhuang/hellominecraft/util/logging/message/ParameterizedMessageFactory.java index 7459cf5c5..f98ad5f22 100755 --- a/HMCLAPI/src/main/java/org/jackhuang/hellominecraft/utils/logging/message/ParameterizedMessageFactory.java +++ b/HMCLAPI/src/main/java/org/jackhuang/hellominecraft/util/logging/message/ParameterizedMessageFactory.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.utils.logging.message; +package org.jackhuang.hellominecraft.util.logging.message; /** * diff --git a/HMCLAPI/src/main/java/org/jackhuang/hellominecraft/utils/logging/message/SimpleMessage.java b/HMCLAPI/src/main/java/org/jackhuang/hellominecraft/util/logging/message/SimpleMessage.java similarity index 97% rename from HMCLAPI/src/main/java/org/jackhuang/hellominecraft/utils/logging/message/SimpleMessage.java rename to HMCLAPI/src/main/java/org/jackhuang/hellominecraft/util/logging/message/SimpleMessage.java index 2d0eb6430..ea8409e5f 100755 --- a/HMCLAPI/src/main/java/org/jackhuang/hellominecraft/utils/logging/message/SimpleMessage.java +++ b/HMCLAPI/src/main/java/org/jackhuang/hellominecraft/util/logging/message/SimpleMessage.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.utils.logging.message; +package org.jackhuang.hellominecraft.util.logging.message; /** * diff --git a/HMCLAPI/src/main/java/org/jackhuang/hellominecraft/utils/logging/message/StringFormattedMessage.java b/HMCLAPI/src/main/java/org/jackhuang/hellominecraft/util/logging/message/StringFormattedMessage.java similarity index 98% rename from HMCLAPI/src/main/java/org/jackhuang/hellominecraft/utils/logging/message/StringFormattedMessage.java rename to HMCLAPI/src/main/java/org/jackhuang/hellominecraft/util/logging/message/StringFormattedMessage.java index 1cabb13cb..5dc211f55 100755 --- a/HMCLAPI/src/main/java/org/jackhuang/hellominecraft/utils/logging/message/StringFormattedMessage.java +++ b/HMCLAPI/src/main/java/org/jackhuang/hellominecraft/util/logging/message/StringFormattedMessage.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.utils.logging.message; +package org.jackhuang.hellominecraft.util.logging.message; import java.util.Arrays; import java.util.IllegalFormatException; diff --git a/HMCLAPI/src/main/java/org/jackhuang/hellominecraft/utils/system/Compressor.java b/HMCLAPI/src/main/java/org/jackhuang/hellominecraft/util/system/Compressor.java similarity index 97% rename from HMCLAPI/src/main/java/org/jackhuang/hellominecraft/utils/system/Compressor.java rename to HMCLAPI/src/main/java/org/jackhuang/hellominecraft/util/system/Compressor.java index bb1b4646c..63bda0f7d 100755 --- a/HMCLAPI/src/main/java/org/jackhuang/hellominecraft/utils/system/Compressor.java +++ b/HMCLAPI/src/main/java/org/jackhuang/hellominecraft/util/system/Compressor.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.utils.system; +package org.jackhuang.hellominecraft.util.system; import java.io.BufferedInputStream; import java.io.BufferedOutputStream; @@ -26,9 +26,9 @@ import java.io.IOException; import java.io.InputStream; import java.util.zip.ZipEntry; import java.util.zip.ZipOutputStream; -import org.jackhuang.hellominecraft.utils.functions.Predicate; +import org.jackhuang.hellominecraft.util.func.Predicate; import java.util.zip.ZipInputStream; -import org.jackhuang.hellominecraft.utils.functions.BiFunction; +import org.jackhuang.hellominecraft.util.func.BiFunction; /** * 文件压缩/解压类 diff --git a/HMCLAPI/src/main/java/org/jackhuang/hellominecraft/utils/system/FileUtils.java b/HMCLAPI/src/main/java/org/jackhuang/hellominecraft/util/system/FileUtils.java similarity index 99% rename from HMCLAPI/src/main/java/org/jackhuang/hellominecraft/utils/system/FileUtils.java rename to HMCLAPI/src/main/java/org/jackhuang/hellominecraft/util/system/FileUtils.java index 9264b171c..b75e78b80 100755 --- a/HMCLAPI/src/main/java/org/jackhuang/hellominecraft/utils/system/FileUtils.java +++ b/HMCLAPI/src/main/java/org/jackhuang/hellominecraft/util/system/FileUtils.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.utils.system; +package org.jackhuang.hellominecraft.util.system; import java.io.File; import java.io.FileFilter; @@ -27,8 +27,8 @@ import java.io.OutputStream; import java.nio.channels.FileChannel; import java.util.ArrayList; import java.util.List; -import org.jackhuang.hellominecraft.utils.logging.HMCLog; -import org.jackhuang.hellominecraft.utils.NetUtils; +import org.jackhuang.hellominecraft.util.logging.HMCLog; +import org.jackhuang.hellominecraft.util.NetUtils; /** * diff --git a/HMCLAPI/src/main/java/org/jackhuang/hellominecraft/utils/system/IOUtils.java b/HMCLAPI/src/main/java/org/jackhuang/hellominecraft/util/system/IOUtils.java similarity index 98% rename from HMCLAPI/src/main/java/org/jackhuang/hellominecraft/utils/system/IOUtils.java rename to HMCLAPI/src/main/java/org/jackhuang/hellominecraft/util/system/IOUtils.java index 3034e8008..99bc63998 100755 --- a/HMCLAPI/src/main/java/org/jackhuang/hellominecraft/utils/system/IOUtils.java +++ b/HMCLAPI/src/main/java/org/jackhuang/hellominecraft/util/system/IOUtils.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.utils.system; +package org.jackhuang.hellominecraft.util.system; import java.io.BufferedReader; import java.io.ByteArrayOutputStream; @@ -37,7 +37,7 @@ import java.net.URL; import java.net.UnknownHostException; import java.util.ArrayList; import java.util.List; -import org.jackhuang.hellominecraft.utils.logging.HMCLog; +import org.jackhuang.hellominecraft.util.logging.HMCLog; /** * diff --git a/HMCLAPI/src/main/java/org/jackhuang/hellominecraft/utils/system/Java.java b/HMCLAPI/src/main/java/org/jackhuang/hellominecraft/util/system/Java.java similarity index 97% rename from HMCLAPI/src/main/java/org/jackhuang/hellominecraft/utils/system/Java.java rename to HMCLAPI/src/main/java/org/jackhuang/hellominecraft/util/system/Java.java index 2c9f1d77a..58cb96f14 100755 --- a/HMCLAPI/src/main/java/org/jackhuang/hellominecraft/utils/system/Java.java +++ b/HMCLAPI/src/main/java/org/jackhuang/hellominecraft/util/system/Java.java @@ -15,15 +15,15 @@ * 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.utils.system; +package org.jackhuang.hellominecraft.util.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.utils.C; -import org.jackhuang.hellominecraft.utils.logging.HMCLog; +import org.jackhuang.hellominecraft.util.C; +import org.jackhuang.hellominecraft.util.logging.HMCLog; /** * diff --git a/HMCLAPI/src/main/java/org/jackhuang/hellominecraft/utils/system/JavaProcess.java b/HMCLAPI/src/main/java/org/jackhuang/hellominecraft/util/system/JavaProcess.java similarity index 98% rename from HMCLAPI/src/main/java/org/jackhuang/hellominecraft/utils/system/JavaProcess.java rename to HMCLAPI/src/main/java/org/jackhuang/hellominecraft/util/system/JavaProcess.java index c3ba36bc7..2a56201f8 100755 --- a/HMCLAPI/src/main/java/org/jackhuang/hellominecraft/utils/system/JavaProcess.java +++ b/HMCLAPI/src/main/java/org/jackhuang/hellominecraft/util/system/JavaProcess.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.utils.system; +package org.jackhuang.hellominecraft.util.system; import java.util.ArrayList; import java.util.Arrays; diff --git a/HMCLAPI/src/main/java/org/jackhuang/hellominecraft/utils/system/JavaProcessMonitor.java b/HMCLAPI/src/main/java/org/jackhuang/hellominecraft/util/system/JavaProcessMonitor.java similarity index 92% rename from HMCLAPI/src/main/java/org/jackhuang/hellominecraft/utils/system/JavaProcessMonitor.java rename to HMCLAPI/src/main/java/org/jackhuang/hellominecraft/util/system/JavaProcessMonitor.java index 0a888e418..94ee93ff2 100755 --- a/HMCLAPI/src/main/java/org/jackhuang/hellominecraft/utils/system/JavaProcessMonitor.java +++ b/HMCLAPI/src/main/java/org/jackhuang/hellominecraft/util/system/JavaProcessMonitor.java @@ -15,14 +15,14 @@ * 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.utils.system; +package org.jackhuang.hellominecraft.util.system; import java.util.Arrays; import java.util.HashSet; -import org.jackhuang.hellominecraft.utils.CollectionUtils; -import org.jackhuang.hellominecraft.utils.Event; -import org.jackhuang.hellominecraft.utils.EventHandler; -import org.jackhuang.hellominecraft.utils.StrUtils; +import org.jackhuang.hellominecraft.util.CollectionUtils; +import org.jackhuang.hellominecraft.util.Event; +import org.jackhuang.hellominecraft.util.EventHandler; +import org.jackhuang.hellominecraft.util.StrUtils; /** * diff --git a/HMCLAPI/src/main/java/org/jackhuang/hellominecraft/utils/system/JdkVersion.java b/HMCLAPI/src/main/java/org/jackhuang/hellominecraft/util/system/JdkVersion.java similarity index 97% rename from HMCLAPI/src/main/java/org/jackhuang/hellominecraft/utils/system/JdkVersion.java rename to HMCLAPI/src/main/java/org/jackhuang/hellominecraft/util/system/JdkVersion.java index 351544db9..9a72633b5 100755 --- a/HMCLAPI/src/main/java/org/jackhuang/hellominecraft/utils/system/JdkVersion.java +++ b/HMCLAPI/src/main/java/org/jackhuang/hellominecraft/util/system/JdkVersion.java @@ -15,14 +15,14 @@ * 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.utils.system; +package org.jackhuang.hellominecraft.util.system; import java.io.File; import java.io.IOException; import java.util.regex.Matcher; import java.util.regex.Pattern; -import org.jackhuang.hellominecraft.utils.logging.HMCLog; -import org.jackhuang.hellominecraft.utils.StrUtils; +import org.jackhuang.hellominecraft.util.logging.HMCLog; +import org.jackhuang.hellominecraft.util.StrUtils; /** * diff --git a/HMCLAPI/src/main/java/org/jackhuang/hellominecraft/utils/system/OS.java b/HMCLAPI/src/main/java/org/jackhuang/hellominecraft/util/system/OS.java similarity index 96% rename from HMCLAPI/src/main/java/org/jackhuang/hellominecraft/utils/system/OS.java rename to HMCLAPI/src/main/java/org/jackhuang/hellominecraft/util/system/OS.java index e43360d99..e968f74a5 100755 --- a/HMCLAPI/src/main/java/org/jackhuang/hellominecraft/utils/system/OS.java +++ b/HMCLAPI/src/main/java/org/jackhuang/hellominecraft/util/system/OS.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.utils.system; +package org.jackhuang.hellominecraft.util.system; import com.sun.management.OperatingSystemMXBean; import java.io.BufferedReader; @@ -25,8 +25,8 @@ import java.io.IOException; import java.io.InputStreamReader; import java.lang.management.ManagementFactory; import java.util.StringTokenizer; -import org.jackhuang.hellominecraft.utils.logging.HMCLog; -import org.jackhuang.hellominecraft.utils.StrUtils; +import org.jackhuang.hellominecraft.util.logging.HMCLog; +import org.jackhuang.hellominecraft.util.StrUtils; /** * @author huangyuhui diff --git a/HMCLAPI/src/main/java/org/jackhuang/hellominecraft/utils/system/Platform.java b/HMCLAPI/src/main/java/org/jackhuang/hellominecraft/util/system/Platform.java similarity index 96% rename from HMCLAPI/src/main/java/org/jackhuang/hellominecraft/utils/system/Platform.java rename to HMCLAPI/src/main/java/org/jackhuang/hellominecraft/util/system/Platform.java index 081544a8f..9a23f4908 100755 --- a/HMCLAPI/src/main/java/org/jackhuang/hellominecraft/utils/system/Platform.java +++ b/HMCLAPI/src/main/java/org/jackhuang/hellominecraft/util/system/Platform.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.utils.system; +package org.jackhuang.hellominecraft.util.system; /** * diff --git a/HMCLAPI/src/main/java/org/jackhuang/hellominecraft/utils/system/ProcessManager.java b/HMCLAPI/src/main/java/org/jackhuang/hellominecraft/util/system/ProcessManager.java similarity index 96% rename from HMCLAPI/src/main/java/org/jackhuang/hellominecraft/utils/system/ProcessManager.java rename to HMCLAPI/src/main/java/org/jackhuang/hellominecraft/util/system/ProcessManager.java index 3c0c4e12f..49f5facc7 100755 --- a/HMCLAPI/src/main/java/org/jackhuang/hellominecraft/utils/system/ProcessManager.java +++ b/HMCLAPI/src/main/java/org/jackhuang/hellominecraft/util/system/ProcessManager.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.utils.system; +package org.jackhuang.hellominecraft.util.system; import java.util.HashSet; diff --git a/HMCLAPI/src/main/java/org/jackhuang/hellominecraft/utils/system/ProcessThread.java b/HMCLAPI/src/main/java/org/jackhuang/hellominecraft/util/system/ProcessThread.java similarity index 95% rename from HMCLAPI/src/main/java/org/jackhuang/hellominecraft/utils/system/ProcessThread.java rename to HMCLAPI/src/main/java/org/jackhuang/hellominecraft/util/system/ProcessThread.java index ab2e1a084..8d9136d9a 100755 --- a/HMCLAPI/src/main/java/org/jackhuang/hellominecraft/utils/system/ProcessThread.java +++ b/HMCLAPI/src/main/java/org/jackhuang/hellominecraft/util/system/ProcessThread.java @@ -15,13 +15,13 @@ * 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.utils.system; +package org.jackhuang.hellominecraft.util.system; import java.io.InputStream; import java.io.InputStreamReader; import java.io.UnsupportedEncodingException; -import org.jackhuang.hellominecraft.utils.logging.HMCLog; -import org.jackhuang.hellominecraft.utils.EventHandler; +import org.jackhuang.hellominecraft.util.logging.HMCLog; +import org.jackhuang.hellominecraft.util.EventHandler; /** * diff --git a/HMCLAPI/src/main/java/org/jackhuang/hellominecraft/utils/system/ThreadExecutor.java b/HMCLAPI/src/main/java/org/jackhuang/hellominecraft/util/system/ThreadExecutor.java similarity index 91% rename from HMCLAPI/src/main/java/org/jackhuang/hellominecraft/utils/system/ThreadExecutor.java rename to HMCLAPI/src/main/java/org/jackhuang/hellominecraft/util/system/ThreadExecutor.java index 5ff32e78f..fe025455a 100755 --- a/HMCLAPI/src/main/java/org/jackhuang/hellominecraft/utils/system/ThreadExecutor.java +++ b/HMCLAPI/src/main/java/org/jackhuang/hellominecraft/util/system/ThreadExecutor.java @@ -15,9 +15,9 @@ * 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.utils.system; +package org.jackhuang.hellominecraft.util.system; -import org.jackhuang.hellominecraft.utils.functions.Consumer; +import org.jackhuang.hellominecraft.util.func.Consumer; /** * diff --git a/HMCLAPI/src/main/java/org/jackhuang/hellominecraft/utils/system/ZipEngine.java b/HMCLAPI/src/main/java/org/jackhuang/hellominecraft/util/system/ZipEngine.java similarity index 97% rename from HMCLAPI/src/main/java/org/jackhuang/hellominecraft/utils/system/ZipEngine.java rename to HMCLAPI/src/main/java/org/jackhuang/hellominecraft/util/system/ZipEngine.java index a7d94dba0..4ab91577f 100644 --- a/HMCLAPI/src/main/java/org/jackhuang/hellominecraft/utils/system/ZipEngine.java +++ b/HMCLAPI/src/main/java/org/jackhuang/hellominecraft/util/system/ZipEngine.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.utils.system; +package org.jackhuang.hellominecraft.util.system; import java.io.BufferedInputStream; import java.io.BufferedOutputStream; @@ -27,7 +27,7 @@ import java.io.IOException; import java.io.InputStream; import java.util.zip.ZipEntry; import java.util.zip.ZipOutputStream; -import org.jackhuang.hellominecraft.utils.functions.BiFunction; +import org.jackhuang.hellominecraft.util.func.BiFunction; /** * Non thread-safe diff --git a/HMCLAPI/src/main/java/org/jackhuang/hellominecraft/utils/tasks/DecompressTask.java b/HMCLAPI/src/main/java/org/jackhuang/hellominecraft/util/tasks/DecompressTask.java similarity index 91% rename from HMCLAPI/src/main/java/org/jackhuang/hellominecraft/utils/tasks/DecompressTask.java rename to HMCLAPI/src/main/java/org/jackhuang/hellominecraft/util/tasks/DecompressTask.java index 1b2504df0..949b476f4 100755 --- a/HMCLAPI/src/main/java/org/jackhuang/hellominecraft/utils/tasks/DecompressTask.java +++ b/HMCLAPI/src/main/java/org/jackhuang/hellominecraft/util/tasks/DecompressTask.java @@ -15,10 +15,10 @@ * 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.utils.tasks; +package org.jackhuang.hellominecraft.util.tasks; import java.io.File; -import org.jackhuang.hellominecraft.utils.system.Compressor; +import org.jackhuang.hellominecraft.util.system.Compressor; /** * diff --git a/HMCLAPI/src/main/java/org/jackhuang/hellominecraft/utils/tasks/DoingDoneListener.java b/HMCLAPI/src/main/java/org/jackhuang/hellominecraft/util/tasks/DoingDoneListener.java similarity index 95% rename from HMCLAPI/src/main/java/org/jackhuang/hellominecraft/utils/tasks/DoingDoneListener.java rename to HMCLAPI/src/main/java/org/jackhuang/hellominecraft/util/tasks/DoingDoneListener.java index 6b2dade9c..1f3752678 100755 --- a/HMCLAPI/src/main/java/org/jackhuang/hellominecraft/utils/tasks/DoingDoneListener.java +++ b/HMCLAPI/src/main/java/org/jackhuang/hellominecraft/util/tasks/DoingDoneListener.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.utils.tasks; +package org.jackhuang.hellominecraft.util.tasks; /** * diff --git a/HMCLAPI/src/main/java/org/jackhuang/hellominecraft/utils/tasks/DoubleTask.java b/HMCLAPI/src/main/java/org/jackhuang/hellominecraft/util/tasks/DoubleTask.java similarity index 95% rename from HMCLAPI/src/main/java/org/jackhuang/hellominecraft/utils/tasks/DoubleTask.java rename to HMCLAPI/src/main/java/org/jackhuang/hellominecraft/util/tasks/DoubleTask.java index 87604d950..77996d2ff 100755 --- a/HMCLAPI/src/main/java/org/jackhuang/hellominecraft/utils/tasks/DoubleTask.java +++ b/HMCLAPI/src/main/java/org/jackhuang/hellominecraft/util/tasks/DoubleTask.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.utils.tasks; +package org.jackhuang.hellominecraft.util.tasks; /** * diff --git a/HMCLAPI/src/main/java/org/jackhuang/hellominecraft/utils/tasks/ParallelTask.java b/HMCLAPI/src/main/java/org/jackhuang/hellominecraft/util/tasks/ParallelTask.java similarity index 96% rename from HMCLAPI/src/main/java/org/jackhuang/hellominecraft/utils/tasks/ParallelTask.java rename to HMCLAPI/src/main/java/org/jackhuang/hellominecraft/util/tasks/ParallelTask.java index 1f71df65a..cf0f8c692 100755 --- a/HMCLAPI/src/main/java/org/jackhuang/hellominecraft/utils/tasks/ParallelTask.java +++ b/HMCLAPI/src/main/java/org/jackhuang/hellominecraft/util/tasks/ParallelTask.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.utils.tasks; +package org.jackhuang.hellominecraft.util.tasks; import java.util.Collection; import java.util.HashSet; diff --git a/HMCLAPI/src/main/java/org/jackhuang/hellominecraft/utils/tasks/ProgressProviderListener.java b/HMCLAPI/src/main/java/org/jackhuang/hellominecraft/util/tasks/ProgressProviderListener.java similarity index 95% rename from HMCLAPI/src/main/java/org/jackhuang/hellominecraft/utils/tasks/ProgressProviderListener.java rename to HMCLAPI/src/main/java/org/jackhuang/hellominecraft/util/tasks/ProgressProviderListener.java index 27735ca06..2b23175ca 100755 --- a/HMCLAPI/src/main/java/org/jackhuang/hellominecraft/utils/tasks/ProgressProviderListener.java +++ b/HMCLAPI/src/main/java/org/jackhuang/hellominecraft/util/tasks/ProgressProviderListener.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.utils.tasks; +package org.jackhuang.hellominecraft.util.tasks; /** * diff --git a/HMCLAPI/src/main/java/org/jackhuang/hellominecraft/utils/tasks/Task.java b/HMCLAPI/src/main/java/org/jackhuang/hellominecraft/util/tasks/Task.java similarity index 96% rename from HMCLAPI/src/main/java/org/jackhuang/hellominecraft/utils/tasks/Task.java rename to HMCLAPI/src/main/java/org/jackhuang/hellominecraft/util/tasks/Task.java index 160fc7d2f..9cbc358f1 100755 --- a/HMCLAPI/src/main/java/org/jackhuang/hellominecraft/utils/tasks/Task.java +++ b/HMCLAPI/src/main/java/org/jackhuang/hellominecraft/util/tasks/Task.java @@ -15,11 +15,11 @@ * 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.utils.tasks; +package org.jackhuang.hellominecraft.util.tasks; import java.util.ArrayList; import java.util.Collection; -import org.jackhuang.hellominecraft.utils.logging.HMCLog; +import org.jackhuang.hellominecraft.util.logging.HMCLog; /** * diff --git a/HMCLAPI/src/main/java/org/jackhuang/hellominecraft/utils/tasks/TaskInfo.java b/HMCLAPI/src/main/java/org/jackhuang/hellominecraft/util/tasks/TaskInfo.java similarity index 95% rename from HMCLAPI/src/main/java/org/jackhuang/hellominecraft/utils/tasks/TaskInfo.java rename to HMCLAPI/src/main/java/org/jackhuang/hellominecraft/util/tasks/TaskInfo.java index 3835ebc54..5e3b143cf 100755 --- a/HMCLAPI/src/main/java/org/jackhuang/hellominecraft/utils/tasks/TaskInfo.java +++ b/HMCLAPI/src/main/java/org/jackhuang/hellominecraft/util/tasks/TaskInfo.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.utils.tasks; +package org.jackhuang.hellominecraft.util.tasks; /** * diff --git a/HMCLAPI/src/main/java/org/jackhuang/hellominecraft/utils/tasks/TaskList.java b/HMCLAPI/src/main/java/org/jackhuang/hellominecraft/util/tasks/TaskList.java similarity index 97% rename from HMCLAPI/src/main/java/org/jackhuang/hellominecraft/utils/tasks/TaskList.java rename to HMCLAPI/src/main/java/org/jackhuang/hellominecraft/util/tasks/TaskList.java index 5f68990e3..fb945f2c9 100755 --- a/HMCLAPI/src/main/java/org/jackhuang/hellominecraft/utils/tasks/TaskList.java +++ b/HMCLAPI/src/main/java/org/jackhuang/hellominecraft/util/tasks/TaskList.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.utils.tasks; +package org.jackhuang.hellominecraft.util.tasks; import java.util.ArrayList; import java.util.Collection; @@ -24,7 +24,7 @@ import java.util.HashSet; import java.util.LinkedList; import java.util.List; import java.util.Set; -import org.jackhuang.hellominecraft.utils.logging.HMCLog; +import org.jackhuang.hellominecraft.util.logging.HMCLog; /** * diff --git a/HMCLAPI/src/main/java/org/jackhuang/hellominecraft/utils/tasks/TaskRunnable.java b/HMCLAPI/src/main/java/org/jackhuang/hellominecraft/util/tasks/TaskRunnable.java similarity index 95% rename from HMCLAPI/src/main/java/org/jackhuang/hellominecraft/utils/tasks/TaskRunnable.java rename to HMCLAPI/src/main/java/org/jackhuang/hellominecraft/util/tasks/TaskRunnable.java index 7662d2035..32c24b398 100755 --- a/HMCLAPI/src/main/java/org/jackhuang/hellominecraft/utils/tasks/TaskRunnable.java +++ b/HMCLAPI/src/main/java/org/jackhuang/hellominecraft/util/tasks/TaskRunnable.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.utils.tasks; +package org.jackhuang.hellominecraft.util.tasks; /** * diff --git a/HMCLAPI/src/main/java/org/jackhuang/hellominecraft/utils/tasks/TaskRunnableArg1.java b/HMCLAPI/src/main/java/org/jackhuang/hellominecraft/util/tasks/TaskRunnableArg1.java similarity index 84% rename from HMCLAPI/src/main/java/org/jackhuang/hellominecraft/utils/tasks/TaskRunnableArg1.java rename to HMCLAPI/src/main/java/org/jackhuang/hellominecraft/util/tasks/TaskRunnableArg1.java index 4aaa47b3d..fbfb2b613 100755 --- a/HMCLAPI/src/main/java/org/jackhuang/hellominecraft/utils/tasks/TaskRunnableArg1.java +++ b/HMCLAPI/src/main/java/org/jackhuang/hellominecraft/util/tasks/TaskRunnableArg1.java @@ -15,12 +15,12 @@ * 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.utils.tasks; +package org.jackhuang.hellominecraft.util.tasks; import java.util.ArrayList; -import org.jackhuang.hellominecraft.utils.tasks.communication.PreviousResult; -import org.jackhuang.hellominecraft.utils.tasks.communication.PreviousResultRegistrar; -import org.jackhuang.hellominecraft.utils.functions.Consumer; +import org.jackhuang.hellominecraft.util.tasks.communication.PreviousResult; +import org.jackhuang.hellominecraft.util.tasks.communication.PreviousResultRegistrar; +import org.jackhuang.hellominecraft.util.func.Consumer; /** * diff --git a/HMCLAPI/src/main/java/org/jackhuang/hellominecraft/utils/tasks/TaskWindow.form b/HMCLAPI/src/main/java/org/jackhuang/hellominecraft/util/tasks/TaskWindow.form similarity index 100% rename from HMCLAPI/src/main/java/org/jackhuang/hellominecraft/utils/tasks/TaskWindow.form rename to HMCLAPI/src/main/java/org/jackhuang/hellominecraft/util/tasks/TaskWindow.form diff --git a/HMCLAPI/src/main/java/org/jackhuang/hellominecraft/utils/tasks/TaskWindow.java b/HMCLAPI/src/main/java/org/jackhuang/hellominecraft/util/tasks/TaskWindow.java similarity index 97% rename from HMCLAPI/src/main/java/org/jackhuang/hellominecraft/utils/tasks/TaskWindow.java rename to HMCLAPI/src/main/java/org/jackhuang/hellominecraft/util/tasks/TaskWindow.java index 3a099ec91..ae4d67aab 100755 --- a/HMCLAPI/src/main/java/org/jackhuang/hellominecraft/utils/tasks/TaskWindow.java +++ b/HMCLAPI/src/main/java/org/jackhuang/hellominecraft/util/tasks/TaskWindow.java @@ -15,16 +15,16 @@ * 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.utils.tasks; +package org.jackhuang.hellominecraft.util.tasks; import java.util.ArrayList; import java.util.LinkedList; import javax.swing.SwingUtilities; -import org.jackhuang.hellominecraft.utils.C; -import org.jackhuang.hellominecraft.utils.logging.HMCLog; -import org.jackhuang.hellominecraft.utils.MessageBox; -import org.jackhuang.hellominecraft.utils.StrUtils; -import org.jackhuang.hellominecraft.utils.views.SwingUtils; +import org.jackhuang.hellominecraft.util.C; +import org.jackhuang.hellominecraft.util.logging.HMCLog; +import org.jackhuang.hellominecraft.util.MessageBox; +import org.jackhuang.hellominecraft.util.StrUtils; +import org.jackhuang.hellominecraft.util.ui.SwingUtils; /** * diff --git a/HMCLAPI/src/main/java/org/jackhuang/hellominecraft/utils/tasks/communication/DefaultPreviousResult.java b/HMCLAPI/src/main/java/org/jackhuang/hellominecraft/util/tasks/communication/DefaultPreviousResult.java similarity index 94% rename from HMCLAPI/src/main/java/org/jackhuang/hellominecraft/utils/tasks/communication/DefaultPreviousResult.java rename to HMCLAPI/src/main/java/org/jackhuang/hellominecraft/util/tasks/communication/DefaultPreviousResult.java index a34b21ec8..e996586f9 100755 --- a/HMCLAPI/src/main/java/org/jackhuang/hellominecraft/utils/tasks/communication/DefaultPreviousResult.java +++ b/HMCLAPI/src/main/java/org/jackhuang/hellominecraft/util/tasks/communication/DefaultPreviousResult.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.utils.tasks.communication; +package org.jackhuang.hellominecraft.util.tasks.communication; /** * diff --git a/HMCLAPI/src/main/java/org/jackhuang/hellominecraft/utils/tasks/communication/PreviousResult.java b/HMCLAPI/src/main/java/org/jackhuang/hellominecraft/util/tasks/communication/PreviousResult.java similarity index 93% rename from HMCLAPI/src/main/java/org/jackhuang/hellominecraft/utils/tasks/communication/PreviousResult.java rename to HMCLAPI/src/main/java/org/jackhuang/hellominecraft/util/tasks/communication/PreviousResult.java index f0e0cf1ba..19fc1565d 100755 --- a/HMCLAPI/src/main/java/org/jackhuang/hellominecraft/utils/tasks/communication/PreviousResult.java +++ b/HMCLAPI/src/main/java/org/jackhuang/hellominecraft/util/tasks/communication/PreviousResult.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.utils.tasks.communication; +package org.jackhuang.hellominecraft.util.tasks.communication; /** * diff --git a/HMCLAPI/src/main/java/org/jackhuang/hellominecraft/utils/tasks/communication/PreviousResultRegistrar.java b/HMCLAPI/src/main/java/org/jackhuang/hellominecraft/util/tasks/communication/PreviousResultRegistrar.java similarity index 89% rename from HMCLAPI/src/main/java/org/jackhuang/hellominecraft/utils/tasks/communication/PreviousResultRegistrar.java rename to HMCLAPI/src/main/java/org/jackhuang/hellominecraft/util/tasks/communication/PreviousResultRegistrar.java index 1fd245521..da5897b6c 100755 --- a/HMCLAPI/src/main/java/org/jackhuang/hellominecraft/utils/tasks/communication/PreviousResultRegistrar.java +++ b/HMCLAPI/src/main/java/org/jackhuang/hellominecraft/util/tasks/communication/PreviousResultRegistrar.java @@ -15,9 +15,9 @@ * 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.utils.tasks.communication; +package org.jackhuang.hellominecraft.util.tasks.communication; -import org.jackhuang.hellominecraft.utils.tasks.Task; +import org.jackhuang.hellominecraft.util.tasks.Task; /** * diff --git a/HMCLAPI/src/main/java/org/jackhuang/hellominecraft/utils/tasks/download/ContentGetAndShowTask.java b/HMCLAPI/src/main/java/org/jackhuang/hellominecraft/util/tasks/download/ContentGetAndShowTask.java similarity index 89% rename from HMCLAPI/src/main/java/org/jackhuang/hellominecraft/utils/tasks/download/ContentGetAndShowTask.java rename to HMCLAPI/src/main/java/org/jackhuang/hellominecraft/util/tasks/download/ContentGetAndShowTask.java index 8f221a581..67ad3e379 100755 --- a/HMCLAPI/src/main/java/org/jackhuang/hellominecraft/utils/tasks/download/ContentGetAndShowTask.java +++ b/HMCLAPI/src/main/java/org/jackhuang/hellominecraft/util/tasks/download/ContentGetAndShowTask.java @@ -15,10 +15,10 @@ * 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.utils.tasks.download; +package org.jackhuang.hellominecraft.util.tasks.download; -import org.jackhuang.hellominecraft.utils.Event; -import org.jackhuang.hellominecraft.utils.views.LogWindow; +import org.jackhuang.hellominecraft.util.Event; +import org.jackhuang.hellominecraft.util.ui.LogWindow; /** * diff --git a/HMCLAPI/src/main/java/org/jackhuang/hellominecraft/utils/tasks/download/DownloadListener.java b/HMCLAPI/src/main/java/org/jackhuang/hellominecraft/util/tasks/download/DownloadListener.java similarity index 87% rename from HMCLAPI/src/main/java/org/jackhuang/hellominecraft/utils/tasks/download/DownloadListener.java rename to HMCLAPI/src/main/java/org/jackhuang/hellominecraft/util/tasks/download/DownloadListener.java index 1c3817b41..c0061f16e 100755 --- a/HMCLAPI/src/main/java/org/jackhuang/hellominecraft/utils/tasks/download/DownloadListener.java +++ b/HMCLAPI/src/main/java/org/jackhuang/hellominecraft/util/tasks/download/DownloadListener.java @@ -15,9 +15,9 @@ * 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.utils.tasks.download; +package org.jackhuang.hellominecraft.util.tasks.download; -import org.jackhuang.hellominecraft.utils.tasks.ProgressProviderListener; +import org.jackhuang.hellominecraft.util.tasks.ProgressProviderListener; /** * diff --git a/HMCLAPI/src/main/java/org/jackhuang/hellominecraft/utils/tasks/download/FileDownloadTask.java b/HMCLAPI/src/main/java/org/jackhuang/hellominecraft/util/tasks/download/FileDownloadTask.java similarity index 93% rename from HMCLAPI/src/main/java/org/jackhuang/hellominecraft/utils/tasks/download/FileDownloadTask.java rename to HMCLAPI/src/main/java/org/jackhuang/hellominecraft/util/tasks/download/FileDownloadTask.java index c708986c8..7be1c375d 100755 --- a/HMCLAPI/src/main/java/org/jackhuang/hellominecraft/utils/tasks/download/FileDownloadTask.java +++ b/HMCLAPI/src/main/java/org/jackhuang/hellominecraft/util/tasks/download/FileDownloadTask.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.utils.tasks.download; +package org.jackhuang.hellominecraft.util.tasks.download; import java.io.File; import java.io.IOException; @@ -24,12 +24,12 @@ import java.io.RandomAccessFile; import java.net.HttpURLConnection; import java.net.URL; import java.util.ArrayList; -import org.jackhuang.hellominecraft.utils.C; -import org.jackhuang.hellominecraft.utils.logging.HMCLog; -import org.jackhuang.hellominecraft.utils.tasks.Task; -import org.jackhuang.hellominecraft.utils.tasks.communication.PreviousResult; -import org.jackhuang.hellominecraft.utils.tasks.communication.PreviousResultRegistrar; -import org.jackhuang.hellominecraft.utils.system.IOUtils; +import org.jackhuang.hellominecraft.util.C; +import org.jackhuang.hellominecraft.util.logging.HMCLog; +import org.jackhuang.hellominecraft.util.tasks.Task; +import org.jackhuang.hellominecraft.util.tasks.communication.PreviousResult; +import org.jackhuang.hellominecraft.util.tasks.communication.PreviousResultRegistrar; +import org.jackhuang.hellominecraft.util.system.IOUtils; /** * diff --git a/HMCLAPI/src/main/java/org/jackhuang/hellominecraft/utils/tasks/download/HTTPGetTask.java b/HMCLAPI/src/main/java/org/jackhuang/hellominecraft/util/tasks/download/HTTPGetTask.java similarity index 90% rename from HMCLAPI/src/main/java/org/jackhuang/hellominecraft/utils/tasks/download/HTTPGetTask.java rename to HMCLAPI/src/main/java/org/jackhuang/hellominecraft/util/tasks/download/HTTPGetTask.java index e6834faeb..5d25989a7 100755 --- a/HMCLAPI/src/main/java/org/jackhuang/hellominecraft/utils/tasks/download/HTTPGetTask.java +++ b/HMCLAPI/src/main/java/org/jackhuang/hellominecraft/util/tasks/download/HTTPGetTask.java @@ -15,16 +15,16 @@ * 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.utils.tasks.download; +package org.jackhuang.hellominecraft.util.tasks.download; import java.io.ByteArrayOutputStream; import java.io.InputStream; import java.net.URL; import java.net.URLConnection; -import org.jackhuang.hellominecraft.utils.logging.HMCLog; -import org.jackhuang.hellominecraft.utils.tasks.TaskInfo; -import org.jackhuang.hellominecraft.utils.tasks.communication.PreviousResult; -import org.jackhuang.hellominecraft.utils.EventHandler; +import org.jackhuang.hellominecraft.util.logging.HMCLog; +import org.jackhuang.hellominecraft.util.tasks.TaskInfo; +import org.jackhuang.hellominecraft.util.tasks.communication.PreviousResult; +import org.jackhuang.hellominecraft.util.EventHandler; /** * diff --git a/HMCLAPI/src/main/java/org/jackhuang/hellominecraft/utils/tasks/download/NetException.java b/HMCLAPI/src/main/java/org/jackhuang/hellominecraft/util/tasks/download/NetException.java similarity index 94% rename from HMCLAPI/src/main/java/org/jackhuang/hellominecraft/utils/tasks/download/NetException.java rename to HMCLAPI/src/main/java/org/jackhuang/hellominecraft/util/tasks/download/NetException.java index be9919547..67a8608c6 100755 --- a/HMCLAPI/src/main/java/org/jackhuang/hellominecraft/utils/tasks/download/NetException.java +++ b/HMCLAPI/src/main/java/org/jackhuang/hellominecraft/util/tasks/download/NetException.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.utils.tasks.download; +package org.jackhuang.hellominecraft.util.tasks.download; /** * diff --git a/HMCLAPI/src/main/java/org/jackhuang/hellominecraft/utils/views/AbstractFilter.java b/HMCLAPI/src/main/java/org/jackhuang/hellominecraft/util/ui/AbstractFilter.java similarity index 98% rename from HMCLAPI/src/main/java/org/jackhuang/hellominecraft/utils/views/AbstractFilter.java rename to HMCLAPI/src/main/java/org/jackhuang/hellominecraft/util/ui/AbstractFilter.java index 51a633ca3..197edf707 100755 --- a/HMCLAPI/src/main/java/org/jackhuang/hellominecraft/utils/views/AbstractFilter.java +++ b/HMCLAPI/src/main/java/org/jackhuang/hellominecraft/util/ui/AbstractFilter.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.utils.views; +package org.jackhuang.hellominecraft.util.ui; import java.awt.Rectangle; import java.awt.RenderingHints; diff --git a/HMCLAPI/src/main/java/org/jackhuang/hellominecraft/utils/views/BasicColors.java b/HMCLAPI/src/main/java/org/jackhuang/hellominecraft/util/ui/BasicColors.java similarity index 97% rename from HMCLAPI/src/main/java/org/jackhuang/hellominecraft/utils/views/BasicColors.java rename to HMCLAPI/src/main/java/org/jackhuang/hellominecraft/util/ui/BasicColors.java index f86110ef6..1dc7760d1 100755 --- a/HMCLAPI/src/main/java/org/jackhuang/hellominecraft/utils/views/BasicColors.java +++ b/HMCLAPI/src/main/java/org/jackhuang/hellominecraft/util/ui/BasicColors.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.utils.views; +package org.jackhuang.hellominecraft.util.ui; import java.awt.Color; diff --git a/HMCLAPI/src/main/java/org/jackhuang/hellominecraft/utils/views/DropShadowBorder.java b/HMCLAPI/src/main/java/org/jackhuang/hellominecraft/util/ui/DropShadowBorder.java similarity index 97% rename from HMCLAPI/src/main/java/org/jackhuang/hellominecraft/utils/views/DropShadowBorder.java rename to HMCLAPI/src/main/java/org/jackhuang/hellominecraft/util/ui/DropShadowBorder.java index a1e5f6f63..6706fe392 100755 --- a/HMCLAPI/src/main/java/org/jackhuang/hellominecraft/utils/views/DropShadowBorder.java +++ b/HMCLAPI/src/main/java/org/jackhuang/hellominecraft/util/ui/DropShadowBorder.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.utils.views; +package org.jackhuang.hellominecraft.util.ui; import java.awt.AlphaComposite; import java.awt.Color; @@ -28,7 +28,7 @@ import java.awt.RenderingHints; import java.awt.image.BufferedImage; import java.util.HashMap; import javax.swing.border.AbstractBorder; -import org.jackhuang.hellominecraft.utils.Pair; +import org.jackhuang.hellominecraft.util.Pair; public class DropShadowBorder extends AbstractBorder { diff --git a/HMCLAPI/src/main/java/org/jackhuang/hellominecraft/utils/views/FastBlurFilter.java b/HMCLAPI/src/main/java/org/jackhuang/hellominecraft/util/ui/FastBlurFilter.java similarity index 98% rename from HMCLAPI/src/main/java/org/jackhuang/hellominecraft/utils/views/FastBlurFilter.java rename to HMCLAPI/src/main/java/org/jackhuang/hellominecraft/util/ui/FastBlurFilter.java index 19b58d8d5..82a454156 100755 --- a/HMCLAPI/src/main/java/org/jackhuang/hellominecraft/utils/views/FastBlurFilter.java +++ b/HMCLAPI/src/main/java/org/jackhuang/hellominecraft/util/ui/FastBlurFilter.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.utils.views; +package org.jackhuang.hellominecraft.util.ui; import java.awt.image.BufferedImage; diff --git a/HMCLAPI/src/main/java/org/jackhuang/hellominecraft/utils/views/LogWindow.form b/HMCLAPI/src/main/java/org/jackhuang/hellominecraft/util/ui/LogWindow.form similarity index 100% rename from HMCLAPI/src/main/java/org/jackhuang/hellominecraft/utils/views/LogWindow.form rename to HMCLAPI/src/main/java/org/jackhuang/hellominecraft/util/ui/LogWindow.form diff --git a/HMCLAPI/src/main/java/org/jackhuang/hellominecraft/utils/views/LogWindow.java b/HMCLAPI/src/main/java/org/jackhuang/hellominecraft/util/ui/LogWindow.java similarity index 96% rename from HMCLAPI/src/main/java/org/jackhuang/hellominecraft/utils/views/LogWindow.java rename to HMCLAPI/src/main/java/org/jackhuang/hellominecraft/util/ui/LogWindow.java index d8652c6d0..eb037e3bc 100755 --- a/HMCLAPI/src/main/java/org/jackhuang/hellominecraft/utils/views/LogWindow.java +++ b/HMCLAPI/src/main/java/org/jackhuang/hellominecraft/util/ui/LogWindow.java @@ -15,21 +15,21 @@ * 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.utils.views; +package org.jackhuang.hellominecraft.util.ui; import java.awt.Frame; import javax.swing.text.BadLocationException; import javax.swing.text.Document; import javax.swing.text.SimpleAttributeSet; import javax.swing.text.StyleConstants; -import org.jackhuang.hellominecraft.utils.C; -import org.jackhuang.hellominecraft.utils.logging.HMCLog; -import org.jackhuang.hellominecraft.utils.logging.Level; -import org.jackhuang.hellominecraft.utils.functions.NonFunction; -import org.jackhuang.hellominecraft.utils.DoubleOutputStream; -import org.jackhuang.hellominecraft.utils.LauncherPrintStream; -import org.jackhuang.hellominecraft.utils.MessageBox; -import org.jackhuang.hellominecraft.utils.Utils; +import org.jackhuang.hellominecraft.util.C; +import org.jackhuang.hellominecraft.util.logging.HMCLog; +import org.jackhuang.hellominecraft.util.logging.Level; +import org.jackhuang.hellominecraft.util.func.NonFunction; +import org.jackhuang.hellominecraft.util.DoubleOutputStream; +import org.jackhuang.hellominecraft.util.LauncherPrintStream; +import org.jackhuang.hellominecraft.util.MessageBox; +import org.jackhuang.hellominecraft.util.Utils; /** * diff --git a/HMCLAPI/src/main/java/org/jackhuang/hellominecraft/utils/views/LogWindowOutputStream.java b/HMCLAPI/src/main/java/org/jackhuang/hellominecraft/util/ui/LogWindowOutputStream.java similarity index 94% rename from HMCLAPI/src/main/java/org/jackhuang/hellominecraft/utils/views/LogWindowOutputStream.java rename to HMCLAPI/src/main/java/org/jackhuang/hellominecraft/util/ui/LogWindowOutputStream.java index e92fad20a..32449e7f0 100755 --- a/HMCLAPI/src/main/java/org/jackhuang/hellominecraft/utils/views/LogWindowOutputStream.java +++ b/HMCLAPI/src/main/java/org/jackhuang/hellominecraft/util/ui/LogWindowOutputStream.java @@ -15,13 +15,13 @@ * 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.utils.views; +package org.jackhuang.hellominecraft.util.ui; import java.io.OutputStream; import java.util.Timer; import javax.swing.SwingUtilities; -import org.jackhuang.hellominecraft.utils.logging.Level; -import org.jackhuang.hellominecraft.utils.views.LogWindow; +import org.jackhuang.hellominecraft.util.logging.Level; +import org.jackhuang.hellominecraft.util.ui.LogWindow; /** * diff --git a/HMCLAPI/src/main/java/org/jackhuang/hellominecraft/utils/views/Selector.form b/HMCLAPI/src/main/java/org/jackhuang/hellominecraft/util/ui/Selector.form similarity index 100% rename from HMCLAPI/src/main/java/org/jackhuang/hellominecraft/utils/views/Selector.form rename to HMCLAPI/src/main/java/org/jackhuang/hellominecraft/util/ui/Selector.form diff --git a/HMCLAPI/src/main/java/org/jackhuang/hellominecraft/utils/views/Selector.java b/HMCLAPI/src/main/java/org/jackhuang/hellominecraft/util/ui/Selector.java similarity index 98% rename from HMCLAPI/src/main/java/org/jackhuang/hellominecraft/utils/views/Selector.java rename to HMCLAPI/src/main/java/org/jackhuang/hellominecraft/util/ui/Selector.java index 5a19c84e4..8171b180c 100755 --- a/HMCLAPI/src/main/java/org/jackhuang/hellominecraft/utils/views/Selector.java +++ b/HMCLAPI/src/main/java/org/jackhuang/hellominecraft/util/ui/Selector.java @@ -15,9 +15,9 @@ * 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.utils.views; +package org.jackhuang.hellominecraft.util.ui; -import org.jackhuang.hellominecraft.utils.C; +import org.jackhuang.hellominecraft.util.C; /** * The frame given to choose things. diff --git a/HMCLAPI/src/main/java/org/jackhuang/hellominecraft/utils/views/SwingUtils.java b/HMCLAPI/src/main/java/org/jackhuang/hellominecraft/util/ui/SwingUtils.java similarity index 95% rename from HMCLAPI/src/main/java/org/jackhuang/hellominecraft/utils/views/SwingUtils.java rename to HMCLAPI/src/main/java/org/jackhuang/hellominecraft/util/ui/SwingUtils.java index aa37a09dd..42a025519 100755 --- a/HMCLAPI/src/main/java/org/jackhuang/hellominecraft/utils/views/SwingUtils.java +++ b/HMCLAPI/src/main/java/org/jackhuang/hellominecraft/util/ui/SwingUtils.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.utils.views; +package org.jackhuang.hellominecraft.util.ui; import java.awt.EventQueue; import java.awt.FontMetrics; @@ -33,12 +33,12 @@ import javax.swing.JScrollPane; import javax.swing.JTable; import javax.swing.JTextArea; import javax.swing.table.DefaultTableModel; -import org.jackhuang.hellominecraft.utils.C; -import org.jackhuang.hellominecraft.utils.logging.HMCLog; -import org.jackhuang.hellominecraft.utils.MessageBox; -import org.jackhuang.hellominecraft.utils.StrUtils; -import org.jackhuang.hellominecraft.utils.functions.NonFunction; -import org.jackhuang.hellominecraft.utils.system.OS; +import org.jackhuang.hellominecraft.util.C; +import org.jackhuang.hellominecraft.util.logging.HMCLog; +import org.jackhuang.hellominecraft.util.MessageBox; +import org.jackhuang.hellominecraft.util.StrUtils; +import org.jackhuang.hellominecraft.util.func.NonFunction; +import org.jackhuang.hellominecraft.util.system.OS; /** * diff --git a/HMCLAPI/src/main/java/org/jackhuang/hellominecraft/utils/views/TintablePanel.java b/HMCLAPI/src/main/java/org/jackhuang/hellominecraft/util/ui/TintablePanel.java similarity index 98% rename from HMCLAPI/src/main/java/org/jackhuang/hellominecraft/utils/views/TintablePanel.java rename to HMCLAPI/src/main/java/org/jackhuang/hellominecraft/util/ui/TintablePanel.java index 1a85a0b27..5c2a5c6f4 100755 --- a/HMCLAPI/src/main/java/org/jackhuang/hellominecraft/utils/views/TintablePanel.java +++ b/HMCLAPI/src/main/java/org/jackhuang/hellominecraft/util/ui/TintablePanel.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.utils.views; +package org.jackhuang.hellominecraft.util.ui; /** * diff --git a/HMCLAPI/src/main/java/org/jackhuang/hellominecraft/utils/views/checktree/CheckBoxTreeCellRenderer.java b/HMCLAPI/src/main/java/org/jackhuang/hellominecraft/util/ui/checktree/CheckBoxTreeCellRenderer.java similarity index 98% rename from HMCLAPI/src/main/java/org/jackhuang/hellominecraft/utils/views/checktree/CheckBoxTreeCellRenderer.java rename to HMCLAPI/src/main/java/org/jackhuang/hellominecraft/util/ui/checktree/CheckBoxTreeCellRenderer.java index 0d43eb204..4d66e072f 100644 --- a/HMCLAPI/src/main/java/org/jackhuang/hellominecraft/utils/views/checktree/CheckBoxTreeCellRenderer.java +++ b/HMCLAPI/src/main/java/org/jackhuang/hellominecraft/util/ui/checktree/CheckBoxTreeCellRenderer.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.utils.views.checktree; +package org.jackhuang.hellominecraft.util.ui.checktree; import java.awt.Color; import java.awt.Component; diff --git a/HMCLAPI/src/main/java/org/jackhuang/hellominecraft/utils/views/checktree/CheckBoxTreeLabel.java b/HMCLAPI/src/main/java/org/jackhuang/hellominecraft/util/ui/checktree/CheckBoxTreeLabel.java similarity index 97% rename from HMCLAPI/src/main/java/org/jackhuang/hellominecraft/utils/views/checktree/CheckBoxTreeLabel.java rename to HMCLAPI/src/main/java/org/jackhuang/hellominecraft/util/ui/checktree/CheckBoxTreeLabel.java index 553d0c37f..4136b7f5f 100644 --- a/HMCLAPI/src/main/java/org/jackhuang/hellominecraft/utils/views/checktree/CheckBoxTreeLabel.java +++ b/HMCLAPI/src/main/java/org/jackhuang/hellominecraft/util/ui/checktree/CheckBoxTreeLabel.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.utils.views.checktree; +package org.jackhuang.hellominecraft.util.ui.checktree; import java.awt.Color; import java.awt.Dimension; diff --git a/HMCLAPI/src/main/java/org/jackhuang/hellominecraft/utils/views/checktree/CheckBoxTreeNode.java b/HMCLAPI/src/main/java/org/jackhuang/hellominecraft/util/ui/checktree/CheckBoxTreeNode.java similarity index 98% rename from HMCLAPI/src/main/java/org/jackhuang/hellominecraft/utils/views/checktree/CheckBoxTreeNode.java rename to HMCLAPI/src/main/java/org/jackhuang/hellominecraft/util/ui/checktree/CheckBoxTreeNode.java index e06b46380..9fe7d7f10 100644 --- a/HMCLAPI/src/main/java/org/jackhuang/hellominecraft/utils/views/checktree/CheckBoxTreeNode.java +++ b/HMCLAPI/src/main/java/org/jackhuang/hellominecraft/util/ui/checktree/CheckBoxTreeNode.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.utils.views.checktree; +package org.jackhuang.hellominecraft.util.ui.checktree; import javax.swing.tree.DefaultMutableTreeNode; diff --git a/HMCLAPI/src/main/java/org/jackhuang/hellominecraft/utils/views/checktree/CheckBoxTreeNodeSelectionListener.java b/HMCLAPI/src/main/java/org/jackhuang/hellominecraft/util/ui/checktree/CheckBoxTreeNodeSelectionListener.java similarity index 96% rename from HMCLAPI/src/main/java/org/jackhuang/hellominecraft/utils/views/checktree/CheckBoxTreeNodeSelectionListener.java rename to HMCLAPI/src/main/java/org/jackhuang/hellominecraft/util/ui/checktree/CheckBoxTreeNodeSelectionListener.java index 25e609d85..901595dc9 100644 --- a/HMCLAPI/src/main/java/org/jackhuang/hellominecraft/utils/views/checktree/CheckBoxTreeNodeSelectionListener.java +++ b/HMCLAPI/src/main/java/org/jackhuang/hellominecraft/util/ui/checktree/CheckBoxTreeNodeSelectionListener.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.utils.views.checktree; +package org.jackhuang.hellominecraft.util.ui.checktree; import java.awt.event.MouseAdapter; import java.awt.event.MouseEvent; diff --git a/HMCLAPI/src/main/java/org/jackhuang/hellominecraft/utils/views/wizard/api/WizardDisplayer.java b/HMCLAPI/src/main/java/org/jackhuang/hellominecraft/util/ui/wizard/api/WizardDisplayer.java similarity index 97% rename from HMCLAPI/src/main/java/org/jackhuang/hellominecraft/utils/views/wizard/api/WizardDisplayer.java rename to HMCLAPI/src/main/java/org/jackhuang/hellominecraft/util/ui/wizard/api/WizardDisplayer.java index a76912adf..aa9cf0180 100644 --- a/HMCLAPI/src/main/java/org/jackhuang/hellominecraft/utils/views/wizard/api/WizardDisplayer.java +++ b/HMCLAPI/src/main/java/org/jackhuang/hellominecraft/util/ui/wizard/api/WizardDisplayer.java @@ -10,7 +10,7 @@ * enclosed by brackets [] replaced by your own identifying information: * "Portions Copyrighted [year] [name of copyright owner]" */ -package org.jackhuang.hellominecraft.utils.views.wizard.api; +package org.jackhuang.hellominecraft.util.ui.wizard.api; import java.awt.Container; import java.awt.Rectangle; @@ -18,8 +18,8 @@ import java.util.Arrays; import java.util.HashSet; import java.util.Map; import javax.swing.Action; -import org.jackhuang.hellominecraft.utils.views.wizard.api.displayer.WizardDisplayerImpl; -import org.jackhuang.hellominecraft.utils.views.wizard.spi.Wizard; +import org.jackhuang.hellominecraft.util.ui.wizard.api.displayer.WizardDisplayerImpl; +import org.jackhuang.hellominecraft.util.ui.wizard.spi.Wizard; /** *

Displaying Wizards

diff --git a/HMCLAPI/src/main/java/org/jackhuang/hellominecraft/utils/views/wizard/api/WizardResultReceiver.java b/HMCLAPI/src/main/java/org/jackhuang/hellominecraft/util/ui/wizard/api/WizardResultReceiver.java similarity index 96% rename from HMCLAPI/src/main/java/org/jackhuang/hellominecraft/utils/views/wizard/api/WizardResultReceiver.java rename to HMCLAPI/src/main/java/org/jackhuang/hellominecraft/util/ui/wizard/api/WizardResultReceiver.java index 37f01ce22..8f91309bb 100644 --- a/HMCLAPI/src/main/java/org/jackhuang/hellominecraft/utils/views/wizard/api/WizardResultReceiver.java +++ b/HMCLAPI/src/main/java/org/jackhuang/hellominecraft/util/ui/wizard/api/WizardResultReceiver.java @@ -16,7 +16,7 @@ * Software is Sun Microsystems, Inc. Portions Copyright 1997-2006 Sun * Microsystems, Inc. All Rights Reserved. */ -package org.jackhuang.hellominecraft.utils.views.wizard.api; +package org.jackhuang.hellominecraft.util.ui.wizard.api; import java.util.Map; diff --git a/HMCLAPI/src/main/java/org/jackhuang/hellominecraft/utils/views/wizard/api/displayer/InstructionsPanel.java b/HMCLAPI/src/main/java/org/jackhuang/hellominecraft/util/ui/wizard/api/displayer/InstructionsPanel.java similarity index 94% rename from HMCLAPI/src/main/java/org/jackhuang/hellominecraft/utils/views/wizard/api/displayer/InstructionsPanel.java rename to HMCLAPI/src/main/java/org/jackhuang/hellominecraft/util/ui/wizard/api/displayer/InstructionsPanel.java index cf0e6fd35..11e9243f0 100644 --- a/HMCLAPI/src/main/java/org/jackhuang/hellominecraft/utils/views/wizard/api/displayer/InstructionsPanel.java +++ b/HMCLAPI/src/main/java/org/jackhuang/hellominecraft/util/ui/wizard/api/displayer/InstructionsPanel.java @@ -3,7 +3,7 @@ * and open the template in the editor. */ -package org.jackhuang.hellominecraft.utils.views.wizard.api.displayer; +package org.jackhuang.hellominecraft.util.ui.wizard.api.displayer; import java.awt.Container; diff --git a/HMCLAPI/src/main/java/org/jackhuang/hellominecraft/utils/views/wizard/api/displayer/NavButtonManager.java b/HMCLAPI/src/main/java/org/jackhuang/hellominecraft/util/ui/wizard/api/displayer/NavButtonManager.java similarity index 96% rename from HMCLAPI/src/main/java/org/jackhuang/hellominecraft/utils/views/wizard/api/displayer/NavButtonManager.java rename to HMCLAPI/src/main/java/org/jackhuang/hellominecraft/util/ui/wizard/api/displayer/NavButtonManager.java index e4017bda1..f450cf2bc 100644 --- a/HMCLAPI/src/main/java/org/jackhuang/hellominecraft/utils/views/wizard/api/displayer/NavButtonManager.java +++ b/HMCLAPI/src/main/java/org/jackhuang/hellominecraft/util/ui/wizard/api/displayer/NavButtonManager.java @@ -2,7 +2,7 @@ * NavButtonManager.java created on Dec 9, 2006 * */ -package org.jackhuang.hellominecraft.utils.views.wizard.api.displayer; +package org.jackhuang.hellominecraft.util.ui.wizard.api.displayer; import java.awt.Cursor; import java.awt.Dimension; @@ -22,16 +22,15 @@ import javax.swing.JOptionPane; import javax.swing.JPanel; import javax.swing.JRootPane; import javax.swing.UIManager; -import org.jackhuang.hellominecraft.utils.C; - -import org.jackhuang.hellominecraft.utils.views.wizard.modules.MergeMap; -import org.jackhuang.hellominecraft.utils.views.wizard.spi.DeferredWizardResult; -import org.jackhuang.hellominecraft.utils.views.wizard.spi.Summary; -import org.jackhuang.hellominecraft.utils.views.wizard.spi.Wizard; -import org.jackhuang.hellominecraft.utils.views.wizard.spi.WizardException; -import org.jackhuang.hellominecraft.utils.views.wizard.spi.WizardObserver; -import org.jackhuang.hellominecraft.utils.views.wizard.spi.WizardPanel; -import org.jackhuang.hellominecraft.utils.views.wizard.spi.WizardPanelNavResult; +import org.jackhuang.hellominecraft.util.C; +import org.jackhuang.hellominecraft.util.ui.wizard.modules.MergeMap; +import org.jackhuang.hellominecraft.util.ui.wizard.spi.DeferredWizardResult; +import org.jackhuang.hellominecraft.util.ui.wizard.spi.Summary; +import org.jackhuang.hellominecraft.util.ui.wizard.spi.Wizard; +import org.jackhuang.hellominecraft.util.ui.wizard.spi.WizardException; +import org.jackhuang.hellominecraft.util.ui.wizard.spi.WizardObserver; +import org.jackhuang.hellominecraft.util.ui.wizard.spi.WizardPanel; +import org.jackhuang.hellominecraft.util.ui.wizard.spi.WizardPanelNavResult; /** * Manage the button state and interaction with the wizard. diff --git a/HMCLAPI/src/main/java/org/jackhuang/hellominecraft/utils/views/wizard/api/displayer/NavProgress.java b/HMCLAPI/src/main/java/org/jackhuang/hellominecraft/util/ui/wizard/api/displayer/NavProgress.java similarity index 92% rename from HMCLAPI/src/main/java/org/jackhuang/hellominecraft/utils/views/wizard/api/displayer/NavProgress.java rename to HMCLAPI/src/main/java/org/jackhuang/hellominecraft/util/ui/wizard/api/displayer/NavProgress.java index b4f9869e8..9fa51c750 100644 --- a/HMCLAPI/src/main/java/org/jackhuang/hellominecraft/utils/views/wizard/api/displayer/NavProgress.java +++ b/HMCLAPI/src/main/java/org/jackhuang/hellominecraft/util/ui/wizard/api/displayer/NavProgress.java @@ -1,4 +1,4 @@ -package org.jackhuang.hellominecraft.utils.views.wizard.api.displayer; +package org.jackhuang.hellominecraft.util.ui.wizard.api.displayer; import java.awt.Container; import java.awt.EventQueue; @@ -7,11 +7,10 @@ import java.lang.reflect.InvocationTargetException; import javax.swing.JLabel; import javax.swing.JProgressBar; import javax.swing.border.EmptyBorder; -import org.jackhuang.hellominecraft.utils.C; -import org.jackhuang.hellominecraft.utils.logging.HMCLog; - -import org.jackhuang.hellominecraft.utils.views.wizard.spi.ResultProgressHandle; -import org.jackhuang.hellominecraft.utils.views.wizard.spi.Summary; +import org.jackhuang.hellominecraft.util.C; +import org.jackhuang.hellominecraft.util.logging.HMCLog; +import org.jackhuang.hellominecraft.util.ui.wizard.spi.ResultProgressHandle; +import org.jackhuang.hellominecraft.util.ui.wizard.spi.Summary; /** * Show progress bar for deferred results, with a label showing percent done and diff --git a/HMCLAPI/src/main/java/org/jackhuang/hellominecraft/utils/views/wizard/api/displayer/WizardDisplayerImpl.java b/HMCLAPI/src/main/java/org/jackhuang/hellominecraft/util/ui/wizard/api/displayer/WizardDisplayerImpl.java similarity index 95% rename from HMCLAPI/src/main/java/org/jackhuang/hellominecraft/utils/views/wizard/api/displayer/WizardDisplayerImpl.java rename to HMCLAPI/src/main/java/org/jackhuang/hellominecraft/util/ui/wizard/api/displayer/WizardDisplayerImpl.java index 21b741922..9ff809a38 100644 --- a/HMCLAPI/src/main/java/org/jackhuang/hellominecraft/utils/views/wizard/api/displayer/WizardDisplayerImpl.java +++ b/HMCLAPI/src/main/java/org/jackhuang/hellominecraft/util/ui/wizard/api/displayer/WizardDisplayerImpl.java @@ -12,7 +12,7 @@ * Written by Stanley@StanleyKnutson.com based on code from Tim B. * */ -package org.jackhuang.hellominecraft.utils.views.wizard.api.displayer; +package org.jackhuang.hellominecraft.util.ui.wizard.api.displayer; import java.awt.BorderLayout; import java.awt.Color; @@ -49,17 +49,17 @@ import javax.swing.WindowConstants; import javax.swing.border.Border; import javax.swing.border.CompoundBorder; import javax.swing.border.EmptyBorder; -import org.jackhuang.hellominecraft.utils.C; -import org.jackhuang.hellominecraft.utils.logging.HMCLog; -import org.jackhuang.hellominecraft.utils.views.wizard.api.WizardDisplayer; -import org.jackhuang.hellominecraft.utils.views.wizard.api.WizardResultReceiver; -import org.jackhuang.hellominecraft.utils.views.wizard.modules.InstructionsPanelImpl; -import org.jackhuang.hellominecraft.utils.views.wizard.modules.MergeMap; -import org.jackhuang.hellominecraft.utils.views.wizard.spi.DeferredWizardResult; -import org.jackhuang.hellominecraft.utils.views.wizard.spi.ResultProgressHandle; -import org.jackhuang.hellominecraft.utils.views.wizard.spi.Summary; -import org.jackhuang.hellominecraft.utils.views.wizard.spi.Wizard; -import org.jackhuang.hellominecraft.utils.views.wizard.spi.WizardPanel; +import org.jackhuang.hellominecraft.util.C; +import org.jackhuang.hellominecraft.util.logging.HMCLog; +import org.jackhuang.hellominecraft.util.ui.wizard.api.WizardDisplayer; +import org.jackhuang.hellominecraft.util.ui.wizard.api.WizardResultReceiver; +import org.jackhuang.hellominecraft.util.ui.wizard.modules.InstructionsPanelImpl; +import org.jackhuang.hellominecraft.util.ui.wizard.modules.MergeMap; +import org.jackhuang.hellominecraft.util.ui.wizard.spi.DeferredWizardResult; +import org.jackhuang.hellominecraft.util.ui.wizard.spi.ResultProgressHandle; +import org.jackhuang.hellominecraft.util.ui.wizard.spi.Summary; +import org.jackhuang.hellominecraft.util.ui.wizard.spi.Wizard; +import org.jackhuang.hellominecraft.util.ui.wizard.spi.WizardPanel; /** * Default implementation of WizardDisplayer. diff --git a/HMCLAPI/src/main/java/org/jackhuang/hellominecraft/utils/views/wizard/modules/InstructionsPanelImpl.java b/HMCLAPI/src/main/java/org/jackhuang/hellominecraft/util/ui/wizard/modules/InstructionsPanelImpl.java similarity index 97% rename from HMCLAPI/src/main/java/org/jackhuang/hellominecraft/utils/views/wizard/modules/InstructionsPanelImpl.java rename to HMCLAPI/src/main/java/org/jackhuang/hellominecraft/util/ui/wizard/modules/InstructionsPanelImpl.java index f12591bdf..7fe68e801 100644 --- a/HMCLAPI/src/main/java/org/jackhuang/hellominecraft/utils/views/wizard/modules/InstructionsPanelImpl.java +++ b/HMCLAPI/src/main/java/org/jackhuang/hellominecraft/util/ui/wizard/modules/InstructionsPanelImpl.java @@ -15,7 +15,7 @@ * * Created on March 4, 2005, 8:59 PM */ -package org.jackhuang.hellominecraft.utils.views.wizard.modules; +package org.jackhuang.hellominecraft.util.ui.wizard.modules; import java.awt.Color; import java.awt.Component; @@ -42,11 +42,11 @@ import javax.swing.CellRendererPane; import javax.swing.JComponent; import javax.swing.JEditorPane; import javax.swing.UIManager; -import org.jackhuang.hellominecraft.utils.C; -import org.jackhuang.hellominecraft.utils.logging.HMCLog; -import org.jackhuang.hellominecraft.utils.views.wizard.api.displayer.InstructionsPanel; -import org.jackhuang.hellominecraft.utils.views.wizard.spi.Wizard; -import org.jackhuang.hellominecraft.utils.views.wizard.spi.WizardObserver; +import org.jackhuang.hellominecraft.util.C; +import org.jackhuang.hellominecraft.util.logging.HMCLog; +import org.jackhuang.hellominecraft.util.ui.wizard.api.displayer.InstructionsPanel; +import org.jackhuang.hellominecraft.util.ui.wizard.spi.Wizard; +import org.jackhuang.hellominecraft.util.ui.wizard.spi.WizardObserver; /** * A panel that displays a background image and optionally instructions diff --git a/HMCLAPI/src/main/java/org/jackhuang/hellominecraft/utils/views/wizard/modules/MergeMap.java b/HMCLAPI/src/main/java/org/jackhuang/hellominecraft/util/ui/wizard/modules/MergeMap.java similarity index 99% rename from HMCLAPI/src/main/java/org/jackhuang/hellominecraft/utils/views/wizard/modules/MergeMap.java rename to HMCLAPI/src/main/java/org/jackhuang/hellominecraft/util/ui/wizard/modules/MergeMap.java index 0eb677751..31dcf03e4 100644 --- a/HMCLAPI/src/main/java/org/jackhuang/hellominecraft/utils/views/wizard/modules/MergeMap.java +++ b/HMCLAPI/src/main/java/org/jackhuang/hellominecraft/util/ui/wizard/modules/MergeMap.java @@ -13,7 +13,7 @@ enclosed by brackets [] replaced by your own identifying information: * * Created on February 22, 2005, 4:06 PM */ -package org.jackhuang.hellominecraft.utils.views.wizard.modules; +package org.jackhuang.hellominecraft.util.ui.wizard.modules; import java.util.ArrayList; import java.util.Collection; diff --git a/HMCLAPI/src/main/java/org/jackhuang/hellominecraft/utils/views/wizard/spi/BranchingWizard.java b/HMCLAPI/src/main/java/org/jackhuang/hellominecraft/util/ui/wizard/spi/BranchingWizard.java similarity index 99% rename from HMCLAPI/src/main/java/org/jackhuang/hellominecraft/utils/views/wizard/spi/BranchingWizard.java rename to HMCLAPI/src/main/java/org/jackhuang/hellominecraft/util/ui/wizard/spi/BranchingWizard.java index 27e5c2ee2..a79607d49 100644 --- a/HMCLAPI/src/main/java/org/jackhuang/hellominecraft/utils/views/wizard/spi/BranchingWizard.java +++ b/HMCLAPI/src/main/java/org/jackhuang/hellominecraft/util/ui/wizard/spi/BranchingWizard.java @@ -14,7 +14,7 @@ enclosed by brackets [] replaced by your own identifying information: * * Created on March 4, 2005, 10:56 PM */ -package org.jackhuang.hellominecraft.utils.views.wizard.spi; +package org.jackhuang.hellominecraft.util.ui.wizard.spi; import javax.swing.*; import java.util.Arrays; diff --git a/HMCLAPI/src/main/java/org/jackhuang/hellominecraft/utils/views/wizard/spi/DeferredWizardResult.java b/HMCLAPI/src/main/java/org/jackhuang/hellominecraft/util/ui/wizard/spi/DeferredWizardResult.java similarity index 96% rename from HMCLAPI/src/main/java/org/jackhuang/hellominecraft/utils/views/wizard/spi/DeferredWizardResult.java rename to HMCLAPI/src/main/java/org/jackhuang/hellominecraft/util/ui/wizard/spi/DeferredWizardResult.java index 286cd4131..5957c894a 100644 --- a/HMCLAPI/src/main/java/org/jackhuang/hellominecraft/utils/views/wizard/spi/DeferredWizardResult.java +++ b/HMCLAPI/src/main/java/org/jackhuang/hellominecraft/util/ui/wizard/spi/DeferredWizardResult.java @@ -17,7 +17,7 @@ enclosed by brackets [] replaced by your own identifying information: * To change this template, choose Tools | Template Manager * and open the template in the editor. */ -package org.jackhuang.hellominecraft.utils.views.wizard.spi; +package org.jackhuang.hellominecraft.util.ui.wizard.spi; import java.util.Map; @@ -30,7 +30,7 @@ import java.util.Map; * creating files on disk), and a progress bar should be shown until the work * is completed. * - * @see org.jackhuang.hellominecraft.utils.views.wizard.spi.ResultProgressHandle + * @see org.jackhuang.hellominecraft.util.ui.wizard.spi.ResultProgressHandle * * @author Tim Boudreau */ diff --git a/HMCLAPI/src/main/java/org/jackhuang/hellominecraft/utils/views/wizard/spi/GenericListener.java b/HMCLAPI/src/main/java/org/jackhuang/hellominecraft/util/ui/wizard/spi/GenericListener.java similarity index 99% rename from HMCLAPI/src/main/java/org/jackhuang/hellominecraft/utils/views/wizard/spi/GenericListener.java rename to HMCLAPI/src/main/java/org/jackhuang/hellominecraft/util/ui/wizard/spi/GenericListener.java index a120fcb4b..b4f51f85d 100644 --- a/HMCLAPI/src/main/java/org/jackhuang/hellominecraft/utils/views/wizard/spi/GenericListener.java +++ b/HMCLAPI/src/main/java/org/jackhuang/hellominecraft/util/ui/wizard/spi/GenericListener.java @@ -14,7 +14,7 @@ enclosed by brackets [] replaced by your own identifying information: * * Created on October 5, 2004, 12:36 AM */ -package org.jackhuang.hellominecraft.utils.views.wizard.spi; +package org.jackhuang.hellominecraft.util.ui.wizard.spi; import java.awt.Component; import java.awt.Container; diff --git a/HMCLAPI/src/main/java/org/jackhuang/hellominecraft/utils/views/wizard/spi/ResultProgressHandle.java b/HMCLAPI/src/main/java/org/jackhuang/hellominecraft/util/ui/wizard/spi/ResultProgressHandle.java similarity index 98% rename from HMCLAPI/src/main/java/org/jackhuang/hellominecraft/utils/views/wizard/spi/ResultProgressHandle.java rename to HMCLAPI/src/main/java/org/jackhuang/hellominecraft/util/ui/wizard/spi/ResultProgressHandle.java index b5afb105c..792fc13b8 100644 --- a/HMCLAPI/src/main/java/org/jackhuang/hellominecraft/utils/views/wizard/spi/ResultProgressHandle.java +++ b/HMCLAPI/src/main/java/org/jackhuang/hellominecraft/util/ui/wizard/spi/ResultProgressHandle.java @@ -1,4 +1,4 @@ -package org.jackhuang.hellominecraft.utils.views.wizard.spi; +package org.jackhuang.hellominecraft.util.ui.wizard.spi; import java.awt.Container; diff --git a/HMCLAPI/src/main/java/org/jackhuang/hellominecraft/utils/views/wizard/spi/SimpleWizard.java b/HMCLAPI/src/main/java/org/jackhuang/hellominecraft/util/ui/wizard/spi/SimpleWizard.java similarity index 99% rename from HMCLAPI/src/main/java/org/jackhuang/hellominecraft/utils/views/wizard/spi/SimpleWizard.java rename to HMCLAPI/src/main/java/org/jackhuang/hellominecraft/util/ui/wizard/spi/SimpleWizard.java index 86982a26e..e6c0f0379 100644 --- a/HMCLAPI/src/main/java/org/jackhuang/hellominecraft/utils/views/wizard/spi/SimpleWizard.java +++ b/HMCLAPI/src/main/java/org/jackhuang/hellominecraft/util/ui/wizard/spi/SimpleWizard.java @@ -15,7 +15,7 @@ * * Created on February 22, 2005, 2:33 PM */ -package org.jackhuang.hellominecraft.utils.views.wizard.spi; +package org.jackhuang.hellominecraft.util.ui.wizard.spi; import java.util.Arrays; import java.util.Collections; diff --git a/HMCLAPI/src/main/java/org/jackhuang/hellominecraft/utils/views/wizard/spi/SimpleWizardInfo.java b/HMCLAPI/src/main/java/org/jackhuang/hellominecraft/util/ui/wizard/spi/SimpleWizardInfo.java similarity index 99% rename from HMCLAPI/src/main/java/org/jackhuang/hellominecraft/utils/views/wizard/spi/SimpleWizardInfo.java rename to HMCLAPI/src/main/java/org/jackhuang/hellominecraft/util/ui/wizard/spi/SimpleWizardInfo.java index 6a2d39584..b02359885 100644 --- a/HMCLAPI/src/main/java/org/jackhuang/hellominecraft/utils/views/wizard/spi/SimpleWizardInfo.java +++ b/HMCLAPI/src/main/java/org/jackhuang/hellominecraft/util/ui/wizard/spi/SimpleWizardInfo.java @@ -16,7 +16,7 @@ * * Created on March 4, 2005, 9:46 PM */ -package org.jackhuang.hellominecraft.utils.views.wizard.spi; +package org.jackhuang.hellominecraft.util.ui.wizard.spi; import java.awt.Color; import java.io.ByteArrayOutputStream; diff --git a/HMCLAPI/src/main/java/org/jackhuang/hellominecraft/utils/views/wizard/spi/Summary.java b/HMCLAPI/src/main/java/org/jackhuang/hellominecraft/util/ui/wizard/spi/Summary.java similarity index 98% rename from HMCLAPI/src/main/java/org/jackhuang/hellominecraft/utils/views/wizard/spi/Summary.java rename to HMCLAPI/src/main/java/org/jackhuang/hellominecraft/util/ui/wizard/spi/Summary.java index 0106ca346..9b31872a5 100644 --- a/HMCLAPI/src/main/java/org/jackhuang/hellominecraft/utils/views/wizard/spi/Summary.java +++ b/HMCLAPI/src/main/java/org/jackhuang/hellominecraft/util/ui/wizard/spi/Summary.java @@ -16,7 +16,7 @@ enclosed by brackets [] replaced by your own identifying information: * To change this template, choose Tools | Template Manager * and open the template in the editor. */ -package org.jackhuang.hellominecraft.utils.views.wizard.spi; +package org.jackhuang.hellominecraft.util.ui.wizard.spi; import java.awt.Component; import java.awt.Font; diff --git a/HMCLAPI/src/main/java/org/jackhuang/hellominecraft/utils/views/wizard/spi/Util.java b/HMCLAPI/src/main/java/org/jackhuang/hellominecraft/util/ui/wizard/spi/Util.java similarity index 98% rename from HMCLAPI/src/main/java/org/jackhuang/hellominecraft/utils/views/wizard/spi/Util.java rename to HMCLAPI/src/main/java/org/jackhuang/hellominecraft/util/ui/wizard/spi/Util.java index 22761d4a7..19e591efe 100644 --- a/HMCLAPI/src/main/java/org/jackhuang/hellominecraft/utils/views/wizard/spi/Util.java +++ b/HMCLAPI/src/main/java/org/jackhuang/hellominecraft/util/ui/wizard/spi/Util.java @@ -2,7 +2,7 @@ * To change this template, choose Tools | Templates * and open the template in the editor. */ -package org.jackhuang.hellominecraft.utils.views.wizard.spi; +package org.jackhuang.hellominecraft.util.ui.wizard.spi; import java.lang.reflect.InvocationTargetException; import java.lang.reflect.Method; diff --git a/HMCLAPI/src/main/java/org/jackhuang/hellominecraft/utils/views/wizard/spi/Wizard.java b/HMCLAPI/src/main/java/org/jackhuang/hellominecraft/util/ui/wizard/spi/Wizard.java similarity index 98% rename from HMCLAPI/src/main/java/org/jackhuang/hellominecraft/utils/views/wizard/spi/Wizard.java rename to HMCLAPI/src/main/java/org/jackhuang/hellominecraft/util/ui/wizard/spi/Wizard.java index be25251e2..7f4e76e8d 100644 --- a/HMCLAPI/src/main/java/org/jackhuang/hellominecraft/utils/views/wizard/spi/Wizard.java +++ b/HMCLAPI/src/main/java/org/jackhuang/hellominecraft/util/ui/wizard/spi/Wizard.java @@ -8,7 +8,7 @@ and include the License file at http://www.netbeans.org/cddl.txt. If applicable, add the following below the CDDL Header, with the fields enclosed by brackets [] replaced by your own identifying information: "Portions Copyrighted [year] [name of copyright owner]" */ -package org.jackhuang.hellominecraft.utils.views.wizard.spi; +package org.jackhuang.hellominecraft.util.ui.wizard.spi; import java.awt.Rectangle; import java.util.Collections; @@ -17,7 +17,7 @@ import java.util.List; import java.util.Map; import javax.swing.Action; import javax.swing.JComponent; -import org.jackhuang.hellominecraft.utils.views.wizard.api.WizardDisplayer; +import org.jackhuang.hellominecraft.util.ui.wizard.api.WizardDisplayer; /** * Encapsulates the logic and state of a Wizard. A Wizard gathers information @@ -74,7 +74,7 @@ import org.jackhuang.hellominecraft.utils.views.wizard.api.WizardDisplayer; * of the three Wizards are ever actually created). * * - * @see org.jackhuang.hellominecraft.utils.views.wizard.api.WizardDisplayer + * @see org.jackhuang.hellominecraft.util.ui.wizard.api.WizardDisplayer * @see WizardPage * @see WizardPanelProvider * @see WizardBranchController diff --git a/HMCLAPI/src/main/java/org/jackhuang/hellominecraft/utils/views/wizard/spi/WizardBranchController.java b/HMCLAPI/src/main/java/org/jackhuang/hellominecraft/util/ui/wizard/spi/WizardBranchController.java similarity index 99% rename from HMCLAPI/src/main/java/org/jackhuang/hellominecraft/utils/views/wizard/spi/WizardBranchController.java rename to HMCLAPI/src/main/java/org/jackhuang/hellominecraft/util/ui/wizard/spi/WizardBranchController.java index f24a0c603..b6aff33c8 100644 --- a/HMCLAPI/src/main/java/org/jackhuang/hellominecraft/utils/views/wizard/spi/WizardBranchController.java +++ b/HMCLAPI/src/main/java/org/jackhuang/hellominecraft/util/ui/wizard/spi/WizardBranchController.java @@ -14,7 +14,7 @@ enclosed by brackets [] replaced by your own identifying information: * Created on March 5, 2005, 6:33 PM */ -package org.jackhuang.hellominecraft.utils.views.wizard.spi; +package org.jackhuang.hellominecraft.util.ui.wizard.spi; import java.util.Map; /** diff --git a/HMCLAPI/src/main/java/org/jackhuang/hellominecraft/utils/views/wizard/spi/WizardController.java b/HMCLAPI/src/main/java/org/jackhuang/hellominecraft/util/ui/wizard/spi/WizardController.java similarity index 98% rename from HMCLAPI/src/main/java/org/jackhuang/hellominecraft/utils/views/wizard/spi/WizardController.java rename to HMCLAPI/src/main/java/org/jackhuang/hellominecraft/util/ui/wizard/spi/WizardController.java index 7d5f06a35..ccc19c689 100644 --- a/HMCLAPI/src/main/java/org/jackhuang/hellominecraft/utils/views/wizard/spi/WizardController.java +++ b/HMCLAPI/src/main/java/org/jackhuang/hellominecraft/util/ui/wizard/spi/WizardController.java @@ -14,7 +14,7 @@ enclosed by brackets [] replaced by your own identifying information: * Created on March 5, 2005, 7:24 PM */ -package org.jackhuang.hellominecraft.utils.views.wizard.spi; +package org.jackhuang.hellominecraft.util.ui.wizard.spi; /** * Controller which can be used to modify the UI state of a wizard. Passed diff --git a/HMCLAPI/src/main/java/org/jackhuang/hellominecraft/utils/views/wizard/spi/WizardControllerImplementation.java b/HMCLAPI/src/main/java/org/jackhuang/hellominecraft/util/ui/wizard/spi/WizardControllerImplementation.java similarity index 98% rename from HMCLAPI/src/main/java/org/jackhuang/hellominecraft/utils/views/wizard/spi/WizardControllerImplementation.java rename to HMCLAPI/src/main/java/org/jackhuang/hellominecraft/util/ui/wizard/spi/WizardControllerImplementation.java index a873a0f5a..530d6134b 100644 --- a/HMCLAPI/src/main/java/org/jackhuang/hellominecraft/utils/views/wizard/spi/WizardControllerImplementation.java +++ b/HMCLAPI/src/main/java/org/jackhuang/hellominecraft/util/ui/wizard/spi/WizardControllerImplementation.java @@ -9,7 +9,7 @@ If applicable, add the following below the CDDL Header, with the fields enclosed by brackets [] replaced by your own identifying information: "Portions Copyrighted [year] [name of copyright owner]" */ -package org.jackhuang.hellominecraft.utils.views.wizard.spi; +package org.jackhuang.hellominecraft.util.ui.wizard.spi; /** * Internal, non-public SPI for wizard controller; allows the actual WizardController diff --git a/HMCLAPI/src/main/java/org/jackhuang/hellominecraft/utils/views/wizard/spi/WizardException.java b/HMCLAPI/src/main/java/org/jackhuang/hellominecraft/util/ui/wizard/spi/WizardException.java similarity index 96% rename from HMCLAPI/src/main/java/org/jackhuang/hellominecraft/utils/views/wizard/spi/WizardException.java rename to HMCLAPI/src/main/java/org/jackhuang/hellominecraft/util/ui/wizard/spi/WizardException.java index e66698d0f..f011a571d 100644 --- a/HMCLAPI/src/main/java/org/jackhuang/hellominecraft/utils/views/wizard/spi/WizardException.java +++ b/HMCLAPI/src/main/java/org/jackhuang/hellominecraft/util/ui/wizard/spi/WizardException.java @@ -14,7 +14,7 @@ enclosed by brackets [] replaced by your own identifying information: * Created on February 22, 2005, 3:56 PM */ -package org.jackhuang.hellominecraft.utils.views.wizard.spi; +package org.jackhuang.hellominecraft.util.ui.wizard.spi; /** * Some arguments a user enters in a wizard may be too expensive to validate diff --git a/HMCLAPI/src/main/java/org/jackhuang/hellominecraft/utils/views/wizard/spi/WizardImplementation.java b/HMCLAPI/src/main/java/org/jackhuang/hellominecraft/util/ui/wizard/spi/WizardImplementation.java similarity index 99% rename from HMCLAPI/src/main/java/org/jackhuang/hellominecraft/utils/views/wizard/spi/WizardImplementation.java rename to HMCLAPI/src/main/java/org/jackhuang/hellominecraft/util/ui/wizard/spi/WizardImplementation.java index d648e19c9..c810e34f6 100644 --- a/HMCLAPI/src/main/java/org/jackhuang/hellominecraft/utils/views/wizard/spi/WizardImplementation.java +++ b/HMCLAPI/src/main/java/org/jackhuang/hellominecraft/util/ui/wizard/spi/WizardImplementation.java @@ -14,7 +14,7 @@ enclosed by brackets [] replaced by your own identifying information: * Created on February 22, 2005, 2:18 PM */ -package org.jackhuang.hellominecraft.utils.views.wizard.spi; +package org.jackhuang.hellominecraft.util.ui.wizard.spi; import java.util.Map; import javax.swing.JComponent; diff --git a/HMCLAPI/src/main/java/org/jackhuang/hellominecraft/utils/views/wizard/spi/WizardObserver.java b/HMCLAPI/src/main/java/org/jackhuang/hellominecraft/util/ui/wizard/spi/WizardObserver.java similarity index 96% rename from HMCLAPI/src/main/java/org/jackhuang/hellominecraft/utils/views/wizard/spi/WizardObserver.java rename to HMCLAPI/src/main/java/org/jackhuang/hellominecraft/util/ui/wizard/spi/WizardObserver.java index 433f0a9a9..46094f8bc 100644 --- a/HMCLAPI/src/main/java/org/jackhuang/hellominecraft/utils/views/wizard/spi/WizardObserver.java +++ b/HMCLAPI/src/main/java/org/jackhuang/hellominecraft/util/ui/wizard/spi/WizardObserver.java @@ -8,7 +8,7 @@ and include the License file at http://www.netbeans.org/cddl.txt. If applicable, add the following below the CDDL Header, with the fields enclosed by brackets [] replaced by your own identifying information: "Portions Copyrighted [year] [name of copyright owner]" */ -package org.jackhuang.hellominecraft.utils.views.wizard.spi; +package org.jackhuang.hellominecraft.util.ui.wizard.spi; /** * Observer which can detect changes in the state of a wizard as the diff --git a/HMCLAPI/src/main/java/org/jackhuang/hellominecraft/utils/views/wizard/spi/WizardPage.java b/HMCLAPI/src/main/java/org/jackhuang/hellominecraft/util/ui/wizard/spi/WizardPage.java similarity index 99% rename from HMCLAPI/src/main/java/org/jackhuang/hellominecraft/utils/views/wizard/spi/WizardPage.java rename to HMCLAPI/src/main/java/org/jackhuang/hellominecraft/util/ui/wizard/spi/WizardPage.java index 179417d34..7cdd1937f 100644 --- a/HMCLAPI/src/main/java/org/jackhuang/hellominecraft/utils/views/wizard/spi/WizardPage.java +++ b/HMCLAPI/src/main/java/org/jackhuang/hellominecraft/util/ui/wizard/spi/WizardPage.java @@ -13,7 +13,7 @@ enclosed by brackets [] replaced by your own identifying information: * * Created on August 19, 2005, 9:11 PM */ -package org.jackhuang.hellominecraft.utils.views.wizard.spi; +package org.jackhuang.hellominecraft.util.ui.wizard.spi; import java.beans.Beans; import javax.swing.*; diff --git a/HMCLAPI/src/main/java/org/jackhuang/hellominecraft/utils/views/wizard/spi/WizardPanel.java b/HMCLAPI/src/main/java/org/jackhuang/hellominecraft/util/ui/wizard/spi/WizardPanel.java similarity index 98% rename from HMCLAPI/src/main/java/org/jackhuang/hellominecraft/utils/views/wizard/spi/WizardPanel.java rename to HMCLAPI/src/main/java/org/jackhuang/hellominecraft/util/ui/wizard/spi/WizardPanel.java index d40a74058..86afd2ec8 100644 --- a/HMCLAPI/src/main/java/org/jackhuang/hellominecraft/utils/views/wizard/spi/WizardPanel.java +++ b/HMCLAPI/src/main/java/org/jackhuang/hellominecraft/util/ui/wizard/spi/WizardPanel.java @@ -6,7 +6,7 @@ or http://www.netbeans.org/cddl.txt. When distributing Covered Code, include this CDDL Header Notice in each file and include the License file at http://www.netbeans.org/cddl.txt. */ -package org.jackhuang.hellominecraft.utils.views.wizard.spi; +package org.jackhuang.hellominecraft.util.ui.wizard.spi; import java.util.Map; diff --git a/HMCLAPI/src/main/java/org/jackhuang/hellominecraft/utils/views/wizard/spi/WizardPanelNavResult.java b/HMCLAPI/src/main/java/org/jackhuang/hellominecraft/util/ui/wizard/spi/WizardPanelNavResult.java similarity index 97% rename from HMCLAPI/src/main/java/org/jackhuang/hellominecraft/utils/views/wizard/spi/WizardPanelNavResult.java rename to HMCLAPI/src/main/java/org/jackhuang/hellominecraft/util/ui/wizard/spi/WizardPanelNavResult.java index 8577272b8..f5e08c3c9 100644 --- a/HMCLAPI/src/main/java/org/jackhuang/hellominecraft/utils/views/wizard/spi/WizardPanelNavResult.java +++ b/HMCLAPI/src/main/java/org/jackhuang/hellominecraft/util/ui/wizard/spi/WizardPanelNavResult.java @@ -6,7 +6,7 @@ or http://www.netbeans.org/cddl.txt. When distributing Covered Code, include this CDDL Header Notice in each file and include the License file at http://www.netbeans.org/cddl.txt. */ -package org.jackhuang.hellominecraft.utils.views.wizard.spi; +package org.jackhuang.hellominecraft.util.ui.wizard.spi; import java.util.Map; diff --git a/HMCLAPI/src/main/java/org/jackhuang/hellominecraft/utils/views/wizard/spi/WizardPanelProvider.java b/HMCLAPI/src/main/java/org/jackhuang/hellominecraft/util/ui/wizard/spi/WizardPanelProvider.java similarity index 99% rename from HMCLAPI/src/main/java/org/jackhuang/hellominecraft/utils/views/wizard/spi/WizardPanelProvider.java rename to HMCLAPI/src/main/java/org/jackhuang/hellominecraft/util/ui/wizard/spi/WizardPanelProvider.java index 2b08022d3..88dd4e8b5 100644 --- a/HMCLAPI/src/main/java/org/jackhuang/hellominecraft/utils/views/wizard/spi/WizardPanelProvider.java +++ b/HMCLAPI/src/main/java/org/jackhuang/hellominecraft/util/ui/wizard/spi/WizardPanelProvider.java @@ -14,7 +14,7 @@ enclosed by brackets [] replaced by your own identifying information: * Created on March 5, 2005, 7:25 PM */ -package org.jackhuang.hellominecraft.utils.views.wizard.spi; +package org.jackhuang.hellominecraft.util.ui.wizard.spi; import java.util.Arrays; import java.util.HashSet; diff --git a/HMCLAPI/src/main/java/org/jackhuang/hellominecraft/utils/version/MinecraftRemoteLatestVersion.java b/HMCLAPI/src/main/java/org/jackhuang/hellominecraft/util/version/MinecraftRemoteLatestVersion.java similarity index 94% rename from HMCLAPI/src/main/java/org/jackhuang/hellominecraft/utils/version/MinecraftRemoteLatestVersion.java rename to HMCLAPI/src/main/java/org/jackhuang/hellominecraft/util/version/MinecraftRemoteLatestVersion.java index 4c1ef29b4..1eed84e26 100755 --- a/HMCLAPI/src/main/java/org/jackhuang/hellominecraft/utils/version/MinecraftRemoteLatestVersion.java +++ b/HMCLAPI/src/main/java/org/jackhuang/hellominecraft/util/version/MinecraftRemoteLatestVersion.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.utils.version; +package org.jackhuang.hellominecraft.util.version; /** * diff --git a/HMCLAPI/src/main/java/org/jackhuang/hellominecraft/utils/version/MinecraftRemoteVersion.java b/HMCLAPI/src/main/java/org/jackhuang/hellominecraft/util/version/MinecraftRemoteVersion.java similarity index 94% rename from HMCLAPI/src/main/java/org/jackhuang/hellominecraft/utils/version/MinecraftRemoteVersion.java rename to HMCLAPI/src/main/java/org/jackhuang/hellominecraft/util/version/MinecraftRemoteVersion.java index a94ae48f3..f10b02c20 100755 --- a/HMCLAPI/src/main/java/org/jackhuang/hellominecraft/utils/version/MinecraftRemoteVersion.java +++ b/HMCLAPI/src/main/java/org/jackhuang/hellominecraft/util/version/MinecraftRemoteVersion.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.utils.version; +package org.jackhuang.hellominecraft.util.version; /** * diff --git a/HMCLAPI/src/main/java/org/jackhuang/hellominecraft/utils/version/MinecraftRemoteVersions.java b/HMCLAPI/src/main/java/org/jackhuang/hellominecraft/util/version/MinecraftRemoteVersions.java similarity index 94% rename from HMCLAPI/src/main/java/org/jackhuang/hellominecraft/utils/version/MinecraftRemoteVersions.java rename to HMCLAPI/src/main/java/org/jackhuang/hellominecraft/util/version/MinecraftRemoteVersions.java index 72cb94f24..81a9e075f 100755 --- a/HMCLAPI/src/main/java/org/jackhuang/hellominecraft/utils/version/MinecraftRemoteVersions.java +++ b/HMCLAPI/src/main/java/org/jackhuang/hellominecraft/util/version/MinecraftRemoteVersions.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.utils.version; +package org.jackhuang.hellominecraft.util.version; import java.util.ArrayList; diff --git a/HMCLAPI/src/main/java/org/jackhuang/hellominecraft/utils/version/MinecraftVersionRequest.java b/HMCLAPI/src/main/java/org/jackhuang/hellominecraft/util/version/MinecraftVersionRequest.java similarity index 96% rename from HMCLAPI/src/main/java/org/jackhuang/hellominecraft/utils/version/MinecraftVersionRequest.java rename to HMCLAPI/src/main/java/org/jackhuang/hellominecraft/util/version/MinecraftVersionRequest.java index 0f4eedcc3..8aeae8596 100755 --- a/HMCLAPI/src/main/java/org/jackhuang/hellominecraft/utils/version/MinecraftVersionRequest.java +++ b/HMCLAPI/src/main/java/org/jackhuang/hellominecraft/util/version/MinecraftVersionRequest.java @@ -15,16 +15,16 @@ * 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.utils.version; +package org.jackhuang.hellominecraft.util.version; import java.io.File; import java.io.IOException; import java.util.zip.ZipEntry; import java.util.zip.ZipFile; -import org.jackhuang.hellominecraft.utils.C; -import org.jackhuang.hellominecraft.utils.logging.HMCLog; -import org.jackhuang.hellominecraft.utils.ArrayUtils; -import org.jackhuang.hellominecraft.utils.NetUtils; +import org.jackhuang.hellominecraft.util.C; +import org.jackhuang.hellominecraft.util.logging.HMCLog; +import org.jackhuang.hellominecraft.util.ArrayUtils; +import org.jackhuang.hellominecraft.util.NetUtils; /** * @author huangyuhui 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 deleted file mode 100755 index d2cacac63..000000000 --- a/HMCLServer/src/main/java/org.jackhuang.hellominecraft.launcher/servers/ServerPlugin.java +++ /dev/null @@ -1,96 +0,0 @@ -/* - * Hello Minecraft! Launcher. - * Copyright (C) 2013 huangyuhui - * - * This program is free software: you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation, either version 3 of the License, or - * (at your option) any later version. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. - * - * 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.servers; - -import org.jackhuang.hellominecraft.launcher.api.IPlugin; -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.Settings; -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.settings.Profile; -import org.jackhuang.hellominecraft.launcher.views.MainFrame; -import org.jackhuang.hellominecraft.launcher.views.ServerListView; -import org.jackhuang.hellominecraft.utils.functions.Consumer; -import org.jackhuang.hellominecraft.utils.views.Selector; - -/** - * - * @author huangyuhui - */ -public class ServerPlugin implements IPlugin { - - protected static YggdrasilAuthenticator YGGDRASIL_LOGIN; - protected static MFCraftAuthenticator MFCRAFT_LOGIN; - - @Override - public IMinecraftService provideMinecraftService(Profile profile) { - return new MFCraftMinecraftService(profile); - } - - @Override - public void onRegisterAuthenticators(Consumer apply) { - String clientToken = Settings.getInstance().getClientToken(); - MFCRAFT_LOGIN = new MFCraftAuthenticator(clientToken); - MFCRAFT_LOGIN.onLoadSettings(Settings.getInstance().getAuthenticatorConfig(MFCRAFT_LOGIN.id())); - YGGDRASIL_LOGIN = new YggdrasilAuthenticator(clientToken); - YGGDRASIL_LOGIN.onLoadSettings(Settings.getInstance().getAuthenticatorConfig(YGGDRASIL_LOGIN.id())); - Runtime.getRuntime().addShutdownHook(new Thread(() -> { - Settings.getInstance().setAuthenticatorConfig(MFCRAFT_LOGIN.id(), MFCRAFT_LOGIN.onSaveSettings()); - Settings.getInstance().setAuthenticatorConfig(YGGDRASIL_LOGIN.id(), YGGDRASIL_LOGIN.onSaveSettings()); - })); - apply.accept(MFCRAFT_LOGIN); - apply.accept(YGGDRASIL_LOGIN); - } - - @Override - public void showUI() { - MainFrame.showMainFrame(); - } - - public static ServerInfo lastServerInfo; - - @Override - public void onProcessingLoginResult(UserProfileProvider result) throws AuthenticationException { - Servers s = Servers.getInstance(); - String[] sel = new String[s.areas.size()]; - for (int i = 0; i < sel.length; i++) - sel[i] = s.areas.get(i).name; - Selector selector = new Selector(null, sel, "选择你要登录的服务器大区"); - int ind = selector.getChoice(); - for (ServerInfo si : s.areas.get(ind).servers) - si.downloadIcon(); - ServerListView slv = new ServerListView(s.areas.get(ind).servers.toArray(new ServerInfo[0])); - int c = slv.getChoice(); - if (c == -1) - throw new AuthenticationException("未选择服务器"); - lastServerInfo = s.areas.get(ind).servers.get(ind); - result.setServer(lastServerInfo); - } - - @Override - public void onInitializingProfile(Profile p) { - p.initialize(1); - } - -} 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 deleted file mode 100755 index 296f54760..000000000 --- a/HMCLServer/src/main/java/org.jackhuang.hellominecraft.launcher/servers/mfcraft/CheckModsMinecraftProvider.java +++ /dev/null @@ -1,52 +0,0 @@ -/* - * Hello Minecraft! Launcher. - * Copyright (C) 2013 huangyuhui - * - * This program is free software: you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation, either version 3 of the License, or - * (at your option) any later version. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. - * - * 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.servers.mfcraft; - -import java.io.IOException; -import org.jackhuang.hellominecraft.utils.logging.HMCLog; -import org.jackhuang.hellominecraft.launcher.core.service.IMinecraftService; -import org.jackhuang.hellominecraft.launcher.servers.ServerPlugin; -import org.jackhuang.hellominecraft.launcher.core.mod.MinecraftModService; -import org.jackhuang.hellominecraft.launcher.core.version.MinecraftVersionManager; -import org.jackhuang.hellominecraft.launcher.utils.DefaultMinecraftService; -import org.jackhuang.hellominecraft.utils.ArrayUtils; - -/** - * - * @author huangyuhui - */ -public class CheckModsMinecraftProvider extends MinecraftVersionManager { - - public CheckModsMinecraftProvider(IMinecraftService p) { - super(p); - } - - @Override - public boolean onLaunch() { - try { - super.onLaunch(); - String[] md5s = ((MinecraftModService) service.mod()).checkMd5s(((DefaultMinecraftService) service).getProfile().getSelectedVersion()); - String[] md5 = ServerPlugin.lastServerInfo.md5; - return ArrayUtils.equals(md5s, md5); - } catch (IOException ex) { - HMCLog.err("Failed to check md5"); - return false; - } - - } -} 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 deleted file mode 100755 index 9a42224e8..000000000 --- a/HMCLServer/src/main/java/org.jackhuang.hellominecraft.launcher/servers/mfcraft/MFCraftAuthenticator.java +++ /dev/null @@ -1,80 +0,0 @@ -/* - * Hello Minecraft! Launcher. - * Copyright (C) 2013 huangyuhui - * - * This program is free software: you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation, either version 3 of the License, or - * (at your option) any later version. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. - * - * 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.servers.mfcraft; - -import com.google.gson.JsonSyntaxException; -import java.io.IOException; -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.C; -import org.jackhuang.hellominecraft.utils.NetUtils; - -/** - * - * @author huangyuhui - */ -public class MFCraftAuthenticator extends IAuthenticator { - - public MFCraftAuthenticator(String clientToken) { - super(clientToken); - } - - @Override - public UserProfileProvider login(LoginInfo info) throws AuthenticationException { - try { - UserProfileProvider result = new UserProfileProvider(); - String url = String.format("http://zh.mfcraft.cn/index.php?c=user_public&a=clientlogin&user=%s&pass=%s", info.username, info.password); - String response = NetUtils.get(url); - if (response.contains("error")) - throw new AuthenticationException(C.i18n("login.wrong_password")); - result.setUserName(info.username); - String uuid = getUUIDFromUserName(info.username); - result.setSession(uuid); - result.setUserId(uuid); - result.setAccessToken(uuid); - result.setUserType("Legacy"); - return result; - } catch (IOException | JsonSyntaxException ex) { - throw new AuthenticationException(C.i18n("login.failed.connect_authentication_server"), ex); - } - - } - - @Override - public String id() { - return "mfcraft"; - } - - @Override - public String getName() { - return "MFCraft"; - } - - @Override - public UserProfileProvider loginBySettings() throws AuthenticationException { - return null; - } - - @Override - public void logout() { - } - -} 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 deleted file mode 100755 index 037ed4de2..000000000 --- a/HMCLServer/src/main/java/org.jackhuang.hellominecraft.launcher/servers/mfcraft/ServerArea.java +++ /dev/null @@ -1,31 +0,0 @@ -/* - * Hello Minecraft! Launcher. - * Copyright (C) 2013 huangyuhui - * - * This program is free software: you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation, either version 3 of the License, or - * (at your option) any later version. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. - * - * 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.servers.mfcraft; - -import java.util.ArrayList; -import org.jackhuang.hellominecraft.launcher.core.version.ServerInfo; - -/** - * - * @author huangyuhui - */ -public class ServerArea { - - public String name; - public ArrayList servers; -} diff --git a/HMCLServer/src/main/java/org.jackhuang.hellominecraft.launcher/servers/mfcraft/Servers.java b/HMCLServer/src/main/java/org.jackhuang.hellominecraft.launcher/servers/mfcraft/Servers.java deleted file mode 100755 index 60d4fda5c..000000000 --- a/HMCLServer/src/main/java/org.jackhuang.hellominecraft.launcher/servers/mfcraft/Servers.java +++ /dev/null @@ -1,48 +0,0 @@ -/* - * Hello Minecraft! Launcher. - * Copyright (C) 2013 huangyuhui - * - * This program is free software: you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation, either version 3 of the License, or - * (at your option) any later version. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. - * - * 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.servers.mfcraft; - -import java.io.IOException; -import java.util.ArrayList; -import org.jackhuang.hellominecraft.utils.C; -import org.jackhuang.hellominecraft.utils.NetUtils; -import org.jackhuang.hellominecraft.utils.logging.HMCLog; - -/** - * - * @author huangyuhui - */ -public class Servers { - - public static Servers instance; - - public static Servers getInstance() { - if (instance == null) { - String servers = null; - try { - servers = NetUtils.get("http://zh.mfcraft.cn/View/servers.php"); - instance = C.gson.fromJson(servers, Servers.class); - } catch (IOException ex) { - HMCLog.err("Failed to get servers"); - } - } - return instance; - } - - public ArrayList areas; -} diff --git a/HMCSM/src/main/java/org/jackhuang/hellominecraft/svrmgr/Main.java b/HMCSM/src/main/java/org/jackhuang/hellominecraft/svrmgr/Main.java index 6e6ba63df..73579c595 100755 --- a/HMCSM/src/main/java/org/jackhuang/hellominecraft/svrmgr/Main.java +++ b/HMCSM/src/main/java/org/jackhuang/hellominecraft/svrmgr/Main.java @@ -23,14 +23,14 @@ import java.io.StringWriter; import java.text.ParseException; import javax.swing.UIManager; import javax.swing.UnsupportedLookAndFeelException; -import org.jackhuang.hellominecraft.utils.logging.HMCLog; -import org.jackhuang.hellominecraft.utils.views.LogWindow; +import org.jackhuang.hellominecraft.util.logging.HMCLog; +import org.jackhuang.hellominecraft.util.ui.LogWindow; import org.jackhuang.hellominecraft.svrmgr.settings.SettingsManager; -import org.jackhuang.hellominecraft.utils.UpdateChecker; +import org.jackhuang.hellominecraft.util.UpdateChecker; import org.jackhuang.hellominecraft.svrmgr.views.MainWindow; -import org.jackhuang.hellominecraft.utils.VersionNumber; +import org.jackhuang.hellominecraft.util.VersionNumber; import org.jackhuang.hellominecraft.lookandfeel.HelloMinecraftLookAndFeel; -import org.jackhuang.hellominecraft.utils.MessageBox; +import org.jackhuang.hellominecraft.util.MessageBox; /** * diff --git a/HMCSM/src/main/java/org/jackhuang/hellominecraft/svrmgr/cbplugins/PluginManager.java b/HMCSM/src/main/java/org/jackhuang/hellominecraft/svrmgr/cbplugins/PluginManager.java index 02cfbc2c0..06d156271 100755 --- a/HMCSM/src/main/java/org/jackhuang/hellominecraft/svrmgr/cbplugins/PluginManager.java +++ b/HMCSM/src/main/java/org/jackhuang/hellominecraft/svrmgr/cbplugins/PluginManager.java @@ -27,8 +27,8 @@ import java.util.logging.Logger; import java.util.zip.ZipEntry; import java.util.zip.ZipFile; import org.ho.yaml.Yaml; -import org.jackhuang.hellominecraft.utils.NetUtils; -import org.jackhuang.hellominecraft.utils.StrUtils; +import org.jackhuang.hellominecraft.util.NetUtils; +import org.jackhuang.hellominecraft.util.StrUtils; /** * diff --git a/HMCSM/src/main/java/org/jackhuang/hellominecraft/svrmgr/installer/bukkit/BukkitFormatThread.java b/HMCSM/src/main/java/org/jackhuang/hellominecraft/svrmgr/installer/bukkit/BukkitFormatThread.java index 0eb485d89..6518a3017 100755 --- a/HMCSM/src/main/java/org/jackhuang/hellominecraft/svrmgr/installer/bukkit/BukkitFormatThread.java +++ b/HMCSM/src/main/java/org/jackhuang/hellominecraft/svrmgr/installer/bukkit/BukkitFormatThread.java @@ -20,8 +20,8 @@ package org.jackhuang.hellominecraft.svrmgr.installer.bukkit; import java.io.IOException; import java.util.ArrayList; import java.util.List; -import org.jackhuang.hellominecraft.utils.logging.HMCLog; -import org.jackhuang.hellominecraft.utils.functions.Consumer; +import org.jackhuang.hellominecraft.util.logging.HMCLog; +import org.jackhuang.hellominecraft.util.func.Consumer; import org.jsoup.Jsoup; import org.jsoup.nodes.Document; import org.jsoup.nodes.Element; diff --git a/HMCSM/src/main/java/org/jackhuang/hellominecraft/svrmgr/installer/cauldron/ForgeFormatThread.java b/HMCSM/src/main/java/org/jackhuang/hellominecraft/svrmgr/installer/cauldron/ForgeFormatThread.java index 3b41f4bc9..02361e77b 100755 --- a/HMCSM/src/main/java/org/jackhuang/hellominecraft/svrmgr/installer/cauldron/ForgeFormatThread.java +++ b/HMCSM/src/main/java/org/jackhuang/hellominecraft/svrmgr/installer/cauldron/ForgeFormatThread.java @@ -22,8 +22,8 @@ import java.util.ArrayList; import java.util.HashMap; import java.util.List; import java.util.Map; -import org.jackhuang.hellominecraft.utils.functions.Consumer; -import org.jackhuang.hellominecraft.utils.logging.HMCLog; +import org.jackhuang.hellominecraft.util.func.Consumer; +import org.jackhuang.hellominecraft.util.logging.HMCLog; import org.jsoup.Jsoup; import org.jsoup.nodes.Document; import org.jsoup.nodes.Element; diff --git a/HMCSM/src/main/java/org/jackhuang/hellominecraft/svrmgr/installer/cauldron/ForgeInstaller.java b/HMCSM/src/main/java/org/jackhuang/hellominecraft/svrmgr/installer/cauldron/ForgeInstaller.java index 24d8125c3..24779f6a2 100755 --- a/HMCSM/src/main/java/org/jackhuang/hellominecraft/svrmgr/installer/cauldron/ForgeInstaller.java +++ b/HMCSM/src/main/java/org/jackhuang/hellominecraft/svrmgr/installer/cauldron/ForgeInstaller.java @@ -36,15 +36,15 @@ import java.util.jar.Pack200; import java.util.zip.ZipEntry; import java.util.zip.ZipFile; import javax.swing.JOptionPane; -import org.jackhuang.hellominecraft.utils.logging.HMCLog; -import org.jackhuang.hellominecraft.utils.code.DigestUtils; -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.NetUtils; -import org.jackhuang.hellominecraft.utils.StrUtils; -import org.jackhuang.hellominecraft.utils.tasks.TaskWindow; -import org.jackhuang.hellominecraft.utils.tasks.download.FileDownloadTask; +import org.jackhuang.hellominecraft.util.logging.HMCLog; +import org.jackhuang.hellominecraft.util.code.DigestUtils; +import org.jackhuang.hellominecraft.util.system.FileUtils; +import org.jackhuang.hellominecraft.util.system.IOUtils; +import org.jackhuang.hellominecraft.util.MessageBox; +import org.jackhuang.hellominecraft.util.NetUtils; +import org.jackhuang.hellominecraft.util.StrUtils; +import org.jackhuang.hellominecraft.util.tasks.TaskWindow; +import org.jackhuang.hellominecraft.util.tasks.download.FileDownloadTask; import org.tukaani.xz.XZInputStream; /** diff --git a/HMCSM/src/main/java/org/jackhuang/hellominecraft/svrmgr/server/Server.java b/HMCSM/src/main/java/org/jackhuang/hellominecraft/svrmgr/server/Server.java index 6e279da0a..20ed5c1e8 100755 --- a/HMCSM/src/main/java/org/jackhuang/hellominecraft/svrmgr/server/Server.java +++ b/HMCSM/src/main/java/org/jackhuang/hellominecraft/svrmgr/server/Server.java @@ -35,19 +35,19 @@ import java.util.logging.Level; import java.util.logging.Logger; import java.util.regex.Matcher; import java.util.regex.Pattern; -import org.jackhuang.hellominecraft.utils.logging.HMCLog; -import org.jackhuang.hellominecraft.utils.system.IOUtils; -import org.jackhuang.hellominecraft.utils.MessageBox; -import org.jackhuang.hellominecraft.utils.Pair; -import org.jackhuang.hellominecraft.utils.StrUtils; +import org.jackhuang.hellominecraft.util.logging.HMCLog; +import org.jackhuang.hellominecraft.util.system.IOUtils; +import org.jackhuang.hellominecraft.util.MessageBox; +import org.jackhuang.hellominecraft.util.Pair; +import org.jackhuang.hellominecraft.util.StrUtils; import org.jackhuang.hellominecraft.svrmgr.settings.Schedule; import org.jackhuang.hellominecraft.svrmgr.settings.SettingsManager; import org.jackhuang.hellominecraft.svrmgr.threads.MonitorThread; import org.jackhuang.hellominecraft.svrmgr.threads.WaitForThread; import org.jackhuang.hellominecraft.svrmgr.utils.Utilities; -import org.jackhuang.hellominecraft.utils.Event; -import org.jackhuang.hellominecraft.utils.EventHandler; -import org.jackhuang.hellominecraft.utils.functions.Consumer; +import org.jackhuang.hellominecraft.util.Event; +import org.jackhuang.hellominecraft.util.EventHandler; +import org.jackhuang.hellominecraft.util.func.Consumer; /** * diff --git a/HMCSM/src/main/java/org/jackhuang/hellominecraft/svrmgr/server/ServerChecker.java b/HMCSM/src/main/java/org/jackhuang/hellominecraft/svrmgr/server/ServerChecker.java index 74fefe23c..27809b8c4 100755 --- a/HMCSM/src/main/java/org/jackhuang/hellominecraft/svrmgr/server/ServerChecker.java +++ b/HMCSM/src/main/java/org/jackhuang/hellominecraft/svrmgr/server/ServerChecker.java @@ -20,7 +20,7 @@ package org.jackhuang.hellominecraft.svrmgr.server; import java.io.File; import java.io.IOException; import java.util.zip.ZipFile; -import org.jackhuang.hellominecraft.utils.logging.HMCLog; +import org.jackhuang.hellominecraft.util.logging.HMCLog; /** * diff --git a/HMCSM/src/main/java/org/jackhuang/hellominecraft/svrmgr/server/backups/BackupManager.java b/HMCSM/src/main/java/org/jackhuang/hellominecraft/svrmgr/server/backups/BackupManager.java index 37be64938..13a94b656 100755 --- a/HMCSM/src/main/java/org/jackhuang/hellominecraft/svrmgr/server/backups/BackupManager.java +++ b/HMCSM/src/main/java/org/jackhuang/hellominecraft/svrmgr/server/backups/BackupManager.java @@ -22,12 +22,12 @@ import java.io.IOException; import java.text.SimpleDateFormat; import java.util.ArrayList; import java.util.Date; -import org.jackhuang.hellominecraft.utils.logging.HMCLog; -import org.jackhuang.hellominecraft.utils.system.Compressor; +import org.jackhuang.hellominecraft.util.logging.HMCLog; +import org.jackhuang.hellominecraft.util.system.Compressor; import org.jackhuang.hellominecraft.svrmgr.settings.SettingsManager; import org.jackhuang.hellominecraft.svrmgr.utils.Utilities; -import org.jackhuang.hellominecraft.utils.system.FileUtils; -import org.jackhuang.hellominecraft.utils.system.IOUtils; +import org.jackhuang.hellominecraft.util.system.FileUtils; +import org.jackhuang.hellominecraft.util.system.IOUtils; /** * diff --git a/HMCSM/src/main/java/org/jackhuang/hellominecraft/svrmgr/server/schedules/AutoExecuteSchedule.java b/HMCSM/src/main/java/org/jackhuang/hellominecraft/svrmgr/server/schedules/AutoExecuteSchedule.java index 345f3057c..7d3ce2076 100755 --- a/HMCSM/src/main/java/org/jackhuang/hellominecraft/svrmgr/server/schedules/AutoExecuteSchedule.java +++ b/HMCSM/src/main/java/org/jackhuang/hellominecraft/svrmgr/server/schedules/AutoExecuteSchedule.java @@ -19,7 +19,7 @@ package org.jackhuang.hellominecraft.svrmgr.server.schedules; import java.io.IOException; import java.util.TimerTask; -import org.jackhuang.hellominecraft.utils.logging.HMCLog; +import org.jackhuang.hellominecraft.util.logging.HMCLog; import org.jackhuang.hellominecraft.svrmgr.server.Server; import org.jackhuang.hellominecraft.svrmgr.settings.Schedule; diff --git a/HMCSM/src/main/java/org/jackhuang/hellominecraft/svrmgr/settings/PlayerList.java b/HMCSM/src/main/java/org/jackhuang/hellominecraft/svrmgr/settings/PlayerList.java index 93726d2e6..18ee86bf3 100755 --- a/HMCSM/src/main/java/org/jackhuang/hellominecraft/svrmgr/settings/PlayerList.java +++ b/HMCSM/src/main/java/org/jackhuang/hellominecraft/svrmgr/settings/PlayerList.java @@ -22,9 +22,9 @@ import java.io.File; import java.io.IOException; import java.util.HashSet; import java.util.UUID; -import org.jackhuang.hellominecraft.utils.logging.HMCLog; -import org.jackhuang.hellominecraft.utils.system.FileUtils; -import org.jackhuang.hellominecraft.utils.StrUtils; +import org.jackhuang.hellominecraft.util.logging.HMCLog; +import org.jackhuang.hellominecraft.util.system.FileUtils; +import org.jackhuang.hellominecraft.util.StrUtils; import org.jackhuang.hellominecraft.svrmgr.settings.PlayerList.BasePlayer; /** diff --git a/HMCSM/src/main/java/org/jackhuang/hellominecraft/svrmgr/settings/ServerProperties.java b/HMCSM/src/main/java/org/jackhuang/hellominecraft/svrmgr/settings/ServerProperties.java index ad2f3d94b..6f54ef095 100755 --- a/HMCSM/src/main/java/org/jackhuang/hellominecraft/svrmgr/settings/ServerProperties.java +++ b/HMCSM/src/main/java/org/jackhuang/hellominecraft/svrmgr/settings/ServerProperties.java @@ -25,7 +25,7 @@ import java.io.InputStream; import java.text.SimpleDateFormat; import java.util.Date; import java.util.Properties; -import org.jackhuang.hellominecraft.utils.logging.HMCLog; +import org.jackhuang.hellominecraft.util.logging.HMCLog; /** * diff --git a/HMCSM/src/main/java/org/jackhuang/hellominecraft/svrmgr/settings/SettingsManager.java b/HMCSM/src/main/java/org/jackhuang/hellominecraft/svrmgr/settings/SettingsManager.java index daa18fd8c..504d500c3 100755 --- a/HMCSM/src/main/java/org/jackhuang/hellominecraft/svrmgr/settings/SettingsManager.java +++ b/HMCSM/src/main/java/org/jackhuang/hellominecraft/svrmgr/settings/SettingsManager.java @@ -24,9 +24,9 @@ package org.jackhuang.hellominecraft.svrmgr.settings; import com.google.gson.Gson; import java.io.File; import java.io.IOException; -import org.jackhuang.hellominecraft.utils.logging.HMCLog; -import org.jackhuang.hellominecraft.utils.system.FileUtils; -import org.jackhuang.hellominecraft.utils.system.IOUtils; +import org.jackhuang.hellominecraft.util.logging.HMCLog; +import org.jackhuang.hellominecraft.util.system.FileUtils; +import org.jackhuang.hellominecraft.util.system.IOUtils; /** * diff --git a/HMCSM/src/main/java/org/jackhuang/hellominecraft/svrmgr/threads/MonitorThread.java b/HMCSM/src/main/java/org/jackhuang/hellominecraft/svrmgr/threads/MonitorThread.java index 876cda7f7..320f4a77a 100755 --- a/HMCSM/src/main/java/org/jackhuang/hellominecraft/svrmgr/threads/MonitorThread.java +++ b/HMCSM/src/main/java/org/jackhuang/hellominecraft/svrmgr/threads/MonitorThread.java @@ -23,7 +23,7 @@ import java.io.InputStream; import java.io.InputStreamReader; import java.io.UnsupportedEncodingException; import java.util.ArrayList; -import org.jackhuang.hellominecraft.utils.logging.HMCLog; +import org.jackhuang.hellominecraft.util.logging.HMCLog; /** * diff --git a/HMCSM/src/main/java/org/jackhuang/hellominecraft/svrmgr/threads/WaitForThread.java b/HMCSM/src/main/java/org/jackhuang/hellominecraft/svrmgr/threads/WaitForThread.java index 70fda57b2..5670b00cc 100755 --- a/HMCSM/src/main/java/org/jackhuang/hellominecraft/svrmgr/threads/WaitForThread.java +++ b/HMCSM/src/main/java/org/jackhuang/hellominecraft/svrmgr/threads/WaitForThread.java @@ -19,7 +19,7 @@ package org.jackhuang.hellominecraft.svrmgr.threads; import java.util.logging.Level; import java.util.logging.Logger; -import org.jackhuang.hellominecraft.utils.EventHandler; +import org.jackhuang.hellominecraft.util.EventHandler; /** * diff --git a/HMCSM/src/main/java/org/jackhuang/hellominecraft/svrmgr/utils/FolderOpener.java b/HMCSM/src/main/java/org/jackhuang/hellominecraft/svrmgr/utils/FolderOpener.java index b0dcdc8dd..79b743a8c 100755 --- a/HMCSM/src/main/java/org/jackhuang/hellominecraft/svrmgr/utils/FolderOpener.java +++ b/HMCSM/src/main/java/org/jackhuang/hellominecraft/svrmgr/utils/FolderOpener.java @@ -18,7 +18,7 @@ package org.jackhuang.hellominecraft.svrmgr.utils; import java.io.File; -import org.jackhuang.hellominecraft.utils.MessageBox; +import org.jackhuang.hellominecraft.util.MessageBox; /** * diff --git a/HMCSM/src/main/java/org/jackhuang/hellominecraft/svrmgr/utils/IPGet.java b/HMCSM/src/main/java/org/jackhuang/hellominecraft/svrmgr/utils/IPGet.java index 626458cb3..a794e5a2c 100755 --- a/HMCSM/src/main/java/org/jackhuang/hellominecraft/svrmgr/utils/IPGet.java +++ b/HMCSM/src/main/java/org/jackhuang/hellominecraft/svrmgr/utils/IPGet.java @@ -19,9 +19,9 @@ package org.jackhuang.hellominecraft.svrmgr.utils; import java.util.regex.Matcher; import java.util.regex.Pattern; -import org.jackhuang.hellominecraft.utils.logging.HMCLog; -import org.jackhuang.hellominecraft.utils.NetUtils; -import org.jackhuang.hellominecraft.utils.functions.Consumer; +import org.jackhuang.hellominecraft.util.logging.HMCLog; +import org.jackhuang.hellominecraft.util.NetUtils; +import org.jackhuang.hellominecraft.util.func.Consumer; import org.jsoup.Jsoup; import org.jsoup.nodes.Document; import org.jsoup.select.Elements; diff --git a/HMCSM/src/main/java/org/jackhuang/hellominecraft/svrmgr/utils/ModType.java b/HMCSM/src/main/java/org/jackhuang/hellominecraft/svrmgr/utils/ModType.java index 11094ea9d..686420b4d 100755 --- a/HMCSM/src/main/java/org/jackhuang/hellominecraft/svrmgr/utils/ModType.java +++ b/HMCSM/src/main/java/org/jackhuang/hellominecraft/svrmgr/utils/ModType.java @@ -23,7 +23,7 @@ import java.util.logging.Level; import java.util.logging.Logger; import java.util.zip.ZipEntry; import java.util.zip.ZipFile; -import org.jackhuang.hellominecraft.utils.C; +import org.jackhuang.hellominecraft.util.C; /** * 判断mod类型 diff --git a/HMCSM/src/main/java/org/jackhuang/hellominecraft/svrmgr/utils/MonitorServiceImpl.java b/HMCSM/src/main/java/org/jackhuang/hellominecraft/svrmgr/utils/MonitorServiceImpl.java index d936e9be7..94572c41f 100755 --- a/HMCSM/src/main/java/org/jackhuang/hellominecraft/svrmgr/utils/MonitorServiceImpl.java +++ b/HMCSM/src/main/java/org/jackhuang/hellominecraft/svrmgr/utils/MonitorServiceImpl.java @@ -24,7 +24,7 @@ import java.io.InputStreamReader; import java.io.LineNumberReader; import java.util.StringTokenizer; import com.sun.management.OperatingSystemMXBean; -import org.jackhuang.hellominecraft.utils.StrUtils; +import org.jackhuang.hellominecraft.util.StrUtils; /** * diff --git a/HMCSM/src/main/java/org/jackhuang/hellominecraft/svrmgr/utils/Utilities.java b/HMCSM/src/main/java/org/jackhuang/hellominecraft/svrmgr/utils/Utilities.java index 332910149..fa7705284 100755 --- a/HMCSM/src/main/java/org/jackhuang/hellominecraft/svrmgr/utils/Utilities.java +++ b/HMCSM/src/main/java/org/jackhuang/hellominecraft/svrmgr/utils/Utilities.java @@ -19,7 +19,7 @@ package org.jackhuang.hellominecraft.svrmgr.utils; import java.io.File; import org.jackhuang.hellominecraft.svrmgr.settings.SettingsManager; -import org.jackhuang.hellominecraft.utils.system.IOUtils; +import org.jackhuang.hellominecraft.util.system.IOUtils; /** * diff --git a/HMCSM/src/main/java/org/jackhuang/hellominecraft/svrmgr/views/MainWindow.java b/HMCSM/src/main/java/org/jackhuang/hellominecraft/svrmgr/views/MainWindow.java index c959e4d43..5d011dfd8 100755 --- a/HMCSM/src/main/java/org/jackhuang/hellominecraft/svrmgr/views/MainWindow.java +++ b/HMCSM/src/main/java/org/jackhuang/hellominecraft/svrmgr/views/MainWindow.java @@ -45,20 +45,20 @@ import javax.swing.JOptionPane; import javax.swing.JPopupMenu; import javax.swing.filechooser.FileNameExtensionFilter; import javax.swing.table.DefaultTableModel; -import org.jackhuang.hellominecraft.utils.C; -import org.jackhuang.hellominecraft.utils.logging.HMCLog; -import org.jackhuang.hellominecraft.utils.tasks.Task; -import org.jackhuang.hellominecraft.utils.tasks.TaskWindow; -import org.jackhuang.hellominecraft.utils.tasks.download.FileDownloadTask; -import org.jackhuang.hellominecraft.utils.tasks.download.HTTPGetTask; -import org.jackhuang.hellominecraft.utils.system.FileUtils; +import org.jackhuang.hellominecraft.util.C; +import org.jackhuang.hellominecraft.util.logging.HMCLog; +import org.jackhuang.hellominecraft.util.tasks.Task; +import org.jackhuang.hellominecraft.util.tasks.TaskWindow; +import org.jackhuang.hellominecraft.util.tasks.download.FileDownloadTask; +import org.jackhuang.hellominecraft.util.tasks.download.HTTPGetTask; +import org.jackhuang.hellominecraft.util.system.FileUtils; import org.jackhuang.hellominecraft.svrmgr.utils.IMonitorService; -import org.jackhuang.hellominecraft.utils.system.IOUtils; -import org.jackhuang.hellominecraft.utils.MessageBox; +import org.jackhuang.hellominecraft.util.system.IOUtils; +import org.jackhuang.hellominecraft.util.MessageBox; import org.jackhuang.hellominecraft.svrmgr.utils.ModType; import org.jackhuang.hellominecraft.svrmgr.utils.MonitorInfoBean; import org.jackhuang.hellominecraft.svrmgr.utils.MonitorServiceImpl; -import org.jackhuang.hellominecraft.utils.version.MinecraftRemoteVersions; +import org.jackhuang.hellominecraft.util.version.MinecraftRemoteVersions; import org.jackhuang.hellominecraft.svrmgr.Main; import org.jackhuang.hellominecraft.svrmgr.cbplugins.BukkitPlugin; import org.jackhuang.hellominecraft.svrmgr.cbplugins.Category; @@ -84,11 +84,11 @@ import org.jackhuang.hellominecraft.svrmgr.threads.MonitorThread; import org.jackhuang.hellominecraft.svrmgr.utils.FolderOpener; import org.jackhuang.hellominecraft.svrmgr.utils.IPGet; import org.jackhuang.hellominecraft.svrmgr.utils.Utilities; -import org.jackhuang.hellominecraft.utils.views.SwingUtils; -import org.jackhuang.hellominecraft.utils.version.MinecraftRemoteVersion; +import org.jackhuang.hellominecraft.util.ui.SwingUtils; +import org.jackhuang.hellominecraft.util.version.MinecraftRemoteVersion; import org.jackhuang.hellominecraft.lookandfeel.components.ConstomButton; -import org.jackhuang.hellominecraft.utils.Event; -import org.jackhuang.hellominecraft.utils.StrUtils; +import org.jackhuang.hellominecraft.util.Event; +import org.jackhuang.hellominecraft.util.StrUtils; /** * diff --git a/HMCSM/src/main/java/org/jackhuang/hellominecraft/svrmgr/views/PluginInfoDialog.java b/HMCSM/src/main/java/org/jackhuang/hellominecraft/svrmgr/views/PluginInfoDialog.java index 0b62c522d..e3eac7e43 100755 --- a/HMCSM/src/main/java/org/jackhuang/hellominecraft/svrmgr/views/PluginInfoDialog.java +++ b/HMCSM/src/main/java/org/jackhuang/hellominecraft/svrmgr/views/PluginInfoDialog.java @@ -19,9 +19,9 @@ package org.jackhuang.hellominecraft.svrmgr.views; import java.io.File; import javax.swing.table.DefaultTableModel; -import org.jackhuang.hellominecraft.utils.tasks.TaskWindow; -import org.jackhuang.hellominecraft.utils.tasks.download.FileDownloadTask; -import org.jackhuang.hellominecraft.utils.StrUtils; +import org.jackhuang.hellominecraft.util.tasks.TaskWindow; +import org.jackhuang.hellominecraft.util.tasks.download.FileDownloadTask; +import org.jackhuang.hellominecraft.util.StrUtils; import org.jackhuang.hellominecraft.svrmgr.cbplugins.PluginInfo; import org.jackhuang.hellominecraft.svrmgr.cbplugins.PluginVersion; import org.jackhuang.hellominecraft.svrmgr.utils.Utilities; diff --git a/MetroLookAndFeel/src/main/java/org/jackhuang/hellominecraft/lookandfeel/HelloMinecraftLookAndFeel.java b/MetroLookAndFeel/src/main/java/org/jackhuang/hellominecraft/lookandfeel/HelloMinecraftLookAndFeel.java index 2e286c151..9ed4d6810 100755 --- a/MetroLookAndFeel/src/main/java/org/jackhuang/hellominecraft/lookandfeel/HelloMinecraftLookAndFeel.java +++ b/MetroLookAndFeel/src/main/java/org/jackhuang/hellominecraft/lookandfeel/HelloMinecraftLookAndFeel.java @@ -24,8 +24,8 @@ import java.util.Map; import javax.swing.UIDefaults; import javax.swing.UIManager; import javax.swing.plaf.synth.SynthLookAndFeel; -import org.jackhuang.hellominecraft.utils.logging.HMCLog; -import org.jackhuang.hellominecraft.utils.NetUtils; +import org.jackhuang.hellominecraft.util.logging.HMCLog; +import org.jackhuang.hellominecraft.util.NetUtils; /** * diff --git a/MetroLookAndFeel/src/main/java/org/jackhuang/hellominecraft/lookandfeel/Theme.java b/MetroLookAndFeel/src/main/java/org/jackhuang/hellominecraft/lookandfeel/Theme.java index b9d20360b..6d712b6f5 100755 --- a/MetroLookAndFeel/src/main/java/org/jackhuang/hellominecraft/lookandfeel/Theme.java +++ b/MetroLookAndFeel/src/main/java/org/jackhuang/hellominecraft/lookandfeel/Theme.java @@ -19,7 +19,7 @@ package org.jackhuang.hellominecraft.lookandfeel; import java.util.HashMap; import java.util.Map; -import org.jackhuang.hellominecraft.utils.C; +import org.jackhuang.hellominecraft.util.C; /** *