diff --git a/src/main/java/com/gmail/nossr50/api/AbilityAPI.java b/src/main/java/com/gmail/nossr50/api/AbilityAPI.java index 3ad6d43e7..1597fbb20 100644 --- a/src/main/java/com/gmail/nossr50/api/AbilityAPI.java +++ b/src/main/java/com/gmail/nossr50/api/AbilityAPI.java @@ -83,8 +83,8 @@ public final class AbilityAPI { } public static boolean isBleeding(LivingEntity entity) { - if(entity.isValid()) { - if(entity.hasMetadata(MetadataConstants.METADATA_KEY_RUPTURE)) { + if (entity.isValid()) { + if (entity.hasMetadata(MetadataConstants.METADATA_KEY_RUPTURE)) { return true; } } diff --git a/src/main/java/com/gmail/nossr50/api/ExperienceAPI.java b/src/main/java/com/gmail/nossr50/api/ExperienceAPI.java index c626810ec..fd928fdee 100644 --- a/src/main/java/com/gmail/nossr50/api/ExperienceAPI.java +++ b/src/main/java/com/gmail/nossr50/api/ExperienceAPI.java @@ -516,7 +516,7 @@ public final class ExperienceAPI { } public static float getOfflineXPRaw(@NotNull OfflinePlayer offlinePlayer, @NotNull PrimarySkillType skillType) throws InvalidPlayerException, UnsupportedOperationException { - if(SkillTools.isChildSkill(skillType)) + if (SkillTools.isChildSkill(skillType)) throw new UnsupportedOperationException(); return getOfflineProfile(offlinePlayer).getSkillXpLevelRaw(skillType); @@ -1149,7 +1149,7 @@ public final class ExperienceAPI { { for(PrimarySkillType skillType : PrimarySkillType.values()) { - if(ExperienceConfig.getInstance().getXp(skillType, bs.getType()) > 0) + if (ExperienceConfig.getInstance().getXp(skillType, bs.getType()) > 0) { mcMMOPlayer.applyXpGain(skillType, ExperienceConfig.getInstance().getXp(skillType, bs.getType()), XPGainReason.PVE, XPGainSource.SELF); } @@ -1167,7 +1167,7 @@ public final class ExperienceAPI { { for(BlockState bs : blockStates) { - if(ExperienceConfig.getInstance().getXp(skillType, bs.getType()) > 0) + if (ExperienceConfig.getInstance().getXp(skillType, bs.getType()) > 0) { mcMMOPlayer.applyXpGain(skillType, ExperienceConfig.getInstance().getXp(skillType, bs.getType()), XPGainReason.PVE, XPGainSource.SELF); } @@ -1183,7 +1183,7 @@ public final class ExperienceAPI { { for(PrimarySkillType skillType : PrimarySkillType.values()) { - if(ExperienceConfig.getInstance().getXp(skillType, blockState.getType()) > 0) + if (ExperienceConfig.getInstance().getXp(skillType, blockState.getType()) > 0) { mcMMOPlayer.applyXpGain(skillType, ExperienceConfig.getInstance().getXp(skillType, blockState.getType()), XPGainReason.PVE, XPGainSource.SELF); } @@ -1198,7 +1198,7 @@ public final class ExperienceAPI { */ public static void addXpFromBlockBySkill(BlockState blockState, McMMOPlayer mcMMOPlayer, PrimarySkillType skillType) { - if(ExperienceConfig.getInstance().getXp(skillType, blockState.getType()) > 0) + if (ExperienceConfig.getInstance().getXp(skillType, blockState.getType()) > 0) { mcMMOPlayer.applyXpGain(skillType, ExperienceConfig.getInstance().getXp(skillType, blockState.getType()), XPGainReason.PVE, XPGainSource.SELF); } diff --git a/src/main/java/com/gmail/nossr50/api/PartyAPI.java b/src/main/java/com/gmail/nossr50/api/PartyAPI.java index e86bf4619..246131408 100644 --- a/src/main/java/com/gmail/nossr50/api/PartyAPI.java +++ b/src/main/java/com/gmail/nossr50/api/PartyAPI.java @@ -50,7 +50,7 @@ public final class PartyAPI { * @return true if the player is in a party, false otherwise */ public static boolean inParty(Player player) { - if(!mcMMO.p.getPartyConfig().isPartyEnabled() || UserManager.getPlayer(player) == null) + if (!mcMMO.p.getPartyConfig().isPartyEnabled() || UserManager.getPlayer(player) == null) return false; return UserManager.getPlayer(player).inParty(); @@ -94,14 +94,14 @@ public final class PartyAPI { */ @Deprecated public static void addToParty(Player player, String partyName) { - if(!mcMMO.p.getPartyConfig().isPartyEnabled()) { + if (!mcMMO.p.getPartyConfig().isPartyEnabled()) { return; } //Check if player profile is loaded final McMMOPlayer mmoPlayer = UserManager.getPlayer(player); - if(mmoPlayer == null) + if (mmoPlayer == null) return; Party party = mcMMO.p.getPartyManager().getParty(partyName); @@ -109,7 +109,7 @@ public final class PartyAPI { if (party == null) { party = new Party(new PartyLeader(player.getUniqueId(), player.getName()), partyName); } else { - if(mcMMO.p.getPartyManager().isPartyFull(player, party)) + if (mcMMO.p.getPartyManager().isPartyFull(player, party)) { NotificationManager.sendPlayerInformation(player, NotificationType.PARTY_MESSAGE, "Commands.Party.PartyFull", party.toString()); return; @@ -140,7 +140,7 @@ public final class PartyAPI { */ public static void addToParty(Player player, String partyName, boolean bypassLimit) { //Check if player profile is loaded - if(!mcMMO.p.getPartyConfig().isPartyEnabled() || UserManager.getPlayer(player) == null) + if (!mcMMO.p.getPartyConfig().isPartyEnabled() || UserManager.getPlayer(player) == null) return; Party party = mcMMO.p.getPartyManager().getParty(partyName); @@ -161,7 +161,7 @@ public final class PartyAPI { */ public static void removeFromParty(Player player) { //Check if player profile is loaded - if(!mcMMO.p.getPartyConfig().isPartyEnabled() || UserManager.getPlayer(player) == null) + if (!mcMMO.p.getPartyConfig().isPartyEnabled() || UserManager.getPlayer(player) == null) return; mcMMO.p.getPartyManager().removeFromParty(UserManager.getPlayer(player)); @@ -176,7 +176,7 @@ public final class PartyAPI { * @return the leader of the party */ public static @Nullable String getPartyLeader(String partyName) { - if(!mcMMO.p.getPartyConfig().isPartyEnabled()) + if (!mcMMO.p.getPartyConfig().isPartyEnabled()) return null; return mcMMO.p.getPartyManager().getPartyLeaderName(partyName); @@ -192,7 +192,7 @@ public final class PartyAPI { */ @Deprecated public static void setPartyLeader(String partyName, String playerName) { - if(!mcMMO.p.getPartyConfig().isPartyEnabled()) + if (!mcMMO.p.getPartyConfig().isPartyEnabled()) return; mcMMO.p.getPartyManager().setPartyLeader(mcMMO.p.getServer().getOfflinePlayer(playerName).getUniqueId(), mcMMO.p.getPartyManager().getParty(partyName)); @@ -208,7 +208,7 @@ public final class PartyAPI { */ @Deprecated public static List getOnlineAndOfflineMembers(Player player) { - if(!mcMMO.p.getPartyConfig().isPartyEnabled()) { + if (!mcMMO.p.getPartyConfig().isPartyEnabled()) { return null; } @@ -230,7 +230,7 @@ public final class PartyAPI { */ @Deprecated public static LinkedHashSet getMembers(Player player) { - if(!mcMMO.p.getPartyConfig().isPartyEnabled()) + if (!mcMMO.p.getPartyConfig().isPartyEnabled()) return null; return (LinkedHashSet) mcMMO.p.getPartyManager().getAllMembers(player).values(); @@ -245,7 +245,7 @@ public final class PartyAPI { * @return all the player names and uuids in the player's party */ public static LinkedHashMap getMembersMap(Player player) { - if(!mcMMO.p.getPartyConfig().isPartyEnabled()) + if (!mcMMO.p.getPartyConfig().isPartyEnabled()) return null; return mcMMO.p.getPartyManager().getAllMembers(player); @@ -260,7 +260,7 @@ public final class PartyAPI { * @return all online players in this party */ public static List getOnlineMembers(String partyName) { - if(!mcMMO.p.getPartyConfig().isPartyEnabled()) + if (!mcMMO.p.getPartyConfig().isPartyEnabled()) return null; return mcMMO.p.getPartyManager().getOnlineMembers(partyName); diff --git a/src/main/java/com/gmail/nossr50/chat/ChatManager.java b/src/main/java/com/gmail/nossr50/chat/ChatManager.java index 658f4dd16..0d7c21c65 100644 --- a/src/main/java/com/gmail/nossr50/chat/ChatManager.java +++ b/src/main/java/com/gmail/nossr50/chat/ChatManager.java @@ -125,7 +125,7 @@ public class ChatManager { * @param targetChatChannel target chat channel */ public void setOrToggleChatChannel(@NotNull McMMOPlayer mmoPlayer, @NotNull ChatChannel targetChatChannel) { - if(targetChatChannel == mmoPlayer.getChatChannel()) { + if (targetChatChannel == mmoPlayer.getChatChannel()) { //Disabled message mmoPlayer.getPlayer().sendMessage(LocaleLoader.getString("Chat.Channel.Off", StringUtils.getCapitalized(targetChatChannel.toString()))); mmoPlayer.setChatMode(ChatChannel.NONE); @@ -144,7 +144,7 @@ public class ChatManager { StringBuilder stringBuilder = new StringBuilder(); for(int i = 0; i < args.length; i++) { - if(i + 1 >= args.length) { + if (i + 1 >= args.length) { stringBuilder.append(args[i]); } else { stringBuilder.append(args[i]).append(" "); @@ -162,12 +162,12 @@ public class ChatManager { public boolean isMessageAllowed(@NotNull McMMOPlayer mmoPlayer) { switch (mmoPlayer.getChatChannel()) { case ADMIN: - if(mmoPlayer.getPlayer().isOp() || Permissions.adminChat(mmoPlayer.getPlayer())) { + if (mmoPlayer.getPlayer().isOp() || Permissions.adminChat(mmoPlayer.getPlayer())) { return true; } break; case PARTY: - if(mmoPlayer.getParty() != null && Permissions.partyChat(mmoPlayer.getPlayer())) { + if (mmoPlayer.getParty() != null && Permissions.partyChat(mmoPlayer.getPlayer())) { return true; } break; @@ -206,7 +206,7 @@ public class ChatManager { * @return true if the chat channel is enabled */ public boolean isChatChannelEnabled(@NotNull ChatChannel chatChannel) { - if(!isChatEnabled) { + if (!isChatEnabled) { return false; } else { switch(chatChannel) { diff --git a/src/main/java/com/gmail/nossr50/chat/SamePartyPredicate.java b/src/main/java/com/gmail/nossr50/chat/SamePartyPredicate.java index 226eab83d..318460222 100644 --- a/src/main/java/com/gmail/nossr50/chat/SamePartyPredicate.java +++ b/src/main/java/com/gmail/nossr50/chat/SamePartyPredicate.java @@ -20,12 +20,12 @@ public class SamePartyPredicate implements Predicate @Override public boolean test(T t) { //Include the console in the audience - if(t instanceof ConsoleCommandSender) { + if (t instanceof ConsoleCommandSender) { return false; //Party audiences are special, we exclude console from them to avoid double messaging since we send a more verbose version to consoles } else { - if(t instanceof Player player) { + if (t instanceof Player player) { McMMOPlayer mcMMOPlayer = UserManager.getPlayer(player); - if(mcMMOPlayer != null) { + if (mcMMOPlayer != null) { return mcMMOPlayer.getParty() == party; } } diff --git a/src/main/java/com/gmail/nossr50/chat/author/AbstractPlayerAuthor.java b/src/main/java/com/gmail/nossr50/chat/author/AbstractPlayerAuthor.java index eb606af6d..2b9344f51 100644 --- a/src/main/java/com/gmail/nossr50/chat/author/AbstractPlayerAuthor.java +++ b/src/main/java/com/gmail/nossr50/chat/author/AbstractPlayerAuthor.java @@ -48,15 +48,15 @@ public abstract class AbstractPlayerAuthor implements Author { */ protected @NotNull String getSanitizedName(@NotNull ChatChannel chatChannel, boolean useDisplayName) { //Already in cache - if(sanitizedNameCache.containsKey(chatChannel)) { + if (sanitizedNameCache.containsKey(chatChannel)) { //Update cache - if(useDisplayName && hasPlayerDisplayNameChanged()) { + if (useDisplayName && hasPlayerDisplayNameChanged()) { updateLastKnownDisplayName(); updateSanitizedNameCache(chatChannel, true); } } else { //Update last known display name - if(useDisplayName && hasPlayerDisplayNameChanged()) { + if (useDisplayName && hasPlayerDisplayNameChanged()) { updateLastKnownDisplayName(); } @@ -76,7 +76,7 @@ public abstract class AbstractPlayerAuthor implements Author { * @param useDisplayName whether to use this authors display name */ private void updateSanitizedNameCache(@NotNull ChatChannel chatChannel, boolean useDisplayName) { - if(useDisplayName) { + if (useDisplayName) { sanitizedNameCache.put(chatChannel, TextUtils.sanitizeForSerializer(player.getDisplayName())); } else { //No need to sanitize a basic String diff --git a/src/main/java/com/gmail/nossr50/chat/mailer/AdminChatMailer.java b/src/main/java/com/gmail/nossr50/chat/mailer/AdminChatMailer.java index 5ec0f5c37..96c7ad1a6 100644 --- a/src/main/java/com/gmail/nossr50/chat/mailer/AdminChatMailer.java +++ b/src/main/java/com/gmail/nossr50/chat/mailer/AdminChatMailer.java @@ -57,7 +57,7 @@ public class AdminChatMailer extends AbstractChatMailer { * @return the styled string, based on a locale entry */ public @NotNull TextComponent addStyle(@NotNull Author author, @NotNull String message, boolean canColor) { - if(canColor) { + if (canColor) { return LocaleLoader.getTextComponent("Chat.Style.Admin", author.getAuthoredName(ChatChannel.ADMIN), message); } else { return TextUtils.ofLegacyTextRaw(LocaleLoader.getString("Chat.Style.Admin", author.getAuthoredName(ChatChannel.ADMIN), message)); @@ -83,7 +83,7 @@ public class AdminChatMailer extends AbstractChatMailer { McMMOChatEvent chatEvent = new McMMOAdminChatEvent(pluginRef, chatMessage, isAsync); Bukkit.getPluginManager().callEvent(chatEvent); - if(!chatEvent.isCancelled()) { + if (!chatEvent.isCancelled()) { sendMail(chatMessage); } } diff --git a/src/main/java/com/gmail/nossr50/chat/mailer/PartyChatMailer.java b/src/main/java/com/gmail/nossr50/chat/mailer/PartyChatMailer.java index ad8d8992d..e4edb0320 100644 --- a/src/main/java/com/gmail/nossr50/chat/mailer/PartyChatMailer.java +++ b/src/main/java/com/gmail/nossr50/chat/mailer/PartyChatMailer.java @@ -36,7 +36,7 @@ public class PartyChatMailer extends AbstractChatMailer { McMMOChatEvent chatEvent = new McMMOPartyChatEvent(pluginRef, chatMessage, party, isAsync); Bukkit.getPluginManager().callEvent(chatEvent); - if(!chatEvent.isCancelled()) { + if (!chatEvent.isCancelled()) { sendMail(chatMessage); } } @@ -60,14 +60,14 @@ public class PartyChatMailer extends AbstractChatMailer { * @return the styled string, based on a locale entry */ public @NotNull TextComponent addStyle(@NotNull Author author, @NotNull String message, boolean canColor, boolean isLeader) { - if(canColor) { - if(isLeader) { + if (canColor) { + if (isLeader) { return LocaleLoader.getTextComponent("Chat.Style.Party.Leader", author.getAuthoredName(ChatChannel.PARTY), message); } else { return LocaleLoader.getTextComponent("Chat.Style.Party", author.getAuthoredName(ChatChannel.PARTY), message); } } else { - if(isLeader) { + if (isLeader) { return TextUtils.ofLegacyTextRaw(LocaleLoader.getString("Chat.Style.Party.Leader", author.getAuthoredName(ChatChannel.PARTY), message)); } else { return TextUtils.ofLegacyTextRaw(LocaleLoader.getString("Chat.Style.Party", author.getAuthoredName(ChatChannel.PARTY), message)); 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 756c3d457..02b2499ea 100644 --- a/src/main/java/com/gmail/nossr50/chat/message/PartyChatMessage.java +++ b/src/main/java/com/gmail/nossr50/chat/message/PartyChatMessage.java @@ -52,7 +52,7 @@ public class PartyChatMessage extends AbstractChatMessage { messagePartyChatSpies(spyMessage); //Console message - if(ChatConfig.getInstance().isConsoleIncludedInAudience(ChatChannel.PARTY)) + if (ChatConfig.getInstance().isConsoleIncludedInAudience(ChatChannel.PARTY)) mcMMO.p.getChatManager().sendConsoleMessage(author, spyMessage); } @@ -67,11 +67,11 @@ public class PartyChatMessage extends AbstractChatMessage { Player player = mcMMOPlayer.getPlayer(); //Check for toggled players - if(mcMMOPlayer.isPartyChatSpying()) { + if (mcMMOPlayer.isPartyChatSpying()) { Party adminParty = mcMMOPlayer.getParty(); //Only message admins not part of this party - if(adminParty == null || adminParty != getParty()) { + if (adminParty == null || adminParty != getParty()) { //TODO: Hacky, rewrite later Audience audience = mcMMO.getAudiences().player(player); audience.sendMessage(spyMessage); diff --git a/src/main/java/com/gmail/nossr50/commands/CommandManager.java b/src/main/java/com/gmail/nossr50/commands/CommandManager.java index 3b9d8516e..d870baed0 100644 --- a/src/main/java/com/gmail/nossr50/commands/CommandManager.java +++ b/src/main/java/com/gmail/nossr50/commands/CommandManager.java @@ -47,7 +47,7 @@ public class CommandManager { } private void registerSkillCommands() { - if(mcMMO.p.getGeneralConfig().isMasterySystemEnabled()) { + if (mcMMO.p.getGeneralConfig().isMasterySystemEnabled()) { bukkitCommandManager.registerCommand(new PowerLevelCommand(pluginRef)); } } @@ -56,11 +56,11 @@ public class CommandManager { * Registers chat commands if the chat system is enabled */ private void registerChatCommands() { - if(ChatConfig.getInstance().isChatEnabled()) { - if(ChatConfig.getInstance().isChatChannelEnabled(ChatChannel.ADMIN)) { + if (ChatConfig.getInstance().isChatEnabled()) { + if (ChatConfig.getInstance().isChatChannelEnabled(ChatChannel.ADMIN)) { bukkitCommandManager.registerCommand(new AdminChatCommand(pluginRef)); } - if(pluginRef.getPartyConfig().isPartyEnabled() && ChatConfig.getInstance().isChatChannelEnabled(ChatChannel.PARTY)) { + if (pluginRef.getPartyConfig().isPartyEnabled() && ChatConfig.getInstance().isChatChannelEnabled(ChatChannel.PARTY)) { bukkitCommandManager.registerCommand(new PartyChatCommand(pluginRef)); } } @@ -75,7 +75,7 @@ public class CommandManager { bukkitCommandManager.getCommandConditions().addCondition(POWER_LEVEL_CONDITION, (context) -> { BukkitCommandIssuer issuer = context.getIssuer(); - if(issuer.getIssuer() instanceof Player) { + if (issuer.getIssuer() instanceof Player) { validateLoadedData(issuer.getPlayer()); } else { throw new ConditionFailedException(LocaleLoader.getString("Commands.NoConsole")); @@ -88,7 +88,7 @@ public class CommandManager { bukkitCommandManager.getCommandConditions().addCondition(ADMIN_CONDITION, (context) -> { BukkitCommandIssuer issuer = context.getIssuer(); - if(issuer.getIssuer() instanceof Player) { + if (issuer.getIssuer() instanceof Player) { validateLoadedData(issuer.getPlayer()); validateAdmin(issuer.getPlayer()); } @@ -97,7 +97,7 @@ public class CommandManager { bukkitCommandManager.getCommandConditions().addCondition(MMO_DATA_LOADED, (context) -> { BukkitCommandIssuer bukkitCommandIssuer = context.getIssuer(); - if(bukkitCommandIssuer.getIssuer() instanceof Player) { + if (bukkitCommandIssuer.getIssuer() instanceof Player) { validateLoadedData(bukkitCommandIssuer.getPlayer()); } }); @@ -105,7 +105,7 @@ public class CommandManager { bukkitCommandManager.getCommandConditions().addCondition(PARTY_CONDITION, (context) -> { BukkitCommandIssuer bukkitCommandIssuer = context.getIssuer(); - if(bukkitCommandIssuer.getIssuer() instanceof Player) { + if (bukkitCommandIssuer.getIssuer() instanceof Player) { validateLoadedData(bukkitCommandIssuer.getPlayer()); validatePlayerParty(bukkitCommandIssuer.getPlayer()); //TODO: Is there even a point in validating permission? look into this later @@ -115,20 +115,20 @@ public class CommandManager { } private void validatePermission(@NotNull String permissionNode, @NotNull Permissible permissible) { - if(!permissible.hasPermission(permissionNode)) { + if (!permissible.hasPermission(permissionNode)) { throw new ConditionFailedException(LocaleLoader.getString("mcMMO.NoPermission")); } } public void validateAdmin(@NotNull Player player) { - if(!player.isOp() && !Permissions.adminChat(player)) { + if (!player.isOp() && !Permissions.adminChat(player)) { throw new ConditionFailedException("You are lacking the correct permissions to use this command."); } } public void validateLoadedData(@NotNull Player player) { - if(UserManager.getPlayer(player) == null) { + if (UserManager.getPlayer(player) == null) { throw new ConditionFailedException(LocaleLoader.getString("Profile.PendingLoad")); } } @@ -136,7 +136,7 @@ public class CommandManager { public void validatePlayerParty(@NotNull Player player) { McMMOPlayer mmoPlayer = UserManager.getPlayer(player); - if(!pluginRef.getPartyConfig().isPartyEnabled() || mmoPlayer.getParty() == null) { + if (!pluginRef.getPartyConfig().isPartyEnabled() || mmoPlayer.getParty() == null) { throw new ConditionFailedException(LocaleLoader.getString("Commands.Party.None")); } } diff --git a/src/main/java/com/gmail/nossr50/commands/McmmoCommand.java b/src/main/java/com/gmail/nossr50/commands/McmmoCommand.java index 838722131..3d683b800 100644 --- a/src/main/java/com/gmail/nossr50/commands/McmmoCommand.java +++ b/src/main/java/com/gmail/nossr50/commands/McmmoCommand.java @@ -72,7 +72,7 @@ public class McmmoCommand implements CommandExecutor { private void displayOtherCommands(CommandSender sender) { //Don't show them this category if they have none of the permissions - if(!Permissions.skillreset(sender) && !Permissions.mmoedit(sender) && !Permissions.adminChat(sender) && !Permissions.mcgod(sender)) + if (!Permissions.skillreset(sender) && !Permissions.mmoedit(sender) && !Permissions.adminChat(sender) && !Permissions.mcgod(sender)) return; sender.sendMessage(LocaleLoader.getString("Commands.Other")); diff --git a/src/main/java/com/gmail/nossr50/commands/McscoreboardCommand.java b/src/main/java/com/gmail/nossr50/commands/McscoreboardCommand.java index ff5b4ab2d..8bcdde1ad 100644 --- a/src/main/java/com/gmail/nossr50/commands/McscoreboardCommand.java +++ b/src/main/java/com/gmail/nossr50/commands/McscoreboardCommand.java @@ -23,12 +23,12 @@ public class McscoreboardCommand implements TabExecutor { return true; } - if(!mcMMO.p.getGeneralConfig().getScoreboardsEnabled()) { + if (!mcMMO.p.getGeneralConfig().getScoreboardsEnabled()) { sender.sendMessage(LocaleLoader.getString("Scoreboard.Disabled")); return true; } - if(!ScoreboardManager.isPlayerBoardSetup(sender.getName())) { + if (!ScoreboardManager.isPlayerBoardSetup(sender.getName())) { sender.sendMessage(LocaleLoader.getString("Scoreboard.NotSetupYet")); return true; } diff --git a/src/main/java/com/gmail/nossr50/commands/XprateCommand.java b/src/main/java/com/gmail/nossr50/commands/XprateCommand.java index f5ad2641c..a32ba1979 100644 --- a/src/main/java/com/gmail/nossr50/commands/XprateCommand.java +++ b/src/main/java/com/gmail/nossr50/commands/XprateCommand.java @@ -37,7 +37,7 @@ public class XprateCommand implements TabExecutor { if (mcMMO.p.isXPEventEnabled()) { - if(mcMMO.p.getAdvancedConfig().useTitlesForXPEvent()) + if (mcMMO.p.getAdvancedConfig().useTitlesForXPEvent()) { NotificationManager.broadcastTitle(mcMMO.p.getServer(), LocaleLoader.getString("Commands.Event.Stop"), @@ -45,7 +45,7 @@ public class XprateCommand implements TabExecutor { 10, 10*20, 20); } - if(mcMMO.p.getGeneralConfig().broadcastEventMessages()) + if (mcMMO.p.getGeneralConfig().broadcastEventMessages()) { mcMMO.p.getServer().broadcastMessage(LocaleLoader.getString("Commands.Event.Stop")); mcMMO.p.getServer().broadcastMessage(LocaleLoader.getString("Commands.Event.Stop.Subtitle")); @@ -82,7 +82,7 @@ public class XprateCommand implements TabExecutor { int newXpRate = Integer.parseInt(args[0]); - if(newXpRate < 0) + if (newXpRate < 0) { sender.sendMessage(ChatColor.RED+LocaleLoader.getString("Commands.NegativeNumberWarn")); return true; @@ -90,7 +90,7 @@ public class XprateCommand implements TabExecutor { ExperienceConfig.getInstance().setExperienceGainsGlobalMultiplier(newXpRate); - if(mcMMO.p.getAdvancedConfig().useTitlesForXPEvent()) + if (mcMMO.p.getAdvancedConfig().useTitlesForXPEvent()) { NotificationManager.broadcastTitle(mcMMO.p.getServer(), LocaleLoader.getString("Commands.Event.Start"), @@ -98,7 +98,7 @@ public class XprateCommand implements TabExecutor { 10, 10*20, 20); } - if(mcMMO.p.getGeneralConfig().broadcastEventMessages()) + if (mcMMO.p.getGeneralConfig().broadcastEventMessages()) { mcMMO.p.getServer().broadcastMessage(LocaleLoader.getString("Commands.Event.Start")); mcMMO.p.getServer().broadcastMessage(LocaleLoader.getString("Commands.Event.XP", newXpRate)); diff --git a/src/main/java/com/gmail/nossr50/commands/admin/DropTreasureCommand.java b/src/main/java/com/gmail/nossr50/commands/admin/DropTreasureCommand.java index 5a60d9bee..e793a60f8 100644 --- a/src/main/java/com/gmail/nossr50/commands/admin/DropTreasureCommand.java +++ b/src/main/java/com/gmail/nossr50/commands/admin/DropTreasureCommand.java @@ -17,8 +17,8 @@ //public class DropTreasureCommand implements CommandExecutor { // @Override // public boolean onCommand(@NotNull CommandSender sender, @NotNull Command command, @NotNull String label, @NotNull String[] args) { -// if(sender instanceof Player) { -// if(!sender.isOp()) { +// if (sender instanceof Player) { +// if (!sender.isOp()) { // sender.sendMessage("This command is for Operators only"); // return false; // } @@ -27,13 +27,13 @@ // Location location = player.getLocation(); // McMMOPlayer mmoPlayer = UserManager.getPlayer(player); // -// if(mmoPlayer == null) { +// if (mmoPlayer == null) { // //TODO: Localize // player.sendMessage("Your player data is not loaded yet"); // return false; // } // -// if(args.length == 0) { +// if (args.length == 0) { // mcMMO.p.getLogger().info(player.toString() +" is dropping all mcMMO treasures via admin command at location "+location.toString()); // for(Rarity rarity : FishingTreasureConfig.getInstance().fishingRewards.keySet()) { // for(FishingTreasure fishingTreasure : FishingTreasureConfig.getInstance().fishingRewards.get(rarity)) { 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 25a87ceb3..767d544f6 100644 --- a/src/main/java/com/gmail/nossr50/commands/admin/PlayerDebugCommand.java +++ b/src/main/java/com/gmail/nossr50/commands/admin/PlayerDebugCommand.java @@ -13,7 +13,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) { + if (sender instanceof Player) { McMMOPlayer mcMMOPlayer = UserManager.getPlayer((Player) sender); mcMMOPlayer.toggleDebugMode(); //Toggle debug mode NotificationManager.sendPlayerInformationChatOnlyPrefixed(mcMMOPlayer.getPlayer(), "Commands.Mmodebug.Toggle", String.valueOf(mcMMOPlayer.isDebugMode())); 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 3c6f93d11..2e71b238d 100644 --- a/src/main/java/com/gmail/nossr50/commands/chat/AdminChatCommand.java +++ b/src/main/java/com/gmail/nossr50/commands/chat/AdminChatCommand.java @@ -25,9 +25,9 @@ public class AdminChatCommand extends BaseCommand { @Default @Conditions(CommandManager.ADMIN_CONDITION) public void processCommand(String[] args) { BukkitCommandIssuer bukkitCommandIssuer = (BukkitCommandIssuer) getCurrentCommandIssuer(); - if(args == null || args.length == 0) { + if (args == null || args.length == 0) { //Process with no arguments - if(bukkitCommandIssuer.isPlayer()) { + if (bukkitCommandIssuer.isPlayer()) { McMMOPlayer mmoPlayer = UserManager.getPlayer(bukkitCommandIssuer.getPlayer()); pluginRef.getChatManager().setOrToggleChatChannel(mmoPlayer, ChatChannel.ADMIN); } else { @@ -35,10 +35,10 @@ public class AdminChatCommand extends BaseCommand { mcMMO.p.getLogger().info("You cannot switch chat channels as console, please provide full arguments."); } } else { - if(bukkitCommandIssuer.isPlayer()) { + if (bukkitCommandIssuer.isPlayer()) { McMMOPlayer mmoPlayer = UserManager.getPlayer(bukkitCommandIssuer.getPlayer()); - if(mmoPlayer == null) + if (mmoPlayer == null) return; //Message contains the original command so it needs to be passed to this method to trim it 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 cfdbc61d8..369b4a58b 100644 --- a/src/main/java/com/gmail/nossr50/commands/chat/PartyChatCommand.java +++ b/src/main/java/com/gmail/nossr50/commands/chat/PartyChatCommand.java @@ -30,9 +30,9 @@ public class PartyChatCommand extends BaseCommand { public void processCommand(String[] args) { BukkitCommandIssuer bukkitCommandIssuer = (BukkitCommandIssuer) getCurrentCommandIssuer(); - if(args == null || args.length == 0) { + if (args == null || args.length == 0) { //Process with no arguments - if(bukkitCommandIssuer.isPlayer()) { + if (bukkitCommandIssuer.isPlayer()) { McMMOPlayer mmoPlayer = UserManager.getPlayer(bukkitCommandIssuer.getPlayer()); pluginRef.getChatManager().setOrToggleChatChannel(mmoPlayer, ChatChannel.PARTY); } else { @@ -45,7 +45,7 @@ public class PartyChatCommand extends BaseCommand { /* * Player Logic */ - if(bukkitCommandIssuer.getIssuer() instanceof Player) { + if (bukkitCommandIssuer.getIssuer() instanceof Player) { McMMOPlayer mmoPlayer = UserManager.getPlayer(bukkitCommandIssuer.getPlayer()); processCommandArgsPlayer(mmoPlayer, args); /* @@ -72,14 +72,14 @@ public class PartyChatCommand extends BaseCommand { * @param args command arguments */ private void processCommandArgsConsole(@NotNull String[] args) { - if(args.length <= 1) { + if (args.length <= 1) { //Only specific a party and not the message mcMMO.p.getLogger().severe("You need to specify a party name and then write a message afterwards."); } else { //Grab party Party targetParty = mcMMO.p.getPartyManager().getParty(args[0]); - if(targetParty != null) { + if (targetParty != null) { pluginRef.getChatManager().processConsoleMessage(StringUtils.buildStringAfterNthElement(args, 1), targetParty); } else { mcMMO.p.getLogger().severe("A party with that name doesn't exist!"); diff --git a/src/main/java/com/gmail/nossr50/commands/database/ConvertDatabaseCommand.java b/src/main/java/com/gmail/nossr50/commands/database/ConvertDatabaseCommand.java index 571f1ae35..258242115 100644 --- a/src/main/java/com/gmail/nossr50/commands/database/ConvertDatabaseCommand.java +++ b/src/main/java/com/gmail/nossr50/commands/database/ConvertDatabaseCommand.java @@ -28,7 +28,7 @@ public class ConvertDatabaseCommand implements CommandExecutor { } DatabaseManager oldDatabase = DatabaseManagerFactory.createDatabaseManager(previousType, mcMMO.getUsersFilePath(), mcMMO.p.getLogger(), mcMMO.p.getPurgeTime(), mcMMO.p.getAdvancedConfig().getStartingLevel()); - if(oldDatabase == null) { + if (oldDatabase == null) { sender.sendMessage("Unable to load the old database! Check your log for errors."); return true; } diff --git a/src/main/java/com/gmail/nossr50/commands/experience/AddlevelsCommand.java b/src/main/java/com/gmail/nossr50/commands/experience/AddlevelsCommand.java index ca54d293a..b9fb64d25 100644 --- a/src/main/java/com/gmail/nossr50/commands/experience/AddlevelsCommand.java +++ b/src/main/java/com/gmail/nossr50/commands/experience/AddlevelsCommand.java @@ -35,7 +35,7 @@ public class AddlevelsCommand extends ExperienceCommand { McMMOPlayer mmoPlayer = UserManager.getPlayer(player); - if(mmoPlayer == null) { + if (mmoPlayer == null) { EventUtils.tryLevelChangeEvent(player, skill, value, xpRemoved, true, XPGainReason.COMMAND); } else { EventUtils.tryLevelChangeEvent(mmoPlayer, skill, value, xpRemoved, true, XPGainReason.COMMAND); @@ -45,7 +45,7 @@ public class AddlevelsCommand extends ExperienceCommand { @Override protected void handlePlayerMessageAll(Player player, int value, boolean isSilent) { - if(isSilent) + if (isSilent) return; player.sendMessage(LocaleLoader.getString("Commands.addlevels.AwardAll.1", value)); @@ -53,7 +53,7 @@ public class AddlevelsCommand extends ExperienceCommand { @Override protected void handlePlayerMessageSkill(Player player, int value, PrimarySkillType skill, boolean isSilent) { - if(isSilent) + if (isSilent) return; player.sendMessage(LocaleLoader.getString("Commands.addlevels.AwardSkill.1", value, mcMMO.p.getSkillTools().getLocalizedSkillName(skill))); diff --git a/src/main/java/com/gmail/nossr50/commands/experience/AddxpCommand.java b/src/main/java/com/gmail/nossr50/commands/experience/AddxpCommand.java index 25d77e5c0..259b6c7aa 100644 --- a/src/main/java/com/gmail/nossr50/commands/experience/AddxpCommand.java +++ b/src/main/java/com/gmail/nossr50/commands/experience/AddxpCommand.java @@ -26,7 +26,7 @@ public class AddxpCommand extends ExperienceCommand { protected void handleCommand(Player player, PlayerProfile profile, PrimarySkillType skill, int value) { if (player != null) { //Check if player profile is loaded - if(UserManager.getPlayer(player) == null) + if (UserManager.getPlayer(player) == null) return; UserManager.getPlayer(player).applyXpGain(skill, value, XPGainReason.COMMAND, XPGainSource.COMMAND); @@ -39,7 +39,7 @@ public class AddxpCommand extends ExperienceCommand { @Override protected void handlePlayerMessageAll(Player player, int value, boolean isSilent) { - if(isSilent) + if (isSilent) return; player.sendMessage(LocaleLoader.getString("Commands.addxp.AwardAll", value)); @@ -47,7 +47,7 @@ public class AddxpCommand extends ExperienceCommand { @Override protected void handlePlayerMessageSkill(Player player, int value, PrimarySkillType skill, boolean isSilent) { - if(isSilent) + if (isSilent) return; player.sendMessage(LocaleLoader.getString("Commands.addxp.AwardSkill", value, mcMMO.p.getSkillTools().getLocalizedSkillName(skill))); 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 4bd6b4eeb..6ee6673de 100644 --- a/src/main/java/com/gmail/nossr50/commands/experience/ExperienceCommand.java +++ b/src/main/java/com/gmail/nossr50/commands/experience/ExperienceCommand.java @@ -24,16 +24,16 @@ public abstract class ExperienceCommand implements TabExecutor { public boolean onCommand(@NotNull CommandSender sender, @NotNull Command command, @NotNull String label, String[] args) { PrimarySkillType skill; - if(args.length < 2) { + if (args.length < 2) { return false; } else { - if(args.length == 2 && !isSilent(args) || args.length == 3 && isSilent(args)) { + if (args.length == 2 && !isSilent(args) || args.length == 3 && isSilent(args)) { if (CommandUtils.noConsoleUsage(sender)) { return true; } if (!permissionsCheckSelf(sender)) { - if(command.getPermissionMessage() != null) + if (command.getPermissionMessage() != null) sender.sendMessage(command.getPermissionMessage()); sender.sendMessage("(mcMMO) No permission!"); return true; @@ -56,7 +56,7 @@ public abstract class ExperienceCommand implements TabExecutor { } //Profile not loaded - if(UserManager.getPlayer(sender.getName()) == null) + if (UserManager.getPlayer(sender.getName()) == null) { sender.sendMessage(LocaleLoader.getString("Profile.PendingLoad")); return true; @@ -65,7 +65,7 @@ public abstract class ExperienceCommand implements TabExecutor { editValues((Player) sender, UserManager.getPlayer(sender.getName()).getProfile(), skill, Integer.parseInt(args[1]), isSilent(args)); return true; - } else if((args.length == 3 && !isSilent(args)) + } else if ((args.length == 3 && !isSilent(args)) || (args.length == 4 && isSilent(args))) { if (!permissionsCheckOthers(sender)) { sender.sendMessage(command.getPermissionMessage()); @@ -104,7 +104,7 @@ public abstract class ExperienceCommand implements TabExecutor { //Check loading by name profile = mcMMO.getDatabaseManager().loadPlayerProfile(playerName); - if(CommandUtils.unloadedProfile(sender, profile)) { + if (CommandUtils.unloadedProfile(sender, profile)) { return true; } } @@ -126,7 +126,7 @@ public abstract class ExperienceCommand implements TabExecutor { private boolean isSilent(String[] args) { int length = args.length; - if(length == 0) + if (length == 0) return false; return args[length-1].equalsIgnoreCase("-s"); diff --git a/src/main/java/com/gmail/nossr50/commands/experience/MmoeditCommand.java b/src/main/java/com/gmail/nossr50/commands/experience/MmoeditCommand.java index 93089ac69..737d7f40a 100644 --- a/src/main/java/com/gmail/nossr50/commands/experience/MmoeditCommand.java +++ b/src/main/java/com/gmail/nossr50/commands/experience/MmoeditCommand.java @@ -41,7 +41,7 @@ public class MmoeditCommand extends ExperienceCommand { McMMOPlayer mmoPlayer = UserManager.getPlayer(player); - if(mmoPlayer != null) { + if (mmoPlayer != null) { EventUtils.tryLevelEditEvent(mmoPlayer, skill, value, xpRemoved, value > skillLevel, XPGainReason.COMMAND, skillLevel); } else { EventUtils.tryLevelEditEvent(player, skill, value, xpRemoved, value > skillLevel, XPGainReason.COMMAND, skillLevel); @@ -51,7 +51,7 @@ public class MmoeditCommand extends ExperienceCommand { @Override protected void handlePlayerMessageAll(Player player, int value, boolean isSilent) { - if(isSilent) + if (isSilent) return; player.sendMessage(LocaleLoader.getString("Commands.mmoedit.AllSkills.1", value)); @@ -59,7 +59,7 @@ public class MmoeditCommand extends ExperienceCommand { @Override protected void handlePlayerMessageSkill(Player player, int value, PrimarySkillType skill, boolean isSilent) { - if(isSilent) + if (isSilent) return; player.sendMessage(LocaleLoader.getString("Commands.mmoedit.Modified.1", mcMMO.p.getSkillTools().getLocalizedSkillName(skill), value)); diff --git a/src/main/java/com/gmail/nossr50/commands/experience/SkillresetCommand.java b/src/main/java/com/gmail/nossr50/commands/experience/SkillresetCommand.java index edc99e2ad..33b2f311f 100644 --- a/src/main/java/com/gmail/nossr50/commands/experience/SkillresetCommand.java +++ b/src/main/java/com/gmail/nossr50/commands/experience/SkillresetCommand.java @@ -87,7 +87,7 @@ public class SkillresetCommand implements TabExecutor { profile = mcMMO.getDatabaseManager().loadPlayerProfile(playerName); //Check if it was present in DB - if(CommandUtils.unloadedProfile(sender, profile)) { + if (CommandUtils.unloadedProfile(sender, profile)) { return true; } } diff --git a/src/main/java/com/gmail/nossr50/commands/party/PartyChangePasswordCommand.java b/src/main/java/com/gmail/nossr50/commands/party/PartyChangePasswordCommand.java index b8d835ef3..4f1743a02 100644 --- a/src/main/java/com/gmail/nossr50/commands/party/PartyChangePasswordCommand.java +++ b/src/main/java/com/gmail/nossr50/commands/party/PartyChangePasswordCommand.java @@ -12,7 +12,7 @@ import org.jetbrains.annotations.NotNull; public class PartyChangePasswordCommand implements CommandExecutor { @Override public boolean onCommand(@NotNull CommandSender sender, @NotNull Command command, @NotNull String label, String[] args) { - if(UserManager.getPlayer((Player) sender) == null) + if (UserManager.getPlayer((Player) sender) == null) { sender.sendMessage(LocaleLoader.getString("Profile.PendingLoad")); return true; 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 52e99bd3c..3f59fe184 100644 --- a/src/main/java/com/gmail/nossr50/commands/party/PartyCommand.java +++ b/src/main/java/com/gmail/nossr50/commands/party/PartyCommand.java @@ -90,7 +90,7 @@ public class PartyCommand implements TabExecutor { } McMMOPlayer mcMMOPlayer = UserManager.getPlayer(player); - if(mcMMOPlayer == null) + if (mcMMOPlayer == null) { player.sendMessage(LocaleLoader.getString("Profile.PendingLoad")); return true; @@ -207,7 +207,7 @@ public class PartyCommand implements TabExecutor { final McMMOPlayer mcMMOPlayer = UserManager.getPlayer(player); //Not Loaded - if(mcMMOPlayer == null) + if (mcMMOPlayer == null) { sender.sendMessage(LocaleLoader.getString("Profile.PendingLoad")); return ImmutableList.of(); 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 75a7c785c..debe0ce45 100644 --- a/src/main/java/com/gmail/nossr50/commands/party/PartyCreateCommand.java +++ b/src/main/java/com/gmail/nossr50/commands/party/PartyCreateCommand.java @@ -19,7 +19,7 @@ public class PartyCreateCommand implements CommandExecutor { Player player = (Player) sender; McMMOPlayer mcMMOPlayer = UserManager.getPlayer(player); - if(UserManager.getPlayer(player) == null) + if (UserManager.getPlayer(player) == null) { player.sendMessage(LocaleLoader.getString("Profile.PendingLoad")); return true; 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 3e34078e8..74ef9d8ae 100644 --- a/src/main/java/com/gmail/nossr50/commands/party/PartyInfoCommand.java +++ b/src/main/java/com/gmail/nossr50/commands/party/PartyInfoCommand.java @@ -23,7 +23,7 @@ public class PartyInfoCommand implements CommandExecutor { switch (args.length) { case 0: case 1: - if(UserManager.getPlayer((Player) sender) == null) + if (UserManager.getPlayer((Player) sender) == null) { sender.sendMessage(LocaleLoader.getString("Profile.PendingLoad")); return true; diff --git a/src/main/java/com/gmail/nossr50/commands/party/PartyItemShareCommand.java b/src/main/java/com/gmail/nossr50/commands/party/PartyItemShareCommand.java index 44822d82f..f5e58c529 100644 --- a/src/main/java/com/gmail/nossr50/commands/party/PartyItemShareCommand.java +++ b/src/main/java/com/gmail/nossr50/commands/party/PartyItemShareCommand.java @@ -20,7 +20,7 @@ import java.util.Locale; public class PartyItemShareCommand implements CommandExecutor { @Override public boolean onCommand(@NotNull CommandSender sender, @NotNull Command command, @NotNull String label, String[] args) { - if(UserManager.getPlayer((Player) sender) == null) + if (UserManager.getPlayer((Player) sender) == null) { sender.sendMessage(LocaleLoader.getString("Profile.PendingLoad")); return true; diff --git a/src/main/java/com/gmail/nossr50/commands/party/PartyJoinCommand.java b/src/main/java/com/gmail/nossr50/commands/party/PartyJoinCommand.java index a5474d355..b88bfa757 100644 --- a/src/main/java/com/gmail/nossr50/commands/party/PartyJoinCommand.java +++ b/src/main/java/com/gmail/nossr50/commands/party/PartyJoinCommand.java @@ -34,7 +34,7 @@ public class PartyJoinCommand implements CommandExecutor { Player player = (Player) sender; - if(UserManager.getPlayer((Player) sender) == null) + if (UserManager.getPlayer((Player) sender) == null) { sender.sendMessage(LocaleLoader.getString("Profile.PendingLoad")); return true; @@ -62,7 +62,7 @@ public class PartyJoinCommand implements CommandExecutor { return true; } - if(mcMMO.p.getPartyManager().isPartyFull(player, targetParty)) + if (mcMMO.p.getPartyManager().isPartyFull(player, targetParty)) { player.sendMessage(LocaleLoader.getString("Commands.Party.PartyFull", targetParty.toString())); return true; diff --git a/src/main/java/com/gmail/nossr50/commands/party/PartyLockCommand.java b/src/main/java/com/gmail/nossr50/commands/party/PartyLockCommand.java index eb87e0843..130f43d7e 100644 --- a/src/main/java/com/gmail/nossr50/commands/party/PartyLockCommand.java +++ b/src/main/java/com/gmail/nossr50/commands/party/PartyLockCommand.java @@ -55,7 +55,7 @@ public class PartyLockCommand implements CommandExecutor { } private void togglePartyLock(CommandSender sender, boolean lock) { - if(UserManager.getPlayer((Player) sender) == null) + if (UserManager.getPlayer((Player) sender) == null) { sender.sendMessage(LocaleLoader.getString("Profile.PendingLoad")); return; diff --git a/src/main/java/com/gmail/nossr50/commands/party/PartyXpShareCommand.java b/src/main/java/com/gmail/nossr50/commands/party/PartyXpShareCommand.java index 8322beecf..c96792385 100644 --- a/src/main/java/com/gmail/nossr50/commands/party/PartyXpShareCommand.java +++ b/src/main/java/com/gmail/nossr50/commands/party/PartyXpShareCommand.java @@ -17,7 +17,7 @@ import org.jetbrains.annotations.NotNull; public class PartyXpShareCommand implements CommandExecutor { @Override public boolean onCommand(@NotNull CommandSender sender, @NotNull Command command, @NotNull String label, String[] args) { - if(UserManager.getPlayer((Player) sender) == null) + if (UserManager.getPlayer((Player) sender) == null) { sender.sendMessage(LocaleLoader.getString("Profile.PendingLoad")); return true; diff --git a/src/main/java/com/gmail/nossr50/commands/party/alliance/PartyAllianceCommand.java b/src/main/java/com/gmail/nossr50/commands/party/alliance/PartyAllianceCommand.java index e39e7c3e2..e839011ea 100644 --- a/src/main/java/com/gmail/nossr50/commands/party/alliance/PartyAllianceCommand.java +++ b/src/main/java/com/gmail/nossr50/commands/party/alliance/PartyAllianceCommand.java @@ -37,7 +37,7 @@ public class PartyAllianceCommand implements TabExecutor { return true; } - if(UserManager.getPlayer((Player) sender) == null) + if (UserManager.getPlayer((Player) sender) == null) { sender.sendMessage(LocaleLoader.getString("Profile.PendingLoad")); return true; diff --git a/src/main/java/com/gmail/nossr50/commands/party/teleport/PtpAcceptCommand.java b/src/main/java/com/gmail/nossr50/commands/party/teleport/PtpAcceptCommand.java index 19c98ad6a..15c6ca281 100644 --- a/src/main/java/com/gmail/nossr50/commands/party/teleport/PtpAcceptCommand.java +++ b/src/main/java/com/gmail/nossr50/commands/party/teleport/PtpAcceptCommand.java @@ -21,7 +21,7 @@ public class PtpAcceptCommand implements CommandExecutor { return true; } - if(UserManager.getPlayer((Player) sender) == null) + if (UserManager.getPlayer((Player) sender) == null) { sender.sendMessage(LocaleLoader.getString("Profile.PendingLoad")); return true; 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 10f0f1d98..14c9b57b9 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 @@ -45,21 +45,21 @@ public class PtpCommand implements TabExecutor { Player player = (Player) sender; /* WORLD GUARD MAIN FLAG CHECK */ - if(WorldGuardUtils.isWorldGuardLoaded()) + if (WorldGuardUtils.isWorldGuardLoaded()) { - if(!WorldGuardManager.getInstance().hasMainFlag(player)) + if (!WorldGuardManager.getInstance().hasMainFlag(player)) return true; } /* WORLD BLACKLIST CHECK */ - if(WorldBlacklist.isWorldBlacklisted(player.getWorld())) + if (WorldBlacklist.isWorldBlacklisted(player.getWorld())) return true; if (!UserManager.hasPlayerDataKey(player)) { return true; } - if(UserManager.getPlayer((Player) sender) == null) + if (UserManager.getPlayer((Player) sender) == null) { sender.sendMessage(LocaleLoader.getString("Profile.PendingLoad")); return true; @@ -228,13 +228,13 @@ public class PtpCommand implements TabExecutor { } protected static void handleTeleportWarmup(Player teleportingPlayer, Player targetPlayer) { - if(UserManager.getPlayer(targetPlayer) == null) + if (UserManager.getPlayer(targetPlayer) == null) { targetPlayer.sendMessage(LocaleLoader.getString("Profile.PendingLoad")); return; } - if(UserManager.getPlayer(teleportingPlayer) == null) + if (UserManager.getPlayer(teleportingPlayer) == null) { teleportingPlayer.sendMessage(LocaleLoader.getString("Profile.PendingLoad")); return; 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 dcfcdcdbe..e50dbac27 100644 --- a/src/main/java/com/gmail/nossr50/commands/player/McrankCommand.java +++ b/src/main/java/com/gmail/nossr50/commands/player/McrankCommand.java @@ -85,7 +85,7 @@ public class McrankCommand implements TabExecutor { if (sender instanceof Player) { McMMOPlayer mcMMOPlayer = UserManager.getPlayer(sender.getName()); - if(mcMMOPlayer == null) + if (mcMMOPlayer == null) { sender.sendMessage(LocaleLoader.getString("Profile.PendingLoad")); return; 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 e780fa19d..7fa7d04ff 100644 --- a/src/main/java/com/gmail/nossr50/commands/player/XPBarCommand.java +++ b/src/main/java/com/gmail/nossr50/commands/player/XPBarCommand.java @@ -24,22 +24,22 @@ 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) { + if (sender instanceof Player) { McMMOPlayer mmoPlayer = UserManager.getPlayer((Player) sender); - if(mmoPlayer == null) { + if (mmoPlayer == null) { NotificationManager.sendPlayerInformationChatOnlyPrefixed(mmoPlayer.getPlayer(), "Profile.PendingLoad"); return false; } - if(args.length == 0) { + if (args.length == 0) { return false; - } else if(args.length < 2) { + } else if (args.length < 2) { String option = args[0]; - if(option.equalsIgnoreCase(ExperienceBarManager.XPBarSettingTarget.RESET.toString())) { + if (option.equalsIgnoreCase(ExperienceBarManager.XPBarSettingTarget.RESET.toString())) { mmoPlayer.getExperienceBarManager().xpBarSettingToggle(ExperienceBarManager.XPBarSettingTarget.RESET, null); return true; - } else if(option.equalsIgnoreCase(ExperienceBarManager.XPBarSettingTarget.DISABLE.toString())) { + } else if (option.equalsIgnoreCase(ExperienceBarManager.XPBarSettingTarget.DISABLE.toString())) { mmoPlayer.getExperienceBarManager().disableAllBars(); return true; } else { @@ -50,7 +50,7 @@ public class XPBarCommand implements TabExecutor { } else if (args.length == 2) { String skillName = args[1]; - if(SkillUtils.isSkill(skillName)) { + if (SkillUtils.isSkill(skillName)) { PrimarySkillType targetSkill = mcMMO.p.getSkillTools().matchSkill(skillName); @@ -58,7 +58,7 @@ public class XPBarCommand implements TabExecutor { String option = args[0].toLowerCase(); ExperienceBarManager.XPBarSettingTarget settingTarget = getSettingTarget(option); - if(settingTarget != null && settingTarget != ExperienceBarManager.XPBarSettingTarget.RESET) { + if (settingTarget != null && settingTarget != ExperienceBarManager.XPBarSettingTarget.RESET) { //Change setting mmoPlayer.getExperienceBarManager().xpBarSettingToggle(settingTarget, targetSkill); return true; @@ -103,7 +103,7 @@ public class XPBarCommand implements TabExecutor { return StringUtil.copyPartialMatches(args[0], options, new ArrayList<>(ExperienceBarManager.XPBarSettingTarget.values().length)); case 2: - if(!args[0].equalsIgnoreCase(ExperienceBarManager.XPBarSettingTarget.RESET.toString())) + if (!args[0].equalsIgnoreCase(ExperienceBarManager.XPBarSettingTarget.RESET.toString())) return StringUtil.copyPartialMatches(args[1], mcMMO.p.getSkillTools().LOCALIZED_SKILL_NAMES, new ArrayList<>(mcMMO.p.getSkillTools().LOCALIZED_SKILL_NAMES.size())); default: return ImmutableList.of(); 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 d1bb3d864..fc5938f34 100644 --- a/src/main/java/com/gmail/nossr50/commands/skills/AcrobaticsCommand.java +++ b/src/main/java/com/gmail/nossr50/commands/skills/AcrobaticsCommand.java @@ -54,7 +54,7 @@ public class AcrobaticsCommand extends SkillCommand { AbstractSubSkill abstractSubSkill = InteractionManager.getAbstractByName("Roll"); - if(abstractSubSkill != null) + if (abstractSubSkill != null) { String[] rollStrings = ProbabilityUtil.getRNGDisplayValues(mmoPlayer, SubSkillType.ACROBATICS_ROLL); 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 4e2726a79..d916f458a 100644 --- a/src/main/java/com/gmail/nossr50/commands/skills/ArcheryCommand.java +++ b/src/main/java/com/gmail/nossr50/commands/skills/ArcheryCommand.java @@ -76,7 +76,7 @@ public class ArcheryCommand extends SkillCommand { messages.add(getStatMessage(SubSkillType.ARCHERY_SKILL_SHOT, skillShotBonus)); } - if(Permissions.canUseSubSkill(player, SubSkillType.ARCHERY_ARCHERY_LIMIT_BREAK)) { + if (Permissions.canUseSubSkill(player, SubSkillType.ARCHERY_ARCHERY_LIMIT_BREAK)) { messages.add(getStatMessage(SubSkillType.ARCHERY_ARCHERY_LIMIT_BREAK, String.valueOf(CombatUtils.getLimitBreakDamageAgainstQuality(player, SubSkillType.ARCHERY_ARCHERY_LIMIT_BREAK, 1000)))); } 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 f83063522..ce1907c39 100644 --- a/src/main/java/com/gmail/nossr50/commands/skills/AxesCommand.java +++ b/src/main/java/com/gmail/nossr50/commands/skills/AxesCommand.java @@ -95,7 +95,7 @@ public class AxesCommand extends SkillCommand { + (hasEndurance ? LocaleLoader.getString("Perks.ActivationTime.Bonus", skullSplitterLengthEndurance) : "")); } - if(Permissions.canUseSubSkill(player, SubSkillType.AXES_AXES_LIMIT_BREAK)) { + if (Permissions.canUseSubSkill(player, SubSkillType.AXES_AXES_LIMIT_BREAK)) { messages.add(getStatMessage(SubSkillType.AXES_AXES_LIMIT_BREAK, String.valueOf(CombatUtils.getLimitBreakDamageAgainstQuality(player, SubSkillType.AXES_AXES_LIMIT_BREAK, 1000)))); } 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 716c1dded..e5f78ac91 100644 --- a/src/main/java/com/gmail/nossr50/commands/skills/CrossbowsCommand.java +++ b/src/main/java/com/gmail/nossr50/commands/skills/CrossbowsCommand.java @@ -54,7 +54,7 @@ public class CrossbowsCommand extends SkillCommand { String.valueOf(mmoPlayer.getCrossbowsManager().getTrickShotMaxBounceCount()))); } - if(Permissions.canUseSubSkill(player, CROSSBOWS_CROSSBOWS_LIMIT_BREAK)) { + if (Permissions.canUseSubSkill(player, CROSSBOWS_CROSSBOWS_LIMIT_BREAK)) { messages.add(getStatMessage(CROSSBOWS_CROSSBOWS_LIMIT_BREAK, String.valueOf(CombatUtils.getLimitBreakDamageAgainstQuality(player, CROSSBOWS_CROSSBOWS_LIMIT_BREAK, 1000)))); } 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 a40c3aba4..829e4644f 100644 --- a/src/main/java/com/gmail/nossr50/commands/skills/ExcavationCommand.java +++ b/src/main/java/com/gmail/nossr50/commands/skills/ExcavationCommand.java @@ -53,7 +53,7 @@ public class ExcavationCommand extends SkillCommand { //messages.add(LocaleLoader.getString("Excavation.Effect.Length", gigaDrillBreakerLength) + (hasEndurance ? LocaleLoader.getString("Perks.ActivationTime.Bonus", gigaDrillBreakerLengthEndurance) : "")); } - if(Permissions.canUseSubSkill(player, SubSkillType.EXCAVATION_ARCHAEOLOGY)) { + if (Permissions.canUseSubSkill(player, SubSkillType.EXCAVATION_ARCHAEOLOGY)) { messages.add(getStatMessage(false, false, SubSkillType.EXCAVATION_ARCHAEOLOGY, percent.format(excavationManager.getArchaelogyExperienceOrbChance() / 100.0D))); messages.add(getStatMessage(true, false, SubSkillType.EXCAVATION_ARCHAEOLOGY, 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 ff01b92ac..c955fdf18 100644 --- a/src/main/java/com/gmail/nossr50/commands/skills/FishingCommand.java +++ b/src/main/java/com/gmail/nossr50/commands/skills/FishingCommand.java @@ -72,7 +72,7 @@ public class FishingCommand extends SkillCommand { } } - if(totalEnchantChance >= 1) + if (totalEnchantChance >= 1) magicChance = percent.format(totalEnchantChance / 100.0); else magicChance = percent.format(0); diff --git a/src/main/java/com/gmail/nossr50/commands/skills/MacesCommand.java b/src/main/java/com/gmail/nossr50/commands/skills/MacesCommand.java index 9eed83e16..176a9e9a4 100644 --- a/src/main/java/com/gmail/nossr50/commands/skills/MacesCommand.java +++ b/src/main/java/com/gmail/nossr50/commands/skills/MacesCommand.java @@ -31,7 +31,7 @@ // protected List statsDisplay(Player player, float skillValue, boolean hasEndurance, boolean isLucky) { // List messages = new ArrayList<>(); // -// if(SkillUtils.canUseSubskill(player, MACES_MACES_LIMIT_BREAK)) { +// if (SkillUtils.canUseSubskill(player, MACES_MACES_LIMIT_BREAK)) { // messages.add(getStatMessage(MACES_MACES_LIMIT_BREAK, // String.valueOf(CombatUtils.getLimitBreakDamageAgainstQuality(player, MACES_MACES_LIMIT_BREAK, 1000)))); // } 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 b96d43c23..9247cee3c 100644 --- a/src/main/java/com/gmail/nossr50/commands/skills/MiningCommand.java +++ b/src/main/java/com/gmail/nossr50/commands/skills/MiningCommand.java @@ -111,7 +111,7 @@ public class MiningCommand extends SkillCommand { //messages.add(LocaleLoader.getString("Mining.Effect.DropChance", doubleDropChance) + (isLucky ? LocaleLoader.getString("Perks.Lucky.Bonus", doubleDropChanceLucky) : "")); } - if(canTripleDrop) { + if (canTripleDrop) { messages.add(getStatMessage(SubSkillType.MINING_MOTHER_LODE, tripleDropChance) + (isLucky ? LocaleLoader.getString("Perks.Lucky.Bonus", tripleDropChanceLucky) : "")); } 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 3a085a5cf..64152af8a 100644 --- a/src/main/java/com/gmail/nossr50/commands/skills/MmoInfoCommand.java +++ b/src/main/java/com/gmail/nossr50/commands/skills/MmoInfoCommand.java @@ -26,14 +26,14 @@ public class MmoInfoCommand implements TabExecutor { /* * Only allow players to use this command */ - if(commandSender instanceof Player player) + if (commandSender instanceof Player player) { - if(args == null || args.length < 1 || args[0] == null || args[0].isEmpty()) + if (args == null || args.length < 1 || args[0] == null || args[0].isEmpty()) return false; - if(Permissions.mmoinfo(player)) + if (Permissions.mmoinfo(player)) { - if(args[0].equalsIgnoreCase( "???")) + if (args[0].equalsIgnoreCase( "???")) { player.sendMessage(LocaleLoader.getString("Commands.MmoInfo.Header")); player.sendMessage(LocaleLoader.getString("Commands.MmoInfo.SubSkillHeader", "???")); @@ -59,7 +59,7 @@ public class MmoInfoCommand implements TabExecutor { public SubSkillType matchSubSkill(String name) { for(SubSkillType subSkillType : SubSkillType.values()) { - if(subSkillType.getNiceNameNoSpaces(subSkillType).equalsIgnoreCase(name) + if (subSkillType.getNiceNameNoSpaces(subSkillType).equalsIgnoreCase(name) || subSkillType.name().equalsIgnoreCase(name)) return subSkillType; } 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 9ff449f8f..f49542304 100644 --- a/src/main/java/com/gmail/nossr50/commands/skills/SkillCommand.java +++ b/src/main/java/com/gmail/nossr50/commands/skills/SkillCommand.java @@ -149,7 +149,7 @@ public abstract class SkillCommand implements TabExecutor { // send header player.sendMessage(LocaleLoader.getString("Skills.Overhaul.Header", skillName)); - if(!SkillTools.isChildSkill(skill)) + if (!SkillTools.isChildSkill(skill)) { /* * NON-CHILD SKILLS @@ -177,7 +177,7 @@ public abstract class SkillCommand implements TabExecutor { for(int i = 0; i < parentList.size(); i++) { - if(i+1 < parentList.size()) + if (i+1 < parentList.size()) { parentMessage.append(LocaleLoader.getString("Effects.Child.ParentList", mcMMO.p.getSkillTools().getLocalizedSkillName(parentList.get(i)), mcMMOPlayer.getSkillLevel(parentList.get(i)))); parentMessage.append(ChatColor.GRAY).append(", "); @@ -237,7 +237,7 @@ public abstract class SkillCommand implements TabExecutor { int length; - if(abilityLengthCap <= 0) + if (abilityLengthCap <= 0) { length = 2 + (int) (skillValue / abilityLengthVar); } @@ -264,7 +264,7 @@ public abstract class SkillCommand implements TabExecutor { String templateKey = isCustom ? "Ability.Generic.Template.Custom" : "Ability.Generic.Template"; String statDescriptionKey = !isExtra ? subSkillType.getLocaleKeyStatDescription() : subSkillType.getLocaleKeyStatExtraDescription(); - if(isCustom) + if (isCustom) return LocaleLoader.getString(templateKey, LocaleLoader.getString(statDescriptionKey, vars)); else { @@ -274,7 +274,7 @@ public abstract class SkillCommand implements TabExecutor { } protected String getLimitBreakDescriptionParameter() { - if(mcMMO.p.getAdvancedConfig().canApplyLimitBreakPVE()) { + if (mcMMO.p.getAdvancedConfig().canApplyLimitBreakPVE()) { return "(PVP/PVE)"; } else { return "(PVP)"; 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 6c5518270..1de2a9c38 100644 --- a/src/main/java/com/gmail/nossr50/commands/skills/SwordsCommand.java +++ b/src/main/java/com/gmail/nossr50/commands/skills/SwordsCommand.java @@ -101,13 +101,13 @@ public class SwordsCommand extends SkillCommand { + (hasEndurance ? LocaleLoader.getString("Perks.ActivationTime.Bonus", serratedStrikesLengthEndurance) : "")); } - if(SkillUtils.canUseSubskill(player, SubSkillType.SWORDS_STAB)) + if (SkillUtils.canUseSubskill(player, SubSkillType.SWORDS_STAB)) { messages.add(getStatMessage(SubSkillType.SWORDS_STAB, String.valueOf(mmoPlayer.getSwordsManager().getStabDamage()))); } - if(SkillUtils.canUseSubskill(player, SubSkillType.SWORDS_SWORDS_LIMIT_BREAK)) { + if (SkillUtils.canUseSubskill(player, SubSkillType.SWORDS_SWORDS_LIMIT_BREAK)) { messages.add(getStatMessage(SubSkillType.SWORDS_SWORDS_LIMIT_BREAK, String.valueOf(CombatUtils.getLimitBreakDamageAgainstQuality(player, SubSkillType.SWORDS_SWORDS_LIMIT_BREAK, 1000)))); } 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 706adf80a..21d37eb7e 100644 --- a/src/main/java/com/gmail/nossr50/commands/skills/TridentsCommand.java +++ b/src/main/java/com/gmail/nossr50/commands/skills/TridentsCommand.java @@ -31,12 +31,12 @@ public class TridentsCommand extends SkillCommand { protected List statsDisplay(Player player, float skillValue, boolean hasEndurance, boolean isLucky) { List messages = new ArrayList<>(); - if(SkillUtils.canUseSubskill(player, TRIDENTS_TRIDENTS_LIMIT_BREAK)) { + if (SkillUtils.canUseSubskill(player, TRIDENTS_TRIDENTS_LIMIT_BREAK)) { messages.add(getStatMessage(TRIDENTS_TRIDENTS_LIMIT_BREAK, String.valueOf(CombatUtils.getLimitBreakDamageAgainstQuality(player, TRIDENTS_TRIDENTS_LIMIT_BREAK, 1000)))); } - if(SkillUtils.canUseSubskill(player, TRIDENTS_IMPALE)) { + if (SkillUtils.canUseSubskill(player, TRIDENTS_IMPALE)) { messages.add(getStatMessage(TRIDENTS_IMPALE, String.valueOf(mmoPlayer.getTridentsManager().impaleDamageBonus()))); } 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 deb536b10..6a85468c8 100644 --- a/src/main/java/com/gmail/nossr50/commands/skills/UnarmedCommand.java +++ b/src/main/java/com/gmail/nossr50/commands/skills/UnarmedCommand.java @@ -113,7 +113,7 @@ public class UnarmedCommand extends SkillCommand { //messages.add(LocaleLoader.getString("Unarmed.Ability.Chance.IronGrip", ironGripChance) + (isLucky ? LocaleLoader.getString("Perks.Lucky.Bonus", ironGripChanceLucky) : "")); } - if(Permissions.canUseSubSkill(player, SubSkillType.UNARMED_UNARMED_LIMIT_BREAK)) { + if (Permissions.canUseSubSkill(player, SubSkillType.UNARMED_UNARMED_LIMIT_BREAK)) { messages.add(getStatMessage(SubSkillType.UNARMED_UNARMED_LIMIT_BREAK, String.valueOf(CombatUtils.getLimitBreakDamageAgainstQuality(player, SubSkillType.UNARMED_UNARMED_LIMIT_BREAK, 1000)))); } 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 8efacee64..33dd0f071 100644 --- a/src/main/java/com/gmail/nossr50/commands/skills/WoodcuttingCommand.java +++ b/src/main/java/com/gmail/nossr50/commands/skills/WoodcuttingCommand.java @@ -40,7 +40,7 @@ public class WoodcuttingCommand extends SkillCommand { } //Clean Cuts - if(canTripleDrop) { + if (canTripleDrop) { String[] tripleDropStrings = ProbabilityUtil.getRNGDisplayValues(mmoPlayer, SubSkillType.WOODCUTTING_CLEAN_CUTS); tripleDropChance = tripleDropStrings[0]; tripleDropChanceLucky = tripleDropStrings[1]; @@ -80,7 +80,7 @@ public class WoodcuttingCommand extends SkillCommand { + (isLucky ? LocaleLoader.getString("Perks.Lucky.Bonus", doubleDropChanceLucky) : "")); } - if(canTripleDrop) { + if (canTripleDrop) { messages.add(getStatMessage(SubSkillType.WOODCUTTING_CLEAN_CUTS, tripleDropChance) + (isLucky ? LocaleLoader.getString("Perks.Lucky.Bonus", tripleDropChanceLucky) : "")); } @@ -89,7 +89,7 @@ public class WoodcuttingCommand extends SkillCommand { if (canKnockOnWood) { String lootNote; - if(RankUtils.hasReachedRank(2, player, SubSkillType.WOODCUTTING_KNOCK_ON_WOOD)) { + if (RankUtils.hasReachedRank(2, player, SubSkillType.WOODCUTTING_KNOCK_ON_WOOD)) { lootNote = LocaleLoader.getString("Woodcutting.SubSkill.KnockOnWood.Loot.Rank2"); } else { lootNote = LocaleLoader.getString("Woodcutting.SubSkill.KnockOnWood.Loot.Normal"); diff --git a/src/main/java/com/gmail/nossr50/config/BukkitConfig.java b/src/main/java/com/gmail/nossr50/config/BukkitConfig.java index 23d50b6b2..028a3e3bc 100644 --- a/src/main/java/com/gmail/nossr50/config/BukkitConfig.java +++ b/src/main/java/com/gmail/nossr50/config/BukkitConfig.java @@ -52,7 +52,7 @@ public abstract class BukkitConfig { try { config.save(configFile); - if(copyDefaults && !savedDefaults) { + if (copyDefaults && !savedDefaults) { copyMissingDefaultsFromResource(); savedDefaults = true; } @@ -84,7 +84,7 @@ public abstract class BukkitConfig { YamlConfiguration saveDefaultConfigToDisk() { LogUtils.debug(mcMMO.p.getLogger(), "Copying default config to disk: " + fileName + " to defaults/" + fileName); try(InputStream inputStream = mcMMO.p.getResource(fileName)) { - if(inputStream == null) { + if (inputStream == null) { mcMMO.p.getLogger().severe("Unable to copy default config: " + fileName); return null; } diff --git a/src/main/java/com/gmail/nossr50/config/WorldBlacklist.java b/src/main/java/com/gmail/nossr50/config/WorldBlacklist.java index 7b93ebd89..d92d2778f 100644 --- a/src/main/java/com/gmail/nossr50/config/WorldBlacklist.java +++ b/src/main/java/com/gmail/nossr50/config/WorldBlacklist.java @@ -73,7 +73,7 @@ public class WorldBlacklist { closeRead(fileReader); } - if(blacklist.size() > 0) + if (blacklist.size() > 0) plugin.getLogger().info(blacklist.size() + " entries in mcMMO World Blacklist"); } diff --git a/src/main/java/com/gmail/nossr50/config/skills/alchemy/PotionConfig.java b/src/main/java/com/gmail/nossr50/config/skills/alchemy/PotionConfig.java index 774ff511c..9aadac89f 100644 --- a/src/main/java/com/gmail/nossr50/config/skills/alchemy/PotionConfig.java +++ b/src/main/java/com/gmail/nossr50/config/skills/alchemy/PotionConfig.java @@ -195,10 +195,10 @@ public class PotionConfig extends LegacyConfigLoader { PotionUtil.setBasePotionType(potionMeta, potionType, extended, upgraded); // // Use the name of the potion to indicate upgrade status if not set in PotionData -// if(convertPotionConfigName(key).toUpperCase().contains("STRONG")) +// if (convertPotionConfigName(key).toUpperCase().contains("STRONG")) // upgraded = true; // -// if(convertPotionConfigName(key).toUpperCase().contains("LONG")) +// if (convertPotionConfigName(key).toUpperCase().contains("LONG")) // extended = true; List lore = new ArrayList<>(); diff --git a/src/main/java/com/gmail/nossr50/config/skills/repair/RepairConfigManager.java b/src/main/java/com/gmail/nossr50/config/skills/repair/RepairConfigManager.java index 1a54906a7..491a511ed 100644 --- a/src/main/java/com/gmail/nossr50/config/skills/repair/RepairConfigManager.java +++ b/src/main/java/com/gmail/nossr50/config/skills/repair/RepairConfigManager.java @@ -20,7 +20,7 @@ public class RepairConfigManager { repairables.addAll(mainRepairConfig.getLoadedRepairables()); for (String fileName : dataFolder.list()) { - if(fileName.equals(REPAIR_VANILLA_YML)) + if (fileName.equals(REPAIR_VANILLA_YML)) continue; if (!pattern.matcher(fileName).matches()) { diff --git a/src/main/java/com/gmail/nossr50/config/skills/salvage/SalvageConfigManager.java b/src/main/java/com/gmail/nossr50/config/skills/salvage/SalvageConfigManager.java index 77348e8d3..1832da789 100644 --- a/src/main/java/com/gmail/nossr50/config/skills/salvage/SalvageConfigManager.java +++ b/src/main/java/com/gmail/nossr50/config/skills/salvage/SalvageConfigManager.java @@ -21,7 +21,7 @@ public class SalvageConfigManager { salvageables.addAll(mainSalvageConfig.getLoadedSalvageables()); for (String fileName : dataFolder.list()) { - if(fileName.equals(SALVAGE_VANILLA_YML)) + if (fileName.equals(SALVAGE_VANILLA_YML)) continue; if (!pattern.matcher(fileName).matches()) { diff --git a/src/main/java/com/gmail/nossr50/config/treasure/FishingTreasureConfig.java b/src/main/java/com/gmail/nossr50/config/treasure/FishingTreasureConfig.java index 5ffbb74da..95788896c 100755 --- a/src/main/java/com/gmail/nossr50/config/treasure/FishingTreasureConfig.java +++ b/src/main/java/com/gmail/nossr50/config/treasure/FishingTreasureConfig.java @@ -50,7 +50,7 @@ public class FishingTreasureConfig extends BukkitConfig { List reason = new ArrayList<>(); ConfigurationSection enchantment_drop_rates = config.getConfigurationSection("Enchantment_Drop_Rates"); - if(enchantment_drop_rates != null) { + if (enchantment_drop_rates != null) { for (String tier : enchantment_drop_rates.getKeys(false)) { double totalEnchantDropRate = 0; double totalItemDropRate = 0; diff --git a/src/main/java/com/gmail/nossr50/database/FlatFileDataProcessor.java b/src/main/java/com/gmail/nossr50/database/FlatFileDataProcessor.java index 36e6c784c..e64deaae7 100644 --- a/src/main/java/com/gmail/nossr50/database/FlatFileDataProcessor.java +++ b/src/main/java/com/gmail/nossr50/database/FlatFileDataProcessor.java @@ -33,7 +33,7 @@ public class FlatFileDataProcessor { assert !lineData.isEmpty(); //Make sure the data line is "correct" - if(lineData.charAt(lineData.length() - 1) != ':') { + if (lineData.charAt(lineData.length() - 1) != ':') { // Length checks depend on last rawSplitData being ':' // We add it here if it is missing lineData = lineData.concat(":"); @@ -48,9 +48,9 @@ public class FlatFileDataProcessor { boolean anyBadData = false; //This is the minimum size of the split array needed to be considered proper data - if(splitDataLine.length < getMinimumSplitDataLength()) { + if (splitDataLine.length < getMinimumSplitDataLength()) { //Data is considered junk - if(!corruptDataFound) { + if (!corruptDataFound) { logger.severe("Some corrupt data was found in mcmmo.users and has been repaired, it is possible that some player data has been lost in this process."); corruptDataFound = true; } @@ -59,9 +59,9 @@ public class FlatFileDataProcessor { builder.appendFlag(FlatFileDataFlag.CORRUPTED_OR_UNRECOGNIZABLE); //TODO: This block here is probably pointless - if(splitDataLine.length >= 10 //The value here is kind of arbitrary, it shouldn't be too low to avoid false positives, but also we aren't really going to correctly identify when player data has been corrupted or not with 100% accuracy ever + if (splitDataLine.length >= 10 //The value here is kind of arbitrary, it shouldn't be too low to avoid false positives, but also we aren't really going to correctly identify when player data has been corrupted or not with 100% accuracy ever && splitDataLine[0] != null && !splitDataLine[0].isEmpty()) { - if(splitDataLine[0].length() <= 16 && splitDataLine[0].length() >= 3) { + if (splitDataLine[0].length() <= 16 && splitDataLine[0].length() >= 3) { logger.severe("Not enough data found to recover corrupted player data for user: "+splitDataLine[0]); registerData(builder.appendFlag(FlatFileDataFlag.TOO_INCOMPLETE)); return; @@ -81,14 +81,14 @@ public class FlatFileDataProcessor { String name = splitDataLine[USERNAME_INDEX]; String strOfUUID = splitDataLine[UUID_INDEX]; - if(name.isEmpty()) { + if (name.isEmpty()) { reportBadDataLine("No name found for data", "[MISSING NAME]", lineData); builder.appendFlag(FlatFileDataFlag.MISSING_NAME); anyBadData = true; badDataValues[USERNAME_INDEX] = true; } - if(strOfUUID.isEmpty() || strOfUUID.equalsIgnoreCase("NULL")) { + if (strOfUUID.isEmpty() || strOfUUID.equalsIgnoreCase("NULL")) { invalidUUID = true; badDataValues[UUID_INDEX] = true; reportBadDataLine("Empty/null UUID for user", "Empty/null", lineData); @@ -110,20 +110,20 @@ public class FlatFileDataProcessor { } //Duplicate UUID is no good, reject them - if(!invalidUUID && uuid != null && uuids.contains(uuid)) { + if (!invalidUUID && uuid != null && uuids.contains(uuid)) { registerData(builder.appendFlag(FlatFileDataFlag.DUPLICATE_UUID)); return; } uuids.add(uuid); - if(names.contains(name)) { + if (names.contains(name)) { builder.appendFlag(FlatFileDataFlag.DUPLICATE_NAME); anyBadData = true; badDataValues[USERNAME_INDEX] = true; } - if(!name.isEmpty()) + if (!name.isEmpty()) names.add(name); //Make sure the data is up to date schema wise, if it isn't we adjust it to the correct size and flag it for repair @@ -136,9 +136,9 @@ public class FlatFileDataProcessor { //Check each data for bad values for(int i = 0; i < DATA_ENTRY_COUNT; i++) { - if(shouldNotBeEmpty(splitDataLine[i], i)) { + if (shouldNotBeEmpty(splitDataLine[i], i)) { - if(i == OVERHAUL_LAST_LOGIN) { + if (i == OVERHAUL_LAST_LOGIN) { builder.appendFlag(FlatFileDataFlag.LAST_LOGIN_SCHEMA_UPGRADE); } @@ -149,13 +149,13 @@ public class FlatFileDataProcessor { boolean isCorrectType = isOfExpectedType(splitDataLine[i], getExpectedValueType(i)); - if(!isCorrectType) { + if (!isCorrectType) { anyBadData = true; badDataValues[i] = true; } } - if(anyBadData) { + if (anyBadData) { builder.appendFlag(FlatFileDataFlag.BAD_VALUES); builder.appendBadDataValues(badDataValues); } @@ -166,7 +166,7 @@ public class FlatFileDataProcessor { public @NotNull String[] isDataSchemaUpToDate(@NotNull String[] splitDataLine, @NotNull FlatFileDataBuilder builder, boolean[] badDataValues) { assert splitDataLine.length <= DATA_ENTRY_COUNT; //should NEVER be higher - if(splitDataLine.length < DATA_ENTRY_COUNT) { + if (splitDataLine.length < DATA_ENTRY_COUNT) { int oldLength = splitDataLine.length; splitDataLine = Arrays.copyOf(splitDataLine, DATA_ENTRY_COUNT); int newLength = splitDataLine.length; @@ -184,7 +184,7 @@ public class FlatFileDataProcessor { public boolean shouldNotBeEmpty(@Nullable String data, int index) { - if(getExpectedValueType(index) == ExpectedType.IGNORED) { + if (getExpectedValueType(index) == ExpectedType.IGNORED) { return false; } else { return data == null || data.isEmpty(); @@ -248,7 +248,7 @@ public class FlatFileDataProcessor { FlatFileDataContainer flatFileDataContainer = builder.build(); flatFileDataContainers.add(flatFileDataContainer); - if(flatFileDataContainer.getDataFlags() != null) + if (flatFileDataContainer.getDataFlags() != null) flatFileDataFlags.addAll(flatFileDataContainer.getDataFlags()); } @@ -295,7 +295,7 @@ public class FlatFileDataProcessor { for(FlatFileDataContainer dataContainer : flatFileDataContainers) { String[] splitData = FlatFileDataUtil.getPreparedSaveDataLine(dataContainer); - if(splitData == null) + if (splitData == null) continue; //We add a trailing : as it is needed for some reason (is it?) diff --git a/src/main/java/com/gmail/nossr50/database/FlatFileDatabaseManager.java b/src/main/java/com/gmail/nossr50/database/FlatFileDatabaseManager.java index cd11065da..10dca3354 100644 --- a/src/main/java/com/gmail/nossr50/database/FlatFileDatabaseManager.java +++ b/src/main/java/com/gmail/nossr50/database/FlatFileDatabaseManager.java @@ -101,15 +101,15 @@ public final class FlatFileDatabaseManager implements DatabaseManager { this.startingLevel = startingLevel; this.testing = testing; - if(!usersFile.exists()) { + if (!usersFile.exists()) { initEmptyDB(); } - if(!testing) { + if (!testing) { List flatFileDataFlags = checkFileHealthAndStructure(); - if(flatFileDataFlags != null) { - if(!flatFileDataFlags.isEmpty()) { + if (flatFileDataFlags != null) { + if (!flatFileDataFlags.isEmpty()) { logger.info("Detected "+flatFileDataFlags.size() + " data entries which need correction."); } } @@ -222,7 +222,7 @@ public final class FlatFileDatabaseManager implements DatabaseManager { if (lastPlayed == -1) { OfflinePlayer player = mcMMO.p.getServer().getOfflinePlayer(uuid); - if(player.getLastPlayed() != 0) { + if (player.getLastPlayed() != 0) { lastPlayed = player.getLastPlayed(); rewrite = true; } @@ -246,7 +246,7 @@ public final class FlatFileDatabaseManager implements DatabaseManager { out = new FileWriter(usersFilePath); out.write(writer.toString()); - if(testing) { + if (testing) { System.out.println(writer); } } @@ -354,15 +354,15 @@ public final class FlatFileDatabaseManager implements DatabaseManager { boolean wroteUser = false; // While not at the end of the file while ((line = in.readLine()) != null) { - if(line.startsWith("#")) { + if (line.startsWith("#")) { writer.append(line).append("\r\n"); continue; } //Check for incomplete or corrupted data - if(!line.contains(":")) { + if (!line.contains(":")) { - if(!corruptDataFound) { + if (!corruptDataFound) { logger.severe("mcMMO found some unexpected or corrupted data in mcmmo.users and is removing it, it is possible some data has been lost."); corruptDataFound = true; } @@ -373,9 +373,9 @@ public final class FlatFileDatabaseManager implements DatabaseManager { String[] splitData = line.split(":"); //This would be rare, but check the splitData for having enough entries to contain a UUID - if(splitData.length < UUID_INDEX) { //UUID have been in mcMMO DB for a very long time so any user without + if (splitData.length < UUID_INDEX) { //UUID have been in mcMMO DB for a very long time so any user without - if(!corruptDataFound) { + if (!corruptDataFound) { logger.severe("mcMMO found some unexpected or corrupted data in mcmmo.users and is removing it, it is possible some data has been lost."); corruptDataFound = true; } @@ -397,7 +397,7 @@ public final class FlatFileDatabaseManager implements DatabaseManager { /* * If we couldn't find the user in the DB we need to add him */ - if(!wroteUser) { + if (!wroteUser) { writeUserToLine(profile, writer); } @@ -498,7 +498,7 @@ public final class FlatFileDatabaseManager implements DatabaseManager { public @NotNull List readLeaderboard(@Nullable PrimarySkillType primarySkillType, int pageNumber, int statsPerPage) throws InvalidSkillException { //Fix for a plugin that people are using that is throwing SQL errors - if(primarySkillType != null && SkillTools.isChildSkill(primarySkillType)) { + if (primarySkillType != null && SkillTools.isChildSkill(primarySkillType)) { logger.severe("A plugin hooking into mcMMO is being naughty with our database commands, update all plugins that hook into mcMMO and contact their devs!"); throw new InvalidSkillException("A plugin hooking into mcMMO that you are using is attempting to read leaderboard skills for child skills, child skills do not have leaderboards! This is NOT an mcMMO error!"); } @@ -572,11 +572,11 @@ public final class FlatFileDatabaseManager implements DatabaseManager { private @NotNull UserQuery getUserQuery(@Nullable UUID uuid, @Nullable String playerName) throws NullPointerException { boolean hasName = playerName != null && !playerName.equalsIgnoreCase("null"); - if(hasName && uuid != null) { + if (hasName && uuid != null) { return new UserQueryFull(playerName, uuid); } else if (uuid != null) { return new UserQueryUUIDImpl(uuid); - } else if(hasName) { + } else if (hasName) { return new UserQueryNameImpl(playerName); } else { throw new NullPointerException("Both name and UUID cannot be null, at least one must be non-null!"); @@ -610,7 +610,7 @@ public final class FlatFileDatabaseManager implements DatabaseManager { while ((line = in.readLine()) != null) { - if(line.startsWith("#")) { + if (line.startsWith("#")) { continue; } @@ -620,12 +620,12 @@ public final class FlatFileDatabaseManager implements DatabaseManager { /* Don't read corrupt data */ - if(rawSplitData.length < (USERNAME_INDEX + 1)) { + if (rawSplitData.length < (USERNAME_INDEX + 1)) { continue; } // we found the player - if(playerName.equalsIgnoreCase(rawSplitData[USERNAME_INDEX])) { + if (playerName.equalsIgnoreCase(rawSplitData[USERNAME_INDEX])) { return loadFromLine(rawSplitData); } } @@ -660,24 +660,24 @@ public final class FlatFileDatabaseManager implements DatabaseManager { String line; while ((line = in.readLine()) != null) { - if(line.startsWith("#")) { + if (line.startsWith("#")) { continue; } // Find if the line contains the player we want. String[] rawSplitData = line.split(":"); /* Don't read corrupt data */ - if(rawSplitData.length < (UUID_INDEX + 1)) { + if (rawSplitData.length < (UUID_INDEX + 1)) { continue; } try { UUID fromDataUUID = UUID.fromString(rawSplitData[UUID_INDEX]); - if(fromDataUUID.equals(uuid)) { + if (fromDataUUID.equals(uuid)) { return loadFromLine(rawSplitData); } } catch (Exception e) { - if(testing) { + if (testing) { e.printStackTrace(); } } @@ -716,20 +716,20 @@ public final class FlatFileDatabaseManager implements DatabaseManager { String line; while ((line = in.readLine()) != null) { - if(line.startsWith("#")) { + if (line.startsWith("#")) { continue; } // Find if the line contains the player we want. String[] rawSplitData = line.split(":"); /* Don't read corrupt data */ - if(rawSplitData.length < (UUID_INDEX + 1)) { + if (rawSplitData.length < (UUID_INDEX + 1)) { continue; } try { UUID fromDataUUID = UUID.fromString(rawSplitData[UUID_INDEX]); - if(fromDataUUID.equals(uuid)) { + if (fromDataUUID.equals(uuid)) { //Matched UUID, now check if name matches String dbPlayerName = rawSplitData[USERNAME_INDEX]; @@ -746,7 +746,7 @@ public final class FlatFileDatabaseManager implements DatabaseManager { return loadFromLine(rawSplitData); } } catch (Exception e) { - if(testing) { + if (testing) { e.printStackTrace(); } } @@ -774,7 +774,7 @@ public final class FlatFileDatabaseManager implements DatabaseManager { } private @NotNull PlayerProfile grabUnloadedProfile(@NotNull UUID uuid, @Nullable String playerName) { - if(playerName == null) { + if (playerName == null) { playerName = ""; //No name for you boy! } @@ -793,7 +793,7 @@ public final class FlatFileDatabaseManager implements DatabaseManager { String line; while ((line = in.readLine()) != null) { - if(line.startsWith("#")) { + if (line.startsWith("#")) { continue; } @@ -1014,7 +1014,7 @@ public final class FlatFileDatabaseManager implements DatabaseManager { while ((line = in.readLine()) != null) { - if(line.startsWith("#")) + if (line.startsWith("#")) continue; String[] data = line.split(":"); @@ -1145,12 +1145,12 @@ public final class FlatFileDatabaseManager implements DatabaseManager { //Analyze the data while ((currentLine = bufferedReader.readLine()) != null) { //Commented lines - if(currentLine.startsWith("#") && dbCommentDate == null) { //The first commented line in the file is likely to be our note about when the file was created + if (currentLine.startsWith("#") && dbCommentDate == null) { //The first commented line in the file is likely to be our note about when the file was created dbCommentDate = currentLine; continue; } - if(currentLine.isEmpty()) + if (currentLine.isEmpty()) continue; //TODO: We are never passing empty lines, should we remove the flag for them? @@ -1158,12 +1158,12 @@ public final class FlatFileDatabaseManager implements DatabaseManager { } //Only update the file if needed - if(!dataProcessor.getFlatFileDataFlags().isEmpty()) { + if (!dataProcessor.getFlatFileDataFlags().isEmpty()) { flagsFound = new ArrayList<>(dataProcessor.getFlatFileDataFlags()); logger.info("Updating FlatFile Database..."); fileWriter = new FileWriter(usersFilePath); //Write data to file - if(dbCommentDate != null) + if (dbCommentDate != null) fileWriter.write(dbCommentDate + "\r\n"); fileWriter.write(dataProcessor.processDataForSave().toString()); @@ -1176,7 +1176,7 @@ public final class FlatFileDatabaseManager implements DatabaseManager { } } - if(flagsFound == null || flagsFound.isEmpty()) { + if (flagsFound == null || flagsFound.isEmpty()) { return null; } else { return flagsFound; @@ -1184,7 +1184,7 @@ public final class FlatFileDatabaseManager implements DatabaseManager { } private void closeResources(BufferedReader bufferedReader, FileWriter fileWriter) { - if(bufferedReader != null) { + if (bufferedReader != null) { try { bufferedReader.close(); } diff --git a/src/main/java/com/gmail/nossr50/database/SQLDatabaseManager.java b/src/main/java/com/gmail/nossr50/database/SQLDatabaseManager.java index a21f2fced..aef90e48c 100644 --- a/src/main/java/com/gmail/nossr50/database/SQLDatabaseManager.java +++ b/src/main/java/com/gmail/nossr50/database/SQLDatabaseManager.java @@ -59,7 +59,7 @@ public final class SQLDatabaseManager implements DatabaseManager { this.h2 = h2; String connectionString = getConnectionString(h2); - if(!h2 && mcMMO.p.getGeneralConfig().getMySQLPublicKeyRetrieval()) { + if (!h2 && mcMMO.p.getGeneralConfig().getMySQLPublicKeyRetrieval()) { connectionString+= "&allowPublicKeyRetrieval=true"; } @@ -140,7 +140,7 @@ public final class SQLDatabaseManager implements DatabaseManager { String connectionString = "jdbc:mysql://" + mcMMO.p.getGeneralConfig().getMySQLServerName() + ":" + mcMMO.p.getGeneralConfig().getMySQLServerPort() + "/" + mcMMO.p.getGeneralConfig().getMySQLDatabaseName(); - if(!mcMMO.getCompatibilityManager().getMinecraftGameVersion().isAtLeast(1, 17, 0) //Temporary hack for SQL and 1.17 support + if (!mcMMO.getCompatibilityManager().getMinecraftGameVersion().isAtLeast(1, 17, 0) //Temporary hack for SQL and 1.17 support && mcMMO.p.getGeneralConfig().getMySQLSSL()) connectionString += "?verifyServerCertificate=false"+ @@ -247,7 +247,7 @@ public final class SQLDatabaseManager implements DatabaseManager { } if (success) { - if(uuid != null) + if (uuid != null) cleanupUser(uuid); Misc.profileCleanup(playerName); @@ -400,7 +400,7 @@ public final class SQLDatabaseManager implements DatabaseManager { List stats = new ArrayList<>(); //Fix for a plugin that people are using that is throwing SQL errors - if(skill != null && SkillTools.isChildSkill(skill)) { + if (skill != null && SkillTools.isChildSkill(skill)) { logger.severe("A plugin hooking into mcMMO is being naughty with our database commands, update all plugins that hook into mcMMO and contact their devs!"); throw new InvalidSkillException("A plugin hooking into mcMMO that you are using is attempting to read leaderboard skills for child skills, child skills do not have leaderboards! This is NOT an mcMMO error!"); } @@ -631,7 +631,7 @@ public final class SQLDatabaseManager implements DatabaseManager { } private PlayerProfile loadPlayerFromDB(@Nullable UUID uuid, @Nullable String playerName) throws RuntimeException { - if(uuid == null && playerName == null) { + if (uuid == null && playerName == null) { throw new RuntimeException("Error looking up player, both UUID and playerName are null and one must not be."); } diff --git a/src/main/java/com/gmail/nossr50/database/flatfile/FlatFileDataBuilder.java b/src/main/java/com/gmail/nossr50/database/flatfile/FlatFileDataBuilder.java index ed048d5e1..eb6e3dd2a 100644 --- a/src/main/java/com/gmail/nossr50/database/flatfile/FlatFileDataBuilder.java +++ b/src/main/java/com/gmail/nossr50/database/flatfile/FlatFileDataBuilder.java @@ -28,7 +28,7 @@ public class FlatFileDataBuilder { } public @NotNull FlatFileDataContainer build() { - if(dataFlags.contains(FlatFileDataFlag.BAD_VALUES)) { + if (dataFlags.contains(FlatFileDataFlag.BAD_VALUES)) { return new BadCategorizedFlatFileData(uniqueProcessingId, dataFlags, splitStringData, badDataValues); } diff --git a/src/main/java/com/gmail/nossr50/database/flatfile/FlatFileDataUtil.java b/src/main/java/com/gmail/nossr50/database/flatfile/FlatFileDataUtil.java index bc1c19cb6..a3c78685f 100644 --- a/src/main/java/com/gmail/nossr50/database/flatfile/FlatFileDataUtil.java +++ b/src/main/java/com/gmail/nossr50/database/flatfile/FlatFileDataUtil.java @@ -10,14 +10,14 @@ import static com.gmail.nossr50.database.FlatFileDatabaseManager.*; public class FlatFileDataUtil { public static @Nullable String[] getPreparedSaveDataLine(@NotNull FlatFileDataContainer dataContainer) { - if(dataContainer.getDataFlags() == null) { + if (dataContainer.getDataFlags() == null) { return dataContainer.getSplitData(); } //Data of this type is not salvageable //TODO: Test that we ignore the things we are supposed to ignore //TODO: Should we even keep track of the bad data or just not even build data containers for it? Making containers for it is only really useful for debugging.. well I suppose operations are typically async so it shouldn't matter - if(dataContainer.getDataFlags().contains(FlatFileDataFlag.CORRUPTED_OR_UNRECOGNIZABLE) + if (dataContainer.getDataFlags().contains(FlatFileDataFlag.CORRUPTED_OR_UNRECOGNIZABLE) || dataContainer.getDataFlags().contains(FlatFileDataFlag.DUPLICATE_UUID) //For now we will not try to fix any issues with UUIDs || dataContainer.getDataFlags().contains(FlatFileDataFlag.BAD_UUID_DATA) //For now we will not try to fix any issues with UUIDs || dataContainer.getDataFlags().contains(FlatFileDataFlag.TOO_INCOMPLETE)) { @@ -29,7 +29,7 @@ public class FlatFileDataUtil { /* * First fix the bad data values if they exist */ - if(dataContainer instanceof BadCategorizedFlatFileData badData) { + if (dataContainer instanceof BadCategorizedFlatFileData badData) { splitData = repairBadData(dataContainer.getSplitData(), badData.getBadDataIndexes()); } else { splitData = dataContainer.getSplitData(); @@ -42,7 +42,7 @@ public class FlatFileDataUtil { public static @NotNull String[] repairBadData(@NotNull String[] splitData, boolean[] badDataValues) { for(int i = 0; i < FlatFileDatabaseManager.DATA_ENTRY_COUNT; i++) { - if(badDataValues[i]) { + if (badDataValues[i]) { //This data value was marked as bad so we zero initialize it splitData[i] = getZeroInitialisedData(i, 0); } diff --git a/src/main/java/com/gmail/nossr50/datatypes/LevelUpBroadcastPredicate.java b/src/main/java/com/gmail/nossr50/datatypes/LevelUpBroadcastPredicate.java index f19ec041e..32109deac 100644 --- a/src/main/java/com/gmail/nossr50/datatypes/LevelUpBroadcastPredicate.java +++ b/src/main/java/com/gmail/nossr50/datatypes/LevelUpBroadcastPredicate.java @@ -25,56 +25,56 @@ public class LevelUpBroadcastPredicate implements Predi Player broadcastingPlayer = (Player) broadcaster; //Always a player no need to check cast //Broadcaster should be online - if(!broadcastingPlayer.isOnline()) { + if (!broadcastingPlayer.isOnline()) { return false; } McMMOPlayer mmoBroadcastingPlayer = UserManager.getPlayer(broadcastingPlayer); - if(mmoBroadcastingPlayer == null) { + if (mmoBroadcastingPlayer == null) { //This should never be null, but just in case... mcMMO.p.getLogger().severe("McMMOPlayer was null for broadcaster in LevelUpBroadcastPredicate when it should never be null!"); return false; } - if(t instanceof Player listeningPlayer) { + if (t instanceof Player listeningPlayer) { //Party Member Check - if(mcMMO.p.getGeneralConfig().isLevelUpBroadcastsPartyMembersOnly()) { + if (mcMMO.p.getGeneralConfig().isLevelUpBroadcastsPartyMembersOnly()) { McMMOPlayer mmoListeningPlayer = UserManager.getPlayer(listeningPlayer); - if(mmoListeningPlayer == null) { + if (mmoListeningPlayer == null) { return false; //No profile so therefor no party } Party playerWhoLeveledParty = mmoBroadcastingPlayer.getParty(); Party broadcastRecipientParty = mmoListeningPlayer.getParty(); - if(playerWhoLeveledParty == null || broadcastRecipientParty == null) { + if (playerWhoLeveledParty == null || broadcastRecipientParty == null) { return false; //No party on either player when being in the same party is required } - if(!playerWhoLeveledParty.equals(broadcastRecipientParty)) { + if (!playerWhoLeveledParty.equals(broadcastRecipientParty)) { return false; //Not in the same party when it is required } } //Same world check - if(isLevelUpBroadcastsSameWorldOnly()) { - if(!mmoBroadcastingPlayer.getPlayer().getWorld().equals(listeningPlayer.getWorld())) { + if (isLevelUpBroadcastsSameWorldOnly()) { + if (!mmoBroadcastingPlayer.getPlayer().getWorld().equals(listeningPlayer.getWorld())) { return false; //Not in the same world when its required } //Distance checks - if(mcMMO.p.getGeneralConfig().shouldLevelUpBroadcastsRestrictDistance()) { - if(!Misc.isNear(mmoBroadcastingPlayer.getPlayer().getLocation(), listeningPlayer.getLocation(), mcMMO.p.getGeneralConfig().getLevelUpBroadcastRadius())) { + if (mcMMO.p.getGeneralConfig().shouldLevelUpBroadcastsRestrictDistance()) { + if (!Misc.isNear(mmoBroadcastingPlayer.getPlayer().getLocation(), listeningPlayer.getLocation(), mcMMO.p.getGeneralConfig().getLevelUpBroadcastRadius())) { return false; } } } //Visibility checks - if(!listeningPlayer.canSee(mmoBroadcastingPlayer.getPlayer()) && listeningPlayer != mmoBroadcastingPlayer.getPlayer()) { + if (!listeningPlayer.canSee(mmoBroadcastingPlayer.getPlayer()) && listeningPlayer != mmoBroadcastingPlayer.getPlayer()) { return false; //Player who leveled should be invisible to this player so don't send the message } diff --git a/src/main/java/com/gmail/nossr50/datatypes/PowerLevelUpBroadcastPredicate.java b/src/main/java/com/gmail/nossr50/datatypes/PowerLevelUpBroadcastPredicate.java index 05e7a3a1a..1e6b278a8 100644 --- a/src/main/java/com/gmail/nossr50/datatypes/PowerLevelUpBroadcastPredicate.java +++ b/src/main/java/com/gmail/nossr50/datatypes/PowerLevelUpBroadcastPredicate.java @@ -25,56 +25,56 @@ public class PowerLevelUpBroadcastPredicate implements Player broadcastingPlayer = (Player) broadcaster; //Always a player no need to check cast //Broadcaster should be online - if(!broadcastingPlayer.isOnline()) { + if (!broadcastingPlayer.isOnline()) { return false; } McMMOPlayer mmoBroadcastingPlayer = UserManager.getPlayer(broadcastingPlayer); - if(mmoBroadcastingPlayer == null) { + if (mmoBroadcastingPlayer == null) { //This should never be null, but just in case... mcMMO.p.getLogger().severe("McMMOPlayer was null for broadcaster in LevelUpBroadcastPredicate when it should never be null!"); return false; } - if(t instanceof Player listeningPlayer) { + if (t instanceof Player listeningPlayer) { //Party Member Check - if(mcMMO.p.getGeneralConfig().isPowerLevelUpBroadcastsPartyMembersOnly()) { + if (mcMMO.p.getGeneralConfig().isPowerLevelUpBroadcastsPartyMembersOnly()) { McMMOPlayer mmoListeningPlayer = UserManager.getPlayer(listeningPlayer); - if(mmoListeningPlayer == null) { + if (mmoListeningPlayer == null) { return false; //No profile so therefor no party } Party playerWhoLeveledParty = mmoBroadcastingPlayer.getParty(); Party broadcastRecipientParty = mmoListeningPlayer.getParty(); - if(playerWhoLeveledParty == null || broadcastRecipientParty == null) { + if (playerWhoLeveledParty == null || broadcastRecipientParty == null) { return false; //No party on either player when being in the same party is required } - if(!playerWhoLeveledParty.equals(broadcastRecipientParty)) { + if (!playerWhoLeveledParty.equals(broadcastRecipientParty)) { return false; //Not in the same party when it is required } } //Same world check - if(isPowerLevelUpBroadcastsSameWorldOnly()) { - if(!mmoBroadcastingPlayer.getPlayer().getWorld().equals(listeningPlayer.getWorld())) { + if (isPowerLevelUpBroadcastsSameWorldOnly()) { + if (!mmoBroadcastingPlayer.getPlayer().getWorld().equals(listeningPlayer.getWorld())) { return false; //Not in the same world when its required } //Distance checks - if(mcMMO.p.getGeneralConfig().shouldPowerLevelUpBroadcastsRestrictDistance()) { - if(!Misc.isNear(mmoBroadcastingPlayer.getPlayer().getLocation(), listeningPlayer.getLocation(), mcMMO.p.getGeneralConfig().getPowerLevelUpBroadcastRadius())) { + if (mcMMO.p.getGeneralConfig().shouldPowerLevelUpBroadcastsRestrictDistance()) { + if (!Misc.isNear(mmoBroadcastingPlayer.getPlayer().getLocation(), listeningPlayer.getLocation(), mcMMO.p.getGeneralConfig().getPowerLevelUpBroadcastRadius())) { return false; } } } //Visibility checks - if(!listeningPlayer.canSee(mmoBroadcastingPlayer.getPlayer()) && listeningPlayer != mmoBroadcastingPlayer.getPlayer()) { + if (!listeningPlayer.canSee(mmoBroadcastingPlayer.getPlayer()) && listeningPlayer != mmoBroadcastingPlayer.getPlayer()) { return false; //Player who leveled should be invisible to this player so don't send the message } diff --git a/src/main/java/com/gmail/nossr50/datatypes/party/Party.java b/src/main/java/com/gmail/nossr50/datatypes/party/Party.java index 78ffb9966..ddec901d8 100644 --- a/src/main/java/com/gmail/nossr50/datatypes/party/Party.java +++ b/src/main/java/com/gmail/nossr50/datatypes/party/Party.java @@ -91,7 +91,7 @@ public class Party { for(Player p : onlineMembers) { - if(player.canSee(p)) + if (player.canSee(p)) visibleMembers.add(p); } @@ -347,7 +347,7 @@ public class Party { for(UUID playerUUID : members.keySet()) { OfflinePlayer offlinePlayer = Bukkit.getOfflinePlayer(playerUUID); - if(offlinePlayer.isOnline() && player.canSee((Player) offlinePlayer)) { + if (offlinePlayer.isOnline() && player.canSee((Player) offlinePlayer)) { ChatColor onlineColor = leader.getUniqueId().equals(playerUUID) ? ChatColor.GOLD : ChatColor.GREEN; coloredNames.add(onlineColor + offlinePlayer.getName()); } else { @@ -361,7 +361,7 @@ public class Party { private void buildChatMessage(@NotNull StringBuilder stringBuilder, String @NotNull [] names) { for(int i = 0; i < names.length; i++) { - if(i + 1 >= names.length) { + if (i + 1 >= names.length) { stringBuilder .append(names[i]); } else { 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 d8b6199c4..c465e55dc 100644 --- a/src/main/java/com/gmail/nossr50/datatypes/player/McMMOPlayer.java +++ b/src/main/java/com/gmail/nossr50/datatypes/player/McMMOPlayer.java @@ -157,7 +157,7 @@ public class McMMOPlayer implements Identified { this.chatChannel = ChatChannel.NONE; - if(ChatConfig.getInstance().isSpyingAutomatic() && Permissions.adminChatSpy(getPlayer())) { + if (ChatConfig.getInstance().isSpyingAutomatic() && Permissions.adminChatSpy(getPlayer())) { chatSpy = true; } } @@ -253,20 +253,20 @@ public class McMMOPlayer implements Identified { public void processPostXpEvent(PrimarySkillType primarySkillType, Plugin plugin, XPGainSource xpGainSource) { //Check if they've reached the power level cap just now - if(hasReachedPowerLevelCap()) { + if (hasReachedPowerLevelCap()) { NotificationManager.sendPlayerInformationChatOnly(player, "LevelCap.PowerLevel", String.valueOf(mcMMO.p.getGeneralConfig().getPowerLevelCap())); - } else if(hasReachedLevelCap(primarySkillType)) { + } else if (hasReachedLevelCap(primarySkillType)) { NotificationManager.sendPlayerInformationChatOnly(player, "LevelCap.Skill", String.valueOf(mcMMO.p.getSkillTools().getLevelCap(primarySkillType)), mcMMO.p.getSkillTools().getLocalizedSkillName(primarySkillType)); } //Updates from Party sources - if(xpGainSource == XPGainSource.PARTY_MEMBERS && !ExperienceConfig.getInstance().isPartyExperienceBarsEnabled()) + if (xpGainSource == XPGainSource.PARTY_MEMBERS && !ExperienceConfig.getInstance().isPartyExperienceBarsEnabled()) return; //Updates from passive sources (Alchemy, Smelting, etc...) - if(xpGainSource == XPGainSource.PASSIVE && !ExperienceConfig.getInstance().isPassiveGainsExperienceBarsEnabled()) + if (xpGainSource == XPGainSource.PASSIVE && !ExperienceConfig.getInstance().isPassiveGainsExperienceBarsEnabled()) return; updateXPBar(primarySkillType, plugin); @@ -285,7 +285,7 @@ public class McMMOPlayer implements Identified { public double getProgressInCurrentSkillLevel(PrimarySkillType primarySkillType) { - if(SkillTools.isChildSkill(primarySkillType)) { + if (SkillTools.isChildSkill(primarySkillType)) { return 1.0D; } @@ -602,7 +602,7 @@ public class McMMOPlayer implements Identified { * @return */ public boolean hasReachedLevelCap(PrimarySkillType primarySkillType) { - if(hasReachedPowerLevelCap()) + if (hasReachedPowerLevelCap()) return true; return getSkillLevel(primarySkillType) >= mcMMO.p.getSkillTools().getLevelCap(primarySkillType); @@ -624,7 +624,7 @@ public class McMMOPlayer implements Identified { * @param xp Experience amount to process */ public void beginXpGain(PrimarySkillType skill, float xp, XPGainReason xpGainReason, XPGainSource xpGainSource) { - if(xp <= 0) { + if (xp <= 0) { return; } @@ -656,7 +656,7 @@ public class McMMOPlayer implements Identified { * @param xp Experience amount to process */ public void beginUnsharedXpGain(PrimarySkillType skill, float xp, XPGainReason xpGainReason, XPGainSource xpGainSource) { - if(player.getGameMode() == GameMode.CREATIVE) + if (player.getGameMode() == GameMode.CREATIVE) return; applyXpGain(skill, modifyXpGain(skill, xp), xpGainReason, xpGainSource); @@ -709,7 +709,7 @@ public class McMMOPlayer implements Identified { * @param primarySkillType The skill to check */ private void checkXp(PrimarySkillType primarySkillType, XPGainReason xpGainReason, XPGainSource xpGainSource) { - if(hasReachedLevelCap(primarySkillType)) + if (hasReachedLevelCap(primarySkillType)) return; if (getSkillXpLevelRaw(primarySkillType) < getXpToLevel(primarySkillType)) { @@ -906,7 +906,7 @@ public class McMMOPlayer implements Identified { //TODO: This is hacky and temporary solution until skills are move to the new system //Potential problems with this include skills with two super abilities (ie mining) - if(!RankUtils.hasUnlockedSubskill(player, subSkillType)) + if (!RankUtils.hasUnlockedSubskill(player, subSkillType)) { int diff = RankUtils.getSuperAbilityUnlockRequirement(superAbilityType) - getSkillLevel(primarySkillType); @@ -941,7 +941,7 @@ public class McMMOPlayer implements Identified { int ticks; //Ability cap of 0 or below means no cap - if(abilityLengthCap > 0) + if (abilityLengthCap > 0) { ticks = PerksUtils.handleActivationPerks(player, 2 + (Math.min(abilityLengthCap, getSkillLevel(primarySkillType)) / abilityLengthVar), superAbilityType.getMaxLength()); } else { @@ -1024,7 +1024,7 @@ public class McMMOPlayer implements Identified { * IF THE TOOL IS AN AXE * */ - if(tool == ToolType.AXE) { + if (tool == ToolType.AXE) { processAxeToolMessages(); } else { NotificationManager.sendPlayerInformation(player, NotificationType.TOOL, tool.getRaiseTool()); @@ -1045,20 +1045,20 @@ public class McMMOPlayer implements Identified { /* * IF BOTH TREE FELLER & SKULL SPLITTER ARE ON CD */ - if(isAbilityOnCooldown(SuperAbilityType.TREE_FELLER) && isAbilityOnCooldown(SuperAbilityType.SKULL_SPLITTER)) { + if (isAbilityOnCooldown(SuperAbilityType.TREE_FELLER) && isAbilityOnCooldown(SuperAbilityType.SKULL_SPLITTER)) { tooTiredMultiple(PrimarySkillType.WOODCUTTING, SubSkillType.WOODCUTTING_TREE_FELLER, SuperAbilityType.TREE_FELLER, SubSkillType.AXES_SKULL_SPLITTER, SuperAbilityType.SKULL_SPLITTER); /* * IF TREE FELLER IS ON CD * AND PLAYER IS LOOKING AT TREE */ - } else if(isAbilityOnCooldown(SuperAbilityType.TREE_FELLER) + } else if (isAbilityOnCooldown(SuperAbilityType.TREE_FELLER) && BlockUtils.isPartOfTree(rayCast)) { raiseToolWithCooldowns(SubSkillType.WOODCUTTING_TREE_FELLER, SuperAbilityType.TREE_FELLER); /* * IF SKULL SPLITTER IS ON CD */ - } else if(isAbilityOnCooldown(SuperAbilityType.SKULL_SPLITTER)) { + } else if (isAbilityOnCooldown(SuperAbilityType.SKULL_SPLITTER)) { raiseToolWithCooldowns(SubSkillType.AXES_SKULL_SPLITTER, SuperAbilityType.SKULL_SPLITTER); } else { NotificationManager.sendPlayerInformation(player, NotificationType.TOOL, ToolType.AXE.getRaiseTool()); @@ -1156,7 +1156,7 @@ public class McMMOPlayer implements Identified { */ public void logout(boolean syncSave) { Player thisPlayer = getPlayer(); - if(getPlayer().hasMetadata(MetadataConstants.METADATA_KEY_RUPTURE)) { + if (getPlayer().hasMetadata(MetadataConstants.METADATA_KEY_RUPTURE)) { RuptureTaskMeta ruptureTaskMeta = (RuptureTaskMeta) getPlayer().getMetadata(MetadataConstants.METADATA_KEY_RUPTURE).get(0); //Punish a logout @@ -1175,7 +1175,7 @@ public class McMMOPlayer implements Identified { UserManager.remove(thisPlayer); - if(mcMMO.p.getGeneralConfig().getScoreboardsEnabled()) + if (mcMMO.p.getGeneralConfig().getScoreboardsEnabled()) ScoreboardManager.teardownPlayer(thisPlayer); if (inParty()) { diff --git a/src/main/java/com/gmail/nossr50/datatypes/player/PlayerProfile.java b/src/main/java/com/gmail/nossr50/datatypes/player/PlayerProfile.java index 71abb6418..1087fca48 100644 --- a/src/main/java/com/gmail/nossr50/datatypes/player/PlayerProfile.java +++ b/src/main/java/com/gmail/nossr50/datatypes/player/PlayerProfile.java @@ -100,7 +100,7 @@ public class PlayerProfile { loaded = true; - if(lastLogin != null) + if (lastLogin != null) this.lastLogin = lastLogin; } @@ -130,17 +130,17 @@ public class PlayerProfile { if (changed) { mcMMO.p.getLogger().severe("PlayerProfile saving failed for player: " + playerName + " " + uuid); - if(saveAttempts > 0) { + if (saveAttempts > 0) { mcMMO.p.getLogger().severe("Attempted to save profile for player "+getPlayerName() + " resulted in failure. "+saveAttempts+" have been made so far."); } - if(saveAttempts < 10) + if (saveAttempts < 10) { saveAttempts++; //Back out of async saving if we detect a server shutdown, this is not always going to be caught - if(mcMMO.isServerShutdownExecuted() || useSync) + if (mcMMO.isServerShutdownExecuted() || useSync) mcMMO.p.getFoliaLib().getImpl().runNextTick(new PlayerProfileSaveTask(this, true)); else scheduleAsyncSave(); @@ -271,7 +271,7 @@ public class PlayerProfile { } public int getSkillXpLevel(PrimarySkillType skill) { - if(SkillTools.isChildSkill(skill)) { + if (SkillTools.isChildSkill(skill)) { return 0; } @@ -339,7 +339,7 @@ public class PlayerProfile { markProfileDirty(); //Don't allow levels to be negative - if(level < 0) + if (level < 0) level = 0; skills.put(skill, level); @@ -424,7 +424,7 @@ public class PlayerProfile { * @return the total amount of Xp until next level */ public int getXpToLevel(PrimarySkillType primarySkillType) { - if(SkillTools.isChildSkill(primarySkillType)) { + if (SkillTools.isChildSkill(primarySkillType)) { return 0; } diff --git a/src/main/java/com/gmail/nossr50/datatypes/skills/MaterialType.java b/src/main/java/com/gmail/nossr50/datatypes/skills/MaterialType.java index 26e0f17d9..85952bac7 100644 --- a/src/main/java/com/gmail/nossr50/datatypes/skills/MaterialType.java +++ b/src/main/java/com/gmail/nossr50/datatypes/skills/MaterialType.java @@ -37,7 +37,7 @@ public enum MaterialType { return Material.DIAMOND; case NETHERITE: - if(Material.getMaterial("NETHERITE_SCRAP") != null) + if (Material.getMaterial("NETHERITE_SCRAP") != null) return Material.getMaterial("NETHERITE_SCRAP"); else return Material.DIAMOND; diff --git a/src/main/java/com/gmail/nossr50/datatypes/skills/SubSkillType.java b/src/main/java/com/gmail/nossr50/datatypes/skills/SubSkillType.java index 1cf028e88..a43e56c38 100644 --- a/src/main/java/com/gmail/nossr50/datatypes/skills/SubSkillType.java +++ b/src/main/java/com/gmail/nossr50/datatypes/skills/SubSkillType.java @@ -201,7 +201,7 @@ public enum SubSkillType { * Split the string up so we can capitalize each part */ String subskillNameWithoutPrefix = subSkillName.substring(subStringIndex); - if(subskillNameWithoutPrefix.contains("_")) + if (subskillNameWithoutPrefix.contains("_")) { String[] splitStrings = subskillNameWithoutPrefix.split("_"); diff --git a/src/main/java/com/gmail/nossr50/datatypes/skills/alchemy/PotionStage.java b/src/main/java/com/gmail/nossr50/datatypes/skills/alchemy/PotionStage.java index 303cf3b19..7825c717f 100644 --- a/src/main/java/com/gmail/nossr50/datatypes/skills/alchemy/PotionStage.java +++ b/src/main/java/com/gmail/nossr50/datatypes/skills/alchemy/PotionStage.java @@ -64,7 +64,7 @@ public enum PotionStage { stage++; } else if (!potionMeta.getCustomEffects().isEmpty()) { for (PotionEffect effect : potionMeta.getCustomEffects()){ - if(effect.getAmplifier() > 0){ + if (effect.getAmplifier() > 0){ stage++; break; } 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 bb0ea4267..6b91d31b3 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 @@ -61,7 +61,7 @@ public class Roll extends AcrobaticsSubSkill { EntityDamageEvent entityDamageEvent = (EntityDamageEvent) event; //Make sure a real player was damaged in this event - if(!EventUtils.isRealPlayerDamaged(entityDamageEvent)) + if (!EventUtils.isRealPlayerDamaged(entityDamageEvent)) return false; if (entityDamageEvent.getCause() == EntityDamageEvent.DamageCause.FALL) {//Grab the player @@ -81,7 +81,7 @@ public class Roll extends AcrobaticsSubSkill { entityDamageEvent.setCancelled(true); return true; } - } else if(mcMMO.p.getSkillTools().doesPlayerHaveSkillPermission(mmoPlayer.getPlayer(), PrimarySkillType.ACROBATICS)) { + } else if (mcMMO.p.getSkillTools().doesPlayerHaveSkillPermission(mmoPlayer.getPlayer(), PrimarySkillType.ACROBATICS)) { //Give XP Anyways SkillUtils.applyXpGain(mmoPlayer, getPrimarySkill(), calculateRollXP(mmoPlayer, ((EntityDamageEvent) event).getFinalDamage(), false), XPGainReason.PVE); } @@ -156,7 +156,7 @@ public class Roll extends AcrobaticsSubSkill { //Advanced //Lucky Notice - if(isLucky) + if (isLucky) { componentBuilder.append(Component.text(LocaleLoader.getString("JSON.JWrapper.Perks.Header"))); componentBuilder.append(Component.newline()); @@ -213,7 +213,7 @@ public class Roll extends AcrobaticsSubSkill { //mmoPlayer.getPlayer().sendMessage(LocaleLoader.getString("Acrobatics.Roll.Text")); //if (!SkillUtils.cooldownExpired((long) mcMMOmmoPlayer.getPlayer().getTeleportATS(), Config.getInstance().getXPAfterTeleportCooldown())) { - if(!isExploiting(mmoPlayer) && mmoPlayer.getAcrobaticsManager().canGainRollXP()) + if (!isExploiting(mmoPlayer) && mmoPlayer.getAcrobaticsManager().canGainRollXP()) SkillUtils.applyXpGain(mmoPlayer, getPrimarySkill(), calculateRollXP(mmoPlayer, damage, true), XPGainReason.PVE); //} @@ -222,7 +222,7 @@ public class Roll extends AcrobaticsSubSkill { } else if (!isFatal(mmoPlayer, damage)) { //if (!SkillUtils.cooldownExpired((long) mmoPlayer.getTeleportATS(), Config.getInstance().getXPAfterTeleportCooldown())) { - if(!isExploiting(mmoPlayer) && mmoPlayer.getAcrobaticsManager().canGainRollXP()) + if (!isExploiting(mmoPlayer) && mmoPlayer.getAcrobaticsManager().canGainRollXP()) SkillUtils.applyXpGain(mmoPlayer, getPrimarySkill(), calculateRollXP(mmoPlayer, damage, false), XPGainReason.PVE); //} } @@ -252,14 +252,14 @@ public class Roll extends AcrobaticsSubSkill { { NotificationManager.sendPlayerInformation(mmoPlayer.getPlayer(), NotificationType.SUBSKILL_MESSAGE, "Acrobatics.Ability.Proc"); SoundManager.sendCategorizedSound(mmoPlayer.getPlayer(), mmoPlayer.getPlayer().getLocation(), SoundType.ROLL_ACTIVATED, SoundCategory.PLAYERS,0.5F); - if(!isExploiting(mmoPlayer) && mmoPlayer.getAcrobaticsManager().canGainRollXP()) + if (!isExploiting(mmoPlayer) && mmoPlayer.getAcrobaticsManager().canGainRollXP()) SkillUtils.applyXpGain(mmoPlayer, getPrimarySkill(), calculateRollXP(mmoPlayer, damage, true), XPGainReason.PVE); addFallLocation(mmoPlayer); return modifiedDamage; } else if (!isFatal(mmoPlayer, damage)) { - if(!isExploiting(mmoPlayer) && mmoPlayer.getAcrobaticsManager().canGainRollXP()) + if (!isExploiting(mmoPlayer) && mmoPlayer.getAcrobaticsManager().canGainRollXP()) SkillUtils.applyXpGain(mmoPlayer, getPrimarySkill(), calculateRollXP(mmoPlayer, damage, false), XPGainReason.PVE); addFallLocation(mmoPlayer); @@ -286,15 +286,15 @@ public class Roll extends AcrobaticsSubSkill { } if (ItemUtils.hasItemInEitherHand(mmoPlayer.getPlayer(), Material.ENDER_PEARL) || mmoPlayer.getPlayer().isInsideVehicle()) { - if(mmoPlayer.isDebugMode()) { + if (mmoPlayer.isDebugMode()) { mmoPlayer.getPlayer().sendMessage("Acrobatics XP Prevented: Ender Pearl or Inside Vehicle"); } return true; } - if(mmoPlayer.getAcrobaticsManager().hasFallenInLocationBefore(getBlockLocation(mmoPlayer))) + if (mmoPlayer.getAcrobaticsManager().hasFallenInLocationBefore(getBlockLocation(mmoPlayer))) { - if(mmoPlayer.isDebugMode()) { + if (mmoPlayer.isDebugMode()) { mmoPlayer.getPlayer().sendMessage("Acrobatics XP Prevented: Fallen in location before"); } diff --git a/src/main/java/com/gmail/nossr50/datatypes/skills/subskills/taming/TamingSummon.java b/src/main/java/com/gmail/nossr50/datatypes/skills/subskills/taming/TamingSummon.java index f92155a6a..1c39fed2f 100644 --- a/src/main/java/com/gmail/nossr50/datatypes/skills/subskills/taming/TamingSummon.java +++ b/src/main/java/com/gmail/nossr50/datatypes/skills/subskills/taming/TamingSummon.java @@ -36,7 +36,7 @@ public class TamingSummon { entityType = EntityType.HORSE; break; case CAT: - if(shouldSpawnCatInsteadOfOcelot()) { + if (shouldSpawnCatInsteadOfOcelot()) { //Server is on 1.14 or above entityType = EntityType.CAT; } else { diff --git a/src/main/java/com/gmail/nossr50/datatypes/treasure/FishingTreasureBook.java b/src/main/java/com/gmail/nossr50/datatypes/treasure/FishingTreasureBook.java index 69feb7b9b..efe7d1f9c 100644 --- a/src/main/java/com/gmail/nossr50/datatypes/treasure/FishingTreasureBook.java +++ b/src/main/java/com/gmail/nossr50/datatypes/treasure/FishingTreasureBook.java @@ -30,7 +30,7 @@ public class FishingTreasureBook extends FishingTreasure { LogUtils.debug(mcMMO.p.getLogger(), "Registering enchantments for Fishing Book..."); for(Enchantment enchantment : Enchantment.values()) { - if(isEnchantAllowed(enchantment)) { + if (isEnchantAllowed(enchantment)) { addAllLegalEnchants(enchantment); } } @@ -66,9 +66,9 @@ public class FishingTreasureBook extends FishingTreasure { } private boolean isEnchantAllowed(@NotNull Enchantment enchantment) { - if(whiteListedEnchantments != null && !whiteListedEnchantments.isEmpty()) { + if (whiteListedEnchantments != null && !whiteListedEnchantments.isEmpty()) { return whiteListedEnchantments.contains(enchantment); - } else if(blackListedEnchantments != null && !blackListedEnchantments.isEmpty()) { + } else if (blackListedEnchantments != null && !blackListedEnchantments.isEmpty()) { return !blackListedEnchantments.contains(enchantment); } else { return true; diff --git a/src/main/java/com/gmail/nossr50/datatypes/treasure/Rarity.java b/src/main/java/com/gmail/nossr50/datatypes/treasure/Rarity.java index 4666b32b1..0ff04bdbd 100644 --- a/src/main/java/com/gmail/nossr50/datatypes/treasure/Rarity.java +++ b/src/main/java/com/gmail/nossr50/datatypes/treasure/Rarity.java @@ -12,7 +12,7 @@ public enum Rarity { COMMON; public static @NotNull Rarity getRarity(@NotNull String string) { - if(string.equalsIgnoreCase("Records")) { + if (string.equalsIgnoreCase("Records")) { mcMMO.p.getLogger().severe("Entries in fishing treasures have Records set as rarity, however Records was renamed to Mythic. Please update your treasures to read MYTHIC instead of RECORDS for rarity, or delete the config file to regenerate a new one."); return Rarity.MYTHIC; //People that copy paste their configs will have Records interpretted as Mythic } diff --git a/src/main/java/com/gmail/nossr50/events/experience/McMMOPlayerExperienceEvent.java b/src/main/java/com/gmail/nossr50/events/experience/McMMOPlayerExperienceEvent.java index 44ad7d078..f278143cd 100644 --- a/src/main/java/com/gmail/nossr50/events/experience/McMMOPlayerExperienceEvent.java +++ b/src/main/java/com/gmail/nossr50/events/experience/McMMOPlayerExperienceEvent.java @@ -30,7 +30,7 @@ public abstract class McMMOPlayerExperienceEvent extends PlayerEvent implements super(player); this.skill = skill; - if(UserManager.getPlayer(player) != null) { + if (UserManager.getPlayer(player) != null) { this.skillLevel = UserManager.getPlayer(player).getSkillLevel(skill); } else { this.skillLevel = 0; diff --git a/src/main/java/com/gmail/nossr50/listeners/BlockListener.java b/src/main/java/com/gmail/nossr50/listeners/BlockListener.java index 3b3e3ba7e..5e6ea6a78 100644 --- a/src/main/java/com/gmail/nossr50/listeners/BlockListener.java +++ b/src/main/java/com/gmail/nossr50/listeners/BlockListener.java @@ -50,8 +50,8 @@ public class BlockListener implements Listener { public void onBlockDropItemEvent(BlockDropItemEvent event) { //Make sure we clean up metadata on these blocks - if(event.isCancelled()) { - if(event.getBlock().hasMetadata(MetadataConstants.METADATA_KEY_BONUS_DROPS)) + if (event.isCancelled()) { + if (event.getBlock().hasMetadata(MetadataConstants.METADATA_KEY_BONUS_DROPS)) event.getBlock().removeMetadata(MetadataConstants.METADATA_KEY_BONUS_DROPS, plugin); return; } @@ -59,7 +59,7 @@ public class BlockListener implements Listener { int tileEntityTolerance = 1; // beetroot hotfix, potentially other plants may need this fix - if(event.getBlockState().getType() == Material.BEETROOTS) + if (event.getBlockState().getType() == Material.BEETROOTS) tileEntityTolerance = 2; //Track how many "things" are being dropped @@ -72,34 +72,34 @@ public class BlockListener implements Listener { uniqueMaterials.add(item.getItemStack().getType()); //Count blocks as a second failsafe - if(item.getItemStack().getType().isBlock()) + if (item.getItemStack().getType().isBlock()) blockCount++; } - if(uniqueMaterials.size() > tileEntityTolerance) { + if (uniqueMaterials.size() > tileEntityTolerance) { //Too many things are dropping, assume tile entities might be duped //Technically this would also prevent something like coal from being bonus dropped if you placed a TE above a coal ore when mining it but that's pretty edge case and this is a good solution for now dontRewardTE = true; } //If there are more than one block in the item list we can't really trust it and will back out of rewarding bonus drops - if(blockCount <= 1) { + if (blockCount <= 1) { for(Item item : event.getItems()) { ItemStack is = new ItemStack(item.getItemStack()); - if(is.getAmount() <= 0) + if (is.getAmount() <= 0) continue; //TODO: Ignore this abomination its rewritten in 2.2 - if(!mcMMO.p.getGeneralConfig().getDoubleDropsEnabled(PrimarySkillType.MINING, is.getType()) + if (!mcMMO.p.getGeneralConfig().getDoubleDropsEnabled(PrimarySkillType.MINING, is.getType()) && !mcMMO.p.getGeneralConfig().getDoubleDropsEnabled(PrimarySkillType.HERBALISM, is.getType()) && !mcMMO.p.getGeneralConfig().getDoubleDropsEnabled(PrimarySkillType.WOODCUTTING, is.getType())) continue; //If we suspect TEs might be duped only reward block - if(dontRewardTE) { - if(!is.getType().isBlock()) { + if (dontRewardTE) { + if (!is.getType().isBlock()) { continue; } } @@ -115,7 +115,7 @@ public class BlockListener implements Listener { } } - if(event.getBlock().hasMetadata(MetadataConstants.METADATA_KEY_BONUS_DROPS)) + if (event.getBlock().hasMetadata(MetadataConstants.METADATA_KEY_BONUS_DROPS)) event.getBlock().removeMetadata(MetadataConstants.METADATA_KEY_BONUS_DROPS, plugin); } @@ -127,10 +127,10 @@ public class BlockListener implements Listener { @EventHandler(priority = EventPriority.MONITOR, ignoreCancelled = true) public void onBlockPistonExtend(BlockPistonExtendEvent event) { /* WORLD BLACKLIST CHECK */ - if(WorldBlacklist.isWorldBlacklisted(event.getBlock().getWorld())) + if (WorldBlacklist.isWorldBlacklisted(event.getBlock().getWorld())) return; - if(!ExperienceConfig.getInstance().isPistonCheatingPrevented()) { + if (!ExperienceConfig.getInstance().isPistonCheatingPrevented()) { return; } @@ -155,10 +155,10 @@ public class BlockListener implements Listener { @EventHandler(priority = EventPriority.MONITOR, ignoreCancelled = true) public void onBlockPistonRetract(BlockPistonRetractEvent event) { /* WORLD BLACKLIST CHECK */ - if(WorldBlacklist.isWorldBlacklisted(event.getBlock().getWorld())) + if (WorldBlacklist.isWorldBlacklisted(event.getBlock().getWorld())) return; - if(!ExperienceConfig.getInstance().isPistonCheatingPrevented()) { + if (!ExperienceConfig.getInstance().isPistonCheatingPrevented()) { return; } @@ -167,12 +167,12 @@ public class BlockListener implements Listener { Block movedBlock = event.getBlock().getRelative(direction); //Spigot makes bad things happen in its API - if(BlockUtils.isWithinWorldBounds(movedBlock)) { + if (BlockUtils.isWithinWorldBounds(movedBlock)) { BlockUtils.setUnnaturalBlock(movedBlock); } for (Block block : event.getBlocks()) { - if(BlockUtils.isWithinWorldBounds(block) && BlockUtils.isWithinWorldBounds(block.getRelative(direction))) { + if (BlockUtils.isWithinWorldBounds(block) && BlockUtils.isWithinWorldBounds(block.getRelative(direction))) { Block relativeBlock = block.getRelative(direction); BlockUtils.setUnnaturalBlock(relativeBlock); } @@ -189,15 +189,15 @@ public class BlockListener implements Listener { public void onEntityBlockFormEvent(EntityBlockFormEvent event) { /* WORLD BLACKLIST CHECK */ - if(WorldBlacklist.isWorldBlacklisted(event.getBlock().getWorld())) + if (WorldBlacklist.isWorldBlacklisted(event.getBlock().getWorld())) return; BlockState blockState = event.getNewState(); - if(ExperienceConfig.getInstance().isSnowExploitPrevented() && BlockUtils.shouldBeWatched(blockState)) { + if (ExperienceConfig.getInstance().isSnowExploitPrevented() && BlockUtils.shouldBeWatched(blockState)) { Block block = blockState.getBlock(); - if(BlockUtils.isWithinWorldBounds(block)) { + if (BlockUtils.isWithinWorldBounds(block)) { BlockUtils.setUnnaturalBlock(block); } } @@ -212,15 +212,15 @@ public class BlockListener implements Listener { World world = event.getBlock().getWorld(); /* WORLD BLACKLIST CHECK */ - if(WorldBlacklist.isWorldBlacklisted(world)) + if (WorldBlacklist.isWorldBlacklisted(world)) return; - if(ExperienceConfig.getInstance().preventStoneLavaFarming()) { + if (ExperienceConfig.getInstance().preventStoneLavaFarming()) { BlockState newState = event.getNewState(); - if(newState.getType() != Material.OBSIDIAN && ExperienceConfig.getInstance().doesBlockGiveSkillXP(PrimarySkillType.MINING, newState.getBlockData())) { + if (newState.getType() != Material.OBSIDIAN && ExperienceConfig.getInstance().doesBlockGiveSkillXP(PrimarySkillType.MINING, newState.getBlockData())) { Block block = newState.getBlock(); - if(BlockUtils.isWithinWorldBounds(block)) { + if (BlockUtils.isWithinWorldBounds(block)) { BlockUtils.setUnnaturalBlock(block); } } @@ -241,11 +241,11 @@ public class BlockListener implements Listener { // if (!Tag.LOGS.isTagged(event.getBlockReplacedState().getType()) || !Tag.LOGS.isTagged(event.getBlockPlaced().getType())) /* WORLD BLACKLIST CHECK */ - if(WorldBlacklist.isWorldBlacklisted(block.getWorld())) { + if (WorldBlacklist.isWorldBlacklisted(block.getWorld())) { return; } - if(BlockUtils.isWithinWorldBounds(block)) { + if (BlockUtils.isWithinWorldBounds(block)) { //NOTE: BlockMultiPlace has its own logic so don't handle anything that would overlap if (!(event instanceof BlockMultiPlaceEvent)) { BlockUtils.setUnnaturalBlock(block); @@ -261,7 +261,7 @@ public class BlockListener implements Listener { McMMOPlayer mcMMOPlayer = UserManager.getPlayer(player); - if(mcMMOPlayer == null) + if (mcMMOPlayer == null) return; if (blockState.getType() == Repair.anvilMaterial && mcMMO.p.getSkillTools().doesPlayerHaveSkillPermission(player, PrimarySkillType.REPAIR)) { @@ -284,10 +284,10 @@ public class BlockListener implements Listener { Block block = blockState.getBlock(); /* Check if the blocks placed should be monitored so they do not give out XP in the future */ - if(BlockUtils.isWithinWorldBounds(block)) { + if (BlockUtils.isWithinWorldBounds(block)) { //Updated: 10/5/2021 //Note: For some reason Azalea trees trigger this event but no other tree does (as of 10/5/2021) but if this changes in the future we may need to update this - if(BlockUtils.isPartOfTree(event.getBlockPlaced())) { + if (BlockUtils.isPartOfTree(event.getBlockPlaced())) { return; } @@ -305,11 +305,11 @@ public class BlockListener implements Listener { World world = block.getWorld(); /* WORLD BLACKLIST CHECK */ - if(WorldBlacklist.isWorldBlacklisted(world)) + if (WorldBlacklist.isWorldBlacklisted(world)) return; // Minecraft is dumb, the events still throw when a plant "grows" higher than the max block height. Even though no new block is created - if(BlockUtils.isWithinWorldBounds(block)) { + if (BlockUtils.isWithinWorldBounds(block)) { mcMMO.getPlaceStore().setFalse(block); } } @@ -328,15 +328,15 @@ public class BlockListener implements Listener { return; } - if(WorldBlacklist.isWorldBlacklisted(block.getWorld())) { + if (WorldBlacklist.isWorldBlacklisted(block.getWorld())) { BlockUtils.cleanupBlockMetadata(block); return; } /* WORLD GUARD MAIN FLAG CHECK */ - if(WorldGuardUtils.isWorldGuardLoaded()) + if (WorldGuardUtils.isWorldGuardLoaded()) { - if(!WorldGuardManager.getInstance().hasMainFlag(event.getPlayer())) { + if (!WorldGuardManager.getInstance().hasMainFlag(event.getPlayer())) { BlockUtils.cleanupBlockMetadata(block); return; } @@ -364,7 +364,7 @@ public class BlockListener implements Listener { McMMOPlayer mcMMOPlayer = UserManager.getPlayer(player); //Check if profile is loaded - if(mcMMOPlayer == null) { + if (mcMMOPlayer == null) { /* Remove metadata from placed watched blocks */ BlockUtils.cleanupBlockMetadata(block); @@ -442,17 +442,17 @@ public class BlockListener implements Listener { */ @EventHandler(priority = EventPriority.HIGHEST, ignoreCancelled = true) public void onBlockBreakHigher(BlockBreakEvent event) { - if(event instanceof FakeEvent) + if (event instanceof FakeEvent) return; /* WORLD BLACKLIST CHECK */ - if(WorldBlacklist.isWorldBlacklisted(event.getBlock().getWorld())) + if (WorldBlacklist.isWorldBlacklisted(event.getBlock().getWorld())) return; /* WORLD GUARD MAIN FLAG CHECK */ - if(WorldGuardUtils.isWorldGuardLoaded()) + if (WorldGuardUtils.isWorldGuardLoaded()) { - if(!WorldGuardManager.getInstance().hasMainFlag(event.getPlayer())) + if (!WorldGuardManager.getInstance().hasMainFlag(event.getPlayer())) return; } @@ -463,7 +463,7 @@ public class BlockListener implements Listener { } //Profile not loaded - if(UserManager.getPlayer(player) == null) + if (UserManager.getPlayer(player) == null) { return; } @@ -509,13 +509,13 @@ public class BlockListener implements Listener { BlockState blockState = event.getBlock().getState(); /* WORLD BLACKLIST CHECK */ - if(WorldBlacklist.isWorldBlacklisted(event.getBlock().getWorld())) + if (WorldBlacklist.isWorldBlacklisted(event.getBlock().getWorld())) return; /* WORLD GUARD MAIN FLAG CHECK */ - if(WorldGuardUtils.isWorldGuardLoaded()) + if (WorldGuardUtils.isWorldGuardLoaded()) { - if(!WorldGuardManager.getInstance().hasMainFlag(event.getPlayer())) + if (!WorldGuardManager.getInstance().hasMainFlag(event.getPlayer())) return; } @@ -529,7 +529,7 @@ public class BlockListener implements Listener { McMMOPlayer mcMMOPlayer = UserManager.getPlayer(player); //Profile not loaded - if(mcMMOPlayer == null) + if (mcMMOPlayer == null) { return; } @@ -560,11 +560,11 @@ public class BlockListener implements Listener { || BlockUtils.affectedByBlockCracker(blockState) && Permissions.berserk(player))) { mcMMOPlayer.checkAbilityActivation(PrimarySkillType.UNARMED); - if(mcMMOPlayer.getAbilityMode(SuperAbilityType.BERSERK)) { + if (mcMMOPlayer.getAbilityMode(SuperAbilityType.BERSERK)) { if (SuperAbilityType.BERSERK.blockCheck(blockState) && EventUtils.simulateBlockBreak(blockState.getBlock(), player)) { event.setInstaBreak(true); - if(blockState.getType().getKey().getKey().contains("glass")) { + if (blockState.getType().getKey().getKey().contains("glass")) { SoundManager.worldSendSound(player.getWorld(), blockState.getLocation(), SoundType.GLASS); } else { SoundManager.sendSound(player, blockState.getLocation(), SoundType.POP); @@ -592,13 +592,13 @@ public class BlockListener implements Listener { @EventHandler(priority = EventPriority.HIGHEST, ignoreCancelled = true) public void onBlockDamageHigher(BlockDamageEvent event) { /* WORLD BLACKLIST CHECK */ - if(WorldBlacklist.isWorldBlacklisted(event.getBlock().getWorld())) + if (WorldBlacklist.isWorldBlacklisted(event.getBlock().getWorld())) return; /* WORLD GUARD MAIN FLAG CHECK */ - if(WorldGuardUtils.isWorldGuardLoaded()) + if (WorldGuardUtils.isWorldGuardLoaded()) { - if(!WorldGuardManager.getInstance().hasMainFlag(event.getPlayer())) + if (!WorldGuardManager.getInstance().hasMainFlag(event.getPlayer())) return; } @@ -615,7 +615,7 @@ public class BlockListener implements Listener { McMMOPlayer mcMMOPlayer = UserManager.getPlayer(player); //Profile not loaded - if(UserManager.getPlayer(player) == null) + if (UserManager.getPlayer(player) == null) { return; } @@ -643,7 +643,7 @@ public class BlockListener implements Listener { else if (!event.getInstaBreak() && SuperAbilityType.BERSERK.blockCheck(blockState) && EventUtils.simulateBlockBreak(block, player)) { event.setInstaBreak(true); - if(blockState.getType().getKey().getKey().contains("glass")) { + if (blockState.getType().getKey().getKey().contains("glass")) { SoundManager.worldSendSound(player.getWorld(), block.getLocation(), SoundType.GLASS); } else { SoundManager.sendSound(player, block.getLocation(), SoundType.POP); @@ -662,7 +662,7 @@ public class BlockListener implements Listener { McMMOPlayer mcMMOPlayer = UserManager.getPlayer(player); //Profile not loaded - if(UserManager.getPlayer(player) == null) + if (UserManager.getPlayer(player) == null) { return; } @@ -680,14 +680,14 @@ public class BlockListener implements Listener { //TODO: Convert into locale strings private void debugStickDump(Player player, BlockState blockState) { //Profile not loaded - if(UserManager.getPlayer(player) == null) + if (UserManager.getPlayer(player) == null) { return; } - if(UserManager.getPlayer(player).isDebugMode()) + if (UserManager.getPlayer(player).isDebugMode()) { - if(mcMMO.getPlaceStore().isTrue(blockState)) + if (mcMMO.getPlaceStore().isTrue(blockState)) player.sendMessage("[mcMMO DEBUG] This block is not natural and does not reward treasures/XP"); else { @@ -695,24 +695,24 @@ public class BlockListener implements Listener { UserManager.getPlayer(player).getExcavationManager().printExcavationDebug(player, blockState); } - if(WorldGuardUtils.isWorldGuardLoaded()) + if (WorldGuardUtils.isWorldGuardLoaded()) { - if(WorldGuardManager.getInstance().hasMainFlag(player)) + if (WorldGuardManager.getInstance().hasMainFlag(player)) player.sendMessage("[mcMMO DEBUG] World Guard main flag is permitted for this player in this region"); else player.sendMessage("[mcMMO DEBUG] World Guard main flag is DENIED for this player in this region"); - if(WorldGuardManager.getInstance().hasXPFlag(player)) + if (WorldGuardManager.getInstance().hasXPFlag(player)) player.sendMessage("[mcMMO DEBUG] World Guard xp flag is permitted for this player in this region"); else player.sendMessage("[mcMMO DEBUG] World Guard xp flag is not permitted for this player in this region"); } - if(blockState instanceof Furnace || blockState instanceof BrewingStand) { - if(ContainerMetadataUtils.isContainerOwned(blockState)) { + if (blockState instanceof Furnace || blockState instanceof BrewingStand) { + if (ContainerMetadataUtils.isContainerOwned(blockState)) { player.sendMessage("[mcMMO DEBUG] This container has a registered owner"); final OfflinePlayer furnacePlayer = ContainerMetadataUtils.getContainerOwner(blockState); - if(furnacePlayer != null) { + if (furnacePlayer != null) { player.sendMessage("[mcMMO DEBUG] This container is owned by player "+furnacePlayer.getName()); } } @@ -720,7 +720,7 @@ public class BlockListener implements Listener { player.sendMessage("[mcMMO DEBUG] This container does not have a registered owner"); } - if(ExperienceConfig.getInstance().isExperienceBarsEnabled()) + if (ExperienceConfig.getInstance().isExperienceBarsEnabled()) player.sendMessage("[mcMMO DEBUG] XP bars are enabled, however you should check per-skill settings to make sure those are enabled."); player.sendMessage(ChatColor.RED+"You can turn this debug info off by typing "+ChatColor.GOLD+"/mmodebug"); diff --git a/src/main/java/com/gmail/nossr50/listeners/EntityListener.java b/src/main/java/com/gmail/nossr50/listeners/EntityListener.java index 9bad702f2..5e3002a15 100644 --- a/src/main/java/com/gmail/nossr50/listeners/EntityListener.java +++ b/src/main/java/com/gmail/nossr50/listeners/EntityListener.java @@ -63,12 +63,12 @@ public class EntityListener implements Listener { @EventHandler(priority = EventPriority.MONITOR) public void onEntityTransform(EntityTransformEvent event) { - if(event.getEntity() instanceof LivingEntity livingEntity) { + if (event.getEntity() instanceof LivingEntity livingEntity) { //Transfer metadata keys from mob-spawned mobs to new mobs - if(hasMobFlags(livingEntity)) { + if (hasMobFlags(livingEntity)) { for(Entity entity : event.getTransformedEntities()) { - if(entity instanceof LivingEntity transformedEntity) { + if (entity instanceof LivingEntity transformedEntity) { addMobFlags(livingEntity, transformedEntity); } } @@ -78,21 +78,21 @@ public class EntityListener implements Listener { @EventHandler(priority = EventPriority.MONITOR, ignoreCancelled = true) public void onEntityTargetEntity(EntityTargetLivingEntityEvent event) { - if(!ExperienceConfig.getInstance().isEndermanEndermiteFarmingPrevented()) + if (!ExperienceConfig.getInstance().isEndermanEndermiteFarmingPrevented()) return; //It's rare but targets can be null sometimes - if(event.getTarget() == null) + if (event.getTarget() == null) { return; } //Prevent entities from giving XP if they target endermite - if(event.getTarget() instanceof Endermite) + if (event.getTarget() instanceof Endermite) { - if(event.getEntity() instanceof Enderman enderman) { + if (event.getEntity() instanceof Enderman enderman) { - if(!hasMobFlag(MobMetaFlagType.EXPLOITED_ENDERMEN, enderman)) { + if (!hasMobFlag(MobMetaFlagType.EXPLOITED_ENDERMEN, enderman)) { flagMetadata(MobMetaFlagType.EXPLOITED_ENDERMEN, enderman); } } @@ -102,10 +102,10 @@ public class EntityListener implements Listener { @EventHandler(priority = EventPriority.MONITOR, ignoreCancelled = false) public void onEntityShootBow(EntityShootBowEvent event) { /* WORLD BLACKLIST CHECK */ - if(WorldBlacklist.isWorldBlacklisted(event.getEntity().getWorld())) + if (WorldBlacklist.isWorldBlacklisted(event.getEntity().getWorld())) return; - if(event.getEntity() instanceof Player player) + if (event.getEntity() instanceof Player player) { Entity projectile = event.getProjectile(); @@ -135,35 +135,35 @@ public class EntityListener implements Listener { @EventHandler(priority = EventPriority.MONITOR, ignoreCancelled = true) public void onProjectileLaunch(ProjectileLaunchEvent event) { /* WORLD BLACKLIST CHECK */ - if(WorldBlacklist.isWorldBlacklisted(event.getEntity().getWorld())) + if (WorldBlacklist.isWorldBlacklisted(event.getEntity().getWorld())) return; - if(event.getEntity().getShooter() instanceof Player player) + if (event.getEntity().getShooter() instanceof Player player) { /* WORLD GUARD MAIN FLAG CHECK */ - if(WorldGuardUtils.isWorldGuardLoaded()) { - if(!WorldGuardManager.getInstance().hasMainFlag(player)) + if (WorldGuardUtils.isWorldGuardLoaded()) { + if (!WorldGuardManager.getInstance().hasMainFlag(player)) return; } - if(event.getEntity() instanceof Arrow arrow) { + if (event.getEntity() instanceof Arrow arrow) { // Delayed metadata cleanup in case other cleanup hooks fail CombatUtils.delayArrowMetaCleanup(arrow); // If fired from an item with multi-shot, we need to track - if(ItemUtils.doesPlayerHaveEnchantmentInHands(player, "multishot")) { + if (ItemUtils.doesPlayerHaveEnchantmentInHands(player, "multishot")) { arrow.setMetadata(MetadataConstants.METADATA_KEY_MULTI_SHOT_ARROW, MetadataConstants.MCMMO_METADATA_VALUE); } - if(!arrow.hasMetadata(MetadataConstants.METADATA_KEY_BOW_FORCE)) + if (!arrow.hasMetadata(MetadataConstants.METADATA_KEY_BOW_FORCE)) arrow.setMetadata(MetadataConstants.METADATA_KEY_BOW_FORCE, new FixedMetadataValue(pluginRef, 1.0)); - if(!arrow.hasMetadata(MetadataConstants.METADATA_KEY_ARROW_DISTANCE)) + if (!arrow.hasMetadata(MetadataConstants.METADATA_KEY_ARROW_DISTANCE)) arrow.setMetadata(MetadataConstants.METADATA_KEY_ARROW_DISTANCE, new FixedMetadataValue(pluginRef, arrow.getLocation())); //Check both hands - if(ItemUtils.doesPlayerHaveEnchantmentInHands(player, "piercing")) { + if (ItemUtils.doesPlayerHaveEnchantmentInHands(player, "piercing")) { return; } @@ -183,7 +183,7 @@ public class EntityListener implements Listener { @EventHandler(priority = EventPriority.MONITOR, ignoreCancelled = true) public void onEntityChangeBlock(EntityChangeBlockEvent event) { /* WORLD BLACKLIST CHECK */ - if(WorldBlacklist.isWorldBlacklisted(event.getEntity().getWorld())) + if (WorldBlacklist.isWorldBlacklisted(event.getEntity().getWorld())) return; Block block = event.getBlock(); @@ -232,16 +232,16 @@ public class EntityListener implements Listener { @EventHandler(priority = EventPriority.HIGHEST, ignoreCancelled = true) public void onEntityCombustByEntityEvent(EntityCombustByEntityEvent event) { //Prevent players from setting fire to each other if they are in the same party - if(event.getEntity() instanceof Player defender) { + if (event.getEntity() instanceof Player defender) { - if(event.getCombuster() instanceof Projectile projectile) { - if(projectile.getShooter() instanceof Player attacker) { - if(checkIfInPartyOrSamePlayer(event, defender, attacker)) { + if (event.getCombuster() instanceof Projectile projectile) { + if (projectile.getShooter() instanceof Player attacker) { + if (checkIfInPartyOrSamePlayer(event, defender, attacker)) { event.setCancelled(true); } } - } else if(event.getCombuster() instanceof Player attacker) { - if(checkIfInPartyOrSamePlayer(event, defender, attacker)) { + } else if (event.getCombuster() instanceof Player attacker) { + if (checkIfInPartyOrSamePlayer(event, defender, attacker)) { event.setCancelled(true); } } @@ -266,18 +266,18 @@ public class EntityListener implements Listener { Entity defender = event.getEntity(); Entity attacker = event.getDamager(); - if(WorldGuardUtils.isWorldGuardLoaded()) + if (WorldGuardUtils.isWorldGuardLoaded()) { - if(attacker instanceof Player) { + if (attacker instanceof Player) { - if(!WorldGuardManager.getInstance().hasMainFlag((Player) attacker)) { + if (!WorldGuardManager.getInstance().hasMainFlag((Player) attacker)) { return; } - } else if(attacker instanceof Projectile projectile) { + } else if (attacker instanceof Projectile projectile) { - if(projectile.getShooter() instanceof Player) { - if(!WorldGuardManager.getInstance().hasMainFlag((Player) projectile.getShooter())) { + if (projectile.getShooter() instanceof Player) { + if (!WorldGuardManager.getInstance().hasMainFlag((Player) projectile.getShooter())) { return; } } @@ -286,7 +286,7 @@ public class EntityListener implements Listener { } /* WORLD BLACKLIST CHECK */ - if(WorldBlacklist.isWorldBlacklisted(event.getEntity().getWorld())) { + if (WorldBlacklist.isWorldBlacklisted(event.getEntity().getWorld())) { return; } @@ -335,8 +335,8 @@ public class EntityListener implements Listener { //Friendly fire checks if (defender instanceof Player defendingPlayer) { //If the attacker is a Player or a projectile belonging to a player - if(attacker instanceof Projectile projectile) { - if(projectile.getShooter() instanceof Player attackingPlayer && !attackingPlayer.equals(defendingPlayer)) { + if (attacker instanceof Projectile projectile) { + if (projectile.getShooter() instanceof Player attackingPlayer && !attackingPlayer.equals(defendingPlayer)) { //Check for friendly fire and cancel the event if (checkIfInPartyOrSamePlayer(event, defendingPlayer, attackingPlayer)) { return; @@ -362,9 +362,9 @@ public class EntityListener implements Listener { } //Required setup for processCombatAttack - if(attacker instanceof Projectile) { + if (attacker instanceof Projectile) { ProjectileSource shooter = ((Projectile) attacker).getShooter(); - if(shooter instanceof LivingEntity) { + if (shooter instanceof LivingEntity) { attacker = (LivingEntity) shooter; } } @@ -378,8 +378,8 @@ public class EntityListener implements Listener { * Surprising this kind of thing * */ - if(mcMMO.isProjectKorraEnabled()) { - if(event.getFinalDamage() == 0) { + if (mcMMO.isProjectKorraEnabled()) { + if (event.getFinalDamage() == 0) { return; } } @@ -390,22 +390,22 @@ public class EntityListener implements Listener { @EventHandler(priority = EventPriority.MONITOR, ignoreCancelled = false) public void onEntityDamageMonitor(EntityDamageByEntityEvent entityDamageEvent) { - if(entityDamageEvent.getEntity() instanceof LivingEntity livingEntity) { + if (entityDamageEvent.getEntity() instanceof LivingEntity livingEntity) { - if(entityDamageEvent.getFinalDamage() >= livingEntity.getHealth()) { + if (entityDamageEvent.getFinalDamage() >= livingEntity.getHealth()) { //This sets entity names back to whatever they are supposed to be CombatUtils.fixNames(livingEntity); } } - if(entityDamageEvent.getDamager() instanceof Arrow arrow) { + if (entityDamageEvent.getDamager() instanceof Arrow arrow) { CombatUtils.delayArrowMetaCleanup(arrow); } - if(entityDamageEvent.getEntity() instanceof Player player && entityDamageEvent.getDamager() instanceof Player) { + if (entityDamageEvent.getEntity() instanceof Player player && entityDamageEvent.getDamager() instanceof Player) { McMMOPlayer mmoPlayer = UserManager.getPlayer(player); - if(mmoPlayer != null) { - if(mmoPlayer.isDebugMode()) { + if (mmoPlayer != null) { + if (mmoPlayer.isDebugMode()) { player.sendMessage(ChatColor.GOLD + "(mmodebug start of combat report) EntityDamageByEntityEvent DEBUG Info:"); player.sendMessage("You are being damaged by another player in this event"); player.sendMessage("Raw Damage: " + entityDamageEvent.getDamage()); @@ -419,7 +419,7 @@ public class EntityListener implements Listener { player.sendMessage("Final damage: " + entityDamageEvent.getFinalDamage()); - if(entityDamageEvent.isCancelled()) { + if (entityDamageEvent.isCancelled()) { player.sendMessage("Event was cancelled, which means no damage should be done."); } @@ -428,10 +428,10 @@ public class EntityListener implements Listener { } } - if(entityDamageEvent.getDamager() instanceof Player player && entityDamageEvent.getEntity() instanceof Player otherPlayer) { + if (entityDamageEvent.getDamager() instanceof Player player && entityDamageEvent.getEntity() instanceof Player otherPlayer) { McMMOPlayer mmoPlayer = UserManager.getPlayer(player); - if(mmoPlayer != null) { - if(mmoPlayer.isDebugMode()) { + if (mmoPlayer != null) { + if (mmoPlayer.isDebugMode()) { player.sendMessage(ChatColor.GOLD + "(mmodebug start of combat report) EntityDamageByEntityEvent DEBUG Info:"); player.sendMessage("You are dealing damage to another player in this event"); player.sendMessage("Raw Damage: " + entityDamageEvent.getDamage()); @@ -445,7 +445,7 @@ public class EntityListener implements Listener { player.sendMessage("Target players max health: "+otherPlayer.getAttribute(Attribute.GENERIC_MAX_HEALTH).getValue()); player.sendMessage("Target players current health: "+otherPlayer.getHealth()); - if(entityDamageEvent.isCancelled()) { + if (entityDamageEvent.isCancelled()) { player.sendMessage("Event was cancelled, which means no damage should be done."); } @@ -461,7 +461,7 @@ public class EntityListener implements Listener { return true; } - if(!pluginRef.isPartySystemEnabled()) { + if (!pluginRef.isPartySystemEnabled()) { return false; } @@ -470,7 +470,7 @@ public class EntityListener implements Listener { } //Party Friendly Fire - if(!mcMMO.p.getGeneralConfig().getPartyFriendlyFire()) + if (!mcMMO.p.getGeneralConfig().getPartyFriendlyFire()) if ((mcMMO.p.getPartyManager().inSameParty(defendingPlayer, attackingPlayer) || mcMMO.p.getPartyManager().areAllies(defendingPlayer, attackingPlayer)) && !(Permissions.friendlyFire(attackingPlayer) @@ -490,19 +490,19 @@ public class EntityListener implements Listener { @EventHandler(priority = EventPriority.HIGHEST, ignoreCancelled = true) public void onEntityDamage(EntityDamageEvent event) { /* WORLD BLACKLIST CHECK */ - if(WorldBlacklist.isWorldBlacklisted(event.getEntity().getWorld())) + if (WorldBlacklist.isWorldBlacklisted(event.getEntity().getWorld())) return; - if(event.getEntity().hasMetadata(MetadataConstants.METADATA_KEY_EXPLOSION_FROM_RUPTURE)) { + if (event.getEntity().hasMetadata(MetadataConstants.METADATA_KEY_EXPLOSION_FROM_RUPTURE)) { event.getEntity().removeMetadata(MetadataConstants.METADATA_KEY_EXPLOSION_FROM_RUPTURE, mcMMO.p); } - if(event.getEntity() instanceof Player player) + if (event.getEntity() instanceof Player player) { /* WORLD GUARD MAIN FLAG CHECK */ - if(WorldGuardUtils.isWorldGuardLoaded()) + if (WorldGuardUtils.isWorldGuardLoaded()) { - if(!WorldGuardManager.getInstance().hasMainFlag(player)) + if (!WorldGuardManager.getInstance().hasMainFlag(player)) return; } } @@ -559,7 +559,7 @@ public class EntityListener implements Listener { McMMOPlayer mcMMOPlayer = UserManager.getPlayer(player); //Profile not loaded - if(mcMMOPlayer == null) + if (mcMMOPlayer == null) return; /* Check for invincibility */ @@ -577,12 +577,12 @@ public class EntityListener implements Listener { else if (livingEntity instanceof Tameable pet) { AnimalTamer owner = pet.getOwner(); - if(owner instanceof Player player) + if (owner instanceof Player player) { /* WORLD GUARD MAIN FLAG CHECK */ - if(WorldGuardUtils.isWorldGuardLoaded()) + if (WorldGuardUtils.isWorldGuardLoaded()) { - if(!WorldGuardManager.getInstance().hasMainFlag(player)) + if (!WorldGuardManager.getInstance().hasMainFlag(player)) return; } } @@ -592,7 +592,7 @@ public class EntityListener implements Listener { Wolf wolf = (Wolf) pet; //Profile not loaded - if(UserManager.getPlayer(player) == null) + if (UserManager.getPlayer(player) == null) { return; } @@ -679,12 +679,12 @@ public class EntityListener implements Listener { public void onEntityDeath(EntityDeathEvent event) { LivingEntity entity = event.getEntity(); - if(mcMMO.getTransientEntityTracker().isTransientSummon(entity)) { + if (mcMMO.getTransientEntityTracker().isTransientSummon(entity)) { mcMMO.getTransientEntityTracker().removeSummon(entity, null, false); } /* WORLD BLACKLIST CHECK */ - if(WorldBlacklist.isWorldBlacklisted(event.getEntity().getWorld())) { + if (WorldBlacklist.isWorldBlacklisted(event.getEntity().getWorld())) { return; } @@ -704,7 +704,7 @@ public class EntityListener implements Listener { @EventHandler(priority = EventPriority.MONITOR) public void onCreatureSpawn(CreatureSpawnEvent event) { /* WORLD BLACKLIST CHECK */ - if(WorldBlacklist.isWorldBlacklisted(event.getEntity().getWorld())) + if (WorldBlacklist.isWorldBlacklisted(event.getEntity().getWorld())) return; LivingEntity livingEntity = event.getEntity(); @@ -732,7 +732,7 @@ public class EntityListener implements Listener { flagMetadata(mobMetaFlagType, livingEntity); for(Entity passenger : livingEntity.getPassengers()) { - if(passenger != null) { + if (passenger != null) { flagMetadata(mobMetaFlagType, livingEntity); } } @@ -740,8 +740,8 @@ public class EntityListener implements Listener { @EventHandler(ignoreCancelled = true, priority = EventPriority.HIGHEST) public void onEntityBreed(EntityBreedEvent event) { - if(ExperienceConfig.getInstance().isCOTWBreedingPrevented()) { - if(hasMobFlag(MobMetaFlagType.COTW_SUMMONED_MOB, event.getFather()) || hasMobFlag(MobMetaFlagType.COTW_SUMMONED_MOB, event.getMother())) { + if (ExperienceConfig.getInstance().isCOTWBreedingPrevented()) { + if (hasMobFlag(MobMetaFlagType.COTW_SUMMONED_MOB, event.getFather()) || hasMobFlag(MobMetaFlagType.COTW_SUMMONED_MOB, event.getMother())) { event.setCancelled(true); Animals mom = (Animals) event.getMother(); Animals father = (Animals) event.getFather(); @@ -751,7 +751,7 @@ public class EntityListener implements Listener { father.setLoveModeTicks(0); //Inform the player - if(event.getBreeder() instanceof Player player) { + if (event.getBreeder() instanceof Player player) { NotificationManager.sendPlayerInformationChatOnly(player, "Taming.Summon.COTW.BreedingDisallowed"); } } @@ -767,7 +767,7 @@ public class EntityListener implements Listener { @EventHandler(priority = EventPriority.HIGHEST, ignoreCancelled = true) public void onExplosionPrime(ExplosionPrimeEvent event) { /* WORLD BLACKLIST CHECK */ - if(WorldBlacklist.isWorldBlacklisted(event.getEntity().getWorld())) + if (WorldBlacklist.isWorldBlacklisted(event.getEntity().getWorld())) return; Entity entity = event.getEntity(); @@ -785,15 +785,15 @@ public class EntityListener implements Listener { } //Profile not loaded - if(UserManager.getPlayer(player) == null) + if (UserManager.getPlayer(player) == null) { return; } /* WORLD GUARD MAIN FLAG CHECK */ - if(WorldGuardUtils.isWorldGuardLoaded()) + if (WorldGuardUtils.isWorldGuardLoaded()) { - if(!WorldGuardManager.getInstance().hasMainFlag(player)) + if (!WorldGuardManager.getInstance().hasMainFlag(player)) return; } @@ -813,7 +813,7 @@ public class EntityListener implements Listener { @EventHandler(priority = EventPriority.HIGHEST, ignoreCancelled = true) public void onEnitityExplode(EntityExplodeEvent event) { /* WORLD BLACKLIST CHECK */ - if(WorldBlacklist.isWorldBlacklisted(event.getEntity().getWorld())) + if (WorldBlacklist.isWorldBlacklisted(event.getEntity().getWorld())) return; Entity entity = event.getEntity(); @@ -831,14 +831,14 @@ public class EntityListener implements Listener { } /* WORLD GUARD MAIN FLAG CHECK */ - if(WorldGuardUtils.isWorldGuardLoaded()) + if (WorldGuardUtils.isWorldGuardLoaded()) { - if(!WorldGuardManager.getInstance().hasMainFlag(player)) + if (!WorldGuardManager.getInstance().hasMainFlag(player)) return; } //Profile not loaded - if(UserManager.getPlayer(player) == null) + if (UserManager.getPlayer(player) == null) { return; } @@ -860,7 +860,7 @@ public class EntityListener implements Listener { @EventHandler(priority = EventPriority.LOW, ignoreCancelled = true) public void onFoodLevelChange(FoodLevelChangeEvent event) { /* WORLD BLACKLIST CHECK */ - if(WorldBlacklist.isWorldBlacklisted(event.getEntity().getWorld())) + if (WorldBlacklist.isWorldBlacklisted(event.getEntity().getWorld())) return; Entity entity = event.getEntity(); @@ -870,15 +870,15 @@ public class EntityListener implements Listener { } //Profile not loaded - if(UserManager.getPlayer(player) == null) + if (UserManager.getPlayer(player) == null) { return; } /* WORLD GUARD MAIN FLAG CHECK */ - if(WorldGuardUtils.isWorldGuardLoaded()) + if (WorldGuardUtils.isWorldGuardLoaded()) { - if(!WorldGuardManager.getInstance().hasMainFlag(player)) + if (!WorldGuardManager.getInstance().hasMainFlag(player)) return; } @@ -898,9 +898,9 @@ public class EntityListener implements Listener { //The main hand is used over the off hand if they both have food, so check the main hand first Material foodInHand; - if(mcMMO.getMaterialMapStore().isFood(player.getInventory().getItemInMainHand().getType())) { + if (mcMMO.getMaterialMapStore().isFood(player.getInventory().getItemInMainHand().getType())) { foodInHand = player.getInventory().getItemInMainHand().getType(); - } else if(mcMMO.getMaterialMapStore().isFood(player.getInventory().getItemInOffHand().getType())) { + } else if (mcMMO.getMaterialMapStore().isFood(player.getInventory().getItemInOffHand().getType())) { foodInHand = player.getInventory().getItemInOffHand().getType(); } else { return; //Not Food @@ -913,7 +913,7 @@ public class EntityListener implements Listener { */ //Hacky 1.17 support - if(foodInHand.getKey().getKey().equalsIgnoreCase("glow_berries")) { + if (foodInHand.getKey().getKey().equalsIgnoreCase("glow_berries")) { if (Permissions.isSubSkillEnabled(player, SubSkillType.HERBALISM_FARMERS_DIET)) { event.setFoodLevel(UserManager.getPlayer(player).getHerbalismManager().farmersDiet(newFoodLevel)); } @@ -984,7 +984,7 @@ public class EntityListener implements Listener { @EventHandler(priority = EventPriority.MONITOR, ignoreCancelled = true) public void onEntityTame(EntityTameEvent event) { /* WORLD BLACKLIST CHECK */ - if(WorldBlacklist.isWorldBlacklisted(event.getEntity().getWorld())) + if (WorldBlacklist.isWorldBlacklisted(event.getEntity().getWorld())) return; if (event instanceof FakeEntityTameEvent) { @@ -994,9 +994,9 @@ public class EntityListener implements Listener { Player player = (Player) event.getOwner(); /* WORLD GUARD MAIN FLAG CHECK */ - if(WorldGuardUtils.isWorldGuardLoaded()) + if (WorldGuardUtils.isWorldGuardLoaded()) { - if(!WorldGuardManager.getInstance().hasMainFlag(player)) + if (!WorldGuardManager.getInstance().hasMainFlag(player)) return; } @@ -1012,7 +1012,7 @@ public class EntityListener implements Listener { flagMetadata(MobMetaFlagType.PLAYER_TAMED_MOB, livingEntity); //Profile not loaded - if(UserManager.getPlayer(player) == null) + if (UserManager.getPlayer(player) == null) { return; } @@ -1029,7 +1029,7 @@ public class EntityListener implements Listener { @EventHandler(priority = EventPriority.HIGHEST, ignoreCancelled = true) public void onEntityTarget(EntityTargetEvent event) { /* WORLD BLACKLIST CHECK */ - if(WorldBlacklist.isWorldBlacklisted(event.getEntity().getWorld())) + if (WorldBlacklist.isWorldBlacklisted(event.getEntity().getWorld())) return; Entity entity = event.getEntity(); @@ -1040,9 +1040,9 @@ public class EntityListener implements Listener { } /* WORLD GUARD MAIN FLAG CHECK */ - if(WorldGuardUtils.isWorldGuardLoaded()) + if (WorldGuardUtils.isWorldGuardLoaded()) { - if(!WorldGuardManager.getInstance().hasMainFlag(player)) + if (!WorldGuardManager.getInstance().hasMainFlag(player)) return; } @@ -1068,7 +1068,7 @@ public class EntityListener implements Listener { @EventHandler(priority = EventPriority.MONITOR, ignoreCancelled = true) public void onPotionSplash(PotionSplashEvent event) { /* WORLD BLACKLIST CHECK */ - if(WorldBlacklist.isWorldBlacklisted(event.getEntity().getWorld())) + if (WorldBlacklist.isWorldBlacklisted(event.getEntity().getWorld())) return; ItemMeta meta = event.getPotion().getItem().getItemMeta(); @@ -1095,8 +1095,8 @@ public class EntityListener implements Listener { if (WorldBlacklist.isWorldBlacklisted(event.getEntity().getWorld())) return; - if(event.getEntity() instanceof Arrow arrow) { - if(arrow.isShotFromCrossbow()) { + if (event.getEntity() instanceof Arrow arrow) { + if (arrow.isShotFromCrossbow()) { Crossbows.processCrossbows(event, pluginRef, arrow); } } diff --git a/src/main/java/com/gmail/nossr50/listeners/InteractionManager.java b/src/main/java/com/gmail/nossr50/listeners/InteractionManager.java index 348ba2af0..6bc7cca44 100644 --- a/src/main/java/com/gmail/nossr50/listeners/InteractionManager.java +++ b/src/main/java/com/gmail/nossr50/listeners/InteractionManager.java @@ -19,13 +19,13 @@ public class InteractionManager { public static void initMaps() { /* INIT MAPS */ - if(interactRegister == null) + if (interactRegister == null) interactRegister = new HashMap<>(); - if(subSkillList == null) + if (subSkillList == null) subSkillList = new ArrayList<>(); - if(subSkillNameMap == null) + if (subSkillNameMap == null) subSkillNameMap = new HashMap<>(); } @@ -36,7 +36,7 @@ public class InteractionManager { public static void registerSubSkill(AbstractSubSkill abstractSubSkill) { //Store a unique copy of each subskill - if(!subSkillList.contains(abstractSubSkill)) + if (!subSkillList.contains(abstractSubSkill)) subSkillList.add(abstractSubSkill); //Init ArrayList @@ -75,7 +75,7 @@ public class InteractionManager { */ public static void processEvent(Event event, mcMMO plugin, InteractType curInteractType) { - if(interactRegister.get(curInteractType) == null) + if (interactRegister.get(curInteractType) == null) return; for(Interaction interaction : interactRegister.get(curInteractType)) diff --git a/src/main/java/com/gmail/nossr50/listeners/InventoryListener.java b/src/main/java/com/gmail/nossr50/listeners/InventoryListener.java index 08dfb6c4a..9da7a0605 100644 --- a/src/main/java/com/gmail/nossr50/listeners/InventoryListener.java +++ b/src/main/java/com/gmail/nossr50/listeners/InventoryListener.java @@ -42,7 +42,7 @@ public class InventoryListener implements Listener { @EventHandler(priority = EventPriority.HIGHEST, ignoreCancelled = true) public void onFurnaceBurnEvent(FurnaceBurnEvent event) { /* WORLD BLACKLIST CHECK */ - if(WorldBlacklist.isWorldBlacklisted(event.getBlock().getWorld())) + if (WorldBlacklist.isWorldBlacklisted(event.getBlock().getWorld())) return; Block furnaceBlock = event.getBlock(); @@ -57,7 +57,7 @@ public class InventoryListener implements Listener { OfflinePlayer offlinePlayer = ContainerMetadataUtils.getContainerOwner(furnace); Player player; - if(offlinePlayer != null && offlinePlayer.isOnline() && offlinePlayer instanceof Player) { + if (offlinePlayer != null && offlinePlayer.isOnline() && offlinePlayer instanceof Player) { player = (Player) offlinePlayer; if (!Permissions.isSubSkillEnabled(player, SubSkillType.SMELTING_FUEL_EFFICIENCY)) { @@ -66,10 +66,10 @@ public class InventoryListener implements Listener { McMMOPlayer mmoPlayer = UserManager.getPlayer(player); - if(mmoPlayer != null) { + if (mmoPlayer != null) { boolean debugMode = mmoPlayer.isDebugMode(); - if(debugMode) { + if (debugMode) { player.sendMessage("FURNACE FUEL EFFICIENCY DEBUG REPORT"); player.sendMessage("Furnace - "+furnace.hashCode()); player.sendMessage("Furnace Type: "+furnaceBlock.getType()); @@ -78,7 +78,7 @@ public class InventoryListener implements Listener { event.setBurnTime(mmoPlayer.getSmeltingManager().fuelEfficiency(event.getBurnTime())); - if(debugMode) { + if (debugMode) { player.sendMessage("New Furnace Burn Length (after applying fuel efficiency) "+event.getBurnTime()); player.sendMessage(""); } @@ -89,7 +89,7 @@ public class InventoryListener implements Listener { @EventHandler(priority = EventPriority.HIGHEST, ignoreCancelled = true) public void onFurnaceSmeltEvent(FurnaceSmeltEvent event) { /* WORLD BLACKLIST CHECK */ - if(WorldBlacklist.isWorldBlacklisted(event.getBlock().getWorld())) + if (WorldBlacklist.isWorldBlacklisted(event.getBlock().getWorld())) return; BlockState blockState = event.getBlock().getState(); //Furnaces can only be cast from a BlockState not a Block @@ -99,15 +99,15 @@ public class InventoryListener implements Listener { return; } - if(blockState instanceof Furnace furnace) { + if (blockState instanceof Furnace furnace) { OfflinePlayer offlinePlayer = ContainerMetadataUtils.getContainerOwner(furnace); - if(offlinePlayer != null) { + if (offlinePlayer != null) { McMMOPlayer offlineProfile = UserManager.getOfflinePlayer(offlinePlayer); //Profile doesn't exist - if(offlineProfile != null) { + if (offlineProfile != null) { //Process smelting offlineProfile.getSmeltingManager().smeltProcessing(event, furnace); } @@ -118,7 +118,7 @@ public class InventoryListener implements Listener { @EventHandler(priority = EventPriority.HIGHEST, ignoreCancelled = true) public void onFurnaceExtractEvent(FurnaceExtractEvent event) { /* WORLD BLACKLIST CHECK */ - if(WorldBlacklist.isWorldBlacklisted(event.getPlayer().getWorld())) + if (WorldBlacklist.isWorldBlacklisted(event.getPlayer().getWorld())) return; BlockState furnaceBlock = event.getBlock().getState(); @@ -129,11 +129,11 @@ public class InventoryListener implements Listener { Player player = event.getPlayer(); - if(furnaceBlock instanceof Furnace) { + if (furnaceBlock instanceof Furnace) { /* WORLD GUARD MAIN FLAG CHECK */ - if(WorldGuardUtils.isWorldGuardLoaded()) + if (WorldGuardUtils.isWorldGuardLoaded()) { - if(!WorldGuardManager.getInstance().hasMainFlag(player)) + if (!WorldGuardManager.getInstance().hasMainFlag(player)) return; } @@ -142,7 +142,7 @@ public class InventoryListener implements Listener { } //Profile not loaded - if(UserManager.getPlayer(player) == null) + if (UserManager.getPlayer(player) == null) { return; } @@ -156,11 +156,11 @@ public class InventoryListener implements Listener { @EventHandler(priority = EventPriority.NORMAL, ignoreCancelled = true) public void onInventoryClickEventNormal(InventoryClickEvent event) { /* WORLD BLACKLIST CHECK */ - if(WorldBlacklist.isWorldBlacklisted(event.getWhoClicked().getWorld())) + if (WorldBlacklist.isWorldBlacklisted(event.getWhoClicked().getWorld())) return; //We should never care to do processing if the player clicks outside the window -// if(isOutsideWindowClick(event)) +// if (isOutsideWindowClick(event)) // return; Inventory inventory = event.getInventory(); @@ -168,12 +168,12 @@ public class InventoryListener implements Listener { Player player = ((Player) event.getWhoClicked()).getPlayer(); McMMOPlayer mmoPlayer = UserManager.getPlayer(player); - if(event.getInventory() instanceof FurnaceInventory furnaceInventory) { + if (event.getInventory() instanceof FurnaceInventory furnaceInventory) { //Switch owners ContainerMetadataUtils.processContainerOwnership(furnaceInventory.getHolder(), player); } - if(event.getInventory() instanceof BrewerInventory brewerInventory) { + if (event.getInventory() instanceof BrewerInventory brewerInventory) { // switch owners ContainerMetadataUtils.processContainerOwnership(brewerInventory.getHolder(), player); } @@ -196,9 +196,9 @@ public class InventoryListener implements Listener { // TODO: Investigate why this WG check is all the way down here? /* WORLD GUARD MAIN FLAG CHECK */ - if(WorldGuardUtils.isWorldGuardLoaded()) + if (WorldGuardUtils.isWorldGuardLoaded()) { - if(!WorldGuardManager.getInstance().hasMainFlag(player)) + if (!WorldGuardManager.getInstance().hasMainFlag(player)) return; } @@ -291,7 +291,7 @@ public class InventoryListener implements Listener { @EventHandler(priority = EventPriority.NORMAL, ignoreCancelled = true) public void onInventoryDragEvent(InventoryDragEvent event) { /* WORLD BLACKLIST CHECK */ - if(WorldBlacklist.isWorldBlacklisted(event.getWhoClicked().getWorld())) + if (WorldBlacklist.isWorldBlacklisted(event.getWhoClicked().getWorld())) return; Inventory inventory = event.getInventory(); @@ -323,9 +323,9 @@ public class InventoryListener implements Listener { Player player = (Player) whoClicked; /* WORLD GUARD MAIN FLAG CHECK */ - if(WorldGuardUtils.isWorldGuardLoaded()) + if (WorldGuardUtils.isWorldGuardLoaded()) { - if(!WorldGuardManager.getInstance().hasMainFlag(player)) + if (!WorldGuardManager.getInstance().hasMainFlag(player)) return; } @@ -345,7 +345,7 @@ public class InventoryListener implements Listener { public void onBrew(BrewEvent event) { /* WORLD BLACKLIST CHECK */ - if(WorldBlacklist.isWorldBlacklisted(event.getBlock().getWorld())) + if (WorldBlacklist.isWorldBlacklisted(event.getBlock().getWorld())) return; if (event instanceof FakeBrewEvent) @@ -361,7 +361,7 @@ public class InventoryListener implements Listener { // @EventHandler(priority = EventPriority.LOWEST, ignoreCancelled = true) // public void onBrewStart(BrewingStartEvent event) { // /* WORLD BLACKLIST CHECK */ -// if(WorldBlacklist.isWorldBlacklisted(event.getBlock().getWorld())) +// if (WorldBlacklist.isWorldBlacklisted(event.getBlock().getWorld())) // return; // // if (event instanceof FakeEvent) @@ -372,8 +372,8 @@ public class InventoryListener implements Listener { public void onInventoryMoveItemEvent(InventoryMoveItemEvent event) { /* WORLD BLACKLIST CHECK */ - if(event.getSource().getLocation() != null) - if(WorldBlacklist.isWorldBlacklisted(event.getSource().getLocation().getWorld())) + if (event.getSource().getLocation() != null) + if (WorldBlacklist.isWorldBlacklisted(event.getSource().getLocation().getWorld())) return; final Inventory inventory = event.getDestination(); @@ -416,19 +416,19 @@ public class InventoryListener implements Listener { @EventHandler(priority = EventPriority.MONITOR, ignoreCancelled = true) public void onInventoryClickEvent(InventoryClickEvent event) { - if(event.getCurrentItem() == null) { + if (event.getCurrentItem() == null) { return; } SkillUtils.removeAbilityBuff(event.getCurrentItem()); if (event.getAction() == InventoryAction.HOTBAR_SWAP) { - if(isOutsideWindowClick(event)) + if (isOutsideWindowClick(event)) return; PlayerInventory playerInventory = event.getWhoClicked().getInventory(); - if(playerInventory.getItem(event.getHotbarButton()) != null) + if (playerInventory.getItem(event.getHotbarButton()) != null) SkillUtils.removeAbilityBuff(playerInventory.getItem(event.getHotbarButton())); } } @@ -441,7 +441,7 @@ public class InventoryListener implements Listener { @EventHandler(priority = EventPriority.MONITOR, ignoreCancelled = true) public void onCraftItem(CraftItemEvent event) { /* WORLD BLACKLIST CHECK */ - if(WorldBlacklist.isWorldBlacklisted(event.getWhoClicked().getWorld())) + if (WorldBlacklist.isWorldBlacklisted(event.getWhoClicked().getWorld())) return; final HumanEntity whoClicked = event.getWhoClicked(); @@ -460,9 +460,9 @@ public class InventoryListener implements Listener { Player player = (Player) whoClicked; /* WORLD GUARD MAIN FLAG CHECK */ - if(WorldGuardUtils.isWorldGuardLoaded()) + if (WorldGuardUtils.isWorldGuardLoaded()) { - if(!WorldGuardManager.getInstance().hasMainFlag(player)) + if (!WorldGuardManager.getInstance().hasMainFlag(player)) return; } diff --git a/src/main/java/com/gmail/nossr50/listeners/PlayerListener.java b/src/main/java/com/gmail/nossr50/listeners/PlayerListener.java index ab1526382..28a321f88 100644 --- a/src/main/java/com/gmail/nossr50/listeners/PlayerListener.java +++ b/src/main/java/com/gmail/nossr50/listeners/PlayerListener.java @@ -71,13 +71,13 @@ public class PlayerListener implements Listener { @EventHandler(priority = EventPriority.MONITOR, ignoreCancelled = true) public void onPlayerTeleport(PlayerTeleportEvent event) { /* WORLD BLACKLIST CHECK */ - if(WorldBlacklist.isWorldBlacklisted(event.getPlayer().getWorld())) { + if (WorldBlacklist.isWorldBlacklisted(event.getPlayer().getWorld())) { //Remove scoreboards - if(mcMMO.p.getGeneralConfig().getScoreboardsEnabled()) { + if (mcMMO.p.getGeneralConfig().getScoreboardsEnabled()) { ScoreboardManager.teardownPlayer(event.getPlayer()); } return; - } else if(WorldBlacklist.isWorldBlacklisted(event.getFrom().getWorld()) && mcMMO.p.getGeneralConfig().getScoreboardsEnabled()) { + } else if (WorldBlacklist.isWorldBlacklisted(event.getFrom().getWorld()) && mcMMO.p.getGeneralConfig().getScoreboardsEnabled()) { //This only fires if they are travelling to a non-blacklisted world from a blacklisted world //Setup scoreboards @@ -87,9 +87,9 @@ public class PlayerListener implements Listener { Player player = event.getPlayer(); /* WORLD GUARD MAIN FLAG CHECK */ - if(WorldGuardUtils.isWorldGuardLoaded()) + if (WorldGuardUtils.isWorldGuardLoaded()) { - if(!WorldGuardManager.getInstance().hasMainFlag(player)) + if (!WorldGuardManager.getInstance().hasMainFlag(player)) return; } @@ -98,7 +98,7 @@ public class PlayerListener implements Listener { } //Profile not loaded - if(UserManager.getPlayer(player) == null) + if (UserManager.getPlayer(player) == null) { return; } @@ -164,7 +164,7 @@ public class PlayerListener implements Listener { @EventHandler(priority = EventPriority.MONITOR, ignoreCancelled = true) public void onPlayerDeathMonitor(PlayerDeathEvent event) { /* WORLD BLACKLIST CHECK */ - if(WorldBlacklist.isWorldBlacklisted(event.getEntity().getWorld())) + if (WorldBlacklist.isWorldBlacklisted(event.getEntity().getWorld())) return; boolean statLossEnabled = HardcoreManager.isStatLossEnabled(); @@ -183,9 +183,9 @@ public class PlayerListener implements Listener { Player killer = killedPlayer.getKiller(); /* WORLD GUARD MAIN FLAG CHECK */ - if(WorldGuardUtils.isWorldGuardLoaded()) + if (WorldGuardUtils.isWorldGuardLoaded()) { - if(!WorldGuardManager.getInstance().hasMainFlag(killedPlayer)) + if (!WorldGuardManager.getInstance().hasMainFlag(killedPlayer)) return; } @@ -227,7 +227,7 @@ public class PlayerListener implements Listener { } //Profile not loaded - if(UserManager.getPlayer(player) == null) + if (UserManager.getPlayer(player) == null) { return; } @@ -250,13 +250,13 @@ public class PlayerListener implements Listener { @EventHandler(priority = EventPriority.MONITOR, ignoreCancelled = true) public void onPlayerDropItem(PlayerDropItemEvent event) { /* WORLD BLACKLIST CHECK */ - if(WorldBlacklist.isWorldBlacklisted(event.getPlayer().getWorld())) + if (WorldBlacklist.isWorldBlacklisted(event.getPlayer().getWorld())) return; /* WORLD GUARD MAIN FLAG CHECK */ - if(WorldGuardUtils.isWorldGuardLoaded()) + if (WorldGuardUtils.isWorldGuardLoaded()) { - if(!WorldGuardManager.getInstance().hasMainFlag(event.getPlayer())) + if (!WorldGuardManager.getInstance().hasMainFlag(event.getPlayer())) return; } @@ -281,15 +281,15 @@ public class PlayerListener implements Listener { @EventHandler(priority = EventPriority.HIGH, ignoreCancelled = true) public void onPlayerFishHighest(PlayerFishEvent event) { /* WORLD BLACKLIST CHECK */ - if(WorldBlacklist.isWorldBlacklisted(event.getPlayer().getWorld())) + if (WorldBlacklist.isWorldBlacklisted(event.getPlayer().getWorld())) return; Player player = event.getPlayer(); /* WORLD GUARD MAIN FLAG CHECK */ - if(WorldGuardUtils.isWorldGuardLoaded()) + if (WorldGuardUtils.isWorldGuardLoaded()) { - if(!WorldGuardManager.getInstance().hasMainFlag(player)) + if (!WorldGuardManager.getInstance().hasMainFlag(player)) return; } @@ -298,7 +298,7 @@ public class PlayerListener implements Listener { } //Profile not loaded - if(UserManager.getPlayer(player) == null) + if (UserManager.getPlayer(player) == null) { return; } @@ -308,7 +308,7 @@ public class PlayerListener implements Listener { switch (event.getState()) { case CAUGHT_FISH: //TODO Update to new API once available! Waiting for case CAUGHT_TREASURE - if(event.getCaught() != null) { + if (event.getCaught() != null) { Item fishingCatch = (Item) event.getCaught(); if (mcMMO.p.getGeneralConfig().getFishingOverrideTreasures() && @@ -329,7 +329,7 @@ public class PlayerListener implements Listener { if (Permissions.vanillaXpBoost(player, PrimarySkillType.FISHING)) { //Don't modify XP below vanilla values - if(fishingManager.handleVanillaXpBoost(event.getExpToDrop()) > 1) + if (fishingManager.handleVanillaXpBoost(event.getExpToDrop()) > 1) event.setExpToDrop(fishingManager.handleVanillaXpBoost(event.getExpToDrop())); } } @@ -367,15 +367,15 @@ public class PlayerListener implements Listener { @EventHandler(priority = EventPriority.MONITOR, ignoreCancelled = true) public void onPlayerFishMonitor(PlayerFishEvent event) { /* WORLD BLACKLIST CHECK */ - if(WorldBlacklist.isWorldBlacklisted(event.getPlayer().getWorld())) + if (WorldBlacklist.isWorldBlacklisted(event.getPlayer().getWorld())) return; Player player = event.getPlayer(); /* WORLD GUARD MAIN FLAG CHECK */ - if(WorldGuardUtils.isWorldGuardLoaded()) + if (WorldGuardUtils.isWorldGuardLoaded()) { - if(!WorldGuardManager.getInstance().hasMainFlag(player)) + if (!WorldGuardManager.getInstance().hasMainFlag(player)) return; } @@ -384,7 +384,7 @@ public class PlayerListener implements Listener { } //Profile not loaded - if(UserManager.getPlayer(player) == null) + if (UserManager.getPlayer(player) == null) { return; } @@ -393,19 +393,19 @@ public class PlayerListener implements Listener { FishingManager fishingManager = UserManager.getPlayer(player).getFishingManager(); //Track the hook - if(ExperienceConfig.getInstance().isFishingExploitingPrevented()) + if (ExperienceConfig.getInstance().isFishingExploitingPrevented()) { - if(event.getHook().getMetadata(MetadataConstants.METADATA_KEY_FISH_HOOK_REF).size() == 0) + if (event.getHook().getMetadata(MetadataConstants.METADATA_KEY_FISH_HOOK_REF).size() == 0) { fishingManager.setFishHookReference(event.getHook()); } //Spam Fishing - if(event.getState() == PlayerFishEvent.State.CAUGHT_FISH && fishingManager.isFishingTooOften()) + if (event.getState() == PlayerFishEvent.State.CAUGHT_FISH && fishingManager.isFishingTooOften()) { event.setExpToDrop(0); - if(caught instanceof Item caughtItem) + if (caught instanceof Item caughtItem) { caughtItem.remove(); } @@ -421,19 +421,19 @@ public class PlayerListener implements Listener { ItemStack inHand = player.getInventory().getItemInMainHand(); //Grab lure level - if(inHand != null + if (inHand != null && inHand.getItemMeta() != null && inHand.getType().getKey().getKey().equalsIgnoreCase("fishing_rod")) { - if(inHand.getItemMeta().hasEnchants()) { + if (inHand.getItemMeta().hasEnchants()) { for(Enchantment enchantment : inHand.getItemMeta().getEnchants().keySet()) { - if(enchantment.toString().toLowerCase().contains("lure")) { + if (enchantment.toString().toLowerCase().contains("lure")) { lureLevel = inHand.getEnchantmentLevel(enchantment); } } } // Prevent any potential odd behavior by only processing if no offhand fishing rod is present - if(!player.getInventory().getItemInOffHand().getType().getKey().getKey().equalsIgnoreCase("fishing_rod")) { + if (!player.getInventory().getItemInOffHand().getType().getKey().getKey().equalsIgnoreCase("fishing_rod")) { // In case of offhand fishing rod, don't process anything fishingManager.masterAngler(event.getHook(), lureLevel); fishingManager.setFishingTarget(); @@ -442,8 +442,8 @@ public class PlayerListener implements Listener { } return; case CAUGHT_FISH: - if(caught instanceof Item) { - if(ExperienceConfig.getInstance().isFishingExploitingPrevented()) { + if (caught instanceof Item) { + if (ExperienceConfig.getInstance().isFishingExploitingPrevented()) { fishingManager.processExploiting(event.getHook().getLocation().toVector()); @@ -482,20 +482,20 @@ public class PlayerListener implements Listener { @EventHandler(priority = EventPriority.HIGHEST, ignoreCancelled = true) public void onPlayerPickupItem(EntityPickupItemEvent event) { /* WORLD BLACKLIST CHECK */ - if(WorldBlacklist.isWorldBlacklisted(event.getEntity().getWorld())) + if (WorldBlacklist.isWorldBlacklisted(event.getEntity().getWorld())) return; - if(Misc.isNPCEntityExcludingVillagers(event.getEntity())) { + if (Misc.isNPCEntityExcludingVillagers(event.getEntity())) { return; } - if(event.getEntity() instanceof Player player) + if (event.getEntity() instanceof Player player) { /* WORLD GUARD MAIN FLAG CHECK */ - if(WorldGuardUtils.isWorldGuardLoaded()) + if (WorldGuardUtils.isWorldGuardLoaded()) { - if(!WorldGuardManager.getInstance().hasMainFlag(player)) + if (!WorldGuardManager.getInstance().hasMainFlag(player)) return; } @@ -505,7 +505,7 @@ public class PlayerListener implements Listener { //Profile not loaded McMMOPlayer mcMMOPlayer = UserManager.getPlayer(player); - if(mcMMOPlayer == null) { + if (mcMMOPlayer == null) { return; } @@ -513,7 +513,7 @@ public class PlayerListener implements Listener { ItemStack dropStack = drop.getItemStack(); //Remove tracking - if(drop.hasMetadata(MetadataConstants.METADATA_KEY_TRACKED_ARROW)) { + if (drop.hasMetadata(MetadataConstants.METADATA_KEY_TRACKED_ARROW)) { drop.removeMetadata(MetadataConstants.METADATA_KEY_TRACKED_ARROW, mcMMO.p); } @@ -566,7 +566,7 @@ public class PlayerListener implements Listener { McMMOPlayer mcMMOPlayer = UserManager.getPlayer(player); //Profile not loaded - if(mcMMOPlayer == null) { + if (mcMMOPlayer == null) { return; } @@ -618,7 +618,7 @@ public class PlayerListener implements Listener { } //Profile not loaded - if(UserManager.getPlayer(player) == null) + if (UserManager.getPlayer(player) == null) { return; } @@ -634,28 +634,28 @@ public class PlayerListener implements Listener { @EventHandler(priority = EventPriority.LOWEST, ignoreCancelled = true) public void onPlayerInteractLowest(PlayerInteractEvent event) { /* WORLD BLACKLIST CHECK */ - if(WorldBlacklist.isWorldBlacklisted(event.getPlayer().getWorld())) + if (WorldBlacklist.isWorldBlacklisted(event.getPlayer().getWorld())) return; Player player = event.getPlayer(); /* WORLD GUARD MAIN FLAG CHECK */ - if(WorldGuardUtils.isWorldGuardLoaded()) + if (WorldGuardUtils.isWorldGuardLoaded()) { - if(!WorldGuardManager.getInstance().hasMainFlag(player)) + if (!WorldGuardManager.getInstance().hasMainFlag(player)) return; } - if(event.getClickedBlock() == null) + if (event.getClickedBlock() == null) return; Block clickedBlock = event.getClickedBlock(); Material clickedBlockType = clickedBlock.getType(); //The blacklist contains interactable blocks so its a convenient filter - if(clickedBlockType == Repair.anvilMaterial || clickedBlockType == Salvage.anvilMaterial) { + if (clickedBlockType == Repair.anvilMaterial || clickedBlockType == Salvage.anvilMaterial) { event.setUseItemInHand(Event.Result.ALLOW); - if(!event.getPlayer().isSneaking() && mcMMO.getMaterialMapStore().isToolActivationBlackListed(clickedBlockType)) { + if (!event.getPlayer().isSneaking() && mcMMO.getMaterialMapStore().isToolActivationBlackListed(clickedBlockType)) { event.setUseInteractedBlock(Event.Result.DENY); } } @@ -665,7 +665,7 @@ public class PlayerListener implements Listener { } //Profile not loaded - if(UserManager.getPlayer(player) == null) + if (UserManager.getPlayer(player) == null) { return; } @@ -764,15 +764,15 @@ public class PlayerListener implements Listener { @EventHandler(priority = EventPriority.MONITOR) public void onPlayerInteractMonitor(PlayerInteractEvent event) { /* WORLD BLACKLIST CHECK */ - if(WorldBlacklist.isWorldBlacklisted(event.getPlayer().getWorld())) + if (WorldBlacklist.isWorldBlacklisted(event.getPlayer().getWorld())) return; Player player = event.getPlayer(); /* WORLD GUARD MAIN FLAG CHECK */ - if(WorldGuardUtils.isWorldGuardLoaded()) + if (WorldGuardUtils.isWorldGuardLoaded()) { - if(!WorldGuardManager.getInstance().hasMainFlag(player)) + if (!WorldGuardManager.getInstance().hasMainFlag(player)) return; } @@ -781,7 +781,7 @@ public class PlayerListener implements Listener { } //Profile not loaded - if(UserManager.getPlayer(player) == null) + if (UserManager.getPlayer(player) == null) { return; } @@ -793,12 +793,12 @@ public class PlayerListener implements Listener { ItemStack heldItem = player.getInventory().getItemInMainHand(); //Spam Fishing Detection - if(event.getAction() == Action.RIGHT_CLICK_BLOCK || event.getAction() == Action.RIGHT_CLICK_AIR) + if (event.getAction() == Action.RIGHT_CLICK_BLOCK || event.getAction() == Action.RIGHT_CLICK_AIR) { - if(ExperienceConfig.getInstance().isFishingExploitingPrevented() + if (ExperienceConfig.getInstance().isFishingExploitingPrevented() && (heldItem.getType() == Material.FISHING_ROD || player.getInventory().getItemInOffHand().getType() == Material.FISHING_ROD)) { - if(player.isInsideVehicle() && (player.getVehicle() instanceof Minecart || player.getVehicle() instanceof PoweredMinecart)) + if (player.isInsideVehicle() && (player.getVehicle() instanceof Minecart || player.getVehicle() instanceof PoweredMinecart)) { player.getVehicle().eject(); } @@ -809,12 +809,12 @@ public class PlayerListener implements Listener { switch (event.getAction()) { case RIGHT_CLICK_BLOCK: - if(player.getInventory().getItemInOffHand().getType() != Material.AIR && !player.isInsideVehicle() && !player.isSneaking()) { + if (player.getInventory().getItemInOffHand().getType() != Material.AIR && !player.isInsideVehicle() && !player.isSneaking()) { break; } //Hmm - if(event.getClickedBlock() == null) + if (event.getClickedBlock() == null) return; Block block = event.getClickedBlock(); @@ -841,7 +841,7 @@ public class PlayerListener implements Listener { HerbalismManager herbalismManager = mcMMOPlayer.getHerbalismManager(); // FakePlayerAnimationEvent fakeSwing = new FakePlayerAnimationEvent(event.getPlayer(), PlayerAnimationType.ARM_SWING); //PlayerAnimationEvent compat - if(!event.isCancelled() || event.useInteractedBlock() != Event.Result.DENY) { + if (!event.isCancelled() || event.useInteractedBlock() != Event.Result.DENY) { //TODO: Is this code to set false from bone meal even needed? I'll have to double check later. if (heldItem.getType() == Material.BONE_MEAL) { switch (blockState.getType().toString()) { @@ -859,7 +859,7 @@ public class PlayerListener implements Listener { if (herbalismManager.canGreenThumbBlock(blockState)) { //call event for Green Thumb Block - if(!EventUtils.callSubSkillBlockEvent(player, SubSkillType.HERBALISM_GREEN_THUMB, block).isCancelled()) { + if (!EventUtils.callSubSkillBlockEvent(player, SubSkillType.HERBALISM_GREEN_THUMB, block).isCancelled()) { // Bukkit.getPluginManager().callEvent(fakeSwing); player.getInventory().getItemInMainHand().setAmount(heldItem.getAmount() - 1); player.updateInventory(); @@ -870,7 +870,7 @@ public class PlayerListener implements Listener { } /* SHROOM THUMB CHECK */ else if (herbalismManager.canUseShroomThumb(blockState)) { - if(!EventUtils.callSubSkillBlockEvent(player, SubSkillType.HERBALISM_SHROOM_THUMB, block).isCancelled()) { + if (!EventUtils.callSubSkillBlockEvent(player, SubSkillType.HERBALISM_SHROOM_THUMB, block).isCancelled()) { // Bukkit.getPluginManager().callEvent(fakeSwing); event.setCancelled(true); if (herbalismManager.processShroomThumb(blockState) @@ -885,7 +885,7 @@ public class PlayerListener implements Listener { break; case RIGHT_CLICK_AIR: - if(player.getInventory().getItemInOffHand().getType() != Material.AIR && !player.isInsideVehicle() && !player.isSneaking()) { + if (player.getInventory().getItemInOffHand().getType() != Material.AIR && !player.isInsideVehicle() && !player.isSneaking()) { break; } @@ -960,9 +960,9 @@ public class PlayerListener implements Listener { return; } - if(plugin.getChatManager().isChatChannelEnabled(mcMMOPlayer.getChatChannel())) { - if(mcMMOPlayer.getChatChannel() != ChatChannel.NONE) { - if(plugin.getChatManager().isMessageAllowed(mcMMOPlayer)) { + if (plugin.getChatManager().isChatChannelEnabled(mcMMOPlayer.getChatChannel())) { + if (mcMMOPlayer.getChatChannel() != ChatChannel.NONE) { + if (plugin.getChatManager().isMessageAllowed(mcMMOPlayer)) { //If the message is allowed we cancel this event to avoid double sending messages plugin.getChatManager().processPlayerMessage(mcMMOPlayer, event.getMessage(), event.isAsynchronous()); event.setCancelled(true); diff --git a/src/main/java/com/gmail/nossr50/listeners/SelfListener.java b/src/main/java/com/gmail/nossr50/listeners/SelfListener.java index 0fe8eec9f..42303ef90 100644 --- a/src/main/java/com/gmail/nossr50/listeners/SelfListener.java +++ b/src/main/java/com/gmail/nossr50/listeners/SelfListener.java @@ -37,10 +37,10 @@ public class SelfListener implements Listener { McMMOPlayer mcMMOPlayer = UserManager.getPlayer(player); //TODO: Handle proper validation at the event level - if(mcMMOPlayer == null || !mcMMOPlayer.getProfile().isLoaded()) + if (mcMMOPlayer == null || !mcMMOPlayer.getProfile().isLoaded()) return; - if(player.isOnline()) { + if (player.isOnline()) { //Players can gain multiple levels especially during xprate events for(int i = 0; i < event.getLevelsGained(); i++) { @@ -52,7 +52,7 @@ public class SelfListener implements Listener { //Reset the delay timer RankUtils.resetUnlockDelayTimer(); - if(mcMMO.p.getGeneralConfig().getScoreboardsEnabled()) + if (mcMMO.p.getGeneralConfig().getScoreboardsEnabled()) ScoreboardManager.handleLevelUp(player, skill); } } @@ -61,8 +61,8 @@ public class SelfListener implements Listener { public void onPlayerXp(McMMOPlayerXpGainEvent event) { Player player = event.getPlayer(); - if(player.isOnline()) { - if(mcMMO.p.getGeneralConfig().getScoreboardsEnabled()) + if (player.isOnline()) { + if (mcMMO.p.getGeneralConfig().getScoreboardsEnabled()) ScoreboardManager.handleXp(player, event.getSkill()); } } @@ -70,8 +70,8 @@ public class SelfListener implements Listener { @EventHandler(priority = EventPriority.MONITOR, ignoreCancelled = true) public void onAbility(McMMOPlayerAbilityActivateEvent event) { Player player = event.getPlayer(); - if(player.isOnline()) { - if(mcMMO.p.getGeneralConfig().getScoreboardsEnabled()) + if (player.isOnline()) { + if (mcMMO.p.getGeneralConfig().getScoreboardsEnabled()) ScoreboardManager.cooldownUpdate(event.getPlayer(), event.getSkill()); } } @@ -82,30 +82,30 @@ public class SelfListener implements Listener { McMMOPlayer mcMMOPlayer = UserManager.getPlayer(player); //TODO: Handle proper validation at the event level - if(mcMMOPlayer == null || !mcMMOPlayer.getProfile().isLoaded()) + if (mcMMOPlayer == null || !mcMMOPlayer.getProfile().isLoaded()) return; PrimarySkillType primarySkillType = event.getSkill(); - if(mcMMOPlayer.isDebugMode()) { + if (mcMMOPlayer.isDebugMode()) { mcMMOPlayer.getPlayer().sendMessage(event.getSkill().toString() + " XP Gained"); mcMMOPlayer.getPlayer().sendMessage("Incoming Raw XP: "+event.getRawXpGained()); } //WorldGuard XP Check - if(event.getXpGainReason() == XPGainReason.PVE || + if (event.getXpGainReason() == XPGainReason.PVE || event.getXpGainReason() == XPGainReason.PVP || event.getXpGainReason() == XPGainReason.SHARED_PVE || event.getXpGainReason() == XPGainReason.SHARED_PVP) { - if(WorldGuardUtils.isWorldGuardLoaded()) + if (WorldGuardUtils.isWorldGuardLoaded()) { - if(!WorldGuardManager.getInstance().hasXPFlag(player)) + if (!WorldGuardManager.getInstance().hasXPFlag(player)) { event.setRawXpGained(0); event.setCancelled(true); - if(mcMMOPlayer.isDebugMode()) { + if (mcMMOPlayer.isDebugMode()) { mcMMOPlayer.getPlayer().sendMessage("No WG XP Flag - New Raw XP: "+event.getRawXpGained()); } } @@ -117,13 +117,13 @@ public class SelfListener implements Listener { return; } - if(ExperienceConfig.getInstance().isEarlyGameBoostEnabled()) + if (ExperienceConfig.getInstance().isEarlyGameBoostEnabled()) { int earlyGameBonusXP = 0; //Give some bonus XP for low levels - if(PlayerLevelUtils.qualifiesForEarlyGameBoost(mcMMOPlayer, primarySkillType)) + if (PlayerLevelUtils.qualifiesForEarlyGameBoost(mcMMOPlayer, primarySkillType)) { earlyGameBonusXP += (mcMMOPlayer.getXpToLevel(primarySkillType) * 0.05); event.setRawXpGained(event.getRawXpGained() + earlyGameBonusXP); @@ -133,7 +133,7 @@ public class SelfListener implements Listener { int threshold = ExperienceConfig.getInstance().getDiminishedReturnsThreshold(primarySkillType); if (threshold <= 0 || !ExperienceConfig.getInstance().getDiminishedReturnsEnabled()) { - if(mcMMOPlayer.isDebugMode()) { + if (mcMMOPlayer.isDebugMode()) { mcMMOPlayer.getPlayer().sendMessage("Final Raw XP: "+event.getRawXpGained()); } // Diminished returns is turned off @@ -167,7 +167,7 @@ public class SelfListener implements Listener { * Make sure players get a guaranteed minimum of XP */ //If there is no guaranteed minimum proceed, otherwise only proceed if newValue would be higher than our guaranteed minimum - if(guaranteedMinimum <= 0 || newValue > guaranteedMinimum) + if (guaranteedMinimum <= 0 || newValue > guaranteedMinimum) { if (newValue > 0) { event.setRawXpGained(newValue); @@ -181,7 +181,7 @@ public class SelfListener implements Listener { } - if(mcMMOPlayer.isDebugMode()) { + if (mcMMOPlayer.isDebugMode()) { mcMMOPlayer.getPlayer().sendMessage("Final Raw XP: "+event.getRawXpGained()); } } diff --git a/src/main/java/com/gmail/nossr50/listeners/WorldListener.java b/src/main/java/com/gmail/nossr50/listeners/WorldListener.java index 4c24930c6..aedecfea1 100644 --- a/src/main/java/com/gmail/nossr50/listeners/WorldListener.java +++ b/src/main/java/com/gmail/nossr50/listeners/WorldListener.java @@ -26,7 +26,7 @@ public class WorldListener implements Listener { @EventHandler(priority = EventPriority.MONITOR, ignoreCancelled = true) public void onStructureGrow(StructureGrowEvent event) { /* WORLD BLACKLIST CHECK */ - if(WorldBlacklist.isWorldBlacklisted(event.getWorld())) + if (WorldBlacklist.isWorldBlacklisted(event.getWorld())) return; // Using 50 ms later as I do not know of a way to run one tick later (safely) @@ -45,7 +45,7 @@ public class WorldListener implements Listener { @EventHandler(priority = EventPriority.MONITOR, ignoreCancelled = true) public void onWorldUnload(WorldUnloadEvent event) { /* WORLD BLACKLIST CHECK */ - if(WorldBlacklist.isWorldBlacklisted(event.getWorld())) + if (WorldBlacklist.isWorldBlacklisted(event.getWorld())) return; mcMMO.getPlaceStore().unloadWorld(event.getWorld()); @@ -59,7 +59,7 @@ public class WorldListener implements Listener { @EventHandler(priority = EventPriority.MONITOR, ignoreCancelled = true) public void onChunkUnload(ChunkUnloadEvent event) { /* WORLD BLACKLIST CHECK */ - if(WorldBlacklist.isWorldBlacklisted(event.getWorld())) + if (WorldBlacklist.isWorldBlacklisted(event.getWorld())) return; Chunk chunk = event.getChunk(); diff --git a/src/main/java/com/gmail/nossr50/locale/LocaleLoader.java b/src/main/java/com/gmail/nossr50/locale/LocaleLoader.java index e6a37d924..81ab06625 100644 --- a/src/main/java/com/gmail/nossr50/locale/LocaleLoader.java +++ b/src/main/java/com/gmail/nossr50/locale/LocaleLoader.java @@ -380,7 +380,7 @@ public final class LocaleLoader { * @return The message with the hex color codes translated to Minecraft color codes */ public static String translateHexColorCodes(String messageWithHex) { - if(messageWithHex == null) { + if (messageWithHex == null) { return null; } diff --git a/src/main/java/com/gmail/nossr50/mcMMO.java b/src/main/java/com/gmail/nossr50/mcMMO.java index 61df1f745..0b3fe222b 100644 --- a/src/main/java/com/gmail/nossr50/mcMMO.java +++ b/src/main/java/com/gmail/nossr50/mcMMO.java @@ -207,7 +207,7 @@ public class mcMMO extends JavaPlugin { checkModConfigs(); } - if(projectKorraEnabled) { + if (projectKorraEnabled) { getLogger().info("ProjectKorra was detected, this can cause some issues with weakness potions and combat skills for mcMMO"); } @@ -228,7 +228,7 @@ public class mcMMO extends JavaPlugin { //Check for the newer API and tell them what to do if its missing checkForOutdatedAPI(); - if(serverAPIOutdated) + if (serverAPIOutdated) { foliaLib .getImpl() @@ -237,7 +237,7 @@ public class mcMMO extends JavaPlugin { 20, 20*60*30 ); - if(platformManager.getServerSoftware() == ServerSoftwareType.CRAFT_BUKKIT) + if (platformManager.getServerSoftware() == ServerSoftwareType.CRAFT_BUKKIT) { foliaLib .getImpl() @@ -280,11 +280,11 @@ public class mcMMO extends JavaPlugin { //If anonymous statistics are enabled then use them Metrics metrics; - if(generalConfig.getIsMetricsEnabled()) { + if (generalConfig.getIsMetricsEnabled()) { metrics = new Metrics(this, 3894); metrics.addCustomChart(new SimplePie("version", () -> getDescription().getVersion())); - if(generalConfig.getIsRetroMode()) + if (generalConfig.getIsRetroMode()) metrics.addCustomChart(new SimplePie("leveling_system", () -> "Retro")); else metrics.addCustomChart(new SimplePie("leveling_system", () -> "Standard")); @@ -323,7 +323,7 @@ public class mcMMO extends JavaPlugin { transientEntityTracker = new TransientEntityTracker(); setServerShutdown(false); //Reset flag, used to make decisions about async saves - if(Bukkit.getPluginManager().getPlugin("PlaceholderAPI") != null) { + if (Bukkit.getPluginManager().getPlugin("PlaceholderAPI") != null) { new PapiExpansion().register(); } } @@ -351,7 +351,7 @@ public class mcMMO extends JavaPlugin { @Override public void onLoad() { - if(getServer().getPluginManager().getPlugin("WorldGuard") != null) { + if (getServer().getPluginManager().getPlugin("WorldGuard") != null) { WorldGuardManager.getInstance().registerFlags(); } @@ -372,11 +372,11 @@ public class mcMMO extends JavaPlugin { UserManager.saveAll(); // Make sure to save player information if the server shuts down UserManager.clearAll(); Alchemy.finishAllBrews(); // Finish all partially complete AlchemyBrewTasks to prevent vanilla brewing continuation on restart - if(partyConfig.isPartyEnabled()) + if (partyConfig.isPartyEnabled()) getPartyManager().saveParties(); // Save our parties //TODO: Needed? - if(generalConfig.getScoreboardsEnabled()) + if (generalConfig.getScoreboardsEnabled()) ScoreboardManager.teardownAll(); formulaManager.saveFormula(); @@ -615,7 +615,7 @@ public class mcMMO extends JavaPlugin { InteractionManager.initMaps(); //Init maps - if(CoreSkillsConfig.getInstance().isPrimarySkillEnabled(PrimarySkillType.ACROBATICS)) + if (CoreSkillsConfig.getInstance().isPrimarySkillEnabled(PrimarySkillType.ACROBATICS)) { LogUtils.debug(mcMMO.p.getLogger(), "Enabling Acrobatics Skills"); @@ -657,7 +657,7 @@ public class mcMMO extends JavaPlugin { } // Automatically remove old members from parties - if(partyConfig.isPartyEnabled()) { + if (partyConfig.isPartyEnabled()) { long kickIntervalTicks = generalConfig.getAutoPartyKickInterval() * 60L * 60L * Misc.TICK_CONVERSION_FACTOR; if (kickIntervalTicks == 0) { @@ -675,7 +675,7 @@ public class mcMMO extends JavaPlugin { getFoliaLib().getImpl().runTimer(new ClearRegisteredXPGainTask(), 60, 60); } - if(mcMMO.p.getAdvancedConfig().allowPlayerTips()) + if (mcMMO.p.getAdvancedConfig().allowPlayerTips()) { getFoliaLib().getImpl().runTimer(new NotifySquelchReminderTask(), 60, ((20 * 60) * 60)); } diff --git a/src/main/java/com/gmail/nossr50/party/PartyManager.java b/src/main/java/com/gmail/nossr50/party/PartyManager.java index beff259d2..1a6300ac5 100644 --- a/src/main/java/com/gmail/nossr50/party/PartyManager.java +++ b/src/main/java/com/gmail/nossr50/party/PartyManager.java @@ -243,7 +243,7 @@ public final class PartyManager { } final McMMOPlayer mmoPlayer = UserManager.getPlayer(player); - if(mmoPlayer == null) + if (mmoPlayer == null) return null; return mmoPlayer.getParty(); diff --git a/src/main/java/com/gmail/nossr50/party/ShareHandler.java b/src/main/java/com/gmail/nossr50/party/ShareHandler.java index 24392e6b1..77e905002 100644 --- a/src/main/java/com/gmail/nossr50/party/ShareHandler.java +++ b/src/main/java/com/gmail/nossr50/party/ShareHandler.java @@ -51,7 +51,7 @@ public final class ShareHandler { for (Player member : nearMembers) { //Profile not loaded - if(UserManager.getPlayer(member) == null) + if (UserManager.getPlayer(member) == null) { continue; } @@ -115,7 +115,7 @@ public final class ShareHandler { McMMOPlayer mcMMOMember = UserManager.getPlayer(member); //Profile not loaded - if(UserManager.getPlayer(member) == null) + if (UserManager.getPlayer(member) == null) { continue; } diff --git a/src/main/java/com/gmail/nossr50/runnables/MobDodgeMetaCleanup.java b/src/main/java/com/gmail/nossr50/runnables/MobDodgeMetaCleanup.java index 8087d3c65..cc0682910 100644 --- a/src/main/java/com/gmail/nossr50/runnables/MobDodgeMetaCleanup.java +++ b/src/main/java/com/gmail/nossr50/runnables/MobDodgeMetaCleanup.java @@ -17,7 +17,7 @@ public class MobDodgeMetaCleanup extends CancellableRunnable { @Override public void run() { - if(!mob.isValid() || mob.getTarget() == null) { + if (!mob.isValid() || mob.getTarget() == null) { mob.removeMetadata(MetadataConstants.METADATA_KEY_DODGE_TRACKER, pluginRef); this.cancel(); } else if (!mob.hasMetadata(MetadataConstants.METADATA_KEY_DODGE_TRACKER)) { diff --git a/src/main/java/com/gmail/nossr50/runnables/SaveTimerTask.java b/src/main/java/com/gmail/nossr50/runnables/SaveTimerTask.java index 613f3ecee..953c7d9ed 100644 --- a/src/main/java/com/gmail/nossr50/runnables/SaveTimerTask.java +++ b/src/main/java/com/gmail/nossr50/runnables/SaveTimerTask.java @@ -19,7 +19,7 @@ public class SaveTimerTask extends CancellableRunnable { count++; } - if(mcMMO.p.getPartyConfig().isPartyEnabled()) + if (mcMMO.p.getPartyConfig().isPartyEnabled()) mcMMO.p.getPartyManager().saveParties(); } } diff --git a/src/main/java/com/gmail/nossr50/runnables/TravelingBlockMetaCleanup.java b/src/main/java/com/gmail/nossr50/runnables/TravelingBlockMetaCleanup.java index 366fb2967..e982201dc 100644 --- a/src/main/java/com/gmail/nossr50/runnables/TravelingBlockMetaCleanup.java +++ b/src/main/java/com/gmail/nossr50/runnables/TravelingBlockMetaCleanup.java @@ -17,7 +17,7 @@ public class TravelingBlockMetaCleanup extends CancellableRunnable { @Override public void run() { - if(!entity.isValid()) { + if (!entity.isValid()) { entity.removeMetadata(MetadataConstants.METADATA_KEY_TRAVELING_BLOCK, pluginRef); this.cancel(); } else if (!entity.hasMetadata(MetadataConstants.METADATA_KEY_TRAVELING_BLOCK)) { diff --git a/src/main/java/com/gmail/nossr50/runnables/commands/MctopCommandDisplayTask.java b/src/main/java/com/gmail/nossr50/runnables/commands/MctopCommandDisplayTask.java index ed1a2f73c..7ed51f3ad 100644 --- a/src/main/java/com/gmail/nossr50/runnables/commands/MctopCommandDisplayTask.java +++ b/src/main/java/com/gmail/nossr50/runnables/commands/MctopCommandDisplayTask.java @@ -45,14 +45,14 @@ public class MctopCommandDisplayTask extends CancellableRunnable { if (sender instanceof Player) { ((Player) sender).removeMetadata(MetadataConstants.METADATA_KEY_DATABASE_COMMAND, mcMMO.p); } - if(sender instanceof Player) + if (sender instanceof Player) sender.sendMessage(LocaleLoader.getString("Commands.mctop.Tip")); } private void displayChat() { if (skill == null) { - if(sender instanceof Player) { + if (sender instanceof Player) { sender.sendMessage(LocaleLoader.getString("Commands.PowerLevel.Leaderboard")); } else { @@ -60,7 +60,7 @@ public class MctopCommandDisplayTask extends CancellableRunnable { } } else { - if(sender instanceof Player) { + if (sender instanceof Player) { sender.sendMessage(LocaleLoader.getString("Commands.Skill.Leaderboard", mcMMO.p.getSkillTools().getLocalizedSkillName(skill))); } else { @@ -74,7 +74,7 @@ public class MctopCommandDisplayTask extends CancellableRunnable { // Format: // 01. Playername - skill value // 12. Playername - skill value - if(sender instanceof Player) { + if (sender instanceof Player) { sender.sendMessage(String.format("%2d. %s%s - %s%s", place, ChatColor.GREEN, stat.name, ChatColor.WHITE, stat.statVal)); } else { diff --git a/src/main/java/com/gmail/nossr50/runnables/commands/NotifySquelchReminderTask.java b/src/main/java/com/gmail/nossr50/runnables/commands/NotifySquelchReminderTask.java index 9b9fcd6fe..b9931d44e 100644 --- a/src/main/java/com/gmail/nossr50/runnables/commands/NotifySquelchReminderTask.java +++ b/src/main/java/com/gmail/nossr50/runnables/commands/NotifySquelchReminderTask.java @@ -11,9 +11,9 @@ public class NotifySquelchReminderTask extends CancellableRunnable { @Override public void run() { for (Player player : Bukkit.getOnlinePlayers()) { - if(UserManager.getPlayer(player) != null) + if (UserManager.getPlayer(player) != null) { - if(!UserManager.getPlayer(player).useChatNotifications()) + if (!UserManager.getPlayer(player).useChatNotifications()) { player.sendMessage(LocaleLoader.getString("Reminder.Squelched")); } 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 6cd865055..e62df151f 100644 --- a/src/main/java/com/gmail/nossr50/runnables/player/PlayerProfileLoadingTask.java +++ b/src/main/java/com/gmail/nossr50/runnables/player/PlayerProfileLoadingTask.java @@ -44,7 +44,7 @@ public class PlayerProfileLoadingTask extends CancellableRunnable { PlayerProfile profile = mcMMO.getDatabaseManager().loadPlayerProfile(player); - if(!profile.isLoaded()) { + if (!profile.isLoaded()) { LogUtils.debug(mcMMO.p.getLogger(), "Creating new data for player: "+player.getName()); //Profile isn't loaded so add as new user profile = mcMMO.getDatabaseManager().newUser(player); 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 a789171e0..3e63e5a89 100644 --- a/src/main/java/com/gmail/nossr50/runnables/skills/AbilityDisableTask.java +++ b/src/main/java/com/gmail/nossr50/runnables/skills/AbilityDisableTask.java @@ -62,7 +62,7 @@ public class AbilityDisableTask extends CancellableRunnable { if (mcMMO.p.getAdvancedConfig().sendAbilityNotificationToOtherPlayers()) { SkillUtils.sendSkillMessage(player, NotificationType.SUPER_ABILITY_ALERT_OTHERS, ability.getAbilityPlayerOff()); } - if(!mcMMO.isServerShutdownExecuted()) { + if (!mcMMO.isServerShutdownExecuted()) { mcMMO.p.getFoliaLib().getImpl().runAtEntityLater(player, new AbilityCooldownTask(mcMMOPlayer, ability), (long) PerksUtils.handleCooldownPerks(player, ability.getCooldown()) * Misc.TICK_CONVERSION_FACTOR); } } 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 6ced4c66a..bd2e4ae1c 100644 --- a/src/main/java/com/gmail/nossr50/runnables/skills/AwardCombatXpTask.java +++ b/src/main/java/com/gmail/nossr50/runnables/skills/AwardCombatXpTask.java @@ -40,7 +40,7 @@ public class AwardCombatXpTask extends CancellableRunnable { damage += health; } - if(ExperienceConfig.getInstance().useCombatHPCeiling()) { + if (ExperienceConfig.getInstance().useCombatHPCeiling()) { damage = Math.min(damage, ExperienceConfig.getInstance().getCombatHPCeiling()); } diff --git a/src/main/java/com/gmail/nossr50/runnables/skills/BleedTimerTask.java b/src/main/java/com/gmail/nossr50/runnables/skills/BleedTimerTask.java index 0cb4d3d13..f67fa1e86 100644 --- a/src/main/java/com/gmail/nossr50/runnables/skills/BleedTimerTask.java +++ b/src/main/java/com/gmail/nossr50/runnables/skills/BleedTimerTask.java @@ -43,7 +43,7 @@ //// debugMessage+="RemainingTicks=["+containerEntry.getValue().bleedTicks+"], "; // // if (containerEntry.getValue().bleedTicks <= 0 || !target.isValid()) { -// if(target instanceof Player) +// if (target instanceof Player) // { // NotificationManager.sendPlayerInformation((Player) target, NotificationType.SUBSKILL_MESSAGE, "Swords.Combat.Bleeding.Stopped"); // } @@ -96,7 +96,7 @@ // //// debugMessage+="FullArmor=["+String.valueOf(armorCount > 3)+"], "; // -// if(armorCount > 3) +// if (armorCount > 3) // { // damage = damage * .75; // } @@ -104,13 +104,13 @@ //// debugMessage+="AfterRankAndArmorChecks["+damage+"], "; // // //Weapons below Diamond get damage cut in half -// if(toolTier < 4) +// if (toolTier < 4) // damage = damage / 2; // //// debugMessage+="AfterDiamondCheck=["+String.valueOf(damage)+"], "; // // //Wood weapons get damage cut in half again -// if(toolTier < 2) +// if (toolTier < 2) // damage = damage / 2; // //// debugMessage+="AfterWoodenCheck=["+String.valueOf(damage)+"], "; @@ -129,7 +129,7 @@ // //// debugMessage+="TargetHealthAfterDMG=["+String.valueOf(target.getHealth())+"], "; // -// if(victimHealthAftermath <= 0 || victimHealth != victimHealthAftermath) +// if (victimHealthAftermath <= 0 || victimHealth != victimHealthAftermath) // { // //Play Bleed Sound // SoundManager.worldSendSound(target.getWorld(), target.getLocation(), SoundType.BLEED); @@ -187,7 +187,7 @@ // throw new IllegalStateException("Cannot add bleed task async!"); // } // -// if(isIterating) { +// if (isIterating) { // //Used to throw an error here, but in reality all we are really doing is preventing concurrency issues from other plugins being naughty and its not really needed // //I'm not really a fan of silent errors, but I'm sick of seeing people using crazy enchantments come in and report this "bug" // return; @@ -195,7 +195,7 @@ // //// if (isIterating) throw new IllegalStateException("Cannot add task while iterating timers!"); // -// if(toolTier < 4) +// if (toolTier < 4) // ticks = Math.max(1, (ticks / 3)); // // ticks+=1; diff --git a/src/main/java/com/gmail/nossr50/runnables/skills/DelayedCropReplant.java b/src/main/java/com/gmail/nossr50/runnables/skills/DelayedCropReplant.java index 927e9a3f8..ecbe6e43f 100644 --- a/src/main/java/com/gmail/nossr50/runnables/skills/DelayedCropReplant.java +++ b/src/main/java/com/gmail/nossr50/runnables/skills/DelayedCropReplant.java @@ -35,7 +35,7 @@ public class DelayedCropReplant extends CancellableRunnable { public DelayedCropReplant(BlockBreakEvent blockBreakEvent, BlockState cropState, int desiredCropAge, boolean wasImmaturePlant) { BlockData cropData = cropState.getBlockData(); - if(cropData instanceof Directional cropDir) { + if (cropData instanceof Directional cropDir) { cropFace = cropDir.getFacing(); } @@ -56,13 +56,13 @@ public class DelayedCropReplant extends CancellableRunnable { //Remove the metadata marking the block as recently replanted mcMMO.p.getFoliaLib().getImpl().runAtLocationLater(blockBreakEvent.getBlock().getLocation(), new markPlantAsOld(blockBreakEvent.getBlock().getLocation()), 10); - if(blockBreakEvent.isCancelled()) { + if (blockBreakEvent.isCancelled()) { wasImmaturePlant = true; } //Two kinds of air in Minecraft - if(currentState.getType().equals(cropMaterial) || currentState.getType().equals(Material.AIR) || currentState.getType().equals(Material.CAVE_AIR)) { -// if(currentState.getBlock().getRelative(BlockFace.DOWN)) + if (currentState.getType().equals(cropMaterial) || currentState.getType().equals(Material.AIR) || currentState.getType().equals(Material.CAVE_AIR)) { +// if (currentState.getBlock().getRelative(BlockFace.DOWN)) //The space is not currently occupied by a block so we can fill it cropBlock.setType(cropMaterial); @@ -74,19 +74,19 @@ public class DelayedCropReplant extends CancellableRunnable { int age = 0; //Crop age should always be 0 if the plant was immature - if(!wasImmaturePlant) { + if (!wasImmaturePlant) { age = desiredCropAge; //Otherwise make the plant the desired age } - if(newData instanceof Directional) { + if (newData instanceof Directional) { //Cocoa Version Directional directional = (Directional) newState.getBlockData(); directional.setFacing(cropFace); newState.setBlockData(directional); - if(newData instanceof Cocoa) { + if (newData instanceof Cocoa) { plantAnchorType = PlantAnchorType.COCOA; } } @@ -119,7 +119,7 @@ public class DelayedCropReplant extends CancellableRunnable { this.plantBlock = plantBlock; this.plantAnchorType = plantAnchorType; - if(plantFace != null) { + if (plantFace != null) { this.plantFace = plantFace; } } @@ -140,8 +140,8 @@ public class DelayedCropReplant extends CancellableRunnable { private void checkPlantIntegrity(@NotNull BlockFace blockFace) { Block neighbor = plantBlock.getRelative(blockFace); - if(plantAnchorType == PlantAnchorType.COCOA) { - if(!neighbor.getType().toString().toLowerCase().contains("jungle")) { + if (plantAnchorType == PlantAnchorType.COCOA) { + if (!neighbor.getType().toString().toLowerCase().contains("jungle")) { plantBlock.breakNaturally(); } } else { @@ -171,7 +171,7 @@ public class DelayedCropReplant extends CancellableRunnable { @Override public void run() { Block cropBlock = cropLoc.getBlock(); - if(cropBlock.getMetadata(MetadataConstants.METADATA_KEY_REPLANT).size() > 0) + if (cropBlock.getMetadata(MetadataConstants.METADATA_KEY_REPLANT).size() > 0) cropBlock.setMetadata(MetadataConstants.METADATA_KEY_REPLANT, new RecentlyReplantedCropMeta(mcMMO.p, false)); } } 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 34c87b0d4..816257f96 100644 --- a/src/main/java/com/gmail/nossr50/runnables/skills/ExperienceBarHideTask.java +++ b/src/main/java/com/gmail/nossr50/runnables/skills/ExperienceBarHideTask.java @@ -30,7 +30,7 @@ public class ExperienceBarHideTask extends CancellableRunnable { */ @Override public void run() { - if(experienceBarManagerRef == null || mcMMOPlayer == null) + if (experienceBarManagerRef == null || mcMMOPlayer == null) return; experienceBarManagerRef.hideExperienceBar(primarySkillType); diff --git a/src/main/java/com/gmail/nossr50/runnables/skills/RuptureTask.java b/src/main/java/com/gmail/nossr50/runnables/skills/RuptureTask.java index 432d5a296..56dc1b406 100644 --- a/src/main/java/com/gmail/nossr50/runnables/skills/RuptureTask.java +++ b/src/main/java/com/gmail/nossr50/runnables/skills/RuptureTask.java @@ -42,15 +42,15 @@ public class RuptureTask extends CancellableRunnable { @Override public void run() { //Check validity - if(targetEntity.isValid()) { + if (targetEntity.isValid()) { ruptureTick += 1; //Advance rupture tick by 1. damageTickTracker += 1; //Increment damage tick tracker //TODO: Clean this code up, applyRupture() is a confusing name for something that returns boolean //Rupture hasn't ended yet - if(ruptureTick < expireTick) { + if (ruptureTick < expireTick) { //Is it time to damage? - if(damageTickTracker >= DAMAGE_TICK_INTERVAL) { + if (damageTickTracker >= DAMAGE_TICK_INTERVAL) { damageTickTracker = 0; //Reset timer if (applyRupture()) return; @@ -58,7 +58,7 @@ public class RuptureTask extends CancellableRunnable { playAnimation(); } } else { - if(!applyRupture()) { + if (!applyRupture()) { playAnimation(); } @@ -71,7 +71,7 @@ public class RuptureTask extends CancellableRunnable { } private void playAnimation() { - if(animationTick >= ANIMATION_TICK_INTERVAL) { + if (animationTick >= ANIMATION_TICK_INTERVAL) { ParticleEffectUtils.playBleedEffect(targetEntity); //Animate animationTick = 0; } else { @@ -114,7 +114,7 @@ public class RuptureTask extends CancellableRunnable { // // ParticleEffectUtils.playGreaterImpactEffect(targetEntity); //Animate // -// if(ruptureSource.getPlayer() != null && ruptureSource.getPlayer().isValid()) { +// if (ruptureSource.getPlayer() != null && ruptureSource.getPlayer().isValid()) { // targetEntity.damage(getExplosionDamage(), ruptureSource.getPlayer()); // } else { // targetEntity.damage(getExplosionDamage(), null); @@ -129,10 +129,10 @@ public class RuptureTask extends CancellableRunnable { private double calculateAdjustedTickDamage() { double tickDamage = pureTickDamage; - if(targetEntity.getHealth() <= tickDamage) { + if (targetEntity.getHealth() <= tickDamage) { tickDamage = targetEntity.getHealth() - 0.01; - if(tickDamage <= 0) { + if (tickDamage <= 0) { tickDamage = 0; } } 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 7ffbdbb34..a7d646df6 100644 --- a/src/main/java/com/gmail/nossr50/skills/acrobatics/AcrobaticsManager.java +++ b/src/main/java/com/gmail/nossr50/skills/acrobatics/AcrobaticsManager.java @@ -51,10 +51,10 @@ public class AcrobaticsManager extends SkillManager { public boolean canGainRollXP() { - if(!ExperienceConfig.getInstance().isAcrobaticsExploitingPrevented()) + if (!ExperienceConfig.getInstance().isAcrobaticsExploitingPrevented()) return true; - if(System.currentTimeMillis() >= rollXPCooldown) + if (System.currentTimeMillis() >= rollXPCooldown) { rollXPCooldown = System.currentTimeMillis() + rollXPInterval; rollXPIntervalLengthen = (1000 * 10); //5 Seconds @@ -67,10 +67,10 @@ public class AcrobaticsManager extends SkillManager { } public boolean canDodge(Entity damager) { - if(getPlayer().isBlocking()) + if (getPlayer().isBlocking()) return false; - if(!RankUtils.hasUnlockedSubskill(getPlayer(), SubSkillType.ACROBATICS_DODGE)) + if (!RankUtils.hasUnlockedSubskill(getPlayer(), SubSkillType.ACROBATICS_DODGE)) return false; if (Permissions.isSubSkillEnabled(getPlayer(), SubSkillType.ACROBATICS_DODGE)) { @@ -103,14 +103,14 @@ public class AcrobaticsManager extends SkillManager { } if (SkillUtils.cooldownExpired(mmoPlayer.getRespawnATS(), Misc.PLAYER_RESPAWN_COOLDOWN_SECONDS)) { - if(attacker instanceof Mob mob) { + if (attacker instanceof Mob mob) { //Check to see how many dodge XP rewards this mob has handed out - if(mob.hasMetadata(MetadataConstants.METADATA_KEY_DODGE_TRACKER) && ExperienceConfig.getInstance().isAcrobaticsExploitingPrevented()) { + if (mob.hasMetadata(MetadataConstants.METADATA_KEY_DODGE_TRACKER) && ExperienceConfig.getInstance().isAcrobaticsExploitingPrevented()) { //If Dodge XP has been handed out 5 times then consider it being exploited MetadataValue metadataValue = mob.getMetadata(MetadataConstants.METADATA_KEY_DODGE_TRACKER).get(0); int count = metadataValue.asInt(); - if(count <= 5) { + if (count <= 5) { applyXpGain((float) (damage * Acrobatics.dodgeXpModifier), XPGainReason.PVE); mob.setMetadata(MetadataConstants.METADATA_KEY_DODGE_TRACKER, new FixedMetadataValue(mcMMO.p, count + 1)); MobDodgeMetaCleanup metaCleanupTask = new MobDodgeMetaCleanup(mob, mcMMO.p); diff --git a/src/main/java/com/gmail/nossr50/skills/alchemy/AlchemyPotionBrewer.java b/src/main/java/com/gmail/nossr50/skills/alchemy/AlchemyPotionBrewer.java index 6c28f64f9..223a1dd5b 100644 --- a/src/main/java/com/gmail/nossr50/skills/alchemy/AlchemyPotionBrewer.java +++ b/src/main/java/com/gmail/nossr50/skills/alchemy/AlchemyPotionBrewer.java @@ -85,7 +85,7 @@ public final class AlchemyPotionBrewer { } private static void removeIngredient(BrewerInventory inventory, Player player) { - if(inventory.getIngredient() == null) + if (inventory.getIngredient() == null) return; ItemStack ingredient = inventory.getIngredient().clone(); @@ -137,7 +137,7 @@ public final class AlchemyPotionBrewer { } private static List getValidIngredients(@Nullable McMMOPlayer mmoPlayer) { - if(mmoPlayer == null) { + if (mmoPlayer == null) { return mcMMO.p.getPotionConfig().getIngredients(1); } @@ -202,7 +202,7 @@ public final class AlchemyPotionBrewer { // Update the brewing inventory with the new potions for (int i = 0; i < 3; i++) { - if(outputList.get(i) != null) { + if (outputList.get(i) != null) { inventory.setItem(i, outputList.get(i)); } } 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 6aef4f92a..16574621b 100644 --- a/src/main/java/com/gmail/nossr50/skills/archery/ArcheryManager.java +++ b/src/main/java/com/gmail/nossr50/skills/archery/ArcheryManager.java @@ -27,21 +27,21 @@ public class ArcheryManager extends SkillManager { } public boolean canDaze(LivingEntity target) { - if(!RankUtils.hasUnlockedSubskill(getPlayer(), SubSkillType.ARCHERY_DAZE)) + if (!RankUtils.hasUnlockedSubskill(getPlayer(), SubSkillType.ARCHERY_DAZE)) return false; return target instanceof Player && Permissions.isSubSkillEnabled(getPlayer(), SubSkillType.ARCHERY_DAZE); } public boolean canSkillShot() { - if(!RankUtils.hasUnlockedSubskill(getPlayer(), SubSkillType.ARCHERY_SKILL_SHOT)) + if (!RankUtils.hasUnlockedSubskill(getPlayer(), SubSkillType.ARCHERY_SKILL_SHOT)) return false; return Permissions.isSubSkillEnabled(getPlayer(), SubSkillType.ARCHERY_SKILL_SHOT); } public boolean canRetrieveArrows() { - if(!RankUtils.hasUnlockedSubskill(getPlayer(), SubSkillType.ARCHERY_ARROW_RETRIEVAL)) + if (!RankUtils.hasUnlockedSubskill(getPlayer(), SubSkillType.ARCHERY_ARROW_RETRIEVAL)) return false; return Permissions.isSubSkillEnabled(getPlayer(), SubSkillType.ARCHERY_ARROW_RETRIEVAL); @@ -55,13 +55,13 @@ public class ArcheryManager extends SkillManager { */ public static double distanceXpBonusMultiplier(LivingEntity target, Entity arrow) { //Hacky Fix - some plugins spawn arrows and assign them to players after the ProjectileLaunchEvent fires - if(!arrow.hasMetadata(MetadataConstants.METADATA_KEY_ARROW_DISTANCE)) + if (!arrow.hasMetadata(MetadataConstants.METADATA_KEY_ARROW_DISTANCE)) return 1; Location firedLocation = (Location) arrow.getMetadata(MetadataConstants.METADATA_KEY_ARROW_DISTANCE).get(0).value(); Location targetLocation = target.getLocation(); - if(firedLocation == null || firedLocation.getWorld() == null) + if (firedLocation == null || firedLocation.getWorld() == null) return 1; if (firedLocation.getWorld() != targetLocation.getWorld()) { @@ -77,7 +77,7 @@ public class ArcheryManager extends SkillManager { * @param target The {@link LivingEntity} damaged by the arrow */ public void retrieveArrows(LivingEntity target, Projectile projectile) { - if(projectile.hasMetadata(MetadataConstants.METADATA_KEY_TRACKED_ARROW)) { + if (projectile.hasMetadata(MetadataConstants.METADATA_KEY_TRACKED_ARROW)) { Archery.incrementTrackerValue(target); projectile.removeMetadata(MetadataConstants.METADATA_KEY_TRACKED_ARROW, mcMMO.p); //Only 1 entity per projectile } diff --git a/src/main/java/com/gmail/nossr50/skills/axes/Axes.java b/src/main/java/com/gmail/nossr50/skills/axes/Axes.java index 47d95be3f..b3eb84473 100644 --- a/src/main/java/com/gmail/nossr50/skills/axes/Axes.java +++ b/src/main/java/com/gmail/nossr50/skills/axes/Axes.java @@ -23,11 +23,11 @@ public class Axes { public static double skullSplitterModifier = mcMMO.p.getAdvancedConfig().getSkullSplitterModifier(); protected static boolean hasArmor(LivingEntity target) { - if(target == null || !target.isValid() || target.getEquipment() == null) + if (target == null || !target.isValid() || target.getEquipment() == null) return false; for (ItemStack itemStack : target.getEquipment().getArmorContents()) { - if(itemStack == null) + if (itemStack == null) continue; if (ItemUtils.isArmor(itemStack)) { 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 edabb1a52..36abb05ff 100644 --- a/src/main/java/com/gmail/nossr50/skills/axes/AxesManager.java +++ b/src/main/java/com/gmail/nossr50/skills/axes/AxesManager.java @@ -28,35 +28,35 @@ public class AxesManager extends SkillManager { } public boolean canUseAxeMastery() { - if(!RankUtils.hasUnlockedSubskill(getPlayer(), SubSkillType.AXES_AXE_MASTERY)) + if (!RankUtils.hasUnlockedSubskill(getPlayer(), SubSkillType.AXES_AXE_MASTERY)) return false; return Permissions.isSubSkillEnabled(getPlayer(), SubSkillType.AXES_AXE_MASTERY); } public boolean canCriticalHit(@NotNull LivingEntity target) { - if(!RankUtils.hasUnlockedSubskill(getPlayer(), SubSkillType.AXES_CRITICAL_STRIKES)) + if (!RankUtils.hasUnlockedSubskill(getPlayer(), SubSkillType.AXES_CRITICAL_STRIKES)) return false; return target.isValid() && Permissions.isSubSkillEnabled(getPlayer(), SubSkillType.AXES_CRITICAL_STRIKES); } public boolean canImpact(@NotNull LivingEntity target) { - if(!RankUtils.hasUnlockedSubskill(getPlayer(), SubSkillType.AXES_ARMOR_IMPACT)) + if (!RankUtils.hasUnlockedSubskill(getPlayer(), SubSkillType.AXES_ARMOR_IMPACT)) return false; return target.isValid() && Permissions.isSubSkillEnabled(getPlayer(), SubSkillType.AXES_ARMOR_IMPACT) && Axes.hasArmor(target); } public boolean canGreaterImpact(@NotNull LivingEntity target) { - if(!RankUtils.hasUnlockedSubskill(getPlayer(), SubSkillType.AXES_GREATER_IMPACT)) + if (!RankUtils.hasUnlockedSubskill(getPlayer(), SubSkillType.AXES_GREATER_IMPACT)) return false; return target.isValid() && Permissions.isSubSkillEnabled(getPlayer(), SubSkillType.AXES_GREATER_IMPACT) && !Axes.hasArmor(target); } public boolean canUseSkullSplitter(@NotNull LivingEntity target) { - if(!RankUtils.hasUnlockedSubskill(getPlayer(), SubSkillType.AXES_SKULL_SPLITTER)) + if (!RankUtils.hasUnlockedSubskill(getPlayer(), SubSkillType.AXES_SKULL_SPLITTER)) return false; return target.isValid() && mmoPlayer.getAbilityMode(SuperAbilityType.SKULL_SPLITTER) && Permissions.skullSplitter(getPlayer()); diff --git a/src/main/java/com/gmail/nossr50/skills/crossbows/Crossbows.java b/src/main/java/com/gmail/nossr50/skills/crossbows/Crossbows.java index a64b023af..1a60efd7d 100644 --- a/src/main/java/com/gmail/nossr50/skills/crossbows/Crossbows.java +++ b/src/main/java/com/gmail/nossr50/skills/crossbows/Crossbows.java @@ -31,7 +31,7 @@ public class Crossbows { } private static void processTrickShot(ProjectileHitEvent event, Plugin pluginRef, Arrow arrow, McMMOPlayer mmoPlayer) { - if(event.getHitBlock() != null && event.getHitBlockFace() != null) { + if (event.getHitBlock() != null && event.getHitBlockFace() != null) { mmoPlayer.getCrossbowsManager().handleRicochet( pluginRef, arrow, diff --git a/src/main/java/com/gmail/nossr50/skills/crossbows/CrossbowsManager.java b/src/main/java/com/gmail/nossr50/skills/crossbows/CrossbowsManager.java index 671435d98..cde03fb72 100644 --- a/src/main/java/com/gmail/nossr50/skills/crossbows/CrossbowsManager.java +++ b/src/main/java/com/gmail/nossr50/skills/crossbows/CrossbowsManager.java @@ -28,7 +28,7 @@ public class CrossbowsManager extends SkillManager { } public void handleRicochet(@NotNull Plugin pluginRef, @NotNull Arrow arrow, @NotNull Vector hitBlockNormal) { - if(!arrow.isShotFromCrossbow()) + if (!arrow.isShotFromCrossbow()) return; // Check player permission 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 3735cfb8c..eadd72fea 100644 --- a/src/main/java/com/gmail/nossr50/skills/excavation/ExcavationManager.java +++ b/src/main/java/com/gmail/nossr50/skills/excavation/ExcavationManager.java @@ -66,7 +66,7 @@ public class ExcavationManager extends SkillManager { @VisibleForTesting public void processExcavationBonusesOnBlock(BlockState blockState, ExcavationTreasure treasure, Location location) { //Spawn Vanilla XP orbs if a dice roll succeeds - if(ProbabilityUtil.isStaticSkillRNGSuccessful( + if (ProbabilityUtil.isStaticSkillRNGSuccessful( PrimarySkillType.EXCAVATION, mmoPlayer, getArchaelogyExperienceOrbChance())) { Misc.spawnExperienceOrb(location, getExperienceOrbsReward()); } 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 8274cb1dc..9037ca280 100644 --- a/src/main/java/com/gmail/nossr50/skills/fishing/FishingManager.java +++ b/src/main/java/com/gmail/nossr50/skills/fishing/FishingManager.java @@ -74,15 +74,15 @@ public class FishingManager extends SkillManager { // { // long currentTime = System.currentTimeMillis(); // //Only track spam casting if the fishing hook is fresh -// if(currentTime > fishHookSpawnTimestamp + 1000) +// if (currentTime > fishHookSpawnTimestamp + 1000) // return; // -// if(currentTime < fishingRodCastTimestamp + FISHING_ROD_CAST_CD_MILLISECONDS) +// if (currentTime < fishingRodCastTimestamp + FISHING_ROD_CAST_CD_MILLISECONDS) // { // ItemStack fishingRod = getPlayer().getInventory().getItemInMainHand(); // // //Ensure correct hand item is damaged -// if(fishingRod.getType() != Material.FISHING_ROD) { +// if (fishingRod.getType() != Material.FISHING_ROD) { // fishingRod = getPlayer().getInventory().getItemInOffHand(); // } // @@ -90,7 +90,7 @@ public class FishingManager extends SkillManager { // fishingRod.setDurability((short) (fishingRod.getDurability() + 5)); // getPlayer().updateInventory(); // -// if(lastWarnedExhaust + (1000) < currentTime) +// if (lastWarnedExhaust + (1000) < currentTime) // { // getPlayer().sendMessage(LocaleLoader.getString("Fishing.Exhausting")); // lastWarnedExhaust = currentTime; @@ -103,7 +103,7 @@ public class FishingManager extends SkillManager { public void setFishHookReference(FishHook fishHook) { - if(fishHook.getMetadata(MetadataConstants.METADATA_KEY_FISH_HOOK_REF).size() > 0) + if (fishHook.getMetadata(MetadataConstants.METADATA_KEY_FISH_HOOK_REF).size() > 0) return; fishHook.setMetadata(MetadataConstants.METADATA_KEY_FISH_HOOK_REF, MetadataConstants.MCMMO_METADATA_VALUE); @@ -119,7 +119,7 @@ public class FishingManager extends SkillManager { long fishHookSpawnCD = fishHookSpawnTimestamp + 1000; boolean hasFished = (currentTime < fishHookSpawnCD); - if(hasFished && (lastWarned + (1000) < currentTime)) + if (hasFished && (lastWarned + (1000) < currentTime)) { getPlayer().sendMessage(LocaleLoader.getString("Fishing.Scared")); lastWarned = System.currentTimeMillis(); @@ -257,7 +257,7 @@ public class FishingManager extends SkillManager { public void processMasterAngler(@NotNull FishHook fishHook, int lureLevel) { MasterAnglerCompatibilityLayer masterAnglerCompatibilityLayer = (MasterAnglerCompatibilityLayer) mcMMO.getCompatibilityManager().getMasterAnglerCompatibilityLayer(); - if(masterAnglerCompatibilityLayer != null) { + if (masterAnglerCompatibilityLayer != null) { int maxWaitTicks = masterAnglerCompatibilityLayer.getMaxWaitTime(fishHook); int minWaitTicks = masterAnglerCompatibilityLayer.getMinWaitTime(fishHook); @@ -265,7 +265,7 @@ public class FishingManager extends SkillManager { int convertedLureBonus = 0; //This avoids a Minecraft bug where lure levels above 3 break fishing - if(lureLevel > 0) { + if (lureLevel > 0) { masterAnglerCompatibilityLayer.setApplyLure(fishHook, false); convertedLureBonus = lureLevel * 100; } @@ -284,15 +284,15 @@ public class FishingManager extends SkillManager { boolean badValuesFix = false; //If we find bad values correct it - if(reducedMaxWaitTime < reducedMinWaitTime) { + if (reducedMaxWaitTime < reducedMinWaitTime) { reducedMaxWaitTime = reducedMinWaitTime + 100; badValuesFix = true; } - if(mmoPlayer.isDebugMode()) { + if (mmoPlayer.isDebugMode()) { mmoPlayer.getPlayer().sendMessage(ChatColor.GOLD + "Master Angler Debug"); - if(badValuesFix) { + if (badValuesFix) { mmoPlayer.getPlayer().sendMessage(ChatColor.RED + "Bad values were applied and corrected, check your configs, max wait should never be lower than min wait."); } @@ -301,7 +301,7 @@ public class FishingManager extends SkillManager { mmoPlayer.getPlayer().sendMessage("MAX TICK REDUCTION: " + maxWaitReduction); mmoPlayer.getPlayer().sendMessage("BOAT BONUS: " + boatBonus); - if(boatBonus) { + if (boatBonus) { mmoPlayer.getPlayer().sendMessage("BOAT MAX TICK REDUCTION: " + maxWaitReduction); mmoPlayer.getPlayer().sendMessage("BOAT MIN TICK REDUCTION: " + maxWaitReduction); } @@ -341,7 +341,7 @@ public class FishingManager extends SkillManager { public int getMasterAnglerTickMaxWaitReduction(int masterAnglerRank, boolean boatBonus, int emulatedLureBonus) { int totalBonus = mcMMO.p.getAdvancedConfig().getFishingReductionMaxWaitTicks() * masterAnglerRank; - if(boatBonus) { + if (boatBonus) { totalBonus += getFishingBoatMaxWaitReduction(); } @@ -353,7 +353,7 @@ public class FishingManager extends SkillManager { public int getMasterAnglerTickMinWaitReduction(int masterAnglerRank, boolean boatBonus) { int totalBonus = mcMMO.p.getAdvancedConfig().getFishingReductionMinWaitTicks() * masterAnglerRank; - if(boatBonus) { + if (boatBonus) { totalBonus += getFishingBoatMinWaitReduction(); } @@ -394,7 +394,7 @@ public class FishingManager extends SkillManager { } if (treasure != null) { - if(treasure instanceof FishingTreasureBook) { + if (treasure instanceof FishingTreasureBook) { treasureDrop = ItemUtils.createEnchantBook((FishingTreasureBook) treasure); } else { treasureDrop = treasure.getDrop().clone(); // Not cloning is bad, m'kay? @@ -406,9 +406,9 @@ public class FishingManager extends SkillManager { /* * Books get some special treatment */ - if(treasure instanceof FishingTreasureBook) { + if (treasure instanceof FishingTreasureBook) { //Skip the magic hunter stuff - if(treasureDrop.getItemMeta() != null) { + if (treasureDrop.getItemMeta() != null) { enchants.putAll(treasureDrop.getItemMeta().getEnchants()); } @@ -430,7 +430,7 @@ public class FishingManager extends SkillManager { fishingSucceeds = true; boolean enchanted = false; - if(treasure instanceof FishingTreasureBook) { + if (treasure instanceof FishingTreasureBook) { enchanted = true; } else if (!enchants.isEmpty()) { treasureDrop.addUnsafeEnchantments(enchants); @@ -448,7 +448,7 @@ public class FishingManager extends SkillManager { } } - if(fishingSucceeds) { + if (fishingSucceeds) { if (mcMMO.p.getGeneralConfig().getFishingExtraFish()) { Misc.spawnItem(getPlayer(), player.getEyeLocation(), fishingCatch.getItemStack(), ItemSpawnReason.FISHING_EXTRA_FISH); } 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 34c990351..b60c33b7f 100644 --- a/src/main/java/com/gmail/nossr50/skills/herbalism/HerbalismManager.java +++ b/src/main/java/com/gmail/nossr50/skills/herbalism/HerbalismManager.java @@ -51,7 +51,7 @@ public class HerbalismManager extends SkillManager { } public boolean canGreenThumbBlock(BlockState blockState) { - if(!RankUtils.hasUnlockedSubskill(getPlayer(), SubSkillType.HERBALISM_GREEN_THUMB)) + if (!RankUtils.hasUnlockedSubskill(getPlayer(), SubSkillType.HERBALISM_GREEN_THUMB)) return false; Player player = getPlayer(); @@ -61,11 +61,11 @@ public class HerbalismManager extends SkillManager { } public boolean canUseShroomThumb(BlockState blockState) { - if(!BlockUtils.canMakeShroomy(blockState)) { + if (!BlockUtils.canMakeShroomy(blockState)) { return false; } - if(!RankUtils.hasUnlockedSubskill(getPlayer(), SubSkillType.HERBALISM_SHROOM_THUMB)) + if (!RankUtils.hasUnlockedSubskill(getPlayer(), SubSkillType.HERBALISM_SHROOM_THUMB)) return false; Player player = getPlayer(); @@ -81,29 +81,29 @@ public class HerbalismManager extends SkillManager { public void processBerryBushHarvesting(@NotNull BlockState blockState) { /* Check if the player is harvesting a berry bush */ - if(blockState.getType().toString().equalsIgnoreCase("sweet_berry_bush")) { - if(mmoPlayer.isDebugMode()) { + if (blockState.getType().toString().equalsIgnoreCase("sweet_berry_bush")) { + if (mmoPlayer.isDebugMode()) { mmoPlayer.getPlayer().sendMessage("Processing sweet berry bush rewards"); } //Check the age - if(blockState.getBlockData() instanceof Ageable ageable) { + if (blockState.getBlockData() instanceof Ageable ageable) { int rewardByAge = 0; - if(ageable.getAge() == 2) { + if (ageable.getAge() == 2) { rewardByAge = 1; //Normal XP - } else if(ageable.getAge() == 3) { + } else if (ageable.getAge() == 3) { rewardByAge = 2; //Double XP } else { return; //Not old enough, back out of processing } - if(mmoPlayer.isDebugMode()) { + if (mmoPlayer.isDebugMode()) { mmoPlayer.getPlayer().sendMessage("Bush Reward Multiplier: " + rewardByAge); } int xpReward = ExperienceConfig.getInstance().getXp(PrimarySkillType.HERBALISM, blockState) * rewardByAge; - if(mmoPlayer.isDebugMode()) { + if (mmoPlayer.isDebugMode()) { mmoPlayer.getPlayer().sendMessage("Bush XP: " + xpReward); } @@ -129,10 +129,10 @@ public class HerbalismManager extends SkillManager { public void run() { BlockState blockState = block.getState(); - if(blockState.getType().toString().equalsIgnoreCase("sweet_berry_bush")) { - if(blockState.getBlockData() instanceof Ageable ageable) { + if (blockState.getType().toString().equalsIgnoreCase("sweet_berry_bush")) { + if (blockState.getBlockData() instanceof Ageable ageable) { - if(ageable.getAge() <= 1) { + if (ageable.getAge() <= 1) { applyXpGain(xpReward, XPGainReason.PVE, XPGainSource.SELF); } } @@ -142,7 +142,7 @@ public class HerbalismManager extends SkillManager { public boolean canUseHylianLuck() { - if(!RankUtils.hasUnlockedSubskill(getPlayer(), SubSkillType.HERBALISM_HYLIAN_LUCK)) + if (!RankUtils.hasUnlockedSubskill(getPlayer(), SubSkillType.HERBALISM_HYLIAN_LUCK)) return false; return Permissions.isSubSkillEnabled(getPlayer(), SubSkillType.HERBALISM_HYLIAN_LUCK); @@ -207,17 +207,17 @@ public class HerbalismManager extends SkillManager { Block block = blockBreakEvent.getBlock(); if (mcMMO.p.getGeneralConfig().getHerbalismPreventAFK() && player.isInsideVehicle()) { - if(block.hasMetadata(MetadataConstants.METADATA_KEY_REPLANT)) { + if (block.hasMetadata(MetadataConstants.METADATA_KEY_REPLANT)) { block.removeMetadata(MetadataConstants.METADATA_KEY_REPLANT, mcMMO.p); } return; } //Check if the plant was recently replanted - if(block.getBlockData() instanceof Ageable ageableCrop) { - if(block.getMetadata(MetadataConstants.METADATA_KEY_REPLANT).size() >= 1) { - if(block.getMetadata(MetadataConstants.METADATA_KEY_REPLANT).get(0).asBoolean()) { - if(isAgeableMature(ageableCrop)) { + if (block.getBlockData() instanceof Ageable ageableCrop) { + if (block.getMetadata(MetadataConstants.METADATA_KEY_REPLANT).size() >= 1) { + if (block.getMetadata(MetadataConstants.METADATA_KEY_REPLANT).get(0).asBoolean()) { + if (isAgeableMature(ageableCrop)) { block.removeMetadata(MetadataConstants.METADATA_KEY_REPLANT, mcMMO.p); } else { //Crop is recently replanted to back out of destroying it @@ -236,7 +236,7 @@ public class HerbalismManager extends SkillManager { //Grab all broken blocks HashSet brokenBlocks = getBrokenHerbalismBlocks(blockBreakEvent); - if(brokenBlocks.size() == 0) + if (brokenBlocks.size() == 0) return; //Handle rewards, xp, ability interactions, etc @@ -249,16 +249,16 @@ public class HerbalismManager extends SkillManager { * @param brokenPlants plant blocks to process */ private void processHerbalismOnBlocksBroken(BlockBreakEvent blockBreakEvent, HashSet brokenPlants) { - if(blockBreakEvent.isCancelled()) + if (blockBreakEvent.isCancelled()) return; BlockState originalBreak = blockBreakEvent.getBlock().getState(); boolean greenThumbActivated = false; //TODO: The design of Green Terra needs to change, this is a mess - if(Permissions.greenThumbPlant(getPlayer(), originalBreak.getType())) { - if(mcMMO.p.getGeneralConfig().isGreenThumbReplantableCrop(originalBreak.getType())) { - if(!getPlayer().isSneaking()) { + if (Permissions.greenThumbPlant(getPlayer(), originalBreak.getType())) { + if (mcMMO.p.getGeneralConfig().isGreenThumbReplantableCrop(originalBreak.getType())) { + if (!getPlayer().isSneaking()) { greenThumbActivated = processGreenThumbPlants(originalBreak, blockBreakEvent, isGreenTerraActive()); } } @@ -279,21 +279,21 @@ public class HerbalismManager extends SkillManager { /* * This check is to make XP bars appear to work properly with Chorus Trees by giving XP for the originalBreak immediately instead of later */ - if(brokenPlant.getLocation().equals(originalBreak.getBlock().getLocation())) { + if (brokenPlant.getLocation().equals(originalBreak.getBlock().getLocation())) { //If its the same block as the original, we are going to directly check it for being a valid XP gain and add it to the nonChorusBlocks list even if its a chorus block //This stops a delay from happening when bringing up the XP bar for chorus trees - if(!mcMMO.getPlaceStore().isTrue(originalBreak)) { + if (!mcMMO.getPlaceStore().isTrue(originalBreak)) { //Even if its a chorus block, the original break will be moved to nonChorusBlocks for immediate XP rewards noDelayPlantBlocks.add(brokenPlant); } else { - if(isChorusTree(brokenPlant.getType())) { + if (isChorusTree(brokenPlant.getType())) { //If its a chorus tree AND it was marked as true in the placestore then we add this block to the list of chorus blocks delayedChorusBlocks.add(new BlockSnapshot(brokenPlant.getType(), brokenPlant)); } else { noDelayPlantBlocks.add(brokenPlant); //If its not a chorus plant that was marked as unnatural but it was marked unnatural, put it in the nodelay list to be handled } } - } else if(isChorusTree(brokenPlant.getType())) { + } else if (isChorusTree(brokenPlant.getType())) { //Chorus Blocks get checked for XP several ticks later to avoid expensive calculations delayedChorusBlocks.add(new BlockSnapshot(brokenPlant.getType(), brokenPlant)); } else { @@ -302,12 +302,12 @@ public class HerbalismManager extends SkillManager { } //Give out XP to the non-chorus blocks - if(noDelayPlantBlocks.size() > 0) { + if (noDelayPlantBlocks.size() > 0) { //Note: Will contain 1 chorus block if the original block was a chorus block, this is to prevent delays for the XP bar awardXPForPlantBlocks(noDelayPlantBlocks); } - if(delayedChorusBlocks.size() > 0) { + if (delayedChorusBlocks.size() > 0) { //Check XP for chorus blocks DelayedHerbalismXPCheckTask delayedHerbalismXPCheckTask = new DelayedHerbalismXPCheckTask(mmoPlayer, delayedChorusBlocks); @@ -335,7 +335,7 @@ public class HerbalismManager extends SkillManager { BlockData plantData = brokenPlantState.getBlockData(); //Check for double drops - if(!mcMMO.getPlaceStore().isTrue(brokenPlant)) { + if (!mcMMO.getPlaceStore().isTrue(brokenPlant)) { /* * @@ -346,14 +346,14 @@ public class HerbalismManager extends SkillManager { */ //Not all things that are natural should give double drops, make sure its fully mature as well - if(plantData instanceof Ageable ageable) { + if (plantData instanceof Ageable ageable) { - if(isAgeableMature(ageable) || isBizarreAgeable(plantData)) { - if(checkDoubleDrop(brokenPlantState)) { + if (isAgeableMature(ageable) || isBizarreAgeable(plantData)) { + if (checkDoubleDrop(brokenPlantState)) { markForBonusDrops(brokenPlantState); } } - } else if(checkDoubleDrop(brokenPlantState)) { + } else if (checkDoubleDrop(brokenPlantState)) { //Add metadata to mark this block for double or triple drops markForBonusDrops(brokenPlantState); } @@ -366,7 +366,7 @@ public class HerbalismManager extends SkillManager { */ //If it's a Crop we need to reward XP when its fully grown - if(isAgeableAndFullyMature(plantData) && !isBizarreAgeable(plantData)) { + if (isAgeableAndFullyMature(plantData) && !isBizarreAgeable(plantData)) { //Add metadata to mark this block for double or triple drops markForBonusDrops(brokenPlantState); } @@ -380,7 +380,7 @@ public class HerbalismManager extends SkillManager { * @return returns true if the BlockData is a bizarre ageable for Herbalism XP / Rewards */ public boolean isBizarreAgeable(BlockData blockData) { - if(blockData instanceof Ageable) { + if (blockData instanceof Ageable) { //Catcus and Sugar Canes cannot be trusted return switch (blockData.getMaterial()) { case CACTUS, KELP, SUGAR_CANE, BAMBOO -> true; @@ -413,7 +413,7 @@ public class HerbalismManager extends SkillManager { BlockState brokenBlockNewState = brokenPlantBlock.getState(); BlockData plantData = brokenBlockNewState.getBlockData(); - if(mcMMO.getPlaceStore().isTrue(brokenBlockNewState)) { + if (mcMMO.getPlaceStore().isTrue(brokenBlockNewState)) { /* * * Unnatural Blocks @@ -422,7 +422,7 @@ public class HerbalismManager extends SkillManager { */ //If its a Crop we need to reward XP when its fully grown - if(isAgeableAndFullyMature(plantData) && !isBizarreAgeable(plantData)) { + if (isAgeableAndFullyMature(plantData) && !isBizarreAgeable(plantData)) { xpToReward += ExperienceConfig.getInstance().getXp(PrimarySkillType.HERBALISM, brokenBlockNewState.getType()); } @@ -437,9 +437,9 @@ public class HerbalismManager extends SkillManager { */ //Calculate XP - if(plantData instanceof Ageable plantAgeable) { + if (plantData instanceof Ageable plantAgeable) { - if(isAgeableMature(plantAgeable) || isBizarreAgeable(plantData)) { + if (isAgeableMature(plantAgeable) || isBizarreAgeable(plantData)) { xpToReward += ExperienceConfig.getInstance().getXp(PrimarySkillType.HERBALISM, brokenBlockNewState.getType()); } @@ -449,12 +449,12 @@ public class HerbalismManager extends SkillManager { } } - if(mmoPlayer.isDebugMode()) { + if (mmoPlayer.isDebugMode()) { mmoPlayer.getPlayer().sendMessage("Plants processed: "+brokenPlants.size()); } //Reward XP - if(xpToReward > 0) { + if (xpToReward > 0) { applyXpGain(xpToReward, XPGainReason.PVE, XPGainSource.SELF); } } @@ -480,16 +480,16 @@ public class HerbalismManager extends SkillManager { BlockState brokenBlockNewState = blockSnapshot.getBlockRef().getState(); //Remove metadata from the snapshot of blocks - if(brokenBlockNewState.hasMetadata(MetadataConstants.METADATA_KEY_BONUS_DROPS)) { + if (brokenBlockNewState.hasMetadata(MetadataConstants.METADATA_KEY_BONUS_DROPS)) { brokenBlockNewState.removeMetadata(MetadataConstants.METADATA_KEY_BONUS_DROPS, mcMMO.p); } //If the block is not AIR that means it wasn't broken - if(brokenBlockNewState.getType() != Material.AIR) { + if (brokenBlockNewState.getType() != Material.AIR) { continue; } - if(mcMMO.getPlaceStore().isTrue(brokenBlockNewState)) { + if (mcMMO.getPlaceStore().isTrue(brokenBlockNewState)) { //Mark it as natural again as it is being broken mcMMO.getPlaceStore().setFalse(brokenBlockNewState); } else { @@ -500,13 +500,13 @@ public class HerbalismManager extends SkillManager { } } - if(mmoPlayer.isDebugMode()) { + if (mmoPlayer.isDebugMode()) { mmoPlayer.getPlayer().sendMessage("Chorus Plants checked for XP: "+brokenPlants.size()); mmoPlayer.getPlayer().sendMessage("Valid Chorus Plant XP Gains: "+blocksGivingXP); } //Reward XP - if(xpToReward > 0) { + if (xpToReward > 0) { applyXpGain(xpToReward, XPGainReason.PVE, XPGainSource.SELF); } } @@ -525,7 +525,7 @@ public class HerbalismManager extends SkillManager { //Add the initial block blocksBroken.add(originBlockState.getBlock()); - if(!isOneBlockPlant(originBlockMaterial)) { + if (!isOneBlockPlant(originBlockMaterial)) { //If the block is a multi-block structure, capture a set of all blocks broken and return that blocksBroken = getBrokenBlocksMultiBlockPlants(originBlockState); } @@ -602,7 +602,7 @@ public class HerbalismManager extends SkillManager { Block block = originBlock.getBlock(); //Add the initial block to the set - if(inclusive) + if (inclusive) brokenBlocks.add(block); //Limit our search @@ -796,7 +796,7 @@ public class HerbalismManager extends SkillManager { return false; } - if(EventUtils.callSubSkillBlockEvent(player, SubSkillType.HERBALISM_GREEN_THUMB, blockState.getBlock()) + if (EventUtils.callSubSkillBlockEvent(player, SubSkillType.HERBALISM_GREEN_THUMB, blockState.getBlock()) .isCancelled()) { return false; } else { @@ -815,7 +815,7 @@ public class HerbalismManager extends SkillManager { private boolean processGrowingPlants(BlockState blockState, Ageable ageable, BlockBreakEvent blockBreakEvent, boolean greenTerra) { //This check is needed - if(isBizarreAgeable(ageable)) { + if (isBizarreAgeable(ageable)) { return false; } @@ -823,7 +823,7 @@ public class HerbalismManager extends SkillManager { int greenThumbStage = getGreenThumbStage(greenTerra); //Immature plants will start over at 0 - if(!isAgeableMature(ageable)) { + if (!isAgeableMature(ageable)) { // blockBreakEvent.setCancelled(true); startReplantTask(0, blockBreakEvent, blockState, true); // blockState.setType(Material.AIR); @@ -875,7 +875,7 @@ public class HerbalismManager extends SkillManager { } private int getGreenThumbStage(boolean greenTerraActive) { - if(greenTerraActive) + if (greenTerraActive) return Math.min(RankUtils.getHighestRank(SubSkillType.HERBALISM_GREEN_THUMB), RankUtils.getRank(getPlayer(), SubSkillType.HERBALISM_GREEN_THUMB) + 1); diff --git a/src/main/java/com/gmail/nossr50/skills/mining/BlastMining.java b/src/main/java/com/gmail/nossr50/skills/mining/BlastMining.java index 98b8cf8b6..281831295 100644 --- a/src/main/java/com/gmail/nossr50/skills/mining/BlastMining.java +++ b/src/main/java/com/gmail/nossr50/skills/mining/BlastMining.java @@ -64,7 +64,7 @@ public class BlastMining { for(int i = 0; i < SubSkillType.MINING_BLAST_MINING.getNumRanks()-1; i++) { - if(getBlastDamageDecrease(i+1) > 0) + if (getBlastDamageDecrease(i+1) > 0) return RankUtils.getRankUnlockLevel(SubSkillType.MINING_BLAST_MINING, i+1); } @@ -83,7 +83,7 @@ public class BlastMining { for(int i = 0; i < SubSkillType.MINING_BLAST_MINING.getNumRanks()-1; i++) { - if(getBlastRadiusModifier(i+1) > 0) + if (getBlastRadiusModifier(i+1) > 0) return RankUtils.getRankUnlockLevel(SubSkillType.MINING_BLAST_MINING, i+1); } @@ -102,7 +102,7 @@ public class BlastMining { return false; } - if(UserManager.getPlayer(defender) == null) + if (UserManager.getPlayer(defender) == null) { return false; } 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 231941acc..1d8738de2 100644 --- a/src/main/java/com/gmail/nossr50/skills/mining/MiningManager.java +++ b/src/main/java/com/gmail/nossr50/skills/mining/MiningManager.java @@ -40,7 +40,7 @@ public class MiningManager extends SkillManager { } public boolean canUseDemolitionsExpertise() { - if(!RankUtils.hasUnlockedSubskill(getPlayer(), SubSkillType.MINING_DEMOLITIONS_EXPERTISE)) + if (!RankUtils.hasUnlockedSubskill(getPlayer(), SubSkillType.MINING_DEMOLITIONS_EXPERTISE)) return false; return getSkillLevel() >= BlastMining.getDemolitionExpertUnlockLevel() && Permissions.demolitionsExpertise(getPlayer()); @@ -60,7 +60,7 @@ public class MiningManager extends SkillManager { } public boolean canUseBiggerBombs() { - if(!RankUtils.hasUnlockedSubskill(getPlayer(), SubSkillType.MINING_BIGGER_BOMBS)) + if (!RankUtils.hasUnlockedSubskill(getPlayer(), SubSkillType.MINING_BIGGER_BOMBS)) return false; return getSkillLevel() >= BlastMining.getBiggerBombsUnlockLevel() && Permissions.biggerBombs(getPlayer()); @@ -93,18 +93,18 @@ public class MiningManager extends SkillManager { SkillUtils.handleDurabilityChange(getPlayer().getInventory().getItemInMainHand(), mcMMO.p.getGeneralConfig().getAbilityToolDamage()); } - if(!mcMMO.p.getGeneralConfig().getDoubleDropsEnabled(PrimarySkillType.MINING, blockState.getType()) || !canDoubleDrop()) + if (!mcMMO.p.getGeneralConfig().getDoubleDropsEnabled(PrimarySkillType.MINING, blockState.getType()) || !canDoubleDrop()) return; boolean silkTouch = player.getInventory().getItemInMainHand().containsEnchantment(Enchantment.SILK_TOUCH); - if(silkTouch && !mcMMO.p.getAdvancedConfig().getDoubleDropSilkTouchEnabled()) + if (silkTouch && !mcMMO.p.getAdvancedConfig().getDoubleDropSilkTouchEnabled()) return; //Mining mastery allows for a chance of triple drops - if(canMotherLode()) { + if (canMotherLode()) { //Triple Drops failed so do a normal double drops check - if(!processTripleDrops(blockState)) { + if (!processTripleDrops(blockState)) { processDoubleDrops(blockState); } } else { @@ -182,7 +182,7 @@ public class MiningManager extends SkillManager { if (ExperienceConfig.getInstance().getXp(PrimarySkillType.MINING, targetBlock) != 0 && !(targetBlock instanceof Container) && !mcMMO.getPlaceStore().isTrue(targetBlock)) { - if(BlockUtils.isOre(blockState)) { + if (BlockUtils.isOre(blockState)) { ores.add(blockState); } else { notOres.add(blockState); @@ -199,16 +199,16 @@ public class MiningManager extends SkillManager { //Drop "debris" based on skill modifiers for(BlockState blockState : notOres) { - if(isDropIllegal(blockState.getType())) + if (isDropIllegal(blockState.getType())) continue; - if(RandomUtils.nextFloat() < debrisYield) { + if (RandomUtils.nextFloat() < debrisYield) { Misc.spawnItem(getPlayer(), Misc.getBlockCenter(blockState), new ItemStack(blockState.getType()), ItemSpawnReason.BLAST_MINING_DEBRIS_NON_ORES); // Initial block that would have been dropped } } for (BlockState blockState : ores) { - if(isDropIllegal(blockState.getType())) + if (isDropIllegal(blockState.getType())) continue; if (RandomUtils.nextFloat() < (yield + oreBonus)) { 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 8186723cf..555d17313 100644 --- a/src/main/java/com/gmail/nossr50/skills/repair/RepairManager.java +++ b/src/main/java/com/gmail/nossr50/skills/repair/RepairManager.java @@ -66,8 +66,8 @@ public class RepairManager extends SkillManager { Player player = getPlayer(); Repairable repairable = mcMMO.getRepairableManager().getRepairable(item.getType()); if (item.getItemMeta() != null) { - if(item.getItemMeta().hasCustomModelData()) { - if(!mcMMO.p.getCustomItemSupportConfig().isCustomRepairAllowed()) { + if (item.getItemMeta().hasCustomModelData()) { + if (!mcMMO.p.getCustomItemSupportConfig().isCustomRepairAllowed()) { NotificationManager.sendPlayerInformation(player, NotificationType.SUBSKILL_MESSAGE_FAILED, "Anvil.Repair.Reject.CustomModelData"); return; @@ -326,7 +326,7 @@ public class RepairManager extends SkillManager { * @return true if bonus granted, false otherwise */ private boolean checkPlayerProcRepair() { - if(!RankUtils.hasUnlockedSubskill(getPlayer(), SubSkillType.REPAIR_SUPER_REPAIR)) + if (!RankUtils.hasUnlockedSubskill(getPlayer(), SubSkillType.REPAIR_SUPER_REPAIR)) return false; if (ProbabilityUtil.isSkillRNGSuccessful(SubSkillType.REPAIR_SUPER_REPAIR, mmoPlayer)) { @@ -370,8 +370,8 @@ public class RepairManager extends SkillManager { for (Entry enchant : enchants.entrySet()) { int enchantLevel = enchant.getValue(); - if(!ExperienceConfig.getInstance().allowUnsafeEnchantments()) { - if(enchantLevel > enchant.getKey().getMaxLevel()) { + if (!ExperienceConfig.getInstance().allowUnsafeEnchantments()) { + if (enchantLevel > enchant.getKey().getMaxLevel()) { enchantLevel = enchant.getKey().getMaxLevel(); item.addEnchantment(enchant.getKey(), enchantLevel); diff --git a/src/main/java/com/gmail/nossr50/skills/repair/repairables/SimpleRepairable.java b/src/main/java/com/gmail/nossr50/skills/repair/repairables/SimpleRepairable.java index de201456d..2849c9dae 100644 --- a/src/main/java/com/gmail/nossr50/skills/repair/repairables/SimpleRepairable.java +++ b/src/main/java/com/gmail/nossr50/skills/repair/repairables/SimpleRepairable.java @@ -67,7 +67,7 @@ public class SimpleRepairable implements Repairable { @Override public int getMinimumQuantity() { - if(minQuantity == -1) + if (minQuantity == -1) return Math.max(SkillUtils.getRepairAndSalvageQuantities(itemMaterial, repairMaterial), 1); else return minQuantity; 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 5e477825d..fe8e132c9 100644 --- a/src/main/java/com/gmail/nossr50/skills/salvage/SalvageManager.java +++ b/src/main/java/com/gmail/nossr50/skills/salvage/SalvageManager.java @@ -125,7 +125,7 @@ public class SalvageManager extends SkillManager { for(int x = 0; x < potentialSalvageYield-1; x++) { - if(ProbabilityUtil.isStaticSkillRNGSuccessful(PrimarySkillType.SALVAGE, mmoPlayer, chanceOfSuccess)) { + if (ProbabilityUtil.isStaticSkillRNGSuccessful(PrimarySkillType.SALVAGE, mmoPlayer, chanceOfSuccess)) { chanceOfSuccess-=3; chanceOfSuccess = Math.max(chanceOfSuccess, 90); @@ -196,7 +196,7 @@ public class SalvageManager extends SkillManager { } public double getExtractFullEnchantChance() { - if(Permissions.hasSalvageEnchantBypassPerk(getPlayer())) + if (Permissions.hasSalvageEnchantBypassPerk(getPlayer())) return 100.0D; return mcMMO.p.getAdvancedConfig().getArcaneSalvageExtractFullEnchantsChance(getArcaneSalvageRank()); @@ -224,8 +224,8 @@ public class SalvageManager extends SkillManager { int enchantLevel = enchant.getValue(); - if(!ExperienceConfig.getInstance().allowUnsafeEnchantments()) { - if(enchantLevel > enchant.getKey().getMaxLevel()) { + if (!ExperienceConfig.getInstance().allowUnsafeEnchantments()) { + if (enchantLevel > enchant.getKey().getMaxLevel()) { enchantLevel = enchant.getKey().getMaxLevel(); } } @@ -247,11 +247,11 @@ public class SalvageManager extends SkillManager { } } - if(failedAllEnchants(arcaneFailureCount, enchants.entrySet().size())) + if (failedAllEnchants(arcaneFailureCount, enchants.entrySet().size())) { NotificationManager.sendPlayerInformationChatOnly(player, "Salvage.Skills.ArcaneFailed"); return null; - } else if(downgraded) + } else if (downgraded) { NotificationManager.sendPlayerInformationChatOnly(player, "Salvage.Skills.ArcanePartial"); } 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 7fae80419..4b667d86e 100644 --- a/src/main/java/com/gmail/nossr50/skills/smelting/SmeltingManager.java +++ b/src/main/java/com/gmail/nossr50/skills/smelting/SmeltingManager.java @@ -73,7 +73,7 @@ public class SmeltingManager extends SkillManager { FurnaceInventory furnaceInventory = furnace.getInventory(); ItemStack furnaceResult = furnaceInventory.getResult(); - if(furnaceResult == null) + if (furnaceResult == null) return true; //This actually means there is nothing yet in the resulting item slot, which means it should always be okay to double smelt int resultAmount = furnaceResult.getAmount(); //Amount before double smelt 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 66c16f77d..5e02747b8 100644 --- a/src/main/java/com/gmail/nossr50/skills/swords/SwordsManager.java +++ b/src/main/java/com/gmail/nossr50/skills/swords/SwordsManager.java @@ -41,14 +41,14 @@ public class SwordsManager extends SkillManager { } public boolean canUseCounterAttack(Entity target) { - if(!RankUtils.hasUnlockedSubskill(getPlayer(), SubSkillType.SWORDS_COUNTER_ATTACK)) + if (!RankUtils.hasUnlockedSubskill(getPlayer(), SubSkillType.SWORDS_COUNTER_ATTACK)) return false; return target instanceof LivingEntity && Permissions.isSubSkillEnabled(getPlayer(), SubSkillType.SWORDS_COUNTER_ATTACK); } public boolean canUseSerratedStrike() { - if(!RankUtils.hasUnlockedSubskill(getPlayer(), SubSkillType.SWORDS_SERRATED_STRIKES)) + if (!RankUtils.hasUnlockedSubskill(getPlayer(), SubSkillType.SWORDS_SERRATED_STRIKES)) return false; return mmoPlayer.getAbilityMode(SuperAbilityType.SERRATED_STRIKES); @@ -60,13 +60,13 @@ public class SwordsManager extends SkillManager { * @param target The defending entity */ public void processRupture(@NotNull LivingEntity target) { - if(!canUseRupture()) + if (!canUseRupture()) return; - if(target.hasMetadata(MetadataConstants.METADATA_KEY_RUPTURE)) { + if (target.hasMetadata(MetadataConstants.METADATA_KEY_RUPTURE)) { RuptureTaskMeta ruptureTaskMeta = (RuptureTaskMeta) target.getMetadata(MetadataConstants.METADATA_KEY_RUPTURE).get(0); - if(mmoPlayer.isDebugMode()) { + if (mmoPlayer.isDebugMode()) { mmoPlayer.getPlayer().sendMessage("Rupture task ongoing for target " + target.toString()); mmoPlayer.getPlayer().sendMessage(ruptureTaskMeta.getRuptureTimerTask().toString()); } @@ -81,7 +81,7 @@ public class SwordsManager extends SkillManager { if (target instanceof Player defender) { //Don't start or add to a bleed if they are blocking - if(defender.isBlocking()) + if (defender.isBlocking()) return; if (NotificationManager.doesPlayerUseNotifications(defender)) { @@ -112,7 +112,7 @@ public class SwordsManager extends SkillManager { { int rank = RankUtils.getRank(getPlayer(), SubSkillType.SWORDS_STAB); - if(rank > 0) + if (rank > 0) { return (1.0D + (rank * 1.5)); } @@ -122,13 +122,13 @@ public class SwordsManager extends SkillManager { public int getToolTier(@NotNull ItemStack itemStack) { - if(ItemUtils.isNetheriteTool(itemStack)) + if (ItemUtils.isNetheriteTool(itemStack)) return 5; - if(ItemUtils.isDiamondTool(itemStack)) + if (ItemUtils.isDiamondTool(itemStack)) return 4; - else if(ItemUtils.isIronTool(itemStack) || ItemUtils.isGoldTool(itemStack)) + else if (ItemUtils.isIronTool(itemStack) || ItemUtils.isGoldTool(itemStack)) return 3; - else if(ItemUtils.isStoneTool(itemStack)) + else if (ItemUtils.isStoneTool(itemStack)) return 2; else return 1; 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 927c51e1b..9cb609e94 100644 --- a/src/main/java/com/gmail/nossr50/skills/taming/TamingManager.java +++ b/src/main/java/com/gmail/nossr50/skills/taming/TamingManager.java @@ -59,7 +59,7 @@ public class TamingManager extends SkillManager { private void initStaticCaches() { //TODO: Temporary static cache, will be changed in 2.2 //This is shared between instances of TamingManager - if(summoningItems == null) { + if (summoningItems == null) { summoningItems = new HashMap<>(); summoningItems.put(mcMMO.p.getGeneralConfig().getTamingCOTWMaterial(CallOfTheWildType.CAT.getConfigEntityTypeEntry()), CallOfTheWildType.CAT); @@ -69,7 +69,7 @@ public class TamingManager extends SkillManager { //TODO: Temporary static cache, will be changed in 2.2 //This is shared between instances of TamingManager - if(cotwSummonDataProperties == null) { + if (cotwSummonDataProperties == null) { cotwSummonDataProperties = new HashMap<>(); for(CallOfTheWildType callOfTheWildType : CallOfTheWildType.values()) { @@ -116,14 +116,14 @@ public class TamingManager extends SkillManager { } public boolean canUseGore() { - if(!RankUtils.hasUnlockedSubskill(getPlayer(), SubSkillType.TAMING_GORE)) + if (!RankUtils.hasUnlockedSubskill(getPlayer(), SubSkillType.TAMING_GORE)) return false; return Permissions.isSubSkillEnabled(getPlayer(), SubSkillType.TAMING_GORE); } public boolean canUseBeastLore() { - if(!RankUtils.hasUnlockedSubskill(getPlayer(), SubSkillType.TAMING_BEAST_LORE)) + if (!RankUtils.hasUnlockedSubskill(getPlayer(), SubSkillType.TAMING_BEAST_LORE)) return false; return Permissions.isSubSkillEnabled(getPlayer(), SubSkillType.TAMING_BEAST_LORE); @@ -178,7 +178,7 @@ public class TamingManager extends SkillManager { * Summon an ocelot to your side. */ public void summonOcelot() { - if(!RankUtils.hasUnlockedSubskill(getPlayer(), SubSkillType.TAMING_CALL_OF_THE_WILD)) + if (!RankUtils.hasUnlockedSubskill(getPlayer(), SubSkillType.TAMING_CALL_OF_THE_WILD)) return; if (!Permissions.callOfTheWild(getPlayer(), EntityType.OCELOT)) { @@ -192,7 +192,7 @@ public class TamingManager extends SkillManager { * Summon a wolf to your side. */ public void summonWolf() { - if(!RankUtils.hasUnlockedSubskill(getPlayer(), SubSkillType.TAMING_CALL_OF_THE_WILD)) + if (!RankUtils.hasUnlockedSubskill(getPlayer(), SubSkillType.TAMING_CALL_OF_THE_WILD)) return; if (!Permissions.callOfTheWild(getPlayer(), EntityType.WOLF)) { @@ -206,7 +206,7 @@ public class TamingManager extends SkillManager { * Summon a horse to your side. */ public void summonHorse() { - if(!RankUtils.hasUnlockedSubskill(getPlayer(), SubSkillType.TAMING_CALL_OF_THE_WILD)) + if (!RankUtils.hasUnlockedSubskill(getPlayer(), SubSkillType.TAMING_CALL_OF_THE_WILD)) return; if (!Permissions.callOfTheWild(getPlayer(), EntityType.HORSE)) { @@ -237,7 +237,7 @@ public class TamingManager extends SkillManager { if (beast instanceof AbstractHorse horseLikeCreature && !(beast instanceof Llama)) { AttributeInstance jumpAttribute = horseLikeCreature.getAttribute(mcMMO.p.getAttributeMapper().getHorseJumpStrength()); - if(jumpAttribute != null) { + if (jumpAttribute != null) { double jumpStrength = jumpAttribute.getValue(); // Taken from https://minecraft.wiki/w/Horse#Jump_strength jumpStrength = -0.1817584952 * Math.pow(jumpStrength, 3) + 3.689713992 * Math.pow(jumpStrength, 2) + 2.128599134 * jumpStrength - 0.343930367; @@ -261,10 +261,10 @@ public class TamingManager extends SkillManager { } public void pummel(LivingEntity target, Wolf wolf) { - if(!RankUtils.hasUnlockedSubskill(getPlayer(), SubSkillType.TAMING_PUMMEL)) + if (!RankUtils.hasUnlockedSubskill(getPlayer(), SubSkillType.TAMING_PUMMEL)) return; - if(!ProbabilityUtil.isStaticSkillRNGSuccessful(PrimarySkillType.TAMING, mmoPlayer, mcMMO.p.getAdvancedConfig().getPummelChance())) + if (!ProbabilityUtil.isStaticSkillRNGSuccessful(PrimarySkillType.TAMING, mmoPlayer, mcMMO.p.getAdvancedConfig().getPummelChance())) return; ParticleEffectUtils.playGreaterImpactEffect(target); @@ -279,9 +279,9 @@ public class TamingManager extends SkillManager { } public void attackTarget(LivingEntity target) { - if(target instanceof Tameable tameable) + if (target instanceof Tameable tameable) { - if(tameable.getOwner() == getPlayer()) + if (tameable.getOwner() == getPlayer()) { return; } @@ -307,7 +307,7 @@ public class TamingManager extends SkillManager { private void processCallOfTheWild() { //Prevent summoning too many things accidentally if a player holds down the button - if(lastSummonTimeStamp + 150 > System.currentTimeMillis()) { + if (lastSummonTimeStamp + 150 > System.currentTimeMillis()) { return; } else { lastSummonTimeStamp = System.currentTimeMillis(); @@ -317,7 +317,7 @@ public class TamingManager extends SkillManager { ItemStack itemInMainHand = player.getInventory().getItemInMainHand(); //Check if the item the player is currently holding is a COTW item - if(isCOTWItem(itemInMainHand)) { + if (isCOTWItem(itemInMainHand)) { //Get the summoning type CallOfTheWildType callOfTheWildType = summoningItems.get(itemInMainHand.getType()); TamingSummon tamingSummon = cotwSummonDataProperties.get(callOfTheWildType); @@ -326,7 +326,7 @@ public class TamingManager extends SkillManager { int amountSummoned = 0; //Check to see if players have the correct amount of the item required to summon - if(itemInMainHand.getAmount() >= tamingSummon.getItemAmountRequired()) { + if (itemInMainHand.getAmount() >= tamingSummon.getItemAmountRequired()) { //Initial Spawn location Location spawnLocation = Misc.getLocationOffset(player.getLocation(), 1); @@ -358,7 +358,7 @@ public class TamingManager extends SkillManager { } //Remove items from the player if they had at least one entity summoned successfully - if(amountSummoned >= 1) { + if (amountSummoned >= 1) { //Remove the items used to summon int itemAmountAfterPayingCost = itemInMainHand.getAmount() - tamingSummon.getItemAmountRequired(); itemInMainHand.setAmount(itemAmountAfterPayingCost); @@ -412,11 +412,11 @@ public class TamingManager extends SkillManager { addToTracker(callOfWildEntity, CallOfTheWildType.CAT); //Randomize the cat - if(callOfWildEntity instanceof Ocelot) { + if (callOfWildEntity instanceof Ocelot) { int numberOfTypes = Ocelot.Type.values().length; ((Ocelot) callOfWildEntity).setCatType(Ocelot.Type.values()[Misc.getRandom().nextInt(numberOfTypes)]); ((Ocelot) callOfWildEntity).setAdult(); - } else if(callOfWildEntity instanceof Cat) { + } else if (callOfWildEntity instanceof Cat) { int numberOfTypes = Cat.Type.values().length; ((Cat) callOfWildEntity).setCatType(Cat.Type.values()[Misc.getRandom().nextInt(numberOfTypes)]); ((Cat) callOfWildEntity).setAdult(); diff --git a/src/main/java/com/gmail/nossr50/skills/tridents/TridentsManager.java b/src/main/java/com/gmail/nossr50/skills/tridents/TridentsManager.java index 23a8a1330..fcacc014c 100644 --- a/src/main/java/com/gmail/nossr50/skills/tridents/TridentsManager.java +++ b/src/main/java/com/gmail/nossr50/skills/tridents/TridentsManager.java @@ -14,9 +14,9 @@ public class TridentsManager extends SkillManager { public double impaleDamageBonus() { int rank = RankUtils.getRank(getPlayer(), SubSkillType.TRIDENTS_IMPALE); - if(rank > 1) { + if (rank > 1) { return (1.0D + (rank * .5D)); - } else if(rank == 1) { + } else if (rank == 1) { return 1.0D; } diff --git a/src/main/java/com/gmail/nossr50/skills/unarmed/Unarmed.java b/src/main/java/com/gmail/nossr50/skills/unarmed/Unarmed.java index cb1124dd4..d81957ae1 100644 --- a/src/main/java/com/gmail/nossr50/skills/unarmed/Unarmed.java +++ b/src/main/java/com/gmail/nossr50/skills/unarmed/Unarmed.java @@ -21,24 +21,24 @@ public class Unarmed { for(int i = 0; i <= storageContents.length-1; i++) { - if(amount <= 0) + if (amount <= 0) break; - if(i == heldItemSlotID) + if (i == heldItemSlotID) continue; //EMPTY SLOT! - if(storageContents[i] == null) + if (storageContents[i] == null) { player.getInventory().setItem(i, itemDrop); amount = 0; grabbedItem = true; break; } - else if(itemDrop.isSimilar(storageContents[i]) && storageContents[i].getAmount() < storageContents[i].getMaxStackSize()) + else if (itemDrop.isSimilar(storageContents[i]) && storageContents[i].getAmount() < storageContents[i].getMaxStackSize()) { //If we can fit this whole itemstack into this item - if(amount + storageContents[i].getAmount() <= storageContents[i].getMaxStackSize()) + if (amount + storageContents[i].getAmount() <= storageContents[i].getMaxStackSize()) { ItemStack modifiedAmount = storageContents[i]; modifiedAmount.setAmount(amount + storageContents[i].getAmount()); @@ -61,14 +61,14 @@ public class Unarmed { } } - if(amount <= 0) + if (amount <= 0) event.getItem().remove(); //Cleanup Item else event.getItem().getItemStack().setAmount(amount); event.setCancelled(true); - if(grabbedItem) + if (grabbedItem) { SoundManager.sendSound(player, player.getLocation(), SoundType.POP); player.updateInventory(); 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 d4dc4faf9..933dbb8f4 100644 --- a/src/main/java/com/gmail/nossr50/skills/unarmed/UnarmedManager.java +++ b/src/main/java/com/gmail/nossr50/skills/unarmed/UnarmedManager.java @@ -33,7 +33,7 @@ public class UnarmedManager extends SkillManager { } public boolean canUseSteelArm() { - if(!RankUtils.hasUnlockedSubskill(getPlayer(), SubSkillType.UNARMED_STEEL_ARM_STYLE)) + if (!RankUtils.hasUnlockedSubskill(getPlayer(), SubSkillType.UNARMED_STEEL_ARM_STYLE)) return false; return Permissions.isSubSkillEnabled(getPlayer(), SubSkillType.UNARMED_STEEL_ARM_STYLE); @@ -44,14 +44,14 @@ public class UnarmedManager extends SkillManager { } public boolean canDisarm(LivingEntity target) { - if(!RankUtils.hasUnlockedSubskill(getPlayer(), SubSkillType.UNARMED_DISARM)) + if (!RankUtils.hasUnlockedSubskill(getPlayer(), SubSkillType.UNARMED_DISARM)) return false; return target instanceof Player && ((Player) target).getInventory().getItemInMainHand().getType() != Material.AIR && Permissions.isSubSkillEnabled(getPlayer(), SubSkillType.UNARMED_DISARM); } public boolean canDeflect() { - if(!RankUtils.hasUnlockedSubskill(getPlayer(), SubSkillType.UNARMED_ARROW_DEFLECT)) + if (!RankUtils.hasUnlockedSubskill(getPlayer(), SubSkillType.UNARMED_ARROW_DEFLECT)) return false; Player player = getPlayer(); @@ -60,7 +60,7 @@ public class UnarmedManager extends SkillManager { } public boolean canUseBlockCracker() { - if(!RankUtils.hasUnlockedSubskill(getPlayer(), SubSkillType.UNARMED_BLOCK_CRACKER)) + if (!RankUtils.hasUnlockedSubskill(getPlayer(), SubSkillType.UNARMED_BLOCK_CRACKER)) return false; return Permissions.isSubSkillEnabled(getPlayer(), SubSkillType.UNARMED_BLOCK_CRACKER); @@ -103,7 +103,7 @@ public class UnarmedManager extends SkillManager { return; } - if(UserManager.getPlayer(defender) == null) + if (UserManager.getPlayer(defender) == null) return; Item item = Misc.spawnItem(getPlayer(), defender.getLocation(), defender.getInventory().getItemInMainHand(), ItemSpawnReason.UNARMED_DISARMED_ITEM); @@ -156,13 +156,13 @@ public class UnarmedManager extends SkillManager { double bonus = 0; - if(rank >= 18) + if (rank >= 18) bonus = 1 + rank - 18; double finalBonus = bonus + 0.5 + (rank / 2); - if(mcMMO.p.getAdvancedConfig().isSteelArmDamageCustom()) { + if (mcMMO.p.getAdvancedConfig().isSteelArmDamageCustom()) { return mcMMO.p.getAdvancedConfig().getSteelArmOverride(RankUtils.getRank(getPlayer(), SubSkillType.UNARMED_STEEL_ARM_STYLE), finalBonus); } else { return finalBonus; 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 66270dfc6..877f0cc24 100644 --- a/src/main/java/com/gmail/nossr50/skills/woodcutting/WoodcuttingManager.java +++ b/src/main/java/com/gmail/nossr50/skills/woodcutting/WoodcuttingManager.java @@ -90,22 +90,22 @@ public class WoodcuttingManager extends SkillManager { */ public void processBonusDropCheck(@NotNull BlockState blockState) { //TODO: Why isn't this using the item drop event? Potentially because of Tree Feller? This should be adjusted either way. - if(mcMMO.p.getGeneralConfig().getDoubleDropsEnabled(PrimarySkillType.WOODCUTTING, blockState.getType())) { + if (mcMMO.p.getGeneralConfig().getDoubleDropsEnabled(PrimarySkillType.WOODCUTTING, blockState.getType())) { //Mastery enabled for player - if(Permissions.canUseSubSkill(getPlayer(), SubSkillType.WOODCUTTING_CLEAN_CUTS)) { - if(checkCleanCutsActivation(blockState.getType())) { + if (Permissions.canUseSubSkill(getPlayer(), SubSkillType.WOODCUTTING_CLEAN_CUTS)) { + if (checkCleanCutsActivation(blockState.getType())) { //Triple drops spawnHarvestLumberBonusDrops(blockState); spawnHarvestLumberBonusDrops(blockState); } else { //Harvest Lumber Check - if(checkHarvestLumberActivation(blockState.getType())) { + if (checkHarvestLumberActivation(blockState.getType())) { spawnHarvestLumberBonusDrops(blockState); } } //No Mastery (no Clean Cuts) } else if (Permissions.canUseSubSkill(getPlayer(), SubSkillType.WOODCUTTING_HARVEST_LUMBER)) { - if(checkHarvestLumberActivation(blockState.getType())) { + if (checkHarvestLumberActivation(blockState.getType())) { spawnHarvestLumberBonusDrops(blockState); } } @@ -113,7 +113,7 @@ public class WoodcuttingManager extends SkillManager { } public void processWoodcuttingBlockXP(@NotNull BlockState blockState) { - if(mcMMO.getPlaceStore().isTrue(blockState)) + if (mcMMO.getPlaceStore().isTrue(blockState)) return; int xp = getExperienceFromLog(blockState); @@ -333,10 +333,10 @@ public class WoodcuttingManager extends SkillManager { } //Drop displaced non-woodcutting XP blocks - if(RankUtils.hasUnlockedSubskill(player, SubSkillType.WOODCUTTING_KNOCK_ON_WOOD)) { - if(RankUtils.hasReachedRank(2, player, SubSkillType.WOODCUTTING_KNOCK_ON_WOOD)) { - if(mcMMO.p.getAdvancedConfig().isKnockOnWoodXPOrbEnabled()) { - if(ProbabilityUtil.isStaticSkillRNGSuccessful(PrimarySkillType.WOODCUTTING, mmoPlayer, 10)) { + if (RankUtils.hasUnlockedSubskill(player, SubSkillType.WOODCUTTING_KNOCK_ON_WOOD)) { + if (RankUtils.hasReachedRank(2, player, SubSkillType.WOODCUTTING_KNOCK_ON_WOOD)) { + if (mcMMO.p.getAdvancedConfig().isKnockOnWoodXPOrbEnabled()) { + if (ProbabilityUtil.isStaticSkillRNGSuccessful(PrimarySkillType.WOODCUTTING, mmoPlayer, 10)) { int randOrbCount = Math.max(1, Misc.getRandom().nextInt(100)); Misc.spawnExperienceOrb(blockState.getLocation(), randOrbCount); } @@ -356,7 +356,7 @@ public class WoodcuttingManager extends SkillManager { } private int updateProcessedLogCount(int xp, int processedLogCount, int beforeXP) { - if(beforeXP != xp) + if (beforeXP != xp) processedLogCount+=1; return processedLogCount; @@ -373,15 +373,15 @@ public class WoodcuttingManager extends SkillManager { * @return Amount of experience */ private static int processTreeFellerXPGains(BlockState blockState, int woodCount) { - if(mcMMO.getPlaceStore().isTrue(blockState)) + if (mcMMO.getPlaceStore().isTrue(blockState)) return 0; int rawXP = ExperienceConfig.getInstance().getXp(PrimarySkillType.WOODCUTTING, blockState.getType()); - if(rawXP <= 0) + if (rawXP <= 0) return 0; - if(ExperienceConfig.getInstance().isTreeFellerXPReduced()) { + if (ExperienceConfig.getInstance().isTreeFellerXPReduced()) { int reducedXP = rawXP - (woodCount * 5); rawXP = Math.max(1, reducedXP); return rawXP; diff --git a/src/main/java/com/gmail/nossr50/util/BlockUtils.java b/src/main/java/com/gmail/nossr50/util/BlockUtils.java index d18a0e6d6..56d1d698d 100644 --- a/src/main/java/com/gmail/nossr50/util/BlockUtils.java +++ b/src/main/java/com/gmail/nossr50/util/BlockUtils.java @@ -68,7 +68,7 @@ public final class BlockUtils { mcMMO.getPlaceStore().setTrue(block); // Failsafe against lingering metadata - if(block.hasMetadata(MetadataConstants.METADATA_KEY_BONUS_DROPS)) + if (block.hasMetadata(MetadataConstants.METADATA_KEY_BONUS_DROPS)) block.removeMetadata(MetadataConstants.METADATA_KEY_BONUS_DROPS, mcMMO.p); } @@ -78,7 +78,7 @@ public final class BlockUtils { * @param block target block */ public static void cleanupBlockMetadata(Block block) { - if(block.hasMetadata(MetadataConstants.METADATA_KEY_REPLANT)) { + if (block.hasMetadata(MetadataConstants.METADATA_KEY_REPLANT)) { block.removeMetadata(MetadataConstants.METADATA_KEY_REPLANT, mcMMO.p); } @@ -207,7 +207,7 @@ public final class BlockUtils { * otherwise */ public static boolean affectedBySuperBreaker(BlockState blockState) { - if(mcMMO.getMaterialMapStore().isIntendedToolPickaxe(blockState.getType())) + if (mcMMO.getMaterialMapStore().isIntendedToolPickaxe(blockState.getType())) return true; if (ExperienceConfig.getInstance().doesBlockGiveSkillXP(PrimarySkillType.MINING, blockState.getBlockData())) diff --git a/src/main/java/com/gmail/nossr50/util/ChimaeraWing.java b/src/main/java/com/gmail/nossr50/util/ChimaeraWing.java index e6ea0582c..aa2b4380e 100644 --- a/src/main/java/com/gmail/nossr50/util/ChimaeraWing.java +++ b/src/main/java/com/gmail/nossr50/util/ChimaeraWing.java @@ -54,7 +54,7 @@ public final class ChimaeraWing { mcMMOPlayer = UserManager.getPlayer(player); //Not loaded - if(mcMMOPlayer == null) + if (mcMMOPlayer == null) return; if (mcMMOPlayer.getTeleportCommenceLocation() != null) { diff --git a/src/main/java/com/gmail/nossr50/util/ContainerMetadataUtils.java b/src/main/java/com/gmail/nossr50/util/ContainerMetadataUtils.java index 1183466db..b06c1fcdc 100644 --- a/src/main/java/com/gmail/nossr50/util/ContainerMetadataUtils.java +++ b/src/main/java/com/gmail/nossr50/util/ContainerMetadataUtils.java @@ -38,7 +38,7 @@ public class ContainerMetadataUtils { } public static void printOwnershipGainDebug(@NotNull BlockState blockState, @Nullable McMMOPlayer mmoPlayer) { - if(mmoPlayer != null && mmoPlayer.isDebugMode()) { + if (mmoPlayer != null && mmoPlayer.isDebugMode()) { mmoPlayer.getPlayer().sendMessage("Container ownership " + ChatColor.GREEN +"gained " + ChatColor.RESET + "at location: " + blockState.getLocation().toString()); @@ -48,11 +48,11 @@ public class ContainerMetadataUtils { public static void printOwnershipLossDebug(BlockState blockState) { OfflinePlayer containerOwner = getContainerOwner(blockState); - if(containerOwner != null && containerOwner.isOnline()) { + if (containerOwner != null && containerOwner.isOnline()) { final McMMOPlayer mmoContainerOwner = UserManager.getPlayer(containerOwner.getPlayer()); - if(mmoContainerOwner != null) { - if(mmoContainerOwner.isDebugMode()) { + if (mmoContainerOwner != null) { + if (mmoContainerOwner.isDebugMode()) { mmoContainerOwner.getPlayer().sendMessage("Container ownership " + ChatColor.RED + "lost " + ChatColor.RESET + "at location: " + blockState.getLocation().toString()); @@ -65,7 +65,7 @@ public class ContainerMetadataUtils { if (container instanceof PersistentDataHolder persistentDataHolder) { final UUID uuid = getOwner(persistentDataHolder); - if(uuid != null) { + if (uuid != null) { return Bukkit.getOfflinePlayer(uuid); } } @@ -79,11 +79,11 @@ public class ContainerMetadataUtils { } public static void processContainerOwnership(BlockState blockState, Player player) { - if(!mcMMO.p.getSkillTools().doesPlayerHaveSkillPermission(player, PrimarySkillType.SMELTING)) + if (!mcMMO.p.getSkillTools().doesPlayerHaveSkillPermission(player, PrimarySkillType.SMELTING)) return; - if(getContainerOwner(blockState) != null) { - if(getContainerOwner(blockState).getUniqueId().equals(player.getUniqueId())) + if (getContainerOwner(blockState) != null) { + if (getContainerOwner(blockState).getUniqueId().equals(player.getUniqueId())) return; } diff --git a/src/main/java/com/gmail/nossr50/util/EnchantmentMapper.java b/src/main/java/com/gmail/nossr50/util/EnchantmentMapper.java index 798ad289e..f4be9209c 100644 --- a/src/main/java/com/gmail/nossr50/util/EnchantmentMapper.java +++ b/src/main/java/com/gmail/nossr50/util/EnchantmentMapper.java @@ -63,7 +63,7 @@ public class EnchantmentMapper { } private Enchantment initInfinity() { -// if(Registry.ENCHANTMENT.match("infinity") != null) { +// if (Registry.ENCHANTMENT.match("infinity") != null) { // return Registry.ENCHANTMENT.match("infinity"); // } diff --git a/src/main/java/com/gmail/nossr50/util/EventUtils.java b/src/main/java/com/gmail/nossr50/util/EventUtils.java index 4cb7f7703..a4a501da3 100644 --- a/src/main/java/com/gmail/nossr50/util/EventUtils.java +++ b/src/main/java/com/gmail/nossr50/util/EventUtils.java @@ -123,7 +123,7 @@ public final class EventUtils { Entity entity = entityDamageEvent.getEntity(); //Check to make sure the entity is not an NPC - if(Misc.isNPCEntityExcludingVillagers(entity)) + if (Misc.isNPCEntityExcludingVillagers(entity)) return false; if (!entity.isValid() || !(entity instanceof LivingEntity livingEntity)) { @@ -143,7 +143,7 @@ public final class EventUtils { McMMOPlayer mcMMOPlayer = UserManager.getPlayer(player); - if(mcMMOPlayer == null) + if (mcMMOPlayer == null) { return true; } @@ -350,7 +350,7 @@ public final class EventUtils { public static void handlePartyTeleportEvent(Player teleportingPlayer, Player targetPlayer) { McMMOPlayer mcMMOPlayer = UserManager.getPlayer(teleportingPlayer); - if(mcMMOPlayer == null) + if (mcMMOPlayer == null) return; McMMOPartyTeleportEvent event = new McMMOPartyTeleportEvent(teleportingPlayer, targetPlayer, mcMMOPlayer.getParty().getName()); @@ -398,7 +398,7 @@ public final class EventUtils { public static boolean handleXpGainEvent(Player player, PrimarySkillType skill, float xpGained, XPGainReason xpGainReason) { McMMOPlayer mmoPlayer = UserManager.getPlayer(player); - if(mmoPlayer == null) + if (mmoPlayer == null) return true; McMMOPlayerXpGainEvent event = new McMMOPlayerXpGainEvent(player, skill, xpGained, xpGainReason); @@ -415,7 +415,7 @@ public final class EventUtils { } public static boolean handleStatsLossEvent(Player player, HashMap levelChanged, HashMap experienceChanged) { - if(UserManager.getPlayer(player) == null) + if (UserManager.getPlayer(player) == null) return true; McMMOPlayerStatLossEvent event = new McMMOPlayerStatLossEvent(player, levelChanged, experienceChanged); @@ -432,7 +432,7 @@ public final class EventUtils { String skillName = primarySkillType.toString(); int playerSkillLevel = playerProfile.getSkillLevel(primarySkillType); int threshold = mcMMO.p.getGeneralConfig().getHardcoreDeathStatPenaltyLevelThreshold(); - if(playerSkillLevel > threshold) { + if (playerSkillLevel > threshold) { playerProfile.modifySkill(primarySkillType, Math.max(threshold, playerSkillLevel - levelChanged.get(skillName))); playerProfile.removeXp(primarySkillType, experienceChanged.get(skillName)); @@ -468,11 +468,11 @@ public final class EventUtils { McMMOPlayer killerPlayer = UserManager.getPlayer(killer); //Not loaded - if(killerPlayer == null) + if (killerPlayer == null) return true; //Not loaded - if(UserManager.getPlayer(victim) == null) + if (UserManager.getPlayer(victim) == null) return true; PlayerProfile victimProfile = UserManager.getPlayer(victim).getProfile(); diff --git a/src/main/java/com/gmail/nossr50/util/FixSpellingNetheriteUtil.java b/src/main/java/com/gmail/nossr50/util/FixSpellingNetheriteUtil.java index a9e6b4bea..9f5b9dd52 100644 --- a/src/main/java/com/gmail/nossr50/util/FixSpellingNetheriteUtil.java +++ b/src/main/java/com/gmail/nossr50/util/FixSpellingNetheriteUtil.java @@ -11,7 +11,7 @@ public class FixSpellingNetheriteUtil { LogUtils.debug(mcMMO.p.getLogger(), "Checking " + fileName + " config material names..."); File configFile = new File(pluginRef.getDataFolder(), fileName); - if(configFile.exists()) { + if (configFile.exists()) { BufferedReader bufferedReader = null; FileWriter fileWriter = null; try { @@ -35,14 +35,14 @@ public class FixSpellingNetheriteUtil { } catch (IOException e) { e.printStackTrace(); } finally { - if(bufferedReader != null) { + if (bufferedReader != null) { try { bufferedReader.close(); } catch (IOException e) { e.printStackTrace(); } - if(fileWriter != null) { + if (fileWriter != null) { try { fileWriter.close(); } catch (IOException e) { diff --git a/src/main/java/com/gmail/nossr50/util/HardcoreManager.java b/src/main/java/com/gmail/nossr50/util/HardcoreManager.java index 491074a5e..37d807db0 100644 --- a/src/main/java/com/gmail/nossr50/util/HardcoreManager.java +++ b/src/main/java/com/gmail/nossr50/util/HardcoreManager.java @@ -18,15 +18,15 @@ public final class HardcoreManager { public static void invokeStatPenalty(Player player) { - if(WorldGuardUtils.isWorldGuardLoaded()) { - if(!WorldGuardManager.getInstance().hasHardcoreFlag(player)) + if (WorldGuardUtils.isWorldGuardLoaded()) { + if (!WorldGuardManager.getInstance().hasHardcoreFlag(player)) return; } double statLossPercentage = mcMMO.p.getGeneralConfig().getHardcoreDeathStatPenaltyPercentage(); int levelThreshold = mcMMO.p.getGeneralConfig().getHardcoreDeathStatPenaltyLevelThreshold(); - if(UserManager.getPlayer(player) == null) + if (UserManager.getPlayer(player) == null) return; PlayerProfile playerProfile = UserManager.getPlayer(player).getProfile(); @@ -69,15 +69,15 @@ public final class HardcoreManager { public static void invokeVampirism(Player killer, Player victim) { - if(WorldGuardUtils.isWorldGuardLoaded()) { - if(!WorldGuardManager.getInstance().hasHardcoreFlag(killer) || !WorldGuardManager.getInstance().hasHardcoreFlag(victim)) + if (WorldGuardUtils.isWorldGuardLoaded()) { + if (!WorldGuardManager.getInstance().hasHardcoreFlag(killer) || !WorldGuardManager.getInstance().hasHardcoreFlag(victim)) return; } double vampirismStatLeechPercentage = mcMMO.p.getGeneralConfig().getHardcoreVampirismStatLeechPercentage(); int levelThreshold = mcMMO.p.getGeneralConfig().getHardcoreVampirismLevelThreshold(); - if(UserManager.getPlayer(killer) == null || UserManager.getPlayer(victim) == null) + if (UserManager.getPlayer(killer) == null || UserManager.getPlayer(victim) == null) return; PlayerProfile killerProfile = UserManager.getPlayer(killer).getProfile(); diff --git a/src/main/java/com/gmail/nossr50/util/HolidayManager.java b/src/main/java/com/gmail/nossr50/util/HolidayManager.java index 6ea18317b..37adbbc1b 100644 --- a/src/main/java/com/gmail/nossr50/util/HolidayManager.java +++ b/src/main/java/com/gmail/nossr50/util/HolidayManager.java @@ -313,7 +313,7 @@ // } // // public boolean isAprilFirst() { -// if(!Config.getInstance().isAprilFoolsAllowed()) +// if (!Config.getInstance().isAprilFoolsAllowed()) // return false; // // GregorianCalendar aprilFirst = new GregorianCalendar(currentYear, Calendar.APRIL, 1); @@ -323,7 +323,7 @@ // } // // public boolean nearingAprilFirst() { -// if(!Config.getInstance().isAprilFoolsAllowed()) +// if (!Config.getInstance().isAprilFoolsAllowed()) // return false; // // GregorianCalendar start = new GregorianCalendar(Calendar.getInstance().get(Calendar.YEAR), Calendar.MARCH, 28); @@ -366,7 +366,7 @@ // } // // public void levelUpApril(Player player, FakeSkillType fakeSkillType) { -// if(!Config.getInstance().isAprilFoolsAllowed()) +// if (!Config.getInstance().isAprilFoolsAllowed()) // return; // // final McMMOPlayer mmoPlayer = UserManager.getPlayer(player); @@ -379,7 +379,7 @@ // } // // public void registerAprilCommand() { -// if(!Config.getInstance().isAprilFoolsAllowed()) +// if (!Config.getInstance().isAprilFoolsAllowed()) // return; // // PluginCommand command = mcMMO.p.getCommand("crafting"); diff --git a/src/main/java/com/gmail/nossr50/util/ItemMetadataUtils.java b/src/main/java/com/gmail/nossr50/util/ItemMetadataUtils.java index e6074692e..ff565f71d 100644 --- a/src/main/java/com/gmail/nossr50/util/ItemMetadataUtils.java +++ b/src/main/java/com/gmail/nossr50/util/ItemMetadataUtils.java @@ -70,7 +70,7 @@ public final class ItemMetadataUtils { int originalSpeed = getSuperAbilityToolOriginalDigSpeed(itemStack); ItemMeta itemMeta = itemStack.getItemMeta(); - if(itemMeta != null) { + if (itemMeta != null) { //TODO: can be optimized if (itemMeta.hasEnchant(mcMMO.p.getEnchantmentMapper().getEfficiency())) { itemMeta.removeEnchant(mcMMO.p.getEnchantmentMapper().getEfficiency()); diff --git a/src/main/java/com/gmail/nossr50/util/ItemUtils.java b/src/main/java/com/gmail/nossr50/util/ItemUtils.java index d8b34f9ae..e80bf3053 100644 --- a/src/main/java/com/gmail/nossr50/util/ItemUtils.java +++ b/src/main/java/com/gmail/nossr50/util/ItemUtils.java @@ -183,7 +183,7 @@ public final class ItemUtils { public static boolean doesPlayerHaveEnchantmentOnArmor(@NotNull Player player, @NotNull String enchantmentByName) { Enchantment enchantment = getEnchantment(enchantmentByName); - if(enchantment == null) + if (enchantment == null) return false; return doesPlayerHaveEnchantmentOnArmor(player, enchantment); @@ -191,8 +191,8 @@ public final class ItemUtils { public static boolean doesPlayerHaveEnchantmentOnArmor(@NotNull Player player, @NotNull Enchantment enchantment) { for(ItemStack itemStack : player.getInventory().getArmorContents()) { - if(itemStack != null) { - if(hasEnchantment(itemStack, enchantment)) + if (itemStack != null) { + if (hasEnchantment(itemStack, enchantment)) return true; } } @@ -203,17 +203,17 @@ public final class ItemUtils { public static boolean doesPlayerHaveEnchantmentOnArmorOrHands(@NotNull Player player, @NotNull String enchantmentName) { Enchantment enchantment = getEnchantment(enchantmentName); - if(enchantment == null) + if (enchantment == null) return false; return doesPlayerHaveEnchantmentOnArmorOrHands(player, enchantment); } public static boolean doesPlayerHaveEnchantmentOnArmorOrHands(@NotNull Player player, @NotNull Enchantment enchantment) { - if(doesPlayerHaveEnchantmentOnArmor(player, enchantment)) + if (doesPlayerHaveEnchantmentOnArmor(player, enchantment)) return true; - if(doesPlayerHaveEnchantmentInHands(player, enchantment)) + if (doesPlayerHaveEnchantmentInHands(player, enchantment)) return true; return false; @@ -222,7 +222,7 @@ public final class ItemUtils { public static boolean doesPlayerHaveEnchantmentInHands(@NotNull Player player, @NotNull NamespacedKey enchantmentNameKey) { Enchantment enchantment = Enchantment.getByKey(enchantmentNameKey); - if(enchantment == null) + if (enchantment == null) return false; return doesPlayerHaveEnchantmentInHands(player, enchantment); @@ -231,7 +231,7 @@ public final class ItemUtils { public static boolean doesPlayerHaveEnchantmentInHands(@NotNull Player player, @NotNull String enchantmentName) { Enchantment enchantment = getEnchantment(enchantmentName); - if(enchantment == null) + if (enchantment == null) return false; return doesPlayerHaveEnchantmentInHands(player, enchantment); @@ -243,7 +243,7 @@ public final class ItemUtils { } public static boolean hasEnchantment(@NotNull ItemStack itemStack, @NotNull Enchantment enchantment) { - if(itemStack.getItemMeta() != null) { + if (itemStack.getItemMeta() != null) { return itemStack.getItemMeta().hasEnchant(enchantment); } @@ -252,7 +252,7 @@ public final class ItemUtils { public static @Nullable Enchantment getEnchantment(@NotNull String enchantmentName) { for(Enchantment enchantment : Enchantment.values()) { - if(enchantment.getKey().getKey().equalsIgnoreCase(enchantmentName)) { + if (enchantment.getKey().getKey().equalsIgnoreCase(enchantmentName)) { return enchantment; } } @@ -695,7 +695,7 @@ public final class ItemUtils { ItemMeta itemMeta = item.getItemMeta(); - if(itemMeta == null) + if (itemMeta == null) return false; return itemMeta.getLore() != null @@ -709,7 +709,7 @@ public final class ItemUtils { ItemMeta itemMeta = item.getItemMeta(); - if(itemMeta == null) + if (itemMeta == null) return false; return itemMeta.hasDisplayName() && itemMeta.getDisplayName().equals(ChatColor.GOLD + LocaleLoader.getString("Item.ChimaeraWing.Name")); @@ -719,7 +719,7 @@ public final class ItemUtils { // ItemMeta itemMeta = itemStack.getItemMeta(); // List itemLore = new ArrayList<>(); // -// if(itemMeta == null) +// if (itemMeta == null) // return; // // if (itemMeta.hasLore()) { @@ -735,13 +735,13 @@ public final class ItemUtils { public static void removeAbilityLore(@NotNull ItemStack itemStack) { ItemMeta itemMeta = itemStack.getItemMeta(); - if(itemMeta == null) + if (itemMeta == null) return; if (itemMeta.hasLore()) { List itemLore = itemMeta.getLore(); - if(itemLore == null) + if (itemLore == null) return; if (itemLore.remove("mcMMO Ability Tool")) { @@ -754,7 +754,7 @@ public final class ItemUtils { public static void addDigSpeedToItem(@NotNull ItemStack itemStack, int existingEnchantLevel) { ItemMeta itemMeta = itemStack.getItemMeta(); - if(itemMeta == null) + if (itemMeta == null) return; itemMeta.addEnchant(mcMMO.p.getEnchantmentMapper().getEfficiency(), @@ -771,7 +771,7 @@ public final class ItemUtils { EnchantmentWrapper enchantmentWrapper = getRandomEnchantment(fishingTreasureBook.getLegalEnchantments()); ItemMeta itemMeta = itemStack.getItemMeta(); - if(itemMeta == null) { + if (itemMeta == null) { return itemStack; } diff --git a/src/main/java/com/gmail/nossr50/util/Misc.java b/src/main/java/com/gmail/nossr50/util/Misc.java index 2467a5540..a289315cb 100644 --- a/src/main/java/com/gmail/nossr50/util/Misc.java +++ b/src/main/java/com/gmail/nossr50/util/Misc.java @@ -223,7 +223,7 @@ public final class Misc { Location spawnLocation = fromLocation.clone(); Location targetLocation = toLocation.clone(); - if(spawnLocation.getWorld() == null) + if (spawnLocation.getWorld() == null) return null; // We can't get the item until we spawn it and we want to make it cancellable, so we have a custom event. @@ -318,7 +318,7 @@ public final class Misc { // } public static void spawnExperienceOrb(@NotNull Location location, int experienceValue) { - if(location.getWorld() == null) + if (location.getWorld() == null) return; ExperienceOrb experienceOrb = (ExperienceOrb) location.getWorld().spawnEntity(location, EntityType.EXPERIENCE_ORB); @@ -336,7 +336,7 @@ public final class Misc { @Override public void run() { - if(location == null || location.getWorld() == null) + if (location == null || location.getWorld() == null) return; ExperienceOrb experienceOrb = (ExperienceOrb) location.getWorld().spawnEntity(location, EntityType.EXPERIENCE_ORB); @@ -352,7 +352,7 @@ public final class Misc { // // double win = 0, loss = 0; // for(int x = 0; x < iterations; x++) { -// if(RandomChanceUtil.checkRandomChanceExecutionSuccess(normalPlayer.getPlayer(), SubSkillType.MINING_MOTHER_LODE, true)) { +// if (RandomChanceUtil.checkRandomChanceExecutionSuccess(normalPlayer.getPlayer(), SubSkillType.MINING_MOTHER_LODE, true)) { // win++; // } else { // loss++; diff --git a/src/main/java/com/gmail/nossr50/util/MobHealthbarUtils.java b/src/main/java/com/gmail/nossr50/util/MobHealthbarUtils.java index 5da29a656..7d19e1979 100644 --- a/src/main/java/com/gmail/nossr50/util/MobHealthbarUtils.java +++ b/src/main/java/com/gmail/nossr50/util/MobHealthbarUtils.java @@ -54,7 +54,7 @@ public final class MobHealthbarUtils { /* * Store the name in metadata */ - if(target.getMetadata(MetadataConstants.METADATA_KEY_OLD_NAME_KEY).size() <= 0) + if (target.getMetadata(MetadataConstants.METADATA_KEY_OLD_NAME_KEY).size() <= 0) target.setMetadata(MetadataConstants.METADATA_KEY_OLD_NAME_KEY, new OldName(originalName, plugin)); if (oldName == null) { diff --git a/src/main/java/com/gmail/nossr50/util/TransientEntityTracker.java b/src/main/java/com/gmail/nossr50/util/TransientEntityTracker.java index d6bed4509..ba410788d 100644 --- a/src/main/java/com/gmail/nossr50/util/TransientEntityTracker.java +++ b/src/main/java/com/gmail/nossr50/util/TransientEntityTracker.java @@ -147,7 +147,7 @@ public class TransientEntityTracker { private synchronized @Nullable HashSet getTrackedEntities(@NotNull UUID playerUUID, @NotNull CallOfTheWildType callOfTheWildType) { HashMap> playerEntityMap = getPlayerTrackedEntityMap(playerUUID); - if(playerEntityMap == null) + if (playerEntityMap == null) return null; return playerEntityMap.get(callOfTheWildType); @@ -196,12 +196,12 @@ public class TransientEntityTracker { HashSet trackedEntities = getTrackedEntities(uuid, callOfTheWildType); - if(trackedEntities == null) + if (trackedEntities == null) continue; Iterator iterator = trackedEntities.iterator(); while (iterator.hasNext()) { - if(iterator.next().getLivingEntity().equals(livingEntity)) { + if (iterator.next().getLivingEntity().equals(livingEntity)) { iterator.remove(); return; } @@ -220,7 +220,7 @@ public class TransientEntityTracker { ArrayList matchingEntities = new ArrayList<>(); for(LivingEntity livingEntity : getChunkLookupCache()) { - if(livingEntity.getLocation().getChunk().equals(chunk)) { + if (livingEntity.getLocation().getChunk().equals(chunk)) { matchingEntities.add(livingEntity); } } @@ -238,7 +238,7 @@ public class TransientEntityTracker { public synchronized int getAmountCurrentlySummoned(@NotNull UUID playerUUID, @NotNull CallOfTheWildType callOfTheWildType) { HashSet trackedEntities = getTrackedEntities(playerUUID, callOfTheWildType); - if(trackedEntities == null) + if (trackedEntities == null) return 0; return trackedEntities.size(); @@ -253,7 +253,7 @@ public class TransientEntityTracker { */ public synchronized void removeSummon(@NotNull LivingEntity livingEntity, @Nullable Player player, boolean timeExpired) { //Kill the summon & remove it - if(livingEntity.isValid()) { + if (livingEntity.isValid()) { livingEntity.setHealth(0); //Should trigger entity death events livingEntity.remove(); @@ -265,8 +265,8 @@ public class TransientEntityTracker { } //Inform player of summon death - if(player != null && player.isOnline()) { - if(timeExpired) { + if (player != null && player.isOnline()) { + if (timeExpired) { NotificationManager.sendPlayerInformationChatOnly(player, "Taming.Summon.COTW.TimeExpired", StringUtils.getPrettyEntityTypeString(livingEntity.getType())); } else { NotificationManager.sendPlayerInformationChatOnly(player, "Taming.Summon.COTW.Removed", StringUtils.getPrettyEntityTypeString(livingEntity.getType())); @@ -302,7 +302,7 @@ public class TransientEntityTracker { for(CallOfTheWildType callOfTheWildType : CallOfTheWildType.values()) { HashSet trackedEntities = getTrackedEntities(playerUUID, callOfTheWildType); - if(trackedEntities == null) { + if (trackedEntities == null) { continue; } diff --git a/src/main/java/com/gmail/nossr50/util/TransientMetadataTools.java b/src/main/java/com/gmail/nossr50/util/TransientMetadataTools.java index 7fb29ed60..c7f1e335a 100644 --- a/src/main/java/com/gmail/nossr50/util/TransientMetadataTools.java +++ b/src/main/java/com/gmail/nossr50/util/TransientMetadataTools.java @@ -27,7 +27,7 @@ public class TransientMetadataTools { } //Gets assigned to endermen, potentially doesn't get cleared before this point - if(entity.hasMetadata(MetadataConstants.METADATA_KEY_TRAVELING_BLOCK)) { + if (entity.hasMetadata(MetadataConstants.METADATA_KEY_TRAVELING_BLOCK)) { entity.removeMetadata(MetadataConstants.METADATA_KEY_TRAVELING_BLOCK, pluginRef); } @@ -36,7 +36,7 @@ public class TransientMetadataTools { //TODO: This loop has some redundancy, this whole method needs to be rewritten for(String key : MetadataConstants.MOB_METADATA_KEYS) { - if(entity.hasMetadata(key)) { + if (entity.hasMetadata(key)) { entity.removeMetadata(key, pluginRef); } } 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 fcbd2fdbe..e2716aede 100644 --- a/src/main/java/com/gmail/nossr50/util/commands/CommandUtils.java +++ b/src/main/java/com/gmail/nossr50/util/commands/CommandUtils.java @@ -36,7 +36,7 @@ public final class CommandUtils { } public static boolean tooFar(CommandSender sender, Player target, boolean hasPermission) { - if(!target.isOnline() && !hasPermission) { + if (!target.isOnline() && !hasPermission) { sender.sendMessage(LocaleLoader.getString("Inspect.Offline")); return true; } else if (sender instanceof Player && !Misc.isNear(((Player) sender).getLocation(), target.getLocation(), mcMMO.p.getGeneralConfig().getInspectDistance()) && !hasPermission) { @@ -217,7 +217,7 @@ public final class CommandUtils { } private static void printGroupedSkillData(Player inspectTarget, CommandSender display, String header, List skillGroup) { - if(UserManager.getPlayer(inspectTarget) == null) + if (UserManager.getPlayer(inspectTarget) == null) return; PlayerProfile profile = UserManager.getPlayer(inspectTarget).getProfile(); diff --git a/src/main/java/com/gmail/nossr50/util/compat/CompatibilityManager.java b/src/main/java/com/gmail/nossr50/util/compat/CompatibilityManager.java index 012524adb..db6de7825 100644 --- a/src/main/java/com/gmail/nossr50/util/compat/CompatibilityManager.java +++ b/src/main/java/com/gmail/nossr50/util/compat/CompatibilityManager.java @@ -66,7 +66,7 @@ public class CompatibilityManager { } private void initMasterAnglerLayer() { - if(minecraftGameVersion.isAtLeast(1, 16, 3)) { + if (minecraftGameVersion.isAtLeast(1, 16, 3)) { masterAnglerCompatibility = new MasterAnglerCompatibilityLayer(); } else { masterAnglerCompatibility = null; @@ -74,7 +74,7 @@ public class CompatibilityManager { } private void initBungeeSerializerLayer() { - if(minecraftGameVersion.isAtLeast(1, 16, 0)) { + if (minecraftGameVersion.isAtLeast(1, 16, 0)) { bungeeSerializerCompatibilityLayer = new BungeeModernSerializerCompatibilityLayer(); } else { bungeeSerializerCompatibilityLayer = new BungeeLegacySerializerCompatibilityLayer(); @@ -85,13 +85,13 @@ public class CompatibilityManager { //TODO: move to text manager public void reportCompatibilityStatus(@NotNull CommandSender commandSender) { - if(isFullyCompatibleServerSoftware) { + if (isFullyCompatibleServerSoftware) { commandSender.sendMessage(LocaleLoader.getString("mcMMO.Template.Prefix", "mcMMO is fully compatible with the currently running server software.")); } else { //TODO: Better messages for each incompatible layer for(CompatibilityType compatibilityType : CompatibilityType.values()) { - if(!supportedLayers.get(compatibilityType)) { + if (!supportedLayers.get(compatibilityType)) { commandSender.sendMessage(LocaleLoader.getString("mcMMO.Template.Prefix", LocaleLoader.getString("Compatibility.Layer.Unsupported", StringUtils.getCapitalized(compatibilityType.toString())))); } @@ -115,7 +115,7 @@ public class CompatibilityManager { private @NotNull NMSVersion determineNMSVersion() { //This bit here helps prevent mcMMO breaking if it isn't updated but the game continues to update - if(minecraftGameVersion.isAtLeast(1, 17, 0)) { + if (minecraftGameVersion.isAtLeast(1, 17, 0)) { return NMSVersion.NMS_1_17; } @@ -133,13 +133,13 @@ public class CompatibilityManager { case 16: if (minecraftGameVersion.getPatchVersion().asInt() == 1) { return NMSVersion.NMS_1_16_1; - } else if(minecraftGameVersion.getPatchVersion().asInt() == 2) { + } else if (minecraftGameVersion.getPatchVersion().asInt() == 2) { return NMSVersion.NMS_1_16_2; - } else if(minecraftGameVersion.getPatchVersion().asInt() == 3) { + } else if (minecraftGameVersion.getPatchVersion().asInt() == 3) { return NMSVersion.NMS_1_16_3; - } else if(minecraftGameVersion.getPatchVersion().asInt() == 4) { + } else if (minecraftGameVersion.getPatchVersion().asInt() == 4) { return NMSVersion.NMS_1_16_4; - } else if(minecraftGameVersion.getPatchVersion().asInt() >= 5) { + } else if (minecraftGameVersion.getPatchVersion().asInt() >= 5) { return NMSVersion.NMS_1_16_5; } case 17: diff --git a/src/main/java/com/gmail/nossr50/util/compat/layers/attackcooldown/PlayerAttackCooldownToolLayer.java b/src/main/java/com/gmail/nossr50/util/compat/layers/attackcooldown/PlayerAttackCooldownToolLayer.java index 5b0026198..7a870c27a 100644 --- a/src/main/java/com/gmail/nossr50/util/compat/layers/attackcooldown/PlayerAttackCooldownToolLayer.java +++ b/src/main/java/com/gmail/nossr50/util/compat/layers/attackcooldown/PlayerAttackCooldownToolLayer.java @@ -37,15 +37,15 @@ // public PlayerAttackCooldownToolLayer(@NotNull NMSVersion nmsVersion) { // super(nmsVersion); // mcMMO.p.getLogger().info("Loading Compatibility Layer... (Player Attack Cooldown Exploit Prevention)"); -// if(!isCompatibleWithMinecraftVersion(nmsVersion)) { +// if (!isCompatibleWithMinecraftVersion(nmsVersion)) { // mcMMO.p.getLogger().severe("this version of mcMMO does not support NMS for this version of Minecraft, try updating mcMMO or updating Minecraft. Not all versions of Minecraft will have NMS support built into mcMMO."); // cbNMSVersionPath = ""; // } else { -// if(NMSConstants.getCraftBukkitVersionPath(nmsVersion) != null) { +// if (NMSConstants.getCraftBukkitVersionPath(nmsVersion) != null) { // cbNMSVersionPath = NMSConstants.getCraftBukkitVersionPath(nmsVersion); // noErrorsOnInitialize = initializeLayer(); // -// if(noErrorsOnInitialize) { +// if (noErrorsOnInitialize) { // mcMMO.p.getLogger().info("Successfully Loaded Compatibility Layer! (Player Attack Cooldown Exploit Prevention)"); // } // } else { diff --git a/src/main/java/com/gmail/nossr50/util/experience/ExperienceBarManager.java b/src/main/java/com/gmail/nossr50/util/experience/ExperienceBarManager.java index c4617bd69..3a2065f75 100644 --- a/src/main/java/com/gmail/nossr50/util/experience/ExperienceBarManager.java +++ b/src/main/java/com/gmail/nossr50/util/experience/ExperienceBarManager.java @@ -46,13 +46,13 @@ public class ExperienceBarManager { public void updateExperienceBar(PrimarySkillType primarySkillType, Plugin plugin) { - if(disabledBars.contains(primarySkillType) + if (disabledBars.contains(primarySkillType) || !ExperienceConfig.getInstance().isExperienceBarsEnabled() || !ExperienceConfig.getInstance().isExperienceBarEnabled(primarySkillType)) return; //Init Bar - if(experienceBars.get(primarySkillType) == null) + if (experienceBars.get(primarySkillType) == null) experienceBars.put(primarySkillType, new ExperienceBarWrapper(primarySkillType, mcMMOPlayer)); //Get Bar @@ -65,7 +65,7 @@ public class ExperienceBarManager { experienceBarWrapper.showExperienceBar(); //Setup Hide Bar Task - if(experienceBarHideTaskHashMap.get(primarySkillType) != null) + if (experienceBarHideTaskHashMap.get(primarySkillType) != null) { experienceBarHideTaskHashMap.get(primarySkillType).cancel(); } @@ -74,7 +74,7 @@ public class ExperienceBarManager { } private void scheduleHideTask(PrimarySkillType primarySkillType, Plugin plugin) { - if(alwaysVisible.contains(primarySkillType)) + if (alwaysVisible.contains(primarySkillType)) return; ExperienceBarHideTask experienceBarHideTask = new ExperienceBarHideTask(this, mcMMOPlayer, primarySkillType); @@ -84,7 +84,7 @@ public class ExperienceBarManager { public void hideExperienceBar(PrimarySkillType primarySkillType) { - if(experienceBars.containsKey(primarySkillType)) + if (experienceBars.containsKey(primarySkillType)) experienceBars.get(primarySkillType).hideExperienceBar(); } @@ -108,7 +108,7 @@ public class ExperienceBarManager { alwaysVisible.add(skillType); //Remove lingering tasks - if(experienceBarHideTaskHashMap.containsKey(skillType)) { + if (experienceBarHideTaskHashMap.containsKey(skillType)) { experienceBarHideTaskHashMap.get(skillType).cancel(); } @@ -119,7 +119,7 @@ public class ExperienceBarManager { disabledBars.add(skillType); //Remove lingering tasks - if(experienceBarHideTaskHashMap.containsKey(skillType)) { + if (experienceBarHideTaskHashMap.containsKey(skillType)) { experienceBarHideTaskHashMap.get(skillType).cancel(); } @@ -149,7 +149,7 @@ public class ExperienceBarManager { private void informPlayer(@NotNull ExperienceBarManager.@NotNull XPBarSettingTarget settingTarget, @Nullable PrimarySkillType primarySkillType) { //Inform player of setting change - if(settingTarget != XPBarSettingTarget.RESET) { + if (settingTarget != XPBarSettingTarget.RESET) { NotificationManager.sendPlayerInformationChatOnlyPrefixed(mcMMOPlayer.getPlayer(), "Commands.XPBar.SettingChanged", mcMMO.p.getSkillTools().getLocalizedSkillName(primarySkillType), settingTarget.toString()); } else { NotificationManager.sendPlayerInformationChatOnlyPrefixed(mcMMOPlayer.getPlayer(), "Commands.XPBar.Reset"); diff --git a/src/main/java/com/gmail/nossr50/util/experience/ExperienceBarWrapper.java b/src/main/java/com/gmail/nossr50/util/experience/ExperienceBarWrapper.java index 185026ed9..4f2fc97fb 100644 --- a/src/main/java/com/gmail/nossr50/util/experience/ExperienceBarWrapper.java +++ b/src/main/java/com/gmail/nossr50/util/experience/ExperienceBarWrapper.java @@ -57,9 +57,9 @@ public class ExperienceBarWrapper { private String getTitleTemplate() { //If they are using extra details - if(ExperienceConfig.getInstance().isEarlyGameBoostEnabled() && PlayerLevelUtils.qualifiesForEarlyGameBoost(mcMMOPlayer, primarySkillType)) { + if (ExperienceConfig.getInstance().isEarlyGameBoostEnabled() && PlayerLevelUtils.qualifiesForEarlyGameBoost(mcMMOPlayer, primarySkillType)) { return LocaleLoader.getString("XPBar.Template.EarlyGameBoost"); - } else if(ExperienceConfig.getInstance().getAddExtraDetails()) + } else if (ExperienceConfig.getInstance().getAddExtraDetails()) return LocaleLoader.getString("XPBar.Complex.Template", LocaleLoader.getString("XPBar."+niceSkillName, getLevel()), getCurrentXP(), getMaxXP(), getPowerLevel(), getPercentageOfLevel()); return LocaleLoader.getString("XPBar."+niceSkillName, getLevel(), getCurrentXP(), getMaxXP(), getPowerLevel(), getPercentageOfLevel()); @@ -99,23 +99,23 @@ public class ExperienceBarWrapper { public void setProgress(double v) { //Clamp Values - if(v < 0) + if (v < 0) bossBar.setProgress(0.0D); - else if(v > 1) + else if (v > 1) bossBar.setProgress(1.0D); else bossBar.setProgress(v); //Check player level - if(ExperienceConfig.getInstance().isEarlyGameBoostEnabled() && PlayerLevelUtils.qualifiesForEarlyGameBoost(mcMMOPlayer, primarySkillType)) { + if (ExperienceConfig.getInstance().isEarlyGameBoostEnabled() && PlayerLevelUtils.qualifiesForEarlyGameBoost(mcMMOPlayer, primarySkillType)) { setColor(BarColor.YELLOW); } else { setColor(ExperienceConfig.getInstance().getExperienceBarColor(primarySkillType)); } //Every time progress updates we need to check for a title update - if(getLevel() != lastLevelUpdated || ExperienceConfig.getInstance().getDoExperienceBarsAlwaysUpdateTitle()) + if (getLevel() != lastLevelUpdated || ExperienceConfig.getInstance().getDoExperienceBarsAlwaysUpdateTitle()) { updateTitle(); lastLevelUpdated = getLevel(); diff --git a/src/main/java/com/gmail/nossr50/util/experience/FormulaManager.java b/src/main/java/com/gmail/nossr50/util/experience/FormulaManager.java index 6685e816b..f2e20c597 100644 --- a/src/main/java/com/gmail/nossr50/util/experience/FormulaManager.java +++ b/src/main/java/com/gmail/nossr50/util/experience/FormulaManager.java @@ -135,7 +135,7 @@ public class FormulaManager { * @param formulaType target formulaType */ private int processXPToNextLevel(int level, FormulaType formulaType) { - if(mcMMO.isRetroModeEnabled()) + if (mcMMO.isRetroModeEnabled()) { return processXPRetroToNextLevel(level, formulaType); } else { @@ -151,7 +151,7 @@ public class FormulaManager { private int processStandardXPToNextLevel(int level, FormulaType formulaType) { Map experienceMapRef = formulaType == FormulaType.LINEAR ? experienceNeededStandardLinear : experienceNeededStandardExponential; - if(!experienceMapRef.containsKey(level)) { + if (!experienceMapRef.containsKey(level)) { int experienceSum = 0; int retroIndex = (level * 10) + 1; diff --git a/src/main/java/com/gmail/nossr50/util/platform/MajorMinorPatchVersion.java b/src/main/java/com/gmail/nossr50/util/platform/MajorMinorPatchVersion.java index 47f41a82e..ea114508e 100644 --- a/src/main/java/com/gmail/nossr50/util/platform/MajorMinorPatchVersion.java +++ b/src/main/java/com/gmail/nossr50/util/platform/MajorMinorPatchVersion.java @@ -73,7 +73,7 @@ public abstract class MajorMinorPatchVersion implements Versioned { @Override public String getVersionStr() { - if(isPatch()) { + if (isPatch()) { return majorVersion.getVersionString() + "." + minorVersion + "." + patchVersion; diff --git a/src/main/java/com/gmail/nossr50/util/platform/MinecraftGameVersion.java b/src/main/java/com/gmail/nossr50/util/platform/MinecraftGameVersion.java index 387d831d1..34ccdede9 100644 --- a/src/main/java/com/gmail/nossr50/util/platform/MinecraftGameVersion.java +++ b/src/main/java/com/gmail/nossr50/util/platform/MinecraftGameVersion.java @@ -38,21 +38,21 @@ public class MinecraftGameVersion extends MajorMinorPatchVersion { public boolean isAtLeast(int majorVerNumber, int minorVerNumber, int patchVerNumber) { //First check if the major version is higher, if it is we have no need to check minor version or patch version - if(getMajorVersion().asInt() > majorVerNumber) { + if (getMajorVersion().asInt() > majorVerNumber) { return true; //Major version is one higher and hierarchically more important than the other versions } - if(getMajorVersion().asInt() < majorVerNumber) { + if (getMajorVersion().asInt() < majorVerNumber) { return false; //Major version is below, so return false } //Major version meets the requirement, check minor version - if(getMinorVersion().asInt() > minorVerNumber) { + if (getMinorVersion().asInt() > minorVerNumber) { return true; //Minor version is one higher and hierarchically more important than patch version, so exit here } - if(getMinorVersion().asInt() < minorVerNumber) { + if (getMinorVersion().asInt() < minorVerNumber) { return false; //Minor version is at least one version behind, return false } diff --git a/src/main/java/com/gmail/nossr50/util/platform/PlatformManager.java b/src/main/java/com/gmail/nossr50/util/platform/PlatformManager.java index e68ff1912..5ecf557b0 100644 --- a/src/main/java/com/gmail/nossr50/util/platform/PlatformManager.java +++ b/src/main/java/com/gmail/nossr50/util/platform/PlatformManager.java @@ -72,9 +72,9 @@ public class PlatformManager { //TODO: Rewrite this properly once we actually support a not-bukkit platform private @NotNull ServerSoftwareType determinePlatformType() { - if(Bukkit.getVersion().toLowerCase(Locale.ENGLISH).contains("paper")) + if (Bukkit.getVersion().toLowerCase(Locale.ENGLISH).contains("paper")) return ServerSoftwareType.PAPER; - else if(Bukkit.getVersion().toLowerCase(Locale.ENGLISH).contains("spigot")) + else if (Bukkit.getVersion().toLowerCase(Locale.ENGLISH).contains("spigot")) return ServerSoftwareType.SPIGOT; else return ServerSoftwareType.CRAFT_BUKKIT; 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 f41d740b7..156c17e46 100644 --- a/src/main/java/com/gmail/nossr50/util/player/NotificationManager.java +++ b/src/main/java/com/gmail/nossr50/util/player/NotificationManager.java @@ -45,7 +45,7 @@ public class NotificationManager { */ public static void sendPlayerInformation(Player player, NotificationType notificationType, String key) { - if(UserManager.getPlayer(player) == null || !UserManager.getPlayer(player).useChatNotifications()) + if (UserManager.getPlayer(player) == null || !UserManager.getPlayer(player).useChatNotifications()) return; McMMOMessageType destination @@ -61,7 +61,7 @@ public class NotificationManager { public static boolean doesPlayerUseNotifications(Player player) { - if(UserManager.getPlayer(player) == null) + if (UserManager.getPlayer(player) == null) return false; else return UserManager.getPlayer(player).useChatNotifications(); @@ -84,7 +84,7 @@ public class NotificationManager { public static void sendPlayerInformationChatOnly(Player player, String key, String... values) { - if(UserManager.getPlayer(player) == null || !UserManager.getPlayer(player).useChatNotifications()) + if (UserManager.getPlayer(player) == null || !UserManager.getPlayer(player).useChatNotifications()) return; String preColoredString = LocaleLoader.getString(key, (Object[]) values); @@ -93,7 +93,7 @@ public class NotificationManager { public static void sendPlayerInformationChatOnlyPrefixed(Player player, String key, String... values) { - if(UserManager.getPlayer(player) == null || !UserManager.getPlayer(player).useChatNotifications()) + if (UserManager.getPlayer(player) == null || !UserManager.getPlayer(player).useChatNotifications()) return; String preColoredString = LocaleLoader.getString(key, (Object[]) values); @@ -104,7 +104,7 @@ public class NotificationManager { public static void sendPlayerInformation(Player player, NotificationType notificationType, String key, String... values) { - if(UserManager.getPlayer(player) == null || !UserManager.getPlayer(player).useChatNotifications()) + if (UserManager.getPlayer(player) == null || !UserManager.getPlayer(player).useChatNotifications()) return; McMMOMessageType destination = mcMMO.p.getAdvancedConfig().doesNotificationUseActionBar(notificationType) ? McMMOMessageType.ACTION_BAR : McMMOMessageType.SYSTEM; @@ -123,11 +123,11 @@ public class NotificationManager { Component notificationTextComponent = customEvent.getNotificationTextComponent(); - if(customEvent.getChatMessageType() == McMMOMessageType.ACTION_BAR) { + if (customEvent.getChatMessageType() == McMMOMessageType.ACTION_BAR) { audience.sendActionBar(notificationTextComponent); // If the message is being sent to the action bar we need to check if a copy is also sent to the chat system - if(customEvent.isMessageAlsoBeingSentToChat()) { + if (customEvent.isMessageAlsoBeingSentToChat()) { //Send copy to chat system audience.sendMessage(notificationTextComponent); } @@ -158,7 +158,7 @@ public class NotificationManager { public static void sendPlayerLevelUpNotification(McMMOPlayer mcMMOPlayer, PrimarySkillType skillName, int levelsGained, int newLevel) { - if(!mcMMOPlayer.useChatNotifications()) + if (!mcMMOPlayer.useChatNotifications()) return; McMMOMessageType destination @@ -186,7 +186,7 @@ public class NotificationManager { public static void sendPlayerUnlockNotification(McMMOPlayer mcMMOPlayer, SubSkillType subSkillType) { - if(!mcMMOPlayer.useChatNotifications()) + if (!mcMMOPlayer.useChatNotifications()) return; //CHAT MESSAGE @@ -205,12 +205,12 @@ public class NotificationManager { */ private static void sendAdminNotification(String msg) { //If its not enabled exit - if(!mcMMO.p.getGeneralConfig().adminNotifications()) + if (!mcMMO.p.getGeneralConfig().adminNotifications()) return; for(Player player : Bukkit.getServer().getOnlinePlayers()) { - if(player.isOp() || Permissions.adminChat(player)) + if (player.isOp() || Permissions.adminChat(player)) { player.sendMessage(LocaleLoader.getString("Notifications.Admin.Format.Others", msg)); } @@ -241,7 +241,7 @@ public class NotificationManager { */ String senderName = LocaleLoader.getString("Server.ConsoleName"); - if(commandSender instanceof Player) + if (commandSender instanceof Player) { senderName = ((Player) commandSender).getDisplayName() + ChatColor.RESET + "-" + ((Player) commandSender).getUniqueId(); @@ -284,20 +284,20 @@ public class NotificationManager { } public static void processLevelUpBroadcasting(@NotNull McMMOPlayer mmoPlayer, @NotNull PrimarySkillType primarySkillType, int level) { - if(level <= 0) + if (level <= 0) return; //Check if broadcasting is enabled - if(mcMMO.p.getGeneralConfig().shouldLevelUpBroadcasts()) { + if (mcMMO.p.getGeneralConfig().shouldLevelUpBroadcasts()) { //Permission check - if(!Permissions.levelUpBroadcast(mmoPlayer.getPlayer())) { + if (!Permissions.levelUpBroadcast(mmoPlayer.getPlayer())) { return; } int levelInterval = mcMMO.p.getGeneralConfig().getLevelUpBroadcastInterval(); int remainder = level % levelInterval; - if(remainder == 0) { + if (remainder == 0) { //Grab appropriate audience Audience audience = mcMMO.getAudiences().filter(getLevelUpBroadcastPredicate(mmoPlayer.getPlayer())); //TODO: Make prettier @@ -328,20 +328,20 @@ public class NotificationManager { //TODO: Remove the code duplication, am lazy atm //TODO: Fix broadcasts being skipped for situations where a player skips over the milestone like with the addlevels command public static void processPowerLevelUpBroadcasting(@NotNull McMMOPlayer mmoPlayer, int powerLevel) { - if(powerLevel <= 0) + if (powerLevel <= 0) return; //Check if broadcasting is enabled - if(mcMMO.p.getGeneralConfig().shouldPowerLevelUpBroadcasts()) { + if (mcMMO.p.getGeneralConfig().shouldPowerLevelUpBroadcasts()) { //Permission check - if(!Permissions.levelUpBroadcast(mmoPlayer.getPlayer())) { + if (!Permissions.levelUpBroadcast(mmoPlayer.getPlayer())) { return; } int levelInterval = mcMMO.p.getGeneralConfig().getPowerLevelUpBroadcastInterval(); int remainder = powerLevel % levelInterval; - if(remainder == 0) { + if (remainder == 0) { //Grab appropriate audience Audience audience = mcMMO.getAudiences().filter(getPowerLevelUpBroadcastPredicate(mmoPlayer.getPlayer())); //TODO: Make prettier 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 1f0cba2f1..72ad26c4e 100644 --- a/src/main/java/com/gmail/nossr50/util/player/PlayerLevelUtils.java +++ b/src/main/java/com/gmail/nossr50/util/player/PlayerLevelUtils.java @@ -19,7 +19,7 @@ public class PlayerLevelUtils { // int levelCap = Config.getInstance().getLevelCap(primarySkillType); // int cap; // -// if(levelCap == Integer.MAX_VALUE || levelCap <= 0) +// if (levelCap == Integer.MAX_VALUE || levelCap <= 0) // { // cap = Config.getInstance().getIsRetroMode() ? 50 : 5; // } else { 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 a7f4a840b..8d3044bfc 100644 --- a/src/main/java/com/gmail/nossr50/util/player/UserManager.java +++ b/src/main/java/com/gmail/nossr50/util/player/UserManager.java @@ -30,14 +30,14 @@ public final class UserManager { public static void track(@NotNull McMMOPlayer mcMMOPlayer) { mcMMOPlayer.getPlayer().setMetadata(MetadataConstants.METADATA_KEY_PLAYER_DATA, new FixedMetadataValue(mcMMO.p, mcMMOPlayer)); - if(playerDataSet == null) + if (playerDataSet == null) playerDataSet = new HashSet<>(); playerDataSet.add(mcMMOPlayer); //for sync saves on shutdown } public static void cleanupPlayer(McMMOPlayer mcMMOPlayer) { - if(playerDataSet != null) + if (playerDataSet != null) playerDataSet.remove(mcMMOPlayer); } @@ -49,13 +49,13 @@ public final class UserManager { public static void remove(@NotNull Player player) { McMMOPlayer mcMMOPlayer = getPlayer(player); - if(mcMMOPlayer == null) + if (mcMMOPlayer == null) return; mcMMOPlayer.cleanup(); player.removeMetadata(MetadataConstants.METADATA_KEY_PLAYER_DATA, mcMMO.p); - if(playerDataSet != null) { + if (playerDataSet != null) { playerDataSet.remove(mcMMOPlayer); //Clear sync save tracking } } @@ -68,7 +68,7 @@ public final class UserManager { remove(player); } - if(playerDataSet != null) + if (playerDataSet != null) playerDataSet.clear(); //Clear sync save tracking } @@ -76,7 +76,7 @@ public final class UserManager { * Save all users ON THIS THREAD. */ public static void saveAll() { - if(playerDataSet == null) + if (playerDataSet == null) return; ImmutableList trackedSyncData = ImmutableList.copyOf(playerDataSet); @@ -139,14 +139,14 @@ public final class UserManager { */ public static @Nullable McMMOPlayer getPlayer(@Nullable Player player) { //Avoid Array Index out of bounds - if(player != null && player.hasMetadata(MetadataConstants.METADATA_KEY_PLAYER_DATA)) + if (player != null && player.hasMetadata(MetadataConstants.METADATA_KEY_PLAYER_DATA)) return (McMMOPlayer) player.getMetadata(MetadataConstants.METADATA_KEY_PLAYER_DATA).get(0).value(); else return null; } private static @Nullable McMMOPlayer retrieveMcMMOPlayer(@Nullable String playerName, boolean offlineValid) { - if(playerName == null) + if (playerName == null) return null; Player player = mcMMO.p.getServer().getPlayerExact(playerName); diff --git a/src/main/java/com/gmail/nossr50/util/random/ProbabilityUtil.java b/src/main/java/com/gmail/nossr50/util/random/ProbabilityUtil.java index 093b631f5..ca4a67de8 100644 --- a/src/main/java/com/gmail/nossr50/util/random/ProbabilityUtil.java +++ b/src/main/java/com/gmail/nossr50/util/random/ProbabilityUtil.java @@ -46,7 +46,7 @@ public class ProbabilityUtil { double percentageValue = probability.getValue(); //Doesn't need to be scaled //Apply lucky modifier - if(isLucky) { + if (isLucky) { percentageValue *= LUCKY_MODIFIER; } @@ -65,7 +65,7 @@ public class ProbabilityUtil { double percentageValue = probability.getValue(); //Apply lucky modifier - if(isLucky) { + if (isLucky) { percentageValue *= LUCKY_MODIFIER; } @@ -85,7 +85,7 @@ public class ProbabilityUtil { static SkillProbabilityType getProbabilityType(@NotNull SubSkillType subSkillType) { SkillProbabilityType skillProbabilityType = SkillProbabilityType.DYNAMIC_CONFIGURABLE; - if(subSkillType == SubSkillType.TAMING_FAST_FOOD_SERVICE + if (subSkillType == SubSkillType.TAMING_FAST_FOOD_SERVICE || subSkillType == SubSkillType.AXES_ARMOR_IMPACT || subSkillType == SubSkillType.AXES_GREATER_IMPACT) skillProbabilityType = SkillProbabilityType.STATIC_CONFIGURABLE; @@ -181,7 +181,7 @@ public class ProbabilityUtil { //Luck boolean isLucky = mmoPlayer != null && Permissions.lucky(mmoPlayer.getPlayer(), subSkillType.getParentSkill()); - if(isLucky) { + if (isLucky) { return probability.evaluate(LUCKY_MODIFIER); } else { return probability.evaluate(); @@ -224,7 +224,7 @@ public class ProbabilityUtil { if (mmoPlayer != null) { SubSkillEvent subSkillEvent = EventUtils.callSubSkillEvent(mmoPlayer, subSkillType); - if(subSkillEvent.isCancelled()) { + if (subSkillEvent.isCancelled()) { return Probability.ALWAYS_FAILS; } @@ -232,7 +232,7 @@ public class ProbabilityUtil { double resultModifier = subSkillEvent.getResultModifier(); // Mutate probability - if(resultModifier != 1.0D) + if (resultModifier != 1.0D) probability = Probability.ofPercent(probability.getValue() * resultModifier); } @@ -303,7 +303,7 @@ public class ProbabilityUtil { @Nullable McMMOPlayer mmoPlayer, @NotNull Probability probability) { boolean isLucky = mmoPlayer != null && Permissions.lucky(mmoPlayer.getPlayer(), primarySkillType); - if(isLucky) { + if (isLucky) { return probability.evaluate(LUCKY_MODIFIER); } else { return probability.evaluate(); 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 331d3f5b3..ff952b658 100644 --- a/src/main/java/com/gmail/nossr50/util/scoreboards/ScoreboardManager.java +++ b/src/main/java/com/gmail/nossr50/util/scoreboards/ScoreboardManager.java @@ -185,18 +185,18 @@ public class ScoreboardManager { // Called by PlayerQuitEvent listener and OnPlayerTeleport under certain circumstances public static void teardownPlayer(Player player) { - if(player == null) + if (player == null) return; //Hacky world blacklist fix - if(player.isOnline() && player.isValid()) { - if(Bukkit.getServer().getScoreboardManager() != null) + if (player.isOnline() && player.isValid()) { + if (Bukkit.getServer().getScoreboardManager() != null) player.setScoreboard(Bukkit.getServer().getScoreboardManager().getMainScoreboard()); } - if(getWrapper(player) != null) { + if (getWrapper(player) != null) { ScoreboardWrapper wrapper = PLAYER_SCOREBOARDS.remove(player.getName()); - if(wrapper.revertTask != null) { + if (wrapper.revertTask != null) { wrapper.revertTask.cancel(); } } @@ -225,12 +225,12 @@ public class ScoreboardManager { // Selfboards ScoreboardWrapper wrapper = getWrapper(player); - if(wrapper == null) { + if (wrapper == null) { setupPlayer(player); wrapper = getWrapper(player); } - if(wrapper != null) { + if (wrapper != null) { if ((wrapper.isSkillScoreboard() && wrapper.targetSkill == skill) || (wrapper.isStatsScoreboard()) && wrapper.isBoardShown()) { wrapper.doSidebarUpdateSoon(); } @@ -270,12 +270,12 @@ public class ScoreboardManager { // Selfboards ScoreboardWrapper wrapper = getWrapper(player); - if(wrapper == null) { + if (wrapper == null) { setupPlayer(player); wrapper = getWrapper(player); } - if(wrapper != null) { + if (wrapper != null) { if ((wrapper.isCooldownScoreboard() || wrapper.isSkillScoreboard() && wrapper.targetSkill == skill) && wrapper.isBoardShown()) { wrapper.doSidebarUpdateSoon(); } @@ -290,12 +290,12 @@ public class ScoreboardManager { ScoreboardWrapper wrapper = getWrapper(player); - if(wrapper == null) { + if (wrapper == null) { setupPlayer(player); wrapper = getWrapper(player); } - if(wrapper != null) { + if (wrapper != null) { wrapper.setOldScoreboard(); wrapper.setTypeSkill(skill); @@ -309,12 +309,12 @@ public class ScoreboardManager { ScoreboardWrapper wrapper = getWrapper(player); - if(wrapper == null) { + if (wrapper == null) { setupPlayer(player); wrapper = getWrapper(player); } - if(wrapper != null) { + if (wrapper != null) { wrapper.setOldScoreboard(); wrapper.setTypeSkill(primarySkillType); @@ -328,7 +328,7 @@ public class ScoreboardManager { // Do NOT run if already shown if (wrapper != null && wrapper.isBoardShown()) { - if(wrapper.isBoardShown()) + if (wrapper.isBoardShown()) return; wrapper.setOldScoreboard(); @@ -340,7 +340,7 @@ public class ScoreboardManager { public static void enablePlayerStatsScoreboard(Player player) { ScoreboardWrapper wrapper = getWrapper(player); - if(wrapper == null) + if (wrapper == null) return; @@ -353,12 +353,12 @@ public class ScoreboardManager { public static void enablePlayerInspectScoreboard(@NotNull Player player, @NotNull PlayerProfile targetProfile) { ScoreboardWrapper wrapper = getWrapper(player); - if(wrapper == null) { + if (wrapper == null) { setupPlayer(player); wrapper = getWrapper(player); } - if(wrapper != null) { + if (wrapper != null) { wrapper.setOldScoreboard(); wrapper.setTypeInspectStats(targetProfile); @@ -369,12 +369,12 @@ public class ScoreboardManager { public static void enablePlayerInspectScoreboard(@NotNull Player player, @NotNull McMMOPlayer targetMcMMOPlayer) { ScoreboardWrapper wrapper = getWrapper(player); - if(wrapper == null) { + if (wrapper == null) { setupPlayer(player); wrapper = getWrapper(player); } - if(wrapper != null) { + if (wrapper != null) { wrapper.setOldScoreboard(); wrapper.setTypeInspectStats(targetMcMMOPlayer); @@ -385,12 +385,12 @@ public class ScoreboardManager { public static void enablePlayerCooldownScoreboard(Player player) { ScoreboardWrapper wrapper = getWrapper(player); - if(wrapper == null) { + if (wrapper == null) { setupPlayer(player); wrapper = getWrapper(player); } - if(wrapper != null) { + if (wrapper != null) { wrapper.setOldScoreboard(); wrapper.setTypeCooldowns(); @@ -401,12 +401,12 @@ public class ScoreboardManager { public static void showPlayerRankScoreboard(Player player, Map rank) { ScoreboardWrapper wrapper = getWrapper(player); - if(wrapper == null) { + if (wrapper == null) { setupPlayer(player); wrapper = getWrapper(player); } - if(wrapper != null) { + if (wrapper != null) { wrapper.setOldScoreboard(); wrapper.setTypeSelfRank(); wrapper.acceptRankData(rank); @@ -418,12 +418,12 @@ public class ScoreboardManager { public static void showPlayerRankScoreboardOthers(Player player, String targetName, Map rank) { ScoreboardWrapper wrapper = getWrapper(player); - if(wrapper == null) { + if (wrapper == null) { setupPlayer(player); wrapper = getWrapper(player); } - if(wrapper != null) { + if (wrapper != null) { wrapper.setOldScoreboard(); wrapper.setTypeInspectRank(targetName); wrapper.acceptRankData(rank); @@ -436,12 +436,12 @@ public class ScoreboardManager { ScoreboardWrapper wrapper = getWrapper(player); - if(wrapper == null) { + if (wrapper == null) { setupPlayer(player); wrapper = getWrapper(player); } - if(wrapper != null) { + if (wrapper != null) { wrapper.setOldScoreboard(); wrapper.setTypeTop(skill, pageNumber); wrapper.acceptLeaderboardData(stats); @@ -453,12 +453,12 @@ public class ScoreboardManager { public static void showTopPowerScoreboard(Player player, int pageNumber, List stats) { ScoreboardWrapper wrapper = getWrapper(player); - if(wrapper == null) { + if (wrapper == null) { setupPlayer(player); wrapper = getWrapper(player); } - if(wrapper != null) { + if (wrapper != null) { wrapper.setOldScoreboard(); wrapper.setTypeTopPower(pageNumber); wrapper.acceptLeaderboardData(stats); @@ -468,7 +468,7 @@ public class ScoreboardManager { } public static @Nullable ScoreboardWrapper getWrapper(Player player) { - if(PLAYER_SCOREBOARDS.get(player.getName()) == null) { + if (PLAYER_SCOREBOARDS.get(player.getName()) == null) { makeNewScoreboard(player); } @@ -518,7 +518,7 @@ public class ScoreboardManager { */ public static @Nullable Objective getPowerLevelObjective() { if (!mcMMO.p.getGeneralConfig().getPowerLevelTagsEnabled()) { - if(getScoreboardManager() == null) + if (getScoreboardManager() == null) return null; Objective objective = getScoreboardManager().getMainScoreboard().getObjective(POWER_OBJECTIVE); @@ -532,7 +532,7 @@ public class ScoreboardManager { } - if(getScoreboardManager() == null) + if (getScoreboardManager() == null) return null; Objective powerObjective = getScoreboardManager().getMainScoreboard().getObjective(POWER_OBJECTIVE); @@ -580,7 +580,7 @@ public class ScoreboardManager { } public static @Nullable ScoreboardWrapper makeNewScoreboard(Player player) { - if(getScoreboardManager() == null) + if (getScoreboardManager() == null) return null; //Call our custom event 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 4d2d51560..c6e5377fb 100644 --- a/src/main/java/com/gmail/nossr50/util/scoreboards/ScoreboardWrapper.java +++ b/src/main/java/com/gmail/nossr50/util/scoreboards/ScoreboardWrapper.java @@ -62,7 +62,7 @@ public class ScoreboardWrapper { private void initBoard() { sidebarType = SidebarType.NONE; - if(registered) { + if (registered) { //Make sure our references are pointed at the right things sidebarObjective = scoreboard.getObjective(ScoreboardManager.SIDEBAR_OBJECTIVE); powerObjective = scoreboard.getObjective(ScoreboardManager.POWER_OBJECTIVE); @@ -175,7 +175,7 @@ public class ScoreboardWrapper { if (previousBoard == scoreboard) { // Already displaying it if (this.oldBoard == null) { // (Shouldn't happen) Use failsafe value - we're already displaying our board, but we don't have the one we should revert to - if(mcMMO.p.getServer().getScoreboardManager() != null) + if (mcMMO.p.getServer().getScoreboardManager() != null) this.oldBoard = mcMMO.p.getServer().getScoreboardManager().getMainScoreboard(); } } @@ -218,7 +218,7 @@ public class ScoreboardWrapper { // TODO is there any way to do the time that looks acceptable? // player.sendMessage(LocaleLoader.getString("Commands.Scoreboard.Timer", StringUtils.capitalize(sidebarType.toString().toLowerCase(Locale.ENGLISH)), ticks / 20F)); - if(UserManager.getPlayer(playerName) == null) + if (UserManager.getPlayer(playerName) == null) return; PlayerProfile profile = UserManager.getPlayer(player).getProfile(); @@ -411,7 +411,7 @@ public class ScoreboardWrapper { protected void loadObjective(String displayName) { //Unregister objective McMMOScoreboardObjectiveEvent unregisterEvent = callObjectiveEvent(ScoreboardObjectiveEventReason.UNREGISTER_THIS_OBJECTIVE); - if(!unregisterEvent.isCancelled()) { + if (!unregisterEvent.isCancelled()) { try { sidebarObjective.unregister(); } catch (IllegalStateException e) { @@ -419,7 +419,7 @@ public class ScoreboardWrapper { LogUtils.debug(mcMMO.p.getLogger(), "Recovering scoreboard for player: " + player.getName()); - if(mmoPlayer.isDebugMode()) + if (mmoPlayer.isDebugMode()) NotificationManager.sendPlayerInformationChatOnlyPrefixed(player, "Scoreboard.Recovery"); initBoard(); //Start over @@ -429,7 +429,7 @@ public class ScoreboardWrapper { //Register objective McMMOScoreboardObjectiveEvent registerEvent = callObjectiveEvent(ScoreboardObjectiveEventReason.REGISTER_NEW_OBJECTIVE); - if(!registerEvent.isCancelled()) + if (!registerEvent.isCancelled()) sidebarObjective = registerEvent.getTargetBoard().registerNewObjective(ScoreboardManager.SIDEBAR_OBJECTIVE, "dummy", SIDE_OBJECTIVE); if (displayName.length() > 32) { @@ -453,7 +453,7 @@ public class ScoreboardWrapper { * Load new values into the sidebar. */ private void updateSidebar() { - if(updateTask != null) { + if (updateTask != null) { try { updateTask.cancel(); } catch (Exception e) { @@ -477,7 +477,7 @@ public class ScoreboardWrapper { McMMOPlayer mcMMOPlayer = UserManager.getPlayer(player); - if(mcMMOPlayer == null) + if (mcMMOPlayer == null) return; switch (sidebarType) { 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 8be5e4195..55d02ba31 100644 --- a/src/main/java/com/gmail/nossr50/util/skills/CombatUtils.java +++ b/src/main/java/com/gmail/nossr50/util/skills/CombatUtils.java @@ -61,7 +61,7 @@ public final class CombatUtils { McMMOPlayer mcMMOPlayer = UserManager.getPlayer(player); //Make sure the profiles been loaded - if(mcMMOPlayer == null) { + if (mcMMOPlayer == null) { return; } @@ -72,12 +72,12 @@ public final class CombatUtils { mcMMOPlayer.checkAbilityActivation(PrimarySkillType.SWORDS); } - if(target.getHealth() - event.getFinalDamage() > 0) { + if (target.getHealth() - event.getFinalDamage() > 0) { swordsManager.processRupture(target); } //Add Stab Damage - if(swordsManager.canUseStab()) + if (swordsManager.canUseStab()) { boostedDamage += (swordsManager.getStabDamage() * mcMMOPlayer.getAttackStrength()); } @@ -86,7 +86,7 @@ public final class CombatUtils { swordsManager.serratedStrikes(target, event.getDamage()); } - if(canUseLimitBreak(player, target, SubSkillType.SWORDS_SWORDS_LIMIT_BREAK)) + if (canUseLimitBreak(player, target, SubSkillType.SWORDS_SWORDS_LIMIT_BREAK)) { boostedDamage += (getLimitBreakDamage(player, target, SubSkillType.SWORDS_SWORDS_LIMIT_BREAK) * mcMMOPlayer.getAttackStrength()); } @@ -98,11 +98,11 @@ public final class CombatUtils { } private static void printFinalDamageDebug(@NotNull Player player, @NotNull EntityDamageByEntityEvent event, @NotNull McMMOPlayer mcMMOPlayer, @Nullable String @Nullable ... extraInfoLines) { - if(mcMMOPlayer.isDebugMode()) { + if (mcMMOPlayer.isDebugMode()) { player.sendMessage("Final Damage value after mcMMO modifiers: "+ event.getFinalDamage()); - if(extraInfoLines != null) { + if (extraInfoLines != null) { for(String str : extraInfoLines) { - if(str != null) + if (str != null) player.sendMessage(str); } } @@ -119,7 +119,7 @@ public final class CombatUtils { McMMOPlayer mcMMOPlayer = UserManager.getPlayer(player); //Make sure the profiles been loaded - if(mcMMOPlayer == null) { + if (mcMMOPlayer == null) { return; } @@ -133,7 +133,7 @@ public final class CombatUtils { boostedDamage += (tridentsManager.impaleDamageBonus() * mcMMOPlayer.getAttackStrength()); } - if(canUseLimitBreak(player, target, SubSkillType.TRIDENTS_TRIDENTS_LIMIT_BREAK)) { + if (canUseLimitBreak(player, target, SubSkillType.TRIDENTS_TRIDENTS_LIMIT_BREAK)) { boostedDamage += (getLimitBreakDamage(player, target, SubSkillType.TRIDENTS_TRIDENTS_LIMIT_BREAK) * mcMMOPlayer.getAttackStrength()); } @@ -153,7 +153,7 @@ public final class CombatUtils { McMMOPlayer mcMMOPlayer = UserManager.getPlayer(player); //Make sure the profiles been loaded - if(mcMMOPlayer == null) { + if (mcMMOPlayer == null) { return; } @@ -163,7 +163,7 @@ public final class CombatUtils { boostedDamage += (tridentsManager.impaleDamageBonus() * mcMMOPlayer.getAttackStrength()); } - if(canUseLimitBreak(player, target, SubSkillType.TRIDENTS_TRIDENTS_LIMIT_BREAK)) { + if (canUseLimitBreak(player, target, SubSkillType.TRIDENTS_TRIDENTS_LIMIT_BREAK)) { boostedDamage += (getLimitBreakDamage(player, target, SubSkillType.TRIDENTS_TRIDENTS_LIMIT_BREAK) * mcMMOPlayer.getAttackStrength()); } @@ -180,7 +180,7 @@ public final class CombatUtils { McMMOPlayer mcMMOPlayer = UserManager.getPlayer(player); //Make sure the profiles been loaded - if(mcMMOPlayer == null) { + if (mcMMOPlayer == null) { delayArrowMetaCleanup(arrow); return; } @@ -192,7 +192,7 @@ public final class CombatUtils { boostedDamage = mcMMOPlayer.getCrossbowsManager().poweredShot(initialDamage); } - if(canUseLimitBreak(player, target, SubSkillType.CROSSBOWS_CROSSBOWS_LIMIT_BREAK)) { + if (canUseLimitBreak(player, target, SubSkillType.CROSSBOWS_CROSSBOWS_LIMIT_BREAK)) { boostedDamage+=getLimitBreakDamage(player, target, SubSkillType.CROSSBOWS_CROSSBOWS_LIMIT_BREAK); } @@ -222,13 +222,13 @@ public final class CombatUtils { McMMOPlayer mcMMOPlayer = UserManager.getPlayer(player); //Make sure the profiles been loaded - if(mcMMOPlayer == null) { + if (mcMMOPlayer == null) { return; } // MacesManager macesManager = mcMMOPlayer.getMacesManager(); - if(canUseLimitBreak(player, target, SubSkillType.MACES_MACES_LIMIT_BREAK)) { + if (canUseLimitBreak(player, target, SubSkillType.MACES_MACES_LIMIT_BREAK)) { boostedDamage += (getLimitBreakDamage(player, target, SubSkillType.MACES_MACES_LIMIT_BREAK) * mcMMOPlayer.getAttackStrength()); } @@ -248,7 +248,7 @@ public final class CombatUtils { McMMOPlayer mcMMOPlayer = UserManager.getPlayer(player); //Make sure the profiles been loaded - if(mcMMOPlayer == null) { + if (mcMMOPlayer == null) { return; } @@ -277,7 +277,7 @@ public final class CombatUtils { boostedDamage+=(axesManager.criticalHit(target, boostedDamage) * mcMMOPlayer.getAttackStrength()); } - if(canUseLimitBreak(player, target, SubSkillType.AXES_AXES_LIMIT_BREAK)) + if (canUseLimitBreak(player, target, SubSkillType.AXES_AXES_LIMIT_BREAK)) { boostedDamage+=(getLimitBreakDamage(player, target, SubSkillType.AXES_AXES_LIMIT_BREAK) * mcMMOPlayer.getAttackStrength()); } @@ -298,7 +298,7 @@ public final class CombatUtils { McMMOPlayer mcMMOPlayer = UserManager.getPlayer(player); //Make sure the profiles been loaded - if(mcMMOPlayer == null) { + if (mcMMOPlayer == null) { return; } @@ -320,7 +320,7 @@ public final class CombatUtils { unarmedManager.disarmCheck((Player) target); } - if(canUseLimitBreak(player, target, SubSkillType.UNARMED_UNARMED_LIMIT_BREAK)) + if (canUseLimitBreak(player, target, SubSkillType.UNARMED_UNARMED_LIMIT_BREAK)) { boostedDamage+=(getLimitBreakDamage(player, target, SubSkillType.UNARMED_UNARMED_LIMIT_BREAK) * mcMMOPlayer.getAttackStrength()); } @@ -335,11 +335,11 @@ public final class CombatUtils { double initialDamage = event.getDamage(); double boostedDamage = initialDamage; - if(master != null && master.isOnline() && master.isValid()) { + if (master != null && master.isOnline() && master.isValid()) { McMMOPlayer mcMMOPlayer = UserManager.getPlayer(master); //Make sure the profiles been loaded - if(mcMMOPlayer == null) { + if (mcMMOPlayer == null) { return; } @@ -372,7 +372,7 @@ public final class CombatUtils { McMMOPlayer mcMMOPlayer = UserManager.getPlayer(player); //Make sure the profiles been loaded - if(mcMMOPlayer == null) { + if (mcMMOPlayer == null) { delayArrowMetaCleanup(arrow); return; } @@ -394,7 +394,7 @@ public final class CombatUtils { archeryManager.retrieveArrows(target, arrow); } - if(canUseLimitBreak(player, target, SubSkillType.ARCHERY_ARCHERY_LIMIT_BREAK)) + if (canUseLimitBreak(player, target, SubSkillType.ARCHERY_ARCHERY_LIMIT_BREAK)) { boostedDamage+=getLimitBreakDamage(player, target, SubSkillType.ARCHERY_ARCHERY_LIMIT_BREAK); } @@ -402,7 +402,7 @@ public final class CombatUtils { double distanceMultiplier = ArcheryManager.distanceXpBonusMultiplier(target, arrow); double forceMultiplier = 1.0; //Hacky Fix - some plugins spawn arrows and assign them to players after the ProjectileLaunchEvent fires - if(arrow.hasMetadata(MetadataConstants.METADATA_KEY_BOW_FORCE)) + if (arrow.hasMetadata(MetadataConstants.METADATA_KEY_BOW_FORCE)) forceMultiplier = arrow.getMetadata(MetadataConstants.METADATA_KEY_BOW_FORCE).get(0).asDouble(); event.setDamage(boostedDamage); @@ -431,7 +431,7 @@ public final class CombatUtils { } if (target instanceof Player player) { - if(ExperienceConfig.getInstance().isNPCInteractionPrevented()) { + if (ExperienceConfig.getInstance().isNPCInteractionPrevented()) { if (Misc.isNPCEntityExcludingVillagers(target)) { return; } @@ -549,7 +549,7 @@ public final class CombatUtils { if (projectileSource instanceof Player player) { if (!Misc.isNPCEntityExcludingVillagers(player)) { - if(mcMMO.p.getSkillTools().canCombatSkillsTrigger(PrimarySkillType.TRIDENTS, target)) { + if (mcMMO.p.getSkillTools().canCombatSkillsTrigger(PrimarySkillType.TRIDENTS, target)) { processTridentCombatRanged(trident, target, player, event); } } @@ -561,9 +561,9 @@ public final class CombatUtils { if (projectileSource instanceof Player player) { if (!Misc.isNPCEntityExcludingVillagers(player)) { - if(!isCrossbow && mcMMO.p.getSkillTools().canCombatSkillsTrigger(PrimarySkillType.ARCHERY, target)) { + if (!isCrossbow && mcMMO.p.getSkillTools().canCombatSkillsTrigger(PrimarySkillType.ARCHERY, target)) { processArcheryCombat(target, player, event, arrow); - } else if(isCrossbow && mcMMO.p.getSkillTools().canCombatSkillsTrigger(PrimarySkillType.CROSSBOWS, target)) { + } else if (isCrossbow && mcMMO.p.getSkillTools().canCombatSkillsTrigger(PrimarySkillType.CROSSBOWS, target)) { processCrossbowsCombat(target, player, event, arrow); } } else { @@ -576,7 +576,7 @@ public final class CombatUtils { && mcMMO.p.getSkillTools().doesPlayerHaveSkillPermission(player, PrimarySkillType.TAMING)) { McMMOPlayer mcMMOPlayer = UserManager.getPlayer(player); - if(mcMMOPlayer == null) + if (mcMMOPlayer == null) return; TamingManager tamingManager = mcMMOPlayer.getTamingManager(); @@ -594,7 +594,7 @@ public final class CombatUtils { { List metadataValue = entity.getMetadata(MetadataConstants.METADATA_KEY_OLD_NAME_KEY); - if(metadataValue.size() <= 0) + if (metadataValue.size() <= 0) return; OldName oldName = (OldName) metadataValue.get(0); @@ -612,7 +612,7 @@ public final class CombatUtils { * @return the RAW damage bonus from Limit Break which is applied before reductions */ public static int getLimitBreakDamage(@NotNull Player attacker, @NotNull LivingEntity defender, @NotNull SubSkillType subSkillType) { - if(defender instanceof Player playerDefender) { + if (defender instanceof Player playerDefender) { return getLimitBreakDamageAgainstQuality(attacker, subSkillType, getArmorQualityLevel(playerDefender)); } else { return getLimitBreakDamageAgainstQuality(attacker, subSkillType, 1000); @@ -630,11 +630,11 @@ public final class CombatUtils { public static int getLimitBreakDamageAgainstQuality(@NotNull Player attacker, @NotNull SubSkillType subSkillType, int armorQualityLevel) { int rawDamageBoost = RankUtils.getRank(attacker, subSkillType); - if(armorQualityLevel <= 4) { + if (armorQualityLevel <= 4) { rawDamageBoost *= .25; //75% Nerf - } else if(armorQualityLevel <= 8) { + } else if (armorQualityLevel <= 8) { rawDamageBoost *= .50; //50% Nerf - } else if(armorQualityLevel <= 12) { + } else if (armorQualityLevel <= 12) { rawDamageBoost *= .75; //25% Nerf } @@ -650,7 +650,7 @@ public final class CombatUtils { int armorQualityLevel = 0; for(ItemStack itemStack : defender.getInventory().getArmorContents()) { - if(itemStack != null) { + if (itemStack != null) { armorQualityLevel += getArmorQuality(itemStack); } } @@ -673,7 +673,7 @@ public final class CombatUtils { * @return true if the player has access to the limit break */ public static boolean canUseLimitBreak(@NotNull Player player, LivingEntity target, @NotNull SubSkillType subSkillType) { - if(target instanceof Player || mcMMO.p.getAdvancedConfig().canApplyLimitBreakPVE()) { + if (target instanceof Player || mcMMO.p.getAdvancedConfig().canApplyLimitBreakPVE()) { return RankUtils.hasUnlockedSubskill(player, subSkillType) && Permissions.isSubSkillEnabled(player, subSkillType); } else { @@ -826,7 +826,7 @@ public final class CombatUtils { McMMOPlayer mmoAttacker = UserManager.getPlayer(attacker); - if(mmoAttacker != null) { + if (mmoAttacker != null) { mmoAttacker.getSwordsManager().processRupture(livingEntity); } @@ -923,17 +923,17 @@ public final class CombatUtils { } } - if(hasMobFlag(MobMetaFlagType.COTW_SUMMONED_MOB, target)) { + if (hasMobFlag(MobMetaFlagType.COTW_SUMMONED_MOB, target)) { baseXP = 0; - } else if(hasMobFlag(MobMetaFlagType.MOB_SPAWNER_MOB, target) || target.hasMetadata("ES")) { + } else if (hasMobFlag(MobMetaFlagType.MOB_SPAWNER_MOB, target) || target.hasMetadata("ES")) { baseXP *= ExperienceConfig.getInstance().getSpawnedMobXpMultiplier(); - } else if(hasMobFlag(MobMetaFlagType.NETHER_PORTAL_MOB, target)) { + } else if (hasMobFlag(MobMetaFlagType.NETHER_PORTAL_MOB, target)) { baseXP *= ExperienceConfig.getInstance().getNetherPortalXpMultiplier(); - } else if(hasMobFlag(MobMetaFlagType.EGG_MOB, target)) { + } else if (hasMobFlag(MobMetaFlagType.EGG_MOB, target)) { baseXP *= ExperienceConfig.getInstance().getEggXpMultiplier(); } else if (hasMobFlag(MobMetaFlagType.PLAYER_BRED_MOB, target)) { baseXP *= ExperienceConfig.getInstance().getBredMobXpMultiplier(); - } else if(hasMobFlag(MobMetaFlagType.PLAYER_TAMED_MOB, target)) { + } else if (hasMobFlag(MobMetaFlagType.PLAYER_TAMED_MOB, target)) { baseXP *= ExperienceConfig.getInstance().getTamedMobXpMultiplier(); } @@ -958,14 +958,14 @@ public final class CombatUtils { private static boolean shouldBeAffected(@NotNull Player player, @NotNull Entity entity) { if (entity instanceof Player defender) { //TODO: NPC Interaction? - if(UserManager.getPlayer(defender) == null) + if (UserManager.getPlayer(defender) == null) return true; if (!defender.getWorld().getPVP() || defender == player || UserManager.getPlayer(defender).getGodMode()) { return false; } - if(mcMMO.p.getPartyConfig().isPartyEnabled()) { + if (mcMMO.p.getPartyConfig().isPartyEnabled()) { if ((mcMMO.p.getPartyManager().inSameParty(player, defender) || mcMMO.p.getPartyManager().areAllies(player, defender)) && !(Permissions.friendlyFire(player) && Permissions.friendlyFire(defender))) { return false; } @@ -1077,7 +1077,7 @@ public final class CombatUtils { public static void modifyMoveSpeed(@NotNull LivingEntity livingEntity, double multiplier) { AttributeInstance attributeInstance = livingEntity.getAttribute(Attribute.GENERIC_MOVEMENT_SPEED); - if(attributeInstance != null) { + if (attributeInstance != null) { double normalSpeed = attributeInstance.getBaseValue(); attributeInstance.setBaseValue(normalSpeed * multiplier); } diff --git a/src/main/java/com/gmail/nossr50/util/skills/ParticleEffectUtils.java b/src/main/java/com/gmail/nossr50/util/skills/ParticleEffectUtils.java index 48265d03f..7cd22a75f 100644 --- a/src/main/java/com/gmail/nossr50/util/skills/ParticleEffectUtils.java +++ b/src/main/java/com/gmail/nossr50/util/skills/ParticleEffectUtils.java @@ -82,7 +82,7 @@ public final class ParticleEffectUtils { return; } - if(location.getWorld() == null) + if (location.getWorld() == null) return; location.getWorld().playEffect(location, Effect.MOBSPAWNER_FLAMES, 1); @@ -91,7 +91,7 @@ public final class ParticleEffectUtils { public static void playSmokeEffect(Location location) { World world = location.getWorld(); - if(world == null) + if (world == null) return; // Have to do it this way, because not all block directions are valid for smoke diff --git a/src/main/java/com/gmail/nossr50/util/skills/PerksUtils.java b/src/main/java/com/gmail/nossr50/util/skills/PerksUtils.java index ca651cd52..9891582f9 100644 --- a/src/main/java/com/gmail/nossr50/util/skills/PerksUtils.java +++ b/src/main/java/com/gmail/nossr50/util/skills/PerksUtils.java @@ -54,7 +54,7 @@ public final class PerksUtils { double modifier = 1.0F; if (Permissions.customXpBoost(player, skill)) { - if(UserManager.getPlayer(player) != null && UserManager.getPlayer(player).isDebugMode()) { + if (UserManager.getPlayer(player) != null && UserManager.getPlayer(player).isDebugMode()) { player.sendMessage(ChatColor.GOLD + "[DEBUG] " + ChatColor.DARK_GRAY + "XP Perk Multiplier IS CUSTOM! "); } @@ -84,7 +84,7 @@ public final class PerksUtils { float modifiedXP = (float) (xp * modifier); - if(UserManager.getPlayer(player) != null && UserManager.getPlayer(player).isDebugMode()) { + if (UserManager.getPlayer(player) != null && UserManager.getPlayer(player).isDebugMode()) { player.sendMessage(ChatColor.GOLD + "[DEBUG] " + ChatColor.RESET + "XP Perk Multiplier - " + ChatColor.GOLD + modifier); player.sendMessage(ChatColor.GOLD + "[DEBUG] " + ChatColor.RESET + "Original XP before perk boosts " + ChatColor.RED + (double) xp); player.sendMessage(ChatColor.GOLD + "[DEBUG] " + ChatColor.RESET + "XP AFTER PERKS " + ChatColor.DARK_RED + modifiedXP); diff --git a/src/main/java/com/gmail/nossr50/util/skills/ProjectileUtils.java b/src/main/java/com/gmail/nossr50/util/skills/ProjectileUtils.java index f64bac7a3..4835afc47 100644 --- a/src/main/java/com/gmail/nossr50/util/skills/ProjectileUtils.java +++ b/src/main/java/com/gmail/nossr50/util/skills/ProjectileUtils.java @@ -29,54 +29,54 @@ public class ProjectileUtils { */ // TODO: Add test public static void cleanupProjectileMetadata(@NotNull Arrow arrow) { - if(arrow.hasMetadata(MetadataConstants.METADATA_KEY_INF_ARROW)) { + if (arrow.hasMetadata(MetadataConstants.METADATA_KEY_INF_ARROW)) { arrow.removeMetadata(MetadataConstants.METADATA_KEY_INF_ARROW, mcMMO.p); } - if(arrow.hasMetadata(MetadataConstants.METADATA_KEY_BOW_FORCE)) { + if (arrow.hasMetadata(MetadataConstants.METADATA_KEY_BOW_FORCE)) { arrow.removeMetadata(MetadataConstants.METADATA_KEY_BOW_FORCE, mcMMO.p); } - if(arrow.hasMetadata(MetadataConstants.METADATA_KEY_ARROW_DISTANCE)) { + if (arrow.hasMetadata(MetadataConstants.METADATA_KEY_ARROW_DISTANCE)) { arrow.removeMetadata(MetadataConstants.METADATA_KEY_ARROW_DISTANCE, mcMMO.p); } - if(arrow.hasMetadata(MetadataConstants.METADATA_KEY_SPAWNED_ARROW)) { + if (arrow.hasMetadata(MetadataConstants.METADATA_KEY_SPAWNED_ARROW)) { arrow.removeMetadata(MetadataConstants.METADATA_KEY_SPAWNED_ARROW, mcMMO.p); } - if(arrow.hasMetadata(MetadataConstants.METADATA_KEY_MULTI_SHOT_ARROW)) { + if (arrow.hasMetadata(MetadataConstants.METADATA_KEY_MULTI_SHOT_ARROW)) { arrow.removeMetadata(MetadataConstants.METADATA_KEY_MULTI_SHOT_ARROW, mcMMO.p); } - if(arrow.hasMetadata(MetadataConstants.METADATA_KEY_BOUNCE_COUNT)) { + if (arrow.hasMetadata(MetadataConstants.METADATA_KEY_BOUNCE_COUNT)) { arrow.removeMetadata(MetadataConstants.METADATA_KEY_BOUNCE_COUNT, mcMMO.p); } } public static void copyArrowMetadata(@NotNull Plugin pluginRef, @NotNull Arrow arrowToCopy, @NotNull Arrow newArrow) { - if(arrowToCopy.hasMetadata(MetadataConstants.METADATA_KEY_INF_ARROW)) { + if (arrowToCopy.hasMetadata(MetadataConstants.METADATA_KEY_INF_ARROW)) { newArrow.setMetadata(MetadataConstants.METADATA_KEY_INF_ARROW, arrowToCopy.getMetadata(MetadataConstants.METADATA_KEY_INF_ARROW).get(0)); } - if(arrowToCopy.hasMetadata(MetadataConstants.METADATA_KEY_BOW_FORCE)) { + if (arrowToCopy.hasMetadata(MetadataConstants.METADATA_KEY_BOW_FORCE)) { newArrow.setMetadata(MetadataConstants.METADATA_KEY_BOW_FORCE, new FixedMetadataValue(pluginRef, arrowToCopy.getMetadata(MetadataConstants.METADATA_KEY_BOW_FORCE).get(0).asDouble())); } - if(arrowToCopy.hasMetadata(MetadataConstants.METADATA_KEY_ARROW_DISTANCE)) { + if (arrowToCopy.hasMetadata(MetadataConstants.METADATA_KEY_ARROW_DISTANCE)) { newArrow.setMetadata(MetadataConstants.METADATA_KEY_ARROW_DISTANCE, arrowToCopy.getMetadata(MetadataConstants.METADATA_KEY_ARROW_DISTANCE).get(0)); } - if(arrowToCopy.hasMetadata(MetadataConstants.METADATA_KEY_SPAWNED_ARROW)) { + if (arrowToCopy.hasMetadata(MetadataConstants.METADATA_KEY_SPAWNED_ARROW)) { newArrow.setMetadata(MetadataConstants.METADATA_KEY_SPAWNED_ARROW, arrowToCopy.getMetadata(MetadataConstants.METADATA_KEY_SPAWNED_ARROW).get(0)); } - if(arrowToCopy.hasMetadata(MetadataConstants.METADATA_KEY_MULTI_SHOT_ARROW)) { + if (arrowToCopy.hasMetadata(MetadataConstants.METADATA_KEY_MULTI_SHOT_ARROW)) { newArrow.setMetadata(MetadataConstants.METADATA_KEY_MULTI_SHOT_ARROW, arrowToCopy.getMetadata(MetadataConstants.METADATA_KEY_MULTI_SHOT_ARROW).get(0)); } 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 e06497128..38a730d7b 100644 --- a/src/main/java/com/gmail/nossr50/util/skills/RankUtils.java +++ b/src/main/java/com/gmail/nossr50/util/skills/RankUtils.java @@ -36,15 +36,15 @@ public class RankUtils { HashMap innerMap = subSkillRanks.get(subSkillType.toString()); //If the skill doesn't have registered ranks gtfo - if(innerMap == null || innerMap.get(playerRankInSkill) == null) + if (innerMap == null || innerMap.get(playerRankInSkill) == null) continue; //Don't send notifications if the player lacks the permission node - if(!Permissions.isSubSkillEnabled(mcMMOPlayer.getPlayer(), subSkillType)) + if (!Permissions.isSubSkillEnabled(mcMMOPlayer.getPlayer(), subSkillType)) continue; //The players level is the exact level requirement for this skill - if(newLevel == innerMap.get(playerRankInSkill)) + if (newLevel == innerMap.get(playerRankInSkill)) { SkillUnlockNotificationTask skillUnlockNotificationTask = new SkillUnlockNotificationTask(mcMMOPlayer, subSkillType, newLevel); @@ -180,19 +180,19 @@ public class RankUtils { String skillName = subSkillType.toString(); int numRanks = subSkillType.getNumRanks(); - if(subSkillRanks == null) + if (subSkillRanks == null) subSkillRanks = new HashMap<>(); - if(numRanks == 0) + if (numRanks == 0) return -1; //-1 Means the skill doesn't have ranks - if(subSkillRanks.get(skillName) == null && numRanks > 0) + if (subSkillRanks.get(skillName) == null && numRanks > 0) addRanks(subSkillType); //Get our rank map HashMap rankMap = subSkillRanks.get(skillName); - if(UserManager.getPlayer(player) == null) + if (UserManager.getPlayer(player) == null) return 0; //Skill level of parent skill @@ -205,11 +205,11 @@ public class RankUtils { int unlockLevel = getRankUnlockLevel(subSkillType, rank); //If we check all ranks and still cannot unlock the skill, we return rank 0 - if(rank == 0) + if (rank == 0) return 0; //True if our skill level can unlock the current rank - if(currentSkillLevel >= unlockLevel) + if (currentSkillLevel >= unlockLevel) return rank; } @@ -227,19 +227,19 @@ public class RankUtils { String skillName = abstractSubSkill.getConfigKeyName(); int numRanks = abstractSubSkill.getNumRanks(); - if(subSkillRanks == null) + if (subSkillRanks == null) subSkillRanks = new HashMap<>(); - if(numRanks == 0) + if (numRanks == 0) return -1; //-1 Means the skill doesn't have ranks - if(subSkillRanks.get(skillName) == null && numRanks > 0) + if (subSkillRanks.get(skillName) == null && numRanks > 0) addRanks(abstractSubSkill); //Get our rank map HashMap rankMap = subSkillRanks.get(skillName); - if(UserManager.getPlayer(player) == null) + if (UserManager.getPlayer(player) == null) return 0; //Skill level of parent skill @@ -252,11 +252,11 @@ public class RankUtils { int unlockLevel = getRankUnlockLevel(abstractSubSkill, rank); //If we check all ranks and still cannot unlock the skill, we return rank 0 - if(rank == 0) + if (rank == 0) return 0; //True if our skill level can unlock the current rank - if(currentSkillLevel >= unlockLevel) + if (currentSkillLevel >= unlockLevel) return rank; } diff --git a/src/main/java/com/gmail/nossr50/util/skills/SkillTools.java b/src/main/java/com/gmail/nossr50/util/skills/SkillTools.java index d9f25db2c..151c7e649 100644 --- a/src/main/java/com/gmail/nossr50/util/skills/SkillTools.java +++ b/src/main/java/com/gmail/nossr50/util/skills/SkillTools.java @@ -69,7 +69,7 @@ public class SkillTools { for(SubSkillType subSkillType : SubSkillType.values()) { String[] splitSubSkillName = subSkillType.toString().split("_"); - if(primarySkillType1.toString().equalsIgnoreCase(splitSubSkillName[0])) { + if (primarySkillType1.toString().equalsIgnoreCase(splitSubSkillName[0])) { //Parent Skill Found tempSubParentMap.put(subSkillType, primarySkillType1); } @@ -127,7 +127,7 @@ public class SkillTools { PrimarySkillType parent = getSuperAbilityParent(superAbilityType); tempAbilityParentRelationshipMap.put(superAbilityType, parent); - if(superAbilityType != SuperAbilityType.BLAST_MINING) { + if (superAbilityType != SuperAbilityType.BLAST_MINING) { //This map is used only for abilities that have a tool readying phase, so blast mining is ignored tempMainActivatedAbilityChildMap.put(parent, superAbilityType); } @@ -296,7 +296,7 @@ public class SkillTools { } public SuperAbilityType getSuperAbility(PrimarySkillType primarySkillType) { - if(mainActivatedAbilityChildMap.get(primarySkillType) == null) + if (mainActivatedAbilityChildMap.get(primarySkillType) == null) return null; return mainActivatedAbilityChildMap.get(primarySkillType); 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 20b9afd3d..c83389f8b 100644 --- a/src/main/java/com/gmail/nossr50/util/skills/SkillUtils.java +++ b/src/main/java/com/gmail/nossr50/util/skills/SkillUtils.java @@ -61,7 +61,7 @@ public final class SkillUtils { int length; - if(abilityLengthCap > 0) + if (abilityLengthCap > 0) { length = (int) Math.min(abilityLengthCap, 2 + (skillValue / abilityLengthVar)); } else { @@ -142,7 +142,7 @@ public final class SkillUtils { if (HiddenConfig.getInstance().useEnchantmentBuffs()) { ItemStack heldItem = player.getInventory().getItemInMainHand(); - if(heldItem == null) + if (heldItem == null) return; if (!ItemUtils.canBeSuperAbilityDigBoosted(heldItem)) { @@ -171,7 +171,7 @@ public final class SkillUtils { McMMOPlayer mcMMOPlayer = UserManager.getPlayer(player); //Not Loaded - if(mcMMOPlayer == null) + if (mcMMOPlayer == null) return; PrimarySkillType skill = mcMMOPlayer.getAbilityMode(SuperAbilityType.SUPER_BREAKER) ? PrimarySkillType.MINING : PrimarySkillType.EXCAVATION; @@ -181,7 +181,7 @@ public final class SkillUtils { int ticks; - if(abilityLengthCap > 0) + if (abilityLengthCap > 0) { ticks = PerksUtils.handleActivationPerks(player, Math.min(abilityLengthCap, 2 + (mcMMOPlayer.getSkillLevel(skill) / abilityLengthVar)), mcMMO.p.getSkillTools().getSuperAbilityMaxLength(mcMMO.p.getSkillTools().getSuperAbility(skill))) * Misc.TICK_CONVERSION_FACTOR; @@ -202,18 +202,18 @@ public final class SkillUtils { } public static void removeAbilityBuff(@Nullable ItemStack itemStack) { - if(itemStack == null) + if (itemStack == null) return; - if(!ItemUtils.canBeSuperAbilityDigBoosted(itemStack)) + if (!ItemUtils.canBeSuperAbilityDigBoosted(itemStack)) return; //1.13.2+ will have persistent metadata for this itemStack - if(isLegacyAbilityTool(itemStack)) { + if (isLegacyAbilityTool(itemStack)) { ItemMeta itemMeta = itemStack.getItemMeta(); - if(itemMeta != null) { + if (itemMeta != null) { // This is safe to call without prior checks. itemMeta.removeEnchant(mcMMO.p.getEnchantmentMapper().getEfficiency()); @@ -222,7 +222,7 @@ public final class SkillUtils { } } - if(isSuperAbilityBoosted(itemStack)) { + if (isSuperAbilityBoosted(itemStack)) { removeBonusDigSpeedOnSuperAbilityTool(itemStack); } } @@ -239,7 +239,7 @@ public final class SkillUtils { * @param maxDamageModifier the amount to adjust the max damage by */ public static void handleDurabilityChange(ItemStack itemStack, double durabilityModifier, double maxDamageModifier) { - if(itemStack.hasItemMeta() && itemStack.getItemMeta().isUnbreakable()) { + if (itemStack.hasItemMeta() && itemStack.getItemMeta().isUnbreakable()) { return; } @@ -269,7 +269,7 @@ public final class SkillUtils { * @param maxDamageModifier the amount to adjust the max damage by */ public static void handleArmorDurabilityChange(ItemStack itemStack, double durabilityModifier, double maxDamageModifier) { - if(itemStack.hasItemMeta() && itemStack.getItemMeta().isUnbreakable()) { + if (itemStack.hasItemMeta() && itemStack.getItemMeta().isUnbreakable()) { return; } @@ -315,7 +315,7 @@ public final class SkillUtils { public static int getRepairAndSalvageQuantities(Material itemMaterial, Material recipeMaterial) { int quantity = 0; - if(mcMMO.getMaterialMapStore().isNetheriteTool(itemMaterial) || mcMMO.getMaterialMapStore().isNetheriteArmor(itemMaterial)) { + if (mcMMO.getMaterialMapStore().isNetheriteTool(itemMaterial) || mcMMO.getMaterialMapStore().isNetheriteArmor(itemMaterial)) { //One netherite bar requires 4 netherite scraps return 4; } @@ -323,10 +323,10 @@ public final class SkillUtils { for(Iterator recipeIterator = Bukkit.getServer().recipeIterator(); recipeIterator.hasNext();) { Recipe bukkitRecipe = recipeIterator.next(); - if(bukkitRecipe.getResult().getType() != itemMaterial) + if (bukkitRecipe.getResult().getType() != itemMaterial) continue; - if(bukkitRecipe instanceof ShapelessRecipe) { + if (bukkitRecipe instanceof ShapelessRecipe) { for (ItemStack ingredient : ((ShapelessRecipe) bukkitRecipe).getIngredientList()) { if (ingredient != null && (recipeMaterial == null || ingredient.getType() == recipeMaterial) @@ -334,7 +334,7 @@ public final class SkillUtils { quantity += ingredient.getAmount(); } } - } else if(bukkitRecipe instanceof ShapedRecipe) { + } else if (bukkitRecipe instanceof ShapedRecipe) { for (ItemStack ingredient : ((ShapedRecipe) bukkitRecipe).getIngredientMap().values()) { if (ingredient != null && (recipeMaterial == null || ingredient.getType() == recipeMaterial) diff --git a/src/main/java/com/gmail/nossr50/util/sounds/SoundManager.java b/src/main/java/com/gmail/nossr50/util/sounds/SoundManager.java index e3b21da03..8cfa7da25 100644 --- a/src/main/java/com/gmail/nossr50/util/sounds/SoundManager.java +++ b/src/main/java/com/gmail/nossr50/util/sounds/SoundManager.java @@ -15,13 +15,13 @@ public class SoundManager { */ public static void sendSound(Player player, Location location, SoundType soundType) { - if(SoundConfig.getInstance().getIsEnabled(soundType)) + if (SoundConfig.getInstance().getIsEnabled(soundType)) player.playSound(location, getSound(soundType), SoundCategory.MASTER, getVolume(soundType), getPitch(soundType)); } public static void sendCategorizedSound(Player player, Location location, SoundType soundType, SoundCategory soundCategory) { - if(SoundConfig.getInstance().getIsEnabled(soundType)) + if (SoundConfig.getInstance().getIsEnabled(soundType)) player.playSound(location, getSound(soundType), soundCategory, getVolume(soundType), getPitch(soundType)); } @@ -29,18 +29,18 @@ public class SoundManager { { float totalPitch = Math.min(2.0F, (getPitch(soundType) + pitchModifier)); - if(SoundConfig.getInstance().getIsEnabled(soundType)) + if (SoundConfig.getInstance().getIsEnabled(soundType)) player.playSound(location, getSound(soundType), soundCategory, getVolume(soundType), totalPitch); } public static void worldSendSound(World world, Location location, SoundType soundType) { - if(SoundConfig.getInstance().getIsEnabled(soundType)) + if (SoundConfig.getInstance().getIsEnabled(soundType)) world.playSound(location, getSound(soundType), getVolume(soundType), getPitch(soundType)); } public static void worldSendSoundMaxPitch(World world, Location location, SoundType soundType) { - if(SoundConfig.getInstance().getIsEnabled(soundType)) + if (SoundConfig.getInstance().getIsEnabled(soundType)) world.playSound(location, getSound(soundType), getVolume(soundType), 2.0F); } @@ -56,7 +56,7 @@ public class SoundManager { private static float getPitch(SoundType soundType) { - if(soundType == SoundType.FIZZ) + if (soundType == SoundType.FIZZ) return getFizzPitch(); else if (soundType == SoundType.POP) return getPopPitch(); diff --git a/src/main/java/com/gmail/nossr50/util/text/StringUtils.java b/src/main/java/com/gmail/nossr50/util/text/StringUtils.java index a6fa01180..b906058fa 100644 --- a/src/main/java/com/gmail/nossr50/util/text/StringUtils.java +++ b/src/main/java/com/gmail/nossr50/util/text/StringUtils.java @@ -71,7 +71,7 @@ public class StringUtils { StringBuilder trimMessage = new StringBuilder(); for (int i = index; i < args.length; i++) { - if(i + 1 >= args.length) + if (i + 1 >= args.length) trimMessage.append(args[i]); else trimMessage.append(args[i]).append(" "); diff --git a/src/main/java/com/gmail/nossr50/util/text/TextUtils.java b/src/main/java/com/gmail/nossr50/util/text/TextUtils.java index 1d3c001d5..782bd5ccc 100644 --- a/src/main/java/com/gmail/nossr50/util/text/TextUtils.java +++ b/src/main/java/com/gmail/nossr50/util/text/TextUtils.java @@ -31,15 +31,15 @@ public class TextUtils { TextComponent.Builder componentBuilder = Component.text(); for(Component component : componentsArray) { - if(component == null) //Individual elements can be null + if (component == null) //Individual elements can be null continue; - if(prefixComponent != null) + if (prefixComponent != null) componentBuilder.append(prefixComponent); componentBuilder.append(component); - if(suffixComponent != null) + if (suffixComponent != null) componentBuilder.append(suffixComponent); } @@ -68,14 +68,14 @@ public class TextUtils { int indexOfPotentialMember = i + (groupsFinished * 3); //Groups don't always fill all members neatly //Some groups won't have entirely non-null elements - if(indexOfPotentialMember > components.size()-1) { + if (indexOfPotentialMember > components.size()-1) { break; } Component potentialMember = components.get(indexOfPotentialMember); //Make sure the potential member exists because of rounding - if(potentialMember != null) { + if (potentialMember != null) { splitGroups[groupsFinished][i] = potentialMember; } } @@ -113,7 +113,7 @@ public class TextUtils { } public static @NotNull TextComponent colorizeText(@NotNull String rawtext) { - if(customLegacySerializer == null) { + if (customLegacySerializer == null) { customLegacySerializer = getSerializer(); } @@ -139,7 +139,7 @@ public class TextUtils { } public static @NotNull String sanitizeForSerializer(@NotNull String string) { - if(customLegacySerializer == null) { + if (customLegacySerializer == null) { customLegacySerializer = getSerializer(); } diff --git a/src/main/java/com/gmail/nossr50/worldguard/WorldGuardManager.java b/src/main/java/com/gmail/nossr50/worldguard/WorldGuardManager.java index 29b4e89c2..f95671275 100644 --- a/src/main/java/com/gmail/nossr50/worldguard/WorldGuardManager.java +++ b/src/main/java/com/gmail/nossr50/worldguard/WorldGuardManager.java @@ -19,7 +19,7 @@ public class WorldGuardManager { private WorldGuardPlugin worldGuardPluginRef; public static WorldGuardManager getInstance() { - if(instance == null) + if (instance == null) instance = new WorldGuardManager(); return instance; @@ -27,7 +27,7 @@ public class WorldGuardManager { public boolean hasMainFlag(Player player) { - if(player == null) + if (player == null) return false; BukkitPlayer localPlayer = BukkitAdapter.adapt(player); @@ -43,7 +43,7 @@ public class WorldGuardManager { public boolean hasXPFlag(Player player) { - if(player == null) + if (player == null) return false; BukkitPlayer localPlayer = BukkitAdapter.adapt(player); @@ -59,7 +59,7 @@ public class WorldGuardManager { public boolean hasHardcoreFlag(Player player) { - if(player == null) + if (player == null) return false; BukkitPlayer localPlayer = BukkitAdapter.adapt(player); diff --git a/src/main/java/com/gmail/nossr50/worldguard/WorldGuardUtils.java b/src/main/java/com/gmail/nossr50/worldguard/WorldGuardUtils.java index d37f0a50c..82cf426da 100644 --- a/src/main/java/com/gmail/nossr50/worldguard/WorldGuardUtils.java +++ b/src/main/java/com/gmail/nossr50/worldguard/WorldGuardUtils.java @@ -43,7 +43,7 @@ public class WorldGuardUtils { public static boolean isWorldGuardLoaded() { - if(detectedIncompatibleWG) + if (detectedIncompatibleWG) return false; worldGuardPluginRef = getWorldGuard(); @@ -59,21 +59,21 @@ public class WorldGuardUtils { private static WorldGuardPlugin getWorldGuard() { //WG plugin reference is already cached so just return it - if(isLoaded) + if (isLoaded) return worldGuardPluginRef; //Grab WG if it exists Plugin plugin = getServer().getPluginManager().getPlugin("WorldGuard"); - if(plugin == null) { + if (plugin == null) { //WG is not present detectedIncompatibleWG = true; LogUtils.debug(mcMMO.p.getLogger(), "WorldGuard was not detected."); } else { //Check that its actually of class WorldGuardPlugin - if(plugin instanceof WorldGuardPlugin) + if (plugin instanceof WorldGuardPlugin) { - if(isCompatibleVersion(plugin)) + if (isCompatibleVersion(plugin)) { worldGuardPluginRef = (WorldGuardPlugin) plugin; isLoaded = true; @@ -119,8 +119,8 @@ public class WorldGuardUtils { * If WG appears to have all of its classes we can then check to see if its been initialized properly */ try { - if(allClassesFound) { - if(!((SimpleFlagRegistry) WorldGuard.getInstance().getFlagRegistry()).isInitialized()) { + if (allClassesFound) { + if (!((SimpleFlagRegistry) WorldGuard.getInstance().getFlagRegistry()).isInitialized()) { markWGIncompatible(); mcMMO.p.getLogger().severe("WG did not initialize properly, this can cause errors with mcMMO so mcMMO is disabling certain features."); } diff --git a/src/test/java/com/gmail/nossr50/database/FlatFileDatabaseManagerTest.java b/src/test/java/com/gmail/nossr50/database/FlatFileDatabaseManagerTest.java index 8e6d04c2a..c0c448bc7 100644 --- a/src/test/java/com/gmail/nossr50/database/FlatFileDatabaseManagerTest.java +++ b/src/test/java/com/gmail/nossr50/database/FlatFileDatabaseManagerTest.java @@ -293,7 +293,7 @@ class FlatFileDatabaseManagerTest { private void checkNewUserValues(@NotNull PlayerProfile playerProfile, int startingLevel) { //Checking a new user for being zero initialized for(PrimarySkillType primarySkillType : PrimarySkillType.values()) { - if(SkillTools.isChildSkill(primarySkillType)) + if (SkillTools.isChildSkill(primarySkillType)) continue; assertEquals(startingLevel, playerProfile.getSkillLevel(primarySkillType)); @@ -369,7 +369,7 @@ class FlatFileDatabaseManagerTest { assertNotNull(resourceFileURI); File copyOfFile = new File(tempDir.getPath() + File.separator + dbFileName); - if(copyOfFile.exists()) { + if (copyOfFile.exists()) { //noinspection ResultOfMethodCallIgnored copyOfFile.delete(); } @@ -397,7 +397,7 @@ class FlatFileDatabaseManagerTest { */ for(PrimarySkillType primarySkillType : PrimarySkillType.values()) { - if(SkillTools.isChildSkill(primarySkillType)) + if (SkillTools.isChildSkill(primarySkillType)) continue; int expectedLevelHealthyDBEntryOne = getExpectedLevelHealthyDBEntryOne(primarySkillType); @@ -594,7 +594,7 @@ class FlatFileDatabaseManagerTest { Map rankBoyPositions = flatFileDatabaseManager.readRank(rankBoyName); for(PrimarySkillType primarySkillType : PrimarySkillType.values()) { - if(primarySkillType.isChildSkill()) { + if (primarySkillType.isChildSkill()) { assertNull(rankBoyPositions.get(primarySkillType)); assertNull(rankGirlPositions.get(primarySkillType)); } else { @@ -623,7 +623,7 @@ class FlatFileDatabaseManagerTest { assertNotNull(resourceFileURI); File copyOfFile = new File(tempDir.getPath() + File.separator + DB_BADDATA); - if(copyOfFile.exists()) { + if (copyOfFile.exists()) { copyOfFile.delete(); } @@ -683,7 +683,7 @@ class FlatFileDatabaseManagerTest { assertEquals(uuid, leveledProfile.getUniqueId()); for(PrimarySkillType primarySkillType : PrimarySkillType.values()) { - if(SkillTools.isChildSkill(primarySkillType)) + if (SkillTools.isChildSkill(primarySkillType)) continue; leveledProfile.modifySkill(primarySkillType, levels); //TODO: This method also resets XP, not cool @@ -693,7 +693,7 @@ class FlatFileDatabaseManagerTest { leveledProfile = flatFileDatabaseManager.loadPlayerProfile(uuid); for(PrimarySkillType primarySkillType : PrimarySkillType.values()) { - if(SkillTools.isChildSkill(primarySkillType)) { + if (SkillTools.isChildSkill(primarySkillType)) { continue; } diff --git a/src/test/java/com/gmail/nossr50/util/random/ProbabilityTest.java b/src/test/java/com/gmail/nossr50/util/random/ProbabilityTest.java index e114313ba..0a128cd52 100644 --- a/src/test/java/com/gmail/nossr50/util/random/ProbabilityTest.java +++ b/src/test/java/com/gmail/nossr50/util/random/ProbabilityTest.java @@ -93,7 +93,7 @@ class ProbabilityTest { double winCount = 0; for (int i = 0; i < iterations; i++) { - if(probability.evaluate()) { + if (probability.evaluate()) { winCount++; } } diff --git a/src/test/java/com/gmail/nossr50/util/random/ProbabilityTestUtils.java b/src/test/java/com/gmail/nossr50/util/random/ProbabilityTestUtils.java index 0e41b4649..32dadfbbd 100644 --- a/src/test/java/com/gmail/nossr50/util/random/ProbabilityTestUtils.java +++ b/src/test/java/com/gmail/nossr50/util/random/ProbabilityTestUtils.java @@ -7,7 +7,7 @@ public class ProbabilityTestUtils { double iterations = 2.0e7; //20 million double winCount = 0; for (int i = 0; i < iterations; i++) { - if(probability.evaluate()) { + if (probability.evaluate()) { winCount++; } }