From 0cd9bfaef2086e1deca84ccab28b29eda0719402 Mon Sep 17 00:00:00 2001 From: James Seibel Date: Tue, 24 Aug 2021 21:48:09 -0500 Subject: [PATCH] Put all LOD save files in the same folder --- .../lod/handlers/LodDimensionFileHandler.java | 25 +++++++++++-------- 1 file changed, 15 insertions(+), 10 deletions(-) diff --git a/src/main/java/com/seibel/lod/handlers/LodDimensionFileHandler.java b/src/main/java/com/seibel/lod/handlers/LodDimensionFileHandler.java index 66ae28747..0376948d9 100644 --- a/src/main/java/com/seibel/lod/handlers/LodDimensionFileHandler.java +++ b/src/main/java/com/seibel/lod/handlers/LodDimensionFileHandler.java @@ -27,7 +27,10 @@ import java.nio.file.StandardCopyOption; import java.util.concurrent.ExecutorService; import java.util.concurrent.Executors; -import com.seibel.lod.objects.*; +import com.seibel.lod.objects.LevelContainer; +import com.seibel.lod.objects.LodDimension; +import com.seibel.lod.objects.LodRegion; +import com.seibel.lod.objects.RegionPos; import com.seibel.lod.proxy.ClientProxy; import com.seibel.lod.util.LodThreadFactory; import com.seibel.lod.util.LodUtil; @@ -38,7 +41,7 @@ import com.seibel.lod.util.LodUtil; * to file. * * @author James Seibel - * @version 8-22-2021 + * @version 8-24-2021 */ public class LodDimensionFileHandler { @@ -53,14 +56,15 @@ public class LodDimensionFileHandler private File dimensionDataSaveFolder; - /** - * lod - */ + /** lod */ private static final String FILE_NAME_PREFIX = "lod"; - /** - * .txt - */ + /** .txt */ private static final String FILE_EXTENSION = ".txt"; + /** lod/ */ + private static final String LOD_FOLDER_NAME = "lod"; + /** detail-# */ + private static final String DETAIL_FOLDER_NAME_PREFIX = "detail-"; + /** * .tmp
* Added to the end of the file path when saving to prevent @@ -355,8 +359,9 @@ public class LodDimensionFileHandler // ".\Super Flat\DIM-1\data" // or // ".\Super Flat\data" - return dimensionDataSaveFolder.getCanonicalPath() + detailLevel + File.separatorChar + - FILE_NAME_PREFIX + "." + regionX + "." + regionZ + FILE_EXTENSION; + return dimensionDataSaveFolder.getCanonicalPath() + File.separatorChar + + DETAIL_FOLDER_NAME_PREFIX + detailLevel + File.separatorChar + + FILE_NAME_PREFIX + "." + regionX + "." + regionZ + FILE_EXTENSION; } catch (IOException | SecurityException e) {