EpicKnarvik97/mcMMO
1
0
Fork 0
mirror of https://github.com/mcMMO-Dev/mcMMO.git synced 2025-07-14 03:24:43 +02:00
Code Issues Projects Releases Wiki Activity

SkillUtils cleanup, EventUtils creation

Browse Source 
Move some functions in SkillUtils to more relevant locations.

Begin work on utility class to handle all event calls.
This commit is contained in:
GJ
2013-10-15 13:03:33 -04:00
parent 309dfd50cd
commit 468fbdab56
32 changed files with 409 additions and 504 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
src/main/java/com/gmail/nossr50/util/commands/CommandRegistrationManager.java
View File

@ -50,7 +50,6 @@ import com.gmail.nossr50.config.Config;
import com.gmail.nossr50.datatypes.skills.SkillType;
import com.gmail.nossr50.locale.LocaleLoader;
import com.gmail.nossr50.util.StringUtils;
import com.gmail.nossr50.util.skills.SkillUtils;
public final class CommandRegistrationManager {
private CommandRegistrationManager() {};
@ -60,7 +59,7 @@ public final class CommandRegistrationManager {
private static void registerSkillCommands() {
for (SkillType skill : SkillType.values()) {
String commandName = skill.toString().toLowerCase();
String localizedName = SkillUtils.getSkillName(skill).toLowerCase();
String localizedName = skill.getSkillName().toLowerCase();
PluginCommand command;

61
src/main/java/com/gmail/nossr50/util/commands/CommandUtils.java
View File

@ -1,5 +1,6 @@
package com.gmail.nossr50.util.commands;
import java.util.ArrayList;
import java.util.List;
import org.bukkit.OfflinePlayer;
@ -157,16 +158,7 @@ public final class CommandUtils {
* @param display The sender to display stats to
*/
public static void printGatheringSkills(Player inspect, CommandSender display) {
if (SkillUtils.hasGatheringSkills(inspect)) {
PlayerProfile profile = UserManager.getPlayer(inspect).getProfile();
display.sendMessage(LocaleLoader.getString("Stats.Header.Gathering"));
displaySkill(inspect, profile, SkillType.EXCAVATION, display);
displaySkill(inspect, profile, SkillType.FISHING, display);
displaySkill(inspect, profile, SkillType.HERBALISM, display);
displaySkill(inspect, profile, SkillType.MINING, display);
displaySkill(inspect, profile, SkillType.WOODCUTTING, display);
}
printGroupedSkillData(inspect, display, LocaleLoader.getString("Stats.Header.Gathering"), SkillType.GATHERING_SKILLS);
}
public static void printGatheringSkills(Player player) {
@ -180,16 +172,7 @@ public final class CommandUtils {
* @param display The sender to display stats to
*/
public static void printCombatSkills(Player inspect, CommandSender display) {
if (SkillUtils.hasCombatSkills(inspect)) {
PlayerProfile profile = UserManager.getPlayer(inspect).getProfile();
display.sendMessage(LocaleLoader.getString("Stats.Header.Combat"));
displaySkill(inspect, profile, SkillType.AXES, display);
displaySkill(inspect, profile, SkillType.ARCHERY, display);
displaySkill(inspect, profile, SkillType.SWORDS, display);
displaySkill(inspect, profile, SkillType.TAMING, display);
displaySkill(inspect, profile, SkillType.UNARMED, display);
}
printGroupedSkillData(inspect, display, LocaleLoader.getString("Stats.Header.Combat"), SkillType.COMBAT_SKILLS);
}
public static void printCombatSkills(Player player) {
@ -203,26 +186,38 @@ public final class CommandUtils {
* @param display The sender to display stats to
*/
public static void printMiscSkills(Player inspect, CommandSender display) {
if (SkillUtils.hasMiscSkills(inspect)) {
PlayerProfile profile = UserManager.getPlayer(inspect).getProfile();
display.sendMessage(LocaleLoader.getString("Stats.Header.Misc"));
displaySkill(inspect, profile, SkillType.ACROBATICS, display);
displaySkill(inspect, profile, SkillType.REPAIR, display);
}
printGroupedSkillData(inspect, display, LocaleLoader.getString("Stats.Header.Misc"), SkillType.MISC_SKILLS);
}
public static void printMiscSkills(Player player) {
printMiscSkills(player, player);
}
private static void displaySkill(Player player, PlayerProfile profile, SkillType skill, CommandSender display) {
if (Permissions.skillEnabled(player, skill)) {
displaySkill(display, profile, skill);
public static String displaySkill(PlayerProfile profile, SkillType skill) {
if (skill.isChildSkill()) {
return LocaleLoader.getString("Skills.ChildStats", LocaleLoader.getString(StringUtils.getCapitalized(skill.toString()) + ".Listener"), profile.getSkillLevel(skill));
}
return LocaleLoader.getString("Skills.Stats", LocaleLoader.getString(StringUtils.getCapitalized(skill.toString()) + ".Listener"), profile.getSkillLevel(skill), profile.getSkillXpLevel(skill), profile.getXpToLevel(skill));
}
private static void printGroupedSkillData(Player inspect, CommandSender display, String header, List<SkillType> skillGroup) {
PlayerProfile profile = UserManager.getPlayer(inspect).getProfile();
List<String> displayData = new ArrayList<String>();
displayData.add(header);
for (SkillType skill : skillGroup) {
if (Permissions.skillEnabled(inspect, skill)) {
displayData.add(displaySkill(profile, skill));
}
}
int size = displayData.size();
if (size > 1) {
display.sendMessage(displayData.toArray(new String[size]));
}
}
public static void displaySkill(CommandSender sender, PlayerProfile profile, SkillType skill) {
sender.sendMessage(LocaleLoader.getString("Skills.Stats", LocaleLoader.getString(StringUtils.getCapitalized(skill.toString()) + ".Listener"), profile.getSkillLevel(skill), profile.getSkillXpLevel(skill), profile.getXpToLevel(skill)));
}
}