From 6efb7788684137607a37da8bd0c17f273818cd55 Mon Sep 17 00:00:00 2001
From: Flowsqy <47575244+Flowsqy@users.noreply.github.com>
Date: Thu, 20 Jul 2023 22:29:04 +0200
Subject: [PATCH] Fix resource content loading on windows (closes #17)

---
 .../shopchest/language/LanguageLoader.java    | 26 ++++++++++++++-----
 1 file changed, 19 insertions(+), 7 deletions(-)

diff --git a/plugin/src/main/java/de/epiceric/shopchest/language/LanguageLoader.java b/plugin/src/main/java/de/epiceric/shopchest/language/LanguageLoader.java
index e564823..ed9a81d 100644
--- a/plugin/src/main/java/de/epiceric/shopchest/language/LanguageLoader.java
+++ b/plugin/src/main/java/de/epiceric/shopchest/language/LanguageLoader.java
@@ -22,11 +22,13 @@ public class LanguageLoader {
         final FileLoader fileLoader = new FileLoader();
         final LanguageConfigurationLoader languageConfigurationLoader = new LanguageConfigurationLoader();
 
-        final String requestedMessagePath = generateLocalizedPath(MESSAGES_FILENAME, locale);
-        final String defaultResourceMessagePath = generateLocalizedPath(MESSAGES_FILENAME, DEFAULT_LOCALE);
+        final String messageLocalizedFileName = getLocalizedFileName(MESSAGES_FILENAME, locale);
+        final String messageSavePath = getSavePath(messageLocalizedFileName);
+        final String messageResourcePath = getResourcePath(messageLocalizedFileName);
+        final String messageDefaultResourcePath = getResourcePath(getLocalizedFileName(MESSAGES_FILENAME, DEFAULT_LOCALE));
         final File messagesFile;
         try {
-            messagesFile = fileLoader.loadFile(requestedMessagePath, shopChestPlugin, requestedMessagePath, defaultResourceMessagePath);
+            messagesFile = fileLoader.loadFile(messageSavePath, shopChestPlugin, messageResourcePath, messageDefaultResourcePath);
         } catch (IOException e) {
             throw new RuntimeException(e);
         }
@@ -35,10 +37,10 @@ public class LanguageLoader {
         final String[] messages = messageRegistryLoader.getMessages();
         final MessageRegistry messageRegistry = new MessageRegistry(messages, p -> shopChestPlugin.getEconomy().format(p));
 
-        final String requestedItemsPath = generateLocalizedPath(ITEMS_FILENAME, locale);
+        final String itemSavePath = getSavePath(getLocalizedFileName(ITEMS_FILENAME, locale));
         final File itemsFile;
         try {
-            itemsFile = fileLoader.loadFile(requestedItemsPath, shopChestPlugin);
+            itemsFile = fileLoader.loadFile(itemSavePath, shopChestPlugin);
         } catch (IOException e) {
             throw new RuntimeException(e);
         }
@@ -48,8 +50,18 @@ public class LanguageLoader {
     }
 
     @NotNull
-    private String generateLocalizedPath(@NotNull String fileName, @NotNull String locale) {
-        return "lang" + File.separator + fileName + "-" + locale + ".lang";
+    private String getLocalizedFileName(@NotNull String baseName, @NotNull String locale) {
+        return baseName + "-" + locale + ".lang";
+    }
+
+    @NotNull
+    private String getResourcePath(@NotNull String fileName) {
+        return "lang/" + fileName;
+    }
+
+    @NotNull
+    private String getSavePath(@NotNull String fileName) {
+        return "lang" + File.separator + fileName;
     }
 
 }