2 Commits

Author SHA1 Message Date
d73ff75c04 Added commands to help 2021-04-06 21:38:28 +02:00
9f50a45f8c Fixed chat color issue 2021-03-27 20:32:32 +01:00
2 changed files with 23 additions and 20 deletions

View File

@@ -3,7 +3,7 @@
<groupId>de.web.basman93</groupId> <groupId>de.web.basman93</groupId>
<artifactId>KickPlayerOnJoin</artifactId> <artifactId>KickPlayerOnJoin</artifactId>
<packaging>jar</packaging> <packaging>jar</packaging>
<version>1.0.1</version> <version>1.0.3</version>
<name>KickPlayerOnJoin</name> <name>KickPlayerOnJoin</name>
<url></url> <url></url>
<build> <build>

View File

@@ -3,7 +3,7 @@ package de.web.basman93;
import java.util.ArrayList; import java.util.ArrayList;
import java.util.List; import java.util.List;
import org.bukkit.Color; import org.bukkit.ChatColor;
import org.bukkit.command.Command; import org.bukkit.command.Command;
import org.bukkit.command.CommandSender; import org.bukkit.command.CommandSender;
import org.bukkit.configuration.file.FileConfiguration; import org.bukkit.configuration.file.FileConfiguration;
@@ -19,7 +19,7 @@ public class KickPlayerOnJoin extends JavaPlugin implements Listener {
private boolean active = true; private boolean active = true;
private FileConfiguration config = getConfig(); private FileConfiguration config = getConfig();
private List<String> playerlist = new ArrayList<String>(); private List<String> playerlist = new ArrayList<String>();
private final String prefix = Color.SILVER + "[K" + Color.GRAY + "P" + Color.SILVER + "OJ] "; private final String prefix = ChatColor.GRAY + "[K" + ChatColor.DARK_GRAY + "P" + ChatColor.GRAY + "OJ] ";
@Override @Override
public boolean onCommand(CommandSender sender, Command command, String label, String[] args) { public boolean onCommand(CommandSender sender, Command command, String label, String[] args) {
@@ -36,12 +36,20 @@ public class KickPlayerOnJoin extends JavaPlugin implements Listener {
save(); save();
} else if(args.length > 0 && args[0].equalsIgnoreCase("help") && cop(sender, "kpoj.help")) { } else if(args.length > 0 && args[0].equalsIgnoreCase("help") && cop(sender, "kpoj.help")) {
sender.sendMessage(prefix + "--------------- HELP ---------------"); sender.sendMessage(prefix + "---------------------- HELP ----------------------");
sender.sendMessage(prefix + "/kpoj - shows version & status"); sender.sendMessage(prefix + "/kpoj - shows version & status");
sender.sendMessage(prefix + "/kpoj help - shows this help info"); sender.sendMessage(prefix + "/kpoj version - shows version");
sender.sendMessage(prefix + "/kpoj off - deactivate this plugin"); sender.sendMessage(prefix + "/kpoj help - shows this help info");
sender.sendMessage(prefix + "/kpoj on - activate this plugin"); sender.sendMessage(prefix + "/kpoj off - deactivate this plugin");
sender.sendMessage(prefix + "------------------------------------"); sender.sendMessage(prefix + "/kpoj on - activate this plugin");
sender.sendMessage(prefix + "/kpoj add <player> - add player to whitelist");
sender.sendMessage(prefix + "/kpoj del <player> - removes player from whitelist");
sender.sendMessage(prefix + "/kpoj reload - reload plugin");
sender.sendMessage(prefix + "/kpoj list - list players on whitelist");
sender.sendMessage(prefix + "--------------------------------------------------");
} else if(args.length > 0 && args[0].equalsIgnoreCase("version")) {
sender.sendMessage(prefix + "Version: " + getDescription().getVersion());
} else if(args.length > 1 && args[0].equalsIgnoreCase("add") && cop(sender, "kpoj.add")) { } else if(args.length > 1 && args[0].equalsIgnoreCase("add") && cop(sender, "kpoj.add")) {
for(int i = 1; i < args.length; i++) { for(int i = 1; i < args.length; i++) {
@@ -67,25 +75,20 @@ public class KickPlayerOnJoin extends JavaPlugin implements Listener {
} else if(args.length > 0 && args[0].equalsIgnoreCase("reload") && cop(sender, "kpoj.reload")) { } else if(args.length > 0 && args[0].equalsIgnoreCase("reload") && cop(sender, "kpoj.reload")) {
reloadConfig(); reloadConfig();
config = getConfig(); config = getConfig();
playerlist = config.getStringList("Player"); playerlist = config.getStringList("Player");
active = config.getBoolean("Check"); active = config.getBoolean("Check");
sender.sendMessage(prefix + "Config reloaded!");
} else if(args.length > 0 && args[0].equalsIgnoreCase("list") && cop(sender, "kpoj.list")) { } else if(args.length > 0 && args[0].equalsIgnoreCase("list") && cop(sender, "kpoj.list")) {
String buffer = playerlist.isEmpty() ? "" : playerlist.get(0); sender.sendMessage(prefix + "Players: " + String.join(", ", playerlist));
for(int i = 1; i < playerlist.size(); i++) {
buffer += ", " + playerlist.get(i);
}
sender.sendMessage(prefix + "Players: " + buffer);
} else { } else {
sender.sendMessage(prefix + "Version: " + getDescription().getVersion()); sender.sendMessage(prefix + "Version: " + getDescription().getVersion());
if(cop(sender, "kpoj.info")) if(cop(sender, "kpoj.info"))
sender.sendMessage(prefix + "Active: " + (active ? Color.GREEN + "yes" : Color.RED + "no")); sender.sendMessage(prefix + "Active: " + (active ? ChatColor.GREEN + "yes" : ChatColor.RED + "no"));
if(sender.hasPermission("kpoj.info") && sender instanceof Player) if(sender.hasPermission("kpoj.info") && sender instanceof Player)
sender.sendMessage(prefix + "Status: " + (playerlist.contains(sender.getName()) ? Color.GREEN + "Allowed" : Color.RED + "Disallowed")); sender.sendMessage(prefix + "Status: " + (playerlist.contains(sender.getName()) ? ChatColor.GREEN + "Allowed" : ChatColor.RED + "Disallowed"));
} }
return true; return true;
} }
@@ -105,8 +108,8 @@ public class KickPlayerOnJoin extends JavaPlugin implements Listener {
@EventHandler @EventHandler
public void onPlayerLogin(PlayerLoginEvent event) { public void onPlayerLogin(PlayerLoginEvent event) {
if(!playerlist.contains(event.getPlayer().getName()) && active) { if(!playerlist.contains(event.getPlayer().getName()) && active) {
event.disallow(Result.KICK_WHITELIST, "You are not whitelisted on this server!"); event.disallow(Result.KICK_WHITELIST, "You are not white-listed on this server!");
getServer().broadcastMessage(event.getPlayer().getName()); getServer().broadcastMessage(event.getPlayer().getName() + " tried to join.");
} }
} }