From 6b6d011cd5266cc76072dacbb2231d131dc863c7 Mon Sep 17 00:00:00 2001 From: cola98765 Date: Tue, 18 Jan 2022 11:00:07 +0100 Subject: [PATCH] resolved warnings. part 2 --- .../com/seibel/lod/core/api/ClientApi.java | 4 ++-- .../LodBufferBuilderFactory.java | 3 +-- .../handlers/LodDimensionFileHandler.java | 6 +++--- .../lod/core/objects/lod/LodDimension.java | 6 ++---- .../seibel/lod/core/render/LodRenderer.java | 10 +++------- .../objects/VertexAttributePreGL43.java | 20 ++++++++++--------- .../lod/core/util/BooleanMovableGridList.java | 6 +++--- .../seibel/lod/core/util/MovableGridList.java | 6 +++--- .../wrapperInterfaces/IWrapperFactory.java | 2 +- .../config/ILodConfigWrapperSingleton.java | 2 +- .../minecraft/IMinecraftRenderWrapper.java | 12 +++++------ .../modAccessor/IModAccessor.java | 2 +- 12 files changed, 37 insertions(+), 42 deletions(-) diff --git a/src/main/java/com/seibel/lod/core/api/ClientApi.java b/src/main/java/com/seibel/lod/core/api/ClientApi.java index 287747c15..c910b8be0 100644 --- a/src/main/java/com/seibel/lod/core/api/ClientApi.java +++ b/src/main/java/com/seibel/lod/core/api/ClientApi.java @@ -76,8 +76,8 @@ public class ClientApi } - private ConcurrentHashMap.KeySetView generating = ConcurrentHashMap.newKeySet(); - private ConcurrentHashMap.KeySetView toBeLoaded = ConcurrentHashMap.newKeySet(); + private final ConcurrentHashMap.KeySetView generating = ConcurrentHashMap.newKeySet(); + private final ConcurrentHashMap.KeySetView toBeLoaded = ConcurrentHashMap.newKeySet(); public void clientChunkLoadEvent(IChunkWrapper chunk, IWorldWrapper world) { diff --git a/src/main/java/com/seibel/lod/core/builders/bufferBuilding/LodBufferBuilderFactory.java b/src/main/java/com/seibel/lod/core/builders/bufferBuilding/LodBufferBuilderFactory.java index 5dcf76ace..1879cce40 100644 --- a/src/main/java/com/seibel/lod/core/builders/bufferBuilding/LodBufferBuilderFactory.java +++ b/src/main/java/com/seibel/lod/core/builders/bufferBuilding/LodBufferBuilderFactory.java @@ -665,8 +665,7 @@ public class LodBufferBuilderFactory GpuUploadMethod uploadMethod = glProxy.getGpuUploadMethod(); // determine the upload timeout - int MBPerMS = CONFIG.client().advanced().buffers().getGpuUploadPerMegabyteInMilliseconds(); - long BPerNS = MBPerMS; // MB -> B = 1/1,000,000. MS -> NS = 1,000,000. So, MBPerMS = BPerNS. + long BPerNS = CONFIG.client().advanced().buffers().getGpuUploadPerMegabyteInMilliseconds(); // MB -> B = 1/1,000,000. MS -> NS = 1,000,000. So, MBPerMS = BPerNS. long remainingNS = 0; // We don't want to pause for like 0.1 ms... so we store those tiny MS. long bytesUploaded = 0; diff --git a/src/main/java/com/seibel/lod/core/handlers/LodDimensionFileHandler.java b/src/main/java/com/seibel/lod/core/handlers/LodDimensionFileHandler.java index 0dd1780f4..971c3a154 100644 --- a/src/main/java/com/seibel/lod/core/handlers/LodDimensionFileHandler.java +++ b/src/main/java/com/seibel/lod/core/handlers/LodDimensionFileHandler.java @@ -57,7 +57,7 @@ import com.seibel.lod.core.util.LodUtil; public class LodDimensionFileHandler { /** This is the dimension that owns this file handler */ - private LodDimension lodDimension; + private final LodDimension lodDimension; private final File dimensionDataSaveFolder; @@ -88,10 +88,10 @@ public class LodDimensionFileHandler * Allow saving asynchronously, but never try to save multiple regions * at a time */ - private AtomicBoolean isFileWritingThreadRunning = new AtomicBoolean(false); + private final AtomicBoolean isFileWritingThreadRunning = new AtomicBoolean(false); private ExecutorService fileWritingThreadPool = Executors.newSingleThreadExecutor(new LodThreadFactory(this.getClass().getSimpleName())); - private ConcurrentHashMap regionToSave = new ConcurrentHashMap(); + private final ConcurrentHashMap regionToSave = new ConcurrentHashMap(); public LodDimensionFileHandler(File newSaveFolder, LodDimension newLodDimension) diff --git a/src/main/java/com/seibel/lod/core/objects/lod/LodDimension.java b/src/main/java/com/seibel/lod/core/objects/lod/LodDimension.java index 6ae748072..64070b1f0 100644 --- a/src/main/java/com/seibel/lod/core/objects/lod/LodDimension.java +++ b/src/main/java/com/seibel/lod/core/objects/lod/LodDimension.java @@ -157,10 +157,8 @@ public class LodDimension } } Arrays.sort(list, (a, b) -> { - RegionPos posA = a; - RegionPos posB = b; - double disSqrA = posA.x*posA.x+posA.z*posA.z; - double disSqrB = posB.x*posB.x+posB.z*posB.z; + double disSqrA = a.x* a.x+ a.z* a.z; + double disSqrB = b.x* b.x+ b.z* b.z; return Double.compare(disSqrA, disSqrB); }); iteratorList = list; diff --git a/src/main/java/com/seibel/lod/core/render/LodRenderer.java b/src/main/java/com/seibel/lod/core/render/LodRenderer.java index 310be8087..09c0258c9 100644 --- a/src/main/java/com/seibel/lod/core/render/LodRenderer.java +++ b/src/main/java/com/seibel/lod/core/render/LodRenderer.java @@ -404,10 +404,8 @@ public class LodRenderer // accuracy vs the model view matrix, which only uses floats) //int bufferPosX = LevelPosUtil.convert(LodUtil.CHUNK_DETAIL_LEVEL, vbosCenterX, LodUtil.BLOCK_DETAIL_LEVEL); //int bufferPosZ = LevelPosUtil.convert(LodUtil.CHUNK_DETAIL_LEVEL, vbosCenterZ, LodUtil.BLOCK_DETAIL_LEVEL); - int bufferPosX = vbosCenterX; - int bufferPosZ = vbosCenterZ; - double xDiff = projectedView.x - bufferPosX; - double zDiff = projectedView.z - bufferPosZ; + double xDiff = projectedView.x - vbosCenterX; + double zDiff = projectedView.z - vbosCenterZ; mcModelViewMatrix.multiplyTranslationMatrix(-xDiff, -projectedView.y, -zDiff); return mcModelViewMatrix; @@ -421,10 +419,8 @@ public class LodRenderer { //int worldCenterX = LevelPosUtil.convert(LodUtil.CHUNK_DETAIL_LEVEL, vbosCenterX, LodUtil.BLOCK_DETAIL_LEVEL); //int worldCenterZ = LevelPosUtil.convert(LodUtil.CHUNK_DETAIL_LEVEL, vbosCenterZ, LodUtil.BLOCK_DETAIL_LEVEL); - int worldCenterX = vbosCenterX; - int worldCenterZ = vbosCenterZ; Vec3d cameraPos = MC_RENDER.getCameraExactPosition(); - return new Vec3f((float)cameraPos.x - worldCenterX, (float)cameraPos.y, (float)cameraPos.z - worldCenterZ); + return new Vec3f((float)cameraPos.x - vbosCenterX, (float)cameraPos.y, (float)cameraPos.z - vbosCenterZ); } /** diff --git a/src/main/java/com/seibel/lod/core/render/objects/VertexAttributePreGL43.java b/src/main/java/com/seibel/lod/core/render/objects/VertexAttributePreGL43.java index 65a7e9c89..02246cb57 100644 --- a/src/main/java/com/seibel/lod/core/render/objects/VertexAttributePreGL43.java +++ b/src/main/java/com/seibel/lod/core/render/objects/VertexAttributePreGL43.java @@ -48,14 +48,16 @@ public final class VertexAttributePreGL43 extends VertexAttribute { public void bindBufferToBindingPoint(int buffer, int bindingPoint) { int[] toBind = bindingPointsToIndex[bindingPoint]; - for (int i=0; i extends ArrayList implements List { return (x>=0 && x=0 && y=gridSize || y<0 || y>=gridSize) return null; return super.get(x + y * gridSize); } - private final boolean _setDirect(int x, int y, T t) { + private boolean _setDirect(int x, int y, T t) { if (x<0 || x>=gridSize || y<0 || y>=gridSize) return false; super.set(x + y * gridSize, t); return true; } - private final T _swapDirect(int x, int y, T t) { + private T _swapDirect(int x, int y, T t) { if (x<0 || x>=gridSize || y<0 || y>=gridSize) return null; return super.set(x + y * gridSize, t); } diff --git a/src/main/java/com/seibel/lod/core/wrapperInterfaces/IWrapperFactory.java b/src/main/java/com/seibel/lod/core/wrapperInterfaces/IWrapperFactory.java index a7cb2c4f0..13c376d3f 100644 --- a/src/main/java/com/seibel/lod/core/wrapperInterfaces/IWrapperFactory.java +++ b/src/main/java/com/seibel/lod/core/wrapperInterfaces/IWrapperFactory.java @@ -48,7 +48,7 @@ public interface IWrapperFactory AbstractWorldGeneratorWrapper createWorldGenerator(LodBuilder newLodBuilder, LodDimension newLodDimension, IWorldWrapper worldWrapper); // Return null to signal that there is no AbstractWorldGenerator - public default AbstractExperimentalWorldGeneratorWrapper createExperimentalWorldGenerator(LodBuilder newLodBuilder, LodDimension newLodDimension, IWorldWrapper worldWrapper) { + default AbstractExperimentalWorldGeneratorWrapper createExperimentalWorldGenerator(LodBuilder newLodBuilder, LodDimension newLodDimension, IWorldWrapper worldWrapper) { return null; } } diff --git a/src/main/java/com/seibel/lod/core/wrapperInterfaces/config/ILodConfigWrapperSingleton.java b/src/main/java/com/seibel/lod/core/wrapperInterfaces/config/ILodConfigWrapperSingleton.java index ad4aeba28..64e8f8b87 100644 --- a/src/main/java/com/seibel/lod/core/wrapperInterfaces/config/ILodConfigWrapperSingleton.java +++ b/src/main/java/com/seibel/lod/core/wrapperInterfaces/config/ILodConfigWrapperSingleton.java @@ -345,7 +345,7 @@ public interface ILodConfigWrapperSingleton void setGenerationPriority(GenerationPriority newGenerationPriority); DistanceGenerationMode DISTANCE_GENERATION_MODE_DEFAULT = DistanceGenerationMode.SURFACE; - public static String getDistanceGenerationModeDesc(IVersionConstants versionConstants) + static String getDistanceGenerationModeDesc(IVersionConstants versionConstants) { return "" + " How detailed should fake chunks be generated outside the vanilla render distance? \n" diff --git a/src/main/java/com/seibel/lod/core/wrapperInterfaces/minecraft/IMinecraftRenderWrapper.java b/src/main/java/com/seibel/lod/core/wrapperInterfaces/minecraft/IMinecraftRenderWrapper.java index 3d4ed437e..01bb39158 100644 --- a/src/main/java/com/seibel/lod/core/wrapperInterfaces/minecraft/IMinecraftRenderWrapper.java +++ b/src/main/java/com/seibel/lod/core/wrapperInterfaces/minecraft/IMinecraftRenderWrapper.java @@ -55,9 +55,9 @@ public interface IMinecraftRenderWrapper Color getFogColor(float partialTicks); - public default Color getUnderWaterFogColor(float partialTicks) {return getFogColor(partialTicks);} + default Color getUnderWaterFogColor(float partialTicks) {return getFogColor(partialTicks);} - public default boolean isFogStateInUnderWater() { + default boolean isFogStateInUnderWater() { return false; } @@ -77,7 +77,7 @@ public interface IMinecraftRenderWrapper *
* If not implemented this calls {@link #getMaximumRenderedChunks()}. */ - public default HashSet getVanillaRenderedChunks() + default HashSet getVanillaRenderedChunks() { ISodiumAccessor sodium = ModAccessorApi.get(ISodiumAccessor.class); return sodium==null ? getMaximumRenderedChunks() : sodium.getNormalRenderedChunks(); @@ -87,7 +87,7 @@ public interface IMinecraftRenderWrapper * Doesn't need to be implemented.
* Returns every chunk position within the vanilla render distance. */ - public default HashSet getMaximumRenderedChunks() + default HashSet getMaximumRenderedChunks() { IMinecraftWrapper mcWrapper = SingletonHandler.get(IMinecraftWrapper.class); IWrapperFactory factory = SingletonHandler.get(IWrapperFactory.class); @@ -119,9 +119,9 @@ public interface IMinecraftRenderWrapper /** @returns -1 if there was an issue getting the lightmap */ int getLightmapTextureWidth(); /** @returns -1 if there was an issue getting the lightmap */ - public int getLightmapGLFormat(); + int getLightmapGLFormat(); // Try and disable vanilla fog. Return true if successful, or false if not able to. - public boolean tryDisableVanillaFog(); + boolean tryDisableVanillaFog(); } diff --git a/src/main/java/com/seibel/lod/core/wrapperInterfaces/modAccessor/IModAccessor.java b/src/main/java/com/seibel/lod/core/wrapperInterfaces/modAccessor/IModAccessor.java index dbf0b878e..0cba75bf0 100644 --- a/src/main/java/com/seibel/lod/core/wrapperInterfaces/modAccessor/IModAccessor.java +++ b/src/main/java/com/seibel/lod/core/wrapperInterfaces/modAccessor/IModAccessor.java @@ -1,5 +1,5 @@ package com.seibel.lod.core.wrapperInterfaces.modAccessor; -public abstract interface IModAccessor { +public interface IModAccessor { String getModName(); }