Skip to content

Commit

Permalink
fix hang on load
Browse files Browse the repository at this point in the history
  • Loading branch information
sisby-folk committed Dec 24, 2024
1 parent 9199640 commit 883928e
Show file tree
Hide file tree
Showing 2 changed files with 9 additions and 2 deletions.
2 changes: 1 addition & 1 deletion gradle.properties
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@ authors=Hunternif, tyra314, Sisby folk
contributors=Kenkron, asiekierka, Haven King, TheCodeWarrior, osipxd, coolAlias, TehNut, lumiscosity, frodolon
license=LGPL-3.0-or-later
# Mod Version
baseVersion=2.10.0
baseVersion=2.10.1
# Branch Metadata
branch=1.20
tagBranch=1.20
Expand Down
9 changes: 8 additions & 1 deletion src/main/java/folk/sisby/antique_atlas/WorldAtlasData.java
Original file line number Diff line number Diff line change
Expand Up @@ -31,8 +31,10 @@
import java.util.Collection;
import java.util.Deque;
import java.util.HashMap;
import java.util.HashSet;
import java.util.Map;
import java.util.Random;
import java.util.Set;
import java.util.concurrent.ConcurrentHashMap;
import java.util.concurrent.ConcurrentLinkedDeque;

Expand All @@ -57,6 +59,7 @@ public static void onLoad(World world, WorldSummary summary, ClientPlayerEntity
private final Map<Landmark<?>, MarkerTexture> structureMarkers = new ConcurrentHashMap<>();

private final Rect tileScope = new Rect(0, 0, 0, 0);
private final Set<ChunkPos> terrainDequeHash = new HashSet<>();
private final Deque<ChunkPos> terrainDeque = new ConcurrentLinkedDeque<>();
boolean isFinished = false;

Expand All @@ -68,7 +71,10 @@ public static void onLoad(World world, WorldSummary summary, ClientPlayerEntity

public void onTerrainUpdated(World world, WorldTerrainSummary ignored2, Collection<ChunkPos> chunks) {
for (ChunkPos pos : chunks) {
if (!biomeTiles.containsKey(pos) && !terrainDeque.contains(pos)) terrainDeque.add(pos);
if (!biomeTiles.containsKey(pos) && !terrainDequeHash.contains(pos)) {
terrainDequeHash.add(pos);
terrainDeque.add(pos);
}
}
}

Expand All @@ -80,6 +86,7 @@ public void tick(World world) {
if (!BiomeTileProviders.getInstance().hasFallbacks()) return;
for (int i = 0; i < AntiqueAtlas.CONFIG.chunkTickLimit; i++) {
ChunkPos pos = terrainDeque.pollFirst();
terrainDequeHash.remove(pos);
if (pos == null) break;
Pair<TerrainTileProvider, TileElevation> tile = world.getRegistryKey() == World.NETHER ? TerrainTiling.terrainToTileNether(world, pos) : TerrainTiling.terrainToTile(world, pos);
if (tile != null) {
Expand Down

0 comments on commit 883928e

Please sign in to comment.