Altitude/LiteFlags
5
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Re-did formatting, removed some unused code and rewrote some excessive if statements

Browse Source
This commit is contained in:
Sti-jn 2021-04-04 19:24:43 +02:00
parent e9b13e085e
commit b235928089
14 changed files with 724 additions and 769 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

70
src/main/java/com/liteflags/auth/AuthTimer.java
View File

@ -3,51 +3,53 @@ package com.liteflags.auth;
import com.liteflags.LiteFlags; import com.liteflags.LiteFlags;
import com.liteflags.data.maps.MapCache; import com.liteflags.data.maps.MapCache;
import com.liteflags.util.Utilities; import com.liteflags.util.Utilities;
import java.util.HashMap; import java.util.HashMap;
import java.util.Map; import java.util.Map;
import java.util.UUID; import java.util.UUID;
import org.bukkit.Bukkit; import org.bukkit.Bukkit;
import org.bukkit.entity.Player; import org.bukkit.entity.Player;
public class AuthTimer<taskID> { public class AuthTimer<taskID> {
public LiteFlags flags; public LiteFlags flags;
public static Map<UUID, Integer> taskID = new HashMap(); public static Map<UUID, Integer> taskID = new HashMap();
public AuthTimer(LiteFlags flags) { public AuthTimer(LiteFlags flags) {
this.flags = flags; this.flags = flags;
} }
public static void startTimer(final Player player) { public static void startTimer(final Player player) {
int tid = LiteFlags.getInstance().getServer().getScheduler().scheduleSyncRepeatingTask(LiteFlags.getInstance(), new Runnable() { int tid = LiteFlags.getInstance().getServer().getScheduler().scheduleSyncRepeatingTask(LiteFlags.getInstance(), new Runnable() {
int timeRemaining = LiteFlags.getInstance().getConfig().getInt("Authenticate_Timer"); int timeRemaining = LiteFlags.getInstance().getConfig().getInt("Authenticate_Timer");
public void run() {
if (this.timeRemaining <= 0) {
if (player.hasPermission("liteflags.authentication.success")) {
AuthTimer.endTask(player);
} else {
player.sendMessage(Utilities.format(LiteFlags.getInstance().getConfig().getString("Messages.Authenticate").replace("%code%", (CharSequence) MapCache.reauthedPlayers.get(player.getUniqueId().toString()))));
Bukkit.getServer().dispatchCommand(Bukkit.getConsoleSender(), LiteFlags.getInstance().getConfig().getString("Authenticate_Timer_Command").replace("%player%", player.getName()).replace("%code%", (CharSequence) MapCache.reauthedPlayers.get(player.getUniqueId().toString())));
this.timeRemaining = LiteFlags.getInstance().getConfig().getInt("Authenticate_Timer");
}
} else if (player.hasPermission("liteflags.authentication.success")) {
AuthTimer.endTask(player);
} else {
--this.timeRemaining;
}
public void run() {
if (this.timeRemaining <= 0) {
if (player.hasPermission("liteflags.authentication.success")) {
AuthTimer.endTask(player);
} else {
player.sendMessage(Utilities.format(LiteFlags.getInstance().getConfig().getString("Messages.Authenticate").replace("%code%", (CharSequence)MapCache.reauthedPlayers.get(player.getUniqueId().toString()))));
Bukkit.getServer().dispatchCommand(Bukkit.getConsoleSender(), LiteFlags.getInstance().getConfig().getString("Authenticate_Timer_Command").replace("%player%", player.getName()).replace("%code%", (CharSequence)MapCache.reauthedPlayers.get(player.getUniqueId().toString())));
this.timeRemaining = LiteFlags.getInstance().getConfig().getInt("Authenticate_Timer");
}
} else if (player.hasPermission("liteflags.authentication.success")) {
AuthTimer.endTask(player);
} else {
--this.timeRemaining;
} }
}, 0L, 20L);
Bukkit.getServer().dispatchCommand(Bukkit.getConsoleSender(), LiteFlags.getInstance().getConfig().getString("Authenticate_Timer_Command").replace("%player%", player.getName()).replace("%code%", (CharSequence) MapCache.reauthedPlayers.get(player.getUniqueId().toString())));
taskID.put(player.getUniqueId(), tid);
}
} public static void endTask(Player player) {
}, 0L, 20L); if (taskID.containsKey(player.getUniqueId())) {
Bukkit.getServer().dispatchCommand(Bukkit.getConsoleSender(), LiteFlags.getInstance().getConfig().getString("Authenticate_Timer_Command").replace("%player%", player.getName()).replace("%code%", (CharSequence)MapCache.reauthedPlayers.get(player.getUniqueId().toString()))); int tid = taskID.get(player.getUniqueId());
taskID.put(player.getUniqueId(), tid); LiteFlags.getInstance().getServer().getScheduler().cancelTask(tid);
} taskID.remove(player.getUniqueId());
}
public static void endTask(Player player) { }
if (taskID.containsKey(player.getUniqueId())) {
int tid = taskID.get(player.getUniqueId());
LiteFlags.getInstance().getServer().getScheduler().cancelTask(tid);
taskID.remove(player.getUniqueId());
}
}
} }

38
src/main/java/com/liteflags/auth/Authentication.java
View File

@ -3,32 +3,34 @@ package com.liteflags.auth;
import com.liteflags.LiteFlags; import com.liteflags.LiteFlags;
import com.liteflags.data.maps.MapCache; import com.liteflags.data.maps.MapCache;
import com.liteflags.util.Utilities; import com.liteflags.util.Utilities;
import java.util.Random; import java.util.Random;
import java.util.UUID; import java.util.UUID;
import org.bukkit.Bukkit; import org.bukkit.Bukkit;
import org.bukkit.entity.Player; import org.bukkit.entity.Player;
public class Authentication { public class Authentication {
public static String getAuthKey() { public static String getAuthKey() {
String randChars = "ABCDEFGHIJKLMNPQRSTUVWXYZ123456789abcdefghijklmnopqrstuvwsyz"; String randChars = "ABCDEFGHIJKLMNPQRSTUVWXYZ123456789abcdefghijklmnopqrstuvwsyz";
StringBuilder salt = new StringBuilder(); StringBuilder salt = new StringBuilder();
Random rnd = new Random(); Random rnd = new Random();
while(salt.length() < 6) { while (salt.length() < 6) {
int index = (int)(rnd.nextFloat() * (float)randChars.length()); int index = (int) (rnd.nextFloat() * (float) randChars.length());
salt.append(randChars.charAt(index)); salt.append(randChars.charAt(index));
} }
return "." + salt.toString(); return "." + salt.toString();
} }
public static void checkAuthStatus(UUID uuid) { public static void checkAuthStatus(UUID uuid) {
Player player = Bukkit.getPlayer(uuid); Player player = Bukkit.getPlayer(uuid);
if (!player.hasPermission("liteflags.authentication.success")) { if (!player.hasPermission("liteflags.authentication.success")) {
MapCache.reauthedPlayers.put(player.getUniqueId().toString(), getAuthKey()); MapCache.reauthedPlayers.put(player.getUniqueId().toString(), getAuthKey());
AuthTimer.startTimer(player); AuthTimer.startTimer(player);
player.sendMessage(Utilities.format(LiteFlags.getInstance().getConfig().getString("Messages.Authenticate").replace("%code%", (CharSequence)MapCache.reauthedPlayers.get(player.getUniqueId().toString())))); player.sendMessage(Utilities.format(LiteFlags.getInstance().getConfig().getString("Messages.Authenticate").replace("%code%", (CharSequence) MapCache.reauthedPlayers.get(player.getUniqueId().toString()))));
} }
} }
} }

4
src/main/java/com/liteflags/commands/AuthCMD.java
View File

@ -1,4 +0,0 @@
package com.liteflags.commands;
public class AuthCMD {
}

464
src/main/java/com/liteflags/commands/FlagCMD.java
View File

@ -5,12 +5,14 @@ import com.liteflags.data.database.Database;
import com.liteflags.data.database.Methods; import com.liteflags.data.database.Methods;
import com.liteflags.data.maps.MapCache; import com.liteflags.data.maps.MapCache;
import com.liteflags.util.Utilities; import com.liteflags.util.Utilities;
import java.sql.ResultSet; import java.sql.ResultSet;
import java.sql.SQLException; import java.sql.SQLException;
import java.util.Arrays; import java.util.Arrays;
import java.util.Iterator; import java.util.Iterator;
import java.util.List; import java.util.List;
import java.util.concurrent.TimeUnit; import java.util.concurrent.TimeUnit;
import net.md_5.bungee.api.chat.ClickEvent; import net.md_5.bungee.api.chat.ClickEvent;
import net.md_5.bungee.api.chat.ComponentBuilder; import net.md_5.bungee.api.chat.ComponentBuilder;
import net.md_5.bungee.api.chat.HoverEvent; import net.md_5.bungee.api.chat.HoverEvent;
@ -25,259 +27,257 @@ import org.bukkit.command.CommandSender;
import org.bukkit.entity.Player; import org.bukkit.entity.Player;
public class FlagCMD implements CommandExecutor { public class FlagCMD implements CommandExecutor {
private LiteFlags flags; private LiteFlags flags;
public FlagCMD(LiteFlags flags) { public FlagCMD(LiteFlags flags) {
this.flags = flags; this.flags = flags;
} }
public boolean onCommand(CommandSender sender, Command cmd, String label, String[] args) { public boolean onCommand(CommandSender sender, Command cmd, String label, String[] args) {
OfflinePlayer target; OfflinePlayer target;
String removeTimeLetter; String removeTimeLetter;
if (cmd.getName().equalsIgnoreCase("flag") && sender instanceof Player) { if (cmd.getName().equalsIgnoreCase("flag") && sender instanceof Player) {
if (sender.hasPermission("liteflags.staff")) { if (sender.hasPermission("liteflags.staff")) {
if (args.length == 0) { if (args.length == 0) {
sender.sendMessage(ChatColor.RED + "Invalid command. /flag help"); sender.sendMessage(ChatColor.RED + "Invalid command. /flag help");
} }
if (args.length == 1 && args[0].equalsIgnoreCase("help")) { if (args.length == 1 && args[0].equalsIgnoreCase("help")) {
sender.sendMessage(ChatColor.YELLOW + "/flaglist | /fl " + ChatColor.GRAY + "- Shows all the players with active flags"); sender.sendMessage(ChatColor.YELLOW + "/flaglist | /fl " + ChatColor.GRAY + "- Shows all the players with active flags");
sender.sendMessage(ChatColor.YELLOW + "/flaglist | /fl <player> " + ChatColor.GRAY + "- Shows all flags a player has"); sender.sendMessage(ChatColor.YELLOW + "/flaglist | /fl <player> " + ChatColor.GRAY + "- Shows all flags a player has");
sender.sendMessage(ChatColor.YELLOW + "/flag <player> <time> <reason> " + ChatColor.GRAY + "- This will flag a player for a given reason. Ex: /flag BobTheBuilder 7d Possible hacked client."); sender.sendMessage(ChatColor.YELLOW + "/flag <player> <time> <reason> " + ChatColor.GRAY + "- This will flag a player for a given reason. Ex: /flag BobTheBuilder 7d Possible hacked client.");
} }
if (args.length >= 2) { if (args.length >= 2) {
if (args[0].equalsIgnoreCase("remove")) { if (args[0].equalsIgnoreCase("remove")) {
if (sender.hasPermission("liteflags.removeflags")) { if (sender.hasPermission("liteflags.removeflags")) {
target = Bukkit.getServer().getOfflinePlayer(args[2]); target = Bukkit.getServer().getOfflinePlayer(args[2]);
int id = Integer.parseInt(args[1]); int id = Integer.parseInt(args[1]);
if (args.length == 4) { if (args.length == 4) {
if (!args[3].isEmpty() && args[3].equalsIgnoreCase("-c") && Database.hasFlags(target.getUniqueId())) { if (!args[3].isEmpty() && args[3].equalsIgnoreCase("-c") && Database.hasFlags(target.getUniqueId())) {
sender.sendMessage(ChatColor.GRAY + "You have successfully removed the flag '" + Database.getFlagReason(target.getUniqueId(), id) + "' from " + ChatColor.YELLOW + target.getName() + "'s" + ChatColor.GRAY + " flag history."); sender.sendMessage(ChatColor.GRAY + "You have successfully removed the flag '" + Database.getFlagReason(target.getUniqueId(), id) + "' from " + ChatColor.YELLOW + target.getName() + "'s" + ChatColor.GRAY + " flag history.");
LiteFlags.getInstance().getLogger().info(sender.getName() + " has removed the flag '" + Database.getFlagReason(target.getUniqueId(), id) + "' from " + target.getName() + "'s flag history."); LiteFlags.getInstance().getLogger().info(sender.getName() + " has removed the flag '" + Database.getFlagReason(target.getUniqueId(), id) + "' from " + target.getName() + "'s flag history.");
Database.removeFlag(target.getUniqueId(), id); Database.removeFlag(target.getUniqueId(), id);
}
} else if (args.length == 3) {
Utilities.sendFlagConfirmMessage(sender, target, id, Database.getFlagReason(target.getUniqueId(), id));
}
} else {
sender.sendMessage(Utilities.format(LiteFlags.getInstance().getConfig().getString("Messages.NoPermission")));
} }
} else if (args.length == 3) { } else {
Utilities.sendFlagConfirmMessage(sender, target, id, Database.getFlagReason(target.getUniqueId(), id)); target = Bukkit.getServer().getOfflinePlayer(args[0]);
} if (Methods.getTotalActiveFlags(target) < LiteFlags.getInstance().getConfig().getInt("ActiveFlags.Limit")) {
} else { if (target != null) {
sender.sendMessage(Utilities.format(LiteFlags.getInstance().getConfig().getString("Messages.NoPermission"))); if (!args[1].equals("*")) {
} removeTimeLetter = removeLastChar(args[1]);
} else { if (!removeTimeLetter.isEmpty()) {
target = Bukkit.getServer().getOfflinePlayer(args[0]); if (this.isInt(removeTimeLetter)) {
if (Methods.getTotalActiveFlags(target) < LiteFlags.getInstance().getConfig().getInt("ActiveFlags.Limit")) { String getLetter = getLastChar(args[1]);
if (target != null) { String[] validTimes = new String[]{"d", "h", "m"};
if (!args[1].equals("*")) { if (Arrays.asList(validTimes).contains(getLetter)) {
removeTimeLetter = removeLastChar(args[1]); int number = Integer.parseInt(removeTimeLetter);
if (!removeTimeLetter.isEmpty()) { int timeInMin = this.convertTimeToMinutes(number, getLetter);
if (this.isInt(removeTimeLetter)) { long currentTime = TimeUnit.MILLISECONDS.toMinutes(System.currentTimeMillis());
String getLetter = getLastChar(args[1]); int conTime = (int) currentTime + timeInMin;
String[] validTimes = new String[]{"d", "h", "m"}; StringBuilder reason = new StringBuilder();
if (Arrays.asList(validTimes).contains(getLetter)) {
int number = Integer.parseInt(removeTimeLetter); for (int i = 2; i < args.length; ++i) {
int timeInMin = this.convertTimeToMinutes(number, getLetter); if (i > 2) {
long currentTime = TimeUnit.MILLISECONDS.toMinutes(System.currentTimeMillis()); reason.append(" ");
int conTime = (int)currentTime + timeInMin; }
reason.append(args[i]);
}
Database.addFlag(target.getUniqueId(), (long) ((int) TimeUnit.MINUTES.toSeconds((long) conTime)), reason.toString(), sender.getName(), Utilities.convertTime(timeInMin));
if (target.isOnline() && !MapCache.activeFlags.contains(target.getName())) {
MapCache.activeFlags.add(target.getName());
}
Iterator var25 = Bukkit.getOnlinePlayers().iterator();
while (var25.hasNext()) {
Player staff = (Player) var25.next();
if (staff.hasPermission("liteflags.alertflags")) {
staff.sendMessage(Utilities.format(LiteFlags.getInstance().getConfig().getString("Messages.FlaggedPlayer").replace("%staff%", sender.getName()).replace("%player%", target.getName()).replace("%flaglength%", Utilities.convertTime(timeInMin)).replace("%reason%", reason.toString())));
}
}
} else {
sender.sendMessage(ChatColor.RED + getLetter + " is not a valid letter. (d, h, m)");
}
} else {
sender.sendMessage(ChatColor.RED + removeTimeLetter + " is not a valid number.");
}
} else {
sender.sendMessage(ChatColor.RED + "Invalid time argument! Example: 1d");
}
} else if (sender.hasPermission("liteflags.flagperm")) {
StringBuilder reason = new StringBuilder(); StringBuilder reason = new StringBuilder();
for(int i = 2; i < args.length; ++i) { for (int i = 2; i < args.length; ++i) {
if (i > 2) { if (i > 2) {
reason.append(" "); reason.append(" ");
} }
reason.append(args[i]); reason.append(args[i]);
} }
Database.addFlag(target.getUniqueId(), (long)((int)TimeUnit.MINUTES.toSeconds((long)conTime)), reason.toString(), sender.getName(), Utilities.convertTime(timeInMin)); Database.addFlag(target.getUniqueId(), 0L, reason.toString(), sender.getName(), "Permanent");
if (target.isOnline() && !MapCache.activeFlags.contains(target.getName())) { if (!MapCache.activeFlags.contains(target.getName())) {
MapCache.activeFlags.add(target.getName()); MapCache.activeFlags.add(target.getName());
} }
Iterator var25 = Bukkit.getOnlinePlayers().iterator(); Iterator var21 = Bukkit.getOnlinePlayers().iterator();
while(var25.hasNext()) { while (var21.hasNext()) {
Player staff = (Player)var25.next(); Player staff = (Player) var21.next();
if (staff.hasPermission("liteflags.alertflags")) { if (staff.hasPermission("liteflags.alertflags")) {
staff.sendMessage(Utilities.format(LiteFlags.getInstance().getConfig().getString("Messages.FlaggedPlayer").replace("%staff%", sender.getName()).replace("%player%", target.getName()).replace("%flaglength%", Utilities.convertTime(timeInMin)).replace("%reason%", reason.toString()))); staff.sendMessage(Utilities.format(LiteFlags.getInstance().getConfig().getString("Messages.FlaggedPlayer").replace("%staff%", sender.getName()).replace("%player%", target.getName()).replace("%flaglength%", "Permanent").replace("%reason%", reason.toString())));
} }
} }
} else { } else {
sender.sendMessage(ChatColor.RED + getLetter + " is not a valid letter. (d, h, m)"); sender.sendMessage(ChatColor.RED + "You do not have permission to flag permanently.");
} }
} else { } else {
sender.sendMessage(ChatColor.RED + removeTimeLetter + " is not a valid number."); sender.sendMessage(target.getName() + " is not a valid username!");
} }
} else {
sender.sendMessage(ChatColor.RED + "Invalid time argument! Example: 1d");
}
} else if (sender.hasPermission("liteflags.flagperm")) {
StringBuilder reason = new StringBuilder();
for(int i = 2; i < args.length; ++i) {
if (i > 2) {
reason.append(" ");
}
reason.append(args[i]);
}
Database.addFlag(target.getUniqueId(), 0L, reason.toString(), sender.getName(), "Permanent");
if (!MapCache.activeFlags.contains(target.getName())) {
MapCache.activeFlags.add(target.getName());
}
Iterator var21 = Bukkit.getOnlinePlayers().iterator();
while(var21.hasNext()) {
Player staff = (Player)var21.next();
if (staff.hasPermission("liteflags.alertflags")) {
staff.sendMessage(Utilities.format(LiteFlags.getInstance().getConfig().getString("Messages.FlaggedPlayer").replace("%staff%", sender.getName()).replace("%player%", target.getName()).replace("%flaglength%", "Permanent").replace("%reason%", reason.toString())));
}
}
} else { } else {
sender.sendMessage(ChatColor.RED + "You do not have permission to flag permanently."); sender.sendMessage(Utilities.format(LiteFlags.getInstance().getConfig().getString("Messages.ActiveFlagsLimit").replace("%player%", target.getName())));
} }
} else { }
sender.sendMessage(target.getName() + " is not a valid username!"); }
} } else {
} else { sender.sendMessage(Utilities.format(LiteFlags.getInstance().getConfig().getString("Messages.NoPermission")));
sender.sendMessage(Utilities.format(LiteFlags.getInstance().getConfig().getString("Messages.ActiveFlagsLimit").replace("%player%", target.getName())));
}
}
} }
} else { } else if (cmd.getName().equalsIgnoreCase("flaglist")) {
sender.sendMessage(Utilities.format(LiteFlags.getInstance().getConfig().getString("Messages.NoPermission"))); if (sender.hasPermission("liteflags.staff")) {
} if (args.length == 0) {
} if (MapCache.activeFlags.size() > 0) {
Iterator var17 = MapCache.activeFlags.iterator();
if (cmd.getName().equalsIgnoreCase("flaglist")) { while (var17.hasNext()) {
if (sender.hasPermission("liteflags.staff")) { removeTimeLetter = (String) var17.next();
if (args.length == 0) { OfflinePlayer afPlayer = Bukkit.getServer().getOfflinePlayer(removeTimeLetter);
if (MapCache.activeFlags.size() > 0) { int totalFlags = Methods.getTotalActiveFlags(afPlayer);
Iterator var17 = MapCache.activeFlags.iterator(); Utilities.sendStaffHoverMessage(afPlayer, (Player) sender, Utilities.format(LiteFlags.getInstance().getConfig().getString("Messages.AlertActiveFlags").replace("%player%", afPlayer.getName()).replace("%totalactflags%", "" + totalFlags).replace("%consoleFlags%", "" + Methods.consoleFlags).replace("%staffFlags%", "" + Methods.staffFlags)));
}
} else {
sender.sendMessage(ChatColor.GRAY + "No players have active flags.");
}
}
while(var17.hasNext()) { if (args.length >= 1) {
removeTimeLetter = (String)var17.next(); target = Bukkit.getServer().getOfflinePlayer(args[0]);
OfflinePlayer afPlayer = Bukkit.getServer().getOfflinePlayer(removeTimeLetter); this.sendFlagMessage(sender, target);
int totalFlags = Methods.getTotalActiveFlags(afPlayer); }
Utilities.sendStaffHoverMessage(afPlayer, (Player)sender, Utilities.format(LiteFlags.getInstance().getConfig().getString("Messages.AlertActiveFlags").replace("%player%", afPlayer.getName()).replace("%totalactflags%", "" + totalFlags).replace("%consoleFlags%", "" + Methods.consoleFlags).replace("%staffFlags%", "" + Methods.staffFlags))); } else {
} sender.sendMessage(Utilities.format(LiteFlags.getInstance().getConfig().getString("Messages.NoPermission")));
} else {
sender.sendMessage(ChatColor.GRAY + "No players have active flags.");
}
} }
}
if (args.length >= 1) { return false;
target = Bukkit.getServer().getOfflinePlayer(args[0]); }
this.sendFlagMessage(sender, target);
private static String getLastChar(String str) {
return str.substring(str.length() - 1);
}
private static String removeLastChar(String str) {
return str.substring(0, str.length() - 1);
}
public int convertTimeToMinutes(int number, String dhm) {
if (dhm.equalsIgnoreCase("d")) {
return 1440 * number;
} else {
return dhm.equalsIgnoreCase("h") ? 60 * number : number;
}
}
public boolean isInt(String s) {
try {
Integer.parseInt(s);
return true;
} catch (NumberFormatException var3) {
return false;
}
}
public void sendFlagMessage(CommandSender sender, OfflinePlayer targetPlayer) {
List<String> body = LiteFlags.getInstance().getConfig().getStringList("Messages.PlayerFlagsBody");
int i = 0;
//int id = false;
boolean headerMessage = false;
if (Database.hasFlags(targetPlayer.getUniqueId())) {
try {
ResultSet flag = Database.getPlayerFlags(targetPlayer.getUniqueId());
label52:
while (flag.next()) {
long expireTime = TimeUnit.SECONDS.toMinutes((long) flag.getInt("expire_time"));
long timeFlagged = TimeUnit.SECONDS.toMinutes((long) flag.getInt("time_flagged"));
long currentTime = TimeUnit.SECONDS.toMinutes(System.currentTimeMillis() / 1000L);
int convertedExpireTime = (int) expireTime - (int) currentTime;
int convertedFlaggedTime = (int) currentTime - (int) timeFlagged;
String flaggedBy = flag.getString("flagged_by");
String flagLength = flag.getString("flag_length");
String reason = flag.getString("reason");
int id = flag.getInt("id");
TextComponent mainComponent = null;
Iterator var20 = body.iterator();
while (true) {
while (true) {
if (!var20.hasNext()) {
continue label52;
}
String s = (String) var20.next();
s = s.replaceFirst("%player%", targetPlayer.getName());
s = s.replaceFirst("%staff%", flaggedBy);
s = s.replaceFirst("%flaglength%", flagLength);
s = s.replaceFirst("%reason%", reason);
s = s.replaceFirst("%flagtime%", Utilities.convertTime(convertedFlaggedTime));
if (expireTime != 0L) {
s = s.replaceFirst("%expiretime%", Utilities.convertTime(convertedExpireTime));
}
s = s.replaceFirst("%limit%", "" + Database.countFlags(targetPlayer.getUniqueId()));
s = s.replaceFirst("%nl%", " ");
if (convertedExpireTime < 0 && expireTime != 0L) {
s = s.replaceFirst("%active%", LiteFlags.getInstance().getConfig().getString("Messages.ExpiredFlags"));
mainComponent = new TextComponent(Utilities.format(s));
} else {
s = s.replaceFirst("%active%", LiteFlags.getInstance().getConfig().getString("Messages.ActiveFlags"));
mainComponent = new TextComponent(Utilities.format(s));
}
if (!headerMessage) {
headerMessage = true;
sender.sendMessage(Utilities.format(LiteFlags.getInstance().getConfig().getString("Messages.PlayerFlagsHeader").replace("%limit%", "" + Database.countFlags(targetPlayer.getUniqueId()))));
}
if (!s.contains(LiteFlags.getInstance().getConfig().getString("Messages.ActiveFlags")) && !s.contains(LiteFlags.getInstance().getConfig().getString("Messages.ExpiredFlags"))) {
sender.sendMessage(Utilities.format(s));
} else {
mainComponent.setColor(net.md_5.bungee.api.ChatColor.GOLD);
TextComponent removeButton = new TextComponent("[✖]");
removeButton.setColor(net.md_5.bungee.api.ChatColor.GRAY);
removeButton.setHoverEvent(new HoverEvent(Action.SHOW_TEXT, (new ComponentBuilder(net.md_5.bungee.api.ChatColor.GRAY + "Click to remove this flag")).create()));
removeButton.setClickEvent(new ClickEvent(net.md_5.bungee.api.chat.ClickEvent.Action.RUN_COMMAND, "/flag remove " + id + " " + targetPlayer.getName()));
mainComponent.addExtra(removeButton);
sender.spigot().sendMessage(mainComponent);
}
}
}
}
} catch (SQLException var23) {
var23.printStackTrace();
} }
} else { } else {
sender.sendMessage(Utilities.format(LiteFlags.getInstance().getConfig().getString("Messages.NoPermission"))); sender.sendMessage(Utilities.format(LiteFlags.getInstance().getConfig().getString("Messages.PlayerFlagsHeader").replace("%limit%", "" + i)));
} }
}
return false; }
}
private static String getLastChar(String str) {
return str.substring(str.length() - 1);
}
private static String removeLastChar(String str) {
return str.substring(0, str.length() - 1);
}
public int convertTimeToMinutes(int number, String dhm) {
if (dhm.equalsIgnoreCase("d")) {
return 1440 * number;
} else {
return dhm.equalsIgnoreCase("h") ? 60 * number : number;
}
}
public boolean isInt(String s) {
try {
Integer.parseInt(s);
return true;
} catch (NumberFormatException var3) {
return false;
}
}
public void sendFlagMessage(CommandSender sender, OfflinePlayer targetPlayer) {
List<String> body = LiteFlags.getInstance().getConfig().getStringList("Messages.PlayerFlagsBody");
int i = 0;
//int id = false;
boolean headerMessage = false;
if (Database.hasFlags(targetPlayer.getUniqueId())) {
try {
ResultSet flag = Database.getPlayerFlags(targetPlayer.getUniqueId());
label52:
while(flag.next()) {
long expireTime = TimeUnit.SECONDS.toMinutes((long)flag.getInt("expire_time"));
long timeFlagged = TimeUnit.SECONDS.toMinutes((long)flag.getInt("time_flagged"));
long currentTime = TimeUnit.SECONDS.toMinutes(System.currentTimeMillis() / 1000L);
int convertedExpireTime = (int)expireTime - (int)currentTime;
int convertedFlaggedTime = (int)currentTime - (int)timeFlagged;
String flaggedBy = flag.getString("flagged_by");
String flagLength = flag.getString("flag_length");
String reason = flag.getString("reason");
int id = flag.getInt("id");
TextComponent mainComponent = null;
Iterator var20 = body.iterator();
while(true) {
while(true) {
if (!var20.hasNext()) {
continue label52;
}
String s = (String)var20.next();
s = s.replaceFirst("%player%", targetPlayer.getName());
s = s.replaceFirst("%staff%", flaggedBy);
s = s.replaceFirst("%flaglength%", flagLength);
s = s.replaceFirst("%reason%", reason);
s = s.replaceFirst("%flagtime%", Utilities.convertTime(convertedFlaggedTime));
if (expireTime != 0L) {
s = s.replaceFirst("%expiretime%", Utilities.convertTime(convertedExpireTime));
}
s = s.replaceFirst("%limit%", "" + Database.countFlags(targetPlayer.getUniqueId()));
s = s.replaceFirst("%nl%", " ");
if (convertedExpireTime < 0 && expireTime != 0L) {
s = s.replaceFirst("%active%", LiteFlags.getInstance().getConfig().getString("Messages.ExpiredFlags"));
mainComponent = new TextComponent(Utilities.format(s));
} else {
s = s.replaceFirst("%active%", LiteFlags.getInstance().getConfig().getString("Messages.ActiveFlags"));
mainComponent = new TextComponent(Utilities.format(s));
}
if (!headerMessage) {
headerMessage = true;
sender.sendMessage(Utilities.format(LiteFlags.getInstance().getConfig().getString("Messages.PlayerFlagsHeader").replace("%limit%", "" + Database.countFlags(targetPlayer.getUniqueId()))));
}
if (!s.contains(LiteFlags.getInstance().getConfig().getString("Messages.ActiveFlags")) && !s.contains(LiteFlags.getInstance().getConfig().getString("Messages.ExpiredFlags"))) {
sender.sendMessage(Utilities.format(s));
} else {
mainComponent.setColor(net.md_5.bungee.api.ChatColor.GOLD);
TextComponent removeButton = new TextComponent("[✖]");
removeButton.setColor(net.md_5.bungee.api.ChatColor.GRAY);
removeButton.setHoverEvent(new HoverEvent(Action.SHOW_TEXT, (new ComponentBuilder(net.md_5.bungee.api.ChatColor.GRAY + "Click to remove this flag")).create()));
removeButton.setClickEvent(new ClickEvent(net.md_5.bungee.api.chat.ClickEvent.Action.RUN_COMMAND, "/flag remove " + id + " " + targetPlayer.getName()));
mainComponent.addExtra(removeButton);
sender.spigot().sendMessage(mainComponent);
}
}
}
}
} catch (SQLException var23) {
var23.printStackTrace();
}
} else {
sender.sendMessage(Utilities.format(LiteFlags.getInstance().getConfig().getString("Messages.PlayerFlagsHeader").replace("%limit%", "" + i)));
}
}
} }

4
src/main/java/com/liteflags/data/Data.java
View File

@ -1,4 +0,0 @@
package com.liteflags.data;
public class Data {
}

379
src/main/java/com/liteflags/data/database/Database.java
View File

@ -1,6 +1,7 @@
package com.liteflags.data.database; package com.liteflags.data.database;
import com.liteflags.LiteFlags; import com.liteflags.LiteFlags;
import java.sql.PreparedStatement; import java.sql.PreparedStatement;
import java.sql.ResultSet; import java.sql.ResultSet;
import java.sql.SQLException; import java.sql.SQLException;
@ -8,226 +9,226 @@ import java.sql.Statement;
import java.util.UUID; import java.util.UUID;
public class Database { public class Database {
public static void createTables() { public static void createTables() {
String player_flags = "CREATE TABLE IF NOT EXISTS player_flags (\n id INTEGER NOT NULL AUTO_INCREMENT,\n uuid VARCHAR(36) NOT NULL,\n expire_time INTEGER(12),\n reason VARCHAR(256) NOT NULL,\n flagged_by VARCHAR(16) NOT NULL,\n time_flagged INTEGER(16) NOT NULL,\n flag_length VARCHAR(36) NOT NULL,\n PRIMARY KEY(ID)\n);"; String player_flags = "CREATE TABLE IF NOT EXISTS player_flags (\n id INTEGER NOT NULL AUTO_INCREMENT,\n uuid VARCHAR(36) NOT NULL,\n expire_time INTEGER(12),\n reason VARCHAR(256) NOT NULL,\n flagged_by VARCHAR(16) NOT NULL,\n time_flagged INTEGER(16) NOT NULL,\n flag_length VARCHAR(36) NOT NULL,\n PRIMARY KEY(ID)\n);";
String player_cache = "CREATE TABLE IF NOT EXISTS player_cache (\n uuid VARCHAR(36) NOT NULL,\n player_name VARCHAR(16),\n PRIMARY KEY(uuid)\n);"; String player_cache = "CREATE TABLE IF NOT EXISTS player_cache (\n uuid VARCHAR(36) NOT NULL,\n player_name VARCHAR(16),\n PRIMARY KEY(uuid)\n);";
try { try {
Statement statement = DatabaseConnection.getConnection().createStatement(); Statement statement = DatabaseConnection.getConnection().createStatement();
statement.execute(player_flags); statement.execute(player_flags);
statement.execute(player_cache); statement.execute(player_cache);
} catch (SQLException var3) { } catch (SQLException var3) {
var3.printStackTrace(); var3.printStackTrace();
} }
} }
public static void addFlag(UUID uuid, long expireTime, String reason, String flaggedBy, String flagLength) { public static void addFlag(UUID uuid, long expireTime, String reason, String flaggedBy, String flagLength) {
int timeFlagged = (int)(System.currentTimeMillis() / 1000L); int timeFlagged = (int) (System.currentTimeMillis() / 1000L);
String sql = "INSERT INTO player_flags (uuid, expire_time, reason, flagged_by, time_flagged, flag_length) VALUES (?, ?, ?, ?, ?, ?)"; String sql = "INSERT INTO player_flags (uuid, expire_time, reason, flagged_by, time_flagged, flag_length) VALUES (?, ?, ?, ?, ?, ?)";
try { try {
PreparedStatement statement = DatabaseConnection.getConnection().prepareStatement(sql); PreparedStatement statement = DatabaseConnection.getConnection().prepareStatement(sql);
Throwable var9 = null; Throwable var9 = null;
try {
statement.setString(1, uuid.toString());
statement.setLong(2, expireTime);
statement.setString(3, reason);
statement.setString(4, flaggedBy);
statement.setInt(5, timeFlagged);
statement.setString(6, flagLength);
statement.execute();
} catch (Throwable var19) {
var9 = var19;
throw var19;
} finally {
if (statement != null) {
if (var9 != null) {
try {
statement.close();
} catch (Throwable var18) {
var9.addSuppressed(var18);
}
} else {
statement.close();
}
}
try {
statement.setString(1, uuid.toString());
statement.setLong(2, expireTime);
statement.setString(3, reason);
statement.setString(4, flaggedBy);
statement.setInt(5, timeFlagged);
statement.setString(6, flagLength);
statement.execute();
} catch (Throwable var19) {
var9 = var19;
throw var19;
} finally {
if (statement != null) {
if (var9 != null) {
try {
statement.close();
} catch (Throwable var18) {
var9.addSuppressed(var18);
}
} else {
statement.close();
}
} }
} catch (SQLException var21) {
var21.printStackTrace();
}
} }
} catch (SQLException var21) {
var21.printStackTrace();
}
} public static void removeFlag(UUID uuid, int id) {
String sql = "DELETE FROM player_flags WHERE uuid = ? AND id = ?";
public static void removeFlag(UUID uuid, int id) { try {
String sql = "DELETE FROM player_flags WHERE uuid = ? AND id = ?"; PreparedStatement statement = DatabaseConnection.getConnection().prepareStatement(sql);
Throwable var4 = null;
try { try {
PreparedStatement statement = DatabaseConnection.getConnection().prepareStatement(sql); statement.setString(1, uuid.toString());
Throwable var4 = null; statement.setInt(2, id);
statement.executeUpdate();
} catch (Throwable var14) {
var4 = var14;
throw var14;
} finally {
if (statement != null) {
if (var4 != null) {
try {
statement.close();
} catch (Throwable var13) {
var4.addSuppressed(var13);
}
} else {
statement.close();
}
}
try {
statement.setString(1, uuid.toString());
statement.setInt(2, id);
statement.executeUpdate();
} catch (Throwable var14) {
var4 = var14;
throw var14;
} finally {
if (statement != null) {
if (var4 != null) {
try {
statement.close();
} catch (Throwable var13) {
var4.addSuppressed(var13);
}
} else {
statement.close();
}
} }
} catch (SQLException var16) {
var16.printStackTrace();
}
} }
} catch (SQLException var16) {
var16.printStackTrace();
}
} public static Integer countFlags(UUID uuid) {
int i = 0;
public static Integer countFlags(UUID uuid) { try {
int i = 0; for (ResultSet resultSet = getPlayerFlags(uuid); resultSet.next(); ++i) {
try {
for(ResultSet resultSet = getPlayerFlags(uuid); resultSet.next(); ++i) {
}
} catch (SQLException var3) {
var3.printStackTrace();
}
return i;
}
public static void removePlayerCache(UUID uuid) {
String sql = "DELETE FROM player_cache WHERE uuid = ?";
try {
PreparedStatement statement = DatabaseConnection.getConnection().prepareStatement(sql);
Throwable var3 = null;
try {
statement.setString(1, uuid.toString());
statement.executeUpdate();
} catch (Throwable var13) {
var3 = var13;
throw var13;
} finally {
if (statement != null) {
if (var3 != null) {
try {
statement.close();
} catch (Throwable var12) {
var3.addSuppressed(var12);
}
} else {
statement.close();
}
} }
} catch (SQLException var3) {
var3.printStackTrace();
}
} return i;
} catch (SQLException var15) { }
var15.printStackTrace();
}
} public static void removePlayerCache(UUID uuid) {
String sql = "DELETE FROM player_cache WHERE uuid = ?";
public static boolean hasFlags(UUID u) { try {
try { PreparedStatement statement = DatabaseConnection.getConnection().prepareStatement(sql);
if (getStringResult("SELECT * FROM player_flags WHERE uuid = ?", u.toString()).next()) { Throwable var3 = null;
return true;
}
} catch (SQLException var2) {
var2.printStackTrace();
}
return false; try {
} statement.setString(1, uuid.toString());
statement.executeUpdate();
} catch (Throwable var13) {
var3 = var13;
throw var13;
} finally {
if (statement != null) {
if (var3 != null) {
try {
statement.close();
} catch (Throwable var12) {
var3.addSuppressed(var12);
}
} else {
statement.close();
}
}
public static void addPlayerCache(UUID uuid, String playerName) {
String sql = "INSERT INTO player_cache (uuid, player_name) VALUES (?, ?) ON DUPLICATE KEY UPDATE player_name = ?";
try {
PreparedStatement statement = DatabaseConnection.getConnection().prepareStatement(sql);
Throwable var4 = null;
try {
statement.setString(1, uuid.toString());
statement.setString(2, playerName);
statement.setString(3, playerName);
statement.execute();
} catch (Throwable var14) {
var4 = var14;
throw var14;
} finally {
if (statement != null) {
if (var4 != null) {
try {
statement.close();
} catch (Throwable var13) {
var4.addSuppressed(var13);
}
} else {
statement.close();
}
} }
} catch (SQLException var15) {
var15.printStackTrace();
}
} }
} catch (SQLException var16) {
var16.printStackTrace();
}
} public static boolean hasFlags(UUID u) {
try {
if (getStringResult("SELECT * FROM player_flags WHERE uuid = ?", u.toString()).next()) {
return true;
}
} catch (SQLException var2) {
var2.printStackTrace();
}
public static boolean inPlayerCache(UUID uuid) { return false;
try { }
if (getStringResult("SELECT * FROM player_cache WHERE uuid = ?", uuid.toString()).next()) {
return true;
}
} catch (SQLException var2) {
var2.printStackTrace();
}
return false; public static void addPlayerCache(UUID uuid, String playerName) {
} String sql = "INSERT INTO player_cache (uuid, player_name) VALUES (?, ?) ON DUPLICATE KEY UPDATE player_name = ?";
public static String getFlagReason(UUID uuid, int id) { try {
try { PreparedStatement statement = DatabaseConnection.getConnection().prepareStatement(sql);
ResultSet resultSet = getStringResult("SELECT reason FROM player_flags WHERE uuid = ? AND id = " + id, uuid.toString()); Throwable var4 = null;
if (resultSet.next()) {
return resultSet.getString("reason");
}
} catch (SQLException var3) {
var3.printStackTrace();
}
return null; try {
} statement.setString(1, uuid.toString());
statement.setString(2, playerName);
statement.setString(3, playerName);
statement.execute();
} catch (Throwable var14) {
var4 = var14;
throw var14;
} finally {
if (statement != null) {
if (var4 != null) {
try {
statement.close();
} catch (Throwable var13) {
var4.addSuppressed(var13);
}
} else {
statement.close();
}
}
public static ResultSet getPlayerFlags(UUID uuid) throws SQLException { }
return getStringResult("SELECT * FROM player_flags WHERE uuid = ? ORDER BY id DESC LIMIT " + LiteFlags.getInstance().getConfig().getInt("FlagsHistory.ListLimit"), uuid.toString()); } catch (SQLException var16) {
} var16.printStackTrace();
}
public static ResultSet getActiveTime(UUID uuid) throws SQLException { }
return getStringResult("SELECT expire_time, flagged_by FROM player_flags WHERE uuid = ?", uuid.toString());
}
private static ResultSet getStringResult(String query, String... parameters) throws SQLException { public static boolean inPlayerCache(UUID uuid) {
PreparedStatement statement = DatabaseConnection.getConnection().prepareStatement(query); try {
if (getStringResult("SELECT * FROM player_cache WHERE uuid = ?", uuid.toString()).next()) {
return true;
}
} catch (SQLException var2) {
var2.printStackTrace();
}
for(int i = 1; i < parameters.length + 1; ++i) { return false;
statement.setString(i, parameters[i - 1]); }
}
return statement.executeQuery(); public static String getFlagReason(UUID uuid, int id) {
} try {
ResultSet resultSet = getStringResult("SELECT reason FROM player_flags WHERE uuid = ? AND id = " + id, uuid.toString());
if (resultSet.next()) {
return resultSet.getString("reason");
}
} catch (SQLException var3) {
var3.printStackTrace();
}
return null;
}
public static ResultSet getPlayerFlags(UUID uuid) throws SQLException {
return getStringResult("SELECT * FROM player_flags WHERE uuid = ? ORDER BY id DESC LIMIT " + LiteFlags.getInstance().getConfig().getInt("FlagsHistory.ListLimit"), uuid.toString());
}
public static ResultSet getActiveTime(UUID uuid) throws SQLException {
return getStringResult("SELECT expire_time, flagged_by FROM player_flags WHERE uuid = ?", uuid.toString());
}
private static ResultSet getStringResult(String query, String... parameters) throws SQLException {
PreparedStatement statement = DatabaseConnection.getConnection().prepareStatement(query);
for (int i = 1; i < parameters.length + 1; ++i) {
statement.setString(i, parameters[i - 1]);
}
return statement.executeQuery();
}
} }

65
src/main/java/com/liteflags/data/database/DatabaseConnection.java
View File

@ -1,47 +1,48 @@
package com.liteflags.data.database; package com.liteflags.data.database;
import com.liteflags.LiteFlags; import com.liteflags.LiteFlags;
import java.sql.Connection; import java.sql.Connection;
import java.sql.DriverManager; import java.sql.DriverManager;
import java.sql.SQLException; import java.sql.SQLException;
public class DatabaseConnection { public class DatabaseConnection {
public static DatabaseConnection instance; public static DatabaseConnection instance;
public Connection connection; public Connection connection;
public String drivers = LiteFlags.getInstance().getConfig().getString("Database.Drivers"); public String drivers = LiteFlags.getInstance().getConfig().getString("Database.Drivers");
public String ip = LiteFlags.getInstance().getConfig().getString("Database.IP"); public String ip = LiteFlags.getInstance().getConfig().getString("Database.IP");
public String port = LiteFlags.getInstance().getConfig().getString("Database.Port"); public String port = LiteFlags.getInstance().getConfig().getString("Database.Port");
public String database = LiteFlags.getInstance().getConfig().getString("Database.Database"); public String database = LiteFlags.getInstance().getConfig().getString("Database.Database");
public String username = LiteFlags.getInstance().getConfig().getString("Database.Username"); public String username = LiteFlags.getInstance().getConfig().getString("Database.Username");
public String password = LiteFlags.getInstance().getConfig().getString("Database.Password"); public String password = LiteFlags.getInstance().getConfig().getString("Database.Password");
public DatabaseConnection() throws SQLException { public DatabaseConnection() throws SQLException {
instance = this; instance = this;
instance.openConnection(); instance.openConnection();
Database.createTables(); Database.createTables();
} }
public void openConnection() throws SQLException { public void openConnection() throws SQLException {
if (this.connection == null || this.connection.isClosed()) { if (this.connection == null || this.connection.isClosed()) {
synchronized(this) { synchronized (this) {
if (this.connection == null || this.connection.isClosed()) { if (this.connection == null || this.connection.isClosed()) {
this.connection = DriverManager.getConnection("jdbc:" + this.drivers + "://" + this.ip + ":" + this.port + "/" + this.database, this.username, this.password); this.connection = DriverManager.getConnection("jdbc:" + this.drivers + "://" + this.ip + ":" + this.port + "/" + this.database, this.username, this.password);
}
} }
} }
} }
}
public static Connection getConnection() { public static Connection getConnection() {
try { try {
instance.openConnection(); instance.openConnection();
} catch (SQLException var1) { } catch (SQLException var1) {
var1.printStackTrace(); var1.printStackTrace();
} }
return instance.connection; return instance.connection;
} }
public static void initialize() throws SQLException { public static void initialize() throws SQLException {
instance = new DatabaseConnection(); instance = new DatabaseConnection();
} }
} }

165
src/main/java/com/liteflags/data/database/Methods.java
View File

@ -2,111 +2,100 @@ package com.liteflags.data.database;
import com.liteflags.LiteFlags; import com.liteflags.LiteFlags;
import com.liteflags.util.Utilities; import com.liteflags.util.Utilities;
import java.sql.ResultSet; import java.sql.ResultSet;
import java.sql.SQLException; import java.sql.SQLException;
import java.util.concurrent.TimeUnit; import java.util.concurrent.TimeUnit;
import org.bukkit.OfflinePlayer; import org.bukkit.OfflinePlayer;
public class Methods { public class Methods {
public static int consoleFlags; public static int consoleFlags;
public static int staffFlags; public static int staffFlags;
public static String flagListLimit = LiteFlags.getInstance().getConfig().getString("ActiveFlags.Limit"); public static String flagListLimit = LiteFlags.getInstance().getConfig().getString("ActiveFlags.Limit");
public static String playerFlagsHeader; public static String playerFlagsHeader;
public static boolean hasActiveFlags(OfflinePlayer player) { public static boolean hasActiveFlags(OfflinePlayer player) {
try { try {
ResultSet flag = Database.getActiveTime(player.getUniqueId()); ResultSet flag = Database.getActiveTime(player.getUniqueId());
while(flag.next()) { while (flag.next()) {
long expireTime = TimeUnit.SECONDS.toMinutes((long)flag.getInt("expire_time")); long expireTime = TimeUnit.SECONDS.toMinutes((long) flag.getInt("expire_time"));
long currentTime = TimeUnit.SECONDS.toMinutes(System.currentTimeMillis() / 1000L); long currentTime = TimeUnit.SECONDS.toMinutes(System.currentTimeMillis() / 1000L);
int convertedExpireTime = (int)expireTime - (int)currentTime; int convertedExpireTime = (int) expireTime - (int) currentTime;
if (convertedExpireTime >= 0) {
return true; if (convertedExpireTime >= 0 || expireTime == 0L) {
return true;
}
} }
} catch (SQLException var7) {
var7.printStackTrace();
}
if (expireTime == 0L) { return false;
return true; }
public static int getTotalActiveFlags(OfflinePlayer player) {
consoleFlags = 0;
staffFlags = 0;
int i = 0;
try {
ResultSet flag = Database.getActiveTime(player.getUniqueId());
while (flag.next()) {
long expireTime = TimeUnit.SECONDS.toMinutes((long) flag.getInt("expire_time"));
long currentTime = TimeUnit.SECONDS.toMinutes(System.currentTimeMillis() / 1000L);
int convertedExpireTime = (int) expireTime - (int) currentTime;
if (convertedExpireTime >= 0 || expireTime == 0L) {
++i;
if (flag.getString("flagged_by").equalsIgnoreCase("console")) {
++consoleFlags;
} else {
++staffFlags;
}
}
} }
} } catch (SQLException var9) {
} catch (SQLException var7) { var9.printStackTrace();
var7.printStackTrace(); }
}
return false; return i;
} }
public static int getTotalActiveFlags(OfflinePlayer player) { public static int getActiveConsoleFlags(OfflinePlayer player) {
consoleFlags = 0; int i = 0;
staffFlags = 0;
int i = 0;
try { try {
ResultSet flag = Database.getActiveTime(player.getUniqueId()); ResultSet flag = Database.getActiveTime(player.getUniqueId());
while(flag.next()) { while (flag.next()) {
long expireTime = TimeUnit.SECONDS.toMinutes((long)flag.getInt("expire_time")); long expireTime = TimeUnit.SECONDS.toMinutes((long) flag.getInt("expire_time"));
long currentTime = TimeUnit.SECONDS.toMinutes(System.currentTimeMillis() / 1000L); long currentTime = TimeUnit.SECONDS.toMinutes(System.currentTimeMillis() / 1000L);
int convertedExpireTime = (int)expireTime - (int)currentTime; int convertedExpireTime = (int) expireTime - (int) currentTime;
String s;
if (convertedExpireTime >= 0) { if (convertedExpireTime >= 0) {
++i; String s = flag.getString("flagged_by");
s = flag.getString("flagged_by"); if (s.equalsIgnoreCase("console")) {
if (s.equalsIgnoreCase("console")) { ++i;
++consoleFlags; }
} else { }
++staffFlags;
}
} else if (expireTime == 0L) {
++i;
s = flag.getString("flagged_by");
if (s.equalsIgnoreCase("console")) {
++consoleFlags;
} else {
++staffFlags;
}
} }
} } catch (SQLException e) {
} catch (SQLException var9) { e.printStackTrace();
var9.printStackTrace(); }
}
return i; return i;
} }
public static int getActiveConsoleFlags(OfflinePlayer player) { public static int getRandomIntegerBetweenRange(int min, int max) {
int i = 0; int x = (int) (Math.random() * (double) (max - min + 1)) + min;
return x;
}
try { static {
ResultSet flag = Database.getActiveTime(player.getUniqueId()); playerFlagsHeader = Utilities.format(LiteFlags.getInstance().getConfig().getString("Messages.PlayerFlagsHeader")
.replace("%limit%", flagListLimit));
while(flag.next()) { }
long expireTime = TimeUnit.SECONDS.toMinutes((long)flag.getInt("expire_time"));
long currentTime = TimeUnit.SECONDS.toMinutes(System.currentTimeMillis() / 1000L);
int convertedExpireTime = (int)expireTime - (int)currentTime;
if (convertedExpireTime >= 0) {
String s = flag.getString("flagged_by");
if (s.equalsIgnoreCase("console")) {
++i;
}
}
}
} catch (SQLException var9) {
var9.printStackTrace();
}
return i;
}
public static void getPlayerFlags(OfflinePlayer targetPlayer) {
}
public static int getRandomIntegerBetweenRange(int min, int max) {
int x = (int)(Math.random() * (double)(max - min + 1)) + min;
return x;
}
static {
playerFlagsHeader = Utilities.format(LiteFlags.getInstance().getConfig().getString("Messages.PlayerFlagsHeader").replace("%limit%", flagListLimit));
}
} }

4
src/main/java/com/liteflags/data/maps/MapCache.java
View File

@ -6,6 +6,6 @@ import java.util.List;
import java.util.Map; import java.util.Map;
public class MapCache { public class MapCache {
public static Map<String, String> reauthedPlayers = new HashMap(); public static Map<String, String> reauthedPlayers = new HashMap();
public static List<String> activeFlags = new ArrayList(); public static List<String> activeFlags = new ArrayList();
} }

78
src/main/java/com/liteflags/events/ChatEvent.java
View File

@ -5,8 +5,10 @@ import com.liteflags.data.database.Database;
import com.liteflags.data.database.Methods; import com.liteflags.data.database.Methods;
import com.liteflags.data.maps.MapCache; import com.liteflags.data.maps.MapCache;
import com.liteflags.util.Utilities; import com.liteflags.util.Utilities;
import java.util.Random; import java.util.Random;
import java.util.concurrent.TimeUnit; import java.util.concurrent.TimeUnit;
import org.bukkit.Bukkit; import org.bukkit.Bukkit;
import org.bukkit.entity.Player; import org.bukkit.entity.Player;
import org.bukkit.event.EventHandler; import org.bukkit.event.EventHandler;
@ -15,44 +17,54 @@ import org.bukkit.event.player.AsyncPlayerChatEvent;
import org.bukkit.scheduler.BukkitRunnable; import org.bukkit.scheduler.BukkitRunnable;
public class ChatEvent implements Listener { public class ChatEvent implements Listener {
private LiteFlags flags;
public ChatEvent(LiteFlags flags) { @EventHandler
this.flags = flags; public void onPlayerChat(AsyncPlayerChatEvent e) {
} final Player player = e.getPlayer();
@EventHandler if (!MapCache.reauthedPlayers.containsKey(player.getUniqueId().toString())) {
public void onPlayerChat(AsyncPlayerChatEvent e) { return;
final Player player = e.getPlayer(); }
if (MapCache.reauthedPlayers.containsKey(player.getUniqueId().toString())) {
String value = MapCache.reauthedPlayers.get(player.getUniqueId().toString()); String value = MapCache.reauthedPlayers.get(player.getUniqueId().toString());
if (e.getMessage().equals(value)) {
if (e.getMessage().equals(value)) {
e.setCancelled(true); e.setCancelled(true);
player.sendMessage(Utilities.format(LiteFlags.getInstance().getConfig().getString("Messages.Authenticate_Success"))); player.sendMessage(Utilities.format(LiteFlags.getInstance().getConfig().getString("Messages.Authenticate_Success")));
long time = TimeUnit.SECONDS.toMinutes(System.currentTimeMillis() / 1000L) + 5L;
final int min = LiteFlags.getInstance().getConfig().getInt("RandomReauth.MinNumber"); final int min = LiteFlags.getInstance().getConfig().getInt("RandomReauth.MinNumber");
final int max = LiteFlags.getInstance().getConfig().getInt("RandomReauth.MaxNumber"); final int max = LiteFlags.getInstance().getConfig().getInt("RandomReauth.MaxNumber");
new Random();
final String timeAmount = LiteFlags.getInstance().getConfig().getString("RandomReauth.TimeFormat");
(new BukkitRunnable() {
public void run() {
Bukkit.getServer().dispatchCommand(Bukkit.getConsoleSender(), LiteFlags.getInstance().getConfig().getString("Commands.TempAuthSuccess").replace("%player%", player.getName()).replace("%permission%", "liteflags.authentication.success").replace("%expiretime%", Methods.getRandomIntegerBetweenRange(min, max) + timeAmount.substring(0, 1).toLowerCase()));
}
}).runTask(LiteFlags.getInstance());
MapCache.reauthedPlayers.remove(player.getUniqueId().toString());
if (Database.inPlayerCache(player.getUniqueId())) {
long currentTime = TimeUnit.MILLISECONDS.toMinutes(System.currentTimeMillis());
int expireTime = 10080;
int conTime = (int)currentTime + expireTime;
Database.addFlag(player.getUniqueId(), (long)((int)TimeUnit.MINUTES.toSeconds((long)conTime)), "Possible Hacked Client - Logged out before authenticating.", "Console", "7 Days");
Database.removePlayerCache(player.getUniqueId());
}
} else {
e.setCancelled(true);
player.sendMessage(Utilities.format(LiteFlags.getInstance().getConfig().getString("Messages.Authenticate_Failed").replace("%code%", (CharSequence)MapCache.reauthedPlayers.get(player.getUniqueId().toString()))));
LiteFlags.getInstance().getLogger().info(player.getName() + " tried talking while authenticating: " + e.getMessage());
}
}
} final String timeAmount = LiteFlags.getInstance().getConfig().getString("RandomReauth.TimeFormat");
new BukkitRunnable() {
public void run() {
Bukkit.getServer().dispatchCommand(Bukkit.getConsoleSender(),
LiteFlags.getInstance().getConfig().getString("Commands.TempAuthSuccess")
.replace("%player%", player.getName())
.replace("%permission%", "liteflags.authentication.success")
.replace("%expiretime%",
Methods.getRandomIntegerBetweenRange(min, max)
+ timeAmount.substring(0, 1).toLowerCase()));
}
}.runTask(LiteFlags.getInstance());
MapCache.reauthedPlayers.remove(player.getUniqueId().toString());
if (Database.inPlayerCache(player.getUniqueId())) {
long currentTime = TimeUnit.MILLISECONDS.toMinutes(System.currentTimeMillis());
int expireTime = 10080;
int conTime = (int) currentTime + expireTime;
Database.addFlag(player.getUniqueId(), (long) ((int) TimeUnit.MINUTES.toSeconds((long) conTime)), "Possible Hacked Client - Logged out before authenticating.", "Console", "7 Days");
Database.removePlayerCache(player.getUniqueId());
}
} else {
e.setCancelled(true);
player.sendMessage(Utilities.format(LiteFlags.getInstance().getConfig().getString("Messages.Authenticate_Failed").replace("%code%", (CharSequence) MapCache.reauthedPlayers.get(player.getUniqueId().toString()))));
LiteFlags.getInstance().getLogger().info(player.getName() + " tried talking while authenticating: " + e.getMessage());
}
}
} }

40
src/main/java/com/liteflags/events/LoginEvent.java
View File

@ -5,7 +5,7 @@ import com.liteflags.auth.Authentication;
import com.liteflags.data.database.Methods; import com.liteflags.data.database.Methods;
import com.liteflags.data.maps.MapCache; import com.liteflags.data.maps.MapCache;
import com.liteflags.util.Utilities; import com.liteflags.util.Utilities;
import java.util.Iterator;
import org.bukkit.Bukkit; import org.bukkit.Bukkit;
import org.bukkit.entity.Player; import org.bukkit.entity.Player;
import org.bukkit.event.EventHandler; import org.bukkit.event.EventHandler;
@ -13,31 +13,25 @@ import org.bukkit.event.Listener;
import org.bukkit.event.player.PlayerJoinEvent; import org.bukkit.event.player.PlayerJoinEvent;
public class LoginEvent implements Listener { public class LoginEvent implements Listener {
private LiteFlags flags;
public LoginEvent(LiteFlags flags) { @EventHandler
this.flags = flags; public void onPlayerLogin(PlayerJoinEvent e) {
} Player player = e.getPlayer();
if (!player.hasPermission("liteflags.authentication.bypass")) {
Authentication.checkAuthStatus(player.getUniqueId());
}
@EventHandler if (!Methods.hasActiveFlags(player)) {
public void onPlayerLogin(PlayerJoinEvent e) { return;
Player player = e.getPlayer(); }
if (!player.hasPermission("liteflags.authentication.bypass")) {
Authentication.checkAuthStatus(player.getUniqueId());
}
if (Methods.hasActiveFlags(player)) { MapCache.activeFlags.add(player.getName());
MapCache.activeFlags.add(player.getName());
Iterator var3 = Bukkit.getOnlinePlayers().iterator();
while(var3.hasNext()) { for (Player onlinePlayer : Bukkit.getOnlinePlayers()) {
Player staff = (Player)var3.next(); if (onlinePlayer.hasPermission("liteflags.alertflags") && !LiteFlags.getInstance().getConfig().getString("Messages.AlertActiveFlags").equalsIgnoreCase("disablethis")) {
if (staff.hasPermission("liteflags.alertflags") && !LiteFlags.getInstance().getConfig().getString("Messages.AlertActiveFlags").equalsIgnoreCase("disablethis")) { int activeTotalFlags = Methods.getTotalActiveFlags(player);
int activeTotalFlags = Methods.getTotalActiveFlags(player); Utilities.sendStaffHoverMessage(player, onlinePlayer, Utilities.format(LiteFlags.getInstance().getConfig().getString("Messages.AlertActiveFlags").replace("%player%", player.getName()).replace("%totalactflags%", "" + activeTotalFlags).replace("%consoleFlags%", "" + Methods.consoleFlags).replace("%staffFlags%", "" + Methods.staffFlags)));
Utilities.sendStaffHoverMessage(player, staff, Utilities.format(LiteFlags.getInstance().getConfig().getString("Messages.AlertActiveFlags").replace("%player%", player.getName()).replace("%totalactflags%", "" + activeTotalFlags).replace("%consoleFlags%", "" + Methods.consoleFlags).replace("%staffFlags%", "" + Methods.staffFlags)));
} }
} }
} }
}
} }

35
src/main/java/com/liteflags/events/LogoutEvent.java
View File

@ -10,27 +10,26 @@ import org.bukkit.event.Listener;
import org.bukkit.event.player.PlayerQuitEvent; import org.bukkit.event.player.PlayerQuitEvent;
public class LogoutEvent implements Listener { public class LogoutEvent implements Listener {
private LiteFlags flags; private LiteFlags flags;
public LogoutEvent(LiteFlags flags) { public LogoutEvent(LiteFlags flags) {
this.flags = flags; this.flags = flags;
} }
@EventHandler @EventHandler
public void onPlayerLogout(PlayerQuitEvent e) { public void onPlayerLogout(PlayerQuitEvent e) {
Player player = e.getPlayer(); Player player = e.getPlayer();
if (AuthTimer.taskID.containsKey(player.getUniqueId())) {
AuthTimer.endTask(player);
}
if (MapCache.reauthedPlayers.containsKey(player.getUniqueId().toString())) { if (AuthTimer.taskID.containsKey(player.getUniqueId())) {
Database.addPlayerCache(player.getUniqueId(), player.getName()); AuthTimer.endTask(player);
MapCache.reauthedPlayers.remove(player.getUniqueId().toString()); }
}
if (MapCache.activeFlags.contains(player.getName())) { if (MapCache.reauthedPlayers.containsKey(player.getUniqueId().toString())) {
MapCache.activeFlags.remove(player.getName()); Database.addPlayerCache(player.getUniqueId(), player.getName());
} MapCache.reauthedPlayers.remove(player.getUniqueId().toString());
}
} MapCache.activeFlags.remove(player.getName());
}
} }

22
src/main/java/com/liteflags/events/MoveEvent.java
View File

@ -1,6 +1,5 @@
package com.liteflags.events; package com.liteflags.events;
import com.liteflags.LiteFlags;
import com.liteflags.data.maps.MapCache; import com.liteflags.data.maps.MapCache;
import org.bukkit.entity.Player; import org.bukkit.entity.Player;
import org.bukkit.event.EventHandler; import org.bukkit.event.EventHandler;
@ -8,20 +7,9 @@ import org.bukkit.event.Listener;
import org.bukkit.event.player.PlayerMoveEvent; import org.bukkit.event.player.PlayerMoveEvent;
public class MoveEvent implements Listener { public class MoveEvent implements Listener {
private LiteFlags flags; @EventHandler
public void onPlayerMove(PlayerMoveEvent e) {
public MoveEvent(LiteFlags flags) { Player player = e.getPlayer();
this.flags = flags; e.setCancelled(MapCache.reauthedPlayers.containsKey(player.getUniqueId().toString()));
} }
@EventHandler
public void onPlayerMove(PlayerMoveEvent e) {
Player player = e.getPlayer();
if (MapCache.reauthedPlayers.containsKey(player.getUniqueId().toString())) {
e.setCancelled(true);
} else {
e.setCancelled(false);
}
}
} }

125
src/main/java/com/liteflags/util/Utilities.java
View File

@ -1,6 +1,7 @@
package com.liteflags.util; package com.liteflags.util;
import java.util.concurrent.TimeUnit; import java.util.concurrent.TimeUnit;
import net.md_5.bungee.api.ChatColor; import net.md_5.bungee.api.ChatColor;
import net.md_5.bungee.api.chat.ClickEvent; import net.md_5.bungee.api.chat.ClickEvent;
import net.md_5.bungee.api.chat.ComponentBuilder; import net.md_5.bungee.api.chat.ComponentBuilder;
@ -12,84 +13,58 @@ import org.bukkit.command.CommandSender;
import org.bukkit.entity.Player; import org.bukkit.entity.Player;
public class Utilities { public class Utilities {
public static String convertTime(int time) { public static String convertTime(int time) {
int days = (int) TimeUnit.MINUTES.toDays(time); int days = (int) TimeUnit.MINUTES.toDays(time);
int hours = (int)(TimeUnit.MINUTES.toHours(time) - TimeUnit.DAYS.toHours(days)); int hours = (int) (TimeUnit.MINUTES.toHours(time) - TimeUnit.DAYS.toHours(days));
int minutes = (int)(TimeUnit.MINUTES.toMinutes(time) - TimeUnit.HOURS.toMinutes(hours) - TimeUnit.DAYS.toMinutes(days)); int minutes = (int) (TimeUnit.MINUTES.toMinutes(time) - TimeUnit.HOURS.toMinutes(hours) - TimeUnit.DAYS.toMinutes(days));
String d = days + " day";
String h = hours + " hour";
String m = minutes + " minute";
String c = ", ";
if (days == 0) {
if (hours == 0) {
return minutes == 1 ? m : m + "s";
} else if (hours == 1) {
if (minutes == 1) {
return h + c + m;
} else {
return minutes == 0 ? h : h + c + m + "s";
}
} else if (minutes == 1) {
return h + "s" + c + m;
} else {
return minutes == 0 ? h + "s" : h + "s" + c + m + "s";
}
} else if (days == 1) {
if (hours == 1) {
if (minutes == 1) {
return d + c + h + c + m;
} else {
return minutes == 0 ? d + c + h : d + c + h + c + m + "s";
}
} else if (minutes == 1) {
return hours == 0 ? d + c + m : d + c + h + "s" + c + m;
} else if (minutes == 0) {
return hours == 0 ? d : d + c + h + "s";
} else {
return hours == 0 ? d + c + m + "s" : d + c + h + "s" + c + m + "s";
}
} else if (hours == 1) {
if (minutes == 1) {
return d + "s" + c + h + c + m;
} else {
return minutes == 0 ? d + "s" + c + h : d + "s" + c + h + c + m + "s";
}
} else if (minutes == 1) {
return hours == 0 ? d + "s" + c + m : d + "s" + c + h + "s" + c + m;
} else if (minutes == 0) {
return hours == 0 ? d + "s" : d + "s" + c + h + "s";
} else {
return hours == 0 ? d + "s" + c + m + "s" : d + "s" + c + h + "s" + c + m + "s";
}
}
public static String format(String m) { String timeString = formatTime(days, " day");
return ChatColor.translateAlternateColorCodes('&', m); timeString += (timeString.length() == 0 ? "" : ", ") + formatTime(hours, " hour");
} timeString += (timeString.length() == 0 ? "" : ", ") + formatTime(minutes, " minute");
public static void sendStaffHoverMessage(OfflinePlayer targetPlayer, Player staffPlayer, String mainString) { if (timeString.length() == 0) timeString = "0 minutes";
TextComponent mainComponent = new TextComponent(mainString);
mainComponent.setHoverEvent(new HoverEvent(Action.SHOW_TEXT, (new ComponentBuilder(ChatColor.GRAY + "Click to view " + targetPlayer.getName() + "'s flags")).create()));
mainComponent.setClickEvent(new ClickEvent(net.md_5.bungee.api.chat.ClickEvent.Action.RUN_COMMAND, "/flaglist " + targetPlayer.getName()));
staffPlayer.spigot().sendMessage(mainComponent);
}
public static void sendFlagConfirmMessage(CommandSender sender, OfflinePlayer targetPlayer, int id, String flagReason) { return timeString;
TextComponent mainComponent = new TextComponent("Are you sure you want to remove the flag '" + flagReason + "' from " + ChatColor.YELLOW + targetPlayer.getName() + "'s" + ChatColor.GRAY + " flag history? "); }
mainComponent.setColor(ChatColor.GRAY);
TextComponent confirmButton = new TextComponent("[Confirm]");
confirmButton.setColor(ChatColor.GREEN);
confirmButton.setHoverEvent(new HoverEvent(Action.SHOW_TEXT, (new ComponentBuilder(ChatColor.GREEN + "Click to confirm")).create()));
confirmButton.setClickEvent(new ClickEvent(net.md_5.bungee.api.chat.ClickEvent.Action.RUN_COMMAND, "/flag remove " + id + " " + targetPlayer.getName() + " -c"));
mainComponent.addExtra(confirmButton);
sender.spigot().sendMessage(mainComponent);
}
public static TextComponent textComponent(TextComponent component) { private static String formatTime(int value, String s) {
return component; switch (value) {
} case 0:
return "";
case 1:
return value + s;
default:
return value + s + "s";
}
}
public static void sendMessage(Player player, TextComponent component) { public static String format(String m) {
player.spigot().sendMessage(component); return ChatColor.translateAlternateColorCodes('&', m);
} }
public static void sendStaffHoverMessage(OfflinePlayer targetPlayer, Player staffPlayer, String mainString) {
TextComponent mainComponent = new TextComponent(mainString);
mainComponent.setHoverEvent(new HoverEvent(Action.SHOW_TEXT, (new ComponentBuilder(ChatColor.GRAY + "Click to view " + targetPlayer.getName() + "'s flags")).create()));
mainComponent.setClickEvent(new ClickEvent(net.md_5.bungee.api.chat.ClickEvent.Action.RUN_COMMAND, "/flaglist " + targetPlayer.getName()));
staffPlayer.spigot().sendMessage(mainComponent);
}
public static void sendFlagConfirmMessage(CommandSender sender, OfflinePlayer targetPlayer, int id, String flagReason) {
TextComponent mainComponent = new TextComponent("Are you sure you want to remove the flag '" + flagReason + "' from " + ChatColor.YELLOW + targetPlayer.getName() + "'s" + ChatColor.GRAY + " flag history? ");
mainComponent.setColor(ChatColor.GRAY);
TextComponent confirmButton = new TextComponent("[Confirm]");
confirmButton.setColor(ChatColor.GREEN);
confirmButton.setHoverEvent(new HoverEvent(Action.SHOW_TEXT, (new ComponentBuilder(ChatColor.GREEN + "Click to confirm")).create()));
confirmButton.setClickEvent(new ClickEvent(net.md_5.bungee.api.chat.ClickEvent.Action.RUN_COMMAND, "/flag remove " + id + " " + targetPlayer.getName() + " -c"));
mainComponent.addExtra(confirmButton);
sender.spigot().sendMessage(mainComponent);
}
public static TextComponent textComponent(TextComponent component) {
return component;
}
public static void sendMessage(Player player, TextComponent component) {
player.spigot().sendMessage(component);
}
} }