remove logger and collections dependencies

HSGamer · HSGamer · commit 5f364dc74c75 · 2025-08-04T23:57:17.000+07:00
diff --git a/lib/pom.xml b/lib/pom.xml
@@ -19,21 +19,11 @@
     </repositories>
 
     <dependencies>
-        <dependency>
-            <groupId>me.hsgamer</groupId>
-            <artifactId>hscore-collections</artifactId>
-            <version>${core.version}</version>
-        </dependency>
         <dependency>
             <groupId>me.hsgamer</groupId>
             <artifactId>hscore-web</artifactId>
             <version>${core.version}</version>
         </dependency>
-        <dependency>
-            <groupId>me.hsgamer</groupId>
-            <artifactId>hscore-logger-common</artifactId>
-            <version>${core.version}</version>
-        </dependency>
         <dependency>
             <groupId>org.json</groupId>
             <artifactId>json</artifactId>
diff --git a/lib/src/main/java/io/github/projectunified/mcserverupdater/UpdateBuilder.java b/lib/src/main/java/io/github/projectunified/mcserverupdater/UpdateBuilder.java
@@ -1,30 +1,25 @@
 package io.github.projectunified.mcserverupdater;
 
 import io.github.projectunified.mcserverupdater.api.Checksum;
+import io.github.projectunified.mcserverupdater.api.DebugConsumer;
 import io.github.projectunified.mcserverupdater.api.Updater;
 import io.github.projectunified.mcserverupdater.updater.*;
 import io.github.projectunified.mcserverupdater.util.Utils;
 import io.github.projectunified.mcserverupdater.util.VersionQuery;
-import me.hsgamer.hscore.collections.map.CaseInsensitiveStringLinkedMap;
-import me.hsgamer.hscore.logger.common.LogLevel;
-import me.hsgamer.hscore.logger.common.Logger;
 
 import java.io.File;
 import java.io.IOException;
-import java.util.Map;
-import java.util.Optional;
-import java.util.Set;
+import java.util.*;
 import java.util.concurrent.CompletableFuture;
 import java.util.concurrent.CompletionException;
 import java.util.concurrent.ExecutionException;
-import java.util.function.Consumer;
 import java.util.function.Function;
 
 /**
  * Where to create the update process
  */
 public final class UpdateBuilder {
-    private static final Map<String, Function<VersionQuery, Updater>> UPDATERS = new CaseInsensitiveStringLinkedMap<>();
+    private static final Map<String, Function<VersionQuery, Updater>> UPDATERS = new HashMap<>();
 
     static {
         registerUpdater(versionQuery -> new PaperUpdater(versionQuery, "paper"), "paper", "papermc", "paperspigot");
@@ -66,7 +61,7 @@ public final class UpdateBuilder {
     private ChecksumSupplier checksumSupplier = () -> "";
     private ChecksumConsumer checksumConsumer = s -> {
     };
-    private Logger logger = (logLevel, s) -> {
+    private DebugConsumer debugConsumer = s -> {
     };
 
     private UpdateBuilder(String project) {
@@ -179,25 +174,15 @@ public UpdateBuilder checksumConsumer(ChecksumConsumer checksumConsumer) {
         return this;
     }
 
-    /**
-     * Set the logger
-     *
-     * @param logger the logger
-     * @return the update process
-     */
-    public UpdateBuilder logger(Logger logger) {
-        this.logger = logger;
-        return this;
-    }
-
     /**
      * Set the debug consumer
      *
      * @param debugConsumer the debug consumer
      * @return the update process
      */
-    public UpdateBuilder debugConsumer(Consumer<String> debugConsumer) {
-        return logger((logLevel, s) -> debugConsumer.accept("[" + logLevel.name() + "] " + s));
+    public UpdateBuilder debugConsumer(DebugConsumer debugConsumer) {
+        this.debugConsumer = debugConsumer;
+        return this;
     }
 
     /**
@@ -283,12 +268,12 @@ public File workingDirectory() {
     }
 
     /**
-     * Get the logger
+     * Get the debug consumer
      *
-     * @return the logger
+     * @return the debug consumer
      */
-    public Logger logger() {
-        return logger;
+    public DebugConsumer debugConsumer() {
+        return debugConsumer;
     }
 
     /**
@@ -297,7 +282,7 @@ public Logger logger() {
      * @param message the message
      */
     public void debug(String message) {
-        logger.log(LogLevel.DEBUG, message);
+        debugConsumer.consume(message);
     }
 
     /**
@@ -308,7 +293,7 @@ public void debug(String message) {
     public CompletableFuture<UpdateStatus> executeAsync() {
         return CompletableFuture.supplyAsync(() -> {
             VersionQuery versionQuery = new VersionQuery(version, this);
-            Updater update = Optional.ofNullable(UPDATERS.get(project)).map(f -> f.apply(versionQuery)).orElse(null);
+            Updater update = Optional.ofNullable(UPDATERS.get(project.toLowerCase(Locale.ROOT))).map(f -> f.apply(versionQuery)).orElse(null);
             if (update == null) {
                 return UpdateStatus.NO_PROJECT;
             }
diff --git a/lib/src/main/java/io/github/projectunified/mcserverupdater/api/BibliothekUpdater.java b/lib/src/main/java/io/github/projectunified/mcserverupdater/api/BibliothekUpdater.java
@@ -2,7 +2,6 @@
 
 import io.github.projectunified.mcserverupdater.UpdateBuilder;
 import io.github.projectunified.mcserverupdater.util.VersionQuery;
-import me.hsgamer.hscore.logger.common.Logger;
 import me.hsgamer.hscore.web.UserAgent;
 import me.hsgamer.hscore.web.WebUtils;
 import org.json.JSONArray;
@@ -104,7 +103,7 @@ public final String getFileUrl() {
     }
 
     @Override
-    public final Logger getLogger() {
-        return updateBuilder.logger();
+    public DebugConsumer getDebugConsumer() {
+        return updateBuilder.debugConsumer();
     }
 }
diff --git a/lib/src/main/java/io/github/projectunified/mcserverupdater/api/DebugConsumer.java b/lib/src/main/java/io/github/projectunified/mcserverupdater/api/DebugConsumer.java
@@ -0,0 +1,17 @@
+package io.github.projectunified.mcserverupdater.api;
+
+public interface DebugConsumer {
+    void consume(String message);
+
+    default void consume(Throwable throwable) {
+        consume(throwable.getClass().getSimpleName() + ": " + throwable.getMessage());
+        for (StackTraceElement element : throwable.getStackTrace()) {
+            consume("    at " + element.toString());
+        }
+    }
+
+    default void consume(String message, Throwable throwable) {
+        consume(message);
+        consume(throwable);
+    }
+}
diff --git a/lib/src/main/java/io/github/projectunified/mcserverupdater/api/GithubBranchUpdater.java b/lib/src/main/java/io/github/projectunified/mcserverupdater/api/GithubBranchUpdater.java
@@ -2,7 +2,6 @@
 
 import io.github.projectunified.mcserverupdater.UpdateBuilder;
 import io.github.projectunified.mcserverupdater.util.VersionQuery;
-import me.hsgamer.hscore.logger.common.Logger;
 import me.hsgamer.hscore.web.UserAgent;
 import me.hsgamer.hscore.web.WebUtils;
 import org.json.JSONArray;
@@ -107,7 +106,7 @@ public String getCurrentChecksum(File file) throws Exception {
     }
 
     @Override
-    public Logger getLogger() {
-        return updateBuilder.logger();
+    public DebugConsumer getDebugConsumer() {
+        return updateBuilder.debugConsumer();
     }
 }
diff --git a/lib/src/main/java/io/github/projectunified/mcserverupdater/api/GithubReleaseUpdater.java b/lib/src/main/java/io/github/projectunified/mcserverupdater/api/GithubReleaseUpdater.java
@@ -2,7 +2,6 @@
 
 import io.github.projectunified.mcserverupdater.UpdateBuilder;
 import io.github.projectunified.mcserverupdater.util.VersionQuery;
-import me.hsgamer.hscore.logger.common.Logger;
 import me.hsgamer.hscore.web.UserAgent;
 import me.hsgamer.hscore.web.WebUtils;
 import org.json.JSONArray;
@@ -146,7 +145,7 @@ public String getCurrentChecksum(File file) throws Exception {
     }
 
     @Override
-    public Logger getLogger() {
-        return updateBuilder.logger();
+    public DebugConsumer getDebugConsumer() {
+        return updateBuilder.debugConsumer();
     }
 }
diff --git a/lib/src/main/java/io/github/projectunified/mcserverupdater/api/JenkinsUpdater.java b/lib/src/main/java/io/github/projectunified/mcserverupdater/api/JenkinsUpdater.java
@@ -2,7 +2,6 @@
 
 import io.github.projectunified.mcserverupdater.UpdateBuilder;
 import io.github.projectunified.mcserverupdater.util.VersionQuery;
-import me.hsgamer.hscore.logger.common.Logger;
 import me.hsgamer.hscore.web.UserAgent;
 import me.hsgamer.hscore.web.WebUtils;
 import org.json.JSONArray;
@@ -160,7 +159,7 @@ public String getCurrentChecksum(File file) throws Exception {
     }
 
     @Override
-    public Logger getLogger() {
-        return updateBuilder.logger();
+    public DebugConsumer getDebugConsumer() {
+        return updateBuilder.debugConsumer();
     }
 }
diff --git a/lib/src/main/java/io/github/projectunified/mcserverupdater/api/Updater.java b/lib/src/main/java/io/github/projectunified/mcserverupdater/api/Updater.java
@@ -1,28 +1,25 @@
 package io.github.projectunified.mcserverupdater.api;
 
-import me.hsgamer.hscore.logger.common.LogLevel;
-import me.hsgamer.hscore.logger.common.Logger;
-
 import java.io.File;
 
 public interface Updater {
     boolean update(File file) throws Exception;
 
-    Logger getLogger();
+    DebugConsumer getDebugConsumer();
 
     default void debug(String message) {
-        getLogger().log(LogLevel.DEBUG, message);
+        getDebugConsumer().consume(message);
     }
 
     default void debug(String format, Object... args) {
         debug(String.format(format, args));
     }
 
     default void debug(Throwable throwable) {
-        getLogger().log(LogLevel.DEBUG, throwable);
+        getDebugConsumer().consume(throwable);
     }
 
     default void debug(String message, Throwable throwable) {
-        getLogger().log(LogLevel.DEBUG, message, throwable);
+        getDebugConsumer().consume(message, throwable);
     }
 }
diff --git a/lib/src/main/java/io/github/projectunified/mcserverupdater/updater/FabricUpdater.java b/lib/src/main/java/io/github/projectunified/mcserverupdater/updater/FabricUpdater.java
@@ -1,10 +1,10 @@
 package io.github.projectunified.mcserverupdater.updater;
 
 import io.github.projectunified.mcserverupdater.UpdateBuilder;
+import io.github.projectunified.mcserverupdater.api.DebugConsumer;
 import io.github.projectunified.mcserverupdater.api.SimpleChecksum;
 import io.github.projectunified.mcserverupdater.api.UrlInputStreamUpdater;
 import io.github.projectunified.mcserverupdater.util.VersionQuery;
-import me.hsgamer.hscore.logger.common.Logger;
 import me.hsgamer.hscore.web.UserAgent;
 import me.hsgamer.hscore.web.WebUtils;
 import org.json.JSONArray;
@@ -110,7 +110,7 @@ public String getCurrentChecksum(File file) throws Exception {
     }
 
     @Override
-    public Logger getLogger() {
-        return updateBuilder.logger();
+    public DebugConsumer getDebugConsumer() {
+        return updateBuilder.debugConsumer();
     }
 }
diff --git a/lib/src/main/java/io/github/projectunified/mcserverupdater/updater/MohistUpdater.java b/lib/src/main/java/io/github/projectunified/mcserverupdater/updater/MohistUpdater.java
@@ -1,10 +1,10 @@
 package io.github.projectunified.mcserverupdater.updater;
 
 import io.github.projectunified.mcserverupdater.UpdateBuilder;
+import io.github.projectunified.mcserverupdater.api.DebugConsumer;
 import io.github.projectunified.mcserverupdater.api.FileDigestChecksum;
 import io.github.projectunified.mcserverupdater.api.UrlInputStreamUpdater;
 import io.github.projectunified.mcserverupdater.util.VersionQuery;
-import me.hsgamer.hscore.logger.common.Logger;
 import me.hsgamer.hscore.web.UserAgent;
 import me.hsgamer.hscore.web.WebUtils;
 import org.json.JSONArray;
@@ -76,7 +76,7 @@ public String getFileUrl() {
     }
 
     @Override
-    public Logger getLogger() {
-        return updateBuilder.logger();
+    public DebugConsumer getDebugConsumer() {
+        return updateBuilder.debugConsumer();
     }
 }
diff --git a/lib/src/main/java/io/github/projectunified/mcserverupdater/updater/PaperUpdater.java b/lib/src/main/java/io/github/projectunified/mcserverupdater/updater/PaperUpdater.java
@@ -1,10 +1,10 @@
 package io.github.projectunified.mcserverupdater.updater;
 
 import io.github.projectunified.mcserverupdater.UpdateBuilder;
+import io.github.projectunified.mcserverupdater.api.DebugConsumer;
 import io.github.projectunified.mcserverupdater.api.FileDigestChecksum;
 import io.github.projectunified.mcserverupdater.api.UrlInputStreamUpdater;
 import io.github.projectunified.mcserverupdater.util.VersionQuery;
-import me.hsgamer.hscore.logger.common.Logger;
 import me.hsgamer.hscore.web.UserAgent;
 import me.hsgamer.hscore.web.WebUtils;
 import org.json.JSONArray;
@@ -86,7 +86,7 @@ public String getFileUrl() {
     }
 
     @Override
-    public Logger getLogger() {
-        return updateBuilder.logger();
+    public DebugConsumer getDebugConsumer() {
+        return updateBuilder.debugConsumer();
     }
 }
diff --git a/lib/src/main/java/io/github/projectunified/mcserverupdater/updater/PurpurUpdater.java b/lib/src/main/java/io/github/projectunified/mcserverupdater/updater/PurpurUpdater.java
@@ -1,10 +1,10 @@
 package io.github.projectunified.mcserverupdater.updater;
 
 import io.github.projectunified.mcserverupdater.UpdateBuilder;
+import io.github.projectunified.mcserverupdater.api.DebugConsumer;
 import io.github.projectunified.mcserverupdater.api.FileDigestChecksum;
 import io.github.projectunified.mcserverupdater.api.UrlInputStreamUpdater;
 import io.github.projectunified.mcserverupdater.util.VersionQuery;
-import me.hsgamer.hscore.logger.common.Logger;
 import me.hsgamer.hscore.web.UserAgent;
 import me.hsgamer.hscore.web.WebUtils;
 import org.json.JSONArray;
@@ -84,7 +84,7 @@ public String getChecksum() {
     }
 
     @Override
-    public Logger getLogger() {
-        return updateBuilder.logger();
+    public DebugConsumer getDebugConsumer() {
+        return updateBuilder.debugConsumer();
     }
 }
diff --git a/lib/src/main/java/io/github/projectunified/mcserverupdater/updater/SpigotUpdater.java b/lib/src/main/java/io/github/projectunified/mcserverupdater/updater/SpigotUpdater.java
@@ -1,9 +1,9 @@
 package io.github.projectunified.mcserverupdater.updater;
 
 import io.github.projectunified.mcserverupdater.UpdateBuilder;
+import io.github.projectunified.mcserverupdater.api.DebugConsumer;
 import io.github.projectunified.mcserverupdater.api.Updater;
 import io.github.projectunified.mcserverupdater.util.VersionQuery;
-import me.hsgamer.hscore.logger.common.Logger;
 import me.hsgamer.hscore.web.UserAgent;
 import me.hsgamer.hscore.web.WebUtils;
 
@@ -65,8 +65,8 @@ public boolean update(File file) throws Exception {
     }
 
     @Override
-    public Logger getLogger() {
-        return updateBuilder.logger();
+    public DebugConsumer getDebugConsumer() {
+        return updateBuilder.debugConsumer();
     }
 
     private boolean runBuildTools(File buildTools, File outputDir) throws IOException, InterruptedException {
diff --git a/lib/src/main/java/io/github/projectunified/mcserverupdater/updater/SpongeUpdater.java b/lib/src/main/java/io/github/projectunified/mcserverupdater/updater/SpongeUpdater.java
@@ -1,10 +1,10 @@
 package io.github.projectunified.mcserverupdater.updater;
 
 import io.github.projectunified.mcserverupdater.UpdateBuilder;
+import io.github.projectunified.mcserverupdater.api.DebugConsumer;
 import io.github.projectunified.mcserverupdater.api.FileDigestChecksum;
 import io.github.projectunified.mcserverupdater.api.UrlInputStreamUpdater;
 import io.github.projectunified.mcserverupdater.util.VersionQuery;
-import me.hsgamer.hscore.logger.common.Logger;
 import me.hsgamer.hscore.web.UserAgent;
 import me.hsgamer.hscore.web.WebUtils;
 import org.json.JSONArray;
@@ -129,8 +129,8 @@ public String getChecksum() {
     }
 
     @Override
-    public Logger getLogger() {
-        return updateBuilder.logger();
+    public DebugConsumer getDebugConsumer() {
+        return updateBuilder.debugConsumer();
     }
 
     public enum Type {
diff --git a/standalone/pom.xml b/standalone/pom.xml
@@ -57,10 +57,5 @@
             <artifactId>jopt-simple</artifactId>
             <version>6.0-alpha-3</version>
         </dependency>
-        <dependency>
-            <groupId>me.hsgamer</groupId>
-            <artifactId>hscore-logger-jul</artifactId>
-            <version>${core.version}</version>
-        </dependency>
     </dependencies>
 </project>
diff --git a/standalone/src/main/java/io/github/projectunified/mcserverupdater/MCServerUpdater.java b/standalone/src/main/java/io/github/projectunified/mcserverupdater/MCServerUpdater.java

Original file line number	Diff line number	Diff line change
`@@ -2,7 +2,6 @@`
`2`	`2`
`3`	`3`	`import io.github.projectunified.mcserverupdater.UpdateBuilder;`
`4`	`4`	`import io.github.projectunified.mcserverupdater.util.VersionQuery;`
`5`		`-import me.hsgamer.hscore.logger.common.Logger;`
`6`	`5`	`import me.hsgamer.hscore.web.UserAgent;`
`7`	`6`	`import me.hsgamer.hscore.web.WebUtils;`
`8`	`7`	`import org.json.JSONArray;`
`@@ -104,7 +103,7 @@ public final String getFileUrl() {`
`104`	`103`	`}`
`105`	`104`
`106`	`105`	`@Override`
`107`		`- public final Logger getLogger() {`
`108`		`- return updateBuilder.logger();`
	`106`	`+ public DebugConsumer getDebugConsumer() {`
	`107`	`+ return updateBuilder.debugConsumer();`
`109`	`108`	`}`
`110`	`109`	`}`
Original file line number	Diff line number	Diff line change
`@@ -1,28 +1,25 @@`
`1`	`1`	`package io.github.projectunified.mcserverupdater.api;`
`2`	`2`
`3`		`-import me.hsgamer.hscore.logger.common.LogLevel;`
`4`		`-import me.hsgamer.hscore.logger.common.Logger;`
`5`		`-`
`6`	`3`	`import java.io.File;`
`7`	`4`
`8`	`5`	`public interface Updater {`
`9`	`6`	`boolean update(File file) throws Exception;`
`10`	`7`
`11`		`- Logger getLogger();`
	`8`	`+ DebugConsumer getDebugConsumer();`
`12`	`9`
`13`	`10`	`default void debug(String message) {`
`14`		`- getLogger().log(LogLevel.DEBUG, message);`
	`11`	`+ getDebugConsumer().consume(message);`
`15`	`12`	`}`
`16`	`13`
`17`	`14`	`default void debug(String format, Object... args) {`
`18`	`15`	`debug(String.format(format, args));`
`19`	`16`	`}`
`20`	`17`
`21`	`18`	`default void debug(Throwable throwable) {`
`22`		`- getLogger().log(LogLevel.DEBUG, throwable);`
	`19`	`+ getDebugConsumer().consume(throwable);`
`23`	`20`	`}`
`24`	`21`
`25`	`22`	`default void debug(String message, Throwable throwable) {`
`26`		`- getLogger().log(LogLevel.DEBUG, message, throwable);`
	`23`	`+ getDebugConsumer().consume(message, throwable);`
`27`	`24`	`}`
`28`	`25`	`}`
Original file line number	Diff line number	Diff line change
`@@ -1,10 +1,10 @@`
`1`	`1`	`package io.github.projectunified.mcserverupdater.updater;`
`2`	`2`
`3`	`3`	`import io.github.projectunified.mcserverupdater.UpdateBuilder;`
	`4`	`+import io.github.projectunified.mcserverupdater.api.DebugConsumer;`
`4`	`5`	`import io.github.projectunified.mcserverupdater.api.SimpleChecksum;`
`5`	`6`	`import io.github.projectunified.mcserverupdater.api.UrlInputStreamUpdater;`
`6`	`7`	`import io.github.projectunified.mcserverupdater.util.VersionQuery;`
`7`		`-import me.hsgamer.hscore.logger.common.Logger;`
`8`	`8`	`import me.hsgamer.hscore.web.UserAgent;`
`9`	`9`	`import me.hsgamer.hscore.web.WebUtils;`
`10`	`10`	`import org.json.JSONArray;`
`@@ -110,7 +110,7 @@ public String getCurrentChecksum(File file) throws Exception {`
`110`	`110`	`}`
`111`	`111`
`112`	`112`	`@Override`
`113`		`- public Logger getLogger() {`
`114`		`- return updateBuilder.logger();`
	`113`	`+ public DebugConsumer getDebugConsumer() {`
	`114`	`+ return updateBuilder.debugConsumer();`
`115`	`115`	`}`
`116`	`116`	`}`