From 808380b46132207ccccd2ada9b063fd73d173dd4 Mon Sep 17 00:00:00 2001 From: James Seibel Date: Sun, 18 Jun 2023 08:51:12 -0500 Subject: [PATCH] improve FileHandler directory creation logic --- .../core/file/fullDatafile/FullDataFileHandler.java | 6 +++++- .../core/file/renderfile/RenderSourceFileHandler.java | 4 ++++ .../distanthorizons/core/level/ClientLevelModule.java | 4 ---- 3 files changed, 9 insertions(+), 5 deletions(-) diff --git a/core/src/main/java/com/seibel/distanthorizons/core/file/fullDatafile/FullDataFileHandler.java b/core/src/main/java/com/seibel/distanthorizons/core/file/fullDatafile/FullDataFileHandler.java index 28c5c66cc..e568423c6 100644 --- a/core/src/main/java/com/seibel/distanthorizons/core/file/fullDatafile/FullDataFileHandler.java +++ b/core/src/main/java/com/seibel/distanthorizons/core/file/fullDatafile/FullDataFileHandler.java @@ -45,8 +45,12 @@ public class FullDataFileHandler implements IFullDataSourceProvider public FullDataFileHandler(IDhLevel level, File saveRootDir) { + this.level = level; this.saveDir = saveRootDir; - this.level = level; + if (!this.saveDir.exists() && !this.saveDir.mkdirs()) + { + LOGGER.warn("Unable to create full data folder, file saving may fail."); + } } diff --git a/core/src/main/java/com/seibel/distanthorizons/core/file/renderfile/RenderSourceFileHandler.java b/core/src/main/java/com/seibel/distanthorizons/core/file/renderfile/RenderSourceFileHandler.java index e66cf5b20..521e3fe90 100644 --- a/core/src/main/java/com/seibel/distanthorizons/core/file/renderfile/RenderSourceFileHandler.java +++ b/core/src/main/java/com/seibel/distanthorizons/core/file/renderfile/RenderSourceFileHandler.java @@ -51,6 +51,10 @@ public class RenderSourceFileHandler implements ILodRenderSourceProvider this.fullDataSourceProvider = sourceProvider; this.level = level; this.saveDir = saveRootDir; + if (!this.saveDir.exists() && !this.saveDir.mkdirs()) + { + LOGGER.warn("Unable to create render data folder, file saving may fail."); + } } diff --git a/core/src/main/java/com/seibel/distanthorizons/core/level/ClientLevelModule.java b/core/src/main/java/com/seibel/distanthorizons/core/level/ClientLevelModule.java index cb330f4d2..669a82504 100644 --- a/core/src/main/java/com/seibel/distanthorizons/core/level/ClientLevelModule.java +++ b/core/src/main/java/com/seibel/distanthorizons/core/level/ClientLevelModule.java @@ -36,10 +36,6 @@ public class ClientLevelModule { { this.parent = parent; this.f3Message = new F3Screen.NestedMessage(this::f3Log); - if (parent.getSaveStructure().getRenderCacheFolder(parent.getLevelWrapper()).mkdirs()) - { - LOGGER.warn("unable to create cache folder."); - } } //==============//