From bceefb571786cc5cebaf93db1ac98d85bee18e14 Mon Sep 17 00:00:00 2001 From: James Seibel Date: Sat, 3 Jul 2021 21:16:56 -0500 Subject: [PATCH] Rename LodBuilder to LodChunkBuilder --- .../seibel/lod/builders/LodBufferBuilder.java | 8 +++---- .../{LodBuilder.java => LodChunkBuilder.java} | 4 ++-- .../worldGeneration/LodChunkGenWorker.java | 18 +++++++-------- .../com/seibel/lod/proxy/ClientProxy.java | 22 +++++++++---------- 4 files changed, 26 insertions(+), 26 deletions(-) rename src/main/java/com/seibel/lod/builders/{LodBuilder.java => LodChunkBuilder.java} (99%) diff --git a/src/main/java/com/seibel/lod/builders/LodBufferBuilder.java b/src/main/java/com/seibel/lod/builders/LodBufferBuilder.java index 1bc334eb2..d97a505d3 100644 --- a/src/main/java/com/seibel/lod/builders/LodBufferBuilder.java +++ b/src/main/java/com/seibel/lod/builders/LodBufferBuilder.java @@ -33,7 +33,7 @@ public class LodBufferBuilder /** This holds the thread used to generate new LODs off the main thread. */ private ExecutorService genThread = Executors.newSingleThreadExecutor(); - private LodBuilder lodBuilder; + private LodChunkBuilder lodChunkBuilder; /** The buffers that are used to create LODs using near fog */ public volatile BufferBuilder buildableNearBuffer; @@ -59,10 +59,10 @@ public class LodBufferBuilder public int maxChunkGenRequests = Runtime.getRuntime().availableProcessors(); - public LodBufferBuilder(LodBuilder newLodBuilder) + public LodBufferBuilder(LodChunkBuilder newLodBuilder) { mc = Minecraft.getInstance(); - lodBuilder = newLodBuilder; + lodChunkBuilder = newLodBuilder; } @@ -233,7 +233,7 @@ public class LodBufferBuilder numberOfChunksWaitingToGenerate++; - LodChunkGenWorker genWorker = new LodChunkGenWorker(chunkPos, renderer, lodBuilder, this, lodDim, serverWorld, biomeContainer); + LodChunkGenWorker genWorker = new LodChunkGenWorker(chunkPos, renderer, lodChunkBuilder, this, lodDim, serverWorld, biomeContainer); WorldWorkerManager.addWorker(genWorker); } } diff --git a/src/main/java/com/seibel/lod/builders/LodBuilder.java b/src/main/java/com/seibel/lod/builders/LodChunkBuilder.java similarity index 99% rename from src/main/java/com/seibel/lod/builders/LodBuilder.java rename to src/main/java/com/seibel/lod/builders/LodChunkBuilder.java index 1f4f18142..df85ee083 100644 --- a/src/main/java/com/seibel/lod/builders/LodBuilder.java +++ b/src/main/java/com/seibel/lod/builders/LodChunkBuilder.java @@ -32,7 +32,7 @@ import net.minecraft.world.gen.Heightmap; * @author James Seibel * @version 6-27-2021 */ -public class LodBuilder +public class LodChunkBuilder { private ExecutorService lodGenThreadPool = Executors.newSingleThreadExecutor(); @@ -45,7 +45,7 @@ public class LodBuilder - public LodBuilder() + public LodChunkBuilder() { } diff --git a/src/main/java/com/seibel/lod/builders/worldGeneration/LodChunkGenWorker.java b/src/main/java/com/seibel/lod/builders/worldGeneration/LodChunkGenWorker.java index 91fe4d418..5f356504d 100644 --- a/src/main/java/com/seibel/lod/builders/worldGeneration/LodChunkGenWorker.java +++ b/src/main/java/com/seibel/lod/builders/worldGeneration/LodChunkGenWorker.java @@ -9,7 +9,7 @@ import java.util.concurrent.Executors; import java.util.function.Supplier; import com.seibel.lod.builders.LodBufferBuilder; -import com.seibel.lod.builders.LodBuilder; +import com.seibel.lod.builders.LodChunkBuilder; import com.seibel.lod.builders.LodBuilderConfig; import com.seibel.lod.enums.DistanceGenerationMode; import com.seibel.lod.handlers.LodConfig; @@ -63,7 +63,7 @@ public class LodChunkGenWorker implements IWorker public LodChunkGenWorker(ChunkPos newPos, LodRenderer newLodRenderer, - LodBuilder newLodBuilder, LodBufferBuilder newLodBufferBuilder, + LodChunkBuilder newLodBuilder, LodBufferBuilder newLodBufferBuilder, LodDimension newLodDimension, ServerWorld newServerWorld, BiomeContainer newBiomeContainer) { @@ -121,19 +121,19 @@ public class LodChunkGenWorker implements IWorker { public final ServerWorld serverWorld; public final LodDimension lodDim; - public final LodBuilder lodBuilder; + public final LodChunkBuilder lodChunkBuilder; public final LodRenderer lodRenderer; private LodBufferBuilder lodBufferBuilder; private ChunkPos pos; public LodChunkGenThread(ChunkPos newPos, LodRenderer newLodRenderer, - LodBuilder newLodBuilder, LodBufferBuilder newLodBufferBuilder, + LodChunkBuilder newLodBuilder, LodBufferBuilder newLodBufferBuilder, LodDimension newLodDimension, ServerWorld newServerWorld) { pos = newPos; lodRenderer = newLodRenderer; - lodBuilder = newLodBuilder; + lodChunkBuilder = newLodBuilder; lodBufferBuilder = newLodBufferBuilder; lodDim = newLodDimension; serverWorld = newServerWorld; @@ -284,7 +284,7 @@ public class LodChunkGenWorker implements IWorker LodChunk lod; if (!inTheEnd) { - lod = lodBuilder.generateLodFromChunk(chunk, new LodBuilderConfig(true, true, false)); + lod = lodChunkBuilder.generateLodFromChunk(chunk, new LodBuilderConfig(true, true, false)); } else { @@ -325,7 +325,7 @@ public class LodChunkGenWorker implements IWorker snowFeature.place(lodServerWorld, chunkGen, serverWorld.random, chunk.getPos().getWorldPosition(), null); - LodChunk lod = lodBuilder.generateLodFromChunk(chunk, new LodBuilderConfig(false, true, true)); + LodChunk lod = lodChunkBuilder.generateLodFromChunk(chunk, new LodBuilderConfig(false, true, true)); lodDim.addLod(lod); } @@ -432,7 +432,7 @@ public class LodChunkGenWorker implements IWorker } // generate a Lod like normal - LodChunk lod = lodBuilder.generateLodFromChunk(chunk); + LodChunk lod = lodChunkBuilder.generateLodFromChunk(chunk); lodDim.addLod(lod); } @@ -448,7 +448,7 @@ public class LodChunkGenWorker implements IWorker */ private void generateWithServer() { - lodBuilder.generateLodChunkAsync(serverWorld.getChunk(pos.x, pos.z, ChunkStatus.FEATURES), ClientProxy.getLodWorld(), serverWorld); + lodChunkBuilder.generateLodChunkAsync(serverWorld.getChunk(pos.x, pos.z, ChunkStatus.FEATURES), ClientProxy.getLodWorld(), serverWorld); } diff --git a/src/main/java/com/seibel/lod/proxy/ClientProxy.java b/src/main/java/com/seibel/lod/proxy/ClientProxy.java index 0871339d5..02a450897 100644 --- a/src/main/java/com/seibel/lod/proxy/ClientProxy.java +++ b/src/main/java/com/seibel/lod/proxy/ClientProxy.java @@ -4,7 +4,7 @@ import org.apache.logging.log4j.LogManager; import org.apache.logging.log4j.Logger; import com.seibel.lod.builders.LodBufferBuilder; -import com.seibel.lod.builders.LodBuilder; +import com.seibel.lod.builders.LodChunkBuilder; import com.seibel.lod.handlers.LodConfig; import com.seibel.lod.objects.LodChunk; import com.seibel.lod.objects.LodDimension; @@ -32,8 +32,8 @@ public class ClientProxy public static final Logger LOGGER = LogManager.getLogger("LOD"); private static LodWorld lodWorld = new LodWorld(); - private static LodBuilder lodBuilder = new LodBuilder(); - private static LodBufferBuilder lodBufferBuilder = new LodBufferBuilder(lodBuilder); + private static LodChunkBuilder lodChunkBuilder = new LodChunkBuilder(); + private static LodBufferBuilder lodBufferBuilder = new LodBufferBuilder(lodChunkBuilder); private static LodRenderer renderer = new LodRenderer(lodBufferBuilder); Minecraft mc = Minecraft.getInstance(); @@ -65,10 +65,10 @@ public class ClientProxy // TODO is this logic good? (mc.options.renderDistance * LodChunk.WIDTH * 2 * LodConfig.CLIENT.lodChunkRadiusMultiplier.get()) / LodRegion.SIZE ); - if (lodBuilder.regionWidth != newWidth) + if (lodChunkBuilder.regionWidth != newWidth) { lodWorld.resizeDimensionRegionWidth(newWidth); - lodBuilder.regionWidth = newWidth; + lodChunkBuilder.regionWidth = newWidth; // skip this frame, hopefully the lodWorld // should have everything set up by then @@ -99,8 +99,8 @@ public class ClientProxy // LodConfig.CLIENT.lodColorStyle.set(LodColorStyle.INDIVIDUAL_SIDES); // LodConfig.CLIENT.lodChunkRadiusMultiplier.set(12); // LodConfig.CLIENT.distanceGenerationMode.set(DistanceGenerationMode.FEATURES); -// LodConfig.CLIENT.fogDistance.set(FogDistance.NEAR_AND_FAR); -// LodConfig.CLIENT.fogDrawOverride.set(FogDrawOverride.USE_OPTIFINE_FOG_SETTING); +// LodConfig.CLIENT.fogDistance.set(FogDistance.FAR); +// LodConfig.CLIENT.fogDrawOverride.set(FogDrawOverride.ALWAYS_DRAW_FOG_FANCY); // Note to self: // if "unspecified" shows up in the pie chart, it is @@ -126,7 +126,7 @@ public class ClientProxy @SubscribeEvent public void chunkLoadEvent(ChunkEvent.Load event) { - lodBuilder.generateLodChunkAsync(event.getChunk(), lodWorld, event.getWorld()); + lodChunkBuilder.generateLodChunkAsync(event.getChunk(), lodWorld, event.getWorld()); } @@ -164,7 +164,7 @@ public class ClientProxy event.getClass() == BlockEvent.PortalSpawnEvent.class) { // recreate the LOD where the blocks were changed - lodBuilder.generateLodChunkAsync(event.getWorld().getChunk(event.getPos()), lodWorld, event.getWorld()); + lodChunkBuilder.generateLodChunkAsync(event.getWorld().getChunk(event.getPos()), lodWorld, event.getWorld()); } } @@ -180,9 +180,9 @@ public class ClientProxy return lodWorld; } - public static LodBuilder getLodBuilder() + public static LodChunkBuilder getLodBuilder() { - return lodBuilder; + return lodChunkBuilder; } public static LodRenderer getRenderer()