fix: crash on startup due to Vault (#87)

Author: skyecodes

common/src/main/java/com/github/franckyi/ibeeditor/client/Vault.java

@@ -1,8 +1,9 @@
 package com.github.franckyi.ibeeditor.client;
 
 import com.github.franckyi.ibeeditor.PlatformUtil;
+import io.netty.buffer.ByteBufInputStream;
 import io.netty.buffer.Unpooled;
-import net.minecraft.nbt.CompoundTag;
+import net.minecraft.nbt.*;
 import net.minecraft.network.FriendlyByteBuf;
 import org.apache.logging.log4j.LogManager;
 import org.apache.logging.log4j.Logger;
@@ -88,14 +89,36 @@ private static void loadFromFile(Path path) {
         try (var is = Files.newInputStream(path)) {
             buffer.writeBytes(is, is.available());
             INSTANCE.version = buffer.readInt();
-            IntStream.range(0, buffer.readInt()).forEach(i -> INSTANCE.items.add(buffer.readNbt()));
-            IntStream.range(0, buffer.readInt()).forEach(i -> INSTANCE.entities.add(buffer.readNbt()));
+            IntStream.range(0, buffer.readInt()).forEach(i -> INSTANCE.items.add(safeReadNbt()));
+            IntStream.range(0, buffer.readInt()).forEach(i -> INSTANCE.entities.add(safeReadNbt()));
             LOGGER.info("Vault loaded");
         } catch (IOException e) {
             LOGGER.error("Error while loading vault", e);
         }
     }
 
+    private static CompoundTag safeReadNbt() {
+        var i = buffer.readerIndex();
+        try {
+            var result = buffer.readNbt();
+            if (result == null || result.isEmpty()) throw new RuntimeException("Tag is empty, this must be an error");
+            return result;
+        } catch (Exception e) {
+            buffer.readerIndex(i);
+            byte b0 = buffer.readByte();
+            if (b0 != Tag.TAG_COMPOUND) {
+                throw e;
+            } else {
+                buffer.readerIndex(i);
+                try {
+                    return NbtIo.read(new ByteBufInputStream(buffer));
+                } catch (IOException e0) {
+                    throw new RuntimeException(e0);
+                }
+            }
+        }
+    }
+
     public static void save() {
         try (var os = Files.newOutputStream(VAULT_FILE)) {
             buffer.writeInt(INSTANCE.version);

forge_update.json

@@ -5,7 +5,7 @@
     "1.20-recommended": "2.2.3",
     "1.20.1-latest": "2.2.3",
     "1.20.1-recommended": "2.2.3",
-    "1.20.2-latest": "2.2.4",
-    "1.20.2-recommended": "2.2.4"
+    "1.20.2-latest": "2.2.5",
+    "1.20.2-recommended": "2.2.5"
   }
 }

gradle.properties

@@ -4,7 +4,7 @@ org.gradle.daemon=false
 # IBE Editor
 minecraft_version=1.20.2
 archives_base_name=IBEEditor
-mod_version=2.2.4
+mod_version=2.2.5
 maven_group=com.github.franckyi.ibeeditor
 # Fabric https://fabricmc.net/develop/
 fabric_loader_version=0.14.24

versions.json

@@ -1,7 +1,11 @@
 {
+  "2.2.5": {
+    "type": "release",
+    "changelog": "* fix: crash on startup due to Vault (#87)"
+  },
   "2.2.4": {
     "type": "release",
-    "changelog": "* feat: 1.20.2 update (#86)\n* fix(forge): make mod optional for client (#84)"
+    "changelog": "* feat: 1.20.2 update (#86)\n* fix(forge): make mod optional for client (#84)\n* fix: allow the block editor to be opened when the mod isn't installed on the server (#85)"
   },
   "2.2.3": {
     "type": "release",