* Addons can expose data that they want to expose. To access it, call this class with the appropriate addon name, * the label for the data that is requested and if required, a map of key-value pairs that will be given to the addon. - * + *
* Note Since BentoBox 1.17.0, Addons can be declared as Pladdons and be loaded by the Bukkit classloader. This * enables Plugins to access Addon methods directly so this API is not required. *
diff --git a/src/main/java/world/bentobox/bentobox/api/commands/admin/blueprints/AdminBlueprintCommand.java b/src/main/java/world/bentobox/bentobox/api/commands/admin/blueprints/AdminBlueprintCommand.java index ca8a6eaf0..8246d157d 100644 --- a/src/main/java/world/bentobox/bentobox/api/commands/admin/blueprints/AdminBlueprintCommand.java +++ b/src/main/java/world/bentobox/bentobox/api/commands/admin/blueprints/AdminBlueprintCommand.java @@ -121,11 +121,6 @@ public class AdminBlueprintCommand extends ConfirmableCommand { user.spawnParticle(PARTICLE, PARTICLE_DUST_OPTIONS, maxX + 0.5, maxY + 0.5, z + 0.5); } - // Drawing origin - if (clipboard.getOrigin() != null) { - user.spawnParticle(Particle.VILLAGER_HAPPY, null, clipboard.getOrigin().getBlockX() + 0.5, clipboard.getOrigin().getBlockY() + 0.5, clipboard.getOrigin().getBlockZ() + 0.5); - } - } protected void hideClipboard(User user) { diff --git a/src/main/java/world/bentobox/bentobox/api/commands/island/IslandBanCommand.java b/src/main/java/world/bentobox/bentobox/api/commands/island/IslandBanCommand.java index 388e4b1ce..bcf001ec3 100644 --- a/src/main/java/world/bentobox/bentobox/api/commands/island/IslandBanCommand.java +++ b/src/main/java/world/bentobox/bentobox/api/commands/island/IslandBanCommand.java @@ -112,8 +112,8 @@ public class IslandBanCommand extends CompositeCommand { } // Event is not cancelled if (island.ban(issuer.getUniqueId(), target.getUniqueId())) { - issuer.sendMessage("commands.island.ban.player-banned", TextVariables.NAME, target.getName()); - target.sendMessage("commands.island.ban.owner-banned-you", TextVariables.NAME, issuer.getName()); + issuer.sendMessage("commands.island.ban.player-banned", TextVariables.NAME, target.getName(), TextVariables.DISPLAY_NAME, target.getDisplayName()); + target.sendMessage("commands.island.ban.owner-banned-you", TextVariables.NAME, issuer.getName(), TextVariables.DISPLAY_NAME, issuer.getDisplayName()); // If the player is online, has an island and on the banned island, move them home immediately if (target.isOnline() && getIslands().hasIsland(getWorld(), target.getUniqueId()) && island.onIsland(target.getLocation())) { getIslands().homeTeleportAsync(getWorld(), target.getPlayer()); diff --git a/src/main/java/world/bentobox/bentobox/api/commands/island/IslandExpelCommand.java b/src/main/java/world/bentobox/bentobox/api/commands/island/IslandExpelCommand.java index a13ad2587..be7fbc0c6 100644 --- a/src/main/java/world/bentobox/bentobox/api/commands/island/IslandExpelCommand.java +++ b/src/main/java/world/bentobox/bentobox/api/commands/island/IslandExpelCommand.java @@ -116,17 +116,17 @@ public class IslandExpelCommand extends CompositeCommand { return false; } - target.sendMessage("commands.island.expel.player-expelled-you", TextVariables.NAME, user.getName()); + target.sendMessage("commands.island.expel.player-expelled-you", TextVariables.NAME, user.getName(), TextVariables.DISPLAY_NAME, user.getDisplayName()); island.getWorld().playSound(target.getLocation(), Sound.ENTITY_GENERIC_EXPLODE, 1F, 1F); if (getIslands().hasIsland(getWorld(), target) || getIslands().inTeam(getWorld(), target.getUniqueId())) { // Success - user.sendMessage(SUCCESS, TextVariables.NAME, target.getName()); + user.sendMessage(SUCCESS, TextVariables.NAME, target.getName(), TextVariables.DISPLAY_NAME, target.getDisplayName()); // Teleport home getIslands().homeTeleportAsync(getWorld(), target.getPlayer()); return true; } else if (getIslands().getSpawn(getWorld()).isPresent()){ // Success - user.sendMessage(SUCCESS, TextVariables.NAME, target.getName()); + user.sendMessage(SUCCESS, TextVariables.NAME, target.getName(), TextVariables.DISPLAY_NAME, target.getDisplayName()); getIslands().spawnTeleport(getWorld(), target.getPlayer()); return true; } else if (getIWM().getAddon(getWorld()) @@ -136,7 +136,7 @@ public class IslandExpelCommand extends CompositeCommand { .orElse(false) && target.performCommand(this.getTopLabel() + " create")) { getAddon().logWarning("Expel: " + target.getName() + " had no island, so one was created"); - user.sendMessage(SUCCESS, TextVariables.NAME, target.getName()); + user.sendMessage(SUCCESS, TextVariables.NAME, target.getName(), TextVariables.DISPLAY_NAME, target.getDisplayName()); return true; } diff --git a/src/main/java/world/bentobox/bentobox/api/commands/island/IslandUnbanCommand.java b/src/main/java/world/bentobox/bentobox/api/commands/island/IslandUnbanCommand.java index 9f4f25a93..041636e0f 100644 --- a/src/main/java/world/bentobox/bentobox/api/commands/island/IslandUnbanCommand.java +++ b/src/main/java/world/bentobox/bentobox/api/commands/island/IslandUnbanCommand.java @@ -94,8 +94,8 @@ public class IslandUnbanCommand extends CompositeCommand { } // Event is not cancelled if (island.unban(user.getUniqueId(), target.getUniqueId())) { - user.sendMessage("commands.island.unban.player-unbanned", TextVariables.NAME, target.getName()); - target.sendMessage("commands.island.unban.you-are-unbanned", TextVariables.NAME, user.getName()); + user.sendMessage("commands.island.unban.player-unbanned", TextVariables.NAME, target.getName(), TextVariables.DISPLAY_NAME, target.getDisplayName()); + target.sendMessage("commands.island.unban.you-are-unbanned", TextVariables.NAME, user.getName(), TextVariables.DISPLAY_NAME, user.getDisplayName()); // Set cooldown if (getSettings().getBanCooldown() > 0 && getParent() != null) { getParent().getSubCommand("ban").ifPresent(subCommand -> diff --git a/src/main/java/world/bentobox/bentobox/api/commands/island/team/IslandTeamCoopCommand.java b/src/main/java/world/bentobox/bentobox/api/commands/island/team/IslandTeamCoopCommand.java index 50c1d12de..5da40ae6d 100644 --- a/src/main/java/world/bentobox/bentobox/api/commands/island/team/IslandTeamCoopCommand.java +++ b/src/main/java/world/bentobox/bentobox/api/commands/island/team/IslandTeamCoopCommand.java @@ -105,8 +105,8 @@ public class IslandTeamCoopCommand extends CompositeCommand { } island.setRank(target, RanksManager.COOP_RANK); - user.sendMessage("commands.island.team.coop.success", TextVariables.NAME, target.getName()); - target.sendMessage("commands.island.team.coop.you-are-a-coop-member", TextVariables.NAME, user.getName()); + user.sendMessage("commands.island.team.coop.success", TextVariables.NAME, target.getName(), TextVariables.DISPLAY_NAME, target.getDisplayName()); + target.sendMessage("commands.island.team.coop.you-are-a-coop-member", TextVariables.NAME, user.getName(), TextVariables.DISPLAY_NAME, user.getDisplayName()); } return true; } else { diff --git a/src/main/java/world/bentobox/bentobox/api/commands/island/team/IslandTeamInviteAcceptCommand.java b/src/main/java/world/bentobox/bentobox/api/commands/island/team/IslandTeamInviteAcceptCommand.java index 5f17a3ab2..89bd8ab64 100644 --- a/src/main/java/world/bentobox/bentobox/api/commands/island/team/IslandTeamInviteAcceptCommand.java +++ b/src/main/java/world/bentobox/bentobox/api/commands/island/team/IslandTeamInviteAcceptCommand.java @@ -111,10 +111,10 @@ public class IslandTeamInviteAcceptCommand extends ConfirmableCommand { .rankChange(island.getRank(user), RanksManager.TRUSTED_RANK) .build(); if (inviter.isOnline()) { - inviter.sendMessage("commands.island.team.trust.success", TextVariables.NAME, user.getName()); + inviter.sendMessage("commands.island.team.trust.success", TextVariables.NAME, user.getName(), TextVariables.DISPLAY_NAME, user.getDisplayName()); } if (inviter.isPlayer()) { - user.sendMessage("commands.island.team.trust.you-are-trusted", TextVariables.NAME, inviter.getName()); + user.sendMessage("commands.island.team.trust.you-are-trusted", TextVariables.NAME, inviter.getName(), TextVariables.DISPLAY_NAME, inviter.getDisplayName()); } } } @@ -138,10 +138,10 @@ public class IslandTeamInviteAcceptCommand extends ConfirmableCommand { .rankChange(island.getRank(user), RanksManager.COOP_RANK) .build(); if (inviter.isOnline()) { - inviter.sendMessage("commands.island.team.coop.success", TextVariables.NAME, user.getName()); + inviter.sendMessage("commands.island.team.coop.success", TextVariables.NAME, user.getName(), TextVariables.DISPLAY_NAME, user.getDisplayName()); } if (inviter.isPlayer()) { - user.sendMessage("commands.island.team.coop.you-are-a-coop-member", TextVariables.NAME, inviter.getName()); + user.sendMessage("commands.island.team.coop.you-are-a-coop-member", TextVariables.NAME, inviter.getName(), TextVariables.DISPLAY_NAME, inviter.getDisplayName()); } } } @@ -188,7 +188,7 @@ public class IslandTeamInviteAcceptCommand extends ConfirmableCommand { user.sendMessage("commands.island.team.invite.accept.you-joined-island", TextVariables.LABEL, getTopLabel()); User inviter = User.getInstance(invite.getInviter()); if (inviter.isOnline()) { - inviter.sendMessage("commands.island.team.invite.accept.name-joined-your-island", TextVariables.NAME, user.getName()); + inviter.sendMessage("commands.island.team.invite.accept.name-joined-your-island", TextVariables.NAME, user.getName(), TextVariables.DISPLAY_NAME, user.getDisplayName()); } getIslands().save(teamIsland); // Fire event diff --git a/src/main/java/world/bentobox/bentobox/api/commands/island/team/IslandTeamInviteCommand.java b/src/main/java/world/bentobox/bentobox/api/commands/island/team/IslandTeamInviteCommand.java index a36584f14..5eb674a4c 100644 --- a/src/main/java/world/bentobox/bentobox/api/commands/island/team/IslandTeamInviteCommand.java +++ b/src/main/java/world/bentobox/bentobox/api/commands/island/team/IslandTeamInviteCommand.java @@ -129,9 +129,9 @@ public class IslandTeamInviteCommand extends CompositeCommand { // Put the invited player (key) onto the list with inviter (value) // If someone else has invited a player, then this invite will overwrite the previous invite! itc.addInvite(Invite.Type.TEAM, user.getUniqueId(), invitedPlayer.getUniqueId()); - user.sendMessage("commands.island.team.invite.invitation-sent", TextVariables.NAME, invitedPlayer.getName()); + user.sendMessage("commands.island.team.invite.invitation-sent", TextVariables.NAME, invitedPlayer.getName(), TextVariables.DISPLAY_NAME, invitedPlayer.getDisplayName()); // Send message to online player - invitedPlayer.sendMessage("commands.island.team.invite.name-has-invited-you", TextVariables.NAME, user.getName()); + invitedPlayer.sendMessage("commands.island.team.invite.name-has-invited-you", TextVariables.NAME, user.getName(), TextVariables.DISPLAY_NAME, user.getDisplayName()); invitedPlayer.sendMessage("commands.island.team.invite.to-accept-or-reject", TextVariables.LABEL, getTopLabel()); if (getIslands().hasIsland(getWorld(), invitedPlayer.getUniqueId())) { invitedPlayer.sendMessage("commands.island.team.invite.you-will-lose-your-island"); diff --git a/src/main/java/world/bentobox/bentobox/api/commands/island/team/IslandTeamInviteRejectCommand.java b/src/main/java/world/bentobox/bentobox/api/commands/island/team/IslandTeamInviteRejectCommand.java index b09644b77..12dff7c0e 100644 --- a/src/main/java/world/bentobox/bentobox/api/commands/island/team/IslandTeamInviteRejectCommand.java +++ b/src/main/java/world/bentobox/bentobox/api/commands/island/team/IslandTeamInviteRejectCommand.java @@ -42,9 +42,9 @@ public class IslandTeamInviteRejectCommand extends CompositeCommand { } Optional.ofNullable(itc.getInviter(playerUUID)) - .map(User::getInstance) - .ifPresent(inviter -> - inviter.sendMessage("commands.island.team.invite.reject.name-rejected-your-invite", TextVariables.NAME, user.getName()) + .map(User::getInstance) + .ifPresent(inviter -> + inviter.sendMessage("commands.island.team.invite.reject.name-rejected-your-invite", TextVariables.NAME, user.getName(), TextVariables.DISPLAY_NAME, user.getDisplayName()) ); // Remove this player from the global invite list diff --git a/src/main/java/world/bentobox/bentobox/api/commands/island/team/IslandTeamKickCommand.java b/src/main/java/world/bentobox/bentobox/api/commands/island/team/IslandTeamKickCommand.java index 8722dfa1f..061e82259 100644 --- a/src/main/java/world/bentobox/bentobox/api/commands/island/team/IslandTeamKickCommand.java +++ b/src/main/java/world/bentobox/bentobox/api/commands/island/team/IslandTeamKickCommand.java @@ -70,11 +70,11 @@ public class IslandTeamKickCommand extends ConfirmableCommand { int targetRank = Objects.requireNonNull(island).getRank(targetUUID); if (rank <= targetRank) { - user.sendMessage("commands.island.team.kick.cannot-kick-rank", - TextVariables.NAME, getPlayers().getName(targetUUID)); + user.sendMessage("commands.island.team.kick.cannot-kick-rank", + TextVariables.NAME, getPlayers().getName(targetUUID)); return false; } - + if (!getSettings().isKickConfirmation()) { kick(user, targetUUID); return true; @@ -96,15 +96,15 @@ public class IslandTeamKickCommand extends ConfirmableCommand { if (event.isCancelled()) { return; } - target.sendMessage("commands.island.team.kick.player-kicked", - TextVariables.GAMEMODE, getAddon().getDescription().getName(), - TextVariables.NAME, user.getName()); + target.sendMessage("commands.island.team.kick.player-kicked", + TextVariables.GAMEMODE, getAddon().getDescription().getName(), + TextVariables.NAME, user.getName(), TextVariables.DISPLAY_NAME, user.getDisplayName()); getIslands().removePlayer(getWorld(), targetUUID); // Clean the target player getPlayers().cleanLeavingPlayer(getWorld(), target, true, oldIsland); - user.sendMessage("commands.island.team.kick.success", TextVariables.NAME, target.getName()); + user.sendMessage("commands.island.team.kick.success", TextVariables.NAME, target.getName(), TextVariables.DISPLAY_NAME, target.getDisplayName()); IslandEvent.builder() .island(oldIsland) .involvedPlayer(user.getUniqueId()) diff --git a/src/main/java/world/bentobox/bentobox/api/commands/island/team/IslandTeamLeaveCommand.java b/src/main/java/world/bentobox/bentobox/api/commands/island/team/IslandTeamLeaveCommand.java index db1a37379..01d455fa8 100644 --- a/src/main/java/world/bentobox/bentobox/api/commands/island/team/IslandTeamLeaveCommand.java +++ b/src/main/java/world/bentobox/bentobox/api/commands/island/team/IslandTeamLeaveCommand.java @@ -78,7 +78,7 @@ public class IslandTeamLeaveCommand extends ConfirmableCommand { } UUID ownerUUID = getIslands().getOwner(getWorld(), user.getUniqueId()); if (ownerUUID != null) { - User.getInstance(ownerUUID).sendMessage("commands.island.team.leave.left-your-island", TextVariables.NAME, user.getName()); + User.getInstance(ownerUUID).sendMessage("commands.island.team.leave.left-your-island", TextVariables.NAME, user.getName(), TextVariables.DISPLAY_NAME, user.getDisplayName()); } getIslands().setLeaveTeam(getWorld(), user.getUniqueId()); // Clean the player diff --git a/src/main/java/world/bentobox/bentobox/api/commands/island/team/IslandTeamPromoteCommand.java b/src/main/java/world/bentobox/bentobox/api/commands/island/team/IslandTeamPromoteCommand.java index 7c8722a79..d4a32daeb 100644 --- a/src/main/java/world/bentobox/bentobox/api/commands/island/team/IslandTeamPromoteCommand.java +++ b/src/main/java/world/bentobox/bentobox/api/commands/island/team/IslandTeamPromoteCommand.java @@ -82,7 +82,7 @@ public class IslandTeamPromoteCommand extends CompositeCommand { if (nextRank != RanksManager.OWNER_RANK && nextRank > currentRank) { getIslands().getIsland(getWorld(), user.getUniqueId()).setRank(target, nextRank); String rankName = user.getTranslation(getPlugin().getRanksManager().getRank(nextRank)); - user.sendMessage("commands.island.team.promote.success", TextVariables.NAME, target.getName(), TextVariables.RANK, rankName); + user.sendMessage("commands.island.team.promote.success", TextVariables.NAME, target.getName(), TextVariables.RANK, rankName, TextVariables.DISPLAY_NAME, target.getDisplayName()); IslandEvent.builder() .island(island) .involvedPlayer(user.getUniqueId()) @@ -102,7 +102,7 @@ public class IslandTeamPromoteCommand extends CompositeCommand { if (prevRank >= RanksManager.MEMBER_RANK && prevRank < currentRank) { getIslands().getIsland(getWorld(), user.getUniqueId()).setRank(target, prevRank); String rankName = user.getTranslation(getPlugin().getRanksManager().getRank(prevRank)); - user.sendMessage("commands.island.team.demote.success", TextVariables.NAME, target.getName(), TextVariables.RANK, rankName); + user.sendMessage("commands.island.team.demote.success", TextVariables.NAME, target.getName(), TextVariables.RANK, rankName, TextVariables.DISPLAY_NAME, target.getDisplayName()); IslandEvent.builder() .island(island) .involvedPlayer(user.getUniqueId()) diff --git a/src/main/java/world/bentobox/bentobox/api/commands/island/team/IslandTeamTrustCommand.java b/src/main/java/world/bentobox/bentobox/api/commands/island/team/IslandTeamTrustCommand.java index a8db0863d..22ea20482 100644 --- a/src/main/java/world/bentobox/bentobox/api/commands/island/team/IslandTeamTrustCommand.java +++ b/src/main/java/world/bentobox/bentobox/api/commands/island/team/IslandTeamTrustCommand.java @@ -96,9 +96,9 @@ public class IslandTeamTrustCommand extends CompositeCommand { // Put the invited player (key) onto the list with inviter (value) // If someone else has invited a player, then this invite will overwrite the previous invite! itc.addInvite(Type.TRUST, user.getUniqueId(), target.getUniqueId()); - user.sendMessage("commands.island.team.invite.invitation-sent", TextVariables.NAME, target.getName()); + user.sendMessage("commands.island.team.invite.invitation-sent", TextVariables.NAME, target.getName(), TextVariables.DISPLAY_NAME, target.getDisplayName()); // Send message to online player - target.sendMessage("commands.island.team.trust.name-has-invited-you", TextVariables.NAME, user.getName()); + target.sendMessage("commands.island.team.trust.name-has-invited-you", TextVariables.NAME, user.getName(), TextVariables.DISPLAY_NAME, user.getDisplayName()); target.sendMessage("commands.island.team.invite.to-accept-or-reject", TextVariables.LABEL, getTopLabel()); } else { if (island.getMemberSet(RanksManager.TRUSTED_RANK, false).size() >= getIslands().getMaxMembers(island, RanksManager.TRUSTED_RANK)) { @@ -107,8 +107,8 @@ public class IslandTeamTrustCommand extends CompositeCommand { } island.setRank(target, RanksManager.TRUSTED_RANK); - user.sendMessage("commands.island.team.trust.success", TextVariables.NAME, target.getName()); - target.sendMessage("commands.island.team.trust.you-are-trusted", TextVariables.NAME, user.getName()); + user.sendMessage("commands.island.team.trust.success", TextVariables.NAME, target.getName(), TextVariables.DISPLAY_NAME, target.getDisplayName()); + target.sendMessage("commands.island.team.trust.you-are-trusted", TextVariables.NAME, user.getName(), TextVariables.DISPLAY_NAME, user.getDisplayName()); } return true; } else { diff --git a/src/main/java/world/bentobox/bentobox/api/commands/island/team/IslandTeamUncoopCommand.java b/src/main/java/world/bentobox/bentobox/api/commands/island/team/IslandTeamUncoopCommand.java index e219d3043..5df6a1133 100644 --- a/src/main/java/world/bentobox/bentobox/api/commands/island/team/IslandTeamUncoopCommand.java +++ b/src/main/java/world/bentobox/bentobox/api/commands/island/team/IslandTeamUncoopCommand.java @@ -84,8 +84,8 @@ public class IslandTeamUncoopCommand extends CompositeCommand { Island island = getIslands().getIsland(getWorld(), user.getUniqueId()); if (island != null) { island.removeMember(targetUUID); - user.sendMessage("commands.island.team.uncoop.success", TextVariables.NAME, target.getName()); - target.sendMessage("commands.island.team.uncoop.you-are-no-longer-a-coop-member", TextVariables.NAME, user.getName()); + user.sendMessage("commands.island.team.uncoop.success", TextVariables.NAME, target.getName(), TextVariables.DISPLAY_NAME, target.getDisplayName()); + target.sendMessage("commands.island.team.uncoop.you-are-no-longer-a-coop-member", TextVariables.NAME, user.getName(), TextVariables.DISPLAY_NAME, user.getDisplayName()); // Set cooldown if (getSettings().getCoopCooldown() > 0 && getParent() != null) { getParent().getSubCommand("coop").ifPresent(subCommand -> diff --git a/src/main/java/world/bentobox/bentobox/api/commands/island/team/IslandTeamUntrustCommand.java b/src/main/java/world/bentobox/bentobox/api/commands/island/team/IslandTeamUntrustCommand.java index 74b3de095..57034bf66 100644 --- a/src/main/java/world/bentobox/bentobox/api/commands/island/team/IslandTeamUntrustCommand.java +++ b/src/main/java/world/bentobox/bentobox/api/commands/island/team/IslandTeamUntrustCommand.java @@ -84,8 +84,8 @@ public class IslandTeamUntrustCommand extends CompositeCommand { Island island = getIslands().getIsland(getWorld(), user.getUniqueId()); if (island != null) { island.removeMember(targetUUID); - user.sendMessage("commands.island.team.untrust.success", TextVariables.NAME, target.getName()); - target.sendMessage("commands.island.team.untrust.you-are-no-longer-trusted", TextVariables.NAME, user.getName()); + user.sendMessage("commands.island.team.untrust.success", TextVariables.NAME, target.getName(), TextVariables.DISPLAY_NAME, target.getDisplayName()); + target.sendMessage("commands.island.team.untrust.you-are-no-longer-trusted", TextVariables.NAME, user.getName(), TextVariables.DISPLAY_NAME, user.getDisplayName()); // Set cooldown if (getSettings().getTrustCooldown() > 0 && getParent() != null) { getParent().getSubCommand("trust").ifPresent(subCommand -> diff --git a/src/main/java/world/bentobox/bentobox/api/events/IslandBaseEvent.java b/src/main/java/world/bentobox/bentobox/api/events/IslandBaseEvent.java index d09a7c12b..1c31b3346 100644 --- a/src/main/java/world/bentobox/bentobox/api/events/IslandBaseEvent.java +++ b/src/main/java/world/bentobox/bentobox/api/events/IslandBaseEvent.java @@ -23,7 +23,7 @@ public abstract class IslandBaseEvent extends BentoBoxEvent implements Cancellab protected final Event rawEvent; protected IslandBaseEvent newEvent; - protected IslandBaseEvent(Island island) { + public IslandBaseEvent(Island island) { super(); this.island = island; playerUUID = island == null ? null : island.getOwner(); @@ -38,7 +38,7 @@ public abstract class IslandBaseEvent extends BentoBoxEvent implements Cancellab * @param admin - true if ths is due to an admin event * @param location - the location */ - protected IslandBaseEvent(Island island, UUID playerUUID, boolean admin, Location location) { + public IslandBaseEvent(Island island, UUID playerUUID, boolean admin, Location location) { super(); this.island = island; this.playerUUID = playerUUID; @@ -54,7 +54,7 @@ public abstract class IslandBaseEvent extends BentoBoxEvent implements Cancellab * @param location - the location * @param rawEvent - the raw event */ - protected IslandBaseEvent(Island island, UUID playerUUID, boolean admin, Location location, Event rawEvent) { + public IslandBaseEvent(Island island, UUID playerUUID, boolean admin, Location location, Event rawEvent) { super(); this.island = island; this.playerUUID = playerUUID; 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 c1e5b3a4f..4d4bc14f8 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 @@ -28,7 +28,7 @@ public class IslandBanEvent extends IslandBaseEvent { return handlers; } - IslandBanEvent(Island island, UUID player, boolean admin, Location location) { + public IslandBanEvent(Island island, UUID player, boolean admin, Location location) { // Final variables have to be declared in the constructor super(island, player, admin, location); } 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 75d56792f..099551095 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 @@ -28,7 +28,7 @@ public class IslandCreateEvent extends IslandBaseEvent { return handlers; } - IslandCreateEvent(Island island, UUID player, boolean admin, Location location, @NonNull BlueprintBundle blueprintBundle) { + public IslandCreateEvent(Island island, UUID player, boolean admin, Location location, @NonNull BlueprintBundle blueprintBundle) { // Final variables have to be declared in the constructor super(island, player, admin, location); this.blueprintBundle = blueprintBundle; 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 303a7ab03..d9c43b94d 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 @@ -25,7 +25,7 @@ public class IslandCreatedEvent extends IslandBaseEvent { return handlers; } - IslandCreatedEvent(Island island, UUID player, boolean admin, Location location) { + public IslandCreatedEvent(Island island, UUID player, boolean admin, Location location) { // Final variables have to be declared in the constructor super(island, player, admin, location); } 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 f05ebabdf..ac3c4334b 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 @@ -28,7 +28,7 @@ public class IslandDeleteChunksEvent extends IslandBaseEvent { return handlers; } - IslandDeleteChunksEvent(Island island, UUID player, boolean admin, Location location, IslandDeletion deletedIsland) { + public IslandDeleteChunksEvent(Island island, UUID player, boolean admin, Location location, IslandDeletion deletedIsland) { // Final variables have to be declared in the constructor super(island, player, admin, location); this.deletedIslandInfo = deletedIsland; 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 dec404e22..5a36fbf3d 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 @@ -26,7 +26,7 @@ public class IslandDeleteEvent extends IslandBaseEvent { return handlers; } - IslandDeleteEvent(Island island, UUID player, boolean admin, Location location) { + public IslandDeleteEvent(Island island, UUID player, boolean admin, Location location) { // Final variables have to be declared in the constructor super(island, player, admin, location); } 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 f3d31de98..3d9f62aa1 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 @@ -30,7 +30,7 @@ public class IslandDeletedEvent extends IslandBaseEvent { return handlers; } - IslandDeletedEvent(Island island, UUID player, boolean admin, Location location, IslandDeletion deletedIsland) { + public IslandDeletedEvent(Island island, UUID player, boolean admin, Location location, IslandDeletion deletedIsland) { // Final variables have to be declared in the constructor super(island, player, admin, location); this.deletedIslandInfo = deletedIsland; 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 eaf732e4b..98bc01a3a 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 @@ -29,7 +29,7 @@ public class IslandEnterEvent extends IslandBaseEvent { return handlers; } - IslandEnterEvent(Island island, UUID player, boolean admin, Location location, @Nullable Island fromIsland, Event rawEvent) { + public 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/IslandExitEvent.java b/src/main/java/world/bentobox/bentobox/api/events/island/IslandExitEvent.java index c378a473f..667f7c3d2 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 @@ -29,7 +29,7 @@ public class IslandExitEvent extends IslandBaseEvent { return handlers; } - IslandExitEvent(Island island, UUID player, boolean admin, Location location, @Nullable Island toIsland, Event rawEvent) { + public 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 f412810fd..8a8892065 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 @@ -29,7 +29,7 @@ public class IslandExpelEvent extends IslandBaseEvent { return handlers; } - IslandExpelEvent(Island island, UUID player, boolean admin, Location location) { + public IslandExpelEvent(Island island, UUID player, boolean admin, Location location) { // Final variables have to be declared in the constructor super(island, player, admin, location); } 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 597f9caf8..2c102315c 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 @@ -26,7 +26,7 @@ public class IslandGeneralEvent extends IslandBaseEvent { return handlers; } - IslandGeneralEvent(Island island, UUID player, boolean admin, Location location) { + public IslandGeneralEvent(Island island, UUID player, boolean admin, Location location) { // Final variables have to be declared in the constructor super(island, player, admin, location); } 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 39322bd13..6d2bd4115 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 @@ -26,7 +26,7 @@ public class IslandLockEvent extends IslandBaseEvent { return handlers; } - IslandLockEvent(Island island, UUID player, boolean admin, Location location) { + public IslandLockEvent(Island island, UUID player, boolean admin, Location location) { // Final variables have to be declared in the constructor super(island, player, admin, location); } 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 babdb66be..5810f6146 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 @@ -26,7 +26,7 @@ public class IslandNewIslandEvent extends IslandBaseEvent { return handlers; } - IslandNewIslandEvent(Island island, UUID player, boolean admin, Location location) { + public IslandNewIslandEvent(Island island, UUID player, boolean admin, Location location) { // Final variables have to be declared in the constructor super(island, player, admin, location); } 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 698ab59c1..fd7166caa 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 @@ -25,7 +25,7 @@ public class IslandPreCreateEvent extends IslandBaseEvent { return handlers; } - IslandPreCreateEvent(UUID player) { + public IslandPreCreateEvent(UUID player) { // Final variables have to be declared in the constructor super(null, player, false, null); } 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 5b9d54381..78d650ee1 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 @@ -27,7 +27,7 @@ public class IslandPreclearEvent extends IslandBaseEvent { return handlers; } - IslandPreclearEvent(Island island, UUID player, boolean admin, Location location, @NonNull Island oldIsland) { + public IslandPreclearEvent(Island island, UUID player, boolean admin, Location location, @NonNull Island oldIsland) { // Final variables have to be declared in the constructor super(island, player, admin, location); // Create a copy of the old island 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 d38d21a3b..7cfc4aaea 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 @@ -46,7 +46,7 @@ public class IslandProtectionRangeChangeEvent extends IslandBaseEvent { * @param newRange of type int * @param oldRange of type int */ - IslandProtectionRangeChangeEvent(Island island, UUID player, boolean admin, Location location, int newRange, int oldRange) { + public IslandProtectionRangeChangeEvent(Island island, UUID player, boolean admin, Location location, int newRange, int oldRange) { super(island, player, admin, location); this.newRange = newRange; this.oldRange = oldRange; 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 c3189fed2..1ab0a1539 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 @@ -26,7 +26,7 @@ public class IslandRegisteredEvent extends IslandBaseEvent { return handlers; } - IslandRegisteredEvent(Island island, UUID player, boolean admin, Location location) { + public IslandRegisteredEvent(Island island, UUID player, boolean admin, Location location) { super(island, player, admin, location); } } \ No newline at end of file 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 3a8fb474c..b6db1092b 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 @@ -26,7 +26,7 @@ public class IslandReservedEvent extends IslandBaseEvent { return handlers; } - IslandReservedEvent(Island island, UUID player, boolean admin, Location location) { + public IslandReservedEvent(Island island, UUID player, boolean admin, Location location) { super(island, player, admin, location); } } \ No newline at end of file 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 1b7a4043c..f1eb3456c 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 @@ -29,7 +29,7 @@ public class IslandResetEvent extends IslandBaseEvent { return handlers; } - IslandResetEvent(Island island, UUID player, boolean admin, Location location, @NonNull BlueprintBundle blueprintBundle, @NonNull Island oldIsland) { + public IslandResetEvent(Island island, UUID player, boolean admin, Location location, @NonNull BlueprintBundle blueprintBundle, @NonNull Island oldIsland) { // Final variables have to be declared in the constructor super(island, player, admin, location); this.blueprintBundle = blueprintBundle; 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 5b8200a7c..c326c3acf 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 @@ -27,7 +27,7 @@ public class IslandResettedEvent extends IslandBaseEvent { return handlers; } - IslandResettedEvent(Island island, UUID player, boolean admin, Location location, Island oldIsland) { + public IslandResettedEvent(Island island, UUID player, boolean admin, Location location, Island oldIsland) { // Final variables have to be declared in the constructor super(island, player, admin, location); // Create a copy of the old island 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 95726975e..868d62407 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 @@ -26,7 +26,7 @@ public class IslandUnlockEvent extends IslandBaseEvent { return handlers; } - IslandUnlockEvent(Island island, UUID player, boolean admin, Location location) { + public IslandUnlockEvent(Island island, UUID player, boolean admin, Location location) { // Final variables have to be declared in the constructor super(island, player, admin, location); } 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 d11d9c1fc..b76204b11 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 @@ -26,7 +26,7 @@ public class IslandUnregisteredEvent extends IslandBaseEvent { return handlers; } - IslandUnregisteredEvent(Island island, UUID player, boolean admin, Location location) { + public IslandUnregisteredEvent(Island island, UUID player, boolean admin, Location location) { super(island, player, admin, location); } } \ No newline at end of file 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 0317b7c7a..1f7f1a37a 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 @@ -22,7 +22,7 @@ public class TeamDeleteEvent extends IslandBaseEvent { return handlers; } - TeamDeleteEvent(Island island, UUID player, boolean admin, Location location) { + public TeamDeleteEvent(Island island, UUID player, boolean admin, Location location) { // Final variables have to be declared in the constructor super(island, player, admin, location); } 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 1a3a862bf..d18e0f37c 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 @@ -22,7 +22,7 @@ public class TeamGeneralEvent extends IslandBaseEvent { return handlers; } - TeamGeneralEvent(Island island, UUID player, boolean admin, Location location) { + public TeamGeneralEvent(Island island, UUID player, boolean admin, Location location) { // Final variables have to be declared in the constructor super(island, player, admin, location); } 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 0cf632e8b..2fa9747ff 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 @@ -22,7 +22,7 @@ public class TeamInfoEvent extends IslandBaseEvent { return handlers; } - TeamInfoEvent(Island island, UUID player, boolean admin, Location location) { + public TeamInfoEvent(Island island, UUID player, boolean admin, Location location) { // Final variables have to be declared in the constructor super(island, player, admin, location); } 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 6bd40dcbe..b0b1da4dc 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 @@ -22,7 +22,7 @@ public class TeamInviteEvent extends IslandBaseEvent { return handlers; } - TeamInviteEvent(Island island, UUID player, boolean admin, Location location) { + public TeamInviteEvent(Island island, UUID player, boolean admin, Location location) { // Final variables have to be declared in the constructor super(island, player, admin, location); } 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 6523a113e..8590b85f7 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 @@ -22,7 +22,7 @@ public class TeamJoinEvent extends IslandBaseEvent { return handlers; } - TeamJoinEvent(Island island, UUID player, boolean admin, Location location) { + public TeamJoinEvent(Island island, UUID player, boolean admin, Location location) { // Final variables have to be declared in the constructor super(island, player, admin, location); } 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 7164d3c59..74222257b 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 @@ -34,7 +34,7 @@ public class TeamJoinedEvent extends IslandBaseEvent { * @param location - location * @since 1.3.0 */ - TeamJoinedEvent(Island island, UUID player, boolean admin, Location location) { + public TeamJoinedEvent(Island island, UUID player, boolean admin, Location location) { // Final variables have to be declared in the constructor super(island, player, admin, location); } 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 f3bd18b14..61f846491 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 @@ -22,7 +22,7 @@ public class TeamKickEvent extends IslandBaseEvent { return handlers; } - TeamKickEvent(Island island, UUID player, boolean admin, Location location) { + public TeamKickEvent(Island island, UUID player, boolean admin, Location location) { // Final variables have to be declared in the constructor super(island, player, admin, location); } 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 d4c16a7af..345b5a12e 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 @@ -27,7 +27,7 @@ public class TeamLeaveEvent extends IslandBaseEvent { return handlers; } - TeamLeaveEvent(Island island, UUID player, boolean admin, Location location) { + public TeamLeaveEvent(Island island, UUID player, boolean admin, Location location) { // Final variables have to be declared in the constructor super(island, player, admin, location); } 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 218b88746..be3afa475 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 @@ -22,7 +22,7 @@ public class TeamRejectEvent extends IslandBaseEvent { return handlers; } - TeamRejectEvent(Island island, UUID player, boolean admin, Location location) { + public TeamRejectEvent(Island island, UUID player, boolean admin, Location location) { // Final variables have to be declared in the constructor super(island, player, admin, location); } 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 e907cf91a..40e07bb95 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 @@ -28,7 +28,7 @@ public class TeamSetownerEvent extends IslandBaseEvent { return handlers; } - TeamSetownerEvent(Island island, UUID player, boolean admin, Location location) { + public TeamSetownerEvent(Island island, UUID player, boolean admin, Location location) { // Final variables have to be declared in the constructor super(island, player, admin, location); } 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 2a07712bb..9ae934526 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 @@ -22,7 +22,7 @@ public class TeamUninviteEvent extends IslandBaseEvent { return handlers; } - TeamUninviteEvent(Island island, UUID player, boolean admin, Location location) { + public TeamUninviteEvent(Island island, UUID player, boolean admin, Location location) { // Final variables have to be declared in the constructor super(island, player, admin, location); } diff --git a/src/main/java/world/bentobox/bentobox/api/flags/Flag.java b/src/main/java/world/bentobox/bentobox/api/flags/Flag.java index e860b44e1..409296228 100644 --- a/src/main/java/world/bentobox/bentobox/api/flags/Flag.java +++ b/src/main/java/world/bentobox/bentobox/api/flags/Flag.java @@ -2,6 +2,7 @@ package world.bentobox.bentobox.api.flags; import java.util.Arrays; import java.util.HashSet; +import java.util.Locale; import java.util.Optional; import java.util.Set; @@ -466,6 +467,33 @@ public class Flag implements Comparable
* Blueprints are BentoBox's version of schematics, but contain
* additional useful info.
*
diff --git a/src/main/java/world/bentobox/bentobox/database/Database.java b/src/main/java/world/bentobox/bentobox/database/Database.java
index 0eae05e35..0f5679c63 100644
--- a/src/main/java/world/bentobox/bentobox/database/Database.java
+++ b/src/main/java/world/bentobox/bentobox/database/Database.java
@@ -85,7 +85,7 @@ public class Database
* If the item contains a custom name, return its custom name.
* If the item itself does not have a custom name, the material
* name will be translated and returned.
@@ -515,29 +515,74 @@ public class LangUtilsHook extends Hook {
int variant = (pcol & 255) << 24 | (bcol & 255) << 16 | (patt & 255) << 8 | type;
switch (variant) {
- case 117506305: return "Anemone";
- case 117899265: return "Black Tang";
- case 185008129: return "Blue Tang";
- case 117441793: return "Butterflyfish";
- case 118161664: return "Cichlid";
- case 65536 : return "Clownfish";
- case 50726144 : return "Cotton Candy Betta";
- case 67764993 : return "Dottyback";
- case 234882305: return "Emperor Red Snapper";
- case 67110144 : return "Goatfish";
- case 117441025: return "Moorish Idol";
- case 16778497 : return "Ornate Butterflyfish";
- case 101253888: return "Parrotfish";
- case 50660352 : return "Queen Angelfish";
- case 918529 : return "Red Cichlid";
- case 235340288: return "Red Lipped Blenny";
- case 918273 : return "Red Snapper";
- case 67108865 : return "Threadfin";
- case 917504 : return "Tomato Clownfish";
- case 459008 : return "Triggerfish";
- case 67699456 : return "Yellowtail Parrotfish";
- case 67371009 : return "Yellow Tang";
- default : break;
+ case 117506305 -> {
+ return "Anemone";
+ }
+ case 117899265 -> {
+ return "Black Tang";
+ }
+ case 185008129 -> {
+ return "Blue Tang";
+ }
+ case 117441793 -> {
+ return "Butterflyfish";
+ }
+ case 118161664 -> {
+ return "Cichlid";
+ }
+ case 65536 -> {
+ return "Clownfish";
+ }
+ case 50726144 -> {
+ return "Cotton Candy Betta";
+ }
+ case 67764993 -> {
+ return "Dottyback";
+ }
+ case 234882305 -> {
+ return "Emperor Red Snapper";
+ }
+ case 67110144 -> {
+ return "Goatfish";
+ }
+ case 117441025 -> {
+ return "Moorish Idol";
+ }
+ case 16778497 -> {
+ return "Ornate Butterflyfish";
+ }
+ case 101253888 -> {
+ return "Parrotfish";
+ }
+ case 50660352 -> {
+ return "Queen Angelfish";
+ }
+ case 918529 -> {
+ return "Red Cichlid";
+ }
+ case 235340288 -> {
+ return "Red Lipped Blenny";
+ }
+ case 918273 -> {
+ return "Red Snapper";
+ }
+ case 67108865 -> {
+ return "Threadfin";
+ }
+ case 917504 -> {
+ return "Tomato Clownfish";
+ }
+ case 459008 -> {
+ return "Triggerfish";
+ }
+ case 67699456 -> {
+ return "Yellowtail Parrotfish";
+ }
+ case 67371009 -> {
+ return "Yellow Tang";
+ }
+ default -> {
+ }
}
}
return null;
diff --git a/src/main/java/world/bentobox/bentobox/listeners/BannedCommands.java b/src/main/java/world/bentobox/bentobox/listeners/BannedCommands.java
index c9dc27be1..c644eb1a5 100644
--- a/src/main/java/world/bentobox/bentobox/listeners/BannedCommands.java
+++ b/src/main/java/world/bentobox/bentobox/listeners/BannedCommands.java
@@ -36,19 +36,43 @@ public class BannedCommands implements Listener {
public void onVisitorCommand(PlayerCommandPreprocessEvent e) {
if (!plugin.getIWM().inWorld(e.getPlayer().getLocation()) || e.getPlayer().isOp()
|| e.getPlayer().hasPermission(plugin.getIWM().getPermissionPrefix(e.getPlayer().getWorld()) + "mod.bypassprotect")
- || plugin.getIslands().locationIsOnIsland(e.getPlayer(), e.getPlayer().getLocation())) {
+ || plugin.getIslands().locationIsOnIsland(e.getPlayer(), e.getPlayer().getLocation())
+ || e.getMessage().isEmpty()
+ ) {
return;
}
World w = e.getPlayer().getWorld();
// Check banned commands
+ // Split up the entry
String[] args = e.getMessage().substring(1).toLowerCase(java.util.Locale.ENGLISH).split(" ");
- if (plugin.getIWM().getVisitorBannedCommands(w).contains(args[0])) {
- User user = User.getInstance(e.getPlayer());
- user.notify("protection.protected", TextVariables.DESCRIPTION, user.getTranslation("protection.command-is-banned"));
- e.setCancelled(true);
+ // Loop through each of the banned commands
+ for (String cmd : plugin.getIWM().getVisitorBannedCommands(w)) {
+ if (checkCmd(cmd, args)) {
+ User user = User.getInstance(e.getPlayer());
+ user.notify("protection.protected", TextVariables.DESCRIPTION, user.getTranslation("protection.command-is-banned"));
+ e.setCancelled(true);
+ return;
+ }
}
}
+ private boolean checkCmd(String cmd, String[] args) {
+ // Commands are guilty until proven innocent :-)
+ boolean banned = true;
+ // Get the elements of the banned command by splitting it
+ String[] bannedSplit = cmd.toLowerCase(java.util.Locale.ENGLISH).split(" ");
+ // If the banned command has the same number of elements or less than the entered command then it may be banned
+ if (bannedSplit.length <= args.length) {
+ for (int i = 0; i < bannedSplit.length; i++) {
+ if (!bannedSplit[i].equals(args[i])) {
+ banned = false;
+ break;
+ }
+ }
+ }
+ return banned;
+ }
+
/**
* Prevents falling players from using commands, like /warp
* @param e - event
diff --git a/src/main/java/world/bentobox/bentobox/listeners/flags/clicklisteners/GeoMobLimitTab.java b/src/main/java/world/bentobox/bentobox/listeners/flags/clicklisteners/GeoMobLimitTab.java
index 84b2d759c..b721dee20 100644
--- a/src/main/java/world/bentobox/bentobox/listeners/flags/clicklisteners/GeoMobLimitTab.java
+++ b/src/main/java/world/bentobox/bentobox/listeners/flags/clicklisteners/GeoMobLimitTab.java
@@ -1,7 +1,6 @@
package world.bentobox.bentobox.listeners.flags.clicklisteners;
import java.util.Arrays;
-import java.util.Collections;
import java.util.Comparator;
import java.util.List;
@@ -34,11 +33,11 @@ public class GeoMobLimitTab implements Tab, ClickHandler {
/**
* A list of all living entity types, minus some
*/
- private static final List
* This event is triggered when entity is about to being teleported because of contact with the
* nether portal or end gateway portal (exit portal triggers respawn).
- *
+ *
* This event is not called if nether/end is disabled in server settings.
*
* @param event the entity portal event.
diff --git a/src/main/java/world/bentobox/bentobox/listeners/teleports/PlayerTeleportListener.java b/src/main/java/world/bentobox/bentobox/listeners/teleports/PlayerTeleportListener.java
index fa0ebfc80..1f4b2cbfc 100644
--- a/src/main/java/world/bentobox/bentobox/listeners/teleports/PlayerTeleportListener.java
+++ b/src/main/java/world/bentobox/bentobox/listeners/teleports/PlayerTeleportListener.java
@@ -63,10 +63,10 @@ public class PlayerTeleportListener extends AbstractTeleportListener implements
/**
* This listener checks player portal events and triggers appropriate methods to transfer
* players to the correct location in other dimension.
- *
+ *
* This event is triggered when player is about to being teleported because of contact with the
* nether portal or end gateway portal (exit portal triggers respawn).
- *
+ *
* This event is not called if nether/end is disabled in server settings.
*
* @param event the player portal event.
diff --git a/src/main/java/world/bentobox/bentobox/lists/Flags.java b/src/main/java/world/bentobox/bentobox/lists/Flags.java
index 10ad9570e..4f74ca46e 100644
--- a/src/main/java/world/bentobox/bentobox/lists/Flags.java
+++ b/src/main/java/world/bentobox/bentobox/lists/Flags.java
@@ -42,6 +42,7 @@ import world.bentobox.bentobox.listeners.flags.protection.TeleportationListener;
import world.bentobox.bentobox.listeners.flags.protection.ThrowingListener;
import world.bentobox.bentobox.listeners.flags.settings.DecayListener;
import world.bentobox.bentobox.listeners.flags.settings.MobSpawnListener;
+import world.bentobox.bentobox.listeners.flags.settings.MobTeleportListener;
import world.bentobox.bentobox.listeners.flags.settings.PVPListener;
import world.bentobox.bentobox.listeners.flags.worldsettings.ChestDamageListener;
import world.bentobox.bentobox.listeners.flags.worldsettings.CleanSuperFlatListener;
@@ -287,12 +288,12 @@ public final class Flags {
public static final Flag SHEARING = new Flag.Builder("SHEARING", Material.SHEARS).listener(new ShearingListener()).mode(Flag.Mode.ADVANCED).build();
// Item pickup or drop
- public static final Flag ITEM_DROP = new Flag.Builder("ITEM_DROP", Material.DIAMOND).defaultSetting(true).listener(new ItemDropPickUpListener()).mode(Flag.Mode.BASIC).build();
- public static final Flag ITEM_PICKUP = new Flag.Builder("ITEM_PICKUP", Material.SUGAR_CANE).mode(Flag.Mode.BASIC).build();
+ public static final Flag ITEM_DROP = new Flag.Builder("ITEM_DROP", Material.DIAMOND).defaultRank(RanksManager.VISITOR_RANK).listener(new ItemDropPickUpListener()).mode(Flag.Mode.BASIC).build();
+ public static final Flag ITEM_PICKUP = new Flag.Builder("ITEM_PICKUP", Material.SUGAR_CANE).mode(Flag.Mode.BASIC).defaultRank(RanksManager.VISITOR_RANK).build();
// Experience
public static final Flag EXPERIENCE_PICKUP = new Flag.Builder("EXPERIENCE_PICKUP", Material.EXPERIENCE_BOTTLE)
- .listener(Util.isPaper() ? new PaperExperiencePickupListener() : new ExperiencePickupListener()).mode(Flag.Mode.ADVANCED).build();
+ .listener(Util.isPaper() ? new PaperExperiencePickupListener() : new ExperiencePickupListener()).mode(Flag.Mode.ADVANCED).defaultRank(RanksManager.VISITOR_RANK).build();
// Command ranks
public static final Flag COMMAND_RANKS = new Flag.Builder("COMMAND_RANKS", Material.PLAYER_HEAD)
@@ -488,6 +489,21 @@ public final class Flags {
.listener(new EndermanListener())
.build();
+ /**
+ * If {@code false}, prevents Endermans from teleporting
+ * @since 1.22.1
+ */
+ public static final Flag ENDERMAN_TELEPORT = new Flag.Builder("ENDERMAN_TELEPORT", Material.ENDER_PEARL).type(Type.SETTING)
+ .defaultSetting(true).listener(new MobTeleportListener()).mode(Flag.Mode.ADVANCED).build();
+ /**
+ * If {@code false}, prevents Shulkers from teleporting
+ * Uses same listener as ENDERMAN_TELEPORT
+ * @since 1.22.1
+ */
+ public static final Flag SHULKER_TELEPORT = new Flag.Builder("SHULKER_TELEPORT", Material.SHULKER_SHELL).type(Type.SETTING)
+ .defaultSetting(true).mode(Flag.Mode.ADVANCED).build();
+
+
public static final Flag ENTER_EXIT_MESSAGES = new Flag.Builder("ENTER_EXIT_MESSAGES", Material.DIRT).defaultSetting(true).type(Type.WORLD_SETTING)
.listener(new EnterExitListener())
.build();
@@ -632,6 +648,21 @@ public final class Flags {
*/
public static final Flag ENTITY_PORTAL_TELEPORT = new Flag.Builder("ENTITY_PORTAL_TELEPORT", Material.ENDER_EYE).type(Type.WORLD_SETTING).defaultSetting(false).build();
+ /**
+ * Harvest Setting
+ * Controls who gets to harvest any crop related contents. e.g. Wheat, Sugar Cane, melon blocks, not stems, pumpkin blocks, etc.
+ * @since 1.23.0
+ */
+ public static final Flag HARVEST = new Flag.Builder("HARVEST", Material.PUMPKIN).type(Type.PROTECTION).build();
+
+ /**
+ * Crop Planting
+ * Controls who gets to plant crops on tilled soil.
+ * @since 1.23.0
+ */
+ public static final Flag CROP_PLANTING = new Flag.Builder("CROP_PLANTING", Material.PUMPKIN_SEEDS).type(Type.PROTECTION).build();
+
+
/**
* Provides a list of all the Flag instances contained in this class using reflection.
* Deprecated Flags are ignored.
diff --git a/src/main/java/world/bentobox/bentobox/managers/AddonsManager.java b/src/main/java/world/bentobox/bentobox/managers/AddonsManager.java
index ed1be9554..8ccc1bc88 100644
--- a/src/main/java/world/bentobox/bentobox/managers/AddonsManager.java
+++ b/src/main/java/world/bentobox/bentobox/managers/AddonsManager.java
@@ -190,7 +190,7 @@ public class AddonsManager {
private PladdonData loadPladdon(YamlConfiguration data, @NonNull File f) throws InvalidAddonInheritException, MalformedURLException, InvalidAddonDescriptionException, InstantiationException, IllegalAccessException, InvocationTargetException, NoSuchMethodException, InvalidDescriptionException {
Addon addon = null;
try {
- Plugin pladdon = pluginLoader.loadPlugin(f);
+ Plugin pladdon = Bukkit.getPluginManager().loadPlugin(f);
if (pladdon instanceof Pladdon pl) {
addon = pl.getAddon();
addon.setDescription(AddonClassLoader.asDescription(data));
@@ -314,8 +314,10 @@ public class AddonsManager {
if (addon instanceof GameModeAddon gameMode) {
// Create the gameWorlds
gameMode.createWorlds();
- // Create the seed worlds
- createSeedWorlds(gameMode);
+ if (gameMode.isUsesNewChunkGeneration()) {
+ // Create the seed worlds
+ createSeedWorlds(gameMode);
+ }
plugin.getIWM().addGameMode(gameMode);
// Save and load blueprints
plugin.getBlueprintsManager().extractDefaultBlueprints(gameMode);
@@ -344,7 +346,6 @@ public class AddonsManager {
/**
* Create seed worlds, which are used for deletion
- * @param gameMode
*/
private void createSeedWorlds(GameModeAddon gameMode) {
if (gameMode.getOverWorld() != null) {
@@ -449,8 +450,8 @@ public class AddonsManager {
public void disableAddons() {
if (!getEnabledAddons().isEmpty()) {
plugin.log("Disabling addons...");
- // Disable addons
- getEnabledAddons().forEach(this::disable);
+ // Disable addons - pladdons are disabled by the server
+ getEnabledAddons().stream().filter(addon -> !pladdons.keySet().contains(addon)).forEach(this::disable);
plugin.log("Addons successfully disabled.");
}
// Unregister all commands
diff --git a/src/main/java/world/bentobox/bentobox/managers/LocalesManager.java b/src/main/java/world/bentobox/bentobox/managers/LocalesManager.java
index d2ee1dc54..ce5fbeb87 100644
--- a/src/main/java/world/bentobox/bentobox/managers/LocalesManager.java
+++ b/src/main/java/world/bentobox/bentobox/managers/LocalesManager.java
@@ -104,6 +104,25 @@ public class LocalesManager {
}
return null;
}
+
+ /**
+ * Set the translation for a reference for a specific locale. The locale must be a known locale on this server.
+ * User {@link #getAvailableLocales(boolean)} to find out what locales are available.
+ * Note, the usual default locale is {@code Locale.US}
+ * @param locale locale
+ * @param reference reference
+ * @param translation translation
+ * @return true if successful, false if the locale is not a known locale on this server
+ * @since 1.22.1
+ */
+ public boolean setTranslation(Locale locale, String reference, String translation) {
+ // Set a translation
+ if (!languages.containsKey(locale)) {
+ return false;
+ }
+ languages.get(locale).set(reference, translation);
+ return true;
+ }
/**
* Gets the translated String corresponding to the reference from the server's or the en-US locale file.
@@ -120,7 +139,7 @@ public class LocalesManager {
/**
* Gets the list of prefixes from the user's locale, the server's locale and the en-US locale file.
* @param user the user to get the locale, not null.
- * @return the list of prefixes from the user's locale, the server's locale and the en-US locale file.
+ * @return the set of prefixes from the user's locale, the server's locale and the en-US locale file.
* @since 1.13.0
*/
public Set
* Assumes 0 patch version.
*
* @param minor Min Minor Version
@@ -738,6 +738,32 @@ public class Util {
}
return regenerator;
}
+
+ /**
+ * Checks what version the server is running and picks the appropriate NMS handler, or fallback
+ * @return PasteHandler
+ */
+ public static PasteHandler getPasteHandler() {
+ if (pasteHandler == null) {
+ String serverPackageName = Bukkit.getServer().getClass().getPackage().getName();
+ String pluginPackageName = plugin.getClass().getPackage().getName();
+ String version = serverPackageName.substring(serverPackageName.lastIndexOf('.') + 1);
+ PasteHandler handler;
+ try {
+ Class> clazz = Class.forName(pluginPackageName + ".nms." + version + ".PasteHandlerImpl");
+ if (PasteHandler.class.isAssignableFrom(clazz)) {
+ handler = (PasteHandler) clazz.getConstructor().newInstance();
+ } else {
+ throw new IllegalStateException("Class " + clazz.getName() + " does not implement PasteHandler");
+ }
+ } catch (Exception e) {
+ plugin.logWarning("No PasteHandler found for " + version + ", falling back to Bukkit API.");
+ handler = new world.bentobox.bentobox.nms.fallback.PasteHandlerImpl();
+ }
+ setPasteHandler(handler);
+ }
+ return pasteHandler;
+ }
/**
* Set the paste handler the plugin will use
@@ -747,17 +773,6 @@ public class Util {
Util.pasteHandler = pasteHandler;
}
- /**
- * Get the paste handler the plugin will use
- * @return an NMS accelerated class for this server
- */
- public static PasteHandler getPasteHandler() {
- if (pasteHandler == null) {
- setPasteHandler(new world.bentobox.bentobox.nms.fallback.PasteHandlerImpl());
- }
- return pasteHandler;
- }
-
/**
* Broadcast a localized message to all players with the permission {@link Server#BROADCAST_CHANNEL_USERS}
*
diff --git a/src/main/java/world/bentobox/bentobox/util/teleport/ClosestSafeSpotTeleport.java b/src/main/java/world/bentobox/bentobox/util/teleport/ClosestSafeSpotTeleport.java
index 8a2965b3b..d25bd0ac0 100644
--- a/src/main/java/world/bentobox/bentobox/util/teleport/ClosestSafeSpotTeleport.java
+++ b/src/main/java/world/bentobox/bentobox/util/teleport/ClosestSafeSpotTeleport.java
@@ -276,7 +276,7 @@ public class ClosestSafeSpotTeleport
/**
* This method finishes the chunk loading task and checks from all remaining positions in block queue
* to find the best location for teleportation.
- *
+ *
* This method stops position finding task and process teleporation.
*/
private void finishTask()
diff --git a/src/main/java/world/bentobox/bentobox/versions/ServerCompatibility.java b/src/main/java/world/bentobox/bentobox/versions/ServerCompatibility.java
index dfef37415..50c58f533 100644
--- a/src/main/java/world/bentobox/bentobox/versions/ServerCompatibility.java
+++ b/src/main/java/world/bentobox/bentobox/versions/ServerCompatibility.java
@@ -214,6 +214,10 @@ public class ServerCompatibility {
* @since 1.22.0
*/
V1_19_3(Compatibility.COMPATIBLE),
+ /**
+ * @since 1.22.1
+ */
+ V1_19_4(Compatibility.COMPATIBLE),
;
private final Compatibility compatibility;
diff --git a/src/main/resources/locales/en-US.yml b/src/main/resources/locales/en-US.yml
index ecf47e868..122dc307b 100644
--- a/src/main/resources/locales/en-US.yml
+++ b/src/main/resources/locales/en-US.yml
@@ -851,6 +851,11 @@ protection:
name: "Shulker boxes"
description: "Toggle shulker box interaction"
hint: "Shulker box access disabled"
+ SHULKER_TELEPORT:
+ description: |-
+ &a Shulker can teleport
+ &a if active.
+ name: "Shulker teleport"
TRAPPED_CHEST:
name: "Trapped chests"
description: "Toggle trapped chest interaction"
@@ -928,6 +933,11 @@ protection:
&a by island visitor.
name: "Creeper griefing protection"
hint: "Creeper griefing disabled"
+ CROP_PLANTING:
+ description: |-
+ &a Set who can plant seeds.
+ name: "Crop planting"
+ hint: "Crop planting disabled"
CROP_TRAMPLE:
description: "Toggle crop trampling"
name: "Trample crops"
@@ -971,6 +981,11 @@ protection:
&a Endermen can remove
&a blocks from islands
name: "Enderman griefing"
+ ENDERMAN_TELEPORT:
+ description: |-
+ &a Endermen can teleport
+ &a if active.
+ name: "Enderman teleport"
ENDER_PEARL:
description: "Toggle use"
name: "EnderPearls"
@@ -1031,6 +1046,13 @@ protection:
&a outside protected
&a island space
name: "&e Limit mobs to island"
+ HARVEST:
+ description: |-
+ &a Set who can harvest crops.
+ &a Don't forget to allow item
+ &a pickup too!
+ name: "Crop harvesting"
+ hint: "Crop harvesting disabled"
HIVE:
description: |-
&a Toggle hive harvesting.
@@ -1634,7 +1656,7 @@ successfully-loaded: |2
&6 ____ _ ____
&6 | _ \ | | | _ \ &7 by &a tastybento &7 and &a Poslovitch
- &6 | |_) | ___ _ __ | |_ ___ | |_) | _____ __ &7 2017 - 2022
+ &6 | |_) | ___ _ __ | |_ ___ | |_) | _____ __ &7 2017 - 2023
&6 | _ < / _ \ '_ \| __/ _ \| _ < / _ \ \/ /
&6 | |_) | __/ | | | || (_) | |_) | (_) > < &b v&e [version]
&6 |____/ \___|_| |_|\__\___/|____/ \___/_/\_\ &8 Loaded in &e [time]&8 ms.
diff --git a/src/main/resources/plugin.yml b/src/main/resources/plugin.yml
index bc5ef1ccb..1d84e6f85 100644
--- a/src/main/resources/plugin.yml
+++ b/src/main/resources/plugin.yml
@@ -60,3 +60,4 @@ permissions:
bentobox.version:
description: Allows to use /bentobox version
default: op
+
diff --git a/src/test/java/world/bentobox/bentobox/SettingsTest.java b/src/test/java/world/bentobox/bentobox/SettingsTest.java
index b8e464c63..b482dc96c 100644
--- a/src/test/java/world/bentobox/bentobox/SettingsTest.java
+++ b/src/test/java/world/bentobox/bentobox/SettingsTest.java
@@ -28,7 +28,6 @@ public class SettingsTest {
private Settings s;
/**
- * @throws java.lang.Exception
*/
@Before
public void setUp() throws Exception {
diff --git a/src/test/java/world/bentobox/bentobox/api/addons/AddonClassLoaderTest.java b/src/test/java/world/bentobox/bentobox/api/addons/AddonClassLoaderTest.java
index 8a501b652..3664f7e46 100644
--- a/src/test/java/world/bentobox/bentobox/api/addons/AddonClassLoaderTest.java
+++ b/src/test/java/world/bentobox/bentobox/api/addons/AddonClassLoaderTest.java
@@ -49,7 +49,7 @@ import world.bentobox.bentobox.managers.AddonsManager;
@PrepareForTest( { BentoBox.class, Bukkit.class })
public class AddonClassLoaderTest {
- private enum MandatoryTags {
+ private enum mandatoryTags {
MAIN,
NAME,
VERSION,
@@ -76,7 +76,6 @@ public class AddonClassLoaderTest {
private BentoBox plugin;
/**
- * @throws java.lang.Exception
*/
@Before
public void setUp() throws Exception {
@@ -91,7 +90,7 @@ public class AddonClassLoaderTest {
}
- public void makeAddon(List
* Sets up BentoBox plugin, pluginManager and ItemFactory.
* Location, world, playersManager and player.
* IWM, Addon and WorldSettings. IslandManager with one
@@ -172,7 +172,6 @@ public abstract class AbstractCommonSetup {
}
/**
- * @throws java.lang.Exception
*/
@After
public void tearDown() {
diff --git a/src/test/java/world/bentobox/bentobox/listeners/flags/clicklisteners/GeoMobLimitTabTest.java b/src/test/java/world/bentobox/bentobox/listeners/flags/clicklisteners/GeoMobLimitTabTest.java
index 8724383ee..4ecccedc1 100644
--- a/src/test/java/world/bentobox/bentobox/listeners/flags/clicklisteners/GeoMobLimitTabTest.java
+++ b/src/test/java/world/bentobox/bentobox/listeners/flags/clicklisteners/GeoMobLimitTabTest.java
@@ -66,7 +66,6 @@ public class GeoMobLimitTabTest {
private GameModeAddon gma;
/**
- * @throws java.lang.Exception
*/
@Before
public void setUp() throws Exception {
diff --git a/src/test/java/world/bentobox/bentobox/listeners/flags/protection/BlockInteractionListenerTest.java b/src/test/java/world/bentobox/bentobox/listeners/flags/protection/BlockInteractionListenerTest.java
index bdb0c5f56..51e3fe309 100644
--- a/src/test/java/world/bentobox/bentobox/listeners/flags/protection/BlockInteractionListenerTest.java
+++ b/src/test/java/world/bentobox/bentobox/listeners/flags/protection/BlockInteractionListenerTest.java
@@ -121,7 +121,6 @@ public class BlockInteractionListenerTest extends AbstractCommonSetup {
/**
- * @throws java.lang.Exception
*/
@Override
@Before
diff --git a/src/test/java/world/bentobox/bentobox/listeners/flags/protection/BreakBlocksListenerTest.java b/src/test/java/world/bentobox/bentobox/listeners/flags/protection/BreakBlocksListenerTest.java
index 67166b2a3..687916edd 100644
--- a/src/test/java/world/bentobox/bentobox/listeners/flags/protection/BreakBlocksListenerTest.java
+++ b/src/test/java/world/bentobox/bentobox/listeners/flags/protection/BreakBlocksListenerTest.java
@@ -59,7 +59,6 @@ public class BreakBlocksListenerTest extends AbstractCommonSetup {
private BreakBlocksListener bbl;
/**
- * @throws java.lang.Exception
*/
@Override
@Before
@@ -81,6 +80,7 @@ public class BreakBlocksListenerTest extends AbstractCommonSetup {
public void testOnBlockBreakAllowed() {
Block block = mock(Block.class);
when(block.getLocation()).thenReturn(location);
+ when(block.getType()).thenReturn(Material.DIRT);
BlockBreakEvent e = new BlockBreakEvent(block, player);
bbl.onBlockBreak(e);
assertFalse(e.isCancelled());
@@ -93,12 +93,43 @@ public class BreakBlocksListenerTest extends AbstractCommonSetup {
public void testOnBlockBreakNotAllowed() {
when(island.isAllowed(any(), any())).thenReturn(false);
Block block = mock(Block.class);
+ when(block.getType()).thenReturn(Material.DIRT);
when(block.getLocation()).thenReturn(location);
BlockBreakEvent e = new BlockBreakEvent(block, player);
bbl.onBlockBreak(e);
assertTrue(e.isCancelled());
verify(notifier).notify(any(), eq("protection.protected"));
}
+
+ /**
+ * Test method for {@link world.bentobox.bentobox.listeners.flags.protection.BreakBlocksListener#onBlockBreak(org.bukkit.event.block.BlockBreakEvent)}.
+ */
+ @Test
+ public void testOnBlockHarvestNotAllowed() {
+ when(island.isAllowed(any(), eq(Flags.HARVEST))).thenReturn(false);
+ Block block = mock(Block.class);
+ when(block.getType()).thenReturn(Material.PUMPKIN);
+ when(block.getLocation()).thenReturn(location);
+ BlockBreakEvent e = new BlockBreakEvent(block, player);
+ bbl.onBlockBreak(e);
+ assertTrue(e.isCancelled());
+ verify(notifier).notify(any(), eq("protection.protected"));
+ }
+
+ /**
+ * Test method for {@link world.bentobox.bentobox.listeners.flags.protection.BreakBlocksListener#onBlockBreak(org.bukkit.event.block.BlockBreakEvent)}.
+ */
+ @Test
+ public void testOnBlockHarvestAllowed() {
+ when(island.isAllowed(any(), eq(Flags.BREAK_BLOCKS))).thenReturn(false);
+ when(island.isAllowed(any(), eq(Flags.HARVEST))).thenReturn(true);
+ Block block = mock(Block.class);
+ when(block.getType()).thenReturn(Material.PUMPKIN);
+ when(block.getLocation()).thenReturn(location);
+ BlockBreakEvent e = new BlockBreakEvent(block, player);
+ bbl.onBlockBreak(e);
+ assertFalse(e.isCancelled());
+ }
/**
* Test method for {@link world.bentobox.bentobox.listeners.flags.protection.BreakBlocksListener#onBreakHanging(org.bukkit.event.hanging.HangingBreakByEntityEvent)}.
diff --git a/src/test/java/world/bentobox/bentobox/listeners/flags/protection/BucketListenerTest.java b/src/test/java/world/bentobox/bentobox/listeners/flags/protection/BucketListenerTest.java
index 34435a79e..45ea1d3eb 100644
--- a/src/test/java/world/bentobox/bentobox/listeners/flags/protection/BucketListenerTest.java
+++ b/src/test/java/world/bentobox/bentobox/listeners/flags/protection/BucketListenerTest.java
@@ -17,6 +17,7 @@ import org.bukkit.entity.TropicalFish;
import org.bukkit.event.player.PlayerBucketEmptyEvent;
import org.bukkit.event.player.PlayerBucketFillEvent;
import org.bukkit.event.player.PlayerInteractEntityEvent;
+import org.bukkit.inventory.EquipmentSlot;
import org.bukkit.inventory.ItemStack;
import org.bukkit.inventory.PlayerInventory;
import org.junit.Before;
@@ -42,7 +43,6 @@ public class BucketListenerTest extends AbstractCommonSetup {
private BucketListener l;
/**
- * @throws java.lang.Exception
*/
@Override
@Before
@@ -66,7 +66,7 @@ public class BucketListenerTest extends AbstractCommonSetup {
when(block.getLocation()).thenReturn(location);
when(block.getRelative(any())).thenReturn(block);
ItemStack item = mock(ItemStack.class);
- PlayerBucketEmptyEvent e = new PlayerBucketEmptyEvent(player, block, block, BlockFace.UP, Material.WATER_BUCKET, item);
+ PlayerBucketEmptyEvent e = new PlayerBucketEmptyEvent(player, block, block, BlockFace.UP, Material.WATER_BUCKET, item, EquipmentSlot.HAND);
l.onBucketEmpty(e);
assertFalse(e.isCancelled());
}
@@ -81,7 +81,7 @@ public class BucketListenerTest extends AbstractCommonSetup {
when(block.getLocation()).thenReturn(location);
when(block.getRelative(any())).thenReturn(block);
ItemStack item = mock(ItemStack.class);
- PlayerBucketEmptyEvent e = new PlayerBucketEmptyEvent(player, block, block, BlockFace.UP, Material.WATER_BUCKET, item);
+ PlayerBucketEmptyEvent e = new PlayerBucketEmptyEvent(player, block, block, BlockFace.UP, Material.WATER_BUCKET, item, EquipmentSlot.HAND);
l.onBucketEmpty(e);
assertTrue(e.isCancelled());
verify(notifier).notify(any(), eq("protection.protected"));
@@ -97,22 +97,22 @@ public class BucketListenerTest extends AbstractCommonSetup {
when(block.getRelative(any())).thenReturn(block);
ItemStack item = mock(ItemStack.class);
when(item.getType()).thenReturn(Material.WATER_BUCKET);
- PlayerBucketFillEvent e = new PlayerBucketFillEvent(player, block, block, BlockFace.UP, Material.WATER_BUCKET, item);
+ PlayerBucketFillEvent e = new PlayerBucketFillEvent(player, block, block, BlockFace.UP, Material.WATER_BUCKET, item, EquipmentSlot.HAND);
l.onBucketFill(e);
assertFalse(e.isCancelled());
when(item.getType()).thenReturn(Material.BUCKET);
- e = new PlayerBucketFillEvent(player, block, block, BlockFace.UP, Material.WATER_BUCKET, item);
+ e = new PlayerBucketFillEvent(player, block, block, BlockFace.UP, Material.WATER_BUCKET, item, EquipmentSlot.HAND);
l.onBucketFill(e);
assertFalse(e.isCancelled());
when(item.getType()).thenReturn(Material.LAVA_BUCKET);
- e = new PlayerBucketFillEvent(player, block, block, BlockFace.UP, Material.WATER_BUCKET, item);
+ e = new PlayerBucketFillEvent(player, block, block, BlockFace.UP, Material.WATER_BUCKET, item, EquipmentSlot.HAND);
l.onBucketFill(e);
assertFalse(e.isCancelled());
when(item.getType()).thenReturn(Material.MILK_BUCKET);
- e = new PlayerBucketFillEvent(player, block, block, BlockFace.UP, Material.WATER_BUCKET, item);
+ e = new PlayerBucketFillEvent(player, block, block, BlockFace.UP, Material.WATER_BUCKET, item, EquipmentSlot.HAND);
l.onBucketFill(e);
assertFalse(e.isCancelled());
}
@@ -128,22 +128,22 @@ public class BucketListenerTest extends AbstractCommonSetup {
when(block.getRelative(any())).thenReturn(block);
ItemStack item = mock(ItemStack.class);
when(item.getType()).thenReturn(Material.WATER_BUCKET);
- PlayerBucketFillEvent e = new PlayerBucketFillEvent(player, block, block, BlockFace.UP, Material.WATER_BUCKET, item);
+ PlayerBucketFillEvent e = new PlayerBucketFillEvent(player, block, block, BlockFace.UP, Material.WATER_BUCKET, item, EquipmentSlot.HAND);
l.onBucketFill(e);
assertTrue(e.isCancelled());
when(item.getType()).thenReturn(Material.BUCKET);
- e = new PlayerBucketFillEvent(player, block, block, BlockFace.UP, Material.WATER_BUCKET, item);
+ e = new PlayerBucketFillEvent(player, block, block, BlockFace.UP, Material.WATER_BUCKET, item, EquipmentSlot.HAND);
l.onBucketFill(e);
assertTrue(e.isCancelled());
when(item.getType()).thenReturn(Material.LAVA_BUCKET);
- e = new PlayerBucketFillEvent(player, block, block, BlockFace.UP, Material.WATER_BUCKET, item);
+ e = new PlayerBucketFillEvent(player, block, block, BlockFace.UP, Material.WATER_BUCKET, item, EquipmentSlot.HAND);
l.onBucketFill(e);
assertTrue(e.isCancelled());
when(item.getType()).thenReturn(Material.MILK_BUCKET);
- e = new PlayerBucketFillEvent(player, block, block, BlockFace.UP, Material.WATER_BUCKET, item);
+ e = new PlayerBucketFillEvent(player, block, block, BlockFace.UP, Material.WATER_BUCKET, item, EquipmentSlot.HAND);
l.onBucketFill(e);
assertTrue(e.isCancelled());
@@ -164,22 +164,22 @@ public class BucketListenerTest extends AbstractCommonSetup {
when(block.getRelative(any())).thenReturn(block);
ItemStack item = mock(ItemStack.class);
when(item.getType()).thenReturn(Material.WATER_BUCKET);
- PlayerBucketFillEvent e = new PlayerBucketFillEvent(player, block, block, BlockFace.UP, Material.WATER_BUCKET, item);
+ PlayerBucketFillEvent e = new PlayerBucketFillEvent(player, block, block, BlockFace.UP, Material.WATER_BUCKET, item, EquipmentSlot.HAND);
l.onBucketFill(e);
assertFalse(e.isCancelled());
when(item.getType()).thenReturn(Material.BUCKET);
- e = new PlayerBucketFillEvent(player, block, block, BlockFace.UP, Material.WATER_BUCKET, item);
+ e = new PlayerBucketFillEvent(player, block, block, BlockFace.UP, Material.WATER_BUCKET, item, EquipmentSlot.HAND);
l.onBucketFill(e);
assertTrue(e.isCancelled());
when(item.getType()).thenReturn(Material.LAVA_BUCKET);
- e = new PlayerBucketFillEvent(player, block, block, BlockFace.UP, Material.WATER_BUCKET, item);
+ e = new PlayerBucketFillEvent(player, block, block, BlockFace.UP, Material.WATER_BUCKET, item, EquipmentSlot.HAND);
l.onBucketFill(e);
assertFalse(e.isCancelled());
when(item.getType()).thenReturn(Material.MILK_BUCKET);
- e = new PlayerBucketFillEvent(player, block, block, BlockFace.UP, Material.WATER_BUCKET, item);
+ e = new PlayerBucketFillEvent(player, block, block, BlockFace.UP, Material.WATER_BUCKET, item, EquipmentSlot.HAND);
l.onBucketFill(e);
assertFalse(e.isCancelled());
diff --git a/src/test/java/world/bentobox/bentobox/listeners/flags/protection/EggListenerTest.java b/src/test/java/world/bentobox/bentobox/listeners/flags/protection/EggListenerTest.java
index bc0a4db49..b4103ff38 100644
--- a/src/test/java/world/bentobox/bentobox/listeners/flags/protection/EggListenerTest.java
+++ b/src/test/java/world/bentobox/bentobox/listeners/flags/protection/EggListenerTest.java
@@ -35,7 +35,6 @@ public class EggListenerTest extends AbstractCommonSetup {
private EggListener el;
/**
- * @throws java.lang.Exception
*/
@Override
@Before
diff --git a/src/test/java/world/bentobox/bentobox/listeners/flags/protection/ElytraListenerTest.java b/src/test/java/world/bentobox/bentobox/listeners/flags/protection/ElytraListenerTest.java
index a1f0fdceb..7ede01502 100644
--- a/src/test/java/world/bentobox/bentobox/listeners/flags/protection/ElytraListenerTest.java
+++ b/src/test/java/world/bentobox/bentobox/listeners/flags/protection/ElytraListenerTest.java
@@ -33,7 +33,6 @@ public class ElytraListenerTest extends AbstractCommonSetup {
private ElytraListener el;
/**
- * @throws java.lang.Exception
*/
@Override
@Before
diff --git a/src/test/java/world/bentobox/bentobox/listeners/flags/protection/EntityInteractListenerTest.java b/src/test/java/world/bentobox/bentobox/listeners/flags/protection/EntityInteractListenerTest.java
index 0f258b06e..8b8e5014a 100644
--- a/src/test/java/world/bentobox/bentobox/listeners/flags/protection/EntityInteractListenerTest.java
+++ b/src/test/java/world/bentobox/bentobox/listeners/flags/protection/EntityInteractListenerTest.java
@@ -54,7 +54,6 @@ public class EntityInteractListenerTest extends AbstractCommonSetup {
private EquipmentSlot hand;
/**
- * @throws java.lang.Exception
*/
@Override
@Before
diff --git a/src/test/java/world/bentobox/bentobox/listeners/flags/protection/ExperiencePickupListenerTest.java b/src/test/java/world/bentobox/bentobox/listeners/flags/protection/ExperiencePickupListenerTest.java
index 651419943..77a274bab 100644
--- a/src/test/java/world/bentobox/bentobox/listeners/flags/protection/ExperiencePickupListenerTest.java
+++ b/src/test/java/world/bentobox/bentobox/listeners/flags/protection/ExperiencePickupListenerTest.java
@@ -43,7 +43,6 @@ public class ExperiencePickupListenerTest extends AbstractCommonSetup {
private Entity entity;
/**
- * @throws java.lang.Exception
*/
@Override
@Before
diff --git a/src/test/java/world/bentobox/bentobox/listeners/flags/protection/HurtingListenerTest.java b/src/test/java/world/bentobox/bentobox/listeners/flags/protection/HurtingListenerTest.java
index 9e9f777ad..596fba8ca 100644
--- a/src/test/java/world/bentobox/bentobox/listeners/flags/protection/HurtingListenerTest.java
+++ b/src/test/java/world/bentobox/bentobox/listeners/flags/protection/HurtingListenerTest.java
@@ -52,7 +52,6 @@ public class HurtingListenerTest extends AbstractCommonSetup {
private User user;
/**
- * @throws java.lang.Exception
*/
@Override
@Before
diff --git a/src/test/java/world/bentobox/bentobox/listeners/flags/protection/InventoryListenerTest.java b/src/test/java/world/bentobox/bentobox/listeners/flags/protection/InventoryListenerTest.java
index d8046658f..391805324 100644
--- a/src/test/java/world/bentobox/bentobox/listeners/flags/protection/InventoryListenerTest.java
+++ b/src/test/java/world/bentobox/bentobox/listeners/flags/protection/InventoryListenerTest.java
@@ -64,7 +64,6 @@ public class InventoryListenerTest extends AbstractCommonSetup {
private Material type;
/**
- * @throws java.lang.Exception
*/
@Override
@Before
diff --git a/src/test/java/world/bentobox/bentobox/listeners/flags/protection/LockAndBanListenerTest.java b/src/test/java/world/bentobox/bentobox/listeners/flags/protection/LockAndBanListenerTest.java
index 6eb7629fd..08e698197 100644
--- a/src/test/java/world/bentobox/bentobox/listeners/flags/protection/LockAndBanListenerTest.java
+++ b/src/test/java/world/bentobox/bentobox/listeners/flags/protection/LockAndBanListenerTest.java
@@ -82,7 +82,6 @@ public class LockAndBanListenerTest {
private BukkitScheduler sch;
/**
- * @throws java.lang.Exception
*/
@Before
public void setUp() throws Exception {
diff --git a/src/test/java/world/bentobox/bentobox/listeners/flags/protection/PlaceBlocksListenerTest.java b/src/test/java/world/bentobox/bentobox/listeners/flags/protection/PlaceBlocksListenerTest.java
index c00ee2d57..e04f72b41 100644
--- a/src/test/java/world/bentobox/bentobox/listeners/flags/protection/PlaceBlocksListenerTest.java
+++ b/src/test/java/world/bentobox/bentobox/listeners/flags/protection/PlaceBlocksListenerTest.java
@@ -51,7 +51,6 @@ public class PlaceBlocksListenerTest extends AbstractCommonSetup {
private PlaceBlocksListener pbl;
/**
- * @throws java.lang.Exception
*/
@Override
@Before
@@ -90,6 +89,7 @@ public class PlaceBlocksListenerTest extends AbstractCommonSetup {
when(placedBlock.getLocation()).thenReturn(location);
BlockState replacedBlockState = mock(BlockState.class);
Block placedAgainst = mock(Block.class);
+ when(placedAgainst.getType()).thenReturn(Material.STONE);
ItemStack itemInHand = mock(ItemStack.class);
when(itemInHand.getType()).thenReturn(Material.STONE);
EquipmentSlot hand = EquipmentSlot.HAND;
@@ -106,7 +106,7 @@ public class PlaceBlocksListenerTest extends AbstractCommonSetup {
Hanging hanging = mock(Hanging.class);
Block block = mock(Block.class);
when(block.getLocation()).thenReturn(location);
- HangingPlaceEvent e = new HangingPlaceEvent(hanging, player, block, BlockFace.EAST, null);
+ HangingPlaceEvent e = new HangingPlaceEvent(hanging, player, block, BlockFace.EAST, null, null);
pbl.onHangingPlace(e);
assertFalse(e.isCancelled());
verify(notifier, never()).notify(any(), eq("protection.protected"));
@@ -121,7 +121,7 @@ public class PlaceBlocksListenerTest extends AbstractCommonSetup {
Hanging hanging = mock(Hanging.class);
Block block = mock(Block.class);
when(block.getLocation()).thenReturn(location);
- HangingPlaceEvent e = new HangingPlaceEvent(hanging, player, block, BlockFace.EAST, null);
+ HangingPlaceEvent e = new HangingPlaceEvent(hanging, player, block, BlockFace.EAST, null, null);
pbl.onHangingPlace(e);
assertTrue(e.isCancelled());
verify(notifier).notify(any(), eq("protection.protected"));
@@ -154,6 +154,7 @@ public class PlaceBlocksListenerTest extends AbstractCommonSetup {
when(placedBlock.getLocation()).thenReturn(location);
BlockState replacedBlockState = mock(BlockState.class);
Block placedAgainst = mock(Block.class);
+ when(placedAgainst.getType()).thenReturn(Material.STONE);
ItemStack itemInHand = mock(ItemStack.class);
when(itemInHand.getType()).thenReturn(Material.STONE);
EquipmentSlot hand = EquipmentSlot.HAND;
@@ -162,6 +163,71 @@ public class PlaceBlocksListenerTest extends AbstractCommonSetup {
assertTrue(e.isCancelled());
verify(notifier).notify(any(), eq("protection.protected"));
}
+
+ /**
+ * Test method for {@link PlaceBlocksListener#onBlockPlace(org.bukkit.event.block.BlockPlaceEvent)}.
+ */
+ @Test
+ public void testOnBlockCropsAllowed() {
+ when(island.isAllowed(any(), eq(Flags.PLACE_BLOCKS))).thenReturn(false);
+ when(island.isAllowed(any(), eq(Flags.CROP_PLANTING))).thenReturn(true);
+ Block placedBlock = mock(Block.class);
+ when(placedBlock.getType()).thenReturn(Material.WHEAT);
+ when(placedBlock.getLocation()).thenReturn(location);
+ BlockState replacedBlockState = mock(BlockState.class);
+ Block placedAgainst = mock(Block.class);
+ when(placedAgainst.getType()).thenReturn(Material.FARMLAND);
+ ItemStack itemInHand = mock(ItemStack.class);
+ when(itemInHand.getType()).thenReturn(Material.WHEAT_SEEDS);
+ EquipmentSlot hand = EquipmentSlot.HAND;
+ BlockPlaceEvent e = new BlockPlaceEvent(placedBlock, replacedBlockState, placedAgainst, itemInHand, player, true, hand);
+ pbl.onBlockPlace(e);
+ assertFalse(e.isCancelled());
+ }
+
+ /**
+ * Test method for {@link PlaceBlocksListener#onBlockPlace(org.bukkit.event.block.BlockPlaceEvent)}.
+ */
+ @Test
+ public void testOnBlockCropsAllowedNotCrop() {
+ when(island.isAllowed(any(), eq(Flags.PLACE_BLOCKS))).thenReturn(false);
+ when(island.isAllowed(any(), eq(Flags.CROP_PLANTING))).thenReturn(true);
+ Block placedBlock = mock(Block.class);
+ when(placedBlock.getType()).thenReturn(Material.DIRT);
+ when(placedBlock.getLocation()).thenReturn(location);
+ BlockState replacedBlockState = mock(BlockState.class);
+ Block placedAgainst = mock(Block.class);
+ when(placedAgainst.getType()).thenReturn(Material.FARMLAND);
+ ItemStack itemInHand = mock(ItemStack.class);
+ when(itemInHand.getType()).thenReturn(Material.DIRT);
+ EquipmentSlot hand = EquipmentSlot.HAND;
+ BlockPlaceEvent e = new BlockPlaceEvent(placedBlock, replacedBlockState, placedAgainst, itemInHand, player, true, hand);
+ pbl.onBlockPlace(e);
+ assertTrue(e.isCancelled());
+ verify(notifier).notify(any(), eq("protection.protected"));
+ }
+
+ /**
+ * Test method for {@link PlaceBlocksListener#onBlockPlace(org.bukkit.event.block.BlockPlaceEvent)}.
+ */
+ @Test
+ public void testOnBlockCropsNotAllowed() {
+ when(island.isAllowed(any(), eq(Flags.PLACE_BLOCKS))).thenReturn(false);
+ when(island.isAllowed(any(), eq(Flags.CROP_PLANTING))).thenReturn(false);
+ Block placedBlock = mock(Block.class);
+ when(placedBlock.getType()).thenReturn(Material.WHEAT);
+ when(placedBlock.getLocation()).thenReturn(location);
+ BlockState replacedBlockState = mock(BlockState.class);
+ Block placedAgainst = mock(Block.class);
+ when(placedAgainst.getType()).thenReturn(Material.FARMLAND);
+ ItemStack itemInHand = mock(ItemStack.class);
+ when(itemInHand.getType()).thenReturn(Material.WHEAT_SEEDS);
+ EquipmentSlot hand = EquipmentSlot.HAND;
+ BlockPlaceEvent e = new BlockPlaceEvent(placedBlock, replacedBlockState, placedAgainst, itemInHand, player, true, hand);
+ pbl.onBlockPlace(e);
+ assertTrue(e.isCancelled());
+ verify(notifier).notify(any(), eq("protection.protected"));
+ }
/**
* Test method for {@link PlaceBlocksListener#onBlockPlace(org.bukkit.event.block.BlockPlaceEvent)}.
diff --git a/src/test/java/world/bentobox/bentobox/listeners/flags/protection/ThrowingListenerTest.java b/src/test/java/world/bentobox/bentobox/listeners/flags/protection/ThrowingListenerTest.java
index c31cf7529..362e2c444 100644
--- a/src/test/java/world/bentobox/bentobox/listeners/flags/protection/ThrowingListenerTest.java
+++ b/src/test/java/world/bentobox/bentobox/listeners/flags/protection/ThrowingListenerTest.java
@@ -34,7 +34,6 @@ public class ThrowingListenerTest extends AbstractCommonSetup {
private ThrowingListener tl;
/**
- * @throws java.lang.Exception
*/
@Override
@Before
diff --git a/src/test/java/world/bentobox/bentobox/listeners/flags/settings/MobSpawnListenerTest.java b/src/test/java/world/bentobox/bentobox/listeners/flags/settings/MobSpawnListenerTest.java
index 9a943f4a1..cba3a2ada 100644
--- a/src/test/java/world/bentobox/bentobox/listeners/flags/settings/MobSpawnListenerTest.java
+++ b/src/test/java/world/bentobox/bentobox/listeners/flags/settings/MobSpawnListenerTest.java
@@ -206,53 +206,24 @@ public class MobSpawnListenerTest {
for (SpawnReason reason: SpawnReason.values()) {
CreatureSpawnEvent e = new CreatureSpawnEvent(le, reason);
switch (reason) {
- // Natural
- case DEFAULT:
- case DROWNED:
- case JOCKEY:
- case LIGHTNING:
- case MOUNT:
- case NATURAL:
- case NETHER_PORTAL:
- case OCELOT_BABY:
- case PATROL:
- case RAID:
- case REINFORCEMENTS:
- case SILVERFISH_BLOCK:
- case TRAP:
- case VILLAGE_DEFENSE:
- case VILLAGE_INVASION:
- // These should be blocked
- l.onMobSpawn(e);
- assertTrue("Natural spawn should be blocked: " + reason.toString(), e.isCancelled());
- break;
+ // Natural
+ case DEFAULT, DROWNED, JOCKEY, LIGHTNING, MOUNT, NATURAL, NETHER_PORTAL, OCELOT_BABY, PATROL, RAID, REINFORCEMENTS, SILVERFISH_BLOCK, TRAP, VILLAGE_DEFENSE, VILLAGE_INVASION -> {
+ // These should be blocked
+ l.onMobSpawn(e);
+ assertTrue("Natural spawn should be blocked: " + reason.toString(), e.isCancelled());
+ }
// Spawners
- case SPAWNER:
- l.onMobSpawn(e);
- assertTrue("Spawners spawn should be blocked: " + reason.toString(), e.isCancelled());
- break;
+ case SPAWNER -> {
+ l.onMobSpawn(e);
+ assertTrue("Spawners spawn should be blocked: " + reason.toString(), e.isCancelled());
+ }
// Unnatural - player involved or allowed
- case BREEDING:
- case BUILD_IRONGOLEM:
- case BUILD_SNOWMAN:
- case BUILD_WITHER:
- case CURED:
- case CUSTOM:
- case DISPENSE_EGG:
- case EGG:
- case ENDER_PEARL:
- case EXPLOSION:
- case INFECTION:
- case SHEARED:
- case SHOULDER_ENTITY:
- case SPAWNER_EGG:
- case SLIME_SPLIT:
- l.onMobSpawn(e);
- assertFalse("Should be not blocked: " + reason.toString(), e.isCancelled());
- break;
- default:
- break;
-
+ case BREEDING, BUILD_IRONGOLEM, BUILD_SNOWMAN, BUILD_WITHER, CURED, CUSTOM, DISPENSE_EGG, EGG, ENDER_PEARL, EXPLOSION, INFECTION, SHEARED, SHOULDER_ENTITY, SPAWNER_EGG, SLIME_SPLIT -> {
+ l.onMobSpawn(e);
+ assertFalse("Should be not blocked: " + reason.toString(), e.isCancelled());
+ }
+ default -> {
+ }
}
}
diff --git a/src/test/java/world/bentobox/bentobox/listeners/flags/settings/MobTeleportListenerTest.java b/src/test/java/world/bentobox/bentobox/listeners/flags/settings/MobTeleportListenerTest.java
new file mode 100644
index 000000000..d570f162d
--- /dev/null
+++ b/src/test/java/world/bentobox/bentobox/listeners/flags/settings/MobTeleportListenerTest.java
@@ -0,0 +1,213 @@
+package world.bentobox.bentobox.listeners.flags.settings;
+
+import static org.junit.Assert.assertFalse;
+import static org.junit.Assert.assertTrue;
+import static org.mockito.ArgumentMatchers.any;
+import static org.mockito.Mockito.mock;
+import static org.mockito.Mockito.when;
+
+import java.util.Optional;
+
+import org.bukkit.Location;
+import org.bukkit.World;
+import org.bukkit.entity.Entity;
+import org.bukkit.entity.EntityType;
+import org.bukkit.event.entity.EntityTeleportEvent;
+import org.junit.After;
+import org.junit.Before;
+import org.junit.Test;
+import org.junit.runner.RunWith;
+import org.mockito.Mock;
+import org.mockito.Mockito;
+import org.powermock.api.mockito.PowerMockito;
+import org.powermock.core.classloader.annotations.PrepareForTest;
+import org.powermock.modules.junit4.PowerMockRunner;
+
+import world.bentobox.bentobox.BentoBox;
+import world.bentobox.bentobox.database.objects.Island;
+import world.bentobox.bentobox.lists.Flags;
+import world.bentobox.bentobox.managers.IslandWorldManager;
+import world.bentobox.bentobox.managers.IslandsManager;
+
+/**
+ * @author tastybento
+ *
+ */
+@RunWith(PowerMockRunner.class)
+@PrepareForTest({BentoBox.class })
+public class MobTeleportListenerTest {
+
+ @Mock
+ private IslandWorldManager iwm;
+ @Mock
+ private IslandsManager im;
+ @Mock
+ private Island island;
+ private MobTeleportListener mtl;
+
+ @Mock
+ private Entity enderman;
+ @Mock
+ private Entity shulker;
+ @Mock
+ private Entity other;
+ @Mock
+ private Location from;
+ @Mock
+ private Location to;
+ @Mock
+ private World world;
+ /**
+ * @throws java.lang.Exception
+ */
+ @Before
+ public void setUp() throws Exception {
+ // Set up plugin
+ BentoBox plugin = mock(BentoBox.class);
+ PowerMockito.mockStatic(BentoBox.class, Mockito.RETURNS_MOCKS);
+ when(BentoBox.getInstance()).thenReturn(plugin);
+ // Island World Manager
+ when(plugin.getIWM()).thenReturn(iwm);
+ when(iwm.inWorld(any(World.class))).thenReturn(true);
+ // Island Manager
+ when(plugin.getIslands()).thenReturn(im);
+ when(im.getIslandAt(any())).thenReturn(Optional.of(island));
+ when(island.isAllowed(Flags.ENDERMAN_TELEPORT)).thenReturn(true);
+ when(island.isAllowed(Flags.SHULKER_TELEPORT)).thenReturn(true);
+
+ when(to.getWorld()).thenReturn(world);
+ when(from.getWorld()).thenReturn(world);
+ when(enderman.getType()).thenReturn(EntityType.ENDERMAN);
+ when(shulker.getType()).thenReturn(EntityType.SHULKER);
+ when(other.getType()).thenReturn(EntityType.AXOLOTL);
+ mtl = new MobTeleportListener();
+
+ }
+
+ /**
+ * @throws java.lang.Exception
+ */
+ @After
+ public void tearDown() throws Exception {
+ Mockito.framework().clearInlineMocks();
+ }
+
+ /**
+ * Test method for {@link world.bentobox.bentobox.listeners.flags.settings.MobTeleportListener#onEntityTeleportEvent(org.bukkit.event.entity.EntityTeleportEvent)}.
+ */
+ @Test
+ public void testOnEntityTeleportEventEndermanNotAllowed() {
+ Flags.ENDERMAN_TELEPORT.setSetting(world, false);
+ when(island.isAllowed(Flags.ENDERMAN_TELEPORT)).thenReturn(false);
+ EntityTeleportEvent e = new EntityTeleportEvent(enderman, from, to);
+ mtl.onEntityTeleportEvent(e);
+ assertTrue(e.isCancelled());
+ }
+
+ /**
+ * Test method for {@link world.bentobox.bentobox.listeners.flags.settings.MobTeleportListener#onEntityTeleportEvent(org.bukkit.event.entity.EntityTeleportEvent)}.
+ */
+ @Test
+ public void testOnEntityTeleportEventEndermanNotAllowedWrongWorld() {
+ when(iwm.inWorld(any(World.class))).thenReturn(false);
+ Flags.ENDERMAN_TELEPORT.setSetting(world, false);
+ when(island.isAllowed(Flags.ENDERMAN_TELEPORT)).thenReturn(false);
+ EntityTeleportEvent e = new EntityTeleportEvent(enderman, from, to);
+ mtl.onEntityTeleportEvent(e);
+ assertFalse(e.isCancelled());
+ }
+
+ /**
+ * Test method for {@link world.bentobox.bentobox.listeners.flags.settings.MobTeleportListener#onEntityTeleportEvent(org.bukkit.event.entity.EntityTeleportEvent)}.
+ */
+ @Test
+ public void testOnEntityTeleportEventEndermanNotAllowedNotOnIsland() {
+ when(im.getIslandAt(any())).thenReturn(Optional.empty());
+ Flags.ENDERMAN_TELEPORT.setSetting(world, false);
+ EntityTeleportEvent e = new EntityTeleportEvent(enderman, from, to);
+ mtl.onEntityTeleportEvent(e);
+ assertFalse(e.isCancelled());
+ }
+
+ /**
+ * Test method for {@link world.bentobox.bentobox.listeners.flags.settings.MobTeleportListener#onEntityTeleportEvent(org.bukkit.event.entity.EntityTeleportEvent)}.
+ */
+ @Test
+ public void testOnEntityTeleportEventEndermanAllowedDefault() {
+ EntityTeleportEvent e = new EntityTeleportEvent(enderman, from, to);
+ mtl.onEntityTeleportEvent(e);
+ assertFalse(e.isCancelled());
+ }
+
+ /**
+ * Test method for {@link world.bentobox.bentobox.listeners.flags.settings.MobTeleportListener#onEntityTeleportEvent(org.bukkit.event.entity.EntityTeleportEvent)}.
+ */
+ @Test
+ public void testOnEntityTeleportEventOther() {
+ EntityTeleportEvent e = new EntityTeleportEvent(other, from, to);
+ mtl.onEntityTeleportEvent(e);
+ assertFalse(e.isCancelled());
+ }
+
+ /**
+ * Test method for {@link world.bentobox.bentobox.listeners.flags.settings.MobTeleportListener#onEntityTeleportEvent(org.bukkit.event.entity.EntityTeleportEvent)}.
+ */
+ @Test
+ public void testOnEntityTeleportEventEndermanNotAllowedButOther() {
+ Flags.ENDERMAN_TELEPORT.setSetting(world, false);
+ Flags.SHULKER_TELEPORT.setSetting(world, false);
+ when(island.isAllowed(Flags.ENDERMAN_TELEPORT)).thenReturn(false);
+ when(island.isAllowed(Flags.SHULKER_TELEPORT)).thenReturn(false);
+ EntityTeleportEvent e = new EntityTeleportEvent(other, from, to);
+ mtl.onEntityTeleportEvent(e);
+ assertFalse(e.isCancelled());
+ }
+
+ /**
+ * Test method for {@link world.bentobox.bentobox.listeners.flags.settings.MobTeleportListener#onEntityTeleportEvent(org.bukkit.event.entity.EntityTeleportEvent)}.
+ */
+ @Test
+ public void testOnEntityTeleportEventShulkerNotAllowed() {
+ Flags.SHULKER_TELEPORT.setSetting(world, false);
+ when(island.isAllowed(Flags.SHULKER_TELEPORT)).thenReturn(false);
+ EntityTeleportEvent e = new EntityTeleportEvent(shulker, from, to);
+ mtl.onEntityTeleportEvent(e);
+ assertTrue(e.isCancelled());
+ }
+
+ /**
+ * Test method for {@link world.bentobox.bentobox.listeners.flags.settings.MobTeleportListener#onEntityTeleportEvent(org.bukkit.event.entity.EntityTeleportEvent)}.
+ */
+ @Test
+ public void testOnEntityTeleportEventShulkerNotAllowedWrongWorld() {
+ when(iwm.inWorld(any(World.class))).thenReturn(false);
+ Flags.SHULKER_TELEPORT.setSetting(world, false);
+ when(island.isAllowed(Flags.SHULKER_TELEPORT)).thenReturn(false);
+ EntityTeleportEvent e = new EntityTeleportEvent(shulker, from, to);
+ mtl.onEntityTeleportEvent(e);
+ assertFalse(e.isCancelled());
+ }
+
+ /**
+ * Test method for {@link world.bentobox.bentobox.listeners.flags.settings.MobTeleportListener#onEntityTeleportEvent(org.bukkit.event.entity.EntityTeleportEvent)}.
+ */
+ @Test
+ public void testOnEntityTeleportEventShulkerNotAllowedNotOnIsland() {
+ when(im.getIslandAt(any())).thenReturn(Optional.empty());
+ Flags.SHULKER_TELEPORT.setSetting(world, false);
+ EntityTeleportEvent e = new EntityTeleportEvent(shulker, from, to);
+ mtl.onEntityTeleportEvent(e);
+ assertFalse(e.isCancelled());
+ }
+
+ /**
+ * Test method for {@link world.bentobox.bentobox.listeners.flags.settings.MobTeleportListener#onEntityTeleportEvent(org.bukkit.event.entity.EntityTeleportEvent)}.
+ */
+ @Test
+ public void testOnEntityTeleportEventShulkerAllowedDefault() {
+ EntityTeleportEvent e = new EntityTeleportEvent(shulker, from, to);
+ mtl.onEntityTeleportEvent(e);
+ assertFalse(e.isCancelled());
+ }
+
+}
diff --git a/src/test/java/world/bentobox/bentobox/listeners/flags/settings/PVPListenerTest.java b/src/test/java/world/bentobox/bentobox/listeners/flags/settings/PVPListenerTest.java
index 94e1f266e..c58075a64 100644
--- a/src/test/java/world/bentobox/bentobox/listeners/flags/settings/PVPListenerTest.java
+++ b/src/test/java/world/bentobox/bentobox/listeners/flags/settings/PVPListenerTest.java
@@ -119,7 +119,6 @@ public class PVPListenerTest {
private Notifier notifier;
/**
- * @throws java.lang.Exception
*/
@Before
public void setUp() throws Exception {
diff --git a/src/test/java/world/bentobox/bentobox/listeners/flags/worldsettings/CleanSuperFlatListenerTest.java b/src/test/java/world/bentobox/bentobox/listeners/flags/worldsettings/CleanSuperFlatListenerTest.java
index ca8e0b12c..603b0a503 100644
--- a/src/test/java/world/bentobox/bentobox/listeners/flags/worldsettings/CleanSuperFlatListenerTest.java
+++ b/src/test/java/world/bentobox/bentobox/listeners/flags/worldsettings/CleanSuperFlatListenerTest.java
@@ -66,7 +66,6 @@ public class CleanSuperFlatListenerTest {
private WorldRegenerator regenerator;
/**
- * @throws java.lang.Exception
*/
@Before
public void setUp() throws Exception {
diff --git a/src/test/java/world/bentobox/bentobox/listeners/flags/worldsettings/CoarseDirtTillingListenerTest.java b/src/test/java/world/bentobox/bentobox/listeners/flags/worldsettings/CoarseDirtTillingListenerTest.java
index dc5e480e8..aa1a13f9e 100644
--- a/src/test/java/world/bentobox/bentobox/listeners/flags/worldsettings/CoarseDirtTillingListenerTest.java
+++ b/src/test/java/world/bentobox/bentobox/listeners/flags/worldsettings/CoarseDirtTillingListenerTest.java
@@ -77,7 +77,6 @@ public class CoarseDirtTillingListenerTest {
/**
- * @throws java.lang.Exception
*/
@Before
public void setUp() throws Exception {
@@ -123,7 +122,6 @@ public class CoarseDirtTillingListenerTest {
}
/**
- * @throws java.lang.Exception
*/
@After
public void tearDown() throws Exception {
diff --git a/src/test/java/world/bentobox/bentobox/listeners/flags/worldsettings/EnterExitListenerTest.java b/src/test/java/world/bentobox/bentobox/listeners/flags/worldsettings/EnterExitListenerTest.java
index be3620e11..09b45ac2b 100644
--- a/src/test/java/world/bentobox/bentobox/listeners/flags/worldsettings/EnterExitListenerTest.java
+++ b/src/test/java/world/bentobox/bentobox/listeners/flags/worldsettings/EnterExitListenerTest.java
@@ -87,7 +87,6 @@ public class EnterExitListenerTest {
private EnterExitListener listener;
/**
- * @throws java.lang.Exception
*/
@Before
public void setUp() throws Exception {
diff --git a/src/test/java/world/bentobox/bentobox/listeners/flags/worldsettings/InvincibleVisitorsListenerTest.java b/src/test/java/world/bentobox/bentobox/listeners/flags/worldsettings/InvincibleVisitorsListenerTest.java
index bf729df5b..3dff93414 100644
--- a/src/test/java/world/bentobox/bentobox/listeners/flags/worldsettings/InvincibleVisitorsListenerTest.java
+++ b/src/test/java/world/bentobox/bentobox/listeners/flags/worldsettings/InvincibleVisitorsListenerTest.java
@@ -86,7 +86,6 @@ public class InvincibleVisitorsListenerTest {
private World world;
/**
- * @throws java.lang.Exception
*/
@Before
public void setUp() throws Exception {
diff --git a/src/test/java/world/bentobox/bentobox/listeners/flags/worldsettings/IslandRespawnListenerTest.java b/src/test/java/world/bentobox/bentobox/listeners/flags/worldsettings/IslandRespawnListenerTest.java
index 4af405df3..54c805df4 100644
--- a/src/test/java/world/bentobox/bentobox/listeners/flags/worldsettings/IslandRespawnListenerTest.java
+++ b/src/test/java/world/bentobox/bentobox/listeners/flags/worldsettings/IslandRespawnListenerTest.java
@@ -67,7 +67,6 @@ public class IslandRespawnListenerTest {
private Server server;
/**
- * @throws java.lang.Exception
*/
@Before
public void setUp() throws Exception {
diff --git a/src/test/java/world/bentobox/bentobox/listeners/flags/worldsettings/OfflineGrowthListenerTest.java b/src/test/java/world/bentobox/bentobox/listeners/flags/worldsettings/OfflineGrowthListenerTest.java
index b4833d384..17e6f7a2b 100644
--- a/src/test/java/world/bentobox/bentobox/listeners/flags/worldsettings/OfflineGrowthListenerTest.java
+++ b/src/test/java/world/bentobox/bentobox/listeners/flags/worldsettings/OfflineGrowthListenerTest.java
@@ -195,7 +195,7 @@ public class OfflineGrowthListenerTest {
}
/**
- * Test method for {@link OfflineGrowthListener#onSpread(BlockSpreadEvent}.
+ * Test method for {@link OfflineGrowthListener#onSpread(BlockSpreadEvent)}.
*/
@Test
public void testOnSpreadDoNothing() {
@@ -209,7 +209,7 @@ public class OfflineGrowthListenerTest {
}
/**
- * Test method for {@link OfflineGrowthListener#onSpread(BlockSpreadEvent}.
+ * Test method for {@link OfflineGrowthListener#onSpread(BlockSpreadEvent)}.
*/
@Test
public void testOnSpreadMembersOnline() {
@@ -227,7 +227,7 @@ public class OfflineGrowthListenerTest {
}
/**
- * Test method for {@link OfflineGrowthListener#onSpread(BlockSpreadEvent}.
+ * Test method for {@link OfflineGrowthListener#onSpread(BlockSpreadEvent)}.
*/
@Test
public void testOnSpreadMembersOffline() {
@@ -255,7 +255,7 @@ public class OfflineGrowthListenerTest {
}
/**
- * Test method for {@link OfflineGrowthListener#onSpread(BlockSpreadEvent}.
+ * Test method for {@link OfflineGrowthListener#onSpread(BlockSpreadEvent)}.
*/
@Test
public void testOnSpreadMembersOfflineTree() {
@@ -274,7 +274,7 @@ public class OfflineGrowthListenerTest {
}
/**
- * Test method for {@link OfflineGrowthListener#onSpread(BlockSpreadEvent}.
+ * Test method for {@link OfflineGrowthListener#onSpread(BlockSpreadEvent)}.
*/
@Test
public void testOnSpreadNonIsland() {
@@ -289,7 +289,7 @@ public class OfflineGrowthListenerTest {
}
/**
- * Test method for {@link OfflineGrowthListener#onSpread(BlockSpreadEvent}.
+ * Test method for {@link OfflineGrowthListener#onSpread(BlockSpreadEvent)}.
*/
@Test
public void testOnSpreadNonBentoBoxWorldIsland() {
diff --git a/src/test/java/world/bentobox/bentobox/listeners/flags/worldsettings/OfflineRedstoneListenerTest.java b/src/test/java/world/bentobox/bentobox/listeners/flags/worldsettings/OfflineRedstoneListenerTest.java
index 52b9ef8f6..1624808de 100644
--- a/src/test/java/world/bentobox/bentobox/listeners/flags/worldsettings/OfflineRedstoneListenerTest.java
+++ b/src/test/java/world/bentobox/bentobox/listeners/flags/worldsettings/OfflineRedstoneListenerTest.java
@@ -107,11 +107,11 @@ public class OfflineRedstoneListenerTest {
PowerMockito.mockStatic(Bukkit.class);
// Online players
Set> result = c.tabComplete(user, "", Collections.singletonList("g"));
assertTrue(result.isPresent());
- result.ifPresent(list -> {
- assertEquals(1, list.size());
- });
+ result.ifPresent(list -> assertEquals(1, list.size()));
// Two names
result = c.tabComplete(user, "", Collections.singletonList("f"));
assertTrue(result.isPresent());
- result.ifPresent(list -> {
- assertEquals(2, list.size());
- });
+ result.ifPresent(list -> assertEquals(2, list.size()));
}
}
diff --git a/src/test/java/world/bentobox/bentobox/api/commands/admin/AdminInfoCommandTest.java b/src/test/java/world/bentobox/bentobox/api/commands/admin/AdminInfoCommandTest.java
index 2ea39b024..c9abe12c9 100644
--- a/src/test/java/world/bentobox/bentobox/api/commands/admin/AdminInfoCommandTest.java
+++ b/src/test/java/world/bentobox/bentobox/api/commands/admin/AdminInfoCommandTest.java
@@ -81,7 +81,6 @@ public class AdminInfoCommandTest {
private IslandWorldManager iwm;
/**
- * @throws java.lang.Exception
*/
@Before
public void setUp() throws Exception {
@@ -141,7 +140,6 @@ public class AdminInfoCommandTest {
}
/**
- * @throws java.lang.Exception
*/
@After
public void tearDown() {
diff --git a/src/test/java/world/bentobox/bentobox/api/commands/admin/AdminRegisterCommandTest.java b/src/test/java/world/bentobox/bentobox/api/commands/admin/AdminRegisterCommandTest.java
index bc25f8ebf..e1ac03ac6 100644
--- a/src/test/java/world/bentobox/bentobox/api/commands/admin/AdminRegisterCommandTest.java
+++ b/src/test/java/world/bentobox/bentobox/api/commands/admin/AdminRegisterCommandTest.java
@@ -68,7 +68,6 @@ public class AdminRegisterCommandTest {
private IslandDeletionManager idm;
/**
- * @throws java.lang.Exception
*/
@Before
public void setUp() throws Exception {
diff --git a/src/test/java/world/bentobox/bentobox/api/commands/admin/AdminResetFlagsCommandTest.java b/src/test/java/world/bentobox/bentobox/api/commands/admin/AdminResetFlagsCommandTest.java
index 4f5e64f4f..7e1260d6a 100644
--- a/src/test/java/world/bentobox/bentobox/api/commands/admin/AdminResetFlagsCommandTest.java
+++ b/src/test/java/world/bentobox/bentobox/api/commands/admin/AdminResetFlagsCommandTest.java
@@ -78,7 +78,6 @@ public class AdminResetFlagsCommandTest {
private @Nullable User user;
/**
- * @throws java.lang.Exception
*/
@Before
public void setUp() throws Exception {
@@ -140,7 +139,6 @@ public class AdminResetFlagsCommandTest {
}
/**
- * @throws java.lang.Exception
*/
@After
public void tearDown() {
diff --git a/src/test/java/world/bentobox/bentobox/api/commands/admin/AdminSetrankCommandTest.java b/src/test/java/world/bentobox/bentobox/api/commands/admin/AdminSetrankCommandTest.java
index 60f4d44ab..10a72c98b 100644
--- a/src/test/java/world/bentobox/bentobox/api/commands/admin/AdminSetrankCommandTest.java
+++ b/src/test/java/world/bentobox/bentobox/api/commands/admin/AdminSetrankCommandTest.java
@@ -63,7 +63,6 @@ public class AdminSetrankCommandTest {
private UUID targetUUID;
/**
- * @throws java.lang.Exception
*/
@Before
public void setUp() throws Exception {
@@ -106,7 +105,6 @@ public class AdminSetrankCommandTest {
}
/**
- * @throws java.lang.Exception
*/
@After
public void tearDown() {
diff --git a/src/test/java/world/bentobox/bentobox/api/commands/admin/AdminSetspawnCommandTest.java b/src/test/java/world/bentobox/bentobox/api/commands/admin/AdminSetspawnCommandTest.java
index 4e2aabed7..6829efb2e 100644
--- a/src/test/java/world/bentobox/bentobox/api/commands/admin/AdminSetspawnCommandTest.java
+++ b/src/test/java/world/bentobox/bentobox/api/commands/admin/AdminSetspawnCommandTest.java
@@ -52,7 +52,6 @@ public class AdminSetspawnCommandTest {
private IslandsManager im;
/**
- * @throws java.lang.Exception
*/
@Before
public void setUp() throws Exception {
diff --git a/src/test/java/world/bentobox/bentobox/api/commands/admin/AdminSettingsCommandTest.java b/src/test/java/world/bentobox/bentobox/api/commands/admin/AdminSettingsCommandTest.java
index 14f844015..91a48aa26 100644
--- a/src/test/java/world/bentobox/bentobox/api/commands/admin/AdminSettingsCommandTest.java
+++ b/src/test/java/world/bentobox/bentobox/api/commands/admin/AdminSettingsCommandTest.java
@@ -93,7 +93,6 @@ public class AdminSettingsCommandTest {
private PluginManager pluginManager;
/**
- * @throws java.lang.Exception
*/
@Before
public void setUp() throws Exception {
@@ -187,7 +186,6 @@ public class AdminSettingsCommandTest {
}
/**
- * @throws java.lang.Exception
*/
@After
public void tearDown() throws Exception {
diff --git a/src/test/java/world/bentobox/bentobox/api/commands/admin/AdminSwitchCommandTest.java b/src/test/java/world/bentobox/bentobox/api/commands/admin/AdminSwitchCommandTest.java
index 9aa60dcfe..86ea63f79 100644
--- a/src/test/java/world/bentobox/bentobox/api/commands/admin/AdminSwitchCommandTest.java
+++ b/src/test/java/world/bentobox/bentobox/api/commands/admin/AdminSwitchCommandTest.java
@@ -50,7 +50,6 @@ public class AdminSwitchCommandTest {
private UUID notUUID;
/**
- * @throws java.lang.Exception
*/
@Before
public void setUp() throws Exception {
@@ -85,7 +84,6 @@ public class AdminSwitchCommandTest {
}
/**
- * @throws java.lang.Exception
*/
@After
public void tearDown() throws Exception {
diff --git a/src/test/java/world/bentobox/bentobox/api/commands/admin/AdminTeleportCommandTest.java b/src/test/java/world/bentobox/bentobox/api/commands/admin/AdminTeleportCommandTest.java
index 9d692be09..5d0bb3a76 100644
--- a/src/test/java/world/bentobox/bentobox/api/commands/admin/AdminTeleportCommandTest.java
+++ b/src/test/java/world/bentobox/bentobox/api/commands/admin/AdminTeleportCommandTest.java
@@ -29,7 +29,6 @@ import org.junit.Test;
import org.junit.runner.RunWith;
import org.mockito.Mock;
import org.mockito.Mockito;
-import org.mockito.invocation.InvocationOnMock;
import org.mockito.stubbing.Answer;
import org.powermock.api.mockito.PowerMockito;
import org.powermock.core.classloader.annotations.PrepareForTest;
@@ -78,7 +77,6 @@ public class AdminTeleportCommandTest {
/**
- * @throws java.lang.Exception
*/
@Before
public void setUp() throws Exception {
@@ -142,12 +140,7 @@ public class AdminTeleportCommandTest {
when(lm.get(any(), any())).thenReturn("mock translation");
when(plugin.getLocalesManager()).thenReturn(lm);
- when(user.getTranslation(Mockito.anyString(),Mockito.anyString(), Mockito.anyString())).thenAnswer(new Answer
h = new MySQLDatabaseHandler
(plugin, List.class, dbConn);
+ MySQLDatabaseHandler
h = new MySQLDatabaseHandler<>(plugin, List.class, dbConn);
h.saveObject(Collections.singletonList("test"));
verify(plugin).logError(eq("This class is not a DataObject: java.util.Collections$SingletonList"));
}
/**
* Test method for {@link world.bentobox.bentobox.database.sql.mysql.MySQLDatabaseHandler#saveObject(java.lang.Object)}.
- * @throws SQLException
*/
@Test
@Ignore("Async cannot be tested")
@@ -328,7 +318,6 @@ public class MySQLDatabaseHandlerTest {
/**
* Test method for {@link world.bentobox.bentobox.database.sql.mysql.MySQLDatabaseHandler#saveObject(java.lang.Object)}.
- * @throws SQLException
*/
@Test
@Ignore("Async cannot be tested")
@@ -358,14 +347,13 @@ public class MySQLDatabaseHandlerTest {
@Ignore("After reworking to HikariCP, this does not work.")
public void testDeleteObjectIncorrectType() {
@SuppressWarnings("rawtypes")
- MySQLDatabaseHandler
h = new MySQLDatabaseHandler
(plugin, List.class, dbConn);
+ MySQLDatabaseHandler
h = new MySQLDatabaseHandler<>(plugin, List.class, dbConn);
h.deleteObject(Collections.singletonList("test"));
verify(plugin).logError(eq("This class is not a DataObject: java.util.Collections$SingletonList"));
}
/**
* Test method for {@link world.bentobox.bentobox.database.sql.mysql.MySQLDatabaseHandler#deleteObject(java.lang.Object)}.
- * @throws SQLException
*/
@Test
@Ignore("Async cannot be tested")
@@ -379,7 +367,6 @@ public class MySQLDatabaseHandlerTest {
/**
* Test method for {@link world.bentobox.bentobox.database.sql.mysql.MySQLDatabaseHandler#objectExists(java.lang.String)}.
- * @throws SQLException
*/
@Test
@Ignore("After reworking to HikariCP, this does not work.")
@@ -395,7 +382,6 @@ public class MySQLDatabaseHandlerTest {
/**
* Test method for {@link world.bentobox.bentobox.database.sql.mysql.MySQLDatabaseHandler#objectExists(java.lang.String)}.
- * @throws SQLException
*/
@Test
@Ignore("After reworking to HikariCP, this does not work.")
@@ -412,7 +398,6 @@ public class MySQLDatabaseHandlerTest {
/**
* Test method for {@link world.bentobox.bentobox.database.sql.mysql.MySQLDatabaseHandler#objectExists(java.lang.String)}.
- * @throws SQLException
*/
@Test
@Ignore("After reworking to HikariCP, this does not work.")
@@ -429,7 +414,6 @@ public class MySQLDatabaseHandlerTest {
/**
* Test method for {@link world.bentobox.bentobox.database.sql.mysql.MySQLDatabaseHandler#objectExists(java.lang.String)}.
- * @throws SQLException
*/
@Test
@Ignore
@@ -447,7 +431,6 @@ public class MySQLDatabaseHandlerTest {
/**
* Test method for {@link world.bentobox.bentobox.database.sql.mysql.MySQLDatabaseHandler#objectExists(java.lang.String)}.
- * @throws SQLException
*/
@Test
@Ignore("After reworking to HikariCP, this does not work.")
@@ -461,7 +444,6 @@ public class MySQLDatabaseHandlerTest {
/**
* Test method for {@link world.bentobox.bentobox.database.sql.mysql.MySQLDatabaseHandler#deleteID(java.lang.String)}.
- * @throws SQLException
*/
@Test
@Ignore("Cannot test async")
@@ -475,7 +457,6 @@ public class MySQLDatabaseHandlerTest {
/**
* Test method for {@link world.bentobox.bentobox.database.sql.mysql.MySQLDatabaseHandler#deleteID(java.lang.String)}.
- * @throws SQLException
*/
@Test
@Ignore("Cannot test async")
@@ -501,7 +482,6 @@ public class MySQLDatabaseHandlerTest {
/**
* Test method for {@link world.bentobox.bentobox.database.sql.mysql.MySQLDatabaseHandler#MySQLDatabaseHandler(world.bentobox.bentobox.BentoBox, java.lang.Class, world.bentobox.bentobox.database.DatabaseConnector)}.
- * @throws SQLException
*/
@Test
@Ignore("After reworking to HikariCP, this does not work.")
@@ -512,7 +492,6 @@ public class MySQLDatabaseHandlerTest {
/**
* Test method for {@link world.bentobox.bentobox.database.sql.mysql.MySQLDatabaseHandler#MySQLDatabaseHandler(world.bentobox.bentobox.BentoBox, java.lang.Class, world.bentobox.bentobox.database.DatabaseConnector)}.
- * @throws SQLException
*/
@Test
@Ignore
@@ -523,7 +502,6 @@ public class MySQLDatabaseHandlerTest {
}
/**
* Test method for {@link world.bentobox.bentobox.database.sql.mysql.MySQLDatabaseHandler#MySQLDatabaseHandler(world.bentobox.bentobox.BentoBox, java.lang.Class, world.bentobox.bentobox.database.DatabaseConnector)}.
- * @throws SQLException
*/
@Test
@Ignore("After reworking to HikariCP, this does not work.")
diff --git a/src/test/java/world/bentobox/bentobox/database/yaml/YamlDatabaseHandlerTest.java b/src/test/java/world/bentobox/bentobox/database/yaml/YamlDatabaseHandlerTest.java
index 6ed819ede..d86a05a90 100644
--- a/src/test/java/world/bentobox/bentobox/database/yaml/YamlDatabaseHandlerTest.java
+++ b/src/test/java/world/bentobox/bentobox/database/yaml/YamlDatabaseHandlerTest.java
@@ -81,7 +81,6 @@ public class YamlDatabaseHandlerTest {
/**
- * @throws java.lang.Exception
*/
@Before
public void setUp() throws Exception {
@@ -122,11 +121,10 @@ public class YamlDatabaseHandlerTest {
config2.save(record2);
// Handler
- handler = new YamlDatabaseHandler