Next release (v1.2.x)

.github/workflows/automatic-build.yml

@@ -23,7 +23,7 @@ jobs:
           arguments: shadowJar
 
       - name: Uploading
-        uses: actions/upload-artifact@v2
+        uses: actions/upload-artifact@v4
         with:
           name: SpeedBridge-2
-          path: ${{ github.workspace }}/speedbridge2-spigot-plugin/build/libs/*.jar
+          path: ${{ github.workspace }}/spigot/build/libs/*.jar

.gitignore

@@ -111,6 +111,7 @@ buildNumber.properties
 
 # Common working directory
 run/
+run-*/
 demo
 dep.txt
 memory

build.gradle.kts

@@ -14,34 +14,6 @@ allprojects {
     group = "io.tofpu.speedbridge2"
     version = "1.1.4-" + "git rev-parse --short=8 HEAD".runCommand(rootDir)
 
-    repositories {
-        mavenLocal()
-        mavenCentral()
-
-        maven("https://jitpack.io")
-        maven("https://repo.extendedclip.com/content/repositories/placeholderapi/")
-        maven("https://maven.enginehub.org/repo/")
-        maven("https://oss.sonatype.org/content/groups/public/")
-        maven("https://repo.codemc.org/repository/maven-public/")
-        maven("https://libraries.minecraft.net")
-    }
-
-    dependencies {
-        compileOnly("org.spigotmc:spigot-api:1.8.8-R0.1-SNAPSHOT")
-
-        implementation("com.github.Revxrsal.Lamp:common:3.1.7")
-
-        implementation("net.kyori:adventure-api:4.10.1")
-        implementation("net.kyori:adventure-text-minimessage:4.10.1")
-
-        implementation("com.github.tofpu:DynamicClass:1.1") {
-            exclude("com.google.guava", "guava")
-        }
-
-        testImplementation("org.junit.jupiter:junit-jupiter-api:5.6.0")
-        testRuntimeOnly("org.junit.jupiter:junit-jupiter-engine")
-    }
-
     publishing {
         publications {
             create<MavenPublication>("maven") {

spigot/build.gradle.kts

@@ -2,11 +2,29 @@ plugins {
     id("xyz.jpenilla.run-paper") version "2.0.1"
 }
 
+repositories {
+    mavenLocal()
+    mavenCentral()
+
+    maven("https://jitpack.io")
+    maven("https://repo.extendedclip.com/content/repositories/placeholderapi/")
+    maven("https://maven.enginehub.org/repo/")
+    maven("https://oss.sonatype.org/content/groups/public/")
+    maven("https://repo.codemc.org/repository/maven-public/")
+    maven("https://libraries.minecraft.net")
+}
+
 dependencies {
+    compileOnly("org.spigotmc:spigot-api:1.8.8-R0.1-SNAPSHOT")
+
     compileOnly("org.xerial:sqlite-jdbc:3.36.0.3")
     compileOnly("com.sk89q:worldedit:6.0.0-SNAPSHOT")
 
-    implementation("com.github.Revxrsal.Lamp:bukkit:3.1.7")
+    implementation("com.github.Revxrsal.Lamp:common:3.2.1")
+    implementation("com.github.Revxrsal.Lamp:bukkit:3.2.1")
+
+    implementation("net.kyori:adventure-api:4.10.1")
+    implementation("net.kyori:adventure-text-minimessage:4.10.1")
     implementation("net.kyori:adventure-platform-bukkit:4.0.1")
 
     implementation("com.github.tofpu:DynamicClass:1.1") {
@@ -20,22 +38,25 @@ dependencies {
 
     implementation("org.bstats:bstats-bukkit:3.0.0")
 
-    compileOnly("me.clip:placeholderapi:2.10.10")
+    compileOnly("me.clip:placeholderapi:2.11.6")
 
     implementation("com.github.ben-manes.caffeine:caffeine:2.9.3")
 
     implementation("com.github.cryptomorin:XSeries:8.7.1")
-    implementation("com.github.tofpu.MultiWorldEdit:multiworldedit-api:0eb85d6cbd") {
+    implementation("com.github.tofpu.MultiWorldEdit:multiworldedit-api:8930fd3caa") {
         exclude("de.schlichtherle", "truezip")
         exclude("rhino", "js")
         exclude("com.sk89q", "worldedit")
     }
 
-    implementation("com.github.tofpu:umbrella:1.20-support-SNAPSHOT")
+    implementation("com.github.Tofpu:toolbar:v1-SNAPSHOT")
+    implementation("com.github.Tofpu:dynamicclass:1.3") {
+        exclude("com.google.guava", "guava")
+    }
 }
 
 tasks {
-    named<com.github.jengelman.gradle.plugins.shadow.tasks.ShadowJar>("shadowJar") {
+    shadowJar {
         archiveName = "Speedbridge2-${version}-all.jar"
 
         dependencies {
@@ -56,8 +77,10 @@ tasks {
     }
 
     runServer {
-        minecraftVersion("1.8.8")
-//        pluginJars(project.file("libs/worldedit-bukkit-7.2.15.jar"))
-        pluginJars(project.file("libs/worldedit-bukkit-6.1.jar"))
+//        minecraftVersion("1.8.8")
+//        pluginJars(project.file("libs/worldedit-bukkit-6.1.jar"))
+//        minecraftVersion("1.20.4")
+        minecraftVersion("1.19.4")
+        pluginJars(project.file("libs/worldedit-bukkit-7.3.0.jar"))
     }
-}
+}

spigot/src/main/java/io/tofpu/speedbridge2/SpeedBridge.java

@@ -3,7 +3,6 @@
 import io.tofpu.dynamicclass.DynamicClass;
 import io.tofpu.multiworldedit.MultiWorldEditAPI;
 import io.tofpu.speedbridge2.command.CommandManager;
-import io.tofpu.speedbridge2.command.subcommand.HelpCommandGenerator;
 import io.tofpu.speedbridge2.model.blockmenu.BlockMenuManager;
 import io.tofpu.speedbridge2.model.common.Message;
 import io.tofpu.speedbridge2.model.common.PluginExecutor;
@@ -50,6 +49,13 @@ public SpeedBridge(final JavaPlugin javaPlugin) {
         this.leaderboard = new Leaderboard(playerService);
     }
 
+    public static BukkitAudiences getAdventure() {
+        if (adventure == null) {
+            throw new IllegalStateException("Tried to access Adventure when the plugin was disabled!");
+        }
+        return adventure;
+    }
+
     public void load() {
         // reset the world, in-case it does exist
         arenaManager.resetWorld();
@@ -84,7 +90,7 @@ public void enable() {
 
         if (Bukkit.getPluginManager().isPluginEnabled("PlaceholderAPI")) {
             ExpansionHandler.INSTANCE.load();
-            
+
             log("Hooking into PlaceholderAPI...");
             new PluginExpansion(javaPlugin, playerService);
         }
@@ -133,25 +139,26 @@ public void enable() {
         log("Loading the messages...");
         Message.load(javaPlugin.getDataFolder());
 
-        log("Generating `/sb help` message...");
-        HelpCommandGenerator.generateHelpCommand(javaPlugin);
-
-        log("Checking for an update...");
-        UpdateChecker.init(javaPlugin, 100619)
-                .requestUpdateCheck()
-                .whenComplete((updateResult, throwable) -> {
-                    if (throwable != null) {
-                        log("Couldn't check for an update...");
-                        return;
-                    }
-
-                    if (updateResult.requiresUpdate()) {
-                        log("You're using an outdated version of SpeedBridge!");
-                        log("You can download the latest version at https://www.spigotmc.org/resources/.100619/");
-                    } else {
-                        log("You're using the latest version!");
-                    }
-                });
+        if (ConfigurationManager.INSTANCE.getGeneralCategory().shouldCheckForUpdates()) {
+            log("Checking for an update...");
+            UpdateChecker.init(javaPlugin, 100619)
+                    .requestUpdateCheck()
+                    .whenComplete((updateResult, throwable) -> {
+                        if (throwable != null) {
+                            log("Couldn't check for an update...");
+                            return;
+                        }
+
+                        if (updateResult.requiresUpdate()) {
+                            log("You're using an outdated version of SpeedBridge!");
+                            log("You can download the latest version at https://www.spigotmc.org/resources/.100619/");
+                        } else {
+                            log("You're using the latest version!");
+                        }
+                    });
+        } else {
+            log("Not checking for an update as it was explicitly disabled in the config.");
+        }
     }
 
     public void shutdown() {
@@ -177,11 +184,4 @@ public void shutdown() {
     private void log(final String content) {
         javaPlugin.getLogger().info(content);
     }
-
-    public static BukkitAudiences getAdventure() {
-        if(adventure == null) {
-            throw new IllegalStateException("Tried to access Adventure when the plugin was disabled!");
-        }
-        return adventure;
-    }
 }

spigot/src/main/java/io/tofpu/speedbridge2/command/CommandManager.java

@@ -3,8 +3,10 @@
 import io.tofpu.dynamicclass.DynamicClass;
 import io.tofpu.speedbridge2.command.condition.AbstractCommandConditionWrapper;
 import io.tofpu.speedbridge2.command.condition.LampConditionRegistry;
+import io.tofpu.speedbridge2.command.condition.annotation.OptionalPermission;
 import io.tofpu.speedbridge2.command.context.AbstractLampContext;
 import io.tofpu.speedbridge2.command.context.LampContextRegistry;
+import io.tofpu.speedbridge2.command.help.HelpGenerator;
 import io.tofpu.speedbridge2.command.parser.AbstractLampParser;
 import io.tofpu.speedbridge2.command.parser.LampParseRegistry;
 import io.tofpu.speedbridge2.command.subcommand.CommandCompletion;
@@ -19,6 +21,7 @@
 import io.tofpu.speedbridge2.model.player.object.BridgePlayer;
 import io.tofpu.speedbridge2.model.player.object.CommonBridgePlayer;
 import io.tofpu.speedbridge2.model.player.object.SenderBridgePlayer;
+import org.bukkit.Material;
 import org.bukkit.plugin.Plugin;
 import org.jetbrains.annotations.NotNull;
 import revxrsal.commands.bukkit.BukkitCommandActor;
@@ -29,7 +32,10 @@
 
 import java.util.UUID;
 
+import static io.tofpu.speedbridge2.model.common.util.BridgeUtil.log;
+
 public final class CommandManager {
+    private static final HelpGenerator helpGenerator = new HelpGenerator();
     private static BukkitCommandHandler commandHandler;
 
     public static void load(final @NotNull Plugin plugin,
@@ -84,16 +90,25 @@ public boolean isCustomType(final Class<?> type) {
         constructTabCompleter(islandService);
         constructCommandConditions();
 
-        commandHandler.register(new SpeedBridgeCommand(playerService, islandService));
+        commandHandler.registerAnnotationReplacer(OptionalPermission.class, OptionalPermission.AnnotationReplacerImpl.INSTANCE);
+        commandHandler.registerPermissionReader(OptionalPermission.PermissionReaderImpl.INSTANCE);
+
+        commandHandler.accept(new SpeedBridgeCommand(helpGenerator, playerService, islandService));
         commandHandler.register(new SpeedBridgeDebugCommand(arenaManager));
+
+        log("Generating `/sb help` message...");
+        helpGenerator.generate(plugin, commandHandler);
+
+        commandHandler.registerBrigadier();
     }
 
     private static void constructTabCompleter(final @NotNull IslandService islandService) {
         BridgeUtil.debug("Constructing tab completer...");
 
-        commandHandler.getAutoCompleter()
-                .registerParameterSuggestions(Island.class,
-                        new CommandCompletion(islandService)::islands);
+        CommandCompletion commandCompletion = new CommandCompletion(islandService);
+        commandHandler.getAutoCompleter().registerParameterSuggestions(Island.class, commandCompletion::islands);
+        commandHandler.getAutoCompleter().registerParameterSuggestions(Material.class, commandCompletion::materials);
+        commandHandler.getAutoCompleter().registerParameterSuggestions(BridgePlayer.class, commandCompletion::players);
     }
 
     private static void constructContext() {

spigot/src/main/java/io/tofpu/speedbridge2/command/condition/AbstractCommandConditionWrapper.java

@@ -14,7 +14,7 @@ public abstract class AbstractCommandConditionWrapper implements CommandConditio
     private final Class<? extends Annotation> type;
 
     public AbstractCommandConditionWrapper(final Class<? extends Annotation> type,
-            final LampConditionRegistry registry) {
+                                           final LampConditionRegistry registry) {
         this.type = type;
         registry.register(type, this);
     }
@@ -35,8 +35,8 @@ public final void test(
     }
 
     abstract void execute(@NotNull CommandActor actor,
-            @NotNull ExecutableCommand command,
-            @NotNull @Unmodifiable List<String> arguments);
+                          @NotNull ExecutableCommand command,
+                          @NotNull @Unmodifiable List<String> arguments);
 
     public Class<? extends Annotation> getType() {
         return type;

spigot/src/main/java/io/tofpu/speedbridge2/command/condition/LampConditionRegistry.java

@@ -7,4 +7,5 @@
 
 @AutoRegister
 public final class LampConditionRegistry extends AbstractLampRegistry<Class<?
-        extends Annotation>, AbstractCommandConditionWrapper> {}
+        extends Annotation>, AbstractCommandConditionWrapper> {
+}

spigot/src/main/java/io/tofpu/speedbridge2/command/condition/annotation/MaterialType.java

@@ -0,0 +1,14 @@
+package io.tofpu.speedbridge2.command.condition.annotation;
+
+import io.tofpu.speedbridge2.util.material.MaterialCategory;
+
+import java.lang.annotation.ElementType;
+import java.lang.annotation.Retention;
+import java.lang.annotation.RetentionPolicy;
+import java.lang.annotation.Target;
+
+@Target(ElementType.PARAMETER)
+@Retention(RetentionPolicy.RUNTIME)
+public @interface MaterialType {
+    MaterialCategory category();
+}

spigot/src/main/java/io/tofpu/speedbridge2/command/condition/annotation/OptionalPermission.java

@@ -0,0 +1,47 @@
+package io.tofpu.speedbridge2.command.condition.annotation;
+
+import org.jetbrains.annotations.NotNull;
+import org.jetbrains.annotations.Nullable;
+import revxrsal.commands.annotation.Optional;
+import revxrsal.commands.annotation.dynamic.AnnotationReplacer;
+import revxrsal.commands.annotation.dynamic.Annotations;
+import revxrsal.commands.bukkit.BukkitCommandActor;
+import revxrsal.commands.command.CommandPermission;
+import revxrsal.commands.command.trait.CommandAnnotationHolder;
+import revxrsal.commands.process.PermissionReader;
+
+import java.lang.annotation.*;
+import java.lang.reflect.AnnotatedElement;
+import java.util.Collection;
+
+import static revxrsal.commands.util.Collections.linkedListOf;
+
+@Target(ElementType.PARAMETER)
+@Retention(RetentionPolicy.RUNTIME)
+public @interface OptionalPermission {
+    String value();
+
+    enum AnnotationReplacerImpl implements AnnotationReplacer<OptionalPermission> {
+        INSTANCE;
+
+        @Override
+        public Collection<Annotation> replaceAnnotations(@NotNull AnnotatedElement element, @NotNull OptionalPermission annotation) {
+            Optional optional = Annotations.create(Optional.class);
+            return linkedListOf(optional, annotation);
+        }
+    }
+
+    enum PermissionReaderImpl implements PermissionReader {
+        INSTANCE {
+            @Override
+            public @Nullable CommandPermission getPermission(@NotNull CommandAnnotationHolder command) {
+                OptionalPermission annotation = command.getAnnotation(OptionalPermission.class);
+                if (annotation == null) return null;
+                return actor -> {
+                    BukkitCommandActor playerActor = (BukkitCommandActor) actor;
+                    return playerActor.requirePlayer().hasPermission(annotation.value());
+                };
+            }
+        }
+    }
+}

spigot/src/main/java/io/tofpu/speedbridge2/command/condition/annotation/RestrictConsole.java

@@ -7,4 +7,5 @@
 
 @Target(ElementType.METHOD)
 @Retention(RetentionPolicy.RUNTIME)
-public @interface RestrictConsole {}
+public @interface RestrictConsole {
+}

spigot/src/main/java/io/tofpu/speedbridge2/command/condition/annotation/RestrictDummyModel.java

@@ -7,4 +7,5 @@
 
 @Target(ElementType.METHOD)
 @Retention(RetentionPolicy.RUNTIME)
-public @interface RestrictDummyModel {}
+public @interface RestrictDummyModel {
+}