AtlasMediaGroup/TotalFreedomMod
1
0
Fork 0
mirror of https://github.com/AtlasMediaGroup/TotalFreedomMod.git synced 2025-06-29 19:46:42 +00:00
Code Issues Packages Projects Releases Wiki Activity

staff -> admins

Browse Source 
* rename everything containing staff back to admin (as requested by ryan i've renamed commands like slconfig to saconfig but left "slconfig" as an alias)
* format almost every file correctly
* a few other improvements
This commit is contained in:
speed
2020-12-03 19:28:53 -05:00
parent aae1f524ea
commit 293ea04c56
205 changed files with 1667 additions and 1696 deletions
Download Patch File Download Diff File Expand all files Collapse all files

24
src/main/java/me/totalfreedom/totalfreedommod/rank/Displayable.java
View File

@ -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();
}
}

20
src/main/java/me/totalfreedom/totalfreedommod/rank/Rank.java
View File

@ -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;
}

66
src/main/java/me/totalfreedom/totalfreedommod/rank/RankManager.java
View File

@ -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);
}
}
}
}

2
src/main/java/me/totalfreedom/totalfreedommod/rank/Title.java
View File

@ -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);