diff --git a/common/src/main/java/com/seibel/lod/common/wrappers/worldGeneration/ExperimentalGenerator.java b/common/src/main/java/com/seibel/lod/common/wrappers/worldGeneration/ExperimentalGenerator.java index 08e85e5ff..705faaec1 100644 --- a/common/src/main/java/com/seibel/lod/common/wrappers/worldGeneration/ExperimentalGenerator.java +++ b/common/src/main/java/com/seibel/lod/common/wrappers/worldGeneration/ExperimentalGenerator.java @@ -93,7 +93,7 @@ public class ExperimentalGenerator extends AbstractExperimentalWorldGeneratorWra // TODO: Make it so that lodDim allows feeding in a function to fast halt if // position generation is completed. - PosToGenerateContainer posToGenerate = lodDim.getPosToGenerate(estimatedSampleNeeded, playerPosX, playerPosZ); + PosToGenerateContainer posToGenerate = lodDim.getPosToGenerate(estimatedSampleNeeded, playerPosX, playerPosZ, priority); // Find the max number of iterations we need to go though. // We are checking one FarPos, and one NearPos per iterations. This ensure we @@ -172,7 +172,6 @@ public class ExperimentalGenerator extends AbstractExperimentalWorldGeneratorWra int chunkZ = LevelPosUtil.getChunkPos(detailLevel, posToGenerate.getNthPosZ(i, true)); int genSize = detailLevel > LodUtil.CHUNK_DETAIL_LEVEL ? 0 : generationGroupSize; if (generationGroup.tryAddPoint(chunkX, chunkZ, genSize, targetStep)) { - ClientApi.LOGGER.info("Added one NEAR event: "+genSize+"("+detailLevel+")"); toGenerate--; } if (toGenerate <= 0) @@ -192,7 +191,6 @@ public class ExperimentalGenerator extends AbstractExperimentalWorldGeneratorWra int chunkX = LevelPosUtil.getChunkPos(detailLevel, posToGenerate.getNthPosX(i, false)); int chunkZ = LevelPosUtil.getChunkPos(detailLevel, posToGenerate.getNthPosZ(i, false)); if (generationGroup.tryAddPoint(chunkX, chunkZ, generationGroupSizeFar, targetStep)) { - ClientApi.LOGGER.info("Added one FAR event: 0"); toGenerate--; } } @@ -205,11 +203,11 @@ public class ExperimentalGenerator extends AbstractExperimentalWorldGeneratorWra //Enable this for logging if (targetToGenerate != toGenerate) { if (toGenerate <= 0) { - ClientApi.LOGGER.info( + ClientApi.LOGGER.debug( "WorldGenerator: Sampled " + posToGenerate.getNumberOfPos() + " out of " + estimatedSampleNeeded + " points, started all targeted " + targetToGenerate + " generations."); } else { - ClientApi.LOGGER.info("WorldGenerator: Sampled " + posToGenerate.getNumberOfPos() + " out of " + ClientApi.LOGGER.debug("WorldGenerator: Sampled " + posToGenerate.getNumberOfPos() + " out of " + estimatedSampleNeeded + " points, started " + (targetToGenerate - toGenerate) + " out of targeted " + targetToGenerate + " generations."); } @@ -222,7 +220,7 @@ public class ExperimentalGenerator extends AbstractExperimentalWorldGeneratorWra // Ensure wee don't go to basically infinity if (estimatedSampleNeeded > 32768) estimatedSampleNeeded = 32768; - System.out.println("WorldGenerator: Increasing estimatedSampleNeeeded to " + estimatedSampleNeeded); + ClientApi.LOGGER.debug("WorldGenerator: Increasing estimatedSampleNeeeded to " + estimatedSampleNeeded); } else if (toGenerate <= 0 && positionGoneThough * 1.5 < posToGenerate.getNumberOfPos()) { // We haven't gone though half of them and it's already enough. @@ -231,7 +229,7 @@ public class ExperimentalGenerator extends AbstractExperimentalWorldGeneratorWra // Ensure we don't go to near zero. if (estimatedSampleNeeded < 4) estimatedSampleNeeded = 4; - System.out.println("WorldGenerator: Decreasing estimatedSampleNeeeded to " + estimatedSampleNeeded); + ClientApi.LOGGER.debug("WorldGenerator: Decreasing estimatedSampleNeeeded to " + estimatedSampleNeeded); } } diff --git a/common/src/main/java/com/seibel/lod/common/wrappers/worldGeneration/WorldGenerationStep.java b/common/src/main/java/com/seibel/lod/common/wrappers/worldGeneration/WorldGenerationStep.java index 91ddc0920..3b99cbb9b 100644 --- a/common/src/main/java/com/seibel/lod/common/wrappers/worldGeneration/WorldGenerationStep.java +++ b/common/src/main/java/com/seibel/lod/common/wrappers/worldGeneration/WorldGenerationStep.java @@ -432,12 +432,11 @@ public final class WorldGenerationStep { } public WorldGenerationStep(ServerLevel level, LodBuilder lodBuilder, LodDimension lodDim) { - System.out.println("================WORLD_GEN_STEP_INITING============="); + ClientApi.LOGGER.info("================WORLD_GEN_STEP_INITING============="); params = new GlobalParameters(level, lodBuilder, lodDim); } public final void generateLodFromList(GenerationEvent event) { - if (event.range!=0) System.out.println("Started event: "+event); event.pEvent.beginNano = System.nanoTime(); GridList referencedChunks; DistanceGenerationMode generationMode; diff --git a/core b/core index e71660eb4..1a5fd8734 160000 --- a/core +++ b/core @@ -1 +1 @@ -Subproject commit e71660eb4153cd27e070600b446eca6771b70369 +Subproject commit 1a5fd873463bb56af1fe8e93fe1081109f23cb8b