Merge branch 'master' into mc1.20

Author: TBlueF

Dockerfile

@@ -2,6 +2,8 @@ FROM eclipse-temurin:21-jre-jammy
 
 WORKDIR /app
 
+ENV BLUEMAP_COMMAND="docker run --rm -it ghcr.io/bluemap-minecraft/bluemap"
+
 COPY build/release/*-cli.jar cli.jar
 
 ENTRYPOINT [ "java", "-jar", "cli.jar" ]

build.gradle.kts

@@ -0,0 +1,4 @@
+// adding this helps intellij with resolving repositories to be able to download library docs and sources
+plugins {
+    bluemap.base
+}

buildSrc/src/main/kotlin/bluemap.base.gradle.kts

@@ -1,8 +1,5 @@
 plugins {
-    java
-    `java-library`
     `maven-publish`
-    id ( "com.diffplug.spotless" )
 }
 
 group = "de.bluecolored"
@@ -33,47 +30,6 @@ repositories {
     maven ( "https://maven.neoforged.net/releases" )
 }
 
-tasks.withType(JavaCompile::class).configureEach {
-    options.encoding = "utf-8"
-}
-
-tasks.withType(AbstractArchiveTask::class).configureEach {
-    isReproducibleFileOrder = true
-    isPreserveFileTimestamps = false
-}
-
-java {
-    toolchain.languageVersion = JavaLanguageVersion.of(21)
-    withSourcesJar()
-    withJavadocJar()
-}
-
-tasks.javadoc {
-    (options as StandardJavadocDocletOptions).apply {
-        links(
-            "https://docs.oracle.com/en/java/javase/21/docs/api/",
-            "https://javadoc.io/doc/com.flowpowered/flow-math/1.0.3/",
-            "https://javadoc.io/doc/com.google.code.gson/gson/2.8.9/",
-        )
-        addStringOption("Xdoclint:none", "-quiet")
-        addBooleanOption("html5", true)
-    }
-}
-
-tasks.test {
-    useJUnitPlatform()
-}
-
-spotless {
-    java {
-        target ("src/*/java/**/*.java")
-
-        licenseHeaderFile(rootProject.file("LICENSE_HEADER"))
-        indentWithSpaces()
-        trimTrailingWhitespace()
-    }
-}
-
 publishing {
     repositories {
         maven {

buildSrc/src/main/kotlin/bluemap.implementation.gradle.kts

@@ -1,5 +1,5 @@
 plugins {
-    id ( "bluemap.base" )
+    id ( "bluemap.java" )
     id ( "com.gradleup.shadow" )
 }
 

buildSrc/src/main/kotlin/bluemap.java.gradle.kts

@@ -0,0 +1,47 @@
+plugins {
+    id ( "bluemap.base" )
+    java
+    `java-library`
+    id ( "com.diffplug.spotless" )
+}
+
+tasks.withType(JavaCompile::class).configureEach {
+    options.encoding = "utf-8"
+}
+
+tasks.withType(AbstractArchiveTask::class).configureEach {
+    isReproducibleFileOrder = true
+    isPreserveFileTimestamps = false
+}
+
+java {
+    toolchain.languageVersion = JavaLanguageVersion.of(21)
+    withSourcesJar()
+    withJavadocJar()
+}
+
+tasks.javadoc {
+    (options as StandardJavadocDocletOptions).apply {
+        links(
+            "https://docs.oracle.com/en/java/javase/21/docs/api/",
+            "https://javadoc.io/doc/com.flowpowered/flow-math/1.0.3/",
+            "https://javadoc.io/doc/com.google.code.gson/gson/2.8.9/",
+        )
+        addStringOption("Xdoclint:none", "-quiet")
+        addBooleanOption("html5", true)
+    }
+}
+
+tasks.test {
+    useJUnitPlatform()
+}
+
+spotless {
+    java {
+        target ("src/*/java/**/*.java")
+
+        licenseHeaderFile(rootProject.file("LICENSE_HEADER"))
+        indentWithSpaces()
+        trimTrailingWhitespace()
+    }
+}

buildSrc/src/main/kotlin/curseforge.kt

@@ -1,10 +1,12 @@
 import com.matthewprenger.cursegradle.CurseProject
-import gradle.kotlin.dsl.accessors._94345610689fa610403700b47edcf23c.curseforge
 import org.gradle.api.Action
 import org.gradle.api.Project
 import org.gradle.kotlin.dsl.closureOf
 
 fun Project.curseforgeBlueMap (configuration: Action<CurseProject>) {
+    val curseforge = extensions.getByName("curseforge")
+            as com.matthewprenger.cursegradle.CurseExtension
+
     curseforge.project(closureOf<CurseProject> {
         id = "406463"
         changelogType = "markdown"

common/build.gradle.kts

@@ -2,7 +2,7 @@ import com.github.gradle.node.npm.task.NpmTask
 import java.io.IOException
 
 plugins {
-    bluemap.base
+    bluemap.java
     alias ( libs.plugins.node.gradle )
 }
 

common/src/main/java/de/bluecolored/bluemap/common/config/CoreConfig.java

@@ -24,12 +24,14 @@
  */
 package de.bluecolored.bluemap.common.config;
 
+import lombok.Getter;
 import org.spongepowered.configurate.objectmapping.ConfigSerializable;
 
 import java.nio.file.Path;
 
 @SuppressWarnings({"FieldMayBeFinal", "FieldCanBeLocal"})
 @ConfigSerializable
+@Getter
 public class CoreConfig {
 
     private boolean acceptDownload = false;
@@ -39,54 +41,22 @@ public class CoreConfig {
     private boolean metrics = true;
 
     private Path data = Path.of("bluemap");
-
     private boolean scanForModResources = true;
 
     private LogConfig log = new LogConfig();
 
-    public boolean isAcceptDownload() {
-        return acceptDownload;
-    }
-
-    public int getRenderThreadCount() {
-        return renderThreadCount;
-    }
-
     public int resolveRenderThreadCount() {
         if (renderThreadCount > 0) return renderThreadCount;
         return Math.max(Runtime.getRuntime().availableProcessors() + renderThreadCount, 1);
     }
 
-    public boolean isMetrics() {
-        return metrics;
-    }
-
-    public Path getData() {
-        return data;
-    }
-
-    public boolean isScanForModResources() {
-        return scanForModResources;
-    }
-
-    public LogConfig getLog() {
-        return log;
-    }
-
     @ConfigSerializable
+    @Getter
     public static class LogConfig {
 
         private String file = null;
         private boolean append = false;
 
-        public String getFile() {
-            return file;
-        }
-
-        public boolean isAppend() {
-            return append;
-        }
-
     }
 
 }

common/src/main/java/de/bluecolored/bluemap/common/config/PluginConfig.java

@@ -24,13 +24,16 @@
  */
 package de.bluecolored.bluemap.common.config;
 
+import lombok.Getter;
 import org.spongepowered.configurate.objectmapping.ConfigSerializable;
 
+import java.time.Duration;
 import java.util.ArrayList;
 import java.util.List;
 
 @SuppressWarnings({"FieldMayBeFinal", "FieldCanBeLocal"})
 @ConfigSerializable
+@Getter
 public class PluginConfig {
 
     private boolean livePlayerMarkers = true;
@@ -50,58 +53,15 @@ public class PluginConfig {
 
     private int playerRenderLimit = -1;
 
+    private int updateCooldown = 60;
     private int fullUpdateInterval = 1440;
 
-    public boolean isLivePlayerMarkers() {
-        return livePlayerMarkers;
+    public Duration getUpdateCooldown() {
+        return Duration.ofSeconds(updateCooldown);
     }
 
-    public List<String> getHiddenGameModes() {
-        return hiddenGameModes;
-    }
-
-    public boolean isHideVanished() {
-        return hideVanished;
-    }
-
-    public boolean isHideInvisible() {
-        return hideInvisible;
-    }
-
-    public boolean isHideSneaking() {
-        return hideSneaking;
-    }
-
-    public boolean isHideDifferentWorld() {
-        return hideDifferentWorld;
-    }
-
-    public int getHideBelowSkyLight() {
-        return hideBelowSkyLight;
-    }
-
-    public int getHideBelowBlockLight() {
-        return hideBelowBlockLight;
-    }
-
-    public int getWriteMarkersInterval() {
-        return writeMarkersInterval;
-    }
-
-    public int getWritePlayersInterval() {
-        return writePlayersInterval;
-    }
-
-    public boolean isSkinDownload() {
-        return skinDownload;
-    }
-
-    public int getPlayerRenderLimit() {
-        return playerRenderLimit;
-    }
-
-    public int getFullUpdateInterval() {
-        return fullUpdateInterval;
+    public Duration getFullUpdateInterval() {
+        return Duration.ofMinutes(fullUpdateInterval);
     }
 
 }

common/src/main/java/de/bluecolored/bluemap/common/config/WebappConfig.java

@@ -24,6 +24,7 @@
  */
 package de.bluecolored.bluemap.common.config;
 
+import lombok.Getter;
 import org.spongepowered.configurate.objectmapping.ConfigSerializable;
 
 import java.nio.file.Path;
@@ -33,6 +34,7 @@
 
 @SuppressWarnings({"FieldMayBeFinal", "FieldCanBeLocal"})
 @ConfigSerializable
+@Getter
 public class WebappConfig {
 
     private boolean enabled = true;
@@ -65,80 +67,8 @@ public class WebappConfig {
     private Set<String> scripts = new HashSet<>();
     private Set<String> styles = new HashSet<>();
 
-    public boolean isEnabled() {
-        return enabled;
-    }
-
-    public Path getWebroot() {
-        return webroot;
-    }
-
-    public boolean isUpdateSettingsFile() {
-        return updateSettingsFile;
-    }
-
-    public boolean isUseCookies() {
-        return useCookies;
-    }
-
-    public boolean isDefaultToFlatView() {
-        return defaultToFlatView;
-    }
-
     public Optional<String> getStartLocation() {
         return Optional.ofNullable(startLocation);
     }
 
-    public float getResolutionDefault() {
-        return resolutionDefault;
-    }
-
-    public int getMinZoomDistance() {
-        return minZoomDistance;
-    }
-
-    public int getMaxZoomDistance() {
-        return maxZoomDistance;
-    }
-
-    public int getHiresSliderMax() {
-        return hiresSliderMax;
-    }
-
-    public int getHiresSliderDefault() {
-        return hiresSliderDefault;
-    }
-
-    public int getHiresSliderMin() {
-        return hiresSliderMin;
-    }
-
-    public int getLowresSliderMax() {
-        return lowresSliderMax;
-    }
-
-    public int getLowresSliderDefault() {
-        return lowresSliderDefault;
-    }
-
-    public int getLowresSliderMin() {
-        return lowresSliderMin;
-    }
-
-    public String getMapDataRoot() {
-        return mapDataRoot;
-    }
-
-    public String getLiveDataRoot() {
-        return liveDataRoot;
-    }
-
-    public Set<String> getScripts() {
-        return scripts;
-    }
-
-    public Set<String> getStyles() {
-        return styles;
-    }
-
 }