diff --git a/.gitignore b/.gitignore index d98830a22..a89fc0c3f 100644 --- a/.gitignore +++ b/.gitignore @@ -26,4 +26,6 @@ HMCLServer/ HMCSM/build/ MetroLookAndFeel/build/ /HMCUtils/build/ -/HMCLaF/build/ \ No newline at end of file +/HMCLaF/build/ +/HMCLUtils/build/ +/HMCLCore/build/ \ No newline at end of file diff --git a/HMCL/build.gradle b/HMCL/build.gradle index 404ea741b..8b54e2474 100755 --- a/HMCL/build.gradle +++ b/HMCL/build.gradle @@ -39,7 +39,7 @@ import java.util.zip.ZipEntry import java.util.zip.ZipFile if (!hasProperty('mainClass')) { - ext.mainClass = 'org.jackhuang.hellominecraft.launcher.Main' + ext.mainClass = 'org.jackhuang.hmcl.Main' } def buildnumber = System.getenv("TRAVIS_BUILD_NUMBER") @@ -63,7 +63,6 @@ String mavenArtifactId = name task generateSources(type: Copy) { from 'src/main/java' - from 'src/core/java' into "$buildDir/generated-src" filter(org.apache.tools.ant.filters.ReplaceTokens, tokens: [ 'HELLO_MINECRAFT_LAUNCHER_VERSION_FOR_GRADLE_REPLACING': mavenVersion @@ -85,30 +84,6 @@ macAppBundle { javaProperties.put("apple.laf.useScreenMenuBar", "true") } -sourceSets { - main { - java { - srcDirs = [ - 'src/core/java/', - 'src/main/java/' - ] - } - resources { - srcDirs = ['src/main/resources/'] - } - } - core { - java { - compileClasspath += main.compileClasspath - runtimeClasspath += main.runtimeClasspath - srcDirs 'src/core/java/' - } - resources { - srcDirs 'src/main/resources/' - } - } -} - configurations { coreCompile.extendsFrom compile coreRuntime.extendsFrom runtime @@ -124,26 +99,26 @@ configure(install.repositories.mavenInstaller) { dependencies { compile project(":HMCLaF") - compile project(":HMCUtils") - compile group: "org.commonjava.googlecode.markdown4j", name: "markdown4j", version: "2.2-cj-1.0" + compile project(":HMCLAPI") + compile project(":HMCLCore") } retrolambda { - javaVersion = JavaVersion.VERSION_1_6 + javaVersion = JavaVersion.VERSION_1_7 } jar { from { configurations.compile.collect { it.isDirectory() ? it : zipTree(it) } } manifest { - attributes 'Created-By' : 'Copyright(c) 2013-2016 huangyuhui.', + attributes 'Created-By' : 'Copyright(c) 2013-2017 huangyuhui.', 'Main-Class' : mainClass } } launch4j { supportUrl = 'http://www.mcbbs.net/thread-142335-1-1.html' - jreMinVersion = '1.6.0' + jreMinVersion = '1.7.0' mainClassName = mainClass icon = new File(project.buildDir, '../icon.ico').absolutePath diff --git a/HMCL/src/core/java/org/jackhuang/hellominecraft/launcher/core/download/MinecraftRemoteLatestVersion.java b/HMCL/src/core/java/org/jackhuang/hellominecraft/launcher/core/download/MinecraftRemoteLatestVersion.java deleted file mode 100644 index d707fef92..000000000 --- a/HMCL/src/core/java/org/jackhuang/hellominecraft/launcher/core/download/MinecraftRemoteLatestVersion.java +++ /dev/null @@ -1,34 +0,0 @@ -/* - * Hello Minecraft!. - * 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.download; - -import com.google.gson.annotations.SerializedName; - -/** - * - * @author huangyuhui - */ -public class MinecraftRemoteLatestVersion { - - @SerializedName("snapshot") - public String snapshot; - - @SerializedName("release") - public String release; - -} diff --git a/HMCL/src/main/java/org/jackhuang/hellominecraft/launcher/Main.java b/HMCL/src/main/java/org/jackhuang/hmcl/Main.java similarity index 77% rename from HMCL/src/main/java/org/jackhuang/hellominecraft/launcher/Main.java rename to HMCL/src/main/java/org/jackhuang/hmcl/Main.java index bd54d495b..08e2b7b56 100644 --- a/HMCL/src/main/java/org/jackhuang/hellominecraft/launcher/Main.java +++ b/HMCL/src/main/java/org/jackhuang/hmcl/Main.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; +package org.jackhuang.hmcl; import java.io.File; import java.io.FileOutputStream; @@ -36,25 +36,27 @@ import javax.swing.ImageIcon; import javax.swing.RepaintManager; import javax.swing.UIManager; import javax.swing.UnsupportedLookAndFeelException; -import org.jackhuang.hellominecraft.util.log.HMCLog; -import org.jackhuang.hellominecraft.launcher.api.PluginManager; -import org.jackhuang.hellominecraft.launcher.core.launch.GameLauncher; -import org.jackhuang.hellominecraft.launcher.util.CrashReporter; -import org.jackhuang.hellominecraft.util.log.Configuration; -import org.jackhuang.hellominecraft.util.log.appender.ConsoleAppender; -import org.jackhuang.hellominecraft.util.log.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.util.ui.MyRepaintManager; -import org.jackhuang.hellominecraft.launcher.util.DefaultPlugin; -import org.jackhuang.hellominecraft.lookandfeel.HelloMinecraftLookAndFeel; -import org.jackhuang.hellominecraft.util.MathUtils; -import org.jackhuang.hellominecraft.util.MessageBox; -import org.jackhuang.hellominecraft.util.StrUtils; -import org.jackhuang.hellominecraft.util.lang.SupportedLocales; -import org.jackhuang.hellominecraft.util.VersionNumber; +import org.jackhuang.hmcl.api.HMCLApi; +import org.jackhuang.hmcl.api.HMCLog; +import org.jackhuang.hmcl.api.ILogger; +import org.jackhuang.hmcl.api.PluginManager; +import org.jackhuang.hmcl.api.VersionNumber; +import org.jackhuang.hmcl.laf.HelloMinecraftLookAndFeel; +import org.jackhuang.hmcl.setting.Settings; +import org.jackhuang.hmcl.ui.LogWindow; +import org.jackhuang.hmcl.ui.MainFrame; +import org.jackhuang.hmcl.util.CrashReporter; +import org.jackhuang.hmcl.util.DefaultPlugin; +import org.jackhuang.hmcl.util.MathUtils; +import org.jackhuang.hmcl.util.MessageBox; +import org.jackhuang.hmcl.util.StrUtils; +import org.jackhuang.hmcl.util.lang.SupportedLocales; +import org.jackhuang.hmcl.util.log.Configuration; +import org.jackhuang.hmcl.util.log.appender.ConsoleAppender; +import org.jackhuang.hmcl.util.log.layout.DefaultLayout; +import org.jackhuang.hmcl.util.sys.ProcessManager; +import org.jackhuang.hmcl.util.ui.MyRepaintManager; +import org.jackhuang.hmcl.util.upgrade.IUpgrader; /** * @@ -82,10 +84,6 @@ public final class Main implements Runnable { public static final String LAUNCHER_VERSION = "@HELLO_MINECRAFT_LAUNCHER_VERSION_FOR_GRADLE_REPLACING@"; public static final int MINIMUM_LAUNCHER_VERSION = 16; - public static VersionNumber getVersionNumber() { - return VersionNumber.check(LAUNCHER_VERSION); - } - /** * Make the main window title. * @@ -105,6 +103,8 @@ public final class Main implements Runnable { public static void main(String[] args) throws IOException { { + HMCLApi.HMCL_VERSION = VersionNumber.check(LAUNCHER_VERSION); + PluginManager.getPlugin(DefaultPlugin.class); for (String s : args) if (s.startsWith("--plugin=")) { @@ -121,7 +121,7 @@ public final class Main implements Runnable { return; } - IUpgrader.NOW_UPGRADER.parseArguments(getVersionNumber(), args); + IUpgrader.NOW_UPGRADER.parseArguments(HMCLApi.HMCL_VERSION, args); System.setProperty("awt.useSystemAAFontSettings", "on"); System.setProperty("swing.aatext", "true"); @@ -147,6 +147,34 @@ public final class Main implements Runnable { } catch (IOException ex) { LOGGER.log(Level.SEVERE, "Failed to add log appender File because an error occurred while creating or opening hmcl.log", ex); } + + org.jackhuang.hmcl.util.log.logger.Logger logger = new org.jackhuang.hmcl.util.log.logger.Logger("HMCL"); + HMCLog.LOGGER = new ILogger() { + @Override + public void log(String msg) { + logger.info(msg); + } + + @Override + public void warn(String msg) { + logger.warn(msg); + } + + @Override + public void warn(String msg, Throwable t) { + logger.warn(msg, t); + } + + @Override + public void err(String msg) { + logger.error(msg); + } + + @Override + public void err(String msg, Throwable t) { + logger.error(msg, t); + } + }; HMCLog.log("*** " + Main.makeTitle() + " ***"); @@ -169,7 +197,7 @@ public final class Main implements Runnable { } LogWindow.INSTANCE.clean(); - LogWindow.INSTANCE.setTerminateGame(GameLauncher.PROCESS_MANAGER::stopAllProcesses); + LogWindow.INSTANCE.setTerminateGame(ProcessManager::stopAllProcesses); Settings.UPDATE_CHECKER.upgrade.register(IUpgrader.NOW_UPGRADER); Settings.UPDATE_CHECKER.process(false).reg(t -> Main.invokeUpdate()).execute(); @@ -186,14 +214,14 @@ public final class Main implements Runnable { } }); } - + MainFrame.showMainFrame(); } } @Override public void run() { - GameLauncher.PROCESS_MANAGER.stopAllProcesses(); + ProcessManager.stopAllProcesses(); } public static void invokeUpdate() { @@ -202,7 +230,7 @@ public final class Main implements Runnable { public static ImageIcon getIcon(String path) { try { - return new ImageIcon(Main.class.getResource("/org/jackhuang/hellominecraft/launcher/" + path)); + return new ImageIcon(Main.class.getResource("/org/jackhuang/hmcl/" + path)); } catch (Exception e) { HMCLog.err("Failed to load icon", e); return null; diff --git a/HMCL/src/main/java/org/jackhuang/hellominecraft/launcher/api/event/config/ProfileChangedEvent.java b/HMCL/src/main/java/org/jackhuang/hmcl/api/event/config/ProfileChangedEvent.java similarity index 75% rename from HMCL/src/main/java/org/jackhuang/hellominecraft/launcher/api/event/config/ProfileChangedEvent.java rename to HMCL/src/main/java/org/jackhuang/hmcl/api/event/config/ProfileChangedEvent.java index c7ddd6a09..25eec8ef0 100644 --- a/HMCL/src/main/java/org/jackhuang/hellominecraft/launcher/api/event/config/ProfileChangedEvent.java +++ b/HMCL/src/main/java/org/jackhuang/hmcl/api/event/config/ProfileChangedEvent.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.api.event.config; +package org.jackhuang.hmcl.api.event.config; -import org.jackhuang.hellominecraft.api.SimpleEvent; -import org.jackhuang.hellominecraft.launcher.setting.Profile; +import org.jackhuang.hmcl.api.event.SimpleEvent; +import org.jackhuang.hmcl.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} + * This event is fired on the {@link org.jackhuang.hmcl.api.HMCLApi#EVENT_BUS} + * @param source {@link org.jackhuang.hmcl.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/hmcl/api/event/config/ProfileLoadingEvent.java similarity index 81% rename from HMCL/src/main/java/org/jackhuang/hellominecraft/launcher/api/event/config/ProfileLoadingEvent.java rename to HMCL/src/main/java/org/jackhuang/hmcl/api/event/config/ProfileLoadingEvent.java index f240aa6be..9754d30a2 100644 --- a/HMCL/src/main/java/org/jackhuang/hellominecraft/launcher/api/event/config/ProfileLoadingEvent.java +++ b/HMCL/src/main/java/org/jackhuang/hmcl/api/event/config/ProfileLoadingEvent.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.launcher.api.event.config; +package org.jackhuang.hmcl.api.event.config; import java.util.EventObject; /** * This event gets fired when loading profiles. *
- * This event is fired on the {@link org.jackhuang.hellominecraft.api.HMCAPI#EVENT_BUS} - * @param source {@link org.jackhuang.hellominecraft.launcher.setting.Settings} + * This event is fired on the {@link org.jackhuang.hmcl.api.HMCLApi#EVENT_BUS} + * @param source {@link org.jackhuang.hmcl.setting.Settings} * @author huangyuhui */ public class ProfileLoadingEvent extends EventObject { diff --git a/HMCL/src/main/java/org/jackhuang/hellominecraft/launcher/setting/Config.java b/HMCL/src/main/java/org/jackhuang/hmcl/setting/Config.java similarity index 83% rename from HMCL/src/main/java/org/jackhuang/hellominecraft/launcher/setting/Config.java rename to HMCL/src/main/java/org/jackhuang/hmcl/setting/Config.java index 6e0e7cf53..ca5f51955 100755 --- a/HMCL/src/main/java/org/jackhuang/hellominecraft/launcher/setting/Config.java +++ b/HMCL/src/main/java/org/jackhuang/hmcl/setting/Config.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.setting; +package org.jackhuang.hmcl.setting; -import org.jackhuang.hellominecraft.launcher.core.download.DownloadType; +import org.jackhuang.hmcl.core.download.DownloadType; import com.google.gson.annotations.SerializedName; import java.util.ArrayList; import java.util.HashMap; @@ -25,15 +25,17 @@ import java.util.List; import java.util.Map; 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.api.HMCAPI; -import org.jackhuang.hellominecraft.launcher.api.event.config.AuthenticatorChangedEvent; -import org.jackhuang.hellominecraft.launcher.api.event.config.DownloadTypeChangedEvent; -import org.jackhuang.hellominecraft.launcher.api.event.config.ThemeChangedEvent; -import org.jackhuang.hellominecraft.launcher.core.MCUtils; -import org.jackhuang.hellominecraft.util.sys.JdkVersion; -import org.jackhuang.hellominecraft.util.sys.OS; +import org.jackhuang.hmcl.core.auth.AbstractAuthenticator; +import org.jackhuang.hmcl.laf.LAFTheme; +import org.jackhuang.hmcl.api.HMCLApi; +import org.jackhuang.hmcl.api.event.config.AuthenticatorChangedEvent; +import org.jackhuang.hmcl.api.event.config.DownloadTypeChangedEvent; +import org.jackhuang.hmcl.api.event.config.ThemeChangedEvent; +import org.jackhuang.hmcl.core.MCUtils; +import org.jackhuang.hmcl.util.sys.JdkVersion; +import org.jackhuang.hmcl.util.sys.OS; +import org.jackhuang.hmcl.api.auth.IAuthenticator; +import org.jackhuang.hmcl.api.ui.Theme; /** * @@ -66,7 +68,7 @@ public final class Config implements Cloneable { @SerializedName("decorated") private boolean decorated; @SerializedName("theme") - private int theme; + private String theme; @SerializedName("java") private List java; @SerializedName("localization") @@ -85,14 +87,14 @@ public final class Config implements Cloneable { } public Theme getTheme() { - if (theme >= Theme.values().length) - theme = 0; - return Theme.values()[theme]; + if (!Theme.THEMES.containsKey(theme)) + theme = LAFTheme.BLUE.id; + return Theme.THEMES.get(theme); } - public void setTheme(int theme) { + public void setTheme(String theme) { this.theme = theme; - HMCAPI.EVENT_BUS.fireChannel(new ThemeChangedEvent(this, getTheme())); + HMCLApi.EVENT_BUS.fireChannel(new ThemeChangedEvent(this, getTheme())); Settings.save(); } @@ -169,20 +171,20 @@ public final class Config implements Cloneable { } public IAuthenticator getAuthenticator() { - return IAuthenticator.LOGINS.get(getLoginType()); + return AbstractAuthenticator.LOGINS.get(getLoginType()); } public int getLoginType() { - if (logintype < 0 || logintype >= IAuthenticator.LOGINS.size()) + if (logintype < 0 || logintype >= AbstractAuthenticator.LOGINS.size()) logintype = 0; return logintype; } public void setLoginType(int logintype) { - if (logintype < 0 || logintype >= IAuthenticator.LOGINS.size()) + if (logintype < 0 || logintype >= AbstractAuthenticator.LOGINS.size()) return; this.logintype = logintype; - HMCAPI.EVENT_BUS.fireChannel(new AuthenticatorChangedEvent(this, IAuthenticator.LOGINS.get(logintype))); + HMCLApi.EVENT_BUS.fireChannel(new AuthenticatorChangedEvent(this, AbstractAuthenticator.LOGINS.get(logintype))); Settings.save(); } @@ -192,7 +194,7 @@ public final class Config implements Cloneable { public void setDownloadType(int downloadtype) { this.downloadtype = downloadtype; - HMCAPI.EVENT_BUS.fireChannel(new DownloadTypeChangedEvent(this, getDownloadSource())); + HMCLApi.EVENT_BUS.fireChannel(new DownloadTypeChangedEvent(this, getDownloadSource().name())); Settings.save(); } @@ -219,7 +221,7 @@ public final class Config implements Cloneable { clientToken = UUID.randomUUID().toString(); logintype = downloadtype = 0; enableAnimation = enableBlur = enableShadow = true; - theme = 4; + theme = LAFTheme.BLUE.id; decorated = OS.os() == OS.LINUX; auth = new HashMap<>(); commonpath = MCUtils.getLocation().getAbsolutePath(); diff --git a/HMCL/src/main/java/org/jackhuang/hellominecraft/launcher/setting/Profile.java b/HMCL/src/main/java/org/jackhuang/hmcl/setting/Profile.java similarity index 90% rename from HMCL/src/main/java/org/jackhuang/hellominecraft/launcher/setting/Profile.java rename to HMCL/src/main/java/org/jackhuang/hmcl/setting/Profile.java index 2d66b4ff3..aeaa6f6cb 100755 --- a/HMCL/src/main/java/org/jackhuang/hellominecraft/launcher/setting/Profile.java +++ b/HMCL/src/main/java/org/jackhuang/hmcl/setting/Profile.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.setting; +package org.jackhuang.hmcl.setting; import com.google.gson.annotations.SerializedName; -import org.jackhuang.hellominecraft.launcher.util.HMCLGameLauncher; -import org.jackhuang.hellominecraft.launcher.util.HMCLMinecraftService; +import org.jackhuang.hmcl.util.HMCLGameLauncher; +import org.jackhuang.hmcl.util.HMCLMinecraftService; import java.io.File; -import org.jackhuang.hellominecraft.launcher.core.MCUtils; -import org.jackhuang.hellominecraft.launcher.core.version.MinecraftVersion; -import org.jackhuang.hellominecraft.util.sys.IOUtils; -import org.jackhuang.hellominecraft.util.StrUtils; -import org.jackhuang.hellominecraft.api.EventHandler; -import org.jackhuang.hellominecraft.api.PropertyChangedEvent; -import org.jackhuang.hellominecraft.util.sys.OS; +import org.jackhuang.hmcl.core.MCUtils; +import org.jackhuang.hmcl.core.version.MinecraftVersion; +import org.jackhuang.hmcl.util.sys.IOUtils; +import org.jackhuang.hmcl.util.StrUtils; +import org.jackhuang.hmcl.api.event.EventHandler; +import org.jackhuang.hmcl.api.event.PropertyChangedEvent; +import org.jackhuang.hmcl.util.sys.OS; /** * diff --git a/HMCL/src/main/java/org/jackhuang/hellominecraft/launcher/setting/Settings.java b/HMCL/src/main/java/org/jackhuang/hmcl/setting/Settings.java similarity index 83% rename from HMCL/src/main/java/org/jackhuang/hellominecraft/launcher/setting/Settings.java rename to HMCL/src/main/java/org/jackhuang/hmcl/setting/Settings.java index 2c1f4e3c3..efe0ad3fc 100755 --- a/HMCL/src/main/java/org/jackhuang/hellominecraft/launcher/setting/Settings.java +++ b/HMCL/src/main/java/org/jackhuang/hmcl/setting/Settings.java @@ -15,26 +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.setting; +package org.jackhuang.hmcl.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.util.C; -import org.jackhuang.hellominecraft.util.log.HMCLog; -import org.jackhuang.hellominecraft.launcher.Main; -import org.jackhuang.hellominecraft.launcher.core.MCUtils; -import org.jackhuang.hellominecraft.launcher.core.download.DownloadType; -import org.jackhuang.hellominecraft.util.CollectionUtils; -import org.jackhuang.hellominecraft.api.HMCAPI; -import org.jackhuang.hellominecraft.launcher.api.event.config.ProfileChangedEvent; -import org.jackhuang.hellominecraft.launcher.api.event.config.ProfileLoadingEvent; -import org.jackhuang.hellominecraft.util.sys.FileUtils; -import org.jackhuang.hellominecraft.util.MessageBox; -import org.jackhuang.hellominecraft.util.UpdateChecker; -import org.jackhuang.hellominecraft.util.sys.IOUtils; +import org.jackhuang.hmcl.util.C; +import org.jackhuang.hmcl.api.HMCLog; +import org.jackhuang.hmcl.core.MCUtils; +import org.jackhuang.hmcl.core.download.DownloadType; +import org.jackhuang.hmcl.util.CollectionUtils; +import org.jackhuang.hmcl.api.HMCLApi; +import org.jackhuang.hmcl.api.event.config.ProfileChangedEvent; +import org.jackhuang.hmcl.api.event.config.ProfileLoadingEvent; +import org.jackhuang.hmcl.util.sys.FileUtils; +import org.jackhuang.hmcl.util.MessageBox; +import org.jackhuang.hmcl.util.UpdateChecker; +import org.jackhuang.hmcl.util.sys.IOUtils; /** * @@ -48,7 +47,7 @@ public final class Settings { public static final File SETTINGS_FILE = new File("hmcl.json"); private static final Config SETTINGS; - public static final UpdateChecker UPDATE_CHECKER = new UpdateChecker(Main.getVersionNumber(), "hmcl"); + public static final UpdateChecker UPDATE_CHECKER = new UpdateChecker(HMCLApi.HMCL_VERSION, "hmcl"); public static Config getInstance() { return SETTINGS; @@ -56,7 +55,7 @@ public final class Settings { static { SETTINGS = initSettings(); - DownloadType.setSuggestedDownloadType(SETTINGS.getDownloadSource()); + DownloadType.setSuggestedDownloadType(SETTINGS.getDownloadSource().name()); if (!getProfiles().containsKey(DEFAULT_PROFILE)) getProfiles().put(DEFAULT_PROFILE, new Profile(DEFAULT_PROFILE)); @@ -161,12 +160,12 @@ public final class Settings { Profile p = getLastProfile(); if (p == null) throw new Error("No profiles here, it should not happen"); - HMCAPI.EVENT_BUS.fireChannel(new ProfileChangedEvent(SETTINGS, p)); + HMCLApi.EVENT_BUS.fireChannel(new ProfileChangedEvent(SETTINGS, p)); p.onSelected(); } public static void onProfileLoading() { - HMCAPI.EVENT_BUS.fireChannel(new ProfileLoadingEvent(SETTINGS)); + HMCLApi.EVENT_BUS.fireChannel(new ProfileLoadingEvent(SETTINGS)); onProfileChanged(); } } diff --git a/HMCL/src/main/java/org/jackhuang/hellominecraft/launcher/setting/VersionSetting.java b/HMCL/src/main/java/org/jackhuang/hmcl/setting/VersionSetting.java similarity index 88% rename from HMCL/src/main/java/org/jackhuang/hellominecraft/launcher/setting/VersionSetting.java rename to HMCL/src/main/java/org/jackhuang/hmcl/setting/VersionSetting.java index dd4c27644..f2f2a1ca7 100644 --- a/HMCL/src/main/java/org/jackhuang/hellominecraft/launcher/setting/VersionSetting.java +++ b/HMCL/src/main/java/org/jackhuang/hmcl/setting/VersionSetting.java @@ -15,23 +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.launcher.setting; +package org.jackhuang.hmcl.setting; import com.google.gson.annotations.SerializedName; import java.io.File; -import java.io.IOException; -import org.jackhuang.hellominecraft.launcher.Main; -import org.jackhuang.hellominecraft.launcher.util.LauncherVisibility; -import org.jackhuang.hellominecraft.launcher.core.launch.LaunchOptions; -import org.jackhuang.hellominecraft.launcher.core.version.GameDirType; -import org.jackhuang.hellominecraft.util.C; -import org.jackhuang.hellominecraft.api.EventHandler; -import org.jackhuang.hellominecraft.api.PropertyChangedEvent; -import org.jackhuang.hellominecraft.util.StrUtils; -import org.jackhuang.hellominecraft.util.log.HMCLog; -import org.jackhuang.hellominecraft.util.sys.Java; -import org.jackhuang.hellominecraft.util.sys.JdkVersion; -import org.jackhuang.hellominecraft.util.sys.OS; +import org.jackhuang.hmcl.Main; +import org.jackhuang.hmcl.util.LauncherVisibility; +import org.jackhuang.hmcl.api.game.LaunchOptions; +import org.jackhuang.hmcl.api.game.GameDirType; +import org.jackhuang.hmcl.util.C; +import org.jackhuang.hmcl.api.event.EventHandler; +import org.jackhuang.hmcl.api.event.PropertyChangedEvent; +import org.jackhuang.hmcl.util.StrUtils; +import org.jackhuang.hmcl.api.HMCLog; +import org.jackhuang.hmcl.util.sys.Java; +import org.jackhuang.hmcl.util.sys.OS; /** * @@ -338,19 +336,6 @@ public class VersionSetting { setJava(null); str = getJavaDir(); } - JdkVersion jv = new JdkVersion(str); - if (Settings.getInstance().getJava().contains(jv)) - jv = Settings.getInstance().getJava().get(Settings.getInstance().getJava().indexOf(jv)); - else - try { - jv = JdkVersion.getJavaVersionFromExecutable(str); - Settings.getInstance().getJava().add(jv); - Settings.save(); - } catch (IOException ex) { - HMCLog.warn("Failed to get java version", ex); - jv = null; - } - x.setJava(jv); x.setJavaDir(str); return x; } diff --git a/HMCL/src/main/java/org/jackhuang/hellominecraft/launcher/ui/DraggableFrame.java b/HMCL/src/main/java/org/jackhuang/hmcl/ui/DraggableFrame.java similarity index 97% rename from HMCL/src/main/java/org/jackhuang/hellominecraft/launcher/ui/DraggableFrame.java rename to HMCL/src/main/java/org/jackhuang/hmcl/ui/DraggableFrame.java index 597bdae2f..0081d48ab 100755 --- a/HMCL/src/main/java/org/jackhuang/hellominecraft/launcher/ui/DraggableFrame.java +++ b/HMCL/src/main/java/org/jackhuang/hmcl/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.ui; +package org.jackhuang.hmcl.ui; import java.awt.event.MouseEvent; import java.awt.event.MouseListener; diff --git a/HMCL/src/main/java/org/jackhuang/hellominecraft/launcher/ui/GameDownloadPanel.form b/HMCL/src/main/java/org/jackhuang/hmcl/ui/GameDownloadPanel.form similarity index 93% rename from HMCL/src/main/java/org/jackhuang/hellominecraft/launcher/ui/GameDownloadPanel.form rename to HMCL/src/main/java/org/jackhuang/hmcl/ui/GameDownloadPanel.form index 220f84fd9..1b40154f7 100755 --- a/HMCL/src/main/java/org/jackhuang/hellominecraft/launcher/ui/GameDownloadPanel.form +++ b/HMCL/src/main/java/org/jackhuang/hmcl/ui/GameDownloadPanel.form @@ -41,7 +41,7 @@ - + @@ -74,7 +74,7 @@ - + diff --git a/HMCL/src/main/java/org/jackhuang/hellominecraft/launcher/ui/GameDownloadPanel.java b/HMCL/src/main/java/org/jackhuang/hmcl/ui/GameDownloadPanel.java similarity index 92% rename from HMCL/src/main/java/org/jackhuang/hellominecraft/launcher/ui/GameDownloadPanel.java rename to HMCL/src/main/java/org/jackhuang/hmcl/ui/GameDownloadPanel.java index ca6c8351b..93d378f15 100755 --- a/HMCL/src/main/java/org/jackhuang/hellominecraft/launcher/ui/GameDownloadPanel.java +++ b/HMCL/src/main/java/org/jackhuang/hmcl/ui/GameDownloadPanel.java @@ -15,17 +15,17 @@ * 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.ui; +package org.jackhuang.hmcl.ui; -import org.jackhuang.hellominecraft.util.ui.Page; +import org.jackhuang.hmcl.util.ui.Page; import javax.swing.table.DefaultTableModel; -import org.jackhuang.hellominecraft.launcher.core.download.MinecraftRemoteVersions; -import org.jackhuang.hellominecraft.launcher.setting.Settings; -import org.jackhuang.hellominecraft.util.C; -import org.jackhuang.hellominecraft.util.MessageBox; -import org.jackhuang.hellominecraft.util.StrUtils; -import org.jackhuang.hellominecraft.util.task.TaskWindow; -import org.jackhuang.hellominecraft.util.ui.SwingUtils; +import org.jackhuang.hmcl.core.download.MinecraftRemoteVersions; +import org.jackhuang.hmcl.setting.Settings; +import org.jackhuang.hmcl.util.C; +import org.jackhuang.hmcl.util.MessageBox; +import org.jackhuang.hmcl.util.StrUtils; +import org.jackhuang.hmcl.util.task.TaskWindow; +import org.jackhuang.hmcl.util.ui.SwingUtils; /** * diff --git a/HMCL/src/main/java/org/jackhuang/hellominecraft/launcher/ui/GameSettingsPanel.form b/HMCL/src/main/java/org/jackhuang/hmcl/ui/GameSettingsPanel.form similarity index 90% rename from HMCL/src/main/java/org/jackhuang/hellominecraft/launcher/ui/GameSettingsPanel.form rename to HMCL/src/main/java/org/jackhuang/hmcl/ui/GameSettingsPanel.form index 2aa7d94ee..ec3600fea 100755 --- a/HMCL/src/main/java/org/jackhuang/hellominecraft/launcher/ui/GameSettingsPanel.form +++ b/HMCL/src/main/java/org/jackhuang/hmcl/ui/GameSettingsPanel.form @@ -92,7 +92,7 @@ - + @@ -208,7 +208,7 @@ - + @@ -220,7 +220,7 @@ - + @@ -245,7 +245,7 @@ - + @@ -260,14 +260,14 @@ - + - + @@ -286,7 +286,7 @@ - + @@ -307,14 +307,14 @@ - + - + @@ -331,7 +331,7 @@ - + @@ -351,7 +351,7 @@ - + @@ -361,7 +361,7 @@ - + @@ -389,7 +389,7 @@ - + @@ -479,14 +479,14 @@ - + - + @@ -501,14 +501,14 @@ - + - + @@ -520,7 +520,7 @@ - + @@ -530,7 +530,7 @@ - + @@ -542,7 +542,7 @@ - + @@ -554,7 +554,7 @@ - + @@ -566,7 +566,7 @@ - + @@ -583,7 +583,7 @@ - + @@ -672,7 +672,7 @@ - + @@ -682,7 +682,7 @@ - + @@ -692,7 +692,7 @@ - + @@ -711,7 +711,7 @@ - + @@ -807,7 +807,7 @@ - + @@ -840,7 +840,7 @@ - + @@ -895,7 +895,7 @@ - + @@ -905,7 +905,7 @@ - + @@ -920,7 +920,7 @@ - + @@ -930,7 +930,7 @@ - + @@ -940,7 +940,7 @@ - + @@ -955,7 +955,7 @@ - + @@ -965,7 +965,7 @@ - + @@ -975,7 +975,7 @@ - + @@ -985,7 +985,7 @@ - + diff --git a/HMCL/src/main/java/org/jackhuang/hellominecraft/launcher/ui/GameSettingsPanel.java b/HMCL/src/main/java/org/jackhuang/hmcl/ui/GameSettingsPanel.java similarity index 97% rename from HMCL/src/main/java/org/jackhuang/hellominecraft/launcher/ui/GameSettingsPanel.java rename to HMCL/src/main/java/org/jackhuang/hmcl/ui/GameSettingsPanel.java index 7f5082761..d04175f1e 100755 --- a/HMCL/src/main/java/org/jackhuang/hellominecraft/launcher/ui/GameSettingsPanel.java +++ b/HMCL/src/main/java/org/jackhuang/hmcl/ui/GameSettingsPanel.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.ui; +package org.jackhuang.hmcl.ui; -import org.jackhuang.hellominecraft.util.ui.Page; +import org.jackhuang.hmcl.util.ui.Page; import java.awt.datatransfer.DataFlavor; import java.awt.datatransfer.Transferable; import java.awt.datatransfer.UnsupportedFlavorException; @@ -43,34 +43,33 @@ import javax.swing.event.ChangeEvent; import javax.swing.event.ChangeListener; import javax.swing.event.TableModelEvent; import javax.swing.table.DefaultTableModel; -import org.jackhuang.hellominecraft.api.HMCAPI; -import org.jackhuang.hellominecraft.launcher.api.event.config.ProfileChangedEvent; -import org.jackhuang.hellominecraft.launcher.api.event.config.ProfileLoadingEvent; -import org.jackhuang.hellominecraft.launcher.api.event.version.RefreshedVersionsEvent; -import org.jackhuang.hellominecraft.launcher.core.GameException; -import org.jackhuang.hellominecraft.util.C; -import org.jackhuang.hellominecraft.util.log.HMCLog; -import org.jackhuang.hellominecraft.launcher.util.LauncherVisibility; -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.mod.ModInfo; -import org.jackhuang.hellominecraft.launcher.core.install.InstallerType; -import org.jackhuang.hellominecraft.launcher.core.version.GameDirType; -import org.jackhuang.hellominecraft.launcher.core.version.MinecraftVersion; -import org.jackhuang.hellominecraft.launcher.setting.VersionSetting; -import org.jackhuang.hellominecraft.util.MessageBox; -import org.jackhuang.hellominecraft.util.AbstractSwingWorker; -import org.jackhuang.hellominecraft.util.MinecraftVersionRequest; -import org.jackhuang.hellominecraft.util.sys.OS; -import org.jackhuang.hellominecraft.util.StrUtils; -import org.jackhuang.hellominecraft.util.func.Consumer; -import org.jackhuang.hellominecraft.util.sys.FileUtils; -import org.jackhuang.hellominecraft.util.ui.SwingUtils; -import org.jackhuang.hellominecraft.util.sys.Java; -import org.jackhuang.hellominecraft.util.task.TaskWindow; -import org.jackhuang.hellominecraft.util.ui.JSystemFileChooser; -import org.jackhuang.hellominecraft.util.ui.LogWindow; +import org.jackhuang.hmcl.api.HMCLApi; +import org.jackhuang.hmcl.api.event.config.ProfileChangedEvent; +import org.jackhuang.hmcl.api.event.config.ProfileLoadingEvent; +import org.jackhuang.hmcl.api.event.version.RefreshedVersionsEvent; +import org.jackhuang.hmcl.core.GameException; +import org.jackhuang.hmcl.util.C; +import org.jackhuang.hmcl.api.HMCLog; +import org.jackhuang.hmcl.util.LauncherVisibility; +import org.jackhuang.hmcl.setting.Profile; +import org.jackhuang.hmcl.setting.Settings; +import org.jackhuang.hmcl.util.FileNameFilter; +import org.jackhuang.hmcl.core.mod.ModInfo; +import org.jackhuang.hmcl.core.install.InstallerType; +import org.jackhuang.hmcl.api.game.GameDirType; +import org.jackhuang.hmcl.core.version.MinecraftVersion; +import org.jackhuang.hmcl.setting.VersionSetting; +import org.jackhuang.hmcl.util.MessageBox; +import org.jackhuang.hmcl.util.AbstractSwingWorker; +import org.jackhuang.hmcl.util.MinecraftVersionRequest; +import org.jackhuang.hmcl.util.sys.OS; +import org.jackhuang.hmcl.util.StrUtils; +import org.jackhuang.hmcl.api.func.Consumer; +import org.jackhuang.hmcl.util.sys.FileUtils; +import org.jackhuang.hmcl.util.ui.SwingUtils; +import org.jackhuang.hmcl.util.sys.Java; +import org.jackhuang.hmcl.util.task.TaskWindow; +import org.jackhuang.hmcl.util.ui.JSystemFileChooser; /** * @@ -86,8 +85,8 @@ public final class GameSettingsPanel extends RepaintPage implements DropTargetLi final InstallerPanel installerPanels[] = new InstallerPanel[InstallerType.values().length]; public GameSettingsPanel() { - HMCAPI.EVENT_BUS.channel(RefreshedVersionsEvent.class).register(t -> { - if (Settings.getLastProfile().service() == t.getValue() && t.getValue().version().getVersions().isEmpty()) + HMCLApi.EVENT_BUS.channel(RefreshedVersionsEvent.class).register(t -> { + if (Settings.getLastProfile().service().version() == t.getSource() && Settings.getLastProfile().service().version().getVersions().isEmpty()) if (!showedNoVersion && Settings.getLastProfile().service().checkingModpack) { showedNoVersion = true; SwingUtilities.invokeLater(() -> { @@ -123,9 +122,9 @@ public final class GameSettingsPanel extends RepaintPage implements DropTargetLi cboJava.addItem(j.getLocalizedName()); isLoading = false; - HMCAPI.EVENT_BUS.channel(ProfileLoadingEvent.class).register(onLoadingProfiles); - HMCAPI.EVENT_BUS.channel(ProfileChangedEvent.class).register(onSelectedProfilesChanged); - HMCAPI.EVENT_BUS.channel(RefreshedVersionsEvent.class).register(onRefreshedVersions); + HMCLApi.EVENT_BUS.channel(ProfileLoadingEvent.class).register(onLoadingProfiles); + HMCLApi.EVENT_BUS.channel(ProfileChangedEvent.class).register(onSelectedProfilesChanged); + HMCLApi.EVENT_BUS.channel(RefreshedVersionsEvent.class).register(onRefreshedVersions); } void initExplorationMenu() { @@ -1454,7 +1453,7 @@ public final class GameSettingsPanel extends RepaintPage implements DropTargetLi } final Consumer onRefreshedVersions = t -> { - if (Settings.getLastProfile().service() == t.getValue()) + if (Settings.getLastProfile().service().version() == t.getSource()) loadVersions(); }; diff --git a/HMCL/src/main/java/org/jackhuang/hellominecraft/launcher/ui/HeaderTab.java b/HMCL/src/main/java/org/jackhuang/hmcl/ui/HeaderTab.java similarity index 98% rename from HMCL/src/main/java/org/jackhuang/hellominecraft/launcher/ui/HeaderTab.java rename to HMCL/src/main/java/org/jackhuang/hmcl/ui/HeaderTab.java index 0a4dc9c3b..826eff9f5 100755 --- a/HMCL/src/main/java/org/jackhuang/hellominecraft/launcher/ui/HeaderTab.java +++ b/HMCL/src/main/java/org/jackhuang/hmcl/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.ui; +package org.jackhuang.hmcl.ui; import java.awt.EventQueue; import java.awt.event.ActionListener; diff --git a/HMCL/src/main/java/org/jackhuang/hellominecraft/launcher/ui/InstallerPanel.form b/HMCL/src/main/java/org/jackhuang/hmcl/ui/InstallerPanel.form similarity index 93% rename from HMCL/src/main/java/org/jackhuang/hellominecraft/launcher/ui/InstallerPanel.form rename to HMCL/src/main/java/org/jackhuang/hmcl/ui/InstallerPanel.form index b80dde8be..fdaca141c 100755 --- a/HMCL/src/main/java/org/jackhuang/hellominecraft/launcher/ui/InstallerPanel.form +++ b/HMCL/src/main/java/org/jackhuang/hmcl/ui/InstallerPanel.form @@ -42,7 +42,7 @@ - + @@ -74,7 +74,7 @@ - + diff --git a/HMCL/src/main/java/org/jackhuang/hellominecraft/launcher/ui/InstallerPanel.java b/HMCL/src/main/java/org/jackhuang/hmcl/ui/InstallerPanel.java similarity index 90% rename from HMCL/src/main/java/org/jackhuang/hellominecraft/launcher/ui/InstallerPanel.java rename to HMCL/src/main/java/org/jackhuang/hmcl/ui/InstallerPanel.java index ccc42742f..3796d1b18 100755 --- a/HMCL/src/main/java/org/jackhuang/hellominecraft/launcher/ui/InstallerPanel.java +++ b/HMCL/src/main/java/org/jackhuang/hmcl/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.ui; +package org.jackhuang.hmcl.ui; -import org.jackhuang.hellominecraft.util.ui.Page; +import org.jackhuang.hmcl.util.ui.Page; import java.util.List; import javax.swing.SwingUtilities; import javax.swing.table.DefaultTableModel; -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.task.TaskRunnable; -import org.jackhuang.hellominecraft.util.task.TaskWindow; -import org.jackhuang.hellominecraft.util.MessageBox; -import org.jackhuang.hellominecraft.util.StrUtils; -import org.jackhuang.hellominecraft.util.task.Task; -import org.jackhuang.hellominecraft.util.ui.SwingUtils; +import org.jackhuang.hmcl.util.C; +import org.jackhuang.hmcl.setting.Settings; +import org.jackhuang.hmcl.core.install.InstallerType; +import org.jackhuang.hmcl.core.install.InstallerVersionList; +import org.jackhuang.hmcl.util.task.TaskRunnable; +import org.jackhuang.hmcl.util.task.TaskWindow; +import org.jackhuang.hmcl.util.MessageBox; +import org.jackhuang.hmcl.util.StrUtils; +import org.jackhuang.hmcl.util.task.Task; +import org.jackhuang.hmcl.util.ui.SwingUtils; /** * diff --git a/HMCL/src/main/java/org/jackhuang/hellominecraft/launcher/ui/LauncherSettingsPanel.form b/HMCL/src/main/java/org/jackhuang/hmcl/ui/LauncherSettingsPanel.form similarity index 85% rename from HMCL/src/main/java/org/jackhuang/hellominecraft/launcher/ui/LauncherSettingsPanel.form rename to HMCL/src/main/java/org/jackhuang/hmcl/ui/LauncherSettingsPanel.form index 72f58f42b..dcb9b8076 100755 --- a/HMCL/src/main/java/org/jackhuang/hellominecraft/launcher/ui/LauncherSettingsPanel.form +++ b/HMCL/src/main/java/org/jackhuang/hmcl/ui/LauncherSettingsPanel.form @@ -169,7 +169,7 @@ - + @@ -179,7 +179,7 @@ - + @@ -189,7 +189,7 @@ - + @@ -197,7 +197,7 @@ - + @@ -207,14 +207,14 @@ - + - + @@ -224,7 +224,7 @@ - + @@ -234,16 +234,11 @@ - + - - - - - @@ -251,7 +246,7 @@ - + @@ -263,7 +258,7 @@ - + @@ -275,14 +270,14 @@ - + - + @@ -299,14 +294,14 @@ - + - + @@ -316,7 +311,7 @@ - + @@ -339,14 +334,14 @@ - + - + @@ -362,7 +357,7 @@ - + @@ -372,7 +367,7 @@ - + @@ -382,14 +377,14 @@ - + - + @@ -399,7 +394,7 @@ - + diff --git a/HMCL/src/main/java/org/jackhuang/hellominecraft/launcher/ui/LauncherSettingsPanel.java b/HMCL/src/main/java/org/jackhuang/hmcl/ui/LauncherSettingsPanel.java similarity index 94% rename from HMCL/src/main/java/org/jackhuang/hellominecraft/launcher/ui/LauncherSettingsPanel.java rename to HMCL/src/main/java/org/jackhuang/hmcl/ui/LauncherSettingsPanel.java index fff863eff..d1a7c4408 100755 --- a/HMCL/src/main/java/org/jackhuang/hellominecraft/launcher/ui/LauncherSettingsPanel.java +++ b/HMCL/src/main/java/org/jackhuang/hmcl/ui/LauncherSettingsPanel.java @@ -15,20 +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.launcher.ui; +package org.jackhuang.hmcl.ui; import java.io.IOException; import javax.swing.DefaultComboBoxModel; import javax.swing.filechooser.FileNameExtensionFilter; -import org.jackhuang.hellominecraft.util.C; -import org.jackhuang.hellominecraft.util.log.HMCLog; -import org.jackhuang.hellominecraft.launcher.setting.Settings; -import org.jackhuang.hellominecraft.launcher.core.download.DownloadType; -import org.jackhuang.hellominecraft.util.sys.IOUtils; -import org.jackhuang.hellominecraft.util.MessageBox; -import org.jackhuang.hellominecraft.util.lang.SupportedLocales; -import org.jackhuang.hellominecraft.util.ui.JSystemFileChooser; -import org.jackhuang.hellominecraft.util.ui.SwingUtils; +import org.jackhuang.hmcl.util.C; +import org.jackhuang.hmcl.api.HMCLog; +import org.jackhuang.hmcl.api.ui.Theme; +import org.jackhuang.hmcl.setting.Settings; +import org.jackhuang.hmcl.core.download.DownloadType; +import org.jackhuang.hmcl.util.sys.IOUtils; +import org.jackhuang.hmcl.util.MessageBox; +import org.jackhuang.hmcl.util.lang.SupportedLocales; +import org.jackhuang.hmcl.util.ui.JSystemFileChooser; +import org.jackhuang.hmcl.util.ui.SwingUtils; /** * @@ -62,6 +63,10 @@ public class LauncherSettingsPanel extends RepaintPage { } cboLang.setModel(d); cboLang.setSelectedIndex(id); + + DefaultComboBoxModel g = new DefaultComboBoxModel<>(); + for (Theme t : Theme.THEMES.values()) + cboTheme.addItem(t); txtBackgroundPath.setText(Settings.getInstance().getBgpath()); txtCommonPath.setText(Settings.getInstance().getCommonpath()); @@ -70,7 +75,7 @@ public class LauncherSettingsPanel extends RepaintPage { txtProxyUsername.setText(Settings.getInstance().getProxyUserName()); txtProxyPassword.setText(Settings.getInstance().getProxyPassword()); cboDownloadSource.setSelectedIndex(Settings.getInstance().getDownloadType()); - cboTheme.setSelectedIndex(Settings.getInstance().getTheme().ordinal()); + cboTheme.setSelectedItem(Settings.getInstance().getTheme()); chkEnableShadow.setSelected(Settings.getInstance().isEnableShadow()); chkEnableBlur.setSelected(Settings.getInstance().isEnableBlur()); chkEnableAnimation.setSelected(Settings.getInstance().isEnableAnimation()); @@ -167,7 +172,6 @@ public class LauncherSettingsPanel extends RepaintPage { lblTheme.setText(C.i18n("launcher.theme")); // NOI18N - cboTheme.setModel(new DefaultComboBoxModel(new String[]{C.i18n("color.blue"),C.i18n("color.green"),C.i18n("color.purple"),C.i18n("color.dark_blue"),C.i18n("color.orange"),C.i18n("color.red")})); cboTheme.addItemListener(new java.awt.event.ItemListener() { public void itemStateChanged(java.awt.event.ItemEvent evt) { cboThemeItemStateChanged(evt); @@ -306,12 +310,12 @@ public class LauncherSettingsPanel extends RepaintPage { .addComponent(chkEnableBlur) .addPreferredGap(javax.swing.LayoutStyle.ComponentPlacement.RELATED) .addComponent(chkEnableAnimation)) - .addComponent(lblAbout, javax.swing.GroupLayout.PREFERRED_SIZE, javax.swing.GroupLayout.DEFAULT_SIZE, javax.swing.GroupLayout.PREFERRED_SIZE) + .addComponent(lblAbout) .addGroup(layout.createSequentialGroup() .addComponent(btnCheckUpdate) .addPreferredGap(javax.swing.LayoutStyle.ComponentPlacement.RELATED) .addComponent(btnMCBBS)) - .addComponent(lblModpack, javax.swing.GroupLayout.PREFERRED_SIZE, javax.swing.GroupLayout.DEFAULT_SIZE, javax.swing.GroupLayout.PREFERRED_SIZE) + .addComponent(lblModpack) .addComponent(lblRestart)) .addGap(0, 0, Short.MAX_VALUE)) .addGroup(layout.createSequentialGroup() @@ -386,9 +390,9 @@ public class LauncherSettingsPanel extends RepaintPage { .addPreferredGap(javax.swing.LayoutStyle.ComponentPlacement.RELATED) .addComponent(lblRestart) .addPreferredGap(javax.swing.LayoutStyle.ComponentPlacement.RELATED) - .addComponent(lblModpack, javax.swing.GroupLayout.PREFERRED_SIZE, javax.swing.GroupLayout.DEFAULT_SIZE, javax.swing.GroupLayout.PREFERRED_SIZE) + .addComponent(lblModpack) .addPreferredGap(javax.swing.LayoutStyle.ComponentPlacement.RELATED) - .addComponent(lblAbout, javax.swing.GroupLayout.PREFERRED_SIZE, javax.swing.GroupLayout.DEFAULT_SIZE, javax.swing.GroupLayout.PREFERRED_SIZE) + .addComponent(lblAbout) .addContainerGap()) ); }// //GEN-END:initComponents @@ -430,7 +434,7 @@ public class LauncherSettingsPanel extends RepaintPage { }//GEN-LAST:event_btnCheckUpdateActionPerformed private void cboThemeItemStateChanged(java.awt.event.ItemEvent evt) {//GEN-FIRST:event_cboThemeItemStateChanged - Settings.getInstance().setTheme(cboTheme.getSelectedIndex()); + Settings.getInstance().setTheme(((Theme) cboTheme.getSelectedItem()).id); }//GEN-LAST:event_cboThemeItemStateChanged private void lblModpackMouseClicked(java.awt.event.MouseEvent evt) {//GEN-FIRST:event_lblModpackMouseClicked diff --git a/HMCL/src/main/java/org/jackhuang/hellominecraft/launcher/ui/LaunchingUIDaemon.java b/HMCL/src/main/java/org/jackhuang/hmcl/ui/LaunchingUIDaemon.java similarity index 73% rename from HMCL/src/main/java/org/jackhuang/hellominecraft/launcher/ui/LaunchingUIDaemon.java rename to HMCL/src/main/java/org/jackhuang/hmcl/ui/LaunchingUIDaemon.java index 8c3e7d5d1..185fed309 100644 --- a/HMCL/src/main/java/org/jackhuang/hellominecraft/launcher/ui/LaunchingUIDaemon.java +++ b/HMCL/src/main/java/org/jackhuang/hmcl/ui/LaunchingUIDaemon.java @@ -15,32 +15,31 @@ * 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.ui; +package org.jackhuang.hmcl.ui; import java.io.File; import java.io.IOException; import javax.swing.JOptionPane; -import org.jackhuang.hellominecraft.api.HMCAPI; -import org.jackhuang.hellominecraft.api.event.process.JVMLaunchFailedEvent; -import org.jackhuang.hellominecraft.api.event.process.JavaProcessExitedAbnormallyEvent; -import org.jackhuang.hellominecraft.api.event.process.JavaProcessStoppedEvent; -import org.jackhuang.hellominecraft.launcher.api.event.launch.LaunchEvent; -import org.jackhuang.hellominecraft.launcher.api.event.launch.LaunchSucceededEvent; -import org.jackhuang.hellominecraft.launcher.api.event.launch.LaunchingStateChangedEvent; -import org.jackhuang.hellominecraft.launcher.util.LauncherVisibility; -import org.jackhuang.hellominecraft.launcher.core.launch.GameLauncher; -import org.jackhuang.hellominecraft.launcher.setting.Profile; -import org.jackhuang.hellominecraft.launcher.setting.Settings; -import org.jackhuang.hellominecraft.launcher.util.HMCLGameLauncher; -import org.jackhuang.hellominecraft.launcher.util.MinecraftCrashAdvicer; -import org.jackhuang.hellominecraft.util.C; -import org.jackhuang.hellominecraft.util.MessageBox; -import org.jackhuang.hellominecraft.util.func.Consumer; -import org.jackhuang.hellominecraft.util.log.HMCLog; -import org.jackhuang.hellominecraft.util.sys.FileUtils; -import org.jackhuang.hellominecraft.util.sys.JavaProcessMonitor; -import org.jackhuang.hellominecraft.util.ui.LogWindow; -import org.jackhuang.hellominecraft.util.net.WebFrame; +import org.jackhuang.hmcl.api.HMCLApi; +import org.jackhuang.hmcl.api.event.process.JVMLaunchFailedEvent; +import org.jackhuang.hmcl.api.event.process.JavaProcessExitedAbnormallyEvent; +import org.jackhuang.hmcl.api.event.process.JavaProcessStoppedEvent; +import org.jackhuang.hmcl.api.event.launch.LaunchEvent; +import org.jackhuang.hmcl.api.event.launch.LaunchSucceededEvent; +import org.jackhuang.hmcl.api.event.launch.LaunchingStateChangedEvent; +import org.jackhuang.hmcl.util.LauncherVisibility; +import org.jackhuang.hmcl.core.launch.GameLauncher; +import org.jackhuang.hmcl.setting.Profile; +import org.jackhuang.hmcl.setting.Settings; +import org.jackhuang.hmcl.util.HMCLGameLauncher; +import org.jackhuang.hmcl.util.MinecraftCrashAdvicer; +import org.jackhuang.hmcl.util.C; +import org.jackhuang.hmcl.util.MessageBox; +import org.jackhuang.hmcl.api.func.Consumer; +import org.jackhuang.hmcl.api.HMCLog; +import org.jackhuang.hmcl.util.sys.FileUtils; +import org.jackhuang.hmcl.util.sys.ProcessMonitor; +import org.jackhuang.hmcl.util.net.WebFrame; /** * @@ -49,8 +48,8 @@ import org.jackhuang.hellominecraft.util.net.WebFrame; public class LaunchingUIDaemon { public LaunchingUIDaemon() { - HMCAPI.EVENT_BUS.channel(LaunchingStateChangedEvent.class).register(LAUNCHING_STATE_CHANGED); - HMCAPI.EVENT_BUS.channel(LaunchEvent.class).register(p -> { + HMCLApi.EVENT_BUS.channel(LaunchingStateChangedEvent.class).register(LAUNCHING_STATE_CHANGED); + HMCLApi.EVENT_BUS.channel(LaunchEvent.class).register(p -> { GameLauncher obj = (GameLauncher) p.getSource(); HMCLGameLauncher.GameLauncherTag tag = (HMCLGameLauncher.GameLauncherTag) obj.getTag(); if (tag.launcherVisibility == LauncherVisibility.CLOSE && !LogWindow.INSTANCE.isVisible()) { @@ -65,19 +64,19 @@ public class LaunchingUIDaemon { } // We promise that JavaProcessMonitor.tag is LauncherVisibility // See events below. - JavaProcessMonitor monitor = new JavaProcessMonitor(p.getValue()); + ProcessMonitor monitor = new ProcessMonitor(p.getValue()); monitor.setTag(tag.launcherVisibility); monitor.start(); }); - HMCAPI.EVENT_BUS.channel(LaunchSucceededEvent.class).register(p -> { + HMCLApi.EVENT_BUS.channel(LaunchSucceededEvent.class).register(p -> { int state = ((HMCLGameLauncher.GameLauncherTag) ((GameLauncher) p.getSource()).getTag()).state; if (state == 1) LAUNCH_FINISHER.accept(p); else if (state == 2) LAUNCH_SCRIPT_FINISHER.accept(p); }); - HMCAPI.EVENT_BUS.channel(JavaProcessStoppedEvent.class).register(event -> checkExit((LauncherVisibility) ((JavaProcessMonitor) event.getSource()).getTag())); - HMCAPI.EVENT_BUS.channel(JavaProcessExitedAbnormallyEvent.class).register(event -> { + HMCLApi.EVENT_BUS.channel(JavaProcessStoppedEvent.class).register(event -> checkExit((LauncherVisibility) ((ProcessMonitor) event.getSource()).getTag())); + HMCLApi.EVENT_BUS.channel(JavaProcessExitedAbnormallyEvent.class).register(event -> { int exitCode = event.getValue().getExitCode(); HMCLog.err("The game exited abnormally, exit code: " + exitCode); String[] logs = event.getValue().getStdOutLines().toArray(new String[0]); @@ -96,16 +95,16 @@ public class LaunchingUIDaemon { f.setModal(true); f.setTitle(msg); f.setVisible(true); - checkExit((LauncherVisibility) ((JavaProcessMonitor) event.getSource()).getTag()); + checkExit((LauncherVisibility) ((ProcessMonitor) event.getSource()).getTag()); }); - HMCAPI.EVENT_BUS.channel(JVMLaunchFailedEvent.class).register(event -> { + HMCLApi.EVENT_BUS.channel(JVMLaunchFailedEvent.class).register(event -> { int exitCode = event.getValue().getExitCode(); HMCLog.err("Cannot create jvm, exit code: " + exitCode); WebFrame f = new WebFrame(event.getValue().getStdOutLines().toArray(new String[0])); f.setModal(true); f.setTitle(C.i18n("launch.cannot_create_jvm") + " exit code: " + exitCode); f.setVisible(true); - checkExit((LauncherVisibility) ((JavaProcessMonitor) event.getSource()).getTag()); + checkExit((LauncherVisibility) ((ProcessMonitor) event.getSource()).getTag()); }); } diff --git a/HMCUtils/src/main/java/org/jackhuang/hellominecraft/util/ui/LogWindow.form b/HMCL/src/main/java/org/jackhuang/hmcl/ui/LogWindow.form old mode 100755 new mode 100644 similarity index 89% rename from HMCUtils/src/main/java/org/jackhuang/hellominecraft/util/ui/LogWindow.form rename to HMCL/src/main/java/org/jackhuang/hmcl/ui/LogWindow.form index 227ef10f2..9c98ebd8c --- a/HMCUtils/src/main/java/org/jackhuang/hellominecraft/util/ui/LogWindow.form +++ b/HMCL/src/main/java/org/jackhuang/hmcl/ui/LogWindow.form @@ -4,7 +4,7 @@ - + @@ -83,7 +83,7 @@ - + @@ -93,7 +93,7 @@ - + @@ -103,7 +103,7 @@ - + @@ -113,7 +113,7 @@ - + @@ -128,7 +128,7 @@ - + @@ -146,7 +146,7 @@ - + diff --git a/HMCUtils/src/main/java/org/jackhuang/hellominecraft/util/ui/LogWindow.java b/HMCL/src/main/java/org/jackhuang/hmcl/ui/LogWindow.java old mode 100755 new mode 100644 similarity index 97% rename from HMCUtils/src/main/java/org/jackhuang/hellominecraft/util/ui/LogWindow.java rename to HMCL/src/main/java/org/jackhuang/hmcl/ui/LogWindow.java index dece70821..63702b1b9 --- a/HMCUtils/src/main/java/org/jackhuang/hellominecraft/util/ui/LogWindow.java +++ b/HMCL/src/main/java/org/jackhuang/hmcl/ui/LogWindow.java @@ -15,19 +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.util.ui; +package org.jackhuang.hmcl.ui; import java.io.PrintStream; import javax.swing.SwingUtilities; import javax.swing.text.Document; import javax.swing.text.SimpleAttributeSet; import javax.swing.text.StyleConstants; -import org.jackhuang.hellominecraft.util.C; -import org.jackhuang.hellominecraft.util.log.HMCLog; -import org.jackhuang.hellominecraft.util.log.Level; -import org.jackhuang.hellominecraft.util.func.NonFunction; -import org.jackhuang.hellominecraft.util.DoubleOutputStream; -import org.jackhuang.hellominecraft.util.Utils; +import org.jackhuang.hmcl.util.C; +import org.jackhuang.hmcl.api.HMCLog; +import org.jackhuang.hmcl.util.log.Level; +import org.jackhuang.hmcl.api.func.NonFunction; +import org.jackhuang.hmcl.util.DoubleOutputStream; +import org.jackhuang.hmcl.util.Utils; +import org.jackhuang.hmcl.util.ui.SwingUtils; /** * diff --git a/HMCUtils/src/main/java/org/jackhuang/hellominecraft/util/ui/LogWindowOutputStream.java b/HMCL/src/main/java/org/jackhuang/hmcl/ui/LogWindowOutputStream.java old mode 100755 new mode 100644 similarity index 91% rename from HMCUtils/src/main/java/org/jackhuang/hellominecraft/util/ui/LogWindowOutputStream.java rename to HMCL/src/main/java/org/jackhuang/hmcl/ui/LogWindowOutputStream.java index 387fc1d76..c92634a83 --- a/HMCUtils/src/main/java/org/jackhuang/hellominecraft/util/ui/LogWindowOutputStream.java +++ b/HMCL/src/main/java/org/jackhuang/hmcl/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.util.ui; +package org.jackhuang.hmcl.ui; import java.io.OutputStream; import java.util.Objects; import javax.swing.SwingUtilities; -import org.jackhuang.hellominecraft.util.code.Charsets; -import org.jackhuang.hellominecraft.util.log.Level; +import org.jackhuang.hmcl.util.code.Charsets; +import org.jackhuang.hmcl.util.log.Level; /** * diff --git a/HMCL/src/main/java/org/jackhuang/hellominecraft/launcher/ui/MainFrame.java b/HMCL/src/main/java/org/jackhuang/hmcl/ui/MainFrame.java similarity index 91% rename from HMCL/src/main/java/org/jackhuang/hellominecraft/launcher/ui/MainFrame.java rename to HMCL/src/main/java/org/jackhuang/hmcl/ui/MainFrame.java index a3c44b72c..7da386b2e 100755 --- a/HMCL/src/main/java/org/jackhuang/hellominecraft/launcher/ui/MainFrame.java +++ b/HMCL/src/main/java/org/jackhuang/hmcl/ui/MainFrame.java @@ -15,11 +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.ui; +package org.jackhuang.hmcl.ui; -import org.jackhuang.hellominecraft.util.ui.Page; -import org.jackhuang.hellominecraft.util.ui.GaussionPanel; -import org.jackhuang.hellominecraft.util.ui.IRepaint; +import org.jackhuang.hmcl.util.ui.GaussionPanel; +import org.jackhuang.hmcl.util.ui.IRepaint; import java.awt.BorderLayout; import java.awt.CardLayout; import java.awt.Color; @@ -40,7 +39,6 @@ import java.awt.image.BufferedImage; import java.util.ArrayList; import java.util.Arrays; import java.util.Collection; -import java.util.HashMap; import java.util.List; import javax.swing.BorderFactory; import javax.swing.Box; @@ -51,22 +49,23 @@ import javax.swing.JComponent; import javax.swing.JLabel; import javax.swing.JPanel; import javax.swing.SwingUtilities; -import org.jackhuang.hellominecraft.api.HMCAPI; -import org.jackhuang.hellominecraft.launcher.Main; -import org.jackhuang.hellominecraft.launcher.api.PluginManager; -import org.jackhuang.hellominecraft.launcher.api.event.config.ThemeChangedEvent; -import org.jackhuang.hellominecraft.launcher.core.auth.IAuthenticator; -import org.jackhuang.hellominecraft.launcher.setting.Settings; -import org.jackhuang.hellominecraft.lookandfeel.Theme; -import org.jackhuang.hellominecraft.util.C; -import org.jackhuang.hellominecraft.util.MessageBox; -import org.jackhuang.hellominecraft.util.StrUtils; -import org.jackhuang.hellominecraft.util.log.HMCLog; -import org.jackhuang.hellominecraft.util.ui.BasicColors; -import org.jackhuang.hellominecraft.util.ui.DropShadowBorder; -import org.jackhuang.hellominecraft.util.ui.GraphicsUtils; -import org.jackhuang.hellominecraft.util.ui.SwingUtils; -import org.jackhuang.hellominecraft.util.ui.TintablePanel; +import org.jackhuang.hmcl.api.HMCLApi; +import org.jackhuang.hmcl.Main; +import org.jackhuang.hmcl.api.PluginManager; +import org.jackhuang.hmcl.api.event.config.ThemeChangedEvent; +import org.jackhuang.hmcl.setting.Settings; +import org.jackhuang.hmcl.util.C; +import org.jackhuang.hmcl.util.MessageBox; +import org.jackhuang.hmcl.util.StrUtils; +import org.jackhuang.hmcl.api.HMCLog; +import org.jackhuang.hmcl.util.ui.BasicColors; +import org.jackhuang.hmcl.util.ui.DropShadowBorder; +import org.jackhuang.hmcl.util.ui.GraphicsUtils; +import org.jackhuang.hmcl.util.ui.SwingUtils; +import org.jackhuang.hmcl.util.ui.TintablePanel; +import org.jackhuang.hmcl.api.auth.IAuthenticator; +import org.jackhuang.hmcl.api.ui.Theme; +import org.jackhuang.hmcl.api.ui.TopTabPage; /** @@ -159,7 +158,7 @@ public final class MainFrame extends DraggableFrame implements IRepaint { } ((JPanel) getContentPane()).setOpaque(true); - HMCAPI.EVENT_BUS.channel(ThemeChangedEvent.class).register(x -> reloadColor(x.getValue())); + HMCLApi.EVENT_BUS.channel(ThemeChangedEvent.class).register(x -> reloadColor(x.getValue())); SwingUtilities.invokeLater(() -> selectTab("main")); } @@ -260,7 +259,7 @@ public final class MainFrame extends DraggableFrame implements IRepaint { private transient final ActionListener tabListener = e -> MainFrame.this.selectTab(e.getActionCommand()); - private void initializeTab(Page inst, String cmd, String title) { + private void initializeTab(TopTabPage inst, String cmd, String title) { HeaderTab tab = new HeaderTab(title); tab.setActionCommand(cmd); tab.setForeground(BasicColors.COLOR_WHITE_TEXT); @@ -274,11 +273,11 @@ public final class MainFrame extends DraggableFrame implements IRepaint { private final List tabHeader = new ArrayList<>(); private JPanel tabWrapper[]; - private final List tabContent = new ArrayList<>(); + private final List tabContent = new ArrayList<>(); public void selectTab(String tabName) { int chosen = -1; - Page onCreate = null, onSelect = null; + TopTabPage onCreate = null, onSelect = null; for (int i = 0; i < tabHeader.size(); i++) if (tabName.equalsIgnoreCase(tabHeader.get(i).getActionCommand())) { if (!tabContent.get(i).isCreated()) { diff --git a/HMCL/src/main/java/org/jackhuang/hellominecraft/launcher/ui/MainPagePanel.form b/HMCL/src/main/java/org/jackhuang/hmcl/ui/MainPagePanel.form similarity index 92% rename from HMCL/src/main/java/org/jackhuang/hellominecraft/launcher/ui/MainPagePanel.form rename to HMCL/src/main/java/org/jackhuang/hmcl/ui/MainPagePanel.form index 4913c4d4d..d929e9a74 100755 --- a/HMCL/src/main/java/org/jackhuang/hellominecraft/launcher/ui/MainPagePanel.form +++ b/HMCL/src/main/java/org/jackhuang/hmcl/ui/MainPagePanel.form @@ -20,7 +20,7 @@ - + @@ -40,7 +40,7 @@ - + @@ -130,7 +130,7 @@ - + @@ -147,14 +147,14 @@ - + - + @@ -171,10 +171,10 @@ - + - + @@ -228,7 +228,7 @@ - + @@ -265,7 +265,7 @@ - + @@ -279,7 +279,7 @@ - + @@ -289,7 +289,7 @@ - + diff --git a/HMCL/src/main/java/org/jackhuang/hellominecraft/launcher/ui/MainPagePanel.java b/HMCL/src/main/java/org/jackhuang/hmcl/ui/MainPagePanel.java similarity index 90% rename from HMCL/src/main/java/org/jackhuang/hellominecraft/launcher/ui/MainPagePanel.java rename to HMCL/src/main/java/org/jackhuang/hmcl/ui/MainPagePanel.java index a151f4eb5..d54667a69 100755 --- a/HMCL/src/main/java/org/jackhuang/hellominecraft/launcher/ui/MainPagePanel.java +++ b/HMCL/src/main/java/org/jackhuang/hmcl/ui/MainPagePanel.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.ui; +package org.jackhuang.hmcl.ui; -import org.jackhuang.hellominecraft.util.ui.Page; -import org.jackhuang.hellominecraft.util.ui.WideComboBox; -import org.jackhuang.hellominecraft.util.ui.GaussionPanel; +import org.jackhuang.hmcl.util.ui.Page; +import org.jackhuang.hmcl.util.ui.WideComboBox; +import org.jackhuang.hmcl.util.ui.GaussionPanel; import java.awt.CardLayout; import java.awt.Dimension; import java.awt.Font; @@ -29,30 +29,31 @@ import javax.swing.DefaultComboBoxModel; import javax.swing.JOptionPane; import javax.swing.SwingUtilities; import javax.swing.filechooser.FileNameExtensionFilter; -import org.jackhuang.hellominecraft.api.HMCAPI; -import org.jackhuang.hellominecraft.launcher.api.event.config.AuthenticatorChangedEvent; -import org.jackhuang.hellominecraft.launcher.api.event.config.ProfileChangedEvent; -import org.jackhuang.hellominecraft.launcher.api.event.config.ProfileLoadingEvent; -import org.jackhuang.hellominecraft.launcher.api.event.launch.LaunchSucceededEvent; -import org.jackhuang.hellominecraft.launcher.api.event.launch.LaunchingState; -import org.jackhuang.hellominecraft.launcher.api.event.launch.LaunchingStateChangedEvent; -import org.jackhuang.hellominecraft.launcher.api.event.version.RefreshedVersionsEvent; -import org.jackhuang.hellominecraft.util.C; -import org.jackhuang.hellominecraft.launcher.core.auth.IAuthenticator; -import org.jackhuang.hellominecraft.launcher.setting.Profile; -import org.jackhuang.hellominecraft.util.StrUtils; -import org.jackhuang.hellominecraft.launcher.core.version.MinecraftVersion; -import org.jackhuang.hellominecraft.launcher.setting.Settings; -import org.jackhuang.hellominecraft.launcher.core.mod.ModpackManager; -import org.jackhuang.hellominecraft.launcher.ui.modpack.ModpackWizard; -import org.jackhuang.hellominecraft.lookandfeel.ConstomButton; -import org.jackhuang.hellominecraft.util.func.Consumer; -import org.jackhuang.hellominecraft.util.sys.FileUtils; -import org.jackhuang.hellominecraft.util.task.TaskWindow; -import org.jackhuang.hellominecraft.util.ui.GraphicsUtils; -import org.jackhuang.hellominecraft.util.ui.JSystemFileChooser; -import org.jackhuang.hellominecraft.util.ui.SwingUtils; -import org.jackhuang.hellominecraft.util.ui.wizard.api.WizardDisplayer; +import org.jackhuang.hmcl.api.HMCLApi; +import org.jackhuang.hmcl.api.event.config.AuthenticatorChangedEvent; +import org.jackhuang.hmcl.api.event.config.ProfileChangedEvent; +import org.jackhuang.hmcl.api.event.config.ProfileLoadingEvent; +import org.jackhuang.hmcl.api.event.launch.LaunchSucceededEvent; +import org.jackhuang.hmcl.api.event.launch.LaunchingState; +import org.jackhuang.hmcl.api.event.launch.LaunchingStateChangedEvent; +import org.jackhuang.hmcl.api.event.version.RefreshedVersionsEvent; +import org.jackhuang.hmcl.util.C; +import org.jackhuang.hmcl.core.auth.AbstractAuthenticator; +import org.jackhuang.hmcl.setting.Profile; +import org.jackhuang.hmcl.util.StrUtils; +import org.jackhuang.hmcl.core.version.MinecraftVersion; +import org.jackhuang.hmcl.setting.Settings; +import org.jackhuang.hmcl.core.mod.ModpackManager; +import org.jackhuang.hmcl.ui.modpack.ModpackWizard; +import org.jackhuang.hmcl.laf.ConstomButton; +import org.jackhuang.hmcl.api.func.Consumer; +import org.jackhuang.hmcl.util.sys.FileUtils; +import org.jackhuang.hmcl.util.task.TaskWindow; +import org.jackhuang.hmcl.util.ui.GraphicsUtils; +import org.jackhuang.hmcl.util.ui.JSystemFileChooser; +import org.jackhuang.hmcl.util.ui.SwingUtils; +import org.jackhuang.hmcl.util.ui.wizard.api.WizardDisplayer; +import org.jackhuang.hmcl.api.auth.IAuthenticator; /** * @@ -97,12 +98,12 @@ public class MainPagePanel extends Page { ((RepaintPage) pnlMore).setRepainter(pnlRoot); - HMCAPI.EVENT_BUS.channel(AuthenticatorChangedEvent.class).register(onAuthChanged); - HMCAPI.EVENT_BUS.channel(ProfileLoadingEvent.class).register(onLoadingProfiles); - HMCAPI.EVENT_BUS.channel(ProfileChangedEvent.class).register(onSelectedProfilesChanged); - HMCAPI.EVENT_BUS.channel(RefreshedVersionsEvent.class).register(onRefreshedVersions); - HMCAPI.EVENT_BUS.channel(LaunchingStateChangedEvent.class).register(launchingStateChanged); - HMCAPI.EVENT_BUS.channel(LaunchSucceededEvent.class).register(this::prepareAuths); + HMCLApi.EVENT_BUS.channel(AuthenticatorChangedEvent.class).register(onAuthChanged); + HMCLApi.EVENT_BUS.channel(ProfileLoadingEvent.class).register(onLoadingProfiles); + HMCLApi.EVENT_BUS.channel(ProfileChangedEvent.class).register(onSelectedProfilesChanged); + HMCLApi.EVENT_BUS.channel(RefreshedVersionsEvent.class).register(onRefreshedVersions); + HMCLApi.EVENT_BUS.channel(LaunchingStateChangedEvent.class).register(launchingStateChanged); + HMCLApi.EVENT_BUS.channel(LaunchSucceededEvent.class).register(this::prepareAuths); prepareAuths(); } @@ -117,7 +118,7 @@ public class MainPagePanel extends Page { private void initComponents() { pnlRoot = new GaussionPanel(); - pnlMore = new org.jackhuang.hellominecraft.launcher.ui.RepaintPage(); + pnlMore = new org.jackhuang.hmcl.ui.RepaintPage(); txtPlayerName = new javax.swing.JTextField(); lblLogin = new javax.swing.JLabel(); cboLoginMode = new javax.swing.JComboBox(); @@ -418,7 +419,7 @@ public class MainPagePanel extends Page { private void prepareAuths() { preparingAuth = true; cboLoginMode.removeAllItems(); - for (IAuthenticator str : IAuthenticator.LOGINS) + for (IAuthenticator str : AbstractAuthenticator.LOGINS) cboLoginMode.addItem(str.getName()); preparingAuth = false; int loginType = Settings.getInstance().getLoginType(); @@ -495,7 +496,7 @@ public class MainPagePanel extends Page { }; final Consumer onRefreshedVersions = t -> { - if (Settings.getLastProfile().service() == t.getValue()) + if (Settings.getLastProfile().service().version() == t.getSource()) loadVersions(); }; diff --git a/HMCL/src/main/java/org/jackhuang/hellominecraft/launcher/ui/NewProfileWindow.form b/HMCL/src/main/java/org/jackhuang/hmcl/ui/NewProfileWindow.form similarity index 88% rename from HMCL/src/main/java/org/jackhuang/hellominecraft/launcher/ui/NewProfileWindow.form rename to HMCL/src/main/java/org/jackhuang/hmcl/ui/NewProfileWindow.form index 95f9074ca..15e5411aa 100755 --- a/HMCL/src/main/java/org/jackhuang/hellominecraft/launcher/ui/NewProfileWindow.form +++ b/HMCL/src/main/java/org/jackhuang/hmcl/ui/NewProfileWindow.form @@ -4,7 +4,7 @@ - + @@ -77,7 +77,7 @@ - + @@ -89,7 +89,7 @@ - + @@ -103,7 +103,7 @@ - + @@ -113,7 +113,7 @@ - + diff --git a/HMCL/src/main/java/org/jackhuang/hellominecraft/launcher/ui/NewProfileWindow.java b/HMCL/src/main/java/org/jackhuang/hmcl/ui/NewProfileWindow.java similarity index 96% rename from HMCL/src/main/java/org/jackhuang/hellominecraft/launcher/ui/NewProfileWindow.java rename to HMCL/src/main/java/org/jackhuang/hmcl/ui/NewProfileWindow.java index d2ce6b488..8ba792a1c 100755 --- a/HMCL/src/main/java/org/jackhuang/hellominecraft/launcher/ui/NewProfileWindow.java +++ b/HMCL/src/main/java/org/jackhuang/hmcl/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.ui; +package org.jackhuang.hmcl.ui; -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; +import org.jackhuang.hmcl.util.C; +import org.jackhuang.hmcl.setting.Profile; +import org.jackhuang.hmcl.setting.Settings; +import org.jackhuang.hmcl.util.StrUtils; /** * diff --git a/HMCL/src/main/java/org/jackhuang/hellominecraft/launcher/ui/NewTabPane.java b/HMCL/src/main/java/org/jackhuang/hmcl/ui/NewTabPane.java similarity index 81% rename from HMCL/src/main/java/org/jackhuang/hellominecraft/launcher/ui/NewTabPane.java rename to HMCL/src/main/java/org/jackhuang/hmcl/ui/NewTabPane.java index 6d1638215..e4aa60f2d 100755 --- a/HMCL/src/main/java/org/jackhuang/hellominecraft/launcher/ui/NewTabPane.java +++ b/HMCL/src/main/java/org/jackhuang/hmcl/ui/NewTabPane.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.ui; +package org.jackhuang.hmcl.ui; -import org.jackhuang.hellominecraft.util.ui.Selectable; import javax.swing.JTabbedPane; import javax.swing.event.ChangeEvent; import javax.swing.event.ChangeListener; +import org.jackhuang.hmcl.api.ui.TopTabPage; /** * @@ -40,10 +40,10 @@ public class NewTabPane extends JTabbedPane implements ChangeListener { if (initializing) return; for (int i = 0; i < getComponentCount(); ++i) - if (getSelectedIndex() != i && getComponent(i) instanceof Selectable) - ((Selectable) getComponent(i)).onLeave(); - if (getSelectedComponent() instanceof Selectable) - ((Selectable) getSelectedComponent()).onSelect(); + if (getSelectedIndex() != i && getComponent(i) instanceof TopTabPage) + ((TopTabPage) getComponent(i)).onLeave(); + if (getSelectedComponent() instanceof TopTabPage) + ((TopTabPage) getSelectedComponent()).onSelect(); } } diff --git a/HMCL/src/main/java/org/jackhuang/hellominecraft/launcher/ui/RepaintPage.java b/HMCL/src/main/java/org/jackhuang/hmcl/ui/RepaintPage.java similarity index 90% rename from HMCL/src/main/java/org/jackhuang/hellominecraft/launcher/ui/RepaintPage.java rename to HMCL/src/main/java/org/jackhuang/hmcl/ui/RepaintPage.java index de85907b6..96ea56974 100644 --- a/HMCL/src/main/java/org/jackhuang/hellominecraft/launcher/ui/RepaintPage.java +++ b/HMCL/src/main/java/org/jackhuang/hmcl/ui/RepaintPage.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.ui; +package org.jackhuang.hmcl.ui; -import org.jackhuang.hellominecraft.util.ui.Page; -import org.jackhuang.hellominecraft.util.ui.IRepaint; +import org.jackhuang.hmcl.util.ui.Page; +import org.jackhuang.hmcl.util.ui.IRepaint; import java.awt.Rectangle; import java.awt.Window; import java.util.Arrays; diff --git a/HMCL/src/main/java/org/jackhuang/hellominecraft/launcher/ui/modpack/ModpackDescriptionPanel.form b/HMCL/src/main/java/org/jackhuang/hmcl/ui/modpack/ModpackDescriptionPanel.form similarity index 100% rename from HMCL/src/main/java/org/jackhuang/hellominecraft/launcher/ui/modpack/ModpackDescriptionPanel.form rename to HMCL/src/main/java/org/jackhuang/hmcl/ui/modpack/ModpackDescriptionPanel.form diff --git a/HMCL/src/main/java/org/jackhuang/hellominecraft/launcher/ui/modpack/ModpackDescriptionPanel.java b/HMCL/src/main/java/org/jackhuang/hmcl/ui/modpack/ModpackDescriptionPanel.java similarity index 93% rename from HMCL/src/main/java/org/jackhuang/hellominecraft/launcher/ui/modpack/ModpackDescriptionPanel.java rename to HMCL/src/main/java/org/jackhuang/hmcl/ui/modpack/ModpackDescriptionPanel.java index eab84035c..68c2806a3 100644 --- a/HMCL/src/main/java/org/jackhuang/hellominecraft/launcher/ui/modpack/ModpackDescriptionPanel.java +++ b/HMCL/src/main/java/org/jackhuang/hmcl/ui/modpack/ModpackDescriptionPanel.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.ui.modpack; +package org.jackhuang.hmcl.ui.modpack; import java.awt.Dimension; import java.awt.HeadlessException; import java.io.IOException; import java.util.Map; import javax.swing.JOptionPane; -import org.jackhuang.hellominecraft.util.C; -import org.jackhuang.hellominecraft.util.MessageBox; -import org.jackhuang.hellominecraft.util.StrUtils; -import org.jackhuang.hellominecraft.util.net.WebPage; -import org.jackhuang.hellominecraft.util.ui.wizard.spi.WizardController; +import org.jackhuang.hmcl.util.C; +import org.jackhuang.hmcl.util.MessageBox; +import org.jackhuang.hmcl.util.StrUtils; +import org.jackhuang.hmcl.util.net.WebPage; +import org.jackhuang.hmcl.util.ui.wizard.spi.WizardController; import org.markdown4j.Markdown4jProcessor; /** diff --git a/HMCL/src/main/java/org/jackhuang/hellominecraft/launcher/ui/modpack/ModpackFileSelectionPanel.form b/HMCL/src/main/java/org/jackhuang/hmcl/ui/modpack/ModpackFileSelectionPanel.form similarity index 100% rename from HMCL/src/main/java/org/jackhuang/hellominecraft/launcher/ui/modpack/ModpackFileSelectionPanel.form rename to HMCL/src/main/java/org/jackhuang/hmcl/ui/modpack/ModpackFileSelectionPanel.form diff --git a/HMCL/src/main/java/org/jackhuang/hellominecraft/launcher/ui/modpack/ModpackFileSelectionPanel.java b/HMCL/src/main/java/org/jackhuang/hmcl/ui/modpack/ModpackFileSelectionPanel.java similarity index 90% rename from HMCL/src/main/java/org/jackhuang/hellominecraft/launcher/ui/modpack/ModpackFileSelectionPanel.java rename to HMCL/src/main/java/org/jackhuang/hmcl/ui/modpack/ModpackFileSelectionPanel.java index 7921e3482..28c74a845 100644 --- a/HMCL/src/main/java/org/jackhuang/hellominecraft/launcher/ui/modpack/ModpackFileSelectionPanel.java +++ b/HMCL/src/main/java/org/jackhuang/hmcl/ui/modpack/ModpackFileSelectionPanel.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.ui.modpack; +package org.jackhuang.hmcl.ui.modpack; import java.io.File; import java.util.HashMap; @@ -23,14 +23,14 @@ import java.util.HashSet; import java.util.Map; import java.util.Set; import javax.swing.tree.DefaultTreeModel; -import org.jackhuang.hellominecraft.launcher.core.mod.ModAdviser; -import org.jackhuang.hellominecraft.util.C; -import org.jackhuang.hellominecraft.util.Pair; -import org.jackhuang.hellominecraft.util.sys.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; +import org.jackhuang.hmcl.core.mod.ModAdviser; +import org.jackhuang.hmcl.util.C; +import org.jackhuang.hmcl.util.Pair; +import org.jackhuang.hmcl.util.sys.FileUtils; +import org.jackhuang.hmcl.util.ui.checktree.CheckBoxTreeCellRenderer; +import org.jackhuang.hmcl.util.ui.checktree.CheckBoxTreeNode; +import org.jackhuang.hmcl.util.ui.checktree.CheckBoxTreeNodeSelectionListener; +import org.jackhuang.hmcl.util.ui.wizard.spi.WizardController; /** * diff --git a/HMCL/src/main/java/org/jackhuang/hellominecraft/launcher/ui/modpack/ModpackInitializationPanel.form b/HMCL/src/main/java/org/jackhuang/hmcl/ui/modpack/ModpackInitializationPanel.form similarity index 100% rename from HMCL/src/main/java/org/jackhuang/hellominecraft/launcher/ui/modpack/ModpackInitializationPanel.form rename to HMCL/src/main/java/org/jackhuang/hmcl/ui/modpack/ModpackInitializationPanel.form diff --git a/HMCL/src/main/java/org/jackhuang/hellominecraft/launcher/ui/modpack/ModpackInitializationPanel.java b/HMCL/src/main/java/org/jackhuang/hmcl/ui/modpack/ModpackInitializationPanel.java similarity index 97% rename from HMCL/src/main/java/org/jackhuang/hellominecraft/launcher/ui/modpack/ModpackInitializationPanel.java rename to HMCL/src/main/java/org/jackhuang/hmcl/ui/modpack/ModpackInitializationPanel.java index 998d49fe8..fbb6a1eb5 100644 --- a/HMCL/src/main/java/org/jackhuang/hellominecraft/launcher/ui/modpack/ModpackInitializationPanel.java +++ b/HMCL/src/main/java/org/jackhuang/hmcl/ui/modpack/ModpackInitializationPanel.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.ui.modpack; +package org.jackhuang.hmcl.ui.modpack; import java.util.Map; import java.util.Vector; import java.util.regex.Pattern; import javax.swing.DefaultComboBoxModel; import javax.swing.filechooser.FileNameExtensionFilter; -import org.jackhuang.hellominecraft.util.C; -import org.jackhuang.hellominecraft.util.ui.JSystemFileChooser; -import org.jackhuang.hellominecraft.util.ui.wizard.spi.WizardController; +import org.jackhuang.hmcl.util.C; +import org.jackhuang.hmcl.util.ui.JSystemFileChooser; +import org.jackhuang.hmcl.util.ui.wizard.spi.WizardController; /** * diff --git a/HMCL/src/main/java/org/jackhuang/hellominecraft/launcher/ui/modpack/ModpackWizard.java b/HMCL/src/main/java/org/jackhuang/hmcl/ui/modpack/ModpackWizard.java similarity index 85% rename from HMCL/src/main/java/org/jackhuang/hellominecraft/launcher/ui/modpack/ModpackWizard.java rename to HMCL/src/main/java/org/jackhuang/hmcl/ui/modpack/ModpackWizard.java index c26ef3163..87a8c4259 100644 --- a/HMCL/src/main/java/org/jackhuang/hellominecraft/launcher/ui/modpack/ModpackWizard.java +++ b/HMCL/src/main/java/org/jackhuang/hmcl/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.ui.modpack; +package org.jackhuang.hmcl.ui.modpack; import java.io.File; import java.io.IOException; @@ -28,29 +28,29 @@ import java.util.List; import java.util.Map; import java.util.Vector; import javax.swing.JComponent; -import org.jackhuang.hellominecraft.launcher.core.GameException; -import org.jackhuang.hellominecraft.launcher.core.mod.ModpackManager; -import org.jackhuang.hellominecraft.launcher.core.version.MinecraftVersion; -import org.jackhuang.hellominecraft.launcher.setting.Config; -import org.jackhuang.hellominecraft.launcher.setting.Profile; -import org.jackhuang.hellominecraft.launcher.setting.Settings; -import org.jackhuang.hellominecraft.launcher.util.HMCLMinecraftService; -import org.jackhuang.hellominecraft.util.C; -import org.jackhuang.hellominecraft.util.Pair; -import org.jackhuang.hellominecraft.util.StrUtils; -import org.jackhuang.hellominecraft.util.Utils; -import org.jackhuang.hellominecraft.util.log.HMCLog; -import org.jackhuang.hellominecraft.util.sys.IOUtils; -import org.jackhuang.hellominecraft.util.sys.ZipEngine; -import org.jackhuang.hellominecraft.util.net.WebPage; -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; +import org.jackhuang.hmcl.core.GameException; +import org.jackhuang.hmcl.core.mod.ModpackManager; +import org.jackhuang.hmcl.core.version.MinecraftVersion; +import org.jackhuang.hmcl.setting.Config; +import org.jackhuang.hmcl.setting.Profile; +import org.jackhuang.hmcl.setting.Settings; +import org.jackhuang.hmcl.util.HMCLMinecraftService; +import org.jackhuang.hmcl.util.C; +import org.jackhuang.hmcl.util.Pair; +import org.jackhuang.hmcl.util.StrUtils; +import org.jackhuang.hmcl.util.Utils; +import org.jackhuang.hmcl.api.HMCLog; +import org.jackhuang.hmcl.util.sys.IOUtils; +import org.jackhuang.hmcl.util.sys.ZipEngine; +import org.jackhuang.hmcl.util.net.WebPage; +import org.jackhuang.hmcl.util.ui.checktree.CheckBoxTreeNode; +import org.jackhuang.hmcl.util.ui.wizard.spi.DeferredWizardResult; +import org.jackhuang.hmcl.util.ui.wizard.spi.ResultProgressHandle; +import org.jackhuang.hmcl.util.ui.wizard.spi.Summary; +import org.jackhuang.hmcl.util.ui.wizard.spi.WizardBranchController; +import org.jackhuang.hmcl.util.ui.wizard.spi.WizardController; +import org.jackhuang.hmcl.util.ui.wizard.spi.WizardException; +import org.jackhuang.hmcl.util.ui.wizard.spi.WizardPanelProvider; /** * diff --git a/HMCL/src/main/java/org/jackhuang/hellominecraft/launcher/util/CrashReporter.java b/HMCL/src/main/java/org/jackhuang/hmcl/util/CrashReporter.java similarity index 91% rename from HMCL/src/main/java/org/jackhuang/hellominecraft/launcher/util/CrashReporter.java rename to HMCL/src/main/java/org/jackhuang/hmcl/util/CrashReporter.java index 54c6cf464..23aba506c 100755 --- a/HMCL/src/main/java/org/jackhuang/hellominecraft/launcher/util/CrashReporter.java +++ b/HMCL/src/main/java/org/jackhuang/hmcl/util/CrashReporter.java @@ -15,8 +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.util; +package org.jackhuang.hmcl.util; +import org.jackhuang.hmcl.util.C; +import org.jackhuang.hmcl.util.StrUtils; +import org.jackhuang.hmcl.util.MessageBox; import java.io.IOException; import java.text.SimpleDateFormat; import java.util.Date; @@ -25,15 +28,12 @@ import java.util.HashSet; import java.util.logging.Level; import java.util.logging.Logger; import javax.swing.SwingUtilities; -import org.jackhuang.hellominecraft.util.C; -import org.jackhuang.hellominecraft.util.log.HMCLog; -import static org.jackhuang.hellominecraft.launcher.Main.LAUNCHER_VERSION; -import org.jackhuang.hellominecraft.launcher.setting.Settings; -import org.jackhuang.hellominecraft.util.net.NetUtils; -import org.jackhuang.hellominecraft.util.MessageBox; -import org.jackhuang.hellominecraft.util.StrUtils; -import org.jackhuang.hellominecraft.util.sys.OS; -import org.jackhuang.hellominecraft.util.ui.LogWindow; +import org.jackhuang.hmcl.api.HMCLog; +import static org.jackhuang.hmcl.Main.LAUNCHER_VERSION; +import org.jackhuang.hmcl.setting.Settings; +import org.jackhuang.hmcl.util.net.NetUtils; +import org.jackhuang.hmcl.util.sys.OS; +import org.jackhuang.hmcl.ui.LogWindow; /** * diff --git a/HMCL/src/main/java/org/jackhuang/hellominecraft/launcher/util/DefaultPlugin.java b/HMCL/src/main/java/org/jackhuang/hmcl/util/DefaultPlugin.java similarity index 69% rename from HMCL/src/main/java/org/jackhuang/hellominecraft/launcher/util/DefaultPlugin.java rename to HMCL/src/main/java/org/jackhuang/hmcl/util/DefaultPlugin.java index 4ea8d8536..9f8dd7555 100755 --- a/HMCL/src/main/java/org/jackhuang/hellominecraft/launcher/util/DefaultPlugin.java +++ b/HMCL/src/main/java/org/jackhuang/hmcl/util/DefaultPlugin.java @@ -15,23 +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.util; +package org.jackhuang.hmcl.util; import java.util.ArrayList; import javax.swing.JFrame; -import org.jackhuang.hellominecraft.launcher.api.AddTabCallback; -import org.jackhuang.hellominecraft.launcher.core.service.IMinecraftService; -import org.jackhuang.hellominecraft.launcher.api.IPlugin; -import org.jackhuang.hellominecraft.launcher.core.auth.IAuthenticator; -import org.jackhuang.hellominecraft.launcher.core.auth.OfflineAuthenticator; -import org.jackhuang.hellominecraft.launcher.core.auth.YggdrasilAuthenticator; -import org.jackhuang.hellominecraft.launcher.setting.Profile; -import org.jackhuang.hellominecraft.launcher.setting.Settings; -import org.jackhuang.hellominecraft.launcher.ui.GameSettingsPanel; -import org.jackhuang.hellominecraft.launcher.ui.LauncherSettingsPanel; -import org.jackhuang.hellominecraft.launcher.ui.MainPagePanel; -import org.jackhuang.hellominecraft.util.C; -import org.jackhuang.hellominecraft.util.func.Consumer; +import org.jackhuang.hmcl.api.ui.AddTabCallback; +import org.jackhuang.hmcl.api.IPlugin; +import org.jackhuang.hmcl.core.auth.OfflineAuthenticator; +import org.jackhuang.hmcl.core.auth.YggdrasilAuthenticator; +import org.jackhuang.hmcl.setting.Settings; +import org.jackhuang.hmcl.ui.GameSettingsPanel; +import org.jackhuang.hmcl.ui.LauncherSettingsPanel; +import org.jackhuang.hmcl.ui.MainPagePanel; +import org.jackhuang.hmcl.api.auth.IAuthenticator; +import org.jackhuang.hmcl.api.func.Consumer; +import org.jackhuang.hmcl.api.ui.Theme; +import org.jackhuang.hmcl.laf.LAFTheme; /** * @@ -39,6 +38,11 @@ import org.jackhuang.hellominecraft.util.func.Consumer; */ public class DefaultPlugin implements IPlugin { + public DefaultPlugin() { + for (Theme t : LAFTheme.THEMES) + Theme.THEMES.put(t.getId(), t); + } + ArrayList auths = new ArrayList<>(); @Override diff --git a/HMCL/src/main/java/org/jackhuang/hellominecraft/launcher/util/FileNameFilter.java b/HMCL/src/main/java/org/jackhuang/hmcl/util/FileNameFilter.java similarity index 92% rename from HMCL/src/main/java/org/jackhuang/hellominecraft/launcher/util/FileNameFilter.java rename to HMCL/src/main/java/org/jackhuang/hmcl/util/FileNameFilter.java index 74778cf6f..c8166bf92 100755 --- a/HMCL/src/main/java/org/jackhuang/hellominecraft/launcher/util/FileNameFilter.java +++ b/HMCL/src/main/java/org/jackhuang/hmcl/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.util; +package org.jackhuang.hmcl.util; import java.io.File; import javax.swing.filechooser.FileFilter; -import org.jackhuang.hellominecraft.util.sys.FileUtils; +import org.jackhuang.hmcl.util.sys.FileUtils; /** * diff --git a/HMCL/src/main/java/org/jackhuang/hellominecraft/launcher/util/HMCLAssetService.java b/HMCL/src/main/java/org/jackhuang/hmcl/util/HMCLAssetService.java similarity index 83% rename from HMCL/src/main/java/org/jackhuang/hellominecraft/launcher/util/HMCLAssetService.java rename to HMCL/src/main/java/org/jackhuang/hmcl/util/HMCLAssetService.java index 15b4718b2..f329e92bc 100644 --- a/HMCL/src/main/java/org/jackhuang/hellominecraft/launcher/util/HMCLAssetService.java +++ b/HMCL/src/main/java/org/jackhuang/hmcl/util/HMCLAssetService.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.util; +package org.jackhuang.hmcl.util; import java.io.File; -import org.jackhuang.hellominecraft.launcher.core.asset.MinecraftAssetService; -import org.jackhuang.hellominecraft.launcher.core.service.IMinecraftService; -import org.jackhuang.hellominecraft.launcher.setting.Settings; +import org.jackhuang.hmcl.core.asset.MinecraftAssetService; +import org.jackhuang.hmcl.core.service.IMinecraftService; +import org.jackhuang.hmcl.setting.Settings; /** * diff --git a/HMCL/src/main/java/org/jackhuang/hellominecraft/launcher/util/HMCLGameLauncher.java b/HMCL/src/main/java/org/jackhuang/hmcl/util/HMCLGameLauncher.java similarity index 64% rename from HMCL/src/main/java/org/jackhuang/hellominecraft/launcher/util/HMCLGameLauncher.java rename to HMCL/src/main/java/org/jackhuang/hmcl/util/HMCLGameLauncher.java index 50998be86..73f8a0e04 100644 --- a/HMCL/src/main/java/org/jackhuang/hellominecraft/launcher/util/HMCLGameLauncher.java +++ b/HMCL/src/main/java/org/jackhuang/hmcl/util/HMCLGameLauncher.java @@ -15,28 +15,28 @@ * 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.util; +package org.jackhuang.hmcl.util; import java.io.File; -import org.jackhuang.hellominecraft.launcher.core.GameException; -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 org.jackhuang.hellominecraft.launcher.core.launch.DefaultGameLauncher; -import org.jackhuang.hellominecraft.launcher.core.launch.GameLauncher; -import org.jackhuang.hellominecraft.launcher.core.launch.LaunchOptions; -import org.jackhuang.hellominecraft.launcher.setting.Profile; -import org.jackhuang.hellominecraft.launcher.setting.Settings; -import org.jackhuang.hellominecraft.util.C; -import org.jackhuang.hellominecraft.api.HMCAPI; -import org.jackhuang.hellominecraft.launcher.api.event.launch.LaunchSucceededEvent; -import org.jackhuang.hellominecraft.launcher.api.event.launch.LaunchingState; -import org.jackhuang.hellominecraft.launcher.api.event.launch.LaunchingStateChangedEvent; -import org.jackhuang.hellominecraft.launcher.api.event.launch.ProcessingLaunchOptionsEvent; -import org.jackhuang.hellominecraft.launcher.core.RuntimeGameException; -import org.jackhuang.hellominecraft.util.func.Consumer; -import org.jackhuang.hellominecraft.util.log.HMCLog; -import org.jackhuang.hellominecraft.util.sys.JavaProcess; +import org.jackhuang.hmcl.core.GameException; +import org.jackhuang.hmcl.api.auth.AuthenticationException; +import org.jackhuang.hmcl.core.auth.AbstractAuthenticator; +import org.jackhuang.hmcl.api.auth.LoginInfo; +import org.jackhuang.hmcl.core.launch.DefaultGameLauncher; +import org.jackhuang.hmcl.core.launch.GameLauncher; +import org.jackhuang.hmcl.api.game.LaunchOptions; +import org.jackhuang.hmcl.setting.Profile; +import org.jackhuang.hmcl.setting.Settings; +import org.jackhuang.hmcl.api.HMCLApi; +import org.jackhuang.hmcl.api.event.launch.LaunchSucceededEvent; +import org.jackhuang.hmcl.api.event.launch.LaunchingState; +import org.jackhuang.hmcl.api.event.launch.LaunchingStateChangedEvent; +import org.jackhuang.hmcl.api.event.launch.ProcessingLaunchOptionsEvent; +import org.jackhuang.hmcl.core.RuntimeGameException; +import org.jackhuang.hmcl.api.func.Consumer; +import org.jackhuang.hmcl.api.HMCLog; +import org.jackhuang.hmcl.util.sys.JavaProcess; +import org.jackhuang.hmcl.api.auth.IAuthenticator; /** * @@ -50,12 +50,12 @@ public class HMCLGameLauncher { public HMCLGameLauncher(Profile p) { this.profile = p; - HMCAPI.EVENT_BUS.channel(LaunchSucceededEvent.class).register(() -> setLaunching(false)); + HMCLApi.EVENT_BUS.channel(LaunchSucceededEvent.class).register(() -> setLaunching(false)); } void setLaunching(boolean isLaunching) { if (isLaunching != this.isLaunching) - HMCAPI.EVENT_BUS.fireChannel(new LaunchingStateChangedEvent(this, isLaunching ? LaunchingState.Starting : LaunchingState.Done)); + HMCLApi.EVENT_BUS.fireChannel(new LaunchingStateChangedEvent(this, isLaunching ? LaunchingState.Starting : LaunchingState.Done)); this.isLaunching = isLaunching; } @@ -77,7 +77,7 @@ public class HMCLGameLauncher { return; } - final IAuthenticator l = IAuthenticator.LOGINS.get(Settings.getInstance().getLoginType()); + final IAuthenticator l = AbstractAuthenticator.LOGINS.get(Settings.getInstance().getLoginType()); final LoginInfo li = new LoginInfo(l.getUserName(), l.isLoggedIn() || !l.hasPassword() ? null : passwordIfNeeded); Thread t = new Thread() { @Override @@ -85,7 +85,7 @@ public class HMCLGameLauncher { Thread.currentThread().setName("Game Launcher"); try { LaunchOptions options = profile.getSelectedVersionSetting().createLaunchOptions(profile.getCanonicalGameDirFile()); - HMCAPI.EVENT_BUS.fireChannel(new ProcessingLaunchOptionsEvent(this, options)); + HMCLApi.EVENT_BUS.fireChannel(new ProcessingLaunchOptionsEvent(this, options)); DefaultGameLauncher gl = new DefaultGameLauncher(options, profile.service(), li, l); GameLauncherTag tag = new GameLauncherTag(); tag.launcherVisibility = profile.getSelectedVersionSetting().getLauncherVisibility(); diff --git a/HMCL/src/main/java/org/jackhuang/hellominecraft/launcher/util/HMCLGameProvider.java b/HMCL/src/main/java/org/jackhuang/hmcl/util/HMCLGameProvider.java similarity index 73% rename from HMCL/src/main/java/org/jackhuang/hellominecraft/launcher/util/HMCLGameProvider.java rename to HMCL/src/main/java/org/jackhuang/hmcl/util/HMCLGameProvider.java index 0060f4959..0cc3f8e04 100644 --- a/HMCL/src/main/java/org/jackhuang/hellominecraft/launcher/util/HMCLGameProvider.java +++ b/HMCL/src/main/java/org/jackhuang/hmcl/util/HMCLGameProvider.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.launcher.util; +package org.jackhuang.hmcl.util; import java.io.File; -import org.jackhuang.hellominecraft.api.HMCAPI; -import org.jackhuang.hellominecraft.launcher.api.event.version.MinecraftLibraryPathEvent; -import org.jackhuang.hellominecraft.launcher.core.version.GameDirType; -import org.jackhuang.hellominecraft.launcher.core.version.MinecraftVersionManager; -import org.jackhuang.hellominecraft.launcher.setting.Settings; -import org.jackhuang.hellominecraft.launcher.setting.VersionSetting; +import org.jackhuang.hmcl.api.HMCLApi; +import org.jackhuang.hmcl.api.event.version.MinecraftLibraryPathEvent; +import org.jackhuang.hmcl.api.game.GameDirType; +import org.jackhuang.hmcl.core.version.MinecraftVersionManager; +import org.jackhuang.hmcl.setting.Settings; +import org.jackhuang.hmcl.setting.VersionSetting; /** * @@ -34,7 +34,7 @@ public class HMCLGameProvider extends MinecraftVersionManager { public HMCLGameProvider(HMCLMinecraftService p) { super(p); - HMCAPI.EVENT_BUS.channel(MinecraftLibraryPathEvent.class).register(t -> { + HMCLApi.EVENT_BUS.channel(MinecraftLibraryPathEvent.class).register(t -> { if (!t.getFile().getValue().exists()) t.getFile().setValue(new File(Settings.getInstance().getCommonpath(), t.getLocation())); }); diff --git a/HMCL/src/main/java/org/jackhuang/hellominecraft/launcher/util/HMCLMinecraftService.java b/HMCL/src/main/java/org/jackhuang/hmcl/util/HMCLMinecraftService.java similarity index 73% rename from HMCL/src/main/java/org/jackhuang/hellominecraft/launcher/util/HMCLMinecraftService.java rename to HMCL/src/main/java/org/jackhuang/hmcl/util/HMCLMinecraftService.java index f5996b934..8443b4ed1 100644 --- a/HMCL/src/main/java/org/jackhuang/hellominecraft/launcher/util/HMCLMinecraftService.java +++ b/HMCL/src/main/java/org/jackhuang/hmcl/util/HMCLMinecraftService.java @@ -15,34 +15,40 @@ * 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.util; +package org.jackhuang.hmcl.util; +import org.jackhuang.hmcl.core.service.IMinecraftService; +import org.jackhuang.hmcl.core.service.IMinecraftAssetService; +import org.jackhuang.hmcl.core.service.IMinecraftLoader; +import org.jackhuang.hmcl.core.service.IMinecraftDownloadService; +import org.jackhuang.hmcl.core.service.IMinecraftProvider; +import org.jackhuang.hmcl.util.C; +import org.jackhuang.hmcl.core.service.IMinecraftModService; +import org.jackhuang.hmcl.core.service.IMinecraftInstallerService; import com.google.gson.JsonSyntaxException; import java.io.File; import java.util.HashMap; import java.util.Map; import javax.swing.SwingUtilities; -import org.jackhuang.hellominecraft.api.HMCAPI; -import org.jackhuang.hellominecraft.launcher.api.event.version.LoadedOneVersionEvent; -import org.jackhuang.hellominecraft.launcher.api.event.version.RefreshedVersionsEvent; -import org.jackhuang.hellominecraft.launcher.api.event.version.RefreshingVersionsEvent; -import org.jackhuang.hellominecraft.launcher.core.GameException; -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; -import org.jackhuang.hellominecraft.launcher.core.launch.MinecraftLoader; -import org.jackhuang.hellominecraft.launcher.core.service.*; -import org.jackhuang.hellominecraft.launcher.core.mod.MinecraftModService; -import org.jackhuang.hellominecraft.launcher.core.mod.ModpackManager; -import org.jackhuang.hellominecraft.launcher.setting.Profile; -import org.jackhuang.hellominecraft.launcher.setting.VersionSetting; -import org.jackhuang.hellominecraft.launcher.ui.MainFrame; -import org.jackhuang.hellominecraft.util.C; -import org.jackhuang.hellominecraft.util.log.HMCLog; -import org.jackhuang.hellominecraft.util.sys.FileUtils; -import org.jackhuang.hellominecraft.util.task.TaskWindow; +import org.jackhuang.hmcl.api.HMCLApi; +import org.jackhuang.hmcl.api.event.version.LoadedOneVersionEvent; +import org.jackhuang.hmcl.api.event.version.RefreshedVersionsEvent; +import org.jackhuang.hmcl.api.event.version.RefreshingVersionsEvent; +import org.jackhuang.hmcl.core.GameException; +import org.jackhuang.hmcl.core.install.MinecraftInstallerService; +import org.jackhuang.hmcl.core.asset.MinecraftAssetService; +import org.jackhuang.hmcl.api.auth.UserProfileProvider; +import org.jackhuang.hmcl.core.download.MinecraftDownloadService; +import org.jackhuang.hmcl.api.game.LaunchOptions; +import org.jackhuang.hmcl.core.launch.MinecraftLoader; +import org.jackhuang.hmcl.core.mod.MinecraftModService; +import org.jackhuang.hmcl.core.mod.ModpackManager; +import org.jackhuang.hmcl.setting.Profile; +import org.jackhuang.hmcl.setting.VersionSetting; +import org.jackhuang.hmcl.ui.MainFrame; +import org.jackhuang.hmcl.api.HMCLog; +import org.jackhuang.hmcl.util.sys.FileUtils; +import org.jackhuang.hmcl.util.task.TaskWindow; /** * @@ -57,8 +63,8 @@ public class HMCLMinecraftService extends IMinecraftService { this.p = p; this.provider = new HMCLGameProvider(this); provider.initializeMiencraft(); - HMCAPI.EVENT_BUS.channel(RefreshingVersionsEvent.class).register(versionSettings::clear); - HMCAPI.EVENT_BUS.channel(RefreshedVersionsEvent.class).registerFirst(() -> { + HMCLApi.EVENT_BUS.channel(RefreshingVersionsEvent.class).register(versionSettings::clear); + HMCLApi.EVENT_BUS.channel(RefreshedVersionsEvent.class).registerFirst(() -> { if (!checkingModpack) { checkingModpack = true; if (version().getVersionCount() == 0) { @@ -72,7 +78,7 @@ public class HMCLMinecraftService extends IMinecraftService { } } }); - HMCAPI.EVENT_BUS.channel(LoadedOneVersionEvent.class).register(e -> loadVersionSetting(e.getValue())); + HMCLApi.EVENT_BUS.channel(LoadedOneVersionEvent.class).register(e -> loadVersionSetting(e.getValue())); this.mms = new MinecraftModService(this); this.mds = new MinecraftDownloadService(this); this.mas = new HMCLAssetService(this); diff --git a/HMCL/src/main/java/org/jackhuang/hellominecraft/launcher/util/LauncherVisibility.java b/HMCL/src/main/java/org/jackhuang/hmcl/util/LauncherVisibility.java similarity index 95% rename from HMCL/src/main/java/org/jackhuang/hellominecraft/launcher/util/LauncherVisibility.java rename to HMCL/src/main/java/org/jackhuang/hmcl/util/LauncherVisibility.java index 8122770ac..136fceee3 100755 --- a/HMCL/src/main/java/org/jackhuang/hellominecraft/launcher/util/LauncherVisibility.java +++ b/HMCL/src/main/java/org/jackhuang/hmcl/util/LauncherVisibility.java @@ -15,7 +15,7 @@ * You should have received a copy of the GNU General Public License * along with this program. If not, see {http://www.gnu.org/licenses/}. */ -package org.jackhuang.hellominecraft.launcher.util; +package org.jackhuang.hmcl.util; /** * diff --git a/HMCL/src/main/java/org/jackhuang/hellominecraft/launcher/util/MinecraftCrashAdvicer.java b/HMCL/src/main/java/org/jackhuang/hmcl/util/MinecraftCrashAdvicer.java similarity index 94% rename from HMCL/src/main/java/org/jackhuang/hellominecraft/launcher/util/MinecraftCrashAdvicer.java rename to HMCL/src/main/java/org/jackhuang/hmcl/util/MinecraftCrashAdvicer.java index a5bb7bc01..c9aca0a28 100755 --- a/HMCL/src/main/java/org/jackhuang/hellominecraft/launcher/util/MinecraftCrashAdvicer.java +++ b/HMCL/src/main/java/org/jackhuang/hmcl/util/MinecraftCrashAdvicer.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.util; +package org.jackhuang.hmcl.util; -import org.jackhuang.hellominecraft.util.C; -import org.jackhuang.hellominecraft.util.lang.SupportedLocales; +import org.jackhuang.hmcl.util.C; +import org.jackhuang.hmcl.util.lang.SupportedLocales; /** * Give the advice to solve the Minecraft crashing. diff --git a/HMCL/src/main/java/org/jackhuang/hellominecraft/launcher/util/upgrade/AppDataUpgrader.java b/HMCL/src/main/java/org/jackhuang/hmcl/util/upgrade/AppDataUpgrader.java similarity index 89% rename from HMCL/src/main/java/org/jackhuang/hellominecraft/launcher/util/upgrade/AppDataUpgrader.java rename to HMCL/src/main/java/org/jackhuang/hmcl/util/upgrade/AppDataUpgrader.java index 585b86927..83a10ed40 100755 --- a/HMCL/src/main/java/org/jackhuang/hellominecraft/launcher/util/upgrade/AppDataUpgrader.java +++ b/HMCL/src/main/java/org/jackhuang/hmcl/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.util.upgrade; +package org.jackhuang.hmcl.util.upgrade; import java.io.File; import java.io.IOException; @@ -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.api.SimpleEvent; -import org.jackhuang.hellominecraft.util.C; -import org.jackhuang.hellominecraft.util.log.HMCLog; -import org.jackhuang.hellominecraft.launcher.core.MCUtils; -import org.jackhuang.hellominecraft.util.task.Task; -import org.jackhuang.hellominecraft.util.task.TaskWindow; -import org.jackhuang.hellominecraft.util.net.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.sys.FileUtils; -import org.jackhuang.hellominecraft.util.sys.IOUtils; -import org.jackhuang.hellominecraft.util.sys.OS; +import org.jackhuang.hmcl.api.event.SimpleEvent; +import org.jackhuang.hmcl.util.C; +import org.jackhuang.hmcl.api.HMCLog; +import org.jackhuang.hmcl.core.MCUtils; +import org.jackhuang.hmcl.util.task.Task; +import org.jackhuang.hmcl.util.task.TaskWindow; +import org.jackhuang.hmcl.util.net.FileDownloadTask; +import org.jackhuang.hmcl.util.ArrayUtils; +import org.jackhuang.hmcl.util.MessageBox; +import org.jackhuang.hmcl.util.UpdateChecker; +import org.jackhuang.hmcl.util.Utils; +import org.jackhuang.hmcl.api.VersionNumber; +import org.jackhuang.hmcl.util.sys.FileUtils; +import org.jackhuang.hmcl.util.sys.IOUtils; +import org.jackhuang.hmcl.util.sys.OS; /** * diff --git a/HMCL/src/main/java/org/jackhuang/hellominecraft/launcher/util/upgrade/IUpgrader.java b/HMCL/src/main/java/org/jackhuang/hmcl/util/upgrade/IUpgrader.java similarity index 86% rename from HMCL/src/main/java/org/jackhuang/hellominecraft/launcher/util/upgrade/IUpgrader.java rename to HMCL/src/main/java/org/jackhuang/hmcl/util/upgrade/IUpgrader.java index 56ba37a65..9812805e1 100755 --- a/HMCL/src/main/java/org/jackhuang/hellominecraft/launcher/util/upgrade/IUpgrader.java +++ b/HMCL/src/main/java/org/jackhuang/hmcl/util/upgrade/IUpgrader.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.util.upgrade; +package org.jackhuang.hmcl.util.upgrade; -import org.jackhuang.hellominecraft.api.SimpleEvent; -import org.jackhuang.hellominecraft.util.VersionNumber; -import org.jackhuang.hellominecraft.util.func.Consumer; +import org.jackhuang.hmcl.api.event.SimpleEvent; +import org.jackhuang.hmcl.api.VersionNumber; +import org.jackhuang.hmcl.api.func.Consumer; /** * diff --git a/HMCL/src/main/java/org/jackhuang/hellominecraft/launcher/util/upgrade/NewFileUpgrader.java b/HMCL/src/main/java/org/jackhuang/hmcl/util/upgrade/NewFileUpgrader.java similarity index 78% rename from HMCL/src/main/java/org/jackhuang/hellominecraft/launcher/util/upgrade/NewFileUpgrader.java rename to HMCL/src/main/java/org/jackhuang/hmcl/util/upgrade/NewFileUpgrader.java index 59bff6ec8..2dc7d4173 100755 --- a/HMCL/src/main/java/org/jackhuang/hellominecraft/launcher/util/upgrade/NewFileUpgrader.java +++ b/HMCL/src/main/java/org/jackhuang/hmcl/util/upgrade/NewFileUpgrader.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.util.upgrade; +package org.jackhuang.hmcl.util.upgrade; import java.io.File; import java.io.IOException; -import org.jackhuang.hellominecraft.api.SimpleEvent; -import org.jackhuang.hellominecraft.util.log.HMCLog; -import org.jackhuang.hellominecraft.util.task.TaskWindow; -import org.jackhuang.hellominecraft.util.net.FileDownloadTask; -import org.jackhuang.hellominecraft.util.ArrayUtils; -import org.jackhuang.hellominecraft.util.VersionNumber; -import org.jackhuang.hellominecraft.util.sys.FileUtils; -import org.jackhuang.hellominecraft.util.sys.IOUtils; +import org.jackhuang.hmcl.api.event.SimpleEvent; +import org.jackhuang.hmcl.api.HMCLog; +import org.jackhuang.hmcl.util.task.TaskWindow; +import org.jackhuang.hmcl.util.net.FileDownloadTask; +import org.jackhuang.hmcl.util.ArrayUtils; +import org.jackhuang.hmcl.api.VersionNumber; +import org.jackhuang.hmcl.util.sys.FileUtils; +import org.jackhuang.hmcl.util.sys.IOUtils; /** * diff --git a/HMCL/src/main/resources/org/jackhuang/hellominecraft/launcher/background.jpg b/HMCL/src/main/resources/org/jackhuang/hmcl/background.jpg similarity index 100% rename from HMCL/src/main/resources/org/jackhuang/hellominecraft/launcher/background.jpg rename to HMCL/src/main/resources/org/jackhuang/hmcl/background.jpg diff --git a/HMCL/src/main/resources/org/jackhuang/hellominecraft/launcher/close.png b/HMCL/src/main/resources/org/jackhuang/hmcl/close.png similarity index 100% rename from HMCL/src/main/resources/org/jackhuang/hellominecraft/launcher/close.png rename to HMCL/src/main/resources/org/jackhuang/hmcl/close.png diff --git a/HMCL/src/main/resources/org/jackhuang/hellominecraft/launcher/icon-new.png b/HMCL/src/main/resources/org/jackhuang/hmcl/icon-new.png similarity index 100% rename from HMCL/src/main/resources/org/jackhuang/hellominecraft/launcher/icon-new.png rename to HMCL/src/main/resources/org/jackhuang/hmcl/icon-new.png diff --git a/HMCL/src/main/resources/org/jackhuang/hellominecraft/launcher/icon.png b/HMCL/src/main/resources/org/jackhuang/hmcl/icon.png similarity index 100% rename from HMCL/src/main/resources/org/jackhuang/hellominecraft/launcher/icon.png rename to HMCL/src/main/resources/org/jackhuang/hmcl/icon.png diff --git a/HMCL/src/main/resources/org/jackhuang/hellominecraft/launcher/minimize.png b/HMCL/src/main/resources/org/jackhuang/hmcl/minimize.png similarity index 100% rename from HMCL/src/main/resources/org/jackhuang/hellominecraft/launcher/minimize.png rename to HMCL/src/main/resources/org/jackhuang/hmcl/minimize.png diff --git a/HMCUtils/build.gradle b/HMCLAPI/build.gradle old mode 100755 new mode 100644 similarity index 87% rename from HMCUtils/build.gradle rename to HMCLAPI/build.gradle index 7c2a1b656..f5564570b --- a/HMCUtils/build.gradle +++ b/HMCLAPI/build.gradle @@ -15,14 +15,6 @@ * You should have received a copy of the GNU General Public License * along with this program. If not, see {http://www.gnu.org/licenses/}. */ -apply plugin: 'me.tatarka.retrolambda' - -if (!hasProperty('mainClass')) { - ext.mainClass = '' -} - -if (System.getenv("BUILD_NUMBER") != null) -version = System.getenv("BUILD_NUMBER") buildscript { repositories { @@ -34,6 +26,11 @@ buildscript { } } +apply plugin: 'me.tatarka.retrolambda' + +if (System.getenv("BUILD_NUMBER") != null) + version = System.getenv("BUILD_NUMBER") + retrolambda { - javaVersion = JavaVersion.VERSION_1_6 + javaVersion = JavaVersion.VERSION_1_7 } diff --git a/HMCUtils/src/main/java/org/jackhuang/hellominecraft/api/HMCAPI.java b/HMCLAPI/src/main/java/org/jackhuang/hmcl/api/HMCLApi.java similarity index 85% rename from HMCUtils/src/main/java/org/jackhuang/hellominecraft/api/HMCAPI.java rename to HMCLAPI/src/main/java/org/jackhuang/hmcl/api/HMCLApi.java index de19e8391..080880a8f 100644 --- a/HMCUtils/src/main/java/org/jackhuang/hellominecraft/api/HMCAPI.java +++ b/HMCLAPI/src/main/java/org/jackhuang/hmcl/api/HMCLApi.java @@ -15,16 +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.api; +package org.jackhuang.hmcl.api; + +import org.jackhuang.hmcl.api.event.EventBus; /** * * @author huang */ -public class HMCAPI { +public class HMCLApi { /** * Events. */ public static final EventBus EVENT_BUS = new EventBus(); + + public static VersionNumber HMCL_VERSION; } diff --git a/HMCUtils/src/main/java/org/jackhuang/hellominecraft/util/log/HMCLog.java b/HMCLAPI/src/main/java/org/jackhuang/hmcl/api/HMCLog.java old mode 100755 new mode 100644 similarity index 80% rename from HMCUtils/src/main/java/org/jackhuang/hellominecraft/util/log/HMCLog.java rename to HMCLAPI/src/main/java/org/jackhuang/hmcl/api/HMCLog.java index 0888a38d8..6994b63ac --- a/HMCUtils/src/main/java/org/jackhuang/hellominecraft/util/log/HMCLog.java +++ b/HMCLAPI/src/main/java/org/jackhuang/hmcl/api/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.util.log; +package org.jackhuang.hmcl.api; -import org.jackhuang.hellominecraft.util.log.logger.Logger; +import org.jackhuang.hmcl.api.ILogger; /** * @@ -25,10 +25,10 @@ import org.jackhuang.hellominecraft.util.log.logger.Logger; */ public class HMCLog { - private static final Logger LOGGER = new Logger("Hello Minecraft!"); + public static ILogger LOGGER; public static void log(String message) { - LOGGER.info(message); + LOGGER.log(message); } public static void warn(String message) { @@ -40,11 +40,11 @@ public class HMCLog { } public static void err(String msg) { - LOGGER.error(msg); + LOGGER.err(msg); } public static void err(String msg, Throwable t) { - LOGGER.error(msg, t); + LOGGER.err(msg, t); } } diff --git a/HMCUtils/src/main/java/org/jackhuang/hellominecraft/util/ui/Selectable.java b/HMCLAPI/src/main/java/org/jackhuang/hmcl/api/ILogger.java old mode 100755 new mode 100644 similarity index 77% rename from HMCUtils/src/main/java/org/jackhuang/hellominecraft/util/ui/Selectable.java rename to HMCLAPI/src/main/java/org/jackhuang/hmcl/api/ILogger.java index a7c28c65b..c9bafe118 --- a/HMCUtils/src/main/java/org/jackhuang/hellominecraft/util/ui/Selectable.java +++ b/HMCLAPI/src/main/java/org/jackhuang/hmcl/api/ILogger.java @@ -1,7 +1,7 @@ /* * 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 @@ -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.util.ui; +package org.jackhuang.hmcl.api; /** * * @author huangyuhui */ -public interface Selectable { +public interface ILogger { - void onCreate(); + void log(String message); - boolean isCreated(); + void warn(String message); - void onSelect(); + void warn(String msg, Throwable t); - boolean isSelected(); + void err(String msg); - void onLeave(); + void err(String msg, Throwable t); } diff --git a/HMCL/src/core/java/org/jackhuang/hellominecraft/launcher/api/IPlugin.java b/HMCLAPI/src/main/java/org/jackhuang/hmcl/api/IPlugin.java old mode 100755 new mode 100644 similarity index 88% rename from HMCL/src/core/java/org/jackhuang/hellominecraft/launcher/api/IPlugin.java rename to HMCLAPI/src/main/java/org/jackhuang/hmcl/api/IPlugin.java index 94eb94245..fceb9d505 --- a/HMCL/src/core/java/org/jackhuang/hellominecraft/launcher/api/IPlugin.java +++ b/HMCLAPI/src/main/java/org/jackhuang/hmcl/api/IPlugin.java @@ -15,11 +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.api; +package org.jackhuang.hmcl.api; +import org.jackhuang.hmcl.api.ui.AddTabCallback; import javax.swing.JFrame; -import org.jackhuang.hellominecraft.launcher.core.auth.IAuthenticator; -import org.jackhuang.hellominecraft.util.func.Consumer; +import org.jackhuang.hmcl.api.auth.IAuthenticator; +import org.jackhuang.hmcl.api.func.Consumer; /** * Each plugin must implement this interface. diff --git a/HMCSM/src/main/java/org/jackhuang/hellominecraft/svrmgr/api/ServerStoppedEvent.java b/HMCLAPI/src/main/java/org/jackhuang/hmcl/api/IProcess.java similarity index 70% rename from HMCSM/src/main/java/org/jackhuang/hellominecraft/svrmgr/api/ServerStoppedEvent.java rename to HMCLAPI/src/main/java/org/jackhuang/hmcl/api/IProcess.java index 9d21d8d70..ae173529b 100644 --- a/HMCSM/src/main/java/org/jackhuang/hellominecraft/svrmgr/api/ServerStoppedEvent.java +++ b/HMCLAPI/src/main/java/org/jackhuang/hmcl/api/IProcess.java @@ -15,18 +15,29 @@ * 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.svrmgr.api; +package org.jackhuang.hmcl.api; -import java.util.EventObject; +import java.util.ArrayList; +import java.util.List; /** * * @author huang */ -public class ServerStoppedEvent extends EventObject { - - public ServerStoppedEvent(Object source) { - super(source); - } +public interface IProcess { + + int getExitCode(); + + Process getRawProcess(); + + String getStartupCommand(); + + List getStartupCommands(); + + ArrayList getStdOutLines(); + + boolean isRunning(); + + void stop(); } diff --git a/HMCL/src/core/java/org/jackhuang/hellominecraft/launcher/api/PluginManager.java b/HMCLAPI/src/main/java/org/jackhuang/hmcl/api/PluginManager.java old mode 100755 new mode 100644 similarity index 89% rename from HMCL/src/core/java/org/jackhuang/hellominecraft/launcher/api/PluginManager.java rename to HMCLAPI/src/main/java/org/jackhuang/hmcl/api/PluginManager.java index 12d3f0a16..d617b7d7d --- a/HMCL/src/core/java/org/jackhuang/hellominecraft/launcher/api/PluginManager.java +++ b/HMCLAPI/src/main/java/org/jackhuang/hmcl/api/PluginManager.java @@ -15,12 +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.launcher.api; +package org.jackhuang.hmcl.api; +import org.jackhuang.hmcl.api.ui.AddTabCallback; 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.hmcl.api.auth.IAuthenticator; +import org.jackhuang.hmcl.api.func.Consumer; /** * Can be only called by HMCL. diff --git a/HMCUtils/src/main/java/org/jackhuang/hellominecraft/util/VersionNumber.java b/HMCLAPI/src/main/java/org/jackhuang/hmcl/api/VersionNumber.java old mode 100755 new mode 100644 similarity index 97% rename from HMCUtils/src/main/java/org/jackhuang/hellominecraft/util/VersionNumber.java rename to HMCLAPI/src/main/java/org/jackhuang/hmcl/api/VersionNumber.java index 9b85d6168..50d7ef5e2 --- a/HMCUtils/src/main/java/org/jackhuang/hellominecraft/util/VersionNumber.java +++ b/HMCLAPI/src/main/java/org/jackhuang/hmcl/api/VersionNumber.java @@ -15,9 +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.util; - -import org.jackhuang.hellominecraft.util.log.HMCLog; +package org.jackhuang.hmcl.api; /** * diff --git a/HMCUtils/src/main/java/org/jackhuang/hellominecraft/util/Wrapper.java b/HMCLAPI/src/main/java/org/jackhuang/hmcl/api/Wrapper.java similarity index 95% rename from HMCUtils/src/main/java/org/jackhuang/hellominecraft/util/Wrapper.java rename to HMCLAPI/src/main/java/org/jackhuang/hmcl/api/Wrapper.java index 49192df2c..127f001b0 100644 --- a/HMCUtils/src/main/java/org/jackhuang/hellominecraft/util/Wrapper.java +++ b/HMCLAPI/src/main/java/org/jackhuang/hmcl/api/Wrapper.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.util; +package org.jackhuang.hmcl.api; /** * diff --git a/HMCL/src/core/java/org/jackhuang/hellominecraft/launcher/core/auth/AuthenticationException.java b/HMCLAPI/src/main/java/org/jackhuang/hmcl/api/auth/AuthenticationException.java old mode 100755 new mode 100644 similarity index 95% rename from HMCL/src/core/java/org/jackhuang/hellominecraft/launcher/core/auth/AuthenticationException.java rename to HMCLAPI/src/main/java/org/jackhuang/hmcl/api/auth/AuthenticationException.java index 2a132a362..0c7ac36e2 --- a/HMCL/src/core/java/org/jackhuang/hellominecraft/launcher/core/auth/AuthenticationException.java +++ b/HMCLAPI/src/main/java/org/jackhuang/hmcl/api/auth/AuthenticationException.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.auth; +package org.jackhuang.hmcl.api.auth; /** * Thrown if we are trying to log in but there's some problems like password wrong. diff --git a/HMCLAPI/src/main/java/org/jackhuang/hmcl/api/auth/IAuthenticator.java b/HMCLAPI/src/main/java/org/jackhuang/hmcl/api/auth/IAuthenticator.java new file mode 100644 index 000000000..d6daf2751 --- /dev/null +++ b/HMCLAPI/src/main/java/org/jackhuang/hmcl/api/auth/IAuthenticator.java @@ -0,0 +1,75 @@ +/* + * 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.hmcl.api.auth; + +import java.util.Map; + +/** + * + * @author huang + */ +public interface IAuthenticator { + + /** + * + * @return the name of login method. + */ + String getName(); + + String getPassword(); + + String getUserName(); + + /** + * Has password? + * + * @return has password? + */ + boolean hasPassword(); + + String id(); + + boolean isLoggedIn(); + + void logOut(); + + /** + * Login Method + * + * @param info username & password + * + * @return login result + * + * @throws + * org.jackhuang.hmcl.core.auth.AuthenticationException + */ + UserProfileProvider login(LoginInfo info) throws AuthenticationException; + + UserProfileProvider loginBySettings() throws AuthenticationException; + + void onLoadSettings(Map m); + + Map onSaveSettings(); + + void setPassword(String password); + + void setRememberMe(boolean is); + + void setUserName(String s); + +} diff --git a/HMCL/src/core/java/org/jackhuang/hellominecraft/launcher/core/auth/LoginInfo.java b/HMCLAPI/src/main/java/org/jackhuang/hmcl/api/auth/LoginInfo.java old mode 100755 new mode 100644 similarity index 94% rename from HMCL/src/core/java/org/jackhuang/hellominecraft/launcher/core/auth/LoginInfo.java rename to HMCLAPI/src/main/java/org/jackhuang/hmcl/api/auth/LoginInfo.java index 020f0d4e0..b26400b33 --- a/HMCL/src/core/java/org/jackhuang/hellominecraft/launcher/core/auth/LoginInfo.java +++ b/HMCLAPI/src/main/java/org/jackhuang/hmcl/api/auth/LoginInfo.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.auth; +package org.jackhuang.hmcl.api.auth; /** * diff --git a/HMCL/src/core/java/org/jackhuang/hellominecraft/launcher/core/auth/UserProfileProvider.java b/HMCLAPI/src/main/java/org/jackhuang/hmcl/api/auth/UserProfileProvider.java old mode 100755 new mode 100644 similarity index 98% rename from HMCL/src/core/java/org/jackhuang/hellominecraft/launcher/core/auth/UserProfileProvider.java rename to HMCLAPI/src/main/java/org/jackhuang/hmcl/api/auth/UserProfileProvider.java index 9009e5e0c..06000351b --- a/HMCL/src/core/java/org/jackhuang/hellominecraft/launcher/core/auth/UserProfileProvider.java +++ b/HMCLAPI/src/main/java/org/jackhuang/hmcl/api/auth/UserProfileProvider.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.auth; +package org.jackhuang.hmcl.api.auth; /** * diff --git a/HMCUtils/src/main/java/org/jackhuang/hellominecraft/api/EventBus.java b/HMCLAPI/src/main/java/org/jackhuang/hmcl/api/event/EventBus.java similarity index 97% rename from HMCUtils/src/main/java/org/jackhuang/hellominecraft/api/EventBus.java rename to HMCLAPI/src/main/java/org/jackhuang/hmcl/api/event/EventBus.java index 47ac1607f..736d94ae0 100644 --- a/HMCUtils/src/main/java/org/jackhuang/hellominecraft/api/EventBus.java +++ b/HMCLAPI/src/main/java/org/jackhuang/hmcl/api/event/EventBus.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.api; +package org.jackhuang.hmcl.api.event; import java.util.EventObject; import java.util.HashMap; diff --git a/HMCUtils/src/main/java/org/jackhuang/hellominecraft/api/EventHandler.java b/HMCLAPI/src/main/java/org/jackhuang/hmcl/api/event/EventHandler.java old mode 100755 new mode 100644 similarity index 95% rename from HMCUtils/src/main/java/org/jackhuang/hellominecraft/api/EventHandler.java rename to HMCLAPI/src/main/java/org/jackhuang/hmcl/api/event/EventHandler.java index 93ac760d5..b7402a6d3 --- a/HMCUtils/src/main/java/org/jackhuang/hellominecraft/api/EventHandler.java +++ b/HMCLAPI/src/main/java/org/jackhuang/hmcl/api/event/EventHandler.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.api; +package org.jackhuang.hmcl.api.event; import java.util.ArrayList; import java.util.EventObject; -import org.jackhuang.hellominecraft.util.func.Consumer; +import org.jackhuang.hmcl.api.func.Consumer; /** * diff --git a/HMCUtils/src/main/java/org/jackhuang/hellominecraft/api/event/OutOfDateEvent.java b/HMCLAPI/src/main/java/org/jackhuang/hmcl/api/event/OutOfDateEvent.java similarity index 74% rename from HMCUtils/src/main/java/org/jackhuang/hellominecraft/api/event/OutOfDateEvent.java rename to HMCLAPI/src/main/java/org/jackhuang/hmcl/api/event/OutOfDateEvent.java index ef44afd59..a5da93e61 100644 --- a/HMCUtils/src/main/java/org/jackhuang/hellominecraft/api/event/OutOfDateEvent.java +++ b/HMCLAPI/src/main/java/org/jackhuang/hmcl/api/event/OutOfDateEvent.java @@ -15,19 +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.api.event; +package org.jackhuang.hmcl.api.event; -import org.jackhuang.hellominecraft.api.ResultedSimpleEvent; -import org.jackhuang.hellominecraft.util.VersionNumber; +import org.jackhuang.hmcl.api.VersionNumber; /** * This event gets fired when we found that user's HMCL is out of date. *
- * This event is {@link org.jackhuang.hellominecraft.api.ResultedEvent} + * This event is {@link org.jackhuang.hmcl.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.HMCAPI#EVENT_BUS} - * @param source {@link org.jackhuang.hellominecraft.util.UpdateChecker} + * This event is fired on the {@link org.jackhuang.hmcl.api.HMCLApi#EVENT_BUS} + * @param source {@link org.jackhuang.hmcl.util.UpdateChecker} * @param VersionNumber newest version * @author huang */ diff --git a/HMCUtils/src/main/java/org/jackhuang/hellominecraft/api/PropertyChangedEvent.java b/HMCLAPI/src/main/java/org/jackhuang/hmcl/api/event/PropertyChangedEvent.java similarity index 96% rename from HMCUtils/src/main/java/org/jackhuang/hellominecraft/api/PropertyChangedEvent.java rename to HMCLAPI/src/main/java/org/jackhuang/hmcl/api/event/PropertyChangedEvent.java index 6f2549eba..0b965830a 100644 --- a/HMCUtils/src/main/java/org/jackhuang/hellominecraft/api/PropertyChangedEvent.java +++ b/HMCLAPI/src/main/java/org/jackhuang/hmcl/api/event/PropertyChangedEvent.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.api; +package org.jackhuang.hmcl.api.event; import java.util.EventObject; diff --git a/HMCUtils/src/main/java/org/jackhuang/hellominecraft/api/ResultedEvent.java b/HMCLAPI/src/main/java/org/jackhuang/hmcl/api/event/ResultedEvent.java similarity index 96% rename from HMCUtils/src/main/java/org/jackhuang/hellominecraft/api/ResultedEvent.java rename to HMCLAPI/src/main/java/org/jackhuang/hmcl/api/event/ResultedEvent.java index 144344259..a0b0a7bb2 100644 --- a/HMCUtils/src/main/java/org/jackhuang/hellominecraft/api/ResultedEvent.java +++ b/HMCLAPI/src/main/java/org/jackhuang/hmcl/api/event/ResultedEvent.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.api; +package org.jackhuang.hmcl.api.event; import java.util.EventObject; diff --git a/HMCUtils/src/main/java/org/jackhuang/hellominecraft/api/ResultedSimpleEvent.java b/HMCLAPI/src/main/java/org/jackhuang/hmcl/api/event/ResultedSimpleEvent.java similarity index 96% rename from HMCUtils/src/main/java/org/jackhuang/hellominecraft/api/ResultedSimpleEvent.java rename to HMCLAPI/src/main/java/org/jackhuang/hmcl/api/event/ResultedSimpleEvent.java index b0b374d0f..327ee41ad 100644 --- a/HMCUtils/src/main/java/org/jackhuang/hellominecraft/api/ResultedSimpleEvent.java +++ b/HMCLAPI/src/main/java/org/jackhuang/hmcl/api/event/ResultedSimpleEvent.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.api; +package org.jackhuang.hmcl.api.event; /** * diff --git a/HMCUtils/src/main/java/org/jackhuang/hellominecraft/api/SimpleEvent.java b/HMCLAPI/src/main/java/org/jackhuang/hmcl/api/event/SimpleEvent.java similarity index 96% rename from HMCUtils/src/main/java/org/jackhuang/hellominecraft/api/SimpleEvent.java rename to HMCLAPI/src/main/java/org/jackhuang/hmcl/api/event/SimpleEvent.java index aa7c362ae..a0da11493 100644 --- a/HMCUtils/src/main/java/org/jackhuang/hellominecraft/api/SimpleEvent.java +++ b/HMCLAPI/src/main/java/org/jackhuang/hmcl/api/event/SimpleEvent.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.api; +package org.jackhuang.hmcl.api.event; import java.util.EventObject; diff --git a/HMCL/src/core/java/org/jackhuang/hellominecraft/launcher/api/event/config/AuthenticatorChangedEvent.java b/HMCLAPI/src/main/java/org/jackhuang/hmcl/api/event/config/AuthenticatorChangedEvent.java similarity index 75% rename from HMCL/src/core/java/org/jackhuang/hellominecraft/launcher/api/event/config/AuthenticatorChangedEvent.java rename to HMCLAPI/src/main/java/org/jackhuang/hmcl/api/event/config/AuthenticatorChangedEvent.java index 41814c48a..4835002fa 100644 --- a/HMCL/src/core/java/org/jackhuang/hellominecraft/launcher/api/event/config/AuthenticatorChangedEvent.java +++ b/HMCLAPI/src/main/java/org/jackhuang/hmcl/api/event/config/AuthenticatorChangedEvent.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.api.event.config; +package org.jackhuang.hmcl.api.event.config; -import org.jackhuang.hellominecraft.api.SimpleEvent; -import org.jackhuang.hellominecraft.launcher.core.auth.IAuthenticator; +import org.jackhuang.hmcl.api.event.SimpleEvent; +import org.jackhuang.hmcl.api.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} + * This event is fired on the {@link org.jackhuang.hmcl.api.HMCLApi#EVENT_BUS} + * @param source {@link org.jackhuang.hmcl.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/HMCLAPI/src/main/java/org/jackhuang/hmcl/api/event/config/DownloadTypeChangedEvent.java similarity index 61% rename from HMCL/src/core/java/org/jackhuang/hellominecraft/launcher/api/event/config/DownloadTypeChangedEvent.java rename to HMCLAPI/src/main/java/org/jackhuang/hmcl/api/event/config/DownloadTypeChangedEvent.java index c88a26ae4..e1fd7baeb 100644 --- a/HMCL/src/core/java/org/jackhuang/hellominecraft/launcher/api/event/config/DownloadTypeChangedEvent.java +++ b/HMCLAPI/src/main/java/org/jackhuang/hmcl/api/event/config/DownloadTypeChangedEvent.java @@ -15,22 +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.launcher.api.event.config; +package org.jackhuang.hmcl.api.event.config; -import org.jackhuang.hellominecraft.api.SimpleEvent; -import org.jackhuang.hellominecraft.launcher.core.download.DownloadType; +import org.jackhuang.hmcl.api.event.SimpleEvent; /** * This event gets fired when the download type 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 DownloadType the new downlaod type + * This event is fired on the {@link org.jackhuang.hmcl.api.HMCLApi#EVENT_BUS} + * @param source {@link org.jackhuang.hmcl.setting.Config} + * @param String the new downlaod type name * @author huangyuhui */ -public class DownloadTypeChangedEvent extends SimpleEvent { +public class DownloadTypeChangedEvent extends SimpleEvent { - public DownloadTypeChangedEvent(Object source, DownloadType value) { + public DownloadTypeChangedEvent(Object source, String value) { super(source, value); } diff --git a/HMCL/src/core/java/org/jackhuang/hellominecraft/launcher/api/event/config/ThemeChangedEvent.java b/HMCLAPI/src/main/java/org/jackhuang/hmcl/api/event/config/ThemeChangedEvent.java similarity index 75% rename from HMCL/src/core/java/org/jackhuang/hellominecraft/launcher/api/event/config/ThemeChangedEvent.java rename to HMCLAPI/src/main/java/org/jackhuang/hmcl/api/event/config/ThemeChangedEvent.java index b65239d2b..7b7736413 100644 --- a/HMCL/src/core/java/org/jackhuang/hellominecraft/launcher/api/event/config/ThemeChangedEvent.java +++ b/HMCLAPI/src/main/java/org/jackhuang/hmcl/api/event/config/ThemeChangedEvent.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.api.event.config; +package org.jackhuang.hmcl.api.event.config; -import org.jackhuang.hellominecraft.api.SimpleEvent; -import org.jackhuang.hellominecraft.lookandfeel.Theme; +import org.jackhuang.hmcl.api.event.SimpleEvent; +import org.jackhuang.hmcl.api.ui.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} + * This event is fired on the {@link org.jackhuang.hmcl.api.HMCLApi#EVENT_BUS} + * @param source {@link org.jackhuang.hmcl.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/HMCLAPI/src/main/java/org/jackhuang/hmcl/api/event/launch/DecompressLibrariesEvent.java similarity index 76% rename from HMCL/src/core/java/org/jackhuang/hellominecraft/launcher/api/event/launch/DecompressLibrariesEvent.java rename to HMCLAPI/src/main/java/org/jackhuang/hmcl/api/event/launch/DecompressLibrariesEvent.java index ec8c09878..bd5dccadc 100644 --- a/HMCL/src/core/java/org/jackhuang/hellominecraft/launcher/api/event/launch/DecompressLibrariesEvent.java +++ b/HMCLAPI/src/main/java/org/jackhuang/hmcl/api/event/launch/DecompressLibrariesEvent.java @@ -15,18 +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.api.event.launch; +package org.jackhuang.hmcl.api.event.launch; -import org.jackhuang.hellominecraft.api.ResultedSimpleEvent; +import org.jackhuang.hmcl.api.game.DecompressLibraryJob; +import org.jackhuang.hmcl.api.event.ResultedSimpleEvent; /** * This event gets fired when we are launching a game and going to decompress natives. *
- * This event is {@link org.jackhuang.hellominecraft.api.ResultedEvent} + * This event is {@link org.jackhuang.hmcl.api.event.ResultedEvent} * If this event is failed, the launching process will be terminated. *
- * This event is fired on the {@link org.jackhuang.hellominecraft.api.HMCAPI#EVENT_BUS} - * @param source {@link org.jackhuang.hellominecraft.launcher.core.launch.GameLauncher} + * This event is fired on the {@link org.jackhuang.hmcl.api.HMCLApi#EVENT_BUS} + * @param source {@link org.jackhuang.hmcl.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/DownloadLibrariesEvent.java b/HMCLAPI/src/main/java/org/jackhuang/hmcl/api/event/launch/DownloadLibrariesEvent.java similarity index 77% rename from HMCL/src/core/java/org/jackhuang/hellominecraft/launcher/api/event/launch/DownloadLibrariesEvent.java rename to HMCLAPI/src/main/java/org/jackhuang/hmcl/api/event/launch/DownloadLibrariesEvent.java index 3684e8eb6..da50de567 100644 --- a/HMCL/src/core/java/org/jackhuang/hellominecraft/launcher/api/event/launch/DownloadLibrariesEvent.java +++ b/HMCLAPI/src/main/java/org/jackhuang/hmcl/api/event/launch/DownloadLibrariesEvent.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.api.event.launch; +package org.jackhuang.hmcl.api.event.launch; import java.util.List; -import org.jackhuang.hellominecraft.api.ResultedSimpleEvent; +import org.jackhuang.hmcl.api.event.ResultedSimpleEvent; /** * This event gets fired when we are launching a game and there are some libraries to be downloaded. *
- * This event is {@link org.jackhuang.hellominecraft.api.ResultedEvent} + * This event is {@link org.jackhuang.hmcl.api.event.ResultedEvent} * If this event is failed, the launching process will be terminated. *
- * This event is fired on the {@link org.jackhuang.hellominecraft.api.HMCAPI#EVENT_BUS} - * @param source {@link org.jackhuang.hellominecraft.launcher.core.launch.GameLauncher} + * This event is fired on the {@link org.jackhuang.hmcl.api.HMCLApi#EVENT_BUS} + * @param source {@link org.jackhuang.hmcl.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/HMCLAPI/src/main/java/org/jackhuang/hmcl/api/event/launch/DownloadLibraryJob.java similarity index 90% rename from HMCL/src/core/java/org/jackhuang/hellominecraft/launcher/api/event/launch/DownloadLibraryJob.java rename to HMCLAPI/src/main/java/org/jackhuang/hmcl/api/event/launch/DownloadLibraryJob.java index 85a801855..0b89e8e88 100644 --- a/HMCL/src/core/java/org/jackhuang/hellominecraft/launcher/api/event/launch/DownloadLibraryJob.java +++ b/HMCLAPI/src/main/java/org/jackhuang/hmcl/api/event/launch/DownloadLibraryJob.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.api.event.launch; +package org.jackhuang.hmcl.api.event.launch; import java.io.File; -import org.jackhuang.hellominecraft.launcher.core.version.IMinecraftLibrary; +import org.jackhuang.hmcl.api.game.IMinecraftLibrary; /** * @@ -37,7 +37,7 @@ public class DownloadLibraryJob { } public DownloadLibraryJob parse() { - String name = lib.name; + String name = lib.getName(); if (name.startsWith("net.minecraftforge:forge:")) { String[] s = name.split(":"); if (s.length == 3) diff --git a/HMCL/src/core/java/org/jackhuang/hellominecraft/launcher/api/event/launch/LaunchEvent.java b/HMCLAPI/src/main/java/org/jackhuang/hmcl/api/event/launch/LaunchEvent.java similarity index 63% rename from HMCL/src/core/java/org/jackhuang/hellominecraft/launcher/api/event/launch/LaunchEvent.java rename to HMCLAPI/src/main/java/org/jackhuang/hmcl/api/event/launch/LaunchEvent.java index 4cf872925..02682a1d0 100644 --- a/HMCL/src/core/java/org/jackhuang/hellominecraft/launcher/api/event/launch/LaunchEvent.java +++ b/HMCLAPI/src/main/java/org/jackhuang/hmcl/api/event/launch/LaunchEvent.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.api.event.launch; +package org.jackhuang.hmcl.api.event.launch; -import org.jackhuang.hellominecraft.api.SimpleEvent; -import org.jackhuang.hellominecraft.util.sys.JavaProcess; +import org.jackhuang.hmcl.api.IProcess; +import org.jackhuang.hmcl.api.event.SimpleEvent; /** * This event gets fired when we launched the game. *
- * 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 + * This event is fired on the {@link org.jackhuang.hmcl.api.HMCLApi#EVENT_BUS} + * @param source {@link org.jackhuang.hmcl.core.launch.GameLauncher} + * @param IProcess the game process * @author huangyuhui */ -public class LaunchEvent extends SimpleEvent { +public class LaunchEvent extends SimpleEvent { - public LaunchEvent(Object source, JavaProcess value) { + public LaunchEvent(Object source, IProcess value) { super(source, value); } diff --git a/HMCL/src/core/java/org/jackhuang/hellominecraft/launcher/api/event/launch/LaunchSucceededEvent.java b/HMCLAPI/src/main/java/org/jackhuang/hmcl/api/event/launch/LaunchSucceededEvent.java similarity index 79% rename from HMCL/src/core/java/org/jackhuang/hellominecraft/launcher/api/event/launch/LaunchSucceededEvent.java rename to HMCLAPI/src/main/java/org/jackhuang/hmcl/api/event/launch/LaunchSucceededEvent.java index 19d0e9da8..d41b1d7c9 100644 --- a/HMCL/src/core/java/org/jackhuang/hellominecraft/launcher/api/event/launch/LaunchSucceededEvent.java +++ b/HMCLAPI/src/main/java/org/jackhuang/hmcl/api/event/launch/LaunchSucceededEvent.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.api.event.launch; +package org.jackhuang.hmcl.api.event.launch; import java.util.List; -import org.jackhuang.hellominecraft.api.SimpleEvent; +import org.jackhuang.hmcl.api.event.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.HMCAPI#EVENT_BUS} - * @param source {@link org.jackhuang.hellominecraft.launcher.core.launch.GameLauncher} + * This event is fired on the {@link org.jackhuang.hmcl.api.HMCLApi#EVENT_BUS} + * @param source {@link org.jackhuang.hmcl.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/LaunchingState.java b/HMCLAPI/src/main/java/org/jackhuang/hmcl/api/event/launch/LaunchingState.java similarity index 93% rename from HMCL/src/core/java/org/jackhuang/hellominecraft/launcher/api/event/launch/LaunchingState.java rename to HMCLAPI/src/main/java/org/jackhuang/hmcl/api/event/launch/LaunchingState.java index f6e50687c..9d2759e97 100644 --- a/HMCL/src/core/java/org/jackhuang/hellominecraft/launcher/api/event/launch/LaunchingState.java +++ b/HMCLAPI/src/main/java/org/jackhuang/hmcl/api/event/launch/LaunchingState.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.api.event.launch; +package org.jackhuang.hmcl.api.event.launch; /** * diff --git a/HMCL/src/core/java/org/jackhuang/hellominecraft/launcher/api/event/launch/LaunchingStateChangedEvent.java b/HMCLAPI/src/main/java/org/jackhuang/hmcl/api/event/launch/LaunchingStateChangedEvent.java similarity index 79% rename from HMCL/src/core/java/org/jackhuang/hellominecraft/launcher/api/event/launch/LaunchingStateChangedEvent.java rename to HMCLAPI/src/main/java/org/jackhuang/hmcl/api/event/launch/LaunchingStateChangedEvent.java index 19c3d5a42..e7267fc49 100644 --- a/HMCL/src/core/java/org/jackhuang/hellominecraft/launcher/api/event/launch/LaunchingStateChangedEvent.java +++ b/HMCLAPI/src/main/java/org/jackhuang/hmcl/api/event/launch/LaunchingStateChangedEvent.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.launcher.api.event.launch; +package org.jackhuang.hmcl.api.event.launch; -import org.jackhuang.hellominecraft.api.SimpleEvent; +import org.jackhuang.hmcl.api.event.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.HMCAPI#EVENT_BUS} - * @param source {@link org.jackhuang.hellominecraft.launcher.core.launch.GameLauncher} + * This event is fired on the {@link org.jackhuang.hmcl.api.HMCLApi#EVENT_BUS} + * @param source {@link org.jackhuang.hmcl.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/HMCLAPI/src/main/java/org/jackhuang/hmcl/api/event/launch/ProcessingLaunchOptionsEvent.java similarity index 73% rename from HMCL/src/core/java/org/jackhuang/hellominecraft/launcher/api/event/launch/ProcessingLaunchOptionsEvent.java rename to HMCLAPI/src/main/java/org/jackhuang/hmcl/api/event/launch/ProcessingLaunchOptionsEvent.java index e496126f9..bd4e350ea 100644 --- a/HMCL/src/core/java/org/jackhuang/hellominecraft/launcher/api/event/launch/ProcessingLaunchOptionsEvent.java +++ b/HMCLAPI/src/main/java/org/jackhuang/hmcl/api/event/launch/ProcessingLaunchOptionsEvent.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.api.event.launch; +package org.jackhuang.hmcl.api.event.launch; -import org.jackhuang.hellominecraft.api.SimpleEvent; -import org.jackhuang.hellominecraft.launcher.core.launch.LaunchOptions; +import org.jackhuang.hmcl.api.event.SimpleEvent; +import org.jackhuang.hmcl.api.game.LaunchOptions; /** * This event gets fired before generating launch command. *
* Pay attension: If you need to terminate the launching process, you must throw - * {@link org.jackhuang.hellominecraft.launcher.core.RuntimeGameException anyway. + * {@link org.jackhuang.hmcl.core.RuntimeGameException anyway. *
- * This event is fired on the {@link org.jackhuang.hellominecraft.api.HMCAPI#EVENT_BUS} - * @param source {@link org.jackhuang.hellominecraft.launcher.core.launch.GameLauncher} + * This event is fired on the {@link org.jackhuang.hmcl.api.HMCLApi#EVENT_BUS} + * @param source {@link org.jackhuang.hmcl.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/HMCLAPI/src/main/java/org/jackhuang/hmcl/api/event/launch/ProcessingLoginResultEvent.java similarity index 73% rename from HMCL/src/core/java/org/jackhuang/hellominecraft/launcher/api/event/launch/ProcessingLoginResultEvent.java rename to HMCLAPI/src/main/java/org/jackhuang/hmcl/api/event/launch/ProcessingLoginResultEvent.java index 234edcb20..76a6162f7 100644 --- a/HMCL/src/core/java/org/jackhuang/hellominecraft/launcher/api/event/launch/ProcessingLoginResultEvent.java +++ b/HMCLAPI/src/main/java/org/jackhuang/hmcl/api/event/launch/ProcessingLoginResultEvent.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.api.event.launch; +package org.jackhuang.hmcl.api.event.launch; -import org.jackhuang.hellominecraft.api.SimpleEvent; -import org.jackhuang.hellominecraft.launcher.core.auth.UserProfileProvider; +import org.jackhuang.hmcl.api.auth.UserProfileProvider; +import org.jackhuang.hmcl.api.event.SimpleEvent; /** * This event gets fired when we successfully logged in. *
* Pay attension: If you need to terminate the launching process, you must throw - * {@link org.jackhuang.hellominecraft.launcher.core.RuntimeGameException anyway. + * {@link org.jackhuang.hmcl.core.RuntimeGameException anyway. *
- * This event is fired on the {@link org.jackhuang.hellominecraft.api.HMCAPI#EVENT_BUS} - * @param source {@link org.jackhuang.hellominecraft.launcher.core.launch.GameLauncher} + * This event is fired on the {@link org.jackhuang.hmcl.api.HMCLApi#EVENT_BUS} + * @param source {@link org.jackhuang.hmcl.core.launch.GameLauncher} * @param UserProfileProvider you can modify the value of this event to control the user profile. * @author huangyuhui */ diff --git a/HMCUtils/src/main/java/org/jackhuang/hellominecraft/api/event/process/JVMLaunchFailedEvent.java b/HMCLAPI/src/main/java/org/jackhuang/hmcl/api/event/process/JVMLaunchFailedEvent.java similarity index 66% rename from HMCUtils/src/main/java/org/jackhuang/hellominecraft/api/event/process/JVMLaunchFailedEvent.java rename to HMCLAPI/src/main/java/org/jackhuang/hmcl/api/event/process/JVMLaunchFailedEvent.java index 796596fb7..c740aa701 100644 --- a/HMCUtils/src/main/java/org/jackhuang/hellominecraft/api/event/process/JVMLaunchFailedEvent.java +++ b/HMCLAPI/src/main/java/org/jackhuang/hmcl/api/event/process/JVMLaunchFailedEvent.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.api.event.process; +package org.jackhuang.hmcl.api.event.process; -import org.jackhuang.hellominecraft.api.SimpleEvent; -import org.jackhuang.hellominecraft.util.sys.JavaProcess; +import org.jackhuang.hmcl.api.IProcess; +import org.jackhuang.hmcl.api.event.SimpleEvent; /** * This event gets fired when we launch the JVM and it got crashed. *
- * This event is fired on the {@link org.jackhuang.hellominecraft.api.HMCAPI#EVENT_BUS} - * @param source {@link org.jackhuang.hellominecraft.util.sys.JavaProcessMonitor} + * This event is fired on the {@link org.jackhuang.hmcl.api.HMCLApi#EVENT_BUS} + * @param source {@link org.jackhuang.hmcl.util.sys.JavaProcessMonitor} * @param JavaProcess the crashed process. * @author huangyuhui */ -public class JVMLaunchFailedEvent extends SimpleEvent { +public class JVMLaunchFailedEvent extends SimpleEvent { - public JVMLaunchFailedEvent(Object source, JavaProcess value) { + public JVMLaunchFailedEvent(Object source, IProcess value) { super(source, value); } diff --git a/HMCUtils/src/main/java/org/jackhuang/hellominecraft/api/event/process/JavaProcessExitedAbnormallyEvent.java b/HMCLAPI/src/main/java/org/jackhuang/hmcl/api/event/process/JavaProcessExitedAbnormallyEvent.java similarity index 70% rename from HMCUtils/src/main/java/org/jackhuang/hellominecraft/api/event/process/JavaProcessExitedAbnormallyEvent.java rename to HMCLAPI/src/main/java/org/jackhuang/hmcl/api/event/process/JavaProcessExitedAbnormallyEvent.java index b897bc0d1..c8f3b1c91 100644 --- a/HMCUtils/src/main/java/org/jackhuang/hellominecraft/api/event/process/JavaProcessExitedAbnormallyEvent.java +++ b/HMCLAPI/src/main/java/org/jackhuang/hmcl/api/event/process/JavaProcessExitedAbnormallyEvent.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.api.event.process; +package org.jackhuang.hmcl.api.event.process; -import org.jackhuang.hellominecraft.api.SimpleEvent; -import org.jackhuang.hellominecraft.util.sys.JavaProcess; +import org.jackhuang.hmcl.api.IProcess; +import org.jackhuang.hmcl.api.event.SimpleEvent; /** * 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.HMCAPI#EVENT_BUS} - * @param source {@link org.jackhuang.hellominecraft.util.sys.JavaProcessMonitor} + * This event is fired on the {@link org.jackhuang.hmcl.api.HMCLApi#EVENT_BUS} + * @param source {@link org.jackhuang.hmcl.util.sys.JavaProcessMonitor} * @param JavaProcess The process that exited abnormally. * @author huangyuhui */ -public class JavaProcessExitedAbnormallyEvent extends SimpleEvent { +public class JavaProcessExitedAbnormallyEvent extends SimpleEvent { - public JavaProcessExitedAbnormallyEvent(Object source, JavaProcess value) { + public JavaProcessExitedAbnormallyEvent(Object source, IProcess value) { super(source, value); } diff --git a/HMCUtils/src/main/java/org/jackhuang/hellominecraft/api/event/process/JavaProcessStartingEvent.java b/HMCLAPI/src/main/java/org/jackhuang/hmcl/api/event/process/JavaProcessStartingEvent.java similarity index 66% rename from HMCUtils/src/main/java/org/jackhuang/hellominecraft/api/event/process/JavaProcessStartingEvent.java rename to HMCLAPI/src/main/java/org/jackhuang/hmcl/api/event/process/JavaProcessStartingEvent.java index a78f4d044..81bb457c7 100644 --- a/HMCUtils/src/main/java/org/jackhuang/hellominecraft/api/event/process/JavaProcessStartingEvent.java +++ b/HMCLAPI/src/main/java/org/jackhuang/hmcl/api/event/process/JavaProcessStartingEvent.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.api.event.process; +package org.jackhuang.hmcl.api.event.process; -import org.jackhuang.hellominecraft.api.SimpleEvent; -import org.jackhuang.hellominecraft.util.sys.JavaProcess; +import org.jackhuang.hmcl.api.IProcess; +import org.jackhuang.hmcl.api.event.SimpleEvent; /** * This event gets fired when a JavaProcess is starting. *
- * This event is fired on the {@link org.jackhuang.hellominecraft.api.HMCAPI#EVENT_BUS} - * @param source {@link org.jackhuang.hellominecraft.util.sys.JavaProcessMonitor} + * This event is fired on the {@link org.jackhuang.hmcl.api.HMCLApi#EVENT_BUS} + * @param source {@link org.jackhuang.hmcl.util.sys.JavaProcessMonitor} * @param JavaProcess the starting JavaProcess. * @author huang */ -public class JavaProcessStartingEvent extends SimpleEvent { +public class JavaProcessStartingEvent extends SimpleEvent { - public JavaProcessStartingEvent(Object source, JavaProcess value) { + public JavaProcessStartingEvent(Object source, IProcess value) { super(source, value); } diff --git a/HMCUtils/src/main/java/org/jackhuang/hellominecraft/api/event/process/JavaProcessStoppedEvent.java b/HMCLAPI/src/main/java/org/jackhuang/hmcl/api/event/process/JavaProcessStoppedEvent.java similarity index 66% rename from HMCUtils/src/main/java/org/jackhuang/hellominecraft/api/event/process/JavaProcessStoppedEvent.java rename to HMCLAPI/src/main/java/org/jackhuang/hmcl/api/event/process/JavaProcessStoppedEvent.java index ffbf2d5cf..a91879ec6 100644 --- a/HMCUtils/src/main/java/org/jackhuang/hellominecraft/api/event/process/JavaProcessStoppedEvent.java +++ b/HMCLAPI/src/main/java/org/jackhuang/hmcl/api/event/process/JavaProcessStoppedEvent.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.api.event.process; +package org.jackhuang.hmcl.api.event.process; -import org.jackhuang.hellominecraft.api.SimpleEvent; -import org.jackhuang.hellominecraft.util.sys.JavaProcess; +import org.jackhuang.hmcl.api.IProcess; +import org.jackhuang.hmcl.api.event.SimpleEvent; /** * 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.HMCAPI#EVENT_BUS} - * @param source {@link org.jackhuang.hellominecraft.util.sys.JavaProcessMonitor} + * This event is fired on the {@link org.jackhuang.hmcl.api.HMCLApi#EVENT_BUS} + * @param source {@link org.jackhuang.hmcl.util.sys.JavaProcessMonitor} * @param JavaProcess minecraft process * @author huangyuhui */ -public class JavaProcessStoppedEvent extends SimpleEvent { +public class JavaProcessStoppedEvent extends SimpleEvent { - public JavaProcessStoppedEvent(Object source, JavaProcess value) { + public JavaProcessStoppedEvent(Object source, IProcess value) { super(source, value); } diff --git a/HMCL/src/core/java/org/jackhuang/hellominecraft/launcher/api/event/version/LoadedOneVersionEvent.java b/HMCLAPI/src/main/java/org/jackhuang/hmcl/api/event/version/LoadedOneVersionEvent.java similarity index 77% rename from HMCL/src/core/java/org/jackhuang/hellominecraft/launcher/api/event/version/LoadedOneVersionEvent.java rename to HMCLAPI/src/main/java/org/jackhuang/hmcl/api/event/version/LoadedOneVersionEvent.java index 5bf1c8cf4..281b92d1a 100644 --- a/HMCL/src/core/java/org/jackhuang/hellominecraft/launcher/api/event/version/LoadedOneVersionEvent.java +++ b/HMCLAPI/src/main/java/org/jackhuang/hmcl/api/event/version/LoadedOneVersionEvent.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.launcher.api.event.version; +package org.jackhuang.hmcl.api.event.version; -import org.jackhuang.hellominecraft.api.SimpleEvent; +import org.jackhuang.hmcl.api.event.SimpleEvent; /** * This event gets fired when a minecraft version has been loaded. *
- * This event is fired on the {@link org.jackhuang.hellominecraft.api.HMCAPI#EVENT_BUS} - * @param source {@link org.jackhuang.hellominecraft.launcher.core.version.MinecraftVersionManager} + * This event is fired on the {@link org.jackhuang.hmcl.api.HMCLApi#EVENT_BUS} + * @param source {@link org.jackhuang.hmcl.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/HMCLAPI/src/main/java/org/jackhuang/hmcl/api/event/version/MinecraftLibraryPathEvent.java similarity index 82% rename from HMCL/src/core/java/org/jackhuang/hellominecraft/launcher/api/event/version/MinecraftLibraryPathEvent.java rename to HMCLAPI/src/main/java/org/jackhuang/hmcl/api/event/version/MinecraftLibraryPathEvent.java index 1a1909145..2b62b6a76 100644 --- a/HMCL/src/core/java/org/jackhuang/hellominecraft/launcher/api/event/version/MinecraftLibraryPathEvent.java +++ b/HMCLAPI/src/main/java/org/jackhuang/hmcl/api/event/version/MinecraftLibraryPathEvent.java @@ -15,17 +15,17 @@ * 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.api.event.version; +package org.jackhuang.hmcl.api.event.version; import java.io.File; import java.util.EventObject; -import org.jackhuang.hellominecraft.util.Wrapper; +import org.jackhuang.hmcl.api.Wrapper; /** * This event gets fired when we getting minecraft library path. *
- * This event is fired on the {@link org.jackhuang.hellominecraft.api.HMCAPI#EVENT_BUS} - * @param source {@link org.jackhuang.hellominecraft.launcher.core.version.MinecraftLibrary} + * This event is fired on the {@link org.jackhuang.hmcl.api.HMCLApi#EVENT_BUS} + * @param source {@link org.jackhuang.hmcl.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/HMCLAPI/src/main/java/org/jackhuang/hmcl/api/event/version/RefreshedVersionsEvent.java similarity index 62% rename from HMCL/src/core/java/org/jackhuang/hellominecraft/launcher/api/event/version/RefreshedVersionsEvent.java rename to HMCLAPI/src/main/java/org/jackhuang/hmcl/api/event/version/RefreshedVersionsEvent.java index a9a0f0470..8ebb5b2c0 100644 --- a/HMCL/src/core/java/org/jackhuang/hellominecraft/launcher/api/event/version/RefreshedVersionsEvent.java +++ b/HMCLAPI/src/main/java/org/jackhuang/hmcl/api/event/version/RefreshedVersionsEvent.java @@ -15,23 +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.api.event.version; +package org.jackhuang.hmcl.api.event.version; -import org.jackhuang.hellominecraft.api.SimpleEvent; -import org.jackhuang.hellominecraft.launcher.core.service.IMinecraftService; +import java.util.EventObject; /** * This event gets fired when all the versions in .minecraft folder are loaded. *
- * This event is fired on the {@link org.jackhuang.hellominecraft.api.HMCAPI#EVENT_BUS} - * @param source {@link org.jackhuang.hellominecraft.launcher.core.version.MinecraftVersionManager} + * This event is fired on the {@link org.jackhuang.hmcl.api.HMCLApi#EVENT_BUS} + * @param source {@link org.jackhuang.hmcl.core.version.MinecraftVersionManager} * @param IMinecraftService the .minecraft folder. * @author huangyuhui */ -public class RefreshedVersionsEvent extends SimpleEvent { +public class RefreshedVersionsEvent extends EventObject { - public RefreshedVersionsEvent(Object source, IMinecraftService value) { - super(source, value); + public RefreshedVersionsEvent(Object source) { + super(source); } } diff --git a/HMCL/src/core/java/org/jackhuang/hellominecraft/launcher/api/event/version/RefreshingVersionsEvent.java b/HMCLAPI/src/main/java/org/jackhuang/hmcl/api/event/version/RefreshingVersionsEvent.java similarity index 61% rename from HMCL/src/core/java/org/jackhuang/hellominecraft/launcher/api/event/version/RefreshingVersionsEvent.java rename to HMCLAPI/src/main/java/org/jackhuang/hmcl/api/event/version/RefreshingVersionsEvent.java index a78a6ddeb..e16ad2a30 100644 --- a/HMCL/src/core/java/org/jackhuang/hellominecraft/launcher/api/event/version/RefreshingVersionsEvent.java +++ b/HMCLAPI/src/main/java/org/jackhuang/hmcl/api/event/version/RefreshingVersionsEvent.java @@ -15,23 +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.api.event.version; +package org.jackhuang.hmcl.api.event.version; -import org.jackhuang.hellominecraft.api.SimpleEvent; -import org.jackhuang.hellominecraft.launcher.core.service.IMinecraftService; +import java.util.EventObject; /** * This event gets fired when loading versions in a .minecraft folder. *
- * This event is fired on the {@link org.jackhuang.hellominecraft.api.HMCAPI#EVENT_BUS} - * @param source {@link org.jackhuang.hellominecraft.launcher.core.version.MinecraftVersionManager} + * This event is fired on the {@link org.jackhuang.hmcl.api.HMCLApi#EVENT_BUS} + * @param source {@link org.jackhuang.hmcl.core.version.MinecraftVersionManager} * @param IMinecraftService .minecraft folder. * @author huang */ -public class RefreshingVersionsEvent extends SimpleEvent { +public class RefreshingVersionsEvent extends EventObject { - public RefreshingVersionsEvent(Object source, IMinecraftService value) { - super(source, value); + public RefreshingVersionsEvent(Object source) { + super(source); } } diff --git a/HMCUtils/src/main/java/org/jackhuang/hellominecraft/util/func/BiFunction.java b/HMCLAPI/src/main/java/org/jackhuang/hmcl/api/func/BiFunction.java old mode 100755 new mode 100644 similarity index 94% rename from HMCUtils/src/main/java/org/jackhuang/hellominecraft/util/func/BiFunction.java rename to HMCLAPI/src/main/java/org/jackhuang/hmcl/api/func/BiFunction.java index bbe6745aa..79477f6ff --- a/HMCUtils/src/main/java/org/jackhuang/hellominecraft/util/func/BiFunction.java +++ b/HMCLAPI/src/main/java/org/jackhuang/hmcl/api/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.util.func; +package org.jackhuang.hmcl.api.func; /** * diff --git a/HMCUtils/src/main/java/org/jackhuang/hellominecraft/util/func/CallbackIO.java b/HMCLAPI/src/main/java/org/jackhuang/hmcl/api/func/CallbackIO.java similarity index 94% rename from HMCUtils/src/main/java/org/jackhuang/hellominecraft/util/func/CallbackIO.java rename to HMCLAPI/src/main/java/org/jackhuang/hmcl/api/func/CallbackIO.java index 167c77660..717199b59 100644 --- a/HMCUtils/src/main/java/org/jackhuang/hellominecraft/util/func/CallbackIO.java +++ b/HMCLAPI/src/main/java/org/jackhuang/hmcl/api/func/CallbackIO.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.util.func; +package org.jackhuang.hmcl.api.func; import java.io.IOException; diff --git a/HMCUtils/src/main/java/org/jackhuang/hellominecraft/util/func/Consumer.java b/HMCLAPI/src/main/java/org/jackhuang/hmcl/api/func/Consumer.java old mode 100755 new mode 100644 similarity index 94% rename from HMCUtils/src/main/java/org/jackhuang/hellominecraft/util/func/Consumer.java rename to HMCLAPI/src/main/java/org/jackhuang/hmcl/api/func/Consumer.java index 60252a170..70867753a --- a/HMCUtils/src/main/java/org/jackhuang/hellominecraft/util/func/Consumer.java +++ b/HMCLAPI/src/main/java/org/jackhuang/hmcl/api/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.util.func; +package org.jackhuang.hmcl.api.func; import java.util.EventListener; diff --git a/HMCUtils/src/main/java/org/jackhuang/hellominecraft/util/func/Function.java b/HMCLAPI/src/main/java/org/jackhuang/hmcl/api/func/Function.java old mode 100755 new mode 100644 similarity index 94% rename from HMCUtils/src/main/java/org/jackhuang/hellominecraft/util/func/Function.java rename to HMCLAPI/src/main/java/org/jackhuang/hmcl/api/func/Function.java index 95e610efb..c6546fd30 --- a/HMCUtils/src/main/java/org/jackhuang/hellominecraft/util/func/Function.java +++ b/HMCLAPI/src/main/java/org/jackhuang/hmcl/api/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.util.func; +package org.jackhuang.hmcl.api.func; /** * diff --git a/HMCUtils/src/main/java/org/jackhuang/hellominecraft/util/func/NonFunction.java b/HMCLAPI/src/main/java/org/jackhuang/hmcl/api/func/NonFunction.java old mode 100755 new mode 100644 similarity index 94% rename from HMCUtils/src/main/java/org/jackhuang/hellominecraft/util/func/NonFunction.java rename to HMCLAPI/src/main/java/org/jackhuang/hmcl/api/func/NonFunction.java index a51235b9f..704e89c49 --- a/HMCUtils/src/main/java/org/jackhuang/hellominecraft/util/func/NonFunction.java +++ b/HMCLAPI/src/main/java/org/jackhuang/hmcl/api/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.util.func; +package org.jackhuang.hmcl.api.func; /** * diff --git a/HMCUtils/src/main/java/org/jackhuang/hellominecraft/util/func/Predicate.java b/HMCLAPI/src/main/java/org/jackhuang/hmcl/api/func/Predicate.java old mode 100755 new mode 100644 similarity index 94% rename from HMCUtils/src/main/java/org/jackhuang/hellominecraft/util/func/Predicate.java rename to HMCLAPI/src/main/java/org/jackhuang/hmcl/api/func/Predicate.java index 9b7e0f1c8..6eb10f8ed --- a/HMCUtils/src/main/java/org/jackhuang/hellominecraft/util/func/Predicate.java +++ b/HMCLAPI/src/main/java/org/jackhuang/hmcl/api/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.util.func; +package org.jackhuang.hmcl.api.func; /** * diff --git a/HMCL/src/core/java/org/jackhuang/hellominecraft/launcher/api/event/launch/DecompressLibraryJob.java b/HMCLAPI/src/main/java/org/jackhuang/hmcl/api/game/DecompressLibraryJob.java similarity index 92% rename from HMCL/src/core/java/org/jackhuang/hellominecraft/launcher/api/event/launch/DecompressLibraryJob.java rename to HMCLAPI/src/main/java/org/jackhuang/hmcl/api/game/DecompressLibraryJob.java index 3c0d3a67a..81984a39e 100644 --- a/HMCL/src/core/java/org/jackhuang/hellominecraft/launcher/api/event/launch/DecompressLibraryJob.java +++ b/HMCLAPI/src/main/java/org/jackhuang/hmcl/api/game/DecompressLibraryJob.java @@ -15,10 +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.api.event.launch; +package org.jackhuang.hmcl.api.game; import java.io.File; -import org.jackhuang.hellominecraft.launcher.core.version.Extract; /** * @author huangyuhui diff --git a/HMCL/src/core/java/org/jackhuang/hellominecraft/launcher/core/version/Extract.java b/HMCLAPI/src/main/java/org/jackhuang/hmcl/api/game/Extract.java old mode 100755 new mode 100644 similarity index 77% rename from HMCL/src/core/java/org/jackhuang/hellominecraft/launcher/core/version/Extract.java rename to HMCLAPI/src/main/java/org/jackhuang/hmcl/api/game/Extract.java index ca6d914b2..5c60ffee2 --- a/HMCL/src/core/java/org/jackhuang/hellominecraft/launcher/core/version/Extract.java +++ b/HMCLAPI/src/main/java/org/jackhuang/hmcl/api/game/Extract.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.version; +package org.jackhuang.hmcl.api.game; import com.google.gson.annotations.SerializedName; import java.util.ArrayList; +import java.util.Collection; import java.util.List; -import org.jackhuang.hellominecraft.util.StrUtils; /** * @@ -32,7 +32,7 @@ public class Extract implements Cloneable { public List exclude = new ArrayList<>(); public boolean allow(String path) { - return !StrUtils.startsWithOne(exclude, path); + return !startsWithOne(exclude, path); } @Override @@ -44,4 +44,12 @@ public class Extract implements Cloneable { } } + public static boolean startsWithOne(Collection a, String match) { + if (a == null) + return false; + for (String b : a) + if (match.startsWith(b)) + return true; + return false; + } } diff --git a/HMCL/src/core/java/org/jackhuang/hellominecraft/launcher/core/version/GameDirType.java b/HMCLAPI/src/main/java/org/jackhuang/hmcl/api/game/GameDirType.java old mode 100755 new mode 100644 similarity index 93% rename from HMCL/src/core/java/org/jackhuang/hellominecraft/launcher/core/version/GameDirType.java rename to HMCLAPI/src/main/java/org/jackhuang/hmcl/api/game/GameDirType.java index 0fe97eda8..483e8e582 --- a/HMCL/src/core/java/org/jackhuang/hellominecraft/launcher/core/version/GameDirType.java +++ b/HMCLAPI/src/main/java/org/jackhuang/hmcl/api/game/GameDirType.java @@ -15,7 +15,7 @@ * You should have received a copy of the GNU General Public License * along with this program. If not, see {http://www.gnu.org/licenses/}. */ -package org.jackhuang.hellominecraft.launcher.core.version; +package org.jackhuang.hmcl.api.game; /** * diff --git a/HMCSM/src/main/java/org/jackhuang/hellominecraft/svrmgr/api/ServerStartedEvent.java b/HMCLAPI/src/main/java/org/jackhuang/hmcl/api/game/IMinecraftLibrary.java similarity index 71% rename from HMCSM/src/main/java/org/jackhuang/hellominecraft/svrmgr/api/ServerStartedEvent.java rename to HMCLAPI/src/main/java/org/jackhuang/hmcl/api/game/IMinecraftLibrary.java index 9dd6cc28a..c4862432d 100644 --- a/HMCSM/src/main/java/org/jackhuang/hellominecraft/svrmgr/api/ServerStartedEvent.java +++ b/HMCLAPI/src/main/java/org/jackhuang/hmcl/api/game/IMinecraftLibrary.java @@ -15,18 +15,26 @@ * 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.svrmgr.api; +package org.jackhuang.hmcl.api.game; -import java.util.EventObject; +import java.io.File; /** * * @author huang */ -public class ServerStartedEvent extends EventObject { +public interface IMinecraftLibrary extends Cloneable { + + boolean allow(); + + Extract getDecompressExtractRules(); + + File getFilePath(File gameDir); + + String getName(); + + boolean isRequiredToUnzip(); - public ServerStartedEvent(Object source) { - super(source); - } + String getDownloadURL(String downloadSource); } diff --git a/HMCL/src/core/java/org/jackhuang/hellominecraft/launcher/core/launch/LaunchOptions.java b/HMCLAPI/src/main/java/org/jackhuang/hmcl/api/game/LaunchOptions.java similarity index 91% rename from HMCL/src/core/java/org/jackhuang/hellominecraft/launcher/core/launch/LaunchOptions.java rename to HMCLAPI/src/main/java/org/jackhuang/hmcl/api/game/LaunchOptions.java index b70874516..cc9f295d0 100644 --- a/HMCL/src/core/java/org/jackhuang/hellominecraft/launcher/core/launch/LaunchOptions.java +++ b/HMCLAPI/src/main/java/org/jackhuang/hmcl/api/game/LaunchOptions.java @@ -15,12 +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.core.launch; +package org.jackhuang.hmcl.api.game; import java.io.File; -import org.jackhuang.hellominecraft.launcher.core.version.GameDirType; -import org.jackhuang.hellominecraft.util.StrUtils; -import org.jackhuang.hellominecraft.util.sys.JdkVersion; /** * @@ -31,7 +28,6 @@ public class LaunchOptions { private String name, versionName, javaArgs, minecraftArgs, maxMemory, permSize, width, height, serverIp, wrapper; private String proxyHost, proxyPort, proxyUser, proxyPass, javaDir, launchVersion, type, precalledCommand; private boolean fullscreen, noJVMArgs, notCheckGame; - private JdkVersion java; private File gameDir; private GameDirType gameDirType; @@ -59,14 +55,6 @@ public class LaunchOptions { return javaDir; } - public JdkVersion getJava() { - return java; - } - - public void setJava(JdkVersion java) { - this.java = java; - } - public String getName() { return name; } @@ -84,7 +72,7 @@ public class LaunchOptions { } public boolean hasJavaArgs() { - return StrUtils.isNotBlank(getJavaArgs().trim()); + return getJavaArgs() != null && !getJavaArgs().trim().isEmpty(); } public String getMaxMemory() { diff --git a/HMCL/src/core/java/org/jackhuang/hellominecraft/launcher/api/AddTabCallback.java b/HMCLAPI/src/main/java/org/jackhuang/hmcl/api/ui/AddTabCallback.java similarity index 87% rename from HMCL/src/core/java/org/jackhuang/hellominecraft/launcher/api/AddTabCallback.java rename to HMCLAPI/src/main/java/org/jackhuang/hmcl/api/ui/AddTabCallback.java index 451138c25..993fdcb94 100644 --- a/HMCL/src/core/java/org/jackhuang/hellominecraft/launcher/api/AddTabCallback.java +++ b/HMCLAPI/src/main/java/org/jackhuang/hmcl/api/ui/AddTabCallback.java @@ -15,9 +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.api; - -import org.jackhuang.hellominecraft.util.ui.Page; +package org.jackhuang.hmcl.api.ui; /** * Used for adding tab page to MainFrame. @@ -33,5 +31,5 @@ public interface AddTabCallback { * @param id the id of your page. * @param title you are supposed to localize your texts. */ - void addTab(Page tabPage, String id, String title); + void addTab(TopTabPage tabPage, String id, String title); } diff --git a/HMCLAPI/src/main/java/org/jackhuang/hmcl/api/ui/Theme.java b/HMCLAPI/src/main/java/org/jackhuang/hmcl/api/ui/Theme.java new file mode 100644 index 000000000..60ccda3ce --- /dev/null +++ b/HMCLAPI/src/main/java/org/jackhuang/hmcl/api/ui/Theme.java @@ -0,0 +1,50 @@ +/* + * 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.hmcl.api.ui; + +import java.util.HashMap; +import java.util.Map; +import java.util.Objects; + +/** + * + * @author huang + */ +public class Theme { + + public static final Map THEMES = new HashMap<>(); + + public final String id; + public final String localizedName; + public final Map settings; + + public Theme(String id, String localizedName, Map settings) { + this.id = id; + this.localizedName = localizedName; + this.settings = Objects.requireNonNull(settings, "Theme settings map may not be null."); + } + + @Override + public String toString() { + return localizedName; + } + + public String getId() { + return id; + } +} diff --git a/HMCLAPI/src/main/java/org/jackhuang/hmcl/api/ui/TopTabPage.java b/HMCLAPI/src/main/java/org/jackhuang/hmcl/api/ui/TopTabPage.java new file mode 100644 index 000000000..f443e6034 --- /dev/null +++ b/HMCLAPI/src/main/java/org/jackhuang/hmcl/api/ui/TopTabPage.java @@ -0,0 +1,37 @@ +/* + * 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.hmcl.api.ui; + +import javax.swing.JPanel; + +/** + * + * @author huangyuhui + */ +public abstract class TopTabPage extends JPanel { + + public abstract void onCreate(); + + public abstract boolean isCreated(); + + public abstract void onSelect(); + + public abstract boolean isSelected(); + + public abstract void onLeave(); +} diff --git a/HMCLCore/build.gradle b/HMCLCore/build.gradle new file mode 100644 index 000000000..58a9208cb --- /dev/null +++ b/HMCLCore/build.gradle @@ -0,0 +1,41 @@ +/* + * 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/}. + */ + +buildscript { + repositories { + mavenCentral(); + + dependencies { + classpath 'me.tatarka:gradle-retrolambda:3.1.0' + } + } +} + +apply plugin: 'me.tatarka.retrolambda' + +if (System.getenv("BUILD_NUMBER") != null) + version = System.getenv("BUILD_NUMBER") + +dependencies { + compile project(":HMCLAPI") + compile group: "org.commonjava.googlecode.markdown4j", name: "markdown4j", version: "2.2-cj-1.0" +} + +retrolambda { + javaVersion = JavaVersion.VERSION_1_7 +} diff --git a/HMCL/src/core/java/org/jackhuang/hellominecraft/launcher/core/GameException.java b/HMCLCore/src/main/java/org/jackhuang/hmcl/core/GameException.java similarity index 95% rename from HMCL/src/core/java/org/jackhuang/hellominecraft/launcher/core/GameException.java rename to HMCLCore/src/main/java/org/jackhuang/hmcl/core/GameException.java index 9c8e44a7c..6c50f2f6d 100644 --- a/HMCL/src/core/java/org/jackhuang/hellominecraft/launcher/core/GameException.java +++ b/HMCLCore/src/main/java/org/jackhuang/hmcl/core/GameException.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; +package org.jackhuang.hmcl.core; /** * Thrown if we have some problem generating launch command. diff --git a/HMCL/src/core/java/org/jackhuang/hellominecraft/launcher/core/MCUtils.java b/HMCLCore/src/main/java/org/jackhuang/hmcl/core/MCUtils.java old mode 100755 new mode 100644 similarity index 94% rename from HMCL/src/core/java/org/jackhuang/hellominecraft/launcher/core/MCUtils.java rename to HMCLCore/src/main/java/org/jackhuang/hmcl/core/MCUtils.java index b7d940c3d..f6aa7b9d1 --- a/HMCL/src/core/java/org/jackhuang/hellominecraft/launcher/core/MCUtils.java +++ b/HMCLCore/src/main/java/org/jackhuang/hmcl/core/MCUtils.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; +package org.jackhuang.hmcl.core; import java.io.File; import java.io.IOException; -import org.jackhuang.hellominecraft.util.sys.FileUtils; -import org.jackhuang.hellominecraft.util.sys.OS; +import org.jackhuang.hmcl.util.sys.FileUtils; +import org.jackhuang.hmcl.util.sys.OS; /** * diff --git a/HMCL/src/core/java/org/jackhuang/hellominecraft/launcher/core/RuntimeGameException.java b/HMCLCore/src/main/java/org/jackhuang/hmcl/core/RuntimeGameException.java similarity index 95% rename from HMCL/src/core/java/org/jackhuang/hellominecraft/launcher/core/RuntimeGameException.java rename to HMCLCore/src/main/java/org/jackhuang/hmcl/core/RuntimeGameException.java index eccd03646..dfe33774c 100644 --- a/HMCL/src/core/java/org/jackhuang/hellominecraft/launcher/core/RuntimeGameException.java +++ b/HMCLCore/src/main/java/org/jackhuang/hmcl/core/RuntimeGameException.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; +package org.jackhuang.hmcl.core; /** * diff --git a/HMCL/src/core/java/org/jackhuang/hellominecraft/launcher/core/asset/AssetsIndex.java b/HMCLCore/src/main/java/org/jackhuang/hmcl/core/asset/AssetsIndex.java old mode 100755 new mode 100644 similarity index 96% rename from HMCL/src/core/java/org/jackhuang/hellominecraft/launcher/core/asset/AssetsIndex.java rename to HMCLCore/src/main/java/org/jackhuang/hmcl/core/asset/AssetsIndex.java index 9de6ce609..ed708cd03 --- a/HMCL/src/core/java/org/jackhuang/hellominecraft/launcher/core/asset/AssetsIndex.java +++ b/HMCLCore/src/main/java/org/jackhuang/hmcl/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.asset; +package org.jackhuang.hmcl.core.asset; import com.google.gson.annotations.SerializedName; import java.util.HashSet; diff --git a/HMCL/src/core/java/org/jackhuang/hellominecraft/launcher/core/asset/AssetsMojangLoader.java b/HMCLCore/src/main/java/org/jackhuang/hmcl/core/asset/AssetsMojangLoader.java old mode 100755 new mode 100644 similarity index 82% rename from HMCL/src/core/java/org/jackhuang/hellominecraft/launcher/core/asset/AssetsMojangLoader.java rename to HMCLCore/src/main/java/org/jackhuang/hmcl/core/asset/AssetsMojangLoader.java index 0eddb2c5b..123010ceb --- a/HMCL/src/core/java/org/jackhuang/hellominecraft/launcher/core/asset/AssetsMojangLoader.java +++ b/HMCLCore/src/main/java/org/jackhuang/hmcl/core/asset/AssetsMojangLoader.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.asset; +package org.jackhuang.hmcl.core.asset; import java.io.File; import java.util.ArrayList; @@ -24,17 +24,16 @@ import java.util.Collection; import java.util.HashSet; import java.util.Map; import java.util.Objects; -import org.jackhuang.hellominecraft.util.C; -import org.jackhuang.hellominecraft.util.log.HMCLog; -import org.jackhuang.hellominecraft.launcher.core.service.IMinecraftAssetService; -import org.jackhuang.hellominecraft.util.task.Task; -import org.jackhuang.hellominecraft.util.sys.FileUtils; -import org.jackhuang.hellominecraft.util.sys.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.util.VersionNumber; -import org.jackhuang.hellominecraft.util.task.TaskInfo; +import org.jackhuang.hmcl.util.C; +import org.jackhuang.hmcl.api.HMCLog; +import org.jackhuang.hmcl.core.service.IMinecraftAssetService; +import org.jackhuang.hmcl.util.task.Task; +import org.jackhuang.hmcl.util.sys.FileUtils; +import org.jackhuang.hmcl.util.StrUtils; +import org.jackhuang.hmcl.core.download.IDownloadProvider; +import org.jackhuang.hmcl.core.version.MinecraftVersion; +import org.jackhuang.hmcl.api.VersionNumber; +import org.jackhuang.hmcl.util.task.TaskInfo; /** * @@ -50,7 +49,6 @@ public class AssetsMojangLoader extends IAssetsHandler { public Task getList(final MinecraftVersion mv, final IMinecraftAssetService mp) { Objects.requireNonNull(mv); String assetsId = mv.getAssetsIndex().getId(); - File assets = mp.getAssets(assetsId); HMCLog.log("Gathering asset index: " + assetsId); File f = mp.getIndexFile(assetsId); return new TaskInfo("Gather asset index") { diff --git a/HMCL/src/core/java/org/jackhuang/hellominecraft/launcher/core/asset/AssetsObject.java b/HMCLCore/src/main/java/org/jackhuang/hmcl/core/asset/AssetsObject.java old mode 100755 new mode 100644 similarity index 96% rename from HMCL/src/core/java/org/jackhuang/hellominecraft/launcher/core/asset/AssetsObject.java rename to HMCLCore/src/main/java/org/jackhuang/hmcl/core/asset/AssetsObject.java index 5949ae620..8c932333b --- a/HMCL/src/core/java/org/jackhuang/hellominecraft/launcher/core/asset/AssetsObject.java +++ b/HMCLCore/src/main/java/org/jackhuang/hmcl/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.asset; +package org.jackhuang.hmcl.core.asset; /** * diff --git a/HMCL/src/core/java/org/jackhuang/hellominecraft/launcher/core/asset/IAssetsHandler.java b/HMCLCore/src/main/java/org/jackhuang/hmcl/core/asset/IAssetsHandler.java old mode 100755 new mode 100644 similarity index 85% rename from HMCL/src/core/java/org/jackhuang/hellominecraft/launcher/core/asset/IAssetsHandler.java rename to HMCLCore/src/main/java/org/jackhuang/hmcl/core/asset/IAssetsHandler.java index 9f45b40a5..4dd30917d --- a/HMCL/src/core/java/org/jackhuang/hellominecraft/launcher/core/asset/IAssetsHandler.java +++ b/HMCLCore/src/main/java/org/jackhuang/hmcl/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.asset; +package org.jackhuang.hmcl.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.util.C; -import org.jackhuang.hellominecraft.util.log.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.util.task.Task; -import org.jackhuang.hellominecraft.util.net.FileDownloadTask; -import org.jackhuang.hellominecraft.util.code.DigestUtils; -import org.jackhuang.hellominecraft.util.sys.FileUtils; -import org.jackhuang.hellominecraft.util.sys.IOUtils; -import org.jackhuang.hellominecraft.util.task.TaskInfo; +import org.jackhuang.hmcl.util.C; +import org.jackhuang.hmcl.api.HMCLog; +import org.jackhuang.hmcl.core.service.IMinecraftAssetService; +import org.jackhuang.hmcl.core.download.IDownloadProvider; +import org.jackhuang.hmcl.core.version.MinecraftVersion; +import org.jackhuang.hmcl.util.task.Task; +import org.jackhuang.hmcl.util.net.FileDownloadTask; +import org.jackhuang.hmcl.util.code.DigestUtils; +import org.jackhuang.hmcl.util.sys.FileUtils; +import org.jackhuang.hmcl.util.sys.IOUtils; +import org.jackhuang.hmcl.util.task.TaskInfo; /** * Assets diff --git a/HMCL/src/core/java/org/jackhuang/hellominecraft/launcher/core/asset/MinecraftAssetService.java b/HMCLCore/src/main/java/org/jackhuang/hmcl/core/asset/MinecraftAssetService.java old mode 100755 new mode 100644 similarity index 89% rename from HMCL/src/core/java/org/jackhuang/hellominecraft/launcher/core/asset/MinecraftAssetService.java rename to HMCLCore/src/main/java/org/jackhuang/hmcl/core/asset/MinecraftAssetService.java index 7b4138fba..4174a0e6b --- a/HMCL/src/core/java/org/jackhuang/hellominecraft/launcher/core/asset/MinecraftAssetService.java +++ b/HMCLCore/src/main/java/org/jackhuang/hmcl/core/asset/MinecraftAssetService.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.asset; +package org.jackhuang.hmcl.core.asset; import com.google.gson.JsonSyntaxException; import java.io.File; @@ -23,21 +23,21 @@ import java.io.IOException; import java.util.Arrays; import java.util.Collection; import java.util.Map; -import org.jackhuang.hellominecraft.launcher.core.GameException; -import org.jackhuang.hellominecraft.launcher.core.launch.IAssetProvider; -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.AssetIndexDownloadInfo; -import org.jackhuang.hellominecraft.launcher.core.version.MinecraftVersion; -import org.jackhuang.hellominecraft.util.MessageBox; -import org.jackhuang.hellominecraft.util.log.HMCLog; -import org.jackhuang.hellominecraft.util.task.Task; -import org.jackhuang.hellominecraft.util.task.TaskWindow; -import org.jackhuang.hellominecraft.util.net.FileDownloadTask; -import org.jackhuang.hellominecraft.util.sys.FileUtils; -import org.jackhuang.hellominecraft.util.sys.IOUtils; -import org.jackhuang.hellominecraft.util.task.TaskInfo; +import org.jackhuang.hmcl.core.GameException; +import org.jackhuang.hmcl.core.launch.IAssetProvider; +import org.jackhuang.hmcl.util.C; +import org.jackhuang.hmcl.core.service.IMinecraftAssetService; +import org.jackhuang.hmcl.core.service.IMinecraftService; +import org.jackhuang.hmcl.core.version.AssetIndexDownloadInfo; +import org.jackhuang.hmcl.core.version.MinecraftVersion; +import org.jackhuang.hmcl.util.MessageBox; +import org.jackhuang.hmcl.api.HMCLog; +import org.jackhuang.hmcl.util.task.Task; +import org.jackhuang.hmcl.util.task.TaskWindow; +import org.jackhuang.hmcl.util.net.FileDownloadTask; +import org.jackhuang.hmcl.util.sys.FileUtils; +import org.jackhuang.hmcl.util.sys.IOUtils; +import org.jackhuang.hmcl.util.task.TaskInfo; /** * diff --git a/HMCL/src/core/java/org/jackhuang/hellominecraft/launcher/core/auth/IAuthenticator.java b/HMCLCore/src/main/java/org/jackhuang/hmcl/core/auth/AbstractAuthenticator.java old mode 100755 new mode 100644 similarity index 73% rename from HMCL/src/core/java/org/jackhuang/hellominecraft/launcher/core/auth/IAuthenticator.java rename to HMCLCore/src/main/java/org/jackhuang/hmcl/core/auth/AbstractAuthenticator.java index 0845fb71d..f3ebb6527 --- a/HMCL/src/core/java/org/jackhuang/hellominecraft/launcher/core/auth/IAuthenticator.java +++ b/HMCLCore/src/main/java/org/jackhuang/hmcl/core/auth/AbstractAuthenticator.java @@ -15,20 +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.launcher.core.auth; +package org.jackhuang.hmcl.core.auth; +import org.jackhuang.hmcl.api.auth.IAuthenticator; import java.util.ArrayList; import java.util.HashMap; import java.util.List; import java.util.Map; -import org.jackhuang.hellominecraft.launcher.api.PluginManager; +import org.jackhuang.hmcl.api.PluginManager; /** * Login interface * * @author huangyuhui */ -public abstract class IAuthenticator { +public abstract class AbstractAuthenticator implements IAuthenticator { public static final List LOGINS = new ArrayList<>(); @@ -38,7 +39,7 @@ public abstract class IAuthenticator { protected String clientToken, username, password; - public IAuthenticator(String clientToken) { + public AbstractAuthenticator(String clientToken) { this.clientToken = clientToken; } @@ -46,53 +47,35 @@ public abstract class IAuthenticator { return clientToken; } - /** - * Login Method - * - * @param info username & password - * - * @return login result - * - * @throws - * org.jackhuang.hellominecraft.launcher.core.auth.AuthenticationException - */ - public abstract UserProfileProvider login(LoginInfo info) throws AuthenticationException; - - public abstract String id(); - - /** - * - * @return the name of login method. - */ - public abstract String getName(); /** * Has password? * * @return has password? */ + @Override public boolean hasPassword() { return true; } + @Override public boolean isLoggedIn() { return false; } + @Override public void setRememberMe(boolean is) { } - public abstract UserProfileProvider loginBySettings() throws AuthenticationException; - - public abstract void logOut(); - + @Override public Map onSaveSettings() { HashMap m = new HashMap<>(); m.put("IAuthenticator_UserName", username); return m; } + @Override public void onLoadSettings(Map m) { if (m == null) return; @@ -100,18 +83,22 @@ public abstract class IAuthenticator { username = o instanceof String ? (String) o : ""; } + @Override public String getUserName() { return username; } + @Override public void setUserName(String s) { username = s; } + @Override public String getPassword() { return password; } + @Override public void setPassword(String password) { this.password = password; } diff --git a/HMCL/src/core/java/org/jackhuang/hellominecraft/launcher/core/auth/OfflineAuthenticator.java b/HMCLCore/src/main/java/org/jackhuang/hmcl/core/auth/OfflineAuthenticator.java old mode 100755 new mode 100644 similarity index 87% rename from HMCL/src/core/java/org/jackhuang/hellominecraft/launcher/core/auth/OfflineAuthenticator.java rename to HMCLCore/src/main/java/org/jackhuang/hmcl/core/auth/OfflineAuthenticator.java index 7997d6a07..9cfb550b1 --- a/HMCL/src/core/java/org/jackhuang/hellominecraft/launcher/core/auth/OfflineAuthenticator.java +++ b/HMCLCore/src/main/java/org/jackhuang/hmcl/core/auth/OfflineAuthenticator.java @@ -15,19 +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.auth; +package org.jackhuang.hmcl.core.auth; +import org.jackhuang.hmcl.api.auth.UserProfileProvider; +import org.jackhuang.hmcl.api.auth.LoginInfo; +import org.jackhuang.hmcl.api.auth.AuthenticationException; import java.util.HashMap; import java.util.Map; -import org.jackhuang.hellominecraft.util.C; -import org.jackhuang.hellominecraft.util.StrUtils; -import org.jackhuang.hellominecraft.util.code.DigestUtils; +import org.jackhuang.hmcl.util.C; +import org.jackhuang.hmcl.util.StrUtils; +import org.jackhuang.hmcl.util.code.DigestUtils; /** * * @author huangyuhui */ -public final class OfflineAuthenticator extends IAuthenticator { +public final class OfflineAuthenticator extends AbstractAuthenticator { Map uuidMap = new HashMap<>(); diff --git a/HMCL/src/core/java/org/jackhuang/hellominecraft/launcher/core/auth/YggdrasilAuthenticator.java b/HMCLCore/src/main/java/org/jackhuang/hmcl/core/auth/YggdrasilAuthenticator.java old mode 100755 new mode 100644 similarity index 89% rename from HMCL/src/core/java/org/jackhuang/hellominecraft/launcher/core/auth/YggdrasilAuthenticator.java rename to HMCLCore/src/main/java/org/jackhuang/hmcl/core/auth/YggdrasilAuthenticator.java index 5a945be88..720c29692 --- a/HMCL/src/core/java/org/jackhuang/hellominecraft/launcher/core/auth/YggdrasilAuthenticator.java +++ b/HMCLCore/src/main/java/org/jackhuang/hmcl/core/auth/YggdrasilAuthenticator.java @@ -15,25 +15,28 @@ * 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.auth; +package org.jackhuang.hmcl.core.auth; +import org.jackhuang.hmcl.api.auth.UserProfileProvider; +import org.jackhuang.hmcl.api.auth.LoginInfo; +import org.jackhuang.hmcl.api.auth.AuthenticationException; import com.google.gson.GsonBuilder; import java.net.Proxy; import java.util.Map; import javax.swing.JOptionPane; -import org.jackhuang.hellominecraft.util.C; -import org.jackhuang.hellominecraft.util.ArrayUtils; -import org.jackhuang.hellominecraft.launcher.core.auth.yggdrasil.GameProfile; -import org.jackhuang.hellominecraft.launcher.core.auth.yggdrasil.UUIDTypeAdapter; -import org.jackhuang.hellominecraft.launcher.core.auth.yggdrasil.PropertyMap; -import org.jackhuang.hellominecraft.launcher.core.auth.yggdrasil.YggdrasilAuthentication; -import org.jackhuang.hellominecraft.util.ui.SwingUtils; +import org.jackhuang.hmcl.util.C; +import org.jackhuang.hmcl.util.ArrayUtils; +import org.jackhuang.hmcl.core.auth.yggdrasil.GameProfile; +import org.jackhuang.hmcl.core.auth.yggdrasil.UUIDTypeAdapter; +import org.jackhuang.hmcl.core.auth.yggdrasil.PropertyMap; +import org.jackhuang.hmcl.core.auth.yggdrasil.YggdrasilAuthentication; +import org.jackhuang.hmcl.util.ui.SwingUtils; /** * * @author huangyuhui */ -public final class YggdrasilAuthenticator extends IAuthenticator { +public final class YggdrasilAuthenticator extends AbstractAuthenticator { YggdrasilAuthentication ua; diff --git a/HMCL/src/core/java/org/jackhuang/hellominecraft/launcher/core/auth/yggdrasil/AuthenticationRequest.java b/HMCLCore/src/main/java/org/jackhuang/hmcl/core/auth/yggdrasil/AuthenticationRequest.java old mode 100755 new mode 100644 similarity index 96% rename from HMCL/src/core/java/org/jackhuang/hellominecraft/launcher/core/auth/yggdrasil/AuthenticationRequest.java rename to HMCLCore/src/main/java/org/jackhuang/hmcl/core/auth/yggdrasil/AuthenticationRequest.java index d664a0bf6..878ee5ddc --- a/HMCL/src/core/java/org/jackhuang/hellominecraft/launcher/core/auth/yggdrasil/AuthenticationRequest.java +++ b/HMCLCore/src/main/java/org/jackhuang/hmcl/core/auth/yggdrasil/AuthenticationRequest.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.auth.yggdrasil; +package org.jackhuang.hmcl.core.auth.yggdrasil; import java.util.HashMap; diff --git a/HMCL/src/core/java/org/jackhuang/hellominecraft/launcher/core/auth/yggdrasil/GameProfile.java b/HMCLCore/src/main/java/org/jackhuang/hmcl/core/auth/yggdrasil/GameProfile.java old mode 100755 new mode 100644 similarity index 96% rename from HMCL/src/core/java/org/jackhuang/hellominecraft/launcher/core/auth/yggdrasil/GameProfile.java rename to HMCLCore/src/main/java/org/jackhuang/hmcl/core/auth/yggdrasil/GameProfile.java index 6be6f1685..665a5a0c5 --- a/HMCL/src/core/java/org/jackhuang/hellominecraft/launcher/core/auth/yggdrasil/GameProfile.java +++ b/HMCLCore/src/main/java/org/jackhuang/hmcl/core/auth/yggdrasil/GameProfile.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.auth.yggdrasil; +package org.jackhuang.hmcl.core.auth.yggdrasil; import com.google.gson.JsonDeserializationContext; import com.google.gson.JsonDeserializer; @@ -27,7 +27,7 @@ import com.google.gson.JsonSerializer; import java.lang.reflect.Type; import java.util.Objects; import java.util.UUID; -import org.jackhuang.hellominecraft.util.StrUtils; +import org.jackhuang.hmcl.util.StrUtils; public class GameProfile { diff --git a/HMCL/src/core/java/org/jackhuang/hellominecraft/launcher/core/auth/yggdrasil/Property.java b/HMCLCore/src/main/java/org/jackhuang/hmcl/core/auth/yggdrasil/Property.java old mode 100755 new mode 100644 similarity index 93% rename from HMCL/src/core/java/org/jackhuang/hellominecraft/launcher/core/auth/yggdrasil/Property.java rename to HMCLCore/src/main/java/org/jackhuang/hmcl/core/auth/yggdrasil/Property.java index e9b014032..a6cbe26ab --- a/HMCL/src/core/java/org/jackhuang/hellominecraft/launcher/core/auth/yggdrasil/Property.java +++ b/HMCLCore/src/main/java/org/jackhuang/hmcl/core/auth/yggdrasil/Property.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.auth.yggdrasil; +package org.jackhuang.hmcl.core.auth.yggdrasil; public class Property { diff --git a/HMCL/src/core/java/org/jackhuang/hellominecraft/launcher/core/auth/yggdrasil/PropertyMap.java b/HMCLCore/src/main/java/org/jackhuang/hmcl/core/auth/yggdrasil/PropertyMap.java old mode 100755 new mode 100644 similarity index 97% rename from HMCL/src/core/java/org/jackhuang/hellominecraft/launcher/core/auth/yggdrasil/PropertyMap.java rename to HMCLCore/src/main/java/org/jackhuang/hmcl/core/auth/yggdrasil/PropertyMap.java index b687d5820..22f21fe9b --- a/HMCL/src/core/java/org/jackhuang/hellominecraft/launcher/core/auth/yggdrasil/PropertyMap.java +++ b/HMCLCore/src/main/java/org/jackhuang/hmcl/core/auth/yggdrasil/PropertyMap.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.auth.yggdrasil; +package org.jackhuang.hmcl.core.auth.yggdrasil; import com.google.gson.JsonArray; import com.google.gson.JsonDeserializationContext; @@ -31,7 +31,7 @@ import java.util.ArrayList; import java.util.HashMap; import java.util.List; import java.util.Map; -import org.jackhuang.hellominecraft.util.log.HMCLog; +import org.jackhuang.hmcl.api.HMCLog; public class PropertyMap extends HashMap { diff --git a/HMCL/src/core/java/org/jackhuang/hellominecraft/launcher/core/auth/yggdrasil/RefreshRequest.java b/HMCLCore/src/main/java/org/jackhuang/hmcl/core/auth/yggdrasil/RefreshRequest.java old mode 100755 new mode 100644 similarity index 96% rename from HMCL/src/core/java/org/jackhuang/hellominecraft/launcher/core/auth/yggdrasil/RefreshRequest.java rename to HMCLCore/src/main/java/org/jackhuang/hmcl/core/auth/yggdrasil/RefreshRequest.java index 36a03fbb9..ef0873f82 --- a/HMCL/src/core/java/org/jackhuang/hellominecraft/launcher/core/auth/yggdrasil/RefreshRequest.java +++ b/HMCLCore/src/main/java/org/jackhuang/hmcl/core/auth/yggdrasil/RefreshRequest.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.auth.yggdrasil; +package org.jackhuang.hmcl.core.auth.yggdrasil; public class RefreshRequest { diff --git a/HMCL/src/core/java/org/jackhuang/hellominecraft/launcher/core/auth/yggdrasil/Response.java b/HMCLCore/src/main/java/org/jackhuang/hmcl/core/auth/yggdrasil/Response.java old mode 100755 new mode 100644 similarity index 95% rename from HMCL/src/core/java/org/jackhuang/hellominecraft/launcher/core/auth/yggdrasil/Response.java rename to HMCLCore/src/main/java/org/jackhuang/hmcl/core/auth/yggdrasil/Response.java index fdacf1f93..7a0921a5b --- a/HMCL/src/core/java/org/jackhuang/hellominecraft/launcher/core/auth/yggdrasil/Response.java +++ b/HMCLCore/src/main/java/org/jackhuang/hmcl/core/auth/yggdrasil/Response.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.auth.yggdrasil; +package org.jackhuang.hmcl.core.auth.yggdrasil; import com.google.gson.annotations.SerializedName; diff --git a/HMCL/src/core/java/org/jackhuang/hellominecraft/launcher/core/auth/yggdrasil/UUIDTypeAdapter.java b/HMCLCore/src/main/java/org/jackhuang/hmcl/core/auth/yggdrasil/UUIDTypeAdapter.java old mode 100755 new mode 100644 similarity index 95% rename from HMCL/src/core/java/org/jackhuang/hellominecraft/launcher/core/auth/yggdrasil/UUIDTypeAdapter.java rename to HMCLCore/src/main/java/org/jackhuang/hmcl/core/auth/yggdrasil/UUIDTypeAdapter.java index f93d46fd3..1cfe77a67 --- a/HMCL/src/core/java/org/jackhuang/hellominecraft/launcher/core/auth/yggdrasil/UUIDTypeAdapter.java +++ b/HMCLCore/src/main/java/org/jackhuang/hmcl/core/auth/yggdrasil/UUIDTypeAdapter.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.auth.yggdrasil; +package org.jackhuang.hmcl.core.auth.yggdrasil; import com.google.gson.TypeAdapter; import com.google.gson.stream.JsonReader; diff --git a/HMCL/src/core/java/org/jackhuang/hellominecraft/launcher/core/auth/yggdrasil/User.java b/HMCLCore/src/main/java/org/jackhuang/hmcl/core/auth/yggdrasil/User.java old mode 100755 new mode 100644 similarity index 94% rename from HMCL/src/core/java/org/jackhuang/hellominecraft/launcher/core/auth/yggdrasil/User.java rename to HMCLCore/src/main/java/org/jackhuang/hmcl/core/auth/yggdrasil/User.java index 48f0e2d4f..756a32987 --- a/HMCL/src/core/java/org/jackhuang/hellominecraft/launcher/core/auth/yggdrasil/User.java +++ b/HMCLCore/src/main/java/org/jackhuang/hmcl/core/auth/yggdrasil/User.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.auth.yggdrasil; +package org.jackhuang.hmcl.core.auth.yggdrasil; public class User { diff --git a/HMCL/src/core/java/org/jackhuang/hellominecraft/launcher/core/auth/yggdrasil/UserType.java b/HMCLCore/src/main/java/org/jackhuang/hmcl/core/auth/yggdrasil/UserType.java similarity index 95% rename from HMCL/src/core/java/org/jackhuang/hellominecraft/launcher/core/auth/yggdrasil/UserType.java rename to HMCLCore/src/main/java/org/jackhuang/hmcl/core/auth/yggdrasil/UserType.java index ef54c8d35..05294a039 100644 --- a/HMCL/src/core/java/org/jackhuang/hellominecraft/launcher/core/auth/yggdrasil/UserType.java +++ b/HMCLCore/src/main/java/org/jackhuang/hmcl/core/auth/yggdrasil/UserType.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.auth.yggdrasil; +package org.jackhuang.hmcl.core.auth.yggdrasil; import java.util.HashMap; import java.util.Map; diff --git a/HMCL/src/core/java/org/jackhuang/hellominecraft/launcher/core/auth/yggdrasil/ValidateRequest.java b/HMCLCore/src/main/java/org/jackhuang/hmcl/core/auth/yggdrasil/ValidateRequest.java similarity index 94% rename from HMCL/src/core/java/org/jackhuang/hellominecraft/launcher/core/auth/yggdrasil/ValidateRequest.java rename to HMCLCore/src/main/java/org/jackhuang/hmcl/core/auth/yggdrasil/ValidateRequest.java index 4fcb1c467..a89571b80 100644 --- a/HMCL/src/core/java/org/jackhuang/hellominecraft/launcher/core/auth/yggdrasil/ValidateRequest.java +++ b/HMCLCore/src/main/java/org/jackhuang/hmcl/core/auth/yggdrasil/ValidateRequest.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.auth.yggdrasil; +package org.jackhuang.hmcl.core.auth.yggdrasil; /** * diff --git a/HMCL/src/core/java/org/jackhuang/hellominecraft/launcher/core/auth/yggdrasil/YggdrasilAuthentication.java b/HMCLCore/src/main/java/org/jackhuang/hmcl/core/auth/yggdrasil/YggdrasilAuthentication.java old mode 100755 new mode 100644 similarity index 96% rename from HMCL/src/core/java/org/jackhuang/hellominecraft/launcher/core/auth/yggdrasil/YggdrasilAuthentication.java rename to HMCLCore/src/main/java/org/jackhuang/hmcl/core/auth/yggdrasil/YggdrasilAuthentication.java index 1129f43c9..3fed07c82 --- a/HMCL/src/core/java/org/jackhuang/hellominecraft/launcher/core/auth/yggdrasil/YggdrasilAuthentication.java +++ b/HMCLCore/src/main/java/org/jackhuang/hmcl/core/auth/yggdrasil/YggdrasilAuthentication.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.core.auth.yggdrasil; +package org.jackhuang.hmcl.core.auth.yggdrasil; -import org.jackhuang.hellominecraft.launcher.core.auth.AuthenticationException; +import org.jackhuang.hmcl.api.auth.AuthenticationException; import com.google.gson.Gson; import com.google.gson.GsonBuilder; import com.google.gson.JsonParseException; @@ -28,11 +28,11 @@ import java.util.HashMap; import java.util.List; import java.util.Map; import java.util.UUID; -import org.jackhuang.hellominecraft.util.ArrayUtils; -import org.jackhuang.hellominecraft.util.C; -import org.jackhuang.hellominecraft.util.log.HMCLog; -import org.jackhuang.hellominecraft.util.net.NetUtils; -import org.jackhuang.hellominecraft.util.StrUtils; +import org.jackhuang.hmcl.util.ArrayUtils; +import org.jackhuang.hmcl.util.C; +import org.jackhuang.hmcl.api.HMCLog; +import org.jackhuang.hmcl.util.net.NetUtils; +import org.jackhuang.hmcl.util.StrUtils; public class YggdrasilAuthentication { diff --git a/HMCL/src/core/java/org/jackhuang/hellominecraft/launcher/core/download/BMCLAPIDownloadProvider.java b/HMCLCore/src/main/java/org/jackhuang/hmcl/core/download/BMCLAPIDownloadProvider.java old mode 100755 new mode 100644 similarity index 82% rename from HMCL/src/core/java/org/jackhuang/hellominecraft/launcher/core/download/BMCLAPIDownloadProvider.java rename to HMCLCore/src/main/java/org/jackhuang/hmcl/core/download/BMCLAPIDownloadProvider.java index 94e11757d..7a773fc6c --- a/HMCL/src/core/java/org/jackhuang/hellominecraft/launcher/core/download/BMCLAPIDownloadProvider.java +++ b/HMCLCore/src/main/java/org/jackhuang/hmcl/core/download/BMCLAPIDownloadProvider.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.download; +package org.jackhuang.hmcl.core.download; -import org.jackhuang.hellominecraft.launcher.core.install.InstallerVersionList; -import org.jackhuang.hellominecraft.util.C; +import org.jackhuang.hmcl.core.install.InstallerVersionList; +import org.jackhuang.hmcl.util.C; /** * @@ -28,17 +28,17 @@ public class BMCLAPIDownloadProvider extends IDownloadProvider { @Override public InstallerVersionList getForgeInstaller() { - return org.jackhuang.hellominecraft.launcher.core.install.forge.MinecraftForgeVersionList.getInstance(); + return org.jackhuang.hmcl.core.install.forge.MinecraftForgeVersionList.getInstance(); } @Override public InstallerVersionList getLiteLoaderInstaller() { - return org.jackhuang.hellominecraft.launcher.core.install.liteloader.LiteLoaderVersionList.getInstance(); + return org.jackhuang.hmcl.core.install.liteloader.LiteLoaderVersionList.getInstance(); } @Override public InstallerVersionList getOptiFineInstaller() { - return org.jackhuang.hellominecraft.launcher.core.install.optifine.bmcl.OptiFineBMCLVersionList.getInstance(); + return org.jackhuang.hmcl.core.install.optifine.bmcl.OptiFineBMCLVersionList.getInstance(); } @Override diff --git a/HMCL/src/core/java/org/jackhuang/hellominecraft/launcher/core/download/CurseDownloadProvider.java b/HMCLCore/src/main/java/org/jackhuang/hmcl/core/download/CurseDownloadProvider.java similarity index 94% rename from HMCL/src/core/java/org/jackhuang/hellominecraft/launcher/core/download/CurseDownloadProvider.java rename to HMCLCore/src/main/java/org/jackhuang/hmcl/core/download/CurseDownloadProvider.java index 2cf81138d..345dd22fa 100644 --- a/HMCL/src/core/java/org/jackhuang/hellominecraft/launcher/core/download/CurseDownloadProvider.java +++ b/HMCLCore/src/main/java/org/jackhuang/hmcl/core/download/CurseDownloadProvider.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.download; +package org.jackhuang.hmcl.core.download; /** * diff --git a/HMCL/src/core/java/org/jackhuang/hellominecraft/launcher/core/download/DownloadType.java b/HMCLCore/src/main/java/org/jackhuang/hmcl/core/download/DownloadType.java old mode 100755 new mode 100644 similarity index 70% rename from HMCL/src/core/java/org/jackhuang/hellominecraft/launcher/core/download/DownloadType.java rename to HMCLCore/src/main/java/org/jackhuang/hmcl/core/download/DownloadType.java index a3e962879..1f96a13d0 --- a/HMCL/src/core/java/org/jackhuang/hellominecraft/launcher/core/download/DownloadType.java +++ b/HMCLCore/src/main/java/org/jackhuang/hmcl/core/download/DownloadType.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.download; +package org.jackhuang.hmcl.core.download; -import org.jackhuang.hellominecraft.api.HMCAPI; -import org.jackhuang.hellominecraft.launcher.api.event.config.DownloadTypeChangedEvent; -import org.jackhuang.hellominecraft.util.C; -import org.jackhuang.hellominecraft.util.task.TaskWindow; +import org.jackhuang.hmcl.api.HMCLApi; +import org.jackhuang.hmcl.api.event.config.DownloadTypeChangedEvent; +import org.jackhuang.hmcl.util.C; +import org.jackhuang.hmcl.util.task.TaskWindow; /** * @@ -54,14 +54,15 @@ public enum DownloadType { return suggestedDownloadType; } - public static void setSuggestedDownloadType(DownloadType suggestedDownloadType) { - if (suggestedDownloadType == null) + public static void setSuggestedDownloadType(String id) { + DownloadType s = DownloadType.valueOf(id); + if (s == null) throw new IllegalArgumentException("download type should not be null."); - TaskWindow.downloadSource = suggestedDownloadType.getName(); - DownloadType.suggestedDownloadType = suggestedDownloadType; + TaskWindow.downloadSource = s.getName(); + DownloadType.suggestedDownloadType = s; } static { - HMCAPI.EVENT_BUS.channel(DownloadTypeChangedEvent.class).register(t -> setSuggestedDownloadType(t.getValue())); + HMCLApi.EVENT_BUS.channel(DownloadTypeChangedEvent.class).register(t -> setSuggestedDownloadType(t.getValue())); } } diff --git a/HMCL/src/core/java/org/jackhuang/hellominecraft/launcher/core/download/IDownloadProvider.java b/HMCLCore/src/main/java/org/jackhuang/hmcl/core/download/IDownloadProvider.java old mode 100755 new mode 100644 similarity index 90% rename from HMCL/src/core/java/org/jackhuang/hellominecraft/launcher/core/download/IDownloadProvider.java rename to HMCLCore/src/main/java/org/jackhuang/hmcl/core/download/IDownloadProvider.java index b6142969d..47c3b7532 --- a/HMCL/src/core/java/org/jackhuang/hellominecraft/launcher/core/download/IDownloadProvider.java +++ b/HMCLCore/src/main/java/org/jackhuang/hmcl/core/download/IDownloadProvider.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.download; +package org.jackhuang.hmcl.core.download; -import org.jackhuang.hellominecraft.launcher.core.install.InstallerType; -import org.jackhuang.hellominecraft.launcher.core.install.InstallerVersionList; +import org.jackhuang.hmcl.core.install.InstallerType; +import org.jackhuang.hmcl.core.install.InstallerVersionList; /** * diff --git a/HMCL/src/core/java/org/jackhuang/hellominecraft/launcher/core/download/MinecraftDownloadService.java b/HMCLCore/src/main/java/org/jackhuang/hmcl/core/download/MinecraftDownloadService.java old mode 100755 new mode 100644 similarity index 83% rename from HMCL/src/core/java/org/jackhuang/hellominecraft/launcher/core/download/MinecraftDownloadService.java rename to HMCLCore/src/main/java/org/jackhuang/hmcl/core/download/MinecraftDownloadService.java index f06206cda..5902dcbd6 --- a/HMCL/src/core/java/org/jackhuang/hellominecraft/launcher/core/download/MinecraftDownloadService.java +++ b/HMCLCore/src/main/java/org/jackhuang/hmcl/core/download/MinecraftDownloadService.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.download; +package org.jackhuang.hmcl.core.download; -import org.jackhuang.hellominecraft.launcher.api.event.launch.DownloadLibraryJob; -import org.jackhuang.hellominecraft.launcher.core.service.IMinecraftDownloadService; +import org.jackhuang.hmcl.api.event.launch.DownloadLibraryJob; +import org.jackhuang.hmcl.core.service.IMinecraftDownloadService; import com.google.gson.JsonSyntaxException; import java.io.File; import java.util.ArrayList; @@ -26,18 +26,18 @@ import java.util.Arrays; import java.util.Collection; import java.util.HashSet; import java.util.List; -import org.jackhuang.hellominecraft.util.C; -import org.jackhuang.hellominecraft.util.log.HMCLog; -import org.jackhuang.hellominecraft.launcher.core.GameException; -import org.jackhuang.hellominecraft.launcher.core.service.IMinecraftService; -import org.jackhuang.hellominecraft.launcher.core.version.GameDownloadInfo; -import org.jackhuang.hellominecraft.launcher.core.version.IMinecraftLibrary; -import org.jackhuang.hellominecraft.launcher.core.version.MinecraftVersion; -import org.jackhuang.hellominecraft.util.net.FileDownloadTask; -import org.jackhuang.hellominecraft.util.func.Function; -import org.jackhuang.hellominecraft.util.sys.FileUtils; -import org.jackhuang.hellominecraft.util.task.Task; -import org.jackhuang.hellominecraft.util.task.TaskInfo; +import org.jackhuang.hmcl.util.C; +import org.jackhuang.hmcl.api.HMCLog; +import org.jackhuang.hmcl.core.GameException; +import org.jackhuang.hmcl.core.service.IMinecraftService; +import org.jackhuang.hmcl.core.version.GameDownloadInfo; +import org.jackhuang.hmcl.api.game.IMinecraftLibrary; +import org.jackhuang.hmcl.core.version.MinecraftVersion; +import org.jackhuang.hmcl.util.net.FileDownloadTask; +import org.jackhuang.hmcl.api.func.Function; +import org.jackhuang.hmcl.util.sys.FileUtils; +import org.jackhuang.hmcl.util.task.Task; +import org.jackhuang.hmcl.util.task.TaskInfo; /** * @@ -56,10 +56,10 @@ public class MinecraftDownloadService extends IMinecraftDownloadService { return downloadLibraries; MinecraftVersion v = mv.resolve(service.version()); for (IMinecraftLibrary l : v.getLibraries()) - if (l != null && l.allow() && l.getDownloadInfo() != null) { + if (l != null && l.allow() && l.getDownloadURL(service.getDownloadType().name()) != null) { File ff = l.getFilePath(service.baseDirectory()); if (!ff.exists()) { - String libURL = l.getDownloadInfo().getUrl(service.getDownloadType()); + String libURL = l.getDownloadURL(service.getDownloadType().name()); if (libURL != null) downloadLibraries.add(new DownloadLibraryJob(l, libURL, ff)); } diff --git a/HMCSM/src/main/java/org/jackhuang/hellominecraft/svrmgr/util/version/MinecraftRemoteLatestVersion.java b/HMCLCore/src/main/java/org/jackhuang/hmcl/core/download/MinecraftRemoteLatestVersion.java old mode 100755 new mode 100644 similarity index 94% rename from HMCSM/src/main/java/org/jackhuang/hellominecraft/svrmgr/util/version/MinecraftRemoteLatestVersion.java rename to HMCLCore/src/main/java/org/jackhuang/hmcl/core/download/MinecraftRemoteLatestVersion.java index 04e6e890f..ebf073c4a --- a/HMCSM/src/main/java/org/jackhuang/hellominecraft/svrmgr/util/version/MinecraftRemoteLatestVersion.java +++ b/HMCLCore/src/main/java/org/jackhuang/hmcl/core/download/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.svrmgr.util.version; +package org.jackhuang.hmcl.core.download; import com.google.gson.annotations.SerializedName; @@ -27,6 +27,7 @@ public class MinecraftRemoteLatestVersion { @SerializedName("snapshot") public String snapshot; + @SerializedName("release") public String release; diff --git a/HMCL/src/core/java/org/jackhuang/hellominecraft/launcher/core/download/MinecraftRemoteVersion.java b/HMCLCore/src/main/java/org/jackhuang/hmcl/core/download/MinecraftRemoteVersion.java similarity index 95% rename from HMCL/src/core/java/org/jackhuang/hellominecraft/launcher/core/download/MinecraftRemoteVersion.java rename to HMCLCore/src/main/java/org/jackhuang/hmcl/core/download/MinecraftRemoteVersion.java index 64d787c8b..97fbbf151 100644 --- a/HMCL/src/core/java/org/jackhuang/hellominecraft/launcher/core/download/MinecraftRemoteVersion.java +++ b/HMCLCore/src/main/java/org/jackhuang/hmcl/core/download/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.launcher.core.download; +package org.jackhuang.hmcl.core.download; import com.google.gson.annotations.SerializedName; diff --git a/HMCL/src/core/java/org/jackhuang/hellominecraft/launcher/core/download/MinecraftRemoteVersions.java b/HMCLCore/src/main/java/org/jackhuang/hmcl/core/download/MinecraftRemoteVersions.java similarity index 91% rename from HMCL/src/core/java/org/jackhuang/hellominecraft/launcher/core/download/MinecraftRemoteVersions.java rename to HMCLCore/src/main/java/org/jackhuang/hmcl/core/download/MinecraftRemoteVersions.java index 7b408a01f..3cb999830 100644 --- a/HMCL/src/core/java/org/jackhuang/hellominecraft/launcher/core/download/MinecraftRemoteVersions.java +++ b/HMCLCore/src/main/java/org/jackhuang/hmcl/core/download/MinecraftRemoteVersions.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.launcher.core.download; +package org.jackhuang.hmcl.core.download; import com.google.gson.annotations.SerializedName; import java.util.ArrayList; -import org.jackhuang.hellominecraft.util.C; -import org.jackhuang.hellominecraft.util.net.NetUtils; -import org.jackhuang.hellominecraft.util.AbstractSwingWorker; +import org.jackhuang.hmcl.util.C; +import org.jackhuang.hmcl.util.net.NetUtils; +import org.jackhuang.hmcl.util.AbstractSwingWorker; /** * diff --git a/HMCL/src/core/java/org/jackhuang/hellominecraft/launcher/core/download/MojangDownloadProvider.java b/HMCLCore/src/main/java/org/jackhuang/hmcl/core/download/MojangDownloadProvider.java old mode 100755 new mode 100644 similarity index 82% rename from HMCL/src/core/java/org/jackhuang/hellominecraft/launcher/core/download/MojangDownloadProvider.java rename to HMCLCore/src/main/java/org/jackhuang/hmcl/core/download/MojangDownloadProvider.java index e63e75930..b1f4ce612 --- a/HMCL/src/core/java/org/jackhuang/hellominecraft/launcher/core/download/MojangDownloadProvider.java +++ b/HMCLCore/src/main/java/org/jackhuang/hmcl/core/download/MojangDownloadProvider.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.download; +package org.jackhuang.hmcl.core.download; import java.util.Locale; -import org.jackhuang.hellominecraft.launcher.core.install.InstallerVersionList; -import org.jackhuang.hellominecraft.util.lang.SupportedLocales; +import org.jackhuang.hmcl.core.install.InstallerVersionList; +import org.jackhuang.hmcl.util.lang.SupportedLocales; /** * @@ -29,17 +29,17 @@ public class MojangDownloadProvider extends IDownloadProvider { @Override public InstallerVersionList getForgeInstaller() { - return org.jackhuang.hellominecraft.launcher.core.install.forge.MinecraftForgeVersionList.getInstance(); + return org.jackhuang.hmcl.core.install.forge.MinecraftForgeVersionList.getInstance(); } @Override public InstallerVersionList getLiteLoaderInstaller() { - return org.jackhuang.hellominecraft.launcher.core.install.liteloader.LiteLoaderVersionList.getInstance(); + return org.jackhuang.hmcl.core.install.liteloader.LiteLoaderVersionList.getInstance(); } @Override public InstallerVersionList getOptiFineInstaller() { - return org.jackhuang.hellominecraft.launcher.core.install.optifine.vanilla.OptiFineVersionList.getInstance(); + return org.jackhuang.hmcl.core.install.optifine.vanilla.OptiFineVersionList.getInstance(); } @Override diff --git a/HMCL/src/core/java/org/jackhuang/hellominecraft/launcher/core/install/InstallProfile.java b/HMCLCore/src/main/java/org/jackhuang/hmcl/core/install/InstallProfile.java old mode 100755 new mode 100644 similarity index 82% rename from HMCL/src/core/java/org/jackhuang/hellominecraft/launcher/core/install/InstallProfile.java rename to HMCLCore/src/main/java/org/jackhuang/hmcl/core/install/InstallProfile.java index eace40039..85cad09ef --- a/HMCL/src/core/java/org/jackhuang/hellominecraft/launcher/core/install/InstallProfile.java +++ b/HMCLCore/src/main/java/org/jackhuang/hmcl/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.install; +package org.jackhuang.hmcl.core.install; import com.google.gson.annotations.SerializedName; -import org.jackhuang.hellominecraft.launcher.core.version.MinecraftVersion; -import org.jackhuang.hellominecraft.launcher.core.install.forge.Install; +import org.jackhuang.hmcl.core.version.MinecraftVersion; +import org.jackhuang.hmcl.core.install.forge.Install; /** * diff --git a/HMCL/src/core/java/org/jackhuang/hellominecraft/launcher/core/install/InstallerType.java b/HMCLCore/src/main/java/org/jackhuang/hmcl/core/install/InstallerType.java old mode 100755 new mode 100644 similarity index 94% rename from HMCL/src/core/java/org/jackhuang/hellominecraft/launcher/core/install/InstallerType.java rename to HMCLCore/src/main/java/org/jackhuang/hmcl/core/install/InstallerType.java index ca6aa3d1f..bbd98dfd2 --- a/HMCL/src/core/java/org/jackhuang/hellominecraft/launcher/core/install/InstallerType.java +++ b/HMCLCore/src/main/java/org/jackhuang/hmcl/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.install; +package org.jackhuang.hmcl.core.install; /** * diff --git a/HMCL/src/core/java/org/jackhuang/hellominecraft/launcher/core/install/InstallerVersionList.java b/HMCLCore/src/main/java/org/jackhuang/hmcl/core/install/InstallerVersionList.java old mode 100755 new mode 100644 similarity index 96% rename from HMCL/src/core/java/org/jackhuang/hellominecraft/launcher/core/install/InstallerVersionList.java rename to HMCLCore/src/main/java/org/jackhuang/hmcl/core/install/InstallerVersionList.java index 8aebc7d56..d7ee07f98 --- a/HMCL/src/core/java/org/jackhuang/hellominecraft/launcher/core/install/InstallerVersionList.java +++ b/HMCLCore/src/main/java/org/jackhuang/hmcl/core/install/InstallerVersionList.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.install; +package org.jackhuang.hmcl.core.install; import java.io.Serializable; import java.util.ArrayList; @@ -24,8 +24,8 @@ import java.util.Comparator; import java.util.List; import java.util.Map; import java.util.Objects; -import org.jackhuang.hellominecraft.util.StrUtils; -import org.jackhuang.hellominecraft.util.task.Task; +import org.jackhuang.hmcl.util.StrUtils; +import org.jackhuang.hmcl.util.task.Task; /** * diff --git a/HMCL/src/core/java/org/jackhuang/hellominecraft/launcher/core/install/InstallerVersionNewerComparator.java b/HMCLCore/src/main/java/org/jackhuang/hmcl/core/install/InstallerVersionNewerComparator.java old mode 100755 new mode 100644 similarity index 87% rename from HMCL/src/core/java/org/jackhuang/hellominecraft/launcher/core/install/InstallerVersionNewerComparator.java rename to HMCLCore/src/main/java/org/jackhuang/hmcl/core/install/InstallerVersionNewerComparator.java index 2e02465fd..b04c8d14f --- a/HMCL/src/core/java/org/jackhuang/hellominecraft/launcher/core/install/InstallerVersionNewerComparator.java +++ b/HMCLCore/src/main/java/org/jackhuang/hmcl/core/install/InstallerVersionNewerComparator.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.install; +package org.jackhuang.hmcl.core.install; import java.io.Serializable; import java.util.Comparator; -import org.jackhuang.hellominecraft.launcher.core.install.InstallerVersionList.InstallerVersion; +import org.jackhuang.hmcl.core.install.InstallerVersionList.InstallerVersion; /** * diff --git a/HMCL/src/core/java/org/jackhuang/hellominecraft/launcher/core/install/MinecraftInstallerService.java b/HMCLCore/src/main/java/org/jackhuang/hmcl/core/install/MinecraftInstallerService.java old mode 100755 new mode 100644 similarity index 75% rename from HMCL/src/core/java/org/jackhuang/hellominecraft/launcher/core/install/MinecraftInstallerService.java rename to HMCLCore/src/main/java/org/jackhuang/hmcl/core/install/MinecraftInstallerService.java index 7287ed1b3..5aa90f4e7 --- a/HMCL/src/core/java/org/jackhuang/hellominecraft/launcher/core/install/MinecraftInstallerService.java +++ b/HMCLCore/src/main/java/org/jackhuang/hmcl/core/install/MinecraftInstallerService.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.launcher.core.install; +package org.jackhuang.hmcl.core.install; -import org.jackhuang.hellominecraft.launcher.core.service.IMinecraftInstallerService; +import org.jackhuang.hmcl.core.service.IMinecraftInstallerService; import java.io.File; -import org.jackhuang.hellominecraft.launcher.core.service.IMinecraftService; -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.LiteLoaderInstallerVersion; -import org.jackhuang.hellominecraft.launcher.core.install.optifine.OptiFineInstaller; -import org.jackhuang.hellominecraft.launcher.core.install.optifine.vanilla.OptiFineDownloadFormatter; -import org.jackhuang.hellominecraft.util.task.Task; -import org.jackhuang.hellominecraft.util.net.FileDownloadTask; -import org.jackhuang.hellominecraft.util.sys.IOUtils; -import org.jackhuang.hellominecraft.util.task.DeleteFileTask; +import org.jackhuang.hmcl.core.service.IMinecraftService; +import org.jackhuang.hmcl.core.install.InstallerVersionList.InstallerVersion; +import org.jackhuang.hmcl.core.install.forge.ForgeInstaller; +import org.jackhuang.hmcl.core.install.liteloader.LiteLoaderInstaller; +import org.jackhuang.hmcl.core.install.liteloader.LiteLoaderInstallerVersion; +import org.jackhuang.hmcl.core.install.optifine.OptiFineInstaller; +import org.jackhuang.hmcl.core.install.optifine.vanilla.OptiFineDownloadFormatter; +import org.jackhuang.hmcl.util.task.Task; +import org.jackhuang.hmcl.util.net.FileDownloadTask; +import org.jackhuang.hmcl.util.sys.IOUtils; +import org.jackhuang.hmcl.util.task.DeleteFileTask; /** * diff --git a/HMCL/src/core/java/org/jackhuang/hellominecraft/launcher/core/install/forge/ForgeInstaller.java b/HMCLCore/src/main/java/org/jackhuang/hmcl/core/install/forge/ForgeInstaller.java old mode 100755 new mode 100644 similarity index 82% rename from HMCL/src/core/java/org/jackhuang/hellominecraft/launcher/core/install/forge/ForgeInstaller.java rename to HMCLCore/src/main/java/org/jackhuang/hmcl/core/install/forge/ForgeInstaller.java index 56a7e5eb3..230053ef3 --- a/HMCL/src/core/java/org/jackhuang/hellominecraft/launcher/core/install/forge/ForgeInstaller.java +++ b/HMCLCore/src/main/java/org/jackhuang/hmcl/core/install/forge/ForgeInstaller.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.core.install.forge; +package org.jackhuang.hmcl.core.install.forge; -import org.jackhuang.hellominecraft.launcher.core.install.InstallProfile; +import org.jackhuang.hmcl.core.install.InstallProfile; 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.api.HMCAPI; -import org.jackhuang.hellominecraft.launcher.api.event.version.MinecraftLibraryPathEvent; -import org.jackhuang.hellominecraft.util.C; -import org.jackhuang.hellominecraft.util.log.HMCLog; -import org.jackhuang.hellominecraft.launcher.core.service.IMinecraftService; -import org.jackhuang.hellominecraft.util.task.Task; -import org.jackhuang.hellominecraft.util.sys.FileUtils; -import org.jackhuang.hellominecraft.launcher.core.version.MinecraftLibrary; -import org.jackhuang.hellominecraft.util.MessageBox; -import org.jackhuang.hellominecraft.util.Wrapper; -import org.jackhuang.hellominecraft.util.sys.IOUtils; +import org.jackhuang.hmcl.api.HMCLApi; +import org.jackhuang.hmcl.api.event.version.MinecraftLibraryPathEvent; +import org.jackhuang.hmcl.util.C; +import org.jackhuang.hmcl.api.HMCLog; +import org.jackhuang.hmcl.core.service.IMinecraftService; +import org.jackhuang.hmcl.util.task.Task; +import org.jackhuang.hmcl.util.sys.FileUtils; +import org.jackhuang.hmcl.core.version.MinecraftLibrary; +import org.jackhuang.hmcl.util.MessageBox; +import org.jackhuang.hmcl.api.Wrapper; +import org.jackhuang.hmcl.util.sys.IOUtils; /** * @@ -84,7 +84,7 @@ public class ForgeInstaller extends Task { String path = "libraries/" + forge.getDownloadInfo().path; MinecraftLibraryPathEvent event = new MinecraftLibraryPathEvent(this, path, new Wrapper<>(new File(gameDir, path))); - HMCAPI.EVENT_BUS.fireChannel(event); + HMCLApi.EVENT_BUS.fireChannel(event); File file = event.getFile().getValue(); if (!FileUtils.makeDirectory(file.getParentFile())) diff --git a/HMCL/src/core/java/org/jackhuang/hellominecraft/launcher/core/install/forge/Install.java b/HMCLCore/src/main/java/org/jackhuang/hmcl/core/install/forge/Install.java old mode 100755 new mode 100644 similarity index 97% rename from HMCL/src/core/java/org/jackhuang/hellominecraft/launcher/core/install/forge/Install.java rename to HMCLCore/src/main/java/org/jackhuang/hmcl/core/install/forge/Install.java index 4c8863ef2..d4a01cfe4 --- a/HMCL/src/core/java/org/jackhuang/hellominecraft/launcher/core/install/forge/Install.java +++ b/HMCLCore/src/main/java/org/jackhuang/hmcl/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.install.forge; +package org.jackhuang.hmcl.core.install.forge; import com.google.gson.annotations.SerializedName; diff --git a/HMCL/src/core/java/org/jackhuang/hellominecraft/launcher/core/install/forge/MinecraftForgeVersion.java b/HMCLCore/src/main/java/org/jackhuang/hmcl/core/install/forge/MinecraftForgeVersion.java old mode 100755 new mode 100644 similarity index 96% rename from HMCL/src/core/java/org/jackhuang/hellominecraft/launcher/core/install/forge/MinecraftForgeVersion.java rename to HMCLCore/src/main/java/org/jackhuang/hmcl/core/install/forge/MinecraftForgeVersion.java index f6bd01f03..9c288e707 --- a/HMCL/src/core/java/org/jackhuang/hellominecraft/launcher/core/install/forge/MinecraftForgeVersion.java +++ b/HMCLCore/src/main/java/org/jackhuang/hmcl/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.install.forge; +package org.jackhuang.hmcl.core.install.forge; /** * diff --git a/HMCL/src/core/java/org/jackhuang/hellominecraft/launcher/core/install/forge/MinecraftForgeVersionList.java b/HMCLCore/src/main/java/org/jackhuang/hmcl/core/install/forge/MinecraftForgeVersionList.java old mode 100755 new mode 100644 similarity index 88% rename from HMCL/src/core/java/org/jackhuang/hellominecraft/launcher/core/install/forge/MinecraftForgeVersionList.java rename to HMCLCore/src/main/java/org/jackhuang/hmcl/core/install/forge/MinecraftForgeVersionList.java index 17d44e4e7..e9b581fc2 --- a/HMCL/src/core/java/org/jackhuang/hellominecraft/launcher/core/install/forge/MinecraftForgeVersionList.java +++ b/HMCLCore/src/main/java/org/jackhuang/hmcl/core/install/forge/MinecraftForgeVersionList.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.install.forge; +package org.jackhuang.hmcl.core.install.forge; import java.util.ArrayList; import java.util.Arrays; @@ -23,14 +23,14 @@ import java.util.Collection; import java.util.Collections; import java.util.HashMap; import java.util.Map; -import org.jackhuang.hellominecraft.util.C; -import org.jackhuang.hellominecraft.launcher.core.download.DownloadType; -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.task.Task; -import org.jackhuang.hellominecraft.util.task.TaskInfo; -import org.jackhuang.hellominecraft.util.net.HTTPGetTask; +import org.jackhuang.hmcl.util.C; +import org.jackhuang.hmcl.core.download.DownloadType; +import org.jackhuang.hmcl.util.StrUtils; +import org.jackhuang.hmcl.core.install.InstallerVersionList; +import org.jackhuang.hmcl.core.install.InstallerVersionNewerComparator; +import org.jackhuang.hmcl.util.task.Task; +import org.jackhuang.hmcl.util.task.TaskInfo; +import org.jackhuang.hmcl.util.net.HTTPGetTask; /** * diff --git a/HMCL/src/core/java/org/jackhuang/hellominecraft/launcher/core/install/forge/MinecraftForgeVersionRoot.java b/HMCLCore/src/main/java/org/jackhuang/hmcl/core/install/forge/MinecraftForgeVersionRoot.java old mode 100755 new mode 100644 similarity index 95% rename from HMCL/src/core/java/org/jackhuang/hellominecraft/launcher/core/install/forge/MinecraftForgeVersionRoot.java rename to HMCLCore/src/main/java/org/jackhuang/hmcl/core/install/forge/MinecraftForgeVersionRoot.java index a282fbe03..3311751e5 --- a/HMCL/src/core/java/org/jackhuang/hellominecraft/launcher/core/install/forge/MinecraftForgeVersionRoot.java +++ b/HMCLCore/src/main/java/org/jackhuang/hmcl/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.install.forge; +package org.jackhuang.hmcl.core.install.forge; import com.google.gson.annotations.SerializedName; import java.util.Map; diff --git a/HMCL/src/core/java/org/jackhuang/hellominecraft/launcher/core/install/liteloader/LiteLoaderInstaller.java b/HMCLCore/src/main/java/org/jackhuang/hmcl/core/install/liteloader/LiteLoaderInstaller.java old mode 100755 new mode 100644 similarity index 80% rename from HMCL/src/core/java/org/jackhuang/hellominecraft/launcher/core/install/liteloader/LiteLoaderInstaller.java rename to HMCLCore/src/main/java/org/jackhuang/hmcl/core/install/liteloader/LiteLoaderInstaller.java index e35ec4e82..349b6782d --- a/HMCL/src/core/java/org/jackhuang/hellominecraft/launcher/core/install/liteloader/LiteLoaderInstaller.java +++ b/HMCLCore/src/main/java/org/jackhuang/hmcl/core/install/liteloader/LiteLoaderInstaller.java @@ -15,23 +15,23 @@ * 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.install.liteloader; +package org.jackhuang.hmcl.core.install.liteloader; import java.io.File; import java.util.ArrayList; import java.util.Arrays; -import org.jackhuang.hellominecraft.api.HMCAPI; -import org.jackhuang.hellominecraft.launcher.api.event.version.MinecraftLibraryPathEvent; -import org.jackhuang.hellominecraft.util.C; -import org.jackhuang.hellominecraft.util.log.HMCLog; -import org.jackhuang.hellominecraft.launcher.core.service.IMinecraftService; -import org.jackhuang.hellominecraft.util.task.Task; -import org.jackhuang.hellominecraft.util.task.comm.PreviousResult; -import org.jackhuang.hellominecraft.util.task.comm.PreviousResultRegistrar; -import org.jackhuang.hellominecraft.util.sys.FileUtils; -import org.jackhuang.hellominecraft.launcher.core.version.MinecraftLibrary; -import org.jackhuang.hellominecraft.launcher.core.version.MinecraftVersion; -import org.jackhuang.hellominecraft.util.Wrapper; +import org.jackhuang.hmcl.api.HMCLApi; +import org.jackhuang.hmcl.api.event.version.MinecraftLibraryPathEvent; +import org.jackhuang.hmcl.util.C; +import org.jackhuang.hmcl.api.HMCLog; +import org.jackhuang.hmcl.core.service.IMinecraftService; +import org.jackhuang.hmcl.util.task.Task; +import org.jackhuang.hmcl.util.task.comm.PreviousResult; +import org.jackhuang.hmcl.util.task.comm.PreviousResultRegistrar; +import org.jackhuang.hmcl.util.sys.FileUtils; +import org.jackhuang.hmcl.core.version.MinecraftLibrary; +import org.jackhuang.hmcl.core.version.MinecraftVersion; +import org.jackhuang.hmcl.api.Wrapper; /** * @@ -74,7 +74,7 @@ public class LiteLoaderInstaller extends Task implements PreviousResultRegistrar String path = "libraries/com/mumfrey/liteloader/" + version.selfVersion + "/liteloader-" + version.selfVersion + ".jar"; MinecraftLibraryPathEvent event = new MinecraftLibraryPathEvent(this, path, new Wrapper<>(new File(service.baseDirectory(), path))); - HMCAPI.EVENT_BUS.fireChannel(event); + HMCLApi.EVENT_BUS.fireChannel(event); FileUtils.copyFile(installer, event.getFile().getValue()); mv.id += "-LiteLoader" + version.selfVersion; diff --git a/HMCL/src/core/java/org/jackhuang/hellominecraft/launcher/core/install/liteloader/LiteLoaderInstallerVersion.java b/HMCLCore/src/main/java/org/jackhuang/hmcl/core/install/liteloader/LiteLoaderInstallerVersion.java similarity index 88% rename from HMCL/src/core/java/org/jackhuang/hellominecraft/launcher/core/install/liteloader/LiteLoaderInstallerVersion.java rename to HMCLCore/src/main/java/org/jackhuang/hmcl/core/install/liteloader/LiteLoaderInstallerVersion.java index 9b5cab2a0..ffd96af8c 100644 --- a/HMCL/src/core/java/org/jackhuang/hellominecraft/launcher/core/install/liteloader/LiteLoaderInstallerVersion.java +++ b/HMCLCore/src/main/java/org/jackhuang/hmcl/core/install/liteloader/LiteLoaderInstallerVersion.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.install.liteloader; +package org.jackhuang.hmcl.core.install.liteloader; import java.util.Arrays; import java.util.Objects; -import org.jackhuang.hellominecraft.launcher.core.install.InstallerVersionList; -import org.jackhuang.hellominecraft.launcher.core.version.MinecraftLibrary; +import org.jackhuang.hmcl.core.install.InstallerVersionList; +import org.jackhuang.hmcl.core.version.MinecraftLibrary; /** * diff --git a/HMCL/src/core/java/org/jackhuang/hellominecraft/launcher/core/install/liteloader/LiteLoaderMCVersions.java b/HMCLCore/src/main/java/org/jackhuang/hmcl/core/install/liteloader/LiteLoaderMCVersions.java old mode 100755 new mode 100644 similarity index 93% rename from HMCL/src/core/java/org/jackhuang/hellominecraft/launcher/core/install/liteloader/LiteLoaderMCVersions.java rename to HMCLCore/src/main/java/org/jackhuang/hmcl/core/install/liteloader/LiteLoaderMCVersions.java index f6539c365..7926c0ca4 --- a/HMCL/src/core/java/org/jackhuang/hellominecraft/launcher/core/install/liteloader/LiteLoaderMCVersions.java +++ b/HMCLCore/src/main/java/org/jackhuang/hmcl/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.install.liteloader; +package org.jackhuang.hmcl.core.install.liteloader; import com.google.gson.annotations.SerializedName; import java.util.Map; diff --git a/HMCL/src/core/java/org/jackhuang/hellominecraft/launcher/core/install/liteloader/LiteLoaderVersion.java b/HMCLCore/src/main/java/org/jackhuang/hmcl/core/install/liteloader/LiteLoaderVersion.java old mode 100755 new mode 100644 similarity index 89% rename from HMCL/src/core/java/org/jackhuang/hellominecraft/launcher/core/install/liteloader/LiteLoaderVersion.java rename to HMCLCore/src/main/java/org/jackhuang/hmcl/core/install/liteloader/LiteLoaderVersion.java index a1f5fdb73..7cbc66dea --- a/HMCL/src/core/java/org/jackhuang/hellominecraft/launcher/core/install/liteloader/LiteLoaderVersion.java +++ b/HMCLCore/src/main/java/org/jackhuang/hmcl/core/install/liteloader/LiteLoaderVersion.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.install.liteloader; +package org.jackhuang.hmcl.core.install.liteloader; import com.google.gson.annotations.SerializedName; -import org.jackhuang.hellominecraft.launcher.core.version.MinecraftLibrary; +import org.jackhuang.hmcl.core.version.MinecraftLibrary; /** * diff --git a/HMCL/src/core/java/org/jackhuang/hellominecraft/launcher/core/install/liteloader/LiteLoaderVersionList.java b/HMCLCore/src/main/java/org/jackhuang/hmcl/core/install/liteloader/LiteLoaderVersionList.java old mode 100755 new mode 100644 similarity index 87% rename from HMCL/src/core/java/org/jackhuang/hellominecraft/launcher/core/install/liteloader/LiteLoaderVersionList.java rename to HMCLCore/src/main/java/org/jackhuang/hmcl/core/install/liteloader/LiteLoaderVersionList.java index 6040dde55..c29ac776d --- a/HMCL/src/core/java/org/jackhuang/hellominecraft/launcher/core/install/liteloader/LiteLoaderVersionList.java +++ b/HMCLCore/src/main/java/org/jackhuang/hmcl/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.install.liteloader; +package org.jackhuang.hmcl.core.install.liteloader; import java.util.ArrayList; import java.util.Arrays; @@ -23,14 +23,14 @@ import java.util.Collection; import java.util.Collections; import java.util.HashMap; import java.util.Map; -import org.jackhuang.hellominecraft.launcher.core.download.DownloadType; -import org.jackhuang.hellominecraft.util.C; -import org.jackhuang.hellominecraft.launcher.core.install.InstallerVersionList; -import org.jackhuang.hellominecraft.launcher.core.install.InstallerVersionNewerComparator; -import org.jackhuang.hellominecraft.util.StrUtils; -import org.jackhuang.hellominecraft.util.task.Task; -import org.jackhuang.hellominecraft.util.task.TaskInfo; -import org.jackhuang.hellominecraft.util.net.HTTPGetTask; +import org.jackhuang.hmcl.core.download.DownloadType; +import org.jackhuang.hmcl.util.C; +import org.jackhuang.hmcl.core.install.InstallerVersionList; +import org.jackhuang.hmcl.core.install.InstallerVersionNewerComparator; +import org.jackhuang.hmcl.util.StrUtils; +import org.jackhuang.hmcl.util.task.Task; +import org.jackhuang.hmcl.util.task.TaskInfo; +import org.jackhuang.hmcl.util.net.HTTPGetTask; /** * diff --git a/HMCL/src/core/java/org/jackhuang/hellominecraft/launcher/core/install/liteloader/LiteLoaderVersionsMeta.java b/HMCLCore/src/main/java/org/jackhuang/hmcl/core/install/liteloader/LiteLoaderVersionsMeta.java old mode 100755 new mode 100644 similarity index 95% rename from HMCL/src/core/java/org/jackhuang/hellominecraft/launcher/core/install/liteloader/LiteLoaderVersionsMeta.java rename to HMCLCore/src/main/java/org/jackhuang/hmcl/core/install/liteloader/LiteLoaderVersionsMeta.java index 078ad9823..af4fe01b4 --- a/HMCL/src/core/java/org/jackhuang/hellominecraft/launcher/core/install/liteloader/LiteLoaderVersionsMeta.java +++ b/HMCLCore/src/main/java/org/jackhuang/hmcl/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.install.liteloader; +package org.jackhuang.hmcl.core.install.liteloader; import com.google.gson.annotations.SerializedName; diff --git a/HMCL/src/core/java/org/jackhuang/hellominecraft/launcher/core/install/liteloader/LiteLoaderVersionsRoot.java b/HMCLCore/src/main/java/org/jackhuang/hmcl/core/install/liteloader/LiteLoaderVersionsRoot.java old mode 100755 new mode 100644 similarity index 93% rename from HMCL/src/core/java/org/jackhuang/hellominecraft/launcher/core/install/liteloader/LiteLoaderVersionsRoot.java rename to HMCLCore/src/main/java/org/jackhuang/hmcl/core/install/liteloader/LiteLoaderVersionsRoot.java index d8051e41c..c65ecae61 --- a/HMCL/src/core/java/org/jackhuang/hellominecraft/launcher/core/install/liteloader/LiteLoaderVersionsRoot.java +++ b/HMCLCore/src/main/java/org/jackhuang/hmcl/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.install.liteloader; +package org.jackhuang.hmcl.core.install.liteloader; import com.google.gson.annotations.SerializedName; import java.util.Map; diff --git a/HMCL/src/core/java/org/jackhuang/hellominecraft/launcher/core/install/optifine/OptiFineInstaller.java b/HMCLCore/src/main/java/org/jackhuang/hmcl/core/install/optifine/OptiFineInstaller.java old mode 100755 new mode 100644 similarity index 77% rename from HMCL/src/core/java/org/jackhuang/hellominecraft/launcher/core/install/optifine/OptiFineInstaller.java rename to HMCLCore/src/main/java/org/jackhuang/hmcl/core/install/optifine/OptiFineInstaller.java index 19d392783..ab78248fb --- a/HMCL/src/core/java/org/jackhuang/hellominecraft/launcher/core/install/optifine/OptiFineInstaller.java +++ b/HMCLCore/src/main/java/org/jackhuang/hmcl/core/install/optifine/OptiFineInstaller.java @@ -15,26 +15,26 @@ * 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.install.optifine; +package org.jackhuang.hmcl.core.install.optifine; import java.io.File; import java.util.ArrayList; import java.util.zip.ZipFile; -import org.jackhuang.hellominecraft.api.HMCAPI; -import org.jackhuang.hellominecraft.launcher.api.event.version.MinecraftLibraryPathEvent; -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.launcher.core.version.LibrariesDownloadInfo; -import org.jackhuang.hellominecraft.launcher.core.version.LibraryDownloadInfo; -import org.jackhuang.hellominecraft.util.task.Task; -import org.jackhuang.hellominecraft.util.task.comm.PreviousResult; -import org.jackhuang.hellominecraft.util.task.comm.PreviousResultRegistrar; -import org.jackhuang.hellominecraft.util.sys.FileUtils; -import org.jackhuang.hellominecraft.launcher.core.version.MinecraftLibrary; -import org.jackhuang.hellominecraft.launcher.core.version.MinecraftVersion; -import org.jackhuang.hellominecraft.util.Wrapper; -import org.jackhuang.hellominecraft.util.log.HMCLog; +import org.jackhuang.hmcl.api.HMCLApi; +import org.jackhuang.hmcl.api.event.version.MinecraftLibraryPathEvent; +import org.jackhuang.hmcl.util.C; +import org.jackhuang.hmcl.core.install.InstallerVersionList; +import org.jackhuang.hmcl.core.service.IMinecraftService; +import org.jackhuang.hmcl.core.version.LibrariesDownloadInfo; +import org.jackhuang.hmcl.core.version.LibraryDownloadInfo; +import org.jackhuang.hmcl.util.task.Task; +import org.jackhuang.hmcl.util.task.comm.PreviousResult; +import org.jackhuang.hmcl.util.task.comm.PreviousResultRegistrar; +import org.jackhuang.hmcl.util.sys.FileUtils; +import org.jackhuang.hmcl.core.version.MinecraftLibrary; +import org.jackhuang.hmcl.core.version.MinecraftVersion; +import org.jackhuang.hmcl.api.Wrapper; +import org.jackhuang.hmcl.api.HMCLog; /** * @@ -73,7 +73,7 @@ public class OptiFineInstaller extends Task implements PreviousResultRegistrar(new File(service.baseDirectory(), "libraries/" + library.downloads.artifact.path))); - HMCAPI.EVENT_BUS.fireChannel(event); + HMCLApi.EVENT_BUS.fireChannel(event); FileUtils.copyFile(installer, event.getFile().getValue()); mv.id += "-" + selfId; diff --git a/HMCL/src/core/java/org/jackhuang/hellominecraft/launcher/core/install/optifine/OptiFineVersion.java b/HMCLCore/src/main/java/org/jackhuang/hmcl/core/install/optifine/OptiFineVersion.java old mode 100755 new mode 100644 similarity index 95% rename from HMCL/src/core/java/org/jackhuang/hellominecraft/launcher/core/install/optifine/OptiFineVersion.java rename to HMCLCore/src/main/java/org/jackhuang/hmcl/core/install/optifine/OptiFineVersion.java index 824beee6f..2fc842b0a --- a/HMCL/src/core/java/org/jackhuang/hellominecraft/launcher/core/install/optifine/OptiFineVersion.java +++ b/HMCLCore/src/main/java/org/jackhuang/hmcl/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.install.optifine; +package org.jackhuang.hmcl.core.install.optifine; /** * diff --git a/HMCL/src/core/java/org/jackhuang/hellominecraft/launcher/core/install/optifine/bmcl/OptiFineBMCLVersionList.java b/HMCLCore/src/main/java/org/jackhuang/hmcl/core/install/optifine/bmcl/OptiFineBMCLVersionList.java old mode 100755 new mode 100644 similarity index 85% rename from HMCL/src/core/java/org/jackhuang/hellominecraft/launcher/core/install/optifine/bmcl/OptiFineBMCLVersionList.java rename to HMCLCore/src/main/java/org/jackhuang/hmcl/core/install/optifine/bmcl/OptiFineBMCLVersionList.java index c87c64f40..9a2b23c55 --- a/HMCL/src/core/java/org/jackhuang/hellominecraft/launcher/core/install/optifine/bmcl/OptiFineBMCLVersionList.java +++ b/HMCLCore/src/main/java/org/jackhuang/hmcl/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.install.optifine.bmcl; +package org.jackhuang.hmcl.core.install.optifine.bmcl; import com.google.gson.reflect.TypeToken; import java.lang.reflect.Type; @@ -26,14 +26,14 @@ import java.util.Collections; import java.util.HashMap; import java.util.HashSet; import java.util.List; -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.StrUtils; -import org.jackhuang.hellominecraft.util.task.Task; -import org.jackhuang.hellominecraft.util.task.TaskInfo; -import org.jackhuang.hellominecraft.util.net.HTTPGetTask; +import org.jackhuang.hmcl.util.C; +import org.jackhuang.hmcl.util.ArrayUtils; +import org.jackhuang.hmcl.core.install.InstallerVersionList; +import org.jackhuang.hmcl.core.install.optifine.OptiFineVersion; +import org.jackhuang.hmcl.util.StrUtils; +import org.jackhuang.hmcl.util.task.Task; +import org.jackhuang.hmcl.util.task.TaskInfo; +import org.jackhuang.hmcl.util.net.HTTPGetTask; /** * diff --git a/HMCL/src/core/java/org/jackhuang/hellominecraft/launcher/core/install/optifine/vanilla/OptiFineDownloadFormatter.java b/HMCLCore/src/main/java/org/jackhuang/hmcl/core/install/optifine/vanilla/OptiFineDownloadFormatter.java old mode 100755 new mode 100644 similarity index 84% rename from HMCL/src/core/java/org/jackhuang/hellominecraft/launcher/core/install/optifine/vanilla/OptiFineDownloadFormatter.java rename to HMCLCore/src/main/java/org/jackhuang/hmcl/core/install/optifine/vanilla/OptiFineDownloadFormatter.java index 418a3b522..f5d0b9e1f --- a/HMCL/src/core/java/org/jackhuang/hellominecraft/launcher/core/install/optifine/vanilla/OptiFineDownloadFormatter.java +++ b/HMCLCore/src/main/java/org/jackhuang/hmcl/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.install.optifine.vanilla; +package org.jackhuang.hmcl.core.install.optifine.vanilla; import java.util.regex.Matcher; import java.util.regex.Pattern; -import org.jackhuang.hellominecraft.util.C; -import org.jackhuang.hellominecraft.util.task.Task; -import org.jackhuang.hellominecraft.util.task.comm.PreviousResult; -import org.jackhuang.hellominecraft.util.net.NetUtils; +import org.jackhuang.hmcl.util.C; +import org.jackhuang.hmcl.util.task.Task; +import org.jackhuang.hmcl.util.task.comm.PreviousResult; +import org.jackhuang.hmcl.util.net.NetUtils; /** * diff --git a/HMCL/src/core/java/org/jackhuang/hellominecraft/launcher/core/install/optifine/vanilla/OptiFineVersionList.java b/HMCLCore/src/main/java/org/jackhuang/hmcl/core/install/optifine/vanilla/OptiFineVersionList.java old mode 100755 new mode 100644 similarity index 91% rename from HMCL/src/core/java/org/jackhuang/hellominecraft/launcher/core/install/optifine/vanilla/OptiFineVersionList.java rename to HMCLCore/src/main/java/org/jackhuang/hmcl/core/install/optifine/vanilla/OptiFineVersionList.java index 6154c7634..1cf495383 --- a/HMCL/src/core/java/org/jackhuang/hellominecraft/launcher/core/install/optifine/vanilla/OptiFineVersionList.java +++ b/HMCLCore/src/main/java/org/jackhuang/hmcl/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.install.optifine.vanilla; +package org.jackhuang.hmcl.core.install.optifine.vanilla; import java.io.ByteArrayInputStream; import java.io.IOException; @@ -30,14 +30,14 @@ 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.install.InstallerVersionList; -import org.jackhuang.hellominecraft.launcher.core.install.optifine.OptiFineVersion; -import org.jackhuang.hellominecraft.util.ArrayUtils; -import org.jackhuang.hellominecraft.util.C; -import org.jackhuang.hellominecraft.util.StrUtils; -import org.jackhuang.hellominecraft.util.task.Task; -import org.jackhuang.hellominecraft.util.task.TaskInfo; -import org.jackhuang.hellominecraft.util.net.HTTPGetTask; +import org.jackhuang.hmcl.core.install.InstallerVersionList; +import org.jackhuang.hmcl.core.install.optifine.OptiFineVersion; +import org.jackhuang.hmcl.util.ArrayUtils; +import org.jackhuang.hmcl.util.C; +import org.jackhuang.hmcl.util.StrUtils; +import org.jackhuang.hmcl.util.task.Task; +import org.jackhuang.hmcl.util.task.TaskInfo; +import org.jackhuang.hmcl.util.net.HTTPGetTask; import org.w3c.dom.DOMException; import org.w3c.dom.Document; import org.w3c.dom.Element; diff --git a/HMCL/src/core/java/org/jackhuang/hellominecraft/launcher/core/launch/AbstractMinecraftLoader.java b/HMCLCore/src/main/java/org/jackhuang/hmcl/core/launch/AbstractMinecraftLoader.java old mode 100755 new mode 100644 similarity index 87% rename from HMCL/src/core/java/org/jackhuang/hellominecraft/launcher/core/launch/AbstractMinecraftLoader.java rename to HMCLCore/src/main/java/org/jackhuang/hmcl/core/launch/AbstractMinecraftLoader.java index 740c80773..3a574e1ab --- a/HMCL/src/core/java/org/jackhuang/hellominecraft/launcher/core/launch/AbstractMinecraftLoader.java +++ b/HMCLCore/src/main/java/org/jackhuang/hmcl/core/launch/AbstractMinecraftLoader.java @@ -15,25 +15,27 @@ * 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.launch; +package org.jackhuang.hmcl.core.launch; +import org.jackhuang.hmcl.api.game.LaunchOptions; import java.io.File; +import java.io.IOException; import java.util.ArrayList; import java.util.Arrays; import java.util.List; -import org.jackhuang.hellominecraft.util.C; -import org.jackhuang.hellominecraft.util.log.HMCLog; -import org.jackhuang.hellominecraft.util.sys.JdkVersion; -import org.jackhuang.hellominecraft.util.MathUtils; -import org.jackhuang.hellominecraft.util.MessageBox; -import org.jackhuang.hellominecraft.util.sys.OS; -import org.jackhuang.hellominecraft.util.sys.Platform; -import org.jackhuang.hellominecraft.util.StrUtils; -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.launcher.core.service.IMinecraftService; -import org.jackhuang.hellominecraft.launcher.core.service.IMinecraftLoader; +import org.jackhuang.hmcl.util.C; +import org.jackhuang.hmcl.api.HMCLog; +import org.jackhuang.hmcl.util.sys.JdkVersion; +import org.jackhuang.hmcl.util.MathUtils; +import org.jackhuang.hmcl.util.MessageBox; +import org.jackhuang.hmcl.util.sys.OS; +import org.jackhuang.hmcl.util.sys.Platform; +import org.jackhuang.hmcl.util.StrUtils; +import org.jackhuang.hmcl.core.GameException; +import org.jackhuang.hmcl.api.auth.UserProfileProvider; +import org.jackhuang.hmcl.core.version.MinecraftVersion; +import org.jackhuang.hmcl.core.service.IMinecraftService; +import org.jackhuang.hmcl.core.service.IMinecraftLoader; /** * @@ -69,7 +71,12 @@ public abstract class AbstractMinecraftLoader implements IMinecraftLoader { if (StrUtils.isNotBlank(options.getWrapper())) res.add(options.getWrapper()); - JdkVersion jv = options.getJava(); + JdkVersion jv = null; + try { + jv = JdkVersion.getJavaVersionFromExecutable(options.getJavaDir()); + } catch (IOException ex) { + HMCLog.err("Failed to read java version", ex); + } res.add(options.getJavaDir()); if (options.hasJavaArgs()) diff --git a/HMCL/src/core/java/org/jackhuang/hellominecraft/launcher/core/launch/DefaultGameLauncher.java b/HMCLCore/src/main/java/org/jackhuang/hmcl/core/launch/DefaultGameLauncher.java old mode 100755 new mode 100644 similarity index 67% rename from HMCL/src/core/java/org/jackhuang/hellominecraft/launcher/core/launch/DefaultGameLauncher.java rename to HMCLCore/src/main/java/org/jackhuang/hmcl/core/launch/DefaultGameLauncher.java index a249abd9e..04fe63fff --- a/HMCL/src/core/java/org/jackhuang/hellominecraft/launcher/core/launch/DefaultGameLauncher.java +++ b/HMCLCore/src/main/java/org/jackhuang/hmcl/core/launch/DefaultGameLauncher.java @@ -15,25 +15,26 @@ * 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.launch; +package org.jackhuang.hmcl.core.launch; +import org.jackhuang.hmcl.api.game.LaunchOptions; import java.io.IOException; import java.util.HashSet; import java.util.List; -import org.jackhuang.hellominecraft.api.HMCAPI; -import org.jackhuang.hellominecraft.api.ResultedSimpleEvent; -import org.jackhuang.hellominecraft.launcher.api.event.launch.DecompressLibrariesEvent; -import org.jackhuang.hellominecraft.launcher.api.event.launch.DownloadLibrariesEvent; -import org.jackhuang.hellominecraft.launcher.api.event.launch.DownloadLibraryJob; -import org.jackhuang.hellominecraft.launcher.core.auth.IAuthenticator; -import org.jackhuang.hellominecraft.launcher.core.auth.LoginInfo; -import org.jackhuang.hellominecraft.launcher.core.service.IMinecraftService; -import org.jackhuang.hellominecraft.util.C; -import org.jackhuang.hellominecraft.util.MessageBox; -import org.jackhuang.hellominecraft.util.log.HMCLog; -import org.jackhuang.hellominecraft.util.sys.CompressingUtils; -import org.jackhuang.hellominecraft.util.task.ParallelTask; -import org.jackhuang.hellominecraft.util.task.TaskWindow; +import org.jackhuang.hmcl.api.HMCLApi; +import org.jackhuang.hmcl.api.event.ResultedSimpleEvent; +import org.jackhuang.hmcl.api.event.launch.DecompressLibrariesEvent; +import org.jackhuang.hmcl.api.event.launch.DownloadLibrariesEvent; +import org.jackhuang.hmcl.api.event.launch.DownloadLibraryJob; +import org.jackhuang.hmcl.api.auth.LoginInfo; +import org.jackhuang.hmcl.core.service.IMinecraftService; +import org.jackhuang.hmcl.util.C; +import org.jackhuang.hmcl.util.MessageBox; +import org.jackhuang.hmcl.api.HMCLog; +import org.jackhuang.hmcl.util.sys.CompressingUtils; +import org.jackhuang.hmcl.util.task.ParallelTask; +import org.jackhuang.hmcl.util.task.TaskWindow; +import org.jackhuang.hmcl.api.auth.IAuthenticator; public class DefaultGameLauncher extends GameLauncher { @@ -44,15 +45,15 @@ public class DefaultGameLauncher extends GameLauncher { } private void register() { - HMCAPI.EVENT_BUS.channel(DownloadLibrariesEvent.class).register(t -> { + HMCLApi.EVENT_BUS.channel(DownloadLibrariesEvent.class).register(t -> { ResultedSimpleEvent> event = (ResultedSimpleEvent) t; final TaskWindow.TaskWindowFactory dw = TaskWindow.factory(); ParallelTask parallelTask = new ParallelTask(); HashSet names = new HashSet<>(); for (DownloadLibraryJob s : t.getValue()) { - if (names.contains(s.lib.name)) + if (names.contains(s.lib.getName())) continue; - names.add(s.lib.name); + names.add(s.lib.getName()); parallelTask.addTask(new LibraryDownloadTask(s)); } dw.append(parallelTask); @@ -63,7 +64,7 @@ public class DefaultGameLauncher extends GameLauncher { flag = true; t.setResult(flag); }); - HMCAPI.EVENT_BUS.channel(DecompressLibrariesEvent.class).register(t -> { + HMCLApi.EVENT_BUS.channel(DecompressLibrariesEvent.class).register(t -> { if (t.getValue() == null) { t.setResult(false); return; diff --git a/HMCL/src/core/java/org/jackhuang/hellominecraft/launcher/core/launch/GameLauncher.java b/HMCLCore/src/main/java/org/jackhuang/hmcl/core/launch/GameLauncher.java old mode 100755 new mode 100644 similarity index 66% rename from HMCL/src/core/java/org/jackhuang/hellominecraft/launcher/core/launch/GameLauncher.java rename to HMCLCore/src/main/java/org/jackhuang/hmcl/core/launch/GameLauncher.java index 035f70a72..4676af133 --- a/HMCL/src/core/java/org/jackhuang/hellominecraft/launcher/core/launch/GameLauncher.java +++ b/HMCLCore/src/main/java/org/jackhuang/hmcl/core/launch/GameLauncher.java @@ -15,44 +15,43 @@ * 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.launch; +package org.jackhuang.hmcl.core.launch; +import org.jackhuang.hmcl.api.game.LaunchOptions; import java.io.BufferedWriter; import java.io.File; import java.io.FileOutputStream; import java.io.IOException; import java.io.OutputStreamWriter; import java.util.List; -import org.jackhuang.hellominecraft.api.HMCAPI; -import org.jackhuang.hellominecraft.launcher.api.event.launch.DecompressLibrariesEvent; -import org.jackhuang.hellominecraft.launcher.api.event.launch.DecompressLibraryJob; -import org.jackhuang.hellominecraft.launcher.api.event.launch.DownloadLibrariesEvent; -import org.jackhuang.hellominecraft.launcher.api.event.launch.LaunchEvent; -import org.jackhuang.hellominecraft.launcher.api.event.launch.LaunchSucceededEvent; -import org.jackhuang.hellominecraft.launcher.api.event.launch.LaunchingState; -import org.jackhuang.hellominecraft.launcher.api.event.launch.LaunchingStateChangedEvent; -import org.jackhuang.hellominecraft.launcher.api.event.launch.ProcessingLoginResultEvent; -import org.jackhuang.hellominecraft.launcher.core.GameException; -import org.jackhuang.hellominecraft.launcher.core.RuntimeGameException; -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 org.jackhuang.hellominecraft.launcher.core.auth.UserProfileProvider; -import org.jackhuang.hellominecraft.launcher.core.service.IMinecraftLoader; -import org.jackhuang.hellominecraft.launcher.core.service.IMinecraftService; -import org.jackhuang.hellominecraft.util.C; -import org.jackhuang.hellominecraft.util.StrUtils; -import org.jackhuang.hellominecraft.util.code.Charsets; -import org.jackhuang.hellominecraft.util.log.HMCLog; -import org.jackhuang.hellominecraft.util.sys.FileUtils; -import org.jackhuang.hellominecraft.util.sys.IOUtils; -import org.jackhuang.hellominecraft.util.sys.JavaProcess; -import org.jackhuang.hellominecraft.util.sys.OS; -import org.jackhuang.hellominecraft.util.sys.ProcessManager; +import org.jackhuang.hmcl.api.HMCLApi; +import org.jackhuang.hmcl.api.event.launch.DecompressLibrariesEvent; +import org.jackhuang.hmcl.api.game.DecompressLibraryJob; +import org.jackhuang.hmcl.api.event.launch.DownloadLibrariesEvent; +import org.jackhuang.hmcl.api.event.launch.LaunchEvent; +import org.jackhuang.hmcl.api.event.launch.LaunchSucceededEvent; +import org.jackhuang.hmcl.api.event.launch.LaunchingState; +import org.jackhuang.hmcl.api.event.launch.LaunchingStateChangedEvent; +import org.jackhuang.hmcl.api.event.launch.ProcessingLoginResultEvent; +import org.jackhuang.hmcl.core.GameException; +import org.jackhuang.hmcl.core.RuntimeGameException; +import org.jackhuang.hmcl.api.auth.AuthenticationException; +import org.jackhuang.hmcl.api.auth.LoginInfo; +import org.jackhuang.hmcl.api.auth.UserProfileProvider; +import org.jackhuang.hmcl.core.service.IMinecraftLoader; +import org.jackhuang.hmcl.core.service.IMinecraftService; +import org.jackhuang.hmcl.util.C; +import org.jackhuang.hmcl.util.StrUtils; +import org.jackhuang.hmcl.util.code.Charsets; +import org.jackhuang.hmcl.api.HMCLog; +import org.jackhuang.hmcl.util.sys.FileUtils; +import org.jackhuang.hmcl.util.sys.IOUtils; +import org.jackhuang.hmcl.util.sys.JavaProcess; +import org.jackhuang.hmcl.util.sys.OS; +import org.jackhuang.hmcl.api.auth.IAuthenticator; public class GameLauncher { - - public static final ProcessManager PROCESS_MANAGER = new ProcessManager(); + LaunchOptions options; IMinecraftService service; LoginInfo info; @@ -66,6 +65,22 @@ public class GameLauncher { this.login = lg; } + public LaunchOptions getOptions() { + return options; + } + + public IMinecraftService getService() { + return service; + } + + public LoginInfo getInfo() { + return info; + } + + public UserProfileProvider getLoginResult() { + return result; + } + private Object tag; public Object getTag() { @@ -90,7 +105,7 @@ public class GameLauncher { public void makeLaunchCommand() throws AuthenticationException, GameException, RuntimeGameException { HMCLog.log("Building process"); HMCLog.log("Logging in..."); - HMCAPI.EVENT_BUS.fireChannel(new LaunchingStateChangedEvent(this, LaunchingState.LoggingIn)); + HMCLApi.EVENT_BUS.fireChannel(new LaunchingStateChangedEvent(this, LaunchingState.LoggingIn)); IMinecraftLoader loader; if (info != null) result = login.login(info); @@ -98,9 +113,9 @@ public class GameLauncher { result = login.loginBySettings(); if (result == null) throw new AuthenticationException("Result can not be null."); - HMCAPI.EVENT_BUS.fireChannel(new ProcessingLoginResultEvent(this, result)); + HMCLApi.EVENT_BUS.fireChannel(new ProcessingLoginResultEvent(this, result)); - HMCAPI.EVENT_BUS.fireChannel(new LaunchingStateChangedEvent(this, LaunchingState.GeneratingLaunchingCodes)); + HMCLApi.EVENT_BUS.fireChannel(new LaunchingStateChangedEvent(this, LaunchingState.GeneratingLaunchingCodes)); loader = service.launch(options, result); File file = service.version().getDecompressNativesToLocation(loader.getMinecraftVersion()); @@ -109,18 +124,18 @@ public class GameLauncher { if (!options.isNotCheckGame()) { HMCLog.log("Detecting libraries..."); - HMCAPI.EVENT_BUS.fireChannel(new LaunchingStateChangedEvent(this, LaunchingState.DownloadingLibraries)); - if (!HMCAPI.EVENT_BUS.fireChannelResulted(new DownloadLibrariesEvent(this, service.download().getDownloadLibraries(loader.getMinecraftVersion())))) + HMCLApi.EVENT_BUS.fireChannel(new LaunchingStateChangedEvent(this, LaunchingState.DownloadingLibraries)); + if (!HMCLApi.EVENT_BUS.fireChannelResulted(new DownloadLibrariesEvent(this, service.download().getDownloadLibraries(loader.getMinecraftVersion())))) throw new GameException("Failed to download libraries"); } HMCLog.log("Unpacking natives..."); - HMCAPI.EVENT_BUS.fireChannel(new LaunchingStateChangedEvent(this, LaunchingState.DecompressingNatives)); + HMCLApi.EVENT_BUS.fireChannel(new LaunchingStateChangedEvent(this, LaunchingState.DecompressingNatives)); DecompressLibraryJob job = service.version().getDecompressLibraries(loader.getMinecraftVersion()); - if (!HMCAPI.EVENT_BUS.fireChannelResulted(new DecompressLibrariesEvent(this, job))) + if (!HMCLApi.EVENT_BUS.fireChannelResulted(new DecompressLibrariesEvent(this, job))) throw new GameException("Failed to decompress natives"); - HMCAPI.EVENT_BUS.fireChannel(new LaunchSucceededEvent(this, loader.makeLaunchingCommand())); + HMCLApi.EVENT_BUS.fireChannel(new LaunchSucceededEvent(this, loader.makeLaunchingCommand())); } /** @@ -148,9 +163,9 @@ public class GameLauncher { throw new Error("Fucking bug!"); builder.redirectErrorStream(true).directory(service.version().getRunDirectory(options.getLaunchVersion())) .environment().put("APPDATA", service.baseDirectory().getAbsolutePath()); - JavaProcess jp = new JavaProcess(str, builder.start(), PROCESS_MANAGER); + JavaProcess jp = new JavaProcess(str, builder.start()); HMCLog.log("Have started the process"); - HMCAPI.EVENT_BUS.fireChannel(new LaunchEvent(this, jp)); + HMCLApi.EVENT_BUS.fireChannel(new LaunchEvent(this, jp)); } /** diff --git a/HMCL/src/core/java/org/jackhuang/hellominecraft/launcher/core/launch/IAssetProvider.java b/HMCLCore/src/main/java/org/jackhuang/hmcl/core/launch/IAssetProvider.java similarity index 81% rename from HMCL/src/core/java/org/jackhuang/hellominecraft/launcher/core/launch/IAssetProvider.java rename to HMCLCore/src/main/java/org/jackhuang/hmcl/core/launch/IAssetProvider.java index a21473103..8b5e54476 100644 --- a/HMCL/src/core/java/org/jackhuang/hellominecraft/launcher/core/launch/IAssetProvider.java +++ b/HMCLCore/src/main/java/org/jackhuang/hmcl/core/launch/IAssetProvider.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.launch; +package org.jackhuang.hmcl.core.launch; -import org.jackhuang.hellominecraft.launcher.core.GameException; -import org.jackhuang.hellominecraft.launcher.core.version.MinecraftVersion; +import org.jackhuang.hmcl.core.GameException; +import org.jackhuang.hmcl.core.version.MinecraftVersion; /** * diff --git a/HMCL/src/core/java/org/jackhuang/hellominecraft/launcher/core/launch/LibraryDownloadTask.java b/HMCLCore/src/main/java/org/jackhuang/hmcl/core/launch/LibraryDownloadTask.java old mode 100755 new mode 100644 similarity index 77% rename from HMCL/src/core/java/org/jackhuang/hellominecraft/launcher/core/launch/LibraryDownloadTask.java rename to HMCLCore/src/main/java/org/jackhuang/hmcl/core/launch/LibraryDownloadTask.java index d88e5f557..b025288f2 --- a/HMCL/src/core/java/org/jackhuang/hellominecraft/launcher/core/launch/LibraryDownloadTask.java +++ b/HMCLCore/src/main/java/org/jackhuang/hmcl/core/launch/LibraryDownloadTask.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.launch; +package org.jackhuang.hmcl.core.launch; -import org.jackhuang.hellominecraft.util.C; -import org.jackhuang.hellominecraft.launcher.api.event.launch.DownloadLibraryJob; -import org.jackhuang.hellominecraft.util.net.FileDownloadTask; +import org.jackhuang.hmcl.util.C; +import org.jackhuang.hmcl.api.event.launch.DownloadLibraryJob; +import org.jackhuang.hmcl.util.net.FileDownloadTask; /** * @@ -36,7 +36,7 @@ public class LibraryDownloadTask extends FileDownloadTask { @Override public String getInfo() { - return C.i18n("download") + ": " + job.lib.name; + return C.i18n("download") + ": " + job.lib.getName(); } } diff --git a/HMCL/src/core/java/org/jackhuang/hellominecraft/launcher/core/launch/MinecraftLoader.java b/HMCLCore/src/main/java/org/jackhuang/hmcl/core/launch/MinecraftLoader.java old mode 100755 new mode 100644 similarity index 88% rename from HMCL/src/core/java/org/jackhuang/hellominecraft/launcher/core/launch/MinecraftLoader.java rename to HMCLCore/src/main/java/org/jackhuang/hmcl/core/launch/MinecraftLoader.java index 80422cb78..e0f758e0a --- a/HMCL/src/core/java/org/jackhuang/hellominecraft/launcher/core/launch/MinecraftLoader.java +++ b/HMCLCore/src/main/java/org/jackhuang/hmcl/core/launch/MinecraftLoader.java @@ -15,21 +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.launch; +package org.jackhuang.hmcl.core.launch; +import org.jackhuang.hmcl.api.game.LaunchOptions; import java.io.File; import java.io.IOException; import java.util.ArrayList; import java.util.List; import java.util.Locale; -import org.jackhuang.hellominecraft.util.StrUtils; -import org.jackhuang.hellominecraft.util.log.HMCLog; -import org.jackhuang.hellominecraft.util.sys.IOUtils; -import org.jackhuang.hellominecraft.util.sys.OS; -import org.jackhuang.hellominecraft.launcher.core.GameException; -import org.jackhuang.hellominecraft.launcher.core.auth.UserProfileProvider; -import org.jackhuang.hellominecraft.launcher.core.version.MinecraftLibrary; -import org.jackhuang.hellominecraft.launcher.core.service.IMinecraftService; +import org.jackhuang.hmcl.util.StrUtils; +import org.jackhuang.hmcl.api.HMCLog; +import org.jackhuang.hmcl.util.sys.IOUtils; +import org.jackhuang.hmcl.util.sys.OS; +import org.jackhuang.hmcl.core.GameException; +import org.jackhuang.hmcl.api.auth.UserProfileProvider; +import org.jackhuang.hmcl.core.version.MinecraftLibrary; +import org.jackhuang.hmcl.core.service.IMinecraftService; /** * @@ -47,7 +48,7 @@ public class MinecraftLoader extends AbstractMinecraftLoader { ArrayList opt = new ArrayList<>(); for (MinecraftLibrary l : version.libraries) if (l.allow() && !l.isRequiredToUnzip()) { - if (l.name.toLowerCase(Locale.US).contains("optifine")) { + if (l.getName().toLowerCase(Locale.US).contains("optifine")) { opt.add(l); continue; } diff --git a/HMCL/src/core/java/org/jackhuang/hellominecraft/launcher/core/mod/MinecraftModService.java b/HMCLCore/src/main/java/org/jackhuang/hmcl/core/mod/MinecraftModService.java old mode 100755 new mode 100644 similarity index 91% rename from HMCL/src/core/java/org/jackhuang/hellominecraft/launcher/core/mod/MinecraftModService.java rename to HMCLCore/src/main/java/org/jackhuang/hmcl/core/mod/MinecraftModService.java index 231096434..69d12ef09 --- a/HMCL/src/core/java/org/jackhuang/hellominecraft/launcher/core/mod/MinecraftModService.java +++ b/HMCLCore/src/main/java/org/jackhuang/hmcl/core/mod/MinecraftModService.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.mod; +package org.jackhuang.hmcl.core.mod; import java.io.File; import java.io.IOException; @@ -24,10 +24,10 @@ import java.util.Collections; import java.util.HashMap; import java.util.List; import java.util.Map; -import org.jackhuang.hellominecraft.util.log.HMCLog; -import org.jackhuang.hellominecraft.launcher.core.service.IMinecraftModService; -import org.jackhuang.hellominecraft.launcher.core.service.IMinecraftService; -import org.jackhuang.hellominecraft.util.sys.FileUtils; +import org.jackhuang.hmcl.api.HMCLog; +import org.jackhuang.hmcl.core.service.IMinecraftModService; +import org.jackhuang.hmcl.core.service.IMinecraftService; +import org.jackhuang.hmcl.util.sys.FileUtils; /** * diff --git a/HMCL/src/core/java/org/jackhuang/hellominecraft/launcher/core/mod/ModAdviser.java b/HMCLCore/src/main/java/org/jackhuang/hmcl/core/mod/ModAdviser.java similarity index 94% rename from HMCL/src/core/java/org/jackhuang/hellominecraft/launcher/core/mod/ModAdviser.java rename to HMCLCore/src/main/java/org/jackhuang/hmcl/core/mod/ModAdviser.java index 2cc1e4671..74136fb81 100644 --- a/HMCL/src/core/java/org/jackhuang/hellominecraft/launcher/core/mod/ModAdviser.java +++ b/HMCLCore/src/main/java/org/jackhuang/hmcl/core/mod/ModAdviser.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.mod; +package org.jackhuang.hmcl.core.mod; /** * diff --git a/HMCL/src/core/java/org/jackhuang/hellominecraft/launcher/core/mod/ModInfo.java b/HMCLCore/src/main/java/org/jackhuang/hmcl/core/mod/ModInfo.java old mode 100755 new mode 100644 similarity index 95% rename from HMCL/src/core/java/org/jackhuang/hellominecraft/launcher/core/mod/ModInfo.java rename to HMCLCore/src/main/java/org/jackhuang/hmcl/core/mod/ModInfo.java index a5a1bfb32..f0428c002 --- a/HMCL/src/core/java/org/jackhuang/hellominecraft/launcher/core/mod/ModInfo.java +++ b/HMCLCore/src/main/java/org/jackhuang/hmcl/core/mod/ModInfo.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.mod; +package org.jackhuang.hmcl.core.mod; import com.google.gson.JsonElement; import com.google.gson.JsonObject; @@ -29,10 +29,10 @@ import java.io.InputStreamReader; import java.util.List; import java.util.zip.ZipEntry; import java.util.zip.ZipFile; -import org.jackhuang.hellominecraft.util.C; -import org.jackhuang.hellominecraft.util.log.HMCLog; -import org.jackhuang.hellominecraft.util.StrUtils; -import org.jackhuang.hellominecraft.util.sys.FileUtils; +import org.jackhuang.hmcl.util.C; +import org.jackhuang.hmcl.api.HMCLog; +import org.jackhuang.hmcl.util.StrUtils; +import org.jackhuang.hmcl.util.sys.FileUtils; /** * diff --git a/HMCL/src/core/java/org/jackhuang/hellominecraft/launcher/core/mod/ModpackManager.java b/HMCLCore/src/main/java/org/jackhuang/hmcl/core/mod/ModpackManager.java similarity index 92% rename from HMCL/src/core/java/org/jackhuang/hellominecraft/launcher/core/mod/ModpackManager.java rename to HMCLCore/src/main/java/org/jackhuang/hmcl/core/mod/ModpackManager.java index c7c3f37a9..8628f5940 100644 --- a/HMCL/src/core/java/org/jackhuang/hellominecraft/launcher/core/mod/ModpackManager.java +++ b/HMCLCore/src/main/java/org/jackhuang/hmcl/core/mod/ModpackManager.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.mod; +package org.jackhuang.hmcl.core.mod; import java.awt.Dimension; import java.io.File; @@ -33,21 +33,21 @@ import java.util.concurrent.atomic.AtomicInteger; import java.util.zip.ZipFile; import javax.swing.JFrame; import javax.swing.JOptionPane; -import org.jackhuang.hellominecraft.util.C; -import org.jackhuang.hellominecraft.util.log.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.util.func.CallbackIO; -import org.jackhuang.hellominecraft.util.sys.CompressingUtils; -import org.jackhuang.hellominecraft.util.sys.FileUtils; -import org.jackhuang.hellominecraft.util.sys.ZipEngine; -import org.jackhuang.hellominecraft.util.task.Task; -import org.jackhuang.hellominecraft.util.net.WebPage; -import org.jackhuang.hellominecraft.util.MinecraftVersionRequest; -import org.jackhuang.hellominecraft.util.sys.IOUtils; -import org.jackhuang.hellominecraft.util.task.NoShownTaskException; +import org.jackhuang.hmcl.util.C; +import org.jackhuang.hmcl.api.HMCLog; +import org.jackhuang.hmcl.core.GameException; +import org.jackhuang.hmcl.core.service.IMinecraftProvider; +import org.jackhuang.hmcl.core.service.IMinecraftService; +import org.jackhuang.hmcl.core.version.MinecraftVersion; +import org.jackhuang.hmcl.api.func.CallbackIO; +import org.jackhuang.hmcl.util.sys.CompressingUtils; +import org.jackhuang.hmcl.util.sys.FileUtils; +import org.jackhuang.hmcl.util.sys.ZipEngine; +import org.jackhuang.hmcl.util.task.Task; +import org.jackhuang.hmcl.util.net.WebPage; +import org.jackhuang.hmcl.util.MinecraftVersionRequest; +import org.jackhuang.hmcl.util.sys.IOUtils; +import org.jackhuang.hmcl.util.task.NoShownTaskException; /** * A mod pack(*.zip) includes these things: diff --git a/HMCL/src/core/java/org/jackhuang/hellominecraft/launcher/core/service/IMinecraftAssetService.java b/HMCLCore/src/main/java/org/jackhuang/hmcl/core/service/IMinecraftAssetService.java old mode 100755 new mode 100644 similarity index 84% rename from HMCL/src/core/java/org/jackhuang/hellominecraft/launcher/core/service/IMinecraftAssetService.java rename to HMCLCore/src/main/java/org/jackhuang/hmcl/core/service/IMinecraftAssetService.java index 56f234775..030ae0f1a --- a/HMCL/src/core/java/org/jackhuang/hellominecraft/launcher/core/service/IMinecraftAssetService.java +++ b/HMCLCore/src/main/java/org/jackhuang/hmcl/core/service/IMinecraftAssetService.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.service; +package org.jackhuang.hmcl.core.service; import java.io.File; import java.io.IOException; -import org.jackhuang.hellominecraft.launcher.core.GameException; -import org.jackhuang.hellominecraft.launcher.core.asset.AssetsObject; -import org.jackhuang.hellominecraft.launcher.core.version.AssetIndexDownloadInfo; -import org.jackhuang.hellominecraft.util.task.Task; +import org.jackhuang.hmcl.core.GameException; +import org.jackhuang.hmcl.core.asset.AssetsObject; +import org.jackhuang.hmcl.core.version.AssetIndexDownloadInfo; +import org.jackhuang.hmcl.util.task.Task; /** * diff --git a/HMCL/src/core/java/org/jackhuang/hellominecraft/launcher/core/service/IMinecraftBasicService.java b/HMCLCore/src/main/java/org/jackhuang/hmcl/core/service/IMinecraftBasicService.java old mode 100755 new mode 100644 similarity index 94% rename from HMCL/src/core/java/org/jackhuang/hellominecraft/launcher/core/service/IMinecraftBasicService.java rename to HMCLCore/src/main/java/org/jackhuang/hmcl/core/service/IMinecraftBasicService.java index 8e1cfe830..2ec510b06 --- a/HMCL/src/core/java/org/jackhuang/hellominecraft/launcher/core/service/IMinecraftBasicService.java +++ b/HMCLCore/src/main/java/org/jackhuang/hmcl/core/service/IMinecraftBasicService.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.service; +package org.jackhuang.hmcl.core.service; /** * diff --git a/HMCL/src/core/java/org/jackhuang/hellominecraft/launcher/core/service/IMinecraftDownloadService.java b/HMCLCore/src/main/java/org/jackhuang/hmcl/core/service/IMinecraftDownloadService.java old mode 100755 new mode 100644 similarity index 80% rename from HMCL/src/core/java/org/jackhuang/hellominecraft/launcher/core/service/IMinecraftDownloadService.java rename to HMCLCore/src/main/java/org/jackhuang/hmcl/core/service/IMinecraftDownloadService.java index e28b3d1cf..3d0126bba --- a/HMCL/src/core/java/org/jackhuang/hellominecraft/launcher/core/service/IMinecraftDownloadService.java +++ b/HMCLCore/src/main/java/org/jackhuang/hmcl/core/service/IMinecraftDownloadService.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.service; +package org.jackhuang.hmcl.core.service; import java.io.File; import java.util.List; -import org.jackhuang.hellominecraft.launcher.core.GameException; -import org.jackhuang.hellominecraft.launcher.api.event.launch.DownloadLibraryJob; -import org.jackhuang.hellominecraft.launcher.core.version.MinecraftVersion; -import org.jackhuang.hellominecraft.util.task.Task; +import org.jackhuang.hmcl.core.GameException; +import org.jackhuang.hmcl.api.event.launch.DownloadLibraryJob; +import org.jackhuang.hmcl.core.version.MinecraftVersion; +import org.jackhuang.hmcl.util.task.Task; /** * diff --git a/HMCL/src/core/java/org/jackhuang/hellominecraft/launcher/core/service/IMinecraftInstallerService.java b/HMCLCore/src/main/java/org/jackhuang/hmcl/core/service/IMinecraftInstallerService.java similarity index 83% rename from HMCL/src/core/java/org/jackhuang/hellominecraft/launcher/core/service/IMinecraftInstallerService.java rename to HMCLCore/src/main/java/org/jackhuang/hmcl/core/service/IMinecraftInstallerService.java index 87cef4ec0..04a6bed2c 100644 --- a/HMCL/src/core/java/org/jackhuang/hellominecraft/launcher/core/service/IMinecraftInstallerService.java +++ b/HMCLCore/src/main/java/org/jackhuang/hmcl/core/service/IMinecraftInstallerService.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.service; +package org.jackhuang.hmcl.core.service; -import org.jackhuang.hellominecraft.launcher.core.install.InstallerType; -import org.jackhuang.hellominecraft.launcher.core.install.InstallerVersionList; -import org.jackhuang.hellominecraft.util.task.Task; +import org.jackhuang.hmcl.core.install.InstallerType; +import org.jackhuang.hmcl.core.install.InstallerVersionList; +import org.jackhuang.hmcl.util.task.Task; /** * diff --git a/HMCL/src/core/java/org/jackhuang/hellominecraft/launcher/core/service/IMinecraftLoader.java b/HMCLCore/src/main/java/org/jackhuang/hmcl/core/service/IMinecraftLoader.java old mode 100755 new mode 100644 similarity index 82% rename from HMCL/src/core/java/org/jackhuang/hellominecraft/launcher/core/service/IMinecraftLoader.java rename to HMCLCore/src/main/java/org/jackhuang/hmcl/core/service/IMinecraftLoader.java index 4091b51e7..16c210e4d --- a/HMCL/src/core/java/org/jackhuang/hellominecraft/launcher/core/service/IMinecraftLoader.java +++ b/HMCLCore/src/main/java/org/jackhuang/hmcl/core/service/IMinecraftLoader.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.service; +package org.jackhuang.hmcl.core.service; import java.util.List; -import org.jackhuang.hellominecraft.launcher.core.GameException; -import org.jackhuang.hellominecraft.launcher.core.version.MinecraftVersion; +import org.jackhuang.hmcl.core.GameException; +import org.jackhuang.hmcl.core.version.MinecraftVersion; /** * diff --git a/HMCL/src/core/java/org/jackhuang/hellominecraft/launcher/core/service/IMinecraftModService.java b/HMCLCore/src/main/java/org/jackhuang/hmcl/core/service/IMinecraftModService.java old mode 100755 new mode 100644 similarity index 90% rename from HMCL/src/core/java/org/jackhuang/hellominecraft/launcher/core/service/IMinecraftModService.java rename to HMCLCore/src/main/java/org/jackhuang/hmcl/core/service/IMinecraftModService.java index 46297f208..9e17b288a --- a/HMCL/src/core/java/org/jackhuang/hellominecraft/launcher/core/service/IMinecraftModService.java +++ b/HMCLCore/src/main/java/org/jackhuang/hmcl/core/service/IMinecraftModService.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.service; +package org.jackhuang.hmcl.core.service; import java.io.File; import java.util.List; -import org.jackhuang.hellominecraft.launcher.core.mod.ModInfo; +import org.jackhuang.hmcl.core.mod.ModInfo; /** * diff --git a/HMCL/src/core/java/org/jackhuang/hellominecraft/launcher/core/service/IMinecraftProvider.java b/HMCLCore/src/main/java/org/jackhuang/hmcl/core/service/IMinecraftProvider.java old mode 100755 new mode 100644 similarity index 88% rename from HMCL/src/core/java/org/jackhuang/hellominecraft/launcher/core/service/IMinecraftProvider.java rename to HMCLCore/src/main/java/org/jackhuang/hmcl/core/service/IMinecraftProvider.java index bbb634ca4..02380f5c9 --- a/HMCL/src/core/java/org/jackhuang/hellominecraft/launcher/core/service/IMinecraftProvider.java +++ b/HMCLCore/src/main/java/org/jackhuang/hmcl/core/service/IMinecraftProvider.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.service; +package org.jackhuang.hmcl.core.service; import java.io.File; import java.util.Collection; -import org.jackhuang.hellominecraft.launcher.core.GameException; -import org.jackhuang.hellominecraft.launcher.api.event.launch.DecompressLibraryJob; -import org.jackhuang.hellominecraft.launcher.core.version.MinecraftVersion; -import org.jackhuang.hellominecraft.api.EventHandler; -import org.jackhuang.hellominecraft.util.func.Consumer; -import org.jackhuang.hellominecraft.util.func.Predicate; +import org.jackhuang.hmcl.core.GameException; +import org.jackhuang.hmcl.api.game.DecompressLibraryJob; +import org.jackhuang.hmcl.core.version.MinecraftVersion; +import org.jackhuang.hmcl.api.event.EventHandler; +import org.jackhuang.hmcl.api.func.Consumer; +import org.jackhuang.hmcl.api.func.Predicate; /** * Provide everything of the Minecraft of a Profile. * * @see - * org.jackhuang.hellominecraft.launcher.core.version.MinecraftVersionManager + * org.jackhuang.hmcl.core.version.MinecraftVersionManager * @author huangyuhui */ public abstract class IMinecraftProvider { diff --git a/HMCL/src/core/java/org/jackhuang/hellominecraft/launcher/core/service/IMinecraftService.java b/HMCLCore/src/main/java/org/jackhuang/hmcl/core/service/IMinecraftService.java similarity index 79% rename from HMCL/src/core/java/org/jackhuang/hellominecraft/launcher/core/service/IMinecraftService.java rename to HMCLCore/src/main/java/org/jackhuang/hmcl/core/service/IMinecraftService.java index 9989981e1..0496e8678 100644 --- a/HMCL/src/core/java/org/jackhuang/hellominecraft/launcher/core/service/IMinecraftService.java +++ b/HMCLCore/src/main/java/org/jackhuang/hmcl/core/service/IMinecraftService.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.launcher.core.service; +package org.jackhuang.hmcl.core.service; import java.io.File; -import org.jackhuang.hellominecraft.launcher.core.GameException; -import org.jackhuang.hellominecraft.launcher.core.auth.UserProfileProvider; -import org.jackhuang.hellominecraft.launcher.core.download.DownloadType; -import org.jackhuang.hellominecraft.launcher.core.launch.LaunchOptions; +import org.jackhuang.hmcl.core.GameException; +import org.jackhuang.hmcl.api.auth.UserProfileProvider; +import org.jackhuang.hmcl.core.download.DownloadType; +import org.jackhuang.hmcl.api.game.LaunchOptions; /** * @@ -48,7 +48,7 @@ public abstract class IMinecraftService { /** * Provide the Minecraft Loader to generate the launching command. * - * @see org.jackhuang.hellominecraft.launcher.core.service.IMinecraftLoader + * @see org.jackhuang.hmcl.core.service.IMinecraftLoader * @param p player informations, including username & auth_token * * @return what you want diff --git a/HMCL/src/core/java/org/jackhuang/hellominecraft/launcher/core/version/IMinecraftLibrary.java b/HMCLCore/src/main/java/org/jackhuang/hmcl/core/version/AbstractMinecraftLibrary.java old mode 100755 new mode 100644 similarity index 69% rename from HMCL/src/core/java/org/jackhuang/hellominecraft/launcher/core/version/IMinecraftLibrary.java rename to HMCLCore/src/main/java/org/jackhuang/hmcl/core/version/AbstractMinecraftLibrary.java index 5de53abe4..66c204e4a --- a/HMCL/src/core/java/org/jackhuang/hellominecraft/launcher/core/version/IMinecraftLibrary.java +++ b/HMCLCore/src/main/java/org/jackhuang/hmcl/core/version/AbstractMinecraftLibrary.java @@ -15,36 +15,39 @@ * You should have received a copy of the GNU General Public License * along with this program. If not, see {http://www.gnu.org/licenses/}. */ -package org.jackhuang.hellominecraft.launcher.core.version; +package org.jackhuang.hmcl.core.version; -import java.io.File; +import org.jackhuang.hmcl.core.download.DownloadType; +import org.jackhuang.hmcl.api.game.IMinecraftLibrary; /** * * @author huangyuhui */ -public abstract class IMinecraftLibrary implements Cloneable { +public abstract class AbstractMinecraftLibrary implements IMinecraftLibrary { - public String name; + private String name; - public IMinecraftLibrary(String name) { + public AbstractMinecraftLibrary(String name) { this.name = name; } - public abstract boolean isRequiredToUnzip(); - - public abstract Extract getDecompressExtractRules(); + @Override + public String getName() { + return name; + } public abstract LibraryDownloadInfo getDownloadInfo(); - public abstract boolean allow(); - - public abstract File getFilePath(File gameDir); + @Override + public String getDownloadURL(String downloadSource) { + return getDownloadInfo().getUrl(DownloadType.valueOf(downloadSource)); + } @Override public boolean equals(Object obj) { if (obj instanceof MinecraftLibrary) - return ((MinecraftLibrary) obj).name.equals(name); + return ((MinecraftLibrary) obj).getName().equals(name); return false; } diff --git a/HMCL/src/core/java/org/jackhuang/hellominecraft/launcher/core/version/AssetIndexDownloadInfo.java b/HMCLCore/src/main/java/org/jackhuang/hmcl/core/version/AssetIndexDownloadInfo.java similarity index 90% rename from HMCL/src/core/java/org/jackhuang/hellominecraft/launcher/core/version/AssetIndexDownloadInfo.java rename to HMCLCore/src/main/java/org/jackhuang/hmcl/core/version/AssetIndexDownloadInfo.java index 7d6bf460f..bce033abb 100644 --- a/HMCL/src/core/java/org/jackhuang/hellominecraft/launcher/core/version/AssetIndexDownloadInfo.java +++ b/HMCLCore/src/main/java/org/jackhuang/hmcl/core/version/AssetIndexDownloadInfo.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.core.version; +package org.jackhuang.hmcl.core.version; -import org.jackhuang.hellominecraft.launcher.core.download.DownloadType; +import org.jackhuang.hmcl.core.download.DownloadType; /** * diff --git a/HMCL/src/core/java/org/jackhuang/hellominecraft/launcher/core/version/GameDownloadInfo.java b/HMCLCore/src/main/java/org/jackhuang/hmcl/core/version/GameDownloadInfo.java similarity index 94% rename from HMCL/src/core/java/org/jackhuang/hellominecraft/launcher/core/version/GameDownloadInfo.java rename to HMCLCore/src/main/java/org/jackhuang/hmcl/core/version/GameDownloadInfo.java index 84be2d46e..06bf6e4db 100644 --- a/HMCL/src/core/java/org/jackhuang/hellominecraft/launcher/core/version/GameDownloadInfo.java +++ b/HMCLCore/src/main/java/org/jackhuang/hmcl/core/version/GameDownloadInfo.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.version; +package org.jackhuang.hmcl.core.version; import com.google.gson.annotations.SerializedName; -import org.jackhuang.hellominecraft.launcher.core.download.DownloadType; +import org.jackhuang.hmcl.core.download.DownloadType; /** * diff --git a/HMCL/src/core/java/org/jackhuang/hellominecraft/launcher/core/version/LibrariesDownloadInfo.java b/HMCLCore/src/main/java/org/jackhuang/hmcl/core/version/LibrariesDownloadInfo.java similarity index 94% rename from HMCL/src/core/java/org/jackhuang/hellominecraft/launcher/core/version/LibrariesDownloadInfo.java rename to HMCLCore/src/main/java/org/jackhuang/hmcl/core/version/LibrariesDownloadInfo.java index 454633ced..7aeb0f250 100644 --- a/HMCL/src/core/java/org/jackhuang/hellominecraft/launcher/core/version/LibrariesDownloadInfo.java +++ b/HMCLCore/src/main/java/org/jackhuang/hmcl/core/version/LibrariesDownloadInfo.java @@ -15,7 +15,7 @@ * You should have received a copy of the GNU General Public License * along with this program. If not, see {http://www.gnu.org/licenses/}. */ -package org.jackhuang.hellominecraft.launcher.core.version; +package org.jackhuang.hmcl.core.version; import com.google.gson.annotations.SerializedName; import java.util.Map; diff --git a/HMCL/src/core/java/org/jackhuang/hellominecraft/launcher/core/version/LibraryDownloadInfo.java b/HMCLCore/src/main/java/org/jackhuang/hmcl/core/version/LibraryDownloadInfo.java similarity index 86% rename from HMCL/src/core/java/org/jackhuang/hellominecraft/launcher/core/version/LibraryDownloadInfo.java rename to HMCLCore/src/main/java/org/jackhuang/hmcl/core/version/LibraryDownloadInfo.java index 08b2e2e17..b184ef54c 100644 --- a/HMCL/src/core/java/org/jackhuang/hellominecraft/launcher/core/version/LibraryDownloadInfo.java +++ b/HMCLCore/src/main/java/org/jackhuang/hmcl/core/version/LibraryDownloadInfo.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.version; +package org.jackhuang.hmcl.core.version; import com.google.gson.annotations.SerializedName; -import org.jackhuang.hellominecraft.launcher.core.download.DownloadType; -import org.jackhuang.hellominecraft.util.StrUtils; -import org.jackhuang.hellominecraft.util.sys.IOUtils; +import org.jackhuang.hmcl.core.download.DownloadType; +import org.jackhuang.hmcl.util.StrUtils; +import org.jackhuang.hmcl.util.sys.IOUtils; /** * diff --git a/HMCL/src/core/java/org/jackhuang/hellominecraft/launcher/core/version/MinecraftClassicVersion.java b/HMCLCore/src/main/java/org/jackhuang/hmcl/core/version/MinecraftClassicVersion.java old mode 100755 new mode 100644 similarity index 93% rename from HMCL/src/core/java/org/jackhuang/hellominecraft/launcher/core/version/MinecraftClassicVersion.java rename to HMCLCore/src/main/java/org/jackhuang/hmcl/core/version/MinecraftClassicVersion.java index d2ecd71d5..74ce888c5 --- a/HMCL/src/core/java/org/jackhuang/hellominecraft/launcher/core/version/MinecraftClassicVersion.java +++ b/HMCLCore/src/main/java/org/jackhuang/hmcl/core/version/MinecraftClassicVersion.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.version; +package org.jackhuang.hmcl.core.version; import java.io.File; import java.util.ArrayList; import java.util.Set; -import org.jackhuang.hellominecraft.launcher.core.service.IMinecraftProvider; +import org.jackhuang.hmcl.core.service.IMinecraftProvider; /** * diff --git a/HMCL/src/core/java/org/jackhuang/hellominecraft/launcher/core/version/MinecraftLibrary.java b/HMCLCore/src/main/java/org/jackhuang/hmcl/core/version/MinecraftLibrary.java old mode 100755 new mode 100644 similarity index 87% rename from HMCL/src/core/java/org/jackhuang/hellominecraft/launcher/core/version/MinecraftLibrary.java rename to HMCLCore/src/main/java/org/jackhuang/hmcl/core/version/MinecraftLibrary.java index ada7006da..228eff012 --- a/HMCL/src/core/java/org/jackhuang/hellominecraft/launcher/core/version/MinecraftLibrary.java +++ b/HMCLCore/src/main/java/org/jackhuang/hmcl/core/version/MinecraftLibrary.java @@ -15,24 +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.core.version; +package org.jackhuang.hmcl.core.version; +import org.jackhuang.hmcl.api.game.Extract; import com.google.gson.annotations.SerializedName; import java.io.File; import java.util.ArrayList; import java.util.HashMap; -import org.jackhuang.hellominecraft.api.HMCAPI; -import org.jackhuang.hellominecraft.launcher.api.event.version.MinecraftLibraryPathEvent; -import org.jackhuang.hellominecraft.util.sys.OS; -import org.jackhuang.hellominecraft.util.sys.Platform; -import org.jackhuang.hellominecraft.util.StrUtils; -import org.jackhuang.hellominecraft.util.Wrapper; +import org.jackhuang.hmcl.api.HMCLApi; +import org.jackhuang.hmcl.api.event.version.MinecraftLibraryPathEvent; +import org.jackhuang.hmcl.util.sys.OS; +import org.jackhuang.hmcl.util.sys.Platform; +import org.jackhuang.hmcl.util.StrUtils; +import org.jackhuang.hmcl.api.Wrapper; /** * * @author huangyuhui */ -public class MinecraftLibrary extends IMinecraftLibrary { +public class MinecraftLibrary extends AbstractMinecraftLibrary { @SerializedName("rules") public ArrayList rules; @@ -91,9 +92,9 @@ public class MinecraftLibrary extends IMinecraftLibrary { } public String formatName() { - if (name == null) + if (getName() == null) return null; - String[] s = name.split(":"); + String[] s = getName().split(":"); if (s.length < 3) return null; StringBuilder sb = new StringBuilder(s[0].replace('.', '/')).append('/').append(s[1]).append('/').append(s[2]).append('/').append(s[1]).append('-').append(s[2]); @@ -108,7 +109,7 @@ public class MinecraftLibrary extends IMinecraftLibrary { if (info == null) return null; MinecraftLibraryPathEvent event = new MinecraftLibraryPathEvent(this, "libraries/" + info.path, new Wrapper<>(new File(gameDir, "libraries/" + info.path))); - HMCAPI.EVENT_BUS.fireChannel(event); + HMCLApi.EVENT_BUS.fireChannel(event); return event.getFile().getValue(); } @@ -119,7 +120,7 @@ public class MinecraftLibrary extends IMinecraftLibrary { @Override public LibraryDownloadInfo getDownloadInfo() { - if (name == null) + if (getName() == null) return null; if (downloads == null) downloads = new LibrariesDownloadInfo(); diff --git a/HMCL/src/core/java/org/jackhuang/hellominecraft/launcher/core/version/MinecraftOldLibrary.java b/HMCLCore/src/main/java/org/jackhuang/hmcl/core/version/MinecraftOldLibrary.java old mode 100755 new mode 100644 similarity index 91% rename from HMCL/src/core/java/org/jackhuang/hellominecraft/launcher/core/version/MinecraftOldLibrary.java rename to HMCLCore/src/main/java/org/jackhuang/hmcl/core/version/MinecraftOldLibrary.java index 96d7425ea..85636ca8a --- a/HMCL/src/core/java/org/jackhuang/hellominecraft/launcher/core/version/MinecraftOldLibrary.java +++ b/HMCLCore/src/main/java/org/jackhuang/hmcl/core/version/MinecraftOldLibrary.java @@ -15,7 +15,7 @@ * You should have received a copy of the GNU General Public License * along with this program. If not, see {http://www.gnu.org/licenses/}. */ -package org.jackhuang.hellominecraft.launcher.core.version; +package org.jackhuang.hmcl.core.version; import java.io.File; @@ -41,7 +41,7 @@ public class MinecraftOldLibrary extends MinecraftLibrary { @Override public File getFilePath(File gameDir) { - return new File(gameDir, "bin/" + name + ".jar"); + return new File(gameDir, "bin/" + getName() + ".jar"); } @Override diff --git a/HMCL/src/core/java/org/jackhuang/hellominecraft/launcher/core/version/MinecraftVersion.java b/HMCLCore/src/main/java/org/jackhuang/hmcl/core/version/MinecraftVersion.java old mode 100755 new mode 100644 similarity index 95% rename from HMCL/src/core/java/org/jackhuang/hellominecraft/launcher/core/version/MinecraftVersion.java rename to HMCLCore/src/main/java/org/jackhuang/hmcl/core/version/MinecraftVersion.java index 16fc0e3e3..98d0d9775 --- a/HMCL/src/core/java/org/jackhuang/hellominecraft/launcher/core/version/MinecraftVersion.java +++ b/HMCLCore/src/main/java/org/jackhuang/hmcl/core/version/MinecraftVersion.java @@ -15,8 +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.core.version; +package org.jackhuang.hmcl.core.version; +import org.jackhuang.hmcl.api.game.IMinecraftLibrary; import com.google.gson.annotations.SerializedName; import java.io.File; import java.util.ArrayList; @@ -26,11 +27,11 @@ import java.util.List; import java.util.Map; import java.util.Objects; import java.util.Set; -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.asset.AssetsIndex; -import org.jackhuang.hellominecraft.util.ArrayUtils; +import org.jackhuang.hmcl.util.C; +import org.jackhuang.hmcl.core.GameException; +import org.jackhuang.hmcl.core.service.IMinecraftProvider; +import org.jackhuang.hmcl.core.asset.AssetsIndex; +import org.jackhuang.hmcl.util.ArrayUtils; /** * diff --git a/HMCL/src/core/java/org/jackhuang/hellominecraft/launcher/core/version/MinecraftVersionManager.java b/HMCLCore/src/main/java/org/jackhuang/hmcl/core/version/MinecraftVersionManager.java old mode 100755 new mode 100644 similarity index 87% rename from HMCL/src/core/java/org/jackhuang/hellominecraft/launcher/core/version/MinecraftVersionManager.java rename to HMCLCore/src/main/java/org/jackhuang/hmcl/core/version/MinecraftVersionManager.java index 2eedae4c0..563fc2363 --- a/HMCL/src/core/java/org/jackhuang/hellominecraft/launcher/core/version/MinecraftVersionManager.java +++ b/HMCLCore/src/main/java/org/jackhuang/hmcl/core/version/MinecraftVersionManager.java @@ -15,9 +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.version; +package org.jackhuang.hmcl.core.version; -import org.jackhuang.hellominecraft.launcher.api.event.launch.DecompressLibraryJob; +import org.jackhuang.hmcl.api.game.Extract; +import org.jackhuang.hmcl.api.game.IMinecraftLibrary; +import org.jackhuang.hmcl.api.game.DecompressLibraryJob; import com.google.gson.JsonSyntaxException; import java.io.File; import java.io.IOException; @@ -25,24 +27,24 @@ import java.util.ArrayList; import java.util.Collection; import java.util.Map; import java.util.TreeMap; -import org.jackhuang.hellominecraft.api.HMCAPI; -import org.jackhuang.hellominecraft.launcher.api.event.version.LoadedOneVersionEvent; -import org.jackhuang.hellominecraft.launcher.api.event.version.RefreshedVersionsEvent; -import org.jackhuang.hellominecraft.launcher.api.event.version.RefreshingVersionsEvent; -import org.jackhuang.hellominecraft.util.C; -import org.jackhuang.hellominecraft.util.log.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.util.sys.FileUtils; -import org.jackhuang.hellominecraft.launcher.core.MCUtils; -import org.jackhuang.hellominecraft.util.task.TaskWindow; -import org.jackhuang.hellominecraft.util.sys.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.func.Predicate; -import org.jackhuang.hellominecraft.util.ui.SwingUtils; +import org.jackhuang.hmcl.api.HMCLApi; +import org.jackhuang.hmcl.api.event.version.LoadedOneVersionEvent; +import org.jackhuang.hmcl.api.event.version.RefreshedVersionsEvent; +import org.jackhuang.hmcl.api.event.version.RefreshingVersionsEvent; +import org.jackhuang.hmcl.util.C; +import org.jackhuang.hmcl.api.HMCLog; +import org.jackhuang.hmcl.core.GameException; +import org.jackhuang.hmcl.core.service.IMinecraftProvider; +import org.jackhuang.hmcl.core.service.IMinecraftService; +import org.jackhuang.hmcl.util.sys.FileUtils; +import org.jackhuang.hmcl.core.MCUtils; +import org.jackhuang.hmcl.util.task.TaskWindow; +import org.jackhuang.hmcl.util.sys.IOUtils; +import org.jackhuang.hmcl.util.MessageBox; +import org.jackhuang.hmcl.util.StrUtils; +import org.jackhuang.hmcl.api.func.Consumer; +import org.jackhuang.hmcl.api.func.Predicate; +import org.jackhuang.hmcl.util.ui.SwingUtils; /** * @@ -72,7 +74,7 @@ public class MinecraftVersionManager extends IMinecraftProvider { @Override public synchronized void refreshVersions() { - HMCAPI.EVENT_BUS.fireChannel(new RefreshingVersionsEvent(this, service)); + HMCLApi.EVENT_BUS.fireChannel(new RefreshingVersionsEvent(this)); try { MCUtils.tryWriteProfile(service.baseDirectory()); @@ -142,12 +144,12 @@ public class MinecraftVersionManager extends IMinecraftProvider { } versions.put(id, mcVersion); - HMCAPI.EVENT_BUS.fireChannel(new LoadedOneVersionEvent(this, id)); + HMCLApi.EVENT_BUS.fireChannel(new LoadedOneVersionEvent(this, id)); } catch (Exception e) { HMCLog.warn("Ignoring: " + dir + ", the json of this Minecraft is malformed.", e); } } - HMCAPI.EVENT_BUS.fireChannel(new RefreshedVersionsEvent(this, service)); + HMCLApi.EVENT_BUS.fireChannel(new RefreshedVersionsEvent(this)); } @Override diff --git a/HMCL/src/core/java/org/jackhuang/hellominecraft/launcher/core/version/Natives.java b/HMCLCore/src/main/java/org/jackhuang/hmcl/core/version/Natives.java old mode 100755 new mode 100644 similarity index 95% rename from HMCL/src/core/java/org/jackhuang/hellominecraft/launcher/core/version/Natives.java rename to HMCLCore/src/main/java/org/jackhuang/hmcl/core/version/Natives.java index e7f05983c..47ad558d0 --- a/HMCL/src/core/java/org/jackhuang/hellominecraft/launcher/core/version/Natives.java +++ b/HMCLCore/src/main/java/org/jackhuang/hmcl/core/version/Natives.java @@ -15,7 +15,7 @@ * You should have received a copy of the GNU General Public License * along with this program. If not, see {http://www.gnu.org/licenses/}. */ -package org.jackhuang.hellominecraft.launcher.core.version; +package org.jackhuang.hmcl.core.version; import com.google.gson.annotations.SerializedName; diff --git a/HMCL/src/core/java/org/jackhuang/hellominecraft/launcher/core/version/OSRestriction.java b/HMCLCore/src/main/java/org/jackhuang/hmcl/core/version/OSRestriction.java old mode 100755 new mode 100644 similarity index 89% rename from HMCL/src/core/java/org/jackhuang/hellominecraft/launcher/core/version/OSRestriction.java rename to HMCLCore/src/main/java/org/jackhuang/hmcl/core/version/OSRestriction.java index d881ce07b..4297d2e0d --- a/HMCL/src/core/java/org/jackhuang/hellominecraft/launcher/core/version/OSRestriction.java +++ b/HMCLCore/src/main/java/org/jackhuang/hmcl/core/version/OSRestriction.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.version; +package org.jackhuang.hmcl.core.version; import com.google.gson.annotations.SerializedName; -import org.jackhuang.hellominecraft.util.StrUtils; -import org.jackhuang.hellominecraft.util.sys.OS; +import org.jackhuang.hmcl.util.StrUtils; +import org.jackhuang.hmcl.util.sys.OS; /** * diff --git a/HMCL/src/core/java/org/jackhuang/hellominecraft/launcher/core/version/Rules.java b/HMCLCore/src/main/java/org/jackhuang/hmcl/core/version/Rules.java old mode 100755 new mode 100644 similarity index 94% rename from HMCL/src/core/java/org/jackhuang/hellominecraft/launcher/core/version/Rules.java rename to HMCLCore/src/main/java/org/jackhuang/hmcl/core/version/Rules.java index 0d792759a..8e455eaa9 --- a/HMCL/src/core/java/org/jackhuang/hellominecraft/launcher/core/version/Rules.java +++ b/HMCLCore/src/main/java/org/jackhuang/hmcl/core/version/Rules.java @@ -15,7 +15,7 @@ * You should have received a copy of the GNU General Public License * along with this program. If not, see {http://www.gnu.org/licenses/}. */ -package org.jackhuang.hellominecraft.launcher.core.version; +package org.jackhuang.hmcl.core.version; import com.google.gson.annotations.SerializedName; diff --git a/HMCUtils/src/main/java/org/jackhuang/hellominecraft/util/AbstractSwingWorker.java b/HMCLCore/src/main/java/org/jackhuang/hmcl/util/AbstractSwingWorker.java similarity index 95% rename from HMCUtils/src/main/java/org/jackhuang/hellominecraft/util/AbstractSwingWorker.java rename to HMCLCore/src/main/java/org/jackhuang/hmcl/util/AbstractSwingWorker.java index 6a3f0fa4c..f3a12082b 100644 --- a/HMCUtils/src/main/java/org/jackhuang/hellominecraft/util/AbstractSwingWorker.java +++ b/HMCLCore/src/main/java/org/jackhuang/hmcl/util/AbstractSwingWorker.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.util; +package org.jackhuang.hmcl.util; import java.util.ArrayList; import java.util.Arrays; import java.util.List; import java.util.Objects; import javax.swing.SwingWorker; -import org.jackhuang.hellominecraft.util.func.Consumer; +import org.jackhuang.hmcl.api.func.Consumer; /** * diff --git a/HMCUtils/src/main/java/org/jackhuang/hellominecraft/util/ArrayUtils.java b/HMCLCore/src/main/java/org/jackhuang/hmcl/util/ArrayUtils.java old mode 100755 new mode 100644 similarity index 98% rename from HMCUtils/src/main/java/org/jackhuang/hellominecraft/util/ArrayUtils.java rename to HMCLCore/src/main/java/org/jackhuang/hmcl/util/ArrayUtils.java index 4fb48c1d4..edc43cc33 --- a/HMCUtils/src/main/java/org/jackhuang/hellominecraft/util/ArrayUtils.java +++ b/HMCLCore/src/main/java/org/jackhuang/hmcl/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.util; +package org.jackhuang.hmcl.util; import java.util.ArrayList; import java.util.Arrays; diff --git a/HMCUtils/src/main/java/org/jackhuang/hellominecraft/util/C.java b/HMCLCore/src/main/java/org/jackhuang/hmcl/util/C.java old mode 100755 new mode 100644 similarity index 94% rename from HMCUtils/src/main/java/org/jackhuang/hellominecraft/util/C.java rename to HMCLCore/src/main/java/org/jackhuang/hmcl/util/C.java index 8dba3ae2b..69876b010 --- a/HMCUtils/src/main/java/org/jackhuang/hellominecraft/util/C.java +++ b/HMCLCore/src/main/java/org/jackhuang/hmcl/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.util; +package org.jackhuang.hmcl.util; -import org.jackhuang.hellominecraft.util.lang.SupportedLocales; +import org.jackhuang.hmcl.util.lang.SupportedLocales; import com.google.gson.Gson; import com.google.gson.GsonBuilder; diff --git a/HMCUtils/src/main/java/org/jackhuang/hellominecraft/util/CollectionUtils.java b/HMCLCore/src/main/java/org/jackhuang/hmcl/util/CollectionUtils.java old mode 100755 new mode 100644 similarity index 93% rename from HMCUtils/src/main/java/org/jackhuang/hellominecraft/util/CollectionUtils.java rename to HMCLCore/src/main/java/org/jackhuang/hmcl/util/CollectionUtils.java index cbd840607..762649bfc --- a/HMCUtils/src/main/java/org/jackhuang/hellominecraft/util/CollectionUtils.java +++ b/HMCLCore/src/main/java/org/jackhuang/hmcl/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.util; +package org.jackhuang.hmcl.util; -import org.jackhuang.hellominecraft.util.func.Predicate; +import org.jackhuang.hmcl.api.func.Predicate; import java.util.ArrayList; import java.util.Collection; import java.util.Iterator; diff --git a/HMCUtils/src/main/java/org/jackhuang/hellominecraft/util/DoubleOutputStream.java b/HMCLCore/src/main/java/org/jackhuang/hmcl/util/DoubleOutputStream.java old mode 100755 new mode 100644 similarity index 98% rename from HMCUtils/src/main/java/org/jackhuang/hellominecraft/util/DoubleOutputStream.java rename to HMCLCore/src/main/java/org/jackhuang/hmcl/util/DoubleOutputStream.java index c4d21d472..37b20128d --- a/HMCUtils/src/main/java/org/jackhuang/hellominecraft/util/DoubleOutputStream.java +++ b/HMCLCore/src/main/java/org/jackhuang/hmcl/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.util; +package org.jackhuang.hmcl.util; import java.io.IOException; import java.io.OutputStream; diff --git a/HMCUtils/src/main/java/org/jackhuang/hellominecraft/util/IUpdateChecker.java b/HMCLCore/src/main/java/org/jackhuang/hmcl/util/IUpdateChecker.java old mode 100755 new mode 100644 similarity index 95% rename from HMCUtils/src/main/java/org/jackhuang/hellominecraft/util/IUpdateChecker.java rename to HMCLCore/src/main/java/org/jackhuang/hmcl/util/IUpdateChecker.java index 1bedf7225..dce9baa7b --- a/HMCUtils/src/main/java/org/jackhuang/hellominecraft/util/IUpdateChecker.java +++ b/HMCLCore/src/main/java/org/jackhuang/hmcl/util/IUpdateChecker.java @@ -15,8 +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.util; +package org.jackhuang.hmcl.util; +import org.jackhuang.hmcl.api.VersionNumber; import java.util.Map; /** diff --git a/HMCUtils/src/main/java/org/jackhuang/hellominecraft/util/MathUtils.java b/HMCLCore/src/main/java/org/jackhuang/hmcl/util/MathUtils.java old mode 100755 new mode 100644 similarity index 97% rename from HMCUtils/src/main/java/org/jackhuang/hellominecraft/util/MathUtils.java rename to HMCLCore/src/main/java/org/jackhuang/hmcl/util/MathUtils.java index ffb49dadf..b58850e21 --- a/HMCUtils/src/main/java/org/jackhuang/hellominecraft/util/MathUtils.java +++ b/HMCLCore/src/main/java/org/jackhuang/hmcl/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.util; +package org.jackhuang.hmcl.util; /** * diff --git a/HMCUtils/src/main/java/org/jackhuang/hellominecraft/util/MessageBox.java b/HMCLCore/src/main/java/org/jackhuang/hmcl/util/MessageBox.java old mode 100755 new mode 100644 similarity index 97% rename from HMCUtils/src/main/java/org/jackhuang/hellominecraft/util/MessageBox.java rename to HMCLCore/src/main/java/org/jackhuang/hmcl/util/MessageBox.java index 6c4aaad5e..d5bd2bacf --- a/HMCUtils/src/main/java/org/jackhuang/hellominecraft/util/MessageBox.java +++ b/HMCLCore/src/main/java/org/jackhuang/hmcl/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.util; +package org.jackhuang.hmcl.util; -import org.jackhuang.hellominecraft.util.ui.SwingUtils; +import org.jackhuang.hmcl.util.ui.SwingUtils; import javax.swing.JOptionPane; /** diff --git a/HMCUtils/src/main/java/org/jackhuang/hellominecraft/util/MinecraftVersionRequest.java b/HMCLCore/src/main/java/org/jackhuang/hmcl/util/MinecraftVersionRequest.java old mode 100755 new mode 100644 similarity index 97% rename from HMCUtils/src/main/java/org/jackhuang/hellominecraft/util/MinecraftVersionRequest.java rename to HMCLCore/src/main/java/org/jackhuang/hmcl/util/MinecraftVersionRequest.java index a00b13a91..fb62812fa --- a/HMCUtils/src/main/java/org/jackhuang/hellominecraft/util/MinecraftVersionRequest.java +++ b/HMCLCore/src/main/java/org/jackhuang/hmcl/util/MinecraftVersionRequest.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.util; +package org.jackhuang.hmcl.util; import java.io.File; import java.io.IOException; import java.io.Serializable; import java.util.zip.ZipEntry; import java.util.zip.ZipFile; -import org.jackhuang.hellominecraft.util.log.HMCLog; -import org.jackhuang.hellominecraft.util.sys.IOUtils; +import org.jackhuang.hmcl.api.HMCLog; +import org.jackhuang.hmcl.util.sys.IOUtils; /** * @author huangyuhui diff --git a/HMCUtils/src/main/java/org/jackhuang/hellominecraft/util/Pair.java b/HMCLCore/src/main/java/org/jackhuang/hmcl/util/Pair.java old mode 100755 new mode 100644 similarity index 97% rename from HMCUtils/src/main/java/org/jackhuang/hellominecraft/util/Pair.java rename to HMCLCore/src/main/java/org/jackhuang/hmcl/util/Pair.java index 182d54b59..73434805c --- a/HMCUtils/src/main/java/org/jackhuang/hellominecraft/util/Pair.java +++ b/HMCLCore/src/main/java/org/jackhuang/hmcl/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.util; +package org.jackhuang.hmcl.util; import java.util.Map; import java.util.Objects; diff --git a/HMCUtils/src/main/java/org/jackhuang/hellominecraft/util/StrUtils.java b/HMCLCore/src/main/java/org/jackhuang/hmcl/util/StrUtils.java old mode 100755 new mode 100644 similarity index 97% rename from HMCUtils/src/main/java/org/jackhuang/hellominecraft/util/StrUtils.java rename to HMCLCore/src/main/java/org/jackhuang/hmcl/util/StrUtils.java index d6f9db641..206c12729 --- a/HMCUtils/src/main/java/org/jackhuang/hellominecraft/util/StrUtils.java +++ b/HMCLCore/src/main/java/org/jackhuang/hmcl/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.util; +package org.jackhuang.hmcl.util; import java.io.PrintWriter; import java.io.StringWriter; @@ -24,8 +24,8 @@ import java.util.ArrayList; import java.util.Collection; import java.util.List; import java.util.StringTokenizer; -import org.jackhuang.hellominecraft.util.func.Function; -import org.jackhuang.hellominecraft.util.func.Predicate; +import org.jackhuang.hmcl.api.func.Function; +import org.jackhuang.hmcl.api.func.Predicate; /** * diff --git a/HMCUtils/src/main/java/org/jackhuang/hellominecraft/util/UpdateChecker.java b/HMCLCore/src/main/java/org/jackhuang/hmcl/util/UpdateChecker.java old mode 100755 new mode 100644 similarity index 87% rename from HMCUtils/src/main/java/org/jackhuang/hellominecraft/util/UpdateChecker.java rename to HMCLCore/src/main/java/org/jackhuang/hmcl/util/UpdateChecker.java index 0bd13f628..bdf6394e9 --- a/HMCUtils/src/main/java/org/jackhuang/hellominecraft/util/UpdateChecker.java +++ b/HMCLCore/src/main/java/org/jackhuang/hmcl/util/UpdateChecker.java @@ -15,17 +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.util; +package org.jackhuang.hmcl.util; -import org.jackhuang.hellominecraft.api.EventHandler; -import org.jackhuang.hellominecraft.util.net.NetUtils; +import org.jackhuang.hmcl.api.VersionNumber; +import org.jackhuang.hmcl.api.event.EventHandler; +import org.jackhuang.hmcl.util.net.NetUtils; import com.google.gson.JsonSyntaxException; import java.io.IOException; -import org.jackhuang.hellominecraft.util.log.HMCLog; +import org.jackhuang.hmcl.api.HMCLog; import java.util.Map; -import org.jackhuang.hellominecraft.api.HMCAPI; -import org.jackhuang.hellominecraft.api.SimpleEvent; -import org.jackhuang.hellominecraft.api.event.OutOfDateEvent; +import org.jackhuang.hmcl.api.HMCLApi; +import org.jackhuang.hmcl.api.event.SimpleEvent; +import org.jackhuang.hmcl.api.event.OutOfDateEvent; /** * @@ -98,7 +99,7 @@ public final class UpdateChecker implements IUpdateChecker { @Override public void checkOutdate() { if (outOfDate) - if (HMCAPI.EVENT_BUS.fireChannelResulted(new OutOfDateEvent(this, getNewVersion()))) + if (HMCLApi.EVENT_BUS.fireChannelResulted(new OutOfDateEvent(this, getNewVersion()))) upgrade.fire(new SimpleEvent<>(this, getNewVersion())); } } diff --git a/HMCUtils/src/main/java/org/jackhuang/hellominecraft/util/Utils.java b/HMCLCore/src/main/java/org/jackhuang/hmcl/util/Utils.java old mode 100755 new mode 100644 similarity index 97% rename from HMCUtils/src/main/java/org/jackhuang/hellominecraft/util/Utils.java rename to HMCLCore/src/main/java/org/jackhuang/hmcl/util/Utils.java index b90acdf42..0fa4f86b6 --- a/HMCUtils/src/main/java/org/jackhuang/hellominecraft/util/Utils.java +++ b/HMCLCore/src/main/java/org/jackhuang/hmcl/util/Utils.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.util; +package org.jackhuang.hmcl.util; import java.awt.HeadlessException; import java.awt.Toolkit; diff --git a/HMCUtils/src/main/java/org/jackhuang/hellominecraft/util/code/Charsets.java b/HMCLCore/src/main/java/org/jackhuang/hmcl/util/code/Charsets.java old mode 100755 new mode 100644 similarity index 94% rename from HMCUtils/src/main/java/org/jackhuang/hellominecraft/util/code/Charsets.java rename to HMCLCore/src/main/java/org/jackhuang/hmcl/util/code/Charsets.java index a73a2e28d..f144b4d8e --- a/HMCUtils/src/main/java/org/jackhuang/hellominecraft/util/code/Charsets.java +++ b/HMCLCore/src/main/java/org/jackhuang/hmcl/util/code/Charsets.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.util.code; +package org.jackhuang.hmcl.util.code; import java.nio.charset.Charset; import java.nio.charset.UnsupportedCharsetException; -import org.jackhuang.hellominecraft.util.sys.IOUtils; +import org.jackhuang.hmcl.util.sys.IOUtils; public final class Charsets { diff --git a/HMCUtils/src/main/java/org/jackhuang/hellominecraft/util/code/DigestUtils.java b/HMCLCore/src/main/java/org/jackhuang/hmcl/util/code/DigestUtils.java old mode 100755 new mode 100644 similarity index 99% rename from HMCUtils/src/main/java/org/jackhuang/hellominecraft/util/code/DigestUtils.java rename to HMCLCore/src/main/java/org/jackhuang/hmcl/util/code/DigestUtils.java index 17d9b7350..b7f7522c4 --- a/HMCUtils/src/main/java/org/jackhuang/hellominecraft/util/code/DigestUtils.java +++ b/HMCLCore/src/main/java/org/jackhuang/hmcl/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.util.code; +package org.jackhuang.hmcl.util.code; import java.io.IOException; import java.io.InputStream; diff --git a/HMCUtils/src/main/java/org/jackhuang/hellominecraft/util/code/Hex.java b/HMCLCore/src/main/java/org/jackhuang/hmcl/util/code/Hex.java old mode 100755 new mode 100644 similarity index 98% rename from HMCUtils/src/main/java/org/jackhuang/hellominecraft/util/code/Hex.java rename to HMCLCore/src/main/java/org/jackhuang/hmcl/util/code/Hex.java index 44773f209..380721884 --- a/HMCUtils/src/main/java/org/jackhuang/hellominecraft/util/code/Hex.java +++ b/HMCLCore/src/main/java/org/jackhuang/hmcl/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.util.code; +package org.jackhuang.hmcl.util.code; import java.nio.charset.Charset; diff --git a/HMCUtils/src/main/java/org/jackhuang/hellominecraft/util/lang/Localization.java b/HMCLCore/src/main/java/org/jackhuang/hmcl/util/lang/Localization.java similarity index 94% rename from HMCUtils/src/main/java/org/jackhuang/hellominecraft/util/lang/Localization.java rename to HMCLCore/src/main/java/org/jackhuang/hmcl/util/lang/Localization.java index 2f398343d..a31adaf9f 100644 --- a/HMCUtils/src/main/java/org/jackhuang/hellominecraft/util/lang/Localization.java +++ b/HMCLCore/src/main/java/org/jackhuang/hmcl/util/lang/Localization.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.util.lang; +package org.jackhuang.hmcl.util.lang; import java.io.IOException; import java.io.InputStream; import java.util.HashMap; import java.util.Locale; import java.util.Map; -import org.jackhuang.hellominecraft.util.sys.IOUtils; +import org.jackhuang.hmcl.util.sys.IOUtils; /** * @@ -30,7 +30,7 @@ import org.jackhuang.hellominecraft.util.sys.IOUtils; */ public final class Localization { - private static final String ROOT_LOCATION = "/org/jackhuang/hellominecraft/lang/I18N%s.lang"; + private static final String ROOT_LOCATION = "/org/jackhuang/hmcl/lang/I18N%s.lang"; private static final Map INSTANCE = new HashMap<>(); diff --git a/HMCUtils/src/main/java/org/jackhuang/hellominecraft/util/lang/SupportedLocales.java b/HMCLCore/src/main/java/org/jackhuang/hmcl/util/lang/SupportedLocales.java similarity index 97% rename from HMCUtils/src/main/java/org/jackhuang/hellominecraft/util/lang/SupportedLocales.java rename to HMCLCore/src/main/java/org/jackhuang/hmcl/util/lang/SupportedLocales.java index edc0dd735..dc9b505d3 100644 --- a/HMCUtils/src/main/java/org/jackhuang/hellominecraft/util/lang/SupportedLocales.java +++ b/HMCLCore/src/main/java/org/jackhuang/hmcl/util/lang/SupportedLocales.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.util.lang; +package org.jackhuang.hmcl.util.lang; import java.util.Locale; diff --git a/HMCUtils/src/main/java/org/jackhuang/hellominecraft/util/log/AppenderControl.java b/HMCLCore/src/main/java/org/jackhuang/hmcl/util/log/AppenderControl.java old mode 100755 new mode 100644 similarity index 95% rename from HMCUtils/src/main/java/org/jackhuang/hellominecraft/util/log/AppenderControl.java rename to HMCLCore/src/main/java/org/jackhuang/hmcl/util/log/AppenderControl.java index 8531bcb05..8efc6291f --- a/HMCUtils/src/main/java/org/jackhuang/hellominecraft/util/log/AppenderControl.java +++ b/HMCLCore/src/main/java/org/jackhuang/hmcl/util/log/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.util.log; +package org.jackhuang.hmcl.util.log; -import org.jackhuang.hellominecraft.util.log.appender.IAppender; +import org.jackhuang.hmcl.util.log.appender.IAppender; public class AppenderControl { diff --git a/HMCUtils/src/main/java/org/jackhuang/hellominecraft/util/log/Configuration.java b/HMCLCore/src/main/java/org/jackhuang/hmcl/util/log/Configuration.java old mode 100755 new mode 100644 similarity index 82% rename from HMCUtils/src/main/java/org/jackhuang/hellominecraft/util/log/Configuration.java rename to HMCLCore/src/main/java/org/jackhuang/hmcl/util/log/Configuration.java index b6ed6579e..8fba84333 --- a/HMCUtils/src/main/java/org/jackhuang/hellominecraft/util/log/Configuration.java +++ b/HMCLCore/src/main/java/org/jackhuang/hmcl/util/log/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.util.log; +package org.jackhuang.hmcl.util.log; import java.util.ArrayList; -import org.jackhuang.hellominecraft.util.log.appender.ConsoleAppender; -import org.jackhuang.hellominecraft.util.log.appender.IAppender; -import org.jackhuang.hellominecraft.util.log.layout.DefaultLayout; +import org.jackhuang.hmcl.util.log.appender.ConsoleAppender; +import org.jackhuang.hmcl.util.log.appender.IAppender; +import org.jackhuang.hmcl.util.log.layout.DefaultLayout; /** * diff --git a/HMCUtils/src/main/java/org/jackhuang/hellominecraft/util/log/Level.java b/HMCLCore/src/main/java/org/jackhuang/hmcl/util/log/Level.java old mode 100755 new mode 100644 similarity index 98% rename from HMCUtils/src/main/java/org/jackhuang/hellominecraft/util/log/Level.java rename to HMCLCore/src/main/java/org/jackhuang/hmcl/util/log/Level.java index e29b13705..ee9738078 --- a/HMCUtils/src/main/java/org/jackhuang/hellominecraft/util/log/Level.java +++ b/HMCLCore/src/main/java/org/jackhuang/hmcl/util/log/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.util.log; +package org.jackhuang.hmcl.util.log; import java.awt.Color; import java.util.regex.Matcher; diff --git a/HMCUtils/src/main/java/org/jackhuang/hellominecraft/util/log/LogEvent.java b/HMCLCore/src/main/java/org/jackhuang/hmcl/util/log/LogEvent.java old mode 100755 new mode 100644 similarity index 89% rename from HMCUtils/src/main/java/org/jackhuang/hellominecraft/util/log/LogEvent.java rename to HMCLCore/src/main/java/org/jackhuang/hmcl/util/log/LogEvent.java index 045af68e5..5a9851fac --- a/HMCUtils/src/main/java/org/jackhuang/hellominecraft/util/log/LogEvent.java +++ b/HMCLCore/src/main/java/org/jackhuang/hmcl/util/log/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.util.log; +package org.jackhuang.hmcl.util.log; -import org.jackhuang.hellominecraft.util.log.message.IMessage; +import org.jackhuang.hmcl.util.log.message.IMessage; /** * diff --git a/HMCUtils/src/main/java/org/jackhuang/hellominecraft/util/log/LoggingException.java b/HMCLCore/src/main/java/org/jackhuang/hmcl/util/log/LoggingException.java old mode 100755 new mode 100644 similarity index 95% rename from HMCUtils/src/main/java/org/jackhuang/hellominecraft/util/log/LoggingException.java rename to HMCLCore/src/main/java/org/jackhuang/hmcl/util/log/LoggingException.java index 9eef0235a..0bee11c30 --- a/HMCUtils/src/main/java/org/jackhuang/hellominecraft/util/log/LoggingException.java +++ b/HMCLCore/src/main/java/org/jackhuang/hmcl/util/log/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.util.log; +package org.jackhuang.hmcl.util.log; /** * diff --git a/HMCUtils/src/main/java/org/jackhuang/hellominecraft/util/log/appender/AbstractAppender.java b/HMCLCore/src/main/java/org/jackhuang/hmcl/util/log/appender/AbstractAppender.java old mode 100755 new mode 100644 similarity index 93% rename from HMCUtils/src/main/java/org/jackhuang/hellominecraft/util/log/appender/AbstractAppender.java rename to HMCLCore/src/main/java/org/jackhuang/hmcl/util/log/appender/AbstractAppender.java index cfe28fe26..feb8b71e3 --- a/HMCUtils/src/main/java/org/jackhuang/hellominecraft/util/log/appender/AbstractAppender.java +++ b/HMCLCore/src/main/java/org/jackhuang/hmcl/util/log/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.util.log.appender; +package org.jackhuang.hmcl.util.log.appender; import java.io.Serializable; -import org.jackhuang.hellominecraft.util.log.layout.ILayout; +import org.jackhuang.hmcl.util.log.layout.ILayout; /** * diff --git a/HMCUtils/src/main/java/org/jackhuang/hellominecraft/util/log/appender/ConsoleAppender.java b/HMCLCore/src/main/java/org/jackhuang/hmcl/util/log/appender/ConsoleAppender.java old mode 100755 new mode 100644 similarity index 95% rename from HMCUtils/src/main/java/org/jackhuang/hellominecraft/util/log/appender/ConsoleAppender.java rename to HMCLCore/src/main/java/org/jackhuang/hmcl/util/log/appender/ConsoleAppender.java index f868f5274..15496d524 --- a/HMCUtils/src/main/java/org/jackhuang/hellominecraft/util/log/appender/ConsoleAppender.java +++ b/HMCLCore/src/main/java/org/jackhuang/hmcl/util/log/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.util.log.appender; +package org.jackhuang.hmcl.util.log.appender; import java.io.IOException; import java.io.OutputStream; import java.io.Serializable; -import org.jackhuang.hellominecraft.util.log.layout.ILayout; +import org.jackhuang.hmcl.util.log.layout.ILayout; /** * diff --git a/HMCUtils/src/main/java/org/jackhuang/hellominecraft/util/log/appender/IAppender.java b/HMCLCore/src/main/java/org/jackhuang/hmcl/util/log/appender/IAppender.java old mode 100755 new mode 100644 similarity index 84% rename from HMCUtils/src/main/java/org/jackhuang/hellominecraft/util/log/appender/IAppender.java rename to HMCLCore/src/main/java/org/jackhuang/hmcl/util/log/appender/IAppender.java index 1c08c07d5..bef4b223c --- a/HMCUtils/src/main/java/org/jackhuang/hellominecraft/util/log/appender/IAppender.java +++ b/HMCLCore/src/main/java/org/jackhuang/hmcl/util/log/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.util.log.appender; +package org.jackhuang.hmcl.util.log.appender; import java.io.Serializable; -import org.jackhuang.hellominecraft.util.log.LogEvent; -import org.jackhuang.hellominecraft.util.log.layout.ILayout; +import org.jackhuang.hmcl.util.log.LogEvent; +import org.jackhuang.hmcl.util.log.layout.ILayout; /** * diff --git a/HMCUtils/src/main/java/org/jackhuang/hellominecraft/util/log/appender/OutputStreamAppender.java b/HMCLCore/src/main/java/org/jackhuang/hmcl/util/log/appender/OutputStreamAppender.java old mode 100755 new mode 100644 similarity index 89% rename from HMCUtils/src/main/java/org/jackhuang/hellominecraft/util/log/appender/OutputStreamAppender.java rename to HMCLCore/src/main/java/org/jackhuang/hmcl/util/log/appender/OutputStreamAppender.java index 23c9f4615..5f0957153 --- a/HMCUtils/src/main/java/org/jackhuang/hellominecraft/util/log/appender/OutputStreamAppender.java +++ b/HMCLCore/src/main/java/org/jackhuang/hmcl/util/log/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.util.log.appender; +package org.jackhuang.hmcl.util.log.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.util.log.LogEvent; -import org.jackhuang.hellominecraft.util.log.LoggingException; -import org.jackhuang.hellominecraft.util.log.layout.ILayout; +import org.jackhuang.hmcl.util.log.LogEvent; +import org.jackhuang.hmcl.util.log.LoggingException; +import org.jackhuang.hmcl.util.log.layout.ILayout; /** * diff --git a/HMCUtils/src/main/java/org/jackhuang/hellominecraft/util/log/layout/AbstractStringLayout.java b/HMCLCore/src/main/java/org/jackhuang/hmcl/util/log/layout/AbstractStringLayout.java old mode 100755 new mode 100644 similarity index 89% rename from HMCUtils/src/main/java/org/jackhuang/hellominecraft/util/log/layout/AbstractStringLayout.java rename to HMCLCore/src/main/java/org/jackhuang/hmcl/util/log/layout/AbstractStringLayout.java index 2554a25a5..e4e970a02 --- a/HMCUtils/src/main/java/org/jackhuang/hellominecraft/util/log/layout/AbstractStringLayout.java +++ b/HMCLCore/src/main/java/org/jackhuang/hmcl/util/log/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.util.log.layout; +package org.jackhuang.hmcl.util.log.layout; -import org.jackhuang.hellominecraft.util.log.LogEvent; +import org.jackhuang.hmcl.util.log.LogEvent; /** * diff --git a/HMCUtils/src/main/java/org/jackhuang/hellominecraft/util/log/layout/DefaultLayout.java b/HMCLCore/src/main/java/org/jackhuang/hmcl/util/log/layout/DefaultLayout.java old mode 100755 new mode 100644 similarity index 91% rename from HMCUtils/src/main/java/org/jackhuang/hellominecraft/util/log/layout/DefaultLayout.java rename to HMCLCore/src/main/java/org/jackhuang/hmcl/util/log/layout/DefaultLayout.java index 1eb845185..1e59c708a --- a/HMCUtils/src/main/java/org/jackhuang/hellominecraft/util/log/layout/DefaultLayout.java +++ b/HMCLCore/src/main/java/org/jackhuang/hmcl/util/log/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.util.log.layout; +package org.jackhuang.hmcl.util.log.layout; import java.text.SimpleDateFormat; import java.util.Date; -import org.jackhuang.hellominecraft.util.log.LogEvent; +import org.jackhuang.hmcl.util.log.LogEvent; /** * diff --git a/HMCUtils/src/main/java/org/jackhuang/hellominecraft/util/log/layout/ILayout.java b/HMCLCore/src/main/java/org/jackhuang/hmcl/util/log/layout/ILayout.java old mode 100755 new mode 100644 similarity index 89% rename from HMCUtils/src/main/java/org/jackhuang/hellominecraft/util/log/layout/ILayout.java rename to HMCLCore/src/main/java/org/jackhuang/hmcl/util/log/layout/ILayout.java index 742702b17..69a0b1749 --- a/HMCUtils/src/main/java/org/jackhuang/hellominecraft/util/log/layout/ILayout.java +++ b/HMCLCore/src/main/java/org/jackhuang/hmcl/util/log/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.util.log.layout; +package org.jackhuang.hmcl.util.log.layout; import java.io.Serializable; -import org.jackhuang.hellominecraft.util.log.LogEvent; +import org.jackhuang.hmcl.util.log.LogEvent; /** * diff --git a/HMCUtils/src/main/java/org/jackhuang/hellominecraft/util/log/logger/AbstractLogger.java b/HMCLCore/src/main/java/org/jackhuang/hmcl/util/log/logger/AbstractLogger.java old mode 100755 new mode 100644 similarity index 96% rename from HMCUtils/src/main/java/org/jackhuang/hellominecraft/util/log/logger/AbstractLogger.java rename to HMCLCore/src/main/java/org/jackhuang/hmcl/util/log/logger/AbstractLogger.java index 5044d2e16..c99359106 --- a/HMCUtils/src/main/java/org/jackhuang/hellominecraft/util/log/logger/AbstractLogger.java +++ b/HMCLCore/src/main/java/org/jackhuang/hmcl/util/log/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.util.log.logger; +package org.jackhuang.hmcl.util.log.logger; -import org.jackhuang.hellominecraft.util.log.Level; -import org.jackhuang.hellominecraft.util.log.message.IMessage; -import org.jackhuang.hellominecraft.util.log.message.IMessageFactory; -import org.jackhuang.hellominecraft.util.log.message.ParameterizedMessageFactory; -import org.jackhuang.hellominecraft.util.log.message.StringFormattedMessage; +import org.jackhuang.hmcl.util.log.Level; +import org.jackhuang.hmcl.util.log.message.IMessage; +import org.jackhuang.hmcl.util.log.message.IMessageFactory; +import org.jackhuang.hmcl.util.log.message.ParameterizedMessageFactory; +import org.jackhuang.hmcl.util.log.message.StringFormattedMessage; public abstract class AbstractLogger implements ILogger { diff --git a/HMCUtils/src/main/java/org/jackhuang/hellominecraft/util/log/logger/ILogger.java b/HMCLCore/src/main/java/org/jackhuang/hmcl/util/log/logger/ILogger.java old mode 100755 new mode 100644 similarity index 95% rename from HMCUtils/src/main/java/org/jackhuang/hellominecraft/util/log/logger/ILogger.java rename to HMCLCore/src/main/java/org/jackhuang/hmcl/util/log/logger/ILogger.java index 65958c7ab..bb4624d0a --- a/HMCUtils/src/main/java/org/jackhuang/hellominecraft/util/log/logger/ILogger.java +++ b/HMCLCore/src/main/java/org/jackhuang/hmcl/util/log/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.util.log.logger; +package org.jackhuang.hmcl.util.log.logger; -import org.jackhuang.hellominecraft.util.log.Level; -import org.jackhuang.hellominecraft.util.log.message.IMessage; +import org.jackhuang.hmcl.util.log.Level; +import org.jackhuang.hmcl.util.log.message.IMessage; /** * diff --git a/HMCUtils/src/main/java/org/jackhuang/hellominecraft/util/log/logger/Logger.java b/HMCLCore/src/main/java/org/jackhuang/hmcl/util/log/logger/Logger.java old mode 100755 new mode 100644 similarity index 91% rename from HMCUtils/src/main/java/org/jackhuang/hellominecraft/util/log/logger/Logger.java rename to HMCLCore/src/main/java/org/jackhuang/hmcl/util/log/logger/Logger.java index 8d3c2b05b..ff9a00ef5 --- a/HMCUtils/src/main/java/org/jackhuang/hellominecraft/util/log/logger/Logger.java +++ b/HMCLCore/src/main/java/org/jackhuang/hmcl/util/log/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.util.log.logger; +package org.jackhuang.hmcl.util.log.logger; import java.util.HashMap; import java.util.Map; import java.util.concurrent.ConcurrentHashMap; -import org.jackhuang.hellominecraft.util.log.AppenderControl; -import org.jackhuang.hellominecraft.util.log.Configuration; -import org.jackhuang.hellominecraft.util.log.Level; -import org.jackhuang.hellominecraft.util.log.LogEvent; -import org.jackhuang.hellominecraft.util.log.appender.IAppender; -import org.jackhuang.hellominecraft.util.log.message.IMessage; -import org.jackhuang.hellominecraft.util.log.message.IMessageFactory; +import org.jackhuang.hmcl.util.log.AppenderControl; +import org.jackhuang.hmcl.util.log.Configuration; +import org.jackhuang.hmcl.util.log.Level; +import org.jackhuang.hmcl.util.log.LogEvent; +import org.jackhuang.hmcl.util.log.appender.IAppender; +import org.jackhuang.hmcl.util.log.message.IMessage; +import org.jackhuang.hmcl.util.log.message.IMessageFactory; public class Logger extends AbstractLogger { diff --git a/HMCUtils/src/main/java/org/jackhuang/hellominecraft/util/log/message/AbstractMessageFactory.java b/HMCLCore/src/main/java/org/jackhuang/hmcl/util/log/message/AbstractMessageFactory.java old mode 100755 new mode 100644 similarity index 95% rename from HMCUtils/src/main/java/org/jackhuang/hellominecraft/util/log/message/AbstractMessageFactory.java rename to HMCLCore/src/main/java/org/jackhuang/hmcl/util/log/message/AbstractMessageFactory.java index 7b70d79da..b1b599f24 --- a/HMCUtils/src/main/java/org/jackhuang/hellominecraft/util/log/message/AbstractMessageFactory.java +++ b/HMCLCore/src/main/java/org/jackhuang/hmcl/util/log/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.util.log.message; +package org.jackhuang.hmcl.util.log.message; /** * diff --git a/HMCUtils/src/main/java/org/jackhuang/hellominecraft/util/log/message/IMessage.java b/HMCLCore/src/main/java/org/jackhuang/hmcl/util/log/message/IMessage.java old mode 100755 new mode 100644 similarity index 94% rename from HMCUtils/src/main/java/org/jackhuang/hellominecraft/util/log/message/IMessage.java rename to HMCLCore/src/main/java/org/jackhuang/hmcl/util/log/message/IMessage.java index 22c11cc02..7db79f14f --- a/HMCUtils/src/main/java/org/jackhuang/hellominecraft/util/log/message/IMessage.java +++ b/HMCLCore/src/main/java/org/jackhuang/hmcl/util/log/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.util.log.message; +package org.jackhuang.hmcl.util.log.message; import java.io.Serializable; diff --git a/HMCUtils/src/main/java/org/jackhuang/hellominecraft/util/log/message/IMessageFactory.java b/HMCLCore/src/main/java/org/jackhuang/hmcl/util/log/message/IMessageFactory.java old mode 100755 new mode 100644 similarity index 94% rename from HMCUtils/src/main/java/org/jackhuang/hellominecraft/util/log/message/IMessageFactory.java rename to HMCLCore/src/main/java/org/jackhuang/hmcl/util/log/message/IMessageFactory.java index 8cacfa720..054606ffb --- a/HMCUtils/src/main/java/org/jackhuang/hellominecraft/util/log/message/IMessageFactory.java +++ b/HMCLCore/src/main/java/org/jackhuang/hmcl/util/log/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.util.log.message; +package org.jackhuang.hmcl.util.log.message; /** * diff --git a/HMCUtils/src/main/java/org/jackhuang/hellominecraft/util/log/message/ObjectMessage.java b/HMCLCore/src/main/java/org/jackhuang/hmcl/util/log/message/ObjectMessage.java old mode 100755 new mode 100644 similarity index 97% rename from HMCUtils/src/main/java/org/jackhuang/hellominecraft/util/log/message/ObjectMessage.java rename to HMCLCore/src/main/java/org/jackhuang/hmcl/util/log/message/ObjectMessage.java index ab046b6eb..2b138b56e --- a/HMCUtils/src/main/java/org/jackhuang/hellominecraft/util/log/message/ObjectMessage.java +++ b/HMCLCore/src/main/java/org/jackhuang/hmcl/util/log/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.util.log.message; +package org.jackhuang.hmcl.util.log.message; public class ObjectMessage implements IMessage { diff --git a/HMCUtils/src/main/java/org/jackhuang/hellominecraft/util/log/message/ParameterizedMessage.java b/HMCLCore/src/main/java/org/jackhuang/hmcl/util/log/message/ParameterizedMessage.java old mode 100755 new mode 100644 similarity index 99% rename from HMCUtils/src/main/java/org/jackhuang/hellominecraft/util/log/message/ParameterizedMessage.java rename to HMCLCore/src/main/java/org/jackhuang/hmcl/util/log/message/ParameterizedMessage.java index 17be6b993..78925ab82 --- a/HMCUtils/src/main/java/org/jackhuang/hellominecraft/util/log/message/ParameterizedMessage.java +++ b/HMCLCore/src/main/java/org/jackhuang/hmcl/util/log/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.util.log.message; +package org.jackhuang.hmcl.util.log.message; import java.text.SimpleDateFormat; import java.util.Arrays; diff --git a/HMCUtils/src/main/java/org/jackhuang/hellominecraft/util/log/message/ParameterizedMessageFactory.java b/HMCLCore/src/main/java/org/jackhuang/hmcl/util/log/message/ParameterizedMessageFactory.java old mode 100755 new mode 100644 similarity index 94% rename from HMCUtils/src/main/java/org/jackhuang/hellominecraft/util/log/message/ParameterizedMessageFactory.java rename to HMCLCore/src/main/java/org/jackhuang/hmcl/util/log/message/ParameterizedMessageFactory.java index c78385350..56b689bba --- a/HMCUtils/src/main/java/org/jackhuang/hellominecraft/util/log/message/ParameterizedMessageFactory.java +++ b/HMCLCore/src/main/java/org/jackhuang/hmcl/util/log/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.util.log.message; +package org.jackhuang.hmcl.util.log.message; /** * diff --git a/HMCUtils/src/main/java/org/jackhuang/hellominecraft/util/log/message/SimpleMessage.java b/HMCLCore/src/main/java/org/jackhuang/hmcl/util/log/message/SimpleMessage.java old mode 100755 new mode 100644 similarity index 97% rename from HMCUtils/src/main/java/org/jackhuang/hellominecraft/util/log/message/SimpleMessage.java rename to HMCLCore/src/main/java/org/jackhuang/hmcl/util/log/message/SimpleMessage.java index 1590a73e9..8ddaafbbe --- a/HMCUtils/src/main/java/org/jackhuang/hellominecraft/util/log/message/SimpleMessage.java +++ b/HMCLCore/src/main/java/org/jackhuang/hmcl/util/log/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.util.log.message; +package org.jackhuang.hmcl.util.log.message; /** * diff --git a/HMCUtils/src/main/java/org/jackhuang/hellominecraft/util/log/message/StringFormattedMessage.java b/HMCLCore/src/main/java/org/jackhuang/hmcl/util/log/message/StringFormattedMessage.java old mode 100755 new mode 100644 similarity index 98% rename from HMCUtils/src/main/java/org/jackhuang/hellominecraft/util/log/message/StringFormattedMessage.java rename to HMCLCore/src/main/java/org/jackhuang/hmcl/util/log/message/StringFormattedMessage.java index 9af3fd098..3e5b3f24f --- a/HMCUtils/src/main/java/org/jackhuang/hellominecraft/util/log/message/StringFormattedMessage.java +++ b/HMCLCore/src/main/java/org/jackhuang/hmcl/util/log/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.util.log.message; +package org.jackhuang.hmcl.util.log.message; import java.util.Arrays; import java.util.IllegalFormatException; diff --git a/HMCUtils/src/main/java/org/jackhuang/hellominecraft/util/net/FileDownloadTask.java b/HMCLCore/src/main/java/org/jackhuang/hmcl/util/net/FileDownloadTask.java old mode 100755 new mode 100644 similarity index 93% rename from HMCUtils/src/main/java/org/jackhuang/hellominecraft/util/net/FileDownloadTask.java rename to HMCLCore/src/main/java/org/jackhuang/hmcl/util/net/FileDownloadTask.java index 1366f5971..4f43752ff --- a/HMCUtils/src/main/java/org/jackhuang/hellominecraft/util/net/FileDownloadTask.java +++ b/HMCLCore/src/main/java/org/jackhuang/hmcl/util/net/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.util.net; +package org.jackhuang.hmcl.util.net; import java.io.File; import java.io.IOException; @@ -26,15 +26,15 @@ import java.net.HttpURLConnection; import java.net.URL; import java.security.MessageDigest; import java.util.ArrayList; -import org.jackhuang.hellominecraft.util.C; -import org.jackhuang.hellominecraft.util.code.DigestUtils; -import org.jackhuang.hellominecraft.util.func.Function; -import org.jackhuang.hellominecraft.util.log.HMCLog; -import org.jackhuang.hellominecraft.util.sys.FileUtils; -import org.jackhuang.hellominecraft.util.task.Task; -import org.jackhuang.hellominecraft.util.task.comm.PreviousResult; -import org.jackhuang.hellominecraft.util.task.comm.PreviousResultRegistrar; -import org.jackhuang.hellominecraft.util.sys.IOUtils; +import org.jackhuang.hmcl.util.C; +import org.jackhuang.hmcl.util.code.DigestUtils; +import org.jackhuang.hmcl.api.func.Function; +import org.jackhuang.hmcl.api.HMCLog; +import org.jackhuang.hmcl.util.sys.FileUtils; +import org.jackhuang.hmcl.util.task.Task; +import org.jackhuang.hmcl.util.task.comm.PreviousResult; +import org.jackhuang.hmcl.util.task.comm.PreviousResultRegistrar; +import org.jackhuang.hmcl.util.sys.IOUtils; /** * diff --git a/HMCUtils/src/main/java/org/jackhuang/hellominecraft/util/net/HTTPGetTask.java b/HMCLCore/src/main/java/org/jackhuang/hmcl/util/net/HTTPGetTask.java old mode 100755 new mode 100644 similarity index 88% rename from HMCUtils/src/main/java/org/jackhuang/hellominecraft/util/net/HTTPGetTask.java rename to HMCLCore/src/main/java/org/jackhuang/hmcl/util/net/HTTPGetTask.java index e2ff969c1..2a1e81f2c --- a/HMCUtils/src/main/java/org/jackhuang/hellominecraft/util/net/HTTPGetTask.java +++ b/HMCLCore/src/main/java/org/jackhuang/hmcl/util/net/HTTPGetTask.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.util.net; +package org.jackhuang.hmcl.util.net; import java.io.ByteArrayOutputStream; import java.io.IOException; @@ -24,13 +24,13 @@ import java.net.HttpURLConnection; import java.net.Proxy; import java.net.URL; import java.nio.charset.Charset; -import org.jackhuang.hellominecraft.util.C; -import org.jackhuang.hellominecraft.util.log.HMCLog; -import org.jackhuang.hellominecraft.util.task.comm.PreviousResult; -import org.jackhuang.hellominecraft.api.EventHandler; -import org.jackhuang.hellominecraft.api.SimpleEvent; -import org.jackhuang.hellominecraft.util.code.Charsets; -import org.jackhuang.hellominecraft.util.task.Task; +import org.jackhuang.hmcl.util.C; +import org.jackhuang.hmcl.api.HMCLog; +import org.jackhuang.hmcl.util.task.comm.PreviousResult; +import org.jackhuang.hmcl.api.event.EventHandler; +import org.jackhuang.hmcl.api.event.SimpleEvent; +import org.jackhuang.hmcl.util.code.Charsets; +import org.jackhuang.hmcl.util.task.Task; /** * diff --git a/HMCUtils/src/main/java/org/jackhuang/hellominecraft/util/net/NetUtils.java b/HMCLCore/src/main/java/org/jackhuang/hmcl/util/net/NetUtils.java old mode 100755 new mode 100644 similarity index 94% rename from HMCUtils/src/main/java/org/jackhuang/hellominecraft/util/net/NetUtils.java rename to HMCLCore/src/main/java/org/jackhuang/hmcl/util/net/NetUtils.java index e146721ea..b7f4cdee0 --- a/HMCUtils/src/main/java/org/jackhuang/hellominecraft/util/net/NetUtils.java +++ b/HMCLCore/src/main/java/org/jackhuang/hmcl/util/net/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.util.net; +package org.jackhuang.hmcl.util.net; -import org.jackhuang.hellominecraft.util.log.HMCLog; +import org.jackhuang.hmcl.api.HMCLog; import java.io.IOException; import java.io.InputStream; import java.io.OutputStream; @@ -26,8 +26,8 @@ import java.net.MalformedURLException; import java.net.Proxy; import java.net.URL; import java.util.Map; -import org.jackhuang.hellominecraft.util.code.Charsets; -import org.jackhuang.hellominecraft.util.sys.IOUtils; +import org.jackhuang.hmcl.util.code.Charsets; +import org.jackhuang.hmcl.util.sys.IOUtils; /** * diff --git a/HMCUtils/src/main/java/org/jackhuang/hellominecraft/util/net/WebFrame.java b/HMCLCore/src/main/java/org/jackhuang/hmcl/util/net/WebFrame.java similarity index 85% rename from HMCUtils/src/main/java/org/jackhuang/hellominecraft/util/net/WebFrame.java rename to HMCLCore/src/main/java/org/jackhuang/hmcl/util/net/WebFrame.java index 402bfba0b..f86ffc39d 100644 --- a/HMCUtils/src/main/java/org/jackhuang/hellominecraft/util/net/WebFrame.java +++ b/HMCLCore/src/main/java/org/jackhuang/hmcl/util/net/WebFrame.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.util.net; +package org.jackhuang.hmcl.util.net; import java.awt.event.WindowAdapter; import java.awt.event.WindowEvent; import javax.swing.JDialog; -import org.jackhuang.hellominecraft.util.StrUtils; -import org.jackhuang.hellominecraft.util.log.Level; -import org.jackhuang.hellominecraft.util.ui.GraphicsUtils; -import org.jackhuang.hellominecraft.util.ui.SwingUtils; +import org.jackhuang.hmcl.util.StrUtils; +import org.jackhuang.hmcl.util.log.Level; +import org.jackhuang.hmcl.util.ui.GraphicsUtils; +import org.jackhuang.hmcl.util.ui.SwingUtils; /** * diff --git a/HMCUtils/src/main/java/org/jackhuang/hellominecraft/util/net/WebPage.java b/HMCLCore/src/main/java/org/jackhuang/hmcl/util/net/WebPage.java similarity index 91% rename from HMCUtils/src/main/java/org/jackhuang/hellominecraft/util/net/WebPage.java rename to HMCLCore/src/main/java/org/jackhuang/hmcl/util/net/WebPage.java index 5c8db5a97..249cb6578 100644 --- a/HMCUtils/src/main/java/org/jackhuang/hellominecraft/util/net/WebPage.java +++ b/HMCLCore/src/main/java/org/jackhuang/hmcl/util/net/WebPage.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.util.net; +package org.jackhuang.hmcl.util.net; import javax.swing.JScrollPane; import javax.swing.event.HyperlinkEvent; -import org.jackhuang.hellominecraft.util.log.HMCLog; -import org.jackhuang.hellominecraft.util.ui.SwingUtils; +import org.jackhuang.hmcl.api.HMCLog; +import org.jackhuang.hmcl.util.ui.SwingUtils; /** * diff --git a/HMCUtils/src/main/java/org/jackhuang/hellominecraft/util/sys/CompressingUtils.java b/HMCLCore/src/main/java/org/jackhuang/hmcl/util/sys/CompressingUtils.java old mode 100755 new mode 100644 similarity index 97% rename from HMCUtils/src/main/java/org/jackhuang/hellominecraft/util/sys/CompressingUtils.java rename to HMCLCore/src/main/java/org/jackhuang/hmcl/util/sys/CompressingUtils.java index 77e84c312..c31308604 --- a/HMCUtils/src/main/java/org/jackhuang/hellominecraft/util/sys/CompressingUtils.java +++ b/HMCLCore/src/main/java/org/jackhuang/hmcl/util/sys/CompressingUtils.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.util.sys; +package org.jackhuang.hmcl.util.sys; import java.io.File; import java.io.FileOutputStream; @@ -23,9 +23,9 @@ import java.io.IOException; import java.io.InputStream; import java.util.zip.ZipEntry; import java.util.zip.ZipOutputStream; -import org.jackhuang.hellominecraft.util.func.Predicate; +import org.jackhuang.hmcl.api.func.Predicate; import java.util.zip.ZipInputStream; -import org.jackhuang.hellominecraft.util.func.BiFunction; +import org.jackhuang.hmcl.api.func.BiFunction; /** * 文件压缩/解压类 diff --git a/HMCUtils/src/main/java/org/jackhuang/hellominecraft/util/sys/FileUtils.java b/HMCLCore/src/main/java/org/jackhuang/hmcl/util/sys/FileUtils.java old mode 100755 new mode 100644 similarity index 99% rename from HMCUtils/src/main/java/org/jackhuang/hellominecraft/util/sys/FileUtils.java rename to HMCLCore/src/main/java/org/jackhuang/hmcl/util/sys/FileUtils.java index 2bedc68f7..0ab4a630d --- a/HMCUtils/src/main/java/org/jackhuang/hellominecraft/util/sys/FileUtils.java +++ b/HMCLCore/src/main/java/org/jackhuang/hmcl/util/sys/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.util.sys; +package org.jackhuang.hmcl.util.sys; import java.io.File; import java.io.FileFilter; @@ -29,7 +29,7 @@ import java.nio.file.StandardCopyOption; import java.util.ArrayList; import java.util.List; import java.util.Objects; -import org.jackhuang.hellominecraft.util.log.HMCLog; +import org.jackhuang.hmcl.api.HMCLog; /** * diff --git a/HMCUtils/src/main/java/org/jackhuang/hellominecraft/util/sys/IOUtils.java b/HMCLCore/src/main/java/org/jackhuang/hmcl/util/sys/IOUtils.java old mode 100755 new mode 100644 similarity index 97% rename from HMCUtils/src/main/java/org/jackhuang/hellominecraft/util/sys/IOUtils.java rename to HMCLCore/src/main/java/org/jackhuang/hmcl/util/sys/IOUtils.java index 5b09c2879..bc3c0c594 --- a/HMCUtils/src/main/java/org/jackhuang/hellominecraft/util/sys/IOUtils.java +++ b/HMCLCore/src/main/java/org/jackhuang/hmcl/util/sys/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.util.sys; +package org.jackhuang.hmcl.util.sys; import java.io.BufferedReader; import java.io.ByteArrayOutputStream; @@ -36,9 +36,9 @@ import java.net.UnknownHostException; import java.nio.charset.Charset; import java.util.ArrayList; import java.util.List; -import org.jackhuang.hellominecraft.util.func.Consumer; -import org.jackhuang.hellominecraft.util.func.Function; -import org.jackhuang.hellominecraft.util.log.HMCLog; +import org.jackhuang.hmcl.api.func.Consumer; +import org.jackhuang.hmcl.api.func.Function; +import org.jackhuang.hmcl.api.HMCLog; /** * @@ -275,7 +275,7 @@ public final class IOUtils { } private static List readProcessImpl(String[] cmd, Function callback) throws IOException, InterruptedException { - JavaProcess jp = new JavaProcess(cmd, new ProcessBuilder(cmd).start(), null); + JavaProcess jp = new JavaProcess(cmd, new ProcessBuilder(cmd).start()); ArrayList lines = new ArrayList<>(); try (BufferedReader br = new BufferedReader(new InputStreamReader(callback.apply(jp.getRawProcess()), Charset.defaultCharset()))) { jp.getRawProcess().waitFor(); diff --git a/HMCUtils/src/main/java/org/jackhuang/hellominecraft/util/sys/Java.java b/HMCLCore/src/main/java/org/jackhuang/hmcl/util/sys/Java.java old mode 100755 new mode 100644 similarity index 97% rename from HMCUtils/src/main/java/org/jackhuang/hellominecraft/util/sys/Java.java rename to HMCLCore/src/main/java/org/jackhuang/hmcl/util/sys/Java.java index 8a850803a..fb64cd31f --- a/HMCUtils/src/main/java/org/jackhuang/hellominecraft/util/sys/Java.java +++ b/HMCLCore/src/main/java/org/jackhuang/hmcl/util/sys/Java.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.util.sys; +package org.jackhuang.hmcl.util.sys; import java.io.File; import java.io.IOException; @@ -24,8 +24,8 @@ import java.util.Collections; import java.util.HashMap; import java.util.List; import java.util.Map; -import org.jackhuang.hellominecraft.util.C; -import org.jackhuang.hellominecraft.util.log.HMCLog; +import org.jackhuang.hmcl.util.C; +import org.jackhuang.hmcl.api.HMCLog; /** * diff --git a/HMCUtils/src/main/java/org/jackhuang/hellominecraft/util/sys/JavaProcess.java b/HMCLCore/src/main/java/org/jackhuang/hmcl/util/sys/JavaProcess.java old mode 100755 new mode 100644 similarity index 80% rename from HMCUtils/src/main/java/org/jackhuang/hellominecraft/util/sys/JavaProcess.java rename to HMCLCore/src/main/java/org/jackhuang/hmcl/util/sys/JavaProcess.java index 5f44eeda4..457d062e4 --- a/HMCUtils/src/main/java/org/jackhuang/hellominecraft/util/sys/JavaProcess.java +++ b/HMCLCore/src/main/java/org/jackhuang/hmcl/util/sys/JavaProcess.java @@ -15,8 +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.util.sys; +package org.jackhuang.hmcl.util.sys; +import org.jackhuang.hmcl.api.IProcess; import java.util.ArrayList; import java.util.Arrays; import java.util.List; @@ -25,45 +26,43 @@ import java.util.List; * * @author huangyuhui */ -public class JavaProcess { +public class JavaProcess implements IProcess { private final List commands; private final Process process; private final ArrayList stdOutLines = new ArrayList<>(); - private final ProcessManager pm; - public JavaProcess(List commands, Process process, ProcessManager pm) { + public JavaProcess(List commands, Process process) { this.commands = commands; this.process = process; - this.pm = pm; - if (pm != null) - pm.registerProcess(this); + ProcessManager.registerProcess(this); } - public JavaProcess(String[] commands, Process process, ProcessManager pm) { - this(Arrays.asList(commands), process, pm); + public JavaProcess(String[] commands, Process process) { + this(Arrays.asList(commands), process); } + @Override public Process getRawProcess() { return this.process; } + @Override public List getStartupCommands() { return this.commands; } + @Override public String getStartupCommand() { return this.process.toString(); } - - public ProcessManager getProcessManager() { - return pm; - } + @Override public ArrayList getStdOutLines() { return this.stdOutLines; } + @Override public boolean isRunning() { try { this.process.exitValue(); @@ -74,6 +73,7 @@ public class JavaProcess { return false; } + @Override public int getExitCode() { try { return this.process.exitValue(); @@ -88,6 +88,7 @@ public class JavaProcess { return "JavaProcess[commands=" + this.commands + ", isRunning=" + isRunning() + "]"; } + @Override public void stop() { this.process.destroy(); } diff --git a/HMCUtils/src/main/java/org/jackhuang/hellominecraft/util/sys/JdkVersion.java b/HMCLCore/src/main/java/org/jackhuang/hmcl/util/sys/JdkVersion.java old mode 100755 new mode 100644 similarity index 96% rename from HMCUtils/src/main/java/org/jackhuang/hellominecraft/util/sys/JdkVersion.java rename to HMCLCore/src/main/java/org/jackhuang/hmcl/util/sys/JdkVersion.java index fe8a7f0f0..20dbc532e --- a/HMCUtils/src/main/java/org/jackhuang/hellominecraft/util/sys/JdkVersion.java +++ b/HMCLCore/src/main/java/org/jackhuang/hmcl/util/sys/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.util.sys; +package org.jackhuang.hmcl.util.sys; import java.io.File; import java.io.IOException; import java.util.regex.Matcher; import java.util.regex.Pattern; -import org.jackhuang.hellominecraft.util.log.HMCLog; -import org.jackhuang.hellominecraft.util.StrUtils; +import org.jackhuang.hmcl.api.HMCLog; +import org.jackhuang.hmcl.util.StrUtils; /** * diff --git a/HMCUtils/src/main/java/org/jackhuang/hellominecraft/util/sys/OS.java b/HMCLCore/src/main/java/org/jackhuang/hmcl/util/sys/OS.java old mode 100755 new mode 100644 similarity index 96% rename from HMCUtils/src/main/java/org/jackhuang/hellominecraft/util/sys/OS.java rename to HMCLCore/src/main/java/org/jackhuang/hmcl/util/sys/OS.java index 319b43ebf..925acd962 --- a/HMCUtils/src/main/java/org/jackhuang/hellominecraft/util/sys/OS.java +++ b/HMCLCore/src/main/java/org/jackhuang/hmcl/util/sys/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.util.sys; +package org.jackhuang.hmcl.util.sys; import com.sun.management.OperatingSystemMXBean; import java.io.BufferedReader; @@ -25,8 +25,8 @@ import java.io.InputStreamReader; import java.lang.management.ManagementFactory; import java.util.Locale; import java.util.StringTokenizer; -import org.jackhuang.hellominecraft.util.code.Charsets; -import org.jackhuang.hellominecraft.util.log.HMCLog; +import org.jackhuang.hmcl.util.code.Charsets; +import org.jackhuang.hmcl.api.HMCLog; /** * @author huangyuhui diff --git a/HMCUtils/src/main/java/org/jackhuang/hellominecraft/util/sys/Platform.java b/HMCLCore/src/main/java/org/jackhuang/hmcl/util/sys/Platform.java old mode 100755 new mode 100644 similarity index 96% rename from HMCUtils/src/main/java/org/jackhuang/hellominecraft/util/sys/Platform.java rename to HMCLCore/src/main/java/org/jackhuang/hmcl/util/sys/Platform.java index 7584050fe..c68b96a13 --- a/HMCUtils/src/main/java/org/jackhuang/hellominecraft/util/sys/Platform.java +++ b/HMCLCore/src/main/java/org/jackhuang/hmcl/util/sys/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.util.sys; +package org.jackhuang.hmcl.util.sys; /** * diff --git a/HMCUtils/src/main/java/org/jackhuang/hellominecraft/util/sys/ProcessManager.java b/HMCLCore/src/main/java/org/jackhuang/hmcl/util/sys/ProcessManager.java old mode 100755 new mode 100644 similarity index 73% rename from HMCUtils/src/main/java/org/jackhuang/hellominecraft/util/sys/ProcessManager.java rename to HMCLCore/src/main/java/org/jackhuang/hmcl/util/sys/ProcessManager.java index 70dbb8cf4..7494c577d --- a/HMCUtils/src/main/java/org/jackhuang/hellominecraft/util/sys/ProcessManager.java +++ b/HMCLCore/src/main/java/org/jackhuang/hmcl/util/sys/ProcessManager.java @@ -15,9 +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.util.sys; +package org.jackhuang.hmcl.util.sys; import java.util.HashSet; +import org.jackhuang.hmcl.api.IProcess; /** * @@ -25,19 +26,19 @@ import java.util.HashSet; */ public class ProcessManager { - private static final HashSet GAME_PROCESSES = new HashSet<>(); + private static final HashSet GAME_PROCESSES = new HashSet<>(); - public void registerProcess(JavaProcess jp) { + public static void registerProcess(IProcess jp) { GAME_PROCESSES.add(jp); } - public void stopAllProcesses() { - for (JavaProcess jp : GAME_PROCESSES) + public static void stopAllProcesses() { + for (IProcess jp : GAME_PROCESSES) jp.stop(); GAME_PROCESSES.clear(); } - public void onProcessStopped(JavaProcess p) { + public static void onProcessStopped(IProcess p) { GAME_PROCESSES.remove(p); } } diff --git a/HMCUtils/src/main/java/org/jackhuang/hellominecraft/util/sys/JavaProcessMonitor.java b/HMCLCore/src/main/java/org/jackhuang/hmcl/util/sys/ProcessMonitor.java old mode 100755 new mode 100644 similarity index 69% rename from HMCUtils/src/main/java/org/jackhuang/hellominecraft/util/sys/JavaProcessMonitor.java rename to HMCLCore/src/main/java/org/jackhuang/hmcl/util/sys/ProcessMonitor.java index 55ec3f64e..1eb78e29d --- a/HMCUtils/src/main/java/org/jackhuang/hellominecraft/util/sys/JavaProcessMonitor.java +++ b/HMCLCore/src/main/java/org/jackhuang/hmcl/util/sys/ProcessMonitor.java @@ -15,34 +15,35 @@ * 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.util.sys; +package org.jackhuang.hmcl.util.sys; import java.util.Arrays; import java.util.HashSet; -import org.jackhuang.hellominecraft.util.CollectionUtils; -import org.jackhuang.hellominecraft.api.HMCAPI; -import org.jackhuang.hellominecraft.api.event.process.JVMLaunchFailedEvent; -import org.jackhuang.hellominecraft.api.event.process.JavaProcessExitedAbnormallyEvent; -import org.jackhuang.hellominecraft.api.event.process.JavaProcessStartingEvent; -import org.jackhuang.hellominecraft.api.event.process.JavaProcessStoppedEvent; -import org.jackhuang.hellominecraft.util.StrUtils; -import org.jackhuang.hellominecraft.util.log.HMCLog; -import org.jackhuang.hellominecraft.util.log.Level; +import org.jackhuang.hmcl.util.CollectionUtils; +import org.jackhuang.hmcl.api.HMCLApi; +import org.jackhuang.hmcl.api.event.process.JVMLaunchFailedEvent; +import org.jackhuang.hmcl.api.event.process.JavaProcessExitedAbnormallyEvent; +import org.jackhuang.hmcl.api.event.process.JavaProcessStartingEvent; +import org.jackhuang.hmcl.api.event.process.JavaProcessStoppedEvent; +import org.jackhuang.hmcl.util.StrUtils; +import org.jackhuang.hmcl.api.HMCLog; +import org.jackhuang.hmcl.util.log.Level; +import org.jackhuang.hmcl.api.IProcess; /** * * @author huangyuhui */ -public class JavaProcessMonitor { +public class ProcessMonitor { private final HashSet al = new HashSet<>(); - private final JavaProcess p; + private final IProcess p; - public JavaProcessMonitor(JavaProcess p) { + public ProcessMonitor(IProcess p) { this.p = p; } - public JavaProcess getJavaProcess() { + public IProcess getProcess() { return p; } @@ -57,21 +58,21 @@ public class JavaProcessMonitor { } public void start() { - HMCAPI.EVENT_BUS.fireChannel(new JavaProcessStartingEvent(this, p)); + HMCLApi.EVENT_BUS.fireChannel(new JavaProcessStartingEvent(this, p)); ProcessThread a = new ProcessThread(p); a.stopEvent.register(event -> { HMCLog.log("Process exit code: " + p.getExitCode()); if (p.getExitCode() != 0 || StrUtils.containsOne(p.getStdOutLines(), Arrays.asList("Unable to launch"), x -> Level.guessLevel(x, Level.INFO).lessOrEqual(Level.ERROR))) - HMCAPI.EVENT_BUS.fireChannel(new JavaProcessExitedAbnormallyEvent(JavaProcessMonitor.this, p)); + HMCLApi.EVENT_BUS.fireChannel(new JavaProcessExitedAbnormallyEvent(ProcessMonitor.this, p)); if (p.getExitCode() != 0 && StrUtils.containsOne(p.getStdOutLines(), Arrays.asList("Could not create the Java Virtual Machine.", "Error occurred during initialization of VM", "A fatal exception has occurred. Program will exit.", "Unable to launch"), x -> Level.guessLevel(x, Level.INFO).lessOrEqual(Level.ERROR))) - HMCAPI.EVENT_BUS.fireChannel(new JVMLaunchFailedEvent(JavaProcessMonitor.this, p)); + HMCLApi.EVENT_BUS.fireChannel(new JVMLaunchFailedEvent(ProcessMonitor.this, p)); processThreadStopped((ProcessThread) event.getSource(), false); }); a.start(); @@ -84,7 +85,7 @@ public class JavaProcessMonitor { for (Thread a : al) a.interrupt(); al.clear(); - HMCAPI.EVENT_BUS.fireChannel(new JavaProcessStoppedEvent(this, p)); + HMCLApi.EVENT_BUS.fireChannel(new JavaProcessStoppedEvent(this, p)); } } } diff --git a/HMCUtils/src/main/java/org/jackhuang/hellominecraft/util/sys/ProcessThread.java b/HMCLCore/src/main/java/org/jackhuang/hmcl/util/sys/ProcessThread.java old mode 100755 new mode 100644 similarity index 79% rename from HMCUtils/src/main/java/org/jackhuang/hellominecraft/util/sys/ProcessThread.java rename to HMCLCore/src/main/java/org/jackhuang/hmcl/util/sys/ProcessThread.java index 5f0916110..de4723738 --- a/HMCUtils/src/main/java/org/jackhuang/hellominecraft/util/sys/ProcessThread.java +++ b/HMCLCore/src/main/java/org/jackhuang/hmcl/util/sys/ProcessThread.java @@ -15,16 +15,17 @@ * 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.util.sys; +package org.jackhuang.hmcl.util.sys; import java.io.BufferedReader; import java.io.IOException; import java.io.InputStream; import java.io.InputStreamReader; -import org.jackhuang.hellominecraft.util.log.HMCLog; -import org.jackhuang.hellominecraft.api.EventHandler; -import org.jackhuang.hellominecraft.api.SimpleEvent; -import org.jackhuang.hellominecraft.util.code.Charsets; +import org.jackhuang.hmcl.api.HMCLog; +import org.jackhuang.hmcl.api.event.EventHandler; +import org.jackhuang.hmcl.api.event.SimpleEvent; +import org.jackhuang.hmcl.util.code.Charsets; +import org.jackhuang.hmcl.api.IProcess; /** * @@ -32,16 +33,16 @@ import org.jackhuang.hellominecraft.util.code.Charsets; */ public class ProcessThread extends Thread { - JavaProcess p; + IProcess p; public final EventHandler> printlnEvent = new EventHandler<>(); - public final EventHandler> stopEvent = new EventHandler<>(); + public final EventHandler> stopEvent = new EventHandler<>(); - public ProcessThread(JavaProcess process) { + public ProcessThread(IProcess process) { p = process; } - public JavaProcess getProcess() { + public IProcess getProcess() { return p; } @@ -65,8 +66,7 @@ public class ProcessThread extends Thread { System.out.println("MC: " + line); p.getStdOutLines().add(line); } - if (p.getProcessManager() != null) - p.getProcessManager().onProcessStopped(p); + ProcessManager.onProcessStopped(p); stopEvent.fire(new SimpleEvent<>(this, p)); } catch (IOException e) { HMCLog.err("An error occured when reading process stdout/stderr.", e); diff --git a/HMCUtils/src/main/java/org/jackhuang/hellominecraft/util/sys/ZipEngine.java b/HMCLCore/src/main/java/org/jackhuang/hmcl/util/sys/ZipEngine.java similarity index 97% rename from HMCUtils/src/main/java/org/jackhuang/hellominecraft/util/sys/ZipEngine.java rename to HMCLCore/src/main/java/org/jackhuang/hmcl/util/sys/ZipEngine.java index 35b30c3a6..4f0eba237 100644 --- a/HMCUtils/src/main/java/org/jackhuang/hellominecraft/util/sys/ZipEngine.java +++ b/HMCLCore/src/main/java/org/jackhuang/hmcl/util/sys/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.util.sys; +package org.jackhuang.hmcl.util.sys; import java.io.BufferedOutputStream; import java.io.ByteArrayInputStream; @@ -27,7 +27,7 @@ import java.io.InputStream; import java.util.HashSet; import java.util.zip.ZipEntry; import java.util.zip.ZipOutputStream; -import org.jackhuang.hellominecraft.util.func.BiFunction; +import org.jackhuang.hmcl.api.func.BiFunction; /** * Non thread-safe diff --git a/HMCUtils/src/main/java/org/jackhuang/hellominecraft/util/task/DeleteFileTask.java b/HMCLCore/src/main/java/org/jackhuang/hmcl/util/task/DeleteFileTask.java similarity index 96% rename from HMCUtils/src/main/java/org/jackhuang/hellominecraft/util/task/DeleteFileTask.java rename to HMCLCore/src/main/java/org/jackhuang/hmcl/util/task/DeleteFileTask.java index 8a30bde59..89085f263 100644 --- a/HMCUtils/src/main/java/org/jackhuang/hellominecraft/util/task/DeleteFileTask.java +++ b/HMCLCore/src/main/java/org/jackhuang/hmcl/util/task/DeleteFileTask.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.util.task; +package org.jackhuang.hmcl.util.task; import java.io.File; import java.io.IOException; diff --git a/HMCUtils/src/main/java/org/jackhuang/hellominecraft/util/task/DoingDoneListener.java b/HMCLCore/src/main/java/org/jackhuang/hmcl/util/task/DoingDoneListener.java old mode 100755 new mode 100644 similarity index 95% rename from HMCUtils/src/main/java/org/jackhuang/hellominecraft/util/task/DoingDoneListener.java rename to HMCLCore/src/main/java/org/jackhuang/hmcl/util/task/DoingDoneListener.java index a2fd4adf8..7c5e7c673 --- a/HMCUtils/src/main/java/org/jackhuang/hellominecraft/util/task/DoingDoneListener.java +++ b/HMCLCore/src/main/java/org/jackhuang/hmcl/util/task/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.util.task; +package org.jackhuang.hmcl.util.task; import java.util.Collection; diff --git a/HMCUtils/src/main/java/org/jackhuang/hellominecraft/util/task/DoubleTask.java b/HMCLCore/src/main/java/org/jackhuang/hmcl/util/task/DoubleTask.java old mode 100755 new mode 100644 similarity index 96% rename from HMCUtils/src/main/java/org/jackhuang/hellominecraft/util/task/DoubleTask.java rename to HMCLCore/src/main/java/org/jackhuang/hmcl/util/task/DoubleTask.java index a6ebc5c95..ba4bed374 --- a/HMCUtils/src/main/java/org/jackhuang/hellominecraft/util/task/DoubleTask.java +++ b/HMCLCore/src/main/java/org/jackhuang/hmcl/util/task/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.util.task; +package org.jackhuang.hmcl.util.task; import java.util.Arrays; import java.util.Collection; diff --git a/HMCUtils/src/main/java/org/jackhuang/hellominecraft/util/task/NoShownTaskException.java b/HMCLCore/src/main/java/org/jackhuang/hmcl/util/task/NoShownTaskException.java similarity index 95% rename from HMCUtils/src/main/java/org/jackhuang/hellominecraft/util/task/NoShownTaskException.java rename to HMCLCore/src/main/java/org/jackhuang/hmcl/util/task/NoShownTaskException.java index fe3f620a7..40b20601d 100644 --- a/HMCUtils/src/main/java/org/jackhuang/hellominecraft/util/task/NoShownTaskException.java +++ b/HMCLCore/src/main/java/org/jackhuang/hmcl/util/task/NoShownTaskException.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.util.task; +package org.jackhuang.hmcl.util.task; /** * diff --git a/HMCUtils/src/main/java/org/jackhuang/hellominecraft/util/task/ParallelTask.java b/HMCLCore/src/main/java/org/jackhuang/hmcl/util/task/ParallelTask.java old mode 100755 new mode 100644 similarity index 96% rename from HMCUtils/src/main/java/org/jackhuang/hellominecraft/util/task/ParallelTask.java rename to HMCLCore/src/main/java/org/jackhuang/hmcl/util/task/ParallelTask.java index be9bd8a22..a85a9e333 --- a/HMCUtils/src/main/java/org/jackhuang/hellominecraft/util/task/ParallelTask.java +++ b/HMCLCore/src/main/java/org/jackhuang/hmcl/util/task/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.util.task; +package org.jackhuang.hmcl.util.task; import java.util.Collection; import java.util.HashSet; diff --git a/HMCUtils/src/main/java/org/jackhuang/hellominecraft/util/task/ProgressProviderListener.java b/HMCLCore/src/main/java/org/jackhuang/hmcl/util/task/ProgressProviderListener.java old mode 100755 new mode 100644 similarity index 95% rename from HMCUtils/src/main/java/org/jackhuang/hellominecraft/util/task/ProgressProviderListener.java rename to HMCLCore/src/main/java/org/jackhuang/hmcl/util/task/ProgressProviderListener.java index af024d88a..3ef8f23eb --- a/HMCUtils/src/main/java/org/jackhuang/hellominecraft/util/task/ProgressProviderListener.java +++ b/HMCLCore/src/main/java/org/jackhuang/hmcl/util/task/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.util.task; +package org.jackhuang.hmcl.util.task; /** * diff --git a/HMCUtils/src/main/java/org/jackhuang/hellominecraft/util/task/Task.java b/HMCLCore/src/main/java/org/jackhuang/hmcl/util/task/Task.java old mode 100755 new mode 100644 similarity index 98% rename from HMCUtils/src/main/java/org/jackhuang/hellominecraft/util/task/Task.java rename to HMCLCore/src/main/java/org/jackhuang/hmcl/util/task/Task.java index 5836a515e..0cf427d75 --- a/HMCUtils/src/main/java/org/jackhuang/hellominecraft/util/task/Task.java +++ b/HMCLCore/src/main/java/org/jackhuang/hmcl/util/task/Task.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.util.task; +package org.jackhuang.hmcl.util.task; import java.util.Collection; diff --git a/HMCUtils/src/main/java/org/jackhuang/hellominecraft/util/task/TaskInfo.java b/HMCLCore/src/main/java/org/jackhuang/hmcl/util/task/TaskInfo.java old mode 100755 new mode 100644 similarity index 95% rename from HMCUtils/src/main/java/org/jackhuang/hellominecraft/util/task/TaskInfo.java rename to HMCLCore/src/main/java/org/jackhuang/hmcl/util/task/TaskInfo.java index b01a04e25..3342d9d97 --- a/HMCUtils/src/main/java/org/jackhuang/hellominecraft/util/task/TaskInfo.java +++ b/HMCLCore/src/main/java/org/jackhuang/hmcl/util/task/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.util.task; +package org.jackhuang.hmcl.util.task; /** * diff --git a/HMCUtils/src/main/java/org/jackhuang/hellominecraft/util/task/TaskList.java b/HMCLCore/src/main/java/org/jackhuang/hmcl/util/task/TaskList.java old mode 100755 new mode 100644 similarity index 97% rename from HMCUtils/src/main/java/org/jackhuang/hellominecraft/util/task/TaskList.java rename to HMCLCore/src/main/java/org/jackhuang/hmcl/util/task/TaskList.java index 7ce99c71a..33e60bf70 --- a/HMCUtils/src/main/java/org/jackhuang/hellominecraft/util/task/TaskList.java +++ b/HMCLCore/src/main/java/org/jackhuang/hmcl/util/task/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.util.task; +package org.jackhuang.hmcl.util.task; import java.util.ArrayList; import java.util.Collection; @@ -30,8 +30,8 @@ import java.util.concurrent.ExecutorService; import java.util.concurrent.Executors; import java.util.concurrent.Future; import java.util.concurrent.atomic.AtomicBoolean; -import org.jackhuang.hellominecraft.api.EventHandler; -import org.jackhuang.hellominecraft.util.log.HMCLog; +import org.jackhuang.hmcl.api.event.EventHandler; +import org.jackhuang.hmcl.api.HMCLog; /** * diff --git a/HMCUtils/src/main/java/org/jackhuang/hellominecraft/util/task/TaskRunnable.java b/HMCLCore/src/main/java/org/jackhuang/hmcl/util/task/TaskRunnable.java old mode 100755 new mode 100644 similarity index 95% rename from HMCUtils/src/main/java/org/jackhuang/hellominecraft/util/task/TaskRunnable.java rename to HMCLCore/src/main/java/org/jackhuang/hmcl/util/task/TaskRunnable.java index b708f7944..d9013b599 --- a/HMCUtils/src/main/java/org/jackhuang/hellominecraft/util/task/TaskRunnable.java +++ b/HMCLCore/src/main/java/org/jackhuang/hmcl/util/task/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.util.task; +package org.jackhuang.hmcl.util.task; /** * diff --git a/HMCUtils/src/main/java/org/jackhuang/hellominecraft/util/task/TaskWindow.form b/HMCLCore/src/main/java/org/jackhuang/hmcl/util/task/TaskWindow.form old mode 100755 new mode 100644 similarity index 100% rename from HMCUtils/src/main/java/org/jackhuang/hellominecraft/util/task/TaskWindow.form rename to HMCLCore/src/main/java/org/jackhuang/hmcl/util/task/TaskWindow.form diff --git a/HMCUtils/src/main/java/org/jackhuang/hellominecraft/util/task/TaskWindow.java b/HMCLCore/src/main/java/org/jackhuang/hmcl/util/task/TaskWindow.java old mode 100755 new mode 100644 similarity index 97% rename from HMCUtils/src/main/java/org/jackhuang/hellominecraft/util/task/TaskWindow.java rename to HMCLCore/src/main/java/org/jackhuang/hmcl/util/task/TaskWindow.java index 1b3a553f4..499660076 --- a/HMCUtils/src/main/java/org/jackhuang/hellominecraft/util/task/TaskWindow.java +++ b/HMCLCore/src/main/java/org/jackhuang/hmcl/util/task/TaskWindow.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.util.task; +package org.jackhuang.hmcl.util.task; import java.util.ArrayList; import java.util.Collection; import java.util.LinkedList; import javax.swing.SwingUtilities; import javax.swing.table.TableColumn; -import org.jackhuang.hellominecraft.util.C; -import org.jackhuang.hellominecraft.util.log.HMCLog; -import org.jackhuang.hellominecraft.util.MessageBox; -import org.jackhuang.hellominecraft.util.StrUtils; -import org.jackhuang.hellominecraft.util.ui.SwingUtils; +import org.jackhuang.hmcl.util.C; +import org.jackhuang.hmcl.api.HMCLog; +import org.jackhuang.hmcl.util.MessageBox; +import org.jackhuang.hmcl.util.StrUtils; +import org.jackhuang.hmcl.util.ui.SwingUtils; /** * diff --git a/HMCUtils/src/main/java/org/jackhuang/hellominecraft/util/task/comm/PreviousResult.java b/HMCLCore/src/main/java/org/jackhuang/hmcl/util/task/comm/PreviousResult.java old mode 100755 new mode 100644 similarity index 94% rename from HMCUtils/src/main/java/org/jackhuang/hellominecraft/util/task/comm/PreviousResult.java rename to HMCLCore/src/main/java/org/jackhuang/hmcl/util/task/comm/PreviousResult.java index 9fa6734b4..767a223c2 --- a/HMCUtils/src/main/java/org/jackhuang/hellominecraft/util/task/comm/PreviousResult.java +++ b/HMCLCore/src/main/java/org/jackhuang/hmcl/util/task/comm/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.util.task.comm; +package org.jackhuang.hmcl.util.task.comm; /** * diff --git a/HMCUtils/src/main/java/org/jackhuang/hellominecraft/util/task/comm/PreviousResultRegistrar.java b/HMCLCore/src/main/java/org/jackhuang/hmcl/util/task/comm/PreviousResultRegistrar.java old mode 100755 new mode 100644 similarity index 90% rename from HMCUtils/src/main/java/org/jackhuang/hellominecraft/util/task/comm/PreviousResultRegistrar.java rename to HMCLCore/src/main/java/org/jackhuang/hmcl/util/task/comm/PreviousResultRegistrar.java index 1849491f2..eb6afc517 --- a/HMCUtils/src/main/java/org/jackhuang/hellominecraft/util/task/comm/PreviousResultRegistrar.java +++ b/HMCLCore/src/main/java/org/jackhuang/hmcl/util/task/comm/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.util.task.comm; +package org.jackhuang.hmcl.util.task.comm; -import org.jackhuang.hellominecraft.util.task.Task; +import org.jackhuang.hmcl.util.task.Task; /** * diff --git a/HMCUtils/src/main/java/org/jackhuang/hellominecraft/util/ui/AbstractFilter.java b/HMCLCore/src/main/java/org/jackhuang/hmcl/util/ui/AbstractFilter.java old mode 100755 new mode 100644 similarity index 97% rename from HMCUtils/src/main/java/org/jackhuang/hellominecraft/util/ui/AbstractFilter.java rename to HMCLCore/src/main/java/org/jackhuang/hmcl/util/ui/AbstractFilter.java index af41c8145..005c173ef --- a/HMCUtils/src/main/java/org/jackhuang/hellominecraft/util/ui/AbstractFilter.java +++ b/HMCLCore/src/main/java/org/jackhuang/hmcl/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.util.ui; +package org.jackhuang.hmcl.util.ui; import java.awt.Rectangle; import java.awt.RenderingHints; diff --git a/HMCUtils/src/main/java/org/jackhuang/hellominecraft/util/ui/BasicColors.java b/HMCLCore/src/main/java/org/jackhuang/hmcl/util/ui/BasicColors.java old mode 100755 new mode 100644 similarity index 97% rename from HMCUtils/src/main/java/org/jackhuang/hellominecraft/util/ui/BasicColors.java rename to HMCLCore/src/main/java/org/jackhuang/hmcl/util/ui/BasicColors.java index 5031117fa..38702da5d --- a/HMCUtils/src/main/java/org/jackhuang/hellominecraft/util/ui/BasicColors.java +++ b/HMCLCore/src/main/java/org/jackhuang/hmcl/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.util.ui; +package org.jackhuang.hmcl.util.ui; import java.awt.Color; diff --git a/HMCUtils/src/main/java/org/jackhuang/hellominecraft/util/ui/DropShadowBorder.java b/HMCLCore/src/main/java/org/jackhuang/hmcl/util/ui/DropShadowBorder.java old mode 100755 new mode 100644 similarity index 97% rename from HMCUtils/src/main/java/org/jackhuang/hellominecraft/util/ui/DropShadowBorder.java rename to HMCLCore/src/main/java/org/jackhuang/hmcl/util/ui/DropShadowBorder.java index 75148c195..2ce3ac780 --- a/HMCUtils/src/main/java/org/jackhuang/hellominecraft/util/ui/DropShadowBorder.java +++ b/HMCLCore/src/main/java/org/jackhuang/hmcl/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.util.ui; +package org.jackhuang.hmcl.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.util.Pair; +import org.jackhuang.hmcl.util.Pair; public class DropShadowBorder extends AbstractBorder { diff --git a/HMCUtils/src/main/java/org/jackhuang/hellominecraft/util/ui/FastBlurFilter.java b/HMCLCore/src/main/java/org/jackhuang/hmcl/util/ui/FastBlurFilter.java old mode 100755 new mode 100644 similarity index 99% rename from HMCUtils/src/main/java/org/jackhuang/hellominecraft/util/ui/FastBlurFilter.java rename to HMCLCore/src/main/java/org/jackhuang/hmcl/util/ui/FastBlurFilter.java index 93eae016b..087d4252d --- a/HMCUtils/src/main/java/org/jackhuang/hellominecraft/util/ui/FastBlurFilter.java +++ b/HMCLCore/src/main/java/org/jackhuang/hmcl/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.util.ui; +package org.jackhuang.hmcl.util.ui; import java.awt.image.BufferedImage; diff --git a/HMCUtils/src/main/java/org/jackhuang/hellominecraft/util/ui/GaussionPanel.java b/HMCLCore/src/main/java/org/jackhuang/hmcl/util/ui/GaussionPanel.java similarity index 98% rename from HMCUtils/src/main/java/org/jackhuang/hellominecraft/util/ui/GaussionPanel.java rename to HMCLCore/src/main/java/org/jackhuang/hmcl/util/ui/GaussionPanel.java index efe65bd10..8f5b466da 100644 --- a/HMCUtils/src/main/java/org/jackhuang/hellominecraft/util/ui/GaussionPanel.java +++ b/HMCLCore/src/main/java/org/jackhuang/hmcl/util/ui/GaussionPanel.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.util.ui; +package org.jackhuang.hmcl.util.ui; import java.awt.AlphaComposite; import java.awt.Color; diff --git a/HMCUtils/src/main/java/org/jackhuang/hellominecraft/util/ui/GraphicsUtils.java b/HMCLCore/src/main/java/org/jackhuang/hmcl/util/ui/GraphicsUtils.java old mode 100755 new mode 100644 similarity index 92% rename from HMCUtils/src/main/java/org/jackhuang/hellominecraft/util/ui/GraphicsUtils.java rename to HMCLCore/src/main/java/org/jackhuang/hmcl/util/ui/GraphicsUtils.java index 6593e56f0..672418db2 --- a/HMCUtils/src/main/java/org/jackhuang/hellominecraft/util/ui/GraphicsUtils.java +++ b/HMCLCore/src/main/java/org/jackhuang/hmcl/util/ui/GraphicsUtils.java @@ -1,4 +1,4 @@ -package org.jackhuang.hellominecraft.util.ui; +package org.jackhuang.hmcl.util.ui; import java.awt.Color; import java.awt.Graphics; @@ -9,7 +9,6 @@ import java.awt.image.BufferedImage; import java.awt.image.Raster; import java.awt.image.WritableRaster; import java.util.Map; -import javax.imageio.ImageIO; import javax.swing.plaf.synth.SynthContext; import javax.swing.plaf.synth.SynthGraphicsUtils; @@ -91,25 +90,6 @@ public class GraphicsUtils extends SynthGraphicsUtils { oldAA); } - /** - * Load an image using ImageIO from resource in - * org.jdesktop.swingx.plaf.nimbus.images. Catches and prints all Exceptions - * so that it can safely be used in a static context. - * - * @param imgName The name of the image to load, eg. "border.png" - * - * @return The loaded image - */ - public static BufferedImage loadImage(String imgName) { - try { - return ImageIO.read(GraphicsUtils.class.getClassLoader().getResource("org/jackhuang/hellominecraft/lookandfeel/images/" + imgName)); - } catch (Exception e) { - System.err.println("Error loading image \"org/jackhuang/hellominecraft/lookandfeel/images/" + imgName + "\""); - e.printStackTrace(); - } - return null; - } - public static String getColor(Color c) { return Integer.toHexString(c.getRGB() & 0xFFFFFF); } diff --git a/HMCUtils/src/main/java/org/jackhuang/hellominecraft/util/ui/IRepaint.java b/HMCLCore/src/main/java/org/jackhuang/hmcl/util/ui/IRepaint.java similarity index 96% rename from HMCUtils/src/main/java/org/jackhuang/hellominecraft/util/ui/IRepaint.java rename to HMCLCore/src/main/java/org/jackhuang/hmcl/util/ui/IRepaint.java index cb8952729..4e5c9aca7 100644 --- a/HMCUtils/src/main/java/org/jackhuang/hellominecraft/util/ui/IRepaint.java +++ b/HMCLCore/src/main/java/org/jackhuang/hmcl/util/ui/IRepaint.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.util.ui; +package org.jackhuang.hmcl.util.ui; import java.awt.Rectangle; import java.awt.Window; diff --git a/HMCUtils/src/main/java/org/jackhuang/hellominecraft/util/ui/JSystemFileChooser.java b/HMCLCore/src/main/java/org/jackhuang/hmcl/util/ui/JSystemFileChooser.java similarity index 97% rename from HMCUtils/src/main/java/org/jackhuang/hellominecraft/util/ui/JSystemFileChooser.java rename to HMCLCore/src/main/java/org/jackhuang/hmcl/util/ui/JSystemFileChooser.java index be74b8d71..88d25f241 100644 --- a/HMCUtils/src/main/java/org/jackhuang/hellominecraft/util/ui/JSystemFileChooser.java +++ b/HMCLCore/src/main/java/org/jackhuang/hmcl/util/ui/JSystemFileChooser.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.util.ui; +package org.jackhuang.hmcl.util.ui; import java.awt.Color; import java.io.File; diff --git a/HMCUtils/src/main/java/org/jackhuang/hellominecraft/util/ui/MyRepaintManager.java b/HMCLCore/src/main/java/org/jackhuang/hmcl/util/ui/MyRepaintManager.java similarity index 97% rename from HMCUtils/src/main/java/org/jackhuang/hellominecraft/util/ui/MyRepaintManager.java rename to HMCLCore/src/main/java/org/jackhuang/hmcl/util/ui/MyRepaintManager.java index 7a871ec9a..2171c8f3d 100644 --- a/HMCUtils/src/main/java/org/jackhuang/hellominecraft/util/ui/MyRepaintManager.java +++ b/HMCLCore/src/main/java/org/jackhuang/hmcl/util/ui/MyRepaintManager.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.util.ui; +package org.jackhuang.hmcl.util.ui; import java.awt.Container; import java.awt.Rectangle; diff --git a/HMCUtils/src/main/java/org/jackhuang/hellominecraft/util/ui/Page.java b/HMCLCore/src/main/java/org/jackhuang/hmcl/util/ui/Page.java old mode 100755 new mode 100644 similarity index 96% rename from HMCUtils/src/main/java/org/jackhuang/hellominecraft/util/ui/Page.java rename to HMCLCore/src/main/java/org/jackhuang/hmcl/util/ui/Page.java index 95317c808..fd12f16c2 --- a/HMCUtils/src/main/java/org/jackhuang/hellominecraft/util/ui/Page.java +++ b/HMCLCore/src/main/java/org/jackhuang/hmcl/util/ui/Page.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.util.ui; +package org.jackhuang.hmcl.util.ui; +import org.jackhuang.hmcl.api.ui.TopTabPage; import java.awt.AlphaComposite; import java.awt.Graphics; import java.awt.Graphics2D; import java.awt.image.BufferedImage; -import javax.swing.JPanel; import javax.swing.SwingUtilities; import javax.swing.Timer; @@ -29,7 +29,7 @@ import javax.swing.Timer; * * @author huangyuhui */ -public class Page extends JPanel implements Selectable { +public class Page extends TopTabPage { boolean selected = false; diff --git a/HMCUtils/src/main/java/org/jackhuang/hellominecraft/util/ui/StackBlurFilter.java b/HMCLCore/src/main/java/org/jackhuang/hmcl/util/ui/StackBlurFilter.java similarity index 99% rename from HMCUtils/src/main/java/org/jackhuang/hellominecraft/util/ui/StackBlurFilter.java rename to HMCLCore/src/main/java/org/jackhuang/hmcl/util/ui/StackBlurFilter.java index 4156f6b07..f7a825b60 100644 --- a/HMCUtils/src/main/java/org/jackhuang/hellominecraft/util/ui/StackBlurFilter.java +++ b/HMCLCore/src/main/java/org/jackhuang/hmcl/util/ui/StackBlurFilter.java @@ -1,4 +1,4 @@ -package org.jackhuang.hellominecraft.util.ui; +package org.jackhuang.hmcl.util.ui; /* * Copyright (c) 2007, Romain Guy diff --git a/HMCUtils/src/main/java/org/jackhuang/hellominecraft/util/ui/SwingUtils.java b/HMCLCore/src/main/java/org/jackhuang/hmcl/util/ui/SwingUtils.java old mode 100755 new mode 100644 similarity index 97% rename from HMCUtils/src/main/java/org/jackhuang/hellominecraft/util/ui/SwingUtils.java rename to HMCLCore/src/main/java/org/jackhuang/hmcl/util/ui/SwingUtils.java index 3635d5299..d147e5f93 --- a/HMCUtils/src/main/java/org/jackhuang/hellominecraft/util/ui/SwingUtils.java +++ b/HMCLCore/src/main/java/org/jackhuang/hmcl/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.util.ui; +package org.jackhuang.hmcl.util.ui; import java.awt.Component; import java.awt.EventQueue; @@ -44,13 +44,13 @@ import javax.swing.JScrollPane; import javax.swing.JTable; import javax.swing.SwingUtilities; import javax.swing.table.DefaultTableModel; -import org.jackhuang.hellominecraft.util.C; -import org.jackhuang.hellominecraft.util.log.HMCLog; -import org.jackhuang.hellominecraft.util.MessageBox; -import org.jackhuang.hellominecraft.util.StrUtils; -import org.jackhuang.hellominecraft.util.Utils; -import org.jackhuang.hellominecraft.util.func.NonFunction; -import org.jackhuang.hellominecraft.util.sys.OS; +import org.jackhuang.hmcl.util.C; +import org.jackhuang.hmcl.api.HMCLog; +import org.jackhuang.hmcl.util.MessageBox; +import org.jackhuang.hmcl.util.StrUtils; +import org.jackhuang.hmcl.util.Utils; +import org.jackhuang.hmcl.api.func.NonFunction; +import org.jackhuang.hmcl.util.sys.OS; /** * diff --git a/HMCUtils/src/main/java/org/jackhuang/hellominecraft/util/ui/TintablePanel.java b/HMCLCore/src/main/java/org/jackhuang/hmcl/util/ui/TintablePanel.java old mode 100755 new mode 100644 similarity index 98% rename from HMCUtils/src/main/java/org/jackhuang/hellominecraft/util/ui/TintablePanel.java rename to HMCLCore/src/main/java/org/jackhuang/hmcl/util/ui/TintablePanel.java index 9bc967dda..8845c937c --- a/HMCUtils/src/main/java/org/jackhuang/hellominecraft/util/ui/TintablePanel.java +++ b/HMCLCore/src/main/java/org/jackhuang/hmcl/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.util.ui; +package org.jackhuang.hmcl.util.ui; /** * diff --git a/HMCUtils/src/main/java/org/jackhuang/hellominecraft/util/ui/WideComboBox.java b/HMCLCore/src/main/java/org/jackhuang/hmcl/util/ui/WideComboBox.java similarity index 97% rename from HMCUtils/src/main/java/org/jackhuang/hellominecraft/util/ui/WideComboBox.java rename to HMCLCore/src/main/java/org/jackhuang/hmcl/util/ui/WideComboBox.java index 2f86e209c..233a22ed3 100644 --- a/HMCUtils/src/main/java/org/jackhuang/hellominecraft/util/ui/WideComboBox.java +++ b/HMCLCore/src/main/java/org/jackhuang/hmcl/util/ui/WideComboBox.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.util.ui; +package org.jackhuang.hmcl.util.ui; import java.awt.Dimension; import java.awt.FontMetrics; diff --git a/HMCUtils/src/main/java/org/jackhuang/hellominecraft/util/ui/checktree/CheckBoxTreeCellRenderer.java b/HMCLCore/src/main/java/org/jackhuang/hmcl/util/ui/checktree/CheckBoxTreeCellRenderer.java similarity index 98% rename from HMCUtils/src/main/java/org/jackhuang/hellominecraft/util/ui/checktree/CheckBoxTreeCellRenderer.java rename to HMCLCore/src/main/java/org/jackhuang/hmcl/util/ui/checktree/CheckBoxTreeCellRenderer.java index f82ab5d0f..e31bae52c 100644 --- a/HMCUtils/src/main/java/org/jackhuang/hellominecraft/util/ui/checktree/CheckBoxTreeCellRenderer.java +++ b/HMCLCore/src/main/java/org/jackhuang/hmcl/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.util.ui.checktree; +package org.jackhuang.hmcl.util.ui.checktree; import java.awt.Color; import java.awt.Component; diff --git a/HMCUtils/src/main/java/org/jackhuang/hellominecraft/util/ui/checktree/CheckBoxTreeLabel.java b/HMCLCore/src/main/java/org/jackhuang/hmcl/util/ui/checktree/CheckBoxTreeLabel.java similarity index 97% rename from HMCUtils/src/main/java/org/jackhuang/hellominecraft/util/ui/checktree/CheckBoxTreeLabel.java rename to HMCLCore/src/main/java/org/jackhuang/hmcl/util/ui/checktree/CheckBoxTreeLabel.java index 5de62fa71..292addd0d 100644 --- a/HMCUtils/src/main/java/org/jackhuang/hellominecraft/util/ui/checktree/CheckBoxTreeLabel.java +++ b/HMCLCore/src/main/java/org/jackhuang/hmcl/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.util.ui.checktree; +package org.jackhuang.hmcl.util.ui.checktree; import java.awt.Color; import java.awt.Dimension; diff --git a/HMCUtils/src/main/java/org/jackhuang/hellominecraft/util/ui/checktree/CheckBoxTreeNode.java b/HMCLCore/src/main/java/org/jackhuang/hmcl/util/ui/checktree/CheckBoxTreeNode.java similarity index 97% rename from HMCUtils/src/main/java/org/jackhuang/hellominecraft/util/ui/checktree/CheckBoxTreeNode.java rename to HMCLCore/src/main/java/org/jackhuang/hmcl/util/ui/checktree/CheckBoxTreeNode.java index d231aa402..aaa474af1 100644 --- a/HMCUtils/src/main/java/org/jackhuang/hellominecraft/util/ui/checktree/CheckBoxTreeNode.java +++ b/HMCLCore/src/main/java/org/jackhuang/hmcl/util/ui/checktree/CheckBoxTreeNode.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.util.ui.checktree; +package org.jackhuang.hmcl.util.ui.checktree; import javax.swing.tree.DefaultMutableTreeNode; -import org.jackhuang.hellominecraft.util.Pair; +import org.jackhuang.hmcl.util.Pair; /** * diff --git a/HMCUtils/src/main/java/org/jackhuang/hellominecraft/util/ui/checktree/CheckBoxTreeNodeSelectionListener.java b/HMCLCore/src/main/java/org/jackhuang/hmcl/util/ui/checktree/CheckBoxTreeNodeSelectionListener.java similarity index 96% rename from HMCUtils/src/main/java/org/jackhuang/hellominecraft/util/ui/checktree/CheckBoxTreeNodeSelectionListener.java rename to HMCLCore/src/main/java/org/jackhuang/hmcl/util/ui/checktree/CheckBoxTreeNodeSelectionListener.java index 075347f01..0c7ed61c8 100644 --- a/HMCUtils/src/main/java/org/jackhuang/hellominecraft/util/ui/checktree/CheckBoxTreeNodeSelectionListener.java +++ b/HMCLCore/src/main/java/org/jackhuang/hmcl/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.util.ui.checktree; +package org.jackhuang.hmcl.util.ui.checktree; import java.awt.event.MouseAdapter; import java.awt.event.MouseEvent; diff --git a/HMCUtils/src/main/java/org/jackhuang/hellominecraft/util/ui/wizard/api/WizardDisplayer.java b/HMCLCore/src/main/java/org/jackhuang/hmcl/util/ui/wizard/api/WizardDisplayer.java similarity index 96% rename from HMCUtils/src/main/java/org/jackhuang/hellominecraft/util/ui/wizard/api/WizardDisplayer.java rename to HMCLCore/src/main/java/org/jackhuang/hmcl/util/ui/wizard/api/WizardDisplayer.java index dbf770c4d..5387aa166 100644 --- a/HMCUtils/src/main/java/org/jackhuang/hellominecraft/util/ui/wizard/api/WizardDisplayer.java +++ b/HMCLCore/src/main/java/org/jackhuang/hmcl/util/ui/wizard/api/WizardDisplayer.java @@ -10,16 +10,16 @@ * enclosed by brackets [] replaced by your own identifying information: * "Portions Copyrighted [year] [name of copyright owner]" */ -package org.jackhuang.hellominecraft.util.ui.wizard.api; +package org.jackhuang.hmcl.util.ui.wizard.api; import java.awt.Container; import java.awt.Rectangle; import java.util.Arrays; import java.util.Map; import javax.swing.Action; -import org.jackhuang.hellominecraft.util.ArrayUtils; -import org.jackhuang.hellominecraft.util.ui.wizard.api.displayer.WizardDisplayerImpl; -import org.jackhuang.hellominecraft.util.ui.wizard.spi.Wizard; +import org.jackhuang.hmcl.util.ArrayUtils; +import org.jackhuang.hmcl.util.ui.wizard.api.displayer.WizardDisplayerImpl; +import org.jackhuang.hmcl.util.ui.wizard.spi.Wizard; /** *

Displaying Wizards

diff --git a/HMCUtils/src/main/java/org/jackhuang/hellominecraft/util/ui/wizard/api/WizardResultReceiver.java b/HMCLCore/src/main/java/org/jackhuang/hmcl/util/ui/wizard/api/WizardResultReceiver.java similarity index 96% rename from HMCUtils/src/main/java/org/jackhuang/hellominecraft/util/ui/wizard/api/WizardResultReceiver.java rename to HMCLCore/src/main/java/org/jackhuang/hmcl/util/ui/wizard/api/WizardResultReceiver.java index 8f91309bb..27bc989be 100644 --- a/HMCUtils/src/main/java/org/jackhuang/hellominecraft/util/ui/wizard/api/WizardResultReceiver.java +++ b/HMCLCore/src/main/java/org/jackhuang/hmcl/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.util.ui.wizard.api; +package org.jackhuang.hmcl.util.ui.wizard.api; import java.util.Map; diff --git a/HMCUtils/src/main/java/org/jackhuang/hellominecraft/util/ui/wizard/api/displayer/InstructionsPanel.java b/HMCLCore/src/main/java/org/jackhuang/hmcl/util/ui/wizard/api/displayer/InstructionsPanel.java similarity index 94% rename from HMCUtils/src/main/java/org/jackhuang/hellominecraft/util/ui/wizard/api/displayer/InstructionsPanel.java rename to HMCLCore/src/main/java/org/jackhuang/hmcl/util/ui/wizard/api/displayer/InstructionsPanel.java index 11e9243f0..08a6ac03d 100644 --- a/HMCUtils/src/main/java/org/jackhuang/hellominecraft/util/ui/wizard/api/displayer/InstructionsPanel.java +++ b/HMCLCore/src/main/java/org/jackhuang/hmcl/util/ui/wizard/api/displayer/InstructionsPanel.java @@ -3,7 +3,7 @@ * and open the template in the editor. */ -package org.jackhuang.hellominecraft.util.ui.wizard.api.displayer; +package org.jackhuang.hmcl.util.ui.wizard.api.displayer; import java.awt.Container; diff --git a/HMCUtils/src/main/java/org/jackhuang/hellominecraft/util/ui/wizard/api/displayer/NavButtonManager.java b/HMCLCore/src/main/java/org/jackhuang/hmcl/util/ui/wizard/api/displayer/NavButtonManager.java similarity index 96% rename from HMCUtils/src/main/java/org/jackhuang/hellominecraft/util/ui/wizard/api/displayer/NavButtonManager.java rename to HMCLCore/src/main/java/org/jackhuang/hmcl/util/ui/wizard/api/displayer/NavButtonManager.java index 30d5d7776..b297cb2b4 100644 --- a/HMCUtils/src/main/java/org/jackhuang/hellominecraft/util/ui/wizard/api/displayer/NavButtonManager.java +++ b/HMCLCore/src/main/java/org/jackhuang/hmcl/util/ui/wizard/api/displayer/NavButtonManager.java @@ -2,7 +2,7 @@ * NavButtonManager.java created on Dec 9, 2006 * */ -package org.jackhuang.hellominecraft.util.ui.wizard.api.displayer; +package org.jackhuang.hmcl.util.ui.wizard.api.displayer; import java.awt.Cursor; import java.awt.Dimension; @@ -22,15 +22,15 @@ import javax.swing.JOptionPane; import javax.swing.JPanel; import javax.swing.JRootPane; import javax.swing.UIManager; -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; +import org.jackhuang.hmcl.util.C; +import org.jackhuang.hmcl.util.ui.wizard.modules.MergeMap; +import org.jackhuang.hmcl.util.ui.wizard.spi.DeferredWizardResult; +import org.jackhuang.hmcl.util.ui.wizard.spi.Summary; +import org.jackhuang.hmcl.util.ui.wizard.spi.Wizard; +import org.jackhuang.hmcl.util.ui.wizard.spi.WizardException; +import org.jackhuang.hmcl.util.ui.wizard.spi.WizardObserver; +import org.jackhuang.hmcl.util.ui.wizard.spi.WizardPanel; +import org.jackhuang.hmcl.util.ui.wizard.spi.WizardPanelNavResult; /** * Manage the button state and interaction with the wizard. diff --git a/HMCUtils/src/main/java/org/jackhuang/hellominecraft/util/ui/wizard/api/displayer/NavProgress.java b/HMCLCore/src/main/java/org/jackhuang/hmcl/util/ui/wizard/api/displayer/NavProgress.java similarity index 93% rename from HMCUtils/src/main/java/org/jackhuang/hellominecraft/util/ui/wizard/api/displayer/NavProgress.java rename to HMCLCore/src/main/java/org/jackhuang/hmcl/util/ui/wizard/api/displayer/NavProgress.java index f19defe4d..d168f5c86 100644 --- a/HMCUtils/src/main/java/org/jackhuang/hellominecraft/util/ui/wizard/api/displayer/NavProgress.java +++ b/HMCLCore/src/main/java/org/jackhuang/hmcl/util/ui/wizard/api/displayer/NavProgress.java @@ -1,4 +1,4 @@ -package org.jackhuang.hellominecraft.util.ui.wizard.api.displayer; +package org.jackhuang.hmcl.util.ui.wizard.api.displayer; import java.awt.Container; import java.awt.EventQueue; @@ -7,10 +7,10 @@ import java.lang.reflect.InvocationTargetException; import javax.swing.JLabel; import javax.swing.JProgressBar; import javax.swing.border.EmptyBorder; -import org.jackhuang.hellominecraft.util.C; -import org.jackhuang.hellominecraft.util.log.HMCLog; -import org.jackhuang.hellominecraft.util.ui.wizard.spi.ResultProgressHandle; -import org.jackhuang.hellominecraft.util.ui.wizard.spi.Summary; +import org.jackhuang.hmcl.util.C; +import org.jackhuang.hmcl.api.HMCLog; +import org.jackhuang.hmcl.util.ui.wizard.spi.ResultProgressHandle; +import org.jackhuang.hmcl.util.ui.wizard.spi.Summary; /** * Show progress bar for deferred results, with a label showing percent done and diff --git a/HMCUtils/src/main/java/org/jackhuang/hellominecraft/util/ui/wizard/api/displayer/WizardDisplayerImpl.java b/HMCLCore/src/main/java/org/jackhuang/hmcl/util/ui/wizard/api/displayer/WizardDisplayerImpl.java similarity index 95% rename from HMCUtils/src/main/java/org/jackhuang/hellominecraft/util/ui/wizard/api/displayer/WizardDisplayerImpl.java rename to HMCLCore/src/main/java/org/jackhuang/hmcl/util/ui/wizard/api/displayer/WizardDisplayerImpl.java index 4e908c3eb..ed27578b3 100644 --- a/HMCUtils/src/main/java/org/jackhuang/hellominecraft/util/ui/wizard/api/displayer/WizardDisplayerImpl.java +++ b/HMCLCore/src/main/java/org/jackhuang/hmcl/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.util.ui.wizard.api.displayer; +package org.jackhuang.hmcl.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.util.C; -import org.jackhuang.hellominecraft.util.log.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; +import org.jackhuang.hmcl.util.C; +import org.jackhuang.hmcl.api.HMCLog; +import org.jackhuang.hmcl.util.ui.wizard.api.WizardDisplayer; +import org.jackhuang.hmcl.util.ui.wizard.api.WizardResultReceiver; +import org.jackhuang.hmcl.util.ui.wizard.modules.InstructionsPanelImpl; +import org.jackhuang.hmcl.util.ui.wizard.modules.MergeMap; +import org.jackhuang.hmcl.util.ui.wizard.spi.DeferredWizardResult; +import org.jackhuang.hmcl.util.ui.wizard.spi.ResultProgressHandle; +import org.jackhuang.hmcl.util.ui.wizard.spi.Summary; +import org.jackhuang.hmcl.util.ui.wizard.spi.Wizard; +import org.jackhuang.hmcl.util.ui.wizard.spi.WizardPanel; /** * Default implementation of WizardDisplayer. diff --git a/HMCUtils/src/main/java/org/jackhuang/hellominecraft/util/ui/wizard/modules/InstructionsPanelImpl.java b/HMCLCore/src/main/java/org/jackhuang/hmcl/util/ui/wizard/modules/InstructionsPanelImpl.java similarity index 97% rename from HMCUtils/src/main/java/org/jackhuang/hellominecraft/util/ui/wizard/modules/InstructionsPanelImpl.java rename to HMCLCore/src/main/java/org/jackhuang/hmcl/util/ui/wizard/modules/InstructionsPanelImpl.java index cad6733f5..ef4f961ce 100644 --- a/HMCUtils/src/main/java/org/jackhuang/hellominecraft/util/ui/wizard/modules/InstructionsPanelImpl.java +++ b/HMCLCore/src/main/java/org/jackhuang/hmcl/util/ui/wizard/modules/InstructionsPanelImpl.java @@ -15,7 +15,7 @@ * * Created on March 4, 2005, 8:59 PM */ -package org.jackhuang.hellominecraft.util.ui.wizard.modules; +package org.jackhuang.hmcl.util.ui.wizard.modules; import java.awt.Color; import java.awt.Component; @@ -43,11 +43,11 @@ import javax.swing.CellRendererPane; import javax.swing.JComponent; import javax.swing.JEditorPane; import javax.swing.UIManager; -import org.jackhuang.hellominecraft.util.C; -import org.jackhuang.hellominecraft.util.log.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; +import org.jackhuang.hmcl.util.C; +import org.jackhuang.hmcl.api.HMCLog; +import org.jackhuang.hmcl.util.ui.wizard.api.displayer.InstructionsPanel; +import org.jackhuang.hmcl.util.ui.wizard.spi.Wizard; +import org.jackhuang.hmcl.util.ui.wizard.spi.WizardObserver; /** * A panel that displays a background image and optionally instructions from a diff --git a/HMCUtils/src/main/java/org/jackhuang/hellominecraft/util/ui/wizard/modules/MergeMap.java b/HMCLCore/src/main/java/org/jackhuang/hmcl/util/ui/wizard/modules/MergeMap.java similarity index 99% rename from HMCUtils/src/main/java/org/jackhuang/hellominecraft/util/ui/wizard/modules/MergeMap.java rename to HMCLCore/src/main/java/org/jackhuang/hmcl/util/ui/wizard/modules/MergeMap.java index 238fb1145..0e6baa493 100644 --- a/HMCUtils/src/main/java/org/jackhuang/hellominecraft/util/ui/wizard/modules/MergeMap.java +++ b/HMCLCore/src/main/java/org/jackhuang/hmcl/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.util.ui.wizard.modules; +package org.jackhuang.hmcl.util.ui.wizard.modules; import java.util.ArrayList; import java.util.Collection; diff --git a/HMCUtils/src/main/java/org/jackhuang/hellominecraft/util/ui/wizard/spi/AbstractWizard.java b/HMCLCore/src/main/java/org/jackhuang/hmcl/util/ui/wizard/spi/AbstractWizard.java similarity index 92% rename from HMCUtils/src/main/java/org/jackhuang/hellominecraft/util/ui/wizard/spi/AbstractWizard.java rename to HMCLCore/src/main/java/org/jackhuang/hmcl/util/ui/wizard/spi/AbstractWizard.java index 809cb5556..507be421a 100644 --- a/HMCUtils/src/main/java/org/jackhuang/hellominecraft/util/ui/wizard/spi/AbstractWizard.java +++ b/HMCLCore/src/main/java/org/jackhuang/hmcl/util/ui/wizard/spi/AbstractWizard.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.util.ui.wizard.spi; +package org.jackhuang.hmcl.util.ui.wizard.spi; import java.util.Collections; import java.util.LinkedList; import java.util.List; -import org.jackhuang.hellominecraft.util.func.Consumer; +import org.jackhuang.hmcl.api.func.Consumer; /** * diff --git a/HMCUtils/src/main/java/org/jackhuang/hellominecraft/util/ui/wizard/spi/BranchingWizard.java b/HMCLCore/src/main/java/org/jackhuang/hmcl/util/ui/wizard/spi/BranchingWizard.java similarity index 99% rename from HMCUtils/src/main/java/org/jackhuang/hellominecraft/util/ui/wizard/spi/BranchingWizard.java rename to HMCLCore/src/main/java/org/jackhuang/hmcl/util/ui/wizard/spi/BranchingWizard.java index ffeaedd8b..293e4c1d8 100644 --- a/HMCUtils/src/main/java/org/jackhuang/hellominecraft/util/ui/wizard/spi/BranchingWizard.java +++ b/HMCLCore/src/main/java/org/jackhuang/hmcl/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.util.ui.wizard.spi; +package org.jackhuang.hmcl.util.ui.wizard.spi; import javax.swing.*; import java.util.Arrays; diff --git a/HMCUtils/src/main/java/org/jackhuang/hellominecraft/util/ui/wizard/spi/DeferredWizardResult.java b/HMCLCore/src/main/java/org/jackhuang/hmcl/util/ui/wizard/spi/DeferredWizardResult.java similarity index 97% rename from HMCUtils/src/main/java/org/jackhuang/hellominecraft/util/ui/wizard/spi/DeferredWizardResult.java rename to HMCLCore/src/main/java/org/jackhuang/hmcl/util/ui/wizard/spi/DeferredWizardResult.java index 5957c894a..82804f329 100644 --- a/HMCUtils/src/main/java/org/jackhuang/hellominecraft/util/ui/wizard/spi/DeferredWizardResult.java +++ b/HMCLCore/src/main/java/org/jackhuang/hmcl/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.util.ui.wizard.spi; +package org.jackhuang.hmcl.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.util.ui.wizard.spi.ResultProgressHandle + * @see org.jackhuang.hmcl.util.ui.wizard.spi.ResultProgressHandle * * @author Tim Boudreau */ diff --git a/HMCUtils/src/main/java/org/jackhuang/hellominecraft/util/ui/wizard/spi/GenericListener.java b/HMCLCore/src/main/java/org/jackhuang/hmcl/util/ui/wizard/spi/GenericListener.java similarity index 99% rename from HMCUtils/src/main/java/org/jackhuang/hellominecraft/util/ui/wizard/spi/GenericListener.java rename to HMCLCore/src/main/java/org/jackhuang/hmcl/util/ui/wizard/spi/GenericListener.java index 171211176..04569bb49 100644 --- a/HMCUtils/src/main/java/org/jackhuang/hellominecraft/util/ui/wizard/spi/GenericListener.java +++ b/HMCLCore/src/main/java/org/jackhuang/hmcl/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.util.ui.wizard.spi; +package org.jackhuang.hmcl.util.ui.wizard.spi; import java.awt.Component; import java.awt.Container; diff --git a/HMCUtils/src/main/java/org/jackhuang/hellominecraft/util/ui/wizard/spi/ResultProgressHandle.java b/HMCLCore/src/main/java/org/jackhuang/hmcl/util/ui/wizard/spi/ResultProgressHandle.java similarity index 98% rename from HMCUtils/src/main/java/org/jackhuang/hellominecraft/util/ui/wizard/spi/ResultProgressHandle.java rename to HMCLCore/src/main/java/org/jackhuang/hmcl/util/ui/wizard/spi/ResultProgressHandle.java index 792fc13b8..4f1a43600 100644 --- a/HMCUtils/src/main/java/org/jackhuang/hellominecraft/util/ui/wizard/spi/ResultProgressHandle.java +++ b/HMCLCore/src/main/java/org/jackhuang/hmcl/util/ui/wizard/spi/ResultProgressHandle.java @@ -1,4 +1,4 @@ -package org.jackhuang.hellominecraft.util.ui.wizard.spi; +package org.jackhuang.hmcl.util.ui.wizard.spi; import java.awt.Container; diff --git a/HMCUtils/src/main/java/org/jackhuang/hellominecraft/util/ui/wizard/spi/SimpleWizard.java b/HMCLCore/src/main/java/org/jackhuang/hmcl/util/ui/wizard/spi/SimpleWizard.java similarity index 99% rename from HMCUtils/src/main/java/org/jackhuang/hellominecraft/util/ui/wizard/spi/SimpleWizard.java rename to HMCLCore/src/main/java/org/jackhuang/hmcl/util/ui/wizard/spi/SimpleWizard.java index d71ee6f45..7c423971c 100644 --- a/HMCUtils/src/main/java/org/jackhuang/hellominecraft/util/ui/wizard/spi/SimpleWizard.java +++ b/HMCLCore/src/main/java/org/jackhuang/hmcl/util/ui/wizard/spi/SimpleWizard.java @@ -15,7 +15,7 @@ * * Created on February 22, 2005, 2:33 PM */ -package org.jackhuang.hellominecraft.util.ui.wizard.spi; +package org.jackhuang.hmcl.util.ui.wizard.spi; import java.util.Arrays; import java.util.HashMap; diff --git a/HMCUtils/src/main/java/org/jackhuang/hellominecraft/util/ui/wizard/spi/SimpleWizardInfo.java b/HMCLCore/src/main/java/org/jackhuang/hmcl/util/ui/wizard/spi/SimpleWizardInfo.java similarity index 98% rename from HMCUtils/src/main/java/org/jackhuang/hellominecraft/util/ui/wizard/spi/SimpleWizardInfo.java rename to HMCLCore/src/main/java/org/jackhuang/hmcl/util/ui/wizard/spi/SimpleWizardInfo.java index 5ed354cf1..700752d86 100644 --- a/HMCUtils/src/main/java/org/jackhuang/hellominecraft/util/ui/wizard/spi/SimpleWizardInfo.java +++ b/HMCLCore/src/main/java/org/jackhuang/hmcl/util/ui/wizard/spi/SimpleWizardInfo.java @@ -16,7 +16,7 @@ * * Created on March 4, 2005, 9:46 PM */ -package org.jackhuang.hellominecraft.util.ui.wizard.spi; +package org.jackhuang.hmcl.util.ui.wizard.spi; import java.awt.Color; import java.io.ByteArrayOutputStream; @@ -29,9 +29,9 @@ import javax.swing.BorderFactory; import javax.swing.JComponent; import javax.swing.JScrollPane; import javax.swing.JTextArea; -import org.jackhuang.hellominecraft.util.ArrayUtils; -import org.jackhuang.hellominecraft.util.code.Charsets; -import org.jackhuang.hellominecraft.util.sys.IOUtils; +import org.jackhuang.hmcl.util.ArrayUtils; +import org.jackhuang.hmcl.util.code.Charsets; +import org.jackhuang.hmcl.util.sys.IOUtils; /** * Provides information about a simple wizard. Wraps a diff --git a/HMCUtils/src/main/java/org/jackhuang/hellominecraft/util/ui/wizard/spi/Summary.java b/HMCLCore/src/main/java/org/jackhuang/hmcl/util/ui/wizard/spi/Summary.java similarity index 96% rename from HMCUtils/src/main/java/org/jackhuang/hellominecraft/util/ui/wizard/spi/Summary.java rename to HMCLCore/src/main/java/org/jackhuang/hmcl/util/ui/wizard/spi/Summary.java index 5e25a7cf8..af4571af1 100644 --- a/HMCUtils/src/main/java/org/jackhuang/hellominecraft/util/ui/wizard/spi/Summary.java +++ b/HMCLCore/src/main/java/org/jackhuang/hmcl/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.util.ui.wizard.spi; +package org.jackhuang.hmcl.util.ui.wizard.spi; import java.awt.Component; import java.awt.Font; @@ -25,8 +25,8 @@ import javax.swing.JList; import javax.swing.JScrollPane; import javax.swing.JTextArea; import javax.swing.UIManager; -import org.jackhuang.hellominecraft.util.ArrayUtils; -import org.jackhuang.hellominecraft.util.StrUtils; +import org.jackhuang.hmcl.util.ArrayUtils; +import org.jackhuang.hmcl.util.StrUtils; /** * Object which may be returned from diff --git a/HMCUtils/src/main/java/org/jackhuang/hellominecraft/util/ui/wizard/spi/Util.java b/HMCLCore/src/main/java/org/jackhuang/hmcl/util/ui/wizard/spi/Util.java similarity index 98% rename from HMCUtils/src/main/java/org/jackhuang/hellominecraft/util/ui/wizard/spi/Util.java rename to HMCLCore/src/main/java/org/jackhuang/hmcl/util/ui/wizard/spi/Util.java index 8c08f6865..b46b50a63 100644 --- a/HMCUtils/src/main/java/org/jackhuang/hellominecraft/util/ui/wizard/spi/Util.java +++ b/HMCLCore/src/main/java/org/jackhuang/hmcl/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.util.ui.wizard.spi; +package org.jackhuang.hmcl.util.ui.wizard.spi; import java.lang.reflect.InvocationTargetException; import java.lang.reflect.Method; diff --git a/HMCUtils/src/main/java/org/jackhuang/hellominecraft/util/ui/wizard/spi/Wizard.java b/HMCLCore/src/main/java/org/jackhuang/hmcl/util/ui/wizard/spi/Wizard.java similarity index 99% rename from HMCUtils/src/main/java/org/jackhuang/hellominecraft/util/ui/wizard/spi/Wizard.java rename to HMCLCore/src/main/java/org/jackhuang/hmcl/util/ui/wizard/spi/Wizard.java index d463305f9..2bd5a4975 100644 --- a/HMCUtils/src/main/java/org/jackhuang/hellominecraft/util/ui/wizard/spi/Wizard.java +++ b/HMCLCore/src/main/java/org/jackhuang/hmcl/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.util.ui.wizard.spi; +package org.jackhuang.hmcl.util.ui.wizard.spi; import java.util.Collections; import java.util.LinkedList; @@ -72,7 +72,7 @@ import javax.swing.JComponent; * of the three Wizards are ever actually created). * * - * @see org.jackhuang.hellominecraft.util.ui.wizard.api.WizardDisplayer + * @see org.jackhuang.hmcl.util.ui.wizard.api.WizardDisplayer * @see WizardPage * @see WizardPanelProvider * @see WizardBranchController diff --git a/HMCUtils/src/main/java/org/jackhuang/hellominecraft/util/ui/wizard/spi/WizardBranchController.java b/HMCLCore/src/main/java/org/jackhuang/hmcl/util/ui/wizard/spi/WizardBranchController.java similarity index 99% rename from HMCUtils/src/main/java/org/jackhuang/hellominecraft/util/ui/wizard/spi/WizardBranchController.java rename to HMCLCore/src/main/java/org/jackhuang/hmcl/util/ui/wizard/spi/WizardBranchController.java index 25bb2e010..0df71c2fa 100644 --- a/HMCUtils/src/main/java/org/jackhuang/hellominecraft/util/ui/wizard/spi/WizardBranchController.java +++ b/HMCLCore/src/main/java/org/jackhuang/hmcl/util/ui/wizard/spi/WizardBranchController.java @@ -13,7 +13,7 @@ enclosed by brackets [] replaced by your own identifying information: * * Created on March 5, 2005, 6:33 PM */ -package org.jackhuang.hellominecraft.util.ui.wizard.spi; +package org.jackhuang.hmcl.util.ui.wizard.spi; import java.util.Map; import java.util.Objects; diff --git a/HMCUtils/src/main/java/org/jackhuang/hellominecraft/util/ui/wizard/spi/WizardController.java b/HMCLCore/src/main/java/org/jackhuang/hmcl/util/ui/wizard/spi/WizardController.java similarity index 98% rename from HMCUtils/src/main/java/org/jackhuang/hellominecraft/util/ui/wizard/spi/WizardController.java rename to HMCLCore/src/main/java/org/jackhuang/hmcl/util/ui/wizard/spi/WizardController.java index ccc19c689..ef861673f 100644 --- a/HMCUtils/src/main/java/org/jackhuang/hellominecraft/util/ui/wizard/spi/WizardController.java +++ b/HMCLCore/src/main/java/org/jackhuang/hmcl/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.util.ui.wizard.spi; +package org.jackhuang.hmcl.util.ui.wizard.spi; /** * Controller which can be used to modify the UI state of a wizard. Passed diff --git a/HMCUtils/src/main/java/org/jackhuang/hellominecraft/util/ui/wizard/spi/WizardControllerImplementation.java b/HMCLCore/src/main/java/org/jackhuang/hmcl/util/ui/wizard/spi/WizardControllerImplementation.java similarity index 98% rename from HMCUtils/src/main/java/org/jackhuang/hellominecraft/util/ui/wizard/spi/WizardControllerImplementation.java rename to HMCLCore/src/main/java/org/jackhuang/hmcl/util/ui/wizard/spi/WizardControllerImplementation.java index 530d6134b..bb9b6704b 100644 --- a/HMCUtils/src/main/java/org/jackhuang/hellominecraft/util/ui/wizard/spi/WizardControllerImplementation.java +++ b/HMCLCore/src/main/java/org/jackhuang/hmcl/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.util.ui.wizard.spi; +package org.jackhuang.hmcl.util.ui.wizard.spi; /** * Internal, non-public SPI for wizard controller; allows the actual WizardController diff --git a/HMCUtils/src/main/java/org/jackhuang/hellominecraft/util/ui/wizard/spi/WizardException.java b/HMCLCore/src/main/java/org/jackhuang/hmcl/util/ui/wizard/spi/WizardException.java similarity index 96% rename from HMCUtils/src/main/java/org/jackhuang/hellominecraft/util/ui/wizard/spi/WizardException.java rename to HMCLCore/src/main/java/org/jackhuang/hmcl/util/ui/wizard/spi/WizardException.java index f011a571d..1e47a68e1 100644 --- a/HMCUtils/src/main/java/org/jackhuang/hellominecraft/util/ui/wizard/spi/WizardException.java +++ b/HMCLCore/src/main/java/org/jackhuang/hmcl/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.util.ui.wizard.spi; +package org.jackhuang.hmcl.util.ui.wizard.spi; /** * Some arguments a user enters in a wizard may be too expensive to validate diff --git a/HMCUtils/src/main/java/org/jackhuang/hellominecraft/util/ui/wizard/spi/WizardImplementation.java b/HMCLCore/src/main/java/org/jackhuang/hmcl/util/ui/wizard/spi/WizardImplementation.java similarity index 99% rename from HMCUtils/src/main/java/org/jackhuang/hellominecraft/util/ui/wizard/spi/WizardImplementation.java rename to HMCLCore/src/main/java/org/jackhuang/hmcl/util/ui/wizard/spi/WizardImplementation.java index c810e34f6..8a47422a2 100644 --- a/HMCUtils/src/main/java/org/jackhuang/hellominecraft/util/ui/wizard/spi/WizardImplementation.java +++ b/HMCLCore/src/main/java/org/jackhuang/hmcl/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.util.ui.wizard.spi; +package org.jackhuang.hmcl.util.ui.wizard.spi; import java.util.Map; import javax.swing.JComponent; diff --git a/HMCUtils/src/main/java/org/jackhuang/hellominecraft/util/ui/wizard/spi/WizardObserver.java b/HMCLCore/src/main/java/org/jackhuang/hmcl/util/ui/wizard/spi/WizardObserver.java similarity index 96% rename from HMCUtils/src/main/java/org/jackhuang/hellominecraft/util/ui/wizard/spi/WizardObserver.java rename to HMCLCore/src/main/java/org/jackhuang/hmcl/util/ui/wizard/spi/WizardObserver.java index 46094f8bc..8c7516a6b 100644 --- a/HMCUtils/src/main/java/org/jackhuang/hellominecraft/util/ui/wizard/spi/WizardObserver.java +++ b/HMCLCore/src/main/java/org/jackhuang/hmcl/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.util.ui.wizard.spi; +package org.jackhuang.hmcl.util.ui.wizard.spi; /** * Observer which can detect changes in the state of a wizard as the diff --git a/HMCUtils/src/main/java/org/jackhuang/hellominecraft/util/ui/wizard/spi/WizardPage.java b/HMCLCore/src/main/java/org/jackhuang/hmcl/util/ui/wizard/spi/WizardPage.java similarity index 99% rename from HMCUtils/src/main/java/org/jackhuang/hellominecraft/util/ui/wizard/spi/WizardPage.java rename to HMCLCore/src/main/java/org/jackhuang/hmcl/util/ui/wizard/spi/WizardPage.java index bd1b3d177..b057b6c91 100644 --- a/HMCUtils/src/main/java/org/jackhuang/hellominecraft/util/ui/wizard/spi/WizardPage.java +++ b/HMCLCore/src/main/java/org/jackhuang/hmcl/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.util.ui.wizard.spi; +package org.jackhuang.hmcl.util.ui.wizard.spi; import java.beans.Beans; import javax.swing.*; @@ -26,7 +26,7 @@ import java.util.HashMap; import java.util.Map; import java.util.Objects; import java.util.Set; -import org.jackhuang.hellominecraft.util.ArrayUtils; +import org.jackhuang.hmcl.util.ArrayUtils; /** * A convenience JPanel subclass that makes it easy to create wizard panels. diff --git a/HMCUtils/src/main/java/org/jackhuang/hellominecraft/util/ui/wizard/spi/WizardPanel.java b/HMCLCore/src/main/java/org/jackhuang/hmcl/util/ui/wizard/spi/WizardPanel.java similarity index 98% rename from HMCUtils/src/main/java/org/jackhuang/hellominecraft/util/ui/wizard/spi/WizardPanel.java rename to HMCLCore/src/main/java/org/jackhuang/hmcl/util/ui/wizard/spi/WizardPanel.java index 86afd2ec8..55bf5eaba 100644 --- a/HMCUtils/src/main/java/org/jackhuang/hellominecraft/util/ui/wizard/spi/WizardPanel.java +++ b/HMCLCore/src/main/java/org/jackhuang/hmcl/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.util.ui.wizard.spi; +package org.jackhuang.hmcl.util.ui.wizard.spi; import java.util.Map; diff --git a/HMCUtils/src/main/java/org/jackhuang/hellominecraft/util/ui/wizard/spi/WizardPanelNavResult.java b/HMCLCore/src/main/java/org/jackhuang/hmcl/util/ui/wizard/spi/WizardPanelNavResult.java similarity index 97% rename from HMCUtils/src/main/java/org/jackhuang/hellominecraft/util/ui/wizard/spi/WizardPanelNavResult.java rename to HMCLCore/src/main/java/org/jackhuang/hmcl/util/ui/wizard/spi/WizardPanelNavResult.java index faa8e31aa..09b0e3ccc 100644 --- a/HMCUtils/src/main/java/org/jackhuang/hellominecraft/util/ui/wizard/spi/WizardPanelNavResult.java +++ b/HMCLCore/src/main/java/org/jackhuang/hmcl/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.util.ui.wizard.spi; +package org.jackhuang.hmcl.util.ui.wizard.spi; import java.util.Map; diff --git a/HMCUtils/src/main/java/org/jackhuang/hellominecraft/util/ui/wizard/spi/WizardPanelProvider.java b/HMCLCore/src/main/java/org/jackhuang/hmcl/util/ui/wizard/spi/WizardPanelProvider.java similarity index 99% rename from HMCUtils/src/main/java/org/jackhuang/hellominecraft/util/ui/wizard/spi/WizardPanelProvider.java rename to HMCLCore/src/main/java/org/jackhuang/hmcl/util/ui/wizard/spi/WizardPanelProvider.java index 724b98cd8..b98953f03 100644 --- a/HMCUtils/src/main/java/org/jackhuang/hellominecraft/util/ui/wizard/spi/WizardPanelProvider.java +++ b/HMCLCore/src/main/java/org/jackhuang/hmcl/util/ui/wizard/spi/WizardPanelProvider.java @@ -13,13 +13,13 @@ enclosed by brackets [] replaced by your own identifying information: * * Created on March 5, 2005, 7:25 PM */ -package org.jackhuang.hellominecraft.util.ui.wizard.spi; +package org.jackhuang.hmcl.util.ui.wizard.spi; import java.util.Arrays; import java.util.Map; import java.util.Objects; import javax.swing.JComponent; -import org.jackhuang.hellominecraft.util.ArrayUtils; +import org.jackhuang.hmcl.util.ArrayUtils; /** * (Note: WizardPage offers somewhat simpler functionality for diff --git a/HMCUtils/src/main/resources/org/jackhuang/hellominecraft/lang/I18N.lang b/HMCLCore/src/main/resources/org/jackhuang/hmcl/lang/I18N.lang old mode 100755 new mode 100644 similarity index 100% rename from HMCUtils/src/main/resources/org/jackhuang/hellominecraft/lang/I18N.lang rename to HMCLCore/src/main/resources/org/jackhuang/hmcl/lang/I18N.lang diff --git a/HMCUtils/src/main/resources/org/jackhuang/hellominecraft/lang/I18N.properties b/HMCLCore/src/main/resources/org/jackhuang/hmcl/lang/I18N.properties old mode 100755 new mode 100644 similarity index 100% rename from HMCUtils/src/main/resources/org/jackhuang/hellominecraft/lang/I18N.properties rename to HMCLCore/src/main/resources/org/jackhuang/hmcl/lang/I18N.properties diff --git a/HMCUtils/src/main/resources/org/jackhuang/hellominecraft/lang/I18N_vi.lang b/HMCLCore/src/main/resources/org/jackhuang/hmcl/lang/I18N_vi.lang similarity index 100% rename from HMCUtils/src/main/resources/org/jackhuang/hellominecraft/lang/I18N_vi.lang rename to HMCLCore/src/main/resources/org/jackhuang/hmcl/lang/I18N_vi.lang diff --git a/HMCUtils/src/main/resources/org/jackhuang/hellominecraft/lang/I18N_vi.properties b/HMCLCore/src/main/resources/org/jackhuang/hmcl/lang/I18N_vi.properties similarity index 100% rename from HMCUtils/src/main/resources/org/jackhuang/hellominecraft/lang/I18N_vi.properties rename to HMCLCore/src/main/resources/org/jackhuang/hmcl/lang/I18N_vi.properties diff --git a/HMCUtils/src/main/resources/org/jackhuang/hellominecraft/lang/I18N_zh.lang b/HMCLCore/src/main/resources/org/jackhuang/hmcl/lang/I18N_zh.lang old mode 100755 new mode 100644 similarity index 100% rename from HMCUtils/src/main/resources/org/jackhuang/hellominecraft/lang/I18N_zh.lang rename to HMCLCore/src/main/resources/org/jackhuang/hmcl/lang/I18N_zh.lang diff --git a/HMCUtils/src/main/resources/org/jackhuang/hellominecraft/lang/I18N_zh.properties b/HMCLCore/src/main/resources/org/jackhuang/hmcl/lang/I18N_zh.properties old mode 100755 new mode 100644 similarity index 100% rename from HMCUtils/src/main/resources/org/jackhuang/hellominecraft/lang/I18N_zh.properties rename to HMCLCore/src/main/resources/org/jackhuang/hmcl/lang/I18N_zh.properties diff --git a/HMCUtils/src/main/resources/org/jackhuang/hellominecraft/lang/I18N_zh_CN.lang b/HMCLCore/src/main/resources/org/jackhuang/hmcl/lang/I18N_zh_CN.lang old mode 100755 new mode 100644 similarity index 100% rename from HMCUtils/src/main/resources/org/jackhuang/hellominecraft/lang/I18N_zh_CN.lang rename to HMCLCore/src/main/resources/org/jackhuang/hmcl/lang/I18N_zh_CN.lang diff --git a/HMCUtils/src/main/resources/org/jackhuang/hellominecraft/lang/I18N_zh_CN.properties b/HMCLCore/src/main/resources/org/jackhuang/hmcl/lang/I18N_zh_CN.properties old mode 100755 new mode 100644 similarity index 100% rename from HMCUtils/src/main/resources/org/jackhuang/hellominecraft/lang/I18N_zh_CN.properties rename to HMCLCore/src/main/resources/org/jackhuang/hmcl/lang/I18N_zh_CN.properties diff --git a/HMCUtils/src/main/resources/org/jackhuang/hellominecraft/wizard.jpg b/HMCLCore/src/main/resources/org/jackhuang/hmcl/wizard.jpg old mode 100755 new mode 100644 similarity index 100% rename from HMCUtils/src/main/resources/org/jackhuang/hellominecraft/wizard.jpg rename to HMCLCore/src/main/resources/org/jackhuang/hmcl/wizard.jpg diff --git a/HMCLaF/build.gradle b/HMCLaF/build.gradle index 71c0ce12e..66db93b4d 100755 --- a/HMCLaF/build.gradle +++ b/HMCLaF/build.gradle @@ -15,14 +15,6 @@ * You should have received a copy of the GNU General Public License * along with this program. If not, see {http://www.gnu.org/licenses/}. */ -apply plugin: 'me.tatarka.retrolambda' - -if (!hasProperty('mainClass')) { - ext.mainClass = '' -} - -if (System.getenv("BUILD_NUMBER") != null) - version = System.getenv("BUILD_NUMBER") buildscript { repositories { @@ -34,10 +26,15 @@ buildscript { } } +apply plugin: 'me.tatarka.retrolambda' + +if (System.getenv("BUILD_NUMBER") != null) + version = System.getenv("BUILD_NUMBER") + dependencies { - compile project(":HMCUtils") + compile project(":HMCLCore") } retrolambda { - javaVersion = JavaVersion.VERSION_1_6 + javaVersion = JavaVersion.VERSION_1_7 } diff --git a/HMCLaF/src/main/java/org/jackhuang/hellominecraft/lookandfeel/ConstomButton.java b/HMCLaF/src/main/java/org/jackhuang/hmcl/laf/ConstomButton.java similarity index 91% rename from HMCLaF/src/main/java/org/jackhuang/hellominecraft/lookandfeel/ConstomButton.java rename to HMCLaF/src/main/java/org/jackhuang/hmcl/laf/ConstomButton.java index b2071a6a9..2b930f0cb 100755 --- a/HMCLaF/src/main/java/org/jackhuang/hellominecraft/lookandfeel/ConstomButton.java +++ b/HMCLaF/src/main/java/org/jackhuang/hmcl/laf/ConstomButton.java @@ -14,10 +14,10 @@ * You should have received a copy of the GNU General Public License * along with this program. */ -package org.jackhuang.hellominecraft.lookandfeel; +package org.jackhuang.hmcl.laf; import java.awt.Color; -import org.jackhuang.hellominecraft.util.ui.GraphicsUtils; +import org.jackhuang.hmcl.util.ui.GraphicsUtils; /** * diff --git a/HMCLaF/src/main/java/org/jackhuang/hellominecraft/lookandfeel/HelloMinecraftLookAndFeel.java b/HMCLaF/src/main/java/org/jackhuang/hmcl/laf/HelloMinecraftLookAndFeel.java similarity index 75% rename from HMCLaF/src/main/java/org/jackhuang/hellominecraft/lookandfeel/HelloMinecraftLookAndFeel.java rename to HMCLaF/src/main/java/org/jackhuang/hmcl/laf/HelloMinecraftLookAndFeel.java index 24cfd7210..2abfb8e63 100755 --- a/HMCLaF/src/main/java/org/jackhuang/hellominecraft/lookandfeel/HelloMinecraftLookAndFeel.java +++ b/HMCLaF/src/main/java/org/jackhuang/hmcl/laf/HelloMinecraftLookAndFeel.java @@ -14,17 +14,20 @@ * You should have received a copy of the GNU General Public License * along with this program. */ -package org.jackhuang.hellominecraft.lookandfeel; +package org.jackhuang.hmcl.laf; import java.awt.Color; +import java.awt.image.BufferedImage; import java.io.ByteArrayInputStream; import java.io.InputStream; import java.text.ParseException; import java.util.Map; +import javax.imageio.ImageIO; import javax.swing.UIDefaults; import javax.swing.plaf.synth.SynthLookAndFeel; -import org.jackhuang.hellominecraft.util.log.HMCLog; -import org.jackhuang.hellominecraft.util.sys.IOUtils; +import org.jackhuang.hmcl.api.HMCLog; +import org.jackhuang.hmcl.util.sys.IOUtils; +import org.jackhuang.hmcl.util.ui.GraphicsUtils; /** * @@ -32,7 +35,7 @@ import org.jackhuang.hellominecraft.util.sys.IOUtils; */ public class HelloMinecraftLookAndFeel extends SynthLookAndFeel { - public static final Map DEFAULT_SETTINGS = Theme.BLUE.settings; + public static final Map DEFAULT_SETTINGS = LAFTheme.BLUE.settings; /** * Creates a new instance of NimbusLookAndFeel @@ -46,7 +49,7 @@ public class HelloMinecraftLookAndFeel extends SynthLookAndFeel { public HelloMinecraftLookAndFeel(Map settings) throws ParseException { try { - try (InputStream is = HelloMinecraftLookAndFeel.class.getResourceAsStream("/org/jackhuang/hellominecraft/lookandfeel/synth.xml")) { + try (InputStream is = HelloMinecraftLookAndFeel.class.getResourceAsStream("/org/jackhuang/hmcl/laf/synth.xml")) { String s = IOUtils.toString(is, "UTF-8"); for (Map.Entry ss : settings.entrySet()) s = s.replace("${" + ss.getKey() + "}", ss.getValue()); @@ -55,7 +58,7 @@ public class HelloMinecraftLookAndFeel extends SynthLookAndFeel { } catch (Throwable ex) { HMCLog.err("This fucking exception should not happen. Retry backup solution.", ex); try { - try (InputStream is = HelloMinecraftLookAndFeel.class.getResourceAsStream("/org/jackhuang/hellominecraft/lookandfeel/synth_backup.xml")) { + try (InputStream is = HelloMinecraftLookAndFeel.class.getResourceAsStream("/org/jackhuang/hmcl/laf/synth_backup.xml")) { load(is, HelloMinecraftLookAndFeel.class); } } catch (Throwable e) { @@ -110,4 +113,23 @@ public class HelloMinecraftLookAndFeel extends SynthLookAndFeel { public String getDescription() { return "HelloMinecraftLookAndFeel"; } + + /** + * Load an image using ImageIO from resource in + * org.jdesktop.swingx.plaf.nimbus.images. Catches and prints all Exceptions + * so that it can safely be used in a static context. + * + * @param imgName The name of the image to load, eg. "border.png" + * + * @return The loaded image + */ + public static BufferedImage loadImage(String imgName) { + try { + return ImageIO.read(GraphicsUtils.class.getClassLoader().getResource("org/jackhuang/hmcl/laf/images/" + imgName)); + } catch (Exception e) { + System.err.println("Error loading image \"org/jackhuang/hmcl/laf/images/" + imgName + "\""); + e.printStackTrace(); + } + return null; + } } diff --git a/HMCLaF/src/main/java/org/jackhuang/hellominecraft/lookandfeel/Theme.java b/HMCLaF/src/main/java/org/jackhuang/hmcl/laf/LAFTheme.java similarity index 76% rename from HMCLaF/src/main/java/org/jackhuang/hellominecraft/lookandfeel/Theme.java rename to HMCLaF/src/main/java/org/jackhuang/hmcl/laf/LAFTheme.java index fa10d28cc..5430fdec9 100755 --- a/HMCLaF/src/main/java/org/jackhuang/hellominecraft/lookandfeel/Theme.java +++ b/HMCLaF/src/main/java/org/jackhuang/hmcl/laf/LAFTheme.java @@ -15,19 +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.lookandfeel; +package org.jackhuang.hmcl.laf; import java.util.HashMap; -import java.util.Map; -import java.util.Objects; -import org.jackhuang.hellominecraft.util.C; +import org.jackhuang.hmcl.api.ui.Theme; +import org.jackhuang.hmcl.util.C; /** * * @author huangyuhui */ -public enum Theme { - BLUE(C.i18n("color.blue"), new HashMap() { +public final class LAFTheme { + public static final Theme BLUE = new Theme("blue", C.i18n("color.blue"), new HashMap() { { put("Customized.TabbedPaneTab.selected_foreground", "#106CA3"); put("Customized.ComboBox.selected_background", "#A0D8F0"); @@ -35,8 +34,8 @@ public enum Theme { put("Customized.MainFrame.selected_background", "#0C5E91"); put("Customized.MainFrame.background_image", "background.jpg"); } - }), - GREEN(C.i18n("color.green"), new HashMap() { + }); + public static final Theme GREEN = new Theme("green", C.i18n("color.green"), new HashMap() { { put("Customized.TabbedPaneTab.selected_foreground", "#1ABC9C"); put("Customized.ComboBox.selected_background", "#1ABC9C"); @@ -44,8 +43,8 @@ public enum Theme { put("Customized.MainFrame.selected_background", "#16A085"); put("Customized.MainFrame.background_image", "background.jpg"); } - }), - PURPLE(C.i18n("color.purple"), new HashMap() { + }); + public static final Theme PURPLE = new Theme("purple", C.i18n("color.purple"), new HashMap() { { put("Customized.TabbedPaneTab.selected_foreground", "#9B59B6"); put("Customized.ComboBox.selected_background", "#9B59B6"); @@ -53,8 +52,8 @@ public enum Theme { put("Customized.MainFrame.selected_background", "#8E44AD"); put("Customized.MainFrame.background_image", "background.jpg"); } - }), - DARKER_BLUE(C.i18n("color.dark_blue"), new HashMap() { + }); + public static final Theme DARKER_BLUE = new Theme("darker_blue", C.i18n("color.dark_blue"), new HashMap() { { put("Customized.TabbedPaneTab.selected_foreground", "#34495E"); put("Customized.ComboBox.selected_background", "#34495E"); @@ -62,8 +61,8 @@ public enum Theme { put("Customized.MainFrame.selected_background", "#2C3E50"); put("Customized.MainFrame.background_image", "background.jpg"); } - }), - ORANGE(C.i18n("color.orange"), new HashMap() { + }); + public static final Theme ORANGE = new Theme("orange", C.i18n("color.orange"), new HashMap() { { put("Customized.TabbedPaneTab.selected_foreground", "#E67E22"); put("Customized.ComboBox.selected_background", "#F39C12"); @@ -71,8 +70,8 @@ public enum Theme { put("Customized.MainFrame.selected_background", "#D35400"); put("Customized.MainFrame.background_image", "background.jpg"); } - }), - RED(C.i18n("color.red"), new HashMap() { + }); + public static final Theme RED = new Theme("red", C.i18n("color.red"), new HashMap() { { put("Customized.TabbedPaneTab.selected_foreground", "#E74C3C"); put("Customized.ComboBox.selected_background", "#E74C3C"); @@ -81,12 +80,5 @@ public enum Theme { put("Customized.MainFrame.background_image", "background.jpg"); } }); - - public final String localizedName; - public final Map settings; - - private Theme(String localizedName, Map settings) { - this.localizedName = localizedName; - this.settings = Objects.requireNonNull(settings, "Theme settings map may not be null."); - } + public static final Theme[] THEMES = new Theme[] {BLUE, GREEN, PURPLE, DARKER_BLUE, ORANGE, RED}; } diff --git a/HMCLaF/src/main/java/org/jackhuang/hellominecraft/lookandfeel/painter/ButtonPainter.java b/HMCLaF/src/main/java/org/jackhuang/hmcl/laf/painter/ButtonPainter.java similarity index 98% rename from HMCLaF/src/main/java/org/jackhuang/hellominecraft/lookandfeel/painter/ButtonPainter.java rename to HMCLaF/src/main/java/org/jackhuang/hmcl/laf/painter/ButtonPainter.java index b0001cb11..8fb62c8f2 100755 --- a/HMCLaF/src/main/java/org/jackhuang/hellominecraft/lookandfeel/painter/ButtonPainter.java +++ b/HMCLaF/src/main/java/org/jackhuang/hmcl/laf/painter/ButtonPainter.java @@ -18,7 +18,7 @@ * License along with this library; if not, write to the Free Software * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA */ -package org.jackhuang.hellominecraft.lookandfeel.painter; +package org.jackhuang.hmcl.laf.painter; import java.awt.Color; import java.awt.Graphics; @@ -30,8 +30,8 @@ import javax.swing.Timer; import javax.swing.plaf.synth.SynthConstants; import javax.swing.plaf.synth.SynthContext; import javax.swing.plaf.synth.SynthPainter; -import org.jackhuang.hellominecraft.util.ui.GraphicsUtils; -import org.jackhuang.hellominecraft.lookandfeel.ConstomButton; +import org.jackhuang.hmcl.util.ui.GraphicsUtils; +import org.jackhuang.hmcl.laf.ConstomButton; /** * ButtonPainter - handles painting Nimbus style buttons with Java2D diff --git a/HMCLaF/src/main/java/org/jackhuang/hellominecraft/lookandfeel/painter/ProgressPainter.java b/HMCLaF/src/main/java/org/jackhuang/hmcl/laf/painter/ProgressPainter.java similarity index 96% rename from HMCLaF/src/main/java/org/jackhuang/hellominecraft/lookandfeel/painter/ProgressPainter.java rename to HMCLaF/src/main/java/org/jackhuang/hmcl/laf/painter/ProgressPainter.java index a7eddcce7..39abf7599 100755 --- a/HMCLaF/src/main/java/org/jackhuang/hellominecraft/lookandfeel/painter/ProgressPainter.java +++ b/HMCLaF/src/main/java/org/jackhuang/hmcl/laf/painter/ProgressPainter.java @@ -18,9 +18,9 @@ * License along with this library; if not, write to the Free Software * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA */ -package org.jackhuang.hellominecraft.lookandfeel.painter; +package org.jackhuang.hmcl.laf.painter; -import org.jackhuang.hellominecraft.util.ui.GraphicsUtils; +import org.jackhuang.hmcl.util.ui.GraphicsUtils; import javax.swing.plaf.synth.SynthContext; import javax.swing.plaf.synth.SynthPainter; diff --git a/HMCLaF/src/main/java/org/jackhuang/hellominecraft/lookandfeel/painter/TextFieldPainter.java b/HMCLaF/src/main/java/org/jackhuang/hmcl/laf/painter/TextFieldPainter.java similarity index 96% rename from HMCLaF/src/main/java/org/jackhuang/hellominecraft/lookandfeel/painter/TextFieldPainter.java rename to HMCLaF/src/main/java/org/jackhuang/hmcl/laf/painter/TextFieldPainter.java index 560981581..05071b188 100755 --- a/HMCLaF/src/main/java/org/jackhuang/hellominecraft/lookandfeel/painter/TextFieldPainter.java +++ b/HMCLaF/src/main/java/org/jackhuang/hmcl/laf/painter/TextFieldPainter.java @@ -18,14 +18,14 @@ * License along with this library; if not, write to the Free Software * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA */ -package org.jackhuang.hellominecraft.lookandfeel.painter; +package org.jackhuang.hmcl.laf.painter; import javax.swing.plaf.synth.SynthContext; import javax.swing.plaf.synth.SynthPainter; import java.awt.Color; import java.awt.Graphics; import javax.swing.plaf.synth.SynthConstants; -import org.jackhuang.hellominecraft.util.ui.GraphicsUtils; +import org.jackhuang.hmcl.util.ui.GraphicsUtils; /** * TextFieldPainter diff --git a/HMCLaF/src/main/java/org/jackhuang/hellominecraft/lookandfeel/ui/ComboBoxUI.java b/HMCLaF/src/main/java/org/jackhuang/hmcl/laf/ui/ComboBoxUI.java similarity index 98% rename from HMCLaF/src/main/java/org/jackhuang/hellominecraft/lookandfeel/ui/ComboBoxUI.java rename to HMCLaF/src/main/java/org/jackhuang/hmcl/laf/ui/ComboBoxUI.java index 2fb6b0eb9..628cc0d73 100755 --- a/HMCLaF/src/main/java/org/jackhuang/hellominecraft/lookandfeel/ui/ComboBoxUI.java +++ b/HMCLaF/src/main/java/org/jackhuang/hmcl/laf/ui/ComboBoxUI.java @@ -1,6 +1,6 @@ -package org.jackhuang.hellominecraft.lookandfeel.ui; +package org.jackhuang.hmcl.laf.ui; -import static org.jackhuang.hellominecraft.util.ui.GraphicsUtils.loadImage; +import static org.jackhuang.hmcl.laf.HelloMinecraftLookAndFeel.loadImage; import javax.swing.plaf.ComponentUI; import javax.swing.plaf.basic.BasicComboBoxUI; @@ -134,8 +134,9 @@ public class ComboBoxUI extends BasicComboBoxUI implements MouseListener { ((JComponent) renderer).setForeground(comboBox.getForeground()); } paintCurrentValue(g, rectangleForCurrentValue(), false); - if (renderer instanceof JComponent) + if (renderer instanceof JComponent) { ((JComponent) renderer).setOpaque(true); + } } } diff --git a/HMCLaF/src/main/java/org/jackhuang/hellominecraft/lookandfeel/ui/ListCellRender.java b/HMCLaF/src/main/java/org/jackhuang/hmcl/laf/ui/ListCellRender.java similarity index 96% rename from HMCLaF/src/main/java/org/jackhuang/hellominecraft/lookandfeel/ui/ListCellRender.java rename to HMCLaF/src/main/java/org/jackhuang/hmcl/laf/ui/ListCellRender.java index 215145dd7..e0aa02410 100755 --- a/HMCLaF/src/main/java/org/jackhuang/hellominecraft/lookandfeel/ui/ListCellRender.java +++ b/HMCLaF/src/main/java/org/jackhuang/hmcl/laf/ui/ListCellRender.java @@ -18,7 +18,7 @@ * License along with this library; if not, write to the Free Software * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA */ -package org.jackhuang.hellominecraft.lookandfeel.ui; +package org.jackhuang.hmcl.laf.ui; import javax.swing.DefaultListCellRenderer; import javax.swing.JList; diff --git a/HMCLaF/src/main/java/org/jackhuang/hellominecraft/lookandfeel/ui/ScrollBarUI.java b/HMCLaF/src/main/java/org/jackhuang/hmcl/laf/ui/ScrollBarUI.java similarity index 98% rename from HMCLaF/src/main/java/org/jackhuang/hellominecraft/lookandfeel/ui/ScrollBarUI.java rename to HMCLaF/src/main/java/org/jackhuang/hmcl/laf/ui/ScrollBarUI.java index 5d63c1e05..2813b964e 100755 --- a/HMCLaF/src/main/java/org/jackhuang/hellominecraft/lookandfeel/ui/ScrollBarUI.java +++ b/HMCLaF/src/main/java/org/jackhuang/hmcl/laf/ui/ScrollBarUI.java @@ -2,9 +2,9 @@ * To change this template, choose Tools | Templates * and open the template in the editor. */ -package org.jackhuang.hellominecraft.lookandfeel.ui; +package org.jackhuang.hmcl.laf.ui; -import static org.jackhuang.hellominecraft.util.ui.GraphicsUtils.loadImage; +import static org.jackhuang.hmcl.laf.HelloMinecraftLookAndFeel.loadImage; import javax.swing.JButton; import javax.swing.JComponent; diff --git a/HMCLaF/src/main/java/org/jackhuang/hellominecraft/lookandfeel/ui/ScrollButton.java b/HMCLaF/src/main/java/org/jackhuang/hmcl/laf/ui/ScrollButton.java similarity index 97% rename from HMCLaF/src/main/java/org/jackhuang/hellominecraft/lookandfeel/ui/ScrollButton.java rename to HMCLaF/src/main/java/org/jackhuang/hmcl/laf/ui/ScrollButton.java index 616c7d4e0..c517629f3 100755 --- a/HMCLaF/src/main/java/org/jackhuang/hellominecraft/lookandfeel/ui/ScrollButton.java +++ b/HMCLaF/src/main/java/org/jackhuang/hmcl/laf/ui/ScrollButton.java @@ -18,7 +18,7 @@ * License along with this library; if not, write to the Free Software * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA */ -package org.jackhuang.hellominecraft.lookandfeel.ui; +package org.jackhuang.hmcl.laf.ui; import javax.swing.plaf.metal.MetalScrollButton; import java.awt.Dimension; diff --git a/HMCLaF/src/main/resources/org/jackhuang/hellominecraft/lookandfeel/images/checkbox_off.png b/HMCLaF/src/main/resources/org/jackhuang/hmcl/laf/images/checkbox_off.png similarity index 100% rename from HMCLaF/src/main/resources/org/jackhuang/hellominecraft/lookandfeel/images/checkbox_off.png rename to HMCLaF/src/main/resources/org/jackhuang/hmcl/laf/images/checkbox_off.png diff --git a/HMCLaF/src/main/resources/org/jackhuang/hellominecraft/lookandfeel/images/checkbox_off_disabled.png b/HMCLaF/src/main/resources/org/jackhuang/hmcl/laf/images/checkbox_off_disabled.png similarity index 100% rename from HMCLaF/src/main/resources/org/jackhuang/hellominecraft/lookandfeel/images/checkbox_off_disabled.png rename to HMCLaF/src/main/resources/org/jackhuang/hmcl/laf/images/checkbox_off_disabled.png diff --git a/HMCLaF/src/main/resources/org/jackhuang/hellominecraft/lookandfeel/images/checkbox_off_over.png b/HMCLaF/src/main/resources/org/jackhuang/hmcl/laf/images/checkbox_off_over.png similarity index 100% rename from HMCLaF/src/main/resources/org/jackhuang/hellominecraft/lookandfeel/images/checkbox_off_over.png rename to HMCLaF/src/main/resources/org/jackhuang/hmcl/laf/images/checkbox_off_over.png diff --git a/HMCLaF/src/main/resources/org/jackhuang/hellominecraft/lookandfeel/images/checkbox_off_pressed.png b/HMCLaF/src/main/resources/org/jackhuang/hmcl/laf/images/checkbox_off_pressed.png similarity index 100% rename from HMCLaF/src/main/resources/org/jackhuang/hellominecraft/lookandfeel/images/checkbox_off_pressed.png rename to HMCLaF/src/main/resources/org/jackhuang/hmcl/laf/images/checkbox_off_pressed.png diff --git a/HMCLaF/src/main/resources/org/jackhuang/hellominecraft/lookandfeel/images/checkbox_on.png b/HMCLaF/src/main/resources/org/jackhuang/hmcl/laf/images/checkbox_on.png similarity index 100% rename from HMCLaF/src/main/resources/org/jackhuang/hellominecraft/lookandfeel/images/checkbox_on.png rename to HMCLaF/src/main/resources/org/jackhuang/hmcl/laf/images/checkbox_on.png diff --git a/HMCLaF/src/main/resources/org/jackhuang/hellominecraft/lookandfeel/images/checkbox_on_disabled.png b/HMCLaF/src/main/resources/org/jackhuang/hmcl/laf/images/checkbox_on_disabled.png similarity index 100% rename from HMCLaF/src/main/resources/org/jackhuang/hellominecraft/lookandfeel/images/checkbox_on_disabled.png rename to HMCLaF/src/main/resources/org/jackhuang/hmcl/laf/images/checkbox_on_disabled.png diff --git a/HMCLaF/src/main/resources/org/jackhuang/hellominecraft/lookandfeel/images/checkbox_on_over.png b/HMCLaF/src/main/resources/org/jackhuang/hmcl/laf/images/checkbox_on_over.png similarity index 100% rename from HMCLaF/src/main/resources/org/jackhuang/hellominecraft/lookandfeel/images/checkbox_on_over.png rename to HMCLaF/src/main/resources/org/jackhuang/hmcl/laf/images/checkbox_on_over.png diff --git a/HMCLaF/src/main/resources/org/jackhuang/hellominecraft/lookandfeel/images/checkbox_on_pressed.png b/HMCLaF/src/main/resources/org/jackhuang/hmcl/laf/images/checkbox_on_pressed.png similarity index 100% rename from HMCLaF/src/main/resources/org/jackhuang/hellominecraft/lookandfeel/images/checkbox_on_pressed.png rename to HMCLaF/src/main/resources/org/jackhuang/hmcl/laf/images/checkbox_on_pressed.png diff --git a/HMCLaF/src/main/resources/org/jackhuang/hellominecraft/lookandfeel/images/combo_disabled.png b/HMCLaF/src/main/resources/org/jackhuang/hmcl/laf/images/combo_disabled.png similarity index 100% rename from HMCLaF/src/main/resources/org/jackhuang/hellominecraft/lookandfeel/images/combo_disabled.png rename to HMCLaF/src/main/resources/org/jackhuang/hmcl/laf/images/combo_disabled.png diff --git a/HMCLaF/src/main/resources/org/jackhuang/hellominecraft/lookandfeel/images/combo_normal.png b/HMCLaF/src/main/resources/org/jackhuang/hmcl/laf/images/combo_normal.png similarity index 100% rename from HMCLaF/src/main/resources/org/jackhuang/hellominecraft/lookandfeel/images/combo_normal.png rename to HMCLaF/src/main/resources/org/jackhuang/hmcl/laf/images/combo_normal.png diff --git a/HMCLaF/src/main/resources/org/jackhuang/hellominecraft/lookandfeel/images/combo_over.png b/HMCLaF/src/main/resources/org/jackhuang/hmcl/laf/images/combo_over.png similarity index 100% rename from HMCLaF/src/main/resources/org/jackhuang/hellominecraft/lookandfeel/images/combo_over.png rename to HMCLaF/src/main/resources/org/jackhuang/hmcl/laf/images/combo_over.png diff --git a/HMCLaF/src/main/resources/org/jackhuang/hellominecraft/lookandfeel/images/combo_pressed.png b/HMCLaF/src/main/resources/org/jackhuang/hmcl/laf/images/combo_pressed.png similarity index 100% rename from HMCLaF/src/main/resources/org/jackhuang/hellominecraft/lookandfeel/images/combo_pressed.png rename to HMCLaF/src/main/resources/org/jackhuang/hmcl/laf/images/combo_pressed.png diff --git a/HMCLaF/src/main/resources/org/jackhuang/hellominecraft/lookandfeel/images/option_pane_error.png b/HMCLaF/src/main/resources/org/jackhuang/hmcl/laf/images/option_pane_error.png similarity index 100% rename from HMCLaF/src/main/resources/org/jackhuang/hellominecraft/lookandfeel/images/option_pane_error.png rename to HMCLaF/src/main/resources/org/jackhuang/hmcl/laf/images/option_pane_error.png diff --git a/HMCLaF/src/main/resources/org/jackhuang/hellominecraft/lookandfeel/images/option_pane_info.png b/HMCLaF/src/main/resources/org/jackhuang/hmcl/laf/images/option_pane_info.png similarity index 100% rename from HMCLaF/src/main/resources/org/jackhuang/hellominecraft/lookandfeel/images/option_pane_info.png rename to HMCLaF/src/main/resources/org/jackhuang/hmcl/laf/images/option_pane_info.png diff --git a/HMCLaF/src/main/resources/org/jackhuang/hellominecraft/lookandfeel/images/option_pane_question.png b/HMCLaF/src/main/resources/org/jackhuang/hmcl/laf/images/option_pane_question.png similarity index 100% rename from HMCLaF/src/main/resources/org/jackhuang/hellominecraft/lookandfeel/images/option_pane_question.png rename to HMCLaF/src/main/resources/org/jackhuang/hmcl/laf/images/option_pane_question.png diff --git a/HMCLaF/src/main/resources/org/jackhuang/hellominecraft/lookandfeel/images/option_pane_warning.png b/HMCLaF/src/main/resources/org/jackhuang/hmcl/laf/images/option_pane_warning.png similarity index 100% rename from HMCLaF/src/main/resources/org/jackhuang/hellominecraft/lookandfeel/images/option_pane_warning.png rename to HMCLaF/src/main/resources/org/jackhuang/hmcl/laf/images/option_pane_warning.png diff --git a/HMCLaF/src/main/resources/org/jackhuang/hellominecraft/lookandfeel/images/radio_btn.png b/HMCLaF/src/main/resources/org/jackhuang/hmcl/laf/images/radio_btn.png similarity index 100% rename from HMCLaF/src/main/resources/org/jackhuang/hellominecraft/lookandfeel/images/radio_btn.png rename to HMCLaF/src/main/resources/org/jackhuang/hmcl/laf/images/radio_btn.png diff --git a/HMCLaF/src/main/resources/org/jackhuang/hellominecraft/lookandfeel/images/radio_btn_disabled_normal.png b/HMCLaF/src/main/resources/org/jackhuang/hmcl/laf/images/radio_btn_disabled_normal.png similarity index 100% rename from HMCLaF/src/main/resources/org/jackhuang/hellominecraft/lookandfeel/images/radio_btn_disabled_normal.png rename to HMCLaF/src/main/resources/org/jackhuang/hmcl/laf/images/radio_btn_disabled_normal.png diff --git a/HMCLaF/src/main/resources/org/jackhuang/hellominecraft/lookandfeel/images/radio_btn_disabled_selected.png b/HMCLaF/src/main/resources/org/jackhuang/hmcl/laf/images/radio_btn_disabled_selected.png similarity index 100% rename from HMCLaF/src/main/resources/org/jackhuang/hellominecraft/lookandfeel/images/radio_btn_disabled_selected.png rename to HMCLaF/src/main/resources/org/jackhuang/hmcl/laf/images/radio_btn_disabled_selected.png diff --git a/HMCLaF/src/main/resources/org/jackhuang/hellominecraft/lookandfeel/images/radio_btn_over.png b/HMCLaF/src/main/resources/org/jackhuang/hmcl/laf/images/radio_btn_over.png similarity index 100% rename from HMCLaF/src/main/resources/org/jackhuang/hellominecraft/lookandfeel/images/radio_btn_over.png rename to HMCLaF/src/main/resources/org/jackhuang/hmcl/laf/images/radio_btn_over.png diff --git a/HMCLaF/src/main/resources/org/jackhuang/hellominecraft/lookandfeel/images/radio_btn_pressed.png b/HMCLaF/src/main/resources/org/jackhuang/hmcl/laf/images/radio_btn_pressed.png similarity index 100% rename from HMCLaF/src/main/resources/org/jackhuang/hellominecraft/lookandfeel/images/radio_btn_pressed.png rename to HMCLaF/src/main/resources/org/jackhuang/hmcl/laf/images/radio_btn_pressed.png diff --git a/HMCLaF/src/main/resources/org/jackhuang/hellominecraft/lookandfeel/images/radio_btn_selected.png b/HMCLaF/src/main/resources/org/jackhuang/hmcl/laf/images/radio_btn_selected.png similarity index 100% rename from HMCLaF/src/main/resources/org/jackhuang/hellominecraft/lookandfeel/images/radio_btn_selected.png rename to HMCLaF/src/main/resources/org/jackhuang/hmcl/laf/images/radio_btn_selected.png diff --git a/HMCLaF/src/main/resources/org/jackhuang/hellominecraft/lookandfeel/images/radio_btn_selected_over.png b/HMCLaF/src/main/resources/org/jackhuang/hmcl/laf/images/radio_btn_selected_over.png similarity index 100% rename from HMCLaF/src/main/resources/org/jackhuang/hellominecraft/lookandfeel/images/radio_btn_selected_over.png rename to HMCLaF/src/main/resources/org/jackhuang/hmcl/laf/images/radio_btn_selected_over.png diff --git a/HMCLaF/src/main/resources/org/jackhuang/hellominecraft/lookandfeel/images/radio_btn_selected_pressed.png b/HMCLaF/src/main/resources/org/jackhuang/hmcl/laf/images/radio_btn_selected_pressed.png similarity index 100% rename from HMCLaF/src/main/resources/org/jackhuang/hellominecraft/lookandfeel/images/radio_btn_selected_pressed.png rename to HMCLaF/src/main/resources/org/jackhuang/hmcl/laf/images/radio_btn_selected_pressed.png diff --git a/HMCLaF/src/main/resources/org/jackhuang/hellominecraft/lookandfeel/images/scroll_dec_normal.png b/HMCLaF/src/main/resources/org/jackhuang/hmcl/laf/images/scroll_dec_normal.png similarity index 100% rename from HMCLaF/src/main/resources/org/jackhuang/hellominecraft/lookandfeel/images/scroll_dec_normal.png rename to HMCLaF/src/main/resources/org/jackhuang/hmcl/laf/images/scroll_dec_normal.png diff --git a/HMCLaF/src/main/resources/org/jackhuang/hellominecraft/lookandfeel/images/scroll_dec_over.png b/HMCLaF/src/main/resources/org/jackhuang/hmcl/laf/images/scroll_dec_over.png similarity index 100% rename from HMCLaF/src/main/resources/org/jackhuang/hellominecraft/lookandfeel/images/scroll_dec_over.png rename to HMCLaF/src/main/resources/org/jackhuang/hmcl/laf/images/scroll_dec_over.png diff --git a/HMCLaF/src/main/resources/org/jackhuang/hellominecraft/lookandfeel/images/scroll_dec_pressed.png b/HMCLaF/src/main/resources/org/jackhuang/hmcl/laf/images/scroll_dec_pressed.png similarity index 100% rename from HMCLaF/src/main/resources/org/jackhuang/hellominecraft/lookandfeel/images/scroll_dec_pressed.png rename to HMCLaF/src/main/resources/org/jackhuang/hmcl/laf/images/scroll_dec_pressed.png diff --git a/HMCLaF/src/main/resources/org/jackhuang/hellominecraft/lookandfeel/images/scroll_disabled.png b/HMCLaF/src/main/resources/org/jackhuang/hmcl/laf/images/scroll_disabled.png similarity index 100% rename from HMCLaF/src/main/resources/org/jackhuang/hellominecraft/lookandfeel/images/scroll_disabled.png rename to HMCLaF/src/main/resources/org/jackhuang/hmcl/laf/images/scroll_disabled.png diff --git a/HMCLaF/src/main/resources/org/jackhuang/hellominecraft/lookandfeel/images/scroll_enabled.png b/HMCLaF/src/main/resources/org/jackhuang/hmcl/laf/images/scroll_enabled.png similarity index 100% rename from HMCLaF/src/main/resources/org/jackhuang/hellominecraft/lookandfeel/images/scroll_enabled.png rename to HMCLaF/src/main/resources/org/jackhuang/hmcl/laf/images/scroll_enabled.png diff --git a/HMCLaF/src/main/resources/org/jackhuang/hellominecraft/lookandfeel/images/scroll_inc_normal.png b/HMCLaF/src/main/resources/org/jackhuang/hmcl/laf/images/scroll_inc_normal.png similarity index 100% rename from HMCLaF/src/main/resources/org/jackhuang/hellominecraft/lookandfeel/images/scroll_inc_normal.png rename to HMCLaF/src/main/resources/org/jackhuang/hmcl/laf/images/scroll_inc_normal.png diff --git a/HMCLaF/src/main/resources/org/jackhuang/hellominecraft/lookandfeel/images/scroll_inc_over.png b/HMCLaF/src/main/resources/org/jackhuang/hmcl/laf/images/scroll_inc_over.png similarity index 100% rename from HMCLaF/src/main/resources/org/jackhuang/hellominecraft/lookandfeel/images/scroll_inc_over.png rename to HMCLaF/src/main/resources/org/jackhuang/hmcl/laf/images/scroll_inc_over.png diff --git a/HMCLaF/src/main/resources/org/jackhuang/hellominecraft/lookandfeel/images/scroll_inc_pressed.png b/HMCLaF/src/main/resources/org/jackhuang/hmcl/laf/images/scroll_inc_pressed.png similarity index 100% rename from HMCLaF/src/main/resources/org/jackhuang/hellominecraft/lookandfeel/images/scroll_inc_pressed.png rename to HMCLaF/src/main/resources/org/jackhuang/hmcl/laf/images/scroll_inc_pressed.png diff --git a/HMCLaF/src/main/resources/org/jackhuang/hellominecraft/lookandfeel/images/scroll_thumb_normal.png b/HMCLaF/src/main/resources/org/jackhuang/hmcl/laf/images/scroll_thumb_normal.png similarity index 100% rename from HMCLaF/src/main/resources/org/jackhuang/hellominecraft/lookandfeel/images/scroll_thumb_normal.png rename to HMCLaF/src/main/resources/org/jackhuang/hmcl/laf/images/scroll_thumb_normal.png diff --git a/HMCLaF/src/main/resources/org/jackhuang/hellominecraft/lookandfeel/images/scroll_thumb_over.png b/HMCLaF/src/main/resources/org/jackhuang/hmcl/laf/images/scroll_thumb_over.png similarity index 100% rename from HMCLaF/src/main/resources/org/jackhuang/hellominecraft/lookandfeel/images/scroll_thumb_over.png rename to HMCLaF/src/main/resources/org/jackhuang/hmcl/laf/images/scroll_thumb_over.png diff --git a/HMCLaF/src/main/resources/org/jackhuang/hellominecraft/lookandfeel/images/scroll_thumb_pressed.png b/HMCLaF/src/main/resources/org/jackhuang/hmcl/laf/images/scroll_thumb_pressed.png similarity index 100% rename from HMCLaF/src/main/resources/org/jackhuang/hellominecraft/lookandfeel/images/scroll_thumb_pressed.png rename to HMCLaF/src/main/resources/org/jackhuang/hmcl/laf/images/scroll_thumb_pressed.png diff --git a/HMCLaF/src/main/resources/org/jackhuang/hellominecraft/lookandfeel/images/tree_closed.gif b/HMCLaF/src/main/resources/org/jackhuang/hmcl/laf/images/tree_closed.gif similarity index 100% rename from HMCLaF/src/main/resources/org/jackhuang/hellominecraft/lookandfeel/images/tree_closed.gif rename to HMCLaF/src/main/resources/org/jackhuang/hmcl/laf/images/tree_closed.gif diff --git a/HMCLaF/src/main/resources/org/jackhuang/hellominecraft/lookandfeel/images/tree_collapsed.gif b/HMCLaF/src/main/resources/org/jackhuang/hmcl/laf/images/tree_collapsed.gif similarity index 100% rename from HMCLaF/src/main/resources/org/jackhuang/hellominecraft/lookandfeel/images/tree_collapsed.gif rename to HMCLaF/src/main/resources/org/jackhuang/hmcl/laf/images/tree_collapsed.gif diff --git a/HMCLaF/src/main/resources/org/jackhuang/hellominecraft/lookandfeel/images/tree_expanded.gif b/HMCLaF/src/main/resources/org/jackhuang/hmcl/laf/images/tree_expanded.gif similarity index 100% rename from HMCLaF/src/main/resources/org/jackhuang/hellominecraft/lookandfeel/images/tree_expanded.gif rename to HMCLaF/src/main/resources/org/jackhuang/hmcl/laf/images/tree_expanded.gif diff --git a/HMCLaF/src/main/resources/org/jackhuang/hellominecraft/lookandfeel/images/tree_leaf.gif b/HMCLaF/src/main/resources/org/jackhuang/hmcl/laf/images/tree_leaf.gif similarity index 100% rename from HMCLaF/src/main/resources/org/jackhuang/hellominecraft/lookandfeel/images/tree_leaf.gif rename to HMCLaF/src/main/resources/org/jackhuang/hmcl/laf/images/tree_leaf.gif diff --git a/HMCLaF/src/main/resources/org/jackhuang/hellominecraft/lookandfeel/images/tree_open.gif b/HMCLaF/src/main/resources/org/jackhuang/hmcl/laf/images/tree_open.gif similarity index 100% rename from HMCLaF/src/main/resources/org/jackhuang/hellominecraft/lookandfeel/images/tree_open.gif rename to HMCLaF/src/main/resources/org/jackhuang/hmcl/laf/images/tree_open.gif diff --git a/HMCLaF/src/main/resources/org/jackhuang/hellominecraft/lookandfeel/synth.xml b/HMCLaF/src/main/resources/org/jackhuang/hmcl/laf/synth.xml similarity index 96% rename from HMCLaF/src/main/resources/org/jackhuang/hellominecraft/lookandfeel/synth.xml rename to HMCLaF/src/main/resources/org/jackhuang/hmcl/laf/synth.xml index 0c743cbd5..99985f5d9 100755 --- a/HMCLaF/src/main/resources/org/jackhuang/hellominecraft/lookandfeel/synth.xml +++ b/HMCLaF/src/main/resources/org/jackhuang/hmcl/laf/synth.xml @@ -26,7 +26,7 @@ - + @@ -43,7 +43,7 @@ - + @@ -58,7 +58,7 @@ @@ -238,7 +238,7 @@ @@ -43,7 +43,7 @@ - + @@ -58,7 +58,7 @@ @@ -238,7 +238,7 @@