merge is pain

1 files changed, 19 insertions, 6 deletions

diff --git a/src/main/java/io/github/moulberry/notenoughupdates/NEUManager.java b/src/main/java/io/github/moulberry/notenoughupdates/NEUManager.java
index 24c90c7b..f0b3fc0e 100644
--- a/src/main/java/io/github/moulberry/notenoughupdates/NEUManager.java
+++ b/src/main/java/io/github/moulberry/notenoughupdates/NEUManager.java
@@ -95,6 +95,13 @@ public class NEUManager {
         return SBInfo.getInstance().currentProfile;
     }
 
+    public <T> T getJsonFromFile(File file, Class<T> clazz) {
+        try(BufferedReader reader = new BufferedReader(new InputStreamReader(new FileInputStream(file), StandardCharsets.UTF_8))) {
+            T obj = gson.fromJson(reader, clazz);
+            return obj;
+        } catch(Exception e) { return null; }
+    }
+
     /**
      * Parses a file in to a JsonObject.
      */
@@ -237,8 +244,6 @@ public class NEUManager {
                         } catch (IOException e) {
                         }
                     }
-
-                    Constants.reload();
                 }
             } catch(Exception e) {
                 e.printStackTrace();
@@ -246,8 +251,6 @@ public class NEUManager {
                 if(dialog != null) dialog.dispose();
             }
 
-            System.err.println("First load");
-
             File items = new File(repoLocation, "items");
             if(items.exists()) {
                 File[] itemFiles = new File(repoLocation, "items").listFiles();
@@ -262,9 +265,13 @@ public class NEUManager {
                     }
                 }
             }
-        });
 
-        System.err.println("Second load");
+            try {
+                Constants.reload();
+            } catch(Exception e) {
+                e.printStackTrace();
+            }
+        });
 
         File items = new File(repoLocation, "items");
         if(items.exists()) {
@@ -280,6 +287,12 @@ public class NEUManager {
                 }
             }
         }
+
+        try {
+            Constants.reload();
+        } catch(Exception e) {
+            e.printStackTrace();
+        }
     }
 
     /**