diff --git a/pom.xml b/pom.xml index 5e46f919..399b5909 100644 --- a/pom.xml +++ b/pom.xml @@ -5,12 +5,12 @@ me.totalfreedom TotalFreedomMod - 2020.11.5 + 6.0 jar UTF-8 - Antaeus + Mirror ${project.name} ${maven.build.timestamp} MM/dd/yyyy HH:mm @@ -33,9 +33,9 @@ - scm:git:git@github.com:TFPatches/TotalFreedomMod.git - scm:git:git@github.com:TFPatches/TotalFreedomMod.git - git@github.com:TFPatches/TotalFreedomMod.git + scm:git:git@github.com:TotalFreedomMC/TotalFreedomMod.git + scm:git:git@github.com:TotalFreedomMC/TotalFreedomMod.git + git@github.com:TotalFreedomMC/TotalFreedomMod.git @@ -195,7 +195,7 @@ net.ess3 EssentialsX - 2.18.1 + 2.18.2 provided @@ -275,13 +275,6 @@ 3.1.1 compile - - - net.dean.jraw - JRAW - 1.1.0 - provided - diff --git a/src/main/java/me/totalfreedom/totalfreedommod/AntiSpam.java b/src/main/java/me/totalfreedom/totalfreedommod/AntiSpam.java index af015222..54764e87 100644 --- a/src/main/java/me/totalfreedom/totalfreedommod/AntiSpam.java +++ b/src/main/java/me/totalfreedom/totalfreedommod/AntiSpam.java @@ -62,7 +62,7 @@ public class AntiSpam extends FreedomService { final Player player = event.getPlayer(); - if (plugin.sl.isStaff(player)) + if (plugin.al.isAdmin(player)) { return; } @@ -109,7 +109,7 @@ public class AntiSpam extends FreedomService return; } - if (plugin.sl.isStaff(player)) + if (plugin.al.isAdmin(player)) { return; } diff --git a/src/main/java/me/totalfreedom/totalfreedommod/ChatManager.java b/src/main/java/me/totalfreedom/totalfreedommod/ChatManager.java index b391278a..e03b2578 100644 --- a/src/main/java/me/totalfreedom/totalfreedommod/ChatManager.java +++ b/src/main/java/me/totalfreedom/totalfreedommod/ChatManager.java @@ -5,7 +5,7 @@ import me.totalfreedom.totalfreedommod.config.ConfigEntry; import me.totalfreedom.totalfreedommod.player.FPlayer; import me.totalfreedom.totalfreedommod.player.PlayerData; import me.totalfreedom.totalfreedommod.rank.Displayable; -import me.totalfreedom.totalfreedommod.staff.StaffMember; +import me.totalfreedom.totalfreedommod.admin.Admin; import me.totalfreedom.totalfreedommod.util.FLog; import me.totalfreedom.totalfreedommod.util.FSync; import me.totalfreedom.totalfreedommod.util.FUtil; @@ -65,7 +65,7 @@ public class ChatManager extends FreedomService return; } - if (!ConfigEntry.TOGGLE_CHAT.getBoolean() && !plugin.sl.isStaff(player)) + if (!ConfigEntry.TOGGLE_CHAT.getBoolean() && !plugin.al.isAdmin(player)) { event.setCancelled(true); playerMsg(player, "Chat is currently disabled.", org.bukkit.ChatColor.RED); @@ -87,29 +87,14 @@ public class ChatManager extends FreedomService return; } - // Check for staffchat - if (fPlayer.inStaffChat()) + // Check for adminchat + if (fPlayer.inAdminChat()) { - FSync.staffChatMessage(player, message); + FSync.adminChatMessage(player, message); event.setCancelled(true); return; } - // Check for 4chan trigger - Boolean green = ChatColor.stripColor(message).toLowerCase().startsWith(">"); - Boolean orange = ChatColor.stripColor(message).toLowerCase().endsWith("<"); - if (ConfigEntry.FOURCHAN_ENABLED.getBoolean()) - { - if (green) - { - message = ChatColor.GREEN + message; - } - else if (orange) - { - message = ChatColor.GOLD + message; - } - } - // Finally, set message event.setMessage(message); @@ -123,7 +108,7 @@ public class ChatManager extends FreedomService } // Check for mentions - Boolean mentionEveryone = ChatColor.stripColor(message).toLowerCase().contains("@everyone") && plugin.sl.isStaff(player); + Boolean mentionEveryone = ChatColor.stripColor(message).toLowerCase().contains("@everyone") && plugin.al.isAdmin(player); for (Player p : server.getOnlinePlayers()) { if (ChatColor.stripColor(message).toLowerCase().contains("@" + p.getName().toLowerCase()) || mentionEveryone) @@ -135,8 +120,8 @@ public class ChatManager extends FreedomService // Set format event.setFormat(format); - // Send to discord - if (!ConfigEntry.STAFF_ONLY_MODE.getBoolean() && !Bukkit.hasWhitelist() && !plugin.pl.getPlayer(player).isMuted() && !plugin.tfg.inGuildChat(player)) + // Send to Discord + if (!ConfigEntry.ADMIN_ONLY_MODE.getBoolean() && !Bukkit.hasWhitelist() && !plugin.pl.getPlayer(player).isMuted() && !plugin.tfg.inGuildChat(player)) { plugin.dc.messageChatChannel(plugin.dc.deformat(player.getName()) + " \u00BB " + ChatColor.stripColor(message)); } @@ -144,8 +129,7 @@ public class ChatManager extends FreedomService public ChatColor getColor(Displayable display) { - ChatColor color = display.getColor(); - return color; + return display.getColor(); } public String getColoredTag(Displayable display) @@ -154,27 +138,27 @@ public class ChatManager extends FreedomService return color + display.getAbbr(); } - public void staffChat(CommandSender sender, String message) + public void adminChat(CommandSender sender, String message) { Displayable display = plugin.rm.getDisplay(sender); - FLog.info("[STAFF] " + sender.getName() + " " + display.getTag() + ": " + message, true); + FLog.info("[ADMIN] " + sender.getName() + " " + display.getTag() + ": " + message, true); plugin.dc.messageAdminChatChannel(sender.getName() + " \u00BB " + message); for (Player player : server.getOnlinePlayers()) { - if (plugin.sl.isStaff(player)) + if (plugin.al.isAdmin(player)) { - StaffMember staffMember = plugin.sl.getAdmin(player); - if (!Strings.isNullOrEmpty(staffMember.getAcFormat())) + Admin admin = plugin.al.getAdmin(player); + if (!Strings.isNullOrEmpty(admin.getAcFormat())) { - String format = staffMember.getAcFormat(); + String format = admin.getAcFormat(); ChatColor color = getColor(display); String msg = format.replace("%name%", sender.getName()).replace("%rank%", display.getAbbr()).replace("%rankcolor%", color.toString()).replace("%msg%", message); player.sendMessage(FUtil.colorize(msg)); } else { - player.sendMessage("[" + ChatColor.AQUA + "STAFF" + ChatColor.WHITE + "] " + ChatColor.DARK_RED + sender.getName() + ChatColor.DARK_GRAY + " [" + getColoredTag(display) + ChatColor.DARK_GRAY + "]" + ChatColor.WHITE + ": " + ChatColor.GOLD + FUtil.colorize(message)); + player.sendMessage("[" + ChatColor.AQUA + "ADMIN" + ChatColor.WHITE + "] " + ChatColor.DARK_RED + sender.getName() + ChatColor.DARK_GRAY + " [" + getColoredTag(display) + ChatColor.DARK_GRAY + "]" + ChatColor.WHITE + ": " + ChatColor.GOLD + FUtil.colorize(message)); } } } @@ -184,7 +168,7 @@ public class ChatManager extends FreedomService { for (Player player : server.getOnlinePlayers()) { - if (plugin.sl.isStaff(player)) + if (plugin.al.isAdmin(player)) { playerMsg(player, ChatColor.RED + "[REPORTS] " + ChatColor.GOLD + reporter.getName() + " has reported " + reported.getName() + " for " + report); } diff --git a/src/main/java/me/totalfreedom/totalfreedommod/CommandSpy.java b/src/main/java/me/totalfreedom/totalfreedommod/CommandSpy.java index 5bc0ddc0..4da218d3 100644 --- a/src/main/java/me/totalfreedom/totalfreedommod/CommandSpy.java +++ b/src/main/java/me/totalfreedom/totalfreedommod/CommandSpy.java @@ -23,9 +23,9 @@ public class CommandSpy extends FreedomService { for (Player player : server.getOnlinePlayers()) { - if (plugin.sl.isStaff(player) && plugin.sl.getAdmin(player).getCommandSpy()) + if (plugin.al.isAdmin(player) && plugin.al.getAdmin(player).getCommandSpy()) { - if (plugin.sl.isStaff(event.getPlayer()) && !plugin.sl.isAdmin(player)) + if (plugin.al.isAdmin(event.getPlayer()) && !plugin.al.isSeniorAdmin(player)) { continue; } diff --git a/src/main/java/me/totalfreedom/totalfreedommod/LogViewer.java b/src/main/java/me/totalfreedom/totalfreedommod/LogViewer.java deleted file mode 100644 index 802256bc..00000000 --- a/src/main/java/me/totalfreedom/totalfreedommod/LogViewer.java +++ /dev/null @@ -1,204 +0,0 @@ -package me.totalfreedom.totalfreedommod; - -import java.io.UnsupportedEncodingException; -import java.net.HttpURLConnection; -import java.net.MalformedURLException; -import java.net.URL; -import java.net.URLEncoder; -import java.security.NoSuchAlgorithmException; -import java.security.NoSuchProviderException; -import java.security.SecureRandom; -import java.util.ArrayList; -import java.util.HashMap; -import java.util.Iterator; -import java.util.List; -import java.util.Map; -import me.totalfreedom.totalfreedommod.config.ConfigEntry; -import me.totalfreedom.totalfreedommod.util.FLog; -import org.apache.commons.lang.StringUtils; -import org.bukkit.ChatColor; -import org.bukkit.command.CommandSender; -import org.bukkit.entity.Player; -import org.bukkit.scheduler.BukkitRunnable; - -public class LogViewer extends FreedomService -{ - @Override - public void onStart() - { - } - - @Override - public void onStop() - { - } - - public void updateLogsRegistration(final CommandSender sender, final Player target, final LogsRegistrationMode mode) - { - updateLogsRegistration(sender, target.getName(), mode); - } - - public void updateLogsRegistration(final CommandSender sender, final String targetName, final LogsRegistrationMode mode) - { - final String logsRegisterUrl = ConfigEntry.LOGS_URL.getString(); - final String logsRegisterPassword = ConfigEntry.LOGS_SECRET.getString(); - - if (logsRegisterUrl == null || logsRegisterPassword == null || logsRegisterUrl.isEmpty() || logsRegisterPassword.isEmpty()) - { - return; - } - - new BukkitRunnable() - { - @Override - public void run() - { - try - { - if (sender != null) - { - sender.sendMessage(ChatColor.YELLOW + "Connecting..."); - } - - final String key = SecureCodeGenerator.generateCode(20); - - final URL urlAdd = new URLBuilder(logsRegisterUrl) - .addQueryParameter("mode", mode.name()) - .addQueryParameter("password", logsRegisterPassword) - .addQueryParameter("name", targetName) - .addQueryParameter("key", key) - .getURL(); - - final HttpURLConnection connection = (HttpURLConnection)urlAdd.openConnection(); - connection.setConnectTimeout(1000 * 5); - connection.setReadTimeout(1000 * 5); - connection.setUseCaches(false); - connection.setRequestMethod("HEAD"); - - final int responseCode = connection.getResponseCode(); - - if (sender != null) - { - if (!plugin.isEnabled()) - { - return; - } - - new BukkitRunnable() - { - @Override - public void run() - { - if (responseCode == 200) - { - if (mode == LogsRegistrationMode.ADD) - { - String link = null; - try - { - final URL urlVerify = new URLBuilder(logsRegisterUrl) - .addQueryParameter("mode", LogsRegistrationMode.VERIFY.name()) - .addQueryParameter("name", targetName) - .addQueryParameter("key", key) - .getURL(); - link = urlVerify.toString(); - } - catch (Exception ex) - { - FLog.severe(ex); - } - - sender.sendMessage(ChatColor.GREEN + "Open this link to verify your logviewer registration:\n" + ChatColor.DARK_GREEN + link); - } - else - { - sender.sendMessage(ChatColor.GREEN + "Logviewer access revoked successfully."); - } - } - else - { - sender.sendMessage(ChatColor.RED + "Error contacting logs registration server."); - } - } - }.runTask(plugin); - } - } - catch (Exception ex) - { - FLog.severe(ex); - } - } - }.runTaskAsynchronously(plugin); - } - - public static enum LogsRegistrationMode - { - - ADD, DELETE, VERIFY; - } - - private static class URLBuilder - { - - private final String requestPath; - private final Map queryStringMap = new HashMap<>(); - - private URLBuilder(String requestPath) - { - this.requestPath = requestPath; - } - - public URLBuilder addQueryParameter(String key, String value) - { - queryStringMap.put(key, value); - return this; - } - - public URL getURL() throws MalformedURLException - { - List pairs = new ArrayList<>(); - Iterator> it = queryStringMap.entrySet().iterator(); - while (it.hasNext()) - { - Map.Entry pair = it.next(); - try - { - pairs.add(URLEncoder.encode(pair.getKey(), "UTF-8") + "=" + URLEncoder.encode(pair.getValue(), "UTF-8")); - } - catch (UnsupportedEncodingException ex) - { - FLog.severe(ex); - } - } - - return new URL(requestPath + "?" + StringUtils.join(pairs, "&")); - } - } - - private static class SecureCodeGenerator - { - - private static final String CHARACTER_SET = "0123456789ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz"; - - public static String generateCode(final int length) - { - SecureRandom random; - try - { - random = SecureRandom.getInstance("SHA1PRNG", "SUN"); - } - catch (NoSuchAlgorithmException | NoSuchProviderException ex) - { - random = new SecureRandom(); - FLog.severe(ex); - } - - final StringBuilder sb = new StringBuilder(); - for (int i = 0; i < length; i++) - { - sb.append(CHARACTER_SET.charAt(random.nextInt(CHARACTER_SET.length()))); - } - return sb.toString(); - } - } -} diff --git a/src/main/java/me/totalfreedom/totalfreedommod/LoginProcess.java b/src/main/java/me/totalfreedom/totalfreedommod/LoginProcess.java index 9faeecca..c7ab815a 100644 --- a/src/main/java/me/totalfreedom/totalfreedommod/LoginProcess.java +++ b/src/main/java/me/totalfreedom/totalfreedommod/LoginProcess.java @@ -53,7 +53,7 @@ public class LoginProcess extends FreedomService public void onPlayerPreLogin(AsyncPlayerPreLoginEvent event) { final String ip = event.getAddress().getHostAddress().trim(); - final boolean isStaff = plugin.sl.getEntryByIp(ip) != null; + final boolean isAdmin = plugin.al.getEntryByIp(ip) != null; // Check if the player is already online for (Player onlinePlayer : server.getOnlinePlayers()) @@ -63,10 +63,10 @@ public class LoginProcess extends FreedomService continue; } - if (isStaff) + if (isAdmin) { event.allow(); - FSync.playerKick(onlinePlayer, "A staff member just logged in with the username you are using."); + FSync.playerKick(onlinePlayer, "An admin just logged in with the username you are using."); return; } @@ -113,11 +113,11 @@ public class LoginProcess extends FreedomService } } - // Check if player is staff - final boolean isStaff = plugin.sl.getEntryByIp(ip) != null; + // Check if player is admin + final boolean isAdmin = plugin.al.getEntryByIp(ip) != null; // Validation below this point - if (isStaff) // Player is staff + if (isAdmin) // Player is admin { // Force-allow log in event.allow(); @@ -127,9 +127,9 @@ public class LoginProcess extends FreedomService { for (Player onlinePlayer : server.getOnlinePlayers()) { - if (!plugin.sl.isStaff(onlinePlayer)) + if (!plugin.al.isAdmin(onlinePlayer)) { - onlinePlayer.kickPlayer("You have been kicked to free up room for a staff member."); + onlinePlayer.kickPlayer("You have been kicked to free up room for an admin."); count--; } @@ -149,7 +149,7 @@ public class LoginProcess extends FreedomService return; } - // Player is not a staff member + // Player is not an admin // Server full check if (server.getOnlinePlayers().size() >= server.getMaxPlayers()) { @@ -157,10 +157,10 @@ public class LoginProcess extends FreedomService return; } - // Staff-only mode - if (ConfigEntry.STAFF_ONLY_MODE.getBoolean()) + // Admin-only mode + if (ConfigEntry.ADMIN_ONLY_MODE.getBoolean()) { - event.disallow(PlayerLoginEvent.Result.KICK_OTHER, "Server is temporarily open to staff only."); + event.disallow(PlayerLoginEvent.Result.KICK_OTHER, "Server is temporarily open to admins only."); return; } @@ -226,7 +226,7 @@ public class LoginProcess extends FreedomService player.setPlayerListFooter(FUtil.colorize(ConfigEntry.SERVER_TABLIST_FOOTER.getString()).replace("\\n", "\n")); } - if (!plugin.sl.isStaff(player)) + if (!plugin.al.isAdmin(player)) { String tag = playerData.getTag(); if (tag != null) @@ -237,14 +237,14 @@ public class LoginProcess extends FreedomService int noteCount = playerData.getNotes().size(); if (noteCount != 0) { - String noteMessage = "This player has " + noteCount + " staff note" + (noteCount > 1 ? "s" : "") + "."; + String noteMessage = "This player has " + noteCount + " admin note" + (noteCount > 1 ? "s" : "") + "."; JSONMessage notice = JSONMessage.create(ChatColor.GOLD + noteMessage + " Click here to view them.") .tooltip("Click here to view them.") .runCommand("/notes " + player.getName() + " list"); FLog.info(noteMessage); for (Player p : server.getOnlinePlayers()) { - if (plugin.sl.isStaffImpostor(p)) + if (plugin.al.isAdminImpostor(p)) { notice.send(p); } @@ -257,14 +257,14 @@ public class LoginProcess extends FreedomService @Override public void run() { - if (ConfigEntry.STAFF_ONLY_MODE.getBoolean()) + if (ConfigEntry.ADMIN_ONLY_MODE.getBoolean()) { - player.sendMessage(ChatColor.RED + "Server is currently closed to non-staff."); + player.sendMessage(ChatColor.RED + "Server is currently closed to non-admins."); } if (lockdownEnabled) { - FUtil.playerMsg(player, "Warning: Server is currenty in lockdown-mode, new players will not be able to join!", ChatColor.RED); + FUtil.playerMsg(player, "Warning: Server is currently in lockdown-mode, new players will not be able to join!", ChatColor.RED); } } }.runTaskLater(plugin, 20L); diff --git a/src/main/java/me/totalfreedom/totalfreedommod/Monitors.java b/src/main/java/me/totalfreedom/totalfreedommod/Monitors.java index 1a0a52c5..c9b40ab2 100644 --- a/src/main/java/me/totalfreedom/totalfreedommod/Monitors.java +++ b/src/main/java/me/totalfreedom/totalfreedommod/Monitors.java @@ -46,7 +46,7 @@ public class Monitors extends FreedomService } } - plugin.sl.potionSpyMessage(ChatColor.translateAlternateColorCodes('&', String.format("&8[&ePotionSpy&8] &r%s splashed %s %s at X: %s Y: %s Z: %s in the world '%s'%s.", + plugin.al.potionSpyMessage(ChatColor.translateAlternateColorCodes('&', String.format("&8[&ePotionSpy&8] &r%s splashed %s %s at X: %s Y: %s Z: %s in the world '%s'%s.", player.getName(), potionsThrown, potionsThrown == 1 ? "potion" : "potions", latestThrownPotion.getLocation().getBlockX(), latestThrownPotion.getLocation().getBlockY(), latestThrownPotion.getLocation().getBlockZ(), latestThrownPotion.getWorld().getName(), trollPotions > 0 ? String.format(" &c(most likely troll %s)", trollPotions == 1 ? "potion" : "potions") : ""))); } diff --git a/src/main/java/me/totalfreedom/totalfreedommod/MovementValidator.java b/src/main/java/me/totalfreedom/totalfreedommod/MovementValidator.java index 9fcb6288..089f488d 100644 --- a/src/main/java/me/totalfreedom/totalfreedommod/MovementValidator.java +++ b/src/main/java/me/totalfreedom/totalfreedommod/MovementValidator.java @@ -23,7 +23,6 @@ import org.bukkit.inventory.ItemStack; public class MovementValidator extends FreedomService { - public static final int MAX_XYZ_COORD = 29999998; public static final int MAX_DISTANCE_TRAVELED = 100; diff --git a/src/main/java/me/totalfreedom/totalfreedommod/Muter.java b/src/main/java/me/totalfreedom/totalfreedommod/Muter.java index 203d3e77..97891bef 100644 --- a/src/main/java/me/totalfreedom/totalfreedommod/Muter.java +++ b/src/main/java/me/totalfreedom/totalfreedommod/Muter.java @@ -45,7 +45,7 @@ public class Muter extends FreedomService return; } - if (plugin.sl.isStaffSync(player)) + if (plugin.al.isAdminSync(player)) { fPlayer.setMuted(false); MUTED_PLAYERS.remove(player.getName()); @@ -70,7 +70,7 @@ public class Muter extends FreedomService } String message = event.getMessage(); - if (plugin.sl.isStaff(player)) + if (plugin.al.isAdmin(player)) { fPlayer.setMuted(false); return; diff --git a/src/main/java/me/totalfreedom/totalfreedommod/Pterodactyl.java b/src/main/java/me/totalfreedom/totalfreedommod/Pterodactyl.java index c425c8df..1c254110 100644 --- a/src/main/java/me/totalfreedom/totalfreedommod/Pterodactyl.java +++ b/src/main/java/me/totalfreedom/totalfreedommod/Pterodactyl.java @@ -7,7 +7,7 @@ import joptsimple.internal.Strings; import lombok.Getter; import me.totalfreedom.totalfreedommod.config.ConfigEntry; import me.totalfreedom.totalfreedommod.rank.Rank; -import me.totalfreedom.totalfreedommod.staff.StaffMember; +import me.totalfreedom.totalfreedommod.admin.Admin; import me.totalfreedom.totalfreedommod.util.FLog; import me.totalfreedom.totalfreedommod.util.FUtil; import me.totalfreedom.totalfreedommod.util.Response; @@ -34,16 +34,16 @@ public class Pterodactyl extends FreedomService { } - public void updateAccountStatus(StaffMember staffMember) + public void updateAccountStatus(Admin admin) { - String id = staffMember.getPteroID(); + String id = admin.getPteroID(); if (Strings.isNullOrEmpty(id) || !enabled) { return; } - if (!staffMember.isActive() || staffMember.getRank() != Rank.SENIOR_ADMIN) + if (!admin.isActive() || admin.getRank() != Rank.SENIOR_ADMIN) { FLog.debug("Disabling ptero acc"); removeAccountFromServer(id); diff --git a/src/main/java/me/totalfreedom/totalfreedommod/Reddit.java b/src/main/java/me/totalfreedom/totalfreedommod/Reddit.java deleted file mode 100644 index d9c02663..00000000 --- a/src/main/java/me/totalfreedom/totalfreedommod/Reddit.java +++ /dev/null @@ -1,217 +0,0 @@ -package me.totalfreedom.totalfreedommod; - -import com.google.common.base.Strings; -import java.util.Arrays; -import java.util.HashMap; -import java.util.List; -import java.util.Map; -import me.totalfreedom.totalfreedommod.config.ConfigEntry; -import me.totalfreedom.totalfreedommod.player.PlayerData; -import me.totalfreedom.totalfreedommod.rank.Displayable; -import me.totalfreedom.totalfreedommod.rank.Rank; -import me.totalfreedom.totalfreedommod.rank.Title; -import me.totalfreedom.totalfreedommod.util.FLog; -import me.totalfreedom.totalfreedommod.util.FUtil; -import net.dean.jraw.ApiException; -import net.dean.jraw.RedditClient; -import net.dean.jraw.http.OkHttpNetworkAdapter; -import net.dean.jraw.http.UserAgent; -import net.dean.jraw.models.CurrentFlair; -import net.dean.jraw.models.Flair; -import net.dean.jraw.oauth.Credentials; -import net.dean.jraw.oauth.OAuthHelper; -import net.dean.jraw.references.SubredditReference; -import org.bukkit.entity.Player; - -public class Reddit extends FreedomService -{ - private final String SUBREDDIT_NAME = ConfigEntry.REDDIT_SUBREDDIT_NAME.getString(); - private final String USERNAME = ConfigEntry.REDDIT_USERNAME.getString(); - private final String PASSWORD = ConfigEntry.REDDIT_PASSWORD.getString(); - private final String CLIENT_ID = ConfigEntry.REDDIT_CLIENT_ID.getString(); - private final String CLIENT_SECRET = ConfigEntry.REDDIT_CLIENT_SECRET.getString(); - - private final UserAgent userAgent = new UserAgent("bot", "me.totalfreedom.reddit", TotalFreedomMod.build.version, USERNAME); - private final Credentials credentials = Credentials.script(USERNAME, PASSWORD, CLIENT_ID, CLIENT_SECRET); - - private RedditClient reddit = null; - private SubredditReference subreddit = null; - - private HashMap linkCodes = new HashMap<>(); - private HashMap pending = new HashMap<>(); - - private Map flairList = new HashMap<>(); - - private Map flairNameList = new HashMap<>(); - - private List noFlairDisplays = Arrays.asList(Title.VERIFIED_STAFF, Rank.IMPOSTOR, Rank.NON_OP, Rank.OP); - - public boolean enabled = false; - - @Override - public void onStart() - { - enabled = ConfigEntry.REDDIT_CLIENT_ID.getString() == null; - if (!enabled) - { - return; - } - - if (reddit == null) - { - try - { - reddit = OAuthHelper.automatic(new OkHttpNetworkAdapter(userAgent), credentials); - reddit.setLogHttp(FUtil.inDeveloperMode()); - } - catch (NoClassDefFoundError e) - { - FLog.warning("The JRAW plugin is not installed, therefore the Reddit service cannot start."); - FLog.warning("To resolve this error, please download the latest JRAW from: https://github.com/TFPatches/Minecraft-JRAW/releases"); - enabled = false; - return; - } - catch (NullPointerException e) - { - FLog.warning("Invalid Reddit credentials specified, please double check everything in the config."); - enabled = false; - return; - } - } - - if (subreddit == null) - { - subreddit = reddit.subreddit(SUBREDDIT_NAME); - } - - loadFlairList(); - } - - @Override - public void onStop() - { - } - - public void setFlair(String username, String flairID) - { - List flairs = subreddit.userFlairOptions(); - Flair flair = null; - for (Flair f : flairs) - { - if (f.getId().equals(flairID)) - { - flair = f; - break; - } - } - - if (flair == null) - { - return; - } - - subreddit.otherUserFlair(username).updateToTemplate(flair.getId(), ""); - } - - public void removeFlair(String username) - { - subreddit.otherUserFlair(username).updateToTemplate("", ""); - } - - public void sendModMessage(String username, String subject, String body) throws ApiException - { - reddit.me().inbox().compose("/r/" + SUBREDDIT_NAME, username, subject, body); - } - - public String addLinkCode(PlayerData data, String username) - { - String code = FUtil.randomAlphanumericString(10); - linkCodes.put(code, data); - pending.put(data, username); - return code; - } - - public String checkLinkCode(String code) - { - PlayerData data = linkCodes.get(code); - String username = pending.get(data); - if (data == null || username == null) - { - return null; - } - - linkCodes.remove(code); - pending.remove(data); - - data.setRedditUsername(username); - plugin.pl.save(data); - - return username; - } - - public boolean updateFlair(Player player) - { - if (!enabled) - { - return false; - } - - PlayerData data = plugin.pl.getData(player); - String username = data.getRedditUsername(); - Displayable display = plugin.rm.getDisplay(player); - if (username == null) - { - FLog.debug("No Reddit account"); - return false; - } - - CurrentFlair currentFlair = subreddit.otherUserFlair(username).current(); - String currentFlairName = currentFlair.getText(); - String currentFlairID = currentFlair.getId(); - String neededFlairID = flairList.get(display); - String neededFlairName = flairNameList.get(display); - - FLog.debug("Current ID: " + currentFlairID); - FLog.debug("Needed ID: " + neededFlairID); - - FLog.debug("Current Name: " + currentFlairName); - FLog.debug("Needed Name: " + neededFlairName); - - - // Work around - //if (currentFlairID == null && neededFlairID != null || currentFlairID != null && neededFlairID != null && !currentFlairID.equals(neededFlairID)) - if (Strings.isNullOrEmpty(currentFlairName) && neededFlairName != null || !Strings.isNullOrEmpty(currentFlairName) && neededFlairName != null && !currentFlairName.equals(neededFlairName)) - { - FLog.debug("Setting flair"); - setFlair(username, neededFlairID); - return true; - } - - if (noFlairDisplays.contains(display) && !Strings.isNullOrEmpty(currentFlairName)) - { - FLog.debug("Removing flair"); - removeFlair(username); - return true; - } - - return false; - } - - public void loadFlairList() - { - flairList.put(Title.OWNER, ConfigEntry.REDDIT_SERVER_OWNER_FLAIR_ID.getString()); - flairList.put(Title.EXECUTIVE, ConfigEntry.REDDIT_EXECUTIVE_FLAIR_ID.getString()); - flairList.put(Title.DEVELOPER, ConfigEntry.REDDIT_DEVELOPER_FLAIR_ID.getString()); - flairList.put(Rank.SENIOR_ADMIN, ConfigEntry.REDDIT_SENIOR_ADMIN_FLAIR_ID.getString()); - flairList.put(Rank.ADMIN, ConfigEntry.REDDIT_NEW_ADMIN_FLAIR_ID.getString()); - flairList.put(Title.MASTER_BUILDER, ConfigEntry.REDDIT_MASTER_BUILDER_FLAIR_ID.getString()); - - // Work around because the current flair ID keeps returning null, either a JRAW bug or a Reddit bug - flairNameList.put(Title.OWNER, "Server Owner"); - flairNameList.put(Title.EXECUTIVE, "Executive"); - flairNameList.put(Title.DEVELOPER, "Developer"); - flairNameList.put(Rank.SENIOR_ADMIN, "Senior Admin"); - flairNameList.put(Rank.ADMIN, "Admin"); - flairNameList.put(Title.MASTER_BUILDER, "Master Builder"); - } -} diff --git a/src/main/java/me/totalfreedom/totalfreedommod/SavedFlags.java b/src/main/java/me/totalfreedom/totalfreedommod/SavedFlags.java index 8a0cd287..97d2e72d 100644 --- a/src/main/java/me/totalfreedom/totalfreedommod/SavedFlags.java +++ b/src/main/java/me/totalfreedom/totalfreedommod/SavedFlags.java @@ -94,5 +94,4 @@ public class SavedFlags extends FreedomService FLog.severe(ex); } } - } diff --git a/src/main/java/me/totalfreedom/totalfreedommod/ServerPing.java b/src/main/java/me/totalfreedom/totalfreedommod/ServerPing.java index e87f8005..6f5ceaad 100644 --- a/src/main/java/me/totalfreedom/totalfreedommod/ServerPing.java +++ b/src/main/java/me/totalfreedom/totalfreedommod/ServerPing.java @@ -30,9 +30,9 @@ public class ServerPing extends FreedomService return; } - if (ConfigEntry.STAFF_ONLY_MODE.getBoolean()) + if (ConfigEntry.ADMIN_ONLY_MODE.getBoolean()) { - event.setMotd(FUtil.colorize(ConfigEntry.SERVER_STAFFMODE_MOTD.getString())); + event.setMotd(FUtil.colorize(ConfigEntry.SERVER_ADMINMODE_MOTD.getString())); return; } diff --git a/src/main/java/me/totalfreedom/totalfreedommod/Sitter.java b/src/main/java/me/totalfreedom/totalfreedommod/Sitter.java deleted file mode 100644 index b90fd260..00000000 --- a/src/main/java/me/totalfreedom/totalfreedommod/Sitter.java +++ /dev/null @@ -1,34 +0,0 @@ -package me.totalfreedom.totalfreedommod; - -import me.totalfreedom.totalfreedommod.command.Command_sit; -import org.bukkit.entity.ArmorStand; -import org.bukkit.entity.Entity; -import org.bukkit.event.EventHandler; -import org.spigotmc.event.entity.EntityDismountEvent; - -public class Sitter extends FreedomService -{ - @Override - public void onStart() - { - } - - @Override - public void onStop() - { - } - - @EventHandler - public void onEntityDismount(EntityDismountEvent e) - { - Entity dm = e.getDismounted(); - if (dm instanceof ArmorStand) - { - if (Command_sit.STANDS.contains(dm)) - { - Command_sit.STANDS.remove(dm); - dm.remove(); - } - } - } -} diff --git a/src/main/java/me/totalfreedom/totalfreedommod/TotalFreedomMod.java b/src/main/java/me/totalfreedom/totalfreedommod/TotalFreedomMod.java index ca55fe18..936407a3 100644 --- a/src/main/java/me/totalfreedom/totalfreedommod/TotalFreedomMod.java +++ b/src/main/java/me/totalfreedom/totalfreedommod/TotalFreedomMod.java @@ -26,11 +26,8 @@ import me.totalfreedom.totalfreedommod.command.CommandLoader; import me.totalfreedom.totalfreedommod.config.MainConfig; import me.totalfreedom.totalfreedommod.discord.Discord; import me.totalfreedom.totalfreedommod.freeze.Freezer; -import me.totalfreedom.totalfreedommod.fun.CurseListener; import me.totalfreedom.totalfreedommod.fun.ItemFun; import me.totalfreedom.totalfreedommod.fun.Jumppads; -import me.totalfreedom.totalfreedommod.fun.Landminer; -import me.totalfreedom.totalfreedommod.fun.MP44; import me.totalfreedom.totalfreedommod.fun.Trailer; import me.totalfreedom.totalfreedommod.httpd.HTTPDaemon; import me.totalfreedom.totalfreedommod.permissions.PermissionConfig; @@ -41,8 +38,8 @@ import me.totalfreedom.totalfreedommod.rank.RankManager; import me.totalfreedom.totalfreedommod.shop.Shop; import me.totalfreedom.totalfreedommod.shop.Votifier; import me.totalfreedom.totalfreedommod.sql.SQLite; -import me.totalfreedom.totalfreedommod.staff.ActivityLog; -import me.totalfreedom.totalfreedommod.staff.StaffList; +import me.totalfreedom.totalfreedommod.admin.ActivityLog; +import me.totalfreedom.totalfreedommod.admin.AdminList; import me.totalfreedom.totalfreedommod.util.FLog; import me.totalfreedom.totalfreedommod.util.FUtil; import me.totalfreedom.totalfreedommod.util.MethodTimer; @@ -83,8 +80,7 @@ public class TotalFreedomMod extends JavaPlugin public ServerInterface si; public SavedFlags sf; public WorldManager wm; - public LogViewer lv; - public StaffList sl; + public AdminList al; public ActivityLog acl; public RankManager rm; public CommandBlocker cb; @@ -107,7 +103,6 @@ public class TotalFreedomMod extends JavaPlugin public BanManager bm; public IndefiniteBanList im; public PermissionManager pem; - public Reddit rd; public GameRuleHandler gr; public CommandSpy cs; public Cager ca; @@ -122,22 +117,16 @@ public class TotalFreedomMod extends JavaPlugin public Monitors mo; public MovementValidator mv; public ServerPing sp; - public CurseListener cul; public ItemFun it; - public Landminer lm; - public MP44 mp; public Jumppads jp; public Trailer tr; public HTTPDaemon hd; public WorldRestrictions wr; public SignBlocker snp; public EntityWiper ew; - public Sitter st; public VanishHandler vh; public Pterodactyl ptero; - //public HubWorldRestrictions hwr; - // // Bridges public BukkitTelnetBridge btb; public EssentialsBridge esb; @@ -200,9 +189,8 @@ public class TotalFreedomMod extends JavaPlugin si = new ServerInterface(); sf = new SavedFlags(); wm = new WorldManager(); - lv = new LogViewer(); sql = new SQLite(); - sl = new StaffList(); + al = new AdminList(); acl = new ActivityLog(); rm = new RankManager(); cb = new CommandBlocker(); @@ -225,11 +213,9 @@ public class TotalFreedomMod extends JavaPlugin bm = new BanManager(); im = new IndefiniteBanList(); pem = new PermissionManager(); - rd = new Reddit(); gr = new GameRuleHandler(); snp = new SignBlocker(); ew = new EntityWiper(); - st = new Sitter(); vh = new VanishHandler(); ptero = new Pterodactyl(); @@ -250,10 +236,7 @@ public class TotalFreedomMod extends JavaPlugin sp = new ServerPing(); // Fun - cul = new CurseListener(); it = new ItemFun(); - lm = new Landminer(); - mp = new MP44(); jp = new Jumppads(); tr = new Trailer(); // HTTPD diff --git a/src/main/java/me/totalfreedom/totalfreedommod/VanishHandler.java b/src/main/java/me/totalfreedom/totalfreedommod/VanishHandler.java index 19608bcc..7d1e586d 100644 --- a/src/main/java/me/totalfreedom/totalfreedommod/VanishHandler.java +++ b/src/main/java/me/totalfreedom/totalfreedommod/VanishHandler.java @@ -31,7 +31,7 @@ public class VanishHandler extends FreedomService for (Player p : server.getOnlinePlayers()) { - if (!plugin.sl.isStaff(player) && plugin.sl.isVanished(p.getName())) + if (!plugin.al.isAdmin(player) && plugin.al.isVanished(p.getName())) { player.hidePlayer(plugin, p); } @@ -39,17 +39,17 @@ public class VanishHandler extends FreedomService for (Player p : server.getOnlinePlayers()) { - if (!plugin.sl.isStaff(p) && plugin.sl.isVanished(player.getName())) + if (!plugin.al.isAdmin(p) && plugin.al.isVanished(player.getName())) { p.hidePlayer(plugin, player); } } - if (plugin.sl.isVanished(player.getName())) + if (plugin.al.isVanished(player.getName())) { plugin.esb.setVanished(player.getName(), true); FLog.info(player.getName() + " joined while still vanished."); - plugin.sl.messageAllStaff(ChatColor.YELLOW + player.getName() + " has joined silently."); + plugin.al.messageAllAdmins(ChatColor.YELLOW + player.getName() + " has joined silently."); event.setJoinMessage(null); new BukkitRunnable() @@ -57,7 +57,7 @@ public class VanishHandler extends FreedomService @Override public void run() { - if (!plugin.sl.isVanished(player.getName())) + if (!plugin.al.isVanished(player.getName())) { this.cancel(); } @@ -73,11 +73,11 @@ public class VanishHandler extends FreedomService { Player player = event.getPlayer(); - if (plugin.sl.isVanished(player.getName())) + if (plugin.al.isVanished(player.getName())) { event.setQuitMessage(null); FLog.info(player.getName() + " left while still vanished."); - plugin.sl.messageAllStaff(ChatColor.YELLOW + player.getName() + " has left silently."); + plugin.al.messageAllAdmins(ChatColor.YELLOW + player.getName() + " has left silently."); } } } \ No newline at end of file diff --git a/src/main/java/me/totalfreedom/totalfreedommod/staff/ActivityLog.java b/src/main/java/me/totalfreedom/totalfreedommod/admin/ActivityLog.java similarity index 97% rename from src/main/java/me/totalfreedom/totalfreedommod/staff/ActivityLog.java rename to src/main/java/me/totalfreedom/totalfreedommod/admin/ActivityLog.java index 565d4051..93ba9cd6 100644 --- a/src/main/java/me/totalfreedom/totalfreedommod/staff/ActivityLog.java +++ b/src/main/java/me/totalfreedom/totalfreedommod/admin/ActivityLog.java @@ -1,4 +1,4 @@ -package me.totalfreedom.totalfreedommod.staff; +package me.totalfreedom.totalfreedommod.admin; import com.google.common.collect.Maps; import java.util.Map; @@ -17,7 +17,6 @@ import org.bukkit.event.player.PlayerQuitEvent; public class ActivityLog extends FreedomService { - public static final String FILENAME = "activitylog.yml"; @Getter @@ -167,7 +166,7 @@ public class ActivityLog extends FreedomService public void onPlayerJoin(PlayerJoinEvent event) { Player player = event.getPlayer(); - if (plugin.sl.isStaff(player)) + if (plugin.al.isAdmin(player)) { getActivityLog(event.getPlayer()).addLogin(); plugin.acl.save(); @@ -179,7 +178,7 @@ public class ActivityLog extends FreedomService public void onPlayerQuit(PlayerQuitEvent event) { Player player = event.getPlayer(); - if (plugin.sl.isStaff(player)) + if (plugin.al.isAdmin(player)) { getActivityLog(event.getPlayer()).addLogout(); plugin.acl.save(); diff --git a/src/main/java/me/totalfreedom/totalfreedommod/staff/ActivityLogEntry.java b/src/main/java/me/totalfreedom/totalfreedommod/admin/ActivityLogEntry.java similarity index 98% rename from src/main/java/me/totalfreedom/totalfreedommod/staff/ActivityLogEntry.java rename to src/main/java/me/totalfreedom/totalfreedommod/admin/ActivityLogEntry.java index 3ad5a249..12b67460 100644 --- a/src/main/java/me/totalfreedom/totalfreedommod/staff/ActivityLogEntry.java +++ b/src/main/java/me/totalfreedom/totalfreedommod/admin/ActivityLogEntry.java @@ -1,4 +1,4 @@ -package me.totalfreedom.totalfreedommod.staff; +package me.totalfreedom.totalfreedommod.admin; import com.google.common.collect.Lists; import java.time.Instant; diff --git a/src/main/java/me/totalfreedom/totalfreedommod/staff/StaffMember.java b/src/main/java/me/totalfreedom/totalfreedommod/admin/Admin.java similarity index 90% rename from src/main/java/me/totalfreedom/totalfreedommod/staff/StaffMember.java rename to src/main/java/me/totalfreedom/totalfreedommod/admin/Admin.java index 934552f5..39f0cab4 100644 --- a/src/main/java/me/totalfreedom/totalfreedommod/staff/StaffMember.java +++ b/src/main/java/me/totalfreedom/totalfreedommod/admin/Admin.java @@ -1,4 +1,4 @@ -package me.totalfreedom.totalfreedommod.staff; +package me.totalfreedom.totalfreedommod.admin; import java.sql.ResultSet; import java.sql.SQLException; @@ -9,7 +9,6 @@ import java.util.List; import java.util.Map; import lombok.Getter; import lombok.Setter; -import me.totalfreedom.totalfreedommod.LogViewer.LogsRegistrationMode; import me.totalfreedom.totalfreedommod.TotalFreedomMod; import me.totalfreedom.totalfreedommod.rank.Rank; import me.totalfreedom.totalfreedommod.util.FLog; @@ -17,7 +16,7 @@ import me.totalfreedom.totalfreedommod.util.FUtil; import org.apache.commons.lang.StringUtils; import org.bukkit.entity.Player; -public class StaffMember +public class Admin { @Getter @Setter @@ -45,13 +44,13 @@ public class StaffMember @Setter private String pteroID = null; - public StaffMember(Player player) + public Admin(Player player) { this.name = player.getName(); this.ips.add(FUtil.getIp(player)); } - public StaffMember(ResultSet resultSet) + public Admin(ResultSet resultSet) { try { @@ -68,7 +67,7 @@ public class StaffMember } catch (SQLException e) { - FLog.severe("Failed to load staff: " + e.getMessage()); + FLog.severe("Failed to load admin: " + e.getMessage()); } } @@ -77,7 +76,7 @@ public class StaffMember { final StringBuilder output = new StringBuilder(); - output.append("Staff: ").append(name).append("\n") + output.append("Admin: ").append(name).append("\n") .append("- IPs: ").append(StringUtils.join(ips, ", ")).append("\n") .append("- Last Login: ").append(FUtil.dateToString(lastLogin)).append("\n") .append("- Rank: ").append(rank.getName()).append("\n") @@ -151,8 +150,6 @@ public class StaffMember plugin.btb.killTelnetSessions(getName()); } } - - plugin.lv.updateLogsRegistration(null, getName(), LogsRegistrationMode.DELETE); } } diff --git a/src/main/java/me/totalfreedom/totalfreedommod/admin/AdminList.java b/src/main/java/me/totalfreedom/totalfreedommod/admin/AdminList.java new file mode 100644 index 00000000..6290b00e --- /dev/null +++ b/src/main/java/me/totalfreedom/totalfreedommod/admin/AdminList.java @@ -0,0 +1,381 @@ +package me.totalfreedom.totalfreedommod.admin; + +import com.google.common.collect.Maps; +import com.google.common.collect.Sets; +import java.sql.ResultSet; +import java.sql.SQLException; +import java.util.ArrayList; +import java.util.Date; +import java.util.List; +import java.util.Map; +import java.util.Set; +import java.util.concurrent.TimeUnit; +import lombok.Getter; +import me.totalfreedom.totalfreedommod.FreedomService; +import me.totalfreedom.totalfreedommod.config.ConfigEntry; +import me.totalfreedom.totalfreedommod.rank.Rank; +import me.totalfreedom.totalfreedommod.util.FLog; +import me.totalfreedom.totalfreedommod.util.FUtil; +import org.bukkit.Bukkit; +import org.bukkit.command.CommandSender; +import org.bukkit.entity.Player; + +public class AdminList extends FreedomService +{ + @Getter + private final Set allAdmins = Sets.newHashSet(); // Includes disabled admins + // Only active admins below + @Getter + private final Set activeAdmins = Sets.newHashSet(); + private final Map nameTable = Maps.newHashMap(); + private final Map ipTable = Maps.newHashMap(); + public final List verifiedNoAdmin = new ArrayList<>(); + public final Map> verifiedNoAdminIps = Maps.newHashMap(); + public static final List vanished = new ArrayList<>(); + + @Override + public void onStart() + { + load(); + deactivateOldEntries(false); + } + + @Override + public void onStop() + { + } + + public void load() + { + allAdmins.clear(); + try + { + ResultSet adminSet = plugin.sql.getAdminlist(); + { + while (adminSet.next()) + { + Admin admin = new Admin(adminSet); + allAdmins.add(admin); + } + } + } + catch (SQLException e) + { + FLog.severe("Failed to load admin list: " + e.getMessage()); + } + + updateTables(); + FLog.info("Loaded " + allAdmins.size() + " admin members (" + nameTable.size() + " active, " + ipTable.size() + " IPs)"); + } + + public void messageAllAdmins(String message) + { + for (Player player : server.getOnlinePlayers()) + { + if (isAdmin(player)) + { + player.sendMessage(message); + } + } + } + + public void potionSpyMessage(String message) + { + for (Player player : server.getOnlinePlayers()) + { + Admin admin = getAdmin(player.getPlayer()); + if (isAdmin(player) && admin.getPotionSpy()) + { + player.sendMessage(message); + } + } + } + + public synchronized boolean isAdminSync(CommandSender sender) + { + return isAdmin(sender); + } + + public List getActiveAdminNames() + { + List names = new ArrayList(); + for (Admin admin : activeAdmins) + { + names.add(admin.getName()); + } + return names; + } + + public boolean isAdmin(CommandSender sender) + { + if (!(sender instanceof Player)) + { + return true; + } + + Admin admin = getAdmin((Player)sender); + + return admin != null && admin.isActive(); + } + + public boolean isAdmin(Player player) + { + if (player == null) + { + return true; + } + + Admin admin = getAdmin(player); + + return admin != null && admin.isActive(); + } + + public boolean isSeniorAdmin(CommandSender sender) + { + Admin admin = getAdmin(sender); + if (admin == null) + { + return false; + } + + return admin.getRank().ordinal() >= Rank.SENIOR_ADMIN.ordinal(); + } + + public Admin getAdmin(CommandSender sender) + { + if (sender instanceof Player) + { + return getAdmin((Player)sender); + } + + return getEntryByName(sender.getName()); + } + + public Admin getAdmin(Player player) + { + // Find admin + String ip = FUtil.getIp(player); + Admin admin = getEntryByName(player.getName()); + + // Admin by name + if (admin != null) + { + // Check if we're in online mode, + // Or the players IP is in the admin entry + if (Bukkit.getOnlineMode() || admin.getIps().contains(ip)) + { + if (!admin.getIps().contains(ip)) + { + // Add the new IP if we have to + admin.addIp(ip); + save(admin); + updateTables(); + } + return admin; + } + } + + // Admin by ip + admin = getEntryByIp(ip); + if (admin != null) + { + // Set the new username + String oldName = admin.getName(); + admin.setName(player.getName()); + plugin.sql.updateAdminName(oldName, admin.getName()); + updateTables(); + } + + return null; + } + + public Admin getEntryByName(String name) + { + return nameTable.get(name.toLowerCase()); + } + + public Admin getEntryByIp(String ip) + { + return ipTable.get(ip); + } + + public Admin getEntryByIpFuzzy(String needleIp) + { + final Admin directAdmin = getEntryByIp(needleIp); + if (directAdmin != null) + { + return directAdmin; + } + + for (String ip : ipTable.keySet()) + { + if (FUtil.fuzzyIpMatch(needleIp, ip, 3)) + { + return ipTable.get(ip); + } + } + + return null; + } + + public void updateLastLogin(Player player) + { + final Admin admin = getAdmin(player); + if (admin == null) + { + return; + } + + admin.setLastLogin(new Date()); + admin.setName(player.getName()); + save(admin); + } + + public boolean isAdminImpostor(Player player) + { + return getEntryByName(player.getName()) != null && !isAdmin(player) && !isVerifiedAdmin(player); + } + + public boolean isVerifiedAdmin(Player player) + { + return verifiedNoAdmin.contains(player.getName()) && verifiedNoAdminIps.get(player.getName()).contains(FUtil.getIp(player)); + } + + public boolean isIdentityMatched(Player player) + { + if (Bukkit.getOnlineMode()) + { + return true; + } + + Admin admin = getAdmin(player); + return admin != null && admin.getName().equalsIgnoreCase(player.getName()); + } + + public void addAdmin(Admin admin) + { + if (!admin.isValid()) + { + FLog.warning("Could not add admin: " + admin.getName() + ". Admin is missing details!"); + return; + } + + // Store admin, update views + allAdmins.add(admin); + updateTables(); + + // Save admin + plugin.sql.addAdmin(admin); + } + + public boolean removeAdmin(Admin admin) + { + if (admin.getRank().isAtLeast(Rank.ADMIN)) + { + if (plugin.btb != null) + { + plugin.btb.killTelnetSessions(admin.getName()); + } + } + + // Remove admin, update views + if (!allAdmins.remove(admin)) + { + return false; + } + updateTables(); + + // Unsave admin + plugin.sql.removeAdmin(admin); + + return true; + } + + public void updateTables() + { + activeAdmins.clear(); + nameTable.clear(); + ipTable.clear(); + + for (Admin admin : allAdmins) + { + if (!admin.isActive()) + { + continue; + } + + activeAdmins.add(admin); + nameTable.put(admin.getName().toLowerCase(), admin); + + for (String ip : admin.getIps()) + { + ipTable.put(ip, admin); + } + + } + } + + public Set getAdminNames() + { + return nameTable.keySet(); + } + + public Set getAdminIps() + { + return ipTable.keySet(); + } + + public void save(Admin admin) + { + try + { + ResultSet currentSave = plugin.sql.getAdminByName(admin.getName()); + for (Map.Entry entry : admin.toSQLStorable().entrySet()) + { + Object storedValue = plugin.sql.getValue(currentSave, entry.getKey(), entry.getValue()); + if (storedValue != null && !storedValue.equals(entry.getValue()) || storedValue == null && entry.getValue() != null || entry.getValue() == null) + { + plugin.sql.setAdminValue(admin, entry.getKey(), entry.getValue()); + } + } + } + catch (SQLException e) + { + FLog.severe("Failed to save admin: " + e.getMessage()); + } + } + + public void deactivateOldEntries(boolean verbose) + { + for (Admin admin : allAdmins) + { + if (!admin.isActive() || admin.getRank().isAtLeast(Rank.SENIOR_ADMIN)) + { + continue; + } + + final Date lastLogin = admin.getLastLogin(); + final long lastLoginHours = TimeUnit.HOURS.convert(new Date().getTime() - lastLogin.getTime(), TimeUnit.MILLISECONDS); + + if (lastLoginHours < ConfigEntry.ADMINLIST_CLEAN_THESHOLD_HOURS.getInteger()) + { + continue; + } + + if (verbose) + { + FUtil.adminAction("TotalFreedomMod", "Deactivating admin " + admin.getName() + ", inactive for " + lastLoginHours + " hours", true); + } + + admin.setActive(false); + save(admin); + } + + updateTables(); + } + + public boolean isVanished(String player) + { + return vanished.contains(player); + } +} \ No newline at end of file diff --git a/src/main/java/me/totalfreedom/totalfreedommod/banning/BanManager.java b/src/main/java/me/totalfreedom/totalfreedommod/banning/BanManager.java index c07a3979..31292a97 100644 --- a/src/main/java/me/totalfreedom/totalfreedommod/banning/BanManager.java +++ b/src/main/java/me/totalfreedom/totalfreedommod/banning/BanManager.java @@ -271,7 +271,7 @@ public class BanManager extends FreedomService final Player player = event.getPlayer(); final PlayerData data = plugin.pl.getData(player); - if (!plugin.sl.isStaff(player)) + if (!plugin.al.isAdmin(player)) { return; } diff --git a/src/main/java/me/totalfreedom/totalfreedommod/blocking/BlockBlocker.java b/src/main/java/me/totalfreedom/totalfreedommod/blocking/BlockBlocker.java index c457a0fd..800a78b0 100644 --- a/src/main/java/me/totalfreedom/totalfreedommod/blocking/BlockBlocker.java +++ b/src/main/java/me/totalfreedom/totalfreedommod/blocking/BlockBlocker.java @@ -181,6 +181,5 @@ public class BlockBlocker extends FreedomService player.sendMessage(ChatColor.GRAY + "Your banner had too many patterns on it, so some were removed."); } } - } } diff --git a/src/main/java/me/totalfreedom/totalfreedommod/blocking/EditBlocker.java b/src/main/java/me/totalfreedom/totalfreedommod/blocking/EditBlocker.java index a27c4248..0a7217e0 100644 --- a/src/main/java/me/totalfreedom/totalfreedommod/blocking/EditBlocker.java +++ b/src/main/java/me/totalfreedom/totalfreedommod/blocking/EditBlocker.java @@ -30,7 +30,7 @@ public class EditBlocker extends FreedomService return; } - if (plugin.sl.isStaffSync(event.getPlayer())) + if (plugin.al.isAdminSync(event.getPlayer())) { fPlayer.setEditBlocked(false); return; @@ -49,7 +49,7 @@ public class EditBlocker extends FreedomService return; } - if (plugin.sl.isStaffSync(event.getPlayer())) + if (plugin.al.isAdminSync(event.getPlayer())) { fPlayer.setEditBlocked(false); return; diff --git a/src/main/java/me/totalfreedom/totalfreedommod/blocking/EventBlocker.java b/src/main/java/me/totalfreedom/totalfreedommod/blocking/EventBlocker.java index b0d8e2c4..4a834133 100644 --- a/src/main/java/me/totalfreedom/totalfreedommod/blocking/EventBlocker.java +++ b/src/main/java/me/totalfreedom/totalfreedommod/blocking/EventBlocker.java @@ -148,11 +148,6 @@ public class EventBlocker extends FreedomService @EventHandler(priority = EventPriority.NORMAL) public void onPlayerDropItem(PlayerDropItemEvent event) { - if (!plugin.sl.isStaff(event.getPlayer())) - { - event.setCancelled(true); - } - if (!ConfigEntry.AUTO_ENTITY_WIPE.getBoolean()) { return; @@ -213,7 +208,7 @@ public class EventBlocker extends FreedomService } // TODO: Revert back to old redstone block system when (or if) it is fixed in Bukkit, Spigot or Paper. - private ArrayList redstoneBlocks = new ArrayList<>(Arrays.asList(Material.REDSTONE, Material.DISPENSER, Material.DROPPER, Material.REDSTONE_LAMP)); + private final ArrayList redstoneBlocks = new ArrayList<>(Arrays.asList(Material.REDSTONE, Material.DISPENSER, Material.DROPPER, Material.REDSTONE_LAMP)); @EventHandler public void onBlockPhysics(BlockPhysicsEvent event) diff --git a/src/main/java/me/totalfreedom/totalfreedommod/blocking/InteractBlocker.java b/src/main/java/me/totalfreedom/totalfreedommod/blocking/InteractBlocker.java index b2dfadb2..b7df3bbe 100644 --- a/src/main/java/me/totalfreedom/totalfreedommod/blocking/InteractBlocker.java +++ b/src/main/java/me/totalfreedom/totalfreedommod/blocking/InteractBlocker.java @@ -90,7 +90,7 @@ public class InteractBlocker extends FreedomService { case WATER_BUCKET: { - if (plugin.sl.isStaff(player) || ConfigEntry.ALLOW_WATER_PLACE.getBoolean()) + if (plugin.al.isAdmin(player) || ConfigEntry.ALLOW_WATER_PLACE.getBoolean()) { break; } @@ -103,7 +103,7 @@ public class InteractBlocker extends FreedomService case LAVA_BUCKET: { - if (plugin.sl.isStaff(player) || ConfigEntry.ALLOW_LAVA_PLACE.getBoolean()) + if (plugin.al.isAdmin(player) || ConfigEntry.ALLOW_LAVA_PLACE.getBoolean()) { break; } diff --git a/src/main/java/me/totalfreedom/totalfreedommod/blocking/PVPBlocker.java b/src/main/java/me/totalfreedom/totalfreedommod/blocking/PVPBlocker.java index dc6cbcea..52d855c2 100644 --- a/src/main/java/me/totalfreedom/totalfreedommod/blocking/PVPBlocker.java +++ b/src/main/java/me/totalfreedom/totalfreedommod/blocking/PVPBlocker.java @@ -70,7 +70,7 @@ public class PVPBlocker extends FreedomService } } - if (player != null & !plugin.sl.isStaff(player)) + if (player != null & !plugin.al.isAdmin(player)) { if (player.getGameMode() == GameMode.CREATIVE) { diff --git a/src/main/java/me/totalfreedom/totalfreedommod/blocking/command/CommandBlocker.java b/src/main/java/me/totalfreedom/totalfreedommod/blocking/command/CommandBlocker.java index 0f19a90e..ad223101 100644 --- a/src/main/java/me/totalfreedom/totalfreedommod/blocking/command/CommandBlocker.java +++ b/src/main/java/me/totalfreedom/totalfreedommod/blocking/command/CommandBlocker.java @@ -24,7 +24,6 @@ import org.bukkit.plugin.SimplePluginManager; public class CommandBlocker extends FreedomService { - private final Pattern flagPattern = Pattern.compile("(:([0-9]){5,})"); // private final Map entryList = Maps.newHashMap(); @@ -171,7 +170,7 @@ public class CommandBlocker extends FreedomService for (String part : commandParts) { - if (command.startsWith("/") && !plugin.sl.isStaff(sender) && (part.contains("#copy") || part.contains("#clipboard"))) + if (command.startsWith("/") && !plugin.al.isAdmin(sender) && (part.contains("#copy") || part.contains("#clipboard"))) { FUtil.playerMsg(sender, "WorldEdit copy variables are disabled."); return true; diff --git a/src/main/java/me/totalfreedom/totalfreedommod/blocking/command/CommandBlockerAction.java b/src/main/java/me/totalfreedom/totalfreedommod/blocking/command/CommandBlockerAction.java index 5bf9919c..9993b7fd 100644 --- a/src/main/java/me/totalfreedom/totalfreedommod/blocking/command/CommandBlockerAction.java +++ b/src/main/java/me/totalfreedom/totalfreedommod/blocking/command/CommandBlockerAction.java @@ -2,7 +2,6 @@ package me.totalfreedom.totalfreedommod.blocking.command; public enum CommandBlockerAction { - BLOCK("b"), BLOCK_AND_EJECT("a"), BLOCK_UNKNOWN("u"); diff --git a/src/main/java/me/totalfreedom/totalfreedommod/blocking/command/CommandBlockerEntry.java b/src/main/java/me/totalfreedom/totalfreedommod/blocking/command/CommandBlockerEntry.java index deb43964..c8208cda 100644 --- a/src/main/java/me/totalfreedom/totalfreedommod/blocking/command/CommandBlockerEntry.java +++ b/src/main/java/me/totalfreedom/totalfreedommod/blocking/command/CommandBlockerEntry.java @@ -10,7 +10,6 @@ import org.spigotmc.SpigotConfig; public class CommandBlockerEntry { - @Getter private final CommandBlockerRank rank; @Getter diff --git a/src/main/java/me/totalfreedom/totalfreedommod/blocking/command/CommandBlockerRank.java b/src/main/java/me/totalfreedom/totalfreedommod/blocking/command/CommandBlockerRank.java index 4b2055ad..3bacbcf1 100644 --- a/src/main/java/me/totalfreedom/totalfreedommod/blocking/command/CommandBlockerRank.java +++ b/src/main/java/me/totalfreedom/totalfreedommod/blocking/command/CommandBlockerRank.java @@ -2,18 +2,15 @@ package me.totalfreedom.totalfreedommod.blocking.command; import me.totalfreedom.totalfreedommod.TotalFreedomMod; import me.totalfreedom.totalfreedommod.rank.Rank; -import me.totalfreedom.totalfreedommod.staff.StaffMember; +import me.totalfreedom.totalfreedommod.admin.Admin; import org.bukkit.command.CommandSender; -import org.bukkit.entity.Player; public enum CommandBlockerRank { - ANYONE("a"), OP("o"), - SUPER("s"), - TELNET("t"), - SENIOR("c"), + ADMIN("a"), + SENIOR_ADMIN("s"), NOBODY("n"); // private final String token; @@ -35,19 +32,14 @@ public enum CommandBlockerRank public static CommandBlockerRank fromSender(CommandSender sender) { - if (!(sender instanceof Player)) + Admin admin = TotalFreedomMod.plugin().al.getAdmin(sender); + if (admin != null) { - return TELNET; - } - - StaffMember staffMember = TotalFreedomMod.plugin().sl.getAdmin(sender); - if (staffMember != null) - { - if (staffMember.getRank() == Rank.SENIOR_ADMIN) + if (admin.getRank() == Rank.SENIOR_ADMIN) { - return SENIOR; + return SENIOR_ADMIN; } - return SUPER; + return ADMIN; } if (sender.isOp()) diff --git a/src/main/java/me/totalfreedom/totalfreedommod/bridge/BukkitTelnetBridge.java b/src/main/java/me/totalfreedom/totalfreedommod/bridge/BukkitTelnetBridge.java index 1e55ba7f..b5909fff 100644 --- a/src/main/java/me/totalfreedom/totalfreedommod/bridge/BukkitTelnetBridge.java +++ b/src/main/java/me/totalfreedom/totalfreedommod/bridge/BukkitTelnetBridge.java @@ -11,7 +11,7 @@ import me.totalfreedom.bukkittelnet.api.TelnetRequestDataTagsEvent; import me.totalfreedom.bukkittelnet.session.ClientSession; import me.totalfreedom.totalfreedommod.FreedomService; import me.totalfreedom.totalfreedommod.rank.Rank; -import me.totalfreedom.totalfreedommod.staff.StaffMember; +import me.totalfreedom.totalfreedommod.admin.Admin; import me.totalfreedom.totalfreedommod.util.FLog; import org.bukkit.entity.Player; import org.bukkit.event.EventHandler; @@ -43,15 +43,15 @@ public class BukkitTelnetBridge extends FreedomService return; } - final StaffMember staffMember = plugin.sl.getEntryByIpFuzzy(ip); + final Admin admin = plugin.al.getEntryByIpFuzzy(ip); - if (staffMember == null || !staffMember.isActive() || !staffMember.getRank().hasConsoleVariant()) + if (admin == null || !admin.isActive() || !admin.getRank().hasConsoleVariant()) { return; } event.setBypassPassword(true); - event.setName(staffMember.getName()); + event.setName(admin.getName()); } @EventHandler(priority = EventPriority.NORMAL) @@ -77,14 +77,14 @@ public class BukkitTelnetBridge extends FreedomService boolean isTelnetAdmin = false; boolean isSeniorAdmin = false; - final StaffMember staffMember = plugin.sl.getAdmin(player); - if (staffMember != null) + final Admin admin = plugin.al.getAdmin(player); + if (admin != null) { - boolean active = staffMember.isActive(); + boolean active = admin.isActive(); isAdmin = active; - isSeniorAdmin = active && staffMember.getRank() == Rank.SENIOR_ADMIN; - isTelnetAdmin = active && (isSeniorAdmin || staffMember.getRank() == Rank.ADMIN); + isSeniorAdmin = active && admin.getRank() == Rank.SENIOR_ADMIN; + isTelnetAdmin = active && (isSeniorAdmin || admin.getRank() == Rank.ADMIN); } playerTags.put("tfm.admin.isAdmin", isAdmin); @@ -121,22 +121,22 @@ public class BukkitTelnetBridge extends FreedomService return bukkitTelnetPlugin; } - public List getConnectedAdmins() + public List getConnectedAdmins() { - List staffMembers = new ArrayList<>(); + List admins = new ArrayList<>(); final BukkitTelnet telnet = getBukkitTelnetPlugin(); if (telnet != null) { for (ClientSession session : telnet.appender.getSessions()) { - StaffMember staffMember = plugin.sl.getEntryByName(session.getUserName().toLowerCase()); - if (staffMember != null && !staffMembers.contains(staffMember)) + Admin admin = plugin.al.getEntryByName(session.getUserName().toLowerCase()); + if (admin != null && !admins.contains(admin)) { - staffMembers.add(staffMember); + admins.add(admin); } } } - return staffMembers; + return admins; } public void killTelnetSessions(final String name) diff --git a/src/main/java/me/totalfreedom/totalfreedommod/bridge/LibsDisguisesBridge.java b/src/main/java/me/totalfreedom/totalfreedommod/bridge/LibsDisguisesBridge.java index e70a60cd..0604eff3 100644 --- a/src/main/java/me/totalfreedom/totalfreedommod/bridge/LibsDisguisesBridge.java +++ b/src/main/java/me/totalfreedom/totalfreedommod/bridge/LibsDisguisesBridge.java @@ -46,7 +46,7 @@ public class LibsDisguisesBridge extends FreedomService return libsDisguisesPlugin; } - public void undisguiseAll(boolean staff) + public void undisguiseAll(boolean admins) { try { @@ -61,7 +61,7 @@ public class LibsDisguisesBridge extends FreedomService { if (DisguiseAPI.isDisguised(player)) { - if (!staff && plugin.sl.isStaff(player)) + if (!admins && plugin.al.isAdmin(player)) { continue; } diff --git a/src/main/java/me/totalfreedom/totalfreedommod/caging/Cager.java b/src/main/java/me/totalfreedom/totalfreedommod/caging/Cager.java index 5307d562..05e40e5e 100644 --- a/src/main/java/me/totalfreedom/totalfreedommod/caging/Cager.java +++ b/src/main/java/me/totalfreedom/totalfreedommod/caging/Cager.java @@ -32,7 +32,7 @@ public class Cager extends FreedomService { Player player = event.getPlayer(); if (player == null - || plugin.sl.isStaff(player)) + || plugin.al.isAdmin(player)) { return; } diff --git a/src/main/java/me/totalfreedom/totalfreedommod/command/Command_staffchat.java b/src/main/java/me/totalfreedom/totalfreedommod/command/Command_adminchat.java similarity index 66% rename from src/main/java/me/totalfreedom/totalfreedommod/command/Command_staffchat.java rename to src/main/java/me/totalfreedom/totalfreedommod/command/Command_adminchat.java index df993a02..147d8754 100644 --- a/src/main/java/me/totalfreedom/totalfreedommod/command/Command_staffchat.java +++ b/src/main/java/me/totalfreedom/totalfreedommod/command/Command_adminchat.java @@ -8,10 +8,9 @@ import org.bukkit.command.CommandSender; import org.bukkit.entity.Player; @CommandPermissions(level = Rank.ADMIN, source = SourceType.BOTH) -@CommandParameters(description = "Talk privately with other staff on the server.", usage = "/ [message]", aliases = "o,sc") -public class Command_staffchat extends FreedomCommand +@CommandParameters(description = "Talk privately with other admins on the server.", usage = "/ [message]", aliases = "o,sc") +public class Command_adminchat extends FreedomCommand { - @Override public boolean run(CommandSender sender, Player playerSender, Command cmd, String commandLabel, String[] args, boolean senderIsConsole) { @@ -19,17 +18,17 @@ public class Command_staffchat extends FreedomCommand { if (senderIsConsole) { - msg("You must be in-game to toggle staff chat, it cannot be toggled via CONSOLE or Telnet."); + msg("You must be in-game to toggle admin chat, it cannot be toggled via CONSOLE or Telnet."); return true; } FPlayer userinfo = plugin.pl.getPlayer(playerSender); - userinfo.setStaffChat(!userinfo.inStaffChat()); - msg("Toggled your staff chat " + (userinfo.inStaffChat() ? "on" : "off") + "."); + userinfo.setAdminChat(!userinfo.inAdminChat()); + msg("Toggled your admin chat " + (userinfo.inAdminChat() ? "on" : "off") + "."); } else { - plugin.cm.staffChat(sender, StringUtils.join(args, " ")); + plugin.cm.adminChat(sender, StringUtils.join(args, " ")); } return true; } diff --git a/src/main/java/me/totalfreedom/totalfreedommod/command/Command_staffinfo.java b/src/main/java/me/totalfreedom/totalfreedommod/command/Command_admininfo.java similarity index 72% rename from src/main/java/me/totalfreedom/totalfreedommod/command/Command_staffinfo.java rename to src/main/java/me/totalfreedom/totalfreedommod/command/Command_admininfo.java index 01acf403..86d48bcc 100644 --- a/src/main/java/me/totalfreedom/totalfreedommod/command/Command_staffinfo.java +++ b/src/main/java/me/totalfreedom/totalfreedommod/command/Command_admininfo.java @@ -11,22 +11,21 @@ import org.bukkit.command.CommandSender; import org.bukkit.entity.Player; @CommandPermissions(level = Rank.OP, source = SourceType.BOTH) -@CommandParameters(description = "Information on how to apply for staff.", usage = "/", aliases = "si") -public class Command_staffinfo extends FreedomCommand +@CommandParameters(description = "Information on how to apply for admin.", usage = "/", aliases = "ai") +public class Command_admininfo extends FreedomCommand { - @Override public boolean run(CommandSender sender, Player playerSender, Command cmd, String commandLabel, String[] args, boolean senderIsConsole) { - List staffInfo = ConfigEntry.STAFF_INFO.getStringList(); + List adminInfo = ConfigEntry.ADMIN_INFO.getStringList(); - if (staffInfo.isEmpty()) + if (adminInfo.isEmpty()) { - msg("The staff information section of the config.yml file has not been configured.", ChatColor.RED); + msg("The admin information section in the config.yml file has not been configured.", ChatColor.RED); } else { - msg(FUtil.colorize(StringUtils.join(staffInfo, "\n"))); + msg(FUtil.colorize(StringUtils.join(adminInfo, "\n"))); } return true; } diff --git a/src/main/java/me/totalfreedom/totalfreedommod/command/Command_staffmode.java b/src/main/java/me/totalfreedom/totalfreedommod/command/Command_adminmode.java similarity index 74% rename from src/main/java/me/totalfreedom/totalfreedommod/command/Command_staffmode.java rename to src/main/java/me/totalfreedom/totalfreedommod/command/Command_adminmode.java index 25203b5c..a23f4c7b 100644 --- a/src/main/java/me/totalfreedom/totalfreedommod/command/Command_staffmode.java +++ b/src/main/java/me/totalfreedom/totalfreedommod/command/Command_adminmode.java @@ -11,10 +11,9 @@ import org.bukkit.command.CommandSender; import org.bukkit.entity.Player; @CommandPermissions(level = Rank.ADMIN, source = SourceType.BOTH) -@CommandParameters(description = "Denies joining of operators and only allows staff members to join.", usage = "/ [on | off]") -public class Command_staffmode extends FreedomCommand +@CommandParameters(description = "Denies joining of operators and only allows admins to join.", usage = "/ [on | off]") +public class Command_adminmode extends FreedomCommand { - @Override public boolean run(CommandSender sender, Player playerSender, Command cmd, String commandLabel, String[] args, boolean senderIsConsole) { @@ -25,19 +24,19 @@ public class Command_staffmode extends FreedomCommand if (args[0].equalsIgnoreCase("off")) { - ConfigEntry.STAFF_ONLY_MODE.setBoolean(false); - FUtil.staffAction(sender.getName(), "Opening the server to all players.", true); + ConfigEntry.ADMIN_ONLY_MODE.setBoolean(false); + FUtil.adminAction(sender.getName(), "Opening the server to all players.", true); return true; } else if (args[0].equalsIgnoreCase("on")) { - ConfigEntry.STAFF_ONLY_MODE.setBoolean(true); - FUtil.staffAction(sender.getName(), "Closing the server to non-staff.", true); + ConfigEntry.ADMIN_ONLY_MODE.setBoolean(true); + FUtil.adminAction(sender.getName(), "Closing the server to non-admins.", true); for (Player player : server.getOnlinePlayers()) { - if (!isStaff(player)) + if (!isAdmin(player)) { - player.kickPlayer("Server is now closed to non-staff."); + player.kickPlayer("Server is now closed to non-admins."); } } return true; @@ -49,7 +48,7 @@ public class Command_staffmode extends FreedomCommand @Override public List getTabCompleteOptions(CommandSender sender, Command command, String alias, String[] args) { - if (args.length == 1 && plugin.sl.isStaff(sender) && !(sender instanceof Player)) + if (args.length == 1 && plugin.al.isAdmin(sender) && !(sender instanceof Player)) { return Arrays.asList("on", "off"); } diff --git a/src/main/java/me/totalfreedom/totalfreedommod/command/Command_staffworld.java b/src/main/java/me/totalfreedom/totalfreedommod/command/Command_adminworld.java similarity index 85% rename from src/main/java/me/totalfreedom/totalfreedommod/command/Command_staffworld.java rename to src/main/java/me/totalfreedom/totalfreedommod/command/Command_adminworld.java index 203429cd..39ae50d6 100644 --- a/src/main/java/me/totalfreedom/totalfreedommod/command/Command_staffworld.java +++ b/src/main/java/me/totalfreedom/totalfreedommod/command/Command_adminworld.java @@ -13,12 +13,11 @@ import org.bukkit.command.CommandSender; import org.bukkit.entity.Player; @CommandPermissions(level = Rank.OP, source = SourceType.BOTH) -@CommandParameters(description = "Allows for staff to configure time, and weather of the StaffWorld, and allows for staff and ops to go to the StaffWorld.", +@CommandParameters(description = "Allows for admins to configure time, and weather of the AdminWorld, and allows for admins and ops to go to the AdminWorld.", usage = "/ [time | weather ]", - aliases = "sw") -public class Command_staffworld extends FreedomCommand + aliases = "aw") +public class Command_adminworld extends FreedomCommand { - private enum CommandMode { TELEPORT, TIME, WEATHER @@ -61,24 +60,24 @@ public class Command_staffworld extends FreedomCommand return false; } - World staffWorld = null; + World adminWorld = null; try { - staffWorld = plugin.wm.staffworld.getWorld(); + adminWorld = plugin.wm.adminworld.getWorld(); } catch (Exception ex) { } - if (staffWorld == null || playerSender.getWorld() == staffWorld) + if (adminWorld == null || playerSender.getWorld() == adminWorld) { msg("Going to the main world."); PaperLib.teleportAsync(playerSender, server.getWorlds().get(0).getSpawnLocation()); } else { - msg("Going to the StaffWorld."); - plugin.wm.staffworld.sendToWorld(playerSender); + msg("Going to the AdminWorld."); + plugin.wm.adminworld.sendToWorld(playerSender); } break; } @@ -91,8 +90,8 @@ public class Command_staffworld extends FreedomCommand WorldTime timeOfDay = WorldTime.getByAlias(args[1]); if (timeOfDay != null) { - plugin.wm.staffworld.setTimeOfDay(timeOfDay); - msg("StaffWorld time set to: " + timeOfDay.name()); + plugin.wm.adminworld.setTimeOfDay(timeOfDay); + msg("AdminWorld time set to: " + timeOfDay.name()); } else { @@ -115,8 +114,8 @@ public class Command_staffworld extends FreedomCommand WorldWeather weatherMode = WorldWeather.getByAlias(args[1]); if (weatherMode != null) { - plugin.wm.staffworld.setWeatherMode(weatherMode); - msg("StaffWorld weather set to: " + weatherMode.name()); + plugin.wm.adminworld.setWeatherMode(weatherMode); + msg("AdminWorld weather set to: " + weatherMode.name()); } else { @@ -152,7 +151,7 @@ public class Command_staffworld extends FreedomCommand // TODO: Redo this properly private void assertCommandPerms(CommandSender sender, Player playerSender) throws PermissionDeniedException { - if (!(sender instanceof Player) || playerSender == null || !isStaff(sender)) + if (!(sender instanceof Player) || playerSender == null || !isAdmin(sender)) { throw new PermissionDeniedException(); } @@ -177,7 +176,7 @@ public class Command_staffworld extends FreedomCommand @Override public List getTabCompleteOptions(CommandSender sender, Command command, String alias, String[] args) { - if (!plugin.sl.isStaff(sender)) + if (!plugin.al.isAdmin(sender)) { return Collections.emptyList(); } diff --git a/src/main/java/me/totalfreedom/totalfreedommod/command/Command_adventure.java b/src/main/java/me/totalfreedom/totalfreedommod/command/Command_adventure.java index a26ae92b..60719852 100644 --- a/src/main/java/me/totalfreedom/totalfreedommod/command/Command_adventure.java +++ b/src/main/java/me/totalfreedom/totalfreedommod/command/Command_adventure.java @@ -37,7 +37,7 @@ public class Command_adventure extends FreedomCommand targetPlayer.setGameMode(GameMode.ADVENTURE); } - FUtil.staffAction(sender.getName(), "Changing everyone's gamemode to adventure", false); + FUtil.adminAction(sender.getName(), "Changing everyone's gamemode to adventure", false); msg("Your gamemode has been set to adventure."); return true; } diff --git a/src/main/java/me/totalfreedom/totalfreedommod/command/Command_aeclear.java b/src/main/java/me/totalfreedom/totalfreedommod/command/Command_aeclear.java index a73d9656..2255e516 100644 --- a/src/main/java/me/totalfreedom/totalfreedommod/command/Command_aeclear.java +++ b/src/main/java/me/totalfreedom/totalfreedommod/command/Command_aeclear.java @@ -17,7 +17,7 @@ public class Command_aeclear extends FreedomCommand @Override public boolean run(CommandSender sender, Player playerSender, Command cmd, String commandLabel, String[] args, boolean senderIsConsole) { - FUtil.staffAction(sender.getName(), "Removing all area effect clouds.", true); + FUtil.adminAction(sender.getName(), "Removing all area effect clouds.", true); int removed = 0; for (World world : server.getWorlds()) { diff --git a/src/main/java/me/totalfreedom/totalfreedommod/command/Command_attributelist.java b/src/main/java/me/totalfreedom/totalfreedommod/command/Command_attributelist.java deleted file mode 100644 index 8cb9a189..00000000 --- a/src/main/java/me/totalfreedom/totalfreedommod/command/Command_attributelist.java +++ /dev/null @@ -1,30 +0,0 @@ -package me.totalfreedom.totalfreedommod.command; - -import me.totalfreedom.totalfreedommod.rank.Rank; -import org.bukkit.attribute.Attribute; -import org.bukkit.command.Command; -import org.bukkit.command.CommandSender; -import org.bukkit.entity.Player; - -@CommandPermissions(level = Rank.OP, source = SourceType.BOTH) -@CommandParameters(description = "Lists all possible attributes.", usage = "/") -public class Command_attributelist extends FreedomCommand -{ - - @Override - public boolean run(CommandSender sender, Player playerSender, Command cmd, String commandLabel, String[] args, boolean senderIsConsole) - { - String list = "All possible attributes: "; - - for (Attribute attribute : Attribute.values()) - { - list += attribute.name() + ", "; - } - - // Remove extra comma at the end of the list - list = list.substring(0, list.length() - 2); - - msg(list); - return true; - } -} diff --git a/src/main/java/me/totalfreedom/totalfreedommod/command/Command_ban.java b/src/main/java/me/totalfreedom/totalfreedommod/command/Command_ban.java index 9a47fa3e..51e642c9 100644 --- a/src/main/java/me/totalfreedom/totalfreedommod/command/Command_ban.java +++ b/src/main/java/me/totalfreedom/totalfreedommod/command/Command_ban.java @@ -154,7 +154,7 @@ public class Command_ban extends FreedomCommand bcast.append(" - Reason: ").append(ChatColor.YELLOW).append(reason); } msg(sender, ChatColor.GRAY + username + " has been banned and IP is: " + StringUtils.join(ips, ", ")); - FUtil.staffAction(sender.getName(), String.format(bcast.toString()), true); + FUtil.adminAction(sender.getName(), String.format(bcast.toString()), true); } // Kick player and handle others on IP diff --git a/src/main/java/me/totalfreedom/totalfreedommod/command/Command_banip.java b/src/main/java/me/totalfreedom/totalfreedommod/command/Command_banip.java index cd71ed1e..f7df8b44 100644 --- a/src/main/java/me/totalfreedom/totalfreedommod/command/Command_banip.java +++ b/src/main/java/me/totalfreedom/totalfreedommod/command/Command_banip.java @@ -72,7 +72,7 @@ public class Command_banip extends FreedomCommand { // Broadcast FLog.info(ChatColor.RED + sender.getName() + " - Banned the IP " + ip); - String message = ChatColor.RED + sender.getName() + " - Banned " + (plugin.sl.isStaff(player) ? "the IP " + ip : "an IP"); + String message = ChatColor.RED + sender.getName() + " - Banned " + (plugin.al.isAdmin(player) ? "the IP " + ip : "an IP"); player.sendMessage(message); } } diff --git a/src/main/java/me/totalfreedom/totalfreedommod/command/Command_banlist.java b/src/main/java/me/totalfreedom/totalfreedommod/command/Command_banlist.java index f48ddf23..72ae69d4 100644 --- a/src/main/java/me/totalfreedom/totalfreedommod/command/Command_banlist.java +++ b/src/main/java/me/totalfreedom/totalfreedommod/command/Command_banlist.java @@ -20,7 +20,7 @@ public class Command_banlist extends FreedomCommand { checkRank(Rank.SENIOR_ADMIN); - FUtil.staffAction(sender.getName(), "Purging the ban list", true); + FUtil.adminAction(sender.getName(), "Purging the ban list", true); int amount = plugin.bm.purge(); msg("Purged " + amount + " player bans."); return true; diff --git a/src/main/java/me/totalfreedom/totalfreedommod/command/Command_banname.java b/src/main/java/me/totalfreedom/totalfreedommod/command/Command_banname.java index 09d1171f..5f8644dd 100644 --- a/src/main/java/me/totalfreedom/totalfreedommod/command/Command_banname.java +++ b/src/main/java/me/totalfreedom/totalfreedommod/command/Command_banname.java @@ -55,7 +55,7 @@ public class Command_banname extends FreedomCommand if (!silent) { - FUtil.staffAction(sender.getName(), "Banned the name " + name, true); + FUtil.adminAction(sender.getName(), "Banned the name " + name, true); } Player player = getPlayer(name); diff --git a/src/main/java/me/totalfreedom/totalfreedommod/command/Command_bird.java b/src/main/java/me/totalfreedom/totalfreedommod/command/Command_bird.java deleted file mode 100644 index 4eb70a01..00000000 --- a/src/main/java/me/totalfreedom/totalfreedommod/command/Command_bird.java +++ /dev/null @@ -1,33 +0,0 @@ -package me.totalfreedom.totalfreedommod.command; - -import java.util.Arrays; -import java.util.List; -import java.util.Random; -import me.totalfreedom.totalfreedommod.rank.Rank; -import org.bukkit.Location; -import org.bukkit.command.Command; -import org.bukkit.command.CommandSender; -import org.bukkit.entity.EntityType; -import org.bukkit.entity.Player; - -@CommandPermissions(level = Rank.OP, source = SourceType.ONLY_IN_GAME) -@CommandParameters(description = "Spawns a random type of fish at your location.", usage = "/") -public class Command_bird extends FreedomCommand -{ - - @Override - public boolean run(CommandSender sender, Player playerSender, Command cmd, String commandLabel, String[] args, boolean senderIsConsole) - { - Location location = playerSender.getTargetBlock(null, 15).getLocation().add(0, 1, 0); - playerSender.getWorld().spawnEntity(location, getRandomFish()); - msg(":goodbird:"); - return true; - } - - public EntityType getRandomFish() - { - List fishTypes = Arrays.asList(EntityType.COD, EntityType.SALMON, EntityType.PUFFERFISH, EntityType.TROPICAL_FISH); - Random random = new Random(); - return fishTypes.get(random.nextInt(fishTypes.size())); - } -} diff --git a/src/main/java/me/totalfreedom/totalfreedommod/command/Command_blockcmd.java b/src/main/java/me/totalfreedom/totalfreedommod/command/Command_blockcmd.java index 2411091b..fece338d 100644 --- a/src/main/java/me/totalfreedom/totalfreedommod/command/Command_blockcmd.java +++ b/src/main/java/me/totalfreedom/totalfreedommod/command/Command_blockcmd.java @@ -23,7 +23,7 @@ public class Command_blockcmd extends FreedomCommand if (args[0].equals("purge")) { - FUtil.staffAction(sender.getName(), "Unblocking commands for all players", true); + FUtil.adminAction(sender.getName(), "Unblocking commands for all players", true); int counter = 0; for (Player player : server.getOnlinePlayers()) { @@ -40,18 +40,18 @@ public class Command_blockcmd extends FreedomCommand if (args[0].equals("-a")) { - FUtil.staffAction(sender.getName(), "Blocking commands for all non-staff", true); + FUtil.adminAction(sender.getName(), "Blocking commands for all non-admins", true); int counter = 0; for (Player player : server.getOnlinePlayers()) { - if (isStaff(player)) + if (isAdmin(player)) { continue; } counter += 1; plugin.pl.getPlayer(player).setCommandsBlocked(true); - msg(player, "Your commands have been blocked by a staff member.", ChatColor.RED); + msg(player, "Your commands have been blocked by an admin.", ChatColor.RED); } msg("Blocked commands for " + counter + " players."); @@ -66,9 +66,9 @@ public class Command_blockcmd extends FreedomCommand return true; } - if (isStaff(player)) + if (isAdmin(player)) { - msg(player.getName() + " is a staff member, and cannot have their commands blocked."); + msg(player.getName() + " is an admin, and cannot have their commands blocked."); return true; } @@ -76,7 +76,7 @@ public class Command_blockcmd extends FreedomCommand if (!playerdata.allCommandsBlocked()) { playerdata.setCommandsBlocked(true); - FUtil.staffAction(sender.getName(), "Blocking all commands for " + player.getName(), true); + FUtil.adminAction(sender.getName(), "Blocking all commands for " + player.getName(), true); msg("Blocked commands for " + player.getName() + "."); } else diff --git a/src/main/java/me/totalfreedom/totalfreedommod/command/Command_blockedit.java b/src/main/java/me/totalfreedom/totalfreedommod/command/Command_blockedit.java index 8848335a..4e74276e 100644 --- a/src/main/java/me/totalfreedom/totalfreedommod/command/Command_blockedit.java +++ b/src/main/java/me/totalfreedom/totalfreedommod/command/Command_blockedit.java @@ -46,7 +46,7 @@ public class Command_blockedit extends FreedomCommand if (args[0].equals("purge")) { - FUtil.staffAction(sender.getName(), "Unblocking block modification abilities for all players.", true); + FUtil.adminAction(sender.getName(), "Unblocking block modification abilities for all players.", true); int count = 0; for (final Player player : this.server.getOnlinePlayers()) { @@ -63,11 +63,11 @@ public class Command_blockedit extends FreedomCommand if (args[0].equals("all")) { - FUtil.staffAction(sender.getName(), "Blocking block modification abilities for all non-staff.", true); + FUtil.adminAction(sender.getName(), "Blocking block modification abilities for all non-admins.", true); int counter = 0; for (final Player player : this.server.getOnlinePlayers()) { - if (!plugin.sl.isStaff(player)) + if (!plugin.al.isAdmin(player)) { final FPlayer playerdata = plugin.pl.getPlayer(player); playerdata.setEditBlocked(true); @@ -105,20 +105,20 @@ public class Command_blockedit extends FreedomCommand final FPlayer pd = plugin.pl.getPlayer(player2); if (pd.isEditBlocked()) { - FUtil.staffAction(sender.getName(), "Unblocking block modification abilities for " + player2.getName(), true); + FUtil.adminAction(sender.getName(), "Unblocking block modification abilities for " + player2.getName(), true); pd.setEditBlocked(false); msg("Unblocking block modification abilities for " + player2.getName()); msg(player2, "Your block modification abilities have been restored.", ChatColor.RED); } else { - if (plugin.sl.isStaff(player2)) + if (plugin.al.isAdmin(player2)) { - msg(player2.getName() + " is a staff member, and cannot have their block edits blocked."); + msg(player2.getName() + " is an admin, and cannot have their block edits blocked."); return true; } - FUtil.staffAction(sender.getName(), "Blocking block modification abilities for " + player2.getName(), true); + FUtil.adminAction(sender.getName(), "Blocking block modification abilities for " + player2.getName(), true); pd.setEditBlocked(true); if (smite) diff --git a/src/main/java/me/totalfreedom/totalfreedommod/command/Command_blockpvp.java b/src/main/java/me/totalfreedom/totalfreedommod/command/Command_blockpvp.java index 93ce68f3..678a8d67 100644 --- a/src/main/java/me/totalfreedom/totalfreedommod/command/Command_blockpvp.java +++ b/src/main/java/me/totalfreedom/totalfreedommod/command/Command_blockpvp.java @@ -46,7 +46,7 @@ public class Command_blockpvp extends FreedomCommand if (args[0].equals("purge")) { - FUtil.staffAction(sender.getName(), "Enabling PVP for all players.", true); + FUtil.adminAction(sender.getName(), "Enabling PVP for all players.", true); int count = 0; for (Player player : server.getOnlinePlayers()) { @@ -64,11 +64,11 @@ public class Command_blockpvp extends FreedomCommand if (args[0].equals("all")) { - FUtil.staffAction(sender.getName(), "Disabling PVP for all non-staff", true); + FUtil.adminAction(sender.getName(), "Disabling PVP for all non-admins", true); int counter = 0; for (Player player : server.getOnlinePlayers()) { - if (!plugin.sl.isStaff(player)) + if (!plugin.al.isAdmin(player)) { final FPlayer playerdata = plugin.pl.getPlayer(player); playerdata.setPvpBlocked(true); @@ -106,20 +106,20 @@ public class Command_blockpvp extends FreedomCommand final FPlayer pd = plugin.pl.getPlayer(p); if (pd.isPvpBlocked()) { - FUtil.staffAction(sender.getName(), "Enabling PVP for " + p.getName(), true); + FUtil.adminAction(sender.getName(), "Enabling PVP for " + p.getName(), true); pd.setPvpBlocked(false); msg("Enabling PVP for " + p.getName()); msg(p, "Your PVP have been enabled.", ChatColor.GREEN); } else { - if (plugin.sl.isStaff(p)) + if (plugin.al.isAdmin(p)) { - msg(p.getName() + " is a staff member, and cannot have their PVP disabled."); + msg(p.getName() + " is an admin and cannot have their PVP disabled."); return true; } - FUtil.staffAction(sender.getName(), "Disabling PVP for " + p.getName(), true); + FUtil.adminAction(sender.getName(), "Disabling PVP for " + p.getName(), true); pd.setPvpBlocked(true); if (smite) { diff --git a/src/main/java/me/totalfreedom/totalfreedommod/command/Command_blockredstone.java b/src/main/java/me/totalfreedom/totalfreedommod/command/Command_blockredstone.java index ed9eb156..0da1726a 100644 --- a/src/main/java/me/totalfreedom/totalfreedommod/command/Command_blockredstone.java +++ b/src/main/java/me/totalfreedom/totalfreedommod/command/Command_blockredstone.java @@ -18,14 +18,14 @@ public class Command_blockredstone extends FreedomCommand if (ConfigEntry.ALLOW_REDSTONE.getBoolean()) { ConfigEntry.ALLOW_REDSTONE.setBoolean(false); - FUtil.staffAction(sender.getName(), "Blocking all redstone", true); + FUtil.adminAction(sender.getName(), "Blocking all redstone", true); new BukkitRunnable() { public void run() { if (!ConfigEntry.ALLOW_REDSTONE.getBoolean()) { - FUtil.staffAction("TotalFreedom", "Unblocking all redstone", false); + FUtil.adminAction("TotalFreedom", "Unblocking all redstone", false); ConfigEntry.ALLOW_REDSTONE.setBoolean(true); } } @@ -34,7 +34,7 @@ public class Command_blockredstone extends FreedomCommand else { ConfigEntry.ALLOW_REDSTONE.setBoolean(true); - FUtil.staffAction(sender.getName(), "Unblocking all redstone", true); + FUtil.adminAction(sender.getName(), "Unblocking all redstone", true); } return true; } diff --git a/src/main/java/me/totalfreedom/totalfreedommod/command/Command_cage.java b/src/main/java/me/totalfreedom/totalfreedommod/command/Command_cage.java index 5e9fbdbe..ab756e20 100644 --- a/src/main/java/me/totalfreedom/totalfreedommod/command/Command_cage.java +++ b/src/main/java/me/totalfreedom/totalfreedommod/command/Command_cage.java @@ -30,7 +30,7 @@ public class Command_cage extends FreedomCommand String skullName = null; if ("purge".equals(args[0])) { - FUtil.staffAction(sender.getName(), "Uncaging all players", true); + FUtil.adminAction(sender.getName(), "Uncaging all players", true); for (Player player : server.getOnlinePlayers()) { final FPlayer fPlayer = plugin.pl.getPlayer(player); @@ -101,11 +101,11 @@ public class Command_cage extends FreedomCommand if (outerMaterial == Material.PLAYER_HEAD) { - FUtil.staffAction(sender.getName(), "Caging " + player.getName() + " in " + skullName, true); + FUtil.adminAction(sender.getName(), "Caging " + player.getName() + " in " + skullName, true); } else { - FUtil.staffAction(sender.getName(), "Caging " + player.getName(), true); + FUtil.adminAction(sender.getName(), "Caging " + player.getName(), true); } return true; } @@ -113,7 +113,7 @@ public class Command_cage extends FreedomCommand @Override public List getTabCompleteOptions(CommandSender sender, Command command, String alias, String[] args) { - if (!plugin.sl.isStaff(sender)) + if (!plugin.al.isAdmin(sender)) { return null; } diff --git a/src/main/java/me/totalfreedom/totalfreedommod/command/Command_cartsit.java b/src/main/java/me/totalfreedom/totalfreedommod/command/Command_cartsit.java index 722c4a1b..fe66cdd4 100644 --- a/src/main/java/me/totalfreedom/totalfreedommod/command/Command_cartsit.java +++ b/src/main/java/me/totalfreedom/totalfreedommod/command/Command_cartsit.java @@ -16,7 +16,7 @@ public class Command_cartsit extends FreedomCommand { Player targetPlayer = playerSender; - if (args.length == 1 && plugin.sl.isStaff(sender)) + if (args.length == 1 && plugin.al.isAdmin(sender)) { targetPlayer = getPlayer(args[0]); diff --git a/src/main/java/me/totalfreedom/totalfreedommod/command/Command_clearchat.java b/src/main/java/me/totalfreedom/totalfreedommod/command/Command_clearchat.java index 1edafd1a..23efe0b2 100644 --- a/src/main/java/me/totalfreedom/totalfreedommod/command/Command_clearchat.java +++ b/src/main/java/me/totalfreedom/totalfreedommod/command/Command_clearchat.java @@ -16,7 +16,7 @@ public class Command_clearchat extends FreedomCommand { for (Player player : server.getOnlinePlayers()) { - if (!plugin.sl.isStaff(player)) + if (!plugin.al.isAdmin(player)) { for (int i = 0; i < 100; i++) { @@ -24,7 +24,7 @@ public class Command_clearchat extends FreedomCommand } } } - FUtil.staffAction(sender.getName(), "Cleared chat", true); + FUtil.adminAction(sender.getName(), "Cleared chat", true); return true; } } diff --git a/src/main/java/me/totalfreedom/totalfreedommod/command/Command_cleardiscordqueue.java b/src/main/java/me/totalfreedom/totalfreedommod/command/Command_cleardiscordqueue.java index 8346fb70..86bf3470 100644 --- a/src/main/java/me/totalfreedom/totalfreedommod/command/Command_cleardiscordqueue.java +++ b/src/main/java/me/totalfreedom/totalfreedommod/command/Command_cleardiscordqueue.java @@ -9,7 +9,6 @@ import org.bukkit.entity.Player; @CommandParameters(description = "Clear the discord message queue.", usage = "/") public class Command_cleardiscordqueue extends FreedomCommand { - @Override public boolean run(CommandSender sender, Player playerSender, Command cmd, String commandLabel, String[] args, boolean senderIsConsole) { diff --git a/src/main/java/me/totalfreedom/totalfreedommod/command/Command_clearinventory.java b/src/main/java/me/totalfreedom/totalfreedommod/command/Command_clearinventory.java index e946d2bc..f005d52f 100644 --- a/src/main/java/me/totalfreedom/totalfreedommod/command/Command_clearinventory.java +++ b/src/main/java/me/totalfreedom/totalfreedommod/command/Command_clearinventory.java @@ -29,11 +29,11 @@ public class Command_clearinventory extends FreedomCommand } else { - if (plugin.sl.isStaff(sender)) + if (plugin.al.isAdmin(sender)) { if (args[0].equals("-a")) { - FUtil.staffAction(sender.getName(), "Clearing everyone's inventory", true); + FUtil.adminAction(sender.getName(), "Clearing everyone's inventory", true); for (Player player : server.getOnlinePlayers()) { player.getInventory().clear(); @@ -67,7 +67,7 @@ public class Command_clearinventory extends FreedomCommand @Override public List getTabCompleteOptions(CommandSender sender, Command command, String alias, String[] args) { - if (args.length == 1 && plugin.sl.isStaff(sender)) + if (args.length == 1 && plugin.al.isAdmin(sender)) { List players = FUtil.getPlayerList(); players.add("-a"); diff --git a/src/main/java/me/totalfreedom/totalfreedommod/command/Command_clownfish.java b/src/main/java/me/totalfreedom/totalfreedommod/command/Command_clownfish.java index 11338c59..c39cee74 100644 --- a/src/main/java/me/totalfreedom/totalfreedommod/command/Command_clownfish.java +++ b/src/main/java/me/totalfreedom/totalfreedommod/command/Command_clownfish.java @@ -11,7 +11,6 @@ import org.bukkit.entity.Player; @CommandParameters(description = "Obtain a clown fish", usage = "/") public class Command_clownfish extends FreedomCommand { - @Override public boolean run(CommandSender sender, Player playerSender, Command cmd, String commandLabel, String[] args, boolean senderIsConsole) { diff --git a/src/main/java/me/totalfreedom/totalfreedommod/command/Command_cmdspy.java b/src/main/java/me/totalfreedom/totalfreedommod/command/Command_cmdspy.java index abb2b8e8..e98362cf 100644 --- a/src/main/java/me/totalfreedom/totalfreedommod/command/Command_cmdspy.java +++ b/src/main/java/me/totalfreedom/totalfreedommod/command/Command_cmdspy.java @@ -1,7 +1,7 @@ package me.totalfreedom.totalfreedommod.command; import me.totalfreedom.totalfreedommod.rank.Rank; -import me.totalfreedom.totalfreedommod.staff.StaffMember; +import me.totalfreedom.totalfreedommod.admin.Admin; import org.bukkit.command.Command; import org.bukkit.command.CommandSender; import org.bukkit.entity.Player; @@ -14,11 +14,11 @@ public class Command_cmdspy extends FreedomCommand @Override public boolean run(CommandSender sender, Player playerSender, Command cmd, String commandLabel, String[] args, boolean senderIsConsole) { - StaffMember staffMember = plugin.sl.getAdmin(playerSender); - staffMember.setCommandSpy(!staffMember.getCommandSpy()); - msg("CommandSpy " + (staffMember.getCommandSpy() ? "enabled." : "disabled.")); - plugin.sl.save(staffMember); - plugin.sl.updateTables(); + Admin admin = plugin.al.getAdmin(playerSender); + admin.setCommandSpy(!admin.getCommandSpy()); + msg("CommandSpy " + (admin.getCommandSpy() ? "enabled." : "disabled.")); + plugin.al.save(admin); + plugin.al.updateTables(); return true; } diff --git a/src/main/java/me/totalfreedom/totalfreedommod/command/Command_colorme.java b/src/main/java/me/totalfreedom/totalfreedommod/command/Command_colorme.java deleted file mode 100644 index 97b3ef7e..00000000 --- a/src/main/java/me/totalfreedom/totalfreedommod/command/Command_colorme.java +++ /dev/null @@ -1,59 +0,0 @@ -package me.totalfreedom.totalfreedommod.command; - -import java.util.Iterator; -import java.util.Map; -import me.totalfreedom.totalfreedommod.rank.Rank; -import me.totalfreedom.totalfreedommod.util.FUtil; -import org.apache.commons.lang.StringUtils; -import org.bukkit.ChatColor; -import org.bukkit.command.Command; -import org.bukkit.command.CommandSender; -import org.bukkit.entity.Player; - -@CommandPermissions(level = Rank.OP, source = SourceType.ONLY_IN_GAME) -@CommandParameters(description = "Essentials Interface Command - Set your nickname to a certain color.", usage = "/ ") -public class Command_colorme extends FreedomCommand -{ - - @Override - public boolean run(CommandSender sender, Player playerSender, Command cmd, String commandLabel, String[] args, boolean senderIsConsole) - { - if (args.length != 1) - { - return false; - } - - if ("list".equalsIgnoreCase(args[0])) - { - msg("Colors: " + StringUtils.join(FUtil.CHAT_COLOR_NAMES.keySet(), ", ")); - return true; - } - - final String needle = args[0].trim().toLowerCase(); - ChatColor color = null; - final Iterator> it = FUtil.CHAT_COLOR_NAMES.entrySet().iterator(); - while (it.hasNext()) - { - final Map.Entry entry = it.next(); - if (entry.getKey().contains(needle)) - { - color = entry.getValue(); - break; - } - } - - if (color == null) - { - msg("Invalid color: " + needle + " - Use \"/colorme list\" to list colors."); - return true; - } - - final String newNick = color + ChatColor.stripColor(playerSender.getDisplayName()).trim() + ChatColor.WHITE; - - plugin.esb.setNickname(sender.getName(), newNick); - - msg("Your nickname is now: " + newNick); - - return true; - } -} diff --git a/src/main/java/me/totalfreedom/totalfreedommod/command/Command_commandlist.java b/src/main/java/me/totalfreedom/totalfreedommod/command/Command_commandlist.java deleted file mode 100644 index d4a1fe56..00000000 --- a/src/main/java/me/totalfreedom/totalfreedommod/command/Command_commandlist.java +++ /dev/null @@ -1,53 +0,0 @@ -package me.totalfreedom.totalfreedommod.command; - -import java.util.ArrayList; -import java.util.Collections; -import java.util.List; -import java.util.Map; -import java.util.Map.Entry; -import me.totalfreedom.totalfreedommod.rank.Rank; -import org.apache.commons.lang.StringUtils; -import org.bukkit.command.Command; -import org.bukkit.command.CommandSender; -import org.bukkit.entity.Player; -import org.bukkit.plugin.Plugin; -import org.bukkit.plugin.PluginDescriptionFile; - -@CommandPermissions(level = Rank.NON_OP, source = SourceType.BOTH) -@CommandParameters(description = "Show all commands for all server plugins.", usage = "/", aliases = "cmdlist") -public class Command_commandlist extends FreedomCommand -{ - - @Override - public boolean run(CommandSender sender, Player playerSender, Command cmd, String commandLabel, String[] args, boolean senderIsConsole) - { - List commands = new ArrayList<>(); - - for (Plugin targetPlugin : server.getPluginManager().getPlugins()) - { - try - { - PluginDescriptionFile desc = targetPlugin.getDescription(); - Map> map = desc.getCommands(); - - if (map != null) - { - for (Entry> entry : map.entrySet()) - { - String command_name = entry.getKey(); - commands.add(command_name); - } - } - } - catch (Throwable ex) - { - } - } - - Collections.sort(commands); - - sender.sendMessage(StringUtils.join(commands, ", ")); - - return true; - } -} diff --git a/src/main/java/me/totalfreedom/totalfreedommod/command/Command_creative.java b/src/main/java/me/totalfreedom/totalfreedommod/command/Command_creative.java index 5593c3e3..e37971ff 100644 --- a/src/main/java/me/totalfreedom/totalfreedommod/command/Command_creative.java +++ b/src/main/java/me/totalfreedom/totalfreedommod/command/Command_creative.java @@ -37,7 +37,7 @@ public class Command_creative extends FreedomCommand targetPlayer.setGameMode(GameMode.CREATIVE); } - FUtil.staffAction(sender.getName(), "Changing everyone's gamemode to creative", false); + FUtil.adminAction(sender.getName(), "Changing everyone's gamemode to creative", false); msg("Your gamemode has been set to creative."); return true; } diff --git a/src/main/java/me/totalfreedom/totalfreedommod/command/Command_curse.java b/src/main/java/me/totalfreedom/totalfreedommod/command/Command_curse.java deleted file mode 100644 index bd6ec98a..00000000 --- a/src/main/java/me/totalfreedom/totalfreedommod/command/Command_curse.java +++ /dev/null @@ -1,66 +0,0 @@ -package me.totalfreedom.totalfreedommod.command; - -import java.util.Collections; -import java.util.List; -import me.totalfreedom.totalfreedommod.rank.Rank; -import me.totalfreedom.totalfreedommod.util.FUtil; -import org.bukkit.ChatColor; -import org.bukkit.command.Command; -import org.bukkit.command.CommandSender; -import org.bukkit.entity.Player; - -@CommandPermissions(level = Rank.SENIOR_ADMIN, source = SourceType.ONLY_IN_GAME) -@CommandParameters(description = "Curse someone - sends a cursed texture pack to the specified player.", usage = "/ ") -public class Command_curse extends FreedomCommand -{ - - /* The only problem with this is someone can prevent themself from being cursed by declining to download the - resource pack. However, if they hit yes, then you can curse them whenever you want and they can't stop it unless - they go into their server settings. and set server resource packs to prompt or disabled */ - - @Override - public boolean run(CommandSender sender, Player playerSender, Command cmd, String commandLabel, String[] args, boolean senderIsConsole) - { - - if (!FUtil.isExecutive(sender.getName())) - { - return noPerms(); - } - - if (args.length == 0) - { - return false; - } - - final Player player = getPlayer(args[0]); - - if (player == null) - { - msg(FreedomCommand.PLAYER_NOT_FOUND); - return true; - } - - if (plugin.cul.cursedPlayers.containsKey(player)) - { - msg("Already attempting to curse!", ChatColor.RED); - return true; - } - - player.setResourcePack("http://play.totalfreedom.me/cursed.zip"); - msg("Attempting to curse " + player.getName(), ChatColor.GREEN); - plugin.cul.cursedPlayers.put(player, playerSender); - - - return true; - } - - @Override - public List getTabCompleteOptions(CommandSender sender, Command command, String alias, String[] args) - { - if (args.length == 1 && plugin.sl.isStaff(sender) && FUtil.isExecutive(sender.getName())) - { - return FUtil.getPlayerList(); - } - return Collections.emptyList(); - } -} diff --git a/src/main/java/me/totalfreedom/totalfreedommod/command/Command_denick.java b/src/main/java/me/totalfreedom/totalfreedommod/command/Command_denick.java index a5ee04a4..cc90c8f2 100644 --- a/src/main/java/me/totalfreedom/totalfreedommod/command/Command_denick.java +++ b/src/main/java/me/totalfreedom/totalfreedommod/command/Command_denick.java @@ -20,7 +20,7 @@ public class Command_denick extends FreedomCommand return true; } - FUtil.staffAction(sender.getName(), "Removing all nicknames", false); + FUtil.adminAction(sender.getName(), "Removing all nicknames", false); for (Player player : server.getOnlinePlayers()) { diff --git a/src/main/java/me/totalfreedom/totalfreedommod/command/Command_deop.java b/src/main/java/me/totalfreedom/totalfreedommod/command/Command_deop.java index b5665c98..73e18112 100644 --- a/src/main/java/me/totalfreedom/totalfreedommod/command/Command_deop.java +++ b/src/main/java/me/totalfreedom/totalfreedommod/command/Command_deop.java @@ -35,7 +35,7 @@ public class Command_deop extends FreedomCommand if (player.getName().toLowerCase().contains(targetName) || player.getDisplayName().toLowerCase().contains(targetName) || player.getName().contains(targetName) || player.getDisplayName().contains(targetName)) { - if (player.isOp() && !plugin.sl.isVanished(player.getName())) + if (player.isOp() && !plugin.al.isVanished(player.getName())) { matchedPlayerNames.add(player.getName()); player.setOp(false); @@ -48,7 +48,7 @@ public class Command_deop extends FreedomCommand { if (!silent) { - FUtil.staffAction(sender.getName(), "De-opping " + StringUtils.join(matchedPlayerNames, ", "), false); + FUtil.adminAction(sender.getName(), "De-opping " + StringUtils.join(matchedPlayerNames, ", "), false); } } else diff --git a/src/main/java/me/totalfreedom/totalfreedommod/command/Command_deopall.java b/src/main/java/me/totalfreedom/totalfreedommod/command/Command_deopall.java index eed3a2d8..c73e088a 100644 --- a/src/main/java/me/totalfreedom/totalfreedommod/command/Command_deopall.java +++ b/src/main/java/me/totalfreedom/totalfreedommod/command/Command_deopall.java @@ -14,7 +14,7 @@ public class Command_deopall extends FreedomCommand @Override public boolean run(CommandSender sender, Player playerSender, Command cmd, String commandLabel, String[] args, boolean senderIsConsole) { - FUtil.staffAction(sender.getName(), "De-opping all players on the server", true); + FUtil.adminAction(sender.getName(), "De-opping all players on the server", true); for (Player player : server.getOnlinePlayers()) { diff --git a/src/main/java/me/totalfreedom/totalfreedommod/command/Command_disguisetoggle.java b/src/main/java/me/totalfreedom/totalfreedommod/command/Command_disguisetoggle.java index 7099ca25..b53cd134 100644 --- a/src/main/java/me/totalfreedom/totalfreedommod/command/Command_disguisetoggle.java +++ b/src/main/java/me/totalfreedom/totalfreedommod/command/Command_disguisetoggle.java @@ -20,7 +20,7 @@ public class Command_disguisetoggle extends FreedomCommand return true; } - FUtil.staffAction(sender.getName(), (plugin.ldb.isDisguisesEnabled() ? "Disabling" : "Enabling") + " disguises", false); + FUtil.adminAction(sender.getName(), (plugin.ldb.isDisguisesEnabled() ? "Disabling" : "Enabling") + " disguises", false); if (plugin.ldb.isDisguisesEnabled()) { diff --git a/src/main/java/me/totalfreedom/totalfreedommod/command/Command_doom.java b/src/main/java/me/totalfreedom/totalfreedommod/command/Command_doom.java index d64feae7..031e77a0 100644 --- a/src/main/java/me/totalfreedom/totalfreedommod/command/Command_doom.java +++ b/src/main/java/me/totalfreedom/totalfreedommod/command/Command_doom.java @@ -5,7 +5,7 @@ import me.totalfreedom.totalfreedommod.config.ConfigEntry; import me.totalfreedom.totalfreedommod.punishments.Punishment; import me.totalfreedom.totalfreedommod.punishments.PunishmentType; import me.totalfreedom.totalfreedommod.rank.Rank; -import me.totalfreedom.totalfreedommod.staff.StaffMember; +import me.totalfreedom.totalfreedommod.admin.Admin; import me.totalfreedom.totalfreedommod.util.FUtil; import org.apache.commons.lang.ArrayUtils; import org.apache.commons.lang.StringUtils; @@ -38,23 +38,23 @@ public class Command_doom extends FreedomCommand return true; } - FUtil.staffAction(sender.getName(), "Casting oblivion over " + player.getName(), true); + FUtil.adminAction(sender.getName(), "Casting oblivion over " + player.getName(), true); FUtil.bcastMsg(player.getName() + " will be completely obliviated!", ChatColor.RED); final String ip = player.getAddress().getAddress().getHostAddress().trim(); // Remove from admin - StaffMember staffMember = getStaffMember(player); - if (staffMember != null) + Admin admin = getAdmin(player); + if (admin != null) { - FUtil.staffAction(sender.getName(), "Removing " + player.getName() + " from the staff list", true); - staffMember.setActive(false); - plugin.sl.save(staffMember); - plugin.sl.updateTables(); - plugin.ptero.updateAccountStatus(staffMember); + FUtil.adminAction(sender.getName(), "Removing " + player.getName() + " from the admin list", true); + admin.setActive(false); + plugin.al.save(admin); + plugin.al.updateTables(); + plugin.ptero.updateAccountStatus(admin); if (plugin.dc.enabled && ConfigEntry.DISCORD_ROLE_SYNC.getBoolean()) { - plugin.dc.syncRoles(staffMember, plugin.pl.getData(staffMember.getName()).getDiscordID()); + plugin.dc.syncRoles(admin, plugin.pl.getData(admin.getName()).getDiscordID()); } } @@ -120,7 +120,7 @@ public class Command_doom extends FreedomCommand public void run() { // message - FUtil.staffAction(sender.getName(), "Banning " + player.getName(), true); + FUtil.adminAction(sender.getName(), "Banning " + player.getName(), true); msg(sender, player.getName() + " has been banned and IP is: " + ip); // generate explosion diff --git a/src/main/java/me/totalfreedom/totalfreedommod/command/Command_entitywipe.java b/src/main/java/me/totalfreedom/totalfreedommod/command/Command_entitywipe.java index 377fe1f6..5a80bf5f 100644 --- a/src/main/java/me/totalfreedom/totalfreedommod/command/Command_entitywipe.java +++ b/src/main/java/me/totalfreedom/totalfreedommod/command/Command_entitywipe.java @@ -54,7 +54,7 @@ public class Command_entitywipe extends FreedomCommand entityName = FUtil.formatName(type.name()); } - FUtil.staffAction(sender.getName(), "Purging all " + (type != null ? entityName + "s" : "entities"), true); + FUtil.adminAction(sender.getName(), "Purging all " + (type != null ? entityName + "s" : "entities"), true); int count; if (type != null) { diff --git a/src/main/java/me/totalfreedom/totalfreedommod/command/Command_explode.java b/src/main/java/me/totalfreedom/totalfreedommod/command/Command_explode.java deleted file mode 100644 index 25094965..00000000 --- a/src/main/java/me/totalfreedom/totalfreedommod/command/Command_explode.java +++ /dev/null @@ -1,67 +0,0 @@ -package me.totalfreedom.totalfreedommod.command; - -import java.util.Collections; -import java.util.List; -import me.totalfreedom.totalfreedommod.rank.Rank; -import me.totalfreedom.totalfreedommod.util.FUtil; -import org.bukkit.command.Command; -import org.bukkit.command.CommandSender; -import org.bukkit.entity.Player; -import org.bukkit.scheduler.BukkitRunnable; -import org.bukkit.util.Vector; - -@CommandPermissions(level = Rank.SENIOR_ADMIN, source = SourceType.BOTH) -@CommandParameters(description = "Surprise someone.", usage = "/ ") -public class Command_explode extends FreedomCommand -{ - @Override - public boolean run(CommandSender sender, Player playerSender, Command cmd, String commandLabel, String[] args, boolean senderIsConsole) - { - - if (args.length == 0) - { - return false; - } - - final Player player = getPlayer(args[0]); - - if (player == null) - { - msg(FreedomCommand.PLAYER_NOT_FOUND); - return true; - } - - player.setFlying(false); - player.setVelocity(player.getVelocity().clone().add(new Vector(0, 50, 0))); - for (int i = 1; i <= 3; i++) - { - FUtil.createExplosionOnDelay(player.getLocation(), 2L, i * 10); - } - new BukkitRunnable() - { - @Override - public void run() - { - for (int i = 0; i < 4; i++) - { - player.getWorld().strikeLightning(player.getLocation()); - player.getWorld().createExplosion(player.getLocation(), 4L); - } - player.setHealth(0.0); - msg("Exploded " + player.getName()); - } - }.runTaskLater(plugin, 40); - - return true; - } - - @Override - public List getTabCompleteOptions(CommandSender sender, Command command, String alias, String[] args) - { - if (args.length == 1 && plugin.sl.isStaff(sender)) - { - return FUtil.getPlayerList(); - } - return Collections.emptyList(); - } -} \ No newline at end of file diff --git a/src/main/java/me/totalfreedom/totalfreedommod/command/Command_fireball.java b/src/main/java/me/totalfreedom/totalfreedommod/command/Command_fireball.java index e5366424..9e5378bf 100644 --- a/src/main/java/me/totalfreedom/totalfreedommod/command/Command_fireball.java +++ b/src/main/java/me/totalfreedom/totalfreedommod/command/Command_fireball.java @@ -11,7 +11,6 @@ import org.bukkit.entity.Player; @CommandParameters(description = "Obtain a fire ball", usage = "/") public class Command_fireball extends FreedomCommand { - @Override public boolean run(CommandSender sender, Player playerSender, Command cmd, String commandLabel, String[] args, boolean senderIsConsole) { diff --git a/src/main/java/me/totalfreedom/totalfreedommod/command/Command_forcekill.java b/src/main/java/me/totalfreedom/totalfreedommod/command/Command_forcekill.java deleted file mode 100644 index a7c4d1ce..00000000 --- a/src/main/java/me/totalfreedom/totalfreedommod/command/Command_forcekill.java +++ /dev/null @@ -1,38 +0,0 @@ -package me.totalfreedom.totalfreedommod.command; - -import me.totalfreedom.totalfreedommod.rank.Rank; -import org.bukkit.command.Command; -import org.bukkit.command.CommandSender; -import org.bukkit.entity.Player; - -@CommandPermissions(level = Rank.OP, source = SourceType.BOTH) -@CommandParameters(description = "Forcefully kill someone - for those who REALLY need to die.", usage = "/ ") -public class Command_forcekill extends FreedomCommand -{ - - @Override - public boolean run(CommandSender sender, Player playerSender, Command cmd, String commandLabel, String[] args, boolean senderIsConsole) - { - if (!plugin.sl.isMod(sender) && !senderIsConsole) - { - playerSender.setHealth(0); - return true; - } - - if (args.length < 1) - { - return false; - } - - final Player player = getPlayer(args[0]); - if (player == null) - { - msg(PLAYER_NOT_FOUND); - return true; - } - - player.setHealth(0); - - return true; - } -} diff --git a/src/main/java/me/totalfreedom/totalfreedommod/command/Command_freeze.java b/src/main/java/me/totalfreedom/totalfreedommod/command/Command_freeze.java index 0796d1c0..a4b35326 100644 --- a/src/main/java/me/totalfreedom/totalfreedommod/command/Command_freeze.java +++ b/src/main/java/me/totalfreedom/totalfreedommod/command/Command_freeze.java @@ -9,10 +9,9 @@ import org.bukkit.command.CommandSender; import org.bukkit.entity.Player; @CommandPermissions(level = Rank.ADMIN, source = SourceType.BOTH) -@CommandParameters(description = "Freeze/Unfreeze a specified player, or all non-staff on the server.", usage = "/ [target | purge]", aliases = "fr") +@CommandParameters(description = "Freeze/Unfreeze a specified player, or all non-admins on the server.", usage = "/ [target | purge]", aliases = "fr") public class Command_freeze extends FreedomCommand { - @Override public boolean run(CommandSender sender, Player playerSender, Command cmd, String commandLabel, String[] args, boolean senderIsConsole) { @@ -23,15 +22,15 @@ public class Command_freeze extends FreedomCommand if (!gFreeze) { - FUtil.staffAction(sender.getName(), "Disabling global player freeze", false); + FUtil.adminAction(sender.getName(), "Disabling global player freeze", false); msg("Players are now free to move."); return true; } - FUtil.staffAction(sender.getName(), "Enabling global player freeze", false); + FUtil.adminAction(sender.getName(), "Enabling global player freeze", false); for (Player player : server.getOnlinePlayers()) { - if (!isStaff(player)) + if (!isAdmin(player)) { player.sendTitle(ChatColor.RED + "You've been globally frozen.", ChatColor.YELLOW + "Please be patient and you will be unfrozen shortly.", 20, 100, 60); msg(player, "You have been globally frozen due to an OP breaking the rules, please wait and you will be unfrozen soon.", ChatColor.RED); @@ -43,10 +42,10 @@ public class Command_freeze extends FreedomCommand if (args[0].equals("purge")) { - FUtil.staffAction(sender.getName(), "Unfreezing all players", false); + FUtil.adminAction(sender.getName(), "Unfreezing all players", false); for (Player player : server.getOnlinePlayers()) { - if (!isStaff(player)) + if (!isAdmin(player)) { player.sendTitle(ChatColor.GREEN + "You've been unfrozen.", ChatColor.YELLOW + "You may now move again.", 20, 100, 60); } diff --git a/src/main/java/me/totalfreedom/totalfreedommod/command/Command_glow.java b/src/main/java/me/totalfreedom/totalfreedommod/command/Command_glow.java deleted file mode 100644 index 62100467..00000000 --- a/src/main/java/me/totalfreedom/totalfreedommod/command/Command_glow.java +++ /dev/null @@ -1,32 +0,0 @@ -package me.totalfreedom.totalfreedommod.command; - -import me.totalfreedom.totalfreedommod.rank.Rank; -import org.bukkit.command.Command; -import org.bukkit.command.CommandSender; -import org.bukkit.entity.Player; -import org.bukkit.potion.PotionEffect; -import org.bukkit.potion.PotionEffectType; - -@CommandPermissions(level = Rank.OP, source = SourceType.ONLY_IN_GAME) -@CommandParameters(description = "Toggles the glowing outline effect because y'all lazy as fuck", usage = "/") -public class Command_glow extends FreedomCommand -{ - - @Override - public boolean run(CommandSender sender, Player playerSender, Command cmd, String commandLabel, String[] args, boolean senderIsConsole) - { - boolean glowing = false; - if (playerSender.getPotionEffect(PotionEffectType.GLOWING) != null) - { - playerSender.removePotionEffect(PotionEffectType.GLOWING); - } - else - { - PotionEffect glow = new PotionEffect(PotionEffectType.GLOWING, 1000000, 1, false, false); - playerSender.addPotionEffect(glow); - glowing = true; - } - msg("You " + (glowing ? "are now" : "no longer") + " glowing."); - return true; - } -} diff --git a/src/main/java/me/totalfreedom/totalfreedommod/command/Command_gravity.java b/src/main/java/me/totalfreedom/totalfreedommod/command/Command_gravity.java deleted file mode 100644 index f4f24fc2..00000000 --- a/src/main/java/me/totalfreedom/totalfreedommod/command/Command_gravity.java +++ /dev/null @@ -1,22 +0,0 @@ -package me.totalfreedom.totalfreedommod.command; - -import me.totalfreedom.totalfreedommod.rank.Rank; -import org.bukkit.ChatColor; -import org.bukkit.command.Command; -import org.bukkit.command.CommandSender; -import org.bukkit.entity.Player; - -@CommandPermissions(level = Rank.OP, source = SourceType.ONLY_IN_GAME) -@CommandParameters(description = "Toggles player gravity on/off.", usage = "/") -public class Command_gravity extends FreedomCommand -{ - - @Override - public boolean run(CommandSender sender, Player playerSender, Command cmd, String commandLabel, String[] args, boolean senderIsConsole) - { - boolean enabled = !playerSender.hasGravity(); - playerSender.setGravity(enabled); - msg((enabled ? "En" : "Dis") + "abled gravity.", (enabled ? ChatColor.GREEN : ChatColor.RED)); - return true; - } -} diff --git a/src/main/java/me/totalfreedom/totalfreedommod/command/Command_gsay.java b/src/main/java/me/totalfreedom/totalfreedommod/command/Command_gsay.java deleted file mode 100644 index d830d715..00000000 --- a/src/main/java/me/totalfreedom/totalfreedommod/command/Command_gsay.java +++ /dev/null @@ -1,35 +0,0 @@ -package me.totalfreedom.totalfreedommod.command; - -import me.totalfreedom.totalfreedommod.rank.Rank; -import org.apache.commons.lang3.StringUtils; -import org.bukkit.command.Command; -import org.bukkit.command.CommandSender; -import org.bukkit.entity.Player; - -@CommandPermissions(level = Rank.ADMIN, source = SourceType.BOTH, blockHostConsole = true) -@CommandParameters(description = "Send a chat message as someone else.", usage = "/ ") -public class Command_gsay extends FreedomCommand -{ - @Override - public boolean run(CommandSender sender, Player playerSender, Command cmd, String commandLabel, String[] args, boolean senderIsConsole) - { - if (args.length < 2) - { - return false; - } - - final Player player = getPlayer(args[0]); - - if (player == null) - { - sender.sendMessage(FreedomCommand.PLAYER_NOT_FOUND); - return true; - } - - final String outMessage = StringUtils.join(args, " ", 1, args.length); - msg("Sending message as " + player.getName() + ": " + outMessage); - player.chat(outMessage); - msg("Message sent."); - return true; - } -} \ No newline at end of file diff --git a/src/main/java/me/totalfreedom/totalfreedommod/command/Command_health.java b/src/main/java/me/totalfreedom/totalfreedommod/command/Command_health.java index 3f28dfd2..eb74025c 100644 --- a/src/main/java/me/totalfreedom/totalfreedommod/command/Command_health.java +++ b/src/main/java/me/totalfreedom/totalfreedommod/command/Command_health.java @@ -17,7 +17,6 @@ import org.bukkit.scheduler.BukkitTask; @CommandParameters(description = "View server health, such as ticks-per-second, memory, etc.", usage = "/") public class Command_health extends FreedomCommand { - private static final int BYTES_PER_MB = 1024 * 1024; private static final DoubleRange TPS_RANGE = new DoubleRange(20.0 - 0.1, 20.0 + 0.1); @@ -40,7 +39,7 @@ public class Command_health extends FreedomCommand { try { - TFM_TickMeter tickMeter = new TFM_TickMeter(plugin); + TickMeter tickMeter = new TickMeter(plugin); tickMeter.startTicking(); Thread.sleep(2500); final double ticksPerSecond = tickMeter.stopTicking(); @@ -70,15 +69,14 @@ public class Command_health extends FreedomCommand return true; } - private class TFM_TickMeter + private class TickMeter { - private final AtomicInteger ticks = new AtomicInteger(); private final TotalFreedomMod plugin; private long startTime; private BukkitTask task; - public TFM_TickMeter(TotalFreedomMod plugin) + public TickMeter(TotalFreedomMod plugin) { this.plugin = plugin; } @@ -107,5 +105,4 @@ public class Command_health extends FreedomCommand return (double)tickCount / ((double)elapsed / 1000.0); } } - } diff --git a/src/main/java/me/totalfreedom/totalfreedommod/command/Command_hubworld.java b/src/main/java/me/totalfreedom/totalfreedommod/command/Command_hubworld.java index e29764a7..a88e23d5 100644 --- a/src/main/java/me/totalfreedom/totalfreedommod/command/Command_hubworld.java +++ b/src/main/java/me/totalfreedom/totalfreedommod/command/Command_hubworld.java @@ -153,7 +153,7 @@ public class Command_hubworld extends FreedomCommand @Override public List getTabCompleteOptions(CommandSender sender, Command command, String alias, String[] args) { - if (!plugin.sl.isStaff(sender)) + if (!plugin.al.isAdmin(sender)) { return Collections.emptyList(); } @@ -178,7 +178,7 @@ public class Command_hubworld extends FreedomCommand // TODO: Redo this properly private void assertCommandPerms(CommandSender sender, Player playerSender) throws PermissionDeniedException { - if (!(sender instanceof Player) || playerSender == null || !plugin.sl.isAdmin(playerSender)) + if (!(sender instanceof Player) || playerSender == null || !plugin.al.isSeniorAdmin(playerSender)) { throw new PermissionDeniedException(); } diff --git a/src/main/java/me/totalfreedom/totalfreedommod/command/Command_indefban.java b/src/main/java/me/totalfreedom/totalfreedommod/command/Command_indefban.java index 32f5f1bb..1c966406 100644 --- a/src/main/java/me/totalfreedom/totalfreedommod/command/Command_indefban.java +++ b/src/main/java/me/totalfreedom/totalfreedommod/command/Command_indefban.java @@ -9,7 +9,6 @@ import org.bukkit.entity.Player; @CommandParameters(description = "Reload the indefinite ban list.", usage = "/ reload", aliases = "ib") public class Command_indefban extends FreedomCommand { - @Override public boolean run(CommandSender sender, Player playerSender, Command cmd, String commandLabel, String[] args, boolean senderIsConsole) { diff --git a/src/main/java/me/totalfreedom/totalfreedommod/command/Command_invis.java b/src/main/java/me/totalfreedom/totalfreedommod/command/Command_invis.java index 266350f6..f89113d5 100644 --- a/src/main/java/me/totalfreedom/totalfreedommod/command/Command_invis.java +++ b/src/main/java/me/totalfreedom/totalfreedommod/command/Command_invis.java @@ -26,11 +26,11 @@ public class Command_invis extends FreedomCommand { if (args[0].equalsIgnoreCase("clear")) { - if(!plugin.sl.isStaff(sender)) + if(!plugin.al.isAdmin(sender)) return noPerms(); else { - FUtil.staffAction(sender.getName(), "Clearing all invisibility potion effects from all players", true); + FUtil.adminAction(sender.getName(), "Clearing all invisibility potion effects from all players", true); clear = true; } } @@ -43,10 +43,10 @@ public class Command_invis extends FreedomCommand for (Player player : server.getOnlinePlayers()) { - if (player.hasPotionEffect(PotionEffectType.INVISIBILITY) && !plugin.sl.isVanished(player.getName())) + if (player.hasPotionEffect(PotionEffectType.INVISIBILITY) && !plugin.al.isVanished(player.getName())) { players.add(player.getName()); - if (clear && !plugin.sl.isStaff(player)) + if (clear && !plugin.al.isAdmin(player)) { player.removePotionEffect((PotionEffectType.INVISIBILITY)); clears++; @@ -71,7 +71,7 @@ public class Command_invis extends FreedomCommand @Override public List getTabCompleteOptions(CommandSender sender, Command command, String alias, String[] args) { - if (args.length == 1 && plugin.sl.isStaff(sender)) + if (args.length == 1 && plugin.al.isAdmin(sender)) return Arrays.asList("clear"); return Collections.emptyList(); diff --git a/src/main/java/me/totalfreedom/totalfreedommod/command/Command_invsee.java b/src/main/java/me/totalfreedom/totalfreedommod/command/Command_invsee.java index d0f75a0c..9ee96f58 100644 --- a/src/main/java/me/totalfreedom/totalfreedommod/command/Command_invsee.java +++ b/src/main/java/me/totalfreedom/totalfreedommod/command/Command_invsee.java @@ -35,9 +35,9 @@ public class Command_invsee extends FreedomCommand return true; } - if (plugin.sl.isStaff(player) && !plugin.sl.isStaff(playerSender)) + if (plugin.al.isAdmin(player) && !plugin.al.isAdmin(playerSender)) { - msg("You cannot see the inventory of staff members.", ChatColor.RED); + msg("You cannot see the inventory of admin members.", ChatColor.RED); return true; } @@ -67,7 +67,7 @@ public class Command_invsee extends FreedomCommand } inv = player.getInventory(); playerSender.closeInventory(); - if (!plugin.sl.isStaff(player)) + if (!plugin.al.isAdmin(player)) { FPlayer fPlayer = plugin.pl.getPlayer(playerSender); fPlayer.setInvSee(true); diff --git a/src/main/java/me/totalfreedom/totalfreedommod/command/Command_jumppads.java b/src/main/java/me/totalfreedom/totalfreedommod/command/Command_jumppads.java index 1ec12b73..604ce9be 100644 --- a/src/main/java/me/totalfreedom/totalfreedommod/command/Command_jumppads.java +++ b/src/main/java/me/totalfreedom/totalfreedommod/command/Command_jumppads.java @@ -95,7 +95,7 @@ public class Command_jumppads extends FreedomCommand @Override public List getTabCompleteOptions(CommandSender sender, Command command, String alias, String[] args) { - if (!plugin.sl.isStaff(sender)) + if (!plugin.al.isAdmin(sender)) { return Collections.emptyList(); } diff --git a/src/main/java/me/totalfreedom/totalfreedommod/command/Command_kick.java b/src/main/java/me/totalfreedom/totalfreedommod/command/Command_kick.java index 7e8d1c72..b2ff77ce 100644 --- a/src/main/java/me/totalfreedom/totalfreedommod/command/Command_kick.java +++ b/src/main/java/me/totalfreedom/totalfreedommod/command/Command_kick.java @@ -65,11 +65,11 @@ public class Command_kick extends FreedomCommand { if (reason != null) { - FUtil.staffAction(sender.getName(), "Kicking " + player.getName() + " - Reason: " + reason, true); + FUtil.adminAction(sender.getName(), "Kicking " + player.getName() + " - Reason: " + reason, true); } else { - FUtil.staffAction(sender.getName(), "Kicking " + player.getName(), true); + FUtil.adminAction(sender.getName(), "Kicking " + player.getName(), true); } } else diff --git a/src/main/java/me/totalfreedom/totalfreedommod/command/Command_kicknoob.java b/src/main/java/me/totalfreedom/totalfreedommod/command/Command_kicknoob.java index f75dbbfe..974d3c9b 100644 --- a/src/main/java/me/totalfreedom/totalfreedommod/command/Command_kicknoob.java +++ b/src/main/java/me/totalfreedom/totalfreedommod/command/Command_kicknoob.java @@ -8,23 +8,21 @@ import org.bukkit.command.CommandSender; import org.bukkit.entity.Player; @CommandPermissions(level = Rank.ADMIN, source = SourceType.BOTH) -@CommandParameters(description = "Kick all non-staff on server.", usage = "/", aliases = "kickall") +@CommandParameters(description = "Kick all non-admins on server.", usage = "/", aliases = "kickall") public class Command_kicknoob extends FreedomCommand { - @Override public boolean run(CommandSender sender, Player playerSender, Command cmd, String commandLabel, String[] args, boolean senderIsConsole) { - FUtil.staffAction(sender.getName(), "Disconnecting all non-staff.", true); + FUtil.adminAction(sender.getName(), "Disconnecting all non-admins.", true); for (Player player : server.getOnlinePlayers()) { - if (!plugin.sl.isStaff(player)) + if (!plugin.al.isAdmin(player)) { - player.kickPlayer(ChatColor.RED + "All non-staff were kicked by " + sender.getName() + "."); + player.kickPlayer(ChatColor.RED + "All non-admins were kicked by " + sender.getName() + "."); } } - return true; } -} +} \ No newline at end of file diff --git a/src/main/java/me/totalfreedom/totalfreedommod/command/Command_landmine.java b/src/main/java/me/totalfreedom/totalfreedommod/command/Command_landmine.java deleted file mode 100644 index 4ef0ef2f..00000000 --- a/src/main/java/me/totalfreedom/totalfreedommod/command/Command_landmine.java +++ /dev/null @@ -1,67 +0,0 @@ -package me.totalfreedom.totalfreedommod.command; - -import java.util.Iterator; -import me.totalfreedom.totalfreedommod.config.ConfigEntry; -import me.totalfreedom.totalfreedommod.fun.Landminer.Landmine; -import me.totalfreedom.totalfreedommod.rank.Rank; -import org.bukkit.ChatColor; -import org.bukkit.Material; -import org.bukkit.block.Block; -import org.bukkit.block.BlockFace; -import org.bukkit.command.Command; -import org.bukkit.command.CommandSender; -import org.bukkit.entity.Player; - -@CommandPermissions(level = Rank.OP, source = SourceType.ONLY_IN_GAME) -@CommandParameters(description = "Set a landmine trap.", usage = "/") -public class Command_landmine extends FreedomCommand -{ - - @Override - public boolean run(CommandSender sender, Player playerSender, Command cmd, String commandLabel, String[] args, boolean senderIsConsole) - { - if (!ConfigEntry.LANDMINES_ENABLED.getBoolean()) - { - msg("The landmine is currently disabled.", ChatColor.GREEN); - return true; - } - - if (!ConfigEntry.ALLOW_EXPLOSIONS.getBoolean()) - { - msg("Explosions are currently disabled.", ChatColor.GREEN); - return true; - } - - double radius = 2.0; - - if (args.length >= 1) - { - if ("list".equals(args[0])) - { - final Iterator landmines = plugin.lm.getLandmines().iterator(); - while (landmines.hasNext()) - { - msg(landmines.next().toString()); - } - return true; - } - - try - { - radius = Math.max(2.0, Math.min(6.0, Double.parseDouble(args[0]))); - } - catch (NumberFormatException ex) - { - } - } - - final Block landmine = playerSender.getLocation().getBlock().getRelative(BlockFace.DOWN); - landmine.setType(Material.TNT); - plugin.lm.add(new Landmine(landmine.getLocation(), playerSender, radius)); - - msg("Landmine planted - Radius = " + radius + " blocks.", ChatColor.GREEN); - - return true; - } - -} diff --git a/src/main/java/me/totalfreedom/totalfreedommod/command/Command_linkdiscord.java b/src/main/java/me/totalfreedom/totalfreedommod/command/Command_linkdiscord.java index 94dca915..a6510fc0 100644 --- a/src/main/java/me/totalfreedom/totalfreedommod/command/Command_linkdiscord.java +++ b/src/main/java/me/totalfreedom/totalfreedommod/command/Command_linkdiscord.java @@ -22,7 +22,7 @@ public class Command_linkdiscord extends FreedomCommand return true; } - if (args.length > 1 && plugin.sl.isStaff(playerSender)) + if (args.length > 1 && plugin.al.isAdmin(playerSender)) { PlayerData playerData = plugin.pl.getData(args[0]); if (playerData == null) diff --git a/src/main/java/me/totalfreedom/totalfreedommod/command/Command_linkreddit.java b/src/main/java/me/totalfreedom/totalfreedommod/command/Command_linkreddit.java deleted file mode 100644 index f7d3cf35..00000000 --- a/src/main/java/me/totalfreedom/totalfreedommod/command/Command_linkreddit.java +++ /dev/null @@ -1,69 +0,0 @@ -package me.totalfreedom.totalfreedommod.command; - -import me.totalfreedom.totalfreedommod.rank.Rank; -import net.dean.jraw.ApiException; -import org.bukkit.ChatColor; -import org.bukkit.command.Command; -import org.bukkit.command.CommandSender; -import org.bukkit.entity.Player; - -@CommandPermissions(level = Rank.OP, source = SourceType.ONLY_IN_GAME) -@CommandParameters(description = "Link your reddit account", usage = "/ >") -public class Command_linkreddit extends FreedomCommand -{ - - public boolean run(final CommandSender sender, final Player playerSender, final Command cmd, final String commandLabel, final String[] args, final boolean senderIsConsole) - { - if (!plugin.rd.enabled) - { - msg("The Reddit system is currently disabled.", ChatColor.RED); - return true; - } - - if (getData(playerSender).getRedditUsername() != null) - { - msg("Your Reddit account is already linked."); - return true; - } - - if (args.length == 0) - { - return false; - } - - if (args.length == 1 && !args[0].equals("code")) - { - String username = args[0]; - String code = plugin.rd.addLinkCode(getData(playerSender), username); - - try - { - plugin.rd.sendModMessage(username, "Link Code", "Please run the following in-game to link your Reddit account: /linkreddit code " + code); - } - catch (ApiException e) - { - msg("Could not find a Reddit account by the name of " + args[0], ChatColor.RED); - return true; - } - - msg("A linking code has been sent to " + username + ". Please check your mod mail at " + ChatColor.AQUA + "https://www.reddit.com/message/moderator", ChatColor.GREEN); - return true; - } - - String code = args[1]; - String username = plugin.rd.checkLinkCode(code); - - if (username == null) - { - msg(code + " is not a valid code", ChatColor.RED); - return true; - } - - msg("Successfully linked the Reddit account " + username + " to your Minecraft account.", ChatColor.GREEN); - if (plugin.rd.updateFlair(playerSender)) - { - msg("Your flair has been updated.", ChatColor.GREEN); - } - return true; - } -} diff --git a/src/main/java/me/totalfreedom/totalfreedommod/command/Command_list.java b/src/main/java/me/totalfreedom/totalfreedommod/command/Command_list.java index 9b3d4b8c..73692a83 100644 --- a/src/main/java/me/totalfreedom/totalfreedommod/command/Command_list.java +++ b/src/main/java/me/totalfreedom/totalfreedommod/command/Command_list.java @@ -5,8 +5,8 @@ import java.util.List; import me.totalfreedom.totalfreedommod.config.ConfigEntry; import me.totalfreedom.totalfreedommod.rank.Displayable; import me.totalfreedom.totalfreedommod.rank.Rank; -import me.totalfreedom.totalfreedommod.staff.StaffList; -import me.totalfreedom.totalfreedommod.staff.StaffMember; +import me.totalfreedom.totalfreedommod.admin.AdminList; +import me.totalfreedom.totalfreedommod.admin.Admin; import me.totalfreedom.totalfreedommod.util.FUtil; import net.md_5.bungee.api.ChatColor; import org.apache.commons.lang.StringUtils; @@ -42,13 +42,13 @@ public class Command_list extends FreedomCommand { case "-s": { - listFilter = ListFilter.STAFF; + listFilter = ListFilter.ADMINS; break; } case "-v": { checkRank(Rank.ADMIN); - listFilter = ListFilter.VANISHED_STAFF; + listFilter = ListFilter.VANISHED_ADMINS; break; } case "-t": @@ -82,20 +82,20 @@ public class Command_list extends FreedomCommand List n = new ArrayList<>(); - if (listFilter == ListFilter.TELNET_SESSIONS && plugin.sl.isStaff(sender) && plugin.sl.getAdmin(playerSender).getRank().isAtLeast(Rank.ADMIN)) + if (listFilter == ListFilter.TELNET_SESSIONS && plugin.al.isAdmin(sender) && plugin.al.getAdmin(playerSender).getRank().isAtLeast(Rank.ADMIN)) { - List connectedStaffMembers = plugin.btb.getConnectedAdmins(); - onlineStats.append(ChatColor.BLUE).append("There are ").append(ChatColor.RED).append(connectedStaffMembers.size()) + List connectedAdmins = plugin.btb.getConnectedAdmins(); + onlineStats.append(ChatColor.BLUE).append("There are ").append(ChatColor.RED).append(connectedAdmins.size()) .append(ChatColor.BLUE) - .append(" staff members connected to telnet."); - for (StaffMember staffMember : connectedStaffMembers) + .append(" admins connected to telnet."); + for (Admin admin : connectedAdmins) { - n.add(staffMember.getName()); + n.add(admin.getName()); } } else { - onlineStats.append(ChatColor.BLUE).append("There are ").append(ChatColor.RED).append(server.getOnlinePlayers().size() - StaffList.vanished.size()) + onlineStats.append(ChatColor.BLUE).append("There are ").append(ChatColor.RED).append(server.getOnlinePlayers().size() - AdminList.vanished.size()) .append(ChatColor.BLUE) .append(" out of a maximum ") .append(ChatColor.RED) @@ -104,19 +104,19 @@ public class Command_list extends FreedomCommand .append(" players online."); for (Player p : server.getOnlinePlayers()) { - if (listFilter == ListFilter.STAFF && !plugin.sl.isStaff(p)) + if (listFilter == ListFilter.ADMINS && !plugin.al.isAdmin(p)) { continue; } - if (listFilter == ListFilter.STAFF && plugin.sl.isVanished(p.getName())) + if (listFilter == ListFilter.ADMINS && plugin.al.isVanished(p.getName())) { continue; } - if (listFilter == ListFilter.VANISHED_STAFF && !plugin.sl.isVanished(p.getName())) + if (listFilter == ListFilter.VANISHED_ADMINS && !plugin.al.isVanished(p.getName())) { continue; } - if (listFilter == ListFilter.IMPOSTORS && !plugin.sl.isStaffImpostor(p)) + if (listFilter == ListFilter.IMPOSTORS && !plugin.al.isAdminImpostor(p)) { continue; } @@ -124,7 +124,7 @@ public class Command_list extends FreedomCommand { continue; } - if (listFilter == ListFilter.PLAYERS && plugin.sl.isVanished(p.getName())) + if (listFilter == ListFilter.PLAYERS && plugin.al.isVanished(p.getName())) { continue; } @@ -155,8 +155,8 @@ public class Command_list extends FreedomCommand private enum ListFilter { PLAYERS, - STAFF, - VANISHED_STAFF, + ADMINS, + VANISHED_ADMINS, TELNET_SESSIONS, FAMOUS_PLAYERS, IMPOSTORS diff --git a/src/main/java/me/totalfreedom/totalfreedommod/command/Command_lockup.java b/src/main/java/me/totalfreedom/totalfreedommod/command/Command_lockup.java index 87693606..92222b16 100644 --- a/src/main/java/me/totalfreedom/totalfreedommod/command/Command_lockup.java +++ b/src/main/java/me/totalfreedom/totalfreedommod/command/Command_lockup.java @@ -22,7 +22,7 @@ public class Command_lockup extends FreedomCommand { if (args[0].equalsIgnoreCase("all")) { - FUtil.staffAction(sender.getName(), "Locking up all players", true); + FUtil.adminAction(sender.getName(), "Locking up all players", true); for (Player player : server.getOnlinePlayers()) { @@ -32,7 +32,7 @@ public class Command_lockup extends FreedomCommand } else if (args[0].equalsIgnoreCase("purge")) { - FUtil.staffAction(sender.getName(), "Unlocking all players", true); + FUtil.adminAction(sender.getName(), "Unlocking all players", true); for (Player player : server.getOnlinePlayers()) { cancelLockup(player); @@ -59,7 +59,7 @@ public class Command_lockup extends FreedomCommand if (!silent) { - FUtil.staffAction(sender.getName(), "Locking up " + player.getName(), true); + FUtil.adminAction(sender.getName(), "Locking up " + player.getName(), true); } startLockup(player); msg("Locked up " + player.getName() + "."); @@ -76,7 +76,7 @@ public class Command_lockup extends FreedomCommand if (!silent) { - FUtil.staffAction(sender.getName(), "Unlocking " + player.getName(), true); + FUtil.adminAction(sender.getName(), "Unlocking " + player.getName(), true); } cancelLockup(player); msg("Unlocked " + player.getName() + "."); diff --git a/src/main/java/me/totalfreedom/totalfreedommod/command/Command_loginmessage.java b/src/main/java/me/totalfreedom/totalfreedommod/command/Command_loginmessage.java index 4f4f544b..0b5efbc2 100644 --- a/src/main/java/me/totalfreedom/totalfreedommod/command/Command_loginmessage.java +++ b/src/main/java/me/totalfreedom/totalfreedommod/command/Command_loginmessage.java @@ -16,7 +16,7 @@ public class Command_loginmessage extends FreedomCommand @Override public boolean run(final CommandSender sender, final Player playerSender, Command cmd, String commandLabel, String[] args, boolean senderIsConsole) { - if (!plugin.pl.getData(playerSender).hasItem(ShopItem.LOGIN_MESSAGES) && !isStaff(playerSender)) + if (!plugin.pl.getData(playerSender).hasItem(ShopItem.LOGIN_MESSAGES) && !isAdmin(playerSender)) { msg("You did not purchase the ability to use login messages! Purchase the ability from the shop.", ChatColor.RED); return true; diff --git a/src/main/java/me/totalfreedom/totalfreedommod/command/Command_logs.java b/src/main/java/me/totalfreedom/totalfreedommod/command/Command_logs.java deleted file mode 100644 index e95d29b8..00000000 --- a/src/main/java/me/totalfreedom/totalfreedommod/command/Command_logs.java +++ /dev/null @@ -1,26 +0,0 @@ -package me.totalfreedom.totalfreedommod.command; - -import me.totalfreedom.totalfreedommod.LogViewer.LogsRegistrationMode; -import me.totalfreedom.totalfreedommod.rank.Rank; -import org.bukkit.command.Command; -import org.bukkit.command.CommandSender; -import org.bukkit.entity.Player; - -@CommandPermissions(level = Rank.ADMIN, source = SourceType.ONLY_IN_GAME) -@CommandParameters(description = "Register your connection with the TFM logviewer.", usage = "/ [off]") -public class Command_logs extends FreedomCommand -{ - - @Override - public boolean run(final CommandSender sender, final Player playerSender, Command cmd, String commandLabel, String[] args, boolean senderIsConsole) - { - LogsRegistrationMode mode = LogsRegistrationMode.ADD; - if (args.length == 1 && "off".equalsIgnoreCase(args[0])) - { - mode = LogsRegistrationMode.DELETE; - } - plugin.lv.updateLogsRegistration(sender, playerSender, mode); - - return true; - } -} diff --git a/src/main/java/me/totalfreedom/totalfreedommod/command/Command_manuallyverify.java b/src/main/java/me/totalfreedom/totalfreedommod/command/Command_manuallyverify.java index 28ab5ae3..82182b8a 100644 --- a/src/main/java/me/totalfreedom/totalfreedommod/command/Command_manuallyverify.java +++ b/src/main/java/me/totalfreedom/totalfreedommod/command/Command_manuallyverify.java @@ -39,7 +39,7 @@ public class Command_manuallyverify extends FreedomCommand return true; } - FUtil.staffAction(sender.getName(), "Manually verifying player " + player.getName(), false); + FUtil.adminAction(sender.getName(), "Manually verifying player " + player.getName(), false); player.setOp(true); player.sendMessage(YOU_ARE_OP); diff --git a/src/main/java/me/totalfreedom/totalfreedommod/command/Command_massmurder.java b/src/main/java/me/totalfreedom/totalfreedommod/command/Command_massmurder.java deleted file mode 100644 index e5ed5857..00000000 --- a/src/main/java/me/totalfreedom/totalfreedommod/command/Command_massmurder.java +++ /dev/null @@ -1,42 +0,0 @@ -package me.totalfreedom.totalfreedommod.command; - -import me.totalfreedom.totalfreedommod.config.ConfigEntry; -import me.totalfreedom.totalfreedommod.rank.Rank; -import org.bukkit.command.Command; -import org.bukkit.command.CommandSender; -import org.bukkit.entity.Player; - -@CommandPermissions(level = Rank.SENIOR_ADMIN, source = SourceType.BOTH) -@CommandParameters(description = "seth's personal command", usage = "/ ", aliases = "genocide") -public class Command_massmurder extends FreedomCommand -{ - - @Override - public boolean run(CommandSender sender, Player playerSender, Command cmd, String commandLabel, String[] args, boolean senderIsConsole) - { - if (!ConfigEntry.SERVER_OWNERS.getStringList().contains(playerSender.getName())) - { - return noPerms(); - } - - if (args.length < 1) - { - return false; - } - - int count = 0; - for (String name : args) - { - Player player = getPlayer(name); - if (player != null) - { - player.setHealth(0); - count++; - } - } - - msg("Mass murdered a school of " + count); - - return true; - } -} diff --git a/src/main/java/me/totalfreedom/totalfreedommod/command/Command_masterbuilderinfo.java b/src/main/java/me/totalfreedom/totalfreedommod/command/Command_masterbuilderinfo.java index a22d1e7b..ed1532c2 100644 --- a/src/main/java/me/totalfreedom/totalfreedommod/command/Command_masterbuilderinfo.java +++ b/src/main/java/me/totalfreedom/totalfreedommod/command/Command_masterbuilderinfo.java @@ -14,7 +14,6 @@ import org.bukkit.entity.Player; @CommandParameters(description = "Information on how to apply for Master Builder.", usage = "/", aliases = "mbi") public class Command_masterbuilderinfo extends FreedomCommand { - @Override public boolean run(CommandSender sender, Player playerSender, Command cmd, String commandLabel, String[] args, boolean senderIsConsole) { @@ -22,7 +21,7 @@ public class Command_masterbuilderinfo extends FreedomCommand if (masterBuilderInfo.isEmpty()) { - msg("The master builder information section of the config.yml file has not been configured.", ChatColor.RED); + msg("The master builder information section in the config.yml file has not been configured.", ChatColor.RED); } else { diff --git a/src/main/java/me/totalfreedom/totalfreedommod/command/Command_masterbuilderworld.java b/src/main/java/me/totalfreedom/totalfreedommod/command/Command_masterbuilderworld.java index b18e0379..1e0509a2 100644 --- a/src/main/java/me/totalfreedom/totalfreedommod/command/Command_masterbuilderworld.java +++ b/src/main/java/me/totalfreedom/totalfreedommod/command/Command_masterbuilderworld.java @@ -153,7 +153,7 @@ public class Command_masterbuilderworld extends FreedomCommand @Override public List getTabCompleteOptions(CommandSender sender, Command command, String alias, String[] args) { - if (!plugin.sl.isStaff(sender)) + if (!plugin.al.isAdmin(sender)) { return Collections.emptyList(); } @@ -178,7 +178,7 @@ public class Command_masterbuilderworld extends FreedomCommand // TODO: Redo this properly private void assertCommandPerms(CommandSender sender, Player playerSender) throws PermissionDeniedException { - if (!(sender instanceof Player) || playerSender == null || !plugin.sl.isAdmin(playerSender)) + if (!(sender instanceof Player) || playerSender == null || !plugin.al.isSeniorAdmin(playerSender)) { throw new PermissionDeniedException(); } diff --git a/src/main/java/me/totalfreedom/totalfreedommod/command/Command_mbconfig.java b/src/main/java/me/totalfreedom/totalfreedommod/command/Command_mbconfig.java index b97d1b97..f0d597cb 100644 --- a/src/main/java/me/totalfreedom/totalfreedommod/command/Command_mbconfig.java +++ b/src/main/java/me/totalfreedom/totalfreedommod/command/Command_mbconfig.java @@ -58,7 +58,7 @@ public class Command_mbconfig extends FreedomCommand plugin.sql.addPlayer(data); msg(counter + " IPs removed."); msg(data.getIps().get(0) + " is now your only IP address"); - FUtil.staffAction(sender.getName(), "Clearing my IPs", true); + FUtil.adminAction(sender.getName(), "Clearing my IPs", true); return true; } case "clearip": @@ -118,7 +118,7 @@ public class Command_mbconfig extends FreedomCommand if (data.isMasterBuilder() && plugin.pl.isPlayerImpostor(player)) { - FUtil.staffAction(sender.getName(), "Re-adding " + data.getName() + " to the Master Builder list", true); + FUtil.adminAction(sender.getName(), "Re-adding " + data.getName() + " to the Master Builder list", true); if (plugin.pl.getPlayer(player).getFreezeData().isFrozen()) { @@ -134,7 +134,7 @@ public class Command_mbconfig extends FreedomCommand } else if (!data.isMasterBuilder()) { - FUtil.staffAction(sender.getName(), "Adding " + data.getName() + " to the Master Builder list", true); + FUtil.adminAction(sender.getName(), "Adding " + data.getName() + " to the Master Builder list", true); data.setMasterBuilder(true); data.setVerification(true); plugin.pl.save(data); @@ -171,7 +171,7 @@ public class Command_mbconfig extends FreedomCommand return true; } - FUtil.staffAction(sender.getName(), "Removing " + data.getName() + " from the Master Builder list", true); + FUtil.adminAction(sender.getName(), "Removing " + data.getName() + " from the Master Builder list", true); data.setMasterBuilder(false); if (data.getDiscordID() == null) { diff --git a/src/main/java/me/totalfreedom/totalfreedommod/command/Command_mobpurge.java b/src/main/java/me/totalfreedom/totalfreedommod/command/Command_mobpurge.java index 7e9a005d..26071f83 100644 --- a/src/main/java/me/totalfreedom/totalfreedommod/command/Command_mobpurge.java +++ b/src/main/java/me/totalfreedom/totalfreedommod/command/Command_mobpurge.java @@ -46,7 +46,7 @@ public class Command_mobpurge extends FreedomCommand mobName = FUtil.formatName(type.name()); } - FUtil.staffAction(sender.getName(), "Purging all " + (type != null ? mobName + "s" : "mobs"), true); + FUtil.adminAction(sender.getName(), "Purging all " + (type != null ? mobName + "s" : "mobs"), true); int count = plugin.ew.purgeMobs(type); msg(count + " " + (type != null ? mobName : "mob") + FUtil.showS(count) + " removed."); return true; diff --git a/src/main/java/me/totalfreedom/totalfreedommod/command/Command_modifyitem.java b/src/main/java/me/totalfreedom/totalfreedommod/command/Command_modifyitem.java index 8862bf6b..57313658 100644 --- a/src/main/java/me/totalfreedom/totalfreedommod/command/Command_modifyitem.java +++ b/src/main/java/me/totalfreedom/totalfreedommod/command/Command_modifyitem.java @@ -23,7 +23,6 @@ import org.bukkit.potion.PotionEffectType; @CommandParameters(description = "Modify the current item you are holding.", usage = "/ | lore | enchant | potion | attribute | clear>", aliases = "mi") public class Command_modifyitem extends FreedomCommand { - @Override public boolean run(final CommandSender sender, final Player playerSender, Command cmd, String commandLabel, String[] args, boolean senderIsConsole) { diff --git a/src/main/java/me/totalfreedom/totalfreedommod/command/Command_mp44.java b/src/main/java/me/totalfreedom/totalfreedommod/command/Command_mp44.java deleted file mode 100644 index 6f34ab27..00000000 --- a/src/main/java/me/totalfreedom/totalfreedommod/command/Command_mp44.java +++ /dev/null @@ -1,52 +0,0 @@ -package me.totalfreedom.totalfreedommod.command; - -import me.totalfreedom.totalfreedommod.config.ConfigEntry; -import me.totalfreedom.totalfreedommod.player.FPlayer; -import me.totalfreedom.totalfreedommod.rank.Rank; -import org.bukkit.ChatColor; -import org.bukkit.Material; -import org.bukkit.command.Command; -import org.bukkit.command.CommandSender; -import org.bukkit.entity.Player; -import org.bukkit.inventory.ItemStack; - -@CommandPermissions(level = Rank.OP, source = SourceType.ONLY_IN_GAME) -@CommandParameters(description = "Modern weaponry, FTW. Use 'draw' to start firing, 'sling' to stop firing.", usage = "/ ") -public class Command_mp44 extends FreedomCommand -{ - - @Override - public boolean run(CommandSender sender, Player playerSender, Command cmd, String commandLabel, String[] args, boolean senderIsConsole) - { - if (!ConfigEntry.MP44_ENABLED.getBoolean()) - { - msg("The mp44 is currently disabled.", ChatColor.GREEN); - return true; - } - - if (args.length == 0) - { - return false; - } - - FPlayer playerdata = plugin.pl.getPlayer(playerSender); - - if (args[0].equalsIgnoreCase("draw")) - { - playerdata.armMP44(); - - msg("mp44 is ARMED! Left click with gunpowder to start firing, left click again to quit.", ChatColor.GREEN); - msg("Type /mp44 sling to disable. -by Madgeek1450", ChatColor.GREEN); - - playerSender.getEquipment().setItemInMainHand(new ItemStack(Material.GUNPOWDER, 1)); - } - else - { - playerdata.disarmMP44(); - - sender.sendMessage(ChatColor.GREEN + "mp44 Disarmed."); - } - - return true; - } -} diff --git a/src/main/java/me/totalfreedom/totalfreedommod/command/Command_mute.java b/src/main/java/me/totalfreedom/totalfreedommod/command/Command_mute.java index 8d4dc76c..f06e12c9 100644 --- a/src/main/java/me/totalfreedom/totalfreedommod/command/Command_mute.java +++ b/src/main/java/me/totalfreedom/totalfreedommod/command/Command_mute.java @@ -53,7 +53,7 @@ public class Command_mute extends FreedomCommand if (args[0].equals("purge")) { - FUtil.staffAction(sender.getName(), "Unmuting all players.", true); + FUtil.adminAction(sender.getName(), "Unmuting all players.", true); FPlayer info; int count = 0; for (Player mp : server.getOnlinePlayers()) @@ -73,13 +73,13 @@ public class Command_mute extends FreedomCommand if (args[0].equals("all")) { - FUtil.staffAction(sender.getName(), "Muting all non-staff", true); + FUtil.adminAction(sender.getName(), "Muting all non-admins", true); FPlayer playerdata; int counter = 0; for (Player player : server.getOnlinePlayers()) { - if (!plugin.sl.isStaff(player)) + if (!plugin.al.isAdmin(player)) { player.sendTitle(ChatColor.RED + "You've been muted globally.", ChatColor.YELLOW + "Please be patient and you will be unmuted shortly.", 20, 100, 60); playerdata = plugin.pl.getPlayer(player); @@ -120,9 +120,9 @@ public class Command_mute extends FreedomCommand } FPlayer playerdata = plugin.pl.getPlayer(player); - if (plugin.sl.isStaff(player)) + if (plugin.al.isAdmin(player)) { - msg(player.getName() + " is a staff member, and can't be muted."); + msg(player.getName() + " is an admin, and can't be muted."); return true; } @@ -140,7 +140,7 @@ public class Command_mute extends FreedomCommand return true; } - FUtil.staffAction(sender.getName(), "Muting " + player.getName(), true); + FUtil.adminAction(sender.getName(), "Muting " + player.getName(), true); if (smite) { @@ -163,7 +163,7 @@ public class Command_mute extends FreedomCommand @Override public List getTabCompleteOptions(CommandSender sender, Command command, String alias, String[] args) { - if (!plugin.sl.isStaff(sender)) + if (!plugin.al.isAdmin(sender)) { return null; } diff --git a/src/main/java/me/totalfreedom/totalfreedommod/command/Command_myadmin.java b/src/main/java/me/totalfreedom/totalfreedommod/command/Command_myadmin.java index 2e5ca94a..2561f3e0 100644 --- a/src/main/java/me/totalfreedom/totalfreedommod/command/Command_myadmin.java +++ b/src/main/java/me/totalfreedom/totalfreedommod/command/Command_myadmin.java @@ -8,7 +8,7 @@ import me.totalfreedom.totalfreedommod.config.ConfigEntry; import me.totalfreedom.totalfreedommod.discord.Discord; import me.totalfreedom.totalfreedommod.player.PlayerData; import me.totalfreedom.totalfreedommod.rank.Rank; -import me.totalfreedom.totalfreedommod.staff.StaffMember; +import me.totalfreedom.totalfreedommod.admin.Admin; import me.totalfreedom.totalfreedommod.util.FUtil; import org.apache.commons.lang.StringUtils; import org.bukkit.ChatColor; @@ -29,7 +29,7 @@ public class Command_myadmin extends FreedomCommand } Player init = null; - StaffMember target = getStaffMember(playerSender); + Admin target = getAdmin(playerSender); Player targetPlayer = playerSender; // -o switch @@ -44,10 +44,10 @@ public class Command_myadmin extends FreedomCommand return true; } - target = getStaffMember(targetPlayer); + target = getAdmin(targetPlayer); if (target == null) { - msg("That player is not a staff member", ChatColor.RED); + msg("That player is not an admin", ChatColor.RED); return true; } @@ -72,19 +72,19 @@ public class Command_myadmin extends FreedomCommand if (init == null) { - FUtil.staffAction(sender.getName(), "Clearing my IPs", true); + FUtil.adminAction(sender.getName(), "Clearing my IPs", true); } else { - FUtil.staffAction(sender.getName(), "Clearing " + target.getName() + "' IPs", true); + FUtil.adminAction(sender.getName(), "Clearing " + target.getName() + "' IPs", true); } int counter = target.getIps().size() - 1; target.clearIPs(); target.addIp(targetIp); - plugin.sl.save(target); - plugin.sl.updateTables(); + plugin.al.save(target); + plugin.al.updateTables(); plugin.pl.syncIps(target); msg(counter + " IPs removed."); @@ -120,16 +120,16 @@ public class Command_myadmin extends FreedomCommand } else { - msg("You cannot remove that staff members current IP."); + msg("You cannot remove that admins current IP."); } return true; } - FUtil.staffAction(sender.getName(), "Removing an IP" + (init == null ? "" : " from " + targetPlayer.getName() + "'s IPs"), true); + FUtil.adminAction(sender.getName(), "Removing an IP" + (init == null ? "" : " from " + targetPlayer.getName() + "'s IPs"), true); target.removeIp(args[1]); - plugin.sl.save(target); - plugin.sl.updateTables(); + plugin.al.save(target); + plugin.al.updateTables(); plugin.pl.syncIps(target); @@ -142,10 +142,10 @@ public class Command_myadmin extends FreedomCommand { String format = StringUtils.join(args, " ", 1, args.length); target.setAcFormat(format); - plugin.sl.save(target); - plugin.sl.updateTables(); - msg("Set staff chat format to \"" + format + "\".", ChatColor.GRAY); - String example = format.replace("%name%", "ExampleStaff").replace("%rank%", Rank.ADMIN.getAbbr()).replace("%rankcolor%", Rank.ADMIN.getColor().toString()).replace("%msg%", "The quick brown fox jumps over the lazy dog."); + plugin.al.save(target); + plugin.al.updateTables(); + msg("Set admin chat format to \"" + format + "\".", ChatColor.GRAY); + String example = format.replace("%name%", "ExampleAdmin").replace("%rank%", Rank.ADMIN.getAbbr()).replace("%rankcolor%", Rank.ADMIN.getColor().toString()).replace("%msg%", "The quick brown fox jumps over the lazy dog."); msg(ChatColor.GRAY + "Example: " + FUtil.colorize(example)); return true; } @@ -153,9 +153,9 @@ public class Command_myadmin extends FreedomCommand case "clearscformat": { target.setAcFormat(null); - plugin.sl.save(target); - plugin.sl.updateTables(); - msg("Cleared staff chat format.", ChatColor.GRAY); + plugin.al.save(target); + plugin.al.updateTables(); + msg("Cleared admin chat format.", ChatColor.GRAY); return true; } @@ -198,7 +198,7 @@ public class Command_myadmin extends FreedomCommand @Override public List getTabCompleteOptions(CommandSender sender, Command command, String alias, String[] args) { - if (!plugin.sl.isStaff(sender)) + if (!plugin.al.isAdmin(sender)) { return Collections.emptyList(); } @@ -225,7 +225,7 @@ public class Command_myadmin extends FreedomCommand { if (args[0].equals("clearip")) { - List ips = plugin.sl.getAdmin(sender).getIps(); + List ips = plugin.al.getAdmin(sender).getIps(); ips.remove(FUtil.getIp((Player)sender)); return ips; } @@ -246,10 +246,10 @@ public class Command_myadmin extends FreedomCommand { if (args[0].equals("-o") && args[2].equals("clearip")) { - StaffMember staffMember = plugin.sl.getEntryByName(args[1]); - if (staffMember != null) + Admin admin = plugin.al.getEntryByName(args[1]); + if (admin != null) { - return staffMember.getIps(); + return admin.getIps(); } } } diff --git a/src/main/java/me/totalfreedom/totalfreedommod/command/Command_nickclean.java b/src/main/java/me/totalfreedom/totalfreedommod/command/Command_nickclean.java index 93dd10fe..68eeef36 100644 --- a/src/main/java/me/totalfreedom/totalfreedommod/command/Command_nickclean.java +++ b/src/main/java/me/totalfreedom/totalfreedommod/command/Command_nickclean.java @@ -53,12 +53,12 @@ public class Command_nickclean extends FreedomCommand return true; } - FUtil.staffAction(sender.getName(), "Cleaning " + player.getName() + "'s nickname", false); + FUtil.adminAction(sender.getName(), "Cleaning " + player.getName() + "'s nickname", false); cleanNickname(player); return true; } - FUtil.staffAction(sender.getName(), "Cleaning all nicknames", false); + FUtil.adminAction(sender.getName(), "Cleaning all nicknames", false); for (final Player player : server.getOnlinePlayers()) { cleanNickname(player); diff --git a/src/main/java/me/totalfreedom/totalfreedommod/command/Command_nickfilter.java b/src/main/java/me/totalfreedom/totalfreedommod/command/Command_nickfilter.java index db6a70db..16d5375a 100644 --- a/src/main/java/me/totalfreedom/totalfreedommod/command/Command_nickfilter.java +++ b/src/main/java/me/totalfreedom/totalfreedommod/command/Command_nickfilter.java @@ -41,11 +41,11 @@ public class Command_nickfilter extends FreedomCommand player = getPlayerByDisplayName(displayName); - if (player == null || plugin.sl.isVanished(player.getName()) && !plugin.sl.isStaff(sender)) + if (player == null || plugin.al.isVanished(player.getName()) && !plugin.al.isAdmin(sender)) { player = getPlayerByDisplayNameAlt(displayName); - if (player == null || !plugin.sl.isVanished(player.getName()) && !plugin.sl.isStaff(sender)) + if (player == null || !plugin.al.isVanished(player.getName()) && !plugin.al.isAdmin(sender)) { sender.sendMessage(ChatColor.GRAY + "Can't find player by nickname: " + displayName); return true; diff --git a/src/main/java/me/totalfreedom/totalfreedommod/command/Command_op.java b/src/main/java/me/totalfreedom/totalfreedommod/command/Command_op.java index 9cda7d52..93ff8397 100644 --- a/src/main/java/me/totalfreedom/totalfreedommod/command/Command_op.java +++ b/src/main/java/me/totalfreedom/totalfreedommod/command/Command_op.java @@ -36,7 +36,7 @@ public class Command_op extends FreedomCommand if (player.getName().toLowerCase().contains(targetName) || player.getDisplayName().toLowerCase().contains(targetName) || player.getName().contains(targetName) || player.getDisplayName().contains(targetName)) { - if (!player.isOp() && !plugin.sl.isVanished(player.getName())) + if (!player.isOp() && !plugin.al.isVanished(player.getName())) { matchedPlayerNames.add(player.getName()); player.setOp(true); @@ -49,7 +49,7 @@ public class Command_op extends FreedomCommand { if (!silent) { - FUtil.staffAction(sender.getName(), "Opping " + StringUtils.join(matchedPlayerNames, ", "), false); + FUtil.adminAction(sender.getName(), "Opping " + StringUtils.join(matchedPlayerNames, ", "), false); } } else diff --git a/src/main/java/me/totalfreedom/totalfreedommod/command/Command_opall.java b/src/main/java/me/totalfreedom/totalfreedommod/command/Command_opall.java index 4ce3dd88..b728a7fd 100644 --- a/src/main/java/me/totalfreedom/totalfreedommod/command/Command_opall.java +++ b/src/main/java/me/totalfreedom/totalfreedommod/command/Command_opall.java @@ -14,7 +14,7 @@ public class Command_opall extends FreedomCommand @Override public boolean run(CommandSender sender, Player playerSender, Command cmd, String commandLabel, String[] args, boolean senderIsConsole) { - FUtil.staffAction(sender.getName(), "Opping all players on the server", false); + FUtil.adminAction(sender.getName(), "Opping all players on the server", false); for (Player player : server.getOnlinePlayers()) { diff --git a/src/main/java/me/totalfreedom/totalfreedommod/command/Command_opme.java b/src/main/java/me/totalfreedom/totalfreedommod/command/Command_opme.java index b39e8429..eaadd8fc 100644 --- a/src/main/java/me/totalfreedom/totalfreedommod/command/Command_opme.java +++ b/src/main/java/me/totalfreedom/totalfreedommod/command/Command_opme.java @@ -14,7 +14,7 @@ public class Command_opme extends FreedomCommand @Override public boolean run(CommandSender sender, Player playerSender, Command cmd, String commandLabel, String[] args, boolean senderIsConsole) { - FUtil.staffAction(sender.getName(), "Opping " + sender.getName(), false); + FUtil.adminAction(sender.getName(), "Opping " + sender.getName(), false); sender.setOp(true); sender.sendMessage(FreedomCommand.YOU_ARE_OP); return true; diff --git a/src/main/java/me/totalfreedom/totalfreedommod/command/Command_ops.java b/src/main/java/me/totalfreedom/totalfreedommod/command/Command_ops.java index 3ac97109..cb7e697f 100644 --- a/src/main/java/me/totalfreedom/totalfreedommod/command/Command_ops.java +++ b/src/main/java/me/totalfreedom/totalfreedommod/command/Command_ops.java @@ -42,13 +42,13 @@ public class Command_ops extends FreedomCommand if (args[0].equals("purge")) { - if (!plugin.sl.isStaff(sender)) + if (!plugin.al.isAdmin(sender)) { noPerms(); return true; } - FUtil.staffAction(sender.getName(), "Purging all operators", true); + FUtil.adminAction(sender.getName(), "Purging all operators", true); for (OfflinePlayer player : server.getOperators()) { diff --git a/src/main/java/me/totalfreedom/totalfreedommod/command/Command_orbit.java b/src/main/java/me/totalfreedom/totalfreedommod/command/Command_orbit.java index 0db05178..6227f57e 100644 --- a/src/main/java/me/totalfreedom/totalfreedommod/command/Command_orbit.java +++ b/src/main/java/me/totalfreedom/totalfreedommod/command/Command_orbit.java @@ -60,7 +60,7 @@ public class Command_orbit extends FreedomCommand playerdata.startOrbiting(strength); player.setVelocity(new Vector(0, strength, 0)); - FUtil.staffAction(sender.getName(), "Orbiting " + player.getName(), false); + FUtil.adminAction(sender.getName(), "Orbiting " + player.getName(), false); return true; } diff --git a/src/main/java/me/totalfreedom/totalfreedommod/command/Command_panel.java b/src/main/java/me/totalfreedom/totalfreedommod/command/Command_panel.java index 0b3eff38..6c7ada38 100644 --- a/src/main/java/me/totalfreedom/totalfreedommod/command/Command_panel.java +++ b/src/main/java/me/totalfreedom/totalfreedommod/command/Command_panel.java @@ -6,7 +6,7 @@ import java.util.Collections; import java.util.List; import me.totalfreedom.totalfreedommod.player.PlayerData; import me.totalfreedom.totalfreedommod.rank.Rank; -import me.totalfreedom.totalfreedommod.staff.StaffMember; +import me.totalfreedom.totalfreedommod.admin.Admin; import me.totalfreedom.totalfreedommod.util.FUtil; import org.bukkit.ChatColor; import org.bukkit.command.Command; @@ -44,9 +44,9 @@ public class Command_panel extends FreedomCommand if (args[0].equals("create")) { msg("Creating your Pterodactyl account...", ChatColor.GREEN); - StaffMember staffMember = getStaffMember(playerSender); + Admin admin = getAdmin(playerSender); - if (staffMember.getPteroID() != null) + if (admin.getPteroID() != null) { msg("You already have a Pterodactyl account.", ChatColor.RED); return true; @@ -64,9 +64,9 @@ public class Command_panel extends FreedomCommand plugin.ptero.addAccountToServer(id); - staffMember.setPteroID(id); - plugin.sl.save(staffMember); - plugin.sl.updateTables(); + admin.setPteroID(id); + plugin.al.save(admin); + plugin.al.updateTables(); plugin.dc.sendPteroInfo(playerData, username, password); msg("Successfully created your Pterodactyl account. Check your DMs from " + plugin.dc.formatBotTag() + " on discord to get your credentials.", ChatColor.GREEN); @@ -75,15 +75,15 @@ public class Command_panel extends FreedomCommand else if (args[0].equals("delete")) { msg("Deleting your Pterodactyl account...", ChatColor.GREEN); - StaffMember staffMember = getStaffMember(playerSender); + Admin admin = getAdmin(playerSender); - if (staffMember.getPteroID() == null) + if (admin.getPteroID() == null) { msg("You do not have a Pterodactyl account.", ChatColor.RED); return true; } - boolean deleted = plugin.ptero.deleteAccount(staffMember.getPteroID()); + boolean deleted = plugin.ptero.deleteAccount(admin.getPteroID()); if (!deleted) { @@ -91,33 +91,13 @@ public class Command_panel extends FreedomCommand return true; } - staffMember.setPteroID(null); - plugin.sl.save(staffMember); - plugin.sl.updateTables(); + admin.setPteroID(null); + plugin.al.save(admin); + plugin.al.updateTables(); msg("Successfully deleted your Pterodactyl account.", ChatColor.GREEN); return true; } - /*else if (args[0].equals("resetpassword")) - { - StaffMember staffMember = getAdmin(playerSender); - - if (staffMember.getAmpUsername() == null) - { - msg("You do not have a Pterodactyl account.", ChatColor.RED); - return true; - } - - msg("Resetting your password...", ChatColor.GREEN); - - String id = staffMember.getPteroID(); - String password = FUtil.randomString(30); - plugin.ptero.setPassword(id, password); - plugin.dc.sendPteroInfo(playerData, null, password); - - msg("Successfully reset your AMP account password. Check your DMs from " + plugin.dc.formatBotTag() + " on discord to get your credentials.", ChatColor.GREEN); - return true; - }*/ return false; } @@ -125,7 +105,7 @@ public class Command_panel extends FreedomCommand @Override public List getTabCompleteOptions(CommandSender sender, Command command, String alias, String[] args) { - if (args.length == 1 && plugin.sl.isAdmin(sender)) + if (args.length == 1 && plugin.al.isSeniorAdmin(sender)) { return Arrays.asList("create", "delete"); } diff --git a/src/main/java/me/totalfreedom/totalfreedommod/command/Command_permissions.java b/src/main/java/me/totalfreedom/totalfreedommod/command/Command_permissions.java index 2c9c8eeb..ecfa2477 100644 --- a/src/main/java/me/totalfreedom/totalfreedommod/command/Command_permissions.java +++ b/src/main/java/me/totalfreedom/totalfreedommod/command/Command_permissions.java @@ -15,7 +15,7 @@ public class Command_permissions extends FreedomCommand @Override public boolean run(CommandSender sender, Player playerSender, Command cmd, String commandLabel, String[] args, boolean senderIsConsole) { - if (args.length > 0 && args[0].equals("reload") && plugin.sl.isStaff(sender)) + if (args.length > 0 && args[0].equals("reload") && plugin.al.isAdmin(sender)) { plugin.permissions.load(); plugin.pem.loadPermissionNodes(); diff --git a/src/main/java/me/totalfreedom/totalfreedommod/command/Command_playtime.java b/src/main/java/me/totalfreedom/totalfreedommod/command/Command_playtime.java deleted file mode 100644 index 88b571d5..00000000 --- a/src/main/java/me/totalfreedom/totalfreedommod/command/Command_playtime.java +++ /dev/null @@ -1,63 +0,0 @@ -package me.totalfreedom.totalfreedommod.command; - -import java.time.Instant; -import java.util.Date; -import java.util.List; -import me.totalfreedom.totalfreedommod.rank.Rank; -import me.totalfreedom.totalfreedommod.staff.ActivityLogEntry; -import me.totalfreedom.totalfreedommod.util.FUtil; -import org.bukkit.command.Command; -import org.bukkit.command.CommandSender; -import org.bukkit.entity.Player; - -@CommandPermissions(level = Rank.ADMIN, source = SourceType.ONLY_IN_GAME) -@CommandParameters(description = "Gets your playtime statistics.", usage = "/") -public class Command_playtime extends FreedomCommand -{ - @Override - public boolean run(final CommandSender sender, final Player playerSender, final Command cmd, final String commandLabel, final String[] args, final boolean senderIsConsole) - { - ActivityLogEntry entry = plugin.acl.getActivityLog(playerSender); - int seconds = entry.getTotalSecondsPlayed(); - int minutes = 0; - int hours = 0; - while (seconds >= 60) - { - seconds -= 60; - minutes += 1; - } - while (minutes >= 60) - { - minutes -= 60; - hours += 1; - } - if (entry.getTimestamps().size() == 0) - { - entry.addLogin(); - } - String lastLoginString = entry.getTimestamps().get(entry.getTimestamps().size() - 1); - Date currentTime = Date.from(Instant.now()); - lastLoginString = lastLoginString.replace("Login: ", ""); - Date lastLogin = FUtil.stringToDate(lastLoginString); - - long duration = currentTime.getTime() - lastLogin.getTime(); - long cseconds = duration / 1000 % 60; - long cminutes = duration / (60 * 1000) % 60; - long chours = duration / (60 * 60 * 1000); - StringBuilder sb = new StringBuilder() - .append("Playtime - " + sender.getName() + "\n") - .append("Current Session: " + chours + " hours, " + cminutes + " minutes, and " + cseconds + " seconds" + "\n") - .append("Overall: " + hours + " hours, " + minutes + " minutes, and " + seconds + " seconds" + "\n"); - List durations = entry.getDurations(); - if (durations.size() >= 3) - { - sb.append("Recent Sessions:"); - for (int i = 0; i < 3; i++) - { - sb.append("\n" + " - " + durations.get((durations.size() - 1) - i)); - } - } - msg(sb.toString()); - return true; - } -} diff --git a/src/main/java/me/totalfreedom/totalfreedommod/command/Command_plugincontrol.java b/src/main/java/me/totalfreedom/totalfreedommod/command/Command_plugincontrol.java index 5a5b6c11..de1d0ad7 100644 --- a/src/main/java/me/totalfreedom/totalfreedommod/command/Command_plugincontrol.java +++ b/src/main/java/me/totalfreedom/totalfreedommod/command/Command_plugincontrol.java @@ -135,7 +135,7 @@ public class Command_plugincontrol extends FreedomCommand @Override public List getTabCompleteOptions(CommandSender sender, Command command, String alias, String[] args) { - if (!plugin.sl.isStaff(sender)) + if (!plugin.al.isAdmin(sender)) { return Collections.emptyList(); } diff --git a/src/main/java/me/totalfreedom/totalfreedommod/command/Command_potion.java b/src/main/java/me/totalfreedom/totalfreedommod/command/Command_potion.java index 7b7bbc1f..5b2032ca 100644 --- a/src/main/java/me/totalfreedom/totalfreedommod/command/Command_potion.java +++ b/src/main/java/me/totalfreedom/totalfreedommod/command/Command_potion.java @@ -42,13 +42,13 @@ public class Command_potion extends FreedomCommand } else if (args[0].equalsIgnoreCase("clearall")) { - if (!(plugin.sl.isStaff(sender) || senderIsConsole)) + if (!(plugin.al.isAdmin(sender) || senderIsConsole)) { noPerms(); return true; } - FUtil.staffAction(sender.getName(), "Cleared all potion effects from all players", true); + FUtil.adminAction(sender.getName(), "Cleared all potion effects from all players", true); for (Player target : server.getOnlinePlayers()) { for (PotionEffect potion_effect : target.getActivePotionEffects()) @@ -64,9 +64,9 @@ public class Command_potion extends FreedomCommand Player target = playerSender; if(args.length == 2) { - if (!plugin.sl.isStaff(sender) && !target.equals(getPlayer(sender.getName()))) + if (!plugin.al.isAdmin(sender) && !target.equals(getPlayer(sender.getName()))) { - msg(ChatColor.RED + "Only staff can clear potion effects from other players."); + msg(ChatColor.RED + "Only admins can clear potion effects from other players."); return true; } target = getPlayer(args[1], true); @@ -103,15 +103,15 @@ public class Command_potion extends FreedomCommand if (args.length == 5) { - if (!plugin.sl.isStaff(sender) && !getPlayer(args[4]).equals(getPlayer(sender.getName()))) + if (!plugin.al.isAdmin(sender) && !getPlayer(args[4]).equals(getPlayer(sender.getName()))) { - sender.sendMessage(ChatColor.RED + "Only staff can apply potion effects to other players."); + sender.sendMessage(ChatColor.RED + "Only admins can apply potion effects to other players."); return true; } target = getPlayer(args[4]); - if (target == null || plugin.sl.isVanished(target.getName()) && !plugin.sl.isStaff(sender)) + if (target == null || plugin.al.isVanished(target.getName()) && !plugin.al.isAdmin(sender)) { msg(FreedomCommand.PLAYER_NOT_FOUND, ChatColor.RED); return true; @@ -180,7 +180,7 @@ public class Command_potion extends FreedomCommand case 1: List arguments = new ArrayList<>(); arguments.addAll(Arrays.asList("list", "clear", "add")); - if (plugin.sl.isStaff(sender)) + if (plugin.al.isAdmin(sender)) { arguments.add("clearall"); } @@ -189,7 +189,7 @@ public class Command_potion extends FreedomCommand case 2: if (args[0].equals("clear")) { - if (plugin.sl.isStaff(sender)) + if (plugin.al.isAdmin(sender)) { return FUtil.getPlayerList(); } @@ -215,7 +215,7 @@ public class Command_potion extends FreedomCommand break; case 5: - if (plugin.sl.isStaff(sender)) + if (plugin.al.isAdmin(sender)) { if (args[0].equals("add")) { diff --git a/src/main/java/me/totalfreedom/totalfreedommod/command/Command_potionspy.java b/src/main/java/me/totalfreedom/totalfreedommod/command/Command_potionspy.java index beae27f2..dde57f0b 100644 --- a/src/main/java/me/totalfreedom/totalfreedommod/command/Command_potionspy.java +++ b/src/main/java/me/totalfreedom/totalfreedommod/command/Command_potionspy.java @@ -5,7 +5,7 @@ import java.util.Collections; import java.util.List; import java.util.Map; import me.totalfreedom.totalfreedommod.rank.Rank; -import me.totalfreedom.totalfreedommod.staff.StaffMember; +import me.totalfreedom.totalfreedommod.admin.Admin; import me.totalfreedom.totalfreedommod.util.FUtil; import org.apache.commons.lang.math.NumberUtils; import org.bukkit.Bukkit; @@ -16,7 +16,7 @@ import org.bukkit.entity.Player; import org.bukkit.entity.ThrownPotion; @CommandPermissions(level = Rank.ADMIN, source = SourceType.ONLY_IN_GAME) -@CommandParameters(description = "Allows staff to see potions that are thrown.", usage = "/ | history [player] ", aliases = "potspy") +@CommandParameters(description = "Allows admins to see potions that are thrown.", usage = "/ | history [player] ", aliases = "potspy") public class Command_potionspy extends FreedomCommand { private String titleText = "&8&m------------------&r &ePotionSpy &8&m------------------&r"; @@ -28,11 +28,11 @@ public class Command_potionspy extends FreedomCommand @Override public boolean run(CommandSender sender, Player playerSender, Command cmd, String commandLabel, String[] args, boolean senderIsConsole) { - StaffMember staffMember = plugin.sl.getAdmin(playerSender); + Admin admin = plugin.al.getAdmin(playerSender); if (args.length <= 0) { - setPotionSpyState(staffMember, !staffMember.getPotionSpy()); + setPotionSpyState(admin, !admin.getPotionSpy()); return true; } else @@ -41,12 +41,12 @@ public class Command_potionspy extends FreedomCommand { case "enable": case "on": - setPotionSpyState(staffMember, true); + setPotionSpyState(admin, true); break; case "disable": case "off": - setPotionSpyState(staffMember, false); + setPotionSpyState(admin, false); break; case "history": @@ -176,12 +176,12 @@ public class Command_potionspy extends FreedomCommand return true; } - private void setPotionSpyState(StaffMember staffMember, boolean state) + private void setPotionSpyState(Admin admin, boolean state) { - staffMember.setPotionSpy(state); - plugin.sl.save(staffMember); - plugin.sl.updateTables(); - msg("PotionSpy is now " + (staffMember.getPotionSpy() ? "enabled." : "disabled.")); + admin.setPotionSpy(state); + plugin.al.save(admin); + plugin.al.updateTables(); + msg("PotionSpy is now " + (admin.getPotionSpy() ? "enabled." : "disabled.")); } /** diff --git a/src/main/java/me/totalfreedom/totalfreedommod/command/Command_purgeall.java b/src/main/java/me/totalfreedom/totalfreedommod/command/Command_purgeall.java index 18b8426c..efee00ac 100644 --- a/src/main/java/me/totalfreedom/totalfreedommod/command/Command_purgeall.java +++ b/src/main/java/me/totalfreedom/totalfreedommod/command/Command_purgeall.java @@ -19,7 +19,7 @@ public class Command_purgeall extends FreedomCommand @Override public boolean run(CommandSender sender, Player playerSender, Command cmd, String commandLabel, String[] args, boolean senderIsConsole) { - FUtil.staffAction(sender.getName(), "Purging all player data", true); + FUtil.adminAction(sender.getName(), "Purging all player data", true); // Purge entities for (World world : Bukkit.getWorlds()) diff --git a/src/main/java/me/totalfreedom/totalfreedommod/command/Command_reactionbar.java b/src/main/java/me/totalfreedom/totalfreedommod/command/Command_reactionbar.java index 6aa9ab96..83cde4d5 100644 --- a/src/main/java/me/totalfreedom/totalfreedommod/command/Command_reactionbar.java +++ b/src/main/java/me/totalfreedom/totalfreedommod/command/Command_reactionbar.java @@ -10,7 +10,6 @@ import org.bukkit.entity.Player; @CommandParameters(description = "Forcefully start a reaction", usage = "/") public class Command_reactionbar extends FreedomCommand { - @Override public boolean run(CommandSender sender, Player playerSender, Command cmd, String commandLabel, String[] args, boolean senderIsConsole) { diff --git a/src/main/java/me/totalfreedom/totalfreedommod/command/Command_report.java b/src/main/java/me/totalfreedom/totalfreedommod/command/Command_report.java index 114cd96b..46bdd8f2 100644 --- a/src/main/java/me/totalfreedom/totalfreedommod/command/Command_report.java +++ b/src/main/java/me/totalfreedom/totalfreedommod/command/Command_report.java @@ -9,10 +9,9 @@ import org.bukkit.command.CommandSender; import org.bukkit.entity.Player; @CommandPermissions(level = Rank.OP, source = SourceType.ONLY_IN_GAME, blockHostConsole = true) -@CommandParameters(description = "Report a player for all staff to see.", usage = "/ ") +@CommandParameters(description = "Report a player for all admins to see.", usage = "/ ") public class Command_report extends FreedomCommand { - @Override public boolean run(CommandSender sender, Player playerSender, Command cmd, String commandLabel, String[] args, boolean senderIsConsole) { @@ -38,9 +37,9 @@ public class Command_report extends FreedomCommand } } - if (plugin.sl.isStaff(player)) + if (plugin.al.isAdmin(player)) { - msg(ChatColor.RED + "You can not report server staff."); + msg(ChatColor.RED + "You can not report admins."); return true; } diff --git a/src/main/java/me/totalfreedom/totalfreedommod/command/Command_ride.java b/src/main/java/me/totalfreedom/totalfreedommod/command/Command_ride.java index 0e01496f..d2a3a486 100644 --- a/src/main/java/me/totalfreedom/totalfreedommod/command/Command_ride.java +++ b/src/main/java/me/totalfreedom/totalfreedommod/command/Command_ride.java @@ -114,7 +114,7 @@ public class Command_ride extends FreedomCommand return true; } - if (playerData.getRideMode().equals("off") && !isStaff(sender)) + if (playerData.getRideMode().equals("off") && !isAdmin(sender)) { msg("That player cannot be ridden.", ChatColor.RED); return true; diff --git a/src/main/java/me/totalfreedom/totalfreedommod/command/Command_rideablepearl.java b/src/main/java/me/totalfreedom/totalfreedommod/command/Command_rideablepearl.java index b4e02d6f..a1d9c0be 100644 --- a/src/main/java/me/totalfreedom/totalfreedommod/command/Command_rideablepearl.java +++ b/src/main/java/me/totalfreedom/totalfreedommod/command/Command_rideablepearl.java @@ -8,10 +8,9 @@ import org.bukkit.command.CommandSender; import org.bukkit.entity.Player; @CommandPermissions(level = Rank.OP, source = SourceType.ONLY_IN_GAME) -@CommandParameters(description = "Obtain a rideable ender pearl", usage = "/") +@CommandParameters(description = "Obtain a rideable Ender Pearl", usage = "/") public class Command_rideablepearl extends FreedomCommand { - @Override public boolean run(CommandSender sender, Player playerSender, Command cmd, String commandLabel, String[] args, boolean senderIsConsole) { diff --git a/src/main/java/me/totalfreedom/totalfreedommod/command/Command_ro.java b/src/main/java/me/totalfreedom/totalfreedommod/command/Command_ro.java index ee20441c..9a8922c6 100644 --- a/src/main/java/me/totalfreedom/totalfreedommod/command/Command_ro.java +++ b/src/main/java/me/totalfreedom/totalfreedommod/command/Command_ro.java @@ -92,10 +92,10 @@ public class Command_ro extends FreedomCommand names = StringUtils.join(materials, ", "); } - World staffWorld = null; + World adminWorld = null; try { - staffWorld = plugin.wm.staffworld.getWorld(); + adminWorld = plugin.wm.adminworld.getWorld(); } catch (Exception ex) { @@ -104,11 +104,11 @@ public class Command_ro extends FreedomCommand int affected = 0; if (targetPlayer == null) { - FUtil.staffAction(sender.getName(), "Removing all " + names + " within " + radius + " blocks of all players... Brace for lag!", false); + FUtil.adminAction(sender.getName(), "Removing all " + names + " within " + radius + " blocks of all players... Brace for lag!", false); for (final Player player : server.getOnlinePlayers()) { - if (player.getWorld() == staffWorld) + if (player.getWorld() == adminWorld) { continue; } @@ -121,9 +121,9 @@ public class Command_ro extends FreedomCommand } else { - if (targetPlayer.getWorld() != staffWorld) + if (targetPlayer.getWorld() != adminWorld) { - FUtil.staffAction(sender.getName(), "Removing all " + names + " within " + radius + " blocks of " + targetPlayer.getName(), false); + FUtil.adminAction(sender.getName(), "Removing all " + names + " within " + radius + " blocks of " + targetPlayer.getName(), false); for (Material material : materials) { affected += replaceBlocks(targetPlayer.getLocation(), material, Material.AIR, radius); @@ -131,7 +131,7 @@ public class Command_ro extends FreedomCommand } } - FUtil.staffAction(sender.getName(), "Remove complete! " + affected + " blocks removed.", false); + FUtil.adminAction(sender.getName(), "Remove complete! " + affected + " blocks removed.", false); return true; } diff --git a/src/main/java/me/totalfreedom/totalfreedommod/command/Command_slconfig.java b/src/main/java/me/totalfreedom/totalfreedommod/command/Command_saconfig.java similarity index 58% rename from src/main/java/me/totalfreedom/totalfreedommod/command/Command_slconfig.java rename to src/main/java/me/totalfreedom/totalfreedommod/command/Command_saconfig.java index d1c619a7..a840d29f 100644 --- a/src/main/java/me/totalfreedom/totalfreedommod/command/Command_slconfig.java +++ b/src/main/java/me/totalfreedom/totalfreedommod/command/Command_saconfig.java @@ -9,7 +9,7 @@ import me.totalfreedom.totalfreedommod.config.ConfigEntry; import me.totalfreedom.totalfreedommod.discord.Discord; import me.totalfreedom.totalfreedommod.player.FPlayer; import me.totalfreedom.totalfreedommod.rank.Rank; -import me.totalfreedom.totalfreedommod.staff.StaffMember; +import me.totalfreedom.totalfreedommod.admin.Admin; import me.totalfreedom.totalfreedommod.util.FUtil; import org.apache.commons.lang.StringUtils; import org.bukkit.ChatColor; @@ -18,10 +18,9 @@ import org.bukkit.command.CommandSender; import org.bukkit.entity.Player; @CommandPermissions(level = Rank.OP, source = SourceType.BOTH) -@CommandParameters(description = "List, add, remove, or set the rank of staff, clean or reload the staff list, or view the info of staff.", usage = "/ | >") -public class Command_slconfig extends FreedomCommand +@CommandParameters(description = "List, add, remove, or set the rank of admins, clean or reload the admin list, or view the info of admins.", usage = "/ | >") +public class Command_saconfig extends FreedomCommand { - @Override public boolean run(CommandSender sender, Player playerSender, Command cmd, String commandLabel, String[] args, boolean senderIsConsole) { @@ -34,7 +33,7 @@ public class Command_slconfig extends FreedomCommand { case "list": { - msg("Staff: " + StringUtils.join(plugin.sl.getAdminNames(), ", "), ChatColor.GOLD); + msg("Admins: " + StringUtils.join(plugin.al.getAdminNames(), ", "), ChatColor.GOLD); return true; } @@ -43,9 +42,9 @@ public class Command_slconfig extends FreedomCommand checkConsole(); checkRank(Rank.SENIOR_ADMIN); - FUtil.staffAction(sender.getName(), "Cleaning staff list", true); - plugin.sl.deactivateOldEntries(true); - msg("Staff: " + StringUtils.join(plugin.sl.getAdminNames(), ", "), ChatColor.GOLD); + FUtil.adminAction(sender.getName(), "Cleaning admin list", true); + plugin.al.deactivateOldEntries(true); + msg("Admins: " + StringUtils.join(plugin.al.getAdminNames(), ", "), ChatColor.GOLD); return true; } @@ -54,9 +53,9 @@ public class Command_slconfig extends FreedomCommand { checkRank(Rank.SENIOR_ADMIN); - FUtil.staffAction(sender.getName(), "Reloading the staff list", true); - plugin.sl.load(); - msg("Staff list reloaded!"); + FUtil.adminAction(sender.getName(), "Reloading the admin list", true); + plugin.al.load(); + msg("Admin list reloaded!"); return true; } @@ -85,23 +84,23 @@ public class Command_slconfig extends FreedomCommand if (!rank.isAtLeast(Rank.ADMIN)) { - msg("Rank must be Trial Mod or higher.", ChatColor.RED); + msg("Rank must be Admin or higher.", ChatColor.RED); return true; } - StaffMember staffMember = plugin.sl.getEntryByName(args[1]); - if (staffMember == null) + Admin admin = plugin.al.getEntryByName(args[1]); + if (admin == null) { - msg("Unknown staff member: " + args[1]); + msg("Unknown admin: " + args[1]); return true; } - FUtil.staffAction(sender.getName(), "Setting " + staffMember.getName() + "'s rank to " + rank.getName(), true); + FUtil.adminAction(sender.getName(), "Setting " + admin.getName() + "'s rank to " + rank.getName(), true); - staffMember.setRank(rank); - plugin.sl.save(staffMember); + admin.setRank(rank); + plugin.al.save(admin); - Player player = getPlayer(staffMember.getName()); + Player player = getPlayer(admin.getName()); if (player != null) { plugin.rm.updateDisplay(player); @@ -109,12 +108,12 @@ public class Command_slconfig extends FreedomCommand if (plugin.dc.enabled && ConfigEntry.DISCORD_ROLE_SYNC.getBoolean()) { - Discord.syncRoles(staffMember, plugin.pl.getData(staffMember.getName()).getDiscordID()); + Discord.syncRoles(admin, plugin.pl.getData(admin.getName()).getDiscordID()); } - plugin.ptero.updateAccountStatus(staffMember); + plugin.ptero.updateAccountStatus(admin); - msg("Set " + staffMember.getName() + "'s rank to " + rank.getName()); + msg("Set " + admin.getName() + "'s rank to " + rank.getName()); return true; } @@ -127,24 +126,24 @@ public class Command_slconfig extends FreedomCommand checkRank(Rank.ADMIN); - StaffMember staffMember = plugin.sl.getEntryByName(args[1]); + Admin admin = plugin.al.getEntryByName(args[1]); - if (staffMember == null) + if (admin == null) { final Player player = getPlayer(args[1]); if (player != null) { - staffMember = plugin.sl.getAdmin(player); + admin = plugin.al.getAdmin(player); } } - if (staffMember == null) + if (admin == null) { - msg("Staff member not found: " + args[1]); + msg("Admin not found: " + args[1]); } else { - msg(staffMember.toString()); + msg(admin.toString()); } return true; @@ -160,7 +159,7 @@ public class Command_slconfig extends FreedomCommand checkConsole(); checkRank(Rank.ADMIN); - // Player already staff? + // Player already admin? final Player player = getPlayer(args[1]); if (player == null) @@ -169,31 +168,31 @@ public class Command_slconfig extends FreedomCommand return true; } - if (plugin.sl.isStaff(player)) + if (plugin.al.isAdmin(player)) { - msg("That player is already a staff member."); + msg("That player is already an admin."); return true; } - // Find the old staff entry + // Find the old admin entry String name = player != null ? player.getName() : args[1]; - StaffMember staffMember = null; - for (StaffMember loopStaffMember : plugin.sl.getAllStaffMembers()) + Admin admin = null; + for (Admin loopAdmin : plugin.al.getAllAdmins()) { - if (loopStaffMember.getName().equalsIgnoreCase(name) || loopStaffMember.getIps().contains(FUtil.getIp(player))) + if (loopAdmin.getName().equalsIgnoreCase(name) || loopAdmin.getIps().contains(FUtil.getIp(player))) { - staffMember = loopStaffMember; + admin = loopAdmin; break; } } if (plugin.pl.isPlayerImpostor(player)) { - msg("This player was labeled as a Player impostor and is not a staff member, therefore they cannot be added to the staff list.", ChatColor.RED); + msg("This player was labeled as a Player impostor and is not an admin, therefore they cannot be added to the admin list.", ChatColor.RED); return true; } - if (staffMember == null) // New staff member + if (admin == null) // New admin { if (player == null) { @@ -201,39 +200,39 @@ public class Command_slconfig extends FreedomCommand return true; } - FUtil.staffAction(sender.getName(), "Adding " + player.getName() + " to the staff list", true); - staffMember = new StaffMember(player); + FUtil.adminAction(sender.getName(), "Adding " + player.getName() + " to the admin list", true); + admin = new Admin(player); - plugin.sl.addAdmin(staffMember); + plugin.al.addAdmin(admin); plugin.rm.updateDisplay(player); - plugin.ptero.updateAccountStatus(staffMember); + plugin.ptero.updateAccountStatus(admin); } - else // Existing staff member + else // Existing admin { - FUtil.staffAction(sender.getName(), "Re-adding " + player.getName() + " to the staff list", true); + FUtil.adminAction(sender.getName(), "Re-adding " + player.getName() + " to the admin list", true); if (player != null) { - String oldName = staffMember.getName(); - if (oldName != player.getName()) + String oldName = admin.getName(); + if (!oldName.equals(player.getName())) { - staffMember.setName(player.getName()); - plugin.sql.updateStaffMemberName(oldName, staffMember.getName()); + admin.setName(player.getName()); + plugin.sql.updateAdminName(oldName, admin.getName()); } - staffMember.addIp(FUtil.getIp(player)); + admin.addIp(FUtil.getIp(player)); } - staffMember.setActive(true); - staffMember.setLastLogin(new Date()); + admin.setActive(true); + admin.setLastLogin(new Date()); - if (plugin.sl.isVerifiedStaff(player)) + if (plugin.al.isVerifiedAdmin(player)) { - plugin.sl.verifiedNoStaff.remove(player.getName()); - plugin.sl.verifiedNoStaffIps.remove(player.getName()); + plugin.al.verifiedNoAdmin.remove(player.getName()); + plugin.al.verifiedNoAdminIps.remove(player.getName()); } - plugin.sl.save(staffMember); - plugin.sl.updateTables(); + plugin.al.save(admin); + plugin.al.updateTables(); if (player != null) { plugin.rm.updateDisplay(player); @@ -241,9 +240,9 @@ public class Command_slconfig extends FreedomCommand if (plugin.dc.enabled && ConfigEntry.DISCORD_ROLE_SYNC.getBoolean()) { - plugin.dc.syncRoles(staffMember, plugin.pl.getData(player).getDiscordID()); + plugin.dc.syncRoles(admin, plugin.pl.getData(player).getDiscordID()); } - plugin.ptero.updateAccountStatus(staffMember); + plugin.ptero.updateAccountStatus(admin); } if (player != null) @@ -275,31 +274,31 @@ public class Command_slconfig extends FreedomCommand checkRank(Rank.ADMIN); Player player = getPlayer(args[1]); - StaffMember staffMember = player != null ? plugin.sl.getAdmin(player) : plugin.sl.getEntryByName(args[1]); + Admin admin = player != null ? plugin.al.getAdmin(player) : plugin.al.getEntryByName(args[1]); - if (staffMember == null) + if (admin == null) { - msg("Staff member not found: " + args[1]); + msg("Admin not found: " + args[1]); return true; } - FUtil.staffAction(sender.getName(), "Removing " + staffMember.getName() + " from the staff list", true); - staffMember.setActive(false); + FUtil.adminAction(sender.getName(), "Removing " + admin.getName() + " from the admin list", true); + admin.setActive(false); - plugin.sl.save(staffMember); - plugin.sl.updateTables(); + plugin.al.save(admin); + plugin.al.updateTables(); if (player != null) { plugin.rm.updateDisplay(player); - plugin.pl.getPlayer(player).setStaffChat(false); + plugin.pl.getPlayer(player).setAdminChat(false); } if (plugin.dc.enabled && ConfigEntry.DISCORD_ROLE_SYNC.getBoolean()) { - Discord.syncRoles(staffMember, plugin.pl.getData(staffMember.getName()).getDiscordID()); + Discord.syncRoles(admin, plugin.pl.getData(admin.getName()).getDiscordID()); } - plugin.ptero.updateAccountStatus(staffMember); + plugin.ptero.updateAccountStatus(admin); return true; } @@ -318,16 +317,12 @@ public class Command_slconfig extends FreedomCommand { List arguments = new ArrayList<>(); arguments.add("list"); - if (plugin.sl.isStaff(sender)) - { - arguments.add("info"); - } - if (plugin.sl.isMod(sender)) + if (plugin.al.isAdmin(sender)) { arguments.add("add"); arguments.add("remove"); } - if (plugin.sl.isAdmin(sender)) + if (plugin.al.isSeniorAdmin(sender)) { arguments.add("reload"); arguments.add("clean"); diff --git a/src/main/java/me/totalfreedom/totalfreedommod/command/Command_scare.java b/src/main/java/me/totalfreedom/totalfreedommod/command/Command_scare.java deleted file mode 100644 index 53e93c75..00000000 --- a/src/main/java/me/totalfreedom/totalfreedommod/command/Command_scare.java +++ /dev/null @@ -1,62 +0,0 @@ -package me.totalfreedom.totalfreedommod.command; - -import java.util.Collections; -import java.util.List; -import me.totalfreedom.totalfreedommod.rank.Rank; -import me.totalfreedom.totalfreedommod.util.FUtil; -import org.bukkit.ChatColor; -import org.bukkit.Particle; -import org.bukkit.Sound; -import org.bukkit.command.Command; -import org.bukkit.command.CommandSender; -import org.bukkit.entity.Player; - -@CommandPermissions(level = Rank.SENIOR_ADMIN, source = SourceType.BOTH) -@CommandParameters(description = "Sends a guardian particle effect with an enderman scream to the specified player.", usage = "/ ") -public class Command_scare extends FreedomCommand -{ - @Override - public boolean run(CommandSender sender, Player playerSender, Command cmd, String commandLabel, String[] args, boolean senderIsConsole) - { - if (!FUtil.isPaper()) - { - msg("This command won't work without Paper!", ChatColor.RED); - return true; - } - - if (args.length == 0) - { - return false; - } - - final Player player = getPlayer(args[0]); - - if (player == null) - { - msg(FreedomCommand.PLAYER_NOT_FOUND); - return true; - } - - msg("Scared " + player.getName()); - player.sendMessage(ChatColor.RED + "ZING"); - - player.spawnParticle(Particle.MOB_APPEARANCE, player.getLocation(), 4); - for (int i = 0; i < 10; ++i) - { - player.playSound(player.getLocation(), Sound.ENTITY_ENDERMAN_SCREAM, 1, 0); - } - - - return true; - } - - @Override - public List getTabCompleteOptions(CommandSender sender, Command command, String alias, String[] args) - { - if (args.length == 1 && plugin.sl.isStaff(sender)) - { - return FUtil.getPlayerList(); - } - return Collections.emptyList(); - } -} diff --git a/src/main/java/me/totalfreedom/totalfreedommod/command/Command_serverstats.java b/src/main/java/me/totalfreedom/totalfreedommod/command/Command_serverstats.java index 6d17dbed..c2087f00 100644 --- a/src/main/java/me/totalfreedom/totalfreedommod/command/Command_serverstats.java +++ b/src/main/java/me/totalfreedom/totalfreedommod/command/Command_serverstats.java @@ -8,16 +8,15 @@ import org.bukkit.command.CommandSender; import org.bukkit.entity.Player; @CommandPermissions(level = Rank.OP, source = SourceType.BOTH) -@CommandParameters(description = "Check the status of the server, including opped players, staff, etc.", usage = "/", aliases = "ss") +@CommandParameters(description = "Check the status of the server, including opped players, admins, etc.", usage = "/", aliases = "ss") public class Command_serverstats extends FreedomCommand { - @Override public boolean run(CommandSender sender, Player playerSender, Command cmd, String commandLabel, String[] args, boolean senderIsConsole) { msg("-==" + ConfigEntry.SERVER_NAME.getString() + " server stats==-", ChatColor.GOLD); msg("Total opped players: " + server.getOperators().size(), ChatColor.RED); - msg("Total staff: " + plugin.sl.getAllStaffMembers().size() + " (" + plugin.sl.getActiveStaffMembers().size() + " active)", ChatColor.BLUE); + msg("Total admins: " + plugin.al.getAllAdmins().size() + " (" + plugin.al.getActiveAdmins().size() + " active)", ChatColor.BLUE); int bans = plugin.im.getIndefBans().size(); int nameBans = plugin.im.getNameBanCount(); int uuidBans = plugin.im.getUuidBanCount(); diff --git a/src/main/java/me/totalfreedom/totalfreedommod/command/Command_setlimit.java b/src/main/java/me/totalfreedom/totalfreedommod/command/Command_setlimit.java index 3d4ffa0d..1357814f 100644 --- a/src/main/java/me/totalfreedom/totalfreedommod/command/Command_setlimit.java +++ b/src/main/java/me/totalfreedom/totalfreedommod/command/Command_setlimit.java @@ -43,7 +43,7 @@ public class Command_setlimit extends FreedomCommand } if (success) { - FUtil.staffAction(sender.getName(), "Setting everyone's WorldEdit block modification limit to " + amount + ".", true); + FUtil.adminAction(sender.getName(), "Setting everyone's WorldEdit block modification limit to " + amount + ".", true); } return true; } diff --git a/src/main/java/me/totalfreedom/totalfreedommod/command/Command_setplayerlimit.java b/src/main/java/me/totalfreedom/totalfreedommod/command/Command_setplayerlimit.java index 22f027b5..c1174859 100644 --- a/src/main/java/me/totalfreedom/totalfreedommod/command/Command_setplayerlimit.java +++ b/src/main/java/me/totalfreedom/totalfreedommod/command/Command_setplayerlimit.java @@ -59,7 +59,7 @@ public class Command_setplayerlimit extends FreedomCommand } if (success) { - FUtil.staffAction(sender.getName(), "Setting " + player.getName() + "'s WorldEdit block modification limit to " + amount + ".", true); + FUtil.adminAction(sender.getName(), "Setting " + player.getName() + "'s WorldEdit block modification limit to " + amount + ".", true); } return true; } diff --git a/src/main/java/me/totalfreedom/totalfreedommod/command/Command_settotalvotes.java b/src/main/java/me/totalfreedom/totalfreedommod/command/Command_settotalvotes.java index 2b4f6a17..c6d4e914 100644 --- a/src/main/java/me/totalfreedom/totalfreedommod/command/Command_settotalvotes.java +++ b/src/main/java/me/totalfreedom/totalfreedommod/command/Command_settotalvotes.java @@ -12,11 +12,9 @@ import org.bukkit.entity.Player; @CommandParameters(description = "Set a player's total votes", usage = "/ ") public class Command_settotalvotes extends FreedomCommand { - @Override public boolean run(CommandSender sender, Player playerSender, Command cmd, String commandLabel, String[] args, boolean senderIsConsole) { - if (!ConfigEntry.SERVER_OWNERS.getStringList().contains(sender.getName())) { return noPerms(); @@ -57,7 +55,6 @@ public class Command_settotalvotes extends FreedomCommand { player.sendMessage(ChatColor.GREEN + sender.getName() + " has set your total votes to " + votes); } - return true; } } diff --git a/src/main/java/me/totalfreedom/totalfreedommod/command/Command_sit.java b/src/main/java/me/totalfreedom/totalfreedommod/command/Command_sit.java deleted file mode 100644 index 6ef233dd..00000000 --- a/src/main/java/me/totalfreedom/totalfreedommod/command/Command_sit.java +++ /dev/null @@ -1,34 +0,0 @@ -package me.totalfreedom.totalfreedommod.command; - -import java.util.ArrayList; -import java.util.List; -import me.totalfreedom.totalfreedommod.rank.Rank; -import org.bukkit.command.Command; -import org.bukkit.command.CommandSender; -import org.bukkit.entity.ArmorStand; -import org.bukkit.entity.EntityType; -import org.bukkit.entity.Player; - -@CommandPermissions(level = Rank.OP, source = SourceType.ONLY_IN_GAME) -@CommandParameters(description = "Sit at the current place you are at.", usage = "/") -public class Command_sit extends FreedomCommand -{ - public static List STANDS = new ArrayList<>(); - - public boolean run(final CommandSender sender, final Player playerSender, final Command cmd, final String commandLabel, final String[] args, final boolean senderIsConsole) - { - if (args.length != 0) - { - return false; - } - ArmorStand stand = (ArmorStand) playerSender.getWorld().spawnEntity(playerSender.getLocation().clone().subtract(0.0, 1.7, 0.0), EntityType.ARMOR_STAND); - stand.setGravity(false); - stand.setAI(false); - stand.setVisible(false); - stand.setInvulnerable(true); - stand.addPassenger(playerSender); - STANDS.add(stand); - msg("You are now sitting."); - return true; - } -} diff --git a/src/main/java/me/totalfreedom/totalfreedommod/command/Command_stackingpotato.java b/src/main/java/me/totalfreedom/totalfreedommod/command/Command_stackingpotato.java index 7a1514f5..ffac9f89 100644 --- a/src/main/java/me/totalfreedom/totalfreedommod/command/Command_stackingpotato.java +++ b/src/main/java/me/totalfreedom/totalfreedommod/command/Command_stackingpotato.java @@ -11,7 +11,6 @@ import org.bukkit.entity.Player; @CommandParameters(description = "Obtain a stacking potato", usage = "/") public class Command_stackingpotato extends FreedomCommand { - @Override public boolean run(CommandSender sender, Player playerSender, Command cmd, String commandLabel, String[] args, boolean senderIsConsole) { diff --git a/src/main/java/me/totalfreedom/totalfreedommod/command/Command_stopsound.java b/src/main/java/me/totalfreedom/totalfreedommod/command/Command_stopsound.java index 1e0acb92..55daf3c2 100644 --- a/src/main/java/me/totalfreedom/totalfreedommod/command/Command_stopsound.java +++ b/src/main/java/me/totalfreedom/totalfreedommod/command/Command_stopsound.java @@ -14,7 +14,6 @@ import org.bukkit.entity.Player; @CommandParameters(description = "Stops all sounds or a specified sound.", usage = "/ [sound]") public class Command_stopsound extends FreedomCommand { - @Override public boolean run(CommandSender sender, Player playerSender, Command cmd, String commandLabel, String[] args, boolean senderIsConsole) { diff --git a/src/main/java/me/totalfreedom/totalfreedommod/command/Command_survival.java b/src/main/java/me/totalfreedom/totalfreedommod/command/Command_survival.java index 59b50240..89f2d738 100644 --- a/src/main/java/me/totalfreedom/totalfreedommod/command/Command_survival.java +++ b/src/main/java/me/totalfreedom/totalfreedommod/command/Command_survival.java @@ -37,7 +37,7 @@ public class Command_survival extends FreedomCommand targetPlayer.setGameMode(GameMode.SURVIVAL); } - FUtil.staffAction(sender.getName(), "Changing everyone's gamemode to survival", false); + FUtil.adminAction(sender.getName(), "Changing everyone's gamemode to survival", false); msg("Your gamemode has been set to survival."); return true; } diff --git a/src/main/java/me/totalfreedom/totalfreedommod/command/Command_tag.java b/src/main/java/me/totalfreedom/totalfreedommod/command/Command_tag.java index a7a4df59..8c502510 100644 --- a/src/main/java/me/totalfreedom/totalfreedommod/command/Command_tag.java +++ b/src/main/java/me/totalfreedom/totalfreedommod/command/Command_tag.java @@ -18,14 +18,12 @@ import org.bukkit.entity.Player; @CommandParameters(description = "Allows you to set your own prefix.", usage = "/ [-s[ave]] | list | gradient | off | clear | clearall>") public class Command_tag extends FreedomCommand { - public static final List FORBIDDEN_WORDS = Arrays.asList( - "admin", "owner", "moderator", "developer", "console", "dev", "staff", "mod", "sra", "tca", "sta", "sa"); + "admin", "owner", "moderator", "developer", "console", "dev", "admin", "mod", "sra", "tca", "sta", "sa"); @Override public boolean run(CommandSender sender, Player playerSender, Command cmd, String commandLabel, String[] args, boolean senderIsConsole) { - boolean save = false; if (args.length < 1) @@ -41,14 +39,13 @@ public class Command_tag extends FreedomCommand if (args.length == 1) { - if ("list".equalsIgnoreCase(args[0])) { msg("Tags for all online players:"); for (final Player player : server.getOnlinePlayers()) { - if (plugin.sl.isVanished(player.getName()) && !plugin.sl.isStaff(sender)) + if (plugin.al.isVanished(player.getName()) && !plugin.al.isAdmin(sender)) { continue; } @@ -63,13 +60,13 @@ public class Command_tag extends FreedomCommand } else if ("clearall".equalsIgnoreCase(args[0])) { - if (!plugin.sl.isStaff(sender)) + if (!plugin.al.isAdmin(sender)) { noPerms(); return true; } - FUtil.staffAction(sender.getName(), "Removing all tags", false); + FUtil.adminAction(sender.getName(), "Removing all tags", false); int count = 0; for (final Player player : server.getOnlinePlayers()) @@ -113,7 +110,7 @@ public class Command_tag extends FreedomCommand { if ("clear".equalsIgnoreCase(args[0])) { - if (!plugin.sl.isStaff(sender)) + if (!plugin.al.isAdmin(sender)) { noPerms(); return true; @@ -156,7 +153,7 @@ public class Command_tag extends FreedomCommand }); final String outputTag = FUtil.colorize(strippedTag); - int tagLimit = (plugin.sl.isStaff(sender) ? 30 : 20); + int tagLimit = (plugin.al.isAdmin(sender) ? 30 : 20); final String rawTag = ChatColor.stripColor(outputTag).toLowerCase(); @@ -166,7 +163,7 @@ public class Command_tag extends FreedomCommand return true; } - if (!plugin.sl.isStaff(sender)) + if (!plugin.al.isAdmin(sender)) { for (String word : FORBIDDEN_WORDS) { @@ -233,7 +230,7 @@ public class Command_tag extends FreedomCommand tag = StringUtils.join(splitTag, ""); final String outputTag = FUtil.colorize(tag); - int tagLimit = (plugin.sl.isStaff(sender) ? 30 : 20); + int tagLimit = (plugin.al.isAdmin(sender) ? 30 : 20); final String rawTag = ChatColor.stripColor(outputTag).toLowerCase(); @@ -243,7 +240,7 @@ public class Command_tag extends FreedomCommand return true; } - if (!plugin.sl.isStaff(sender)) + if (!plugin.al.isAdmin(sender)) { for (String word : FORBIDDEN_WORDS) { diff --git a/src/main/java/me/totalfreedom/totalfreedommod/command/Command_tagnyan.java b/src/main/java/me/totalfreedom/totalfreedommod/command/Command_tagnyan.java index c874f493..ed7bd04c 100644 --- a/src/main/java/me/totalfreedom/totalfreedommod/command/Command_tagnyan.java +++ b/src/main/java/me/totalfreedom/totalfreedommod/command/Command_tagnyan.java @@ -31,7 +31,7 @@ public class Command_tagnyan extends FreedomCommand String tagStr = tag.toString(); - int tagLimit = (plugin.sl.isStaff(sender) ? 30 : 20); + int tagLimit = (plugin.al.isAdmin(sender) ? 30 : 20); final String rawTag = ChatColor.stripColor(tagStr).toLowerCase(); @@ -41,7 +41,7 @@ public class Command_tagnyan extends FreedomCommand return true; } - if (!plugin.sl.isStaff(sender)) + if (!plugin.al.isAdmin(sender)) { for (String word : Command_tag.FORBIDDEN_WORDS) { diff --git a/src/main/java/me/totalfreedom/totalfreedommod/command/Command_tagrainbow.java b/src/main/java/me/totalfreedom/totalfreedommod/command/Command_tagrainbow.java index c534c068..912aeb6d 100644 --- a/src/main/java/me/totalfreedom/totalfreedommod/command/Command_tagrainbow.java +++ b/src/main/java/me/totalfreedom/totalfreedommod/command/Command_tagrainbow.java @@ -23,7 +23,7 @@ public class Command_tagrainbow extends FreedomCommand final String tag = ChatColor.stripColor(FUtil.colorize(StringUtils.join(args, " "))); - if (!plugin.sl.isStaff(sender)) + if (!plugin.al.isAdmin(sender)) { final String rawTag = ChatColor.stripColor(tag).toLowerCase(); diff --git a/src/main/java/me/totalfreedom/totalfreedommod/command/Command_tban.java b/src/main/java/me/totalfreedom/totalfreedommod/command/Command_tban.java index c272972f..62952366 100644 --- a/src/main/java/me/totalfreedom/totalfreedommod/command/Command_tban.java +++ b/src/main/java/me/totalfreedom/totalfreedommod/command/Command_tban.java @@ -93,7 +93,7 @@ public class Command_tban extends FreedomCommand if (reason != null) { - FUtil.staffAction(sender.getName(), "Tempbanning " + player.getName() + " for 5 minutes - Reason: " + reason, true); + FUtil.adminAction(sender.getName(), "Tempbanning " + player.getName() + " for 5 minutes - Reason: " + reason, true); kick.append("\n") .append(ChatColor.RED) .append("Reason: ") @@ -102,7 +102,7 @@ public class Command_tban extends FreedomCommand } else { - FUtil.staffAction(sender.getName(), "Tempbanning " + player.getName() + " for 5 minutes", true); + FUtil.adminAction(sender.getName(), "Tempbanning " + player.getName() + " for 5 minutes", true); } } } diff --git a/src/main/java/me/totalfreedom/totalfreedommod/command/Command_tempban.java b/src/main/java/me/totalfreedom/totalfreedommod/command/Command_tempban.java index 7f9500a2..7ae87d6b 100644 --- a/src/main/java/me/totalfreedom/totalfreedommod/command/Command_tempban.java +++ b/src/main/java/me/totalfreedom/totalfreedommod/command/Command_tempban.java @@ -97,7 +97,7 @@ public class Command_tempban extends FreedomCommand } } - FUtil.staffAction(sender.getName(), message.toString(), true); + FUtil.adminAction(sender.getName(), message.toString(), true); } else { diff --git a/src/main/java/me/totalfreedom/totalfreedommod/command/Command_toggle.java b/src/main/java/me/totalfreedom/totalfreedommod/command/Command_toggle.java index 4432aff1..ebb998ff 100644 --- a/src/main/java/me/totalfreedom/totalfreedommod/command/Command_toggle.java +++ b/src/main/java/me/totalfreedom/totalfreedommod/command/Command_toggle.java @@ -44,15 +44,11 @@ public class Command_toggle extends FreedomCommand msg("- grindstones"); msg("- jukeboxes"); msg("- spawners"); - msg("- 4chan"); msg("- beehives"); msg("- respawnanchors"); msg("- autotp"); msg("- autoclear"); msg("- minecarts"); - msg("- landmines"); - msg("- mp44"); - msg("- tossmob"); return false; } @@ -111,7 +107,7 @@ public class Command_toggle extends FreedomCommand { boolean active = !plugin.lp.isLockdownEnabled(); plugin.lp.setLockdownEnabled(active); - FUtil.staffAction(sender.getName(), (active ? "A" : "De-a") + "ctivating server lockdown", true); + FUtil.adminAction(sender.getName(), (active ? "A" : "De-a") + "ctivating server lockdown", true); break; } @@ -243,12 +239,6 @@ public class Command_toggle extends FreedomCommand break; } - case "4chan": - { - toggle("4chan mode is", ConfigEntry.FOURCHAN_ENABLED); - break; - } - case "beehives": { toggle("Beehives are", ConfigEntry.ALLOW_BEEHIVES); @@ -278,24 +268,6 @@ public class Command_toggle extends FreedomCommand toggle("Minecarts are", ConfigEntry.ALLOW_MINECARTS); break; } - - case "landmines": - { - toggle("Landmines are", ConfigEntry.LANDMINES_ENABLED); - break; - } - - case "mp44": - { - toggle("MP44 is", ConfigEntry.MP44_ENABLED); - break; - } - - case "tossmob": - { - toggle("Tossmob is", ConfigEntry.TOSSMOB_ENABLED); - break; - } } return true; } @@ -308,7 +280,7 @@ public class Command_toggle extends FreedomCommand @Override public List getTabCompleteOptions(CommandSender sender, Command command, String alias, String[] args) { - if (!plugin.sl.isStaff(sender)) + if (!plugin.al.isAdmin(sender)) { return Collections.emptyList(); } @@ -318,8 +290,8 @@ public class Command_toggle extends FreedomCommand return Arrays.asList( "waterplace", "fireplace", "lavaplace", "fluidspread", "lavadmg", "firespread", "frostwalk", "firework", "prelog", "lockdown", "petprotect", "entitywipe", "nonuke", "explosives", "unsafeenchs", - "bells", "armorstands", "structureblocks", "jigsaws", "grindstones", "jukeboxes", "spawners", "4chan", "beehives", - "respawnanchors", "autotp", "autoclear", "minecarts", "mp44", "landmines", "tossmob"); + "bells", "armorstands", "structureblocks", "jigsaws", "grindstones", "jukeboxes", "spawners", "beehives", + "respawnanchors", "autotp", "autoclear", "minecarts"); } return Collections.emptyList(); } diff --git a/src/main/java/me/totalfreedom/totalfreedommod/command/Command_togglechat.java b/src/main/java/me/totalfreedom/totalfreedommod/command/Command_togglechat.java index 970a87be..a37a078f 100644 --- a/src/main/java/me/totalfreedom/totalfreedommod/command/Command_togglechat.java +++ b/src/main/java/me/totalfreedom/totalfreedommod/command/Command_togglechat.java @@ -15,7 +15,7 @@ public class Command_togglechat extends FreedomCommand public boolean run(CommandSender sender, Player playerSender, Command cmd, String commandLabel, String[] args, boolean senderIsConsole) { ConfigEntry.TOGGLE_CHAT.setBoolean(!ConfigEntry.TOGGLE_CHAT.getBoolean()); - FUtil.staffAction(sender.getName(), "Chat " + (ConfigEntry.TOGGLE_CHAT.getBoolean() ? "enabled" : "disabled") + ".", true); + FUtil.adminAction(sender.getName(), "Chat " + (ConfigEntry.TOGGLE_CHAT.getBoolean() ? "enabled" : "disabled") + ".", true); return true; } } diff --git a/src/main/java/me/totalfreedom/totalfreedommod/command/Command_togglepickup.java b/src/main/java/me/totalfreedom/totalfreedommod/command/Command_togglepickup.java index df9c8294..fedea4a2 100644 --- a/src/main/java/me/totalfreedom/totalfreedommod/command/Command_togglepickup.java +++ b/src/main/java/me/totalfreedom/totalfreedommod/command/Command_togglepickup.java @@ -10,7 +10,6 @@ import org.bukkit.entity.Player; @CommandParameters(description = "Toggle item pickup.", usage = "/") public class Command_togglepickup extends FreedomCommand { - @Override public boolean run(CommandSender sender, Player playerSender, Command cmd, String commandLabel, String[] args, boolean senderIsConsole) { diff --git a/src/main/java/me/totalfreedom/totalfreedommod/command/Command_tossmob.java b/src/main/java/me/totalfreedom/totalfreedommod/command/Command_tossmob.java deleted file mode 100644 index c9c69043..00000000 --- a/src/main/java/me/totalfreedom/totalfreedommod/command/Command_tossmob.java +++ /dev/null @@ -1,118 +0,0 @@ -package me.totalfreedom.totalfreedommod.command; - -import java.util.ArrayList; -import java.util.List; -import me.totalfreedom.totalfreedommod.config.ConfigEntry; -import me.totalfreedom.totalfreedommod.player.FPlayer; -import me.totalfreedom.totalfreedommod.rank.Rank; -import me.totalfreedom.totalfreedommod.util.FUtil; -import me.totalfreedom.totalfreedommod.util.Groups; -import org.bukkit.ChatColor; -import org.bukkit.Material; -import org.bukkit.command.Command; -import org.bukkit.command.CommandSender; -import org.bukkit.entity.EntityType; -import org.bukkit.entity.Player; -import org.bukkit.inventory.ItemStack; - -@CommandPermissions(level = Rank.OP, source = SourceType.ONLY_IN_GAME) -@CommandParameters(description = "Throw a mob in the direction you are facing when you right click with a bone.", - usage = "/ ") -public class Command_tossmob extends FreedomCommand -{ - - @Override - public boolean run(CommandSender sender, Player playerSender, Command cmd, String commandLabel, String[] args, boolean senderIsConsole) - { - if (!ConfigEntry.TOSSMOB_ENABLED.getBoolean()) - { - msg("Tossmob is currently disabled."); - return true; - } - - if (args.length == 0) - { - return false; - } - - FPlayer playerData = plugin.pl.getPlayer(playerSender); - - EntityType type = null; - if (args.length >= 1) - { - if (args[0].equalsIgnoreCase("off")) - { - playerData.disableMobThrower(); - msg("MobThrower is disabled.", ChatColor.GREEN); - return true; - } - - if (args[0].equalsIgnoreCase("list")) - { - msg("Supported mobs: " + getAllMobNames(), ChatColor.GREEN); - return true; - } - - for (EntityType loop : EntityType.values()) - { - if (loop != null && loop.name().equalsIgnoreCase(args[0])) - { - type = loop; - break; - } - } - - if (type == null) - { - msg("Unknown entity type: " + args[0], ChatColor.RED); - return true; - } - - if (!Groups.MOB_TYPES.contains(type)) - { - msg(FUtil.formatName(type.name()) + " is an entity, however it is not a mob.", ChatColor.RED); - return true; - } - } - - double speed = 1.0; - if (args.length >= 2) - { - try - { - speed = Double.parseDouble(args[1]); - } - catch (NumberFormatException ex) - { - msg("The input provided is not a valid integer."); - return true; - } - } - - if (speed < 1.0) - { - speed = 1.0; - } - else if (speed > 5.0) - { - speed = 5.0; - } - - playerData.enableMobThrower(type, speed); - msg("MobThrower is enabled. Mob: " + type + " - Speed: " + speed + ".", ChatColor.GREEN); - msg("Right click while holding a " + Material.BONE.toString() + " to throw mobs!", ChatColor.GREEN); - msg("Type '/tossmob off' to disable. -By Madgeek1450", ChatColor.GREEN); - - playerSender.getEquipment().setItemInMainHand(new ItemStack(Material.BONE, 1)); - return true; - } - public static List getAllMobNames() - { - List names = new ArrayList<>(); - for (EntityType entityType : Groups.MOB_TYPES) - { - names.add(entityType.name()); - } - return names; - } -} diff --git a/src/main/java/me/totalfreedom/totalfreedommod/command/Command_totalfreedommod.java b/src/main/java/me/totalfreedom/totalfreedommod/command/Command_totalfreedommod.java index 42b3b051..432fe0b8 100644 --- a/src/main/java/me/totalfreedom/totalfreedommod/command/Command_totalfreedommod.java +++ b/src/main/java/me/totalfreedom/totalfreedommod/command/Command_totalfreedommod.java @@ -27,7 +27,7 @@ public class Command_totalfreedommod extends FreedomCommand return false; } - if (!plugin.sl.isStaff(sender)) + if (!plugin.al.isAdmin(sender)) { noPerms(); return true; diff --git a/src/main/java/me/totalfreedom/totalfreedommod/command/Command_unban.java b/src/main/java/me/totalfreedom/totalfreedommod/command/Command_unban.java index b8c9151f..98a5d8fc 100644 --- a/src/main/java/me/totalfreedom/totalfreedommod/command/Command_unban.java +++ b/src/main/java/me/totalfreedom/totalfreedommod/command/Command_unban.java @@ -34,7 +34,7 @@ public class Command_unban extends FreedomCommand username = entry.getName(); ips.addAll(entry.getIps()); - FUtil.staffAction(sender.getName(), "Unbanning " + username, true); + FUtil.adminAction(sender.getName(), "Unbanning " + username, true); msg(username + " has been unbanned along with the following IPs: " + StringUtils.join(ips, ", ")); plugin.bm.removeBan(plugin.bm.getByUsername(username)); diff --git a/src/main/java/me/totalfreedom/totalfreedommod/command/Command_unbanip.java b/src/main/java/me/totalfreedom/totalfreedommod/command/Command_unbanip.java index bf5e19eb..21122d84 100644 --- a/src/main/java/me/totalfreedom/totalfreedommod/command/Command_unbanip.java +++ b/src/main/java/me/totalfreedom/totalfreedommod/command/Command_unbanip.java @@ -54,7 +54,7 @@ public class Command_unbanip extends FreedomCommand if (!silent) { - FUtil.staffAction(sender.getName(), "Unbanned the ip " + ip, true); + FUtil.adminAction(sender.getName(), "Unbanned the ip " + ip, true); } return true; diff --git a/src/main/java/me/totalfreedom/totalfreedommod/command/Command_unbanname.java b/src/main/java/me/totalfreedom/totalfreedommod/command/Command_unbanname.java index 897fa9c3..cf925674 100644 --- a/src/main/java/me/totalfreedom/totalfreedommod/command/Command_unbanname.java +++ b/src/main/java/me/totalfreedom/totalfreedommod/command/Command_unbanname.java @@ -48,7 +48,7 @@ public class Command_unbanname extends FreedomCommand if (!silent) { - FUtil.staffAction(sender.getName(), "Unbanned the name " + name, true); + FUtil.adminAction(sender.getName(), "Unbanned the name " + name, true); } return true; diff --git a/src/main/java/me/totalfreedom/totalfreedommod/command/Command_unblockcmd.java b/src/main/java/me/totalfreedom/totalfreedommod/command/Command_unblockcmd.java index 2ef15dfb..8579db8b 100644 --- a/src/main/java/me/totalfreedom/totalfreedommod/command/Command_unblockcmd.java +++ b/src/main/java/me/totalfreedom/totalfreedommod/command/Command_unblockcmd.java @@ -32,7 +32,7 @@ public class Command_unblockcmd extends FreedomCommand if (fPlayer.allCommandsBlocked()) { fPlayer.setCommandsBlocked(false); - FUtil.staffAction(sender.getName(), "Unblocking all commands for " + player.getName(), true); + FUtil.adminAction(sender.getName(), "Unblocking all commands for " + player.getName(), true); msg("Unblocked commands for " + player.getName() + "."); } else diff --git a/src/main/java/me/totalfreedom/totalfreedommod/command/Command_uncage.java b/src/main/java/me/totalfreedom/totalfreedommod/command/Command_uncage.java index ab03da19..31f7acf2 100644 --- a/src/main/java/me/totalfreedom/totalfreedommod/command/Command_uncage.java +++ b/src/main/java/me/totalfreedom/totalfreedommod/command/Command_uncage.java @@ -32,7 +32,7 @@ public class Command_uncage extends FreedomCommand final FPlayer fPlayer = plugin.pl.getPlayer(player); if (fPlayer.getCageData().isCaged()) { - FUtil.staffAction(sender.getName(), "Uncaging " + player.getName(), true); + FUtil.adminAction(sender.getName(), "Uncaging " + player.getName(), true); fPlayer.getCageData().setCaged(false); } else diff --git a/src/main/java/me/totalfreedom/totalfreedommod/command/Command_undisguiseall.java b/src/main/java/me/totalfreedom/totalfreedommod/command/Command_undisguiseall.java index c9fa366d..aae96bf9 100644 --- a/src/main/java/me/totalfreedom/totalfreedommod/command/Command_undisguiseall.java +++ b/src/main/java/me/totalfreedom/totalfreedommod/command/Command_undisguiseall.java @@ -20,16 +20,13 @@ public class Command_undisguiseall extends FreedomCommand } boolean admins = false; - if (args.length > 0 && args[0].equalsIgnoreCase("-a")) { admins = true; } - FUtil.staffAction(sender.getName(), "Undisguising all " + (admins ? "players" : "non-staff"), true); - + FUtil.adminAction(sender.getName(), "Undisguising all " + (admins ? "players" : "non-admins"), true); plugin.ldb.undisguiseAll(admins); - return true; } } diff --git a/src/main/java/me/totalfreedom/totalfreedommod/command/Command_unlinkdiscord.java b/src/main/java/me/totalfreedom/totalfreedommod/command/Command_unlinkdiscord.java index 65e78eee..07556280 100644 --- a/src/main/java/me/totalfreedom/totalfreedommod/command/Command_unlinkdiscord.java +++ b/src/main/java/me/totalfreedom/totalfreedommod/command/Command_unlinkdiscord.java @@ -21,7 +21,7 @@ public class Command_unlinkdiscord extends FreedomCommand return true; } - if (args.length != 0 && plugin.sl.isStaff(playerSender)) + if (args.length != 0 && plugin.al.isAdmin(playerSender)) { PlayerData playerData = plugin.pl.getData(args[0]); if (playerData == null) diff --git a/src/main/java/me/totalfreedom/totalfreedommod/command/Command_unlinkreddit.java b/src/main/java/me/totalfreedom/totalfreedommod/command/Command_unlinkreddit.java deleted file mode 100644 index b52e2ef5..00000000 --- a/src/main/java/me/totalfreedom/totalfreedommod/command/Command_unlinkreddit.java +++ /dev/null @@ -1,41 +0,0 @@ -package me.totalfreedom.totalfreedommod.command; - -import me.totalfreedom.totalfreedommod.player.PlayerData; -import me.totalfreedom.totalfreedommod.rank.Rank; -import org.bukkit.ChatColor; -import org.bukkit.command.Command; -import org.bukkit.command.CommandSender; -import org.bukkit.entity.Player; - -@CommandPermissions(level = Rank.OP, source = SourceType.ONLY_IN_GAME) -@CommandParameters(description = "Unlink your reddit account", usage = "/") -public class Command_unlinkreddit extends FreedomCommand -{ - - @Override - public boolean run(CommandSender sender, Player playerSender, Command cmd, String commandLabel, String[] args, boolean senderIsConsole) - { - if (!plugin.rd.enabled) - { - msg("The reddit system is currently disabled.", ChatColor.RED); - return true; - } - - PlayerData data = getData(playerSender); - - if (data.getRedditUsername() == null) - { - msg("You don't have a reddit account linked.", ChatColor.RED); - return true; - } - - plugin.rd.removeFlair(data.getRedditUsername()); - - data.setRedditUsername(null); - plugin.pl.save(data); - - msg("Successfully unlinked your reddit account. If you had a flair, it was removed.", ChatColor.GREEN); - - return true; - } -} diff --git a/src/main/java/me/totalfreedom/totalfreedommod/command/Command_unmute.java b/src/main/java/me/totalfreedom/totalfreedommod/command/Command_unmute.java index 48ab3c35..5876227c 100644 --- a/src/main/java/me/totalfreedom/totalfreedommod/command/Command_unmute.java +++ b/src/main/java/me/totalfreedom/totalfreedommod/command/Command_unmute.java @@ -53,7 +53,7 @@ public class Command_unmute extends FreedomCommand return true; } - FUtil.staffAction(sender.getName(), "Unmuting " + player.getName(), true); + FUtil.adminAction(sender.getName(), "Unmuting " + player.getName(), true); msg("Unmuted " + player.getName()); msg(player, "You have been unmuted.", ChatColor.RED); } diff --git a/src/main/java/me/totalfreedom/totalfreedommod/command/Command_vanish.java b/src/main/java/me/totalfreedom/totalfreedommod/command/Command_vanish.java index a0f32733..2caf570d 100644 --- a/src/main/java/me/totalfreedom/totalfreedommod/command/Command_vanish.java +++ b/src/main/java/me/totalfreedom/totalfreedommod/command/Command_vanish.java @@ -33,7 +33,7 @@ public class Command_vanish extends FreedomCommand } } - if (plugin.sl.isVanished(playerSender.getName())) + if (plugin.al.isVanished(playerSender.getName())) { if (silent) { @@ -55,18 +55,18 @@ public class Command_vanish extends FreedomCommand plugin.pl.getData(playerSender).setTag(tag); FLog.info(playerSender.getName() + " is no longer vanished."); - plugin.sl.messageAllStaff(ChatColor.YELLOW + sender.getName() + " has unvanished and is now visible to everyone."); + plugin.al.messageAllAdmins(ChatColor.YELLOW + sender.getName() + " has unvanished and is now visible to everyone."); for (Player player : server.getOnlinePlayers()) { - if (!plugin.sl.isStaff(player)) + if (!plugin.al.isAdmin(player)) { player.showPlayer(plugin, playerSender); } } plugin.esb.setVanished(playerSender.getName(), false); playerSender.setPlayerListName(StringUtils.substring(displayName, 0, 16)); - plugin.sl.vanished.remove(playerSender.getName()); + plugin.al.vanished.remove(playerSender.getName()); } else { @@ -75,7 +75,7 @@ public class Command_vanish extends FreedomCommand @Override public void run() { - if (plugin.sl.isVanished(playerSender.getName())) + if (plugin.al.isVanished(playerSender.getName())) { playerSender.spigot().sendMessage(ChatMessageType.ACTION_BAR, TextComponent.fromLegacyText(ChatColor.GOLD + "You are hidden from other players.")); } @@ -94,18 +94,18 @@ public class Command_vanish extends FreedomCommand } FLog.info(playerSender.getName() + " is now vanished."); - plugin.sl.messageAllStaff(ChatColor.YELLOW + sender.getName() + " has vanished and is now only visible to staff members."); + plugin.al.messageAllAdmins(ChatColor.YELLOW + sender.getName() + " has vanished and is now only visible to admins."); for (Player player : server.getOnlinePlayers()) { - if (!plugin.sl.isStaff(player)) + if (!plugin.al.isAdmin(player)) { player.hidePlayer(plugin, playerSender); } } plugin.esb.setVanished(playerSender.getName(), true); - plugin.sl.vanished.add(playerSender.getName()); + plugin.al.vanished.add(playerSender.getName()); } return true; } diff --git a/src/main/java/me/totalfreedom/totalfreedommod/command/Command_verify.java b/src/main/java/me/totalfreedom/totalfreedommod/command/Command_verify.java index 9855ca37..e81e608b 100644 --- a/src/main/java/me/totalfreedom/totalfreedommod/command/Command_verify.java +++ b/src/main/java/me/totalfreedom/totalfreedommod/command/Command_verify.java @@ -10,10 +10,9 @@ import org.bukkit.command.CommandSender; import org.bukkit.entity.Player; @CommandPermissions(level = Rank.IMPOSTOR, source = SourceType.BOTH) -@CommandParameters(description = "Sends a verification code to the player, or the player can input the sent code. Staff can manually verify a player impostor.", usage = "/ >") +@CommandParameters(description = "Sends a verification code to the player, or the player can input the sent code. Admins can manually verify a player impostor.", usage = "/ >") public class Command_verify extends FreedomCommand { - @Override public boolean run(CommandSender sender, Player playerSender, Command cmd, String commandLabel, String[] args, boolean senderIsConsole) { diff --git a/src/main/java/me/totalfreedom/totalfreedommod/command/Command_verifynostaff.java b/src/main/java/me/totalfreedom/totalfreedommod/command/Command_verifynoadmin.java similarity index 70% rename from src/main/java/me/totalfreedom/totalfreedommod/command/Command_verifynostaff.java rename to src/main/java/me/totalfreedom/totalfreedommod/command/Command_verifynoadmin.java index 54472951..3e34b8b9 100644 --- a/src/main/java/me/totalfreedom/totalfreedommod/command/Command_verifynostaff.java +++ b/src/main/java/me/totalfreedom/totalfreedommod/command/Command_verifynoadmin.java @@ -12,10 +12,9 @@ import org.bukkit.command.CommandSender; import org.bukkit.entity.Player; @CommandPermissions(level = Rank.ADMIN, source = SourceType.BOTH) -@CommandParameters(description = "Verify a staff member without giving them staff permissions.", usage = "/ ", aliases = "vns") -public class Command_verifynostaff extends FreedomCommand +@CommandParameters(description = "Verify an admin without giving them admin permissions.", usage = "/ ", aliases = "vna") +public class Command_verifynoadmin extends FreedomCommand { - @Override public boolean run(CommandSender sender, Player playerSender, Command cmd, String commandLabel, String[] args, boolean senderIsConsole) { @@ -32,32 +31,32 @@ public class Command_verifynostaff extends FreedomCommand return true; } - if (plugin.sl.isStaffImpostor(player)) + if (plugin.al.isAdminImpostor(player)) { - if (!plugin.sl.verifiedNoStaff.contains(player.getName())) + if (!plugin.al.verifiedNoAdmin.contains(player.getName())) { - plugin.sl.verifiedNoStaff.add(player.getName()); + plugin.al.verifiedNoAdmin.add(player.getName()); } String ip = FUtil.getIp(player); - if (!plugin.sl.verifiedNoStaffIps.containsKey(player.getName())) + if (!plugin.al.verifiedNoAdminIps.containsKey(player.getName())) { List ips = new ArrayList<>(); ips.add(ip); - plugin.sl.verifiedNoStaffIps.put(player.getName(), ips); + plugin.al.verifiedNoAdminIps.put(player.getName(), ips); } else { - List ips = plugin.sl.verifiedNoStaffIps.get(player.getName()); + List ips = plugin.al.verifiedNoAdminIps.get(player.getName()); if (!ips.contains(ip)) { ips.add(ip); - plugin.sl.verifiedNoStaff.remove(player.getName()); - plugin.sl.verifiedNoStaffIps.put(player.getName(), ips); + plugin.al.verifiedNoAdmin.remove(player.getName()); + plugin.al.verifiedNoAdminIps.put(player.getName(), ips); } } plugin.rm.updateDisplay(player); - FUtil.staffAction(sender.getName(), "Verified " + player.getName() + ", without staff permissions.", true); + FUtil.adminAction(sender.getName(), "Verified " + player.getName() + ", without admin permissions.", true); player.setOp(true); player.sendMessage(YOU_ARE_OP); final FPlayer fPlayer = plugin.pl.getPlayer(player); @@ -66,11 +65,11 @@ public class Command_verifynostaff extends FreedomCommand fPlayer.getFreezeData().setFrozen(false); player.sendMessage(ChatColor.GRAY + "You have been unfrozen."); } - msg("Verified " + player.getName() + " but didn't give them staff permissions", ChatColor.GREEN); + msg("Verified " + player.getName() + " but didn't give them admin permissions", ChatColor.GREEN); } else { - msg(player.getName() + " is not a staff imposter.", ChatColor.RED); + msg(player.getName() + " is not an admin imposter.", ChatColor.RED); } return true; @@ -84,7 +83,7 @@ public class Command_verifynostaff extends FreedomCommand List adminImposters = new ArrayList<>(); for (Player player : server.getOnlinePlayers()) { - if (plugin.sl.isStaffImpostor(player)) + if (plugin.al.isAdminImpostor(player)) { adminImposters.add(player.getName()); } diff --git a/src/main/java/me/totalfreedom/totalfreedommod/command/Command_vote.java b/src/main/java/me/totalfreedom/totalfreedommod/command/Command_vote.java index f87f16a8..7722dfaa 100644 --- a/src/main/java/me/totalfreedom/totalfreedommod/command/Command_vote.java +++ b/src/main/java/me/totalfreedom/totalfreedommod/command/Command_vote.java @@ -14,7 +14,6 @@ import org.bukkit.entity.Player; @CommandParameters(description = "Information on how to vote", usage = "/") public class Command_vote extends FreedomCommand { - @Override public boolean run(CommandSender sender, Player playerSender, Command cmd, String commandLabel, String[] args, boolean senderIsConsole) { @@ -22,7 +21,7 @@ public class Command_vote extends FreedomCommand if (voteInfo.isEmpty()) { - msg("The voting information section of the config.yml file has not been configured.", ChatColor.RED); + msg("The voting information section in the config.yml file has not been configured.", ChatColor.RED); } else { diff --git a/src/main/java/me/totalfreedom/totalfreedommod/command/Command_warn.java b/src/main/java/me/totalfreedom/totalfreedommod/command/Command_warn.java index 08cc2bb2..4483b4a0 100644 --- a/src/main/java/me/totalfreedom/totalfreedommod/command/Command_warn.java +++ b/src/main/java/me/totalfreedom/totalfreedommod/command/Command_warn.java @@ -45,9 +45,9 @@ public class Command_warn extends FreedomCommand return true; } - if (plugin.sl.isStaff(player)) + if (plugin.al.isAdmin(player)) { - msg(ChatColor.RED + "You can not warn staff"); + msg(ChatColor.RED + "You can not warn admins."); return true; } @@ -62,7 +62,7 @@ public class Command_warn extends FreedomCommand } msg(player, ChatColor.RED + "[WARNING] You received a warning from " + sender.getName() + ": " + warnReason); - String staffNotice = ChatColor.RED + + String adminNotice = ChatColor.RED + sender.getName() + " - " + "Warning: " + @@ -70,7 +70,7 @@ public class Command_warn extends FreedomCommand " - Reason: " + ChatColor.YELLOW + warnReason; - plugin.sl.messageAllStaff(staffNotice); + plugin.al.messageAllAdmins(adminNotice); plugin.pl.getPlayer(player).incrementWarnings(); return true; } diff --git a/src/main/java/me/totalfreedom/totalfreedommod/command/Command_whitelist.java b/src/main/java/me/totalfreedom/totalfreedommod/command/Command_whitelist.java index 4cca9fd0..92235745 100644 --- a/src/main/java/me/totalfreedom/totalfreedommod/command/Command_whitelist.java +++ b/src/main/java/me/totalfreedom/totalfreedommod/command/Command_whitelist.java @@ -62,13 +62,13 @@ public class Command_whitelist extends FreedomCommand return true; } - // Commands below are restricted to staff + // Commands below are restricted to admins checkRank(Rank.ADMIN); // on if (args[0].equalsIgnoreCase("on")) { - FUtil.staffAction(sender.getName(), "Turning the whitelist on", true); + FUtil.adminAction(sender.getName(), "Turning the whitelist on", true); server.setWhitelist(true); return true; } @@ -76,7 +76,7 @@ public class Command_whitelist extends FreedomCommand // off if (args[0].equalsIgnoreCase("off")) { - FUtil.staffAction(sender.getName(), "Turning the whitelist off", true); + FUtil.adminAction(sender.getName(), "Turning the whitelist off", true); server.setWhitelist(false); return true; } @@ -98,7 +98,7 @@ public class Command_whitelist extends FreedomCommand player = DepreciationAggregator.getOfflinePlayer(server, search_name); } - FUtil.staffAction(sender.getName(), "Adding " + player.getName() + " to the whitelist", false); + FUtil.adminAction(sender.getName(), "Adding " + player.getName() + " to the whitelist", false); player.setWhitelisted(true); return true; } @@ -122,7 +122,7 @@ public class Command_whitelist extends FreedomCommand if (player.isWhitelisted()) { - FUtil.staffAction(sender.getName(), "Removing " + player.getName() + " from the whitelist", false); + FUtil.adminAction(sender.getName(), "Removing " + player.getName() + " from the whitelist", false); player.setWhitelisted(false); return true; } @@ -136,7 +136,7 @@ public class Command_whitelist extends FreedomCommand // addall if (args[0].equalsIgnoreCase("addall")) { - FUtil.staffAction(sender.getName(), "Adding all online players to the whitelist", false); + FUtil.adminAction(sender.getName(), "Adding all online players to the whitelist", false); int counter = 0; for (Player player : server.getOnlinePlayers()) { @@ -151,14 +151,14 @@ public class Command_whitelist extends FreedomCommand return true; } - // Telnet only + // Admin only checkConsole(); checkRank(Rank.ADMIN); // purge if (args[0].equalsIgnoreCase("purge")) { - FUtil.staffAction(sender.getName(), "Removing all players from the whitelist", false); + FUtil.adminAction(sender.getName(), "Removing all players from the whitelist", false); msg("Removed " + plugin.si.purgeWhitelist() + " players from the whitelist."); return true; } @@ -172,7 +172,7 @@ public class Command_whitelist extends FreedomCommand { List arguments = new ArrayList<>(); arguments.addAll(Arrays.asList("list", "count")); - if (plugin.sl.isStaff(sender)) + if (plugin.al.isAdmin(sender)) { arguments.addAll(Arrays.asList("on", "off", "add", "remove", "addall")); if (!(sender instanceof Player)) @@ -182,7 +182,7 @@ public class Command_whitelist extends FreedomCommand } return arguments; } - else if (args.length == 2 && plugin.sl.isStaff(sender)) + else if (args.length == 2 && plugin.al.isAdmin(sender)) { if (args[0].equals("add")) { diff --git a/src/main/java/me/totalfreedom/totalfreedommod/command/Command_whohas.java b/src/main/java/me/totalfreedom/totalfreedommod/command/Command_whohas.java index f9ef9f6c..cdd2754b 100644 --- a/src/main/java/me/totalfreedom/totalfreedommod/command/Command_whohas.java +++ b/src/main/java/me/totalfreedom/totalfreedommod/command/Command_whohas.java @@ -40,16 +40,16 @@ public class Command_whohas extends FreedomCommand for (final Player player : server.getOnlinePlayers()) { - if (!plugin.sl.isStaff(sender) && plugin.sl.isVanished(player.getName())) + if (!plugin.al.isAdmin(sender) && plugin.al.isVanished(player.getName())) { continue; } if (player.getInventory().contains(material)) { players.add(player.getName()); - if (plugin.sl.isStaff(sender)) + if (plugin.al.isAdmin(sender)) { - if (doClear && !plugin.sl.isStaff(player)) + if (doClear && !plugin.al.isAdmin(player)) { player.getInventory().remove(material); } @@ -87,7 +87,7 @@ public class Command_whohas extends FreedomCommand return getAllMaterials(); } - if (args.length == 2 && plugin.sl.isStaff(sender)) + if (args.length == 2 && plugin.al.isAdmin(sender)) { return Arrays.asList("clear"); } diff --git a/src/main/java/me/totalfreedom/totalfreedommod/command/Command_wipecoreprotectdata.java b/src/main/java/me/totalfreedom/totalfreedommod/command/Command_wipecoreprotectdata.java index 7cd206b5..f89ff3cf 100644 --- a/src/main/java/me/totalfreedom/totalfreedommod/command/Command_wipecoreprotectdata.java +++ b/src/main/java/me/totalfreedom/totalfreedommod/command/Command_wipecoreprotectdata.java @@ -21,7 +21,7 @@ public class Command_wipecoreprotectdata extends FreedomCommand return true; } - FUtil.staffAction(sender.getName(), "Wiping CoreProtect data for the flatlands", true); + FUtil.adminAction(sender.getName(), "Wiping CoreProtect data for the flatlands", true); new BukkitRunnable() { diff --git a/src/main/java/me/totalfreedom/totalfreedommod/command/Command_wipepunishments.java b/src/main/java/me/totalfreedom/totalfreedommod/command/Command_wipepunishments.java index 4f04996b..f6d5c2ce 100644 --- a/src/main/java/me/totalfreedom/totalfreedommod/command/Command_wipepunishments.java +++ b/src/main/java/me/totalfreedom/totalfreedommod/command/Command_wipepunishments.java @@ -22,7 +22,7 @@ public class Command_wipepunishments extends FreedomCommand if (args[0].equalsIgnoreCase("-a")) { - FUtil.staffAction(sender.getName(), "Wiping the punishment history", true); + FUtil.adminAction(sender.getName(), "Wiping the punishment history", true); msg("Wiped " + plugin.pul.clear() + " punishments."); } @@ -30,7 +30,7 @@ public class Command_wipepunishments extends FreedomCommand { String username = args[0]; - FUtil.staffAction(sender.getName(), "Wiping the punishment history for " + username, true); + FUtil.adminAction(sender.getName(), "Wiping the punishment history for " + username, true); msg("Wiped " + plugin.pul.clear(username) + " punishments for " + username + "."); } diff --git a/src/main/java/me/totalfreedom/totalfreedommod/command/Command_wiperegions.java b/src/main/java/me/totalfreedom/totalfreedommod/command/Command_wiperegions.java index 1fe47bf3..56502205 100644 --- a/src/main/java/me/totalfreedom/totalfreedommod/command/Command_wiperegions.java +++ b/src/main/java/me/totalfreedom/totalfreedommod/command/Command_wiperegions.java @@ -40,7 +40,7 @@ public class Command_wiperegions extends FreedomCommand if (regionsWiped != 0) { - FUtil.staffAction(sender.getName(), "Wiped all regions in " + world.getName(), true); + FUtil.adminAction(sender.getName(), "Wiped all regions in " + world.getName(), true); msg("Wiped " + regionsWiped + " regions in " + world.getName()); return true; } diff --git a/src/main/java/me/totalfreedom/totalfreedommod/command/Command_wipeuserdata.java b/src/main/java/me/totalfreedom/totalfreedommod/command/Command_wipeuserdata.java index 34be758a..c184766a 100644 --- a/src/main/java/me/totalfreedom/totalfreedommod/command/Command_wipeuserdata.java +++ b/src/main/java/me/totalfreedom/totalfreedommod/command/Command_wipeuserdata.java @@ -23,11 +23,11 @@ public class Command_wipeuserdata extends FreedomCommand return true; } - FUtil.staffAction(sender.getName(), "Wiping Essentials and worlds playerdata", true); + FUtil.adminAction(sender.getName(), "Wiping Essentials and worlds playerdata", true); for (World w : Bukkit.getWorlds()) { - if (w.getName().equals(plugin.wm.staffworld.getWorld().getName())) + if (w.getName().equals(plugin.wm.adminworld.getWorld().getName())) { continue; } diff --git a/src/main/java/me/totalfreedom/totalfreedommod/command/Command_wipewarps.java b/src/main/java/me/totalfreedom/totalfreedommod/command/Command_wipewarps.java index 0ac21765..ce7dcc36 100644 --- a/src/main/java/me/totalfreedom/totalfreedommod/command/Command_wipewarps.java +++ b/src/main/java/me/totalfreedom/totalfreedommod/command/Command_wipewarps.java @@ -23,7 +23,7 @@ public class Command_wipewarps extends FreedomCommand Essentials essentials = plugin.esb.getEssentialsPlugin(); File warps = new File(essentials.getDataFolder(), "warps"); - FUtil.staffAction(sender.getName(), "Wiping Essentials warps", true); + FUtil.adminAction(sender.getName(), "Wiping Essentials warps", true); FUtil.deleteFolder(warps); warps.mkdir(); essentials.reload(); diff --git a/src/main/java/me/totalfreedom/totalfreedommod/command/FreedomCommand.java b/src/main/java/me/totalfreedom/totalfreedommod/command/FreedomCommand.java index be8c3eae..49c0a192 100644 --- a/src/main/java/me/totalfreedom/totalfreedommod/command/FreedomCommand.java +++ b/src/main/java/me/totalfreedom/totalfreedommod/command/FreedomCommand.java @@ -12,7 +12,7 @@ import lombok.Getter; import me.totalfreedom.totalfreedommod.TotalFreedomMod; import me.totalfreedom.totalfreedommod.player.PlayerData; import me.totalfreedom.totalfreedommod.rank.Rank; -import me.totalfreedom.totalfreedommod.staff.StaffMember; +import me.totalfreedom.totalfreedommod.admin.Admin; import me.totalfreedom.totalfreedommod.util.FUtil; import org.apache.commons.lang.StringUtils; import org.bukkit.Bukkit; @@ -166,7 +166,7 @@ public abstract class FreedomCommand implements CommandExecutor, TabCompleter return true; } - if (perms.cooldown() != 0 && !isStaff(sender)) + if (perms.cooldown() != 0 && !isAdmin(sender)) { COOLDOWN_TIMERS.put(sender, cmd); timer.schedule(new TimerTask() @@ -224,14 +224,14 @@ public abstract class FreedomCommand implements CommandExecutor, TabCompleter msg(color + message); } - protected boolean isStaff(Player player) + protected boolean isAdmin(Player player) { - return plugin.sl.isStaff(player); + return plugin.al.isAdmin(player); } - protected boolean isStaff(CommandSender sender) + protected boolean isAdmin(CommandSender sender) { - return plugin.sl.isStaff(sender); + return plugin.al.isAdmin(sender); } protected void checkConsole() @@ -316,7 +316,7 @@ public abstract class FreedomCommand implements CommandExecutor, TabCompleter Player player = Bukkit.getPlayer(name); if (player != null) { - if (nullVanished && plugin.sl.isVanished(player.getName()) && !plugin.sl.isStaff(sender)) + if (nullVanished && plugin.al.isVanished(player.getName()) && !plugin.al.isAdmin(sender)) { return null; } @@ -324,14 +324,14 @@ public abstract class FreedomCommand implements CommandExecutor, TabCompleter return player; } - protected StaffMember getStaffMember(CommandSender sender) + protected Admin getAdmin(CommandSender sender) { - return plugin.sl.getAdmin(sender); + return plugin.al.getAdmin(sender); } - protected StaffMember getStaffMember(Player player) + protected Admin getAdmin(Player player) { - return plugin.sl.getAdmin(player); + return plugin.al.getAdmin(player); } protected PlayerData getData(Player player) diff --git a/src/main/java/me/totalfreedom/totalfreedommod/config/ConfigEntry.java b/src/main/java/me/totalfreedom/totalfreedommod/config/ConfigEntry.java index 64fd5259..e1c53588 100644 --- a/src/main/java/me/totalfreedom/totalfreedommod/config/ConfigEntry.java +++ b/src/main/java/me/totalfreedom/totalfreedommod/config/ConfigEntry.java @@ -64,7 +64,7 @@ public enum ConfigEntry SERVER_TABLIST_FOOTER(String.class, "server.tablist_footer"), // SERVER_BAN_MOTD(String.class, "server.motds.ban"), - SERVER_STAFFMODE_MOTD(String.class, "server.motds.staffmode"), + SERVER_ADMINMODE_MOTD(String.class, "server.motds.adminmode"), SERVER_LOCKDOWN_MOTD(String.class, "server.motds.lockdown"), SERVER_WHITELIST_MOTD(String.class, "server.motds.whitelist"), SERVER_FULL_MOTD(String.class, "server.motds.full"), @@ -73,7 +73,6 @@ public enum ConfigEntry DISCORD_REPORT_CHANNEL_ID(String.class, "discord.report_channel_id"), DISCORD_CHAT_CHANNEL_ID(String.class, "discord.chat_channel_id"), DISCORD_ADMINCHAT_CHANNEL_ID(String.class, "discord.adminchat_channel_id"), - DISCORD_ROLE_SYNC(Boolean.class, "discord.role_sync"), DISCORD_SERVER_ID(String.class, "discord.server_id"), DISCORD_MASTER_BUILDER_ROLE_ID(String.class, "discord.master_builder_role_id"), @@ -83,18 +82,6 @@ public enum ConfigEntry DISCORD_EXECUTIVE_ROLE_ID(String.class, "discord.executive_role_id"), DISCORD_SERVER_OWNER_ROLE_ID(String.class, "discord.server_owner_role_id"), // - REDDIT_SUBREDDIT_NAME(String.class, "reddit.subreddit_name"), - REDDIT_USERNAME(String.class, "reddit.username"), - REDDIT_PASSWORD(String.class, "reddit.password"), - REDDIT_CLIENT_ID(String.class, "reddit.client_id"), - REDDIT_CLIENT_SECRET(String.class, "reddit.client_secret"), - REDDIT_MASTER_BUILDER_FLAIR_ID(String.class, "reddit.master_builder_flair_id"), - REDDIT_NEW_ADMIN_FLAIR_ID(String.class, "reddit.admin_flair_id"), - REDDIT_SENIOR_ADMIN_FLAIR_ID(String.class, "reddit.senior_admin_flair_id"), - REDDIT_DEVELOPER_FLAIR_ID(String.class, "reddit.developer_flair_id"), - REDDIT_EXECUTIVE_FLAIR_ID(String.class, "reddit.executive_flair_id"), - REDDIT_SERVER_OWNER_FLAIR_ID(String.class, "reddit.server_owner_flair_id"), - // PTERO_URL(String.class, "ptero.url"), PTERO_DEFAULT_EMAIL_DOMAIN(String.class, "ptero.default_email_domain"), PTERO_SERVER_UUID(String.class, "ptero.server_uuid"), @@ -119,8 +106,8 @@ public enum ConfigEntry SHOP_PRICES_CLOWN_FISH(Integer.class, "shop.prices.clown_fish"), SHOP_PRICES_LOGIN_MESSAGES(Integer.class, "shop.prices.login_messages"), // - STAFFLIST_CLEAN_THESHOLD_HOURS(Integer.class, "stafflist.clean_threshold_hours"), - STAFFLIST_CONSOLE_IS_ADMIN(Boolean.class, "stafflist.console_is_admin"), + ADMINLIST_CLEAN_THESHOLD_HOURS(Integer.class, "adminlist.clean_threshold_hours"), + ADMINLIST_CONSOLE_IS_ADMIN(Boolean.class, "adminlist.console_is_admin"), // COREPROTECT_MYSQL_ENABLED(Boolean.class, "coreprotect.enabled"), COREPROTECT_MYSQL_HOST(String.class, "coreprotect.host"), @@ -135,17 +122,12 @@ public enum ConfigEntry ENABLE_PREPROCESS_LOG(Boolean.class, "preprocess_log"), ENABLE_PET_PROTECT(Boolean.class, "petprotect.enabled"), // - LANDMINES_ENABLED(Boolean.class, "landmines_enabled"), - TOSSMOB_ENABLED(Boolean.class, "tossmob_enabled"), - AUTOKICK_ENABLED(Boolean.class, "autokick.enabled"), - MP44_ENABLED(Boolean.class, "mp44_enabled"), - FOURCHAN_ENABLED(Boolean.class, "4chan_enabled"), - // NUKE_MONITOR_ENABLED(Boolean.class, "nukemonitor.enabled"), NUKE_MONITOR_COUNT_BREAK(Integer.class, "nukemonitor.count_break"), NUKE_MONITOR_COUNT_PLACE(Integer.class, "nukemonitor.count_place"), NUKE_MONITOR_RANGE(Double.class, "nukemonitor.range"), // + AUTOKICK_ENABLED(Boolean.class, "autokick.enabled"), AUTOKICK_THRESHOLD(Double.class, "autokick.threshold"), AUTOKICK_TIME(Integer.class, "autokick.time"), // @@ -166,8 +148,8 @@ public enum ConfigEntry BLOCKED_COMMANDS(List.class, "blocked_commands"), HOST_SENDER_NAMES(List.class, "host_sender_names"), FAMOUS_PLAYERS(List.class, "famous_players"), - STAFF_ONLY_MODE(Boolean.class, "staff_only_mode"), - STAFF_INFO(List.class, "staffinfo"), + ADMIN_ONLY_MODE(Boolean.class, "admin_only_mode"), + ADMIN_INFO(List.class, "admininfo"), VOTING_INFO(List.class, "votinginfo"), MASTER_BUILDER_INFO(List.class, "masterbuilderinfo"), AUTO_ENTITY_WIPE(Boolean.class, "auto_wipe"), diff --git a/src/main/java/me/totalfreedom/totalfreedommod/discord/Discord.java b/src/main/java/me/totalfreedom/totalfreedommod/discord/Discord.java index 88232d5e..7f419f51 100644 --- a/src/main/java/me/totalfreedom/totalfreedommod/discord/Discord.java +++ b/src/main/java/me/totalfreedom/totalfreedommod/discord/Discord.java @@ -17,7 +17,7 @@ import me.totalfreedom.totalfreedommod.FreedomService; import me.totalfreedom.totalfreedommod.config.ConfigEntry; import me.totalfreedom.totalfreedommod.player.PlayerData; import me.totalfreedom.totalfreedommod.rank.Rank; -import me.totalfreedom.totalfreedommod.staff.StaffMember; +import me.totalfreedom.totalfreedommod.admin.Admin; import me.totalfreedom.totalfreedommod.util.FLog; import me.totalfreedom.totalfreedommod.util.FUtil; import net.dv8tion.jda.api.EmbedBuilder; @@ -298,7 +298,7 @@ public class Discord extends FreedomService @EventHandler(priority = EventPriority.MONITOR) public void onPlayerJoin(PlayerJoinEvent event) { - if (!plugin.sl.isVanished(event.getPlayer().getName())) + if (!plugin.al.isVanished(event.getPlayer().getName())) { messageChatChannel("**" + deformat(event.getPlayer().getName()) + " joined the server" + "**"); } @@ -307,7 +307,7 @@ public class Discord extends FreedomService @EventHandler(priority = EventPriority.MONITOR) public void onPlayerLeave(PlayerQuitEvent event) { - if (!plugin.sl.isVanished(event.getPlayer().getName())) + if (!plugin.al.isVanished(event.getPlayer().getName())) { messageChatChannel("**" + deformat(event.getPlayer().getName()) + " left the server" + "**"); } @@ -428,7 +428,7 @@ public class Discord extends FreedomService return true; } - public static boolean syncRoles(StaffMember staffMember, String discordID) + public static boolean syncRoles(Admin admin, String discordID) { if (discordID == null) { @@ -462,7 +462,7 @@ public class Discord extends FreedomService return false; } - if (!staffMember.isActive()) + if (!admin.isActive()) { if (member.getRoles().contains(adminRole)) { @@ -475,7 +475,7 @@ public class Discord extends FreedomService return true; } - if (staffMember.getRank().equals(Rank.ADMIN)) + if (admin.getRank().equals(Rank.ADMIN)) { if (!member.getRoles().contains(adminRole)) { @@ -487,7 +487,7 @@ public class Discord extends FreedomService } return true; } - else if (staffMember.getRank().equals(Rank.SENIOR_ADMIN)) + else if (admin.getRank().equals(Rank.SENIOR_ADMIN)) { if (!member.getRoles().contains(senioradminRole)) { diff --git a/src/main/java/me/totalfreedom/totalfreedommod/discord/DiscordToAdminChatListener.java b/src/main/java/me/totalfreedom/totalfreedommod/discord/DiscordToAdminChatListener.java index e5005bcd..35eda11b 100644 --- a/src/main/java/me/totalfreedom/totalfreedommod/discord/DiscordToAdminChatListener.java +++ b/src/main/java/me/totalfreedom/totalfreedommod/discord/DiscordToAdminChatListener.java @@ -26,7 +26,7 @@ public class DiscordToAdminChatListener extends ListenerAdapter { Member member = event.getMember(); String tag = dtml.getDisplay(member); - StringBuilder message = new StringBuilder(ChatColor.DARK_GRAY + "[" + ChatColor.DARK_AQUA + "STAFF" + ChatColor.DARK_GRAY + "]"); + StringBuilder message = new StringBuilder(ChatColor.DARK_GRAY + "[" + ChatColor.DARK_AQUA + "ADMIN" + ChatColor.DARK_GRAY + "]"); Message msg = event.getMessage(); if (tag != null) { @@ -56,7 +56,7 @@ public class DiscordToAdminChatListener extends ListenerAdapter } for (Player player : Bukkit.getOnlinePlayers()) { - if (TotalFreedomMod.getPlugin().sl.isStaff(player)) + if (TotalFreedomMod.getPlugin().al.isAdmin(player)) { player.spigot().sendMessage(builder.create()); } diff --git a/src/main/java/me/totalfreedom/totalfreedommod/discord/PrivateMessageListener.java b/src/main/java/me/totalfreedom/totalfreedommod/discord/PrivateMessageListener.java index 63cd4c80..d00dc422 100644 --- a/src/main/java/me/totalfreedom/totalfreedommod/discord/PrivateMessageListener.java +++ b/src/main/java/me/totalfreedom/totalfreedommod/discord/PrivateMessageListener.java @@ -2,7 +2,7 @@ package me.totalfreedom.totalfreedommod.discord; import me.totalfreedom.totalfreedommod.TotalFreedomMod; import me.totalfreedom.totalfreedommod.player.PlayerData; -import me.totalfreedom.totalfreedommod.staff.StaffMember; +import me.totalfreedom.totalfreedommod.admin.Admin; import net.dv8tion.jda.api.events.message.priv.PrivateMessageReceivedEvent; import net.dv8tion.jda.api.hooks.ListenerAdapter; @@ -24,10 +24,10 @@ public class PrivateMessageListener extends ListenerAdapter player.setDiscordID(event.getMessage().getAuthor().getId()); player.setVerification(true); - StaffMember staffMember = TotalFreedomMod.plugin().sl.getEntryByName(name); - if (staffMember != null) + Admin admin = TotalFreedomMod.plugin().al.getEntryByName(name); + if (admin != null) { - Discord.syncRoles(staffMember, player.getDiscordID()); + Discord.syncRoles(admin, player.getDiscordID()); } TotalFreedomMod.plugin().pl.save(player); Discord.LINK_CODES.remove(code); diff --git a/src/main/java/me/totalfreedom/totalfreedommod/freeze/FreezeData.java b/src/main/java/me/totalfreedom/totalfreedommod/freeze/FreezeData.java index a648375f..f0f97136 100644 --- a/src/main/java/me/totalfreedom/totalfreedommod/freeze/FreezeData.java +++ b/src/main/java/me/totalfreedom/totalfreedommod/freeze/FreezeData.java @@ -62,9 +62,9 @@ public class FreezeData @Override public void run() { - if (!plugin().sl.isStaffImpostor(player) && plugin().pl.isPlayerImpostor(player)) + if (!plugin().al.isAdminImpostor(player) && plugin().pl.isPlayerImpostor(player)) { - FUtil.staffAction("TotalFreedom", "Unfreezing " + player.getName(), false); + FUtil.adminAction("TotalFreedom", "Unfreezing " + player.getName(), false); setFrozen(false); } } diff --git a/src/main/java/me/totalfreedom/totalfreedommod/freeze/Freezer.java b/src/main/java/me/totalfreedom/totalfreedommod/freeze/Freezer.java index 638d51b9..e830be9b 100644 --- a/src/main/java/me/totalfreedom/totalfreedommod/freeze/Freezer.java +++ b/src/main/java/me/totalfreedom/totalfreedommod/freeze/Freezer.java @@ -46,7 +46,7 @@ public class Freezer extends FreedomService { final Player player = event.getPlayer(); - if (plugin.sl.isStaff(player)) + if (plugin.al.isAdmin(player)) { return; } diff --git a/src/main/java/me/totalfreedom/totalfreedommod/fun/CurseListener.java b/src/main/java/me/totalfreedom/totalfreedommod/fun/CurseListener.java deleted file mode 100644 index 50a8f0c4..00000000 --- a/src/main/java/me/totalfreedom/totalfreedommod/fun/CurseListener.java +++ /dev/null @@ -1,53 +0,0 @@ -package me.totalfreedom.totalfreedommod.fun; - -import java.util.HashMap; -import me.totalfreedom.totalfreedommod.FreedomService; -import org.bukkit.ChatColor; -import org.bukkit.entity.Player; -import org.bukkit.event.EventHandler; -import org.bukkit.event.EventPriority; -import org.bukkit.event.player.PlayerResourcePackStatusEvent; -import static org.bukkit.event.player.PlayerResourcePackStatusEvent.Status; - -public class CurseListener extends FreedomService -{ - public HashMap cursedPlayers = new HashMap(); - - @Override - public void onStart() - { - } - - @Override - public void onStop() - { - } - - @EventHandler(priority = EventPriority.MONITOR) - public void onResourcePackStatus(PlayerResourcePackStatusEvent event) - { - Player player = event.getPlayer(); - PlayerResourcePackStatusEvent.Status cursed = event.getStatus(); - Player cursedBy = cursedPlayers.get(player); - if (cursed.equals(Status.ACCEPTED)) - { - cursedBy.sendMessage(ChatColor.GREEN + "Casting curse on " + player.getName() + "..."); - } - else if (cursed.equals(Status.DECLINED)) - { - cursedBy.sendMessage(ChatColor.RED + "Failed to start cast on " + player.getName() + "!"); - cursedPlayers.remove(player); - } - else if (cursed.equals(Status.SUCCESSFULLY_LOADED)) - { - cursedBy.sendMessage(ChatColor.GREEN + "Successfully cursed + " + player.getName() + "!"); - cursedPlayers.remove(player); - } - else if (cursed.equals(Status.FAILED_DOWNLOAD)) - { - cursedBy.sendMessage(ChatColor.RED + "Failed to cast curse on " + player.getName() + "!"); - cursedPlayers.remove(player); - } - } - -} diff --git a/src/main/java/me/totalfreedom/totalfreedommod/fun/ItemFun.java b/src/main/java/me/totalfreedom/totalfreedommod/fun/ItemFun.java index f1875723..610c7f21 100644 --- a/src/main/java/me/totalfreedom/totalfreedommod/fun/ItemFun.java +++ b/src/main/java/me/totalfreedom/totalfreedommod/fun/ItemFun.java @@ -46,7 +46,6 @@ import org.bukkit.util.Vector; public class ItemFun extends FreedomService { - public List explosivePlayers = new ArrayList<>(); private final Random random = new Random(); @@ -177,30 +176,9 @@ public class ItemFun extends FreedomService } final Player player = event.getPlayer(); - final FPlayer fPlayer = plugin.pl.getPlayer(player); switch (event.getMaterial()) { - case GUNPOWDER: - { - if (!fPlayer.isMP44Armed()) - { - break; - } - - event.setCancelled(true); - - if (fPlayer.toggleMP44Firing()) - { - fPlayer.startArrowShooter(plugin); - } - else - { - fPlayer.stopArrowShooter(); - } - break; - } - case BLAZE_ROD: { if (!plugin.sh.isRealItem(plugin.pl.getData(player), ShopItem.LIGHTNING_ROD, player.getInventory(), plugin.sh.getLightningRod())) diff --git a/src/main/java/me/totalfreedom/totalfreedommod/fun/Landminer.java b/src/main/java/me/totalfreedom/totalfreedommod/fun/Landminer.java deleted file mode 100644 index 07853dda..00000000 --- a/src/main/java/me/totalfreedom/totalfreedommod/fun/Landminer.java +++ /dev/null @@ -1,122 +0,0 @@ -package me.totalfreedom.totalfreedommod.fun; - -import java.util.ArrayList; -import java.util.Iterator; -import java.util.List; -import lombok.Getter; -import me.totalfreedom.totalfreedommod.FreedomService; -import me.totalfreedom.totalfreedommod.config.ConfigEntry; -import org.bukkit.GameMode; -import org.bukkit.Location; -import org.bukkit.Material; -import org.bukkit.entity.Player; -import org.bukkit.entity.TNTPrimed; -import org.bukkit.event.EventHandler; -import org.bukkit.event.EventPriority; -import org.bukkit.event.player.PlayerMoveEvent; -import org.bukkit.util.Vector; - -public class Landminer extends FreedomService -{ - - @Getter - private final List landmines = new ArrayList<>(); - - @Override - public void onStart() - { - landmines.clear(); - } - - @Override - public void onStop() - { - } - - public void add(Landmine landmine) - { - landmines.add(landmine); - } - - public void remove(Landmine landmine) - { - landmines.remove(landmine); - } - - @EventHandler(priority = EventPriority.NORMAL) - public void onPlayerMove(PlayerMoveEvent event) - { - if (!(ConfigEntry.LANDMINES_ENABLED.getBoolean() && ConfigEntry.ALLOW_EXPLOSIONS.getBoolean())) - { - return; - } - - final Player player = event.getPlayer(); - - final Iterator lit = landmines.iterator(); - while (lit.hasNext()) - { - final Landmine landmine = lit.next(); - - final Location location = landmine.location; - if (location.getBlock().getType() != Material.TNT) - { - lit.remove(); - continue; - } - - if (landmine.planter.equals(player)) - { - break; - } - - if (!player.getWorld().equals(location.getWorld())) - { - continue; - } - - if (!(player.getLocation().distanceSquared(location) <= (landmine.radius * landmine.radius))) - { - break; - } - - landmine.location.getBlock().setType(Material.AIR); - - final TNTPrimed tnt1 = location.getWorld().spawn(location, TNTPrimed.class); - tnt1.setFuseTicks(40); - tnt1.setPassenger(player); - tnt1.setVelocity(new Vector(0.0, 2.0, 0.0)); - - final TNTPrimed tnt2 = location.getWorld().spawn(player.getLocation(), TNTPrimed.class); - tnt2.setFuseTicks(1); - - player.setGameMode(GameMode.SURVIVAL); - lit.remove(); - } - } - - public static class Landmine - { - - @Getter - private final Location location; - @Getter - private final Player planter; - @Getter - private final double radius; - - public Landmine(Location location, Player player, double radius) - { - this.location = location; - this.planter = player; - this.radius = radius; - } - - @Override - public String toString() - { - return this.location.toString() + ", " + this.radius + ", " + this.planter.getName(); - } - } - -} diff --git a/src/main/java/me/totalfreedom/totalfreedommod/fun/MP44.java b/src/main/java/me/totalfreedom/totalfreedommod/fun/MP44.java deleted file mode 100644 index a961d505..00000000 --- a/src/main/java/me/totalfreedom/totalfreedommod/fun/MP44.java +++ /dev/null @@ -1,26 +0,0 @@ -package me.totalfreedom.totalfreedommod.fun; - -import me.totalfreedom.totalfreedommod.FreedomService; -import org.bukkit.event.EventHandler; -import org.bukkit.event.EventPriority; -import org.bukkit.event.player.PlayerQuitEvent; - -public class MP44 extends FreedomService -{ - @Override - public void onStart() - { - } - - @Override - public void onStop() - { - } - - @EventHandler(priority = EventPriority.MONITOR) - public void onPlayerQuit(PlayerQuitEvent event) - { - plugin.pl.getPlayer(event.getPlayer()).disarmMP44(); - } - -} diff --git a/src/main/java/me/totalfreedom/totalfreedommod/httpd/HTTPDaemon.java b/src/main/java/me/totalfreedom/totalfreedommod/httpd/HTTPDaemon.java index a18d0375..11cd84fe 100644 --- a/src/main/java/me/totalfreedom/totalfreedommod/httpd/HTTPDaemon.java +++ b/src/main/java/me/totalfreedom/totalfreedommod/httpd/HTTPDaemon.java @@ -23,7 +23,6 @@ import me.totalfreedom.totalfreedommod.httpd.module.Module_logs; import me.totalfreedom.totalfreedommod.httpd.module.Module_players; import me.totalfreedom.totalfreedommod.httpd.module.Module_punishments; import me.totalfreedom.totalfreedommod.httpd.module.Module_schematic; -import me.totalfreedom.totalfreedommod.httpd.module.Module_staff; import me.totalfreedom.totalfreedommod.util.FLog; import org.apache.commons.io.FilenameUtils; import org.apache.commons.lang.StringUtils; @@ -31,7 +30,6 @@ import org.apache.commons.lang.exception.ExceptionUtils; public class HTTPDaemon extends FreedomService { - public static String MIME_DEFAULT_BINARY = "application/octet-stream"; private static final Pattern EXT_REGEX = Pattern.compile("\\.([^\\.\\s]+)$"); // @@ -53,7 +51,6 @@ public class HTTPDaemon extends FreedomService // Modules modules.clear(); module("activitylog", Module_activitylog.class, true); - module("staff", Module_staff.class, true); module("bans", Module_bans.class, true); module("help", Module_help.class, false); module("list", Module_list.class, false); diff --git a/src/main/java/me/totalfreedom/totalfreedommod/httpd/module/Module_activitylog.java b/src/main/java/me/totalfreedom/totalfreedommod/httpd/module/Module_activitylog.java index e165878d..4a308179 100644 --- a/src/main/java/me/totalfreedom/totalfreedommod/httpd/module/Module_activitylog.java +++ b/src/main/java/me/totalfreedom/totalfreedommod/httpd/module/Module_activitylog.java @@ -4,8 +4,8 @@ import java.io.File; import me.totalfreedom.totalfreedommod.TotalFreedomMod; import me.totalfreedom.totalfreedommod.httpd.HTTPDaemon; import me.totalfreedom.totalfreedommod.httpd.NanoHTTPD; -import me.totalfreedom.totalfreedommod.staff.ActivityLog; -import me.totalfreedom.totalfreedommod.staff.StaffMember; +import me.totalfreedom.totalfreedommod.admin.ActivityLog; +import me.totalfreedom.totalfreedommod.admin.Admin; public class Module_activitylog extends HTTPDModule { @@ -39,7 +39,7 @@ public class Module_activitylog extends HTTPDModule private boolean isAuthorized(String remoteAddress) { - StaffMember entry = plugin.sl.getEntryByIp(remoteAddress); + Admin entry = plugin.al.getEntryByIp(remoteAddress); return entry != null && entry.isActive(); } } diff --git a/src/main/java/me/totalfreedom/totalfreedommod/httpd/module/Module_bans.java b/src/main/java/me/totalfreedom/totalfreedommod/httpd/module/Module_bans.java index 8b0d0072..b1141830 100644 --- a/src/main/java/me/totalfreedom/totalfreedommod/httpd/module/Module_bans.java +++ b/src/main/java/me/totalfreedom/totalfreedommod/httpd/module/Module_bans.java @@ -2,7 +2,7 @@ package me.totalfreedom.totalfreedommod.httpd.module; import me.totalfreedom.totalfreedommod.TotalFreedomMod; import me.totalfreedom.totalfreedommod.httpd.NanoHTTPD; -import me.totalfreedom.totalfreedommod.staff.StaffMember; +import me.totalfreedom.totalfreedommod.admin.Admin; public class Module_bans extends HTTPDModule { @@ -41,7 +41,7 @@ public class Module_bans extends HTTPDModule private boolean isAuthorized(String remoteAddress) { - StaffMember entry = plugin.sl.getEntryByIp(remoteAddress); + Admin entry = plugin.al.getEntryByIp(remoteAddress); return entry != null && entry.isActive(); } } \ No newline at end of file diff --git a/src/main/java/me/totalfreedom/totalfreedommod/httpd/module/Module_indefbans.java b/src/main/java/me/totalfreedom/totalfreedommod/httpd/module/Module_indefbans.java index 63b66fc7..6940d628 100644 --- a/src/main/java/me/totalfreedom/totalfreedommod/httpd/module/Module_indefbans.java +++ b/src/main/java/me/totalfreedom/totalfreedommod/httpd/module/Module_indefbans.java @@ -5,7 +5,7 @@ import me.totalfreedom.totalfreedommod.TotalFreedomMod; import me.totalfreedom.totalfreedommod.banning.IndefiniteBanList; import me.totalfreedom.totalfreedommod.httpd.HTTPDaemon; import me.totalfreedom.totalfreedommod.httpd.NanoHTTPD; -import me.totalfreedom.totalfreedommod.staff.StaffMember; +import me.totalfreedom.totalfreedommod.admin.Admin; public class Module_indefbans extends HTTPDModule { @@ -39,7 +39,7 @@ public class Module_indefbans extends HTTPDModule private boolean isAuthorized(String remoteAddress) { - StaffMember entry = plugin.sl.getEntryByIp(remoteAddress); + Admin entry = plugin.al.getEntryByIp(remoteAddress); return entry != null && entry.isActive(); } } diff --git a/src/main/java/me/totalfreedom/totalfreedommod/httpd/module/Module_index.java b/src/main/java/me/totalfreedom/totalfreedommod/httpd/module/Module_index.java index 8b3fb66b..f4175227 100644 --- a/src/main/java/me/totalfreedom/totalfreedommod/httpd/module/Module_index.java +++ b/src/main/java/me/totalfreedom/totalfreedommod/httpd/module/Module_index.java @@ -10,7 +10,6 @@ import org.reflections.Reflections; public class Module_index extends HTTPDModule { - public Module_index(TotalFreedomMod plugin, NanoHTTPD.HTTPSession session) { super(plugin, session); diff --git a/src/main/java/me/totalfreedom/totalfreedommod/httpd/module/Module_list.java b/src/main/java/me/totalfreedom/totalfreedommod/httpd/module/Module_list.java index c8cb29fb..57837a34 100644 --- a/src/main/java/me/totalfreedom/totalfreedommod/httpd/module/Module_list.java +++ b/src/main/java/me/totalfreedom/totalfreedommod/httpd/module/Module_list.java @@ -4,7 +4,7 @@ import java.util.Collection; import me.totalfreedom.totalfreedommod.TotalFreedomMod; import me.totalfreedom.totalfreedommod.config.ConfigEntry; import me.totalfreedom.totalfreedommod.httpd.NanoHTTPD; -import me.totalfreedom.totalfreedommod.staff.StaffMember; +import me.totalfreedom.totalfreedommod.admin.Admin; import me.totalfreedom.totalfreedommod.util.FUtil; import org.bukkit.Bukkit; import org.bukkit.entity.Player; @@ -38,7 +38,7 @@ public class Module_list extends HTTPDModule for (Player player : Bukkit.getOnlinePlayers()) { - if (plugin.sl.isVanished(player.getName())) + if (plugin.al.isVanished(player.getName())) { continue; } @@ -68,15 +68,15 @@ public class Module_list extends HTTPDModule owners.add(player.getName()); } - if (!plugin.sl.isStaff(player) && !hasSpecialTitle(player)) + if (!plugin.al.isAdmin(player) && !hasSpecialTitle(player)) { operators.add(player.getName()); } - if (!hasSpecialTitle(player) && plugin.sl.isStaff(player) && !plugin.sl.isVanished(player.getName())) + if (!hasSpecialTitle(player) && plugin.al.isAdmin(player) && !plugin.al.isVanished(player.getName())) { - StaffMember staffMember = plugin.sl.getAdmin(player); - switch (staffMember.getRank()) + Admin admin = plugin.al.getAdmin(player); + switch (admin.getRank()) { case ADMIN: admins.add(player.getName()); @@ -115,7 +115,7 @@ public class Module_list extends HTTPDModule for (Player player : onlinePlayers) { - if (plugin.sl.isVanished(player.getName())) + if (plugin.al.isVanished(player.getName())) { continue; } @@ -133,7 +133,7 @@ public class Module_list extends HTTPDModule public boolean isImposter(Player player) { - if (plugin.sl.isStaffImpostor(player) || plugin.pl.isPlayerImpostor(player)) + if (plugin.al.isAdminImpostor(player) || plugin.pl.isPlayerImpostor(player)) { return true; } diff --git a/src/main/java/me/totalfreedom/totalfreedommod/httpd/module/Module_logfile.java b/src/main/java/me/totalfreedom/totalfreedommod/httpd/module/Module_logfile.java index 8767cf64..8c964833 100644 --- a/src/main/java/me/totalfreedom/totalfreedommod/httpd/module/Module_logfile.java +++ b/src/main/java/me/totalfreedom/totalfreedommod/httpd/module/Module_logfile.java @@ -13,7 +13,7 @@ import me.totalfreedom.totalfreedommod.httpd.HTTPDPageBuilder; import me.totalfreedom.totalfreedommod.httpd.HTTPDaemon; import me.totalfreedom.totalfreedommod.httpd.NanoHTTPD; import me.totalfreedom.totalfreedommod.httpd.NanoHTTPD.Response; -import me.totalfreedom.totalfreedommod.staff.StaffMember; +import me.totalfreedom.totalfreedommod.admin.Admin; import me.totalfreedom.totalfreedommod.util.FLog; import org.apache.commons.io.FileUtils; import org.apache.commons.lang3.StringEscapeUtils; @@ -165,7 +165,7 @@ public class Module_logfile extends HTTPDModule private boolean isAuthorized(String remoteAddress) { - StaffMember entry = plugin.sl.getEntryByIp(remoteAddress); + Admin entry = plugin.al.getEntryByIp(remoteAddress); return entry != null && entry.isActive(); } diff --git a/src/main/java/me/totalfreedom/totalfreedommod/httpd/module/Module_players.java b/src/main/java/me/totalfreedom/totalfreedommod/httpd/module/Module_players.java index 89003d18..6945bca2 100644 --- a/src/main/java/me/totalfreedom/totalfreedommod/httpd/module/Module_players.java +++ b/src/main/java/me/totalfreedom/totalfreedommod/httpd/module/Module_players.java @@ -3,7 +3,7 @@ package me.totalfreedom.totalfreedommod.httpd.module; import me.totalfreedom.totalfreedommod.TotalFreedomMod; import me.totalfreedom.totalfreedommod.config.ConfigEntry; import me.totalfreedom.totalfreedommod.httpd.NanoHTTPD; -import me.totalfreedom.totalfreedommod.staff.StaffMember; +import me.totalfreedom.totalfreedommod.admin.Admin; import me.totalfreedom.totalfreedommod.util.FUtil; import org.bukkit.Bukkit; import org.bukkit.entity.Player; @@ -12,7 +12,6 @@ import org.json.simple.JSONObject; public class Module_players extends HTTPDModule { - public Module_players(TotalFreedomMod plugin, NanoHTTPD.HTTPSession session) { super(plugin, session); @@ -25,7 +24,7 @@ public class Module_players extends HTTPDModule final JSONObject responseObject = new JSONObject(); final JSONArray players = new JSONArray(); - final JSONArray onlinestaff = new JSONArray(); + final JSONArray onlineAdmins = new JSONArray(); final JSONArray masterbuilders = new JSONArray(); final JSONArray admins = new JSONArray(); final JSONArray senioradmins = new JSONArray(); @@ -35,22 +34,22 @@ public class Module_players extends HTTPDModule // All online players for (Player player : Bukkit.getOnlinePlayers()) { - if (!plugin.sl.isVanished(player.getName())) + if (!plugin.al.isVanished(player.getName())) { players.add(player.getName()); - if (plugin.sl.isStaff(player) && !plugin.sl.isStaffImpostor(player)) + if (plugin.al.isAdmin(player) && !plugin.al.isAdminImpostor(player)) { - onlinestaff.add(player.getName()); + onlineAdmins.add(player.getName()); } } } - // Staff - for (StaffMember staffMember : plugin.sl.getActiveStaffMembers()) + // Admins + for (Admin admin : plugin.al.getActiveAdmins()) { - final String username = staffMember.getName(); + final String username = admin.getName(); - switch (staffMember.getRank()) + switch (admin.getRank()) { case ADMIN: admins.add(username); diff --git a/src/main/java/me/totalfreedom/totalfreedommod/httpd/module/Module_punishments.java b/src/main/java/me/totalfreedom/totalfreedommod/httpd/module/Module_punishments.java index 3aadc42f..88e192d9 100644 --- a/src/main/java/me/totalfreedom/totalfreedommod/httpd/module/Module_punishments.java +++ b/src/main/java/me/totalfreedom/totalfreedommod/httpd/module/Module_punishments.java @@ -5,7 +5,7 @@ import me.totalfreedom.totalfreedommod.TotalFreedomMod; import me.totalfreedom.totalfreedommod.httpd.HTTPDaemon; import me.totalfreedom.totalfreedommod.httpd.NanoHTTPD; import me.totalfreedom.totalfreedommod.punishments.PunishmentList; -import me.totalfreedom.totalfreedommod.staff.StaffMember; +import me.totalfreedom.totalfreedommod.admin.Admin; public class Module_punishments extends HTTPDModule { @@ -42,7 +42,7 @@ public class Module_punishments extends HTTPDModule private boolean isAuthorized(String remoteAddress) { - StaffMember entry = plugin.sl.getEntryByIp(remoteAddress); + Admin entry = plugin.al.getEntryByIp(remoteAddress); return entry != null && entry.isActive(); } } \ No newline at end of file diff --git a/src/main/java/me/totalfreedom/totalfreedommod/httpd/module/Module_schematic.java b/src/main/java/me/totalfreedom/totalfreedommod/httpd/module/Module_schematic.java index 3c64d5bf..bdd5edf5 100644 --- a/src/main/java/me/totalfreedom/totalfreedommod/httpd/module/Module_schematic.java +++ b/src/main/java/me/totalfreedom/totalfreedommod/httpd/module/Module_schematic.java @@ -22,7 +22,7 @@ import me.totalfreedom.totalfreedommod.httpd.NanoHTTPD; import me.totalfreedom.totalfreedommod.httpd.NanoHTTPD.Method; import me.totalfreedom.totalfreedommod.httpd.NanoHTTPD.Response; import me.totalfreedom.totalfreedommod.player.PlayerData; -import me.totalfreedom.totalfreedommod.staff.StaffMember; +import me.totalfreedom.totalfreedommod.admin.Admin; import me.totalfreedom.totalfreedommod.util.FLog; import org.apache.commons.io.FileUtils; import org.apache.commons.lang3.StringEscapeUtils; @@ -280,9 +280,9 @@ public class Module_schematic extends HTTPDModule private boolean isAuthorized(String remoteAddress) { - StaffMember staffMemberEntry = plugin.sl.getEntryByIp(remoteAddress); + Admin adminEntry = plugin.al.getEntryByIp(remoteAddress); PlayerData data = plugin.pl.getDataByIp(remoteAddress); - return ((staffMemberEntry != null && staffMemberEntry.isActive()) || data != null && data.isMasterBuilder()); + return ((adminEntry != null && adminEntry.isActive()) || data != null && data.isMasterBuilder()); } private static class SchematicTransferException extends Exception diff --git a/src/main/java/me/totalfreedom/totalfreedommod/httpd/module/Module_staff.java b/src/main/java/me/totalfreedom/totalfreedommod/httpd/module/Module_staff.java deleted file mode 100644 index 41c5e261..00000000 --- a/src/main/java/me/totalfreedom/totalfreedommod/httpd/module/Module_staff.java +++ /dev/null @@ -1,48 +0,0 @@ -package me.totalfreedom.totalfreedommod.httpd.module; - -import me.totalfreedom.totalfreedommod.TotalFreedomMod; -import me.totalfreedom.totalfreedommod.httpd.NanoHTTPD; -import me.totalfreedom.totalfreedommod.staff.StaffMember; - -public class Module_staff extends HTTPDModule -{ - - public Module_staff(TotalFreedomMod plugin, NanoHTTPD.HTTPSession session) - { - super(plugin, session); - } - - @Override - public NanoHTTPD.Response getResponse() - { - - return new NanoHTTPD.Response(NanoHTTPD.Response.Status.NOT_FOUND, NanoHTTPD.MIME_PLAINTEXT, - "Error 404: Not Found - i have to re-work this"); - /*File adminFile = new File(plugin.getDataFolder(), Admin.CONFIG_FILENAME); - if (adminFile.exists()) - { - final String remoteAddress = socket.getInetAddress().getHostAddress(); - if (!isAuthorized(remoteAddress)) - { - return new NanoHTTPD.Response(NanoHTTPD.Response.Status.NOT_FOUND, NanoHTTPD.MIME_PLAINTEXT, - "You may not view the admin list. Your IP, " + remoteAddress + ", is not registered to an admin on the server."); - } - else - { - return HTTPDaemon.serveFileBasic(new File(plugin.getDataFolder(), Admin.CONFIG_FILENAME)); - } - - } - else - { - return new NanoHTTPD.Response(NanoHTTPD.Response.Status.NOT_FOUND, NanoHTTPD.MIME_PLAINTEXT, - "Error 404: Not Found - The requested resource was not found on this server."); - }*/ - } - - private boolean isAuthorized(String remoteAddress) - { - StaffMember entry = plugin.sl.getEntryByIp(remoteAddress); - return entry != null && entry.isActive(); - } -} \ No newline at end of file diff --git a/src/main/java/me/totalfreedom/totalfreedommod/permissions/PermissionManager.java b/src/main/java/me/totalfreedom/totalfreedommod/permissions/PermissionManager.java index 60a2cd92..c17c3ed0 100644 --- a/src/main/java/me/totalfreedom/totalfreedommod/permissions/PermissionManager.java +++ b/src/main/java/me/totalfreedom/totalfreedommod/permissions/PermissionManager.java @@ -94,7 +94,7 @@ public class PermissionManager extends FreedomService } } - if (plugin.pl.getData(player).isMasterBuilder() && !plugin.sl.isStaff(player)) + if (plugin.pl.getData(player).isMasterBuilder() && !plugin.al.isAdmin(player)) { if (nodes != null) { diff --git a/src/main/java/me/totalfreedom/totalfreedommod/player/FPlayer.java b/src/main/java/me/totalfreedom/totalfreedommod/player/FPlayer.java index 9ca196ce..78027bca 100644 --- a/src/main/java/me/totalfreedom/totalfreedommod/player/FPlayer.java +++ b/src/main/java/me/totalfreedom/totalfreedommod/player/FPlayer.java @@ -20,7 +20,6 @@ import org.bukkit.scheduler.BukkitTask; public class FPlayer { - public static final long AUTO_PURGE_TICKS = 5L * 60L * 20L; @Getter @@ -51,13 +50,10 @@ public class FPlayer private EntityType mobThrowerEntity = EntityType.PIG; private double mobThrowerSpeed = 4.0; private final List mobThrowerQueue = new ArrayList<>(); - private BukkitTask mp44ScheduleTask = null; - private boolean mp44Armed = false; - private boolean mp44Firing = false; private BukkitTask lockupScheduleTask = null; private boolean lockedUp = false; private String lastMessage = ""; - private boolean inStaffchat = false; + private boolean inAdminChat = false; private boolean allCommandsBlocked = false; @Getter @Setter @@ -236,46 +232,6 @@ public class FPlayer } } - public void startArrowShooter(TotalFreedomMod plugin) - { - this.stopArrowShooter(); - this.mp44ScheduleTask = new ArrowShooter(this.player).runTaskTimer(plugin, 1L, 1L); - this.mp44Firing = true; - } - - public void stopArrowShooter() - { - if (this.mp44ScheduleTask != null) - { - this.mp44ScheduleTask.cancel(); - this.mp44ScheduleTask = null; - } - this.mp44Firing = false; - } - - public void armMP44() - { - this.mp44Armed = true; - this.stopArrowShooter(); - } - - public void disarmMP44() - { - this.mp44Armed = false; - this.stopArrowShooter(); - } - - public boolean isMP44Armed() - { - return this.mp44Armed; - } - - public boolean toggleMP44Firing() - { - this.mp44Firing = !this.mp44Firing; - return mp44Firing; - } - public boolean isMuted() { return unmuteTask != null; @@ -306,12 +262,12 @@ public class FPlayer { if (getPlayer() != null) { - FUtil.staffAction(ConfigEntry.SERVER_NAME.getString(), "Unmuting " + getPlayer().getName(), false); + FUtil.adminAction(ConfigEntry.SERVER_NAME.getString(), "Unmuting " + getPlayer().getName(), false); setMuted(false); } else { - FUtil.staffAction(ConfigEntry.SERVER_NAME.getString(), "Unmuting " + getName(), false); + FUtil.adminAction(ConfigEntry.SERVER_NAME.getString(), "Unmuting " + getName(), false); plugin.mu.MUTED_PLAYERS.remove(getName()); } } @@ -348,14 +304,15 @@ public class FPlayer return lastMessage; } - public void setStaffChat(boolean inStaffchat) + public void setAdminChat(boolean inAdminChat + ) { - this.inStaffchat = inStaffchat; + this.inAdminChat = inAdminChat; } - public boolean inStaffChat() + public boolean inAdminChat() { - return this.inStaffchat; + return this.inAdminChat; } public boolean allCommandsBlocked() diff --git a/src/main/java/me/totalfreedom/totalfreedommod/player/PlayerData.java b/src/main/java/me/totalfreedom/totalfreedommod/player/PlayerData.java index 6822c92f..d5329fa8 100644 --- a/src/main/java/me/totalfreedom/totalfreedommod/player/PlayerData.java +++ b/src/main/java/me/totalfreedom/totalfreedommod/player/PlayerData.java @@ -49,9 +49,6 @@ public class PlayerData private boolean displayDiscord = true; @Getter @Setter - private String redditUsername; - @Getter - @Setter private String loginMessage; public PlayerData(ResultSet resultSet) @@ -75,7 +72,6 @@ public class PlayerData items.addAll(FUtil.stringToList(resultSet.getString("items"))); totalVotes = resultSet.getInt("total_votes"); displayDiscord = resultSet.getBoolean("display_discord"); - redditUsername = resultSet.getString("reddit_username"); loginMessage = resultSet.getString("login_message"); } catch (SQLException e) @@ -112,7 +108,6 @@ public class PlayerData .append("- Tag: ").append(FUtil.colorize(tag)).append(ChatColor.GRAY).append("\n") .append("- Ride Mode: ").append(rideMode).append("\n") .append("- Backup Codes: ").append(backupCodes.size()).append("/10").append("\n") - .append("- Reddit Username: ").append(redditUsername) .append("- Login Message: ").append(loginMessage); return output.toString(); @@ -248,7 +243,6 @@ public class PlayerData put("items", FUtil.listToString(items)); put("total_votes", totalVotes); put("display_discord", displayDiscord); - put("reddit_username", redditUsername); put("login_message", loginMessage); }}; return map; diff --git a/src/main/java/me/totalfreedom/totalfreedommod/player/PlayerList.java b/src/main/java/me/totalfreedom/totalfreedommod/player/PlayerList.java index 04ba3742..553d2887 100644 --- a/src/main/java/me/totalfreedom/totalfreedommod/player/PlayerList.java +++ b/src/main/java/me/totalfreedom/totalfreedommod/player/PlayerList.java @@ -11,7 +11,7 @@ import lombok.Getter; import me.totalfreedom.totalfreedommod.FreedomService; import me.totalfreedom.totalfreedommod.config.ConfigEntry; import me.totalfreedom.totalfreedommod.rank.Rank; -import me.totalfreedom.totalfreedommod.staff.StaffMember; +import me.totalfreedom.totalfreedommod.admin.Admin; import me.totalfreedom.totalfreedommod.util.FLog; import me.totalfreedom.totalfreedommod.util.FUtil; import org.bukkit.OfflinePlayer; @@ -19,7 +19,6 @@ import org.bukkit.entity.Player; public class PlayerList extends FreedomService { - @Getter public final Map playerMap = Maps.newHashMap(); // ip,dataMap @@ -98,25 +97,16 @@ public class PlayerList extends FreedomService { PlayerData data = getData(name); - if ((!ConfigEntry.HOST_SENDER_NAMES.getStringList().contains(name.toLowerCase()) && data != null && !ConfigEntry.SERVER_OWNERS.getStringList().contains(data.getName())) - && !ConfigEntry.SERVER_EXECUTIVES.getStringList().contains(data.getName()) - && !isTelnetMasterBuilder(data) - && !ConfigEntry.HOST_SENDER_NAMES.getStringList().contains(name.toLowerCase())) - { - return false; - } - return true; + return (ConfigEntry.HOST_SENDER_NAMES.getStringList().contains(name.toLowerCase()) || data == null || ConfigEntry.SERVER_OWNERS.getStringList().contains(data.getName())) + || ConfigEntry.SERVER_EXECUTIVES.getStringList().contains(data.getName()) + || isAdminMasterBuilder(data) + || ConfigEntry.HOST_SENDER_NAMES.getStringList().contains(name.toLowerCase()); } - public boolean isTelnetMasterBuilder(PlayerData playerData) + public boolean isAdminMasterBuilder(PlayerData playerData) { - StaffMember staffMember = plugin.sl.getEntryByName(playerData.getName()); - if (staffMember != null && staffMember.getRank().isAtLeast(Rank.ADMIN) && playerData.isMasterBuilder()) - { - return true; - } - - return false; + Admin admin = plugin.al.getEntryByName(playerData.getName()); + return admin != null && admin.getRank().isAtLeast(Rank.ADMIN) && playerData.isMasterBuilder(); } // May not return null @@ -157,14 +147,14 @@ public class PlayerList extends FreedomService { PlayerData playerData = getData(player); return plugin.dc.enabled - && !plugin.sl.isStaff(player) - && (playerData.hasVerification()) + && !plugin.al.isAdmin(player) + && playerData.hasVerification() && !playerData.getIps().contains(FUtil.getIp(player)); } public boolean IsImpostor(Player player) { - return isPlayerImpostor(player) || plugin.sl.isStaffImpostor(player); + return isPlayerImpostor(player) || plugin.al.isAdminImpostor(player); } public void verify(Player player, String backupCode) @@ -178,40 +168,38 @@ public class PlayerList extends FreedomService playerData.addIp(FUtil.getIp(player)); save(playerData); - if (plugin.sl.isStaffImpostor(player)) + if (plugin.al.isAdminImpostor(player)) { - StaffMember staffMember = plugin.sl.getEntryByName(player.getName()); - staffMember.setLastLogin(new Date()); - staffMember.addIp(FUtil.getIp(player)); - plugin.sl.updateTables(); - plugin.sl.save(staffMember); + Admin admin = plugin.al.getEntryByName(player.getName()); + admin.setLastLogin(new Date()); + admin.addIp(FUtil.getIp(player)); + plugin.al.updateTables(); + plugin.al.save(admin); } - plugin.rm.updateDisplay(player); } - public void syncIps(StaffMember staffMember) + public void syncIps(Admin admin) { - PlayerData playerData = getData(staffMember.getName()); + PlayerData playerData = getData(admin.getName()); playerData.clearIps(); - playerData.addIps(staffMember.getIps()); + playerData.addIps(admin.getIps()); plugin.pl.save(playerData); } public void syncIps(PlayerData playerData) { - StaffMember staffMember = plugin.sl.getEntryByName(playerData.getName()); + Admin admin = plugin.al.getEntryByName(playerData.getName()); - if (staffMember != null && staffMember.isActive()) + if (admin != null && admin.isActive()) { - staffMember.clearIPs(); - staffMember.addIps(playerData.getIps()); - plugin.sl.updateTables(); - plugin.sl.save(staffMember); + admin.clearIPs(); + admin.addIps(playerData.getIps()); + plugin.al.updateTables(); + plugin.al.save(admin); } } - public void save(PlayerData player) { try diff --git a/src/main/java/me/totalfreedom/totalfreedommod/rank/Rank.java b/src/main/java/me/totalfreedom/totalfreedommod/rank/Rank.java index ce6f4169..06c9cbaa 100644 --- a/src/main/java/me/totalfreedom/totalfreedommod/rank/Rank.java +++ b/src/main/java/me/totalfreedom/totalfreedommod/rank/Rank.java @@ -8,10 +8,10 @@ public enum Rank implements Displayable IMPOSTOR("an", "Impostor", Type.PLAYER, "Imp", ChatColor.YELLOW, null, false, false), NON_OP("a", "Non-Op", Type.PLAYER, "", ChatColor.WHITE, null, false, false), OP("an", "Operator", Type.PLAYER, "OP", ChatColor.GREEN, null, false, false), - ADMIN("an", "Admin", Type.STAFF, "Admin", ChatColor.DARK_GREEN, org.bukkit.ChatColor.DARK_GREEN, true, true), - SENIOR_ADMIN("a", "Senior Admin", Type.STAFF, "SrA", ChatColor.GOLD, org.bukkit.ChatColor.GOLD, true, true), - ADMIN_CONSOLE("the", "Console", Type.STAFF_CONSOLE, "Console", ChatColor.DARK_PURPLE, null, false, false), - SENIOR_CONSOLE("the", "Console", Type.STAFF_CONSOLE, "Console", ChatColor.DARK_PURPLE, null, false, false); + ADMIN("an", "Admin", Type.ADMIN, "Admin", ChatColor.DARK_GREEN, org.bukkit.ChatColor.DARK_GREEN, true, true), + SENIOR_ADMIN("a", "Senior Admin", Type.ADMIN, "SrA", ChatColor.GOLD, org.bukkit.ChatColor.GOLD, true, true), + ADMIN_CONSOLE("the", "Console", Type.ADMIN_CONSOLE, "Console", ChatColor.DARK_PURPLE, null, false, false), + SENIOR_CONSOLE("the", "Console", Type.ADMIN_CONSOLE, "Console", ChatColor.DARK_PURPLE, null, false, false); @Getter private final Type type; @Getter @@ -79,7 +79,7 @@ public enum Rank implements Displayable public boolean isConsole() { - return getType() == Type.STAFF_CONSOLE; + return getType() == Type.ADMIN_CONSOLE; } public int getLevel() @@ -102,9 +102,9 @@ public enum Rank implements Displayable return getConsoleVariant().getLevel() >= rank.getConsoleVariant().getLevel(); } - public boolean isStaff() + public boolean isAdmin() { - return getType() == Type.STAFF || getType() == Type.STAFF_CONSOLE; + return getType() == Type.ADMIN || getType() == Type.ADMIN_CONSOLE; } public boolean hasConsoleVariant() @@ -143,10 +143,10 @@ public enum Rank implements Displayable public enum Type { PLAYER, - STAFF, - STAFF_CONSOLE; + ADMIN, + ADMIN_CONSOLE; - public boolean isStaff() + public boolean isAdmin() { return this != PLAYER; } diff --git a/src/main/java/me/totalfreedom/totalfreedommod/rank/RankManager.java b/src/main/java/me/totalfreedom/totalfreedommod/rank/RankManager.java index 4da69ce2..187eb8a0 100644 --- a/src/main/java/me/totalfreedom/totalfreedommod/rank/RankManager.java +++ b/src/main/java/me/totalfreedom/totalfreedommod/rank/RankManager.java @@ -4,7 +4,7 @@ import me.totalfreedom.totalfreedommod.FreedomService; import me.totalfreedom.totalfreedommod.config.ConfigEntry; import me.totalfreedom.totalfreedommod.player.FPlayer; import me.totalfreedom.totalfreedommod.player.PlayerData; -import me.totalfreedom.totalfreedommod.staff.StaffMember; +import me.totalfreedom.totalfreedommod.admin.Admin; import me.totalfreedom.totalfreedommod.util.FUtil; import org.apache.commons.lang.StringUtils; import org.bukkit.ChatColor; @@ -39,7 +39,7 @@ public class RankManager extends FreedomService final Player player = (Player)sender; // Display impostors - if (plugin.sl.isStaffImpostor(player)) + if (plugin.al.isAdminImpostor(player)) { return Rank.IMPOSTOR; } @@ -56,18 +56,18 @@ public class RankManager extends FreedomService return Title.DEVELOPER; } - if (ConfigEntry.SERVER_EXECUTIVES.getList().contains(player.getName()) && plugin.sl.isStaff(player)) + if (ConfigEntry.SERVER_EXECUTIVES.getList().contains(player.getName()) && plugin.al.isAdmin(player)) { return Title.EXECUTIVE; } - if (plugin.sl.isVerifiedStaff(player)) + if (plugin.al.isVerifiedAdmin(player)) { - return Title.VERIFIED_STAFF; + return Title.VERIFIED_ADMIN; } - // Master builders show up if they are not staff - if (plugin.pl.getData(player).isMasterBuilder() && !plugin.sl.isStaff(player)) + // Master builders show up if they are not admins + if (plugin.pl.getData(player).isMasterBuilder() && !plugin.al.isAdmin(player)) { return Title.MASTER_BUILDER; } @@ -75,26 +75,26 @@ public class RankManager extends FreedomService return getRank(player); } - public Displayable getDisplay(StaffMember staffMember) + public Displayable getDisplay(Admin admin) { // If the player's an owner, display that - if (ConfigEntry.SERVER_OWNERS.getList().contains(staffMember.getName())) + if (ConfigEntry.SERVER_OWNERS.getList().contains(admin.getName())) { return Title.OWNER; } // Developers always show up - if (FUtil.isDeveloper((Player)staffMember)) + if (FUtil.isDeveloper((Player)admin)) { return Title.DEVELOPER; } - if (ConfigEntry.SERVER_EXECUTIVES.getList().contains(staffMember.getName())) + if (ConfigEntry.SERVER_EXECUTIVES.getList().contains(admin.getName())) { return Title.EXECUTIVE; } - return staffMember.getRank(); + return admin.getRank(); } public Rank getRank(CommandSender sender) @@ -107,19 +107,19 @@ public class RankManager extends FreedomService // CONSOLE? if (sender.getName().equals("CONSOLE")) { - return ConfigEntry.STAFFLIST_CONSOLE_IS_ADMIN.getBoolean() ? Rank.SENIOR_CONSOLE : Rank.ADMIN_CONSOLE; + return ConfigEntry.ADMINLIST_CONSOLE_IS_ADMIN.getBoolean() ? Rank.SENIOR_CONSOLE : Rank.ADMIN_CONSOLE; } // Console admin, get by name - StaffMember staffMember = plugin.sl.getEntryByName(sender.getName()); + Admin admin = plugin.al.getEntryByName(sender.getName()); // Unknown console: RCON? - if (staffMember == null) + if (admin == null) { return Rank.SENIOR_CONSOLE; } - Rank rank = staffMember.getRank(); + Rank rank = admin.getRank(); // Get console if (rank.hasConsoleVariant()) @@ -131,12 +131,12 @@ public class RankManager extends FreedomService public Rank getRank(Player player) { - if (plugin.sl.isStaffImpostor(player) || plugin.pl.isPlayerImpostor(player)) + if (plugin.al.isAdminImpostor(player) || plugin.pl.isPlayerImpostor(player)) { return Rank.IMPOSTOR; } - final StaffMember entry = plugin.sl.getAdmin(player); + final Admin entry = plugin.al.getAdmin(player); if (entry != null) { return entry.getRank(); @@ -168,7 +168,7 @@ public class RankManager extends FreedomService FPlayer fPlayer = plugin.pl.getPlayer(player); PlayerData data = plugin.pl.getData(player); Displayable display = getDisplay(player); - if (plugin.sl.isStaff(player) || data.isMasterBuilder() || FUtil.isDeveloper(player)) + if (plugin.al.isAdmin(player) || data.isMasterBuilder() || FUtil.isDeveloper(player)) { String displayName = display.getColor() + player.getName(); player.setPlayerListName(displayName); @@ -181,7 +181,6 @@ public class RankManager extends FreedomService fPlayer.setTag(getTag(player, display.getColoredTag())); updatePlayerTeam(player); plugin.pem.setPermissions(player); - plugin.rd.updateFlair(player); } @EventHandler(priority = EventPriority.MONITOR) @@ -191,36 +190,36 @@ public class RankManager extends FreedomService final FPlayer fPlayer = plugin.pl.getPlayer(player); PlayerData target = plugin.pl.getData(player); - // Unban staff - boolean isStaff = plugin.sl.isStaff(player); - if (isStaff) + // Unban admins + boolean isAdmin = plugin.al.isAdmin(player); + if (isAdmin) { // Verify strict IP match - if (!plugin.sl.isIdentityMatched(player)) + if (!plugin.al.isIdentityMatched(player)) { - FUtil.bcastMsg("Warning: " + player.getName() + " is a staff member, but is using an account not registered to one of their ip-list.", ChatColor.RED); + FUtil.bcastMsg("Warning: " + player.getName() + " is an admin, but is using an account not registered to one of their IP-list.", ChatColor.RED); fPlayer.setSuperadminIdVerified(false); } else { fPlayer.setSuperadminIdVerified(true); - plugin.sl.updateLastLogin(player); + plugin.al.updateLastLogin(player); } } - if (plugin.sl.isVerifiedStaff(player)) + if (plugin.al.isVerifiedAdmin(player)) { - FUtil.bcastMsg("Warning: " + player.getName() + " is a staff member, but does not have any staff permissions.", ChatColor.RED); + FUtil.bcastMsg("Warning: " + player.getName() + " is an admin, but does not have any admin permissions.", ChatColor.RED); } // Handle impostors - boolean isImpostor = plugin.sl.isStaffImpostor(player) || plugin.pl.isPlayerImpostor(player); + boolean isImpostor = plugin.al.isAdminImpostor(player) || plugin.pl.isPlayerImpostor(player); if (isImpostor) { FUtil.bcastMsg(ChatColor.AQUA + player.getName() + " is " + Rank.IMPOSTOR.getColoredLoginMessage()); - if (plugin.sl.isStaffImpostor(player)) + if (plugin.al.isAdminImpostor(player)) { - FUtil.bcastMsg("Warning: " + player.getName() + " has been flagged as a staff impostor and has been frozen!", ChatColor.RED); + FUtil.bcastMsg("Warning: " + player.getName() + " has been flagged as an admin impostor and has been frozen!", ChatColor.RED); } else if (plugin.pl.isPlayerImpostor(player)) { @@ -237,9 +236,9 @@ public class RankManager extends FreedomService } // Broadcast login message - if (isStaff || FUtil.isDeveloper(player) || plugin.pl.getData(player).isMasterBuilder() || plugin.pl.getData(player).hasLoginMessage()) + if (isAdmin || FUtil.isDeveloper(player) || plugin.pl.getData(player).isMasterBuilder() || plugin.pl.getData(player).hasLoginMessage()) { - if (!plugin.sl.isVanished(player.getName())) + if (!plugin.al.isVanished(player.getName())) { FUtil.bcastMsg(craftLoginMessage(player, null)); } diff --git a/src/main/java/me/totalfreedom/totalfreedommod/rank/Title.java b/src/main/java/me/totalfreedom/totalfreedommod/rank/Title.java index 0af577f3..dd110111 100644 --- a/src/main/java/me/totalfreedom/totalfreedommod/rank/Title.java +++ b/src/main/java/me/totalfreedom/totalfreedommod/rank/Title.java @@ -7,7 +7,7 @@ public enum Title implements Displayable { MASTER_BUILDER("a", "Master Builder", ChatColor.DARK_AQUA, org.bukkit.ChatColor.DARK_AQUA, "MB", true, true), - VERIFIED_STAFF("a", "Verified Staff Member", ChatColor.LIGHT_PURPLE, org.bukkit.ChatColor.LIGHT_PURPLE, "VS", false, true), + VERIFIED_ADMIN("a", "Verified Admin", ChatColor.LIGHT_PURPLE, org.bukkit.ChatColor.LIGHT_PURPLE, "VA", false, true), EXECUTIVE("an", "Executive", ChatColor.RED, org.bukkit.ChatColor.RED, "Exec", true, true), DEVELOPER("a", "Developer", ChatColor.DARK_PURPLE, org.bukkit.ChatColor.DARK_PURPLE, "Dev", true, true), OWNER("the", "Owner", ChatColor.of("#ff0000"), org.bukkit.ChatColor.DARK_RED, "Owner", true, true); diff --git a/src/main/java/me/totalfreedom/totalfreedommod/sql/SQLite.java b/src/main/java/me/totalfreedom/totalfreedommod/sql/SQLite.java index 71128d67..eb4660c7 100644 --- a/src/main/java/me/totalfreedom/totalfreedommod/sql/SQLite.java +++ b/src/main/java/me/totalfreedom/totalfreedommod/sql/SQLite.java @@ -10,7 +10,7 @@ import java.text.MessageFormat; import me.totalfreedom.totalfreedommod.FreedomService; import me.totalfreedom.totalfreedommod.banning.Ban; import me.totalfreedom.totalfreedommod.player.PlayerData; -import me.totalfreedom.totalfreedommod.staff.StaffMember; +import me.totalfreedom.totalfreedommod.admin.Admin; import me.totalfreedom.totalfreedommod.util.FLog; import me.totalfreedom.totalfreedommod.util.FUtil; @@ -78,22 +78,22 @@ public class SQLite extends FreedomService } } - if (!tableExists(meta, "staff")) + if (!tableExists(meta, "admins")) { try { - connection.createStatement().execute("CREATE TABLE `staff` (`username` VARCHAR NOT NULL, `ips` VARCHAR NOT NULL, `rank` VARCHAR NOT NULL, `active` BOOLEAN NOT NULL, `last_login` LONG NOT NULL, `command_spy` BOOLEAN NOT NULL, `potion_spy` BOOLEAN NOT NULL, `ac_format` VARCHAR, `ptero_id` VARCHAR);"); + connection.createStatement().execute("CREATE TABLE `admins` (`username` VARCHAR NOT NULL, `ips` VARCHAR NOT NULL, `rank` VARCHAR NOT NULL, `active` BOOLEAN NOT NULL, `last_login` LONG NOT NULL, `command_spy` BOOLEAN NOT NULL, `potion_spy` BOOLEAN NOT NULL, `ac_format` VARCHAR, `ptero_id` VARCHAR);"); } catch (SQLException e) { - FLog.severe("Failed to create the staff table: " + e.getMessage()); + FLog.severe("Failed to create the admin table: " + e.getMessage()); } } if (!tableExists(meta, "players")) { try { - connection.createStatement().execute("CREATE TABLE `players` (`username` VARCHAR NOT NULL, `ips` VARCHAR NOT NULL, `notes` VARCHAR, `tag` VARCHAR, `discord_id` VARCHAR, `backup_codes` VARCHAR, `donator` BOOLEAN NOT NULL, `master_builder` BOOLEAN NOT NULL,`verification` BOOLEAN NOT NULL, `ride_mode` VARCHAR NOT NULL, `coins` INT, `items` VARCHAR, `total_votes` INT NOT NULL, `display_discord` BOOLEAN NOT NULL, `reddit_username` VARCHAR, `login_message` VARCHAR);"); + connection.createStatement().execute("CREATE TABLE `players` (`username` VARCHAR NOT NULL, `ips` VARCHAR NOT NULL, `notes` VARCHAR, `tag` VARCHAR, `discord_id` VARCHAR, `backup_codes` VARCHAR, `donator` BOOLEAN NOT NULL, `master_builder` BOOLEAN NOT NULL,`verification` BOOLEAN NOT NULL, `ride_mode` VARCHAR NOT NULL, `coins` INT, `items` VARCHAR, `total_votes` INT NOT NULL, `display_discord` BOOLEAN NOT NULL, `login_message` VARCHAR);"); } catch (SQLException e) { @@ -124,24 +124,24 @@ public class SQLite extends FreedomService return connection.createStatement().executeQuery("SELECT * FROM bans"); } - public ResultSet getStaffList() throws SQLException + public ResultSet getAdminlist() throws SQLException { - return connection.createStatement().executeQuery("SELECT * FROM staff"); + return connection.createStatement().executeQuery("SELECT * FROM admins"); } - public void setStaffMemberValue(StaffMember staffMember, String key, Object value) + public void setAdminValue(Admin admin, String key, Object value) { try { - Object[] data = {key, staffMember.getName()}; - PreparedStatement statement = connection.prepareStatement(MessageFormat.format("UPDATE staff SET {0}=? WHERE username=''{1}''", data)); + Object[] data = {key, admin.getName()}; + PreparedStatement statement = connection.prepareStatement(MessageFormat.format("UPDATE admins SET {0}=? WHERE username=''{1}''", data)); statement = setUnknownType(statement, 1, value); statement.executeUpdate(); } catch (SQLException e) { - FLog.severe("Failed to update staff member value:"); + FLog.severe("Failed to update admin value:"); FLog.severe(e); } } @@ -162,18 +162,18 @@ public class SQLite extends FreedomService } } - public void updateStaffMemberName(String oldName, String newName) + public void updateAdminName(String oldName, String newName) { try { - PreparedStatement statement = connection.prepareStatement(MessageFormat.format("UPDATE staff SET username=? WHERE username=''{0}''", oldName)); + PreparedStatement statement = connection.prepareStatement(MessageFormat.format("UPDATE admins SET username=? WHERE username=''{0}''", oldName)); statement = setUnknownType(statement, 1, newName); statement.executeUpdate(); } catch (SQLException e) { - FLog.severe("Failed to update staff member name: " + e.getMessage()); + FLog.severe("Failed to update admin name: " + e.getMessage()); } } @@ -243,25 +243,25 @@ public class SQLite extends FreedomService return result; } - public void addStaffMember(StaffMember staffMember) + public void addAdmin(Admin admin) { try { - PreparedStatement statement = connection.prepareStatement("INSERT INTO staff VALUES (?, ?, ?, ?, ?, ?, ?, ?, ?, ?)"); - statement.setString(1, staffMember.getName()); - statement.setString(2, FUtil.listToString(staffMember.getIps())); - statement.setString(3, staffMember.getRank().toString()); - statement.setBoolean(4, staffMember.isActive()); - statement.setLong(5, staffMember.getLastLogin().getTime()); - statement.setBoolean(7, staffMember.getCommandSpy()); - statement.setBoolean(8, staffMember.getPotionSpy()); - statement.setString(9, staffMember.getAcFormat()); - statement.setString(10, staffMember.getPteroID()); + PreparedStatement statement = connection.prepareStatement("INSERT INTO admins VALUES (?, ?, ?, ?, ?, ?, ?, ?, ?, ?)"); + statement.setString(1, admin.getName()); + statement.setString(2, FUtil.listToString(admin.getIps())); + statement.setString(3, admin.getRank().toString()); + statement.setBoolean(4, admin.isActive()); + statement.setLong(5, admin.getLastLogin().getTime()); + statement.setBoolean(7, admin.getCommandSpy()); + statement.setBoolean(8, admin.getPotionSpy()); + statement.setString(9, admin.getAcFormat()); + statement.setString(10, admin.getPteroID()); statement.executeUpdate(); } catch (SQLException e) { - FLog.severe("Failed to add staff member:"); + FLog.severe("Failed to add admin:"); FLog.severe(e); } } @@ -270,7 +270,7 @@ public class SQLite extends FreedomService { try { - PreparedStatement statement = connection.prepareStatement("INSERT INTO players VALUES (?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?)"); + PreparedStatement statement = connection.prepareStatement("INSERT INTO players VALUES (?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?)"); statement.setString(1, player.getName()); statement.setString(2, FUtil.listToString(player.getIps())); statement.setString(3, FUtil.listToString(player.getNotes())); @@ -284,8 +284,7 @@ public class SQLite extends FreedomService statement.setString(12, FUtil.listToString(player.getItems())); statement.setInt(13, player.getTotalVotes()); statement.setBoolean(14, player.doesDisplayDiscord()); - statement.setString(15, player.getRedditUsername()); - statement.setString(16, player.getLoginMessage()); + statement.setString(15, player.getLoginMessage()); statement.executeUpdate(); } catch (SQLException e) @@ -295,11 +294,11 @@ public class SQLite extends FreedomService } } - public ResultSet getStaffMemberByName(String name) + public ResultSet getAdminByName(String name) { try { - ResultSet resultSet = connection.createStatement().executeQuery(MessageFormat.format("SELECT * FROM staff WHERE username=''{0}''", name)); + ResultSet resultSet = connection.createStatement().executeQuery(MessageFormat.format("SELECT * FROM admins WHERE username=''{0}''", name)); if (resultSet.next()) { return resultSet; @@ -307,7 +306,7 @@ public class SQLite extends FreedomService } catch (SQLException e) { - FLog.severe("Failed to get staff member by name:"); + FLog.severe("Failed to get admin by name:"); FLog.severe(e); } @@ -367,15 +366,15 @@ public class SQLite extends FreedomService return null; } - public void removeStaffMember(StaffMember staffMember) + public void removeAdmin(Admin admin) { try { - connection.createStatement().executeUpdate(MessageFormat.format("DELETE FROM staff where name=''{0}''", staffMember.getName())); + connection.createStatement().executeUpdate(MessageFormat.format("DELETE FROM admins where name=''{0}''", admin.getName())); } catch (SQLException e) { - FLog.severe("Failed to remove staff member:"); + FLog.severe("Failed to remove admin:"); FLog.severe(e); } } diff --git a/src/main/java/me/totalfreedom/totalfreedommod/staff/StaffList.java b/src/main/java/me/totalfreedom/totalfreedommod/staff/StaffList.java deleted file mode 100644 index 4cd76268..00000000 --- a/src/main/java/me/totalfreedom/totalfreedommod/staff/StaffList.java +++ /dev/null @@ -1,394 +0,0 @@ -package me.totalfreedom.totalfreedommod.staff; - -import com.google.common.collect.Maps; -import com.google.common.collect.Sets; -import java.sql.ResultSet; -import java.sql.SQLException; -import java.util.ArrayList; -import java.util.Date; -import java.util.List; -import java.util.Map; -import java.util.Set; -import java.util.concurrent.TimeUnit; -import lombok.Getter; -import me.totalfreedom.totalfreedommod.FreedomService; -import me.totalfreedom.totalfreedommod.config.ConfigEntry; -import me.totalfreedom.totalfreedommod.rank.Rank; -import me.totalfreedom.totalfreedommod.util.FLog; -import me.totalfreedom.totalfreedommod.util.FUtil; -import org.bukkit.Bukkit; -import org.bukkit.command.CommandSender; -import org.bukkit.entity.Player; - -public class StaffList extends FreedomService -{ - @Getter - private final Set allStaffMembers = Sets.newHashSet(); // Includes disabled staff - // Only active staff below - @Getter - private final Set activeStaffMembers = Sets.newHashSet(); - private final Map nameTable = Maps.newHashMap(); - private final Map ipTable = Maps.newHashMap(); - public final List verifiedNoStaff = new ArrayList<>(); - public final Map> verifiedNoStaffIps = Maps.newHashMap(); - public static final List vanished = new ArrayList<>(); - - @Override - public void onStart() - { - load(); - deactivateOldEntries(false); - } - - @Override - public void onStop() - { - } - - public void load() - { - allStaffMembers.clear(); - try - { - ResultSet adminSet = plugin.sql.getStaffList(); - { - while (adminSet.next()) - { - StaffMember staffMember = new StaffMember(adminSet); - allStaffMembers.add(staffMember); - } - } - } - catch (SQLException e) - { - FLog.severe("Failed to load staff list: " + e.getMessage()); - } - - updateTables(); - FLog.info("Loaded " + allStaffMembers.size() + " staff members (" + nameTable.size() + " active, " + ipTable.size() + " IPs)"); - } - - public void messageAllStaff(String message) - { - for (Player player : server.getOnlinePlayers()) - { - if (isStaff(player)) - { - player.sendMessage(message); - } - } - } - - public void potionSpyMessage(String message) - { - for (Player player : server.getOnlinePlayers()) - { - StaffMember staffMember = getAdmin(player.getPlayer()); - if (isStaff(player) && staffMember.getPotionSpy()) - { - player.sendMessage(message); - } - } - } - - public synchronized boolean isStaffSync(CommandSender sender) - { - return isStaff(sender); - } - - public List getActiveStaffNames() - { - List names = new ArrayList(); - for (StaffMember staffMember : activeStaffMembers) - { - names.add(staffMember.getName()); - } - return names; - } - - public boolean isStaff(CommandSender sender) - { - if (!(sender instanceof Player)) - { - return true; - } - - StaffMember staffMember = getAdmin((Player)sender); - - return staffMember != null && staffMember.isActive(); - } - - public boolean isStaff(Player player) - { - if (player == null) - { - return true; - } - - StaffMember staffMember = getAdmin(player); - - return staffMember != null && staffMember.isActive(); - } - - public boolean isMod(CommandSender sender) - { - StaffMember staffMember = getAdmin(sender); - if (staffMember == null) - { - return false; - } - - return staffMember.getRank().ordinal() >= Rank.ADMIN.ordinal(); - } - - public boolean isAdmin(CommandSender sender) - { - StaffMember staffMember = getAdmin(sender); - if (staffMember == null) - { - return false; - } - - return staffMember.getRank().ordinal() >= Rank.SENIOR_ADMIN.ordinal(); - } - - public StaffMember getAdmin(CommandSender sender) - { - if (sender instanceof Player) - { - return getAdmin((Player)sender); - } - - return getEntryByName(sender.getName()); - } - - public StaffMember getAdmin(Player player) - { - // Find admin - String ip = FUtil.getIp(player); - StaffMember staffMember = getEntryByName(player.getName()); - - // Admin by name - if (staffMember != null) - { - // Check if we're in online mode, - // Or the players IP is in the admin entry - if (Bukkit.getOnlineMode() || staffMember.getIps().contains(ip)) - { - if (!staffMember.getIps().contains(ip)) - { - // Add the new IP if we have to - staffMember.addIp(ip); - save(staffMember); - updateTables(); - } - return staffMember; - } - } - - // Admin by ip - staffMember = getEntryByIp(ip); - if (staffMember != null) - { - // Set the new username - String oldName = staffMember.getName(); - staffMember.setName(player.getName()); - plugin.sql.updateStaffMemberName(oldName, staffMember.getName()); - updateTables(); - } - - return null; - } - - public StaffMember getEntryByName(String name) - { - return nameTable.get(name.toLowerCase()); - } - - public StaffMember getEntryByIp(String ip) - { - return ipTable.get(ip); - } - - public StaffMember getEntryByIpFuzzy(String needleIp) - { - final StaffMember directStaffMember = getEntryByIp(needleIp); - if (directStaffMember != null) - { - return directStaffMember; - } - - for (String ip : ipTable.keySet()) - { - if (FUtil.fuzzyIpMatch(needleIp, ip, 3)) - { - return ipTable.get(ip); - } - } - - return null; - } - - public void updateLastLogin(Player player) - { - final StaffMember staffMember = getAdmin(player); - if (staffMember == null) - { - return; - } - - staffMember.setLastLogin(new Date()); - staffMember.setName(player.getName()); - save(staffMember); - } - - public boolean isStaffImpostor(Player player) - { - return getEntryByName(player.getName()) != null && !isStaff(player) && !isVerifiedStaff(player); - } - - public boolean isVerifiedStaff(Player player) - { - return verifiedNoStaff.contains(player.getName()) && verifiedNoStaffIps.get(player.getName()).contains(FUtil.getIp(player)); - } - - public boolean isIdentityMatched(Player player) - { - if (Bukkit.getOnlineMode()) - { - return true; - } - - StaffMember staffMember = getAdmin(player); - return staffMember == null ? false : staffMember.getName().equalsIgnoreCase(player.getName()); - } - - public boolean addAdmin(StaffMember staffMember) - { - if (!staffMember.isValid()) - { - logger.warning("Could not add staff: " + staffMember.getName() + " Staff is missing details!"); - return false; - } - - // Store admin, update views - allStaffMembers.add(staffMember); - updateTables(); - - // Save admin - plugin.sql.addStaffMember(staffMember); - - return true; - } - - public boolean removeAdmin(StaffMember staffMember) - { - if (staffMember.getRank().isAtLeast(Rank.ADMIN)) - { - if (plugin.btb != null) - { - plugin.btb.killTelnetSessions(staffMember.getName()); - } - } - - // Remove staff, update views - if (!allStaffMembers.remove(staffMember)) - { - return false; - } - updateTables(); - - // Unsave staff - plugin.sql.removeStaffMember(staffMember); - - return true; - } - - public void updateTables() - { - activeStaffMembers.clear(); - nameTable.clear(); - ipTable.clear(); - - for (StaffMember staffMember : allStaffMembers) - { - if (!staffMember.isActive()) - { - continue; - } - - activeStaffMembers.add(staffMember); - nameTable.put(staffMember.getName().toLowerCase(), staffMember); - - for (String ip : staffMember.getIps()) - { - ipTable.put(ip, staffMember); - } - - } - } - - public Set getAdminNames() - { - return nameTable.keySet(); - } - - public Set getAdminIps() - { - return ipTable.keySet(); - } - - public void save(StaffMember staffMember) - { - try - { - ResultSet currentSave = plugin.sql.getStaffMemberByName(staffMember.getName()); - for (Map.Entry entry : staffMember.toSQLStorable().entrySet()) - { - Object storedValue = plugin.sql.getValue(currentSave, entry.getKey(), entry.getValue()); - if (storedValue != null && !storedValue.equals(entry.getValue()) || storedValue == null && entry.getValue() != null || entry.getValue() == null) - { - plugin.sql.setStaffMemberValue(staffMember, entry.getKey(), entry.getValue()); - } - } - } - catch (SQLException e) - { - FLog.severe("Failed to save staff: " + e.getMessage()); - } - } - - public void deactivateOldEntries(boolean verbose) - { - for (StaffMember staffMember : allStaffMembers) - { - if (!staffMember.isActive() || staffMember.getRank().isAtLeast(Rank.SENIOR_ADMIN)) - { - continue; - } - - final Date lastLogin = staffMember.getLastLogin(); - final long lastLoginHours = TimeUnit.HOURS.convert(new Date().getTime() - lastLogin.getTime(), TimeUnit.MILLISECONDS); - - if (lastLoginHours < ConfigEntry.STAFFLIST_CLEAN_THESHOLD_HOURS.getInteger()) - { - continue; - } - - if (verbose) - { - FUtil.staffAction("TotalFreedomMod", "Deactivating staff member " + staffMember.getName() + ", inactive for " + lastLoginHours + " hours", true); - } - - staffMember.setActive(false); - save(staffMember); - } - - updateTables(); - } - - public boolean isVanished(String player) - { - return vanished.contains(player); - } -} \ No newline at end of file diff --git a/src/main/java/me/totalfreedom/totalfreedommod/util/FSync.java b/src/main/java/me/totalfreedom/totalfreedommod/util/FSync.java index 52ffd1be..7a4b9e3a 100644 --- a/src/main/java/me/totalfreedom/totalfreedommod/util/FSync.java +++ b/src/main/java/me/totalfreedom/totalfreedommod/util/FSync.java @@ -54,7 +54,7 @@ public class FSync }.runTask(plugin); } - public static void staffChatMessage(final CommandSender sender, final String message) + public static void adminChatMessage(final CommandSender sender, final String message) { final TotalFreedomMod plugin = TotalFreedomMod.plugin(); new BukkitRunnable() @@ -63,7 +63,7 @@ public class FSync @Override public void run() { - plugin.cm.staffChat(sender, message); + plugin.cm.adminChat(sender, message); } }.runTask(plugin); diff --git a/src/main/java/me/totalfreedom/totalfreedommod/util/FUtil.java b/src/main/java/me/totalfreedom/totalfreedommod/util/FUtil.java index 931ee0fb..96dd2b23 100644 --- a/src/main/java/me/totalfreedom/totalfreedommod/util/FUtil.java +++ b/src/main/java/me/totalfreedom/totalfreedommod/util/FUtil.java @@ -160,7 +160,7 @@ public class FUtil List names = new ArrayList<>(); for (Player player : Bukkit.getOnlinePlayers()) { - if (!TotalFreedomMod.plugin().sl.isVanished(player.getName())) + if (!TotalFreedomMod.plugin().al.isVanished(player.getName())) { names.add(player.getName()); } @@ -342,9 +342,9 @@ public class FUtil player.setFlying(flying); } - public static void staffAction(String staffMemberName, String action, boolean isRed) + public static void adminAction(String adminName, String action, boolean isRed) { - FUtil.bcastMsg(staffMemberName + " - " + action, (isRed ? ChatColor.RED : ChatColor.AQUA)); + FUtil.bcastMsg(adminName + " - " + action, (isRed ? ChatColor.RED : ChatColor.AQUA)); } public static String formatLocation(Location location) diff --git a/src/main/java/me/totalfreedom/totalfreedommod/world/StaffWorld.java b/src/main/java/me/totalfreedom/totalfreedommod/world/AdminWorld.java similarity index 95% rename from src/main/java/me/totalfreedom/totalfreedommod/world/StaffWorld.java rename to src/main/java/me/totalfreedom/totalfreedommod/world/AdminWorld.java index fe47d754..d41238f4 100644 --- a/src/main/java/me/totalfreedom/totalfreedommod/world/StaffWorld.java +++ b/src/main/java/me/totalfreedom/totalfreedommod/world/AdminWorld.java @@ -15,9 +15,8 @@ import org.bukkit.block.BlockFace; import org.bukkit.entity.Player; import org.bukkit.event.player.PlayerMoveEvent; -public final class StaffWorld extends CustomWorld +public final class AdminWorld extends CustomWorld { - private static final long CACHE_CLEAR_FREQUENCY = 30L * 1000L; //30 seconds, milliseconds private static final long TP_COOLDOWN_TIME = 500L; //0.5 seconds, milliseconds private static final String GENERATION_PARAMETERS = ConfigEntry.FLATLANDS_GENERATE_PARAMS.getString(); @@ -27,9 +26,9 @@ public final class StaffWorld extends CustomWorld private WorldWeather weather = WorldWeather.OFF; private WorldTime time = WorldTime.INHERIT; - public StaffWorld() + public AdminWorld() { - super("staffworld"); + super("adminworld"); } @Override @@ -59,7 +58,7 @@ public final class StaffWorld extends CustomWorld org.bukkit.material.Sign signData = (org.bukkit.material.Sign)welcomeSign.getData(); signData.setFacingDirection(BlockFace.NORTH); - welcomeSign.setLine(0, ChatColor.GREEN + "StaffWorld"); + welcomeSign.setLine(0, ChatColor.GREEN + "AdminWorld"); welcomeSign.setLine(1, ChatColor.DARK_GRAY + "---"); welcomeSign.setLine(2, ChatColor.YELLOW + "Spawn Point"); welcomeSign.setLine(3, ChatColor.DARK_GRAY + "---"); @@ -94,7 +93,7 @@ public final class StaffWorld extends CustomWorld if (lastTP == null || lastTP + TP_COOLDOWN_TIME <= currentTimeMillis) { teleportCooldown.put(player, currentTimeMillis); - FLog.info(player.getName() + " attempted to access the StaffWorld."); + FLog.info(player.getName() + " attempted to access the AdminWorld."); event.setTo(Bukkit.getWorlds().get(0).getSpawnLocation()); } return false; diff --git a/src/main/java/me/totalfreedom/totalfreedommod/world/WorldManager.java b/src/main/java/me/totalfreedom/totalfreedommod/world/WorldManager.java index 5f7b3856..ab0282fb 100644 --- a/src/main/java/me/totalfreedom/totalfreedommod/world/WorldManager.java +++ b/src/main/java/me/totalfreedom/totalfreedommod/world/WorldManager.java @@ -18,14 +18,14 @@ public class WorldManager extends FreedomService { public Flatlands flatlands; - public StaffWorld staffworld; + public AdminWorld adminworld; public MasterBuilderWorld masterBuilderWorld; public HubWorld hubworld; public WorldManager() { this.flatlands = new Flatlands(); - this.staffworld = new StaffWorld(); + this.adminworld = new AdminWorld(); this.masterBuilderWorld = new MasterBuilderWorld(); this.hubworld = new HubWorld(); } @@ -34,7 +34,7 @@ public class WorldManager extends FreedomService public void onStart() { flatlands.getWorld(); - staffworld.getWorld(); + adminworld.getWorld(); masterBuilderWorld.getWorld(); hubworld.getWorld(); @@ -55,7 +55,7 @@ public class WorldManager extends FreedomService public void onStop() { flatlands.getWorld().save(); - staffworld.getWorld().save(); + adminworld.getWorld().save(); masterBuilderWorld.getWorld().save(); hubworld.getWorld().save(); } @@ -65,7 +65,7 @@ public class WorldManager extends FreedomService { try { - if (event.getWorld().equals(staffworld.getWorld()) && staffworld.getWeatherMode() != WorldWeather.OFF) + if (event.getWorld().equals(adminworld.getWorld()) && adminworld.getWeatherMode() != WorldWeather.OFF) { return; } @@ -93,7 +93,7 @@ public class WorldManager extends FreedomService { try { - if (event.getWorld().equals(staffworld.getWorld()) && staffworld.getWeatherMode() != WorldWeather.OFF) + if (event.getWorld().equals(adminworld.getWorld()) && adminworld.getWeatherMode() != WorldWeather.OFF) { return; } diff --git a/src/main/java/me/totalfreedom/totalfreedommod/world/WorldRestrictions.java b/src/main/java/me/totalfreedom/totalfreedommod/world/WorldRestrictions.java index ff3d35bb..e8c4ebec 100644 --- a/src/main/java/me/totalfreedom/totalfreedommod/world/WorldRestrictions.java +++ b/src/main/java/me/totalfreedom/totalfreedommod/world/WorldRestrictions.java @@ -61,7 +61,7 @@ public class WorldRestrictions extends FreedomService } } - return !plugin.sl.isStaff(player) && player.getWorld().equals(plugin.wm.staffworld.getWorld()); + return !plugin.al.isAdmin(player) && player.getWorld().equals(plugin.wm.adminworld.getWorld()); } @EventHandler(priority = EventPriority.NORMAL) @@ -132,7 +132,7 @@ public class WorldRestrictions extends FreedomService { /* This is a very poor way of blocking WorldEdit commands, all the methods I know of for obtaining a list of a plugin's commands are returning null for world edit. */ - String allowed = player.getWorld().equals(plugin.wm.staffworld.getWorld()) ? "Staff" : "Master Builders"; + String allowed = player.getWorld().equals(plugin.wm.adminworld.getWorld()) ? "Admin" : "Master Builders"; if (command.startsWith("/") || BLOCKED_WORLDEDIT_COMMANDS.contains(command)) { diff --git a/src/main/resources/config.yml b/src/main/resources/config.yml index 9d68be28..a0bbea90 100644 --- a/src/main/resources/config.yml +++ b/src/main/resources/config.yml @@ -19,7 +19,7 @@ server: # MOTD Modification motds: ban: '&cYou are banned.' - staffmode: '&cServer is closed.' + adminmode: '&cServer is closed.' lockdown: '&cServer is in lock-down.' whitelist: '&cWhitelist enabled.' full: '&cServer is full.' @@ -78,31 +78,6 @@ discord: # Owner role ID server_owner_role_id: '' -# Reddit -reddit: - # Name of your subreddit (the r/NAME, excluding r/) - subreddit_name: 'TotalFreedom' - # Username of the bot account - username: '' - # Bot account password - password: '' - # Developer app id (Make one at https://www.reddit.com/prefs/apps (make sure the type is script)) - client_id: '' - # Developer app secret - client_secret: '' - # Master Builder flair ID - master_builder_flair_id: '' - # Admin flair ID - admin_flair_id: '' - # Senior Admin flair ID - senior_admin_flair_id: '' - # Developer flair ID - developer_flair_id: '' - # Executive Admin flair ID - executive_flair_id: '' - # Owner flair ID - server_owner_flair_id: '' - # Pterodactyl ptero: # URL - do not leave a trailing forward slash @@ -132,7 +107,6 @@ shop: # Chat reactions reactions: - # Enable chat reactions? enabled: true @@ -177,10 +151,9 @@ shop: clown_fish: 1500 login_messages: 5000 -# Staff list -stafflist: - - # The amount of hours after which staff may be removed from the admin list +# Admin list +adminlist: + # The amount of hours after which admins may be removed from the admin list clean_threshold_hours: 167 # Give the default CONSOLE admin privileges. @@ -250,9 +223,8 @@ allow: # * The first section is a letter which indicates which rank may use this command # Valid ranks: # n - Nobody (Completely disabled) -# c - Trial Mods (Console) -# m - Admins (Console) -# s - Staff (Any in-game admin) +# a - Admins (Console) +# s - Senior Admins (Console) # o - Ops (Non-Ops won't be able to use it) # # * The second section is a letter which indicates what to do when a player executes that command. @@ -264,8 +236,8 @@ allow: # * The third section is the command to be blocked, prefixed with a slash # # * The fourth section is the message to send to the player when executing that command. -# This should be ommited if unwanted. ChatColors are supported with the &-key. By default -# -the starting ChatColor is set to gray. You can use the default 'That command is blocked.' message +# This should be omitted if unwanted. ChatColors are supported with the &-key. By default +# the starting ChatColor is set to gray. You can use the default 'That command is blocked.' message # by using a single underscore. # # Examples: @@ -299,46 +271,46 @@ blocked_commands: - 'n:b:/bossbar:_' - 'n:b://forceload:_' - # Staff commands - - 's:b:/save-all:_' - - 's:b:/kick:_' - - 's:b:/socialspy:_' - - 's:b:/replaceitem:_' - - 's:b:/kill:_' - - 's:b://generate:_' - - 's:b://:_' - - 's:b:/superpickaxe:_' - - 's:b:/brush:_' - - 's:b:/size:_' - - 's:b://mask:_' - - 's:b:/mat:_' - - 's:b://butcher:_' - - 's:b:/scoreboard:_' - - 's:b:/setspawn:_' - - 's:b://snow:_' - - 's:b:/tellraw:_' - - 's:b:/forestgen:_' - - 's:b:/setidletimeout:_' - - 's:b:/mail sendall:_' - - 's:b:/eco reset:_' - - 's:b:/mask:_' - - 's:b:/gmask:_' - - 's:b:/lrbuild:_' - - 's:b:/defaultgamemode:_' - - 's:b:/reload:_' - - 's:b:/title:_' - - 's:b:/worldborder:_' - - 's:b:/weather:_' - - 's:b:/tpall:_' - - 's:b:/setblock:_' - - 's:b:/green:_' - - 's:b:/gamerule:_' - - 's:b:/togglejail:_' - - 's:b:/fill:_' - - 's:b:/flood:_' - - 's:b:/team:_' - - 's:b:/loot:_' - - 's:b:/schedule:_' + # Admin commands + - 'a:b:/save-all:_' + - 'a:b:/kick:_' + - 'a:b:/socialspy:_' + - 'a:b:/replaceitem:_' + - 'a:b:/kill:_' + - 'a:b://generate:_' + - 'a:b://:_' + - 'a:b:/superpickaxe:_' + - 'a:b:/brush:_' + - 'a:b:/size:_' + - 'a:b://mask:_' + - 'a:b:/mat:_' + - 'a:b://butcher:_' + - 'a:b:/scoreboard:_' + - 'a:b:/setspawn:_' + - 'a:b://snow:_' + - 'a:b:/tellraw:_' + - 'a:b:/forestgen:_' + - 'a:b:/setidletimeout:_' + - 'a:b:/mail sendall:_' + - 'a:b:/eco reset:_' + - 'a:b:/mask:_' + - 'a:b:/gmask:_' + - 'a:b:/lrbuild:_' + - 'a:b:/defaultgamemode:_' + - 'a:b:/reload:_' + - 'a:b:/title:_' + - 'a:b:/worldborder:_' + - 'a:b:/weather:_' + - 'a:b:/tpall:_' + - 'a:b:/setblock:_' + - 'a:b:/green:_' + - 'a:b:/gamerule:_' + - 'a:b:/togglejail:_' + - 'a:b:/fill:_' + - 'a:b:/flood:_' + - 'a:b:/team:_' + - 'a:b:/loot:_' + - 'a:b:/schedule:_' # Automatically wipe dropped objects auto_wipe: true @@ -361,13 +333,6 @@ disable: night: true weather: true - -# Enable misc. features -landmines_enabled: false -mp44_enabled: false -tossmob_enabled: false -4chan_enabled: false - # Moblimiter moblimiter: enabled: true @@ -386,7 +351,7 @@ flatlands: generate_params: 16,stone,32,dirt,1,grass_block # Admin-Only Mode -staff_only_mode: false +admin_only_mode: false # Toggle Chat toggle_chat: true @@ -429,10 +394,10 @@ announcer: - 'Racism, nazism, and sexism are strictly forbidden!' - 'Join our Discord server! Link: https://discordapp.com/invite/XXjmAmV/' -# What to display in the staffinfo command. -staffinfo: - - '&bHow to apply for staff on the TotalFreedom Server:' - - ' &6- Do not ask for staff in game' +# What to display in the admin info command. +admininfo: + - '&bHow to apply for admin on the TotalFreedom Server:' + - ' &6- Do not ask for admin in game' - ' &2- Be helpful within the server' - ' &6- Report those breaking the rules' - ' &2- And apply on our forums at the link:' diff --git a/src/main/resources/permissions.yml b/src/main/resources/permissions.yml index 2f7876f4..3aac49c1 100644 --- a/src/main/resources/permissions.yml +++ b/src/main/resources/permissions.yml @@ -1,10 +1,10 @@ # -# TotalFreedomMod 5.5 Permissions +# TotalFreedomMod 6.0 Permissions # by ZeroEpoch1969 # # Note that every group inherits the previous groups' permissions -# Meaning Telnet Admins have the permissions of Operators and Super Admins, and etc +# Meaning Senior Admins have the permissions of Operators and Admins, and etc # This is used to remove all permission begging with the root node # This is useful when a plugin gives all permissions to a player because they are opped