From 01aaa38f819291fcbd2747bc86206a4557b452ee Mon Sep 17 00:00:00 2001 From: huanghongxun Date: Sat, 4 Jul 2015 17:17:41 +0800 Subject: [PATCH] reconstruct code, update crash suggestions & fix crash when minecraft.json -> libraries is lost --- .../hellominecraft/launcher/Main.java | 4 ++-- .../launcher/launch/GameLauncher.java | 4 ++-- .../launcher/launch/MinecraftLoader.java | 4 ++-- .../launcher/settings/Profile.java | 2 +- .../launcher/settings/Settings.java | 4 ++-- .../{CrashReport.java => CrashReporter.java} | 4 ++-- .../launcher/utils/MCUtils.java | 4 ++-- .../utils/assets/AssetsMojangLoader.java | 4 ++-- .../launcher/utils/assets/IAssetsHandler.java | 2 +- .../installers/PackMinecraftInstaller.java | 4 ++-- .../installers/forge/ForgeInstaller.java | 2 +- .../liteloader/LiteLoaderInstaller.java | 2 +- .../optifine/OptiFineInstaller.java | 2 +- .../version/MinecraftVersionManager.java | 24 ++++++++++--------- .../launcher/views/GameSettingsPanel.java | 2 +- .../launcher/views/LauncherSettingsPanel.java | 2 +- .../authlib/HttpAuthenticationService.java | 2 +- .../tasks/download/FileDownloadTask.java | 2 +- .../utils/system/Compressor.java | 1 - .../utils/{ => system}/FileUtils.java | 3 ++- .../utils/{ => system}/IOUtils.java | 2 +- .../utils/system/JdkVersion.java | 1 - .../hellominecraft/views/LogWindow.form | 4 +++- .../hellominecraft/views/LogWindow.java | 4 ++-- .../hellominecraft/launcher/I18N.properties | 9 +++---- .../launcher/I18N_en_US.properties | 9 +++---- .../launcher/I18N_zh_CN.properties | 7 +++--- .../launcher/I18N_zh_TW.properties | 5 ++-- .../installer/cauldron/ForgeInstaller.java | 4 ++-- .../hellominecraft/svrmgr/server/Server.java | 2 +- .../svrmgr/settings/PlayerList.java | 2 +- .../svrmgr/settings/SettingsManager.java | 4 ++-- .../svrmgr/views/MainWindow.java | 4 ++-- 33 files changed, 71 insertions(+), 64 deletions(-) rename HMCL/src/main/java/org/jackhuang/hellominecraft/launcher/utils/{CrashReport.java => CrashReporter.java} (96%) rename HMCLAPI/src/main/java/org/jackhuang/hellominecraft/utils/{ => system}/FileUtils.java (99%) rename HMCLAPI/src/main/java/org/jackhuang/hellominecraft/utils/{ => system}/IOUtils.java (99%) 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 0fc08c9b3b..22cbea72bf 100644 --- a/HMCL/src/main/java/org/jackhuang/hellominecraft/launcher/Main.java +++ b/HMCL/src/main/java/org/jackhuang/hellominecraft/launcher/Main.java @@ -34,7 +34,7 @@ import org.jackhuang.hellominecraft.C; import org.jackhuang.hellominecraft.utils.functions.NonConsumer; import org.jackhuang.hellominecraft.HMCLog; import org.jackhuang.hellominecraft.launcher.launch.GameLauncher; -import org.jackhuang.hellominecraft.launcher.utils.CrashReport; +import org.jackhuang.hellominecraft.launcher.utils.CrashReporter; import org.jackhuang.hellominecraft.logging.Configuration; import org.jackhuang.hellominecraft.logging.appender.ConsoleAppender; import org.jackhuang.hellominecraft.logging.layout.DefaultLayout; @@ -77,7 +77,7 @@ public final class Main implements NonConsumer { public static void main(String[] args) { { - Thread.setDefaultUncaughtExceptionHandler(new CrashReport(true)); + Thread.setDefaultUncaughtExceptionHandler(new CrashReporter(true)); try { File file = new File("hmcl.log"); diff --git a/HMCL/src/main/java/org/jackhuang/hellominecraft/launcher/launch/GameLauncher.java b/HMCL/src/main/java/org/jackhuang/hellominecraft/launcher/launch/GameLauncher.java index eaea0d7ceb..59667015d6 100644 --- a/HMCL/src/main/java/org/jackhuang/hellominecraft/launcher/launch/GameLauncher.java +++ b/HMCL/src/main/java/org/jackhuang/hellominecraft/launcher/launch/GameLauncher.java @@ -30,8 +30,8 @@ import org.jackhuang.hellominecraft.launcher.utils.auth.LoginInfo; import org.jackhuang.hellominecraft.launcher.utils.auth.UserProfileProvider; import org.jackhuang.hellominecraft.launcher.utils.download.DownloadType; import org.jackhuang.hellominecraft.launcher.settings.Profile; -import org.jackhuang.hellominecraft.utils.FileUtils; -import org.jackhuang.hellominecraft.utils.IOUtils; +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.system.MessageBox; import org.jackhuang.hellominecraft.utils.system.OS; diff --git a/HMCL/src/main/java/org/jackhuang/hellominecraft/launcher/launch/MinecraftLoader.java b/HMCL/src/main/java/org/jackhuang/hellominecraft/launcher/launch/MinecraftLoader.java index dc098e425b..47b156f1d2 100644 --- a/HMCL/src/main/java/org/jackhuang/hellominecraft/launcher/launch/MinecraftLoader.java +++ b/HMCL/src/main/java/org/jackhuang/hellominecraft/launcher/launch/MinecraftLoader.java @@ -24,7 +24,7 @@ import org.jackhuang.hellominecraft.C; import org.jackhuang.hellominecraft.HMCLog; import org.jackhuang.hellominecraft.launcher.utils.auth.UserProfileProvider; import org.jackhuang.hellominecraft.launcher.settings.Profile; -import org.jackhuang.hellominecraft.utils.IOUtils; +import org.jackhuang.hellominecraft.utils.system.IOUtils; import org.jackhuang.hellominecraft.launcher.utils.MCUtils; import org.jackhuang.hellominecraft.launcher.utils.assets.AssetsIndex; import org.jackhuang.hellominecraft.launcher.utils.assets.AssetsObject; @@ -32,7 +32,7 @@ import org.jackhuang.hellominecraft.launcher.utils.download.DownloadType; import org.jackhuang.hellominecraft.utils.system.OS; import org.jackhuang.hellominecraft.launcher.version.MinecraftLibrary; import org.jackhuang.hellominecraft.launcher.version.MinecraftVersion; -import org.jackhuang.hellominecraft.utils.FileUtils; +import org.jackhuang.hellominecraft.utils.system.FileUtils; import org.jackhuang.hellominecraft.utils.system.MessageBox; /** diff --git a/HMCL/src/main/java/org/jackhuang/hellominecraft/launcher/settings/Profile.java b/HMCL/src/main/java/org/jackhuang/hellominecraft/launcher/settings/Profile.java index a53bc1885a..197af3ba94 100644 --- a/HMCL/src/main/java/org/jackhuang/hellominecraft/launcher/settings/Profile.java +++ b/HMCL/src/main/java/org/jackhuang/hellominecraft/launcher/settings/Profile.java @@ -18,7 +18,7 @@ package org.jackhuang.hellominecraft.launcher.settings; import java.io.File; import org.jackhuang.hellominecraft.launcher.launch.IMinecraftProvider; -import org.jackhuang.hellominecraft.utils.IOUtils; +import org.jackhuang.hellominecraft.utils.system.IOUtils; import org.jackhuang.hellominecraft.launcher.utils.MCUtils; import org.jackhuang.hellominecraft.launcher.version.GameDirType; import org.jackhuang.hellominecraft.utils.StrUtils; diff --git a/HMCL/src/main/java/org/jackhuang/hellominecraft/launcher/settings/Settings.java b/HMCL/src/main/java/org/jackhuang/hellominecraft/launcher/settings/Settings.java index 0ea13fd286..1d7475f389 100644 --- a/HMCL/src/main/java/org/jackhuang/hellominecraft/launcher/settings/Settings.java +++ b/HMCL/src/main/java/org/jackhuang/hellominecraft/launcher/settings/Settings.java @@ -26,8 +26,8 @@ import org.jackhuang.hellominecraft.C; import org.jackhuang.hellominecraft.HMCLog; import org.jackhuang.hellominecraft.launcher.Main; import org.jackhuang.hellominecraft.utils.CollectionUtils; -import org.jackhuang.hellominecraft.utils.FileUtils; -import org.jackhuang.hellominecraft.utils.IOUtils; +import org.jackhuang.hellominecraft.utils.system.FileUtils; +import org.jackhuang.hellominecraft.utils.system.IOUtils; import org.jackhuang.hellominecraft.utils.system.MessageBox; import org.jackhuang.hellominecraft.utils.StrUtils; import org.jackhuang.hellominecraft.utils.UpdateChecker; diff --git a/HMCL/src/main/java/org/jackhuang/hellominecraft/launcher/utils/CrashReport.java b/HMCL/src/main/java/org/jackhuang/hellominecraft/launcher/utils/CrashReporter.java similarity index 96% rename from HMCL/src/main/java/org/jackhuang/hellominecraft/launcher/utils/CrashReport.java rename to HMCL/src/main/java/org/jackhuang/hellominecraft/launcher/utils/CrashReporter.java index eb48a299ee..3c410207ad 100644 --- a/HMCL/src/main/java/org/jackhuang/hellominecraft/launcher/utils/CrashReport.java +++ b/HMCL/src/main/java/org/jackhuang/hellominecraft/launcher/utils/CrashReporter.java @@ -31,11 +31,11 @@ import org.jackhuang.hellominecraft.views.LogWindow; * * @author hyh */ -public class CrashReport implements Thread.UncaughtExceptionHandler { +public class CrashReporter implements Thread.UncaughtExceptionHandler { boolean enableLogger = false; - public CrashReport(boolean enableLogger) { + public CrashReporter(boolean enableLogger) { this.enableLogger = enableLogger; } diff --git a/HMCL/src/main/java/org/jackhuang/hellominecraft/launcher/utils/MCUtils.java b/HMCL/src/main/java/org/jackhuang/hellominecraft/launcher/utils/MCUtils.java index 3981fcf9e0..f983d28826 100644 --- a/HMCL/src/main/java/org/jackhuang/hellominecraft/launcher/utils/MCUtils.java +++ b/HMCL/src/main/java/org/jackhuang/hellominecraft/launcher/utils/MCUtils.java @@ -31,8 +31,8 @@ import org.jackhuang.hellominecraft.version.MinecraftRemoteVersions; import org.jackhuang.hellominecraft.tasks.TaskWindow; import org.jackhuang.hellominecraft.tasks.download.FileDownloadTask; import org.jackhuang.hellominecraft.utils.ArrayUtils; -import org.jackhuang.hellominecraft.utils.FileUtils; -import org.jackhuang.hellominecraft.utils.IOUtils; +import org.jackhuang.hellominecraft.utils.system.FileUtils; +import org.jackhuang.hellominecraft.utils.system.IOUtils; import org.jackhuang.hellominecraft.version.MinecraftVersionRequest; import org.jackhuang.hellominecraft.utils.NetUtils; import org.jackhuang.hellominecraft.utils.system.OS; diff --git a/HMCL/src/main/java/org/jackhuang/hellominecraft/launcher/utils/assets/AssetsMojangLoader.java b/HMCL/src/main/java/org/jackhuang/hellominecraft/launcher/utils/assets/AssetsMojangLoader.java index 7036e82c77..10b5f91fb2 100644 --- a/HMCL/src/main/java/org/jackhuang/hellominecraft/launcher/utils/assets/AssetsMojangLoader.java +++ b/HMCL/src/main/java/org/jackhuang/hellominecraft/launcher/utils/assets/AssetsMojangLoader.java @@ -24,8 +24,8 @@ import org.jackhuang.hellominecraft.C; import org.jackhuang.hellominecraft.HMCLog; import org.jackhuang.hellominecraft.launcher.settings.Settings; import org.jackhuang.hellominecraft.tasks.Task; -import org.jackhuang.hellominecraft.utils.FileUtils; -import org.jackhuang.hellominecraft.utils.IOUtils; +import org.jackhuang.hellominecraft.utils.system.FileUtils; +import org.jackhuang.hellominecraft.utils.system.IOUtils; import org.jackhuang.hellominecraft.utils.StrUtils; import org.jackhuang.hellominecraft.launcher.utils.MCUtils; import org.jackhuang.hellominecraft.launcher.utils.download.IDownloadProvider; diff --git a/HMCL/src/main/java/org/jackhuang/hellominecraft/launcher/utils/assets/IAssetsHandler.java b/HMCL/src/main/java/org/jackhuang/hellominecraft/launcher/utils/assets/IAssetsHandler.java index 3b88468b1e..f5a95d8b60 100644 --- a/HMCL/src/main/java/org/jackhuang/hellominecraft/launcher/utils/assets/IAssetsHandler.java +++ b/HMCL/src/main/java/org/jackhuang/hellominecraft/launcher/utils/assets/IAssetsHandler.java @@ -31,7 +31,7 @@ import org.jackhuang.hellominecraft.tasks.Task; import org.jackhuang.hellominecraft.tasks.download.FileDownloadTask; import org.jackhuang.hellominecraft.utils.functions.Consumer; import org.jackhuang.hellominecraft.utils.code.DigestUtils; -import org.jackhuang.hellominecraft.utils.IOUtils; +import org.jackhuang.hellominecraft.utils.system.IOUtils; import org.jackhuang.hellominecraft.utils.NetUtils; /** diff --git a/HMCL/src/main/java/org/jackhuang/hellominecraft/launcher/utils/installers/PackMinecraftInstaller.java b/HMCL/src/main/java/org/jackhuang/hellominecraft/launcher/utils/installers/PackMinecraftInstaller.java index a3c9358d56..729b10cc6d 100644 --- a/HMCL/src/main/java/org/jackhuang/hellominecraft/launcher/utils/installers/PackMinecraftInstaller.java +++ b/HMCL/src/main/java/org/jackhuang/hellominecraft/launcher/utils/installers/PackMinecraftInstaller.java @@ -20,8 +20,8 @@ import java.io.File; import java.io.IOException; import java.util.ArrayList; import org.jackhuang.hellominecraft.utils.system.Compressor; -import org.jackhuang.hellominecraft.utils.FileUtils; -import org.jackhuang.hellominecraft.utils.IOUtils; +import org.jackhuang.hellominecraft.utils.system.FileUtils; +import org.jackhuang.hellominecraft.utils.system.IOUtils; /** * diff --git a/HMCL/src/main/java/org/jackhuang/hellominecraft/launcher/utils/installers/forge/ForgeInstaller.java b/HMCL/src/main/java/org/jackhuang/hellominecraft/launcher/utils/installers/forge/ForgeInstaller.java index b196fb0b84..c9b0d316de 100644 --- a/HMCL/src/main/java/org/jackhuang/hellominecraft/launcher/utils/installers/forge/ForgeInstaller.java +++ b/HMCL/src/main/java/org/jackhuang/hellominecraft/launcher/utils/installers/forge/ForgeInstaller.java @@ -31,7 +31,7 @@ import org.jackhuang.hellominecraft.HMCLog; import org.jackhuang.hellominecraft.launcher.launch.IMinecraftProvider; import org.jackhuang.hellominecraft.launcher.settings.Settings; import org.jackhuang.hellominecraft.tasks.Task; -import org.jackhuang.hellominecraft.utils.FileUtils; +import org.jackhuang.hellominecraft.utils.system.FileUtils; import org.jackhuang.hellominecraft.utils.NetUtils; import org.jackhuang.hellominecraft.launcher.version.MinecraftLibrary; import org.jackhuang.hellominecraft.utils.system.MessageBox; diff --git a/HMCL/src/main/java/org/jackhuang/hellominecraft/launcher/utils/installers/liteloader/LiteLoaderInstaller.java b/HMCL/src/main/java/org/jackhuang/hellominecraft/launcher/utils/installers/liteloader/LiteLoaderInstaller.java index 05e0b021d9..4c5e0de14e 100644 --- a/HMCL/src/main/java/org/jackhuang/hellominecraft/launcher/utils/installers/liteloader/LiteLoaderInstaller.java +++ b/HMCL/src/main/java/org/jackhuang/hellominecraft/launcher/utils/installers/liteloader/LiteLoaderInstaller.java @@ -25,7 +25,7 @@ import org.jackhuang.hellominecraft.tasks.Task; import org.jackhuang.hellominecraft.tasks.communication.PreviousResult; import org.jackhuang.hellominecraft.tasks.communication.PreviousResultRegistrator; import org.jackhuang.hellominecraft.launcher.settings.Profile; -import org.jackhuang.hellominecraft.utils.FileUtils; +import org.jackhuang.hellominecraft.utils.system.FileUtils; import org.jackhuang.hellominecraft.launcher.version.MinecraftLibrary; import org.jackhuang.hellominecraft.launcher.version.MinecraftVersion; diff --git a/HMCL/src/main/java/org/jackhuang/hellominecraft/launcher/utils/installers/optifine/OptiFineInstaller.java b/HMCL/src/main/java/org/jackhuang/hellominecraft/launcher/utils/installers/optifine/OptiFineInstaller.java index f151f42fad..fba8c1a3c1 100644 --- a/HMCL/src/main/java/org/jackhuang/hellominecraft/launcher/utils/installers/optifine/OptiFineInstaller.java +++ b/HMCL/src/main/java/org/jackhuang/hellominecraft/launcher/utils/installers/optifine/OptiFineInstaller.java @@ -25,7 +25,7 @@ import org.jackhuang.hellominecraft.launcher.settings.Profile; import org.jackhuang.hellominecraft.tasks.Task; import org.jackhuang.hellominecraft.tasks.communication.PreviousResult; import org.jackhuang.hellominecraft.tasks.communication.PreviousResultRegistrator; -import org.jackhuang.hellominecraft.utils.FileUtils; +import org.jackhuang.hellominecraft.utils.system.FileUtils; import org.jackhuang.hellominecraft.launcher.version.MinecraftLibrary; import org.jackhuang.hellominecraft.launcher.version.MinecraftVersion; diff --git a/HMCL/src/main/java/org/jackhuang/hellominecraft/launcher/version/MinecraftVersionManager.java b/HMCL/src/main/java/org/jackhuang/hellominecraft/launcher/version/MinecraftVersionManager.java index a56884b4fa..88ef3759e8 100644 --- a/HMCL/src/main/java/org/jackhuang/hellominecraft/launcher/version/MinecraftVersionManager.java +++ b/HMCL/src/main/java/org/jackhuang/hellominecraft/launcher/version/MinecraftVersionManager.java @@ -32,13 +32,13 @@ import org.jackhuang.hellominecraft.launcher.launch.GameLauncher.DownloadLibrary import org.jackhuang.hellominecraft.launcher.launch.IMinecraftLoader; import org.jackhuang.hellominecraft.launcher.launch.IMinecraftProvider; import org.jackhuang.hellominecraft.launcher.launch.MinecraftLoader; -import org.jackhuang.hellominecraft.utils.FileUtils; +import org.jackhuang.hellominecraft.utils.system.FileUtils; import org.jackhuang.hellominecraft.launcher.utils.MCUtils; import org.jackhuang.hellominecraft.launcher.utils.auth.UserProfileProvider; import org.jackhuang.hellominecraft.launcher.utils.download.DownloadType; import org.jackhuang.hellominecraft.launcher.settings.Profile; import org.jackhuang.hellominecraft.launcher.settings.Settings; -import org.jackhuang.hellominecraft.utils.IOUtils; +import org.jackhuang.hellominecraft.utils.system.IOUtils; import org.jackhuang.hellominecraft.utils.system.MessageBox; import org.jackhuang.hellominecraft.utils.StrUtils; import org.jackhuang.hellominecraft.utils.Utils; @@ -226,15 +226,17 @@ public final class MinecraftVersionManager extends IMinecraftProvider { public List getDownloadLibraries(DownloadType downloadType) { ArrayList downloadLibraries = new ArrayList<>(); MinecraftVersion v = profile.getSelectedMinecraftVersion().resolve(this, Settings.getInstance().getDownloadSource()); - for (IMinecraftLibrary l : v.libraries) { - l.init(); - if (l.allow()) { - File ff = l.getFilePath(baseFolder); - if (!ff.exists()) { - String libURL = downloadType.getProvider().getLibraryDownloadURL() + "/"; - libURL = l.getDownloadURL(libURL, downloadType); - if (libURL != null) - downloadLibraries.add(new DownloadLibraryJob(l.name, libURL, ff)); + if(v.libraries != null) { + for (IMinecraftLibrary l : v.libraries) { + l.init(); + if (l.allow()) { + File ff = l.getFilePath(baseFolder); + if (!ff.exists()) { + String libURL = downloadType.getProvider().getLibraryDownloadURL() + "/"; + libURL = l.getDownloadURL(libURL, downloadType); + if (libURL != null) + downloadLibraries.add(new DownloadLibraryJob(l.name, libURL, ff)); + } } } } diff --git a/HMCL/src/main/java/org/jackhuang/hellominecraft/launcher/views/GameSettingsPanel.java b/HMCL/src/main/java/org/jackhuang/hellominecraft/launcher/views/GameSettingsPanel.java index 1baffbaf8e..64ce3dd72a 100644 --- a/HMCL/src/main/java/org/jackhuang/hellominecraft/launcher/views/GameSettingsPanel.java +++ b/HMCL/src/main/java/org/jackhuang/hellominecraft/launcher/views/GameSettingsPanel.java @@ -54,7 +54,7 @@ import org.jackhuang.hellominecraft.tasks.TaskWindow; import org.jackhuang.hellominecraft.tasks.communication.DefaultPreviousResult; import org.jackhuang.hellominecraft.tasks.download.FileDownloadTask; import org.jackhuang.hellominecraft.tasks.download.HTTPGetTask; -import org.jackhuang.hellominecraft.utils.IOUtils; +import org.jackhuang.hellominecraft.utils.system.IOUtils; import org.jackhuang.hellominecraft.utils.system.MessageBox; import org.jackhuang.hellominecraft.version.MinecraftVersionRequest; import org.jackhuang.hellominecraft.utils.system.OS; diff --git a/HMCL/src/main/java/org/jackhuang/hellominecraft/launcher/views/LauncherSettingsPanel.java b/HMCL/src/main/java/org/jackhuang/hellominecraft/launcher/views/LauncherSettingsPanel.java index c73e87100c..e83491c47f 100644 --- a/HMCL/src/main/java/org/jackhuang/hellominecraft/launcher/views/LauncherSettingsPanel.java +++ b/HMCL/src/main/java/org/jackhuang/hellominecraft/launcher/views/LauncherSettingsPanel.java @@ -23,7 +23,7 @@ import javax.swing.JFileChooser; import org.jackhuang.hellominecraft.C; import org.jackhuang.hellominecraft.HMCLog; import org.jackhuang.hellominecraft.launcher.settings.Settings; -import org.jackhuang.hellominecraft.utils.IOUtils; +import org.jackhuang.hellominecraft.utils.system.IOUtils; import org.jackhuang.hellominecraft.utils.system.MessageBox; /** diff --git a/HMCL/src/main/java/org/jackhuang/mojang/authlib/HttpAuthenticationService.java b/HMCL/src/main/java/org/jackhuang/mojang/authlib/HttpAuthenticationService.java index 32ed7246c5..81f642deb3 100644 --- a/HMCL/src/main/java/org/jackhuang/mojang/authlib/HttpAuthenticationService.java +++ b/HMCL/src/main/java/org/jackhuang/mojang/authlib/HttpAuthenticationService.java @@ -11,7 +11,7 @@ import java.net.URLEncoder; import java.util.Map; import java.util.Objects; import org.jackhuang.hellominecraft.logging.logger.Logger; -import org.jackhuang.hellominecraft.utils.IOUtils; +import org.jackhuang.hellominecraft.utils.system.IOUtils; import org.jackhuang.hellominecraft.utils.NetUtils; public abstract class HttpAuthenticationService extends BaseAuthenticationService { diff --git a/HMCLAPI/src/main/java/org/jackhuang/hellominecraft/tasks/download/FileDownloadTask.java b/HMCLAPI/src/main/java/org/jackhuang/hellominecraft/tasks/download/FileDownloadTask.java index d74599aeaf..4c60c45fae 100644 --- a/HMCLAPI/src/main/java/org/jackhuang/hellominecraft/tasks/download/FileDownloadTask.java +++ b/HMCLAPI/src/main/java/org/jackhuang/hellominecraft/tasks/download/FileDownloadTask.java @@ -34,7 +34,7 @@ import org.jackhuang.hellominecraft.HMCLog; import org.jackhuang.hellominecraft.tasks.Task; import org.jackhuang.hellominecraft.tasks.communication.PreviousResult; import org.jackhuang.hellominecraft.tasks.communication.PreviousResultRegistrator; -import org.jackhuang.hellominecraft.utils.IOUtils; +import org.jackhuang.hellominecraft.utils.system.IOUtils; /** * diff --git a/HMCLAPI/src/main/java/org/jackhuang/hellominecraft/utils/system/Compressor.java b/HMCLAPI/src/main/java/org/jackhuang/hellominecraft/utils/system/Compressor.java index 1c83116776..8db88f5caf 100644 --- a/HMCLAPI/src/main/java/org/jackhuang/hellominecraft/utils/system/Compressor.java +++ b/HMCLAPI/src/main/java/org/jackhuang/hellominecraft/utils/system/Compressor.java @@ -26,7 +26,6 @@ import java.io.InputStream; import java.util.zip.ZipEntry; import java.util.zip.ZipFile; import java.util.zip.ZipOutputStream; -import org.jackhuang.hellominecraft.utils.IOUtils; import org.jackhuang.hellominecraft.utils.StrUtils; /** diff --git a/HMCLAPI/src/main/java/org/jackhuang/hellominecraft/utils/FileUtils.java b/HMCLAPI/src/main/java/org/jackhuang/hellominecraft/utils/system/FileUtils.java similarity index 99% rename from HMCLAPI/src/main/java/org/jackhuang/hellominecraft/utils/FileUtils.java rename to HMCLAPI/src/main/java/org/jackhuang/hellominecraft/utils/system/FileUtils.java index 347ea44444..9a1d9c67ad 100644 --- a/HMCLAPI/src/main/java/org/jackhuang/hellominecraft/utils/FileUtils.java +++ b/HMCLAPI/src/main/java/org/jackhuang/hellominecraft/utils/system/FileUtils.java @@ -14,7 +14,7 @@ * You should have received a copy of the GNU General Public License * along with this program. */ -package org.jackhuang.hellominecraft.utils; +package org.jackhuang.hellominecraft.utils.system; import java.io.File; import java.io.FileFilter; @@ -27,6 +27,7 @@ import java.nio.channels.FileChannel; import java.util.ArrayList; import java.util.List; import org.jackhuang.hellominecraft.HMCLog; +import org.jackhuang.hellominecraft.utils.NetUtils; /** * diff --git a/HMCLAPI/src/main/java/org/jackhuang/hellominecraft/utils/IOUtils.java b/HMCLAPI/src/main/java/org/jackhuang/hellominecraft/utils/system/IOUtils.java similarity index 99% rename from HMCLAPI/src/main/java/org/jackhuang/hellominecraft/utils/IOUtils.java rename to HMCLAPI/src/main/java/org/jackhuang/hellominecraft/utils/system/IOUtils.java index 9f1c4047cc..1d21a07a05 100644 --- a/HMCLAPI/src/main/java/org/jackhuang/hellominecraft/utils/IOUtils.java +++ b/HMCLAPI/src/main/java/org/jackhuang/hellominecraft/utils/system/IOUtils.java @@ -14,7 +14,7 @@ * You should have received a copy of the GNU General Public License * along with this program. */ -package org.jackhuang.hellominecraft.utils; +package org.jackhuang.hellominecraft.utils.system; import org.jackhuang.hellominecraft.utils.system.OS; import java.io.ByteArrayOutputStream; diff --git a/HMCLAPI/src/main/java/org/jackhuang/hellominecraft/utils/system/JdkVersion.java b/HMCLAPI/src/main/java/org/jackhuang/hellominecraft/utils/system/JdkVersion.java index 42c0bb64c5..a6de5b81a5 100644 --- a/HMCLAPI/src/main/java/org/jackhuang/hellominecraft/utils/system/JdkVersion.java +++ b/HMCLAPI/src/main/java/org/jackhuang/hellominecraft/utils/system/JdkVersion.java @@ -25,7 +25,6 @@ import java.io.InputStreamReader; import java.util.regex.Matcher; import java.util.regex.Pattern; import org.jackhuang.hellominecraft.HMCLog; -import org.jackhuang.hellominecraft.utils.FileUtils; import org.jackhuang.hellominecraft.utils.StrUtils; /** diff --git a/HMCLAPI/src/main/java/org/jackhuang/hellominecraft/views/LogWindow.form b/HMCLAPI/src/main/java/org/jackhuang/hellominecraft/views/LogWindow.form index 906cc170b0..e72974771c 100644 --- a/HMCLAPI/src/main/java/org/jackhuang/hellominecraft/views/LogWindow.form +++ b/HMCLAPI/src/main/java/org/jackhuang/hellominecraft/views/LogWindow.form @@ -3,7 +3,9 @@
- + + + diff --git a/HMCLAPI/src/main/java/org/jackhuang/hellominecraft/views/LogWindow.java b/HMCLAPI/src/main/java/org/jackhuang/hellominecraft/views/LogWindow.java index 78c7359532..9ffe04fd50 100644 --- a/HMCLAPI/src/main/java/org/jackhuang/hellominecraft/views/LogWindow.java +++ b/HMCLAPI/src/main/java/org/jackhuang/hellominecraft/views/LogWindow.java @@ -76,7 +76,8 @@ public class LogWindow extends javax.swing.JFrame { btnGitHub = new javax.swing.JButton(); setDefaultCloseOperation(javax.swing.WindowConstants.DISPOSE_ON_CLOSE); - setTitle("Log"); + java.util.ResourceBundle bundle = java.util.ResourceBundle.getBundle("org/jackhuang/hellominecraft/launcher/I18N"); // NOI18N + setTitle(bundle.getString("logwindow.title")); // NOI18N addWindowListener(new java.awt.event.WindowAdapter() { public void windowClosed(java.awt.event.WindowEvent evt) { formWindowClosed(evt); @@ -88,7 +89,6 @@ public class LogWindow extends javax.swing.JFrame { txtLog.setRows(5); jScrollPane1.setViewportView(txtLog); - java.util.ResourceBundle bundle = java.util.ResourceBundle.getBundle("org/jackhuang/hellominecraft/launcher/I18N"); // NOI18N btnClear.setText(bundle.getString("ui.button.clear")); // NOI18N btnClear.addActionListener(new java.awt.event.ActionListener() { public void actionPerformed(java.awt.event.ActionEvent evt) { diff --git a/HMCLAPI/src/main/resources/org/jackhuang/hellominecraft/launcher/I18N.properties b/HMCLAPI/src/main/resources/org/jackhuang/hellominecraft/launcher/I18N.properties index 7b54e0fc74..2b6db1e385 100644 --- a/HMCLAPI/src/main/resources/org/jackhuang/hellominecraft/launcher/I18N.properties +++ b/HMCLAPI/src/main/resources/org/jackhuang/hellominecraft/launcher/I18N.properties @@ -56,7 +56,7 @@ install.release_time=\u91ca\u653e\u65f6\u95f4 install.type=\u7c7b\u578b crash.launcher=\u542f\u52a8\u5668\u5d29\u6e83\u4e86\uff01 -crash.minecraft=Minecraft\u5d29\u6e83\u4e86\uff01 +crash.minecraft=Minecraft\u5d29\u6e83\u4e86\uff01\u8bf7\u8ba4\u771f\u9605\u8bfb\u5efa\u8bae\u3002 login.choose_charactor=\u8bf7\u9009\u62e9\u60a8\u8981\u4f7f\u7528\u7684\u89d2\u8272 login.no_charactor=\u8be5\u5e10\u53f7\u6ca1\u6709\u89d2\u8272 @@ -101,8 +101,8 @@ ui.more=\u66f4\u591a crash.advice.UnsupportedClassVersionError=\u8fd9\u53ef\u80fd\u662f\u56e0\u4e3a\u60a8\u7684Java\u7248\u672c\u8fc7\u4e8e\u8001\u65e7\uff0c\u53ef\u4ee5\u5c1d\u8bd5\u66f4\u6362\u6700\u65b0Java\u5e76\u5728\u7248\u672c\u8bbe\u7f6e\u7684Java\u8def\u5f84\u4e2d\u8bbe\u7f6e. crash.advice.ConcurrentModificationException=\u8fd9\u53ef\u80fd\u662f\u56e0\u4e3a\u60a8\u7684Java\u7248\u672c\u9ad8\u4e8eJava 1.8.0_11\u5bfc\u81f4\u7684,\u53ef\u4ee5\u5c1d\u8bd5\u5378\u8f7dJava8\u5b89\u88c5Java7\u3002 -crash.advice.ClassNotFoundException=Minecraft\u4e0d\u5b8c\u6574\u6216Mod\u51b2\u7a81\uff0c\u8bf7\u91cd\u8bd5\u6216\u4e0b\u8f7d\u6574\u5408\u5305\u89e3\u51b3\u95ee\u9898\u3002 -crash.advice.NoSuchFieldError=Minecraft\u4e0d\u5b8c\u6574\u6216Mod\u51b2\u7a81\uff0c\u8bf7\u91cd\u8bd5\u6216\u4e0b\u8f7d\u6574\u5408\u5305\u89e3\u51b3\u95ee\u9898\u3002 +crash.advice.ClassNotFoundException=Minecraft\u4e0d\u5b8c\u6574\u6216Mod\u51b2\u7a81\uff0c\u5982\u679c\u6709\u672a\u80fd\u4e0b\u8f7d\u7684\u6587\u4ef6\u8bf7\u4e0b\u8f7d\u6210\u529f\u540e\u91cd\u8bd5\u6216\u4e0b\u8f7d\u6574\u5408\u5305\u89e3\u51b3\u95ee\u9898\u3002 +crash.advice.NoSuchFieldError=Minecraft\u4e0d\u5b8c\u6574\u6216Mod\u51b2\u7a81\uff0c\u5982\u679c\u6709\u672a\u80fd\u4e0b\u8f7d\u7684\u6587\u4ef6\u8bf7\u4e0b\u8f7d\u6210\u529f\u540e\u91cd\u8bd5\u6216\u4e0b\u8f7d\u6574\u5408\u5305\u89e3\u51b3\u95ee\u9898\u3002 crash.advice.LWJGLException=\u60a8\u7684\u7535\u8111\u4e0d\u6b63\u5e38\uff0c\u53ef\u80fd\u9700\u8981\u4f7f\u7528\u9a71\u52a8\u7cbe\u7075\u6216\u5176\u4ed6\u5b89\u88c5\u5668\u66f4\u65b0\u663e\u5361\u9a71\u52a8\u3002 crash.advice.SecurityException=\u53ef\u80fd\u662f\u60a8\u4fee\u6539\u4e86minecraft.jar\u4f46\u672a\u5220\u9664META-INF\u6587\u4ef6\u5939\u7684\u539f\u56e0\u3002\u8bf7\u901a\u8fc7\u538b\u7f29\u8f6f\u4ef6\u5220\u9664jar\u4e2d\u7684META-INF\u6587\u4ef6\u5939\u3002 crash.advice.otherwise=\u53ef\u80fd\u662fMod\u6216\u5176\u4ed6\u95ee\u9898\u3002 @@ -151,7 +151,7 @@ ui.message.making=\u751f\u6210\u4e2d ui.message.sure_remove=\u771f\u7684\u8981\u5220\u9664\u914d\u7f6e%s\u5417\uff1f ui.label.settings=\u9009\u9879 -ui.label.crashing=Hello Minecraft! Launcher\u9047\u5230\u4e86\u65e0\u6cd5\u5904\u7406\u7684\u9519\u8bef\uff0c\u8bf7\u590d\u5236\u4e0b\u5217\u5185\u5bb9\u5e76\u901a\u8fc7mcbbs\u3001\u8d34\u5427\u3001Github\u6216Minecraft Forum\u53cd\u9988bug\u3002 +ui.label.crashing=Hello Minecraft!\u9047\u5230\u4e86\u65e0\u6cd5\u5904\u7406\u7684\u9519\u8bef\uff0c\u8bf7\u590d\u5236\u4e0b\u5217\u5185\u5bb9\u5e76\u901a\u8fc7mcbbs\u3001\u8d34\u5427\u3001Github\u6216Minecraft Forum\u53cd\u9988bug\u3002 ui.label.crashing_out_dated=Hello Minecraft! Launcher\u9047\u5230\u4e86\u65e0\u6cd5\u5904\u7406\u7684\u9519\u8bef\uff0c\u5df2\u68c0\u6d4b\u5230\u60a8\u7684\u542f\u52a8\u5668\u4e0d\u662f\u6700\u65b0\u7248\u672c\uff0c\u8bf7\u66f4\u65b0\u540e\u518d\u8bd5\uff01 ui.label.failed_set=\u8bbe\u7f6e\u5931\u8d25\uff1a @@ -280,6 +280,7 @@ update.found=(\u53d1\u73b0\u66f4\u65b0!) logwindow.terminate_game=\u7ed3\u675f\u6e38\u620f\u8fdb\u7a0b logwindow.tieba=\u8d34\u5427 +logwindow.title=\u65e5\u5fd7 selector.choose=\u9009\u62e9 diff --git a/HMCLAPI/src/main/resources/org/jackhuang/hellominecraft/launcher/I18N_en_US.properties b/HMCLAPI/src/main/resources/org/jackhuang/hellominecraft/launcher/I18N_en_US.properties index 045dfbb07f..f92284443c 100644 --- a/HMCLAPI/src/main/resources/org/jackhuang/hellominecraft/launcher/I18N_en_US.properties +++ b/HMCLAPI/src/main/resources/org/jackhuang/hellominecraft/launcher/I18N_en_US.properties @@ -96,8 +96,8 @@ ui.more=More crash.advice.UnsupportedClassVersionError=Maybe your java is too old, try to update the java. crash.advice.ConcurrentModificationException=Maybe your Java is newer than 1.8.0_11, you could downgrade to Java 7. -crash.advice.ClassNotFoundException=Minecraft or mods are incomplete. Retry or update your game and mods! -crash.advice.NoSuchFieldError=Minecraft or mods are incomplete. Retry or update your game and mods! +crash.advice.ClassNotFoundException=Minecraft or mods are incomplete. Retry if there are some libraries that have not downloaded or update your game and mods! +crash.advice.NoSuchFieldError=Minecraft or mods are incomplete. Retry if there are some libraries that have not downloaded or update your game and mods! crash.advice.LWJGLException=Maybe your video driver does not work well, please update your video driver. crash.advice.SecurityException=Maybe you have modified minecraft.jar but have not removed the META-INF. crash.advice.otherwise=Maybe mods caused problems. @@ -218,7 +218,7 @@ launcher.versions_json_not_matched=The version %s is malformed! There are a json launcher.versions_json_not_matched_needs_auto_completion=The version %s lost json, needs auto completion? launcher.versions_json_not_matched_cannot_auto_completion=The version %s lost json, but cannot auto complete it, delete it? launcher.choose_bgpath=Choose background path. -launcher.background_tooltip=\n\n\u542f\u52a8\u5668\u9ed8\u8ba4\u4f7f\u7528\u81ea\u5e26\u7684\u80cc\u666f
\n\u5982\u679c\u5f53\u524d\u76ee\u5f55\u6709background.png\uff0c\u5219\u4f1a\u4f7f\u7528\u8be5\u6587\u4ef6\u4f5c\u4e3a\u80cc\u666f
\n\u5982\u679c\u5f53\u524d\u76ee\u5f55\u6709bgskin\u5b50\u76ee\u5f55\uff0c\u5219\u4f1a\u968f\u673a\u4f7f\u7528\u91cc\u9762\u7684\u4e00\u5f20\u56fe\u4f5c\u4e3a\u80cc\u666f
\n\u5982\u679c\u8be5\u80cc\u666f\u5730\u5740\u88ab\u4fee\u6539\uff0c\u5219\u4f1a\u4f7f\u7528\u80cc\u666f\u5730\u5740\u91cc\u7684\u4e00\u5f20\u56fe\u4f5c\u4e3a\u80cc\u666f
\n\u80cc\u666f\u5730\u5740\u5141\u8bb8\u6709\u591a\u4e2a\u5730\u5740\uff0c\u4f7f\u7528\u534a\u89d2\u5206\u53f7";"(\u4e0d\u5305\u542b\u53cc\u5f15\u53f7)\u5206\u9694\n\n +launcher.background_tooltip=\n\nThis app uses the default background at first.
\nIf there is background.png in the directory, it will be used.
\nIf there is "bgskin" subdirectory, this app will chooses one picture in "bgskin" randomly.
\nIf you set the background setting, this app will use it.\n\n launcher.update_launcher=Check for update launcher.enable_shadow=Enable Window Shadow launcher.theme=Theme @@ -271,7 +271,8 @@ update.failed=Failed to check for updates. update.found=(Found Update!) logwindow.terminate_game=Terminate Game -logwindow.tieba=Tieba +logwindow.tieba=Baidu Tieba +logwindow.title=Log selector.choose=Choose diff --git a/HMCLAPI/src/main/resources/org/jackhuang/hellominecraft/launcher/I18N_zh_CN.properties b/HMCLAPI/src/main/resources/org/jackhuang/hellominecraft/launcher/I18N_zh_CN.properties index ba46a5e817..52c38d0ab1 100644 --- a/HMCLAPI/src/main/resources/org/jackhuang/hellominecraft/launcher/I18N_zh_CN.properties +++ b/HMCLAPI/src/main/resources/org/jackhuang/hellominecraft/launcher/I18N_zh_CN.properties @@ -56,7 +56,7 @@ install.release_time=\u91ca\u653e\u65f6\u95f4 install.type=\u7c7b\u578b crash.launcher=\u542f\u52a8\u5668\u5d29\u6e83\u4e86\uff01 -crash.minecraft=Minecraft\u5d29\u6e83\u4e86\uff01 +crash.minecraft=Minecraft\u5d29\u6e83\u4e86\uff01\u8bf7\u8ba4\u771f\u9605\u8bfb\u5efa\u8bae\u3002 login.choose_charactor=\u8bf7\u9009\u62e9\u60a8\u8981\u4f7f\u7528\u7684\u89d2\u8272 login.no_charactor=\u8be5\u5e10\u53f7\u6ca1\u6709\u89d2\u8272 @@ -96,8 +96,8 @@ ui.more=\u66f4\u591a crash.advice.UnsupportedClassVersionError=\u8fd9\u53ef\u80fd\u662f\u56e0\u4e3a\u60a8\u7684Java\u7248\u672c\u8fc7\u4e8e\u8001\u65e7\uff0c\u53ef\u4ee5\u5c1d\u8bd5\u66f4\u6362\u6700\u65b0Java\u5e76\u5728\u7248\u672c\u8bbe\u7f6e\u7684Java\u8def\u5f84\u4e2d\u8bbe\u7f6e. crash.advice.ConcurrentModificationException=\u8fd9\u53ef\u80fd\u662f\u56e0\u4e3a\u60a8\u7684Java\u7248\u672c\u9ad8\u4e8eJava 1.8.0_11\u5bfc\u81f4\u7684,\u53ef\u4ee5\u5c1d\u8bd5\u5378\u8f7dJava8\u5b89\u88c5Java7\u3002 -crash.advice.ClassNotFoundException=Minecraft\u4e0d\u5b8c\u6574\u6216Mod\u51b2\u7a81\uff0c\u8bf7\u91cd\u8bd5\u4e0b\u8f7d\u6574\u5408\u5305\u89e3\u51b3\u95ee\u9898\u3002 -crash.advice.NoSuchFieldError=Minecraft\u4e0d\u5b8c\u6574\u6216Mod\u51b2\u7a81\uff0c\u8bf7\u91cd\u8bd5\u6216\u4e0b\u8f7d\u6574\u5408\u5305\u89e3\u51b3\u95ee\u9898\u3002 +crash.advice.ClassNotFoundException=Minecraft\u4e0d\u5b8c\u6574\u6216Mod\u51b2\u7a81\uff0c\u5982\u679c\u6709\u672a\u80fd\u4e0b\u8f7d\u7684\u6587\u4ef6\u8bf7\u4e0b\u8f7d\u6210\u529f\u540e\u91cd\u8bd5\u4e0b\u8f7d\u6574\u5408\u5305\u89e3\u51b3\u95ee\u9898\u3002 +crash.advice.NoSuchFieldError=Minecraft\u4e0d\u5b8c\u6574\u6216Mod\u51b2\u7a81\uff0c\u5982\u679c\u6709\u672a\u80fd\u4e0b\u8f7d\u7684\u6587\u4ef6\u8bf7\u4e0b\u8f7d\u6210\u529f\u540e\u91cd\u8bd5\u6216\u4e0b\u8f7d\u6574\u5408\u5305\u89e3\u51b3\u95ee\u9898\u3002 crash.advice.LWJGLException=\u60a8\u7684\u7535\u8111\u4e0d\u6b63\u5e38\uff0c\u53ef\u80fd\u9700\u8981\u4f7f\u7528\u9a71\u52a8\u7cbe\u7075\u6216\u5176\u4ed6\u5b89\u88c5\u5668\u66f4\u65b0\u663e\u5361\u9a71\u52a8\u3002 crash.advice.SecurityException=\u53ef\u80fd\u662f\u60a8\u4fee\u6539\u4e86minecraft.jar\u4f46\u672a\u5220\u9664META-INF\u6587\u4ef6\u5939\u7684\u539f\u56e0\u3002\u8bf7\u901a\u8fc7\u538b\u7f29\u8f6f\u4ef6\u5220\u9664jar\u4e2d\u7684META-INF\u6587\u4ef6\u5939\u3002 crash.advice.otherwise=\u53ef\u80fd\u662fMod\u6216\u5176\u4ed6\u95ee\u9898\u3002 @@ -274,6 +274,7 @@ update.found=(\u53d1\u73b0\u66f4\u65b0!) logwindow.terminate_game=\u7ed3\u675f\u6e38\u620f\u8fdb\u7a0b logwindow.tieba=\u8d34\u5427 +logwindow.title=\u65e5\u5fd7 selector.choose=\u9009\u62e9 diff --git a/HMCLAPI/src/main/resources/org/jackhuang/hellominecraft/launcher/I18N_zh_TW.properties b/HMCLAPI/src/main/resources/org/jackhuang/hellominecraft/launcher/I18N_zh_TW.properties index 78a2050afe..bef29bea21 100644 --- a/HMCLAPI/src/main/resources/org/jackhuang/hellominecraft/launcher/I18N_zh_TW.properties +++ b/HMCLAPI/src/main/resources/org/jackhuang/hellominecraft/launcher/I18N_zh_TW.properties @@ -96,8 +96,8 @@ ui.more=\u66f4\u591a crash.advice.UnsupportedClassVersionError=\u9019\u53ef\u80fd\u662f\u56e0\u70ba\u60a8\u7684Java\u7248\u672c\u904e\u65bc\u8001\u820a\uff0c\u53ef\u4ee5\u5617\u8a66\u66f4\u63db\u6700\u65b0Java\u4e26\u5728\u7248\u672c\u8a2d\u5b9a\u7684Java\u8def\u5f91\u4e2d\u8a2d\u5b9a. crash.advice.ConcurrentModificationException=\u9019\u53ef\u80fd\u662f\u56e0\u70ba\u60a8\u7684Java\u7248\u672c\u9ad8\u65bcJava 1.8.0_11\u5c0e\u81f4\u7684,\u53ef\u4ee5\u5617\u8a66\u5378\u8f09Java8\u5b89\u88ddJava7\u3002 -crash.advice.ClassNotFoundException=Minecraft\u4e0d\u5b8c\u6574\u6216Mod\u885d\u7a81\uff0c\u8bf7\u91cd\u8bd5\u4e0b\u8f09\u6574\u5408\u5305\u89e3\u6c7a\u554f\u984c\u3002 -crash.advice.NoSuchFieldError=Minecraft\u4e0d\u5b8c\u6574\u6216Mod\u885d\u7a81\uff0c\u8bf7\u91cd\u8bd5\u901a\u904e\u4e0b\u8f09\u6574\u5408\u5305\u89e3\u6c7a\u554f\u984c\u3002 +crash.advice.ClassNotFoundException=Minecraft\u4e0d\u5b8c\u6574\u6216Mod\u885d\u7a81\uff0c\u5982\u679c\u6709\u672a\u80fd\u4e0b\u8f7d\u7684\u6587\u4ef6\u8bf7\u4e0b\u8f7d\u6210\u529f\u540e\u91cd\u8bd5\u6216\u4e0b\u8f09\u6574\u5408\u5305\u89e3\u6c7a\u554f\u984c\u3002 +crash.advice.NoSuchFieldError=Minecraft\u4e0d\u5b8c\u6574\u6216Mod\u885d\u7a81\uff0c\u5982\u679c\u6709\u672a\u80fd\u4e0b\u8f7d\u7684\u6587\u4ef6\u8bf7\u4e0b\u8f7d\u6210\u529f\u540e\u91cd\u8bd5\u6216\u4e0b\u8f09\u6574\u5408\u5305\u89e3\u6c7a\u554f\u984c\u3002 crash.advice.LWJGLException=\u60a8\u7684\u7535\u8111\u4e0d\u6b63\u5e38\uff0c\u53ef\u80fd\u9700\u8981\u4f7f\u7528\u9a71\u52a8\u7cbe\u7075\u6216\u5176\u4ed6\u5b89\u88c5\u5668\u66f4\u65b0\u663e\u5361\u9a71\u52a8\u3002 crash.advice.SecurityException=\u53ef\u80fd\u662f\u60a8\u4fee\u6539\u4e86minecraft.jar\u4f46\u672a\u522a\u9664META-INF\u6587\u4ef6\u593e\u7684\u539f\u56e0\u3002\u8acb\u901a\u904e\u58d3\u7e2e\u8edf\u4ef6\u522a\u9664jar\u4e2d\u7684META-INF\u6587\u4ef6\u593e\u3002 crash.advice.otherwise=\u53ef\u80fd\u662fMod\u6216\u5176\u4ed6\u554f\u984c\u3002 @@ -272,6 +272,7 @@ update.found=(\u767c\u73fe\u66f4\u65b0!) logwindow.terminate_game=\u7d50\u675f\u904a\u6232\u9032\u7a0b logwindow.tieba=\u8cbc\u5427 +logwindow.title=\u65e5\u5fd7 selector.choose=\u9078\u64c7 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 1b1f8d62ae..58f6ff2ac3 100644 --- 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 @@ -26,8 +26,8 @@ import java.util.zip.ZipFile; import javax.swing.JOptionPane; import org.jackhuang.hellominecraft.HMCLog; import org.jackhuang.hellominecraft.utils.code.DigestUtils; -import org.jackhuang.hellominecraft.utils.FileUtils; -import org.jackhuang.hellominecraft.utils.IOUtils; +import org.jackhuang.hellominecraft.utils.system.FileUtils; +import org.jackhuang.hellominecraft.utils.system.IOUtils; import org.jackhuang.hellominecraft.utils.system.MessageBox; import org.jackhuang.hellominecraft.utils.NetUtils; import org.jackhuang.hellominecraft.utils.StrUtils; 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 6bad226d35..f6b090ba13 100644 --- a/HMCSM/src/main/java/org/jackhuang/hellominecraft/svrmgr/server/Server.java +++ b/HMCSM/src/main/java/org/jackhuang/hellominecraft/svrmgr/server/Server.java @@ -23,7 +23,7 @@ import java.util.logging.Logger; import java.util.regex.Matcher; import java.util.regex.Pattern; import org.jackhuang.hellominecraft.HMCLog; -import org.jackhuang.hellominecraft.utils.IOUtils; +import org.jackhuang.hellominecraft.utils.system.IOUtils; import org.jackhuang.hellominecraft.utils.system.MessageBox; import org.jackhuang.hellominecraft.utils.Pair; import org.jackhuang.hellominecraft.utils.StrUtils; 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 c309cc2b9b..c76f09fed3 100644 --- a/HMCSM/src/main/java/org/jackhuang/hellominecraft/svrmgr/settings/PlayerList.java +++ b/HMCSM/src/main/java/org/jackhuang/hellominecraft/svrmgr/settings/PlayerList.java @@ -11,7 +11,7 @@ import java.io.IOException; import java.util.HashSet; import java.util.UUID; import org.jackhuang.hellominecraft.HMCLog; -import org.jackhuang.hellominecraft.utils.FileUtils; +import org.jackhuang.hellominecraft.utils.system.FileUtils; import org.jackhuang.hellominecraft.utils.StrUtils; import org.jackhuang.hellominecraft.svrmgr.settings.PlayerList.BasePlayer; 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 f692c5b49c..5303319d72 100644 --- a/HMCSM/src/main/java/org/jackhuang/hellominecraft/svrmgr/settings/SettingsManager.java +++ b/HMCSM/src/main/java/org/jackhuang/hellominecraft/svrmgr/settings/SettingsManager.java @@ -12,8 +12,8 @@ import com.google.gson.Gson; import java.io.File; import java.io.IOException; import org.jackhuang.hellominecraft.HMCLog; -import org.jackhuang.hellominecraft.utils.FileUtils; -import org.jackhuang.hellominecraft.utils.IOUtils; +import org.jackhuang.hellominecraft.utils.system.FileUtils; +import org.jackhuang.hellominecraft.utils.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 07a999e4ab..d0bcba1bbb 100644 --- a/HMCSM/src/main/java/org/jackhuang/hellominecraft/svrmgr/views/MainWindow.java +++ b/HMCSM/src/main/java/org/jackhuang/hellominecraft/svrmgr/views/MainWindow.java @@ -39,9 +39,9 @@ import org.jackhuang.hellominecraft.tasks.Task; import org.jackhuang.hellominecraft.tasks.TaskWindow; import org.jackhuang.hellominecraft.tasks.download.FileDownloadTask; import org.jackhuang.hellominecraft.tasks.download.HTTPGetTask; -import org.jackhuang.hellominecraft.utils.FileUtils; +import org.jackhuang.hellominecraft.utils.system.FileUtils; import org.jackhuang.hellominecraft.svrmgr.utils.IMonitorService; -import org.jackhuang.hellominecraft.utils.IOUtils; +import org.jackhuang.hellominecraft.utils.system.IOUtils; import org.jackhuang.hellominecraft.utils.system.MessageBox; import org.jackhuang.hellominecraft.svrmgr.utils.ModType; import org.jackhuang.hellominecraft.svrmgr.utils.MonitorInfoBean;