cleanup

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

@@ -21,6 +21,7 @@ import com.google.gson.JsonParseException;
 import org.jackhuang.hmcl.mod.Modpack;
 import org.jackhuang.hmcl.util.CompressingUtils;
 import org.jackhuang.hmcl.util.JsonUtils;
+import org.jackhuang.hmcl.util.Lang;
 import org.jackhuang.hmcl.util.StringUtils;
 
 import java.io.File;
@@ -33,7 +34,7 @@ import java.util.List;
  */
 public final class HMCLModpackManager {
 
-    public static final List<String> MODPACK_BLACK_LIST = Arrays.asList(
+    public static final List<String> MODPACK_BLACK_LIST = Lang.immutableListOf(
             "usernamecache.json", "usercache.json", // Minecraft
             "launcher_profiles.json", "launcher.pack.lzma", // Minecraft Launcher
             "pack.json", "launcher.jar", "hmclmc.log", // HMCL
@@ -43,7 +44,7 @@ public final class HMCLModpackManager {
             "downloads", // Curse
             "asm", "backups", "TCNodeTracker", "CustomDISkins", "data" // Mods
     );
-    public static final List<String> MODPACK_SUGGESTED_BLACK_LIST = Arrays.asList(
+    public static final List<String> MODPACK_SUGGESTED_BLACK_LIST = Lang.immutableListOf(
             "fonts", // BetterFonts
             "saves", "servers.dat", "options.txt", // Minecraft
             "blueprints" /* BuildCraft */,

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

@@ -221,10 +221,8 @@ public final class LauncherHelper {
     }
 
     public static void stopManagedProcesses() {
-        synchronized (PROCESSES) {
+        while (!PROCESSES.isEmpty())
-            while (!PROCESSES.isEmpty())
+            Optional.ofNullable(PROCESSES.poll()).ifPresent(ManagedProcess::stop);
-                Optional.ofNullable(PROCESSES.poll()).ifPresent(ManagedProcess::stop);
-        }
     }
 
     public void emitStatus(LoadingState state) {

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

@@ -28,7 +28,7 @@ import java.util.List;
 public final class DownloadProviders {
     private DownloadProviders() {}
 
-    public static List<DownloadProvider> DOWNLOAD_PROVIDERS = Arrays.asList(MojangDownloadProvider.INSTANCE, BMCLAPIDownloadProvider.INSTANCE);
+    public static final List<DownloadProvider> DOWNLOAD_PROVIDERS = Lang.immutableListOf(MojangDownloadProvider.INSTANCE, BMCLAPIDownloadProvider.INSTANCE);
 
     public static DownloadProvider getDownloadProvider(int index) {
         return Lang.get(DOWNLOAD_PROVIDERS, index).orElse(MojangDownloadProvider.INSTANCE);

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

@@ -54,7 +54,7 @@ public final class Locales {
      */
     public static final SupportedLocale RU = new SupportedLocale(new Locale("ru"));
 
-    public static final List<SupportedLocale> LOCALES = Arrays.asList(DEFAULT, EN, ZH_CN);
+    public static final List<SupportedLocale> LOCALES = Lang.immutableListOf(DEFAULT, EN, ZH_CN);
 
     public static SupportedLocale getLocale(int index) {
         return Lang.get(LOCALES, index).orElse(DEFAULT);

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

@@ -29,7 +29,7 @@ import java.util.List;
 public final class Proxies {
     private Proxies() {}
 
-    public static final List<Proxy.Type> PROXIES = Arrays.asList(Proxy.Type.DIRECT, Proxy.Type.HTTP, Proxy.Type.SOCKS);
+    public static final List<Proxy.Type> PROXIES = Lang.immutableListOf(Proxy.Type.DIRECT, Proxy.Type.HTTP, Proxy.Type.SOCKS);
 
     public static Proxy.Type getProxyType(int index) {
         return Lang.get(PROXIES, index).orElse(null);

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

@@ -42,10 +42,7 @@ import javafx.scene.layout.Region;
 import javafx.scene.shape.Rectangle;
 import javafx.util.Duration;
 import org.jackhuang.hmcl.Main;
-import org.jackhuang.hmcl.util.ExceptionalSupplier;
+import org.jackhuang.hmcl.util.*;
-import org.jackhuang.hmcl.util.Lang;
-import org.jackhuang.hmcl.util.Logging;
-import org.jackhuang.hmcl.util.OperatingSystem;
 
 import java.io.File;
 import java.io.IOException;
@@ -223,7 +220,11 @@ public final class FXUtils {
     }
 
     public static void openFolder(File file) {
-        file.mkdirs();
+        if (!FileUtils.makeDirectory(file)) {
+            Logging.LOG.log(Level.SEVERE, "Unable to make directory " + file);
+            return;
+        }
+
         String path = file.getAbsolutePath();
 
         switch (OperatingSystem.CURRENT_OS) {

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

@@ -138,6 +138,9 @@ public final class LogWindow extends Stage {
             case DEBUG:
                 debug.set(debug.get() + 1);
                 break;
+            default:
+                // ignore
+                break;
         }
     }
 

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

@@ -216,6 +216,8 @@ public final class MainPage extends StackPane implements DecoratorPage {
             case 3:
                 FXUtils.openFolder(profile.getRepository().getRunDirectory(rightClickedVersion));
                 break;
+            default:
+                throw new Error();
         }
     }
 

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

@@ -41,7 +41,6 @@ public class ComponentListCell extends StackPane {
     private final Node content;
     private Animation expandAnimation;
     private Rectangle clipRect;
-    private double animatedHeight;
     private final BooleanProperty expanded = new SimpleBooleanProperty(this, "expanded", false);
 
     public ComponentListCell(Node content) {
@@ -129,18 +128,13 @@ public class ComponentListCell extends StackPane {
                     updateClip(newHeight);
                 }
 
-                animatedHeight = newAnimatedHeight;
-
                 expandAnimation = new Timeline(new KeyFrame(new Duration(320.0),
                         new KeyValue(container.minHeightProperty(), contentHeight, FXUtils.SINE),
                         new KeyValue(container.maxHeightProperty(), contentHeight, FXUtils.SINE)
                 ));
 
                 if (!isExpanded()) {
-                    expandAnimation.setOnFinished(e2 -> {
+                    expandAnimation.setOnFinished(e2 -> updateClip(newHeight));
-                        updateClip(newHeight);
-                        animatedHeight = 0.0;
-                    });
                 }
 
                 expandAnimation.play();

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

@@ -137,6 +137,8 @@ public final class MessageBox {
             case OK_CANCEL_OPTION:
                 alert.getButtonTypes().setAll(ButtonType.OK, ButtonType.CANCEL);
                 break;
+            default:
+                throw new IllegalArgumentException("Unrecognized message box option " + option);
         }
         Optional<ButtonType> buttonType = alert.showAndWait();
         if (!buttonType.isPresent()) return CLOSED_OPTION;

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

@@ -76,6 +76,8 @@ public final class MessageDialogPane extends StackPane {
             case MessageBox.QUESTION_MESSAGE:
                 graphic.setGraphic(SVG.helpCircle("black", 40, 40));
                 break;
+            default:
+                throw new IllegalArgumentException("Unrecognized message box message type " + type);
         }
     }
 

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

@@ -17,6 +17,7 @@
  */
 package org.jackhuang.hmcl.upgrade;
 
+import com.google.gson.JsonParseException;
 import com.google.gson.JsonSyntaxException;
 import com.google.gson.reflect.TypeToken;
 import org.jackhuang.hmcl.Main;
@@ -84,10 +85,10 @@ public class AppDataUpgrader extends IUpgrader {
                         }
                     }
                 }
-            } catch (JsonSyntaxException ex) {
+            } catch (JsonParseException ex) {
                 f.delete();
             } catch (IOException | PrivilegedActionException t) {
-                Logging.LOG.log(Level.SEVERE, "Failed to execute newer version application", t);
+                Logging.LOG.log(Level.SEVERE, "Unable to execute newer version application", t);
             }
     }
 

HMCLCore/src/main/java/org/jackhuang/hmcl/auth/authlibinjector/AuthlibInjectorAccount.java

@@ -25,6 +25,7 @@ import org.jackhuang.hmcl.auth.yggdrasil.YggdrasilService;
 import org.jackhuang.hmcl.auth.yggdrasil.YggdrasilSession;
 import org.jackhuang.hmcl.game.Arguments;
 import org.jackhuang.hmcl.task.GetTask;
+import org.jackhuang.hmcl.util.Charsets;
 import org.jackhuang.hmcl.util.ExceptionalSupplier;
 import org.jackhuang.hmcl.util.Lang;
 import org.jackhuang.hmcl.util.NetworkUtils;
@@ -68,7 +69,7 @@ public class AuthlibInjectorAccount extends YggdrasilAccount {
             Arguments arguments = Arguments.addJVMArguments(null, arg);
 
             if (flag.get())
-                arguments = Arguments.addJVMArguments(arguments, "-Dorg.to2mbn.authlibinjector.config.prefetched=" + new String(Base64.getEncoder().encode(getTask.getResult().getBytes())));
+                arguments = Arguments.addJVMArguments(arguments, "-Dorg.to2mbn.authlibinjector.config.prefetched=" + new String(Base64.getEncoder().encode(getTask.getResult().getBytes()), Charsets.UTF_8));
 
             return info.setArguments(arguments);
         } catch (Exception e) {

HMCLCore/src/main/java/org/jackhuang/hmcl/download/RemoteVersion.java

@@ -77,6 +77,6 @@ public class RemoteVersion<T> implements Comparable<RemoteVersion<T>> {
     @Override
     public int compareTo(RemoteVersion<T> o) {
         // newer versions are smaller than older versions
-        return -VersionNumber.asVersion(selfVersion).compareTo(VersionNumber.asVersion(o.selfVersion));
+        return VersionNumber.asVersion(o.selfVersion).compareTo(VersionNumber.asVersion(selfVersion));
     }
 }

HMCLCore/src/main/java/org/jackhuang/hmcl/download/game/GameVersionList.java

@@ -72,7 +72,7 @@ public final class GameVersionList extends VersionList<GameRemoteVersionTag> {
 
         @Override
         public int compareTo(RemoteVersion<GameRemoteVersionTag> o) {
-            return -getTag().getTime().compareTo(o.getTag().getTime());
+            return o.getTag().getTime().compareTo(getTag().getTime());
         }
     }
 }

HMCLCore/src/main/java/org/jackhuang/hmcl/event/Event.java

@@ -17,16 +17,47 @@
  */
 package org.jackhuang.hmcl.event;
 
-import java.util.EventObject;
+import java.util.Objects;
 
 /**
  *
  * @author huangyuhui
  */
-public class Event extends EventObject {
+public class Event {
 
+    /**
+     * The object on which the Event initially occurred.
+     */
+    protected transient Object  source;
+
+    /**
+     * Constructs a prototypical Event.
+     *
+     * @param source The object on which the Event initially occurred.
+     * @throws  NullPointerException  if source is null.
+     */
     public Event(Object source) {
-        super(source);
+        Objects.requireNonNull(source);
+
+        this.source = source;
+    }
+
+    /**
+     * The object on which the Event initially occurred.
+     *
+     * @return The object on which the Event initially occurred.
+     */
+    public Object getSource() {
+        return source;
+    }
+
+    /**
+     * Returns a String representation of this Event.
+     *
+     * @return  A a String representation of this Event.
+     */
+    public String toString() {
+        return getClass().getName() + "[source=" + source + "]";
     }
 
     private boolean canceled;

HMCLCore/src/main/java/org/jackhuang/hmcl/launch/Log4jHandler.java

@@ -30,6 +30,7 @@ import java.io.IOException;
 import java.io.InterruptedIOException;
 import java.io.PipedInputStream;
 import java.io.PipedOutputStream;
+import java.text.SimpleDateFormat;
 import java.util.Date;
 import java.util.LinkedList;
 import java.util.List;
@@ -114,6 +115,8 @@ final class Log4jHandler extends Thread {
 
     private class Log4jHandlerImpl extends DefaultHandler {
 
+        private final SimpleDateFormat format = new SimpleDateFormat("HH:mm:ss");
+
         private String date = "", thread = "", logger = "";
         private StringBuilder message;
         private Log4jLevel level;
@@ -124,8 +127,8 @@ final class Log4jHandler extends Thread {
             switch (localName) {
                 case "log4j_Event":
                     message = new StringBuilder();
-                    Date d = new Date(Long.valueOf(attributes.getValue("timestamp")));
+                    Date d = new Date(Long.parseLong(attributes.getValue("timestamp")));
-                    date = Constants.DEFAULT_DATE_FORMAT.format(d);
+                    date = format.format(d);
                     try {
                         level = Log4jLevel.valueOf(attributes.getValue("level"));
                     } catch (IllegalArgumentException e) {

HMCLCore/src/main/java/org/jackhuang/hmcl/mod/ModInfo.java

@@ -23,6 +23,7 @@ import org.jackhuang.hmcl.util.Logging;
 import org.jackhuang.hmcl.util.StringUtils;
 
 import java.io.File;
+import java.util.Objects;
 
 /**
  *
@@ -125,6 +126,16 @@ public final class ModInfo implements Comparable<ModInfo> {
         return getFileName().compareTo(o.getFileName());
     }
 
+    @Override
+    public boolean equals(Object obj) {
+        return obj instanceof ModInfo && Objects.equals(getFileName(), ((ModInfo) obj).getFileName());
+    }
+
+    @Override
+    public int hashCode() {
+        return Objects.hash(getFileName());
+    }
+
     public static boolean isFileMod(File file) {
         String name = file.getName();
         if (isDisabled(file))

HMCLCore/src/main/java/org/jackhuang/hmcl/task/FileDownloadTask.java

@@ -126,10 +126,7 @@ public class FileDownloadTask extends Task {
             if (repeat > 0) {
                 FailedEvent<URL> event = new FailedEvent<>(this, repeat, currentURL);
                 onFailed.fireEvent(event);
-                if (!currentURL.equals(event.getNewResult())) {
+                currentURL = event.getNewResult();
-                    Logging.LOG.log(Level.FINE, "Switch from {0} to {1}", new Object[] { currentURL, event.getNewResult() });
-                    currentURL = event.getNewResult();
-                }
             }
             if (Thread.interrupted()) {
                 Thread.currentThread().interrupt();

HMCLCore/src/main/java/org/jackhuang/hmcl/task/SchedulerImpl.java

@@ -19,10 +19,7 @@ package org.jackhuang.hmcl.task;
 
 import org.jackhuang.hmcl.util.ExceptionalRunnable;
 
-import java.util.concurrent.CountDownLatch;
+import java.util.concurrent.*;
-import java.util.concurrent.ExecutionException;
-import java.util.concurrent.Future;
-import java.util.concurrent.TimeUnit;
 import java.util.concurrent.atomic.AtomicReference;
 import java.util.function.Consumer;
 
@@ -84,8 +81,9 @@ class SchedulerImpl extends Scheduler {
             }
 
             @Override
-            public Void get(long timeout, TimeUnit unit) throws InterruptedException, ExecutionException {
+            public Void get(long timeout, TimeUnit unit) throws InterruptedException, ExecutionException, TimeoutException {
-                latch.await(timeout, unit);
+                if (!latch.await(timeout, unit))
+                    throw new TimeoutException();
                 return getImpl();
             }
         };

HMCLCore/src/main/java/org/jackhuang/hmcl/util/Constants.java

@@ -52,8 +52,6 @@ public final class Constants {
     public static final String DEFAULT_VERSION_DOWNLOAD_URL = "http://s3.amazonaws.com/Minecraft.Download/versions/";
     public static final String DEFAULT_INDEX_URL = "http://s3.amazonaws.com/Minecraft.Download/indexes/";
 
-    public static final SimpleDateFormat DEFAULT_DATE_FORMAT = new SimpleDateFormat("HH:mm:ss");
-
     public static Consumer<Runnable> UI_THREAD_SCHEDULER = s -> Schedulers.computation().schedule(s::run);
     
     public static final Consumer<Runnable> SWING_UI_THREAD_SCHEDULER = s -> {

HMCLCore/src/main/java/org/jackhuang/hmcl/util/JavaVersion.java

@@ -107,14 +107,14 @@ public final class JavaVersion implements Serializable {
         try {
             Process process = new ProcessBuilder(actualFile.getAbsolutePath(), "-version").start();
             process.waitFor();
-            BufferedReader reader = new BufferedReader(new InputStreamReader(process.getErrorStream()));
+            try (BufferedReader reader = new BufferedReader(new InputStreamReader(process.getErrorStream()))) {
-            String line;
+                for (String line; (line = reader.readLine()) != null; ) {
-            while ((line = reader.readLine()) != null) {
+                    Matcher m = REGEX.matcher(line);
-                Matcher m = REGEX.matcher(line);
+                    if (m.find())
-                if (m.find())
+                        version = m.group("version");
-                    version = m.group("version");
+                    if (line.contains("64-Bit"))
-                if (line.contains("64-Bit"))
+                        platform = Platform.BIT_64;
-                    platform = Platform.BIT_64;
+                }
             }
         } catch (InterruptedException e) {
             throw new IOException("Interrupted scanning the java version.", e);
@@ -217,11 +217,11 @@ public final class JavaVersion implements Serializable {
         Process process = Runtime.getRuntime().exec(cmd);
         process.waitFor();
 
-        BufferedReader reader = new BufferedReader(new InputStreamReader(process.getInputStream()));
+        try (BufferedReader reader = new BufferedReader(new InputStreamReader(process.getInputStream()))) {
-        String line;
+            for (String line; (line = reader.readLine()) != null; )
-        while ((line = reader.readLine()) != null)
+                if (line.startsWith(location) && !line.equals(location))
-            if (line.startsWith(location) && !line.equals(location))
+                    res.add(line);
-                res.add(line);
+        }
         return res;
     }
 
@@ -241,22 +241,22 @@ public final class JavaVersion implements Serializable {
         Process process = Runtime.getRuntime().exec(cmd);
         process.waitFor();
 
-        BufferedReader reader = new BufferedReader(new InputStreamReader(process.getInputStream()));
+        try (BufferedReader reader = new BufferedReader(new InputStreamReader(process.getInputStream()))) {
-        String line;
+            for (String line; (line = reader.readLine()) != null; )
-        while ((line = reader.readLine()) != null)
+                if (StringUtils.isNotBlank(line)) {
-            if (StringUtils.isNotBlank(line)) {
+                    if (last && line.trim().startsWith(name)) {
-                if (last && line.trim().startsWith(name)) {
+                        int begins = line.indexOf(name);
-                    int begins = line.indexOf(name);
+                        if (begins > 0) {
-                    if (begins > 0) {
+                            String s2 = line.substring(begins + name.length());
-                        String s2 = line.substring(begins + name.length());
+                            begins = s2.indexOf("REG_SZ");
-                        begins = s2.indexOf("REG_SZ");
+                            if (begins > 0)
-                        if (begins > 0)
+                                return s2.substring(begins + "REG_SZ".length()).trim();
-                            return s2.substring(begins + "REG_SZ".length()).trim();
+                        }
                     }
+                    if (location.equals(line.trim()))
+                        last = true;
                 }
-                if (location.equals(line.trim()))
+        }
-                    last = true;
-            }
         return null;
     }
 }

HMCLCore/src/main/java/org/jackhuang/hmcl/util/Lang.java

@@ -47,6 +47,11 @@ public final class Lang {
         return map;
     }
 
+    @SafeVarargs
+    public static <T> List<T> immutableListOf(T... elements) {
+        return Collections.unmodifiableList(Arrays.asList(elements));
+    }
+
     public static <K, V> V computeIfAbsent(Map<K, V> map, K key, Supplier<V> computingFunction) {
         V value = map.get(key);
         if (value == null) {

HMCLCore/src/main/java/org/jackhuang/hmcl/util/Logging.java

@@ -21,6 +21,7 @@ import java.io.ByteArrayOutputStream;
 import java.io.IOException;
 import java.io.PrintWriter;
 import java.text.MessageFormat;
+import java.text.SimpleDateFormat;
 import java.util.Date;
 import java.util.logging.*;
 
@@ -55,10 +56,11 @@ public final class Logging {
     static final class DefaultFormatter extends Formatter {
 
         static final DefaultFormatter INSTANCE = new DefaultFormatter();
+        private final SimpleDateFormat format = new SimpleDateFormat("HH:mm:ss");
 
         @Override
         public String format(LogRecord record) {
-            String date = Constants.DEFAULT_DATE_FORMAT.format(new Date(record.getMillis()));
+            String date = format.format(new Date(record.getMillis()));
             String log = String.format("[%s] [%s.%s/%s] %s%n",
                     date, record.getSourceClassName(), record.getSourceMethodName(),
                     record.getLevel().getName(), MessageFormat.format(record.getMessage(), record.getParameters())