diff options
Diffstat (limited to 'src/main/java/com/redstoner/bungeeBans/commands')
5 files changed, 227 insertions, 11 deletions
diff --git a/src/main/java/com/redstoner/bungeeBans/commands/BanCommand.java b/src/main/java/com/redstoner/bungeeBans/commands/BanCommand.java index ec9e980..0527893 100644 --- a/src/main/java/com/redstoner/bungeeBans/commands/BanCommand.java +++ b/src/main/java/com/redstoner/bungeeBans/commands/BanCommand.java @@ -33,7 +33,7 @@ public class BanCommand extends Command { switch (args.length) { case 0: sender.sendMessage( - new ComponentBuilder("Usage: ") + new ComponentBuilder(ChatColor.RED + "Usage: ") .append(ChatColor.AQUA + "/ban ") .append(ChatColor.GOLD + "<username> ") .append(ChatColor.YELLOW + "[reason]") @@ -67,9 +67,8 @@ public class BanCommand extends Command { try { bm.saveBans(); - sender.sendMessage(new TextComponent(ChatColor.GREEN + "Saved bans to file!")); } catch (IOException e) { - sender.sendMessage(new TextComponent(ChatColor.RED + "Failed to save bans to file!")); + sender.sendMessage(new TextComponent(ChatColor.RED + "Failed to save player bans to file! (nothing was changed)")); e.printStackTrace(); bm.removeBan(ban); diff --git a/src/main/java/com/redstoner/bungeeBans/commands/BanIPCommand.java b/src/main/java/com/redstoner/bungeeBans/commands/BanIPCommand.java new file mode 100644 index 0000000..d2f3c33 --- /dev/null +++ b/src/main/java/com/redstoner/bungeeBans/commands/BanIPCommand.java @@ -0,0 +1,95 @@ +package com.redstoner.bungeeBans.commands; + +import com.redstoner.bungeeBans.BanManager; +import com.redstoner.bungeeBans.Main; +import com.redstoner.bungeeBans.Util; +import com.redstoner.bungeeBans.json.IPBan; +import net.md_5.bungee.api.ChatColor; +import net.md_5.bungee.api.CommandSender; +import net.md_5.bungee.api.chat.ComponentBuilder; +import net.md_5.bungee.api.chat.TextComponent; +import net.md_5.bungee.api.connection.ProxiedPlayer; +import net.md_5.bungee.api.plugin.Command; + +import java.io.IOException; +import java.util.Arrays; + +public class BanIPCommand extends Command { + private BanManager<IPBan> bm; + private Main plugin; + + public BanIPCommand(BanManager<IPBan> bm, Main plugin) { + super("banip", "bungeeBans.banip"); + + this.bm = bm; + this.plugin = plugin; + } + + @Override + public void execute(CommandSender sender, String[] args) { + String reason = "Banned by an operator."; + + switch (args.length) { + case 0: + sender.sendMessage( + new ComponentBuilder(ChatColor.RED + "Usage: ") + .append(ChatColor.AQUA + "/banip ") + .append(ChatColor.GOLD + "<ip> ") + .append(ChatColor.YELLOW + "[reason]") + .create() + ); + case 1: + break; + default: + reason = String.join(" ", Arrays.copyOfRange(args, 1, args.length)); + break; + } + + + String ip = args[0]; + String expires = "forever"; //TODO: expiry option + + if (!Util.validateIP(ip)) { + sender.sendMessage(new TextComponent(ChatColor.RED + "Invalid IP!")); + return; + } + + if (bm.getBan(ip) != null) { + sender.sendMessage(new TextComponent(ChatColor.RED + "That IP is already banned!")); + return; + } + + IPBan ban = new IPBan(ip, Util.getNow(), sender.getName(), expires, reason); + bm.addBan(ban); + + try { + bm.saveBans(); + } catch (IOException e) { + sender.sendMessage(new TextComponent(ChatColor.RED + "Failed to save IP bans to file! (nothing was changed)")); + e.printStackTrace(); + + bm.removeBan(ban); + return; + } + + for (ProxiedPlayer player : plugin.getProxy().getPlayers()) { + if (player.getAddress().getAddress().toString().equals(ip)) { + player.disconnect( + new ComponentBuilder(ChatColor.RED + "Your IP was banned by ") + .append(ChatColor.AQUA + sender.getName()) + .append(ChatColor.RED + " for ") + .append(ChatColor.YELLOW + reason) + .create() + ); + } + } + + sender.sendMessage( + new ComponentBuilder(ChatColor.GREEN + "Banned IP ") + .append(ChatColor.AQUA + ip) + .append(ChatColor.GREEN + " for ") + .append(ChatColor.AQUA + reason) + .create() + ); + } +} diff --git a/src/main/java/com/redstoner/bungeeBans/commands/GetIPBanCommand.java b/src/main/java/com/redstoner/bungeeBans/commands/GetIPBanCommand.java new file mode 100644 index 0000000..16fbf7f --- /dev/null +++ b/src/main/java/com/redstoner/bungeeBans/commands/GetIPBanCommand.java @@ -0,0 +1,59 @@ +package com.redstoner.bungeeBans.commands; + +import com.redstoner.bungeeBans.BanManager; +import com.redstoner.bungeeBans.Util; +import com.redstoner.bungeeBans.json.IPBan; +import net.md_5.bungee.api.ChatColor; +import net.md_5.bungee.api.CommandSender; +import net.md_5.bungee.api.chat.ComponentBuilder; +import net.md_5.bungee.api.chat.TextComponent; +import net.md_5.bungee.api.plugin.Command; + +public class GetIPBanCommand extends Command { + private BanManager<IPBan> bm; + + public GetIPBanCommand(BanManager<IPBan> bm) { + super("getipban", "bungeebans.getipban"); + + this.bm = bm; + } + + @Override + public void execute(CommandSender sender, String[] args) { + if (args.length != 1) { + sender.sendMessage( + new ComponentBuilder(ChatColor.RED + "Usage: ") + .append(ChatColor.AQUA + "/getipban ") + .append(ChatColor.GOLD + "<ip> ") + .create() + ); + + return; + } + + String ip = args[0]; + + if (!Util.validateIP(ip)) { + sender.sendMessage(new TextComponent(ChatColor.RED + "Invalid IP!")); + return; + } + + IPBan ban = bm.getBan(ip); + + if (ban == null) { + sender.sendMessage(new TextComponent(ChatColor.RED + "That IP is not banned!")); + return; + } + + sender.sendMessage( + new ComponentBuilder(ChatColor.GREEN + "IP ") + .append(ChatColor.AQUA + ip) + .append(ChatColor.GREEN + " is banned for ") + .append(ChatColor.AQUA + ban.getReason()) + .append(ChatColor.GREEN + " until ") + .append(ChatColor.AQUA + ban.getExpires()) + .create() + ); + + } +} diff --git a/src/main/java/com/redstoner/bungeeBans/commands/UnbanCommand.java b/src/main/java/com/redstoner/bungeeBans/commands/UnbanCommand.java index a495dbb..809c7d2 100644 --- a/src/main/java/com/redstoner/bungeeBans/commands/UnbanCommand.java +++ b/src/main/java/com/redstoner/bungeeBans/commands/UnbanCommand.java @@ -1,6 +1,5 @@ package com.redstoner.bungeeBans.commands; -import com.mojang.api.profiles.HttpProfileRepository; import com.mojang.api.profiles.Profile; import com.redstoner.bungeeBans.BanManager; import com.redstoner.bungeeBans.Util; @@ -14,8 +13,6 @@ import net.md_5.bungee.api.plugin.Command; import java.io.IOException; public class UnbanCommand extends Command { - HttpProfileRepository profileRepo = new HttpProfileRepository("minecraft"); - private BanManager<PlayerBan> bm; public UnbanCommand(BanManager<PlayerBan> bm) { @@ -28,8 +25,7 @@ public class UnbanCommand extends Command { public void execute(CommandSender sender, String[] args) { if (args.length != 1) { sender.sendMessage( - new ComponentBuilder(ChatColor.RED + "Invalid command! ") - .append("Usage: ") + new ComponentBuilder(ChatColor.RED + "Usage: ") .append(ChatColor.AQUA + "/unban ") .append(ChatColor.GOLD + "<username> ") .create() @@ -38,7 +34,7 @@ public class UnbanCommand extends Command { return; } - Profile[] profiles = profileRepo.findProfilesByNames(args[0]); + Profile[] profiles = Util.findProfilesByNames(args[0]); if (profiles.length != 1) { sender.sendMessage(new TextComponent(ChatColor.RED + "Invalid name!")); @@ -59,9 +55,8 @@ public class UnbanCommand extends Command { try { bm.saveBans(); - sender.sendMessage(new TextComponent(ChatColor.GREEN + "Saved bans to file!")); } catch (IOException e) { - sender.sendMessage(new TextComponent(ChatColor.RED + "Failed to save bans to file!")); + sender.sendMessage(new TextComponent(ChatColor.RED + "Failed to save player bans to file! (nothing was changed)")); e.printStackTrace(); bm.addBan(ban); diff --git a/src/main/java/com/redstoner/bungeeBans/commands/UnbanIPCommand.java b/src/main/java/com/redstoner/bungeeBans/commands/UnbanIPCommand.java new file mode 100644 index 0000000..c314660 --- /dev/null +++ b/src/main/java/com/redstoner/bungeeBans/commands/UnbanIPCommand.java @@ -0,0 +1,68 @@ +package com.redstoner.bungeeBans.commands; + +import com.redstoner.bungeeBans.BanManager; +import com.redstoner.bungeeBans.Util; +import com.redstoner.bungeeBans.json.IPBan; +import net.md_5.bungee.api.ChatColor; +import net.md_5.bungee.api.CommandSender; +import net.md_5.bungee.api.chat.ComponentBuilder; +import net.md_5.bungee.api.chat.TextComponent; +import net.md_5.bungee.api.plugin.Command; + +import java.io.IOException; + +public class UnbanIPCommand extends Command { + private BanManager<IPBan> bm; + + public UnbanIPCommand(BanManager<IPBan> bm) { + super("unbanip", "bungeebans.unbanip", "pardonip"); + + this.bm = bm; + } + + @Override + public void execute(CommandSender sender, String[] args) { + if (args.length != 1) { + sender.sendMessage( + new ComponentBuilder(ChatColor.RED + "Usage: ") + .append(ChatColor.AQUA + "/unbanip ") + .append(ChatColor.GOLD + "<ip> ") + .create() + ); + + return; + } + + String ip = args[0]; + + if (!Util.validateIP(ip)) { + sender.sendMessage(new TextComponent(ChatColor.RED + "Invalid IP!")); + return; + } + + IPBan ban = bm.getBan(ip); + + if (ban == null) { + sender.sendMessage(new TextComponent(ChatColor.RED + "That IP is not banned!")); + return; + } + + bm.removeBan(ban); + + try { + bm.saveBans(); + } catch (IOException e) { + sender.sendMessage(new TextComponent(ChatColor.RED + "Failed to save IP bans to file! (nothing was changed)")); + e.printStackTrace(); + + bm.addBan(ban); + return; + } + + sender.sendMessage( + new ComponentBuilder(ChatColor.GREEN + "Unbanned IP ") + .append(ChatColor.AQUA + ip) + .create() + ); + } +} |