Merge branch 'stable' into development

src/main/java/emu/grasscutter/Config.java

@@ -16,7 +16,6 @@ public final class Config {
 	public String KEY_FOLDER = "./keys/";
 	public String SCRIPTS_FOLDER = "./resources/Scripts/";
 	public String PLUGINS_FOLDER = "./plugins/";
-	public String LANGUAGE_FOLDER = "./languages/";
 
 	public ServerDebugMode DebugMode = ServerDebugMode.NONE; // ALL, MISSING, NONE
 	public ServerRunMode RunMode = ServerRunMode.HYBRID; // HYBRID, DISPATCH_ONLY, GAME_ONLY

src/main/java/emu/grasscutter/utils/Language.java

@@ -19,7 +19,7 @@ public final class Language {
      * @return A language instance.
      */
     public static Language getLanguage(String langCode) {
-        return new Language(langCode + ".json", Grasscutter.getConfig().DefaultLanguage.toLanguageTag());
+        return new Language(langCode + ".json", Grasscutter.getConfig().DefaultLanguage.toLanguageTag() + ".json");
     }
 
     /**
@@ -46,15 +46,20 @@ public final class Language {
     private Language(String fileName, String fallback) {
         @Nullable JsonObject languageData = null;
 
-        try {
         InputStream file = Grasscutter.class.getResourceAsStream("/languages/" + fileName);
-            String translationContents = Utils.readFromInputStream(file);
-            if(translationContents.equals("empty")) {
+        if (file == null) { // Provided fallback language.
             file = Grasscutter.class.getResourceAsStream("/languages/" + fallback);
-                translationContents = Utils.readFromInputStream(file);
+            Grasscutter.getLogger().warn("Failed to load language file: " + fileName + ", falling back to: " + fallback);
+        }
+        if(file == null) { // Fallback the fallback language.
+            file = Grasscutter.class.getResourceAsStream("/languages/en-US.json");
+            Grasscutter.getLogger().warn("Failed to load language file: " + fallback + ", falling back to: en-US.json");
         }
+        if(file == null)
+            throw new RuntimeException("Unable to load the primary, fallback, and 'en-US' language files.");
         
-            languageData = Grasscutter.getGsonFactory().fromJson(translationContents, JsonObject.class);
+        try {
+            languageData = Grasscutter.getGsonFactory().fromJson(Utils.readFromInputStream(file), JsonObject.class);
         } catch (Exception exception) {
             Grasscutter.getLogger().warn("Failed to load language file: " + fileName, exception);
         }