Merge pull request #1522 from VoChiDanh/master

Fix tsv & yml
Dans-Plugins · Sep 24, 2022 · 47022c3 · 47022c3
2 parents 7ee929b + e551c8d
commit 47022c3
Show file tree

Hide file tree

Showing 8 changed files with 2,844 additions and 2,838 deletions.
diff --git a/src/main/java/dansplugins/factionsystem/MedievalFactions.java b/src/main/java/dansplugins/factionsystem/MedievalFactions.java
@@ -4,7 +4,6 @@
  */
 package dansplugins.factionsystem;
 
-import dansplugins.factionsystem.commands.AddLawCommand;
 import dansplugins.factionsystem.commands.abs.TabCompleterBase;
 import dansplugins.factionsystem.data.EphemeralData;
 import dansplugins.factionsystem.data.PersistentData;

diff --git a/src/main/java/dansplugins/factionsystem/services/MessageService.java b/src/main/java/dansplugins/factionsystem/services/MessageService.java
@@ -21,10 +21,7 @@ public MessageService(MedievalFactions medievalFactions) {
 
     public void createLanguageFile() {
         languageFile = new File(medievalFactions.getDataFolder(), "language.yml");
-        if (!languageFile.exists()) {
-            medievalFactions.saveResource("language.yml", false);
-        }
-
+        if (!languageFile.exists()) medievalFactions.saveResource("language.yml", false);
         language = new YamlConfiguration();
         try {
             language.load(languageFile);
@@ -37,15 +34,25 @@ public FileConfiguration getLanguage() {
         return language;
     }
 
+
     public void reloadLanguage() {
-        language = YamlConfiguration.loadConfiguration(languageFile);
+        if (languageFile.exists()) {
+            language = YamlConfiguration.loadConfiguration(languageFile);
+        } else {
+            createLanguageFile();
+        }
     }
 
     public void saveLanguage() {
-        try {
-            language.save(languageFile);
-        } catch (IOException ignored) {
+        if (languageFile.exists()) {
+            try {
+                language.save(languageFile);
+            } catch (IOException ignored) {
+            }
+        } else {
+            createLanguageFile();
         }
     }
 
+
 }
diff --git a/src/main/resources/de.tsv b/src/main/resources/de.tsv
diff --git a/src/main/resources/en-us.tsv b/src/main/resources/en-us.tsv
diff --git a/src/main/resources/es.tsv b/src/main/resources/es.tsv
diff --git a/src/main/resources/pt-br.tsv b/src/main/resources/pt-br.tsv
diff --git a/src/main/resources/ru.tsv b/src/main/resources/ru.tsv
diff --git a/src/main/resources/test.tsv b/src/main/resources/test.tsv