Merge branch '1.16' into 1.17

badasintended · Mar 25, 2021 · 9b29ac3 · 9b29ac3
2 parents 11ce028 + d15ba21
commit 9b29ac3
Showing 1 changed file with 15 additions and 7 deletions.
diff --git a/common/src/main/java/mcp/mobius/waila/utils/JsonConfig.java b/common/src/main/java/mcp/mobius/waila/utils/JsonConfig.java
@@ -40,14 +40,12 @@ public JsonConfig(String fileName, Class<T> configClass, Supplier<T> defaultFact
         this(Waila.configDir.resolve(fileName + (fileName.endsWith(".json") ? "" : ".json")).toFile(), configClass, defaultFactory);
     }
 
+    public JsonConfig(File file, Class<T> configClass) {
+        this(file, configClass, defaultFactory(configClass));
+    }
+
     public JsonConfig(String fileName, Class<T> configClass) {
-        this(fileName, configClass, () -> {
-            try {
-                return configClass.getConstructor().newInstance();
-            } catch (Exception e) {
-                throw new RuntimeException("Failed to create new config instance", e);
-            }
-        });
+        this(fileName, configClass, defaultFactory(configClass));
     }
 
     public JsonConfig<T> withGson(Gson gson) {
@@ -77,6 +75,16 @@ public void invalidate() {
         configGetter.invalidate();
     }
 
+    private static <T> Supplier<T> defaultFactory(Class<T> configClass) {
+        return () -> {
+            try {
+                return configClass.getConstructor().newInstance();
+            } catch (Exception e) {
+                throw new RuntimeException("Failed to create new config instance", e);
+            }
+        };
+    }
+
     static class CachedSupplier<T> {
 
         private final Supplier<T> supplier;