diff --git a/Bukkit/Plugin/src/main/java/dev/brighten/antivpn/bukkit/BukkitPlugin.java b/Bukkit/Plugin/src/main/java/dev/brighten/antivpn/bukkit/BukkitPlugin.java index 2ca99ae..1cab6a2 100644 --- a/Bukkit/Plugin/src/main/java/dev/brighten/antivpn/bukkit/BukkitPlugin.java +++ b/Bukkit/Plugin/src/main/java/dev/brighten/antivpn/bukkit/BukkitPlugin.java @@ -149,10 +149,10 @@ public class BukkitPlugin implements LoaderBootstrap { private String getDatabaseType() { VPNDatabase database = AntiVPN.getInstance().getDatabase(); - if(database instanceof H2VPN) { - return "H2"; - } else if(database instanceof MySqlVPN) { + if(database instanceof MySqlVPN) { return "MySQL"; + } else if(database instanceof H2VPN) { + return "H2"; } else if(database instanceof MongoVPN) { return "MongoDB"; } else { diff --git a/Bungee/BungeePlugin/src/main/java/dev/brighten/antivpn/bungee/BungeePlugin.java b/Bungee/BungeePlugin/src/main/java/dev/brighten/antivpn/bungee/BungeePlugin.java index 5ef8317..15bb2ac 100644 --- a/Bungee/BungeePlugin/src/main/java/dev/brighten/antivpn/bungee/BungeePlugin.java +++ b/Bungee/BungeePlugin/src/main/java/dev/brighten/antivpn/bungee/BungeePlugin.java @@ -85,11 +85,10 @@ public class BungeePlugin implements LoaderBootstrap { private String getDatabaseType() { VPNDatabase database = AntiVPN.getInstance().getDatabase(); - - if(database instanceof H2VPN) { - return "H2"; - } else if(database instanceof MySqlVPN) { + if(database instanceof MySqlVPN) { return "MySQL"; + } else if(database instanceof H2VPN) { + return "H2"; } else if(database instanceof MongoVPN) { return "MongoDB"; } else { diff --git a/Common/Source/src/main/java/dev/brighten/antivpn/AntiVPN.java b/Common/Source/src/main/java/dev/brighten/antivpn/AntiVPN.java index 4daf09e..944b2f6 100644 --- a/Common/Source/src/main/java/dev/brighten/antivpn/AntiVPN.java +++ b/Common/Source/src/main/java/dev/brighten/antivpn/AntiVPN.java @@ -125,7 +125,7 @@ public class AntiVPN { break; } case "mysql": - case "sql":{ + case "sql": { AntiVPN.getInstance().getExecutor().log("Using databaseType MySQL..."); INSTANCE.database = new MySqlVPN(); INSTANCE.database.init(); diff --git a/Common/Source/src/main/java/dev/brighten/antivpn/utils/StringUtil.java b/Common/Source/src/main/java/dev/brighten/antivpn/utils/StringUtil.java index 32d4532..2fe79fe 100644 --- a/Common/Source/src/main/java/dev/brighten/antivpn/utils/StringUtil.java +++ b/Common/Source/src/main/java/dev/brighten/antivpn/utils/StringUtil.java @@ -16,12 +16,6 @@ package dev.brighten.antivpn.utils; -import dev.brighten.antivpn.AntiVPN; - -import java.nio.charset.StandardCharsets; -import java.security.MessageDigest; -import java.security.NoSuchAlgorithmException; - import dev.brighten.antivpn.api.APIPlayer; import dev.brighten.antivpn.web.objects.VPNResponse; @@ -34,25 +28,6 @@ public class StringUtil { return "&m-----------------------------------------------------"; } - public static String getHash(String input) { - try { - MessageDigest digest = MessageDigest.getInstance("SHA1"); - byte[] hash = digest.digest(input.getBytes(StandardCharsets.UTF_8)); - StringBuilder hexString = new StringBuilder(2 * hash.length); - for (byte b : hash) { - String hex = Integer.toHexString(0xff & b); - if (hex.length() == 1) { - hexString.append('0'); - } - hexString.append(hex); - } - return hexString.toString(); - } catch (NoSuchAlgorithmException e) { - AntiVPN.getInstance().getExecutor().logException(e); - } - return null; - } - public static String varReplace(String input, APIPlayer player, VPNResponse result) { return translateAlternateColorCodes('&', input.replace("%player%", player.getName()) .replace("%reason%", result.getMethod()) diff --git a/Velocity/VelocityPlugin/src/main/java/dev/brighten/antivpn/velocity/VelocityPlugin.java b/Velocity/VelocityPlugin/src/main/java/dev/brighten/antivpn/velocity/VelocityPlugin.java index a93f180..10760a1 100644 --- a/Velocity/VelocityPlugin/src/main/java/dev/brighten/antivpn/velocity/VelocityPlugin.java +++ b/Velocity/VelocityPlugin/src/main/java/dev/brighten/antivpn/velocity/VelocityPlugin.java @@ -61,12 +61,11 @@ public class VelocityPlugin implements LoaderBootstrap { private String getDatabaseType() { VPNDatabase database = AntiVPN.getInstance().getDatabase(); - - if(database instanceof H2VPN) { - return "H2"; - } else if(database instanceof MySqlVPN) { + if(database instanceof MySqlVPN) { return "MySQL"; - } else if(database instanceof MongoVPN) { + } else if(database instanceof H2VPN) { + return "H2"; + } else if(database instanceof MongoVPN) { return "MongoDB"; } else { return "No-Database";