Disabled pre-gen loading for now + small fix

This commit is contained in:
Leonardo
2021-10-17 19:56:29 +02:00
parent e6949dcd14
commit 33d150b090
3 changed files with 11 additions and 8 deletions
@@ -185,8 +185,9 @@ public class LodNodeGenWorker implements IWorker
{
IChunk loadedChunk = null;
// long startTime = System.currentTimeMillis();
if(LodConfig.CLIENT.worldGenerator.alwaysLoadPregeneratedChunks.get())
loadedChunk = ChunkLoader.getChunkFromFile(pos);
//if(LodConfig.CLIENT.worldGenerator.alwaysLoadPregeneratedChunks.get())
// loadedChunk = ChunkLoader.getChunkFromFile(pos);
//loadedChunk = ChunkLoader.getChunkFromFile(pos);
if(loadedChunk == null)
{
switch (generationMode)
@@ -342,17 +342,16 @@ public class LodConfig
+ " Turning this on will make plains smoother since the tall grass won't be used. \n")
.define("Avoid Blocks With No Collision", true);
/*alwaysLoadPregeneratedChunks = builder
.comment("\n\n"
+ " if a chunk has been pre-generated, then the mod would use the real chunk for the \n"
+ "fake chunk creation. May require a deletion of the lod file to see the result. \n")
.define("Use pre-generated chunks", true);*/
avoidNonFullBlocks = builder
.comment("\n\n"
+ " If true LODs will only show full bocks when generating. \n"
+ " Turning this on will make plains smoother since the tall grass won't be used. \n")
.define("Avoid Non Full Blocks", true);
alwaysLoadPregeneratedChunks = builder
.comment("\n\n"
+ " if a chunk has been pregenerated, then the mod would use the real chunk for the \n"
+ " fake chunk creation. May require a deletion of the lod file to see the result. \n")
.define("Use pre-generated chunks", false);
builder.pop();
}
}
@@ -22,6 +22,9 @@ public class ChunkLoader
ServerWorld serverWorld = LodUtil.getServerWorldFromDimension(clientWorld.dimensionType());
try
{
File file = new File(serverWorld.getChunkSource().getDataStorage().dataFolder.getParent() + File.separatorChar + "region", "r." + (pos.x >> 5) + "." + (pos.z >> 5) + ".mca");
if(!file.exists())
return null;
IChunk loadedChunk = ChunkSerializer.read(
serverWorld,
serverWorld.getStructureManager(),