removed some redundant repeated color stuff

This commit is contained in:
Chiss 2014-09-12 11:59:32 +10:00
parent b507571403
commit b5152bd621
4 changed files with 12 additions and 20 deletions

View File

@ -84,4 +84,9 @@ public enum Rank
if (bold) return Color + C.Bold + name; if (bold) return Color + C.Bold + name;
else return Color + name; else return Color + name;
} }
public ChatColor GetColor()
{
return Color;
}
} }

View File

@ -59,12 +59,6 @@ public class C
public static String listValueOn = "" + ChatColor.GREEN; public static String listValueOn = "" + ChatColor.GREEN;
public static String listValueOff = "" + ChatColor.RED; public static String listValueOff = "" + ChatColor.RED;
public static String rAll = "" + ChatColor.WHITE;
public static String rHelp = "" + ChatColor.GREEN;
public static String rMod = "" + ChatColor.GOLD;
public static String rAdmin = "" + ChatColor.RED;
public static String rOwner = "" + ChatColor.DARK_RED;
public static String consoleHead = "" + ChatColor.RED; public static String consoleHead = "" + ChatColor.RED;
public static String consoleFill = "" + ChatColor.WHITE; public static String consoleFill = "" + ChatColor.WHITE;
public static String consoleBody = "" + ChatColor.YELLOW; public static String consoleBody = "" + ChatColor.YELLOW;

View File

@ -95,22 +95,15 @@ public class F
public static String help(String cmd, String body, Rank rank) public static String help(String cmd, String body, Rank rank)
{ {
if (rank == Rank.OWNER) return C.rOwner + cmd + " " + C.mBody + body + " " + rank(Rank.OWNER); return rank.GetColor() + cmd + " " + C.mBody + body + " " + rank(rank);
else if (rank == Rank.ADMIN) return C.rAdmin + cmd + " " + C.mBody + body + " " + rank(Rank.ADMIN);
else if (rank == Rank.MODERATOR) return C.rMod + cmd + " " + C.mBody + body + " " + rank(Rank.MODERATOR);
else if (rank == Rank.HELPER) return C.rHelp + cmd + " " + C.mBody + body + " " + rank(Rank.HELPER);
else return C.rAll + cmd + " " + C.mBody + body + " " + rank(Rank.ALL);
} }
public static String rank(Rank rank) public static String rank(Rank rank)
{ {
if (rank == Rank.OWNER) return C.rOwner + "Owner"; if (rank == Rank.ALL)
else if (rank == Rank.ADMIN) return C.rAdmin + "Admin"; return rank.GetColor() + "Player";
else if (rank == Rank.DEVELOPER) return C.rAdmin + "Developer";
else if (rank == Rank.SNR_MODERATOR) return C.rMod + "Senior Mod"; return rank.GetTag(false, false);
else if (rank == Rank.MODERATOR) return C.rMod + "Mod";
else if (rank == Rank.HELPER) return C.rHelp + "Helper";
else return C.rAll + "Player";
} }
public static String value(String variable, String value) public static String value(String variable, String value)