Fix some more Thread-names

Author: TBlueF

common/src/main/java/de/bluecolored/bluemap/common/plugin/MapUpdateService.java

@@ -39,9 +39,12 @@
 import java.util.Map;
 import java.util.Timer;
 import java.util.TimerTask;
+import java.util.concurrent.atomic.AtomicInteger;
 
 public class MapUpdateService extends Thread {
 
+    private static final AtomicInteger NEXT_ID = new AtomicInteger(0);
+
     private final BmMap map;
     private final RenderManager renderManager;
     private final Duration regionUpdateCooldown;
@@ -55,6 +58,7 @@ public class MapUpdateService extends Thread {
     private final Cache<Vector2i, Long> lastUpdateTimes;
 
     public MapUpdateService(RenderManager renderManager, BmMap map, Duration regionUpdateCooldown) throws IOException {
+        super("BlueMap-MapUpdateService-" + NEXT_ID.getAndIncrement());
         this.renderManager = renderManager;
         this.map = map;
         this.regionUpdateCooldown = regionUpdateCooldown;

common/src/main/java/de/bluecolored/bluemap/common/plugin/Plugin.java

@@ -232,11 +232,14 @@ private void load(@Nullable ResourcePack preloadedResourcePack) throws IOExcepti
                     webLogger = Logger.combine(webLoggerList);
 
                     try {
-                        webServer = new HttpServer(new LoggingRequestHandler(
-                                webRequestHandler,
-                                webserverConfig.getLog().getFormat(),
-                                webLogger
-                        ));
+                        webServer = new HttpServer(
+                                "BlueMap-Webserver",
+                                new LoggingRequestHandler(
+                                        webRequestHandler,
+                                        webserverConfig.getLog().getFormat(),
+                                        webLogger
+                                )
+                        );
                         webServer.bind(new InetSocketAddress(
                                 webserverConfig.resolveIp(),
                                 webserverConfig.getPort()

common/src/main/java/de/bluecolored/bluemap/common/web/http/HttpServer.java

@@ -34,7 +34,8 @@ public class HttpServer extends Server {
     @Getter @Setter
     private HttpRequestHandler requestHandler;
 
-    public HttpServer(HttpRequestHandler requestHandler) throws IOException {
+    public HttpServer(String name, HttpRequestHandler requestHandler) throws IOException {
+        super(name);
         this.requestHandler = requestHandler;
     }
 

common/src/main/java/de/bluecolored/bluemap/common/web/http/Server.java

@@ -40,7 +40,8 @@ public abstract class Server extends Thread implements Closeable, Runnable {
     private final Selector selector;
     private final Collection<ServerSocketChannel> server;
 
-    public Server() throws IOException {
+    public Server(String name) throws IOException {
+        super(name);
         this.selector = Selector.open();
         this.server = new ArrayList<>();
     }

core/src/main/java/de/bluecolored/bluemap/core/BlueMap.java

@@ -29,10 +29,7 @@
 import org.spongepowered.configurate.gson.GsonConfigurationLoader;
 
 import java.io.IOException;
-import java.util.concurrent.Executors;
-import java.util.concurrent.ForkJoinPool;
-import java.util.concurrent.ForkJoinWorkerThread;
-import java.util.concurrent.ScheduledExecutorService;
+import java.util.concurrent.*;
 
 public class BlueMap {
 
@@ -71,4 +68,12 @@ public class BlueMap {
             false
     );
 
+    private static final Thread.Builder.OfPlatform schedulerThreadBuilder = Thread.ofPlatform().name("BlueMap-Scheduler-", 0);
+    public static final ScheduledExecutorService SCHEDULER = Executors.newScheduledThreadPool(1, runnable -> {
+        Thread thread = schedulerThreadBuilder.unstarted(runnable);
+        // use current classloader, this fixes ClassLoading issues with forge
+        thread.setContextClassLoader(BlueMap.class.getClassLoader());
+        return thread;
+    });
+
 }

core/src/main/java/de/bluecolored/bluemap/core/util/Caches.java

@@ -34,7 +34,7 @@ public class Caches {
     public static Caffeine<Object, Object> with() {
         return Caffeine.newBuilder()
                 .executor(BlueMap.THREAD_POOL)
-                .scheduler(Scheduler.systemScheduler())
+                .scheduler(Scheduler.forScheduledExecutorService(BlueMap.SCHEDULER))
                 .recordStats();
     }
 

implementations/cli/src/main/java/de/bluecolored/bluemap/cli/BlueMapCLI.java

@@ -291,7 +291,7 @@ public void startWebserver(BlueMapService blueMap, boolean verbose) throws IOExc
 
         try {
             //noinspection resource
-            HttpServer webServer = new HttpServer(handler);
+            HttpServer webServer = new HttpServer("BlueMap-Webserver", handler);
             webServer.bind(new InetSocketAddress(
                     config.resolveIp(),
                     config.getPort()