From 0250e903a5770f72ec726167bdf399abfa6a3a26 Mon Sep 17 00:00:00 2001 From: OmniCypher Date: Mon, 3 Aug 2015 21:39:56 -0700 Subject: [PATCH] Added getElementSubColor() Added getElementSubColor() method to each element file (not including chi) to easily return said elements sub element color, getMetalbendingColor() has been marked as depreciated and will be removed soon as it is no longer needed. Added new staff members to /b who, kingbirdy still requires an account and AlexTheCoder is still included. --- .../projectkorra/projectkorra/Commands.java | 48 ++++++++++++++----- .../projectkorra/airbending/AirMethods.java | 9 ++++ .../earthbending/EarthMethods.java | 9 ++++ .../projectkorra/firebending/FireMethods.java | 9 ++++ .../waterbending/WaterMethods.java | 9 ++++ 5 files changed, 71 insertions(+), 13 deletions(-) diff --git a/src/com/projectkorra/projectkorra/Commands.java b/src/com/projectkorra/projectkorra/Commands.java index 777b5b02..097cb847 100644 --- a/src/com/projectkorra/projectkorra/Commands.java +++ b/src/com/projectkorra/projectkorra/Commands.java @@ -1592,24 +1592,31 @@ public class Commands { //Developers if (uuid2.toString().equals("833a7132-a9ec-4f0a-ad9c-c3d6b8a1c7eb") // Jacklin213 || uuid2.toString().equals("96f40c81-dd5d-46b6-9afe-365114d4a082") // Coolade + || uuid2.toString().equals("4eb6315e-9dd1-49f7-b582-c1170e497ab0") // jedk1 + || uuid2.toString().equals("5031c4e3-8103-49ea-b531-0d6ae71bad69") // Simplicitee + || uuid2.toString().equals("d7757be8-86de-4898-ab4f-2b1b2fbc3dfa") // StrangeOne101 || uuid2.toString().equals("81adae76-d647-4b41-bfb0-8166516fa189")) { // AlexTheCoder s.sendMessage(ChatColor.DARK_PURPLE + "ProjectKorra Developer"); } - + //Concept Designers if (uuid2.toString().equals("623df34e-9cd4-438d-b07c-1905e1fc46b6") // Loony || uuid2.toString().equals("80f9072f-e37e-4adc-8675-1ba6af87d63b") // Cross + || uuid2.toString().equals("ce889d32-c2a0-4765-969f-9ca54d0bd34a") // ashe36 + || uuid2.toString().equals("7daead36-d285-4640-848a-2f105334b792") // Fuzzy || uuid2.toString().equals("38217173-8a32-4ba7-9fe1-dd4fed031a74")) { // Fly s.sendMessage(ChatColor.GREEN + "ProjectKorra Concept Designer"); } - + //Community Moderators - if (uuid2.toString().equals("")) { + if (uuid2.toString().equals("1553482a-5e86-4270-9262-b57c11151074") // Pickle9775 + || uuid2.toString().equals("3d5bc713-ab8b-4125-b5ba-a1c1c2400b2c")) { // Gold s.sendMessage(ChatColor.GOLD + "ProjectKorra Community Moderator"); } //Digital Team - if (uuid2.toString().equals("")) { + if (uuid2.toString().equals("2ab334d1-9691-4994-a624-209c7b4f220b") // Austygen + ) { s.sendMessage(ChatColor.BLUE + "ProjectKorra Digital Team"); } @@ -1900,22 +1907,37 @@ public class Commands { if (GeneralMethods.abilityExists(args[1])) { String ability = GeneralMethods.getAbility(args[1]); if (AirMethods.isAirAbility(ability)) { - s.sendMessage(AirMethods.getAirColor() + ability + " - "); - s.sendMessage(AirMethods.getAirColor() + AbilityModuleManager.descriptions.get(ability)); + if(AirMethods.isSpiritualProjectionAbility(ability) || AirMethods.isFlightAbility(ability)) { + s.sendMessage(AirMethods.getAirSubColor() + ability + " - "); + s.sendMessage(AirMethods.getAirSubColor() + AbilityModuleManager.descriptions.get(ability)); + } else { + s.sendMessage(AirMethods.getAirColor() + ability + " - "); + s.sendMessage(AirMethods.getAirColor() + AbilityModuleManager.descriptions.get(ability)); + } } else if (WaterMethods.isWaterAbility(ability)) { - s.sendMessage(WaterMethods.getWaterColor() + ability + " - "); - s.sendMessage(WaterMethods.getWaterColor() + AbilityModuleManager.descriptions.get(ability)); + if(WaterMethods.isIcebendingAbility(ability) || WaterMethods.isBloodbendingAbility(ability) || WaterMethods.isHealingAbility(ability) || WaterMethods.isPlantbendingAbility(ability)) { + s.sendMessage(WaterMethods.getWaterSubColor() + ability + " - "); + s.sendMessage(WaterMethods.getWaterSubColor() + AbilityModuleManager.descriptions.get(ability)); + } else { + s.sendMessage(WaterMethods.getWaterColor() + ability + " - "); + s.sendMessage(WaterMethods.getWaterColor() + AbilityModuleManager.descriptions.get(ability)); + } } else if (EarthMethods.isEarthAbility(ability)) { - if (EarthMethods.isMetalbendingAbility(ability)) { - s.sendMessage(EarthMethods.getMetalbendingColor() + ability + " - "); - s.sendMessage(EarthMethods.getMetalbendingColor() + AbilityModuleManager.descriptions.get(ability)); + if (EarthMethods.isMetalbendingAbility(ability) || EarthMethods.isLavabendingAbility(ability) || EarthMethods.isSandbendingAbility(ability)) { + s.sendMessage(EarthMethods.getEarthSubColor() + ability + " - "); + s.sendMessage(EarthMethods.getEarthSubColor() + AbilityModuleManager.descriptions.get(ability)); } else { s.sendMessage(EarthMethods.getEarthColor() + ability + " - "); s.sendMessage(EarthMethods.getEarthColor() + AbilityModuleManager.descriptions.get(ability)); } } else if (FireMethods.isFireAbility(ability)) { - s.sendMessage(FireMethods.getFireColor() + ability + " - "); - s.sendMessage(FireMethods.getFireColor() + AbilityModuleManager.descriptions.get(ability)); + if(FireMethods.isCombustionbendingAbility(ability) || FireMethods.isLightningbendingAbility(ability)) { + s.sendMessage(FireMethods.getFireSubColor() + ability + " - "); + s.sendMessage(FireMethods.getFireSubColor() + AbilityModuleManager.descriptions.get(ability)); + } else { + s.sendMessage(FireMethods.getFireColor() + ability + " - "); + s.sendMessage(FireMethods.getFireColor() + AbilityModuleManager.descriptions.get(ability)); + } } else if (ChiMethods.isChiAbility(ability)) { s.sendMessage(ChiMethods.getChiColor() + ability + " - "); s.sendMessage(ChiMethods.getChiColor() + AbilityModuleManager.descriptions.get(ability)); diff --git a/src/com/projectkorra/projectkorra/airbending/AirMethods.java b/src/com/projectkorra/projectkorra/airbending/AirMethods.java index 2f5a5231..1ff61f63 100644 --- a/src/com/projectkorra/projectkorra/airbending/AirMethods.java +++ b/src/com/projectkorra/projectkorra/airbending/AirMethods.java @@ -61,6 +61,15 @@ public class AirMethods { public static ChatColor getAirColor() { return ChatColor.valueOf(config.getString("Properties.Chat.Colors.Air")); } + + /** + * Gets the AirSubColor from the config. + * + * @return Config specified ChatColor + */ + public static ChatColor getAirSubColor() { + return ChatColor.valueOf(config.getString("Properties.Chat.Colors.AirSub")); + } /** * Checks whether an ability is an air ability. diff --git a/src/com/projectkorra/projectkorra/earthbending/EarthMethods.java b/src/com/projectkorra/projectkorra/earthbending/EarthMethods.java index 5922e0f8..f5a36639 100644 --- a/src/com/projectkorra/projectkorra/earthbending/EarthMethods.java +++ b/src/com/projectkorra/projectkorra/earthbending/EarthMethods.java @@ -125,6 +125,15 @@ public class EarthMethods { public static ChatColor getEarthColor() { return ChatColor.valueOf(config.getString("Properties.Chat.Colors.Earth")); } + + /** + * Gets the EarthSubColor from the config. + * + * @return Config specified ChatColor + */ + public static ChatColor getEarthSubColor() { + return ChatColor.valueOf(config.getString("Properties.Chat.Colors.EarthSub")); + } public static int getEarthbendableBlocksLength(Player player, Block block, Vector direction, int maxlength) { Location location = block.getLocation(); diff --git a/src/com/projectkorra/projectkorra/firebending/FireMethods.java b/src/com/projectkorra/projectkorra/firebending/FireMethods.java index 98b515fd..b0a53b71 100644 --- a/src/com/projectkorra/projectkorra/firebending/FireMethods.java +++ b/src/com/projectkorra/projectkorra/firebending/FireMethods.java @@ -76,6 +76,15 @@ public class FireMethods { public static ChatColor getFireColor() { return ChatColor.valueOf(config.getString("Properties.Chat.Colors.Fire")); } + + /** + * Gets the FireSubColor from the config. + * + * @return Config specified ChatColor + */ + public static ChatColor getFireSubColor() { + return ChatColor.valueOf(config.getString("Properties.Chat.Colors.FireSub")); + } public static boolean isCombustionbendingAbility(String ability) { return AbilityModuleManager.combustionabilities.contains(ability); diff --git a/src/com/projectkorra/projectkorra/waterbending/WaterMethods.java b/src/com/projectkorra/projectkorra/waterbending/WaterMethods.java index 6efc932c..408ccc83 100644 --- a/src/com/projectkorra/projectkorra/waterbending/WaterMethods.java +++ b/src/com/projectkorra/projectkorra/waterbending/WaterMethods.java @@ -123,6 +123,15 @@ public class WaterMethods { public static ChatColor getWaterColor() { return ChatColor.valueOf(config.getString("Properties.Chat.Colors.Water")); } + + /** + * Gets the WaterSubColor from the config. + * + * @return Config specified ChatColor + */ + public static ChatColor getWaterSubColor() { + return ChatColor.valueOf(config.getString("Properties.Chat.Colors.WaterSub")); + } /** * Finds a valid Water source for a Player. To use dynamic source selection,