diff --git a/Changelog.txt b/Changelog.txt index ae5f745ff..e868fb4e9 100644 --- a/Changelog.txt +++ b/Changelog.txt @@ -17,10 +17,11 @@ Version 2.1.0 + Added the tagline "Overhaul Era" to various locations until 3.0.0 comes out + (Sound) Volume and Pitch of sounds can now be configured in the new sounds.yml file + (MySQL) Added support for SSL for MySQL/MariaDB (On by default) + + (Skills) Adding a new subskill to child skills called 'Understanding The Art' this adds nothing new, but tracks your progress in that child skill, which was previous a bit obfuscated. + (Skills) Tool alerts now are sent to the Action Bar + (Skills) Super Ability activation alerts are now sent to the Action Bar + (Skills) Certain Skill messages are now sent to the Action Bar - + (Config) Skill Ranks are now defined in skillranks.yml if a skill does not have a rank it's unlocked right away + + (Config) Skill Rank requirements are now defined in skillranks.yml you cannot add or remove ranks from this file + (Config) Added option to use SSL for MySQL in config.yml + (Config) Added option to disable the new URL links to config.yml + (Config) New config file added coreskills.yml @@ -51,6 +52,7 @@ Version 2.1.0 = (MySQL) When converting from MySQL to flatfile mcMMO will now properly include all users in the conversion process + (Party) Parties can now have size limits (configurable in config.yml), party size is unlimited by default ! (Party) Party member list will only include members of the party that you can see (aren't vanished) + ! (Skills) Some skill level rank requirements have changed ! (Skills) Fixed an edge case bug where Blast Mining wouldn't inform the player that it was on cooldown ! (Skills) mcMMO skills will now be on a scale from 1-100 instead of 0-1000 (for existing mcMMO installs this is opt-in and off by default) ! (Skills) Skill Super Powers (Tree Feller, etc...) will now require level 10+ to use @@ -59,6 +61,9 @@ Version 2.1.0 ! (Skills) Woodcutting's Double Drop subskill is now named Harvest Lumber ! (Skills) Archery's Skill Shot now uses a rank system ! (Skills) Axe's Axe Mastery now uses a rank system + ! (Skills) Axe's Impact now uses a rank system + ! (Skills) Herbalism's Farmer's Diet now uses a rank system + ! (Skills) Herbalism's Green Thumb now uses a rank system ! (Config) Unarmed.IronArm in advanced.yml is now Unarmed.IronArmStyle ! (Config) Unarmed.Deflect in advanced.yml is now Unarmed.ArrowDeflect ! (Config) Swords.Counter in advanced.yml is now Swords.CounterAttack @@ -77,9 +82,9 @@ Version 2.1.0 ! (Locale) Super Abilities no longer have (ABILITY) in their Skill.Effect strings ! (API) mcMMO is now built against Spigot-API instead of Bukkit ! (API) Moved a lot of methods from SkillCommand to SkillUtils - ! (API) SkillType is now PrimarySkill + ! (API) SkillType is now PrimarySkillType ! (API) SecondarySkill is now SubSkillType - ! (API) AbilityType is now SuperAbility + ! (API) AbilityType is now SuperAbilityType ! (API) SecondaryAbilityEvent is now SubSkillEvent ! (API) SubSkillType has had many helpful methods added to it ! (API) GREEN_THUMB_PLANT & GREEN_THUMB_BLOCK are replaced by GREEN_THUMB diff --git a/src/main/java/com/gmail/nossr50/api/ExperienceAPI.java b/src/main/java/com/gmail/nossr50/api/ExperienceAPI.java index a13618db0..1879d45b9 100644 --- a/src/main/java/com/gmail/nossr50/api/ExperienceAPI.java +++ b/src/main/java/com/gmail/nossr50/api/ExperienceAPI.java @@ -3,7 +3,7 @@ package com.gmail.nossr50.api; import java.util.Set; import java.util.UUID; -import com.gmail.nossr50.datatypes.skills.PrimarySkill; +import com.gmail.nossr50.datatypes.skills.PrimarySkillType; import org.bukkit.entity.Player; import com.gmail.nossr50.mcMMO; @@ -34,7 +34,7 @@ public final class ExperienceAPI { * @return true if this is a valid mcMMO skill */ public static boolean isValidSkillType(String skillType) { - return PrimarySkill.getSkill(skillType) != null; + return PrimarySkillType.getSkill(skillType) != null; } /** @@ -48,7 +48,7 @@ public final class ExperienceAPI { * @return true if this is a valid, non-child mcMMO skill */ public static boolean isNonChildSkill(String skillType) { - PrimarySkill skill = PrimarySkill.getSkill(skillType); + PrimarySkillType skill = PrimarySkillType.getSkill(skillType); return skill != null && !skill.isChildSkill(); } @@ -261,7 +261,7 @@ public final class ExperienceAPI { * @throws InvalidXPGainReasonException if the given xpGainReason is not valid */ public static void addModifiedXP(Player player, String skillType, int XP, String xpGainReason, boolean isUnshared) { - PrimarySkill skill = getSkillType(skillType); + PrimarySkillType skill = getSkillType(skillType); if (isUnshared) { getPlayer(player).beginUnsharedXpGain(skill, (int) (XP / skill.getXpModifier() * ExperienceConfig.getInstance().getExperienceGainsGlobalMultiplier()), getXPGainReason(xpGainReason)); @@ -285,7 +285,7 @@ public final class ExperienceAPI { */ @Deprecated public static void addModifiedXPOffline(String playerName, String skillType, int XP) { - PrimarySkill skill = getSkillType(skillType); + PrimarySkillType skill = getSkillType(skillType); addOfflineXP(playerName, skill, (int) (XP / skill.getXpModifier() * ExperienceConfig.getInstance().getExperienceGainsGlobalMultiplier())); } @@ -515,7 +515,7 @@ public final class ExperienceAPI { * @throws UnsupportedOperationException if the given skill is a child skill */ public static int getXPRemaining(Player player, String skillType) { - PrimarySkill skill = getNonChildSkillType(skillType); + PrimarySkillType skill = getNonChildSkillType(skillType); PlayerProfile profile = getPlayer(player).getProfile(); @@ -537,7 +537,7 @@ public final class ExperienceAPI { */ @Deprecated public static int getOfflineXPRemaining(String playerName, String skillType) { - PrimarySkill skill = getNonChildSkillType(skillType); + PrimarySkillType skill = getNonChildSkillType(skillType); PlayerProfile profile = getOfflineProfile(playerName); return profile.getXpToLevel(skill) - profile.getSkillXpLevel(skill); @@ -557,7 +557,7 @@ public final class ExperienceAPI { * @throws UnsupportedOperationException if the given skill is a child skill */ public static float getOfflineXPRemaining(UUID uuid, String skillType) { - PrimarySkill skill = getNonChildSkillType(skillType); + PrimarySkillType skill = getNonChildSkillType(skillType); PlayerProfile profile = getOfflineProfile(uuid); return profile.getXpToLevel(skill) - profile.getSkillXpLevelRaw(skill); @@ -593,12 +593,12 @@ public final class ExperienceAPI { @Deprecated public static void addLevelOffline(String playerName, String skillType, int levels) { PlayerProfile profile = getOfflineProfile(playerName); - PrimarySkill skill = getSkillType(skillType); + PrimarySkillType skill = getSkillType(skillType); if (skill.isChildSkill()) { - Set parentSkills = FamilyTree.getParents(skill); + Set parentSkills = FamilyTree.getParents(skill); - for (PrimarySkill parentSkill : parentSkills) { + for (PrimarySkillType parentSkill : parentSkills) { profile.addLevels(parentSkill, (levels / parentSkills.size())); } @@ -624,12 +624,12 @@ public final class ExperienceAPI { */ public static void addLevelOffline(UUID uuid, String skillType, int levels) { PlayerProfile profile = getOfflineProfile(uuid); - PrimarySkill skill = getSkillType(skillType); + PrimarySkillType skill = getSkillType(skillType); if (skill.isChildSkill()) { - Set parentSkills = FamilyTree.getParents(skill); + Set parentSkills = FamilyTree.getParents(skill); - for (PrimarySkill parentSkill : parentSkills) { + for (PrimarySkillType parentSkill : parentSkills) { profile.addLevels(parentSkill, (levels / parentSkills.size())); } @@ -716,7 +716,7 @@ public final class ExperienceAPI { int powerLevel = 0; PlayerProfile profile = getOfflineProfile(playerName); - for (PrimarySkill type : PrimarySkill.NON_CHILD_SKILLS) { + for (PrimarySkillType type : PrimarySkillType.NON_CHILD_SKILLS) { powerLevel += profile.getSkillLevel(type); } @@ -737,7 +737,7 @@ public final class ExperienceAPI { int powerLevel = 0; PlayerProfile profile = getOfflineProfile(uuid); - for (PrimarySkill type : PrimarySkill.NON_CHILD_SKILLS) { + for (PrimarySkillType type : PrimarySkillType.NON_CHILD_SKILLS) { powerLevel += profile.getSkillLevel(type); } @@ -1015,7 +1015,7 @@ public final class ExperienceAPI { } // Utility methods follow. - private static void addOfflineXP(UUID playerUniqueId, PrimarySkill skill, int XP) { + private static void addOfflineXP(UUID playerUniqueId, PrimarySkillType skill, int XP) { PlayerProfile profile = getOfflineProfile(playerUniqueId); profile.addXp(skill, XP); @@ -1023,7 +1023,7 @@ public final class ExperienceAPI { } @Deprecated - private static void addOfflineXP(String playerName, PrimarySkill skill, int XP) { + private static void addOfflineXP(String playerName, PrimarySkillType skill, int XP) { PlayerProfile profile = getOfflineProfile(playerName); profile.addXp(skill, XP); @@ -1052,8 +1052,8 @@ public final class ExperienceAPI { return profile; } - private static PrimarySkill getSkillType(String skillType) throws InvalidSkillException { - PrimarySkill skill = PrimarySkill.getSkill(skillType); + private static PrimarySkillType getSkillType(String skillType) throws InvalidSkillException { + PrimarySkillType skill = PrimarySkillType.getSkill(skillType); if (skill == null) { throw new InvalidSkillException(); @@ -1062,8 +1062,8 @@ public final class ExperienceAPI { return skill; } - private static PrimarySkill getNonChildSkillType(String skillType) throws InvalidSkillException, UnsupportedOperationException { - PrimarySkill skill = getSkillType(skillType); + private static PrimarySkillType getNonChildSkillType(String skillType) throws InvalidSkillException, UnsupportedOperationException { + PrimarySkillType skill = getSkillType(skillType); if (skill.isChildSkill()) { throw new UnsupportedOperationException("Child skills do not have XP"); diff --git a/src/main/java/com/gmail/nossr50/api/SkillAPI.java b/src/main/java/com/gmail/nossr50/api/SkillAPI.java index 728b7cb9e..de895c65f 100644 --- a/src/main/java/com/gmail/nossr50/api/SkillAPI.java +++ b/src/main/java/com/gmail/nossr50/api/SkillAPI.java @@ -4,7 +4,7 @@ import java.util.ArrayList; import java.util.Arrays; import java.util.List; -import com.gmail.nossr50.datatypes.skills.PrimarySkill; +import com.gmail.nossr50.datatypes.skills.PrimarySkillType; public final class SkillAPI { private SkillAPI() {} @@ -18,7 +18,7 @@ public final class SkillAPI { * @return a list of strings with valid skill names */ public static List getSkills() { - return getListFromEnum(Arrays.asList(PrimarySkill.values())); + return getListFromEnum(Arrays.asList(PrimarySkillType.values())); } /** @@ -30,7 +30,7 @@ public final class SkillAPI { * @return a list of strings with valid skill names */ public static List getNonChildSkills() { - return getListFromEnum(PrimarySkill.NON_CHILD_SKILLS); + return getListFromEnum(PrimarySkillType.NON_CHILD_SKILLS); } /** @@ -42,7 +42,7 @@ public final class SkillAPI { * @return a list of strings with valid skill names */ public static List getChildSkills() { - return getListFromEnum(PrimarySkill.CHILD_SKILLS); + return getListFromEnum(PrimarySkillType.CHILD_SKILLS); } /** @@ -54,7 +54,7 @@ public final class SkillAPI { * @return a list of strings with valid skill names */ public static List getCombatSkills() { - return getListFromEnum(PrimarySkill.COMBAT_SKILLS); + return getListFromEnum(PrimarySkillType.COMBAT_SKILLS); } /** @@ -66,7 +66,7 @@ public final class SkillAPI { * @return a list of strings with valid skill names */ public static List getGatheringSkills() { - return getListFromEnum(PrimarySkill.GATHERING_SKILLS); + return getListFromEnum(PrimarySkillType.GATHERING_SKILLS); } /** @@ -78,14 +78,14 @@ public final class SkillAPI { * @return a list of strings with valid skill names */ public static List getMiscSkills() { - return getListFromEnum(PrimarySkill.MISC_SKILLS); + return getListFromEnum(PrimarySkillType.MISC_SKILLS); } - private static List getListFromEnum(List skillsTypes) { + private static List getListFromEnum(List skillsTypes) { List skills = new ArrayList(); - for (PrimarySkill primarySkill : skillsTypes) { - skills.add(primarySkill.name()); + for (PrimarySkillType primarySkillType : skillsTypes) { + skills.add(primarySkillType.name()); } return skills; diff --git a/src/main/java/com/gmail/nossr50/commands/experience/AddlevelsCommand.java b/src/main/java/com/gmail/nossr50/commands/experience/AddlevelsCommand.java index d85bd3218..496597bf2 100644 --- a/src/main/java/com/gmail/nossr50/commands/experience/AddlevelsCommand.java +++ b/src/main/java/com/gmail/nossr50/commands/experience/AddlevelsCommand.java @@ -1,6 +1,6 @@ package com.gmail.nossr50.commands.experience; -import com.gmail.nossr50.datatypes.skills.PrimarySkill; +import com.gmail.nossr50.datatypes.skills.PrimarySkillType; import org.bukkit.command.CommandSender; import org.bukkit.entity.Player; @@ -22,7 +22,7 @@ public class AddlevelsCommand extends ExperienceCommand { } @Override - protected void handleCommand(Player player, PlayerProfile profile, PrimarySkill skill, int value) { + protected void handleCommand(Player player, PlayerProfile profile, PrimarySkillType skill, int value) { float xpRemoved = profile.getSkillXpLevelRaw(skill); profile.addLevels(skill, value); @@ -40,7 +40,7 @@ public class AddlevelsCommand extends ExperienceCommand { } @Override - protected void handlePlayerMessageSkill(Player player, int value, PrimarySkill skill) { + protected void handlePlayerMessageSkill(Player player, int value, PrimarySkillType skill) { player.sendMessage(LocaleLoader.getString("Commands.addlevels.AwardSkill.1", value, skill.getName())); } } diff --git a/src/main/java/com/gmail/nossr50/commands/experience/AddxpCommand.java b/src/main/java/com/gmail/nossr50/commands/experience/AddxpCommand.java index dc74ec7b4..c3a7672db 100644 --- a/src/main/java/com/gmail/nossr50/commands/experience/AddxpCommand.java +++ b/src/main/java/com/gmail/nossr50/commands/experience/AddxpCommand.java @@ -1,6 +1,6 @@ package com.gmail.nossr50.commands.experience; -import com.gmail.nossr50.datatypes.skills.PrimarySkill; +import com.gmail.nossr50.datatypes.skills.PrimarySkillType; import org.bukkit.command.CommandSender; import org.bukkit.entity.Player; @@ -22,7 +22,7 @@ public class AddxpCommand extends ExperienceCommand { } @Override - protected void handleCommand(Player player, PlayerProfile profile, PrimarySkill skill, int value) { + protected void handleCommand(Player player, PlayerProfile profile, PrimarySkillType skill, int value) { if (player != null) { UserManager.getPlayer(player).applyXpGain(skill, value, XPGainReason.COMMAND); } @@ -38,7 +38,7 @@ public class AddxpCommand extends ExperienceCommand { } @Override - protected void handlePlayerMessageSkill(Player player, int value, PrimarySkill skill) { + protected void handlePlayerMessageSkill(Player player, int value, PrimarySkillType skill) { player.sendMessage(LocaleLoader.getString("Commands.addxp.AwardSkill", value, skill.getName())); } } diff --git a/src/main/java/com/gmail/nossr50/commands/experience/ExperienceCommand.java b/src/main/java/com/gmail/nossr50/commands/experience/ExperienceCommand.java index 32b24c3e4..065956531 100644 --- a/src/main/java/com/gmail/nossr50/commands/experience/ExperienceCommand.java +++ b/src/main/java/com/gmail/nossr50/commands/experience/ExperienceCommand.java @@ -4,7 +4,7 @@ import java.util.ArrayList; import java.util.List; import java.util.UUID; -import com.gmail.nossr50.datatypes.skills.PrimarySkill; +import com.gmail.nossr50.datatypes.skills.PrimarySkillType; import org.bukkit.OfflinePlayer; import org.bukkit.command.Command; import org.bukkit.command.CommandSender; @@ -23,7 +23,7 @@ import com.google.common.collect.ImmutableList; public abstract class ExperienceCommand implements TabExecutor { @Override public boolean onCommand(CommandSender sender, Command command, String label, String[] args) { - PrimarySkill skill; + PrimarySkillType skill; switch (args.length) { case 2: @@ -40,7 +40,7 @@ public abstract class ExperienceCommand implements TabExecutor { return true; } - skill = PrimarySkill.getSkill(args[0]); + skill = PrimarySkillType.getSkill(args[0]); if (args[1].equalsIgnoreCase("all")) { skill = null; @@ -65,7 +65,7 @@ public abstract class ExperienceCommand implements TabExecutor { return true; } - skill = PrimarySkill.getSkill(args[1]); + skill = PrimarySkillType.getSkill(args[1]); if (args[1].equalsIgnoreCase("all")) { skill = null; @@ -116,7 +116,7 @@ public abstract class ExperienceCommand implements TabExecutor { List playerNames = CommandUtils.getOnlinePlayerNames(sender); return StringUtil.copyPartialMatches(args[0], playerNames, new ArrayList(playerNames.size())); case 2: - return StringUtil.copyPartialMatches(args[1], PrimarySkill.SKILL_NAMES, new ArrayList(PrimarySkill.SKILL_NAMES.size())); + return StringUtil.copyPartialMatches(args[1], PrimarySkillType.SKILL_NAMES, new ArrayList(PrimarySkillType.SKILL_NAMES.size())); default: return ImmutableList.of(); } @@ -124,15 +124,15 @@ public abstract class ExperienceCommand implements TabExecutor { protected abstract boolean permissionsCheckSelf(CommandSender sender); protected abstract boolean permissionsCheckOthers(CommandSender sender); - protected abstract void handleCommand(Player player, PlayerProfile profile, PrimarySkill skill, int value); + protected abstract void handleCommand(Player player, PlayerProfile profile, PrimarySkillType skill, int value); protected abstract void handlePlayerMessageAll(Player player, int value); - protected abstract void handlePlayerMessageSkill(Player player, int value, PrimarySkill skill); + protected abstract void handlePlayerMessageSkill(Player player, int value, PrimarySkillType skill); private boolean validateArguments(CommandSender sender, String skillName, String value) { return !(CommandUtils.isInvalidInteger(sender, value) || (!skillName.equalsIgnoreCase("all") && CommandUtils.isInvalidSkill(sender, skillName))); } - protected static void handleSenderMessage(CommandSender sender, String playerName, PrimarySkill skill) { + protected static void handleSenderMessage(CommandSender sender, String playerName, PrimarySkillType skill) { if (skill == null) { sender.sendMessage(LocaleLoader.getString("Commands.addlevels.AwardAll.2", playerName)); } @@ -141,10 +141,10 @@ public abstract class ExperienceCommand implements TabExecutor { } } - protected void editValues(Player player, PlayerProfile profile, PrimarySkill skill, int value) { + protected void editValues(Player player, PlayerProfile profile, PrimarySkillType skill, int value) { if (skill == null) { - for (PrimarySkill primarySkill : PrimarySkill.NON_CHILD_SKILLS) { - handleCommand(player, profile, primarySkill, value); + for (PrimarySkillType primarySkillType : PrimarySkillType.NON_CHILD_SKILLS) { + handleCommand(player, profile, primarySkillType, value); } if (player != null) { diff --git a/src/main/java/com/gmail/nossr50/commands/experience/MmoeditCommand.java b/src/main/java/com/gmail/nossr50/commands/experience/MmoeditCommand.java index 759b318c6..25951c20b 100644 --- a/src/main/java/com/gmail/nossr50/commands/experience/MmoeditCommand.java +++ b/src/main/java/com/gmail/nossr50/commands/experience/MmoeditCommand.java @@ -1,6 +1,6 @@ package com.gmail.nossr50.commands.experience; -import com.gmail.nossr50.datatypes.skills.PrimarySkill; +import com.gmail.nossr50.datatypes.skills.PrimarySkillType; import org.bukkit.command.CommandSender; import org.bukkit.entity.Player; @@ -22,7 +22,7 @@ public class MmoeditCommand extends ExperienceCommand { } @Override - protected void handleCommand(Player player, PlayerProfile profile, PrimarySkill skill, int value) { + protected void handleCommand(Player player, PlayerProfile profile, PrimarySkillType skill, int value) { int skillLevel = profile.getSkillLevel(skill); float xpRemoved = profile.getSkillXpLevelRaw(skill); @@ -46,7 +46,7 @@ public class MmoeditCommand extends ExperienceCommand { } @Override - protected void handlePlayerMessageSkill(Player player, int value, PrimarySkill skill) { + protected void handlePlayerMessageSkill(Player player, int value, PrimarySkillType skill) { player.sendMessage(LocaleLoader.getString("Commands.mmoedit.Modified.1", skill.getName(), value)); } } diff --git a/src/main/java/com/gmail/nossr50/commands/experience/SkillresetCommand.java b/src/main/java/com/gmail/nossr50/commands/experience/SkillresetCommand.java index 0efd84cb8..8b6f18978 100644 --- a/src/main/java/com/gmail/nossr50/commands/experience/SkillresetCommand.java +++ b/src/main/java/com/gmail/nossr50/commands/experience/SkillresetCommand.java @@ -4,7 +4,7 @@ import java.util.ArrayList; import java.util.List; import java.util.UUID; -import com.gmail.nossr50.datatypes.skills.PrimarySkill; +import com.gmail.nossr50.datatypes.skills.PrimarySkillType; import org.bukkit.OfflinePlayer; import org.bukkit.command.Command; import org.bukkit.command.CommandSender; @@ -30,7 +30,7 @@ import com.google.common.collect.ImmutableList; public class SkillresetCommand implements TabExecutor { @Override public boolean onCommand(CommandSender sender, Command command, String label, String[] args) { - PrimarySkill skill; + PrimarySkillType skill; switch (args.length) { case 1: if (CommandUtils.noConsoleUsage(sender)) { @@ -50,7 +50,7 @@ public class SkillresetCommand implements TabExecutor { skill = null; } else { - skill = PrimarySkill.getSkill(args[1]); + skill = PrimarySkillType.getSkill(args[1]); } editValues((Player) sender, UserManager.getPlayer(sender.getName()).getProfile(), skill); @@ -70,7 +70,7 @@ public class SkillresetCommand implements TabExecutor { skill = null; } else { - skill = PrimarySkill.getSkill(args[1]); + skill = PrimarySkillType.getSkill(args[1]); } String playerName = CommandUtils.getMatchedPlayerName(args[0]); @@ -110,13 +110,13 @@ public class SkillresetCommand implements TabExecutor { List playerNames = CommandUtils.getOnlinePlayerNames(sender); return StringUtil.copyPartialMatches(args[0], playerNames, new ArrayList(playerNames.size())); case 2: - return StringUtil.copyPartialMatches(args[1], PrimarySkill.SKILL_NAMES, new ArrayList(PrimarySkill.SKILL_NAMES.size())); + return StringUtil.copyPartialMatches(args[1], PrimarySkillType.SKILL_NAMES, new ArrayList(PrimarySkillType.SKILL_NAMES.size())); default: return ImmutableList.of(); } } - protected void handleCommand(Player player, PlayerProfile profile, PrimarySkill skill) { + protected void handleCommand(Player player, PlayerProfile profile, PrimarySkillType skill) { int levelsRemoved = profile.getSkillLevel(skill); float xpRemoved = profile.getSkillXpLevelRaw(skill); @@ -142,7 +142,7 @@ public class SkillresetCommand implements TabExecutor { player.sendMessage(LocaleLoader.getString("Commands.Reset.All")); } - protected void handlePlayerMessageSkill(Player player, PrimarySkill skill) { + protected void handlePlayerMessageSkill(Player player, PrimarySkillType skill) { player.sendMessage(LocaleLoader.getString("Commands.Reset.Single", skill.getName())); } @@ -150,7 +150,7 @@ public class SkillresetCommand implements TabExecutor { return skillName.equalsIgnoreCase("all") || !CommandUtils.isInvalidSkill(sender, skillName); } - protected static void handleSenderMessage(CommandSender sender, String playerName, PrimarySkill skill) { + protected static void handleSenderMessage(CommandSender sender, String playerName, PrimarySkillType skill) { if (skill == null) { sender.sendMessage(LocaleLoader.getString("Commands.addlevels.AwardAll.2", playerName)); } @@ -159,10 +159,10 @@ public class SkillresetCommand implements TabExecutor { } } - protected void editValues(Player player, PlayerProfile profile, PrimarySkill skill) { + protected void editValues(Player player, PlayerProfile profile, PrimarySkillType skill) { if (skill == null) { - for (PrimarySkill primarySkill : PrimarySkill.NON_CHILD_SKILLS) { - handleCommand(player, profile, primarySkill); + for (PrimarySkillType primarySkillType : PrimarySkillType.NON_CHILD_SKILLS) { + handleCommand(player, profile, primarySkillType); } if (player != null) { diff --git a/src/main/java/com/gmail/nossr50/commands/hardcore/HardcoreCommand.java b/src/main/java/com/gmail/nossr50/commands/hardcore/HardcoreCommand.java index d51bbf96c..948640406 100644 --- a/src/main/java/com/gmail/nossr50/commands/hardcore/HardcoreCommand.java +++ b/src/main/java/com/gmail/nossr50/commands/hardcore/HardcoreCommand.java @@ -1,6 +1,6 @@ package com.gmail.nossr50.commands.hardcore; -import com.gmail.nossr50.datatypes.skills.PrimarySkill; +import com.gmail.nossr50.datatypes.skills.PrimarySkillType; import org.bukkit.command.CommandSender; import com.gmail.nossr50.mcMMO; @@ -20,10 +20,10 @@ public class HardcoreCommand extends HardcoreModeCommand { } @Override - protected boolean checkEnabled(PrimarySkill skill) { + protected boolean checkEnabled(PrimarySkillType skill) { if (skill == null) { - for (PrimarySkill primarySkill : PrimarySkill.values()) { - if (!primarySkill.getHardcoreStatLossEnabled()) { + for (PrimarySkillType primarySkillType : PrimarySkillType.values()) { + if (!primarySkillType.getHardcoreStatLossEnabled()) { return false; } } @@ -35,12 +35,12 @@ public class HardcoreCommand extends HardcoreModeCommand { } @Override - protected void enable(PrimarySkill skill) { + protected void enable(PrimarySkillType skill) { toggle(true, skill); } @Override - protected void disable(PrimarySkill skill) { + protected void disable(PrimarySkillType skill) { toggle(false, skill); } @@ -50,10 +50,10 @@ public class HardcoreCommand extends HardcoreModeCommand { sender.sendMessage(LocaleLoader.getString("Hardcore.DeathStatLoss.PercentageChanged", percent.format(newPercentage / 100.0D))); } - private void toggle(boolean enable, PrimarySkill skill) { + private void toggle(boolean enable, PrimarySkillType skill) { if (skill == null) { - for (PrimarySkill primarySkill : PrimarySkill.NON_CHILD_SKILLS) { - primarySkill.setHardcoreStatLossEnabled(enable); + for (PrimarySkillType primarySkillType : PrimarySkillType.NON_CHILD_SKILLS) { + primarySkillType.setHardcoreStatLossEnabled(enable); } } else { diff --git a/src/main/java/com/gmail/nossr50/commands/hardcore/HardcoreModeCommand.java b/src/main/java/com/gmail/nossr50/commands/hardcore/HardcoreModeCommand.java index 47e1f4dd8..f1e76c3a7 100644 --- a/src/main/java/com/gmail/nossr50/commands/hardcore/HardcoreModeCommand.java +++ b/src/main/java/com/gmail/nossr50/commands/hardcore/HardcoreModeCommand.java @@ -4,7 +4,7 @@ import java.text.DecimalFormat; import java.util.ArrayList; import java.util.List; -import com.gmail.nossr50.datatypes.skills.PrimarySkill; +import com.gmail.nossr50.datatypes.skills.PrimarySkillType; import org.bukkit.command.Command; import org.bukkit.command.CommandSender; import org.bukkit.command.TabExecutor; @@ -76,7 +76,7 @@ public abstract class HardcoreModeCommand implements TabExecutor { return true; } - PrimarySkill skill = PrimarySkill.getSkill(args[0]); + PrimarySkillType skill = PrimarySkillType.getSkill(args[0]); if (!CommandUtils.isChildSkill(sender, skill)) { return true; @@ -125,8 +125,8 @@ public abstract class HardcoreModeCommand implements TabExecutor { protected abstract boolean checkTogglePermissions(CommandSender sender); protected abstract boolean checkModifyPermissions(CommandSender sender); - protected abstract boolean checkEnabled(PrimarySkill skill); - protected abstract void enable(PrimarySkill skill); - protected abstract void disable(PrimarySkill skill); + protected abstract boolean checkEnabled(PrimarySkillType skill); + protected abstract void enable(PrimarySkillType skill); + protected abstract void disable(PrimarySkillType skill); protected abstract void modify(CommandSender sender, double newPercentage); } diff --git a/src/main/java/com/gmail/nossr50/commands/hardcore/VampirismCommand.java b/src/main/java/com/gmail/nossr50/commands/hardcore/VampirismCommand.java index e85aa6e4c..2cd3297a5 100644 --- a/src/main/java/com/gmail/nossr50/commands/hardcore/VampirismCommand.java +++ b/src/main/java/com/gmail/nossr50/commands/hardcore/VampirismCommand.java @@ -4,7 +4,7 @@ import org.bukkit.command.CommandSender; import com.gmail.nossr50.mcMMO; import com.gmail.nossr50.config.Config; -import com.gmail.nossr50.datatypes.skills.PrimarySkill; +import com.gmail.nossr50.datatypes.skills.PrimarySkillType; import com.gmail.nossr50.locale.LocaleLoader; import com.gmail.nossr50.util.Permissions; @@ -20,10 +20,10 @@ public class VampirismCommand extends HardcoreModeCommand { } @Override - protected boolean checkEnabled(PrimarySkill skill) { + protected boolean checkEnabled(PrimarySkillType skill) { if (skill == null) { - for (PrimarySkill primarySkill : PrimarySkill.values()) { - if (!primarySkill.getHardcoreVampirismEnabled()) { + for (PrimarySkillType primarySkillType : PrimarySkillType.values()) { + if (!primarySkillType.getHardcoreVampirismEnabled()) { return false; } } @@ -35,12 +35,12 @@ public class VampirismCommand extends HardcoreModeCommand { } @Override - protected void enable(PrimarySkill skill) { + protected void enable(PrimarySkillType skill) { toggle(true, skill); } @Override - protected void disable(PrimarySkill skill) { + protected void disable(PrimarySkillType skill) { toggle(false, skill); } @@ -50,10 +50,10 @@ public class VampirismCommand extends HardcoreModeCommand { sender.sendMessage(LocaleLoader.getString("Hardcore.Vampirism.PercentageChanged", percent.format(newPercentage / 100.0D))); } - private void toggle(boolean enable, PrimarySkill skill) { + private void toggle(boolean enable, PrimarySkillType skill) { if (skill == null) { - for (PrimarySkill primarySkill : PrimarySkill.NON_CHILD_SKILLS) { - primarySkill.setHardcoreVampirismEnabled(enable); + for (PrimarySkillType primarySkillType : PrimarySkillType.NON_CHILD_SKILLS) { + primarySkillType.setHardcoreVampirismEnabled(enable); } } else { diff --git a/src/main/java/com/gmail/nossr50/commands/player/InspectCommand.java b/src/main/java/com/gmail/nossr50/commands/player/InspectCommand.java index 9fcde0739..b91ac6645 100644 --- a/src/main/java/com/gmail/nossr50/commands/player/InspectCommand.java +++ b/src/main/java/com/gmail/nossr50/commands/player/InspectCommand.java @@ -3,7 +3,7 @@ package com.gmail.nossr50.commands.player; import java.util.ArrayList; import java.util.List; -import com.gmail.nossr50.datatypes.skills.PrimarySkill; +import com.gmail.nossr50.datatypes.skills.PrimarySkillType; import org.bukkit.command.Command; import org.bukkit.command.CommandSender; import org.bukkit.command.TabExecutor; @@ -53,17 +53,17 @@ public class InspectCommand implements TabExecutor { sender.sendMessage(LocaleLoader.getString("Inspect.OfflineStats", playerName)); sender.sendMessage(LocaleLoader.getString("Stats.Header.Gathering")); - for (PrimarySkill skill : PrimarySkill.GATHERING_SKILLS) { + for (PrimarySkillType skill : PrimarySkillType.GATHERING_SKILLS) { sender.sendMessage(CommandUtils.displaySkill(profile, skill)); } sender.sendMessage(LocaleLoader.getString("Stats.Header.Combat")); - for (PrimarySkill skill : PrimarySkill.COMBAT_SKILLS) { + for (PrimarySkillType skill : PrimarySkillType.COMBAT_SKILLS) { sender.sendMessage(CommandUtils.displaySkill(profile, skill)); } sender.sendMessage(LocaleLoader.getString("Stats.Header.Misc")); - for (PrimarySkill skill : PrimarySkill.MISC_SKILLS) { + for (PrimarySkillType skill : PrimarySkillType.MISC_SKILLS) { sender.sendMessage(CommandUtils.displaySkill(profile, skill)); } diff --git a/src/main/java/com/gmail/nossr50/commands/player/MctopCommand.java b/src/main/java/com/gmail/nossr50/commands/player/MctopCommand.java index f80ed914c..dc9acb3b5 100644 --- a/src/main/java/com/gmail/nossr50/commands/player/MctopCommand.java +++ b/src/main/java/com/gmail/nossr50/commands/player/MctopCommand.java @@ -2,7 +2,7 @@ package com.gmail.nossr50.commands.player; import com.gmail.nossr50.config.Config; import com.gmail.nossr50.datatypes.player.McMMOPlayer; -import com.gmail.nossr50.datatypes.skills.PrimarySkill; +import com.gmail.nossr50.datatypes.skills.PrimarySkillType; import com.gmail.nossr50.locale.LocaleLoader; import com.gmail.nossr50.mcMMO; import com.gmail.nossr50.runnables.commands.MctopCommandAsyncTask; @@ -24,7 +24,7 @@ import java.util.List; public class MctopCommand implements TabExecutor { @Override public boolean onCommand(CommandSender sender, Command command, String label, String[] args) { - PrimarySkill skill = null; + PrimarySkillType skill = null; switch (args.length) { case 0: @@ -69,13 +69,13 @@ public class MctopCommand implements TabExecutor { public List onTabComplete(CommandSender sender, Command command, String alias, String[] args) { switch (args.length) { case 1: - return StringUtil.copyPartialMatches(args[0], PrimarySkill.SKILL_NAMES, new ArrayList(PrimarySkill.SKILL_NAMES.size())); + return StringUtil.copyPartialMatches(args[0], PrimarySkillType.SKILL_NAMES, new ArrayList(PrimarySkillType.SKILL_NAMES.size())); default: return ImmutableList.of(); } } - private void display(int page, PrimarySkill skill, CommandSender sender, Command command) { + private void display(int page, PrimarySkillType skill, CommandSender sender, Command command) { if (skill != null && !Permissions.mctop(sender, skill)) { sender.sendMessage(command.getPermissionMessage()); return; @@ -112,19 +112,19 @@ public class MctopCommand implements TabExecutor { display(page, skill, sender); } - private void display(int page, PrimarySkill skill, CommandSender sender) { + private void display(int page, PrimarySkillType skill, CommandSender sender) { boolean useBoard = (sender instanceof Player) && (Config.getInstance().getTopUseBoard()); boolean useChat = !useBoard || Config.getInstance().getTopUseChat(); new MctopCommandAsyncTask(page, skill, sender, useBoard, useChat).runTaskAsynchronously(mcMMO.p); } - private PrimarySkill extractSkill(CommandSender sender, String skillName) { + private PrimarySkillType extractSkill(CommandSender sender, String skillName) { if (CommandUtils.isInvalidSkill(sender, skillName)) { return null; } - PrimarySkill skill = PrimarySkill.getSkill(skillName); + PrimarySkillType skill = PrimarySkillType.getSkill(skillName); if (CommandUtils.isChildSkill(sender, skill)) { return null; diff --git a/src/main/java/com/gmail/nossr50/commands/skills/AcrobaticsCommand.java b/src/main/java/com/gmail/nossr50/commands/skills/AcrobaticsCommand.java index d71b90a49..28acd6009 100644 --- a/src/main/java/com/gmail/nossr50/commands/skills/AcrobaticsCommand.java +++ b/src/main/java/com/gmail/nossr50/commands/skills/AcrobaticsCommand.java @@ -9,7 +9,7 @@ import com.gmail.nossr50.util.skills.SkillUtils; import net.md_5.bungee.api.chat.TextComponent; import org.bukkit.entity.Player; -import com.gmail.nossr50.datatypes.skills.PrimarySkill; +import com.gmail.nossr50.datatypes.skills.PrimarySkillType; import com.gmail.nossr50.locale.LocaleLoader; import com.gmail.nossr50.util.Permissions; @@ -21,7 +21,7 @@ public class AcrobaticsCommand extends SkillCommand { private boolean canRoll; public AcrobaticsCommand() { - super(PrimarySkill.ACROBATICS); + super(PrimarySkillType.ACROBATICS); } @Override @@ -82,7 +82,7 @@ public class AcrobaticsCommand extends SkillCommand { protected List getTextComponents(Player player) { List textComponents = new ArrayList<>(); - TextComponentFactory.getSubSkillTextComponents(player, textComponents, PrimarySkill.ACROBATICS); + TextComponentFactory.getSubSkillTextComponents(player, textComponents, PrimarySkillType.ACROBATICS); return textComponents; } diff --git a/src/main/java/com/gmail/nossr50/commands/skills/AlchemyCommand.java b/src/main/java/com/gmail/nossr50/commands/skills/AlchemyCommand.java index 69c522dfa..ef0533d91 100644 --- a/src/main/java/com/gmail/nossr50/commands/skills/AlchemyCommand.java +++ b/src/main/java/com/gmail/nossr50/commands/skills/AlchemyCommand.java @@ -3,7 +3,7 @@ package com.gmail.nossr50.commands.skills; import java.util.ArrayList; import java.util.List; -import com.gmail.nossr50.datatypes.skills.PrimarySkill; +import com.gmail.nossr50.datatypes.skills.PrimarySkillType; import com.gmail.nossr50.datatypes.skills.SubSkillType; import com.gmail.nossr50.util.TextComponentFactory; import net.md_5.bungee.api.chat.TextComponent; @@ -28,7 +28,7 @@ public class AlchemyCommand extends SkillCommand { private boolean canConcoctions; public AlchemyCommand() { - super(PrimarySkill.ALCHEMY); + super(PrimarySkillType.ALCHEMY); } protected String[] calculateAbilityDisplayValues(Player player, boolean isLucky) { @@ -107,7 +107,7 @@ public class AlchemyCommand extends SkillCommand { protected List getTextComponents(Player player) { List textComponents = new ArrayList<>(); - TextComponentFactory.getSubSkillTextComponents(player, textComponents, PrimarySkill.ALCHEMY); + TextComponentFactory.getSubSkillTextComponents(player, textComponents, PrimarySkillType.ALCHEMY); return textComponents; } diff --git a/src/main/java/com/gmail/nossr50/commands/skills/ArcheryCommand.java b/src/main/java/com/gmail/nossr50/commands/skills/ArcheryCommand.java index 036dcf5a7..a3afe460c 100644 --- a/src/main/java/com/gmail/nossr50/commands/skills/ArcheryCommand.java +++ b/src/main/java/com/gmail/nossr50/commands/skills/ArcheryCommand.java @@ -3,7 +3,7 @@ package com.gmail.nossr50.commands.skills; import java.util.ArrayList; import java.util.List; -import com.gmail.nossr50.datatypes.skills.PrimarySkill; +import com.gmail.nossr50.datatypes.skills.PrimarySkillType; import com.gmail.nossr50.datatypes.skills.SubSkillType; import com.gmail.nossr50.util.TextComponentFactory; import net.md_5.bungee.api.chat.TextComponent; @@ -25,7 +25,7 @@ public class ArcheryCommand extends SkillCommand { private boolean canRetrieve; public ArcheryCommand() { - super(PrimarySkill.ARCHERY); + super(PrimarySkillType.ARCHERY); } @Override @@ -100,7 +100,7 @@ public class ArcheryCommand extends SkillCommand { protected List getTextComponents(Player player) { List textComponents = new ArrayList<>(); - TextComponentFactory.getSubSkillTextComponents(player, textComponents, PrimarySkill.ARCHERY); + TextComponentFactory.getSubSkillTextComponents(player, textComponents, PrimarySkillType.ARCHERY); return textComponents; } diff --git a/src/main/java/com/gmail/nossr50/commands/skills/AxesCommand.java b/src/main/java/com/gmail/nossr50/commands/skills/AxesCommand.java index b810ccc03..b218304c2 100644 --- a/src/main/java/com/gmail/nossr50/commands/skills/AxesCommand.java +++ b/src/main/java/com/gmail/nossr50/commands/skills/AxesCommand.java @@ -3,7 +3,7 @@ package com.gmail.nossr50.commands.skills; import java.util.ArrayList; import java.util.List; -import com.gmail.nossr50.datatypes.skills.PrimarySkill; +import com.gmail.nossr50.datatypes.skills.PrimarySkillType; import com.gmail.nossr50.datatypes.skills.SubSkillType; import com.gmail.nossr50.util.TextComponentFactory; import net.md_5.bungee.api.chat.TextComponent; @@ -28,7 +28,7 @@ public class AxesCommand extends SkillCommand { private boolean canGreaterImpact; public AxesCommand() { - super(PrimarySkill.AXES); + super(PrimarySkillType.AXES); } @Override @@ -125,7 +125,7 @@ public class AxesCommand extends SkillCommand { protected List getTextComponents(Player player) { List textComponents = new ArrayList<>(); - TextComponentFactory.getSubSkillTextComponents(player, textComponents, PrimarySkill.AXES); + TextComponentFactory.getSubSkillTextComponents(player, textComponents, PrimarySkillType.AXES); return textComponents; } diff --git a/src/main/java/com/gmail/nossr50/commands/skills/ExcavationCommand.java b/src/main/java/com/gmail/nossr50/commands/skills/ExcavationCommand.java index c6562fad4..307703fdb 100644 --- a/src/main/java/com/gmail/nossr50/commands/skills/ExcavationCommand.java +++ b/src/main/java/com/gmail/nossr50/commands/skills/ExcavationCommand.java @@ -3,12 +3,12 @@ package com.gmail.nossr50.commands.skills; import java.util.ArrayList; import java.util.List; +import com.gmail.nossr50.datatypes.skills.PrimarySkillType; import com.gmail.nossr50.util.TextComponentFactory; import net.md_5.bungee.api.chat.TextComponent; import org.bukkit.entity.Player; import com.gmail.nossr50.datatypes.skills.SubSkillType; -import com.gmail.nossr50.datatypes.skills.PrimarySkill; import com.gmail.nossr50.locale.LocaleLoader; import com.gmail.nossr50.util.Permissions; @@ -20,7 +20,7 @@ public class ExcavationCommand extends SkillCommand { private boolean canTreasureHunt; public ExcavationCommand() { - super(PrimarySkill.EXCAVATION); + super(PrimarySkillType.EXCAVATION); } @Override @@ -69,7 +69,7 @@ public class ExcavationCommand extends SkillCommand { protected List getTextComponents(Player player) { List textComponents = new ArrayList<>(); - TextComponentFactory.getSubSkillTextComponents(player, textComponents, PrimarySkill.EXCAVATION); + TextComponentFactory.getSubSkillTextComponents(player, textComponents, PrimarySkillType.EXCAVATION); return textComponents; } diff --git a/src/main/java/com/gmail/nossr50/commands/skills/FishingCommand.java b/src/main/java/com/gmail/nossr50/commands/skills/FishingCommand.java index 03e086166..251fe61d4 100644 --- a/src/main/java/com/gmail/nossr50/commands/skills/FishingCommand.java +++ b/src/main/java/com/gmail/nossr50/commands/skills/FishingCommand.java @@ -12,7 +12,7 @@ import org.bukkit.entity.Player; import com.gmail.nossr50.config.AdvancedConfig; import com.gmail.nossr50.config.treasure.TreasureConfig; -import com.gmail.nossr50.datatypes.skills.PrimarySkill; +import com.gmail.nossr50.datatypes.skills.PrimarySkillType; import com.gmail.nossr50.datatypes.treasure.Rarity; import com.gmail.nossr50.locale.LocaleLoader; import com.gmail.nossr50.skills.fishing.Fishing; @@ -46,7 +46,7 @@ public class FishingCommand extends SkillCommand { private boolean canIceFish; public FishingCommand() { - super(PrimarySkill.FISHING); + super(PrimarySkillType.FISHING); } @Override @@ -209,7 +209,7 @@ public class FishingCommand extends SkillCommand { protected List getTextComponents(Player player) { List textComponents = new ArrayList<>(); - TextComponentFactory.getSubSkillTextComponents(player, textComponents, PrimarySkill.FISHING); + TextComponentFactory.getSubSkillTextComponents(player, textComponents, PrimarySkillType.FISHING); return textComponents; } diff --git a/src/main/java/com/gmail/nossr50/commands/skills/HerbalismCommand.java b/src/main/java/com/gmail/nossr50/commands/skills/HerbalismCommand.java index 7d7470792..a0a7b5996 100644 --- a/src/main/java/com/gmail/nossr50/commands/skills/HerbalismCommand.java +++ b/src/main/java/com/gmail/nossr50/commands/skills/HerbalismCommand.java @@ -1,6 +1,6 @@ package com.gmail.nossr50.commands.skills; -import com.gmail.nossr50.datatypes.skills.PrimarySkill; +import com.gmail.nossr50.datatypes.skills.PrimarySkillType; import com.gmail.nossr50.datatypes.skills.SubSkillType; import com.gmail.nossr50.locale.LocaleLoader; import com.gmail.nossr50.skills.herbalism.Herbalism; @@ -36,7 +36,7 @@ public class HerbalismCommand extends SkillCommand { private boolean canShroomThumb; public HerbalismCommand() { - super(PrimarySkill.HERBALISM); + super(PrimarySkillType.HERBALISM); } @Override @@ -169,7 +169,7 @@ public class HerbalismCommand extends SkillCommand { protected List getTextComponents(Player player) { List textComponents = new ArrayList<>(); - TextComponentFactory.getSubSkillTextComponents(player, textComponents, PrimarySkill.HERBALISM); + TextComponentFactory.getSubSkillTextComponents(player, textComponents, PrimarySkillType.HERBALISM); return textComponents; } diff --git a/src/main/java/com/gmail/nossr50/commands/skills/MiningCommand.java b/src/main/java/com/gmail/nossr50/commands/skills/MiningCommand.java index 49aded715..3e40b6118 100644 --- a/src/main/java/com/gmail/nossr50/commands/skills/MiningCommand.java +++ b/src/main/java/com/gmail/nossr50/commands/skills/MiningCommand.java @@ -3,13 +3,13 @@ package com.gmail.nossr50.commands.skills; import java.util.ArrayList; import java.util.List; +import com.gmail.nossr50.datatypes.skills.PrimarySkillType; import com.gmail.nossr50.datatypes.skills.SubSkillType; import com.gmail.nossr50.util.TextComponentFactory; import net.md_5.bungee.api.chat.TextComponent; import org.bukkit.entity.Player; import com.gmail.nossr50.config.AdvancedConfig; -import com.gmail.nossr50.datatypes.skills.PrimarySkill; import com.gmail.nossr50.locale.LocaleLoader; import com.gmail.nossr50.skills.mining.BlastMining; import com.gmail.nossr50.skills.mining.BlastMining.Tier; @@ -37,7 +37,7 @@ public class MiningCommand extends SkillCommand { private boolean canDemoExpert; public MiningCommand() { - super(PrimarySkill.MINING); + super(PrimarySkillType.MINING); } @Override @@ -157,7 +157,7 @@ public class MiningCommand extends SkillCommand { protected List getTextComponents(Player player) { List textComponents = new ArrayList<>(); - TextComponentFactory.getSubSkillTextComponents(player, textComponents, PrimarySkill.MINING); + TextComponentFactory.getSubSkillTextComponents(player, textComponents, PrimarySkillType.MINING); return textComponents; } diff --git a/src/main/java/com/gmail/nossr50/commands/skills/MmoInfoCommand.java b/src/main/java/com/gmail/nossr50/commands/skills/MmoInfoCommand.java index b26c8b070..a81c61435 100644 --- a/src/main/java/com/gmail/nossr50/commands/skills/MmoInfoCommand.java +++ b/src/main/java/com/gmail/nossr50/commands/skills/MmoInfoCommand.java @@ -1,11 +1,10 @@ package com.gmail.nossr50.commands.skills; -import com.gmail.nossr50.datatypes.skills.PrimarySkill; +import com.gmail.nossr50.datatypes.skills.PrimarySkillType; import com.gmail.nossr50.datatypes.skills.subskills.AbstractSubSkill; import com.gmail.nossr50.listeners.InteractionManager; import com.gmail.nossr50.locale.LocaleLoader; import com.gmail.nossr50.util.Permissions; -import com.gmail.nossr50.util.TextComponentFactory; import com.google.common.collect.ImmutableList; import org.bukkit.command.Command; import org.bukkit.command.CommandSender; @@ -35,7 +34,7 @@ public class MmoInfoCommand implements TabExecutor { return false; //Real skill - if(InteractionManager.getAbstractByName(args[0]) != null || PrimarySkill.SUBSKILL_NAMES.contains(args[0])) + if(InteractionManager.getAbstractByName(args[0]) != null || PrimarySkillType.SUBSKILL_NAMES.contains(args[0])) { displayInfo(player, args[0]); return true; @@ -52,7 +51,7 @@ public class MmoInfoCommand implements TabExecutor { public List onTabComplete(CommandSender sender, Command command, String alias, String[] args) { switch (args.length) { case 1: - return StringUtil.copyPartialMatches(args[0], PrimarySkill.SUBSKILL_NAMES, new ArrayList(PrimarySkill.SUBSKILL_NAMES.size())); + return StringUtil.copyPartialMatches(args[0], PrimarySkillType.SUBSKILL_NAMES, new ArrayList(PrimarySkillType.SUBSKILL_NAMES.size())); default: return ImmutableList.of(); } diff --git a/src/main/java/com/gmail/nossr50/commands/skills/RepairCommand.java b/src/main/java/com/gmail/nossr50/commands/skills/RepairCommand.java index b36aca955..420a55bad 100644 --- a/src/main/java/com/gmail/nossr50/commands/skills/RepairCommand.java +++ b/src/main/java/com/gmail/nossr50/commands/skills/RepairCommand.java @@ -2,7 +2,7 @@ package com.gmail.nossr50.commands.skills; import com.gmail.nossr50.datatypes.skills.MaterialType; import com.gmail.nossr50.datatypes.skills.SubSkillType; -import com.gmail.nossr50.datatypes.skills.PrimarySkill; +import com.gmail.nossr50.datatypes.skills.PrimarySkillType; import com.gmail.nossr50.locale.LocaleLoader; import com.gmail.nossr50.mcMMO; import com.gmail.nossr50.skills.repair.ArcaneForging; @@ -43,7 +43,7 @@ public class RepairCommand extends SkillCommand { private int stoneLevel; public RepairCommand() { - super(PrimarySkill.REPAIR); + super(PrimarySkillType.REPAIR); } @Override @@ -162,7 +162,7 @@ public class RepairCommand extends SkillCommand { protected List getTextComponents(Player player) { List textComponents = new ArrayList<>(); - TextComponentFactory.getSubSkillTextComponents(player, textComponents, PrimarySkill.REPAIR); + TextComponentFactory.getSubSkillTextComponents(player, textComponents, PrimarySkillType.REPAIR); return textComponents; } diff --git a/src/main/java/com/gmail/nossr50/commands/skills/SalvageCommand.java b/src/main/java/com/gmail/nossr50/commands/skills/SalvageCommand.java index 36a9dcbe0..0aa4449ff 100644 --- a/src/main/java/com/gmail/nossr50/commands/skills/SalvageCommand.java +++ b/src/main/java/com/gmail/nossr50/commands/skills/SalvageCommand.java @@ -3,7 +3,7 @@ package com.gmail.nossr50.commands.skills; import java.util.ArrayList; import java.util.List; -import com.gmail.nossr50.datatypes.skills.PrimarySkill; +import com.gmail.nossr50.datatypes.skills.PrimarySkillType; import com.gmail.nossr50.datatypes.skills.SubSkillType; import com.gmail.nossr50.util.TextComponentFactory; import net.md_5.bungee.api.chat.TextComponent; @@ -20,7 +20,7 @@ public class SalvageCommand extends SkillCommand { private boolean canArcaneSalvage; public SalvageCommand() { - super(PrimarySkill.SALVAGE); + super(PrimarySkillType.SALVAGE); } @Override @@ -83,7 +83,7 @@ public class SalvageCommand extends SkillCommand { protected List getTextComponents(Player player) { List textComponents = new ArrayList<>(); - TextComponentFactory.getSubSkillTextComponents(player, textComponents, PrimarySkill.SALVAGE); + TextComponentFactory.getSubSkillTextComponents(player, textComponents, PrimarySkillType.SALVAGE); return textComponents; } diff --git a/src/main/java/com/gmail/nossr50/commands/skills/SkillCommand.java b/src/main/java/com/gmail/nossr50/commands/skills/SkillCommand.java index 095d3aa7d..79aae10e6 100644 --- a/src/main/java/com/gmail/nossr50/commands/skills/SkillCommand.java +++ b/src/main/java/com/gmail/nossr50/commands/skills/SkillCommand.java @@ -4,7 +4,7 @@ import java.text.DecimalFormat; import java.util.List; import java.util.Set; -import com.gmail.nossr50.datatypes.skills.PrimarySkill; +import com.gmail.nossr50.datatypes.skills.PrimarySkillType; import com.gmail.nossr50.config.AdvancedConfig; import com.gmail.nossr50.config.Config; @@ -30,7 +30,7 @@ import org.bukkit.command.TabExecutor; import org.bukkit.entity.Player; public abstract class SkillCommand implements TabExecutor { - protected PrimarySkill skill; + protected PrimarySkillType skill; private String skillName; protected DecimalFormat percent = new DecimalFormat("##0.00%"); @@ -38,7 +38,7 @@ public abstract class SkillCommand implements TabExecutor { private CommandExecutor skillGuideCommand; - public SkillCommand(PrimarySkill skill) { + public SkillCommand(PrimarySkillType skill) { this.skill = skill; skillName = skill.getName(); skillGuideCommand = new SkillGuideCommand(skill); @@ -143,10 +143,10 @@ public abstract class SkillCommand implements TabExecutor { //LEVEL player.sendMessage(LocaleLoader.getString("Effects.Child.Overhaul", skillValue, skillValue)); - Set parents = FamilyTree.getParents(skill); + Set parents = FamilyTree.getParents(skill); //TODO: Add JSON here - for (PrimarySkill parent : parents) { + for (PrimarySkillType parent : parents) { player.sendMessage(parent.getName() + " - " + LocaleLoader.getString("Effects.Level.Overhaul", mcMMOPlayer.getSkillLevel(parent), mcMMOPlayer.getSkillXpLevel(parent), mcMMOPlayer.getXpToLevel(parent))); } } @@ -161,9 +161,9 @@ public abstract class SkillCommand implements TabExecutor { player.sendMessage(LocaleLoader.getString("Effects.Child", skillValue)); player.sendMessage(LocaleLoader.getString("Skills.Header", LocaleLoader.getString("Skills.Parents"))); - Set parents = FamilyTree.getParents(skill); + Set parents = FamilyTree.getParents(skill); - for (PrimarySkill parent : parents) { + for (PrimarySkillType parent : parents) { player.sendMessage(parent.getName() + " - " + LocaleLoader.getString("Effects.Level", mcMMOPlayer.getSkillLevel(parent), mcMMOPlayer.getSkillXpLevel(parent), mcMMOPlayer.getXpToLevel(parent))); } } diff --git a/src/main/java/com/gmail/nossr50/commands/skills/SkillGuideCommand.java b/src/main/java/com/gmail/nossr50/commands/skills/SkillGuideCommand.java index 6f39198e5..c2e9cef1f 100644 --- a/src/main/java/com/gmail/nossr50/commands/skills/SkillGuideCommand.java +++ b/src/main/java/com/gmail/nossr50/commands/skills/SkillGuideCommand.java @@ -3,11 +3,11 @@ package com.gmail.nossr50.commands.skills; import java.util.ArrayList; import java.util.Arrays; +import com.gmail.nossr50.datatypes.skills.PrimarySkillType; import org.bukkit.command.Command; import org.bukkit.command.CommandExecutor; import org.bukkit.command.CommandSender; -import com.gmail.nossr50.datatypes.skills.PrimarySkill; import com.gmail.nossr50.locale.LocaleLoader; import com.gmail.nossr50.util.StringUtils; @@ -17,7 +17,7 @@ public class SkillGuideCommand implements CommandExecutor { private String invalidPage = LocaleLoader.getString("Guides.Page.Invalid"); - public SkillGuideCommand(PrimarySkill skill) { + public SkillGuideCommand(PrimarySkillType skill) { header = LocaleLoader.getString("Guides.Header", skill.getName()); guide = getGuide(skill); } @@ -86,7 +86,7 @@ public class SkillGuideCommand implements CommandExecutor { return allStrings; } - private ArrayList getGuide(PrimarySkill skill) { + private ArrayList getGuide(PrimarySkillType skill) { ArrayList guide = new ArrayList(); for (int i = 0; i < 10; i++) { diff --git a/src/main/java/com/gmail/nossr50/commands/skills/SmeltingCommand.java b/src/main/java/com/gmail/nossr50/commands/skills/SmeltingCommand.java index 5bee63045..ee4b360ac 100644 --- a/src/main/java/com/gmail/nossr50/commands/skills/SmeltingCommand.java +++ b/src/main/java/com/gmail/nossr50/commands/skills/SmeltingCommand.java @@ -3,13 +3,13 @@ package com.gmail.nossr50.commands.skills; import java.util.ArrayList; import java.util.List; +import com.gmail.nossr50.datatypes.skills.PrimarySkillType; import com.gmail.nossr50.datatypes.skills.SubSkillType; import com.gmail.nossr50.util.TextComponentFactory; import net.md_5.bungee.api.chat.TextComponent; import org.bukkit.entity.Player; import com.gmail.nossr50.config.AdvancedConfig; -import com.gmail.nossr50.datatypes.skills.PrimarySkill; import com.gmail.nossr50.locale.LocaleLoader; import com.gmail.nossr50.skills.smelting.Smelting; import com.gmail.nossr50.skills.smelting.Smelting.Tier; @@ -29,7 +29,7 @@ public class SmeltingCommand extends SkillCommand { private boolean canVanillaXPBoost; public SmeltingCommand() { - super(PrimarySkill.SMELTING); + super(PrimarySkillType.SMELTING); } @Override @@ -124,7 +124,7 @@ public class SmeltingCommand extends SkillCommand { protected List getTextComponents(Player player) { List textComponents = new ArrayList<>(); - TextComponentFactory.getSubSkillTextComponents(player, textComponents, PrimarySkill.SMELTING); + TextComponentFactory.getSubSkillTextComponents(player, textComponents, PrimarySkillType.SMELTING); return textComponents; } diff --git a/src/main/java/com/gmail/nossr50/commands/skills/SwordsCommand.java b/src/main/java/com/gmail/nossr50/commands/skills/SwordsCommand.java index 15adefb6d..c3890fc99 100644 --- a/src/main/java/com/gmail/nossr50/commands/skills/SwordsCommand.java +++ b/src/main/java/com/gmail/nossr50/commands/skills/SwordsCommand.java @@ -3,7 +3,7 @@ package com.gmail.nossr50.commands.skills; import java.util.ArrayList; import java.util.List; -import com.gmail.nossr50.datatypes.skills.PrimarySkill; +import com.gmail.nossr50.datatypes.skills.PrimarySkillType; import com.gmail.nossr50.datatypes.skills.SubSkillType; import com.gmail.nossr50.util.TextComponentFactory; import net.md_5.bungee.api.chat.TextComponent; @@ -28,7 +28,7 @@ public class SwordsCommand extends SkillCommand { private boolean canBleed; public SwordsCommand() { - super(PrimarySkill.SWORDS); + super(PrimarySkillType.SWORDS); } @Override @@ -109,7 +109,7 @@ public class SwordsCommand extends SkillCommand { protected List getTextComponents(Player player) { List textComponents = new ArrayList<>(); - TextComponentFactory.getSubSkillTextComponents(player, textComponents, PrimarySkill.SWORDS); + TextComponentFactory.getSubSkillTextComponents(player, textComponents, PrimarySkillType.SWORDS); return textComponents; } diff --git a/src/main/java/com/gmail/nossr50/commands/skills/TamingCommand.java b/src/main/java/com/gmail/nossr50/commands/skills/TamingCommand.java index bcccba580..5a93ae327 100644 --- a/src/main/java/com/gmail/nossr50/commands/skills/TamingCommand.java +++ b/src/main/java/com/gmail/nossr50/commands/skills/TamingCommand.java @@ -3,7 +3,7 @@ package com.gmail.nossr50.commands.skills; import java.util.ArrayList; import java.util.List; -import com.gmail.nossr50.datatypes.skills.PrimarySkill; +import com.gmail.nossr50.datatypes.skills.PrimarySkillType; import com.gmail.nossr50.datatypes.skills.SubSkillType; import com.gmail.nossr50.util.TextComponentFactory; import net.md_5.bungee.api.chat.TextComponent; @@ -31,7 +31,7 @@ public class TamingCommand extends SkillCommand { private boolean canHolyHound; public TamingCommand() { - super(PrimarySkill.TAMING); + super(PrimarySkillType.TAMING); } @Override @@ -175,7 +175,7 @@ public class TamingCommand extends SkillCommand { protected List getTextComponents(Player player) { List textComponents = new ArrayList<>(); - TextComponentFactory.getSubSkillTextComponents(player, textComponents, PrimarySkill.TAMING); + TextComponentFactory.getSubSkillTextComponents(player, textComponents, PrimarySkillType.TAMING); return textComponents; } diff --git a/src/main/java/com/gmail/nossr50/commands/skills/UnarmedCommand.java b/src/main/java/com/gmail/nossr50/commands/skills/UnarmedCommand.java index 611101ec6..f531a14fe 100644 --- a/src/main/java/com/gmail/nossr50/commands/skills/UnarmedCommand.java +++ b/src/main/java/com/gmail/nossr50/commands/skills/UnarmedCommand.java @@ -3,7 +3,7 @@ package com.gmail.nossr50.commands.skills; import java.util.ArrayList; import java.util.List; -import com.gmail.nossr50.datatypes.skills.PrimarySkill; +import com.gmail.nossr50.datatypes.skills.PrimarySkillType; import com.gmail.nossr50.datatypes.skills.SubSkillType; import com.gmail.nossr50.util.TextComponentFactory; import net.md_5.bungee.api.chat.TextComponent; @@ -31,7 +31,7 @@ public class UnarmedCommand extends SkillCommand { private boolean canIronGrip; public UnarmedCommand() { - super(PrimarySkill.UNARMED); + super(PrimarySkillType.UNARMED); } @Override @@ -139,7 +139,7 @@ public class UnarmedCommand extends SkillCommand { protected List getTextComponents(Player player) { List textComponents = new ArrayList<>(); - TextComponentFactory.getSubSkillTextComponents(player, textComponents, PrimarySkill.UNARMED); + TextComponentFactory.getSubSkillTextComponents(player, textComponents, PrimarySkillType.UNARMED); return textComponents; } diff --git a/src/main/java/com/gmail/nossr50/commands/skills/WoodcuttingCommand.java b/src/main/java/com/gmail/nossr50/commands/skills/WoodcuttingCommand.java index 4d46001c9..8ebe76c28 100644 --- a/src/main/java/com/gmail/nossr50/commands/skills/WoodcuttingCommand.java +++ b/src/main/java/com/gmail/nossr50/commands/skills/WoodcuttingCommand.java @@ -3,7 +3,7 @@ package com.gmail.nossr50.commands.skills; import java.util.ArrayList; import java.util.List; -import com.gmail.nossr50.datatypes.skills.PrimarySkill; +import com.gmail.nossr50.datatypes.skills.PrimarySkillType; import com.gmail.nossr50.datatypes.skills.SubSkillType; import com.gmail.nossr50.util.TextComponentFactory; import net.md_5.bungee.api.chat.TextComponent; @@ -27,7 +27,7 @@ public class WoodcuttingCommand extends SkillCommand { private boolean canNaturesBounty; public WoodcuttingCommand() { - super(PrimarySkill.WOODCUTTING); + super(PrimarySkillType.WOODCUTTING); } @Override @@ -129,7 +129,7 @@ public class WoodcuttingCommand extends SkillCommand { protected List getTextComponents(Player player) { List textComponents = new ArrayList<>(); - TextComponentFactory.getSubSkillTextComponents(player, textComponents, PrimarySkill.WOODCUTTING); + TextComponentFactory.getSubSkillTextComponents(player, textComponents, PrimarySkillType.WOODCUTTING); return textComponents; } diff --git a/src/main/java/com/gmail/nossr50/config/AdvancedConfig.java b/src/main/java/com/gmail/nossr50/config/AdvancedConfig.java index 4b7a6646a..fa370b538 100644 --- a/src/main/java/com/gmail/nossr50/config/AdvancedConfig.java +++ b/src/main/java/com/gmail/nossr50/config/AdvancedConfig.java @@ -5,10 +5,9 @@ import java.util.Arrays; import java.util.List; import com.gmail.nossr50.datatypes.interactions.NotificationType; -import com.gmail.nossr50.datatypes.skills.PrimarySkill; +import com.gmail.nossr50.datatypes.skills.PrimarySkillType; import com.gmail.nossr50.datatypes.skills.SubSkillType; import com.gmail.nossr50.datatypes.skills.subskills.AbstractSubSkill; -import com.gmail.nossr50.locale.LocaleLoader; import com.gmail.nossr50.skills.alchemy.Alchemy; import com.gmail.nossr50.skills.fishing.Fishing; import com.gmail.nossr50.skills.mining.BlastMining; @@ -1029,7 +1028,7 @@ public class AdvancedConfig extends AutoUpdateConfigLoader { //For now we will only check ranks of stuff I've overhauled for(SubSkillType subSkillType : SubSkillType.values()) { - if(subSkillType.getParentSkill() == PrimarySkill.WOODCUTTING) + if(subSkillType.getParentSkill() == PrimarySkillType.WOODCUTTING) { //Keeping track of the rank requirements and making sure there are no logical errors int curRank = 0; diff --git a/src/main/java/com/gmail/nossr50/config/Config.java b/src/main/java/com/gmail/nossr50/config/Config.java index 197ca0df0..2edeb5ed1 100644 --- a/src/main/java/com/gmail/nossr50/config/Config.java +++ b/src/main/java/com/gmail/nossr50/config/Config.java @@ -4,7 +4,7 @@ import com.gmail.nossr50.database.SQLDatabaseManager.PoolIdentifier; import com.gmail.nossr50.datatypes.MobHealthbarType; import com.gmail.nossr50.datatypes.party.PartyFeature; import com.gmail.nossr50.datatypes.skills.SuperAbilityType; -import com.gmail.nossr50.datatypes.skills.PrimarySkill; +import com.gmail.nossr50.datatypes.skills.PrimarySkillType; import com.gmail.nossr50.util.StringUtils; import org.bukkit.Material; import org.bukkit.block.data.BlockData; @@ -362,16 +362,16 @@ public class Config extends AutoUpdateConfigLoader { } /* Hardcore Mode */ - public boolean getHardcoreStatLossEnabled(PrimarySkill primarySkill) { return config.getBoolean("Hardcore.Death_Stat_Loss.Enabled." + StringUtils.getCapitalized(primarySkill.toString()), false); } - public void setHardcoreStatLossEnabled(PrimarySkill primarySkill, boolean enabled) { config.set("Hardcore.Death_Stat_Loss.Enabled." + StringUtils.getCapitalized(primarySkill.toString()), enabled); } + public boolean getHardcoreStatLossEnabled(PrimarySkillType primarySkillType) { return config.getBoolean("Hardcore.Death_Stat_Loss.Enabled." + StringUtils.getCapitalized(primarySkillType.toString()), false); } + public void setHardcoreStatLossEnabled(PrimarySkillType primarySkillType, boolean enabled) { config.set("Hardcore.Death_Stat_Loss.Enabled." + StringUtils.getCapitalized(primarySkillType.toString()), enabled); } public double getHardcoreDeathStatPenaltyPercentage() { return config.getDouble("Hardcore.Death_Stat_Loss.Penalty_Percentage", 75.0D); } public void setHardcoreDeathStatPenaltyPercentage(double value) { config.set("Hardcore.Death_Stat_Loss.Penalty_Percentage", value); } public int getHardcoreDeathStatPenaltyLevelThreshold() { return config.getInt("Hardcore.Death_Stat_Loss.Level_Threshold", 0); } - public boolean getHardcoreVampirismEnabled(PrimarySkill primarySkill) { return config.getBoolean("Hardcore.Vampirism.Enabled." + StringUtils.getCapitalized(primarySkill.toString()), false); } - public void setHardcoreVampirismEnabled(PrimarySkill primarySkill, boolean enabled) { config.set("Hardcore.Vampirism.Enabled." + StringUtils.getCapitalized(primarySkill.toString()), enabled); } + public boolean getHardcoreVampirismEnabled(PrimarySkillType primarySkillType) { return config.getBoolean("Hardcore.Vampirism.Enabled." + StringUtils.getCapitalized(primarySkillType.toString()), false); } + public void setHardcoreVampirismEnabled(PrimarySkillType primarySkillType, boolean enabled) { config.set("Hardcore.Vampirism.Enabled." + StringUtils.getCapitalized(primarySkillType.toString()), enabled); } public double getHardcoreVampirismStatLeechPercentage() { return config.getDouble("Hardcore.Vampirism.Leech_Percentage", 5.0D); } public void setHardcoreVampirismStatLeechPercentage(double value) { config.set("Hardcore.Vampirism.Leech_Percentage", value); } @@ -466,9 +466,9 @@ public class Config extends AutoUpdateConfigLoader { /* * SKILL SETTINGS */ - public boolean getDoubleDropsEnabled(PrimarySkill skill, Material material) { return config.getBoolean("Double_Drops." + StringUtils.getCapitalized(skill.toString()) + "." + StringUtils.getPrettyItemString(material).replace(" ", "_")); } + public boolean getDoubleDropsEnabled(PrimarySkillType skill, Material material) { return config.getBoolean("Double_Drops." + StringUtils.getCapitalized(skill.toString()) + "." + StringUtils.getPrettyItemString(material).replace(" ", "_")); } - public boolean getDoubleDropsDisabled(PrimarySkill skill) { + public boolean getDoubleDropsDisabled(PrimarySkillType skill) { String skillName = StringUtils.getCapitalized(skill.toString()); ConfigurationSection section = config.getConfigurationSection("Double_Drops." + skillName); if (section == null) @@ -558,20 +558,20 @@ public class Config extends AutoUpdateConfigLoader { return (cap <= 0) ? Integer.MAX_VALUE : cap; } - public int getLevelCap(PrimarySkill skill) { + public int getLevelCap(PrimarySkillType skill) { int cap = config.getInt("Skills." + StringUtils.getCapitalized(skill.toString()) + ".Level_Cap"); return (cap <= 0) ? Integer.MAX_VALUE : cap; } - public int getSkillAbilityGate(PrimarySkill skill) { + public int getSkillAbilityGate(PrimarySkillType skill) { return config.getInt("Skills." + StringUtils.getCapitalized(skill.toString()) + ".Ability_Activation_Level_Gate"); } public boolean getTruncateSkills() { return config.getBoolean("General.TruncateSkills", false); } /* PVP & PVE Settings */ - public boolean getPVPEnabled(PrimarySkill skill) { return config.getBoolean("Skills." + StringUtils.getCapitalized(skill.toString()) + ".Enabled_For_PVP", true); } - public boolean getPVEEnabled(PrimarySkill skill) { return config.getBoolean("Skills." + StringUtils.getCapitalized(skill.toString()) + ".Enabled_For_PVE", true); } + public boolean getPVPEnabled(PrimarySkillType skill) { return config.getBoolean("Skills." + StringUtils.getCapitalized(skill.toString()) + ".Enabled_For_PVP", true); } + public boolean getPVEEnabled(PrimarySkillType skill) { return config.getBoolean("Skills." + StringUtils.getCapitalized(skill.toString()) + ".Enabled_For_PVE", true); } //public float getMasterVolume() { return (float) config.getDouble("Sounds.MasterVolume", 1.0); } } diff --git a/src/main/java/com/gmail/nossr50/config/CoreSkillsConfig.java b/src/main/java/com/gmail/nossr50/config/CoreSkillsConfig.java index 61087ffd8..269ee30f2 100644 --- a/src/main/java/com/gmail/nossr50/config/CoreSkillsConfig.java +++ b/src/main/java/com/gmail/nossr50/config/CoreSkillsConfig.java @@ -1,6 +1,6 @@ package com.gmail.nossr50.config; -import com.gmail.nossr50.datatypes.skills.PrimarySkill; +import com.gmail.nossr50.datatypes.skills.PrimarySkillType; import com.gmail.nossr50.datatypes.skills.subskills.AbstractSubSkill; import com.gmail.nossr50.util.StringUtils; @@ -49,11 +49,11 @@ public class CoreSkillsConfig extends AutoUpdateConfigLoader { /** * Whether or not this primary skill is enabled - * @param primarySkill target primary skill + * @param primarySkillType target primary skill * @return true if enabled */ - public boolean isPrimarySkillEnabled(PrimarySkill primarySkill) + public boolean isPrimarySkillEnabled(PrimarySkillType primarySkillType) { - return config.getBoolean(StringUtils.getCapitalized(primarySkill.toString())+".Enabled", true); + return config.getBoolean(StringUtils.getCapitalized(primarySkillType.toString())+".Enabled", true); } } diff --git a/src/main/java/com/gmail/nossr50/config/RankConfig.java b/src/main/java/com/gmail/nossr50/config/RankConfig.java new file mode 100644 index 000000000..b9de07c3d --- /dev/null +++ b/src/main/java/com/gmail/nossr50/config/RankConfig.java @@ -0,0 +1,25 @@ +package com.gmail.nossr50.config; + +public class RankConfig extends AutoUpdateConfigLoader { + private static RankConfig instance; + + public RankConfig() + { + super("skillranks.yml"); + validate(); + this.instance = this; + } + + @Override + protected void loadKeys() { + + } + + public static RankConfig getInstance() + { + if(instance == null) + return new RankConfig(); + + return instance; + } +} diff --git a/src/main/java/com/gmail/nossr50/config/experience/ExperienceConfig.java b/src/main/java/com/gmail/nossr50/config/experience/ExperienceConfig.java index 90c241099..a5dc907a4 100644 --- a/src/main/java/com/gmail/nossr50/config/experience/ExperienceConfig.java +++ b/src/main/java/com/gmail/nossr50/config/experience/ExperienceConfig.java @@ -3,7 +3,7 @@ package com.gmail.nossr50.config.experience; import com.gmail.nossr50.config.AutoUpdateConfigLoader; import com.gmail.nossr50.datatypes.experience.FormulaType; import com.gmail.nossr50.datatypes.skills.MaterialType; -import com.gmail.nossr50.datatypes.skills.PrimarySkill; +import com.gmail.nossr50.datatypes.skills.PrimarySkillType; import com.gmail.nossr50.datatypes.skills.alchemy.PotionStage; import com.gmail.nossr50.util.StringUtils; import org.bukkit.Material; @@ -160,14 +160,14 @@ public class ExperienceConfig extends AutoUpdateConfigLoader { public double getBredMobXpMultiplier() { return config.getDouble("Experience_Formula.Breeding.Multiplier", 1.0); } /* Skill modifiers */ - public double getFormulaSkillModifier(PrimarySkill skill) { return config.getDouble("Experience_Formula.Modifier." + StringUtils.getCapitalized(skill.toString())); } + public double getFormulaSkillModifier(PrimarySkillType skill) { return config.getDouble("Experience_Formula.Modifier." + StringUtils.getCapitalized(skill.toString())); } /* Custom XP perk */ public double getCustomXpPerkBoost() { return config.getDouble("Experience_Formula.Custom_XP_Perk.Boost", 1.25); } /* Diminished Returns */ public boolean getDiminishedReturnsEnabled() { return config.getBoolean("Diminished_Returns.Enabled", false); } - public int getDiminishedReturnsThreshold(PrimarySkill skill) { return config.getInt("Diminished_Returns.Threshold." + StringUtils.getCapitalized(skill.toString()), 20000); } + public int getDiminishedReturnsThreshold(PrimarySkillType skill) { return config.getInt("Diminished_Returns.Threshold." + StringUtils.getCapitalized(skill.toString()), 20000); } public int getDiminishedReturnsTimeInterval() { return config.getInt("Diminished_Returns.Time_Interval", 10); } /* Conversion */ @@ -187,7 +187,7 @@ public class ExperienceConfig extends AutoUpdateConfigLoader { public boolean hasCombatXP(EntityType entity) {return config.contains("Experience.Combat.Multiplier." + StringUtils.getPrettyEntityTypeString(entity).replace(" ", "_")); } /* Materials */ - public int getXp(PrimarySkill skill, Material data) + public int getXp(PrimarySkillType skill, Material data) { String baseString = "Experience." + StringUtils.getCapitalized(skill.toString()) + "."; String explicitString = baseString + StringUtils.getExplicitConfigMaterialString(data); @@ -203,7 +203,7 @@ public class ExperienceConfig extends AutoUpdateConfigLoader { } /* Materials */ - public int getXp(PrimarySkill skill, BlockData data) + public int getXp(PrimarySkillType skill, BlockData data) { String baseString = "Experience." + StringUtils.getCapitalized(skill.toString()) + "."; String explicitString = baseString + StringUtils.getExplicitConfigBlockDataString(data); @@ -218,7 +218,7 @@ public class ExperienceConfig extends AutoUpdateConfigLoader { return 0; } - public boolean isSkillBlock(PrimarySkill skill, Material data) + public boolean isSkillBlock(PrimarySkillType skill, Material data) { String baseString = "Experience." + StringUtils.getCapitalized(skill.toString()) + "."; String explicitString = baseString + StringUtils.getExplicitConfigMaterialString(data); @@ -231,7 +231,7 @@ public class ExperienceConfig extends AutoUpdateConfigLoader { return config.contains(wildcardString); } - public boolean isSkillBlock(PrimarySkill skill, BlockData data) + public boolean isSkillBlock(PrimarySkillType skill, BlockData data) { String baseString = "Experience." + StringUtils.getCapitalized(skill.toString()) + "."; String explicitString = baseString + StringUtils.getExplicitConfigBlockDataString(data); diff --git a/src/main/java/com/gmail/nossr50/database/DatabaseManager.java b/src/main/java/com/gmail/nossr50/database/DatabaseManager.java index 793f0366c..aea237eaa 100644 --- a/src/main/java/com/gmail/nossr50/database/DatabaseManager.java +++ b/src/main/java/com/gmail/nossr50/database/DatabaseManager.java @@ -8,7 +8,7 @@ import com.gmail.nossr50.config.Config; import com.gmail.nossr50.datatypes.database.DatabaseType; import com.gmail.nossr50.datatypes.database.PlayerStat; import com.gmail.nossr50.datatypes.player.PlayerProfile; -import com.gmail.nossr50.datatypes.skills.PrimarySkill; +import com.gmail.nossr50.datatypes.skills.PrimarySkillType; public interface DatabaseManager { // One month in milliseconds @@ -50,10 +50,10 @@ public interface DatabaseManager { * @param statsPerPage The number of stats per page * @return the requested leaderboard information */ - public List readLeaderboard(PrimarySkill skill, int pageNumber, int statsPerPage); + public List readLeaderboard(PrimarySkillType skill, int pageNumber, int statsPerPage); /** - * Retrieve rank info into a HashMap from PrimarySkill to the rank. + * Retrieve rank info into a HashMap from PrimarySkillType to the rank. *

* The special value null is used to represent the Power * Level rank (the combination of all skill levels). @@ -61,7 +61,7 @@ public interface DatabaseManager { * @param playerName The name of the user to retrieve the rankings for * @return the requested rank information */ - public Map readRank(String playerName); + public Map readRank(String playerName); /** * Add a new user to the database. diff --git a/src/main/java/com/gmail/nossr50/database/FlatfileDatabaseManager.java b/src/main/java/com/gmail/nossr50/database/FlatfileDatabaseManager.java index 8be546a07..281785e17 100644 --- a/src/main/java/com/gmail/nossr50/database/FlatfileDatabaseManager.java +++ b/src/main/java/com/gmail/nossr50/database/FlatfileDatabaseManager.java @@ -18,7 +18,7 @@ import java.util.Map; import java.util.UUID; import com.gmail.nossr50.datatypes.player.UniqueDataType; -import com.gmail.nossr50.datatypes.skills.PrimarySkill; +import com.gmail.nossr50.datatypes.skills.PrimarySkillType; import com.gmail.nossr50.datatypes.skills.SuperAbilityType; import org.bukkit.OfflinePlayer; @@ -34,7 +34,7 @@ import com.gmail.nossr50.util.Misc; import com.gmail.nossr50.util.StringUtils; public final class FlatfileDatabaseManager implements DatabaseManager { - private final HashMap> playerStatHash = new HashMap>(); + private final HashMap> playerStatHash = new HashMap>(); private final List powerLevels = new ArrayList(); private long lastUpdate = 0; @@ -70,7 +70,7 @@ public final class FlatfileDatabaseManager implements DatabaseManager { while ((line = in.readLine()) != null) { String[] character = line.split(":"); - Map skills = getSkillMapFromLine(character); + Map skills = getSkillMapFromLine(character); boolean powerless = true; for (int skill : skills.values()) { @@ -323,31 +323,31 @@ public final class FlatfileDatabaseManager implements DatabaseManager { private void writeUserToLine(PlayerProfile profile, String playerName, UUID uuid, StringBuilder writer) { writer.append(playerName).append(":"); - writer.append(profile.getSkillLevel(PrimarySkill.MINING)).append(":"); + writer.append(profile.getSkillLevel(PrimarySkillType.MINING)).append(":"); writer.append(":"); writer.append(":"); - writer.append(profile.getSkillXpLevel(PrimarySkill.MINING)).append(":"); - writer.append(profile.getSkillLevel(PrimarySkill.WOODCUTTING)).append(":"); - writer.append(profile.getSkillXpLevel(PrimarySkill.WOODCUTTING)).append(":"); - writer.append(profile.getSkillLevel(PrimarySkill.REPAIR)).append(":"); - writer.append(profile.getSkillLevel(PrimarySkill.UNARMED)).append(":"); - writer.append(profile.getSkillLevel(PrimarySkill.HERBALISM)).append(":"); - writer.append(profile.getSkillLevel(PrimarySkill.EXCAVATION)).append(":"); - writer.append(profile.getSkillLevel(PrimarySkill.ARCHERY)).append(":"); - writer.append(profile.getSkillLevel(PrimarySkill.SWORDS)).append(":"); - writer.append(profile.getSkillLevel(PrimarySkill.AXES)).append(":"); - writer.append(profile.getSkillLevel(PrimarySkill.ACROBATICS)).append(":"); - writer.append(profile.getSkillXpLevel(PrimarySkill.REPAIR)).append(":"); - writer.append(profile.getSkillXpLevel(PrimarySkill.UNARMED)).append(":"); - writer.append(profile.getSkillXpLevel(PrimarySkill.HERBALISM)).append(":"); - writer.append(profile.getSkillXpLevel(PrimarySkill.EXCAVATION)).append(":"); - writer.append(profile.getSkillXpLevel(PrimarySkill.ARCHERY)).append(":"); - writer.append(profile.getSkillXpLevel(PrimarySkill.SWORDS)).append(":"); - writer.append(profile.getSkillXpLevel(PrimarySkill.AXES)).append(":"); - writer.append(profile.getSkillXpLevel(PrimarySkill.ACROBATICS)).append(":"); + writer.append(profile.getSkillXpLevel(PrimarySkillType.MINING)).append(":"); + writer.append(profile.getSkillLevel(PrimarySkillType.WOODCUTTING)).append(":"); + writer.append(profile.getSkillXpLevel(PrimarySkillType.WOODCUTTING)).append(":"); + writer.append(profile.getSkillLevel(PrimarySkillType.REPAIR)).append(":"); + writer.append(profile.getSkillLevel(PrimarySkillType.UNARMED)).append(":"); + writer.append(profile.getSkillLevel(PrimarySkillType.HERBALISM)).append(":"); + writer.append(profile.getSkillLevel(PrimarySkillType.EXCAVATION)).append(":"); + writer.append(profile.getSkillLevel(PrimarySkillType.ARCHERY)).append(":"); + writer.append(profile.getSkillLevel(PrimarySkillType.SWORDS)).append(":"); + writer.append(profile.getSkillLevel(PrimarySkillType.AXES)).append(":"); + writer.append(profile.getSkillLevel(PrimarySkillType.ACROBATICS)).append(":"); + writer.append(profile.getSkillXpLevel(PrimarySkillType.REPAIR)).append(":"); + writer.append(profile.getSkillXpLevel(PrimarySkillType.UNARMED)).append(":"); + writer.append(profile.getSkillXpLevel(PrimarySkillType.HERBALISM)).append(":"); + writer.append(profile.getSkillXpLevel(PrimarySkillType.EXCAVATION)).append(":"); + writer.append(profile.getSkillXpLevel(PrimarySkillType.ARCHERY)).append(":"); + writer.append(profile.getSkillXpLevel(PrimarySkillType.SWORDS)).append(":"); + writer.append(profile.getSkillXpLevel(PrimarySkillType.AXES)).append(":"); + writer.append(profile.getSkillXpLevel(PrimarySkillType.ACROBATICS)).append(":"); writer.append(":"); - writer.append(profile.getSkillLevel(PrimarySkill.TAMING)).append(":"); - writer.append(profile.getSkillXpLevel(PrimarySkill.TAMING)).append(":"); + writer.append(profile.getSkillLevel(PrimarySkillType.TAMING)).append(":"); + writer.append(profile.getSkillXpLevel(PrimarySkillType.TAMING)).append(":"); writer.append((int) profile.getAbilityDATS(SuperAbilityType.BERSERK)).append(":"); writer.append((int) profile.getAbilityDATS(SuperAbilityType.GIGA_DRILL_BREAKER)).append(":"); writer.append((int) profile.getAbilityDATS(SuperAbilityType.TREE_FELLER)).append(":"); @@ -356,21 +356,21 @@ public final class FlatfileDatabaseManager implements DatabaseManager { writer.append((int) profile.getAbilityDATS(SuperAbilityType.SKULL_SPLITTER)).append(":"); writer.append((int) profile.getAbilityDATS(SuperAbilityType.SUPER_BREAKER)).append(":"); writer.append(":"); - writer.append(profile.getSkillLevel(PrimarySkill.FISHING)).append(":"); - writer.append(profile.getSkillXpLevel(PrimarySkill.FISHING)).append(":"); + writer.append(profile.getSkillLevel(PrimarySkillType.FISHING)).append(":"); + writer.append(profile.getSkillXpLevel(PrimarySkillType.FISHING)).append(":"); writer.append((int) profile.getAbilityDATS(SuperAbilityType.BLAST_MINING)).append(":"); writer.append(System.currentTimeMillis() / Misc.TIME_CONVERSION_FACTOR).append(":"); MobHealthbarType mobHealthbarType = profile.getMobHealthbarType(); writer.append(mobHealthbarType == null ? Config.getInstance().getMobHealthbarDefault().toString() : mobHealthbarType.toString()).append(":"); - writer.append(profile.getSkillLevel(PrimarySkill.ALCHEMY)).append(":"); - writer.append(profile.getSkillXpLevel(PrimarySkill.ALCHEMY)).append(":"); + writer.append(profile.getSkillLevel(PrimarySkillType.ALCHEMY)).append(":"); + writer.append(profile.getSkillXpLevel(PrimarySkillType.ALCHEMY)).append(":"); writer.append(uuid != null ? uuid.toString() : "NULL").append(":"); writer.append(profile.getScoreboardTipsShown()).append(":"); writer.append(profile.getUniqueData(UniqueDataType.CHIMAERA_WING_DATS)).append(":"); writer.append("\r\n"); } - public List readLeaderboard(PrimarySkill skill, int pageNumber, int statsPerPage) { + public List readLeaderboard(PrimarySkillType skill, int pageNumber, int statsPerPage) { updateLeaderboards(); List statsList = skill == null ? powerLevels : playerStatHash.get(skill); int fromIndex = (Math.max(pageNumber, 1) - 1) * statsPerPage; @@ -378,12 +378,12 @@ public final class FlatfileDatabaseManager implements DatabaseManager { return statsList.subList(Math.min(fromIndex, statsList.size()), Math.min(fromIndex + statsPerPage, statsList.size())); } - public Map readRank(String playerName) { + public Map readRank(String playerName) { updateLeaderboards(); - Map skills = new HashMap(); + Map skills = new HashMap(); - for (PrimarySkill skill : PrimarySkill.NON_CHILD_SKILLS) { + for (PrimarySkillType skill : PrimarySkillType.NON_CHILD_SKILLS) { skills.put(skill, getPlayerRank(playerName, playerStatHash.get(skill))); } @@ -778,21 +778,21 @@ public final class FlatfileDatabaseManager implements DatabaseManager { playerName = data[USERNAME]; int powerLevel = 0; - Map skills = getSkillMapFromLine(data); + Map skills = getSkillMapFromLine(data); - powerLevel += putStat(acrobatics, playerName, skills.get(PrimarySkill.ACROBATICS)); - powerLevel += putStat(alchemy, playerName, skills.get(PrimarySkill.ALCHEMY)); - powerLevel += putStat(archery, playerName, skills.get(PrimarySkill.ARCHERY)); - powerLevel += putStat(axes, playerName, skills.get(PrimarySkill.AXES)); - powerLevel += putStat(excavation, playerName, skills.get(PrimarySkill.EXCAVATION)); - powerLevel += putStat(fishing, playerName, skills.get(PrimarySkill.FISHING)); - powerLevel += putStat(herbalism, playerName, skills.get(PrimarySkill.HERBALISM)); - powerLevel += putStat(mining, playerName, skills.get(PrimarySkill.MINING)); - powerLevel += putStat(repair, playerName, skills.get(PrimarySkill.REPAIR)); - powerLevel += putStat(swords, playerName, skills.get(PrimarySkill.SWORDS)); - powerLevel += putStat(taming, playerName, skills.get(PrimarySkill.TAMING)); - powerLevel += putStat(unarmed, playerName, skills.get(PrimarySkill.UNARMED)); - powerLevel += putStat(woodcutting, playerName, skills.get(PrimarySkill.WOODCUTTING)); + powerLevel += putStat(acrobatics, playerName, skills.get(PrimarySkillType.ACROBATICS)); + powerLevel += putStat(alchemy, playerName, skills.get(PrimarySkillType.ALCHEMY)); + powerLevel += putStat(archery, playerName, skills.get(PrimarySkillType.ARCHERY)); + powerLevel += putStat(axes, playerName, skills.get(PrimarySkillType.AXES)); + powerLevel += putStat(excavation, playerName, skills.get(PrimarySkillType.EXCAVATION)); + powerLevel += putStat(fishing, playerName, skills.get(PrimarySkillType.FISHING)); + powerLevel += putStat(herbalism, playerName, skills.get(PrimarySkillType.HERBALISM)); + powerLevel += putStat(mining, playerName, skills.get(PrimarySkillType.MINING)); + powerLevel += putStat(repair, playerName, skills.get(PrimarySkillType.REPAIR)); + powerLevel += putStat(swords, playerName, skills.get(PrimarySkillType.SWORDS)); + powerLevel += putStat(taming, playerName, skills.get(PrimarySkillType.TAMING)); + powerLevel += putStat(unarmed, playerName, skills.get(PrimarySkillType.UNARMED)); + powerLevel += putStat(woodcutting, playerName, skills.get(PrimarySkillType.WOODCUTTING)); putStat(powerLevels, playerName, powerLevel); } @@ -829,19 +829,19 @@ public final class FlatfileDatabaseManager implements DatabaseManager { Collections.sort(alchemy, c); Collections.sort(powerLevels, c); - playerStatHash.put(PrimarySkill.MINING, mining); - playerStatHash.put(PrimarySkill.WOODCUTTING, woodcutting); - playerStatHash.put(PrimarySkill.REPAIR, repair); - playerStatHash.put(PrimarySkill.UNARMED, unarmed); - playerStatHash.put(PrimarySkill.HERBALISM, herbalism); - playerStatHash.put(PrimarySkill.EXCAVATION, excavation); - playerStatHash.put(PrimarySkill.ARCHERY, archery); - playerStatHash.put(PrimarySkill.SWORDS, swords); - playerStatHash.put(PrimarySkill.AXES, axes); - playerStatHash.put(PrimarySkill.ACROBATICS, acrobatics); - playerStatHash.put(PrimarySkill.TAMING, taming); - playerStatHash.put(PrimarySkill.FISHING, fishing); - playerStatHash.put(PrimarySkill.ALCHEMY, alchemy); + playerStatHash.put(PrimarySkillType.MINING, mining); + playerStatHash.put(PrimarySkillType.WOODCUTTING, woodcutting); + playerStatHash.put(PrimarySkillType.REPAIR, repair); + playerStatHash.put(PrimarySkillType.UNARMED, unarmed); + playerStatHash.put(PrimarySkillType.HERBALISM, herbalism); + playerStatHash.put(PrimarySkillType.EXCAVATION, excavation); + playerStatHash.put(PrimarySkillType.ARCHERY, archery); + playerStatHash.put(PrimarySkillType.SWORDS, swords); + playerStatHash.put(PrimarySkillType.AXES, axes); + playerStatHash.put(PrimarySkillType.ACROBATICS, acrobatics); + playerStatHash.put(PrimarySkillType.TAMING, taming); + playerStatHash.put(PrimarySkillType.FISHING, fishing); + playerStatHash.put(PrimarySkillType.ALCHEMY, alchemy); } /** @@ -908,7 +908,7 @@ public final class FlatfileDatabaseManager implements DatabaseManager { } if (Config.getInstance().getTruncateSkills()) { - for (PrimarySkill skill : PrimarySkill.NON_CHILD_SKILLS) { + for (PrimarySkillType skill : PrimarySkillType.NON_CHILD_SKILLS) { int index = getSkillIndex(skill); if (index >= character.length) { continue; @@ -1048,8 +1048,8 @@ public final class FlatfileDatabaseManager implements DatabaseManager { updated |= oldVersion != null; if (Config.getInstance().getTruncateSkills()) { - Map skills = getSkillMapFromLine(character); - for (PrimarySkill skill : PrimarySkill.NON_CHILD_SKILLS) { + Map skills = getSkillMapFromLine(character); + for (PrimarySkillType skill : PrimarySkillType.NON_CHILD_SKILLS) { int cap = Config.getInstance().getLevelCap(skill); if (skills.get(skill) > cap) { updated = true; @@ -1143,8 +1143,8 @@ public final class FlatfileDatabaseManager implements DatabaseManager { } private PlayerProfile loadFromLine(String[] character) { - Map skills = getSkillMapFromLine(character); // Skill levels - Map skillsXp = new EnumMap(PrimarySkill.class); // Skill & XP + Map skills = getSkillMapFromLine(character); // Skill levels + Map skillsXp = new EnumMap(PrimarySkillType.class); // Skill & XP Map skillsDATS = new EnumMap(SuperAbilityType.class); // Ability & Cooldown Map uniquePlayerDataMap = new EnumMap(UniqueDataType.class); MobHealthbarType mobHealthbarType; @@ -1152,19 +1152,19 @@ public final class FlatfileDatabaseManager implements DatabaseManager { // TODO on updates, put new values in a try{} ? - skillsXp.put(PrimarySkill.TAMING, (float) Integer.valueOf(character[EXP_TAMING])); - skillsXp.put(PrimarySkill.MINING, (float) Integer.valueOf(character[EXP_MINING])); - skillsXp.put(PrimarySkill.REPAIR, (float) Integer.valueOf(character[EXP_REPAIR])); - skillsXp.put(PrimarySkill.WOODCUTTING, (float) Integer.valueOf(character[EXP_WOODCUTTING])); - skillsXp.put(PrimarySkill.UNARMED, (float) Integer.valueOf(character[EXP_UNARMED])); - skillsXp.put(PrimarySkill.HERBALISM, (float) Integer.valueOf(character[EXP_HERBALISM])); - skillsXp.put(PrimarySkill.EXCAVATION, (float) Integer.valueOf(character[EXP_EXCAVATION])); - skillsXp.put(PrimarySkill.ARCHERY, (float) Integer.valueOf(character[EXP_ARCHERY])); - skillsXp.put(PrimarySkill.SWORDS, (float) Integer.valueOf(character[EXP_SWORDS])); - skillsXp.put(PrimarySkill.AXES, (float) Integer.valueOf(character[EXP_AXES])); - skillsXp.put(PrimarySkill.ACROBATICS, (float) Integer.valueOf(character[EXP_ACROBATICS])); - skillsXp.put(PrimarySkill.FISHING, (float) Integer.valueOf(character[EXP_FISHING])); - skillsXp.put(PrimarySkill.ALCHEMY, (float) Integer.valueOf(character[EXP_ALCHEMY])); + skillsXp.put(PrimarySkillType.TAMING, (float) Integer.valueOf(character[EXP_TAMING])); + skillsXp.put(PrimarySkillType.MINING, (float) Integer.valueOf(character[EXP_MINING])); + skillsXp.put(PrimarySkillType.REPAIR, (float) Integer.valueOf(character[EXP_REPAIR])); + skillsXp.put(PrimarySkillType.WOODCUTTING, (float) Integer.valueOf(character[EXP_WOODCUTTING])); + skillsXp.put(PrimarySkillType.UNARMED, (float) Integer.valueOf(character[EXP_UNARMED])); + skillsXp.put(PrimarySkillType.HERBALISM, (float) Integer.valueOf(character[EXP_HERBALISM])); + skillsXp.put(PrimarySkillType.EXCAVATION, (float) Integer.valueOf(character[EXP_EXCAVATION])); + skillsXp.put(PrimarySkillType.ARCHERY, (float) Integer.valueOf(character[EXP_ARCHERY])); + skillsXp.put(PrimarySkillType.SWORDS, (float) Integer.valueOf(character[EXP_SWORDS])); + skillsXp.put(PrimarySkillType.AXES, (float) Integer.valueOf(character[EXP_AXES])); + skillsXp.put(PrimarySkillType.ACROBATICS, (float) Integer.valueOf(character[EXP_ACROBATICS])); + skillsXp.put(PrimarySkillType.FISHING, (float) Integer.valueOf(character[EXP_FISHING])); + skillsXp.put(PrimarySkillType.ALCHEMY, (float) Integer.valueOf(character[EXP_ALCHEMY])); // Taming - Unused skillsDATS.put(SuperAbilityType.SUPER_BREAKER, Integer.valueOf(character[COOLDOWN_SUPER_BREAKER])); @@ -1211,22 +1211,22 @@ public final class FlatfileDatabaseManager implements DatabaseManager { return new PlayerProfile(character[USERNAME], uuid, skills, skillsXp, skillsDATS, mobHealthbarType, scoreboardTipsShown, uniquePlayerDataMap); } - private Map getSkillMapFromLine(String[] character) { - Map skills = new EnumMap(PrimarySkill.class); // Skill & Level + private Map getSkillMapFromLine(String[] character) { + Map skills = new EnumMap(PrimarySkillType.class); // Skill & Level - skills.put(PrimarySkill.TAMING, Integer.valueOf(character[SKILLS_TAMING])); - skills.put(PrimarySkill.MINING, Integer.valueOf(character[SKILLS_MINING])); - skills.put(PrimarySkill.REPAIR, Integer.valueOf(character[SKILLS_REPAIR])); - skills.put(PrimarySkill.WOODCUTTING, Integer.valueOf(character[SKILLS_WOODCUTTING])); - skills.put(PrimarySkill.UNARMED, Integer.valueOf(character[SKILLS_UNARMED])); - skills.put(PrimarySkill.HERBALISM, Integer.valueOf(character[SKILLS_HERBALISM])); - skills.put(PrimarySkill.EXCAVATION, Integer.valueOf(character[SKILLS_EXCAVATION])); - skills.put(PrimarySkill.ARCHERY, Integer.valueOf(character[SKILLS_ARCHERY])); - skills.put(PrimarySkill.SWORDS, Integer.valueOf(character[SKILLS_SWORDS])); - skills.put(PrimarySkill.AXES, Integer.valueOf(character[SKILLS_AXES])); - skills.put(PrimarySkill.ACROBATICS, Integer.valueOf(character[SKILLS_ACROBATICS])); - skills.put(PrimarySkill.FISHING, Integer.valueOf(character[SKILLS_FISHING])); - skills.put(PrimarySkill.ALCHEMY, Integer.valueOf(character[SKILLS_ALCHEMY])); + skills.put(PrimarySkillType.TAMING, Integer.valueOf(character[SKILLS_TAMING])); + skills.put(PrimarySkillType.MINING, Integer.valueOf(character[SKILLS_MINING])); + skills.put(PrimarySkillType.REPAIR, Integer.valueOf(character[SKILLS_REPAIR])); + skills.put(PrimarySkillType.WOODCUTTING, Integer.valueOf(character[SKILLS_WOODCUTTING])); + skills.put(PrimarySkillType.UNARMED, Integer.valueOf(character[SKILLS_UNARMED])); + skills.put(PrimarySkillType.HERBALISM, Integer.valueOf(character[SKILLS_HERBALISM])); + skills.put(PrimarySkillType.EXCAVATION, Integer.valueOf(character[SKILLS_EXCAVATION])); + skills.put(PrimarySkillType.ARCHERY, Integer.valueOf(character[SKILLS_ARCHERY])); + skills.put(PrimarySkillType.SWORDS, Integer.valueOf(character[SKILLS_SWORDS])); + skills.put(PrimarySkillType.AXES, Integer.valueOf(character[SKILLS_AXES])); + skills.put(PrimarySkillType.ACROBATICS, Integer.valueOf(character[SKILLS_ACROBATICS])); + skills.put(PrimarySkillType.FISHING, Integer.valueOf(character[SKILLS_FISHING])); + skills.put(PrimarySkillType.ALCHEMY, Integer.valueOf(character[SKILLS_ALCHEMY])); return skills; } @@ -1238,7 +1238,7 @@ public final class FlatfileDatabaseManager implements DatabaseManager { @Override public void onDisable() { } - private int getSkillIndex(PrimarySkill skill) { + private int getSkillIndex(PrimarySkillType skill) { switch (skill) { case ACROBATICS: return SKILLS_ACROBATICS; diff --git a/src/main/java/com/gmail/nossr50/database/SQLDatabaseManager.java b/src/main/java/com/gmail/nossr50/database/SQLDatabaseManager.java index 40d491568..a00c972e0 100644 --- a/src/main/java/com/gmail/nossr50/database/SQLDatabaseManager.java +++ b/src/main/java/com/gmail/nossr50/database/SQLDatabaseManager.java @@ -7,8 +7,8 @@ import com.gmail.nossr50.datatypes.database.PlayerStat; import com.gmail.nossr50.datatypes.database.UpgradeType; import com.gmail.nossr50.datatypes.player.PlayerProfile; import com.gmail.nossr50.datatypes.player.UniqueDataType; +import com.gmail.nossr50.datatypes.skills.PrimarySkillType; import com.gmail.nossr50.datatypes.skills.SuperAbilityType; -import com.gmail.nossr50.datatypes.skills.PrimarySkill; import com.gmail.nossr50.mcMMO; import com.gmail.nossr50.runnables.database.UUIDUpdateAsyncTask; import com.gmail.nossr50.util.Misc; @@ -234,22 +234,22 @@ public final class SQLDatabaseManager implements DatabaseManager { + ", unarmed = ?, herbalism = ?, excavation = ?" + ", archery = ?, swords = ?, axes = ?, acrobatics = ?" + ", fishing = ?, alchemy = ?, total = ? WHERE user_id = ?"); - statement.setInt(1, profile.getSkillLevel(PrimarySkill.TAMING)); - statement.setInt(2, profile.getSkillLevel(PrimarySkill.MINING)); - statement.setInt(3, profile.getSkillLevel(PrimarySkill.REPAIR)); - statement.setInt(4, profile.getSkillLevel(PrimarySkill.WOODCUTTING)); - statement.setInt(5, profile.getSkillLevel(PrimarySkill.UNARMED)); - statement.setInt(6, profile.getSkillLevel(PrimarySkill.HERBALISM)); - statement.setInt(7, profile.getSkillLevel(PrimarySkill.EXCAVATION)); - statement.setInt(8, profile.getSkillLevel(PrimarySkill.ARCHERY)); - statement.setInt(9, profile.getSkillLevel(PrimarySkill.SWORDS)); - statement.setInt(10, profile.getSkillLevel(PrimarySkill.AXES)); - statement.setInt(11, profile.getSkillLevel(PrimarySkill.ACROBATICS)); - statement.setInt(12, profile.getSkillLevel(PrimarySkill.FISHING)); - statement.setInt(13, profile.getSkillLevel(PrimarySkill.ALCHEMY)); + statement.setInt(1, profile.getSkillLevel(PrimarySkillType.TAMING)); + statement.setInt(2, profile.getSkillLevel(PrimarySkillType.MINING)); + statement.setInt(3, profile.getSkillLevel(PrimarySkillType.REPAIR)); + statement.setInt(4, profile.getSkillLevel(PrimarySkillType.WOODCUTTING)); + statement.setInt(5, profile.getSkillLevel(PrimarySkillType.UNARMED)); + statement.setInt(6, profile.getSkillLevel(PrimarySkillType.HERBALISM)); + statement.setInt(7, profile.getSkillLevel(PrimarySkillType.EXCAVATION)); + statement.setInt(8, profile.getSkillLevel(PrimarySkillType.ARCHERY)); + statement.setInt(9, profile.getSkillLevel(PrimarySkillType.SWORDS)); + statement.setInt(10, profile.getSkillLevel(PrimarySkillType.AXES)); + statement.setInt(11, profile.getSkillLevel(PrimarySkillType.ACROBATICS)); + statement.setInt(12, profile.getSkillLevel(PrimarySkillType.FISHING)); + statement.setInt(13, profile.getSkillLevel(PrimarySkillType.ALCHEMY)); int total = 0; - for (PrimarySkill primarySkill : PrimarySkill.NON_CHILD_SKILLS) - total += profile.getSkillLevel(primarySkill); + for (PrimarySkillType primarySkillType : PrimarySkillType.NON_CHILD_SKILLS) + total += profile.getSkillLevel(primarySkillType); statement.setInt(14, total); statement.setInt(15, id); success &= (statement.executeUpdate() != 0); @@ -264,19 +264,19 @@ public final class SQLDatabaseManager implements DatabaseManager { + ", unarmed = ?, herbalism = ?, excavation = ?" + ", archery = ?, swords = ?, axes = ?, acrobatics = ?" + ", fishing = ?, alchemy = ? WHERE user_id = ?"); - statement.setInt(1, profile.getSkillXpLevel(PrimarySkill.TAMING)); - statement.setInt(2, profile.getSkillXpLevel(PrimarySkill.MINING)); - statement.setInt(3, profile.getSkillXpLevel(PrimarySkill.REPAIR)); - statement.setInt(4, profile.getSkillXpLevel(PrimarySkill.WOODCUTTING)); - statement.setInt(5, profile.getSkillXpLevel(PrimarySkill.UNARMED)); - statement.setInt(6, profile.getSkillXpLevel(PrimarySkill.HERBALISM)); - statement.setInt(7, profile.getSkillXpLevel(PrimarySkill.EXCAVATION)); - statement.setInt(8, profile.getSkillXpLevel(PrimarySkill.ARCHERY)); - statement.setInt(9, profile.getSkillXpLevel(PrimarySkill.SWORDS)); - statement.setInt(10, profile.getSkillXpLevel(PrimarySkill.AXES)); - statement.setInt(11, profile.getSkillXpLevel(PrimarySkill.ACROBATICS)); - statement.setInt(12, profile.getSkillXpLevel(PrimarySkill.FISHING)); - statement.setInt(13, profile.getSkillXpLevel(PrimarySkill.ALCHEMY)); + statement.setInt(1, profile.getSkillXpLevel(PrimarySkillType.TAMING)); + statement.setInt(2, profile.getSkillXpLevel(PrimarySkillType.MINING)); + statement.setInt(3, profile.getSkillXpLevel(PrimarySkillType.REPAIR)); + statement.setInt(4, profile.getSkillXpLevel(PrimarySkillType.WOODCUTTING)); + statement.setInt(5, profile.getSkillXpLevel(PrimarySkillType.UNARMED)); + statement.setInt(6, profile.getSkillXpLevel(PrimarySkillType.HERBALISM)); + statement.setInt(7, profile.getSkillXpLevel(PrimarySkillType.EXCAVATION)); + statement.setInt(8, profile.getSkillXpLevel(PrimarySkillType.ARCHERY)); + statement.setInt(9, profile.getSkillXpLevel(PrimarySkillType.SWORDS)); + statement.setInt(10, profile.getSkillXpLevel(PrimarySkillType.AXES)); + statement.setInt(11, profile.getSkillXpLevel(PrimarySkillType.ACROBATICS)); + statement.setInt(12, profile.getSkillXpLevel(PrimarySkillType.FISHING)); + statement.setInt(13, profile.getSkillXpLevel(PrimarySkillType.ALCHEMY)); statement.setInt(14, id); success &= (statement.executeUpdate() != 0); statement.close(); @@ -328,7 +328,7 @@ public final class SQLDatabaseManager implements DatabaseManager { return success; } - public List readLeaderboard(PrimarySkill skill, int pageNumber, int statsPerPage) { + public List readLeaderboard(PrimarySkillType skill, int pageNumber, int statsPerPage) { List stats = new ArrayList(); String query = skill == null ? ALL_QUERY_VERSION : skill.name().toLowerCase(); @@ -365,8 +365,8 @@ public final class SQLDatabaseManager implements DatabaseManager { return stats; } - public Map readRank(String playerName) { - Map skills = new HashMap(); + public Map readRank(String playerName) { + Map skills = new HashMap(); ResultSet resultSet = null; PreparedStatement statement = null; @@ -374,8 +374,8 @@ public final class SQLDatabaseManager implements DatabaseManager { try { connection = getConnection(PoolIdentifier.MISC); - for (PrimarySkill primarySkill : PrimarySkill.NON_CHILD_SKILLS) { - String skillName = primarySkill.name().toLowerCase(); + for (PrimarySkillType primarySkillType : PrimarySkillType.NON_CHILD_SKILLS) { + String skillName = primarySkillType.name().toLowerCase(); // Get count of all users with higher skill level than player String sql = "SELECT COUNT(*) AS rank FROM " + tablePrefix + "users JOIN " + tablePrefix + "skills ON user_id = id WHERE " + skillName + " > 0 " + "AND " + skillName + " > (SELECT " + skillName + " FROM " + tablePrefix + "users JOIN " + tablePrefix + "skills ON user_id = id " + @@ -402,7 +402,7 @@ public final class SQLDatabaseManager implements DatabaseManager { while (resultSet.next()) { if (resultSet.getString("user").equalsIgnoreCase(playerName)) { - skills.put(primarySkill, rank + resultSet.getRow()); + skills.put(primarySkillType, rank + resultSet.getRow()); break; } } @@ -890,7 +890,7 @@ public final class SQLDatabaseManager implements DatabaseManager { } if (Config.getInstance().getTruncateSkills()) { - for (PrimarySkill skill : PrimarySkill.NON_CHILD_SKILLS) { + for (PrimarySkillType skill : PrimarySkillType.NON_CHILD_SKILLS) { int cap = Config.getInstance().getLevelCap(skill); if (cap != Integer.MAX_VALUE) { statement = connection.prepareStatement("UPDATE `" + tablePrefix + "skills` SET `" + skill.name().toLowerCase() + "` = " + cap + " WHERE `" + skill.name().toLowerCase() + "` > " + cap); @@ -1052,8 +1052,8 @@ public final class SQLDatabaseManager implements DatabaseManager { } private PlayerProfile loadFromResult(String playerName, ResultSet result) throws SQLException { - Map skills = new EnumMap(PrimarySkill.class); // Skill & Level - Map skillsXp = new EnumMap(PrimarySkill.class); // Skill & XP + Map skills = new EnumMap(PrimarySkillType.class); // Skill & Level + Map skillsXp = new EnumMap(PrimarySkillType.class); // Skill & XP Map skillsDATS = new EnumMap(SuperAbilityType.class); // Ability & Cooldown Map uniqueData = new EnumMap(UniqueDataType.class); //Chimaera wing cooldown and other misc info MobHealthbarType mobHealthbarType; @@ -1066,33 +1066,33 @@ public final class SQLDatabaseManager implements DatabaseManager { final int OFFSET_DATS = 26; final int OFFSET_OTHER = 39; - skills.put(PrimarySkill.TAMING, result.getInt(OFFSET_SKILLS + 1)); - skills.put(PrimarySkill.MINING, result.getInt(OFFSET_SKILLS + 2)); - skills.put(PrimarySkill.REPAIR, result.getInt(OFFSET_SKILLS + 3)); - skills.put(PrimarySkill.WOODCUTTING, result.getInt(OFFSET_SKILLS + 4)); - skills.put(PrimarySkill.UNARMED, result.getInt(OFFSET_SKILLS + 5)); - skills.put(PrimarySkill.HERBALISM, result.getInt(OFFSET_SKILLS + 6)); - skills.put(PrimarySkill.EXCAVATION, result.getInt(OFFSET_SKILLS + 7)); - skills.put(PrimarySkill.ARCHERY, result.getInt(OFFSET_SKILLS + 8)); - skills.put(PrimarySkill.SWORDS, result.getInt(OFFSET_SKILLS + 9)); - skills.put(PrimarySkill.AXES, result.getInt(OFFSET_SKILLS + 10)); - skills.put(PrimarySkill.ACROBATICS, result.getInt(OFFSET_SKILLS + 11)); - skills.put(PrimarySkill.FISHING, result.getInt(OFFSET_SKILLS + 12)); - skills.put(PrimarySkill.ALCHEMY, result.getInt(OFFSET_SKILLS + 13)); + skills.put(PrimarySkillType.TAMING, result.getInt(OFFSET_SKILLS + 1)); + skills.put(PrimarySkillType.MINING, result.getInt(OFFSET_SKILLS + 2)); + skills.put(PrimarySkillType.REPAIR, result.getInt(OFFSET_SKILLS + 3)); + skills.put(PrimarySkillType.WOODCUTTING, result.getInt(OFFSET_SKILLS + 4)); + skills.put(PrimarySkillType.UNARMED, result.getInt(OFFSET_SKILLS + 5)); + skills.put(PrimarySkillType.HERBALISM, result.getInt(OFFSET_SKILLS + 6)); + skills.put(PrimarySkillType.EXCAVATION, result.getInt(OFFSET_SKILLS + 7)); + skills.put(PrimarySkillType.ARCHERY, result.getInt(OFFSET_SKILLS + 8)); + skills.put(PrimarySkillType.SWORDS, result.getInt(OFFSET_SKILLS + 9)); + skills.put(PrimarySkillType.AXES, result.getInt(OFFSET_SKILLS + 10)); + skills.put(PrimarySkillType.ACROBATICS, result.getInt(OFFSET_SKILLS + 11)); + skills.put(PrimarySkillType.FISHING, result.getInt(OFFSET_SKILLS + 12)); + skills.put(PrimarySkillType.ALCHEMY, result.getInt(OFFSET_SKILLS + 13)); - skillsXp.put(PrimarySkill.TAMING, result.getFloat(OFFSET_XP + 1)); - skillsXp.put(PrimarySkill.MINING, result.getFloat(OFFSET_XP + 2)); - skillsXp.put(PrimarySkill.REPAIR, result.getFloat(OFFSET_XP + 3)); - skillsXp.put(PrimarySkill.WOODCUTTING, result.getFloat(OFFSET_XP + 4)); - skillsXp.put(PrimarySkill.UNARMED, result.getFloat(OFFSET_XP + 5)); - skillsXp.put(PrimarySkill.HERBALISM, result.getFloat(OFFSET_XP + 6)); - skillsXp.put(PrimarySkill.EXCAVATION, result.getFloat(OFFSET_XP + 7)); - skillsXp.put(PrimarySkill.ARCHERY, result.getFloat(OFFSET_XP + 8)); - skillsXp.put(PrimarySkill.SWORDS, result.getFloat(OFFSET_XP + 9)); - skillsXp.put(PrimarySkill.AXES, result.getFloat(OFFSET_XP + 10)); - skillsXp.put(PrimarySkill.ACROBATICS, result.getFloat(OFFSET_XP + 11)); - skillsXp.put(PrimarySkill.FISHING, result.getFloat(OFFSET_XP + 12)); - skillsXp.put(PrimarySkill.ALCHEMY, result.getFloat(OFFSET_XP + 13)); + skillsXp.put(PrimarySkillType.TAMING, result.getFloat(OFFSET_XP + 1)); + skillsXp.put(PrimarySkillType.MINING, result.getFloat(OFFSET_XP + 2)); + skillsXp.put(PrimarySkillType.REPAIR, result.getFloat(OFFSET_XP + 3)); + skillsXp.put(PrimarySkillType.WOODCUTTING, result.getFloat(OFFSET_XP + 4)); + skillsXp.put(PrimarySkillType.UNARMED, result.getFloat(OFFSET_XP + 5)); + skillsXp.put(PrimarySkillType.HERBALISM, result.getFloat(OFFSET_XP + 6)); + skillsXp.put(PrimarySkillType.EXCAVATION, result.getFloat(OFFSET_XP + 7)); + skillsXp.put(PrimarySkillType.ARCHERY, result.getFloat(OFFSET_XP + 8)); + skillsXp.put(PrimarySkillType.SWORDS, result.getFloat(OFFSET_XP + 9)); + skillsXp.put(PrimarySkillType.AXES, result.getFloat(OFFSET_XP + 10)); + skillsXp.put(PrimarySkillType.ACROBATICS, result.getFloat(OFFSET_XP + 11)); + skillsXp.put(PrimarySkillType.FISHING, result.getFloat(OFFSET_XP + 12)); + skillsXp.put(PrimarySkillType.ALCHEMY, result.getFloat(OFFSET_XP + 13)); // Taming - Unused - result.getInt(OFFSET_DATS + 1) skillsDATS.put(SuperAbilityType.SUPER_BREAKER, result.getInt(OFFSET_DATS + 2)); @@ -1235,10 +1235,10 @@ public final class SQLDatabaseManager implements DatabaseManager { resultSet = statement.executeQuery("SHOW INDEX FROM `" + tablePrefix + "skills` WHERE `Key_name` LIKE 'idx\\_%'"); resultSet.last(); - if (resultSet.getRow() != PrimarySkill.NON_CHILD_SKILLS.size()) { + if (resultSet.getRow() != PrimarySkillType.NON_CHILD_SKILLS.size()) { mcMMO.p.getLogger().info("Indexing tables, this may take a while on larger databases"); - for (PrimarySkill skill : PrimarySkill.NON_CHILD_SKILLS) { + for (PrimarySkillType skill : PrimarySkillType.NON_CHILD_SKILLS) { String skill_name = skill.name().toLowerCase(); try { diff --git a/src/main/java/com/gmail/nossr50/datatypes/experience/SkillXpGain.java b/src/main/java/com/gmail/nossr50/datatypes/experience/SkillXpGain.java index 8eb768e8e..34548838a 100644 --- a/src/main/java/com/gmail/nossr50/datatypes/experience/SkillXpGain.java +++ b/src/main/java/com/gmail/nossr50/datatypes/experience/SkillXpGain.java @@ -4,20 +4,20 @@ import java.util.concurrent.Delayed; import java.util.concurrent.TimeUnit; import com.gmail.nossr50.config.experience.ExperienceConfig; -import com.gmail.nossr50.datatypes.skills.PrimarySkill; +import com.gmail.nossr50.datatypes.skills.PrimarySkillType; public class SkillXpGain implements Delayed { private final long expiryTime; private final float xp; - private final PrimarySkill type; + private final PrimarySkillType type; - public SkillXpGain(PrimarySkill type, float xp) { + public SkillXpGain(PrimarySkillType type, float xp) { this.expiryTime = System.currentTimeMillis() + getDuration(); this.xp = xp; this.type = type; } - public PrimarySkill getSkill() { + public PrimarySkillType getSkill() { return type; } diff --git a/src/main/java/com/gmail/nossr50/datatypes/player/McMMOPlayer.java b/src/main/java/com/gmail/nossr50/datatypes/player/McMMOPlayer.java index 001969d73..b94b6017c 100644 --- a/src/main/java/com/gmail/nossr50/datatypes/player/McMMOPlayer.java +++ b/src/main/java/com/gmail/nossr50/datatypes/player/McMMOPlayer.java @@ -8,8 +8,8 @@ import com.gmail.nossr50.datatypes.interactions.NotificationType; import com.gmail.nossr50.datatypes.mods.CustomTool; import com.gmail.nossr50.datatypes.party.Party; import com.gmail.nossr50.datatypes.party.PartyTeleportRecord; +import com.gmail.nossr50.datatypes.skills.PrimarySkillType; import com.gmail.nossr50.datatypes.skills.SuperAbilityType; -import com.gmail.nossr50.datatypes.skills.PrimarySkill; import com.gmail.nossr50.datatypes.skills.ToolType; import com.gmail.nossr50.datatypes.skills.XPGainReason; import com.gmail.nossr50.locale.LocaleLoader; @@ -63,7 +63,7 @@ public class McMMOPlayer { private Player player; private PlayerProfile profile; - private final Map skillManagers = new HashMap(); + private final Map skillManagers = new HashMap(); private Party party; private Party invite; @@ -110,11 +110,11 @@ public class McMMOPlayer { /* * I'm using this method because it makes code shorter and safer (we don't have to add all SkillTypes manually), * but I actually have no idea about the performance impact, if there is any. - * If in the future someone wants to remove this, don't forget to also remove what is in the PrimarySkill enum. - bm01 + * If in the future someone wants to remove this, don't forget to also remove what is in the PrimarySkillType enum. - bm01 */ try { - for (PrimarySkill primarySkill : PrimarySkill.values()) { - skillManagers.put(primarySkill, primarySkill.getManagerClass().getConstructor(McMMOPlayer.class).newInstance(this)); + for (PrimarySkillType primarySkillType : PrimarySkillType.values()) { + skillManagers.put(primarySkillType, primarySkillType.getManagerClass().getConstructor(McMMOPlayer.class).newInstance(this)); } } catch (Exception e) { @@ -133,63 +133,63 @@ public class McMMOPlayer { } public AcrobaticsManager getAcrobaticsManager() { - return (AcrobaticsManager) skillManagers.get(PrimarySkill.ACROBATICS); + return (AcrobaticsManager) skillManagers.get(PrimarySkillType.ACROBATICS); } public AlchemyManager getAlchemyManager() { - return (AlchemyManager) skillManagers.get(PrimarySkill.ALCHEMY); + return (AlchemyManager) skillManagers.get(PrimarySkillType.ALCHEMY); } public ArcheryManager getArcheryManager() { - return (ArcheryManager) skillManagers.get(PrimarySkill.ARCHERY); + return (ArcheryManager) skillManagers.get(PrimarySkillType.ARCHERY); } public AxesManager getAxesManager() { - return (AxesManager) skillManagers.get(PrimarySkill.AXES); + return (AxesManager) skillManagers.get(PrimarySkillType.AXES); } public ExcavationManager getExcavationManager() { - return (ExcavationManager) skillManagers.get(PrimarySkill.EXCAVATION); + return (ExcavationManager) skillManagers.get(PrimarySkillType.EXCAVATION); } public FishingManager getFishingManager() { - return (FishingManager) skillManagers.get(PrimarySkill.FISHING); + return (FishingManager) skillManagers.get(PrimarySkillType.FISHING); } public HerbalismManager getHerbalismManager() { - return (HerbalismManager) skillManagers.get(PrimarySkill.HERBALISM); + return (HerbalismManager) skillManagers.get(PrimarySkillType.HERBALISM); } public MiningManager getMiningManager() { - return (MiningManager) skillManagers.get(PrimarySkill.MINING); + return (MiningManager) skillManagers.get(PrimarySkillType.MINING); } public RepairManager getRepairManager() { - return (RepairManager) skillManagers.get(PrimarySkill.REPAIR); + return (RepairManager) skillManagers.get(PrimarySkillType.REPAIR); } public SalvageManager getSalvageManager() { - return (SalvageManager) skillManagers.get(PrimarySkill.SALVAGE); + return (SalvageManager) skillManagers.get(PrimarySkillType.SALVAGE); } public SmeltingManager getSmeltingManager() { - return (SmeltingManager) skillManagers.get(PrimarySkill.SMELTING); + return (SmeltingManager) skillManagers.get(PrimarySkillType.SMELTING); } public SwordsManager getSwordsManager() { - return (SwordsManager) skillManagers.get(PrimarySkill.SWORDS); + return (SwordsManager) skillManagers.get(PrimarySkillType.SWORDS); } public TamingManager getTamingManager() { - return (TamingManager) skillManagers.get(PrimarySkill.TAMING); + return (TamingManager) skillManagers.get(PrimarySkillType.TAMING); } public UnarmedManager getUnarmedManager() { - return (UnarmedManager) skillManagers.get(PrimarySkill.UNARMED); + return (UnarmedManager) skillManagers.get(PrimarySkillType.UNARMED); } public WoodcuttingManager getWoodcuttingManager() { - return (WoodcuttingManager) skillManagers.get(PrimarySkill.WOODCUTTING); + return (WoodcuttingManager) skillManagers.get(PrimarySkillType.WOODCUTTING); } /* @@ -395,7 +395,7 @@ public class McMMOPlayer { public int getPowerLevel() { int powerLevel = 0; - for (PrimarySkill type : PrimarySkill.NON_CHILD_SKILLS) { + for (PrimarySkillType type : PrimarySkillType.NON_CHILD_SKILLS) { if (type.getPermissions(player)) { powerLevel += getSkillLevel(type); } @@ -410,7 +410,7 @@ public class McMMOPlayer { * @param skill Skill being used * @param xp Experience amount to process */ - public void beginXpGain(PrimarySkill skill, float xp, XPGainReason xpGainReason) { + public void beginXpGain(PrimarySkillType skill, float xp, XPGainReason xpGainReason) { Validate.isTrue(xp >= 0.0, "XP gained should be greater than or equal to zero."); if (xp <= 0.0) { @@ -418,10 +418,10 @@ public class McMMOPlayer { } if (skill.isChildSkill()) { - Set parentSkills = FamilyTree.getParents(skill); + Set parentSkills = FamilyTree.getParents(skill); float splitXp = xp / parentSkills.size(); - for (PrimarySkill parentSkill : parentSkills) { + for (PrimarySkillType parentSkill : parentSkills) { if (parentSkill.getPermissions(player)) { beginXpGain(parentSkill, splitXp, xpGainReason); } @@ -444,7 +444,7 @@ public class McMMOPlayer { * @param skill Skill being used * @param xp Experience amount to process */ - public void beginUnsharedXpGain(PrimarySkill skill, float xp, XPGainReason xpGainReason) { + public void beginUnsharedXpGain(PrimarySkillType skill, float xp, XPGainReason xpGainReason) { applyXpGain(skill, modifyXpGain(skill, xp), xpGainReason); if (party == null) { @@ -459,56 +459,56 @@ public class McMMOPlayer { /** * Applies an experience gain * - * @param primarySkill Skill being used + * @param primarySkillType Skill being used * @param xp Experience amount to add */ - public void applyXpGain(PrimarySkill primarySkill, float xp, XPGainReason xpGainReason) { - if (!primarySkill.getPermissions(player)) { + public void applyXpGain(PrimarySkillType primarySkillType, float xp, XPGainReason xpGainReason) { + if (!primarySkillType.getPermissions(player)) { return; } - if (primarySkill.isChildSkill()) { - Set parentSkills = FamilyTree.getParents(primarySkill); + if (primarySkillType.isChildSkill()) { + Set parentSkills = FamilyTree.getParents(primarySkillType); - for (PrimarySkill parentSkill : parentSkills) { + for (PrimarySkillType parentSkill : parentSkills) { applyXpGain(parentSkill, xp / parentSkills.size(), xpGainReason); } return; } - if (!EventUtils.handleXpGainEvent(player, primarySkill, xp, xpGainReason)) { + if (!EventUtils.handleXpGainEvent(player, primarySkillType, xp, xpGainReason)) { return; } - isUsingUnarmed = (primarySkill == PrimarySkill.UNARMED); - checkXp(primarySkill, xpGainReason); + isUsingUnarmed = (primarySkillType == PrimarySkillType.UNARMED); + checkXp(primarySkillType, xpGainReason); } /** * Check the XP of a skill. * - * @param primarySkill The skill to check + * @param primarySkillType The skill to check */ - private void checkXp(PrimarySkill primarySkill, XPGainReason xpGainReason) { - if (getSkillXpLevelRaw(primarySkill) < getXpToLevel(primarySkill)) { + private void checkXp(PrimarySkillType primarySkillType, XPGainReason xpGainReason) { + if (getSkillXpLevelRaw(primarySkillType) < getXpToLevel(primarySkillType)) { return; } int levelsGained = 0; float xpRemoved = 0; - while (getSkillXpLevelRaw(primarySkill) >= getXpToLevel(primarySkill)) { - if (hasReachedLevelCap(primarySkill)) { - setSkillXpLevel(primarySkill, 0); + while (getSkillXpLevelRaw(primarySkillType) >= getXpToLevel(primarySkillType)) { + if (hasReachedLevelCap(primarySkillType)) { + setSkillXpLevel(primarySkillType, 0); break; } - xpRemoved += profile.levelUp(primarySkill); + xpRemoved += profile.levelUp(primarySkillType); levelsGained++; } - if (!EventUtils.handleLevelChangeEvent(player, primarySkill, levelsGained, xpRemoved, true, xpGainReason)) { + if (!EventUtils.handleLevelChangeEvent(player, primarySkillType, levelsGained, xpRemoved, true, xpGainReason)) { return; } @@ -520,7 +520,7 @@ public class McMMOPlayer { * Check to see if the player unlocked any new skills */ - NotificationManager.sendPlayerLevelUpNotification(UserManager.getPlayer(player), primarySkill, profile.getSkillLevel(primarySkill)); + NotificationManager.sendPlayerLevelUpNotification(UserManager.getPlayer(player), primarySkillType, profile.getSkillLevel(primarySkillType)); } /* @@ -690,16 +690,16 @@ public class McMMOPlayer { /** * Modifies an experience gain using skill modifiers, global rate and perks * - * @param primarySkill Skill being used + * @param primarySkillType Skill being used * @param xp Experience amount to process * @return Modified experience */ - private float modifyXpGain(PrimarySkill primarySkill, float xp) { - if (player.getGameMode() == GameMode.CREATIVE || (primarySkill.getMaxLevel() <= getSkillLevel(primarySkill)) || (Config.getInstance().getPowerLevelCap() <= getPowerLevel())) { + private float modifyXpGain(PrimarySkillType primarySkillType, float xp) { + if (player.getGameMode() == GameMode.CREATIVE || (primarySkillType.getMaxLevel() <= getSkillLevel(primarySkillType)) || (Config.getInstance().getPowerLevelCap() <= getPowerLevel())) { return 0; } - xp = (float) (xp / primarySkill.getXpModifier() * ExperienceConfig.getInstance().getExperienceGainsGlobalMultiplier()); + xp = (float) (xp / primarySkillType.getXpModifier() * ExperienceConfig.getInstance().getExperienceGainsGlobalMultiplier()); if (Config.getInstance().getToolModsEnabled()) { CustomTool tool = mcMMO.getModManager().getTool(player.getInventory().getItemInMainHand()); @@ -709,7 +709,7 @@ public class McMMOPlayer { } } - return PerksUtils.handleXpPerks(player, xp, primarySkill); + return PerksUtils.handleXpPerks(player, xp, primarySkillType); } public void checkGodMode() { @@ -731,7 +731,7 @@ public class McMMOPlayer { * * @param skill The skill the ability is based on */ - public void checkAbilityActivation(PrimarySkill skill) { + public void checkAbilityActivation(PrimarySkillType skill) { ToolType tool = skill.getTool(); SuperAbilityType ability = skill.getAbility(); @@ -761,7 +761,7 @@ public class McMMOPlayer { * Axes and Woodcutting are odd because they share the same tool. * We show them the too tired message when they take action. */ - if (skill == PrimarySkill.WOODCUTTING || skill == PrimarySkill.AXES) { + if (skill == PrimarySkillType.WOODCUTTING || skill == PrimarySkillType.AXES) { NotificationManager.sendPlayerInformation(player, NotificationType.ABILITY_COOLDOWN, "Skills.TooTired", String.valueOf(timeRemaining)); } @@ -796,7 +796,7 @@ public class McMMOPlayer { new AbilityDisableTask(this, ability).runTaskLater(mcMMO.p, ticks * Misc.TICK_CONVERSION_FACTOR); } - public void processAbilityActivation(PrimarySkill skill) { + public void processAbilityActivation(PrimarySkillType skill) { if (Config.getInstance().getAbilitiesOnlyActivateWhenSneaking() && !player.isSneaking()) { return; } @@ -825,7 +825,7 @@ public class McMMOPlayer { * Basically the tool always needs to ready and we check to see if the cooldown is over when the user takes action */ if (ability.getPermissions(player) && tool.inHand(inHand) && !getToolPreparationMode(tool)) { - if (skill != PrimarySkill.WOODCUTTING && skill != PrimarySkill.AXES) { + if (skill != PrimarySkillType.WOODCUTTING && skill != PrimarySkillType.AXES) { int timeRemaining = calculateTimeRemaining(ability); if (!getAbilityMode(ability) && timeRemaining > 0) { @@ -855,46 +855,46 @@ public class McMMOPlayer { return (int) (((deactivatedTimestamp + (PerksUtils.handleCooldownPerks(player, ability.getCooldown()) * Misc.TIME_CONVERSION_FACTOR)) - System.currentTimeMillis()) / Misc.TIME_CONVERSION_FACTOR); } - private boolean hasReachedLevelCap(PrimarySkill skill) { + private boolean hasReachedLevelCap(PrimarySkillType skill) { return (skill.getMaxLevel() < getSkillLevel(skill) + 1) || (Config.getInstance().getPowerLevelCap() < getPowerLevel() + 1); } /* * These functions are wrapped from PlayerProfile so that we don't always have to store it alongside the McMMOPlayer object. */ - public int getSkillLevel(PrimarySkill skill) { + public int getSkillLevel(PrimarySkillType skill) { return profile.getSkillLevel(skill); } - public float getSkillXpLevelRaw(PrimarySkill skill) { + public float getSkillXpLevelRaw(PrimarySkillType skill) { return profile.getSkillXpLevelRaw(skill); } - public int getSkillXpLevel(PrimarySkill skill) { + public int getSkillXpLevel(PrimarySkillType skill) { return profile.getSkillXpLevel(skill); } - public void setSkillXpLevel(PrimarySkill skill, float xpLevel) { + public void setSkillXpLevel(PrimarySkillType skill, float xpLevel) { profile.setSkillXpLevel(skill, xpLevel); } - public int getXpToLevel(PrimarySkill skill) { + public int getXpToLevel(PrimarySkillType skill) { return profile.getXpToLevel(skill); } - public void removeXp(PrimarySkill skill, int xp) { + public void removeXp(PrimarySkillType skill, int xp) { profile.removeXp(skill, xp); } - public void modifySkill(PrimarySkill skill, int level) { + public void modifySkill(PrimarySkillType skill, int level) { profile.modifySkill(skill, level); } - public void addLevels(PrimarySkill skill, int levels) { + public void addLevels(PrimarySkillType skill, int levels) { profile.addLevels(skill, levels); } - public void addXp(PrimarySkill skill, float xp) { + public void addXp(PrimarySkillType skill, float xp) { profile.addXp(skill, xp); } diff --git a/src/main/java/com/gmail/nossr50/datatypes/player/PlayerProfile.java b/src/main/java/com/gmail/nossr50/datatypes/player/PlayerProfile.java index 16c1d9d14..2da73be4e 100644 --- a/src/main/java/com/gmail/nossr50/datatypes/player/PlayerProfile.java +++ b/src/main/java/com/gmail/nossr50/datatypes/player/PlayerProfile.java @@ -6,7 +6,7 @@ import java.util.Set; import java.util.UUID; import java.util.concurrent.DelayQueue; -import com.gmail.nossr50.datatypes.skills.PrimarySkill; +import com.gmail.nossr50.datatypes.skills.PrimarySkillType; import com.gmail.nossr50.datatypes.skills.SuperAbilityType; import com.gmail.nossr50.mcMMO; import com.gmail.nossr50.config.Config; @@ -31,14 +31,14 @@ public class PlayerProfile { private int scoreboardTipsShown; /* Skill Data */ - private final Map skills = new HashMap(); // Skill & Level - private final Map skillsXp = new HashMap(); // Skill & XP + private final Map skills = new HashMap(); // Skill & Level + private final Map skillsXp = new HashMap(); // Skill & XP private final Map abilityDATS = new HashMap(); // Ability & Cooldown private final Map uniquePlayerData = new HashMap<>(); //Misc data that doesn't fit into other categories (chimaera wing, etc..) // Store previous XP gains for deminished returns private DelayQueue gainedSkillsXp = new DelayQueue(); - private HashMap rollingSkillsXp = new HashMap(); + private HashMap rollingSkillsXp = new HashMap(); @Deprecated public PlayerProfile(String playerName) { @@ -56,9 +56,9 @@ public class PlayerProfile { abilityDATS.put(superAbilityType, 0); } - for (PrimarySkill primarySkill : PrimarySkill.NON_CHILD_SKILLS) { - skills.put(primarySkill, 0); - skillsXp.put(primarySkill, 0F); + for (PrimarySkillType primarySkillType : PrimarySkillType.NON_CHILD_SKILLS) { + skills.put(primarySkillType, 0); + skillsXp.put(primarySkillType, 0F); } //Misc Cooldowns @@ -76,7 +76,7 @@ public class PlayerProfile { this.loaded = isLoaded; } - public PlayerProfile(String playerName, UUID uuid, Map levelData, Map xpData, Map cooldownData, MobHealthbarType mobHealthbarType, int scoreboardTipsShown, Map uniqueProfileData) { + public PlayerProfile(String playerName, UUID uuid, Map levelData, Map xpData, Map cooldownData, MobHealthbarType mobHealthbarType, int scoreboardTipsShown, Map uniqueProfileData) { this.playerName = playerName; this.uuid = uuid; this.mobHealthbarType = mobHealthbarType; @@ -209,19 +209,19 @@ public class PlayerProfile { * Xp Functions */ - public int getSkillLevel(PrimarySkill skill) { + public int getSkillLevel(PrimarySkillType skill) { return skill.isChildSkill() ? getChildSkillLevel(skill) : skills.get(skill); } - public float getSkillXpLevelRaw(PrimarySkill skill) { + public float getSkillXpLevelRaw(PrimarySkillType skill) { return skillsXp.get(skill); } - public int getSkillXpLevel(PrimarySkill skill) { + public int getSkillXpLevel(PrimarySkillType skill) { return (int) Math.floor(getSkillXpLevelRaw(skill)); } - public void setSkillXpLevel(PrimarySkill skill, float xpLevel) { + public void setSkillXpLevel(PrimarySkillType skill, float xpLevel) { if (skill.isChildSkill()) { return; } @@ -231,7 +231,7 @@ public class PlayerProfile { skillsXp.put(skill, xpLevel); } - protected float levelUp(PrimarySkill skill) { + protected float levelUp(PrimarySkillType skill) { float xpRemoved = getXpToLevel(skill); changed = true; @@ -248,7 +248,7 @@ public class PlayerProfile { * @param skill Type of skill to modify * @param xp Amount of xp to remove */ - public void removeXp(PrimarySkill skill, int xp) { + public void removeXp(PrimarySkillType skill, int xp) { if (skill.isChildSkill()) { return; } @@ -258,7 +258,7 @@ public class PlayerProfile { skillsXp.put(skill, skillsXp.get(skill) - xp); } - public void removeXp(PrimarySkill skill, float xp) { + public void removeXp(PrimarySkillType skill, float xp) { if (skill.isChildSkill()) { return; } @@ -274,7 +274,7 @@ public class PlayerProfile { * @param skill Type of skill to modify * @param level New level value for the skill */ - public void modifySkill(PrimarySkill skill, int level) { + public void modifySkill(PrimarySkillType skill, int level) { if (skill.isChildSkill()) { return; } @@ -291,7 +291,7 @@ public class PlayerProfile { * @param skill Type of skill to add levels to * @param levels Number of levels to add */ - public void addLevels(PrimarySkill skill, int levels) { + public void addLevels(PrimarySkillType skill, int levels) { modifySkill(skill, skills.get(skill) + levels); } @@ -301,14 +301,14 @@ public class PlayerProfile { * @param skill Type of skill to add experience to * @param xp Number of experience to add */ - public void addXp(PrimarySkill skill, float xp) { + public void addXp(PrimarySkillType skill, float xp) { changed = true; if (skill.isChildSkill()) { - Set parentSkills = FamilyTree.getParents(skill); + Set parentSkills = FamilyTree.getParents(skill); float dividedXP = (xp / parentSkills.size()); - for (PrimarySkill parentSkill : parentSkills) { + for (PrimarySkillType parentSkill : parentSkills) { skillsXp.put(parentSkill, skillsXp.get(parentSkill) + dividedXP); } } @@ -323,11 +323,11 @@ public class PlayerProfile { * * @return xp Experience amount registered */ - public float getRegisteredXpGain(PrimarySkill primarySkill) { + public float getRegisteredXpGain(PrimarySkillType primarySkillType) { float xp = 0F; - if (rollingSkillsXp.get(primarySkill) != null) { - xp = rollingSkillsXp.get(primarySkill); + if (rollingSkillsXp.get(primarySkillType) != null) { + xp = rollingSkillsXp.get(primarySkillType); } return xp; @@ -337,12 +337,12 @@ public class PlayerProfile { * Register an experience gain * This is used for diminished XP returns * - * @param primarySkill Skill being used + * @param primarySkillType Skill being used * @param xp Experience amount to add */ - public void registerXpGain(PrimarySkill primarySkill, float xp) { - gainedSkillsXp.add(new SkillXpGain(primarySkill, xp)); - rollingSkillsXp.put(primarySkill, getRegisteredXpGain(primarySkill) + xp); + public void registerXpGain(PrimarySkillType primarySkillType, float xp) { + gainedSkillsXp.add(new SkillXpGain(primarySkillType, xp)); + rollingSkillsXp.put(primarySkillType, getRegisteredXpGain(primarySkillType) + xp); } /** @@ -359,21 +359,21 @@ public class PlayerProfile { /** * Get the amount of Xp remaining before the next level. * - * @param primarySkill Type of skill to check + * @param primarySkillType Type of skill to check * @return the total amount of Xp until next level */ - public int getXpToLevel(PrimarySkill primarySkill) { - int level = (ExperienceConfig.getInstance().getCumulativeCurveEnabled()) ? UserManager.getPlayer(playerName).getPowerLevel() : skills.get(primarySkill); + public int getXpToLevel(PrimarySkillType primarySkillType) { + int level = (ExperienceConfig.getInstance().getCumulativeCurveEnabled()) ? UserManager.getPlayer(playerName).getPowerLevel() : skills.get(primarySkillType); FormulaType formulaType = ExperienceConfig.getInstance().getFormulaType(); return mcMMO.getFormulaManager().getCachedXpToLevel(level, formulaType); } - private int getChildSkillLevel(PrimarySkill primarySkill) { - Set parents = FamilyTree.getParents(primarySkill); + private int getChildSkillLevel(PrimarySkillType primarySkillType) { + Set parents = FamilyTree.getParents(primarySkillType); int sum = 0; - for (PrimarySkill parent : parents) { + for (PrimarySkillType parent : parents) { sum += Math.min(getSkillLevel(parent), parent.getMaxLevel()); } diff --git a/src/main/java/com/gmail/nossr50/datatypes/skills/PrimarySkill.java b/src/main/java/com/gmail/nossr50/datatypes/skills/PrimarySkillType.java similarity index 84% rename from src/main/java/com/gmail/nossr50/datatypes/skills/PrimarySkill.java rename to src/main/java/com/gmail/nossr50/datatypes/skills/PrimarySkillType.java index 738435b42..4ea4b158b 100644 --- a/src/main/java/com/gmail/nossr50/datatypes/skills/PrimarySkill.java +++ b/src/main/java/com/gmail/nossr50/datatypes/skills/PrimarySkillType.java @@ -35,7 +35,7 @@ import com.gmail.nossr50.util.skills.ParticleEffectUtils; import com.google.common.collect.ImmutableList; -public enum PrimarySkill { +public enum PrimarySkillType { ACROBATICS(AcrobaticsManager.class, Color.WHITE, ImmutableList.of(SubSkillType.ACROBATICS_DODGE, SubSkillType.ACROBATICS_ROLL)), ALCHEMY(AlchemyManager.class, Color.FUCHSIA, ImmutableList.of(SubSkillType.ALCHEMY_CATALYSIS, SubSkillType.ALCHEMY_CONCOCTIONS)), ARCHERY(ArcheryManager.class, Color.MAROON, ImmutableList.of(SubSkillType.ARCHERY_DAZE, SubSkillType.ARCHERY_ARROW_RETRIEVAL, SubSkillType.ARCHERY_SKILL_SHOT)), @@ -45,8 +45,8 @@ public enum PrimarySkill { HERBALISM(HerbalismManager.class, Color.GREEN, SuperAbilityType.GREEN_TERRA, ToolType.HOE, ImmutableList.of(SubSkillType.HERBALISM_FARMERS_DIET, SubSkillType.HERBALISM_GREEN_THUMB, SubSkillType.HERBALISM_DOUBLE_DROPS, SubSkillType.HERBALISM_HYLIAN_LUCK, SubSkillType.HERBALISM_SHROOM_THUMB)), MINING(MiningManager.class, Color.GRAY, SuperAbilityType.SUPER_BREAKER, ToolType.PICKAXE, ImmutableList.of(SubSkillType.MINING_SUPER_BREAKER, SubSkillType.MINING_DEMOLITIONS_EXPERTISE, SubSkillType.MINING_BIGGER_BOMBS, SubSkillType.MINING_BLAST_MINING, SubSkillType.MINING_DOUBLE_DROPS)), REPAIR(RepairManager.class, Color.SILVER, ImmutableList.of(SubSkillType.REPAIR_ARCANE_FORGING, SubSkillType.REPAIR_REPAIR_MASTERY, SubSkillType.REPAIR_SUPER_REPAIR)), - SALVAGE(SalvageManager.class, Color.ORANGE, ImmutableList.of(SubSkillType.SALVAGE_ADVANCED_SALVAGE, SubSkillType.SALVAGE_ARCANE_SALVAGE)), - SMELTING(SmeltingManager.class, Color.YELLOW, ImmutableList.of(SubSkillType.SMELTING_FLUX_MINING, SubSkillType.SMELTING_FUEL_EFFICIENCY, SubSkillType.SMELTING_SECOND_SMELT)), + SALVAGE(SalvageManager.class, Color.ORANGE, ImmutableList.of(SubSkillType.SALVAGE_UNDERSTANDING_THE_ART, SubSkillType.SALVAGE_ADVANCED_SALVAGE, SubSkillType.SALVAGE_ARCANE_SALVAGE)), + SMELTING(SmeltingManager.class, Color.YELLOW, ImmutableList.of(SubSkillType.SMELTING_UNDERSTANDING_THE_ART, SubSkillType.SMELTING_FLUX_MINING, SubSkillType.SMELTING_FUEL_EFFICIENCY, SubSkillType.SMELTING_SECOND_SMELT)), SWORDS(SwordsManager.class, Color.fromRGB(178, 34, 34), SuperAbilityType.SERRATED_STRIKES, ToolType.SWORD, ImmutableList.of(SubSkillType.SWORDS_SERRATED_STRIKES, SubSkillType.SWORDS_BLEED, SubSkillType.SWORDS_COUNTER_ATTACK)), TAMING(TamingManager.class, Color.PURPLE, ImmutableList.of(SubSkillType.TAMING_BEAST_LORE, SubSkillType.TAMING_CALL_OF_THE_WILD, SubSkillType.TAMING_ENVIRONMENTALLY_AWARE, SubSkillType.TAMING_FAST_FOOD_SERVICE, SubSkillType.TAMING_GORE, SubSkillType.TAMING_HOLY_HOUND, SubSkillType.TAMING_SHARPENED_CLAWS, SubSkillType.TAMING_SHOCK_PROOF, SubSkillType.TAMING_THICK_FUR, SubSkillType.TAMING_PUMMEL)), UNARMED(UnarmedManager.class, Color.BLACK, SuperAbilityType.BERSERK, ToolType.FISTS, ImmutableList.of(SubSkillType.UNARMED_BERSERK, SubSkillType.UNARMED_BLOCK_CRACKER, SubSkillType.UNARMED_ARROW_DEFLECT, SubSkillType.UNARMED_DISARM, SubSkillType.UNARMED_IRON_ARM_STYLE, SubSkillType.UNARMED_IRON_GRIP)), @@ -61,20 +61,20 @@ public enum PrimarySkill { public static final List SKILL_NAMES; public static final List SUBSKILL_NAMES; - public static final List CHILD_SKILLS; - public static final List NON_CHILD_SKILLS; + public static final List CHILD_SKILLS; + public static final List NON_CHILD_SKILLS; - public static final List COMBAT_SKILLS = ImmutableList.of(ARCHERY, AXES, SWORDS, TAMING, UNARMED); - public static final List GATHERING_SKILLS = ImmutableList.of(EXCAVATION, FISHING, HERBALISM, MINING, WOODCUTTING); - public static final List MISC_SKILLS = ImmutableList.of(ACROBATICS, ALCHEMY, REPAIR, SALVAGE, SMELTING); + public static final List COMBAT_SKILLS = ImmutableList.of(ARCHERY, AXES, SWORDS, TAMING, UNARMED); + public static final List GATHERING_SKILLS = ImmutableList.of(EXCAVATION, FISHING, HERBALISM, MINING, WOODCUTTING); + public static final List MISC_SKILLS = ImmutableList.of(ACROBATICS, ALCHEMY, REPAIR, SALVAGE, SMELTING); static { - List childSkills = new ArrayList(); - List nonChildSkills = new ArrayList(); + List childSkills = new ArrayList(); + List nonChildSkills = new ArrayList(); ArrayList names = new ArrayList(); ArrayList subSkillNames = new ArrayList<>(); - for (PrimarySkill skill : values()) { + for (PrimarySkillType skill : values()) { if (skill.isChildSkill()) { childSkills.add(skill); } @@ -97,11 +97,11 @@ public enum PrimarySkill { NON_CHILD_SKILLS = ImmutableList.copyOf(nonChildSkills); } - private PrimarySkill(Class managerClass, Color runescapeColor, List subSkillTypes) { + private PrimarySkillType(Class managerClass, Color runescapeColor, List subSkillTypes) { this(managerClass, runescapeColor, null, null, subSkillTypes); } - private PrimarySkill(Class managerClass, Color runescapeColor, SuperAbilityType ability, ToolType tool, List subSkillTypes) { + private PrimarySkillType(Class managerClass, Color runescapeColor, SuperAbilityType ability, ToolType tool, List subSkillTypes) { this.managerClass = managerClass; this.runescapeColor = runescapeColor; this.ability = ability; @@ -168,16 +168,16 @@ public enum PrimarySkill { return ExperienceConfig.getInstance().getFormulaSkillModifier(this); } - public static PrimarySkill getSkill(String skillName) { + public static PrimarySkillType getSkill(String skillName) { if (!Config.getInstance().getLocale().equalsIgnoreCase("en_US")) { - for (PrimarySkill type : values()) { + for (PrimarySkillType type : values()) { if (skillName.equalsIgnoreCase(LocaleLoader.getString(StringUtils.getCapitalized(type.name()) + ".SkillName"))) { return type; } } } - for (PrimarySkill type : values()) { + for (PrimarySkillType type : values()) { if (type.name().equalsIgnoreCase(skillName)) { return type; } @@ -202,8 +202,8 @@ public enum PrimarySkill { } } - public static PrimarySkill bySecondaryAbility(SubSkillType subSkillType) { - for (PrimarySkill type : values()) { + public static PrimarySkillType bySecondaryAbility(SubSkillType subSkillType) { + for (PrimarySkillType type : values()) { if (type.getSkillAbilities().contains(subSkillType)) { return type; } @@ -211,8 +211,8 @@ public enum PrimarySkill { return null; } - public static PrimarySkill byAbility(SuperAbilityType ability) { - for (PrimarySkill type : values()) { + public static PrimarySkillType byAbility(SuperAbilityType ability) { + for (PrimarySkillType type : values()) { if (type.getAbility() == ability) { return type; } diff --git a/src/main/java/com/gmail/nossr50/datatypes/skills/SubSkillType.java b/src/main/java/com/gmail/nossr50/datatypes/skills/SubSkillType.java index 611acd1bb..64c546945 100644 --- a/src/main/java/com/gmail/nossr50/datatypes/skills/SubSkillType.java +++ b/src/main/java/com/gmail/nossr50/datatypes/skills/SubSkillType.java @@ -4,7 +4,7 @@ import com.gmail.nossr50.locale.LocaleLoader; import com.gmail.nossr50.util.StringUtils; public enum SubSkillType { - /* !! Warning -- Do not let subskills share a name with any existing PrimarySkill as it will clash with the static import !! */ + /* !! Warning -- Do not let subskills share a name with any existing PrimarySkillType as it will clash with the static import !! */ /* ACROBATICS */ ACROBATICS_DODGE, @@ -60,11 +60,13 @@ public enum SubSkillType { /* Salvage */ SALVAGE_ADVANCED_SALVAGE, SALVAGE_ARCANE_SALVAGE, + SALVAGE_UNDERSTANDING_THE_ART, /* Smelting */ SMELTING_FLUX_MINING, SMELTING_FUEL_EFFICIENCY, SMELTING_SECOND_SMELT, + SMELTING_UNDERSTANDING_THE_ART, /* Swords */ SWORDS_BLEED, @@ -122,11 +124,11 @@ public enum SubSkillType { } /** - * !!! This relies on the immutable lists in PrimarySkill being populated !!! + * !!! This relies on the immutable lists in PrimarySkillType being populated !!! * If we add skills, those immutable lists need to be updated * @return */ - public PrimarySkill getParentSkill() { return PrimarySkill.bySecondaryAbility(this); } + public PrimarySkillType getParentSkill() { return PrimarySkillType.bySecondaryAbility(this); } /** * Returns the permission root address for the advanced.yml for this subskill diff --git a/src/main/java/com/gmail/nossr50/datatypes/skills/interfaces/ChildSkill.java b/src/main/java/com/gmail/nossr50/datatypes/skills/interfaces/ChildSkill.java index 95aa4b5e4..0bfee0108 100644 --- a/src/main/java/com/gmail/nossr50/datatypes/skills/interfaces/ChildSkill.java +++ b/src/main/java/com/gmail/nossr50/datatypes/skills/interfaces/ChildSkill.java @@ -1,11 +1,11 @@ package com.gmail.nossr50.datatypes.skills.interfaces; -import com.gmail.nossr50.datatypes.skills.PrimarySkill; +import com.gmail.nossr50.datatypes.skills.PrimarySkillType; public interface ChildSkill extends Skill { /** * Get's the other parent for this Skill * @return the other parent */ - PrimarySkill getSecondParent(); + PrimarySkillType getSecondParent(); } diff --git a/src/main/java/com/gmail/nossr50/datatypes/skills/interfaces/Skill.java b/src/main/java/com/gmail/nossr50/datatypes/skills/interfaces/Skill.java index b7283d0a9..68cf7180e 100644 --- a/src/main/java/com/gmail/nossr50/datatypes/skills/interfaces/Skill.java +++ b/src/main/java/com/gmail/nossr50/datatypes/skills/interfaces/Skill.java @@ -1,13 +1,13 @@ package com.gmail.nossr50.datatypes.skills.interfaces; -import com.gmail.nossr50.datatypes.skills.PrimarySkill; +import com.gmail.nossr50.datatypes.skills.PrimarySkillType; public interface Skill { /** * The primary skill * @return this primary skill */ - PrimarySkill getPrimarySkill(); + PrimarySkillType getPrimarySkill(); /** * Returns the key name used for this skill in conjunction with config files diff --git a/src/main/java/com/gmail/nossr50/datatypes/skills/subskills/acrobatics/AcrobaticsSubSkill.java b/src/main/java/com/gmail/nossr50/datatypes/skills/subskills/acrobatics/AcrobaticsSubSkill.java index c547a3780..30c53594f 100644 --- a/src/main/java/com/gmail/nossr50/datatypes/skills/subskills/acrobatics/AcrobaticsSubSkill.java +++ b/src/main/java/com/gmail/nossr50/datatypes/skills/subskills/acrobatics/AcrobaticsSubSkill.java @@ -1,13 +1,11 @@ package com.gmail.nossr50.datatypes.skills.subskills.acrobatics; -import com.gmail.nossr50.datatypes.skills.PrimarySkill; +import com.gmail.nossr50.datatypes.skills.PrimarySkillType; import com.gmail.nossr50.datatypes.skills.subskills.AbstractSubSkill; import com.gmail.nossr50.datatypes.skills.subskills.interfaces.InteractType; import com.gmail.nossr50.locale.LocaleLoader; import com.gmail.nossr50.mcMMO; import com.gmail.nossr50.util.StringUtils; -import net.md_5.bungee.api.chat.ComponentBuilder; -import org.bukkit.entity.Player; import org.bukkit.event.Event; import org.bukkit.event.EventPriority; @@ -58,8 +56,8 @@ public abstract class AcrobaticsSubSkill extends AbstractSubSkill { * @return The name of the primary skill */ @Override - public PrimarySkill getPrimarySkill() { - return PrimarySkill.ACROBATICS; + public PrimarySkillType getPrimarySkill() { + return PrimarySkillType.ACROBATICS; } /** diff --git a/src/main/java/com/gmail/nossr50/events/experience/McMMOPlayerExperienceEvent.java b/src/main/java/com/gmail/nossr50/events/experience/McMMOPlayerExperienceEvent.java index 6ea8c118e..66882befc 100644 --- a/src/main/java/com/gmail/nossr50/events/experience/McMMOPlayerExperienceEvent.java +++ b/src/main/java/com/gmail/nossr50/events/experience/McMMOPlayerExperienceEvent.java @@ -1,6 +1,6 @@ package com.gmail.nossr50.events.experience; -import com.gmail.nossr50.datatypes.skills.PrimarySkill; +import com.gmail.nossr50.datatypes.skills.PrimarySkillType; import org.bukkit.entity.Player; import org.bukkit.event.Cancellable; import org.bukkit.event.HandlerList; @@ -14,19 +14,19 @@ import com.gmail.nossr50.util.player.UserManager; */ public abstract class McMMOPlayerExperienceEvent extends PlayerEvent implements Cancellable { private boolean cancelled; - protected PrimarySkill skill; + protected PrimarySkillType skill; protected int skillLevel; protected XPGainReason xpGainReason; @Deprecated - protected McMMOPlayerExperienceEvent(Player player, PrimarySkill skill) { + protected McMMOPlayerExperienceEvent(Player player, PrimarySkillType skill) { super(player); this.skill = skill; this.skillLevel = UserManager.getPlayer(player).getSkillLevel(skill); this.xpGainReason = XPGainReason.UNKNOWN; } - protected McMMOPlayerExperienceEvent(Player player, PrimarySkill skill, XPGainReason xpGainReason) { + protected McMMOPlayerExperienceEvent(Player player, PrimarySkillType skill, XPGainReason xpGainReason) { super(player); this.skill = skill; this.skillLevel = UserManager.getPlayer(player).getSkillLevel(skill); @@ -36,7 +36,7 @@ public abstract class McMMOPlayerExperienceEvent extends PlayerEvent implements /** * @return The skill involved in this event */ - public PrimarySkill getSkill() { + public PrimarySkillType getSkill() { return skill; } diff --git a/src/main/java/com/gmail/nossr50/events/experience/McMMOPlayerLevelChangeEvent.java b/src/main/java/com/gmail/nossr50/events/experience/McMMOPlayerLevelChangeEvent.java index 25d05c383..74eb42c47 100644 --- a/src/main/java/com/gmail/nossr50/events/experience/McMMOPlayerLevelChangeEvent.java +++ b/src/main/java/com/gmail/nossr50/events/experience/McMMOPlayerLevelChangeEvent.java @@ -1,6 +1,6 @@ package com.gmail.nossr50.events.experience; -import com.gmail.nossr50.datatypes.skills.PrimarySkill; +import com.gmail.nossr50.datatypes.skills.PrimarySkillType; import org.bukkit.entity.Player; import com.gmail.nossr50.datatypes.skills.XPGainReason; @@ -10,11 +10,11 @@ import com.gmail.nossr50.datatypes.skills.XPGainReason; */ public abstract class McMMOPlayerLevelChangeEvent extends McMMOPlayerExperienceEvent { @Deprecated - public McMMOPlayerLevelChangeEvent(Player player, PrimarySkill skill) { + public McMMOPlayerLevelChangeEvent(Player player, PrimarySkillType skill) { super(player, skill, XPGainReason.UNKNOWN); } - public McMMOPlayerLevelChangeEvent(Player player, PrimarySkill skill, XPGainReason xpGainReason) { + public McMMOPlayerLevelChangeEvent(Player player, PrimarySkillType skill, XPGainReason xpGainReason) { super(player, skill, xpGainReason); } } diff --git a/src/main/java/com/gmail/nossr50/events/experience/McMMOPlayerLevelDownEvent.java b/src/main/java/com/gmail/nossr50/events/experience/McMMOPlayerLevelDownEvent.java index 817c853aa..9cf36a891 100644 --- a/src/main/java/com/gmail/nossr50/events/experience/McMMOPlayerLevelDownEvent.java +++ b/src/main/java/com/gmail/nossr50/events/experience/McMMOPlayerLevelDownEvent.java @@ -1,6 +1,6 @@ package com.gmail.nossr50.events.experience; -import com.gmail.nossr50.datatypes.skills.PrimarySkill; +import com.gmail.nossr50.datatypes.skills.PrimarySkillType; import org.bukkit.entity.Player; import org.bukkit.event.HandlerList; @@ -13,23 +13,23 @@ public class McMMOPlayerLevelDownEvent extends McMMOPlayerLevelChangeEvent { private int levelsLost; @Deprecated - public McMMOPlayerLevelDownEvent(Player player, PrimarySkill skill) { + public McMMOPlayerLevelDownEvent(Player player, PrimarySkillType skill) { super(player, skill, XPGainReason.UNKNOWN); this.levelsLost = 1; } @Deprecated - public McMMOPlayerLevelDownEvent(Player player, PrimarySkill skill, int levelsLost) { + public McMMOPlayerLevelDownEvent(Player player, PrimarySkillType skill, int levelsLost) { super(player, skill, XPGainReason.UNKNOWN); this.levelsLost = levelsLost; } - public McMMOPlayerLevelDownEvent(Player player, PrimarySkill skill, XPGainReason xpGainReason) { + public McMMOPlayerLevelDownEvent(Player player, PrimarySkillType skill, XPGainReason xpGainReason) { super(player, skill, xpGainReason); this.levelsLost = 1; } - public McMMOPlayerLevelDownEvent(Player player, PrimarySkill skill, int levelsLost, XPGainReason xpGainReason) { + public McMMOPlayerLevelDownEvent(Player player, PrimarySkillType skill, int levelsLost, XPGainReason xpGainReason) { super(player, skill, xpGainReason); this.levelsLost = levelsLost; } diff --git a/src/main/java/com/gmail/nossr50/events/experience/McMMOPlayerLevelUpEvent.java b/src/main/java/com/gmail/nossr50/events/experience/McMMOPlayerLevelUpEvent.java index c6495cc52..06d81cde3 100644 --- a/src/main/java/com/gmail/nossr50/events/experience/McMMOPlayerLevelUpEvent.java +++ b/src/main/java/com/gmail/nossr50/events/experience/McMMOPlayerLevelUpEvent.java @@ -1,6 +1,6 @@ package com.gmail.nossr50.events.experience; -import com.gmail.nossr50.datatypes.skills.PrimarySkill; +import com.gmail.nossr50.datatypes.skills.PrimarySkillType; import org.bukkit.entity.Player; import org.bukkit.event.HandlerList; @@ -13,23 +13,23 @@ public class McMMOPlayerLevelUpEvent extends McMMOPlayerLevelChangeEvent { private int levelsGained; @Deprecated - public McMMOPlayerLevelUpEvent(Player player, PrimarySkill skill) { + public McMMOPlayerLevelUpEvent(Player player, PrimarySkillType skill) { super(player, skill, XPGainReason.UNKNOWN); this.levelsGained = 1; } @Deprecated - public McMMOPlayerLevelUpEvent(Player player, PrimarySkill skill, int levelsGained) { + public McMMOPlayerLevelUpEvent(Player player, PrimarySkillType skill, int levelsGained) { super(player, skill, XPGainReason.UNKNOWN); this.levelsGained = levelsGained; } - public McMMOPlayerLevelUpEvent(Player player, PrimarySkill skill, XPGainReason xpGainReason) { + public McMMOPlayerLevelUpEvent(Player player, PrimarySkillType skill, XPGainReason xpGainReason) { super(player, skill, xpGainReason); this.levelsGained = 1; } - public McMMOPlayerLevelUpEvent(Player player, PrimarySkill skill, int levelsGained, XPGainReason xpGainReason) { + public McMMOPlayerLevelUpEvent(Player player, PrimarySkillType skill, int levelsGained, XPGainReason xpGainReason) { super(player, skill, xpGainReason); this.levelsGained = levelsGained; } diff --git a/src/main/java/com/gmail/nossr50/events/experience/McMMOPlayerXpGainEvent.java b/src/main/java/com/gmail/nossr50/events/experience/McMMOPlayerXpGainEvent.java index 74295ccb5..8654331fd 100644 --- a/src/main/java/com/gmail/nossr50/events/experience/McMMOPlayerXpGainEvent.java +++ b/src/main/java/com/gmail/nossr50/events/experience/McMMOPlayerXpGainEvent.java @@ -1,6 +1,6 @@ package com.gmail.nossr50.events.experience; -import com.gmail.nossr50.datatypes.skills.PrimarySkill; +import com.gmail.nossr50.datatypes.skills.PrimarySkillType; import org.bukkit.entity.Player; import org.bukkit.event.HandlerList; @@ -13,12 +13,12 @@ public class McMMOPlayerXpGainEvent extends McMMOPlayerExperienceEvent { private float xpGained; @Deprecated - public McMMOPlayerXpGainEvent(Player player, PrimarySkill skill, float xpGained) { + public McMMOPlayerXpGainEvent(Player player, PrimarySkillType skill, float xpGained) { super(player, skill, XPGainReason.UNKNOWN); this.xpGained = xpGained; } - public McMMOPlayerXpGainEvent(Player player, PrimarySkill skill, float xpGained, XPGainReason xpGainReason) { + public McMMOPlayerXpGainEvent(Player player, PrimarySkillType skill, float xpGained, XPGainReason xpGainReason) { super(player, skill, xpGainReason); this.xpGained = xpGained; } diff --git a/src/main/java/com/gmail/nossr50/events/skills/McMMOPlayerSkillEvent.java b/src/main/java/com/gmail/nossr50/events/skills/McMMOPlayerSkillEvent.java index 63ebeedc1..4ea859117 100644 --- a/src/main/java/com/gmail/nossr50/events/skills/McMMOPlayerSkillEvent.java +++ b/src/main/java/com/gmail/nossr50/events/skills/McMMOPlayerSkillEvent.java @@ -1,6 +1,6 @@ package com.gmail.nossr50.events.skills; -import com.gmail.nossr50.datatypes.skills.PrimarySkill; +import com.gmail.nossr50.datatypes.skills.PrimarySkillType; import org.bukkit.entity.Player; import org.bukkit.event.HandlerList; import org.bukkit.event.player.PlayerEvent; @@ -11,10 +11,10 @@ import com.gmail.nossr50.util.player.UserManager; * Generic event for mcMMO skill handling. */ public abstract class McMMOPlayerSkillEvent extends PlayerEvent { - protected PrimarySkill skill; + protected PrimarySkillType skill; protected int skillLevel; - protected McMMOPlayerSkillEvent(Player player, PrimarySkill skill) { + protected McMMOPlayerSkillEvent(Player player, PrimarySkillType skill) { super(player); this.skill = skill; this.skillLevel = UserManager.getPlayer(player).getSkillLevel(skill); @@ -23,7 +23,7 @@ public abstract class McMMOPlayerSkillEvent extends PlayerEvent { /** * @return The skill involved in this event */ - public PrimarySkill getSkill() { + public PrimarySkillType getSkill() { return skill; } diff --git a/src/main/java/com/gmail/nossr50/events/skills/abilities/McMMOPlayerAbilityActivateEvent.java b/src/main/java/com/gmail/nossr50/events/skills/abilities/McMMOPlayerAbilityActivateEvent.java index 7e3af4e76..7b0db958b 100644 --- a/src/main/java/com/gmail/nossr50/events/skills/abilities/McMMOPlayerAbilityActivateEvent.java +++ b/src/main/java/com/gmail/nossr50/events/skills/abilities/McMMOPlayerAbilityActivateEvent.java @@ -1,13 +1,13 @@ package com.gmail.nossr50.events.skills.abilities; -import com.gmail.nossr50.datatypes.skills.PrimarySkill; +import com.gmail.nossr50.datatypes.skills.PrimarySkillType; import org.bukkit.entity.Player; import org.bukkit.event.Cancellable; public class McMMOPlayerAbilityActivateEvent extends McMMOPlayerAbilityEvent implements Cancellable { private boolean cancelled; - public McMMOPlayerAbilityActivateEvent(Player player, PrimarySkill skill) { + public McMMOPlayerAbilityActivateEvent(Player player, PrimarySkillType skill) { super(player, skill); cancelled = false; } diff --git a/src/main/java/com/gmail/nossr50/events/skills/abilities/McMMOPlayerAbilityDeactivateEvent.java b/src/main/java/com/gmail/nossr50/events/skills/abilities/McMMOPlayerAbilityDeactivateEvent.java index eeb256e46..2b913883c 100644 --- a/src/main/java/com/gmail/nossr50/events/skills/abilities/McMMOPlayerAbilityDeactivateEvent.java +++ b/src/main/java/com/gmail/nossr50/events/skills/abilities/McMMOPlayerAbilityDeactivateEvent.java @@ -2,10 +2,10 @@ package com.gmail.nossr50.events.skills.abilities; import org.bukkit.entity.Player; -import com.gmail.nossr50.datatypes.skills.PrimarySkill; +import com.gmail.nossr50.datatypes.skills.PrimarySkillType; public class McMMOPlayerAbilityDeactivateEvent extends McMMOPlayerAbilityEvent { - public McMMOPlayerAbilityDeactivateEvent(Player player, PrimarySkill skill) { + public McMMOPlayerAbilityDeactivateEvent(Player player, PrimarySkillType skill) { super(player, skill); } } diff --git a/src/main/java/com/gmail/nossr50/events/skills/abilities/McMMOPlayerAbilityEvent.java b/src/main/java/com/gmail/nossr50/events/skills/abilities/McMMOPlayerAbilityEvent.java index b2dd7656c..22387e8ff 100644 --- a/src/main/java/com/gmail/nossr50/events/skills/abilities/McMMOPlayerAbilityEvent.java +++ b/src/main/java/com/gmail/nossr50/events/skills/abilities/McMMOPlayerAbilityEvent.java @@ -3,13 +3,13 @@ package com.gmail.nossr50.events.skills.abilities; import com.gmail.nossr50.datatypes.skills.SuperAbilityType; import org.bukkit.entity.Player; -import com.gmail.nossr50.datatypes.skills.PrimarySkill; +import com.gmail.nossr50.datatypes.skills.PrimarySkillType; import com.gmail.nossr50.events.skills.McMMOPlayerSkillEvent; public class McMMOPlayerAbilityEvent extends McMMOPlayerSkillEvent { private SuperAbilityType ability; - protected McMMOPlayerAbilityEvent(Player player, PrimarySkill skill) { + protected McMMOPlayerAbilityEvent(Player player, PrimarySkillType skill) { super(player, skill); ability = skill.getAbility(); } diff --git a/src/main/java/com/gmail/nossr50/events/skills/alchemy/McMMOPlayerBrewEvent.java b/src/main/java/com/gmail/nossr50/events/skills/alchemy/McMMOPlayerBrewEvent.java index 8629454de..018b13eb7 100644 --- a/src/main/java/com/gmail/nossr50/events/skills/alchemy/McMMOPlayerBrewEvent.java +++ b/src/main/java/com/gmail/nossr50/events/skills/alchemy/McMMOPlayerBrewEvent.java @@ -1,6 +1,6 @@ package com.gmail.nossr50.events.skills.alchemy; -import com.gmail.nossr50.datatypes.skills.PrimarySkill; +import com.gmail.nossr50.datatypes.skills.PrimarySkillType; import org.bukkit.block.Block; import org.bukkit.block.BlockState; import org.bukkit.block.BrewingStand; @@ -15,7 +15,7 @@ public class McMMOPlayerBrewEvent extends McMMOPlayerSkillEvent implements Cance private boolean cancelled; public McMMOPlayerBrewEvent(Player player, BlockState brewingStand) { - super(player, PrimarySkill.ALCHEMY); + super(player, PrimarySkillType.ALCHEMY); this.brewingStand = brewingStand; cancelled = false; } diff --git a/src/main/java/com/gmail/nossr50/events/skills/alchemy/McMMOPlayerCatalysisEvent.java b/src/main/java/com/gmail/nossr50/events/skills/alchemy/McMMOPlayerCatalysisEvent.java index 6b00d299f..acfa013e1 100644 --- a/src/main/java/com/gmail/nossr50/events/skills/alchemy/McMMOPlayerCatalysisEvent.java +++ b/src/main/java/com/gmail/nossr50/events/skills/alchemy/McMMOPlayerCatalysisEvent.java @@ -1,9 +1,9 @@ package com.gmail.nossr50.events.skills.alchemy; +import com.gmail.nossr50.datatypes.skills.PrimarySkillType; import org.bukkit.entity.Player; import org.bukkit.event.Cancellable; -import com.gmail.nossr50.datatypes.skills.PrimarySkill; import com.gmail.nossr50.events.skills.McMMOPlayerSkillEvent; public class McMMOPlayerCatalysisEvent extends McMMOPlayerSkillEvent implements Cancellable { @@ -12,7 +12,7 @@ public class McMMOPlayerCatalysisEvent extends McMMOPlayerSkillEvent implements private boolean cancelled; public McMMOPlayerCatalysisEvent(Player player, double speed) { - super(player, PrimarySkill.ALCHEMY); + super(player, PrimarySkillType.ALCHEMY); this.speed = speed; cancelled = false; } diff --git a/src/main/java/com/gmail/nossr50/events/skills/fishing/McMMOPlayerFishingEvent.java b/src/main/java/com/gmail/nossr50/events/skills/fishing/McMMOPlayerFishingEvent.java index d91a74e58..b8f84b8a5 100644 --- a/src/main/java/com/gmail/nossr50/events/skills/fishing/McMMOPlayerFishingEvent.java +++ b/src/main/java/com/gmail/nossr50/events/skills/fishing/McMMOPlayerFishingEvent.java @@ -1,6 +1,6 @@ package com.gmail.nossr50.events.skills.fishing; -import com.gmail.nossr50.datatypes.skills.PrimarySkill; +import com.gmail.nossr50.datatypes.skills.PrimarySkillType; import org.bukkit.entity.Player; import org.bukkit.event.Cancellable; @@ -10,7 +10,7 @@ public class McMMOPlayerFishingEvent extends McMMOPlayerSkillEvent implements Ca private boolean cancelled; protected McMMOPlayerFishingEvent(Player player) { - super(player, PrimarySkill.FISHING); + super(player, PrimarySkillType.FISHING); cancelled = false; } diff --git a/src/main/java/com/gmail/nossr50/events/skills/repair/McMMOPlayerRepairCheckEvent.java b/src/main/java/com/gmail/nossr50/events/skills/repair/McMMOPlayerRepairCheckEvent.java index 82a2bf6be..6cdc6015c 100644 --- a/src/main/java/com/gmail/nossr50/events/skills/repair/McMMOPlayerRepairCheckEvent.java +++ b/src/main/java/com/gmail/nossr50/events/skills/repair/McMMOPlayerRepairCheckEvent.java @@ -1,6 +1,6 @@ package com.gmail.nossr50.events.skills.repair; -import com.gmail.nossr50.datatypes.skills.PrimarySkill; +import com.gmail.nossr50.datatypes.skills.PrimarySkillType; import org.bukkit.entity.Player; import org.bukkit.event.Cancellable; import org.bukkit.inventory.ItemStack; @@ -17,7 +17,7 @@ public class McMMOPlayerRepairCheckEvent extends McMMOPlayerSkillEvent implement private boolean cancelled; public McMMOPlayerRepairCheckEvent(Player player, short repairAmount, ItemStack repairMaterial, ItemStack repairedObject) { - super(player, PrimarySkill.REPAIR); + super(player, PrimarySkillType.REPAIR); this.repairAmount = repairAmount; this.repairMaterial = repairMaterial; this.repairedObject = repairedObject; diff --git a/src/main/java/com/gmail/nossr50/events/skills/salvage/McMMOPlayerSalvageCheckEvent.java b/src/main/java/com/gmail/nossr50/events/skills/salvage/McMMOPlayerSalvageCheckEvent.java index 960fd4f31..54a9fcf85 100644 --- a/src/main/java/com/gmail/nossr50/events/skills/salvage/McMMOPlayerSalvageCheckEvent.java +++ b/src/main/java/com/gmail/nossr50/events/skills/salvage/McMMOPlayerSalvageCheckEvent.java @@ -1,10 +1,10 @@ package com.gmail.nossr50.events.skills.salvage; +import com.gmail.nossr50.datatypes.skills.PrimarySkillType; import org.bukkit.entity.Player; import org.bukkit.event.Cancellable; import org.bukkit.inventory.ItemStack; -import com.gmail.nossr50.datatypes.skills.PrimarySkill; import com.gmail.nossr50.events.skills.McMMOPlayerSkillEvent; /** @@ -17,7 +17,7 @@ public class McMMOPlayerSalvageCheckEvent extends McMMOPlayerSkillEvent implemen private boolean cancelled; public McMMOPlayerSalvageCheckEvent(Player player, ItemStack salvageItem, ItemStack salvageResults, ItemStack enchantedBook) { - super(player, PrimarySkill.SALVAGE); + super(player, PrimarySkillType.SALVAGE); this.salvageItem = salvageItem; this.salvageResults = salvageResults; this.enchantedBook = enchantedBook; diff --git a/src/main/java/com/gmail/nossr50/events/skills/secondaryabilities/SubSkillEvent.java b/src/main/java/com/gmail/nossr50/events/skills/secondaryabilities/SubSkillEvent.java index c405f5c45..1e215f3e3 100644 --- a/src/main/java/com/gmail/nossr50/events/skills/secondaryabilities/SubSkillEvent.java +++ b/src/main/java/com/gmail/nossr50/events/skills/secondaryabilities/SubSkillEvent.java @@ -2,11 +2,10 @@ package com.gmail.nossr50.events.skills.secondaryabilities; import com.gmail.nossr50.datatypes.skills.SubSkillType; import com.gmail.nossr50.datatypes.skills.subskills.AbstractSubSkill; -import com.gmail.nossr50.datatypes.skills.subskills.interfaces.SubSkill; import org.bukkit.entity.Player; import org.bukkit.event.Cancellable; -import com.gmail.nossr50.datatypes.skills.PrimarySkill; +import com.gmail.nossr50.datatypes.skills.PrimarySkillType; import com.gmail.nossr50.events.skills.McMMOPlayerSkillEvent; public class SubSkillEvent extends McMMOPlayerSkillEvent implements Cancellable { @@ -20,7 +19,7 @@ public class SubSkillEvent extends McMMOPlayerSkillEvent implements Cancellable */ @Deprecated public SubSkillEvent(Player player, SubSkillType subSkillType) { - super(player, PrimarySkill.bySecondaryAbility(subSkillType)); + super(player, PrimarySkillType.bySecondaryAbility(subSkillType)); this.subSkillType = subSkillType; } diff --git a/src/main/java/com/gmail/nossr50/events/skills/unarmed/McMMOPlayerDisarmEvent.java b/src/main/java/com/gmail/nossr50/events/skills/unarmed/McMMOPlayerDisarmEvent.java index 9db531d79..a9ebfba9f 100644 --- a/src/main/java/com/gmail/nossr50/events/skills/unarmed/McMMOPlayerDisarmEvent.java +++ b/src/main/java/com/gmail/nossr50/events/skills/unarmed/McMMOPlayerDisarmEvent.java @@ -3,7 +3,7 @@ package com.gmail.nossr50.events.skills.unarmed; import org.bukkit.entity.Player; import org.bukkit.event.Cancellable; -import com.gmail.nossr50.datatypes.skills.PrimarySkill; +import com.gmail.nossr50.datatypes.skills.PrimarySkillType; import com.gmail.nossr50.events.skills.McMMOPlayerSkillEvent; public class McMMOPlayerDisarmEvent extends McMMOPlayerSkillEvent implements Cancellable { @@ -11,7 +11,7 @@ public class McMMOPlayerDisarmEvent extends McMMOPlayerSkillEvent implements Can private Player defender; public McMMOPlayerDisarmEvent(Player defender) { - super(defender, PrimarySkill.UNARMED); + super(defender, PrimarySkillType.UNARMED); this.defender = defender; } diff --git a/src/main/java/com/gmail/nossr50/listeners/BlockListener.java b/src/main/java/com/gmail/nossr50/listeners/BlockListener.java index d5f94dd50..73f131add 100644 --- a/src/main/java/com/gmail/nossr50/listeners/BlockListener.java +++ b/src/main/java/com/gmail/nossr50/listeners/BlockListener.java @@ -3,8 +3,8 @@ package com.gmail.nossr50.listeners; import com.gmail.nossr50.config.Config; import com.gmail.nossr50.config.HiddenConfig; import com.gmail.nossr50.datatypes.player.McMMOPlayer; +import com.gmail.nossr50.datatypes.skills.PrimarySkillType; import com.gmail.nossr50.datatypes.skills.SuperAbilityType; -import com.gmail.nossr50.datatypes.skills.PrimarySkill; import com.gmail.nossr50.datatypes.skills.ToolType; import com.gmail.nossr50.events.fake.FakeBlockBreakEvent; import com.gmail.nossr50.events.fake.FakeBlockDamageEvent; @@ -152,10 +152,10 @@ public class BlockListener implements Listener { McMMOPlayer mcMMOPlayer = UserManager.getPlayer(player); - if (blockState.getType() == Repair.anvilMaterial && PrimarySkill.REPAIR.getPermissions(player)) { + if (blockState.getType() == Repair.anvilMaterial && PrimarySkillType.REPAIR.getPermissions(player)) { mcMMOPlayer.getRepairManager().placedAnvilCheck(); } - else if (blockState.getType() == Salvage.anvilMaterial && PrimarySkill.SALVAGE.getPermissions(player)) { + else if (blockState.getType() == Salvage.anvilMaterial && PrimarySkillType.SALVAGE.getPermissions(player)) { mcMMOPlayer.getSalvageManager().placedAnvilCheck(); } } @@ -210,26 +210,26 @@ public class BlockListener implements Listener { /* Green Terra */ if (herbalismManager.canActivateAbility()) { - mcMMOPlayer.checkAbilityActivation(PrimarySkill.HERBALISM); + mcMMOPlayer.checkAbilityActivation(PrimarySkillType.HERBALISM); } /* * We don't check the block store here because herbalism has too many unusual edge cases. * Instead, we check it inside the drops handler. */ - if (PrimarySkill.HERBALISM.getPermissions(player)) { + if (PrimarySkillType.HERBALISM.getPermissions(player)) { herbalismManager.herbalismBlockCheck(blockState); } } /* MINING */ - else if (BlockUtils.affectedBySuperBreaker(blockState) && ItemUtils.isPickaxe(heldItem) && PrimarySkill.MINING.getPermissions(player) && !mcMMO.getPlaceStore().isTrue(blockState)) { + else if (BlockUtils.affectedBySuperBreaker(blockState) && ItemUtils.isPickaxe(heldItem) && PrimarySkillType.MINING.getPermissions(player) && !mcMMO.getPlaceStore().isTrue(blockState)) { MiningManager miningManager = mcMMOPlayer.getMiningManager(); miningManager.miningBlockCheck(blockState); } /* WOOD CUTTING */ - else if (BlockUtils.isLog(blockState) && ItemUtils.isAxe(heldItem) && PrimarySkill.WOODCUTTING.getPermissions(player) && !mcMMO.getPlaceStore().isTrue(blockState)) { + else if (BlockUtils.isLog(blockState) && ItemUtils.isAxe(heldItem) && PrimarySkillType.WOODCUTTING.getPermissions(player) && !mcMMO.getPlaceStore().isTrue(blockState)) { WoodcuttingManager woodcuttingManager = mcMMOPlayer.getWoodcuttingManager(); if (woodcuttingManager.canUseTreeFeller(heldItem)) { woodcuttingManager.processTreeFeller(blockState); @@ -240,7 +240,7 @@ public class BlockListener implements Listener { } /* EXCAVATION */ - else if (BlockUtils.affectedByGigaDrillBreaker(blockState) && ItemUtils.isShovel(heldItem) && PrimarySkill.EXCAVATION.getPermissions(player) && !mcMMO.getPlaceStore().isTrue(blockState)) { + else if (BlockUtils.affectedByGigaDrillBreaker(blockState) && ItemUtils.isShovel(heldItem) && PrimarySkillType.EXCAVATION.getPermissions(player) && !mcMMO.getPlaceStore().isTrue(blockState)) { ExcavationManager excavationManager = mcMMOPlayer.getExcavationManager(); excavationManager.excavationBlockCheck(blockState); @@ -345,19 +345,19 @@ public class BlockListener implements Listener { } if (mcMMOPlayer.getToolPreparationMode(ToolType.HOE) && ItemUtils.isHoe(heldItem) && (BlockUtils.affectedByGreenTerra(blockState) || BlockUtils.canMakeMossy(blockState)) && Permissions.greenTerra(player)) { - mcMMOPlayer.checkAbilityActivation(PrimarySkill.HERBALISM); + mcMMOPlayer.checkAbilityActivation(PrimarySkillType.HERBALISM); } else if (mcMMOPlayer.getToolPreparationMode(ToolType.AXE) && ItemUtils.isAxe(heldItem) && BlockUtils.isLog(blockState) && Permissions.treeFeller(player)) { - mcMMOPlayer.checkAbilityActivation(PrimarySkill.WOODCUTTING); + mcMMOPlayer.checkAbilityActivation(PrimarySkillType.WOODCUTTING); } else if (mcMMOPlayer.getToolPreparationMode(ToolType.PICKAXE) && ItemUtils.isPickaxe(heldItem) && BlockUtils.affectedBySuperBreaker(blockState) && Permissions.superBreaker(player)) { - mcMMOPlayer.checkAbilityActivation(PrimarySkill.MINING); + mcMMOPlayer.checkAbilityActivation(PrimarySkillType.MINING); } else if (mcMMOPlayer.getToolPreparationMode(ToolType.SHOVEL) && ItemUtils.isShovel(heldItem) && BlockUtils.affectedByGigaDrillBreaker(blockState) && Permissions.gigaDrillBreaker(player)) { - mcMMOPlayer.checkAbilityActivation(PrimarySkill.EXCAVATION); + mcMMOPlayer.checkAbilityActivation(PrimarySkillType.EXCAVATION); } else if (mcMMOPlayer.getToolPreparationMode(ToolType.FISTS) && heldItem.getType() == Material.AIR && (BlockUtils.affectedByGigaDrillBreaker(blockState) || blockState.getType() == Material.SNOW || BlockUtils.affectedByBlockCracker(blockState) && Permissions.berserk(player))) { - mcMMOPlayer.checkAbilityActivation(PrimarySkill.UNARMED); + mcMMOPlayer.checkAbilityActivation(PrimarySkillType.UNARMED); } } diff --git a/src/main/java/com/gmail/nossr50/listeners/InventoryListener.java b/src/main/java/com/gmail/nossr50/listeners/InventoryListener.java index 1e375ffa4..397164c73 100644 --- a/src/main/java/com/gmail/nossr50/listeners/InventoryListener.java +++ b/src/main/java/com/gmail/nossr50/listeners/InventoryListener.java @@ -2,7 +2,7 @@ package com.gmail.nossr50.listeners; import java.util.List; -import com.gmail.nossr50.datatypes.skills.PrimarySkill; +import com.gmail.nossr50.datatypes.skills.PrimarySkillType; import com.gmail.nossr50.datatypes.skills.SubSkillType; import com.gmail.nossr50.events.fake.FakeBrewEvent; import org.bukkit.Location; @@ -105,7 +105,7 @@ public class InventoryListener implements Listener { Player player = getPlayerFromFurnace(furnaceBlock); - if (!UserManager.hasPlayerDataKey(player) || !PrimarySkill.SMELTING.getPermissions(player)) { + if (!UserManager.hasPlayerDataKey(player) || !PrimarySkillType.SMELTING.getPermissions(player)) { return; } @@ -122,7 +122,7 @@ public class InventoryListener implements Listener { Player player = getPlayerFromFurnace(furnaceBlock); - if (!UserManager.hasPlayerDataKey(player) || !Permissions.vanillaXpBoost(player, PrimarySkill.SMELTING)) { + if (!UserManager.hasPlayerDataKey(player) || !Permissions.vanillaXpBoost(player, PrimarySkillType.SMELTING)) { return; } diff --git a/src/main/java/com/gmail/nossr50/listeners/PlayerListener.java b/src/main/java/com/gmail/nossr50/listeners/PlayerListener.java index b17d0b742..6008eac1b 100644 --- a/src/main/java/com/gmail/nossr50/listeners/PlayerListener.java +++ b/src/main/java/com/gmail/nossr50/listeners/PlayerListener.java @@ -8,8 +8,8 @@ import com.gmail.nossr50.config.experience.ExperienceConfig; import com.gmail.nossr50.datatypes.chat.ChatMode; import com.gmail.nossr50.datatypes.party.Party; import com.gmail.nossr50.datatypes.player.McMMOPlayer; +import com.gmail.nossr50.datatypes.skills.PrimarySkillType; import com.gmail.nossr50.datatypes.skills.SuperAbilityType; -import com.gmail.nossr50.datatypes.skills.PrimarySkill; import com.gmail.nossr50.locale.LocaleLoader; import com.gmail.nossr50.mcMMO; import com.gmail.nossr50.party.ShareHandler; @@ -187,7 +187,7 @@ public class PlayerListener implements Listener { public void onPlayerFishHighest(PlayerFishEvent event) { Player player = event.getPlayer(); - if (!UserManager.hasPlayerDataKey(player) || !PrimarySkill.FISHING.getPermissions(player)) { + if (!UserManager.hasPlayerDataKey(player) || !PrimarySkillType.FISHING.getPermissions(player)) { return; } @@ -211,7 +211,7 @@ public class PlayerListener implements Listener { fishingCatch.setItemStack(new ItemStack(Material.SALMON, 1)); } - if (Permissions.vanillaXpBoost(player, PrimarySkill.FISHING)) { + if (Permissions.vanillaXpBoost(player, PrimarySkillType.FISHING)) { event.setExpToDrop(fishingManager.handleVanillaXpBoost(event.getExpToDrop())); } return; @@ -242,7 +242,7 @@ public class PlayerListener implements Listener { public void onPlayerFishMonitor(PlayerFishEvent event) { Player player = event.getPlayer(); - if (!UserManager.hasPlayerDataKey(player) || !PrimarySkill.FISHING.getPermissions(player)) { + if (!UserManager.hasPlayerDataKey(player) || !PrimarySkillType.FISHING.getPermissions(player)) { return; } @@ -415,7 +415,7 @@ public class PlayerListener implements Listener { if (!Config.getInstance().getAbilitiesOnlyActivateWhenSneaking() || player.isSneaking()) { /* REPAIR CHECKS */ - if (type == Repair.anvilMaterial && PrimarySkill.REPAIR.getPermissions(player) && mcMMO.getRepairableManager().isRepairable(heldItem)) { + if (type == Repair.anvilMaterial && PrimarySkillType.REPAIR.getPermissions(player) && mcMMO.getRepairableManager().isRepairable(heldItem)) { RepairManager repairManager = mcMMOPlayer.getRepairManager(); event.setCancelled(true); @@ -426,7 +426,7 @@ public class PlayerListener implements Listener { } } /* SALVAGE CHECKS */ - else if (type == Salvage.anvilMaterial && PrimarySkill.SALVAGE.getPermissions(player) && mcMMO.getSalvageableManager().isSalvageable(heldItem)) { + else if (type == Salvage.anvilMaterial && PrimarySkillType.SALVAGE.getPermissions(player) && mcMMO.getSalvageableManager().isSalvageable(heldItem)) { SalvageManager salvageManager = UserManager.getPlayer(player).getSalvageManager(); event.setCancelled(true); @@ -455,7 +455,7 @@ public class PlayerListener implements Listener { if (!Config.getInstance().getAbilitiesOnlyActivateWhenSneaking() || player.isSneaking()) { /* REPAIR CHECKS */ - if (type == Repair.anvilMaterial && PrimarySkill.REPAIR.getPermissions(player) && mcMMO.getRepairableManager().isRepairable(heldItem)) { + if (type == Repair.anvilMaterial && PrimarySkillType.REPAIR.getPermissions(player) && mcMMO.getRepairableManager().isRepairable(heldItem)) { RepairManager repairManager = mcMMOPlayer.getRepairManager(); // Cancel repairing an enchanted item @@ -465,7 +465,7 @@ public class PlayerListener implements Listener { } } /* SALVAGE CHECKS */ - else if (type == Salvage.anvilMaterial && PrimarySkill.SALVAGE.getPermissions(player) && mcMMO.getSalvageableManager().isSalvageable(heldItem)) { + else if (type == Salvage.anvilMaterial && PrimarySkillType.SALVAGE.getPermissions(player) && mcMMO.getSalvageableManager().isSalvageable(heldItem)) { SalvageManager salvageManager = mcMMOPlayer.getSalvageManager(); // Cancel salvaging an enchanted item @@ -512,15 +512,15 @@ public class PlayerListener implements Listener { if (BlockUtils.canActivateAbilities(blockState)) { if (Config.getInstance().getAbilitiesEnabled()) { if (BlockUtils.canActivateHerbalism(blockState)) { - mcMMOPlayer.processAbilityActivation(PrimarySkill.HERBALISM); + mcMMOPlayer.processAbilityActivation(PrimarySkillType.HERBALISM); } - mcMMOPlayer.processAbilityActivation(PrimarySkill.AXES); - mcMMOPlayer.processAbilityActivation(PrimarySkill.EXCAVATION); - mcMMOPlayer.processAbilityActivation(PrimarySkill.MINING); - mcMMOPlayer.processAbilityActivation(PrimarySkill.SWORDS); - mcMMOPlayer.processAbilityActivation(PrimarySkill.UNARMED); - mcMMOPlayer.processAbilityActivation(PrimarySkill.WOODCUTTING); + mcMMOPlayer.processAbilityActivation(PrimarySkillType.AXES); + mcMMOPlayer.processAbilityActivation(PrimarySkillType.EXCAVATION); + mcMMOPlayer.processAbilityActivation(PrimarySkillType.MINING); + mcMMOPlayer.processAbilityActivation(PrimarySkillType.SWORDS); + mcMMOPlayer.processAbilityActivation(PrimarySkillType.UNARMED); + mcMMOPlayer.processAbilityActivation(PrimarySkillType.WOODCUTTING); } ChimaeraWing.activationCheck(player); @@ -565,13 +565,13 @@ public class PlayerListener implements Listener { /* ACTIVATION CHECKS */ if (Config.getInstance().getAbilitiesEnabled()) { - mcMMOPlayer.processAbilityActivation(PrimarySkill.AXES); - mcMMOPlayer.processAbilityActivation(PrimarySkill.EXCAVATION); - mcMMOPlayer.processAbilityActivation(PrimarySkill.HERBALISM); - mcMMOPlayer.processAbilityActivation(PrimarySkill.MINING); - mcMMOPlayer.processAbilityActivation(PrimarySkill.SWORDS); - mcMMOPlayer.processAbilityActivation(PrimarySkill.UNARMED); - mcMMOPlayer.processAbilityActivation(PrimarySkill.WOODCUTTING); + mcMMOPlayer.processAbilityActivation(PrimarySkillType.AXES); + mcMMOPlayer.processAbilityActivation(PrimarySkillType.EXCAVATION); + mcMMOPlayer.processAbilityActivation(PrimarySkillType.HERBALISM); + mcMMOPlayer.processAbilityActivation(PrimarySkillType.MINING); + mcMMOPlayer.processAbilityActivation(PrimarySkillType.SWORDS); + mcMMOPlayer.processAbilityActivation(PrimarySkillType.UNARMED); + mcMMOPlayer.processAbilityActivation(PrimarySkillType.WOODCUTTING); } /* ITEM CHECKS */ @@ -671,7 +671,7 @@ public class PlayerListener implements Listener { String lowerCaseCommand = command.toLowerCase(); // Do these ACTUALLY have to be lower case to work properly? - for (PrimarySkill skill : PrimarySkill.values()) { + for (PrimarySkillType skill : PrimarySkillType.values()) { String skillName = skill.toString().toLowerCase(); String localizedName = skill.getName().toLowerCase(); diff --git a/src/main/java/com/gmail/nossr50/listeners/SelfListener.java b/src/main/java/com/gmail/nossr50/listeners/SelfListener.java index 54fca0d0e..c2f5bdd49 100644 --- a/src/main/java/com/gmail/nossr50/listeners/SelfListener.java +++ b/src/main/java/com/gmail/nossr50/listeners/SelfListener.java @@ -1,6 +1,6 @@ package com.gmail.nossr50.listeners; -import com.gmail.nossr50.datatypes.skills.PrimarySkill; +import com.gmail.nossr50.datatypes.skills.PrimarySkillType; import com.gmail.nossr50.datatypes.skills.XPGainReason; import org.bukkit.entity.Player; import org.bukkit.event.EventHandler; @@ -20,7 +20,7 @@ public class SelfListener implements Listener { @EventHandler(priority = EventPriority.MONITOR, ignoreCancelled = true) public void onPlayerLevelUp(McMMOPlayerLevelUpEvent event) { Player player = event.getPlayer(); - PrimarySkill skill = event.getSkill(); + PrimarySkillType skill = event.getSkill(); ScoreboardManager.handleLevelUp(player, skill); @@ -47,8 +47,8 @@ public class SelfListener implements Listener { public void onPlayerXpGain(McMMOPlayerXpGainEvent event) { if (event.getXpGainReason() == XPGainReason.COMMAND) return; - PrimarySkill primarySkill = event.getSkill(); - int threshold = ExperienceConfig.getInstance().getDiminishedReturnsThreshold(primarySkill); + PrimarySkillType primarySkillType = event.getSkill(); + int threshold = ExperienceConfig.getInstance().getDiminishedReturnsThreshold(primarySkillType); if (threshold <= 0 || !ExperienceConfig.getInstance().getDiminishedReturnsEnabled()) { // Diminished returns is turned off return; @@ -63,15 +63,15 @@ public class SelfListener implements Listener { Player player = event.getPlayer(); McMMOPlayer mcMMOPlayer = UserManager.getPlayer(player); - if (primarySkill.isChildSkill()) { + if (primarySkillType.isChildSkill()) { return; } - float modifiedThreshold = (float) (threshold / primarySkill.getXpModifier() * ExperienceConfig.getInstance().getExperienceGainsGlobalMultiplier()); - float difference = (mcMMOPlayer.getProfile().getRegisteredXpGain(primarySkill) - modifiedThreshold) / modifiedThreshold; + float modifiedThreshold = (float) (threshold / primarySkillType.getXpModifier() * ExperienceConfig.getInstance().getExperienceGainsGlobalMultiplier()); + float difference = (mcMMOPlayer.getProfile().getRegisteredXpGain(primarySkillType) - modifiedThreshold) / modifiedThreshold; if (difference > 0) { -// System.out.println("Total XP Earned: " + mcMMOPlayer.getProfile().getRegisteredXpGain(primarySkill) + " / Threshold value: " + threshold); +// System.out.println("Total XP Earned: " + mcMMOPlayer.getProfile().getRegisteredXpGain(primarySkillType) + " / Threshold value: " + threshold); // System.out.println(difference * 100 + "% over the threshold!"); // System.out.println("Previous: " + event.getRawXpGained()); // System.out.println("Adjusted XP " + (event.getRawXpGained() - (event.getRawXpGained() * difference))); diff --git a/src/main/java/com/gmail/nossr50/mcMMO.java b/src/main/java/com/gmail/nossr50/mcMMO.java index 1588f0b33..96cd81ad2 100644 --- a/src/main/java/com/gmail/nossr50/mcMMO.java +++ b/src/main/java/com/gmail/nossr50/mcMMO.java @@ -12,7 +12,7 @@ import com.gmail.nossr50.config.skills.salvage.SalvageConfigManager; import com.gmail.nossr50.config.treasure.TreasureConfig; import com.gmail.nossr50.database.DatabaseManager; import com.gmail.nossr50.database.DatabaseManagerFactory; -import com.gmail.nossr50.datatypes.skills.PrimarySkill; +import com.gmail.nossr50.datatypes.skills.PrimarySkillType; import com.gmail.nossr50.datatypes.skills.subskills.acrobatics.Roll; import com.gmail.nossr50.listeners.*; import com.gmail.nossr50.party.PartyManager; @@ -379,6 +379,7 @@ public class mcMMO extends JavaPlugin { PotionConfig.getInstance(); CoreSkillsConfig.getInstance(); SoundConfig.getInstance(); + RankConfig.getInstance(); new ChildConfig(); @@ -435,7 +436,7 @@ public class mcMMO extends JavaPlugin { * Acrobatics skills */ - if(CoreSkillsConfig.getInstance().isPrimarySkillEnabled(PrimarySkill.ACROBATICS)) + if(CoreSkillsConfig.getInstance().isPrimarySkillEnabled(PrimarySkillType.ACROBATICS)) { System.out.println("[mcMMO]" + " enabling Acrobatics Skills"); diff --git a/src/main/java/com/gmail/nossr50/party/ShareHandler.java b/src/main/java/com/gmail/nossr50/party/ShareHandler.java index ca5f3ad6b..70a2eb4f3 100644 --- a/src/main/java/com/gmail/nossr50/party/ShareHandler.java +++ b/src/main/java/com/gmail/nossr50/party/ShareHandler.java @@ -2,7 +2,7 @@ package com.gmail.nossr50.party; import java.util.List; -import com.gmail.nossr50.datatypes.skills.PrimarySkill; +import com.gmail.nossr50.datatypes.skills.PrimarySkillType; import org.bukkit.entity.Item; import org.bukkit.entity.Player; import org.bukkit.inventory.ItemStack; @@ -25,10 +25,10 @@ public final class ShareHandler { * * @param xp Xp without party sharing * @param mcMMOPlayer Player initiating the Xp gain - * @param primarySkill Skill being used + * @param primarySkillType Skill being used * @return True is the xp has been shared */ - public static boolean handleXpShare(float xp, McMMOPlayer mcMMOPlayer, PrimarySkill primarySkill, XPGainReason xpGainReason) { + public static boolean handleXpShare(float xp, McMMOPlayer mcMMOPlayer, PrimarySkillType primarySkillType, XPGainReason xpGainReason) { Party party = mcMMOPlayer.getParty(); if (party.getXpShareMode() != ShareMode.EQUAL) { @@ -48,7 +48,7 @@ public final class ShareHandler { float splitXp = (float) (xp / partySize * shareBonus); for (Player member : nearMembers) { - UserManager.getPlayer(member).beginUnsharedXpGain(primarySkill, splitXp, xpGainReason); + UserManager.getPlayer(member).beginUnsharedXpGain(primarySkillType, splitXp, xpGainReason); } return true; diff --git a/src/main/java/com/gmail/nossr50/runnables/commands/McrankCommandAsyncTask.java b/src/main/java/com/gmail/nossr50/runnables/commands/McrankCommandAsyncTask.java index 0f300270f..dba16559e 100644 --- a/src/main/java/com/gmail/nossr50/runnables/commands/McrankCommandAsyncTask.java +++ b/src/main/java/com/gmail/nossr50/runnables/commands/McrankCommandAsyncTask.java @@ -2,12 +2,12 @@ package com.gmail.nossr50.runnables.commands; import java.util.Map; +import com.gmail.nossr50.datatypes.skills.PrimarySkillType; import org.bukkit.command.CommandSender; import org.bukkit.entity.Player; import org.bukkit.scheduler.BukkitRunnable; import com.gmail.nossr50.mcMMO; -import com.gmail.nossr50.datatypes.skills.PrimarySkill; import org.apache.commons.lang.Validate; @@ -32,7 +32,7 @@ public class McrankCommandAsyncTask extends BukkitRunnable { @Override public void run() { - Map skills = mcMMO.getDatabaseManager().readRank(playerName); + Map skills = mcMMO.getDatabaseManager().readRank(playerName); new McrankCommandDisplayTask(skills, sender, playerName, useBoard, useChat).runTaskLater(mcMMO.p, 1); } diff --git a/src/main/java/com/gmail/nossr50/runnables/commands/McrankCommandDisplayTask.java b/src/main/java/com/gmail/nossr50/runnables/commands/McrankCommandDisplayTask.java index e9378b1a0..2ebde4422 100644 --- a/src/main/java/com/gmail/nossr50/runnables/commands/McrankCommandDisplayTask.java +++ b/src/main/java/com/gmail/nossr50/runnables/commands/McrankCommandDisplayTask.java @@ -2,7 +2,7 @@ package com.gmail.nossr50.runnables.commands; import java.util.Map; -import com.gmail.nossr50.datatypes.skills.PrimarySkill; +import com.gmail.nossr50.datatypes.skills.PrimarySkillType; import org.bukkit.command.CommandSender; import org.bukkit.entity.Player; import org.bukkit.scheduler.BukkitRunnable; @@ -15,12 +15,12 @@ import com.gmail.nossr50.util.scoreboards.ScoreboardManager; * Display the results of McrankCommandAsyncTask to the sender. */ public class McrankCommandDisplayTask extends BukkitRunnable { - private final Map skills; + private final Map skills; private final CommandSender sender; private final String playerName; private final boolean useBoard, useChat; - McrankCommandDisplayTask(Map skills, CommandSender sender, String playerName, boolean useBoard, boolean useChat) { + McrankCommandDisplayTask(Map skills, CommandSender sender, String playerName, boolean useBoard, boolean useChat) { this.skills = skills; this.sender = sender; this.playerName = playerName; @@ -47,7 +47,7 @@ public class McrankCommandDisplayTask extends BukkitRunnable { sender.sendMessage(LocaleLoader.getString("Commands.mcrank.Heading")); sender.sendMessage(LocaleLoader.getString("Commands.mcrank.Player", playerName)); - for (PrimarySkill skill : PrimarySkill.NON_CHILD_SKILLS) { + for (PrimarySkillType skill : PrimarySkillType.NON_CHILD_SKILLS) { if (!skill.getPermissions(player)) { continue; } diff --git a/src/main/java/com/gmail/nossr50/runnables/commands/MctopCommandAsyncTask.java b/src/main/java/com/gmail/nossr50/runnables/commands/MctopCommandAsyncTask.java index 21aaac772..50cd862f9 100644 --- a/src/main/java/com/gmail/nossr50/runnables/commands/MctopCommandAsyncTask.java +++ b/src/main/java/com/gmail/nossr50/runnables/commands/MctopCommandAsyncTask.java @@ -8,17 +8,17 @@ import org.bukkit.scheduler.BukkitRunnable; import com.gmail.nossr50.mcMMO; import com.gmail.nossr50.datatypes.database.PlayerStat; -import com.gmail.nossr50.datatypes.skills.PrimarySkill; +import com.gmail.nossr50.datatypes.skills.PrimarySkillType; import org.apache.commons.lang.Validate; public class MctopCommandAsyncTask extends BukkitRunnable { private final CommandSender sender; - private final PrimarySkill skill; + private final PrimarySkillType skill; private final int page; private final boolean useBoard, useChat; - public MctopCommandAsyncTask(int page, PrimarySkill skill, CommandSender sender, boolean useBoard, boolean useChat) { + public MctopCommandAsyncTask(int page, PrimarySkillType skill, CommandSender sender, boolean useBoard, boolean useChat) { Validate.isTrue(useBoard || useChat, "Attempted to start a rank retrieval with both board and chat off"); Validate.notNull(sender, "Attempted to start a rank retrieval with no recipient"); diff --git a/src/main/java/com/gmail/nossr50/runnables/commands/MctopCommandDisplayTask.java b/src/main/java/com/gmail/nossr50/runnables/commands/MctopCommandDisplayTask.java index 90e7f3252..8f027c142 100644 --- a/src/main/java/com/gmail/nossr50/runnables/commands/MctopCommandDisplayTask.java +++ b/src/main/java/com/gmail/nossr50/runnables/commands/MctopCommandDisplayTask.java @@ -1,7 +1,7 @@ package com.gmail.nossr50.runnables.commands; import com.gmail.nossr50.datatypes.database.PlayerStat; -import com.gmail.nossr50.datatypes.skills.PrimarySkill; +import com.gmail.nossr50.datatypes.skills.PrimarySkillType; import com.gmail.nossr50.locale.LocaleLoader; import com.gmail.nossr50.mcMMO; import com.gmail.nossr50.util.scoreboards.ScoreboardManager; @@ -18,11 +18,11 @@ import java.util.List; public class MctopCommandDisplayTask extends BukkitRunnable { private final List userStats; private final CommandSender sender; - private final PrimarySkill skill; + private final PrimarySkillType skill; private final int page; private final boolean useBoard, useChat; - MctopCommandDisplayTask(List userStats, int page, PrimarySkill skill, CommandSender sender, boolean useBoard, boolean useChat) { + MctopCommandDisplayTask(List userStats, int page, PrimarySkillType skill, CommandSender sender, boolean useBoard, boolean useChat) { this.userStats = userStats; this.page = page; this.skill = skill; diff --git a/src/main/java/com/gmail/nossr50/runnables/database/FormulaConversionTask.java b/src/main/java/com/gmail/nossr50/runnables/database/FormulaConversionTask.java index 301494786..9c04ab1b9 100644 --- a/src/main/java/com/gmail/nossr50/runnables/database/FormulaConversionTask.java +++ b/src/main/java/com/gmail/nossr50/runnables/database/FormulaConversionTask.java @@ -1,6 +1,6 @@ package com.gmail.nossr50.runnables.database; -import com.gmail.nossr50.datatypes.skills.PrimarySkill; +import com.gmail.nossr50.datatypes.skills.PrimarySkillType; import org.bukkit.command.CommandSender; import org.bukkit.scheduler.BukkitRunnable; @@ -59,20 +59,20 @@ public class FormulaConversionTask extends BukkitRunnable { private void editValues(PlayerProfile profile) { mcMMO.p.debug("========================================================================"); mcMMO.p.debug("Conversion report for " + profile.getPlayerName() + ":"); - for (PrimarySkill primarySkill : PrimarySkill.NON_CHILD_SKILLS) { - int oldLevel = profile.getSkillLevel(primarySkill); - int oldXPLevel = profile.getSkillXpLevel(primarySkill); + for (PrimarySkillType primarySkillType : PrimarySkillType.NON_CHILD_SKILLS) { + int oldLevel = profile.getSkillLevel(primarySkillType); + int oldXPLevel = profile.getSkillXpLevel(primarySkillType); int totalOldXP = mcMMO.getFormulaManager().calculateTotalExperience(oldLevel, oldXPLevel); if (totalOldXP == 0) { continue; } - int[] newExperienceValues = mcMMO.getFormulaManager().calculateNewLevel(primarySkill, (int) Math.floor(totalOldXP / ExperienceConfig.getInstance().getExpModifier()), formulaType); + int[] newExperienceValues = mcMMO.getFormulaManager().calculateNewLevel(primarySkillType, (int) Math.floor(totalOldXP / ExperienceConfig.getInstance().getExpModifier()), formulaType); int newLevel = newExperienceValues[0]; int newXPlevel = newExperienceValues[1]; - mcMMO.p.debug(" Skill: " + primarySkill.toString()); + mcMMO.p.debug(" Skill: " + primarySkillType.toString()); mcMMO.p.debug(" OLD:"); mcMMO.p.debug(" Level: " + oldLevel); @@ -84,8 +84,8 @@ public class FormulaConversionTask extends BukkitRunnable { mcMMO.p.debug(" XP " + newXPlevel); mcMMO.p.debug("------------------------------------------------------------------------"); - profile.modifySkill(primarySkill, newLevel); - profile.setSkillXpLevel(primarySkill, newXPlevel); + profile.modifySkill(primarySkillType, newLevel); + profile.setSkillXpLevel(primarySkillType, newXPlevel); } } } diff --git a/src/main/java/com/gmail/nossr50/runnables/skills/AlchemyBrewTask.java b/src/main/java/com/gmail/nossr50/runnables/skills/AlchemyBrewTask.java index aaa99293d..53528ddaf 100644 --- a/src/main/java/com/gmail/nossr50/runnables/skills/AlchemyBrewTask.java +++ b/src/main/java/com/gmail/nossr50/runnables/skills/AlchemyBrewTask.java @@ -9,7 +9,7 @@ import org.bukkit.entity.Player; import org.bukkit.scheduler.BukkitRunnable; import com.gmail.nossr50.mcMMO; -import com.gmail.nossr50.datatypes.skills.PrimarySkill; +import com.gmail.nossr50.datatypes.skills.PrimarySkillType; import com.gmail.nossr50.events.skills.alchemy.McMMOPlayerBrewEvent; import com.gmail.nossr50.events.skills.alchemy.McMMOPlayerCatalysisEvent; import com.gmail.nossr50.skills.alchemy.Alchemy; @@ -39,7 +39,7 @@ public class AlchemyBrewTask extends BukkitRunnable { brewTimer = DEFAULT_BREW_TICKS; if (player != null && !Misc.isNPCEntity(player) && Permissions.isSubSkillEnabled(player, SubSkillType.ALCHEMY_CATALYSIS)) { - double catalysis = UserManager.getPlayer(player).getAlchemyManager().calculateBrewSpeed(Permissions.lucky(player, PrimarySkill.ALCHEMY)); + double catalysis = UserManager.getPlayer(player).getAlchemyManager().calculateBrewSpeed(Permissions.lucky(player, PrimarySkillType.ALCHEMY)); McMMOPlayerCatalysisEvent event = new McMMOPlayerCatalysisEvent(player, catalysis); mcMMO.p.getServer().getPluginManager().callEvent(event); diff --git a/src/main/java/com/gmail/nossr50/runnables/skills/AwardCombatXpTask.java b/src/main/java/com/gmail/nossr50/runnables/skills/AwardCombatXpTask.java index 01c832eff..090e551fc 100644 --- a/src/main/java/com/gmail/nossr50/runnables/skills/AwardCombatXpTask.java +++ b/src/main/java/com/gmail/nossr50/runnables/skills/AwardCombatXpTask.java @@ -1,6 +1,6 @@ package com.gmail.nossr50.runnables.skills; -import com.gmail.nossr50.datatypes.skills.PrimarySkill; +import com.gmail.nossr50.datatypes.skills.PrimarySkillType; import org.bukkit.entity.LivingEntity; import org.bukkit.scheduler.BukkitRunnable; @@ -10,14 +10,14 @@ import com.gmail.nossr50.datatypes.skills.XPGainReason; public class AwardCombatXpTask extends BukkitRunnable { private McMMOPlayer mcMMOPlayer; private double baseXp; - private PrimarySkill primarySkill; + private PrimarySkillType primarySkillType; private LivingEntity target; private XPGainReason xpGainReason; private double baseHealth; - public AwardCombatXpTask(McMMOPlayer mcMMOPlayer, PrimarySkill primarySkill, double baseXp, LivingEntity target, XPGainReason xpGainReason) { + public AwardCombatXpTask(McMMOPlayer mcMMOPlayer, PrimarySkillType primarySkillType, double baseXp, LivingEntity target, XPGainReason xpGainReason) { this.mcMMOPlayer = mcMMOPlayer; - this.primarySkill = primarySkill; + this.primarySkillType = primarySkillType; this.baseXp = baseXp; this.target = target; this.xpGainReason = xpGainReason; @@ -39,6 +39,6 @@ public class AwardCombatXpTask extends BukkitRunnable { damage += health; } - mcMMOPlayer.beginXpGain(primarySkill, (int) (damage * baseXp), xpGainReason); + mcMMOPlayer.beginXpGain(primarySkillType, (int) (damage * baseXp), xpGainReason); } } diff --git a/src/main/java/com/gmail/nossr50/skills/SkillManager.java b/src/main/java/com/gmail/nossr50/skills/SkillManager.java index 0d88baf5d..2b8d4fb4d 100644 --- a/src/main/java/com/gmail/nossr50/skills/SkillManager.java +++ b/src/main/java/com/gmail/nossr50/skills/SkillManager.java @@ -1,6 +1,6 @@ package com.gmail.nossr50.skills; -import com.gmail.nossr50.datatypes.skills.PrimarySkill; +import com.gmail.nossr50.datatypes.skills.PrimarySkillType; import org.bukkit.entity.Entity; import org.bukkit.entity.LivingEntity; import org.bukkit.entity.Player; @@ -12,9 +12,9 @@ import com.gmail.nossr50.util.skills.PerksUtils; public abstract class SkillManager { protected McMMOPlayer mcMMOPlayer; protected int activationChance; - protected PrimarySkill skill; + protected PrimarySkillType skill; - public SkillManager(McMMOPlayer mcMMOPlayer, PrimarySkill skill) { + public SkillManager(McMMOPlayer mcMMOPlayer, PrimarySkillType skill) { this.mcMMOPlayer = mcMMOPlayer; this.activationChance = PerksUtils.handleLuckyPerks(mcMMOPlayer.getPlayer(), skill); this.skill = skill; diff --git a/src/main/java/com/gmail/nossr50/skills/acrobatics/AcrobaticsManager.java b/src/main/java/com/gmail/nossr50/skills/acrobatics/AcrobaticsManager.java index 6378c3bac..49f96b40b 100644 --- a/src/main/java/com/gmail/nossr50/skills/acrobatics/AcrobaticsManager.java +++ b/src/main/java/com/gmail/nossr50/skills/acrobatics/AcrobaticsManager.java @@ -1,20 +1,13 @@ package com.gmail.nossr50.skills.acrobatics; -import com.gmail.nossr50.datatypes.interactions.NotificationType; +import com.gmail.nossr50.datatypes.skills.PrimarySkillType; import com.gmail.nossr50.datatypes.skills.SubSkillType; -import com.gmail.nossr50.listeners.InteractionManager; import com.gmail.nossr50.util.skills.SkillActivationType; -import org.bukkit.Location; -import org.bukkit.Material; -import org.bukkit.enchantments.Enchantment; import org.bukkit.entity.Entity; import org.bukkit.entity.LightningStrike; import org.bukkit.entity.Player; -import org.bukkit.inventory.ItemStack; -import com.gmail.nossr50.config.Config; import com.gmail.nossr50.datatypes.player.McMMOPlayer; -import com.gmail.nossr50.datatypes.skills.PrimarySkill; import com.gmail.nossr50.datatypes.skills.XPGainReason; import com.gmail.nossr50.locale.LocaleLoader; import com.gmail.nossr50.skills.SkillManager; @@ -26,7 +19,7 @@ import com.gmail.nossr50.util.skills.SkillUtils; public class AcrobaticsManager extends SkillManager { public AcrobaticsManager(McMMOPlayer mcMMOPlayer) { - super(mcMMOPlayer, PrimarySkill.ACROBATICS); + super(mcMMOPlayer, PrimarySkillType.ACROBATICS); } public boolean canDodge(Entity damager) { diff --git a/src/main/java/com/gmail/nossr50/skills/alchemy/AlchemyManager.java b/src/main/java/com/gmail/nossr50/skills/alchemy/AlchemyManager.java index a6b067f44..f31448ec6 100644 --- a/src/main/java/com/gmail/nossr50/skills/alchemy/AlchemyManager.java +++ b/src/main/java/com/gmail/nossr50/skills/alchemy/AlchemyManager.java @@ -2,12 +2,12 @@ package com.gmail.nossr50.skills.alchemy; import java.util.List; +import com.gmail.nossr50.datatypes.skills.PrimarySkillType; import org.bukkit.inventory.ItemStack; import com.gmail.nossr50.config.experience.ExperienceConfig; import com.gmail.nossr50.config.skills.alchemy.PotionConfig; import com.gmail.nossr50.datatypes.player.McMMOPlayer; -import com.gmail.nossr50.datatypes.skills.PrimarySkill; import com.gmail.nossr50.datatypes.skills.XPGainReason; import com.gmail.nossr50.datatypes.skills.alchemy.PotionStage; import com.gmail.nossr50.skills.SkillManager; @@ -17,7 +17,7 @@ public class AlchemyManager extends SkillManager { private final double LUCKY_MODIFIER = 4.0 / 3.0; public AlchemyManager(McMMOPlayer mcMMOPlayer) { - super(mcMMOPlayer, PrimarySkill.ALCHEMY); + super(mcMMOPlayer, PrimarySkillType.ALCHEMY); } public int getTier() { diff --git a/src/main/java/com/gmail/nossr50/skills/archery/ArcheryManager.java b/src/main/java/com/gmail/nossr50/skills/archery/ArcheryManager.java index 430467f45..ae9e7a82e 100644 --- a/src/main/java/com/gmail/nossr50/skills/archery/ArcheryManager.java +++ b/src/main/java/com/gmail/nossr50/skills/archery/ArcheryManager.java @@ -11,7 +11,7 @@ import org.bukkit.potion.PotionEffectType; import com.gmail.nossr50.mcMMO; import com.gmail.nossr50.datatypes.player.McMMOPlayer; -import com.gmail.nossr50.datatypes.skills.PrimarySkill; +import com.gmail.nossr50.datatypes.skills.PrimarySkillType; import com.gmail.nossr50.locale.LocaleLoader; import com.gmail.nossr50.skills.SkillManager; import com.gmail.nossr50.util.Misc; @@ -21,7 +21,7 @@ import com.gmail.nossr50.util.skills.SkillUtils; public class ArcheryManager extends SkillManager { public ArcheryManager(McMMOPlayer mcMMOPlayer) { - super(mcMMOPlayer, PrimarySkill.ARCHERY); + super(mcMMOPlayer, PrimarySkillType.ARCHERY); } public boolean canDaze(LivingEntity target) { diff --git a/src/main/java/com/gmail/nossr50/skills/axes/AxesManager.java b/src/main/java/com/gmail/nossr50/skills/axes/AxesManager.java index 3cd013625..9f646272a 100644 --- a/src/main/java/com/gmail/nossr50/skills/axes/AxesManager.java +++ b/src/main/java/com/gmail/nossr50/skills/axes/AxesManager.java @@ -2,6 +2,7 @@ package com.gmail.nossr50.skills.axes; import java.util.Map; +import com.gmail.nossr50.datatypes.skills.PrimarySkillType; import com.gmail.nossr50.datatypes.skills.SubSkillType; import com.gmail.nossr50.datatypes.skills.SuperAbilityType; import com.gmail.nossr50.util.skills.*; @@ -11,7 +12,6 @@ import org.bukkit.event.entity.EntityDamageEvent.DamageModifier; import org.bukkit.inventory.ItemStack; import com.gmail.nossr50.datatypes.player.McMMOPlayer; -import com.gmail.nossr50.datatypes.skills.PrimarySkill; import com.gmail.nossr50.datatypes.skills.ToolType; import com.gmail.nossr50.locale.LocaleLoader; import com.gmail.nossr50.skills.SkillManager; @@ -21,7 +21,7 @@ import com.gmail.nossr50.util.player.UserManager; public class AxesManager extends SkillManager { public AxesManager(McMMOPlayer mcMMOPlayer) { - super(mcMMOPlayer, PrimarySkill.AXES); + super(mcMMOPlayer, PrimarySkillType.AXES); } public boolean canUseAxeMastery() { diff --git a/src/main/java/com/gmail/nossr50/skills/child/ChildConfig.java b/src/main/java/com/gmail/nossr50/skills/child/ChildConfig.java index 5ef34e47d..d19573fbc 100644 --- a/src/main/java/com/gmail/nossr50/skills/child/ChildConfig.java +++ b/src/main/java/com/gmail/nossr50/skills/child/ChildConfig.java @@ -2,7 +2,7 @@ package com.gmail.nossr50.skills.child; import java.util.EnumSet; -import com.gmail.nossr50.datatypes.skills.PrimarySkill; +import com.gmail.nossr50.datatypes.skills.PrimarySkillType; import org.bukkit.configuration.file.YamlConfiguration; import com.gmail.nossr50.config.AutoUpdateConfigLoader; @@ -20,15 +20,15 @@ public class ChildConfig extends AutoUpdateConfigLoader { FamilyTree.clearRegistrations(); // when reloading, need to clear statics - for (PrimarySkill skill : PrimarySkill.CHILD_SKILLS) { + for (PrimarySkillType skill : PrimarySkillType.CHILD_SKILLS) { plugin.debug("Finding parents of " + skill.name()); - EnumSet parentSkills = EnumSet.noneOf(PrimarySkill.class); + EnumSet parentSkills = EnumSet.noneOf(PrimarySkillType.class); boolean useDefaults = false; // If we had an error we back out and use defaults for (String name : config.getStringList(StringUtils.getCapitalized(skill.name()))) { try { - PrimarySkill parentSkill = PrimarySkill.valueOf(name.toUpperCase()); + PrimarySkillType parentSkill = PrimarySkillType.valueOf(name.toUpperCase()); FamilyTree.enforceNotChildSkill(parentSkill); parentSkills.add(parentSkill); } @@ -46,12 +46,12 @@ public class ChildConfig extends AutoUpdateConfigLoader { * If they're dedicated enough to have modified it, they can have the errors it may produce. * Alternatively, this can be used to allow child skills to be parent skills, provided there are no circular dependencies this is an advanced sort of configuration. */ - parentSkills.add(PrimarySkill.valueOf(name.toUpperCase())); + parentSkills.add(PrimarySkillType.valueOf(name.toUpperCase())); } } // Register them - for (PrimarySkill parentSkill : parentSkills) { + for (PrimarySkillType parentSkill : parentSkills) { plugin.debug("Registering " + parentSkill.name() + " as parent of " + skill.name()); FamilyTree.registerParent(skill, parentSkill); } diff --git a/src/main/java/com/gmail/nossr50/skills/child/FamilyTree.java b/src/main/java/com/gmail/nossr50/skills/child/FamilyTree.java index fc1b6721f..5035b195e 100644 --- a/src/main/java/com/gmail/nossr50/skills/child/FamilyTree.java +++ b/src/main/java/com/gmail/nossr50/skills/child/FamilyTree.java @@ -5,32 +5,32 @@ import java.util.EnumSet; import java.util.HashMap; import java.util.Set; -import com.gmail.nossr50.datatypes.skills.PrimarySkill; +import com.gmail.nossr50.datatypes.skills.PrimarySkillType; public class FamilyTree { - private static HashMap> tree = new HashMap>(); + private static HashMap> tree = new HashMap>(); - public static Set getParents(PrimarySkill childSkill) { + public static Set getParents(PrimarySkillType childSkill) { enforceChildSkill(childSkill); // We do not check if we have the child skill in question, as not having it would mean we did something wrong, and an NPE is desired. return tree.get(childSkill); } - protected static void registerParent(PrimarySkill childSkill, PrimarySkill parentSkill) { + protected static void registerParent(PrimarySkillType childSkill, PrimarySkillType parentSkill) { enforceChildSkill(childSkill); enforceNotChildSkill(parentSkill); if (!tree.containsKey(childSkill)) { - tree.put(childSkill, EnumSet.noneOf(PrimarySkill.class)); + tree.put(childSkill, EnumSet.noneOf(PrimarySkillType.class)); } tree.get(childSkill).add(parentSkill); } protected static void closeRegistration() { - for (PrimarySkill childSkill : tree.keySet()) { - Set immutableSet = Collections.unmodifiableSet(tree.get(childSkill)); + for (PrimarySkillType childSkill : tree.keySet()) { + Set immutableSet = Collections.unmodifiableSet(tree.get(childSkill)); tree.put(childSkill, immutableSet); } } @@ -39,13 +39,13 @@ public class FamilyTree { tree.clear(); } - protected static void enforceChildSkill(PrimarySkill skill) { + protected static void enforceChildSkill(PrimarySkillType skill) { if (!skill.isChildSkill()) { throw new IllegalArgumentException(skill.name() + " is not a child skill!"); } } - protected static void enforceNotChildSkill(PrimarySkill skill) { + protected static void enforceNotChildSkill(PrimarySkillType skill) { if (skill.isChildSkill()) { throw new IllegalArgumentException(skill.name() + " is a child skill!"); } diff --git a/src/main/java/com/gmail/nossr50/skills/excavation/Excavation.java b/src/main/java/com/gmail/nossr50/skills/excavation/Excavation.java index 37800d120..86580a944 100644 --- a/src/main/java/com/gmail/nossr50/skills/excavation/Excavation.java +++ b/src/main/java/com/gmail/nossr50/skills/excavation/Excavation.java @@ -2,7 +2,7 @@ package com.gmail.nossr50.skills.excavation; import com.gmail.nossr50.config.experience.ExperienceConfig; import com.gmail.nossr50.config.treasure.TreasureConfig; -import com.gmail.nossr50.datatypes.skills.PrimarySkill; +import com.gmail.nossr50.datatypes.skills.PrimarySkillType; import com.gmail.nossr50.datatypes.treasure.ExcavationTreasure; import com.gmail.nossr50.mcMMO; import com.gmail.nossr50.util.StringUtils; @@ -26,7 +26,7 @@ public class Excavation { } protected static int getBlockXP(BlockState blockState) { - int xp = ExperienceConfig.getInstance().getXp(PrimarySkill.EXCAVATION, blockState.getType()); + int xp = ExperienceConfig.getInstance().getXp(PrimarySkillType.EXCAVATION, blockState.getType()); if (xp == 0 && mcMMO.getModManager().isCustomExcavationBlock(blockState)) { xp = mcMMO.getModManager().getBlock(blockState).getXpGain(); diff --git a/src/main/java/com/gmail/nossr50/skills/excavation/ExcavationManager.java b/src/main/java/com/gmail/nossr50/skills/excavation/ExcavationManager.java index e53eb243e..8842f4bd3 100644 --- a/src/main/java/com/gmail/nossr50/skills/excavation/ExcavationManager.java +++ b/src/main/java/com/gmail/nossr50/skills/excavation/ExcavationManager.java @@ -2,7 +2,7 @@ package com.gmail.nossr50.skills.excavation; import java.util.List; -import com.gmail.nossr50.datatypes.skills.PrimarySkill; +import com.gmail.nossr50.datatypes.skills.PrimarySkillType; import org.bukkit.Location; import org.bukkit.block.BlockState; @@ -18,7 +18,7 @@ import com.gmail.nossr50.util.skills.SkillUtils; public class ExcavationManager extends SkillManager { public ExcavationManager(McMMOPlayer mcMMOPlayer) { - super(mcMMOPlayer, PrimarySkill.EXCAVATION); + super(mcMMOPlayer, PrimarySkillType.EXCAVATION); } /** diff --git a/src/main/java/com/gmail/nossr50/skills/fishing/FishingManager.java b/src/main/java/com/gmail/nossr50/skills/fishing/FishingManager.java index e84e37ff2..8f3b91b4b 100644 --- a/src/main/java/com/gmail/nossr50/skills/fishing/FishingManager.java +++ b/src/main/java/com/gmail/nossr50/skills/fishing/FishingManager.java @@ -5,7 +5,7 @@ import com.gmail.nossr50.config.Config; import com.gmail.nossr50.config.experience.ExperienceConfig; import com.gmail.nossr50.config.treasure.TreasureConfig; import com.gmail.nossr50.datatypes.player.McMMOPlayer; -import com.gmail.nossr50.datatypes.skills.PrimarySkill; +import com.gmail.nossr50.datatypes.skills.PrimarySkillType; import com.gmail.nossr50.datatypes.skills.SubSkillType; import com.gmail.nossr50.datatypes.skills.XPGainReason; import com.gmail.nossr50.datatypes.treasure.EnchantmentTreasure; @@ -50,7 +50,7 @@ public class FishingManager extends SkillManager { private Location hookLocation; public FishingManager(McMMOPlayer mcMMOPlayer) { - super(mcMMOPlayer, PrimarySkill.FISHING); + super(mcMMOPlayer, PrimarySkillType.FISHING); } public boolean canShake(Entity target) { @@ -281,7 +281,7 @@ public class FishingManager extends SkillManager { */ public void handleFishing(Item fishingCatch) { this.fishingCatch = fishingCatch; - int fishXp = ExperienceConfig.getInstance().getXp(PrimarySkill.FISHING, fishingCatch.getItemStack().getType()); + int fishXp = ExperienceConfig.getInstance().getXp(PrimarySkillType.FISHING, fishingCatch.getItemStack().getType()); int treasureXp = 0; Player player = getPlayer(); FishingTreasure treasure = null; diff --git a/src/main/java/com/gmail/nossr50/skills/herbalism/HerbalismManager.java b/src/main/java/com/gmail/nossr50/skills/herbalism/HerbalismManager.java index 6a5fe4529..a3e2b4e44 100644 --- a/src/main/java/com/gmail/nossr50/skills/herbalism/HerbalismManager.java +++ b/src/main/java/com/gmail/nossr50/skills/herbalism/HerbalismManager.java @@ -28,7 +28,7 @@ import java.util.List; public class HerbalismManager extends SkillManager { public HerbalismManager(McMMOPlayer mcMMOPlayer) { - super(mcMMOPlayer, PrimarySkill.HERBALISM); + super(mcMMOPlayer, PrimarySkillType.HERBALISM); } public boolean canBlockCheck() { diff --git a/src/main/java/com/gmail/nossr50/skills/mining/Mining.java b/src/main/java/com/gmail/nossr50/skills/mining/Mining.java index a180a45c6..91e5d156e 100644 --- a/src/main/java/com/gmail/nossr50/skills/mining/Mining.java +++ b/src/main/java/com/gmail/nossr50/skills/mining/Mining.java @@ -1,7 +1,7 @@ package com.gmail.nossr50.skills.mining; import com.gmail.nossr50.config.experience.ExperienceConfig; -import com.gmail.nossr50.datatypes.skills.PrimarySkill; +import com.gmail.nossr50.datatypes.skills.PrimarySkillType; import com.gmail.nossr50.mcMMO; import com.gmail.nossr50.util.Misc; import org.bukkit.Material; @@ -16,7 +16,7 @@ public class Mining { * @param blockState The {@link BlockState} to check ability activation for */ public static int getBlockXp(BlockState blockState) { - int xp = ExperienceConfig.getInstance().getXp(PrimarySkill.MINING, blockState.getType()); + int xp = ExperienceConfig.getInstance().getXp(PrimarySkillType.MINING, blockState.getType()); if (xp == 0 && mcMMO.getModManager().isCustomMiningBlock(blockState)) { xp = mcMMO.getModManager().getBlock(blockState).getXpGain(); diff --git a/src/main/java/com/gmail/nossr50/skills/mining/MiningManager.java b/src/main/java/com/gmail/nossr50/skills/mining/MiningManager.java index 14394e474..881a6938a 100644 --- a/src/main/java/com/gmail/nossr50/skills/mining/MiningManager.java +++ b/src/main/java/com/gmail/nossr50/skills/mining/MiningManager.java @@ -3,8 +3,8 @@ package com.gmail.nossr50.skills.mining; import com.gmail.nossr50.config.Config; import com.gmail.nossr50.datatypes.interactions.NotificationType; import com.gmail.nossr50.datatypes.player.McMMOPlayer; +import com.gmail.nossr50.datatypes.skills.PrimarySkillType; import com.gmail.nossr50.datatypes.skills.SuperAbilityType; -import com.gmail.nossr50.datatypes.skills.PrimarySkill; import com.gmail.nossr50.datatypes.skills.SubSkillType; import com.gmail.nossr50.datatypes.skills.XPGainReason; import com.gmail.nossr50.mcMMO; @@ -31,7 +31,7 @@ import java.util.List; public class MiningManager extends SkillManager { public MiningManager(McMMOPlayer mcMMOPlayer) { - super(mcMMOPlayer, PrimarySkill.MINING); + super(mcMMOPlayer, PrimarySkillType.MINING); } public boolean canUseDemolitionsExpertise() { diff --git a/src/main/java/com/gmail/nossr50/skills/repair/RepairManager.java b/src/main/java/com/gmail/nossr50/skills/repair/RepairManager.java index 69d972cbe..b990d3709 100644 --- a/src/main/java/com/gmail/nossr50/skills/repair/RepairManager.java +++ b/src/main/java/com/gmail/nossr50/skills/repair/RepairManager.java @@ -3,8 +3,8 @@ package com.gmail.nossr50.skills.repair; import com.gmail.nossr50.config.Config; import com.gmail.nossr50.config.experience.ExperienceConfig; import com.gmail.nossr50.datatypes.player.McMMOPlayer; +import com.gmail.nossr50.datatypes.skills.PrimarySkillType; import com.gmail.nossr50.datatypes.skills.SubSkillType; -import com.gmail.nossr50.datatypes.skills.PrimarySkill; import com.gmail.nossr50.datatypes.skills.XPGainReason; import com.gmail.nossr50.locale.LocaleLoader; import com.gmail.nossr50.mcMMO; @@ -20,7 +20,6 @@ import com.gmail.nossr50.util.skills.SkillUtils; import com.gmail.nossr50.util.sounds.SoundManager; import com.gmail.nossr50.util.sounds.SoundType; import org.bukkit.Material; -import org.bukkit.Sound; import org.bukkit.enchantments.Enchantment; import org.bukkit.entity.Player; import org.bukkit.inventory.ItemStack; @@ -34,7 +33,7 @@ public class RepairManager extends SkillManager { private int lastClick; public RepairManager(McMMOPlayer mcMMOPlayer) { - super(mcMMOPlayer, PrimarySkill.REPAIR); + super(mcMMOPlayer, PrimarySkillType.REPAIR); } /** diff --git a/src/main/java/com/gmail/nossr50/skills/salvage/SalvageManager.java b/src/main/java/com/gmail/nossr50/skills/salvage/SalvageManager.java index b67bf2682..6cdaadf3f 100644 --- a/src/main/java/com/gmail/nossr50/skills/salvage/SalvageManager.java +++ b/src/main/java/com/gmail/nossr50/skills/salvage/SalvageManager.java @@ -2,7 +2,7 @@ package com.gmail.nossr50.skills.salvage; import com.gmail.nossr50.config.Config; import com.gmail.nossr50.datatypes.player.McMMOPlayer; -import com.gmail.nossr50.datatypes.skills.PrimarySkill; +import com.gmail.nossr50.datatypes.skills.PrimarySkillType; import com.gmail.nossr50.locale.LocaleLoader; import com.gmail.nossr50.mcMMO; import com.gmail.nossr50.skills.SkillManager; @@ -17,7 +17,6 @@ import com.gmail.nossr50.util.sounds.SoundManager; import com.gmail.nossr50.util.sounds.SoundType; import org.bukkit.Location; import org.bukkit.Material; -import org.bukkit.Sound; import org.bukkit.enchantments.Enchantment; import org.bukkit.entity.Player; import org.bukkit.inventory.ItemStack; @@ -31,7 +30,7 @@ public class SalvageManager extends SkillManager { private int lastClick; public SalvageManager(McMMOPlayer mcMMOPlayer) { - super(mcMMOPlayer, PrimarySkill.SALVAGE); + super(mcMMOPlayer, PrimarySkillType.SALVAGE); } /** diff --git a/src/main/java/com/gmail/nossr50/skills/smelting/Smelting.java b/src/main/java/com/gmail/nossr50/skills/smelting/Smelting.java index c2913319b..5df3b92e7 100644 --- a/src/main/java/com/gmail/nossr50/skills/smelting/Smelting.java +++ b/src/main/java/com/gmail/nossr50/skills/smelting/Smelting.java @@ -2,7 +2,7 @@ package com.gmail.nossr50.skills.smelting; import com.gmail.nossr50.config.AdvancedConfig; import com.gmail.nossr50.config.experience.ExperienceConfig; -import com.gmail.nossr50.datatypes.skills.PrimarySkill; +import com.gmail.nossr50.datatypes.skills.PrimarySkillType; import com.gmail.nossr50.mcMMO; import org.bukkit.inventory.ItemStack; @@ -44,6 +44,6 @@ public class Smelting { public static double fluxMiningChance = AdvancedConfig.getInstance().getFluxMiningChance(); protected static int getResourceXp(ItemStack smelting) { - return mcMMO.getModManager().isCustomOre(smelting.getType()) ? mcMMO.getModManager().getBlock(smelting.getType()).getSmeltingXpGain() : ExperienceConfig.getInstance().getXp(PrimarySkill.SMELTING, smelting.getType()); + return mcMMO.getModManager().isCustomOre(smelting.getType()) ? mcMMO.getModManager().getBlock(smelting.getType()).getSmeltingXpGain() : ExperienceConfig.getInstance().getXp(PrimarySkillType.SMELTING, smelting.getType()); } } diff --git a/src/main/java/com/gmail/nossr50/skills/smelting/SmeltingManager.java b/src/main/java/com/gmail/nossr50/skills/smelting/SmeltingManager.java index dab59c712..73401e3c2 100644 --- a/src/main/java/com/gmail/nossr50/skills/smelting/SmeltingManager.java +++ b/src/main/java/com/gmail/nossr50/skills/smelting/SmeltingManager.java @@ -3,7 +3,7 @@ package com.gmail.nossr50.skills.smelting; import com.gmail.nossr50.config.Config; import com.gmail.nossr50.datatypes.player.McMMOPlayer; import com.gmail.nossr50.datatypes.skills.SubSkillType; -import com.gmail.nossr50.datatypes.skills.PrimarySkill; +import com.gmail.nossr50.datatypes.skills.PrimarySkillType; import com.gmail.nossr50.datatypes.skills.XPGainReason; import com.gmail.nossr50.events.skills.secondaryabilities.SubSkillWeightedActivationCheckEvent; import com.gmail.nossr50.locale.LocaleLoader; @@ -34,7 +34,7 @@ import java.util.List; public class SmeltingManager extends SkillManager { public SmeltingManager(McMMOPlayer mcMMOPlayer) { - super(mcMMOPlayer, PrimarySkill.SMELTING); + super(mcMMOPlayer, PrimarySkillType.SMELTING); } public boolean canUseFluxMining(BlockState blockState) { diff --git a/src/main/java/com/gmail/nossr50/skills/swords/SwordsManager.java b/src/main/java/com/gmail/nossr50/skills/swords/SwordsManager.java index f96bcbc69..01681bd0e 100644 --- a/src/main/java/com/gmail/nossr50/skills/swords/SwordsManager.java +++ b/src/main/java/com/gmail/nossr50/skills/swords/SwordsManager.java @@ -2,7 +2,7 @@ package com.gmail.nossr50.skills.swords; import java.util.Map; -import com.gmail.nossr50.datatypes.skills.PrimarySkill; +import com.gmail.nossr50.datatypes.skills.PrimarySkillType; import com.gmail.nossr50.datatypes.skills.SubSkillType; import com.gmail.nossr50.datatypes.skills.SuperAbilityType; import com.gmail.nossr50.util.skills.SkillActivationType; @@ -24,7 +24,7 @@ import com.gmail.nossr50.util.skills.SkillUtils; public class SwordsManager extends SkillManager { public SwordsManager(McMMOPlayer mcMMOPlayer) { - super(mcMMOPlayer, PrimarySkill.SWORDS); + super(mcMMOPlayer, PrimarySkillType.SWORDS); } public boolean canActivateAbility() { diff --git a/src/main/java/com/gmail/nossr50/skills/taming/TamingManager.java b/src/main/java/com/gmail/nossr50/skills/taming/TamingManager.java index ca5c678d6..230bf4424 100644 --- a/src/main/java/com/gmail/nossr50/skills/taming/TamingManager.java +++ b/src/main/java/com/gmail/nossr50/skills/taming/TamingManager.java @@ -5,7 +5,7 @@ import com.gmail.nossr50.config.Config; import com.gmail.nossr50.config.experience.ExperienceConfig; import com.gmail.nossr50.datatypes.interactions.NotificationType; import com.gmail.nossr50.datatypes.player.McMMOPlayer; -import com.gmail.nossr50.datatypes.skills.PrimarySkill; +import com.gmail.nossr50.datatypes.skills.PrimarySkillType; import com.gmail.nossr50.datatypes.skills.SubSkillType; import com.gmail.nossr50.datatypes.skills.XPGainReason; import com.gmail.nossr50.events.fake.FakeEntityTameEvent; @@ -33,7 +33,7 @@ import java.util.List; public class TamingManager extends SkillManager { public TamingManager(McMMOPlayer mcMMOPlayer) { - super(mcMMOPlayer, PrimarySkill.TAMING); + super(mcMMOPlayer, PrimarySkillType.TAMING); } private static HashMap> summonedEntities = new HashMap>(); diff --git a/src/main/java/com/gmail/nossr50/skills/unarmed/UnarmedManager.java b/src/main/java/com/gmail/nossr50/skills/unarmed/UnarmedManager.java index 94854d92e..fc1a83460 100644 --- a/src/main/java/com/gmail/nossr50/skills/unarmed/UnarmedManager.java +++ b/src/main/java/com/gmail/nossr50/skills/unarmed/UnarmedManager.java @@ -4,7 +4,7 @@ import com.gmail.nossr50.config.AdvancedConfig; import com.gmail.nossr50.datatypes.player.McMMOPlayer; import com.gmail.nossr50.datatypes.skills.SubSkillType; import com.gmail.nossr50.datatypes.skills.SuperAbilityType; -import com.gmail.nossr50.datatypes.skills.PrimarySkill; +import com.gmail.nossr50.datatypes.skills.PrimarySkillType; import com.gmail.nossr50.datatypes.skills.ToolType; import com.gmail.nossr50.locale.LocaleLoader; import com.gmail.nossr50.mcMMO; @@ -26,7 +26,7 @@ import org.bukkit.block.data.BlockData; public class UnarmedManager extends SkillManager { public UnarmedManager(McMMOPlayer mcMMOPlayer) { - super(mcMMOPlayer, PrimarySkill.UNARMED); + super(mcMMOPlayer, PrimarySkillType.UNARMED); } public boolean canActivateAbility() { diff --git a/src/main/java/com/gmail/nossr50/skills/woodcutting/Woodcutting.java b/src/main/java/com/gmail/nossr50/skills/woodcutting/Woodcutting.java index fce1b2725..5a57ee764 100644 --- a/src/main/java/com/gmail/nossr50/skills/woodcutting/Woodcutting.java +++ b/src/main/java/com/gmail/nossr50/skills/woodcutting/Woodcutting.java @@ -3,7 +3,7 @@ package com.gmail.nossr50.skills.woodcutting; import com.gmail.nossr50.config.AdvancedConfig; import com.gmail.nossr50.config.Config; import com.gmail.nossr50.config.experience.ExperienceConfig; -import com.gmail.nossr50.datatypes.skills.PrimarySkill; +import com.gmail.nossr50.datatypes.skills.PrimarySkillType; import com.gmail.nossr50.mcMMO; import com.gmail.nossr50.util.BlockUtils; import com.gmail.nossr50.util.Misc; @@ -43,7 +43,7 @@ public final class Woodcutting { return mcMMO.getModManager().getBlock(blockState).getXpGain(); } - return ExperienceConfig.getInstance().getXp(PrimarySkill.WOODCUTTING, blockState.getType()); + return ExperienceConfig.getInstance().getXp(PrimarySkillType.WOODCUTTING, blockState.getType()); } /** diff --git a/src/main/java/com/gmail/nossr50/skills/woodcutting/WoodcuttingManager.java b/src/main/java/com/gmail/nossr50/skills/woodcutting/WoodcuttingManager.java index 4b3ed81d3..4c5ac30bc 100644 --- a/src/main/java/com/gmail/nossr50/skills/woodcutting/WoodcuttingManager.java +++ b/src/main/java/com/gmail/nossr50/skills/woodcutting/WoodcuttingManager.java @@ -4,7 +4,7 @@ import com.gmail.nossr50.datatypes.mods.CustomBlock; import com.gmail.nossr50.datatypes.player.McMMOPlayer; import com.gmail.nossr50.datatypes.skills.SubSkillType; import com.gmail.nossr50.datatypes.skills.SuperAbilityType; -import com.gmail.nossr50.datatypes.skills.PrimarySkill; +import com.gmail.nossr50.datatypes.skills.PrimarySkillType; import com.gmail.nossr50.datatypes.skills.XPGainReason; import com.gmail.nossr50.locale.LocaleLoader; import com.gmail.nossr50.mcMMO; @@ -26,7 +26,7 @@ import java.util.Set; public class WoodcuttingManager extends SkillManager { public WoodcuttingManager(McMMOPlayer mcMMOPlayer) { - super(mcMMOPlayer, PrimarySkill.WOODCUTTING); + super(mcMMOPlayer, PrimarySkillType.WOODCUTTING); } public boolean canUseLeafBlower(ItemStack heldItem) { diff --git a/src/main/java/com/gmail/nossr50/util/BlockUtils.java b/src/main/java/com/gmail/nossr50/util/BlockUtils.java index 35bf24251..3f56b69c3 100644 --- a/src/main/java/com/gmail/nossr50/util/BlockUtils.java +++ b/src/main/java/com/gmail/nossr50/util/BlockUtils.java @@ -1,7 +1,7 @@ package com.gmail.nossr50.util; import com.gmail.nossr50.config.experience.ExperienceConfig; -import com.gmail.nossr50.datatypes.skills.PrimarySkill; +import com.gmail.nossr50.datatypes.skills.PrimarySkillType; import com.gmail.nossr50.mcMMO; import com.gmail.nossr50.skills.repair.Repair; import com.gmail.nossr50.skills.salvage.Salvage; @@ -172,7 +172,7 @@ public final class BlockUtils { * @return true if the block should affected by Green Terra, false otherwise */ public static boolean affectedByGreenTerra(BlockState blockState) { - if (ExperienceConfig.getInstance().isSkillBlock(PrimarySkill.HERBALISM, blockState.getBlockData())) { + if (ExperienceConfig.getInstance().isSkillBlock(PrimarySkillType.HERBALISM, blockState.getBlockData())) { return true; } @@ -188,7 +188,7 @@ public final class BlockUtils { * otherwise */ public static Boolean affectedBySuperBreaker(BlockState blockState) { - if (ExperienceConfig.getInstance().isSkillBlock(PrimarySkill.MINING, blockState.getBlockData())) + if (ExperienceConfig.getInstance().isSkillBlock(PrimarySkillType.MINING, blockState.getBlockData())) return true; return isOre(blockState) || mcMMO.getModManager().isCustomMiningBlock(blockState); @@ -203,7 +203,7 @@ public final class BlockUtils { * otherwise */ public static boolean affectedByGigaDrillBreaker(BlockState blockState) { - if (ExperienceConfig.getInstance().isSkillBlock(PrimarySkill.EXCAVATION, blockState.getBlockData())) + if (ExperienceConfig.getInstance().isSkillBlock(PrimarySkillType.EXCAVATION, blockState.getBlockData())) return true; return mcMMO.getModManager().isCustomExcavationBlock(blockState); } @@ -216,7 +216,7 @@ public final class BlockUtils { * @return true if the block is a log, false otherwise */ public static boolean isLog(BlockState blockState) { - if (ExperienceConfig.getInstance().isSkillBlock(PrimarySkill.WOODCUTTING, blockState.getBlockData())) + if (ExperienceConfig.getInstance().isSkillBlock(PrimarySkillType.WOODCUTTING, blockState.getBlockData())) return true; return mcMMO.getModManager().isCustomLog(blockState); } diff --git a/src/main/java/com/gmail/nossr50/util/EventUtils.java b/src/main/java/com/gmail/nossr50/util/EventUtils.java index 17e345b38..6fc8fb57a 100644 --- a/src/main/java/com/gmail/nossr50/util/EventUtils.java +++ b/src/main/java/com/gmail/nossr50/util/EventUtils.java @@ -3,9 +3,9 @@ package com.gmail.nossr50.util; import com.gmail.nossr50.datatypes.party.Party; import com.gmail.nossr50.datatypes.player.McMMOPlayer; import com.gmail.nossr50.datatypes.player.PlayerProfile; +import com.gmail.nossr50.datatypes.skills.PrimarySkillType; import com.gmail.nossr50.datatypes.skills.SubSkillType; import com.gmail.nossr50.datatypes.skills.SuperAbilityType; -import com.gmail.nossr50.datatypes.skills.PrimarySkill; import com.gmail.nossr50.datatypes.skills.XPGainReason; import com.gmail.nossr50.datatypes.skills.subskills.AbstractSubSkill; import com.gmail.nossr50.events.experience.McMMOPlayerLevelChangeEvent; @@ -140,7 +140,7 @@ public class EventUtils { * Others */ - public static McMMOPlayerAbilityActivateEvent callPlayerAbilityActivateEvent(Player player, PrimarySkill skill) { + public static McMMOPlayerAbilityActivateEvent callPlayerAbilityActivateEvent(Player player, PrimarySkillType skill) { McMMOPlayerAbilityActivateEvent event = new McMMOPlayerAbilityActivateEvent(player, skill); mcMMO.p.getServer().getPluginManager().callEvent(event); @@ -181,7 +181,7 @@ public class EventUtils { return event; } - public static boolean handleLevelChangeEvent(Player player, PrimarySkill skill, int levelsChanged, float xpRemoved, boolean isLevelUp, XPGainReason xpGainReason) { + public static boolean handleLevelChangeEvent(Player player, PrimarySkillType skill, int levelsChanged, float xpRemoved, boolean isLevelUp, XPGainReason xpGainReason) { McMMOPlayerLevelChangeEvent event = isLevelUp ? new McMMOPlayerLevelUpEvent(player, skill, levelsChanged, xpGainReason) : new McMMOPlayerLevelDownEvent(player, skill, levelsChanged, xpGainReason); mcMMO.p.getServer().getPluginManager().callEvent(event); @@ -268,7 +268,7 @@ public class EventUtils { return !isCancelled; } - public static boolean handleXpGainEvent(Player player, PrimarySkill skill, float xpGained, XPGainReason xpGainReason) { + public static boolean handleXpGainEvent(Player player, PrimarySkillType skill, float xpGained, XPGainReason xpGainReason) { McMMOPlayerXpGainEvent event = new McMMOPlayerXpGainEvent(player, skill, xpGained, xpGainReason); mcMMO.p.getServer().getPluginManager().callEvent(event); @@ -293,19 +293,19 @@ public class EventUtils { experienceChanged = event.getExperienceChanged(); PlayerProfile playerProfile = UserManager.getPlayer(player).getProfile(); - for (PrimarySkill primarySkill : PrimarySkill.NON_CHILD_SKILLS) { - String skillName = primarySkill.toString(); - int playerSkillLevel = playerProfile.getSkillLevel(primarySkill); + for (PrimarySkillType primarySkillType : PrimarySkillType.NON_CHILD_SKILLS) { + String skillName = primarySkillType.toString(); + int playerSkillLevel = playerProfile.getSkillLevel(primarySkillType); - playerProfile.modifySkill(primarySkill, playerSkillLevel - levelChanged.get(skillName)); - playerProfile.removeXp(primarySkill, experienceChanged.get(skillName)); + playerProfile.modifySkill(primarySkillType, playerSkillLevel - levelChanged.get(skillName)); + playerProfile.removeXp(primarySkillType, experienceChanged.get(skillName)); - if (playerProfile.getSkillXpLevel(primarySkill) < 0) { - playerProfile.setSkillXpLevel(primarySkill, 0); + if (playerProfile.getSkillXpLevel(primarySkillType) < 0) { + playerProfile.setSkillXpLevel(primarySkillType, 0); } - if (playerProfile.getSkillLevel(primarySkill) < 0) { - playerProfile.modifySkill(primarySkill, 0); + if (playerProfile.getSkillLevel(primarySkillType) < 0) { + playerProfile.modifySkill(primarySkillType, 0); } } } @@ -331,22 +331,22 @@ public class EventUtils { McMMOPlayer killerPlayer = UserManager.getPlayer(killer); PlayerProfile victimProfile = UserManager.getPlayer(victim).getProfile(); - for (PrimarySkill primarySkill : PrimarySkill.NON_CHILD_SKILLS) { - String skillName = primarySkill.toString(); - int victimSkillLevel = victimProfile.getSkillLevel(primarySkill); + for (PrimarySkillType primarySkillType : PrimarySkillType.NON_CHILD_SKILLS) { + String skillName = primarySkillType.toString(); + int victimSkillLevel = victimProfile.getSkillLevel(primarySkillType); - killerPlayer.addLevels(primarySkill, levelChangedKiller.get(skillName)); - killerPlayer.beginUnsharedXpGain(primarySkill, experienceChangedKiller.get(skillName), XPGainReason.VAMPIRISM); + killerPlayer.addLevels(primarySkillType, levelChangedKiller.get(skillName)); + killerPlayer.beginUnsharedXpGain(primarySkillType, experienceChangedKiller.get(skillName), XPGainReason.VAMPIRISM); - victimProfile.modifySkill(primarySkill, victimSkillLevel - levelChangedVictim.get(skillName)); - victimProfile.removeXp(primarySkill, experienceChangedVictim.get(skillName)); + victimProfile.modifySkill(primarySkillType, victimSkillLevel - levelChangedVictim.get(skillName)); + victimProfile.removeXp(primarySkillType, experienceChangedVictim.get(skillName)); - if (victimProfile.getSkillXpLevel(primarySkill) < 0) { - victimProfile.setSkillXpLevel(primarySkill, 0); + if (victimProfile.getSkillXpLevel(primarySkillType) < 0) { + victimProfile.setSkillXpLevel(primarySkillType, 0); } - if (victimProfile.getSkillLevel(primarySkill) < 0) { - victimProfile.modifySkill(primarySkill, 0); + if (victimProfile.getSkillLevel(primarySkillType) < 0) { + victimProfile.modifySkill(primarySkillType, 0); } } } @@ -355,7 +355,7 @@ public class EventUtils { } public static McMMOPlayerAbilityDeactivateEvent callAbilityDeactivateEvent(Player player, SuperAbilityType ability) { - McMMOPlayerAbilityDeactivateEvent event = new McMMOPlayerAbilityDeactivateEvent(player, PrimarySkill.byAbility(ability)); + McMMOPlayerAbilityDeactivateEvent event = new McMMOPlayerAbilityDeactivateEvent(player, PrimarySkillType.byAbility(ability)); mcMMO.p.getServer().getPluginManager().callEvent(event); return event; diff --git a/src/main/java/com/gmail/nossr50/util/HardcoreManager.java b/src/main/java/com/gmail/nossr50/util/HardcoreManager.java index e949d6aa6..5992913e4 100644 --- a/src/main/java/com/gmail/nossr50/util/HardcoreManager.java +++ b/src/main/java/com/gmail/nossr50/util/HardcoreManager.java @@ -2,7 +2,7 @@ package com.gmail.nossr50.util; import java.util.HashMap; -import com.gmail.nossr50.datatypes.skills.PrimarySkill; +import com.gmail.nossr50.datatypes.skills.PrimarySkillType; import org.bukkit.entity.Player; import com.gmail.nossr50.config.Config; @@ -23,27 +23,27 @@ public final class HardcoreManager { HashMap levelChanged = new HashMap(); HashMap experienceChanged = new HashMap(); - for (PrimarySkill primarySkill : PrimarySkill.NON_CHILD_SKILLS) { - if (!primarySkill.getHardcoreStatLossEnabled()) { - levelChanged.put(primarySkill.toString(), 0); - experienceChanged.put(primarySkill.toString(), 0F); + for (PrimarySkillType primarySkillType : PrimarySkillType.NON_CHILD_SKILLS) { + if (!primarySkillType.getHardcoreStatLossEnabled()) { + levelChanged.put(primarySkillType.toString(), 0); + experienceChanged.put(primarySkillType.toString(), 0F); continue; } - int playerSkillLevel = playerProfile.getSkillLevel(primarySkill); - int playerSkillXpLevel = playerProfile.getSkillXpLevel(primarySkill); + int playerSkillLevel = playerProfile.getSkillLevel(primarySkillType); + int playerSkillXpLevel = playerProfile.getSkillXpLevel(primarySkillType); if (playerSkillLevel <= 0 || playerSkillLevel <= levelThreshold) { - levelChanged.put(primarySkill.toString(), 0); - experienceChanged.put(primarySkill.toString(), 0F); + levelChanged.put(primarySkillType.toString(), 0); + experienceChanged.put(primarySkillType.toString(), 0F); continue; } double statsLost = playerSkillLevel * (statLossPercentage * 0.01D); int levelsLost = (int) statsLost; int xpLost = (int) Math.floor(playerSkillXpLevel * (statsLost - levelsLost)); - levelChanged.put(primarySkill.toString(), levelsLost); - experienceChanged.put(primarySkill.toString(), (float) xpLost); + levelChanged.put(primarySkillType.toString(), levelsLost); + experienceChanged.put(primarySkillType.toString(), (float) xpLost); totalLevelsLost += levelsLost; } @@ -66,29 +66,29 @@ public final class HardcoreManager { HashMap levelChanged = new HashMap(); HashMap experienceChanged = new HashMap(); - for (PrimarySkill primarySkill : PrimarySkill.NON_CHILD_SKILLS) { - if (!primarySkill.getHardcoreVampirismEnabled()) { - levelChanged.put(primarySkill.toString(), 0); - experienceChanged.put(primarySkill.toString(), 0F); + for (PrimarySkillType primarySkillType : PrimarySkillType.NON_CHILD_SKILLS) { + if (!primarySkillType.getHardcoreVampirismEnabled()) { + levelChanged.put(primarySkillType.toString(), 0); + experienceChanged.put(primarySkillType.toString(), 0F); continue; } - int killerSkillLevel = killerProfile.getSkillLevel(primarySkill); - int victimSkillLevel = victimProfile.getSkillLevel(primarySkill); + int killerSkillLevel = killerProfile.getSkillLevel(primarySkillType); + int victimSkillLevel = victimProfile.getSkillLevel(primarySkillType); if (victimSkillLevel <= 0 || victimSkillLevel < killerSkillLevel / 2 || victimSkillLevel <= levelThreshold) { - levelChanged.put(primarySkill.toString(), 0); - experienceChanged.put(primarySkill.toString(), 0F); + levelChanged.put(primarySkillType.toString(), 0); + experienceChanged.put(primarySkillType.toString(), 0F); continue; } - int victimSkillXpLevel = victimProfile.getSkillXpLevel(primarySkill); + int victimSkillXpLevel = victimProfile.getSkillXpLevel(primarySkillType); double statsStolen = victimSkillLevel * (vampirismStatLeechPercentage * 0.01D); int levelsStolen = (int) statsStolen; int xpStolen = (int) Math.floor(victimSkillXpLevel * (statsStolen - levelsStolen)); - levelChanged.put(primarySkill.toString(), levelsStolen); - experienceChanged.put(primarySkill.toString(), (float) xpStolen); + levelChanged.put(primarySkillType.toString(), levelsStolen); + experienceChanged.put(primarySkillType.toString(), (float) xpStolen); totalLevelsStolen += levelsStolen; } @@ -115,8 +115,8 @@ public final class HardcoreManager { public static boolean isStatLossEnabled() { boolean enabled = false; - for (PrimarySkill primarySkill : PrimarySkill.NON_CHILD_SKILLS) { - if (primarySkill.getHardcoreStatLossEnabled()) { + for (PrimarySkillType primarySkillType : PrimarySkillType.NON_CHILD_SKILLS) { + if (primarySkillType.getHardcoreStatLossEnabled()) { enabled = true; break; } @@ -133,8 +133,8 @@ public final class HardcoreManager { public static boolean isVampirismEnabled() { boolean enabled = false; - for (PrimarySkill primarySkill : PrimarySkill.NON_CHILD_SKILLS) { - if (primarySkill.getHardcoreVampirismEnabled()) { + for (PrimarySkillType primarySkillType : PrimarySkillType.NON_CHILD_SKILLS) { + if (primarySkillType.getHardcoreVampirismEnabled()) { enabled = true; break; } diff --git a/src/main/java/com/gmail/nossr50/util/HolidayManager.java b/src/main/java/com/gmail/nossr50/util/HolidayManager.java index 987f2cb98..d3a459058 100644 --- a/src/main/java/com/gmail/nossr50/util/HolidayManager.java +++ b/src/main/java/com/gmail/nossr50/util/HolidayManager.java @@ -1,7 +1,7 @@ package com.gmail.nossr50.util; import com.gmail.nossr50.commands.skills.AprilCommand; -import com.gmail.nossr50.datatypes.skills.PrimarySkill; +import com.gmail.nossr50.datatypes.skills.PrimarySkillType; import com.gmail.nossr50.mcMMO; import com.gmail.nossr50.util.player.UserManager; import com.gmail.nossr50.util.skills.ParticleEffectUtils; @@ -358,7 +358,7 @@ public final class HolidayManager { } public void levelUpApril(Player player, FakeSkillType fakeSkillType) { - int levelTotal = Misc.getRandom().nextInt(1 + UserManager.getPlayer(player).getSkillLevel(PrimarySkill.MINING)) + 1; + int levelTotal = Misc.getRandom().nextInt(1 + UserManager.getPlayer(player).getSkillLevel(PrimarySkillType.MINING)) + 1; SoundManager.sendSound(player, player.getLocation(), SoundType.LEVEL_UP); player.sendMessage(ChatColor.YELLOW + StringUtils.getCapitalized(fakeSkillType.toString()) + " skill increased by 1. Total (" + levelTotal + ")"); ParticleEffectUtils.fireworkParticleShower(player, ALL_COLORS.get(Misc.getRandom().nextInt(ALL_COLORS.size()))); diff --git a/src/main/java/com/gmail/nossr50/util/Motd.java b/src/main/java/com/gmail/nossr50/util/Motd.java index b8a3608a3..f0f547d72 100644 --- a/src/main/java/com/gmail/nossr50/util/Motd.java +++ b/src/main/java/com/gmail/nossr50/util/Motd.java @@ -2,8 +2,7 @@ package com.gmail.nossr50.util; import java.text.DecimalFormat; -import com.gmail.nossr50.datatypes.skills.PrimarySkill; -import org.bukkit.ChatColor; +import com.gmail.nossr50.datatypes.skills.PrimarySkillType; import org.bukkit.entity.Player; import org.bukkit.plugin.PluginDescriptionFile; @@ -86,7 +85,7 @@ public final class Motd { * @param player Target player */ public static void displayXpPerks(Player player) { - for (PrimarySkill skill : PrimarySkill.values()) { + for (PrimarySkillType skill : PrimarySkillType.values()) { if (PerksUtils.handleXpPerks(player, 1, skill) > 1) { player.sendMessage(PERK_PREFIX + LocaleLoader.getString("Effects.Template", LocaleLoader.getString("Perks.XP.Name"), LocaleLoader.getString("Perks.XP.Desc"))); return; @@ -127,7 +126,7 @@ public final class Motd { * @param player Target player */ public static void displayLuckyPerks(Player player) { - for (PrimarySkill skill : PrimarySkill.values()) { + for (PrimarySkillType skill : PrimarySkillType.values()) { if (Permissions.lucky(player, skill)) { player.sendMessage(PERK_PREFIX + LocaleLoader.getString("Effects.Template", LocaleLoader.getString("Perks.Lucky.Name"), LocaleLoader.getString("Perks.Lucky.Desc.Login"))); return; diff --git a/src/main/java/com/gmail/nossr50/util/Permissions.java b/src/main/java/com/gmail/nossr50/util/Permissions.java index 804bff0ee..e6d8c08f1 100644 --- a/src/main/java/com/gmail/nossr50/util/Permissions.java +++ b/src/main/java/com/gmail/nossr50/util/Permissions.java @@ -1,6 +1,6 @@ package com.gmail.nossr50.util; -import com.gmail.nossr50.datatypes.skills.PrimarySkill; +import com.gmail.nossr50.datatypes.skills.PrimarySkillType; import com.gmail.nossr50.datatypes.skills.subskills.AbstractSubSkill; import org.bukkit.Material; import org.bukkit.Server; @@ -81,17 +81,17 @@ public final class Permissions { public static boolean mcrefresh(Permissible permissible) { return (permissible.hasPermission("mcmmo.commands.mcrefresh")); } public static boolean mcrefreshOthers(Permissible permissible) { return (permissible.hasPermission("mcmmo.commands.mcrefresh.others")); } - public static boolean mctop(Permissible permissible, PrimarySkill skill) { return permissible.hasPermission("mcmmo.commands.mctop." + skill.toString().toLowerCase()); } + public static boolean mctop(Permissible permissible, PrimarySkillType skill) { return permissible.hasPermission("mcmmo.commands.mctop." + skill.toString().toLowerCase()); } public static boolean mmoedit(Permissible permissible) { return permissible.hasPermission("mcmmo.commands.mmoedit"); } public static boolean mmoeditOthers(Permissible permissible) { return permissible.hasPermission("mcmmo.commands.mmoedit.others"); } public static boolean skillreset(Permissible permissible) { return permissible.hasPermission("mcmmo.commands.skillreset"); } - public static boolean skillreset(Permissible permissible, PrimarySkill skill) { return permissible.hasPermission("mcmmo.commands.skillreset." + skill.toString().toLowerCase()); } + public static boolean skillreset(Permissible permissible, PrimarySkillType skill) { return permissible.hasPermission("mcmmo.commands.skillreset." + skill.toString().toLowerCase()); } public static boolean skillresetOthers(Permissible permissible) { return permissible.hasPermission("mcmmo.commands.skillreset.others"); } - public static boolean skillresetOthers(Permissible permissible, PrimarySkill skill) { return permissible.hasPermission("mcmmo.commands.skillreset.others." + skill.toString().toLowerCase()); } + public static boolean skillresetOthers(Permissible permissible, PrimarySkillType skill) { return permissible.hasPermission("mcmmo.commands.skillreset.others." + skill.toString().toLowerCase()); } - public static boolean xplock(Permissible permissible, PrimarySkill skill) { return permissible.hasPermission("mcmmo.commands.xplock." + skill.toString().toLowerCase()); } + public static boolean xplock(Permissible permissible, PrimarySkillType skill) { return permissible.hasPermission("mcmmo.commands.xplock." + skill.toString().toLowerCase()); } public static boolean xprateSet(Permissible permissible) { return permissible.hasPermission("mcmmo.commands.xprate.set"); } public static boolean xprateReset(Permissible permissible) { return permissible.hasPermission("mcmmo.commands.xprate.reset"); } @@ -107,16 +107,16 @@ public final class Permissions { * PERKS */ - public static boolean lucky(Permissible permissible, PrimarySkill skill) { return permissible.hasPermission("mcmmo.perks.lucky." + skill.toString().toLowerCase()); } + public static boolean lucky(Permissible permissible, PrimarySkillType skill) { return permissible.hasPermission("mcmmo.perks.lucky." + skill.toString().toLowerCase()); } /* XP PERKS */ - public static boolean quadrupleXp(Permissible permissible, PrimarySkill skill) { return permissible.hasPermission("mcmmo.perks.xp.quadruple." + skill.toString().toLowerCase()); } - public static boolean tripleXp(Permissible permissible, PrimarySkill skill) { return permissible.hasPermission("mcmmo.perks.xp.triple." + skill.toString().toLowerCase()); } - public static boolean doubleAndOneHalfXp(Permissible permissible, PrimarySkill skill) { return permissible.hasPermission("mcmmo.perks.xp.150percentboost." + skill.toString().toLowerCase()); } - public static boolean doubleXp(Permissible permissible, PrimarySkill skill) { return permissible.hasPermission("mcmmo.perks.xp.double." + skill.toString().toLowerCase()); } - public static boolean oneAndOneHalfXp(Permissible permissible, PrimarySkill skill) { return permissible.hasPermission("mcmmo.perks.xp.50percentboost." + skill.toString().toLowerCase()); } - public static boolean oneAndOneTenthXp(Permissible permissible, PrimarySkill skill) { return permissible.hasPermission("mcmmo.perks.xp.10percentboost." + skill.toString().toLowerCase()); } - public static boolean customXpBoost(Permissible permissible, PrimarySkill skill) { return permissible.hasPermission("mcmmo.perks.xp.customboost." + skill.toString().toLowerCase()); } + public static boolean quadrupleXp(Permissible permissible, PrimarySkillType skill) { return permissible.hasPermission("mcmmo.perks.xp.quadruple." + skill.toString().toLowerCase()); } + public static boolean tripleXp(Permissible permissible, PrimarySkillType skill) { return permissible.hasPermission("mcmmo.perks.xp.triple." + skill.toString().toLowerCase()); } + public static boolean doubleAndOneHalfXp(Permissible permissible, PrimarySkillType skill) { return permissible.hasPermission("mcmmo.perks.xp.150percentboost." + skill.toString().toLowerCase()); } + public static boolean doubleXp(Permissible permissible, PrimarySkillType skill) { return permissible.hasPermission("mcmmo.perks.xp.double." + skill.toString().toLowerCase()); } + public static boolean oneAndOneHalfXp(Permissible permissible, PrimarySkillType skill) { return permissible.hasPermission("mcmmo.perks.xp.50percentboost." + skill.toString().toLowerCase()); } + public static boolean oneAndOneTenthXp(Permissible permissible, PrimarySkillType skill) { return permissible.hasPermission("mcmmo.perks.xp.10percentboost." + skill.toString().toLowerCase()); } + public static boolean customXpBoost(Permissible permissible, PrimarySkillType skill) { return permissible.hasPermission("mcmmo.perks.xp.customboost." + skill.toString().toLowerCase()); } /* ACTIVATION PERKS */ public static boolean twelveSecondActivationBoost(Permissible permissible) { return permissible.hasPermission("mcmmo.perks.activationtime.twelveseconds"); } @@ -132,11 +132,11 @@ public final class Permissions { * SKILLS */ - public static boolean skillEnabled(Permissible permissible, PrimarySkill skill) {return permissible.hasPermission("mcmmo.skills." + skill.toString().toLowerCase()); } - public static boolean vanillaXpBoost(Permissible permissible, PrimarySkill skill) { return permissible.hasPermission("mcmmo.ability." + skill.toString().toLowerCase() + ".vanillaxpboost"); } + public static boolean skillEnabled(Permissible permissible, PrimarySkillType skill) {return permissible.hasPermission("mcmmo.skills." + skill.toString().toLowerCase()); } + public static boolean vanillaXpBoost(Permissible permissible, PrimarySkillType skill) { return permissible.hasPermission("mcmmo.ability." + skill.toString().toLowerCase() + ".vanillaxpboost"); } public static boolean isSubSkillEnabled(Permissible permissible, SubSkillType subSkillType) { return permissible.hasPermission(subSkillType.getPermissionNodeAddress()); } public static boolean isSubSkillEnabled(Permissible permissible, AbstractSubSkill abstractSubSkill) { return permissible.hasPermission(abstractSubSkill.getPermissionNode()); } - public static boolean bonusDamage(Permissible permissible, PrimarySkill skill) { return permissible.hasPermission("mcmmo.ability." + skill.toString().toLowerCase() + ".bonusdamage"); } + public static boolean bonusDamage(Permissible permissible, PrimarySkillType skill) { return permissible.hasPermission("mcmmo.ability." + skill.toString().toLowerCase() + ".bonusdamage"); } /* ACROBATICS */ public static boolean dodge(Permissible permissible) { return permissible.hasPermission("mcmmo.ability.acrobatics.dodge"); } diff --git a/src/main/java/com/gmail/nossr50/util/TextComponentFactory.java b/src/main/java/com/gmail/nossr50/util/TextComponentFactory.java index 750c4db71..6d5bca25b 100644 --- a/src/main/java/com/gmail/nossr50/util/TextComponentFactory.java +++ b/src/main/java/com/gmail/nossr50/util/TextComponentFactory.java @@ -6,7 +6,7 @@ import com.gmail.nossr50.config.Config; import com.gmail.nossr50.datatypes.interactions.NotificationType; import com.gmail.nossr50.datatypes.json.McMMOUrl; import com.gmail.nossr50.datatypes.player.McMMOPlayer; -import com.gmail.nossr50.datatypes.skills.PrimarySkill; +import com.gmail.nossr50.datatypes.skills.PrimarySkillType; import com.gmail.nossr50.datatypes.skills.SubSkillType; import com.gmail.nossr50.datatypes.skills.subskills.AbstractSubSkill; import com.gmail.nossr50.listeners.InteractionManager; @@ -16,7 +16,6 @@ import net.md_5.bungee.api.ChatColor; import net.md_5.bungee.api.chat.*; import org.bukkit.entity.Player; import java.util.ArrayList; -import java.util.HashMap; import java.util.List; /** @@ -55,7 +54,7 @@ public class TextComponentFactory { return getNotificationTextComponent(LocaleLoader.getString(localeKey), notificationType); } - public static TextComponent getNotificationLevelUpTextComponent(McMMOPlayer player, PrimarySkill skill, int currentLevel) + public static TextComponent getNotificationLevelUpTextComponent(McMMOPlayer player, PrimarySkillType skill, int currentLevel) { //player.sendMessage(LocaleLoader.getString(StringUtils.getCapitalized(primarySkill.toString()) + ".Skillup", levelsGained, getSkillLevel(primarySkill))); TextComponent textComponent = new TextComponent(LocaleLoader.getString("JSON."+StringUtils.getCapitalized(skill.toString())) @@ -513,7 +512,7 @@ public class TextComponentFactory { componentBuilder.append("\n"); } - public static void getSubSkillTextComponents(Player player, List textComponents, PrimarySkill parentSkill) { + public static void getSubSkillTextComponents(Player player, List textComponents, PrimarySkillType parentSkill) { for(SubSkillType subSkillType : SubSkillType.values()) { if(subSkillType.getParentSkill() == parentSkill) diff --git a/src/main/java/com/gmail/nossr50/util/commands/CommandRegistrationManager.java b/src/main/java/com/gmail/nossr50/util/commands/CommandRegistrationManager.java index 941ea246c..18d160dee 100644 --- a/src/main/java/com/gmail/nossr50/util/commands/CommandRegistrationManager.java +++ b/src/main/java/com/gmail/nossr50/util/commands/CommandRegistrationManager.java @@ -5,6 +5,7 @@ import java.util.List; import com.gmail.nossr50.commands.chat.McChatSpy; import com.gmail.nossr50.commands.skills.*; +import com.gmail.nossr50.datatypes.skills.PrimarySkillType; import org.bukkit.command.PluginCommand; import com.gmail.nossr50.mcMMO; @@ -39,7 +40,6 @@ import com.gmail.nossr50.commands.player.McrankCommand; import com.gmail.nossr50.commands.player.McstatsCommand; import com.gmail.nossr50.commands.player.MctopCommand; import com.gmail.nossr50.config.Config; -import com.gmail.nossr50.datatypes.skills.PrimarySkill; import com.gmail.nossr50.locale.LocaleLoader; import com.gmail.nossr50.util.StringUtils; @@ -49,7 +49,7 @@ public final class CommandRegistrationManager { private static String permissionsMessage = LocaleLoader.getString("mcMMO.NoPermission"); private static void registerSkillCommands() { - for (PrimarySkill skill : PrimarySkill.values()) { + for (PrimarySkillType skill : PrimarySkillType.values()) { String commandName = skill.toString().toLowerCase(); String localizedName = skill.getName().toLowerCase(); diff --git a/src/main/java/com/gmail/nossr50/util/commands/CommandUtils.java b/src/main/java/com/gmail/nossr50/util/commands/CommandUtils.java index 359bcc73a..3e7c9ecbc 100644 --- a/src/main/java/com/gmail/nossr50/util/commands/CommandUtils.java +++ b/src/main/java/com/gmail/nossr50/util/commands/CommandUtils.java @@ -3,7 +3,7 @@ package com.gmail.nossr50.util.commands; import java.util.ArrayList; import java.util.List; -import com.gmail.nossr50.datatypes.skills.PrimarySkill; +import com.gmail.nossr50.datatypes.skills.PrimarySkillType; import org.bukkit.OfflinePlayer; import org.bukkit.command.CommandSender; import org.bukkit.entity.Player; @@ -26,7 +26,7 @@ public final class CommandUtils { private CommandUtils() {} - public static boolean isChildSkill(CommandSender sender, PrimarySkill skill) { + public static boolean isChildSkill(CommandSender sender, PrimarySkillType skill) { if (skill == null || !skill.isChildSkill()) { return false; } @@ -181,7 +181,7 @@ public final class CommandUtils { * @param display The sender to display stats to */ public static void printGatheringSkills(Player inspect, CommandSender display) { - printGroupedSkillData(inspect, display, LocaleLoader.getString("Stats.Header.Gathering"), PrimarySkill.GATHERING_SKILLS); + printGroupedSkillData(inspect, display, LocaleLoader.getString("Stats.Header.Gathering"), PrimarySkillType.GATHERING_SKILLS); } public static void printGatheringSkills(Player player) { @@ -195,7 +195,7 @@ public final class CommandUtils { * @param display The sender to display stats to */ public static void printCombatSkills(Player inspect, CommandSender display) { - printGroupedSkillData(inspect, display, LocaleLoader.getString("Stats.Header.Combat"), PrimarySkill.COMBAT_SKILLS); + printGroupedSkillData(inspect, display, LocaleLoader.getString("Stats.Header.Combat"), PrimarySkillType.COMBAT_SKILLS); } public static void printCombatSkills(Player player) { @@ -209,14 +209,14 @@ public final class CommandUtils { * @param display The sender to display stats to */ public static void printMiscSkills(Player inspect, CommandSender display) { - printGroupedSkillData(inspect, display, LocaleLoader.getString("Stats.Header.Misc"), PrimarySkill.MISC_SKILLS); + printGroupedSkillData(inspect, display, LocaleLoader.getString("Stats.Header.Misc"), PrimarySkillType.MISC_SKILLS); } public static void printMiscSkills(Player player) { printMiscSkills(player, player); } - public static String displaySkill(PlayerProfile profile, PrimarySkill skill) { + public static String displaySkill(PlayerProfile profile, PrimarySkillType skill) { if (skill.isChildSkill()) { return LocaleLoader.getString("Skills.ChildStats", LocaleLoader.getString(StringUtils.getCapitalized(skill.toString()) + ".Listener") + " ", profile.getSkillLevel(skill)); } @@ -224,13 +224,13 @@ public final class CommandUtils { 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 skillGroup) { + private static void printGroupedSkillData(Player inspect, CommandSender display, String header, List skillGroup) { PlayerProfile profile = UserManager.getPlayer(inspect).getProfile(); List displayData = new ArrayList(); displayData.add(header); - for (PrimarySkill skill : skillGroup) { + for (PrimarySkillType skill : skillGroup) { if (skill.getPermissions(inspect)) { displayData.add(displaySkill(profile, skill)); } diff --git a/src/main/java/com/gmail/nossr50/util/experience/FormulaManager.java b/src/main/java/com/gmail/nossr50/util/experience/FormulaManager.java index f7611811a..766144996 100644 --- a/src/main/java/com/gmail/nossr50/util/experience/FormulaManager.java +++ b/src/main/java/com/gmail/nossr50/util/experience/FormulaManager.java @@ -4,13 +4,13 @@ import java.io.File; import java.util.HashMap; import java.util.Map; +import com.gmail.nossr50.datatypes.skills.PrimarySkillType; import org.bukkit.configuration.file.YamlConfiguration; import com.gmail.nossr50.mcMMO; import com.gmail.nossr50.config.Config; import com.gmail.nossr50.config.experience.ExperienceConfig; import com.gmail.nossr50.datatypes.experience.FormulaType; -import com.gmail.nossr50.datatypes.skills.PrimarySkill; public class FormulaManager { private static File formulaFile = new File(mcMMO.getFlatFileDirectory() + "formula.yml"); @@ -75,15 +75,15 @@ public class FormulaManager { * Calculate how many levels a player should have using * the new formula type. * - * @param primarySkill skill where new levels and experience are calculated for + * @param primarySkillType skill where new levels and experience are calculated for * @param experience total amount of experience * @param formulaType The new {@link FormulaType} * @return the amount of levels and experience */ - public int[] calculateNewLevel(PrimarySkill primarySkill, int experience, FormulaType formulaType) { + public int[] calculateNewLevel(PrimarySkillType primarySkillType, int experience, FormulaType formulaType) { int newLevel = 0; int remainder = 0; - int maxLevel = Config.getInstance().getLevelCap(primarySkill); + int maxLevel = Config.getInstance().getLevelCap(primarySkillType); while (experience > 0 && newLevel < maxLevel) { int experienceToNextLevel = getCachedXpToLevel(newLevel, formulaType); diff --git a/src/main/java/com/gmail/nossr50/util/player/NotificationManager.java b/src/main/java/com/gmail/nossr50/util/player/NotificationManager.java index c51699813..2dab0e308 100644 --- a/src/main/java/com/gmail/nossr50/util/player/NotificationManager.java +++ b/src/main/java/com/gmail/nossr50/util/player/NotificationManager.java @@ -3,7 +3,7 @@ package com.gmail.nossr50.util.player; import com.gmail.nossr50.config.AdvancedConfig; import com.gmail.nossr50.datatypes.interactions.NotificationType; import com.gmail.nossr50.datatypes.player.McMMOPlayer; -import com.gmail.nossr50.datatypes.skills.PrimarySkill; +import com.gmail.nossr50.datatypes.skills.PrimarySkillType; import com.gmail.nossr50.events.skills.McMMOPlayerNotificationEvent; import com.gmail.nossr50.util.Misc; import com.gmail.nossr50.util.TextComponentFactory; @@ -85,7 +85,7 @@ public class NotificationManager { * @param skillName skill that leveled up * @param newLevel new level of that skill */ - public static void sendPlayerLevelUpNotification(McMMOPlayer mcMMOPlayer, PrimarySkill skillName, int newLevel) + public static void sendPlayerLevelUpNotification(McMMOPlayer mcMMOPlayer, PrimarySkillType skillName, int newLevel) { ChatMessageType destination = AdvancedConfig.getInstance().doesNotificationUseActionBar(NotificationType.LEVEL_UP_MESSAGE) ? ChatMessageType.ACTION_BAR : ChatMessageType.SYSTEM; diff --git a/src/main/java/com/gmail/nossr50/util/scoreboards/ScoreboardManager.java b/src/main/java/com/gmail/nossr50/util/scoreboards/ScoreboardManager.java index 3262054d7..9bfdae8ba 100644 --- a/src/main/java/com/gmail/nossr50/util/scoreboards/ScoreboardManager.java +++ b/src/main/java/com/gmail/nossr50/util/scoreboards/ScoreboardManager.java @@ -6,7 +6,7 @@ import java.util.HashMap; import java.util.List; import java.util.Map; -import com.gmail.nossr50.datatypes.skills.PrimarySkill; +import com.gmail.nossr50.datatypes.skills.PrimarySkillType; import com.gmail.nossr50.datatypes.skills.SuperAbilityType; import org.bukkit.ChatColor; import org.bukkit.entity.Player; @@ -50,7 +50,7 @@ public class ScoreboardManager { static final String LABEL_ABILITY_COOLDOWN = LocaleLoader.getString("Scoreboard.Misc.Cooldown"); static final String LABEL_OVERALL = LocaleLoader.getString("Scoreboard.Misc.Overall"); - static final Map skillLabels; + static final Map skillLabels; static final Map abilityLabelsColored; static final Map abilityLabelsSkill; @@ -61,7 +61,7 @@ public class ScoreboardManager { /* * We need immutable objects for our Scoreboard's labels */ - ImmutableMap.Builder skillLabelBuilder = ImmutableMap.builder(); + ImmutableMap.Builder skillLabelBuilder = ImmutableMap.builder(); ImmutableMap.Builder abilityLabelBuilder = ImmutableMap.builder(); ImmutableMap.Builder abilityLabelSkillBuilder = ImmutableMap.builder(); @@ -90,14 +90,14 @@ public class ScoreboardManager { Collections.shuffle(colors, Misc.getRandom()); int i = 0; - for (PrimarySkill type : PrimarySkill.values()) { + for (PrimarySkillType type : PrimarySkillType.values()) { // Include child skills skillLabelBuilder.put(type, getShortenedName(colors.get(i) + type.getName(), false)); if (type.getAbility() != null) { abilityLabelBuilder.put(type.getAbility(), getShortenedName(colors.get(i) + type.getAbility().getName())); - if (type == PrimarySkill.MINING) { + if (type == PrimarySkillType.MINING) { abilityLabelBuilder.put(SuperAbilityType.BLAST_MINING, getShortenedName(colors.get(i) + SuperAbilityType.BLAST_MINING.getName())); } } @@ -112,14 +112,14 @@ public class ScoreboardManager { * Stylizes the targetBoard using our normal color scheme */ else { - for (PrimarySkill type : PrimarySkill.values()) { + for (PrimarySkillType type : PrimarySkillType.values()) { // Include child skills skillLabelBuilder.put(type, getShortenedName(ChatColor.GREEN + type.getName())); if (type.getAbility() != null) { abilityLabelBuilder.put(type.getAbility(), formatAbility(type.getAbility().getName())); - if (type == PrimarySkill.MINING) { + if (type == PrimarySkillType.MINING) { abilityLabelBuilder.put(SuperAbilityType.BLAST_MINING, formatAbility(SuperAbilityType.BLAST_MINING.getName())); } } @@ -207,7 +207,7 @@ public class ScoreboardManager { } // Called by internal level-up event listener - public static void handleLevelUp(Player player, PrimarySkill skill) { + public static void handleLevelUp(Player player, PrimarySkillType skill) { // Selfboards ScoreboardWrapper selfboardWrapper = PLAYER_SCOREBOARDS.get(player.getName()); @@ -234,7 +234,7 @@ public class ScoreboardManager { } // Called by internal xp event listener - public static void handleXp(Player player, PrimarySkill skill) { + public static void handleXp(Player player, PrimarySkillType skill) { // Selfboards ScoreboardWrapper wrapper = PLAYER_SCOREBOARDS.get(player.getName()); @@ -244,7 +244,7 @@ public class ScoreboardManager { } // Called by internal ability event listeners - public static void cooldownUpdate(Player player, PrimarySkill skill) { + public static void cooldownUpdate(Player player, PrimarySkillType skill) { // Selfboards ScoreboardWrapper wrapper = PLAYER_SCOREBOARDS.get(player.getName()); @@ -255,7 +255,7 @@ public class ScoreboardManager { // **** Setup methods **** // - public static void enablePlayerSkillScoreboard(Player player, PrimarySkill skill) { + public static void enablePlayerSkillScoreboard(Player player, PrimarySkillType skill) { ScoreboardWrapper wrapper = PLAYER_SCOREBOARDS.get(player.getName()); wrapper.setOldScoreboard(); @@ -264,7 +264,7 @@ public class ScoreboardManager { changeScoreboard(wrapper, Config.getInstance().getSkillScoreboardTime()); } - public static void enablePlayerSkillLevelUpScoreboard(Player player, PrimarySkill skill) { + public static void enablePlayerSkillLevelUpScoreboard(Player player, PrimarySkillType skill) { ScoreboardWrapper wrapper = PLAYER_SCOREBOARDS.get(player.getName()); // Do NOT run if already shown @@ -305,7 +305,7 @@ public class ScoreboardManager { changeScoreboard(wrapper, Config.getInstance().getCooldownScoreboardTime()); } - public static void showPlayerRankScoreboard(Player player, Map rank) { + public static void showPlayerRankScoreboard(Player player, Map rank) { ScoreboardWrapper wrapper = PLAYER_SCOREBOARDS.get(player.getName()); wrapper.setOldScoreboard(); @@ -315,7 +315,7 @@ public class ScoreboardManager { changeScoreboard(wrapper, Config.getInstance().getRankScoreboardTime()); } - public static void showPlayerRankScoreboardOthers(Player player, String targetName, Map rank) { + public static void showPlayerRankScoreboardOthers(Player player, String targetName, Map rank) { ScoreboardWrapper wrapper = PLAYER_SCOREBOARDS.get(player.getName()); wrapper.setOldScoreboard(); @@ -325,7 +325,7 @@ public class ScoreboardManager { changeScoreboard(wrapper, Config.getInstance().getRankScoreboardTime()); } - public static void showTopScoreboard(Player player, PrimarySkill skill, int pageNumber, List stats) { + public static void showTopScoreboard(Player player, PrimarySkillType skill, int pageNumber, List stats) { ScoreboardWrapper wrapper = PLAYER_SCOREBOARDS.get(player.getName()); wrapper.setOldScoreboard(); diff --git a/src/main/java/com/gmail/nossr50/util/scoreboards/ScoreboardWrapper.java b/src/main/java/com/gmail/nossr50/util/scoreboards/ScoreboardWrapper.java index bf5c1d2e0..6330676b3 100644 --- a/src/main/java/com/gmail/nossr50/util/scoreboards/ScoreboardWrapper.java +++ b/src/main/java/com/gmail/nossr50/util/scoreboards/ScoreboardWrapper.java @@ -3,6 +3,7 @@ package com.gmail.nossr50.util.scoreboards; import java.util.List; import java.util.Map; +import com.gmail.nossr50.datatypes.skills.PrimarySkillType; import com.gmail.nossr50.datatypes.skills.SuperAbilityType; import com.gmail.nossr50.events.scoreboard.*; import org.bukkit.ChatColor; @@ -19,7 +20,6 @@ import com.gmail.nossr50.config.Config; import com.gmail.nossr50.datatypes.database.PlayerStat; import com.gmail.nossr50.datatypes.player.McMMOPlayer; import com.gmail.nossr50.datatypes.player.PlayerProfile; -import com.gmail.nossr50.datatypes.skills.PrimarySkill; import com.gmail.nossr50.locale.LocaleLoader; import com.gmail.nossr50.skills.child.FamilyTree; import com.gmail.nossr50.util.Misc; @@ -44,7 +44,7 @@ public class ScoreboardWrapper { // Parameter variables (May be null / invalid) private Scoreboard oldBoard = null; public String targetPlayer = null; - public PrimarySkill targetSkill = null; + public PrimarySkillType targetSkill = null; private PlayerProfile targetProfile = null; public int leaderboardPage = -1; @@ -290,7 +290,7 @@ public class ScoreboardWrapper { loadObjective(""); } - public void setTypeSkill(PrimarySkill skill) { + public void setTypeSkill(PrimarySkillType skill) { this.sidebarType = SidebarType.SKILL_BOARD; targetSkill = skill; @@ -369,7 +369,7 @@ public class ScoreboardWrapper { loadObjective(String.format("%s (%2d - %2d)", ScoreboardManager.POWER_LEVEL, startPosition, endPosition)); } - public void setTypeTop(PrimarySkill skill, int page) { + public void setTypeTop(PrimarySkillType skill, int page) { this.sidebarType = SidebarType.TOP_BOARD; leaderboardPage = page; targetSkill = skill; @@ -451,7 +451,7 @@ public class ScoreboardWrapper { sidebarObjective.getScore(ScoreboardManager.LABEL_REMAINING_XP).setScore(mcMMOPlayer.getXpToLevel(targetSkill) - currentXP); } else { - for (PrimarySkill parentSkill : FamilyTree.getParents(targetSkill)) { + for (PrimarySkillType parentSkill : FamilyTree.getParents(targetSkill)) { sidebarObjective.getScore(ScoreboardManager.skillLabels.get(parentSkill)).setScore(mcMMOPlayer.getSkillLevel(parentSkill)); } } @@ -461,7 +461,7 @@ public class ScoreboardWrapper { if (targetSkill.getAbility() != null) { boolean stopUpdating; - if (targetSkill == PrimarySkill.MINING) { + if (targetSkill == PrimarySkillType.MINING) { // Special-Case: Mining has two abilities, both with cooldowns Score cooldownSB = sidebarObjective.getScore(ScoreboardManager.abilityLabelsSkill.get(SuperAbilityType.SUPER_BREAKER)); Score cooldownBM = sidebarObjective.getScore(ScoreboardManager.abilityLabelsSkill.get(SuperAbilityType.BLAST_MINING)); @@ -529,7 +529,7 @@ public class ScoreboardWrapper { // Calculate power level here int powerLevel = 0; - for (PrimarySkill skill : PrimarySkill.NON_CHILD_SKILLS) { // Don't include child skills, makes the list too long + for (PrimarySkillType skill : PrimarySkillType.NON_CHILD_SKILLS) { // Don't include child skills, makes the list too long int level = newProfile.getSkillLevel(skill); powerLevel += level; @@ -548,7 +548,7 @@ public class ScoreboardWrapper { case RANK_BOARD: case TOP_BOARD: /* - * @see #acceptRankData(Map rank) + * @see #acceptRankData(Map rank) * @see #acceptLeaderboardData(List stats) */ break; @@ -558,11 +558,11 @@ public class ScoreboardWrapper { } } - public void acceptRankData(Map rankData) { + public void acceptRankData(Map rankData) { Integer rank; Player player = mcMMO.p.getServer().getPlayerExact(playerName); - for (PrimarySkill skill : PrimarySkill.NON_CHILD_SKILLS) { + for (PrimarySkillType skill : PrimarySkillType.NON_CHILD_SKILLS) { if (!skill.getPermissions(player)) { continue; } diff --git a/src/main/java/com/gmail/nossr50/util/skills/CombatUtils.java b/src/main/java/com/gmail/nossr50/util/skills/CombatUtils.java index 8769ce0d4..75d2057ef 100644 --- a/src/main/java/com/gmail/nossr50/util/skills/CombatUtils.java +++ b/src/main/java/com/gmail/nossr50/util/skills/CombatUtils.java @@ -4,7 +4,7 @@ import java.util.EnumMap; import java.util.HashMap; import java.util.Map; -import com.gmail.nossr50.datatypes.skills.PrimarySkill; +import com.gmail.nossr50.datatypes.skills.PrimarySkillType; import org.bukkit.GameMode; import org.bukkit.Material; import org.bukkit.entity.AnimalTamer; @@ -64,7 +64,7 @@ public final class CombatUtils { Map modifiers = getModifiers(event); if (swordsManager.canActivateAbility()) { - mcMMOPlayer.checkAbilityActivation(PrimarySkill.SWORDS); + mcMMOPlayer.checkAbilityActivation(PrimarySkillType.SWORDS); } if (swordsManager.canUseBleed()) { @@ -75,7 +75,7 @@ public final class CombatUtils { swordsManager.serratedStrikes(target, initialDamage, modifiers); } - startGainXp(mcMMOPlayer, target, PrimarySkill.SWORDS); + startGainXp(mcMMOPlayer, target, PrimarySkillType.SWORDS); } private static void processAxeCombat(LivingEntity target, Player player, EntityDamageByEntityEvent event) { @@ -91,7 +91,7 @@ public final class CombatUtils { AxesManager axesManager = mcMMOPlayer.getAxesManager(); if (axesManager.canActivateAbility()) { - mcMMOPlayer.checkAbilityActivation(PrimarySkill.AXES); + mcMMOPlayer.checkAbilityActivation(PrimarySkillType.AXES); } if (axesManager.canUseAxeMastery()) { @@ -114,7 +114,7 @@ public final class CombatUtils { } applyScaledModifiers(initialDamage, finalDamage, event); - startGainXp(mcMMOPlayer, target, PrimarySkill.AXES); + startGainXp(mcMMOPlayer, target, PrimarySkillType.AXES); } private static void processUnarmedCombat(LivingEntity target, Player player, EntityDamageByEntityEvent event) { @@ -129,7 +129,7 @@ public final class CombatUtils { UnarmedManager unarmedManager = mcMMOPlayer.getUnarmedManager(); if (unarmedManager.canActivateAbility()) { - mcMMOPlayer.checkAbilityActivation(PrimarySkill.UNARMED); + mcMMOPlayer.checkAbilityActivation(PrimarySkillType.UNARMED); } if (unarmedManager.canUseIronArm()) { @@ -145,7 +145,7 @@ public final class CombatUtils { } applyScaledModifiers(initialDamage, finalDamage, event); - startGainXp(mcMMOPlayer, target, PrimarySkill.UNARMED); + startGainXp(mcMMOPlayer, target, PrimarySkillType.UNARMED); } private static void processTamingCombat(LivingEntity target, Player master, Wolf wolf, EntityDamageByEntityEvent event) { @@ -170,7 +170,7 @@ public final class CombatUtils { } applyScaledModifiers(initialDamage, finalDamage, event); - startGainXp(mcMMOPlayer, target, PrimarySkill.TAMING); + startGainXp(mcMMOPlayer, target, PrimarySkillType.TAMING); } private static void processArcheryCombat(LivingEntity target, Player player, EntityDamageByEntityEvent event, Arrow arrow) { @@ -180,7 +180,7 @@ public final class CombatUtils { McMMOPlayer mcMMOPlayer = UserManager.getPlayer(player); ArcheryManager archeryManager = mcMMOPlayer.getArcheryManager(); - if (target instanceof Player && PrimarySkill.UNARMED.getPVPEnabled()) { + if (target instanceof Player && PrimarySkillType.UNARMED.getPVPEnabled()) { UnarmedManager unarmedManager = UserManager.getPlayer((Player) target).getUnarmedManager(); if (unarmedManager.canDeflect()) { @@ -207,7 +207,7 @@ public final class CombatUtils { archeryManager.distanceXpBonus(target, arrow); applyScaledModifiers(initialDamage, finalDamage, event); - startGainXp(mcMMOPlayer, target, PrimarySkill.ARCHERY, arrow.getMetadata(mcMMO.bowForceKey).get(0).asDouble()); + startGainXp(mcMMOPlayer, target, PrimarySkillType.ARCHERY, arrow.getMetadata(mcMMO.bowForceKey).get(0).asDouble()); } /** @@ -245,29 +245,29 @@ public final class CombatUtils { } if (ItemUtils.isSword(heldItem)) { - if (!PrimarySkill.SWORDS.shouldProcess(target)) { + if (!PrimarySkillType.SWORDS.shouldProcess(target)) { return; } - if (PrimarySkill.SWORDS.getPermissions(player)) { + if (PrimarySkillType.SWORDS.getPermissions(player)) { processSwordCombat(target, player, event); } } else if (ItemUtils.isAxe(heldItem)) { - if (!PrimarySkill.AXES.shouldProcess(target)) { + if (!PrimarySkillType.AXES.shouldProcess(target)) { return; } - if (PrimarySkill.AXES.getPermissions(player)) { + if (PrimarySkillType.AXES.getPermissions(player)) { processAxeCombat(target, player, event); } } else if (ItemUtils.isUnarmed(heldItem)) { - if (!PrimarySkill.UNARMED.shouldProcess(target)) { + if (!PrimarySkillType.UNARMED.shouldProcess(target)) { return; } - if (PrimarySkill.UNARMED.getPermissions(player)) { + if (PrimarySkillType.UNARMED.getPermissions(player)) { processUnarmedCombat(target, player, event); } } @@ -277,10 +277,10 @@ public final class CombatUtils { Wolf wolf = (Wolf) damager; AnimalTamer tamer = wolf.getOwner(); - if (tamer != null && tamer instanceof Player && PrimarySkill.TAMING.shouldProcess(target)) { + if (tamer != null && tamer instanceof Player && PrimarySkillType.TAMING.shouldProcess(target)) { Player master = (Player) tamer; - if (!Misc.isNPCEntity(master) && PrimarySkill.TAMING.getPermissions(master)) { + if (!Misc.isNPCEntity(master) && PrimarySkillType.TAMING.getPermissions(master)) { processTamingCombat(target, master, wolf, event); } } @@ -289,14 +289,14 @@ public final class CombatUtils { Arrow arrow = (Arrow) damager; ProjectileSource projectileSource = arrow.getShooter(); - if (projectileSource != null && projectileSource instanceof Player && PrimarySkill.ARCHERY.shouldProcess(target)) { + if (projectileSource != null && projectileSource instanceof Player && PrimarySkillType.ARCHERY.shouldProcess(target)) { Player player = (Player) projectileSource; - if (!Misc.isNPCEntity(player) && PrimarySkill.ARCHERY.getPermissions(player)) { + if (!Misc.isNPCEntity(player) && PrimarySkillType.ARCHERY.getPermissions(player)) { processArcheryCombat(target, player, event, arrow); } - if (target.getType() != EntityType.CREEPER && !Misc.isNPCEntity(player) && PrimarySkill.TAMING.getPermissions(player)) { + if (target.getType() != EntityType.CREEPER && !Misc.isNPCEntity(player) && PrimarySkillType.TAMING.getPermissions(player)) { McMMOPlayer mcMMOPlayer = UserManager.getPlayer(player); TamingManager tamingManager = mcMMOPlayer.getTamingManager(); tamingManager.attackTarget(target); @@ -321,7 +321,7 @@ public final class CombatUtils { } if (ItemUtils.isSword(player.getInventory().getItemInMainHand())) { - if (!PrimarySkill.SWORDS.shouldProcess(target)) { + if (!PrimarySkillType.SWORDS.shouldProcess(target)) { return; } @@ -397,7 +397,7 @@ public final class CombatUtils { * @param damage The initial damage amount * @param type The type of skill being used */ - public static void applyAbilityAoE(Player attacker, LivingEntity target, double damage, Map modifiers, PrimarySkill type) { + public static void applyAbilityAoE(Player attacker, LivingEntity target, double damage, Map modifiers, PrimarySkillType type) { int numberOfTargets = getTier(attacker.getInventory().getItemInMainHand()); // The higher the weapon tier, the more targets you hit double damageAmount = Math.max(damage, 1); @@ -438,8 +438,8 @@ public final class CombatUtils { } } - public static void startGainXp(McMMOPlayer mcMMOPlayer, LivingEntity target, PrimarySkill primarySkill) { - startGainXp(mcMMOPlayer, target, primarySkill, 1.0); + public static void startGainXp(McMMOPlayer mcMMOPlayer, LivingEntity target, PrimarySkillType primarySkillType) { + startGainXp(mcMMOPlayer, target, primarySkillType, 1.0); } /** @@ -447,9 +447,9 @@ public final class CombatUtils { * * @param mcMMOPlayer The attacking player * @param target The defending entity - * @param primarySkill The skill being used + * @param primarySkillType The skill being used */ - private static void startGainXp(McMMOPlayer mcMMOPlayer, LivingEntity target, PrimarySkill primarySkill, double multiplier) { + private static void startGainXp(McMMOPlayer mcMMOPlayer, LivingEntity target, PrimarySkillType primarySkillType, double multiplier) { double baseXP = 0; XPGainReason xpGainReason; @@ -516,7 +516,7 @@ public final class CombatUtils { baseXP *= multiplier; if (baseXP != 0) { - new AwardCombatXpTask(mcMMOPlayer, primarySkill, baseXP, target, xpGainReason).runTaskLater(mcMMO.p, 0); + new AwardCombatXpTask(mcMMOPlayer, primarySkillType, baseXP, target, xpGainReason).runTaskLater(mcMMO.p, 0); } } diff --git a/src/main/java/com/gmail/nossr50/util/skills/PerksUtils.java b/src/main/java/com/gmail/nossr50/util/skills/PerksUtils.java index 585dcde40..79882787d 100644 --- a/src/main/java/com/gmail/nossr50/util/skills/PerksUtils.java +++ b/src/main/java/com/gmail/nossr50/util/skills/PerksUtils.java @@ -1,6 +1,6 @@ package com.gmail.nossr50.util.skills; -import com.gmail.nossr50.datatypes.skills.PrimarySkill; +import com.gmail.nossr50.datatypes.skills.PrimarySkillType; import org.bukkit.entity.Player; import com.gmail.nossr50.config.experience.ExperienceConfig; @@ -44,7 +44,7 @@ public final class PerksUtils { return ticks; } - public static float handleXpPerks(Player player, float xp, PrimarySkill skill) { + public static float handleXpPerks(Player player, float xp, PrimarySkillType skill) { if (Permissions.customXpBoost(player, skill)) { xp *= ExperienceConfig.getInstance().getCustomXpPerkBoost(); } @@ -74,10 +74,10 @@ public final class PerksUtils { * Calculate activation chance for a skill. * * @param player Player to check the activation chance for - * @param skill PrimarySkill to check the activation chance of + * @param skill PrimarySkillType to check the activation chance of * @return the activation chance with "lucky perk" accounted for */ - public static int handleLuckyPerks(Player player, PrimarySkill skill) { + public static int handleLuckyPerks(Player player, PrimarySkillType skill) { if (Permissions.lucky(player, skill)) { return LUCKY_SKILL_ACTIVATION_CHANCE; } diff --git a/src/main/java/com/gmail/nossr50/util/skills/SkillUtils.java b/src/main/java/com/gmail/nossr50/util/skills/SkillUtils.java index 0136effce..a0e0c0a07 100644 --- a/src/main/java/com/gmail/nossr50/util/skills/SkillUtils.java +++ b/src/main/java/com/gmail/nossr50/util/skills/SkillUtils.java @@ -5,9 +5,9 @@ import com.gmail.nossr50.config.Config; import com.gmail.nossr50.config.HiddenConfig; import com.gmail.nossr50.datatypes.interactions.NotificationType; import com.gmail.nossr50.datatypes.player.McMMOPlayer; +import com.gmail.nossr50.datatypes.skills.PrimarySkillType; import com.gmail.nossr50.datatypes.skills.SubSkillType; import com.gmail.nossr50.datatypes.skills.SuperAbilityType; -import com.gmail.nossr50.datatypes.skills.PrimarySkill; import com.gmail.nossr50.datatypes.skills.XPGainReason; import com.gmail.nossr50.datatypes.skills.subskills.AbstractSubSkill; import com.gmail.nossr50.datatypes.skills.subskills.interfaces.RandomChance; @@ -42,7 +42,7 @@ public class SkillUtils { public static final DecimalFormat percent = new DecimalFormat("##0.00%"); public static final DecimalFormat decimal = new DecimalFormat("##0.00"); - public static void applyXpGain(McMMOPlayer mcMMOPlayer, PrimarySkill skill, float xp, XPGainReason xpGainReason) { + public static void applyXpGain(McMMOPlayer mcMMOPlayer, PrimarySkillType skill, float xp, XPGainReason xpGainReason) { mcMMOPlayer.beginXpGain(skill, xp, xpGainReason); } @@ -65,7 +65,7 @@ public class SkillUtils { return calculateAbilityDisplayValues((AdvancedConfig.getInstance().getMaxChance(subSkillType) / maxBonusLevel) * Math.min(skillValue, maxBonusLevel), isLucky); } - public static String[] calculateLengthDisplayValues(Player player, float skillValue, PrimarySkill skill) { + public static String[] calculateLengthDisplayValues(Player player, float skillValue, PrimarySkillType skill) { int maxLength = skill.getAbility().getMaxLength(); int length = 2 + (int) (skillValue / AdvancedConfig.getInstance().getAbilityLength()); int enduranceLength = PerksUtils.handleActivationPerks(player, length, maxLength); @@ -81,7 +81,7 @@ public class SkillUtils { * Others */ - public static int handleFoodSkills(Player player, PrimarySkill skill, int eventFoodLevel, int baseLevel, int maxLevel, int rankChange) { + public static int handleFoodSkills(Player player, PrimarySkillType skill, int eventFoodLevel, int baseLevel, int maxLevel, int rankChange) { int skillLevel = UserManager.getPlayer(player).getSkillLevel(skill); int currentFoodLevel = player.getFoodLevel(); @@ -129,7 +129,7 @@ public class SkillUtils { * @return true if this is a valid skill, false otherwise */ public static boolean isSkill(String skillName) { - return Config.getInstance().getLocale().equalsIgnoreCase("en_US") ? PrimarySkill.getSkill(skillName) != null : isLocalizedSkill(skillName); + return Config.getInstance().getLocale().equalsIgnoreCase("en_US") ? PrimarySkillType.getSkill(skillName) != null : isLocalizedSkill(skillName); } public static void sendSkillMessage(Player player, NotificationType notificationType, String key) { @@ -179,7 +179,7 @@ public class SkillUtils { } McMMOPlayer mcMMOPlayer = UserManager.getPlayer(player); - PrimarySkill skill = mcMMOPlayer.getAbilityMode(SuperAbilityType.SUPER_BREAKER) ? PrimarySkill.MINING : PrimarySkill.EXCAVATION; + PrimarySkillType skill = mcMMOPlayer.getAbilityMode(SuperAbilityType.SUPER_BREAKER) ? PrimarySkillType.MINING : PrimarySkillType.EXCAVATION; int ticks = PerksUtils.handleActivationPerks(player, 2 + (mcMMOPlayer.getSkillLevel(skill) / AdvancedConfig.getInstance().getAbilityLength()), skill.getAbility().getMaxLength()) * Misc.TICK_CONVERSION_FACTOR; PotionEffect abilityBuff = new PotionEffect(PotionEffectType.FAST_DIGGING, duration + ticks, amplifier + 10); @@ -287,7 +287,7 @@ public class SkillUtils { * @return returns true if all conditions are met and they event is not cancelled */ public static boolean isActivationSuccessful(SkillActivationType subskillActivationType, SubSkillType subSkillType, Player player, - PrimarySkill skill, int skillLevel, int activationChance) + PrimarySkillType skill, int skillLevel, int activationChance) { //Maximum chance to succeed double maxChance = AdvancedConfig.getInstance().getMaxChance(subSkillType); @@ -330,7 +330,7 @@ public class SkillUtils { public static boolean isActivationSuccessful(SkillActivationType skillActivationType, AbstractSubSkill abstractSubSkill, Player player, double maxChance, int maxBonusLevel) { int skillLevel = UserManager.getPlayer(player).getSkillLevel(abstractSubSkill.getPrimarySkill()); - PrimarySkill skill = abstractSubSkill.getPrimarySkill(); + PrimarySkillType skill = abstractSubSkill.getPrimarySkill(); switch(skillActivationType) { @@ -362,7 +362,7 @@ public class SkillUtils { //Maximum roll we can make int maxBonusLevel = randomChance.getRandomChanceMaxBonus(); int skillLevel = UserManager.getPlayer(player).getSkillLevel(abstractSubSkill.getPrimarySkill()); - PrimarySkill skill = abstractSubSkill.getPrimarySkill(); + PrimarySkillType skill = abstractSubSkill.getPrimarySkill(); switch(skillActivationType) { @@ -433,7 +433,7 @@ public class SkillUtils { } private static boolean isLocalizedSkill(String skillName) { - for (PrimarySkill skill : PrimarySkill.values()) { + for (PrimarySkillType skill : PrimarySkillType.values()) { if (skillName.equalsIgnoreCase(LocaleLoader.getString(StringUtils.getCapitalized(skill.toString()) + ".SkillName"))) { return true; } diff --git a/src/main/resources/advanced.yml b/src/main/resources/advanced.yml index dcfbb2dc5..1f3b78906 100644 --- a/src/main/resources/advanced.yml +++ b/src/main/resources/advanced.yml @@ -33,9 +33,9 @@ Skills: EnchantBuff: 5 # IncreaseLevel: This setting will determine when the length of every ability gets longer with 1 second # EnchantBuff: This setting determines how many enchant levels to use when buffing Super Breaker & Giga Drill Breaker - ClassicScaling: + Standard: IncreaseLevel: 50 - StandardScaling: + RetroMode: IncreaseLevel: 5 # @@ -402,15 +402,6 @@ Skills: # EnchantDowngradeEnabled: When salvaging enchanted items, the enchants may be downgraded EnchantLossEnabled: true EnchantDowngradeEnabled: true - Rank_Levels: - Rank_1: 12 - Rank_2: 25 - Rank_3: 37 - Rank_4: 50 - Rank_5: 62 - Rank_6: 75 - Rank_7: 87 - Rank_8: 100 # ExtractFullEnchant: Chance to extract the full enchant at each ArcaneSalvage rank ExtractFullEnchant: @@ -522,50 +513,41 @@ Skills: # MaxBonusLevel: On this level, the chance to cause Gore will be ChanceMax: 100.0 MaxBonusLevel: 100 - # BleedTicks: Determines the length of the bleeding effect # Modifier: Damage will get multiplied by this modifier BleedTicks: 2 Modifier: 2.0 - FastFood: # UnlockLevel: Level when FastFood unlocks # Chance: The chance for wolves to heal hp when inflicting damage UnlockLevel: 5 Chance: 50.0 - EnvironmentallyAware: # UnlockLevel: Level when EnvironmentallyAware unlocks UnlockLevel: 10 - ThickFur: # UnlockLevel: Level when ThickFur unlocks # Modifier: Damage will get divided by this modifier UnlockLevel: 25 Modifier: 2.0 - HolyHound: # UnlockLevel: Level when HolyHound unlocks UnlockLevel: 37 - ShockProof: # UnlockLevel: Level when ShockProof unlocks # Modifier: Damage will get divided by this modifier UnlockLevel: 50 Modifier: 6.0 - SharpenedClaws: # UnlockLevel: Level when SharpenedClaws unlocks # Bonus: This bonus will get added to the damage caused UnlockLevel: 75 Bonus: 2.0 - CallOfTheWild: # MinHorseJumpStrength: The minimum jump strength a summoned horse must have # MaxHorseJumpStrength: The maximum jump strength a summoned horse can have MinHorseJumpStrength: 0.7 MaxHorseJumpStrength: 2.0 - Pummel: # ChanceMax: Maximum chance of triggering pummel Chance: 10.0 diff --git a/src/main/resources/locale/locale_en_US.properties b/src/main/resources/locale/locale_en_US.properties index e80b8f928..b6f611f42 100644 --- a/src/main/resources/locale/locale_en_US.properties +++ b/src/main/resources/locale/locale_en_US.properties @@ -290,6 +290,7 @@ Repair.Arcane.Perfect=[[GREEN]]You have sustained the arcane energies in this it Repair.Arcane.Rank=[[RED]]Arcane Forging: [[YELLOW]]Rank {0}/{1} #SALVAGE Salvage.Pretty.Name=Salvage +Salvage.SubSkill.UnderstandingTheArt=You're not just digging through your neighbors trash, you're taking care of the environment.\nPowers up various properties of Salvaging. Salvage.SubSkill.AdvancedSalvage.Name=Advanced Salvage Salvage.SubSkill.AdvancedSalvage.Description=Salvage damaged items Salvage.SubSkill.ArcaneSalvage.Name=Arcane Salvaging @@ -926,6 +927,7 @@ MOTD.Version.Overhaul=[[GOLD]][mcMMO] [[RED]]Overhaul Era[[GOLD]] - [[DARK_AQUA] MOTD.Website=[[GOLD]][mcMMO] [[GREEN]]{0}[[YELLOW]] - mcMMO Website #SMELTING Smelting.Ability.FluxMining=[[RED]]Flux Mining Chance: [[YELLOW]]{0} +Smelting.SubSkill.UnderstandingTheArt=Maybe you're spending a bit too much time smelting in the caves.\nPowers up various properties of Smelting. Smelting.Ability.FuelEfficiency=[[RED]]Fuel Efficiency Multiplier: [[YELLOW]]{0}x Smelting.Ability.Locked.0=LOCKED UNTIL {0}+ SKILL (VANILLA XP BOOST) Smelting.Ability.Locked.1=LOCKED UNTIL {0}+ SKILL (FLUX MINING) diff --git a/src/main/resources/skillranks.yml b/src/main/resources/skillranks.yml index e69de29bb..34507994f 100644 --- a/src/main/resources/skillranks.yml +++ b/src/main/resources/skillranks.yml @@ -0,0 +1,293 @@ +# This file defines the rank level requirements for a subskill +# You cannot alter how many ranks a skill has, that is coded into mcMMO directly +# You can however, change when they unlock, if you make all ranks of a skill level 0 for example every player will have the most powerful version of that skill right away. +# Retro Mode and Standard have separate config settings to make it easier for server owners to understand the difference between the two +# Retro Mode is setup to be an entirely cosmetic change, keeping the old 0-1000 feeling of mcMMO +# Retro Mode has 10x faster leveling and 10x higher skill requirements, if you do the math you can see its the same as Standard other than cosmetics! +### +Alchemy: + Alchemy: + Catalysis: + Standard: + Rank_1: 10 + RetroMode: + Rank_1: 100 + Concoctions: + Standard: + Rank_1: 10 + Rank_2: 25 + Rank_3: 35 + Rank_4: 50 + Rank_5: 65 + Rank_6: 75 + Rank_7: 85 + Rank_8: 100 + RetroMode: + Rank_1: 100 + Rank_2: 250 + Rank_3: 350 + Rank_4: 500 + Rank_5: 650 + Rank_6: 750 + Rank_7: 850 + Rank_8: 1000 +Archery: + SkillShot: + Standard: + Rank_1: 5 + Rank_2: 10 + Rank_3: 15 + Rank_4: 20 + Rank_5: 25 + Rank_6: 30 + Rank_7: 35 + Rank_8: 40 + Rank_9: 45 + Rank_10: 50 + Rank_11: 55 + Rank_12: 60 + Rank_13: 65 + Rank_14: 70 + Rank_15: 75 + Rank_16: 80 + Rank_17: 85 + Rank_18: 90 + Rank_19: 95 + Rank_20: 100 + Retro: + Rank_1: 5 + Rank_2: 100 + Rank_3: 150 + Rank_4: 200 + Rank_5: 250 + Rank_6: 300 + Rank_7: 350 + Rank_8: 400 + Rank_9: 450 + Rank_10: 500 + Rank_11: 550 + Rank_12: 600 + Rank_13: 650 + Rank_14: 700 + Rank_15: 750 + Rank_16: 800 + Rank_17: 850 + Rank_18: 900 + Rank_19: 950 + Rank_20: 1000 +Axes: + ArmorImpact: + Standard: + Rank_1: 5 + Rank_2: 10 + Rank_3: 15 + Rank_4: 20 + Rank_5: 25 + Rank_6: 30 + Rank_7: 35 + Rank_8: 40 + Rank_9: 45 + Rank_10: 50 + Rank_11: 55 + Rank_12: 60 + Rank_13: 65 + Rank_14: 70 + Rank_15: 75 + Rank_16: 80 + Rank_17: 85 + Rank_18: 90 + Rank_19: 95 + Rank_20: 100 + Retro: + Rank_1: 5 + Rank_2: 100 + Rank_3: 150 + Rank_4: 200 + Rank_5: 250 + Rank_6: 300 + Rank_7: 350 + Rank_8: 400 + Rank_9: 450 + Rank_10: 500 + Rank_11: 550 + Rank_12: 600 + Rank_13: 650 + Rank_14: 700 + Rank_15: 750 + Rank_16: 800 + Rank_17: 850 + Rank_18: 900 + Rank_19: 950 + Rank_20: 1000 + AxeMastery: + Standard: + Rank_1: 5 + Rank_2: 10 + Rank_3: 15 + Rank_4: 20 + RetroMode: + Rank_1: 50 + Rank_2: 100 + Rank_3: 150 + Rank_4: 200 +Taming: + FastFoodService: + Standard: + Rank_1: 5 + RetroMode: + Rank_1: 50 + EnvironmentallyAware: + Standard: + Rank_1: 10 + RetroMode: + Rank_1: 100 + ThickFur: + Standard: + Rank_1: 25 + RetroMode: + Rank_1: 250 + HolyHound: + Standard: + Rank_1: 35 + RetroMode: + Rank_1: 350 + ShockProof: + Standard: + Rank_1: 50 + RetroMode: + Rank_1: 500 + SharpenedClaws: + Standard: + Rank_1: 75 + RetroMode: + Rank_1: 750 +Smelting: + UnderstandingTheArt: + Standard: + Rank_1: 10 + Rank_2: 25 + Rank_3: 35 + Rank_4: 50 + Rank_5: 65 + Rank_6: 75 + Rank_7: 85 + Rank_8: 100 + RetroMode: + Rank_1: 100 + Rank_2: 250 + Rank_3: 350 + Rank_4: 500 + Rank_5: 650 + Rank_6: 750 + Rank_7: 850 + Rank_8: 1000 +Salvage: + UnderstandingTheArt: + Standard: + Rank_1: 10 + Rank_2: 25 + Rank_3: 35 + Rank_4: 50 + Rank_5: 65 + Rank_6: 75 + Rank_7: 85 + Rank_8: 100 + RetroMode: + Rank_1: 100 + Rank_2: 250 + Rank_3: 350 + Rank_4: 500 + Rank_5: 650 + Rank_6: 750 + Rank_7: 850 + Rank_8: 1000 +Mining: + BlastMining: + Standard: + Rank_1: 10 + Rank_2: 25 + Rank_3: 35 + Rank_4: 50 + Rank_5: 65 + Rank_6: 75 + Rank_7: 85 + Rank_8: 100 + RetroMode: + Rank_1: 100 + Rank_2: 250 + Rank_3: 350 + Rank_4: 500 + Rank_5: 650 + Rank_6: 750 + Rank_7: 850 + Rank_8: 1000 +Herbalism: + GreenThumb: + Standard: + Rank_1: 20 + Rank_2: 40 + Rank_3: 60 + Rank_4: 80 + Rank_5: 100 + RetroMode: + Rank_1: 200 + Rank_2: 400 + Rank_3: 600 + Rank_4: 800 + Rank_5: 1000 + FarmersDiet: + Standard: + Rank_1: 20 + Rank_2: 40 + Rank_3: 60 + Rank_4: 80 + Rank_5: 100 + RetroMode: + Rank_1: 200 + Rank_2: 400 + Rank_3: 600 + Rank_4: 800 + Rank_5: 1000 +Fishing: + MasterAngler: + Standard: + Rank_1: 50 + RetroMode: + Rank_1: 150 + IceFishing: + Standard: + Rank_1: 5 + RetroMode: + Rank_1: 50 + FishermansDiet: + Standard: + Rank_1: 20 + Rank_2: 40 + Rank_3: 60 + Rank_4: 80 + Rank_5: 100 + RetroMode: + Rank_1: 200 + Rank_2: 400 + Rank_3: 600 + Rank_4: 800 + Rank_5: 1000 + TreasureHunter: + Standard: + Rank_1: 10 + Rank_2: 25 + Rank_3: 35 + Rank_4: 50 + Rank_5: 65 + Rank_6: 75 + Rank_7: 85 + Rank_8: 100 + RetroMode: + Rank_1: 100 + Rank_2: 250 + Rank_3: 350 + Rank_4: 500 + Rank_5: 650 + Rank_6: 750 + Rank_7: 850 + Rank_8: 1000