From 93cabde9f447ef29fc021b407eeb9a037d004acb Mon Sep 17 00:00:00 2001 From: huangyuhui Date: Thu, 30 Aug 2018 22:20:18 +0800 Subject: [PATCH] clean up HMCLCore --- .../java/org/jackhuang/hmcl/auth/AccountBuilder.java | 8 ++++---- .../hmcl/download/game/GameAssetDownloadTask.java | 4 ---- .../jackhuang/hmcl/download/game/GameVersionList.java | 1 - .../hmcl/download/game/LibraryDownloadTask.java | 2 -- .../org/jackhuang/hmcl/event/ProcessStoppedEvent.java | 1 - .../org/jackhuang/hmcl/game/LibrariesDownloadInfo.java | 2 +- .../src/main/java/org/jackhuang/hmcl/game/Version.java | 10 +++++----- .../org/jackhuang/hmcl/launch/DefaultLauncher.java | 4 ---- .../org/jackhuang/hmcl/mod/ModpackInstallTask.java | 1 - .../org/jackhuang/hmcl/util/ExceptionalRunnable.java | 2 +- .../java/org/jackhuang/hmcl/util/IntVersionNumber.java | 1 - .../src/main/java/org/jackhuang/hmcl/util/Zipper.java | 2 -- 12 files changed, 11 insertions(+), 27 deletions(-) diff --git a/HMCLCore/src/main/java/org/jackhuang/hmcl/auth/AccountBuilder.java b/HMCLCore/src/main/java/org/jackhuang/hmcl/auth/AccountBuilder.java index 2e2ecfd93..2b865e409 100644 --- a/HMCLCore/src/main/java/org/jackhuang/hmcl/auth/AccountBuilder.java +++ b/HMCLCore/src/main/java/org/jackhuang/hmcl/auth/AccountBuilder.java @@ -28,22 +28,22 @@ public final class AccountBuilder { public AccountBuilder() { } - public AccountBuilder setSelector(CharacterSelector selector) { + public AccountBuilder setSelector(CharacterSelector selector) { this.selector = Objects.requireNonNull(selector); return this; } - public AccountBuilder setUsername(String username) { + public AccountBuilder setUsername(String username) { this.username = Objects.requireNonNull(username); return this; } - public AccountBuilder setPassword(String password) { + public AccountBuilder setPassword(String password) { this.password = password; return this; } - public AccountBuilder setAdditionalData(Object additionalData) { + public AccountBuilder setAdditionalData(Object additionalData) { this.additionalData = additionalData; return this; } diff --git a/HMCLCore/src/main/java/org/jackhuang/hmcl/download/game/GameAssetDownloadTask.java b/HMCLCore/src/main/java/org/jackhuang/hmcl/download/game/GameAssetDownloadTask.java index d8940ca0e..f43b482ce 100644 --- a/HMCLCore/src/main/java/org/jackhuang/hmcl/download/game/GameAssetDownloadTask.java +++ b/HMCLCore/src/main/java/org/jackhuang/hmcl/download/game/GameAssetDownloadTask.java @@ -28,16 +28,12 @@ import org.jackhuang.hmcl.util.Logging; import org.jackhuang.hmcl.util.NetworkUtils; import java.io.File; -import java.io.IOException; import java.util.Collection; import java.util.LinkedList; import java.util.List; import java.util.Map; import java.util.logging.Level; -import static org.jackhuang.hmcl.util.DigestUtils.digest; -import static org.jackhuang.hmcl.util.Hex.encodeHex; - /** * * @author huangyuhui diff --git a/HMCLCore/src/main/java/org/jackhuang/hmcl/download/game/GameVersionList.java b/HMCLCore/src/main/java/org/jackhuang/hmcl/download/game/GameVersionList.java index ced1afb49..97c4b51f5 100644 --- a/HMCLCore/src/main/java/org/jackhuang/hmcl/download/game/GameVersionList.java +++ b/HMCLCore/src/main/java/org/jackhuang/hmcl/download/game/GameVersionList.java @@ -18,7 +18,6 @@ package org.jackhuang.hmcl.download.game; import org.jackhuang.hmcl.download.DownloadProvider; -import org.jackhuang.hmcl.download.RemoteVersion; import org.jackhuang.hmcl.download.VersionList; import org.jackhuang.hmcl.task.GetTask; import org.jackhuang.hmcl.task.Task; diff --git a/HMCLCore/src/main/java/org/jackhuang/hmcl/download/game/LibraryDownloadTask.java b/HMCLCore/src/main/java/org/jackhuang/hmcl/download/game/LibraryDownloadTask.java index 9c4c4d868..7cb061812 100644 --- a/HMCLCore/src/main/java/org/jackhuang/hmcl/download/game/LibraryDownloadTask.java +++ b/HMCLCore/src/main/java/org/jackhuang/hmcl/download/game/LibraryDownloadTask.java @@ -14,8 +14,6 @@ import org.tukaani.xz.XZInputStream; import java.io.*; import java.net.URL; import java.nio.charset.Charset; -import java.nio.file.Files; -import java.nio.file.Paths; import java.util.*; import java.util.jar.JarEntry; import java.util.jar.JarInputStream; diff --git a/HMCLCore/src/main/java/org/jackhuang/hmcl/event/ProcessStoppedEvent.java b/HMCLCore/src/main/java/org/jackhuang/hmcl/event/ProcessStoppedEvent.java index 36c70856f..7786c13d5 100644 --- a/HMCLCore/src/main/java/org/jackhuang/hmcl/event/ProcessStoppedEvent.java +++ b/HMCLCore/src/main/java/org/jackhuang/hmcl/event/ProcessStoppedEvent.java @@ -18,7 +18,6 @@ package org.jackhuang.hmcl.event; import org.jackhuang.hmcl.util.ManagedProcess; -import org.jackhuang.hmcl.util.ToStringBuilder; /** * This event gets fired when minecraft process exited successfully and the exit code is 0. diff --git a/HMCLCore/src/main/java/org/jackhuang/hmcl/game/LibrariesDownloadInfo.java b/HMCLCore/src/main/java/org/jackhuang/hmcl/game/LibrariesDownloadInfo.java index e3b0e64f4..e898be8ff 100644 --- a/HMCLCore/src/main/java/org/jackhuang/hmcl/game/LibrariesDownloadInfo.java +++ b/HMCLCore/src/main/java/org/jackhuang/hmcl/game/LibrariesDownloadInfo.java @@ -47,7 +47,7 @@ public final class LibrariesDownloadInfo { } public Map getClassifiers() { - return classifiers == null ? Collections.EMPTY_MAP : Collections.unmodifiableMap(classifiers); + return classifiers == null ? Collections.emptyMap() : Collections.unmodifiableMap(classifiers); } } diff --git a/HMCLCore/src/main/java/org/jackhuang/hmcl/game/Version.java b/HMCLCore/src/main/java/org/jackhuang/hmcl/game/Version.java index c1af9e157..cd62e2978 100644 --- a/HMCLCore/src/main/java/org/jackhuang/hmcl/game/Version.java +++ b/HMCLCore/src/main/java/org/jackhuang/hmcl/game/Version.java @@ -116,15 +116,15 @@ public class Version implements Comparable, Validation { } public Map getLogging() { - return logging == null ? Collections.EMPTY_MAP : Collections.unmodifiableMap(logging); + return logging == null ? Collections.emptyMap() : Collections.unmodifiableMap(logging); } public List getLibraries() { - return libraries == null ? Collections.EMPTY_LIST : Collections.unmodifiableList(libraries); + return libraries == null ? Collections.emptyList() : Collections.unmodifiableList(libraries); } public List getCompatibilityRules() { - return compatibilityRules == null ? Collections.EMPTY_LIST : Collections.unmodifiableList(compatibilityRules); + return compatibilityRules == null ? Collections.emptyList() : Collections.unmodifiableList(compatibilityRules); } public DownloadInfo getDownloadInfo() { @@ -247,14 +247,14 @@ public class Version implements Comparable, Validation { if (StringUtils.isBlank(id)) throw new JsonParseException("Version ID cannot be blank"); if (downloads != null) - for (Map.Entry entry : downloads.entrySet()) { + for (Map.Entry entry : downloads.entrySet()) { if (!(entry.getKey() instanceof DownloadType)) throw new JsonParseException("Version downloads key must be DownloadType"); if (!(entry.getValue() instanceof DownloadInfo)) throw new JsonParseException("Version downloads value must be DownloadInfo"); } if (logging != null) - for (Map.Entry entry : logging.entrySet()) { + for (Map.Entry entry : logging.entrySet()) { if (!(entry.getKey() instanceof DownloadType)) throw new JsonParseException("Version logging key must be DownloadType"); if (!(entry.getValue() instanceof LoggingInfo)) diff --git a/HMCLCore/src/main/java/org/jackhuang/hmcl/launch/DefaultLauncher.java b/HMCLCore/src/main/java/org/jackhuang/hmcl/launch/DefaultLauncher.java index 1448dc485..e061ecb0d 100644 --- a/HMCLCore/src/main/java/org/jackhuang/hmcl/launch/DefaultLauncher.java +++ b/HMCLCore/src/main/java/org/jackhuang/hmcl/launch/DefaultLauncher.java @@ -300,10 +300,6 @@ public class DefaultLauncher extends Launcher { throw new PermissionException(); } - private void startMonitors(ManagedProcess managedProcess, ProcessListener processListener) { - startMonitors(managedProcess, processListener, true); - } - private void startMonitors(ManagedProcess managedProcess, ProcessListener processListener, boolean isDaemon) { processListener.setProcess(managedProcess); Thread stdout = Lang.thread(new StreamPump(managedProcess.getProcess().getInputStream(), it -> { diff --git a/HMCLCore/src/main/java/org/jackhuang/hmcl/mod/ModpackInstallTask.java b/HMCLCore/src/main/java/org/jackhuang/hmcl/mod/ModpackInstallTask.java index 92e6d639f..ab3e4f8e6 100644 --- a/HMCLCore/src/main/java/org/jackhuang/hmcl/mod/ModpackInstallTask.java +++ b/HMCLCore/src/main/java/org/jackhuang/hmcl/mod/ModpackInstallTask.java @@ -19,7 +19,6 @@ package org.jackhuang.hmcl.mod; import org.jackhuang.hmcl.task.Task; import org.jackhuang.hmcl.util.FileUtils; -import org.jackhuang.hmcl.util.IOUtils; import org.jackhuang.hmcl.util.Unzipper; import java.io.File; diff --git a/HMCLCore/src/main/java/org/jackhuang/hmcl/util/ExceptionalRunnable.java b/HMCLCore/src/main/java/org/jackhuang/hmcl/util/ExceptionalRunnable.java index 941b8cbb2..ed693979a 100644 --- a/HMCLCore/src/main/java/org/jackhuang/hmcl/util/ExceptionalRunnable.java +++ b/HMCLCore/src/main/java/org/jackhuang/hmcl/util/ExceptionalRunnable.java @@ -34,7 +34,7 @@ public interface ExceptionalRunnable { }; } - static ExceptionalRunnable fromRunnable(Runnable r) { + static ExceptionalRunnable fromRunnable(Runnable r) { return r::run; } diff --git a/HMCLCore/src/main/java/org/jackhuang/hmcl/util/IntVersionNumber.java b/HMCLCore/src/main/java/org/jackhuang/hmcl/util/IntVersionNumber.java index b6a19590b..b1171bdde 100644 --- a/HMCLCore/src/main/java/org/jackhuang/hmcl/util/IntVersionNumber.java +++ b/HMCLCore/src/main/java/org/jackhuang/hmcl/util/IntVersionNumber.java @@ -18,7 +18,6 @@ package org.jackhuang.hmcl.util; import java.util.Arrays; -import java.util.Collections; import java.util.List; import java.util.Objects; import java.util.stream.Collectors; diff --git a/HMCLCore/src/main/java/org/jackhuang/hmcl/util/Zipper.java b/HMCLCore/src/main/java/org/jackhuang/hmcl/util/Zipper.java index cfb57c817..ac3c4b695 100644 --- a/HMCLCore/src/main/java/org/jackhuang/hmcl/util/Zipper.java +++ b/HMCLCore/src/main/java/org/jackhuang/hmcl/util/Zipper.java @@ -67,8 +67,6 @@ public final class Zipper implements Closeable { * @param filter returns false if you do not want that file or directory */ public void putDirectory(Path source, String targetDir, Predicate filter) throws IOException { - File[] files = null; - Path root = fs.getPath(targetDir); Files.createDirectories(root); Files.walkFileTree(source, new SimpleFileVisitor() {