fix #178

xGinko · Feb 27, 2024 · eaf265c · eaf265c
1 parent ea5cec6
commit eaf265c
Show file tree

Hide file tree

Showing 4 changed files with 9 additions and 9 deletions.
diff --git a/...chyExploitFixesFolia/src/main/java/me/moomoo/anarchyexploitfixes/AnarchyExploitFixes.java b/...chyExploitFixesFolia/src/main/java/me/moomoo/anarchyexploitfixes/AnarchyExploitFixes.java
@@ -147,7 +147,7 @@ private void reloadLang() {
             File langDirectory = new File(getDataFolder() + File.separator + "lang");
             Files.createDirectories(langDirectory.toPath());
             for (String fileName : getDefaultLanguageFiles()) {
-                final String localeString = fileName.substring(fileName.lastIndexOf(File.separator) + 1, fileName.lastIndexOf('.'));
+                final String localeString = fileName.substring(fileName.lastIndexOf('/') + 1, fileName.lastIndexOf('.'));
                 logger.info("Found language file for " + localeString);
                 languageCacheMap.put(localeString, new LanguageCache(localeString));
             }
@@ -172,7 +172,7 @@ private Set<String> getDefaultLanguageFiles() {
         try (final JarFile pluginJarFile = new JarFile(this.getFile())) {
             return pluginJarFile.stream()
                     .map(ZipEntry::getName)
-                    .filter(name -> name.startsWith("lang" + File.separator) && name.endsWith(".yml"))
+                    .filter(name -> name.startsWith("lang/") && name.endsWith(".yml"))
                     .collect(Collectors.toSet());
         } catch (IOException e) {
             logger.severe("Failed getting default lang files! - "+e.getLocalizedMessage());

diff --git a/...hyExploitFixesFolia/src/main/java/me/moomoo/anarchyexploitfixes/config/LanguageCache.java b/...hyExploitFixesFolia/src/main/java/me/moomoo/anarchyexploitfixes/config/LanguageCache.java
@@ -30,10 +30,10 @@ public LanguageCache(String locale) throws Exception {
         File parent = langYML.getParentFile();
         if (!parent.exists() && !parent.mkdir())
             AnarchyExploitFixes.getLog().severe("Unable to create lang directory.");
-        // Check if the file already exists and save the one from the plugins resources folder if it does not
+        // Check if the file already exists and save the one from the plugin's resources folder if it does not
         if (!langYML.exists())
-            plugin.saveResource("lang" + File.separator + locale + ".yml", false);
-        // Finally load the lang file with configmaster
+            plugin.saveResource("lang/" + locale + ".yml", false);
+        // Finally, load the lang file with configmaster
         this.lang = ConfigFile.loadConfig(langYML);
 
         // Commands

diff --git a/...hyExploitFixesLegacy/src/main/java/me/moomoo/anarchyexploitfixes/AnarchyExploitFixes.java b/...hyExploitFixesLegacy/src/main/java/me/moomoo/anarchyexploitfixes/AnarchyExploitFixes.java
@@ -172,7 +172,7 @@ private Set<String> getDefaultLanguageFiles() {
         try (final JarFile pluginJarFile = new JarFile(this.getFile())) {
             return pluginJarFile.stream()
                     .map(ZipEntry::getName)
-                    .filter(name -> name.startsWith("lang" + File.separator) && name.endsWith(".yml"))
+                    .filter(name -> name.startsWith("lang/") && name.endsWith(".yml"))
                     .collect(Collectors.toSet());
         } catch (IOException e) {
             logger.severe("Failed getting default lang files! - "+e.getLocalizedMessage());

diff --git a/...yExploitFixesLegacy/src/main/java/me/moomoo/anarchyexploitfixes/config/LanguageCache.java b/...yExploitFixesLegacy/src/main/java/me/moomoo/anarchyexploitfixes/config/LanguageCache.java
@@ -32,10 +32,10 @@ public LanguageCache(String locale) throws Exception {
         File parent = langYML.getParentFile();
         if (!parent.exists() && !parent.mkdir())
             AnarchyExploitFixes.getLog().severe("Unable to create lang directory.");
-        // Check if the file already exists and save the one from the plugins resources folder if it does not
+        // Check if the file already exists and save the one from the plugin's resources folder if it does not
         if (!langYML.exists())
-            plugin.saveResource("lang" + File.separator + locale + ".yml", false);
-        // Finally load the lang file with configmaster
+            plugin.saveResource("lang/" + locale + ".yml", false);
+        // Finally, load the lang file with configmaster
         this.lang = ConfigFile.loadConfig(langYML);
 
         // Commands