Skip to content

[1.20] Fix chunk IO errors occurring when C2ME is installed (and async feature worldgen is enabled) #4883

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

Open
carbonatek wants to merge 2 commits into
base: 1.20.1
Choose a base branch
from
+10 −7
Open

[1.20] Fix chunk IO errors occurring when C2ME is installed (and async feature worldgen is enabled) #4883

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
8fc48bb
Fix indicators stopping world generation with C2ME installed
carbonatek May 28, 2026
d148829
Remove the "level" argument from createPlacer
carbonatek May 28, 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
6 changes: 3 additions & 3 deletions ...m/gregtechceu/gtceu/api/data/worldgen/generator/indicators/SurfaceIndicatorGenerator.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -141,12 +141,12 @@ public Map<ChunkPos, OreIndicatorPlacer> generate(WorldGenLevel level, RandomSou

return WorldGeneratorUtils.groupByChunks(positions).entrySet().stream()
.collect(Collectors.toMap(Map.Entry::getKey,
entry -> createPlacer(level, entry.getValue(), blockState)));
entry -> createPlacer(entry.getValue(), blockState)));
}

private OreIndicatorPlacer createPlacer(WorldGenLevel level, List<BlockPos> positionsWithoutY,
private OreIndicatorPlacer createPlacer(List<BlockPos> positionsWithoutY,
BlockState blockState) {
return (access) -> {
return (access, level) -> {
var positions = positionsWithoutY.stream()
.map(pos -> placement.resolver.apply(level, access, pos))
.filter(pos -> !level.isOutsideBuildHeight(pos))
Expand Down
3 changes: 2 additions & 1 deletion src/main/java/com/gregtechceu/gtceu/api/data/worldgen/ores/OreIndicatorPlacer.java
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,7 @@
package com.gregtechceu.gtceu.api.data.worldgen.ores;

import net.minecraft.MethodsReturnNonnullByDefault;
import net.minecraft.world.level.WorldGenLevel;
import net.minecraft.world.level.chunk.BulkSectionAccess;

import javax.annotation.ParametersAreNonnullByDefault;
Expand All @@ -10,5 +11,5 @@
@FunctionalInterface
public interface OreIndicatorPlacer {

void placeIndicators(BulkSectionAccess access);
void placeIndicators(BulkSectionAccess access, WorldGenLevel level);
}
8 changes: 5 additions & 3 deletions src/main/java/com/gregtechceu/gtceu/api/data/worldgen/ores/OrePlacer.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -54,7 +54,8 @@ public void placeOres(WorldGenLevel level, ChunkGenerator chunkGenerator, ChunkA

try (BulkSectionAccess access = new BulkSectionAccess(level)) {
generatedVeins.forEach(generatedVein -> placeVein(chunk.getPos(), random, access, generatedVein, null));
generatedIndicators.forEach(generatedIndicator -> placeIndicators(chunk, access, generatedIndicator));
generatedIndicators
.forEach(generatedIndicator -> placeIndicators(level, chunk, access, generatedIndicator));
}
}

Expand Down Expand Up @@ -87,10 +88,11 @@ private Map<SectionPos, Map<BlockPos, OreBlockPlacer>> resolvePlacerLists(ChunkP
Collectors.toMap(Map.Entry::getKey, Map.Entry::getValue)));
}

private void placeIndicators(ChunkAccess chunk, BulkSectionAccess access, GeneratedIndicators generatedVein) {
private void placeIndicators(WorldGenLevel level, ChunkAccess chunk, BulkSectionAccess access,
GeneratedIndicators generatedVein) {
if (!ConfigHolder.INSTANCE.worldgen.oreVeins.oreIndicators) return;
generatedVein.consumeIndicators(chunk.getPos()).forEach(placer -> {
placer.placeIndicators(access);
placer.placeIndicators(access, level);
});
}
}
Loading