From b7f713a50f332e5c19007ce902ec4e4f9b66cc0e Mon Sep 17 00:00:00 2001 From: nossr50 Date: Tue, 22 Dec 2020 13:43:12 -0800 Subject: [PATCH] Use OnlineMMOPlayer over McMMOPlayer --- .../com/gmail/nossr50/api/AbilityAPI.java | 4 +- .../java/com/gmail/nossr50/api/ChatAPI.java | 38 +++++++++---------- .../com/gmail/nossr50/api/ExperienceAPI.java | 18 ++++----- .../com/gmail/nossr50/chat/ChatManager.java | 14 +++---- .../nossr50/chat/SamePartyPredicate.java | 4 +- .../chat/message/PartyChatMessage.java | 4 +- .../commands/AbilityToggleCommand.java | 4 +- .../nossr50/commands/CommandManager.java | 4 +- .../gmail/nossr50/commands/MHDCommand.java | 6 +-- .../gmail/nossr50/commands/McgodCommand.java | 4 +- .../nossr50/commands/McnotifyCommand.java | 4 +- .../nossr50/commands/McrefreshCommand.java | 4 +- .../gmail/nossr50/commands/ToggleCommand.java | 8 ++-- .../commands/admin/PlayerDebugCommand.java | 4 +- .../commands/chat/AdminChatCommand.java | 6 +-- .../nossr50/commands/chat/McChatSpy.java | 4 +- .../commands/chat/PartyChatCommand.java | 10 ++--- .../experience/ExperienceCommand.java | 4 +- .../experience/SkillresetCommand.java | 4 +- .../commands/party/PartyAcceptCommand.java | 4 +- .../nossr50/commands/party/PartyCommand.java | 4 +- .../commands/party/PartyCreateCommand.java | 4 +- .../commands/party/PartyInfoCommand.java | 6 +-- .../commands/party/PartyInviteCommand.java | 6 +-- .../commands/party/PartyQuitCommand.java | 4 +- .../commands/party/PartyRenameCommand.java | 4 +- .../party/teleport/PtpAcceptAnyCommand.java | 4 +- .../commands/party/teleport/PtpCommand.java | 14 +++---- .../commands/player/InspectCommand.java | 2 +- .../commands/player/MccooldownCommand.java | 4 +- .../commands/player/McrankCommand.java | 8 ++-- .../commands/player/McstatsCommand.java | 4 +- .../nossr50/commands/player/MctopCommand.java | 4 +- .../nossr50/commands/player/XPBarCommand.java | 4 +- .../commands/skills/AcrobaticsCommand.java | 10 ++--- .../commands/skills/AlchemyCommand.java | 14 +++---- .../commands/skills/ArcheryCommand.java | 10 ++--- .../nossr50/commands/skills/AxesCommand.java | 10 ++--- .../commands/skills/CrossbowsCommand.java | 10 ++--- .../commands/skills/ExcavationCommand.java | 10 ++--- .../commands/skills/FishingCommand.java | 10 ++--- .../commands/skills/HerbalismCommand.java | 10 ++--- .../commands/skills/MiningCommand.java | 10 ++--- .../commands/skills/MmoInfoCommand.java | 6 +-- .../commands/skills/RepairCommand.java | 10 ++--- .../commands/skills/SalvageCommand.java | 10 ++--- .../nossr50/commands/skills/SkillCommand.java | 22 +++++------ .../commands/skills/SmeltingCommand.java | 10 ++--- .../commands/skills/SwordsCommand.java | 10 ++--- .../commands/skills/TamingCommand.java | 10 ++--- .../commands/skills/TridentsCommand.java | 10 ++--- .../commands/skills/UnarmedCommand.java | 10 ++--- .../commands/skills/WoodcuttingCommand.java | 12 +++--- .../experience/ExperienceManager.java | 6 +-- .../datatypes/party/PartyMemberManager.java | 4 +- .../nossr50/datatypes/player/McMMOPlayer.java | 2 +- .../skills/subskills/acrobatics/Roll.java | 14 +++---- .../skills/subskills/interfaces/SubSkill.java | 4 +- .../nossr50/listeners/BlockListener.java | 14 +++---- .../nossr50/listeners/CommandListener.java | 4 +- .../nossr50/listeners/EntityListener.java | 8 ++-- .../nossr50/listeners/InventoryListener.java | 4 +- .../nossr50/listeners/PlayerListener.java | 14 +++---- .../gmail/nossr50/listeners/SelfListener.java | 4 +- .../com/gmail/nossr50/party/PartyManager.java | 24 ++++++------ .../com/gmail/nossr50/party/ShareHandler.java | 14 +++---- .../nossr50/runnables/SaveTimerTask.java | 4 +- .../database/FormulaConversionTask.java | 4 +- .../runnables/items/ChimaeraWingWarmup.java | 6 +-- .../runnables/items/TeleportationWarmup.java | 8 ++-- .../player/ClearRegisteredXPGainTask.java | 4 +- .../player/PlayerProfileLoadingTask.java | 8 ++-- .../runnables/skills/AbilityCooldownTask.java | 6 +-- .../runnables/skills/AbilityDisableTask.java | 6 +-- .../runnables/skills/AwardCombatXpTask.java | 6 +-- .../skills/DelayedHerbalismXPCheckTask.java | 6 +-- .../skills/ExperienceBarHideTask.java | 6 +-- .../skills/SkillUnlockNotificationTask.java | 6 +-- .../runnables/skills/ToolLowerTask.java | 6 +-- .../gmail/nossr50/skills/SkillManager.java | 6 +-- .../skills/acrobatics/AcrobaticsManager.java | 4 +- .../skills/alchemy/AlchemyManager.java | 4 +- .../gmail/nossr50/skills/archery/Archery.java | 6 +-- .../skills/archery/ArcheryManager.java | 4 +- .../nossr50/skills/axes/AxesManager.java | 4 +- .../skills/crossbows/CrossbowManager.java | 4 +- .../skills/excavation/ExcavationManager.java | 4 +- .../skills/fishing/FishingManager.java | 4 +- .../skills/herbalism/HerbalismManager.java | 4 +- .../nossr50/skills/mining/MiningManager.java | 4 +- .../nossr50/skills/repair/RepairManager.java | 4 +- .../skills/salvage/SalvageManager.java | 4 +- .../skills/smelting/SmeltingManager.java | 4 +- .../nossr50/skills/swords/SwordsManager.java | 4 +- .../nossr50/skills/taming/TamingManager.java | 4 +- .../skills/tridents/TridentManager.java | 4 +- .../skills/unarmed/UnarmedManager.java | 4 +- .../woodcutting/WoodcuttingManager.java | 4 +- .../com/gmail/nossr50/util/ChimaeraWing.java | 4 +- .../com/gmail/nossr50/util/EventUtils.java | 12 +++--- .../gmail/nossr50/util/HolidayManager.java | 4 +- .../java/com/gmail/nossr50/util/Misc.java | 4 +- .../nossr50/util/commands/CommandUtils.java | 4 +- .../util/experience/ExperienceUtils.java | 8 ++-- .../experience/MMOExperienceBarManager.java | 6 +-- .../input/AbilityActivationProcessor.java | 6 +-- .../util/input/SuperAbilityManager.java | 6 +-- .../util/player/NotificationManager.java | 14 +++---- .../nossr50/util/player/PlayerLevelUtils.java | 4 +- .../nossr50/util/player/UserManager.java | 28 +++++++------- .../util/random/RandomChanceSkill.java | 10 ++--- .../nossr50/util/random/RandomChanceUtil.java | 4 +- .../util/scoreboards/ScoreboardManager.java | 2 +- .../util/scoreboards/ScoreboardWrapper.java | 6 +-- .../nossr50/util/skills/CombatUtils.java | 32 ++++++++-------- .../gmail/nossr50/util/skills/RankUtils.java | 18 ++++----- .../gmail/nossr50/util/skills/SkillUtils.java | 14 +++---- .../nossr50/util/skills/SmeltingTracker.java | 8 ++-- .../util/text/TextComponentFactory.java | 26 ++++++------- 119 files changed, 460 insertions(+), 460 deletions(-) diff --git a/src/main/java/com/gmail/nossr50/api/AbilityAPI.java b/src/main/java/com/gmail/nossr50/api/AbilityAPI.java index f759da49e..2ab3a4f40 100644 --- a/src/main/java/com/gmail/nossr50/api/AbilityAPI.java +++ b/src/main/java/com/gmail/nossr50/api/AbilityAPI.java @@ -1,6 +1,6 @@ package com.gmail.nossr50.api; -import com.gmail.nossr50.datatypes.player.McMMOPlayer; +import com.neetgames.mcmmo.player.OnlineMMOPlayer; import com.gmail.nossr50.datatypes.skills.SuperAbilityType; import com.gmail.nossr50.mcMMO; import com.gmail.nossr50.runnables.skills.BleedTimerTask; @@ -39,7 +39,7 @@ public final class AbilityAPI { } public static boolean isAnyAbilityEnabled(Player player) { - McMMOPlayer mmoPlayer = mcMMO.getUserManager().queryPlayer(player); + OnlineMMOPlayer mmoPlayer = mcMMO.getUserManager().queryPlayer(player); for (SuperAbilityType ability : SuperAbilityType.values()) { if (mmoPlayer.getSuperAbilityManager().getAbilityMode(ability)) { diff --git a/src/main/java/com/gmail/nossr50/api/ChatAPI.java b/src/main/java/com/gmail/nossr50/api/ChatAPI.java index d87f5a924..a41b7492f 100644 --- a/src/main/java/com/gmail/nossr50/api/ChatAPI.java +++ b/src/main/java/com/gmail/nossr50/api/ChatAPI.java @@ -1,7 +1,7 @@ package com.gmail.nossr50.api; import com.gmail.nossr50.datatypes.chat.ChatChannel; -import com.gmail.nossr50.datatypes.player.McMMOPlayer; +import com.neetgames.mcmmo.player.OnlineMMOPlayer; import com.gmail.nossr50.mcMMO; import org.bukkit.entity.Player; import org.jetbrains.annotations.NotNull; @@ -16,11 +16,11 @@ public final class ChatAPI { * * @param player target player * @return true if the player is targeting the party chat channel - * @deprecated Use {@link #isUsingPartyChat(McMMOPlayer)} instead + * @deprecated Use {@link #isUsingPartyChat(OnlineMMOPlayer)} instead */ @Deprecated public static boolean isUsingPartyChat(@NotNull Player player) { - McMMOPlayer mmoPlayer = mcMMO.getUserManager().queryPlayer(player); + OnlineMMOPlayer mmoPlayer = mcMMO.getUserManager().queryPlayer(player); if(mmoPlayer != null) return mmoPlayer.getChatChannel() == ChatChannel.PARTY; @@ -29,12 +29,12 @@ public final class ChatAPI { } /** - * Check if a {@link McMMOPlayer} is in the Party chat channel + * Check if a {@link OnlineMMOPlayer} is in the Party chat channel * * @param mmoPlayer target player * @return true if the player is targeting the party chat channel */ - public static boolean isUsingPartyChat(@NotNull McMMOPlayer mmoPlayer) { + public static boolean isUsingPartyChat(@NotNull OnlineMMOPlayer mmoPlayer) { return mmoPlayer.getChatChannel() == ChatChannel.PARTY; } @@ -43,7 +43,7 @@ public final class ChatAPI { * * @param playerName The name of the player to check * @return true if the player is using party chat, false otherwise - * @deprecated use {@link #isUsingPartyChat(McMMOPlayer)} instead for performance reasons + * @deprecated use {@link #isUsingPartyChat(OnlineMMOPlayer)} instead for performance reasons */ @Deprecated public static boolean isUsingPartyChat(String playerName) { @@ -59,11 +59,11 @@ public final class ChatAPI { * * @param player target player * @return true if the player is targeting the admin chat channel - * @deprecated Use {@link #isUsingAdminChat(McMMOPlayer)} instead + * @deprecated Use {@link #isUsingAdminChat(OnlineMMOPlayer)} instead */ @Deprecated public static boolean isUsingAdminChat(@NotNull Player player) { - McMMOPlayer mmoPlayer = mcMMO.getUserManager().queryPlayer(player); + OnlineMMOPlayer mmoPlayer = mcMMO.getUserManager().queryPlayer(player); if(mmoPlayer != null) return mmoPlayer.getChatChannel() == ChatChannel.ADMIN; @@ -72,12 +72,12 @@ public final class ChatAPI { } /** - * Check if a {@link McMMOPlayer} is in the Admin chat channel + * Check if a {@link OnlineMMOPlayer} is in the Admin chat channel * * @param mmoPlayer target player * @return true if the player is targeting the admin chat channel */ - public static boolean isUsingAdminChat(@NotNull McMMOPlayer mmoPlayer) { + public static boolean isUsingAdminChat(@NotNull OnlineMMOPlayer mmoPlayer) { return mmoPlayer.getChatChannel() == ChatChannel.ADMIN; } @@ -86,7 +86,7 @@ public final class ChatAPI { * * @param playerName The name of the player to check * @return true if the player is using admin chat, false otherwise - * @deprecated use {@link #isUsingAdminChat(McMMOPlayer)} instead for performance reasons + * @deprecated use {@link #isUsingAdminChat(OnlineMMOPlayer)} instead for performance reasons */ @Deprecated public static boolean isUsingAdminChat(String playerName) { @@ -98,11 +98,11 @@ public final class ChatAPI { } /** - * Toggle the party chat channel of a {@link McMMOPlayer} + * Toggle the party chat channel of a {@link OnlineMMOPlayer} * * @param mmoPlayer The player to toggle party chat on. */ - public static void togglePartyChat(@NotNull McMMOPlayer mmoPlayer) { + public static void togglePartyChat(@NotNull OnlineMMOPlayer mmoPlayer) { mcMMO.p.getChatManager().setOrToggleChatChannel(mmoPlayer, ChatChannel.PARTY); } @@ -110,7 +110,7 @@ public final class ChatAPI { * Toggle the party chat mode of a player. * * @param player The player to toggle party chat on. - * @deprecated use {@link #togglePartyChat(McMMOPlayer)} + * @deprecated use {@link #togglePartyChat(OnlineMMOPlayer)} */ @Deprecated public static void togglePartyChat(Player player) throws NullPointerException { @@ -121,7 +121,7 @@ public final class ChatAPI { * Toggle the party chat mode of a player. * * @param playerName The name of the player to toggle party chat on. - * @deprecated Use {@link #togglePartyChat(McMMOPlayer)} instead + * @deprecated Use {@link #togglePartyChat(OnlineMMOPlayer)} instead */ @Deprecated public static void togglePartyChat(String playerName) throws NullPointerException { @@ -129,11 +129,11 @@ public final class ChatAPI { } /** - * Toggle the admin chat channel of a {@link McMMOPlayer} + * Toggle the admin chat channel of a {@link OnlineMMOPlayer} * * @param mmoPlayer The player to toggle admin chat on. */ - public static void toggleAdminChat(@NotNull McMMOPlayer mmoPlayer) { + public static void toggleAdminChat(@NotNull OnlineMMOPlayer mmoPlayer) { mcMMO.p.getChatManager().setOrToggleChatChannel(mmoPlayer, ChatChannel.ADMIN); } @@ -141,7 +141,7 @@ public final class ChatAPI { * Toggle the admin chat mode of a player. * * @param player The player to toggle admin chat on. - * @deprecated Use {@link #toggleAdminChat(McMMOPlayer)} instead + * @deprecated Use {@link #toggleAdminChat(OnlineMMOPlayer)} instead */ @Deprecated public static void toggleAdminChat(Player player) throws NullPointerException { @@ -152,7 +152,7 @@ public final class ChatAPI { * Toggle the admin chat mode of a player. * * @param playerName The name of the player to toggle party chat on. - * @deprecated Use {@link #toggleAdminChat(McMMOPlayer)} instead + * @deprecated Use {@link #toggleAdminChat(OnlineMMOPlayer)} instead */ @Deprecated public static void toggleAdminChat(String playerName) throws NullPointerException { diff --git a/src/main/java/com/gmail/nossr50/api/ExperienceAPI.java b/src/main/java/com/gmail/nossr50/api/ExperienceAPI.java index 72a63ee70..b5357096c 100644 --- a/src/main/java/com/gmail/nossr50/api/ExperienceAPI.java +++ b/src/main/java/com/gmail/nossr50/api/ExperienceAPI.java @@ -6,7 +6,7 @@ import com.gmail.nossr50.config.experience.ExperienceConfig; import com.gmail.nossr50.datatypes.experience.FormulaType; import com.gmail.nossr50.datatypes.experience.XPGainReason; import com.gmail.nossr50.datatypes.experience.XPGainSource; -import com.gmail.nossr50.datatypes.player.McMMOPlayer; +import com.neetgames.mcmmo.player.OnlineMMOPlayer; import com.gmail.nossr50.datatypes.player.PlayerProfile; import com.gmail.nossr50.datatypes.skills.PrimarySkillType; import com.gmail.nossr50.mcMMO; @@ -47,7 +47,7 @@ public final class ExperienceAPI { * @deprecated Draft API */ @Deprecated - public static void addCombatXP(McMMOPlayer mmoPlayer, LivingEntity target, PrimarySkillType primarySkillType, double multiplier) { + public static void addCombatXP(OnlineMMOPlayer mmoPlayer, LivingEntity target, PrimarySkillType primarySkillType, double multiplier) { CombatUtils.processCombatXP(mmoPlayer, target, primarySkillType, multiplier); } @@ -61,7 +61,7 @@ public final class ExperienceAPI { * @deprecated Draft API */ @Deprecated - public static void addCombatXP(McMMOPlayer mmoPlayer, LivingEntity target, PrimarySkillType primarySkillType) { + public static void addCombatXP(OnlineMMOPlayer mmoPlayer, LivingEntity target, PrimarySkillType primarySkillType) { CombatUtils.processCombatXP(mmoPlayer, target, primarySkillType); } @@ -1064,7 +1064,7 @@ public final class ExperienceAPI { * @param blockStates the blocks to reward XP for * @param mmoPlayer the target player */ - public static void addXpFromBlocks(ArrayList blockStates, McMMOPlayer mmoPlayer) + public static void addXpFromBlocks(ArrayList blockStates, OnlineMMOPlayer mmoPlayer) { for(BlockState bs : blockStates) { @@ -1084,7 +1084,7 @@ public final class ExperienceAPI { * @param mmoPlayer the target player * @param skillType target primary skill */ - public static void addXpFromBlocksBySkill(ArrayList blockStates, McMMOPlayer mmoPlayer, PrimarySkillType skillType) + public static void addXpFromBlocksBySkill(ArrayList blockStates, OnlineMMOPlayer mmoPlayer, PrimarySkillType skillType) { for(BlockState bs : blockStates) { @@ -1100,7 +1100,7 @@ public final class ExperienceAPI { * @param blockState The target blockstate * @param mmoPlayer The target player */ - public static void addXpFromBlock(BlockState blockState, McMMOPlayer mmoPlayer) + public static void addXpFromBlock(BlockState blockState, OnlineMMOPlayer mmoPlayer) { for(PrimarySkillType skillType : PrimarySkillType.values()) { @@ -1117,7 +1117,7 @@ public final class ExperienceAPI { * @param mmoPlayer The target player * @param skillType target primary skill */ - public static void addXpFromBlockBySkill(BlockState blockState, McMMOPlayer mmoPlayer, PrimarySkillType skillType) + public static void addXpFromBlockBySkill(BlockState blockState, OnlineMMOPlayer mmoPlayer, PrimarySkillType skillType) { if(ExperienceConfig.getInstance().getXp(skillType, blockState.getType()) > 0) { @@ -1208,11 +1208,11 @@ public final class ExperienceAPI { /** * @deprecated Use UserManager::getPlayer(Player player) instead * @param player target player - * @return McMMOPlayer for that player if the profile is loaded, otherwise null + * @return OnlineMMOPlayer for that player if the profile is loaded, otherwise null * @throws McMMOPlayerNotFoundException */ @Deprecated - private static McMMOPlayer getPlayer(Player player) throws McMMOPlayerNotFoundException { + private static OnlineMMOPlayer getPlayer(Player player) throws McMMOPlayerNotFoundException { if (!mcMMO.getUserManager().hasPlayerDataKey(player)) { throw new McMMOPlayerNotFoundException(player); } diff --git a/src/main/java/com/gmail/nossr50/chat/ChatManager.java b/src/main/java/com/gmail/nossr50/chat/ChatManager.java index a0a1e6f30..538137f5f 100644 --- a/src/main/java/com/gmail/nossr50/chat/ChatManager.java +++ b/src/main/java/com/gmail/nossr50/chat/ChatManager.java @@ -7,7 +7,7 @@ import com.gmail.nossr50.chat.mailer.PartyChatMailer; import com.gmail.nossr50.config.ChatConfig; import com.gmail.nossr50.datatypes.chat.ChatChannel; import com.gmail.nossr50.datatypes.party.Party; -import com.gmail.nossr50.datatypes.player.McMMOPlayer; +import com.neetgames.mcmmo.player.OnlineMMOPlayer; import com.gmail.nossr50.locale.LocaleLoader; import com.gmail.nossr50.mcMMO; import com.gmail.nossr50.util.Misc; @@ -45,7 +45,7 @@ public class ChatManager { * @param rawMessage the raw message from the player as it was typed * @param isAsync whether or not this is getting processed via async */ - public void processPlayerMessage(@NotNull McMMOPlayer mmoPlayer, @NotNull String rawMessage, boolean isAsync) { + public void processPlayerMessage(@NotNull OnlineMMOPlayer mmoPlayer, @NotNull String rawMessage, boolean isAsync) { processPlayerMessage(mmoPlayer, mmoPlayer.getChatChannel(), rawMessage, isAsync); } @@ -56,7 +56,7 @@ public class ChatManager { * @param args the raw command arguments from the player * @param chatChannel target channel */ - public void processPlayerMessage(@NotNull McMMOPlayer mmoPlayer, @NotNull String[] args, @NotNull ChatChannel chatChannel) { + public void processPlayerMessage(@NotNull OnlineMMOPlayer mmoPlayer, @NotNull String[] args, @NotNull ChatChannel chatChannel) { String chatMessageWithoutCommand = buildChatMessage(args); //Commands are never async @@ -71,7 +71,7 @@ public class ChatManager { * @param rawMessage raw chat message as it was typed * @param isAsync whether or not this is getting processed via async */ - private void processPlayerMessage(@NotNull McMMOPlayer mmoPlayer, @NotNull ChatChannel chatChannel, @NotNull String rawMessage, boolean isAsync) { + private void processPlayerMessage(@NotNull OnlineMMOPlayer mmoPlayer, @NotNull ChatChannel chatChannel, @NotNull String rawMessage, boolean isAsync) { switch (chatChannel) { case ADMIN: adminChatMailer.processChatMessage(mmoPlayer.getPlayerAuthor(), rawMessage, isAsync, Permissions.colorChat(mmoPlayer.getPlayer())); @@ -119,12 +119,12 @@ public class ChatManager { } /** - * Change the chat channel of a {@link McMMOPlayer} + * Change the chat channel of a {@link OnlineMMOPlayer} * Targeting the channel a player is already in will remove that player from the chat channel * @param mmoPlayer target player * @param targetChatChannel target chat channel */ - public void setOrToggleChatChannel(@NotNull McMMOPlayer mmoPlayer, @NotNull ChatChannel targetChatChannel) { + public void setOrToggleChatChannel(@NotNull OnlineMMOPlayer mmoPlayer, @NotNull ChatChannel targetChatChannel) { if(targetChatChannel == mmoPlayer.getChatChannel()) { //Disabled message mmoPlayer.getPlayer().sendMessage(LocaleLoader.getString("Chat.Channel.Off", StringUtils.getCapitalized(targetChatChannel.toString()))); @@ -159,7 +159,7 @@ public class ChatManager { * @param mmoPlayer target player * @return true if the player can send messages to that chat channel */ - public boolean isMessageAllowed(@NotNull McMMOPlayer mmoPlayer) { + public boolean isMessageAllowed(@NotNull OnlineMMOPlayer mmoPlayer) { switch (mmoPlayer.getChatChannel()) { case ADMIN: if(mmoPlayer.getPlayer().isOp() || Permissions.adminChat(mmoPlayer.getPlayer())) { diff --git a/src/main/java/com/gmail/nossr50/chat/SamePartyPredicate.java b/src/main/java/com/gmail/nossr50/chat/SamePartyPredicate.java index ce319c908..5a6da54da 100644 --- a/src/main/java/com/gmail/nossr50/chat/SamePartyPredicate.java +++ b/src/main/java/com/gmail/nossr50/chat/SamePartyPredicate.java @@ -1,7 +1,7 @@ package com.gmail.nossr50.chat; import com.gmail.nossr50.datatypes.party.Party; -import com.gmail.nossr50.datatypes.player.McMMOPlayer; +import com.neetgames.mcmmo.player.OnlineMMOPlayer; import com.gmail.nossr50.util.player.UserManager; import org.bukkit.command.CommandSender; import org.bukkit.command.ConsoleCommandSender; @@ -25,7 +25,7 @@ public class SamePartyPredicate implements Predicate } else { if(t instanceof Player) { Player player = (Player) t; - McMMOPlayer mcMMOPlayer = mcMMO.getUserManager().queryPlayer(player); + OnlineMMOPlayer mcMMOPlayer = mcMMO.getUserManager().queryPlayer(player); if(mcMMOPlayer != null) { return mcMMOPlayer.getParty() == party; } diff --git a/src/main/java/com/gmail/nossr50/chat/message/PartyChatMessage.java b/src/main/java/com/gmail/nossr50/chat/message/PartyChatMessage.java index 4c143ec69..00ab8d138 100644 --- a/src/main/java/com/gmail/nossr50/chat/message/PartyChatMessage.java +++ b/src/main/java/com/gmail/nossr50/chat/message/PartyChatMessage.java @@ -3,7 +3,7 @@ package com.gmail.nossr50.chat.message; import com.gmail.nossr50.chat.author.Author; import com.gmail.nossr50.datatypes.chat.ChatChannel; import com.gmail.nossr50.datatypes.party.Party; -import com.gmail.nossr50.datatypes.player.McMMOPlayer; +import com.neetgames.mcmmo.player.OnlineMMOPlayer; import com.gmail.nossr50.locale.LocaleLoader; import com.gmail.nossr50.mcMMO; import com.gmail.nossr50.util.player.UserManager; @@ -61,7 +61,7 @@ public class PartyChatMessage extends AbstractChatMessage { */ private void messagePartyChatSpies(@NotNull TextComponent spyMessage) { //Find the people with permissions - for(McMMOPlayer mcMMOPlayer : UserManager.getPlayers()) { + for(OnlineMMOPlayer mcMMOPlayer : UserManager.getPlayers()) { Player player = mcMMOPlayer.getPlayer(); //Check for toggled players diff --git a/src/main/java/com/gmail/nossr50/commands/AbilityToggleCommand.java b/src/main/java/com/gmail/nossr50/commands/AbilityToggleCommand.java index 0388a1852..9f6438483 100644 --- a/src/main/java/com/gmail/nossr50/commands/AbilityToggleCommand.java +++ b/src/main/java/com/gmail/nossr50/commands/AbilityToggleCommand.java @@ -1,6 +1,6 @@ package com.gmail.nossr50.commands; -import com.gmail.nossr50.datatypes.player.McMMOPlayer; +import com.neetgames.mcmmo.player.OnlineMMOPlayer; import com.gmail.nossr50.locale.LocaleLoader; import com.gmail.nossr50.util.Permissions; import org.bukkit.command.CommandSender; @@ -18,7 +18,7 @@ public class AbilityToggleCommand extends ToggleCommand { } @Override - protected void applyCommandAction(@NotNull McMMOPlayer mmoPlayer) { + protected void applyCommandAction(@NotNull OnlineMMOPlayer mmoPlayer) { mmoPlayer.getPlayer().sendMessage(LocaleLoader.getString("Commands.Ability." + (mmoPlayer.getSuperAbilityManager().getAbilityActivationPermission() ? "Off" : "On"))); mmoPlayer.getSuperAbilityManager().toggleAbilityActivationPermission(); } diff --git a/src/main/java/com/gmail/nossr50/commands/CommandManager.java b/src/main/java/com/gmail/nossr50/commands/CommandManager.java index 8732924c1..ae209c23f 100644 --- a/src/main/java/com/gmail/nossr50/commands/CommandManager.java +++ b/src/main/java/com/gmail/nossr50/commands/CommandManager.java @@ -7,7 +7,7 @@ import com.gmail.nossr50.commands.chat.AdminChatCommand; import com.gmail.nossr50.commands.chat.PartyChatCommand; import com.gmail.nossr50.config.ChatConfig; import com.gmail.nossr50.datatypes.chat.ChatChannel; -import com.gmail.nossr50.datatypes.player.McMMOPlayer; +import com.neetgames.mcmmo.player.OnlineMMOPlayer; import com.gmail.nossr50.locale.LocaleLoader; import com.gmail.nossr50.mcMMO; import com.gmail.nossr50.util.Permissions; @@ -103,7 +103,7 @@ public class CommandManager { } public void validatePlayerParty(@NotNull Player player) { - McMMOPlayer mmoPlayer = mcMMO.getUserManager().queryPlayer(player); + OnlineMMOPlayer mmoPlayer = mcMMO.getUserManager().queryPlayer(player); if(mmoPlayer.getParty() == null) { throw new ConditionFailedException(LocaleLoader.getString("Commands.Party.None")); diff --git a/src/main/java/com/gmail/nossr50/commands/MHDCommand.java b/src/main/java/com/gmail/nossr50/commands/MHDCommand.java index 7340b277e..bca6805fe 100644 --- a/src/main/java/com/gmail/nossr50/commands/MHDCommand.java +++ b/src/main/java/com/gmail/nossr50/commands/MHDCommand.java @@ -3,7 +3,7 @@ package com.gmail.nossr50.commands; import com.gmail.nossr50.config.Config; import com.gmail.nossr50.database.FlatFileDatabaseManager; import com.gmail.nossr50.database.SQLDatabaseManager; -import com.gmail.nossr50.datatypes.player.McMMOPlayer; +import com.neetgames.mcmmo.player.OnlineMMOPlayer; import com.gmail.nossr50.mcMMO; import com.google.common.collect.ImmutableList; import org.bukkit.command.Command; @@ -20,7 +20,7 @@ public class MHDCommand implements TabExecutor { if (mcMMO.getDatabaseManager() instanceof SQLDatabaseManager) { SQLDatabaseManager m = (SQLDatabaseManager) mcMMO.getDatabaseManager(); m.resetMobHealthSettings(); - for (McMMOPlayer mmoPlayer : mcMMO.getUserManager().getPlayers()) { + for (OnlineMMOPlayer mmoPlayer : mcMMO.getUserManager().getPlayers()) { mmoPlayer.setMobHealthBarType(Config.getInstance().getMobHealthbarDefault()); } sender.sendMessage("Mob health reset"); @@ -29,7 +29,7 @@ public class MHDCommand implements TabExecutor { if (mcMMO.getDatabaseManager() instanceof FlatFileDatabaseManager) { FlatFileDatabaseManager m = (FlatFileDatabaseManager) mcMMO.getDatabaseManager(); m.resetMobHealthSettings(); - for (McMMOPlayer mmoPlayer : mcMMO.getUserManager().getPlayers()) { + for (OnlineMMOPlayer mmoPlayer : mcMMO.getUserManager().getPlayers()) { mmoPlayer.setMobHealthBarType(Config.getInstance().getMobHealthbarDefault()); } sender.sendMessage("Mob health reset"); diff --git a/src/main/java/com/gmail/nossr50/commands/McgodCommand.java b/src/main/java/com/gmail/nossr50/commands/McgodCommand.java index fc36a34f8..ac099ea87 100644 --- a/src/main/java/com/gmail/nossr50/commands/McgodCommand.java +++ b/src/main/java/com/gmail/nossr50/commands/McgodCommand.java @@ -1,6 +1,6 @@ package com.gmail.nossr50.commands; -import com.gmail.nossr50.datatypes.player.McMMOPlayer; +import com.neetgames.mcmmo.player.OnlineMMOPlayer; import com.gmail.nossr50.locale.LocaleLoader; import com.gmail.nossr50.util.Permissions; import org.bukkit.command.CommandSender; @@ -18,7 +18,7 @@ public class McgodCommand extends ToggleCommand { } @Override - protected void applyCommandAction(@NotNull McMMOPlayer mmoPlayer) { + protected void applyCommandAction(@NotNull OnlineMMOPlayer mmoPlayer) { mmoPlayer.getPlayer().sendMessage(LocaleLoader.getString("Commands.GodMode." + (mmoPlayer.getGodMode() ? "Disabled" : "Enabled"))); mmoPlayer.toggleGodMode(); } diff --git a/src/main/java/com/gmail/nossr50/commands/McnotifyCommand.java b/src/main/java/com/gmail/nossr50/commands/McnotifyCommand.java index 41078203c..2724270b7 100644 --- a/src/main/java/com/gmail/nossr50/commands/McnotifyCommand.java +++ b/src/main/java/com/gmail/nossr50/commands/McnotifyCommand.java @@ -1,6 +1,6 @@ package com.gmail.nossr50.commands; -import com.gmail.nossr50.datatypes.player.McMMOPlayer; +import com.neetgames.mcmmo.player.OnlineMMOPlayer; import com.gmail.nossr50.locale.LocaleLoader; import com.gmail.nossr50.mcMMO; import com.gmail.nossr50.util.commands.CommandUtils; @@ -21,7 +21,7 @@ public class McnotifyCommand implements TabExecutor { } if (args.length == 0) { - McMMOPlayer mmoPlayer = mcMMO.getUserManager().queryPlayer((Player) sender); + OnlineMMOPlayer mmoPlayer = mcMMO.getUserManager().queryPlayer((Player) sender); //Not Loaded yet if (mmoPlayer == null) diff --git a/src/main/java/com/gmail/nossr50/commands/McrefreshCommand.java b/src/main/java/com/gmail/nossr50/commands/McrefreshCommand.java index 7618a2a92..95644b756 100644 --- a/src/main/java/com/gmail/nossr50/commands/McrefreshCommand.java +++ b/src/main/java/com/gmail/nossr50/commands/McrefreshCommand.java @@ -1,6 +1,6 @@ package com.gmail.nossr50.commands; -import com.gmail.nossr50.datatypes.player.McMMOPlayer; +import com.neetgames.mcmmo.player.OnlineMMOPlayer; import com.gmail.nossr50.locale.LocaleLoader; import com.gmail.nossr50.util.Permissions; import org.bukkit.command.CommandSender; @@ -18,7 +18,7 @@ public class McrefreshCommand extends ToggleCommand { } @Override - protected void applyCommandAction(@NotNull McMMOPlayer mmoPlayer) { + protected void applyCommandAction(@NotNull OnlineMMOPlayer mmoPlayer) { mmoPlayer.setRecentlyHurtTimestamp(0); mmoPlayer.getSuperAbilityManager().resetCooldowns(); mmoPlayer.getSuperAbilityManager().unprimeAllAbilityTools(); diff --git a/src/main/java/com/gmail/nossr50/commands/ToggleCommand.java b/src/main/java/com/gmail/nossr50/commands/ToggleCommand.java index 61a9f9fab..ccfd9a275 100644 --- a/src/main/java/com/gmail/nossr50/commands/ToggleCommand.java +++ b/src/main/java/com/gmail/nossr50/commands/ToggleCommand.java @@ -1,6 +1,6 @@ package com.gmail.nossr50.commands; -import com.gmail.nossr50.datatypes.player.McMMOPlayer; +import com.neetgames.mcmmo.player.OnlineMMOPlayer; import com.gmail.nossr50.locale.LocaleLoader; import com.gmail.nossr50.mcMMO; import com.gmail.nossr50.util.commands.CommandUtils; @@ -35,7 +35,7 @@ public abstract class ToggleCommand implements TabExecutor { return true; } - McMMOPlayer mmoPlayer = mcMMO.getUserManager().queryPlayer((Player) sender); + OnlineMMOPlayer mmoPlayer = mcMMO.getUserManager().queryPlayer((Player) sender); if(mmoPlayer != null) { applyCommandAction(mmoPlayer); @@ -53,7 +53,7 @@ public abstract class ToggleCommand implements TabExecutor { String playerName = CommandUtils.getMatchedPlayerName(args[0]); Player otherPlayer = Bukkit.getPlayer(playerName); - McMMOPlayer mmoOther = mcMMO.getUserManager().queryPlayer(otherPlayer); + OnlineMMOPlayer mmoOther = mcMMO.getUserManager().queryPlayer(otherPlayer); if (!CommandUtils.checkPlayerExistence(sender, playerName, mmoOther)) { return true; @@ -83,6 +83,6 @@ public abstract class ToggleCommand implements TabExecutor { protected abstract boolean hasOtherPermission(@NotNull CommandSender sender); protected abstract boolean hasSelfPermission(@NotNull CommandSender sender); - protected abstract void applyCommandAction(@NotNull McMMOPlayer mmoPlayer); + protected abstract void applyCommandAction(@NotNull OnlineMMOPlayer mmoPlayer); protected abstract void sendSuccessMessage(@NotNull CommandSender sender, @NotNull String playerName); } diff --git a/src/main/java/com/gmail/nossr50/commands/admin/PlayerDebugCommand.java b/src/main/java/com/gmail/nossr50/commands/admin/PlayerDebugCommand.java index 6e93b2ea5..f37922c74 100644 --- a/src/main/java/com/gmail/nossr50/commands/admin/PlayerDebugCommand.java +++ b/src/main/java/com/gmail/nossr50/commands/admin/PlayerDebugCommand.java @@ -1,6 +1,6 @@ package com.gmail.nossr50.commands.admin; -import com.gmail.nossr50.datatypes.player.McMMOPlayer; +import com.neetgames.mcmmo.player.OnlineMMOPlayer; import com.gmail.nossr50.locale.LocaleLoader; import com.gmail.nossr50.mcMMO; import com.gmail.nossr50.util.player.NotificationManager; @@ -15,7 +15,7 @@ public class PlayerDebugCommand implements CommandExecutor { @Override public boolean onCommand(@NotNull CommandSender sender, @NotNull Command command, @NotNull String label, String[] args) { if(sender instanceof Player) { - McMMOPlayer mmoPlayer = mcMMO.getUserManager().queryPlayer((Player) sender); + OnlineMMOPlayer mmoPlayer = mcMMO.getUserManager().queryPlayer((Player) sender); if(mmoPlayer == null) { sender.sendMessage(LocaleLoader.getString("Commands.NotLoaded")); diff --git a/src/main/java/com/gmail/nossr50/commands/chat/AdminChatCommand.java b/src/main/java/com/gmail/nossr50/commands/chat/AdminChatCommand.java index e2b2aef79..0c8713cbc 100644 --- a/src/main/java/com/gmail/nossr50/commands/chat/AdminChatCommand.java +++ b/src/main/java/com/gmail/nossr50/commands/chat/AdminChatCommand.java @@ -7,7 +7,7 @@ import co.aikar.commands.annotation.Conditions; import co.aikar.commands.annotation.Default; import com.gmail.nossr50.commands.CommandManager; import com.gmail.nossr50.datatypes.chat.ChatChannel; -import com.gmail.nossr50.datatypes.player.McMMOPlayer; +import com.neetgames.mcmmo.player.OnlineMMOPlayer; import com.gmail.nossr50.mcMMO; import com.gmail.nossr50.util.player.UserManager; import org.jetbrains.annotations.NotNull; @@ -26,7 +26,7 @@ public class AdminChatCommand extends BaseCommand { if(args == null || args.length == 0) { //Process with no arguments if(bukkitCommandIssuer.isPlayer()) { - McMMOPlayer mmoPlayer = UserManager.getPlayer(bukkitCommandIssuer.getPlayer()); + OnlineMMOPlayer mmoPlayer = UserManager.getPlayer(bukkitCommandIssuer.getPlayer()); pluginRef.getChatManager().setOrToggleChatChannel(mmoPlayer, ChatChannel.ADMIN); } else { //Not support for console @@ -34,7 +34,7 @@ public class AdminChatCommand extends BaseCommand { } } else { if(bukkitCommandIssuer.isPlayer()) { - McMMOPlayer mmoPlayer = UserManager.getPlayer(bukkitCommandIssuer.getPlayer()); + OnlineMMOPlayer mmoPlayer = UserManager.getPlayer(bukkitCommandIssuer.getPlayer()); if(mmoPlayer == null) return; diff --git a/src/main/java/com/gmail/nossr50/commands/chat/McChatSpy.java b/src/main/java/com/gmail/nossr50/commands/chat/McChatSpy.java index 101231f20..f02293fa3 100644 --- a/src/main/java/com/gmail/nossr50/commands/chat/McChatSpy.java +++ b/src/main/java/com/gmail/nossr50/commands/chat/McChatSpy.java @@ -1,7 +1,7 @@ package com.gmail.nossr50.commands.chat; import com.gmail.nossr50.commands.ToggleCommand; -import com.gmail.nossr50.datatypes.player.McMMOPlayer; +import com.neetgames.mcmmo.player.OnlineMMOPlayer; import com.gmail.nossr50.locale.LocaleLoader; import com.gmail.nossr50.util.Permissions; import org.bukkit.command.CommandSender; @@ -19,7 +19,7 @@ public class McChatSpy extends ToggleCommand { } @Override - protected void applyCommandAction(@NotNull McMMOPlayer mmoPlayer) { + protected void applyCommandAction(@NotNull OnlineMMOPlayer mmoPlayer) { mmoPlayer.getPlayer().sendMessage(LocaleLoader.getString("Commands.AdminChatSpy." + (mmoPlayer.isPartyChatSpying() ? "Disabled" : "Enabled"))); mmoPlayer.togglePartyChatSpying(); } diff --git a/src/main/java/com/gmail/nossr50/commands/chat/PartyChatCommand.java b/src/main/java/com/gmail/nossr50/commands/chat/PartyChatCommand.java index 9fc985308..bb859e29f 100644 --- a/src/main/java/com/gmail/nossr50/commands/chat/PartyChatCommand.java +++ b/src/main/java/com/gmail/nossr50/commands/chat/PartyChatCommand.java @@ -8,7 +8,7 @@ import co.aikar.commands.annotation.Default; import com.gmail.nossr50.commands.CommandManager; import com.gmail.nossr50.datatypes.chat.ChatChannel; import com.gmail.nossr50.datatypes.party.Party; -import com.gmail.nossr50.datatypes.player.McMMOPlayer; +import com.neetgames.mcmmo.player.OnlineMMOPlayer; import com.gmail.nossr50.mcMMO; import com.gmail.nossr50.party.PartyManager; import com.gmail.nossr50.util.player.UserManager; @@ -32,7 +32,7 @@ public class PartyChatCommand extends BaseCommand { if(args == null || args.length == 0) { //Process with no arguments if(bukkitCommandIssuer.isPlayer()) { - McMMOPlayer mmoPlayer = UserManager.getPlayer(bukkitCommandIssuer.getPlayer()); + OnlineMMOPlayer mmoPlayer = UserManager.getPlayer(bukkitCommandIssuer.getPlayer()); pluginRef.getChatManager().setOrToggleChatChannel(mmoPlayer, ChatChannel.PARTY); } else { //Not support for console @@ -45,7 +45,7 @@ public class PartyChatCommand extends BaseCommand { * Player Logic */ if(bukkitCommandIssuer.getIssuer() instanceof Player) { - McMMOPlayer mmoPlayer = UserManager.getPlayer(bukkitCommandIssuer.getPlayer()); + OnlineMMOPlayer mmoPlayer = UserManager.getPlayer(bukkitCommandIssuer.getPlayer()); processCommandArgsPlayer(mmoPlayer, args); /* * Console Logic @@ -57,11 +57,11 @@ public class PartyChatCommand extends BaseCommand { } /** - * Processes the command with arguments for a {@link McMMOPlayer} + * Processes the command with arguments for a {@link OnlineMMOPlayer} * @param mmoPlayer target player * @param args command arguments */ - private void processCommandArgsPlayer(@NotNull McMMOPlayer mmoPlayer, @NotNull String[] args) { + private void processCommandArgsPlayer(@NotNull OnlineMMOPlayer mmoPlayer, @NotNull String[] args) { //Player is not toggling and is chatting directly to party pluginRef.getChatManager().processPlayerMessage(mmoPlayer, args, ChatChannel.PARTY); } 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 c3cec9454..98ec5e212 100644 --- a/src/main/java/com/gmail/nossr50/commands/experience/ExperienceCommand.java +++ b/src/main/java/com/gmail/nossr50/commands/experience/ExperienceCommand.java @@ -1,6 +1,6 @@ package com.gmail.nossr50.commands.experience; -import com.gmail.nossr50.datatypes.player.McMMOPlayer; +import com.neetgames.mcmmo.player.OnlineMMOPlayer; import com.gmail.nossr50.datatypes.player.PlayerProfile; import com.gmail.nossr50.datatypes.skills.PrimarySkillType; import com.gmail.nossr50.locale.LocaleLoader; @@ -91,7 +91,7 @@ public abstract class ExperienceCommand implements TabExecutor { int value = Integer.parseInt(args[2]); String playerName = CommandUtils.getMatchedPlayerName(args[0]); - McMMOPlayer mmoPlayer = mcMMO.getUserManager().queryPlayerName(playerName); + OnlineMMOPlayer mmoPlayer = mcMMO.getUserManager().queryPlayerName(playerName); // If the mmoPlayer doesn't exist, create a temporary profile and check if it's present in the database. If it's not, abort the process. if (mmoPlayer == null) { 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 fe3b2e21b..43dce995e 100644 --- a/src/main/java/com/gmail/nossr50/commands/experience/SkillresetCommand.java +++ b/src/main/java/com/gmail/nossr50/commands/experience/SkillresetCommand.java @@ -1,7 +1,7 @@ package com.gmail.nossr50.commands.experience; import com.gmail.nossr50.datatypes.experience.XPGainReason; -import com.gmail.nossr50.datatypes.player.McMMOPlayer; +import com.neetgames.mcmmo.player.OnlineMMOPlayer; import com.gmail.nossr50.datatypes.player.PlayerProfile; import com.gmail.nossr50.datatypes.skills.PrimarySkillType; import com.gmail.nossr50.locale.LocaleLoader; @@ -73,7 +73,7 @@ public class SkillresetCommand implements TabExecutor { } String playerName = CommandUtils.getMatchedPlayerName(args[0]); - McMMOPlayer mmoPlayer = mcMMO.getUserManager().queryPlayerName(playerName); + OnlineMMOPlayer mmoPlayer = mcMMO.getUserManager().queryPlayerName(playerName); // If the mmoPlayer doesn't exist, create a temporary profile and check if it's present in the database. If it's not, abort the process. if (mmoPlayer == null) { diff --git a/src/main/java/com/gmail/nossr50/commands/party/PartyAcceptCommand.java b/src/main/java/com/gmail/nossr50/commands/party/PartyAcceptCommand.java index d24ef83fd..5cac693a2 100644 --- a/src/main/java/com/gmail/nossr50/commands/party/PartyAcceptCommand.java +++ b/src/main/java/com/gmail/nossr50/commands/party/PartyAcceptCommand.java @@ -1,6 +1,6 @@ package com.gmail.nossr50.commands.party; -import com.gmail.nossr50.datatypes.player.McMMOPlayer; +import com.neetgames.mcmmo.player.OnlineMMOPlayer; import com.gmail.nossr50.locale.LocaleLoader; import com.gmail.nossr50.mcMMO; import org.bukkit.command.Command; @@ -21,7 +21,7 @@ public class PartyAcceptCommand implements CommandExecutor { return true; } - McMMOPlayer mmoPlayer = mcMMO.getUserManager().queryPlayer(player); + OnlineMMOPlayer mmoPlayer = mcMMO.getUserManager().queryPlayer(player); if (!mmoPlayer.hasPartyInvite()) { diff --git a/src/main/java/com/gmail/nossr50/commands/party/PartyCommand.java b/src/main/java/com/gmail/nossr50/commands/party/PartyCommand.java index f4cf700f7..2d30ce01b 100644 --- a/src/main/java/com/gmail/nossr50/commands/party/PartyCommand.java +++ b/src/main/java/com/gmail/nossr50/commands/party/PartyCommand.java @@ -3,7 +3,7 @@ package com.gmail.nossr50.commands.party; import com.gmail.nossr50.commands.chat.PartyChatCommand; import com.gmail.nossr50.commands.party.teleport.PtpCommand; import com.gmail.nossr50.datatypes.party.Party; -import com.gmail.nossr50.datatypes.player.McMMOPlayer; +import com.neetgames.mcmmo.player.OnlineMMOPlayer; import com.gmail.nossr50.locale.LocaleLoader; import com.gmail.nossr50.mcMMO; import com.gmail.nossr50.util.Permissions; @@ -75,7 +75,7 @@ public class PartyCommand implements TabExecutor { return true; } - McMMOPlayer mmoPlayer = mcMMO.getUserManager().queryPlayer(player); + OnlineMMOPlayer mmoPlayer = mcMMO.getUserManager().queryPlayer(player); if (args.length < 1) { if (!mcMMO.getPartyManager().mmoPlayer.inParty()) { diff --git a/src/main/java/com/gmail/nossr50/commands/party/PartyCreateCommand.java b/src/main/java/com/gmail/nossr50/commands/party/PartyCreateCommand.java index 6051c65c1..adf87df51 100644 --- a/src/main/java/com/gmail/nossr50/commands/party/PartyCreateCommand.java +++ b/src/main/java/com/gmail/nossr50/commands/party/PartyCreateCommand.java @@ -1,6 +1,6 @@ package com.gmail.nossr50.commands.party; -import com.gmail.nossr50.datatypes.player.McMMOPlayer; +import com.neetgames.mcmmo.player.OnlineMMOPlayer; import com.gmail.nossr50.locale.LocaleLoader; import com.gmail.nossr50.mcMMO; import org.bukkit.command.Command; @@ -16,7 +16,7 @@ public class PartyCreateCommand implements CommandExecutor { case 2: case 3: Player player = (Player) sender; - McMMOPlayer mmoPlayer = mcMMO.getUserManager().queryPlayer(player); + OnlineMMOPlayer mmoPlayer = mcMMO.getUserManager().queryPlayer(player); if(mcMMO.getUserManager().queryPlayer(player) == null) { diff --git a/src/main/java/com/gmail/nossr50/commands/party/PartyInfoCommand.java b/src/main/java/com/gmail/nossr50/commands/party/PartyInfoCommand.java index 75424f361..66f18a966 100644 --- a/src/main/java/com/gmail/nossr50/commands/party/PartyInfoCommand.java +++ b/src/main/java/com/gmail/nossr50/commands/party/PartyInfoCommand.java @@ -3,7 +3,7 @@ package com.gmail.nossr50.commands.party; import com.gmail.nossr50.config.Config; import com.gmail.nossr50.datatypes.party.Party; import com.gmail.nossr50.datatypes.party.PartyFeature; -import com.gmail.nossr50.datatypes.player.McMMOPlayer; +import com.neetgames.mcmmo.player.OnlineMMOPlayer; import com.gmail.nossr50.locale.LocaleLoader; import com.gmail.nossr50.mcMMO; import org.bukkit.command.Command; @@ -27,7 +27,7 @@ public class PartyInfoCommand implements CommandExecutor { return true; } Player player = (Player) sender; - McMMOPlayer mmoPlayer = mcMMO.getUserManager().queryPlayer(player); + OnlineMMOPlayer mmoPlayer = mcMMO.getUserManager().queryPlayer(player); Party party = mmoPlayer.getParty(); displayPartyHeader(player, party); @@ -101,7 +101,7 @@ public class PartyInfoCommand implements CommandExecutor { player.sendMessage(LocaleLoader.getString("Commands.Party.ShareMode") + expShareInfo); } - private void displayMemberInfo(Player player, McMMOPlayer mmoPlayer, Party party) { + private void displayMemberInfo(Player player, OnlineMMOPlayer mmoPlayer, Party party) { /* * Only show members of the party that this member can see */ diff --git a/src/main/java/com/gmail/nossr50/commands/party/PartyInviteCommand.java b/src/main/java/com/gmail/nossr50/commands/party/PartyInviteCommand.java index 51bb5ccea..32aef2b9c 100644 --- a/src/main/java/com/gmail/nossr50/commands/party/PartyInviteCommand.java +++ b/src/main/java/com/gmail/nossr50/commands/party/PartyInviteCommand.java @@ -2,7 +2,7 @@ package com.gmail.nossr50.commands.party; import com.gmail.nossr50.config.Config; import com.gmail.nossr50.datatypes.party.Party; -import com.gmail.nossr50.datatypes.player.McMMOPlayer; +import com.neetgames.mcmmo.player.OnlineMMOPlayer; import com.gmail.nossr50.locale.LocaleLoader; import com.gmail.nossr50.mcMMO; import com.gmail.nossr50.util.commands.CommandUtils; @@ -17,7 +17,7 @@ public class PartyInviteCommand implements CommandExecutor { public boolean onCommand(@NotNull CommandSender sender, @NotNull Command command, @NotNull String label, String[] args) { if (args.length == 2) { String targetName = CommandUtils.getMatchedPlayerName(args[1]); - McMMOPlayer mcMMOTarget = mcMMO.getUserManager().queryPlayerName(targetName); + OnlineMMOPlayer mcMMOTarget = mcMMO.getUserManager().queryPlayerName(targetName); if (!CommandUtils.checkPlayerExistence(sender, targetName, mcMMOTarget)) { return false; @@ -31,7 +31,7 @@ public class PartyInviteCommand implements CommandExecutor { } Player player = (Player) sender; - McMMOPlayer mmoPlayer = mcMMO.getUserManager().queryPlayer(player); + OnlineMMOPlayer mmoPlayer = mcMMO.getUserManager().queryPlayer(player); String playerName = player.getName(); if (player.equals(target)) { diff --git a/src/main/java/com/gmail/nossr50/commands/party/PartyQuitCommand.java b/src/main/java/com/gmail/nossr50/commands/party/PartyQuitCommand.java index a3bb9d0a8..51a4b0253 100644 --- a/src/main/java/com/gmail/nossr50/commands/party/PartyQuitCommand.java +++ b/src/main/java/com/gmail/nossr50/commands/party/PartyQuitCommand.java @@ -1,7 +1,7 @@ package com.gmail.nossr50.commands.party; import com.gmail.nossr50.datatypes.party.Party; -import com.gmail.nossr50.datatypes.player.McMMOPlayer; +import com.neetgames.mcmmo.player.OnlineMMOPlayer; import com.gmail.nossr50.events.party.McMMOPartyChangeEvent.EventReason; import com.gmail.nossr50.locale.LocaleLoader; import org.bukkit.command.Command; @@ -21,7 +21,7 @@ public class PartyQuitCommand implements CommandExecutor { return true; } - McMMOPlayer mmoPlayer = mcMMO.getUserManager().getPlayer(player); + OnlineMMOPlayer mmoPlayer = mcMMO.getUserManager().getPlayer(player); Party playerParty = mmoPlayer.getParty(); if (!mcMMO.getPartyManager().handlePartyChangeEvent(player, playerParty.getPartyName(), null, EventReason.LEFT_PARTY)) { diff --git a/src/main/java/com/gmail/nossr50/commands/party/PartyRenameCommand.java b/src/main/java/com/gmail/nossr50/commands/party/PartyRenameCommand.java index afee924cf..835be6f4b 100644 --- a/src/main/java/com/gmail/nossr50/commands/party/PartyRenameCommand.java +++ b/src/main/java/com/gmail/nossr50/commands/party/PartyRenameCommand.java @@ -2,7 +2,7 @@ package com.gmail.nossr50.commands.party; import com.gmail.nossr50.datatypes.party.Party; import com.gmail.nossr50.datatypes.party.PartyMember; -import com.gmail.nossr50.datatypes.player.McMMOPlayer; +import com.neetgames.mcmmo.player.OnlineMMOPlayer; import com.gmail.nossr50.events.party.McMMOPartyChangeEvent.EventReason; import com.gmail.nossr50.locale.LocaleLoader; import com.gmail.nossr50.mcMMO; @@ -21,7 +21,7 @@ public class PartyRenameCommand implements CommandExecutor { return true; } - McMMOPlayer mmoPlayer = mcMMO.getUserManager().queryPlayer((Player) sender); + OnlineMMOPlayer mmoPlayer = mcMMO.getUserManager().queryPlayer((Player) sender); Party playerParty = mmoPlayer.getParty(); String oldPartyName = playerParty.getPartyName(); diff --git a/src/main/java/com/gmail/nossr50/commands/party/teleport/PtpAcceptAnyCommand.java b/src/main/java/com/gmail/nossr50/commands/party/teleport/PtpAcceptAnyCommand.java index 4c532f595..5f87bd541 100644 --- a/src/main/java/com/gmail/nossr50/commands/party/teleport/PtpAcceptAnyCommand.java +++ b/src/main/java/com/gmail/nossr50/commands/party/teleport/PtpAcceptAnyCommand.java @@ -3,7 +3,7 @@ package com.gmail.nossr50.commands.party.teleport; import com.gmail.nossr50.datatypes.party.Party; import com.gmail.nossr50.datatypes.party.PartyMember; import com.gmail.nossr50.datatypes.party.PartyTeleportRecord; -import com.gmail.nossr50.datatypes.player.McMMOPlayer; +import com.neetgames.mcmmo.player.OnlineMMOPlayer; import com.gmail.nossr50.locale.LocaleLoader; import com.gmail.nossr50.mcMMO; import com.gmail.nossr50.util.Permissions; @@ -26,7 +26,7 @@ public class PtpAcceptAnyCommand implements CommandExecutor { return false; Player playerSender = (Player) sender; - McMMOPlayer mmoPlayer = mcMMO.getUserManager().queryPlayer(playerSender); + OnlineMMOPlayer mmoPlayer = mcMMO.getUserManager().queryPlayer(playerSender); if(mmoPlayer == null) { playerSender.sendMessage(LocaleLoader.getString("Commands.NotLoaded")); diff --git a/src/main/java/com/gmail/nossr50/commands/party/teleport/PtpCommand.java b/src/main/java/com/gmail/nossr50/commands/party/teleport/PtpCommand.java index d33bd3cc0..a7d34677b 100644 --- a/src/main/java/com/gmail/nossr50/commands/party/teleport/PtpCommand.java +++ b/src/main/java/com/gmail/nossr50/commands/party/teleport/PtpCommand.java @@ -5,7 +5,7 @@ import com.gmail.nossr50.config.WorldBlacklist; import com.gmail.nossr50.datatypes.party.Party; import com.gmail.nossr50.datatypes.party.PartyFeature; import com.gmail.nossr50.datatypes.party.PartyTeleportRecord; -import com.gmail.nossr50.datatypes.player.McMMOPlayer; +import com.neetgames.mcmmo.player.OnlineMMOPlayer; import com.gmail.nossr50.locale.LocaleLoader; import com.gmail.nossr50.mcMMO; import com.gmail.nossr50.runnables.items.TeleportationWarmup; @@ -65,7 +65,7 @@ public class PtpCommand implements TabExecutor { return true; } - McMMOPlayer mmoPlayer = mcMMO.getUserManager().queryPlayer(player); + OnlineMMOPlayer mmoPlayer = mcMMO.getUserManager().queryPlayer(player); if (!mmoPlayer.inParty()) { sender.sendMessage(LocaleLoader.getString("Commands.Party.None")); @@ -139,7 +139,7 @@ public class PtpCommand implements TabExecutor { } Player player = (Player) sender; - McMMOPlayer mmoPlayer = mcMMO.getUserManager().queryPlayer(player); + OnlineMMOPlayer mmoPlayer = mcMMO.getUserManager().queryPlayer(player); if (!mmoPlayer.inParty()) { return ImmutableList.of(); @@ -159,7 +159,7 @@ public class PtpCommand implements TabExecutor { return; } - McMMOPlayer mcMMOTarget = mcMMO.getUserManager().getPlayer(targetName); + OnlineMMOPlayer mcMMOTarget = mcMMO.getUserManager().getPlayer(targetName); Player target = mcMMOTarget.getPlayer(); @@ -196,7 +196,7 @@ public class PtpCommand implements TabExecutor { } protected static boolean canTeleport(CommandSender sender, Player player, String targetName) { - McMMOPlayer mcMMOTarget = mcMMO.getUserManager().getPlayer(targetName); + OnlineMMOPlayer mcMMOTarget = mcMMO.getUserManager().getPlayer(targetName); if (!CommandUtils.checkPlayerExistence(sender, targetName, mcMMOTarget)) { return false; @@ -240,8 +240,8 @@ public class PtpCommand implements TabExecutor { return; } - McMMOPlayer mmoPlayer = mcMMO.getUserManager().queryPlayer(teleportingPlayer); - McMMOPlayer mcMMOTarget = mcMMO.getUserManager().queryPlayer(targetPlayer); + OnlineMMOPlayer mmoPlayer = mcMMO.getUserManager().queryPlayer(teleportingPlayer); + OnlineMMOPlayer mcMMOTarget = mcMMO.getUserManager().queryPlayer(targetPlayer); long warmup = Config.getInstance().getPTPCommandWarmup(); 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 9ba96359e..74a705f75 100644 --- a/src/main/java/com/gmail/nossr50/commands/player/InspectCommand.java +++ b/src/main/java/com/gmail/nossr50/commands/player/InspectCommand.java @@ -1,7 +1,7 @@ package com.gmail.nossr50.commands.player; import com.gmail.nossr50.config.Config; -import com.gmail.nossr50.datatypes.player.McMMOPlayer; +import com.neetgames.mcmmo.player.OnlineMMOPlayer; import com.gmail.nossr50.datatypes.player.PlayerProfile; import com.gmail.nossr50.datatypes.skills.PrimarySkillType; import com.gmail.nossr50.locale.LocaleLoader; diff --git a/src/main/java/com/gmail/nossr50/commands/player/MccooldownCommand.java b/src/main/java/com/gmail/nossr50/commands/player/MccooldownCommand.java index a1a5716f5..f26fdc032 100644 --- a/src/main/java/com/gmail/nossr50/commands/player/MccooldownCommand.java +++ b/src/main/java/com/gmail/nossr50/commands/player/MccooldownCommand.java @@ -1,7 +1,7 @@ package com.gmail.nossr50.commands.player; 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.SuperAbilityType; import com.gmail.nossr50.locale.LocaleLoader; import com.gmail.nossr50.util.commands.CommandUtils; @@ -42,7 +42,7 @@ public class MccooldownCommand implements TabExecutor { return true; } - McMMOPlayer mmoPlayer = mcMMO.getUserManager().getPlayer(player); + OnlineMMOPlayer mmoPlayer = mcMMO.getUserManager().getPlayer(player); player.sendMessage(LocaleLoader.getString("Commands.Cooldowns.Header")); player.sendMessage(LocaleLoader.getString("mcMMO.NoSkillNote")); diff --git a/src/main/java/com/gmail/nossr50/commands/player/McrankCommand.java b/src/main/java/com/gmail/nossr50/commands/player/McrankCommand.java index db162309a..e751306ec 100644 --- a/src/main/java/com/gmail/nossr50/commands/player/McrankCommand.java +++ b/src/main/java/com/gmail/nossr50/commands/player/McrankCommand.java @@ -1,7 +1,7 @@ package com.gmail.nossr50.commands.player; import com.gmail.nossr50.config.Config; -import com.gmail.nossr50.datatypes.player.McMMOPlayer; +import com.neetgames.mcmmo.player.OnlineMMOPlayer; import com.gmail.nossr50.locale.LocaleLoader; import com.gmail.nossr50.mcMMO; import com.gmail.nossr50.runnables.commands.McrankCommandAsyncTask; @@ -52,7 +52,7 @@ public class McrankCommand implements TabExecutor { } String playerName = CommandUtils.getMatchedPlayerName(args[0]); - McMMOPlayer mmoPlayer = mcMMO.getUserManager().queryPlayerName(playerName); + OnlineMMOPlayer mmoPlayer = mcMMO.getUserManager().queryPlayerName(playerName); if (mmoPlayer != null) { Player player = mmoPlayer.getPlayer(); @@ -82,7 +82,7 @@ public class McrankCommand implements TabExecutor { private void display(CommandSender sender, String playerName) { if (sender instanceof Player) { - McMMOPlayer mmoPlayer = mcMMO.getUserManager().getPlayer(sender.getName()); + OnlineMMOPlayer mmoPlayer = mcMMO.getUserManager().getPlayer(sender.getName()); if(mmoPlayer == null) { @@ -113,7 +113,7 @@ public class McrankCommand implements TabExecutor { new McrankCommandAsyncTask(playerName, sender, useBoard, useChat).runTaskAsynchronously(mcMMO.p); } - private long getCDSeconds(McMMOPlayer mmoPlayer, long cooldownMillis) { + private long getCDSeconds(OnlineMMOPlayer mmoPlayer, long cooldownMillis) { return ((mmoPlayer.getDatabaseCommandATS() + cooldownMillis) - System.currentTimeMillis()); } } diff --git a/src/main/java/com/gmail/nossr50/commands/player/McstatsCommand.java b/src/main/java/com/gmail/nossr50/commands/player/McstatsCommand.java index 0a9bf6b52..30a0104fa 100644 --- a/src/main/java/com/gmail/nossr50/commands/player/McstatsCommand.java +++ b/src/main/java/com/gmail/nossr50/commands/player/McstatsCommand.java @@ -1,7 +1,7 @@ package com.gmail.nossr50.commands.player; import com.gmail.nossr50.config.Config; -import com.gmail.nossr50.datatypes.player.McMMOPlayer; +import com.neetgames.mcmmo.player.OnlineMMOPlayer; import com.gmail.nossr50.locale.LocaleLoader; import com.gmail.nossr50.mcMMO; import com.gmail.nossr50.util.commands.CommandUtils; @@ -34,7 +34,7 @@ public class McstatsCommand implements TabExecutor { return true; } - McMMOPlayer mmoPlayer = mcMMO.getUserManager().queryPlayer(player); + OnlineMMOPlayer mmoPlayer = mcMMO.getUserManager().queryPlayer(player); if (Config.getInstance().getStatsUseBoard() && Config.getInstance().getScoreboardsEnabled()) { ScoreboardManager.enablePlayerStatsScoreboard(player); 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 962039278..93c021b75 100644 --- a/src/main/java/com/gmail/nossr50/commands/player/MctopCommand.java +++ b/src/main/java/com/gmail/nossr50/commands/player/MctopCommand.java @@ -1,7 +1,7 @@ package com.gmail.nossr50.commands.player; 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.locale.LocaleLoader; import com.gmail.nossr50.mcMMO; @@ -84,7 +84,7 @@ public class MctopCommand implements TabExecutor { return; } - McMMOPlayer mmoPlayer = mcMMO.getUserManager().getPlayer(sender.getName()); + OnlineMMOPlayer mmoPlayer = mcMMO.getUserManager().getPlayer(sender.getName()); long cooldownMillis = Math.max(Config.getInstance().getDatabasePlayerCooldown(), 1750); if (mmoPlayer.getDatabaseCommandATS() + cooldownMillis > System.currentTimeMillis()) { diff --git a/src/main/java/com/gmail/nossr50/commands/player/XPBarCommand.java b/src/main/java/com/gmail/nossr50/commands/player/XPBarCommand.java index 47f21fd16..d05aabe31 100644 --- a/src/main/java/com/gmail/nossr50/commands/player/XPBarCommand.java +++ b/src/main/java/com/gmail/nossr50/commands/player/XPBarCommand.java @@ -1,6 +1,6 @@ package com.gmail.nossr50.commands.player; -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.experience.MMOExperienceBarManager; import com.gmail.nossr50.util.player.NotificationManager; @@ -23,7 +23,7 @@ public class XPBarCommand implements TabExecutor { @Override public boolean onCommand(@NotNull CommandSender sender, @NotNull Command command, @NotNull String label, @NotNull String[] args) { if(sender instanceof Player) { - McMMOPlayer mmoPlayer = mcMMO.getUserManager().getPlayer((Player) sender); + OnlineMMOPlayer mmoPlayer = mcMMO.getUserManager().getPlayer((Player) sender); if(mmoPlayer == null) { NotificationManager.sendPlayerInformationChatOnlyPrefixed(mmoPlayer.getPlayer(), "Profile.PendingLoad"); return false; 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 3084d726c..ab81fbe23 100644 --- a/src/main/java/com/gmail/nossr50/commands/skills/AcrobaticsCommand.java +++ b/src/main/java/com/gmail/nossr50/commands/skills/AcrobaticsCommand.java @@ -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 statsDisplay(@NotNull McMMOPlayer mmoPlayer, float skillValue, boolean hasEndurance, boolean isLucky) { + protected @NotNull List statsDisplay(@NotNull OnlineMMOPlayer mmoPlayer, float skillValue, boolean hasEndurance, boolean isLucky) { List messages = new ArrayList<>(); if (canDodge) { @@ -90,7 +90,7 @@ public class AcrobaticsCommand extends SkillCommand { } @Override - protected @NotNull List getTextComponents(@NotNull McMMOPlayer mmoPlayer) { + protected @NotNull List getTextComponents(@NotNull OnlineMMOPlayer mmoPlayer) { List textComponents = new ArrayList<>(); TextComponentFactory.getSubSkillTextComponents(mmoPlayer, textComponents, PrimarySkillType.ACROBATICS); 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 9cf24c7cb..ddb9ad3e1 100644 --- a/src/main/java/com/gmail/nossr50/commands/skills/AlchemyCommand.java +++ b/src/main/java/com/gmail/nossr50/commands/skills/AlchemyCommand.java @@ -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 statsDisplay(@NotNull McMMOPlayer mmoPlayer, float skillValue, boolean hasEndurance, boolean isLucky) { + protected @NotNull List statsDisplay(@NotNull OnlineMMOPlayer mmoPlayer, float skillValue, boolean hasEndurance, boolean isLucky) { List messages = new ArrayList<>(); if (canCatalysis) { @@ -101,7 +101,7 @@ public class AlchemyCommand extends SkillCommand { } @Override - protected @NotNull List getTextComponents(@NotNull McMMOPlayer mmoPlayer) { + protected @NotNull List getTextComponents(@NotNull OnlineMMOPlayer mmoPlayer) { List textComponents = new ArrayList<>(); TextComponentFactory.getSubSkillTextComponents(mmoPlayer, textComponents, PrimarySkillType.ALCHEMY); 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 c449cb494..21b6309a4 100644 --- a/src/main/java/com/gmail/nossr50/commands/skills/ArcheryCommand.java +++ b/src/main/java/com/gmail/nossr50/commands/skills/ArcheryCommand.java @@ -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 statsDisplay(@NotNull McMMOPlayer mmoPlayer, float skillValue, boolean hasEndurance, boolean isLucky) { + protected @NotNull List statsDisplay(@NotNull OnlineMMOPlayer mmoPlayer, float skillValue, boolean hasEndurance, boolean isLucky) { List messages = new ArrayList<>(); if (canRetrieve) { @@ -85,7 +85,7 @@ public class ArcheryCommand extends SkillCommand { } @Override - protected @NotNull List getTextComponents(@NotNull McMMOPlayer mmoPlayer) { + protected @NotNull List getTextComponents(@NotNull OnlineMMOPlayer mmoPlayer) { List textComponents = new ArrayList<>(); TextComponentFactory.getSubSkillTextComponents(mmoPlayer, textComponents, PrimarySkillType.ARCHERY); 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 733e67943..e8b4bcd9d 100644 --- a/src/main/java/com/gmail/nossr50/commands/skills/AxesCommand.java +++ b/src/main/java/com/gmail/nossr50/commands/skills/AxesCommand.java @@ -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 statsDisplay(@NotNull McMMOPlayer mmoPlayer, float skillValue, boolean hasEndurance, boolean isLucky) { + protected @NotNull List statsDisplay(@NotNull OnlineMMOPlayer mmoPlayer, float skillValue, boolean hasEndurance, boolean isLucky) { List messages = new ArrayList<>(); if (canImpact) { @@ -105,7 +105,7 @@ public class AxesCommand extends SkillCommand { } @Override - protected @NotNull List getTextComponents(@NotNull McMMOPlayer mmoPlayer) { + protected @NotNull List getTextComponents(@NotNull OnlineMMOPlayer mmoPlayer) { List textComponents = new ArrayList<>(); TextComponentFactory.getSubSkillTextComponents(mmoPlayer, textComponents, PrimarySkillType.AXES); diff --git a/src/main/java/com/gmail/nossr50/commands/skills/CrossbowsCommand.java b/src/main/java/com/gmail/nossr50/commands/skills/CrossbowsCommand.java index 6fb2d6b44..2029cd43c 100644 --- a/src/main/java/com/gmail/nossr50/commands/skills/CrossbowsCommand.java +++ b/src/main/java/com/gmail/nossr50/commands/skills/CrossbowsCommand.java @@ -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 statsDisplay(@NotNull McMMOPlayer mmoPlayer, float skillValue, boolean hasEndurance, boolean isLucky) { + protected @NotNull List statsDisplay(@NotNull OnlineMMOPlayer mmoPlayer, float skillValue, boolean hasEndurance, boolean isLucky) { List messages = new ArrayList<>(); CrossbowManager crossbowManager = mmoPlayer.getCrossbowManager(); @@ -41,7 +41,7 @@ public class CrossbowsCommand extends SkillCommand { } @Override - protected List getTextComponents(@NotNull McMMOPlayer mmoPlayer) { + protected List getTextComponents(@NotNull OnlineMMOPlayer mmoPlayer) { List textComponents = new ArrayList<>(); TextComponentFactory.getSubSkillTextComponents(mmoPlayer, textComponents, PrimarySkillType.CROSSBOWS); 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 f4ca42cf5..7fcbfc5a5 100644 --- a/src/main/java/com/gmail/nossr50/commands/skills/ExcavationCommand.java +++ b/src/main/java/com/gmail/nossr50/commands/skills/ExcavationCommand.java @@ -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 statsDisplay(@NotNull McMMOPlayer mmoPlayer, float skillValue, boolean hasEndurance, boolean isLucky) { + protected @NotNull List statsDisplay(@NotNull OnlineMMOPlayer mmoPlayer, float skillValue, boolean hasEndurance, boolean isLucky) { List messages = new ArrayList<>(); ExcavationManager excavationManager = mmoPlayer.getExcavationManager(); @@ -66,7 +66,7 @@ public class ExcavationCommand extends SkillCommand { } @Override - protected @NotNull List getTextComponents(@NotNull McMMOPlayer mmoPlayer) { + protected @NotNull List getTextComponents(@NotNull OnlineMMOPlayer mmoPlayer) { List textComponents = new ArrayList<>(); TextComponentFactory.getSubSkillTextComponents(mmoPlayer, textComponents, PrimarySkillType.EXCAVATION); 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 9a2a4686c..3fcb4e45a 100644 --- a/src/main/java/com/gmail/nossr50/commands/skills/FishingCommand.java +++ b/src/main/java/com/gmail/nossr50/commands/skills/FishingCommand.java @@ -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 statsDisplay(@NotNull McMMOPlayer mmoPlayer, float skillValue, boolean hasEndurance, boolean isLucky) { + protected @NotNull List statsDisplay(@NotNull OnlineMMOPlayer mmoPlayer, float skillValue, boolean hasEndurance, boolean isLucky) { List messages = new ArrayList<>(); if (canFishermansDiet) { @@ -152,7 +152,7 @@ public class FishingCommand extends SkillCommand { } @Override - protected @NotNull List getTextComponents(@NotNull McMMOPlayer mmoPlayer) { + protected @NotNull List getTextComponents(@NotNull OnlineMMOPlayer mmoPlayer) { List textComponents = new ArrayList<>(); TextComponentFactory.getSubSkillTextComponents(mmoPlayer, textComponents, PrimarySkillType.FISHING); 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 097e04de8..ba87ceb29 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.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 statsDisplay(@NotNull McMMOPlayer mmoPlayer, float skillValue, boolean hasEndurance, boolean isLucky) { + protected @NotNull List statsDisplay(@NotNull OnlineMMOPlayer mmoPlayer, float skillValue, boolean hasEndurance, boolean isLucky) { List messages = new ArrayList<>(); if (canDoubleDrop) { @@ -152,7 +152,7 @@ public class HerbalismCommand extends SkillCommand { } @Override - protected @NotNull List getTextComponents(@NotNull McMMOPlayer mmoPlayer) { + protected @NotNull List getTextComponents(@NotNull OnlineMMOPlayer mmoPlayer) { List textComponents = new ArrayList<>(); TextComponentFactory.getSubSkillTextComponents(mmoPlayer, textComponents, PrimarySkillType.HERBALISM); 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 037fce7a5..991b1af0e 100644 --- a/src/main/java/com/gmail/nossr50/commands/skills/MiningCommand.java +++ b/src/main/java/com/gmail/nossr50/commands/skills/MiningCommand.java @@ -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 statsDisplay(@NotNull McMMOPlayer mmoPlayer, float skillValue, boolean hasEndurance, boolean isLucky) { + protected @NotNull List statsDisplay(@NotNull OnlineMMOPlayer mmoPlayer, float skillValue, boolean hasEndurance, boolean isLucky) { List messages = new ArrayList<>(); if (canBiggerBombs) { @@ -111,7 +111,7 @@ public class MiningCommand extends SkillCommand { } @Override - protected @NotNull List getTextComponents(@NotNull McMMOPlayer mmoPlayer) { + protected @NotNull List getTextComponents(@NotNull OnlineMMOPlayer mmoPlayer) { List textComponents = new ArrayList<>(); TextComponentFactory.getSubSkillTextComponents(mmoPlayer, textComponents, PrimarySkillType.MINING); 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 aabdadc96..564c6a8ed 100644 --- a/src/main/java/com/gmail/nossr50/commands/skills/MmoInfoCommand.java +++ b/src/main/java/com/gmail/nossr50/commands/skills/MmoInfoCommand.java @@ -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); 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 5f7f508e7..582c0800b 100644 --- a/src/main/java/com/gmail/nossr50/commands/skills/RepairCommand.java +++ b/src/main/java/com/gmail/nossr50/commands/skills/RepairCommand.java @@ -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 statsDisplay(@NotNull McMMOPlayer mmoPlayer, float skillValue, boolean hasEndurance, boolean isLucky) { + protected @NotNull List statsDisplay(@NotNull OnlineMMOPlayer mmoPlayer, float skillValue, boolean hasEndurance, boolean isLucky) { List messages = new ArrayList<>(); if (canArcaneForge) { @@ -121,7 +121,7 @@ public class RepairCommand extends SkillCommand { } @Override - protected @NotNull List getTextComponents(@NotNull McMMOPlayer mmoPlayer) { + protected @NotNull List getTextComponents(@NotNull OnlineMMOPlayer mmoPlayer) { List textComponents = new ArrayList<>(); TextComponentFactory.getSubSkillTextComponents(mmoPlayer, textComponents, PrimarySkillType.REPAIR); 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 aaff8c18d..57bd44a5d 100644 --- a/src/main/java/com/gmail/nossr50/commands/skills/SalvageCommand.java +++ b/src/main/java/com/gmail/nossr50/commands/skills/SalvageCommand.java @@ -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 statsDisplay(@NotNull McMMOPlayer mmoPlayer, float skillValue, boolean hasEndurance, boolean isLucky) { + protected @NotNull List statsDisplay(@NotNull OnlineMMOPlayer mmoPlayer, float skillValue, boolean hasEndurance, boolean isLucky) { List messages = new ArrayList<>(); SalvageManager salvageManager = mmoPlayer.getSalvageManager(); @@ -64,7 +64,7 @@ public class SalvageCommand extends SkillCommand { } @Override - protected @NotNull List getTextComponents(@NotNull McMMOPlayer mmoPlayer) { + protected @NotNull List getTextComponents(@NotNull OnlineMMOPlayer mmoPlayer) { List textComponents = new ArrayList<>(); TextComponentFactory.getSubSkillTextComponents(mmoPlayer, textComponents, PrimarySkillType.SALVAGE); 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 77594def1..a74441dd9 100644 --- a/src/main/java/com/gmail/nossr50/commands/skills/SkillCommand.java +++ b/src/main/java/com/gmail/nossr50/commands/skills/SkillCommand.java @@ -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 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 effectsDisplay(); - protected abstract @NotNull List statsDisplay(@NotNull McMMOPlayer mmoPlayer, float skillValue, boolean hasEndurance, boolean isLucky); + protected abstract @NotNull List statsDisplay(@NotNull OnlineMMOPlayer mmoPlayer, float skillValue, boolean hasEndurance, boolean isLucky); - protected abstract @NotNull List getTextComponents(@NotNull McMMOPlayer player); + protected abstract @NotNull List 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); } } 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 7a30afa23..49434fa75 100644 --- a/src/main/java/com/gmail/nossr50/commands/skills/SmeltingCommand.java +++ b/src/main/java/com/gmail/nossr50/commands/skills/SmeltingCommand.java @@ -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 statsDisplay(@NotNull McMMOPlayer mmoPlayer, float skillValue, boolean hasEndurance, boolean isLucky) { + protected @NotNull List statsDisplay(@NotNull OnlineMMOPlayer mmoPlayer, float skillValue, boolean hasEndurance, boolean isLucky) { List messages = new ArrayList<>(); /*if (canFluxMine) { @@ -88,7 +88,7 @@ public class SmeltingCommand extends SkillCommand { } @Override - protected @NotNull List getTextComponents(@NotNull McMMOPlayer mmoPlayer) { + protected @NotNull List getTextComponents(@NotNull OnlineMMOPlayer mmoPlayer) { List textComponents = new ArrayList<>(); TextComponentFactory.getSubSkillTextComponents(mmoPlayer, textComponents, PrimarySkillType.SMELTING); 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 fa465fa4a..f6a5dad4a 100644 --- a/src/main/java/com/gmail/nossr50/commands/skills/SwordsCommand.java +++ b/src/main/java/com/gmail/nossr50/commands/skills/SwordsCommand.java @@ -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 statsDisplay(@NotNull McMMOPlayer mmoPlayer, float skillValue, boolean hasEndurance, boolean isLucky) { + protected @NotNull List statsDisplay(@NotNull OnlineMMOPlayer mmoPlayer, float skillValue, boolean hasEndurance, boolean isLucky) { List messages = new ArrayList<>(); int ruptureTicks = mmoPlayer.getSwordsManager().getRuptureBleedTicks(); @@ -110,7 +110,7 @@ public class SwordsCommand extends SkillCommand { } @Override - protected @NotNull List getTextComponents(@NotNull McMMOPlayer mmoPlayer) { + protected @NotNull List getTextComponents(@NotNull OnlineMMOPlayer mmoPlayer) { List textComponents = new ArrayList<>(); TextComponentFactory.getSubSkillTextComponents(mmoPlayer, textComponents, PrimarySkillType.SWORDS); 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 e22401d3f..db022e8c7 100644 --- a/src/main/java/com/gmail/nossr50/commands/skills/TamingCommand.java +++ b/src/main/java/com/gmail/nossr50/commands/skills/TamingCommand.java @@ -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 statsDisplay(@NotNull McMMOPlayer mmoPlayer, float skillValue, boolean hasEndurance, boolean isLucky) { + protected @NotNull List statsDisplay(@NotNull OnlineMMOPlayer mmoPlayer, float skillValue, boolean hasEndurance, boolean isLucky) { List messages = new ArrayList<>(); if (canEnvironmentallyAware) { @@ -93,7 +93,7 @@ public class TamingCommand extends SkillCommand { } @Override - protected @NotNull List getTextComponents(@NotNull McMMOPlayer mmoPlayer) { + protected @NotNull List getTextComponents(@NotNull OnlineMMOPlayer mmoPlayer) { List textComponents = new ArrayList<>(); TextComponentFactory.getSubSkillTextComponents(mmoPlayer, textComponents, this.skill); diff --git a/src/main/java/com/gmail/nossr50/commands/skills/TridentsCommand.java b/src/main/java/com/gmail/nossr50/commands/skills/TridentsCommand.java index bdd00aa42..4d1766bd4 100644 --- a/src/main/java/com/gmail/nossr50/commands/skills/TridentsCommand.java +++ b/src/main/java/com/gmail/nossr50/commands/skills/TridentsCommand.java @@ -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 statsDisplay(@NotNull McMMOPlayer mmoPlayer, float skillValue, boolean hasEndurance, boolean isLucky) { + protected @NotNull List statsDisplay(@NotNull OnlineMMOPlayer mmoPlayer, float skillValue, boolean hasEndurance, boolean isLucky) { return null; } @Override - protected @NotNull List getTextComponents(@NotNull McMMOPlayer mmoPlayer) { + protected @NotNull List getTextComponents(@NotNull OnlineMMOPlayer mmoPlayer) { List textComponents = new ArrayList<>(); TextComponentFactory.getSubSkillTextComponents(mmoPlayer, textComponents, PrimarySkillType.TRIDENTS); 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 3bff9e38c..81aa28c13 100644 --- a/src/main/java/com/gmail/nossr50/commands/skills/UnarmedCommand.java +++ b/src/main/java/com/gmail/nossr50/commands/skills/UnarmedCommand.java @@ -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 statsDisplay(@NotNull McMMOPlayer mmoPlayer, float skillValue, boolean hasEndurance, boolean isLucky) { + protected @NotNull List statsDisplay(@NotNull OnlineMMOPlayer mmoPlayer, float skillValue, boolean hasEndurance, boolean isLucky) { List messages = new ArrayList<>(); if (canDeflect) { @@ -123,7 +123,7 @@ public class UnarmedCommand extends SkillCommand { } @Override - protected @NotNull List getTextComponents(@NotNull McMMOPlayer mmoPlayer) { + protected @NotNull List getTextComponents(@NotNull OnlineMMOPlayer mmoPlayer) { List textComponents = new ArrayList<>(); TextComponentFactory.getSubSkillTextComponents(mmoPlayer, textComponents, PrimarySkillType.UNARMED); 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 34c43bc37..213bc7806 100644 --- a/src/main/java/com/gmail/nossr50/commands/skills/WoodcuttingCommand.java +++ b/src/main/java/com/gmail/nossr50/commands/skills/WoodcuttingCommand.java @@ -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 statsDisplay(@NotNull McMMOPlayer mmoPlayer, float skillValue, boolean hasEndurance, boolean isLucky) { + protected @NotNull List statsDisplay(@NotNull OnlineMMOPlayer mmoPlayer, float skillValue, boolean hasEndurance, boolean isLucky) { List messages = new ArrayList<>(); if (canDoubleDrop) { @@ -98,7 +98,7 @@ public class WoodcuttingCommand extends SkillCommand { } @Override - protected @NotNull List getTextComponents(@NotNull McMMOPlayer mmoPlayer) { + protected @NotNull List getTextComponents(@NotNull OnlineMMOPlayer mmoPlayer) { List textComponents = new ArrayList<>(); TextComponentFactory.getSubSkillTextComponents(mmoPlayer, textComponents, PrimarySkillType.WOODCUTTING); diff --git a/src/main/java/com/gmail/nossr50/datatypes/experience/ExperienceManager.java b/src/main/java/com/gmail/nossr50/datatypes/experience/ExperienceManager.java index 0af5c8f32..92e63ffc7 100644 --- a/src/main/java/com/gmail/nossr50/datatypes/experience/ExperienceManager.java +++ b/src/main/java/com/gmail/nossr50/datatypes/experience/ExperienceManager.java @@ -3,7 +3,7 @@ package com.gmail.nossr50.datatypes.experience; import com.gmail.nossr50.config.Config; import com.gmail.nossr50.config.experience.ExperienceConfig; import com.gmail.nossr50.datatypes.party.Party; -import com.gmail.nossr50.datatypes.player.McMMOPlayer; +import com.neetgames.mcmmo.player.OnlineMMOPlayer; import com.gmail.nossr50.datatypes.player.PersistentPlayerData; import com.gmail.nossr50.datatypes.skills.CoreSkillConstants; import com.gmail.nossr50.datatypes.skills.PrimarySkillType; @@ -30,9 +30,9 @@ public class ExperienceManager { private boolean isUsingUnarmed = false; private final @NotNull PersistentPlayerData persistentPlayerDataRef; - private @Nullable McMMOPlayer mmoPlayer; + private @Nullable OnlineMMOPlayer mmoPlayer; - public ExperienceManager(@NotNull McMMOPlayer mmoPlayer) { + public ExperienceManager(@NotNull OnlineMMOPlayer mmoPlayer) { this.mmoPlayer = mmoPlayer; this.persistentPlayerDataRef = mmoPlayer.getPersistentPlayerData(); } diff --git a/src/main/java/com/gmail/nossr50/datatypes/party/PartyMemberManager.java b/src/main/java/com/gmail/nossr50/datatypes/party/PartyMemberManager.java index e4627034a..66474c91b 100644 --- a/src/main/java/com/gmail/nossr50/datatypes/party/PartyMemberManager.java +++ b/src/main/java/com/gmail/nossr50/datatypes/party/PartyMemberManager.java @@ -2,7 +2,7 @@ package com.gmail.nossr50.datatypes.party; import com.gmail.nossr50.config.Config; import com.gmail.nossr50.datatypes.dirtydata.DirtySet; -import com.gmail.nossr50.datatypes.player.McMMOPlayer; +import com.neetgames.mcmmo.player.OnlineMMOPlayer; import com.gmail.nossr50.util.Misc; import com.neetgames.mcmmo.exceptions.InvalidPlayerException; import org.bukkit.OfflinePlayer; @@ -163,7 +163,7 @@ public class PartyMemberManager { * @param mmoPlayer The player to check * @return the near party members */ - public @NotNull List getNearMembers(@NotNull McMMOPlayer mmoPlayer) { + public @NotNull List getNearMembers(@NotNull OnlineMMOPlayer mmoPlayer) { List nearMembers = new ArrayList<>(); Party party = mmoPlayer.getParty(); 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 090f8af32..45fe82ed0 100644 --- a/src/main/java/com/gmail/nossr50/datatypes/player/McMMOPlayer.java +++ b/src/main/java/com/gmail/nossr50/datatypes/player/McMMOPlayer.java @@ -83,7 +83,7 @@ public class McMMOPlayer extends PlayerProfile implements OnlineMMOPlayer, Ident private final @NotNull AbilityActivationProcessor abilityActivationProcessor; /** - * Create a new {@link McMMOPlayer} with default values for a {@link Player} + * Create a new {@link OnlineMMOPlayer} with default values for a {@link Player} * @param player target player */ public McMMOPlayer(@NotNull Player player) { diff --git a/src/main/java/com/gmail/nossr50/datatypes/skills/subskills/acrobatics/Roll.java b/src/main/java/com/gmail/nossr50/datatypes/skills/subskills/acrobatics/Roll.java index 2fd2aff35..016eebf48 100644 --- a/src/main/java/com/gmail/nossr50/datatypes/skills/subskills/acrobatics/Roll.java +++ b/src/main/java/com/gmail/nossr50/datatypes/skills/subskills/acrobatics/Roll.java @@ -4,7 +4,7 @@ import com.gmail.nossr50.config.AdvancedConfig; import com.gmail.nossr50.config.experience.ExperienceConfig; import com.gmail.nossr50.datatypes.experience.XPGainReason; import com.gmail.nossr50.datatypes.interactions.NotificationType; -import com.gmail.nossr50.datatypes.player.McMMOPlayer; +import com.neetgames.mcmmo.player.OnlineMMOPlayer; import com.gmail.nossr50.datatypes.skills.SubSkillType; import com.gmail.nossr50.locale.LocaleLoader; import com.gmail.nossr50.mcMMO; @@ -65,7 +65,7 @@ public class Roll extends AcrobaticsSubSkill { return false; if (entityDamageEvent.getCause() == EntityDamageEvent.DamageCause.FALL) {//Grab the player - McMMOPlayer mmoPlayer = EventUtils.getMcMMOPlayer(entityDamageEvent.getEntity()); + OnlineMMOPlayer mmoPlayer = EventUtils.getMcMMOPlayer(entityDamageEvent.getEntity()); if (mmoPlayer == null) return false; @@ -119,7 +119,7 @@ public class Roll extends AcrobaticsSubSkill { String rollChance, rollChanceLucky, gracefulRollChance, gracefulRollChanceLucky; /* Values related to the player */ - McMMOPlayer mmoPlayer = mcMMO.getUserManager().queryPlayer(player); + OnlineMMOPlayer mmoPlayer = mcMMO.getUserManager().queryPlayer(player); float skillValue = mmoPlayer.getExperienceManager().getSkillLevel(getPrimarySkill()); boolean isLucky = Permissions.lucky(player, getPrimarySkill()); @@ -186,7 +186,7 @@ public class Roll extends AcrobaticsSubSkill { * @param damage The amount of damage initially dealt by the event * @return the modified event damage if the ability was successful, the original event damage otherwise */ - private double rollCheck(Player player, McMMOPlayer mmoPlayer, double damage) { + private double rollCheck(Player player, OnlineMMOPlayer mmoPlayer, double damage) { int skillLevel = mmoPlayer.getExperienceManager().getSkillLevel(getPrimarySkill()); @@ -221,7 +221,7 @@ public class Roll extends AcrobaticsSubSkill { return damage; } - private int getActivationChance(McMMOPlayer mmoPlayer) { + private int getActivationChance(OnlineMMOPlayer mmoPlayer) { return PerksUtils.handleLuckyPerks(mmoPlayer.getPlayer(), getPrimarySkill()); } @@ -231,7 +231,7 @@ public class Roll extends AcrobaticsSubSkill { * @param damage The amount of damage initially dealt by the event * @return the modified event damage if the ability was successful, the original event damage otherwise */ - private double gracefulRollCheck(Player player, McMMOPlayer mmoPlayer, double damage, int skillLevel) { + private double gracefulRollCheck(Player player, OnlineMMOPlayer mmoPlayer, double damage, int skillLevel) { double modifiedDamage = calculateModifiedRollDamage(damage, AdvancedConfig.getInstance().getRollDamageThreshold() * 2); RandomChanceSkill rcs = new RandomChanceSkill(player, subSkillType); @@ -269,7 +269,7 @@ public class Roll extends AcrobaticsSubSkill { return false; } - McMMOPlayer mmoPlayer = mcMMO.getUserManager().queryPlayer(player); + OnlineMMOPlayer mmoPlayer = mcMMO.getUserManager().queryPlayer(player); if (ItemUtils.hasItemInEitherHand(player, Material.ENDER_PEARL) || player.isInsideVehicle()) { if(mmoPlayer.isDebugMode()) { diff --git a/src/main/java/com/gmail/nossr50/datatypes/skills/subskills/interfaces/SubSkill.java b/src/main/java/com/gmail/nossr50/datatypes/skills/subskills/interfaces/SubSkill.java index d081a2482..390bbd709 100644 --- a/src/main/java/com/gmail/nossr50/datatypes/skills/subskills/interfaces/SubSkill.java +++ b/src/main/java/com/gmail/nossr50/datatypes/skills/subskills/interfaces/SubSkill.java @@ -1,6 +1,6 @@ package com.gmail.nossr50.datatypes.skills.subskills.interfaces; -import com.gmail.nossr50.datatypes.player.McMMOPlayer; +import com.neetgames.mcmmo.player.OnlineMMOPlayer; import com.gmail.nossr50.datatypes.skills.interfaces.Skill; import net.kyori.adventure.text.TextComponent; import org.bukkit.entity.Player; @@ -63,7 +63,7 @@ public interface SubSkill extends Skill { * @param componentBuilder target component builder * @param mmoPlayer owner of this skill */ - void addStats(TextComponent.Builder componentBuilder, @NotNull McMMOPlayer mmoPlayer); + void addStats(TextComponent.Builder componentBuilder, @NotNull OnlineMMOPlayer mmoPlayer); /** * Whether or not this subskill is enabled diff --git a/src/main/java/com/gmail/nossr50/listeners/BlockListener.java b/src/main/java/com/gmail/nossr50/listeners/BlockListener.java index 257eaf644..fd1185fc8 100644 --- a/src/main/java/com/gmail/nossr50/listeners/BlockListener.java +++ b/src/main/java/com/gmail/nossr50/listeners/BlockListener.java @@ -6,7 +6,7 @@ import com.gmail.nossr50.config.HiddenConfig; import com.gmail.nossr50.config.WorldBlacklist; import com.gmail.nossr50.config.experience.ExperienceConfig; import com.gmail.nossr50.datatypes.meta.BonusDropMeta; -import com.gmail.nossr50.datatypes.player.McMMOPlayer; +import com.neetgames.mcmmo.player.OnlineMMOPlayer; import com.gmail.nossr50.datatypes.skills.AbilityToolType; import com.gmail.nossr50.datatypes.skills.PrimarySkillType; import com.gmail.nossr50.datatypes.skills.SuperAbilityType; @@ -220,7 +220,7 @@ public class BlockListener implements Listener { return; } - McMMOPlayer mmoPlayer = mcMMO.getUserManager().queryPlayer(player); + OnlineMMOPlayer mmoPlayer = mcMMO.getUserManager().queryPlayer(player); if(mmoPlayer == null) return; @@ -300,7 +300,7 @@ public class BlockListener implements Listener { return; } - McMMOPlayer mmoPlayer = mcMMO.getUserManager().queryPlayer(player); + OnlineMMOPlayer mmoPlayer = mcMMO.getUserManager().queryPlayer(player); //Check if profile is loaded if(mmoPlayer == null) { @@ -461,7 +461,7 @@ public class BlockListener implements Listener { return; } - McMMOPlayer mmoPlayer = mcMMO.getUserManager().queryPlayer(player); + OnlineMMOPlayer mmoPlayer = mcMMO.getUserManager().queryPlayer(player); //Profile not loaded if(mmoPlayer == null) @@ -547,7 +547,7 @@ public class BlockListener implements Listener { return; } - McMMOPlayer mmoPlayer = mcMMO.getUserManager().queryPlayer(player); + OnlineMMOPlayer mmoPlayer = mcMMO.getUserManager().queryPlayer(player); //Profile not loaded if(mcMMO.getUserManager().queryPlayer(player) == null) @@ -594,7 +594,7 @@ public class BlockListener implements Listener { @EventHandler(priority = EventPriority.MONITOR) public void onBlockDamageCleanup(BlockDamageEvent event) { Player player = event.getPlayer(); - McMMOPlayer mmoPlayer = mcMMO.getUserManager().queryPlayer(player); + OnlineMMOPlayer mmoPlayer = mcMMO.getUserManager().queryPlayer(player); //Profile not loaded if(mcMMO.getUserManager().queryPlayer(player) == null) @@ -666,7 +666,7 @@ public class BlockListener implements Listener { } } - private void cleanupAbilityTools(Player player, McMMOPlayer mmoPlayer, BlockState blockState, ItemStack heldItem) { + private void cleanupAbilityTools(Player player, OnlineMMOPlayer mmoPlayer, BlockState blockState, ItemStack heldItem) { if (HiddenConfig.getInstance().useEnchantmentBuffs()) { if ((ItemUtils.isPickaxe(heldItem) && !mmoPlayer.getSuperAbilityManager().getAbilityMode(SuperAbilityType.SUPER_BREAKER)) || (ItemUtils.isShovel(heldItem) && !mmoPlayer.getSuperAbilityManager().getAbilityMode(SuperAbilityType.GIGA_DRILL_BREAKER))) { SkillUtils.removeAbilityBuff(heldItem); diff --git a/src/main/java/com/gmail/nossr50/listeners/CommandListener.java b/src/main/java/com/gmail/nossr50/listeners/CommandListener.java index da0a43e4d..608ba1fe2 100644 --- a/src/main/java/com/gmail/nossr50/listeners/CommandListener.java +++ b/src/main/java/com/gmail/nossr50/listeners/CommandListener.java @@ -1,6 +1,6 @@ //package com.gmail.nossr50.listeners; // -//import com.gmail.nossr50.datatypes.player.McMMOPlayer; +//import com.neetgames.mcmmo.player.OnlineMMOPlayer; //import com.gmail.nossr50.datatypes.skills.SuperAbilityType; //import com.gmail.nossr50.mcMMO; //import com.gmail.nossr50.util.player.UserManager; @@ -26,7 +26,7 @@ // // SkillUtils.removeAbilityBoostsFromInventory(player); // -// McMMOPlayer mmoPlayer = mcMMO.getUserManager().queryPlayer(player); +// OnlineMMOPlayer mmoPlayer = mcMMO.getUserManager().queryPlayer(player); // // if(mmoPlayer == null) // return; diff --git a/src/main/java/com/gmail/nossr50/listeners/EntityListener.java b/src/main/java/com/gmail/nossr50/listeners/EntityListener.java index db8ac3bc9..13092d3e9 100644 --- a/src/main/java/com/gmail/nossr50/listeners/EntityListener.java +++ b/src/main/java/com/gmail/nossr50/listeners/EntityListener.java @@ -5,7 +5,7 @@ import com.gmail.nossr50.config.Config; import com.gmail.nossr50.config.WorldBlacklist; import com.gmail.nossr50.config.experience.ExperienceConfig; import com.gmail.nossr50.datatypes.meta.ProjectileOriginMeta; -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.interfaces.InteractType; @@ -192,7 +192,7 @@ public class EntityListener implements Listener { //Crossbow only if (isCrossbow) { - McMMOPlayer mmoPlayer = mcMMO.getUserManager().queryPlayer(player); + OnlineMMOPlayer mmoPlayer = mcMMO.getUserManager().queryPlayer(player); //Process launch event if (Permissions.skillEnabled(player, PrimarySkillType.CROSSBOWS)) { @@ -409,7 +409,7 @@ public class EntityListener implements Listener { } //Deflect checks - final McMMOPlayer mmoPlayer = mcMMO.getUserManager().queryPlayer(defendingPlayer); + final OnlineMMOPlayer mmoPlayer = mcMMO.getUserManager().queryPlayer(defendingPlayer); if (mmoPlayer != null) { UnarmedManager unarmedManager = mmoPlayer.getUnarmedManager(); @@ -566,7 +566,7 @@ public class EntityListener implements Listener { return; } - McMMOPlayer mmoPlayer = mcMMO.getUserManager().queryPlayer(player); + OnlineMMOPlayer mmoPlayer = mcMMO.getUserManager().queryPlayer(player); //Profile not loaded if(mmoPlayer == null) diff --git a/src/main/java/com/gmail/nossr50/listeners/InventoryListener.java b/src/main/java/com/gmail/nossr50/listeners/InventoryListener.java index 9634d5605..f2814e33f 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 com.gmail.nossr50.config.Config; import com.gmail.nossr50.config.WorldBlacklist; -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.events.fake.FakeBrewEvent; @@ -111,7 +111,7 @@ public class InventoryListener implements Listener { if(offlinePlayer != null) { - McMMOPlayer offlineProfile = mcMMO.getUserManager().queryOfflineMcMMOPlayer(offlinePlayer); + OnlineMMOPlayer offlineProfile = mcMMO.getUserManager().queryOfflineMcMMOPlayer(offlinePlayer); //Profile doesn't exist if(offlineProfile != null) { diff --git a/src/main/java/com/gmail/nossr50/listeners/PlayerListener.java b/src/main/java/com/gmail/nossr50/listeners/PlayerListener.java index e86840723..9997fdb6b 100644 --- a/src/main/java/com/gmail/nossr50/listeners/PlayerListener.java +++ b/src/main/java/com/gmail/nossr50/listeners/PlayerListener.java @@ -4,7 +4,7 @@ import com.gmail.nossr50.config.Config; import com.gmail.nossr50.config.WorldBlacklist; import com.gmail.nossr50.config.experience.ExperienceConfig; import com.gmail.nossr50.datatypes.chat.ChatChannel; -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; @@ -204,7 +204,7 @@ public class PlayerListener implements Listener { return; } - McMMOPlayer mmoPlayer = mcMMO.getUserManager().queryPlayer(player); + OnlineMMOPlayer mmoPlayer = mcMMO.getUserManager().queryPlayer(player); mmoPlayer.checkGodMode(); mmoPlayer.checkParty(); @@ -462,7 +462,7 @@ public class PlayerListener implements Listener { return; } - McMMOPlayer mmoPlayer = mcMMO.getUserManager().queryPlayer(player); + OnlineMMOPlayer mmoPlayer = mcMMO.getUserManager().queryPlayer(player); Item drop = event.getItem(); ItemStack dropStack = drop.getItemStack(); @@ -525,7 +525,7 @@ public class PlayerListener implements Listener { } //No need for null checks here - McMMOPlayer mmoPlayer = mcMMO.getUserManager().queryPlayer(player); + OnlineMMOPlayer mmoPlayer = mcMMO.getUserManager().queryPlayer(player); //TODO: There's an issue with using Async saves on player quit //TODO: Basically there are conditions in which an async task does not execute fast enough to save the data if the server shutdown shortly after this task was scheduled mcMMO.getUserManager().saveUserWithDelay(mmoPlayer.getPersistentPlayerData(), false, 20); @@ -628,7 +628,7 @@ public class PlayerListener implements Listener { return; } - McMMOPlayer mmoPlayer = mcMMO.getUserManager().queryPlayer(player); + OnlineMMOPlayer mmoPlayer = mcMMO.getUserManager().queryPlayer(player); MiningManager miningManager = mmoPlayer.getMiningManager(); ItemStack heldItem = player.getInventory().getItemInMainHand(); @@ -744,7 +744,7 @@ public class PlayerListener implements Listener { return; } - McMMOPlayer mmoPlayer = mcMMO.getUserManager().queryPlayer(player); + OnlineMMOPlayer mmoPlayer = mcMMO.getUserManager().queryPlayer(player); ItemStack heldItem = player.getInventory().getItemInMainHand(); //Spam Fishing Detection @@ -779,7 +779,7 @@ public class PlayerListener implements Listener { return; } - McMMOPlayer mmoPlayer = mcMMO.getUserManager().queryPlayer(player); + OnlineMMOPlayer mmoPlayer = mcMMO.getUserManager().queryPlayer(player); if (mmoPlayer == null) { mcMMO.p.debug(player.getName() + "is chatting, but is currently not logged in to the server."); diff --git a/src/main/java/com/gmail/nossr50/listeners/SelfListener.java b/src/main/java/com/gmail/nossr50/listeners/SelfListener.java index 43e9b1aeb..3b5fa574e 100644 --- a/src/main/java/com/gmail/nossr50/listeners/SelfListener.java +++ b/src/main/java/com/gmail/nossr50/listeners/SelfListener.java @@ -3,7 +3,7 @@ package com.gmail.nossr50.listeners; import com.gmail.nossr50.config.Config; import com.gmail.nossr50.config.experience.ExperienceConfig; import com.gmail.nossr50.datatypes.experience.XPGainReason; -import com.gmail.nossr50.datatypes.player.McMMOPlayer; +import com.neetgames.mcmmo.player.OnlineMMOPlayer; import com.gmail.nossr50.datatypes.skills.PrimarySkillType; import com.gmail.nossr50.events.experience.McMMOPlayerLevelUpEvent; import com.gmail.nossr50.events.experience.McMMOPlayerXpGainEvent; @@ -81,7 +81,7 @@ public class SelfListener implements Listener { @EventHandler(priority = EventPriority.NORMAL, ignoreCancelled = true) public void onPlayerXpGain(McMMOPlayerXpGainEvent event) { Player player = event.getPlayer(); - McMMOPlayer mmoPlayer = mcMMO.getUserManager().queryPlayer(player); + OnlineMMOPlayer mmoPlayer = mcMMO.getUserManager().queryPlayer(player); PrimarySkillType primarySkillType = event.getSkill(); if(mmoPlayer.isDebugMode()) { diff --git a/src/main/java/com/gmail/nossr50/party/PartyManager.java b/src/main/java/com/gmail/nossr50/party/PartyManager.java index e292f33b9..1e361ce73 100644 --- a/src/main/java/com/gmail/nossr50/party/PartyManager.java +++ b/src/main/java/com/gmail/nossr50/party/PartyManager.java @@ -8,7 +8,7 @@ import com.gmail.nossr50.datatypes.party.ItemShareType; import com.gmail.nossr50.datatypes.party.Party; import com.gmail.nossr50.datatypes.party.PartyMember; import com.gmail.nossr50.datatypes.party.ShareMode; -import com.gmail.nossr50.datatypes.player.McMMOPlayer; +import com.neetgames.mcmmo.player.OnlineMMOPlayer; import com.gmail.nossr50.datatypes.player.PlayerProfile; import com.gmail.nossr50.events.party.McMMOPartyAllianceChangeEvent; import com.gmail.nossr50.events.party.McMMOPartyChangeEvent; @@ -113,7 +113,7 @@ public final class PartyManager { * @param newPartyName The name of the party being joined * @return true if the party was joined successfully, false otherwise */ - public boolean changeOrJoinParty(@NotNull McMMOPlayer mmoPlayer, @NotNull String newPartyName) { + public boolean changeOrJoinParty(@NotNull OnlineMMOPlayer mmoPlayer, @NotNull String newPartyName) { Player player = mmoPlayer.getPlayer(); if (inParty(mmoPlayer)) { @@ -166,7 +166,7 @@ public final class PartyManager { * @param mmoPlayer The player to check * @return the near party members */ - public List getNearMembers(McMMOPlayer mmoPlayer) { + public List getNearMembers(OnlineMMOPlayer mmoPlayer) { List nearMembers = new ArrayList<>(); Party party = mmoPlayer.getParty(); @@ -184,7 +184,7 @@ public final class PartyManager { return nearMembers; } - public List getNearVisibleMembers(@NotNull McMMOPlayer mmoPlayer) { + public List getNearVisibleMembers(@NotNull OnlineMMOPlayer mmoPlayer) { List nearMembers = new ArrayList<>(); Party party = mmoPlayer.getParty(); @@ -310,7 +310,7 @@ public final class PartyManager { return null; } - McMMOPlayer mmoPlayer = mcMMO.getUserManager().queryPlayer(player); + OnlineMMOPlayer mmoPlayer = mcMMO.getUserManager().queryPlayer(player); return mmoPlayer.getParty(); } @@ -358,7 +358,7 @@ public final class PartyManager { * * @param mmoPlayer The player to remove */ - public void removeFromParty(McMMOPlayer mmoPlayer) { + public void removeFromParty(OnlineMMOPlayer mmoPlayer) { removeFromParty(mmoPlayer.getPlayer(), mmoPlayer.getParty()); processPartyLeaving(mmoPlayer); } @@ -395,7 +395,7 @@ public final class PartyManager { * @param partyName The party to add the player to * @param password The password for this party, null if there was no password */ - public void createParty(McMMOPlayer mmoPlayer, String partyName, String password) { + public void createParty(OnlineMMOPlayer mmoPlayer, String partyName, String password) { Player player = mmoPlayer.getPlayer(); Party party = new Party(new PartyLeader(player.getUniqueId(), player.getName()), partyName.replace(".", ""), password); @@ -446,7 +446,7 @@ public final class PartyManager { * * @param mmoPlayer The player to add to the party */ - public void joinInvitedParty(McMMOPlayer mmoPlayer) { + public void joinInvitedParty(OnlineMMOPlayer mmoPlayer) { Party invite = mmoPlayer.getPartyInvite(); // Check if the party still exists, it might have been disbanded @@ -474,7 +474,7 @@ public final class PartyManager { * * @param mmoPlayer The player who accepts the alliance invite */ - public void acceptAllianceInvite(McMMOPlayer mmoPlayer) { + public void acceptAllianceInvite(OnlineMMOPlayer mmoPlayer) { Party invite = mmoPlayer.getPartyAllianceInvite(); Player player = mmoPlayer.getPlayer(); @@ -535,7 +535,7 @@ public final class PartyManager { * @param mmoPlayer The player to add to the party * @param party The party */ - public void addToParty(McMMOPlayer mmoPlayer, Party party) { + public void addToParty(OnlineMMOPlayer mmoPlayer, Party party) { Player player = mmoPlayer.getPlayer(); String playerName = player.getName(); @@ -588,7 +588,7 @@ public final class PartyManager { * * @return true if the player can invite */ - public boolean canInvite(McMMOPlayer mmoPlayer) { + public boolean canInvite(OnlineMMOPlayer mmoPlayer) { Party party = mmoPlayer.getParty(); return !party.isLocked() || party.getLeader().getUniqueId().equals(mmoPlayer.getPlayer().getUniqueId()); @@ -813,7 +813,7 @@ public final class PartyManager { * * @param mmoPlayer The player to remove party data from. */ - public void processPartyLeaving(@NotNull McMMOPlayer mmoPlayer) { + public void processPartyLeaving(@NotNull OnlineMMOPlayer mmoPlayer) { mmoPlayer.removeParty(); mmoPlayer.setChatMode(ChatChannel.NONE); mmoPlayer.setItemShareModifier(10); diff --git a/src/main/java/com/gmail/nossr50/party/ShareHandler.java b/src/main/java/com/gmail/nossr50/party/ShareHandler.java index 635be5c62..e7f8864aa 100644 --- a/src/main/java/com/gmail/nossr50/party/ShareHandler.java +++ b/src/main/java/com/gmail/nossr50/party/ShareHandler.java @@ -7,7 +7,7 @@ import com.gmail.nossr50.datatypes.experience.XPGainSource; import com.gmail.nossr50.datatypes.party.ItemShareType; import com.gmail.nossr50.datatypes.party.Party; import com.gmail.nossr50.datatypes.party.ShareMode; -import com.gmail.nossr50.datatypes.player.McMMOPlayer; +import com.neetgames.mcmmo.player.OnlineMMOPlayer; import com.gmail.nossr50.datatypes.skills.PrimarySkillType; import com.gmail.nossr50.mcMMO; import com.gmail.nossr50.util.Misc; @@ -29,7 +29,7 @@ public final class ShareHandler { * @param primarySkillType Skill being used * @return True is the xp has been shared */ - public static boolean handleXpShare(float xp, @NotNull McMMOPlayer mmoPlayer, @NotNull Party party, @NotNull PrimarySkillType primarySkillType, @NotNull XPGainReason xpGainReason) { + public static boolean handleXpShare(float xp, @NotNull OnlineMMOPlayer mmoPlayer, @NotNull Party party, @NotNull PrimarySkillType primarySkillType, @NotNull XPGainReason xpGainReason) { if (party.getPartyExperienceManager().getXpShareMode() != ShareMode.EQUAL) { return false; @@ -48,7 +48,7 @@ public final class ShareHandler { float splitXp = (float) (xp / partySize * shareBonus); for (Player otherMember : nearMembers) { - McMMOPlayer partyMember = mcMMO.getUserManager().queryPlayer(otherMember); + OnlineMMOPlayer partyMember = mcMMO.getUserManager().queryPlayer(otherMember); //Profile not loaded if(partyMember == null) { @@ -68,7 +68,7 @@ public final class ShareHandler { * @param mmoPlayer Player who picked up the item * @return True if the item has been shared */ - public static boolean handleItemShare(Item drop, McMMOPlayer mmoPlayer) { + public static boolean handleItemShare(Item drop, OnlineMMOPlayer mmoPlayer) { ItemStack itemStack = drop.getItemStack(); ItemShareType dropType = ItemShareType.getShareType(itemStack); @@ -111,7 +111,7 @@ public final class ShareHandler { int highestRoll = 0; for (Player member : nearMembers) { - McMMOPlayer mcMMOMember = mcMMO.getUserManager().getPlayer(member); + OnlineMMOPlayer mcMMOMember = mcMMO.getUserManager().getPlayer(member); //Profile not loaded if(mcMMO.getUserManager().getPlayer(member) == null) @@ -130,14 +130,14 @@ public final class ShareHandler { highestRoll = diceRoll; if (winningPlayer != null) { - McMMOPlayer mcMMOWinning = mcMMO.getUserManager().getPlayer(winningPlayer); + OnlineMMOPlayer mcMMOWinning = mcMMO.getUserManager().getPlayer(winningPlayer); mcMMOWinning.setItemShareModifier(mcMMOWinning.getItemShareModifier() + itemWeight); } winningPlayer = member; } - McMMOPlayer mcMMOTarget = mcMMO.getUserManager().getPlayer(winningPlayer); + OnlineMMOPlayer mcMMOTarget = mcMMO.getUserManager().getPlayer(winningPlayer); mcMMOTarget.setItemShareModifier(mcMMOTarget.getItemShareModifier() - itemWeight); awardDrop(winningPlayer, newStack); } diff --git a/src/main/java/com/gmail/nossr50/runnables/SaveTimerTask.java b/src/main/java/com/gmail/nossr50/runnables/SaveTimerTask.java index 3f426e809..423706849 100644 --- a/src/main/java/com/gmail/nossr50/runnables/SaveTimerTask.java +++ b/src/main/java/com/gmail/nossr50/runnables/SaveTimerTask.java @@ -1,6 +1,6 @@ package com.gmail.nossr50.runnables; -import com.gmail.nossr50.datatypes.player.McMMOPlayer; +import com.neetgames.mcmmo.player.OnlineMMOPlayer; import com.gmail.nossr50.mcMMO; import org.bukkit.scheduler.BukkitRunnable; @@ -11,7 +11,7 @@ public class SaveTimerTask extends BukkitRunnable { int count = 1; //TODO: write a more efficient bulk save - for (McMMOPlayer mmoPlayer : mcMMO.getUserManager().getPlayers()) { + for (OnlineMMOPlayer mmoPlayer : mcMMO.getUserManager().getPlayers()) { mcMMO.getUserManager().saveUserWithDelay(mmoPlayer.getPersistentPlayerData(), false, count); count++; } 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 997c5e6d7..566e7966c 100644 --- a/src/main/java/com/gmail/nossr50/runnables/database/FormulaConversionTask.java +++ b/src/main/java/com/gmail/nossr50/runnables/database/FormulaConversionTask.java @@ -3,7 +3,7 @@ package com.gmail.nossr50.runnables.database; import com.gmail.nossr50.config.experience.ExperienceConfig; import com.gmail.nossr50.database.DatabaseManager; import com.gmail.nossr50.datatypes.experience.FormulaType; -import com.gmail.nossr50.datatypes.player.McMMOPlayer; +import com.neetgames.mcmmo.player.OnlineMMOPlayer; import com.gmail.nossr50.datatypes.player.PlayerProfile; import com.gmail.nossr50.datatypes.skills.PrimarySkillType; import com.gmail.nossr50.locale.LocaleLoader; @@ -26,7 +26,7 @@ public class FormulaConversionTask extends BukkitRunnable { int convertedUsers = 0; long startMillis = System.currentTimeMillis(); for (String playerName : mcMMO.getDatabaseManager().getStoredUsers()) { - McMMOPlayer mmoPlayer = mcMMO.getUserManager().queryPlayerName(playerName); + OnlineMMOPlayer mmoPlayer = mcMMO.getUserManager().queryPlayerName(playerName); PlayerProfile profile; // If the mmoPlayer doesn't exist, create a temporary profile and check if it's present in the database. If it's not, abort the process. diff --git a/src/main/java/com/gmail/nossr50/runnables/items/ChimaeraWingWarmup.java b/src/main/java/com/gmail/nossr50/runnables/items/ChimaeraWingWarmup.java index 943aac775..1dcfaf71b 100644 --- a/src/main/java/com/gmail/nossr50/runnables/items/ChimaeraWingWarmup.java +++ b/src/main/java/com/gmail/nossr50/runnables/items/ChimaeraWingWarmup.java @@ -1,7 +1,7 @@ package com.gmail.nossr50.runnables.items; import com.gmail.nossr50.config.Config; -import com.gmail.nossr50.datatypes.player.McMMOPlayer; +import com.neetgames.mcmmo.player.OnlineMMOPlayer; import com.gmail.nossr50.locale.LocaleLoader; import com.gmail.nossr50.util.ChimaeraWing; import com.gmail.nossr50.util.ItemUtils; @@ -13,9 +13,9 @@ import org.bukkit.inventory.ItemStack; import org.bukkit.scheduler.BukkitRunnable; public class ChimaeraWingWarmup extends BukkitRunnable { - private final McMMOPlayer mmoPlayer; + private final OnlineMMOPlayer mmoPlayer; - public ChimaeraWingWarmup(McMMOPlayer mmoPlayer) { + public ChimaeraWingWarmup(OnlineMMOPlayer mmoPlayer) { this.mmoPlayer = mmoPlayer; } diff --git a/src/main/java/com/gmail/nossr50/runnables/items/TeleportationWarmup.java b/src/main/java/com/gmail/nossr50/runnables/items/TeleportationWarmup.java index 299e1c629..0d3e940d0 100644 --- a/src/main/java/com/gmail/nossr50/runnables/items/TeleportationWarmup.java +++ b/src/main/java/com/gmail/nossr50/runnables/items/TeleportationWarmup.java @@ -1,7 +1,7 @@ package com.gmail.nossr50.runnables.items; import com.gmail.nossr50.config.Config; -import com.gmail.nossr50.datatypes.player.McMMOPlayer; +import com.neetgames.mcmmo.player.OnlineMMOPlayer; import com.gmail.nossr50.locale.LocaleLoader; import com.gmail.nossr50.util.EventUtils; import com.gmail.nossr50.util.Misc; @@ -13,10 +13,10 @@ import org.bukkit.entity.Player; import org.bukkit.scheduler.BukkitRunnable; public class TeleportationWarmup extends BukkitRunnable { - private final McMMOPlayer mmoPlayer; - private final McMMOPlayer mcMMOTarget; + private final OnlineMMOPlayer mmoPlayer; + private final OnlineMMOPlayer mcMMOTarget; - public TeleportationWarmup(McMMOPlayer mmoPlayer, McMMOPlayer mcMMOTarget) { + public TeleportationWarmup(OnlineMMOPlayer mmoPlayer, OnlineMMOPlayer mcMMOTarget) { this.mmoPlayer = mmoPlayer; this.mcMMOTarget = mcMMOTarget; } diff --git a/src/main/java/com/gmail/nossr50/runnables/player/ClearRegisteredXPGainTask.java b/src/main/java/com/gmail/nossr50/runnables/player/ClearRegisteredXPGainTask.java index b3739211a..ad3860324 100644 --- a/src/main/java/com/gmail/nossr50/runnables/player/ClearRegisteredXPGainTask.java +++ b/src/main/java/com/gmail/nossr50/runnables/player/ClearRegisteredXPGainTask.java @@ -1,12 +1,12 @@ package com.gmail.nossr50.runnables.player; -import com.gmail.nossr50.datatypes.player.McMMOPlayer; +import com.neetgames.mcmmo.player.OnlineMMOPlayer; import org.bukkit.scheduler.BukkitRunnable; public class ClearRegisteredXPGainTask extends BukkitRunnable { @Override public void run() { - for (McMMOPlayer mmoPlayer : mcMMO.getUserManager().getPlayers()) { + for (OnlineMMOPlayer mmoPlayer : mcMMO.getUserManager().getPlayers()) { mmoPlayer.purgeExpiredXpGains(); } } diff --git a/src/main/java/com/gmail/nossr50/runnables/player/PlayerProfileLoadingTask.java b/src/main/java/com/gmail/nossr50/runnables/player/PlayerProfileLoadingTask.java index 6b62e72c1..94baf8a79 100644 --- a/src/main/java/com/gmail/nossr50/runnables/player/PlayerProfileLoadingTask.java +++ b/src/main/java/com/gmail/nossr50/runnables/player/PlayerProfileLoadingTask.java @@ -1,7 +1,7 @@ package com.gmail.nossr50.runnables.player; import com.gmail.nossr50.config.Config; -import com.gmail.nossr50.datatypes.player.McMMOPlayer; +import com.neetgames.mcmmo.player.OnlineMMOPlayer; import com.gmail.nossr50.datatypes.player.PlayerProfile; import com.gmail.nossr50.locale.LocaleLoader; import com.gmail.nossr50.mcMMO; @@ -43,7 +43,7 @@ public class PlayerProfileLoadingTask extends BukkitRunnable { try { PlayerProfile profile = mcMMO.getDatabaseManager().queryPlayerDataByUUID(player.getUniqueId()); - new ApplySuccessfulProfile(new McMMOPlayer(player, profile)).runTask(mcMMO.p); + new ApplySuccessfulProfile(new OnlineMMOPlayer(player, profile)).runTask(mcMMO.p); EventUtils.callPlayerProfileLoadEvent(player, profile); return; @@ -70,9 +70,9 @@ public class PlayerProfileLoadingTask extends BukkitRunnable { } private class ApplySuccessfulProfile extends BukkitRunnable { - private final McMMOPlayer mmoPlayer; + private final OnlineMMOPlayer mmoPlayer; - private ApplySuccessfulProfile(McMMOPlayer mmoPlayer) { + private ApplySuccessfulProfile(OnlineMMOPlayer mmoPlayer) { this.mmoPlayer = mmoPlayer; } 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 c7a5dc37c..6e273684e 100644 --- a/src/main/java/com/gmail/nossr50/runnables/skills/AbilityCooldownTask.java +++ b/src/main/java/com/gmail/nossr50/runnables/skills/AbilityCooldownTask.java @@ -1,16 +1,16 @@ package com.gmail.nossr50.runnables.skills; import com.gmail.nossr50.datatypes.interactions.NotificationType; -import com.gmail.nossr50.datatypes.player.McMMOPlayer; +import com.neetgames.mcmmo.player.OnlineMMOPlayer; import com.gmail.nossr50.datatypes.skills.SuperAbilityType; import com.gmail.nossr50.util.player.NotificationManager; import org.bukkit.scheduler.BukkitRunnable; public class AbilityCooldownTask extends BukkitRunnable { - private final McMMOPlayer mmoPlayer; + private final OnlineMMOPlayer mmoPlayer; private final SuperAbilityType ability; - public AbilityCooldownTask(McMMOPlayer mmoPlayer, SuperAbilityType ability) { + public AbilityCooldownTask(OnlineMMOPlayer mmoPlayer, SuperAbilityType ability) { this.mmoPlayer = mmoPlayer; this.ability = ability; } 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 0fd3a1f42..49cf24739 100644 --- a/src/main/java/com/gmail/nossr50/runnables/skills/AbilityDisableTask.java +++ b/src/main/java/com/gmail/nossr50/runnables/skills/AbilityDisableTask.java @@ -3,7 +3,7 @@ package com.gmail.nossr50.runnables.skills; import com.gmail.nossr50.config.AdvancedConfig; import com.gmail.nossr50.config.Config; import com.gmail.nossr50.datatypes.interactions.NotificationType; -import com.gmail.nossr50.datatypes.player.McMMOPlayer; +import com.neetgames.mcmmo.player.OnlineMMOPlayer; import com.gmail.nossr50.datatypes.skills.SuperAbilityType; import com.gmail.nossr50.mcMMO; import com.gmail.nossr50.util.EventUtils; @@ -18,10 +18,10 @@ import org.bukkit.entity.Player; import org.bukkit.scheduler.BukkitRunnable; public class AbilityDisableTask extends BukkitRunnable { - private final McMMOPlayer mmoPlayer; + private final OnlineMMOPlayer mmoPlayer; private final SuperAbilityType ability; - public AbilityDisableTask(McMMOPlayer mmoPlayer, SuperAbilityType ability) { + public AbilityDisableTask(OnlineMMOPlayer mmoPlayer, SuperAbilityType ability) { this.mmoPlayer = mmoPlayer; this.ability = ability; } 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 7e74dc654..7f12436c8 100644 --- a/src/main/java/com/gmail/nossr50/runnables/skills/AwardCombatXpTask.java +++ b/src/main/java/com/gmail/nossr50/runnables/skills/AwardCombatXpTask.java @@ -2,20 +2,20 @@ package com.gmail.nossr50.runnables.skills; import com.gmail.nossr50.datatypes.experience.XPGainReason; import com.gmail.nossr50.datatypes.experience.XPGainSource; -import com.gmail.nossr50.datatypes.player.McMMOPlayer; +import com.neetgames.mcmmo.player.OnlineMMOPlayer; import com.gmail.nossr50.datatypes.skills.PrimarySkillType; import org.bukkit.entity.LivingEntity; import org.bukkit.scheduler.BukkitRunnable; public class AwardCombatXpTask extends BukkitRunnable { - private final McMMOPlayer mmoPlayer; + private final OnlineMMOPlayer mmoPlayer; private final double baseXp; private final PrimarySkillType primarySkillType; private final LivingEntity target; private final XPGainReason xpGainReason; private final double baseHealth; - public AwardCombatXpTask(McMMOPlayer mmoPlayer, PrimarySkillType primarySkillType, double baseXp, LivingEntity target, XPGainReason xpGainReason) { + public AwardCombatXpTask(OnlineMMOPlayer mmoPlayer, PrimarySkillType primarySkillType, double baseXp, LivingEntity target, XPGainReason xpGainReason) { this.mmoPlayer = mmoPlayer; this.primarySkillType = primarySkillType; this.baseXp = baseXp; diff --git a/src/main/java/com/gmail/nossr50/runnables/skills/DelayedHerbalismXPCheckTask.java b/src/main/java/com/gmail/nossr50/runnables/skills/DelayedHerbalismXPCheckTask.java index e2179cfb2..aa4e2f81a 100644 --- a/src/main/java/com/gmail/nossr50/runnables/skills/DelayedHerbalismXPCheckTask.java +++ b/src/main/java/com/gmail/nossr50/runnables/skills/DelayedHerbalismXPCheckTask.java @@ -1,17 +1,17 @@ package com.gmail.nossr50.runnables.skills; import com.gmail.nossr50.datatypes.BlockSnapshot; -import com.gmail.nossr50.datatypes.player.McMMOPlayer; +import com.neetgames.mcmmo.player.OnlineMMOPlayer; import org.bukkit.scheduler.BukkitRunnable; import java.util.ArrayList; public class DelayedHerbalismXPCheckTask extends BukkitRunnable { - private final McMMOPlayer mmoPlayer; + private final OnlineMMOPlayer mmoPlayer; private final ArrayList chorusBlocks; - public DelayedHerbalismXPCheckTask(McMMOPlayer mmoPlayer, ArrayList chorusBlocks) { + public DelayedHerbalismXPCheckTask(OnlineMMOPlayer mmoPlayer, ArrayList chorusBlocks) { this.mmoPlayer = mmoPlayer; this.chorusBlocks = chorusBlocks; } diff --git a/src/main/java/com/gmail/nossr50/runnables/skills/ExperienceBarHideTask.java b/src/main/java/com/gmail/nossr50/runnables/skills/ExperienceBarHideTask.java index 359c63cce..52b6fa4cb 100644 --- a/src/main/java/com/gmail/nossr50/runnables/skills/ExperienceBarHideTask.java +++ b/src/main/java/com/gmail/nossr50/runnables/skills/ExperienceBarHideTask.java @@ -1,16 +1,16 @@ package com.gmail.nossr50.runnables.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.experience.MMOExperienceBarManager; import org.bukkit.scheduler.BukkitRunnable; public class ExperienceBarHideTask extends BukkitRunnable { - public final McMMOPlayer mmoPlayer; + public final OnlineMMOPlayer mmoPlayer; public final PrimarySkillType primarySkillType; public final MMOExperienceBarManager MMOExperienceBarManagerRef; - public ExperienceBarHideTask(MMOExperienceBarManager MMOExperienceBarManagerRef, McMMOPlayer mmoPlayer, PrimarySkillType primarySkillType) + public ExperienceBarHideTask(MMOExperienceBarManager MMOExperienceBarManagerRef, OnlineMMOPlayer mmoPlayer, PrimarySkillType primarySkillType) { this.MMOExperienceBarManagerRef = MMOExperienceBarManagerRef; this.mmoPlayer = mmoPlayer; diff --git a/src/main/java/com/gmail/nossr50/runnables/skills/SkillUnlockNotificationTask.java b/src/main/java/com/gmail/nossr50/runnables/skills/SkillUnlockNotificationTask.java index 287805b06..08143e1df 100644 --- a/src/main/java/com/gmail/nossr50/runnables/skills/SkillUnlockNotificationTask.java +++ b/src/main/java/com/gmail/nossr50/runnables/skills/SkillUnlockNotificationTask.java @@ -1,13 +1,13 @@ package com.gmail.nossr50.runnables.skills; -import com.gmail.nossr50.datatypes.player.McMMOPlayer; +import com.neetgames.mcmmo.player.OnlineMMOPlayer; import com.gmail.nossr50.datatypes.skills.SubSkillType; import com.gmail.nossr50.util.player.NotificationManager; import org.bukkit.scheduler.BukkitRunnable; public class SkillUnlockNotificationTask extends BukkitRunnable { - private final McMMOPlayer mmoPlayer; + private final OnlineMMOPlayer mmoPlayer; private final SubSkillType subSkillType; private final int rank; /** @@ -16,7 +16,7 @@ public class SkillUnlockNotificationTask extends BukkitRunnable { * @param subSkillType the subskill that they just unlocked * @param rank the rank of the subskill */ - public SkillUnlockNotificationTask(McMMOPlayer mmoPlayer, SubSkillType subSkillType, int rank) + public SkillUnlockNotificationTask(OnlineMMOPlayer mmoPlayer, SubSkillType subSkillType, int rank) { this.mmoPlayer = mmoPlayer; this.subSkillType = subSkillType; diff --git a/src/main/java/com/gmail/nossr50/runnables/skills/ToolLowerTask.java b/src/main/java/com/gmail/nossr50/runnables/skills/ToolLowerTask.java index 20a6575bd..7e1e0e3b4 100644 --- a/src/main/java/com/gmail/nossr50/runnables/skills/ToolLowerTask.java +++ b/src/main/java/com/gmail/nossr50/runnables/skills/ToolLowerTask.java @@ -2,16 +2,16 @@ package com.gmail.nossr50.runnables.skills; import com.gmail.nossr50.config.Config; import com.gmail.nossr50.datatypes.interactions.NotificationType; -import com.gmail.nossr50.datatypes.player.McMMOPlayer; +import com.neetgames.mcmmo.player.OnlineMMOPlayer; import com.gmail.nossr50.datatypes.skills.AbilityToolType; import com.gmail.nossr50.util.player.NotificationManager; import org.bukkit.scheduler.BukkitRunnable; public class ToolLowerTask extends BukkitRunnable { - private final McMMOPlayer mmoPlayer; + private final OnlineMMOPlayer mmoPlayer; private final AbilityToolType tool; - public ToolLowerTask(McMMOPlayer mmoPlayer, AbilityToolType abilityToolType) { + public ToolLowerTask(OnlineMMOPlayer mmoPlayer, AbilityToolType abilityToolType) { this.mmoPlayer = mmoPlayer; this.tool = abilityToolType; } diff --git a/src/main/java/com/gmail/nossr50/skills/SkillManager.java b/src/main/java/com/gmail/nossr50/skills/SkillManager.java index 1cdc0cf2d..910ce0438 100644 --- a/src/main/java/com/gmail/nossr50/skills/SkillManager.java +++ b/src/main/java/com/gmail/nossr50/skills/SkillManager.java @@ -2,17 +2,17 @@ package com.gmail.nossr50.skills; import com.gmail.nossr50.datatypes.experience.XPGainReason; import com.gmail.nossr50.datatypes.experience.XPGainSource; -import com.gmail.nossr50.datatypes.player.McMMOPlayer; +import com.neetgames.mcmmo.player.OnlineMMOPlayer; import com.gmail.nossr50.datatypes.skills.PrimarySkillType; import org.bukkit.entity.Entity; import org.bukkit.entity.LivingEntity; import org.bukkit.entity.Player; public abstract class SkillManager { - protected McMMOPlayer mmoPlayer; + protected OnlineMMOPlayer mmoPlayer; protected PrimarySkillType skill; - public SkillManager(McMMOPlayer mmoPlayer, PrimarySkillType skill) { + public SkillManager(OnlineMMOPlayer mmoPlayer, PrimarySkillType skill) { this.mmoPlayer = mmoPlayer; 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 d0cf50a5f..c4b933263 100644 --- a/src/main/java/com/gmail/nossr50/skills/acrobatics/AcrobaticsManager.java +++ b/src/main/java/com/gmail/nossr50/skills/acrobatics/AcrobaticsManager.java @@ -4,7 +4,7 @@ import com.gmail.nossr50.config.experience.ExperienceConfig; import com.gmail.nossr50.datatypes.LimitedSizeList; import com.gmail.nossr50.datatypes.experience.XPGainReason; import com.gmail.nossr50.datatypes.interactions.NotificationType; -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.mcMMO; @@ -26,7 +26,7 @@ import org.bukkit.metadata.MetadataValue; public class AcrobaticsManager extends SkillManager { - public AcrobaticsManager(McMMOPlayer mmoPlayer) { + public AcrobaticsManager(OnlineMMOPlayer mmoPlayer) { super(mmoPlayer, PrimarySkillType.ACROBATICS); fallLocationMap = new LimitedSizeList(50); } 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 9a1cddd3d..af84c2ee4 100644 --- a/src/main/java/com/gmail/nossr50/skills/alchemy/AlchemyManager.java +++ b/src/main/java/com/gmail/nossr50/skills/alchemy/AlchemyManager.java @@ -4,7 +4,7 @@ import com.gmail.nossr50.config.experience.ExperienceConfig; import com.gmail.nossr50.config.skills.alchemy.PotionConfig; import com.gmail.nossr50.datatypes.experience.XPGainReason; import com.gmail.nossr50.datatypes.experience.XPGainSource; -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.alchemy.PotionStage; @@ -18,7 +18,7 @@ import java.util.List; public class AlchemyManager extends SkillManager { private final double LUCKY_MODIFIER = 4.0 / 3.0; - public AlchemyManager(McMMOPlayer mmoPlayer) { + public AlchemyManager(OnlineMMOPlayer mmoPlayer) { super(mmoPlayer, PrimarySkillType.ALCHEMY); } diff --git a/src/main/java/com/gmail/nossr50/skills/archery/Archery.java b/src/main/java/com/gmail/nossr50/skills/archery/Archery.java index 18468c070..871d2d371 100644 --- a/src/main/java/com/gmail/nossr50/skills/archery/Archery.java +++ b/src/main/java/com/gmail/nossr50/skills/archery/Archery.java @@ -3,7 +3,7 @@ package com.gmail.nossr50.skills.archery; import com.gmail.nossr50.api.ItemSpawnReason; import com.gmail.nossr50.config.AdvancedConfig; import com.gmail.nossr50.config.experience.ExperienceConfig; -import com.gmail.nossr50.datatypes.player.McMMOPlayer; +import com.neetgames.mcmmo.player.OnlineMMOPlayer; import com.gmail.nossr50.datatypes.skills.SubSkillType; import com.gmail.nossr50.util.Misc; import com.gmail.nossr50.util.skills.RankUtils; @@ -65,13 +65,13 @@ public class Archery { } } - public static double getSkillShotBonusDamage(@NotNull McMMOPlayer mmoPlayer, double oldDamage) { + public static double getSkillShotBonusDamage(@NotNull OnlineMMOPlayer mmoPlayer, double oldDamage) { double damageBonusPercent = getDamageBonusPercent(mmoPlayer); double newDamage = oldDamage + (oldDamage * damageBonusPercent); return Math.min(newDamage, (oldDamage + Archery.skillShotMaxBonusDamage)); } - public static double getDamageBonusPercent(@NotNull McMMOPlayer mmoPlayer) { + public static double getDamageBonusPercent(@NotNull OnlineMMOPlayer mmoPlayer) { return ((RankUtils.getRank(mmoPlayer, SubSkillType.ARCHERY_SKILL_SHOT)) * (AdvancedConfig.getInstance().getSkillShotRankDamageMultiplier()) / 100.0D); } } 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 bcb5feb73..84a229c75 100644 --- a/src/main/java/com/gmail/nossr50/skills/archery/ArcheryManager.java +++ b/src/main/java/com/gmail/nossr50/skills/archery/ArcheryManager.java @@ -1,7 +1,7 @@ package com.gmail.nossr50.skills.archery; import com.gmail.nossr50.datatypes.interactions.NotificationType; -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.mcMMO; @@ -22,7 +22,7 @@ import org.bukkit.potion.PotionEffectType; import org.jetbrains.annotations.NotNull; public class ArcheryManager extends SkillManager { - public ArcheryManager(McMMOPlayer mmoPlayer) { + public ArcheryManager(OnlineMMOPlayer mmoPlayer) { super(mmoPlayer, PrimarySkillType.ARCHERY); } 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 b5aa57714..6f73017bc 100644 --- a/src/main/java/com/gmail/nossr50/skills/axes/AxesManager.java +++ b/src/main/java/com/gmail/nossr50/skills/axes/AxesManager.java @@ -2,7 +2,7 @@ package com.gmail.nossr50.skills.axes; import com.gmail.nossr50.config.AdvancedConfig; import com.gmail.nossr50.datatypes.interactions.NotificationType; -import com.gmail.nossr50.datatypes.player.McMMOPlayer; +import com.neetgames.mcmmo.player.OnlineMMOPlayer; import com.gmail.nossr50.datatypes.skills.AbilityToolType; import com.gmail.nossr50.datatypes.skills.PrimarySkillType; import com.gmail.nossr50.datatypes.skills.SubSkillType; @@ -21,7 +21,7 @@ import org.bukkit.inventory.ItemStack; import java.util.Map; public class AxesManager extends SkillManager { - public AxesManager(McMMOPlayer mmoPlayer) { + public AxesManager(OnlineMMOPlayer mmoPlayer) { super(mmoPlayer, PrimarySkillType.AXES); } diff --git a/src/main/java/com/gmail/nossr50/skills/crossbows/CrossbowManager.java b/src/main/java/com/gmail/nossr50/skills/crossbows/CrossbowManager.java index 653b40645..e94bfd019 100644 --- a/src/main/java/com/gmail/nossr50/skills/crossbows/CrossbowManager.java +++ b/src/main/java/com/gmail/nossr50/skills/crossbows/CrossbowManager.java @@ -1,6 +1,6 @@ package com.gmail.nossr50.skills.crossbows; -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.mcMMO; @@ -19,7 +19,7 @@ import org.bukkit.util.Vector; import org.jetbrains.annotations.NotNull; public class CrossbowManager extends SkillManager { - public CrossbowManager(McMMOPlayer mmoPlayer) { + public CrossbowManager(OnlineMMOPlayer mmoPlayer) { super(mmoPlayer, PrimarySkillType.CROSSBOWS); } private static final int SPREAD_VALUE = 12; 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 164c4f60a..220b60ab8 100644 --- a/src/main/java/com/gmail/nossr50/skills/excavation/ExcavationManager.java +++ b/src/main/java/com/gmail/nossr50/skills/excavation/ExcavationManager.java @@ -3,7 +3,7 @@ package com.gmail.nossr50.skills.excavation; import com.gmail.nossr50.api.ItemSpawnReason; import com.gmail.nossr50.config.Config; import com.gmail.nossr50.datatypes.experience.XPGainReason; -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.ExcavationTreasure; @@ -20,7 +20,7 @@ import org.bukkit.entity.Player; import java.util.List; public class ExcavationManager extends SkillManager { - public ExcavationManager(McMMOPlayer mmoPlayer) { + public ExcavationManager(OnlineMMOPlayer mmoPlayer) { super(mmoPlayer, 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 9da6a6d4c..038a3cb00 100644 --- a/src/main/java/com/gmail/nossr50/skills/fishing/FishingManager.java +++ b/src/main/java/com/gmail/nossr50/skills/fishing/FishingManager.java @@ -7,7 +7,7 @@ import com.gmail.nossr50.config.experience.ExperienceConfig; import com.gmail.nossr50.config.treasure.TreasureConfig; import com.gmail.nossr50.datatypes.experience.XPGainReason; import com.gmail.nossr50.datatypes.interactions.NotificationType; -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.EnchantmentTreasure; @@ -62,7 +62,7 @@ public class FishingManager extends SkillManager { private Location hookLocation; private int fishCaughtCounter = 1; - public FishingManager(McMMOPlayer mmoPlayer) { + public FishingManager(OnlineMMOPlayer mmoPlayer) { super(mmoPlayer, PrimarySkillType.FISHING); } 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 4beb62102..6285890f1 100644 --- a/src/main/java/com/gmail/nossr50/skills/herbalism/HerbalismManager.java +++ b/src/main/java/com/gmail/nossr50/skills/herbalism/HerbalismManager.java @@ -9,7 +9,7 @@ import com.gmail.nossr50.datatypes.experience.XPGainReason; import com.gmail.nossr50.datatypes.experience.XPGainSource; import com.gmail.nossr50.datatypes.interactions.NotificationType; import com.gmail.nossr50.datatypes.meta.RecentlyReplantedCropMeta; -import com.gmail.nossr50.datatypes.player.McMMOPlayer; +import com.neetgames.mcmmo.player.OnlineMMOPlayer; import com.gmail.nossr50.datatypes.skills.AbilityToolType; import com.gmail.nossr50.datatypes.skills.PrimarySkillType; import com.gmail.nossr50.datatypes.skills.SubSkillType; @@ -47,7 +47,7 @@ import java.util.HashSet; import java.util.List; public class HerbalismManager extends SkillManager { - public HerbalismManager(McMMOPlayer mmoPlayer) { + public HerbalismManager(OnlineMMOPlayer mmoPlayer) { super(mmoPlayer, PrimarySkillType.HERBALISM); } 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 ffc5e7430..87f31caf0 100644 --- a/src/main/java/com/gmail/nossr50/skills/mining/MiningManager.java +++ b/src/main/java/com/gmail/nossr50/skills/mining/MiningManager.java @@ -6,7 +6,7 @@ import com.gmail.nossr50.config.Config; import com.gmail.nossr50.config.experience.ExperienceConfig; import com.gmail.nossr50.datatypes.experience.XPGainReason; import com.gmail.nossr50.datatypes.interactions.NotificationType; -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.SuperAbilityType; @@ -33,7 +33,7 @@ import java.util.ArrayList; import java.util.List; public class MiningManager extends SkillManager { - public MiningManager(McMMOPlayer mmoPlayer) { + public MiningManager(OnlineMMOPlayer mmoPlayer) { super(mmoPlayer, PrimarySkillType.MINING); } 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 828092c4c..33c86a057 100644 --- a/src/main/java/com/gmail/nossr50/skills/repair/RepairManager.java +++ b/src/main/java/com/gmail/nossr50/skills/repair/RepairManager.java @@ -5,7 +5,7 @@ import com.gmail.nossr50.config.Config; import com.gmail.nossr50.config.experience.ExperienceConfig; import com.gmail.nossr50.datatypes.experience.XPGainReason; import com.gmail.nossr50.datatypes.interactions.NotificationType; -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 RepairManager extends SkillManager { private boolean placedAnvil; private int lastClick; - public RepairManager(McMMOPlayer mmoPlayer) { + public RepairManager(OnlineMMOPlayer mmoPlayer) { super(mmoPlayer, 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 80fea5975..f9681b62e 100644 --- a/src/main/java/com/gmail/nossr50/skills/salvage/SalvageManager.java +++ b/src/main/java/com/gmail/nossr50/skills/salvage/SalvageManager.java @@ -5,7 +5,7 @@ import com.gmail.nossr50.config.AdvancedConfig; 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.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 SalvageManager extends SkillManager { private boolean placedAnvil; private int lastClick; - public SalvageManager(McMMOPlayer mmoPlayer) { + public SalvageManager(OnlineMMOPlayer mmoPlayer) { super(mmoPlayer, PrimarySkillType.SALVAGE); } 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 2a5359828..9f68120ed 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.experience.XPGainReason; import com.gmail.nossr50.datatypes.experience.XPGainSource; -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.SkillManager; @@ -15,7 +15,7 @@ import org.bukkit.event.inventory.FurnaceBurnEvent; import org.bukkit.inventory.ItemStack; public class SmeltingManager extends SkillManager { - public SmeltingManager(McMMOPlayer mmoPlayer) { + public SmeltingManager(OnlineMMOPlayer mmoPlayer) { super(mmoPlayer, PrimarySkillType.SMELTING); } 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 147651166..9e6842f6f 100644 --- a/src/main/java/com/gmail/nossr50/skills/swords/SwordsManager.java +++ b/src/main/java/com/gmail/nossr50/skills/swords/SwordsManager.java @@ -1,7 +1,7 @@ package com.gmail.nossr50.skills.swords; import com.gmail.nossr50.datatypes.interactions.NotificationType; -import com.gmail.nossr50.datatypes.player.McMMOPlayer; +import com.neetgames.mcmmo.player.OnlineMMOPlayer; import com.gmail.nossr50.datatypes.skills.AbilityToolType; import com.gmail.nossr50.datatypes.skills.PrimarySkillType; import com.gmail.nossr50.datatypes.skills.SubSkillType; @@ -25,7 +25,7 @@ import org.jetbrains.annotations.NotNull; import java.util.Map; public class SwordsManager extends SkillManager { - public SwordsManager(McMMOPlayer mmoPlayer) { + public SwordsManager(OnlineMMOPlayer mmoPlayer) { super(mmoPlayer, PrimarySkillType.SWORDS); } 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 fb772a0da..d60ce217f 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.experience.XPGainReason; import com.gmail.nossr50.datatypes.interactions.NotificationType; -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.taming.CallOfTheWildType; @@ -45,7 +45,7 @@ public class TamingManager extends SkillManager { private HashMap> playerSummonedEntities; - public TamingManager(@NotNull McMMOPlayer mmoPlayer) { + public TamingManager(@NotNull OnlineMMOPlayer mmoPlayer) { super(mmoPlayer, PrimarySkillType.TAMING); init(); } diff --git a/src/main/java/com/gmail/nossr50/skills/tridents/TridentManager.java b/src/main/java/com/gmail/nossr50/skills/tridents/TridentManager.java index 9052d56e1..ab7ad3fa0 100644 --- a/src/main/java/com/gmail/nossr50/skills/tridents/TridentManager.java +++ b/src/main/java/com/gmail/nossr50/skills/tridents/TridentManager.java @@ -1,11 +1,11 @@ package com.gmail.nossr50.skills.tridents; -import com.gmail.nossr50.datatypes.player.McMMOPlayer; +import com.neetgames.mcmmo.player.OnlineMMOPlayer; import com.gmail.nossr50.datatypes.skills.PrimarySkillType; import com.gmail.nossr50.skills.SkillManager; public class TridentManager extends SkillManager { - public TridentManager(McMMOPlayer mmoPlayer) { + public TridentManager(OnlineMMOPlayer mmoPlayer) { super(mmoPlayer, PrimarySkillType.TRIDENTS); } 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 8789da6e5..80998c2eb 100644 --- a/src/main/java/com/gmail/nossr50/skills/unarmed/UnarmedManager.java +++ b/src/main/java/com/gmail/nossr50/skills/unarmed/UnarmedManager.java @@ -3,7 +3,7 @@ package com.gmail.nossr50.skills.unarmed; import com.gmail.nossr50.api.ItemSpawnReason; import com.gmail.nossr50.config.AdvancedConfig; import com.gmail.nossr50.datatypes.interactions.NotificationType; -import com.gmail.nossr50.datatypes.player.McMMOPlayer; +import com.neetgames.mcmmo.player.OnlineMMOPlayer; import com.gmail.nossr50.datatypes.skills.AbilityToolType; import com.gmail.nossr50.datatypes.skills.PrimarySkillType; import com.gmail.nossr50.datatypes.skills.SubSkillType; @@ -27,7 +27,7 @@ import org.bukkit.inventory.ItemStack; public class UnarmedManager extends SkillManager { - public UnarmedManager(McMMOPlayer mmoPlayer) { + public UnarmedManager(OnlineMMOPlayer mmoPlayer) { super(mmoPlayer, PrimarySkillType.UNARMED); } 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 3869a920f..204663235 100644 --- a/src/main/java/com/gmail/nossr50/skills/woodcutting/WoodcuttingManager.java +++ b/src/main/java/com/gmail/nossr50/skills/woodcutting/WoodcuttingManager.java @@ -5,7 +5,7 @@ import com.gmail.nossr50.config.Config; import com.gmail.nossr50.config.experience.ExperienceConfig; import com.gmail.nossr50.datatypes.experience.XPGainReason; import com.gmail.nossr50.datatypes.interactions.NotificationType; -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.SuperAbilityType; @@ -51,7 +51,7 @@ public class WoodcuttingManager extends SkillManager { new int[] { 2, -1}, new int[] { 2, 0}, new int[] { 2, 1}, }; - public WoodcuttingManager(McMMOPlayer mmoPlayer) { + public WoodcuttingManager(OnlineMMOPlayer mmoPlayer) { super(mmoPlayer, PrimarySkillType.WOODCUTTING); treeFellerThreshold = Config.getInstance().getTreeFellerThreshold(); } diff --git a/src/main/java/com/gmail/nossr50/util/ChimaeraWing.java b/src/main/java/com/gmail/nossr50/util/ChimaeraWing.java index 592f5e74f..5098cc920 100644 --- a/src/main/java/com/gmail/nossr50/util/ChimaeraWing.java +++ b/src/main/java/com/gmail/nossr50/util/ChimaeraWing.java @@ -2,7 +2,7 @@ package com.gmail.nossr50.util; import com.gmail.nossr50.config.Config; import com.gmail.nossr50.datatypes.interactions.NotificationType; -import com.gmail.nossr50.datatypes.player.McMMOPlayer; +import com.neetgames.mcmmo.player.OnlineMMOPlayer; import com.gmail.nossr50.locale.LocaleLoader; import com.gmail.nossr50.mcMMO; import com.gmail.nossr50.runnables.items.ChimaeraWingWarmup; @@ -25,7 +25,7 @@ import java.util.ArrayList; import java.util.List; public final class ChimaeraWing { - private static McMMOPlayer mmoPlayer; + private static OnlineMMOPlayer mmoPlayer; private static Location location; private ChimaeraWing() {} diff --git a/src/main/java/com/gmail/nossr50/util/EventUtils.java b/src/main/java/com/gmail/nossr50/util/EventUtils.java index 0715929e8..a1f6c891c 100644 --- a/src/main/java/com/gmail/nossr50/util/EventUtils.java +++ b/src/main/java/com/gmail/nossr50/util/EventUtils.java @@ -4,7 +4,7 @@ import com.gmail.nossr50.config.Config; import com.gmail.nossr50.datatypes.experience.XPGainReason; import com.gmail.nossr50.datatypes.experience.XPGainSource; import com.gmail.nossr50.datatypes.party.Party; -import com.gmail.nossr50.datatypes.player.McMMOPlayer; +import com.neetgames.mcmmo.player.OnlineMMOPlayer; import com.gmail.nossr50.datatypes.player.PlayerProfile; import com.gmail.nossr50.datatypes.skills.PrimarySkillType; import com.gmail.nossr50.datatypes.skills.SubSkillType; @@ -92,9 +92,9 @@ public final class EventUtils { * This little method is just to make the code more readable * * @param entity target entity - * @return the associated McMMOPlayer for this entity + * @return the associated OnlineMMOPlayer for this entity */ - public static McMMOPlayer getMcMMOPlayer(@NotNull Entity entity) + public static OnlineMMOPlayer getMcMMOPlayer(@NotNull Entity entity) { return mcMMO.getUserManager().queryPlayer((Player)entity); } @@ -144,7 +144,7 @@ public final class EventUtils { return true; } - McMMOPlayer mmoPlayer = mcMMO.getUserManager().queryPlayer(player); + OnlineMMOPlayer mmoPlayer = mcMMO.getUserManager().queryPlayer(player); if(mmoPlayer == null) { @@ -273,7 +273,7 @@ public final class EventUtils { } public static void handlePartyTeleportEvent(Player teleportingPlayer, Player targetPlayer) { - McMMOPlayer mmoPlayer = mcMMO.getUserManager().queryPlayer(teleportingPlayer); + OnlineMMOPlayer mmoPlayer = mcMMO.getUserManager().queryPlayer(teleportingPlayer); if(mmoPlayer == null) return; @@ -386,7 +386,7 @@ public final class EventUtils { HashMap levelChangedVictim = eventVictim.getLevelChanged(); HashMap experienceChangedVictim = eventVictim.getExperienceChanged(); - McMMOPlayer killerPlayer = mcMMO.getUserManager().queryPlayer(killer); + OnlineMMOPlayer killerPlayer = mcMMO.getUserManager().queryPlayer(killer); //Not loaded if(killerPlayer == null) diff --git a/src/main/java/com/gmail/nossr50/util/HolidayManager.java b/src/main/java/com/gmail/nossr50/util/HolidayManager.java index e833fb3cb..872f0bf86 100644 --- a/src/main/java/com/gmail/nossr50/util/HolidayManager.java +++ b/src/main/java/com/gmail/nossr50/util/HolidayManager.java @@ -3,7 +3,7 @@ package com.gmail.nossr50.util; import com.gmail.nossr50.commands.skills.AprilCommand; import com.gmail.nossr50.config.Config; import com.gmail.nossr50.datatypes.interactions.NotificationType; -import com.gmail.nossr50.datatypes.player.McMMOPlayer; +import com.neetgames.mcmmo.player.OnlineMMOPlayer; import com.gmail.nossr50.datatypes.skills.PrimarySkillType; import com.gmail.nossr50.locale.LocaleLoader; import com.gmail.nossr50.mcMMO; @@ -368,7 +368,7 @@ public final class HolidayManager { if(!Config.getInstance().isAprilFoolsAllowed()) return; - final McMMOPlayer mmoPlayer = mcMMO.getUserManager().queryPlayer(player); + final OnlineMMOPlayer mmoPlayer = mcMMO.getUserManager().queryPlayer(player); if (mmoPlayer == null) return; int levelTotal = Misc.getRandom().nextInt(1 + mmoPlayer.getSkillLevel(PrimarySkillType.MINING)) + 1; diff --git a/src/main/java/com/gmail/nossr50/util/Misc.java b/src/main/java/com/gmail/nossr50/util/Misc.java index b005a6940..6284af606 100644 --- a/src/main/java/com/gmail/nossr50/util/Misc.java +++ b/src/main/java/com/gmail/nossr50/util/Misc.java @@ -1,7 +1,7 @@ package com.gmail.nossr50.util; import com.gmail.nossr50.api.ItemSpawnReason; -import com.gmail.nossr50.datatypes.player.McMMOPlayer; +import com.neetgames.mcmmo.player.OnlineMMOPlayer; import com.gmail.nossr50.events.items.McMMOItemSpawnEvent; import com.gmail.nossr50.mcMMO; import com.gmail.nossr50.runnables.player.PlayerProfileLoadingTask; @@ -307,7 +307,7 @@ public final class Misc { * @param mmoPlayer target player * @return true if the player is the party leader */ - public static boolean isPartyLeader(@NotNull McMMOPlayer mmoPlayer) { + public static boolean isPartyLeader(@NotNull OnlineMMOPlayer mmoPlayer) { return mmoPlayer.getParty().getLeader().getUniqueId().equals(mmoPlayer.getPlayer().getUniqueId()); } 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 f6b2a554c..7f906c4e0 100644 --- a/src/main/java/com/gmail/nossr50/util/commands/CommandUtils.java +++ b/src/main/java/com/gmail/nossr50/util/commands/CommandUtils.java @@ -1,7 +1,7 @@ package com.gmail.nossr50.util.commands; import com.gmail.nossr50.config.Config; -import com.gmail.nossr50.datatypes.player.McMMOPlayer; +import com.neetgames.mcmmo.player.OnlineMMOPlayer; import com.gmail.nossr50.datatypes.player.PlayerProfile; import com.gmail.nossr50.datatypes.skills.PrimarySkillType; import com.gmail.nossr50.locale.LocaleLoader; @@ -77,7 +77,7 @@ public final class CommandUtils { * * @return true if the player is online and a valid mmoPlayer object was found */ - public static boolean checkPlayerExistence(CommandSender sender, String playerName, McMMOPlayer mmoPlayer) { + public static boolean checkPlayerExistence(CommandSender sender, String playerName, OnlineMMOPlayer mmoPlayer) { if (mmoPlayer != null) { if (CommandUtils.hidden(sender, mmoPlayer.getPlayer(), false)) { sender.sendMessage(LocaleLoader.getString("Commands.Offline")); diff --git a/src/main/java/com/gmail/nossr50/util/experience/ExperienceUtils.java b/src/main/java/com/gmail/nossr50/util/experience/ExperienceUtils.java index f3d6f0147..6f6f5d53f 100644 --- a/src/main/java/com/gmail/nossr50/util/experience/ExperienceUtils.java +++ b/src/main/java/com/gmail/nossr50/util/experience/ExperienceUtils.java @@ -2,7 +2,7 @@ package com.gmail.nossr50.util.experience; import com.gmail.nossr50.datatypes.experience.XPGainReason; import com.gmail.nossr50.datatypes.experience.XPGainSource; -import com.gmail.nossr50.datatypes.player.McMMOPlayer; +import com.neetgames.mcmmo.player.OnlineMMOPlayer; import com.gmail.nossr50.datatypes.skills.PrimarySkillType; import org.bukkit.plugin.Plugin; import org.jetbrains.annotations.NotNull; @@ -16,11 +16,11 @@ public class ExperienceUtils { * @param primarySkillType Skill being used * @param xp Experience amount to add */ - public static void applyXpGain(@NotNull McMMOPlayer mmoPlayer, @NotNull PrimarySkillType primarySkillType, float xp, @NotNull XPGainReason xpGainReason, @NotNull XPGainSource xpGainSource) { + public static void applyXpGain(@NotNull OnlineMMOPlayer mmoPlayer, @NotNull PrimarySkillType primarySkillType, float xp, @NotNull XPGainReason xpGainReason, @NotNull XPGainSource xpGainSource) { mmoPlayer.getExperienceManager().applyXpGain(primarySkillType, xp, xpGainReason, xpGainSource); } - public static void processPostXpEvent(@NotNull McMMOPlayer mmoPlayer, @NotNull PrimarySkillType primarySkillType, @NotNull Plugin plugin, @NotNull XPGainSource xpGainSource) { + public static void processPostXpEvent(@NotNull OnlineMMOPlayer mmoPlayer, @NotNull PrimarySkillType primarySkillType, @NotNull Plugin plugin, @NotNull XPGainSource xpGainSource) { mmoPlayer.getExperienceManager().processPostXpEvent(primarySkillType, plugin, xpGainSource); } @@ -29,7 +29,7 @@ public class ExperienceUtils { * * @param primarySkillType The skill to check */ - public static void updateLevelStats(@NotNull McMMOPlayer mmoPlayer, @NotNull PrimarySkillType primarySkillType, @NotNull XPGainReason xpGainReason, @NotNull XPGainSource xpGainSource) { + public static void updateLevelStats(@NotNull OnlineMMOPlayer mmoPlayer, @NotNull PrimarySkillType primarySkillType, @NotNull XPGainReason xpGainReason, @NotNull XPGainSource xpGainSource) { mmoPlayer.getExperienceManager().updateLevelStats(primarySkillType, xpGainReason, xpGainSource); } } diff --git a/src/main/java/com/gmail/nossr50/util/experience/MMOExperienceBarManager.java b/src/main/java/com/gmail/nossr50/util/experience/MMOExperienceBarManager.java index 37db0fc93..4d183e43f 100644 --- a/src/main/java/com/gmail/nossr50/util/experience/MMOExperienceBarManager.java +++ b/src/main/java/com/gmail/nossr50/util/experience/MMOExperienceBarManager.java @@ -1,7 +1,7 @@ package com.gmail.nossr50.util.experience; import com.gmail.nossr50.config.experience.ExperienceConfig; -import com.gmail.nossr50.datatypes.player.McMMOPlayer; +import com.neetgames.mcmmo.player.OnlineMMOPlayer; import com.gmail.nossr50.datatypes.skills.CoreSkillConstants; import com.gmail.nossr50.datatypes.skills.PrimarySkillType; import com.gmail.nossr50.mcMMO; @@ -21,7 +21,7 @@ import java.util.Map; * Each ExperienceBarManager only manages a single player */ public class MMOExperienceBarManager { - private final McMMOPlayer mmoPlayer; + private final OnlineMMOPlayer mmoPlayer; int delaySeconds = 3; @@ -31,7 +31,7 @@ public class MMOExperienceBarManager { private @NotNull final HashMap experienceBarHideTaskHashMap; - public MMOExperienceBarManager(@NotNull McMMOPlayer mmoPlayer, @NotNull Map barStateMapRef) + public MMOExperienceBarManager(@NotNull OnlineMMOPlayer mmoPlayer, @NotNull Map barStateMapRef) { this.mmoPlayer = mmoPlayer; this.barStateMapRef = barStateMapRef; diff --git a/src/main/java/com/gmail/nossr50/util/input/AbilityActivationProcessor.java b/src/main/java/com/gmail/nossr50/util/input/AbilityActivationProcessor.java index bd81a2ab2..009962c4e 100644 --- a/src/main/java/com/gmail/nossr50/util/input/AbilityActivationProcessor.java +++ b/src/main/java/com/gmail/nossr50/util/input/AbilityActivationProcessor.java @@ -2,7 +2,7 @@ package com.gmail.nossr50.util.input; import com.gmail.nossr50.config.Config; import com.gmail.nossr50.datatypes.interactions.NotificationType; -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.SuperAbilityType; @@ -26,10 +26,10 @@ import org.bukkit.event.player.PlayerInteractEvent; import org.bukkit.inventory.ItemStack; public class AbilityActivationProcessor { - private final McMMOPlayer mmoPlayer; + private final OnlineMMOPlayer mmoPlayer; private final Player player; - public AbilityActivationProcessor(McMMOPlayer mmoPlayer) { + public AbilityActivationProcessor(OnlineMMOPlayer mmoPlayer) { this.mmoPlayer = mmoPlayer; this.player = mmoPlayer.getPlayer(); } diff --git a/src/main/java/com/gmail/nossr50/util/input/SuperAbilityManager.java b/src/main/java/com/gmail/nossr50/util/input/SuperAbilityManager.java index fd24a44fe..1ecbf3017 100644 --- a/src/main/java/com/gmail/nossr50/util/input/SuperAbilityManager.java +++ b/src/main/java/com/gmail/nossr50/util/input/SuperAbilityManager.java @@ -3,7 +3,7 @@ package com.gmail.nossr50.util.input; import com.gmail.nossr50.config.AdvancedConfig; import com.gmail.nossr50.config.Config; import com.gmail.nossr50.datatypes.interactions.NotificationType; -import com.gmail.nossr50.datatypes.player.McMMOPlayer; +import com.neetgames.mcmmo.player.OnlineMMOPlayer; import com.gmail.nossr50.datatypes.player.PersistentPlayerData; import com.gmail.nossr50.datatypes.skills.AbilityToolType; import com.gmail.nossr50.datatypes.skills.PrimarySkillType; @@ -28,7 +28,7 @@ import java.util.Map; public class SuperAbilityManager { - private final McMMOPlayer mmoPlayer; + private final OnlineMMOPlayer mmoPlayer; private final Player player; private final Map superAbilityState = new HashMap<>(); @@ -39,7 +39,7 @@ public class SuperAbilityManager { private final Map toolMode = new HashMap<>(); private final PersistentPlayerData persistentPlayerData; - public SuperAbilityManager(@NotNull McMMOPlayer mmoPlayer, @NotNull PersistentPlayerData persistentPlayerData) { + public SuperAbilityManager(@NotNull OnlineMMOPlayer mmoPlayer, @NotNull PersistentPlayerData persistentPlayerData) { this.mmoPlayer = mmoPlayer; this.persistentPlayerData = persistentPlayerData; this.player = mmoPlayer.getPlayer(); 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 3e4d5651a..0b302b4b8 100644 --- a/src/main/java/com/gmail/nossr50/util/player/NotificationManager.java +++ b/src/main/java/com/gmail/nossr50/util/player/NotificationManager.java @@ -4,7 +4,7 @@ import com.gmail.nossr50.config.AdvancedConfig; import com.gmail.nossr50.config.Config; import com.gmail.nossr50.datatypes.interactions.NotificationType; import com.gmail.nossr50.datatypes.notifications.SensitiveCommandType; -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.events.skills.McMMOPlayerNotificationEvent; @@ -37,7 +37,7 @@ public class NotificationManager { */ public static void sendPlayerInformation(@NotNull Player player, @NotNull NotificationType notificationType, @NotNull String key) { - McMMOPlayer mmoPlayer = mcMMO.getUserManager().queryPlayer(player); + OnlineMMOPlayer mmoPlayer = mcMMO.getUserManager().queryPlayer(player); if(mmoPlayer == null || !mmoPlayer.hasSkillChatNotifications()) return; @@ -53,7 +53,7 @@ public class NotificationManager { public static boolean doesPlayerUseNotifications(@NotNull Player player) { - McMMOPlayer mmoPlayer = mcMMO.getUserManager().queryPlayer(player); + OnlineMMOPlayer mmoPlayer = mcMMO.getUserManager().queryPlayer(player); if(mmoPlayer == null) return false; @@ -78,7 +78,7 @@ public class NotificationManager { public static void sendPlayerInformationChatOnly(@NotNull Player player, @NotNull String key, String... values) { - McMMOPlayer mmoPlayer = mcMMO.getUserManager().queryPlayer(player); + OnlineMMOPlayer mmoPlayer = mcMMO.getUserManager().queryPlayer(player); if(mmoPlayer == null || !mmoPlayer.hasSkillChatNotifications()) return; @@ -89,7 +89,7 @@ public class NotificationManager { public static void sendPlayerInformationChatOnlyPrefixed(@NotNull Player player, @NotNull String key, String... values) { - McMMOPlayer mmoPlayer = mcMMO.getUserManager().queryPlayer(player); + OnlineMMOPlayer mmoPlayer = mcMMO.getUserManager().queryPlayer(player); if(mmoPlayer == null || !mmoPlayer.hasSkillChatNotifications()) return; @@ -149,7 +149,7 @@ public class NotificationManager { * @param skillName skill that leveled up * @param newLevel new level of that skill */ - public static void sendPlayerLevelUpNotification(McMMOPlayer mmoPlayer, PrimarySkillType skillName, int levelsGained, int newLevel) + public static void sendPlayerLevelUpNotification(OnlineMMOPlayer mmoPlayer, PrimarySkillType skillName, int levelsGained, int newLevel) { if(!mmoPlayer.hasSkillChatNotifications()) return; @@ -170,7 +170,7 @@ public class NotificationManager { } } - public static void sendPlayerUnlockNotification(@NotNull McMMOPlayer mmoPlayer, @NotNull SubSkillType subSkillType) + public static void sendPlayerUnlockNotification(@NotNull OnlineMMOPlayer mmoPlayer, @NotNull SubSkillType subSkillType) { if(!mmoPlayer.hasSkillChatNotifications()) return; diff --git a/src/main/java/com/gmail/nossr50/util/player/PlayerLevelUtils.java b/src/main/java/com/gmail/nossr50/util/player/PlayerLevelUtils.java index 6096f6271..67f19d2b5 100644 --- a/src/main/java/com/gmail/nossr50/util/player/PlayerLevelUtils.java +++ b/src/main/java/com/gmail/nossr50/util/player/PlayerLevelUtils.java @@ -1,6 +1,6 @@ package com.gmail.nossr50.util.player; -import com.gmail.nossr50.datatypes.player.McMMOPlayer; +import com.neetgames.mcmmo.player.OnlineMMOPlayer; import com.gmail.nossr50.datatypes.skills.PrimarySkillType; import com.gmail.nossr50.mcMMO; import org.jetbrains.annotations.NotNull; @@ -18,7 +18,7 @@ public class PlayerLevelUtils { * @param primarySkillType target skill * @return if the player would qualify for the XP boost if its enabled */ - public static boolean qualifiesForEarlyGameBoost(@NotNull McMMOPlayer mmoPlayer, @NotNull PrimarySkillType primarySkillType) { + public static boolean qualifiesForEarlyGameBoost(@NotNull OnlineMMOPlayer mmoPlayer, @NotNull PrimarySkillType primarySkillType) { return mmoPlayer.getSkillLevel(primarySkillType) < mcMMO.getPlayerLevelUtils().getEarlyGameCutoff(primarySkillType); } } diff --git a/src/main/java/com/gmail/nossr50/util/player/UserManager.java b/src/main/java/com/gmail/nossr50/util/player/UserManager.java index c43c15a35..393ea4602 100644 --- a/src/main/java/com/gmail/nossr50/util/player/UserManager.java +++ b/src/main/java/com/gmail/nossr50/util/player/UserManager.java @@ -2,7 +2,7 @@ package com.gmail.nossr50.util.player; import com.gmail.nossr50.config.Config; import com.gmail.nossr50.datatypes.player.MMODataSnapshot; -import com.gmail.nossr50.datatypes.player.McMMOPlayer; +import com.neetgames.mcmmo.player.OnlineMMOPlayer; import com.gmail.nossr50.datatypes.player.PersistentPlayerData; import com.gmail.nossr50.datatypes.player.PlayerProfile; import com.gmail.nossr50.mcMMO; @@ -26,7 +26,7 @@ import java.util.UUID; //TODO: Add per world handling public final class UserManager { - private final @NotNull HashSet playerDataSet; //Used to track players for sync saves on shutdown + private final @NotNull HashSet playerDataSet; //Used to track players for sync saves on shutdown public UserManager() { this.playerDataSet = new HashSet<>(); @@ -37,7 +37,7 @@ public final class UserManager { * * @param mmoPlayer the player profile to start tracking */ - public void track(@NotNull McMMOPlayer mmoPlayer) { + public void track(@NotNull OnlineMMOPlayer mmoPlayer) { mmoPlayer.getPlayer().setMetadata(mcMMO.playerDataKey, new FixedMetadataValue(mcMMO.p, mmoPlayer)); playerDataSet.add(mmoPlayer); //for sync saves on shutdown @@ -48,21 +48,21 @@ public final class UserManager { * * @param mmoPlayer target player */ - public void cleanupPlayer(@NotNull McMMOPlayer mmoPlayer) { + public void cleanupPlayer(@NotNull OnlineMMOPlayer mmoPlayer) { playerDataSet.remove(mmoPlayer); } /** - * Gets the McMMOPlayer object for a player, this can be null if the player has not yet been loaded. + * Gets the OnlineMMOPlayer object for a player, this can be null if the player has not yet been loaded. * @param player target player - * @return McMMOPlayer object for this player, null if Player has not been loaded + * @return OnlineMMOPlayer object for this player, null if Player has not been loaded */ - public @Nullable McMMOPlayer queryPlayer(@Nullable Player player) { + public @Nullable OnlineMMOPlayer queryPlayer(@Nullable Player player) { if(player == null) return null; if(player.hasMetadata(mcMMO.playerDataKey)) - return (McMMOPlayer) player.getMetadata(mcMMO.playerDataKey).get(0).value(); + return (OnlineMMOPlayer) player.getMetadata(mcMMO.playerDataKey).get(0).value(); else return null; } @@ -77,7 +77,7 @@ public final class UserManager { * @param player The Player object */ public void remove(@NotNull Player player) { - McMMOPlayer mmoPlayer = queryPlayer(player); + OnlineMMOPlayer mmoPlayer = queryPlayer(player); if(mmoPlayer != null) { mmoPlayer.cleanup(); @@ -98,8 +98,8 @@ public final class UserManager { playerDataSet.clear(); //Clear sync save tracking } - public @NotNull Collection getPlayers() { - Collection playerCollection = new ArrayList<>(); + public @NotNull Collection getPlayers() { + Collection playerCollection = new ArrayList<>(); for (Player player : mcMMO.p.getServer().getOnlinePlayers()) { if (hasPlayerDataKey(player)) { @@ -136,11 +136,11 @@ public final class UserManager { * Save all users ON THIS THREAD. */ public void saveAllSync() { - ImmutableList trackedSyncData = ImmutableList.copyOf(playerDataSet); + ImmutableList trackedSyncData = ImmutableList.copyOf(playerDataSet); mcMMO.p.getLogger().info("Saving player data... (" + trackedSyncData.size() + ")"); - for (McMMOPlayer onlinePlayer : trackedSyncData) { + for (OnlineMMOPlayer onlinePlayer : trackedSyncData) { try { mcMMO.p.getLogger().info("Saving data for player: "+onlinePlayer.getPlayerName()); @@ -161,7 +161,7 @@ public final class UserManager { * * @param syncSave if true, data is saved synchronously */ - public void logout(@NotNull McMMOPlayer mmoPlayer, boolean syncSave) { + public void logout(@NotNull OnlineMMOPlayer mmoPlayer, boolean syncSave) { BleedTimerTask.bleedOut(mmoPlayer.getPlayer()); //TODO: There is a possibility that async saves don't execute in time if the server is told to shutdown diff --git a/src/main/java/com/gmail/nossr50/util/random/RandomChanceSkill.java b/src/main/java/com/gmail/nossr50/util/random/RandomChanceSkill.java index 2fa3f9fe4..39ff21c17 100644 --- a/src/main/java/com/gmail/nossr50/util/random/RandomChanceSkill.java +++ b/src/main/java/com/gmail/nossr50/util/random/RandomChanceSkill.java @@ -1,7 +1,7 @@ package com.gmail.nossr50.util.random; 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.util.Permissions; @@ -22,7 +22,7 @@ public class RandomChanceSkill implements RandomChanceExecution { this.subSkillType = subSkillType; this.probabilityCap = RandomChanceUtil.LINEAR_CURVE_VAR; - final McMMOPlayer mmoPlayer = mcMMO.getUserManager().getPlayer(player); + final OnlineMMOPlayer mmoPlayer = mcMMO.getUserManager().getPlayer(player); if (player != null && mmoPlayer != null) { this.skillLevel = mmoPlayer.getSkillLevel(primarySkillType); } else { @@ -43,7 +43,7 @@ public class RandomChanceSkill implements RandomChanceExecution { this.subSkillType = subSkillType; this.probabilityCap = RandomChanceUtil.LINEAR_CURVE_VAR; - final McMMOPlayer mmoPlayer = mcMMO.getUserManager().getPlayer(player); + final OnlineMMOPlayer mmoPlayer = mcMMO.getUserManager().getPlayer(player); if (player != null && mmoPlayer != null) { this.skillLevel = mmoPlayer.getSkillLevel(primarySkillType); } else { @@ -68,7 +68,7 @@ public class RandomChanceSkill implements RandomChanceExecution { this.primarySkillType = subSkillType.getParentSkill(); this.subSkillType = subSkillType; - final McMMOPlayer mmoPlayer = mcMMO.getUserManager().getPlayer(player); + final OnlineMMOPlayer mmoPlayer = mcMMO.getUserManager().getPlayer(player); if (player != null && mmoPlayer != null) { this.skillLevel = mmoPlayer.getSkillLevel(primarySkillType); } else { @@ -93,7 +93,7 @@ public class RandomChanceSkill implements RandomChanceExecution { this.primarySkillType = subSkillType.getParentSkill(); this.subSkillType = subSkillType; - final McMMOPlayer mmoPlayer = mcMMO.getUserManager().getPlayer(player); + final OnlineMMOPlayer mmoPlayer = mcMMO.getUserManager().getPlayer(player); if (player != null && mmoPlayer != null) { this.skillLevel = mmoPlayer.getSkillLevel(primarySkillType); } else { diff --git a/src/main/java/com/gmail/nossr50/util/random/RandomChanceUtil.java b/src/main/java/com/gmail/nossr50/util/random/RandomChanceUtil.java index 4a08962b9..e51f8592c 100644 --- a/src/main/java/com/gmail/nossr50/util/random/RandomChanceUtil.java +++ b/src/main/java/com/gmail/nossr50/util/random/RandomChanceUtil.java @@ -1,7 +1,7 @@ package com.gmail.nossr50.util.random; 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.datatypes.skills.subskills.AbstractSubSkill; @@ -328,7 +328,7 @@ public class RandomChanceUtil return displayValues; } - public static String[] calculateAbilityDisplayValuesStatic(@NotNull McMMOPlayer mmoPlayer, PrimarySkillType primarySkillType, double chance) { + public static String[] calculateAbilityDisplayValuesStatic(@NotNull OnlineMMOPlayer mmoPlayer, PrimarySkillType primarySkillType, double chance) { RandomChanceStatic rcs = new RandomChanceStatic(chance, false); double successChance = getRandomChanceExecutionChance(rcs); 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 ad66c36b1..d8c453d03 100644 --- a/src/main/java/com/gmail/nossr50/util/scoreboards/ScoreboardManager.java +++ b/src/main/java/com/gmail/nossr50/util/scoreboards/ScoreboardManager.java @@ -2,7 +2,7 @@ package com.gmail.nossr50.util.scoreboards; import com.gmail.nossr50.config.Config; import com.gmail.nossr50.datatypes.database.PlayerStat; -import com.gmail.nossr50.datatypes.player.McMMOPlayer; +import com.neetgames.mcmmo.player.OnlineMMOPlayer; import com.gmail.nossr50.datatypes.player.PlayerProfile; import com.gmail.nossr50.datatypes.skills.PrimarySkillType; import com.gmail.nossr50.datatypes.skills.SuperAbilityType; 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 01b6e366a..40d6ebd89 100644 --- a/src/main/java/com/gmail/nossr50/util/scoreboards/ScoreboardWrapper.java +++ b/src/main/java/com/gmail/nossr50/util/scoreboards/ScoreboardWrapper.java @@ -2,7 +2,7 @@ package com.gmail.nossr50.util.scoreboards; import com.gmail.nossr50.config.Config; import com.gmail.nossr50.datatypes.database.PlayerStat; -import com.gmail.nossr50.datatypes.player.McMMOPlayer; +import com.neetgames.mcmmo.player.OnlineMMOPlayer; import com.gmail.nossr50.datatypes.player.PlayerProfile; import com.gmail.nossr50.datatypes.skills.PrimarySkillType; import com.gmail.nossr50.datatypes.skills.SuperAbilityType; @@ -62,7 +62,7 @@ public class ScoreboardWrapper { powerObjective.setDisplayName(ScoreboardManager.TAG_POWER_LEVEL); powerObjective.setDisplaySlot(DisplaySlot.BELOW_NAME); - for (McMMOPlayer mmoPlayer : mcMMO.getUserManager().getPlayers()) { + for (OnlineMMOPlayer mmoPlayer : mcMMO.getUserManager().getPlayers()) { powerObjective.getScore(mmoPlayer.getPlayerName()).setScore(mmoPlayer.getExperienceManager().getPowerLevel()); } } @@ -433,7 +433,7 @@ public class ScoreboardWrapper { return; } - McMMOPlayer mmoPlayer = mcMMO.getUserManager().queryPlayer(player); + OnlineMMOPlayer mmoPlayer = mcMMO.getUserManager().queryPlayer(player); if(mmoPlayer == null) return; 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 b42d83d85..e00e68a4c 100644 --- a/src/main/java/com/gmail/nossr50/util/skills/CombatUtils.java +++ b/src/main/java/com/gmail/nossr50/util/skills/CombatUtils.java @@ -5,7 +5,7 @@ import com.gmail.nossr50.config.experience.ExperienceConfig; import com.gmail.nossr50.datatypes.experience.XPGainReason; import com.gmail.nossr50.datatypes.interactions.NotificationType; import com.gmail.nossr50.datatypes.meta.OldName; -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.events.fake.FakeEntityDamageByEntityEvent; @@ -75,7 +75,7 @@ public final class CombatUtils { return; } - McMMOPlayer mmoPlayer = mcMMO.getUserManager().queryPlayer(player); + OnlineMMOPlayer mmoPlayer = mcMMO.getUserManager().queryPlayer(player); //Make sure the profiles been loaded if(mmoPlayer == null) { @@ -125,7 +125,7 @@ public final class CombatUtils { return; } - McMMOPlayer mmoPlayer = mcMMO.getUserManager().queryPlayer(player); + OnlineMMOPlayer mmoPlayer = mcMMO.getUserManager().queryPlayer(player); //Make sure the profiles been loaded if(mmoPlayer == null) { @@ -140,7 +140,7 @@ public final class CombatUtils { } - private static void printFinalDamageDebug(@NotNull Player player, @NotNull EntityDamageByEntityEvent event, @NotNull McMMOPlayer mcMMOPlayer, @Nullable String @Nullable ... extraInfoLines) { + private static void printFinalDamageDebug(@NotNull Player player, @NotNull EntityDamageByEntityEvent event, @NotNull OnlineMMOPlayer mcMMOPlayer, @Nullable String @Nullable ... extraInfoLines) { if(mcMMOPlayer.isDebugMode()) { player.sendMessage("Final Damage value after mcMMO modifiers: "+ event.getFinalDamage()); if(extraInfoLines != null) { @@ -161,7 +161,7 @@ public final class CombatUtils { double finalDamage = initialDamage; Map modifiers = getModifiers(event); - McMMOPlayer mmoPlayer = mcMMO.getUserManager().queryPlayer(player); + OnlineMMOPlayer mmoPlayer = mcMMO.getUserManager().queryPlayer(player); //Make sure the profiles been loaded if(mmoPlayer == null) { @@ -212,7 +212,7 @@ public final class CombatUtils { double initialDamage = event.getDamage(); double finalDamage = initialDamage; - McMMOPlayer mmoPlayer = mcMMO.getUserManager().queryPlayer(player); + OnlineMMOPlayer mmoPlayer = mcMMO.getUserManager().queryPlayer(player); //Make sure the profiles been loaded if(mmoPlayer == null) { @@ -253,7 +253,7 @@ public final class CombatUtils { double finalDamage = initialDamage; if(master != null && master.isOnline() && master.isValid()) { - McMMOPlayer mmoPlayer = mcMMO.getUserManager().queryPlayer(master); + OnlineMMOPlayer mmoPlayer = mcMMO.getUserManager().queryPlayer(master); //Make sure the profiles been loaded if(mmoPlayer == null) { @@ -285,7 +285,7 @@ public final class CombatUtils { private static void processArcheryCombat(@NotNull LivingEntity target, @NotNull Player player, @NotNull EntityDamageByEntityEvent event, @NotNull Projectile arrow) { double initialDamage = event.getDamage(); - McMMOPlayer mmoPlayer = mcMMO.getUserManager().queryPlayer(player); + OnlineMMOPlayer mmoPlayer = mcMMO.getUserManager().queryPlayer(player); //Make sure the profiles been loaded if(mmoPlayer == null) { @@ -334,7 +334,7 @@ public final class CombatUtils { private static void processCrossbowCombat(LivingEntity target, Player player, EntityDamageByEntityEvent event, Projectile arrow) { double initialDamage = event.getDamage(); - McMMOPlayer mmoPlayer = mcMMO.getUserManager().queryPlayer(player); + OnlineMMOPlayer mmoPlayer = mcMMO.getUserManager().queryPlayer(player); //Make sure the profiles been loaded if(mmoPlayer == null) { @@ -393,7 +393,7 @@ public final class CombatUtils { return; } - McMMOPlayer mmoPlayer = mcMMO.getUserManager().queryPlayer(player); + OnlineMMOPlayer mmoPlayer = mcMMO.getUserManager().queryPlayer(player); AcrobaticsManager acrobaticsManager = mmoPlayer.getAcrobaticsManager(); if (acrobaticsManager.canDodge(target)) { @@ -514,7 +514,7 @@ public final class CombatUtils { } if (target.getType() != EntityType.CREEPER && !Misc.isNPCEntityExcludingVillagers(player) && PrimarySkillType.TAMING.getPermissions(player)) { - McMMOPlayer mmoPlayer = mcMMO.getUserManager().queryPlayer(player); + OnlineMMOPlayer mmoPlayer = mcMMO.getUserManager().queryPlayer(player); if(mmoPlayer == null) { return; @@ -558,7 +558,7 @@ public final class CombatUtils { * @param subSkillType the specific limit break skill for calculations * @return the RAW damage bonus from Limit Break which is applied before reductions */ - public static int getLimitBreakDamage(@NotNull McMMOPlayer attacker, @NotNull LivingEntity defender, @NotNull SubSkillType subSkillType) { + public static int getLimitBreakDamage(@NotNull OnlineMMOPlayer attacker, @NotNull LivingEntity defender, @NotNull SubSkillType subSkillType) { if(defender instanceof Player) { Player playerDefender = (Player) defender; return getLimitBreakDamageAgainstQuality(attacker, subSkillType, getArmorQualityLevel(playerDefender)); @@ -575,7 +575,7 @@ public final class CombatUtils { * @param armorQualityLevel Armor quality level * @return the RAW damage boost after its been mutated by armor quality */ - public static int getLimitBreakDamageAgainstQuality(@NotNull McMMOPlayer attacker, @NotNull SubSkillType subSkillType, int armorQualityLevel) { + public static int getLimitBreakDamageAgainstQuality(@NotNull OnlineMMOPlayer attacker, @NotNull SubSkillType subSkillType, int armorQualityLevel) { int rawDamageBoost = RankUtils.getRank(attacker, subSkillType); if(armorQualityLevel <= 4) { @@ -620,7 +620,7 @@ public final class CombatUtils { * @param mmoPlayer target entity * @return true if the mmoPlayer has access to the limit break */ - public static boolean canUseLimitBreak(@NotNull McMMOPlayer mmoPlayer, LivingEntity target, @NotNull SubSkillType subSkillType) { + public static boolean canUseLimitBreak(@NotNull OnlineMMOPlayer mmoPlayer, LivingEntity target, @NotNull SubSkillType subSkillType) { if(target instanceof Player || AdvancedConfig.getInstance().canApplyLimitBreakPVE()) { return RankUtils.hasUnlockedSubskill(mmoPlayer, subSkillType) && Permissions.isSubSkillEnabled(mmoPlayer.getPlayer(), subSkillType); @@ -795,7 +795,7 @@ public final class CombatUtils { * @param target The defending entity * @param primarySkillType The skill being used */ - public static void processCombatXP(@NotNull McMMOPlayer mmoPlayer, LivingEntity target, PrimarySkillType primarySkillType) { + public static void processCombatXP(@NotNull OnlineMMOPlayer mmoPlayer, LivingEntity target, PrimarySkillType primarySkillType) { processCombatXP(mmoPlayer, target, primarySkillType, 1.0); } @@ -807,7 +807,7 @@ public final class CombatUtils { * @param primarySkillType The skill being used * @param multiplier final XP result will be multiplied by this */ - public static void processCombatXP(@NotNull McMMOPlayer mmoPlayer, LivingEntity target, PrimarySkillType primarySkillType, double multiplier) { + public static void processCombatXP(@NotNull OnlineMMOPlayer mmoPlayer, LivingEntity target, PrimarySkillType primarySkillType, double multiplier) { double baseXP = 0; XPGainReason xpGainReason; diff --git a/src/main/java/com/gmail/nossr50/util/skills/RankUtils.java b/src/main/java/com/gmail/nossr50/util/skills/RankUtils.java index 451ac0c6c..74a2fdd8f 100644 --- a/src/main/java/com/gmail/nossr50/util/skills/RankUtils.java +++ b/src/main/java/com/gmail/nossr50/util/skills/RankUtils.java @@ -1,7 +1,7 @@ package com.gmail.nossr50.util.skills; import com.gmail.nossr50.config.RankConfig; -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.SuperAbilityType; @@ -25,7 +25,7 @@ public class RankUtils { * @param primarySkillType target skill * @param newLevel the new level of this skill */ - public static void executeSkillUnlockNotifications(@NotNull Plugin plugin, @NotNull McMMOPlayer mmoPlayer, @NotNull PrimarySkillType primarySkillType, int newLevel) + public static void executeSkillUnlockNotifications(@NotNull Plugin plugin, @NotNull OnlineMMOPlayer mmoPlayer, @NotNull PrimarySkillType primarySkillType, int newLevel) { for(SubSkillType subSkillType : primarySkillType.getSkillAbilities()) { @@ -105,7 +105,7 @@ public class RankUtils { * @param subSkillType the target subskill * @return true if the player has at least one rank in the skill */ - public static boolean hasUnlockedSubskill(@NotNull McMMOPlayer mmoPlayer, @NotNull SubSkillType subSkillType) + public static boolean hasUnlockedSubskill(@NotNull OnlineMMOPlayer mmoPlayer, @NotNull SubSkillType subSkillType) { int curRank = getRank(mmoPlayer, subSkillType); @@ -119,7 +119,7 @@ public class RankUtils { * @param abstractSubSkill the target subskill * @return true if the player has at least one rank in the skill */ - public static boolean hasUnlockedSubskill(@NotNull McMMOPlayer mmoPlayer, @NotNull AbstractSubSkill abstractSubSkill) + public static boolean hasUnlockedSubskill(@NotNull OnlineMMOPlayer mmoPlayer, @NotNull AbstractSubSkill abstractSubSkill) { int curRank = getRank(mmoPlayer, abstractSubSkill); @@ -134,7 +134,7 @@ public class RankUtils { * @param subSkillType the target subskill * @return true if the player is at least that rank in this subskill */ - public static boolean hasReachedRank(int rank, @NotNull McMMOPlayer mmoPlayer, @NotNull SubSkillType subSkillType) + public static boolean hasReachedRank(int rank, @NotNull OnlineMMOPlayer mmoPlayer, @NotNull SubSkillType subSkillType) { return getRank(mmoPlayer, subSkillType) >= rank; } @@ -146,7 +146,7 @@ public class RankUtils { * @param abstractSubSkill the target subskill * @return true if the player is at least that rank in this subskill */ - public static boolean hasReachedRank(int rank, @NotNull McMMOPlayer mmoPlayer, @NotNull AbstractSubSkill abstractSubSkill) + public static boolean hasReachedRank(int rank, @NotNull OnlineMMOPlayer mmoPlayer, @NotNull AbstractSubSkill abstractSubSkill) { return getRank(mmoPlayer, abstractSubSkill) >= rank; } @@ -168,7 +168,7 @@ public class RankUtils { * @param subSkillType Target subskill * @return The rank the player currently has achieved in this skill. -1 for skills without ranks. */ - public static int getRank(@NotNull McMMOPlayer mmoPlayer, @NotNull SubSkillType subSkillType) + public static int getRank(@NotNull OnlineMMOPlayer mmoPlayer, @NotNull SubSkillType subSkillType) { String skillName = subSkillType.toString(); int numRanks = subSkillType.getNumRanks(); @@ -212,7 +212,7 @@ public class RankUtils { * @param abstractSubSkill Target subskill * @return The rank the player currently has achieved in this skill. -1 for skills without ranks. */ - public static int getRank(@NotNull McMMOPlayer mmoPlayer, @NotNull AbstractSubSkill abstractSubSkill) + public static int getRank(@NotNull OnlineMMOPlayer mmoPlayer, @NotNull AbstractSubSkill abstractSubSkill) { String skillName = abstractSubSkill.getConfigKeyName(); int numRanks = abstractSubSkill.getNumRanks(); @@ -365,7 +365,7 @@ public class RankUtils { return getRankUnlockLevel(superAbilityType.getSubSkillTypeDefinition(), 1); } - public static boolean isPlayerMaxRankInSubSkill(@NotNull McMMOPlayer mmoPlayer, SubSkillType subSkillType) { + public static boolean isPlayerMaxRankInSubSkill(@NotNull OnlineMMOPlayer mmoPlayer, SubSkillType subSkillType) { int playerRank = getRank(mmoPlayer, subSkillType); int highestRank = getHighestRank(subSkillType); 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 cac4445ab..1036e5b3c 100644 --- a/src/main/java/com/gmail/nossr50/util/skills/SkillUtils.java +++ b/src/main/java/com/gmail/nossr50/util/skills/SkillUtils.java @@ -6,7 +6,7 @@ import com.gmail.nossr50.config.HiddenConfig; import com.gmail.nossr50.datatypes.experience.XPGainReason; import com.gmail.nossr50.datatypes.experience.XPGainSource; import com.gmail.nossr50.datatypes.interactions.NotificationType; -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.SuperAbilityType; @@ -44,11 +44,11 @@ public final class SkillUtils { */ private SkillUtils() {} - public static void applyXpGain(@NotNull McMMOPlayer mmoPlayer, @NotNull PrimarySkillType primarySkillType, float xp, @NotNull XPGainReason xpGainReason) { + public static void applyXpGain(@NotNull OnlineMMOPlayer mmoPlayer, @NotNull PrimarySkillType primarySkillType, float xp, @NotNull XPGainReason xpGainReason) { mmoPlayer.getExperienceManager().beginXpGain(mmoPlayer.getPlayer(), primarySkillType, xp, xpGainReason, XPGainSource.SELF); } - public static void applyXpGain(@NotNull McMMOPlayer mmoPlayer, @NotNull PrimarySkillType primarySkillType, float xp, @NotNull XPGainReason xpGainReason, @NotNull XPGainSource xpGainSource) { + public static void applyXpGain(@NotNull OnlineMMOPlayer mmoPlayer, @NotNull PrimarySkillType primarySkillType, float xp, @NotNull XPGainReason xpGainReason, @NotNull XPGainSource xpGainSource) { mmoPlayer.getExperienceManager().beginXpGain(mmoPlayer.getPlayer(), primarySkillType, xp, xpGainReason, xpGainSource); } @@ -67,7 +67,7 @@ public final class SkillUtils { * Skill Stat Calculations */ - public static @NotNull String[] calculateLengthDisplayValues(@NotNull McMMOPlayer mmoPlayer, float skillValue, @NotNull PrimarySkillType skill) { + public static @NotNull String[] calculateLengthDisplayValues(@NotNull OnlineMMOPlayer mmoPlayer, float skillValue, @NotNull PrimarySkillType skill) { int maxLength = skill.getSuperAbilityType().getMaxLength(); int abilityLengthVar = AdvancedConfig.getInstance().getAbilityLength(); int abilityLengthCap = AdvancedConfig.getInstance().getAbilityLengthCap(); @@ -94,7 +94,7 @@ public final class SkillUtils { * Others */ - public static int handleFoodSkills(@NotNull McMMOPlayer mmoPlayer, int eventFoodLevel, @NotNull SubSkillType subSkillType) { + public static int handleFoodSkills(@NotNull OnlineMMOPlayer mmoPlayer, int eventFoodLevel, @NotNull SubSkillType subSkillType) { int curRank = RankUtils.getRank(mmoPlayer, subSkillType); int currentFoodLevel = mmoPlayer.getPlayer().getFoodLevel(); @@ -114,7 +114,7 @@ public final class SkillUtils { * * @return the number of seconds remaining before the cooldown expires */ - public static int calculateTimeLeft(long deactivatedTimeStamp, int cooldown, @NotNull McMMOPlayer mmoPlayer) { + public static int calculateTimeLeft(long deactivatedTimeStamp, int cooldown, @NotNull OnlineMMOPlayer mmoPlayer) { return (int) (((deactivatedTimeStamp + (PerksUtils.handleCooldownPerks(mmoPlayer.getPlayer(), cooldown) * Misc.TIME_CONVERSION_FACTOR)) - System.currentTimeMillis()) / Misc.TIME_CONVERSION_FACTOR); } @@ -188,7 +188,7 @@ public final class SkillUtils { } } - McMMOPlayer mmoPlayer = mcMMO.getUserManager().queryPlayer(player); + OnlineMMOPlayer mmoPlayer = mcMMO.getUserManager().queryPlayer(player); //Not Loaded if(mmoPlayer == null) diff --git a/src/main/java/com/gmail/nossr50/util/skills/SmeltingTracker.java b/src/main/java/com/gmail/nossr50/util/skills/SmeltingTracker.java index 8c653d8ff..f9f2cb24f 100644 --- a/src/main/java/com/gmail/nossr50/util/skills/SmeltingTracker.java +++ b/src/main/java/com/gmail/nossr50/util/skills/SmeltingTracker.java @@ -1,6 +1,6 @@ package com.gmail.nossr50.util.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.mcMMO; import com.gmail.nossr50.util.Permissions; @@ -21,7 +21,7 @@ public class SmeltingTracker { private void changeFurnaceOwnership(Furnace furnace, Player player) { - McMMOPlayer mmoPlayer = mcMMO.getUserManager().queryPlayer(player); + OnlineMMOPlayer mmoPlayer = mcMMO.getUserManager().queryPlayer(player); /* Debug output @@ -37,7 +37,7 @@ public class SmeltingTracker { mcMMO.getCompatibilityManager().getPersistentDataLayer().setFurnaceOwner(furnace, player.getUniqueId()); } - private void printOwnershipGainDebug(Furnace furnace, McMMOPlayer mmoPlayer) { + private void printOwnershipGainDebug(Furnace furnace, OnlineMMOPlayer mmoPlayer) { if(mmoPlayer != null) { if(mmoPlayer.isDebugMode()) { mmoPlayer.getPlayer().sendMessage("Furnace ownership " + @@ -52,7 +52,7 @@ public class SmeltingTracker { OfflinePlayer furnaceOwner = getFurnaceOwner(furnace); if(furnaceOwner != null && furnaceOwner.isOnline()) { - McMMOPlayer furnaceOwnerProfile = mcMMO.getUserManager().queryPlayer(furnaceOwner.getPlayer()); + OnlineMMOPlayer furnaceOwnerProfile = mcMMO.getUserManager().queryPlayer(furnaceOwner.getPlayer()); if(furnaceOwnerProfile != null) { if(furnaceOwnerProfile.isDebugMode()) { diff --git a/src/main/java/com/gmail/nossr50/util/text/TextComponentFactory.java b/src/main/java/com/gmail/nossr50/util/text/TextComponentFactory.java index 3457f8be4..0ded6aa20 100644 --- a/src/main/java/com/gmail/nossr50/util/text/TextComponentFactory.java +++ b/src/main/java/com/gmail/nossr50/util/text/TextComponentFactory.java @@ -4,7 +4,7 @@ import com.gmail.nossr50.config.Config; import com.gmail.nossr50.config.RankConfig; import com.gmail.nossr50.datatypes.json.McMMOUrl; import com.gmail.nossr50.datatypes.json.McMMOWebLinks; -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; @@ -63,7 +63,7 @@ public class TextComponentFactory { return Component.text(text); } - public static void sendPlayerSubSkillWikiLink(McMMOPlayer mmoPlayer, String subskillformatted) + public static void sendPlayerSubSkillWikiLink(OnlineMMOPlayer mmoPlayer, String subskillformatted) { if(!Config.getInstance().getUrlLinksEnabled()) return; @@ -82,7 +82,7 @@ public class TextComponentFactory { mcMMO.getAudiences().player(mmoPlayer.getPlayer()).sendMessage(Identity.nil(), wikiLinkComponent, MessageType.SYSTEM); } - public static void sendPlayerUrlHeader(@NotNull McMMOPlayer mmoPlayer) { + public static void sendPlayerUrlHeader(@NotNull OnlineMMOPlayer mmoPlayer) { TextComponent prefix = Component.text(LocaleLoader.getString("Overhaul.mcMMO.Url.Wrap.Prefix") + " "); /*prefix.setColor(ChatColor.DARK_AQUA);*/ TextComponent suffix = Component.text(" "+LocaleLoader.getString("Overhaul.mcMMO.Url.Wrap.Suffix")); @@ -241,7 +241,7 @@ public class TextComponentFactory { return ClickEvent.openUrl(url); } - private static Component getSubSkillTextComponent(@NotNull McMMOPlayer mmoPlayer, @NotNull SubSkillType subSkillType) + private static Component getSubSkillTextComponent(@NotNull OnlineMMOPlayer mmoPlayer, @NotNull SubSkillType subSkillType) { //Get skill name String skillName = subSkillType.getLocaleName(); @@ -259,7 +259,7 @@ public class TextComponentFactory { return textComponent.build(); } - private static TextComponent getSubSkillTextComponent(@NotNull McMMOPlayer mmoPlayer, @NotNull AbstractSubSkill abstractSubSkill) + private static TextComponent getSubSkillTextComponent(@NotNull OnlineMMOPlayer mmoPlayer, @NotNull AbstractSubSkill abstractSubSkill) { //String key = abstractSubSkill.getConfigKeyName(); String skillName = abstractSubSkill.getNiceName(); @@ -280,7 +280,7 @@ public class TextComponentFactory { return textComponent.build(); } - private static TextComponent.Builder initNewSkillTextComponent(@NotNull McMMOPlayer mmoPlayer, @NotNull String skillName, @NotNull SubSkillType subSkillType, boolean skillUnlocked) { + private static TextComponent.Builder initNewSkillTextComponent(@NotNull OnlineMMOPlayer mmoPlayer, @NotNull String skillName, @NotNull SubSkillType subSkillType, boolean skillUnlocked) { TextComponent.Builder textComponent; if (skillUnlocked) { if (RankUtils.getHighestRank(subSkillType) == RankUtils.getRank(mmoPlayer, subSkillType) && subSkillType.getNumRanks() > 1) @@ -299,12 +299,12 @@ public class TextComponentFactory { return textComponent; } - private static Component getSubSkillHoverComponent(@NotNull McMMOPlayer mmoPlayer, @NotNull AbstractSubSkill abstractSubSkill) + private static Component getSubSkillHoverComponent(@NotNull OnlineMMOPlayer mmoPlayer, @NotNull AbstractSubSkill abstractSubSkill) { return getSubSkillHoverEventJSON(abstractSubSkill, mmoPlayer); } - private static Component getSubSkillHoverComponent(@NotNull McMMOPlayer mmoPlayer, SubSkillType subSkillType) + private static Component getSubSkillHoverComponent(@NotNull OnlineMMOPlayer mmoPlayer, SubSkillType subSkillType) { return getSubSkillHoverEventJSON(subSkillType, mmoPlayer); } @@ -315,7 +315,7 @@ public class TextComponentFactory { * @param mmoPlayer the player who owns this subskill * @return the hover basecomponent object for this subskill */ - private static Component getSubSkillHoverEventJSON(@NotNull AbstractSubSkill abstractSubSkill, @NotNull McMMOPlayer mmoPlayer) + private static Component getSubSkillHoverEventJSON(@NotNull AbstractSubSkill abstractSubSkill, @NotNull OnlineMMOPlayer mmoPlayer) { String skillName = abstractSubSkill.getNiceName(); @@ -363,7 +363,7 @@ public class TextComponentFactory { return componentBuilder.build(); } - private static TextComponent.Builder setupSkillComponentNameStyle(@NotNull McMMOPlayer mmoPlayer, @NotNull String skillName, @NotNull SubSkillType subSkillType, boolean skillUnlocked) { + private static TextComponent.Builder setupSkillComponentNameStyle(@NotNull OnlineMMOPlayer mmoPlayer, @NotNull String skillName, @NotNull SubSkillType subSkillType, boolean skillUnlocked) { TextComponent.Builder componentBuilder; if (skillUnlocked) { if (RankUtils.getHighestRank(subSkillType) == RankUtils.getRank(mmoPlayer, subSkillType) && subSkillType.getNumRanks() > 1) @@ -417,7 +417,7 @@ public class TextComponentFactory { } @Deprecated - private static @NotNull Component getSubSkillHoverEventJSON(@NotNull SubSkillType subSkillType, @NotNull McMMOPlayer mmoPlayer) + private static @NotNull Component getSubSkillHoverEventJSON(@NotNull SubSkillType subSkillType, @NotNull OnlineMMOPlayer mmoPlayer) { String skillName = subSkillType.getLocaleName(); @@ -485,7 +485,7 @@ public class TextComponentFactory { componentBuilder.append(Component.newline()); } - public static void getSubSkillTextComponents(@NotNull McMMOPlayer mmoPlayer, @NotNull List textComponents, @NotNull PrimarySkillType parentSkill) { + public static void getSubSkillTextComponents(@NotNull OnlineMMOPlayer mmoPlayer, @NotNull List textComponents, @NotNull PrimarySkillType parentSkill) { for(SubSkillType subSkillType : SubSkillType.values()) { if(subSkillType.getParentSkill() == parentSkill) @@ -514,7 +514,7 @@ public class TextComponentFactory { } } - public static @NotNull TextComponent getSubSkillUnlockedNotificationComponents(@NotNull McMMOPlayer mmoPlayer, @NotNull SubSkillType subSkillType) + public static @NotNull TextComponent getSubSkillUnlockedNotificationComponents(@NotNull OnlineMMOPlayer mmoPlayer, @NotNull SubSkillType subSkillType) { TextComponent.Builder unlockMessage = Component.text().content(LocaleLoader.getString("JSON.SkillUnlockMessage", subSkillType.getLocaleName(), RankUtils.getRank(mmoPlayer, subSkillType))); unlockMessage.hoverEvent(HoverEvent.showText(getSubSkillHoverComponent(mmoPlayer, subSkillType)));