Polish, 处理部分警告

HMCL/src/main/java/org/jackhuang/hmcl/game/ModpackHelper.java

@@ -106,7 +106,7 @@ public final class ModpackHelper {
         else throw new IllegalStateException("Unrecognized modpack: " + modpack);
     }
 
-    public static Task getUpdateTask(Profile profile, File zipFile, String name, ModpackConfiguration configuration) throws UnsupportedModpackException, MismatchedModpackTypeException, IOException {
+    public static Task getUpdateTask(Profile profile, File zipFile, String name, ModpackConfiguration<?> configuration) throws UnsupportedModpackException, MismatchedModpackTypeException, IOException {
         Modpack modpack = ModpackHelper.readModpackManifest(zipFile);
 
         switch (configuration.getType()) {

HMCL/src/main/java/org/jackhuang/hmcl/setting/Accounts.java

@@ -73,9 +73,8 @@ public final class Accounts {
     }
 
 	public static Optional<String> getCurrentCharacter(Map<Object, Object> storage) {
-        Optional<Map> properties = Lang.get(storage, "properties", Map.class);
+		return Lang.get(storage, "properties", Map.class)
-        if (!properties.isPresent()) return Optional.empty();
+				.flatMap(properties -> Lang.get(properties, "character", String.class));
-        return Lang.get(properties.get(), "character", String.class);
 	}
 
     static String getAccountId(Account account) {

HMCL/src/main/java/org/jackhuang/hmcl/setting/Settings.java

@@ -69,7 +69,7 @@ public class Settings {
     {
         for (Map<Object, Object> settings : SETTINGS.getAccounts()) {
             Optional<String> characterName = Accounts.getCurrentCharacter(settings);
-            AccountFactory factory = Accounts.ACCOUNT_FACTORY.get(Lang.get(settings, "type", String.class, ""));
+            AccountFactory<?> factory = Accounts.ACCOUNT_FACTORY.get(Lang.get(settings, "type", String.class, ""));
             if (factory == null || !characterName.isPresent()) {
                 // unrecognized account type, so remove it.
                 SETTINGS.getAccounts().remove(settings);

HMCL/src/main/java/org/jackhuang/hmcl/setting/VersionSetting.java

@@ -138,7 +138,7 @@ public final class VersionSetting {
         permSizeProperty.set(permSize);
     }
 
-    private final ImmediateIntegerProperty maxMemoryProperty = new ImmediateIntegerProperty(this, "maxMemory", (int) OperatingSystem.SUGGESTED_MEMORY);
+    private final ImmediateIntegerProperty maxMemoryProperty = new ImmediateIntegerProperty(this, "maxMemory", OperatingSystem.SUGGESTED_MEMORY);
 
     public ImmediateIntegerProperty maxMemoryProperty() {
         return maxMemoryProperty;

HMCL/src/main/java/org/jackhuang/hmcl/ui/AccountsPage.java

@@ -214,19 +214,19 @@ public final class AccountsPage extends StackPane implements DecoratorPage {
         this.title.set(title);
     }
 
-    public static String accountException(Exception account) {
+    public static String accountException(Exception exception) {
-        if (account instanceof InvalidCredentialsException) {
+        if (exception instanceof InvalidCredentialsException) {
             return Main.i18n("account.failed.invalid_credentials");
-        } else if (account instanceof NoCharacterException) {
+        } else if (exception instanceof NoCharacterException) {
             return Main.i18n("account.failed.no_charactor");
-        } else if (account instanceof ServerDisconnectException) {
+        } else if (exception instanceof ServerDisconnectException) {
             return Main.i18n("account.failed.connect_authentication_server");
-        } else if (account instanceof InvalidTokenException) {
+        } else if (exception instanceof InvalidTokenException) {
             return Main.i18n("account.failed.invalid_token");
-        } else if (account instanceof InvalidPasswordException) {
+        } else if (exception instanceof InvalidPasswordException) {
             return Main.i18n("account.failed.invalid_password");
         } else {
-            return account.getClass() + ": " + ((Exception) account).getLocalizedMessage();
+            return exception.getClass() + ": " + exception.getLocalizedMessage();
         }
     }
 

HMCL/src/main/java/org/jackhuang/hmcl/ui/construct/NoneMultipleSelectionModel.java

@@ -21,13 +21,9 @@ import javafx.collections.FXCollections;
 import javafx.collections.ObservableList;
 import javafx.scene.control.MultipleSelectionModel;
 
-public final class NoneMultipleSelectionModel<T> extends MultipleSelectionModel<T> {
+public class NoneMultipleSelectionModel<T> extends MultipleSelectionModel<T> {
-    private static final NoneMultipleSelectionModel INSTANCE = new NoneMultipleSelectionModel();
-    private NoneMultipleSelectionModel() {}
 
-    @SuppressWarnings("unchecked")
+	public NoneMultipleSelectionModel() {
-    public static <T> NoneMultipleSelectionModel<T> getInstance() {
-        return (NoneMultipleSelectionModel<T>) INSTANCE;
     }
 
     @Override

HMCL/src/main/java/org/jackhuang/hmcl/ui/construct/RipplerContainer.java

@@ -217,10 +217,12 @@ public class RipplerContainer extends StackPane {
     private static class StyleableProperties {
 
         private static final CssMetaData<RipplerContainer, Paint> RIPPLER_FILL = new CssMetaData<RipplerContainer, Paint>("-jfx-rippler-fill", StyleConverter.getPaintConverter(), Color.rgb(0, 200, 255)) {
+            @Override
 			public boolean isSettable(RipplerContainer control) {
                 return control.ripplerFill == null || !control.ripplerFill.isBound();
             }
 
+            @Override
 			public StyleableProperty<Paint> getStyleableProperty(RipplerContainer control) {
                 return control.ripplerFillProperty();
             }
@@ -232,7 +234,7 @@ public class RipplerContainer extends StackPane {
         }
 
         static {
-            List<CssMetaData<? extends Styleable, ?>> styleables = new ArrayList<>(Parent.getClassCssMetaData());
+            List<CssMetaData<? extends Styleable, ?>> styleables = new ArrayList<>(Node.getClassCssMetaData());
             Collections.addAll(styleables, RIPPLER_FILL);
             STYLEABLES = Collections.unmodifiableList(styleables);
         }

HMCL/src/main/java/org/jackhuang/hmcl/ui/export/ExportWizardProvider.java

@@ -44,7 +44,10 @@ public final class ExportWizardProvider implements WizardProvider {
 
     @Override
     public Object finish(Map<String, Object> settings) {
-        return new HMCLModpackExportTask(profile.getRepository(), version, (List<String>) settings.get(ModpackFileSelectionPage.MODPACK_FILE_SELECTION),
+		@SuppressWarnings("unchecked")
+		List<String> whitelist = (List<String>) settings.get(ModpackFileSelectionPage.MODPACK_FILE_SELECTION);
+
+		return new HMCLModpackExportTask(profile.getRepository(), version, whitelist,
 				new Modpack(
                         (String) settings.get(ModpackInfoPage.MODPACK_NAME),
                         (String) settings.get(ModpackInfoPage.MODPACK_AUTHOR),

HMCL/src/main/java/org/jackhuang/hmcl/ui/export/ModpackFileSelectionPage.java

@@ -62,7 +62,7 @@ public final class ModpackFileSelectionPage extends StackPane implements WizardP
         FXUtils.loadFXML(this, "/assets/fxml/modpack/selection.fxml");
         rootNode = getTreeItem(profile.getRepository().getRunDirectory(version), "minecraft");
         treeView.setRoot(rootNode);
-        treeView.setSelectionModel(NoneMultipleSelectionModel.getInstance());
+        treeView.setSelectionModel(new NoneMultipleSelectionModel<>());
     }
 
     private CheckBoxTreeItem<String> getTreeItem(File file, String basePath) {

HMCL/src/main/java/org/jackhuang/hmcl/upgrade/AppDataUpgrader.java

@@ -56,7 +56,7 @@ public class AppDataUpgrader extends IUpgrader {
                 al.add("--noupdate");
                 AccessController.doPrivileged((PrivilegedExceptionAction<Void>) () -> {
                     new URLClassLoader(new URL[]{jar.toURI().toURL()},
-                            URLClassLoader.getSystemClassLoader().getParent()).loadClass(mainClass)
+                            ClassLoader.getSystemClassLoader().getParent()).loadClass(mainClass)
                             .getMethod("main", String[].class).invoke(null, new Object[]{al.toArray(new String[0])});
                     return null;
                 });

HMCLCore/src/main/java/org/jackhuang/hmcl/auth/OfflineAccount.java

@@ -47,6 +47,7 @@ public class OfflineAccount extends Account {
             throw new IllegalArgumentException("Username cannot be blank");
     }
 
+    @Override
     public UUID getUUID() {
         return UUIDTypeAdapter.fromString(uuid);
     }