move some stuff around

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

@@ -1,4 +1,4 @@
-package de.kentoj.scrow.bukkit.region.impl;
+package de.kentoj.scrow.bukkit.region;
 
 import lombok.Getter;
 

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

@@ -1,7 +1,5 @@
-package de.kentoj.scrow.bukkit.region.impl;
+package de.kentoj.scrow.bukkit.region;
 
-import de.kentoj.scrow.bukkit.region.ChunkPos;
-import de.kentoj.scrow.bukkit.region.Range;
 import org.bukkit.Location;
 
 import java.util.ArrayList;

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

@@ -1,6 +1,5 @@
-package de.kentoj.scrow.bukkit.region.impl;
+package de.kentoj.scrow.bukkit.region;
 
-import de.kentoj.scrow.bukkit.region.ChunkPos;
 import lombok.RequiredArgsConstructor;
 import org.bukkit.Location;
 

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

@@ -1,6 +1,5 @@
-package de.kentoj.scrow.bukkit.region.impl;
+package de.kentoj.scrow.bukkit.region;
 
-import de.kentoj.scrow.bukkit.region.ChunkPos;
 import lombok.RequiredArgsConstructor;
 import org.bukkit.Location;
 

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

@@ -1,6 +1,5 @@
-package de.kentoj.scrow.bukkit.region.impl;
+package de.kentoj.scrow.bukkit.region;
 
-import de.kentoj.scrow.bukkit.region.ChunkPos;
 import org.bukkit.Location;
 
 import java.util.List;

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

@@ -1,6 +1,5 @@
 package de.kentoj.scrow.bukkit.region;
 
-import de.kentoj.scrow.bukkit.region.impl.Region;
 import org.jetbrains.annotations.Nullable;
 
 import java.util.List;

core-bukkit-api/src/main/java/de/kentoj/scrow/bukkit/region/event/RegionEvent.java

@@ -1,6 +1,6 @@
 package de.kentoj.scrow.bukkit.region.event;
 
-import de.kentoj.scrow.bukkit.region.impl.Region;
+import de.kentoj.scrow.bukkit.region.Region;
 import lombok.Getter;
 import lombok.RequiredArgsConstructor;
 import org.bukkit.entity.Player;

core-bukkit-api/src/main/java/de/kentoj/scrow/bukkit/region/event/RegionJoinEvent.java

@@ -1,6 +1,6 @@
 package de.kentoj.scrow.bukkit.region.event;
 
-import de.kentoj.scrow.bukkit.region.impl.Region;
+import de.kentoj.scrow.bukkit.region.Region;
 import lombok.Getter;
 import lombok.Setter;
 import org.bukkit.entity.Player;

core-bukkit-api/src/main/java/de/kentoj/scrow/bukkit/region/event/RegionLeaveEvent.java

@@ -1,6 +1,6 @@
 package de.kentoj.scrow.bukkit.region.event;
 
-import de.kentoj.scrow.bukkit.region.impl.Region;
+import de.kentoj.scrow.bukkit.region.Region;
 import lombok.Getter;
 import lombok.Setter;
 import org.bukkit.entity.Player;

core-bukkit-impl/src/main/java/de/kentoj/scrow/bukkit/CoreImplPlugin.java

@@ -1,11 +1,11 @@
 package de.kentoj.scrow.bukkit;
 
-import de.kentoj.scrow.bukkit.economy.command.CoinsCommand;
+import de.kentoj.scrow.bukkit.command.economy.CoinsCommand;
-import de.kentoj.scrow.bukkit.friends.command.FriendCommand;
+import de.kentoj.scrow.bukkit.command.friends.FriendCommand;
-import de.kentoj.scrow.bukkit.instancemanager.cache.InstanceCache;
+import de.kentoj.scrow.bukkit.command.instance.InstanceCache;
-import de.kentoj.scrow.bukkit.instancemanager.command.InstanceCommand;
+import de.kentoj.scrow.bukkit.command.instance.InstanceCommand;
-import de.kentoj.scrow.bukkit.instancemanager.command.LobbyCommand;
+import de.kentoj.scrow.bukkit.command.instance.LobbyCommand;
-import de.kentoj.scrow.bukkit.instancemanager.command.PlayCommand;
+import de.kentoj.scrow.bukkit.command.instance.PlayCommand;
 import org.bukkit.plugin.java.JavaPlugin;
 
 import java.io.IOException;

core-bukkit-impl/src/main/java/de/kentoj/scrow/bukkit/ScrowAPISurface.java

@@ -1,19 +1,19 @@
 package de.kentoj.scrow.bukkit;
 
 import de.kentoj.kencommandapi.CommandAPI;
+import de.kentoj.scrow.bukkit.internal.network.NetworkPlayerWatchdog;
+import de.kentoj.scrow.bukkit.internal.region.RegionManagerImpl;
+import de.kentoj.scrow.bukkit.internal.region.RegionPlayerTracker;
+import de.kentoj.scrow.bukkit.internal.region.RegionTask;
 import de.kentoj.scrowlib.economy.InMemoryEconomyService;
 import de.kentoj.scrowlib.economy.PostgresEconomyService;
 import de.kentoj.scrowlib.friends.friendship.InMemoryFriendshipService;
 import de.kentoj.scrowlib.friends.friendship.PostgresFriendshipService;
 import de.kentoj.scrowlib.friends.request.InMemoryFriendRequestService;
 import de.kentoj.scrowlib.friends.request.PostgresFriendRequestService;
-import de.kentoj.scrow.bukkit.network.NetworkPlayerWatchdog;
-import de.kentoj.scrowlib.player.NetworkPlayerImpl;
-import de.kentoj.scrow.bukkit.region.RegionManagerImpl;
-import de.kentoj.scrow.bukkit.region.RegionPlayerTracker;
-import de.kentoj.scrow.bukkit.region.RegionTask;
 import de.kentoj.scrowlib.instancemanager.InstanceManagerImpl;
 import de.kentoj.scrowlib.messaging.MessageBroker;
+import de.kentoj.scrowlib.player.NetworkPlayerImpl;
 import de.kentoj.scrowlib.utils.EnvUtils;
 import io.nats.client.Nats;
 import io.nats.client.Options;
@@ -58,11 +58,11 @@ public class ScrowAPISurface {
         ScrowAPI.setCommandApi(new CommandAPI(plugin));
         ScrowAPI.setInstanceManager(new InstanceManagerImpl(ScrowAPI.getMessageBroker()));
         ScrowAPI.setEconomyService(ScrowAPI.getJdbi() != null ?
-                new PostgresEconomyService() : new InMemoryEconomyService());
+                new PostgresEconomyService(ScrowAPI.getJdbi()) : new InMemoryEconomyService());
         ScrowAPI.setFriendRequestService(ScrowAPI.getJdbi() != null ?
-                new PostgresFriendRequestService() : new InMemoryFriendRequestService());
+                new PostgresFriendRequestService(ScrowAPI.getJdbi()) : new InMemoryFriendRequestService());
         ScrowAPI.setFriendshipService(ScrowAPI.getJdbi() != null ?
-                new PostgresFriendshipService() : new InMemoryFriendshipService());
+                new PostgresFriendshipService(ScrowAPI.getJdbi()) : new InMemoryFriendshipService());
 
         new RegionTask(new RegionPlayerTracker()).runTaskTimer(plugin, 10, 10);
         new NetworkPlayerWatchdog().listen();

core-bukkit-impl/src/main/java/de/kentoj/scrow/bukkit/command/economy/CoinsCommand.java

@@ -1,4 +1,4 @@
-package de.kentoj.scrow.bukkit.economy.command;
+package de.kentoj.scrow.bukkit.command.economy;
 
 import com.leakyabstractions.result.api.Result;
 import com.leakyabstractions.result.core.Results;

core-bukkit-impl/src/main/java/de/kentoj/scrow/bukkit/command/economy/CoinsGetLiteral.java

@@ -1,4 +1,4 @@
-package de.kentoj.scrow.bukkit.economy.command;
+package de.kentoj.scrow.bukkit.command.economy;
 
 import com.leakyabstractions.result.api.Result;
 import com.leakyabstractions.result.core.Results;

core-bukkit-impl/src/main/java/de/kentoj/scrow/bukkit/command/economy/CoinsSetLiteral.java

@@ -1,4 +1,4 @@
-package de.kentoj.scrow.bukkit.economy.command;
+package de.kentoj.scrow.bukkit.command.economy;
 
 import com.leakyabstractions.result.api.Result;
 import com.leakyabstractions.result.core.Results;

core-bukkit-impl/src/main/java/de/kentoj/scrow/bukkit/command/friends/FriendAddLiteral.java

@@ -1,4 +1,4 @@
-package de.kentoj.scrow.bukkit.friends.command;
+package de.kentoj.scrow.bukkit.command.friends;
 
 import com.leakyabstractions.result.api.Result;
 import com.leakyabstractions.result.core.Results;

core-bukkit-impl/src/main/java/de/kentoj/scrow/bukkit/command/friends/FriendCommand.java

@@ -1,4 +1,4 @@
-package de.kentoj.scrow.bukkit.friends.command;
+package de.kentoj.scrow.bukkit.command.friends;
 
 import de.kentoj.kencommandapi.api.node.CommandNode;
 import de.kentoj.kencommandapi.api.node.RootCommandNode;

core-bukkit-impl/src/main/java/de/kentoj/scrow/bukkit/command/friends/FriendListLiteral.java

@@ -1,4 +1,4 @@
-package de.kentoj.scrow.bukkit.friends.command;
+package de.kentoj.scrow.bukkit.command.friends;
 
 import com.leakyabstractions.result.api.Result;
 import com.leakyabstractions.result.core.Results;

core-bukkit-impl/src/main/java/de/kentoj/scrow/bukkit/command/friends/FriendRemoveLiteral.java

@@ -1,4 +1,4 @@
-package de.kentoj.scrow.bukkit.friends.command;
+package de.kentoj.scrow.bukkit.command.friends;
 
 import com.leakyabstractions.result.api.Result;
 import com.leakyabstractions.result.core.Results;

core-bukkit-impl/src/main/java/de/kentoj/scrow/bukkit/command/friends/FriendRequestDeclineLiteral.java

@@ -1,4 +1,4 @@
-package de.kentoj.scrow.bukkit.friends.command;
+package de.kentoj.scrow.bukkit.command.friends;
 
 import com.leakyabstractions.result.api.Result;
 import com.leakyabstractions.result.core.Results;

core-bukkit-impl/src/main/java/de/kentoj/scrow/bukkit/command/friends/FriendRequestsLiteral.java

@@ -1,4 +1,4 @@
-package de.kentoj.scrow.bukkit.friends.command;
+package de.kentoj.scrow.bukkit.command.friends;
 
 import com.leakyabstractions.result.api.Result;
 import com.leakyabstractions.result.core.Results;

core-bukkit-impl/src/main/java/de/kentoj/scrow/bukkit/command/instance/InstanceCache.java

@@ -1,4 +1,4 @@
-package de.kentoj.scrow.bukkit.instancemanager.cache;
+package de.kentoj.scrow.bukkit.command.instance;
 
 import de.kentoj.scrow.bukkit.ScrowAPI;
 import de.kentoj.scrowlib.instancemanager.ServerInstance;

core-bukkit-impl/src/main/java/de/kentoj/scrow/bukkit/command/instance/InstanceCommand.java

@@ -1,8 +1,7 @@
-package de.kentoj.scrow.bukkit.instancemanager.command;
+package de.kentoj.scrow.bukkit.command.instance;
 
 import de.kentoj.kencommandapi.api.node.CommandNode;
 import de.kentoj.kencommandapi.api.node.RootCommandNode;
-import de.kentoj.scrow.bukkit.instancemanager.cache.InstanceCache;
 import de.kentoj.scrowlib.convention.ScrowMessageStyle;
 import lombok.AccessLevel;
 import lombok.NoArgsConstructor;

core-bukkit-impl/src/main/java/de/kentoj/scrow/bukkit/command/instance/InstanceDeployLiteral.java

@@ -1,4 +1,4 @@
-package de.kentoj.scrow.bukkit.instancemanager.command;
+package de.kentoj.scrow.bukkit.command.instance;
 
 import com.leakyabstractions.result.api.Result;
 import com.leakyabstractions.result.core.Results;

core-bukkit-impl/src/main/java/de/kentoj/scrow/bukkit/command/instance/InstanceDestroyLiteral.java

@@ -1,4 +1,4 @@
-package de.kentoj.scrow.bukkit.instancemanager.command;
+package de.kentoj.scrow.bukkit.command.instance;
 
 import com.leakyabstractions.result.api.Result;
 import com.leakyabstractions.result.core.Results;
@@ -8,7 +8,6 @@ import de.kentoj.kencommandapi.api.invocation.CommandContext;
 import de.kentoj.kencommandapi.api.invocation.CommandExecutor;
 import de.kentoj.kencommandapi.api.node.CommandNode;
 import de.kentoj.scrow.bukkit.ScrowAPI;
-import de.kentoj.scrow.bukkit.instancemanager.cache.InstanceCache;
 import de.kentoj.scrow.bukkit.scheduler.Tasks;
 import de.kentoj.scrowlib.convention.ScrowMessageStyle;
 import de.kentoj.scrowlib.instancemanager.ServerInstance;

core-bukkit-impl/src/main/java/de/kentoj/scrow/bukkit/command/instance/InstanceListLiteral.java

@@ -1,4 +1,4 @@
-package de.kentoj.scrow.bukkit.instancemanager.command;
+package de.kentoj.scrow.bukkit.command.instance;
 
 import com.leakyabstractions.result.api.Result;
 import com.leakyabstractions.result.core.Results;

core-bukkit-impl/src/main/java/de/kentoj/scrow/bukkit/command/instance/LobbyCommand.java

@@ -1,4 +1,4 @@
-package de.kentoj.scrow.bukkit.instancemanager.command;
+package de.kentoj.scrow.bukkit.command.instance;
 
 import com.leakyabstractions.result.api.Result;
 import com.leakyabstractions.result.core.Results;

core-bukkit-impl/src/main/java/de/kentoj/scrow/bukkit/command/instance/PlayCommand.java

@@ -1,4 +1,4 @@
-package de.kentoj.scrow.bukkit.instancemanager.command;
+package de.kentoj.scrow.bukkit.command.instance;
 
 import com.leakyabstractions.result.api.Result;
 import com.leakyabstractions.result.core.Results;

core-bukkit-impl/src/main/java/de/kentoj/scrow/bukkit/friends/notification/NotificationListener.java

@@ -1,19 +0,0 @@
-package de.kentoj.scrow.bukkit.friends.notification;
-
-import de.kentoj.scrow.bukkit.ScrowAPI;
-import de.kentoj.scrowlib.messaging.MessageBroker;
-import org.bukkit.Bukkit;
-import org.bukkit.event.Listener;
-
-import java.util.UUID;
-
-public class NotificationListener {
-
-    private final MessageBroker messageBroker = ScrowAPI.getMessageBroker();
-
-    public NotificationListener() {
-        messageBroker.subscribe("event.player.connect", doc -> {
-            var player= Bukkit.getPlayer(doc.get("playerId", UUID.class));
-        });
-    }
-}

core-bukkit-impl/src/main/java/de/kentoj/scrow/bukkit/internal/network/NetworkPlayerWatchdog.java

@@ -1,4 +1,4 @@
-package de.kentoj.scrow.bukkit.network;
+package de.kentoj.scrow.bukkit.internal.network;
 
 import de.kentoj.scrow.bukkit.ScrowAPI;
 import lombok.RequiredArgsConstructor;

core-bukkit-impl/src/main/java/de/kentoj/scrow/bukkit/internal/region/RegionManagerImpl.java

@@ -1,6 +1,8 @@
-package de.kentoj.scrow.bukkit.region;
+package de.kentoj.scrow.bukkit.internal.region;
 
-import de.kentoj.scrow.bukkit.region.impl.Region;
+import de.kentoj.scrow.bukkit.region.ChunkPos;
+import de.kentoj.scrow.bukkit.region.Region;
+import de.kentoj.scrow.bukkit.region.RegionManager;
 import org.jetbrains.annotations.Nullable;
 
 import java.util.*;

core-bukkit-impl/src/main/java/de/kentoj/scrow/bukkit/internal/region/RegionPlayerTracker.java

@@ -1,7 +1,7 @@
-package de.kentoj.scrow.bukkit.region;
+package de.kentoj.scrow.bukkit.internal.region;
 
 import de.kentoj.scrow.bukkit.ScrowAPI;
-import de.kentoj.scrow.bukkit.region.impl.Region;
+import de.kentoj.scrow.bukkit.region.Region;
 import org.bukkit.Bukkit;
 import org.bukkit.entity.Player;
 

core-bukkit-impl/src/main/java/de/kentoj/scrow/bukkit/internal/region/RegionTask.java

@@ -1,9 +1,10 @@
-package de.kentoj.scrow.bukkit.region;
+package de.kentoj.scrow.bukkit.internal.region;
 
 import de.kentoj.scrow.bukkit.ScrowAPI;
+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 de.kentoj.scrow.bukkit.region.impl.Region;
 import lombok.RequiredArgsConstructor;
 import org.bukkit.Bukkit;
 import org.bukkit.scheduler.BukkitRunnable;

core-lib/src/main/java/de/kentoj/scrowlib/economy/PostgresEconomyService.java

@@ -1,21 +1,18 @@
 package de.kentoj.scrowlib.economy;
 
-import de.kentoj.scrow.bukkit.ScrowAPI;
 import org.jdbi.v3.core.Jdbi;
 
 import java.util.UUID;
 
 import static com.google.common.base.Preconditions.checkArgument;
-import static com.google.common.base.Preconditions.checkNotNull;
 
 // TODO log operations to separate table
 public class PostgresEconomyService implements EconomyService {
 
     private final Jdbi jdbi;
 
-    public PostgresEconomyService() {
+    public PostgresEconomyService(Jdbi jdbi) {
-        checkNotNull(ScrowAPI.getJdbi());
+        this.jdbi = jdbi;
-        this.jdbi = ScrowAPI.getJdbi();
         jdbi.withHandle(h -> h.execute("""
                 CREATE TABLE IF NOT EXISTS economy (
                     playerId UUID NOT NULL,

core-lib/src/main/java/de/kentoj/scrowlib/friends/friendship/PostgresFriendshipService.java

@@ -1,6 +1,5 @@
 package de.kentoj.scrowlib.friends.friendship;
 
-import de.kentoj.scrow.bukkit.ScrowAPI;
 import de.kentoj.scrowlib.friends.Friendship;
 import de.kentoj.scrowlib.friends.FriendshipService;
 import de.kentoj.scrowlib.friends.OrderedUUIDPair;
@@ -14,15 +13,12 @@ import java.time.OffsetDateTime;
 import java.util.List;
 import java.util.UUID;
 
-import static com.google.common.base.Preconditions.checkNotNull;
-
 public class PostgresFriendshipService implements FriendshipService {
 
     private final Jdbi jdbi;
 
-    public PostgresFriendshipService() {
+    public PostgresFriendshipService(Jdbi jdbi) {
-        checkNotNull(ScrowAPI.getJdbi());
+        this.jdbi = jdbi;
-        jdbi = ScrowAPI.getJdbi();
         jdbi.useHandle(h -> h.execute("""
                 CREATE TABLE IF NOT EXISTS friendships (
                     first_uuid UUID NOT NULL,

core-lib/src/main/java/de/kentoj/scrowlib/friends/request/PostgresFriendRequestService.java

@@ -1,6 +1,5 @@
 package de.kentoj.scrowlib.friends.request;
 
-import de.kentoj.scrow.bukkit.ScrowAPI;
 import de.kentoj.scrowlib.friends.FriendRequest;
 import de.kentoj.scrowlib.friends.FriendRequestService;
 import lombok.extern.slf4j.Slf4j;
@@ -14,17 +13,13 @@ import java.time.OffsetDateTime;
 import java.util.List;
 import java.util.UUID;
 
-import static com.google.common.base.Preconditions.checkNotNull;
-
 @Slf4j
 public class PostgresFriendRequestService implements FriendRequestService {
 
     private final Jdbi jdbi;
 
-    public PostgresFriendRequestService() {
+    public PostgresFriendRequestService(Jdbi jdbi) {
-        checkNotNull(ScrowAPI.getJdbi());
+        this.jdbi = jdbi;
-        jdbi = ScrowAPI.getJdbi();
-
         jdbi.useHandle(h -> h.execute("""
                 CREATE TABLE IF NOT EXISTS friendrequests (
                     from_uuid UUID NOT NULL,