spdis/voxy
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Final attempt at fixing ingest lighting

Browse Source
This commit is contained in:
mcrcortex
2025-06-24 00:12:38 +10:00
parent 155eb75b82
commit 355a63c46f
1 changed files with 28 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files

45
src/main/java/me/cortex/voxy/common/world/service/VoxelIngestService.java
View File

@@ -16,6 +16,7 @@ import net.minecraft.world.chunk.Chunk;
import net.minecraft.world.chunk.ChunkNibbleArray; import net.minecraft.world.chunk.ChunkNibbleArray;
import net.minecraft.world.chunk.ChunkSection; import net.minecraft.world.chunk.ChunkSection;
import net.minecraft.world.chunk.WorldChunk; import net.minecraft.world.chunk.WorldChunk;
import net.minecraft.world.chunk.light.LightStorage;
import org.jetbrains.annotations.NotNull; import org.jetbrains.annotations.NotNull;
import java.util.concurrent.ConcurrentLinkedDeque; import java.util.concurrent.ConcurrentLinkedDeque;
@@ -93,8 +94,7 @@ public class VoxelIngestService {
throw new IllegalStateException("Tried inserting chunk into WorldEngine that was not alive"); throw new IllegalStateException("Tried inserting chunk into WorldEngine that was not alive");
} }
var lightingProvider = chunk.getWorld().getLightingProvider(); var lightingProvider = chunk.getWorld().getLightingProvider();
var blp = lightingProvider.get(LightType.BLOCK); boolean gotLighting = false;
var slp = lightingProvider.get(LightType.SKY);
int i = chunk.getBottomSectionCoord() - 1; int i = chunk.getBottomSectionCoord() - 1;
for (var section : chunk.getSectionArray()) { for (var section : chunk.getSectionArray()) {
@@ -102,25 +102,40 @@ public class VoxelIngestService {
if (section == null || !shouldIngestSection(section, chunk.getPos().x, i, chunk.getPos().z)) continue; if (section == null || !shouldIngestSection(section, chunk.getPos().x, i, chunk.getPos().z)) continue;
//if (section.isEmpty()) continue; //if (section.isEmpty()) continue;
var pos = ChunkSectionPos.from(chunk.getPos(), i); var pos = ChunkSectionPos.from(chunk.getPos(), i);
var bl = blp.getLightSection(pos); if (lightingProvider.getStatus(LightType.SKY, pos) != LightStorage.Status.LIGHT_AND_DATA || lightingProvider.getStatus(LightType.BLOCK, pos) != LightStorage.Status.LIGHT_AND_DATA)
boolean blNull = bl == null; continue;
if (!(bl == null || bl.isUninitialized())) { gotLighting = true;
bl = bl.copy();
} else {
bl = null;
} }
if (!gotLighting) {
return;
}
var blp = lightingProvider.get(LightType.BLOCK);
var slp = lightingProvider.get(LightType.SKY);
i = chunk.getBottomSectionCoord() - 1;
for (var section : chunk.getSectionArray()) {
i++;
if (section == null || !shouldIngestSection(section, chunk.getPos().x, i, chunk.getPos().z)) continue;
//if (section.isEmpty()) continue;
var pos = ChunkSectionPos.from(chunk.getPos(), i);
var bl = blp.getLightSection(pos);
if (bl != null) {
bl = bl.copy();
}
var sl = slp.getLightSection(pos); var sl = slp.getLightSection(pos);
boolean slNull = sl == null; if (sl != null) {
if (!(sl == null || sl.isUninitialized())) {
sl = sl.copy(); sl = sl.copy();
} else {
sl = null;
} }
//If its null for either, assume failure to obtain lighting and ignore section //If its null for either, assume failure to obtain lighting and ignore section
if (blNull || slNull) { //if (blNone && slNone) {
continue; // continue;
} //}
this.ingestQueue.add(new IngestSection(chunk.getPos().x, i, chunk.getPos().z, engine, section, bl, sl)); this.ingestQueue.add(new IngestSection(chunk.getPos().x, i, chunk.getPos().z, engine, section, bl, sl));
try { try {