Merge remote-tracking branch 'origin/master' into mc1.20

Author: TBlueF

.github/workflows/build.yml

@@ -1,4 +1,4 @@
-name: Build
+name: CI
 
 on:
   push:
@@ -12,37 +12,62 @@ on:
   workflow_dispatch:
 
 jobs:
+
+  test:
+    name: "Tests"
+    runs-on: ubuntu-latest
+    steps:
+      - name: Checkout
+        uses: actions/checkout@v5
+        with:
+          submodules: recursive
+          fetch-depth: 0 # needed for versioning
+      - name: Set up Java
+        uses: actions/setup-java@v5
+        with:
+          distribution: 'temurin'
+          java-version: 21
+          cache: 'gradle'
+      - name: Tests
+        run: ./gradlew spotlessCheck test --stacktrace
+
   build:
+    name: "Build"
     runs-on: ubuntu-latest
     steps:
-      - uses: actions/checkout@v4
+      - name: Checkout
+        uses: actions/checkout@v5
         with:
           submodules: recursive
           fetch-depth: 0 # needed for versioning
       - name: Set up Java
-        uses: actions/setup-java@v4
+        uses: actions/setup-java@v5
         with:
           distribution: 'temurin'
           java-version: |
             21
             17
           cache: 'gradle'
       - name: Build with Gradle
-        run: ./gradlew spotlessCheck test release --stacktrace
-      - uses: actions/upload-artifact@v4
+        run: ./gradlew release --stacktrace
+      - name: Upload Artifacts
+        uses: actions/upload-artifact@v4
         with:
           name: artifacts
           path: build/release/*
 
   docker:
+    name: Deploy Docker Build
     runs-on: ubuntu-latest
     needs: build
     steps:
-      - uses: actions/checkout@v4
+      - name: Checkout
+        uses: actions/checkout@v5
         with:
           submodules: recursive
           fetch-depth: 0
-      - uses: actions/download-artifact@v4
+      - name: Download Artifacts
+        uses: actions/download-artifact@v5
         with:
           name: artifacts
           path: build/release
@@ -54,7 +79,7 @@ jobs:
           password: ${{ secrets.GITHUB_TOKEN }}
       - name: Set up Docker Buildx
         uses: docker/setup-buildx-action@v3
-      - name: Docker metadata
+      - name: Docker Metadata
         id: metadata
         uses: docker/metadata-action@v5
         with:
@@ -68,7 +93,7 @@ jobs:
             type=match,pattern=v\d+,group=0,enable=${{ startsWith(github.ref, 'refs/tags/') }}
           flavor: |
             latest=false
-      - name: Build and push
+      - name: Build and Push
         uses: docker/build-push-action@v5
         with:
           context: .

.github/workflows/translation-checker.yml

@@ -1,4 +1,4 @@
-name: Check translations
+name: Check Translations
 
 on:
   push:
@@ -10,15 +10,17 @@ permissions:
   contents: read
 
 jobs:
-  deploy:
+  run:
+    name: Check Translations
     runs-on: ubuntu-latest
     steps:
       - name: Checkout
-        uses: actions/checkout@v4
-      - uses: actions/setup-node@v4
+        uses: actions/checkout@v5
+      - name: Install Node
+        uses: actions/setup-node@v5
         with:
           node-version: 20
-      - name: Install deps
+      - name: Install Dependencies
         working-directory: .github/translation-checker
         run: npm ci
       - name: Run Translation Checker

api

@@ -15,7 +15,7 @@ repositories {
     maven ("https://repo.bluecolored.de/snapshots") {
         content { includeGroupByRegex ("de\\.bluecolored.*") }
     }
-    maven ("https://hub.spigotmc.org/nexus/content/repositories/snapshots/") {
+    maven ("https://hub.spigotmc.org/nexus/content/repositories/snapshots") {
         content { includeGroup ("org.spigotmc") }
     }
 
@@ -27,8 +27,10 @@ repositories {
 
     mavenCentral()
     maven ("https://libraries.minecraft.net")
+    maven ("https://repo.papermc.io/repository/maven-public")
+    maven ( "https://maven.fabricmc.net" )
+    maven ( "https://maven.neoforged.net/releases" )
     maven ( "https://maven.minecraftforge.net" )
-    maven ("https://repo.papermc.io/repository/maven-public/")
 }
 
 tasks.withType(JavaCompile::class).configureEach {

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

@@ -1,6 +1,6 @@
 plugins {
     id ( "bluemap.base" )
-    id ( "io.github.goooler.shadow" )
+    id ( "com.gradleup.shadow" )
 }
 
 tasks.shadowJar {

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

@@ -1,5 +1,5 @@
 import com.matthewprenger.cursegradle.CurseProject
-import gradle.kotlin.dsl.accessors._30aa10cce2eda716151152e22de91a4c.curseforge
+import gradle.kotlin.dsl.accessors._94345610689fa610403700b47edcf23c.curseforge
 import org.gradle.api.Action
 import org.gradle.api.Project
 import org.gradle.kotlin.dsl.closureOf

buildSrc/src/main/kotlin/curseforge.kt

@@ -153,11 +153,7 @@ public synchronized Map<String, BmMap> getOrLoadMaps(Predicate<String> filter) t
             try {
                 loadMap(entry.getKey(), entry.getValue());
             } catch (ConfigurationException ex) {
-                Logger.global.logWarning(ex.getFormattedExplanation());
-                Throwable cause = ex.getRootCause();
-                if (cause != null) {
-                    Logger.global.logError("Detailed error:", ex);
-                }
+                ex.printLog(Logger.global);
             }
         }
         return Collections.unmodifiableMap(maps);

common/src/main/java/de/bluecolored/bluemap/common/BlueMapService.java

@@ -22,9 +22,18 @@
  * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
  * THE SOFTWARE.
  */
-package de.bluecolored.bluemap.common.web.http;
+package de.bluecolored.bluemap.common.addons;
 
-import java.nio.channels.SelectionKey;
-import java.util.function.Consumer;
+import lombok.Getter;
+import lombok.RequiredArgsConstructor;
 
-public interface SelectionConsumer extends Consumer<SelectionKey> {}
+import java.nio.file.Path;
+
+@RequiredArgsConstructor
+@Getter
+public class Addon {
+
+    private final AddonInfo addonInfo;
+    private final Path jarFile;
+
+}

…p/common/web/http/SelectionConsumer.java …colored/bluemap/common/addons/Addon.javacommon/src/main/java/de/bluecolored/bluemap/common/web/http/SelectionConsumer.java renamed to common/src/main/java/de/bluecolored/bluemap/common/addons/Addon.java common/src/main/java/de/bluecolored/bluemap/common/web/http/SelectionConsumer.java renamed to common/src/main/java/de/bluecolored/bluemap/common/addons/Addon.java

@@ -24,13 +24,59 @@
  */
 package de.bluecolored.bluemap.common.addons;
 
+import com.google.gson.FieldNamingPolicy;
+import com.google.gson.Gson;
+import com.google.gson.GsonBuilder;
+import de.bluecolored.bluemap.common.config.ConfigurationException;
 import lombok.Getter;
+import org.jetbrains.annotations.Nullable;
 
+import java.io.IOException;
+import java.io.Reader;
+import java.nio.charset.StandardCharsets;
+import java.nio.file.FileSystem;
+import java.nio.file.FileSystems;
+import java.nio.file.Files;
+import java.nio.file.Path;
+import java.util.Set;
+
+@SuppressWarnings({"FieldMayBeFinal", "unused"})
 @Getter
 public class AddonInfo {
     public static final String ADDON_INFO_FILE = "bluemap.addon.json";
 
+    private static final Gson GSON = new GsonBuilder()
+            .setFieldNamingPolicy(FieldNamingPolicy.LOWER_CASE_WITH_DASHES)
+            .create();
+
     private String id;
     private String entrypoint;
+    private Set<String> dependencies = Set.of();
+    private Set<String> softDependencies = Set.of();
+
+    public static @Nullable AddonInfo load(Path addonJarFile) throws ConfigurationException {
+        try (FileSystem fileSystem = FileSystems.newFileSystem(addonJarFile, (ClassLoader) null)) {
+            for (Path root : fileSystem.getRootDirectories()) {
+                Path addonInfoFile = root.resolve(ADDON_INFO_FILE);
+                if (!Files.exists(addonInfoFile)) continue;
+
+                try (Reader reader = Files.newBufferedReader(addonInfoFile, StandardCharsets.UTF_8)) {
+                    AddonInfo addonInfo = GSON.fromJson(reader, AddonInfo.class);
+
+                    if (addonInfo.getId() == null)
+                        throw new ConfigurationException("'id' is missing");
+
+                    if (addonInfo.getEntrypoint() == null)
+                        throw new ConfigurationException("'entrypoint' is missing");
+
+                    return addonInfo;
+                }
+            }
+        } catch (IOException e) {
+            throw new ConfigurationException("There was an exception trying to access the file.", e);
+        }
+
+        return null;
+    }
 
 }