Delete Recipe data or Villager data files, if they are determined to be empty.

Author: sakura-ryoko

gradle.properties

@@ -9,10 +9,10 @@ author = masa
 mod_file_name = itemscroller-fabric
 
 # Current mod version
-mod_version = 0.30.2-sakura.2
+mod_version = 0.30.2-sakura.3
 
 # Required malilib version
-malilib_version = 059239c8ef
+malilib_version = af945e9e49
 
 # Minecraft, Fabric Loader and API and mappings versions
 minecraft_version_out = 1.21.11

src/main/java/fi/dy/masa/itemscroller/recipes/RecipeStorage.java

@@ -143,6 +143,26 @@ public void clearRecipe(int index)
         this.dirty = true;
     }
 
+    private boolean isEmpty()
+    {
+        return !(this.recipes.length > 0) || this.isRecipesEmpty();
+    }
+
+    private boolean isRecipesEmpty()
+    {
+        boolean empty = true;
+
+	    for (RecipePattern recipe : this.recipes)
+	    {
+		    if (!recipe.isEmpty())
+		    {
+			    empty = false;
+		    }
+	    }
+
+        return empty;
+    }
+
     public void onAddToRecipeBook(RecipeDisplayEntry entry)
     {
         Minecraft mc = Minecraft.getInstance();
@@ -240,6 +260,11 @@ private CompoundData writeToNBT(@Nonnull RegistryAccess registry)
         ListData tagRecipes = new ListData();
         CompoundData data = new CompoundData();
 
+        if (this.isEmpty())
+        {
+            return data;
+        }
+
         for (int i = 0; i < this.recipes.length; i++)
         {
             if (this.recipes[i].isValid())
@@ -360,6 +385,19 @@ public void writeToDisk(@Nonnull RegistryAccess registry)
 
 //                    NbtUtils.writeCompressed(this.writeToNBT(registry), fileTmp);
 	                CompoundData data = this.writeToNBT(registry);
+
+                    // Don't save a file if there are no recipe's to save.
+                    if (data.isEmpty())
+                    {
+                        if (Files.exists(fileReal))
+                        {
+                            Files.delete(fileReal);
+                        }
+
+                        this.dirty = false;
+                        return;
+                    }
+
 	                DataFileUtils.writeCompoundDataToCompressedNbtFile(fileTmp, data);
 
                     if (Files.exists(fileReal))

src/main/java/fi/dy/masa/itemscroller/villager/VillagerData.java

@@ -52,10 +52,20 @@ IntArrayList getFavorites()
         return this.favorites;
     }
 
+    protected boolean isEmpty()
+    {
+        return this.favorites.isEmpty();
+    }
+
     public CompoundData toNBT()
     {
 	    CompoundData data = new CompoundData();
 
+        if (this.isEmpty())
+        {
+            return data;
+        }
+
 	    data.putLong("UUIDM", this.uuid.getMostSignificantBits());
 	    data.putLong("UUIDL", this.uuid.getLeastSignificantBits());
 	    data.putInt("ListPosition", this.tradeListPosition);

src/main/java/fi/dy/masa/itemscroller/villager/VillagerDataStorage.java

@@ -155,12 +155,38 @@ private void readFromNBT(CompoundData tags)
         }
     }
 
+    private boolean isEmpty()
+    {
+        return (this.data.isEmpty() || this.isVillagerDataEmpty()) && this.globalFavorites.isEmpty();
+    }
+
+    private boolean isVillagerDataEmpty()
+    {
+        boolean empty = true;
+
+        for (VillagerData data : this.data.values())
+        {
+            if (!data.isEmpty())
+            {
+                empty = false;
+            }
+        }
+
+        return empty;
+    }
+
     private CompoundData writeToNBT()
     {
 	    CompoundData tags = new CompoundData();
         ListData favoriteListData = new ListData();
 	    ListData globalFavoriteData = new ListData();
 
+        if (this.isEmpty())
+        {
+            dirty = false;
+            return tags;
+        }
+
         for (VillagerData data : this.data.values())
         {
             favoriteListData.add(data.toNBT());
@@ -258,6 +284,19 @@ public void writeToDisk()
 
 //                    NbtUtils.writeCompressed(this.writeToNBT(), fileTmp);
 	                CompoundData data = this.writeToNBT();
+
+                    // Don't save file if there are no entries.
+                    if (data.isEmpty())
+                    {
+                        if (Files.exists(fileReal))
+                        {
+                            Files.delete(fileReal);
+                        }
+
+                        this.dirty = false;
+                        return;
+                    }
+
 					DataFileUtils.writeCompoundDataToCompressedNbtFile(fileTmp, data);
 
                     if (Files.exists(fileReal))