Fix several issues around sectioned world data i/o, bump neoforge version, bump version

Signed-off-by: HellFirePvP <7419378+HellFirePvP@users.noreply.github.com>

Author: HellFirePvP

build.gradle

@@ -83,7 +83,10 @@ tasks.withType(ProcessResources).configureEach {
     }
 }
 
-// Example configuration to allow publishing using the maven-publish plugin
+java {
+    withSourcesJar()
+}
+
 publishing {
     publications {
         register('mavenJava', MavenPublication) {

gradle.properties

@@ -7,14 +7,14 @@ neogradle.subsystems.parchment.mappingsVersion=2024.11.17
 
 minecraft_version=1.21.1
 minecraft_version_range=[1.21.1,1.22)
-neo_version=21.1.85
+neo_version=21.1.173
 neo_version_range=[21.1.0,)
 loader_version_range=[4,)
 
 mod_id=observerlib
 mod_name=ObserverLib
 mod_license=GNU Lesser General Public License v3.0
-mod_version=1.9.0
+mod_version=1.10.1
 mod_group_id=hellfirepvp.observerlib
 mod_authors=HellFirePvP
 mod_description=Cached world structure and change monitoring library.

src/main/java/hellfirepvp/observerlib/common/data/CachedWorldData.java

@@ -20,7 +20,6 @@
 public abstract class CachedWorldData<T extends CachedWorldData<T>> implements IWorldRelatedData<T> {
 
     private final ReadWriteLock rwLock = new ReentrantReadWriteLock();
-    protected final Random rand = new Random();
     private final WorldCacheDomain.SaveKey<T> key;
 
     protected CachedWorldData(WorldCacheDomain.SaveKey<T> key) {

src/main/java/hellfirepvp/observerlib/common/data/IWorldRelatedData.java

@@ -1,9 +1,14 @@
 package hellfirepvp.observerlib.common.data;
 
+import com.mojang.serialization.Codec;
+import net.minecraft.util.Tuple;
 import net.minecraft.world.level.Level;
 
 import java.io.File;
 import java.io.IOException;
+import java.util.Optional;
+import java.util.function.BiFunction;
+import java.util.function.Function;
 
 /**
  * This class is part of the ObserverLib Mod
@@ -14,14 +19,23 @@
  */
 public interface IWorldRelatedData<T extends IWorldRelatedData<T>> {
 
-    public WorldCacheDomain.SaveKey<T> getSaveKey();
+    WorldCacheDomain.SaveKey<T> getSaveKey();
 
-    public abstract void markSaved();
+    void markSaved();
 
-    default public void onLoad(Level world) {}
+    default void onLoad(Level world) {}
 
-    public void writeAdditionalData(File saveDir, File backupDir) throws IOException;
+    default void setLoader(FileLoader<?> loader) {}
 
-    public void readAdditionalData(File dir) throws IOException;
+    void writeAdditionalData(File saveDir, File backupDir) throws IOException;
 
+    void readAdditionalData(File directory, FileLoader<?> fileLoader);
+
+    interface FileResolver {
+        File resolveFile(File directory);
+    }
+
+    interface FileLoader<F> {
+        Optional<Tuple<F, File>> loadData(FileResolver resolver, Codec<F> codec);
+    }
 }

src/main/java/hellfirepvp/observerlib/common/data/WorldCacheDomain.java

@@ -1,9 +1,7 @@
 package hellfirepvp.observerlib.common.data;
 
 import com.google.common.io.Files;
-import com.mojang.datafixers.util.Pair;
 import com.mojang.serialization.Codec;
-import com.mojang.serialization.DataResult;
 import com.mojang.serialization.codecs.RecordCodecBuilder;
 import hellfirepvp.observerlib.ObserverLib;
 import net.minecraft.server.MinecraftServer;
@@ -142,23 +140,23 @@ public Codec<T> getInstanceCodec() {
             return instanceCodec;
         }
 
-        public T getNewInstance(SaveKey<T> key) {
-            return instanceProvider.apply(key);
+        public T newInstance() {
+            return instanceProvider.apply(this);
         }
 
-        public File getSaveFile(File directory) {
-            return directory.toPath().resolve(this.getIdentifier() + ".dat").toFile();
+        public IWorldRelatedData.FileResolver saveFileResolver() {
+            return directory -> directory.toPath().resolve(this.getIdentifier() + ".dat").toFile();
         }
 
         public File createAndBackupSaveFile(File saveDir, File backupDir) throws IOException {
-            return this.createAndBackupSaveFile(saveDir, backupDir, this::getSaveFile);
+            return this.createAndBackupSaveFile(saveDir, backupDir, this.saveFileResolver());
         }
 
-        public File createAndBackupSaveFile(File saveDir, File backupDir, Function<File, File> fileResolver) throws IOException {
-            File saveFile = fileResolver.apply(saveDir);
+        public File createAndBackupSaveFile(File saveDir, File backupDir, IWorldRelatedData.FileResolver fileResolver) throws IOException {
+            File saveFile = fileResolver.resolveFile(saveDir);
             if (saveFile.exists()) {
                 try {
-                    Files.copy(saveFile, fileResolver.apply(backupDir));
+                    Files.copy(saveFile, fileResolver.resolveFile(backupDir));
                 } catch (Exception exc) {
                     ObserverLib.log.info("Copying '{}' 's actual file to its backup file failed!", this.getIdentifier());
                     exc.printStackTrace();

src/main/java/hellfirepvp/observerlib/common/data/WorldCacheIOThread.java

@@ -10,13 +10,14 @@
 import net.minecraft.nbt.Tag;
 import net.minecraft.resources.ResourceLocation;
 import net.minecraft.SharedConstants;
+import net.minecraft.util.Tuple;
 import net.minecraft.world.level.Level;
-import org.apache.commons.io.FileUtils;
 
 import javax.annotation.Nonnull;
 import java.io.File;
 import java.io.IOException;
 import java.util.*;
+import java.util.function.BiFunction;
 
 /**
  * This class is part of the ObserverLib Mod
@@ -155,56 +156,81 @@ private static <T extends IWorldRelatedData<T>> void writeDataToFile(IWorldRelat
     @Nonnull
     private static <T extends IWorldRelatedData<T>> T loadDataFromFile(WorldCacheDomain domain, ResourceLocation dimTypeName, WorldCacheDomain.SaveKey<T> key) {
         DirectorySet f = getDirectorySet(domain.getSaveDirectory(), dimTypeName, key);
-        if (!f.getActualDirectory().exists() && !f.getBackupDirectory().exists()) {
-            return key.getNewInstance(key);
-        }
-        ObserverLib.log.info("Load WorldRelatedData '" + key.getIdentifier() + "' for world " + dimTypeName);
-        boolean errored = false;
-        T data = null;
-        try {
-            if (f.getActualDirectory().exists()) {
-                data = attemptLoad(key, f.getActualDirectory());
+        IWorldRelatedData.FileLoader<T> loader = createLoadingContext(f, key);
+
+        ObserverLib.log.info("Loading WorldData {}/{} for level {}", key.getDomainName().getNamespace(), key.getIdentifier(), dimTypeName);
+        T loaded = loader.loadData(key.saveFileResolver(), key.getInstanceCodec())
+                .map(dataTpl -> {
+                    dataTpl.getA().readAdditionalData(dataTpl.getB().getParentFile(), loader);
+                    return dataTpl.getA();
+                })
+                .orElseGet(key::newInstance);
+        ObserverLib.log.info("Loading WorldData {}/{} for level {} finished", key.getDomainName().getNamespace(), key.getIdentifier(), dimTypeName);
+        return loaded;
+    }
+
+    private static <F> IWorldRelatedData.FileLoader<F> createLoadingContext(DirectorySet dirSet, WorldCacheDomain.SaveKey<?> rootKey) {
+        String rootName = rootKey.saveFileResolver().resolveFile(new File("/")).getAbsolutePath();
+        return (fileResolver, codec) -> {
+            if (!dirSet.getActualDirectory().exists() && !dirSet.getBackupDirectory().exists()) {
+                return Optional.empty();
             }
-        } catch (Exception exc) {
-            ObserverLib.log.info("Loading worlddata '" + key.getIdentifier() + "' failed for its actual save. Attempting load from backup.");
-            errored = true;
-        }
-        if(data == null) {
+            // Resolve from root to get an idea of what's being loaded.
+            String attemptName = fileResolver.resolveFile(new File("/")).getAbsolutePath();
+            boolean isSaveRoot = attemptName.equals(rootName);
+
+            F data = null;
+            File dataFile = null;
+
+            // Try load from actual fileset
             try {
-                if (f.getBackupDirectory().exists()) {
-                    data = attemptLoad(key, f.getBackupDirectory());
+                if (dirSet.getActualDirectory().exists()) {
+                    dataFile = fileResolver.resolveFile(dirSet.getActualDirectory());
+                    if (dataFile.exists()) {
+                        CompoundTag dataTag = NbtIo.read(dataFile.toPath());
+                        data = codec.parse(NbtOps.INSTANCE, dataTag.get("data")).getOrThrow(IOException::new);
+                    }
                 }
             } catch (Exception exc) {
-                ObserverLib.log.info("Loading worlddata '" + key.getIdentifier() + "' failed for its backup save. Creating empty one for current runtime and copying erroneous files to error directory.");
-                errored = true;
+                ObserverLib.log.warn("Loading level data {} failed for its actual save. Attempting load from backup.",
+                        (isSaveRoot ? rootKey.getIdentifier() : rootKey.getIdentifier() + attemptName));
             }
-        }
-        if(data == null && errored) {
-            DirectorySet errorSet = f.getErrorDirectories();
-            try {
-                if(f.getActualDirectory().exists()) {
-                    Files.copy(f.getActualDirectory(), errorSet.getActualDirectory());
-                    FileUtils.deleteDirectory(f.getActualDirectory());
+            // Try load from backup fileset
+            if (data == null) {
+                try {
+                    if (dirSet.getBackupDirectory().exists()) {
+                        dataFile = fileResolver.resolveFile(dirSet.getBackupDirectory());
+                        if (dataFile.exists()) {
+                            CompoundTag dataTag = NbtIo.read(dataFile.toPath());
+                            data = codec.parse(NbtOps.INSTANCE, dataTag.get("data")).getOrThrow(IOException::new);
+                        }
+                    }
+                } catch (Exception exc) {
+                    ObserverLib.log.warn("Loading level data {} failed for its backup save. Copying erroneous files to error directory.",
+                            (isSaveRoot ? rootKey.getIdentifier() : rootKey.getIdentifier() + attemptName));
                 }
-                if(f.getBackupDirectory().exists()) {
-                    Files.copy(f.getBackupDirectory(), errorSet.getBackupDirectory());
-                    FileUtils.deleteDirectory(f.getBackupDirectory());
+            }
+            // Copy files to error directory and give up.
+            if (data == null) {
+                DirectorySet errorSet = dirSet.getErrorDirectories();
+                try {
+                    if (dirSet.getActualDirectory().exists()) {
+                        Files.copy(dirSet.getActualDirectory(), errorSet.getActualDirectory());
+                    }
+                    if (dirSet.getBackupDirectory().exists()) {
+                        Files.copy(dirSet.getBackupDirectory(), errorSet.getBackupDirectory());
+                    }
+                } catch (Exception e) {
+                    ObserverLib.log.warn("Copying erroneous level data {} to the error directory failed.",
+                            (isSaveRoot ? rootKey.getIdentifier() : rootKey.getIdentifier() + attemptName));
+                    ObserverLib.log.error("Copying files failed.", e);
                 }
-            } catch (Exception e) {
-                ObserverLib.log.info("Attempting to copy erroneous worlddata '" + key.getIdentifier() + "' to its error files directory failed.");
-                e.printStackTrace();
             }
-        }
-        if (data == null) {
-            data = key.getNewInstance(key);
-        }
-        ObserverLib.log.info("Loading of '" + key.getIdentifier() + "' for world " + dimTypeName + " finished.");
-        return data;
-    }
-
-    private static <T extends IWorldRelatedData<T>> T attemptLoad(WorldCacheDomain.SaveKey<T> key, File baseDirectory) throws IOException {
-        CompoundTag dataTag = NbtIo.read(key.getSaveFile(baseDirectory).toPath());
-        return key.getInstanceCodec().parse(NbtOps.INSTANCE, dataTag.get("data")).getOrThrow(IOException::new);
+            if (data == null) {
+                return Optional.empty();
+            }
+            return Optional.of(new Tuple<>(data, dataFile));
+        };
     }
 
     private synchronized static DirectorySet getDirectorySet(File baseDirectory, ResourceLocation dimTypeName, WorldCacheDomain.SaveKey<?> key) {
@@ -217,15 +243,6 @@ private synchronized static DirectorySet getDirectorySet(File baseDirectory, Res
         return new DirectorySet(new File(worldDir, key.getIdentifier()));
     }
 
-    private static File getServerWorldDirectory(File baseDirectory) {
-        File pDir = new File(baseDirectory, "worlddata");
-        if (!pDir.exists()) {
-            pDir.mkdirs();
-        }
-        ensureFolder(pDir);
-        return pDir;
-    }
-
     private static void ensureFolder(File f) {
         if (!f.isDirectory()) {
             ObserverLib.log.warn("dataFile exists, but is a file instead of a folder! Please ensure that this is a folder/delete the file!");