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

relying on someone else to look this over to see if i missed anything

Browse Source
This commit is contained in:
Telesphoreo
2020-09-27 21:51:15 -05:00
parent d203772a9a
commit 54e6e2f9b1
116 changed files with 209 additions and 277 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@ -8,11 +8,10 @@ public enum Rank implements Displayable
IMPOSTOR("an", "Impostor", Type.PLAYER, "Imp", ChatColor.YELLOW, null, false),
NON_OP("a", "Non-Op", Type.PLAYER, "", ChatColor.WHITE, null, false),
OP("an", "Operator", Type.PLAYER, "OP", ChatColor.GREEN, null, false),
TRIAL_MOD("a", "Trial Moderator", Type.STAFF, "Trial Mod", ChatColor.AQUA, org.bukkit.ChatColor.AQUA, true),
MOD("a", "Moderator", Type.STAFF, "Mod", ChatColor.DARK_GREEN, org.bukkit.ChatColor.DARK_GREEN, true),
ADMIN("an", "Administrator", Type.STAFF, "Admin", ChatColor.GOLD, org.bukkit.ChatColor.GOLD, true),
MOD_CONSOLE("the", "Console", Type.STAFF_CONSOLE, "Console", ChatColor.DARK_PURPLE, null, false),
ADMIN_CONSOLE("the", "Console", Type.STAFF_CONSOLE, "Console", ChatColor.DARK_PURPLE, null, false);
NEW_ADMIN("a", "Moderator", Type.STAFF, "Mod", ChatColor.DARK_GREEN, org.bukkit.ChatColor.DARK_GREEN, true),
SENIOR_ADMIN("an", "Administrator", Type.STAFF, "Admin", ChatColor.GOLD, org.bukkit.ChatColor.GOLD, true),
NEW_ADMIN_CONSOLE("the", "Console", Type.STAFF_CONSOLE, "Console", ChatColor.DARK_PURPLE, null, false),
SENIOR_CONSOLE("the", "Console", Type.STAFF_CONSOLE, "Console", ChatColor.DARK_PURPLE, null, false);
@Getter
private final Type type;
@Getter
@ -107,12 +106,12 @@ public enum Rank implements Displayable
{
switch (this)
{
case MOD:
case MOD_CONSOLE:
return MOD_CONSOLE;
case ADMIN:
case ADMIN_CONSOLE:
return ADMIN_CONSOLE;
case NEW_ADMIN:
case NEW_ADMIN_CONSOLE:
return NEW_ADMIN_CONSOLE;
case SENIOR_ADMIN:
case SENIOR_CONSOLE:
return SENIOR_CONSOLE;
default:
return null;
}

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

@ -109,7 +109,7 @@ public class RankManager extends FreedomService
// CONSOLE?
if (sender.getName().equals("CONSOLE"))
{
return ConfigEntry.STAFFLIST_CONSOLE_IS_ADMIN.getBoolean() ? Rank.ADMIN_CONSOLE : Rank.MOD_CONSOLE;
return ConfigEntry.STAFFLIST_CONSOLE_IS_ADMIN.getBoolean() ? Rank.SENIOR_CONSOLE : Rank.NEW_ADMIN_CONSOLE;
}
// Console admin, get by name
@ -118,7 +118,7 @@ public class RankManager extends FreedomService
// Unknown console: RCON?
if (staffMember == null)
{
return Rank.ADMIN_CONSOLE;
return Rank.SENIOR_CONSOLE;
}
Rank rank = staffMember.getRank();