From ed91771594dec7e87ad1c83e48faa253d04a0f1c Mon Sep 17 00:00:00 2001
From: yushijinhun <yushijinhun@gmail.com>
Date: Sat, 22 Sep 2018 12:39:57 +0800
Subject: [PATCH] Remove truePredicate/falsePredicate/emptyConsumer

---
 .../org/jackhuang/hmcl/mod/CurseInstallTask.java    |  3 +--
 .../hmcl/mod/MultiMCModpackInstallTask.java         |  2 +-
 .../java/org/jackhuang/hmcl/task/Schedulers.java    |  3 +--
 .../java/org/jackhuang/hmcl/util/Constants.java     | 13 -------------
 4 files changed, 3 insertions(+), 18 deletions(-)

diff --git a/HMCLCore/src/main/java/org/jackhuang/hmcl/mod/CurseInstallTask.java b/HMCLCore/src/main/java/org/jackhuang/hmcl/mod/CurseInstallTask.java
index 3f4cece9e..e9ffcd6e0 100644
--- a/HMCLCore/src/main/java/org/jackhuang/hmcl/mod/CurseInstallTask.java
+++ b/HMCLCore/src/main/java/org/jackhuang/hmcl/mod/CurseInstallTask.java
@@ -23,7 +23,6 @@ import org.jackhuang.hmcl.download.DefaultDependencyManager;
 import org.jackhuang.hmcl.download.GameBuilder;
 import org.jackhuang.hmcl.game.DefaultGameRepository;
 import org.jackhuang.hmcl.task.Task;
-import org.jackhuang.hmcl.util.Constants;
 import org.jackhuang.hmcl.util.gson.JsonUtils;
 import org.jackhuang.hmcl.util.io.FileUtils;
 
@@ -93,7 +92,7 @@ public final class CurseInstallTask extends Task {
         } catch (JsonParseException | IOException ignore) {
         }
         this.config = config;
-        dependents.add(new ModpackInstallTask<>(zipFile, run, manifest.getOverrides(), Constants.truePredicate(), config));
+        dependents.add(new ModpackInstallTask<>(zipFile, run, manifest.getOverrides(), any -> true, config));
     }
 
     @Override
diff --git a/HMCLCore/src/main/java/org/jackhuang/hmcl/mod/MultiMCModpackInstallTask.java b/HMCLCore/src/main/java/org/jackhuang/hmcl/mod/MultiMCModpackInstallTask.java
index 0773c7dbd..be2e3447f 100644
--- a/HMCLCore/src/main/java/org/jackhuang/hmcl/mod/MultiMCModpackInstallTask.java
+++ b/HMCLCore/src/main/java/org/jackhuang/hmcl/mod/MultiMCModpackInstallTask.java
@@ -100,7 +100,7 @@ public final class MultiMCModpackInstallTask extends Task {
         } catch (JsonParseException | IOException ignore) {
         }
 
-        dependents.add(new ModpackInstallTask<>(zipFile, run, "/" + manifest.getName() + "/minecraft", Constants.truePredicate(), config));
+        dependents.add(new ModpackInstallTask<>(zipFile, run, "/" + manifest.getName() + "/minecraft", any -> true, config));
     }
     
     @Override
diff --git a/HMCLCore/src/main/java/org/jackhuang/hmcl/task/Schedulers.java b/HMCLCore/src/main/java/org/jackhuang/hmcl/task/Schedulers.java
index 8a1d53b00..324369906 100644
--- a/HMCLCore/src/main/java/org/jackhuang/hmcl/task/Schedulers.java
+++ b/HMCLCore/src/main/java/org/jackhuang/hmcl/task/Schedulers.java
@@ -17,7 +17,6 @@
  */
 package org.jackhuang.hmcl.task;
 
-import org.jackhuang.hmcl.util.Constants;
 import org.jackhuang.hmcl.util.Logging;
 
 import java.util.concurrent.*;
@@ -113,7 +112,7 @@ public final class Schedulers {
         return newThread();
     }
 
-    static final Scheduler NONE = new SchedulerImpl(Constants.emptyConsumer());
+    static final Scheduler NONE = new SchedulerImpl(any -> {});
 
     public static synchronized void shutdown() {
         Logging.LOG.info("Shutting down executor services.");
diff --git a/HMCLCore/src/main/java/org/jackhuang/hmcl/util/Constants.java b/HMCLCore/src/main/java/org/jackhuang/hmcl/util/Constants.java
index 056908497..ec220e2bb 100644
--- a/HMCLCore/src/main/java/org/jackhuang/hmcl/util/Constants.java
+++ b/HMCLCore/src/main/java/org/jackhuang/hmcl/util/Constants.java
@@ -27,7 +27,6 @@ import org.jackhuang.hmcl.util.platform.OperatingSystem;
 import java.awt.*;
 import java.nio.charset.Charset;
 import java.util.function.Consumer;
-import java.util.function.Predicate;
 
 /**
  * Constants.
@@ -63,16 +62,4 @@ public final class Constants {
 
     // lazy loading
     public static final ObjectBinding<Image> DEFAULT_ICON = Bindings.createObjectBinding(() -> new Image("/assets/img/icon.png"));
-
-    public static <T> Predicate<T> truePredicate() {
-        return s -> true;
-    }
-
-    public static <T> Predicate<T> falsePredicate() {
-        return s -> false;
-    }
-
-    public static <T> Consumer<T> emptyConsumer() {
-        return x -> {};
-    }
 }