diff --git a/BungeeBan-latest.jar b/BungeeBan-latest.jar deleted file mode 100644 index fbbe227..0000000 Binary files a/BungeeBan-latest.jar and /dev/null differ diff --git a/src/de/VinciDev/BungeeBan/Main.java b/src/de/VinciDev/BungeeBan/BungeeBan.java similarity index 76% rename from src/de/VinciDev/BungeeBan/Main.java rename to src/de/VinciDev/BungeeBan/BungeeBan.java index f1f4872..0182535 100644 --- a/src/de/VinciDev/BungeeBan/Main.java +++ b/src/de/VinciDev/BungeeBan/BungeeBan.java @@ -1,24 +1,25 @@ -package de.VinciDev.BungeeBan; +package de.vincidev.bungeeban; import java.io.IOException; import com.google.gson.Gson; -import de.VinciDev.BungeeBan.Handlers.PlayerConnect; -import de.VinciDev.BungeeBan.Metrics.Metrics; -import de.VinciDev.BungeeBan.Util.BungeeBan; -import de.VinciDev.BungeeBan.Util.FileManager; -import de.VinciDev.BungeeBan.Util.MySQL; -import de.VinciDev.BungeeBan.Util.UpdateChecker; +import de.vincidev.bungeeban.handlers.BroadcastHandlers; +import de.vincidev.bungeeban.handlers.PlayerConnect; +import de.vincidev.bungeeban.metrics.Metrics; +import de.vincidev.bungeeban.utils.BungeeBanUtils; +import de.vincidev.bungeeban.utils.FileManager; +import de.vincidev.bungeeban.utils.MySQL; +import de.vincidev.bungeeban.utils.UpdateChecker; import net.md_5.bungee.BungeeCord; import net.md_5.bungee.api.plugin.Plugin; import net.md_5.bungee.api.plugin.PluginManager; -public class Main extends Plugin { +public class BungeeBan extends Plugin { static String prefix = ""; static MySQL mysql; - static Main main; + static BungeeBan main; static Gson gson; public static final String rsId = "5924"; @@ -49,7 +50,7 @@ public void onEnable() { mysql.openConnection(); if (mysql.isConnected()) { log("§9Connection successful. Tables will be created if they do not already exist."); - BungeeBan.createTables(); + BungeeBanUtils.createTables(); } else { log("§cThe mysql connection was not successful. Please recheck your config.yml"); } @@ -77,6 +78,7 @@ public void onDisable() { public void register() { PluginManager pm = BungeeCord.getInstance().getPluginManager(); pm.registerListener(this, new PlayerConnect()); + pm.registerListener(this, new BroadcastHandlers()); } @SuppressWarnings("deprecation") @@ -84,7 +86,7 @@ public static void log(String msg) { BungeeCord.getInstance().getConsole().sendMessage(msg); } - public static Main getInstance() { + public static BungeeBan getInstance() { return main; } @@ -97,11 +99,11 @@ public static String getPrefix() { } public static void setMysql(MySQL mysql) { - Main.mysql = mysql; + BungeeBan.mysql = mysql; } public static void setPrefix(String prefix) { - Main.prefix = prefix; + BungeeBan.prefix = prefix; } public static Gson getGson() { diff --git a/src/de/VinciDev/BungeeBan/Commands/CustomCommand.java b/src/de/VinciDev/BungeeBan/Commands/CustomCommand.java index 33279a0..deaf52b 100644 --- a/src/de/VinciDev/BungeeBan/Commands/CustomCommand.java +++ b/src/de/VinciDev/BungeeBan/Commands/CustomCommand.java @@ -1,4 +1,4 @@ -package de.VinciDev.BungeeBan.Commands; +package de.vincidev.bungeeban.commands; import net.md_5.bungee.api.CommandSender; import net.md_5.bungee.api.plugin.Command; diff --git a/src/de/VinciDev/BungeeBan/Events/BungeeBanEvent.java b/src/de/VinciDev/BungeeBan/Events/BungeeBanEvent.java index 58aed87..9333481 100644 --- a/src/de/VinciDev/BungeeBan/Events/BungeeBanEvent.java +++ b/src/de/VinciDev/BungeeBan/Events/BungeeBanEvent.java @@ -1,4 +1,4 @@ -package de.VinciDev.BungeeBan.Events; +package de.vincidev.bungeeban.events; import java.util.UUID; diff --git a/src/de/VinciDev/BungeeBan/Events/BungeeBanIpEvent.java b/src/de/VinciDev/BungeeBan/Events/BungeeBanIpEvent.java index d83a607..07b3236 100644 --- a/src/de/VinciDev/BungeeBan/Events/BungeeBanIpEvent.java +++ b/src/de/VinciDev/BungeeBan/Events/BungeeBanIpEvent.java @@ -1,4 +1,4 @@ -package de.VinciDev.BungeeBan.Events; +package de.vincidev.bungeeban.events; import net.md_5.bungee.api.plugin.Event; diff --git a/src/de/VinciDev/BungeeBan/Events/BungeeKickEvent.java b/src/de/VinciDev/BungeeBan/Events/BungeeKickEvent.java index 2f3a48a..67919ba 100644 --- a/src/de/VinciDev/BungeeBan/Events/BungeeKickEvent.java +++ b/src/de/VinciDev/BungeeBan/Events/BungeeKickEvent.java @@ -1,4 +1,4 @@ -package de.VinciDev.BungeeBan.Events; +package de.vincidev.bungeeban.events; import java.util.UUID; diff --git a/src/de/VinciDev/BungeeBan/Events/BungeeMuteEvent.java b/src/de/VinciDev/BungeeBan/Events/BungeeMuteEvent.java index cf8ef05..9b90058 100644 --- a/src/de/VinciDev/BungeeBan/Events/BungeeMuteEvent.java +++ b/src/de/VinciDev/BungeeBan/Events/BungeeMuteEvent.java @@ -1,4 +1,4 @@ -package de.VinciDev.BungeeBan.Events; +package de.vincidev.bungeeban.events; import java.util.UUID; diff --git a/src/de/VinciDev/BungeeBan/Events/BungeeMuteIpEvent.java b/src/de/VinciDev/BungeeBan/Events/BungeeMuteIpEvent.java index 1253c80..89366aa 100644 --- a/src/de/VinciDev/BungeeBan/Events/BungeeMuteIpEvent.java +++ b/src/de/VinciDev/BungeeBan/Events/BungeeMuteIpEvent.java @@ -1,4 +1,4 @@ -package de.VinciDev.BungeeBan.Events; +package de.vincidev.bungeeban.events; import net.md_5.bungee.api.plugin.Event; diff --git a/src/de/VinciDev/BungeeBan/Events/BungeeReportEvent.java b/src/de/VinciDev/BungeeBan/Events/BungeeReportEvent.java index d97680f..bb8f2a5 100644 --- a/src/de/VinciDev/BungeeBan/Events/BungeeReportEvent.java +++ b/src/de/VinciDev/BungeeBan/Events/BungeeReportEvent.java @@ -1,4 +1,4 @@ -package de.VinciDev.BungeeBan.Events; +package de.vincidev.bungeeban.events; import java.util.UUID; diff --git a/src/de/VinciDev/BungeeBan/Events/BungeeUnbanEvent.java b/src/de/VinciDev/BungeeBan/Events/BungeeUnbanEvent.java index 4627b0e..f5fe0e8 100644 --- a/src/de/VinciDev/BungeeBan/Events/BungeeUnbanEvent.java +++ b/src/de/VinciDev/BungeeBan/Events/BungeeUnbanEvent.java @@ -1,4 +1,4 @@ -package de.VinciDev.BungeeBan.Events; +package de.vincidev.bungeeban.events; import java.util.UUID; diff --git a/src/de/VinciDev/BungeeBan/Events/BungeeUnmuteEvent.java b/src/de/VinciDev/BungeeBan/Events/BungeeUnmuteEvent.java index 5d89529..b515b75 100644 --- a/src/de/VinciDev/BungeeBan/Events/BungeeUnmuteEvent.java +++ b/src/de/VinciDev/BungeeBan/Events/BungeeUnmuteEvent.java @@ -1,4 +1,4 @@ -package de.VinciDev.BungeeBan.Events; +package de.vincidev.bungeeban.events; import java.util.UUID; diff --git a/src/de/VinciDev/BungeeBan/Events/BungeeUnwarnEvent.java b/src/de/VinciDev/BungeeBan/Events/BungeeUnwarnEvent.java index a766ac3..e8d2207 100644 --- a/src/de/VinciDev/BungeeBan/Events/BungeeUnwarnEvent.java +++ b/src/de/VinciDev/BungeeBan/Events/BungeeUnwarnEvent.java @@ -1,4 +1,4 @@ -package de.VinciDev.BungeeBan.Events; +package de.vincidev.bungeeban.events; import java.util.UUID; diff --git a/src/de/VinciDev/BungeeBan/Events/BungeeWarnEvent.java b/src/de/VinciDev/BungeeBan/Events/BungeeWarnEvent.java index 2ff9c9c..035f841 100644 --- a/src/de/VinciDev/BungeeBan/Events/BungeeWarnEvent.java +++ b/src/de/VinciDev/BungeeBan/Events/BungeeWarnEvent.java @@ -1,4 +1,4 @@ -package de.VinciDev.BungeeBan.Events; +package de.vincidev.bungeeban.events; import java.util.UUID; diff --git a/src/de/VinciDev/BungeeBan/Handlers/BroadcastHandlers.java b/src/de/VinciDev/BungeeBan/Handlers/BroadcastHandlers.java index c17613d..fad16dd 100644 --- a/src/de/VinciDev/BungeeBan/Handlers/BroadcastHandlers.java +++ b/src/de/VinciDev/BungeeBan/Handlers/BroadcastHandlers.java @@ -1,15 +1,15 @@ -package de.VinciDev.BungeeBan.Handlers; - -import de.VinciDev.BungeeBan.Events.BungeeBanEvent; -import de.VinciDev.BungeeBan.Events.BungeeBanIpEvent; -import de.VinciDev.BungeeBan.Events.BungeeKickEvent; -import de.VinciDev.BungeeBan.Events.BungeeMuteEvent; -import de.VinciDev.BungeeBan.Events.BungeeMuteIpEvent; -import de.VinciDev.BungeeBan.Events.BungeeReportEvent; -import de.VinciDev.BungeeBan.Events.BungeeUnbanEvent; -import de.VinciDev.BungeeBan.Events.BungeeUnmuteEvent; -import de.VinciDev.BungeeBan.Events.BungeeUnwarnEvent; -import de.VinciDev.BungeeBan.Events.BungeeWarnEvent; +package de.vincidev.bungeeban.handlers; + +import de.vincidev.bungeeban.events.BungeeBanEvent; +import de.vincidev.bungeeban.events.BungeeBanIpEvent; +import de.vincidev.bungeeban.events.BungeeKickEvent; +import de.vincidev.bungeeban.events.BungeeMuteEvent; +import de.vincidev.bungeeban.events.BungeeMuteIpEvent; +import de.vincidev.bungeeban.events.BungeeReportEvent; +import de.vincidev.bungeeban.events.BungeeUnbanEvent; +import de.vincidev.bungeeban.events.BungeeUnmuteEvent; +import de.vincidev.bungeeban.events.BungeeUnwarnEvent; +import de.vincidev.bungeeban.events.BungeeWarnEvent; import net.md_5.bungee.api.plugin.Listener; import net.md_5.bungee.event.EventHandler; diff --git a/src/de/VinciDev/BungeeBan/Handlers/PlayerConnect.java b/src/de/VinciDev/BungeeBan/Handlers/PlayerConnect.java index 854145c..5e9b26f 100644 --- a/src/de/VinciDev/BungeeBan/Handlers/PlayerConnect.java +++ b/src/de/VinciDev/BungeeBan/Handlers/PlayerConnect.java @@ -1,6 +1,6 @@ -package de.VinciDev.BungeeBan.Handlers; +package de.vincidev.bungeeban.handlers; -import de.VinciDev.BungeeBan.Util.BungeeBan; +import de.vincidev.bungeeban.utils.BungeeBanUtils; import net.md_5.bungee.api.connection.ProxiedPlayer; import net.md_5.bungee.api.event.ServerConnectEvent; import net.md_5.bungee.api.plugin.Listener; @@ -10,6 +10,6 @@ public class PlayerConnect implements Listener { @EventHandler public void onConnected(ServerConnectEvent e) { ProxiedPlayer p = e.getPlayer(); - BungeeBan.pushPlayer(p); + BungeeBanUtils.pushPlayer(p); } } \ No newline at end of file diff --git a/src/de/VinciDev/BungeeBan/Metrics/Metrics.java b/src/de/VinciDev/BungeeBan/Metrics/Metrics.java index 7baf08a..65ea67e 100644 --- a/src/de/VinciDev/BungeeBan/Metrics/Metrics.java +++ b/src/de/VinciDev/BungeeBan/Metrics/Metrics.java @@ -25,7 +25,7 @@ * authors and contributors and should not be interpreted as representing official policies, * either expressed or implied, of anybody else. */ -package de.VinciDev.BungeeBan.Metrics; +package de.vincidev.bungeeban.metrics; import net.md_5.bungee.api.ProxyServer; import net.md_5.bungee.api.plugin.Plugin; diff --git a/src/de/VinciDev/BungeeBan/Util/BungeeBan.java b/src/de/VinciDev/BungeeBan/utils/BungeeBanUtils.java similarity index 86% rename from src/de/VinciDev/BungeeBan/Util/BungeeBan.java rename to src/de/VinciDev/BungeeBan/utils/BungeeBanUtils.java index 541ecc3..c3d8145 100644 --- a/src/de/VinciDev/BungeeBan/Util/BungeeBan.java +++ b/src/de/VinciDev/BungeeBan/utils/BungeeBanUtils.java @@ -1,4 +1,4 @@ -package de.VinciDev.BungeeBan.Util; +package de.vincidev.bungeeban.utils; import java.sql.ResultSet; import java.sql.SQLException; @@ -7,10 +7,10 @@ import java.util.Date; import java.util.UUID; -import de.VinciDev.BungeeBan.Main; -import de.VinciDev.BungeeBan.Events.BungeeBanEvent; -import de.VinciDev.BungeeBan.Events.BungeeBanIpEvent; -import de.VinciDev.BungeeBan.Events.BungeeReportEvent; +import de.vincidev.bungeeban.BungeeBan; +import de.vincidev.bungeeban.events.BungeeBanEvent; +import de.vincidev.bungeeban.events.BungeeBanIpEvent; +import de.vincidev.bungeeban.events.BungeeReportEvent; import net.md_5.bungee.BungeeCord; import net.md_5.bungee.api.connection.ProxiedPlayer; @@ -25,7 +25,7 @@ * API. If you need help using this class and its implemented * methods, don't hesitate to contact VinciDev in Skype. */ -public class BungeeBan { +public class BungeeBanUtils { public static final String tablePrefix = "BungeeBan_"; @@ -33,18 +33,18 @@ public class BungeeBan { * Creates the tables in the MySQL database in case they didn't exist yet. */ public static void createTables() { - Main.getMysql().update("CREATE TABLE IF NOT EXISTS " + tablePrefix + BungeeBan.getMysql().update("CREATE TABLE IF NOT EXISTS " + tablePrefix + "PlayerCache(Playername VARCHAR(16), UUID VARCHAR(100), FirstOnline LONG, LastOnline LONG, LastIP VARCHAR(100))"); - Main.getMysql().update("CREATE TABLE IF NOT EXISTS " + tablePrefix + BungeeBan.getMysql().update("CREATE TABLE IF NOT EXISTS " + tablePrefix + "Bans(UUID VARCHAR(100), BanReason VARCHAR(256), BannedOn LONG, BanEnd LONG, BannedBy VARCHAR(100))"); - Main.getMysql().update("CREATE TABLE IF NOT EXISTS " + tablePrefix + BungeeBan.getMysql().update("CREATE TABLE IF NOT EXISTS " + tablePrefix + "IPBans(IP VARCHAR(100), BanReason VARCHAR(256), BannedOn LONG, BanEnd LONG, BannedBy VARCHAR(100))"); - Main.getMysql().update("CREATE TABLE IF NOT EXISTS " + tablePrefix + BungeeBan.getMysql().update("CREATE TABLE IF NOT EXISTS " + tablePrefix + "Mutes(UUID VARCHAR(100), MuteReason VARCHAR(256), MutedOn LONG, MuteEnd LONG, MutedBy VARCHAR(100))"); - Main.getMysql().update("CREATE TABLE IF NOT EXISTS " + tablePrefix + BungeeBan.getMysql().update("CREATE TABLE IF NOT EXISTS " + tablePrefix + "IPMutes(IP VARCHAR(100), MuteReason VARCHAR(256), MutedOn LONG, MuteEnd LONG, MutedBy VARCHAR(100))"); - Main.getMysql().update("CREATE TABLE IF NOT EXISTS " + tablePrefix + "Warns(UUID VARCHAR(100), WarnLevel INT)"); - Main.getMysql() + BungeeBan.getMysql().update("CREATE TABLE IF NOT EXISTS " + tablePrefix + "Warns(UUID VARCHAR(100), WarnLevel INT)"); + BungeeBan.getMysql() .update("CREATE TABLE IF NOT EXISTS " + tablePrefix + "Logs(Date VARCHAR(100), Message VARCHAR(1024))"); } @@ -56,7 +56,7 @@ public static void createTables() { * @return nothing */ public static void report(UUID reported, UUID reportedBy, String reason, String servername) { - Main.getInstance().getProxy().getPluginManager() + BungeeBan.getInstance().getProxy().getPluginManager() .callEvent(new BungeeReportEvent(reported, reportedBy, reason, servername)); } @@ -68,17 +68,17 @@ public static void report(UUID reported, UUID reportedBy, String reason, String * the Player who should be pushed */ public static void pushPlayer(ProxiedPlayer p) { - ResultSet rs = Main.getMysql().getResult( + ResultSet rs = BungeeBan.getMysql().getResult( "SELECT * FROM " + tablePrefix + "PlayerCache WHERE UUID='" + p.getUniqueId().toString() + "'"); try { if (rs.next()) { - Main.getMysql() + BungeeBan.getMysql() .update("UPDATE " + tablePrefix + "PlayerCache SET Playername='" + p.getName() + "', LastOnline='" + System.currentTimeMillis() + "', LastIP='" + p.getAddress().getAddress().getHostAddress() + "' WHERE UUID='" + p.getUniqueId().toString() + "'"); } else { - Main.getMysql().update("INSERT INTO " + tablePrefix + BungeeBan.getMysql().update("INSERT INTO " + tablePrefix + "PlayerCache(Playername, UUID, FirstOnline, LastOnline, LastIP) VALUES('" + p.getName() + "', '" + p.getUniqueId().toString() + "', '" + System.currentTimeMillis() + "', '" + System.currentTimeMillis() + "', '" + p.getAddress().getAddress().getHostAddress() + "')"); @@ -97,8 +97,8 @@ public static void pushPlayer(ProxiedPlayer p) { * "null" if he doesn't. */ public static UUID getUniqueID(String playername) { - ResultSet rs = Main.getMysql() - .getResult("SELECT * FROM " + tablePrefix + "PlayerCache WHERE Playername='" + playername + "'"); + ResultSet rs = BungeeBan.getMysql() + .getResult("SELECT * FROM " + tablePrefix + "PlayerCache WHERE Playername like '" + playername + "'"); try { if (rs.next()) { return UUID.fromString(rs.getString("UUID")); @@ -118,7 +118,7 @@ public static UUID getUniqueID(String playername) { * he doesn't. */ public static String getPlayername(UUID uuid) { - ResultSet rs = Main.getMysql() + ResultSet rs = BungeeBan.getMysql() .getResult("SELECT * FROM " + tablePrefix + "PlayerCache WHERE UUID='" + uuid.toString() + "'"); try { if (rs.next()) { @@ -156,7 +156,7 @@ public static String getUUID(String playername) { * exists, or "0" if he doesn't. */ public static long firstOnline(UUID uuid) { - ResultSet rs = Main.getMysql() + ResultSet rs = BungeeBan.getMysql() .getResult("SELECT * FROM " + tablePrefix + "PlayerCache WHERE UUID='" + uuid.toString() + "'"); try { if (rs.next()) { @@ -178,7 +178,7 @@ public static long firstOnline(UUID uuid) { * exists, or "0" if he doesn't. */ public static long lastOnline(UUID uuid) { - ResultSet rs = Main.getMysql() + ResultSet rs = BungeeBan.getMysql() .getResult("SELECT * FROM " + tablePrefix + "PlayerCache WHERE UUID='" + uuid.toString() + "'"); try { if (rs.next()) { @@ -200,7 +200,7 @@ public static long lastOnline(UUID uuid) { * exists, or "0" if he doesn't. */ public static String getLastIp(UUID uuid) { - ResultSet rs = Main.getMysql() + ResultSet rs = BungeeBan.getMysql() .getResult("SELECT * FROM " + tablePrefix + "PlayerCache WHERE UUID='" + uuid.toString() + "'"); try { if (rs.next()) { @@ -220,7 +220,7 @@ public static String getLastIp(UUID uuid) { * @return true if the player is banned, false if the player is not banned. */ public static boolean isBanned(UUID uuid) { - ResultSet rs = Main.getMysql() + ResultSet rs = BungeeBan.getMysql() .getResult("SELECT * FROM " + tablePrefix + "Bans WHERE UUID='" + uuid.toString() + "'"); try { if (rs.next()) { @@ -240,7 +240,7 @@ public static boolean isBanned(UUID uuid) { * @return true if the player is banned, false if the player is not banned. */ public static boolean isBanned(String ip) { - ResultSet rs = Main.getMysql().getResult("SELECT * FROM " + tablePrefix + "IPBans WHERE IP='" + ip + "'"); + ResultSet rs = BungeeBan.getMysql().getResult("SELECT * FROM " + tablePrefix + "IPBans WHERE IP='" + ip + "'"); try { if (rs.next()) { return true; @@ -259,7 +259,7 @@ public static boolean isBanned(String ip) { * @return true if the player is muted, false if the player is not muted. */ public static boolean isMuted(UUID uuid) { - ResultSet rs = Main.getMysql() + ResultSet rs = BungeeBan.getMysql() .getResult("SELECT * FROM " + tablePrefix + "Mutes WHERE UUID='" + uuid.toString() + "'"); try { if (rs.next()) { @@ -279,7 +279,7 @@ public static boolean isMuted(UUID uuid) { * @return true if the IP is muted, false if the IP is not muted. */ public static boolean isMuted(String ip) { - ResultSet rs = Main.getMysql().getResult("SELECT * FROM " + tablePrefix + "IPMutes WHERE IP='" + ip + "'"); + ResultSet rs = BungeeBan.getMysql().getResult("SELECT * FROM " + tablePrefix + "IPMutes WHERE IP='" + ip + "'"); try { if (rs.next()) { return true; @@ -298,7 +298,7 @@ public static boolean isMuted(String ip) { * @return true if the player is warned, false if the player is not warned. */ public static boolean isWarned(UUID uuid) { - ResultSet rs = Main.getMysql() + ResultSet rs = BungeeBan.getMysql() .getResult("SELECT * FROM " + tablePrefix + "Warns WHERE UUID='" + uuid.toString() + "'"); try { if (rs.next()) { @@ -319,7 +319,7 @@ public static boolean isWarned(UUID uuid) { * is not banned */ public static String getBanReason(UUID uuid) { - ResultSet rs = Main.getMysql() + ResultSet rs = BungeeBan.getMysql() .getResult("SELECT * FROM " + tablePrefix + "Bans WHERE UUID='" + uuid.toString() + "'"); try { if (rs.next()) { @@ -340,7 +340,7 @@ public static String getBanReason(UUID uuid) { * banned */ public static String getBanReason(String ip) { - ResultSet rs = Main.getMysql().getResult("SELECT * FROM " + tablePrefix + "IPBans WHERE IP='" + ip + "'"); + ResultSet rs = BungeeBan.getMysql().getResult("SELECT * FROM " + tablePrefix + "IPBans WHERE IP='" + ip + "'"); try { if (rs.next()) { return rs.getString("BanReason"); @@ -360,7 +360,7 @@ public static String getBanReason(String ip) { * is not muted */ public static String getMuteReason(UUID uuid) { - ResultSet rs = Main.getMysql() + ResultSet rs = BungeeBan.getMysql() .getResult("SELECT * FROM " + tablePrefix + "Mutes WHERE UUID='" + uuid.toString() + "'"); try { if (rs.next()) { @@ -381,7 +381,7 @@ public static String getMuteReason(UUID uuid) { * muted */ public static String getMuteReason(String ip) { - ResultSet rs = Main.getMysql().getResult("SELECT * FROM " + tablePrefix + "IPMutes WHERE IP='" + ip + "'"); + ResultSet rs = BungeeBan.getMysql().getResult("SELECT * FROM " + tablePrefix + "IPMutes WHERE IP='" + ip + "'"); try { if (rs.next()) { return rs.getString("MuteReason"); @@ -402,7 +402,7 @@ public static String getMuteReason(String ip) { * if the player is not banned */ public static String getWhoBanned(UUID uuid) { - ResultSet rs = Main.getMysql() + ResultSet rs = BungeeBan.getMysql() .getResult("SELECT * FROM " + tablePrefix + "Bans WHERE UUID='" + uuid.toString() + "'"); try { if (rs.next()) { @@ -423,7 +423,7 @@ public static String getWhoBanned(UUID uuid) { * the IP is not banned */ public static String getWhoBanned(String ip) { - ResultSet rs = Main.getMysql().getResult("SELECT * FROM " + tablePrefix + "IPBans WHERE IP='" + ip + "'"); + ResultSet rs = BungeeBan.getMysql().getResult("SELECT * FROM " + tablePrefix + "IPBans WHERE IP='" + ip + "'"); try { if (rs.next()) { return rs.getString("BannedBy"); @@ -444,7 +444,7 @@ public static String getWhoBanned(String ip) { * if the player is not muted */ public static String getWhoMuted(UUID uuid) { - ResultSet rs = Main.getMysql() + ResultSet rs = BungeeBan.getMysql() .getResult("SELECT * FROM " + tablePrefix + "Mutes WHERE UUID='" + uuid.toString() + "'"); try { if (rs.next()) { @@ -465,7 +465,7 @@ public static String getWhoMuted(UUID uuid) { * the IP is not muted */ public static String getWhoMuted(String ip) { - ResultSet rs = Main.getMysql().getResult("SELECT * FROM " + tablePrefix + "IPMutes WHERE IP='" + ip + "'"); + ResultSet rs = BungeeBan.getMysql().getResult("SELECT * FROM " + tablePrefix + "IPMutes WHERE IP='" + ip + "'"); try { if (rs.next()) { return rs.getString("MutedBy"); @@ -484,7 +484,7 @@ public static String getWhoMuted(String ip) { * @return The time when the player has been banned and 0 if he isnt banned */ public static long getBannedOn(UUID uuid) { - ResultSet rs = Main.getMysql() + ResultSet rs = BungeeBan.getMysql() .getResult("SELECT * FROM " + tablePrefix + "Bans WHERE UUID='" + uuid.toString() + "'"); try { if (rs.next()) { @@ -504,7 +504,7 @@ public static long getBannedOn(UUID uuid) { * @return The time when the IP has been banned and 0 if it isnt banned */ public static long getBannedOn(String ip) { - ResultSet rs = Main.getMysql().getResult("SELECT * FROM " + tablePrefix + "IPBans WHERE IP='" + ip + "'"); + ResultSet rs = BungeeBan.getMysql().getResult("SELECT * FROM " + tablePrefix + "IPBans WHERE IP='" + ip + "'"); try { if (rs.next()) { return rs.getLong("BannedOn"); @@ -523,7 +523,7 @@ public static long getBannedOn(String ip) { * @return The time when the player has been muted and 0 if he isnt muted */ public static long getMutedOn(UUID uuid) { - ResultSet rs = Main.getMysql() + ResultSet rs = BungeeBan.getMysql() .getResult("SELECT * FROM " + tablePrefix + "Mutes WHERE UUID='" + uuid.toString() + "'"); try { if (rs.next()) { @@ -543,7 +543,7 @@ public static long getMutedOn(UUID uuid) { * @return The time when the IP has been muted and 0 if it isnt muted */ public static long getMutedOn(String ip) { - ResultSet rs = Main.getMysql().getResult("SELECT * FROM " + tablePrefix + "IPMutes WHERE IP='" + ip + "'"); + ResultSet rs = BungeeBan.getMysql().getResult("SELECT * FROM " + tablePrefix + "IPMutes WHERE IP='" + ip + "'"); try { if (rs.next()) { return rs.getLong("MutedOn"); @@ -563,7 +563,7 @@ public static long getMutedOn(String ip) { * -1 if he is permanently banned */ public static long getBanEnd(UUID uuid) { - ResultSet rs = Main.getMysql() + ResultSet rs = BungeeBan.getMysql() .getResult("SELECT * FROM " + tablePrefix + "Bans WHERE UUID='" + uuid.toString() + "'"); try { if (rs.next()) { @@ -584,7 +584,7 @@ public static long getBanEnd(UUID uuid) { * if he is permanently muted */ public static long getMuteEnd(String ip) { - ResultSet rs = Main.getMysql().getResult("SELECT * FROM " + tablePrefix + "IPMutes WHERE UUID='" + ip + "'"); + ResultSet rs = BungeeBan.getMysql().getResult("SELECT * FROM " + tablePrefix + "IPMutes WHERE UUID='" + ip + "'"); try { if (rs.next()) { return rs.getLong("MuteEnd"); @@ -604,7 +604,7 @@ public static long getMuteEnd(String ip) { * if he is permanently muted */ public static long getMuteEnd(UUID uuid) { - ResultSet rs = Main.getMysql() + ResultSet rs = BungeeBan.getMysql() .getResult("SELECT * FROM " + tablePrefix + "Mutes WHERE UUID='" + uuid.toString() + "'"); try { if (rs.next()) { @@ -625,7 +625,7 @@ public static long getMuteEnd(UUID uuid) { * if he is permanently banned */ public static long getBanEnd(String ip) { - ResultSet rs = Main.getMysql().getResult("SELECT * FROM " + tablePrefix + "IPBans WHERE IP='" + ip + "'"); + ResultSet rs = BungeeBan.getMysql().getResult("SELECT * FROM " + tablePrefix + "IPBans WHERE IP='" + ip + "'"); try { if (rs.next()) { return rs.getLong("BanEnd"); @@ -645,8 +645,8 @@ public static long getBanEnd(String ip) { public static void log(String message) { DateFormat dateFormat = new SimpleDateFormat("dd/MM/yyyy HH:mm:ss"); Date date = new Date(); - if (Main.getMysql() != null) { - Main.getMysql().update("INSERT INTO " + tablePrefix + "Logs(Date, Message) VALUES('" + if (BungeeBan.getMysql() != null) { + BungeeBan.getMysql().update("INSERT INTO " + tablePrefix + "Logs(Date, Message) VALUES('" + dateFormat.format(date) + "', '" + message + "')"); } } @@ -660,7 +660,7 @@ public static void log(String message) { * and -1 if he hasn't. */ public static int getWarnLevel(UUID uuid) { - ResultSet rs = Main.getMysql() + ResultSet rs = BungeeBan.getMysql() .getResult("SELECT * FROM " + tablePrefix + "Warns WHERE UUID='" + uuid.toString() + "'"); try { if (rs.next()) { @@ -681,10 +681,10 @@ public static int getWarnLevel(UUID uuid) { */ public static void setWarnLevel(UUID uuid, int warnlevel) { if (getWarnLevel(uuid) != -1) { - Main.getMysql().update("UPDATE " + tablePrefix + "Warns SET WarnLevel='" + warnlevel + "' WHERE UUID='" + BungeeBan.getMysql().update("UPDATE " + tablePrefix + "Warns SET WarnLevel='" + warnlevel + "' WHERE UUID='" + uuid.toString() + "'"); } else { - Main.getMysql().update("INSERT INTO " + tablePrefix + "Warns(UUID, WarnLevel) VALUES('" + uuid.toString() + BungeeBan.getMysql().update("INSERT INTO " + tablePrefix + "Warns(UUID, WarnLevel) VALUES('" + uuid.toString() + "', '" + warnlevel + "')"); } } @@ -749,7 +749,7 @@ public static void banPlayer(UUID uuid, String bannedBy, String banReason, long end = System.currentTimeMillis() + (seconds * 1000); } // MySQL Insertion - Main.getMysql() + BungeeBan.getMysql() .update("INSERT INTO " + tablePrefix + "Bans(UUID, BanReason, BannedOn, BanEnd, BannedBy) VALUES('" + uuid.toString() + "', '" + banReason + "', '" + System.currentTimeMillis() + "', '" + end + "', '" + bannedBy + "')"); @@ -785,7 +785,7 @@ public static void banPlayer(String ip, String bannedBy, String banReason, long end = System.currentTimeMillis() + (seconds * 1000); } // MySQL Insertion - Main.getMysql() + BungeeBan.getMysql() .update("INSERT INTO " + tablePrefix + "IPBans(IP, BanReason, BannedOn, BanEnd, BannedBy) VALUES('" + ip.toString() + "', '" + banReason + "', '" + System.currentTimeMillis() + "', '" + end + "', '" + bannedBy + "')"); diff --git a/src/de/VinciDev/BungeeBan/Util/BungeeUtil.java b/src/de/VinciDev/BungeeBan/utils/BungeeUtil.java similarity index 97% rename from src/de/VinciDev/BungeeBan/Util/BungeeUtil.java rename to src/de/VinciDev/BungeeBan/utils/BungeeUtil.java index 8e4c4c7..672f019 100644 --- a/src/de/VinciDev/BungeeBan/Util/BungeeUtil.java +++ b/src/de/VinciDev/BungeeBan/utils/BungeeUtil.java @@ -1,4 +1,4 @@ -package de.VinciDev.BungeeBan.Util; +package de.vincidev.bungeeban.utils; import java.util.UUID; diff --git a/src/de/VinciDev/BungeeBan/Util/FileManager.java b/src/de/VinciDev/BungeeBan/utils/FileManager.java similarity index 84% rename from src/de/VinciDev/BungeeBan/Util/FileManager.java rename to src/de/VinciDev/BungeeBan/utils/FileManager.java index 3d2e1b2..dead9e2 100644 --- a/src/de/VinciDev/BungeeBan/Util/FileManager.java +++ b/src/de/VinciDev/BungeeBan/utils/FileManager.java @@ -1,4 +1,4 @@ -package de.VinciDev.BungeeBan.Util; +package de.vincidev.bungeeban.utils; import java.io.File; import java.io.IOException; @@ -6,7 +6,7 @@ import java.util.List; import java.util.UUID; -import de.VinciDev.BungeeBan.Main; +import de.vincidev.bungeeban.BungeeBan; import net.md_5.bungee.api.ChatColor; import net.md_5.bungee.config.Configuration; import net.md_5.bungee.config.ConfigurationProvider; @@ -19,10 +19,10 @@ public class FileManager { public static Configuration LanguageConfiguration; public static void loadFiles() { - if (!Main.getInstance().getDataFolder().exists()) { - Main.getInstance().getDataFolder().mkdir(); + if (!BungeeBan.getInstance().getDataFolder().exists()) { + BungeeBan.getInstance().getDataFolder().mkdir(); } - ConfigFile = new File(Main.getInstance().getDataFolder().getPath(), "config.yml"); + ConfigFile = new File(BungeeBan.getInstance().getDataFolder().getPath(), "config.yml"); if (!ConfigFile.exists()) { try { ConfigFile.createNewFile(); @@ -35,7 +35,7 @@ public static void loadFiles() { } catch (IOException e1) { e1.printStackTrace(); } - LanguageFile = new File(Main.getInstance().getDataFolder().getPath(), "lang.yml"); + LanguageFile = new File(BungeeBan.getInstance().getDataFolder().getPath(), "lang.yml"); if (!LanguageFile.exists()) { try { LanguageFile.createNewFile(); @@ -54,9 +54,9 @@ public static void setDefaultConfig() { if (ConfigConfiguration.get("MySQL") == null) { ConfigConfiguration.set("MySQL.Hostname", "127.0.0.1"); ConfigConfiguration.set("MySQL.Port", 3306); - ConfigConfiguration.set("MySQL.Username", "bungeeban"); + ConfigConfiguration.set("MySQL.Username", "BungeeBanUtils"); ConfigConfiguration.set("MySQL.Password", "walrus"); - ConfigConfiguration.set("MySQL.Database", "bungeeban"); + ConfigConfiguration.set("MySQL.Database", "BungeeBanUtils"); ConfigConfiguration.set("WebPanel.Username", "admin"); ConfigConfiguration.set("WebPanel.Password", "admin"); ConfigConfiguration.set("Report.CoolDownActivated", true); @@ -79,14 +79,14 @@ public static void readConfig() { String username = ConfigConfiguration.getString("MySQL.Username"); String password = ConfigConfiguration.getString("MySQL.Password"); String database = ConfigConfiguration.getString("MySQL.Database"); - Main.setMysql(new MySQL(hostname, port, username, password, database)); + BungeeBan.setMysql(new MySQL(hostname, port, username, password, database)); } @SuppressWarnings({ "rawtypes", "unchecked" }) public static void createLangFile() { if (LanguageConfiguration.get("Prefix") == null) { // Prefixes - LanguageConfiguration.set("Prefix", "&8[&cBungeeBan&8] "); + LanguageConfiguration.set("Prefix", "&8[&cBungeeBanUtils&8] "); // Errors LanguageConfiguration.set("Messages.NoPermissions", "&cYou are not allowed to use this."); LanguageConfiguration.set("Messages.Cooldown", "&cPlease wait a bit before using this again."); @@ -195,11 +195,11 @@ public static String getTranslation(String path) { public static List getBanKickMessage(UUID uuid) { List messages = new ArrayList<>(); - if (BungeeBan.isBanned(uuid)) { - String playername = BungeeBan.getPlayername(uuid); - String reason = BungeeBan.getBanReason(uuid); - String by = BungeeBan.getWhoBanned(uuid); - String end = BungeeBan.getRemainingTime(BungeeBan.getBanEnd(uuid)); + if (BungeeBanUtils.isBanned(uuid)) { + String playername = BungeeBanUtils.getPlayername(uuid); + String reason = BungeeBanUtils.getBanReason(uuid); + String by = BungeeBanUtils.getWhoBanned(uuid); + String end = BungeeBanUtils.getRemainingTime(BungeeBanUtils.getBanEnd(uuid)); messages = LanguageConfiguration.getStringList("Messages.Ban.Kick"); for (String message : messages) { message = ChatColor.translateAlternateColorCodes('&', message); @@ -214,11 +214,11 @@ public static List getBanKickMessage(UUID uuid) { public static List getBanBroadcastMessage(UUID uuid) { List messages = new ArrayList<>(); - if (BungeeBan.isBanned(uuid)) { - String playername = BungeeBan.getPlayername(uuid); - String reason = BungeeBan.getBanReason(uuid); - String by = BungeeBan.getWhoBanned(uuid); - String end = BungeeBan.getRemainingTime(BungeeBan.getBanEnd(uuid)); + if (BungeeBanUtils.isBanned(uuid)) { + String playername = BungeeBanUtils.getPlayername(uuid); + String reason = BungeeBanUtils.getBanReason(uuid); + String by = BungeeBanUtils.getWhoBanned(uuid); + String end = BungeeBanUtils.getRemainingTime(BungeeBanUtils.getBanEnd(uuid)); messages = LanguageConfiguration.getStringList("Messages.Ban.Broadcast"); for (String message : messages) { message = ChatColor.translateAlternateColorCodes('&', message); @@ -233,10 +233,10 @@ public static List getBanBroadcastMessage(UUID uuid) { public static List getBanBroadcastMessage(String ip) { List messages = new ArrayList<>(); - if (BungeeBan.isBanned(ip)) { - String reason = BungeeBan.getBanReason(ip); - String by = BungeeBan.getWhoBanned(ip); - String end = BungeeBan.getRemainingTime(BungeeBan.getBanEnd(ip)); + if (BungeeBanUtils.isBanned(ip)) { + String reason = BungeeBanUtils.getBanReason(ip); + String by = BungeeBanUtils.getWhoBanned(ip); + String end = BungeeBanUtils.getRemainingTime(BungeeBanUtils.getBanEnd(ip)); messages = LanguageConfiguration.getStringList("Messages.Ban.Broadcast"); for (String message : messages) { message = ChatColor.translateAlternateColorCodes('&', message); @@ -251,10 +251,10 @@ public static List getBanBroadcastMessage(String ip) { public static List getBanKickMessage(String ip) { List messages = new ArrayList<>(); - if (BungeeBan.isBanned(ip)) { - String reason = BungeeBan.getBanReason(ip); - String by = BungeeBan.getWhoBanned(ip); - String end = BungeeBan.getRemainingTime(BungeeBan.getBanEnd(ip)); + if (BungeeBanUtils.isBanned(ip)) { + String reason = BungeeBanUtils.getBanReason(ip); + String by = BungeeBanUtils.getWhoBanned(ip); + String end = BungeeBanUtils.getRemainingTime(BungeeBanUtils.getBanEnd(ip)); messages = LanguageConfiguration.getStringList("Messages.Ban.Kick"); for (String message : messages) { message = ChatColor.translateAlternateColorCodes('&', message); @@ -268,11 +268,11 @@ public static List getBanKickMessage(String ip) { public static List getMuteKickMessage(UUID uuid) { List messages = new ArrayList<>(); - if (BungeeBan.isBanned(uuid)) { - String playername = BungeeBan.getPlayername(uuid); - String reason = BungeeBan.getMuteReason(uuid); - String by = BungeeBan.getWhoMuted(uuid); - String end = BungeeBan.getRemainingTime(BungeeBan.getMuteEnd(uuid)); + if (BungeeBanUtils.isBanned(uuid)) { + String playername = BungeeBanUtils.getPlayername(uuid); + String reason = BungeeBanUtils.getMuteReason(uuid); + String by = BungeeBanUtils.getWhoMuted(uuid); + String end = BungeeBanUtils.getRemainingTime(BungeeBanUtils.getMuteEnd(uuid)); messages = LanguageConfiguration.getStringList("Messages.Mute.MuteMessage"); for (String message : messages) { message = ChatColor.translateAlternateColorCodes('&', message); @@ -287,10 +287,10 @@ public static List getMuteKickMessage(UUID uuid) { public static List getMuteKickMessage(String ip) { List messages = new ArrayList<>(); - if (BungeeBan.isBanned(ip)) { - String reason = BungeeBan.getMuteReason(ip); - String by = BungeeBan.getWhoMuted(ip); - String end = BungeeBan.getRemainingTime(BungeeBan.getMuteEnd(ip)); + if (BungeeBanUtils.isBanned(ip)) { + String reason = BungeeBanUtils.getMuteReason(ip); + String by = BungeeBanUtils.getWhoMuted(ip); + String end = BungeeBanUtils.getRemainingTime(BungeeBanUtils.getMuteEnd(ip)); messages = LanguageConfiguration.getStringList("Messages.Mute.MuteMessage"); for (String message : messages) { message = ChatColor.translateAlternateColorCodes('&', message); diff --git a/src/de/VinciDev/BungeeBan/Util/MySQL.java b/src/de/VinciDev/BungeeBan/utils/MySQL.java similarity index 93% rename from src/de/VinciDev/BungeeBan/Util/MySQL.java rename to src/de/VinciDev/BungeeBan/utils/MySQL.java index 6676949..24d7ccf 100644 --- a/src/de/VinciDev/BungeeBan/Util/MySQL.java +++ b/src/de/VinciDev/BungeeBan/utils/MySQL.java @@ -1,4 +1,4 @@ -package de.VinciDev.BungeeBan.Util; +package de.vincidev.bungeeban.utils; import java.sql.Connection; import java.sql.DriverManager; @@ -6,7 +6,7 @@ import java.sql.ResultSet; import java.sql.SQLException; -import de.VinciDev.BungeeBan.Main; +import de.vincidev.bungeeban.BungeeBan; import net.md_5.bungee.BungeeCord; public class MySQL { @@ -53,7 +53,7 @@ public void closeConnection() { public void update(String query) { if (isConnected()) { - BungeeCord.getInstance().getScheduler().runAsync(Main.getInstance(), new Runnable() { + BungeeCord.getInstance().getScheduler().runAsync(BungeeBan.getInstance(), new Runnable() { @Override public void run() { try { diff --git a/src/de/VinciDev/BungeeBan/Util/UpdateChecker.java b/src/de/VinciDev/BungeeBan/utils/UpdateChecker.java similarity index 86% rename from src/de/VinciDev/BungeeBan/Util/UpdateChecker.java rename to src/de/VinciDev/BungeeBan/utils/UpdateChecker.java index fbdfe9d..572d876 100644 --- a/src/de/VinciDev/BungeeBan/Util/UpdateChecker.java +++ b/src/de/VinciDev/BungeeBan/utils/UpdateChecker.java @@ -1,4 +1,4 @@ -package de.VinciDev.BungeeBan.Util; +package de.vincidev.bungeeban.utils; import java.io.BufferedReader; import java.io.IOException; @@ -7,10 +7,10 @@ import java.net.MalformedURLException; import java.net.URL; -import de.VinciDev.BungeeBan.Main; +import de.vincidev.bungeeban.BungeeBan; public class UpdateChecker { - public static boolean updateAvailable(Main instance, String rsID) { + public static boolean updateAvailable(BungeeBan instance, String rsID) { int localVersion = Integer.parseInt(instance.getDescription().getVersion().replace(".", "")); try { HttpURLConnection con = (HttpURLConnection) new URL("http://www.spigotmc.org/api/general.php") diff --git a/src/plugin.yml b/src/plugin.yml index f832fed..a778bb5 100644 --- a/src/plugin.yml +++ b/src/plugin.yml @@ -1,7 +1,7 @@ -name: BungeeCord +name: BungeeBan version: 2.7 author: [VinciDev] -main: de.VinciDev.BungeeBan.Main +main: de.vincidev.bungeeban.Main commands: ban: banip: