diff --git a/core/BUILD b/core/BUILD new file mode 100644 index 0000000..e69de29 diff --git a/core-bukkit/BUILD b/core/bukkit/BUILD similarity index 83% rename from core-bukkit/BUILD rename to core/bukkit/BUILD index a06b311..9fa9266 100644 --- a/core-bukkit/BUILD +++ b/core/bukkit/BUILD @@ -4,15 +4,15 @@ load("@rules_java//java:java_binary.bzl", "java_binary") java_library( name = "api", - srcs = glob(["api/main/**/*.java"]), + srcs = glob(["api/main/java/**/*.java"]), visibility = ["//visibility:public"], deps = [ - "//core-lib:core", + "//core/common", artifact("io.papermc.paper:paper-api"), artifact("de.kentoj.scrow:kencommandapi-bukkit"), ], exports = [ - "//core-lib:core", + "//core/common", artifact("de.kentoj.scrow:kencommandapi-bukkit"), artifact("org.mongodb:bson"), ], @@ -20,10 +20,10 @@ java_library( java_binary( name = "_plugin", - srcs = glob(["plugin/main/**/*.java"]), + srcs = glob(["plugin/main/java/**/*.java"]), create_executable = False, resources = glob(["plugin/main/resources/**"]), - resource_strip_prefix = "core-bukkit/plugin/main/resources", + resource_strip_prefix = "core/bukkit/plugin/main/resources", deps = [ ":api", artifact("net.luckperms:api"), 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 similarity index 95% rename from core-bukkit/api/main/java/de/kentoj/scrow/bukkit/ScrowAPI.java rename to core/bukkit/api/main/java/de/kentoj/scrow/bukkit/ScrowAPI.java index d8e6859..1b06cd4 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 @@ -140,6 +140,11 @@ public class ScrowAPI { return instanceManager; } + /** + * Regions are not a reliable enough to detect fast movements. + * The way regions work is that every few ticks, all regions are checked for players. + * @see org.bukkit.event.player.PlayerMoveEvent + */ public static RegionManager regionManager() { return regionManager; } diff --git a/core-bukkit/api/main/java/de/kentoj/scrow/bukkit/gameserver/GameServer.java b/core/bukkit/api/main/java/de/kentoj/scrow/bukkit/gameserver/GameServer.java similarity index 100% rename from core-bukkit/api/main/java/de/kentoj/scrow/bukkit/gameserver/GameServer.java rename to core/bukkit/api/main/java/de/kentoj/scrow/bukkit/gameserver/GameServer.java diff --git a/core-bukkit/api/main/java/de/kentoj/scrow/bukkit/gameserver/GameServerPool.java b/core/bukkit/api/main/java/de/kentoj/scrow/bukkit/gameserver/GameServerPool.java similarity index 100% rename from core-bukkit/api/main/java/de/kentoj/scrow/bukkit/gameserver/GameServerPool.java rename to core/bukkit/api/main/java/de/kentoj/scrow/bukkit/gameserver/GameServerPool.java diff --git a/core-bukkit/api/main/java/de/kentoj/scrow/bukkit/minigame/Minigame.java b/core/bukkit/api/main/java/de/kentoj/scrow/bukkit/minigame/Minigame.java similarity index 100% rename from core-bukkit/api/main/java/de/kentoj/scrow/bukkit/minigame/Minigame.java rename to core/bukkit/api/main/java/de/kentoj/scrow/bukkit/minigame/Minigame.java diff --git a/core-bukkit/api/main/java/de/kentoj/scrow/bukkit/minigame/MinigameManager.java b/core/bukkit/api/main/java/de/kentoj/scrow/bukkit/minigame/MinigameManager.java similarity index 100% rename from core-bukkit/api/main/java/de/kentoj/scrow/bukkit/minigame/MinigameManager.java rename to core/bukkit/api/main/java/de/kentoj/scrow/bukkit/minigame/MinigameManager.java diff --git a/core-bukkit/api/main/java/de/kentoj/scrow/bukkit/minigame/PlayerManager.java b/core/bukkit/api/main/java/de/kentoj/scrow/bukkit/minigame/PlayerManager.java similarity index 100% rename from core-bukkit/api/main/java/de/kentoj/scrow/bukkit/minigame/PlayerManager.java rename to core/bukkit/api/main/java/de/kentoj/scrow/bukkit/minigame/PlayerManager.java 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 similarity index 100% rename from core-bukkit/api/main/java/de/kentoj/scrow/bukkit/minigame/lobby/LobbyPhase.java rename to core/bukkit/api/main/java/de/kentoj/scrow/bukkit/minigame/lobby/LobbyPhase.java diff --git a/core-bukkit/api/main/java/de/kentoj/scrow/bukkit/minigame/lobby/WaitForMaximumPlayersPhase.java b/core/bukkit/api/main/java/de/kentoj/scrow/bukkit/minigame/lobby/WaitForMaximumPlayersPhase.java similarity index 100% rename from core-bukkit/api/main/java/de/kentoj/scrow/bukkit/minigame/lobby/WaitForMaximumPlayersPhase.java rename to core/bukkit/api/main/java/de/kentoj/scrow/bukkit/minigame/lobby/WaitForMaximumPlayersPhase.java diff --git a/core-bukkit/api/main/java/de/kentoj/scrow/bukkit/minigame/lobby/WaitForMinimumPlayersPhase.java b/core/bukkit/api/main/java/de/kentoj/scrow/bukkit/minigame/lobby/WaitForMinimumPlayersPhase.java similarity index 100% rename from core-bukkit/api/main/java/de/kentoj/scrow/bukkit/minigame/lobby/WaitForMinimumPlayersPhase.java rename to core/bukkit/api/main/java/de/kentoj/scrow/bukkit/minigame/lobby/WaitForMinimumPlayersPhase.java diff --git a/core-bukkit/api/main/java/de/kentoj/scrow/bukkit/minigame/phase/CompositePhase.java b/core/bukkit/api/main/java/de/kentoj/scrow/bukkit/minigame/phase/CompositePhase.java similarity index 100% rename from core-bukkit/api/main/java/de/kentoj/scrow/bukkit/minigame/phase/CompositePhase.java rename to core/bukkit/api/main/java/de/kentoj/scrow/bukkit/minigame/phase/CompositePhase.java diff --git a/core-bukkit/api/main/java/de/kentoj/scrow/bukkit/minigame/phase/IPhase.java b/core/bukkit/api/main/java/de/kentoj/scrow/bukkit/minigame/phase/IPhase.java similarity index 100% rename from core-bukkit/api/main/java/de/kentoj/scrow/bukkit/minigame/phase/IPhase.java rename to core/bukkit/api/main/java/de/kentoj/scrow/bukkit/minigame/phase/IPhase.java diff --git a/core-bukkit/api/main/java/de/kentoj/scrow/bukkit/minigame/phase/Phase.java b/core/bukkit/api/main/java/de/kentoj/scrow/bukkit/minigame/phase/Phase.java similarity index 100% rename from core-bukkit/api/main/java/de/kentoj/scrow/bukkit/minigame/phase/Phase.java rename to core/bukkit/api/main/java/de/kentoj/scrow/bukkit/minigame/phase/Phase.java diff --git a/core-bukkit/api/main/java/de/kentoj/scrow/bukkit/minigame/phase/PhaseFlow.java b/core/bukkit/api/main/java/de/kentoj/scrow/bukkit/minigame/phase/PhaseFlow.java similarity index 100% rename from core-bukkit/api/main/java/de/kentoj/scrow/bukkit/minigame/phase/PhaseFlow.java rename to core/bukkit/api/main/java/de/kentoj/scrow/bukkit/minigame/phase/PhaseFlow.java diff --git a/core-bukkit/api/main/java/de/kentoj/scrow/bukkit/minigame/phase/event/EventHandler.java b/core/bukkit/api/main/java/de/kentoj/scrow/bukkit/minigame/phase/event/EventHandler.java similarity index 100% rename from core-bukkit/api/main/java/de/kentoj/scrow/bukkit/minigame/phase/event/EventHandler.java rename to core/bukkit/api/main/java/de/kentoj/scrow/bukkit/minigame/phase/event/EventHandler.java diff --git a/core-bukkit/api/main/java/de/kentoj/scrow/bukkit/minigame/phase/event/PhaseListeners.java b/core/bukkit/api/main/java/de/kentoj/scrow/bukkit/minigame/phase/event/PhaseListeners.java similarity index 100% rename from core-bukkit/api/main/java/de/kentoj/scrow/bukkit/minigame/phase/event/PhaseListeners.java rename to core/bukkit/api/main/java/de/kentoj/scrow/bukkit/minigame/phase/event/PhaseListeners.java diff --git a/core-bukkit/api/main/java/de/kentoj/scrow/bukkit/minigame/phase/event/PhaseListenersImpl.java b/core/bukkit/api/main/java/de/kentoj/scrow/bukkit/minigame/phase/event/PhaseListenersImpl.java similarity index 100% rename from core-bukkit/api/main/java/de/kentoj/scrow/bukkit/minigame/phase/event/PhaseListenersImpl.java rename to core/bukkit/api/main/java/de/kentoj/scrow/bukkit/minigame/phase/event/PhaseListenersImpl.java diff --git a/core-bukkit/api/main/java/de/kentoj/scrow/bukkit/minigame/phaseflow/LinearPhaseFlow.java b/core/bukkit/api/main/java/de/kentoj/scrow/bukkit/minigame/phaseflow/LinearPhaseFlow.java similarity index 100% rename from core-bukkit/api/main/java/de/kentoj/scrow/bukkit/minigame/phaseflow/LinearPhaseFlow.java rename to core/bukkit/api/main/java/de/kentoj/scrow/bukkit/minigame/phaseflow/LinearPhaseFlow.java 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 similarity index 100% rename from core-bukkit/api/main/java/de/kentoj/scrow/bukkit/minigame/phaseflow/PhaseContext.java rename to core/bukkit/api/main/java/de/kentoj/scrow/bukkit/minigame/phaseflow/PhaseContext.java diff --git a/core-bukkit/api/main/java/de/kentoj/scrow/bukkit/region/AbstractRegion.java b/core/bukkit/api/main/java/de/kentoj/scrow/bukkit/region/AbstractRegion.java similarity index 100% rename from core-bukkit/api/main/java/de/kentoj/scrow/bukkit/region/AbstractRegion.java rename to core/bukkit/api/main/java/de/kentoj/scrow/bukkit/region/AbstractRegion.java diff --git a/core-bukkit/api/main/java/de/kentoj/scrow/bukkit/region/ChunkPos.java b/core/bukkit/api/main/java/de/kentoj/scrow/bukkit/region/ChunkPos.java similarity index 100% rename from core-bukkit/api/main/java/de/kentoj/scrow/bukkit/region/ChunkPos.java rename to core/bukkit/api/main/java/de/kentoj/scrow/bukkit/region/ChunkPos.java diff --git a/core-bukkit/api/main/java/de/kentoj/scrow/bukkit/region/CompositeRegion.java b/core/bukkit/api/main/java/de/kentoj/scrow/bukkit/region/CompositeRegion.java similarity index 100% rename from core-bukkit/api/main/java/de/kentoj/scrow/bukkit/region/CompositeRegion.java rename to core/bukkit/api/main/java/de/kentoj/scrow/bukkit/region/CompositeRegion.java diff --git a/core-bukkit/api/main/java/de/kentoj/scrow/bukkit/region/CuboidRegion.java b/core/bukkit/api/main/java/de/kentoj/scrow/bukkit/region/CuboidRegion.java similarity index 100% rename from core-bukkit/api/main/java/de/kentoj/scrow/bukkit/region/CuboidRegion.java rename to core/bukkit/api/main/java/de/kentoj/scrow/bukkit/region/CuboidRegion.java diff --git a/core-bukkit/api/main/java/de/kentoj/scrow/bukkit/region/CylinderRegion.java b/core/bukkit/api/main/java/de/kentoj/scrow/bukkit/region/CylinderRegion.java similarity index 100% rename from core-bukkit/api/main/java/de/kentoj/scrow/bukkit/region/CylinderRegion.java rename to core/bukkit/api/main/java/de/kentoj/scrow/bukkit/region/CylinderRegion.java diff --git a/core-bukkit/api/main/java/de/kentoj/scrow/bukkit/region/Range.java b/core/bukkit/api/main/java/de/kentoj/scrow/bukkit/region/Range.java similarity index 100% rename from core-bukkit/api/main/java/de/kentoj/scrow/bukkit/region/Range.java rename to core/bukkit/api/main/java/de/kentoj/scrow/bukkit/region/Range.java diff --git a/core-bukkit/api/main/java/de/kentoj/scrow/bukkit/region/Region.java b/core/bukkit/api/main/java/de/kentoj/scrow/bukkit/region/Region.java similarity index 100% rename from core-bukkit/api/main/java/de/kentoj/scrow/bukkit/region/Region.java rename to core/bukkit/api/main/java/de/kentoj/scrow/bukkit/region/Region.java diff --git a/core-bukkit/api/main/java/de/kentoj/scrow/bukkit/region/RegionManager.java b/core/bukkit/api/main/java/de/kentoj/scrow/bukkit/region/RegionManager.java similarity index 62% rename from core-bukkit/api/main/java/de/kentoj/scrow/bukkit/region/RegionManager.java rename to core/bukkit/api/main/java/de/kentoj/scrow/bukkit/region/RegionManager.java index c07ba59..c3494a5 100644 --- a/core-bukkit/api/main/java/de/kentoj/scrow/bukkit/region/RegionManager.java +++ b/core/bukkit/api/main/java/de/kentoj/scrow/bukkit/region/RegionManager.java @@ -5,6 +5,11 @@ import org.jetbrains.annotations.Nullable; import java.util.List; import java.util.UUID; +/** + * Regions are not a reliable enough to detect fast movements. + * The way regions work is that every few ticks, all regions are checked for players. + * @see org.bukkit.event.player.PlayerMoveEvent + */ public interface RegionManager { List getRegions(ChunkPos chunkPos); diff --git a/core-bukkit/api/main/java/de/kentoj/scrow/bukkit/region/event/RegionEvent.java b/core/bukkit/api/main/java/de/kentoj/scrow/bukkit/region/event/RegionEvent.java similarity index 100% rename from core-bukkit/api/main/java/de/kentoj/scrow/bukkit/region/event/RegionEvent.java rename to core/bukkit/api/main/java/de/kentoj/scrow/bukkit/region/event/RegionEvent.java diff --git a/core-bukkit/api/main/java/de/kentoj/scrow/bukkit/region/event/RegionJoinEvent.java b/core/bukkit/api/main/java/de/kentoj/scrow/bukkit/region/event/RegionJoinEvent.java similarity index 100% rename from core-bukkit/api/main/java/de/kentoj/scrow/bukkit/region/event/RegionJoinEvent.java rename to core/bukkit/api/main/java/de/kentoj/scrow/bukkit/region/event/RegionJoinEvent.java diff --git a/core-bukkit/api/main/java/de/kentoj/scrow/bukkit/region/event/RegionLeaveEvent.java b/core/bukkit/api/main/java/de/kentoj/scrow/bukkit/region/event/RegionLeaveEvent.java similarity index 100% rename from core-bukkit/api/main/java/de/kentoj/scrow/bukkit/region/event/RegionLeaveEvent.java rename to core/bukkit/api/main/java/de/kentoj/scrow/bukkit/region/event/RegionLeaveEvent.java diff --git a/core-bukkit/api/main/java/de/kentoj/scrow/bukkit/scheduler/Task.java b/core/bukkit/api/main/java/de/kentoj/scrow/bukkit/scheduler/Task.java similarity index 100% rename from core-bukkit/api/main/java/de/kentoj/scrow/bukkit/scheduler/Task.java rename to core/bukkit/api/main/java/de/kentoj/scrow/bukkit/scheduler/Task.java diff --git a/core-bukkit/api/main/java/de/kentoj/scrow/bukkit/scheduler/TaskImpl.java b/core/bukkit/api/main/java/de/kentoj/scrow/bukkit/scheduler/TaskImpl.java similarity index 100% rename from core-bukkit/api/main/java/de/kentoj/scrow/bukkit/scheduler/TaskImpl.java rename to core/bukkit/api/main/java/de/kentoj/scrow/bukkit/scheduler/TaskImpl.java diff --git a/core-bukkit/api/main/java/de/kentoj/scrow/bukkit/scheduler/TaskState.java b/core/bukkit/api/main/java/de/kentoj/scrow/bukkit/scheduler/TaskState.java similarity index 100% rename from core-bukkit/api/main/java/de/kentoj/scrow/bukkit/scheduler/TaskState.java rename to core/bukkit/api/main/java/de/kentoj/scrow/bukkit/scheduler/TaskState.java 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 similarity index 100% rename from core-bukkit/api/main/java/de/kentoj/scrow/bukkit/scheduler/Tasks.java rename to core/bukkit/api/main/java/de/kentoj/scrow/bukkit/scheduler/Tasks.java diff --git a/core-bukkit/plugin/main/java/de/kentoj/scrow/bukkit/CoreImplPlugin.java b/core/bukkit/plugin/main/java/de/kentoj/scrow/bukkit/CoreImplPlugin.java similarity index 100% rename from core-bukkit/plugin/main/java/de/kentoj/scrow/bukkit/CoreImplPlugin.java rename to core/bukkit/plugin/main/java/de/kentoj/scrow/bukkit/CoreImplPlugin.java 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 similarity index 100% rename from core-bukkit/plugin/main/java/de/kentoj/scrow/bukkit/ScrowAPISurface.java rename to core/bukkit/plugin/main/java/de/kentoj/scrow/bukkit/ScrowAPISurface.java 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 similarity index 100% rename from core-bukkit/plugin/main/java/de/kentoj/scrow/bukkit/command/economy/CoinsCommand.java rename to core/bukkit/plugin/main/java/de/kentoj/scrow/bukkit/command/economy/CoinsCommand.java 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 similarity index 100% rename from core-bukkit/plugin/main/java/de/kentoj/scrow/bukkit/command/economy/CoinsGetLiteral.java rename to core/bukkit/plugin/main/java/de/kentoj/scrow/bukkit/command/economy/CoinsGetLiteral.java 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 similarity index 100% rename from core-bukkit/plugin/main/java/de/kentoj/scrow/bukkit/command/economy/CoinsSetLiteral.java rename to core/bukkit/plugin/main/java/de/kentoj/scrow/bukkit/command/economy/CoinsSetLiteral.java 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 similarity index 100% rename from core-bukkit/plugin/main/java/de/kentoj/scrow/bukkit/command/friends/FriendAddLiteral.java rename to core/bukkit/plugin/main/java/de/kentoj/scrow/bukkit/command/friends/FriendAddLiteral.java 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 similarity index 100% rename from core-bukkit/plugin/main/java/de/kentoj/scrow/bukkit/command/friends/FriendCommand.java rename to core/bukkit/plugin/main/java/de/kentoj/scrow/bukkit/command/friends/FriendCommand.java 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 similarity index 100% rename from core-bukkit/plugin/main/java/de/kentoj/scrow/bukkit/command/friends/FriendListLiteral.java rename to core/bukkit/plugin/main/java/de/kentoj/scrow/bukkit/command/friends/FriendListLiteral.java 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 similarity index 100% rename from core-bukkit/plugin/main/java/de/kentoj/scrow/bukkit/command/friends/FriendRemoveLiteral.java rename to core/bukkit/plugin/main/java/de/kentoj/scrow/bukkit/command/friends/FriendRemoveLiteral.java 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 similarity index 100% rename from core-bukkit/plugin/main/java/de/kentoj/scrow/bukkit/command/friends/FriendRequestDeclineLiteral.java rename to core/bukkit/plugin/main/java/de/kentoj/scrow/bukkit/command/friends/FriendRequestDeclineLiteral.java 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 similarity index 100% rename from core-bukkit/plugin/main/java/de/kentoj/scrow/bukkit/command/friends/FriendRequestsLiteral.java rename to core/bukkit/plugin/main/java/de/kentoj/scrow/bukkit/command/friends/FriendRequestsLiteral.java diff --git a/core-bukkit/plugin/main/java/de/kentoj/scrow/bukkit/command/instance/InstanceCache.java b/core/bukkit/plugin/main/java/de/kentoj/scrow/bukkit/command/instance/InstanceCache.java similarity index 100% rename from core-bukkit/plugin/main/java/de/kentoj/scrow/bukkit/command/instance/InstanceCache.java rename to core/bukkit/plugin/main/java/de/kentoj/scrow/bukkit/command/instance/InstanceCache.java 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 similarity index 100% rename from core-bukkit/plugin/main/java/de/kentoj/scrow/bukkit/command/instance/InstanceCommand.java rename to core/bukkit/plugin/main/java/de/kentoj/scrow/bukkit/command/instance/InstanceCommand.java 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 similarity index 100% rename from core-bukkit/plugin/main/java/de/kentoj/scrow/bukkit/command/instance/InstanceDeployLiteral.java rename to core/bukkit/plugin/main/java/de/kentoj/scrow/bukkit/command/instance/InstanceDeployLiteral.java 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 similarity index 100% rename from core-bukkit/plugin/main/java/de/kentoj/scrow/bukkit/command/instance/InstanceDestroyLiteral.java rename to core/bukkit/plugin/main/java/de/kentoj/scrow/bukkit/command/instance/InstanceDestroyLiteral.java 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 similarity index 100% rename from core-bukkit/plugin/main/java/de/kentoj/scrow/bukkit/command/instance/InstanceListLiteral.java rename to core/bukkit/plugin/main/java/de/kentoj/scrow/bukkit/command/instance/InstanceListLiteral.java 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 similarity index 100% rename from core-bukkit/plugin/main/java/de/kentoj/scrow/bukkit/command/instance/LobbyCommand.java rename to core/bukkit/plugin/main/java/de/kentoj/scrow/bukkit/command/instance/LobbyCommand.java 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 similarity index 100% rename from core-bukkit/plugin/main/java/de/kentoj/scrow/bukkit/command/instance/PlayCommand.java rename to core/bukkit/plugin/main/java/de/kentoj/scrow/bukkit/command/instance/PlayCommand.java 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 similarity index 100% rename from core-bukkit/plugin/main/java/de/kentoj/scrow/bukkit/internal/player/NetworkPlayerWatchdog.java rename to core/bukkit/plugin/main/java/de/kentoj/scrow/bukkit/internal/player/NetworkPlayerWatchdog.java diff --git a/core-bukkit/plugin/main/java/de/kentoj/scrow/bukkit/internal/player/prefix/CachedPrefixProvider.java b/core/bukkit/plugin/main/java/de/kentoj/scrow/bukkit/internal/player/prefix/CachedPrefixProvider.java similarity index 100% rename from core-bukkit/plugin/main/java/de/kentoj/scrow/bukkit/internal/player/prefix/CachedPrefixProvider.java rename to core/bukkit/plugin/main/java/de/kentoj/scrow/bukkit/internal/player/prefix/CachedPrefixProvider.java diff --git a/core-bukkit/plugin/main/java/de/kentoj/scrow/bukkit/internal/player/prefix/LuckPermsPrefixSetter.java b/core/bukkit/plugin/main/java/de/kentoj/scrow/bukkit/internal/player/prefix/LuckPermsPrefixSetter.java similarity index 100% rename from core-bukkit/plugin/main/java/de/kentoj/scrow/bukkit/internal/player/prefix/LuckPermsPrefixSetter.java rename to core/bukkit/plugin/main/java/de/kentoj/scrow/bukkit/internal/player/prefix/LuckPermsPrefixSetter.java diff --git a/core-bukkit/plugin/main/java/de/kentoj/scrow/bukkit/internal/region/RegionManagerImpl.java b/core/bukkit/plugin/main/java/de/kentoj/scrow/bukkit/internal/region/RegionManagerImpl.java similarity index 100% rename from core-bukkit/plugin/main/java/de/kentoj/scrow/bukkit/internal/region/RegionManagerImpl.java rename to core/bukkit/plugin/main/java/de/kentoj/scrow/bukkit/internal/region/RegionManagerImpl.java diff --git a/core-bukkit/plugin/main/java/de/kentoj/scrow/bukkit/internal/region/RegionPlayerTracker.java b/core/bukkit/plugin/main/java/de/kentoj/scrow/bukkit/internal/region/RegionPlayerTracker.java similarity index 100% rename from core-bukkit/plugin/main/java/de/kentoj/scrow/bukkit/internal/region/RegionPlayerTracker.java rename to core/bukkit/plugin/main/java/de/kentoj/scrow/bukkit/internal/region/RegionPlayerTracker.java 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 similarity index 100% rename from core-bukkit/plugin/main/java/de/kentoj/scrow/bukkit/internal/region/RegionTask.java rename to core/bukkit/plugin/main/java/de/kentoj/scrow/bukkit/internal/region/RegionTask.java diff --git a/core-bukkit/plugin/main/java/de/kentoj/scrow/bukkit/style/ChatStyleListener.java b/core/bukkit/plugin/main/java/de/kentoj/scrow/bukkit/style/ChatStyleListener.java similarity index 100% rename from core-bukkit/plugin/main/java/de/kentoj/scrow/bukkit/style/ChatStyleListener.java rename to core/bukkit/plugin/main/java/de/kentoj/scrow/bukkit/style/ChatStyleListener.java 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 similarity index 100% rename from core-bukkit/plugin/main/java/de/kentoj/scrow/bukkit/style/StyleHelper.java rename to core/bukkit/plugin/main/java/de/kentoj/scrow/bukkit/style/StyleHelper.java diff --git a/core-bukkit/plugin/main/java/de/kentoj/scrow/bukkit/style/TabStyleListener.java b/core/bukkit/plugin/main/java/de/kentoj/scrow/bukkit/style/TabStyleListener.java similarity index 100% rename from core-bukkit/plugin/main/java/de/kentoj/scrow/bukkit/style/TabStyleListener.java rename to core/bukkit/plugin/main/java/de/kentoj/scrow/bukkit/style/TabStyleListener.java diff --git a/core-bukkit/plugin/main/resources/plugin.yml b/core/bukkit/plugin/main/resources/plugin.yml similarity index 100% rename from core-bukkit/plugin/main/resources/plugin.yml rename to core/bukkit/plugin/main/resources/plugin.yml diff --git a/core-lib/BUILD b/core/common/BUILD similarity index 92% rename from core-lib/BUILD rename to core/common/BUILD index e732c92..1ee759a 100644 --- a/core-lib/BUILD +++ b/core/common/BUILD @@ -15,8 +15,8 @@ shared_deps = [ ] java_library( - name = "core", - srcs = glob(["src/main/**/*.java"]), + name = "common", + srcs = glob(["src/main/java/**/*.java"]), visibility = ["//visibility:public"], deps = shared_deps + [ artifact("org.jdbi:jdbi3-postgres"), diff --git a/core-lib/src/main/java/de/kentoj/scrowlib/convention/ScrowMessageStyle.java b/core/common/src/main/java/de/kentoj/scrowlib/convention/ScrowMessageStyle.java similarity index 100% rename from core-lib/src/main/java/de/kentoj/scrowlib/convention/ScrowMessageStyle.java rename to core/common/src/main/java/de/kentoj/scrowlib/convention/ScrowMessageStyle.java diff --git a/core-lib/src/main/java/de/kentoj/scrowlib/economy/EconomyService.java b/core/common/src/main/java/de/kentoj/scrowlib/economy/EconomyService.java similarity index 100% rename from core-lib/src/main/java/de/kentoj/scrowlib/economy/EconomyService.java rename to core/common/src/main/java/de/kentoj/scrowlib/economy/EconomyService.java diff --git a/core-lib/src/main/java/de/kentoj/scrowlib/economy/InMemoryEconomyService.java b/core/common/src/main/java/de/kentoj/scrowlib/economy/InMemoryEconomyService.java similarity index 100% rename from core-lib/src/main/java/de/kentoj/scrowlib/economy/InMemoryEconomyService.java rename to core/common/src/main/java/de/kentoj/scrowlib/economy/InMemoryEconomyService.java diff --git a/core-lib/src/main/java/de/kentoj/scrowlib/economy/PostgresEconomyService.java b/core/common/src/main/java/de/kentoj/scrowlib/economy/PostgresEconomyService.java similarity index 100% rename from core-lib/src/main/java/de/kentoj/scrowlib/economy/PostgresEconomyService.java rename to core/common/src/main/java/de/kentoj/scrowlib/economy/PostgresEconomyService.java diff --git a/core-lib/src/main/java/de/kentoj/scrowlib/friends/FriendRequest.java b/core/common/src/main/java/de/kentoj/scrowlib/friends/FriendRequest.java similarity index 100% rename from core-lib/src/main/java/de/kentoj/scrowlib/friends/FriendRequest.java rename to core/common/src/main/java/de/kentoj/scrowlib/friends/FriendRequest.java diff --git a/core-lib/src/main/java/de/kentoj/scrowlib/friends/FriendRequestService.java b/core/common/src/main/java/de/kentoj/scrowlib/friends/FriendRequestService.java similarity index 100% rename from core-lib/src/main/java/de/kentoj/scrowlib/friends/FriendRequestService.java rename to core/common/src/main/java/de/kentoj/scrowlib/friends/FriendRequestService.java diff --git a/core-lib/src/main/java/de/kentoj/scrowlib/friends/Friendship.java b/core/common/src/main/java/de/kentoj/scrowlib/friends/Friendship.java similarity index 100% rename from core-lib/src/main/java/de/kentoj/scrowlib/friends/Friendship.java rename to core/common/src/main/java/de/kentoj/scrowlib/friends/Friendship.java diff --git a/core-lib/src/main/java/de/kentoj/scrowlib/friends/FriendshipService.java b/core/common/src/main/java/de/kentoj/scrowlib/friends/FriendshipService.java similarity index 100% rename from core-lib/src/main/java/de/kentoj/scrowlib/friends/FriendshipService.java rename to core/common/src/main/java/de/kentoj/scrowlib/friends/FriendshipService.java diff --git a/core-lib/src/main/java/de/kentoj/scrowlib/friends/OrderedUUIDPair.java b/core/common/src/main/java/de/kentoj/scrowlib/friends/OrderedUUIDPair.java similarity index 100% rename from core-lib/src/main/java/de/kentoj/scrowlib/friends/OrderedUUIDPair.java rename to core/common/src/main/java/de/kentoj/scrowlib/friends/OrderedUUIDPair.java diff --git a/core-lib/src/main/java/de/kentoj/scrowlib/friends/friendship/FriendshipImpl.java b/core/common/src/main/java/de/kentoj/scrowlib/friends/friendship/FriendshipImpl.java similarity index 100% rename from core-lib/src/main/java/de/kentoj/scrowlib/friends/friendship/FriendshipImpl.java rename to core/common/src/main/java/de/kentoj/scrowlib/friends/friendship/FriendshipImpl.java diff --git a/core-lib/src/main/java/de/kentoj/scrowlib/friends/friendship/InMemoryFriendshipService.java b/core/common/src/main/java/de/kentoj/scrowlib/friends/friendship/InMemoryFriendshipService.java similarity index 100% rename from core-lib/src/main/java/de/kentoj/scrowlib/friends/friendship/InMemoryFriendshipService.java rename to core/common/src/main/java/de/kentoj/scrowlib/friends/friendship/InMemoryFriendshipService.java diff --git a/core-lib/src/main/java/de/kentoj/scrowlib/friends/friendship/PostgresFriendshipService.java b/core/common/src/main/java/de/kentoj/scrowlib/friends/friendship/PostgresFriendshipService.java similarity index 100% rename from core-lib/src/main/java/de/kentoj/scrowlib/friends/friendship/PostgresFriendshipService.java rename to core/common/src/main/java/de/kentoj/scrowlib/friends/friendship/PostgresFriendshipService.java diff --git a/core-lib/src/main/java/de/kentoj/scrowlib/friends/request/FriendRequestImpl.java b/core/common/src/main/java/de/kentoj/scrowlib/friends/request/FriendRequestImpl.java similarity index 100% rename from core-lib/src/main/java/de/kentoj/scrowlib/friends/request/FriendRequestImpl.java rename to core/common/src/main/java/de/kentoj/scrowlib/friends/request/FriendRequestImpl.java diff --git a/core-lib/src/main/java/de/kentoj/scrowlib/friends/request/InMemoryFriendRequestService.java b/core/common/src/main/java/de/kentoj/scrowlib/friends/request/InMemoryFriendRequestService.java similarity index 100% rename from core-lib/src/main/java/de/kentoj/scrowlib/friends/request/InMemoryFriendRequestService.java rename to core/common/src/main/java/de/kentoj/scrowlib/friends/request/InMemoryFriendRequestService.java diff --git a/core-lib/src/main/java/de/kentoj/scrowlib/friends/request/PostgresFriendRequestService.java b/core/common/src/main/java/de/kentoj/scrowlib/friends/request/PostgresFriendRequestService.java similarity index 100% rename from core-lib/src/main/java/de/kentoj/scrowlib/friends/request/PostgresFriendRequestService.java rename to core/common/src/main/java/de/kentoj/scrowlib/friends/request/PostgresFriendRequestService.java diff --git a/core-lib/src/main/java/de/kentoj/scrowlib/instancemanager/InstanceManager.java b/core/common/src/main/java/de/kentoj/scrowlib/instancemanager/InstanceManager.java similarity index 100% rename from core-lib/src/main/java/de/kentoj/scrowlib/instancemanager/InstanceManager.java rename to core/common/src/main/java/de/kentoj/scrowlib/instancemanager/InstanceManager.java diff --git a/core-lib/src/main/java/de/kentoj/scrowlib/instancemanager/InstanceManagerImpl.java b/core/common/src/main/java/de/kentoj/scrowlib/instancemanager/InstanceManagerImpl.java similarity index 100% rename from core-lib/src/main/java/de/kentoj/scrowlib/instancemanager/InstanceManagerImpl.java rename to core/common/src/main/java/de/kentoj/scrowlib/instancemanager/InstanceManagerImpl.java diff --git a/core-lib/src/main/java/de/kentoj/scrowlib/instancemanager/ServerInstance.java b/core/common/src/main/java/de/kentoj/scrowlib/instancemanager/ServerInstance.java similarity index 100% rename from core-lib/src/main/java/de/kentoj/scrowlib/instancemanager/ServerInstance.java rename to core/common/src/main/java/de/kentoj/scrowlib/instancemanager/ServerInstance.java diff --git a/core-lib/src/main/java/de/kentoj/scrowlib/messaging/InMemoyMessageBroker.java b/core/common/src/main/java/de/kentoj/scrowlib/messaging/InMemoyMessageBroker.java similarity index 100% rename from core-lib/src/main/java/de/kentoj/scrowlib/messaging/InMemoyMessageBroker.java rename to core/common/src/main/java/de/kentoj/scrowlib/messaging/InMemoyMessageBroker.java diff --git a/core-lib/src/main/java/de/kentoj/scrowlib/messaging/MessageBroker.java b/core/common/src/main/java/de/kentoj/scrowlib/messaging/MessageBroker.java similarity index 100% rename from core-lib/src/main/java/de/kentoj/scrowlib/messaging/MessageBroker.java rename to core/common/src/main/java/de/kentoj/scrowlib/messaging/MessageBroker.java diff --git a/core-lib/src/main/java/de/kentoj/scrowlib/messaging/NatsMessageBroker.java b/core/common/src/main/java/de/kentoj/scrowlib/messaging/NatsMessageBroker.java similarity index 100% rename from core-lib/src/main/java/de/kentoj/scrowlib/messaging/NatsMessageBroker.java rename to core/common/src/main/java/de/kentoj/scrowlib/messaging/NatsMessageBroker.java diff --git a/core-lib/src/main/java/de/kentoj/scrowlib/messaging/RemoteException.java b/core/common/src/main/java/de/kentoj/scrowlib/messaging/RemoteException.java similarity index 100% rename from core-lib/src/main/java/de/kentoj/scrowlib/messaging/RemoteException.java rename to core/common/src/main/java/de/kentoj/scrowlib/messaging/RemoteException.java diff --git a/core-lib/src/main/java/de/kentoj/scrowlib/messaging/RequestHandler.java b/core/common/src/main/java/de/kentoj/scrowlib/messaging/RequestHandler.java similarity index 100% rename from core-lib/src/main/java/de/kentoj/scrowlib/messaging/RequestHandler.java rename to core/common/src/main/java/de/kentoj/scrowlib/messaging/RequestHandler.java diff --git a/core-lib/src/main/java/de/kentoj/scrowlib/messaging/ResultRepository.java b/core/common/src/main/java/de/kentoj/scrowlib/messaging/ResultRepository.java similarity index 100% rename from core-lib/src/main/java/de/kentoj/scrowlib/messaging/ResultRepository.java rename to core/common/src/main/java/de/kentoj/scrowlib/messaging/ResultRepository.java diff --git a/core-lib/src/main/java/de/kentoj/scrowlib/messaging/SyncRequestHandler.java b/core/common/src/main/java/de/kentoj/scrowlib/messaging/SyncRequestHandler.java similarity index 100% rename from core-lib/src/main/java/de/kentoj/scrowlib/messaging/SyncRequestHandler.java rename to core/common/src/main/java/de/kentoj/scrowlib/messaging/SyncRequestHandler.java diff --git a/core-lib/src/main/java/de/kentoj/scrowlib/player/NetworkPlayer.java b/core/common/src/main/java/de/kentoj/scrowlib/player/NetworkPlayer.java similarity index 100% rename from core-lib/src/main/java/de/kentoj/scrowlib/player/NetworkPlayer.java rename to core/common/src/main/java/de/kentoj/scrowlib/player/NetworkPlayer.java diff --git a/core-lib/src/main/java/de/kentoj/scrowlib/player/NetworkPlayerFactory.java b/core/common/src/main/java/de/kentoj/scrowlib/player/NetworkPlayerFactory.java similarity index 100% rename from core-lib/src/main/java/de/kentoj/scrowlib/player/NetworkPlayerFactory.java rename to core/common/src/main/java/de/kentoj/scrowlib/player/NetworkPlayerFactory.java diff --git a/core-lib/src/main/java/de/kentoj/scrowlib/player/NetworkPlayerImpl.java b/core/common/src/main/java/de/kentoj/scrowlib/player/NetworkPlayerImpl.java similarity index 100% rename from core-lib/src/main/java/de/kentoj/scrowlib/player/NetworkPlayerImpl.java rename to core/common/src/main/java/de/kentoj/scrowlib/player/NetworkPlayerImpl.java diff --git a/core-lib/src/main/java/de/kentoj/scrowlib/player/PlayerPrefixProvider.java b/core/common/src/main/java/de/kentoj/scrowlib/player/PlayerPrefixProvider.java similarity index 100% rename from core-lib/src/main/java/de/kentoj/scrowlib/player/PlayerPrefixProvider.java rename to core/common/src/main/java/de/kentoj/scrowlib/player/PlayerPrefixProvider.java diff --git a/core-lib/src/main/java/de/kentoj/scrowlib/utils/ComponentUtils.java b/core/common/src/main/java/de/kentoj/scrowlib/utils/ComponentUtils.java similarity index 100% rename from core-lib/src/main/java/de/kentoj/scrowlib/utils/ComponentUtils.java rename to core/common/src/main/java/de/kentoj/scrowlib/utils/ComponentUtils.java diff --git a/core-lib/src/main/java/de/kentoj/scrowlib/utils/DocumentRepository.java b/core/common/src/main/java/de/kentoj/scrowlib/utils/DocumentRepository.java similarity index 100% rename from core-lib/src/main/java/de/kentoj/scrowlib/utils/DocumentRepository.java rename to core/common/src/main/java/de/kentoj/scrowlib/utils/DocumentRepository.java diff --git a/core-lib/src/main/java/de/kentoj/scrowlib/utils/EnvUtils.java b/core/common/src/main/java/de/kentoj/scrowlib/utils/EnvUtils.java similarity index 100% rename from core-lib/src/main/java/de/kentoj/scrowlib/utils/EnvUtils.java rename to core/common/src/main/java/de/kentoj/scrowlib/utils/EnvUtils.java diff --git a/core-velocity/BUILD b/core/velocity/BUILD similarity index 83% rename from core-velocity/BUILD rename to core/velocity/BUILD index 31c4a85..573188f 100644 --- a/core-velocity/BUILD +++ b/core/velocity/BUILD @@ -4,15 +4,15 @@ load("@rules_java//java:java_binary.bzl", "java_binary") java_library( name = "api", - srcs = glob(["api/main/**/*.java"]), + srcs = glob(["api/main/java/**/*.java"]), visibility = ["//visibility:public"], deps = [ - "//core-lib:core", + "//core/common", artifact("com.velocitypowered:velocity-api"), artifact("de.kentoj.scrow:kencommandapi-velocity"), ], exports = [ - "//core-lib:core", + "//core/common", artifact("de.kentoj.scrow:kencommandapi-velocity"), artifact("org.mongodb:bson"), ], @@ -20,7 +20,7 @@ java_library( java_binary( name = "plugin", - srcs = glob(["plugin/main/**/*.java"]), + srcs = glob(["plugin/main/java/**/*.java"]), create_executable = False, deps = [ ":api", 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 similarity index 100% rename from core-velocity/api/main/java/de/kentoj/scrow/velocity/ScrowAPI.java rename to core/velocity/api/main/java/de/kentoj/scrow/velocity/ScrowAPI.java 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 similarity index 100% rename from core-velocity/plugin/main/java/de/kentoj/scrow/corevelocity/CoreVelocityPlugin.java rename to core/velocity/plugin/main/java/de/kentoj/scrow/corevelocity/CoreVelocityPlugin.java 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 similarity index 100% rename from core-velocity/plugin/main/java/de/kentoj/scrow/corevelocity/ScrowAPISurface.java rename to core/velocity/plugin/main/java/de/kentoj/scrow/corevelocity/ScrowAPISurface.java 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 similarity index 100% rename from core-velocity/plugin/main/java/de/kentoj/scrow/corevelocity/misc/OnlineCommand.java rename to core/velocity/plugin/main/java/de/kentoj/scrow/corevelocity/misc/OnlineCommand.java 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 similarity index 100% rename from core-velocity/plugin/main/java/de/kentoj/scrow/corevelocity/network/FriendNotifications.java rename to core/velocity/plugin/main/java/de/kentoj/scrow/corevelocity/network/FriendNotifications.java 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 similarity index 100% rename from core-velocity/plugin/main/java/de/kentoj/scrow/corevelocity/network/SendPlayerWatchdog.java rename to core/velocity/plugin/main/java/de/kentoj/scrow/corevelocity/network/SendPlayerWatchdog.java 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 similarity index 100% rename from core-velocity/plugin/main/java/de/kentoj/scrow/corevelocity/network/ServerRegisterWatchdog.java rename to core/velocity/plugin/main/java/de/kentoj/scrow/corevelocity/network/ServerRegisterWatchdog.java 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 similarity index 100% rename from core-velocity/plugin/main/java/de/kentoj/scrow/corevelocity/privmsg/LastTargetCache.java rename to core/velocity/plugin/main/java/de/kentoj/scrow/corevelocity/privmsg/LastTargetCache.java 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 similarity index 100% rename from core-velocity/plugin/main/java/de/kentoj/scrow/corevelocity/privmsg/MsgCommand.java rename to core/velocity/plugin/main/java/de/kentoj/scrow/corevelocity/privmsg/MsgCommand.java 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 similarity index 100% rename from core-velocity/plugin/main/java/de/kentoj/scrow/corevelocity/privmsg/PrivMsgHandler.java rename to core/velocity/plugin/main/java/de/kentoj/scrow/corevelocity/privmsg/PrivMsgHandler.java 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 similarity index 100% rename from core-velocity/plugin/main/java/de/kentoj/scrow/corevelocity/privmsg/ReplyCommand.java rename to core/velocity/plugin/main/java/de/kentoj/scrow/corevelocity/privmsg/ReplyCommand.java diff --git a/dev-server/BUILD b/dev-server/BUILD index 1106d4e..7bd8000 100644 --- a/dev-server/BUILD +++ b/dev-server/BUILD @@ -9,7 +9,7 @@ dev_server( ":viabackwards", ], local_plugins = [ - "//core-bukkit:plugin", + "//core/bukkit:plugin", ], ) diff --git a/minigame/BUILD b/minigame/BUILD new file mode 100644 index 0000000..e69de29 diff --git a/minigame/crowwars/BUILD b/minigame/crowwars/BUILD new file mode 100644 index 0000000..9517fc4 --- /dev/null +++ b/minigame/crowwars/BUILD @@ -0,0 +1,22 @@ +load("@rules_jvm_external//:defs.bzl", "artifact") +load("@rules_java//java:java_binary.bzl", "java_binary") + +java_binary( + name = "_plugin", + srcs = glob(["main/java/**/*.java"]), + create_executable = False, + resources = glob(["main/resources/**"]), + resource_strip_prefix = "minigame/crowwars/main/resources", + deps = [ + "//core/bukkit:api", + artifact("io.papermc.paper:paper-api"), + ], +) + +genrule( + name = "plugin", + srcs = [":_plugin_deploy.jar"], + outs = ["plugin.jar"], + cmd = "cp $< $@", + visibility = ["//visibility:public"], +) \ No newline at end of file diff --git a/minigame/crowwars/README.md b/minigame/crowwars/README.md new file mode 100644 index 0000000..3f3c172 --- /dev/null +++ b/minigame/crowwars/README.md @@ -0,0 +1,20 @@ +# phases + +## Lobby + +players can select a kit + +## teleport phase + +player's are teleported to the arena +wait 3s to not overwhelm players. + +## no-pvp + +for 10s, pvp is disabled. +players can loot chests etc. + +## pvp + +players die until only one is left. +the last wins. \ No newline at end of file diff --git a/minigame/crowwars/main/java/site/lab0x13/scrow/crowwars/CrowWarsPlugin.java b/minigame/crowwars/main/java/site/lab0x13/scrow/crowwars/CrowWarsPlugin.java new file mode 100644 index 0000000..e2a81da --- /dev/null +++ b/minigame/crowwars/main/java/site/lab0x13/scrow/crowwars/CrowWarsPlugin.java @@ -0,0 +1,11 @@ +package site.lab0x13.scrow.crowwars; + +import org.bukkit.plugin.java.JavaPlugin; + +public final class CrowWarsPlugin extends JavaPlugin { + + @Override + public void onEnable() { + + } +} \ No newline at end of file diff --git a/minigame/crowwars/main/java/site/lab0x13/scrow/crowwars/config/Config.java b/minigame/crowwars/main/java/site/lab0x13/scrow/crowwars/config/Config.java new file mode 100644 index 0000000..ac84015 --- /dev/null +++ b/minigame/crowwars/main/java/site/lab0x13/scrow/crowwars/config/Config.java @@ -0,0 +1,10 @@ +package site.lab0x13.scrow.crowwars.config; + +import org.bukkit.inventory.ItemStack; +import site.lab0x13.scrow.crowwars.loot.Pool; + +public record Config( + Pool rareLootPool, + Pool commonLootPool +) { +} diff --git a/minigame/crowwars/main/java/site/lab0x13/scrow/crowwars/jumppad/JumpPad.java b/minigame/crowwars/main/java/site/lab0x13/scrow/crowwars/jumppad/JumpPad.java new file mode 100644 index 0000000..7dd7147 --- /dev/null +++ b/minigame/crowwars/main/java/site/lab0x13/scrow/crowwars/jumppad/JumpPad.java @@ -0,0 +1,8 @@ +package site.lab0x13.scrow.crowwars.jumppad; + +import de.kentoj.scrow.bukkit.region.Region; + +public record JumpPad( + Region region +) { +} diff --git a/minigame/crowwars/main/java/site/lab0x13/scrow/crowwars/jumppad/JumpPadListener.java b/minigame/crowwars/main/java/site/lab0x13/scrow/crowwars/jumppad/JumpPadListener.java new file mode 100644 index 0000000..4c253cf --- /dev/null +++ b/minigame/crowwars/main/java/site/lab0x13/scrow/crowwars/jumppad/JumpPadListener.java @@ -0,0 +1,12 @@ +package site.lab0x13.scrow.crowwars.jumppad; + +import com.destroystokyo.paper.event.player.PlayerJumpEvent; +import org.bukkit.event.EventHandler; +import org.bukkit.event.Listener; + +public class JumpPadListener implements Listener { + + @EventHandler(ignoreCancelled = true) + public void onPlayerJump(PlayerJumpEvent event) { + } +} diff --git a/minigame/crowwars/main/java/site/lab0x13/scrow/crowwars/jumppad/JumpPadRegistry.java b/minigame/crowwars/main/java/site/lab0x13/scrow/crowwars/jumppad/JumpPadRegistry.java new file mode 100644 index 0000000..f2070eb --- /dev/null +++ b/minigame/crowwars/main/java/site/lab0x13/scrow/crowwars/jumppad/JumpPadRegistry.java @@ -0,0 +1,12 @@ +package site.lab0x13.scrow.crowwars.jumppad; + +import java.util.List; + +public class JumpPadRegistry { + + private final List jumppads; + + public JumpPadRegistry(List jumppads) { + this.jumppads = jumppads; + } +} diff --git a/minigame/crowwars/main/java/site/lab0x13/scrow/crowwars/loot/LootTable.java b/minigame/crowwars/main/java/site/lab0x13/scrow/crowwars/loot/LootTable.java new file mode 100644 index 0000000..149bc5d --- /dev/null +++ b/minigame/crowwars/main/java/site/lab0x13/scrow/crowwars/loot/LootTable.java @@ -0,0 +1,26 @@ +package site.lab0x13.scrow.crowwars.loot; + +import org.bukkit.inventory.ItemStack; + +import java.util.ArrayList; +import java.util.List; +import java.util.random.RandomGenerator; + +public class LootTable { + + private final Pool> poolPool; + + public LootTable(Weighted>[] pools) { + this.poolPool = new Pool<>(pools); + } + + public List generate(RandomGenerator random, int size) { + var result = new ArrayList(); + for (int i = 0; i < size; i++) { + var pool = poolPool.pick(random); + var selectedItem = pool.value().pick(random).value(); + result.add(selectedItem); + } + return result; + } +} diff --git a/minigame/crowwars/main/java/site/lab0x13/scrow/crowwars/loot/Pool.java b/minigame/crowwars/main/java/site/lab0x13/scrow/crowwars/loot/Pool.java new file mode 100644 index 0000000..99386c3 --- /dev/null +++ b/minigame/crowwars/main/java/site/lab0x13/scrow/crowwars/loot/Pool.java @@ -0,0 +1,32 @@ +package site.lab0x13.scrow.crowwars.loot; + +import java.util.Arrays; +import java.util.random.RandomGenerator; + +public class Pool { + + private final Weighted[] entries; + + public Pool(Weighted[] entries) { + this.entries = entries; + } + + public Weighted pick(RandomGenerator random) { + /* + * weighted random algorithm. + * https://dev.to/jacktt/understanding-the-weighted-random-algorithm-581p + */ + int totalWeight = Arrays.stream(entries) + .mapToInt(Weighted::weight) + .sum(); + int cursor = 0; + var rand = random.nextInt(totalWeight); + for (Weighted ent : entries) { + cursor += ent.weight(); + if (rand < cursor) + return ent; + } + + throw new RuntimeException("this should not be reached"); + } +} diff --git a/minigame/crowwars/main/java/site/lab0x13/scrow/crowwars/loot/PoolEntry.java b/minigame/crowwars/main/java/site/lab0x13/scrow/crowwars/loot/PoolEntry.java new file mode 100644 index 0000000..47c4fca --- /dev/null +++ b/minigame/crowwars/main/java/site/lab0x13/scrow/crowwars/loot/PoolEntry.java @@ -0,0 +1,34 @@ +package site.lab0x13.scrow.crowwars.loot; + +import org.bukkit.inventory.ItemStack; + +import java.util.random.RandomGenerator; + +import static com.google.common.base.Preconditions.checkArgument; + +public final class PoolEntry { + + private final ItemStack itemStack; + private final int weight; + private final int minAmount, maxAmount; + + public PoolEntry(ItemStack itemStack, int weight, int minAmount, int maxAmount) { + checkArgument(weight > 0, "weight must be > 0"); + checkArgument(minAmount <= 0, "minAmount must be > 0"); + checkArgument(maxAmount > minAmount, "maxAmount must be >= minAmount"); + this.itemStack = itemStack.clone(); + this.weight = weight; + this.minAmount = minAmount; + this.maxAmount = maxAmount; + } + + public int weight() { + return weight; + } + + public ItemStack create(RandomGenerator random) { + var i = itemStack.clone(); + i.setAmount(random.nextInt(minAmount, maxAmount + 1)); + return i; + } +} diff --git a/minigame/crowwars/main/java/site/lab0x13/scrow/crowwars/loot/Weighted.java b/minigame/crowwars/main/java/site/lab0x13/scrow/crowwars/loot/Weighted.java new file mode 100644 index 0000000..a8fc804 --- /dev/null +++ b/minigame/crowwars/main/java/site/lab0x13/scrow/crowwars/loot/Weighted.java @@ -0,0 +1,8 @@ +package site.lab0x13.scrow.crowwars.loot; + +public interface Weighted { + + int weight(); + + T value(); +} diff --git a/minigame/crowwars/main/resources/plugin.yml b/minigame/crowwars/main/resources/plugin.yml new file mode 100644 index 0000000..a0aa26a --- /dev/null +++ b/minigame/crowwars/main/resources/plugin.yml @@ -0,0 +1,6 @@ +name: "CrowWars" +version: "0" +depend: [ "CoreBukkit" ] +main: "site.lab0x13.scrow.crowwars.CrowWarsPlugin" +api-version: "1.21" +author: "Kento2" \ No newline at end of file