TotalFreedomMC/TF-ProjectKorra
1
0
Fork 0
mirror of https://github.com/TotalFreedomMC/TF-ProjectKorra.git synced 2025-02-11 19:50:37 +00:00
Code Issues Projects Releases Wiki Activity

Merge pull request #436 from Simplicitee/master

Browse source 
Add new staff, Fixed ConfigType
This commit is contained in:
OmniCypher 2016-03-02 17:47:11 -08:00
commit 66ac82240d
2 changed files with 20 additions and 20 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

11
src/com/projectkorra/projectkorra/command/WhoCommand.java
View file

@ -51,18 +51,15 @@ public class WhoCommand extends PKCommand {
staff.put("d7757be8-86de-4898-ab4f-2b1b2fbc3dfa", ChatColor.DARK_PURPLE + "ProjectKorra Developer"); // StrangeOne101
staff.put("3b5bdfab-8ae1-4794-b160-4f33f31fde99", ChatColor.DARK_PURPLE + "ProjectKorra Developer"); // kingbirdy
staff.put("dedf335b-d282-47ab-8ffc-a80121661cd1", ChatColor.DARK_PURPLE + "ProjectKorra Developer"); // grasshopperMatt
staff.put("679a6396-6a31-4898-8130-044f34bef743", ChatColor.DARK_PURPLE + "ProjectKorra Developer"); // savior67
staff.put("7bb267eb-cf0b-4fb9-a697-27c2a913ed92", ChatColor.DARK_PURPLE + "ProjectKorra Developer"); // Finn
staff.put("623df34e-9cd4-438d-b07c-1905e1fc46b6", ChatColor.GREEN + "ProjectKorra Concept Designer"); // Loony
//staff.put("80f9072f-e37e-4adc-8675-1ba6af87d63b", ChatColor.GREEN + "ProjectKorra Concept Designer"); // Cross
//staff.put("57205eec-96bd-4aa3-b73f-c6627429beb2", ChatColor.GREEN + "ProjectKorra Concept Designer"); // ashe36
//staff.put("7daead36-d285-4640-848a-2f105334b792", ChatColor.GREEN + "ProjectKorra Concept Designer"); // Fuzzy
//staff.put("f30c871e-cd60-446b-b219-e31e00e16857", ChatColor.GREEN + "ProjectKorra Concept Designer"); // Gangksta
staff.put("38217173-8a32-4ba7-9fe1-dd4fed031a74", ChatColor.GREEN + "ProjectKorra Concept Designer"); // Easte
staff.put("3c484e61-7876-46c0-98c9-88c7834dc96c", ChatColor.GREEN + "ProjectKorra Concept Designer"); //SamuraiSnowman (Zmeduna)
staff.put("3c484e61-7876-46c0-98c9-88c7834dc96c", ChatColor.GREEN + "ProjectKorra Concept Designer"); // SamuraiSnowman (Zmeduna)
staff.put("1d4a8a47-1f3b-40a6-b412-c15d874491b8", ChatColor.GREEN + "ProjectKorra Concept Designer"); // Fyf
staff.put("3d5bc713-ab8b-4125-b5ba-a1c1c2400b2c", ChatColor.GOLD + "ProjectKorra Community Moderator"); // Gold
//staff.put("2ab334d1-9691-4994-a624-209c7b4f220b", ChatColor.BLUE + "ProjectKorra Digital Team"); // Austygen
}
@Override

27
src/com/projectkorra/projectkorra/configuration/ConfigType.java
View file

@ -7,30 +7,33 @@ import java.util.List;
public class ConfigType {
private static final HashMap<String, ConfigType> ALL_TYPES = new HashMap<>();
public static final ConfigType DEFAULT = new ConfigType("Default");
public static final ConfigType PRESETS = new ConfigType("Presets");
public static final ConfigType DEATH_MESSAGE = new ConfigType("DeathMessage");
public static final ConfigType[] CORE_TYPES = {DEFAULT, PRESETS, DEATH_MESSAGE};
private static HashMap<String, ConfigType> allTypes = new HashMap<>();
private static List<ConfigType> addonTypes = new ArrayList<>();
private static final ConfigType[] CORE_TYPES = {DEFAULT, PRESETS, DEATH_MESSAGE};
private String string;
public ConfigType(String string) {
this.string = string;
allTypes.put(string, this);
if (!Arrays.asList(CORE_TYPES).contains(this)) {
addonTypes.add(this);
}
ALL_TYPES.put(string, this);
}
public static List<ConfigType> addonValues() {
return addonTypes;
List<ConfigType> values = new ArrayList<>();
for (String key : ALL_TYPES.keySet()) {
if (!Arrays.asList(CORE_TYPES).contains(ALL_TYPES.get(key))) {
values.add(ALL_TYPES.get(key));
}
}
return values;
}
public static ConfigType[] coreValues() {
return CORE_TYPES;
public static List<ConfigType> coreValues() {
return Arrays.asList(CORE_TYPES);
}
public String toString() {
@ -39,8 +42,8 @@ public class ConfigType {
public static List<ConfigType> values() {
List<ConfigType> values = new ArrayList<>();
for (String key : allTypes.keySet()) {
values.add(allTypes.get(key));
for (String key : ALL_TYPES.keySet()) {
values.add(ALL_TYPES.get(key));
}
return values;
}