From e9cd803e99457cd7fd5a615dbd1038d40be7f349 Mon Sep 17 00:00:00 2001
From: kento2 <kento@placeq.com>
Date: Sun, 28 Jun 2026 21:01:09 +0200
Subject: [PATCH] .

---
 .idea/workspace.xml                           | 100 +++++++++++++-----
 .../java/de/kentoj/scrow/bukkit/ScrowAPI.java |   7 +-
 .../scrow/bukkit/region/RegionManager.java    |  39 +------
 .../bukkit/region/event/RegionJoinEvent.java  |   1 -
 .../kentoj/scrow/bukkit/ScrowAPISurface.java  |   2 +
 .../bukkit/region/RegionManagerImpl.java      |  45 ++++++++
 .../scrow/bukkit/region/RegionTask.java       |   6 +-
 7 files changed, 134 insertions(+), 66 deletions(-)
 create mode 100644 core-bukkit-impl/src/main/java/de/kentoj/scrow/bukkit/region/RegionManagerImpl.java

diff --git a/.idea/workspace.xml b/.idea/workspace.xml
index affa795..a4fe9da 100644
--- a/.idea/workspace.xml
+++ b/.idea/workspace.xml
@@ -4,27 +4,14 @@
     <option name="autoReloadType" value="SELECTIVE" />
   </component>
   <component name="ChangeListManager">
-    <list default="true" id="56c685a1-f609-4ffd-a951-849beb2a7f8d" name="Changes" comment="">
-      <change afterPath="$PROJECT_DIR$/core-bukkit-api/src/main/java/de/kentoj/scrow/bukkit/region/ChunkPos.java" afterDir="false" />
-      <change afterPath="$PROJECT_DIR$/core-bukkit-api/src/main/java/de/kentoj/scrow/bukkit/region/Range.java" afterDir="false" />
-      <change afterPath="$PROJECT_DIR$/core-bukkit-api/src/main/java/de/kentoj/scrow/bukkit/region/RegionManager.java" afterDir="false" />
-      <change afterPath="$PROJECT_DIR$/core-bukkit-api/src/main/java/de/kentoj/scrow/bukkit/region/event/RegionEvent.java" afterDir="false" />
-      <change afterPath="$PROJECT_DIR$/core-bukkit-api/src/main/java/de/kentoj/scrow/bukkit/region/event/RegionJoinEvent.java" afterDir="false" />
-      <change afterPath="$PROJECT_DIR$/core-bukkit-api/src/main/java/de/kentoj/scrow/bukkit/region/event/RegionLeaveEvent.java" afterDir="false" />
-      <change afterPath="$PROJECT_DIR$/core-bukkit-api/src/main/java/de/kentoj/scrow/bukkit/region/impl/AbstractRegion.java" afterDir="false" />
-      <change afterPath="$PROJECT_DIR$/core-bukkit-api/src/main/java/de/kentoj/scrow/bukkit/region/impl/CuboidRegion.java" afterDir="false" />
-      <change afterPath="$PROJECT_DIR$/core-bukkit-api/src/main/java/de/kentoj/scrow/bukkit/region/impl/CylinderRegion.java" afterDir="false" />
-      <change afterPath="$PROJECT_DIR$/core-bukkit-api/src/main/java/de/kentoj/scrow/bukkit/region/impl/MergedRegion.java" afterDir="false" />
-      <change afterPath="$PROJECT_DIR$/core-bukkit-api/src/main/java/de/kentoj/scrow/bukkit/region/impl/Region.java" afterDir="false" />
-      <change afterPath="$PROJECT_DIR$/core-bukkit-impl/src/main/java/de/kentoj/scrow/bukkit/region/RegionPlayerTracker.java" afterDir="false" />
-      <change afterPath="$PROJECT_DIR$/core-bukkit-impl/src/main/java/de/kentoj/scrow/bukkit/region/RegionTask.java" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/.idea/gradle.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/gradle.xml" afterDir="false" />
+    <list default="true" id="56c685a1-f609-4ffd-a951-849beb2a7f8d" name="Changes" comment=".">
+      <change afterPath="$PROJECT_DIR$/core-bukkit-impl/src/main/java/de/kentoj/scrow/bukkit/region/RegionManagerImpl.java" afterDir="false" />
       <change beforePath="$PROJECT_DIR$/.idea/workspace.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/workspace.xml" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/build.gradle.kts" beforeDir="false" afterPath="$PROJECT_DIR$/build.gradle.kts" afterDir="false" />
       <change beforePath="$PROJECT_DIR$/core-bukkit-api/src/main/java/de/kentoj/scrow/bukkit/ScrowAPI.java" beforeDir="false" afterPath="$PROJECT_DIR$/core-bukkit-api/src/main/java/de/kentoj/scrow/bukkit/ScrowAPI.java" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/core-bukkit-impl/src/main/java/de/kentoj/scrow/bukkit/CoreImplPlugin.java" beforeDir="false" afterPath="$PROJECT_DIR$/core-bukkit-impl/src/main/java/de/kentoj/scrow/bukkit/CoreImplPlugin.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/core-bukkit-api/src/main/java/de/kentoj/scrow/bukkit/region/RegionManager.java" beforeDir="false" afterPath="$PROJECT_DIR$/core-bukkit-api/src/main/java/de/kentoj/scrow/bukkit/region/RegionManager.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/core-bukkit-api/src/main/java/de/kentoj/scrow/bukkit/region/event/RegionJoinEvent.java" beforeDir="false" afterPath="$PROJECT_DIR$/core-bukkit-api/src/main/java/de/kentoj/scrow/bukkit/region/event/RegionJoinEvent.java" afterDir="false" />
       <change beforePath="$PROJECT_DIR$/core-bukkit-impl/src/main/java/de/kentoj/scrow/bukkit/ScrowAPISurface.java" beforeDir="false" afterPath="$PROJECT_DIR$/core-bukkit-impl/src/main/java/de/kentoj/scrow/bukkit/ScrowAPISurface.java" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/core-lib/build.gradle.kts" beforeDir="false" afterPath="$PROJECT_DIR$/core-lib/build.gradle.kts" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/core-bukkit-impl/src/main/java/de/kentoj/scrow/bukkit/region/RegionTask.java" beforeDir="false" afterPath="$PROJECT_DIR$/core-bukkit-impl/src/main/java/de/kentoj/scrow/bukkit/region/RegionTask.java" afterDir="false" />
     </list>
     <option name="SHOW_DIALOG" value="false" />
     <option name="HIGHLIGHT_CONFLICTS" value="true" />
@@ -70,22 +57,14 @@
                 <item name="" type="6a2764b6:ExternalProjectsStructure$RootNode" />
                 <item name="core" type="f1a62948:ProjectNode" />
                 <item name="core" type="2d1252cf:ModuleNode" />
-                <item name="core-bukkit-api" type="2d1252cf:ModuleNode" />
-              </path>
-              <path>
-                <item name="" type="6a2764b6:ExternalProjectsStructure$RootNode" />
-                <item name="core" type="f1a62948:ProjectNode" />
-                <item name="core" type="2d1252cf:ModuleNode" />
-                <item name="core-bukkit-api" type="2d1252cf:ModuleNode" />
                 <item name="Tasks" type="e4a08cd1:TasksNode" />
               </path>
               <path>
                 <item name="" type="6a2764b6:ExternalProjectsStructure$RootNode" />
                 <item name="core" type="f1a62948:ProjectNode" />
                 <item name="core" type="2d1252cf:ModuleNode" />
-                <item name="core-bukkit-api" type="2d1252cf:ModuleNode" />
                 <item name="Tasks" type="e4a08cd1:TasksNode" />
-                <item name="publishing" type="c8890929:TasksNode$1" />
+                <item name="build" type="c8890929:TasksNode$1" />
               </path>
               <path>
                 <item name="" type="6a2764b6:ExternalProjectsStructure$RootNode" />
@@ -120,6 +99,7 @@
       <list>
         <option value="Kotlin Class" />
         <option value="Class" />
+        <option value="Interface" />
       </list>
     </option>
   </component>
@@ -145,6 +125,8 @@
     "Gradle.core [build].executor": "Run",
     "Gradle.core [clean].executor": "Run",
     "Gradle.core [publishAllPublicationsToScrowRepository].executor": "Run",
+    "Gradle.core:core-bukkit-api [build].executor": "Run",
+    "Gradle.core:core-bukkit-api [clean].executor": "Run",
     "ModuleVcsDetector.initialDetectionPerformed": "true",
     "RunOnceActivity.ShowReadmeOnStart": "true",
     "RunOnceActivity.TerminalTabsStorage.copyFrom.TerminalArrangementManager.252": "true",
@@ -162,6 +144,9 @@
     <key name="MoveFile.RECENT_KEYS">
       <recent name="$PROJECT_DIR$/build-logic/gradle" />
     </key>
+    <key name="ExtractSuperBase.RECENT_KEYS">
+      <recent name="de.kentoj.scrow.bukkit.region" />
+    </key>
     <key name="CopyClassDialog.RECENTS_KEY">
       <recent name="de.kentoj.scrow.bukkit.region.event" />
     </key>
@@ -238,6 +223,50 @@
       <RunAsTest>false</RunAsTest>
       <method v="2" />
     </configuration>
+    <configuration name="core:core-bukkit-api [build]" type="GradleRunConfiguration" factoryName="Gradle" temporary="true">
+      <ExternalSystemSettings>
+        <option name="executionName" />
+        <option name="externalProjectPath" value="$PROJECT_DIR$/core-bukkit-api" />
+        <option name="externalSystemIdString" value="GRADLE" />
+        <option name="scriptParameters" />
+        <option name="taskDescriptions">
+          <list />
+        </option>
+        <option name="taskNames">
+          <list>
+            <option value="build" />
+          </list>
+        </option>
+        <option name="vmOptions" />
+      </ExternalSystemSettings>
+      <ExternalSystemDebugServerProcess>true</ExternalSystemDebugServerProcess>
+      <ExternalSystemReattachDebugProcess>true</ExternalSystemReattachDebugProcess>
+      <DebugAllEnabled>false</DebugAllEnabled>
+      <RunAsTest>false</RunAsTest>
+      <method v="2" />
+    </configuration>
+    <configuration name="core:core-bukkit-api [clean]" type="GradleRunConfiguration" factoryName="Gradle" temporary="true">
+      <ExternalSystemSettings>
+        <option name="executionName" />
+        <option name="externalProjectPath" value="$PROJECT_DIR$/core-bukkit-api" />
+        <option name="externalSystemIdString" value="GRADLE" />
+        <option name="scriptParameters" />
+        <option name="taskDescriptions">
+          <list />
+        </option>
+        <option name="taskNames">
+          <list>
+            <option value="clean" />
+          </list>
+        </option>
+        <option name="vmOptions" />
+      </ExternalSystemSettings>
+      <ExternalSystemDebugServerProcess>true</ExternalSystemDebugServerProcess>
+      <ExternalSystemReattachDebugProcess>true</ExternalSystemReattachDebugProcess>
+      <DebugAllEnabled>false</DebugAllEnabled>
+      <RunAsTest>false</RunAsTest>
+      <method v="2" />
+    </configuration>
     <configuration default="true" type="JetRunConfigurationType">
       <module name="kotlin.scripts.KotlinSettingsScript.build-logic:settings.gradle.kts" />
       <method v="2">
@@ -252,8 +281,10 @@
     <recent_temporary>
       <list>
         <item itemvalue="Gradle.core [build]" />
-        <item itemvalue="Gradle.core [publishAllPublicationsToScrowRepository]" />
         <item itemvalue="Gradle.core [clean]" />
+        <item itemvalue="Gradle.core:core-bukkit-api [build]" />
+        <item itemvalue="Gradle.core:core-bukkit-api [clean]" />
+        <item itemvalue="Gradle.core [publishAllPublicationsToScrowRepository]" />
       </list>
     </recent_temporary>
   </component>
@@ -265,6 +296,19 @@
       <option name="presentableId" value="Default" />
       <updated>1782581947132</updated>
     </task>
+    <task id="LOCAL-00001" summary=".">
+      <option name="closed" value="true" />
+      <created>1782666067624</created>
+      <option name="number" value="00001" />
+      <option name="presentableId" value="LOCAL-00001" />
+      <option name="project" value="LOCAL" />
+      <updated>1782666067624</updated>
+    </task>
+    <option name="localTasksCounter" value="2" />
     <servers />
   </component>
+  <component name="VcsManagerConfiguration">
+    <MESSAGE value="." />
+    <option name="LAST_COMMIT_MESSAGE" value="." />
+  </component>
 </project>
\ No newline at end of file
diff --git a/core-bukkit-api/src/main/java/de/kentoj/scrow/bukkit/ScrowAPI.java b/core-bukkit-api/src/main/java/de/kentoj/scrow/bukkit/ScrowAPI.java
index bad5d00..775f6fd 100644
--- a/core-bukkit-api/src/main/java/de/kentoj/scrow/bukkit/ScrowAPI.java
+++ b/core-bukkit-api/src/main/java/de/kentoj/scrow/bukkit/ScrowAPI.java
@@ -32,7 +32,7 @@ public class ScrowAPI {
     @Getter
     private static ServerManager serverManager;
     @Getter
-    private static final RegionManager regionManager = new RegionManager();
+    private static RegionManager regionManager;
     @Getter
     private static final BukkitKenCommandApi commandApi = new BukkitKenCommandApi();
 
@@ -70,5 +70,10 @@ public class ScrowAPI {
     public static void setDbConFactory(@Nullable DatabaseConnectionFactory dbConFactory) {
         ScrowAPI.dbConFactory = dbConFactory;
     }
+
+    @ApiStatus.Internal
+    public static void setRegionManager(RegionManager regionManager) {
+        ScrowAPI.regionManager = regionManager;
+    }
 }
 
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 95a9c83..ed3ee25 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
@@ -2,41 +2,12 @@ package de.kentoj.scrow.bukkit.region;
 
 import de.kentoj.scrow.bukkit.region.impl.Region;
 
-import java.util.*;
+import java.util.List;
 
-public class RegionManager {
+public interface RegionManager {
+    List<Region> getRegions(ChunkPos chunkPos);
 
-    private final Map<Long, List<UUID>> chunkIndex = new HashMap<>();
-    private final Map<UUID, Region> regions = new HashMap<>();
+    void registerRegion(Region region);
 
-    public List<Region> getRegions(ChunkPos chunkPos) {
-        long key = toKey(chunkPos.getX(), chunkPos.getZ());
-        var uuids = chunkIndex.get(key);
-        if (uuids == null) return Collections.emptyList();
-        return uuids.stream().map(regions::get).toList();
-    }
-
-    public void registerRegion(Region region) {
-        for (ChunkPos chunkPos : region.getChunks()) {
-            var key = toKey(chunkPos.getX(), chunkPos.getZ());
-            chunkIndex.computeIfAbsent(key, __ -> new ArrayList<>())
-                    .add(region.getUuid());
-        }
-        regions.put(region.getUuid(), region);
-    }
-
-    public void unregisterRegion(Region region) {
-        for (ChunkPos chunkPos : region.getChunks()) {
-            var key = toKey(chunkPos.getX(), chunkPos.getZ());
-            var list = chunkIndex.get(key);
-            if (list == null) return;
-            list.remove(region.getUuid());
-        }
-        regions.remove(region.getUuid());
-    }
-
-    public long toKey(int x, int z) {
-        // chatgpt
-        return (((long) x) << 32) ^ (z & 0xffffffffL);
-    }
+    void unregisterRegion(Region region);
 }
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 8356425..d724628 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
@@ -3,7 +3,6 @@ package de.kentoj.scrow.bukkit.region.event;
 import de.kentoj.scrow.bukkit.region.impl.Region;
 import lombok.Getter;
 import lombok.Setter;
-import org.bukkit.entity.LivingEntity;
 import org.bukkit.entity.Player;
 import org.bukkit.event.Cancellable;
 import org.bukkit.event.HandlerList;
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 648a1e7..fc35278 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
@@ -7,6 +7,7 @@ import de.kentoj.scrow.bukkit.friends.friendship.InMemoryFriendshipService;
 import de.kentoj.scrow.bukkit.friends.friendship.PostgresFriendshipService;
 import de.kentoj.scrow.bukkit.friends.request.InMemoryFriendRequestService;
 import de.kentoj.scrow.bukkit.friends.request.PostgresFriendRequestService;
+import de.kentoj.scrow.bukkit.region.RegionManagerImpl;
 import de.kentoj.scrowlib.connection.DatabaseConnectionFactoryImpl;
 import de.kentoj.scrowlib.servermanager.ServerManagerImpl;
 import io.nats.client.Nats;
@@ -45,6 +46,7 @@ public class ScrowAPISurface {
             ScrowAPI.setDbConFactory(new DatabaseConnectionFactoryImpl(factory));
         }
 
+        ScrowAPI.setRegionManager(new RegionManagerImpl());
         ScrowAPI.setServerManager(new ServerManagerImpl(ScrowAPI.getNats()));
         ScrowAPI.setEconomyService(ScrowAPI.getDbConFactory() != null ?
                 new PostgresEconomyService(ScrowAPI.getDbConFactory()) : new InMemoryEconomyService());
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/region/RegionManagerImpl.java
new file mode 100644
index 0000000..189f956
--- /dev/null
+++ b/core-bukkit-impl/src/main/java/de/kentoj/scrow/bukkit/region/RegionManagerImpl.java
@@ -0,0 +1,45 @@
+package de.kentoj.scrow.bukkit.region;
+
+import de.kentoj.scrow.bukkit.region.impl.Region;
+
+import java.util.*;
+
+public class RegionManagerImpl implements RegionManager {
+
+    private final Map<Long, List<UUID>> chunkIndex = new HashMap<>();
+    private final Map<UUID, Region> regions = new HashMap<>();
+
+    @Override
+    public List<Region> getRegions(ChunkPos chunkPos) {
+        long key = toKey(chunkPos.getX(), chunkPos.getZ());
+        var uuids = chunkIndex.get(key);
+        if (uuids == null) return Collections.emptyList();
+        return uuids.stream().map(regions::get).toList();
+    }
+
+    @Override
+    public void registerRegion(Region region) {
+        for (ChunkPos chunkPos : region.getChunks()) {
+            var key = toKey(chunkPos.getX(), chunkPos.getZ());
+            chunkIndex.computeIfAbsent(key, __ -> new ArrayList<>())
+                    .add(region.getUuid());
+        }
+        regions.put(region.getUuid(), region);
+    }
+
+    @Override
+    public void unregisterRegion(Region region) {
+        for (ChunkPos chunkPos : region.getChunks()) {
+            var key = toKey(chunkPos.getX(), chunkPos.getZ());
+            var list = chunkIndex.get(key);
+            if (list == null) return;
+            list.remove(region.getUuid());
+        }
+        regions.remove(region.getUuid());
+    }
+
+    public long toKey(int x, int z) {
+        // chatgpt
+        return (((long) x) << 32) ^ (z & 0xffffffffL);
+    }
+}
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/region/RegionTask.java
index 3a228cf..57ddbea 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/region/RegionTask.java
@@ -16,14 +16,16 @@ public class RegionTask extends BukkitRunnable {
     @Override
     public void run() {
         for (var player : Bukkit.getOnlinePlayers()) {
-            var regions = ScrowAPI.getRegionManager().getRegions(ChunkPos.fromChunk(player.getLocation().getChunk()));
+            var regions = ScrowAPI.getREGION_MANAGER_IMPL().getRegions(ChunkPos.fromChunk(player.getLocation().getChunk()));
+            Bukkit.broadcastMessage(player.getName() + " is near " + regions.size() + " regions");
             for (Region region : regions) {
                 var tracked = playerTracker.isInRegion(region, player);
                 var inside = region.isInRegion(player.getLocation());
                 if (!tracked && inside) {
                     var ev = new RegionJoinEvent(region, player);
                     Bukkit.getPluginManager().callEvent(ev);
-                    if (!ev.isCancelled()) playerTracker.registerInRegion(region, player);
+                    if (!ev.isCancelled())
+                        playerTracker.registerInRegion(region, player);
                 } else if (tracked && !inside) {
                     var ev = new RegionLeaveEvent(region, player);
                     Bukkit.getPluginManager().callEvent(ev);