From e7ff5d3da25f6049c04e876247d559dcd9e0a5dd Mon Sep 17 00:00:00 2001 From: kento2 Date: Sun, 5 Jul 2026 18:59:56 +0200 Subject: [PATCH] move some stuff around --- .../region/{impl => }/AbstractRegion.java | 2 +- .../region/{impl => }/CuboidRegion.java | 4 +--- .../region/{impl => }/CylinderRegion.java | 3 +-- .../region/{impl => }/MergedRegion.java | 3 +-- .../bukkit/region/{impl => }/Region.java | 3 +-- .../scrow/bukkit/region/RegionManager.java | 1 - .../bukkit/region/event/RegionEvent.java | 2 +- .../bukkit/region/event/RegionJoinEvent.java | 2 +- .../bukkit/region/event/RegionLeaveEvent.java | 2 +- .../kentoj/scrow/bukkit/CoreImplPlugin.java | 12 ++++++------ .../kentoj/scrow/bukkit/ScrowAPISurface.java | 16 ++++++++-------- .../economy}/CoinsCommand.java | 2 +- .../economy}/CoinsGetLiteral.java | 2 +- .../economy}/CoinsSetLiteral.java | 2 +- .../friends}/FriendAddLiteral.java | 2 +- .../friends}/FriendCommand.java | 2 +- .../friends}/FriendListLiteral.java | 2 +- .../friends}/FriendRemoveLiteral.java | 2 +- .../friends}/FriendRequestDeclineLiteral.java | 2 +- .../friends}/FriendRequestsLiteral.java | 2 +- .../instance}/InstanceCache.java | 2 +- .../instance}/InstanceCommand.java | 3 +-- .../instance}/InstanceDeployLiteral.java | 2 +- .../instance}/InstanceDestroyLiteral.java | 3 +-- .../instance}/InstanceListLiteral.java | 2 +- .../instance}/LobbyCommand.java | 2 +- .../instance}/PlayCommand.java | 2 +- .../notification/NotificationListener.java | 19 ------------------- .../network/NetworkPlayerWatchdog.java | 2 +- .../region/RegionManagerImpl.java | 6 ++++-- .../region/RegionPlayerTracker.java | 4 ++-- .../{ => internal}/region/RegionTask.java | 5 +++-- .../economy/PostgresEconomyService.java | 7 ++----- .../friendship/PostgresFriendshipService.java | 8 ++------ .../request/PostgresFriendRequestService.java | 9 ++------- 35 files changed, 54 insertions(+), 90 deletions(-) rename core-bukkit-api/src/main/java/de/kentoj/scrow/bukkit/region/{impl => }/AbstractRegion.java (79%) rename core-bukkit-api/src/main/java/de/kentoj/scrow/bukkit/region/{impl => }/CuboidRegion.java (90%) rename core-bukkit-api/src/main/java/de/kentoj/scrow/bukkit/region/{impl => }/CylinderRegion.java (92%) rename core-bukkit-api/src/main/java/de/kentoj/scrow/bukkit/region/{impl => }/MergedRegion.java (90%) rename core-bukkit-api/src/main/java/de/kentoj/scrow/bukkit/region/{impl => }/Region.java (75%) rename core-bukkit-impl/src/main/java/de/kentoj/scrow/bukkit/{economy/command => command/economy}/CoinsCommand.java (97%) rename core-bukkit-impl/src/main/java/de/kentoj/scrow/bukkit/{economy/command => command/economy}/CoinsGetLiteral.java (97%) rename core-bukkit-impl/src/main/java/de/kentoj/scrow/bukkit/{economy/command => command/economy}/CoinsSetLiteral.java (97%) rename core-bukkit-impl/src/main/java/de/kentoj/scrow/bukkit/{friends/command => command/friends}/FriendAddLiteral.java (99%) rename core-bukkit-impl/src/main/java/de/kentoj/scrow/bukkit/{friends/command => command/friends}/FriendCommand.java (97%) rename core-bukkit-impl/src/main/java/de/kentoj/scrow/bukkit/{friends/command => command/friends}/FriendListLiteral.java (98%) rename core-bukkit-impl/src/main/java/de/kentoj/scrow/bukkit/{friends/command => command/friends}/FriendRemoveLiteral.java (97%) rename core-bukkit-impl/src/main/java/de/kentoj/scrow/bukkit/{friends/command => command/friends}/FriendRequestDeclineLiteral.java (98%) rename core-bukkit-impl/src/main/java/de/kentoj/scrow/bukkit/{friends/command => command/friends}/FriendRequestsLiteral.java (98%) rename core-bukkit-impl/src/main/java/de/kentoj/scrow/bukkit/{instancemanager/cache => command/instance}/InstanceCache.java (95%) rename core-bukkit-impl/src/main/java/de/kentoj/scrow/bukkit/{instancemanager/command => command/instance}/InstanceCommand.java (88%) rename core-bukkit-impl/src/main/java/de/kentoj/scrow/bukkit/{instancemanager/command => command/instance}/InstanceDeployLiteral.java (97%) rename core-bukkit-impl/src/main/java/de/kentoj/scrow/bukkit/{instancemanager/command => command/instance}/InstanceDestroyLiteral.java (94%) rename core-bukkit-impl/src/main/java/de/kentoj/scrow/bukkit/{instancemanager/command => command/instance}/InstanceListLiteral.java (96%) rename core-bukkit-impl/src/main/java/de/kentoj/scrow/bukkit/{instancemanager/command => command/instance}/LobbyCommand.java (94%) rename core-bukkit-impl/src/main/java/de/kentoj/scrow/bukkit/{instancemanager/command => command/instance}/PlayCommand.java (97%) delete mode 100644 core-bukkit-impl/src/main/java/de/kentoj/scrow/bukkit/friends/notification/NotificationListener.java rename core-bukkit-impl/src/main/java/de/kentoj/scrow/bukkit/{ => internal}/network/NetworkPlayerWatchdog.java (97%) rename core-bukkit-impl/src/main/java/de/kentoj/scrow/bukkit/{ => internal}/region/RegionManagerImpl.java (88%) rename core-bukkit-impl/src/main/java/de/kentoj/scrow/bukkit/{ => internal}/region/RegionPlayerTracker.java (93%) rename core-bukkit-impl/src/main/java/de/kentoj/scrow/bukkit/{ => internal}/region/RegionTask.java (92%) diff --git a/core-bukkit-api/src/main/java/de/kentoj/scrow/bukkit/region/impl/AbstractRegion.java b/core-bukkit-api/src/main/java/de/kentoj/scrow/bukkit/region/AbstractRegion.java similarity index 79% rename from core-bukkit-api/src/main/java/de/kentoj/scrow/bukkit/region/impl/AbstractRegion.java rename to core-bukkit-api/src/main/java/de/kentoj/scrow/bukkit/region/AbstractRegion.java index 1cf1e97..bc7d182 100644 --- a/core-bukkit-api/src/main/java/de/kentoj/scrow/bukkit/region/impl/AbstractRegion.java +++ b/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; diff --git a/core-bukkit-api/src/main/java/de/kentoj/scrow/bukkit/region/impl/CuboidRegion.java b/core-bukkit-api/src/main/java/de/kentoj/scrow/bukkit/region/CuboidRegion.java similarity index 90% rename from core-bukkit-api/src/main/java/de/kentoj/scrow/bukkit/region/impl/CuboidRegion.java rename to core-bukkit-api/src/main/java/de/kentoj/scrow/bukkit/region/CuboidRegion.java index ca3b598..6ca0ede 100644 --- a/core-bukkit-api/src/main/java/de/kentoj/scrow/bukkit/region/impl/CuboidRegion.java +++ b/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; diff --git a/core-bukkit-api/src/main/java/de/kentoj/scrow/bukkit/region/impl/CylinderRegion.java b/core-bukkit-api/src/main/java/de/kentoj/scrow/bukkit/region/CylinderRegion.java similarity index 92% rename from core-bukkit-api/src/main/java/de/kentoj/scrow/bukkit/region/impl/CylinderRegion.java rename to core-bukkit-api/src/main/java/de/kentoj/scrow/bukkit/region/CylinderRegion.java index 5805113..ba3dbdf 100644 --- a/core-bukkit-api/src/main/java/de/kentoj/scrow/bukkit/region/impl/CylinderRegion.java +++ b/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; diff --git a/core-bukkit-api/src/main/java/de/kentoj/scrow/bukkit/region/impl/MergedRegion.java b/core-bukkit-api/src/main/java/de/kentoj/scrow/bukkit/region/MergedRegion.java similarity index 90% rename from core-bukkit-api/src/main/java/de/kentoj/scrow/bukkit/region/impl/MergedRegion.java rename to core-bukkit-api/src/main/java/de/kentoj/scrow/bukkit/region/MergedRegion.java index 30a785f..f3da13e 100644 --- a/core-bukkit-api/src/main/java/de/kentoj/scrow/bukkit/region/impl/MergedRegion.java +++ b/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; diff --git a/core-bukkit-api/src/main/java/de/kentoj/scrow/bukkit/region/impl/Region.java b/core-bukkit-api/src/main/java/de/kentoj/scrow/bukkit/region/Region.java similarity index 75% rename from core-bukkit-api/src/main/java/de/kentoj/scrow/bukkit/region/impl/Region.java rename to core-bukkit-api/src/main/java/de/kentoj/scrow/bukkit/region/Region.java index 82dad09..e40664d 100644 --- a/core-bukkit-api/src/main/java/de/kentoj/scrow/bukkit/region/impl/Region.java +++ b/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; diff --git a/core-bukkit-api/src/main/java/de/kentoj/scrow/bukkit/region/RegionManager.java b/core-bukkit-api/src/main/java/de/kentoj/scrow/bukkit/region/RegionManager.java index 8e9e2fc..c07ba59 100644 --- a/core-bukkit-api/src/main/java/de/kentoj/scrow/bukkit/region/RegionManager.java +++ b/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; diff --git a/core-bukkit-api/src/main/java/de/kentoj/scrow/bukkit/region/event/RegionEvent.java b/core-bukkit-api/src/main/java/de/kentoj/scrow/bukkit/region/event/RegionEvent.java index f8ef7e4..8c38c54 100644 --- a/core-bukkit-api/src/main/java/de/kentoj/scrow/bukkit/region/event/RegionEvent.java +++ b/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; diff --git a/core-bukkit-api/src/main/java/de/kentoj/scrow/bukkit/region/event/RegionJoinEvent.java b/core-bukkit-api/src/main/java/de/kentoj/scrow/bukkit/region/event/RegionJoinEvent.java index d724628..72f8d38 100644 --- a/core-bukkit-api/src/main/java/de/kentoj/scrow/bukkit/region/event/RegionJoinEvent.java +++ b/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; diff --git a/core-bukkit-api/src/main/java/de/kentoj/scrow/bukkit/region/event/RegionLeaveEvent.java b/core-bukkit-api/src/main/java/de/kentoj/scrow/bukkit/region/event/RegionLeaveEvent.java index 9c932d6..880f695 100644 --- a/core-bukkit-api/src/main/java/de/kentoj/scrow/bukkit/region/event/RegionLeaveEvent.java +++ b/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; diff --git a/core-bukkit-impl/src/main/java/de/kentoj/scrow/bukkit/CoreImplPlugin.java b/core-bukkit-impl/src/main/java/de/kentoj/scrow/bukkit/CoreImplPlugin.java index 86177b5..b8dd3ea 100644 --- a/core-bukkit-impl/src/main/java/de/kentoj/scrow/bukkit/CoreImplPlugin.java +++ b/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.friends.command.FriendCommand; -import de.kentoj.scrow.bukkit.instancemanager.cache.InstanceCache; -import de.kentoj.scrow.bukkit.instancemanager.command.InstanceCommand; -import de.kentoj.scrow.bukkit.instancemanager.command.LobbyCommand; -import de.kentoj.scrow.bukkit.instancemanager.command.PlayCommand; +import de.kentoj.scrow.bukkit.command.economy.CoinsCommand; +import de.kentoj.scrow.bukkit.command.friends.FriendCommand; +import de.kentoj.scrow.bukkit.command.instance.InstanceCache; +import de.kentoj.scrow.bukkit.command.instance.InstanceCommand; +import de.kentoj.scrow.bukkit.command.instance.LobbyCommand; +import de.kentoj.scrow.bukkit.command.instance.PlayCommand; import org.bukkit.plugin.java.JavaPlugin; import java.io.IOException; diff --git a/core-bukkit-impl/src/main/java/de/kentoj/scrow/bukkit/ScrowAPISurface.java b/core-bukkit-impl/src/main/java/de/kentoj/scrow/bukkit/ScrowAPISurface.java index f0ba932..f3b2ac1 100644 --- a/core-bukkit-impl/src/main/java/de/kentoj/scrow/bukkit/ScrowAPISurface.java +++ b/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(); diff --git a/core-bukkit-impl/src/main/java/de/kentoj/scrow/bukkit/economy/command/CoinsCommand.java b/core-bukkit-impl/src/main/java/de/kentoj/scrow/bukkit/command/economy/CoinsCommand.java similarity index 97% rename from core-bukkit-impl/src/main/java/de/kentoj/scrow/bukkit/economy/command/CoinsCommand.java rename to core-bukkit-impl/src/main/java/de/kentoj/scrow/bukkit/command/economy/CoinsCommand.java index a9ae259..b11b3a6 100644 --- a/core-bukkit-impl/src/main/java/de/kentoj/scrow/bukkit/economy/command/CoinsCommand.java +++ b/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; diff --git a/core-bukkit-impl/src/main/java/de/kentoj/scrow/bukkit/economy/command/CoinsGetLiteral.java b/core-bukkit-impl/src/main/java/de/kentoj/scrow/bukkit/command/economy/CoinsGetLiteral.java similarity index 97% rename from core-bukkit-impl/src/main/java/de/kentoj/scrow/bukkit/economy/command/CoinsGetLiteral.java rename to core-bukkit-impl/src/main/java/de/kentoj/scrow/bukkit/command/economy/CoinsGetLiteral.java index ee4c0e1..8cda9ea 100644 --- a/core-bukkit-impl/src/main/java/de/kentoj/scrow/bukkit/economy/command/CoinsGetLiteral.java +++ b/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; diff --git a/core-bukkit-impl/src/main/java/de/kentoj/scrow/bukkit/economy/command/CoinsSetLiteral.java b/core-bukkit-impl/src/main/java/de/kentoj/scrow/bukkit/command/economy/CoinsSetLiteral.java similarity index 97% rename from core-bukkit-impl/src/main/java/de/kentoj/scrow/bukkit/economy/command/CoinsSetLiteral.java rename to core-bukkit-impl/src/main/java/de/kentoj/scrow/bukkit/command/economy/CoinsSetLiteral.java index 316d811..f7306f3 100644 --- a/core-bukkit-impl/src/main/java/de/kentoj/scrow/bukkit/economy/command/CoinsSetLiteral.java +++ b/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; diff --git a/core-bukkit-impl/src/main/java/de/kentoj/scrow/bukkit/friends/command/FriendAddLiteral.java b/core-bukkit-impl/src/main/java/de/kentoj/scrow/bukkit/command/friends/FriendAddLiteral.java similarity index 99% rename from core-bukkit-impl/src/main/java/de/kentoj/scrow/bukkit/friends/command/FriendAddLiteral.java rename to core-bukkit-impl/src/main/java/de/kentoj/scrow/bukkit/command/friends/FriendAddLiteral.java index 0a5e8f0..a642697 100644 --- a/core-bukkit-impl/src/main/java/de/kentoj/scrow/bukkit/friends/command/FriendAddLiteral.java +++ b/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; diff --git a/core-bukkit-impl/src/main/java/de/kentoj/scrow/bukkit/friends/command/FriendCommand.java b/core-bukkit-impl/src/main/java/de/kentoj/scrow/bukkit/command/friends/FriendCommand.java similarity index 97% rename from core-bukkit-impl/src/main/java/de/kentoj/scrow/bukkit/friends/command/FriendCommand.java rename to core-bukkit-impl/src/main/java/de/kentoj/scrow/bukkit/command/friends/FriendCommand.java index fbea61e..500bcc9 100644 --- a/core-bukkit-impl/src/main/java/de/kentoj/scrow/bukkit/friends/command/FriendCommand.java +++ b/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; diff --git a/core-bukkit-impl/src/main/java/de/kentoj/scrow/bukkit/friends/command/FriendListLiteral.java b/core-bukkit-impl/src/main/java/de/kentoj/scrow/bukkit/command/friends/FriendListLiteral.java similarity index 98% rename from core-bukkit-impl/src/main/java/de/kentoj/scrow/bukkit/friends/command/FriendListLiteral.java rename to core-bukkit-impl/src/main/java/de/kentoj/scrow/bukkit/command/friends/FriendListLiteral.java index bd92ccf..f514ea9 100644 --- a/core-bukkit-impl/src/main/java/de/kentoj/scrow/bukkit/friends/command/FriendListLiteral.java +++ b/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; diff --git a/core-bukkit-impl/src/main/java/de/kentoj/scrow/bukkit/friends/command/FriendRemoveLiteral.java b/core-bukkit-impl/src/main/java/de/kentoj/scrow/bukkit/command/friends/FriendRemoveLiteral.java similarity index 97% rename from core-bukkit-impl/src/main/java/de/kentoj/scrow/bukkit/friends/command/FriendRemoveLiteral.java rename to core-bukkit-impl/src/main/java/de/kentoj/scrow/bukkit/command/friends/FriendRemoveLiteral.java index 3583e68..44f7125 100644 --- a/core-bukkit-impl/src/main/java/de/kentoj/scrow/bukkit/friends/command/FriendRemoveLiteral.java +++ b/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; diff --git a/core-bukkit-impl/src/main/java/de/kentoj/scrow/bukkit/friends/command/FriendRequestDeclineLiteral.java b/core-bukkit-impl/src/main/java/de/kentoj/scrow/bukkit/command/friends/FriendRequestDeclineLiteral.java similarity index 98% rename from core-bukkit-impl/src/main/java/de/kentoj/scrow/bukkit/friends/command/FriendRequestDeclineLiteral.java rename to core-bukkit-impl/src/main/java/de/kentoj/scrow/bukkit/command/friends/FriendRequestDeclineLiteral.java index 015c3b9..4f9883d 100644 --- a/core-bukkit-impl/src/main/java/de/kentoj/scrow/bukkit/friends/command/FriendRequestDeclineLiteral.java +++ b/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; diff --git a/core-bukkit-impl/src/main/java/de/kentoj/scrow/bukkit/friends/command/FriendRequestsLiteral.java b/core-bukkit-impl/src/main/java/de/kentoj/scrow/bukkit/command/friends/FriendRequestsLiteral.java similarity index 98% rename from core-bukkit-impl/src/main/java/de/kentoj/scrow/bukkit/friends/command/FriendRequestsLiteral.java rename to core-bukkit-impl/src/main/java/de/kentoj/scrow/bukkit/command/friends/FriendRequestsLiteral.java index 75cce32..2090442 100644 --- a/core-bukkit-impl/src/main/java/de/kentoj/scrow/bukkit/friends/command/FriendRequestsLiteral.java +++ b/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; diff --git a/core-bukkit-impl/src/main/java/de/kentoj/scrow/bukkit/instancemanager/cache/InstanceCache.java b/core-bukkit-impl/src/main/java/de/kentoj/scrow/bukkit/command/instance/InstanceCache.java similarity index 95% rename from core-bukkit-impl/src/main/java/de/kentoj/scrow/bukkit/instancemanager/cache/InstanceCache.java rename to core-bukkit-impl/src/main/java/de/kentoj/scrow/bukkit/command/instance/InstanceCache.java index 228903a..69ef396 100644 --- a/core-bukkit-impl/src/main/java/de/kentoj/scrow/bukkit/instancemanager/cache/InstanceCache.java +++ b/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; diff --git a/core-bukkit-impl/src/main/java/de/kentoj/scrow/bukkit/instancemanager/command/InstanceCommand.java b/core-bukkit-impl/src/main/java/de/kentoj/scrow/bukkit/command/instance/InstanceCommand.java similarity index 88% rename from core-bukkit-impl/src/main/java/de/kentoj/scrow/bukkit/instancemanager/command/InstanceCommand.java rename to core-bukkit-impl/src/main/java/de/kentoj/scrow/bukkit/command/instance/InstanceCommand.java index 32502ca..f5a5f9b 100644 --- a/core-bukkit-impl/src/main/java/de/kentoj/scrow/bukkit/instancemanager/command/InstanceCommand.java +++ b/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; diff --git a/core-bukkit-impl/src/main/java/de/kentoj/scrow/bukkit/instancemanager/command/InstanceDeployLiteral.java b/core-bukkit-impl/src/main/java/de/kentoj/scrow/bukkit/command/instance/InstanceDeployLiteral.java similarity index 97% rename from core-bukkit-impl/src/main/java/de/kentoj/scrow/bukkit/instancemanager/command/InstanceDeployLiteral.java rename to core-bukkit-impl/src/main/java/de/kentoj/scrow/bukkit/command/instance/InstanceDeployLiteral.java index 30b3c73..0a36636 100644 --- a/core-bukkit-impl/src/main/java/de/kentoj/scrow/bukkit/instancemanager/command/InstanceDeployLiteral.java +++ b/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; diff --git a/core-bukkit-impl/src/main/java/de/kentoj/scrow/bukkit/instancemanager/command/InstanceDestroyLiteral.java b/core-bukkit-impl/src/main/java/de/kentoj/scrow/bukkit/command/instance/InstanceDestroyLiteral.java similarity index 94% rename from core-bukkit-impl/src/main/java/de/kentoj/scrow/bukkit/instancemanager/command/InstanceDestroyLiteral.java rename to core-bukkit-impl/src/main/java/de/kentoj/scrow/bukkit/command/instance/InstanceDestroyLiteral.java index 7349434..b9125df 100644 --- a/core-bukkit-impl/src/main/java/de/kentoj/scrow/bukkit/instancemanager/command/InstanceDestroyLiteral.java +++ b/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; diff --git a/core-bukkit-impl/src/main/java/de/kentoj/scrow/bukkit/instancemanager/command/InstanceListLiteral.java b/core-bukkit-impl/src/main/java/de/kentoj/scrow/bukkit/command/instance/InstanceListLiteral.java similarity index 96% rename from core-bukkit-impl/src/main/java/de/kentoj/scrow/bukkit/instancemanager/command/InstanceListLiteral.java rename to core-bukkit-impl/src/main/java/de/kentoj/scrow/bukkit/command/instance/InstanceListLiteral.java index 3be7901..bc2a42e 100644 --- a/core-bukkit-impl/src/main/java/de/kentoj/scrow/bukkit/instancemanager/command/InstanceListLiteral.java +++ b/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; diff --git a/core-bukkit-impl/src/main/java/de/kentoj/scrow/bukkit/instancemanager/command/LobbyCommand.java b/core-bukkit-impl/src/main/java/de/kentoj/scrow/bukkit/command/instance/LobbyCommand.java similarity index 94% rename from core-bukkit-impl/src/main/java/de/kentoj/scrow/bukkit/instancemanager/command/LobbyCommand.java rename to core-bukkit-impl/src/main/java/de/kentoj/scrow/bukkit/command/instance/LobbyCommand.java index 4266092..ec0d537 100644 --- a/core-bukkit-impl/src/main/java/de/kentoj/scrow/bukkit/instancemanager/command/LobbyCommand.java +++ b/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; diff --git a/core-bukkit-impl/src/main/java/de/kentoj/scrow/bukkit/instancemanager/command/PlayCommand.java b/core-bukkit-impl/src/main/java/de/kentoj/scrow/bukkit/command/instance/PlayCommand.java similarity index 97% rename from core-bukkit-impl/src/main/java/de/kentoj/scrow/bukkit/instancemanager/command/PlayCommand.java rename to core-bukkit-impl/src/main/java/de/kentoj/scrow/bukkit/command/instance/PlayCommand.java index 633ac4a..a89845c 100644 --- a/core-bukkit-impl/src/main/java/de/kentoj/scrow/bukkit/instancemanager/command/PlayCommand.java +++ b/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; diff --git a/core-bukkit-impl/src/main/java/de/kentoj/scrow/bukkit/friends/notification/NotificationListener.java b/core-bukkit-impl/src/main/java/de/kentoj/scrow/bukkit/friends/notification/NotificationListener.java deleted file mode 100644 index e218caa..0000000 --- a/core-bukkit-impl/src/main/java/de/kentoj/scrow/bukkit/friends/notification/NotificationListener.java +++ /dev/null @@ -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)); - }); - } -} diff --git a/core-bukkit-impl/src/main/java/de/kentoj/scrow/bukkit/network/NetworkPlayerWatchdog.java b/core-bukkit-impl/src/main/java/de/kentoj/scrow/bukkit/internal/network/NetworkPlayerWatchdog.java similarity index 97% rename from core-bukkit-impl/src/main/java/de/kentoj/scrow/bukkit/network/NetworkPlayerWatchdog.java rename to core-bukkit-impl/src/main/java/de/kentoj/scrow/bukkit/internal/network/NetworkPlayerWatchdog.java index 4e7a26e..cf70f78 100644 --- a/core-bukkit-impl/src/main/java/de/kentoj/scrow/bukkit/network/NetworkPlayerWatchdog.java +++ b/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; diff --git a/core-bukkit-impl/src/main/java/de/kentoj/scrow/bukkit/region/RegionManagerImpl.java b/core-bukkit-impl/src/main/java/de/kentoj/scrow/bukkit/internal/region/RegionManagerImpl.java similarity index 88% rename from core-bukkit-impl/src/main/java/de/kentoj/scrow/bukkit/region/RegionManagerImpl.java rename to core-bukkit-impl/src/main/java/de/kentoj/scrow/bukkit/internal/region/RegionManagerImpl.java index 9100b3e..718df66 100644 --- a/core-bukkit-impl/src/main/java/de/kentoj/scrow/bukkit/region/RegionManagerImpl.java +++ b/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.*; diff --git a/core-bukkit-impl/src/main/java/de/kentoj/scrow/bukkit/region/RegionPlayerTracker.java b/core-bukkit-impl/src/main/java/de/kentoj/scrow/bukkit/internal/region/RegionPlayerTracker.java similarity index 93% rename from core-bukkit-impl/src/main/java/de/kentoj/scrow/bukkit/region/RegionPlayerTracker.java rename to core-bukkit-impl/src/main/java/de/kentoj/scrow/bukkit/internal/region/RegionPlayerTracker.java index 182304f..be0d8fb 100644 --- a/core-bukkit-impl/src/main/java/de/kentoj/scrow/bukkit/region/RegionPlayerTracker.java +++ b/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; diff --git a/core-bukkit-impl/src/main/java/de/kentoj/scrow/bukkit/region/RegionTask.java b/core-bukkit-impl/src/main/java/de/kentoj/scrow/bukkit/internal/region/RegionTask.java similarity index 92% rename from core-bukkit-impl/src/main/java/de/kentoj/scrow/bukkit/region/RegionTask.java rename to core-bukkit-impl/src/main/java/de/kentoj/scrow/bukkit/internal/region/RegionTask.java index 9f2c950..0c3e7b3 100644 --- a/core-bukkit-impl/src/main/java/de/kentoj/scrow/bukkit/region/RegionTask.java +++ b/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; diff --git a/core-lib/src/main/java/de/kentoj/scrowlib/economy/PostgresEconomyService.java b/core-lib/src/main/java/de/kentoj/scrowlib/economy/PostgresEconomyService.java index 20066a8..e01d89c 100644 --- a/core-lib/src/main/java/de/kentoj/scrowlib/economy/PostgresEconomyService.java +++ b/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() { - checkNotNull(ScrowAPI.getJdbi()); - this.jdbi = ScrowAPI.getJdbi(); + public PostgresEconomyService(Jdbi jdbi) { + this.jdbi = jdbi; jdbi.withHandle(h -> h.execute(""" CREATE TABLE IF NOT EXISTS economy ( playerId UUID NOT NULL, diff --git a/core-lib/src/main/java/de/kentoj/scrowlib/friends/friendship/PostgresFriendshipService.java b/core-lib/src/main/java/de/kentoj/scrowlib/friends/friendship/PostgresFriendshipService.java index 7cace0e..aa38a55 100644 --- a/core-lib/src/main/java/de/kentoj/scrowlib/friends/friendship/PostgresFriendshipService.java +++ b/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() { - checkNotNull(ScrowAPI.getJdbi()); - jdbi = ScrowAPI.getJdbi(); + public PostgresFriendshipService(Jdbi jdbi) { + this.jdbi = jdbi; jdbi.useHandle(h -> h.execute(""" CREATE TABLE IF NOT EXISTS friendships ( first_uuid UUID NOT NULL, 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 9cf6691..16afead 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 @@ -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() { - checkNotNull(ScrowAPI.getJdbi()); - jdbi = ScrowAPI.getJdbi(); - + public PostgresFriendRequestService(Jdbi jdbi) { + this.jdbi = jdbi; jdbi.useHandle(h -> h.execute(""" CREATE TABLE IF NOT EXISTS friendrequests ( from_uuid UUID NOT NULL,