bazeling real hard today

core-bukkit-api/BUILD

@@ -0,0 +1,20 @@
+load("@rules_jvm_external//:defs.bzl", "artifact")
+load("@rules_java//java:java_library.bzl", "java_library")
+
+java_library(
+    name = "core-bukkit-api",
+    srcs = glob(["src/main/**/*.java"]),
+    visibility = ["//visibility:public"],
+    deps = [
+        "//core-lib:core",
+        artifact("io.papermc.paper:paper-api"),
+        artifact("org.projectlombok:lombok"),
+        artifact("de.kentoj.scrow:kencommandapi-bukkit"),
+    ],
+    exports = [
+        "//core-lib:core",
+        artifact("de.kentoj.scrow:kencommandapi-bukkit"),
+        artifact("org.mongodb:bson"),
+    ],
+    plugins = [ "//third_party:lombok_plugin" ],
+)

core-bukkit-api/build.gradle.kts

@@ -1,30 +0,0 @@
-plugins {
-    id("java")
-    alias(libs.plugins.scrow.publish)
-    alias(libs.plugins.scrow.database)
-    alias(libs.plugins.scrow.basedependencies)
-    alias(libs.plugins.scrow.javalibrary)
-}
-
-group = "de.kentoj.scrow"
-
-dependencies {
-    api(project(":core-lib"))
-    compileOnly(libs.papermc.api)
-
-    api(libs.nats)
-    api(libs.scrow.commandapi.bukkit) {
-        isChanging = true
-    }
-}
-
-publishing {
-    publications {
-        create<MavenPublication>("ScrowBukkitApi") {
-            groupId = project.group.toString()
-            artifactId = project.name
-            version = project.version.toString()
-            from(components["java"])
-        }
-    }
-}

core-bukkit-api/src/main/java/de/kentoj/scrow/bukkit/ScrowAPI.java

@@ -15,6 +15,8 @@ import lombok.AccessLevel;
 import lombok.Getter;
 import lombok.NoArgsConstructor;
 import org.bukkit.OfflinePlayer;
+import org.bukkit.command.CommandSender;
+import org.bukkit.entity.Player;
 import org.bukkit.plugin.Plugin;
 import org.jdbi.v3.core.Jdbi;
 import org.jetbrains.annotations.ApiStatus;
@@ -45,7 +47,9 @@ public class ScrowAPI {
     @Getter
     private static RegionManager regionManager;
     @Getter
-    private static CommandAPI commandApi;
+    private static CommandAPI<Player> playerCommands;
+    @Getter
+    private static CommandAPI<CommandSender> commands;
     @Getter
     private static PlayerPrefixProvider playerPrefixProvider;
     @Getter
@@ -100,11 +104,6 @@ public class ScrowAPI {
         ScrowAPI.regionManager = regionManager;
     }
 
-    @ApiStatus.Internal
-    public static void setCommandApi(CommandAPI commandApi) {
-        ScrowAPI.commandApi = commandApi;
-    }
-
     @ApiStatus.Internal
     public static void setPlayerFactory(NetworkPlayerFactory playerFactory) {
         ScrowAPI.playerFactory = playerFactory;
@@ -114,5 +113,15 @@ public class ScrowAPI {
     public static void setPlayerPrefixProvider(PlayerPrefixProvider playerPrefixProvider) {
         ScrowAPI.playerPrefixProvider = playerPrefixProvider;
     }
+
+    @ApiStatus.Internal
+    public static void setPlayerCommands(CommandAPI<Player> playerCommands) {
+        ScrowAPI.playerCommands = playerCommands;
+    }
+
+    @ApiStatus.Internal
+    public static void setCommands(CommandAPI<CommandSender> commands) {
+        ScrowAPI.commands = commands;
+    }
 }
 

core-bukkit-api/src/main/java/de/kentoj/scrow/bukkit/minigame/phase/Phase.java

@@ -1,6 +1,5 @@
 package de.kentoj.scrow.bukkit.minigame.phase;
 
-import com.google.errorprone.annotations.ForOverride;
 import de.kentoj.scrow.bukkit.ScrowAPI;
 import de.kentoj.scrow.bukkit.minigame.Minigame;
 import de.kentoj.scrow.bukkit.minigame.phaseflow.PhaseContext;
@@ -25,11 +24,9 @@ public abstract class Phase<T extends Minigame> implements IPhase {
      */
     protected abstract void onCancel();
 
-    @ForOverride
     protected void onEnd() {
     }
 
-    @ForOverride
     protected void onTick(int tick) {
     }
 

core-bukkit-api/src/main/java/de/kentoj/scrow/bukkit/minigame/phaseflow/LinearPhaseFlow.java

@@ -6,7 +6,7 @@ import de.kentoj.scrow.bukkit.minigame.phase.PhaseFlow;
 import lombok.Getter;
 import lombok.RequiredArgsConstructor;
 import lombok.extern.slf4j.Slf4j;
-import org.jspecify.annotations.Nullable;
+import org.jetbrains.annotations.Nullable;
 
 import java.util.ArrayList;
 import java.util.List;