fix language files not properly recognized

JustEli · Aug 4, 2021 · aa38f57 · aa38f57
1 parent ad3f05e
commit aa38f57
Show file tree

Hide file tree

Showing 4 changed files with 28 additions and 12 deletions.
diff --git a/src/main/java/me/justeli/coins/Coins.java b/src/main/java/me/justeli/coins/Coins.java
@@ -9,10 +9,10 @@
 import me.justeli.coins.handler.InventoryHandler;
 import me.justeli.coins.handler.InteractionHandler;
 import me.justeli.coins.handler.UnfairMobHandler;
-import me.justeli.coins.handler.listener.BukkitPickupEvent;
+import me.justeli.coins.handler.listener.BukkitEventListener;
 import me.justeli.coins.handler.PickupHandler;
 import me.justeli.coins.handler.DropHandler;
-import me.justeli.coins.handler.listener.PaperPickupEvent;
+import me.justeli.coins.handler.listener.PaperEventListener;
 import me.justeli.coins.command.Commands;
 import me.justeli.coins.command.TabComplete;
 import me.justeli.coins.hook.MythicMobsHook;
@@ -194,7 +194,7 @@ private void registerEvents ()
 
  boolean validPaper = PaperLib.isPaper() && PaperLib.getMinecraftVersion() > 12;
 
- manager.registerEvents(validPaper? new PaperPickupEvent() : new BukkitPickupEvent(), this);
+ manager.registerEvents(validPaper? new PaperEventListener() : new BukkitEventListener(), this);
 
  manager.registerEvents(new HopperHandler(), this);
  manager.registerEvents(new UnfairMobHandler(), this);

diff --git a/src/main/java/me/justeli/coins/config/Message.java b/src/main/java/me/justeli/coins/config/Message.java
@@ -4,9 +4,11 @@
 import me.justeli.coins.util.Util;
 import org.json.simple.JSONObject;
 import org.json.simple.parser.JSONParser;
+import org.json.simple.parser.ParseException;
 
 import java.io.File;
 import java.io.FileInputStream;
+import java.io.IOException;
 import java.io.InputStreamReader;
 import java.nio.charset.StandardCharsets;
 import java.util.HashMap;
@@ -116,20 +118,34 @@ public static void init (String language)
 
  private static JSONObject getJson (String language)
  {
+ File file = getFile(language);
+
+ if (file == null)
+ return null;
+
  try
  {
  return (JSONObject) new JSONParser().parse(
- new InputStreamReader(
- new FileInputStream(
- Coins.plugin().getDataFolder() + File.separator + "language" + File.separator + language + ".json"
- ),
- StandardCharsets.UTF_8
- )
+ new InputStreamReader(new FileInputStream(file), StandardCharsets.UTF_8)
  );
  }
- catch (Exception exception)
+ catch (IOException | ParseException exception)
  {
  return null;
  }
  }
+
+ private static File getFile (String language)
+ {
+ File[] languageFiles = new File(Coins.plugin().getDataFolder().getAbsolutePath() + File.separator + "language").listFiles();
+ for (File languageFile : languageFiles)
+ {
+ if (languageFile.getName().equalsIgnoreCase(language + ".json"))
+ {
+ return languageFile;
+ }
+ }
+
+ return null;
+ }
 }
diff --git a/...s/handler/listener/BukkitPickupEvent.java → ...handler/listener/BukkitEventListener.java b/...s/handler/listener/BukkitPickupEvent.java → ...handler/listener/BukkitEventListener.java
@@ -10,7 +10,7 @@
  * Created by Eli on September 13, 2020.
  * Coins: me.justeli.coins.events
  */
-public class BukkitPickupEvent
+public class BukkitEventListener
  implements Listener
 {
  @EventHandler (ignoreCancelled = true)

diff --git a/...ns/handler/listener/PaperPickupEvent.java → .../handler/listener/PaperEventListener.java b/...ns/handler/listener/PaperPickupEvent.java → .../handler/listener/PaperEventListener.java
@@ -10,7 +10,7 @@
  * Created by Eli on September 13, 2020.
  * Coins: me.justeli.coins.events
  */
-public class PaperPickupEvent
+public class PaperEventListener
  implements Listener
 {
  @EventHandler