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;
else return Color + name;
}
public ChatColor GetColor()
{
return Color;
}
}

View File

@ -58,13 +58,7 @@ public class C
public static String listValue = "" + ChatColor.YELLOW;
public static String listValueOn = "" + ChatColor.GREEN;
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 consoleFill = "" + ChatColor.WHITE;
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)
{
if (rank == Rank.OWNER) return C.rOwner + cmd + " " + C.mBody + body + " " + rank(Rank.OWNER);
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);
return rank.GetColor() + cmd + " " + C.mBody + body + " " + rank(rank);
}
public static String rank(Rank rank)
{
if (rank == Rank.OWNER) return C.rOwner + "Owner";
else if (rank == Rank.ADMIN) return C.rAdmin + "Admin";
else if (rank == Rank.DEVELOPER) return C.rAdmin + "Developer";
else if (rank == Rank.SNR_MODERATOR) return C.rMod + "Senior Mod";
else if (rank == Rank.MODERATOR) return C.rMod + "Mod";
else if (rank == Rank.HELPER) return C.rHelp + "Helper";
else return C.rAll + "Player";
if (rank == Rank.ALL)
return rank.GetColor() + "Player";
return rank.GetTag(false, false);
}
public static String value(String variable, String value)

View File

@ -28,7 +28,7 @@ public abstract class StrikeItem
private String _name;
private String[] _desc;
private int _cost;
private int _gemCost;
private int _gemCost;
private Material _skin;
private String _ownerName;