diff --git a/build.gradle.kts b/build.gradle.kts index 5124c46a..c829b023 100644 --- a/build.gradle.kts +++ b/build.gradle.kts @@ -29,7 +29,7 @@ allprojects { dependencies { compileOnly("org.spigotmc:spigot-api:1.8.8-R0.1-SNAPSHOT") - implementation("com.github.Revxrsal.Lamp:common:3.0.3") + 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") @@ -55,6 +55,7 @@ allprojects { options.encoding = "UTF-8" options.compilerArgs.plusAssign("-parameters") sourceCompatibility = "8" + targetCompatibility = "8" } build { diff --git a/speedbridge2-spigot-plugin/build.gradle.kts b/speedbridge2-spigot-plugin/build.gradle.kts index 7f6bb267..0d2ebbd1 100644 --- a/speedbridge2-spigot-plugin/build.gradle.kts +++ b/speedbridge2-spigot-plugin/build.gradle.kts @@ -8,7 +8,7 @@ dependencies { compileOnly("org.xerial:sqlite-jdbc:3.36.0.3") compileOnly("com.sk89q:worldedit:6.0.0-SNAPSHOT") - implementation("com.github.Revxrsal.Lamp:bukkit:3.0.7") + implementation("com.github.Revxrsal.Lamp:bukkit:3.1.7") implementation("net.kyori:adventure-platform-bukkit:4.0.1") implementation("com.github.tofpu:DynamicClass:1.1") { @@ -58,8 +58,8 @@ tasks { } runServer { - minecraftVersion("1.20") - pluginJars(project.file("libs/worldedit-bukkit-7.2.15.jar")) -// pluginJars(project.file("libs/worldedit-bukkit-6.1.jar"))d + minecraftVersion("1.8.8") +// pluginJars(project.file("libs/worldedit-bukkit-7.2.15.jar")) + pluginJars(project.file("libs/worldedit-bukkit-6.1.jar")) } } \ No newline at end of file diff --git a/speedbridge2-spigot-plugin/src/main/java/io/tofpu/speedbridge2/command/subcommand/SpeedBridgeCommand.java b/speedbridge2-spigot-plugin/src/main/java/io/tofpu/speedbridge2/command/subcommand/SpeedBridgeCommand.java index 65772d70..bf568ed2 100644 --- a/speedbridge2-spigot-plugin/src/main/java/io/tofpu/speedbridge2/command/subcommand/SpeedBridgeCommand.java +++ b/speedbridge2-spigot-plugin/src/main/java/io/tofpu/speedbridge2/command/subcommand/SpeedBridgeCommand.java @@ -26,13 +26,7 @@ import org.bukkit.command.CommandSender; import org.bukkit.entity.Player; import org.jetbrains.annotations.NotNull; -import revxrsal.commands.annotation.AutoComplete; -import revxrsal.commands.annotation.Command; -import revxrsal.commands.annotation.Default; -import revxrsal.commands.annotation.Description; -import revxrsal.commands.annotation.Flag; -import revxrsal.commands.annotation.Subcommand; -import revxrsal.commands.annotation.Usage; +import revxrsal.commands.annotation.*; import revxrsal.commands.bukkit.annotation.CommandPermission; import java.util.ArrayList; @@ -65,7 +59,7 @@ public SpeedBridgeCommand(final PlayerService playerService, final IslandService this.islandService = islandService; } - @Default + @DefaultFor("~") @Description("The Main Command") public String defaultCommand() { return INSTANCE.noArgument; @@ -376,7 +370,6 @@ private Optional getRandomIsland() { @RestrictDummyModel @RestrictSetup @RestrictConsole - @Default public String onStartSetup(final BridgePlayer bridgePlayer, final Island island) { if (!isGeneralSetupComplete(bridgePlayer)) { return "";