Greatly improve efficiency of IO (#230)

* Greatly improve efficiency of IO

* Fix encapsulation breakage

* Implement requested changes

Author: xpple

src/main/java/net/earthcomputer/clientcommands/command/KitCommand.java

@@ -21,6 +21,8 @@
 import net.minecraft.server.command.ServerCommandSource;
 import net.minecraft.text.TranslatableText;
 import net.minecraft.util.Util;
+import org.apache.logging.log4j.LogManager;
+import org.apache.logging.log4j.Logger;
 
 import java.io.File;
 import java.io.IOException;
@@ -34,8 +36,9 @@
 
 public class KitCommand {
 
+    private static final Logger logger = LogManager.getLogger("clientcommands");
+
     private static final SimpleCommandExceptionType SAVE_FAILED_EXCEPTION = new SimpleCommandExceptionType(new TranslatableText("commands.ckit.saveFile.failed"));
-    private static final SimpleCommandExceptionType LOAD_FAILED_EXCEPTION = new SimpleCommandExceptionType(new TranslatableText("commands.ckit.loadFile.failed"));
 
     private static final DynamicCommandExceptionType ALREADY_EXISTS_EXCEPTION = new DynamicCommandExceptionType(arg -> new TranslatableText("commands.ckit.create.alreadyExists", arg));
 
@@ -48,6 +51,14 @@ public class KitCommand {
 
     private static final Map<String, ListTag> kits = new HashMap<>();
 
+    static {
+        try {
+            loadFile();
+        } catch (IOException e) {
+            logger.info("Could not load kits file, hence /ckit will not work!");
+        }
+    }
+
     public static void register(CommandDispatcher<ServerCommandSource> dispatcher) {
         addClientSideCommand("ckit");
 
@@ -75,8 +86,6 @@ public static void register(CommandDispatcher<ServerCommandSource> dispatcher) {
     }
 
     private static int create(ServerCommandSource source, String name) throws CommandSyntaxException {
-        loadFile();
-
         if (kits.containsKey(name)) {
             throw ALREADY_EXISTS_EXCEPTION.create(name);
         }
@@ -87,8 +96,6 @@ private static int create(ServerCommandSource source, String name) throws Comman
     }
 
     private static int delete(ServerCommandSource source, String name) throws CommandSyntaxException {
-        loadFile();
-
         if (kits.remove(name) == null) {
             throw NOT_FOUND_EXCEPTION.create(name);
         }
@@ -98,8 +105,6 @@ private static int delete(ServerCommandSource source, String name) throws Comman
     }
 
     private static int edit(ServerCommandSource source, String name) throws CommandSyntaxException {
-        loadFile();
-
         if (!kits.containsKey(name)) {
             throw NOT_FOUND_EXCEPTION.create(name);
         }
@@ -114,8 +119,6 @@ private static int load(ServerCommandSource source, String name, boolean overrid
             throw NOT_CREATIVE_EXCEPTION.create();
         }
 
-        loadFile();
-
         ListTag kit = kits.get(name);
         if (kit == null) {
             throw NOT_FOUND_EXCEPTION.create(name);
@@ -138,9 +141,7 @@ private static int load(ServerCommandSource source, String name, boolean overrid
         return 0;
     }
 
-    private static int list(ServerCommandSource source) throws CommandSyntaxException {
-        loadFile();
-
+    private static int list(ServerCommandSource source) {
         String list = String.join(", ", kits.keySet());
         sendFeedback(list.equals("") ? "No available kits" : "Available kits: " + list);
         return kits.size();
@@ -163,31 +164,27 @@ private static void saveFile() throws CommandSyntaxException {
         }
     }
 
-    private static void loadFile() throws CommandSyntaxException {
-        try {
-            kits.clear();
-            CompoundTag rootTag = NbtIo.read(new File(configPath.toFile(), "kits.dat"));
-            if (rootTag == null) {
-                return;
-            }
-            final int currentVersion = SharedConstants.getGameVersion().getWorldVersion();
-            final int fileVersion = rootTag.getInt("DataVersion");
-            CompoundTag compoundTag = rootTag.getCompound("Kits");
-            if (fileVersion >= currentVersion) {
-                compoundTag.getKeys().forEach(key -> kits.put(key, compoundTag.getList(key, NbtType.COMPOUND)));
-            } else {
-                compoundTag.getKeys().forEach(key -> {
-                    ListTag updatedListTag = new ListTag();
-                    compoundTag.getList(key, NbtType.COMPOUND).forEach(tag -> {
-                        Dynamic<Tag> oldTagDynamic = new Dynamic<>(NbtOps.INSTANCE, tag);
-                        Dynamic<Tag> newTagDynamic = client.getDataFixer().update(TypeReferences.ITEM_STACK, oldTagDynamic, fileVersion, currentVersion);
-                        updatedListTag.add(newTagDynamic.getValue());
-                    });
-                    kits.put(key, updatedListTag);
+    private static void loadFile() throws IOException {
+        kits.clear();
+        CompoundTag rootTag = NbtIo.read(new File(configPath.toFile(), "kits.dat"));
+        if (rootTag == null) {
+            return;
+        }
+        final int currentVersion = SharedConstants.getGameVersion().getWorldVersion();
+        final int fileVersion = rootTag.getInt("DataVersion");
+        CompoundTag compoundTag = rootTag.getCompound("Kits");
+        if (fileVersion >= currentVersion) {
+            compoundTag.getKeys().forEach(key -> kits.put(key, compoundTag.getList(key, NbtType.COMPOUND)));
+        } else {
+            compoundTag.getKeys().forEach(key -> {
+                ListTag updatedListTag = new ListTag();
+                compoundTag.getList(key, NbtType.COMPOUND).forEach(tag -> {
+                    Dynamic<Tag> oldTagDynamic = new Dynamic<>(NbtOps.INSTANCE, tag);
+                    Dynamic<Tag> newTagDynamic = client.getDataFixer().update(TypeReferences.ITEM_STACK, oldTagDynamic, fileVersion, currentVersion);
+                    updatedListTag.add(newTagDynamic.getValue());
                 });
-            }
-        } catch (IOException e) {
-            throw LOAD_FAILED_EXCEPTION.create();
+                kits.put(key, updatedListTag);
+            });
         }
     }
 }

src/main/resources/assets/clientcommands/lang/en_us.json

@@ -81,7 +81,6 @@
 
   "commands.ckit.notFound": "Kit \"%s\" not found",
   "commands.ckit.saveFile.failed": "Could not save kits file",
-  "commands.ckit.loadFile.failed": "Could not load kits file",
   "commands.ckit.load.success": "Successfully gave kit \"%s\" to self",
   "commands.ckit.load.notCreative": "Player must be in creative mode to give items to self",
   "commands.ckit.create.success": "Successfully created kit \"%s\"",