fix override system doesn't work

Ghost-chu · Ghost-chu · commit b28457c13dbb · 2021-11-02T07:35:44.000+08:00
diff --git a/src/main/java/org/maxgamer/quickshop/localization/text/SimpleTextManager.java b/src/main/java/org/maxgamer/quickshop/localization/text/SimpleTextManager.java
@@ -193,7 +193,9 @@ private void applyOverrideConfiguration(@NotNull JsonConfiguration distributionC
             if ("language-version".equals(key) || "config-version".equals(key) || "version".equals(key)) {
                 continue;
             }
-            distributionConfiguration.set(key, distributionConfiguration.get(key));
+            Object content = overrideConfiguration.get(key);
+            Util.debugLog("Override key " + key + " with content: " + content);
+            distributionConfiguration.set(key, content);
         }
     }
 
@@ -234,9 +236,7 @@ private JsonConfiguration getOverrideConfiguration(@NotNull String overrideFile,
             localOverrideFile.getParentFile().mkdirs();
             localOverrideFile.createNewFile();
         }
-        JsonConfiguration configuration = new JsonConfiguration();
-        configuration.loadFromString(Util.readToString(localOverrideFile));
-        return configuration;
+        return JsonConfiguration.loadConfiguration(localOverrideFile);
     }
 
     /**

Original file line number	Diff line number	Diff line change
`@@ -193,7 +193,9 @@ private void applyOverrideConfiguration(@NotNull JsonConfiguration distributionC`
`193`	`193`	`if ("language-version".equals(key) \|\| "config-version".equals(key) \|\| "version".equals(key)) {`
`194`	`194`	`continue;`
`195`	`195`	`}`
`196`		`- distributionConfiguration.set(key, distributionConfiguration.get(key));`
	`196`	`+ Object content = overrideConfiguration.get(key);`
	`197`	`+ Util.debugLog("Override key " + key + " with content: " + content);`
	`198`	`+ distributionConfiguration.set(key, content);`
`197`	`199`	`}`
`198`	`200`	`}`
`199`	`201`
`@@ -234,9 +236,7 @@ private JsonConfiguration getOverrideConfiguration(@NotNull String overrideFile,`
`234`	`236`	`localOverrideFile.getParentFile().mkdirs();`
`235`	`237`	`localOverrideFile.createNewFile();`
`236`	`238`	`}`
`237`		`- JsonConfiguration configuration = new JsonConfiguration();`
`238`		`- configuration.loadFromString(Util.readToString(localOverrideFile));`
`239`		`- return configuration;`
	`239`	`+ return JsonConfiguration.loadConfiguration(localOverrideFile);`
`240`	`240`	`}`
`241`	`241`
`242`	`242`	`/**`