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

Pregen test 2

Browse Source
This commit is contained in:
Leonardo
2021-11-03 20:02:15 +01:00
parent d8091ab62a
commit a314f0fe79
3 changed files with 4 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/main/java/com/seibel/lod/builders/worldGeneration/LodGenWorker.java
+1 -1
View File
@@ -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);
src/main/java/com/seibel/lod/objects/LodDimension.java
+1 -1
View File
@@ -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;
src/main/java/com/seibel/lod/proxy/ClientProxy.java
+2 -6
View File
@@ -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());