From cabc470ebd2d64125105b535a17d8aa521b58042 Mon Sep 17 00:00:00 2001 From: James Seibel Date: Thu, 1 Aug 2024 07:44:46 -0500 Subject: [PATCH] Temporary Test removing world gen boarder chunks --- .../worldGeneration/BatchGenerationEnvironment.java | 9 ++++++--- .../common/wrappers/worldGeneration/GenerationEvent.java | 8 ++++---- 2 files changed, 10 insertions(+), 7 deletions(-) diff --git a/common/src/main/java/com/seibel/distanthorizons/common/wrappers/worldGeneration/BatchGenerationEnvironment.java b/common/src/main/java/com/seibel/distanthorizons/common/wrappers/worldGeneration/BatchGenerationEnvironment.java index 239854e92..bad9849df 100644 --- a/common/src/main/java/com/seibel/distanthorizons/common/wrappers/worldGeneration/BatchGenerationEnvironment.java +++ b/common/src/main/java/com/seibel/distanthorizons/common/wrappers/worldGeneration/BatchGenerationEnvironment.java @@ -254,7 +254,8 @@ public final class BatchGenerationEnvironment extends AbstractBatchGenerationEnv builder.put(EDhApiWorldGenerationStep.FEATURES, 0); builder.put(EDhApiWorldGenerationStep.LIGHT, 0); BorderNeeded = builder.build(); - MaxBorderNeeded = BorderNeeded.values().stream().mapToInt(Integer::intValue).max().getAsInt(); + MaxBorderNeeded = 0; + //MaxBorderNeeded = BorderNeeded.values().stream().mapToInt(Integer::intValue).max().getAsInt(); } public BatchGenerationEnvironment(IDhServerLevel serverlevel) @@ -388,7 +389,8 @@ public final class BatchGenerationEnvironment extends AbstractBatchGenerationEnv DummyLightEngine dummyLightEngine; LightGetterAdaptor adaptor; - int borderSize = MaxBorderNeeded; + //int borderSize = MaxBorderNeeded; // + int borderSize = 0; // int refSize = genEvent.size + borderSize * 2; int refPosX = genEvent.minPos.x - borderSize; int refPosZ = genEvent.minPos.z - borderSize; @@ -770,7 +772,8 @@ public final class BatchGenerationEnvironment extends AbstractBatchGenerationEnv } } private static ArrayGridList GetCutoutFrom(ArrayGridList total, int border) { return new ArrayGridList<>(total, border, total.gridSize - border); } - private static ArrayGridList GetCutoutFrom(ArrayGridList total, EDhApiWorldGenerationStep step) { return GetCutoutFrom(total, MaxBorderNeeded - BorderNeeded.get(step)); } + //private static ArrayGridList GetCutoutFrom(ArrayGridList total, EDhApiWorldGenerationStep step) { return GetCutoutFrom(total, MaxBorderNeeded - BorderNeeded.get(step)); } + private static ArrayGridList GetCutoutFrom(ArrayGridList total, EDhApiWorldGenerationStep step) { return GetCutoutFrom(total, 0); } @Override diff --git a/common/src/main/java/com/seibel/distanthorizons/common/wrappers/worldGeneration/GenerationEvent.java b/common/src/main/java/com/seibel/distanthorizons/common/wrappers/worldGeneration/GenerationEvent.java index 46df3f13e..991ec0088 100644 --- a/common/src/main/java/com/seibel/distanthorizons/common/wrappers/worldGeneration/GenerationEvent.java +++ b/common/src/main/java/com/seibel/distanthorizons/common/wrappers/worldGeneration/GenerationEvent.java @@ -73,10 +73,10 @@ public final class GenerationEvent EDhApiWorldGenerationStep target, Consumer resultConsumer, ExecutorService worldGeneratorThreadPool) { - if (size % 2 == 0) - { - size += 1; // size must be odd for vanilla world gen regions to work - } + //if (size % 2 == 0) + //{ + // size += 1; // size must be odd for vanilla world gen regions to work + //} GenerationEvent generationEvent = new GenerationEvent(minPos, size, genEnvironment, target, resultConsumer);