From 5aca47b357151215d0327f02b3abb413d8b9630d Mon Sep 17 00:00:00 2001 From: James Seibel Date: Wed, 17 Jan 2024 07:15:47 -0600 Subject: [PATCH 1/3] Fix render data holes on world gen --- coreSubProjects | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/coreSubProjects b/coreSubProjects index 163c0bf1f..e61f6bb80 160000 --- a/coreSubProjects +++ b/coreSubProjects @@ -1 +1 @@ -Subproject commit 163c0bf1fac5eb3f17406a6bcc0ed8ba5d5b041f +Subproject commit e61f6bb80204400de2d88bba442b1d3d7c205238 From d7618d73c3eed77fe820cfea08073f1f9c272904 Mon Sep 17 00:00:00 2001 From: James Seibel Date: Wed, 17 Jan 2024 07:45:08 -0600 Subject: [PATCH 2/3] Fixes #613 (multiplayer failing due to folder not existing) --- coreSubProjects | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/coreSubProjects b/coreSubProjects index e61f6bb80..b0c2874e7 160000 --- a/coreSubProjects +++ b/coreSubProjects @@ -1 +1 @@ -Subproject commit e61f6bb80204400de2d88bba442b1d3d7c205238 +Subproject commit b0c2874e71cbb294ca7ce524d51c35e278bc1c92 From aa73a30ac4c5a90b744f0bbbf16614abfb78c64a Mon Sep 17 00:00:00 2001 From: James Seibel Date: Wed, 17 Jan 2024 20:57:10 -0600 Subject: [PATCH 3/3] Fix C2ME throwing errors when attempting to get region file --- .../RegionFileStorageExternalCache.java | 15 +++++++++++++++ 1 file changed, 15 insertions(+) diff --git a/common/src/main/java/com/seibel/distanthorizons/common/wrappers/worldGeneration/mimicObject/RegionFileStorageExternalCache.java b/common/src/main/java/com/seibel/distanthorizons/common/wrappers/worldGeneration/mimicObject/RegionFileStorageExternalCache.java index edbc1c89f..bcdd6f5ab 100644 --- a/common/src/main/java/com/seibel/distanthorizons/common/wrappers/worldGeneration/mimicObject/RegionFileStorageExternalCache.java +++ b/common/src/main/java/com/seibel/distanthorizons/common/wrappers/worldGeneration/mimicObject/RegionFileStorageExternalCache.java @@ -21,6 +21,8 @@ public class RegionFileStorageExternalCache implements AutoCloseable { private static final Logger LOGGER = DhLoggerBuilder.getLogger(); + /** Can be null due to the C2ME mod */ + @Nullable public final RegionFileStorage storage; public static final int MAX_CACHE_SIZE = 16; @@ -56,6 +58,19 @@ public class RegionFileStorageExternalCache implements AutoCloseable @Nullable public RegionFile getRegionFile(ChunkPos pos) throws IOException { + if (this.storage == null) + { + if (!regionCacheNullPointerWarningSent) + { + regionCacheNullPointerWarningSent = true; + LOGGER.warn("Unable to access Minecraft's chunk cache. This may be due to another mod changing said cache. DH will be unable to access any Minecraft chunk data until said mod is removed."); + } + + return null; + } + + + long posLong = ChunkPos.asLong(pos.getRegionX(), pos.getRegionZ()); RegionFile rFile = null;