diff --git a/src/main/java/com/gmail/nossr50/commands/AbilityToggleCommand.java b/src/main/java/com/gmail/nossr50/commands/AbilityToggleCommand.java index 747d1e95f..54d50f468 100644 --- a/src/main/java/com/gmail/nossr50/commands/AbilityToggleCommand.java +++ b/src/main/java/com/gmail/nossr50/commands/AbilityToggleCommand.java @@ -22,7 +22,7 @@ public class AbilityToggleCommand extends ToggleCommand { @Override protected void applyCommandAction(McMMOPlayer mcMMOPlayer) { - mcMMOPlayer.getPlayer().sendMessage(pluginRef.getLocaleManager().getString("Commands.Ability." + (mcMMOPlayer.getAbilityUse() ? "Off" : "On"))); + mcMMOPlayer.getPlayer().sendMessage(pluginRef.getLocaleManager().getString("Commands.Ability." + (mcMMOPlayer.getAllowAbilityUse() ? "Off" : "On"))); mcMMOPlayer.toggleAbilityUse(); } diff --git a/src/main/java/com/gmail/nossr50/commands/RefreshCooldownsCommand.java b/src/main/java/com/gmail/nossr50/commands/RefreshCooldownsCommand.java index 581f9afeb..918118a73 100644 --- a/src/main/java/com/gmail/nossr50/commands/RefreshCooldownsCommand.java +++ b/src/main/java/com/gmail/nossr50/commands/RefreshCooldownsCommand.java @@ -25,7 +25,7 @@ public class RefreshCooldownsCommand extends ToggleCommand { mcMMOPlayer.setRecentlyHurt(0); mcMMOPlayer.resetCooldowns(); mcMMOPlayer.resetToolPrepMode(); - mcMMOPlayer.resetAbilityMode(); + mcMMOPlayer.resetSuperAbilityMode(); mcMMOPlayer.getPlayer().sendMessage(pluginRef.getLocaleManager().getString("Ability.Generic.Refresh")); } 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 9a93bf7c0..0c4db40ae 100644 --- a/src/main/java/com/gmail/nossr50/datatypes/player/McMMOPlayer.java +++ b/src/main/java/com/gmail/nossr50/datatypes/player/McMMOPlayer.java @@ -50,10 +50,10 @@ import java.util.UUID; public class McMMOPlayer { private final mcMMO pluginRef; - private final Map skillManagers = new HashMap<>(); - private final Map abilityMode = new HashMap<>(); - private final Map abilityInformed = new HashMap<>(); - private final Map toolMode = new HashMap<>(); + private final Map skillManagerMap = new HashMap<>(); + private final Map superAbilityModeMap = new HashMap<>(); + private final Map superAbilityInformedMap = new HashMap<>(); + private final Map toolModeMap = new HashMap<>(); private final FixedMetadataValue playerMetadata; private Player player; private PlayerProfile profile; @@ -68,7 +68,7 @@ public class McMMOPlayer { private boolean displaySkillNotifications = true; private boolean debugMode; - private boolean abilityUse = true; + private boolean allowAbilityUse = true; private boolean godMode; private boolean chatSpy = false; //Off by default private int recentlyHurt; @@ -98,12 +98,12 @@ public class McMMOPlayer { initSkillManagers(); for (SuperAbilityType superAbilityType : SuperAbilityType.values()) { - abilityMode.put(superAbilityType, false); - abilityInformed.put(superAbilityType, true); // This is intended + superAbilityModeMap.put(superAbilityType, false); + superAbilityInformedMap.put(superAbilityType, true); // This is intended } for (ToolType toolType : ToolType.values()) { - toolMode.put(toolType, false); + toolModeMap.put(toolType, false); } experienceBarManager = new ExperienceBarManager(pluginRef,this); @@ -124,49 +124,49 @@ public class McMMOPlayer { private void initManager(PrimarySkillType primarySkillType) throws InvalidSkillException { switch(primarySkillType) { case ACROBATICS: - skillManagers.put(primarySkillType, new AcrobaticsManager(pluginRef, this)); + skillManagerMap.put(primarySkillType, new AcrobaticsManager(pluginRef, this)); break; case ALCHEMY: - skillManagers.put(primarySkillType, new AlchemyManager(pluginRef, this)); + skillManagerMap.put(primarySkillType, new AlchemyManager(pluginRef, this)); break; case ARCHERY: - skillManagers.put(primarySkillType, new ArcheryManager(pluginRef, this)); + skillManagerMap.put(primarySkillType, new ArcheryManager(pluginRef, this)); break; case AXES: - skillManagers.put(primarySkillType, new AxesManager(pluginRef, this)); + skillManagerMap.put(primarySkillType, new AxesManager(pluginRef, this)); break; case EXCAVATION: - skillManagers.put(primarySkillType, new ExcavationManager(pluginRef, this)); + skillManagerMap.put(primarySkillType, new ExcavationManager(pluginRef, this)); break; case FISHING: - skillManagers.put(primarySkillType, new FishingManager(pluginRef, this)); + skillManagerMap.put(primarySkillType, new FishingManager(pluginRef, this)); break; case HERBALISM: - skillManagers.put(primarySkillType, new HerbalismManager(pluginRef, this)); + skillManagerMap.put(primarySkillType, new HerbalismManager(pluginRef, this)); break; case MINING: - skillManagers.put(primarySkillType, new MiningManager(pluginRef, this)); + skillManagerMap.put(primarySkillType, new MiningManager(pluginRef, this)); break; case REPAIR: - skillManagers.put(primarySkillType, new RepairManager(pluginRef, this)); + skillManagerMap.put(primarySkillType, new RepairManager(pluginRef, this)); break; case SALVAGE: - skillManagers.put(primarySkillType, new SalvageManager(pluginRef, this)); + skillManagerMap.put(primarySkillType, new SalvageManager(pluginRef, this)); break; case SMELTING: - skillManagers.put(primarySkillType, new SmeltingManager(pluginRef, this)); + skillManagerMap.put(primarySkillType, new SmeltingManager(pluginRef, this)); break; case SWORDS: - skillManagers.put(primarySkillType, new SwordsManager(pluginRef, this)); + skillManagerMap.put(primarySkillType, new SwordsManager(pluginRef, this)); break; case TAMING: - skillManagers.put(primarySkillType, new TamingManager(pluginRef, this)); + skillManagerMap.put(primarySkillType, new TamingManager(pluginRef, this)); break; case UNARMED: - skillManagers.put(primarySkillType, new UnarmedManager(pluginRef, this)); + skillManagerMap.put(primarySkillType, new UnarmedManager(pluginRef, this)); break; case WOODCUTTING: - skillManagers.put(primarySkillType, new WoodcuttingManager(pluginRef, this)); + skillManagerMap.put(primarySkillType, new WoodcuttingManager(pluginRef, this)); break; default: throw new InvalidSkillException("The skill named has no manager! Contact the devs!"); @@ -255,63 +255,63 @@ public class McMMOPlayer { } public AcrobaticsManager getAcrobaticsManager() { - return (AcrobaticsManager) skillManagers.get(PrimarySkillType.ACROBATICS); + return (AcrobaticsManager) skillManagerMap.get(PrimarySkillType.ACROBATICS); } public AlchemyManager getAlchemyManager() { - return (AlchemyManager) skillManagers.get(PrimarySkillType.ALCHEMY); + return (AlchemyManager) skillManagerMap.get(PrimarySkillType.ALCHEMY); } public ArcheryManager getArcheryManager() { - return (ArcheryManager) skillManagers.get(PrimarySkillType.ARCHERY); + return (ArcheryManager) skillManagerMap.get(PrimarySkillType.ARCHERY); } public AxesManager getAxesManager() { - return (AxesManager) skillManagers.get(PrimarySkillType.AXES); + return (AxesManager) skillManagerMap.get(PrimarySkillType.AXES); } public ExcavationManager getExcavationManager() { - return (ExcavationManager) skillManagers.get(PrimarySkillType.EXCAVATION); + return (ExcavationManager) skillManagerMap.get(PrimarySkillType.EXCAVATION); } public FishingManager getFishingManager() { - return (FishingManager) skillManagers.get(PrimarySkillType.FISHING); + return (FishingManager) skillManagerMap.get(PrimarySkillType.FISHING); } public HerbalismManager getHerbalismManager() { - return (HerbalismManager) skillManagers.get(PrimarySkillType.HERBALISM); + return (HerbalismManager) skillManagerMap.get(PrimarySkillType.HERBALISM); } public MiningManager getMiningManager() { - return (MiningManager) skillManagers.get(PrimarySkillType.MINING); + return (MiningManager) skillManagerMap.get(PrimarySkillType.MINING); } public RepairManager getRepairManager() { - return (RepairManager) skillManagers.get(PrimarySkillType.REPAIR); + return (RepairManager) skillManagerMap.get(PrimarySkillType.REPAIR); } public SalvageManager getSalvageManager() { - return (SalvageManager) skillManagers.get(PrimarySkillType.SALVAGE); + return (SalvageManager) skillManagerMap.get(PrimarySkillType.SALVAGE); } public SmeltingManager getSmeltingManager() { - return (SmeltingManager) skillManagers.get(PrimarySkillType.SMELTING); + return (SmeltingManager) skillManagerMap.get(PrimarySkillType.SMELTING); } public SwordsManager getSwordsManager() { - return (SwordsManager) skillManagers.get(PrimarySkillType.SWORDS); + return (SwordsManager) skillManagerMap.get(PrimarySkillType.SWORDS); } public TamingManager getTamingManager() { - return (TamingManager) skillManagers.get(PrimarySkillType.TAMING); + return (TamingManager) skillManagerMap.get(PrimarySkillType.TAMING); } public UnarmedManager getUnarmedManager() { - return (UnarmedManager) skillManagers.get(PrimarySkillType.UNARMED); + return (UnarmedManager) skillManagerMap.get(PrimarySkillType.UNARMED); } public WoodcuttingManager getWoodcuttingManager() { - return (WoodcuttingManager) skillManagers.get(PrimarySkillType.WOODCUTTING); + return (WoodcuttingManager) skillManagerMap.get(PrimarySkillType.WOODCUTTING); } /* @@ -321,69 +321,69 @@ public class McMMOPlayer { /** * Reset the mode of all abilities. */ - public void resetAbilityMode() { - for (SuperAbilityType ability : SuperAbilityType.values()) { + public void resetSuperAbilityMode() { + for (SuperAbilityType superAbilityType : SuperAbilityType.values()) { // Correctly disable and handle any special deactivate code - new AbilityDisableTask(pluginRef,this, ability).run(); + new AbilityDisableTask(pluginRef,this, superAbilityType).run(); } } /** * Get the mode of an ability. * - * @param ability The ability to check + * @param superAbilityType The ability to check * @return true if the ability is enabled, false otherwise */ - public boolean getAbilityMode(SuperAbilityType ability) { - return abilityMode.get(ability); + public boolean getSuperAbilityMode(SuperAbilityType superAbilityType) { + return superAbilityModeMap.get(superAbilityType); } /** * Set the mode of an ability. * - * @param ability The ability to check + * @param superAbilityType The ability to check * @param isActive True if the ability is active, false otherwise */ - public void setAbilityMode(SuperAbilityType ability, boolean isActive) { - abilityMode.put(ability, isActive); + public void setSuperAbilityMode(SuperAbilityType superAbilityType, boolean isActive) { + superAbilityModeMap.put(superAbilityType, isActive); } /** * Get the informed state of an ability * - * @param ability The ability to check + * @param superAbilityType The ability to check * @return true if the ability is informed, false otherwise */ - public boolean getAbilityInformed(SuperAbilityType ability) { - return abilityInformed.get(ability); + public boolean getSuperAbilityInformed(SuperAbilityType superAbilityType) { + return superAbilityInformedMap.get(superAbilityType); } /** * Set the informed state of an ability. * - * @param ability The ability to check + * @param superAbilityType The ability to check * @param isInformed True if the ability is informed, false otherwise */ - public void setAbilityInformed(SuperAbilityType ability, boolean isInformed) { - abilityInformed.put(ability, isInformed); + public void setAbilityInformed(SuperAbilityType superAbilityType, boolean isInformed) { + superAbilityInformedMap.put(superAbilityType, isInformed); } /** * Get the current prep mode of a tool. * - * @param tool Tool to get the mode for + * @param toolType Tool to get the mode for * @return true if the tool is prepped, false otherwise */ - public boolean getToolPreparationMode(ToolType tool) { - return toolMode.get(tool); + public boolean getToolPreparationMode(ToolType toolType) { + return toolModeMap.get(toolType); } - public boolean getAbilityUse() { - return abilityUse; + public boolean getAllowAbilityUse() { + return allowAbilityUse; } public void toggleAbilityUse() { - abilityUse = !abilityUse; + allowAbilityUse = !allowAbilityUse; } /* @@ -402,11 +402,11 @@ public class McMMOPlayer { /** * Set the current prep mode of a tool. * - * @param tool Tool to set the mode for + * @param toolType Tool to set the mode for * @param isPrepared true if the tool should be prepped, false otherwise */ - public void setToolPreparationMode(ToolType tool, boolean isPrepared) { - toolMode.put(tool, isPrepared); + public void setToolPreparationMode(ToolType toolType, boolean isPrepared) { + toolModeMap.put(toolType, isPrepared); } /* @@ -901,7 +901,7 @@ public class McMMOPlayer { ToolType tool = pluginRef.getSkillTools().getPrimarySkillToolType(primarySkillType); SuperAbilityType superAbility = pluginRef.getSkillTools().getSuperAbility(primarySkillType); - if (getAbilityMode(superAbility) || !pluginRef.getSkillTools().superAbilityPermissionCheck(superAbility, player)) { + if (getSuperAbilityMode(superAbility) || !pluginRef.getSkillTools().superAbilityPermissionCheck(superAbility, player)) { return; } @@ -948,7 +948,7 @@ public class McMMOPlayer { // Enable the ability profile.setAbilityDATS(superAbility, System.currentTimeMillis() + (abilityLength * Misc.TIME_CONVERSION_FACTOR)); - setAbilityMode(superAbility, true); + setSuperAbilityMode(superAbility, true); if (superAbility == SuperAbilityType.SUPER_BREAKER || superAbility == SuperAbilityType.GIGA_DRILL_BREAKER) { pluginRef.getSkillTools().handleAbilitySpeedIncrease(player); @@ -969,12 +969,12 @@ public class McMMOPlayer { return; }*/ - if (!getAbilityUse()) { + if (!getAllowAbilityUse()) { return; } for (SuperAbilityType superAbilityType : SuperAbilityType.values()) { - if (getAbilityMode(superAbilityType)) { + if (getSuperAbilityMode(superAbilityType)) { return; } } @@ -990,7 +990,7 @@ public class McMMOPlayer { if (primarySkillType != PrimarySkillType.WOODCUTTING && primarySkillType != PrimarySkillType.AXES) { int timeRemaining = calculateTimeRemaining(ability); - if (!getAbilityMode(ability) && timeRemaining > 0) { + if (!getSuperAbilityMode(ability) && timeRemaining > 0) { pluginRef.getNotificationManager().sendPlayerInformation(player, NotificationType.ABILITY_COOLDOWN, "Skills.TooTired", String.valueOf(timeRemaining)); return; } @@ -1021,44 +1021,44 @@ public class McMMOPlayer { /* * These functions are wrapped from PlayerProfile so that we don't always have to store it alongside the McMMOPlayer object. */ - public int getSkillLevel(PrimarySkillType skill) { - return profile.getSkillLevel(skill); + public int getSkillLevel(PrimarySkillType primarySkillType) { + return profile.getSkillLevel(primarySkillType); } - public double getSkillXpLevelRaw(PrimarySkillType skill) { - return profile.getSkillXpLevelRaw(skill); + public double getSkillXpLevelRaw(PrimarySkillType primarySkillType) { + return profile.getSkillXpLevelRaw(primarySkillType); } - public int getSkillXpLevel(PrimarySkillType skill) { - return profile.getSkillXpLevel(skill); + public int getSkillXpLevel(PrimarySkillType primarySkillType) { + return profile.getSkillXpLevel(primarySkillType); } - public void setSkillXpLevel(PrimarySkillType skill, double xpLevel) { - profile.setSkillXpLevel(skill, xpLevel); + public void setSkillXpLevel(PrimarySkillType primarySkillType, double xpLevel) { + profile.setSkillXpLevel(primarySkillType, xpLevel); } - public int getXpToLevel(PrimarySkillType skill) { - return profile.getXpToLevel(skill); + public int getXpToLevel(PrimarySkillType primarySkillType) { + return profile.getXpToLevel(primarySkillType); } - public void removeXp(PrimarySkillType skill, int xp) { - profile.removeXp(skill, xp); + public void removeXp(PrimarySkillType primarySkillType, int xp) { + profile.removeXp(primarySkillType, xp); } - public void modifySkill(PrimarySkillType skill, int level) { - profile.modifySkill(skill, level); + public void modifySkill(PrimarySkillType primarySkillType, int level) { + profile.modifySkill(primarySkillType, level); } - public void addLevels(PrimarySkillType skill, int levels) { - profile.addLevels(skill, levels); + public void addLevels(PrimarySkillType primarySkillType, int levels) { + profile.addLevels(primarySkillType, levels); } - public void addXp(PrimarySkillType skill, double xp) { - profile.addXp(skill, xp); + public void addXp(PrimarySkillType primarySkillType, double xp) { + profile.addXp(primarySkillType, xp); } - public void setAbilityDATS(SuperAbilityType ability, long DATS) { - profile.setAbilityDATS(ability, DATS); + public void setAbilityDATS(SuperAbilityType superAbilityType, long DATS) { + profile.setAbilityDATS(superAbilityType, DATS); } public void resetCooldowns() { @@ -1076,7 +1076,7 @@ public class McMMOPlayer { */ public void logout(boolean syncSave) { Player thisPlayer = getPlayer(); - resetAbilityMode(); + resetSuperAbilityMode(); pluginRef.getBleedTimerTask().bleedOut(thisPlayer); cleanup(); @@ -1106,7 +1106,7 @@ public class McMMOPlayer { * Etc... */ public void cleanup() { - resetAbilityMode(); + resetSuperAbilityMode(); getTamingManager().cleanupAllSummons(); } } diff --git a/src/main/java/com/gmail/nossr50/listeners/BlockListener.java b/src/main/java/com/gmail/nossr50/listeners/BlockListener.java index 00468ece8..8febe7f8c 100644 --- a/src/main/java/com/gmail/nossr50/listeners/BlockListener.java +++ b/src/main/java/com/gmail/nossr50/listeners/BlockListener.java @@ -321,7 +321,7 @@ public class BlockListener implements Listener { ExcavationManager excavationManager = mcMMOPlayer.getExcavationManager(); excavationManager.excavationBlockCheck(blockState); - if (mcMMOPlayer.getAbilityMode(SuperAbilityType.GIGA_DRILL_BREAKER)) { + if (mcMMOPlayer.getSuperAbilityMode(SuperAbilityType.GIGA_DRILL_BREAKER)) { excavationManager.gigaDrillBreaker(blockState); } } @@ -512,11 +512,11 @@ public class BlockListener implements Listener { * * We don't need to check permissions here because they've already been checked for the ability to even activate. */ - if (mcMMOPlayer.getAbilityMode(SuperAbilityType.GREEN_TERRA) && pluginRef.getBlockTools().canMakeMossy(blockState)) { + if (mcMMOPlayer.getSuperAbilityMode(SuperAbilityType.GREEN_TERRA) && pluginRef.getBlockTools().canMakeMossy(blockState)) { if (mcMMOPlayer.getHerbalismManager().processGreenTerraBlockConversion(blockState)) { blockState.update(true); } - } else if (mcMMOPlayer.getAbilityMode(SuperAbilityType.BERSERK) && heldItem.getType() == Material.AIR) { + } else if (mcMMOPlayer.getSuperAbilityMode(SuperAbilityType.BERSERK) && heldItem.getType() == Material.AIR) { if (pluginRef.getSkillTools().superAbilityBlockCheck(SuperAbilityType.BERSERK, block.getState()) && pluginRef.getEventManager().simulateBlockBreak(block, player, true)) { event.setInstaBreak(true); diff --git a/src/main/java/com/gmail/nossr50/runnables/skills/AbilityCooldownTask.java b/src/main/java/com/gmail/nossr50/runnables/skills/AbilityCooldownTask.java index 36782ae4e..6cf658a17 100644 --- a/src/main/java/com/gmail/nossr50/runnables/skills/AbilityCooldownTask.java +++ b/src/main/java/com/gmail/nossr50/runnables/skills/AbilityCooldownTask.java @@ -19,7 +19,7 @@ public class AbilityCooldownTask extends BukkitRunnable { @Override public void run() { - if (!mcMMOPlayer.getPlayer().isOnline() || mcMMOPlayer.getAbilityInformed(ability)) { + if (!mcMMOPlayer.getPlayer().isOnline() || mcMMOPlayer.getSuperAbilityInformed(ability)) { return; } diff --git a/src/main/java/com/gmail/nossr50/runnables/skills/AbilityDisableTask.java b/src/main/java/com/gmail/nossr50/runnables/skills/AbilityDisableTask.java index f99ef8b6c..f9917fd36 100644 --- a/src/main/java/com/gmail/nossr50/runnables/skills/AbilityDisableTask.java +++ b/src/main/java/com/gmail/nossr50/runnables/skills/AbilityDisableTask.java @@ -24,7 +24,7 @@ public class AbilityDisableTask extends BukkitRunnable { @Override public void run() { - if (!mcMMOPlayer.getAbilityMode(superAbilityType)) { + if (!mcMMOPlayer.getSuperAbilityMode(superAbilityType)) { return; } @@ -46,7 +46,7 @@ public class AbilityDisableTask extends BukkitRunnable { pluginRef.getEventManager().callAbilityDeactivateEvent(player, superAbilityType); - mcMMOPlayer.setAbilityMode(superAbilityType, false); + mcMMOPlayer.setSuperAbilityMode(superAbilityType, false); mcMMOPlayer.setAbilityInformed(superAbilityType, false); if (mcMMOPlayer.useChatNotifications()) { 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 56a719978..bd5fba7b3 100644 --- a/src/main/java/com/gmail/nossr50/skills/axes/AxesManager.java +++ b/src/main/java/com/gmail/nossr50/skills/axes/AxesManager.java @@ -59,7 +59,7 @@ public class AxesManager extends SkillManager { if (!pluginRef.getRankTools().hasUnlockedSubskill(getPlayer(), SubSkillType.AXES_SKULL_SPLITTER)) return false; - return target.isValid() && mcMMOPlayer.getAbilityMode(SuperAbilityType.SKULL_SPLITTER) && pluginRef.getPermissionTools().skullSplitter(getPlayer()); + return target.isValid() && mcMMOPlayer.getSuperAbilityMode(SuperAbilityType.SKULL_SPLITTER) && pluginRef.getPermissionTools().skullSplitter(getPlayer()); } public boolean canActivateAbility() { 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 d57a84223..5feca446e 100644 --- a/src/main/java/com/gmail/nossr50/skills/herbalism/HerbalismManager.java +++ b/src/main/java/com/gmail/nossr50/skills/herbalism/HerbalismManager.java @@ -80,7 +80,7 @@ public class HerbalismManager extends SkillManager { } public boolean canGreenTerraBlock(BlockState blockState) { - return mcMMOPlayer.getAbilityMode(SuperAbilityType.GREEN_TERRA) && pluginRef.getBlockTools().canMakeMossy(blockState); + return mcMMOPlayer.getSuperAbilityMode(SuperAbilityType.GREEN_TERRA) && pluginRef.getBlockTools().canMakeMossy(blockState); } public boolean canActivateAbility() { @@ -88,7 +88,7 @@ public class HerbalismManager extends SkillManager { } public boolean isGreenTerraActive() { - return mcMMOPlayer.getAbilityMode(SuperAbilityType.GREEN_TERRA); + return mcMMOPlayer.getSuperAbilityMode(SuperAbilityType.GREEN_TERRA); } /** @@ -283,7 +283,7 @@ public class HerbalismManager extends SkillManager { public void markForBonusDrops(BlockState brokenPlantState) { //Add metadata to mark this block for double or triple drops - boolean awardTriple = mcMMOPlayer.getAbilityMode(SuperAbilityType.GREEN_TERRA); + boolean awardTriple = mcMMOPlayer.getSuperAbilityMode(SuperAbilityType.GREEN_TERRA); pluginRef.getBlockTools().markDropsAsBonus(brokenPlantState, awardTriple); } 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 43db928b9..fea5feb78 100644 --- a/src/main/java/com/gmail/nossr50/skills/mining/MiningManager.java +++ b/src/main/java/com/gmail/nossr50/skills/mining/MiningManager.java @@ -87,7 +87,7 @@ public class MiningManager extends SkillManager { applyXpGain(miningBehaviour.getBlockXp(blockState), XPGainReason.PVE); - if (mcMMOPlayer.getAbilityMode(skill.getSuperAbility())) { + if (mcMMOPlayer.getSuperAbilityMode(skill.getSuperAbility())) { pluginRef.getSkillTools().handleDurabilityChange(getPlayer().getInventory().getItemInMainHand(), pluginRef.getConfigManager().getConfigSuperAbilities().getSuperAbilityLimits().getToolDurabilityDamage()); } @@ -101,7 +101,7 @@ public class MiningManager extends SkillManager { //TODO: Make this readable if (pluginRef.getRandomChanceTools().checkRandomChanceExecutionSuccess(getPlayer(), SubSkillType.MINING_DOUBLE_DROPS)) { - pluginRef.getBlockTools().markDropsAsBonus(blockState, mcMMOPlayer.getAbilityMode(skill.getSuperAbility())); + pluginRef.getBlockTools().markDropsAsBonus(blockState, mcMMOPlayer.getSuperAbilityMode(skill.getSuperAbility())); } } 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 bdedcfe75..ee070bcf3 100644 --- a/src/main/java/com/gmail/nossr50/skills/swords/SwordsManager.java +++ b/src/main/java/com/gmail/nossr50/skills/swords/SwordsManager.java @@ -45,7 +45,7 @@ public class SwordsManager extends SkillManager { if (!pluginRef.getRankTools().hasUnlockedSubskill(getPlayer(), SubSkillType.SWORDS_SERRATED_STRIKES)) return false; - return mcMMOPlayer.getAbilityMode(SuperAbilityType.SERRATED_STRIKES); + return mcMMOPlayer.getSuperAbilityMode(SuperAbilityType.SERRATED_STRIKES); } /** 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 0518e34db..864624d45 100644 --- a/src/main/java/com/gmail/nossr50/skills/unarmed/UnarmedManager.java +++ b/src/main/java/com/gmail/nossr50/skills/unarmed/UnarmedManager.java @@ -47,7 +47,7 @@ public class UnarmedManager extends SkillManager { } public boolean canUseBerserk() { - return mcMMOPlayer.getAbilityMode(SuperAbilityType.BERSERK); + return mcMMOPlayer.getSuperAbilityMode(SuperAbilityType.BERSERK); } public boolean canDisarm(LivingEntity target) { 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 ccb0cbf18..2e9b52743 100644 --- a/src/main/java/com/gmail/nossr50/skills/woodcutting/WoodcuttingManager.java +++ b/src/main/java/com/gmail/nossr50/skills/woodcutting/WoodcuttingManager.java @@ -41,7 +41,7 @@ public class WoodcuttingManager extends SkillManager { } public boolean canUseTreeFeller(ItemStack heldItem) { - return mcMMOPlayer.getAbilityMode(SuperAbilityType.TREE_FELLER) + return mcMMOPlayer.getSuperAbilityMode(SuperAbilityType.TREE_FELLER) && pluginRef.getItemTools().isAxe(heldItem); }