Upstream/ShopChest-Updated
1
0
Fork 0
mirror of https://github.com/Flowsqy/ShopChest.git synced 2024-11-29 01:35:29 +01:00
Code Issues Actions Packages Projects Releases Wiki Activity

Fix resource content loading on windows (closes #17)

Browse Source
This commit is contained in:
Flowsqy 2023-07-20 22:29:04 +02:00
parent 36b09ffe9e
commit 6efb778868
1 changed files with 19 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

26
plugin/src/main/java/de/epiceric/shopchest/language/LanguageLoader.java
View File

@ -22,11 +22,13 @@ public class LanguageLoader {
final FileLoader fileLoader = new FileLoader(); final FileLoader fileLoader = new FileLoader();
final LanguageConfigurationLoader languageConfigurationLoader = new LanguageConfigurationLoader(); final LanguageConfigurationLoader languageConfigurationLoader = new LanguageConfigurationLoader();
final String requestedMessagePath = generateLocalizedPath(MESSAGES_FILENAME, locale); final String messageLocalizedFileName = getLocalizedFileName(MESSAGES_FILENAME, locale);
final String defaultResourceMessagePath = generateLocalizedPath(MESSAGES_FILENAME, DEFAULT_LOCALE); final String messageSavePath = getSavePath(messageLocalizedFileName);
final String messageResourcePath = getResourcePath(messageLocalizedFileName);
final String messageDefaultResourcePath = getResourcePath(getLocalizedFileName(MESSAGES_FILENAME, DEFAULT_LOCALE));
final File messagesFile; final File messagesFile;
try { try {
messagesFile = fileLoader.loadFile(requestedMessagePath, shopChestPlugin, requestedMessagePath, defaultResourceMessagePath); messagesFile = fileLoader.loadFile(messageSavePath, shopChestPlugin, messageResourcePath, messageDefaultResourcePath);
} catch (IOException e) { } catch (IOException e) {
throw new RuntimeException(e); throw new RuntimeException(e);
} }
@ -35,10 +37,10 @@ public class LanguageLoader {
final String[] messages = messageRegistryLoader.getMessages(); final String[] messages = messageRegistryLoader.getMessages();
final MessageRegistry messageRegistry = new MessageRegistry(messages, p -> shopChestPlugin.getEconomy().format(p)); 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; final File itemsFile;
try { try {
itemsFile = fileLoader.loadFile(requestedItemsPath, shopChestPlugin); itemsFile = fileLoader.loadFile(itemSavePath, shopChestPlugin);
} catch (IOException e) { } catch (IOException e) {
throw new RuntimeException(e); throw new RuntimeException(e);
} }
@ -48,8 +50,18 @@ public class LanguageLoader {
} }
@NotNull @NotNull
private String generateLocalizedPath(@NotNull String fileName, @NotNull String locale) { private String getLocalizedFileName(@NotNull String baseName, @NotNull String locale) {
return "lang" + File.separator + fileName + "-" + locale + ".lang"; 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;
} }
} }