Merge tag 'v5.7' into mc1.20

Version 5.7

Author: TBlueF

api

@@ -10,7 +10,10 @@ version = gitVersion()
 
 repositories {
     maven ("https://repo.bluecolored.de/releases") {
-        content { includeGroupByRegex ("de\\.bluecolored\\..*") }
+        content { includeGroupByRegex ("de\\.bluecolored.*") }
+    }
+    maven ("https://repo.bluecolored.de/snapshots") {
+        content { includeGroupByRegex ("de\\.bluecolored.*") }
     }
     maven ("https://hub.spigotmc.org/nexus/content/repositories/snapshots/") {
         content { includeGroup ("org.spigotmc") }

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

@@ -8,14 +8,17 @@ fun Project.gitHash(): String {
 }
 
 fun Project.gitClean(): Boolean {
-    return runCommand("git status --porcelain", "NOT_CLEAN").isEmpty()
+    if (runCommand("git update-index --refresh", "NOT-CLEAN").equals("NOT-CLEAN")) return false;
+    return runCommand("git diff-index HEAD --", "NOT-CLEAN").isEmpty();
 }
 
 fun Project.gitVersion(): String {
     val lastTag = if (runCommand("git tag", "").isEmpty()) "" else runCommand("git describe --tags --abbrev=0", "")
     val lastVersion = if (lastTag.isEmpty()) "0.0" else lastTag.substring(1) // remove the leading 'v'
     val commits = runCommand("git rev-list --count $lastTag..HEAD", "0")
+    val branch = runCommand("git branch --show-current", "master")
     val gitVersion = lastVersion +
+            (if (branch == "master" || branch.isEmpty()) "" else "-${branch.replace('/', '.')}") +
             (if (commits == "0") "" else "-$commits") +
             (if (gitClean()) "" else "-dirty")
 
@@ -50,8 +53,10 @@ private fun Project.runCommand(cmd: String, fallback: String? = null): String {
                 throw TimeoutException("Failed to execute command: '$cmd'")
         }
         .run {
+            val exitCode = waitFor()
+            if (exitCode == 0) return inputStream.bufferedReader().readText().trim()
+
             val error = errorStream.bufferedReader().readText().trim()
-            if (error.isEmpty()) return inputStream.bufferedReader().readText().trim()
             logger.warn("Failed to execute command '$cmd': $error")
             if (fallback != null) return fallback
             throw IOException(error)

buildSrc/src/main/kotlin/versioning.kt

@@ -9,7 +9,11 @@ plugins {
 dependencies {
     api ( project( ":core" ) )
 
-    api ( libs.brigadier )
+    api ( libs.adventure.api )
+    api ( libs.bluecommands.core )
+
+    compileOnly ( libs.bluecommands.brigadier )
+    compileOnly ( libs.brigadier )
 
     compileOnly ( libs.jetbrains.annotations )
     compileOnly ( libs.lombok )

common/build.gradle.kts

@@ -313,6 +313,10 @@ public synchronized Storage getOrLoadStorage(String storageId) throws Configurat
         return storage;
     }
 
+    public Map<String, Storage> getLoadedStorages() {
+        return Collections.unmodifiableMap(storages);
+    }
+
     public @Nullable ResourcePack getResourcePack() {
         return resourcePack;
     }

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

@@ -30,6 +30,7 @@
 import de.bluecolored.bluemap.api.BlueMapWorld;
 import de.bluecolored.bluemap.api.markers.MarkerSet;
 import de.bluecolored.bluemap.common.plugin.Plugin;
+import de.bluecolored.bluemap.common.rendermanager.MapUpdatePreparationTask;
 import de.bluecolored.bluemap.common.rendermanager.MapUpdateTask;
 import de.bluecolored.bluemap.common.rendermanager.WorldRegionRenderTask;
 import de.bluecolored.bluemap.core.map.BmMap;
@@ -117,7 +118,8 @@ private synchronized void unfreeze() {
         BmMap map = unpack(this.map);
         plugin.startWatchingMap(map);
         plugin.getPluginState().getMapState(map).setUpdateEnabled(true);
-        plugin.getRenderManager().scheduleRenderTask(new MapUpdateTask(map));
+        plugin.getRenderManager().scheduleRenderTaskNext(MapUpdatePreparationTask
+                .updateMap(map, plugin.getRenderManager()));
     }
 
     private synchronized void freeze() {

common/src/main/java/de/bluecolored/bluemap/common/api/BlueMapMapImpl.java

@@ -29,6 +29,7 @@
 import de.bluecolored.bluemap.api.RenderManager;
 import de.bluecolored.bluemap.common.plugin.Plugin;
 import de.bluecolored.bluemap.common.rendermanager.MapPurgeTask;
+import de.bluecolored.bluemap.common.rendermanager.MapUpdatePreparationTask;
 import de.bluecolored.bluemap.common.rendermanager.MapUpdateTask;
 import de.bluecolored.bluemap.common.rendermanager.TileUpdateStrategy;
 
@@ -49,7 +50,8 @@ public RenderManagerImpl(BlueMapAPIImpl api, Plugin plugin) {
     @Override
     public boolean scheduleMapUpdateTask(BlueMapMap map, boolean force) {
         BlueMapMapImpl cmap = castMap(map);
-        return renderManager.scheduleRenderTask(new MapUpdateTask(cmap.map(), TileUpdateStrategy.fixed(force)));
+        return renderManager.scheduleRenderTask(MapUpdatePreparationTask
+                .updateMap(cmap.map(), TileUpdateStrategy.fixed(force), renderManager));
     }
 
     @Override

common/src/main/java/de/bluecolored/bluemap/common/api/RenderManagerImpl.java

@@ -0,0 +1,68 @@
+/*
+ * This file is part of BlueMap, licensed under the MIT License (MIT).
+ *
+ * Copyright (c) Blue (Lukas Rieger) <https://bluecolored.de>
+ * Copyright (c) contributors
+ *
+ * Permission is hereby granted, free of charge, to any person obtaining a copy
+ * of this software and associated documentation files (the "Software"), to deal
+ * in the Software without restriction, including without limitation the rights
+ * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+ * copies of the Software, and to permit persons to whom the Software is
+ * furnished to do so, subject to the following conditions:
+ *
+ * The above copyright notice and this permission notice shall be included in
+ * all copies or substantial portions of the Software.
+ *
+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+ * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+ * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+ * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+ * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
+ * THE SOFTWARE.
+ */
+package de.bluecolored.bluemap.common.commands;
+
+import com.mojang.brigadier.Message;
+import com.mojang.brigadier.exceptions.CommandSyntaxException;
+import com.mojang.brigadier.exceptions.SimpleCommandExceptionType;
+import de.bluecolored.bluecommands.ParseFailure;
+import de.bluecolored.bluecommands.ParseResult;
+import de.bluecolored.bluecommands.brigadier.CommandExecutionHandler;
+import de.bluecolored.bluemap.common.plugin.Plugin;
+import de.bluecolored.bluemap.common.serverinterface.CommandSource;
+
+import java.util.Comparator;
+
+public class BrigadierExecutionHandler extends CommandExecutor implements CommandExecutionHandler<CommandSource, Object> {
+    private static final Message DEFAULT_FAILURE_MESSAGE = () -> "Unknown or incomplete command!";
+
+    public BrigadierExecutionHandler(Plugin plugin) {
+        super(plugin);
+    }
+
+    @Override
+    public int handle(ParseResult<CommandSource, Object> parseResult) throws CommandSyntaxException {
+        ExecutionResult executionResult = this.execute(parseResult);
+        if (executionResult.parseFailure())
+            return parseFailure(parseResult);
+        return executionResult.resultCode();
+    }
+
+    private int parseFailure(ParseResult<CommandSource, Object> result) throws CommandSyntaxException {
+        ParseFailure<CommandSource, Object> failure = result.getFailures().stream()
+                .max(Comparator.comparing(ParseFailure::getPosition))
+                .orElseThrow(() -> new CommandSyntaxException(
+                        new SimpleCommandExceptionType(DEFAULT_FAILURE_MESSAGE),
+                        DEFAULT_FAILURE_MESSAGE
+                ));
+        throw new CommandSyntaxException(
+                new SimpleCommandExceptionType(failure::getReason),
+                failure::getReason,
+                result.getInput(),
+                failure.getPosition()
+        );
+    }
+
+}

common/src/main/java/de/bluecolored/bluemap/common/commands/BrigadierExecutionHandler.java

@@ -0,0 +1,91 @@
+/*
+ * This file is part of BlueMap, licensed under the MIT License (MIT).
+ *
+ * Copyright (c) Blue (Lukas Rieger) <https://bluecolored.de>
+ * Copyright (c) contributors
+ *
+ * Permission is hereby granted, free of charge, to any person obtaining a copy
+ * of this software and associated documentation files (the "Software"), to deal
+ * in the Software without restriction, including without limitation the rights
+ * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+ * copies of the Software, and to permit persons to whom the Software is
+ * furnished to do so, subject to the following conditions:
+ *
+ * The above copyright notice and this permission notice shall be included in
+ * all copies or substantial portions of the Software.
+ *
+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+ * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+ * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+ * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+ * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
+ * THE SOFTWARE.
+ */
+package de.bluecolored.bluemap.common.commands;
+
+import de.bluecolored.bluecommands.ParseMatch;
+import de.bluecolored.bluecommands.ParseResult;
+import de.bluecolored.bluemap.common.plugin.Plugin;
+import de.bluecolored.bluemap.common.serverinterface.CommandSource;
+import de.bluecolored.bluemap.core.BlueMap;
+import de.bluecolored.bluemap.core.logger.Logger;
+import lombok.RequiredArgsConstructor;
+import net.kyori.adventure.text.ComponentLike;
+
+import java.util.Comparator;
+import java.util.concurrent.CompletableFuture;
+import java.util.concurrent.TimeUnit;
+
+import static de.bluecolored.bluemap.common.commands.TextFormat.NEGATIVE_COLOR;
+import static net.kyori.adventure.text.Component.text;
+
+@RequiredArgsConstructor
+public class CommandExecutor {
+
+    private final Plugin plugin;
+
+    public ExecutionResult execute(ParseResult<CommandSource, Object> parseResult) {
+        if (parseResult.getMatches().isEmpty()) {
+
+            // check if the plugin is not loaded first
+            if (!Commands.checkPluginLoaded(plugin, parseResult.getContext()))
+                return new ExecutionResult(0, false);
+
+            return new ExecutionResult(0, true);
+        }
+
+        ParseMatch<CommandSource, Object> match = parseResult.getMatches().stream()
+                .max(Comparator.comparing(ParseMatch::getPriority))
+                .orElseThrow(IllegalStateException::new);
+
+        if (!Commands.checkExecutablePreconditions(plugin, match.getContext(), match.getExecutable()))
+            return new ExecutionResult(0, false);
+
+        return CompletableFuture.supplyAsync(match::execute, BlueMap.THREAD_POOL)
+                .thenApply(result -> switch (result) {
+                    case Number n -> n.intValue();
+                    case ComponentLike c -> {
+                        match.getContext().sendMessage(c.asComponent());
+                        yield 1;
+                    }
+                    case Boolean b -> b ? 1 : 0;
+                    case null, default -> 1;
+                })
+                .exceptionally(e -> {
+                    Logger.global.logError("Command execution for '%s' failed".formatted(parseResult.getInput()), e);
+                    parseResult.getContext().sendMessage(text("There was an error executing this command! See logs or console for details.")
+                            .color(NEGATIVE_COLOR));
+                    return 0;
+                })
+                .completeOnTimeout(1, 100, TimeUnit.MILLISECONDS)
+                .thenApply(code -> new ExecutionResult(code, false))
+                .join();
+    }
+
+    public record ExecutionResult (
+        int resultCode,
+        boolean parseFailure
+    ) {}
+
+}