Skip to content

Reduce memory allocation pressure #66

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
UltraProdigy merged 2 commits into from
Aug 30, 2026
Merged

Reduce memory allocation pressure #66

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
9808428
Avoid chunk key allocations
boubou19 Aug 30, 2026
daaffe2
Avoid tile entity key allocations
boubou19 Aug 30, 2026
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
23 changes: 12 additions & 11 deletions src/main/java/com/hfstudio/guidenh/guide/scene/level/GuidebookLevel.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -36,12 +36,13 @@
import cpw.mods.fml.common.registry.GameRegistry;
import cpw.mods.fml.relauncher.Side;
import cpw.mods.fml.relauncher.SideOnly;
import it.unimi.dsi.fastutil.longs.Long2ObjectLinkedOpenHashMap;

public class GuidebookLevel implements IBlockAccess, GuidebookChunkSource {

private final LinkedHashMap<ChunkCoordIntPair, GuidebookChunk> chunks = new LinkedHashMap<>();
private final Long2ObjectLinkedOpenHashMap<GuidebookChunk> chunks = new Long2ObjectLinkedOpenHashMap<>();

private final HashMap<Long, TileEntity> tileEntities = new HashMap<>();
private final Long2ObjectLinkedOpenHashMap<TileEntity> tileEntities = new Long2ObjectLinkedOpenHashMap<>();
private final LinkedHashMap<Integer, Entity> entities = new LinkedHashMap<>();
private final LinkedHashMap<String, LinkedHashSet<Integer>> sceneEntityIds = new LinkedHashMap<>();
private final HashMap<Integer, String> entitySceneIds = new HashMap<>();
Expand Down Expand Up @@ -142,12 +143,12 @@ public void setBlock(int x, int y, int z, @Nullable Block block, int meta, @Null
if (y < 0 || y >= 256) return;

boolean isAir = block == null || block == Blocks.air;
var pair = new ChunkCoordIntPair(x >> 4, z >> 4);
GuidebookChunk chunk = chunks.get(pair);
long chunkKey = ChunkCoordIntPair.chunkXZ2Int(x >> 4, z >> 4);
GuidebookChunk chunk = chunks.get(chunkKey);
if (chunk == null) {
if (isAir) return;
chunk = new GuidebookChunk(x >> 4, z >> 4);
chunks.put(pair, chunk);
chunks.put(chunkKey, chunk);
}

chunk.setBlock(x, y, z, isAir ? null : block, meta);
Expand Down Expand Up @@ -199,14 +200,14 @@ public void restoreBlockFast(int x, int y, int z, @Nullable Block block, int met
}

boolean isAir = block == null || block == Blocks.air;
ChunkCoordIntPair pair = new ChunkCoordIntPair(x >> 4, z >> 4);
GuidebookChunk chunk = chunks.get(pair);
long chunkKey = ChunkCoordIntPair.chunkXZ2Int(x >> 4, z >> 4);
GuidebookChunk chunk = chunks.get(chunkKey);
if (chunk == null) {
if (isAir) {
return;
}
chunk = new GuidebookChunk(x >> 4, z >> 4);
chunks.put(pair, chunk);
chunks.put(chunkKey, chunk);
}

chunk.setBlock(x, y, z, isAir ? null : block, meta);
Expand Down Expand Up @@ -703,11 +704,11 @@ public GuidebookLevel withSampleChest() {
@Override
@Nullable
public GuidebookChunk getChunk(int chunkX, int chunkZ, boolean create) {
var pair = new ChunkCoordIntPair(chunkX, chunkZ);
var chunk = chunks.get(pair);
long chunkKey = ChunkCoordIntPair.chunkXZ2Int(chunkX, chunkZ);
var chunk = chunks.get(chunkKey);
if (chunk == null && create) {
chunk = new GuidebookChunk(chunkX, chunkZ);
chunks.put(pair, chunk);
chunks.put(chunkKey, chunk);
}
return chunk;
}
Expand Down