From 8f43695a47778a692c16672be7d09b522533ed90 Mon Sep 17 00:00:00 2001 From: cola98765 Date: Sun, 10 Oct 2021 13:07:23 +0200 Subject: [PATCH] did someone say warnings and typos? --- .../bufferBuilding/LodBufferBuilder.java | 14 +++---- .../bufferBuilding/lodTemplates/Box.java | 12 +++--- .../worldGeneration/LodNodeGenWorker.java | 5 ++- .../worldGeneration/LodServerWorld.java | 4 +- .../worldGeneration/LodWorldGenerator.java | 6 +-- .../java/com/seibel/lod/config/LodConfig.java | 42 +++++++++---------- .../seibel/lod/enums/BufferRebuildTimes.java | 6 +-- .../seibel/lod/enums/HorizontalQuality.java | 2 +- .../com/seibel/lod/enums/HorizontalScale.java | 2 +- .../lod/objects/NearFarFogSettings.java | 4 +- .../com/seibel/lod/render/LodRenderer.java | 4 +- .../com/seibel/lod/util/LodThreadFactory.java | 2 +- .../seibel/lod/wrappers/MinecraftWrapper.java | 2 +- 13 files changed, 53 insertions(+), 52 deletions(-) diff --git a/src/main/java/com/seibel/lod/builders/bufferBuilding/LodBufferBuilder.java b/src/main/java/com/seibel/lod/builders/bufferBuilding/LodBufferBuilder.java index ed68d44d8..40a40804b 100644 --- a/src/main/java/com/seibel/lod/builders/bufferBuilding/LodBufferBuilder.java +++ b/src/main/java/com/seibel/lod/builders/bufferBuilding/LodBufferBuilder.java @@ -67,9 +67,9 @@ import net.minecraft.util.math.ChunkPos; public class LodBufferBuilder { /** The thread used to generate new LODs off the main thread. */ - public static ExecutorService mainGenThread = Executors.newSingleThreadExecutor(new LodThreadFactory(LodBufferBuilder.class.getSimpleName() + " - main")); + public static final ExecutorService mainGenThread = Executors.newSingleThreadExecutor(new LodThreadFactory(LodBufferBuilder.class.getSimpleName() + " - main")); /** The threads used to generate buffers. */ - public static ExecutorService bufferBuilderThreads = Executors.newFixedThreadPool(LodConfig.CLIENT.threading.numberOfBufferBuilderThreads.get(), new ThreadFactoryBuilder().setNameFormat("Buffer-Builder-%d").build()); + public static final ExecutorService bufferBuilderThreads = Executors.newFixedThreadPool(LodConfig.CLIENT.threading.numberOfBufferBuilderThreads.get(), new ThreadFactoryBuilder().setNameFormat("Buffer-Builder-%d").build()); /** * When uploading to a buffer that is too small, @@ -132,7 +132,7 @@ public class LodBufferBuilder public int previousRegionWidth = 0; /** this is used to prevent multiple threads creating, destroying, or using the buffers at the same time */ - private ReentrantLock bufferLock = new ReentrantLock(); + private final ReentrantLock bufferLock = new ReentrantLock(); private volatile Box[][] boxCache; private volatile PosToRenderContainer[][] setsToRender; @@ -818,11 +818,11 @@ public class LodBufferBuilder } /** A simple container to pass multiple objects back in the getVertexBuffers method. */ - public class VertexBuffersAndOffset + public static class VertexBuffersAndOffset { - public VertexBuffer[][][] vbos; - public int[][][] storageBufferIds; - public ChunkPos drawableCenterChunkPos; + public final VertexBuffer[][][] vbos; + public final int[][][] storageBufferIds; + public final ChunkPos drawableCenterChunkPos; public VertexBuffersAndOffset(VertexBuffer[][][] newVbos, int[][][] newStorageBufferIds, ChunkPos newDrawableCenterChunkPos) { diff --git a/src/main/java/com/seibel/lod/builders/bufferBuilding/lodTemplates/Box.java b/src/main/java/com/seibel/lod/builders/bufferBuilding/lodTemplates/Box.java index cf29636ac..6639a7074 100644 --- a/src/main/java/com/seibel/lod/builders/bufferBuilding/lodTemplates/Box.java +++ b/src/main/java/com/seibel/lod/builders/bufferBuilding/lodTemplates/Box.java @@ -139,20 +139,20 @@ public class Box put(Direction.NORTH, 3); }}; /** holds the box's x, y, z offset */ - public int[] boxOffset; + public final int[] boxOffset; /** holds the box's x, y, z width */ - public int[] boxWidth; + public final int[] boxWidth; /** Holds each direction's color */ - public int[] colorMap; + public final int[] colorMap; /** The original color (before shading) of this box */ public int color; /** */ - public Map adjHeight; - public Map adjDepth; + public final Map adjHeight; + public final Map adjDepth; /** Holds if the given direction should be culled or not */ - public boolean[] culling; + public final boolean[] culling; /** creates an empty box */ diff --git a/src/main/java/com/seibel/lod/builders/worldGeneration/LodNodeGenWorker.java b/src/main/java/com/seibel/lod/builders/worldGeneration/LodNodeGenWorker.java index 0038455fa..703a07304 100644 --- a/src/main/java/com/seibel/lod/builders/worldGeneration/LodNodeGenWorker.java +++ b/src/main/java/com/seibel/lod/builders/worldGeneration/LodNodeGenWorker.java @@ -337,6 +337,7 @@ public class LodNodeGenWorker implements IWorker // if we are in the end, don't generate any chunks. // Since we don't know where the islands are, everything // generates the same, and it looks awful. + //TODO it appears that 'if' can be collapsed, but comment says that it should not be a case lodBuilder.generateLodNodeFromChunk(lodDim, chunk, new LodBuilderConfig(true, true, false)); } @@ -438,9 +439,9 @@ public class LodNodeGenWorker implements IWorker { List>>> featuresForState = biome.generationSettings.features(); - for (int featureStateToGenerate = 0; featureStateToGenerate < featuresForState.size(); featureStateToGenerate++) + for (List>> suppliers : featuresForState) { - for (Supplier> featureSupplier : featuresForState.get(featureStateToGenerate)) + for (Supplier> featureSupplier : suppliers) { ConfiguredFeature configuredFeature = featureSupplier.get(); diff --git a/src/main/java/com/seibel/lod/builders/worldGeneration/LodServerWorld.java b/src/main/java/com/seibel/lod/builders/worldGeneration/LodServerWorld.java index b95013703..686b9d659 100644 --- a/src/main/java/com/seibel/lod/builders/worldGeneration/LodServerWorld.java +++ b/src/main/java/com/seibel/lod/builders/worldGeneration/LodServerWorld.java @@ -74,9 +74,9 @@ public class LodServerWorld implements ISeedReader public HashMap heightmaps = new HashMap<>(); - public IChunk chunk; + public final IChunk chunk; - public ServerWorld serverWorld; + public final ServerWorld serverWorld; public LodServerWorld(ServerWorld newServerWorld, IChunk newChunk) { diff --git a/src/main/java/com/seibel/lod/builders/worldGeneration/LodWorldGenerator.java b/src/main/java/com/seibel/lod/builders/worldGeneration/LodWorldGenerator.java index 192e33837..c5069863a 100644 --- a/src/main/java/com/seibel/lod/builders/worldGeneration/LodWorldGenerator.java +++ b/src/main/java/com/seibel/lod/builders/worldGeneration/LodWorldGenerator.java @@ -30,7 +30,7 @@ import net.minecraftforge.common.WorldWorkerManager; */ public class LodWorldGenerator { - public MinecraftWrapper mc = MinecraftWrapper.INSTANCE; + public final MinecraftWrapper mc = MinecraftWrapper.INSTANCE; /** This holds the thread used to generate new LODs off the main thread. */ private final ExecutorService mainGenThread = Executors.newSingleThreadExecutor(new LodThreadFactory(this.getClass().getSimpleName() + " world generator")); @@ -52,9 +52,9 @@ public class LodWorldGenerator * to limit how many chunks are queued at once. To prevent chunks from being * generated for a long time in an area the player is no longer in. */ - public AtomicInteger numberOfChunksWaitingToGenerate = new AtomicInteger(0); + public final AtomicInteger numberOfChunksWaitingToGenerate = new AtomicInteger(0); - public Set positionsWaitingToBeGenerated = new HashSet<>(); + public final Set positionsWaitingToBeGenerated = new HashSet<>(); /** * Singleton copy of this object diff --git a/src/main/java/com/seibel/lod/config/LodConfig.java b/src/main/java/com/seibel/lod/config/LodConfig.java index f4702f4f9..2a91d95e1 100644 --- a/src/main/java/com/seibel/lod/config/LodConfig.java +++ b/src/main/java/com/seibel/lod/config/LodConfig.java @@ -82,22 +82,22 @@ public class LodConfig public static class Graphics { - public ForgeConfigSpec.EnumValue fogDistance; - public ForgeConfigSpec.EnumValue fogDrawOverride; + public final ForgeConfigSpec.EnumValue fogDistance; + public final ForgeConfigSpec.EnumValue fogDrawOverride; - public ForgeConfigSpec.EnumValue lodTemplate; + public final ForgeConfigSpec.EnumValue lodTemplate; - public ForgeConfigSpec.EnumValue drawResolution; + public final ForgeConfigSpec.EnumValue drawResolution; - public ForgeConfigSpec.EnumValue detailDropOff; + public final ForgeConfigSpec.EnumValue detailDropOff; - public ForgeConfigSpec.IntValue lodChunkRenderDistance; + public final ForgeConfigSpec.IntValue lodChunkRenderDistance; - public ForgeConfigSpec.BooleanValue disableDirectionalCulling; + public final ForgeConfigSpec.BooleanValue disableDirectionalCulling; - public ForgeConfigSpec.BooleanValue alwaysDrawAtMaxQuality; + public final ForgeConfigSpec.BooleanValue alwaysDrawAtMaxQuality; - public ForgeConfigSpec.BooleanValue drawLods; + public final ForgeConfigSpec.BooleanValue drawLods; Graphics(ForgeConfigSpec.Builder builder) @@ -189,13 +189,13 @@ public class LodConfig public static class WorldGenerator { - public ForgeConfigSpec.EnumValue verticalQuality; - public ForgeConfigSpec.EnumValue generationResolution; - public ForgeConfigSpec.EnumValue distanceGenerationMode; - public ForgeConfigSpec.EnumValue generationPriority; - public ForgeConfigSpec.BooleanValue allowUnstableFeatureGeneration; - public ForgeConfigSpec.EnumValue horizontalScale; - public ForgeConfigSpec.EnumValue horizontalQuality; + public final ForgeConfigSpec.EnumValue verticalQuality; + public final ForgeConfigSpec.EnumValue generationResolution; + public final ForgeConfigSpec.EnumValue distanceGenerationMode; + public final ForgeConfigSpec.EnumValue generationPriority; + public final ForgeConfigSpec.BooleanValue allowUnstableFeatureGeneration; + public final ForgeConfigSpec.EnumValue horizontalScale; + public final ForgeConfigSpec.EnumValue horizontalQuality; WorldGenerator(ForgeConfigSpec.Builder builder) { @@ -323,8 +323,8 @@ public class LodConfig public static class Threading { - public ForgeConfigSpec.IntValue numberOfWorldGenerationThreads; - public ForgeConfigSpec.IntValue numberOfBufferBuilderThreads; + public final ForgeConfigSpec.IntValue numberOfWorldGenerationThreads; + public final ForgeConfigSpec.IntValue numberOfBufferBuilderThreads; Threading(ForgeConfigSpec.Builder builder) { @@ -359,8 +359,8 @@ public class LodConfig public static class Debugging { - public ForgeConfigSpec.EnumValue debugMode; - public ForgeConfigSpec.BooleanValue enableDebugKeybindings; + public final ForgeConfigSpec.EnumValue debugMode; + public final ForgeConfigSpec.BooleanValue enableDebugKeybindings; Debugging(ForgeConfigSpec.Builder builder) { @@ -385,7 +385,7 @@ public class LodConfig public static class Buffers { - public ForgeConfigSpec.EnumValue rebuildTimes; + public final ForgeConfigSpec.EnumValue rebuildTimes; Buffers(ForgeConfigSpec.Builder builder) { diff --git a/src/main/java/com/seibel/lod/enums/BufferRebuildTimes.java b/src/main/java/com/seibel/lod/enums/BufferRebuildTimes.java index c89129fef..ecb67e4a6 100644 --- a/src/main/java/com/seibel/lod/enums/BufferRebuildTimes.java +++ b/src/main/java/com/seibel/lod/enums/BufferRebuildTimes.java @@ -34,9 +34,9 @@ public enum BufferRebuildTimes RARE(5000, 2000, 10000); - public int playerMoveTimeout; - public int renderedChunkTimeout; - public int chunkChangeTimeout; + public final int playerMoveTimeout; + public final int renderedChunkTimeout; + public final int chunkChangeTimeout; BufferRebuildTimes(int playerMoveTimeout, int renderedChunkTimeout, int chunkChangeTimeout) { diff --git a/src/main/java/com/seibel/lod/enums/HorizontalQuality.java b/src/main/java/com/seibel/lod/enums/HorizontalQuality.java index 930cc0ec2..1c64d63a8 100644 --- a/src/main/java/com/seibel/lod/enums/HorizontalQuality.java +++ b/src/main/java/com/seibel/lod/enums/HorizontalQuality.java @@ -41,7 +41,7 @@ public enum HorizontalQuality /** Lods expand in three dimension */ HIGH(2.2f); - public double quadraticBase; + public final double quadraticBase; HorizontalQuality(double distanceUnit) { diff --git a/src/main/java/com/seibel/lod/enums/HorizontalScale.java b/src/main/java/com/seibel/lod/enums/HorizontalScale.java index df5951cd7..4f8546708 100644 --- a/src/main/java/com/seibel/lod/enums/HorizontalScale.java +++ b/src/main/java/com/seibel/lod/enums/HorizontalScale.java @@ -38,7 +38,7 @@ public enum HorizontalScale /** Lods expand in three dimension */ HIGH(256); - public int distanceUnit; + public final int distanceUnit; HorizontalScale(int distanceUnit) { diff --git a/src/main/java/com/seibel/lod/objects/NearFarFogSettings.java b/src/main/java/com/seibel/lod/objects/NearFarFogSettings.java index 4428da5c8..3c9de73d6 100644 --- a/src/main/java/com/seibel/lod/objects/NearFarFogSettings.java +++ b/src/main/java/com/seibel/lod/objects/NearFarFogSettings.java @@ -30,8 +30,8 @@ import com.seibel.lod.enums.FogQuality; */ public class NearFarFogSettings { - public NearOrFarSetting near = new NearOrFarSetting(FogDistance.NEAR); - public NearOrFarSetting far = new NearOrFarSetting(FogDistance.FAR); + public final NearOrFarSetting near = new NearOrFarSetting(FogDistance.NEAR); + public final NearOrFarSetting far = new NearOrFarSetting(FogDistance.FAR); /** If true that means Minecraft is * rendering fog alongside us */ diff --git a/src/main/java/com/seibel/lod/render/LodRenderer.java b/src/main/java/com/seibel/lod/render/LodRenderer.java index f62ade283..b79b06e5a 100644 --- a/src/main/java/com/seibel/lod/render/LodRenderer.java +++ b/src/main/java/com/seibel/lod/render/LodRenderer.java @@ -499,8 +499,8 @@ public class LodRenderer NEITHER(false, false), BOTH(true, true); - boolean lodProjUseFov; - boolean defaultMcProjUseFov; + final boolean lodProjUseFov; + final boolean defaultMcProjUseFov; FovTest(boolean newLodProjUseFov, boolean newDefaultMcProjUseFov) { diff --git a/src/main/java/com/seibel/lod/util/LodThreadFactory.java b/src/main/java/com/seibel/lod/util/LodThreadFactory.java index d55ff3f5d..3d5bc2889 100644 --- a/src/main/java/com/seibel/lod/util/LodThreadFactory.java +++ b/src/main/java/com/seibel/lod/util/LodThreadFactory.java @@ -11,7 +11,7 @@ import java.util.concurrent.ThreadFactory; */ public class LodThreadFactory implements ThreadFactory { - public String threadName; + public final String threadName; public LodThreadFactory(String newThreadName) diff --git a/src/main/java/com/seibel/lod/wrappers/MinecraftWrapper.java b/src/main/java/com/seibel/lod/wrappers/MinecraftWrapper.java index 95bf657b8..a8b00f384 100644 --- a/src/main/java/com/seibel/lod/wrappers/MinecraftWrapper.java +++ b/src/main/java/com/seibel/lod/wrappers/MinecraftWrapper.java @@ -32,7 +32,7 @@ import net.minecraft.world.DimensionType; */ public class MinecraftWrapper { - public static MinecraftWrapper INSTANCE = new MinecraftWrapper(); + public static final MinecraftWrapper INSTANCE = new MinecraftWrapper(); private final Minecraft mc = Minecraft.getInstance();