refactor and encapsulate classes

9 files changed, 22 insertions, 137 deletions

diff --git a/src/main/java/net/tylermurphy/hideAndSeek/util/CountdownDisplay.java b/src/main/java/net/tylermurphy/hideAndSeek/game/util/CountdownDisplay.java
index 477f7ca..e735af9 100644
--- a/src/main/java/net/tylermurphy/hideAndSeek/util/CountdownDisplay.java
+++ b/src/main/java/net/tylermurphy/hideAndSeek/game/util/CountdownDisplay.java
@@ -17,7 +17,7 @@
  *
  */
 
-package net.tylermurphy.hideAndSeek.util;
+package net.tylermurphy.hideAndSeek.game.util;
 
 public enum CountdownDisplay {
     CHAT,
diff --git a/src/main/java/net/tylermurphy/hideAndSeek/util/Packet.java b/src/main/java/net/tylermurphy/hideAndSeek/game/util/Packet.java
index bb7219f..0fad539 100644
--- a/src/main/java/net/tylermurphy/hideAndSeek/util/Packet.java
+++ b/src/main/java/net/tylermurphy/hideAndSeek/game/util/Packet.java
@@ -17,7 +17,7 @@
  *
  */
 
-package net.tylermurphy.hideAndSeek.util;
+package net.tylermurphy.hideAndSeek.game.util;
 
 import com.comphenix.protocol.PacketType;
 import com.comphenix.protocol.ProtocolLibrary;
diff --git a/src/main/java/net/tylermurphy/hideAndSeek/util/Status.java b/src/main/java/net/tylermurphy/hideAndSeek/game/util/Status.java
index 0ffba00..e630070 100644
--- a/src/main/java/net/tylermurphy/hideAndSeek/util/Status.java
+++ b/src/main/java/net/tylermurphy/hideAndSeek/game/util/Status.java
@@ -17,10 +17,10 @@
  *
  */
 
-package net.tylermurphy.hideAndSeek.util;
+package net.tylermurphy.hideAndSeek.game.util;
 
 public enum Status {
 
-    STANDBY, STARTING, PLAYING, ENDING
+    STANDBY, STARTING, PLAYING, ENDING, ENDED
 
 }
diff --git a/src/main/java/net/tylermurphy/hideAndSeek/util/Version.java b/src/main/java/net/tylermurphy/hideAndSeek/game/util/Version.java
index fa66fe2..e2dcfdd 100644
--- a/src/main/java/net/tylermurphy/hideAndSeek/util/Version.java
+++ b/src/main/java/net/tylermurphy/hideAndSeek/game/util/Version.java
@@ -1,4 +1,4 @@
-package net.tylermurphy.hideAndSeek.util;
+package net.tylermurphy.hideAndSeek.game.util;
 
 import org.bukkit.Bukkit;
 
diff --git a/src/main/java/net/tylermurphy/hideAndSeek/util/WinType.java b/src/main/java/net/tylermurphy/hideAndSeek/game/util/WinType.java
index 1f6ccd8..f584d80 100644
--- a/src/main/java/net/tylermurphy/hideAndSeek/util/WinType.java
+++ b/src/main/java/net/tylermurphy/hideAndSeek/game/util/WinType.java
@@ -17,7 +17,7 @@
  *
  */
 
-package net.tylermurphy.hideAndSeek.util;
+package net.tylermurphy.hideAndSeek.game.util;
 
 public enum WinType {
 
diff --git a/src/main/java/net/tylermurphy/hideAndSeek/game/CommandHandler.java b/src/main/java/net/tylermurphy/hideAndSeek/util/CommandHandler.java
index b7b2dad..3a05ee5 100644
--- a/src/main/java/net/tylermurphy/hideAndSeek/game/CommandHandler.java
+++ b/src/main/java/net/tylermurphy/hideAndSeek/util/CommandHandler.java
@@ -17,9 +17,12 @@
  *
  */
 
-package net.tylermurphy.hideAndSeek.game;
+package net.tylermurphy.hideAndSeek.util;
 
 import net.tylermurphy.hideAndSeek.command.*;
+import net.tylermurphy.hideAndSeek.command.location.SetExitLocation;
+import net.tylermurphy.hideAndSeek.command.location.SetLobbyLocation;
+import net.tylermurphy.hideAndSeek.command.location.SetSpawnLocation;
 import org.bukkit.command.CommandSender;
 import org.bukkit.entity.Player;
 
diff --git a/src/main/java/net/tylermurphy/hideAndSeek/util/PAPIExpansion.java b/src/main/java/net/tylermurphy/hideAndSeek/util/PAPIExpansion.java
index 4af5ff9..b5e7e34 100644
--- a/src/main/java/net/tylermurphy/hideAndSeek/util/PAPIExpansion.java
+++ b/src/main/java/net/tylermurphy/hideAndSeek/util/PAPIExpansion.java
@@ -1,6 +1,7 @@
 package net.tylermurphy.hideAndSeek.util;
 
 import me.clip.placeholderapi.expansion.PlaceholderExpansion;
+import net.tylermurphy.hideAndSeek.Main;
 import net.tylermurphy.hideAndSeek.database.Database;
 import net.tylermurphy.hideAndSeek.database.PlayerInfo;
 import org.bukkit.OfflinePlayer;
@@ -35,42 +36,43 @@ public class PAPIExpansion extends PlaceholderExpansion  {
 
     @Override
     public String onRequest(OfflinePlayer player, @NotNull String params) {
+        Database database = Main.getInstance().getDatabase();
         String[] args = params.split("_");
         if (args.length < 1) return null;
         if (args[0].equals("stats") && args.length == 2) {
-            PlayerInfo info = Database.playerInfo.getInfo(player.getUniqueId());
+            PlayerInfo info = database.getGameData().getInfo(player.getUniqueId());
             return getValue(info, args[1]);
         } else if (args[0].equals("stats") && args.length == 3) {
             UUID uuid;
-            try { uuid = UUIDFetcher.getUUID(args[2]); } catch (Exception e) { return placeholderError; }
-            PlayerInfo info = Database.playerInfo.getInfo(uuid);
+            try { uuid = Main.getInstance().getServer().getOfflinePlayer(args[2]).getUniqueId(); } catch (Exception e) { return placeholderError; }
+            PlayerInfo info = database.getGameData().getInfo(uuid);
             return getValue(info, args[1]);
         } else if ((args[0].equals("rank-score") || args[0].equals("rank-name") ) && args.length == 3) {
             int place;
             try { place = Integer.parseInt(args[2]); } catch (NumberFormatException e) { return placeholderError; }
             if (place < 1) { return placeholderError; }
             if (getRanking(args[1]) == null) { return placeholderError; }
-            PlayerInfo info = Database.playerInfo.getInfoRanking(getRanking(args[1]), place);
+            PlayerInfo info = database.getGameData().getInfoRanking(getRanking(args[1]), place);
             if (info == null) return placeholderNoData;
             if (args[0].equals("rank-score")) {
                 return getValue(info, args[1]);
             } else {
-                return UUIDFetcher.getPlayer(info.uuid).getName();
+                return Main.getInstance().getServer().getOfflinePlayer(info.uuid).getName();
             }
         } else if (args[0].equals("rank-place") && args.length == 2) {
             if (getRanking(args[1]) == null) { return placeholderError; }
-            PlayerInfo info = Database.playerInfo.getInfo(player.getUniqueId());
+            PlayerInfo info = database.getGameData().getInfo(player.getUniqueId());
             if (getValue(info, args[1]).equals("0")) { return "-"; }
-            Integer count = Database.playerInfo.getRanking(getRanking(args[1]), player.getUniqueId());
+            Integer count = database.getGameData().getRanking(getRanking(args[1]), player.getUniqueId());
             if (count == null) { return placeholderNoData; }
             return count.toString();
         } else if (args[0].equals("rank-place") && args.length == 3) {
             UUID uuid;
-            try { uuid = UUIDFetcher.getUUID(args[2]); } catch (Exception e) { return placeholderError; }
+            try { uuid = Main.getInstance().getServer().getOfflinePlayer(args[2]).getUniqueId(); } catch (Exception e) { return placeholderError; }
             if (getRanking(args[1]) == null) { return placeholderError; }
-            PlayerInfo info = Database.playerInfo.getInfo(player.getUniqueId());
+            PlayerInfo info = database.getGameData().getInfo(player.getUniqueId());
             if (getValue(info, args[1]).equals("0")) { return "-"; }
-            Integer count = Database.playerInfo.getRanking(getRanking(args[1]), uuid);
+            Integer count = database.getGameData().getRanking(getRanking(args[1]), uuid);
             if (count == null) { return placeholderNoData; }
             return count.toString();
         }
diff --git a/src/main/java/net/tylermurphy/hideAndSeek/util/TabCompleter.java b/src/main/java/net/tylermurphy/hideAndSeek/util/TabCompleter.java
index 85b10ee..2605e7b 100644
--- a/src/main/java/net/tylermurphy/hideAndSeek/util/TabCompleter.java
+++ b/src/main/java/net/tylermurphy/hideAndSeek/util/TabCompleter.java
@@ -19,7 +19,6 @@
 
 package net.tylermurphy.hideAndSeek.util;
 
-import net.tylermurphy.hideAndSeek.game.CommandHandler;
 import org.bukkit.command.CommandSender;
 
 import java.util.ArrayList;
diff --git a/src/main/java/net/tylermurphy/hideAndSeek/util/UUIDFetcher.java b/src/main/java/net/tylermurphy/hideAndSeek/util/UUIDFetcher.java
deleted file mode 100644
index abc3400..0000000
--- a/src/main/java/net/tylermurphy/hideAndSeek/util/UUIDFetcher.java
+++ /dev/null
@@ -1,119 +0,0 @@
-/*
- * This file is part of Kenshins Hide and Seek
- *
- * Copyright (c) 2021 Tyler Murphy.
- *
- * Kenshins Hide and Seek free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * he Free Software Foundation version 3.
- *
- * Kenshins Hide and Seek is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program. If not, see <http://www.gnu.org/licenses/>.
- *
- */
-
-package net.tylermurphy.hideAndSeek.util;
-
-import net.tylermurphy.hideAndSeek.Main;
-import org.bukkit.Bukkit;
-import org.bukkit.OfflinePlayer;
-
-import java.io.BufferedReader;
-import java.io.InputStreamReader;
-import java.net.URL;
-import java.net.URLConnection;
-import java.nio.charset.Charset;
-import java.util.HashMap;
-import java.util.Map;
-import java.util.UUID;
-
-public final class UUIDFetcher {
-
-    private static final Map<String,UUID> CACHE = new HashMap<>();
-    private static final Map<UUID,OfflinePlayer> PLAYER_CACHE = new HashMap<>();
-
-    private static final String UUID_URL = "https://api.mojang.com/users/profiles/minecraft/";
-    private static int cacheTask;
-
-    public static void init() {
-        cacheTask = Main.plugin.getServer().getScheduler().scheduleSyncRepeatingTask(Main.plugin, () -> {
-            CACHE.clear();
-            PLAYER_CACHE.clear();
-        }, 600 * 20, 600 * 20);
-    }
-
-    public static void cleanup() {
-        Main.plugin.getServer().getScheduler().cancelTask(cacheTask);
-    }
-
-    public static UUID getUUID(String playername) {
-
-        if (CACHE.containsKey(playername)) return CACHE.get(playername);
-
-        String output = callURL(UUID_URL + playername);
-        StringBuilder result = new StringBuilder();
-        readData(output, result);
-        String u = result.toString();
-        StringBuilder uuid = new StringBuilder();
-        for (int i = 0; i <= 31; i++) {
-            uuid.append(u.charAt(i));
-            if (i == 7 || i == 11 || i == 15 || i == 19) {
-                uuid.append('-');
-            }
-        }
-
-        CACHE.put(playername, UUID.fromString(uuid.toString()));
-
-        return UUID.fromString(uuid.toString());
-    }
-
-    public static OfflinePlayer getPlayer(UUID uuid) {
-        if (PLAYER_CACHE.containsKey(uuid)) return PLAYER_CACHE.get(uuid);
-        OfflinePlayer temp = Bukkit.getOfflinePlayer(uuid);
-        PLAYER_CACHE.put(uuid, temp);
-        return temp;
-    }
-
-    private static void readData(String toRead, StringBuilder result) {
-        for (int i = toRead.length() - 3; i >= 0; i--) {
-            if (toRead.charAt(i) != '"') {
-                result.insert(0, toRead.charAt(i));
-            } else {
-                break;
-            }
-        }
-    }
-
-    private static String callURL(String urlStr) {
-        StringBuilder sb = new StringBuilder();
-        URLConnection urlConn;
-        InputStreamReader in;
-        try {
-            URL url = new URL(urlStr);
-            urlConn = url.openConnection();
-            if (urlConn != null) {
-                urlConn.setReadTimeout(60 * 1000);
-            }
-            if (urlConn != null && urlConn.getInputStream() != null) {
-                in = new InputStreamReader(urlConn.getInputStream(),
-                        Charset.defaultCharset());
-                BufferedReader bufferedReader = new BufferedReader(in);
-                int cp;
-                while ((cp = bufferedReader.read()) != -1) {
-                    sb.append((char) cp);
-                }
-                bufferedReader.close();
-                in.close();
-            }
-        } catch (Exception e) {
-            e.printStackTrace();
-        }
-        return sb.toString();
-    }
-
-}