diff --git a/src/main/java/org/maxgamer/quickshop/command/CommandContainer.java b/src/main/java/org/maxgamer/quickshop/command/CommandContainer.java index 3fb13980d..9f0a6fc44 100644 --- a/src/main/java/org/maxgamer/quickshop/command/CommandContainer.java +++ b/src/main/java/org/maxgamer/quickshop/command/CommandContainer.java @@ -91,6 +91,4 @@ public class CommandContainer { return MsgUtil.getMessage("command.feature-not-enabled", null); } } - - } diff --git a/src/main/java/org/maxgamer/quickshop/file/HumanReadableJsonConfiguration.java b/src/main/java/org/maxgamer/quickshop/file/HumanReadableJsonConfiguration.java index fdaa1bc12..b0b5e426d 100644 --- a/src/main/java/org/maxgamer/quickshop/file/HumanReadableJsonConfiguration.java +++ b/src/main/java/org/maxgamer/quickshop/file/HumanReadableJsonConfiguration.java @@ -27,6 +27,7 @@ import org.maxgamer.quickshop.util.JsonUtil; import java.io.File; import java.io.IOException; +import java.io.InputStreamReader; import java.util.logging.Level; import java.util.logging.Logger; @@ -48,6 +49,16 @@ public class HumanReadableJsonConfiguration extends JsonConfiguration { return configuration; } + public static HumanReadableJsonConfiguration loadConfiguration(@NotNull InputStreamReader inputStreamReader) { + HumanReadableJsonConfiguration configuration = new HumanReadableJsonConfiguration(); + try { + configuration.load(inputStreamReader); + } catch (IOException | InvalidConfigurationException exception) { + logger.log(Level.SEVERE, "Cannot load original language file", exception); + } + return configuration; + } + @Override public @NotNull String saveToString() { return JsonUtil.getHumanReadableGson().toJson(SerializationHelper.serialize(this.getValues(false))); diff --git a/src/main/java/org/maxgamer/quickshop/util/MsgUtil.java b/src/main/java/org/maxgamer/quickshop/util/MsgUtil.java index 5bb366a9a..cb3e052b8 100644 --- a/src/main/java/org/maxgamer/quickshop/util/MsgUtil.java +++ b/src/main/java/org/maxgamer/quickshop/util/MsgUtil.java @@ -80,6 +80,7 @@ public class MsgUtil { @Getter private static YamlConfiguration potioni18n; private static JsonConfiguration builtInLang; + private static JsonConfiguration builtInOriginalLang; private static DecimalFormat processFormat() { try { @@ -288,6 +289,11 @@ public class MsgUtil { Util.debugLog("Cannot load default built-in language file: " + ioException.getMessage()); } builtInLang = HumanReadableJsonConfiguration.loadConfiguration(buildInLangFile); + try (InputStreamReader inputStreamReader = new InputStreamReader(Objects.requireNonNull(plugin.getResource("lang-original/messages.json")))) { + builtInOriginalLang = HumanReadableJsonConfiguration.loadConfiguration(inputStreamReader); + } catch (IOException | NullPointerException exception) { + plugin.getLogger().log(Level.WARNING, "Cannot to load built-in original messages, some phrases may missing when upgrading", exception); + } //Check the i18n language name and backup if (StringUtils.isEmpty(messagei18n.getString("language-name"))) { setAndUpdate("language-name"); @@ -1472,6 +1478,9 @@ public class MsgUtil { if (builtInLang != null) { alt = builtInLang.get(path); } + if (alt == null && builtInOriginalLang != null) { + alt = builtInOriginalLang.get(path); + } if (alt == null) { messagei18n.set(path, "Missing no: " + path); } else {