Small Fixes

Fixed Multiple Json Issues
Fixed Multiple Yaml Issues

Author: ImNotStable

src/main/java/com/imnotstable/qualityeconomy/storage/storageformats/JsonStorageType.java

@@ -32,7 +32,8 @@ public boolean initStorageProcesses() {
           json = new Gson().fromJson(reader, JsonObject.class);
         }
       }
-      json.getAsJsonArray("custom-currencies").forEach(currency -> currencies.add(currency.getAsString()));
+      toggleCustomCurrencies();
+      save();
     } catch (IOException exception) {
       new Debug.QualityError("Failed to initiate storage processes", exception).log();
       return false;
@@ -76,9 +77,7 @@ public void updateAccounts(@NotNull Collection<Account> accounts) {
   @Override
   public @NotNull Map<UUID, Account> getAllAccounts() {
     HashMap<UUID, Account> accounts = new HashMap<>();
-    for (Map.Entry<String, JsonElement> entry : json.entrySet()) {
-      if (entry.getKey().equals("custom-currencies"))
-        continue;
+    for (Map.Entry<String, JsonElement> entry : getEntrySet()) {
       UUID uuid = UUID.fromString(entry.getKey());
       JsonObject accountJson = entry.getValue().getAsJsonObject();
       Account account = new Account(uuid)
@@ -104,6 +103,10 @@ public void addCurrency(@NotNull String currency) {
       currencies = new JsonArray();
     currencies.add(currency);
     json.add("custom-currencies", currencies);
+    for (Map.Entry<String, JsonElement> entry : getEntrySet()) {
+      JsonObject accountJson = entry.getValue().getAsJsonObject();
+      accountJson.addProperty(currency, 0);
+    }
     addCurrencySuccess(currency);
     save();
   }
@@ -114,6 +117,10 @@ public void removeCurrency(@NotNull String currency) {
     JsonArray currencies = json.getAsJsonArray("custom-currencies");
     currencies.remove(new Gson().toJsonTree(currency));
     json.add("custom-currencies", currencies);
+    for (Map.Entry<String, JsonElement> entry : getEntrySet()) {
+      JsonObject accountJson = entry.getValue().getAsJsonObject();
+      accountJson.remove(currency);
+    }
     removeCurrencySuccess(currency);
     save();
   }

src/main/java/com/imnotstable/qualityeconomy/storage/storageformats/YamlStorageType.java

@@ -24,8 +24,11 @@ public boolean initStorageProcesses() {
         if (!file.createNewFile())
           return false;
         yaml = new YamlConfiguration();
-      } else
+      } else {
         yaml = YamlConfiguration.loadConfiguration(file);
+      }
+      toggleCustomCurrencies();
+      save();
     } catch (IOException exception) {
       new Debug.QualityError("Failed to initiate storage processes", exception).log();
       return false;
@@ -69,9 +72,7 @@ public void updateAccounts(@NotNull Collection<Account> accounts) {
   @Override
   public @NotNull Map<UUID, Account> getAllAccounts() {
     Map<UUID, Account> accounts = new HashMap<>();
-    for (String uuid : yaml.getKeys(false)) {
-      if (uuid.equals("custom-currencies"))
-        continue;
+    for (String uuid : getAllUniqueIds()) {
       Account account = new Account(UUID.fromString(uuid));
       account.setUsername(yaml.getString(uuid + ".USERNAME"));
       account.setBalance(yaml.getDouble(uuid + ".BALANCE"));
@@ -93,6 +94,8 @@ public void addCurrency(@NotNull String currency) {
     List<String> currencies = yaml.getStringList("custom-currencies");
     currencies.add(currency);
     yaml.set("custom-currencies", currencies);
+    for (String uuid : getAllUniqueIds())
+      yaml.set(uuid + "." + currency, 0);
     addCurrencySuccess(currency);
     save();
   }
@@ -103,6 +106,8 @@ public void removeCurrency(@NotNull String currency) {
     List<String> currencies = yaml.getStringList("custom-currencies");
     currencies.remove(currency);
     yaml.set("custom-currencies", currencies);
+    for (String uuid : getAllUniqueIds())
+      yaml.set(uuid + "." + currency, null);
     removeCurrencySuccess(currency);
     save();
   }

src/main/java/com/imnotstable/qualityeconomy/util/storage/EasyJson.java

@@ -2,6 +2,8 @@
 
 import com.google.gson.Gson;
 import com.google.gson.GsonBuilder;
+import com.google.gson.JsonArray;
+import com.google.gson.JsonElement;
 import com.google.gson.JsonObject;
 import com.imnotstable.qualityeconomy.QualityEconomy;
 import com.imnotstable.qualityeconomy.configuration.Configuration;
@@ -11,6 +13,9 @@
 import java.io.File;
 import java.io.FileWriter;
 import java.io.IOException;
+import java.util.HashSet;
+import java.util.Map;
+import java.util.Set;
 
 public class EasyJson extends EasyCurrencies {
 
@@ -30,6 +35,23 @@ protected JsonObject serialize(Account account) {
     return json;
   }
 
+  protected void toggleCustomCurrencies() {
+    if (Configuration.areCustomCurrenciesEnabled()) {
+      if (!json.has("custom-currencies"))
+        json.add("custom-currencies", new JsonArray());
+      json.getAsJsonArray("custom-currencies").forEach(currency -> currencies.add(currency.getAsString()));
+    } else {
+      json.remove("custom-currencies");
+    }
+  }
+  
+  
+  protected Set<Map.Entry<String, JsonElement>> getEntrySet() {
+    Set<Map.Entry<String, JsonElement>> entrySet = new HashSet<>(json.entrySet());
+    entrySet.removeIf(entry -> entry.getKey().equals("custom-currencies"));
+    return entrySet;
+  }
+  
   protected void save() {
     Gson gson = new GsonBuilder().create();
     try (FileWriter fileWriter = new FileWriter(file)) {

src/main/java/com/imnotstable/qualityeconomy/util/storage/EasyYaml.java

@@ -8,6 +8,8 @@
 
 import java.io.File;
 import java.io.IOException;
+import java.util.ArrayList;
+import java.util.Set;
 import java.util.UUID;
 
 public class EasyYaml extends EasyCurrencies {
@@ -27,6 +29,22 @@ protected void setAccount(Account account) {
       account.getCustomBalances().forEach((currency, balance) -> yaml.set(uuid + "." + currency, balance));
   }
 
+  protected void toggleCustomCurrencies() {
+    if (Configuration.areCustomCurrenciesEnabled()) {
+      if (!yaml.contains("custom-currencies"))
+        yaml.set("custom-currencies", new ArrayList<String>());
+      currencies.addAll(yaml.getStringList("custom-currencies"));
+    } else {
+      yaml.set("custom-currencies", null);
+    }
+  }
+  
+  protected Set<String> getAllUniqueIds() {
+    Set<String> keys = yaml.getKeys(false);
+    keys.remove("custom-currencies");
+    return keys;
+  }
+  
   protected void save() {
     try {
       yaml.save(file);