From 8eb45e817c4e29eab9e932f356b80b8bf5a162ce Mon Sep 17 00:00:00 2001 From: tastybento Date: Sat, 18 Sep 2021 08:15:15 -0700 Subject: [PATCH] Code smell reduction --- .../bentobox/api/addons/AddonDescription.java | 2 +- .../bentobox/api/commands/CompositeCommand.java | 12 ++++++------ .../api/commands/admin/conversations/NamePrompt.java | 6 +++--- .../bentobox/bentobox/api/events/BentoBoxEvent.java | 3 ++- .../bentobox/api/events/BentoBoxReadyEvent.java | 3 ++- .../bentobox/api/events/OfflineMessageEvent.java | 3 ++- .../bentobox/api/events/addon/AddonDisableEvent.java | 3 ++- .../bentobox/api/events/addon/AddonEnableEvent.java | 3 ++- .../bentobox/api/events/addon/AddonGeneralEvent.java | 3 ++- .../bentobox/api/events/addon/AddonLoadEvent.java | 3 ++- .../bentobox/api/events/command/CommandEvent.java | 3 ++- .../api/events/flags/FlagProtectionChangeEvent.java | 3 ++- .../api/events/flags/FlagSettingChangeEvent.java | 3 ++- .../events/flags/FlagWorldSettingChangeEvent.java | 3 ++- .../bentobox/api/events/island/IslandBanEvent.java | 3 ++- .../api/events/island/IslandCreateEvent.java | 2 +- .../api/events/island/IslandCreatedEvent.java | 3 ++- .../api/events/island/IslandDeleteChunksEvent.java | 3 ++- .../api/events/island/IslandDeleteEvent.java | 3 ++- .../api/events/island/IslandDeletedEvent.java | 3 ++- .../bentobox/api/events/island/IslandEnterEvent.java | 5 +++-- .../bentobox/api/events/island/IslandEvent.java | 6 +++--- .../bentobox/api/events/island/IslandExitEvent.java | 5 +++-- .../bentobox/api/events/island/IslandExpelEvent.java | 3 ++- .../api/events/island/IslandGeneralEvent.java | 3 ++- .../bentobox/api/events/island/IslandLockEvent.java | 3 ++- .../api/events/island/IslandNewIslandEvent.java | 3 ++- .../api/events/island/IslandPreCreateEvent.java | 3 ++- .../api/events/island/IslandPreclearEvent.java | 2 +- .../island/IslandProtectionRangeChangeEvent.java | 3 ++- .../api/events/island/IslandRankChangeEvent.java | 3 ++- .../api/events/island/IslandRegisteredEvent.java | 3 ++- .../api/events/island/IslandReservedEvent.java | 3 ++- .../bentobox/api/events/island/IslandResetEvent.java | 2 +- .../api/events/island/IslandResettedEvent.java | 2 +- .../bentobox/api/events/island/IslandUnbanEvent.java | 3 ++- .../api/events/island/IslandUnlockEvent.java | 3 ++- .../api/events/island/IslandUnregisteredEvent.java | 3 ++- .../bentobox/api/events/team/TeamDeleteEvent.java | 3 ++- .../bentobox/api/events/team/TeamGeneralEvent.java | 3 ++- .../bentobox/api/events/team/TeamInfoEvent.java | 3 ++- .../bentobox/api/events/team/TeamInviteEvent.java | 3 ++- .../bentobox/api/events/team/TeamJoinEvent.java | 3 ++- .../bentobox/api/events/team/TeamJoinedEvent.java | 3 ++- .../bentobox/api/events/team/TeamKickEvent.java | 3 ++- .../bentobox/api/events/team/TeamLeaveEvent.java | 3 ++- .../bentobox/api/events/team/TeamRejectEvent.java | 3 ++- .../bentobox/api/events/team/TeamSetownerEvent.java | 3 ++- .../bentobox/api/events/team/TeamUninviteEvent.java | 3 ++- .../api/flags/clicklisteners/CycleClick.java | 2 +- .../api/panels/builders/PanelItemBuilder.java | 2 +- .../placeholderapi/AddonPlaceholderExpansion.java | 7 ++++--- .../placeholderapi/BasicPlaceholderExpansion.java | 4 ++-- .../placeholderapi/BentoBoxPlaceholderExpansion.java | 7 ++++--- .../world/bentobox/bentobox/api/user/Notifier.java | 3 ++- .../java/world/bentobox/bentobox/api/user/User.java | 2 +- .../bentobox/bentobox/blueprints/Blueprint.java | 2 +- .../bentobox/blueprints/BlueprintClipboard.java | 2 +- .../blueprints/conversation/DescriptionPrompt.java | 3 ++- .../conversation/DescriptionSuccessPrompt.java | 5 +++-- .../conversation/NameConversationPrefix.java | 3 ++- .../bentobox/blueprints/conversation/NamePrompt.java | 2 +- .../blueprints/conversation/NameSuccessPrompt.java | 4 ++-- .../database/json/BentoboxTypeAdapterFactory.java | 2 +- .../database/mongodb/MongoDBDatabaseHandler.java | 3 ++- .../transition/TransitionDatabaseHandler.java | 3 ++- .../database/yaml/YamlDatabaseConnector.java | 2 +- .../bentobox/database/yaml/YamlDatabaseHandler.java | 2 +- .../hooks/placeholders/PlaceholderAPIHook.java | 2 +- .../bentobox/hooks/placeholders/PlaceholderHook.java | 4 ++-- .../listeners/flags/protection/BucketListener.java | 12 +++--------- .../bentobox/managers/IslandWorldManager.java | 2 +- .../bentobox/bentobox/managers/IslandsManager.java | 2 +- .../island/DefaultNewIslandLocationStrategy.java | 2 +- .../panels/settings/WorldDefaultSettingsTab.java | 3 ++- .../world/bentobox/bentobox/util/IslandInfo.java | 2 +- .../world/bentobox/bentobox/util/MyBiomeGrid.java | 9 +++++---- 77 files changed, 152 insertions(+), 107 deletions(-) diff --git a/src/main/java/world/bentobox/bentobox/api/addons/AddonDescription.java b/src/main/java/world/bentobox/bentobox/api/addons/AddonDescription.java index 388aac2bc..b52cd4e61 100644 --- a/src/main/java/world/bentobox/bentobox/api/addons/AddonDescription.java +++ b/src/main/java/world/bentobox/bentobox/api/addons/AddonDescription.java @@ -158,7 +158,7 @@ public final class AddonDescription { * @return the permissions * @since 1.13.0 */ - public ConfigurationSection getPermissions() { + public @Nullable ConfigurationSection getPermissions() { return permissions; } diff --git a/src/main/java/world/bentobox/bentobox/api/commands/CompositeCommand.java b/src/main/java/world/bentobox/bentobox/api/commands/CompositeCommand.java index 931dd5ebe..1ee54502f 100644 --- a/src/main/java/world/bentobox/bentobox/api/commands/CompositeCommand.java +++ b/src/main/java/world/bentobox/bentobox/api/commands/CompositeCommand.java @@ -218,7 +218,7 @@ public abstract class CompositeCommand extends Command implements PluginIdentifi * subcommands until it finds the right object and then runs execute on it. */ @Override - public boolean execute(CommandSender sender, String label, String[] args) { + public boolean execute(@NonNull CommandSender sender, @NonNull String label, String[] args) { // Get the User instance for this sender User user = User.getInstance(sender); // Fire an event to see if this command should be cancelled @@ -352,7 +352,7 @@ public abstract class CompositeCommand extends Command implements PluginIdentifi } @Override - public BentoBox getPlugin() { + public @NonNull BentoBox getPlugin() { return plugin; } @@ -422,7 +422,7 @@ public abstract class CompositeCommand extends Command implements PluginIdentifi } @Override - public String getUsage() { + public @NonNull String getUsage() { return "/" + usage; } @@ -521,7 +521,7 @@ public abstract class CompositeCommand extends Command implements PluginIdentifi * @return The instance of this {@link Command}. */ @Override - public Command setDescription(String description) { + public @NonNull Command setDescription(@NonNull String description) { super.setDescription(description); return this; } @@ -575,7 +575,7 @@ public abstract class CompositeCommand extends Command implements PluginIdentifi * This creates the full linking chain of commands */ @Override - public Command setUsage(String usage) { + public @NonNull Command setUsage(@NonNull String usage) { // Go up the chain CompositeCommand parentCommand = getParent(); StringBuilder u = new StringBuilder().append(getLabel()).append(" ").append(usage); @@ -590,7 +590,7 @@ public abstract class CompositeCommand extends Command implements PluginIdentifi @Override @NonNull - public List tabComplete(final CommandSender sender, final String alias, final String[] args) { + public List tabComplete(final @NonNull CommandSender sender, final @NonNull String alias, final String[] args) { List options = new ArrayList<>(); // Get command object based on args entered so far CompositeCommand command = getCommandFromArgs(args); diff --git a/src/main/java/world/bentobox/bentobox/api/commands/admin/conversations/NamePrompt.java b/src/main/java/world/bentobox/bentobox/api/commands/admin/conversations/NamePrompt.java index 62d2055d1..4569489e8 100644 --- a/src/main/java/world/bentobox/bentobox/api/commands/admin/conversations/NamePrompt.java +++ b/src/main/java/world/bentobox/bentobox/api/commands/admin/conversations/NamePrompt.java @@ -22,7 +22,7 @@ public class NamePrompt extends StringPrompt { private final String oldName; private final BentoBox plugin; - public NamePrompt(BentoBox plugin, @NonNull Island island, User user, String oldName) { + public NamePrompt(BentoBox plugin, @NonNull Island island, @NonNull User user, String oldName) { this.plugin = plugin; this.island = island; this.user = user; @@ -30,12 +30,12 @@ public class NamePrompt extends StringPrompt { } @Override - public String getPromptText(ConversationContext context) { + public @NonNull String getPromptText(@NonNull ConversationContext context) { return user.getTranslation("commands.island.renamehome.enter-new-name"); } @Override - public Prompt acceptInput(ConversationContext context, String input) { + public Prompt acceptInput(@NonNull ConversationContext context, String input) { if (island.renameHome(oldName, input)) { plugin.getIslands().save(island); Bukkit.getScheduler().runTask(plugin, () -> user.sendMessage("general.success")); diff --git a/src/main/java/world/bentobox/bentobox/api/events/BentoBoxEvent.java b/src/main/java/world/bentobox/bentobox/api/events/BentoBoxEvent.java index b4e45d432..cfe578030 100644 --- a/src/main/java/world/bentobox/bentobox/api/events/BentoBoxEvent.java +++ b/src/main/java/world/bentobox/bentobox/api/events/BentoBoxEvent.java @@ -12,6 +12,7 @@ import java.util.Objects; import org.bukkit.event.Event; import org.bukkit.event.HandlerList; +import org.eclipse.jdt.annotation.NonNull; import world.bentobox.bentobox.BentoBox; /** @@ -55,7 +56,7 @@ public abstract class BentoBoxEvent extends Event { */ @Override @Deprecated - public HandlerList getHandlers() { + public @NonNull HandlerList getHandlers() { return getHandlerList(); } diff --git a/src/main/java/world/bentobox/bentobox/api/events/BentoBoxReadyEvent.java b/src/main/java/world/bentobox/bentobox/api/events/BentoBoxReadyEvent.java index 0cb851a1d..d2b360f1b 100644 --- a/src/main/java/world/bentobox/bentobox/api/events/BentoBoxReadyEvent.java +++ b/src/main/java/world/bentobox/bentobox/api/events/BentoBoxReadyEvent.java @@ -1,6 +1,7 @@ package world.bentobox.bentobox.api.events; import org.bukkit.event.HandlerList; +import org.eclipse.jdt.annotation.NonNull; /** * Fired when plugin is ready to play and all files are loaded @@ -12,7 +13,7 @@ public class BentoBoxReadyEvent extends BentoBoxEvent { private static final HandlerList handlers = new HandlerList(); @Override - public HandlerList getHandlers() { + public @NonNull HandlerList getHandlers() { return getHandlerList(); } diff --git a/src/main/java/world/bentobox/bentobox/api/events/OfflineMessageEvent.java b/src/main/java/world/bentobox/bentobox/api/events/OfflineMessageEvent.java index 5f906b8fc..f841e3337 100644 --- a/src/main/java/world/bentobox/bentobox/api/events/OfflineMessageEvent.java +++ b/src/main/java/world/bentobox/bentobox/api/events/OfflineMessageEvent.java @@ -3,6 +3,7 @@ package world.bentobox.bentobox.api.events; import java.util.UUID; import org.bukkit.event.HandlerList; +import org.eclipse.jdt.annotation.NonNull; /** * Fired when a message is going to an offline player @@ -16,7 +17,7 @@ public class OfflineMessageEvent extends BentoBoxEvent { private static final HandlerList handlers = new HandlerList(); @Override - public HandlerList getHandlers() { + public @NonNull HandlerList getHandlers() { return getHandlerList(); } diff --git a/src/main/java/world/bentobox/bentobox/api/events/addon/AddonDisableEvent.java b/src/main/java/world/bentobox/bentobox/api/events/addon/AddonDisableEvent.java index 8b23f342d..24e384702 100644 --- a/src/main/java/world/bentobox/bentobox/api/events/addon/AddonDisableEvent.java +++ b/src/main/java/world/bentobox/bentobox/api/events/addon/AddonDisableEvent.java @@ -4,6 +4,7 @@ import java.util.Map; import org.bukkit.event.HandlerList; +import org.eclipse.jdt.annotation.NonNull; import world.bentobox.bentobox.api.addons.Addon; /** @@ -16,7 +17,7 @@ public class AddonDisableEvent extends AddonBaseEvent { private static final HandlerList handlers = new HandlerList(); @Override - public HandlerList getHandlers() { + public @NonNull HandlerList getHandlers() { return getHandlerList(); } diff --git a/src/main/java/world/bentobox/bentobox/api/events/addon/AddonEnableEvent.java b/src/main/java/world/bentobox/bentobox/api/events/addon/AddonEnableEvent.java index b0ed6b4c4..0b15d1ff2 100644 --- a/src/main/java/world/bentobox/bentobox/api/events/addon/AddonEnableEvent.java +++ b/src/main/java/world/bentobox/bentobox/api/events/addon/AddonEnableEvent.java @@ -4,6 +4,7 @@ import java.util.Map; import org.bukkit.event.HandlerList; +import org.eclipse.jdt.annotation.NonNull; import world.bentobox.bentobox.api.addons.Addon; /** @@ -16,7 +17,7 @@ public class AddonEnableEvent extends AddonBaseEvent { private static final HandlerList handlers = new HandlerList(); @Override - public HandlerList getHandlers() { + public @NonNull HandlerList getHandlers() { return getHandlerList(); } diff --git a/src/main/java/world/bentobox/bentobox/api/events/addon/AddonGeneralEvent.java b/src/main/java/world/bentobox/bentobox/api/events/addon/AddonGeneralEvent.java index 18fce6493..8d6a70931 100644 --- a/src/main/java/world/bentobox/bentobox/api/events/addon/AddonGeneralEvent.java +++ b/src/main/java/world/bentobox/bentobox/api/events/addon/AddonGeneralEvent.java @@ -4,6 +4,7 @@ import java.util.Map; import org.bukkit.event.HandlerList; +import org.eclipse.jdt.annotation.NonNull; import world.bentobox.bentobox.api.addons.Addon; /** @@ -16,7 +17,7 @@ public class AddonGeneralEvent extends AddonBaseEvent { private static final HandlerList handlers = new HandlerList(); @Override - public HandlerList getHandlers() { + public @NonNull HandlerList getHandlers() { return getHandlerList(); } diff --git a/src/main/java/world/bentobox/bentobox/api/events/addon/AddonLoadEvent.java b/src/main/java/world/bentobox/bentobox/api/events/addon/AddonLoadEvent.java index 9f4ff3508..4228ff623 100644 --- a/src/main/java/world/bentobox/bentobox/api/events/addon/AddonLoadEvent.java +++ b/src/main/java/world/bentobox/bentobox/api/events/addon/AddonLoadEvent.java @@ -4,6 +4,7 @@ import java.util.Map; import org.bukkit.event.HandlerList; +import org.eclipse.jdt.annotation.NonNull; import world.bentobox.bentobox.api.addons.Addon; /** @@ -16,7 +17,7 @@ public class AddonLoadEvent extends AddonBaseEvent { private static final HandlerList handlers = new HandlerList(); @Override - public HandlerList getHandlers() { + public @NonNull HandlerList getHandlers() { return getHandlerList(); } diff --git a/src/main/java/world/bentobox/bentobox/api/events/command/CommandEvent.java b/src/main/java/world/bentobox/bentobox/api/events/command/CommandEvent.java index ba1c7c59a..2686d6a84 100644 --- a/src/main/java/world/bentobox/bentobox/api/events/command/CommandEvent.java +++ b/src/main/java/world/bentobox/bentobox/api/events/command/CommandEvent.java @@ -6,6 +6,7 @@ import org.bukkit.command.CommandSender; import org.bukkit.event.Cancellable; import org.bukkit.event.HandlerList; +import org.eclipse.jdt.annotation.NonNull; import world.bentobox.bentobox.api.events.BentoBoxEvent; /** @@ -24,7 +25,7 @@ public class CommandEvent extends BentoBoxEvent implements Cancellable { private static final HandlerList handlers = new HandlerList(); @Override - public HandlerList getHandlers() { + public @NonNull HandlerList getHandlers() { return getHandlerList(); } diff --git a/src/main/java/world/bentobox/bentobox/api/events/flags/FlagProtectionChangeEvent.java b/src/main/java/world/bentobox/bentobox/api/events/flags/FlagProtectionChangeEvent.java index 44b692e11..1b6f3c018 100644 --- a/src/main/java/world/bentobox/bentobox/api/events/flags/FlagProtectionChangeEvent.java +++ b/src/main/java/world/bentobox/bentobox/api/events/flags/FlagProtectionChangeEvent.java @@ -4,6 +4,7 @@ import java.util.UUID; import org.bukkit.event.HandlerList; +import org.eclipse.jdt.annotation.NonNull; import world.bentobox.bentobox.api.flags.Flag; import world.bentobox.bentobox.database.objects.Island; @@ -18,7 +19,7 @@ public class FlagProtectionChangeEvent extends FlagChangeEvent { private static final HandlerList handlers = new HandlerList(); @Override - public HandlerList getHandlers() { + public @NonNull HandlerList getHandlers() { return getHandlerList(); } diff --git a/src/main/java/world/bentobox/bentobox/api/events/flags/FlagSettingChangeEvent.java b/src/main/java/world/bentobox/bentobox/api/events/flags/FlagSettingChangeEvent.java index 6608755fe..bbe6d8d0c 100644 --- a/src/main/java/world/bentobox/bentobox/api/events/flags/FlagSettingChangeEvent.java +++ b/src/main/java/world/bentobox/bentobox/api/events/flags/FlagSettingChangeEvent.java @@ -4,6 +4,7 @@ import java.util.UUID; import org.bukkit.event.HandlerList; +import org.eclipse.jdt.annotation.NonNull; import world.bentobox.bentobox.api.flags.Flag; import world.bentobox.bentobox.database.objects.Island; @@ -18,7 +19,7 @@ public class FlagSettingChangeEvent extends FlagChangeEvent { private static final HandlerList handlers = new HandlerList(); @Override - public HandlerList getHandlers() { + public @NonNull HandlerList getHandlers() { return getHandlerList(); } diff --git a/src/main/java/world/bentobox/bentobox/api/events/flags/FlagWorldSettingChangeEvent.java b/src/main/java/world/bentobox/bentobox/api/events/flags/FlagWorldSettingChangeEvent.java index c7a62b873..307542a82 100644 --- a/src/main/java/world/bentobox/bentobox/api/events/flags/FlagWorldSettingChangeEvent.java +++ b/src/main/java/world/bentobox/bentobox/api/events/flags/FlagWorldSettingChangeEvent.java @@ -5,6 +5,7 @@ import java.util.UUID; import org.bukkit.World; import org.bukkit.event.HandlerList; +import org.eclipse.jdt.annotation.NonNull; import world.bentobox.bentobox.api.flags.Flag; /** @@ -18,7 +19,7 @@ public class FlagWorldSettingChangeEvent extends FlagChangeEvent { private static final HandlerList handlers = new HandlerList(); @Override - public HandlerList getHandlers() { + public @NonNull HandlerList getHandlers() { return getHandlerList(); } diff --git a/src/main/java/world/bentobox/bentobox/api/events/island/IslandBanEvent.java b/src/main/java/world/bentobox/bentobox/api/events/island/IslandBanEvent.java index b610008f3..fb078e00e 100644 --- a/src/main/java/world/bentobox/bentobox/api/events/island/IslandBanEvent.java +++ b/src/main/java/world/bentobox/bentobox/api/events/island/IslandBanEvent.java @@ -5,6 +5,7 @@ import java.util.UUID; import org.bukkit.Location; import org.bukkit.event.HandlerList; +import org.eclipse.jdt.annotation.NonNull; import world.bentobox.bentobox.api.events.IslandBaseEvent; import world.bentobox.bentobox.database.objects.Island; @@ -19,7 +20,7 @@ public class IslandBanEvent extends IslandBaseEvent { private static final HandlerList handlers = new HandlerList(); @Override - public HandlerList getHandlers() { + public @NonNull HandlerList getHandlers() { return getHandlerList(); } diff --git a/src/main/java/world/bentobox/bentobox/api/events/island/IslandCreateEvent.java b/src/main/java/world/bentobox/bentobox/api/events/island/IslandCreateEvent.java index d855d3ace..75d56792f 100644 --- a/src/main/java/world/bentobox/bentobox/api/events/island/IslandCreateEvent.java +++ b/src/main/java/world/bentobox/bentobox/api/events/island/IslandCreateEvent.java @@ -20,7 +20,7 @@ public class IslandCreateEvent extends IslandBaseEvent { private static final HandlerList handlers = new HandlerList(); @Override - public HandlerList getHandlers() { + public @NonNull HandlerList getHandlers() { return getHandlerList(); } diff --git a/src/main/java/world/bentobox/bentobox/api/events/island/IslandCreatedEvent.java b/src/main/java/world/bentobox/bentobox/api/events/island/IslandCreatedEvent.java index e31de98af..dcfb602cf 100644 --- a/src/main/java/world/bentobox/bentobox/api/events/island/IslandCreatedEvent.java +++ b/src/main/java/world/bentobox/bentobox/api/events/island/IslandCreatedEvent.java @@ -5,6 +5,7 @@ import java.util.UUID; import org.bukkit.Location; import org.bukkit.event.HandlerList; +import org.eclipse.jdt.annotation.NonNull; import world.bentobox.bentobox.api.events.IslandBaseEvent; import world.bentobox.bentobox.database.objects.Island; @@ -16,7 +17,7 @@ public class IslandCreatedEvent extends IslandBaseEvent { private static final HandlerList handlers = new HandlerList(); @Override - public HandlerList getHandlers() { + public @NonNull HandlerList getHandlers() { return getHandlerList(); } diff --git a/src/main/java/world/bentobox/bentobox/api/events/island/IslandDeleteChunksEvent.java b/src/main/java/world/bentobox/bentobox/api/events/island/IslandDeleteChunksEvent.java index a1647b2e8..380da8974 100644 --- a/src/main/java/world/bentobox/bentobox/api/events/island/IslandDeleteChunksEvent.java +++ b/src/main/java/world/bentobox/bentobox/api/events/island/IslandDeleteChunksEvent.java @@ -5,6 +5,7 @@ import java.util.UUID; import org.bukkit.Location; import org.bukkit.event.HandlerList; +import org.eclipse.jdt.annotation.NonNull; import world.bentobox.bentobox.api.events.IslandBaseEvent; import world.bentobox.bentobox.database.objects.Island; import world.bentobox.bentobox.database.objects.IslandDeletion; @@ -19,7 +20,7 @@ public class IslandDeleteChunksEvent extends IslandBaseEvent { private static final HandlerList handlers = new HandlerList(); @Override - public HandlerList getHandlers() { + public @NonNull HandlerList getHandlers() { return getHandlerList(); } diff --git a/src/main/java/world/bentobox/bentobox/api/events/island/IslandDeleteEvent.java b/src/main/java/world/bentobox/bentobox/api/events/island/IslandDeleteEvent.java index bfa21a47c..4a46eba36 100644 --- a/src/main/java/world/bentobox/bentobox/api/events/island/IslandDeleteEvent.java +++ b/src/main/java/world/bentobox/bentobox/api/events/island/IslandDeleteEvent.java @@ -5,6 +5,7 @@ import java.util.UUID; import org.bukkit.Location; import org.bukkit.event.HandlerList; +import org.eclipse.jdt.annotation.NonNull; import world.bentobox.bentobox.api.events.IslandBaseEvent; import world.bentobox.bentobox.database.objects.Island; @@ -17,7 +18,7 @@ public class IslandDeleteEvent extends IslandBaseEvent { private static final HandlerList handlers = new HandlerList(); @Override - public HandlerList getHandlers() { + public @NonNull HandlerList getHandlers() { return getHandlerList(); } diff --git a/src/main/java/world/bentobox/bentobox/api/events/island/IslandDeletedEvent.java b/src/main/java/world/bentobox/bentobox/api/events/island/IslandDeletedEvent.java index a6af36f75..b566f9b32 100644 --- a/src/main/java/world/bentobox/bentobox/api/events/island/IslandDeletedEvent.java +++ b/src/main/java/world/bentobox/bentobox/api/events/island/IslandDeletedEvent.java @@ -5,6 +5,7 @@ import java.util.UUID; import org.bukkit.Location; import org.bukkit.event.HandlerList; +import org.eclipse.jdt.annotation.NonNull; import world.bentobox.bentobox.api.events.IslandBaseEvent; import world.bentobox.bentobox.database.objects.Island; import world.bentobox.bentobox.database.objects.IslandDeletion; @@ -21,7 +22,7 @@ public class IslandDeletedEvent extends IslandBaseEvent { private static final HandlerList handlers = new HandlerList(); @Override - public HandlerList getHandlers() { + public @NonNull HandlerList getHandlers() { return getHandlerList(); } diff --git a/src/main/java/world/bentobox/bentobox/api/events/island/IslandEnterEvent.java b/src/main/java/world/bentobox/bentobox/api/events/island/IslandEnterEvent.java index b1125f652..eaf732e4b 100644 --- a/src/main/java/world/bentobox/bentobox/api/events/island/IslandEnterEvent.java +++ b/src/main/java/world/bentobox/bentobox/api/events/island/IslandEnterEvent.java @@ -5,6 +5,7 @@ import java.util.UUID; import org.bukkit.Location; import org.bukkit.event.Event; import org.bukkit.event.HandlerList; +import org.eclipse.jdt.annotation.NonNull; import org.eclipse.jdt.annotation.Nullable; import world.bentobox.bentobox.api.events.IslandBaseEvent; @@ -20,7 +21,7 @@ public class IslandEnterEvent extends IslandBaseEvent { private static final HandlerList handlers = new HandlerList(); @Override - public HandlerList getHandlers() { + public @NonNull HandlerList getHandlers() { return getHandlerList(); } @@ -28,7 +29,7 @@ public class IslandEnterEvent extends IslandBaseEvent { return handlers; } - IslandEnterEvent(Island island, UUID player, boolean admin, Location location, Island fromIsland, Event rawEvent) { + IslandEnterEvent(Island island, UUID player, boolean admin, Location location, @Nullable Island fromIsland, Event rawEvent) { // Final variables have to be declared in the constructor super(island, player, admin, location, rawEvent); this.fromIsland = fromIsland; diff --git a/src/main/java/world/bentobox/bentobox/api/events/island/IslandEvent.java b/src/main/java/world/bentobox/bentobox/api/events/island/IslandEvent.java index 14aad63ff..e83babd6d 100644 --- a/src/main/java/world/bentobox/bentobox/api/events/island/IslandEvent.java +++ b/src/main/java/world/bentobox/bentobox/api/events/island/IslandEvent.java @@ -26,7 +26,7 @@ public class IslandEvent extends IslandBaseEvent { private static final HandlerList handlers = new HandlerList(); @Override - public HandlerList getHandlers() { + public @NonNull HandlerList getHandlers() { return getHandlerList(); } @@ -425,7 +425,7 @@ public class IslandEvent extends IslandBaseEvent { private final @Nullable Island fromIsland; - private IslandEnterEvent(Island island, UUID player, boolean admin, Location location, Island fromIsland, Event rawEvent) { + private IslandEnterEvent(Island island, UUID player, boolean admin, Location location, @Nullable Island fromIsland, Event rawEvent) { // Final variables have to be declared in the constructor super(island, player, admin, location, rawEvent); this.fromIsland = fromIsland; @@ -448,7 +448,7 @@ public class IslandEvent extends IslandBaseEvent { private final @Nullable Island toIsland; - private IslandExitEvent(Island island, UUID player, boolean admin, Location location, Island toIsland, Event rawEvent) { + private IslandExitEvent(Island island, UUID player, boolean admin, Location location, @Nullable Island toIsland, Event rawEvent) { // Final variables have to be declared in the constructor super(island, player, admin, location, rawEvent); this.toIsland = toIsland; diff --git a/src/main/java/world/bentobox/bentobox/api/events/island/IslandExitEvent.java b/src/main/java/world/bentobox/bentobox/api/events/island/IslandExitEvent.java index 62302be7d..c378a473f 100644 --- a/src/main/java/world/bentobox/bentobox/api/events/island/IslandExitEvent.java +++ b/src/main/java/world/bentobox/bentobox/api/events/island/IslandExitEvent.java @@ -5,6 +5,7 @@ import java.util.UUID; import org.bukkit.Location; import org.bukkit.event.Event; import org.bukkit.event.HandlerList; +import org.eclipse.jdt.annotation.NonNull; import org.eclipse.jdt.annotation.Nullable; import world.bentobox.bentobox.api.events.IslandBaseEvent; @@ -20,7 +21,7 @@ public class IslandExitEvent extends IslandBaseEvent { private static final HandlerList handlers = new HandlerList(); @Override - public HandlerList getHandlers() { + public @NonNull HandlerList getHandlers() { return getHandlerList(); } @@ -28,7 +29,7 @@ public class IslandExitEvent extends IslandBaseEvent { return handlers; } - IslandExitEvent(Island island, UUID player, boolean admin, Location location, Island toIsland, Event rawEvent) { + IslandExitEvent(Island island, UUID player, boolean admin, Location location, @Nullable Island toIsland, Event rawEvent) { // Final variables have to be declared in the constructor super(island, player, admin, location, rawEvent); this.toIsland = toIsland; diff --git a/src/main/java/world/bentobox/bentobox/api/events/island/IslandExpelEvent.java b/src/main/java/world/bentobox/bentobox/api/events/island/IslandExpelEvent.java index a263c7f30..f60d1a770 100644 --- a/src/main/java/world/bentobox/bentobox/api/events/island/IslandExpelEvent.java +++ b/src/main/java/world/bentobox/bentobox/api/events/island/IslandExpelEvent.java @@ -5,6 +5,7 @@ import java.util.UUID; import org.bukkit.Location; import org.bukkit.event.HandlerList; +import org.eclipse.jdt.annotation.NonNull; import world.bentobox.bentobox.api.events.IslandBaseEvent; import world.bentobox.bentobox.database.objects.Island; @@ -20,7 +21,7 @@ public class IslandExpelEvent extends IslandBaseEvent { private static final HandlerList handlers = new HandlerList(); @Override - public HandlerList getHandlers() { + public @NonNull HandlerList getHandlers() { return getHandlerList(); } diff --git a/src/main/java/world/bentobox/bentobox/api/events/island/IslandGeneralEvent.java b/src/main/java/world/bentobox/bentobox/api/events/island/IslandGeneralEvent.java index ef02c2ea5..c8f9cc3ae 100644 --- a/src/main/java/world/bentobox/bentobox/api/events/island/IslandGeneralEvent.java +++ b/src/main/java/world/bentobox/bentobox/api/events/island/IslandGeneralEvent.java @@ -5,6 +5,7 @@ import java.util.UUID; import org.bukkit.Location; import org.bukkit.event.HandlerList; +import org.eclipse.jdt.annotation.NonNull; import world.bentobox.bentobox.api.events.IslandBaseEvent; import world.bentobox.bentobox.database.objects.Island; @@ -17,7 +18,7 @@ public class IslandGeneralEvent extends IslandBaseEvent { private static final HandlerList handlers = new HandlerList(); @Override - public HandlerList getHandlers() { + public @NonNull HandlerList getHandlers() { return getHandlerList(); } diff --git a/src/main/java/world/bentobox/bentobox/api/events/island/IslandLockEvent.java b/src/main/java/world/bentobox/bentobox/api/events/island/IslandLockEvent.java index 023d13b49..9783c9e1c 100644 --- a/src/main/java/world/bentobox/bentobox/api/events/island/IslandLockEvent.java +++ b/src/main/java/world/bentobox/bentobox/api/events/island/IslandLockEvent.java @@ -5,6 +5,7 @@ import java.util.UUID; import org.bukkit.Location; import org.bukkit.event.HandlerList; +import org.eclipse.jdt.annotation.NonNull; import world.bentobox.bentobox.api.events.IslandBaseEvent; import world.bentobox.bentobox.database.objects.Island; @@ -17,7 +18,7 @@ public class IslandLockEvent extends IslandBaseEvent { private static final HandlerList handlers = new HandlerList(); @Override - public HandlerList getHandlers() { + public @NonNull HandlerList getHandlers() { return getHandlerList(); } diff --git a/src/main/java/world/bentobox/bentobox/api/events/island/IslandNewIslandEvent.java b/src/main/java/world/bentobox/bentobox/api/events/island/IslandNewIslandEvent.java index bdc2a38af..583cbea40 100644 --- a/src/main/java/world/bentobox/bentobox/api/events/island/IslandNewIslandEvent.java +++ b/src/main/java/world/bentobox/bentobox/api/events/island/IslandNewIslandEvent.java @@ -5,6 +5,7 @@ import java.util.UUID; import org.bukkit.Location; import org.bukkit.event.HandlerList; +import org.eclipse.jdt.annotation.NonNull; import world.bentobox.bentobox.api.events.IslandBaseEvent; import world.bentobox.bentobox.database.objects.Island; @@ -17,7 +18,7 @@ public class IslandNewIslandEvent extends IslandBaseEvent { private static final HandlerList handlers = new HandlerList(); @Override - public HandlerList getHandlers() { + public @NonNull HandlerList getHandlers() { return getHandlerList(); } diff --git a/src/main/java/world/bentobox/bentobox/api/events/island/IslandPreCreateEvent.java b/src/main/java/world/bentobox/bentobox/api/events/island/IslandPreCreateEvent.java index 95d405eb4..99fa17e2f 100644 --- a/src/main/java/world/bentobox/bentobox/api/events/island/IslandPreCreateEvent.java +++ b/src/main/java/world/bentobox/bentobox/api/events/island/IslandPreCreateEvent.java @@ -4,6 +4,7 @@ import java.util.UUID; import org.bukkit.event.HandlerList; +import org.eclipse.jdt.annotation.NonNull; import world.bentobox.bentobox.api.events.IslandBaseEvent; /** @@ -16,7 +17,7 @@ public class IslandPreCreateEvent extends IslandBaseEvent { private static final HandlerList handlers = new HandlerList(); @Override - public HandlerList getHandlers() { + public @NonNull HandlerList getHandlers() { return getHandlerList(); } diff --git a/src/main/java/world/bentobox/bentobox/api/events/island/IslandPreclearEvent.java b/src/main/java/world/bentobox/bentobox/api/events/island/IslandPreclearEvent.java index acc482a08..5b9d54381 100644 --- a/src/main/java/world/bentobox/bentobox/api/events/island/IslandPreclearEvent.java +++ b/src/main/java/world/bentobox/bentobox/api/events/island/IslandPreclearEvent.java @@ -19,7 +19,7 @@ public class IslandPreclearEvent extends IslandBaseEvent { private static final HandlerList handlers = new HandlerList(); @Override - public HandlerList getHandlers() { + public @NonNull HandlerList getHandlers() { return getHandlerList(); } diff --git a/src/main/java/world/bentobox/bentobox/api/events/island/IslandProtectionRangeChangeEvent.java b/src/main/java/world/bentobox/bentobox/api/events/island/IslandProtectionRangeChangeEvent.java index b23dc7503..d033f5fa5 100644 --- a/src/main/java/world/bentobox/bentobox/api/events/island/IslandProtectionRangeChangeEvent.java +++ b/src/main/java/world/bentobox/bentobox/api/events/island/IslandProtectionRangeChangeEvent.java @@ -5,6 +5,7 @@ import java.util.UUID; import org.bukkit.Location; import org.bukkit.event.HandlerList; +import org.eclipse.jdt.annotation.NonNull; import world.bentobox.bentobox.api.events.IslandBaseEvent; import world.bentobox.bentobox.database.objects.Island; @@ -17,7 +18,7 @@ public class IslandProtectionRangeChangeEvent extends IslandBaseEvent { private static final HandlerList handlers = new HandlerList(); @Override - public HandlerList getHandlers() { + public @NonNull HandlerList getHandlers() { return getHandlerList(); } diff --git a/src/main/java/world/bentobox/bentobox/api/events/island/IslandRankChangeEvent.java b/src/main/java/world/bentobox/bentobox/api/events/island/IslandRankChangeEvent.java index 96aef05da..e27f1b0ca 100644 --- a/src/main/java/world/bentobox/bentobox/api/events/island/IslandRankChangeEvent.java +++ b/src/main/java/world/bentobox/bentobox/api/events/island/IslandRankChangeEvent.java @@ -5,6 +5,7 @@ import java.util.UUID; import org.bukkit.Location; import org.bukkit.event.HandlerList; +import org.eclipse.jdt.annotation.NonNull; import world.bentobox.bentobox.api.events.IslandBaseEvent; import world.bentobox.bentobox.database.objects.Island; @@ -20,7 +21,7 @@ public class IslandRankChangeEvent extends IslandBaseEvent { private static final HandlerList handlers = new HandlerList(); @Override - public HandlerList getHandlers() { + public @NonNull HandlerList getHandlers() { return getHandlerList(); } diff --git a/src/main/java/world/bentobox/bentobox/api/events/island/IslandRegisteredEvent.java b/src/main/java/world/bentobox/bentobox/api/events/island/IslandRegisteredEvent.java index 7e39e5509..c8b77c2a8 100644 --- a/src/main/java/world/bentobox/bentobox/api/events/island/IslandRegisteredEvent.java +++ b/src/main/java/world/bentobox/bentobox/api/events/island/IslandRegisteredEvent.java @@ -5,6 +5,7 @@ import java.util.UUID; import org.bukkit.Location; import org.bukkit.event.HandlerList; +import org.eclipse.jdt.annotation.NonNull; import world.bentobox.bentobox.api.events.IslandBaseEvent; import world.bentobox.bentobox.database.objects.Island; @@ -17,7 +18,7 @@ public class IslandRegisteredEvent extends IslandBaseEvent { private static final HandlerList handlers = new HandlerList(); @Override - public HandlerList getHandlers() { + public @NonNull HandlerList getHandlers() { return getHandlerList(); } diff --git a/src/main/java/world/bentobox/bentobox/api/events/island/IslandReservedEvent.java b/src/main/java/world/bentobox/bentobox/api/events/island/IslandReservedEvent.java index e18f9d976..e8dc7738b 100644 --- a/src/main/java/world/bentobox/bentobox/api/events/island/IslandReservedEvent.java +++ b/src/main/java/world/bentobox/bentobox/api/events/island/IslandReservedEvent.java @@ -5,6 +5,7 @@ import java.util.UUID; import org.bukkit.Location; import org.bukkit.event.HandlerList; +import org.eclipse.jdt.annotation.NonNull; import world.bentobox.bentobox.api.events.IslandBaseEvent; import world.bentobox.bentobox.database.objects.Island; @@ -17,7 +18,7 @@ public class IslandReservedEvent extends IslandBaseEvent { private static final HandlerList handlers = new HandlerList(); @Override - public HandlerList getHandlers() { + public @NonNull HandlerList getHandlers() { return getHandlerList(); } diff --git a/src/main/java/world/bentobox/bentobox/api/events/island/IslandResetEvent.java b/src/main/java/world/bentobox/bentobox/api/events/island/IslandResetEvent.java index 980438689..1b7a4043c 100644 --- a/src/main/java/world/bentobox/bentobox/api/events/island/IslandResetEvent.java +++ b/src/main/java/world/bentobox/bentobox/api/events/island/IslandResetEvent.java @@ -21,7 +21,7 @@ public class IslandResetEvent extends IslandBaseEvent { private static final HandlerList handlers = new HandlerList(); @Override - public HandlerList getHandlers() { + public @NonNull HandlerList getHandlers() { return getHandlerList(); } diff --git a/src/main/java/world/bentobox/bentobox/api/events/island/IslandResettedEvent.java b/src/main/java/world/bentobox/bentobox/api/events/island/IslandResettedEvent.java index 448a96758..5b8200a7c 100644 --- a/src/main/java/world/bentobox/bentobox/api/events/island/IslandResettedEvent.java +++ b/src/main/java/world/bentobox/bentobox/api/events/island/IslandResettedEvent.java @@ -19,7 +19,7 @@ public class IslandResettedEvent extends IslandBaseEvent { private static final HandlerList handlers = new HandlerList(); @Override - public HandlerList getHandlers() { + public @NonNull HandlerList getHandlers() { return getHandlerList(); } diff --git a/src/main/java/world/bentobox/bentobox/api/events/island/IslandUnbanEvent.java b/src/main/java/world/bentobox/bentobox/api/events/island/IslandUnbanEvent.java index b4c497d59..94ab59e1e 100644 --- a/src/main/java/world/bentobox/bentobox/api/events/island/IslandUnbanEvent.java +++ b/src/main/java/world/bentobox/bentobox/api/events/island/IslandUnbanEvent.java @@ -5,6 +5,7 @@ import java.util.UUID; import org.bukkit.Location; import org.bukkit.event.HandlerList; +import org.eclipse.jdt.annotation.NonNull; import world.bentobox.bentobox.api.events.IslandBaseEvent; import world.bentobox.bentobox.database.objects.Island; @@ -20,7 +21,7 @@ public class IslandUnbanEvent extends IslandBaseEvent { private static final HandlerList handlers = new HandlerList(); @Override - public HandlerList getHandlers() { + public @NonNull HandlerList getHandlers() { return getHandlerList(); } diff --git a/src/main/java/world/bentobox/bentobox/api/events/island/IslandUnlockEvent.java b/src/main/java/world/bentobox/bentobox/api/events/island/IslandUnlockEvent.java index f2eefc8e1..c44437497 100644 --- a/src/main/java/world/bentobox/bentobox/api/events/island/IslandUnlockEvent.java +++ b/src/main/java/world/bentobox/bentobox/api/events/island/IslandUnlockEvent.java @@ -5,6 +5,7 @@ import java.util.UUID; import org.bukkit.Location; import org.bukkit.event.HandlerList; +import org.eclipse.jdt.annotation.NonNull; import world.bentobox.bentobox.api.events.IslandBaseEvent; import world.bentobox.bentobox.database.objects.Island; @@ -17,7 +18,7 @@ public class IslandUnlockEvent extends IslandBaseEvent { private static final HandlerList handlers = new HandlerList(); @Override - public HandlerList getHandlers() { + public @NonNull HandlerList getHandlers() { return getHandlerList(); } diff --git a/src/main/java/world/bentobox/bentobox/api/events/island/IslandUnregisteredEvent.java b/src/main/java/world/bentobox/bentobox/api/events/island/IslandUnregisteredEvent.java index 36a2f0e91..c3304cf9e 100644 --- a/src/main/java/world/bentobox/bentobox/api/events/island/IslandUnregisteredEvent.java +++ b/src/main/java/world/bentobox/bentobox/api/events/island/IslandUnregisteredEvent.java @@ -5,6 +5,7 @@ import java.util.UUID; import org.bukkit.Location; import org.bukkit.event.HandlerList; +import org.eclipse.jdt.annotation.NonNull; import world.bentobox.bentobox.api.events.IslandBaseEvent; import world.bentobox.bentobox.database.objects.Island; @@ -17,7 +18,7 @@ public class IslandUnregisteredEvent extends IslandBaseEvent { private static final HandlerList handlers = new HandlerList(); @Override - public HandlerList getHandlers() { + public @NonNull HandlerList getHandlers() { return getHandlerList(); } diff --git a/src/main/java/world/bentobox/bentobox/api/events/team/TeamDeleteEvent.java b/src/main/java/world/bentobox/bentobox/api/events/team/TeamDeleteEvent.java index 73351cefc..863a6591c 100644 --- a/src/main/java/world/bentobox/bentobox/api/events/team/TeamDeleteEvent.java +++ b/src/main/java/world/bentobox/bentobox/api/events/team/TeamDeleteEvent.java @@ -5,6 +5,7 @@ import java.util.UUID; import org.bukkit.Location; import org.bukkit.event.HandlerList; +import org.eclipse.jdt.annotation.NonNull; import world.bentobox.bentobox.api.events.IslandBaseEvent; import world.bentobox.bentobox.database.objects.Island; @@ -13,7 +14,7 @@ public class TeamDeleteEvent extends IslandBaseEvent { private static final HandlerList handlers = new HandlerList(); @Override - public HandlerList getHandlers() { + public @NonNull HandlerList getHandlers() { return getHandlerList(); } diff --git a/src/main/java/world/bentobox/bentobox/api/events/team/TeamGeneralEvent.java b/src/main/java/world/bentobox/bentobox/api/events/team/TeamGeneralEvent.java index ccfa53cbf..1e71493eb 100644 --- a/src/main/java/world/bentobox/bentobox/api/events/team/TeamGeneralEvent.java +++ b/src/main/java/world/bentobox/bentobox/api/events/team/TeamGeneralEvent.java @@ -5,6 +5,7 @@ import java.util.UUID; import org.bukkit.Location; import org.bukkit.event.HandlerList; +import org.eclipse.jdt.annotation.NonNull; import world.bentobox.bentobox.api.events.IslandBaseEvent; import world.bentobox.bentobox.database.objects.Island; @@ -13,7 +14,7 @@ public class TeamGeneralEvent extends IslandBaseEvent { private static final HandlerList handlers = new HandlerList(); @Override - public HandlerList getHandlers() { + public @NonNull HandlerList getHandlers() { return getHandlerList(); } diff --git a/src/main/java/world/bentobox/bentobox/api/events/team/TeamInfoEvent.java b/src/main/java/world/bentobox/bentobox/api/events/team/TeamInfoEvent.java index bb945a6aa..14dbc8214 100644 --- a/src/main/java/world/bentobox/bentobox/api/events/team/TeamInfoEvent.java +++ b/src/main/java/world/bentobox/bentobox/api/events/team/TeamInfoEvent.java @@ -5,6 +5,7 @@ import java.util.UUID; import org.bukkit.Location; import org.bukkit.event.HandlerList; +import org.eclipse.jdt.annotation.NonNull; import world.bentobox.bentobox.api.events.IslandBaseEvent; import world.bentobox.bentobox.database.objects.Island; @@ -13,7 +14,7 @@ public class TeamInfoEvent extends IslandBaseEvent { private static final HandlerList handlers = new HandlerList(); @Override - public HandlerList getHandlers() { + public @NonNull HandlerList getHandlers() { return getHandlerList(); } diff --git a/src/main/java/world/bentobox/bentobox/api/events/team/TeamInviteEvent.java b/src/main/java/world/bentobox/bentobox/api/events/team/TeamInviteEvent.java index 6322d6e9e..1a1fca2f2 100644 --- a/src/main/java/world/bentobox/bentobox/api/events/team/TeamInviteEvent.java +++ b/src/main/java/world/bentobox/bentobox/api/events/team/TeamInviteEvent.java @@ -5,6 +5,7 @@ import java.util.UUID; import org.bukkit.Location; import org.bukkit.event.HandlerList; +import org.eclipse.jdt.annotation.NonNull; import world.bentobox.bentobox.api.events.IslandBaseEvent; import world.bentobox.bentobox.database.objects.Island; @@ -13,7 +14,7 @@ public class TeamInviteEvent extends IslandBaseEvent { private static final HandlerList handlers = new HandlerList(); @Override - public HandlerList getHandlers() { + public @NonNull HandlerList getHandlers() { return getHandlerList(); } diff --git a/src/main/java/world/bentobox/bentobox/api/events/team/TeamJoinEvent.java b/src/main/java/world/bentobox/bentobox/api/events/team/TeamJoinEvent.java index 72eb10e0c..73940e019 100644 --- a/src/main/java/world/bentobox/bentobox/api/events/team/TeamJoinEvent.java +++ b/src/main/java/world/bentobox/bentobox/api/events/team/TeamJoinEvent.java @@ -5,6 +5,7 @@ import java.util.UUID; import org.bukkit.Location; import org.bukkit.event.HandlerList; +import org.eclipse.jdt.annotation.NonNull; import world.bentobox.bentobox.api.events.IslandBaseEvent; import world.bentobox.bentobox.database.objects.Island; @@ -13,7 +14,7 @@ public class TeamJoinEvent extends IslandBaseEvent { private static final HandlerList handlers = new HandlerList(); @Override - public HandlerList getHandlers() { + public @NonNull HandlerList getHandlers() { return getHandlerList(); } diff --git a/src/main/java/world/bentobox/bentobox/api/events/team/TeamJoinedEvent.java b/src/main/java/world/bentobox/bentobox/api/events/team/TeamJoinedEvent.java index 051b8bf44..e750154a0 100644 --- a/src/main/java/world/bentobox/bentobox/api/events/team/TeamJoinedEvent.java +++ b/src/main/java/world/bentobox/bentobox/api/events/team/TeamJoinedEvent.java @@ -5,6 +5,7 @@ import java.util.UUID; import org.bukkit.Location; import org.bukkit.event.HandlerList; +import org.eclipse.jdt.annotation.NonNull; import world.bentobox.bentobox.api.events.IslandBaseEvent; import world.bentobox.bentobox.database.objects.Island; @@ -17,7 +18,7 @@ public class TeamJoinedEvent extends IslandBaseEvent { private static final HandlerList handlers = new HandlerList(); @Override - public HandlerList getHandlers() { + public @NonNull HandlerList getHandlers() { return getHandlerList(); } diff --git a/src/main/java/world/bentobox/bentobox/api/events/team/TeamKickEvent.java b/src/main/java/world/bentobox/bentobox/api/events/team/TeamKickEvent.java index 9b9a253af..00a8a11ff 100644 --- a/src/main/java/world/bentobox/bentobox/api/events/team/TeamKickEvent.java +++ b/src/main/java/world/bentobox/bentobox/api/events/team/TeamKickEvent.java @@ -5,6 +5,7 @@ import java.util.UUID; import org.bukkit.Location; import org.bukkit.event.HandlerList; +import org.eclipse.jdt.annotation.NonNull; import world.bentobox.bentobox.api.events.IslandBaseEvent; import world.bentobox.bentobox.database.objects.Island; @@ -13,7 +14,7 @@ public class TeamKickEvent extends IslandBaseEvent { private static final HandlerList handlers = new HandlerList(); @Override - public HandlerList getHandlers() { + public @NonNull HandlerList getHandlers() { return getHandlerList(); } diff --git a/src/main/java/world/bentobox/bentobox/api/events/team/TeamLeaveEvent.java b/src/main/java/world/bentobox/bentobox/api/events/team/TeamLeaveEvent.java index 95f5b732b..28ca431a0 100644 --- a/src/main/java/world/bentobox/bentobox/api/events/team/TeamLeaveEvent.java +++ b/src/main/java/world/bentobox/bentobox/api/events/team/TeamLeaveEvent.java @@ -5,6 +5,7 @@ import java.util.UUID; import org.bukkit.Location; import org.bukkit.event.HandlerList; +import org.eclipse.jdt.annotation.NonNull; import world.bentobox.bentobox.api.events.IslandBaseEvent; import world.bentobox.bentobox.database.objects.Island; @@ -18,7 +19,7 @@ public class TeamLeaveEvent extends IslandBaseEvent { private static final HandlerList handlers = new HandlerList(); @Override - public HandlerList getHandlers() { + public @NonNull HandlerList getHandlers() { return getHandlerList(); } diff --git a/src/main/java/world/bentobox/bentobox/api/events/team/TeamRejectEvent.java b/src/main/java/world/bentobox/bentobox/api/events/team/TeamRejectEvent.java index 6352a742f..adcd4359c 100644 --- a/src/main/java/world/bentobox/bentobox/api/events/team/TeamRejectEvent.java +++ b/src/main/java/world/bentobox/bentobox/api/events/team/TeamRejectEvent.java @@ -5,6 +5,7 @@ import java.util.UUID; import org.bukkit.Location; import org.bukkit.event.HandlerList; +import org.eclipse.jdt.annotation.NonNull; import world.bentobox.bentobox.api.events.IslandBaseEvent; import world.bentobox.bentobox.database.objects.Island; @@ -13,7 +14,7 @@ public class TeamRejectEvent extends IslandBaseEvent { private static final HandlerList handlers = new HandlerList(); @Override - public HandlerList getHandlers() { + public @NonNull HandlerList getHandlers() { return getHandlerList(); } diff --git a/src/main/java/world/bentobox/bentobox/api/events/team/TeamSetownerEvent.java b/src/main/java/world/bentobox/bentobox/api/events/team/TeamSetownerEvent.java index f0abd6647..2d0b81892 100644 --- a/src/main/java/world/bentobox/bentobox/api/events/team/TeamSetownerEvent.java +++ b/src/main/java/world/bentobox/bentobox/api/events/team/TeamSetownerEvent.java @@ -5,6 +5,7 @@ import java.util.UUID; import org.bukkit.Location; import org.bukkit.event.HandlerList; +import org.eclipse.jdt.annotation.NonNull; import world.bentobox.bentobox.api.events.IslandBaseEvent; import world.bentobox.bentobox.database.objects.Island; @@ -19,7 +20,7 @@ public class TeamSetownerEvent extends IslandBaseEvent { private static final HandlerList handlers = new HandlerList(); @Override - public HandlerList getHandlers() { + public @NonNull HandlerList getHandlers() { return getHandlerList(); } diff --git a/src/main/java/world/bentobox/bentobox/api/events/team/TeamUninviteEvent.java b/src/main/java/world/bentobox/bentobox/api/events/team/TeamUninviteEvent.java index 8c7371529..60953cd8e 100644 --- a/src/main/java/world/bentobox/bentobox/api/events/team/TeamUninviteEvent.java +++ b/src/main/java/world/bentobox/bentobox/api/events/team/TeamUninviteEvent.java @@ -5,6 +5,7 @@ import java.util.UUID; import org.bukkit.Location; import org.bukkit.event.HandlerList; +import org.eclipse.jdt.annotation.NonNull; import world.bentobox.bentobox.api.events.IslandBaseEvent; import world.bentobox.bentobox.database.objects.Island; @@ -13,7 +14,7 @@ public class TeamUninviteEvent extends IslandBaseEvent { private static final HandlerList handlers = new HandlerList(); @Override - public HandlerList getHandlers() { + public @NonNull HandlerList getHandlers() { return getHandlerList(); } diff --git a/src/main/java/world/bentobox/bentobox/api/flags/clicklisteners/CycleClick.java b/src/main/java/world/bentobox/bentobox/api/flags/clicklisteners/CycleClick.java index 922337133..d8c0f2e0c 100644 --- a/src/main/java/world/bentobox/bentobox/api/flags/clicklisteners/CycleClick.java +++ b/src/main/java/world/bentobox/bentobox/api/flags/clicklisteners/CycleClick.java @@ -24,7 +24,7 @@ import world.bentobox.bentobox.util.Util; */ public class CycleClick implements PanelItem.ClickHandler { - protected BentoBox plugin = BentoBox.getInstance(); + protected final BentoBox plugin = BentoBox.getInstance(); protected Island island; protected User user; protected boolean changeOccurred; diff --git a/src/main/java/world/bentobox/bentobox/api/panels/builders/PanelItemBuilder.java b/src/main/java/world/bentobox/bentobox/api/panels/builders/PanelItemBuilder.java index c3c10317b..ebe17e3c4 100644 --- a/src/main/java/world/bentobox/bentobox/api/panels/builders/PanelItemBuilder.java +++ b/src/main/java/world/bentobox/bentobox/api/panels/builders/PanelItemBuilder.java @@ -137,7 +137,7 @@ public class PanelItemBuilder { /** * @return the name */ - public String getName() { + public @Nullable String getName() { return name; } diff --git a/src/main/java/world/bentobox/bentobox/api/placeholders/placeholderapi/AddonPlaceholderExpansion.java b/src/main/java/world/bentobox/bentobox/api/placeholders/placeholderapi/AddonPlaceholderExpansion.java index d428b5708..83115c750 100644 --- a/src/main/java/world/bentobox/bentobox/api/placeholders/placeholderapi/AddonPlaceholderExpansion.java +++ b/src/main/java/world/bentobox/bentobox/api/placeholders/placeholderapi/AddonPlaceholderExpansion.java @@ -1,5 +1,6 @@ package world.bentobox.bentobox.api.placeholders.placeholderapi; +import org.eclipse.jdt.annotation.NonNull; import world.bentobox.bentobox.api.addons.Addon; public class AddonPlaceholderExpansion extends BasicPlaceholderExpansion { @@ -10,17 +11,17 @@ public class AddonPlaceholderExpansion extends BasicPlaceholderExpansion { } @Override - public String getName() { + public @NonNull String getName() { return addon.getDescription().getName(); } @Override - public String getAuthor() { + public @NonNull String getAuthor() { return addon.getDescription().getAuthors().get(0); } @Override - public String getVersion() { + public @NonNull String getVersion() { return addon.getDescription().getVersion(); } } diff --git a/src/main/java/world/bentobox/bentobox/api/placeholders/placeholderapi/BasicPlaceholderExpansion.java b/src/main/java/world/bentobox/bentobox/api/placeholders/placeholderapi/BasicPlaceholderExpansion.java index e8a8a91f3..ae69b9376 100644 --- a/src/main/java/world/bentobox/bentobox/api/placeholders/placeholderapi/BasicPlaceholderExpansion.java +++ b/src/main/java/world/bentobox/bentobox/api/placeholders/placeholderapi/BasicPlaceholderExpansion.java @@ -24,7 +24,7 @@ abstract class BasicPlaceholderExpansion extends PlaceholderExpansion { } @Override - public String getIdentifier() { + public @NonNull String getIdentifier() { return getName().toLowerCase(Locale.ENGLISH); } @@ -42,7 +42,7 @@ abstract class BasicPlaceholderExpansion extends PlaceholderExpansion { } @Override - public String onPlaceholderRequest(Player p, String placeholder) { + public String onPlaceholderRequest(Player p, @NonNull String placeholder) { if (placeholders.containsKey(placeholder)) { return placeholders.get(placeholder).onReplace(User.getInstance(p)); } diff --git a/src/main/java/world/bentobox/bentobox/api/placeholders/placeholderapi/BentoBoxPlaceholderExpansion.java b/src/main/java/world/bentobox/bentobox/api/placeholders/placeholderapi/BentoBoxPlaceholderExpansion.java index da290c84e..c00e98384 100644 --- a/src/main/java/world/bentobox/bentobox/api/placeholders/placeholderapi/BentoBoxPlaceholderExpansion.java +++ b/src/main/java/world/bentobox/bentobox/api/placeholders/placeholderapi/BentoBoxPlaceholderExpansion.java @@ -1,5 +1,6 @@ package world.bentobox.bentobox.api.placeholders.placeholderapi; +import org.eclipse.jdt.annotation.NonNull; import world.bentobox.bentobox.BentoBox; public class BentoBoxPlaceholderExpansion extends BasicPlaceholderExpansion { @@ -11,17 +12,17 @@ public class BentoBoxPlaceholderExpansion extends BasicPlaceholderExpansion { } @Override - public String getName() { + public @NonNull String getName() { return plugin.getName(); } @Override - public String getAuthor() { + public @NonNull String getAuthor() { return "Tastybento and Poslovitch"; } @Override - public String getVersion() { + public @NonNull String getVersion() { return plugin.getDescription().getVersion(); } } \ No newline at end of file diff --git a/src/main/java/world/bentobox/bentobox/api/user/Notifier.java b/src/main/java/world/bentobox/bentobox/api/user/Notifier.java index e75adff03..b78888cd8 100644 --- a/src/main/java/world/bentobox/bentobox/api/user/Notifier.java +++ b/src/main/java/world/bentobox/bentobox/api/user/Notifier.java @@ -6,6 +6,7 @@ import java.util.concurrent.TimeUnit; import com.google.common.cache.CacheBuilder; import com.google.common.cache.CacheLoader; import com.google.common.cache.LoadingCache; +import org.eclipse.jdt.annotation.NonNull; /** * Utilities class that helps to avoid spamming the User with potential repeated messages @@ -26,7 +27,7 @@ public class Notifier { .build( new CacheLoader<>() { @Override - public Notification load(User user) { + public Notification load(@NonNull User user) { return new Notification(null, 0); } } diff --git a/src/main/java/world/bentobox/bentobox/api/user/User.java b/src/main/java/world/bentobox/bentobox/api/user/User.java index 12d3d89bf..9f7a191e1 100644 --- a/src/main/java/world/bentobox/bentobox/api/user/User.java +++ b/src/main/java/world/bentobox/bentobox/api/user/User.java @@ -135,7 +135,7 @@ public class User implements MetaDataAble { private Addon addon; - private User(CommandSender sender) { + private User(@Nullable CommandSender sender) { player = null; playerUUID = null; this.sender = sender; diff --git a/src/main/java/world/bentobox/bentobox/blueprints/Blueprint.java b/src/main/java/world/bentobox/bentobox/blueprints/Blueprint.java index fe47de567..38d73eec8 100644 --- a/src/main/java/world/bentobox/bentobox/blueprints/Blueprint.java +++ b/src/main/java/world/bentobox/bentobox/blueprints/Blueprint.java @@ -79,7 +79,7 @@ public class Blueprint { /** * @return the icon */ - public Material getIcon() { + public @NonNull Material getIcon() { return icon; } /** diff --git a/src/main/java/world/bentobox/bentobox/blueprints/BlueprintClipboard.java b/src/main/java/world/bentobox/bentobox/blueprints/BlueprintClipboard.java index 034cdf919..7e7fcbc1e 100644 --- a/src/main/java/world/bentobox/bentobox/blueprints/BlueprintClipboard.java +++ b/src/main/java/world/bentobox/bentobox/blueprints/BlueprintClipboard.java @@ -398,7 +398,7 @@ public class BlueprintClipboard { /** * @return the blueprint */ - public Blueprint getBlueprint() { + public @Nullable Blueprint getBlueprint() { return blueprint; } diff --git a/src/main/java/world/bentobox/bentobox/blueprints/conversation/DescriptionPrompt.java b/src/main/java/world/bentobox/bentobox/blueprints/conversation/DescriptionPrompt.java index 4493d9c47..661b6000d 100644 --- a/src/main/java/world/bentobox/bentobox/blueprints/conversation/DescriptionPrompt.java +++ b/src/main/java/world/bentobox/bentobox/blueprints/conversation/DescriptionPrompt.java @@ -8,6 +8,7 @@ import org.bukkit.conversations.Prompt; import org.bukkit.conversations.StringPrompt; import org.bukkit.entity.Player; +import org.eclipse.jdt.annotation.NonNull; import world.bentobox.bentobox.api.addons.GameModeAddon; import world.bentobox.bentobox.api.localization.TextVariables; import world.bentobox.bentobox.api.user.User; @@ -33,7 +34,7 @@ public class DescriptionPrompt extends StringPrompt { @SuppressWarnings("unchecked") @Override - public String getPromptText(ConversationContext context) { + public @NonNull String getPromptText(ConversationContext context) { User user = User.getInstance((Player)context.getForWhom()); if (context.getSessionData(DESCRIPTION) != null) { StringBuilder sb = new StringBuilder(); diff --git a/src/main/java/world/bentobox/bentobox/blueprints/conversation/DescriptionSuccessPrompt.java b/src/main/java/world/bentobox/bentobox/blueprints/conversation/DescriptionSuccessPrompt.java index b28546a9c..e5e78341e 100644 --- a/src/main/java/world/bentobox/bentobox/blueprints/conversation/DescriptionSuccessPrompt.java +++ b/src/main/java/world/bentobox/bentobox/blueprints/conversation/DescriptionSuccessPrompt.java @@ -7,6 +7,7 @@ import org.bukkit.conversations.MessagePrompt; import org.bukkit.conversations.Prompt; import org.bukkit.entity.Player; +import org.eclipse.jdt.annotation.NonNull; import world.bentobox.bentobox.BentoBox; import world.bentobox.bentobox.api.addons.GameModeAddon; import world.bentobox.bentobox.api.user.User; @@ -28,7 +29,7 @@ public class DescriptionSuccessPrompt extends MessagePrompt { } @Override - public String getPromptText(ConversationContext context) { + public @NonNull String getPromptText(ConversationContext context) { User user = User.getInstance((Player)context.getForWhom()); @SuppressWarnings("unchecked") List description = (List)context.getSessionData("description"); @@ -46,7 +47,7 @@ public class DescriptionSuccessPrompt extends MessagePrompt { } @Override - protected Prompt getNextPrompt(ConversationContext context) { + protected Prompt getNextPrompt(@NonNull ConversationContext context) { return Prompt.END_OF_CONVERSATION; } diff --git a/src/main/java/world/bentobox/bentobox/blueprints/conversation/NameConversationPrefix.java b/src/main/java/world/bentobox/bentobox/blueprints/conversation/NameConversationPrefix.java index 719342de5..0da78ac24 100644 --- a/src/main/java/world/bentobox/bentobox/blueprints/conversation/NameConversationPrefix.java +++ b/src/main/java/world/bentobox/bentobox/blueprints/conversation/NameConversationPrefix.java @@ -4,12 +4,13 @@ import org.bukkit.conversations.ConversationContext; import org.bukkit.conversations.ConversationPrefix; import org.bukkit.entity.Player; +import org.eclipse.jdt.annotation.NonNull; import world.bentobox.bentobox.api.user.User; public class NameConversationPrefix implements ConversationPrefix { @Override - public String getPrefix(ConversationContext context) { + public @NonNull String getPrefix(ConversationContext context) { User user = User.getInstance((Player)context.getForWhom()); return user.getTranslation("commands.admin.blueprint.management.name.conversation-prefix"); } diff --git a/src/main/java/world/bentobox/bentobox/blueprints/conversation/NamePrompt.java b/src/main/java/world/bentobox/bentobox/blueprints/conversation/NamePrompt.java index 5dd8a6294..2677cda44 100644 --- a/src/main/java/world/bentobox/bentobox/blueprints/conversation/NamePrompt.java +++ b/src/main/java/world/bentobox/bentobox/blueprints/conversation/NamePrompt.java @@ -38,7 +38,7 @@ public class NamePrompt extends StringPrompt { } @Override - public String getPromptText(ConversationContext context) { + public @NonNull String getPromptText(ConversationContext context) { User user = User.getInstance((Player)context.getForWhom()); return user.getTranslation("commands.admin.blueprint.management.name.prompt"); } diff --git a/src/main/java/world/bentobox/bentobox/blueprints/conversation/NameSuccessPrompt.java b/src/main/java/world/bentobox/bentobox/blueprints/conversation/NameSuccessPrompt.java index 8fe5d8c51..9e990fefe 100644 --- a/src/main/java/world/bentobox/bentobox/blueprints/conversation/NameSuccessPrompt.java +++ b/src/main/java/world/bentobox/bentobox/blueprints/conversation/NameSuccessPrompt.java @@ -34,7 +34,7 @@ public class NameSuccessPrompt extends MessagePrompt { } @Override - public String getPromptText(ConversationContext context) { + public @NonNull String getPromptText(ConversationContext context) { String name = (String) context.getSessionData("name"); String uniqueId = (String) context.getSessionData("uniqueId"); User user = User.getInstance((Player)context.getForWhom()); @@ -65,7 +65,7 @@ public class NameSuccessPrompt extends MessagePrompt { } @Override - protected Prompt getNextPrompt(ConversationContext context) { + protected Prompt getNextPrompt(@NonNull ConversationContext context) { return Prompt.END_OF_CONVERSATION; } diff --git a/src/main/java/world/bentobox/bentobox/database/json/BentoboxTypeAdapterFactory.java b/src/main/java/world/bentobox/bentobox/database/json/BentoboxTypeAdapterFactory.java index d6693a073..09d738c34 100644 --- a/src/main/java/world/bentobox/bentobox/database/json/BentoboxTypeAdapterFactory.java +++ b/src/main/java/world/bentobox/bentobox/database/json/BentoboxTypeAdapterFactory.java @@ -33,7 +33,7 @@ import world.bentobox.bentobox.database.json.adapters.WorldTypeAdapter; */ public class BentoboxTypeAdapterFactory implements TypeAdapterFactory { - BentoBox plugin; + final BentoBox plugin; /** * @param plugin plugin diff --git a/src/main/java/world/bentobox/bentobox/database/mongodb/MongoDBDatabaseHandler.java b/src/main/java/world/bentobox/bentobox/database/mongodb/MongoDBDatabaseHandler.java index 02c0744a9..f9efcb15c 100644 --- a/src/main/java/world/bentobox/bentobox/database/mongodb/MongoDBDatabaseHandler.java +++ b/src/main/java/world/bentobox/bentobox/database/mongodb/MongoDBDatabaseHandler.java @@ -19,6 +19,7 @@ import com.mongodb.client.model.IndexOptions; import com.mongodb.client.model.Indexes; import com.mongodb.util.JSON; +import org.eclipse.jdt.annotation.NonNull; import world.bentobox.bentobox.BentoBox; import world.bentobox.bentobox.database.DatabaseConnector; import world.bentobox.bentobox.database.json.AbstractJSONDatabaseHandler; @@ -125,7 +126,7 @@ public class MongoDBDatabaseHandler extends AbstractJSONDatabaseHandler { } @Override - public T loadObject(String uniqueId) { + public T loadObject(@NonNull String uniqueId) { Document doc = collection.find(new Document(MONGO_ID, uniqueId)).limit(1).first(); Gson gson = getGson(); String json = JSON.serialize(doc).replaceFirst(MONGO_ID, UNIQUEID); diff --git a/src/main/java/world/bentobox/bentobox/database/transition/TransitionDatabaseHandler.java b/src/main/java/world/bentobox/bentobox/database/transition/TransitionDatabaseHandler.java index a3bb314bd..c1402be8a 100644 --- a/src/main/java/world/bentobox/bentobox/database/transition/TransitionDatabaseHandler.java +++ b/src/main/java/world/bentobox/bentobox/database/transition/TransitionDatabaseHandler.java @@ -5,6 +5,7 @@ import java.lang.reflect.InvocationTargetException; import java.util.List; import java.util.concurrent.CompletableFuture; +import org.eclipse.jdt.annotation.NonNull; import org.eclipse.jdt.annotation.Nullable; import world.bentobox.bentobox.database.AbstractDatabaseHandler; @@ -55,7 +56,7 @@ public class TransitionDatabaseHandler extends AbstractDatabaseHandler { * @see world.bentobox.bentobox.database.AbstractDatabaseHandler#loadObject(java.lang.String) */ @Override - public T loadObject(String uniqueId) throws InstantiationException, IllegalAccessException, InvocationTargetException, ClassNotFoundException, IntrospectionException, NoSuchMethodException { + public T loadObject(@NonNull String uniqueId) throws InstantiationException, IllegalAccessException, InvocationTargetException, ClassNotFoundException, IntrospectionException, NoSuchMethodException { // Try destination database @Nullable T object = toHandler.loadObject(uniqueId); diff --git a/src/main/java/world/bentobox/bentobox/database/yaml/YamlDatabaseConnector.java b/src/main/java/world/bentobox/bentobox/database/yaml/YamlDatabaseConnector.java index aacc05b97..62e9b3094 100644 --- a/src/main/java/world/bentobox/bentobox/database/yaml/YamlDatabaseConnector.java +++ b/src/main/java/world/bentobox/bentobox/database/yaml/YamlDatabaseConnector.java @@ -144,7 +144,7 @@ public class YamlDatabaseConnector implements DatabaseConnector { // Run through the file and add in the comments File commentedFile = new File(file.getPath() + ".tmp"); List newFile = new ArrayList<>(); - try (Scanner scanner = new Scanner(file, "UTF-8")) { + try (Scanner scanner = new Scanner(file, StandardCharsets.UTF_8)) { while (scanner.hasNextLine()) { String nextLine = scanner.nextLine(); // See if there are any comments in this line diff --git a/src/main/java/world/bentobox/bentobox/database/yaml/YamlDatabaseHandler.java b/src/main/java/world/bentobox/bentobox/database/yaml/YamlDatabaseHandler.java index 6c9d56dd5..05b42d537 100644 --- a/src/main/java/world/bentobox/bentobox/database/yaml/YamlDatabaseHandler.java +++ b/src/main/java/world/bentobox/bentobox/database/yaml/YamlDatabaseHandler.java @@ -80,7 +80,7 @@ public class YamlDatabaseHandler extends AbstractDatabaseHandler { * @see world.bentobox.bentobox.database.AbstractDatabaseHandler#loadObject(java.lang.String) */ @Override - public T loadObject(String key) throws InstantiationException, IllegalAccessException, InvocationTargetException, ClassNotFoundException, IntrospectionException, NoSuchMethodException { + public T loadObject(@NonNull String key) throws InstantiationException, IllegalAccessException, InvocationTargetException, ClassNotFoundException, IntrospectionException, NoSuchMethodException { // Objects are loaded from a folder named after the simple name of the class being stored String path = DATABASE_FOLDER_NAME + File.separator + dataObject.getSimpleName(); // This path and key can be overridden by the StoreAt annotation in the code diff --git a/src/main/java/world/bentobox/bentobox/hooks/placeholders/PlaceholderAPIHook.java b/src/main/java/world/bentobox/bentobox/hooks/placeholders/PlaceholderAPIHook.java index 7b3b174fd..bf0583c16 100644 --- a/src/main/java/world/bentobox/bentobox/hooks/placeholders/PlaceholderAPIHook.java +++ b/src/main/java/world/bentobox/bentobox/hooks/placeholders/PlaceholderAPIHook.java @@ -32,7 +32,7 @@ public class PlaceholderAPIHook extends PlaceholderHook { public PlaceholderAPIHook() { - super("PlaceholderAPI"); + super(); this.addonsExpansions = new HashMap<>(); this.bentoBoxPlaceholders = new HashSet<>(); this.addonPlaceholders = new HashMap<>(); diff --git a/src/main/java/world/bentobox/bentobox/hooks/placeholders/PlaceholderHook.java b/src/main/java/world/bentobox/bentobox/hooks/placeholders/PlaceholderHook.java index f8218d8d7..78653f78b 100644 --- a/src/main/java/world/bentobox/bentobox/hooks/placeholders/PlaceholderHook.java +++ b/src/main/java/world/bentobox/bentobox/hooks/placeholders/PlaceholderHook.java @@ -14,8 +14,8 @@ import world.bentobox.bentobox.api.placeholders.PlaceholderReplacer; */ public abstract class PlaceholderHook extends Hook { - protected PlaceholderHook(@NonNull String pluginName) { - super(pluginName, Material.NAME_TAG); + protected PlaceholderHook() { + super("PlaceholderAPI", Material.NAME_TAG); } /** diff --git a/src/main/java/world/bentobox/bentobox/listeners/flags/protection/BucketListener.java b/src/main/java/world/bentobox/bentobox/listeners/flags/protection/BucketListener.java index 02426ea85..2c4878e54 100644 --- a/src/main/java/world/bentobox/bentobox/listeners/flags/protection/BucketListener.java +++ b/src/main/java/world/bentobox/bentobox/listeners/flags/protection/BucketListener.java @@ -40,15 +40,9 @@ public class BucketListener extends FlagListener { public void onBucketFill(final PlayerBucketFillEvent e) { // Check filling of various liquids switch (e.getItemStack().getType()) { - case LAVA_BUCKET -> { - checkIsland(e, e.getPlayer(), e.getBlockClicked().getLocation(), Flags.COLLECT_LAVA); - } - case WATER_BUCKET -> { - checkIsland(e, e.getPlayer(), e.getBlockClicked().getLocation(), Flags.COLLECT_WATER); - } - case MILK_BUCKET -> { - checkIsland(e, e.getPlayer(), e.getBlockClicked().getLocation(), Flags.MILKING); - } + case LAVA_BUCKET -> checkIsland(e, e.getPlayer(), e.getBlockClicked().getLocation(), Flags.COLLECT_LAVA); + case WATER_BUCKET -> checkIsland(e, e.getPlayer(), e.getBlockClicked().getLocation(), Flags.COLLECT_WATER); + case MILK_BUCKET -> checkIsland(e, e.getPlayer(), e.getBlockClicked().getLocation(), Flags.MILKING); default -> // Check general bucket use checkIsland(e, e.getPlayer(), e.getBlockClicked().getLocation(), Flags.BUCKET); diff --git a/src/main/java/world/bentobox/bentobox/managers/IslandWorldManager.java b/src/main/java/world/bentobox/bentobox/managers/IslandWorldManager.java index 10a2f363a..c27a21a13 100644 --- a/src/main/java/world/bentobox/bentobox/managers/IslandWorldManager.java +++ b/src/main/java/world/bentobox/bentobox/managers/IslandWorldManager.java @@ -678,7 +678,7 @@ public class IslandWorldManager { * @return data folder file object or the plugin's data folder if none found */ public File getDataFolder(@NonNull World world) { - return getAddon(world).map(GameModeAddon::getDataFolder).orElseGet(() -> plugin.getDataFolder()); + return getAddon(world).map(GameModeAddon::getDataFolder).orElseGet(plugin::getDataFolder); } /** diff --git a/src/main/java/world/bentobox/bentobox/managers/IslandsManager.java b/src/main/java/world/bentobox/bentobox/managers/IslandsManager.java index b7c433759..46457ce6c 100644 --- a/src/main/java/world/bentobox/bentobox/managers/IslandsManager.java +++ b/src/main/java/world/bentobox/bentobox/managers/IslandsManager.java @@ -129,7 +129,7 @@ public class IslandsManager { * Used only for testing. Sets the database to a mock database. * @param handler - handler */ - public void setHandler(Database handler) { + public void setHandler(@NonNull Database handler) { this.handler = handler; } diff --git a/src/main/java/world/bentobox/bentobox/managers/island/DefaultNewIslandLocationStrategy.java b/src/main/java/world/bentobox/bentobox/managers/island/DefaultNewIslandLocationStrategy.java index 532699419..26593d042 100644 --- a/src/main/java/world/bentobox/bentobox/managers/island/DefaultNewIslandLocationStrategy.java +++ b/src/main/java/world/bentobox/bentobox/managers/island/DefaultNewIslandLocationStrategy.java @@ -32,7 +32,7 @@ public class DefaultNewIslandLocationStrategy implements NewIslandLocationStrate ISLAND_FOUND, BLOCKS_IN_AREA, FREE } - protected BentoBox plugin = BentoBox.getInstance(); + protected final BentoBox plugin = BentoBox.getInstance(); @Override public Location getNextLocation(World world) { diff --git a/src/main/java/world/bentobox/bentobox/panels/settings/WorldDefaultSettingsTab.java b/src/main/java/world/bentobox/bentobox/panels/settings/WorldDefaultSettingsTab.java index 68b3ed5d1..b41f651b6 100644 --- a/src/main/java/world/bentobox/bentobox/panels/settings/WorldDefaultSettingsTab.java +++ b/src/main/java/world/bentobox/bentobox/panels/settings/WorldDefaultSettingsTab.java @@ -7,6 +7,7 @@ import java.util.stream.Collectors; import org.bukkit.Material; import org.bukkit.World; +import org.eclipse.jdt.annotation.NonNull; import world.bentobox.bentobox.api.flags.Flag.Type; import world.bentobox.bentobox.api.flags.clicklisteners.WorldToggleClick; import world.bentobox.bentobox.api.localization.TextVariables; @@ -68,7 +69,7 @@ public class WorldDefaultSettingsTab extends SettingsTab implements Tab { * @return list of all the panel items for this flag type */ @Override - public List getPanelItems() { + public @NonNull List getPanelItems() { // Different description and click handlers return getFlags().stream().map(f -> { PanelItem i = f.toPanelItem(plugin, user, null, false); diff --git a/src/main/java/world/bentobox/bentobox/util/IslandInfo.java b/src/main/java/world/bentobox/bentobox/util/IslandInfo.java index 99886efd0..dbe55854a 100644 --- a/src/main/java/world/bentobox/bentobox/util/IslandInfo.java +++ b/src/main/java/world/bentobox/bentobox/util/IslandInfo.java @@ -28,7 +28,7 @@ public class IslandInfo { /** - * @param plugin + * Get island Info * @param island Island to show info */ public IslandInfo(Island island) { diff --git a/src/main/java/world/bentobox/bentobox/util/MyBiomeGrid.java b/src/main/java/world/bentobox/bentobox/util/MyBiomeGrid.java index 848b4088d..56d17a8ce 100644 --- a/src/main/java/world/bentobox/bentobox/util/MyBiomeGrid.java +++ b/src/main/java/world/bentobox/bentobox/util/MyBiomeGrid.java @@ -7,6 +7,7 @@ import org.bukkit.World.Environment; import org.bukkit.block.Biome; import org.bukkit.generator.ChunkGenerator.BiomeGrid; import org.bukkit.util.Vector; +import org.eclipse.jdt.annotation.NonNull; /** * A biome grid for generators @@ -37,19 +38,19 @@ public class MyBiomeGrid implements BiomeGrid { } @Override - public Biome getBiome(int x, int z) { + public @NonNull Biome getBiome(int x, int z) { return map.getOrDefault(new Vector(x,0,z), defaultBiome); } @Override - public void setBiome(int x, int z, Biome bio) { + public void setBiome(int x, int z, @NonNull Biome bio) { map.put(new Vector(x,0,z), bio); } @Override - public Biome getBiome(int x, int y, int z) { + public @NonNull Biome getBiome(int x, int y, int z) { return map.getOrDefault(new Vector(x,y,z), defaultBiome); } @Override - public void setBiome(int x, int y, int z, Biome bio) { + public void setBiome(int x, int y, int z, @NonNull Biome bio) { map.put(new Vector(x, y, z), bio); }