Improve chunk error handling further

Author: TBlueF

core/src/main/java/de/bluecolored/bluemap/core/world/ChunkConsumer.java

@@ -24,6 +24,10 @@
  */
 package de.bluecolored.bluemap.core.world;
 
+import de.bluecolored.bluemap.core.logger.Logger;
+
+import java.io.IOException;
+
 @FunctionalInterface
 public interface ChunkConsumer<T> {
 
@@ -33,6 +37,10 @@ default boolean filter(int chunkX, int chunkZ, int lastModified) {
 
     void accept(int chunkX, int chunkZ, T chunk);
 
+    default void fail(int chunkX, int chunkZ, IOException exception) throws IOException {
+        throw exception;
+    }
+
     @FunctionalInterface
     interface ListOnly<T> extends ChunkConsumer<T> {
 

core/src/main/java/de/bluecolored/bluemap/core/world/Region.java

@@ -45,6 +45,7 @@ public boolean filter(int x, int z, int lastModified) {
             public void accept(int chunkX, int chunkZ, T chunk) {
                 this.foundChunk = chunk;
             }
+
         }
 
         SingleChunkConsumer singleChunkConsumer = new SingleChunkConsumer();

core/src/main/java/de/bluecolored/bluemap/core/world/mca/ChunkGrid.java

@@ -111,9 +111,14 @@ public void accept(int chunkX, int chunkZ, T chunk) {
                     Vector2i chunkPos = VECTOR_2_I_CACHE.get(chunkX, chunkZ);
                     chunkCache.put(chunkPos, chunk);
                 }
+
+                @Override
+                public void fail(int chunkX, int chunkZ, IOException ex) {
+                    Logger.global.logDebug("Failed to preload chunk (%d, %d) from region ('%s' -> x:%d, z:%d): %s".formatted(chunkX, chunkZ, regionFolder, x, z, ex));
+                }
             });
         } catch (IOException ex) {
-            Logger.global.logDebug("Unexpected exception trying to load preload region ('%s' -> x:%d, z:%d): %s".formatted(regionFolder, x, z, ex));
+            Logger.global.logDebug("Unexpected exception trying to preload region ('%s' -> x:%d, z:%d): %s".formatted(regionFolder, x, z, ex));
         }
     }
 

core/src/main/java/de/bluecolored/bluemap/core/world/mca/region/LinearRegion.java

@@ -170,8 +170,15 @@ public void iterateAllChunks(ChunkConsumer<T> consumer) throws IOException {
                                 chunkDataBuffer = new byte[length];
                             dIn.readFully(chunkDataBuffer, 0, length);
 
-                            T chunk = chunkLoader.load(chunkDataBuffer, 0, length, Compression.NONE);
-                            consumer.accept(chunkX, chunkZ, chunk);
+                            try {
+                                T chunk = chunkLoader.load(chunkDataBuffer, 0, length, Compression.NONE);
+                                consumer.accept(chunkX, chunkZ, chunk);
+                            } catch (IOException ex) {
+                                consumer.fail(chunkX, chunkZ, ex);
+                            } catch (Exception ex) {
+                                consumer.fail(chunkX, chunkZ, new IOException(ex));
+                            }
+
                         } else {
                             // skip before reading the next chunk, but only if there is a next chunk
                             // that we actually want to read, to avoid decompressing unnecessary data

core/src/main/java/de/bluecolored/bluemap/core/world/mca/region/MCARegion.java

@@ -152,8 +152,15 @@ public void iterateAllChunks(ChunkConsumer<T> consumer) throws IOException {
                         channel.position(offset);
                         readFully(channel, chunkDataBuffer, 0, size);
 
-                        T chunk = loadChunk(chunkDataBuffer, size);
-                        consumer.accept(chunkX, chunkZ, chunk);
+                        try {
+                            T chunk = loadChunk(chunkDataBuffer, size);
+                            consumer.accept(chunkX, chunkZ, chunk);
+                        } catch (IOException ex) {
+                            consumer.fail(chunkX, chunkZ, ex);
+                        } catch (Exception ex) {
+                            consumer.fail(chunkX, chunkZ, new IOException(ex));
+                        }
+
                     }
                 }
             }