diff --git a/pom.xml b/pom.xml
index 5e46f919..e9e37870 100644
--- a/pom.xml
+++ b/pom.xml
@@ -195,21 +195,21 @@
net.ess3
EssentialsX
- 2.18.1
+ 2.18.2
provided
net.dv8tion
JDA
- 4.2.0_168
+ 4.2.0_222
provided
net.coreprotect
coreprotect
- 19.1
+ 19.3
provided
diff --git a/src/main/java/me/totalfreedom/totalfreedommod/AntiSpam.java b/src/main/java/me/totalfreedom/totalfreedommod/AntiSpam.java
index af015222..f6eb2404 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;
}
@@ -132,5 +132,4 @@ public class AntiSpam extends FreedomService
markedForDeath.remove(event.getPlayer());
}
}
-
-}
+}
\ No newline at end of file
diff --git a/src/main/java/me/totalfreedom/totalfreedommod/ChatManager.java b/src/main/java/me/totalfreedom/totalfreedommod/ChatManager.java
index b391278a..a0668f6f 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,10 +87,10 @@ 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;
}
@@ -123,7 +123,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)
@@ -136,7 +136,7 @@ public class ChatManager extends FreedomService
event.setFormat(format);
// Send to discord
- if (!ConfigEntry.STAFF_ONLY_MODE.getBoolean() && !Bukkit.hasWhitelist() && !plugin.pl.getPlayer(player).isMuted() && !plugin.tfg.inGuildChat(player))
+ 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));
}
@@ -154,27 +154,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 +184,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..e4f6dce3 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.isAdmin(player))
{
continue;
}
@@ -36,5 +36,4 @@ public class CommandSpy extends FreedomService
}
}
}
-
-}
+}
\ No newline at end of file
diff --git a/src/main/java/me/totalfreedom/totalfreedommod/GameRuleHandler.java b/src/main/java/me/totalfreedom/totalfreedommod/GameRuleHandler.java
index 16c39abb..b8a72d2d 100644
--- a/src/main/java/me/totalfreedom/totalfreedommod/GameRuleHandler.java
+++ b/src/main/java/me/totalfreedom/totalfreedommod/GameRuleHandler.java
@@ -95,7 +95,7 @@ public class GameRuleHandler extends FreedomService
private final String gameRuleName;
private final boolean defaultValue;
- private GameRule(String gameRuleName, boolean defaultValue)
+ GameRule(String gameRuleName, boolean defaultValue)
{
this.gameRuleName = gameRuleName;
this.defaultValue = defaultValue;
@@ -111,4 +111,4 @@ public class GameRuleHandler extends FreedomService
return defaultValue;
}
}
-}
+}
\ No newline at end of file
diff --git a/src/main/java/me/totalfreedom/totalfreedommod/LoginProcess.java b/src/main/java/me/totalfreedom/totalfreedommod/LoginProcess.java
index 9faeecca..5624d998 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,8 @@ public class LoginProcess extends FreedomService
}
}
- // Check if player is staff
- final boolean isStaff = plugin.sl.getEntryByIp(ip) != null;
-
// Validation below this point
- if (isStaff) // Player is staff
+ if (plugin.al.getEntryByIp(ip) != null) // Check if player is admin
{
// Force-allow log in
event.allow();
@@ -127,9 +124,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 +146,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 +154,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 +223,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 +234,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,9 +254,9 @@ 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)
diff --git a/src/main/java/me/totalfreedom/totalfreedommod/Monitors.java b/src/main/java/me/totalfreedom/totalfreedommod/Monitors.java
index 1a0a52c5..9b771d7d 100644
--- a/src/main/java/me/totalfreedom/totalfreedommod/Monitors.java
+++ b/src/main/java/me/totalfreedom/totalfreedommod/Monitors.java
@@ -46,9 +46,9 @@ 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") : "")));
+ latestThrownPotion.getWorld().getName(), trollPotions > 0 ? String.format(" &c(most likely troll %s)", trollPotions == 1 ? "potion" : "potions") : "")));
}
recentlyThrownPotions.clear();
}, 0L, 40L);
@@ -141,4 +141,4 @@ public class Monitors extends FreedomService
return badEffectsDetected > 0;
}
-}
+}
\ No newline at end of file
diff --git a/src/main/java/me/totalfreedom/totalfreedommod/MovementValidator.java b/src/main/java/me/totalfreedom/totalfreedommod/MovementValidator.java
index 9fcb6288..12a11d35 100644
--- a/src/main/java/me/totalfreedom/totalfreedommod/MovementValidator.java
+++ b/src/main/java/me/totalfreedom/totalfreedommod/MovementValidator.java
@@ -182,6 +182,4 @@ public class MovementValidator extends FreedomService
}
return stack.getTag().getList("AttributeModifiers", 10);
}
-}
-
-
+}
\ No newline at end of file
diff --git a/src/main/java/me/totalfreedom/totalfreedommod/Muter.java b/src/main/java/me/totalfreedom/totalfreedommod/Muter.java
index 203d3e77..c0416e16 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;
@@ -113,6 +113,4 @@ public class Muter extends FreedomService
playerdata.setMuted(true);
}
}
-
-
-}
+}
\ No newline at end of file
diff --git a/src/main/java/me/totalfreedom/totalfreedommod/Pterodactyl.java b/src/main/java/me/totalfreedom/totalfreedommod/Pterodactyl.java
index c425c8df..c5120a6a 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,23 +34,23 @@ 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);
return;
}
- FLog.debug("Enabling aptero acc");
+ FLog.debug("Enabling ptero acc");
addAccountToServer(id);
}
@@ -175,4 +175,4 @@ public class Pterodactyl extends FreedomService
FLog.severe(e);
}
}
-}
+}
\ No newline at end of file
diff --git a/src/main/java/me/totalfreedom/totalfreedommod/Reddit.java b/src/main/java/me/totalfreedom/totalfreedommod/Reddit.java
index d9c02663..630e6ff7 100644
--- a/src/main/java/me/totalfreedom/totalfreedommod/Reddit.java
+++ b/src/main/java/me/totalfreedom/totalfreedommod/Reddit.java
@@ -44,7 +44,7 @@ public class Reddit extends FreedomService
private Map flairNameList = new HashMap<>();
- private List noFlairDisplays = Arrays.asList(Title.VERIFIED_STAFF, Rank.IMPOSTOR, Rank.NON_OP, Rank.OP);
+ private List noFlairDisplays = Arrays.asList(Title.VERIFIED_ADMIN, Rank.IMPOSTOR, Rank.NON_OP, Rank.OP);
public boolean enabled = false;
diff --git a/src/main/java/me/totalfreedom/totalfreedommod/ServerPing.java b/src/main/java/me/totalfreedom/totalfreedommod/ServerPing.java
index e87f8005..57148a53 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;
}
@@ -73,5 +73,4 @@ public class ServerPing extends FreedomService
event.setMotd(motd.toString().trim());
}
-
-}
+}
\ No newline at end of file
diff --git a/src/main/java/me/totalfreedom/totalfreedommod/TotalFreedomMod.java b/src/main/java/me/totalfreedom/totalfreedommod/TotalFreedomMod.java
index ca55fe18..ce98db67 100644
--- a/src/main/java/me/totalfreedom/totalfreedommod/TotalFreedomMod.java
+++ b/src/main/java/me/totalfreedom/totalfreedommod/TotalFreedomMod.java
@@ -41,8 +41,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;
@@ -84,7 +84,7 @@ public class TotalFreedomMod extends JavaPlugin
public SavedFlags sf;
public WorldManager wm;
public LogViewer lv;
- public StaffList sl;
+ public AdminList al;
public ActivityLog acl;
public RankManager rm;
public CommandBlocker cb;
@@ -202,7 +202,7 @@ public class TotalFreedomMod extends JavaPlugin
wm = new WorldManager();
lv = new LogViewer();
sql = new SQLite();
- sl = new StaffList();
+ al = new AdminList();
acl = new ActivityLog();
rm = new RankManager();
cb = new CommandBlocker();
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 94%
rename from src/main/java/me/totalfreedom/totalfreedommod/staff/ActivityLog.java
rename to src/main/java/me/totalfreedom/totalfreedommod/admin/ActivityLog.java
index 565d4051..02dd3023 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;
@@ -111,10 +111,10 @@ public class ActivityLog extends FreedomService
activityLog = getEntryByIp(ip);
if (activityLog != null)
{
- // Set the new username
- activityLog.setName(player.getName());
- save();
- updateTables();
+ // Set the new username
+ activityLog.setName(player.getName());
+ save();
+ updateTables();
}
else
{
@@ -167,7 +167,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,11 +179,11 @@ 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();
plugin.acl.updateTables();
}
}
-}
+}
\ No newline at end of file
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 93%
rename from src/main/java/me/totalfreedom/totalfreedommod/staff/StaffMember.java
rename to src/main/java/me/totalfreedom/totalfreedommod/admin/Admin.java
index 934552f5..151f4d5d 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;
@@ -17,7 +17,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 +45,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 +68,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 +77,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")
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..18452402
--- /dev/null
+++ b/src/main/java/me/totalfreedom/totalfreedommod/admin/AdminList.java
@@ -0,0 +1,383 @@
+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() + " admins (" + 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 ? false : admin.getName().equalsIgnoreCase(player.getName());
+ }
+
+ public boolean addAdmin(Admin admin)
+ {
+ if (!admin.isValid())
+ {
+ logger.warning("Could not add admin: " + admin.getName() + ". Admin is missing details!");
+ return false;
+ }
+
+ // Store admin, update views
+ allAdmins.add(admin);
+ updateTables();
+
+ // Save admin
+ plugin.sql.addAdmin(admin);
+
+ return true;
+ }
+
+ 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/Ban.java b/src/main/java/me/totalfreedom/totalfreedommod/banning/Ban.java
index a5811b34..e1a96955 100644
--- a/src/main/java/me/totalfreedom/totalfreedommod/banning/Ban.java
+++ b/src/main/java/me/totalfreedom/totalfreedommod/banning/Ban.java
@@ -267,6 +267,5 @@ public class Ban
it.remove();
}
}
-
}
-}
+}
\ 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..81afad25 100644
--- a/src/main/java/me/totalfreedom/totalfreedommod/banning/BanManager.java
+++ b/src/main/java/me/totalfreedom/totalfreedommod/banning/BanManager.java
@@ -269,9 +269,8 @@ public class BanManager extends FreedomService
public void onPlayerJoin(PlayerJoinEvent event)
{
final Player player = event.getPlayer();
- final PlayerData data = plugin.pl.getData(player);
- if (!plugin.sl.isStaff(player))
+ if (!plugin.al.isAdmin(player))
{
return;
}
@@ -328,5 +327,4 @@ public class BanManager extends FreedomService
}
}
}
-
-}
+}
\ No newline at end of file
diff --git a/src/main/java/me/totalfreedom/totalfreedommod/banning/IndefiniteBan.java b/src/main/java/me/totalfreedom/totalfreedommod/banning/IndefiniteBan.java
index 1e3efcbe..a6c38690 100644
--- a/src/main/java/me/totalfreedom/totalfreedommod/banning/IndefiniteBan.java
+++ b/src/main/java/me/totalfreedom/totalfreedommod/banning/IndefiniteBan.java
@@ -60,4 +60,4 @@ public class IndefiniteBan implements IConfig
{
return username != null;
}
-}
+}
\ No newline at end of file
diff --git a/src/main/java/me/totalfreedom/totalfreedommod/banning/IndefiniteBanList.java b/src/main/java/me/totalfreedom/totalfreedommod/banning/IndefiniteBanList.java
index 042cdf75..ab2009ab 100644
--- a/src/main/java/me/totalfreedom/totalfreedommod/banning/IndefiniteBanList.java
+++ b/src/main/java/me/totalfreedom/totalfreedommod/banning/IndefiniteBanList.java
@@ -137,4 +137,4 @@ public class IndefiniteBanList extends FreedomService
ipBanCount += indefBan.getIps().size();
}
}
-}
+}
\ No newline at end of file
diff --git a/src/main/java/me/totalfreedom/totalfreedommod/blocking/BlockBlocker.java b/src/main/java/me/totalfreedom/totalfreedommod/blocking/BlockBlocker.java
index c457a0fd..4f29a21e 100644
--- a/src/main/java/me/totalfreedom/totalfreedommod/blocking/BlockBlocker.java
+++ b/src/main/java/me/totalfreedom/totalfreedommod/blocking/BlockBlocker.java
@@ -132,13 +132,13 @@ public class BlockBlocker extends FreedomService
case PLAYER_HEAD:
case PLAYER_WALL_HEAD:
{
- Skull skull = (Skull) event.getBlockPlaced().getState();
+ Skull skull = (Skull)event.getBlockPlaced().getState();
if (skull.getOwner() != null)
{
if (skull.getOwner().contains("\u00A7"))
{
skull.setOwner(skull.getOwner().replace("\u00A7", ""));
- SkullMeta meta = (SkullMeta) event.getItemInHand().getItemMeta();
+ SkullMeta meta = (SkullMeta)event.getItemInHand().getItemMeta();
if (meta != null)
{
ItemStack newHead = new ItemStack(Material.PLAYER_HEAD, 1);
@@ -173,14 +173,14 @@ public class BlockBlocker extends FreedomService
if (Groups.BANNERS.contains(event.getBlockPlaced().getType()))
{
- Banner banner = (Banner) event.getBlockPlaced().getState();
- List patterns = banner.getPatterns();;
+ Banner banner = (Banner)event.getBlockPlaced().getState();
+ List patterns = banner.getPatterns();
+ ;
if (patterns.size() >= 2)
{
banner.setPatterns(patterns.subList(0, 2));
player.sendMessage(ChatColor.GRAY + "Your banner had too many patterns on it, so some were removed.");
}
}
-
}
-}
+}
\ No newline at end of file
diff --git a/src/main/java/me/totalfreedom/totalfreedommod/blocking/EditBlocker.java b/src/main/java/me/totalfreedom/totalfreedommod/blocking/EditBlocker.java
index a27c4248..8fefc1f1 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;
@@ -58,5 +58,4 @@ public class EditBlocker extends FreedomService
FSync.playerMsg(event.getPlayer(), ChatColor.RED + "Your ability to destroy blocks has been disabled!");
event.setCancelled(true);
}
-
-}
+}
\ No newline at end of file
diff --git a/src/main/java/me/totalfreedom/totalfreedommod/blocking/EventBlocker.java b/src/main/java/me/totalfreedom/totalfreedommod/blocking/EventBlocker.java
index b0d8e2c4..3daa67e9 100644
--- a/src/main/java/me/totalfreedom/totalfreedommod/blocking/EventBlocker.java
+++ b/src/main/java/me/totalfreedom/totalfreedommod/blocking/EventBlocker.java
@@ -148,7 +148,7 @@ public class EventBlocker extends FreedomService
@EventHandler(priority = EventPriority.NORMAL)
public void onPlayerDropItem(PlayerDropItemEvent event)
{
- if (!plugin.sl.isStaff(event.getPlayer()))
+ if (!plugin.al.isAdmin(event.getPlayer()))
{
event.setCancelled(true);
}
diff --git a/src/main/java/me/totalfreedom/totalfreedommod/blocking/InteractBlocker.java b/src/main/java/me/totalfreedom/totalfreedommod/blocking/InteractBlocker.java
index b2dfadb2..c8f6efb6 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;
}
@@ -126,7 +126,7 @@ public class InteractBlocker extends FreedomService
event.setCancelled(true);
break;
}
-
+
case ARMOR_STAND:
{
if (ConfigEntry.ALLOW_ARMOR_STANDS.getBoolean())
@@ -160,4 +160,4 @@ public class InteractBlocker extends FreedomService
}
}
}
-}
+}
\ No newline at end of file
diff --git a/src/main/java/me/totalfreedom/totalfreedommod/blocking/MobBlocker.java b/src/main/java/me/totalfreedom/totalfreedommod/blocking/MobBlocker.java
index f8a9bcc7..a727e10a 100644
--- a/src/main/java/me/totalfreedom/totalfreedommod/blocking/MobBlocker.java
+++ b/src/main/java/me/totalfreedom/totalfreedommod/blocking/MobBlocker.java
@@ -130,4 +130,4 @@ public class MobBlocker extends FreedomService
event.setCancelled(true);
}
}
-}
+}
\ No newline at end of file
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/PotionBlocker.java b/src/main/java/me/totalfreedom/totalfreedommod/blocking/PotionBlocker.java
index 1799d5d4..1088e565 100644
--- a/src/main/java/me/totalfreedom/totalfreedommod/blocking/PotionBlocker.java
+++ b/src/main/java/me/totalfreedom/totalfreedommod/blocking/PotionBlocker.java
@@ -82,5 +82,4 @@ public class PotionBlocker extends FreedomService
}
return false;
}
-
-}
+}
\ No newline at end of file
diff --git a/src/main/java/me/totalfreedom/totalfreedommod/blocking/SignBlocker.java b/src/main/java/me/totalfreedom/totalfreedommod/blocking/SignBlocker.java
index 26f929b8..c98cb8b9 100644
--- a/src/main/java/me/totalfreedom/totalfreedommod/blocking/SignBlocker.java
+++ b/src/main/java/me/totalfreedom/totalfreedommod/blocking/SignBlocker.java
@@ -63,4 +63,4 @@ public class SignBlocker extends FreedomService
event.setCancelled(true);
}
}
-}
+}
\ No newline at end of file
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..84934a25 100644
--- a/src/main/java/me/totalfreedom/totalfreedommod/blocking/command/CommandBlocker.java
+++ b/src/main/java/me/totalfreedom/totalfreedommod/blocking/command/CommandBlocker.java
@@ -46,12 +46,12 @@ public class CommandBlocker extends FreedomService
{
try
{
- SimplePluginManager simplePluginManager = (SimplePluginManager) Bukkit.getServer().getPluginManager();
+ SimplePluginManager simplePluginManager = (SimplePluginManager)Bukkit.getServer().getPluginManager();
Field commandMapField = SimplePluginManager.class.getDeclaredField("commandMap");
commandMapField.setAccessible(true);
- SimpleCommandMap simpleCommandMap = (SimpleCommandMap) commandMapField.get(simplePluginManager);
+ SimpleCommandMap simpleCommandMap = (SimpleCommandMap)commandMapField.get(simplePluginManager);
return simpleCommandMap;
}
catch (NoSuchFieldException | IllegalArgumentException | IllegalAccessException e)
@@ -171,7 +171,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..615e5fb2 100644
--- a/src/main/java/me/totalfreedom/totalfreedommod/blocking/command/CommandBlockerAction.java
+++ b/src/main/java/me/totalfreedom/totalfreedommod/blocking/command/CommandBlockerAction.java
@@ -8,7 +8,7 @@ public enum CommandBlockerAction
BLOCK_UNKNOWN("u");
private final String token;
- private CommandBlockerAction(String token)
+ CommandBlockerAction(String token)
{
this.token = token;
}
@@ -29,4 +29,4 @@ public enum CommandBlockerAction
}
return null;
}
-}
+}
\ No newline at end of file
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..83e7bdf7 100644
--- a/src/main/java/me/totalfreedom/totalfreedommod/blocking/command/CommandBlockerRank.java
+++ b/src/main/java/me/totalfreedom/totalfreedommod/blocking/command/CommandBlockerRank.java
@@ -2,23 +2,20 @@ 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"),
+ EVERYONE("e"),
OP("o"),
- SUPER("s"),
- TELNET("t"),
- SENIOR("c"),
+ ADMIN("a"),
+ SENIOR_ADMIN("s"),
NOBODY("n");
//
private final String token;
- private CommandBlockerRank(String token)
+ CommandBlockerRank(String token)
{
this.token = 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())
@@ -55,8 +47,7 @@ public enum CommandBlockerRank
return OP;
}
- return ANYONE;
-
+ return EVERYONE;
}
public static CommandBlockerRank fromToken(String token)
@@ -68,6 +59,6 @@ public enum CommandBlockerRank
return rank;
}
}
- return ANYONE;
+ return EVERYONE;
}
-}
+}
\ No newline at end of file
diff --git a/src/main/java/me/totalfreedom/totalfreedommod/bridge/BukkitTelnetBridge.java b/src/main/java/me/totalfreedom/totalfreedommod/bridge/BukkitTelnetBridge.java
index 1e55ba7f..42312e50 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)
@@ -66,10 +66,8 @@ public class BukkitTelnetBridge extends FreedomService
@EventHandler(priority = EventPriority.NORMAL)
public void onTelnetRequestDataTags(TelnetRequestDataTagsEvent event)
{
- final Iterator>> it = event.getDataTags().entrySet().iterator();
- while (it.hasNext())
+ for (Map.Entry> entry : event.getDataTags().entrySet())
{
- final Map.Entry> entry = it.next();
final Player player = entry.getKey();
final Map playerTags = entry.getValue();
@@ -77,14 +75,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 +119,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)
@@ -177,4 +175,4 @@ public class BukkitTelnetBridge extends FreedomService
FLog.severe("Error removing telnet sessions: " + ex.getMessage());
}
}
-}
+}
\ No newline at end of file
diff --git a/src/main/java/me/totalfreedom/totalfreedommod/bridge/CoreProtectBridge.java b/src/main/java/me/totalfreedom/totalfreedommod/bridge/CoreProtectBridge.java
index f53664cf..0f496d01 100644
--- a/src/main/java/me/totalfreedom/totalfreedommod/bridge/CoreProtectBridge.java
+++ b/src/main/java/me/totalfreedom/totalfreedommod/bridge/CoreProtectBridge.java
@@ -301,7 +301,7 @@ public class CoreProtectBridge extends FreedomService
}
}
- if (!plugin.sl.isStaff(player))
+ if (!plugin.al.isAdmin(player))
{
cooldown.put(player.getName(), System.currentTimeMillis());
}
@@ -392,7 +392,7 @@ public class CoreProtectBridge extends FreedomService
}
}
- if (!plugin.sl.isStaff(player))
+ if (!plugin.al.isAdmin(player))
{
cooldown.put(player.getName(), System.currentTimeMillis());
}
diff --git a/src/main/java/me/totalfreedom/totalfreedommod/bridge/EssentialsBridge.java b/src/main/java/me/totalfreedom/totalfreedommod/bridge/EssentialsBridge.java
index 6cbedec7..7e53a5e6 100644
--- a/src/main/java/me/totalfreedom/totalfreedommod/bridge/EssentialsBridge.java
+++ b/src/main/java/me/totalfreedom/totalfreedommod/bridge/EssentialsBridge.java
@@ -215,4 +215,4 @@ public class EssentialsBridge extends FreedomService
return ess != null && ess.isEnabled();
}
-}
+}
\ No newline at end of file
diff --git a/src/main/java/me/totalfreedom/totalfreedommod/bridge/LibsDisguisesBridge.java b/src/main/java/me/totalfreedom/totalfreedommod/bridge/LibsDisguisesBridge.java
index e70a60cd..99e9739e 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 admin)
{
try
{
@@ -61,7 +61,7 @@ public class LibsDisguisesBridge extends FreedomService
{
if (DisguiseAPI.isDisguised(player))
{
- if (!staff && plugin.sl.isStaff(player))
+ if (!admin && plugin.al.isAdmin(player))
{
continue;
}
diff --git a/src/main/java/me/totalfreedom/totalfreedommod/bridge/TFGuildsBridge.java b/src/main/java/me/totalfreedom/totalfreedommod/bridge/TFGuildsBridge.java
index f2e93395..fea8ad88 100644
--- a/src/main/java/me/totalfreedom/totalfreedommod/bridge/TFGuildsBridge.java
+++ b/src/main/java/me/totalfreedom/totalfreedommod/bridge/TFGuildsBridge.java
@@ -55,4 +55,4 @@ public class TFGuildsBridge extends FreedomService
}
return Common.IN_GUILD_CHAT.contains(player);
}
-}
+}
\ No newline at end of file
diff --git a/src/main/java/me/totalfreedom/totalfreedommod/caging/Cager.java b/src/main/java/me/totalfreedom/totalfreedommod/caging/Cager.java
index 5307d562..3f7be6fe 100644
--- a/src/main/java/me/totalfreedom/totalfreedommod/caging/Cager.java
+++ b/src/main/java/me/totalfreedom/totalfreedommod/caging/Cager.java
@@ -31,8 +31,7 @@ public class Cager extends FreedomService
public void onBreakBlock(BlockBreakEvent event)
{
Player player = event.getPlayer();
- if (player == null
- || plugin.sl.isStaff(player))
+ if (player == null || plugin.al.isAdmin(player))
{
return;
}
@@ -113,5 +112,4 @@ public class Cager extends FreedomService
cage.playerJoin();
}
}
-
-}
+}
\ No newline at end of file
diff --git a/src/main/java/me/totalfreedom/totalfreedommod/command/CommandLoader.java b/src/main/java/me/totalfreedom/totalfreedommod/command/CommandLoader.java
index fd11e02d..fbbd0ec9 100644
--- a/src/main/java/me/totalfreedom/totalfreedommod/command/CommandLoader.java
+++ b/src/main/java/me/totalfreedom/totalfreedommod/command/CommandLoader.java
@@ -40,7 +40,9 @@ public class CommandLoader extends FreedomService
for (FreedomCommand command : commands)
{
if (name.equals(command.getName()))
+ {
return command;
+ }
}
return null;
}
@@ -50,7 +52,9 @@ public class CommandLoader extends FreedomService
for (FreedomCommand command : commands)
{
if (Arrays.asList(command.getAliases().split(",")).contains(alias))
+ {
return true;
+ }
}
return false;
}
@@ -69,7 +73,7 @@ public class CommandLoader extends FreedomService
}
catch (InstantiationException | IllegalAccessException | ExceptionInInitializerError ex)
{
- FLog.warning("Failed to register command: /" + commandClass.getSimpleName().replace("Command_" , ""));
+ FLog.warning("Failed to register command: /" + commandClass.getSimpleName().replace("Command_", ""));
}
}
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 64%
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..d1fd6b30 100644
--- a/src/main/java/me/totalfreedom/totalfreedommod/command/Command_staffchat.java
+++ b/src/main/java/me/totalfreedom/totalfreedommod/command/Command_adminchat.java
@@ -8,8 +8,8 @@ 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,ac,staffchat")
+public class Command_adminchat extends FreedomCommand
{
@Override
@@ -19,18 +19,18 @@ 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("Admin chat turned " + (userinfo.inAdminChat() ? "on" : "off") + ".");
}
else
{
- plugin.cm.staffChat(sender, StringUtils.join(args, " "));
+ plugin.cm.adminChat(sender, StringUtils.join(args, " "));
}
return true;
}
-}
+}
\ No newline at end of file
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 71%
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..7708e0dd 100644
--- a/src/main/java/me/totalfreedom/totalfreedommod/command/Command_staffinfo.java
+++ b/src/main/java/me/totalfreedom/totalfreedommod/command/Command_admininfo.java
@@ -11,23 +11,23 @@ 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 = "si,ai,staffinfo")
+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 of 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;
}
-}
+}
\ No newline at end of file
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 72%
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..83415650 100644
--- a/src/main/java/me/totalfreedom/totalfreedommod/command/Command_staffmode.java
+++ b/src/main/java/me/totalfreedom/totalfreedommod/command/Command_adminmode.java
@@ -11,8 +11,8 @@ 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]", aliases = "staffmode")
+public class Command_adminmode extends FreedomCommand
{
@Override
@@ -25,19 +25,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,11 +49,11 @@ 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");
}
return Collections.emptyList();
}
-}
+}
\ No newline at end of file
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..6713f34d 100644
--- a/src/main/java/me/totalfreedom/totalfreedommod/command/Command_staffworld.java
+++ b/src/main/java/me/totalfreedom/totalfreedommod/command/Command_adminworld.java
@@ -13,10 +13,10 @@ 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 = "sw,aw,staffworld")
+public class Command_adminworld extends FreedomCommand
{
private enum CommandMode
@@ -61,24 +61,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 +91,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 +115,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 +152,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 +177,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..1d70d095 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;
}
@@ -55,4 +55,4 @@ public class Command_adventure extends FreedomCommand
player.setGameMode(GameMode.ADVENTURE);
return true;
}
-}
+}
\ No newline at end of file
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..41f87b32 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())
{
@@ -33,4 +33,4 @@ public class Command_aeclear extends FreedomCommand
msg(removed + " area effect clouds removed.");
return true;
}
-}
+}
\ No newline at end of file
diff --git a/src/main/java/me/totalfreedom/totalfreedommod/command/Command_announce.java b/src/main/java/me/totalfreedom/totalfreedommod/command/Command_announce.java
index 400a4055..e0e49a7b 100644
--- a/src/main/java/me/totalfreedom/totalfreedommod/command/Command_announce.java
+++ b/src/main/java/me/totalfreedom/totalfreedommod/command/Command_announce.java
@@ -22,5 +22,4 @@ public class Command_announce extends FreedomCommand
plugin.an.announce(StringUtils.join(args, " "));
return true;
}
-
-}
+}
\ No newline at end of file
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..8d1f758f 100644
--- a/src/main/java/me/totalfreedom/totalfreedommod/command/Command_banip.java
+++ b/src/main/java/me/totalfreedom/totalfreedommod/command/Command_banip.java
@@ -27,7 +27,7 @@ public class Command_banip extends FreedomCommand
boolean silent = false;
String reason = null;
-
+
String ip = args[0];
if (!FUtil.isValidIPv4(ip))
@@ -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..f7b16cfa 100644
--- a/src/main/java/me/totalfreedom/totalfreedommod/command/Command_banname.java
+++ b/src/main/java/me/totalfreedom/totalfreedommod/command/Command_banname.java
@@ -26,8 +26,8 @@ public class Command_banname extends FreedomCommand
boolean silent = false;
String reason = null;
-
- String name = args[0];;
+
+ String name = args[0];
if (plugin.bm.getByUsername(name) != null)
{
@@ -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_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..f8347503 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..ac07ec15 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("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..f4a13a32 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,8 +34,8 @@ 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;
}
-}
+}
\ No newline at end of file
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..1c1dc161 100644
--- a/src/main/java/me/totalfreedom/totalfreedommod/command/Command_cage.java
+++ b/src/main/java/me/totalfreedom/totalfreedommod/command/Command_cage.java
@@ -28,9 +28,9 @@ public class Command_cage extends FreedomCommand
}
String skullName = null;
- if ("purge".equals(args[0]))
+ if (args[0].equalsIgnoreCase("purge"))
{
- 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;
}
@@ -146,4 +146,4 @@ public class Command_cage extends FreedomCommand
return Collections.emptyList();
}
-}
+}
\ No newline at end of file
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..106603f2 100644
--- a/src/main/java/me/totalfreedom/totalfreedommod/command/Command_cartsit.java
+++ b/src/main/java/me/totalfreedom/totalfreedommod/command/Command_cartsit.java
@@ -16,9 +16,8 @@ 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]);
if (targetPlayer == null)
@@ -74,4 +73,4 @@ public class Command_cartsit extends FreedomCommand
return true;
}
-}
+}
\ No newline at end of file
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..b476d3fa 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;
}
-}
+}
\ No newline at end of file
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..68898d0d 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");
@@ -76,4 +76,4 @@ public class Command_clearinventory extends FreedomCommand
return Collections.emptyList();
}
-}
+}
\ No newline at end of file
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..527f310f 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,12 +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;
}
-}
+}
\ No newline at end of file
diff --git a/src/main/java/me/totalfreedom/totalfreedommod/command/Command_colorme.java b/src/main/java/me/totalfreedom/totalfreedommod/command/Command_colorme.java
index 97b3ef7e..e5a3e966 100644
--- a/src/main/java/me/totalfreedom/totalfreedommod/command/Command_colorme.java
+++ b/src/main/java/me/totalfreedom/totalfreedommod/command/Command_colorme.java
@@ -1,6 +1,5 @@
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;
@@ -23,7 +22,7 @@ public class Command_colorme extends FreedomCommand
return false;
}
- if ("list".equalsIgnoreCase(args[0]))
+ if (args[0].equalsIgnoreCase("list"))
{
msg("Colors: " + StringUtils.join(FUtil.CHAT_COLOR_NAMES.keySet(), ", "));
return true;
@@ -31,10 +30,8 @@ public class Command_colorme extends FreedomCommand
final String needle = args[0].trim().toLowerCase();
ChatColor color = null;
- final Iterator> it = FUtil.CHAT_COLOR_NAMES.entrySet().iterator();
- while (it.hasNext())
+ for (Map.Entry entry : FUtil.CHAT_COLOR_NAMES.entrySet())
{
- final Map.Entry entry = it.next();
if (entry.getKey().contains(needle))
{
color = entry.getValue();
@@ -53,7 +50,6 @@ public class Command_colorme extends FreedomCommand
plugin.esb.setNickname(sender.getName(), newNick);
msg("Your nickname is now: " + newNick);
-
return true;
}
-}
+}
\ No newline at end of file
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..32f3dad0 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;
}
@@ -56,4 +56,4 @@ public class Command_creative extends FreedomCommand
return true;
}
-}
+}
\ No newline at end of file
diff --git a/src/main/java/me/totalfreedom/totalfreedommod/command/Command_curse.java b/src/main/java/me/totalfreedom/totalfreedommod/command/Command_curse.java
index bd6ec98a..4417cf35 100644
--- a/src/main/java/me/totalfreedom/totalfreedommod/command/Command_curse.java
+++ b/src/main/java/me/totalfreedom/totalfreedommod/command/Command_curse.java
@@ -49,18 +49,16 @@ public class Command_curse extends FreedomCommand
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()))
+ if (args.length == 1 && plugin.al.isAdmin(sender) && FUtil.isExecutive(sender.getName()))
{
return FUtil.getPlayerList();
}
return Collections.emptyList();
}
-}
+}
\ No newline at end of file
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..9a035fef 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())
{
@@ -33,7 +33,6 @@ public class Command_disguisetoggle extends FreedomCommand
}
msg("Disguises are now " + (plugin.ldb.isDisguisesEnabled() ? "enabled." : "disabled."));
-
return true;
}
-}
+}
\ No newline at end of file
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..ebbab3e9 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,11 +120,12 @@ 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
- player.getWorld().createExplosion(player.getLocation(), 0F, false);;
+ player.getWorld().createExplosion(player.getLocation(), 0F, false);
+ ;
// kick player
player.kickPlayer(ChatColor.RED + kickReason);
@@ -133,4 +134,4 @@ public class Command_doom extends FreedomCommand
return true;
}
-}
+}
\ No newline at end of file
diff --git a/src/main/java/me/totalfreedom/totalfreedommod/command/Command_enchant.java b/src/main/java/me/totalfreedom/totalfreedommod/command/Command_enchant.java
index a431abf7..a88ce67a 100644
--- a/src/main/java/me/totalfreedom/totalfreedommod/command/Command_enchant.java
+++ b/src/main/java/me/totalfreedom/totalfreedommod/command/Command_enchant.java
@@ -266,5 +266,4 @@ public class Command_enchant extends FreedomCommand
return Collections.emptyList();
}
-
-}
+}
\ No newline at end of file
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
index 25094965..470c07b7 100644
--- a/src/main/java/me/totalfreedom/totalfreedommod/command/Command_explode.java
+++ b/src/main/java/me/totalfreedom/totalfreedommod/command/Command_explode.java
@@ -33,10 +33,12 @@ public class Command_explode extends FreedomCommand
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
@@ -58,7 +60,7 @@ public class Command_explode 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 FUtil.getPlayerList();
}
diff --git a/src/main/java/me/totalfreedom/totalfreedommod/command/Command_explosivearrows.java b/src/main/java/me/totalfreedom/totalfreedommod/command/Command_explosivearrows.java
index 2e138f27..b1f4f767 100644
--- a/src/main/java/me/totalfreedom/totalfreedommod/command/Command_explosivearrows.java
+++ b/src/main/java/me/totalfreedom/totalfreedommod/command/Command_explosivearrows.java
@@ -28,4 +28,4 @@ public class Command_explosivearrows extends FreedomCommand
return true;
}
-}
+}
\ No newline at end of file
diff --git a/src/main/java/me/totalfreedom/totalfreedommod/command/Command_forcekill.java b/src/main/java/me/totalfreedom/totalfreedommod/command/Command_forcekill.java
index 2b747494..dd4f3d77 100644
--- a/src/main/java/me/totalfreedom/totalfreedommod/command/Command_forcekill.java
+++ b/src/main/java/me/totalfreedom/totalfreedommod/command/Command_forcekill.java
@@ -13,7 +13,7 @@ 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)
+ if (!plugin.al.isAdmin(sender) && !senderIsConsole)
{
playerSender.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..45de1bde 100644
--- a/src/main/java/me/totalfreedom/totalfreedommod/command/Command_freeze.java
+++ b/src/main/java/me/totalfreedom/totalfreedommod/command/Command_freeze.java
@@ -9,7 +9,7 @@ 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
{
@@ -23,15 +23,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);
@@ -41,12 +41,12 @@ public class Command_freeze extends FreedomCommand
return true;
}
- if (args[0].equals("purge"))
+ if (args[0].equalsIgnoreCase("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_fuckoff.java b/src/main/java/me/totalfreedom/totalfreedommod/command/Command_fuckoff.java
index ab5cb382..bed1cc71 100644
--- a/src/main/java/me/totalfreedom/totalfreedommod/command/Command_fuckoff.java
+++ b/src/main/java/me/totalfreedom/totalfreedommod/command/Command_fuckoff.java
@@ -21,13 +21,8 @@ public class Command_fuckoff extends FreedomCommand
FPlayer player = plugin.pl.getPlayer(playerSender);
- if (!args[0].equals("on"))
+ if (args[0].equalsIgnoreCase("off"))
{
- player.disableFuckoff();
- }
- else
- {
-
double radius = 25.0;
if (args.length >= 2)
{
@@ -39,12 +34,14 @@ public class Command_fuckoff extends FreedomCommand
{
}
}
-
player.setFuckoff(radius);
}
+ else
+ {
+ player.disableFuckoff();
+ }
msg("Fuckoff " + (player.isFuckOff() ? ("enabled. Radius: " + player.getFuckoffRadius() + ".") : "disabled."));
-
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..b85f6743 100644
--- a/src/main/java/me/totalfreedom/totalfreedommod/command/Command_health.java
+++ b/src/main/java/me/totalfreedom/totalfreedommod/command/Command_health.java
@@ -107,5 +107,4 @@ public class Command_health extends FreedomCommand
return (double)tickCount / ((double)elapsed / 1000.0);
}
}
-
-}
+}
\ No newline at end of file
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..1ffc1bb1 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.isAdmin(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..6d00f402 100644
--- a/src/main/java/me/totalfreedom/totalfreedommod/command/Command_indefban.java
+++ b/src/main/java/me/totalfreedom/totalfreedommod/command/Command_indefban.java
@@ -6,7 +6,7 @@ import org.bukkit.command.CommandSender;
import org.bukkit.entity.Player;
@CommandPermissions(level = Rank.SENIOR_ADMIN, source = SourceType.ONLY_CONSOLE)
-@CommandParameters(description = "Reload the indefinite ban list.", usage = "/ reload", aliases = "ib")
+@CommandParameters(description = "Reload the indefinite ban list.", usage = "/ ", aliases = "ib")
public class Command_indefban extends FreedomCommand
{
@@ -29,5 +29,4 @@ public class Command_indefban extends FreedomCommand
msg("Reloaded the indefinite ban list.");
return true;
}
-
-}
+}
\ No newline at end of file
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..12bbff7b 100644
--- a/src/main/java/me/totalfreedom/totalfreedommod/command/Command_invis.java
+++ b/src/main/java/me/totalfreedom/totalfreedommod/command/Command_invis.java
@@ -16,7 +16,7 @@ import org.bukkit.potion.PotionEffectType;
@CommandParameters(description = "Shows (optionally clears) invisible players", usage = "/ [clear]")
public class Command_invis extends FreedomCommand
{
-
+
@Override
public boolean run(CommandSender sender, Player playerSender, Command cmd, String commandLabel, String[] args, boolean senderIsConsole)
{
@@ -26,16 +26,20 @@ public class Command_invis extends FreedomCommand
{
if (args[0].equalsIgnoreCase("clear"))
{
- if(!plugin.sl.isStaff(sender))
- return noPerms();
- else
+ if (!plugin.al.isAdmin(sender))
{
- FUtil.staffAction(sender.getName(), "Clearing all invisibility potion effects from all players", true);
+ return noPerms();
+ }
+ else
+ {
+ FUtil.adminAction(sender.getName(), "Clearing all invisibility potion effects from all players", true);
clear = true;
}
}
else
+ {
return false;
+ }
}
List players = new ArrayList();
@@ -43,10 +47,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++;
@@ -59,20 +63,26 @@ public class Command_invis extends FreedomCommand
msg("There are no invisible players");
return true;
}
-
+
if (clear)
+ {
msg("Cleared " + clears + " players");
+ }
else
+ {
msg("Invisible players (" + players.size() + "): " + StringUtils.join(players, ", "));
-
+ }
+
return true;
}
@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..150e8e24 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 admins.", 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..967eb64c 100644
--- a/src/main/java/me/totalfreedom/totalfreedommod/command/Command_jumppads.java
+++ b/src/main/java/me/totalfreedom/totalfreedommod/command/Command_jumppads.java
@@ -32,9 +32,9 @@ public class Command_jumppads extends FreedomCommand
return true;
}
- if ("off".equals(args[0]))
+ if (args[0].equalsIgnoreCase("off"))
{
- if(plugin.jp.players.get(playerSender) == Jumppads.JumpPadMode.OFF)
+ if (plugin.jp.players.get(playerSender) == Jumppads.JumpPadMode.OFF)
{
msg("Your jumppads are already disabled.");
return true;
@@ -44,7 +44,7 @@ public class Command_jumppads extends FreedomCommand
}
else
{
- if(plugin.jp.players.get(playerSender) != Jumppads.JumpPadMode.OFF)
+ if (plugin.jp.players.get(playerSender) != Jumppads.JumpPadMode.OFF)
{
msg("Your jumppads are already enabled.");
return true;
@@ -65,7 +65,7 @@ public class Command_jumppads extends FreedomCommand
{
if ("off".equals(args[1]))
{
- if(plugin.jp.players.get(playerSender) == Jumppads.JumpPadMode.MADGEEK)
+ if (plugin.jp.players.get(playerSender) == Jumppads.JumpPadMode.MADGEEK)
{
msg("Your jumppads are already set to normal mode.");
return true;
@@ -75,7 +75,7 @@ public class Command_jumppads extends FreedomCommand
}
else
{
- if(plugin.jp.players.get(playerSender) == Jumppads.JumpPadMode.NORMAL_AND_SIDEWAYS)
+ if (plugin.jp.players.get(playerSender) == Jumppads.JumpPadMode.NORMAL_AND_SIDEWAYS)
{
msg("Your jumppads are already set to normal and sideways mode.");
return true;
@@ -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..c009264e 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,23 @@ 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
index 4ef0ef2f..be00b73e 100644
--- a/src/main/java/me/totalfreedom/totalfreedommod/command/Command_landmine.java
+++ b/src/main/java/me/totalfreedom/totalfreedommod/command/Command_landmine.java
@@ -60,8 +60,6 @@ public class Command_landmine extends FreedomCommand
plugin.lm.add(new Landmine(landmine.getLocation(), playerSender, radius));
msg("Landmine planted - Radius = " + radius + " blocks.", ChatColor.GREEN);
-
return true;
}
-
-}
+}
\ No newline at end of file
diff --git a/src/main/java/me/totalfreedom/totalfreedommod/command/Command_lastcmd.java b/src/main/java/me/totalfreedom/totalfreedommod/command/Command_lastcmd.java
index 0b7cac8d..e0271f4a 100644
--- a/src/main/java/me/totalfreedom/totalfreedommod/command/Command_lastcmd.java
+++ b/src/main/java/me/totalfreedom/totalfreedommod/command/Command_lastcmd.java
@@ -42,4 +42,4 @@ public class Command_lastcmd extends FreedomCommand
return true;
}
-}
+}
\ No newline at end of file
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..642f34eb 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)
@@ -58,4 +58,4 @@ public class Command_linkdiscord extends FreedomCommand
msg("Take this code and DM the server bot (" + plugin.dc.formatBotTag() + ") the code (do not put anything else in the message, only the code)");
return true;
}
-}
+}
\ No newline at end of file
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..c6c4a992 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() + ".");
@@ -132,4 +132,4 @@ public class Command_lockup extends FreedomCommand
}
}.runTaskTimer(plugin, 0L, 5L));
}
-}
+}
\ No newline at end of file
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_makeopregion.java b/src/main/java/me/totalfreedom/totalfreedommod/command/Command_makeopregion.java
index b57cae6b..32305e78 100644
--- a/src/main/java/me/totalfreedom/totalfreedommod/command/Command_makeopregion.java
+++ b/src/main/java/me/totalfreedom/totalfreedommod/command/Command_makeopregion.java
@@ -55,7 +55,7 @@ public class Command_makeopregion extends FreedomCommand
LocalSession session = plugin.web.getWorldEditPlugin().getSession(playerSender);
- Region selection = null;
+ Region selection;
try
{
@@ -91,7 +91,6 @@ public class Command_makeopregion extends FreedomCommand
regionManager.addRegion(region);
msg("Successfully created the region '" + name + "' for " + player.getName(), ChatColor.GREEN);
-
return true;
}
-}
+}
\ No newline at end of file
diff --git a/src/main/java/me/totalfreedom/totalfreedommod/command/Command_manageshop.java b/src/main/java/me/totalfreedom/totalfreedommod/command/Command_manageshop.java
index b7207d93..64219716 100644
--- a/src/main/java/me/totalfreedom/totalfreedommod/command/Command_manageshop.java
+++ b/src/main/java/me/totalfreedom/totalfreedommod/command/Command_manageshop.java
@@ -218,5 +218,4 @@ public class Command_manageshop extends FreedomCommand
}
return false;
}
-
-}
+}
\ No newline at end of file
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..f4983fd1 100644
--- a/src/main/java/me/totalfreedom/totalfreedommod/command/Command_manuallyverify.java
+++ b/src/main/java/me/totalfreedom/totalfreedommod/command/Command_manuallyverify.java
@@ -8,7 +8,7 @@ import org.bukkit.command.CommandSender;
import org.bukkit.entity.Player;
@CommandPermissions(level = Rank.ADMIN, source = SourceType.BOTH)
-@CommandParameters(description = "Manually verify someone", usage = "/ ", aliases="mv")
+@CommandParameters(description = "Manually verify someone", usage = "/ ", aliases = "mv")
public class Command_manuallyverify extends FreedomCommand
{
@Override
@@ -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_masterbuilderworld.java b/src/main/java/me/totalfreedom/totalfreedommod/command/Command_masterbuilderworld.java
index b18e0379..dd89780f 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.isAdmin(playerSender))
{
throw new PermissionDeniedException();
}
@@ -199,5 +199,4 @@ public class Command_masterbuilderworld extends FreedomCommand
super(string);
}
}
-
}
\ No newline at end of file
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_mute.java b/src/main/java/me/totalfreedom/totalfreedommod/command/Command_mute.java
index 8d4dc76c..5e8a90bb 100644
--- a/src/main/java/me/totalfreedom/totalfreedommod/command/Command_mute.java
+++ b/src/main/java/me/totalfreedom/totalfreedommod/command/Command_mute.java
@@ -29,7 +29,7 @@ public class Command_mute extends FreedomCommand
return false;
}
- if (args[0].equals("list"))
+ if (args[0].equalsIgnoreCase("list"))
{
msg("Muted players:");
FPlayer info;
@@ -51,9 +51,9 @@ public class Command_mute extends FreedomCommand
return true;
}
- if (args[0].equals("purge"))
+ if (args[0].equalsIgnoreCase("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())
@@ -71,15 +71,15 @@ public class Command_mute extends FreedomCommand
return true;
}
- if (args[0].equals("all"))
+ if (args[0].equalsIgnoreCase("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 e1b9b105..b8148bc9 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() + "'s IPs", true);
+ FUtil.adminAction(sender.getName(), "Clearing " + target.getName() + "'s 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,13 +246,13 @@ 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();
}
}
}
return FUtil.getPlayerList();
}
-}
+}
\ No newline at end of file
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 57c5ac6f..e5fc24f7 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_nickgradient.java b/src/main/java/me/totalfreedom/totalfreedommod/command/Command_nickgradient.java
index 3063c42a..3fba2d4f 100644
--- a/src/main/java/me/totalfreedom/totalfreedommod/command/Command_nickgradient.java
+++ b/src/main/java/me/totalfreedom/totalfreedommod/command/Command_nickgradient.java
@@ -56,7 +56,9 @@ public class Command_nickgradient extends FreedomCommand
from = " (From: " + FUtil.getHexStringOfAWTColor(awt1) + ")";
}
else
+ {
awt1 = java.awt.Color.decode(args[0]);
+ }
if (args[1].equalsIgnoreCase("random") ||
args[1].equalsIgnoreCase("r"))
{
@@ -64,7 +66,9 @@ public class Command_nickgradient extends FreedomCommand
to = " (To: " + FUtil.getHexStringOfAWTColor(awt2) + ")";
}
else
+ {
awt2 = java.awt.Color.decode(args[1]);
+ }
}
catch (NumberFormatException ex)
{
@@ -85,7 +89,6 @@ public class Command_nickgradient extends FreedomCommand
plugin.esb.setNickname(sender.getName(), outputNick);
msg("Your nickname is now: '" + outputNick + ChatColor.GRAY + "'" + from + to);
-
return true;
}
-}
+}
\ No newline at end of file
diff --git a/src/main/java/me/totalfreedom/totalfreedommod/command/Command_nicknyan.java b/src/main/java/me/totalfreedom/totalfreedommod/command/Command_nicknyan.java
index c430b66c..706b54d5 100644
--- a/src/main/java/me/totalfreedom/totalfreedommod/command/Command_nicknyan.java
+++ b/src/main/java/me/totalfreedom/totalfreedommod/command/Command_nicknyan.java
@@ -21,7 +21,7 @@ public class Command_nicknyan extends FreedomCommand
return false;
}
- if ("off".equals(args[0]))
+ if (args[0].equalsIgnoreCase("off"))
{
plugin.esb.setNickname(sender.getName(), null);
msg("Nickname cleared.");
@@ -67,7 +67,6 @@ public class Command_nicknyan extends FreedomCommand
plugin.esb.setNickname(sender.getName(), newNick.toString());
msg("Your nickname is now: " + newNick.toString());
-
return true;
}
-}
+}
\ No newline at end of file
diff --git a/src/main/java/me/totalfreedom/totalfreedommod/command/Command_notes.java b/src/main/java/me/totalfreedom/totalfreedommod/command/Command_notes.java
index 4deb22d3..fe01b6b0 100644
--- a/src/main/java/me/totalfreedom/totalfreedommod/command/Command_notes.java
+++ b/src/main/java/me/totalfreedom/totalfreedommod/command/Command_notes.java
@@ -46,67 +46,76 @@ public class Command_notes extends FreedomCommand
playerData = plugin.pl.getData(player);
}
- if (args[1].equals("list"))
+ switch (args[1])
{
- final StringBuilder noteList = new StringBuilder();
- noteList.append(ChatColor.GREEN + "Player notes for " + playerData.getName() + ":");
- int id = 1;
- for (String note : playerData.getNotes())
+ case "list":
{
- String noteLine = id + ". " + note;
- noteList.append("\n" + ChatColor.GOLD + noteLine);
- id++;
- }
- msg(noteList.toString());
- return true;
- }
- else if (args[1].equals("add"))
- {
- if (args.length < 3)
- {
- return false;
- }
- String note = sender.getName() + ": " + StringUtils.join(ArrayUtils.subarray(args, 2, args.length), " ");
- playerData.addNote(note);
- plugin.pl.save(playerData);
- msg("Note added.", ChatColor.GREEN);
- return true;
- }
- else if (args[1].equals("remove"))
- {
- if (args.length < 3)
- {
- return false;
- }
- int id;
- try
- {
- id = Integer.valueOf(args[2]);
- }
- catch (NumberFormatException e)
- {
- msg("Invalid number: " + args[2], ChatColor.RED);
+ final StringBuilder noteList = new StringBuilder();
+ noteList.append(ChatColor.GREEN + "Player notes for " + playerData.getName() + ":");
+ int id = 1;
+ for (String note : playerData.getNotes())
+ {
+ String noteLine = id + ". " + note;
+ noteList.append("\n" + ChatColor.GOLD + noteLine);
+ id++;
+ }
+ msg(noteList.toString());
return true;
}
- id--;
- if (playerData.removeNote(id))
+
+ case "add":
{
+ if (args.length < 3)
+ {
+ return false;
+ }
+ String note = sender.getName() + ": " + StringUtils.join(ArrayUtils.subarray(args, 2, args.length), " ");
+ playerData.addNote(note);
plugin.pl.save(playerData);
- msg("Note removed.");
+ msg("Note added.", ChatColor.GREEN);
+ return true;
}
- else
+
+ case "remove":
{
- msg("No note with the ID of " + args[2] + " exists.", ChatColor.RED);
+ if (args.length < 3)
+ {
+ return false;
+ }
+
+ int id;
+ try
+ {
+ id = Integer.parseInt(args[2]);
+ }
+ catch (NumberFormatException e)
+ {
+ msg("Invalid number: " + args[2], ChatColor.RED);
+ return true;
+ }
+
+ id--;
+
+ if (playerData.removeNote(id))
+ {
+ plugin.pl.save(playerData);
+ msg("Note removed.");
+ }
+ else
+ {
+ msg("No note with the ID of " + args[2] + " exists.", ChatColor.RED);
+ }
+ return true;
+ }
+
+ case "clear":
+ {
+ int count = playerData.getNotes().size();
+ playerData.clearNotes();
+ plugin.pl.save(playerData);
+ msg("Cleared " + count + " notes.", ChatColor.GREEN);
+ return true;
}
- return true;
- }
- else if (args[1].equals("clear"))
- {
- int count = playerData.getNotes().size();
- playerData.clearNotes();
- plugin.pl.save(playerData);
- msg("Cleared " + count + " notes.", ChatColor.GREEN);
- return true;
}
return false;
}
@@ -128,4 +137,4 @@ public class Command_notes extends FreedomCommand
}
return Collections.emptyList();
}
-}
+}
\ No newline at end of file
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 361ae9be..029c5751 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())
{
@@ -27,4 +27,4 @@ public class Command_opall extends FreedomCommand
return true;
}
-}
+}
\ No newline at end of file
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..246d66b4 100644
--- a/src/main/java/me/totalfreedom/totalfreedommod/command/Command_ops.java
+++ b/src/main/java/me/totalfreedom/totalfreedommod/command/Command_ops.java
@@ -20,7 +20,7 @@ public class Command_ops extends FreedomCommand
return false;
}
- if (args[0].equals("count"))
+ if (args[0].equalsIgnoreCase("count"))
{
int totalOps = server.getOperators().size();
int onlineOps = 0;
@@ -36,19 +36,18 @@ public class Command_ops extends FreedomCommand
msg("Online OPs: " + onlineOps);
msg("Offline OPs: " + (totalOps - onlineOps));
msg("Total OPs: " + totalOps);
-
return true;
}
- if (args[0].equals("purge"))
+ if (args[0].equalsIgnoreCase("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())
{
@@ -60,7 +59,6 @@ public class Command_ops extends FreedomCommand
}
return true;
}
-
return false;
}
-}
+}
\ No newline at end of file
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..08894999 100644
--- a/src/main/java/me/totalfreedom/totalfreedommod/command/Command_orbit.java
+++ b/src/main/java/me/totalfreedom/totalfreedommod/command/Command_orbit.java
@@ -38,7 +38,7 @@ public class Command_orbit extends FreedomCommand
if (args.length >= 2)
{
- if (args[1].equals("stop"))
+ if (args[1].equalsIgnoreCase("stop"))
{
msg("Stopped orbiting " + player.getName());
playerdata.stopOrbiting();
@@ -60,8 +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;
}
-}
+}
\ No newline at end of file
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..88042ec8 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;
@@ -41,12 +41,12 @@ public class Command_panel extends FreedomCommand
return false;
}
- if (args[0].equals("create"))
+ if (args[0].equalsIgnoreCase("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,26 +64,26 @@ 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);
return true;
}
- else if (args[0].equals("delete"))
+ else if (args[0].equalsIgnoreCase("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,18 +91,18 @@ 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);
+ Admin admin = getAdmin(playerSender);
- if (staffMember.getAmpUsername() == null)
+ if (admin.getAmpUsername() == null)
{
msg("You do not have a Pterodactyl account.", ChatColor.RED);
return true;
@@ -110,7 +110,7 @@ public class Command_panel extends FreedomCommand
msg("Resetting your password...", ChatColor.GREEN);
- String id = staffMember.getPteroID();
+ String id = admin.getPteroID();
String password = FUtil.randomString(30);
plugin.ptero.setPassword(id, password);
plugin.dc.sendPteroInfo(playerData, null, password);
@@ -125,12 +125,11 @@ 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");
}
return Collections.emptyList();
}
-
-}
+}
\ No newline at end of file
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..0adc14f3 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].equalsIgnoreCase("reload") && plugin.al.isAdmin(sender))
{
plugin.permissions.load();
plugin.pem.loadPermissionNodes();
diff --git a/src/main/java/me/totalfreedom/totalfreedommod/command/Command_playerverification.java b/src/main/java/me/totalfreedom/totalfreedommod/command/Command_playerverification.java
index 3ae7b928..89a62a28 100644
--- a/src/main/java/me/totalfreedom/totalfreedommod/command/Command_playerverification.java
+++ b/src/main/java/me/totalfreedom/totalfreedommod/command/Command_playerverification.java
@@ -68,6 +68,7 @@ public class Command_playerverification extends FreedomCommand
switch (args[0].toLowerCase())
{
case "enable":
+ {
if (!plugin.dc.enabled)
{
msg("The Discord verification system is currently disabled.", ChatColor.RED);
@@ -87,8 +88,10 @@ public class Command_playerverification extends FreedomCommand
plugin.pl.save(data);
msg("Re-enabled Discord verification.", ChatColor.GREEN);
return true;
+ }
case "disable":
+ {
if (!data.hasVerification())
{
msg("Discord verification is already disabled for you.", ChatColor.RED);
@@ -98,16 +101,20 @@ public class Command_playerverification extends FreedomCommand
plugin.pl.save(data);
msg("Disabled Discord verification.", ChatColor.GREEN);
return true;
+ }
case "status":
+ {
boolean enabled = target.hasVerification();
boolean specified = target.getDiscordID() != null;
msg(ChatColor.GRAY + "Discord Verification Enabled: " + (enabled ? ChatColor.GREEN + "true" : ChatColor.RED + "false"));
msg(ChatColor.GRAY + "Discord ID: " + (specified ? ChatColor.GREEN + target.getDiscordID() : ChatColor.RED + "not set"));
msg(ChatColor.GRAY + "Backup Codes: " + data.getBackupCodes().size() + "/" + "10");
return true;
+ }
case "genbackupcodes":
+ {
if (!plugin.dc.enabled)
{
msg("The Discord verification system is currently disabled.", ChatColor.RED);
@@ -130,11 +137,12 @@ public class Command_playerverification extends FreedomCommand
msg("Failed to generate backup codes, please contact a developer (preferably Seth)", ChatColor.RED);
}
return true;
-
+ }
default:
return false;
}
}
+
@Override
public List getTabCompleteOptions(CommandSender sender, Command command, String alias, String[] args)
{
@@ -145,4 +153,4 @@ public class Command_playerverification extends FreedomCommand
return Collections.emptyList();
}
-}
+}
\ No newline at end of file
diff --git a/src/main/java/me/totalfreedom/totalfreedommod/command/Command_playtime.java b/src/main/java/me/totalfreedom/totalfreedommod/command/Command_playtime.java
index 88b571d5..fc8da0e6 100644
--- a/src/main/java/me/totalfreedom/totalfreedommod/command/Command_playtime.java
+++ b/src/main/java/me/totalfreedom/totalfreedommod/command/Command_playtime.java
@@ -4,7 +4,7 @@ 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.admin.ActivityLogEntry;
import me.totalfreedom.totalfreedommod.util.FUtil;
import org.bukkit.command.Command;
import org.bukkit.command.CommandSender;
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..b49f4b8c 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();
}
@@ -190,4 +190,4 @@ public class Command_plugincontrol extends FreedomCommand
}
return null;
}
-}
+}
\ No newline at end of file
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..999455a9 100644
--- a/src/main/java/me/totalfreedom/totalfreedommod/command/Command_potion.java
+++ b/src/main/java/me/totalfreedom/totalfreedommod/command/Command_potion.java
@@ -18,7 +18,7 @@ import org.bukkit.potion.PotionEffectType;
@CommandParameters(
description = "Manipulate your potion effects. Duration is measured in server ticks (~20 ticks per second).",
usage = "/ [target name]>",
- aliases="effect")
+ aliases = "effect")
public class Command_potion extends FreedomCommand
{
@@ -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())
@@ -62,11 +62,11 @@ public class Command_potion extends FreedomCommand
if (args[0].equalsIgnoreCase("clear"))
{
Player target = playerSender;
- if(args.length == 2)
+ 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();
}
@@ -213,9 +213,9 @@ public class Command_potion extends FreedomCommand
return Arrays.asList("");
}
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..0de7c639 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":
@@ -115,7 +115,7 @@ public class Command_potionspy extends FreedomCommand
if (thrownPotions.isEmpty())
{
- if(Bukkit.getPlayer(args[1]) != null)
+ if (Bukkit.getPlayer(args[1]) != null)
{
msg(sender, noPlayerRecord);
}
@@ -176,18 +176,19 @@ 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."));
}
/**
* Get the unix time difference in string format (1h, 30m, 15s).
+ *
* @param past The unix time at the start.
- * @param now The current unix time.
+ * @param now The current unix time.
* @return A string that displays the time difference between the two unix time values.
*/
private String getUnixTimeDifference(long past, long now)
@@ -219,4 +220,4 @@ public class Command_potionspy extends FreedomCommand
}
}
}
-}
+}
\ No newline at end of file
diff --git a/src/main/java/me/totalfreedom/totalfreedommod/command/Command_premium.java b/src/main/java/me/totalfreedom/totalfreedommod/command/Command_premium.java
index d0dae66b..b883f3c3 100644
--- a/src/main/java/me/totalfreedom/totalfreedommod/command/Command_premium.java
+++ b/src/main/java/me/totalfreedom/totalfreedommod/command/Command_premium.java
@@ -21,15 +21,21 @@ public class Command_premium extends FreedomCommand
public boolean run(CommandSender sender, Player playerSender, Command cmd, String commandLabel, String[] args, boolean senderIsConsole)
{
if (args.length != 1)
+ {
return false;
+ }
final Player player = getPlayer(args[0]);
final String name;
if (player != null)
+ {
name = player.getName();
+ }
else
+ {
name = args[0];
+ }
new BukkitRunnable()
{
@@ -49,16 +55,20 @@ public class Command_premium extends FreedomCommand
try
{
if (urlConnection.getResponseCode() == 200)
+ {
message = ChatColor.GREEN + "Yes";
+ }
else
- message = ChatColor.RED + "No";
+ {
+ message = ChatColor.RED + "No";
+ }
FSync.playerMsg(sender, "Player " + name + " is premium: " + message);
}
catch (IOException e)
{
- FSync.playerMsg(sender, ChatColor.RED + "There was an error on trying to connect to the API server");
+ FSync.playerMsg(sender, ChatColor.RED + "There was an error on trying to connect to the API server");
}
-
+
}
catch (IOException ex)
{
@@ -70,4 +80,4 @@ public class Command_premium extends FreedomCommand
return true;
}
-}
+}
\ No newline at end of file
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_rank.java b/src/main/java/me/totalfreedom/totalfreedommod/command/Command_rank.java
index ab7e02bb..be356d1b 100644
--- a/src/main/java/me/totalfreedom/totalfreedommod/command/Command_rank.java
+++ b/src/main/java/me/totalfreedom/totalfreedommod/command/Command_rank.java
@@ -54,16 +54,14 @@ public class Command_rank extends FreedomCommand
Rank rank = plugin.rm.getRank(player);
StringBuilder sb = new StringBuilder();
- sb
- .append(ChatColor.AQUA)
+ sb.append(ChatColor.AQUA)
.append(player.getName())
.append(" is ")
.append(display.getColoredLoginMessage());
if (rank != display)
{
- sb
- .append(ChatColor.AQUA)
+ sb.append(ChatColor.AQUA)
.append(" (")
.append(rank.getColoredName())
.append(ChatColor.AQUA)
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..086bac6c 100644
--- a/src/main/java/me/totalfreedom/totalfreedommod/command/Command_report.java
+++ b/src/main/java/me/totalfreedom/totalfreedommod/command/Command_report.java
@@ -9,7 +9,7 @@ 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
{
@@ -38,9 +38,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_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 60%
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 9915f401..20d85c05 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,8 +18,8 @@ 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 admin information.", usage = "/ | >", aliases = "slconfig")
+public class Command_saconfig extends FreedomCommand
{
@Override
@@ -34,7 +34,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 +43,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 the admin list", true);
+ plugin.al.deactivateOldEntries(true);
+ msg("Admins: " + StringUtils.join(plugin.al.getAdminNames(), ", "), ChatColor.GOLD);
return true;
}
@@ -54,9 +54,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;
}
@@ -89,19 +89,19 @@ public class Command_slconfig extends FreedomCommand
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 +109,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 +127,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 +160,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 +169,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 +201,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();
+ String oldName = admin.getName();
if (oldName != 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 +241,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 +275,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 +318,13 @@ public class Command_slconfig extends FreedomCommand
{
List arguments = new ArrayList<>();
arguments.add("list");
- if (plugin.sl.isStaff(sender))
+ if (plugin.al.isAdmin(sender))
{
arguments.add("info");
- }
- if (plugin.sl.isMod(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
index 53e93c75..719b5ee2 100644
--- a/src/main/java/me/totalfreedom/totalfreedommod/command/Command_scare.java
+++ b/src/main/java/me/totalfreedom/totalfreedommod/command/Command_scare.java
@@ -53,7 +53,7 @@ public class Command_scare 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 FUtil.getPlayerList();
}
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..e7790ca1 100644
--- a/src/main/java/me/totalfreedom/totalfreedommod/command/Command_serverstats.java
+++ b/src/main/java/me/totalfreedom/totalfreedommod/command/Command_serverstats.java
@@ -8,7 +8,7 @@ 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
{
@@ -17,7 +17,7 @@ public class Command_serverstats extends FreedomCommand
{
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_setcompass.java b/src/main/java/me/totalfreedom/totalfreedommod/command/Command_setcompass.java
index 898dc139..aeafe711 100644
--- a/src/main/java/me/totalfreedom/totalfreedommod/command/Command_setcompass.java
+++ b/src/main/java/me/totalfreedom/totalfreedommod/command/Command_setcompass.java
@@ -15,7 +15,6 @@ public class Command_setcompass extends FreedomCommand
@Override
public boolean run(CommandSender sender, Player playerSender, Command cmd, String commandLabel, String[] args, boolean senderIsConsole)
{
-
if (args.length < 3)
{
return false;
@@ -23,7 +22,7 @@ public class Command_setcompass extends FreedomCommand
try
{
- Location location = new Location(playerSender.getWorld(), Integer.valueOf(args[0]), Integer.valueOf(args[1]), Integer.valueOf(args[2]));
+ Location location = new Location(playerSender.getWorld(), Integer.parseInt(args[0]), Integer.parseInt(args[1]), Integer.parseInt(args[2]));
playerSender.setCompassTarget(location);
msg("Successfully set your compass coordinates to X: " + args[0] + ", Y: " + args[1] + ", Z: " + args[2] + ".", ChatColor.GREEN);
}
@@ -34,4 +33,4 @@ public class Command_setcompass extends FreedomCommand
return true;
}
-}
+}
\ No newline at end of file
diff --git a/src/main/java/me/totalfreedom/totalfreedommod/command/Command_setlevel.java b/src/main/java/me/totalfreedom/totalfreedommod/command/Command_setlevel.java
index f0388f12..551c09d4 100644
--- a/src/main/java/me/totalfreedom/totalfreedommod/command/Command_setlevel.java
+++ b/src/main/java/me/totalfreedom/totalfreedommod/command/Command_setlevel.java
@@ -42,8 +42,8 @@ public class Command_setlevel extends FreedomCommand
playerSender.setLevel(new_level);
- msg("Your XP level is now set to " + ChatColor.GOLD + Integer.toString(new_level));
+ msg("Your XP level is now set to " + ChatColor.GOLD + new_level);
return true;
}
-}
+}
\ No newline at end of file
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..bfe9511e 100644
--- a/src/main/java/me/totalfreedom/totalfreedommod/command/Command_setlimit.java
+++ b/src/main/java/me/totalfreedom/totalfreedommod/command/Command_setlimit.java
@@ -43,8 +43,8 @@ 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;
}
-}
+}
\ No newline at end of file
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..bbc22bd0 100644
--- a/src/main/java/me/totalfreedom/totalfreedommod/command/Command_setplayerlimit.java
+++ b/src/main/java/me/totalfreedom/totalfreedommod/command/Command_setplayerlimit.java
@@ -59,8 +59,8 @@ 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;
}
-}
+}
\ No newline at end of file
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..04d7b3cf 100644
--- a/src/main/java/me/totalfreedom/totalfreedommod/command/Command_settotalvotes.java
+++ b/src/main/java/me/totalfreedom/totalfreedommod/command/Command_settotalvotes.java
@@ -27,14 +27,14 @@ public class Command_settotalvotes extends FreedomCommand
return false;
}
- int votes = 0;
+ int votes;
try
{
votes = Integer.parseInt(args[0]);
}
catch (NumberFormatException e)
{
- msg("Invalid number: " + args[0]);
+ msg("Invalid number: " + args[0]);
return true;
}
@@ -60,4 +60,4 @@ public class Command_settotalvotes extends FreedomCommand
return true;
}
-}
+}
\ No newline at end of file
diff --git a/src/main/java/me/totalfreedom/totalfreedommod/command/Command_sit.java b/src/main/java/me/totalfreedom/totalfreedommod/command/Command_sit.java
index 6ef233dd..f54b677d 100644
--- a/src/main/java/me/totalfreedom/totalfreedommod/command/Command_sit.java
+++ b/src/main/java/me/totalfreedom/totalfreedommod/command/Command_sit.java
@@ -21,7 +21,8 @@ public class Command_sit extends FreedomCommand
{
return false;
}
- ArmorStand stand = (ArmorStand) playerSender.getWorld().spawnEntity(playerSender.getLocation().clone().subtract(0.0, 1.7, 0.0), EntityType.ARMOR_STAND);
+
+ 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);
@@ -31,4 +32,4 @@ public class Command_sit extends FreedomCommand
msg("You are now sitting.");
return true;
}
-}
+}
\ No newline at end of file
diff --git a/src/main/java/me/totalfreedom/totalfreedommod/command/Command_spawnmob.java b/src/main/java/me/totalfreedom/totalfreedommod/command/Command_spawnmob.java
index d27eea10..cf9f0866 100644
--- a/src/main/java/me/totalfreedom/totalfreedommod/command/Command_spawnmob.java
+++ b/src/main/java/me/totalfreedom/totalfreedommod/command/Command_spawnmob.java
@@ -77,7 +77,7 @@ public class Command_spawnmob extends FreedomCommand
return true;
}
- Location l = playerSender.getTargetBlock((Set)null, 30).getLocation().add(0, 1, 0);
+ Location l = playerSender.getTargetBlock(null, 30).getLocation().add(0, 1, 0);
World w = playerSender.getWorld();
msg("Spawning " + amount + " " + type.name().toLowerCase() + (amount > 1 ? "s." : "."));
@@ -87,5 +87,4 @@ public class Command_spawnmob extends FreedomCommand
}
return true;
}
-
-}
+}
\ No newline at end of file
diff --git a/src/main/java/me/totalfreedom/totalfreedommod/command/Command_spectator.java b/src/main/java/me/totalfreedom/totalfreedommod/command/Command_spectator.java
index aa611eb1..43fe0c1d 100644
--- a/src/main/java/me/totalfreedom/totalfreedommod/command/Command_spectator.java
+++ b/src/main/java/me/totalfreedom/totalfreedommod/command/Command_spectator.java
@@ -38,7 +38,6 @@ public class Command_spectator extends FreedomCommand
msg("Setting " + player.getName() + " to game mode spectator");
msg(player, sender.getName() + " set your game mode to spectator");
player.setGameMode(GameMode.SPECTATOR);
-
return true;
}
-}
+}
\ No newline at end of file
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..cf8de4a5 100644
--- a/src/main/java/me/totalfreedom/totalfreedommod/command/Command_tag.java
+++ b/src/main/java/me/totalfreedom/totalfreedommod/command/Command_tag.java
@@ -41,238 +41,252 @@ public class Command_tag extends FreedomCommand
if (args.length == 1)
{
-
- if ("list".equalsIgnoreCase(args[0]))
+ switch (args[0].toLowerCase())
{
- msg("Tags for all online players:");
-
- for (final Player player : server.getOnlinePlayers())
+ case "list":
{
- if (plugin.sl.isVanished(player.getName()) && !plugin.sl.isStaff(sender))
- {
- continue;
- }
- final FPlayer playerdata = plugin.pl.getPlayer(player);
- if (playerdata.getTag() != null)
- {
- msg(player.getName() + ": " + playerdata.getTag());
- }
- }
+ msg("Tags for all online players:");
- return true;
- }
- else if ("clearall".equalsIgnoreCase(args[0]))
- {
- if (!plugin.sl.isStaff(sender))
- {
- noPerms();
+ for (final Player player : server.getOnlinePlayers())
+ {
+ if (plugin.al.isVanished(player.getName()) && !plugin.al.isAdmin(sender))
+ {
+ continue;
+ }
+
+ final FPlayer playerdata = plugin.pl.getPlayer(player);
+ if (playerdata.getTag() != null)
+ {
+ msg(player.getName() + ": " + playerdata.getTag());
+ }
+ }
return true;
}
- FUtil.staffAction(sender.getName(), "Removing all tags", false);
-
- int count = 0;
- for (final Player player : server.getOnlinePlayers())
+ case "clearall":
{
- final FPlayer playerdata = plugin.pl.getPlayer(player);
- if (playerdata.getTag() != null)
+ if (!plugin.al.isAdmin(sender))
{
- count++;
- playerdata.setTag(null);
+ noPerms();
+ return true;
}
- }
- msg(count + " tag(s) removed.");
+ FUtil.adminAction(sender.getName(), "Removing all tags", false);
- return true;
- }
- else if ("off".equalsIgnoreCase(args[0]))
- {
- if (senderIsConsole)
- {
- msg("\"/tag off\" can't be used from the console. Use \"/tag clear \" or \"/tag clearall\" instead.");
- }
- else
- {
- plugin.pl.getPlayer(playerSender).setTag(null);
- if (save)
+ int count = 0;
+ for (final Player player : server.getOnlinePlayers())
{
- save(playerSender, null);
+ final FPlayer playerdata = plugin.pl.getPlayer(player);
+ if (playerdata.getTag() != null)
+ {
+ count++;
+ playerdata.setTag(null);
+ }
}
- msg("Your tag has been removed." + (save ? " (Saved)" : ""));
+
+ msg(count + " tag(s) removed.");
+ return true;
}
- return true;
- }
- else
- {
- return false;
+ case "off":
+ {
+ if (senderIsConsole)
+ {
+ msg("\"/tag off\" can't be used from the console. Use \"/tag clear \" or \"/tag clearall\" instead.");
+ }
+ else
+ {
+ plugin.pl.getPlayer(playerSender).setTag(null);
+
+ if (save)
+ {
+ save(playerSender, null);
+ }
+
+ msg("Your tag has been removed." + (save ? " (Saved)" : ""));
+ }
+ return true;
+ }
+ /*
+ {
+ return false;
+ }*/
}
}
else if (args.length >= 2)
{
- if ("clear".equalsIgnoreCase(args[0]))
+ switch (args[0].toLowerCase())
{
- if (!plugin.sl.isStaff(sender))
+ case "clear":
{
- noPerms();
- return true;
- }
-
- final Player player = getPlayer(args[1]);
-
- if (player == null)
- {
- msg(FreedomCommand.PLAYER_NOT_FOUND);
- return true;
- }
-
- plugin.pl.getPlayer(player).setTag(null);
- if (save)
- {
- save(player, null);
- }
- msg("Removed " + player.getName() + "'s tag." + (save ? " (Saved)" : ""));
-
- return true;
- }
- else if ("set".equalsIgnoreCase(args[0]))
- {
- if (senderIsConsole)
- {
- msg("\"/tag set\" can't be used from the console.");
- return true;
- }
-
- final String inputTag = StringUtils.join(args, " ", 1, args.length);
- final String strippedTag = StringUtils.replaceEachRepeatedly(StringUtils.strip(inputTag),
- new String[]
- {
- "" + ChatColor.COLOR_CHAR, "&k"
- },
- new String[]
- {
- "", ""
- });
- final String outputTag = FUtil.colorize(strippedTag);
-
- int tagLimit = (plugin.sl.isStaff(sender) ? 30 : 20);
-
- final String rawTag = ChatColor.stripColor(outputTag).toLowerCase();
-
- if (rawTag.length() > tagLimit)
- {
- msg("That tag is too long (Max is " + tagLimit + " characters).");
- return true;
- }
-
- if (!plugin.sl.isStaff(sender))
- {
- for (String word : FORBIDDEN_WORDS)
+ if (!plugin.al.isAdmin(sender))
{
- if (rawTag.contains(word))
+ noPerms();
+ return true;
+ }
+
+ final Player player = getPlayer(args[1]);
+
+ if (player == null)
+ {
+ msg(FreedomCommand.PLAYER_NOT_FOUND);
+ return true;
+ }
+
+ plugin.pl.getPlayer(player).setTag(null);
+ if (save)
+ {
+ save(player, null);
+ }
+
+ msg("Removed " + player.getName() + "'s tag." + (save ? " (Saved)" : ""));
+ return true;
+ }
+
+ case "set":
+ {
+ if (senderIsConsole)
+ {
+ msg("\"/tag set\" can't be used from the console.");
+ return true;
+ }
+
+ final String inputTag = StringUtils.join(args, " ", 1, args.length);
+ final String strippedTag = StringUtils.replaceEachRepeatedly(StringUtils.strip(inputTag),
+ new String[]
+ {
+ "" + ChatColor.COLOR_CHAR, "&k"
+ },
+ new String[]
+ {
+ "", ""
+ });
+
+ final String outputTag = FUtil.colorize(strippedTag);
+ int tagLimit = (plugin.al.isAdmin(sender) ? 30 : 20);
+ final String rawTag = ChatColor.stripColor(outputTag).toLowerCase();
+
+ if (rawTag.length() > tagLimit)
+ {
+ msg("That tag is too long (Max is " + tagLimit + " characters).");
+ return true;
+ }
+
+ if (!plugin.al.isAdmin(sender))
+ {
+ for (String word : FORBIDDEN_WORDS)
{
- msg("That tag contains a forbidden word.");
- return true;
+ if (rawTag.contains(word))
+ {
+ msg("That tag contains a forbidden word.");
+ return true;
+ }
}
}
- }
- plugin.pl.getPlayer(playerSender).setTag(outputTag);
- if (save)
- {
- save(playerSender, strippedTag);
- }
- msg("Tag set to '" + outputTag + ChatColor.GRAY + "'." + (save ? " (Saved)" : ""));
+ plugin.pl.getPlayer(playerSender).setTag(outputTag);
- return true;
- }
- else if (args[0].equalsIgnoreCase("gradient"))
- {
- if (senderIsConsole)
- {
- msg("\"/tag gradient\" can't be used from the console.");
- return true;
- }
-
- String from = "", to = "";
- java.awt.Color awt1, awt2;
- try
- {
- if (args[1].equalsIgnoreCase("random") ||
- args[1].equalsIgnoreCase("r"))
+ if (save)
{
- awt1 = FUtil.getRandomAWTColor();
- from = " (From: " + FUtil.getHexStringOfAWTColor(awt1) + ")";
+ save(playerSender, strippedTag);
}
- else
- awt1 = java.awt.Color.decode(args[1]);
- if (args[2].equalsIgnoreCase("random") ||
- args[2].equalsIgnoreCase("r"))
+
+ msg("Tag set to '" + outputTag + ChatColor.GRAY + "'." + (save ? " (Saved)" : ""));
+ return true;
+ }
+
+ case "gradient":
+ {
+ if (senderIsConsole)
{
- awt2 = FUtil.getRandomAWTColor();
- to = " (To: " + FUtil.getHexStringOfAWTColor(awt2) + ")";
+ msg("\"/tag gradient\" can't be used from the console.");
+ return true;
}
- else
- awt2 = java.awt.Color.decode(args[2]);
- }
- catch (NumberFormatException ex)
- {
- msg("Invalid hex values.");
- return true;
- }
- Color c1 = FUtil.fromAWT(awt1);
- Color c2 = FUtil.fromAWT(awt2);
- String tag = StringUtils.join(args, " ", 3, args.length);
- List gradient = FUtil.createColorGradient(c1, c2, tag.length());
- String[] splitTag = tag.split("");
- for (int i = 0; i < splitTag.length; i++)
- {
- splitTag[i] = net.md_5.bungee.api.ChatColor.of(FUtil.toAWT(gradient.get(i))) + splitTag[i];
- }
- tag = StringUtils.join(splitTag, "");
- final String outputTag = FUtil.colorize(tag);
- int tagLimit = (plugin.sl.isStaff(sender) ? 30 : 20);
-
- final String rawTag = ChatColor.stripColor(outputTag).toLowerCase();
-
- if (rawTag.length() > tagLimit)
- {
- msg("That tag is too long (Max is " + tagLimit + " characters).");
- return true;
- }
-
- if (!plugin.sl.isStaff(sender))
- {
- for (String word : FORBIDDEN_WORDS)
+ String from = "", to = "";
+ java.awt.Color awt1, awt2;
+ try
{
- if (rawTag.contains(word))
+ if (args[1].equalsIgnoreCase("random") || args[1].equalsIgnoreCase("r"))
{
- msg("That tag contains a forbidden word.");
- return true;
+ awt1 = FUtil.getRandomAWTColor();
+ from = " (From: " + FUtil.getHexStringOfAWTColor(awt1) + ")";
+ }
+ else
+ {
+ awt1 = java.awt.Color.decode(args[1]);
+ }
+
+ if (args[2].equalsIgnoreCase("random") || args[2].equalsIgnoreCase("r"))
+ {
+ awt2 = FUtil.getRandomAWTColor();
+ to = " (To: " + FUtil.getHexStringOfAWTColor(awt2) + ")";
+ }
+ else
+ {
+ awt2 = java.awt.Color.decode(args[2]);
}
}
+ catch (NumberFormatException ex)
+ {
+ msg("Invalid hex values.");
+ return true;
+ }
+
+ Color c1 = FUtil.fromAWT(awt1);
+ Color c2 = FUtil.fromAWT(awt2);
+ String tag = StringUtils.join(args, " ", 3, args.length);
+ List gradient = FUtil.createColorGradient(c1, c2, tag.length());
+ String[] splitTag = tag.split("");
+
+ for (int i = 0; i < splitTag.length; i++)
+ {
+ splitTag[i] = net.md_5.bungee.api.ChatColor.of(FUtil.toAWT(gradient.get(i))) + splitTag[i];
+ }
+
+ tag = StringUtils.join(splitTag, "");
+ final String outputTag = FUtil.colorize(tag);
+
+ int tagLimit = (plugin.al.isAdmin(sender) ? 30 : 20);
+
+ final String rawTag = ChatColor.stripColor(outputTag).toLowerCase();
+
+ if (rawTag.length() > tagLimit)
+ {
+ msg("That tag is too long (Max is " + tagLimit + " characters).");
+ return true;
+ }
+
+ if (!plugin.al.isAdmin(sender))
+ {
+ for (String word : FORBIDDEN_WORDS)
+ {
+ if (rawTag.contains(word))
+ {
+ msg("That tag contains a forbidden word.");
+ return true;
+ }
+ }
+ }
+
+ plugin.pl.getPlayer(playerSender).setTag(outputTag);
+
+ if (save)
+ {
+ save(playerSender, tag);
+ }
+
+ msg("Tag set to '" + outputTag + ChatColor.GRAY + "'." + (save ? " (Saved)" : "") + from + to);
+ return true;
}
- plugin.pl.getPlayer(playerSender).setTag(outputTag);
- if (save)
+ default:
{
- save(playerSender, tag);
+ return false;
}
- msg("Tag set to '" + outputTag + ChatColor.GRAY + "'." + (save ? " (Saved)" : "") + from + to);
-
- return true;
- }
- else
- {
- return false;
}
}
- else
- {
- return false;
- }
+ return true;
}
public void save(Player player, String tag)
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..a59d3447 100644
--- a/src/main/java/me/totalfreedom/totalfreedommod/command/Command_tagnyan.java
+++ b/src/main/java/me/totalfreedom/totalfreedommod/command/Command_tagnyan.java
@@ -31,17 +31,17 @@ 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();
if (rawTag.length() > tagLimit)
{
- msg("That tag is too long (Max is " + String.valueOf(tagLimit) + " characters).");
+ msg("That tag is too long (Max is " + tagLimit + " characters).");
return true;
}
- if (!plugin.sl.isStaff(sender))
+ if (!plugin.al.isAdmin(sender))
{
for (String word : Command_tag.FORBIDDEN_WORDS)
{
@@ -57,7 +57,6 @@ public class Command_tagnyan extends FreedomCommand
data.setTag(tagStr);
msg("Set tag to " + tag);
-
return true;
}
-}
+}
\ No newline at end of file
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..fb4afa1f 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();
@@ -44,9 +44,7 @@ public class Command_tagrainbow extends FreedomCommand
}
plugin.pl.getPlayer(playerSender).setTag(FUtil.rainbowify(tag));
-
msg("Set tag to " + tag);
-
return true;
}
}
\ No newline at end of file
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..c29a14c0 100644
--- a/src/main/java/me/totalfreedom/totalfreedommod/command/Command_toggle.java
+++ b/src/main/java/me/totalfreedom/totalfreedommod/command/Command_toggle.java
@@ -111,7 +111,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;
}
@@ -308,7 +308,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();
}
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..30a3fb28 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;
}
-}
+}
\ No newline at end of file
diff --git a/src/main/java/me/totalfreedom/totalfreedommod/command/Command_tossmob.java b/src/main/java/me/totalfreedom/totalfreedommod/command/Command_tossmob.java
index c9c69043..aea33cf8 100644
--- a/src/main/java/me/totalfreedom/totalfreedommod/command/Command_tossmob.java
+++ b/src/main/java/me/totalfreedom/totalfreedommod/command/Command_tossmob.java
@@ -43,7 +43,7 @@ public class Command_tossmob extends FreedomCommand
if (args[0].equalsIgnoreCase("off"))
{
playerData.disableMobThrower();
- msg("MobThrower is disabled.", ChatColor.GREEN);
+ msg("Turned off.", ChatColor.GREEN);
return true;
}
@@ -106,6 +106,7 @@ public class Command_tossmob extends FreedomCommand
playerSender.getEquipment().setItemInMainHand(new ItemStack(Material.BONE, 1));
return true;
}
+
public static List getAllMobNames()
{
List names = new ArrayList<>();
@@ -115,4 +116,4 @@ public class Command_tossmob extends FreedomCommand
}
return names;
}
-}
+}
\ No newline at end of file
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..aad66572 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;
@@ -68,4 +68,4 @@ public class Command_totalfreedommod extends FreedomCommand
return true;
}
-}
+}
\ No newline at end of file
diff --git a/src/main/java/me/totalfreedom/totalfreedommod/command/Command_trail.java b/src/main/java/me/totalfreedom/totalfreedommod/command/Command_trail.java
index 2e21bcda..44129bd4 100644
--- a/src/main/java/me/totalfreedom/totalfreedommod/command/Command_trail.java
+++ b/src/main/java/me/totalfreedom/totalfreedommod/command/Command_trail.java
@@ -26,5 +26,4 @@ public class Command_trail extends FreedomCommand
return true;
}
-
-}
+}
\ No newline at end of file
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..d1327381 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));
@@ -64,4 +64,4 @@ public class Command_unban extends FreedomCommand
}
return false;
}
-}
+}
\ No newline at end of file
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..ba510c73 100644
--- a/src/main/java/me/totalfreedom/totalfreedommod/command/Command_undisguiseall.java
+++ b/src/main/java/me/totalfreedom/totalfreedommod/command/Command_undisguiseall.java
@@ -26,10 +26,10 @@ public class Command_undisguiseall extends FreedomCommand
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;
}
-}
+}
\ No newline at end of file
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..922db3a4 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)
@@ -47,4 +47,4 @@ public class Command_unlinkdiscord extends FreedomCommand
msg("Your Minecraft account has been successfully unlinked from the Discord account.", ChatColor.GREEN);
return true;
}
-}
+}
\ No newline at end of file
diff --git a/src/main/java/me/totalfreedom/totalfreedommod/command/Command_unlinkreddit.java b/src/main/java/me/totalfreedom/totalfreedommod/command/Command_unlinkreddit.java
index b52e2ef5..b71c8636 100644
--- a/src/main/java/me/totalfreedom/totalfreedommod/command/Command_unlinkreddit.java
+++ b/src/main/java/me/totalfreedom/totalfreedommod/command/Command_unlinkreddit.java
@@ -38,4 +38,4 @@ public class Command_unlinkreddit extends FreedomCommand
return true;
}
-}
+}
\ No newline at end of file
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..b14b0b68 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."));
}
@@ -88,24 +88,24 @@ public class Command_vanish extends FreedomCommand
}
else
{
- msg ("You have vanished.", ChatColor.GOLD);
+ msg("You have vanished.", ChatColor.GOLD);
FUtil.bcastMsg(playerSender.getName() + " left the game.", ChatColor.YELLOW);
plugin.dc.messageChatChannel("**" + playerSender.getName() + " left the server" + "**");
}
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..b215a4ef 100644
--- a/src/main/java/me/totalfreedom/totalfreedommod/command/Command_verify.java
+++ b/src/main/java/me/totalfreedom/totalfreedommod/command/Command_verify.java
@@ -10,7 +10,7 @@ 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
{
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 69%
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..bf9a9847 100644
--- a/src/main/java/me/totalfreedom/totalfreedommod/command/Command_verifynostaff.java
+++ b/src/main/java/me/totalfreedom/totalfreedommod/command/Command_verifynoadmin.java
@@ -12,8 +12,8 @@ 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 = "vns,verifynostaff,vna")
+public class Command_verifynoadmin extends FreedomCommand
{
@Override
@@ -32,32 +32,31 @@ 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_warn.java b/src/main/java/me/totalfreedom/totalfreedommod/command/Command_warn.java
index 08cc2bb2..827a5b04 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..2ffc1b6b 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,13 +98,13 @@ 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;
}
// remove
- if ("remove".equals(args[0]))
+ if (args[0].equalsIgnoreCase("remove"))
{
if (args.length < 2)
{
@@ -122,21 +122,20 @@ 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;
}
else
{
msg("That player is not whitelisted");
- return true;
}
+ return true;
}
// 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())
{
@@ -158,7 +157,7 @@ public class Command_whitelist extends FreedomCommand
// 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 +171,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 +181,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"))
{
@@ -206,4 +205,4 @@ public class Command_whitelist extends FreedomCommand
}
return names;
}
-}
+}
\ No newline at end of file
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..42ddf20c 100644
--- a/src/main/java/me/totalfreedom/totalfreedommod/command/Command_wiperegions.java
+++ b/src/main/java/me/totalfreedom/totalfreedommod/command/Command_wiperegions.java
@@ -40,15 +40,14 @@ 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;
}
else
{
msg(ChatColor.RED + "No regions were found in \"" + world.getName() + "\"");
- return true;
}
+ return true;
}
public List getAllWorldNames()
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..5efcca19 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 world player data", 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;
}
@@ -37,9 +37,9 @@ public class Command_wipeuserdata extends FreedomCommand
FUtil.deleteFolder(new File(Bukkit.getServer().getWorld(plugin.wm.flatlands.getName()).getWorldFolder().getName() + "stats"));
FUtil.deleteFolder(new File(Bukkit.getServer().getWorld(w.getName()).getWorldFolder().getName() + "stats"));
FUtil.deleteFolder(new File(Bukkit.getServer().getWorld(w.getName()).getWorldFolder().getName() + "playerdata"));
- msg("All playerdata deleted.");
+ msg("Deleted all player data.");
return true;
}
return false;
}
-}
+}
\ No newline at end of file
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..e9116d88 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()
@@ -270,7 +270,7 @@ public abstract class FreedomCommand implements CommandExecutor, TabCompleter
{
try
{
- boolean run = run(sender, sender instanceof ConsoleCommandSender ? null : (Player) sender, cmd, commandLabel, args, sender instanceof ConsoleCommandSender);
+ boolean run = run(sender, sender instanceof ConsoleCommandSender ? null : (Player)sender, cmd, commandLabel, args, sender instanceof ConsoleCommandSender);
if (!run)
{
msg(ChatColor.WHITE + cmd.getUsage().replace("", cmd.getLabel()));
@@ -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)
@@ -348,7 +348,7 @@ public abstract class FreedomCommand implements CommandExecutor, TabCompleter
{
try
{
- return (FreedomCommand) (((PluginCommand) command).getExecutor());
+ return (FreedomCommand)(((PluginCommand)command).getExecutor());
}
catch (Exception ex)
{
diff --git a/src/main/java/me/totalfreedom/totalfreedommod/config/ConfigEntry.java b/src/main/java/me/totalfreedom/totalfreedommod/config/ConfigEntry.java
index 64fd5259..bc86279f 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"),
@@ -119,8 +119,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"),
@@ -166,8 +166,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/config/IConfig.java b/src/main/java/me/totalfreedom/totalfreedommod/config/IConfig.java
index 8da9901e..4773a682 100644
--- a/src/main/java/me/totalfreedom/totalfreedommod/config/IConfig.java
+++ b/src/main/java/me/totalfreedom/totalfreedommod/config/IConfig.java
@@ -5,6 +5,8 @@ import org.bukkit.configuration.ConfigurationSection;
public interface IConfig
{
void loadFrom(ConfigurationSection cs);
+
void saveTo(ConfigurationSection cs);
+
boolean isValid();
-}
+}
\ No newline at end of file
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..169b9d43 100644
--- a/src/main/java/me/totalfreedom/totalfreedommod/discord/DiscordToAdminChatListener.java
+++ b/src/main/java/me/totalfreedom/totalfreedommod/discord/DiscordToAdminChatListener.java
@@ -17,6 +17,7 @@ import org.bukkit.entity.Player;
public class DiscordToAdminChatListener extends ListenerAdapter
{
DiscordToMinecraftListener dtml = new DiscordToMinecraftListener();
+
public void onMessageReceived(MessageReceivedEvent event)
{
String chat_channel_id = ConfigEntry.DISCORD_ADMINCHAT_CHANNEL_ID.getString();
@@ -26,7 +27,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 +57,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());
}
@@ -65,4 +66,4 @@ public class DiscordToAdminChatListener extends ListenerAdapter
}
}
}
-}
+}
\ No newline at end of file
diff --git a/src/main/java/me/totalfreedom/totalfreedommod/discord/PrivateMessageListener.java b/src/main/java/me/totalfreedom/totalfreedommod/discord/PrivateMessageListener.java
index 63cd4c80..9c82a81e 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);
@@ -41,4 +41,4 @@ public class PrivateMessageListener extends ListenerAdapter
}
}
}
-}
+}
\ No newline at end of file
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..6dfa2594 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;
}
@@ -67,5 +67,4 @@ public class Freezer extends FreedomService
event.setTo(loc);
}
-
-}
+}
\ No newline at end of file
diff --git a/src/main/java/me/totalfreedom/totalfreedommod/fun/CurseListener.java b/src/main/java/me/totalfreedom/totalfreedommod/fun/CurseListener.java
index 50a8f0c4..6477ff5b 100644
--- a/src/main/java/me/totalfreedom/totalfreedommod/fun/CurseListener.java
+++ b/src/main/java/me/totalfreedom/totalfreedommod/fun/CurseListener.java
@@ -49,5 +49,4 @@ public class CurseListener extends FreedomService
cursedPlayers.remove(player);
}
}
-
-}
+}
\ No newline at end of file
diff --git a/src/main/java/me/totalfreedom/totalfreedommod/fun/Jumppads.java b/src/main/java/me/totalfreedom/totalfreedommod/fun/Jumppads.java
index 4cd6269b..523f9540 100644
--- a/src/main/java/me/totalfreedom/totalfreedommod/fun/Jumppads.java
+++ b/src/main/java/me/totalfreedom/totalfreedommod/fun/Jumppads.java
@@ -41,7 +41,7 @@ public class Jumppads extends FreedomService
@EventHandler
public void onPlayerJoin(PlayerJoinEvent event)
{
- if(!players.containsKey(event.getPlayer()))
+ if (!players.containsKey(event.getPlayer()))
{
players.put(event.getPlayer(), JumpPadMode.OFF);
}
diff --git a/src/main/java/me/totalfreedom/totalfreedommod/fun/Landminer.java b/src/main/java/me/totalfreedom/totalfreedommod/fun/Landminer.java
index 07853dda..f3896d07 100644
--- a/src/main/java/me/totalfreedom/totalfreedommod/fun/Landminer.java
+++ b/src/main/java/me/totalfreedom/totalfreedommod/fun/Landminer.java
@@ -118,5 +118,4 @@ public class Landminer extends FreedomService
return this.location.toString() + ", " + this.radius + ", " + this.planter.getName();
}
}
-
-}
+}
\ No newline at end of file
diff --git a/src/main/java/me/totalfreedom/totalfreedommod/fun/MP44.java b/src/main/java/me/totalfreedom/totalfreedommod/fun/MP44.java
index a961d505..33e631eb 100644
--- a/src/main/java/me/totalfreedom/totalfreedommod/fun/MP44.java
+++ b/src/main/java/me/totalfreedom/totalfreedommod/fun/MP44.java
@@ -22,5 +22,4 @@ public class MP44 extends FreedomService
{
plugin.pl.getPlayer(event.getPlayer()).disarmMP44();
}
-
-}
+}
\ No newline at end of file
diff --git a/src/main/java/me/totalfreedom/totalfreedommod/httpd/HTTPDaemon.java b/src/main/java/me/totalfreedom/totalfreedommod/httpd/HTTPDaemon.java
index a18d0375..b7fd4474 100644
--- a/src/main/java/me/totalfreedom/totalfreedommod/httpd/HTTPDaemon.java
+++ b/src/main/java/me/totalfreedom/totalfreedommod/httpd/HTTPDaemon.java
@@ -23,7 +23,7 @@ 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.httpd.module.Module_admins;
import me.totalfreedom.totalfreedommod.util.FLog;
import org.apache.commons.io.FilenameUtils;
import org.apache.commons.lang.StringUtils;
@@ -53,7 +53,7 @@ public class HTTPDaemon extends FreedomService
// Modules
modules.clear();
module("activitylog", Module_activitylog.class, true);
- module("staff", Module_staff.class, true);
+ module("admins", Module_admins.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_staff.java b/src/main/java/me/totalfreedom/totalfreedommod/httpd/module/Module_admins.java
similarity index 85%
rename from src/main/java/me/totalfreedom/totalfreedommod/httpd/module/Module_staff.java
rename to src/main/java/me/totalfreedom/totalfreedommod/httpd/module/Module_admins.java
index 41c5e261..1377d21d 100644
--- a/src/main/java/me/totalfreedom/totalfreedommod/httpd/module/Module_staff.java
+++ b/src/main/java/me/totalfreedom/totalfreedommod/httpd/module/Module_admins.java
@@ -2,12 +2,12 @@ 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_staff extends HTTPDModule
+public class Module_admins extends HTTPDModule
{
- public Module_staff(TotalFreedomMod plugin, NanoHTTPD.HTTPSession session)
+ public Module_admins(TotalFreedomMod plugin, NanoHTTPD.HTTPSession session)
{
super(plugin, session);
}
@@ -42,7 +42,7 @@ public class Module_staff 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_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_list.java b/src/main/java/me/totalfreedom/totalfreedommod/httpd/module/Module_list.java
index 9e40853f..7af2d927 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());
@@ -87,7 +87,7 @@ public class Module_list extends HTTPDModule
}
}
}
-
+
// for future refernce - any multi-worded ranks are to be delimited by underscores in the json; eg. senior_admins
responseObject.put("owners", owners);
responseObject.put("executives", executives);
@@ -116,7 +116,7 @@ public class Module_list extends HTTPDModule
for (Player player : onlinePlayers)
{
- if (plugin.sl.isVanished(player.getName()))
+ if (plugin.al.isVanished(player.getName()))
{
continue;
}
@@ -134,20 +134,12 @@ public class Module_list extends HTTPDModule
public boolean isImposter(Player player)
{
- if (plugin.sl.isStaffImpostor(player) || plugin.pl.isPlayerImpostor(player))
- {
- return true;
- }
- return false;
+ return plugin.al.isAdminImpostor(player) || plugin.pl.isPlayerImpostor(player);
}
public boolean hasSpecialTitle(Player player)
{
- if (FUtil.DEVELOPERS.contains(player.getUniqueId().toString()) || ConfigEntry.SERVER_EXECUTIVES.getList().contains(player.getName()) || ConfigEntry.SERVER_OWNERS.getList().contains(player.getName()))
- {
- return true;
- }
- return false;
+ return FUtil.DEVELOPERS.contains(player.getUniqueId().toString()) || ConfigEntry.SERVER_EXECUTIVES.getList().contains(player.getName()) || ConfigEntry.SERVER_OWNERS.getList().contains(player.getName());
}
@Override
@@ -155,4 +147,4 @@ public class Module_list extends HTTPDModule
{
return "TotalFreedom - Online Players";
}
-}
+}
\ No newline at end of file
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..de2a0c4d 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;
@@ -25,7 +25,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 +35,21 @@ 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();
-
- switch (staffMember.getRank())
+ final String username = admin.getName();
+ 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..0c42ae66 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
@@ -330,7 +330,7 @@ public class Module_schematic extends HTTPDModule
//
private final String modeName;
- private ModuleMode(String modeName)
+ ModuleMode(String modeName)
{
this.modeName = modeName;
}
diff --git a/src/main/java/me/totalfreedom/totalfreedommod/permissions/PermissionManager.java b/src/main/java/me/totalfreedom/totalfreedommod/permissions/PermissionManager.java
index 60a2cd92..a3f23fb8 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)
{
@@ -123,4 +123,4 @@ public class PermissionManager extends FreedomService
{
setPermissions(event.getPlayer());
}
-}
+}
\ No newline at end of file
diff --git a/src/main/java/me/totalfreedom/totalfreedommod/player/FPlayer.java b/src/main/java/me/totalfreedom/totalfreedommod/player/FPlayer.java
index 9ca196ce..17a6c13f 100644
--- a/src/main/java/me/totalfreedom/totalfreedommod/player/FPlayer.java
+++ b/src/main/java/me/totalfreedom/totalfreedommod/player/FPlayer.java
@@ -57,7 +57,7 @@ public class FPlayer
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
@@ -306,12 +306,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 +348,14 @@ 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()
@@ -439,4 +439,4 @@ public class FPlayer
shot.setVelocity(shot.getVelocity().multiply(2.0));
}
}
-}
+}
\ No newline at end of file
diff --git a/src/main/java/me/totalfreedom/totalfreedommod/player/PlayerData.java b/src/main/java/me/totalfreedom/totalfreedommod/player/PlayerData.java
index 6bb330f4..42a0138e 100644
--- a/src/main/java/me/totalfreedom/totalfreedommod/player/PlayerData.java
+++ b/src/main/java/me/totalfreedom/totalfreedommod/player/PlayerData.java
@@ -267,4 +267,4 @@ public class PlayerData
{
return displayDiscord;
}
-}
+}
\ No newline at end of file
diff --git a/src/main/java/me/totalfreedom/totalfreedommod/player/PlayerList.java b/src/main/java/me/totalfreedom/totalfreedommod/player/PlayerList.java
index 04ba3742..bc17fa03 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;
@@ -110,8 +110,8 @@ public class PlayerList extends FreedomService
public boolean isTelnetMasterBuilder(PlayerData playerData)
{
- StaffMember staffMember = plugin.sl.getEntryByName(playerData.getName());
- if (staffMember != null && staffMember.getRank().isAtLeast(Rank.ADMIN) && playerData.isMasterBuilder())
+ Admin admin = plugin.al.getEntryByName(playerData.getName());
+ if (admin != null && admin.getRank().isAtLeast(Rank.ADMIN) && playerData.isMasterBuilder())
{
return true;
}
@@ -157,14 +157,14 @@ public class PlayerList extends FreedomService
{
PlayerData playerData = getData(player);
return plugin.dc.enabled
- && !plugin.sl.isStaff(player)
+ && !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,36 +178,36 @@ 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);
}
}
diff --git a/src/main/java/me/totalfreedom/totalfreedommod/rank/Displayable.java b/src/main/java/me/totalfreedom/totalfreedommod/rank/Displayable.java
index d63d4fa8..55cc2fc1 100644
--- a/src/main/java/me/totalfreedom/totalfreedommod/rank/Displayable.java
+++ b/src/main/java/me/totalfreedom/totalfreedommod/rank/Displayable.java
@@ -5,26 +5,26 @@ import net.md_5.bungee.api.ChatColor;
public interface Displayable
{
- public String getArticle();
+ String getArticle();
- public String getName();
+ String getName();
- public String getTag();
+ String getTag();
- public String getAbbr();
+ String getAbbr();
- public ChatColor getColor();
+ ChatColor getColor();
- public org.bukkit.ChatColor getTeamColor();
+ org.bukkit.ChatColor getTeamColor();
- public String getColoredName();
+ String getColoredName();
- public String getColoredTag();
+ String getColoredTag();
- public String getColoredLoginMessage();
+ String getColoredLoginMessage();
- public boolean hasTeam();
+ boolean hasTeam();
- public boolean hasDefaultLoginMessage();
+ boolean hasDefaultLoginMessage();
-}
+}
\ No newline at end of file
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..8866cbb8 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 an admin
+ 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);
@@ -191,36 +191,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 +237,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));
}
@@ -313,4 +313,4 @@ public class RankManager extends FreedomService
team.addPlayer(player);
}
}
-}
+}
\ No newline at end of file
diff --git a/src/main/java/me/totalfreedom/totalfreedommod/rank/Title.java b/src/main/java/me/totalfreedom/totalfreedommod/rank/Title.java
index 0af577f3..d7881fe4 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, "VS", 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/shop/Votifier.java b/src/main/java/me/totalfreedom/totalfreedommod/shop/Votifier.java
index 888989bb..c559d061 100644
--- a/src/main/java/me/totalfreedom/totalfreedommod/shop/Votifier.java
+++ b/src/main/java/me/totalfreedom/totalfreedommod/shop/Votifier.java
@@ -28,9 +28,9 @@ public class Votifier extends FreedomService
{
Vote vote = event.getVote();
String name = vote.getUsername();
- int coinsPerVote = ConfigEntry.SHOP_COINS_PER_VOTE.getInteger();
+ int coinsPerVote = ConfigEntry.SHOP_COINS_PER_VOTE.getInteger();
Player player = server.getPlayer(name);
- PlayerData data = null;
+ PlayerData data;
if (player != null)
{
data = plugin.pl.getData(player);
@@ -53,4 +53,4 @@ public class Votifier extends FreedomService
player.sendMessage(ChatColor.GREEN + "Thank you for voting for us! Here are " + coinsPerVote + " coins!");
}
}
-}
+}
\ No newline at end of file
diff --git a/src/main/java/me/totalfreedom/totalfreedommod/sql/SQLite.java b/src/main/java/me/totalfreedom/totalfreedommod/sql/SQLite.java
index 16d15321..e27bb136 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,15 +78,15 @@ 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 admins table: " + e.getMessage());
}
}
if (!tableExists(meta, "players"))
@@ -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(6, staffMember.getCommandSpy());
- statement.setBoolean(7, staffMember.getPotionSpy());
- statement.setString(8, staffMember.getAcFormat());
- statement.setString(9, 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(6, admin.getCommandSpy());
+ statement.setBoolean(7, admin.getPotionSpy());
+ statement.setString(8, admin.getAcFormat());
+ statement.setString(9, admin.getPteroID());
statement.executeUpdate();
}
catch (SQLException e)
{
- FLog.severe("Failed to add staff member:");
+ FLog.severe("Failed to add admin:");
FLog.severe(e);
}
}
@@ -296,11 +296,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;
@@ -308,7 +308,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);
}
@@ -368,15 +368,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..d1e39cad 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);
@@ -98,4 +98,4 @@ public class FSync
}.runTask(plugin);
}
-}
+}
\ No newline at end of file
diff --git a/src/main/java/me/totalfreedom/totalfreedommod/util/FUtil.java b/src/main/java/me/totalfreedom/totalfreedommod/util/FUtil.java
index 65f96a3b..5dce0549 100644
--- a/src/main/java/me/totalfreedom/totalfreedommod/util/FUtil.java
+++ b/src/main/java/me/totalfreedom/totalfreedommod/util/FUtil.java
@@ -164,7 +164,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());
}
@@ -347,9 +347,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..275fc39a 100644
--- a/src/main/java/me/totalfreedom/totalfreedommod/world/StaffWorld.java
+++ b/src/main/java/me/totalfreedom/totalfreedommod/world/AdminWorld.java
@@ -15,7 +15,7 @@ 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
@@ -27,9 +27,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 +59,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 +94,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;
@@ -135,5 +135,4 @@ public final class StaffWorld extends CustomWorld
{
}
}
-
-}
+}
\ No newline at end of file
diff --git a/src/main/java/me/totalfreedom/totalfreedommod/world/CleanroomChunkGenerator.java b/src/main/java/me/totalfreedom/totalfreedommod/world/CleanroomChunkGenerator.java
index fe183f9c..b3e7db55 100644
--- a/src/main/java/me/totalfreedom/totalfreedommod/world/CleanroomChunkGenerator.java
+++ b/src/main/java/me/totalfreedom/totalfreedommod/world/CleanroomChunkGenerator.java
@@ -142,9 +142,8 @@ public class CleanroomChunkGenerator extends ChunkGenerator
for (int y = 0; y < materials.length; y++)
{
- result.setRegion(0, y, 0, 16, y+1, 16, materials[y]);
+ result.setRegion(0, y, 0, 16, y + 1, 16, materials[y]);
}
-
return result;
}
@@ -164,4 +163,4 @@ public class CleanroomChunkGenerator extends ChunkGenerator
return new Location(world, 0, world.getHighestBlockYAt(0, 0), 0);
}
-}
+}
\ No newline at end of file
diff --git a/src/main/java/me/totalfreedom/totalfreedommod/world/WorldManager.java b/src/main/java/me/totalfreedom/totalfreedommod/world/WorldManager.java
index 5f7b3856..18aeffcd 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;
}
@@ -144,4 +144,4 @@ public class WorldManager extends FreedomService
playerMsg(player, "World " + targetWorld + " not found.", ChatColor.GRAY);
}
-}
+}
\ No newline at end of file
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/java/me/totalfreedom/totalfreedommod/world/WorldTime.java b/src/main/java/me/totalfreedom/totalfreedommod/world/WorldTime.java
index c5d945ec..501fba4d 100644
--- a/src/main/java/me/totalfreedom/totalfreedommod/world/WorldTime.java
+++ b/src/main/java/me/totalfreedom/totalfreedommod/world/WorldTime.java
@@ -17,13 +17,13 @@ public enum WorldTime
private final int timeTicks;
private final List aliases;
- private WorldTime()
+ WorldTime()
{
this.timeTicks = 0;
this.aliases = null;
}
- private WorldTime(String aliases, int timeTicks)
+ WorldTime(String aliases, int timeTicks)
{
this.timeTicks = timeTicks;
this.aliases = Arrays.asList(StringUtils.split(aliases, ","));
@@ -53,4 +53,4 @@ public enum WorldTime
}
return null;
}
-}
+}
\ No newline at end of file
diff --git a/src/main/java/me/totalfreedom/totalfreedommod/world/WorldWeather.java b/src/main/java/me/totalfreedom/totalfreedommod/world/WorldWeather.java
index 829f44bd..3debcedd 100644
--- a/src/main/java/me/totalfreedom/totalfreedommod/world/WorldWeather.java
+++ b/src/main/java/me/totalfreedom/totalfreedommod/world/WorldWeather.java
@@ -14,7 +14,7 @@ public enum WorldWeather
//
private final List aliases;
- private WorldWeather(String aliases)
+ WorldWeather(String aliases)
{
this.aliases = Arrays.asList(StringUtils.split(aliases, ","));
}
diff --git a/src/main/resources/config.yml b/src/main/resources/config.yml
index 4b13b458..1b9cab88 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.'
@@ -34,10 +34,10 @@ server:
- Wild1145
# All players who show up as executive
- executives: []
+ executives: [ ]
# All those who can manage the master builder list
- master_builder_management: []
+ master_builder_management: [ ]
# URL players should appeal for bans at
ban_url: ''
@@ -115,7 +115,7 @@ ptero:
admin_key: ''
# Server API key
server_key: ''
-
+
# The shop
shop:
# Enable the shop
@@ -123,7 +123,7 @@ shop:
# Shop title
title: '&e&lTotalFreedom Shop'
-
+
# Shop prefix
prefix: '&8[&eTF Shop&8]'
@@ -177,16 +177,16 @@ shop:
clown_fish: 1500
login_messages: 5000
-# Staff list
-stafflist:
+# Admin list
+adminlist:
- # The amount of hours after which staff may be removed from the admin list
+ # The amount of hours after which admins may be removed from the admin list
clean_threshold_hours: 167
# Give the default CONSOLE admin privileges.
# Handy in development environments.
console_is_admin: true
-
+
# CoreProtect
coreprotect:
enabled: false
@@ -250,9 +250,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 +263,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 +298,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
@@ -386,7 +385,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
@@ -408,36 +407,36 @@ announcer:
prefix: '&5[&eTotalFreedom&5] &b'
announcements:
- - 'Be sure to visit our forums at &6https://forum.totalfreedom.me/'
- - 'If you are not OP, be sure to ask!'
- - 'Somebody breaking the rules? Report it! /report '
- - 'Griefing is not allowed!'
- - 'Hacked clients are allowed!'
- - 'Interested in becoming admin? Type "/ai" for more information!'
- - 'You may view all online administrators via "/list -s"'
- - 'Save your buildings via WorldEdit! http://totalfreedom.me for more information!'
- - 'You may contact TotalFreedom support on Twitter! https://tiny.re/tfsupport'
- - 'You may download TotalFreedomMod here: https://tiny.re/tfm+'
- - 'Wild1145 is the owner of TotalFreedom.'
- - 'markbyron is the founder of TotalFreedom.'
- - 'Server lagging? Check the lag via "/tps"'
- - 'You are allowed to record and stream videos on TotalFreedom.'
- - 'Player vs player while in creative or god mode is forbidden!'
- - 'Spawn killing is forbidden!'
- - 'Invisible potions are allowed!'
- - 'Serial griefing and trolling will result in an indefinite ban!'
- - 'Racism, nazism, and sexism are strictly forbidden!'
- - 'Join our Discord server! Link: https://discord.com/invite/PW4savJR9a'
+ - 'Be sure to visit our forums at &6https://forum.totalfreedom.me/'
+ - 'If you are not OP, be sure to ask!'
+ - 'Somebody breaking the rules? Report it! /report '
+ - 'Griefing is not allowed!'
+ - 'Hacked clients are allowed!'
+ - 'Interested in becoming admin? Type "/ai" for more information!'
+ - 'You may view all online administrators via "/list -s"'
+ - 'Save your buildings via WorldEdit! http://totalfreedom.me for more information!'
+ - 'You may contact TotalFreedom support on Twitter! https://tiny.re/tfsupport'
+ - 'You may download TotalFreedomMod here: https://tiny.re/tfm+'
+ - 'Wild1145 is the owner of TotalFreedom.'
+ - 'markbyron is the founder of TotalFreedom.'
+ - 'Server lagging? Check the lag via "/tps"'
+ - 'You are allowed to record and stream videos on TotalFreedom.'
+ - 'Player vs player while in creative or god mode is forbidden!'
+ - 'Spawn killing is forbidden!'
+ - 'Invisible potions are allowed!'
+ - 'Serial griefing and trolling will result in an indefinite ban!'
+ - 'Racism, nazism, and sexism are strictly forbidden!'
+ - 'Join our Discord server! Link: https://discord.com/invite/PW4savJR9a'
-# 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 admininfo 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:'
- ' &9https://forum.totalfreedom.me/'
-
+
# What to display in the vote command.
votinginfo:
- '&bVoting Links:'
@@ -526,9 +525,9 @@ autokick:
# Time, in seconds, after which a player should be kicked when inactive
time: 120
-
+
# Blocked Chat Codes - Use &code,&code2,&code3 (No spaces)
blocked_chatcodes: '&0,&k,&m,&n'
# Enables certain things like debug logs and console bypasses
-developer_mode: false
+developer_mode: false
\ No newline at end of file
diff --git a/src/main/resources/permissions.yml b/src/main/resources/permissions.yml
index 2f7876f4..ae404160 100644
--- a/src/main/resources/permissions.yml
+++ b/src/main/resources/permissions.yml
@@ -1,10 +1,10 @@
#
-# TotalFreedomMod 5.5 Permissions
+# TotalFreedomMod 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