diff --git a/.rundevserver/run dev server.run.xml b/.rundevserver/run dev server.run.xml
index ca7931b..8d13d97 100644
--- a/.rundevserver/run dev server.run.xml	
+++ b/.rundevserver/run dev server.run.xml	
@@ -1,6 +1,6 @@
 <component name="ProjectRunConfigurationManager">
   <configuration default="false" name="run dev server" type="ShConfigurationType">
-    <option name="SCRIPT_TEXT" value="bazel run //:dev-server" />
+    <option name="SCRIPT_TEXT" value="bazel run //dev-server:dev" />
     <option name="INDEPENDENT_SCRIPT_PATH" value="true" />
     <option name="SCRIPT_PATH" value="" />
     <option name="SCRIPT_OPTIONS" value="" />
diff --git a/BUILD b/BUILD
index f0375ce..e69de29 100644
--- a/BUILD
+++ b/BUILD
@@ -1,15 +0,0 @@
-load("@rules_shell//shell:sh_binary.bzl", "sh_binary")
-sh_binary(
-    name = "dev-server",
-    data = ["//core-bukkit:plugin"],
-    env = {
-        "MC_VERSION": "26.2",
-        "BUILT_PLUGIN": "bazel-bin/core-bukkit/plugin.jar",
-    },
-    args = [
-        "LuckPerms.jar=https://download.luckperms.net/1652/bukkit/loader/LuckPerms-Bukkit-5.5.65.jar",
-        "ViaVersion.jar=https://hangarcdn.papermc.io/plugins/ViaVersion/ViaVersion/versions/5.11.0/PAPER/ViaVersion-5.11.0.jar",
-        "ViaBackwards.jar=https://hangarcdn.papermc.io/plugins/ViaVersion/ViaBackwards/versions/5.11.0/PAPER/ViaBackwards-5.11.0.jar",
-    ],
-    srcs = ["runDevServer.sh"],
-)
diff --git a/MODULE.bazel b/MODULE.bazel
index b8256e4..2faf2be 100644
--- a/MODULE.bazel
+++ b/MODULE.bazel
@@ -16,7 +16,6 @@ maven.install(
         "com.leakyabstractions:result-api:1.0.1.0",
         "org.jetbrains:annotations:26.0.2-1",
         "com.google.guava:guava:33.5.0-jre",
-        "org.projectlombok:lombok:1.18.46",
         "org.slf4j:slf4j-api:2.0.18",
         "org.slf4j:slf4j-simple:2.0.18",
         "net.kyori:adventure-api:5.2.0",
@@ -27,15 +26,15 @@ maven.install(
         "org.jdbi:jdbi3-postgres:3.53.0",
         "org.mongodb:bson:5.8.0",
         "io.nats:jnats:2.25.2",
-        "de.kentoj.scrow:kencommandapi-core:0.34-SNAPSHOT",
-        "de.kentoj.scrow:kencommandapi-bukkit:0.34-SNAPSHOT",
-        "de.kentoj.scrow:kencommandapi-velocity:0.34-SNAPSHOT",
+        "de.kentoj.scrow:kencommandapi-core:0.36-SNAPSHOT",
+        "de.kentoj.scrow:kencommandapi-bukkit:0.36-SNAPSHOT",
+        "de.kentoj.scrow:kencommandapi-velocity:0.36-SNAPSHOT",
         "io.papermc.paper:paper-api:[26.2.build,)",
         "net.luckperms:api:5.5",
     ],
     repositories = [
         "https://repo.papermc.io/repository/maven-public/",
-        "https://repo.lab0x13.site/snapshots",
+        "https://git.lab0x13.site/api/packages/scrow/maven",
     ],
     known_contributing_modules = ["protobuf"],
     fail_on_missing_checksum = False, # for kencommandapi
@@ -44,4 +43,4 @@ maven.install(
 # luckperms is provided at runtime
 maven.amend_artifact(coordinates = "net.luckperms:api", neverlink = "true")
 
-use_repo(maven, "maven")
\ No newline at end of file
+use_repo(maven, "maven")
diff --git a/core-bukkit/BUILD b/core-bukkit/BUILD
index e83ec17..30d2266 100644
--- a/core-bukkit/BUILD
+++ b/core-bukkit/BUILD
@@ -9,7 +9,6 @@ java_library(
     deps = [
         "//core-lib:core",
         artifact("io.papermc.paper:paper-api"),
-        artifact("org.projectlombok:lombok"),
         artifact("de.kentoj.scrow:kencommandapi-bukkit"),
     ],
     exports = [
diff --git a/core-bukkit/api/main/java/de/kentoj/scrow/bukkit/ScrowAPI.java b/core-bukkit/api/main/java/de/kentoj/scrow/bukkit/ScrowAPI.java
index 48cf2b4..d8e6859 100644
--- a/core-bukkit/api/main/java/de/kentoj/scrow/bukkit/ScrowAPI.java
+++ b/core-bukkit/api/main/java/de/kentoj/scrow/bukkit/ScrowAPI.java
@@ -2,18 +2,15 @@ package de.kentoj.scrow.bukkit;
 
 import de.kentoj.kencommandapi.CommandAPI;
 import de.kentoj.scrow.bukkit.minigame.MinigameManager;
+import de.kentoj.scrow.bukkit.region.RegionManager;
+import de.kentoj.scrowlib.economy.EconomyService;
 import de.kentoj.scrowlib.friends.FriendRequestService;
 import de.kentoj.scrowlib.friends.FriendshipService;
-import de.kentoj.scrowlib.economy.EconomyService;
-import de.kentoj.scrowlib.player.NetworkPlayer;
-import de.kentoj.scrowlib.player.NetworkPlayerFactory;
-import de.kentoj.scrow.bukkit.region.RegionManager;
 import de.kentoj.scrowlib.instancemanager.InstanceManager;
 import de.kentoj.scrowlib.messaging.MessageBroker;
+import de.kentoj.scrowlib.player.NetworkPlayer;
+import de.kentoj.scrowlib.player.NetworkPlayerFactory;
 import de.kentoj.scrowlib.player.PlayerPrefixProvider;
-import lombok.AccessLevel;
-import lombok.Getter;
-import lombok.NoArgsConstructor;
 import org.bukkit.OfflinePlayer;
 import org.bukkit.command.CommandSender;
 import org.bukkit.entity.Player;
diff --git a/core-bukkit/api/main/java/de/kentoj/scrow/bukkit/minigame/lobby/LobbyPhase.java b/core-bukkit/api/main/java/de/kentoj/scrow/bukkit/minigame/lobby/LobbyPhase.java
index 7685ae6..806387c 100644
--- a/core-bukkit/api/main/java/de/kentoj/scrow/bukkit/minigame/lobby/LobbyPhase.java
+++ b/core-bukkit/api/main/java/de/kentoj/scrow/bukkit/minigame/lobby/LobbyPhase.java
@@ -1,10 +1,9 @@
 package de.kentoj.scrow.bukkit.minigame.lobby;
 
 import de.kentoj.scrow.bukkit.minigame.Minigame;
-import de.kentoj.scrow.bukkit.minigame.phaseflow.LinearPhaseFlow;
 import de.kentoj.scrow.bukkit.minigame.phase.CompositePhase;
+import de.kentoj.scrow.bukkit.minigame.phaseflow.LinearPhaseFlow;
 import de.kentoj.scrow.bukkit.minigame.phaseflow.PhaseContext;
-import lombok.Getter;
 import org.bukkit.event.EventPriority;
 import org.bukkit.event.block.BlockBreakEvent;
 import org.bukkit.event.block.BlockExplodeEvent;
diff --git a/core-bukkit/api/main/java/de/kentoj/scrow/bukkit/minigame/phaseflow/PhaseContext.java b/core-bukkit/api/main/java/de/kentoj/scrow/bukkit/minigame/phaseflow/PhaseContext.java
index afc140e..a0e680e 100644
--- a/core-bukkit/api/main/java/de/kentoj/scrow/bukkit/minigame/phaseflow/PhaseContext.java
+++ b/core-bukkit/api/main/java/de/kentoj/scrow/bukkit/minigame/phaseflow/PhaseContext.java
@@ -6,7 +6,6 @@ import de.kentoj.scrow.bukkit.minigame.PlayerManager;
 import de.kentoj.scrow.bukkit.minigame.phase.PhaseFlow;
 import de.kentoj.scrow.bukkit.minigame.phase.event.PhaseListeners;
 import de.kentoj.scrow.bukkit.minigame.phase.event.PhaseListenersImpl;
-import lombok.RequiredArgsConstructor;
 
 public class PhaseContext<T extends Minigame> {
     private final T game;
diff --git a/core-bukkit/api/main/java/de/kentoj/scrow/bukkit/scheduler/Tasks.java b/core-bukkit/api/main/java/de/kentoj/scrow/bukkit/scheduler/Tasks.java
index 8f29979..b1faa15 100644
--- a/core-bukkit/api/main/java/de/kentoj/scrow/bukkit/scheduler/Tasks.java
+++ b/core-bukkit/api/main/java/de/kentoj/scrow/bukkit/scheduler/Tasks.java
@@ -1,8 +1,6 @@
 package de.kentoj.scrow.bukkit.scheduler;
 
 import de.kentoj.scrow.bukkit.ScrowAPI;
-import lombok.AccessLevel;
-import lombok.NoArgsConstructor;
 import org.bukkit.Bukkit;
 
 import java.util.Arrays;
diff --git a/core-bukkit/plugin/main/java/de/kentoj/scrow/bukkit/ScrowAPISurface.java b/core-bukkit/plugin/main/java/de/kentoj/scrow/bukkit/ScrowAPISurface.java
index daab4cf..065c573 100644
--- a/core-bukkit/plugin/main/java/de/kentoj/scrow/bukkit/ScrowAPISurface.java
+++ b/core-bukkit/plugin/main/java/de/kentoj/scrow/bukkit/ScrowAPISurface.java
@@ -18,8 +18,6 @@ import de.kentoj.scrowlib.player.NetworkPlayerImpl;
 import de.kentoj.scrowlib.player.PlayerPrefixProvider;
 import io.nats.client.Nats;
 import io.nats.client.Options;
-import lombok.AccessLevel;
-import lombok.NoArgsConstructor;
 import org.bukkit.command.CommandSender;
 import org.bukkit.entity.Player;
 import org.bukkit.plugin.Plugin;
@@ -30,11 +28,13 @@ import org.slf4j.LoggerFactory;
 import java.io.IOException;
 import java.util.Properties;
 
-@NoArgsConstructor(access = AccessLevel.NONE)
 public class ScrowAPISurface {
 
     private static final Logger log = LoggerFactory.getLogger(ScrowAPISurface.class);
 
+    private ScrowAPISurface() {
+    }
+
     public static void initScrowAPI(Plugin plugin, PlayerPrefixProvider prefixProvider) {
         ScrowAPI.setCorePlugin(plugin);
 
diff --git a/core-bukkit/plugin/main/java/de/kentoj/scrow/bukkit/command/economy/CoinsCommand.java b/core-bukkit/plugin/main/java/de/kentoj/scrow/bukkit/command/economy/CoinsCommand.java
index 7d9f62a..c103a82 100644
--- a/core-bukkit/plugin/main/java/de/kentoj/scrow/bukkit/command/economy/CoinsCommand.java
+++ b/core-bukkit/plugin/main/java/de/kentoj/scrow/bukkit/command/economy/CoinsCommand.java
@@ -9,7 +9,6 @@ import de.kentoj.kencommandapi.api.platform.MessageStyle;
 import de.kentoj.scrow.bukkit.ScrowAPI;
 import de.kentoj.scrow.bukkit.scheduler.Tasks;
 import de.kentoj.scrowlib.convention.ScrowMessageStyle;
-import lombok.Getter;
 import org.bukkit.entity.Player;
 
 import java.util.concurrent.CompletableFuture;
@@ -30,7 +29,7 @@ public final class CoinsCommand {
     }
 
     public CompletableFuture<Result<Object, String>> execute(CommandContext<Player> ctx) {
-        var player = ctx.getSender();
+        var player = ctx.sender();
         return Tasks.supplyAsync(() ->
                         ScrowAPI.economyService().getCoins(player.getUniqueId()))
                 .<Result<Object, String>>mapSync(amount -> {
diff --git a/core-bukkit/plugin/main/java/de/kentoj/scrow/bukkit/command/economy/CoinsGetLiteral.java b/core-bukkit/plugin/main/java/de/kentoj/scrow/bukkit/command/economy/CoinsGetLiteral.java
index 9d4e3e3..3e4761f 100644
--- a/core-bukkit/plugin/main/java/de/kentoj/scrow/bukkit/command/economy/CoinsGetLiteral.java
+++ b/core-bukkit/plugin/main/java/de/kentoj/scrow/bukkit/command/economy/CoinsGetLiteral.java
@@ -9,9 +9,7 @@ import de.kentoj.kencommandapi.api.platform.MessageStyle;
 import de.kentoj.kencommandapi.type.OfflinePlayerArgumentType;
 import de.kentoj.scrow.bukkit.ScrowAPI;
 import de.kentoj.scrow.bukkit.scheduler.Tasks;
-import lombok.Getter;
 import org.bukkit.OfflinePlayer;
-import org.bukkit.command.CommandSender;
 import org.bukkit.entity.Player;
 
 import java.util.concurrent.CompletableFuture;
@@ -26,7 +24,7 @@ public final class CoinsGetLiteral {
         this.style = style;
 
         playerArg = CommandArgumentSpec.builder("player", new OfflinePlayerArgumentType<Player>())
-                .withDefaultValue(CommandContext::getSender)
+                .withDefaultValue(CommandContext::sender)
                 .build();
         literal = Literal.<Player>builder("get")
                 .withPermission("command.coins.get.others")
@@ -40,7 +38,7 @@ public final class CoinsGetLiteral {
         return Tasks.supplyAsync(() ->
                         ScrowAPI.economyService().getCoins(player.getUniqueId()))
                 .<Result<Object, String>>mapSync(amount -> {
-                    ctx.getSender().sendMessage(style.ok(player.getName() + " has " + amount + "$"));
+                    ctx.sender().sendMessage(style.ok(player.getName() + " has " + amount + "$"));
                     return Results.success(new Object());
                 }).toFuture();
     }
diff --git a/core-bukkit/plugin/main/java/de/kentoj/scrow/bukkit/command/economy/CoinsSetLiteral.java b/core-bukkit/plugin/main/java/de/kentoj/scrow/bukkit/command/economy/CoinsSetLiteral.java
index 5554938..895cc57 100644
--- a/core-bukkit/plugin/main/java/de/kentoj/scrow/bukkit/command/economy/CoinsSetLiteral.java
+++ b/core-bukkit/plugin/main/java/de/kentoj/scrow/bukkit/command/economy/CoinsSetLiteral.java
@@ -25,7 +25,7 @@ public final class CoinsSetLiteral {
     CoinsSetLiteral(MessageStyle style) {
         this.style = style;
         playerArg = CommandArgumentSpec.builder("player", new OfflinePlayerArgumentType<Player>())
-                .withDefaultValue(CommandContext::getSender)
+                .withDefaultValue(CommandContext::sender)
                 .build();
         amountArg = CommandArgumentSpec.builder("amount", new IntegerArgumentType<Player>())
                 .build();
@@ -43,7 +43,7 @@ public final class CoinsSetLiteral {
         return Tasks.runAsync(() ->
                         ScrowAPI.economyService().setCoins(player.getUniqueId(), amount))
                 .<Result<Object, String>>supplySync(() -> {
-                    ctx.getSender().sendMessage(style.ok(player.getName() + " now has " + amount + "$"));
+                    ctx.sender().sendMessage(style.ok(player.getName() + " now has " + amount + "$"));
                     return Results.success(new Object());
                 }).toFuture();
     }
diff --git a/core-bukkit/plugin/main/java/de/kentoj/scrow/bukkit/command/friends/FriendAddLiteral.java b/core-bukkit/plugin/main/java/de/kentoj/scrow/bukkit/command/friends/FriendAddLiteral.java
index a8fa8d0..ebe9cc8 100644
--- a/core-bukkit/plugin/main/java/de/kentoj/scrow/bukkit/command/friends/FriendAddLiteral.java
+++ b/core-bukkit/plugin/main/java/de/kentoj/scrow/bukkit/command/friends/FriendAddLiteral.java
@@ -14,7 +14,6 @@ import de.kentoj.scrowlib.friends.FriendRequestService;
 import de.kentoj.scrowlib.friends.FriendshipService;
 import de.kentoj.scrowlib.friends.friendship.FriendshipImpl;
 import de.kentoj.scrowlib.friends.request.FriendRequestImpl;
-import lombok.Getter;
 import net.kyori.adventure.text.Component;
 import org.bukkit.OfflinePlayer;
 import org.bukkit.entity.Player;
@@ -43,7 +42,7 @@ public final class FriendAddLiteral {
     }
 
     private CompletableFuture<Result<Object, String>> execute(CommandContext<Player> ctx) {
-        var self = ctx.getSender();
+        var self = ctx.sender();
         var other = ctx.getArg(playerArg);
         return Tasks.supplyAsync(() -> findAction(self, other)
                         .mapSuccess(action -> {
diff --git a/core-bukkit/plugin/main/java/de/kentoj/scrow/bukkit/command/friends/FriendCommand.java b/core-bukkit/plugin/main/java/de/kentoj/scrow/bukkit/command/friends/FriendCommand.java
index a7ab760..48cce41 100644
--- a/core-bukkit/plugin/main/java/de/kentoj/scrow/bukkit/command/friends/FriendCommand.java
+++ b/core-bukkit/plugin/main/java/de/kentoj/scrow/bukkit/command/friends/FriendCommand.java
@@ -3,8 +3,6 @@ package de.kentoj.scrow.bukkit.command.friends;
 import de.kentoj.kencommandapi.api.literal.Literal;
 import de.kentoj.kencommandapi.api.literal.RootLiteral;
 import de.kentoj.scrowlib.convention.ScrowMessageStyle;
-import lombok.AccessLevel;
-import lombok.NoArgsConstructor;
 import net.kyori.adventure.text.Component;
 import net.kyori.adventure.text.event.ClickEvent;
 import net.kyori.adventure.text.event.HoverEvent;
diff --git a/core-bukkit/plugin/main/java/de/kentoj/scrow/bukkit/command/friends/FriendListLiteral.java b/core-bukkit/plugin/main/java/de/kentoj/scrow/bukkit/command/friends/FriendListLiteral.java
index 2ed1f1b..d1f3d99 100644
--- a/core-bukkit/plugin/main/java/de/kentoj/scrow/bukkit/command/friends/FriendListLiteral.java
+++ b/core-bukkit/plugin/main/java/de/kentoj/scrow/bukkit/command/friends/FriendListLiteral.java
@@ -7,7 +7,6 @@ import de.kentoj.kencommandapi.api.literal.Literal;
 import de.kentoj.scrow.bukkit.ScrowAPI;
 import de.kentoj.scrow.bukkit.scheduler.Tasks;
 import de.kentoj.scrowlib.convention.ScrowMessageStyle;
-import lombok.RequiredArgsConstructor;
 import net.kyori.adventure.text.Component;
 import net.kyori.adventure.text.format.NamedTextColor;
 import net.kyori.adventure.text.minimessage.MiniMessage;
@@ -33,7 +32,7 @@ public final class FriendListLiteral {
     }
 
     private CompletableFuture<Result<Object, String>> displayFriendList(CommandContext<Player> ctx) {
-        var sender = ctx.getSender();
+        var sender = ctx.sender();
         return Tasks.supplyAsync(() ->
                         ScrowAPI.friendshipService().getFriendships(sender.getUniqueId()))
                 .<Result<Object, String>>mapSync(friendships -> {
diff --git a/core-bukkit/plugin/main/java/de/kentoj/scrow/bukkit/command/friends/FriendRemoveLiteral.java b/core-bukkit/plugin/main/java/de/kentoj/scrow/bukkit/command/friends/FriendRemoveLiteral.java
index d918209..5f5a371 100644
--- a/core-bukkit/plugin/main/java/de/kentoj/scrow/bukkit/command/friends/FriendRemoveLiteral.java
+++ b/core-bukkit/plugin/main/java/de/kentoj/scrow/bukkit/command/friends/FriendRemoveLiteral.java
@@ -9,7 +9,6 @@ import de.kentoj.kencommandapi.type.OfflinePlayerArgumentType;
 import de.kentoj.scrow.bukkit.ScrowAPI;
 import de.kentoj.scrow.bukkit.scheduler.Tasks;
 import de.kentoj.scrowlib.convention.ScrowMessageStyle;
-import lombok.Getter;
 import org.bukkit.OfflinePlayer;
 import org.bukkit.entity.Player;
 
@@ -34,11 +33,11 @@ public final class FriendRemoveLiteral {
     private CompletableFuture<Result<Object, String>> removeFriend(CommandContext<Player> ctx) {
         var friend = ctx.getArg(playerArg);
         return Tasks.supplyAsync(() ->
-                        ScrowAPI.friendshipService().deleteFriendship(friend.getUniqueId(), ctx.getSender().getUniqueId()))
+                        ScrowAPI.friendshipService().deleteFriendship(friend.getUniqueId(), ctx.sender().getUniqueId()))
                 .<Result<Object, String>>mapSync(deleted -> {
                     if (!deleted)
                         return Results.failure("You are not friends with " + friend.getName() + ".");
-                    ctx.getSender().sendMessage(style.ok("You have ended the friendship with " + friend.getName() + "."));
+                    ctx.sender().sendMessage(style.ok("You have ended the friendship with " + friend.getName() + "."));
                     return Results.success(new Object());
                 }).toFuture();
     }
diff --git a/core-bukkit/plugin/main/java/de/kentoj/scrow/bukkit/command/friends/FriendRequestDeclineLiteral.java b/core-bukkit/plugin/main/java/de/kentoj/scrow/bukkit/command/friends/FriendRequestDeclineLiteral.java
index ec7728b..b73b333 100644
--- a/core-bukkit/plugin/main/java/de/kentoj/scrow/bukkit/command/friends/FriendRequestDeclineLiteral.java
+++ b/core-bukkit/plugin/main/java/de/kentoj/scrow/bukkit/command/friends/FriendRequestDeclineLiteral.java
@@ -10,8 +10,6 @@ import de.kentoj.scrow.bukkit.ScrowAPI;
 import de.kentoj.scrow.bukkit.scheduler.Tasks;
 import de.kentoj.scrowlib.convention.ScrowMessageStyle;
 import de.kentoj.scrowlib.friends.FriendRequestService;
-import lombok.Getter;
-import lombok.RequiredArgsConstructor;
 import org.bukkit.OfflinePlayer;
 import org.bukkit.entity.Player;
 
@@ -35,15 +33,14 @@ public final class FriendRequestDeclineLiteral {
     }
 
     private CompletableFuture<Result<Object, String>> declineFriendRequest(CommandContext<Player> ctx) {
-        var self = ctx.getSender();
         var other = ctx.getArg(playerArg);
         return Tasks.supplyAsync(() ->
-                        requestService.deleteFriendRequest(other.getUniqueId(), self.getUniqueId()))
+                        requestService.deleteFriendRequest(other.getUniqueId(), ctx.sender().getUniqueId()))
                 .<Result<Object, String>>mapSync(deleted -> {
                     if (!deleted)
                         return Results.failure("There's no incoming friend request from " + other.getName() + ".");
-                    self.sendMessage(style.ok("Friend request declined."));
-                    ScrowAPI.getPlayer(other).sendMessage(style.ok(self.getName() + " has declined your friend request."));
+                    ctx.sender().sendMessage(style.ok("Friend request declined."));
+                    ScrowAPI.getPlayer(other).sendMessage(style.ok(ctx.sender().getName() + " has declined your friend request."));
                     return Results.success(new Object());
                 }).toFuture();
     }
diff --git a/core-bukkit/plugin/main/java/de/kentoj/scrow/bukkit/command/friends/FriendRequestsLiteral.java b/core-bukkit/plugin/main/java/de/kentoj/scrow/bukkit/command/friends/FriendRequestsLiteral.java
index 64e64ec..7b6baf7 100644
--- a/core-bukkit/plugin/main/java/de/kentoj/scrow/bukkit/command/friends/FriendRequestsLiteral.java
+++ b/core-bukkit/plugin/main/java/de/kentoj/scrow/bukkit/command/friends/FriendRequestsLiteral.java
@@ -33,13 +33,13 @@ public final class FriendRequestsLiteral {
 
     private CompletableFuture<Result<Object, String>> displayFriendRequests(CommandContext<Player> ctx) {
         return Tasks.supplyAsync(() ->
-                        ScrowAPI.friendRequestService().getFriendRequestsTo(ctx.getSender().getUniqueId()))
+                        ScrowAPI.friendRequestService().getFriendRequestsTo(ctx.sender().getUniqueId()))
                 .<Result<Object, String>>mapAsync(list -> {
                     if (list.isEmpty()) return Results.failure("You have no friend requests.");
                     var requesters = list.stream()
                             .sorted(this::compareByAge)
                             .map(fr -> Bukkit.getOfflinePlayer(fr.from()).getName());
-                    ctx.getSender().sendMessage(formatList(requesters.toList()));
+                    ctx.sender().sendMessage(formatList(requesters.toList()));
                     return Results.success(new Object());
                 }).toFuture();
     }
diff --git a/core-bukkit/plugin/main/java/de/kentoj/scrow/bukkit/command/instance/InstanceCommand.java b/core-bukkit/plugin/main/java/de/kentoj/scrow/bukkit/command/instance/InstanceCommand.java
index 156f93a..53aa0fd 100644
--- a/core-bukkit/plugin/main/java/de/kentoj/scrow/bukkit/command/instance/InstanceCommand.java
+++ b/core-bukkit/plugin/main/java/de/kentoj/scrow/bukkit/command/instance/InstanceCommand.java
@@ -3,14 +3,12 @@ package de.kentoj.scrow.bukkit.command.instance;
 import de.kentoj.kencommandapi.api.literal.Literal;
 import de.kentoj.kencommandapi.api.literal.RootLiteral;
 import de.kentoj.scrowlib.convention.ScrowMessageStyle;
-import lombok.AccessLevel;
-import lombok.NoArgsConstructor;
 import net.kyori.adventure.text.format.NamedTextColor;
 import org.bukkit.command.CommandSender;
 
 public final class InstanceCommand {
 
-    private RootLiteral<CommandSender> rootLiteral;
+    private final RootLiteral<CommandSender> rootLiteral;
 
     public InstanceCommand(InstanceCache instanceCache) {
         var style = new ScrowMessageStyle("server-manager", NamedTextColor.RED);
diff --git a/core-bukkit/plugin/main/java/de/kentoj/scrow/bukkit/command/instance/InstanceDeployLiteral.java b/core-bukkit/plugin/main/java/de/kentoj/scrow/bukkit/command/instance/InstanceDeployLiteral.java
index cd85a58..dcd343f 100644
--- a/core-bukkit/plugin/main/java/de/kentoj/scrow/bukkit/command/instance/InstanceDeployLiteral.java
+++ b/core-bukkit/plugin/main/java/de/kentoj/scrow/bukkit/command/instance/InstanceDeployLiteral.java
@@ -32,11 +32,11 @@ public final class InstanceDeployLiteral {
 
     private CompletableFuture<Result<Object, String>> deployInstance(CommandContext<CommandSender> ctx) {
         var template = ctx.getArg(templateArg);
-        ctx.getSender().sendMessage(style.ok("Deploying instance... this may take a while."));
+        ctx.sender().sendMessage(style.ok("Deploying instance... this may take a while."));
         return Tasks.supplyAsync(() ->
                         ScrowAPI.instanceManager().deployInstance(template))
                 .<Result<Object, String>>mapSync(instance -> {
-                    ctx.getSender().sendMessage(style.ok("Deployed instance of " + template + " with handle " + instance.handle() + "."));
+                    ctx.sender().sendMessage(style.ok("Deployed instance of " + template + " with handle " + instance.handle() + "."));
                     // FIXME handle unknown server
                     return Results.success(new Object());
                 }).toFuture();
diff --git a/core-bukkit/plugin/main/java/de/kentoj/scrow/bukkit/command/instance/InstanceDestroyLiteral.java b/core-bukkit/plugin/main/java/de/kentoj/scrow/bukkit/command/instance/InstanceDestroyLiteral.java
index e90c430..0b683f5 100644
--- a/core-bukkit/plugin/main/java/de/kentoj/scrow/bukkit/command/instance/InstanceDestroyLiteral.java
+++ b/core-bukkit/plugin/main/java/de/kentoj/scrow/bukkit/command/instance/InstanceDestroyLiteral.java
@@ -41,7 +41,7 @@ public final class InstanceDestroyLiteral {
                 .<Result<Object, String>>mapSync(found -> {
                     if (!found)
                         return Results.failure("No instance with that handle found.");
-                    ctx.getSender().sendMessage(style.ok("Destroyed server with handle " + handle + "."));
+                    ctx.sender().sendMessage(style.ok("Destroyed server with handle " + handle + "."));
                     return Results.success(new Object());
                 }).toFuture();
     }
diff --git a/core-bukkit/plugin/main/java/de/kentoj/scrow/bukkit/command/instance/InstanceListLiteral.java b/core-bukkit/plugin/main/java/de/kentoj/scrow/bukkit/command/instance/InstanceListLiteral.java
index 44891f9..aaa9297 100644
--- a/core-bukkit/plugin/main/java/de/kentoj/scrow/bukkit/command/instance/InstanceListLiteral.java
+++ b/core-bukkit/plugin/main/java/de/kentoj/scrow/bukkit/command/instance/InstanceListLiteral.java
@@ -33,7 +33,7 @@ public final class InstanceListLiteral {
                         msg = msg.appendNewline()
                                 .append(Component.text(" - " + inst.handle() + " on port " + inst.port()));
                     }
-                    ctx.getSender().sendMessage(style.ok(msg));
+                    ctx.sender().sendMessage(style.ok(msg));
                     return Results.success(new Object());
                 }).toFuture();
     }
diff --git a/core-bukkit/plugin/main/java/de/kentoj/scrow/bukkit/command/instance/LobbyCommand.java b/core-bukkit/plugin/main/java/de/kentoj/scrow/bukkit/command/instance/LobbyCommand.java
index e05763c..8846261 100644
--- a/core-bukkit/plugin/main/java/de/kentoj/scrow/bukkit/command/instance/LobbyCommand.java
+++ b/core-bukkit/plugin/main/java/de/kentoj/scrow/bukkit/command/instance/LobbyCommand.java
@@ -6,9 +6,7 @@ import de.kentoj.kencommandapi.api.invocation.CommandContext;
 import de.kentoj.kencommandapi.api.literal.Literal;
 import de.kentoj.kencommandapi.api.literal.RootLiteral;
 import de.kentoj.scrowlib.convention.ScrowMessageStyle;
-import lombok.Getter;
 import org.bukkit.Bukkit;
-import org.bukkit.command.CommandSender;
 import org.bukkit.entity.Player;
 
 public final class LobbyCommand {
@@ -22,7 +20,7 @@ public final class LobbyCommand {
     }
 
     private Result<Object, String> sendToLobby(CommandContext<Player> ctx) {
-        Bukkit.dispatchCommand(ctx.getSender(), "play lobby");
+        Bukkit.dispatchCommand(ctx.sender(), "play lobby");
         return Results.success(new Object());
     }
 
diff --git a/core-bukkit/plugin/main/java/de/kentoj/scrow/bukkit/command/instance/PlayCommand.java b/core-bukkit/plugin/main/java/de/kentoj/scrow/bukkit/command/instance/PlayCommand.java
index 8cc02e8..46d81cf 100644
--- a/core-bukkit/plugin/main/java/de/kentoj/scrow/bukkit/command/instance/PlayCommand.java
+++ b/core-bukkit/plugin/main/java/de/kentoj/scrow/bukkit/command/instance/PlayCommand.java
@@ -40,7 +40,7 @@ public final class PlayCommand {
                         return Results.failure("No instance for " + gamemode + " found.");
 
                     return Results.ofCallable(() -> {
-                        ScrowAPI.getPlayer(ctx.getSender()).sendToInstance(instance.handle());
+                        ScrowAPI.getPlayer(ctx.sender()).sendToInstance(instance.handle());
                         return new Object();
                     }).mapFailure(Exception::getMessage);
                 }).toFuture();
diff --git a/core-bukkit/plugin/main/java/de/kentoj/scrow/bukkit/internal/player/NetworkPlayerWatchdog.java b/core-bukkit/plugin/main/java/de/kentoj/scrow/bukkit/internal/player/NetworkPlayerWatchdog.java
index c927add..09d5b57 100644
--- a/core-bukkit/plugin/main/java/de/kentoj/scrow/bukkit/internal/player/NetworkPlayerWatchdog.java
+++ b/core-bukkit/plugin/main/java/de/kentoj/scrow/bukkit/internal/player/NetworkPlayerWatchdog.java
@@ -1,7 +1,6 @@
 package de.kentoj.scrow.bukkit.internal.player;
 
 import de.kentoj.scrow.bukkit.ScrowAPI;
-import lombok.RequiredArgsConstructor;
 import net.kyori.adventure.key.Key;
 import net.kyori.adventure.sound.Sound;
 import net.kyori.adventure.text.minimessage.MiniMessage;
diff --git a/core-bukkit/plugin/main/java/de/kentoj/scrow/bukkit/internal/region/RegionTask.java b/core-bukkit/plugin/main/java/de/kentoj/scrow/bukkit/internal/region/RegionTask.java
index 81a9e5f..3bfd3f4 100644
--- a/core-bukkit/plugin/main/java/de/kentoj/scrow/bukkit/internal/region/RegionTask.java
+++ b/core-bukkit/plugin/main/java/de/kentoj/scrow/bukkit/internal/region/RegionTask.java
@@ -5,7 +5,6 @@ import de.kentoj.scrow.bukkit.region.ChunkPos;
 import de.kentoj.scrow.bukkit.region.Region;
 import de.kentoj.scrow.bukkit.region.event.RegionJoinEvent;
 import de.kentoj.scrow.bukkit.region.event.RegionLeaveEvent;
-import lombok.RequiredArgsConstructor;
 import org.bukkit.Bukkit;
 import org.bukkit.scheduler.BukkitRunnable;
 
diff --git a/core-bukkit/plugin/main/java/de/kentoj/scrow/bukkit/style/StyleHelper.java b/core-bukkit/plugin/main/java/de/kentoj/scrow/bukkit/style/StyleHelper.java
index 031ae9d..f455674 100644
--- a/core-bukkit/plugin/main/java/de/kentoj/scrow/bukkit/style/StyleHelper.java
+++ b/core-bukkit/plugin/main/java/de/kentoj/scrow/bukkit/style/StyleHelper.java
@@ -1,8 +1,6 @@
 package de.kentoj.scrow.bukkit.style;
 
 import de.kentoj.scrowlib.utils.ComponentUtils;
-import lombok.AccessLevel;
-import lombok.NoArgsConstructor;
 import net.kyori.adventure.text.Component;
 import net.kyori.adventure.text.format.NamedTextColor;
 import org.jetbrains.annotations.Nullable;
diff --git a/core-lib/BUILD b/core-lib/BUILD
index 0f0b31e..e732c92 100644
--- a/core-lib/BUILD
+++ b/core-lib/BUILD
@@ -2,7 +2,11 @@ load("@rules_jvm_external//:defs.bzl", "artifact")
 load("@rules_java//java:java_library.bzl", "java_library")
 
 shared_deps = [
-        "//third_party:common_deps",
+        artifact("com.leakyabstractions:result-api"),
+        artifact("com.leakyabstractions:result"),
+        artifact("org.jetbrains:annotations"),
+        artifact("com.google.guava:guava"),
+        artifact("org.slf4j.slf4j:api"),
         artifact("de.kentoj.scrow:kencommandapi-core"),
         artifact("net.kyori:adventure-api"),
         artifact("net.kyori:adventure-text-minimessage"),
diff --git a/core-lib/src/main/java/de/kentoj/scrowlib/friends/friendship/FriendshipImpl.java b/core-lib/src/main/java/de/kentoj/scrowlib/friends/friendship/FriendshipImpl.java
index a891fb2..b15607e 100644
--- a/core-lib/src/main/java/de/kentoj/scrowlib/friends/friendship/FriendshipImpl.java
+++ b/core-lib/src/main/java/de/kentoj/scrowlib/friends/friendship/FriendshipImpl.java
@@ -2,7 +2,6 @@ package de.kentoj.scrowlib.friends.friendship;
 
 import de.kentoj.scrowlib.friends.Friendship;
 import de.kentoj.scrowlib.friends.OrderedUUIDPair;
-import lombok.RequiredArgsConstructor;
 
 import java.time.Instant;
 import java.util.UUID;
diff --git a/core-lib/src/main/java/de/kentoj/scrowlib/friends/request/PostgresFriendRequestService.java b/core-lib/src/main/java/de/kentoj/scrowlib/friends/request/PostgresFriendRequestService.java
index c071679..71312a5 100644
--- a/core-lib/src/main/java/de/kentoj/scrowlib/friends/request/PostgresFriendRequestService.java
+++ b/core-lib/src/main/java/de/kentoj/scrowlib/friends/request/PostgresFriendRequestService.java
@@ -2,7 +2,6 @@ package de.kentoj.scrowlib.friends.request;
 
 import de.kentoj.scrowlib.friends.FriendRequest;
 import de.kentoj.scrowlib.friends.FriendRequestService;
-import lombok.extern.slf4j.Slf4j;
 import org.jdbi.v3.core.Jdbi;
 import org.jdbi.v3.core.statement.StatementContext;
 import org.jetbrains.annotations.Nullable;
diff --git a/core-lib/src/main/java/de/kentoj/scrowlib/instancemanager/InstanceManagerImpl.java b/core-lib/src/main/java/de/kentoj/scrowlib/instancemanager/InstanceManagerImpl.java
index dc6961c..e9b7a4f 100644
--- a/core-lib/src/main/java/de/kentoj/scrowlib/instancemanager/InstanceManagerImpl.java
+++ b/core-lib/src/main/java/de/kentoj/scrowlib/instancemanager/InstanceManagerImpl.java
@@ -2,7 +2,6 @@ package de.kentoj.scrowlib.instancemanager;
 
 import de.kentoj.scrowlib.messaging.MessageBroker;
 import de.kentoj.scrowlib.messaging.RemoteException;
-import lombok.RequiredArgsConstructor;
 import org.bson.Document;
 import org.jetbrains.annotations.Nullable;
 
diff --git a/core-lib/src/main/java/de/kentoj/scrowlib/player/NetworkPlayerImpl.java b/core-lib/src/main/java/de/kentoj/scrowlib/player/NetworkPlayerImpl.java
index 920d9cf..bb39e27 100644
--- a/core-lib/src/main/java/de/kentoj/scrowlib/player/NetworkPlayerImpl.java
+++ b/core-lib/src/main/java/de/kentoj/scrowlib/player/NetworkPlayerImpl.java
@@ -1,7 +1,6 @@
 package de.kentoj.scrowlib.player;
 
 import de.kentoj.scrowlib.messaging.MessageBroker;
-import lombok.RequiredArgsConstructor;
 import net.kyori.adventure.sound.Sound;
 import net.kyori.adventure.text.Component;
 import net.kyori.adventure.text.minimessage.MiniMessage;
diff --git a/core-velocity/BUILD b/core-velocity/BUILD
index eb33a9e..31c4a85 100644
--- a/core-velocity/BUILD
+++ b/core-velocity/BUILD
@@ -9,7 +9,6 @@ java_library(
     deps = [
         "//core-lib:core",
         artifact("com.velocitypowered:velocity-api"),
-        artifact("org.projectlombok:lombok"),
         artifact("de.kentoj.scrow:kencommandapi-velocity"),
     ],
     exports = [
@@ -17,18 +16,16 @@ java_library(
         artifact("de.kentoj.scrow:kencommandapi-velocity"),
         artifact("org.mongodb:bson"),
     ],
-    plugins = [ "//third_party:lombok_plugin" ],
 )
 
 java_binary(
     name = "plugin",
     srcs = glob(["plugin/main/**/*.java"]),
-    main_class = "none",
-    resources = glob(["plugin/main/resources/**"], allow_empty = True),
+    create_executable = False,
     deps = [
         ":api",
         artifact("com.velocitypowered:velocity-api"),
+        artifact("com.google.inject:guice"),
         artifact("io.nats:jnats"),
     ],
-    plugins = [ "//third_party:lombok_plugin" ],
 )
diff --git a/core-velocity/api/main/java/de/kentoj/scrow/velocity/ScrowAPI.java b/core-velocity/api/main/java/de/kentoj/scrow/velocity/ScrowAPI.java
index 580b222..a5bb79a 100644
--- a/core-velocity/api/main/java/de/kentoj/scrow/velocity/ScrowAPI.java
+++ b/core-velocity/api/main/java/de/kentoj/scrow/velocity/ScrowAPI.java
@@ -7,26 +7,17 @@ import de.kentoj.scrowlib.instancemanager.InstanceManager;
 import de.kentoj.scrowlib.messaging.MessageBroker;
 import de.kentoj.scrowlib.player.NetworkPlayer;
 import de.kentoj.scrowlib.player.NetworkPlayerFactory;
-import lombok.AccessLevel;
-import lombok.Getter;
-import lombok.NoArgsConstructor;
 import org.jdbi.v3.core.Jdbi;
 import org.jetbrains.annotations.ApiStatus;
 
 import java.util.UUID;
 
-@NoArgsConstructor(access = AccessLevel.PRIVATE)
 public class ScrowAPI {
 
-    @Getter
     private static Jdbi jdbi;
-    @Getter
     private static CommandAPI<CommandSource> commands;
-    @Getter
     private static CommandAPI<Player> playerCommands;
-    @Getter
     private static MessageBroker messageBroker;
-    @Getter
     private static InstanceManager instanceManager;
     private static NetworkPlayerFactory playerFactory;
 
@@ -39,33 +30,56 @@ public class ScrowAPI {
     }
 
     @ApiStatus.Internal
-    public static void setMessageBroker(MessageBroker messageBroker) {
+    public static void initMessageBroker(MessageBroker messageBroker) {
         ScrowAPI.messageBroker = messageBroker;
     }
 
     @ApiStatus.Internal
-    public static void setInstanceManager(InstanceManager instanceManager) {
+    public static void initInstanceManager(InstanceManager instanceManager) {
         ScrowAPI.instanceManager = instanceManager;
     }
 
     @ApiStatus.Internal
-    public static void setJdbi(Jdbi jdbi) {
+    public static void initJdbi(Jdbi jdbi) {
         ScrowAPI.jdbi = jdbi;
     }
 
     @ApiStatus.Internal
-    public static void setPlayerFactory(NetworkPlayerFactory playerFactory) {
+    public static void initPlayerFactory(NetworkPlayerFactory playerFactory) {
         ScrowAPI.playerFactory = playerFactory;
     }
 
     @ApiStatus.Internal
-    public static void setPlayerCommands(CommandAPI<Player> playerCommands) {
+    public static void initPlayerCommands(CommandAPI<Player> playerCommands) {
         ScrowAPI.playerCommands = playerCommands;
     }
 
     @ApiStatus.Internal
-    public static void setCommands(CommandAPI<CommandSource> commands) {
+    public static void initCommands(CommandAPI<CommandSource> commands) {
         ScrowAPI.commands = commands;
     }
-}
 
+    public static Jdbi jdbi() {
+        return jdbi;
+    }
+
+    public static CommandAPI<CommandSource> commands() {
+        return commands;
+    }
+
+    public static CommandAPI<Player> playerCommands() {
+        return playerCommands;
+    }
+
+    public static MessageBroker messageBroker() {
+        return messageBroker;
+    }
+
+    public static InstanceManager instanceManager() {
+        return instanceManager;
+    }
+
+    public static NetworkPlayerFactory playerFactory() {
+        return playerFactory;
+    }
+}
diff --git a/core-velocity/plugin/main/java/de/kentoj/scrow/corevelocity/CoreVelocityPlugin.java b/core-velocity/plugin/main/java/de/kentoj/scrow/corevelocity/CoreVelocityPlugin.java
index 0c1a24b..47ef523 100644
--- a/core-velocity/plugin/main/java/de/kentoj/scrow/corevelocity/CoreVelocityPlugin.java
+++ b/core-velocity/plugin/main/java/de/kentoj/scrow/corevelocity/CoreVelocityPlugin.java
@@ -13,18 +13,15 @@ import de.kentoj.scrow.corevelocity.privmsg.LastTargetCache;
 import de.kentoj.scrow.corevelocity.privmsg.MsgCommand;
 import de.kentoj.scrow.corevelocity.privmsg.PrivMsgHandler;
 import de.kentoj.scrow.corevelocity.privmsg.ReplyCommand;
-import de.kentoj.scrow.generated.BuildInfo;
 import de.kentoj.scrow.velocity.ScrowAPI;
 import de.kentoj.scrowlib.convention.ScrowMessageStyle;
-import lombok.extern.slf4j.Slf4j;
 import net.kyori.adventure.text.format.NamedTextColor;
 
-@Slf4j
 @Plugin(
         id = "corevelocity",
         name = "CoreVelocity",
         authors = {"gradlehater57"},
-        version = BuildInfo.VERSION // may not resolve until building for the first time
+        version = "0"
 )
 public final class CoreVelocityPlugin {
 
@@ -35,13 +32,12 @@ public final class CoreVelocityPlugin {
     private void onInit(ProxyInitializeEvent __) {
         ScrowAPISurface.initScrowAPI(server);
 
-        var cmds = ScrowAPI.getCommandApi();
         var lastTargetCache = new LastTargetCache();
         var style = new ScrowMessageStyle("MSG", NamedTextColor.LIGHT_PURPLE);
         var privmsgHelper = new PrivMsgHandler(style);
-        cmds.register(new ReplyCommand(server, lastTargetCache, privmsgHelper, style).getRootLiteral());
-        cmds.register(new MsgCommand(server, lastTargetCache, privmsgHelper, style).getRootLiteral());
-        cmds.register(new OnlineCommand(server).getRootLiteral());
+        ScrowAPI.playerCommands().register(new ReplyCommand(server, lastTargetCache, privmsgHelper, style).rootLiteral());
+        ScrowAPI.playerCommands().register(new MsgCommand(server, lastTargetCache, privmsgHelper, style).rootLiteral());
+        ScrowAPI.commands().register(new OnlineCommand(server).rootLiteral());
 
         var registerWatchdog = new ServerRegisterWatchdog(server);
         var sendPlayerWatchdog = new SendPlayerWatchdog(server);
diff --git a/core-velocity/plugin/main/java/de/kentoj/scrow/corevelocity/ScrowAPISurface.java b/core-velocity/plugin/main/java/de/kentoj/scrow/corevelocity/ScrowAPISurface.java
index 85ec5b1..95acf54 100644
--- a/core-velocity/plugin/main/java/de/kentoj/scrow/corevelocity/ScrowAPISurface.java
+++ b/core-velocity/plugin/main/java/de/kentoj/scrow/corevelocity/ScrowAPISurface.java
@@ -1,5 +1,7 @@
 package de.kentoj.scrow.corevelocity;
 
+import com.velocitypowered.api.command.CommandSource;
+import com.velocitypowered.api.proxy.Player;
 import com.velocitypowered.api.proxy.ProxyServer;
 import de.kentoj.kencommandapi.CommandAPI;
 import de.kentoj.scrow.velocity.ScrowAPI;
@@ -9,20 +11,18 @@ import de.kentoj.scrowlib.messaging.NatsMessageBroker;
 import de.kentoj.scrowlib.player.NetworkPlayerImpl;
 import io.nats.client.Nats;
 import io.nats.client.Options;
-import lombok.AccessLevel;
-import lombok.NoArgsConstructor;
-import lombok.extern.slf4j.Slf4j;
 import org.jdbi.v3.core.Jdbi;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
 
 import java.io.IOException;
 import java.util.Properties;
 
-@Slf4j
-@NoArgsConstructor(access = AccessLevel.NONE)
 public class ScrowAPISurface {
 
-    public static void initScrowAPI(ProxyServer server) {
+    private static final Logger log = LoggerFactory.getLogger(ScrowAPISurface.class);
 
+    public static void initScrowAPI(ProxyServer server) {
         var natsHost = System.getenv("HOST_NATS");
         if (natsHost != null) {
             try {
@@ -30,13 +30,13 @@ public class ScrowAPISurface {
                         .server(natsHost)
                         .pedantic()
                         .build();
-                ScrowAPI.setMessageBroker(new NatsMessageBroker(Nats.connect(options)));
+                ScrowAPI.initMessageBroker(new NatsMessageBroker(Nats.connect(options)));
             } catch (IOException | InterruptedException e) {
                 throw new RuntimeException(e);
             }
         } else {
             log.error("HOST_NATS not set -> Using in-memory dummy message broker");
-            ScrowAPI.setMessageBroker(new InMemoyMessageBroker());
+            ScrowAPI.initMessageBroker(new InMemoyMessageBroker());
         }
 
         var hostPostgres = System.getenv().get("HOST_POSTGRES");
@@ -45,7 +45,7 @@ public class ScrowAPISurface {
                 Class.forName("org.postgresql.Driver", true, ScrowAPISurface.class.getClassLoader());
                 var props = new Properties();
                 props.setProperty("user", "postgres");
-                ScrowAPI.setJdbi(Jdbi.create(hostPostgres, props));
+                ScrowAPI.initJdbi(Jdbi.create(hostPostgres, props));
             } catch (ClassNotFoundException e) {
                 throw new RuntimeException(e);
             }
@@ -53,9 +53,10 @@ public class ScrowAPISurface {
             log.error("HOST_POSTGRES not set -> Using in-memory database");
         }
 
-        ScrowAPI.setInstanceManager(new InstanceManagerImpl(ScrowAPI.getMessageBroker()));
-        ScrowAPI.setCommandApi(new CommandAPI(server));
-        ScrowAPI.setPlayerFactory(playerId -> new NetworkPlayerImpl(ScrowAPI.getMessageBroker(), playerId));
+        ScrowAPI.initInstanceManager(new InstanceManagerImpl(ScrowAPI.messageBroker()));
+        ScrowAPI.initCommands(new CommandAPI<>(server, CommandSource.class));
+        ScrowAPI.initPlayerCommands(new CommandAPI<>(server, Player.class));
+        ScrowAPI.initPlayerFactory(playerId -> new NetworkPlayerImpl(ScrowAPI.messageBroker(), playerId));
     }
 
     public static void destroyScrowAPI() {
diff --git a/core-velocity/plugin/main/java/de/kentoj/scrow/corevelocity/misc/OnlineCommand.java b/core-velocity/plugin/main/java/de/kentoj/scrow/corevelocity/misc/OnlineCommand.java
index 379a7b1..243346e 100644
--- a/core-velocity/plugin/main/java/de/kentoj/scrow/corevelocity/misc/OnlineCommand.java
+++ b/core-velocity/plugin/main/java/de/kentoj/scrow/corevelocity/misc/OnlineCommand.java
@@ -9,30 +9,30 @@ import de.kentoj.kencommandapi.api.invocation.SyncCommandExecutor;
 import de.kentoj.kencommandapi.api.literal.Literal;
 import de.kentoj.kencommandapi.api.literal.RootLiteral;
 import de.kentoj.scrowlib.convention.ScrowMessageStyle;
-import lombok.Getter;
-import lombok.RequiredArgsConstructor;
 
-@RequiredArgsConstructor
-public class OnlineCommand implements SyncCommandExecutor<CommandSource> {
+public final class OnlineCommand {
 
-    @Getter
     private final RootLiteral<CommandSource> rootLiteral;
     private final ScrowMessageStyle style = ScrowMessageStyle.GENERIC;
     private final ProxyServer server;
 
     public OnlineCommand(ProxyServer server) {
         this.server = server;
-        rootLiteral = Literal.rootLiteral(ScrowMessageStyle.GENERIC, "online");
-        rootLiteral.setExecutor(this);
+        rootLiteral = Literal.<CommandSource>builder("online")
+                .withSyncExecutor(this::executeSync)
+                .asRootLiteral(ScrowMessageStyle.GENERIC);
     }
 
-    @Override
-    public Result<Object, String> executeSync(CommandContext<CommandSource> ctx) {
+    private Result<Object, String> executeSync(CommandContext<CommandSource> ctx) {
         int cnt = server.getPlayerCount();
         var msg = cnt != 1
                 ? "There are currently " + cnt + " players online."
                 : "There is currently 1 player online.";
-        ctx.getSender().sendMessage(style.ok(msg));
+        ctx.sender().sendMessage(style.ok(msg));
         return Results.success(new Object());
     }
+
+    public RootLiteral<CommandSource> rootLiteral() {
+        return rootLiteral;
+    }
 }
diff --git a/core-velocity/plugin/main/java/de/kentoj/scrow/corevelocity/network/FriendNotifications.java b/core-velocity/plugin/main/java/de/kentoj/scrow/corevelocity/network/FriendNotifications.java
index 8626737..6cfe45d 100644
--- a/core-velocity/plugin/main/java/de/kentoj/scrow/corevelocity/network/FriendNotifications.java
+++ b/core-velocity/plugin/main/java/de/kentoj/scrow/corevelocity/network/FriendNotifications.java
@@ -9,7 +9,7 @@ import org.bson.Document;
 
 public class FriendNotifications {
 
-    private final MessageBroker messageBroker = ScrowAPI.getMessageBroker();
+    private final MessageBroker messageBroker = ScrowAPI.messageBroker();
 
     @Subscribe
     private void onConnect(PostLoginEvent ev) {
diff --git a/core-velocity/plugin/main/java/de/kentoj/scrow/corevelocity/network/SendPlayerWatchdog.java b/core-velocity/plugin/main/java/de/kentoj/scrow/corevelocity/network/SendPlayerWatchdog.java
index 213adfb..47d7923 100644
--- a/core-velocity/plugin/main/java/de/kentoj/scrow/corevelocity/network/SendPlayerWatchdog.java
+++ b/core-velocity/plugin/main/java/de/kentoj/scrow/corevelocity/network/SendPlayerWatchdog.java
@@ -3,8 +3,6 @@ package de.kentoj.scrow.corevelocity.network;
 import com.velocitypowered.api.proxy.ProxyServer;
 import de.kentoj.scrow.velocity.ScrowAPI;
 import de.kentoj.scrowlib.messaging.MessageBroker;
-import lombok.RequiredArgsConstructor;
-import lombok.extern.slf4j.Slf4j;
 import org.bson.Document;
 
 import java.util.UUID;
@@ -12,15 +10,17 @@ import java.util.concurrent.ExecutorService;
 import java.util.concurrent.Executors;
 import java.util.concurrent.Future;
 
-@Slf4j
-@RequiredArgsConstructor
 public class SendPlayerWatchdog {
 
     private final ExecutorService EXECUTOR = Executors.newVirtualThreadPerTaskExecutor();
 
-    private final MessageBroker messageBroker = ScrowAPI.getMessageBroker();
+    private final MessageBroker messageBroker = ScrowAPI.messageBroker();
     private final ProxyServer server;
 
+    public SendPlayerWatchdog(ProxyServer server) {
+        this.server = server;
+    }
+
     public void listen() {
         messageBroker.handle("player.send", doc -> sendPlayer(
                 doc.get("playerId", UUID.class),
diff --git a/core-velocity/plugin/main/java/de/kentoj/scrow/corevelocity/network/ServerRegisterWatchdog.java b/core-velocity/plugin/main/java/de/kentoj/scrow/corevelocity/network/ServerRegisterWatchdog.java
index 1433364..1942986 100644
--- a/core-velocity/plugin/main/java/de/kentoj/scrow/corevelocity/network/ServerRegisterWatchdog.java
+++ b/core-velocity/plugin/main/java/de/kentoj/scrow/corevelocity/network/ServerRegisterWatchdog.java
@@ -4,31 +4,35 @@ import com.velocitypowered.api.proxy.ProxyServer;
 import com.velocitypowered.api.proxy.server.ServerInfo;
 import de.kentoj.scrow.velocity.ScrowAPI;
 import de.kentoj.scrowlib.messaging.MessageBroker;
-import lombok.RequiredArgsConstructor;
-import lombok.extern.java.Log;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
 
 import java.net.InetSocketAddress;
 
-@Log
-@RequiredArgsConstructor
 public class ServerRegisterWatchdog {
 
-    private final MessageBroker messageBroker = ScrowAPI.getMessageBroker();
+    private static final Logger log = LoggerFactory.getLogger(ServerRegisterWatchdog.class);
+
+    private final MessageBroker messageBroker = ScrowAPI.messageBroker();
     private final ProxyServer server;
 
+    public ServerRegisterWatchdog(ProxyServer server) {
+        this.server = server;
+    }
+
     public void listen() {
         messageBroker.subscribe("event.instance.up", doc -> {
             var handle = doc.getString("handle");
             var port = doc.getInteger("port");
             server.unregisterServer(new ServerInfo(handle, new InetSocketAddress(port)));
-            log.info("registered server " + handle);
+            log.info("registered server {}", handle);
         });
 
         messageBroker.subscribe("event.instance.down", doc -> {
             var handle = doc.getString("handle");
             var port = doc.getInteger("port");
             server.unregisterServer(new ServerInfo(handle, new InetSocketAddress(port)));
-            log.info("unregistered server " + handle);
+            log.info("unregistered server {}", handle);
         });
     }
 }
diff --git a/core-velocity/plugin/main/java/de/kentoj/scrow/corevelocity/privmsg/LastTargetCache.java b/core-velocity/plugin/main/java/de/kentoj/scrow/corevelocity/privmsg/LastTargetCache.java
index db0a0b5..15e74bc 100644
--- a/core-velocity/plugin/main/java/de/kentoj/scrow/corevelocity/privmsg/LastTargetCache.java
+++ b/core-velocity/plugin/main/java/de/kentoj/scrow/corevelocity/privmsg/LastTargetCache.java
@@ -5,13 +5,13 @@ import com.google.common.cache.CacheBuilder;
 import org.jetbrains.annotations.NotNull;
 import org.jetbrains.annotations.Nullable;
 
+import java.time.Duration;
 import java.util.UUID;
-import java.util.concurrent.TimeUnit;
 
 public class LastTargetCache {
 
     private final Cache<@NotNull UUID, @NotNull UUID> cache = CacheBuilder.newBuilder()
-            .expireAfterAccess(20, TimeUnit.MINUTES)
+            .expireAfterAccess(Duration.ofMinutes(20))
             .build();
 
     public @Nullable UUID getLastTarget(UUID uuid) {
diff --git a/core-velocity/plugin/main/java/de/kentoj/scrow/corevelocity/privmsg/MsgCommand.java b/core-velocity/plugin/main/java/de/kentoj/scrow/corevelocity/privmsg/MsgCommand.java
index 591ed6d..da252ec 100644
--- a/core-velocity/plugin/main/java/de/kentoj/scrow/corevelocity/privmsg/MsgCommand.java
+++ b/core-velocity/plugin/main/java/de/kentoj/scrow/corevelocity/privmsg/MsgCommand.java
@@ -5,22 +5,19 @@ import com.leakyabstractions.result.core.Results;
 import com.velocitypowered.api.command.CommandSource;
 import com.velocitypowered.api.proxy.Player;
 import com.velocitypowered.api.proxy.ProxyServer;
-import de.kentoj.kencommandapi.api.argument.CommandArgument;
+import de.kentoj.kencommandapi.api.argument.CommandArgumentSpec;
 import de.kentoj.kencommandapi.api.argument.types.StringArgumentType;
 import de.kentoj.kencommandapi.api.invocation.CommandContext;
-import de.kentoj.kencommandapi.api.invocation.SyncCommandExecutor;
 import de.kentoj.kencommandapi.api.literal.Literal;
 import de.kentoj.kencommandapi.api.literal.RootLiteral;
 import de.kentoj.kencommandapi.api.platform.MessageStyle;
 import de.kentoj.kencommandapi.type.PlayerArgumentType;
-import lombok.Getter;
 
-public class MsgCommand implements SyncCommandExecutor<CommandSource> {
+public class MsgCommand {
 
-    @Getter
-    private final RootLiteral<CommandSource> rootLiteral;
-    private final CommandArgument<CommandSource, Player> targetArg;
-    private final CommandArgument<CommandSource, String> msgArg;
+    private final RootLiteral<Player> rootLiteral;
+    private final CommandArgumentSpec<Player, Player> targetArg;
+    private final CommandArgumentSpec<Player, String> msgArg;
 
     private final LastTargetCache cache;
     private final PrivMsgHandler privMsgHandler;
@@ -29,26 +26,29 @@ public class MsgCommand implements SyncCommandExecutor<CommandSource> {
         this.cache = cache;
         this.privMsgHandler = helper;
 
-        targetArg = CommandArgument.arg("target", new PlayerArgumentType(server));
-        msgArg = CommandArgument.arg("msg", new StringArgumentType<>(true));
+        targetArg = CommandArgumentSpec.builder("target", new PlayerArgumentType<Player>(server)).build();
+        msgArg = CommandArgumentSpec.builder("msg", new StringArgumentType<Player>(true)).build();
 
-        rootLiteral = Literal.rootLiteral(style, "msg", "w", "privmsg");
-        rootLiteral.setExecutor(this);
-        rootLiteral.addArgument(targetArg);
-        rootLiteral.addArgument(msgArg);
+        rootLiteral = Literal.<Player>builder("msg", "w", "privmsg")
+                .withArgument(targetArg)
+                .withArgument(msgArg)
+                .withSyncExecutor(this::executeSync)
+                .asRootLiteral(style);
     }
 
-    @Override
-    public Result<Object, String> executeSync(CommandContext<CommandSource> ctx) {
+    private Result<Object, String> executeSync(CommandContext<Player> ctx) {
         var target = ctx.getArg(targetArg);
         var msg = ctx.getArg(msgArg);
-        var sender = (Player) ctx.getSender();
 
-        var isMessagingSelf = target.getUniqueId().equals(sender.getUniqueId());
+        var isMessagingSelf = target.getUniqueId().equals(ctx.sender().getUniqueId());
         if (isMessagingSelf) return Results.failure("You can't message yourself.");
 
-        cache.setLastTarget(sender.getUniqueId(), target.getUniqueId());
-        privMsgHandler.handle(sender, target, msg);
+        cache.setLastTarget(ctx.sender().getUniqueId(), target.getUniqueId());
+        privMsgHandler.handle(ctx.sender(), target, msg);
         return Results.success(new Object());
     }
+
+    public RootLiteral<Player> rootLiteral() {
+        return rootLiteral;
+    }
 }
diff --git a/core-velocity/plugin/main/java/de/kentoj/scrow/corevelocity/privmsg/PrivMsgHandler.java b/core-velocity/plugin/main/java/de/kentoj/scrow/corevelocity/privmsg/PrivMsgHandler.java
index d431722..e75c063 100644
--- a/core-velocity/plugin/main/java/de/kentoj/scrow/corevelocity/privmsg/PrivMsgHandler.java
+++ b/core-velocity/plugin/main/java/de/kentoj/scrow/corevelocity/privmsg/PrivMsgHandler.java
@@ -2,16 +2,18 @@ package de.kentoj.scrow.corevelocity.privmsg;
 
 import com.velocitypowered.api.proxy.Player;
 import de.kentoj.scrowlib.convention.ScrowMessageStyle;
-import lombok.RequiredArgsConstructor;
 import net.kyori.adventure.text.Component;
 
 import static net.kyori.adventure.text.Component.text;
 
-@RequiredArgsConstructor
 public class PrivMsgHandler {
 
     private final ScrowMessageStyle style;
 
+    public PrivMsgHandler(ScrowMessageStyle style) {
+        this.style = style;
+    }
+
     public void handle(Player player, Player target, String msg) {
         target.sendMessage(style.ok(text(target.getUsername() + " -> You: ").append(Component.text(msg))));
         player.sendMessage(style.ok(text("You -> " + target.getUsername() + ": ").append(Component.text(msg))));
diff --git a/core-velocity/plugin/main/java/de/kentoj/scrow/corevelocity/privmsg/ReplyCommand.java b/core-velocity/plugin/main/java/de/kentoj/scrow/corevelocity/privmsg/ReplyCommand.java
index 4455ab2..d3a4816 100644
--- a/core-velocity/plugin/main/java/de/kentoj/scrow/corevelocity/privmsg/ReplyCommand.java
+++ b/core-velocity/plugin/main/java/de/kentoj/scrow/corevelocity/privmsg/ReplyCommand.java
@@ -5,20 +5,18 @@ import com.leakyabstractions.result.core.Results;
 import com.velocitypowered.api.command.CommandSource;
 import com.velocitypowered.api.proxy.Player;
 import com.velocitypowered.api.proxy.ProxyServer;
-import de.kentoj.kencommandapi.api.argument.CommandArgument;
+import de.kentoj.kencommandapi.api.argument.CommandArgumentSpec;
 import de.kentoj.kencommandapi.api.argument.types.StringArgumentType;
 import de.kentoj.kencommandapi.api.invocation.CommandContext;
-import de.kentoj.kencommandapi.api.invocation.SyncCommandExecutor;
 import de.kentoj.kencommandapi.api.literal.Literal;
 import de.kentoj.kencommandapi.api.literal.RootLiteral;
 import de.kentoj.kencommandapi.api.platform.MessageStyle;
-import lombok.Getter;
+import de.kentoj.kencommandapi.type.PlayerArgumentType;
 
-public class ReplyCommand implements SyncCommandExecutor<CommandSource> {
+public class ReplyCommand {
 
-    @Getter
-    private final RootLiteral<CommandSource> rootLiteral;
-    private final CommandArgument<CommandSource, String> msgArg;
+    private final RootLiteral<Player> rootLiteral;
+    private final CommandArgumentSpec<Player, String> msgArg;
 
     private final LastTargetCache cache;
     private final ProxyServer server;
@@ -29,16 +27,15 @@ public class ReplyCommand implements SyncCommandExecutor<CommandSource> {
         this.server = server;
         this.privMsgHandler = privMsgHandler;
 
-        msgArg = CommandArgument.arg("msg", new StringArgumentType<>(true));
-        rootLiteral = Literal.rootLiteral(style, "reply", "r");
-        rootLiteral.setExecutor(this);
-        rootLiteral.addArgument(msgArg);
+        msgArg = CommandArgumentSpec.builder("msg", new StringArgumentType<Player>(true)).build();
+        rootLiteral = Literal.<Player>builder("reply", "r")
+                .withArgument(msgArg)
+                .withSyncExecutor(this::executeSync)
+                .asRootLiteral(style);
     }
 
-    @Override
-    public Result<Object, String> executeSync(CommandContext<CommandSource> ctx) {
-        var sender = (Player) ctx.getSender();
-        var targetId = cache.getLastTarget(sender.getUniqueId());
+    private Result<Object, String> executeSync(CommandContext<Player> ctx) {
+        var targetId = cache.getLastTarget(ctx.sender().getUniqueId());
         if (targetId == null)
             return Results.failure("You didn't messaged anyone recently. Use /msg first");
         var target = server.getPlayer(targetId).orElse(null);
@@ -46,7 +43,11 @@ public class ReplyCommand implements SyncCommandExecutor<CommandSource> {
 
         if (target == null)
             return Results.failure("The player you last messaged is no longer online.");
-        privMsgHandler.handle(sender, target, msg);
+        privMsgHandler.handle(ctx.sender(), target, msg);
         return Results.success(new Object());
     }
+
+    public RootLiteral<Player> rootLiteral() {
+        return rootLiteral;
+    }
 }
diff --git a/dev-server/BUILD b/dev-server/BUILD
new file mode 100644
index 0000000..1106d4e
--- /dev/null
+++ b/dev-server/BUILD
@@ -0,0 +1,35 @@
+load(":minecraft.bzl", "dev_server", "fetch_file")
+
+dev_server(
+    name = "dev",
+    server_jar = ":papermc",
+    plugins = [
+        ":luckperms",
+        ":viaversion",
+        ":viabackwards",
+    ],
+    local_plugins = [
+        "//core-bukkit:plugin",
+    ],
+)
+
+fetch_file(
+    name = "papermc",
+    filename = "paper.jar",
+    url = "https://fill-data.papermc.io/v1/objects/5953a1f1deaa3572be420c3a5b18406c4b752412a78be4acab7c8b467633caed/paper-26.2-100.jar",
+)
+fetch_file(
+    name = "luckperms",
+    filename = "LuckPerms.jar",
+    url = "https://download.luckperms.net/1652/bukkit/loader/LuckPerms-Bukkit-5.5.65.jar",
+)
+fetch_file(
+    name = "viaversion",
+    filename = "ViaVersion.jar",
+    url = "https://hangarcdn.papermc.io/plugins/ViaVersion/ViaVersion/versions/5.11.0/PAPER/ViaVersion-5.11.0.jar"
+)
+fetch_file(
+    name = "viabackwards",
+    filename = "ViaBackwards.jar",
+    url = "https://hangarcdn.papermc.io/plugins/ViaVersion/ViaBackwards/versions/5.11.0/PAPER/ViaBackwards-5.11.0.jar"
+)
\ No newline at end of file
diff --git a/dev-server/minecraft.bzl b/dev-server/minecraft.bzl
new file mode 100644
index 0000000..7d949d4
--- /dev/null
+++ b/dev-server/minecraft.bzl
@@ -0,0 +1,61 @@
+def _dev_server_impl(ctx):
+    script = ctx.actions.declare_file(ctx.label.name + "_runner")
+    content = """
+#!/bin/sh
+set -eux
+
+echo hi\n
+cp -f '%s' server.jar
+printf eula=true > eula.txt
+mkdir -p plugins
+rm -f plugins/*.jar
+for plugin in %s
+do
+  cp -v \"$plugin\" plugins/
+done
+exec java -jar server.jar --nogui %s
+""" % (
+    ctx.file.server_jar.short_path,
+    " ".join([p.short_path for p in ctx.files.plugins]),
+    " ".join(["--add-plugin %s" % p.short_path for p in ctx.files.local_plugins]),
+)
+    ctx.actions.write(
+        output = script,
+        content = content,
+        is_executable = True,
+    )
+    return DefaultInfo(
+        executable = script,
+        runfiles = ctx.runfiles(files = [ctx.file.server_jar] + ctx.files.plugins + ctx.files.local_plugins)
+    )
+
+dev_server = rule(
+    implementation = _dev_server_impl,
+    executable = True,
+    attrs = {
+        "server_jar": attr.label(allow_single_file = True, mandatory = True),
+        "plugins": attr.label_list(),
+        "local_plugins": attr.label_list(),
+    },
+)
+
+def _fetch_plugin_impl(ctx):
+    out_file = ctx.actions.declare_file(ctx.attr.filename)
+    ctx.actions.run_shell(
+        outputs = [out_file],
+        command = "curl -Lso \"$1\" \"$2\"",
+        arguments = [out_file.path, ctx.attr.url],
+        execution_requirements = {
+            "requires-network": "1",
+        },
+        progress_message = "Downloading plugin %s" % ctx.attr.filename,
+    )
+    return [DefaultInfo(files = depset([out_file]))]
+
+fetch_file = rule(
+    implementation = _fetch_plugin_impl,
+    attrs = {
+        "url": attr.string(mandatory = True),
+        "filename": attr.string(mandatory = True),
+    },
+)
diff --git a/runDevServer.sh b/runDevServer.sh
deleted file mode 100755
index 53497da..0000000
--- a/runDevServer.sh
+++ /dev/null
@@ -1,42 +0,0 @@
-#!/usr/bin/env sh
-set -e
-
-test -n "$MC_VERSION" || {
-  >&2 echo "MC_VERSION unset"
-  exit 1
-}
-
-test -n "$BUILT_PLUGIN" || {
-  >&2 echo "BUILT_PLUGIN unset"
-  exit 1
-}
-
-BUILT_PLUGIN="$(realpath "$BUILD_WORKSPACE_DIRECTORY/$BUILT_PLUGIN")"
-test -e "$BUILT_PLUGIN" || {
-  >&2 echo "$BUILT_PLUGIN does not exist"
-  exit 1
-}
-
-mkdir -p "$BUILD_WORKSPACE_DIRECTORY/run"
-cd "$BUILD_WORKSPACE_DIRECTORY/run"
-printf 'eula=true' > eula.txt
-
-server="paper-${MC_VERSION}.jar"
-test -f "$server" || {
-  >&2 echo "$server not found. downloading..."
-  url="$(curl -Ls "https://fill.papermc.io/v3/projects/paper/versions/$MC_VERSION/builds/latest" \
-    | jq -r '.downloads."server:default".url')"
-  curl -L -o "$server" "$url"
-}
-
-# shellcheck disable=SC2068
-for arg in $@; do
-  name="$(echo "$arg" | cut -d= -f1)"
-  url="$(echo "$arg" | cut -d= -f2)"
-  plugin="plugins/$name"
-  test -f "$plugin" || curl -Lo "$plugin" "$url"
-done
-
-exec java -jar "$server" \
-  --nogui \
-  --add-plugin "$BUILT_PLUGIN"
\ No newline at end of file
diff --git a/third_party/BUILD b/third_party/BUILD
deleted file mode 100644
index 1aa921d..0000000
--- a/third_party/BUILD
+++ /dev/null
@@ -1,23 +0,0 @@
-load("@rules_java//java:java_plugin.bzl", "java_plugin")
-load("@rules_java//java:java_library.bzl", "java_library")
-load("@rules_jvm_external//:defs.bzl", "artifact")
-
-java_plugin(
-    name = "lombok_plugin",
-    visibility = ["//visibility:public"],
-    deps = ["@maven//:org_projectlombok_lombok"],
-    processor_class = "lombok.launch.AnnotationProcessorHider$AnnotationProcessor",
-)
-
-java_library(
-    name = "common_deps",
-    exports = [
-        "@maven//:org_projectlombok_lombok",
-        "@maven//:com_leakyabstractions_result_api",
-        "@maven//:com_leakyabstractions_result",
-        "@maven//:org_jetbrains_annotations",
-        "@maven//:com_google_guava_guava",
-        "@maven//:org_slf4j_slf4j_api",
-    ],
-    visibility = ["//visibility:public"],
-)