Skip to content

Commit

Permalink
Merge branch '1.21.3' into 1.21.4
Browse files Browse the repository at this point in the history 
# Conflicts:
#	settings.gradle.kts
  • Loading branch information
@rfresh2
rfresh2 committed Dec 18, 2024
2 parents d068e9b + 5586bf7 commit 8d8f820
Show file tree
Hide file tree
Showing 4 changed files with 127 additions and 42 deletions.
80 changes: 70 additions & 10 deletions common/src/main/java/xaeroplus/feature/render/highlights/ChunkHighlightBaseCacheHandler.java
View file
Original file line number Diff line number Diff line change
@@ -1,13 +1,23 @@
package xaeroplus.feature.render.highlights;

import it.unimi.dsi.fastutil.longs.*;
import it.unimi.dsi.fastutil.longs.Long2LongMap;
import it.unimi.dsi.fastutil.longs.Long2LongOpenHashMap;
import it.unimi.dsi.fastutil.longs.LongArrayList;
import it.unimi.dsi.fastutil.longs.LongList;
import net.minecraft.resources.ResourceKey;
import net.minecraft.world.level.Level;
import xaeroplus.XaeroPlus;
import xaeroplus.util.ChunkUtils;

import java.util.concurrent.TimeUnit;
import java.util.concurrent.locks.ReadWriteLock;
import java.util.concurrent.locks.StampedLock;

import static xaeroplus.util.ChunkUtils.chunkPosToLong;

public abstract class ChunkHighlightBaseCacheHandler implements ChunkHighlightCache {
public final Long2LongMap chunks = Long2LongMaps.synchronize(new Long2LongOpenHashMap());
public final ReadWriteLock lock = new StampedLock().asReadWriteLock();
public final Long2LongMap chunks = new Long2LongOpenHashMap();

@Override
public boolean addHighlight(final int x, final int z) {
Expand All @@ -16,14 +26,28 @@ public boolean addHighlight(final int x, final int z) {

public boolean addHighlight(final int x, final int z, final long foundTime) {
final long chunkPos = chunkPosToLong(x, z);
chunks.put(chunkPos, foundTime);
try {
if (lock.writeLock().tryLock(1, TimeUnit.SECONDS)) {
chunks.put(chunkPos, foundTime);
lock.writeLock().unlock();
}
} catch (final Exception e) {
XaeroPlus.LOGGER.error("Failed to add new highlight: {}, {}", x, z, e);
}
return true;
}

@Override
public boolean removeHighlight(final int x, final int z) {
final long chunkPos = chunkPosToLong(x, z);
chunks.remove(chunkPos);
try {
if (lock.writeLock().tryLock(1, TimeUnit.SECONDS)) {
chunks.remove(chunkPos);
lock.writeLock().unlock();
}
} catch (final Exception e) {
XaeroPlus.LOGGER.error("Failed to add new highlight: {}, {}", x, z, e);
}
return true;
}

Expand All @@ -34,11 +58,26 @@ public boolean isHighlighted(final int x, final int z, ResourceKey<Level> dimens

@Override
public LongList getHighlightsSnapshot(final ResourceKey<Level> dimension) {
return new LongArrayList(chunks.keySet());
try {
if (lock.readLock().tryLock(1, TimeUnit.SECONDS)) {
// copy is memory inefficient but we need a thread safe iterator for rendering
var list = new LongArrayList(chunks.keySet());
lock.readLock().unlock();
return list;
}
} catch (final Exception e) {
XaeroPlus.LOGGER.error("Error getting highlights snapshot in dimension: {}", dimension.location().getPath(), e);
}
return LongList.of();
}

public boolean isHighlighted(final long chunkPos) {
return chunks.containsKey(chunkPos);
try {
return chunks.containsKey(chunkPos);
} catch (final Exception e) {
XaeroPlus.LOGGER.error("Error checking if chunk is highlighted: {}, {}", ChunkUtils.longToChunkX(chunkPos), ChunkUtils.longToChunkZ(chunkPos), e);
}
return false;
}

@Override
Expand All @@ -49,15 +88,36 @@ public Long2LongMap getHighlightsState() {
@Override
public void loadPreviousState(final Long2LongMap state) {
if (state == null) return;
chunks.putAll(state);
try {
if (lock.writeLock().tryLock(1, TimeUnit.SECONDS)) {
chunks.putAll(state);
lock.writeLock().unlock();
}
} catch (final Exception e) {
XaeroPlus.LOGGER.error("Error loading previous highlight cache state", e);
}
}

public void replaceState(final Long2LongOpenHashMap state) {
chunks.clear();
chunks.putAll(state);
try {
if (lock.writeLock().tryLock(1, TimeUnit.SECONDS)) {
this.chunks.clear();
this.chunks.putAll(state);
lock.writeLock().unlock();
}
} catch (final Exception e) {
XaeroPlus.LOGGER.error("Failed replacing highlight cache state", e);
}
}

public void reset() {
chunks.clear();
try {
if (lock.writeLock().tryLock(1, TimeUnit.SECONDS)) {
chunks.clear();
lock.writeLock().unlock();
}
} catch (final Exception e) {
XaeroPlus.LOGGER.error("Failed resetting highlight cache", e);
}
}
}
76 changes: 48 additions & 28 deletions ...rc/main/java/xaeroplus/feature/render/highlights/ChunkHighlightCacheDimensionHandler.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -5,10 +5,12 @@
import net.minecraft.resources.ResourceKey;
import net.minecraft.world.level.Level;
import org.jetbrains.annotations.NotNull;
import xaeroplus.XaeroPlus;
import xaeroplus.util.ChunkUtils;

import java.util.ArrayList;
import java.util.List;
import java.util.concurrent.TimeUnit;

import static xaeroplus.util.ChunkUtils.chunkPosToLong;
import static xaeroplus.util.ChunkUtils.regionCoordToChunkCoord;
Expand Down Expand Up @@ -44,38 +46,51 @@ public void setWindow(int regionX, int regionZ, int regionSize) {

private void loadHighlightsInWindow() {
executorService.execute(() -> {
synchronized (this.chunks) {
database.getHighlightsInWindow(
final List<ChunkHighlightData> chunks = database.getHighlightsInWindow(
dimension,
windowRegionX - windowRegionSize, windowRegionX + windowRegionSize,
windowRegionZ - windowRegionSize, windowRegionZ + windowRegionSize,
(x, y, time) -> this.chunks.put(chunkPosToLong(x, y), time)
);
windowRegionZ - windowRegionSize, windowRegionZ + windowRegionSize
);
try {
if (lock.writeLock().tryLock(1, TimeUnit.SECONDS)) {
for (int i = 0; i < chunks.size(); i++) {
final ChunkHighlightData chunk = chunks.get(i);
this.chunks.put(chunkPosToLong(chunk.x(), chunk.z()), chunk.foundTime());
}
lock.writeLock().unlock();
}
} catch (final Exception e) {
XaeroPlus.LOGGER.error("Failed to load highlights in window for {} disk cache dimension: {}", database.databaseName, dimension.location(), e);
}
});
}

private void writeHighlightsOutsideWindowToDatabase() {
executorService.execute(() -> {
final List<ChunkHighlightData> chunksToWrite = new ArrayList<>();
var minChunkX = regionCoordToChunkCoord(windowRegionX - windowRegionSize);
var maxChunkX = regionCoordToChunkCoord(windowRegionX + windowRegionSize);
var minChunkZ = regionCoordToChunkCoord(windowRegionZ - windowRegionSize);
var maxChunkZ = regionCoordToChunkCoord(windowRegionZ + windowRegionSize);
synchronized (this.chunks) {
for (var it = chunks.long2LongEntrySet().iterator(); it.hasNext(); ) {
var entry = it.next();
final long chunkPos = entry.getLongKey();
final int chunkX = ChunkUtils.longToChunkX(chunkPos);
final int chunkZ = ChunkUtils.longToChunkZ(chunkPos);
if (chunkX < minChunkX
|| chunkX > maxChunkX
|| chunkZ < minChunkZ
|| chunkZ > maxChunkZ) {
chunksToWrite.add(new ChunkHighlightData(chunkX, chunkZ, entry.getLongValue()));
it.remove();
try {
if (lock.writeLock().tryLock(1L, TimeUnit.SECONDS)) {
var minChunkX = regionCoordToChunkCoord(windowRegionX - windowRegionSize);
var maxChunkX = regionCoordToChunkCoord(windowRegionX + windowRegionSize);
var minChunkZ = regionCoordToChunkCoord(windowRegionZ - windowRegionSize);
var maxChunkZ = regionCoordToChunkCoord(windowRegionZ + windowRegionSize);
for (var it = chunks.long2LongEntrySet().iterator(); it.hasNext(); ) {
var entry = it.next();
final long chunkPos = entry.getLongKey();
final int chunkX = ChunkUtils.longToChunkX(chunkPos);
final int chunkZ = ChunkUtils.longToChunkZ(chunkPos);
if (chunkX < minChunkX
|| chunkX > maxChunkX
|| chunkZ < minChunkZ
|| chunkZ > maxChunkZ) {
chunksToWrite.add(new ChunkHighlightData(chunkX, chunkZ, entry.getLongValue()));
it.remove();
}
}
lock.writeLock().unlock();
}
} catch (final Exception e) {
XaeroPlus.LOGGER.error("Error while writing highlights outside window to {} disk cache dimension: {}", database.databaseName, dimension.location(), e);
}
database.insertHighlightList(chunksToWrite, dimension);
});
Expand All @@ -84,14 +99,19 @@ private void writeHighlightsOutsideWindowToDatabase() {
public ListenableFuture<?> writeAllHighlightsToDatabase() {
return executorService.submit(() -> {
final List<ChunkHighlightData> chunksToWrite = new ArrayList<>(chunks.size());
synchronized (chunks) {
for (var it = chunks.long2LongEntrySet().iterator(); it.hasNext(); ) {
var entry = it.next();
final long chunkPos = entry.getLongKey();
final int chunkX = ChunkUtils.longToChunkX(chunkPos);
final int chunkZ = ChunkUtils.longToChunkZ(chunkPos);
chunksToWrite.add(new ChunkHighlightData(chunkX, chunkZ, entry.getLongValue()));
try {
if (lock.readLock().tryLock(1, TimeUnit.SECONDS)) {
for (var it = chunks.long2LongEntrySet().iterator(); it.hasNext(); ) {
var entry = it.next();
final long chunkPos = entry.getLongKey();
final int chunkX = ChunkUtils.longToChunkX(chunkPos);
final int chunkZ = ChunkUtils.longToChunkZ(chunkPos);
chunksToWrite.add(new ChunkHighlightData(chunkX, chunkZ, entry.getLongValue()));
}
lock.readLock().unlock();
}
} catch (final Exception e) {
XaeroPlus.LOGGER.error("Error while writing all chunks to {} disk cache dimension: {}", database.databaseName, dimension.location(), e);
}
database.insertHighlightList(chunksToWrite, dimension);
});
Expand Down
11 changes: 8 additions & 3 deletions common/src/main/java/xaeroplus/feature/render/highlights/ChunkHighlightLocalCache.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,7 @@
import xaeroplus.XaeroPlus;

import java.util.Map;
import java.util.concurrent.TimeUnit;

public class ChunkHighlightLocalCache extends ChunkHighlightBaseCacheHandler {
private static final int maxNumber = 5000;
Expand All @@ -25,15 +26,19 @@ public boolean addHighlight(final int x, final int z, final long foundTime) {
private void limitChunksSize() {
try {
if (chunks.size() > maxNumber) {
synchronized (chunks) {
if (lock.readLock().tryLock(1, TimeUnit.SECONDS)) {
// remove oldest 500 chunks
var toRemove = chunks.long2LongEntrySet().stream()
.sorted(Map.Entry.comparingByValue())
.limit(500)
.mapToLong(Long2LongMap.Entry::getLongKey)
.toArray();
for (int i = 0; i < toRemove.length; i++) {
chunks.remove(toRemove[i]);
lock.readLock().unlock();
if (lock.writeLock().tryLock(1, TimeUnit.SECONDS)) {
for (int i = 0; i < toRemove.length; i++) {
chunks.remove(toRemove[i]);
}
lock.writeLock().unlock();
}
}
}
Expand Down
2 changes: 1 addition & 1 deletion settings.gradle.kts
View file
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@ pluginManagement {
}
}
gradle.extra.apply {
set("mod_version", "2.24.8")
set("mod_version", "2.24.9")
set("minecraft_version", "1.21.4")
set("parchment_version", "2024.07.28")
set("worldmap_version_fabric", "1.39.2")
Expand Down

0 comments on commit 8d8f820

Please sign in to comment.