From a314f0fe79b04f82ebe608be5cab5415e1f4267a Mon Sep 17 00:00:00 2001 From: Leonardo Date: Wed, 3 Nov 2021 20:02:15 +0100 Subject: [PATCH] Pregen test 2 --- .../seibel/lod/builders/worldGeneration/LodGenWorker.java | 2 +- src/main/java/com/seibel/lod/objects/LodDimension.java | 2 +- src/main/java/com/seibel/lod/proxy/ClientProxy.java | 8 ++------ 3 files changed, 4 insertions(+), 8 deletions(-) diff --git a/src/main/java/com/seibel/lod/builders/worldGeneration/LodGenWorker.java b/src/main/java/com/seibel/lod/builders/worldGeneration/LodGenWorker.java index 58fefc5ea..1ed1ba005 100644 --- a/src/main/java/com/seibel/lod/builders/worldGeneration/LodGenWorker.java +++ b/src/main/java/com/seibel/lod/builders/worldGeneration/LodGenWorker.java @@ -192,7 +192,7 @@ public class LodGenWorker implements IWorker //else //{ IChunk loadedChunk = null; - if (lodDim.isChunkPreGenerated(pos.x, pos.z) && ClientProxy.pregen) + if (LodConfig.CLIENT.advancedModOptions.debugging.usePregen.get() && lodDim.isChunkPreGenerated(pos.x, pos.z)) { // generate a Lod like normal loadedChunk = ChunkLoader.getChunkFromFile(pos); diff --git a/src/main/java/com/seibel/lod/objects/LodDimension.java b/src/main/java/com/seibel/lod/objects/LodDimension.java index e3451b0bd..6cfb09273 100644 --- a/src/main/java/com/seibel/lod/objects/LodDimension.java +++ b/src/main/java/com/seibel/lod/objects/LodDimension.java @@ -603,7 +603,7 @@ public class LodDimension //if(lodRegion.isChunkPreGenerated(xChunkToCheck,zChunkToCheck)) // complexity = DistanceGenerationMode.SERVER.complexity; //else - if(ClientProxy.pregen) + if(LodConfig.CLIENT.advancedModOptions.debugging.usePregen.get() && isChunkPreGenerated(xChunkToCheck, zChunkToCheck)) complexity = DistanceGenerationMode.SERVER.complexity; else complexity = LodConfig.CLIENT.worldGenerator.distanceGenerationMode.get().complexity; diff --git a/src/main/java/com/seibel/lod/proxy/ClientProxy.java b/src/main/java/com/seibel/lod/proxy/ClientProxy.java index a66434edf..76fd78953 100644 --- a/src/main/java/com/seibel/lod/proxy/ClientProxy.java +++ b/src/main/java/com/seibel/lod/proxy/ClientProxy.java @@ -67,8 +67,6 @@ public class ClientProxy */ private boolean firstTimeSetupComplete = false; - public static boolean pregen = false; - private static final LodWorld lodWorld = new LodWorld(); private static final LodBuilder lodBuilder = new LodBuilder(); private static final LodBufferBuilder lodBufferBuilder = new LodBufferBuilder(); @@ -229,7 +227,6 @@ public class ClientProxy @SubscribeEvent public void worldLoadEvent(WorldEvent.Load event) { - pregen = false; DataPointUtil.worldHeight = event.getWorld().getHeight(); //LodNodeGenWorker.restartExecutorService(); //ThreadMapUtil.clearMaps(); @@ -245,7 +242,6 @@ public class ClientProxy @SubscribeEvent public void worldUnloadEvent(WorldEvent.Unload event) { - pregen = false; // the player just unloaded a world/dimension ThreadMapUtil.clearMaps(); @@ -309,9 +305,9 @@ public class ClientProxy if (LodConfig.CLIENT.advancedModOptions.debugging.enableDebugKeybindings.get() && event.getKey() == GLFW.GLFW_KEY_F7 && event.getAction() == GLFW.GLFW_PRESS) { - pregen = !pregen; + LodConfig.CLIENT.advancedModOptions.debugging.usePregen.set(!LodConfig.CLIENT.advancedModOptions.debugging.usePregen.get()); ClientPlayerEntity player = MinecraftWrapper.INSTANCE.getPlayer(); - if(pregen) + if(LodConfig.CLIENT.advancedModOptions.debugging.usePregen.get()) player.sendMessage(new StringTextComponent("pregen activated."),player.getUUID()); else player.sendMessage(new StringTextComponent("pregen de-activated."),player.getUUID());