diff --git a/Assembly/dependency-reduced-pom.xml b/Assembly/dependency-reduced-pom.xml index 976a05c..297eccc 100644 --- a/Assembly/dependency-reduced-pom.xml +++ b/Assembly/dependency-reduced-pom.xml @@ -3,7 +3,7 @@ AntiVPN dev.brighten.antivpn - 1.5.0 + 1.5.1 4.0.0 Assembly diff --git a/Assembly/pom.xml b/Assembly/pom.xml index cda33af..f5a04b3 100644 --- a/Assembly/pom.xml +++ b/Assembly/pom.xml @@ -5,7 +5,7 @@ AntiVPN dev.brighten.antivpn - 1.5.0 + 1.5.1 4.0.0 diff --git a/Bukkit/dependency-reduced-pom.xml b/Bukkit/dependency-reduced-pom.xml index 27bad2f..5129858 100644 --- a/Bukkit/dependency-reduced-pom.xml +++ b/Bukkit/dependency-reduced-pom.xml @@ -3,7 +3,7 @@ AntiVPN dev.brighten.antivpn - 1.5.0 + 1.5.1 4.0.0 Bukkit @@ -56,7 +56,7 @@ dev.brighten.antivpn Common - 1.5.0 + 1.5.1 provided diff --git a/Bukkit/pom.xml b/Bukkit/pom.xml index e05f8e1..4e0a69f 100644 --- a/Bukkit/pom.xml +++ b/Bukkit/pom.xml @@ -5,7 +5,7 @@ AntiVPN dev.brighten.antivpn - 1.5.0 + 1.5.1 4.0.0 @@ -69,7 +69,7 @@ dev.brighten.antivpn Common - 1.5.0 + 1.5.1 provided diff --git a/Bukkit/src/main/java/dev/brighten/antivpn/bukkit/BukkitListener.java b/Bukkit/src/main/java/dev/brighten/antivpn/bukkit/BukkitListener.java index aa6d288..bcc27e8 100644 --- a/Bukkit/src/main/java/dev/brighten/antivpn/bukkit/BukkitListener.java +++ b/Bukkit/src/main/java/dev/brighten/antivpn/bukkit/BukkitListener.java @@ -47,18 +47,23 @@ public class BukkitListener extends VPNExecutor implements Listener { if(cacheResetTask != null && !cacheResetTask.isCancelled()) cacheResetTask.cancel(); } + @Override + public void log(String log, Object... objects) { + Bukkit.getLogger().log(Level.INFO, String.format(log, objects)); + } + @EventHandler public void onJoin(final PlayerJoinEvent event) { AntiVPN.getInstance().getPlayerExecutor().getPlayer(event.getPlayer().getUniqueId()) .ifPresent(player -> { AntiVPN.getInstance().getDatabase().alertsState(player.getUuid(), enabled -> { if(enabled) { - System.out.println("Enabled"); + AntiVPN.getInstance().getExecutor().log("Enabled"); player.setAlertsEnabled(true); player.sendMessage(AntiVPN.getInstance().getMessageHandler() .getString("command-alerts-toggled") .getFormattedMessage(new VpnString.Var<>("state", true))); - } else System.out.println("Not enabled"); + } else AntiVPN.getInstance().getExecutor().log("Not enabled"); }); }); } diff --git a/Bukkit/src/main/resources/plugin.yml b/Bukkit/src/main/resources/plugin.yml index a2083e0..1c9241d 100644 --- a/Bukkit/src/main/resources/plugin.yml +++ b/Bukkit/src/main/resources/plugin.yml @@ -1,4 +1,4 @@ -name: AntiVPN +name: KauriVPN main: dev.brighten.antivpn.bukkit.BukkitPlugin version: ${project.version} author: funkemunky diff --git a/Bungee/dependency-reduced-pom.xml b/Bungee/dependency-reduced-pom.xml index a3e5d91..69ff38d 100644 --- a/Bungee/dependency-reduced-pom.xml +++ b/Bungee/dependency-reduced-pom.xml @@ -3,7 +3,7 @@ AntiVPN dev.brighten.antivpn - 1.5.0 + 1.5.1 4.0.0 Bungee @@ -50,7 +50,7 @@ dev.brighten.antivpn Common - 1.5.0 + 1.5.1 provided diff --git a/Bungee/pom.xml b/Bungee/pom.xml index 5bf654b..92cb82b 100644 --- a/Bungee/pom.xml +++ b/Bungee/pom.xml @@ -5,7 +5,7 @@ AntiVPN dev.brighten.antivpn - 1.5.0 + 1.5.1 4.0.0 @@ -63,7 +63,7 @@ dev.brighten.antivpn Common - 1.5.0 + 1.5.1 provided diff --git a/Bungee/src/main/java/dev/brighten/antivpn/bungee/BungeeListener.java b/Bungee/src/main/java/dev/brighten/antivpn/bungee/BungeeListener.java index 15b97b0..fd55260 100644 --- a/Bungee/src/main/java/dev/brighten/antivpn/bungee/BungeeListener.java +++ b/Bungee/src/main/java/dev/brighten/antivpn/bungee/BungeeListener.java @@ -40,6 +40,11 @@ public class BungeeListener extends VPNExecutor implements Listener { BungeePlugin.pluginInstance.getProxy().getPluginManager().unregisterListener(this); } + @Override + public void log(String log, Object... objects) { + BungeeCord.getInstance().getLogger().log(Level.INFO, String.format(log, objects)); + } + @EventHandler public void onListener(final PostLoginEvent event) { if(event.getPlayer().hasPermission("antivpn.bypass") //Has bypass permission diff --git a/Bungee/src/main/resources/bungee.yml b/Bungee/src/main/resources/bungee.yml index 6bd6b10..b045000 100644 --- a/Bungee/src/main/resources/bungee.yml +++ b/Bungee/src/main/resources/bungee.yml @@ -1,4 +1,4 @@ -name: AntiVPN +name: KauriVPN main: dev.brighten.antivpn.bungee.BungeePlugin description: A simple and fast antivpn plugin. version: ${project.version} diff --git a/Common/pom.xml b/Common/pom.xml index b0e1abb..e8e56c5 100644 --- a/Common/pom.xml +++ b/Common/pom.xml @@ -5,7 +5,7 @@ AntiVPN dev.brighten.antivpn - 1.5.0 + 1.5.1 4.0.0 diff --git a/Common/src/main/java/dev/brighten/antivpn/AntiVPN.java b/Common/src/main/java/dev/brighten/antivpn/AntiVPN.java index 62541df..26f33c9 100644 --- a/Common/src/main/java/dev/brighten/antivpn/AntiVPN.java +++ b/Common/src/main/java/dev/brighten/antivpn/AntiVPN.java @@ -50,7 +50,7 @@ public class AntiVPN { switch(INSTANCE.config.getDatabaseType().toLowerCase()) { case "mysql": case "sql":{ - System.out.println("Using databaseType MySQL..."); + AntiVPN.getInstance().getExecutor().log("Using databaseType MySQL..."); INSTANCE.database = new MySqlVPN(); INSTANCE.database.init(); break; @@ -58,11 +58,11 @@ public class AntiVPN { case "mongo": case "mongodb": case "mongod": { - System.out.println("We currently do not support Mongo, but this is coming in future updates."); + AntiVPN.getInstance().getExecutor().log("We currently do not support Mongo, but this is coming in future updates."); break; } default: { - System.out.println("Could not find database type \"" + INSTANCE.config.getDatabaseType() + "\". " + + AntiVPN.getInstance().getExecutor().log("Could not find database type \"" + INSTANCE.config.getDatabaseType() + "\". " + "Options: [MySQL]"); break; } diff --git a/Common/src/main/java/dev/brighten/antivpn/api/VPNExecutor.java b/Common/src/main/java/dev/brighten/antivpn/api/VPNExecutor.java index caf2a79..341ff47 100644 --- a/Common/src/main/java/dev/brighten/antivpn/api/VPNExecutor.java +++ b/Common/src/main/java/dev/brighten/antivpn/api/VPNExecutor.java @@ -29,6 +29,8 @@ public abstract class VPNExecutor { public abstract void shutdown(); + public abstract void log(String log, Object... objects); + public boolean isWhitelisted(UUID uuid) { return whitelisted.contains(uuid); } @@ -47,12 +49,12 @@ public abstract class VPNExecutor { if(response.isSuccess()) { AntiVPN.getInstance().getDatabase().cacheResponse(response); } else { - System.out.println("Query to VPN API failed! Reason: " + response.getFailureReason()); + log("Query to VPN API failed! Reason: " + response.getFailureReason()); } return response; } catch (JSONException | IOException e) { - System.out.println("Query to VPN API failed! Reason: Java Exception"); + log("Query to VPN API failed! Reason: Java Exception"); e.printStackTrace(); } } @@ -76,12 +78,12 @@ public abstract class VPNExecutor { if(response.isSuccess()) { threadExecutor.execute(() -> AntiVPN.getInstance().getDatabase().cacheResponse(response)); } else { - System.out.println("Query to VPN API failed! Reason: " + response.getFailureReason()); + log("Query to VPN API failed! Reason: " + response.getFailureReason()); } return response; } catch (JSONException | IOException e) { - System.out.println("Query to VPN API failed! Reason: Java Exception"); + log("Query to VPN API failed! Reason: Java Exception"); e.printStackTrace(); } } diff --git a/Common/src/main/java/dev/brighten/antivpn/database/sql/MySqlVPN.java b/Common/src/main/java/dev/brighten/antivpn/database/sql/MySqlVPN.java index 69d8730..12b7f4c 100644 --- a/Common/src/main/java/dev/brighten/antivpn/database/sql/MySqlVPN.java +++ b/Common/src/main/java/dev/brighten/antivpn/database/sql/MySqlVPN.java @@ -188,20 +188,20 @@ public class MySqlVPN implements VPNDatabase { public void init() { if (!AntiVPN.getInstance().getConfig().isDatabaseEnabled()) return; - System.out.println("Initializing MySQL..."); + AntiVPN.getInstance().getExecutor().log("Initializing MySQL..."); MySQL.init(); - System.out.println("Creating tables..."); + AntiVPN.getInstance().getExecutor().log("Creating tables..."); //Running check for old table types to update oldTableCheck: { Query.prepare("select `DATA_TYPE` from INFORMATION_SCHEMA.COLUMNS " + "WHERE table_name = 'responses' AND COLUMN_NAME = 'isp';").execute(set -> { if(set.getObject("DATA_TYPE").toString().contains("varchar")) { - System.out.println("Using old database format for storing responses! " + + AntiVPN.getInstance().getExecutor().log("Using old database format for storing responses! " + "Dropping table and creating a new one..."); if(Query.prepare("drop table `responses`").execute() > 0) { - System.out.println("Successfully dropped table!"); + AntiVPN.getInstance().getExecutor().log("Successfully dropped table!"); } } }); @@ -214,7 +214,7 @@ public class MySqlVPN implements VPNDatabase { + "`latitude` double, `longitude` double)").execute(); Query.prepare("create table if not exists `alerts` (`uuid` varchar(36) not null)").execute(); - System.out.println("Creating indexes..."); + AntiVPN.getInstance().getExecutor().log("Creating indexes..."); try { // Ref: // https://dba.stackexchange.com/questions/24531/mysql-create-index-if-not-exists diff --git a/Common/src/main/java/dev/brighten/antivpn/database/sql/utils/MySQL.java b/Common/src/main/java/dev/brighten/antivpn/database/sql/utils/MySQL.java index 7718312..93c6a60 100644 --- a/Common/src/main/java/dev/brighten/antivpn/database/sql/utils/MySQL.java +++ b/Common/src/main/java/dev/brighten/antivpn/database/sql/utils/MySQL.java @@ -22,10 +22,10 @@ public class MySQL { Query.prepare("CREATE DATABASE IF NOT EXISTS `" + AntiVPN.getInstance().getConfig().getDatabaseName() + "`").execute(); Query.prepare("USE `" + AntiVPN.getInstance().getConfig().getDatabaseName() + "`").execute(); - System.out.println("Connection to MySQL has been established."); + AntiVPN.getInstance().getExecutor().log("Connection to MySQL has been established."); } } catch (Exception e) { - System.out.println("Failed to load mysql: " + e.getMessage()); + AntiVPN.getInstance().getExecutor().log("Failed to load mysql: " + e.getMessage()); e.printStackTrace(); } } diff --git a/Velocity/pom.xml b/Velocity/pom.xml index 48c9507..021bdfc 100644 --- a/Velocity/pom.xml +++ b/Velocity/pom.xml @@ -5,7 +5,7 @@ AntiVPN dev.brighten.antivpn - 1.5.0 + 1.5.1 4.0.0 @@ -33,7 +33,7 @@ dev.brighten.antivpn Common - 1.5.0 + 1.5.1 provided diff --git a/Velocity/src/main/java/dev/brighten/antivpn/velocity/VelocityListener.java b/Velocity/src/main/java/dev/brighten/antivpn/velocity/VelocityListener.java index c4e584a..3ac309d 100644 --- a/Velocity/src/main/java/dev/brighten/antivpn/velocity/VelocityListener.java +++ b/Velocity/src/main/java/dev/brighten/antivpn/velocity/VelocityListener.java @@ -88,4 +88,9 @@ public class VelocityListener extends VPNExecutor { threadExecutor.shutdown(); VelocityPlugin.INSTANCE.getServer().getEventManager().unregisterListener(VelocityPlugin.INSTANCE, this); } + + @Override + public void log(String log, Object... objects) { + VelocityPlugin.INSTANCE.getLogger().log(Level.INFO, String.format(log, objects)); + } } diff --git a/pom.xml b/pom.xml index cfba9fa..cea5a9d 100644 --- a/pom.xml +++ b/pom.xml @@ -7,7 +7,7 @@ dev.brighten.antivpn AntiVPN pom - 1.5.0 + 1.5.1 Common