fix: refresh ClonedChunkSection biome data on cache hit (#1769)

Co-authored-by: Jason Mitchell <[email protected]>
This commit is contained in:
CaedisandJason Mitchell authored and GitHub committed 2026-05-27 16:45:29 -07:00
1 parent 5db2b248d7
commit d3cea1bfe4
8 files changed
+145 -32

No files matched your search

@@ -0,0 +1,21 @@
package com.gtnewhorizons.angelica.event;
import net.minecraftforge.eventbus.api.bus.EventBus;
import net.minecraftforge.eventbus.api.event.MutableEvent;
public final class ChunkBiomeDataChangedEvent extends MutableEvent {
public static final EventBus<ChunkBiomeDataChangedEvent> BUS = EventBus.create(ChunkBiomeDataChangedEvent.class);
private static final ChunkBiomeDataChangedEvent INSTANCE = new ChunkBiomeDataChangedEvent();
public int chunkX;
public int chunkZ;
public static void post(int chunkX, int chunkZ) {
if (!BUS.hasListeners()) return;
INSTANCE.chunkX = chunkX;
INSTANCE.chunkZ = chunkZ;
BUS.post(INSTANCE);
}
}
@@ -7,6 +7,8 @@ import com.gtnewhorizons.angelica.rendering.celeritas.api.IrisShaderProviderHold
import com.gtnewhorizons.angelica.rendering.celeritas.threading.ChunkTaskProvider;
import com.gtnewhorizons.angelica.rendering.celeritas.threading.ChunkTaskRegistry;
import com.gtnewhorizons.angelica.rendering.celeritas.world.cloned.ClonedChunkSectionCache;
import it.unimi.dsi.fastutil.longs.LongIterator;
import it.unimi.dsi.fastutil.longs.LongOpenHashSet;
import net.minecraft.client.Minecraft;
import net.minecraft.client.multiplayer.WorldClient;
import net.minecraft.client.renderer.texture.TextureAtlasSprite;
@@ -40,6 +42,7 @@ public class AngelicaRenderSectionManager extends RenderSectionManager {
private final WorldClient world;
private final ClonedChunkSectionCache sectionCache;
private final ChunkTaskProvider taskProvider;
private final LongOpenHashSet biomeRebuildColumns = new LongOpenHashSet();
public AngelicaRenderSectionManager(RenderPassConfiguration<?> configuration, WorldClient world, int renderDistance, CommandList commandList, int minSection, int maxSection, int requestedThreads, ChunkTaskProvider taskProvider) {
super(configuration, () -> new AngelicaChunkBuildContext(configuration, world), AngelicaChunkRenderer::new, renderDistance, commandList, minSection, maxSection, requestedThreads, true /* hasShadowPass = true for Iris */);
@@ -144,9 +147,35 @@ public class AngelicaRenderSectionManager extends RenderSectionManager {
this.sectionCache.invalidate(section.getChunkX(), section.getChunkY(), section.getChunkZ());
}
public void onBiomesChanged(int chunkX, int chunkZ) {
for (int dx = -1; dx <= 1; dx++) {
for (int dz = -1; dz <= 1; dz++) {
this.biomeRebuildColumns.add(PositionUtil.packChunk(chunkX + dx, chunkZ + dz));
}
}
}
private void flushBiomeRebuilds() {
if (this.biomeRebuildColumns.isEmpty()) {
return;
}
final int sectionCountY = this.world.getHeight() >> 4;
for (final LongIterator it = this.biomeRebuildColumns.iterator(); it.hasNext(); ) {
final long column = it.nextLong();
final int cx = PositionUtil.unpackChunkX(column);
final int cz = PositionUtil.unpackChunkZ(column);
for (int cy = 0; cy < sectionCountY; cy++) {
this.sectionCache.invalidate(cx, cy, cz);
this.scheduleRebuild(cx, cy, cz, false);
}
}
this.biomeRebuildColumns.clear();
}
@Override
public void updateChunks(boolean updateImmediately) {
this.sectionCache.cleanup();
this.flushBiomeRebuilds();
super.updateChunks(updateImmediately);
}
@@ -1,6 +1,7 @@
package com.gtnewhorizons.angelica.rendering.celeritas;
import com.gtnewhorizons.angelica.config.AngelicaConfig;
import com.gtnewhorizons.angelica.event.ChunkBiomeDataChangedEvent;
import com.gtnewhorizons.angelica.glsm.GLStateManager;
import com.gtnewhorizons.angelica.loading.AngelicaClientTweaker;
import org.embeddedt.embeddium.impl.gl.device.GLRenderDevice;
@@ -12,8 +13,16 @@ public class CeleritasSetup {
public static void ensureInitialized() {
if (!initialized && AngelicaConfig.enableCeleritas) {
GLRenderDevice.VANILLA_STATE_RESETTER = () -> GLStateManager.glBindBuffer(GL15.GL_ARRAY_BUFFER, 0);
ChunkBiomeDataChangedEvent.BUS.addListener(CeleritasSetup::onChunkBiomeDataChanged);
AngelicaClientTweaker.LOGGER.debug("Celeritas init");
initialized = true;
}
}
private static void onChunkBiomeDataChanged(ChunkBiomeDataChangedEvent event) {
final CeleritasWorldRenderer renderer = CeleritasWorldRenderer.getInstanceOrNull();
if (renderer != null && renderer.isActive()) {
renderer.getRenderSectionManager().onBiomesChanged(event.chunkX, event.chunkZ);
}
}
}
@@ -74,6 +74,10 @@ public class CeleritasWorldRenderer extends SimpleWorldRenderer<WorldClient, Ang
return instance;
}
public static CeleritasWorldRenderer getInstanceOrNull() {
return instance;
}
public AngelicaRenderSectionManager getRenderSectionManager() {
return this.renderSectionManager;
}
@@ -1,6 +1,5 @@
package com.gtnewhorizons.angelica.rendering.celeritas.world.cloned;
import com.falsepattern.endlessids.mixin.helpers.ChunkBiomeHook;
import com.gtnewhorizons.angelica.api.BlockLightProvider;
import com.gtnewhorizons.angelica.api.SectionLightData;
import com.gtnewhorizons.angelica.compat.ExtendedBlockStorageExt;
@@ -20,6 +19,7 @@ import net.minecraft.world.ChunkPosition;
import net.minecraft.world.EnumSkyBlock;
import net.minecraft.world.World;
import net.minecraft.world.biome.BiomeGenBase;
import net.minecraft.world.biome.WorldChunkManager;
import net.minecraft.world.chunk.Chunk;
import net.minecraft.world.chunk.NibbleArray;
import net.minecraft.world.chunk.storage.ExtendedBlockStorage;
@@ -62,50 +62,51 @@ public class ClonedChunkSection {
this.pos = pos;
this.data = new ExtendedBlockStorageExt(chunk, section);
final int bArrLength;
if (ModStatus.isEIDBiomeLoaded) {
bArrLength = ((ChunkBiomeHook) chunk).getBiomeShortArray().length;
} else {
bArrLength = chunk.getBiomeArray().length;
}
this.biomeData = new BiomeGenBase[bArrLength];
this.biomeData = new BiomeGenBase[16 * 16];
copyBlockEntities(chunk, pos);
// Fill biome data
for (int z = pos.getMinZ(); z <= pos.getMaxZ(); z++) {
for (int x = pos.getMinX(); x <= pos.getMaxX(); x++) {
this.biomeData[(x & 15) | ((z & 15) << 4)] = world.getBiomeGenForCoords(x, z);
}
}
fillBiomeData(chunk);
this.sectionLightData = BlockLightProvider.getInstance().prepareSectionData(chunk, pos.y);
}
private void fillBiomeData(Chunk chunk) {
final WorldChunkManager wcm = world.getWorldChunkManager();
for (int lz = 0; lz < 16; lz++) {
for (int lx = 0; lx < 16; lx++) {
this.biomeData[lx | (lz << 4)] = chunk.getBiomeGenForWorldCoords(lx, lz, wcm);
}
}
}
@SuppressWarnings("unchecked")
private void copyBlockEntities(Chunk chunk, ChunkSectionPos pos) {
this.tileEntities.clear();
final ConcurrentTileEntityMap map = ((IChunkTileEntityMapHolder) chunk).angelica$getConcurrentTEMap();
map.withReadLock(() -> {
map.readLock();
try {
final Object2ObjectOpenHashMap<ChunkPosition, TileEntity> delegate = map.getDelegate();
if (delegate.isEmpty()) return;
if (!delegate.isEmpty()) {
final int minY = pos.getMinY();
final int maxY = pos.getMaxY();
final int minY = pos.getMinY();
final int maxY = pos.getMaxY();
for (Object2ObjectMap.Entry<ChunkPosition, TileEntity> entry : Object2ObjectMaps.fastIterable(delegate)) {
final ChunkPosition tePos = entry.getKey();
if (tePos.chunkPosY < minY || tePos.chunkPosY > maxY) continue;
for (Object2ObjectMap.Entry<ChunkPosition, TileEntity> entry : Object2ObjectMaps.fastIterable(delegate)) {
final ChunkPosition tePos = entry.getKey();
if (tePos.chunkPosY < minY || tePos.chunkPosY > maxY) continue;
final TileEntity te = entry.getValue();
if (te != null && !te.isInvalid()) {
this.tileEntities.put(ChunkSectionPos.packLocal(tePos.chunkPosX & 15, tePos.chunkPosY & 15, tePos.chunkPosZ & 15), te);
final TileEntity te = entry.getValue();
if (te != null && !te.isInvalid()) {
this.tileEntities.put(ChunkSectionPos.packLocal(tePos.chunkPosX & 15, tePos.chunkPosY & 15, tePos.chunkPosZ & 15), te);
}
}
}
});
} finally {
map.readUnlock();
}
this.tileEntities.trim();
}
@@ -21,7 +21,13 @@ public class ClonedChunkSectionCache {
public synchronized void cleanup() {
this.time = getMonotonicTimeSource();
this.byPosition.values().removeIf(entry -> this.time > (entry.getLastUsedTimestamp() + MAX_CACHE_DURATION));
while (!this.byPosition.isEmpty()) {
final ClonedChunkSection oldest = this.byPosition.get(this.byPosition.firstLongKey());
if (this.time <= oldest.getLastUsedTimestamp() + MAX_CACHE_DURATION) {
break;
}
this.byPosition.removeFirst();
}
}
public synchronized ClonedChunkSection acquire(int x, int y, int z) {
@@ -32,18 +38,17 @@ public class ClonedChunkSectionCache {
while (this.byPosition.size() >= MAX_CACHE_SIZE) {
this.byPosition.removeFirst();
}
section = this.createSection(x, y, z);
section = this.createSection(key, x, y, z);
}
section.setLastUsedTimestamp(this.time);
return section;
}
private ClonedChunkSection createSection(int x, int y, int z) {
private ClonedChunkSection createSection(long key, int x, int y, int z) {
final ClonedChunkSection section = new ClonedChunkSection(this, this.world);
final ChunkSectionPos pos = ChunkSectionPos.from(x, y, z);
section.init(pos);
this.byPosition.putAndMoveToLast(pos.asLong(), section);
section.init(ChunkSectionPos.from(x, y, z));
this.byPosition.putAndMoveToLast(key, section);
return section;
}
@@ -42,6 +42,14 @@ public class ConcurrentTileEntityMap implements Map<ChunkPosition, TileEntity> {
}
}
public void readLock() {
lock.readLock().lock();
}
public void readUnlock() {
lock.readLock().unlock();
}
public void withWriteLock(Runnable action) {
lock.writeLock().lock();
try {