From 8a851a70c7844a21c77465d154b018c7a55a17a2 Mon Sep 17 00:00:00 2001 From: James Seibel Date: Wed, 23 Mar 2022 20:59:48 -0500 Subject: [PATCH] rename LodDimFileHelper -> LodSubDimFolderFinder --- src/main/java/com/seibel/lod/core/api/ClientApi.java | 4 ++-- src/main/java/com/seibel/lod/core/api/EventApi.java | 1 - .../lod/core/handlers/LodDimensionFileHandler.java | 4 +--- ...eHelper.java => LodSubDimensionFolderFinder.java} | 12 ++++++------ .../seibel/lod/core/objects/lod/LodDimension.java | 4 ++-- 5 files changed, 11 insertions(+), 14 deletions(-) rename src/main/java/com/seibel/lod/core/handlers/{LodDimensionFileHelper.java => LodSubDimensionFolderFinder.java} (97%) 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 fe69e3e4d..7659aa7b4 100644 --- a/src/main/java/com/seibel/lod/core/api/ClientApi.java +++ b/src/main/java/com/seibel/lod/core/api/ClientApi.java @@ -27,7 +27,7 @@ import java.util.List; import java.util.concurrent.ConcurrentHashMap; import java.util.concurrent.TimeUnit; -import com.seibel.lod.core.handlers.LodDimensionFileHelper; +import com.seibel.lod.core.handlers.LodSubDimensionFolderFinder; import org.lwjgl.glfw.GLFW; import com.seibel.lod.core.ModInfo; @@ -170,7 +170,7 @@ public class ClientApi LodDimension lodDim = ApiShared.lodWorld.getLodDimension(world.getDimensionType()); // Make sure the player's data is up-to-date - LodDimensionFileHelper.updatePlayerData(); + LodSubDimensionFolderFinder.updatePlayerData(); // Make the LodDim if it does not exist if (lodDim == null) diff --git a/src/main/java/com/seibel/lod/core/api/EventApi.java b/src/main/java/com/seibel/lod/core/api/EventApi.java index 2de0915fc..a04d9dd5f 100644 --- a/src/main/java/com/seibel/lod/core/api/EventApi.java +++ b/src/main/java/com/seibel/lod/core/api/EventApi.java @@ -20,7 +20,6 @@ package com.seibel.lod.core.api; import com.seibel.lod.core.api.ClientApi.LagSpikeCatcher; -import com.seibel.lod.core.handlers.LodDimensionFileHelper; import com.seibel.lod.core.objects.opengl.builders.lodBuilding.LodBuilder; import com.seibel.lod.core.objects.opengl.builders.worldGeneration.BatchGenerator; import com.seibel.lod.core.enums.WorldType; 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 af99278e9..717f585b7 100644 --- a/src/main/java/com/seibel/lod/core/handlers/LodDimensionFileHandler.java +++ b/src/main/java/com/seibel/lod/core/handlers/LodDimensionFileHandler.java @@ -33,8 +33,6 @@ import java.util.concurrent.TimeUnit; import java.util.concurrent.atomic.AtomicBoolean; import java.util.concurrent.locks.ReentrantLock; -import com.seibel.lod.core.ModInfo; -import com.seibel.lod.core.api.ApiShared; import org.apache.commons.compress.compressors.xz.XZCompressorInputStream; import org.apache.commons.compress.compressors.xz.XZCompressorOutputStream; @@ -417,7 +415,7 @@ public class LodDimensionFileHandler } // save the dimension data - LodDimensionFileHelper.saveDimensionPlayerData(this.dimensionDataSaveFolder); + LodSubDimensionFolderFinder.saveDimensionPlayerData(this.dimensionDataSaveFolder); trySaveRegionsToBeSaved(); // wait for the saving to finish if requested diff --git a/src/main/java/com/seibel/lod/core/handlers/LodDimensionFileHelper.java b/src/main/java/com/seibel/lod/core/handlers/LodSubDimensionFolderFinder.java similarity index 97% rename from src/main/java/com/seibel/lod/core/handlers/LodDimensionFileHelper.java rename to src/main/java/com/seibel/lod/core/handlers/LodSubDimensionFolderFinder.java index 1c83fb8d0..2fa83b21b 100644 --- a/src/main/java/com/seibel/lod/core/handlers/LodDimensionFileHelper.java +++ b/src/main/java/com/seibel/lod/core/handlers/LodSubDimensionFolderFinder.java @@ -27,9 +27,9 @@ import java.util.UUID; /** * Used to guess the world folder for the player's current dimension. * @author James Seibel - * @version 3-17-2022 + * @version 3-23-2022 */ -public class LodDimensionFileHelper +public class LodSubDimensionFolderFinder { private static final IMinecraftClientWrapper MC = SingletonHandler.get(IMinecraftClientWrapper.class); private static final ILodConfigWrapperSingleton CONFIG = SingletonHandler.get(ILodConfigWrapperSingleton.class); @@ -39,8 +39,8 @@ public class LodDimensionFileHelper private static final VerticalQuality VERTICAL_QUALITY_TO_TEST_WITH = VerticalQuality.MEDIUM; - private static LodDimensionFileHelper.PlayerData PLAYER_DATA = new LodDimensionFileHelper.PlayerData(MC); - private static LodDimensionFileHelper.PlayerData FIRST_SEEN_PLAYER_DATA = null; + private static LodSubDimensionFolderFinder.PlayerData PLAYER_DATA = new LodSubDimensionFolderFinder.PlayerData(MC); + private static LodSubDimensionFolderFinder.PlayerData FIRST_SEEN_PLAYER_DATA = null; @@ -56,7 +56,7 @@ public class LodDimensionFileHelper if (FIRST_SEEN_PLAYER_DATA == null) { FIRST_SEEN_PLAYER_DATA = PLAYER_DATA; - PLAYER_DATA = new LodDimensionFileHelper.PlayerData(MC); + PLAYER_DATA = new LodSubDimensionFolderFinder.PlayerData(MC); } @@ -70,7 +70,7 @@ public class LodDimensionFileHelper // chunk from the newly loaded dimension IChunkWrapper newlyLoadedChunk = MC.getWrappedClientWorld().tryGetChunk(playerChunkPos); // check if this chunk is valid to test - if (!LodDimensionFileHelper.CanDetermineDimensionFolder(newlyLoadedChunk)) + if (!LodSubDimensionFolderFinder.CanDetermineDimensionFolder(newlyLoadedChunk)) return null; // create a temporary dimension to store the test LOD 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 b90b5e4ff..9236c1fa2 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 @@ -26,7 +26,7 @@ import com.seibel.lod.core.enums.config.DropoffQuality; import com.seibel.lod.core.enums.config.GenerationPriority; import com.seibel.lod.core.enums.config.VerticalQuality; import com.seibel.lod.core.handlers.LodDimensionFileHandler; -import com.seibel.lod.core.handlers.LodDimensionFileHelper; +import com.seibel.lod.core.handlers.LodSubDimensionFolderFinder; import com.seibel.lod.core.handlers.dependencyInjection.SingletonHandler; import com.seibel.lod.core.objects.Pos2D; import com.seibel.lod.core.objects.PosToGenerateContainer; @@ -136,7 +136,7 @@ public class LodDimension try { // attempt to get the file handler - File saveDir = LodDimensionFileHelper.determineSubDimensionFolder(); + File saveDir = LodSubDimensionFolderFinder.determineSubDimensionFolder(); if (saveDir == null) return;