fix: farplayers tracking

Author: Mapacheee

src/main/java/me/mapacheee/extendedhorizons/fakechunks/farplayers/FarPlayerTrackingService.java

@@ -27,7 +27,6 @@ public final class FarPlayerTrackingService {
     private static final int FAR_ENTITY_ID_ALLOCATION_ATTEMPTS = 10_000;
     private static final double FAR_RADIUS_PADDING = 0.35d;
     private static final int CHUNK_SHIFT = 4;
-    private static final double CHUNK_SIZE = 1 << CHUNK_SHIFT;
 
     private final Container<EhConfig> configContainer;
     private final FarPlayerCacheService cacheService;
@@ -90,8 +89,8 @@ public void track(
                 continue;
             }
 
-            int stateChunkX = (int) (state.x() / CHUNK_SIZE);
-            int stateChunkZ = (int) (state.z() / CHUNK_SIZE);
+            int stateChunkX = (int) Math.floor(state.x()) >> CHUNK_SHIFT;
+            int stateChunkZ = (int) Math.floor(state.z()) >> CHUNK_SHIFT;
             int relChunkX = stateChunkX - viewerChunkX;
             int relChunkZ = stateChunkZ - viewerChunkZ;
             double distSq = (double) relChunkX * relChunkX + (double) relChunkZ * relChunkZ;

src/main/java/me/mapacheee/extendedhorizons/fakechunks/farplayers/cache/FarPlayerCacheService.java

@@ -12,6 +12,7 @@
 import net.minecraft.world.entity.EquipmentSlot;
 import net.minecraft.world.item.ItemStack;
 
+import java.time.Duration;
 import java.util.ArrayList;
 import java.util.Collection;
 import java.util.Collections;
@@ -25,8 +26,9 @@
 public final class FarPlayerCacheService {
 
     private static final int REGION_SIZE_BITS = 5;
-    private static final int REGION_SIZE = 1 << REGION_SIZE_BITS;
+    private static final int BLOCK_TO_CHUNK_SHIFT = 4;
     private static final int DEFAULT_MAX_ENTRIES = 500;
+    private static final int DEFAULT_TTL_SECONDS = 30;
 
     private final Container<EhConfig> configContainer;
     private volatile Cache<UUID, FarPlayerState> statesCache;
@@ -43,11 +45,14 @@ public FarPlayerCacheService(Container<EhConfig> configContainer) {
 
     public void rebuild() {
         int maxEntries = this.configContainer.get().farPlayerCacheEntries();
+        Duration ttl = Duration.ofSeconds(DEFAULT_TTL_SECONDS);
         this.statesCache = Caffeine.newBuilder()
             .maximumSize(maxEntries)
+            .expireAfterWrite(ttl)
             .build();
         this.equipmentCache = Caffeine.newBuilder()
             .maximumSize(maxEntries)
+            .expireAfterWrite(ttl)
             .build();
     }
 
@@ -59,8 +64,8 @@ public void updateState(UUID playerId, FarPlayerState state) {
         this.statesCache.put(playerId, state);
 
         UUID worldId = state.worldId();
-        int chunkX = (int) (state.x() / REGION_SIZE);
-        int chunkZ = (int) (state.z() / REGION_SIZE);
+        int chunkX = (int) Math.floor(state.x()) >> BLOCK_TO_CHUNK_SHIFT;
+        int chunkZ = (int) Math.floor(state.z()) >> BLOCK_TO_CHUNK_SHIFT;
         long regionKey = getRegionKey(chunkX, chunkZ);
 
         UUID prevWorld = this.playerLastWorld.get(playerId);