EpicKnarvik97/mcMMO
1
0
Fork 0
mirror of https://github.com/mcMMO-Dev/mcMMO.git synced 2025-08-03 04:55:28 +02:00
Code Issues Projects Releases Wiki Activity

Use OnlineMMOPlayer over McMMOPlayer

Browse Source
This commit is contained in:
nossr50
2020-12-22 13:43:12 -08:00
parent 573d9d014e
commit b7f713a50f
119 changed files with 460 additions and 460 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
src/main/java/com/gmail/nossr50/commands/skills/AcrobaticsCommand.java
View File

@@ -1,6 +1,6 @@
package com.gmail.nossr50.commands.skills;
import com.gmail.nossr50.datatypes.player.McMMOPlayer;
import com.neetgames.mcmmo.player.OnlineMMOPlayer;
import com.gmail.nossr50.datatypes.skills.PrimarySkillType;
import com.gmail.nossr50.datatypes.skills.SubSkillType;
import com.gmail.nossr50.datatypes.skills.subskills.AbstractSubSkill;
@@ -28,7 +28,7 @@ public class AcrobaticsCommand extends SkillCommand {
}
@Override
protected void dataCalculations(@NotNull McMMOPlayer mmoPlayer, float skillValue) {
protected void dataCalculations(@NotNull OnlineMMOPlayer mmoPlayer, float skillValue) {
// ACROBATICS_DODGE
if (canDodge) {
String[] dodgeStrings = getAbilityDisplayValues(SkillActivationType.RANDOM_LINEAR_100_SCALE_WITH_CAP, mmoPlayer, SubSkillType.ACROBATICS_DODGE);
@@ -38,13 +38,13 @@ public class AcrobaticsCommand extends SkillCommand {
}
@Override
protected void permissionsCheck(@NotNull McMMOPlayer mmoPlayer) {
protected void permissionsCheck(@NotNull OnlineMMOPlayer mmoPlayer) {
canDodge = canUseSubskill(mmoPlayer, SubSkillType.ACROBATICS_DODGE);
canRoll = canUseSubskill(mmoPlayer, SubSkillType.ACROBATICS_ROLL);
}
@Override
protected @NotNull List<String> statsDisplay(@NotNull McMMOPlayer mmoPlayer, float skillValue, boolean hasEndurance, boolean isLucky) {
protected @NotNull List<String> statsDisplay(@NotNull OnlineMMOPlayer mmoPlayer, float skillValue, boolean hasEndurance, boolean isLucky) {
List<String> messages = new ArrayList<>();
if (canDodge) {
@@ -90,7 +90,7 @@ public class AcrobaticsCommand extends SkillCommand {
}
@Override
protected @NotNull List<Component> getTextComponents(@NotNull McMMOPlayer mmoPlayer) {
protected @NotNull List<Component> getTextComponents(@NotNull OnlineMMOPlayer mmoPlayer) {
List<Component> textComponents = new ArrayList<>();
TextComponentFactory.getSubSkillTextComponents(mmoPlayer, textComponents, PrimarySkillType.ACROBATICS);

14
src/main/java/com/gmail/nossr50/commands/skills/AlchemyCommand.java
View File

@@ -1,6 +1,6 @@
package com.gmail.nossr50.commands.skills;
import com.gmail.nossr50.datatypes.player.McMMOPlayer;
import com.neetgames.mcmmo.player.OnlineMMOPlayer;
import com.gmail.nossr50.datatypes.skills.PrimarySkillType;
import com.gmail.nossr50.datatypes.skills.SubSkillType;
import com.gmail.nossr50.locale.LocaleLoader;
@@ -33,7 +33,7 @@ public class AlchemyCommand extends SkillCommand {
protected String[] calculateAbilityDisplayValues(@NotNull Player player) {
//TODO: Needed?
McMMOPlayer mmoPlayer = mcMMO.getUserManager().queryPlayer(player);
OnlineMMOPlayer mmoPlayer = mcMMO.getUserManager().queryPlayer(player);
if(mmoPlayer == null)
{
player.sendMessage(LocaleLoader.getString("Profile.PendingLoad"));
@@ -43,7 +43,7 @@ public class AlchemyCommand extends SkillCommand {
return calculateAbilityDisplayValues(mmoPlayer);
}
protected String[] calculateAbilityDisplayValues(@NotNull McMMOPlayer mmoPlayer) {
protected String[] calculateAbilityDisplayValues(@NotNull OnlineMMOPlayer mmoPlayer) {
AlchemyManager alchemyManager = mmoPlayer.getAlchemyManager();
String[] displayValues = new String[2];
@@ -57,7 +57,7 @@ public class AlchemyCommand extends SkillCommand {
@Override
protected void dataCalculations(@NotNull McMMOPlayer mmoPlayer, float skillValue) {
protected void dataCalculations(@NotNull OnlineMMOPlayer mmoPlayer, float skillValue) {
// ALCHEMY_CATALYSIS
if (canCatalysis) {
String[] catalysisStrings = calculateAbilityDisplayValues(mmoPlayer.getPlayer());
@@ -75,13 +75,13 @@ public class AlchemyCommand extends SkillCommand {
}
@Override
protected void permissionsCheck(@NotNull McMMOPlayer mmoPlayer) {
protected void permissionsCheck(@NotNull OnlineMMOPlayer mmoPlayer) {
canCatalysis = canUseSubskill(mmoPlayer, SubSkillType.ALCHEMY_CATALYSIS);
canConcoctions = canUseSubskill(mmoPlayer, SubSkillType.ALCHEMY_CONCOCTIONS);
}
@Override
protected @NotNull List<String> statsDisplay(@NotNull McMMOPlayer mmoPlayer, float skillValue, boolean hasEndurance, boolean isLucky) {
protected @NotNull List<String> statsDisplay(@NotNull OnlineMMOPlayer mmoPlayer, float skillValue, boolean hasEndurance, boolean isLucky) {
List<String> messages = new ArrayList<>();
if (canCatalysis) {
@@ -101,7 +101,7 @@ public class AlchemyCommand extends SkillCommand {
}
@Override
protected @NotNull List<Component> getTextComponents(@NotNull McMMOPlayer mmoPlayer) {
protected @NotNull List<Component> getTextComponents(@NotNull OnlineMMOPlayer mmoPlayer) {
List<Component> textComponents = new ArrayList<>();
TextComponentFactory.getSubSkillTextComponents(mmoPlayer, textComponents, PrimarySkillType.ALCHEMY);

10
src/main/java/com/gmail/nossr50/commands/skills/ArcheryCommand.java
View File

@@ -1,6 +1,6 @@
package com.gmail.nossr50.commands.skills;
import com.gmail.nossr50.datatypes.player.McMMOPlayer;
import com.neetgames.mcmmo.player.OnlineMMOPlayer;
import com.gmail.nossr50.datatypes.skills.PrimarySkillType;
import com.gmail.nossr50.datatypes.skills.SubSkillType;
import com.gmail.nossr50.locale.LocaleLoader;
@@ -30,7 +30,7 @@ public class ArcheryCommand extends SkillCommand {
}
@Override
protected void dataCalculations(@NotNull McMMOPlayer mmoPlayer, float skillValue) {
protected void dataCalculations(@NotNull OnlineMMOPlayer mmoPlayer, float skillValue) {
// ARCHERY_ARROW_RETRIEVAL
if (canRetrieve) {
String[] retrieveStrings = getAbilityDisplayValues(SkillActivationType.RANDOM_LINEAR_100_SCALE_WITH_CAP, mmoPlayer, SubSkillType.ARCHERY_ARROW_RETRIEVAL);
@@ -52,14 +52,14 @@ public class ArcheryCommand extends SkillCommand {
}
@Override
protected void permissionsCheck(@NotNull McMMOPlayer mmoPlayer) {
protected void permissionsCheck(@NotNull OnlineMMOPlayer mmoPlayer) {
canSkillShot = canUseSubskill(mmoPlayer, SubSkillType.ARCHERY_SKILL_SHOT);
canDaze = canUseSubskill(mmoPlayer, SubSkillType.ARCHERY_DAZE);
canRetrieve = canUseSubskill(mmoPlayer, SubSkillType.ARCHERY_ARROW_RETRIEVAL);
}
@Override
protected @NotNull List<String> statsDisplay(@NotNull McMMOPlayer mmoPlayer, float skillValue, boolean hasEndurance, boolean isLucky) {
protected @NotNull List<String> statsDisplay(@NotNull OnlineMMOPlayer mmoPlayer, float skillValue, boolean hasEndurance, boolean isLucky) {
List<String> messages = new ArrayList<>();
if (canRetrieve) {
@@ -85,7 +85,7 @@ public class ArcheryCommand extends SkillCommand {
}
@Override
protected @NotNull List<Component> getTextComponents(@NotNull McMMOPlayer mmoPlayer) {
protected @NotNull List<Component> getTextComponents(@NotNull OnlineMMOPlayer mmoPlayer) {
List<Component> textComponents = new ArrayList<>();
TextComponentFactory.getSubSkillTextComponents(mmoPlayer, textComponents, PrimarySkillType.ARCHERY);

10
src/main/java/com/gmail/nossr50/commands/skills/AxesCommand.java
View File

@@ -1,6 +1,6 @@
package com.gmail.nossr50.commands.skills;
import com.gmail.nossr50.datatypes.player.McMMOPlayer;
import com.neetgames.mcmmo.player.OnlineMMOPlayer;
import com.gmail.nossr50.datatypes.skills.PrimarySkillType;
import com.gmail.nossr50.datatypes.skills.SubSkillType;
import com.gmail.nossr50.locale.LocaleLoader;
@@ -35,7 +35,7 @@ public class AxesCommand extends SkillCommand {
}
@Override
protected void dataCalculations(@NotNull McMMOPlayer mmoPlayer, float skillValue) {
protected void dataCalculations(@NotNull OnlineMMOPlayer mmoPlayer, float skillValue) {
// ARMOR IMPACT
if (canImpact) {
impactDamage = mmoPlayer.getAxesManager().getImpactDurabilityDamage();
@@ -62,7 +62,7 @@ public class AxesCommand extends SkillCommand {
}
@Override
protected void permissionsCheck(@NotNull McMMOPlayer mmoPlayer) {
protected void permissionsCheck(@NotNull OnlineMMOPlayer mmoPlayer) {
canSkullSplitter = Permissions.skullSplitter(mmoPlayer.getPlayer()) && RankUtils.hasUnlockedSubskill(mmoPlayer, SubSkillType.AXES_SKULL_SPLITTER);
canCritical = canUseSubskill(mmoPlayer, SubSkillType.AXES_CRITICAL_STRIKES);
canAxeMastery = canUseSubskill(mmoPlayer, SubSkillType.AXES_AXE_MASTERY);
@@ -71,7 +71,7 @@ public class AxesCommand extends SkillCommand {
}
@Override
protected @NotNull List<String> statsDisplay(@NotNull McMMOPlayer mmoPlayer, float skillValue, boolean hasEndurance, boolean isLucky) {
protected @NotNull List<String> statsDisplay(@NotNull OnlineMMOPlayer mmoPlayer, float skillValue, boolean hasEndurance, boolean isLucky) {
List<String> messages = new ArrayList<>();
if (canImpact) {
@@ -105,7 +105,7 @@ public class AxesCommand extends SkillCommand {
}
@Override
protected @NotNull List<Component> getTextComponents(@NotNull McMMOPlayer mmoPlayer) {
protected @NotNull List<Component> getTextComponents(@NotNull OnlineMMOPlayer mmoPlayer) {
List<Component> textComponents = new ArrayList<>();
TextComponentFactory.getSubSkillTextComponents(mmoPlayer, textComponents, PrimarySkillType.AXES);

10
src/main/java/com/gmail/nossr50/commands/skills/CrossbowsCommand.java
View File

@@ -1,6 +1,6 @@
package com.gmail.nossr50.commands.skills;
import com.gmail.nossr50.datatypes.player.McMMOPlayer;
import com.neetgames.mcmmo.player.OnlineMMOPlayer;
import com.gmail.nossr50.datatypes.skills.PrimarySkillType;
import com.gmail.nossr50.datatypes.skills.SubSkillType;
import com.gmail.nossr50.skills.crossbows.CrossbowManager;
@@ -17,17 +17,17 @@ public class CrossbowsCommand extends SkillCommand {
}
@Override
protected void dataCalculations(@NotNull McMMOPlayer mmoPlayer, float skillValue) {
protected void dataCalculations(@NotNull OnlineMMOPlayer mmoPlayer, float skillValue) {
}
@Override
protected void permissionsCheck(@NotNull McMMOPlayer mmoPlayer) {
protected void permissionsCheck(@NotNull OnlineMMOPlayer mmoPlayer) {
}
@Override
protected @NotNull List<String> statsDisplay(@NotNull McMMOPlayer mmoPlayer, float skillValue, boolean hasEndurance, boolean isLucky) {
protected @NotNull List<String> statsDisplay(@NotNull OnlineMMOPlayer mmoPlayer, float skillValue, boolean hasEndurance, boolean isLucky) {
List<String> messages = new ArrayList<>();
CrossbowManager crossbowManager = mmoPlayer.getCrossbowManager();
@@ -41,7 +41,7 @@ public class CrossbowsCommand extends SkillCommand {
}
@Override
protected List<Component> getTextComponents(@NotNull McMMOPlayer mmoPlayer) {
protected List<Component> getTextComponents(@NotNull OnlineMMOPlayer mmoPlayer) {
List<Component> textComponents = new ArrayList<>();
TextComponentFactory.getSubSkillTextComponents(mmoPlayer, textComponents, PrimarySkillType.CROSSBOWS);

10
src/main/java/com/gmail/nossr50/commands/skills/ExcavationCommand.java
View File

@@ -1,6 +1,6 @@
package com.gmail.nossr50.commands.skills;
import com.gmail.nossr50.datatypes.player.McMMOPlayer;
import com.neetgames.mcmmo.player.OnlineMMOPlayer;
import com.gmail.nossr50.datatypes.skills.PrimarySkillType;
import com.gmail.nossr50.datatypes.skills.SubSkillType;
import com.gmail.nossr50.locale.LocaleLoader;
@@ -26,7 +26,7 @@ public class ExcavationCommand extends SkillCommand {
}
@Override
protected void dataCalculations(@NotNull McMMOPlayer mmoPlayer, float skillValue) {
protected void dataCalculations(@NotNull OnlineMMOPlayer mmoPlayer, float skillValue) {
// GIGA DRILL BREAKER
if (canGigaDrill) {
String[] gigaDrillStrings = calculateLengthDisplayValues(mmoPlayer, skillValue);
@@ -36,13 +36,13 @@ public class ExcavationCommand extends SkillCommand {
}
@Override
protected void permissionsCheck(@NotNull McMMOPlayer mmoPlayer) {
protected void permissionsCheck(@NotNull OnlineMMOPlayer mmoPlayer) {
canGigaDrill = Permissions.gigaDrillBreaker(mmoPlayer.getPlayer()) && RankUtils.hasUnlockedSubskill(mmoPlayer, SubSkillType.EXCAVATION_GIGA_DRILL_BREAKER);
canTreasureHunt = canUseSubskill(mmoPlayer, SubSkillType.EXCAVATION_ARCHAEOLOGY);
}
@Override
protected @NotNull List<String> statsDisplay(@NotNull McMMOPlayer mmoPlayer, float skillValue, boolean hasEndurance, boolean isLucky) {
protected @NotNull List<String> statsDisplay(@NotNull OnlineMMOPlayer mmoPlayer, float skillValue, boolean hasEndurance, boolean isLucky) {
List<String> messages = new ArrayList<>();
ExcavationManager excavationManager = mmoPlayer.getExcavationManager();
@@ -66,7 +66,7 @@ public class ExcavationCommand extends SkillCommand {
}
@Override
protected @NotNull List<Component> getTextComponents(@NotNull McMMOPlayer mmoPlayer) {
protected @NotNull List<Component> getTextComponents(@NotNull OnlineMMOPlayer mmoPlayer) {
List<Component> textComponents = new ArrayList<>();
TextComponentFactory.getSubSkillTextComponents(mmoPlayer, textComponents, PrimarySkillType.EXCAVATION);

10
src/main/java/com/gmail/nossr50/commands/skills/FishingCommand.java
View File

@@ -1,7 +1,7 @@
package com.gmail.nossr50.commands.skills;
import com.gmail.nossr50.config.treasure.TreasureConfig;
import com.gmail.nossr50.datatypes.player.McMMOPlayer;
import com.neetgames.mcmmo.player.OnlineMMOPlayer;
import com.gmail.nossr50.datatypes.skills.PrimarySkillType;
import com.gmail.nossr50.datatypes.skills.SubSkillType;
import com.gmail.nossr50.datatypes.treasure.Rarity;
@@ -47,7 +47,7 @@ public class FishingCommand extends SkillCommand {
}
@Override
protected void dataCalculations(@NotNull McMMOPlayer mmoPlayer, float skillValue) {
protected void dataCalculations(@NotNull OnlineMMOPlayer mmoPlayer, float skillValue) {
FishingManager fishingManager = mmoPlayer.getFishingManager();
// TREASURE HUNTER
@@ -97,7 +97,7 @@ public class FishingCommand extends SkillCommand {
}
@Override
protected void permissionsCheck(@NotNull McMMOPlayer mmoPlayer) {
protected void permissionsCheck(@NotNull OnlineMMOPlayer mmoPlayer) {
canTreasureHunt = canUseSubskill(mmoPlayer, SubSkillType.FISHING_TREASURE_HUNTER);
canMagicHunt = canUseSubskill(mmoPlayer, SubSkillType.FISHING_MAGIC_HUNTER) && canUseSubskill(mmoPlayer, SubSkillType.FISHING_TREASURE_HUNTER);
canShake = canUseSubskill(mmoPlayer, SubSkillType.FISHING_SHAKE);
@@ -107,7 +107,7 @@ public class FishingCommand extends SkillCommand {
}
@Override
protected @NotNull List<String> statsDisplay(@NotNull McMMOPlayer mmoPlayer, float skillValue, boolean hasEndurance, boolean isLucky) {
protected @NotNull List<String> statsDisplay(@NotNull OnlineMMOPlayer mmoPlayer, float skillValue, boolean hasEndurance, boolean isLucky) {
List<String> messages = new ArrayList<>();
if (canFishermansDiet) {
@@ -152,7 +152,7 @@ public class FishingCommand extends SkillCommand {
}
@Override
protected @NotNull List<Component> getTextComponents(@NotNull McMMOPlayer mmoPlayer) {
protected @NotNull List<Component> getTextComponents(@NotNull OnlineMMOPlayer mmoPlayer) {
List<Component> textComponents = new ArrayList<>();
TextComponentFactory.getSubSkillTextComponents(mmoPlayer, textComponents, PrimarySkillType.FISHING);

10
src/main/java/com/gmail/nossr50/commands/skills/HerbalismCommand.java
View File

@@ -1,6 +1,6 @@
package com.gmail.nossr50.commands.skills;
import com.gmail.nossr50.datatypes.player.McMMOPlayer;
import com.neetgames.mcmmo.player.OnlineMMOPlayer;
import com.gmail.nossr50.datatypes.skills.PrimarySkillType;
import com.gmail.nossr50.datatypes.skills.SubSkillType;
import com.gmail.nossr50.locale.LocaleLoader;
@@ -42,7 +42,7 @@ public class HerbalismCommand extends SkillCommand {
}
@Override
protected void dataCalculations(@NotNull McMMOPlayer mmoPlayer, float skillValue) {
protected void dataCalculations(@NotNull OnlineMMOPlayer mmoPlayer, float skillValue) {
// DOUBLE DROPS
if (canDoubleDrop) {
@@ -88,7 +88,7 @@ public class HerbalismCommand extends SkillCommand {
}
@Override
protected void permissionsCheck(@NotNull McMMOPlayer mmoPlayer) {
protected void permissionsCheck(@NotNull OnlineMMOPlayer mmoPlayer) {
hasHylianLuck = canUseSubskill(mmoPlayer, SubSkillType.HERBALISM_HYLIAN_LUCK);
canGreenTerra = Permissions.greenTerra(mmoPlayer.getPlayer());
canGreenThumbPlants = RankUtils.hasUnlockedSubskill(mmoPlayer, SubSkillType.HERBALISM_GREEN_THUMB)
@@ -109,7 +109,7 @@ public class HerbalismCommand extends SkillCommand {
}
@Override
protected @NotNull List<String> statsDisplay(@NotNull McMMOPlayer mmoPlayer, float skillValue, boolean hasEndurance, boolean isLucky) {
protected @NotNull List<String> statsDisplay(@NotNull OnlineMMOPlayer mmoPlayer, float skillValue, boolean hasEndurance, boolean isLucky) {
List<String> messages = new ArrayList<>();
if (canDoubleDrop) {
@@ -152,7 +152,7 @@ public class HerbalismCommand extends SkillCommand {
}
@Override
protected @NotNull List<Component> getTextComponents(@NotNull McMMOPlayer mmoPlayer) {
protected @NotNull List<Component> getTextComponents(@NotNull OnlineMMOPlayer mmoPlayer) {
List<Component> textComponents = new ArrayList<>();
TextComponentFactory.getSubSkillTextComponents(mmoPlayer, textComponents, PrimarySkillType.HERBALISM);

10
src/main/java/com/gmail/nossr50/commands/skills/MiningCommand.java
View File

@@ -1,6 +1,6 @@
package com.gmail.nossr50.commands.skills;
import com.gmail.nossr50.datatypes.player.McMMOPlayer;
import com.neetgames.mcmmo.player.OnlineMMOPlayer;
import com.gmail.nossr50.datatypes.skills.PrimarySkillType;
import com.gmail.nossr50.datatypes.skills.SubSkillType;
import com.gmail.nossr50.locale.LocaleLoader;
@@ -39,7 +39,7 @@ public class MiningCommand extends SkillCommand {
}
@Override
protected void dataCalculations(@NotNull McMMOPlayer mmoPlayer, float skillValue) {
protected void dataCalculations(@NotNull OnlineMMOPlayer mmoPlayer, float skillValue) {
// BLAST MINING
if (canBlast || canDemoExpert || canBiggerBombs) {
MiningManager miningManager = mmoPlayer.getMiningManager();
@@ -68,7 +68,7 @@ public class MiningCommand extends SkillCommand {
}
@Override
protected void permissionsCheck(@NotNull McMMOPlayer mmoPlayer) {
protected void permissionsCheck(@NotNull OnlineMMOPlayer mmoPlayer) {
canBiggerBombs = RankUtils.hasUnlockedSubskill(mmoPlayer, SubSkillType.MINING_BIGGER_BOMBS) && Permissions.biggerBombs(mmoPlayer.getPlayer());
canBlast = RankUtils.hasUnlockedSubskill(mmoPlayer, SubSkillType.MINING_BLAST_MINING) && Permissions.remoteDetonation(mmoPlayer.getPlayer());
canDemoExpert = RankUtils.hasUnlockedSubskill(mmoPlayer, SubSkillType.MINING_DEMOLITIONS_EXPERTISE) && Permissions.demolitionsExpertise(mmoPlayer.getPlayer());
@@ -77,7 +77,7 @@ public class MiningCommand extends SkillCommand {
}
@Override
protected @NotNull List<String> statsDisplay(@NotNull McMMOPlayer mmoPlayer, float skillValue, boolean hasEndurance, boolean isLucky) {
protected @NotNull List<String> statsDisplay(@NotNull OnlineMMOPlayer mmoPlayer, float skillValue, boolean hasEndurance, boolean isLucky) {
List<String> messages = new ArrayList<>();
if (canBiggerBombs) {
@@ -111,7 +111,7 @@ public class MiningCommand extends SkillCommand {
}
@Override
protected @NotNull List<Component> getTextComponents(@NotNull McMMOPlayer mmoPlayer) {
protected @NotNull List<Component> getTextComponents(@NotNull OnlineMMOPlayer mmoPlayer) {
List<Component> textComponents = new ArrayList<>();
TextComponentFactory.getSubSkillTextComponents(mmoPlayer, textComponents, PrimarySkillType.MINING);

6
src/main/java/com/gmail/nossr50/commands/skills/MmoInfoCommand.java
View File

@@ -1,6 +1,6 @@
package com.gmail.nossr50.commands.skills;
import com.gmail.nossr50.datatypes.player.McMMOPlayer;
import com.neetgames.mcmmo.player.OnlineMMOPlayer;
import com.gmail.nossr50.datatypes.skills.PrimarySkillType;
import com.gmail.nossr50.datatypes.skills.SubSkillType;
import com.gmail.nossr50.datatypes.skills.subskills.AbstractSubSkill;
@@ -36,7 +36,7 @@ public class MmoInfoCommand implements TabExecutor {
return false;
Player player = (Player) commandSender;
McMMOPlayer mmoPlayer = mcMMO.getUserManager().queryPlayer(player);
OnlineMMOPlayer mmoPlayer = mcMMO.getUserManager().queryPlayer(player);
if(mmoPlayer == null) {
player.sendMessage(LocaleLoader.getString("Commands.NotLoaded"));
@@ -78,7 +78,7 @@ public class MmoInfoCommand implements TabExecutor {
return ImmutableList.of();
}
private void displayInfo(@NotNull McMMOPlayer mmoPlayer, String subSkillName)
private void displayInfo(@NotNull OnlineMMOPlayer mmoPlayer, String subSkillName)
{
//Check to see if the skill exists in the new system
AbstractSubSkill abstractSubSkill = InteractionManager.getAbstractByName(subSkillName);

10
src/main/java/com/gmail/nossr50/commands/skills/RepairCommand.java
View File

@@ -1,6 +1,6 @@
package com.gmail.nossr50.commands.skills;
import com.gmail.nossr50.datatypes.player.McMMOPlayer;
import com.neetgames.mcmmo.player.OnlineMMOPlayer;
import com.gmail.nossr50.datatypes.skills.MaterialType;
import com.gmail.nossr50.datatypes.skills.PrimarySkillType;
import com.gmail.nossr50.datatypes.skills.SubSkillType;
@@ -48,7 +48,7 @@ public class RepairCommand extends SkillCommand {
}
@Override
protected void dataCalculations(@NotNull McMMOPlayer mmoPlayer, float skillValue) {
protected void dataCalculations(@NotNull OnlineMMOPlayer mmoPlayer, float skillValue) {
// We're using pickaxes here, not the best but it works
Repairable diamondRepairable = mcMMO.getRepairableManager().getRepairable(Material.DIAMOND_PICKAXE);
Repairable goldRepairable = mcMMO.getRepairableManager().getRepairable(Material.GOLDEN_PICKAXE);
@@ -75,7 +75,7 @@ public class RepairCommand extends SkillCommand {
}
@Override
protected void permissionsCheck(@NotNull McMMOPlayer mmoPlayer) {
protected void permissionsCheck(@NotNull OnlineMMOPlayer mmoPlayer) {
canSuperRepair = canUseSubskill(mmoPlayer, SubSkillType.REPAIR_SUPER_REPAIR);
canMasterRepair = canUseSubskill(mmoPlayer, SubSkillType.REPAIR_REPAIR_MASTERY);
canArcaneForge = canUseSubskill(mmoPlayer, SubSkillType.REPAIR_ARCANE_FORGING);
@@ -90,7 +90,7 @@ public class RepairCommand extends SkillCommand {
}
@Override
protected @NotNull List<String> statsDisplay(@NotNull McMMOPlayer mmoPlayer, float skillValue, boolean hasEndurance, boolean isLucky) {
protected @NotNull List<String> statsDisplay(@NotNull OnlineMMOPlayer mmoPlayer, float skillValue, boolean hasEndurance, boolean isLucky) {
List<String> messages = new ArrayList<>();
if (canArcaneForge) {
@@ -121,7 +121,7 @@ public class RepairCommand extends SkillCommand {
}
@Override
protected @NotNull List<Component> getTextComponents(@NotNull McMMOPlayer mmoPlayer) {
protected @NotNull List<Component> getTextComponents(@NotNull OnlineMMOPlayer mmoPlayer) {
List<Component> textComponents = new ArrayList<>();
TextComponentFactory.getSubSkillTextComponents(mmoPlayer, textComponents, PrimarySkillType.REPAIR);

10
src/main/java/com/gmail/nossr50/commands/skills/SalvageCommand.java
View File

@@ -1,6 +1,6 @@
package com.gmail.nossr50.commands.skills;
import com.gmail.nossr50.datatypes.player.McMMOPlayer;
import com.neetgames.mcmmo.player.OnlineMMOPlayer;
import com.gmail.nossr50.datatypes.skills.PrimarySkillType;
import com.gmail.nossr50.datatypes.skills.SubSkillType;
import com.gmail.nossr50.locale.LocaleLoader;
@@ -23,19 +23,19 @@ public class SalvageCommand extends SkillCommand {
}
@Override
protected void dataCalculations(@NotNull McMMOPlayer mmoPlayer, float skillValue) {
protected void dataCalculations(@NotNull OnlineMMOPlayer mmoPlayer, float skillValue) {
// TODO Auto-generated method stub
}
@Override
protected void permissionsCheck(@NotNull McMMOPlayer mmoPlayer) {
protected void permissionsCheck(@NotNull OnlineMMOPlayer mmoPlayer) {
canScrapCollector = canUseSubskill(mmoPlayer, SubSkillType.SALVAGE_SCRAP_COLLECTOR);
canArcaneSalvage = canUseSubskill(mmoPlayer, SubSkillType.SALVAGE_ARCANE_SALVAGE);
}
@Override
protected @NotNull List<String> statsDisplay(@NotNull McMMOPlayer mmoPlayer, float skillValue, boolean hasEndurance, boolean isLucky) {
protected @NotNull List<String> statsDisplay(@NotNull OnlineMMOPlayer mmoPlayer, float skillValue, boolean hasEndurance, boolean isLucky) {
List<String> messages = new ArrayList<>();
SalvageManager salvageManager = mmoPlayer.getSalvageManager();
@@ -64,7 +64,7 @@ public class SalvageCommand extends SkillCommand {
}
@Override
protected @NotNull List<Component> getTextComponents(@NotNull McMMOPlayer mmoPlayer) {
protected @NotNull List<Component> getTextComponents(@NotNull OnlineMMOPlayer mmoPlayer) {
List<Component> textComponents = new ArrayList<>();
TextComponentFactory.getSubSkillTextComponents(mmoPlayer, textComponents, PrimarySkillType.SALVAGE);

22
src/main/java/com/gmail/nossr50/commands/skills/SkillCommand.java
View File

@@ -2,7 +2,7 @@ package com.gmail.nossr50.commands.skills;
import com.gmail.nossr50.config.AdvancedConfig;
import com.gmail.nossr50.config.Config;
import com.gmail.nossr50.datatypes.player.McMMOPlayer;
import com.neetgames.mcmmo.player.OnlineMMOPlayer;
import com.gmail.nossr50.datatypes.skills.PrimarySkillType;
import com.gmail.nossr50.datatypes.skills.SubSkillType;
import com.gmail.nossr50.locale.LocaleLoader;
@@ -59,7 +59,7 @@ public abstract class SkillCommand implements TabExecutor {
return true;
}
McMMOPlayer mmoPlayer = mcMMO.getUserManager().queryPlayer((Player) sender);
OnlineMMOPlayer mmoPlayer = mcMMO.getUserManager().queryPlayer((Player) sender);
if(mmoPlayer == null) {
sender.sendMessage(LocaleLoader.getString("Profile.PendingLoad"));
@@ -121,7 +121,7 @@ public abstract class SkillCommand implements TabExecutor {
return skillGuideCommand.onCommand(sender, command, label, args);
}
private void sendStatMessages(@NotNull McMMOPlayer mmoPlayer, boolean isLucky, boolean hasEndurance, float skillValue) {
private void sendStatMessages(@NotNull OnlineMMOPlayer mmoPlayer, boolean isLucky, boolean hasEndurance, float skillValue) {
List<String> statsMessages = statsDisplay(mmoPlayer, skillValue, hasEndurance, isLucky);
if (!statsMessages.isEmpty()) {
@@ -135,7 +135,7 @@ public abstract class SkillCommand implements TabExecutor {
mmoPlayer.getPlayer().sendMessage(LocaleLoader.getString("Guides.Available", skillName, skillName.toLowerCase(Locale.ENGLISH)));
}
private void sendSkillCommandHeader(@NotNull McMMOPlayer mmoPlayer, int skillValue) {
private void sendSkillCommandHeader(@NotNull OnlineMMOPlayer mmoPlayer, int skillValue) {
ChatColor hd1 = ChatColor.DARK_AQUA;
ChatColor c1 = ChatColor.GOLD;
ChatColor c2 = ChatColor.RED;
@@ -200,11 +200,11 @@ public abstract class SkillCommand implements TabExecutor {
return Math.min((int) skillValue, maxLevel) / rankChangeLevel;
}
protected @NotNull String[] getAbilityDisplayValues(@NotNull SkillActivationType skillActivationType, @NotNull McMMOPlayer mmoPlayer, @NotNull SubSkillType subSkill) {
protected @NotNull String[] getAbilityDisplayValues(@NotNull SkillActivationType skillActivationType, @NotNull OnlineMMOPlayer mmoPlayer, @NotNull SubSkillType subSkill) {
return RandomChanceUtil.calculateAbilityDisplayValues(skillActivationType, mmoPlayer.getPlayer(), subSkill);
}
protected @NotNull String[] calculateLengthDisplayValues(@NotNull McMMOPlayer mmoPlayer, float skillValue) {
protected @NotNull String[] calculateLengthDisplayValues(@NotNull OnlineMMOPlayer mmoPlayer, float skillValue) {
int maxLength = skill.getSuperAbilityType().getMaxLength();
int abilityLengthVar = AdvancedConfig.getInstance().getAbilityLength();
int abilityLengthCap = AdvancedConfig.getInstance().getAbilityLengthCap();
@@ -255,15 +255,15 @@ public abstract class SkillCommand implements TabExecutor {
}
}
protected abstract void dataCalculations(@NotNull McMMOPlayer mmoPlayer, float skillValue);
protected abstract void dataCalculations(@NotNull OnlineMMOPlayer mmoPlayer, float skillValue);
protected abstract void permissionsCheck(@NotNull McMMOPlayer mmoPlayer);
protected abstract void permissionsCheck(@NotNull OnlineMMOPlayer mmoPlayer);
//protected abstract List<String> effectsDisplay();
protected abstract @NotNull List<String> statsDisplay(@NotNull McMMOPlayer mmoPlayer, float skillValue, boolean hasEndurance, boolean isLucky);
protected abstract @NotNull List<String> statsDisplay(@NotNull OnlineMMOPlayer mmoPlayer, float skillValue, boolean hasEndurance, boolean isLucky);
protected abstract @NotNull List<Component> getTextComponents(@NotNull McMMOPlayer player);
protected abstract @NotNull List<Component> getTextComponents(@NotNull OnlineMMOPlayer player);
/**
* Checks if a player can use a skill
@@ -271,7 +271,7 @@ public abstract class SkillCommand implements TabExecutor {
* @param subSkillType target subskill
* @return true if the player has permission and has the skill unlocked
*/
protected boolean canUseSubskill(@NotNull McMMOPlayer mmoPlayer, SubSkillType subSkillType) {
protected boolean canUseSubskill(@NotNull OnlineMMOPlayer mmoPlayer, SubSkillType subSkillType) {
return Permissions.isSubSkillEnabled(mmoPlayer.getPlayer(), subSkillType) && RankUtils.hasUnlockedSubskill(mmoPlayer, subSkillType);
}
}

10
src/main/java/com/gmail/nossr50/commands/skills/SmeltingCommand.java
View File

@@ -1,6 +1,6 @@
package com.gmail.nossr50.commands.skills;
import com.gmail.nossr50.datatypes.player.McMMOPlayer;
import com.neetgames.mcmmo.player.OnlineMMOPlayer;
import com.gmail.nossr50.datatypes.skills.PrimarySkillType;
import com.gmail.nossr50.datatypes.skills.SubSkillType;
import com.gmail.nossr50.locale.LocaleLoader;
@@ -31,7 +31,7 @@ public class SmeltingCommand extends SkillCommand {
}
@Override
protected void dataCalculations(@NotNull McMMOPlayer mmoPlayer, float skillValue) {
protected void dataCalculations(@NotNull OnlineMMOPlayer mmoPlayer, float skillValue) {
// FUEL EFFICIENCY
if (canFuelEfficiency) {
burnTimeModifier = String.valueOf(mmoPlayer.getSmeltingManager().getFuelEfficiencyMultiplier());
@@ -53,7 +53,7 @@ public class SmeltingCommand extends SkillCommand {
}
@Override
protected void permissionsCheck(@NotNull McMMOPlayer mmoPlayer) {
protected void permissionsCheck(@NotNull OnlineMMOPlayer mmoPlayer) {
canFuelEfficiency = canUseSubskill(mmoPlayer, SubSkillType.SMELTING_FUEL_EFFICIENCY);
canSecondSmelt = canUseSubskill(mmoPlayer, SubSkillType.SMELTING_SECOND_SMELT);
//canFluxMine = canUseSubskill(player, SubSkillType.SMELTING_FLUX_MINING);
@@ -61,7 +61,7 @@ public class SmeltingCommand extends SkillCommand {
}
@Override
protected @NotNull List<String> statsDisplay(@NotNull McMMOPlayer mmoPlayer, float skillValue, boolean hasEndurance, boolean isLucky) {
protected @NotNull List<String> statsDisplay(@NotNull OnlineMMOPlayer mmoPlayer, float skillValue, boolean hasEndurance, boolean isLucky) {
List<String> messages = new ArrayList<>();
/*if (canFluxMine) {
@@ -88,7 +88,7 @@ public class SmeltingCommand extends SkillCommand {
}
@Override
protected @NotNull List<Component> getTextComponents(@NotNull McMMOPlayer mmoPlayer) {
protected @NotNull List<Component> getTextComponents(@NotNull OnlineMMOPlayer mmoPlayer) {
List<Component> textComponents = new ArrayList<>();
TextComponentFactory.getSubSkillTextComponents(mmoPlayer, textComponents, PrimarySkillType.SMELTING);

10
src/main/java/com/gmail/nossr50/commands/skills/SwordsCommand.java
View File

@@ -1,7 +1,7 @@
package com.gmail.nossr50.commands.skills;
import com.gmail.nossr50.config.AdvancedConfig;
import com.gmail.nossr50.datatypes.player.McMMOPlayer;
import com.neetgames.mcmmo.player.OnlineMMOPlayer;
import com.gmail.nossr50.datatypes.skills.PrimarySkillType;
import com.gmail.nossr50.datatypes.skills.SubSkillType;
import com.gmail.nossr50.locale.LocaleLoader;
@@ -34,7 +34,7 @@ public class SwordsCommand extends SkillCommand {
}
@Override
protected void dataCalculations(@NotNull McMMOPlayer mmoPlayer, float skillValue) {
protected void dataCalculations(@NotNull OnlineMMOPlayer mmoPlayer, float skillValue) {
// SWORDS_COUNTER_ATTACK
if (canCounter) {
String[] counterStrings = getAbilityDisplayValues(SkillActivationType.RANDOM_LINEAR_100_SCALE_WITH_CAP, mmoPlayer, SubSkillType.SWORDS_COUNTER_ATTACK);
@@ -60,14 +60,14 @@ public class SwordsCommand extends SkillCommand {
}
@Override
protected void permissionsCheck(@NotNull McMMOPlayer mmoPlayer) {
protected void permissionsCheck(@NotNull OnlineMMOPlayer mmoPlayer) {
canBleed = canUseSubskill(mmoPlayer, SubSkillType.SWORDS_RUPTURE);
canCounter = canUseSubskill(mmoPlayer, SubSkillType.SWORDS_COUNTER_ATTACK);
canSerratedStrike = RankUtils.hasUnlockedSubskill(mmoPlayer, SubSkillType.SWORDS_SERRATED_STRIKES) && Permissions.serratedStrikes(mmoPlayer.getPlayer());
}
@Override
protected @NotNull List<String> statsDisplay(@NotNull McMMOPlayer mmoPlayer, float skillValue, boolean hasEndurance, boolean isLucky) {
protected @NotNull List<String> statsDisplay(@NotNull OnlineMMOPlayer mmoPlayer, float skillValue, boolean hasEndurance, boolean isLucky) {
List<String> messages = new ArrayList<>();
int ruptureTicks = mmoPlayer.getSwordsManager().getRuptureBleedTicks();
@@ -110,7 +110,7 @@ public class SwordsCommand extends SkillCommand {
}
@Override
protected @NotNull List<Component> getTextComponents(@NotNull McMMOPlayer mmoPlayer) {
protected @NotNull List<Component> getTextComponents(@NotNull OnlineMMOPlayer mmoPlayer) {
List<Component> textComponents = new ArrayList<>();
TextComponentFactory.getSubSkillTextComponents(mmoPlayer, textComponents, PrimarySkillType.SWORDS);

10
src/main/java/com/gmail/nossr50/commands/skills/TamingCommand.java
View File

@@ -1,6 +1,6 @@
package com.gmail.nossr50.commands.skills;
import com.gmail.nossr50.datatypes.player.McMMOPlayer;
import com.neetgames.mcmmo.player.OnlineMMOPlayer;
import com.gmail.nossr50.datatypes.skills.PrimarySkillType;
import com.gmail.nossr50.datatypes.skills.SubSkillType;
import com.gmail.nossr50.locale.LocaleLoader;
@@ -34,7 +34,7 @@ public class TamingCommand extends SkillCommand {
}
@Override
protected void dataCalculations(@NotNull McMMOPlayer mmoPlayer, float skillValue) {
protected void dataCalculations(@NotNull OnlineMMOPlayer mmoPlayer, float skillValue) {
if (canGore) {
String[] goreStrings = getAbilityDisplayValues(SkillActivationType.RANDOM_LINEAR_100_SCALE_WITH_CAP, mmoPlayer, SubSkillType.TAMING_GORE);
goreChance = goreStrings[0];
@@ -43,7 +43,7 @@ public class TamingCommand extends SkillCommand {
}
@Override
protected void permissionsCheck(@NotNull McMMOPlayer mmoPlayer) {
protected void permissionsCheck(@NotNull OnlineMMOPlayer mmoPlayer) {
canBeastLore = canUseSubskill(mmoPlayer, SubSkillType.TAMING_BEAST_LORE);
canCallWild = Permissions.callOfTheWild(mmoPlayer.getPlayer(), EntityType.HORSE) || Permissions.callOfTheWild(mmoPlayer.getPlayer(), EntityType.WOLF) || Permissions.callOfTheWild(mmoPlayer.getPlayer(), EntityType.OCELOT);
canEnvironmentallyAware = canUseSubskill(mmoPlayer, SubSkillType.TAMING_ENVIRONMENTALLY_AWARE);
@@ -56,7 +56,7 @@ public class TamingCommand extends SkillCommand {
}
@Override
protected @NotNull List<String> statsDisplay(@NotNull McMMOPlayer mmoPlayer, float skillValue, boolean hasEndurance, boolean isLucky) {
protected @NotNull List<String> statsDisplay(@NotNull OnlineMMOPlayer mmoPlayer, float skillValue, boolean hasEndurance, boolean isLucky) {
List<String> messages = new ArrayList<>();
if (canEnvironmentallyAware) {
@@ -93,7 +93,7 @@ public class TamingCommand extends SkillCommand {
}
@Override
protected @NotNull List<Component> getTextComponents(@NotNull McMMOPlayer mmoPlayer) {
protected @NotNull List<Component> getTextComponents(@NotNull OnlineMMOPlayer mmoPlayer) {
List<Component> textComponents = new ArrayList<>();
TextComponentFactory.getSubSkillTextComponents(mmoPlayer, textComponents, this.skill);

10
src/main/java/com/gmail/nossr50/commands/skills/TridentsCommand.java
View File

@@ -1,6 +1,6 @@
package com.gmail.nossr50.commands.skills;
import com.gmail.nossr50.datatypes.player.McMMOPlayer;
import com.neetgames.mcmmo.player.OnlineMMOPlayer;
import com.gmail.nossr50.datatypes.skills.PrimarySkillType;
import com.gmail.nossr50.util.text.TextComponentFactory;
import net.kyori.adventure.text.Component;
@@ -15,22 +15,22 @@ public class TridentsCommand extends SkillCommand {
}
@Override
protected void dataCalculations(@NotNull McMMOPlayer mmoPlayer, float skillValue) {
protected void dataCalculations(@NotNull OnlineMMOPlayer mmoPlayer, float skillValue) {
}
@Override
protected void permissionsCheck(@NotNull McMMOPlayer mmoPlayer) {
protected void permissionsCheck(@NotNull OnlineMMOPlayer mmoPlayer) {
}
@Override
protected @NotNull List<String> statsDisplay(@NotNull McMMOPlayer mmoPlayer, float skillValue, boolean hasEndurance, boolean isLucky) {
protected @NotNull List<String> statsDisplay(@NotNull OnlineMMOPlayer mmoPlayer, float skillValue, boolean hasEndurance, boolean isLucky) {
return null;
}
@Override
protected @NotNull List<Component> getTextComponents(@NotNull McMMOPlayer mmoPlayer) {
protected @NotNull List<Component> getTextComponents(@NotNull OnlineMMOPlayer mmoPlayer) {
List<Component> textComponents = new ArrayList<>();
TextComponentFactory.getSubSkillTextComponents(mmoPlayer, textComponents, PrimarySkillType.TRIDENTS);

10
src/main/java/com/gmail/nossr50/commands/skills/UnarmedCommand.java
View File

@@ -1,6 +1,6 @@
package com.gmail.nossr50.commands.skills;
import com.gmail.nossr50.datatypes.player.McMMOPlayer;
import com.neetgames.mcmmo.player.OnlineMMOPlayer;
import com.gmail.nossr50.datatypes.skills.PrimarySkillType;
import com.gmail.nossr50.datatypes.skills.SubSkillType;
import com.gmail.nossr50.locale.LocaleLoader;
@@ -37,7 +37,7 @@ public class UnarmedCommand extends SkillCommand {
}
@Override
protected void dataCalculations(@NotNull McMMOPlayer mmoPlayer, float skillValue) {
protected void dataCalculations(@NotNull OnlineMMOPlayer mmoPlayer, float skillValue) {
// UNARMED_ARROW_DEFLECT
if (canDeflect) {
String[] deflectStrings = getAbilityDisplayValues(SkillActivationType.RANDOM_LINEAR_100_SCALE_WITH_CAP, mmoPlayer, SubSkillType.UNARMED_ARROW_DEFLECT);
@@ -73,7 +73,7 @@ public class UnarmedCommand extends SkillCommand {
}
@Override
protected void permissionsCheck(@NotNull McMMOPlayer mmoPlayer) {
protected void permissionsCheck(@NotNull OnlineMMOPlayer mmoPlayer) {
canBerserk = RankUtils.hasUnlockedSubskill(mmoPlayer, SubSkillType.UNARMED_BERSERK) && Permissions.berserk(mmoPlayer.getPlayer());
canIronArm = canUseSubskill(mmoPlayer, SubSkillType.UNARMED_STEEL_ARM_STYLE);
canDeflect = canUseSubskill(mmoPlayer, SubSkillType.UNARMED_ARROW_DEFLECT);
@@ -83,7 +83,7 @@ public class UnarmedCommand extends SkillCommand {
}
@Override
protected @NotNull List<String> statsDisplay(@NotNull McMMOPlayer mmoPlayer, float skillValue, boolean hasEndurance, boolean isLucky) {
protected @NotNull List<String> statsDisplay(@NotNull OnlineMMOPlayer mmoPlayer, float skillValue, boolean hasEndurance, boolean isLucky) {
List<String> messages = new ArrayList<>();
if (canDeflect) {
@@ -123,7 +123,7 @@ public class UnarmedCommand extends SkillCommand {
}
@Override
protected @NotNull List<Component> getTextComponents(@NotNull McMMOPlayer mmoPlayer) {
protected @NotNull List<Component> getTextComponents(@NotNull OnlineMMOPlayer mmoPlayer) {
List<Component> textComponents = new ArrayList<>();
TextComponentFactory.getSubSkillTextComponents(mmoPlayer, textComponents, PrimarySkillType.UNARMED);

12
src/main/java/com/gmail/nossr50/commands/skills/WoodcuttingCommand.java
View File

@@ -1,6 +1,6 @@
package com.gmail.nossr50.commands.skills;
import com.gmail.nossr50.datatypes.player.McMMOPlayer;
import com.neetgames.mcmmo.player.OnlineMMOPlayer;
import com.gmail.nossr50.datatypes.skills.PrimarySkillType;
import com.gmail.nossr50.datatypes.skills.SubSkillType;
import com.gmail.nossr50.locale.LocaleLoader;
@@ -33,7 +33,7 @@ public class WoodcuttingCommand extends SkillCommand {
}
@Override
protected void dataCalculations(@NotNull McMMOPlayer mmoPlayer, float skillValue) {
protected void dataCalculations(@NotNull OnlineMMOPlayer mmoPlayer, float skillValue) {
// DOUBLE DROPS
if (canDoubleDrop) {
setDoubleDropClassicChanceStrings(mmoPlayer);
@@ -47,14 +47,14 @@ public class WoodcuttingCommand extends SkillCommand {
}
}
private void setDoubleDropClassicChanceStrings(McMMOPlayer mmoPlayer) {
private void setDoubleDropClassicChanceStrings(OnlineMMOPlayer mmoPlayer) {
String[] doubleDropStrings = getAbilityDisplayValues(SkillActivationType.RANDOM_LINEAR_100_SCALE_WITH_CAP, mmoPlayer, SubSkillType.WOODCUTTING_HARVEST_LUMBER);
doubleDropChance = doubleDropStrings[0];
doubleDropChanceLucky = doubleDropStrings[1];
}
@Override
protected void permissionsCheck(@NotNull McMMOPlayer mmoPlayer) {
protected void permissionsCheck(@NotNull OnlineMMOPlayer mmoPlayer) {
canTreeFell = RankUtils.hasUnlockedSubskill(mmoPlayer, SubSkillType.WOODCUTTING_TREE_FELLER) && Permissions.treeFeller(mmoPlayer.getPlayer());
canDoubleDrop = canUseSubskill(mmoPlayer, SubSkillType.WOODCUTTING_HARVEST_LUMBER) && !skill.getDoubleDropsDisabled() && RankUtils.getRank(mmoPlayer, SubSkillType.WOODCUTTING_HARVEST_LUMBER) >= 1;
canLeafBlow = canUseSubskill(mmoPlayer, SubSkillType.WOODCUTTING_LEAF_BLOWER);
@@ -65,7 +65,7 @@ public class WoodcuttingCommand extends SkillCommand {
}
@Override
protected @NotNull List<String> statsDisplay(@NotNull McMMOPlayer mmoPlayer, float skillValue, boolean hasEndurance, boolean isLucky) {
protected @NotNull List<String> statsDisplay(@NotNull OnlineMMOPlayer mmoPlayer, float skillValue, boolean hasEndurance, boolean isLucky) {
List<String> messages = new ArrayList<>();
if (canDoubleDrop) {
@@ -98,7 +98,7 @@ public class WoodcuttingCommand extends SkillCommand {
}
@Override
protected @NotNull List<Component> getTextComponents(@NotNull McMMOPlayer mmoPlayer) {
protected @NotNull List<Component> getTextComponents(@NotNull OnlineMMOPlayer mmoPlayer) {
List<Component> textComponents = new ArrayList<>();
TextComponentFactory.getSubSkillTextComponents(mmoPlayer, textComponents, PrimarySkillType.WOODCUTTING);