wisplite/distant-horizons-sharded
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

refactoring

Browse Source
This commit is contained in:
James Seibel
2023-03-14 21:43:35 -05:00
parent d952e5400b
commit cabcbef34b
3 changed files with 35 additions and 25 deletions
Download Patch File Download Diff File Expand all files Collapse all files
common/src/main/java/com/seibel/lod/common/wrappers/worldGeneration/BatchGenerationEnvironment.java
+10 -10
View File
@@ -450,12 +450,12 @@ public final class BatchGenerationEnvironment extends AbstractBatchGenerationEnv
}
}
public void generateDirect(GenerationEvent genEvent, ArrayGridList<ChunkAccess> subRange,
public void generateDirect(GenerationEvent genEvent, ArrayGridList<ChunkAccess> chunksToGenerate,
EGenerationStep step, LightedWorldGenRegion region)
{
try
{
subRange.forEach((chunk) ->
chunksToGenerate.forEach((chunk) ->
{
if (chunk instanceof ProtoChunk)
{
@@ -472,7 +472,7 @@ public final class BatchGenerationEnvironment extends AbstractBatchGenerationEnv
}
genEvent.timer.nextEvent("structStart");
stepStructureStart.generateGroup(genEvent.threadedParam, region, subRange);
stepStructureStart.generateGroup(genEvent.threadedParam, region, chunksToGenerate);
genEvent.refreshTimeout();
if (step == EGenerationStep.StructureStart)
{
@@ -480,7 +480,7 @@ public final class BatchGenerationEnvironment extends AbstractBatchGenerationEnv
}
genEvent.timer.nextEvent("structRef");
stepStructureReference.generateGroup(genEvent.threadedParam, region, subRange);
stepStructureReference.generateGroup(genEvent.threadedParam, region, chunksToGenerate);
genEvent.refreshTimeout();
if (step == EGenerationStep.StructureReference)
{
@@ -488,7 +488,7 @@ public final class BatchGenerationEnvironment extends AbstractBatchGenerationEnv
}
genEvent.timer.nextEvent("biome");
stepBiomes.generateGroup(genEvent.threadedParam, region, subRange);
stepBiomes.generateGroup(genEvent.threadedParam, region, chunksToGenerate);
genEvent.refreshTimeout();
if (step == EGenerationStep.Biomes)
{
@@ -496,7 +496,7 @@ public final class BatchGenerationEnvironment extends AbstractBatchGenerationEnv
}
genEvent.timer.nextEvent("noise");
stepNoise.generateGroup(genEvent.threadedParam, region, subRange);
stepNoise.generateGroup(genEvent.threadedParam, region, chunksToGenerate);
genEvent.refreshTimeout();
if (step == EGenerationStep.Noise)
{
@@ -504,7 +504,7 @@ public final class BatchGenerationEnvironment extends AbstractBatchGenerationEnv
}
genEvent.timer.nextEvent("surface");
stepSurface.generateGroup(genEvent.threadedParam, region, subRange);
stepSurface.generateGroup(genEvent.threadedParam, region, chunksToGenerate);
genEvent.refreshTimeout();
if (step == EGenerationStep.Surface)
{
@@ -518,7 +518,7 @@ public final class BatchGenerationEnvironment extends AbstractBatchGenerationEnv
}
genEvent.timer.nextEvent("feature");
stepFeatures.generateGroup(genEvent.threadedParam, region, subRange);
stepFeatures.generateGroup(genEvent.threadedParam, region, chunksToGenerate);
genEvent.refreshTimeout();
}
finally
@@ -527,10 +527,10 @@ public final class BatchGenerationEnvironment extends AbstractBatchGenerationEnv
switch (region.lightMode)
{
case FANCY:
stepLight.generateGroup(region.getLightEngine(), subRange);
stepLight.generateGroup(region.getLightEngine(), chunksToGenerate);
break;
case FAST:
subRange.forEach((chunk) ->
chunksToGenerate.forEach((chunk) ->
{
if (chunk instanceof ProtoChunk)
{
common/src/main/java/com/seibel/lod/common/wrappers/worldGeneration/step/StepStructureStart.java
+24 -14
View File
@@ -19,21 +19,24 @@
package com.seibel.lod.common.wrappers.worldGeneration.step;
import java.lang.invoke.MethodHandles;
import java.util.ArrayList;
import java.util.List;
import com.seibel.lod.common.wrappers.worldGeneration.BatchGenerationEnvironment;
import com.seibel.lod.common.wrappers.worldGeneration.ThreadedParameters;
import com.seibel.lod.core.logging.DhLoggerBuilder;
import net.minecraft.server.level.WorldGenRegion;
import net.minecraft.world.level.chunk.ChunkAccess;
import net.minecraft.world.level.chunk.ChunkStatus;
import net.minecraft.world.level.chunk.ProtoChunk;
import org.apache.logging.log4j.Logger;
public final class StepStructureStart {
/**
*
*/
public final class StepStructureStart
{
private static final Logger LOGGER = DhLoggerBuilder.getLogger();
private final BatchGenerationEnvironment environment;
/**
@@ -57,14 +60,17 @@ public final class StepStructureStart {
}
public void generateGroup(ThreadedParameters tParams, WorldGenRegion worldGenRegion,
List<ChunkAccess> chunks) {
ArrayList<ChunkAccess> chunksToDo = new ArrayList<ChunkAccess>();
List<ChunkAccess> chunks)
{
ArrayList<ChunkAccess> chunksToDo = new ArrayList<>();
for (ChunkAccess chunk : chunks) {
if (chunk.getStatus().isOrAfter(STATUS)) continue;
((ProtoChunk) chunk).setStatus(STATUS);
chunksToDo.add(chunk);
for (ChunkAccess chunk : chunks)
{
if (!chunk.getStatus().isOrAfter(STATUS))
{
((ProtoChunk) chunk).setStatus(STATUS);
chunksToDo.add(chunk);
}
}
#if PRE_MC_1_19
@@ -72,7 +78,8 @@ public final class StepStructureStart {
#elif POST_MC_1_19
if (environment.params.worldGenSettings.generateStructures()) {
#endif
for (ChunkAccess chunk : chunksToDo) {
for (ChunkAccess chunk : chunksToDo)
{
// System.out.println("StepStructureStart: "+chunk.getPos());
#if PRE_MC_1_19
environment.params.generator.createStructures(environment.params.registry, tParams.structFeat, chunk, environment.params.structures,
@@ -82,9 +89,12 @@ public final class StepStructureStart {
environment.params.worldSeed);
#endif
#if POST_MC_1_18_1
try {
try
{
tParams.structCheck.onStructureLoad(chunk.getPos(), chunk.getAllStarts());
} catch (ArrayIndexOutOfBoundsException e) {
}
catch (ArrayIndexOutOfBoundsException firstEx)
{
// There's a rare issue with StructStart where it throws ArrayIndexOutOfBounds
// This means the structFeat is corrupted (For some reason) and I need to reset it.
// TODO: Figure out in the future why this happens even though I am using new structFeat - OLD
common/src/main/java/com/seibel/lod/common/wrappers/worldGeneration/step/StepSurface.java
+1 -1
View File
@@ -48,7 +48,7 @@ public final class StepSurface {
public void generateGroup(ThreadedParameters tParams, WorldGenRegion worldGenRegion,
List<ChunkAccess> chunks) {
ArrayList<ChunkAccess> chunksToDo = new ArrayList<ChunkAccess>();
ArrayList<ChunkAccess> chunksToDo = new ArrayList<>();
for (ChunkAccess chunk : chunks) {
if (chunk.getStatus().isOrAfter(STATUS)) continue;