scrow/scrow-monorepo
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages 2 Wiki Activity Actions

.

Browse source
This commit is contained in:
kento2 2026-06-28 21:01:09 +02:00
parent 63a4f17a76
commit e9cd803e99
7 changed files with 134 additions and 66 deletions
Download patch file Download diff file Expand all files Collapse all files

100
.idea/workspace.xml generated
View file

@ -4,27 +4,14 @@
<option name="autoReloadType" value="SELECTIVE" /> <option name="autoReloadType" value="SELECTIVE" />
</component> </component>
<component name="ChangeListManager"> <component name="ChangeListManager">
<list default="true" id="56c685a1-f609-4ffd-a951-849beb2a7f8d" name="Changes" comment=""> <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-impl/src/main/java/de/kentoj/scrow/bukkit/region/RegionManagerImpl.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" />
<change beforePath="$PROJECT_DIR$/.idea/workspace.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/workspace.xml" 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-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-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> </list>
<option name="SHOW_DIALOG" value="false" /> <option name="SHOW_DIALOG" value="false" />
<option name="HIGHLIGHT_CONFLICTS" value="true" /> <option name="HIGHLIGHT_CONFLICTS" value="true" />
@ -70,22 +57,14 @@
<item name="" type="6a2764b6:ExternalProjectsStructure$RootNode" /> <item name="" type="6a2764b6:ExternalProjectsStructure$RootNode" />
<item name="core" type="f1a62948:ProjectNode" /> <item name="core" type="f1a62948:ProjectNode" />
<item name="core" type="2d1252cf:ModuleNode" /> <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" /> <item name="Tasks" type="e4a08cd1:TasksNode" />
</path> </path>
<path> <path>
<item name="" type="6a2764b6:ExternalProjectsStructure$RootNode" /> <item name="" type="6a2764b6:ExternalProjectsStructure$RootNode" />
<item name="core" type="f1a62948:ProjectNode" /> <item name="core" type="f1a62948:ProjectNode" />
<item name="core" type="2d1252cf:ModuleNode" /> <item name="core" type="2d1252cf:ModuleNode" />
<item name="core-bukkit-api" type="2d1252cf:ModuleNode" />
<item name="Tasks" type="e4a08cd1:TasksNode" /> <item name="Tasks" type="e4a08cd1:TasksNode" />
<item name="publishing" type="c8890929:TasksNode$1" /> <item name="build" type="c8890929:TasksNode$1" />
</path> </path>
<path> <path>
<item name="" type="6a2764b6:ExternalProjectsStructure$RootNode" /> <item name="" type="6a2764b6:ExternalProjectsStructure$RootNode" />
@ -120,6 +99,7 @@
<list> <list>
<option value="Kotlin Class" /> <option value="Kotlin Class" />
<option value="Class" /> <option value="Class" />
<option value="Interface" />
</list> </list>
</option> </option>
</component> </component>
@ -145,6 +125,8 @@
"Gradle.core [build].executor": "Run", "Gradle.core [build].executor": "Run",
"Gradle.core [clean].executor": "Run", "Gradle.core [clean].executor": "Run",
"Gradle.core [publishAllPublicationsToScrowRepository].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", "ModuleVcsDetector.initialDetectionPerformed": "true",
"RunOnceActivity.ShowReadmeOnStart": "true", "RunOnceActivity.ShowReadmeOnStart": "true",
"RunOnceActivity.TerminalTabsStorage.copyFrom.TerminalArrangementManager.252": "true", "RunOnceActivity.TerminalTabsStorage.copyFrom.TerminalArrangementManager.252": "true",
@ -162,6 +144,9 @@
<key name="MoveFile.RECENT_KEYS"> <key name="MoveFile.RECENT_KEYS">
<recent name="$PROJECT_DIR$/build-logic/gradle" /> <recent name="$PROJECT_DIR$/build-logic/gradle" />
</key> </key>
<key name="ExtractSuperBase.RECENT_KEYS">
<recent name="de.kentoj.scrow.bukkit.region" />
</key>
<key name="CopyClassDialog.RECENTS_KEY"> <key name="CopyClassDialog.RECENTS_KEY">
<recent name="de.kentoj.scrow.bukkit.region.event" /> <recent name="de.kentoj.scrow.bukkit.region.event" />
</key> </key>
@ -238,6 +223,50 @@
<RunAsTest>false</RunAsTest> <RunAsTest>false</RunAsTest>
<method v="2" /> <method v="2" />
</configuration> </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"> <configuration default="true" type="JetRunConfigurationType">
<module name="kotlin.scripts.KotlinSettingsScript.build-logic:settings.gradle.kts" /> <module name="kotlin.scripts.KotlinSettingsScript.build-logic:settings.gradle.kts" />
<method v="2"> <method v="2">
@ -252,8 +281,10 @@
<recent_temporary> <recent_temporary>
<list> <list>
<item itemvalue="Gradle.core [build]" /> <item itemvalue="Gradle.core [build]" />
<item itemvalue="Gradle.core [publishAllPublicationsToScrowRepository]" />
<item itemvalue="Gradle.core [clean]" /> <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> </list>
</recent_temporary> </recent_temporary>
</component> </component>
@ -265,6 +296,19 @@
<option name="presentableId" value="Default" /> <option name="presentableId" value="Default" />
<updated>1782581947132</updated> <updated>1782581947132</updated>
</task> </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 /> <servers />
</component> </component>
<component name="VcsManagerConfiguration">
<MESSAGE value="." />
<option name="LAST_COMMIT_MESSAGE" value="." />
</component>
</project> </project>

7
core-bukkit-api/src/main/java/de/kentoj/scrow/bukkit/ScrowAPI.java
View file

@ -32,7 +32,7 @@ public class ScrowAPI {
@Getter @Getter
private static ServerManager serverManager; private static ServerManager serverManager;
@Getter @Getter
private static final RegionManager regionManager = new RegionManager(); private static RegionManager regionManager;
@Getter @Getter
private static final BukkitKenCommandApi commandApi = new BukkitKenCommandApi(); private static final BukkitKenCommandApi commandApi = new BukkitKenCommandApi();
@ -70,5 +70,10 @@ public class ScrowAPI {
public static void setDbConFactory(@Nullable DatabaseConnectionFactory dbConFactory) { public static void setDbConFactory(@Nullable DatabaseConnectionFactory dbConFactory) {
ScrowAPI.dbConFactory = dbConFactory; ScrowAPI.dbConFactory = dbConFactory;
} }
@ApiStatus.Internal
public static void setRegionManager(RegionManager regionManager) {
ScrowAPI.regionManager = regionManager;
}
} }

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

@ -2,41 +2,12 @@ package de.kentoj.scrow.bukkit.region;
import de.kentoj.scrow.bukkit.region.impl.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<>(); void registerRegion(Region region);
private final Map<UUID, Region> regions = new HashMap<>();
public List<Region> getRegions(ChunkPos chunkPos) { void unregisterRegion(Region region);
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);
}
} }

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

@ -3,7 +3,6 @@ package de.kentoj.scrow.bukkit.region.event;
import de.kentoj.scrow.bukkit.region.impl.Region; import de.kentoj.scrow.bukkit.region.impl.Region;
import lombok.Getter; import lombok.Getter;
import lombok.Setter; import lombok.Setter;
import org.bukkit.entity.LivingEntity;
import org.bukkit.entity.Player; import org.bukkit.entity.Player;
import org.bukkit.event.Cancellable; import org.bukkit.event.Cancellable;
import org.bukkit.event.HandlerList; import org.bukkit.event.HandlerList;

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

@ -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.friendship.PostgresFriendshipService;
import de.kentoj.scrow.bukkit.friends.request.InMemoryFriendRequestService; import de.kentoj.scrow.bukkit.friends.request.InMemoryFriendRequestService;
import de.kentoj.scrow.bukkit.friends.request.PostgresFriendRequestService; 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.connection.DatabaseConnectionFactoryImpl;
import de.kentoj.scrowlib.servermanager.ServerManagerImpl; import de.kentoj.scrowlib.servermanager.ServerManagerImpl;
import io.nats.client.Nats; import io.nats.client.Nats;
@ -45,6 +46,7 @@ public class ScrowAPISurface {
ScrowAPI.setDbConFactory(new DatabaseConnectionFactoryImpl(factory)); ScrowAPI.setDbConFactory(new DatabaseConnectionFactoryImpl(factory));
} }
ScrowAPI.setRegionManager(new RegionManagerImpl());
ScrowAPI.setServerManager(new ServerManagerImpl(ScrowAPI.getNats())); ScrowAPI.setServerManager(new ServerManagerImpl(ScrowAPI.getNats()));
ScrowAPI.setEconomyService(ScrowAPI.getDbConFactory() != null ? ScrowAPI.setEconomyService(ScrowAPI.getDbConFactory() != null ?
new PostgresEconomyService(ScrowAPI.getDbConFactory()) : new InMemoryEconomyService()); new PostgresEconomyService(ScrowAPI.getDbConFactory()) : new InMemoryEconomyService());

45
core-bukkit-impl/src/main/java/de/kentoj/scrow/bukkit/region/RegionManagerImpl.java Normal file
View file

@ -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);
}
}

6
core-bukkit-impl/src/main/java/de/kentoj/scrow/bukkit/region/RegionTask.java
View file

@ -16,14 +16,16 @@ public class RegionTask extends BukkitRunnable {
@Override @Override
public void run() { public void run() {
for (var player : Bukkit.getOnlinePlayers()) { 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) { for (Region region : regions) {
var tracked = playerTracker.isInRegion(region, player); var tracked = playerTracker.isInRegion(region, player);
var inside = region.isInRegion(player.getLocation()); var inside = region.isInRegion(player.getLocation());
if (!tracked && inside) { if (!tracked && inside) {
var ev = new RegionJoinEvent(region, player); var ev = new RegionJoinEvent(region, player);
Bukkit.getPluginManager().callEvent(ev); Bukkit.getPluginManager().callEvent(ev);
if (!ev.isCancelled()) playerTracker.registerInRegion(region, player); if (!ev.isCancelled())
playerTracker.registerInRegion(region, player);
} else if (tracked && !inside) { } else if (tracked && !inside) {
var ev = new RegionLeaveEvent(region, player); var ev = new RegionLeaveEvent(region, player);
Bukkit.getPluginManager().callEvent(ev); Bukkit.getPluginManager().callEvent(ev);