From b838bc173aa44c216b0ad9d653d871259d7e11f3 Mon Sep 17 00:00:00 2001
From: aro <pantoine.rochas@gmail.com>
Date: Wed, 11 Jan 2023 16:58:59 +0100
Subject: [PATCH] feat: rename file + settings gui state
---
.../net/artelnatif/nicko/gui/SettingsGUI.java | 4 +-
.../artelnatif/nicko/i18n/LocaleManager.java | 88 -------------------
.../{locale_en.properties => en.yml} | 0
.../{locale_fr.properties => fr.yml} | 0
4 files changed, 2 insertions(+), 90 deletions(-)
delete mode 100644 nicko-core/src/main/java/net/artelnatif/nicko/i18n/LocaleManager.java
rename nicko-core/src/main/resources/{locale_en.properties => en.yml} (100%)
rename nicko-core/src/main/resources/{locale_fr.properties => fr.yml} (100%)
diff --git a/nicko-core/src/main/java/net/artelnatif/nicko/gui/SettingsGUI.java b/nicko-core/src/main/java/net/artelnatif/nicko/gui/SettingsGUI.java
index 7e7d19f..9360925 100644
--- a/nicko-core/src/main/java/net/artelnatif/nicko/gui/SettingsGUI.java
+++ b/nicko-core/src/main/java/net/artelnatif/nicko/gui/SettingsGUI.java
@@ -21,9 +21,9 @@ public class SettingsGUI {
};
public SettingsGUI(Player player) {
- if (!NickoBukkit.getInstance().getNickoConfig().isBungeecordEnabled()) {
+ if (!NickoBukkit.getInstance().getNickoConfig().isBungeecordSupport()) {
+ structureIngredients[1] = structureIngredients[1].replace("T", "#");
}
- //structureIngredients[1] = structureIngredients[1].replace("T", "#");
this.gui = new GUIBuilder<>(GUIType.NORMAL)
.setStructure(structureIngredients)
diff --git a/nicko-core/src/main/java/net/artelnatif/nicko/i18n/LocaleManager.java b/nicko-core/src/main/java/net/artelnatif/nicko/i18n/LocaleManager.java
deleted file mode 100644
index bc70028..0000000
--- a/nicko-core/src/main/java/net/artelnatif/nicko/i18n/LocaleManager.java
+++ /dev/null
@@ -1,88 +0,0 @@
-package net.artelnatif.nicko.i18n;
-
-import de.studiocode.invui.util.IOUtils;
-import net.artelnatif.nicko.NickoBukkit;
-
-import java.io.*;
-import java.util.Arrays;
-import java.util.Properties;
-
-public class LocaleManager {
- private static Locale fallback;
-
- private final NickoBukkit instance;
- private final String[] supportedLocales = new String[]{"en", "fr", "custom"};
- private final File directory = new File(NickoBukkit.getInstance().getDataFolder() + "/lang/");
- private final File file = new File(directory, "custom.properties");
-
- private Properties customLanguageFile;
-
- public LocaleManager(NickoBukkit instance) {
- this.instance = instance;
- }
-
- public static void setFallback(Locale fallback) {
- LocaleManager.fallback = fallback;
- }
-
- public static Locale getFallback() {
- return fallback;
- }
-
- public void installCustomLanguageFile() {
- try (InputStream stream = this.getClass().getResourceAsStream("locale_en.properties")) {
- try (BufferedOutputStream outputStream = new BufferedOutputStream(new FileOutputStream(file))) {
- if (stream != null) {
- IOUtils.copy(stream, outputStream, 8 * 1024);
- instance.getLogger().info("Installing custom language file as \"custom.properties\"");
- }
- }
- } catch (IOException e) {
- instance.getLogger().warning("Couldn't get English resource file! Skipping.");
- if (LocaleManager.getFallback() != Locale.ENGLISH) {
- LocaleManager.setFallback(Locale.ENGLISH);
- }
- throw new RuntimeException(e);
- }
- }
-
- public Properties getCustomLanguageFile() {
- if (customLanguageFile == null) {
- final Properties properties = new Properties();
- try {
- properties.load(new BufferedInputStream(new FileInputStream(file)));
- return customLanguageFile = properties;
- } catch (IOException e) {
- instance.getLogger().warning("Couldn't load Custom properties language file, falling back to English.");
- if (LocaleManager.getFallback() != Locale.ENGLISH) {
- LocaleManager.setFallback(Locale.ENGLISH);
- }
- return customLanguageFile = null;
- }
- }
-
- return customLanguageFile;
- }
-
- public Properties reloadCustomLanguageFile() {
- customLanguageFile = null;
- return getCustomLanguageFile();
- }
-
- public void findFallbackLocale() {
- final String locale = instance.getNickoConfig().getFallbackLocale();
- try {
- if (Arrays.stream(supportedLocales).noneMatch(s -> s.equalsIgnoreCase(locale))) {
- instance.getLogger().severe(locale + " is not a supported locale, defaulting to English.");
- LocaleManager.setFallback(Locale.ENGLISH);
- return;
- }
- final Locale defaultLocale = Locale.fromCode(locale);
- instance.getLogger().info("Fallback locale set to " + defaultLocale.getName() + ".");
- LocaleManager.setFallback(defaultLocale);
- } catch (Exception e) {
- instance.getLogger().severe(locale + " is not a valid locale, defaulting to English.");
- LocaleManager.setFallback(Locale.ENGLISH);
- }
- }
-}
diff --git a/nicko-core/src/main/resources/locale_en.properties b/nicko-core/src/main/resources/en.yml
similarity index 100%
rename from nicko-core/src/main/resources/locale_en.properties
rename to nicko-core/src/main/resources/en.yml
diff --git a/nicko-core/src/main/resources/locale_fr.properties b/nicko-core/src/main/resources/fr.yml
similarity index 100%
rename from nicko-core/src/main/resources/locale_fr.properties
rename to nicko-core/src/main/resources/fr.yml