From c1208563cd9a9a3dee625435a2d165df81b79f44 Mon Sep 17 00:00:00 2001 From: huangyuhui Date: Mon, 13 Feb 2017 18:59:04 +0800 Subject: [PATCH] Add some javadoc --- .../launcher/api/AddTabCallback.java | 9 +++ .../hellominecraft/launcher/api/IPlugin.java | 9 ++- .../launcher/api/PluginManager.java | 11 +-- .../config/AuthenticatorChangedEvent.java | 4 +- .../config/DownloadTypeChangedEvent.java | 6 +- .../api/event/config/ThemeChangedEvent.java | 4 +- .../launch/DecompressLibrariesEvent.java | 2 +- .../event/launch/DecompressLibraryJob.java | 1 + .../event/launch/DownloadLibrariesEvent.java | 2 +- .../api/event/launch/DownloadLibraryJob.java | 2 +- .../api/event/launch/LaunchEvent.java | 2 +- .../event/launch/LaunchSucceededEvent.java | 2 +- .../launch/LaunchingStateChangedEvent.java | 2 +- .../launch/ProcessingLaunchOptionsEvent.java | 2 +- .../launch/ProcessingLoginResultEvent.java | 2 +- .../event/version/LoadedOneVersionEvent.java | 2 +- .../version/MinecraftLibraryPathEvent.java | 2 +- .../event/version/RefreshedVersionsEvent.java | 2 +- .../version/RefreshingVersionsEvent.java | 2 +- .../hellominecraft/launcher/Main.java | 2 +- .../api/event/config/ProfileChangedEvent.java | 3 + .../api/event/config/ProfileLoadingEvent.java | 5 +- .../hellominecraft/lookandfeel/Theme.java | 80 +++++++++---------- HMCSM/build.gradle | 6 +- .../api/event/OutOfDateEvent.java | 2 +- .../event/process/JVMLaunchFailedEvent.java | 2 +- .../JavaProcessExitedAbnormallyEvent.java | 2 +- .../process/JavaProcessStartingEvent.java | 2 +- .../process/JavaProcessStoppedEvent.java | 2 +- 29 files changed, 102 insertions(+), 72 deletions(-) diff --git a/HMCL/src/core/java/org/jackhuang/hellominecraft/launcher/api/AddTabCallback.java b/HMCL/src/core/java/org/jackhuang/hellominecraft/launcher/api/AddTabCallback.java index 231b012d7..451138c25 100644 --- a/HMCL/src/core/java/org/jackhuang/hellominecraft/launcher/api/AddTabCallback.java +++ b/HMCL/src/core/java/org/jackhuang/hellominecraft/launcher/api/AddTabCallback.java @@ -20,9 +20,18 @@ package org.jackhuang.hellominecraft.launcher.api; import org.jackhuang.hellominecraft.util.ui.Page; /** + * Used for adding tab page to MainFrame. * * @author huang */ public interface AddTabCallback { + + /** + * Add your tab page to MainFrame. + * + * @param tabPage your customized tab page. + * @param id the id of your page. + * @param title you are supposed to localize your texts. + */ void addTab(Page tabPage, String id, String title); } diff --git a/HMCL/src/core/java/org/jackhuang/hellominecraft/launcher/api/IPlugin.java b/HMCL/src/core/java/org/jackhuang/hellominecraft/launcher/api/IPlugin.java index 4b5b55332..94eb94245 100755 --- a/HMCL/src/core/java/org/jackhuang/hellominecraft/launcher/api/IPlugin.java +++ b/HMCL/src/core/java/org/jackhuang/hellominecraft/launcher/api/IPlugin.java @@ -22,6 +22,7 @@ import org.jackhuang.hellominecraft.launcher.core.auth.IAuthenticator; import org.jackhuang.hellominecraft.util.func.Consumer; /** + * Each plugin must implement this interface. * * @author huangyuhui */ @@ -33,6 +34,12 @@ public interface IPlugin { * @param apply call apply.accept(your authenticator) */ void onRegisterAuthenticators(Consumer apply); - + + /** + * Call callback.addTab to add your customized panel to MainFrame RootPane. + * + * @param frame MainFrame + * @param callback call this if you want. + */ void onAddTab(JFrame frame, AddTabCallback callback); } diff --git a/HMCL/src/core/java/org/jackhuang/hellominecraft/launcher/api/PluginManager.java b/HMCL/src/core/java/org/jackhuang/hellominecraft/launcher/api/PluginManager.java index 886d323f8..12d3f0a16 100755 --- a/HMCL/src/core/java/org/jackhuang/hellominecraft/launcher/api/PluginManager.java +++ b/HMCL/src/core/java/org/jackhuang/hellominecraft/launcher/api/PluginManager.java @@ -21,9 +21,9 @@ import java.util.ArrayList; import javax.swing.JFrame; import org.jackhuang.hellominecraft.launcher.core.auth.IAuthenticator; import org.jackhuang.hellominecraft.util.func.Consumer; -import org.jackhuang.hellominecraft.util.log.HMCLog; /** + * Can be only called by HMCL. * * @author huangyuhui */ @@ -35,16 +35,17 @@ public class PluginManager { try { IPlugin p = (IPlugin) cls.newInstance(); PLUGINS.add(p); - } catch (IllegalAccessException | InstantiationException e) { - HMCLog.err("Failed to new instance"); + } catch (Throwable e) { + System.err.println("Failed to new instance"); + e.printStackTrace(); } } - + public static void fireRegisterAuthenticators(Consumer callback) { for (IPlugin p : PLUGINS) p.onRegisterAuthenticators(callback); } - + public static void fireAddTab(JFrame frame, AddTabCallback callback) { for (IPlugin p : PLUGINS) p.onAddTab(frame, callback); diff --git a/HMCL/src/core/java/org/jackhuang/hellominecraft/launcher/api/event/config/AuthenticatorChangedEvent.java b/HMCL/src/core/java/org/jackhuang/hellominecraft/launcher/api/event/config/AuthenticatorChangedEvent.java index ba7feada5..41814c48a 100644 --- a/HMCL/src/core/java/org/jackhuang/hellominecraft/launcher/api/event/config/AuthenticatorChangedEvent.java +++ b/HMCL/src/core/java/org/jackhuang/hellominecraft/launcher/api/event/config/AuthenticatorChangedEvent.java @@ -22,7 +22,9 @@ import org.jackhuang.hellominecraft.launcher.core.auth.IAuthenticator; /** * This event gets fired when the authenticator changed. - * + *
+ * This event is fired on the {@link org.jackhuang.hellominecraft.api.HMCAPI#EVENT_BUS} + * @param source {@link org.jackhuang.hellominecraft.launcher.setting.Config} * @param IAuthenticator the new authenticator. * @author huangyuhui */ diff --git a/HMCL/src/core/java/org/jackhuang/hellominecraft/launcher/api/event/config/DownloadTypeChangedEvent.java b/HMCL/src/core/java/org/jackhuang/hellominecraft/launcher/api/event/config/DownloadTypeChangedEvent.java index 20252021e..c88a26ae4 100644 --- a/HMCL/src/core/java/org/jackhuang/hellominecraft/launcher/api/event/config/DownloadTypeChangedEvent.java +++ b/HMCL/src/core/java/org/jackhuang/hellominecraft/launcher/api/event/config/DownloadTypeChangedEvent.java @@ -22,8 +22,10 @@ import org.jackhuang.hellominecraft.launcher.core.download.DownloadType; /** * This event gets fired when the download type changed. - * - * @param DownloadType the new downlaod type; + *
+ * This event is fired on the {@link org.jackhuang.hellominecraft.api.HMCAPI#EVENT_BUS} + * @param source {@link org.jackhuang.hellominecraft.launcher.setting.Config} + * @param DownloadType the new downlaod type * @author huangyuhui */ public class DownloadTypeChangedEvent extends SimpleEvent { diff --git a/HMCL/src/core/java/org/jackhuang/hellominecraft/launcher/api/event/config/ThemeChangedEvent.java b/HMCL/src/core/java/org/jackhuang/hellominecraft/launcher/api/event/config/ThemeChangedEvent.java index b1da66bda..b65239d2b 100644 --- a/HMCL/src/core/java/org/jackhuang/hellominecraft/launcher/api/event/config/ThemeChangedEvent.java +++ b/HMCL/src/core/java/org/jackhuang/hellominecraft/launcher/api/event/config/ThemeChangedEvent.java @@ -22,7 +22,9 @@ import org.jackhuang.hellominecraft.lookandfeel.Theme; /** * This event gets fired when the application theme changed. - * + *
+ * This event is fired on the {@link org.jackhuang.hellominecraft.api.HMCAPI#EVENT_BUS} + * @param source {@link org.jackhuang.hellominecraft.launcher.setting.Config} * @param Theme the changed theme * @author huangyuhui */ diff --git a/HMCL/src/core/java/org/jackhuang/hellominecraft/launcher/api/event/launch/DecompressLibrariesEvent.java b/HMCL/src/core/java/org/jackhuang/hellominecraft/launcher/api/event/launch/DecompressLibrariesEvent.java index c0db77b36..ec8c09878 100644 --- a/HMCL/src/core/java/org/jackhuang/hellominecraft/launcher/api/event/launch/DecompressLibrariesEvent.java +++ b/HMCL/src/core/java/org/jackhuang/hellominecraft/launcher/api/event/launch/DecompressLibrariesEvent.java @@ -25,7 +25,7 @@ import org.jackhuang.hellominecraft.api.ResultedSimpleEvent; * This event is {@link org.jackhuang.hellominecraft.api.ResultedEvent} * If this event is failed, the launching process will be terminated. *
- * This event is fired on the {@link org.jackhuang.hellominecraft.api.HMCLAPI#EVENT_BUS} + * This event is fired on the {@link org.jackhuang.hellominecraft.api.HMCAPI#EVENT_BUS} * @param source {@link org.jackhuang.hellominecraft.launcher.core.launch.GameLauncher} * @param DecompressLibraryJob libraries to be decompressed * @author huangyuhui diff --git a/HMCL/src/core/java/org/jackhuang/hellominecraft/launcher/api/event/launch/DecompressLibraryJob.java b/HMCL/src/core/java/org/jackhuang/hellominecraft/launcher/api/event/launch/DecompressLibraryJob.java index 46ec3e8b0..3c0d3a67a 100644 --- a/HMCL/src/core/java/org/jackhuang/hellominecraft/launcher/api/event/launch/DecompressLibraryJob.java +++ b/HMCL/src/core/java/org/jackhuang/hellominecraft/launcher/api/event/launch/DecompressLibraryJob.java @@ -31,6 +31,7 @@ public class DecompressLibraryJob { /** * The length of these 2 arrays must be the same. + * * @param decompressFiles * @param extractRules * @param decompressTo folder diff --git a/HMCL/src/core/java/org/jackhuang/hellominecraft/launcher/api/event/launch/DownloadLibrariesEvent.java b/HMCL/src/core/java/org/jackhuang/hellominecraft/launcher/api/event/launch/DownloadLibrariesEvent.java index fceecea2b..3684e8eb6 100644 --- a/HMCL/src/core/java/org/jackhuang/hellominecraft/launcher/api/event/launch/DownloadLibrariesEvent.java +++ b/HMCL/src/core/java/org/jackhuang/hellominecraft/launcher/api/event/launch/DownloadLibrariesEvent.java @@ -26,7 +26,7 @@ import org.jackhuang.hellominecraft.api.ResultedSimpleEvent; * This event is {@link org.jackhuang.hellominecraft.api.ResultedEvent} * If this event is failed, the launching process will be terminated. *
- * This event is fired on the {@link org.jackhuang.hellominecraft.api.HMCLAPI#EVENT_BUS} + * This event is fired on the {@link org.jackhuang.hellominecraft.api.HMCAPI#EVENT_BUS} * @param source {@link org.jackhuang.hellominecraft.launcher.core.launch.GameLauncher} * Passed value List<DownloadLibraryJob>: libraries to be downloaded. * @author huangyuhui diff --git a/HMCL/src/core/java/org/jackhuang/hellominecraft/launcher/api/event/launch/DownloadLibraryJob.java b/HMCL/src/core/java/org/jackhuang/hellominecraft/launcher/api/event/launch/DownloadLibraryJob.java index d1c6e2c5b..85a801855 100644 --- a/HMCL/src/core/java/org/jackhuang/hellominecraft/launcher/api/event/launch/DownloadLibraryJob.java +++ b/HMCL/src/core/java/org/jackhuang/hellominecraft/launcher/api/event/launch/DownloadLibraryJob.java @@ -35,7 +35,7 @@ public class DownloadLibraryJob { lib = n; path = p; } - + public DownloadLibraryJob parse() { String name = lib.name; if (name.startsWith("net.minecraftforge:forge:")) { diff --git a/HMCL/src/core/java/org/jackhuang/hellominecraft/launcher/api/event/launch/LaunchEvent.java b/HMCL/src/core/java/org/jackhuang/hellominecraft/launcher/api/event/launch/LaunchEvent.java index 0edc36c01..4cf872925 100644 --- a/HMCL/src/core/java/org/jackhuang/hellominecraft/launcher/api/event/launch/LaunchEvent.java +++ b/HMCL/src/core/java/org/jackhuang/hellominecraft/launcher/api/event/launch/LaunchEvent.java @@ -23,7 +23,7 @@ import org.jackhuang.hellominecraft.util.sys.JavaProcess; /** * This event gets fired when we launched the game. *
- * This event is fired on the {@link org.jackhuang.hellominecraft.api.HMCLAPI#EVENT_BUS} + * This event is fired on the {@link org.jackhuang.hellominecraft.api.HMCAPI#EVENT_BUS} * @param source {@link org.jackhuang.hellominecraft.launcher.core.launch.GameLauncher} * @param JavaProcess the game process * @author huangyuhui diff --git a/HMCL/src/core/java/org/jackhuang/hellominecraft/launcher/api/event/launch/LaunchSucceededEvent.java b/HMCL/src/core/java/org/jackhuang/hellominecraft/launcher/api/event/launch/LaunchSucceededEvent.java index ca82a7741..19d0e9da8 100644 --- a/HMCL/src/core/java/org/jackhuang/hellominecraft/launcher/api/event/launch/LaunchSucceededEvent.java +++ b/HMCL/src/core/java/org/jackhuang/hellominecraft/launcher/api/event/launch/LaunchSucceededEvent.java @@ -23,7 +23,7 @@ import org.jackhuang.hellominecraft.api.SimpleEvent; /** * This event gets fired when we make the launching command successfully(not launched the game process). *
- * This event is fired on the {@link org.jackhuang.hellominecraft.api.HMCLAPI#EVENT_BUS} + * This event is fired on the {@link org.jackhuang.hellominecraft.api.HMCAPI#EVENT_BUS} * @param source {@link org.jackhuang.hellominecraft.launcher.core.launch.GameLauncher} * @param List<String> Our launching command. * @author huangyuhui diff --git a/HMCL/src/core/java/org/jackhuang/hellominecraft/launcher/api/event/launch/LaunchingStateChangedEvent.java b/HMCL/src/core/java/org/jackhuang/hellominecraft/launcher/api/event/launch/LaunchingStateChangedEvent.java index 8cb350da3..19c3d5a42 100644 --- a/HMCL/src/core/java/org/jackhuang/hellominecraft/launcher/api/event/launch/LaunchingStateChangedEvent.java +++ b/HMCL/src/core/java/org/jackhuang/hellominecraft/launcher/api/event/launch/LaunchingStateChangedEvent.java @@ -22,7 +22,7 @@ import org.jackhuang.hellominecraft.api.SimpleEvent; /** * This event gets fired when we are launching a game and mark what things we are doing. *
- * This event is fired on the {@link org.jackhuang.hellominecraft.api.HMCLAPI#EVENT_BUS} + * This event is fired on the {@link org.jackhuang.hellominecraft.api.HMCAPI#EVENT_BUS} * @param source {@link org.jackhuang.hellominecraft.launcher.core.launch.GameLauncher} * @param LaunchingState the launching state. * @author huangyuhui diff --git a/HMCL/src/core/java/org/jackhuang/hellominecraft/launcher/api/event/launch/ProcessingLaunchOptionsEvent.java b/HMCL/src/core/java/org/jackhuang/hellominecraft/launcher/api/event/launch/ProcessingLaunchOptionsEvent.java index e7754f421..e496126f9 100644 --- a/HMCL/src/core/java/org/jackhuang/hellominecraft/launcher/api/event/launch/ProcessingLaunchOptionsEvent.java +++ b/HMCL/src/core/java/org/jackhuang/hellominecraft/launcher/api/event/launch/ProcessingLaunchOptionsEvent.java @@ -26,7 +26,7 @@ import org.jackhuang.hellominecraft.launcher.core.launch.LaunchOptions; * Pay attension: If you need to terminate the launching process, you must throw * {@link org.jackhuang.hellominecraft.launcher.core.RuntimeGameException anyway. *
- * This event is fired on the {@link org.jackhuang.hellominecraft.api.HMCLAPI#EVENT_BUS} + * This event is fired on the {@link org.jackhuang.hellominecraft.api.HMCAPI#EVENT_BUS} * @param source {@link org.jackhuang.hellominecraft.launcher.core.launch.GameLauncher} * @param LaunchOptions you can modify the value of this event to control the launching process. * @author huang diff --git a/HMCL/src/core/java/org/jackhuang/hellominecraft/launcher/api/event/launch/ProcessingLoginResultEvent.java b/HMCL/src/core/java/org/jackhuang/hellominecraft/launcher/api/event/launch/ProcessingLoginResultEvent.java index b46f90163..234edcb20 100644 --- a/HMCL/src/core/java/org/jackhuang/hellominecraft/launcher/api/event/launch/ProcessingLoginResultEvent.java +++ b/HMCL/src/core/java/org/jackhuang/hellominecraft/launcher/api/event/launch/ProcessingLoginResultEvent.java @@ -26,7 +26,7 @@ import org.jackhuang.hellominecraft.launcher.core.auth.UserProfileProvider; * Pay attension: If you need to terminate the launching process, you must throw * {@link org.jackhuang.hellominecraft.launcher.core.RuntimeGameException anyway. *
- * This event is fired on the {@link org.jackhuang.hellominecraft.api.HMCLAPI#EVENT_BUS} + * This event is fired on the {@link org.jackhuang.hellominecraft.api.HMCAPI#EVENT_BUS} * @param source {@link org.jackhuang.hellominecraft.launcher.core.launch.GameLauncher} * @param UserProfileProvider you can modify the value of this event to control the user profile. * @author huangyuhui diff --git a/HMCL/src/core/java/org/jackhuang/hellominecraft/launcher/api/event/version/LoadedOneVersionEvent.java b/HMCL/src/core/java/org/jackhuang/hellominecraft/launcher/api/event/version/LoadedOneVersionEvent.java index 490e14553..5bf1c8cf4 100644 --- a/HMCL/src/core/java/org/jackhuang/hellominecraft/launcher/api/event/version/LoadedOneVersionEvent.java +++ b/HMCL/src/core/java/org/jackhuang/hellominecraft/launcher/api/event/version/LoadedOneVersionEvent.java @@ -22,7 +22,7 @@ import org.jackhuang.hellominecraft.api.SimpleEvent; /** * This event gets fired when a minecraft version has been loaded. *
- * This event is fired on the {@link org.jackhuang.hellominecraft.api.HMCLAPI#EVENT_BUS} + * This event is fired on the {@link org.jackhuang.hellominecraft.api.HMCAPI#EVENT_BUS} * @param source {@link org.jackhuang.hellominecraft.launcher.core.version.MinecraftVersionManager} * @param String the version id. * @author huang diff --git a/HMCL/src/core/java/org/jackhuang/hellominecraft/launcher/api/event/version/MinecraftLibraryPathEvent.java b/HMCL/src/core/java/org/jackhuang/hellominecraft/launcher/api/event/version/MinecraftLibraryPathEvent.java index f8c80af78..1a1909145 100644 --- a/HMCL/src/core/java/org/jackhuang/hellominecraft/launcher/api/event/version/MinecraftLibraryPathEvent.java +++ b/HMCL/src/core/java/org/jackhuang/hellominecraft/launcher/api/event/version/MinecraftLibraryPathEvent.java @@ -24,7 +24,7 @@ import org.jackhuang.hellominecraft.util.Wrapper; /** * This event gets fired when we getting minecraft library path. *
- * This event is fired on the {@link org.jackhuang.hellominecraft.api.HMCLAPI#EVENT_BUS} + * This event is fired on the {@link org.jackhuang.hellominecraft.api.HMCAPI#EVENT_BUS} * @param source {@link org.jackhuang.hellominecraft.launcher.core.version.MinecraftLibrary} * @param {@code Wrapper} modify this thing to change to your wanted mc lib. * @author huangyuhui diff --git a/HMCL/src/core/java/org/jackhuang/hellominecraft/launcher/api/event/version/RefreshedVersionsEvent.java b/HMCL/src/core/java/org/jackhuang/hellominecraft/launcher/api/event/version/RefreshedVersionsEvent.java index 8aced6d0f..a9a0f0470 100644 --- a/HMCL/src/core/java/org/jackhuang/hellominecraft/launcher/api/event/version/RefreshedVersionsEvent.java +++ b/HMCL/src/core/java/org/jackhuang/hellominecraft/launcher/api/event/version/RefreshedVersionsEvent.java @@ -23,7 +23,7 @@ import org.jackhuang.hellominecraft.launcher.core.service.IMinecraftService; /** * This event gets fired when all the versions in .minecraft folder are loaded. *
- * This event is fired on the {@link org.jackhuang.hellominecraft.api.HMCLAPI#EVENT_BUS} + * This event is fired on the {@link org.jackhuang.hellominecraft.api.HMCAPI#EVENT_BUS} * @param source {@link org.jackhuang.hellominecraft.launcher.core.version.MinecraftVersionManager} * @param IMinecraftService the .minecraft folder. * @author huangyuhui diff --git a/HMCL/src/core/java/org/jackhuang/hellominecraft/launcher/api/event/version/RefreshingVersionsEvent.java b/HMCL/src/core/java/org/jackhuang/hellominecraft/launcher/api/event/version/RefreshingVersionsEvent.java index cb96b0d62..a78a6ddeb 100644 --- a/HMCL/src/core/java/org/jackhuang/hellominecraft/launcher/api/event/version/RefreshingVersionsEvent.java +++ b/HMCL/src/core/java/org/jackhuang/hellominecraft/launcher/api/event/version/RefreshingVersionsEvent.java @@ -23,7 +23,7 @@ import org.jackhuang.hellominecraft.launcher.core.service.IMinecraftService; /** * This event gets fired when loading versions in a .minecraft folder. *
- * This event is fired on the {@link org.jackhuang.hellominecraft.api.HMCLAPI#EVENT_BUS} + * This event is fired on the {@link org.jackhuang.hellominecraft.api.HMCAPI#EVENT_BUS} * @param source {@link org.jackhuang.hellominecraft.launcher.core.version.MinecraftVersionManager} * @param IMinecraftService .minecraft folder. * @author huang 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 5a097ec29..bd54d495b 100644 --- a/HMCL/src/main/java/org/jackhuang/hellominecraft/launcher/Main.java +++ b/HMCL/src/main/java/org/jackhuang/hellominecraft/launcher/Main.java @@ -112,7 +112,7 @@ public final class Main implements Runnable { try { PluginManager.getPlugin(Class.forName(c)); } catch (ClassNotFoundException ex) { - System.out.println("Class: " + c + " not found, please add your plugin jar to class path."); + LOGGER.log(Level.WARNING, "Class: " + c + " not found, please add your plugin jar to class path.", ex); } } else if (s.startsWith("--help")) { System.out.println("HMCL command line help"); diff --git a/HMCL/src/main/java/org/jackhuang/hellominecraft/launcher/api/event/config/ProfileChangedEvent.java b/HMCL/src/main/java/org/jackhuang/hellominecraft/launcher/api/event/config/ProfileChangedEvent.java index ffb640fbd..c7ddd6a09 100644 --- a/HMCL/src/main/java/org/jackhuang/hellominecraft/launcher/api/event/config/ProfileChangedEvent.java +++ b/HMCL/src/main/java/org/jackhuang/hellominecraft/launcher/api/event/config/ProfileChangedEvent.java @@ -22,6 +22,9 @@ import org.jackhuang.hellominecraft.launcher.setting.Profile; /** * This event gets fired when the selected profile changed. + *
+ * This event is fired on the {@link org.jackhuang.hellominecraft.api.HMCAPI#EVENT_BUS} + * @param source {@link org.jackhuang.hellominecraft.launcher.setting.Settings} * @param Profile the new profile. * @author huangyuhui */ diff --git a/HMCL/src/main/java/org/jackhuang/hellominecraft/launcher/api/event/config/ProfileLoadingEvent.java b/HMCL/src/main/java/org/jackhuang/hellominecraft/launcher/api/event/config/ProfileLoadingEvent.java index 87a54a044..f240aa6be 100644 --- a/HMCL/src/main/java/org/jackhuang/hellominecraft/launcher/api/event/config/ProfileLoadingEvent.java +++ b/HMCL/src/main/java/org/jackhuang/hellominecraft/launcher/api/event/config/ProfileLoadingEvent.java @@ -21,7 +21,10 @@ import java.util.EventObject; /** * This event gets fired when loading profiles. - * @author huang + *
+ * This event is fired on the {@link org.jackhuang.hellominecraft.api.HMCAPI#EVENT_BUS} + * @param source {@link org.jackhuang.hellominecraft.launcher.setting.Settings} + * @author huangyuhui */ public class ProfileLoadingEvent extends EventObject { diff --git a/HMCLaF/src/main/java/org/jackhuang/hellominecraft/lookandfeel/Theme.java b/HMCLaF/src/main/java/org/jackhuang/hellominecraft/lookandfeel/Theme.java index 554105d49..fa10d28cc 100755 --- a/HMCLaF/src/main/java/org/jackhuang/hellominecraft/lookandfeel/Theme.java +++ b/HMCLaF/src/main/java/org/jackhuang/hellominecraft/lookandfeel/Theme.java @@ -28,50 +28,50 @@ import org.jackhuang.hellominecraft.util.C; */ public enum Theme { BLUE(C.i18n("color.blue"), new HashMap() { - { - put("Customized.TabbedPaneTab.selected_foreground", "#106CA3"); - put("Customized.ComboBox.selected_background", "#A0D8F0"); - put("Customized.MainFrame.background", "#106CA3"); - put("Customized.MainFrame.selected_background", "#0C5E91"); - put("Customized.MainFrame.background_image", "background.jpg"); - } - }), + { + put("Customized.TabbedPaneTab.selected_foreground", "#106CA3"); + put("Customized.ComboBox.selected_background", "#A0D8F0"); + put("Customized.MainFrame.background", "#106CA3"); + put("Customized.MainFrame.selected_background", "#0C5E91"); + put("Customized.MainFrame.background_image", "background.jpg"); + } + }), GREEN(C.i18n("color.green"), new HashMap() { - { - put("Customized.TabbedPaneTab.selected_foreground", "#1ABC9C"); - put("Customized.ComboBox.selected_background", "#1ABC9C"); - put("Customized.MainFrame.background", "#1ABC9C"); - put("Customized.MainFrame.selected_background", "#16A085"); - put("Customized.MainFrame.background_image", "background.jpg"); - } - }), + { + put("Customized.TabbedPaneTab.selected_foreground", "#1ABC9C"); + put("Customized.ComboBox.selected_background", "#1ABC9C"); + put("Customized.MainFrame.background", "#1ABC9C"); + put("Customized.MainFrame.selected_background", "#16A085"); + put("Customized.MainFrame.background_image", "background.jpg"); + } + }), PURPLE(C.i18n("color.purple"), new HashMap() { - { - put("Customized.TabbedPaneTab.selected_foreground", "#9B59B6"); - put("Customized.ComboBox.selected_background", "#9B59B6"); - put("Customized.MainFrame.background", "#9B59B6"); - put("Customized.MainFrame.selected_background", "#8E44AD"); - put("Customized.MainFrame.background_image", "background.jpg"); - } - }), + { + put("Customized.TabbedPaneTab.selected_foreground", "#9B59B6"); + put("Customized.ComboBox.selected_background", "#9B59B6"); + put("Customized.MainFrame.background", "#9B59B6"); + put("Customized.MainFrame.selected_background", "#8E44AD"); + put("Customized.MainFrame.background_image", "background.jpg"); + } + }), DARKER_BLUE(C.i18n("color.dark_blue"), new HashMap() { - { - put("Customized.TabbedPaneTab.selected_foreground", "#34495E"); - put("Customized.ComboBox.selected_background", "#34495E"); - put("Customized.MainFrame.background", "#34495E"); - put("Customized.MainFrame.selected_background", "#2C3E50"); - put("Customized.MainFrame.background_image", "background.jpg"); - } - }), + { + put("Customized.TabbedPaneTab.selected_foreground", "#34495E"); + put("Customized.ComboBox.selected_background", "#34495E"); + put("Customized.MainFrame.background", "#34495E"); + put("Customized.MainFrame.selected_background", "#2C3E50"); + put("Customized.MainFrame.background_image", "background.jpg"); + } + }), ORANGE(C.i18n("color.orange"), new HashMap() { - { - put("Customized.TabbedPaneTab.selected_foreground", "#E67E22"); - put("Customized.ComboBox.selected_background", "#F39C12"); - put("Customized.MainFrame.background", "#E67E22"); - put("Customized.MainFrame.selected_background", "#D35400"); - put("Customized.MainFrame.background_image", "background.jpg"); - } - }), + { + put("Customized.TabbedPaneTab.selected_foreground", "#E67E22"); + put("Customized.ComboBox.selected_background", "#F39C12"); + put("Customized.MainFrame.background", "#E67E22"); + put("Customized.MainFrame.selected_background", "#D35400"); + put("Customized.MainFrame.background_image", "background.jpg"); + } + }), RED(C.i18n("color.red"), new HashMap() { { put("Customized.TabbedPaneTab.selected_foreground", "#E74C3C"); diff --git a/HMCSM/build.gradle b/HMCSM/build.gradle index 81d9214a8..e23c7db77 100755 --- a/HMCSM/build.gradle +++ b/HMCSM/build.gradle @@ -20,17 +20,17 @@ buildscript { repositories { mavenCentral(); dependencies { - classpath 'edu.sc.seis.gradle:launch4j:1.0.6' - classpath 'me.tatarka:gradle-retrolambda:3.4.0' + classpath 'me.tatarka:gradle-retrolambda:3.1.0' } } } plugins { id "edu.sc.seis.macAppBundle" version "2.1.6" + //id "me.tatarka.retrolambda" version "3.5.0" + id 'edu.sc.seis.launch4j' version '2.3.0' } -apply plugin: 'launch4j' apply plugin: 'me.tatarka.retrolambda' if (!hasProperty('mainClass')) { diff --git a/HMCUtils/src/main/java/org/jackhuang/hellominecraft/api/event/OutOfDateEvent.java b/HMCUtils/src/main/java/org/jackhuang/hellominecraft/api/event/OutOfDateEvent.java index 61f913daa..ef44afd59 100644 --- a/HMCUtils/src/main/java/org/jackhuang/hellominecraft/api/event/OutOfDateEvent.java +++ b/HMCUtils/src/main/java/org/jackhuang/hellominecraft/api/event/OutOfDateEvent.java @@ -26,7 +26,7 @@ import org.jackhuang.hellominecraft.util.VersionNumber; * This event is {@link org.jackhuang.hellominecraft.api.ResultedEvent} * If this event is failed, HMCL will not ask user to upgrade the application. *
- * This event is fired on the {@link org.jackhuang.hellominecraft.api.HMCLAPI#EVENT_BUS} + * This event is fired on the {@link org.jackhuang.hellominecraft.api.HMCAPI#EVENT_BUS} * @param source {@link org.jackhuang.hellominecraft.util.UpdateChecker} * @param VersionNumber newest version * @author huang diff --git a/HMCUtils/src/main/java/org/jackhuang/hellominecraft/api/event/process/JVMLaunchFailedEvent.java b/HMCUtils/src/main/java/org/jackhuang/hellominecraft/api/event/process/JVMLaunchFailedEvent.java index 5b1f7891e..796596fb7 100644 --- a/HMCUtils/src/main/java/org/jackhuang/hellominecraft/api/event/process/JVMLaunchFailedEvent.java +++ b/HMCUtils/src/main/java/org/jackhuang/hellominecraft/api/event/process/JVMLaunchFailedEvent.java @@ -23,7 +23,7 @@ import org.jackhuang.hellominecraft.util.sys.JavaProcess; /** * This event gets fired when we launch the JVM and it got crashed. *
- * This event is fired on the {@link org.jackhuang.hellominecraft.api.HMCLAPI#EVENT_BUS} + * This event is fired on the {@link org.jackhuang.hellominecraft.api.HMCAPI#EVENT_BUS} * @param source {@link org.jackhuang.hellominecraft.util.sys.JavaProcessMonitor} * @param JavaProcess the crashed process. * @author huangyuhui diff --git a/HMCUtils/src/main/java/org/jackhuang/hellominecraft/api/event/process/JavaProcessExitedAbnormallyEvent.java b/HMCUtils/src/main/java/org/jackhuang/hellominecraft/api/event/process/JavaProcessExitedAbnormallyEvent.java index 869dbb8c5..b897bc0d1 100644 --- a/HMCUtils/src/main/java/org/jackhuang/hellominecraft/api/event/process/JavaProcessExitedAbnormallyEvent.java +++ b/HMCUtils/src/main/java/org/jackhuang/hellominecraft/api/event/process/JavaProcessExitedAbnormallyEvent.java @@ -23,7 +23,7 @@ import org.jackhuang.hellominecraft.util.sys.JavaProcess; /** * This event gets fired when a JavaProcess exited abnormally and the exit code is not zero. *
- * This event is fired on the {@link org.jackhuang.hellominecraft.api.HMCLAPI#EVENT_BUS} + * This event is fired on the {@link org.jackhuang.hellominecraft.api.HMCAPI#EVENT_BUS} * @param source {@link org.jackhuang.hellominecraft.util.sys.JavaProcessMonitor} * @param JavaProcess The process that exited abnormally. * @author huangyuhui diff --git a/HMCUtils/src/main/java/org/jackhuang/hellominecraft/api/event/process/JavaProcessStartingEvent.java b/HMCUtils/src/main/java/org/jackhuang/hellominecraft/api/event/process/JavaProcessStartingEvent.java index 837bb7b20..a78f4d044 100644 --- a/HMCUtils/src/main/java/org/jackhuang/hellominecraft/api/event/process/JavaProcessStartingEvent.java +++ b/HMCUtils/src/main/java/org/jackhuang/hellominecraft/api/event/process/JavaProcessStartingEvent.java @@ -23,7 +23,7 @@ import org.jackhuang.hellominecraft.util.sys.JavaProcess; /** * This event gets fired when a JavaProcess is starting. *
- * This event is fired on the {@link org.jackhuang.hellominecraft.api.HMCLAPI#EVENT_BUS} + * This event is fired on the {@link org.jackhuang.hellominecraft.api.HMCAPI#EVENT_BUS} * @param source {@link org.jackhuang.hellominecraft.util.sys.JavaProcessMonitor} * @param JavaProcess the starting JavaProcess. * @author huang diff --git a/HMCUtils/src/main/java/org/jackhuang/hellominecraft/api/event/process/JavaProcessStoppedEvent.java b/HMCUtils/src/main/java/org/jackhuang/hellominecraft/api/event/process/JavaProcessStoppedEvent.java index 0e84dcdb7..ffbf2d5cf 100644 --- a/HMCUtils/src/main/java/org/jackhuang/hellominecraft/api/event/process/JavaProcessStoppedEvent.java +++ b/HMCUtils/src/main/java/org/jackhuang/hellominecraft/api/event/process/JavaProcessStoppedEvent.java @@ -23,7 +23,7 @@ import org.jackhuang.hellominecraft.util.sys.JavaProcess; /** * This event gets fired when minecraft process exited successfully and the exit code is 0. *
- * This event is fired on the {@link org.jackhuang.hellominecraft.api.HMCLAPI#EVENT_BUS} + * This event is fired on the {@link org.jackhuang.hellominecraft.api.HMCAPI#EVENT_BUS} * @param source {@link org.jackhuang.hellominecraft.util.sys.JavaProcessMonitor} * @param JavaProcess minecraft process * @author huangyuhui