diff --git a/pom.xml b/pom.xml index 1d624a1..1d4cd20 100644 --- a/pom.xml +++ b/pom.xml @@ -90,6 +90,7 @@ org.reflections reflections 0.10.2 + compile diff --git a/src/main/java/me/youhavetrouble/blockedit/BELocale.java b/src/main/java/me/youhavetrouble/blockedit/BELocale.java index a4bfe75..2c35f71 100644 --- a/src/main/java/me/youhavetrouble/blockedit/BELocale.java +++ b/src/main/java/me/youhavetrouble/blockedit/BELocale.java @@ -17,7 +17,6 @@ public class BELocale { protected BELocale(JsonObject json) { - BlockEdit.getPlugin().getSLF4JLogger().info(json.toString()); couldNotFindWandById = json.get("could_not_find_wand_by_id").getAsString(); selectArea = json.get("select_area").getAsString(); copiedSelectionToClipboard = json.get("copied_selection_to_clipboard").getAsString(); diff --git a/src/main/java/me/youhavetrouble/blockedit/BEPlayer.java b/src/main/java/me/youhavetrouble/blockedit/BEPlayer.java index e27bd72..b3ba0b9 100644 --- a/src/main/java/me/youhavetrouble/blockedit/BEPlayer.java +++ b/src/main/java/me/youhavetrouble/blockedit/BEPlayer.java @@ -50,7 +50,6 @@ public class BEPlayer { } } } - } public void resetSelection() { diff --git a/src/main/java/me/youhavetrouble/blockedit/BlockEdit.java b/src/main/java/me/youhavetrouble/blockedit/BlockEdit.java index 1d7656a..6007d44 100644 --- a/src/main/java/me/youhavetrouble/blockedit/BlockEdit.java +++ b/src/main/java/me/youhavetrouble/blockedit/BlockEdit.java @@ -9,10 +9,8 @@ import org.reflections.Reflections; import org.reflections.scanners.Scanners; import java.io.*; -import java.net.URL; import java.util.*; import java.util.regex.Pattern; -import java.util.stream.Collectors; public final class BlockEdit extends JavaPlugin { @@ -65,7 +63,11 @@ public final class BlockEdit extends JavaPlugin { String localeString = fileName .replace(".json", "") .replace("locale/", ""); - locale = Locale.of(localeString); + String[] localeStringSplit = localeString.split("_"); + if (localeStringSplit.length != 2) { + throw new IllegalArgumentException("Invalid locale file name: " + fileName); + } + locale = Locale.of(localeStringSplit[0], localeStringSplit[1].toUpperCase()); } catch (IllegalArgumentException e) { plugin.getSLF4JLogger().error("Invalid locale file name: {}", fileName); continue;