diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index 4191081bb..dff7a8f18 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -13,11 +13,11 @@ jobs: - uses: actions/checkout@v3 with: fetch-depth: 0 # Shallow clones should be disabled for a better relevancy of analysis - - name: Set up JDK 17 + - name: Set up JDK 21 uses: actions/setup-java@v3 with: distribution: 'adopt' - java-version: '17' + java-version: '21' - name: Cache SonarCloud packages uses: actions/cache@v3 with: diff --git a/README.md b/README.md index 8989d0508..7cea761ef 100644 --- a/README.md +++ b/README.md @@ -2,7 +2,6 @@ [![Discord](https://img.shields.io/discord/272499714048524288.svg?logo=discord)](https://discord.bentobox.world) [![Build Status](https://ci.codemc.org/buildStatus/icon?job=BentoBoxWorld/BentoBox)](https://ci.codemc.org/job/BentoBoxWorld/job/BentoBox/) -[![Lines of Code](https://sonarcloud.io/api/project_badges/measure?project=BentoBoxWorld_BentoBox&metric=ncloc)](https://sonarcloud.io/dashboard?id=BentoBoxWorld_BentoBox) [![Maintainability Rating](https://sonarcloud.io/api/project_badges/measure?project=BentoBoxWorld_BentoBox&metric=sqale_rating)](https://sonarcloud.io/dashboard?id=BentoBoxWorld_BentoBox) [![Reliability Rating](https://sonarcloud.io/api/project_badges/measure?project=BentoBoxWorld_BentoBox&metric=reliability_rating)](https://sonarcloud.io/dashboard?id=BentoBoxWorld_BentoBox) [![Security Rating](https://sonarcloud.io/api/project_badges/measure?project=BentoBoxWorld_BentoBox&metric=security_rating)](https://sonarcloud.io/dashboard?id=BentoBoxWorld_BentoBox) @@ -112,9 +111,10 @@ repositories { } dependencies { - compileOnly 'world.bentobox:bentobox:PUT-VERSION-HERE' + compileOnly 'world.bentobox:bentobox:PUT-VERSION-HERE-SNAPSHOT' } ``` +**Note:** Due to a Gradle issue with versions for Maven, you need to use -SNAPSHOT at the end. ### History diff --git a/pom.xml b/pom.xml index 8aa65b84f..6efe8b389 100644 --- a/pom.xml +++ b/pom.xml @@ -73,10 +73,10 @@ 42.2.18 5.0.1 - 1.20.4-R0.1-SNAPSHOT + 1.20.5-R0.1-SNAPSHOT - 1.20.4-R0.1-SNAPSHOT + 1.20.6-R0.1-SNAPSHOT 3.0.0 1.7.1 2.10.9 @@ -88,7 +88,7 @@ -LOCAL - 2.3.0 + 2.4.0 bentobox-world https://sonarcloud.io ${project.basedir}/lib @@ -145,6 +145,10 @@ + + jitpack.io + https://jitpack.io + spigot-repo https://hub.spigotmc.org/nexus/content/repositories/snapshots @@ -153,10 +157,6 @@ codemc-repo https://repo.codemc.org/repository/maven-public - - jitpack.io - https://jitpack.io - placeholderapi-repo https://repo.extendedclip.com/content/repositories/placeholderapi/ @@ -195,6 +195,11 @@ Lumine Releases https://mvn.lumine.io/repository/maven-public/ + + + clojars + https://repo.clojars.org/ + @@ -223,13 +228,25 @@ 3.11.1 test - + org.spigotmc spigot-api ${spigot.version} provided + + org.spigotmc..... + spigot + 1.21-R0.1-SNAPSHOT + provided + + + org.spigotmc.... + spigot + 1.20.6-R0.1-SNAPSHOT + provided + org.spigotmc. spigot @@ -354,16 +371,23 @@ com.github.Slimefun Slimefun4 - RC-36 + RC-37 provided com.github.LoneDev6 api-itemsadder - 3.6.1 + 3.6.3-beta-14 provided + + + com.github.puregero + multilib + 1.1.13 + compile + @@ -486,9 +510,10 @@ org.apache.maven.plugins maven-shade-plugin - 3.3.1-SNAPSHOT + 3.4.0 true + ${project.build.directory}/dependency-reduced-pom.xml org.bstats @@ -500,9 +525,13 @@ io.papermc.lib - world.bentobox.bentobox.paperlib + world.bentobox.bentobox.paperlib - + + com.github.puregero.multilib + world.bentobox.bentobox.multilib + + org.apache.maven.shared:* diff --git a/src/main/java/world/bentobox/bentobox/BStats.java b/src/main/java/world/bentobox/bentobox/BStats.java index aedf7c83a..12efe7865 100644 --- a/src/main/java/world/bentobox/bentobox/BStats.java +++ b/src/main/java/world/bentobox/bentobox/BStats.java @@ -11,10 +11,8 @@ import org.bstats.charts.AdvancedPie; import org.bstats.charts.SimpleBarChart; import org.bstats.charts.SimplePie; import org.bstats.charts.SingleLineChart; -import org.bukkit.Bukkit; import world.bentobox.bentobox.api.addons.GameModeAddon; -import world.bentobox.bentobox.api.flags.Flag; /** * @author Poslovitch @@ -59,7 +57,6 @@ public class BStats { registerGameModeAddonsChart(); registerHooksChart(); registerPlayersPerServerChart(); - registerFlagsDisplayModeChart(); // Single Line charts registerIslandsCountChart(); @@ -171,27 +168,6 @@ public class BStats { })); } - /** - * Sends the "flags display mode" of all the online players. - * @since 1.6.0 - */ - private void registerFlagsDisplayModeChart() { - metrics.addCustomChart(new AdvancedPie("flagsDisplayMode", () -> { - Map values = new HashMap<>(); - - Bukkit.getOnlinePlayers().forEach(player -> { - Flag.Mode mode = plugin.getPlayers().getFlagsDisplayMode(player.getUniqueId()); - if (values.containsKey(mode.name())) { - values.put(mode.name(), values.get(mode.name()) + 1); - } else { - values.put(mode.name(), 1); - } - }); - - return values; - })); - } - /** * Sends the enabled addons (except GameModeAddons) of this server as bar chart. * @since 1.17.1 diff --git a/src/main/java/world/bentobox/bentobox/BentoBox.java b/src/main/java/world/bentobox/bentobox/BentoBox.java index 235d37ef6..75a7c07a8 100644 --- a/src/main/java/world/bentobox/bentobox/BentoBox.java +++ b/src/main/java/world/bentobox/bentobox/BentoBox.java @@ -25,6 +25,7 @@ import world.bentobox.bentobox.api.user.User; import world.bentobox.bentobox.commands.BentoBoxCommand; import world.bentobox.bentobox.database.DatabaseSetup; import world.bentobox.bentobox.hooks.ItemsAdderHook; +import world.bentobox.bentobox.hooks.MultipaperHook; import world.bentobox.bentobox.hooks.MultiverseCoreHook; import world.bentobox.bentobox.hooks.MyWorldsHook; import world.bentobox.bentobox.hooks.MythicMobsHook; @@ -37,6 +38,7 @@ import world.bentobox.bentobox.listeners.DeathListener; import world.bentobox.bentobox.listeners.JoinLeaveListener; import world.bentobox.bentobox.listeners.PanelListenerManager; import world.bentobox.bentobox.listeners.PrimaryIslandListener; +import world.bentobox.bentobox.listeners.SeedWorldMakerListener; import world.bentobox.bentobox.listeners.StandardSpawnProtectionListener; import world.bentobox.bentobox.listeners.teleports.EntityTeleportListener; import world.bentobox.bentobox.listeners.teleports.PlayerTeleportListener; @@ -102,6 +104,8 @@ public class BentoBox extends JavaPlugin implements Listener { @Override public void onEnable(){ + setInstance(this); + if (!ServerCompatibility.getInstance().checkCompatibility().isCanLaunch()) { // The server's most likely incompatible. // Show a warning @@ -123,7 +127,6 @@ public class BentoBox extends JavaPlugin implements Listener { // Save the default config from config.yml saveDefaultConfig(); - setInstance(this); // Load Flags flagsManager = new FlagsManager(this); @@ -184,6 +187,9 @@ public class BentoBox extends JavaPlugin implements Listener { private void completeSetup(long loadTime) { final long enableStart = System.currentTimeMillis(); + + hooksManager.registerHook(new MultipaperHook()); + hooksManager.registerHook(new VaultHook()); // MythicMobs @@ -210,20 +216,6 @@ public class BentoBox extends JavaPlugin implements Listener { return; } - // Save islands & players data every X minutes - Bukkit.getScheduler().runTaskTimer(instance, () -> { - if (!playersManager.isSaveTaskRunning()) { - playersManager.saveAll(true); - } else { - getLogger().warning("Tried to start a player data save task while the previous auto save was still running!"); - } - if (!islandsManager.isSaveTaskRunning()) { - islandsManager.saveAll(true); - } else { - getLogger().warning("Tried to start a island data save task while the previous auto save was still running!"); - } - }, getSettings().getDatabaseBackupPeriod() * 20 * 60L, getSettings().getDatabaseBackupPeriod() * 20 * 60L); - // Make sure all flag listeners are registered. flagsManager.registerListeners(); @@ -323,6 +315,8 @@ public class BentoBox extends JavaPlugin implements Listener { manager.registerEvents(islandDeletionManager, this); // Primary Island Listener manager.registerEvents(new PrimaryIslandListener(this), this); + // Seed world chunk generator + manager.registerEvents(new SeedWorldMakerListener(this), this); } @Override @@ -433,7 +427,7 @@ public class BentoBox extends JavaPlugin implements Listener { * @return the ranksManager * @deprecated Just use {@code RanksManager.getInstance()} */ - @Deprecated(since = "2.0.0") + @Deprecated(since = "2.0.0", forRemoval = true) public RanksManager getRanksManager() { return RanksManager.getInstance(); } diff --git a/src/main/java/world/bentobox/bentobox/api/addons/Addon.java b/src/main/java/world/bentobox/bentobox/api/addons/Addon.java index 57190b7d9..c4807715e 100644 --- a/src/main/java/world/bentobox/bentobox/api/addons/Addon.java +++ b/src/main/java/world/bentobox/bentobox/api/addons/Addon.java @@ -21,11 +21,14 @@ import org.bukkit.configuration.file.FileConfiguration; import org.bukkit.configuration.file.YamlConfiguration; import org.bukkit.event.Listener; +import com.github.puregero.multilib.MultiLib; + import world.bentobox.bentobox.BentoBox; import world.bentobox.bentobox.api.addons.request.AddonRequestHandler; import world.bentobox.bentobox.api.flags.Flag; import world.bentobox.bentobox.managers.IslandsManager; import world.bentobox.bentobox.managers.PlayersManager; +import world.bentobox.bentobox.util.Util; /** * Add-on class for BentoBox. Extend this to create an add-on. The operation @@ -45,6 +48,10 @@ public abstract class Addon { protected Addon() { state = State.DISABLED; + if (!Util.inTest()) { + // If the config is updated, update the config. + MultiLib.onString(getPlugin(), "bentobox-config-update", v -> this.reloadConfig()); + } } /** @@ -275,7 +282,7 @@ public abstract class Addon { } // There are two options, use the path of the resource or not File outFile = new File(destinationFolder, - jarResource.replaceAll("/", Matcher.quoteReplacement(File.separator))); + jarResource.replaceAll("/", Matcher.quoteReplacement(File.separator))); if (noPath) { outFile = new File(destinationFolder, outFile.getName()); @@ -396,7 +403,7 @@ public abstract class Addon { public IslandsManager getIslands() { return getPlugin().getIslands(); } - + /** * Get Islands Manager * @return Islands manager diff --git a/src/main/java/world/bentobox/bentobox/api/addons/GameModeAddon.java b/src/main/java/world/bentobox/bentobox/api/addons/GameModeAddon.java index a45b12d68..79c3fa016 100644 --- a/src/main/java/world/bentobox/bentobox/api/addons/GameModeAddon.java +++ b/src/main/java/world/bentobox/bentobox/api/addons/GameModeAddon.java @@ -8,6 +8,8 @@ import org.bukkit.generator.ChunkGenerator; import org.eclipse.jdt.annotation.NonNull; import org.eclipse.jdt.annotation.Nullable; +import com.github.puregero.multilib.MultiLib; + import world.bentobox.bentobox.api.commands.CompositeCommand; import world.bentobox.bentobox.api.configuration.WorldSettings; import world.bentobox.bentobox.util.Util; @@ -129,7 +131,10 @@ public abstract class GameModeAddon extends Addon { * in-game and need to be saved. * @since 1.4.0 */ - public abstract void saveWorldSettings(); + public void saveWorldSettings() { + // Inform other servers + MultiLib.notify("bentobox-config-update", ""); + } /** * Defines if the game mode uses the latest {@link ChunkGenerator} API or diff --git a/src/main/java/world/bentobox/bentobox/api/addons/Pladdon.java b/src/main/java/world/bentobox/bentobox/api/addons/Pladdon.java index 55d0e2d49..af11005db 100644 --- a/src/main/java/world/bentobox/bentobox/api/addons/Pladdon.java +++ b/src/main/java/world/bentobox/bentobox/api/addons/Pladdon.java @@ -28,7 +28,7 @@ public abstract class Pladdon extends JavaPlugin { String parentFolder = getFile().getParent(); if (parentFolder == null || !parentFolder.endsWith(ADDONS_FOLDER)) { // Jar is in the wrong place. Let's move it - moveJar(); + //moveJar(); } } diff --git a/src/main/java/world/bentobox/bentobox/api/commands/CompositeCommand.java b/src/main/java/world/bentobox/bentobox/api/commands/CompositeCommand.java index 57081bac1..383f5bab2 100644 --- a/src/main/java/world/bentobox/bentobox/api/commands/CompositeCommand.java +++ b/src/main/java/world/bentobox/bentobox/api/commands/CompositeCommand.java @@ -520,11 +520,11 @@ public abstract class CompositeCommand extends Command implements PluginIdentifi /** * Convenience method to check if a user has a team. + * Consider checking the island itself {@link Island#inTeam(UUID)} * * @param world - the world to check * @param user - the User * @return true if player is in a team - * @see Consider checking the island itself {@link Island#inTeam(UUID)} */ protected boolean inTeam(World world, User user) { return plugin.getIslands().inTeam(world, user.getUniqueId()); diff --git a/src/main/java/world/bentobox/bentobox/api/commands/admin/AdminDeleteCommand.java b/src/main/java/world/bentobox/bentobox/api/commands/admin/AdminDeleteCommand.java index 1c3a4c652..2ea7e5ded 100644 --- a/src/main/java/world/bentobox/bentobox/api/commands/admin/AdminDeleteCommand.java +++ b/src/main/java/world/bentobox/bentobox/api/commands/admin/AdminDeleteCommand.java @@ -1,10 +1,14 @@ package world.bentobox.bentobox.api.commands.admin; import java.util.ArrayList; +import java.util.HashMap; import java.util.List; +import java.util.Map; import java.util.Optional; import java.util.UUID; +import org.eclipse.jdt.annotation.Nullable; + import world.bentobox.bentobox.api.commands.CompositeCommand; import world.bentobox.bentobox.api.commands.ConfirmableCommand; import world.bentobox.bentobox.api.events.island.IslandEvent; @@ -16,6 +20,9 @@ import world.bentobox.bentobox.util.Util; public class AdminDeleteCommand extends ConfirmableCommand { + private @Nullable UUID targetUUID; + private Island island; + public AdminDeleteCommand(CompositeCommand parent) { super(parent, "delete"); } @@ -29,56 +36,93 @@ public class AdminDeleteCommand extends ConfirmableCommand { @Override public boolean canExecute(User user, String label, List args) { - if (args.size() != 1) { - showHelp(this, user); + if (args.isEmpty()) { + this.showHelp(this, user); return false; } - // Get target - UUID targetUUID = Util.getUUID(args.get(0)); + // Convert name to a UUID + targetUUID = Util.getUUID(args.get(0)); if (targetUUID == null) { user.sendMessage("general.errors.unknown-player", TextVariables.NAME, args.get(0)); return false; } - Island island = getIslands().getIsland(getWorld(), user); - if (island == null) { + // Check island exists + if (!getIslands().hasIsland(getWorld(), targetUUID) && !getIslands().inTeam(getWorld(), targetUUID)) { user.sendMessage("general.errors.player-has-no-island"); return false; } + if (args.size() == 1) { + // Check if player is owner of any islands + if (getIslands().getIslands(getWorld(), targetUUID).stream().filter(Island::hasTeam) + .anyMatch(is -> targetUUID.equals(is.getOwner()))) { + user.sendMessage("commands.admin.delete.cannot-delete-owner"); + return false; + } + // This is a delete everything request + return true; + } + + // Get the island + User target = User.getInstance(targetUUID); + // They named the island to go to + Map names = getNameIslandMap(target); + final String name = String.join(" ", args.subList(1, args.size())); + if (!names.containsKey(name)) { + // Failed home name check + user.sendMessage("commands.island.go.unknown-home"); + user.sendMessage("commands.island.sethome.homes-are"); + names.keySet() + .forEach(n -> user.sendMessage("commands.island.sethome.home-list-syntax", TextVariables.NAME, n)); + return false; + } else { + IslandInfo info = names.get(name); + island = info.island; + } + // Team members should be kicked before deleting otherwise the whole team will become weird - if (island.hasTeam() && user.getUniqueId().equals(island.getOwner())) { + if (island.hasTeam() && targetUUID.equals(island.getOwner())) { user.sendMessage("commands.admin.delete.cannot-delete-owner"); return false; } + if (names.size() == 1) { + // This is the only island they have so, no need to specify it + island = null; + } return true; } @Override public boolean execute(User user, String label, List args) { - // Get target - UUID targetUUID = getPlayers().getUUID(args.get(0)); // Confirm - askConfirmation(user, () -> deletePlayer(user, targetUUID)); + if (island == null) { + // Delete the player entirely + askConfirmation(user, () -> deletePlayer(user)); + } else { + // Just delete the player's island + askConfirmation(user, () -> deleteIsland(user, island)); + } return true; } - private void deletePlayer(User user, UUID targetUUID) { + private void deleteIsland(User user, Island oldIsland) { + // Fire island preclear event + IslandEvent.builder().involvedPlayer(user.getUniqueId()).reason(Reason.PRECLEAR).island(oldIsland) + .oldIsland(oldIsland).location(oldIsland.getCenter()).build(); + user.sendMessage("commands.admin.delete.deleted-island", TextVariables.XYZ, + Util.xyz(oldIsland.getCenter().toVector())); + getIslands().deleteIsland(oldIsland, true, targetUUID); + + } + + private void deletePlayer(User user) { // Delete player and island for (Island oldIsland : getIslands().getIslands(getWorld(), targetUUID)) { - // Fire island preclear event - IslandEvent.builder() - .involvedPlayer(user.getUniqueId()) - .reason(Reason.PRECLEAR) - .island(oldIsland) - .oldIsland(oldIsland) - .location(oldIsland.getCenter()) - .build(); - user.sendMessage("commands.admin.delete.deleted-island", TextVariables.XYZ, Util.xyz(oldIsland.getCenter().toVector())); - getIslands().deleteIsland(oldIsland, true, targetUUID); + deleteIsland(user, oldIsland); } // Check if player is online and on the island User target = User.getInstance(targetUUID); - // Remove them from this island (it still exists and will be deleted later) + // Remove target from any and all islands in the world getIslands().removePlayer(getWorld(), targetUUID); if (target.isPlayer() && target.isOnline()) { cleanUp(target); @@ -120,6 +164,31 @@ public class AdminDeleteCommand extends ConfirmableCommand { Util.runCommands(target, target.getName(), getIWM().getOnLeaveCommands(getWorld()), "leave"); } + private record IslandInfo(Island island, boolean islandName) { + } + + private Map getNameIslandMap(User target) { + Map islandMap = new HashMap<>(); + int index = 0; + for (Island island : getIslands().getIslands(getWorld(), target.getUniqueId())) { + index++; + if (island.getName() != null && !island.getName().isBlank()) { + // Name has been set + islandMap.put(island.getName(), new IslandInfo(island, true)); + } else { + // Name has not been set + String text = target.getTranslation("protection.flags.ENTER_EXIT_MESSAGES.island", TextVariables.NAME, + target.getName(), TextVariables.DISPLAY_NAME, target.getDisplayName()) + " " + index; + islandMap.put(text, new IslandInfo(island, true)); + } + // Add homes. Homes do not need an island specified + island.getHomes().keySet().forEach(n -> islandMap.put(n, new IslandInfo(island, false))); + } + + return islandMap; + + } + @Override public Optional> tabComplete(User user, String alias, List args) { String lastArg = !args.isEmpty() ? args.get(args.size()-1) : ""; @@ -127,7 +196,16 @@ public class AdminDeleteCommand extends ConfirmableCommand { // Don't show every player on the server. Require at least the first letter return Optional.empty(); } - List options = new ArrayList<>(Util.getOnlinePlayerList(user)); - return Optional.of(Util.tabLimit(options, lastArg)); + if (args.size() == 2) { + return Optional.of(Util.tabLimit(new ArrayList<>(Util.getOnlinePlayerList(user)), lastArg)); + } + if (args.size() == 3) { + UUID target = Util.getUUID(args.get(1)); + return target == null ? Optional.empty() + : Optional.of(Util.tabLimit(new ArrayList<>(getNameIslandMap(User.getInstance(target)).keySet()), + lastArg)); + } + return Optional.empty(); } + } diff --git a/src/main/java/world/bentobox/bentobox/api/commands/admin/AdminEmptyTrashCommand.java b/src/main/java/world/bentobox/bentobox/api/commands/admin/AdminEmptyTrashCommand.java deleted file mode 100644 index f5c8970ff..000000000 --- a/src/main/java/world/bentobox/bentobox/api/commands/admin/AdminEmptyTrashCommand.java +++ /dev/null @@ -1,61 +0,0 @@ -package world.bentobox.bentobox.api.commands.admin; - -import java.util.List; -import java.util.UUID; - -import world.bentobox.bentobox.api.commands.CompositeCommand; -import world.bentobox.bentobox.api.commands.ConfirmableCommand; -import world.bentobox.bentobox.api.localization.TextVariables; -import world.bentobox.bentobox.api.user.User; -import world.bentobox.bentobox.database.objects.Island; - -public class AdminEmptyTrashCommand extends ConfirmableCommand { - - /** - * Clear trash for player, or all unowned islands in trash - * @param parent - admin command - * @since 1.3.0 - */ - public AdminEmptyTrashCommand(CompositeCommand parent) { - super(parent, "emptytrash"); - } - - @Override - public void setup() { - setPermission("admin.trash"); - setOnlyPlayer(false); - setParametersHelp("commands.admin.emptytrash.parameters"); - setDescription("commands.admin.emptytrash.description"); - } - - @Override - public boolean execute(User user, String label, List args) { - if (args.size() > 1) { - // Show help - showHelp(this, user); - return false; - } - // Get target player - UUID targetUUID = args.isEmpty() ? null : getPlayers().getUUID(args.get(0)); - if (!args.isEmpty() && targetUUID == null) { - user.sendMessage("general.errors.unknown-player", TextVariables.NAME, args.get(0)); - return false; - } - // Remove trash for this player - final List islands = getIslands().getQuarantinedIslandByUser(getWorld(), targetUUID); - if (islands.isEmpty()) { - if (args.isEmpty()) { - user.sendMessage("commands.admin.trash.no-unowned-in-trash"); - } else { - user.sendMessage("commands.admin.trash.no-islands-in-trash"); - } - return false; - } else { - this.askConfirmation(user, () -> { - getIslands().deleteQuarantinedIslandByUser(getWorld(), targetUUID); - user.sendMessage("commands.admin.emptytrash.success"); - }); - return true; - } - } -} diff --git a/src/main/java/world/bentobox/bentobox/api/commands/admin/AdminInfoCommand.java b/src/main/java/world/bentobox/bentobox/api/commands/admin/AdminInfoCommand.java index ca3281996..dfb6eaf96 100644 --- a/src/main/java/world/bentobox/bentobox/api/commands/admin/AdminInfoCommand.java +++ b/src/main/java/world/bentobox/bentobox/api/commands/admin/AdminInfoCommand.java @@ -49,9 +49,6 @@ public class AdminInfoCommand extends CompositeCommand { Island island = getIslands().getIsland(getWorld(), targetUUID); if (island != null) { new IslandInfo(island).showAdminInfo(user, getAddon()); - if (!getIslands().getQuarantinedIslandByUser(getWorld(), targetUUID).isEmpty()) { - user.sendMessage("commands.admin.info.islands-in-trash"); - } return true; } else { user.sendMessage("general.errors.player-has-no-island"); diff --git a/src/main/java/world/bentobox/bentobox/api/commands/admin/AdminSettingsCommand.java b/src/main/java/world/bentobox/bentobox/api/commands/admin/AdminSettingsCommand.java index 177d85657..f7fafe800 100644 --- a/src/main/java/world/bentobox/bentobox/api/commands/admin/AdminSettingsCommand.java +++ b/src/main/java/world/bentobox/bentobox/api/commands/admin/AdminSettingsCommand.java @@ -16,7 +16,6 @@ import org.eclipse.jdt.annotation.Nullable; import world.bentobox.bentobox.api.addons.GameModeAddon; import world.bentobox.bentobox.api.commands.CompositeCommand; import world.bentobox.bentobox.api.flags.Flag; -import world.bentobox.bentobox.api.flags.Flag.Mode; import world.bentobox.bentobox.api.flags.Flag.Type; import world.bentobox.bentobox.api.localization.TextVariables; import world.bentobox.bentobox.api.panels.builders.TabbedPanelBuilder; @@ -206,11 +205,9 @@ public class AdminSettingsCommand extends CompositeCommand { switch (f.getType()) { case PROTECTION -> { island.setFlag(f, rank); - getIslands().save(island); } case SETTING -> { island.setSettingsFlag(f, activeState); - getIslands().save(island); } case WORLD_SETTING -> f.setSetting(getWorld(), activeState); default -> { @@ -226,12 +223,11 @@ public class AdminSettingsCommand extends CompositeCommand { user.sendMessage("general.errors.use-in-game"); return false; } - getPlayers().setFlagsDisplayMode(user.getUniqueId(), Mode.EXPERT); if (args.isEmpty()) { new TabbedPanelBuilder() .user(user) .world(getWorld()) - .tab(1, new SettingsTab(getWorld(), user, Flag.Type.WORLD_SETTING)) + .tab(1, new SettingsTab(getWorld(), user, Flag.Type.WORLD_SETTING, Flag.Mode.EXPERT)) .tab(2, new WorldDefaultSettingsTab(getWorld(), user)) .startingSlot(1) .size(54) @@ -242,8 +238,8 @@ public class AdminSettingsCommand extends CompositeCommand { new TabbedPanelBuilder() .user(user) .world(island.getWorld()) - .island(island).tab(1, new SettingsTab(user, Flag.Type.PROTECTION)) - .tab(2, new SettingsTab(user, Flag.Type.SETTING)) + .island(island).tab(1, new SettingsTab(getWorld(), user, Flag.Type.PROTECTION, Flag.Mode.EXPERT)) + .tab(2, new SettingsTab(getWorld(), user, Flag.Type.SETTING, Flag.Mode.EXPERT)) .startingSlot(1) .size(54) .build().openPanel(); diff --git a/src/main/java/world/bentobox/bentobox/api/commands/admin/AdminSwitchtoCommand.java b/src/main/java/world/bentobox/bentobox/api/commands/admin/AdminSwitchtoCommand.java deleted file mode 100644 index 3bb91c4c4..000000000 --- a/src/main/java/world/bentobox/bentobox/api/commands/admin/AdminSwitchtoCommand.java +++ /dev/null @@ -1,87 +0,0 @@ -package world.bentobox.bentobox.api.commands.admin; - -import java.util.ArrayList; -import java.util.List; -import java.util.UUID; - -import org.apache.commons.lang.math.NumberUtils; -import org.eclipse.jdt.annotation.NonNull; - -import world.bentobox.bentobox.api.commands.CompositeCommand; -import world.bentobox.bentobox.api.commands.ConfirmableCommand; -import world.bentobox.bentobox.api.localization.TextVariables; -import world.bentobox.bentobox.api.user.User; -import world.bentobox.bentobox.database.objects.Island; -import world.bentobox.bentobox.util.Util; - -public class AdminSwitchtoCommand extends ConfirmableCommand { - - private UUID targetUUID; - private @NonNull List islands; - - /** - * Switch player's island to the numbered one in trash - * @param parent - admin command - * @since 1.3.0 - */ - public AdminSwitchtoCommand(CompositeCommand parent) { - super(parent, "switchto"); - islands = new ArrayList<>(); - } - - @Override - public void setup() { - setPermission("admin.switchto"); - setOnlyPlayer(false); - setParametersHelp("commands.admin.switchto.parameters"); - setDescription("commands.admin.switchto.description"); - } - - @Override - public boolean canExecute(User user, String label, List args) { - if (args.size() != 2) { - // Show help - showHelp(this, user); - return false; - } - // Get target player - targetUUID = Util.getUUID(args.get(0)); - if (targetUUID == null) { - user.sendMessage("general.errors.unknown-player", TextVariables.NAME, args.get(0)); - return false; - } - // Check island number - islands = getIslands().getQuarantinedIslandByUser(getWorld(), targetUUID); - if (islands.isEmpty()) { - user.sendMessage("commands.admin.trash.no-islands-in-trash"); - return false; - } - return true; - } - - @Override - public boolean execute(User user, String label, List args) { - if (NumberUtils.isDigits(args.get(1))) { - try { - int n = Integer.parseInt(args.get(1)); - if (n < 1 || n > islands.size()) { - user.sendMessage("commands.admin.switchto.out-of-range", TextVariables.NUMBER, String.valueOf(islands.size()), TextVariables.LABEL, getTopLabel()); - return false; - } - this.askConfirmation(user, () -> { - if (getIslands().switchIsland(getWorld(), targetUUID, islands.get(n -1))) { - user.sendMessage("commands.admin.switchto.success"); - } else { - user.sendMessage("commands.admin.switchto.cannot-switch"); - } - }); - return true; - } catch (Exception e) { - showHelp(this, user); - return false; - } - } - return true; - } - -} diff --git a/src/main/java/world/bentobox/bentobox/api/commands/admin/AdminTeleportCommand.java b/src/main/java/world/bentobox/bentobox/api/commands/admin/AdminTeleportCommand.java index 74dfe764e..162f6f222 100644 --- a/src/main/java/world/bentobox/bentobox/api/commands/admin/AdminTeleportCommand.java +++ b/src/main/java/world/bentobox/bentobox/api/commands/admin/AdminTeleportCommand.java @@ -1,7 +1,10 @@ package world.bentobox.bentobox.api.commands.admin; import java.util.ArrayList; +import java.util.HashMap; import java.util.List; +import java.util.Map; +import java.util.Objects; import java.util.Optional; import java.util.UUID; @@ -17,11 +20,17 @@ import world.bentobox.bentobox.database.objects.Island; import world.bentobox.bentobox.util.Util; import world.bentobox.bentobox.util.teleport.SafeSpotTeleport; +/** + * Enables admins to teleport to a player's island, nether or end islands, + * + * For example /acid tp tastybento [island name] would teleport to tastybento's [named] island + * + */ public class AdminTeleportCommand extends CompositeCommand { private static final String NOT_SAFE = "general.errors.no-safe-location-found"; private @Nullable UUID targetUUID; - private @Nullable User userToTeleport; + private Location warpSpot; /** * @param parent - parent command @@ -37,16 +46,17 @@ public class AdminTeleportCommand extends CompositeCommand { setPermission("admin.tp"); setParametersHelp("commands.admin.tp.parameters"); setDescription("commands.admin.tp.description"); + this.setOnlyPlayer(true); } @Override public boolean canExecute(User user, String label, List args) { - if (args.size() != 1 && args.size() != 2) { + if (args.isEmpty()) { this.showHelp(this, user); return false; } // Check for console or not - if (!user.isPlayer() && args.size() != 2) { + if (!user.isPlayer()) { user.sendMessage("general.errors.use-in-game"); return false; } @@ -62,25 +72,6 @@ public class AdminTeleportCommand extends CompositeCommand { return false; } - if (args.size() == 2) { - // We are trying to teleport another player - UUID playerToTeleportUUID = Util.getUUID(args.get(1)); - if (playerToTeleportUUID == null) { - user.sendMessage("general.errors.unknown-player", TextVariables.NAME, args.get(1)); - return false; - } else { - userToTeleport = User.getInstance(playerToTeleportUUID); - if (!userToTeleport.isOnline()) { - user.sendMessage("general.errors.offline-player"); - return false; - } - } - } - return true; - } - - @Override - public boolean execute(User user, String label, List args) { World world = getWorld(); if (getLabel().equals("tpnether")) { world = getPlugin().getIWM().getNetherWorld(getWorld()); @@ -91,19 +82,46 @@ public class AdminTeleportCommand extends CompositeCommand { user.sendMessage(NOT_SAFE); return false; } - Location warpSpot = getSpot(world); + // Get default location if there are no arguments + warpSpot = getSpot(world); if (warpSpot == null) { user.sendMessage(NOT_SAFE); return false; } + if (args.size() == 1) { + return true; + } + // They named the island to go to + Map names = getNameIslandMap(User.getInstance(targetUUID)); + final String name = String.join(" ", args.subList(1, args.size())); + if (!names.containsKey(name)) { + // Failed home name check + user.sendMessage("commands.island.go.unknown-home"); + user.sendMessage("commands.island.sethome.homes-are"); + names.keySet() + .forEach(n -> user.sendMessage("commands.island.sethome.home-list-syntax", TextVariables.NAME, n)); + return false; + } else if (names.size() > 1) { + IslandInfo info = names.get(name); + Island island = info.island; + warpSpot = island.getSpawnPoint(world.getEnvironment()) != null + ? island.getSpawnPoint(world.getEnvironment()) + : island.getProtectionCenter().toVector().toLocation(world); + } + return true; + } + + @Override + public boolean execute(User user, String label, List args) { + Objects.requireNonNull(warpSpot); // Otherwise, ask the admin to go to a safe spot String failureMessage = user.getTranslation("commands.admin.tp.manual", "[location]", warpSpot.getBlockX() + " " + warpSpot.getBlockY() + " " + warpSpot.getBlockZ()); // Set the player - Player player = args.size() == 2 ? userToTeleport.getPlayer() : user.getPlayer(); + Player player = args.size() == 2 ? user.getPlayer() : user.getPlayer(); if (args.size() == 2) { - failureMessage = userToTeleport.getTranslation(NOT_SAFE); + failureMessage = user.getTranslation(NOT_SAFE); } // Teleport @@ -124,6 +142,31 @@ public class AdminTeleportCommand extends CompositeCommand { return island.getSpawnPoint(world.getEnvironment()) != null ? island.getSpawnPoint(world.getEnvironment()) : island.getProtectionCenter().toVector().toLocation(world); } + private record IslandInfo(Island island, boolean islandName) { + } + + private Map getNameIslandMap(User target) { + Map islandMap = new HashMap<>(); + int index = 0; + for (Island island : getIslands().getIslands(getWorld(), target.getUniqueId())) { + index++; + if (island.getName() != null && !island.getName().isBlank()) { + // Name has been set + islandMap.put(island.getName(), new IslandInfo(island, true)); + } else { + // Name has not been set + String text = target.getTranslation("protection.flags.ENTER_EXIT_MESSAGES.island", TextVariables.NAME, + target.getName(), TextVariables.DISPLAY_NAME, target.getDisplayName()) + " " + index; + islandMap.put(text, new IslandInfo(island, true)); + } + // Add homes. Homes do not need an island specified + island.getHomes().keySet().forEach(n -> islandMap.put(n, new IslandInfo(island, false))); + } + + return islandMap; + + } + @Override public Optional> tabComplete(User user, String alias, List args) { String lastArg = !args.isEmpty() ? args.get(args.size()-1) : ""; @@ -131,8 +174,17 @@ public class AdminTeleportCommand extends CompositeCommand { // Don't show every player on the server. Require at least the first letter return Optional.empty(); } - List options = new ArrayList<>(Util.getOnlinePlayerList(user)); - return Optional.of(Util.tabLimit(options, lastArg)); + if (args.size() == 2) { + return Optional.of(Util.tabLimit(new ArrayList<>(Util.getOnlinePlayerList(user)), lastArg)); + } + + if (args.size() == 3) { + UUID target = Util.getUUID(args.get(1)); + return target == null ? Optional.empty() + : Optional + .of(Util.tabLimit(new ArrayList<>(getNameIslandMap(User.getInstance(target)).keySet()), lastArg)); + } + return Optional.empty(); } } diff --git a/src/main/java/world/bentobox/bentobox/api/commands/admin/AdminTeleportUserCommand.java b/src/main/java/world/bentobox/bentobox/api/commands/admin/AdminTeleportUserCommand.java new file mode 100644 index 000000000..d1880ea4e --- /dev/null +++ b/src/main/java/world/bentobox/bentobox/api/commands/admin/AdminTeleportUserCommand.java @@ -0,0 +1,200 @@ +package world.bentobox.bentobox.api.commands.admin; + +import java.util.ArrayList; +import java.util.HashMap; +import java.util.List; +import java.util.Map; +import java.util.Objects; +import java.util.Optional; +import java.util.UUID; + +import org.bukkit.Location; +import org.bukkit.World; +import org.bukkit.entity.Player; +import org.eclipse.jdt.annotation.NonNull; +import org.eclipse.jdt.annotation.Nullable; + +import world.bentobox.bentobox.api.commands.CompositeCommand; +import world.bentobox.bentobox.api.localization.TextVariables; +import world.bentobox.bentobox.api.user.User; +import world.bentobox.bentobox.database.objects.Island; +import world.bentobox.bentobox.util.Util; +import world.bentobox.bentobox.util.teleport.SafeSpotTeleport; + +/** + * Enables admins to teleport a player to another player's island, nether or end islands, + * + * For example /acid tp lspvicky tastybento [island name] would teleport lspvicky to tastybento's [named] island + * + */ +public class AdminTeleportUserCommand extends CompositeCommand { + + private static final String NOT_SAFE = "general.errors.no-safe-location-found"; + private Location warpSpot; + private @Nullable UUID targetUUID; + private @NonNull User toBeTeleported; + + /** + * @param parent - parent command + * @param tpCommand - should be "tpuser", "tpusernether" or "tpuserend" + */ + public AdminTeleportUserCommand(CompositeCommand parent, String tpCommand) { + super(parent, tpCommand); + } + + @Override + public void setup() { + // Permission + setPermission("admin.tpuser"); + setParametersHelp("commands.admin.tpuser.parameters"); + setDescription("commands.admin.tpuser.description"); + } + + @Override + public boolean canExecute(User user, String label, List args) { + if (args.isEmpty() || args.size() == 1) { + this.showHelp(this, user); + return false; + } + // Convert first name to a UUID + UUID teleportee = Util.getUUID(args.get(0)); + if (teleportee == null) { + user.sendMessage("general.errors.unknown-player", TextVariables.NAME, args.get(0)); + return false; + } + // Check online + toBeTeleported = User.getInstance(teleportee); + if (!toBeTeleported.isOnline()) { + user.sendMessage("general.errors.offline-player"); + return false; + } + + // Convert second name to a UUID + targetUUID = Util.getUUID(args.get(1)); + if (targetUUID == null) { + user.sendMessage("general.errors.unknown-player", TextVariables.NAME, args.get(0)); + return false; + } + + // Check island exists + if (!getIslands().hasIsland(getWorld(), targetUUID) && !getIslands().inTeam(getWorld(), targetUUID)) { + user.sendMessage("general.errors.player-has-no-island"); + return false; + } + + World world = getWorld(); + if (getLabel().equals("tpusernether")) { + world = getPlugin().getIWM().getNetherWorld(getWorld()); + } else if (getLabel().equals("tpuserend")) { + world = getPlugin().getIWM().getEndWorld(getWorld()); + } + if (world == null) { + user.sendMessage(NOT_SAFE); + return false; + } + // Get default location if there are no arguments + warpSpot = getSpot(world); + if (warpSpot == null) { + user.sendMessage(NOT_SAFE); + return false; + } + if (args.size() == 2) { + return true; + } + + // They named the island to go to + Map names = getNameIslandMap(User.getInstance(targetUUID)); + final String name = String.join(" ", args.subList(2, args.size())); + if (!names.containsKey(name)) { + // Failed home name check + user.sendMessage("commands.island.go.unknown-home"); + user.sendMessage("commands.island.sethome.homes-are"); + names.keySet() + .forEach(n -> user.sendMessage("commands.island.sethome.home-list-syntax", TextVariables.NAME, n)); + return false; + } else if (names.size() > 1) { + IslandInfo info = names.get(name); + Island island = info.island; + warpSpot = island.getSpawnPoint(world.getEnvironment()) != null + ? island.getSpawnPoint(world.getEnvironment()) + : island.getProtectionCenter().toVector().toLocation(world); + } + return true; + } + + @Override + public boolean execute(User user, String label, List args) { + Objects.requireNonNull(warpSpot); + // Otherwise, ask the admin to go to a safe spot + String failureMessage = user.getTranslation("commands.admin.tp.manual", "[location]", warpSpot.getBlockX() + " " + warpSpot.getBlockY() + " " + + warpSpot.getBlockZ()); + // Set the player + Player player = toBeTeleported.getPlayer(); + if (args.size() == 2) { + failureMessage = user.getTranslation(NOT_SAFE); + } + + // Teleport + new SafeSpotTeleport.Builder(getPlugin()) + .entity(player) + .location(warpSpot) + .failureMessage(failureMessage) + .thenRun(() -> user.sendMessage("general.success")) + .build(); + return true; + } + + private Location getSpot(World world) { + Island island = getIslands().getIsland(world, targetUUID); + if (island == null) { + return null; + } + return island.getSpawnPoint(world.getEnvironment()) != null ? island.getSpawnPoint(world.getEnvironment()) : island.getProtectionCenter().toVector().toLocation(world); + } + + private record IslandInfo(Island island, boolean islandName) { + } + + private Map getNameIslandMap(User target) { + Map islandMap = new HashMap<>(); + int index = 0; + for (Island island : getIslands().getIslands(getWorld(), target.getUniqueId())) { + index++; + if (island.getName() != null && !island.getName().isBlank()) { + // Name has been set + islandMap.put(island.getName(), new IslandInfo(island, true)); + } else { + // Name has not been set + String text = target.getTranslation("protection.flags.ENTER_EXIT_MESSAGES.island", TextVariables.NAME, + target.getName(), TextVariables.DISPLAY_NAME, target.getDisplayName()) + " " + index; + islandMap.put(text, new IslandInfo(island, true)); + } + // Add homes. Homes do not need an island specified + island.getHomes().keySet().forEach(n -> islandMap.put(n, new IslandInfo(island, false))); + } + + return islandMap; + + } + + @Override + public Optional> tabComplete(User user, String alias, List args) { + String lastArg = !args.isEmpty() ? args.get(args.size()-1) : ""; + if (args.isEmpty()) { + // Don't show every player on the server. Require at least the first letter + return Optional.empty(); + } + if (args.size() == 2 || args.size() == 3) { + return Optional.of(Util.tabLimit(new ArrayList<>(Util.getOnlinePlayerList(user)), lastArg)); + } + + if (args.size() == 4) { + UUID target = Util.getUUID(args.get(2)); + return target == null ? Optional.empty() + : Optional + .of(Util.tabLimit(new ArrayList<>(getNameIslandMap(User.getInstance(target)).keySet()), lastArg)); + } + return Optional.empty(); + } + +} diff --git a/src/main/java/world/bentobox/bentobox/api/commands/admin/AdminTrashCommand.java b/src/main/java/world/bentobox/bentobox/api/commands/admin/AdminTrashCommand.java deleted file mode 100644 index e17d10041..000000000 --- a/src/main/java/world/bentobox/bentobox/api/commands/admin/AdminTrashCommand.java +++ /dev/null @@ -1,73 +0,0 @@ -package world.bentobox.bentobox.api.commands.admin; - -import java.util.List; -import java.util.UUID; - -import world.bentobox.bentobox.api.commands.CompositeCommand; -import world.bentobox.bentobox.api.localization.TextVariables; -import world.bentobox.bentobox.api.user.User; -import world.bentobox.bentobox.database.objects.Island; -import world.bentobox.bentobox.util.IslandInfo; - -public class AdminTrashCommand extends CompositeCommand { - - /** - * A command for viewing islands in the database trash - * @param parent - admin command - * @since 1.3.0 - */ - public AdminTrashCommand(CompositeCommand parent) { - super(parent, "trash"); - } - - @Override - public void setup() { - setPermission("admin.trash"); - setOnlyPlayer(false); - setParametersHelp("commands.admin.trash.parameters"); - setDescription("commands.admin.trash.description"); - } - - @Override - public boolean execute(User user, String label, List args) { - if (args.size() > 1) { - // Show help - showHelp(this, user); - return false; - } - // Get target player - UUID targetUUID = args.isEmpty() ? null : getPlayers().getUUID(args.get(0)); - if (!args.isEmpty() && targetUUID == null) { - user.sendMessage("general.errors.unknown-player", TextVariables.NAME, args.get(0)); - return false; - } - // Show trash can info for this player - List islands = getIslands().getQuarantinedIslandByUser(getWorld(), targetUUID); - if (islands.isEmpty()) { - if (args.isEmpty()) { - user.sendMessage("commands.admin.trash.no-unowned-in-trash"); - } else { - user.sendMessage("commands.admin.trash.no-islands-in-trash"); - } - return false; - } else { - if (targetUUID == null) { - showTrash(user, islands); - } else { - getIslands().getQuarantineCache().values().forEach(v -> showTrash(user, v)); - } - return true; - } - } - - private void showTrash(User user, List islands) { - user.sendMessage("commands.admin.trash.title"); - for (int i = 0; i < islands.size(); i++) { - user.sendMessage("commands.admin.trash.count", TextVariables.NUMBER, String.valueOf(i+1)); - new IslandInfo(islands.get(i)).showInfo(user); - } - user.sendMessage("commands.admin.trash.use-switch", TextVariables.LABEL, getTopLabel()); - user.sendMessage("commands.admin.trash.use-emptytrash", TextVariables.LABEL, getTopLabel()); - - } -} diff --git a/src/main/java/world/bentobox/bentobox/api/commands/admin/AdminUnregisterCommand.java b/src/main/java/world/bentobox/bentobox/api/commands/admin/AdminUnregisterCommand.java index 968ebf178..d4d730380 100644 --- a/src/main/java/world/bentobox/bentobox/api/commands/admin/AdminUnregisterCommand.java +++ b/src/main/java/world/bentobox/bentobox/api/commands/admin/AdminUnregisterCommand.java @@ -116,7 +116,6 @@ public class AdminUnregisterCommand extends ConfirmableCommand { targetIsland.getMembers().clear(); targetIsland.log(new LogEntry.Builder("UNREGISTER").data("player", targetUUID.toString()) .data("admin", user.getUniqueId().toString()).build()); - getIslands().save(targetIsland); user.sendMessage("commands.admin.unregister.unregistered-island", TextVariables.XYZ, Util.xyz(targetIsland.getCenter().toVector()), TextVariables.NAME, getPlayers().getName(targetUUID)); } diff --git a/src/main/java/world/bentobox/bentobox/api/commands/admin/DefaultAdminCommand.java b/src/main/java/world/bentobox/bentobox/api/commands/admin/DefaultAdminCommand.java index dbcd126de..be27bf080 100644 --- a/src/main/java/world/bentobox/bentobox/api/commands/admin/DefaultAdminCommand.java +++ b/src/main/java/world/bentobox/bentobox/api/commands/admin/DefaultAdminCommand.java @@ -12,7 +12,6 @@ import world.bentobox.bentobox.api.commands.admin.resets.AdminResetsCommand; import world.bentobox.bentobox.api.commands.admin.team.AdminTeamAddCommand; import world.bentobox.bentobox.api.commands.admin.team.AdminTeamCommand; import world.bentobox.bentobox.api.commands.admin.team.AdminTeamDisbandCommand; -import world.bentobox.bentobox.api.commands.admin.team.AdminTeamFixCommand; import world.bentobox.bentobox.api.commands.admin.team.AdminTeamKickCommand; import world.bentobox.bentobox.api.commands.admin.team.AdminTeamSetownerCommand; import world.bentobox.bentobox.api.localization.TextVariables; @@ -51,9 +50,14 @@ public abstract class DefaultAdminCommand extends CompositeCommand { this.setDescription("commands.admin.help.description"); new AdminVersionCommand(this); + new AdminTeleportCommand(this, "tp"); new AdminTeleportCommand(this, "tpnether"); new AdminTeleportCommand(this, "tpend"); + new AdminTeleportUserCommand(this, "tpuser"); + new AdminTeleportUserCommand(this, "tpusernether"); + new AdminTeleportUserCommand(this, "tpuserend"); + new AdminGetrankCommand(this); new AdminSetrankCommand(this); new AdminInfoCommand(this); @@ -63,7 +67,6 @@ public abstract class DefaultAdminCommand extends CompositeCommand { new AdminTeamKickCommand(this); new AdminTeamDisbandCommand(this); new AdminTeamSetownerCommand(this); - new AdminTeamFixCommand(this); // Blueprints new AdminBlueprintCommand(this); // Register/unregister islands 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 8246d157d..9308301c5 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 @@ -12,6 +12,7 @@ import org.bukkit.Particle; import world.bentobox.bentobox.api.commands.CompositeCommand; import world.bentobox.bentobox.api.commands.ConfirmableCommand; +import world.bentobox.bentobox.api.commands.admin.range.AdminRangeDisplayCommand; import world.bentobox.bentobox.api.user.User; import world.bentobox.bentobox.blueprints.BlueprintClipboard; import world.bentobox.bentobox.managers.BlueprintsManager; @@ -23,7 +24,6 @@ public class AdminBlueprintCommand extends ConfirmableCommand { // Map containing selection cuboid display tasks private Map displayClipboards; - private static final Particle PARTICLE = Particle.REDSTONE; private static final Particle.DustOptions PARTICLE_DUST_OPTIONS = new Particle.DustOptions(Color.RED, 1.0F); public AdminBlueprintCommand(CompositeCommand parent) { @@ -99,26 +99,38 @@ public class AdminBlueprintCommand extends ConfirmableCommand { // Drawing x-axes for (int x = minX; x <= maxX; x++) { - user.spawnParticle(PARTICLE, PARTICLE_DUST_OPTIONS, x + 0.5, minY + 0.5, minZ + 0.5); - user.spawnParticle(PARTICLE, PARTICLE_DUST_OPTIONS, x + 0.5, maxY + 0.5, minZ + 0.5); - user.spawnParticle(PARTICLE, PARTICLE_DUST_OPTIONS, x + 0.5, minY + 0.5, maxZ + 0.5); - user.spawnParticle(PARTICLE, PARTICLE_DUST_OPTIONS, x + 0.5, maxY + 0.5, maxZ + 0.5); + user.spawnParticle(AdminRangeDisplayCommand.PARTICLE, PARTICLE_DUST_OPTIONS, x + 0.5, minY + 0.5, + minZ + 0.5); + user.spawnParticle(AdminRangeDisplayCommand.PARTICLE, PARTICLE_DUST_OPTIONS, x + 0.5, maxY + 0.5, + minZ + 0.5); + user.spawnParticle(AdminRangeDisplayCommand.PARTICLE, PARTICLE_DUST_OPTIONS, x + 0.5, minY + 0.5, + maxZ + 0.5); + user.spawnParticle(AdminRangeDisplayCommand.PARTICLE, PARTICLE_DUST_OPTIONS, x + 0.5, maxY + 0.5, + maxZ + 0.5); } // Drawing y-axes for (int y = minY; y <= maxY; y++) { - user.spawnParticle(PARTICLE, PARTICLE_DUST_OPTIONS, minX + 0.5, y + 0.5, minZ + 0.5); - user.spawnParticle(PARTICLE, PARTICLE_DUST_OPTIONS, maxX + 0.5, y + 0.5, minZ + 0.5); - user.spawnParticle(PARTICLE, PARTICLE_DUST_OPTIONS, minX + 0.5, y + 0.5, maxZ + 0.5); - user.spawnParticle(PARTICLE, PARTICLE_DUST_OPTIONS, maxX + 0.5, y + 0.5, maxZ + 0.5); + user.spawnParticle(AdminRangeDisplayCommand.PARTICLE, PARTICLE_DUST_OPTIONS, minX + 0.5, y + 0.5, + minZ + 0.5); + user.spawnParticle(AdminRangeDisplayCommand.PARTICLE, PARTICLE_DUST_OPTIONS, maxX + 0.5, y + 0.5, + minZ + 0.5); + user.spawnParticle(AdminRangeDisplayCommand.PARTICLE, PARTICLE_DUST_OPTIONS, minX + 0.5, y + 0.5, + maxZ + 0.5); + user.spawnParticle(AdminRangeDisplayCommand.PARTICLE, PARTICLE_DUST_OPTIONS, maxX + 0.5, y + 0.5, + maxZ + 0.5); } // Drawing z-axes for (int z = minZ; z <= maxZ; z++) { - user.spawnParticle(PARTICLE, PARTICLE_DUST_OPTIONS, minX + 0.5, minY + 0.5, z + 0.5); - user.spawnParticle(PARTICLE, PARTICLE_DUST_OPTIONS, maxX + 0.5, minY + 0.5, z + 0.5); - user.spawnParticle(PARTICLE, PARTICLE_DUST_OPTIONS, minX + 0.5, maxY + 0.5, z + 0.5); - user.spawnParticle(PARTICLE, PARTICLE_DUST_OPTIONS, maxX + 0.5, maxY + 0.5, z + 0.5); + user.spawnParticle(AdminRangeDisplayCommand.PARTICLE, PARTICLE_DUST_OPTIONS, minX + 0.5, minY + 0.5, + z + 0.5); + user.spawnParticle(AdminRangeDisplayCommand.PARTICLE, PARTICLE_DUST_OPTIONS, maxX + 0.5, minY + 0.5, + z + 0.5); + user.spawnParticle(AdminRangeDisplayCommand.PARTICLE, PARTICLE_DUST_OPTIONS, minX + 0.5, maxY + 0.5, + z + 0.5); + user.spawnParticle(AdminRangeDisplayCommand.PARTICLE, PARTICLE_DUST_OPTIONS, maxX + 0.5, maxY + 0.5, + z + 0.5); } } diff --git a/src/main/java/world/bentobox/bentobox/api/commands/admin/conversations/NamePrompt.java b/src/main/java/world/bentobox/bentobox/api/commands/admin/conversations/NamePrompt.java index e0edd1b25..79776ed5b 100644 --- a/src/main/java/world/bentobox/bentobox/api/commands/admin/conversations/NamePrompt.java +++ b/src/main/java/world/bentobox/bentobox/api/commands/admin/conversations/NamePrompt.java @@ -40,7 +40,6 @@ public class NamePrompt extends StringPrompt { @Override public Prompt acceptInput(@NonNull ConversationContext context, String input) { if (island.renameHome(oldName, input)) { - plugin.getIslands().save(island); Bukkit.getScheduler().runTask(plugin, () -> user.sendMessage("general.success")); } else { Bukkit.getScheduler().runTask(plugin, () -> user.sendMessage("commands.island.renamehome.already-exists")); diff --git a/src/main/java/world/bentobox/bentobox/api/commands/admin/purge/AdminPurgeCommand.java b/src/main/java/world/bentobox/bentobox/api/commands/admin/purge/AdminPurgeCommand.java index a4218ac9d..ec02a496c 100644 --- a/src/main/java/world/bentobox/bentobox/api/commands/admin/purge/AdminPurgeCommand.java +++ b/src/main/java/world/bentobox/bentobox/api/commands/admin/purge/AdminPurgeCommand.java @@ -5,7 +5,6 @@ import java.util.HashSet; import java.util.Iterator; import java.util.List; import java.util.Set; -import java.util.stream.Collectors; import org.bukkit.Bukkit; import org.bukkit.event.EventHandler; @@ -18,6 +17,7 @@ import world.bentobox.bentobox.api.events.island.IslandDeletedEvent; import world.bentobox.bentobox.api.localization.TextVariables; import world.bentobox.bentobox.api.user.User; import world.bentobox.bentobox.database.objects.Island; +import world.bentobox.bentobox.util.Util; public class AdminPurgeCommand extends CompositeCommand implements Listener { @@ -82,7 +82,7 @@ public class AdminPurgeCommand extends CompositeCommand implements Listener { user.sendMessage("commands.admin.purge.confirm", TextVariables.LABEL, this.getTopLabel()); return false; } - } catch(Exception e) { + } catch (NumberFormatException e) { user.sendMessage("commands.admin.purge.number-error"); return false; } @@ -120,29 +120,42 @@ public class AdminPurgeCommand extends CompositeCommand implements Listener { } } + /** + * Gets a set of islands that are older than the parameter in days + * @param days days + * @return set of islands + */ Set getOldIslands(int days) { + long currentTimeMillis = System.currentTimeMillis(); + double daysInMilliseconds = days * 1000 * 3600 * 24; + Set oldIslands = new HashSet<>(); + + // Process islands in one pass, logging and adding to the set if applicable getPlugin().getIslands().getIslands().stream() - .filter(i -> !i.isSpawn()) - .filter(i -> !i.getPurgeProtected()) - .filter(i -> i.getWorld().equals(this.getWorld())) - .filter(Island::isOwned) - .filter(i -> i.getMembers().size() == 1) - .filter(i -> ((double)(System.currentTimeMillis() - Bukkit.getOfflinePlayer(i.getOwner()).getLastPlayed()) / 1000 / 3600 / 24) > days) - .forEach(i -> { - Date date = new Date(Bukkit.getOfflinePlayer(i.getOwner()).getLastPlayed()); - BentoBox.getInstance().log("Will purge " + - BentoBox.getInstance().getPlayers().getName(i.getOwner()) + - " last logged in " + (int)((double)(System.currentTimeMillis() - Bukkit.getOfflinePlayer(i.getOwner()).getLastPlayed()) / 1000 / 3600 / 24) + " days ago. " + date); - }); - return getPlugin().getIslands().getIslands().stream() - .filter(i -> !i.isSpawn()) - .filter(i -> !i.getPurgeProtected()) - .filter(i -> i.getWorld().equals(this.getWorld())) - .filter(Island::isOwned) - .filter(i -> i.getMembers().size() == 1) - .filter(i -> ((double)(System.currentTimeMillis() - Bukkit.getOfflinePlayer(i.getOwner()).getLastPlayed()) / 1000 / 3600 / 24) > days) - .map(Island::getUniqueId) - .collect(Collectors.toSet()); + .filter(i -> !i.isSpawn()).filter(i -> !i.getPurgeProtected()) + .filter(i -> i.getWorld().equals(this.getWorld())).filter(Island::isOwned).filter( + i -> i.getMemberSet().stream() + .allMatch(member -> (currentTimeMillis + - Bukkit.getOfflinePlayer(member).getLastPlayed()) > daysInMilliseconds)) + .forEach(i -> { + // Add the unique island ID to the set + oldIslands.add(i.getUniqueId()); + BentoBox.getInstance().log("Will purge island at " + Util.xyz(i.getCenter().toVector()) + " in " + + i.getWorld().getName()); + // Log each member's last login information + i.getMemberSet().forEach(member -> { + Date lastLogin = new Date(Bukkit.getOfflinePlayer(member).getLastPlayed()); + BentoBox.getInstance() + .log("Player " + BentoBox.getInstance().getPlayers().getName(member) + + " last logged in " + + (int) ((currentTimeMillis - Bukkit.getOfflinePlayer(member).getLastPlayed()) + / 1000 / 3600 / 24) + + " days ago. " + lastLogin); + }); + BentoBox.getInstance().log("+-----------------------------------------+"); + }); + + return oldIslands; } /** diff --git a/src/main/java/world/bentobox/bentobox/api/commands/admin/range/AdminRangeDisplayCommand.java b/src/main/java/world/bentobox/bentobox/api/commands/admin/range/AdminRangeDisplayCommand.java index f79049829..dbdf75342 100644 --- a/src/main/java/world/bentobox/bentobox/api/commands/admin/range/AdminRangeDisplayCommand.java +++ b/src/main/java/world/bentobox/bentobox/api/commands/admin/range/AdminRangeDisplayCommand.java @@ -13,6 +13,7 @@ import org.bukkit.Particle; import world.bentobox.bentobox.api.commands.CompositeCommand; import world.bentobox.bentobox.api.user.User; import world.bentobox.bentobox.database.objects.Island; +import world.bentobox.bentobox.util.Util; /** * @author Poslovitch @@ -23,6 +24,9 @@ public class AdminRangeDisplayCommand extends CompositeCommand { private static final String DISPLAY = "display"; private static final String SHOW = "show"; private static final String HIDE = "hide"; + public static final Particle PARTICLE = Util.findFirstMatchingEnum(Particle.class, "REDSTONE", "DUST"); + private static final Particle PARTICLE2 = Util.findFirstMatchingEnum(Particle.class, "VILLAGER_HAPPY", + "HAPPY_VILLAGER"); // Map of users to which ranges must be displayed private final Map displayRanges = new HashMap<>(); @@ -76,11 +80,11 @@ public class AdminRangeDisplayCommand extends CompositeCommand { // Draw the default protected area if island protected zone is different if (island.getProtectionRange() != getPlugin().getIWM().getIslandProtectionRange(getWorld())) { - drawZone(user, Particle.VILLAGER_HAPPY, null, island, getPlugin().getIWM().getIslandProtectionRange(getWorld())); + drawZone(user, PARTICLE2, null, island, getPlugin().getIWM().getIslandProtectionRange(getWorld())); } // Draw the island area - drawZone(user, Particle.REDSTONE, new Particle.DustOptions(Color.GRAY, 1.0F), island, island.getRange()); + drawZone(user, PARTICLE, new Particle.DustOptions(Color.GRAY, 1.0F), island, island.getRange()); }); }, 20, 30)); } diff --git a/src/main/java/world/bentobox/bentobox/api/commands/admin/team/AdminTeamFixCommand.java b/src/main/java/world/bentobox/bentobox/api/commands/admin/team/AdminTeamFixCommand.java deleted file mode 100644 index b739b2a24..000000000 --- a/src/main/java/world/bentobox/bentobox/api/commands/admin/team/AdminTeamFixCommand.java +++ /dev/null @@ -1,35 +0,0 @@ -package world.bentobox.bentobox.api.commands.admin.team; - -import java.util.List; - -import world.bentobox.bentobox.api.commands.CompositeCommand; -import world.bentobox.bentobox.api.user.User; - -public class AdminTeamFixCommand extends CompositeCommand { - - - public AdminTeamFixCommand(CompositeCommand parent) { - super(parent, "fix"); - } - - @Override - public void setup() { - setPermission("mod.team.fix"); - setDescription("commands.admin.team.fix.description"); - } - - @Override - public boolean canExecute(User user, String label, List args) { - // If args are not right, show help - if (!args.isEmpty()) { - showHelp(this, user); - return false; - } - return true; - } - @Override - public boolean execute(User user, String label, List args) { - getIslands().checkTeams(user, getWorld()); - return true; - } -} diff --git a/src/main/java/world/bentobox/bentobox/api/commands/island/IslandSetnameCommand.java b/src/main/java/world/bentobox/bentobox/api/commands/island/IslandSetnameCommand.java index d0582e787..798b91a2c 100644 --- a/src/main/java/world/bentobox/bentobox/api/commands/island/IslandSetnameCommand.java +++ b/src/main/java/world/bentobox/bentobox/api/commands/island/IslandSetnameCommand.java @@ -75,12 +75,6 @@ public class IslandSetnameCommand extends CompositeCommand { name = ChatColor.translateAlternateColorCodes('&', name); } - // Check if the name doesn't already exist in the gamemode - if (getSettings().isNameUniqueness() && getIslands().nameExists(getWorld(), name)) { - user.sendMessage("commands.island.setname.name-already-exists"); - return false; - } - return true; } diff --git a/src/main/java/world/bentobox/bentobox/api/commands/island/IslandSettingsCommand.java b/src/main/java/world/bentobox/bentobox/api/commands/island/IslandSettingsCommand.java index e37fd8ff2..027a16961 100644 --- a/src/main/java/world/bentobox/bentobox/api/commands/island/IslandSettingsCommand.java +++ b/src/main/java/world/bentobox/bentobox/api/commands/island/IslandSettingsCommand.java @@ -49,7 +49,8 @@ public class IslandSettingsCommand extends CompositeCommand { .user(user) .island(island) .world(island.getWorld()) - .tab(1, new SettingsTab(user, Flag.Type.PROTECTION)).tab(2, new SettingsTab(user, Flag.Type.SETTING)) + .tab(1, new SettingsTab(getWorld(), user, Flag.Type.PROTECTION)) + .tab(2, new SettingsTab(getWorld(), user, Flag.Type.SETTING)) .startingSlot(1) .size(54) .hideIfEmpty() diff --git a/src/main/java/world/bentobox/bentobox/api/commands/island/team/Invite.java b/src/main/java/world/bentobox/bentobox/api/commands/island/team/Invite.java deleted file mode 100644 index c6328d066..000000000 --- a/src/main/java/world/bentobox/bentobox/api/commands/island/team/Invite.java +++ /dev/null @@ -1,95 +0,0 @@ -package world.bentobox.bentobox.api.commands.island.team; - -import java.util.Objects; -import java.util.UUID; - -import world.bentobox.bentobox.database.objects.Island; - -/** - * Represents an invite - * @author tastybento - * @since 1.8.0 - */ -public class Invite { - - /** - * Type of invitation - * - */ - public enum Type { - COOP, - TEAM, - TRUST - } - - private final Type type; - private final UUID inviter; - private final UUID invitee; - private final Island island; - - /** - * @param type - invitation type, e.g., coop, team, trust - * @param inviter - UUID of inviter - * @param invitee - UUID of invitee - * @param island - the island this invite is for - */ - public Invite(Type type, UUID inviter, UUID invitee, Island island) { - this.type = type; - this.inviter = inviter; - this.invitee = invitee; - this.island = island; - } - - /** - * @return the type - */ - public Type getType() { - return type; - } - - /** - * @return the inviter - */ - public UUID getInviter() { - return inviter; - } - - /** - * @return the invitee - */ - public UUID getInvitee() { - return invitee; - } - - /** - * @return the island - */ - public Island getIsland() { - return island; - } - - /* (non-Javadoc) - * @see java.lang.Object#hashCode() - */ - @Override - public int hashCode() { - return Objects.hash(invitee, inviter, type); - } - - /* (non-Javadoc) - * @see java.lang.Object#equals(java.lang.Object) - */ - @Override - public boolean equals(Object obj) { - if (this == obj) { - return true; - } - if (obj == null) { - return false; - } - if (!(obj instanceof Invite other)) { - return false; - } - return Objects.equals(invitee, other.invitee) && Objects.equals(inviter, other.inviter) && type == other.type; - } -} diff --git a/src/main/java/world/bentobox/bentobox/api/commands/island/team/IslandTeamCommand.java b/src/main/java/world/bentobox/bentobox/api/commands/island/team/IslandTeamCommand.java index fd1d06e82..6cb702ea7 100644 --- a/src/main/java/world/bentobox/bentobox/api/commands/island/team/IslandTeamCommand.java +++ b/src/main/java/world/bentobox/bentobox/api/commands/island/team/IslandTeamCommand.java @@ -1,9 +1,7 @@ package world.bentobox.bentobox.api.commands.island.team; import java.io.File; -import java.util.HashMap; import java.util.List; -import java.util.Map; import java.util.Set; import java.util.UUID; @@ -16,17 +14,13 @@ import world.bentobox.bentobox.api.events.team.TeamEvent; import world.bentobox.bentobox.api.localization.TextVariables; import world.bentobox.bentobox.api.panels.reader.PanelTemplateRecord.TemplateItem; import world.bentobox.bentobox.api.user.User; +import world.bentobox.bentobox.database.Database; import world.bentobox.bentobox.database.objects.Island; +import world.bentobox.bentobox.database.objects.TeamInvite; import world.bentobox.bentobox.managers.RanksManager; public class IslandTeamCommand extends CompositeCommand { - /** - * Invited list. Key is the invited party, value is the invite. - * @since 1.8.0 - */ - private final Map inviteMap; - private IslandTeamKickCommand kickCommand; private IslandTeamLeaveCommand leaveCommand; @@ -51,9 +45,11 @@ public class IslandTeamCommand extends CompositeCommand { private IslandTeamTrustCommand trustCommand; + private final Database handler; + public IslandTeamCommand(CompositeCommand parent) { super(parent, "team"); - inviteMap = new HashMap<>(); + handler = new Database<>(parent.getAddon(), TeamInvite.class); } @Override @@ -139,8 +135,8 @@ public class IslandTeamCommand extends CompositeCommand { * @param invitee - uuid of invitee * @since 1.8.0 */ - public void addInvite(Invite.Type type, @NonNull UUID inviter, @NonNull UUID invitee, @NonNull Island island) { - inviteMap.put(invitee, new Invite(type, inviter, invitee, island)); + public void addInvite(TeamInvite.Type type, @NonNull UUID inviter, @NonNull UUID invitee, @NonNull Island island) { + handler.saveObjectAsync(new TeamInvite(type, inviter, invitee, island.getUniqueId())); } /** @@ -150,7 +146,7 @@ public class IslandTeamCommand extends CompositeCommand { * @since 1.8.0 */ public boolean isInvited(@NonNull UUID invitee) { - return inviteMap.containsKey(invitee); + return handler.objectExists(invitee.toString()); } /** @@ -161,7 +157,7 @@ public class IslandTeamCommand extends CompositeCommand { */ @Nullable public UUID getInviter(UUID invitee) { - return isInvited(invitee) ? inviteMap.get(invitee).getInviter() : null; + return isInvited(invitee) ? handler.loadObject(invitee.toString()).getInviter() : null; } /** @@ -171,8 +167,8 @@ public class IslandTeamCommand extends CompositeCommand { * @since 1.8.0 */ @Nullable - public Invite getInvite(UUID invitee) { - return inviteMap.get(invitee); + public TeamInvite getInvite(UUID invitee) { + return handler.loadObject(invitee.toString()); } /** @@ -181,7 +177,7 @@ public class IslandTeamCommand extends CompositeCommand { * @since 1.8.0 */ public void removeInvite(@NonNull UUID invitee) { - inviteMap.remove(invitee); + handler.deleteID(invitee.toString()); } /** 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 246c38b21..45b84f904 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 @@ -8,10 +8,10 @@ import java.util.UUID; import org.eclipse.jdt.annotation.Nullable; import world.bentobox.bentobox.api.commands.CompositeCommand; -import world.bentobox.bentobox.api.commands.island.team.Invite.Type; import world.bentobox.bentobox.api.localization.TextVariables; import world.bentobox.bentobox.api.user.User; import world.bentobox.bentobox.database.objects.Island; +import world.bentobox.bentobox.database.objects.TeamInvite.Type; import world.bentobox.bentobox.managers.RanksManager; import world.bentobox.bentobox.util.Util; @@ -99,7 +99,7 @@ public class IslandTeamCoopCommand 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.COOP, user.getUniqueId(), target.getUniqueId(), island); + itc.addInvite(Type.COOP, user.getUniqueId(), target.getUniqueId(), island); user.sendMessage("commands.island.team.invite.invitation-sent", TextVariables.NAME, target.getName()); // Send message to online player target.sendMessage("commands.island.team.coop.name-has-invited-you", TextVariables.NAME, diff --git a/src/main/java/world/bentobox/bentobox/api/commands/island/team/IslandTeamGUI.java b/src/main/java/world/bentobox/bentobox/api/commands/island/team/IslandTeamGUI.java index 598e940a9..c85ed76f8 100644 --- a/src/main/java/world/bentobox/bentobox/api/commands/island/team/IslandTeamGUI.java +++ b/src/main/java/world/bentobox/bentobox/api/commands/island/team/IslandTeamGUI.java @@ -22,7 +22,6 @@ import org.eclipse.jdt.annotation.NonNull; import org.eclipse.jdt.annotation.Nullable; import world.bentobox.bentobox.BentoBox; -import world.bentobox.bentobox.api.commands.island.team.Invite.Type; import world.bentobox.bentobox.api.localization.TextVariables; import world.bentobox.bentobox.api.panels.Panel; import world.bentobox.bentobox.api.panels.PanelItem; @@ -34,6 +33,8 @@ import world.bentobox.bentobox.api.panels.reader.ItemTemplateRecord.ActionRecord import world.bentobox.bentobox.api.panels.reader.PanelTemplateRecord.TemplateItem; import world.bentobox.bentobox.api.user.User; import world.bentobox.bentobox.database.objects.Island; +import world.bentobox.bentobox.database.objects.TeamInvite; +import world.bentobox.bentobox.database.objects.TeamInvite.Type; import world.bentobox.bentobox.managers.RanksManager; import world.bentobox.bentobox.util.Util; @@ -208,7 +209,7 @@ public class IslandTeamGUI { private PanelItem createInvitedButton(ItemTemplateRecord template, TemplatedPanel.ItemSlot slot) { PanelItemBuilder builder = new PanelItemBuilder(); if (parent.isInvited(user.getUniqueId()) && user.hasPermission(parent.getAcceptCommand().getPermission())) { - Invite invite = parent.getInvite(user.getUniqueId()); + TeamInvite invite = parent.getInvite(user.getUniqueId()); if (invite == null) { return this.getBlankBorder(); } @@ -224,7 +225,8 @@ public class IslandTeamGUI { return builder.build(); } - private void createInviteClickHandler(PanelItemBuilder builder, Invite invite, @NonNull List list) { + private void createInviteClickHandler(PanelItemBuilder builder, TeamInvite invite, + @NonNull List list) { Type type = invite.getType(); builder.clickHandler((panel, user, clickType, clickSlot) -> { if (list.stream().noneMatch(ar -> clickType.equals(ar.clickType()))) { @@ -526,7 +528,6 @@ public class IslandTeamGUI { /** * Creates text to describe the status of the player - * @param user2 user asking to see the status * @param offlineMember member of the team * @return string */ 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 88c91c162..3ba3013f1 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 @@ -5,13 +5,14 @@ import java.util.UUID; import world.bentobox.bentobox.api.commands.CompositeCommand; import world.bentobox.bentobox.api.commands.ConfirmableCommand; -import world.bentobox.bentobox.api.commands.island.team.Invite.Type; import world.bentobox.bentobox.api.events.IslandBaseEvent; import world.bentobox.bentobox.api.events.island.IslandEvent; import world.bentobox.bentobox.api.events.team.TeamEvent; import world.bentobox.bentobox.api.localization.TextVariables; import world.bentobox.bentobox.api.user.User; import world.bentobox.bentobox.database.objects.Island; +import world.bentobox.bentobox.database.objects.TeamInvite; +import world.bentobox.bentobox.database.objects.TeamInvite.Type; import world.bentobox.bentobox.managers.RanksManager; import world.bentobox.bentobox.util.Util; @@ -49,7 +50,7 @@ public class IslandTeamInviteAcceptCommand extends ConfirmableCommand { user.sendMessage(INVALID_INVITE); return false; } - Invite invite = itc.getInvite(playerUUID); + TeamInvite invite = itc.getInvite(playerUUID); if (invite.getType().equals(Type.TEAM)) { // Check rank to of inviter Island island = getIslands().getIsland(getWorld(), prospectiveOwnerUUID); @@ -78,7 +79,7 @@ public class IslandTeamInviteAcceptCommand extends ConfirmableCommand { @Override public boolean execute(User user, String label, List args) { // Get the invite - Invite invite = itc.getInvite(user.getUniqueId()); + TeamInvite invite = itc.getInvite(user.getUniqueId()); switch (invite.getType()) { case COOP -> askConfirmation(user, () -> acceptCoopInvite(user, invite)); case TRUST -> askConfirmation(user, () -> acceptTrustInvite(user, invite)); @@ -94,11 +95,11 @@ public class IslandTeamInviteAcceptCommand extends ConfirmableCommand { return true; } - void acceptTrustInvite(User user, Invite invite) { + void acceptTrustInvite(User user, TeamInvite invite) { // Remove the invite itc.removeInvite(user.getUniqueId()); User inviter = User.getInstance(invite.getInviter()); - Island island = invite.getIsland(); + Island island = getIslands().getIslandById(invite.getIslandID()).orElse(null); if (island != null) { if (island.getMemberSet(RanksManager.TRUSTED_RANK, false).size() > getIslands().getMaxMembers(island, RanksManager.TRUSTED_RANK)) { @@ -120,11 +121,11 @@ public class IslandTeamInviteAcceptCommand extends ConfirmableCommand { } } - void acceptCoopInvite(User user, Invite invite) { + void acceptCoopInvite(User user, TeamInvite invite) { // Remove the invite itc.removeInvite(user.getUniqueId()); User inviter = User.getInstance(invite.getInviter()); - Island island = invite.getIsland(); + Island island = getIslands().getIslandById(invite.getIslandID()).orElse(null); if (island != null) { if (island.getMemberSet(RanksManager.COOP_RANK, false).size() > getIslands().getMaxMembers(island, RanksManager.COOP_RANK)) { @@ -146,13 +147,13 @@ public class IslandTeamInviteAcceptCommand extends ConfirmableCommand { } } - void acceptTeamInvite(User user, Invite invite) { + void acceptTeamInvite(User user, TeamInvite invite) { // Remove the invite itc.removeInvite(user.getUniqueId()); // Get the player's island - may be null if the player has no island List islands = getIslands().getIslands(getWorld(), user.getUniqueId()); // Get the team's island - Island teamIsland = invite.getIsland(); + Island teamIsland = getIslands().getIslandById(invite.getIslandID()).orElse(null); if (teamIsland == null) { user.sendMessage(INVALID_INVITE); return; @@ -196,7 +197,6 @@ public class IslandTeamInviteAcceptCommand extends ConfirmableCommand { 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 TeamEvent.builder().island(teamIsland).reason(TeamEvent.Reason.JOINED).involvedPlayer(user.getUniqueId()) .build(); 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 77a37dd30..82d2bf4dd 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 @@ -10,13 +10,13 @@ import java.util.UUID; import org.eclipse.jdt.annotation.Nullable; import world.bentobox.bentobox.api.commands.CompositeCommand; -import world.bentobox.bentobox.api.commands.island.team.Invite.Type; import world.bentobox.bentobox.api.events.IslandBaseEvent; import world.bentobox.bentobox.api.events.team.TeamEvent; import world.bentobox.bentobox.api.localization.TextVariables; import world.bentobox.bentobox.api.panels.reader.PanelTemplateRecord.TemplateItem; import world.bentobox.bentobox.api.user.User; import world.bentobox.bentobox.database.objects.Island; +import world.bentobox.bentobox.database.objects.TeamInvite.Type; import world.bentobox.bentobox.managers.IslandsManager; import world.bentobox.bentobox.managers.PlayersManager; import world.bentobox.bentobox.managers.RanksManager; @@ -166,7 +166,7 @@ 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(), island); + itc.addInvite(Type.TEAM, user.getUniqueId(), invitedPlayer.getUniqueId(), island); 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(), TextVariables.DISPLAY_NAME, user.getDisplayName()); diff --git a/src/main/java/world/bentobox/bentobox/api/commands/island/team/IslandTeamSetownerCommand.java b/src/main/java/world/bentobox/bentobox/api/commands/island/team/IslandTeamSetownerCommand.java index e80580aa9..16e23ee5c 100644 --- a/src/main/java/world/bentobox/bentobox/api/commands/island/team/IslandTeamSetownerCommand.java +++ b/src/main/java/world/bentobox/bentobox/api/commands/island/team/IslandTeamSetownerCommand.java @@ -91,7 +91,6 @@ public class IslandTeamSetownerCommand extends CompositeCommand { IslandEvent.builder().island(island).involvedPlayer(user.getUniqueId()).admin(false) .reason(IslandEvent.Reason.RANK_CHANGE).rankChange(RanksManager.OWNER_RANK, RanksManager.SUB_OWNER_RANK) .build(); - getIslands().save(island); return true; } 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 8d57871df..38c0349f7 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 @@ -8,10 +8,10 @@ import java.util.UUID; import org.eclipse.jdt.annotation.Nullable; import world.bentobox.bentobox.api.commands.CompositeCommand; -import world.bentobox.bentobox.api.commands.island.team.Invite.Type; import world.bentobox.bentobox.api.localization.TextVariables; import world.bentobox.bentobox.api.user.User; import world.bentobox.bentobox.database.objects.Island; +import world.bentobox.bentobox.database.objects.TeamInvite.Type; import world.bentobox.bentobox.managers.RanksManager; import world.bentobox.bentobox.util.Util; 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 d28bc0add..89b13cb09 100644 --- a/src/main/java/world/bentobox/bentobox/api/flags/Flag.java +++ b/src/main/java/world/bentobox/bentobox/api/flags/Flag.java @@ -388,21 +388,24 @@ public class Flag implements Comparable { if (!user.isOp() && invisible) { return null; } - // Start the flag conversion PanelItemBuilder pib = new PanelItemBuilder() .icon(ItemParser.parse(user.getTranslationOrNothing(this.getIconReference()), new ItemStack(icon))) - .name(user.getTranslation("protection.panel.flag-item.name-layout", TextVariables.NAME, user.getTranslation(getNameReference()))) + .name(user.getTranslation("protection.panel.flag-item.name-layout", TextVariables.NAME, + user.getTranslation(getNameReference()))) .clickHandler(clickHandler) .invisible(invisible); if (hasSubPanel()) { pib.description(user.getTranslation("protection.panel.flag-item.menu-layout", TextVariables.DESCRIPTION, user.getTranslation(getDescriptionReference()))); return pib.build(); } + return switch (getType()) { case PROTECTION -> createProtectionFlag(plugin, user, island, pib).build(); case SETTING -> createSettingFlag(user, island, pib).build(); case WORLD_SETTING -> createWorldSettingFlag(user, world, pib).build(); + }; + } private PanelItemBuilder createWorldSettingFlag(User user, World world, PanelItemBuilder pib) { @@ -429,19 +432,24 @@ public class Flag implements Comparable { private PanelItemBuilder createProtectionFlag(BentoBox plugin, User user, Island island, PanelItemBuilder pib) { if (island != null) { + int y = island.getFlag(this); // Protection flag + pib.description(user.getTranslation("protection.panel.flag-item.description-layout", TextVariables.DESCRIPTION, user.getTranslation(getDescriptionReference()))); + RanksManager.getInstance().getRanks().forEach((reference, score) -> { - if (score > RanksManager.BANNED_RANK && score < island.getFlag(this)) { + + if (score > RanksManager.BANNED_RANK && score < y) { pib.description(user.getTranslation("protection.panel.flag-item.blocked-rank") + user.getTranslation(reference)); - } else if (score <= RanksManager.OWNER_RANK && score > island.getFlag(this)) { + } else if (score <= RanksManager.OWNER_RANK && score > y) { pib.description(user.getTranslation("protection.panel.flag-item.allowed-rank") + user.getTranslation(reference)); - } else if (score == island.getFlag(this)) { + } else if (score == y) { pib.description(user.getTranslation("protection.panel.flag-item.minimal-rank") + user.getTranslation(reference)); } }); } + return pib; } @@ -469,7 +477,7 @@ public class Flag implements Comparable { public Set getSubflags() { return subflags; } - + /** * Set the name of this flag for a specified locale. This enables the flag's name to be assigned via API. It will not be stored anywhere * and must be rewritten using this call every time the flag is built. @@ -482,7 +490,7 @@ public class Flag implements Comparable { public boolean setTranslatedName(Locale locale, String name) { return BentoBox.getInstance().getLocalesManager().setTranslation(locale, getNameReference(), name); } - + /** * Set the name of this flag for a specified locale. This enables the flag's name to be assigned via API. It will not be stored anywhere * and must be rewritten using this call every time the flag is built. diff --git a/src/main/java/world/bentobox/bentobox/api/panels/PanelItem.java b/src/main/java/world/bentobox/bentobox/api/panels/PanelItem.java index 219beb636..589e936d2 100644 --- a/src/main/java/world/bentobox/bentobox/api/panels/PanelItem.java +++ b/src/main/java/world/bentobox/bentobox/api/panels/PanelItem.java @@ -48,7 +48,6 @@ public class PanelItem { meta.addItemFlags(ItemFlag.HIDE_DESTROYS); meta.addItemFlags(ItemFlag.HIDE_PLACED_ON); meta.addItemFlags(ItemFlag.HIDE_ENCHANTS); - meta.addItemFlags(ItemFlag.HIDE_POTION_EFFECTS); icon.setItemMeta(meta); } @@ -89,7 +88,6 @@ public class PanelItem { this.name = name; if (meta != null) { meta.setDisplayName(name); - meta.setLocalizedName(name); //Localized name cannot be overridden by the player using an anvils icon.setItemMeta(meta); } } @@ -135,9 +133,9 @@ public class PanelItem { } if (meta != null) { if (glow) { - meta.addEnchant(Enchantment.ARROW_DAMAGE, 0, glow); + meta.addEnchant(Enchantment.LURE, 0, glow); } else { - meta.removeEnchant(Enchantment.ARROW_DAMAGE); + meta.removeEnchant(Enchantment.LURE); } icon.setItemMeta(meta); diff --git a/src/main/java/world/bentobox/bentobox/api/panels/TabbedPanel.java b/src/main/java/world/bentobox/bentobox/api/panels/TabbedPanel.java index cc1a41290..3c93ad8a6 100644 --- a/src/main/java/world/bentobox/bentobox/api/panels/TabbedPanel.java +++ b/src/main/java/world/bentobox/bentobox/api/panels/TabbedPanel.java @@ -74,6 +74,7 @@ public class TabbedPanel extends Panel implements PanelListener { * @param page - the page of the tab to show (if multi paged) */ public void openPanel(int activeTab, int page) { + if (!tpb.getTabs().containsKey(activeTab)) { // Request to open a non-existent tab throw new InvalidParameterException("Attempt to open a non-existent tab in a tabbed panel. Missing tab #" + activeTab); @@ -88,21 +89,17 @@ public class TabbedPanel extends Panel implements PanelListener { TreeMap items = new TreeMap<>(); // Get the tab Tab tab = tpb.getTabs().get(activeTab); - // Remove any tabs that have no items, if required if (tpb.isHideIfEmpty()) { tpb.getTabs().values().removeIf(t -> !t.equals(tab) && t.getPanelItems().stream().noneMatch(Objects::nonNull)); } - // Set up the tabbed header setupHeader(tab, items); - // Show the active tab if (tpb.getTabs().containsKey(activeTab)) { List panelItems = tab.getPanelItems(); // Adds the flag items panelItems.stream().filter(Objects::nonNull).skip(page * ITEMS_PER_PAGE).limit(page * ITEMS_PER_PAGE + ITEMS_PER_PAGE).forEach(i -> items.put(items.lastKey() + 1, i)); - // set up the footer setupFooter(items); // Add forward and backward icons @@ -182,6 +179,7 @@ public class TabbedPanel extends Panel implements PanelListener { // Reset the closed flag closed = false; } + } /** diff --git a/src/main/java/world/bentobox/bentobox/api/user/User.java b/src/main/java/world/bentobox/bentobox/api/user/User.java index 4e20a172c..f9508eb37 100644 --- a/src/main/java/world/bentobox/bentobox/api/user/User.java +++ b/src/main/java/world/bentobox/bentobox/api/user/User.java @@ -14,6 +14,7 @@ import java.util.UUID; import org.apache.commons.lang.math.NumberUtils; import org.bukkit.Bukkit; import org.bukkit.ChatColor; +import org.bukkit.Color; import org.bukkit.GameMode; import org.bukkit.Location; import org.bukkit.OfflinePlayer; @@ -33,6 +34,8 @@ import org.bukkit.util.Vector; import org.eclipse.jdt.annotation.NonNull; import org.eclipse.jdt.annotation.Nullable; +import com.google.common.base.Enums; + import world.bentobox.bentobox.BentoBox; import world.bentobox.bentobox.api.addons.Addon; import world.bentobox.bentobox.api.events.OfflineMessageEvent; @@ -62,19 +65,23 @@ public class User implements MetaDataAble { private static final Map> VALIDATION_CHECK; static { Map> v = new EnumMap<>(Particle.class); - v.put(Particle.REDSTONE, Particle.DustOptions.class); - v.put(Particle.ITEM_CRACK, ItemStack.class); - v.put(Particle.BLOCK_CRACK, BlockData.class); - v.put(Particle.BLOCK_DUST, BlockData.class); + v.put(Enums.getIfPresent(Particle.class, "DUST") + .or(Enums.getIfPresent(Particle.class, "REDSTONE").or(Particle.FLAME)), Particle.DustOptions.class); + if (Enums.getIfPresent(Particle.class, "ITEM").isPresent()) { + // 1.20.6 Particles + v.put(Particle.ITEM, ItemStack.class); + v.put(Particle.ITEM_COBWEB, ItemStack.class); + v.put(Particle.BLOCK, BlockData.class); + v.put(Particle.DUST_PILLAR, BlockData.class); + v.put(Particle.ENTITY_EFFECT, Color.class); + } v.put(Particle.FALLING_DUST, BlockData.class); v.put(Particle.BLOCK_MARKER, BlockData.class); v.put(Particle.DUST_COLOR_TRANSITION, DustTransition.class); v.put(Particle.VIBRATION, Vibration.class); v.put(Particle.SCULK_CHARGE, Float.class); v.put(Particle.SHRIEK, Integer.class); - v.put(Particle.LEGACY_BLOCK_CRACK, BlockData.class); - v.put(Particle.LEGACY_BLOCK_DUST, BlockData.class); - v.put(Particle.LEGACY_FALLING_DUST, BlockData.class); + VALIDATION_CHECK = Collections.unmodifiableMap(v); } @@ -153,7 +160,6 @@ public class User implements MetaDataAble { public static void removePlayer(Player player) { if (player != null) { users.remove(player.getUniqueId()); - BentoBox.getInstance().getPlayers().removePlayer(player); } } @@ -711,8 +717,7 @@ public class User implements MetaDataAble { * server's view distance. * * @param particle Particle to display. - * @param dustOptions Particle.DustOptions for the particle to display. Cannot - * be null when particle is {@link Particle#REDSTONE}. + * @param dustOptions Particle.DustOptions for the particle to display. * @param x X coordinate of the particle to display. * @param y Y coordinate of the particle to display. * @param z Z coordinate of the particle to display. @@ -730,7 +735,8 @@ public class User implements MetaDataAble { // Check if this particle is beyond the viewing distance of the server if (this.player != null && this.player.getLocation().toVector().distanceSquared(new Vector(x, y, z)) < (Bukkit.getServer().getViewDistance() * 256 * Bukkit.getServer().getViewDistance())) { - if (particle.equals(Particle.REDSTONE)) { + if (particle.equals(Enums.getIfPresent(Particle.class, "DUST") + .or(Enums.getIfPresent(Particle.class, "REDSTONE").or(Particle.FLAME)))) { player.spawnParticle(particle, x, y, z, 1, 0, 0, 0, 1, dustOptions); } else if (dustOptions != null) { player.spawnParticle(particle, x, y, z, 1, dustOptions); @@ -747,8 +753,7 @@ public class User implements MetaDataAble { * server's view distance. Compatibility method for older usages. * * @param particle Particle to display. - * @param dustOptions Particle.DustOptions for the particle to display. Cannot - * be null when particle is {@link Particle#REDSTONE}. + * @param dustOptions Particle.DustOptions for the particle to display. * @param x X coordinate of the particle to display. * @param y Y coordinate of the particle to display. * @param z Z coordinate of the particle to display. @@ -762,8 +767,7 @@ public class User implements MetaDataAble { * server's view distance. * * @param particle Particle to display. - * @param dustOptions Particle.DustOptions for the particle to display. Cannot - * be null when particle is {@link Particle#REDSTONE}. + * @param dustOptions Particle.DustOptions for the particle to display. * @param x X coordinate of the particle to display. * @param y Y coordinate of the particle to display. * @param z Z coordinate of the particle to display. diff --git a/src/main/java/world/bentobox/bentobox/commands/BentoBoxAboutCommand.java b/src/main/java/world/bentobox/bentobox/commands/BentoBoxAboutCommand.java index 1f511565e..f2694f563 100644 --- a/src/main/java/world/bentobox/bentobox/commands/BentoBoxAboutCommand.java +++ b/src/main/java/world/bentobox/bentobox/commands/BentoBoxAboutCommand.java @@ -28,7 +28,7 @@ public class BentoBoxAboutCommand extends CompositeCommand { @Override public boolean execute(User user, String label, List args) { user.sendRawMessage("About " + BentoBox.getInstance().getDescription().getName() + " v" + BentoBox.getInstance().getDescription().getVersion() + ":"); - user.sendRawMessage("Copyright (c) 2017 - 2023 Tastybento, Poslovitch and the BentoBoxWorld contributors"); + user.sendRawMessage("Copyright (c) 2017 - 2024 Tastybento, Poslovitch and the BentoBoxWorld contributors"); user.sendRawMessage("See https://www.eclipse.org/legal/epl-2.0/ for license information."); return true; } diff --git a/src/main/java/world/bentobox/bentobox/commands/BentoBoxMigrateCommand.java b/src/main/java/world/bentobox/bentobox/commands/BentoBoxMigrateCommand.java index b4b763270..0face2d24 100644 --- a/src/main/java/world/bentobox/bentobox/commands/BentoBoxMigrateCommand.java +++ b/src/main/java/world/bentobox/bentobox/commands/BentoBoxMigrateCommand.java @@ -1,8 +1,13 @@ package world.bentobox.bentobox.commands; +import java.util.LinkedList; import java.util.List; +import java.util.Queue; import java.util.Set; +import org.bukkit.Bukkit; +import org.bukkit.scheduler.BukkitTask; + import world.bentobox.bentobox.BentoBox; import world.bentobox.bentobox.api.commands.CompositeCommand; import world.bentobox.bentobox.api.commands.ConfirmableCommand; @@ -20,6 +25,8 @@ import world.bentobox.bentobox.database.objects.DataObject; public class BentoBoxMigrateCommand extends ConfirmableCommand { private static final String MIGRATED = "commands.bentobox.migrate.migrated"; + private Queue> classQueue; + private BukkitTask task; /** * Reloads settings, addons and localization command @@ -41,11 +48,21 @@ public class BentoBoxMigrateCommand extends ConfirmableCommand { user.sendMessage("commands.bentobox.migrate.addons"); Set> classSet = getPlugin().getAddonsManager().getDataObjects(); classSet.addAll(Database.getDataobjects()); - classSet.forEach(t -> { - user.sendMessage("commands.bentobox.migrate.class", TextVariables.DESCRIPTION, BentoBox.getInstance().getSettings().getDatabasePrefix() + t.getCanonicalName()); - new Database<>(getPlugin(), t).loadObjects(); - user.sendMessage(MIGRATED); - }); + // Put classSet into classQueue + classQueue = new LinkedList<>(classSet); + // Start a scheduler to step through these in a reasonable time + task = Bukkit.getScheduler().runTaskTimer(getPlugin(), () -> { + Class t = classQueue.poll(); + if (t != null) { + user.sendMessage("commands.bentobox.migrate.class", TextVariables.DESCRIPTION, + BentoBox.getInstance().getSettings().getDatabasePrefix() + t.getCanonicalName()); + new Database<>(getPlugin(), t).loadObjects(); + user.sendMessage(MIGRATED); + } else { + user.sendMessage("commands.bentobox.migrate.completed"); + task.cancel(); + } + }, 0, 20L); }); return true; } diff --git a/src/main/java/world/bentobox/bentobox/database/objects/Island.java b/src/main/java/world/bentobox/bentobox/database/objects/Island.java index 60d95c89f..7f26e3180 100644 --- a/src/main/java/world/bentobox/bentobox/database/objects/Island.java +++ b/src/main/java/world/bentobox/bentobox/database/objects/Island.java @@ -13,6 +13,7 @@ import java.util.Objects; import java.util.Optional; import java.util.Set; import java.util.UUID; +import java.util.concurrent.atomic.AtomicBoolean; import java.util.stream.Collectors; import org.bukkit.Bukkit; @@ -41,6 +42,7 @@ import world.bentobox.bentobox.api.user.User; import world.bentobox.bentobox.database.objects.adapters.Adapter; import world.bentobox.bentobox.database.objects.adapters.LogEntryListAdapter; import world.bentobox.bentobox.lists.Flags; +import world.bentobox.bentobox.managers.IslandsManager; import world.bentobox.bentobox.managers.RanksManager; import world.bentobox.bentobox.util.Pair; import world.bentobox.bentobox.util.Util; @@ -56,7 +58,7 @@ import world.bentobox.bentobox.util.Util; public class Island implements DataObject, MetaDataAble { @Expose - private boolean primary; + private Set primaries = new HashSet<>(); /** * Set to true if this data object has been changed since being loaded from the @@ -243,7 +245,6 @@ public class Island implements DataObject, MetaDataAble { range = BentoBox.getInstance().getIWM().getIslandDistance(world); this.protectionRange = protectionRange; this.maxEverProtectionRange = protectionRange; - this.setChanged(); } /** @@ -290,6 +291,7 @@ public class Island implements DataObject, MetaDataAble { this.updatedDate = island.getUpdatedDate(); this.world = island.getWorld(); this.bonusRanges.addAll(island.getBonusRanges()); + this.primaries.addAll(island.getPrimaries()); this.setChanged(); } @@ -304,8 +306,10 @@ public class Island implements DataObject, MetaDataAble { * @param playerUUID - the player's UUID */ public void addMember(@NonNull UUID playerUUID) { - setRank(playerUUID, RanksManager.MEMBER_RANK); - setChanged(); + if (getRank(playerUUID) != RanksManager.MEMBER_RANK) { + setRank(playerUUID, RanksManager.MEMBER_RANK); + setChanged(); + } } /** @@ -320,9 +324,12 @@ public class Island implements DataObject, MetaDataAble { * @return {@code true} */ public boolean ban(@NonNull UUID issuer, @NonNull UUID target) { - setRank(target, RanksManager.BANNED_RANK); - log(new LogEntry.Builder("BAN").data("player", target.toString()).data("issuer", issuer.toString()).build()); - setChanged(); + if (getRank(target) != RanksManager.BANNED_RANK) { + setRank(target, RanksManager.BANNED_RANK); + log(new LogEntry.Builder("BAN").data("player", target.toString()).data("issuer", issuer.toString()) + .build()); + setChanged(); + } return true; } @@ -1005,25 +1012,30 @@ public class Island implements DataObject, MetaDataAble { * @param playerUUID - uuid of player */ public void removeMember(UUID playerUUID) { - members.remove(playerUUID); - setChanged(); + if (members.remove(playerUUID) != null) { + setChanged(); + } } /** * @param center the center to set */ public void setCenter(@NonNull Location center) { - this.world = center.getWorld(); - this.center = center; - setChanged(); + if (this.center == null || !center.getWorld().equals(this.center.getWorld()) || !center.equals(this.center)) { + this.world = center.getWorld(); + this.center = center; + setChanged(); + } } /** * @param createdDate - the createdDate to sets */ public void setCreatedDate(long createdDate) { - this.createdDate = createdDate; - setChanged(); + if (this.createdDate != createdDate) { + this.createdDate = createdDate; + setChanged(); + } } /** @@ -1032,27 +1044,30 @@ public class Island implements DataObject, MetaDataAble { * * @param flag - flag * @param value - Use RanksManager settings, e.g. RanksManager.MEMBER + * @return this island */ - public void setFlag(Flag flag, int value) { + public Island setFlag(Flag flag, int value) { setFlag(flag, value, true); + return this; } /** - * Set the Island Guard flag rank Also specify whether subflags are affected by - * this method call + * Set the Island Guard flag rank and set any subflags * * @param flag - flag * @param value - Use RanksManager settings, e.g. RanksManager.MEMBER * @param doSubflags - whether to set subflags */ public void setFlag(Flag flag, int value, boolean doSubflags) { - flags.put(flag.getID(), value); + if (flags.containsKey(flag.getID()) && flags.get(flag.getID()) != value) { + flags.put(flag.getID(), value); + setChanged(); + } // Subflag support if (doSubflags && flag.hasSubflags()) { // Ensure that a subflag isn't a subflag of itself or else we're in trouble! flag.getSubflags().forEach(subflag -> setFlag(subflag, value, true)); } - setChanged(); } /** @@ -1066,9 +1081,10 @@ public class Island implements DataObject, MetaDataAble { /** * Resets the flags to their default as set in config.yml for this island. If * flags are missing from the config, the default hard-coded value is used and - * set + * set. + * @return this island */ - public void setFlagsDefaults() { + public Island setFlagsDefaults() { BentoBox plugin = BentoBox.getInstance(); Map result = new HashMap<>(); plugin.getFlagsManager().getFlags().stream().filter(f -> f.getType().equals(Flag.Type.PROTECTION)) @@ -1077,8 +1093,8 @@ public class Island implements DataObject, MetaDataAble { plugin.getFlagsManager().getFlags().stream().filter(f -> f.getType().equals(Flag.Type.SETTING)) .forEach(f -> result.put(f.getID(), plugin.getIWM().getDefaultIslandSettings(world).getOrDefault(f, f.getDefaultRank()))); - this.setFlags(result); - setChanged(); + setFlags(result); + return this; } /** @@ -1097,8 +1113,10 @@ public class Island implements DataObject, MetaDataAble { * @param name The display name to set. */ public void setName(String name) { - this.name = (name != null && !name.equals("")) ? name : null; - setChanged(); + if (name == null || !name.equals(this.name)) { + this.name = (name != null && !name.equals("")) ? name : null; + setChanged(); + } } /** @@ -1130,9 +1148,11 @@ public class Island implements DataObject, MetaDataAble { * @param protectionRange the protectionRange to set */ public void setProtectionRange(int protectionRange) { - this.protectionRange = protectionRange; - this.updateMaxEverProtectionRange(); - setChanged(); + if (this.protectionRange != protectionRange) { + this.protectionRange = protectionRange; + this.updateMaxEverProtectionRange(); + setChanged(); + } } /** @@ -1164,8 +1184,10 @@ public class Island implements DataObject, MetaDataAble { * @param purgeProtected - if the island is protected from the Purge */ public void setPurgeProtected(boolean purgeProtected) { - this.purgeProtected = purgeProtected; - setChanged(); + if (this.purgeProtected != purgeProtected) { + this.purgeProtected = purgeProtected; + setChanged(); + } } /** @@ -1179,8 +1201,10 @@ public class Island implements DataObject, MetaDataAble { * @see #setProtectionRange(int) */ public void setRange(int range) { - this.range = range; - setChanged(); + if (this.range != range) { + this.range = range; + setChanged(); + } } /** @@ -1191,7 +1215,6 @@ public class Island implements DataObject, MetaDataAble { */ public void setRank(User user, int rank) { setRank(user.getUniqueId(), rank); - setChanged(); } /** @@ -1199,17 +1222,36 @@ public class Island implements DataObject, MetaDataAble { * the {@link world.bentobox.bentobox.api.events.island.IslandRankChangeEvent}. * * @param uuid UUID of the player - * @param rank rank value + * @param newRank rank value * @since 1.1 */ - public void setRank(@Nullable UUID uuid, int rank) { + public void setRank(@Nullable UUID uuid, int newRank) { + // Early return if the UUID is null, to avoid unnecessary processing. if (uuid == null) { - return; // Defensive code + return; + } + + // Use an AtomicBoolean to track if the member's rank has been changed. + AtomicBoolean isRankChanged = new AtomicBoolean(false); + + // Attempt to update the member's rank, if necessary. + members.compute(uuid, (key, existingRank) -> { + // If the member does not exist or their rank is different, update the rank. + if (existingRank == null || existingRank != newRank) { + isRankChanged.set(true); + return newRank; // Update the rank. + } + // No change needed; return the existing rank. + return existingRank; + }); + + // If the rank was changed, notify the change and log the update. + if (isRankChanged.get()) { + setChanged(); // Notify that a change has occurred. } - members.put(uuid, rank); - setChanged(); } + /** * @param ranks the ranks to set */ @@ -1266,7 +1308,6 @@ public class Island implements DataObject, MetaDataAble { @Override public void setUniqueId(String uniqueId) { this.uniqueId = uniqueId; - setChanged(); } /** @@ -1274,7 +1315,6 @@ public class Island implements DataObject, MetaDataAble { */ public void setUpdatedDate(long updatedDate) { this.updatedDate = updatedDate; - setChanged(); } /** @@ -1347,8 +1387,13 @@ public class Island implements DataObject, MetaDataAble { * @param l - location */ public void setSpawnPoint(Environment islandType, Location l) { - spawnPoint.put(islandType, l); - setChanged(); + spawnPoint.compute(islandType, (key, value) -> { + if (value == null || !value.equals(l)) { + setChanged(); // Call setChanged only if the value is updated. + return l; + } + return value; + }); } /** @@ -1368,8 +1413,9 @@ public class Island implements DataObject, MetaDataAble { * @param rank rank value */ public void removeRank(Integer rank) { - members.values().removeIf(rank::equals); - setChanged(); + if (members.values().removeIf(rank::equals)) { + setChanged(); + } } /** @@ -1455,7 +1501,6 @@ public class Island implements DataObject, MetaDataAble { */ public void setGameMode(String gameMode) { this.gameMode = gameMode; - setChanged(); } /** @@ -1518,8 +1563,9 @@ public class Island implements DataObject, MetaDataAble { if (cooldowns.containsKey(flag.getID()) && cooldowns.get(flag.getID()) > System.currentTimeMillis()) { return true; } - cooldowns.remove(flag.getID()); - setChanged(); + if (cooldowns.remove(flag.getID()) != null) { + setChanged(); + } return false; } @@ -1603,8 +1649,13 @@ public class Island implements DataObject, MetaDataAble { public void setRankCommand(String command, int rank) { if (this.commandRanks == null) this.commandRanks = new HashMap<>(); - this.commandRanks.put(command, rank); - setChanged(); + commandRanks.compute(command, (key, value) -> { + if (value == null || !value.equals(rank)) { + setChanged(); // Call setChanged only if the value is updated. + return rank; + } + return value; + }); } /** @@ -1624,8 +1675,10 @@ public class Island implements DataObject, MetaDataAble { * @since 1.6.0 */ public void setReserved(boolean reserved) { - this.reserved = reserved; - setChanged(); + if (this.reserved != reserved) { + this.reserved = reserved; + setChanged(); + } } /** @@ -1658,17 +1711,19 @@ public class Island implements DataObject, MetaDataAble { } /** - * Indicates the fields have been changed. Used to optimize saving on shutdown. + * Indicates the fields have been changed. Used to optimize saving on shutdown and notify other servers */ public void setChanged() { + this.setUpdatedDate(System.currentTimeMillis()); this.changed = true; + IslandsManager.updateIsland(this); } /** - * @param changed the changed to set + * Resets the changed if the island has been saved */ - public void setChanged(boolean changed) { - this.changed = changed; + public void clearChanged() { + this.changed = false; } /** @@ -1692,6 +1747,9 @@ public class Island implements DataObject, MetaDataAble { * @since 1.16.0 */ public void setProtectionCenter(Location location) throws IOException { + if (this.location.equals(location)) { + return; // nothing to do + } if (!this.inIslandSpace(location)) { throw new IOException("Location must be in island space"); } @@ -1741,6 +1799,9 @@ public class Island implements DataObject, MetaDataAble { * @since 1.16.0 */ public void addHome(String name, Location location) { + if (getHomes().containsKey(name) && getHomes().get(name).equals(location)) { + return; // nothing to do + } if (location != null) { Vector v = location.toVector(); if (!this.getBoundingBox().contains(v)) { @@ -1763,8 +1824,11 @@ public class Island implements DataObject, MetaDataAble { * @since 1.16.0 */ public boolean removeHome(String name) { - setChanged(); - return getHomes().remove(name.toLowerCase()) != null; + if (getHomes().remove(name.toLowerCase()) != null) { + setChanged(); + return true; + } + return false; } /** @@ -1774,8 +1838,11 @@ public class Island implements DataObject, MetaDataAble { * @since 1.20.0 */ public boolean removeHomes() { - setChanged(); - return getHomes().keySet().removeIf(k -> !k.isEmpty()); + if (getHomes().keySet().removeIf(k -> !k.isEmpty())) { + setChanged(); + return true; + } + return false; } /** @@ -1814,8 +1881,10 @@ public class Island implements DataObject, MetaDataAble { * @since 1.16.0 */ public void setMaxHomes(@Nullable Integer maxHomes) { - this.maxHomes = maxHomes; - setChanged(); + if (this.maxHomes != maxHomes) { + this.maxHomes = maxHomes; + setChanged(); + } } /** @@ -1834,8 +1903,10 @@ public class Island implements DataObject, MetaDataAble { * @since 1.16.0 */ public void setMaxMembers(Map maxMembers) { - this.maxMembers = maxMembers; - setChanged(); + if (this.maxMembers != maxMembers) { + this.maxMembers = maxMembers; + setChanged(); + } } /** @@ -1860,7 +1931,13 @@ public class Island implements DataObject, MetaDataAble { * @since 1.16.0 */ public void setMaxMembers(int rank, Integer maxMembers) { - getMaxMembers().put(rank, maxMembers); + getMaxMembers().compute(rank, (key, value) -> { + if (value == null || !value.equals(maxMembers)) { + setChanged(); // Call setChanged only if the value is updated. + return maxMembers; + } + return value; + }); } /** @@ -1923,8 +2000,9 @@ public class Island implements DataObject, MetaDataAble { * @param id id to identify this bonus */ public void clearBonusRange(String id) { - this.getBonusRanges().removeIf(r -> r.getUniqueId().equals(id)); - setChanged(); + if (this.getBonusRanges().removeIf(r -> r.getUniqueId().equals(id))) { + setChanged(); + } } /** @@ -1936,18 +2014,31 @@ public class Island implements DataObject, MetaDataAble { } /** + * @param userID user UUID * @return the primary */ - public boolean isPrimary() { - return primary; + public boolean isPrimary(UUID userID) { + return getPrimaries().contains(userID); } /** - * @param primary the primary to set + * Set this island to be the primary for this user + * @param userID user UUID */ - public void setPrimary(boolean primary) { - this.primary = primary; - setChanged(); + public void setPrimary(UUID userID) { + if (getPrimaries().add(userID)) { + setChanged(); + } + } + + /** + * Remove the primary island + * @param userID user UUID + */ + public void removePrimary(UUID userID) { + if (getPrimaries().remove(userID)) { + setChanged(); + } } /** @@ -1986,4 +2077,41 @@ public class Island implements DataObject, MetaDataAble { + commandRanks + ", reserved=" + reserved + ", metaData=" + metaData + ", homes=" + homes + ", maxHomes=" + maxHomes + "]"; } + + /** + * @return the primaries + */ + public Set getPrimaries() { + if (primaries == null) { + primaries = new HashSet<>(); + } + return primaries; + } + + /** + * @param primaries the primaries to set + */ + public void setPrimaries(Set primaries) { + this.primaries = primaries; + setChanged(); + } + + @Override + public int hashCode() { + return Objects.hash(uniqueId); + } + + @Override + public boolean equals(Object obj) { + if (this == obj) + return true; + if (obj == null) + return false; + if (getClass() != obj.getClass()) + return false; + Island other = (Island) obj; + return Objects.equals(uniqueId, other.uniqueId); + } + + } diff --git a/src/main/java/world/bentobox/bentobox/database/objects/Players.java b/src/main/java/world/bentobox/bentobox/database/objects/Players.java index 3cf06d2c0..ca384ed12 100644 --- a/src/main/java/world/bentobox/bentobox/database/objects/Players.java +++ b/src/main/java/world/bentobox/bentobox/database/objects/Players.java @@ -6,13 +6,10 @@ import java.util.Map; import java.util.Optional; import java.util.Set; import java.util.UUID; -import java.util.stream.Collectors; import org.bukkit.Bukkit; -import org.bukkit.Location; import org.bukkit.World; import org.bukkit.entity.Player; -import org.eclipse.jdt.annotation.Nullable; import com.google.gson.annotations.Expose; @@ -30,8 +27,6 @@ import world.bentobox.bentobox.util.Util; */ @Table(name = "Players") public class Players implements DataObject, MetaDataAble { - @Expose - private Map homeLocations = new HashMap<>(); @Expose private String uniqueId; @Expose @@ -77,7 +72,6 @@ public class Players implements DataObject, MetaDataAble { */ public Players(BentoBox plugin, UUID uniqueId) { this.uniqueId = uniqueId.toString(); - homeLocations = new HashMap<>(); locale = ""; // Try to get player's name this.playerName = Bukkit.getOfflinePlayer(uniqueId).getName(); @@ -86,72 +80,6 @@ public class Players implements DataObject, MetaDataAble { } } - /** - * Gets the default home location. - * @param world - world to check - * @return Location - home location in world - * @deprecated Homes are stored in the Island object now - */ - @Deprecated(since="1.18.0", forRemoval=true) - @Nullable - public Location getHomeLocation(World world) { - return getHomeLocation(world, 1); // Default - } - - /** - * Gets the home location by number for world - * @param world - includes world and any related nether or end worlds - * @param number - a number - * @return Location of this home or null if not available - * @deprecated Homes are stored in the island object now - */ - @Deprecated(since="1.18.0", forRemoval=true) - @Nullable - public Location getHomeLocation(World world, int number) { - // Remove any lost worlds/locations - homeLocations.keySet().removeIf(l -> l == null || l.getWorld() == null); - return homeLocations.entrySet().stream() - .filter(en -> Util.sameWorld(en.getKey().getWorld(), world) && en.getValue() == number) - .map(Map.Entry::getKey) - .findFirst() - .orElse(null); - } - - /** - * @param world - world - * @return Map of home locations - * @deprecated Homes are stored in the island object now - */ - @Deprecated(since="1.18.0", forRemoval=true) - public Map getHomeLocations(World world) { - // Remove any lost worlds/locations - homeLocations.keySet().removeIf(l -> l == null || l.getWorld() == null); - return homeLocations.entrySet().stream().filter(e -> Util.sameWorld(e.getKey().getWorld(),world)) - .collect(Collectors.toMap(Map.Entry::getKey, Map.Entry::getValue)); - } - - /** - * @return the homeLocations - * @deprecated Homes are stored in the Island object now - */ - @Deprecated(since="1.18.0", forRemoval=true) - public Map getHomeLocations() { - // Remove any lost worlds/locations - homeLocations.keySet().removeIf(l -> l == null || l.getWorld() == null); - return homeLocations; - } - - /** - * @param homeLocations the homeLocations to set - * @deprecated Homes are stored in the Island object now - */ - @Deprecated(since="1.18.0", forRemoval=true) - public void setHomeLocations(Map homeLocations) { - this.homeLocations = homeLocations; - // Remove any lost worlds/locations - homeLocations.keySet().removeIf(l -> l == null || l.getWorld() == null); - } - /** * @param playerName the playerName to set */ @@ -202,30 +130,6 @@ public class Players implements DataObject, MetaDataAble { this.resets.put(world.getName(), resets); } - /** - * Stores the home location of the player in a String format - * - * @param l a Bukkit location - * @deprecated Home locations are stored in islands - */ - @Deprecated(since="1.18.0", forRemoval=true) - public void setHomeLocation(final Location l) { - setHomeLocation(l, 1); - } - - /** - * Stores the numbered home location of the player. Numbering starts at 1. - * @param location - the location - * @param number - a number - * @deprecated Home locations are no longer stored for players. They are stored in islands. - */ - @Deprecated(since="1.18.0", forRemoval=true) - public void setHomeLocation(Location location, int number) { - // Remove any home locations in the same world with the same number - homeLocations.entrySet().removeIf(e -> e.getKey() == null || (Util.sameWorld(location.getWorld(), e.getKey().getWorld()) && e.getValue().equals(number))); - homeLocations.put(location, number); - } - /** * Set the uuid for this player object * @param uuid - UUID @@ -234,16 +138,6 @@ public class Players implements DataObject, MetaDataAble { uniqueId = uuid.toString(); } - /** - * Clears all home Locations in world - * @param world - world - * @deprecated Home locations are no longer stored for players. Use {@link world.bentobox.bentobox.managers.IslandsManager} - */ - @Deprecated(since="1.18.0", forRemoval=true) - public void clearHomeLocations(World world) { - homeLocations.keySet().removeIf(l -> l == null || l.getWorld() == null || Util.sameWorld(l.getWorld(), world)); - } - /** * @return the locale */ @@ -350,24 +244,6 @@ public class Players implements DataObject, MetaDataAble { } } - /** - * Returns the display mode for the Flags in the Settings Panel. - * @return the display mode for the Flags in the Settings Panel. - * @since 1.6.0 - */ - public Flag.Mode getFlagsDisplayMode() { - return flagsDisplayMode; - } - - /** - * Sets the display mode for the Flags in the Settings Panel. - * @param flagsDisplayMode the display mode for the Flags in the Settings Panel. - * @since 1.6.0 - */ - public void setFlagsDisplayMode(Flag.Mode flagsDisplayMode) { - this.flagsDisplayMode = flagsDisplayMode; - } - /** * @return the metaData * @since 1.15.5 diff --git a/src/main/java/world/bentobox/bentobox/database/objects/TeamInvite.java b/src/main/java/world/bentobox/bentobox/database/objects/TeamInvite.java new file mode 100644 index 000000000..0988a0424 --- /dev/null +++ b/src/main/java/world/bentobox/bentobox/database/objects/TeamInvite.java @@ -0,0 +1,112 @@ +package world.bentobox.bentobox.database.objects; + +import java.util.Objects; +import java.util.UUID; + +import com.google.gson.annotations.Expose; + +/** + * Data object for team invites + */ +@Table(name = "TeamInvites") +public class TeamInvite implements DataObject { + + /** + * Type of invitation + * + */ + public enum Type { + COOP, + TEAM, + TRUST + } + + @Expose + private Type type; + @Expose + private UUID inviter; + @Expose + private String islandID; + + @Expose + private String uniqueId; + + /** + * @param type - invitation type, e.g., coop, team, trust + * @param inviter - UUID of inviter + * @param invitee - UUID of invitee + * @param islandID - the unique ID of the island this invite is for + */ + public TeamInvite(Type type, UUID inviter, UUID invitee, String islandID) { + this.type = type; + this.uniqueId = invitee.toString(); + this.inviter = inviter; + this.islandID = islandID; + } + + @Override + public String getUniqueId() { + // Inviter + return this.uniqueId; + } + + @Override + public void setUniqueId(String uniqueId) { + this.uniqueId = uniqueId; + } + + /** + * @return the type + */ + public Type getType() { + return type; + } + + /** + * @return the invitee + */ + public UUID getInvitee() { + return UUID.fromString(uniqueId); + } + + /** + * @return the inviter + */ + public UUID getInviter() { + return inviter; + } + + /** + * @return the islandID + */ + public String getIslandID() { + return islandID; + } + + /* (non-Javadoc) + * @see java.lang.Object#hashCode() + */ + @Override + public int hashCode() { + return Objects.hash(inviter, uniqueId, type); + } + + /* (non-Javadoc) + * @see java.lang.Object#equals(java.lang.Object) + */ + @Override + public boolean equals(Object obj) { + if (this == obj) { + return true; + } + if (obj == null) { + return false; + } + if (!(obj instanceof TeamInvite other)) { + return false; + } + return Objects.equals(inviter, other.inviter) && Objects.equals(uniqueId, other.getUniqueId()) + && type == other.type; + } + +} diff --git a/src/main/java/world/bentobox/bentobox/database/transition/TransitionDatabaseHandler.java b/src/main/java/world/bentobox/bentobox/database/transition/TransitionDatabaseHandler.java index c1402be8a..966be709c 100644 --- a/src/main/java/world/bentobox/bentobox/database/transition/TransitionDatabaseHandler.java +++ b/src/main/java/world/bentobox/bentobox/database/transition/TransitionDatabaseHandler.java @@ -44,8 +44,16 @@ public class TransitionDatabaseHandler extends AbstractDatabaseHandler { List listTo = toHandler.loadObjects(); // If source database has objects, then delete and save them in the destination database for (T object : listFrom) { - toHandler.saveObject(object); - fromHandler.deleteObject(object); + toHandler.saveObject(object).thenAccept(b -> { + // Only delete if save was successful + if (b) { + try { + fromHandler.deleteObject(object); + } catch (IllegalAccessException | InvocationTargetException | IntrospectionException e) { + plugin.logStacktrace(e); + } + } + }); } // Merge results listTo.addAll(listFrom); diff --git a/src/main/java/world/bentobox/bentobox/hooks/ItemsAdderHook.java b/src/main/java/world/bentobox/bentobox/hooks/ItemsAdderHook.java index 721058303..e33eca793 100644 --- a/src/main/java/world/bentobox/bentobox/hooks/ItemsAdderHook.java +++ b/src/main/java/world/bentobox/bentobox/hooks/ItemsAdderHook.java @@ -1,6 +1,11 @@ package world.bentobox.bentobox.hooks; +import java.util.List; +import java.util.Map; +import java.util.function.BiConsumer; + import org.bukkit.Bukkit; +import org.bukkit.Chunk; import org.bukkit.Location; import org.bukkit.Material; import org.bukkit.entity.EntityType; @@ -8,6 +13,7 @@ import org.bukkit.entity.Player; import org.bukkit.event.EventHandler; import org.bukkit.event.EventPriority; import org.bukkit.event.entity.EntityExplodeEvent; +import org.eclipse.jdt.annotation.Nullable; import dev.lone.itemsadder.api.CustomBlock; import world.bentobox.bentobox.BentoBox; @@ -22,6 +28,19 @@ import world.bentobox.bentobox.managers.RanksManager; * Hook to enable itemsadder blocks to be deleted when islands are deleted. * It also includes a flag to track explosion access */ +/* + * add some methods under CustomBlock#Advanced class. + + public static void deleteAllCustomBlocksInChunk(Chunk chunk) + + @Nullable + public List getAllBlocksLocationsList(Chunk chunk) + + @Nullable + public Map getAllBlocksLocations(Chunk chunk) + + public void runActionOnBlocks(Chunk chunk, BiConsumer action) + */ public class ItemsAdderHook extends Hook { /** @@ -78,6 +97,24 @@ public class ItemsAdderHook extends Hook { // CustomBlock.remove(location); } + public static void deleteAllCustomBlocksInChunk(Chunk chunk) { + CustomBlock.Advanced.deleteAllCustomBlocksInChunk(chunk); + } + + @Nullable + public List getAllBlocksLocationsList(Chunk chunk) { + return CustomBlock.Advanced.getAllBlocksLocationsList(chunk); + } + + @Nullable + public Map getAllBlocksLocations(Chunk chunk) { + return CustomBlock.Advanced.getAllBlocksLocations(chunk); + } + + public void runActionOnBlocks(Chunk chunk, BiConsumer action) { + CustomBlock.Advanced.runActionOnBlocks(chunk, action); + } + class BlockInteractListener extends FlagListener { /** diff --git a/src/main/java/world/bentobox/bentobox/hooks/LangUtilsHook.java b/src/main/java/world/bentobox/bentobox/hooks/LangUtilsHook.java index 77809ce18..5a6b9ae70 100644 --- a/src/main/java/world/bentobox/bentobox/hooks/LangUtilsHook.java +++ b/src/main/java/world/bentobox/bentobox/hooks/LangUtilsHook.java @@ -1,8 +1,10 @@ package world.bentobox.bentobox.hooks; +import java.util.List; import java.util.Locale; import java.util.Map.Entry; import java.util.logging.Logger; +import java.util.stream.Collectors; import org.bukkit.DyeColor; import org.bukkit.Material; @@ -264,29 +266,48 @@ public class LangUtilsHook extends Hook { if (hooked) { return LanguageHelper.getPotionName(potionType, getUserLocale(user)); } + return generalPotionName(potionType); + } + + private static String generalPotionName(PotionType potionType) { return switch (potionType) { - case UNCRAFTABLE -> "Uncraftable Potion"; case WATER -> "Water Bottle"; case MUNDANE -> "Mundane Potion"; case THICK -> "Thick Potion"; case AWKWARD -> "Awkward Potion"; case NIGHT_VISION -> "Potion of Night Vision"; case INVISIBILITY -> "Potion of Invisibility"; - case JUMP -> "Potion of Leaping"; case FIRE_RESISTANCE -> "Potion of Fire Resistance"; - case SPEED -> "Potion of Swiftness"; case SLOWNESS -> "Potion of Slowness"; case WATER_BREATHING -> "Potion of Water Breathing"; - case INSTANT_HEAL -> "Potion of Healing"; - case INSTANT_DAMAGE -> "Potion of Harming"; case POISON -> "Potion of Poison"; - case REGEN -> "Potion of Regeneration"; case STRENGTH -> "Potion of Strength"; case WEAKNESS -> "Potion of Weakness"; case LUCK -> "Potion of Luck"; case TURTLE_MASTER -> "Potion of the Turtle Master"; case SLOW_FALLING -> "Potion of Slow Falling"; - default -> "Unknown Potion"; + case LONG_FIRE_RESISTANCE -> "Potion of Long Fire Resistance"; + case LONG_INVISIBILITY -> "Potion of Long Invisibility"; + case LONG_NIGHT_VISION -> "Potion of Long Night Vision"; + case LONG_POISON -> "Potion of Long Poison"; + case LONG_REGENERATION -> "Potion of Long Regeneration"; + case LONG_SLOWNESS -> "Potion of Long Slowness"; + case LONG_SLOW_FALLING -> "Potion of Long Slow Falling"; + case LONG_STRENGTH -> "Potion of Long Strength"; + case LONG_SWIFTNESS -> "Potion of Long Swiftness"; + case LONG_TURTLE_MASTER -> "Potion of Long Turtle Master"; + case LONG_WATER_BREATHING -> "Potion of Long Water Breathing"; + case LONG_WEAKNESS -> "Potion of Long Weakness"; + case STRONG_HARMING -> "Potion of Strong Harming"; + case STRONG_HEALING -> "Potion of Strong Healing"; + case STRONG_LEAPING -> "Potion of Strong Leaping"; + case STRONG_POISON -> "Potion of Strong Poison"; + case STRONG_REGENERATION -> "Potion of Strong Regeneration"; + case STRONG_SLOWNESS -> "Potion of Strong Slowness"; + case STRONG_STRENGTH -> "Potion of Strong Strength"; + case STRONG_SWIFTNESS -> "Potion of Swiftness"; + case STRONG_TURTLE_MASTER -> "Potion of Strong Turtle Master"; + default -> "Potion of " + Util.prettifyText(potionType.name()); }; } @@ -302,30 +323,7 @@ public class LangUtilsHook extends Hook { if (hooked) { return LanguageHelper.getSplashPotionName(potionType, getUserLocale(user)); } - return switch (potionType) { - case UNCRAFTABLE -> "Splash Uncraftable Potion"; - case WATER -> "Splash Water Bottle"; - case MUNDANE -> "Mundane Splash Potion"; - case THICK -> "Thick Splash Potion"; - case AWKWARD -> "Awkward Splash Potion"; - case NIGHT_VISION -> "Splash Potion of Night Vision"; - case INVISIBILITY -> "Splash Potion of Invisibility"; - case JUMP -> "Splash Potion of Leaping"; - case FIRE_RESISTANCE -> "Splash Potion of Fire Resistance"; - case SPEED -> "Splash Potion of Swiftness"; - case SLOWNESS -> "Splash Potion of Slowness"; - case WATER_BREATHING -> "Splash Potion of Water Breathing"; - case INSTANT_HEAL -> "Splash Potion of Healing"; - case INSTANT_DAMAGE -> "Splash Potion of Harming"; - case POISON -> "Splash Potion of Poison"; - case REGEN -> "Splash Potion of Regeneration"; - case STRENGTH -> "Splash Potion of Strength"; - case WEAKNESS -> "Splash Potion of Weakness"; - case LUCK -> "Splash Potion of Luck"; - case TURTLE_MASTER -> "Splash Potion of the Turtle Master"; - case SLOW_FALLING -> "Splash Potion of Slow Falling"; - default -> "Unknown Splash Potion"; - }; + return "Splash" + generalPotionName(potionType); } /** @@ -339,30 +337,7 @@ public class LangUtilsHook extends Hook { if (hooked) { return LanguageHelper.getLingeringPotionName(potionType, getUserLocale(user)); } - return switch (potionType) { - case UNCRAFTABLE -> "Lingering Uncraftable Potion"; - case WATER -> "Lingering Water Bottle"; - case MUNDANE -> "Mundane Lingering Potion"; - case THICK -> "Thick Lingering Potion"; - case AWKWARD -> "Awkward Lingering Potion"; - case NIGHT_VISION -> "Lingering Potion of Night Vision"; - case INVISIBILITY -> "Lingering Potion of Invisibility"; - case JUMP -> "Lingering Potion of Leaping"; - case FIRE_RESISTANCE -> "Lingering Potion of Fire Resistance"; - case SPEED -> "Lingering Potion of Swiftness"; - case SLOWNESS -> "Lingering Potion of Slowness"; - case WATER_BREATHING -> "Lingering Potion of Water Breathing"; - case INSTANT_HEAL -> "Lingering Potion of Healing"; - case INSTANT_DAMAGE -> "Lingering Potion of Harming"; - case POISON -> "Lingering Potion of Poison"; - case REGEN -> "Lingering Potion of Regeneration"; - case STRENGTH -> "Lingering Potion of Strength"; - case WEAKNESS -> "Lingering Potion of Weakness"; - case LUCK -> "Lingering Potion of Luck"; - case TURTLE_MASTER -> "Lingering Potion of the Turtle Master"; - case SLOW_FALLING -> "Lingering Potion of Slow Falling"; - default -> "Unknown Lingering Potion"; - }; + return "Lingering" + generalPotionName(potionType); } /** @@ -376,28 +351,7 @@ public class LangUtilsHook extends Hook { if (hooked) { return LanguageHelper.getTippedArrowName(potionType, getUserLocale(user)); } - return switch (potionType) { - case UNCRAFTABLE -> "Uncraftable Tipped Arrow"; - case WATER -> "Arrow of Splashing"; - case MUNDANE, THICK, AWKWARD -> "Tipped Arrow"; - case NIGHT_VISION -> "Arrow of Night Vision"; - case INVISIBILITY -> "Arrow of Invisibility"; - case JUMP -> "Arrow of Leaping"; - case FIRE_RESISTANCE -> "Arrow of Fire Resistance"; - case SPEED -> "Arrow of Swiftness"; - case SLOWNESS -> "Arrow of Slowness"; - case WATER_BREATHING -> "Arrow of Water Breathing"; - case INSTANT_HEAL -> "Arrow of Healing"; - case INSTANT_DAMAGE -> "Arrow of Harming"; - case POISON -> "Arrow of Poison"; - case REGEN -> "Arrow of Regeneration"; - case STRENGTH -> "Arrow of Strength"; - case WEAKNESS -> "Arrow of Weakness"; - case LUCK -> "Arrow of Luck"; - case TURTLE_MASTER -> "Arrow of the Turtle Master"; - case SLOW_FALLING -> "Arrow of Slow Falling"; - default -> "Unknown Arrow"; - }; + return generalPotionName(potionType).replaceAll("Potion", "Arrow"); } /** @@ -413,11 +367,12 @@ public class LangUtilsHook extends Hook { if (hooked) { return LanguageHelper.getPotionBaseEffectName(potionType, getUserLocale(user)); } - PotionEffectType effectType = potionType.getEffectType(); - if (effectType == null) { + List effects = potionType.getPotionEffects(); + if (effects.isEmpty()) { return "No Effects"; } - return Util.prettifyText(effectType.getName()); + return effects.stream().map(effect -> Util.prettifyText(effect.getType().getKey().getKey())) + .collect(Collectors.joining(", ")); } /** @@ -430,7 +385,7 @@ public class LangUtilsHook extends Hook { public static String getPotionEffectName(PotionEffectType effectType, User user) { return hooked ? LanguageHelper.getPotionEffectName(effectType, getUserLocale(user)) - : Util.prettifyText(effectType.getName()); + : Util.prettifyText(effectType.getKey().getKey()); } /** diff --git a/src/main/java/world/bentobox/bentobox/hooks/MultipaperHook.java b/src/main/java/world/bentobox/bentobox/hooks/MultipaperHook.java new file mode 100644 index 000000000..dc578e5cc --- /dev/null +++ b/src/main/java/world/bentobox/bentobox/hooks/MultipaperHook.java @@ -0,0 +1,420 @@ +package world.bentobox.bentobox.hooks; + +import java.util.Collection; +import java.util.function.BiConsumer; +import java.util.function.Consumer; + +import org.bukkit.Chunk; +import org.bukkit.Location; +import org.bukkit.Material; +import org.bukkit.World; +import org.bukkit.block.Block; +import org.bukkit.entity.Entity; +import org.bukkit.entity.Player; +import org.bukkit.plugin.Plugin; +import org.eclipse.jdt.annotation.NonNull; +import org.eclipse.jdt.annotation.Nullable; + +import com.github.puregero.multilib.DataStorageImpl; +import com.github.puregero.multilib.MultiLib; + +import world.bentobox.bentobox.api.hooks.Hook; + +/** + * Hook for Multipaper + */ +public class MultipaperHook extends Hook { + + public MultipaperHook() { + super("multipaper", Material.PAPER); + } + + @Override + public boolean hook() { + return MultiLib.isMultiPaper(); + } + + /** + * @return true if this is a Multipaper server + */ + @Override + public boolean isPluginAvailable() { + return MultiLib.isMultiPaper(); + } + + /** + * Always null because it is not a plugin + * @return null + */ + @Nullable + @Override + public Plugin getPlugin() { + return null; + } + + /** + * Returns whether the chunk is running on an external server or not. + * + * @return True if the chunk is an external chunk, or false if the chunk + * is running on this server or if it's unloaded. + */ + public static boolean isChunkExternal(World world, int cx, int cz) { + return MultiLib.isChunkExternal(world, cx, cz); + } + + /** + * Returns whether the chunk is running on an external server or not. + * + * @return True if the chunk is an external chunk, or false if the chunk + * is running on this server or if it's unloaded. + */ + public static boolean isChunkExternal(Location location) { + return MultiLib.isChunkExternal(location); + } + + /** + * Returns whether the chunk is running on an external server or not. + * + * @return True if the chunk is an external chunk, or false if the chunk + * is running on this server or if it's unloaded. + */ + public static boolean isChunkExternal(Entity entity) { + return MultiLib.isChunkExternal(entity); + } + + /** + * Returns whether the chunk is running on an external server or not. + * + * @return True if the chunk is an external chunk, or false if the chunk + * is running on this server or if it's unloaded. + */ + public static boolean isChunkExternal(Block block) { + return MultiLib.isChunkExternal(block); + } + + /** + * Returns whether the chunk is running on an external server or not. + * + * @return True if the chunk is an external chunk, or false if the chunk + * is running on this server or if it's unloaded. + */ + public static boolean isChunkExternal(Chunk chunk) { + return MultiLib.isChunkExternal(chunk); + } + + /** + * Returns whether the chunk is running on this server or not. + * + * @return True if the chunk is a local chunk, or false if the chunk + * is running on an external server or if it's unloaded. + */ + public static boolean isChunkLocal(World world, int cx, int cz) { + return MultiLib.isChunkLocal(world, cx, cz); + } + + /** + * Returns whether the chunk is running on this server or not. + * + * @return True if the chunk is a local chunk, or false if the chunk + * is running on an external server or if it's unloaded. + */ + public static boolean isChunkLocal(Location location) { + return MultiLib.isChunkLocal(location); + } + + /** + * Returns whether the chunk is running on this server or not. + * + * @return True if the chunk is a local chunk, or false if the chunk + * is running on an external server or if it's unloaded. + */ + public static boolean isChunkLocal(Entity entity) { + return MultiLib.isChunkLocal(entity); + } + + /** + * Returns whether the chunk is running on this server or not. + * + * @return True if the chunk is a local chunk, or false if the chunk + * is running on an external server or if it's unloaded. + */ + public static boolean isChunkLocal(Block block) { + return MultiLib.isChunkLocal(block); + } + + /** + * Returns whether the chunk is running on this server or not. + * + * @return True if the chunk is a local chunk, or false if the chunk + * is running on an external server or if it's unloaded. + */ + public static boolean isChunkLocal(Chunk chunk) { + return MultiLib.isChunkLocal(chunk); + } + + /** + * Returns whether the player is on an external server or not. + * + * @return True if the player is on an external server. + */ + public static boolean isExternalPlayer(Player player) { + return MultiLib.isExternalPlayer(player); + } + + /** + * Returns whether the player is on this server or not. + * + * @return True if the player is on this server. + */ + public static boolean isLocalPlayer(Player player) { + return MultiLib.isLocalPlayer(player); + } + + /** + * Get the bungeecord name of this server. + * + * @return the bungeecord name of this server + */ + @NonNull + public static String getLocalServerName() { + return MultiLib.getLocalServerName(); + } + + /** + * Get the bungeecord name of the server that this player is on. + * + * @return The bungeecord name of the server the player is on for external + * players, or null for local players. + */ + @Nullable + public static String getExternalServerName(Player player) { + return MultiLib.getExternalServerName(player); + } + + /** + * Returns cross-server data that is stored under the specified key. Note + * that all plugins share the same set of keys. This data is + * non-persistent, it will be lost when the player disconnects. + * + * @param key The key the data is stored under. + * @return The data stored under the key, or null if the key isn't set. + */ + public static String getData(Player player, String key) { + return MultiLib.getData(player, key); + } + + /** + * Store cross-server data under the specified key. Note that all plugins + * share the same set of keys. This data is non-persistent, it will be + * lost when the player disconnects. + * + * @param key The key to store the data under. + * @param value The data to store under the key. + */ + public static void setData(Player player, String key, String value) { + MultiLib.setData(player, key, value); + } + + /** + * Returns cross-server data that is stored under the specified key. Note + * that all plugins share the same set of keys. This data is persistent, + * it will be saved even if the player disconnects. This persistent data is + * saved onto the player's .dat file. + * + * @param key The key the data is stored under. + * @return The data stored under the key, or null if the key isn't set. + */ + public static String getPersistentData(Player player, String key) { + return MultiLib.getPersistentData(player, key); + } + + /** + * Store cross-server data under the specified key. Note that all plugins + * share the same set of keys. This data is persistent, it will be saved + * even if the player disconnects. This persistent data is saved onto the + * player's .dat file. + * + * @param key The key to store the data under. + * @param value The data to store under the key. + */ + public static void setPersistentData(Player player, String key, String value) { + MultiLib.setPersistentData(player, key, value); + } + + /** + * Listen to notifications sent by other servers. + * + * @param plugin The plugin listening to these notifications + * @param channel The notification channel to listen to + * @param callback A handler for any data received + */ + public static void on(Plugin plugin, String channel, Consumer callback) { + MultiLib.on(plugin, channel, callback); + } + + /** + * Listen to notifications sent by other servers. + * + * @param plugin The plugin listening to these notifications + * @param channel The notification channel to listen to + * @param callback A handler for any data received + */ + public static void onString(Plugin plugin, String channel, Consumer callback) { + MultiLib.onString(plugin, channel, callback); + } + + /** + * Listen to notifications sent by other servers. + * + * @param plugin The plugin listening to these notifications + * @param channel The notification channel to listen to + * @param callbackWithReply A handler for any data received, and a method to reply to the server on a specified channel + */ + public static void on(Plugin plugin, String channel, + BiConsumer> callbackWithReply) { + MultiLib.on(plugin, channel, callbackWithReply); + } + + /** + * Listen to notifications sent by other servers. + * + * @param plugin The plugin listening to these notifications + * @param channel The notification channel to listen to + * @param callbackWithReply A handler for any data received, and a method to reply to the server on a specified channel + */ + public static void onString(Plugin plugin, String channel, + BiConsumer> callbackWithReply) { + MultiLib.onString(plugin, channel, callbackWithReply); + } + + /** + * Notify all other servers. + * + * @param channel The notification channel to notify on + * @param data The data to notify other servers with + */ + public static void notify(String channel, byte[] data) { + MultiLib.notify(channel, data); + } + + /** + * Notify all other servers. + * + * @param channel The notification channel to notify on + * @param data The data to notify other servers with + */ + public static void notify(String channel, String data) { + MultiLib.notify(channel, data); + } + + /** + * Notify other servers with the specified chunk loaded + * + * @param chunk The chunk that's loaded + * @param channel The notification channel to notify on + * @param data The data to notify other servers with + */ + public static void notify(Chunk chunk, String channel, byte[] data) { + MultiLib.notify(chunk, channel, data); + } + + /** + * Notify other servers with the specified chunk loaded + * + * @param chunk The chunk that's loaded + * @param channel The notification channel to notify on + * @param data The data to notify other servers with + */ + public static void notify(Chunk chunk, String channel, String data) { + MultiLib.notify(chunk, channel, data); + } + + /** + * Notify the owning server of the specified chunk. + * This chunk must be loaded on this server. + * This will notify this server if this server is the owning server. + * + * @param chunk The loaded chunk with an owning server + * @param channel The notification channel to notify on + * @param data The data to notify other servers with + */ + public static void notifyOwningServer(Chunk chunk, String channel, byte[] data) { + MultiLib.notifyOwningServer(chunk, channel, data); + } + + /** + * Notify the owning server of the specified chunk. + * This chunk must be loaded on this server. + * This will notify this server if this server is the owning server. + * + * @param chunk The loaded chunk with an owning server + * @param channel The notification channel to notify on + * @param data The data to notify other servers with + */ + public static void notifyOwningServer(Chunk chunk, String channel, String data) { + MultiLib.notifyOwningServer(chunk, channel, data); + } + + /** + * Notify the owning server of the specified player. + * This will notify this server if this server is the owning server. + * + * @param player The player with an owning server + * @param channel The notification channel to notify on + * @param data The data to notify other servers with + */ + public static void notifyOwningServer(Player player, String channel, byte[] data) { + MultiLib.notifyOwningServer(player, channel, data); + } + + /** + * Notify the owning server of the specified player. + * This will notify this server if this server is the owning server. + * + * @param player The player with an owning server + * @param channel The notification channel to notify on + * @param data The data to notify other servers with + */ + public static void notifyOwningServer(Player player, String channel, String data) { + MultiLib.notifyOwningServer(player, channel, data); + } + + /** + * Says a message (or runs a command) on other servers excluding this one. + * + * @param message The chat message to say + */ + public static void chatOnOtherServers(Player player, String message) { + MultiLib.chatOnOtherServers(player, message); + } + + /** + * Returns all online players across all server instances. + * + * @return a view of all online players + */ + public static Collection getAllOnlinePlayers() { + return MultiLib.getAllOnlinePlayers(); + } + + /** + * Returns players logged into your single local server instance. + * + * @return a view of players online on your local instance + */ + public static Collection getLocalOnlinePlayers() { + return MultiLib.getLocalOnlinePlayers(); + } + + /** + * Gets the multipaper key-value data storage. Accessing this data is + * asynchronous. This storage medium is hosted on the Master instance, + * or a yaml file when using Bukkit. + * + * @return the multipaper data storage + */ + public static DataStorageImpl getDataStorage() { + return MultiLib.getDataStorage(); + } + +} diff --git a/src/main/java/world/bentobox/bentobox/listeners/JoinLeaveListener.java b/src/main/java/world/bentobox/bentobox/listeners/JoinLeaveListener.java index f73f3dac3..605e020c3 100644 --- a/src/main/java/world/bentobox/bentobox/listeners/JoinLeaveListener.java +++ b/src/main/java/world/bentobox/bentobox/listeners/JoinLeaveListener.java @@ -2,6 +2,7 @@ package world.bentobox.bentobox.listeners; import java.util.Collections; import java.util.Objects; +import java.util.Set; import java.util.UUID; import org.bukkit.Bukkit; @@ -61,7 +62,7 @@ public class JoinLeaveListener implements Listener { // Make sure the player is loaded into the cache or create the player if they // don't exist - players.addPlayer(playerUUID); + players.getPlayer(playerUUID); // Reset island resets if required plugin.getIWM().getOverWorlds().stream() @@ -74,7 +75,6 @@ public class JoinLeaveListener implements Listener { // Set the player's name (it may have changed), but only if it isn't empty if (!user.getName().isEmpty()) { players.setPlayerName(user); - players.save(playerUUID); } else { plugin.logWarning("Player that just logged in has no name! " + playerUUID); } @@ -110,7 +110,7 @@ public class JoinLeaveListener implements Listener { private void firstTime(User user) { // Make sure the player is loaded into the cache or create the player if they // don't exist - players.addPlayer(user.getUniqueId()); + players.getPlayer(user.getUniqueId()); plugin.getIWM().getOverWorlds().stream().filter(w -> plugin.getIWM().isCreateIslandOnFirstLoginEnabled(w)) .forEach(w -> { @@ -181,13 +181,15 @@ public class JoinLeaveListener implements Listener { user.getPlayer().getInventory().clear(); } - playerData.getPendingKicks().remove(world.getName()); - players.save(user.getUniqueId()); + Set kicks = playerData.getPendingKicks(); + kicks.remove(world.getName()); + playerData.setPendingKicks(kicks); + } } private void updateIslandRange(User user) { - plugin.getIslands().getIslands().stream() + plugin.getIslands().getIslands(user.getUniqueId()).stream() .filter(island -> island.getOwner() != null && island.getOwner().equals(user.getUniqueId())) .forEach(island -> { // Check if new owner has a different range permission than the island size @@ -218,8 +220,7 @@ public class JoinLeaveListener implements Listener { // Remove any coops if all the island players have left // Go through all the islands this player is a member of, check if all members // have left, remove coops - - plugin.getIslands().getIslands().stream() + plugin.getIslands().getIslands(event.getPlayer().getUniqueId()).stream() .filter(island -> island.getMembers().containsKey(event.getPlayer().getUniqueId())).forEach(island -> { // Are there any online players still for this island? if (Bukkit.getOnlinePlayers().stream().filter(p -> !event.getPlayer().equals(p)) @@ -236,7 +237,6 @@ public class JoinLeaveListener implements Listener { }); // Remove any coop associations from the player logging out plugin.getIslands().clearRank(RanksManager.COOP_RANK, event.getPlayer().getUniqueId()); - players.save(event.getPlayer().getUniqueId()); User.removePlayer(event.getPlayer()); } } diff --git a/src/main/java/world/bentobox/bentobox/listeners/PanelListenerManager.java b/src/main/java/world/bentobox/bentobox/listeners/PanelListenerManager.java index 53d402c5e..6cb57fd45 100644 --- a/src/main/java/world/bentobox/bentobox/listeners/PanelListenerManager.java +++ b/src/main/java/world/bentobox/bentobox/listeners/PanelListenerManager.java @@ -61,6 +61,7 @@ public class PanelListenerManager implements Listener { // Refresh l.refreshPanel(); }); + } else { // Wrong name - delete this panel openPanels.remove(user.getUniqueId()); diff --git a/src/main/java/world/bentobox/bentobox/listeners/SeedWorldMakerListener.java b/src/main/java/world/bentobox/bentobox/listeners/SeedWorldMakerListener.java new file mode 100644 index 000000000..72e42adae --- /dev/null +++ b/src/main/java/world/bentobox/bentobox/listeners/SeedWorldMakerListener.java @@ -0,0 +1,59 @@ +package world.bentobox.bentobox.listeners; + +import org.bukkit.Bukkit; +import org.bukkit.World; +import org.bukkit.event.EventHandler; +import org.bukkit.event.EventPriority; +import org.bukkit.event.Listener; +import org.bukkit.event.world.ChunkLoadEvent; + +import world.bentobox.bentobox.BentoBox; +import world.bentobox.bentobox.api.addons.GameModeAddon; +import world.bentobox.bentobox.api.events.BentoBoxReadyEvent; +import world.bentobox.bentobox.util.Util; + +/** + * Updates chunks in seed worlds if they have been generated in the main world + * @author tastybento + */ +public class SeedWorldMakerListener implements Listener { + + private final BentoBox plugin; + + /** + * Whether BentoBox is ready or not. + * This helps to avoid hanging out the server on startup as a lot of {@link ChunkLoadEvent} are called at this time. + * @since 1.1 + */ + private boolean ready; + + + public SeedWorldMakerListener(BentoBox bentoBox) { + this.plugin = bentoBox; + } + + @EventHandler(priority = EventPriority.LOW, ignoreCancelled = true) + public void onBentoBoxReady(BentoBoxReadyEvent e) { + ready = true; + } + + @EventHandler(priority = EventPriority.LOW, ignoreCancelled = true) + public void onChunkLoad(ChunkLoadEvent e) { + if (!ready || !e.getChunk().isGenerated()) { + return; + } + World world = e.getWorld(); + plugin.getIWM().getAddon(world).filter(GameModeAddon::isUsesNewChunkGeneration).ifPresent(gma -> { + World seed = Bukkit.getWorld(world.getName() + "/bentobox"); + int x = e.getChunk().getX(); + int z = e.getChunk().getZ(); + if (seed != null && !seed.getChunkAt(x, z, false).isGenerated()) { + Util.getChunkAtAsync(seed, x, z, true); + } + }); + + } + + + +} diff --git a/src/main/java/world/bentobox/bentobox/listeners/flags/clicklisteners/CommandCycleClick.java b/src/main/java/world/bentobox/bentobox/listeners/flags/clicklisteners/CommandCycleClick.java index 8b78b725d..d5891191b 100644 --- a/src/main/java/world/bentobox/bentobox/listeners/flags/clicklisteners/CommandCycleClick.java +++ b/src/main/java/world/bentobox/bentobox/listeners/flags/clicklisteners/CommandCycleClick.java @@ -60,9 +60,6 @@ public class CommandCycleClick implements ClickHandler { } // Apply change to panel panel.getInventory().setItem(slot, commandRankClickListener.getPanelItem(command, user, world).getItem()); - // Save island - plugin.getIslands().save(island); - } else { user.getPlayer().playSound(user.getLocation(), Sound.BLOCK_METAL_HIT, 1F, 1F); } diff --git a/src/main/java/world/bentobox/bentobox/listeners/flags/protection/BreakBlocksListener.java b/src/main/java/world/bentobox/bentobox/listeners/flags/protection/BreakBlocksListener.java index 0ad6a318d..b40c99b05 100644 --- a/src/main/java/world/bentobox/bentobox/listeners/flags/protection/BreakBlocksListener.java +++ b/src/main/java/world/bentobox/bentobox/listeners/flags/protection/BreakBlocksListener.java @@ -80,16 +80,20 @@ public class BreakBlocksListener extends FlagListener { Player p = e.getPlayer(); Location l = e.getClickedBlock().getLocation(); Material m = e.getClickedBlock().getType(); - // Check for berry picking - if (e.getAction() == Action.RIGHT_CLICK_BLOCK && (e.getClickedBlock().getType() == Material.CAVE_VINES || e.getClickedBlock().getType() == Material.CAVE_VINES_PLANT)) { - if (!((CaveVinesPlant) e.getClickedBlock().getBlockData()).isBerries()) { - return; + // Right click handling + if (e.getAction() == Action.RIGHT_CLICK_BLOCK) { + Material clickedType = e.getClickedBlock().getType(); + switch (clickedType) { + case CAVE_VINES, CAVE_VINES_PLANT -> { + if (((CaveVinesPlant) e.getClickedBlock().getBlockData()).isBerries()) { + this.checkIsland(e, p, l, Flags.HARVEST); } - this.checkIsland(e, p, l, Flags.HARVEST); - return; - } - if (e.getAction() == Action.RIGHT_CLICK_BLOCK && e.getClickedBlock().getType() == Material.SWEET_BERRY_BUSH) { - this.checkIsland(e, p, l, Flags.HARVEST); + } + case SWEET_BERRY_BUSH -> this.checkIsland(e, p, l, Flags.HARVEST); + case ROOTED_DIRT -> this.checkIsland(e, p, l, Flags.BREAK_BLOCKS); + default -> { // Do nothing + } + } return; } // Only handle hitting things diff --git a/src/main/java/world/bentobox/bentobox/listeners/flags/protection/BreedingListener.java b/src/main/java/world/bentobox/bentobox/listeners/flags/protection/BreedingListener.java index 6d61d761a..0a09e196b 100644 --- a/src/main/java/world/bentobox/bentobox/listeners/flags/protection/BreedingListener.java +++ b/src/main/java/world/bentobox/bentobox/listeners/flags/protection/BreedingListener.java @@ -17,6 +17,7 @@ import org.bukkit.inventory.EquipmentSlot; import org.bukkit.inventory.ItemStack; import com.google.common.base.Enums; +import com.google.common.base.Optional; import world.bentobox.bentobox.api.flags.FlagListener; import world.bentobox.bentobox.lists.Flags; @@ -28,7 +29,6 @@ import world.bentobox.bentobox.lists.Flags; * */ public class BreedingListener extends FlagListener { - /** * A list of items that cause breeding if a player has them in their hand and they click an animal * This list may need to be extended with future versions of Minecraft. @@ -41,7 +41,10 @@ public class BreedingListener extends FlagListener { bi.put(EntityType.HORSE, Arrays.asList(Material.GOLDEN_APPLE, Material.GOLDEN_CARROT)); bi.put(EntityType.DONKEY, Arrays.asList(Material.GOLDEN_APPLE, Material.GOLDEN_CARROT)); bi.put(EntityType.COW, Collections.singletonList(Material.WHEAT)); - bi.put(EntityType.MUSHROOM_COW, Collections.singletonList(Material.WHEAT)); + Optional mc = Enums.getIfPresent(EntityType.class, "MUSHROOM_COW"); + if (mc.isPresent()) { + bi.put(mc.get(), Collections.singletonList(Material.WHEAT)); + } bi.put(EntityType.SHEEP, Collections.singletonList(Material.WHEAT)); bi.put(EntityType.PIG, Arrays.asList(Material.CARROT, Material.POTATO, Material.BEETROOT)); bi.put(EntityType.CHICKEN, Arrays.asList(Material.WHEAT_SEEDS, Material.PUMPKIN_SEEDS, Material.MELON_SEEDS, Material.BEETROOT_SEEDS)); diff --git a/src/main/java/world/bentobox/bentobox/listeners/flags/protection/HurtingListener.java b/src/main/java/world/bentobox/bentobox/listeners/flags/protection/HurtingListener.java index 942cb7edb..3553d61f8 100644 --- a/src/main/java/world/bentobox/bentobox/listeners/flags/protection/HurtingListener.java +++ b/src/main/java/world/bentobox/bentobox/listeners/flags/protection/HurtingListener.java @@ -51,7 +51,10 @@ public class HurtingListener extends FlagListener { public void onEntityDamage(final EntityDamageByEntityEvent e) { // Mobs being hurt - if (Util.isPassiveEntity(e.getEntity())) + if (Util.isTamableEntity(e.getEntity())) { + this.respond(e, e.getDamager(), Flags.HURT_TAMED_ANIMALS); + } + else if (Util.isPassiveEntity(e.getEntity())) { this.respond(e, e.getDamager(), Flags.HURT_ANIMALS); } @@ -92,7 +95,8 @@ public class HurtingListener extends FlagListener { return; } - if ((Util.isPassiveEntity(e.getCaught()) && checkIsland(e, e.getPlayer(), e.getCaught().getLocation(), Flags.HURT_ANIMALS)) + if ((Util.isTamableEntity(e.getCaught()) && checkIsland(e, e.getPlayer(), e.getCaught().getLocation(), Flags.HURT_TAMED_ANIMALS)) + || (Util.isPassiveEntity(e.getCaught()) && checkIsland(e, e.getPlayer(), e.getCaught().getLocation(), Flags.HURT_ANIMALS)) || (Util.isHostileEntity(e.getCaught()) && checkIsland(e, e.getPlayer(), e.getCaught().getLocation(), Flags.HURT_MONSTERS)) || (e.getCaught() instanceof AbstractVillager && checkIsland(e, e.getPlayer(), e.getCaught().getLocation(), Flags.HURT_VILLAGERS))) { e.getHook().remove(); @@ -113,7 +117,11 @@ public class HurtingListener extends FlagListener { if (e.getRightClicked() instanceof Parrot && (e.getHand().equals(EquipmentSlot.HAND) && e.getPlayer().getInventory().getItemInMainHand().getType().equals(Material.COOKIE)) || (e.getHand().equals(EquipmentSlot.OFF_HAND) && e.getPlayer().getInventory().getItemInOffHand().getType().equals(Material.COOKIE))) { - checkIsland(e, e.getPlayer(), e.getRightClicked().getLocation(), Flags.HURT_ANIMALS); + if (((Parrot) e.getRightClicked()).isTamed()) { + checkIsland(e, e.getPlayer(), e.getRightClicked().getLocation(), Flags.HURT_TAMED_ANIMALS); + } else { + checkIsland(e, e.getPlayer(), e.getRightClicked().getLocation(), Flags.HURT_ANIMALS); + } } } @@ -139,6 +147,13 @@ public class HurtingListener extends FlagListener { } } + // Tamed animals being hurt + if (Util.isTamableEntity(entity) && !checkIsland(e, attacker, entity.getLocation(), Flags.HURT_TAMED_ANIMALS)) { + for (PotionEffect effect : e.getPotion().getEffects()) { + entity.removePotionEffect(effect.getType()); + } + } + // Mobs being hurt if (Util.isPassiveEntity(entity) && !checkIsland(e, attacker, entity.getLocation(), Flags.HURT_ANIMALS)) { for (PotionEffect effect : e.getPotion().getEffects()) { @@ -189,6 +204,10 @@ public class HurtingListener extends FlagListener { if (Util.isHostileEntity(entity)) { checkIsland(e, attacker, entity.getLocation(), Flags.HURT_MONSTERS); } + // Tamed animals being hurt + if (Util.isTamableEntity(entity)) { + checkIsland(e, attacker, entity.getLocation(), Flags.HURT_TAMED_ANIMALS); + } // Mobs being hurt if (Util.isPassiveEntity(entity)) { checkIsland(e, attacker, entity.getLocation(), Flags.HURT_ANIMALS); diff --git a/src/main/java/world/bentobox/bentobox/listeners/flags/protection/LeashListener.java b/src/main/java/world/bentobox/bentobox/listeners/flags/protection/LeashListener.java index c07366d56..86724f379 100644 --- a/src/main/java/world/bentobox/bentobox/listeners/flags/protection/LeashListener.java +++ b/src/main/java/world/bentobox/bentobox/listeners/flags/protection/LeashListener.java @@ -9,6 +9,7 @@ import org.bukkit.event.player.PlayerUnleashEntityEvent; import world.bentobox.bentobox.api.flags.FlagListener; import world.bentobox.bentobox.lists.Flags; +import world.bentobox.bentobox.util.Util; /** * @author tastybento @@ -42,7 +43,8 @@ public class LeashListener extends FlagListener { */ @EventHandler(priority = EventPriority.LOW, ignoreCancelled = true) public void onPlayerLeashHitch(final HangingPlaceEvent e) { - if (e.getEntity().getType().equals(EntityType.LEASH_HITCH)) { + EntityType LEASH_HITCH = Util.findFirstMatchingEnum(EntityType.class, "LEASH_HITCH", "LEASH_KNOT"); + if (e.getEntity().getType().equals(LEASH_HITCH)) { checkIsland(e, e.getPlayer(), e.getEntity().getLocation(), Flags.LEASH); } } diff --git a/src/main/java/world/bentobox/bentobox/listeners/flags/protection/PaperShearingListener.java b/src/main/java/world/bentobox/bentobox/listeners/flags/protection/PaperShearingListener.java new file mode 100644 index 000000000..24dbd31c6 --- /dev/null +++ b/src/main/java/world/bentobox/bentobox/listeners/flags/protection/PaperShearingListener.java @@ -0,0 +1,18 @@ +package world.bentobox.bentobox.listeners.flags.protection; + +import org.bukkit.event.EventHandler; +import org.bukkit.event.EventPriority; + +import io.papermc.paper.event.block.PlayerShearBlockEvent; +import world.bentobox.bentobox.api.flags.FlagListener; +import world.bentobox.bentobox.lists.Flags; + +public class PaperShearingListener extends FlagListener { + + // Block shearing - paper only + @EventHandler(priority = EventPriority.LOW) + public void onShearBlock(final PlayerShearBlockEvent e) { + checkIsland(e, e.getPlayer(), e.getBlock().getLocation(), Flags.SHEARING); + } + +} diff --git a/src/main/java/world/bentobox/bentobox/listeners/flags/protection/ShearingListener.java b/src/main/java/world/bentobox/bentobox/listeners/flags/protection/ShearingListener.java index e35c370ee..028cff069 100644 --- a/src/main/java/world/bentobox/bentobox/listeners/flags/protection/ShearingListener.java +++ b/src/main/java/world/bentobox/bentobox/listeners/flags/protection/ShearingListener.java @@ -1,11 +1,13 @@ package world.bentobox.bentobox.listeners.flags.protection; +import org.bukkit.Bukkit; import org.bukkit.event.EventHandler; import org.bukkit.event.EventPriority; import org.bukkit.event.player.PlayerShearEntityEvent; import world.bentobox.bentobox.api.flags.FlagListener; import world.bentobox.bentobox.lists.Flags; +import world.bentobox.bentobox.util.Util; /** * Handles shearing @@ -14,6 +16,12 @@ import world.bentobox.bentobox.lists.Flags; */ public class ShearingListener extends FlagListener { + public ShearingListener() { + if (Util.isPaper()) { + Bukkit.getPluginManager().registerEvents(new PaperShearingListener(), getPlugin()); + } + } + // Protect sheep @EventHandler(priority = EventPriority.LOW) public void onShear(final PlayerShearEntityEvent e) { diff --git a/src/main/java/world/bentobox/bentobox/listeners/flags/protection/TNTListener.java b/src/main/java/world/bentobox/bentobox/listeners/flags/protection/TNTListener.java index 1543de382..f0878c8ce 100644 --- a/src/main/java/world/bentobox/bentobox/listeners/flags/protection/TNTListener.java +++ b/src/main/java/world/bentobox/bentobox/listeners/flags/protection/TNTListener.java @@ -17,6 +17,9 @@ import org.bukkit.event.entity.EntityDamageEvent; import org.bukkit.event.entity.EntityExplodeEvent; import org.bukkit.event.player.PlayerInteractEvent; +import com.google.common.base.Enums; +import com.google.common.base.Optional; + import world.bentobox.bentobox.api.flags.FlagListener; import world.bentobox.bentobox.lists.Flags; @@ -25,13 +28,26 @@ import world.bentobox.bentobox.lists.Flags; * @author tastybento */ public class TNTListener extends FlagListener { - /** * Contains {@link EntityType}s that generates an explosion. * @since 1.5.0 */ - private static final List TNT_TYPES = List.of(EntityType.PRIMED_TNT, EntityType.MINECART_TNT); + private static final List TNT_TYPES = List.of( + findFirstMatchingEnum(EntityType.class, "PRIMED_TNT", "TNT"), + findFirstMatchingEnum(EntityType.class, "MINECART_TNT", "TNT_MINECART")); + private static > T findFirstMatchingEnum(Class enumClass, String... values) { + if (enumClass == null || values == null) { + return null; + } + for (String value : values) { + Optional enumConstant = Enums.getIfPresent(enumClass, value.toUpperCase()); + if (enumConstant.isPresent()) { + return enumConstant.get(); + } + } + return null; // Return null if no match is found + } /** * Contains {@link Material}s that can be used to prime a TNT. * @since 1.5.0 diff --git a/src/main/java/world/bentobox/bentobox/listeners/flags/settings/PVPListener.java b/src/main/java/world/bentobox/bentobox/listeners/flags/settings/PVPListener.java index 2b6689165..401295fad 100644 --- a/src/main/java/world/bentobox/bentobox/listeners/flags/settings/PVPListener.java +++ b/src/main/java/world/bentobox/bentobox/listeners/flags/settings/PVPListener.java @@ -53,8 +53,9 @@ public class PVPListener extends FlagListener { @EventHandler(priority = EventPriority.LOW, ignoreCancelled = true) public void onEntityDamage(EntityDamageByEntityEvent e) { if (e.getEntity() instanceof Player player && getPlugin().getIWM().inWorld(e.getEntity().getWorld())) { - // Allow self damage or NPC attack because Citizens handles its own PVP - if (e.getEntity().equals(e.getDamager()) || e.getEntity().hasMetadata("NPC")) { + // Allow self damage or NPC attack or attack by NPC because Citizens handles its own PVP + if (e.getEntity().equals(e.getDamager()) || e.getEntity().hasMetadata("NPC") + || e.getDamager().hasMetadata("NPC")) { return; } // Is PVP allowed here? @@ -224,9 +225,7 @@ public class PVPListener extends FlagListener { // Only care about PVP Flags if (Flags.PVP_OVERWORLD.equals(flag) || Flags.PVP_NETHER.equals(flag) || Flags.PVP_END.equals(flag)) { String message = "protection.flags." + flag.getID() + "." + (e.isSetTo() ? "enabled" : "disabled"); - // Send the message to visitors - e.getIsland().getVisitors().forEach(visitor -> User.getInstance(visitor).sendMessage(message)); - // Send the message to players on the island + // Send the message to all players on the island e.getIsland().getPlayersOnIsland().forEach(player -> User.getInstance(player).sendMessage(message)); } } @@ -268,7 +267,7 @@ public class PVPListener extends FlagListener { private void alertUser(@NonNull Player player, Flag flag) { String message = "protection.flags." + flag.getID() + ".enabled"; - User.getInstance(player).sendMessage(message); + User.getInstance(player).notify(message); player.playSound(player.getLocation(), Sound.ENTITY_ARROW_HIT_PLAYER,2F, 1F); } } diff --git a/src/main/java/world/bentobox/bentobox/listeners/flags/worldsettings/CreeperListener.java b/src/main/java/world/bentobox/bentobox/listeners/flags/worldsettings/CreeperListener.java index bbe835457..7adf0d6d6 100644 --- a/src/main/java/world/bentobox/bentobox/listeners/flags/worldsettings/CreeperListener.java +++ b/src/main/java/world/bentobox/bentobox/listeners/flags/worldsettings/CreeperListener.java @@ -1,5 +1,8 @@ package world.bentobox.bentobox.listeners.flags.worldsettings; + +import org.bukkit.Location; +import org.bukkit.Material; import org.bukkit.entity.Creeper; import org.bukkit.entity.EntityType; import org.bukkit.entity.Player; @@ -8,6 +11,7 @@ import org.bukkit.event.EventPriority; import org.bukkit.event.entity.EntityDamageByEntityEvent; import org.bukkit.event.entity.EntityDamageEvent; import org.bukkit.event.entity.EntityExplodeEvent; +import org.bukkit.event.player.PlayerInteractEntityEvent; import world.bentobox.bentobox.api.flags.FlagListener; import world.bentobox.bentobox.api.localization.TextVariables; @@ -68,4 +72,33 @@ public class CreeperListener extends FlagListener { e.setCancelled(true); } } + + + /** + * Prevent creepers from igniting if they are not allowed to grief + * @param e - event + * @since 2.4.0 + */ + @EventHandler(priority = EventPriority.NORMAL, ignoreCancelled = true) + public void onPlayerInteractEntity(PlayerInteractEntityEvent e) + { + Player player = e.getPlayer(); + Location location = e.getRightClicked().getLocation(); + + if (!Flags.CREEPER_GRIEFING.isSetForWorld(location.getWorld()) && + e.getRightClicked() instanceof Creeper && + !this.getIslandsManager().locationIsOnIsland(player, location)) + { + Material mainHand = player.getInventory().getItemInMainHand().getType(); + + if (Material.FIRE_CHARGE.equals(mainHand) || + Material.FLINT_AND_STEEL.equals(mainHand)) + { + // Creeper igniting + User user = User.getInstance(player); + user.notify("protection.protected", TextVariables.DESCRIPTION, user.getTranslation(Flags.CREEPER_GRIEFING.getHintReference())); + e.setCancelled(true); + } + } + } } diff --git a/src/main/java/world/bentobox/bentobox/listeners/flags/worldsettings/ObsidianScoopingListener.java b/src/main/java/world/bentobox/bentobox/listeners/flags/worldsettings/ObsidianScoopingListener.java index 0900d396a..25ac4051a 100644 --- a/src/main/java/world/bentobox/bentobox/listeners/flags/worldsettings/ObsidianScoopingListener.java +++ b/src/main/java/world/bentobox/bentobox/listeners/flags/worldsettings/ObsidianScoopingListener.java @@ -17,6 +17,7 @@ import org.bukkit.event.block.Action; import org.bukkit.event.player.PlayerInteractEvent; import org.bukkit.inventory.EquipmentSlot; import org.bukkit.inventory.ItemStack; +import org.bukkit.util.RayTraceResult; import world.bentobox.bentobox.BentoBox; import world.bentobox.bentobox.api.flags.FlagListener; @@ -68,12 +69,20 @@ public class ObsidianScoopingListener extends FlagListener { return lookForLava(e); } + /** + * @param e PlayerInteractEvent + * @return false if obsidian not scooped, true if scooped + */ private boolean lookForLava(PlayerInteractEvent e) { Player player = e.getPlayer(); ItemStack bucket = e.getItem(); // Get block player is looking at - Block b = e.getPlayer().rayTraceBlocks(5, FluidCollisionMode.ALWAYS).getHitBlock(); + RayTraceResult rtBlocks = e.getPlayer().rayTraceBlocks(5, FluidCollisionMode.ALWAYS); + if (rtBlocks == null) { + return false; + } + Block b = rtBlocks.getHitBlock(); if (!b.getType().equals(Material.OBSIDIAN)) { // This should not be needed but might catch some attempts return false; diff --git a/src/main/java/world/bentobox/bentobox/lists/Flags.java b/src/main/java/world/bentobox/bentobox/lists/Flags.java index 9fc685b24..33d4bbf16 100644 --- a/src/main/java/world/bentobox/bentobox/lists/Flags.java +++ b/src/main/java/world/bentobox/bentobox/lists/Flags.java @@ -283,6 +283,7 @@ public final class Flags { public static final Flag HURT_ANIMALS = new Flag.Builder("HURT_ANIMALS", Material.STONE_SWORD).listener(new HurtingListener()).mode(Flag.Mode.ADVANCED).build(); public static final Flag HURT_MONSTERS = new Flag.Builder("HURT_MONSTERS", Material.WOODEN_SWORD).mode(Flag.Mode.BASIC).build(); public static final Flag HURT_VILLAGERS = new Flag.Builder("HURT_VILLAGERS", Material.GOLDEN_SWORD).mode(Flag.Mode.ADVANCED).build(); + public static final Flag HURT_TAMED_ANIMALS = new Flag.Builder("HURT_TAMABLE_ENTITIES", Material.DIAMOND_SWORD).mode(Flag.Mode.ADVANCED).build(); // Leashes public static final Flag LEASH = new Flag.Builder("LEASH", Material.LEAD).listener(new LeashListener()).build(); diff --git a/src/main/java/world/bentobox/bentobox/lists/GameModePlaceholder.java b/src/main/java/world/bentobox/bentobox/lists/GameModePlaceholder.java index e03b2eb81..d472ba78d 100644 --- a/src/main/java/world/bentobox/bentobox/lists/GameModePlaceholder.java +++ b/src/main/java/world/bentobox/bentobox/lists/GameModePlaceholder.java @@ -295,6 +295,14 @@ public enum GameModePlaceholder { RANK("rank", (addon, user, island) -> (island == null || user == null) ? "" : user.getTranslation(RanksManager.getInstance().getRank(island.getRank(user)))), + /** + * Returns the rank this player has on this island. + * @since 2.4.0 + */ + VISITED_ISLAND_RANK("visited_island_rank", + (addon, user, island) -> getVisitedIsland(addon, user) + .map(is -> user.getTranslation(RanksManager.getInstance().getRank(is.getRank(user)))).orElse("")), + /** * Returns how many times this player reset his island. * @since 1.5.0 diff --git a/src/main/java/world/bentobox/bentobox/managers/IslandsManager.java b/src/main/java/world/bentobox/bentobox/managers/IslandsManager.java index 486edb811..7d7364365 100644 --- a/src/main/java/world/bentobox/bentobox/managers/IslandsManager.java +++ b/src/main/java/world/bentobox/bentobox/managers/IslandsManager.java @@ -4,7 +4,6 @@ import java.io.IOException; import java.util.ArrayList; import java.util.Collection; import java.util.Collections; -import java.util.HashMap; import java.util.HashSet; import java.util.LinkedList; import java.util.List; @@ -15,10 +14,10 @@ import java.util.Queue; import java.util.Set; import java.util.UUID; import java.util.concurrent.CompletableFuture; +import java.util.concurrent.ConcurrentHashMap; import java.util.stream.Collectors; import org.bukkit.Bukkit; -import org.bukkit.ChatColor; import org.bukkit.Location; import org.bukkit.Material; import org.bukkit.Tag; @@ -37,6 +36,10 @@ import org.bukkit.util.Vector; import org.eclipse.jdt.annotation.NonNull; import org.eclipse.jdt.annotation.Nullable; +import com.github.puregero.multilib.MultiLib; +import com.google.gson.Gson; +import com.google.gson.GsonBuilder; + import io.papermc.lib.PaperLib; import world.bentobox.bentobox.BentoBox; import world.bentobox.bentobox.api.events.IslandBaseEvent; @@ -44,9 +47,9 @@ import world.bentobox.bentobox.api.events.island.IslandEvent; import world.bentobox.bentobox.api.events.island.IslandEvent.Reason; import world.bentobox.bentobox.api.flags.Flag; import world.bentobox.bentobox.api.localization.TextVariables; -import world.bentobox.bentobox.api.logs.LogEntry; import world.bentobox.bentobox.api.user.User; import world.bentobox.bentobox.database.Database; +import world.bentobox.bentobox.database.json.BentoboxTypeAdapterFactory; import world.bentobox.bentobox.database.objects.Island; import world.bentobox.bentobox.database.objects.IslandDeletion; import world.bentobox.bentobox.lists.Flags; @@ -65,29 +68,18 @@ public class IslandsManager { private final BentoBox plugin; - /** - * One island can be spawn, this is the one - otherwise, this value is null - */ - @NonNull - private final Map<@NonNull World, @Nullable Island> spawn; + private Map spawns = new ConcurrentHashMap<>(); + + private Map last = new ConcurrentHashMap<>(); @NonNull - private Database handler; - - /** - * The last locations where an island were put. This is not stored persistently - * and resets when the server starts - */ - private final Map last; + private static Database handler; /** * Island Cache */ @NonNull private IslandCache islandCache; - // Quarantined islands - @NonNull - private final Map> quarantineCache; // Deleted islands @NonNull private final List deletedIslands; @@ -105,24 +97,57 @@ public class IslandsManager { this.plugin = plugin; // Set up the database handler to store and retrieve Island classes handler = new Database<>(plugin, Island.class); - islandCache = new IslandCache(); - quarantineCache = new HashMap<>(); - spawn = new HashMap<>(); - last = new HashMap<>(); + islandCache = new IslandCache(handler); // This list should always be empty unless database deletion failed // In that case a purge utility may be required in the future deletedIslands = new ArrayList<>(); // Mid-teleport players going home goingHome = new HashSet<>(); + // Set handler in Island + + // Listen for Island Updates + MultiLib.onString(plugin, "bentobox-updateIsland", id -> { + Island island = handler.loadObject(id); + if (island != null) { + islandCache.updateIsland(island); + } + }); + + // Delete island blocks + MultiLib.onString(plugin, "bentobox-deleteIsland", id -> { + IslandDeletion idd = getGson().fromJson(id, IslandDeletion.class); + plugin.getIslandDeletionManager().getIslandChunkDeletionManager().add(idd); + }); + // List for new islands + MultiLib.onString(plugin, "bentobox-newIsland", id -> { + Island island = handler.loadObject(id); + if (island != null) { + islandCache.addIsland(island); + } + }); + // Set or clear spawn + MultiLib.onString(plugin, "bentobox-setspawn", sp -> { + String[] split = sp.split(","); + if (split.length == 1) { + World world = Bukkit.getWorld(split[0]); + this.clearSpawn(world); + } else if (split.length == 2) { + World world = Bukkit.getWorld(split[0]); + if (world != null) { + getIslandById(split[1]).ifPresent(i -> this.setSpawn(i)); + } + } + + }); } /** * Used only for testing. Sets the database to a mock database. * - * @param handler - handler + * @param h - handler */ - public void setHandler(@NonNull Database handler) { - this.handler = handler; + public void setHandler(@NonNull Database h) { + handler = h; } /** @@ -227,14 +252,13 @@ public class IslandsManager { .orElse(""); island.setGameMode(gmName); island.setUniqueId(gmName + island.getUniqueId()); - while (handler.objectExists(island.getUniqueId())) { - // This should never happen, so although this is a potential infinite loop I'm - // going to leave it here because - // it will be bad if this does occur and the server should crash. - plugin.logWarning("Duplicate island UUID occurred"); - island.setUniqueId(gmName + UUID.randomUUID()); - } if (islandCache.addIsland(island)) { + // Save to database and notify other servers + saveIsland(island).thenAccept(b -> { + if (b.equals(Boolean.TRUE)) { + MultiLib.notify("bentobox-newIsland", island.getUniqueId()); + } + }); return island; } return null; @@ -257,27 +281,40 @@ public class IslandsManager { // Set the owner of the island to no one. island.setOwner(null); island.setFlag(Flags.LOCK, RanksManager.VISITOR_RANK); + island.setDeleted(true); if (removeBlocks) { // Remove island from the cache islandCache.deleteIslandFromCache(island); - // Log the deletion (it shouldn't matter but may be useful) - island.log(new LogEntry.Builder("DELETED").build()); - // Set the delete flag which will prevent it from being loaded even if database - // deletion fails - island.setDeleted(true); - // Save the island - handler.saveObjectAsync(island); - // Delete the island - handler.deleteObject(island); // Remove players from island removePlayersFromIsland(island); if (!plugin.getSettings().isKeepPreviousIslandOnReset()) { // Remove blocks from world - plugin.getIslandDeletionManager().getIslandChunkDeletionManager().add(new IslandDeletion(island)); + IslandDeletion id = new IslandDeletion(island); + plugin.getIslandDeletionManager().getIslandChunkDeletionManager().add(id); + // Tell other servers + MultiLib.notify("bentobox-deleteIsland", getGson().toJson(id)); } + // Delete the island from the database + handler.deleteObject(island); } } + private Gson getGson() { + + // Build the Gson + + // excludeFieldsWithoutExposeAnnotation - this means that every field to be stored should use @Expose + // enableComplexMapKeySerialization - forces GSON to use TypeAdapters even for Map keys + GsonBuilder builder = new GsonBuilder().excludeFieldsWithoutExposeAnnotation() + .enableComplexMapKeySerialization().setPrettyPrinting(); + // Register adapter factory + builder.registerTypeAdapterFactory(new BentoboxTypeAdapterFactory(plugin)); + // Allow characters like < or > without escaping them + builder.disableHtmlEscaping(); + + return builder.create(); + } + /** * Get the number of islands made on this server. Used by stats. * @@ -337,6 +374,17 @@ public class IslandsManager { return islandCache.getIslands(world, uniqueId); } + /** + * Gets all the islands for this player in any world where this player has any presence + * + * @param uniqueId user's UUID + * @return List of islands or empty list if none found for user + */ + @NonNull + public List getIslands(UUID uniqueId) { + return islandCache.getIslands(uniqueId); + } + /** * Gets all the islands for this player in this world that this player owns. * @@ -378,7 +426,7 @@ public class IslandsManager { */ @Nullable public Island getIsland(@NonNull World world, @NonNull UUID uuid) { - return islandCache.get(world, uuid); + return islandCache.getIsland(world, uuid); } /** @@ -403,7 +451,7 @@ public class IslandsManager { */ @NonNull public Collection getIslands() { - return islandCache.getIslands(); + return handler.loadObjects().stream().toList(); } /** @@ -417,7 +465,17 @@ public class IslandsManager { */ @NonNull public Collection getIslands(@NonNull World world) { - return islandCache.getIslands(world); + return handler.loadObjects().stream().filter(i -> world.equals(i.getWorld())).toList(); + } + + /** + * Return island with uniqueId. Loads from database. Will block, so be careful. + * @param uniqueID id of island + * @return Optional Island object + * @since 2.4.0 + */ + public Optional loadIsland(String uniqueID) { + return Optional.ofNullable(handler.loadObject(uniqueID)); } /** @@ -462,7 +520,7 @@ public class IslandsManager { * Get the last location where an island was created * * @param world - world - * @return location + * @return location or null if none found */ public Location getLast(@NonNull World world) { return last.get(world); @@ -486,7 +544,7 @@ public class IslandsManager { if (island.getOwner() == null) { // No owner, no rank settings island.setMaxMembers(null); - this.save(island); + updateIsland(island); return 0; } // Island max is either the world default or specified amount for this island @@ -507,8 +565,11 @@ public class IslandsManager { islandMax = owner.getPermissionValue(plugin.getIWM().getPermissionPrefix(island.getWorld()) + perm, islandMax); } - island.setMaxMembers(rank, islandMax == worldDefault ? null : islandMax); - this.save(island); + Integer change = islandMax == worldDefault ? null : islandMax; + if (island.getMaxMembers().get(rank) != change) { + island.setMaxMembers(rank, change); + updateIsland(island); + } return islandMax; } @@ -546,13 +607,16 @@ public class IslandsManager { } // If the island maxHomes is just the same as the world default, then set to // null - island.setMaxHomes(islandMax == plugin.getIWM().getMaxHomes(island.getWorld()) ? null : islandMax); - this.save(island); + Integer change = islandMax == plugin.getIWM().getMaxHomes(island.getWorld()) ? null : islandMax; + if (island.getMaxHomes() != change) { + island.setMaxHomes(change); + updateIsland(island); + } return islandMax; } /** - * Set the maximum numbber of homes allowed on this island + * Set the maximum number of homes allowed on this island * * @param island - island * @param maxHomes - max number of homes allowed, or null if the world default @@ -735,9 +799,9 @@ public class IslandsManager { * @since 1.16.0 */ public boolean setHomeLocation(@Nullable Island island, Location location, String name) { - if (island != null) { + if (island != null && (island.getHome(name) == null || !island.getHome(name).equals(location))) { island.addHome(name, location); - this.save(island); + updateIsland(island); return true; } return false; @@ -890,7 +954,7 @@ public class IslandsManager { */ @NonNull public Optional getSpawn(@NonNull World world) { - return Optional.ofNullable(spawn.get(world)); + return Optional.ofNullable(spawns.get(world)); } /** @@ -901,7 +965,7 @@ public class IslandsManager { */ @Nullable public Location getSpawnPoint(@NonNull World world) { - return spawn.containsKey(world) ? spawn.get(world).getSpawnPoint(world.getEnvironment()) : null; + return getSpawn(world).map(i -> i.getSpawnPoint(world.getEnvironment())).orElse(null); } /** @@ -1132,7 +1196,7 @@ public class IslandsManager { * @return true if they are, false if they are not, or spawn does not exist */ public boolean isAtSpawn(Location playerLoc) { - return spawn.containsKey(playerLoc.getWorld()) && spawn.get(playerLoc.getWorld()).onIsland(playerLoc); + return getSpawn(playerLoc.getWorld()).map(i -> i.onIsland(playerLoc)).orElse(false); } /** @@ -1144,19 +1208,14 @@ public class IslandsManager { * @param spawn the Island to set as spawn. Must not be null. */ public void setSpawn(@NonNull Island spawn) { - // Checking if there is already a spawn set for this world - if (this.spawn.containsKey(spawn.getWorld()) && this.spawn.get(spawn.getWorld()) != null) { - Island oldSpawn = this.spawn.get(spawn.getWorld()); - if (oldSpawn.equals(spawn)) { - return; // The spawn is already the current spawn - no need to update anything. - } else { - oldSpawn.setSpawn(false); - } + if (spawn.getWorld() != null) { + spawns.put(Util.getWorld(spawn.getWorld()), spawn); + // Tell other servers + MultiLib.notify("bentobox-setspawn", spawn.getWorld().getUID().toString() + "," + spawn.getUniqueId()); } - this.spawn.put(spawn.getWorld(), spawn); - spawn.setSpawn(true); } + /** * Clears the spawn island for this world * @@ -1164,11 +1223,9 @@ public class IslandsManager { * @since 1.8.0 */ public void clearSpawn(World world) { - Island spawnIsland = spawn.get(Util.getWorld(world)); - if (spawnIsland != null) { - spawnIsland.setSpawn(false); - } - this.spawn.remove(world); + spawns.remove(world); + // Tell other servers + MultiLib.notify("bentobox-setspawn", world.getUID().toString()); } /** @@ -1192,7 +1249,6 @@ public class IslandsManager { */ public void load() throws IOException { islandCache.clear(); - quarantineCache.clear(); List toQuarantine = new ArrayList<>(); int owned = 0; int unowned = 0; @@ -1206,9 +1262,6 @@ public class IslandsManager { if (island.isDeleted()) { // These will be deleted later deletedIslands.add(island.getUniqueId()); - } else if (island.isDoNotLoad() && island.getWorld() != null && island.getCenter() != null) { - // Add to quarantine cache - quarantineCache.computeIfAbsent(island.getOwner(), k -> new ArrayList<>()).add(island); } // Check island distance and if incorrect stop BentoBox else if (island.getWorld() != null && plugin.getIWM().inWorld(island.getWorld()) && island.getRange() != plugin.getIWM().getIslandDistance(island.getWorld())) { @@ -1219,18 +1272,9 @@ public class IslandsManager { } else { // Fix island center if it is off fixIslandCenter(island); - if (!islandCache.addIsland(island)) { - // Quarantine the offending island - toQuarantine.add(island); - // Add to quarantine cache - island.setDoNotLoad(true); - quarantineCache.computeIfAbsent(island.getOwner(), k -> new ArrayList<>()).add(island); - if (island.isUnowned()) { - unowned++; - } else { - owned++; - } - } else if (island.isSpawn()) { + islandCache.addIsland(island, true); + + if (island.isSpawn()) { // Success, set spawn if this is the spawn island. this.setSpawn(island); } else { @@ -1394,15 +1438,10 @@ public class IslandsManager { homeTeleportAsync(w, p); } else { // Move player to spawn - if (spawn.containsKey(w)) { - // go to island spawn - Location sp = spawn.get(w).getSpawnPoint(w.getEnvironment()); - if (sp != null) { - PaperLib.teleportAsync(p, sp); - } else { - plugin.logWarning("Spawn exists but its location is null!"); - } - } + getSpawn(w).map(i -> i.getSpawnPoint(w.getEnvironment())).filter(Objects::nonNull) + .ifPresentOrElse(sp -> PaperLib.teleportAsync(p, sp), + () -> plugin.logWarning("Spawn exists but its location is null!")); + } }); } @@ -1419,17 +1458,17 @@ public class IslandsManager { } /** - * Save the all the islands to the database + * Save the all the cached islands to the database * * @param schedule true if we should let the task run over multiple ticks to * reduce lag spikes */ public void saveAll(boolean schedule) { if (!schedule) { - for (Island island : islandCache.getIslands()) { + for (Island island : islandCache.getCachedIslands()) { if (island.isChanged()) { try { - handler.saveObjectAsync(island); + saveIsland(island); } catch (Exception e) { plugin.logError("Could not save island to database when running sync! " + e.getMessage()); } @@ -1439,7 +1478,7 @@ public class IslandsManager { } isSaveTaskRunning = true; - Queue queue = new LinkedList<>(islandCache.getIslands()); + Queue queue = new LinkedList<>(islandCache.getCachedIslands()); new BukkitRunnable() { @Override public void run() { @@ -1452,7 +1491,7 @@ public class IslandsManager { } if (island.isChanged()) { try { - handler.saveObjectAsync(island); + saveIsland(island); } catch (Exception e) { plugin.logError("Could not save island to database when running sync! " + e.getMessage()); } @@ -1473,9 +1512,13 @@ public class IslandsManager { teamIsland.addMember(playerUUID); islandCache.addPlayer(playerUUID, teamIsland); // Save the island - handler.saveObjectAsync(teamIsland); + updateIsland(teamIsland); } + /** + * Set the last island location + * @param last location + */ public void setLast(Location last) { this.last.put(last.getWorld(), last); } @@ -1483,7 +1526,7 @@ public class IslandsManager { public void shutdown() { plugin.log("Removing coops from islands..."); // Remove all coop associations - islandCache.getIslands().forEach(i -> i.getMembers().values().removeIf(p -> p == RanksManager.COOP_RANK)); + islandCache.getCachedIslands().forEach(i -> i.getMembers().values().removeIf(p -> p == RanksManager.COOP_RANK)); plugin.log("Saving islands - this has to be done sync so it may take a while with a lot of islands..."); saveAll(); plugin.log("Islands saved."); @@ -1495,11 +1538,11 @@ public class IslandsManager { /** * Checks if a player is in any team in this world. Note that the player may have * multiple islands in the world, any one of which may have a team. + * Consider checking the island itself {@link Island#inTeam(UUID)} * * @param world - world * @param playerUUID - player's UUID * @return true if in team, false if not - * @see Consider checking the island itself {@link Island#inTeam(UUID)} */ public boolean inTeam(World world, @NonNull UUID playerUUID) { return this.islandCache.getIslands(world, playerUUID).stream() @@ -1603,23 +1646,37 @@ public class IslandsManager { * @param uniqueId - UUID of player */ public void clearRank(int rank, UUID uniqueId) { - islandCache.getIslands().forEach( + islandCache.getCachedIslands().forEach( i -> i.getMembers().entrySet().removeIf(e -> e.getKey().equals(uniqueId) && e.getValue() == rank)); } /** - * Save the island to the database + * Update island data in database * * @param island - island */ - public void save(Island island) { - handler.saveObjectAsync(island); + public static void updateIsland(Island island) { + // When mocking, handler can be null so this null check avoids errors + if (handler != null && handler.objectExists(island.getUniqueId())) { + island.clearChanged(); + saveIsland(island).thenAccept(b -> MultiLib.notify("bentobox-updateIsland", island.getUniqueId())); + } + } + + /** + * Saves the island async to the database + * @param island Island object to be saved + * @return CompletableFuture when done + * @since 2.4.0 + */ + public static CompletableFuture saveIsland(Island island) { + return handler.saveObjectAsync(island); } /** * Try to get an island by its unique id * - * @param uniqueId - unique id string + * @param uniqueId - unique id of island * @return optional island * @since 1.3.0 */ @@ -1629,105 +1686,26 @@ public class IslandsManager { } /** - * Try to get an unmodifiable list of quarantined islands owned by uuid in this - * world - * - * @param world - world - * @param uuid - target player's UUID, or null = unowned islands - * @return list of islands; may be empty - * @since 1.3.0 + * Try to get an island by its unique id. If you are needing to load all the islands to check something + * but do not need to have them cached, then use this method and set cache to false. + * + * @param uniqueId - unique id of island + * @param cache - if false, island will not be cached if it is not already + * @return optional island + * @since 2.4.0 */ @NonNull - public List getQuarantinedIslandByUser(@NonNull World world, @Nullable UUID uuid) { - return quarantineCache.getOrDefault(uuid, Collections.emptyList()).stream() - .filter(i -> i.getWorld().equals(world)).toList(); + public Optional getIslandById(String uniqueId, boolean cache) { + return Optional.ofNullable(islandCache.getIslandById(uniqueId, cache)); } /** - * Delete quarantined islands owned by uuid in this world - * - * @param world - world - * @param uuid - target player's UUID, or null = unowned islands - * @since 1.3.0 + * Returns if this is a known island uniqueId. Will not load the island from the database if it is not loaded already. + * @param uniqueId - unique id of island + * @return true if this island exists */ - public void deleteQuarantinedIslandByUser(World world, @Nullable UUID uuid) { - if (quarantineCache.containsKey(uuid)) { - quarantineCache.get(uuid).stream().filter(i -> i.getWorld().equals(world)) - .forEach(i -> handler.deleteObject(i)); - quarantineCache.get(uuid).removeIf(i -> i.getWorld().equals(world)); - } - } - - /** - * @return the quarantineCache - * @since 1.3.0 - */ - @NonNull - public Map> getQuarantineCache() { - return quarantineCache; - } - - /** - * Remove a quarantined island and delete it from the database completely. This - * is NOT recoverable unless you have database backups. - * - * @param island island - * @return {@code true} if island is quarantined and removed - * @since 1.3.0 - */ - public boolean purgeQuarantinedIsland(Island island) { - if (quarantineCache.containsKey(island.getOwner()) && quarantineCache.get(island.getOwner()).remove(island)) { - handler.deleteObject(island); - return true; - } - return false; - } - - /** - * Switches active island and island in trash - * - * @param world - game world - * @param target - target player's UUID - * @param island - island in trash - * @return true if successful, otherwise false - * @since 1.3.0 - */ - public boolean switchIsland(World world, UUID target, Island island) { - // Remove trashed island from trash - if (!quarantineCache.containsKey(island.getOwner()) || !quarantineCache.get(island.getOwner()).remove(island)) { - plugin.logError("Could not remove island from trash"); - return false; - } - // Remove old island from cache if it exists - if (this.hasIsland(world, target)) { - Island oldIsland = islandCache.get(world, target); - islandCache.removeIsland(oldIsland); - - // Set old island to trash - oldIsland.setDoNotLoad(true); - - // Put old island into trash - quarantineCache.computeIfAbsent(target, k -> new ArrayList<>()).add(oldIsland); - // Save old island - handler.saveObjectAsync(oldIsland).thenAccept(result -> { - if (Boolean.FALSE.equals(result)) - plugin.logError("Could not save trashed island in database"); - }); - } - // Restore island from trash - island.setDoNotLoad(false); - // Add new island to cache - if (!islandCache.addIsland(island)) { - plugin.logError("Could not add recovered island to cache"); - return false; - } - // Save new island - handler.saveObjectAsync(island).thenAccept(result -> { - if (Boolean.FALSE.equals(result)) { - plugin.logError("Could not save recovered island to database"); - } - }); - return true; + public boolean isIslandId(String uniqueId) { + return islandCache.isIslandId(uniqueId); } /** @@ -1753,121 +1731,6 @@ public class IslandsManager { this.saveAll(); } - /** - * Returns whether the specified island custom name exists in this world. - * - * @param world World of the gamemode - * @param name Name of an island - * @return {@code true} if there is an island with the specified name in this - * world, {@code false} otherwise. - * @since 1.7.0 - */ - public boolean nameExists(@NonNull World world, @NonNull String name) { - return getIslands(world).stream().map(Island::getName).filter(Objects::nonNull) - .anyMatch(n -> ChatColor.stripColor(n).equals(ChatColor.stripColor(name))); - } - - /** - * Called by the admin team fix command. Attempts to fix the database for teams. - * It will identify and correct situations where a player is listed in multiple - * teams, or is the owner of multiple teams. It will also try to fix the current - * cache. It is recommended to restart the server after this command is run. - * - * @param user - admin calling - * @param world - game world to check - * @return CompletableFuture boolean - true when done - * @deprecated Not compatible with multi-islands. Will be removed. - */ - @Deprecated - public CompletableFuture checkTeams(User user, World world) { - CompletableFuture r = new CompletableFuture<>(); - user.sendMessage("commands.admin.team.fix.scanning"); - Bukkit.getScheduler().runTaskAsynchronously(plugin, () -> { - Map owners = new HashMap<>(); - Map freq = new HashMap<>(); - Map> memberships = new HashMap<>(); - handler.loadObjects().stream().filter(i -> i.getOwner() != null).filter(i -> i.getWorld() != null) - .filter(i -> i.getWorld().equals(world)).filter(i -> !i.isDoNotLoad()).forEach(i -> { - int count = freq.getOrDefault(i.getOwner(), 0); - freq.put(i.getOwner(), count + 1); - if (owners.containsKey(i.getOwner())) { - // Player already has an island in the database - user.sendMessage("commands.admin.team.fix.duplicate-owner", TextVariables.NAME, - plugin.getPlayers().getName(i.getOwner())); - Island prev = owners.get(i.getOwner()); - // Find out if this island is in the cache - Island cachedIsland = this.getIsland(i.getWorld(), i.getOwner()); - if (cachedIsland != null && !cachedIsland.getUniqueId().equals(i.getUniqueId())) { - islandCache.deleteIslandFromCache(i.getUniqueId()); - handler.deleteID(i.getUniqueId()); - } - if (cachedIsland != null && !cachedIsland.getUniqueId().equals(prev.getUniqueId())) { - islandCache.deleteIslandFromCache(prev.getUniqueId()); - handler.deleteID(prev.getUniqueId()); - } - } else { - owners.put(i.getOwner(), i); - i.getMemberSet().forEach(u -> - // Place into membership - memberships.computeIfAbsent(u, k -> new ArrayList<>()).add(i)); - } - }); - freq.entrySet().stream().filter(en -> en.getValue() > 1) - .forEach(en -> user.sendMessage("commands.admin.team.fix.player-has", TextVariables.NAME, - plugin.getPlayers().getName(en.getKey()), TextVariables.NUMBER, - String.valueOf(en.getValue()))); - // Check for players in multiple teams - memberships.entrySet().stream().filter(en -> en.getValue().size() > 1).forEach(en -> { - // Get the islands - String ownerName = plugin.getPlayers().getName(en.getKey()); - user.sendMessage("commands.admin.team.fix.duplicate-member", TextVariables.NAME, ownerName); - int highestRank = 0; - Island highestIsland = null; - for (Island i : en.getValue()) { - int rankValue = i.getRank(en.getKey()); - String rank = RanksManager.getInstance().getRank(rankValue); - if (rankValue > highestRank || highestIsland == null) { - highestRank = rankValue; - highestIsland = i; - } - String xyz = Util.xyz(i.getCenter().toVector()); - user.sendMessage("commands.admin.team.fix.rank-on-island", TextVariables.RANK, - user.getTranslation(rank), TextVariables.XYZ, xyz); - user.sendRawMessage(i.getUniqueId()); - } - // Fix island ownership in cache - // Correct island cache - if (highestRank == RanksManager.OWNER_RANK && highestIsland != null - && islandCache.getIslandById(highestIsland.getUniqueId()) != null) { - islandCache.setOwner(islandCache.getIslandById(highestIsland.getUniqueId()), en.getKey()); - } - // Fix all the entries that are not the highest - for (Island island : en.getValue()) { - if (!island.equals(highestIsland)) { - // Get the actual island being used in the cache - Island i = islandCache.getIslandById(island.getUniqueId()); - if (i != null) { - // Remove membership of this island - i.removeMember(en.getKey()); - } - // Remove from database island - island.removeMember(en.getKey()); - // Save to database - handler.saveObjectAsync(island) - .thenRun(() -> user.sendMessage("commands.admin.team.fix.fixed")); - } else { - // Special check for when a player is an owner and member - } - } - - }); - user.sendMessage("commands.admin.team.fix.done"); - r.complete(true); - }); - - return r; - } - /** * Is user mid home teleport? * @@ -1899,14 +1762,14 @@ public class IslandsManager { } /** - * Convenience method. See {@link IslandCache#get(World, UUID)} + * Convenience method. See {@link IslandCache#getIsland(World, UUID)} * * @param world world * @param uuid player's UUID * @return Island of player or null if there isn't one */ public Island getPrimaryIsland(World world, UUID uuid) { - return this.getIslandCache().get(world, uuid); + return this.getIslandCache().getIsland(world, uuid); } } diff --git a/src/main/java/world/bentobox/bentobox/managers/PlayersManager.java b/src/main/java/world/bentobox/bentobox/managers/PlayersManager.java index 007d67ba1..957f1a37c 100644 --- a/src/main/java/world/bentobox/bentobox/managers/PlayersManager.java +++ b/src/main/java/world/bentobox/bentobox/managers/PlayersManager.java @@ -2,23 +2,21 @@ package world.bentobox.bentobox.managers; import java.util.Collection; import java.util.Collections; -import java.util.HashMap; import java.util.HashSet; -import java.util.LinkedList; import java.util.Map; -import java.util.Queue; +import java.util.Objects; import java.util.Set; import java.util.UUID; +import java.util.concurrent.CompletableFuture; +import java.util.concurrent.ConcurrentHashMap; import org.bukkit.World; import org.bukkit.entity.Player; import org.bukkit.entity.Tameable; -import org.bukkit.scheduler.BukkitRunnable; import org.eclipse.jdt.annotation.NonNull; import org.eclipse.jdt.annotation.Nullable; import world.bentobox.bentobox.BentoBox; -import world.bentobox.bentobox.api.flags.Flag; import world.bentobox.bentobox.api.user.User; import world.bentobox.bentobox.database.Database; import world.bentobox.bentobox.database.objects.Island; @@ -31,11 +29,9 @@ public class PlayersManager { private final BentoBox plugin; private Database handler; private final Database names; + private final Map playerCache = new ConcurrentHashMap<>(); - private final Map playerCache; - private final Set inTeleport; - - private boolean isSaveTaskRunning; + private final Set inTeleport; // this needs databasing /** * Provides a memory cache of online player information @@ -50,7 +46,6 @@ public class PlayersManager { handler = new Database<>(plugin, Players.class); // Set up the names database names = new Database<>(plugin, Names.class); - playerCache = new HashMap<>(); inTeleport = new HashSet<>(); } @@ -62,67 +57,7 @@ public class PlayersManager { this.handler = handler; } - /** - * Load all players - not normally used as to load all players into memory will be wasteful - */ - public void load(){ - playerCache.clear(); - inTeleport.clear(); - handler.loadObjects().forEach(p -> playerCache.put(p.getPlayerUUID(), p)); - } - - public boolean isSaveTaskRunning() { - return isSaveTaskRunning; - } - - /** - * Save all players - */ - public void saveAll() { - saveAll(false); - } - - /** - * Save all players - * @param schedule true if we should let the task run over multiple ticks to reduce lag spikes - */ - public void saveAll(boolean schedule){ - if (!schedule) { - for (Players player : playerCache.values()) { - try { - handler.saveObjectAsync(player); - } catch (Exception e) { - plugin.logError("Could not save player to database when running sync! " + e.getMessage()); - } - } - return; - } - - isSaveTaskRunning = true; - Queue queue = new LinkedList<>(playerCache.values()); - new BukkitRunnable() { - @Override - public void run() { - for (int i = 0; i < plugin.getSettings().getMaxSavedPlayersPerTick(); i++) { - Players player = queue.poll(); - if (player == null) { - isSaveTaskRunning = false; - cancel(); - return; - } - try { - handler.saveObjectAsync(player); - } catch (Exception e) { - plugin.logError("Could not save player to database when running sync! " + e.getMessage()); - } - } - } - }.runTaskTimer(plugin, 0, 1); - } - public void shutdown(){ - saveAll(); - playerCache.clear(); handler.close(); } @@ -133,10 +68,38 @@ public class PlayersManager { */ @Nullable public Players getPlayer(UUID uuid){ - if (!playerCache.containsKey(uuid)) { - addPlayer(uuid); + return playerCache.computeIfAbsent(uuid, this::addPlayer); + } + + /** + * Adds a player to the database. If the UUID does not exist, a new player is created. + * + * @param playerUUID the player's UUID, must not be null + * @return the loaded or newly created player + * @throws NullPointerException if playerUUID is null + */ + private Players addPlayer(@NonNull UUID playerUUID) { + Objects.requireNonNull(playerUUID, "Player UUID must not be null"); + + // If the player exists in the database, load it; otherwise, create and save a new player + Players player = loadPlayer(playerUUID); + if (player != null) { + return player; } - return playerCache.get(uuid); + Players newPlayer = new Players(plugin, playerUUID); + handler.saveObjectAsync(newPlayer); + return newPlayer; + } + + /** + * Force load the player from the database. The player must be known to BenoBox. If it is not + * use {@link #addPlayer(UUID)} instead. This is a blocking call, so be careful. + * @param uuid UUID of player + * @return Players object representing that player + * @since 2.4.0 + */ + public @Nullable Players loadPlayer(UUID uuid) { + return handler.loadObject(uuid.toString()); } /** @@ -146,37 +109,7 @@ public class PlayersManager { */ @NonNull public Collection getPlayers() { - return Collections.unmodifiableCollection(playerCache.values()); - } - - /* - * Cache control methods - */ - - /** - * Adds a player to the cache. If the UUID does not exist, a new player is made - * @param playerUUID - the player's UUID - */ - public void addPlayer(UUID playerUUID) { - if (playerUUID == null) { - return; - } - if (!playerCache.containsKey(playerUUID)) { - Players player; - // If the player is in the database, load it, otherwise create a new player - if (handler.objectExists(playerUUID.toString())) { - player = handler.loadObject(playerUUID.toString()); - if (player == null) { - player = new Players(plugin, playerUUID); - // Corrupted database entry - plugin.logError("Corrupted player database entry for " + playerUUID + " - unrecoverable. Recreated."); - player.setUniqueId(playerUUID.toString()); - } - } else { - player = new Players(plugin, playerUUID); - } - playerCache.put(playerUUID, player); - } + return Collections.unmodifiableCollection(handler.loadObjects()); } /** @@ -187,7 +120,7 @@ public class PlayersManager { * @return true if player is known, otherwise false */ public boolean isKnown(UUID uniqueID) { - return uniqueID != null && (playerCache.containsKey(uniqueID) || handler.objectExists(uniqueID.toString())); + return uniqueID == null ? false : handler.objectExists(uniqueID.toString()); } /** @@ -206,11 +139,8 @@ public class PlayersManager { // Not used } } - // Look in the name cache, then the data base and then give up - return playerCache.values().stream() - .filter(p -> p.getPlayerName().equalsIgnoreCase(name)).findFirst() - .map(p -> UUID.fromString(p.getUniqueId())) - .orElseGet(() -> names.objectExists(name) ? names.loadObject(name).getUuid() : null); + return names.loadObjects().stream().filter(n -> n.getUniqueId().equalsIgnoreCase(name)).findFirst() + .map(Names::getUuid).orElse(null); } /** @@ -218,8 +148,9 @@ public class PlayersManager { * @param user - the User */ public void setPlayerName(@NonNull User user) { - addPlayer(user.getUniqueId()); - playerCache.get(user.getUniqueId()).setPlayerName(user.getName()); + Players player = getPlayer(user.getUniqueId()); + player.setPlayerName(user.getName()); + handler.saveObject(player); Names newName = new Names(user.getName(), user.getUniqueId()); // Add to names database names.saveObjectAsync(newName); @@ -237,8 +168,8 @@ public class PlayersManager { if (playerUUID == null) { return ""; } - addPlayer(playerUUID); - return playerCache.get(playerUUID).getPlayerName(); + getPlayer(playerUUID); + return Objects.requireNonNullElse(playerCache.get(playerUUID).getPlayerName(), ""); } /** @@ -248,8 +179,7 @@ public class PlayersManager { * @return number of resets */ public int getResets(World world, UUID playerUUID) { - addPlayer(playerUUID); - return playerCache.get(playerUUID).getResets(world); + return getPlayer(playerUUID).getResets(world); } /** @@ -261,7 +191,7 @@ public class PlayersManager { * @see #getResets(World, UUID) */ public int getResetsLeft(World world, UUID playerUUID) { - addPlayer(playerUUID); + getPlayer(playerUUID); if (plugin.getIWM().getResetLimit(world) == -1) { return -1; } else { @@ -277,8 +207,9 @@ public class PlayersManager { * @param resets number of resets to set */ public void setResets(World world, UUID playerUUID, int resets) { - addPlayer(playerUUID); - playerCache.get(playerUUID).setResets(world, resets); + Players p = getPlayer(playerUUID); + p.setResets(world, resets); + handler.saveObject(p); } /** @@ -287,11 +218,7 @@ public class PlayersManager { * @return name of the locale this player uses */ public String getLocale(UUID playerUUID) { - addPlayer(playerUUID); - if (playerUUID == null) { - return ""; - } - return playerCache.get(playerUUID).getLocale(); + return getPlayer(playerUUID).getLocale(); } /** @@ -300,8 +227,9 @@ public class PlayersManager { * @param localeName - locale name, e.g., en-US */ public void setLocale(UUID playerUUID, String localeName) { - addPlayer(playerUUID); - playerCache.get(playerUUID).setLocale(localeName); + Players p = getPlayer(playerUUID); + p.setLocale(localeName); + handler.saveObject(p); } /** @@ -310,8 +238,9 @@ public class PlayersManager { * @param playerUUID - the player's UUID */ public void addDeath(World world, UUID playerUUID) { - addPlayer(playerUUID); - playerCache.get(playerUUID).addDeath(world); + Players p = getPlayer(playerUUID); + p.addDeath(world); + handler.saveObject(p); } /** @@ -321,8 +250,9 @@ public class PlayersManager { * @param deaths - number of deaths */ public void setDeaths(World world, UUID playerUUID, int deaths) { - addPlayer(playerUUID); - playerCache.get(playerUUID).setDeaths(world, deaths); + Players p = getPlayer(playerUUID); + p.setDeaths(world, deaths); + handler.saveObject(p); } /** @@ -332,8 +262,7 @@ public class PlayersManager { * @return number of deaths */ public int getDeaths(World world, UUID playerUUID) { - addPlayer(playerUUID); - return playerCache.get(playerUUID) == null ? 0 : playerCache.get(playerUUID).getDeaths(world); + return getPlayer(playerUUID).getDeaths(world); } /** @@ -360,16 +289,6 @@ public class PlayersManager { return inTeleport.contains(uniqueId); } - /** - * Saves the player to the database - * @param playerUUID - the player's UUID - */ - public void save(UUID playerUUID) { - if (playerCache.containsKey(playerUUID)) { - handler.saveObjectAsync(playerCache.get(playerUUID)); - } - } - /** * Tries to get the user from his name * @param name - name @@ -395,41 +314,17 @@ public class PlayersManager { * @param playerUUID player's UUID */ public void addReset(World world, UUID playerUUID) { - addPlayer(playerUUID); - playerCache.get(playerUUID).addReset(world); + Players p = getPlayer(playerUUID); + p.addReset(world); + handler.saveObject(p); } /** - * Sets the Flags display mode for the Settings Panel for this player. - * @param playerUUID player's UUID - * @param displayMode the {@link Flag.Mode} to set - * @since 1.6.0 - */ - public void setFlagsDisplayMode(UUID playerUUID, Flag.Mode displayMode) { - addPlayer(playerUUID); - playerCache.get(playerUUID).setFlagsDisplayMode(displayMode); - } - - /** - * Returns the Flags display mode for the Settings Panel for this player. - * @param playerUUID player's UUID - * @return the {@link Flag.Mode display mode} for the Flags in the Settings Panel. - * @since 1.6.0 - */ - public Flag.Mode getFlagsDisplayMode(UUID playerUUID) { - addPlayer(playerUUID); - return playerCache.get(playerUUID).getFlagsDisplayMode(); - } - - /** - * Remove player from cache. Clears players with the same name or UUID + * Remove player from database * @param player player to remove */ public void removePlayer(Player player) { - // Clear any players with the same name - playerCache.values().removeIf(p -> player.getName().equalsIgnoreCase(p.getPlayerName())); - // Remove if the player's UUID is the same - playerCache.values().removeIf(p -> player.getUniqueId().toString().equals(p.getUniqueId())); + handler.deleteID(player.getUniqueId().toString()); } /** @@ -495,8 +390,21 @@ public class PlayersManager { // Player total XP (not displayed) target.getPlayer().setTotalExperience(0); } - // Save player - save(target.getUniqueId()); + } + + /** + * Saves the player async to the database. The player has to be known to BentoBox to be saved. + * Players are usually detected by BentoBox when they join the server, so this is not an issue. + * @param uuid UUID of the player + * @return Completable future true when done, or false if not saved for some reason, e.g., invalid UUID + * @since 2.4.0 + */ + public CompletableFuture savePlayer(UUID uuid) { + Players p = this.getPlayer(uuid); + if (p != null) { + return handler.saveObjectAsync(p); + } + return CompletableFuture.completedFuture(false); } } diff --git a/src/main/java/world/bentobox/bentobox/managers/island/IslandCache.java b/src/main/java/world/bentobox/bentobox/managers/island/IslandCache.java index a72560ded..acfdabc8f 100644 --- a/src/main/java/world/bentobox/bentobox/managers/island/IslandCache.java +++ b/src/main/java/world/bentobox/bentobox/managers/island/IslandCache.java @@ -9,10 +9,13 @@ import java.util.HashSet; import java.util.Iterator; import java.util.List; import java.util.Map; +import java.util.Map.Entry; +import java.util.Objects; import java.util.Set; import java.util.UUID; import java.util.stream.Collectors; +import org.bukkit.Bukkit; import org.bukkit.Location; import org.bukkit.World; import org.eclipse.jdt.annotation.NonNull; @@ -20,6 +23,7 @@ import org.eclipse.jdt.annotation.Nullable; import world.bentobox.bentobox.BentoBox; import world.bentobox.bentobox.api.flags.Flag; +import world.bentobox.bentobox.database.Database; import world.bentobox.bentobox.database.objects.Island; import world.bentobox.bentobox.managers.RanksManager; import world.bentobox.bentobox.util.Util; @@ -30,8 +34,6 @@ import world.bentobox.bentobox.util.Util; * @author tastybento */ public class IslandCache { - @NonNull - private final Map<@NonNull Location, @NonNull Island> islandsByLocation; /** * Map of all islands with island uniqueId as key */ @@ -42,39 +44,85 @@ public class IslandCache { * UUID, value is a set of islands */ @NonNull - private final Map<@NonNull UUID, Set> islandsByUUID; + private final Map<@NonNull UUID, Set> islandsByUUID; @NonNull private final Map<@NonNull World, @NonNull IslandGrid> grids; + private final @NonNull Database handler; - public IslandCache() { - islandsByLocation = new HashMap<>(); + public IslandCache(@NonNull Database handler) { islandsById = new HashMap<>(); islandsByUUID = new HashMap<>(); grids = new HashMap<>(); + this.handler = handler; } /** - * Adds an island to the grid + * Replace the island we have with this one + * @param newIsland island + */ + public void updateIsland(@NonNull Island newIsland) { + if (newIsland.isDeleted()) { + this.deleteIslandFromCache(newIsland); + return; + } + // Get the old island + Island oldIsland = getIslandById(newIsland.getUniqueId()); + Set newMembers = newIsland.getMembers().keySet(); + if (oldIsland != null) { + Set oldMembers = oldIsland.getMembers().keySet(); + // Remove any members who are not in the new island + for (UUID oldMember : oldMembers) { + if (!newMembers.contains(oldMember)) { + // Member has been removed - remove island + islandsByUUID.computeIfAbsent(oldMember, k -> new HashSet<>()).remove(oldIsland.getUniqueId()); + } + } + } + // Update the members with the new island object + for (UUID newMember : newMembers) { + Set set = islandsByUUID.computeIfAbsent(newMember, k -> new HashSet<>()); + if (oldIsland != null) { + set.remove(oldIsland.getUniqueId()); + } + set.add(newIsland.getUniqueId()); + islandsByUUID.put(newMember, set); + } + + if (setIslandById(newIsland) == null) { + BentoBox.getInstance().logError("islandsById failed to update"); + } + + } + + /** + * Adds an island to the grid, used for new islands + * Caches island. * * @param island island to add, not null * @return true if successfully added, false if not */ public boolean addIsland(@NonNull Island island) { + return addIsland(island, false); + } + + /** + * Adds an island to the grid, used for new islands + * + * @param island island to add, not null + * @param noCache - if true, island will not be cached + * @return true if successfully added, false if not + */ + public boolean addIsland(@NonNull Island island, boolean noCache) { if (island.getCenter() == null || island.getWorld() == null) { - /* - * Special handling - return true. The island will not be quarantined, but just - * not loaded This can occur when a gamemode is removed temporarily from the - * server TODO: have an option to remove these when the purge command is added - */ - return true; + return false; } if (addToGrid(island)) { - islandsByLocation.put(island.getCenter(), island); - islandsById.put(island.getUniqueId(), island); + // Insert a null into the map as a placeholder for cache + islandsById.put(island.getUniqueId().intern(), noCache ? null : island); // Only add islands to this map if they are owned if (island.isOwned()) { - islandsByUUID.computeIfAbsent(island.getOwner(), k -> new HashSet<>()).add(island); + islandsByUUID.computeIfAbsent(island.getOwner(), k -> new HashSet<>()).add(island.getUniqueId()); island.getMemberSet().forEach(member -> addPlayer(member, island)); } return true; @@ -83,14 +131,14 @@ public class IslandCache { } /** - * Adds a player's UUID to the look up for islands. Does no checking + * Adds a player's UUID to the look up for islands. Does no checking. The island for this player must have been added beforehand. * * @param uuid player's uuid * @param island island to associate with this uuid. Only one island can be * associated per world. */ public void addPlayer(@NonNull UUID uuid, @NonNull Island island) { - islandsByUUID.computeIfAbsent(uuid, k -> new HashSet<>()).add(island); + this.islandsByUUID.computeIfAbsent(uuid, k -> new HashSet<>()).add(island.getUniqueId()); } /** @@ -100,11 +148,10 @@ public class IslandCache { * @return true if successfully added, false if not */ private boolean addToGrid(@NonNull Island newIsland) { - return grids.computeIfAbsent(newIsland.getWorld(), k -> new IslandGrid()).addToGrid(newIsland); + return grids.computeIfAbsent(newIsland.getWorld(), k -> new IslandGrid(this)).addToGrid(newIsland); } public void clear() { - islandsByLocation.clear(); islandsById.clear(); islandsByUUID.clear(); } @@ -113,29 +160,19 @@ public class IslandCache { * Deletes an island from the cache. Does not remove blocks. * * @param island island to delete - * @return true if successful, false if not */ - public boolean deleteIslandFromCache(@NonNull Island island) { - if (!islandsByLocation.remove(island.getCenter(), island)) { - return false; - } - islandsById.remove(island.getUniqueId()); + public void deleteIslandFromCache(@NonNull Island island) { + islandsById.remove(island.getUniqueId(), island); removeFromIslandsByUUID(island); // Remove from grid - grids.putIfAbsent(island.getWorld(), new IslandGrid()); - return grids.get(island.getWorld()).removeFromGrid(island); + if (grids.containsKey(island.getWorld())) { + grids.get(island.getWorld()).removeFromGrid(island); + } } private void removeFromIslandsByUUID(Island island) { - for (Set set : islandsByUUID.values()) { - Iterator is = set.iterator(); - while (is.hasNext()) { - Island i = is.next(); - if (i.equals(island)) { - is.remove(); - } - } - // set.removeIf(island::equals); + for (Set set : islandsByUUID.values()) { + set.removeIf(island.getUniqueId()::equals); } } @@ -145,24 +182,11 @@ public class IslandCache { * @param uniqueId - island unique ID */ public void deleteIslandFromCache(@NonNull String uniqueId) { - islandsById.remove(uniqueId); - islandsByLocation.values().removeIf(i -> i.getUniqueId().equals(uniqueId)); - for (Set set : islandsByUUID.values()) { - set.removeIf(i -> i.getUniqueId().equals(uniqueId)); + if (islandsById.containsKey(uniqueId)) { + deleteIslandFromCache(getIslandById(uniqueId)); } } - /** - * Get island based on the exact center location of the island - * - * @param location location to search for - * @return island or null if it does not exist - */ - @Nullable - public Island get(@NonNull Location location) { - return islandsByLocation.get(location); - } - /** * Returns island referenced by player's UUID. Returns the island the player is * on now, or their last known island @@ -172,19 +196,19 @@ public class IslandCache { * @return island or null if none */ @Nullable - public Island get(@NonNull World world, @NonNull UUID uuid) { + public Island getIsland(@NonNull World world, @NonNull UUID uuid) { List islands = getIslands(world, uuid); if (islands.isEmpty()) { return null; } for (Island island : islands) { - if (island.isPrimary()) { + if (island.isPrimary(uuid)) { return island; } } // If there is no primary set, then set one - it doesn't matter which. Island result = islands.iterator().next(); - result.setPrimary(true); + result.setPrimary(uuid); return result; } @@ -200,7 +224,8 @@ public class IslandCache { if (w == null) { return new ArrayList<>(); } - return islandsByUUID.computeIfAbsent(uuid, k -> new HashSet<>()).stream().filter(island -> w.equals(island.getWorld())) + return islandsByUUID.computeIfAbsent(uuid, k -> new HashSet<>()).stream().map(this::getIslandById) + .filter(Objects::nonNull).filter(island -> w.equals(island.getWorld())) .sorted(Comparator.comparingLong(Island::getCreatedDate)) .collect(Collectors.toList()); } @@ -212,8 +237,16 @@ public class IslandCache { * @param island island to make primary */ public void setPrimaryIsland(@NonNull UUID uuid, @NonNull Island island) { + if (island.getPrimaries().contains(uuid)) { + return; + } for (Island is : getIslands(island.getWorld(), uuid)) { - is.setPrimary(island.equals(is)); + if (is.getPrimaries().contains(uuid)) { + is.removePrimary(uuid); + } + if (is.equals(island)) { + is.setPrimary(uuid); + } } } @@ -235,18 +268,51 @@ public class IslandCache { /** * Returns an unmodifiable collection of all the islands (even - * those who may be unowned). + * those who may be unowned). Gets them from the cache or from the database if not + * loaded. This is a very heavy operation likely to cause lag. * * @return unmodifiable collection containing every island. */ @NonNull public Collection getIslands() { - return Collections.unmodifiableCollection(islandsByLocation.values()); + List result = new ArrayList<>(); + for (Entry<@NonNull String, @NonNull Island> entry : islandsById.entrySet()) { + Island island = entry.getValue() != null ? entry.getValue() : loadIsland(entry.getKey()); + if (island != null) { + result.add(island); + } + } + + return Collections.unmodifiableCollection(result); + } + + /** + * Loads the island with the uniqueId from the database. Note, this could be a blocking call + * and lag the server, so be careful using it. + * @param uniqueId unique ID of the island + * @return Island or null if that uniqueID is unknown + * @since 2.4.0 + */ + public Island loadIsland(String uniqueId) { + return handler.loadObject(uniqueId); } /** * Returns an unmodifiable collection of all the islands (even - * those who may be unowned) in the specified world. + * those who may be unowned) that are cached. + * + * @return unmodifiable collection containing every cached island. + */ + @NonNull + public Collection getCachedIslands() { + return islandsById.entrySet().stream().filter(en -> Objects.nonNull(en.getValue())).map(Map.Entry::getValue) + .toList(); + } + + /** + * Returns an unmodifiable collection of all the islands (even + * those that may be unowned) in the specified world. + * Gets islands from the cache if they have been loaded, or from the database if not * * @param world World of the gamemode. * @return unmodifiable collection containing all the islands in the specified @@ -259,9 +325,16 @@ public class IslandCache { if (overworld == null) { return Collections.emptyList(); } - return islandsByLocation.entrySet().stream() - .filter(entry -> overworld.equals(Util.getWorld(entry.getKey().getWorld()))) // shouldn't make NPEs - .map(Map.Entry::getValue).toList(); + + List result = new ArrayList<>(); + for (Entry<@NonNull String, @NonNull Island> entry : islandsById.entrySet()) { + Island island = entry.getValue() != null ? entry.getValue() : loadIsland(entry.getKey()); + if (island != null && overworld.equals(island.getWorld())) { + result.add(island); + } + } + + return Collections.unmodifiableCollection(result); } /** @@ -276,7 +349,8 @@ public class IslandCache { if (!islandsByUUID.containsKey(uuid)) { return false; } - return this.islandsByUUID.get(uuid).stream().filter(i -> world.equals(i.getWorld())) + return this.islandsByUUID.get(uuid).stream().map(this::getIslandById).filter(Objects::nonNull) + .filter(i -> world.equals(i.getWorld())) .anyMatch(i -> uuid.equals(i.getOwner())); } @@ -286,20 +360,24 @@ public class IslandCache { * * @param world world * @param uuid player's UUID - * @return list of islands player had or empty if none + * @return set of islands player had or empty if none */ public Set removePlayer(@NonNull World world, @NonNull UUID uuid) { - World w = Util.getWorld(world); - Set islandSet = islandsByUUID.get(uuid); - if (w == null || islandSet == null) { - return Collections.emptySet(); // Return empty list if no islands map exists for the world + World resolvedWorld = Util.getWorld(world); + Set playerIslandIds = islandsByUUID.get(uuid); + Set removedIslands = new HashSet<>(); + + if (resolvedWorld == null || playerIslandIds == null) { + return Collections.emptySet(); // Return empty set if no islands map exists for the world } - // Go through all the islands associated with this player in this world and - // remove the player from them. - Iterator it = islandSet.iterator(); - while (it.hasNext()) { - Island island = it.next(); - if (w.equals(island.getWorld())) { + + // Iterate over the player's island IDs and process each associated island + Iterator iterator = playerIslandIds.iterator(); + while (iterator.hasNext()) { + Island island = this.getIslandById(iterator.next()); + if (island != null && resolvedWorld.equals(island.getWorld())) { + removedIslands.add(island); + if (uuid.equals(island.getOwner())) { // Player is the owner, so clear the whole island and clear the ownership island.getMembers().clear(); @@ -307,11 +385,13 @@ public class IslandCache { } else { island.removeMember(uuid); } - // Remove this island from this set of islands associated to this player - it.remove(); + + // Remove this island from the set of islands associated with this player + iterator.remove(); } } - return islandSet; + + return removedIslands; } /** @@ -321,11 +401,12 @@ public class IslandCache { * @param uuid uuid of member to remove */ public void removePlayer(@NonNull Island island, @NonNull UUID uuid) { - Set islandSet = islandsByUUID.get(uuid); + Set islandSet = islandsByUUID.get(uuid); if (islandSet != null) { - islandSet.remove(island); + islandSet.remove(island.getUniqueId()); } island.removeMember(uuid); + island.removePrimary(uuid); } /** @@ -334,17 +415,18 @@ public class IslandCache { * @return the number of islands */ public int size() { - return islandsByLocation.size(); + return islandsById.size(); } /** - * Gets the number of islands in the cache for this world + * Gets the number of islands in this world * * @param world world to get the number of islands in * @return the number of islands */ public long size(World world) { - return this.islandsByLocation.keySet().stream().map(Location::getWorld).filter(world::equals).count(); + // Get from grids because this is where we have islands by world + return this.grids.containsKey(world) ? this.grids.get(world).getSize() : 0L; } /** @@ -356,11 +438,10 @@ public class IslandCache { public void setOwner(@NonNull Island island, @Nullable UUID newOwnerUUID) { island.setOwner(newOwnerUUID); if (newOwnerUUID != null) { - islandsByUUID.computeIfAbsent(newOwnerUUID, k -> new HashSet<>()).add(island); + islandsByUUID.computeIfAbsent(newOwnerUUID, k -> new HashSet<>()).add(island.getUniqueId()); } island.setRank(newOwnerUUID, RanksManager.OWNER_RANK); - islandsByLocation.put(island.getCenter(), island); - islandsById.put(island.getUniqueId(), island); + setIslandById(island); } /** @@ -372,42 +453,50 @@ public class IslandCache { */ @Nullable public Island getIslandById(@NonNull String uniqueId) { - return islandsById.get(uniqueId); + // Load from cache or database + return getIslandById(uniqueId, true); } /** - * Removes an island from the cache completely without altering the island - * object + * Get the island by unique id * - * @param island - island to remove - * @since 1.3.0 + * @param uniqueId unique id of the Island. + * @param cache if true, then the Island will be cached if it is not already + * @return island or null if none found + * @since 2.4.0 */ - public void removeIsland(@NonNull Island island) { - islandsByLocation.values().removeIf(island::equals); - islandsById.values().removeIf(island::equals); - islandsByUUID.values().removeIf(island::equals); - World w = Util.getWorld(island.getWorld()); - if (w == null) { - return; + @Nullable + public Island getIslandById(@NonNull String uniqueId, boolean cache) { + Island island = islandsById.get(uniqueId); + if (island != null) { + return island; } - if (grids.containsKey(w)) { - grids.get(w).removeFromGrid(island); + island = loadIsland(uniqueId); + if (cache && island != null) { + islandsById.put(uniqueId, island); } + return island; } /** - * Resets all islands in this game mode to default flag settings + * Place the island into the cache map + * @param island island + * @return the previous value associated with island, or null if this is a new entry + */ + Island setIslandById(Island island) { + return islandsById.put(island.getUniqueId().intern(), island); + } + + /** + * Resets all islands in this game mode to default flag settings. * * @param world - world * @since 1.3.0 */ public void resetAllFlags(World world) { - World w = Util.getWorld(world); - if (w == null) { - return; - } - islandsById.values().stream().filter(i -> i.getWorld().equals(w)).forEach(Island::setFlagsDefaults); + Bukkit.getScheduler().runTaskAsynchronously(BentoBox.getInstance(), + () -> this.getIslands(world).stream().forEach(Island::setFlagsDefaults)); } /** @@ -418,13 +507,9 @@ public class IslandCache { * @since 1.8.0 */ public void resetFlag(World world, Flag flag) { - World w = Util.getWorld(world); - if (w == null) { - return; - } - int setting = BentoBox.getInstance().getIWM().getDefaultIslandFlags(w).getOrDefault(flag, + int setting = BentoBox.getInstance().getIWM().getDefaultIslandFlags(world).getOrDefault(flag, flag.getDefaultRank()); - islandsById.values().stream().filter(i -> i.getWorld().equals(w)).forEach(i -> i.setFlag(flag, setting)); + this.getIslands(world).stream().forEach(i -> i.setFlag(flag, setting)); } /** @@ -437,4 +522,22 @@ public class IslandCache { return islandsById.keySet(); } + /** + * Get a unmodifiable list of all islands this player is involved with + * @param uniqueId player's UUID + * @return list of islands + */ + public @NonNull List getIslands(UUID uniqueId) { + return islandsByUUID.getOrDefault(uniqueId, Collections.emptySet()).stream().map(this::getIslandById).toList(); + } + + /** + * Returns if this is a known island uniqueId. Will not load the island from the database if it is not loaded already. + * @param uniqueId - unique id of island + * @return true if this island exists + */ + public boolean isIslandId(String uniqueId) { + return this.islandsById.containsKey(uniqueId); + } + } diff --git a/src/main/java/world/bentobox/bentobox/managers/island/IslandGrid.java b/src/main/java/world/bentobox/bentobox/managers/island/IslandGrid.java index db404f1a3..0893a7f09 100644 --- a/src/main/java/world/bentobox/bentobox/managers/island/IslandGrid.java +++ b/src/main/java/world/bentobox/bentobox/managers/island/IslandGrid.java @@ -3,7 +3,6 @@ package world.bentobox.bentobox.managers.island; import java.util.Map.Entry; import java.util.TreeMap; -import world.bentobox.bentobox.BentoBox; import world.bentobox.bentobox.database.objects.Island; /** @@ -12,8 +11,16 @@ import world.bentobox.bentobox.database.objects.Island; * */ class IslandGrid { - private final TreeMap> grid = new TreeMap<>(); - private final BentoBox plugin = BentoBox.getInstance(); + private final TreeMap> grid = new TreeMap<>(); + private final IslandCache im; + + /** + * @param im IslandsManager + */ + public IslandGrid(IslandCache im) { + super(); + this.im = im; + } /** * Adds island to grid @@ -21,50 +28,23 @@ class IslandGrid { * @return true if successfully added, false if island already exists, or there is an overlap */ public boolean addToGrid(Island island) { + // Check if we know about this island already if (grid.containsKey(island.getMinX())) { - TreeMap zEntry = grid.get(island.getMinX()); + TreeMap zEntry = grid.get(island.getMinX()); if (zEntry.containsKey(island.getMinZ())) { - // There is an overlap or duplicate - plugin.logError("Cannot load island. Overlapping: " + island.getUniqueId()); - plugin.logError("Location: " + island.getCenter()); - // Get the previously loaded island - Island firstLoaded = zEntry.get(island.getMinZ()); - if (firstLoaded.getOwner() == null && island.getOwner() != null) { - // This looks fishy. We prefer to load islands that have an owner. Swap the two - plugin.logError("Duplicate island has an owner, so using that one. " + island.getOwner()); - firstLoaded = new Island(island); - zEntry.put(island.getMinZ(), firstLoaded); - } else if (firstLoaded.getOwner() != null && island.getOwner() != null) { - // Check if the owners are the same - this is a true duplicate - if (firstLoaded.getOwner().equals(island.getOwner())) { - // Find out which one is the original - if (firstLoaded.getCreatedDate() > island.getCreatedDate()) { - plugin.logError("Same owner duplicate. Swapping based on creation date."); - // FirstLoaded is the newer - firstLoaded = new Island(island); - zEntry.put(island.getMinZ(), firstLoaded); - } else { - plugin.logError("Same owner duplicate."); - } - } else { - plugin.logError("Duplicate but different owner. Keeping first loaded."); - plugin.logError("This is serious!"); - plugin.logError("1st loaded ID: " + firstLoaded.getUniqueId()); - plugin.logError("1st loaded owner: " + firstLoaded.getOwner()); - plugin.logError("2nd loaded ID: " + island.getUniqueId()); - plugin.logError("2nd loaded owner: " + island.getOwner()); - } + if (island.getUniqueId().equals(zEntry.get(island.getMinZ()))) { + return true; } return false; } else { // Add island - zEntry.put(island.getMinZ(), island); + zEntry.put(island.getMinZ(), island.getUniqueId()); grid.put(island.getMinX(), zEntry); } } else { // Add island - TreeMap zEntry = new TreeMap<>(); - zEntry.put(island.getMinZ(), island); + TreeMap zEntry = new TreeMap<>(); + zEntry.put(island.getMinZ(), island.getUniqueId()); grid.put(island.getMinX(), zEntry); } return true; @@ -76,43 +56,59 @@ class IslandGrid { * @return true if island existed and was deleted, false if there was nothing to delete */ public boolean removeFromGrid(Island island) { - // Remove from grid - if (island != null) { - int x = island.getMinX(); - int z = island.getMinZ(); - if (grid.containsKey(x)) { - TreeMap zEntry = grid.get(x); - if (zEntry.containsKey(z)) { - // Island exists - delete it - zEntry.remove(z); - grid.put(x, zEntry); - return true; - } - } + String id = island.getUniqueId(); + boolean removed = grid.values().stream() + .anyMatch(innerMap -> innerMap.values().removeIf(innerValue -> innerValue.equals(id))); + + grid.values().removeIf(TreeMap::isEmpty); + + return removed; + } + + /** + * Retrieves the island located at the specified x and z coordinates, covering both the protected area + * and the full island space. Returns null if no island exists at the given location. + * + * @param x the x coordinate of the location + * @param z the z coordinate of the location + * @return the Island at the specified location, or null if no island is found + */ + public Island getIslandAt(int x, int z) { + // Attempt to find the closest x-coordinate entry that does not exceed 'x' + Entry> xEntry = grid.floorEntry(x); + if (xEntry == null) { + return null; // No x-coordinate entry found, return null } - return false; + + // Attempt to find the closest z-coordinate entry that does not exceed 'z' within the found x-coordinate + Entry zEntry = xEntry.getValue().floorEntry(z); + if (zEntry == null) { + return null; // No z-coordinate entry found, return null + } + + // Retrieve the island using the id found in the z-coordinate entry + Island island = im.getIslandById(zEntry.getValue()); + if (island == null) { + return null; // No island found by the id, return null + } + // Check if the specified coordinates are within the island space + if (island.inIslandSpace(x, z)) { + return island; // Coordinates are within island space, return the island + } + + // Coordinates are outside the island space, return null + return null; } /** - * Returns the island at the x,z location or null if there is none. - * This includes the full island space, not just the protected area. - * - * @param x - x coordinate - * @param z - z coordinate - * @return Island or null + * @return number of islands stored in the grid */ - public Island getIslandAt(int x, int z) { - Entry> en = grid.floorEntry(x); - if (en != null) { - Entry ent = en.getValue().floorEntry(z); - if (ent != null) { - // Check if in the island range - Island island = ent.getValue(); - if (island.inIslandSpace(x, z)) { - return island; - } - } + public long getSize() { + long count = 0; + for (TreeMap innerMap : grid.values()) { + count += innerMap.size(); } - return null; + return count; } + } diff --git a/src/main/java/world/bentobox/bentobox/managers/island/NewIsland.java b/src/main/java/world/bentobox/bentobox/managers/island/NewIsland.java index d9a73819f..bb4f2cb22 100644 --- a/src/main/java/world/bentobox/bentobox/managers/island/NewIsland.java +++ b/src/main/java/world/bentobox/bentobox/managers/island/NewIsland.java @@ -19,6 +19,7 @@ import world.bentobox.bentobox.api.events.island.IslandResetEvent; import world.bentobox.bentobox.api.user.User; import world.bentobox.bentobox.database.objects.Island; import world.bentobox.bentobox.managers.BlueprintsManager; +import world.bentobox.bentobox.managers.IslandsManager; /** * Create and paste a new island @@ -217,7 +218,7 @@ public class NewIsland { // Register metrics plugin.getMetrics().ifPresent(BStats::increaseIslandsCreatedCount); // Save island - plugin.getIslands().save(island); + IslandsManager.updateIsland(island); } /** @@ -266,8 +267,6 @@ public class NewIsland { plugin.getIWM().getAddon(island.getWorld()).map(GameModeAddon::getPermissionPrefix).orElse("") + "island.range", island.getProtectionRange())); - // Save the player so that if the server crashes weird things won't happen - plugin.getPlayers().save(user.getUniqueId()); } /** diff --git a/src/main/java/world/bentobox/bentobox/nms/CopyWorldRegenerator.java b/src/main/java/world/bentobox/bentobox/nms/CopyWorldRegenerator.java index 086a10226..c3ac17183 100644 --- a/src/main/java/world/bentobox/bentobox/nms/CopyWorldRegenerator.java +++ b/src/main/java/world/bentobox/bentobox/nms/CopyWorldRegenerator.java @@ -8,6 +8,8 @@ import java.util.Random; import java.util.concurrent.CompletableFuture; import java.util.concurrent.ExecutionException; +import javax.annotation.Nonnull; + import org.bukkit.Bukkit; import org.bukkit.Chunk; import org.bukkit.Location; @@ -33,11 +35,13 @@ import org.bukkit.inventory.InventoryHolder; import org.bukkit.material.Colorable; import org.bukkit.scheduler.BukkitRunnable; import org.bukkit.util.BoundingBox; +import org.eclipse.jdt.annotation.NonNull; import org.eclipse.jdt.annotation.Nullable; import io.papermc.lib.PaperLib; import world.bentobox.bentobox.BentoBox; import world.bentobox.bentobox.api.addons.GameModeAddon; +import world.bentobox.bentobox.api.hooks.Hook; import world.bentobox.bentobox.database.objects.IslandDeletion; import world.bentobox.bentobox.hooks.ItemsAdderHook; import world.bentobox.bentobox.hooks.SlimefunHook; @@ -97,7 +101,10 @@ public abstract class CopyWorldRegenerator implements WorldRegenerator { } final int x = chunkX; final int z = chunkZ; - newTasks.add(regenerateChunk(di, world, x, z)); + // Only add chunks that are generated + if (world.getChunkAt(x, z, false).isGenerated()) { + newTasks.add(regenerateChunk(di, world, x, z)); + } chunkZ++; if (chunkZ > di.getMaxZChunk()) { chunkZ = di.getMinZChunk(); @@ -119,7 +126,13 @@ public abstract class CopyWorldRegenerator implements WorldRegenerator { return regenerateChunk(null, chunk.getWorld(), chunk.getX(), chunk.getZ()); } - private CompletableFuture regenerateChunk(@Nullable IslandDeletion di, World world, int chunkX, int chunkZ) { + private CompletableFuture regenerateChunk(@Nullable IslandDeletion di, @NonNull World world, int chunkX, + int chunkZ) { + + // Check if chunk has been generated + if (!world.getChunkAt(chunkX, chunkZ, false).isGenerated()) { + return CompletableFuture.completedFuture(null); + } CompletableFuture seedWorldFuture = getSeedWorldChunk(world, chunkX, chunkZ); @@ -201,10 +214,12 @@ public abstract class CopyWorldRegenerator implements WorldRegenerator { // Delete any 3rd party blocks Location loc = new Location(toChunk.getWorld(), baseX + x, y, baseZ + z); slimefunHook.ifPresent(hook -> hook.clearBlockInfo(loc, true)); - itemsAdderHook.ifPresent(hook -> hook.clearBlockInfo(loc)); + } } } + // Items Adder + itemsAdderHook.ifPresent(hook -> ItemsAdderHook.deleteAllCustomBlocksInChunk(toChunk)); // Entities Arrays.stream(fromChunk.getEntities()).forEach(e -> processEntity(e, e.getLocation().toVector().toLocation(toChunk.getWorld()))); @@ -333,7 +348,8 @@ public abstract class CopyWorldRegenerator implements WorldRegenerator { } @SuppressWarnings("deprecation") - private CompletableFuture regenerateChunk(GameModeAddon gm, IslandDeletion di, World world, int chunkX, int chunkZ) { + private CompletableFuture regenerateChunk(GameModeAddon gm, IslandDeletion di, @Nonnull World world, + int chunkX, int chunkZ) { CompletableFuture chunkFuture = PaperLib.getChunkAtAsync(world, chunkX, chunkZ); CompletableFuture invFuture = chunkFuture.thenAccept(chunk -> Arrays.stream(chunk.getTileEntities()).filter(InventoryHolder.class::isInstance) @@ -370,6 +386,7 @@ public abstract class CopyWorldRegenerator implements WorldRegenerator { double baseZ = chunk.getZ() << 4; int minHeight = chunk.getWorld().getMinHeight(); int maxHeight = chunk.getWorld().getMaxHeight(); + Optional slimefunHook = plugin.getHooks().getHook("Slimefun"); for (int x = 0; x < 16; x++) { for (int z = 0; z < 16; z++) { if (!limitBox.contains(baseX + x, 0, baseZ + z)) { @@ -383,12 +400,11 @@ public abstract class CopyWorldRegenerator implements WorldRegenerator { } // Delete any 3rd party blocks Location loc = new Location(chunk.getWorld(), baseX + x, y, baseZ + z); - plugin.getHooks().getHook("Slimefun") - .ifPresent(sf -> ((SlimefunHook) sf).clearBlockInfo(loc, true)); - plugin.getHooks().getHook("ItemsAdder") - .ifPresent(hook -> ((ItemsAdderHook) hook).clearBlockInfo(loc)); + slimefunHook.ifPresent(sf -> ((SlimefunHook) sf).clearBlockInfo(loc, true)); } } } + // Items Adder + plugin.getHooks().getHook("ItemsAdder").ifPresent(hook -> ItemsAdderHook.deleteAllCustomBlocksInChunk(chunk)); } } diff --git a/src/main/java/world/bentobox/bentobox/nms/v1_20_R1/PasteHandlerImpl.java b/src/main/java/world/bentobox/bentobox/nms/v1_20_0_R0_1_SNAPSHOT/PasteHandlerImpl.java similarity index 97% rename from src/main/java/world/bentobox/bentobox/nms/v1_20_R1/PasteHandlerImpl.java rename to src/main/java/world/bentobox/bentobox/nms/v1_20_0_R0_1_SNAPSHOT/PasteHandlerImpl.java index 449c3b788..d9cc8f9f2 100644 --- a/src/main/java/world/bentobox/bentobox/nms/v1_20_R1/PasteHandlerImpl.java +++ b/src/main/java/world/bentobox/bentobox/nms/v1_20_0_R0_1_SNAPSHOT/PasteHandlerImpl.java @@ -1,4 +1,4 @@ -package world.bentobox.bentobox.nms.v1_20_R1; +package world.bentobox.bentobox.nms.v1_20_0_R0_1_SNAPSHOT; import java.util.concurrent.CompletableFuture; diff --git a/src/main/java/world/bentobox/bentobox/nms/v1_20_R1/WorldRegeneratorImpl.java b/src/main/java/world/bentobox/bentobox/nms/v1_20_0_R0_1_SNAPSHOT/WorldRegeneratorImpl.java similarity index 94% rename from src/main/java/world/bentobox/bentobox/nms/v1_20_R1/WorldRegeneratorImpl.java rename to src/main/java/world/bentobox/bentobox/nms/v1_20_0_R0_1_SNAPSHOT/WorldRegeneratorImpl.java index 59a9e5d53..6b85d7272 100644 --- a/src/main/java/world/bentobox/bentobox/nms/v1_20_R1/WorldRegeneratorImpl.java +++ b/src/main/java/world/bentobox/bentobox/nms/v1_20_0_R0_1_SNAPSHOT/WorldRegeneratorImpl.java @@ -1,4 +1,4 @@ -package world.bentobox.bentobox.nms.v1_20_R1; +package world.bentobox.bentobox.nms.v1_20_0_R0_1_SNAPSHOT; import org.bukkit.block.data.BlockData; import org.bukkit.craftbukkit.v1_20_R1.CraftWorld; diff --git a/src/main/java/world/bentobox/bentobox/nms/v1_20_R2/PasteHandlerImpl.java b/src/main/java/world/bentobox/bentobox/nms/v1_20_1_R0_1_SNAPSHOT/PasteHandlerImpl.java similarity index 92% rename from src/main/java/world/bentobox/bentobox/nms/v1_20_R2/PasteHandlerImpl.java rename to src/main/java/world/bentobox/bentobox/nms/v1_20_1_R0_1_SNAPSHOT/PasteHandlerImpl.java index 9d7f3c5fc..483025c52 100644 --- a/src/main/java/world/bentobox/bentobox/nms/v1_20_R2/PasteHandlerImpl.java +++ b/src/main/java/world/bentobox/bentobox/nms/v1_20_1_R0_1_SNAPSHOT/PasteHandlerImpl.java @@ -1,12 +1,12 @@ -package world.bentobox.bentobox.nms.v1_20_R2; +package world.bentobox.bentobox.nms.v1_20_1_R0_1_SNAPSHOT; import java.util.concurrent.CompletableFuture; import org.bukkit.Location; import org.bukkit.block.Block; import org.bukkit.block.data.BlockData; -import org.bukkit.craftbukkit.v1_20_R2.CraftWorld; -import org.bukkit.craftbukkit.v1_20_R2.block.data.CraftBlockData; +import org.bukkit.craftbukkit.v1_20_R1.CraftWorld; +import org.bukkit.craftbukkit.v1_20_R1.block.data.CraftBlockData; import net.minecraft.core.BlockPosition; import net.minecraft.world.level.block.state.IBlockData; diff --git a/src/main/java/world/bentobox/bentobox/nms/v1_20_1_R0_1_SNAPSHOT/WorldRegeneratorImpl.java b/src/main/java/world/bentobox/bentobox/nms/v1_20_1_R0_1_SNAPSHOT/WorldRegeneratorImpl.java new file mode 100644 index 000000000..d15d4809b --- /dev/null +++ b/src/main/java/world/bentobox/bentobox/nms/v1_20_1_R0_1_SNAPSHOT/WorldRegeneratorImpl.java @@ -0,0 +1,26 @@ +package world.bentobox.bentobox.nms.v1_20_1_R0_1_SNAPSHOT; + +import org.bukkit.block.data.BlockData; +import org.bukkit.craftbukkit.v1_20_R1.CraftWorld; +import org.bukkit.craftbukkit.v1_20_R1.block.data.CraftBlockData; + +import net.minecraft.core.BlockPosition; +import net.minecraft.world.level.World; +import net.minecraft.world.level.chunk.Chunk; +import world.bentobox.bentobox.nms.CopyWorldRegenerator; + +public class WorldRegeneratorImpl extends CopyWorldRegenerator { + + @Override + public void setBlockInNativeChunk(org.bukkit.Chunk chunk, int x, int y, int z, BlockData blockData, + boolean applyPhysics) { + CraftBlockData craft = (CraftBlockData) blockData; + World nmsWorld = ((CraftWorld) chunk.getWorld()).getHandle(); + Chunk nmsChunk = nmsWorld.d(chunk.getX(), chunk.getZ()); + BlockPosition bp = new BlockPosition((chunk.getX() << 4) + x, y, (chunk.getZ() << 4) + z); + // Setting the block to air before setting to another state prevents some console errors + nmsChunk.a(bp, PasteHandlerImpl.AIR, applyPhysics); + nmsChunk.a(bp, craft.getState(), applyPhysics); + } + +} \ No newline at end of file diff --git a/src/main/java/world/bentobox/bentobox/nms/v1_20_R3/PasteHandlerImpl.java b/src/main/java/world/bentobox/bentobox/nms/v1_20_4_R0_1_SNAPSHOT/PasteHandlerImpl.java similarity index 97% rename from src/main/java/world/bentobox/bentobox/nms/v1_20_R3/PasteHandlerImpl.java rename to src/main/java/world/bentobox/bentobox/nms/v1_20_4_R0_1_SNAPSHOT/PasteHandlerImpl.java index e06b032fa..af6a83d7a 100644 --- a/src/main/java/world/bentobox/bentobox/nms/v1_20_R3/PasteHandlerImpl.java +++ b/src/main/java/world/bentobox/bentobox/nms/v1_20_4_R0_1_SNAPSHOT/PasteHandlerImpl.java @@ -1,4 +1,4 @@ -package world.bentobox.bentobox.nms.v1_20_R3; +package world.bentobox.bentobox.nms.v1_20_4_R0_1_SNAPSHOT; import java.util.concurrent.CompletableFuture; diff --git a/src/main/java/world/bentobox/bentobox/nms/v1_20_R3/WorldRegeneratorImpl.java b/src/main/java/world/bentobox/bentobox/nms/v1_20_4_R0_1_SNAPSHOT/WorldRegeneratorImpl.java similarity index 94% rename from src/main/java/world/bentobox/bentobox/nms/v1_20_R3/WorldRegeneratorImpl.java rename to src/main/java/world/bentobox/bentobox/nms/v1_20_4_R0_1_SNAPSHOT/WorldRegeneratorImpl.java index 90592f736..f259a92bb 100644 --- a/src/main/java/world/bentobox/bentobox/nms/v1_20_R3/WorldRegeneratorImpl.java +++ b/src/main/java/world/bentobox/bentobox/nms/v1_20_4_R0_1_SNAPSHOT/WorldRegeneratorImpl.java @@ -1,4 +1,4 @@ -package world.bentobox.bentobox.nms.v1_20_R3; +package world.bentobox.bentobox.nms.v1_20_4_R0_1_SNAPSHOT; import org.bukkit.block.data.BlockData; import org.bukkit.craftbukkit.v1_20_R3.CraftWorld; diff --git a/src/main/java/world/bentobox/bentobox/nms/v1_20_6_R0_1_SNAPSHOT/PasteHandlerImpl.java b/src/main/java/world/bentobox/bentobox/nms/v1_20_6_R0_1_SNAPSHOT/PasteHandlerImpl.java new file mode 100644 index 000000000..49efdc370 --- /dev/null +++ b/src/main/java/world/bentobox/bentobox/nms/v1_20_6_R0_1_SNAPSHOT/PasteHandlerImpl.java @@ -0,0 +1,52 @@ +package world.bentobox.bentobox.nms.v1_20_6_R0_1_SNAPSHOT; + +import java.util.concurrent.CompletableFuture; + +import org.bukkit.Location; +import org.bukkit.block.Block; +import org.bukkit.block.data.BlockData; +import org.bukkit.craftbukkit.v1_20_R4.CraftWorld; +import org.bukkit.craftbukkit.v1_20_R4.block.data.CraftBlockData; + +import net.minecraft.core.BlockPosition; +import net.minecraft.world.level.block.state.IBlockData; +import net.minecraft.world.level.chunk.Chunk; +import world.bentobox.bentobox.blueprints.dataobjects.BlueprintBlock; +import world.bentobox.bentobox.database.objects.Island; +import world.bentobox.bentobox.nms.PasteHandler; +import world.bentobox.bentobox.util.DefaultPasteUtil; +import world.bentobox.bentobox.util.Util; + +public class PasteHandlerImpl implements PasteHandler { + + protected static final IBlockData AIR = ((CraftBlockData) AIR_BLOCKDATA).getState(); + + /** + * Set the block to the location + * + * @param island - island + * @param location - location + * @param bpBlock - blueprint block + */ + @Override + public CompletableFuture setBlock(Island island, Location location, BlueprintBlock bpBlock) { + return Util.getChunkAtAsync(location).thenRun(() -> { + Block block = location.getBlock(); + // Set the block data - default is AIR + BlockData bd = DefaultPasteUtil.createBlockData(bpBlock); + CraftBlockData craft = (CraftBlockData) bd; + net.minecraft.world.level.World nmsWorld = ((CraftWorld) location.getWorld()).getHandle(); + Chunk nmsChunk = nmsWorld.d(location.getBlockX() >> 4, location.getBlockZ() >> 4); + BlockPosition bp = new BlockPosition(location.getBlockX(), location.getBlockY(), location.getBlockZ()); + // Setting the block to air before setting to another state prevents some console errors + nmsChunk.a(bp, AIR, false); + nmsChunk.a(bp, craft.getState(), false); + block.setBlockData(bd, false); + DefaultPasteUtil.setBlockState(island, block, bpBlock); + // Set biome + if (bpBlock.getBiome() != null) { + block.setBiome(bpBlock.getBiome()); + } + }); + } +} diff --git a/src/main/java/world/bentobox/bentobox/nms/v1_20_6_R0_1_SNAPSHOT/WorldRegeneratorImpl.java b/src/main/java/world/bentobox/bentobox/nms/v1_20_6_R0_1_SNAPSHOT/WorldRegeneratorImpl.java new file mode 100644 index 000000000..fbff31665 --- /dev/null +++ b/src/main/java/world/bentobox/bentobox/nms/v1_20_6_R0_1_SNAPSHOT/WorldRegeneratorImpl.java @@ -0,0 +1,26 @@ +package world.bentobox.bentobox.nms.v1_20_6_R0_1_SNAPSHOT; + +import org.bukkit.block.data.BlockData; +import org.bukkit.craftbukkit.v1_20_R4.CraftWorld; +import org.bukkit.craftbukkit.v1_20_R4.block.data.CraftBlockData; + +import net.minecraft.core.BlockPosition; +import net.minecraft.world.level.World; +import net.minecraft.world.level.chunk.Chunk; +import world.bentobox.bentobox.nms.CopyWorldRegenerator; + +public class WorldRegeneratorImpl extends CopyWorldRegenerator { + + @Override + public void setBlockInNativeChunk(org.bukkit.Chunk chunk, int x, int y, int z, BlockData blockData, + boolean applyPhysics) { + CraftBlockData craft = (CraftBlockData) blockData; + World nmsWorld = ((CraftWorld) chunk.getWorld()).getHandle(); + Chunk nmsChunk = nmsWorld.d(chunk.getX(), chunk.getZ()); + BlockPosition bp = new BlockPosition((chunk.getX() << 4) + x, y, (chunk.getZ() << 4) + z); + // Setting the block to air before setting to another state prevents some console errors + nmsChunk.a(bp, PasteHandlerImpl.AIR, applyPhysics); + nmsChunk.a(bp, craft.getState(), applyPhysics); + } + +} \ No newline at end of file diff --git a/src/main/java/world/bentobox/bentobox/nms/v1_21_R0_1_SNAPSHOT/PasteHandlerImpl.java b/src/main/java/world/bentobox/bentobox/nms/v1_21_R0_1_SNAPSHOT/PasteHandlerImpl.java new file mode 100644 index 000000000..ece376eb2 --- /dev/null +++ b/src/main/java/world/bentobox/bentobox/nms/v1_21_R0_1_SNAPSHOT/PasteHandlerImpl.java @@ -0,0 +1,52 @@ +package world.bentobox.bentobox.nms.v1_21_R0_1_SNAPSHOT; + +import java.util.concurrent.CompletableFuture; + +import org.bukkit.Location; +import org.bukkit.block.Block; +import org.bukkit.block.data.BlockData; +import org.bukkit.craftbukkit.v1_21_R1.CraftWorld; +import org.bukkit.craftbukkit.v1_21_R1.block.data.CraftBlockData; + +import net.minecraft.core.BlockPosition; +import net.minecraft.world.level.block.state.IBlockData; +import net.minecraft.world.level.chunk.Chunk; +import world.bentobox.bentobox.blueprints.dataobjects.BlueprintBlock; +import world.bentobox.bentobox.database.objects.Island; +import world.bentobox.bentobox.nms.PasteHandler; +import world.bentobox.bentobox.util.DefaultPasteUtil; +import world.bentobox.bentobox.util.Util; + +public class PasteHandlerImpl implements PasteHandler { + + protected static final IBlockData AIR = ((CraftBlockData) AIR_BLOCKDATA).getState(); + + /** + * Set the block to the location + * + * @param island - island + * @param location - location + * @param bpBlock - blueprint block + */ + @Override + public CompletableFuture setBlock(Island island, Location location, BlueprintBlock bpBlock) { + return Util.getChunkAtAsync(location).thenRun(() -> { + Block block = location.getBlock(); + // Set the block data - default is AIR + BlockData bd = DefaultPasteUtil.createBlockData(bpBlock); + CraftBlockData craft = (CraftBlockData) bd; + net.minecraft.world.level.World nmsWorld = ((CraftWorld) location.getWorld()).getHandle(); + Chunk nmsChunk = nmsWorld.d(location.getBlockX() >> 4, location.getBlockZ() >> 4); + BlockPosition bp = new BlockPosition(location.getBlockX(), location.getBlockY(), location.getBlockZ()); + // Setting the block to air before setting to another state prevents some console errors + nmsChunk.a(bp, AIR, false); + nmsChunk.a(bp, craft.getState(), false); + block.setBlockData(bd, false); + DefaultPasteUtil.setBlockState(island, block, bpBlock); + // Set biome + if (bpBlock.getBiome() != null) { + block.setBiome(bpBlock.getBiome()); + } + }); + } +} diff --git a/src/main/java/world/bentobox/bentobox/nms/v1_20_R2/WorldRegeneratorImpl.java b/src/main/java/world/bentobox/bentobox/nms/v1_21_R0_1_SNAPSHOT/WorldRegeneratorImpl.java similarity index 84% rename from src/main/java/world/bentobox/bentobox/nms/v1_20_R2/WorldRegeneratorImpl.java rename to src/main/java/world/bentobox/bentobox/nms/v1_21_R0_1_SNAPSHOT/WorldRegeneratorImpl.java index 2263c01c8..6e1e3855f 100644 --- a/src/main/java/world/bentobox/bentobox/nms/v1_20_R2/WorldRegeneratorImpl.java +++ b/src/main/java/world/bentobox/bentobox/nms/v1_21_R0_1_SNAPSHOT/WorldRegeneratorImpl.java @@ -1,8 +1,8 @@ -package world.bentobox.bentobox.nms.v1_20_R2; +package world.bentobox.bentobox.nms.v1_21_R0_1_SNAPSHOT; import org.bukkit.block.data.BlockData; -import org.bukkit.craftbukkit.v1_20_R2.CraftWorld; -import org.bukkit.craftbukkit.v1_20_R2.block.data.CraftBlockData; +import org.bukkit.craftbukkit.v1_21_R1.CraftWorld; +import org.bukkit.craftbukkit.v1_21_R1.block.data.CraftBlockData; import net.minecraft.core.BlockPosition; import net.minecraft.world.level.World; diff --git a/src/main/java/world/bentobox/bentobox/panels/customizable/IslandCreationPanel.java b/src/main/java/world/bentobox/bentobox/panels/customizable/IslandCreationPanel.java index 681c3cd36..a15e77571 100644 --- a/src/main/java/world/bentobox/bentobox/panels/customizable/IslandCreationPanel.java +++ b/src/main/java/world/bentobox/bentobox/panels/customizable/IslandCreationPanel.java @@ -7,15 +7,20 @@ package world.bentobox.bentobox.panels.customizable; +import java.io.File; +import java.util.ArrayList; +import java.util.Arrays; +import java.util.Collections; +import java.util.Comparator; +import java.util.List; +import java.util.regex.Pattern; +import java.util.stream.Collectors; + import org.bukkit.World; import org.bukkit.event.inventory.ClickType; import org.bukkit.inventory.ItemStack; import org.eclipse.jdt.annotation.NonNull; import org.eclipse.jdt.annotation.Nullable; -import java.io.File; -import java.util.*; -import java.util.regex.Pattern; -import java.util.stream.Collectors; import world.bentobox.bentobox.BentoBox; import world.bentobox.bentobox.api.addons.GameModeAddon; @@ -489,7 +494,7 @@ public class IslandCreationPanel long uses = plugin.getIslands().getIslands(world, user).stream() .filter(is -> is.getMetaData("bundle") .map(mdv -> bundle.getDisplayName().equalsIgnoreCase(mdv.asString()) - && !(reset && is.isPrimary())) // If this is a reset, then ignore the use of the island being reset + && !(reset && is.isPrimary(user.getUniqueId()))) // If this is a reset, then ignore the use of the island being reset .orElse(false)) .count(); builder.description(this.user.getTranslation(BUNDLE_BUTTON_REF + "uses", TextVariables.NUMBER, diff --git a/src/main/java/world/bentobox/bentobox/panels/customizable/LanguagePanel.java b/src/main/java/world/bentobox/bentobox/panels/customizable/LanguagePanel.java index d9be6a2a9..ba84e4c60 100644 --- a/src/main/java/world/bentobox/bentobox/panels/customizable/LanguagePanel.java +++ b/src/main/java/world/bentobox/bentobox/panels/customizable/LanguagePanel.java @@ -7,16 +7,21 @@ package world.bentobox.bentobox.panels.customizable; +import java.io.File; +import java.util.ArrayList; +import java.util.Arrays; +import java.util.List; +import java.util.Locale; +import java.util.Objects; +import java.util.regex.Pattern; +import java.util.stream.Collectors; + import org.apache.commons.lang.WordUtils; import org.bukkit.Material; import org.bukkit.event.inventory.ClickType; import org.bukkit.inventory.ItemStack; import org.eclipse.jdt.annotation.NonNull; import org.eclipse.jdt.annotation.Nullable; -import java.io.File; -import java.util.*; -import java.util.regex.Pattern; -import java.util.stream.Collectors; import world.bentobox.bentobox.BentoBox; import world.bentobox.bentobox.api.addons.GameModeAddon; diff --git a/src/main/java/world/bentobox/bentobox/panels/settings/SettingsTab.java b/src/main/java/world/bentobox/bentobox/panels/settings/SettingsTab.java index 547238e7c..b558cc9d4 100644 --- a/src/main/java/world/bentobox/bentobox/panels/settings/SettingsTab.java +++ b/src/main/java/world/bentobox/bentobox/panels/settings/SettingsTab.java @@ -4,6 +4,7 @@ import java.util.Comparator; import java.util.HashMap; import java.util.List; import java.util.Map; +import java.util.UUID; import java.util.stream.Collectors; import org.bukkit.ChatColor; @@ -16,6 +17,7 @@ import org.eclipse.jdt.annotation.Nullable; import world.bentobox.bentobox.BentoBox; import world.bentobox.bentobox.api.flags.Flag; +import world.bentobox.bentobox.api.flags.Flag.Mode; import world.bentobox.bentobox.api.flags.Flag.Type; import world.bentobox.bentobox.api.localization.TextVariables; import world.bentobox.bentobox.api.panels.Panel; @@ -46,16 +48,7 @@ public class SettingsTab implements Tab, ClickHandler { protected Island island; protected TabbedPanel parent; - /** - * Show a tab of settings - * @param user - user who is viewing the tab - * @param type - flag type - */ - public SettingsTab(User user, Type type) { - this.user = user; - this.type = type; - // Island and world are set when the parent is set. - } + private Map currentMode = new HashMap<>(); /** * Show a tab of settings @@ -69,6 +62,21 @@ public class SettingsTab implements Tab, ClickHandler { this.type = type; } + /** + * Show a tab of settings + * @param world - world + * @param user - user who is viewing the tab + * @param type - flag type + * @param defaultMode - the default mode to show + * @since 2.4.0 + */ + public SettingsTab(World world, User user, Type type, Flag.Mode defaultMode) { + this.world = world; + this.user = user; + this.type = type; + currentMode.put(user.getUniqueId(), defaultMode); + } + /** * @return list of flags that will be shown in this panel */ @@ -81,7 +89,7 @@ public class SettingsTab implements Tab, ClickHandler { // Remove any that are not for this game mode plugin.getIWM().getAddon(world).ifPresent(gm -> flags.removeIf(f -> !f.getGameModes().isEmpty() && !f.getGameModes().contains(gm))); // Remove any that are the wrong rank or that will be on the top row - Flag.Mode mode = plugin.getPlayers().getFlagsDisplayMode(user.getUniqueId()); + Flag.Mode mode = currentMode.getOrDefault(user.getUniqueId(), Mode.BASIC); plugin.getIWM().getAddon(world).ifPresent(gm -> flags.removeIf(f -> f.getMode().isGreaterThan(mode) || f.getMode().equals(Flag.Mode.TOP_ROW))); return flags; @@ -120,13 +128,14 @@ public class SettingsTab implements Tab, ClickHandler { int i = 0; // Jump past empty tabs while (flags.isEmpty() && i++ < Flag.Mode.values().length) { - plugin.getPlayers().setFlagsDisplayMode(user.getUniqueId(), plugin.getPlayers().getFlagsDisplayMode(user.getUniqueId()).getNext()); + currentMode.put(user.getUniqueId(), currentMode.getOrDefault(user.getUniqueId(), Mode.BASIC).getNext()); flags = getFlags(); } - return flags.stream().map( + List<@Nullable PanelItem> result = flags.stream().map( (f -> f.toPanelItem(plugin, user, world, island, plugin.getIWM().getHiddenFlags(world).contains(f.getID())))) .toList(); + return result; } @Override @@ -137,8 +146,9 @@ public class SettingsTab implements Tab, ClickHandler { icons.put(4, Flags.CHANGE_SETTINGS.toPanelItem(plugin, user, world, island, false)); icons.put(5, Flags.LOCK.toPanelItem(plugin, user, world, island, false)); } + // Add the mode icon - switch (plugin.getPlayers().getFlagsDisplayMode(user.getUniqueId())) { + switch (currentMode.getOrDefault(user.getUniqueId(), Mode.BASIC)) { case ADVANCED -> icons.put(7, new PanelItemBuilder().icon(Material.GOLD_INGOT) .name(user.getTranslation(PROTECTION_PANEL + "mode.advanced.name")) .description(user.getTranslation(PROTECTION_PANEL + "mode.advanced.description"), "", @@ -161,7 +171,8 @@ public class SettingsTab implements Tab, ClickHandler { .clickHandler(this) .build()); } - // Add the reset everything to default - it's only in the player's settings panel + + // Add the reset everything to default - it's only in the player's settings panel if (island != null && user.getUniqueId().equals(island.getOwner())) { icons.put(8, new PanelItemBuilder().icon(Material.TNT) .name(user.getTranslation(PROTECTION_PANEL + "reset-to-default.name")) @@ -216,7 +227,7 @@ public class SettingsTab implements Tab, ClickHandler { @Override public boolean onClick(Panel panel, User user, ClickType clickType, int slot) { // Cycle the mode - plugin.getPlayers().setFlagsDisplayMode(user.getUniqueId(), plugin.getPlayers().getFlagsDisplayMode(user.getUniqueId()).getNext()); + currentMode.put(user.getUniqueId(), currentMode.getOrDefault(user.getUniqueId(), Mode.BASIC).getNext()); if (panel instanceof TabbedPanel tp) { tp.setActivePage(0); tp.refreshPanel(); diff --git a/src/main/java/world/bentobox/bentobox/util/IslandInfo.java b/src/main/java/world/bentobox/bentobox/util/IslandInfo.java index cb5e4e4e8..9604aa33f 100644 --- a/src/main/java/world/bentobox/bentobox/util/IslandInfo.java +++ b/src/main/java/world/bentobox/bentobox/util/IslandInfo.java @@ -113,6 +113,10 @@ public class IslandInfo { if (island.getPurgeProtected()) { user.sendMessage("commands.admin.info.purge-protected"); } + // Show bundle info if available + island.getMetaData("bundle").ifPresent(mdv -> { + user.sendMessage("commands.admin.info.bundle", TextVariables.NAME, mdv.asString()); + }); // Fire info event to allow other addons to add to info IslandEvent.builder().island(island).location(island.getCenter()).reason(IslandEvent.Reason.INFO) .involvedPlayer(user.getUniqueId()).addon(addon).admin(true).build(); diff --git a/src/main/java/world/bentobox/bentobox/util/ItemParser.java b/src/main/java/world/bentobox/bentobox/util/ItemParser.java index c315aa897..f820dca1a 100644 --- a/src/main/java/world/bentobox/bentobox/util/ItemParser.java +++ b/src/main/java/world/bentobox/bentobox/util/ItemParser.java @@ -1,14 +1,18 @@ package world.bentobox.bentobox.util; import java.net.URL; -import java.util.*; +import java.util.Arrays; +import java.util.Base64; +import java.util.Locale; +import java.util.MissingFormatArgumentException; +import java.util.Optional; +import java.util.UUID; import org.bukkit.Bukkit; import org.bukkit.DyeColor; import org.bukkit.Material; import org.bukkit.block.banner.Pattern; import org.bukkit.block.banner.PatternType; -import org.bukkit.inventory.ItemFactory; import org.bukkit.inventory.ItemStack; import org.bukkit.inventory.meta.BannerMeta; import org.bukkit.inventory.meta.Damageable; @@ -261,7 +265,8 @@ public class ItemParser { boolean isUpgraded = !part[2].isEmpty() && !part[2].equalsIgnoreCase("1"); boolean isExtended = part[3].equalsIgnoreCase("EXTENDED"); PotionData data = new PotionData(type, isExtended, isUpgraded); - potionMeta.setBasePotionData(data); + // TODO: Set extended and u[graded settings. + potionMeta.setBasePotionType(type); result.setItemMeta(potionMeta); result.setAmount(Integer.parseInt(part[5])); return result; @@ -285,7 +290,7 @@ public class ItemParser { private static ItemStack parsePotion(String[] part) { if (part.length == 6) { BentoBox.getInstance().logWarning("The old potion parsing detected for " + part[0] + - ". Please update your configs, as SPIGOT changed potion types."); + ". Please update your configs, as SPIGOT changed potion types."); return parsePotionOld(part); } @@ -314,7 +319,7 @@ public class ItemParser { if (result.getItemMeta() instanceof PotionMeta meta) { PotionType potionType = Enums.getIfPresent(PotionType.class, part[1].toUpperCase(Locale.ENGLISH)). - or(PotionType.WATER); + or(PotionType.WATER); meta.setBasePotionType(potionType); result.setItemMeta(meta); } @@ -340,7 +345,18 @@ public class ItemParser { BannerMeta meta = (BannerMeta) result.getItemMeta(); if (meta != null) { for (int i = 2; i < part.length; i += 2) { - meta.addPattern(new Pattern(DyeColor.valueOf(part[i + 1]), PatternType.valueOf(part[i]))); + PatternType pt = Enums.getIfPresent(PatternType.class, part[i]).orNull(); + if (pt == null) { + // Try to convert old to new + if (part[i].trim().equals("STRIPE_SMALL") + && Enums.getIfPresent(PatternType.class, "SMALL_STRIPES").isPresent()) { + pt = PatternType.SMALL_STRIPES; + } + } + DyeColor dc = Enums.getIfPresent(DyeColor.class, part[i + 1]).orNull(); + if (pt != null && dc != null) { + meta.addPattern(new Pattern(dc, pt)); + } } result.setItemMeta(meta); } diff --git a/src/main/java/world/bentobox/bentobox/util/Util.java b/src/main/java/world/bentobox/bentobox/util/Util.java index 4d833c344..7679b3bcf 100644 --- a/src/main/java/world/bentobox/bentobox/util/Util.java +++ b/src/main/java/world/bentobox/bentobox/util/Util.java @@ -1,11 +1,14 @@ package world.bentobox.bentobox.util; +import java.io.IOException; import java.text.ParseException; import java.text.SimpleDateFormat; import java.util.ArrayList; +import java.util.Arrays; import java.util.Date; import java.util.Enumeration; import java.util.List; +import java.util.Objects; import java.util.UUID; import java.util.concurrent.CompletableFuture; import java.util.jar.JarEntry; @@ -13,6 +16,8 @@ import java.util.jar.JarFile; import java.util.regex.Matcher; import java.util.regex.Pattern; +import javax.annotation.Nonnull; + import org.bukkit.Bukkit; import org.bukkit.ChatColor; import org.bukkit.Chunk; @@ -23,25 +28,15 @@ import org.bukkit.World.Environment; import org.bukkit.attribute.Attribute; import org.bukkit.block.Block; import org.bukkit.block.BlockFace; -import org.bukkit.entity.Allay; -import org.bukkit.entity.Animals; -import org.bukkit.entity.Bat; -import org.bukkit.entity.EnderDragon; -import org.bukkit.entity.Entity; -import org.bukkit.entity.Flying; -import org.bukkit.entity.IronGolem; -import org.bukkit.entity.Monster; -import org.bukkit.entity.Player; -import org.bukkit.entity.PufferFish; -import org.bukkit.entity.Shulker; -import org.bukkit.entity.Slime; -import org.bukkit.entity.Snowman; -import org.bukkit.entity.WaterMob; +import org.bukkit.entity.*; import org.bukkit.event.player.PlayerTeleportEvent.TeleportCause; import org.bukkit.util.Vector; import org.eclipse.jdt.annotation.NonNull; import org.eclipse.jdt.annotation.Nullable; +import com.google.common.base.Enums; +import com.google.common.base.Optional; + import io.papermc.lib.PaperLib; import io.papermc.lib.features.blockstatesnapshot.BlockStateSnapshotResult; import world.bentobox.bentobox.BentoBox; @@ -68,6 +63,11 @@ public class Util { private static PasteHandler pasteHandler = null; private static WorldRegenerator regenerator = null; + // Bukkit method that was added in 2011 + // Example value: 1.20.4-R0.1-SNAPSHOT + private static final String bukkitVersion = "v" + Bukkit.getBukkitVersion().replace('.', '_').replace('-', '_'); + private static final String pluginPackageName = plugin.getClass().getPackage().getName(); + private Util() {} /** @@ -357,6 +357,10 @@ public class Util { entity instanceof Allay; } + public static boolean isTamableEntity(Entity entity) { + return entity instanceof Tameable && ((Tameable) entity).isTamed(); + } + /* * PaperLib methods for addons to call */ @@ -368,7 +372,7 @@ public class Util { * @return Future that completes with the result of the teleport */ @NonNull - public static CompletableFuture teleportAsync(@NonNull Entity entity, @NonNull Location location) { + public static CompletableFuture teleportAsync(@Nonnull Entity entity, @Nonnull Location location) { return PaperLib.teleportAsync(entity, location); } @@ -380,7 +384,8 @@ public class Util { * @return Future that completes with the result of the teleport */ @NonNull - public static CompletableFuture teleportAsync(@NonNull Entity entity, @NonNull Location location, TeleportCause cause) { + public static CompletableFuture teleportAsync(@Nonnull Entity entity, @Nonnull Location location, + TeleportCause cause) { return PaperLib.teleportAsync(entity, location, cause); } @@ -391,7 +396,8 @@ public class Util { */ @NonNull public static CompletableFuture getChunkAtAsync(@NonNull Location loc) { - return getChunkAtAsync(loc.getWorld(), loc.getBlockX() >> 4, loc.getBlockZ() >> 4, true); + return getChunkAtAsync(Objects.requireNonNull(loc.getWorld()), loc.getBlockX() >> 4, loc.getBlockZ() >> 4, + true); } /** @@ -402,7 +408,7 @@ public class Util { */ @NonNull public static CompletableFuture getChunkAtAsync(@NonNull Location loc, boolean gen) { - return getChunkAtAsync(loc.getWorld(), loc.getBlockX() >> 4, loc.getBlockZ() >> 4, gen); + return getChunkAtAsync(Objects.requireNonNull(loc.getWorld()), loc.getBlockX() >> 4, loc.getBlockZ() >> 4, gen); } /** @@ -413,7 +419,7 @@ public class Util { * @return Future that completes with the chunk */ @NonNull - public static CompletableFuture getChunkAtAsync(@NonNull World world, int x, int z) { + public static CompletableFuture getChunkAtAsync(@Nonnull World world, int x, int z) { return getChunkAtAsync(world, x, z, true); } @@ -426,7 +432,7 @@ public class Util { * @return Future that completes with the chunk, or null if the chunk did not exists and generation was not requested. */ @NonNull - public static CompletableFuture getChunkAtAsync(@NonNull World world, int x, int z, boolean gen) { + public static CompletableFuture getChunkAtAsync(@Nonnull World world, int x, int z, boolean gen) { return PaperLib.getChunkAtAsync(world, x, z, gen); } @@ -436,7 +442,7 @@ public class Util { * @return If the chunk is generated or not */ public static boolean isChunkGenerated(@NonNull Location loc) { - return isChunkGenerated(loc.getWorld(), loc.getBlockX() >> 4, loc.getBlockZ() >> 4); + return isChunkGenerated(Objects.requireNonNull(loc.getWorld()), loc.getBlockX() >> 4, loc.getBlockZ() >> 4); } /** @@ -446,7 +452,7 @@ public class Util { * @param z Z coordinate of the chunk to checl * @return If the chunk is generated or not */ - public static boolean isChunkGenerated(@NonNull World world, int x, int z) { + public static boolean isChunkGenerated(@Nonnull World world, int x, int z) { return PaperLib.isChunkGenerated(world, x, z); } @@ -457,7 +463,7 @@ public class Util { * @return The BlockState */ @NonNull - public static BlockStateSnapshotResult getBlockState(@NonNull Block block, boolean useSnapshot) { + public static BlockStateSnapshotResult getBlockState(@Nonnull Block block, boolean useSnapshot) { return PaperLib.getBlockState(block, useSnapshot); } @@ -715,19 +721,16 @@ public class Util { */ public static WorldRegenerator getRegenerator() { if (regenerator == null) { - String serverPackageName = Bukkit.getServer().getClass().getPackage().getName(); - String pluginPackageName = plugin.getClass().getPackage().getName(); - String version = serverPackageName.substring(serverPackageName.lastIndexOf('.') + 1); WorldRegenerator handler; try { - Class clazz = Class.forName(pluginPackageName + ".nms." + version + ".WorldRegeneratorImpl"); + Class clazz = Class.forName(pluginPackageName + ".nms." + bukkitVersion + ".WorldRegeneratorImpl"); if (WorldRegenerator.class.isAssignableFrom(clazz)) { handler = (WorldRegenerator) clazz.getConstructor().newInstance(); } else { throw new IllegalStateException("Class " + clazz.getName() + " does not implement WorldRegenerator"); } } catch (Exception e) { - plugin.logWarning("No Regenerator found for " + version + ", falling back to Bukkit API."); + plugin.logWarning("No Regenerator found for " + bukkitVersion + ", falling back to Bukkit API."); handler = new world.bentobox.bentobox.nms.fallback.WorldRegeneratorImpl(); } setRegenerator(handler); @@ -741,19 +744,22 @@ public class Util { */ public static PasteHandler getPasteHandler() { if (pasteHandler == null) { - String serverPackageName = Bukkit.getServer().getClass().getPackage().getName(); + + // Bukkit method that was added in 2011 + // Example value: 1.20.4-R0.1-SNAPSHOT + String bukkitVersion = "v" + Bukkit.getServer().getBukkitVersion().replace('.', '_').replace('-', '_'); String pluginPackageName = plugin.getClass().getPackage().getName(); - String version = serverPackageName.substring(serverPackageName.lastIndexOf('.') + 1); + BentoBox.getInstance().log("Optimizing for " + bukkitVersion); PasteHandler handler; try { - Class clazz = Class.forName(pluginPackageName + ".nms." + version + ".PasteHandlerImpl"); + Class clazz = Class.forName(pluginPackageName + ".nms." + bukkitVersion + ".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."); + plugin.logWarning("No PasteHandler found for " + bukkitVersion + ", falling back to Bukkit API."); handler = new world.bentobox.bentobox.nms.fallback.PasteHandlerImpl(); } setPasteHandler(handler); @@ -801,4 +807,38 @@ public class Util { Util.translateColorCodes(input.replaceAll("[\\\\/:*?\"<>|\s]", "_"))). toLowerCase(); } + + /** + * Attempts to find the first matching enum constant from an array of possible string representations. + * This method sequentially checks each string against the enum constants of the specified enum class + * by normalizing the string values to uppercase before comparison, enhancing the likelihood of a match + * if the enum constants are defined in uppercase. + * + * @param enumClass the Class object of the enum type to be checked against + * @param values an array of string values which are potential matches for the enum constants + * @param the type parameter of the enum + * @return the first matching enum constant if a match is found; otherwise, returns null + * @throws IOException + * @throws NullPointerException if either {@code enumClass} or {@code values} are null + */ + public static > T findFirstMatchingEnum(Class enumClass, String... values) { + if (enumClass == null || values == null) { + return null; + } + for (String value : values) { + Optional enumConstant = Enums.getIfPresent(enumClass, value.toUpperCase()); + if (enumConstant.isPresent()) { + return enumConstant.get(); + } + } + return null; // Return null if no match is found + } + + /** + * This checks the stack trace for @Test to determine if a test is calling the code and skips. + * @return true if it's a test. + */ + public static boolean inTest() { + return Arrays.stream(Thread.currentThread().getStackTrace()).anyMatch(e -> e.getClassName().endsWith("Test")); + } } diff --git a/src/main/java/world/bentobox/bentobox/util/heads/HeadCache.java b/src/main/java/world/bentobox/bentobox/util/heads/HeadCache.java index 63086fddb..bf358f501 100644 --- a/src/main/java/world/bentobox/bentobox/util/heads/HeadCache.java +++ b/src/main/java/world/bentobox/bentobox/util/heads/HeadCache.java @@ -4,7 +4,6 @@ import java.util.UUID; import org.bukkit.Material; import org.bukkit.inventory.ItemStack; - import org.bukkit.inventory.meta.SkullMeta; import org.bukkit.profile.PlayerProfile; diff --git a/src/main/java/world/bentobox/bentobox/versions/ServerCompatibility.java b/src/main/java/world/bentobox/bentobox/versions/ServerCompatibility.java index db5f8601d..3c46cbaaa 100644 --- a/src/main/java/world/bentobox/bentobox/versions/ServerCompatibility.java +++ b/src/main/java/world/bentobox/bentobox/versions/ServerCompatibility.java @@ -9,6 +9,8 @@ import org.bukkit.Bukkit; import org.eclipse.jdt.annotation.NonNull; import org.eclipse.jdt.annotation.Nullable; +import world.bentobox.bentobox.util.Util; + /** * Checks and ensures the current server software is compatible with BentoBox. * @author Poslovitch @@ -231,7 +233,19 @@ public class ServerCompatibility { /** * @since 2.0.0 */ - V1_20_4(Compatibility.COMPATIBLE); + V1_20_4(Compatibility.COMPATIBLE), + /** + * @since 2.4.0 + */ + V1_20_5(Compatibility.COMPATIBLE), + /** + * @since 2.4.0 + */ + V1_20_6(Compatibility.COMPATIBLE), + /** + * @since 2.4.0 + */ + V1_21(Compatibility.COMPATIBLE); private final Compatibility compatibility; @@ -273,7 +287,6 @@ public class ServerCompatibility { if (result == null) { // Check the server version first ServerVersion version = getServerVersion(); - if (version == null || version.getCompatibility().equals(Compatibility.INCOMPATIBLE)) { // 'Version = null' means that it's not listed. And therefore, it's implicitly incompatible. result = Compatibility.INCOMPATIBLE; @@ -315,9 +328,12 @@ public class ServerCompatibility { */ @NonNull public ServerSoftware getServerSoftware() { - String[] parts = Bukkit.getServer().getVersion().split("-"); + if (Util.isPaper()) { + return ServerSoftware.PAPER; + } + String[] parts = Bukkit.getServer().getBukkitVersion().split("-"); if (parts.length < 2) { - return ServerSoftware.UNKNOWN.setName(Bukkit.getServer().getVersion().toUpperCase(Locale.ENGLISH)); + return ServerSoftware.UNKNOWN.setName(Bukkit.getServer().getBukkitVersion().toUpperCase(Locale.ENGLISH)); } String serverSoftware = Bukkit.getServer().getVersion().split("-")[1]; try { diff --git a/src/main/resources/locales/en-US.yml b/src/main/resources/locales/en-US.yml index 76f2b8ad4..7989f41ed 100644 --- a/src/main/resources/locales/en-US.yml +++ b/src/main/resources/locales/en-US.yml @@ -230,6 +230,7 @@ commands: banned-players: 'Banned players:' banned-format: '&c [name]' unowned: '&c Unowned' + bundle: '&a Blueprint Bundle used to create island: &b [name]' switch: description: switch on/off protection bypass op: '&c Ops can always bypass protection. Deop to use command.' @@ -266,10 +267,13 @@ commands: reload: description: reload tp: - parameters: [player to teleport] + parameters: [player's island] description: teleport to a player's island manual: '&c No safe warp found! Manually tp near to &b [location] &c and check it out' + tpuser: + parameters: [player's island] + description: teleport a player to another player's island getrank: parameters: [island owner] description: get a player's rank on their island or the island of the owner @@ -510,6 +514,7 @@ commands: addons: '[prefix_bentobox]&6 Migrating addons' class: '[prefix_bentobox]&6 Migrating [description]' migrated: '[prefix_bentobox]&a Migrated' + completed: '[prefix_bentobox]&a Completed' rank: description: 'list, add, or remove ranks' parameters: '&a [list | add | remove] [rank reference] [rank value]' @@ -1226,6 +1231,10 @@ protection: description: '&a Toggle hive harvesting.' name: Hive harvesting hint: Harvesting disabled + HURT_TAMED_ANIMALS: + description: Toggle hurting. Enabled means that tamed animals can take damage. Disabled means they are invincible. + name: Hurt tamed animals + hint: Tamed animal hurting disabled HURT_ANIMALS: description: Toggle hurting name: Hurt animals @@ -1278,6 +1287,7 @@ protection: LEASH: description: Toggle use name: Leash use + hint: Leash use disabled LECTERN: name: Lecterns description: |- @@ -1799,6 +1809,10 @@ enums: HOT_FLOOR: Hot Floor CRAMMING: Cramming DRYOUT: Dryout + FREEZE: Freeze + KILL: Kill + SONIC_BOOM: Sonic Boom + WORLD_BORDER: World Border panel: credits: diff --git a/src/main/resources/locales/zh-CN.yml b/src/main/resources/locales/zh-CN.yml index c5337504d..38da2cfa4 100644 --- a/src/main/resources/locales/zh-CN.yml +++ b/src/main/resources/locales/zh-CN.yml @@ -1,48 +1,53 @@ ---- meta: authors: + - GlobalServer - DuckSoft - shaokeyibb + - Alice-space + - CuteLittleSky + - dawnTak banner: RED_BANNER:1:SQUARE_TOP_RIGHT:YELLOW:CROSS:RED:CURLY_BORDER:RED:MOJANG:YELLOW:HALF_HORIZONTAL_MIRROR:RED:HALF_VERTICAL:RED + prefixes: - bentobox: "&6 BentoBox &7 &l > &r " + bentobox: '&6BentoBox &7&l> &r ' general: - success: "&a成功！" + success: '&a成功!' invalid: 无效 errors: - command-cancelled: "&c命令已取消。" - no-permission: "&c您无权执行此命令 （&7[permission]&c）。" - insufficient-rank: "&c您的阶衔没有达到要求 （&7[rank]&c）！" - use-in-game: "&c这个命令只能在游戏中使用。" - use-in-console: "&c 该命令仅在控制台中可用。" - no-team: "&c您目前没有团队！" - no-island: "&c您现在没有岛屿！" - player-has-island: "&c该玩家原本已经有岛屿了！" - player-has-no-island: "&c该玩家没有岛屿！" - already-have-island: "&c您已经有岛屿了， 不能重复创建！" - no-safe-location-found: "&c试图将您传送到岛屿上时找不到安全的落脚点。" - not-owner: "&c您不是该岛屿的主人！" - player-is-not-owner: "&b[name] &c不是岛屿的主人！" - not-in-team: "&c该玩家不在您的队伍中！" - offline-player: "&c该玩家不存在或已离线。" - unknown-player: "&b[name] &c是未知玩家！" - general: "&c该命令尚未就绪， 请联系管理员。" - unknown-command: "&c未知命令。 请使用 &b/[label] help &c查看帮助。" - wrong-world: "&c在您现在所处的世界里不能这么做！" - you-must-wait: "&c该命令冷却中， 剩余： &b[number] &c秒。" - must-be-positive-number: "&c“[number]” 不是有效的正数。" - not-on-island: "&c 你不在岛上！" + command-cancelled: '&c命令已取消.' + no-permission: '&c你无权执行此命令. (&7[permission]&c)' + insufficient-rank: '&c你的身份等级不够高! (&7[rank]&c)' + use-in-game: '&c此命令只能在游戏内使用.' + use-in-console: '&c此命令只能在控制台使用.' + no-team: '&c你没有加入团队!' + no-island: '&c你现在没有岛屿!' + player-has-island: '&c该玩家已有岛屿!' + player-has-no-island: '&c该玩家没有岛屿!' + already-have-island: '&c你已经有岛屿了!' + no-safe-location-found: '&c试图将你传送到岛屿上时找不到安全的落脚点.' + not-owner: '&c你不是这座岛屿的岛主!' + player-is-not-owner: '&b[name]&c不是这座岛屿的岛主!' + not-in-team: '&c该玩家在你的团队中!' + offline-player: '&c该玩家已离线或不存在.' + unknown-player: '&c未知玩家: [name]!' + general: '&c该命令尚未就绪 - 请联系管理员' + unknown-command: '&c未知命令. 使用&b/[label] help&c查看帮助.' + wrong-world: '&c当前世界不能这么做!' + you-must-wait: '&c你必须等待[number]秒后才能执行该命令.' + must-be-positive-number: '&c[number]不是一个正数.' + not-on-island: '&c你不在岛上!' worlds: overworld: 主世界 nether: 下界 the-end: 末地 + commands: help: - header: "&7 =========== &c [label] 帮助 &7 ===========" - syntax: "&b [usage] &a [parameters]&7 : &e [description]" - syntax-no-parameters: "&b [usage]&7 : &e [description]" - end: "&7 =================================" - parameters: "[command]" + header: '&7=========== &c[label]帮助 &7===========' + syntax: '&b[usage] &a[parameters]&7: &e[description]' + syntax-no-parameters: '&b[usage]&7: &e[description]' + end: '&7=================================' + parameters: '[command]' description: 命令帮助 console: 控制台 admin: @@ -52,1570 +57,1666 @@ commands: description: 修改玩家的岛屿已重置次数 set: description: 设置玩家的岛屿已重置次数 - parameters: " " - success: "&a已将玩家 &b[name] &a的岛屿已重置次数设置为 &b[number] &a。" + parameters: + success: '&a已将玩家&b[name]&a的岛屿已重置次数设置为: &b[number]&a.' reset: - description: 将玩家的岛屿已重置次数重置为 0 - parameters: "" - success-everyone: "&a已将&b所有玩家&a的岛屿已重置次数重置为 &b0 &a。" - success: "&a已将玩家 &b[name] &a的岛屿已重置次数重置为 &b0 &a。" + description: '将玩家的岛屿已重置次数重置为: 0' + parameters: + success-everyone: '&a已将&b所有玩家&a的岛屿已重置次数重置为: &b0&a.' + success: '&a已将玩家&b[name]&a的岛屿已重置次数重置为: &b0&a.' add: description: 增加玩家的岛屿已重置次数 - parameters: " " - success: "&a已将玩家 &b[name] &a的岛屿已重置次数增加了 &b[number]&a， 现在为 &b[total] &a。" + parameters: + success: '&a已将玩家&b[name]&a的岛屿已重置次数增加了&b[number]&a次, 当前已重置次数: &b[total]&a.' remove: description: 减少玩家的岛屿已重置次数 - parameters: " " - success: "&a已将玩家 &b[name] &a的岛屿已重置次数减少了 &b[number]&a， 现在为 &b[total] &a。" + parameters: + success: '&a已将玩家&b[name]&a的岛屿已重置次数减少了&b[number]&a次, 当前已重置次数: &b[total]&a.' purge: - parameters: "[days]" - description: 清理不活动超过 [days] 天的岛屿 - days-one-or-more: "&c天数必需为至少 1 或 1 以上。" - purgable-islands: "&a找到 &b[number] &a个不活动可以被清理的岛屿。" - purge-in-progress: |- - &c清理正在进行中。 - &c使用 &b/[label] purge stop &c来取消清理。 - number-error: "&c天数必需是整数。" - confirm: "&d输入 &b/[label] purge confirm &d开始清理。" - completed: "&a清理工作已完成。" + parameters: '[days]' + description: 清理超过[days]天不活跃的岛屿 + days-one-or-more: 天数必需为至少1天或大于1天 + purgable-islands: '&a发现&b[number]&a个不活跃的岛屿可以被清理.' + purge-in-progress: '&c清理正在进行中. 使用&b/[label] purge stop&c取消清理.' + number-error: '&c天数必需是整数!' + confirm: '&d输入&b/[label] purge confirm&d开始清理' + completed: '&a清理工作已完成.' see-console-for-status: |- - &a清理已开始。 - &a请参阅控制台或使用 &b/[label] purge status &a来查看清理状态。 - no-purge-in-progress: "&c没有正在进行的清理工作。" + &a清理已开始. + &a请参阅控制台或使用&b/[label] purge status&a查看清理状态&a. + no-purge-in-progress: '&c没有正在进行的清理工作.' protect: - description: 开/关 岛屿清理保护， 开启清理保护的岛屿不会被清理。 - move-to-island: "&c您身处的位置并没有岛屿，请到要操作的岛上再试！" - protecting: "&a已为该岛屿开启清理保护。" - unprotecting: "&e已关闭该岛屿的清理保护。" + description: 开/关 岛屿清理保护, 开启清理保护的岛屿不会被清理. + move-to-island: '&c你身处的位置并没有岛屿, 请到要操作的岛上再试!' + protecting: '&a已为该岛屿开启清理保护.' + unprotecting: '&a已关闭该岛屿的清理保护.' stop: description: 停止正在进行的清理工作 - stopping: "&e正在停止清理。" + stopping: 正在停止清理 unowned: - description: 清理被遗弃（无主）的岛屿 - unowned-islands: "&a找到 &b[number] &a个被遗弃（无主）的岛屿。" + description: 清理被遗弃(无主)的岛屿 + unowned-islands: '&a发现&b[number]&a个被遗弃(无主)的岛屿.' status: description: 显示清理状态 - status: "&a共有 &b[purgeable] &a个可清理，已清理 &b[purged] &a个 &7(&b[percentage] %&7)&a。" + status: '&a共有&b[purgeable]&a个岛屿可清理, 已清理&b[purged]&a个&7(&b[percentage] %&7)&a.' team: - description: 管理团队 + description: 团队管理 add: - parameters: " " + parameters: description: 将玩家添加到某个岛屿 - name-not-owner: "&c[name] 不是岛屿主人。" - name-has-island: "&c[name] 已经有岛屿了！" - success: "&a已将 &b[name] &a加入到 &b[owner] &a的岛屿。" + name-not-owner: '&c[name]不是岛主.' + name-has-island: '&c[name]已经有岛屿了!' + success: '&a已将&b[name]&a加入到&b[owner]&a的岛屿.' disband: - parameters: "" - description: 解散某岛屿所有成员 - use-disband-owner: "&c他不是岛屿主人！ 请使用 “disband [owner]” 。" - disbanded: "&c管理员解散了您的岛屿成员！" - success: "&b[name] &a的岛屿成员已被解散。" + parameters: + description: 解散团队 + use-disband-owner: '&cTA不是岛主! 请使用disband [owner].' # 不知道是什么功能 + disbanded: '&c管理员解散了你的团队!' + success: '&b[name]&a的团队已被解散.' fix: - description: 扫描数据库，并修复跨岛屿成员（某些玩家错误地拥有或归属于多个岛屿）。 - scanning: "&e正在扫描数据库..." - duplicate-owner: "&c玩家 &b[name] &c拥有多个岛屿。" - player-has: "&c玩家 &b[name] &c拥有 &b[number] 个岛屿。" - duplicate-member: "&c玩家 &b[name] &c是多个岛屿的成员。" - rank-on-island: "&c[rank] 在 [xyz]" - fixed: "&a已修复。" - done: "&a扫描完毕。" + description: 扫描数据库，并修复跨岛屿成员(某些玩家错误地拥有或归属于多个岛屿, 使用该功能会删除玩家主岛以外的岛屿) + scanning: 正在扫描数据库... + duplicate-owner: '&c数据库中检测到不止1个岛屿的玩家: [name].' + player-has: '&c玩家&b[name]&c拥有&b[number]个岛屿.' + duplicate-member: '&c玩家 &b[name] &c是多个岛屿的成员.' + rank-on-island: '&c在[xyz]的身份等级为: [rank]' + fixed: '&a已修复' + done: '&a扫描完毕' kick: - parameters: "" - description: 将玩家踢出岛屿 - cannot-kick-owner: "&c您不能踢岛屿主人， 请先踢出岛屿成员。" - not-in-team: "&c该玩家不是岛屿成员。" - admin-kicked: "&c管理员将您踢出了岛屿。" - success: "&a您已将 &b[name] &a从 &b[owner] &a的岛屿里踢出。" + parameters: + description: 将玩家踢出团队 + cannot-kick-owner: '&c你不能踢出岛主, 请先踢出团队成员.' + not-in-team: '&c该玩家没有团队.' + admin-kicked: '&c管理员将你踢出了团队.' + success: '&a已将&b[name]&a从&b[owner]&a的岛屿里踢出.' setowner: - parameters: "" - description: 将玩家提升为所在岛屿的岛主 - already-owner: "&c[name] 本身已经是岛主！" - success: "&a已将 &b[name] &a提升为岛主。" + parameters: + description: 将当前岛屿的岛主设置为指定玩家 + already-owner: '&c[name]已经是当前岛屿的岛主了!' + must-be-on-island: '&c你必须在岛屿上才能设置所有者' + confirmation: '&a你确定要把[name]设置为[xyz]的岛主吗?' + success: '&b[name]&a已被设置为当前岛屿的岛主.' + extra-islands: '&c警告: 该玩家当前拥有[number]个岛屿, 最多仅可以拥有[max]个岛屿.' range: - description: 岛屿范围管理命令 + description: 岛屿保护范围管理员命令 invalid-value: - too-low: "&c保护范围必需大于 &b1 &c！" - too-high: "&c保护范围应等于或小于 &b[number] &c！" - same-as-before: "&c保护范围已设置为 &b[number] &c！" + too-low: '&c保护范围必须大于&b1&c!' + too-high: '&c保护范围必须等于或小于&b[number]&c!' + same-as-before: '&c保护范围早已被设置为&b[number]&c, 本次操作无改动!' display: - already-off: "&c范围指示器已关闭。" - already-on: "&c范围指示器已打开。" - description: 开/关 岛屿范围指示器 - hiding: "&2正在隐藏岛屿范围指示器。" + already-off: '&c范围指示器已经关闭了' + already-on: '&c范围指示器已经开启了' + description: 开启/关闭岛屿范围指示器 + hiding: '&4岛屿范围指示器已禁用' hint: |- - &c红色屏障 &f显示所处岛屿的当前保护范围。 - &7灰色粒子 &f显示所处岛屿的最大保护范围。 - &a绿色粒子 &f显示所处岛屿的默认保护范围。 - showing: "&2正在显示岛屿范围指示器。" + &c红色屏障 &f显示当前岛屿的当前保护范围. + &7灰色粒子 &f显示当前岛屿的最大保护范围. + &a绿色粒子 &f显示当前岛屿的默认保护范围(当前岛屿保护范围与默认保护范围不一致时显示). + showing: '&2岛屿范围指示器已启用' set: - parameters: " " + parameters: [island location] description: 设置岛屿保护范围 - success: "&a给定岛屿保护范围被设置为 &b[number] &a。" + success: '&a岛屿保护范围已被设置为: &b[number]&a.' reset: - parameters: "" + parameters: description: 将岛屿保护范围重置为默认值 - success: "&a给定岛屿保护范围已被重置为 &b[number] &a。" + success: '&a岛屿保护范围已被重置为: &b[number]&a.' add: description: 增加岛屿保护范围 - parameters: " " - success: "&a已将 &b[name]&a 的岛屿保护范围增加到 &b[total] &7（&b+[number]&7）&a。" + parameters: [island location] + success: '&a玩家&b[name]&a的岛屿保护范围已增加至&b[total]&7(&b+[number]&7)&a.' remove: description: 减少岛屿保护范围 - parameters: " " - success: "&a已将 &b[name]&a 的岛屿保护范围减少到 &b[total] &7（&b-[number]&7）&a。" + parameters: [island location] + success: '&a玩家&b[name]&a的岛屿保护范围已减少至&b[total]&7(&b-[number]&7)&a.' register: - parameters: "" - description: 将玩家注册到您所处的无人岛 - registered-island: "&a已将 &b[name] &a注册到位于 &b[xyz] &a的无人岛。" - reserved-island: "&a已为 &b[name] &a预留了位于 &b[xyz] &a的岛屿。" - already-owned: "&c所处位置为另一位玩家的岛屿范围！" - no-island-here: "&c这里没有岛屿， 确定要创建一个吗？" - in-deletion: "&c所处位置正在执行清理工作， 请稍后再试。" - cannot-make-island: "&c抱歉，不能在这里创建岛屿。 请参阅控制台以获取详细信息。" + parameters: + description: 将玩家认领到当前的无主岛屿 + registered-island: '&a已将当前岛屿[xyz]认领给玩家[name].' + reserved-island: '&a已为玩家&b[name]&a预留了位于&b[xyz]&a的岛屿.' + already-owned: '&c当前岛屿已有所属!' + no-island-here: '&c当前位置没有岛屿, 是否要创建一个?' + in-deletion: '&c当前位置对应的岛屿正在删除中, 请稍后再试.' + cannot-make-island: '&c当前位置无法创建岛屿, 请查看控制台查看可能的错误.' island-is-spawn: |- - &c所处位置为出生点岛屿， 您确定要将玩家注册到这个岛屿上？ - &6请再次输入命令以确认。 + &c当前岛屿是出生点岛屿, 确定要让玩家认领这个岛屿吗? + &6请再次输入命令以确认. unregister: - parameters: " [x,y,z]" - description: 注销岛主身份， 但保留岛屿资源。 - unregistered-island: "&a已将岛主 &b[name] &a从位于 &b[xyz] &a的岛屿注销。" + parameters: [x,y,z] + description: 设置为无主岛屿并保留岛屿建筑 + unregistered-island: '&a已将[name]位于[xyz]的岛屿设置为无主岛屿.' + errors: + unknown-island-location: '&c未知岛屿位置' + specify-island-location: '&c以x,y,z格式选定岛屿位置' + player-has-more-than-one-island: '&c玩家拥有多个岛屿, 请指定一个岛屿.' info: - parameters: "[player]" - description: 获取所在位置或给定玩家的岛屿信息 - no-island: "&c您所处位置没有岛屿。" - title: "&b&l========== 岛屿信息 ============" - island-uuid: "&d岛屿编号： &f[uuid]" - owner: "&d岛屿主人： &f[owner] &7（&f[uuid]&7）" - last-login: "&d最后登录： &f[date]" - last-login-date-time-format: EEE MMM dd HH:mm:ss zzz yyyy - deaths: "&d死亡次数： &f[number] 次" - resets-left: "&d重置次数： &f[number] 次， 最多： [total] 次" - team-members-title: "&d岛屿成员：" - team-owner-format: "&f - [name] [rank]" - team-member-format: "&7 - [name] [rank]" - island-protection-center: "&d保护中心： &f[xyz]" - island-center: "&d岛屿中心： &f[xyz]" - island-coords: "&d岛屿界线： &f[xz1] 到 [xz2]" - islands-in-trash: "&d这个岛屿在垃圾桶中。" - protection-range: "&d保护范围： &f[range]" - protection-range-bonus-title: "&b 包括以下奖励：" - protection-range-bonus: 奖金：[number] - purge-protected: "&d清理保护： &a已开启" - max-protection-range: "&d历史最大保护范围： &f[range]" - protection-coords: "&d保护界线： &f[xz1] 到 [xz2]" - is-spawn: "&d岛屿类别： &a出生点" - banned-players: "&d封禁玩家：" - banned-format: "&7 - &c[name]" - unowned: "&c无人岛" + parameters: + description: 获取当前岛屿或指定玩家的都信息 + no-island: '&c你当前没有岛屿...' + title: ========== 岛屿信息 ============ + island-uuid: 'UUID: [uuid]' + owner: '岛主: [owner] ([uuid])' + last-login: '最后登录: [date]' + last-login-date-time-format: yyyy-MM-dd HH:mm:ss zzz + deaths: '死亡次数: [number]' + resets-left: '重置次数: [number] (至多: [total])' + team-members-title: '团队身份:' + team-owner-format: '&a[name] [rank]' + team-member-format: '&b[name] [rank]' + island-protection-center: '岛屿保护中心点: [xyz]' + island-center: '岛屿中心: [xyz]' + island-coords: '岛屿界线: [xz1] 至 [xz2]' + islands-in-trash: '&d岛屿在垃圾桶中.' + protection-range: '岛屿保护范围: [range]' + protection-range-bonus-title: '&b包含以下奖励:' + protection-range-bonus: '奖金: [number]' + purge-protected: '&a岛屿处于清理保护状态' + max-protection-range: '历史最大保护范围: [range]' + protection-coords: '岛屿保护界线: [xz1] 至 [xz2]' + is-spawn: '&a为出生点岛屿' + banned-players: '封禁玩家:' + banned-format: '&c[name]' + unowned: '&c无主岛屿' + bundle: '&a用于创建岛屿的蓝图方案: &b[name]' switch: - description: 开/关 保护规避机制 - op: "&c运维人员始终可以规避岛屿保护。 除非将他们开除。" - removing: "&c正在删除保护规避..." - adding: "&a正在添加保护规避..." + description: 开启/关闭 保护规避机制 + op: '&cOP始终可以规避岛屿保护.' + removing: '&a正在删除保护规避...' + adding: '&a正在添加保护规避...' switchto: - parameters: " " - description: 将玩家的岛屿扔进垃圾桶指定的位置 + parameters: + description: 将玩家岛屿扔进回收站的指定位置 out-of-range: |- - &c数字必须介于 &b1 &c到 &b[number] &c之间。 - &c使用 &b[label] trash [player] &c来查看岛屿在垃圾桶中的位置。" - cannot-switch: "&c切换失败。请参阅控制台以获取详细信息。" - success: "&a成功将玩家的岛屿切换到垃圾桶指定的位置。" + &c数字必须在&b1&c和&b[number]&c之间. + &c使用&l[label] trash [player]&r&c来查看岛屿在回收站中的位置. + cannot-switch: '&c切换失败.请查看控制台以获取详细信息.' + success: '&a成功将玩家的岛屿切换到回收站指定的位置.' trash: - no-unowned-in-trash: "&c垃圾桶中没有无人岛。" - no-islands-in-trash: "&c垃圾桶中没有玩家岛屿。" - parameters: "[player]" - description: 显示垃圾桶中的无人岛或玩家岛屿 - title: "&d =========== 岛屿垃圾桶 ===========" - count: "&d&l岛屿： [number]" - use-switch: "&a使用 &b[label] switchto &a将玩家岛屿扔到垃圾桶中指定的位置。" - use-emptytrash: "&a使用 &b[label] emptytrash [player] &a来永久删除岛屿。" + no-unowned-in-trash: '&c回收站中没有无主岛屿' + no-islands-in-trash: '&c该玩家在回收站中没有岛屿' + parameters: '[player]' + description: 显示回收站中无主岛屿或玩家岛屿 + title: '&d =========== 岛屿回收站 ===========' + count: '&d&l岛屿: [number]' + use-switch: '&a使用&l[label] switchto &r&a将玩家岛屿扔到回收站中的指定位置' + use-emptytrash: '&a使用&l[label] emptytrash [player]&r&a来永久清除指定玩家的回收站' emptytrash: - parameters: "[player]" - description: 永久删除垃圾桶中的岛屿 - success: "&a垃圾桶已清空。" + parameters: '[player]' + description: 清理回收站中玩家岛屿或全部的无主岛屿 + success: '&a回收站已清空.' version: - description: 显示 BentoBox 和附加组件的版本 + description: 显示BentoBox和组件(addon)版本 setrange: - parameters: " " - description: 设置玩家岛屿的范围 - range-updated: "&a岛屿范围已更新为 &b[number] &a。" + parameters: + description: 设置玩家岛屿范围 + range-updated: '&a岛屿范围已设置为: &b[number]&a.' reload: - description: 重载本附加组件 + description: 重载 tp: - parameters: " [player to teleport]" - description: 传送到玩家的岛屿上 - manual: "&c没有找到安全落脚点！ 请手动传送到 &b[location] &c附近检查原因。" + parameters: [player to teleport] + description: 传送到指定玩家的岛屿上 + manual: '&c没有找到安全的落脚点! 请手动传送至&b[location]&c附近检查原因.' getrank: - parameters: " [island owner]" - description: 获取玩家在岛屿上的阶衔 - rank-is: "&a玩家 &b[name] &a在岛屿上的阶衔是 &b[rank] &a。" + parameters: [island owner] + description: 获取指定玩家的身份等级 + rank-is: '&a玩家&b[name]&a在岛屿上的身份等级为: &b[rank]&a.' setrank: - parameters: " [island owner]" - description: 设置岛屿玩家的阶衔 - unknown-rank: "&c未知阶衔！" - not-possible: "&c要设置的阶衔必须比 “访客” 高。" - rank-set: "&a已将玩家 &b[name] &a的阶衔从 &b[from] &a设置为 &b[to] &a。" + parameters: [island owner] + description: 设置指定玩家的身份等级 + unknown-rank: '&c未知的身份等级!' + not-possible: '&c身份等级必须比&b访客&c高.' + rank-set: '&a已将玩家&b[name]&a的身份等级从&b[from]&a设置为&b[to]&a.' setprotectionlocation: - parameters: "[x y z]" - description: 将所处位置或给定坐标设置为岛屿保护区的中心点 - island: "&c这将影响玩家 &b[name] &c位于 &b[xyz] &c的岛屿。" - confirmation: "&c您确定将 &b[xyz] &c设置为该岛屿的保护区中心点吗？" - success: "&a成功将 &b[xyz] &a设置为该岛屿的保护区中心点。" + parameters: '[x y z coords]' + description: 将当前位置或指定坐标作为岛屿保护的中心点 + island: '&c这将影响玩家&b[name]&c位于&b[xyz]&c的岛屿.' + confirmation: '&你确定要将&b[xyz]&c设置为当前岛屿保护的中心点吗?' + success: '&a成功将&b[xyz]&a设置为当前岛屿保护的中心点.' fail: |- - &c未能将 &b[xyz] &c设置为该岛屿的保护区中心点！ - &c请参阅控制台以获得详细错误信息。 - island-location-changed: "&a[user] 将岛屿保护区中心点更改为 [xyz]。" - xyz-error: "&c坐标应该为三个整数， 例如： “&b100 120 100&c”。" + &c未能将&b[xyz]&c设置为当前岛屿保护的中心点! + &c请查看控制台以获取详细信息. + island-location-changed: '&a[user]将岛屿保护的中心点设置为: [xyz].' + xyz-error: '&c坐标应该为三个整数, 例如: &b100 120 100&c.' setspawn: - description: 将一个岛屿设置为该游戏模式的出生岛屿（主城） - already-spawn: "&c这个岛屿本来就是出生岛屿（主城）！" - no-island-here: "&c这里没有岛屿。" - confirmation: "&c您确定要将这个岛屿设置为出生岛屿（主城）吗？" - success: "&a已成功将该岛屿设置为出生岛屿（主城）。" + description: 将当前岛屿设置为该游戏模式的出生岛屿 + already-spawn: '&c该岛屿本来就是出生岛屿!' + no-island-here: '&c这里没有岛屿.' + confirmation: '&c你确定要把当前岛屿设置为这个世界的出生岛屿吗?' + success: '&a成功将该岛屿设置为当前世界出生岛屿.' setspawnpoint: description: 将当前位置设置为岛屿出生点 - no-island-here: "&c这里没有岛屿。" - confirmation: "&c您确定要把所处位置设置为该岛屿的出生点？" - success: "&a成功将所处位置设置为该岛屿的出生点。" - island-spawnpoint-changed: "&b[user] &a更改了岛屿出生点。" + no-island-here: '&c这里没有岛屿.' + confirmation: '&c你确定要把当前位置设置为这个岛屿的出生点吗?' + success: '&a成功将当前位置设置为该岛屿出生点.' + island-spawnpoint-changed: '&a[user]更改了岛屿出生点.' settings: - parameters: "[player]/[world flag] [flag/active/disable] [rank/active/disable]" + parameters: '[player]/[world flag]/spawn-island [flag/active/disable] [rank/active/disable]' description: 打开设置面板或使用命令调整岛屿设置 - unknown-setting: "&c未知设置项" + unknown-setting: '&c未知设置' blueprint: - parameters: "" - description: 管理蓝图 - bedrock-required: "&c蓝图中必须有至少一块基岩！" - copy-first: "&c请先使用 &bcopy &c命令将所选区域复制到剪贴板！" - file-exists: "&c文件已经存在， 是否要将其覆盖？" - no-such-file: "&c没有这个文件！" - could-not-load: "&c无法加载该文件！" - could-not-save: "&c保存文件时出现错误： [message]" - set-pos1: "&a对角点 1 已设置为 &f[vector]" - set-pos2: "&a对角点 2 已设置为 &f[vector]" - set-different-pos: "&c这个位置已设置为对角点， 请选择其他位置！" - need-pos1-pos2: "&c请先设置两个对角点！" - copying: "&b正在复制方块..." - copied-blocks: "&b复制了 &f[number] &b个方块到剪贴板中。" - look-at-a-block: "&c要设置的位置必须位于视线所指方向 20 格以内！" - mid-copy: "&c已有一个复制动作正在进行， 请稍等。" - copied-percent: "&6复制了 &b[number]%" + parameters: + description: 操作蓝图 + bedrock-required: '&c蓝图中必须有至少一块基岩!!' + copy-first: '&c请先使用&bcopy&c命令将所选区域复制到剪贴板!' + file-exists: '&c文件已存在, 是否要将其覆盖?' + no-such-file: '&c文件不存在!' + could-not-load: '&c无法加载该文件!' + could-not-save: '&c保存文件时出现错误: [message]' + set-pos1: '&a第一选取点已设置为: &f[vector]' + set-pos2: '&a第二选取点已设置为: &f[vector]' + set-different-pos: '&c这个位置已设置选取点, 请选择其它位置!' + need-pos1-pos2: '&c请先设置两个选取点!' + copying: '&b正在复制方块...' + copied-blocks: '&b复制了&f[number]&b个方块到剪贴板中.' + look-at-a-block: '&c要设置的位置必须位于视线所指方向20格以内!' + mid-copy: '&c已有复制操作正在进行, 请稍等.' + copied-percent: '&6复制进度: &b[number]%&6.' copy: - parameters: "[air]" - description: 复制两个对角点所示区域内的所有方块到剪贴板中 + parameters: '[air]' + description: 复制两个选取点所示区域内的所有非空气方块(如果有[air]参数则包含空气方块) delete: - parameters: "" + parameters: description: 删除蓝图 - no-blueprint: "&c蓝图 &b[name] &c不存在！" - confirmation: "&c请注意， 蓝图删除后将无法恢复！ 您确定要删除吗？" - success: "&a成功删除了蓝图 &b[name] &a。" + no-blueprint: '&c蓝图: &b[name]&c不存在.' + confirmation: |- + &c你确定要删除这个蓝图吗? + &c一旦删除成功, 将无法恢复. + success: '&a成功删除蓝图: &b[name]&a.' load: - parameters: "" - description: 把蓝图文件载入到剪贴板中 + parameters: + description: 加载蓝图到剪贴板 list: - description: 列出可用的蓝图 - no-blueprints: "&c蓝图文件夹中没有蓝图文件！" - available-blueprints: "&a这些蓝图可以加载：" + description: 列出可用蓝图 + no-blueprints: '&c蓝图文件夹中没有蓝图文件!' + available-blueprints: '&a这些蓝图可以加载: ' origin: - description: 将蓝图的原点设置为您所处的位置 + description: 将蓝图的原点设置为你所处的位置 paste: - description: 将剪贴板中的方块粘贴到您的位置 - pasting: "&a正在粘贴..." + description: 将剪贴板中的方块粘贴到你的位置 + pasting: '&a粘贴中...' pos1: - description: 设置剪贴板的第 1 个对角点 + description: 设置剪贴板的第1个选取点 pos2: - description: 设置剪贴板的第 2 个对角点 + description: 设置剪贴板的第2个选取点 save: - parameters: "" + parameters: description: 将剪贴板中的内容保存为蓝图文件 rename: - parameters: " " + parameters: description: 重命名蓝图文件 - success: "&a蓝图文件 &b[old] &a已被重命名为 &b[name] &a。" - pick-different-name: "&c该蓝图名称已存在， 请指定一个不同的名称。" + success: '&a蓝图文件: &b[old]&a已被重命名为: &b[name]&a.' + pick-different-name: '&c该蓝图名称已存在, 请指定一个不同的名称.' management: - back: "&f返回" - instruction: "&7单击蓝图，然后单击此处" - title: "&9&l蓝图方案管理器" - edit: "&7左键点击 - 编辑蓝图方案" - rename: "&7右键点击 - 重命名蓝图方案" - edit-description: "&7&l编辑描述" - world-name-syntax: "&b&l[name]" + back: '&f返回' + instruction: '&7点击蓝图, 然后点击此处' + title: '&9&l蓝图方案管理' + edit: '&7左键点击 - 编辑蓝图方案' + rename: '&7右键点击 - 重命名蓝图方案' + edit-description: '&f点击此处编辑描述' + world-name-syntax: '&f世界: &b[name]' world-instructions: |- &7请从以下列表中选择一个 &7蓝图并放置在右边一格里 &7以将蓝图应用到这个世界 - trash: "&c&l垃圾桶" - no-trash: "&8&l垃圾桶" - trash-instructions: "&e右键点击删除此蓝图方案" - no-trash-instructions: "&c不能删除预置蓝图方案" - permission: "&f&l权限" - no-permission: "&f&l不需要权限" - perm-required: "&c需要：" - no-perm-required: "&c不能为预置的蓝图方案设置权限" - perm-not-required: "&7不需要" - perm-format: "&e" - remove: "&7右键点击来删除" + trash: '&f回收站' + no-trash: '&f无法回收' + trash-instructions: '&7右键点击删除此蓝图方案' + no-trash-instructions: '&c不能删除默认蓝图方案' + permission: '&f权限' + no-permission: '&f无需权限' + perm-required: '&f需要: ' + no-perm-required: '&c不能为默认蓝图方案设置权限' + perm-not-required: '&7不需要权限' + perm-format: '&e' + remove: '&7右键点击删除' blueprint-instruction: |- &7左键点击 - 选择蓝图 &7右键点击 - 重命名蓝图 - select-first: "&c请先选择蓝图！" - new-bundle: "&f&l新建蓝图方案" + select-first: '&c请先选择蓝图' + new-bundle: '&f&l新建蓝图方案' new-bundle-instructions: |- - &7右键点击来创建一个新的蓝图方案。 - &7蓝图方案是指包含适用于主世界、下界、末地 - &7三个世界的蓝图的捆绑包。 - &7它将出现在玩家创建岛屿界面中。 + &7点击创建一个新的蓝图方案 + &7蓝图方案包含: 主世界 下界 末地 + &7三个世界的岛屿蓝图选择 + &7它将出现在玩家创建岛屿界面中 name: quit: quit - prompt: "&e请输入新名称， 或 “&b quit&e” 来退出编辑。" - too-long: "&c新名称太长了！" - pick-a-unique-name: "&c这个名称已存在， 请另选一个不同的名称！" - stripped-char-in-unique-name: "&c 一些字符被删除，因为它们是不允许的。 &a 新 ID 将为 &b [name]&a。" - success: "&a成功！" - conversation-prefix: "&3> &r" + prompt: 请输入蓝图方案名称, 或输入&bquit&r取消创建蓝图方案 + too-long: '&c蓝图方案名称过长, 请确保在32个字符以内.' + pick-a-unique-name: '&c该蓝图方案名称已存在, 请换一个名称.' + stripped-char-in-unique-name: '&c其中的非法字符已被删除, 岛屿方案名称为: &b[name]&a.' + success: '&a蓝图方案创建成功!' + conversation-prefix: '&f>&r' description: quit: quit instructions: |- - &e请为 &b[name] &e输入描述， 每输入一次为一行。 - &e最后输入 “&bquit&e” 退出编辑。 - success: "&a成功！" - cancelling: "&c已取消！" - slot: "&f&l显示槽位： [number]" + &7请为&b[name]&7蓝图方案输入描述 + &7每输入一次为一行 + &7最后输入&bquit&7退出编辑 + default-color: '' + success: '&a蓝图方案描述添加成功!' + cancelling: '&c取消编辑蓝图方案描述!' + slot: '&f显示槽位: [number]' slot-instructions: |- - &e左键点击 &7- &b增加 （往后移） - &e右键点击 &7- &b减少 （往前移） + &7左键点击 &7- &a增加 &7(向后移) + &7右键点击 &7- &c减少 &7(向前移) + times: |- + &a每个玩家最多可使用该蓝图方案次数 + &7左键点击 &7- &a增加 + &7右键点击 &7- &c减少 + unlimited-times: '&e无限' + maximum-times: '&f每个玩家最多可用次数: [number]' resetflags: - parameters: "[flag]" - description: 将所有岛屿的保护标志设置为 config.yml 中默认的状态 - confirm: "&4这将把所有岛屿的保护标志重置为默认值！" - success: "&a已成功将所有岛屿的保护标志重置为默认设置。" - success-one: "&a所有岛屿的 “&b[name]&a” 保护标志已重置为默认值。" + parameters: '[flag]' + description: 将所有岛屿的保护标志设置为config.yml中默认值 + confirm: '&4这将把所有岛屿的保护标志重置为默认值!' + success: '&a成功将所有岛屿的保护标志重置为默认设置.' + success-one: '&a所有岛屿的&b[name]&a保护标志已重置为默认值.' world: description: 管理世界设置 delete: - parameters: "" + parameters: description: 删除玩家的岛屿 - cannot-delete-owner: "&c删除岛屿之前，必须将所有岛屿成员踢出该岛。" - deleted-island: "&a位于 &e[xyz] &a的岛屿已成功删除。" + cannot-delete-owner: '&c删除岛屿之前, 必须将所有团队成员踢出队伍.' + deleted-island: '&a位于&e[xyz]&a的岛屿已成功删除.' deletehomes: - parameters: "<玩家>" - description: 从岛上删除所有命名的房屋 - warning: "&c 所有已命名的房屋将从岛上删除！" + parameters: + description: 从岛上删除所有命名过的家 + warning: '&c岛上所有命名过的家将被删除!' why: - parameters: "" - description: 为玩家 打开/关闭 控制台调试报告 - turning-on: "&a已为 &b[name] &a打开控制台调试报告。" - turning-off: "&e已为 &b[name] &e关闭控制台调试报告。" + parameters: + description: 为玩家开启/关闭控制台调试报告 + turning-on: '&a已为&b[name]&a打开控制台调试报告.' + turning-off: '&e已为&b[name]&e关闭控制台调试报告.' deaths: - description: 调整玩家的死亡次数 + description: 编辑玩家的死亡次数 reset: description: 重置玩家的死亡次数 - parameters: "" - success: "&a成功重置玩家 &b[name] &a的死亡次数。" + parameters: + success: '&a成功将玩家&b[name]&a的死亡次数重置为: &b0&a.' set: description: 设置玩家的死亡次数 - parameters: " " - success: "&a成功将玩家 &b[name] &a的死亡次数设置为 &b[number] &a次。" + parameters: + success: '&a成功将玩家&b[name]&a的死亡次数设置为: &b[number]&a.' add: description: 增加玩家的死亡次数 - parameters: " " + parameters: success: |- - &a成功将玩家 &b[name] &a的死亡次数增加 &b[number] 次。 - &a他现在的死亡次数为： &b[total] &a次。" + &a成功将玩家&b[name]&a的死亡次数增加&b[number]&a次 + &a现在的死亡次数为: &b[total]&a remove: description: 减少玩家的死亡次数 - parameters: " " + parameters: success: |- - &a成功将玩家 &b[name] &a的死亡次数减少 &b[number] 次。 - &a他现在的死亡次数为： &b[total] &a次。" + &a成功将玩家&b[name]&a的死亡次数减少&b[number]&a次 + &a现在的死亡次数为: &b[total]&a resetname: description: 重置玩家岛屿名称 - success: "&a 成功重置[name]的岛屿名称。" + success: '&a成功重置&b[name]&a的岛屿名称.' bentobox: - description: BentoBox 管理员命令 + description: BentoBox管理员命令 perms: - description: 以 YAML 格式显示 BentoBox 和 Addons 的有效权限 + description: 以YAML格式显示BentoBox和Addons的有效权限 about: description: 显示版权和许可信息 reload: - description: 重载 BentoBox 和所有附加组件、设置和语言 - locales-reloaded: "[prefix_bentobox] &2语言资源已重载。" - addons-reloaded: "[prefix_bentobox]&2附加组件已重载。" - settings-reloaded: "[prefix_bentobox]&2设置已重载。" - addon: "[prefix_bentobox]&6正在重载 &b[name] &2。" - addon-reloaded: "[prefix_bentobox]&b[name] &2已重载。" - warning: "[prefix_bentobox]&c警告： 重载可能导致不稳定， 如果发生错误， 请重启服务器。" - unknown-addon: "[prefix_bentobox]&c未知组件！" + description: 重载BentoBox和所有组件(Addons)、设置、语言 + locales-reloaded: '[prefix_bentobox]&2语言文件已重载.' + addons-reloaded: '[prefix_bentobox]&2组件(Addons)已重载.' + settings-reloaded: '[prefix_bentobox]&2设置已重载.' + addon: '[prefix_bentobox]&6正在重载&b[name]&2.' + addon-reloaded: '[prefix_bentobox]&b[name]&2已重载.' + warning: '[prefix_bentobox]&c警告: 重载可能导致不稳定, 如果发生错误, 请重启服务器.' + unknown-addon: '[prefix_bentobox]&c未知组件(Addon)!' locales: - description: 重载语言资源 + description: 重载语言文件 version: - plugin-version: "&2 BentoBox 版本： &3[version]" - description: 显示 BentoBox 和附加组件版本 - loaded-addons: 已载入的附加组件： - loaded-game-worlds: 已载入的游戏世界： - addon-syntax: "&2[name] &3[version] &7(&3[state]&7)" - game-world: "&2[name] &7(&3[addon]&7) : &3[worlds]" - server: "&2服务器： &3[name] [version]&2" - database: "&2数据库： &3[database]" + plugin-version: '&2BentoBox版本: &3[version]' + description: 显示BentoBox和附加组件(Addons)版本 + loaded-addons: '&f已加载的附加组件(Addons):' + loaded-game-worlds: '&f已加载的世界:' + addon-syntax: '&2[name] &3[version] &7(&3[state]&7)' + game-world: '&2[name] &7(&3[addon]&7): &3[worlds]' + server: '&2运行在: &3[name] [version]&2.' + database: '&2数据库类型: &3[database]' manage: description: 显示管理面板 catalog: - description: 显示编目 + description: 显示游戏模式目录 locale: description: 执行语言文件分析 see-console: |- - [prefix_bentobox] &a请从控制台读取反馈信息。 - [prefix_bentobox] &a此命令非常垃圾，无法从聊天中读取反馈... - [prefix_bentobox] &a确实垃圾，就算从控制台里读取反馈也非常吃力啊！ + [prefix_bentobox] &a请从控制台读取反馈信息 + [prefix_bentobox] &a此命令非常垃圾, 无法从聊天中读取反馈... + [prefix_bentobox] &a确实垃圾, 就算从控制台里读取反馈也非常吃力啊! migrate: - description: 将数据从一个数据库迁移到另一个数据库 - players: "[prefix_bentobox] &6迁移玩家数据库" - names: "[prefix_bentobox] &6迁移玩家名称数据库" - addons: "[prefix_bentobox] &6迁移附加组件" - class: "[prefix_bentobox] &6迁移 [description]" - migrated: "[prefix_bentobox] &a迁移完成" + description: 将数据从一个数据库迁移至另一个数据库 + players: '[prefix_bentobox]&6迁移玩家数据库' + names: '[prefix_bentobox]&6迁移玩家名称数据库' + addons: '[prefix_bentobox]&6迁移附加组件(Addons)' + class: '[prefix_bentobox]&6迁移[description]' + migrated: '[prefix_bentobox]&a迁移完成' + rank: + description: 列出, 添加或删除身份等级 + parameters: '&a[list | add | remove] [rank reference] [rank value]' + add: + success: '&a身份等级: &b[rank] &a值: &b[number]&a添加成功!' + failure: '&c身份等级: &b[rank] &a值: &b[number]&a添加失败!' + remove: + success: '&a成功删除身份等级: &b[rank]' + failure: '&c删除身份等级: &b[rank]&c失败. 未知身份等级.' + list: '&a已注册的身份等级如下:' confirmation: - confirm: "&c请在 &b[seconds] &c秒内再次输入命令以确认。" - previous-request-cancelled: "&6先前的确认请求已取消。" - request-cancelled: "&c确认超时 &7- &b请求已取消。" + confirm: '&c请在&b[seconds]&c秒内再次输入命令以确认.' + previous-request-cancelled: '&6先前的确认请求已取消.' + request-cancelled: '&c确认超时 &7- &b请求已取消.' delay: - previous-command-cancelled: "&c上一个命令已取消。" - stand-still: "&6请不要移动！ 将在 &b[seconds] &6秒后传送。" - moved-so-command-cancelled: "&c您移动了， 传送已取消。" + previous-command-cancelled: '&c上一个命令已取消.' + stand-still: '&6请勿移动! 传送将在&b[seconds]&6秒后开始.' + moved-so-command-cancelled: '&c你移动了! 传送已取消.' island: about: description: 显示许可信息 go: - parameters: "[home name]" - description: 传送到岛屿上 - teleport: "&a正在传送到岛屿。" - teleported: "&a正在传送到岛屿传送点 &e[number] &a。" - unknown-home: "&c未知岛屿传送点。" + parameters: '[home name]' + description: 传送到你的岛屿上 + teleport: '&a正在将你传送到你的岛屿上.' + teleported: '&a正在将你传送到你的岛屿传送点: &e[number]&a.' + unknown-home: '&c未知岛屿传送点名称!' help: - description: 岛屿主命令 + description: 岛屿主要命令 spawn: - description: 传送到出生岛屿（主城） - teleporting: "&a正在传送到出生岛屿（主城）" - no-spawn: "&c这个游戏模式里没有出生岛屿！" + description: 传送到出生点 + teleporting: '&a正在将你传送到出生点.' + no-spawn: '&c当前游戏模式没有出生点.' create: - description: 使用可选的蓝图方案创建岛屿 （有些蓝图可能需要权限） - parameters: "" - too-many-islands: "&c这个世界太拥挤了， 已经没有空余空间为您创建岛屿。" - cannot-create-island: "&c找不到合适的地点为您创建岛屿， 请稍后重试..." - unable-create-island: "&c无法生成您的岛屿， 请联系管理员。" - creating-island: "&a正在为您的岛屿寻找合适的地点..." - you-cannot-make: "&c 你不能再建造任何岛屿了！" + description: 使用可选的蓝图方案创建岛屿(一些蓝图可能需要权限) + parameters: + too-many-islands: '&c这个世界太拥挤了, 没有足够的空间来创建你的岛屿.' + cannot-create-island: '&c找不到合适的地点为您创建岛屿, 请稍后重试...' + unable-create-island: '&c无法为你生成岛屿, 请联系管理员.' + creating-island: '&a正在为你的岛屿寻找合适的地点...' + you-cannot-make: '&c你不能再建造任何岛屿了!' + max-uses: '&c你已达到该类型岛屿的最大创建次数, 无法再创建更多该类型的岛屿!' + you-cannot-make-team: '&c团队成员无法创建岛屿.' pasting: - estimated-time: "&b预计用时： &e[number] &a秒。" - blocks: "&b正在构建： &a总共需要构建 &e[number] &a个方块..." - entities: "&b填充实体： &a总共需要填充 &e[number] &a个实体..." - dimension-done: "[world]中的一座岛屿已建成。" - done: "&a完成！ 您的岛屿已准备就绪！" - pick: "&9&l选择岛屿方案" - unknown-blueprint: "&c该蓝图方案尚未加载。" - on-first-login: "&a欢迎！我们将在几秒钟内开始创建您的岛屿！" - you-can-teleport-to-your-island: "&a您可以在任何时传送到您的岛屿。" + estimated-time: '&a预计用时: &b[number]&a秒.' + blocks: '&a正在构建... 共需构建: &b[number]&a个方块.' + entities: '&a填充实体... 共需填充: &b[number]&a个实体.' + dimension-done: '&b[world]&a中的一座岛屿构建成功.' + done: '&a岛屿部署完毕! 你的岛屿已准备就绪.' + pick: '&2选择你的岛屿' + unknown-blueprint: '&c该蓝图方案尚未加载.' + on-first-login: '&a欢迎! 我们将在几秒钟内开始创建你的岛屿.' + you-can-teleport-to-your-island: '&a你可以随时传送到你的岛屿上.' deletehome: description: 删除岛屿传送点 - parameters: "[home name]" + parameters: '[home name]' homes: - description: 列出你的家 + description: 显示你设置的全部岛屿传送点 info: - description: 显示所处岛屿或给定玩家的岛屿信息 - parameters: "" + description: 显示当前岛屿或指定玩家的岛屿信息 + parameters: near: - description: 显示您附近的岛屿的名称 - the-following-islands: "&a这些岛屿在您附近：" - syntax: "&6 - [direction]： &a[name]" + description: 显示周边岛屿名称 + parameters: '' + the-following-islands: '&a这些岛屿在你附近: ' + syntax: '&6[direction]: &a[name]' north: 北方 south: 南方 east: 东方 west: 西方 - no-neighbors: "&c您附近没有岛屿！" + no-neighbors: '&c你的周边没有岛屿!' reset: - description: 重新开始您的岛屿生涯 - parameters: "" - none-left: "&c您没有重置机会了！" - resets-left: "&c您还有 &b[number] &c次重置机会。" + description: 重新开始你的岛屿生涯 + parameters: + none-left: '&c你没有重置机会了!' + resets-left: '&c你还有&b[number]&c次重置机会.' confirmation: |- - &c您确定要重新开始吗？ - &c岛上所有成员都会被踢出岛屿， 之后如果您需要他们， 必须重新邀请他们。 - &c没有回头路：一旦删除了岛屿就再也不能恢复了。 - kicked-from-island: "&c您被踢出了 &b[gamemode] &c的岛屿， 因为岛主正在重置岛屿。" + &c你确定要重置岛屿吗? + &c所有岛屿团队成员将被踢出队伍, 需重新邀请岛屿团队成员. + &c该操作不可逆: 一旦岛屿被删除了, &l没有恢复的可能&r&c. + kicked-from-island: '&c你已被踢出&b[gamemode]&c的岛屿, 岛主正在重置岛屿.' sethome: - description: 设置岛屿传送点 - must-be-on-your-island: "&c您必须在自己的岛上才能设置传送点！" - too-many-homes: "&c无法设置 - 您的岛屿最多只能有 &b[number] &c个传送点。" - home-set: "&6您已在所处位置设置了岛屿传送点。" - homes-are: "&6您的岛屿传送点有：" - home-list-syntax: "&6 - [name]" + description: 设置你的岛屿传送点 + must-be-on-your-island: '&c你必须在自己的岛上才能设置传送点!' + too-many-homes: '&c无法设置 - 你的岛屿最多只能有&b[number]&c个传送点.' + home-set: '&6你的岛屿传送点已被设置在了当前位置.' + homes-are: '&6你的岛屿传送点如下: ' + home-list-syntax: '&6[name]' nether: - not-allowed: "&c不允许在下界设置岛屿传送点。" - confirmation: "&c您确定要在下界设置岛屿传送点吗？" + not-allowed: '&c不允许在下界设置岛屿传送点.' + confirmation: '&c你确定要在下界设置岛屿传送点吗?' the-end: - not-allowed: "&c不允许在末地设置岛屿传送点。" - confirmation: "&c您确定要在末地设置岛屿传送点吗？" - parameters: "[home number]" + not-allowed: '&c不允许在末地设置岛屿传送点.' + confirmation: '&c你确定要在末地设置岛屿传送点吗?' + parameters: '[home name]' setname: - description: 为您的岛屿取一个好听的名字 - name-too-short: "&c太短了， 名字至少应该有 &b[number] &c个字符。" - name-too-long: "&c太长了， 名字最多只能有 &b[number] &c个字符。" - name-already-exists: "&c已经有一个该名称的岛屿了。" - parameters: "" - success: "&a成功为您的岛屿取名为 &b[name] &a。" + description: 为你的岛屿命名 + name-too-short: '&c岛屿名过短. 请至少有: &b[number]&c个字符.' + name-too-long: '&c岛屿名过长. 请至多有: &b[number]&c个字符.' + name-already-exists: '&c已经有一个该名称的岛屿了.' + parameters: + success: '&a成功将你的岛屿命名为: &b[name]&a.' renamehome: description: 重命名岛屿传送点 - parameters: "[home name]" - enter-new-name: "&6输入新名称" - already-exists: "&c该名称已存在， 请输入一个不同的名称。" + parameters: '[home name]' + enter-new-name: '&6请输入新的传送点名称: ' + already-exists: '&c该名称已存在, 请输入一个不同的名称.' resetname: - description: 重置岛屿名称 - success: "&a已成功重置岛屿名称。" + description: 重置你的岛屿名称 + success: '&a你的岛屿名称已重置.' team: - description: 管理您的岛屿团队 + description: 管理你的岛屿团队 + gui: + titles: + team-panel: '&#EE82EE&l岛屿团队管理' + buttons: + status: + name: '&e&l状态' + description: 团队状态 + rank-filter: + name: '&e&l身份等级筛选' + description: '&a点击切换查询的身份等级' + invitation: '&e&l收到邀请' + invite: + name: '&e&l邀请玩家' + description: | + &a玩家必须和你在一个世界(维度) + &a才会显示在列表中 + tips: + LEFT: + name: '&b左键' + invite: '&a邀请一位玩家加入团队' + RIGHT: + name: '&b右键' + SHIFT_RIGHT: + name: '&bShift + 右键' + reject: '&c拒绝邀请' + kick: '&a将该玩家踢出团队' + leave: '&a离开团队' + SHIFT_LEFT: + name: '&bShift + 左键' + accept: '&a接受邀请' + setowner: '&a将该玩家升为岛主(你会成为副岛主)' info: description: 显示您的岛屿团队详细信息 member-layout: - online: "&a&l o &f[name]" - offline: "&7&l o &7[name] ([last_seen])" - offline-not-last-seen: "&7&l o &7[name]" + online: '&a&l o &r&f[name]' + offline: '&c&l o &r&f[name] &7([last_seen])' + offline-not-last-seen: '&c&l o &r&f[name]' last-seen: - layout: "&b[number] &7[unit] 前" + layout: '&b[number]&7[unit]前在线' days: 天 hours: 小时 minutes: 分钟 header: | &f--- &a团队信息 &f--- - &a成员： &b[total]&7/&b[max] - &a在线： &b[online] + &a成员: &b[total]&7/&b[max] + &a在线: &b[online] rank-layout: - owner: "&6[rank]:" - generic: "&6[rank] &7(&b[number]&7)&6：" + owner: '&6[rank]: ' + generic: '&6[rank]&7(&b[number]&7)&6: ' coop: - description: 请求玩家成为您的协作者 - parameters: "" - cannot-coop-yourself: "&c您不能与自己建立协作关系。" - already-has-rank: "&c该玩家已经与您建立了协作关系。" - you-are-a-coop-member: "&2您成为了 &b[name] &a的协作者。" - success: "&a成功！ &b[name] &a成为了您的协作者。" - name-has-invited-you: "&a[name] 邀请您与他建立协作关系。" + description: 将一位玩家以协作者身份加入团队 + parameters: + cannot-coop-yourself: '&c你不能与自己协作!' + already-has-rank: '&c该玩家在你的团队中已经有身份等级了!' + you-are-a-coop-member: '&2你成为了&b[name]&2的协作者.' + success: '&b[name]&a成为了你的协作者.' + name-has-invited-you: '&b[name]&a邀请你以&b协作者&a的身份加入团队.' uncoop: - description: 解除与玩家的协作关系 - parameters: "" - cannot-uncoop-yourself: "&c您不能对自己解除协作关系。" - cannot-uncoop-member: "&c您不能对岛屿成员解除协作关系。" - player-not-cooped: "&c该玩家不是您的协作者。" - you-are-no-longer-a-coop-member: "&c您不再是 &b[name] &c的协作者了。" + description: 与一位玩家解除协作 + parameters: + cannot-uncoop-yourself: '&c你不能与自己解除协作!' + cannot-uncoop-member: '&c你不能与一名团队成员解除协作!' + player-not-cooped: '&c该玩家不是你的协作者!' + you-are-no-longer-a-coop-member: '&c你不再是&b[name]&c团队的协作者了.' all-members-logged-off: |- - &c玩家 &b[name] &c的所有岛屿成员都已下线， - &c因此您与他自动解除了协作关系。 - success: "&b[name] &a不再是您的协作者了。" - is-full: "&c您协作者名额已经满了！" + &c玩家&b[name]&c的所有岛屿成员已离线, + &c因此你们自动解除了协作关系. + success: '&b[name]&a不再是你的协作者了.' + is-full: '&c你的协作者数量已达上限.' trust: - description: 邀请玩家成为您的可信者 - parameters: "" - trust-in-yourself: "&c不能将自己设为可信者" - name-has-invited-you: "&b[name] &a邀请您成为他的可信者。" - player-already-trusted: "&c该玩家本身已经是可信者了。" - you-are-trusted: "&a您被 &b[name] &2列为的可信者！" - success: "&a已把 &b[name] &a列为可信者。" - is-full: "&c您的可信者名额已经满了！" + description: 将一位玩家以可信玩家身份加入团队 + parameters: + trust-in-yourself: '&c你一直都信任着自己!' + name-has-invited-you: '&b[name]&a邀请你以&b可信玩家&a的身份加入团队.' + player-already-trusted: '&c该玩家已经是可信玩家了!' + you-are-trusted: '&2你成为了&b[name]&2的可信玩家.' + success: '&b[name]&a成为了你的可信玩家.' + is-full: '&c你的可信玩家数量已达上限.' untrust: - description: 将玩家从您的可信者里排除 - parameters: "" - cannot-untrust-yourself: "&c您不能把自己从可信者里排除。" - cannot-untrust-member: "&c您不能把岛屿成员从可信者里排除。" - player-not-trusted: "&c该玩家不是您的可信者。" - you-are-no-longer-trusted: "&c您不再是 &b[name] &c的可信者了！" - success: "&b[name] &a不再是您的可信者了。" + description: 将指定玩家取消可信玩家身份 + parameters: + cannot-untrust-yourself: '&c你不能不信任自己!' + cannot-untrust-member: '&c你不能将团队成员取消可信玩家身份!' + player-not-trusted: '&c该玩家不是你的可信玩家!' + you-are-no-longer-trusted: '&c你不再是&b[name]&c团队的可信玩家了' + success: '&b[name]&a不再是你的可信玩家了.' invite: - description: 邀请玩家加入您的岛屿 - invitation-sent: "&a邀请已发送给 &b[name] &a。" - removing-invite: "&c邀请已取消。" - name-has-invited-you: "&b[name] &a邀请您加入他的岛屿。" - to-accept-or-reject: "&a输入 &b/[label] team accept &a接受邀请， 输入 &b/[label] team - reject &a拒绝邀请。" - you-will-lose-your-island: "&c注意， 接受邀请后您将失去自己的岛屿。" + description: 邀请一位玩家以成员身份加入团队(对方会失去自己领取的岛屿) + invitation-sent: '&a邀请已发送给&b[name]&a.' + removing-invite: '&c邀请已取消.' + name-has-invited-you: '&b[name]&a邀请你以成员身份加入TA的岛屿.' + to-accept-or-reject: |- + &a输入&b/[label] team accept&a接受邀请 + &a输入&b/[label] team reject&a拒绝邀请 + you-will-lose-your-island: '&c警告! 如果你接受邀请, 你将会失去你的全部岛屿!' + gui: + titles: + team-invite-panel: 邀请玩家 + button: + already-invited: '&c已邀请' + search: '&a查找玩家' + searching: "&b查找: \n&c[name]" + enter-name: '&a请输入玩家ID: ' + tips: + LEFT: + name: '&b左键' + search: '&a输入玩家ID' + back: '&a返回' + invite: |- + &a邀请TA以&b成员&a身份加入团队 + &c对方会失去自己领取的岛屿 + RIGHT: + name: '&b右键' + coop: |- + &a将TA以&b协作者&a身份拉入团队 + &c当团队成员均不在线时, TA会失去权限 + SHIFT_LEFT: + name: '&bShift + 左键' + trust: |- + &a将TA以&b可信玩家&a身份拉入团队 + &c可信玩家拥有永久权限 errors: - cannot-invite-self: "&c您不能邀请自己！" - cooldown: "&c邀请冷却中， &b[number] &c秒后才能再次发出邀请。" - island-is-full: "&c您的岛屿成员数量已满， 无法再发起邀请。" - none-invited-you: "&c现在没有人邀请您。" - you-already-are-in-team: "&c您已经有岛屿了， 无法接受邀请。" - already-on-team: "&c该玩家本身已经有岛屿了， 不能接受您的邀请。" - invalid-invite: "&c抱歉， 该邀请已失效。" - you-have-already-invited: "&c您刚刚已经邀请过该玩家！" - parameters: "" - you-can-invite: "&a您可以再邀请 &b[number] &a个玩家。" + cannot-invite-self: '&c你不能邀请自己!' + cooldown: '&c邀请冷却中, &b[number]&c秒后才能再次发出邀请.' + island-is-full: '&c你的岛屿已满, 不能邀请更多人了.' + none-invited-you: '&c没有人邀请你.' + you-already-are-in-team: '&c你已经有团队了!' + already-on-team: '&c该玩家已经有团队了!' + invalid-invite: '&c该邀请已失效.' + you-have-already-invited: '&c你已经邀请过该玩家了!' + parameters: + you-can-invite: '&a你还能再邀请&b[number]&a个玩家.' accept: description: 接受邀请 - you-joined-island: "&a您加入了岛屿！ 使用 &b/[label] team &a查看岛屿其他成员。" - name-joined-your-island: "&a[name] 加入了您的岛屿！" - confirmation: |- - &c您确定要接受邀请吗？ - &c&l如果您有岛屿， 您将 &n失去&r &c&l自己的岛屿！ + you-joined-island: '&a你加入了一个岛屿! 使用&b/[label] team&a查看其他岛屿成员.' + name-joined-your-island: '&b[name]&a加入了你的岛屿!' + confirmation: | + &c你确定要接受邀请吗? + &c如果你有岛屿, 你将失去自己的岛屿! reject: description: 拒绝邀请 - you-rejected-invite: "&a您拒绝了加入岛屿的邀请。" - name-rejected-your-invite: "&b[name] &c拒绝了您的邀请。" + you-rejected-invite: '&a你拒绝了对方的邀请.' + name-rejected-your-invite: '&b[name]&c拒绝了你的邀请!' cancel: description: 取消尚未得到回应的邀请 leave: - cannot-leave: "&c岛主要退出岛屿， 请先转让岛屿， 或解散所有成员。" + cannot-leave: '&c岛主无法退出, 除非转让岛屿, 或踢出全部成员.' description: 退出岛屿 - left-your-island: "&c[name] &c退出了岛屿。" - success: "&a您退出了这个岛屿。" + left-your-island: '&b[name]&c退出了你的岛屿' + success: '&a你离开了这个岛屿.' kick: - description: 将成员从您的岛屿中踢出 - parameters: "" - player-kicked: "&c [name] 在 [gamemode] 将你踢出了岛上！" - cannot-kick: "&c您不能踢您自己！" - cannot-kick-rank: "&c 你的等级不允许踢[名字]！" - success: "&a已将 &b[name] &a踢出了岛屿。" + description: 将指定成员踢出你岛屿 + parameters: + player-kicked: '&b[name]&c将你在&b[gamemode]&c上踢了出去!' + cannot-kick: '&c你不能踢出你自己!' + cannot-kick-rank: '&c你的身份等级过低, 无法踢出&b[name]&c!' + success: '&b[name]&a已经被踢出了你的岛屿.' demote: - description: 将您的岛屿成员降级 - parameters: "" + description: 降低你团队成员的身份等级 + parameters: errors: - cant-demote-yourself: "&c您不能将自己降级！" - cant-demote: "&c 你不能降级更高的等级！" - failure: "&c该玩家已经不能再降级了！" - success: "&a已将玩家 &b[name] &a降级为 &b[rank]。" + cant-demote-yourself: '&c你不能降低自己的身份等级!' + cant-demote: '&c降低的身份等级不能更高!' + must-be-member: '&c你只能操作你的团队成员!' + failure: '&c该玩家已经不能再降低身份等级了!' + success: '&a已将&b[name]&a的身份等级降为&b[rank]&a.' promote: - description: 将您的岛屿成员升级 - parameters: "" + description: 提升你团队成员的身份等级 + parameters: errors: - cant-promote-yourself: "&c 你无法推销自己！" - cant-promote: "&c 您无法晋升至高于您的级别！" - failure: "&c该玩家已经不能再升级了！" - success: "&a已将玩家 &b[name] &a升级为 &b[rank]" + cant-promote-yourself: '&c你不能提升自己的身份等级!' + cant-promote: '&c提升的身份等级不能超过自身!' + must-be-member: '&c你只能操作你的团队成员!' + failure: '&c该玩家已经不能再提升身份等级了!' + success: '&a已将&b[name]&a的身份等级升为&b[rank]&a.' setowner: - description: 将您的岛屿所有权转让给成员 + description: 将岛主身份转让给团队成员 errors: - cant-transfer-to-yourself: "&c没有必要把所有权转让给自己！" - target-is-not-member: "&c该玩家不是您的岛屿成员！" - at-max: "&c 该玩家已经拥有了允许的最大岛屿数量！" - name-is-the-owner: "&b[name] &a现在是岛主了！" - parameters: "" - you-are-the-owner: "&a您现在是岛主了！" + cant-transfer-to-yourself: '&c将岛主身份转让给自己是没有必要的!' + target-is-not-member: '&c该玩家不在你的团队中!' + at-max: '&c该玩家拥有的岛屿数量已达上限!' + name-is-the-owner: '&b[name]&a现在是岛主了!' + parameters: + you-are-the-owner: '&a你现在是岛主了!' ban: - description: 把玩家列入您的岛屿黑名单 - parameters: "" - cannot-ban-yourself: "&c您不能对自己进行黑名单操作！" - cannot-ban: "&c该玩家不能被列入岛屿黑名单。" - cannot-ban-member: "&c如果要拉黑岛屿成员， 请先从岛屿上把他踢出去。" - cannot-ban-more-players: "&c您的岛屿黑名单已达到上限， 无法再列入玩家了。" - player-already-banned: "&c该玩家之前已被您列入黑名单。" - player-banned: "&b[name] &c已被您列入黑名单， 从现在开始他不能再进入您的岛屿。" - owner-banned-you: "&c您已被 &b[name] &c列入黑名单， 从现在开始您不能再进入他的岛屿！" - you-are-banned: "&b您已被禁止进入这个岛屿！" + description: 将一位玩家列入黑名单 + parameters: + cannot-ban-yourself: '&c你不能把自己列入黑名单!' + cannot-ban: '&c该玩家不能被列入黑名单.' + cannot-ban-member: '&c如果要将团队成员列入黑名单, 请先踢出该玩家, 然后再把TA列入黑名单.' + cannot-ban-more-players: '&c你的黑名单列表已满, 无法将更多人列入黑名单.' + player-already-banned: '&c该玩家已在黑名单中.' + player-banned: '&b[name]&c已被列入黑名单, TA不再能进入你的岛屿.' + owner-banned-you: '&b[name]&c将你列入了黑名单, 你不再能进入TA的岛屿!' + you-are-banned: '&b你被该岛屿列入黑名单, 无法进入!' unban: - description: 把玩家从您的岛屿黑名单中删除 - parameters: "" - cannot-unban-yourself: "&c您不能对自己进行黑名单操作！" - player-not-banned: "&c该玩家没有被列入岛屿黑名单。" - player-unbanned: "&b[name] &a已从您的岛屿黑名单中删除。" - you-are-unbanned: "&a您已被 &b[name] &a从他的岛屿黑名单中删除。" + description: 将一位玩家从黑名单中移除 + parameters: + cannot-unban-yourself: '&c你不能从黑名单中移除自己!' + player-not-banned: '&c该玩家没有被列入黑名单.' + player-unbanned: '&b[name]&a已被你从黑名单中移除, TA现在可以进入你的岛屿' + you-are-unbanned: '&b[name]&a已将你从黑名单中移除, 你现在可以进入TA的岛屿了.' banlist: - description: 列出岛屿黑名单中的玩家 - noone: "&a岛屿黑名单中没有玩家。" - the-following: "&b下列玩家在您的岛屿黑名单中：" - names: "&c - [line]" - you-can-ban: "&b您的岛屿黑名单能够容纳 &e[number] &b个玩家。" + description: 列出黑名单中的玩家 + noone: '&a当前岛屿没有任何人在黑名单中.' + the-following: '&b下列玩家在黑名单中: ' + names: '&c- [line]' + you-can-ban: '&b你的黑名单最多可容纳&e[number]&b个玩家.' settings: description: 显示岛屿设置 language: description: 选择语言 - parameters: "[language]" - not-available: "&c这不是可用的语言。" - already-selected: "&c您原本已经在使用这种语言了。" + parameters: '[language]' + not-available: '&c该语言不可用.' + already-selected: '&c你当前已经在使用该语言了.' expel: - description: 将玩家驱逐出您的岛屿 - parameters: "" - cannot-expel-yourself: "&c您不能驱逐自己！" - cannot-expel: "&c该玩家不能被驱逐！" - cannot-expel-member: "&c您不能驱逐岛屿成员！" - not-on-island: "&c该玩家不在您的岛上！" - player-expelled-you: "&c您被 &b[name] &c驱逐出他的岛屿！" - success: "&a已把 &b[name] &a从您的岛上驱逐出去。" + description: 将一位玩家从你的岛屿上驱逐 + parameters: + cannot-expel-yourself: '&c你不能驱逐自己!' + cannot-expel: '&c该玩家不能被驱逐.' + cannot-expel-member: '&c你不能驱逐团队成员!' + not-on-island: '&c该玩家不在你的岛屿上!' + player-expelled-you: '&c你被&b[name]&c从TA的岛屿上驱逐了!' + success: '&a成功将&b[name]&a驱逐出你的岛屿.' + ranks: owner: 岛主 sub-owner: 副岛主 member: 成员 - trusted: 可信者 + trusted: 可信玩家 coop: 协作者 visitor: 访客 banned: 黑名单 admin: 管理员 mod: 主持人 + protection: - command-is-banned: 禁止访客使用命令 + command-is-banned: 访客已被禁止使用命令 flags: ALLAY: - name: 缓解互动 - description: 允许向 Allay 提供物品或从 Allay 获取物品 - hint: 缓解交互禁用 + name: '&b&l悦灵' + description: '&a允许&#FAFAD2或&c禁止&#FAFAD2对悦灵使用物品或取回物品' + hint: 禁止与悦灵交互 ANIMAL_NATURAL_SPAWN: - description: 允许/禁止 动物自然生成 - name: "&a&l动物自然生成" + description: '&a允许&#FAFAD2或&c禁止&#FAFAD2动物自然生成' + name: '&b&l动物自然生成' ANIMAL_SPAWNERS_SPAWN: - description: 允许/禁止 刷怪笼生成动物 - name: "&a&l动物刷怪笼" + description: '&a允许&#FAFAD2或&c禁止&#FAFAD2刷怪笼生成动物' + name: '&b&l刷怪笼生成动物' ANVIL: - description: 允许/禁止 使用铁砧 - name: "&a&l使用铁砧" - hint: "&c已被禁止使用铁砧" + description: '&a允许&#FAFAD2或&c禁止&#FAFAD2使用铁砧' + name: '&b&l铁砧' + hint: 禁止使用铁砧 ARMOR_STAND: - description: 允许/禁止 与盔甲架互动 - name: "&a&l使用盔甲架" - hint: "&c已被禁止与盔甲架互动" + description: '&a允许&#FAFAD2或&c禁止&#FAFAD2使用盔甲架' + name: '&b&l盔甲架' + hint: 禁止使用盔甲架 AXOLOTL_SCOOPING: - name: 舀蝾螈 - description: 允许使用桶舀蝾螈 - hint: 铲蝾螈已禁用 + name: '&b&l美西螈' + description: '&a允许&#FAFAD2或&c禁止&#FAFAD2用桶捕捞美西螈' + hint: 禁止用桶捕捞美西螈 BEACON: - description: 允许/禁止 使用信标 - name: "&a&l使用信标" - hint: "&c已被禁止使用新表" + description: '&a允许&#FAFAD2或&c禁止&#FAFAD2使用信标' + name: '&b&l信标' + hint: 禁止使用信标 BED: - description: 允许/禁止 使用床 - name: "&a&l使用床" - hint: "&c已被禁止使用床" + description: '&a允许&#FAFAD2或&c禁止&#FAFAD2使用床' + name: '&b&l床' + hint: 禁止使用床 BOAT: - name: "&a&l船只互动" - description: |- - &7允许/禁止 放置、摧毁和 - &7进入船 - hint: "&c已被禁止与船只互动" + name: '&b&l船' + description: '&a允许&#FAFAD2或&c禁止&#FAFAD2放置、破坏或进入船' + hint: 禁止放置、破坏或进入船 BOOKSHELF: - name: 书架 - description: |- - &a 允许放置书籍 - &a 或拿书。 - hint: 不能放置一本书或拿走一本书。 + name: '&b&l雕纹书架' + description: '&a允许&#FAFAD2或&c禁止&#FAFAD2从雕纹书架放置或拿取书' + hint: 禁止从雕纹书架放置或拿取书 BREAK_BLOCKS: - description: 允许/禁止 破坏方块 - name: "&a&l破坏方块" - hint: "&c已被禁止破坏方块" + description: '&a允许&#FAFAD2或&c禁止&#FAFAD2破坏方块' + name: '&b&l破坏方块' + hint: 禁止破坏方块 BREAK_SPAWNERS: description: |- - &7允许/禁止 破坏刷怪笼 - &7可以超越 “&a破坏方块&7” 设定 - name: "&a&l破坏刷怪笼" - hint: "&c已被禁止破坏刷怪笼" + &a允许&#FAFAD2或&c禁止&#FAFAD2破坏刷怪笼 + &4独立于"破坏方块"权限 + name: '&b&l破坏刷怪笼' + hint: 禁止破坏刷怪笼 BREAK_HOPPERS: description: |- - &7允许/禁止 破坏漏斗 - &7可以超越 “&a破坏方块&7” 设定 - name: "&a&l破坏漏斗" - hint: "&c已禁止破坏漏斗" + &a允许&#FAFAD2或&c禁止&#FAFAD2破坏漏斗 + &4独立于"破坏方块"权限 + name: '&b&l破坏漏斗' + hint: 禁止破坏漏斗 BREEDING: - description: 允许/禁止 喂食动物进行繁殖 - name: "&a&l繁殖动物" - hint: "&c已被禁止繁殖动物" + description: '&a允许&#FAFAD2或&c禁止&#FAFAD2喂养动物' + name: '&b&l喂养动物' + hint: 禁止喂养动物 BREWING: - description: 允许/禁止 使用酿造台 - name: "&a&l使用酿造台" - hint: "&c已被禁止使用酿造台" + description: '&a允许&#FAFAD2或&c禁止&#FAFAD2使用酿造台' + name: '&b&l酿造台' + hint: 禁止使用酿造台 BUCKET: - description: 允许/禁止 使用桶 - name: "&a&l使用桶" - hint: "&c已被禁止使用桶" + description: '&a允许&#FAFAD2或&c禁止&#FAFAD2使用桶' + name: '&b&l桶' + hint: 禁止使用桶 BUTTON: - description: 允许/禁止 使用按钮 - name: "&a&l使用按钮" - hint: "&c已被禁止使用按钮" + description: '&a允许&#FAFAD2或&c禁止&#FAFAD2使用按钮' + name: '&b&l按钮' + hint: 禁止使用按钮 CAKE: - description: 允许/禁止 食用蛋糕 - name: "&a&l食用蛋糕" - hint: "&c已被禁止食用蛋糕" + description: '&a允许&#FAFAD2或&c禁止&#FAFAD2吃蛋糕' + name: '&b&l蛋糕' + hint: 禁止吃蛋糕 CARTOGRAPHY: - name: 制图桌 - description: 切换使用 - hint: 制图表访问已禁用 + name: '&b&l制图台' + description: '&a允许&#FAFAD2或&c禁止&#FAFAD2使用制图台' + hint: 禁止使用制图台 CONTAINER: - name: "&a&l使用容器" + name: '&b&l容器' description: |- - &7允许/禁止 与箱子、潜影 - &7盒、花盆、堆肥桶和木桶 - &7等容器进行交互。 - - &8其他容器由专门的设定项设置。 - hint: "&c已被禁止使用容器" + &a允许&#FAFAD2或&c禁止&#FAFAD2与容器交互 + &4会同步影响以下容器权限: + FFFAA木桶, 蜂箱, 酿造台, 箱子 + FFFAA堆肥桶, 发射器, 投掷器, 花盆 + FFFAA熔炉, 漏斗, 物品展示框, 唱片机 + FFFAA运输矿车, 潜影盒, 陷阱箱 + &4以上容器权限可单独设置 + &4单独设置的权限比该权限高 + hint: 禁止与容器交互 CHEST: - name: 箱子和矿车箱子 + name: '&b&l箱子' description: |- - &a 切换与宝箱的交互 - &a 和箱子矿车。 - &a（不包括陷阱箱） - hint: 无法进入胸部 + &a允许&#FAFAD2或&c禁止&#FAFAD2打开箱子、运输矿车和运输船 + &4(不包含陷阱箱) + hint: 禁止打开箱子、运输矿车和运输船 BARREL: - name: 桶 - description: 切换桶交互 - hint: 桶访问已禁用 + name: '&b&l木桶' + description: '&a允许&#FAFAD2或&c禁止&#FAFAD2打开木桶' + hint: 禁止打开木桶 BLOCK_EXPLODE_DAMAGE: - description: |- - &a 允许床和重生锚 - &a 打破块和损坏 - &a 实体。 - name: 阻止爆炸伤害 + description: '&a允许&#FAFAD2或&c禁止&#FAFAD2床与重生锚破坏方块和对实体造成伤害' + name: '&b&l爆炸伤害与破坏' COMPOSTER: - name: 堆肥工 - description: 切换堆肥器交互 - hint: 堆肥器交互已禁用 + name: '&b&l堆肥桶' + description: '&a允许&#FAFAD2或&c禁止&#FAFAD2使用堆肥桶' + hint: 禁止使用堆肥桶 LOOM: - name: 织布机 - description: 切换使用 - hint: 织机访问已禁用 + name: '&b&l织布机' + description: '&a允许&#FAFAD2或&c禁止&#FAFAD2使用织布机' + hint: 禁止使用织布机 FLOWER_POT: - name: 花盆 - description: 切换花盆互动 - hint: 花盆互动禁用 + name: '&b&l花盆' + description: '&a允许&#FAFAD2或&c禁止&#FAFAD2使用花盆' + hint: 禁止使用花盆 GRINDSTONE: - name: 磨石 - description: 切换使用 - hint: 磨石访问已禁用 + name: '&b&l砂轮' + description: '&a允许&#FAFAD2或&c禁止&#FAFAD2使用砂轮' + hint: 禁止使用砂轮 SHULKER_BOX: - name: 潜影盒 - description: 切换潜影盒交互 - hint: 潜影盒访问被禁用 + name: '&b&l潜影盒' + description: '&a允许&#FAFAD2或&c禁止&#FAFAD2打开潜影盒' + hint: 禁止打开潜影盒 SHULKER_TELEPORT: - description: |- - &a潜影贝可以传送 - &a 如果处于活动状态。 - name: 潜影贝传送 + description: '&a允许&#FAFAD2或&c禁止&#FAFAD2潜影贝传送' + name: '&b&l潜影贝传送' SMITHING: - name: 锻造 - description: 切换使用 - hint: 史密斯访问已禁用 + name: '&b&l锻造台' + description: '&a允许&#FAFAD2或&c禁止&#FAFAD2使用锻造台' + hint: 禁止使用锻造台 STONECUTTING: - name: 石刻 - description: 切换使用 - hint: 石刻访问已禁用 + name: '&b&l切石机' + description: '&a允许&#FAFAD2或&c禁止&#FAFAD2使用切石机' + hint: 禁止使用切石机 TRAPPED_CHEST: - name: 被困的箱子 - description: 切换困宝箱互动 - hint: 被困胸部访问禁用 + name: '&b&l陷阱箱' + description: '&a允许&#FAFAD2或&c禁止&#FAFAD2打开陷阱箱' + hint: 禁止打开陷阱箱 DISPENSER: - name: "&a&l使用发射器" - description: 允许/禁止 与发射器交互 - hint: "&c已被禁止与发射器交互" + name: '&b&l发射器' + description: '&a允许&#FAFAD2或&c禁止&#FAFAD2打开发射器' + hint: 禁止打开发射器 DROPPER: - name: "&a&l使用投掷器" - description: 允许/禁止 与投掷器交互 - hint: "&c已被禁止与投掷器交互" + name: '&b&l投掷器' + description: '&a允许&#FAFAD2或&c禁止&#FAFAD2打开投掷器' + hint: 禁止打开投掷器 ELYTRA: - name: "&a&l使用鞘翅" - description: 允许/禁止 使用鞘翅 - hint: "&c警告： 不允许在这里使用鞘翅！" + name: '&b&l鞘翅' + description: '&a允许&#FAFAD2或&c禁止&#FAFAD2使用鞘翅' + hint: '&c警告: 这里不能使用鞘翅' HOPPER: - name: "&a&l使用漏斗" - description: 允许/禁止 与漏斗交互 - hint: "&c已被禁止与漏斗交互" + name: '&b&l漏斗' + description: '&a允许&#FAFAD2或&c禁止&#FAFAD2打开漏斗' + hint: 禁止打开漏斗 CHEST_DAMAGE: - description: 允许/禁止 炸毁箱子 - name: "&a&l炸毁箱子" + description: '&a允许&#FAFAD2或&c禁止&#FAFAD2爆炸破坏箱子' + name: '&b&l爆炸破坏箱子' CHORUS_FRUIT: - description: |- - &7允许/禁止 使用紫颂果进 - &7行传送 - name: "&a&l使用紫颂果" - hint: "&c已被禁止使用紫颂果进行传送" + description: '&a允许&#FAFAD2或&c禁止&#FAFAD2使用紫颂果传送' + name: '&b&l紫颂果' + hint: 禁止使用紫颂果传送 CLEAN_SUPER_FLAT: description: |- - &7是否允许清理岛屿世界的超平坦地形。 - &7超平坦地形一般是由于世界生成器发 - &7生错误导致的。 - name: "&a&l清理超平坦地形" + &a允许&#FAFAD2或&c禁止&#FAFAD2清理岛屿世界的超平坦地形 + &#FAFAD2超平坦地形一般是由于世界生成器发生错误导致的 + name: '&b&l清理超平坦地形' COARSE_DIRT_TILLING: - description: 允许/禁止 用锄头耕耘砂土以获得泥土 - name: "&a&l砂土变泥土" - hint: "&c已被禁止将砂土耕耘为泥土" + description: '&a允许&#FAFAD2或&c禁止&#FAFAD2用锄头耕耘砂土与挖掘灰化土获取泥土' + name: '&b&l耕耘砂土与挖掘灰化土获取泥土' + hint: 禁止耕耘砂土 COLLECT_LAVA: description: |- - &7允许/禁止 用桶收集熔岩 - &7可以超越 “&a使用桶&7” 设定 - name: "&a&l收集熔岩" - hint: "&c已被禁止收集熔岩" + &a允许&#FAFAD2或&c禁止&#FAFAD2收集熔岩 + &4高于"使用桶"权限 + name: '&b&l收集熔岩' + hint: 禁止收集熔岩 COLLECT_WATER: description: |- - &7允许/禁止 用桶收集水 - &7可以超越 “&a使用桶&7” 设定 - name: "&a&l收集水" - hint: "&c已被禁止收集水" + &a允许&#FAFAD2或&c禁止&#FAFAD2收集水 + &4高于"使用桶"权限 + name: '&b&l收集水' + hint: 禁止收集水 COLLECT_POWDERED_SNOW: description: |- - &a 切换收集粉状雪 - &a（覆盖存储桶） - name: 收集粉状雪 - hint: 粉雪桶已禁用 + &a允许&#FAFAD2或&c禁止&#FAFAD2收集细雪 + &4高于"使用桶"权限 + name: '&b&l收集细雪' + hint: 禁止收集细雪 COMMAND_RANKS: - name: "&6&l命令授权" - description: |- - &7打开 &b阶衔 - 命令 &7配置面板 - &7设置每种阶衔的玩家可以使用的命令 + name: '&e&l管理成员可用命令' + description: '&#FAFAD2管理不同成员身份等级可以使用的命令' CRAFTING: - description: 允许/禁止 使用工作台 - name: "&a&l使用工作台" - hint: "&c已被禁止使用工作台" + description: '&a允许&#FAFAD2或&c禁止&#FAFAD2使用工作台' + name: '&b&l工作台' + hint: 禁止使用工作台 CREEPER_DAMAGE: - description: 允许/禁止 苦力怕的爆炸生效 - name: "&a&l苦力怕爆炸" + description: '&a允许&#FAFAD2或&c禁止&#FAFAD2苦力怕爆炸造成的伤害与破坏' + name: '&b&l苦力怕爆炸' CREEPER_GRIEFING: description: |- - &7当访客引燃苦力怕时，是否允许爆炸 - &7效果生效（炸毁方块、伤害实体） - name: "&a&l苦力怕访客保护" - hint: "&c已禁止访客引燃的苦力怕爆炸" + &a允许&#FAFAD2或&c禁止&#FAFAD2苦力怕访客保护 + &#FAFAD2当访客点燃苦力怕时 + &a允许&#FAFAD2或&c禁止&#FAFAD2爆炸效果生效(炸毁方块、伤害实体) + name: '&b&l苦力怕访客保护' + hint: 苦力怕保护已禁用 CROP_PLANTING: - description: "&a 设置谁可以播种。" - name: 农作物种植 - hint: 禁止农作物种植 + description: '&a允许&#FAFAD2或&c禁止&#FAFAD2种植农作物' + name: '&b&l种植农作物' + hint: 禁止种植农作物 CROP_TRAMPLE: - description: 允许/禁止 踩坏农作物 - name: "&a&l践踏农作物" - hint: "&c已被禁止践踏农作物" + description: '&a允许&#FAFAD2或&c禁止&#FAFAD2践踏农作物' + name: '&b&l践踏农作物' + hint: 禁止践踏农作物 DOOR: - description: 允许/禁止 使用门 - name: "&a&l使用门" - hint: "&c已被禁止使用门" + description: '&a允许&#FAFAD2或&c禁止&#FAFAD2使用门' + name: '&b&l使用门' + hint: 禁止使用门 DRAGON_EGG: - name: "&a&l龙蛋交互" + name: '&b&l龙蛋' description: |- - &7允许/禁止 与龙蛋交互 - &c这不能防止放置或破坏龙蛋 - hint: "&c已被禁止与龙蛋交互" + &a允许&#FAFAD2或&c禁止&#FAFAD2与龙蛋交互 + &4这不能防止龙蛋被放置或破坏 + hint: 禁止与龙蛋交互 DYE: - description: 允许/禁止 使用染料染色 - name: "&a&l使用染料" - hint: "&c已被禁止使用染料染色" + description: '&a允许&#FAFAD2或&c禁止&#FAFAD2使用染料染色' + name: '&b&l使用染料' + hint: 禁止使用染料染色 EGGS: - description: 允许/禁止 投掷鸡蛋 - name: "&a&l投掷鸡蛋" - hint: "&c已被禁止投掷鸡蛋" + description: '&a允许&#FAFAD2或&c禁止&#FAFAD2投掷鸡蛋' + name: '&b&l投掷鸡蛋' + hint: 禁止投掷鸡蛋 ENCHANTING: - description: 允许/禁止 使用附魔台 - name: "&a&l使用附魔台" - hint: "&c已被禁止使用附魔台" + description: '&a允许&#FAFAD2或&c禁止&#FAFAD2使用附魔台' + name: '&b&l附魔台' + hint: 禁止使用附魔台 ENDER_CHEST: - description: 允许/禁止 使用末影箱 - name: "&a&l使用末影箱" - hint: "&c已被禁止使用末影箱" + description: '&a允许&#FAFAD2或&c禁止&#FAFAD2使用或制作末影箱' + name: '&b&l末影箱' + hint: 禁止使用或制作末影箱 ENDERMAN_DEATH_DROP: - description: 允许/禁止 末影人死亡后掉落手中的物品 - name: "&d&l末影人死亡掉落" + description: '&a允许&#FAFAD2或&c禁止&#FAFAD2末影人死亡后掉落手中的任何方块' + name: '&b&l末影人死亡掉落' ENDERMAN_GRIEFING: - description: 允许/禁止 末影人从岛上拿起方块 - name: "&a&l末影人破坏" + description: '&a允许&#FAFAD2或&c禁止&#FAFAD2末影人搬起方块' + name: '&b&l末影人搬起方块' ENDERMAN_TELEPORT: - description: |- - &a末影人可以传送 - &a 如果处于活动状态。 - name: 末影人传送 + description: '&a允许&#FAFAD2或&c禁止&#FAFAD2末影人传送' + name: '&b&l末影人传送' ENDER_PEARL: - description: |- - &7允许/禁止 使用末影珍珠 - &7进行传送 - name: "&a&l使用末影珍珠" - hint: "&c已被禁止使用末影珍珠" + description: '&a允许&#FAFAD2或&c禁止&#FAFAD2使用末影珍珠' + name: '&b&l末影珍珠' + hint: 禁止使用末影珍珠 ENTER_EXIT_MESSAGES: - description: 允许/禁止 显示进出岛屿的提示 - island: "[name] 的岛屿" - name: "&a&l进出岛屿提示" - now-entering: "&a您已进入 &b[name] &a。" - now-entering-your-island: "&a您已进入自己的岛屿。 &b [name]" - now-leaving: "&6您已离开 &b[name] &a。" - now-leaving-your-island: "&6您已离开自己的岛屿。 &b [name]" + description: '&a允许&#FAFAD2或&c禁止&#FAFAD2显示进出岛屿的提示信息' + island: '[name]的岛屿' + name: '&b&l进出岛屿提示' + now-entering: '&a你已进入: &b[name]' + now-entering-your-island: '&a你已进入自己的岛屿: &b[name]' + now-leaving: '&a你已离开: &b[name]' + now-leaving-your-island: '&a你已离开自己的岛屿: &b[name]' EXPERIENCE_BOTTLE_THROWING: - name: "&a&l投掷经验瓶" - description: 允许/禁止 在岛上扔经验瓶 - hint: "&c已被禁止投掷经验瓶" + name: '&b&l投掷附魔之瓶' + description: '&a允许&#FAFAD2或&c禁止&#FAFAD2投掷附魔之瓶' + hint: 禁止投掷附魔之瓶 FIRE_BURNING: - name: "&a&l烧毁方块" + name: '&b&l烧毁方块' description: |- - &7允许/禁止 方块被火烧毁 - &7这不能防止火势蔓延！ + &a允许&#FAFAD2或&c禁止&#FAFAD2烧毁方块 + &4这不能阻止火势蔓延 FIRE_EXTINGUISH: - description: 允许/禁止 熄灭火焰 - name: "&a&l灭火" - hint: "&c已被禁止灭火" + description: '&a允许&#FAFAD2或&c禁止&#FAFAD2熄灭火焰' + name: '&b&l熄灭火焰' + hint: 禁止熄灭火焰 FIRE_IGNITE: - name: "&a&l方块燃烧" + name: '&b&l点火' description: |- - &7允许/禁止 方块被非玩家方式点燃 - &7例如被雷电击中 + &a允许&#FAFAD2或&c禁止&#FAFAD2点火 + &#FAFAD2例如: 打火石、雷击 + &4禁止该权限岛屿上甚至不会打雷 FIRE_SPREAD: - name: "&a&l火势蔓延" - description: "&7允许/禁止 火焰传播到附近的方块" + name: '&b&l火势蔓延' + description: '&a允许&#FAFAD2或&c禁止&#FAFAD2火势蔓延到附近的方块' FISH_SCOOPING: - name: "&a&l捕鱼" - description: 允许/禁止 用水桶捕鱼 - hint: "&c已被禁止捕鱼" + name: '&b&l捕捞鱼' + description: '&a允许&#FAFAD2或&c禁止&#FAFAD2用水桶捕捞鱼' + hint: 禁止捕捞鱼 FLINT_AND_STEEL: - name: "&a&l点火" - description: |- - &7允许/禁止 玩家使用打火石 - &7或火焰弹点燃方块或篝火 - hint: "&c已被禁止点火" + name: '&b&l打火石' + description: '&a允许&#FAFAD2或&c禁止&#FAFAD2使用打火石或火焰弹点燃方块或篝火' + hint: 禁止使用打火石或火焰弹 FURNACE: - description: 允许/禁止 使用熔炉 - name: "&a&l使用熔炉" - hint: "&c已被禁止使用熔炉" + description: '&a允许&#FAFAD2或&c禁止&#FAFAD2使用熔炉、高炉、烟熏炉或营火' + name: '&b&l熔炉' + hint: 禁止使用熔炉、高炉、烟熏炉或营火 GATE: - description: 允许/禁止 使用栅栏门 - name: "&a&l使用栅栏门" - hint: "&c已被禁止使用栅栏门" + description: '&a允许&#FAFAD2或&c禁止&#FAFAD2使用栅栏门' + name: '&b&l栅栏门' + hint: 禁止使用栅栏门 GEO_LIMIT_MOBS: description: |- - &7允许/禁止 移除岛屿范围外的生物 - &7以及将生物生成限制在岛屿范围内 - name: "&e&l生物分布限制" + &#FAFAD2移除离开岛屿保护范围外的生物 + &#FAFAD2以及将生物生成限制在岛屿范围内 + name: '&e&l限制生物范围' HARVEST: description: |- - &a 设置谁可以收割庄稼。 - &a 不要忘记允许项目 - 还有皮卡！ - name: 农作物收割 - hint: 禁止收割农作物 + &a允许&#FAFAD2或&c禁止&#FAFAD2收获农作物 + &#FAFAD2别忘记设置物品拾取权限 + name: '&b&l收获农作物' + hint: 禁止收获农作物 HIVE: - description: 允许/禁止 收集蜂蜜 - name: "&a&l收集蜂蜜" - hint: "&c已被禁止收集蜂蜜" + description: '&a允许&#FAFAD2或&c禁止&#FAFAD2从蜂巢收集蜂蜜' + name: '&b&l收集蜂蜜' + hint: 禁止从蜂巢收集蜂蜜 HURT_ANIMALS: - description: 允许/禁止 伤害动物 - name: "&a&l伤害动物" - hint: "&c已被禁止伤害动物" + description: '&a允许&#FAFAD2或&c禁止&#FAFAD2伤害动物' + name: '&b&l伤害动物' + hint: 禁止伤害动物 HURT_MONSTERS: - description: 允许/禁止 杀伤怪物 - name: "&a&l杀伤怪物" - hint: "&c已被禁止杀伤怪物" + description: '&a允许&#FAFAD2或&c禁止&#FAFAD2伤害怪物' + name: '&b&l伤害怪物' + hint: 禁止伤害怪物 HURT_VILLAGERS: - description: 允许/禁止 伤害村民 - name: "&a&l伤害村民" - hint: "&c已被禁止伤害村民" + description: '&a允许&#FAFAD2或&c禁止&#FAFAD2伤害村民' + name: '&b&l伤害村民' + hint: 禁止伤害村民 ITEM_FRAME: - name: "&a&l取放物品框" + name: '&b&l物品展示框' description: |- - &7允许/禁止 放置和取下物品框 - &7可以超越 “&a放置方块&7/&a破坏方块&7” 设定 - hint: "&c已被禁止使用物品框" + &a允许&#FAFAD2或&c禁止&#FAFAD2使用物品展示框 + &4独立于"放置方块"与"破坏方块"权限 + hint: 禁止使用物品展示框 ITEM_FRAME_DAMAGE: - description: 允许/禁止 （非玩家）生物破坏物品框 - name: "&a&l生物破坏物品框" + description: '&a允许&#FAFAD2或&c禁止&#FAFAD2生物破坏物品展示框(比如苦力怕)' + name: '&b&l破坏物品展示框' INVINCIBLE_VISITORS: - description: 选择访客在岛上可以免疫哪些伤害 - name: "&5&l访客无敌" - hint: "&c已禁止伤害访客" + description: |- + &#FAFAD2配置访客可以免疫的伤害类型 + &a允许&#FAFAD2的是访客免疫的伤害类型 + &c禁止&#FAFAD2的是访客无法免疫的伤害类型 + name: '&e&l访客免疫伤害类型' + hint: '&c禁止伤害访客.' ISLAND_RESPAWN: - description: |- - &7允许/禁止 玩家死亡后在自己 - &7的岛屿上重生 - name: "&a&l在岛屿上重生" + description: '&a允许&#FAFAD2或&c禁止&#FAFAD2玩家死亡后在自己的岛屿上重生' + name: '&b&l岛屿上重生' ITEM_DROP: - description: 允许/禁止 丢弃物品 - name: "&a&l丢弃物品" - hint: "&c已被禁止丢弃物品" + description: '&a允许&#FAFAD2或&c禁止&#FAFAD2丢弃物品' + name: '&b&l丢弃物品' + hint: 禁止丢弃物品 ITEM_PICKUP: - description: 允许/禁止 拾取物品 - name: "&a&l拾取物品" - hint: "&c已被禁止拾取物品" + description: '&a允许&#FAFAD2或&c禁止&#FAFAD2拾取物品' + name: '&b&l拾取物品' + hint: 禁止拾取物品 JUKEBOX: - description: 允许/禁止 使用唱片机 - name: "&a&l使用唱片机" - hint: "&c已被禁止使用唱片机" + description: '&a允许&#FAFAD2或&c禁止&#FAFAD2使用唱片机' + name: '&b&l唱片机' + hint: 禁止使用唱片机 LEAF_DECAY: - name: "&a&l树叶枯萎" - description: 允许/禁止 树叶自然枯萎 + name: '&b&l树叶枯萎' + description: '&a允许&#FAFAD2或&c禁止&#FAFAD2树叶自然枯萎' LEASH: - description: 允许/禁止 使用栓绳 - name: "&a&l使用栓绳" + description: '&a允许&#FAFAD2或&c禁止&#FAFAD2使用拴绳' + name: '&b&l拴绳' + hint: 禁止使用拴绳 LECTERN: - name: "&a&l讲台上的书" + name: '&b&l讲台' description: |- - &7允许/禁止 取放讲台上的书 - &c不会阻止阅读讲台上的书 - hint: "&c已被禁止从讲台上取放书籍" + &a允许&#FAFAD2或&c禁止&#FAFAD2从讲台上放置或取出书 + &4这不能阻止玩家查看讲台上书的内容 + hint: 禁止从讲台上放置或取出书 LEVER: - description: 允许/禁止 使用拉杆 - name: "&a&l使用拉杆" - hint: "&c已被禁止使用拉杆" + description: '&a允许&#FAFAD2或&c禁止&#FAFAD2使用拉杆' + name: '&b&l拉杆' + hint: 禁止使用拉杆 LIMIT_MOBS: - description: "&7选择哪些实体可以被生成" - name: "&3&l实体生成限制" - can: "&a允许生成" - cannot: "&c禁止生成" + description: '&#FAFAD2配置可在当前游戏模式中生成的实体' + name: '&e&l实体生成限制' + can: '&a允许生成' + cannot: '&c禁止生成' LIQUIDS_FLOWING_OUT: - name: "&a&l液体溢出" + name: '&b&l液体流出' description: |- - &7允许/禁止 液体流到岛屿保护范围外 - &c注意，该选项仅能控制水平流动的液体 + &a允许&#FAFAD2或&c禁止&#FAFAD2液体流出岛屿保护范围 + &#FAFAD2禁止该权限可以避免熔岩和水在两个岛屿之间生成圆石 + &4液体仍然可以垂直流动 + &4但在岛屿保护范围之外的液体不会水平流动 LOCK: - description: 选择岛屿对哪些对象开放 - name: "&6&l锁定岛屿" + description: '&a允许&#FAFAD2或&c禁止&#FAFAD2特定身份等级的玩家访问' + name: 'FFF00&l岛屿锁定' CHANGE_SETTINGS: - name: 更改设置 - description: |- - &a 允许切换哪个成员 - &a角色可以改变岛屿设置。 + name: 'FFF00&l更改权限' + description: '&a允许&#FAFAD2或&c禁止&#FAFAD2特定身份等级的玩家更改权限' MILKING: - description: 允许/禁止 挤牛奶 - name: "&a&l挤牛奶" - hint: "&c已被禁止挤牛奶" + description: '&a允许&#FAFAD2或&c禁止&#FAFAD2挤牛奶' + name: '&b&l挤牛奶' + hint: 禁止挤牛奶 MINECART: - name: "&a&l矿车交互" - description: |- - &7允许/禁止 放置、摧毁和 - &7进入矿车" - hint: "&c已被禁止与矿车交互" + name: '&b&l矿车' + description: '&a允许&#FAFAD2或&c禁止&#FAFAD2放置、破坏或进入矿车' + hint: 禁止放置、破坏或进入矿车 MONSTER_NATURAL_SPAWN: - description: 允许/禁止 怪物自然生成 - name: "&a&l怪物自然生成" + description: '&a允许&#FAFAD2或&c禁止&#FAFAD2怪物自然生成' + name: '&b&l怪物自然生成' MONSTER_SPAWNERS_SPAWN: - description: 允许/禁止 刷怪笼生成怪物 - name: "&a&l怪物刷怪笼" + description: '&a允许&#FAFAD2或&c禁止&#FAFAD2刷怪笼生成怪物' + name: '&b&l刷怪笼生成怪物' MOUNT_INVENTORY: - description: 允许/禁止 使用坐骑物品栏 - name: "&a&l坐骑物品栏" - hint: "&c已被禁止使用坐骑物品栏" + description: '&a允许&#FAFAD2或&c禁止&#FAFAD2使用坐骑物品栏(比如驴)' + name: '&b&l坐骑物品栏' + hint: 禁止使用坐骑物品栏 NAME_TAG: - name: "&a&l使用命名牌" - description: 允许/禁止 使用命名牌 - hint: "&c已被禁止使用命名牌" + name: '&b&l命名牌' + description: '&a允许&#FAFAD2或&c禁止&#FAFAD2使用命名牌' + hint: 禁止使用命名牌 NATURAL_SPAWNING_OUTSIDE_RANGE: - name: "&a&l岛外自然生成生物" + name: '&b&l岛外自然生成生物' description: |- - &7允许/禁止 生物（动物和怪物）在岛屿 - &7保护范围外自然生成 - &c这不会阻止刷怪笼和生成蛋生成生物 + &a允许&#FAFAD2或&c禁止&#FAFAD2生物(动物和怪物)在岛屿保护范围之外自然生成 + &4注意这不会阻止用刷怪笼或刷怪蛋生成生物 NOTE_BLOCK: - description: 允许/禁止 使用音符盒 - name: "&a&l使用音符盒" - hint: "&c已被禁止使用音符盒" + description: '&a允许&#FAFAD2或&c禁止&#FAFAD2使用音符盒' + name: '&b&l音符盒' + hint: 禁止使用音符盒 OBSIDIAN_SCOOPING: - name: "&a&l黑曜石变熔岩" + name: '&b&l黑曜石变熔岩' description: |- - &7允许/禁止 玩家用桶把黑曜石变回熔岩 - &7这可以帮助新手找回熔岩 - &c注意： 如果黑曜石附近2格范围内还有 - &c其它黑曜石，则不能把黑曜石变回熔岩 - scooping: "&a已将黑曜石变回熔岩。 下次请小心！" - obsidian-nearby: "&c附近有其它黑曜石， 这个黑曜石不能变回熔岩。" + &a允许&#FAFAD2或&c禁止&#FAFAD2玩家用桶把黑曜石变回熔岩 + &#FAFAD2这将对建造刷石机失误的新手有很大帮助 + &4注意: 如果黑曜石附近2格范围内有其它黑曜石 + &4则不能把黑曜石变回熔岩 + scooping: '&a已将黑曜石变回熔岩.' + obsidian-nearby: '&c附近有其它黑曜石, 这个黑曜石不能变回熔岩.' OFFLINE_GROWTH: description: |- - &7允许/禁止 所有成员都已离线 - &7的岛屿上的植物继续生长 - &a这可以帮助减少性能开销 - name: "&a&l离线生长" + &a允许&#FAFAD2或&c禁止&#FAFAD2所有成员离线岛屿上的植物继续生长 + &c禁止&#FAFAD2它可以减少性能开销 + name: '&b&l离线生长' OFFLINE_REDSTONE: description: |- - &7允许/禁止 所有成员都已离线 - &7的岛屿上的红石设备继续运行 - &a这可以帮助减少性能开销 - &a这个设置不会影响出生岛屿（主城） - name: "&a&l离线红石" + &a允许&#FAFAD2或&c禁止&#FAFAD2所有成员离线岛屿上的红石设备继续运行 + &c禁止&#FAFAD2它可以减少性能开销 + &#FAFAD2不会影响出生岛屿 + name: '&b&l离线红石' PETS_STAY_AT_HOME: description: |- - &7允许/禁止 驯服的宠物始终待在自 - &7己的岛上， 不会到别人的倒上去。 - name: "&a&l宠物不离开岛屿" + &a允许&#FAFAD2时: 驯服的宠物会始终待在自己的岛上 + &c禁止&#FAFAD2时: 驯服的宠物会跟随主人去任何岛上 + name: '&b&l宠物不离开岛屿' PISTON_PUSH: - description: 允许/禁止 活塞将方块推出岛屿范围 - name: "&a&l活塞推动保护" - PLACE_BLOCKS: - description: 允许/禁止 在岛上放置方块 - name: "&a&l放置方块" - hint: "&c已被禁止在岛上放置方块" - POTION_THROWING: - name: "&a&l投掷药水瓶" description: |- - &7允许/禁止 在岛上投掷药水瓶 - &7这包括喷溅型药水和滞留型药水 - hint: "&c已被禁止投掷药水瓶" + &a允许&#FAFAD2时: 活塞可以把方块推出岛屿范围 + &c禁止&#FAFAD2时: 活塞不能把方块推出岛屿范围 + name: '&b&l活塞推动保护' + PLACE_BLOCKS: + description: '&a允许&#FAFAD2或&c禁止&#FAFAD2放置方块' + name: '&b&l放置方块' + hint: 禁止放置方块 + POTION_THROWING: + name: '&b&l投掷药水' + description: |- + &a允许&#FAFAD2或&c禁止&#FAFAD2投掷药水 + &#FAFAD2包含喷溅型药水和滞留型药水 + hint: 禁止投掷药水 NETHER_PORTAL: - description: 允许/禁止 使用下界传送门 - name: "&a&l使用下界传送门" - hint: "&c已被禁止使用下界传送门" + description: '&a允许&#FAFAD2或&c禁止&#FAFAD2使用下界传送门' + name: '&b&l下界传送门' + hint: 禁止使用下界传送门 END_PORTAL: - description: 允许/禁止 使用末地传送门 - name: "&a&l使用末地传送门" - hint: "&c已被禁止使用末地传送门" + description: '&a允许&#FAFAD2或&c禁止&#FAFAD2使用末地传送门' + name: '&b&l末地传送门' + hint: 禁止使用末地传送门 PRESSURE_PLATE: - description: 允许/禁止 激活压力板 - name: "&a&l使用压力板" - hint: "&c已被禁止使用压力板" + description: |- + &a允许&#FAFAD2或&c禁止&#FAFAD2踩在压力板上激活压力板 + &4仍然可以通过丢弃物品或射箭等非玩家实体 + &4激活木质压力板或测重压力板 + name: '&b&l压力板' + hint: 禁止激活压力板 PVP_END: - description: "&c允许/禁止 在末地 PVP" - name: "&a&l末地 PVP" - hint: "&c已被禁止在末地 PVP" - enabled: "&e已允许在末地 PVP！" - disabled: "&a已禁止在末地 PVP。" + description: '&a允许&#FAFAD2或&c禁止&#FAFAD2在末地PVP' + name: '&b&l末地PVP' + hint: '&c禁止在末地PVP.' + enabled: '&c末地PVP已开启.' + disabled: '&a末地PVP已关闭.' PVP_NETHER: - description: "&c允许/禁止 在下界 PVP" - name: "&a&l下界 PVP" - hint: "&c已被禁止在下界 PVP" - enabled: "&e已允许在下界 PVP！" - disabled: "&a已禁止在下界 PVP。" + description: '&a允许&#FAFAD2或&c禁止&#FAFAD2在下界PVP' + name: '&b&l下界PVP' + hint: '&c禁止在下界PVP.' + enabled: '&c下界PVP已开启.' + disabled: '&a下界PVP已关闭.' PVP_OVERWORLD: - description: "&c允许/禁止 在主世界 PVP" - name: "&a&l主世界 PVP" - hint: "&c已被禁止在主世界 PVP" - enabled: "&e已允许在主世界 PVP！" - disabled: "&a已禁止在主世界 PVP。" + description: '&a允许&#FAFAD2或&c禁止&#FAFAD2在主世界PVP' + name: '&b&l主世界PVP' + hint: '&c禁止在主世界PVP.' + enabled: '&c主世界PVP已开启.' + disabled: '&a主世界PVP已关闭.' REDSTONE: description: |- - &7允许/禁止 使用红石设备 - &7包括红石线、中继器、比 - &7较器和阳光感应器 - name: "&a&l使用红石设备" - hint: "&c已被禁止使用红石设备" + &a允许&#FAFAD2或&c禁止&#FAFAD2调整红石元件 + &#FAFAD2包括红石粉、红石中继器、 + &#FAFAD2红石比较器、阳光探测器等 + name: '&b&l红石元件' + hint: 禁止调整红石元件 + # ↓好像开了和关了都没什么区别, 不是很清楚这个的用法↓ REMOVE_END_EXIT_ISLAND: description: |- - &7允许/禁止 移除末地世界的末影龙 - - &7如果允许移除末影龙， 则末影龙不 - &7会在末地世界坐标 0,0 处生成。 - name: "&a&l移除末影龙" + &#FAFAD2防止末地返回主世界的传送门生成在坐标0, 0 + &a允许&#FAFAD2会阻止传送门生成 + &c禁止&#FAFAD2会允许传送门生成 + name: '&b&l移除末地返回门' REMOVE_MOBS: description: |- - &7允许/禁止 玩家回到岛屿时 - &7移除怪物 - &a这有助于玩家安全回到岛上 - name: "&a&l移除怪物" + &a允许&#FAFAD2或&c禁止&#FAFAD2玩家回到岛屿时, 移除怪物 + &a允许&#FAFAD2该权限会使玩家回到岛屿时, 移除怪物 + &c禁止&#FAFAD2该权限会使玩家回到岛屿时, 保留怪物 + &#FAFAD2(允许该权限可能对生电玩家不是很友好) + name: '&b&l移除怪物' RIDING: - description: 允许/禁止 乘骑动物 - name: "&a&l乘骑动物" - hint: "&c已被禁止乘骑动物" + description: '&a允许&#FAFAD2或&c禁止&#FAFAD2骑乘动物' + name: '&b&l骑乘动物' + hint: 禁止骑乘动物 SHEARING: - description: 允许/禁止 使用剪刀 - name: "&a&l使用剪刀" - hint: "&c已被禁止使用剪刀" + description: '&a允许&#FAFAD2或&c禁止&#FAFAD2使用剪刀修剪' + name: '&b&l修剪' + hint: 禁止使用剪刀修剪 SPAWN_EGGS: - description: 允许/禁止 使用生成蛋 - name: "&a&l使用生成蛋" - hint: "&c已被禁止使用生成蛋" + description: '&a允许&#FAFAD2或&c禁止&#FAFAD2使用刷怪蛋' + name: '&b&l刷怪蛋' + hint: 禁止使用刷怪蛋 SPAWNER_SPAWN_EGGS: - description: 允许/禁止 使用生成蛋更改刷怪笼类型 - name: "&a&l更改刷怪笼类型" - hint: "&c已被禁止使用生成蛋更改刷怪笼实体类型" + description: '&a允许&#FAFAD2或&c禁止&#FAFAD2使用刷怪蛋改变刷怪笼生成生物的类型' + name: '&b&l更改刷怪笼类型' + hint: 禁止使用刷怪蛋改变刷怪笼生成生物的类型 SCULK_SENSOR: - description: |- - &a 切换浮游传感器 - &a 激活。 - name: 浮雕传感器 - hint: 污迹传感器激活被禁用 + description: '&a允许&#FAFAD2或&c禁止&#FAFAD2激活幽匿感测体' + name: '&b&l幽匿感测体' + hint: 禁止激活幽匿感测体 SCULK_SHRIEKER: - description: |- - &a 切换恶棍尖叫者 - &a 激活。 - name: 恶棍尖啸者 - hint: sculk shrieker激活被禁用 + description: '&a允许&#FAFAD2或&c禁止&#FAFAD2激活幽匿尖啸体' + name: '&b&l幽匿尖啸体' + hint: 禁止激活幽匿尖啸体 SIGN_EDITING: - description: |- - &a 允许文本编辑 - 符号&a - name: 标志编辑 - hint: 符号编辑已禁用 + description: '&a允许&#FAFAD2或&c禁止&#FAFAD2编辑告示牌' + name: '&b&l编辑告示牌' + hint: 禁止编辑告示牌 TNT_DAMAGE: - description: 允许/禁止 TNT和TNT矿车破坏方块和实体 - name: "&a&lTNT伤害" + description: '&a允许&#FAFAD2或&c禁止&#FAFAD2TNT和TNT矿车破坏方块和对实体造成伤害' + name: '&b&lTNT伤害' TNT_PRIMING: description: |- - &7允许/禁止 用打火石和火 - &7焰弹点燃 TNT。 - - &7该设定项可以被 “&a点火&7” 设 - &7定项超越 - name: "&a&l点燃 TNT" - hint: "&c已被禁止点燃 TNT" + &a允许&#FAFAD2或&c禁止&#FAFAD2使用打火石或火焰弹点燃TNT + &4"打火石"权限更高 + &4同时拥有"打火石"和"点燃TNT"权限的玩家才能点燃TNT + &4但是它不能保护红石信号激活的TNT + name: '&b&l点燃TNT' + hint: 禁止点燃TNT TRADING: - description: 允许/禁止 与村民交易 - name: "&a&l与村民交易" - hint: "&c已被禁止与村民交易" + description: '&a允许&#FAFAD2或&c禁止&#FAFAD2与村民交易' + name: '&b&l村民交易' + hint: 禁止与村民交易 TRAPDOOR: - description: 允许/禁止 使用陷阱门 - name: "&a&l使用陷阱门" - hint: "&c已被禁止使用陷阱门" + description: '&a允许&#FAFAD2或&c禁止&#FAFAD2使用活板门' + name: '&b&l活板门' + hint: 禁止使用活板门 TREES_GROWING_OUTSIDE_RANGE: - name: "&a&l岛外的树木" + name: '&b&l岛屿外树木生长' description: |- - &7允许/禁止 树木生长到岛屿保护 - &7范围外这不仅可以防止岛保护范 - &7围之外的树苗生长，还能防止岛 - &7外的树木被砍伐后树叶变枯萎。 + &a允许&#FAFAD2或&c禁止&#FAFAD2树木在岛屿保护范围之外生长 + &#FAFAD2它不仅可以防止岛屿外的树苗生长 + &#FAFAD2还可以阻止岛屿内的树苗长到岛屿保护范围之外 TURTLE_EGGS: - description: 允许/禁止 踩碎海龟蛋 - name: "&a&l踩碎海龟蛋" - hint: "&c已被禁止踩碎海龟蛋" + description: '&a允许&#FAFAD2或&c禁止&#FAFAD2踩碎海龟蛋' + name: '&b&l海龟蛋' + hint: 禁止踩碎海龟蛋 FROST_WALKER: - description: 允许/禁止 冰霜行者附魔生成霜冰 - name: "&a&l冰霜行者" - hint: "&c已被禁止使用冰霜行者" + description: '&a允许&#FAFAD2或&c禁止&#FAFAD2使冰霜行者附魔生效' + name: '&b&l冰霜行者' + hint: 禁止使用冰霜行者 EXPERIENCE_PICKUP: - name: "&a&l拾取经验球" - description: 允许/禁止 拾取经验球 - hint: "&c已被禁止拾取经验球" + name: '&b&l拾取经验' + description: '&a允许&#FAFAD2或&c禁止&#FAFAD2拾取经验球' + hint: 禁止拾取经验 PREVENT_TELEPORT_WHEN_FALLING: - name: "&a&l阻止坠落时传送" + name: '&b&l阻止坠落时传送' description: |- - &7允许/禁止 阻止玩家在下坠时传送 - &7例如用 /is go 传送到岛屿上 - &c允许即为阻止传送 - hint: "&c已禁止在下坠时进行传送" + &a允许&#FAFAD2或&c禁止&#FAFAD2阻止玩家在坠落时 + &#FAFAD2使用指令传送回自己的岛屿(例如: /is go) + &a允许&#FAFAD2时: 玩家在坠落时不能传送 + &c禁止&#FAFAD2时: 玩家在坠落时可以传送 + &#FAFAD2禁用指令在BentoBox\addons\BSkyBlock\config.yml + &#FAFAD2文件中的"falling-banned-commands"里设置 + hint: '&c你不能在坠落时传送.' VISITOR_KEEP_INVENTORY: - name: 游客对死亡进行盘点 + name: '&b&l访客死亡不掉落' description: |- - &a 防止玩家失去他们的 - &a 物品和经验，如果他们死了 - &a 他们是游客的岛屿。 - ＆一个 - &a 岛成员仍然丢失他们的物品 - &a 如果他们死在自己的岛上！ + &#FAFAD2防止玩家以访客身份访问他人岛屿时死亡而丢失物品和经验 + &a允许&#FAFAD2时: 玩家在他人岛屿死亡不掉落 + &c禁止&#FAFAD2时: 玩家在他人岛屿死亡掉落 + &4岛屿成员在自己的岛屿上死亡时仍然会掉落物品和经验 VISITOR_TRIGGER_RAID: - name: 访客引发袭击 + name: '&b&l访客触发袭击' description: |- - &a 切换访客是否可以开始 - &a 对他们所在的岛屿进行突袭 - &a 来访。 - ＆a - &a 不祥之兆效果将被移除！ + &a允许&#FAFAD2或&c禁止&#FAFAD2访客在他人岛屿上触发袭击 + + &#FAFAD2不祥之兆效果将被移除 ENTITY_PORTAL_TELEPORT: - name: 实体门户使用情况 - description: |- - &a 切换实体（非玩家）是否可以 - &a 使用传送门在之间传送 - &a 尺寸 + name: '&b&l实体通过传送门' + description: '&a允许&#FAFAD2或&c禁止&#FAFAD2实体(不包括玩家)通过传送门跨越维度' WITHER_DAMAGE: - name: "&a&l凋零伤害" + name: '&b&l凋灵破坏' description: |- - &7允许/禁止 凋灵伤害生效 - &7允许时， 凋灵可以破坏方 - &7块和伤害玩家 + &a允许&#FAFAD2或&c禁止&#FAFAD2凋灵破坏方块和伤害玩家 + &a允许&#FAFAD2时: 凋灵可以破坏方块和伤害玩家 + &c禁止&#FAFAD2时: 凋灵不能破坏方块和伤害玩家 WORLD_BLOCK_EXPLODE_DAMAGE: description: |- - &a 允许床和重生锚 - &a 打破块和损坏 - &a 岛屿限制之外的实体。 - name: 世界方块爆炸伤害 + &a允许&#FAFAD2或&c禁止&#FAFAD2床和重生锚爆炸时 + &#FAFAD2对岛屿保护范围之外的方块和实体造成破坏和伤害 + name: '&b&l边界爆炸保护' WORLD_TNT_DAMAGE: description: |- - &7允许/禁止 岛屿保护范围外的TNT - &7和TNT矿车破坏方块和实体 - name: "&a&l世界TNT伤害" - locked: "&c这个岛屿已被锁定！" - protected: "&6岛屿保护： [description]&6。" - world-protected: "&6世界保护： [description]&6。" - spawn-protected: "&6出生点保护： [description]&6。" + &a允许&#FAFAD2或&c禁止&#FAFAD2TNT和TNT矿车爆炸时 + &#FAFAD2对岛屿保护范围之外的方块和实体造成破坏和伤害 + name: '&b&l边界TNT保护' + locked: '&c这个岛屿已被锁定!' + protected: '&c岛屿保护: [description].' + world-protected: '&c世界保护: [description].' + spawn-protected: '&c出生点保护: [description].' + panel: - next: "&f下一页" - previous: "&f上一页" + next: '&f下一页' + previous: '&f上一页' mode: advanced: - name: "&6&l高级设置" - description: "&7显示一些合理的设置项" + name: '&6&l高级设置' + description: '&#FAFAD2显示更多设置项.' basic: - name: "&a&l基本设置" - description: "&7只显示最常用的设置项" + name: '&a&l基础设置' + description: '&#FAFAD2显示基础设置项.' expert: - name: "&c&l专家设置" - description: "&7显示所有可用的设置项。" - click-to-switch: "&e点击 &7切换到 &r[next]" + name: '&c&l专家设置' + description: '&#FAFAD2显示全部设置项.' + click-to-switch: '&e点击&7切换至&r[next]&r&7.' reset-to-default: - name: "&c&l重置为默认值" - description: "&7将 &e所有 &7设置项恢复为默认值" + name: '&c&l重置为默认值' + description: '&#FAFAD2将&b全部&#FAFAD2设置项恢复为默认值' PROTECTION: - title: "&5&l保护" - description: "&7适用于该岛屿的保护设定" + title: '&6&l保护' + description: '&#FAFAD2适用于该岛屿的保护权限' SETTING: - title: "&5&l设置" - description: "&7适用于该岛屿的一般设置项" + title: '&6&l设置' + description: '&#FAFAD2适用于该岛屿的一般权限' WORLD_SETTING: - title: "&5&l用于 &3&l[world_name] &5&l的一般设置" - description: "&7这些设置项适用于全部游戏世界" + title: '&b&l[world_name] &6&l设置' + description: '&#FAFAD2为当前游戏世界设置' WORLD_DEFAULTS: - title: "&5&l用于 &3&l[world_name] &5&l的保护设定" - description: "&7岛屿范围外适用的保护设定" + title: '&b&l[world_name] &6&l世界保护' + description: '&#FAFAD2世界默认权限设置' flag-item: - name-layout: "&a&l[name]" + name-layout: '&a[name]' description-layout: |- - &7[description] + &a[description] - &e左键点击 &7向下循环选择 - &e右键点击 &7向上循环选择 + &e左键 &7向下循环选择 + &e右键 &7向上循环选择 - &7允许给： - allowed-rank: "&3 - &a " - blocked-rank: "&3 - &c " - minimal-rank: "&3 - &2 " - menu-layout: |- - &7[description] + &7授权给: + allowed-rank: '&3 - &a' + blocked-rank: '&3 - &c' + minimal-rank: '&3 - &2' + menu-layout: | + &a [description] - &e点击 &f打开 - setting-cooldown: "&c设置项正在冷却" - setting-layout: |- - &7[description] + &e点击 &7打开配置界面 + setting-cooldown: '&c设置正在冷却中' + setting-layout: | + &a [description] - &e点击 &7切换 &a允许&7/&c禁止 + &e点击 &7切换状态 + + &7当前状态: [setting] + setting-active: '&a允许' + setting-disabled: '&c禁止' - &7当前设定： [setting] - setting-active: "&a允许" - setting-disabled: "&c禁止" -language: - panel-title: "&l选择您适用的语言" - description: - selected: "&a已选定" - click-to-select: "&e点击 &f选择" - authors: "&7作者：" - author: "&3- &b[name]" - edited: "&a已将您的语言更改为 &e[lang] &a。" management: panel: - title: "&lBentoBox 管理" + title: '&6&lBentoBox管理' views: gamemodes: - name: "&6游戏模式" - description: "&e点击 &7列出所有已载入的游戏模式" + name: '&6&l游戏模式' + description: '&e点击 &a显示当前已加载游戏模式' blueprints: - name: "&9蓝图方案" - description: "&e点击 &7打开蓝图方案管理器" + name: '&9&l蓝图方案' + description: '&a打开蓝图方案管理' gamemode: - name: "&6[name]" - description: "&a岛屿数量： &b[islands]\n" + name: '&f[name]' + description: | + &a岛屿数量: &b[islands] addons: - name: "&6附加组件" - description: "&e点击 &7显示所有已加载的附加组件" + name: '&6&l附加组件(Addons)' + description: '&e点击 &a显示当前已加载附加组件(Addons)' hooks: - name: "&6钩子" - description: "&e点击 &7显示所有已挂钩的插件" + name: '&6&l钩子(Hooks)' + description: '&e点击 &a显示当前已挂钩的插件' actions: reload: - name: "&c重载" - description: "&7点击 &c&l两次&r &7重载 &7&lBentoBox" + name: '&c&l重载' + description: '&e点击 &c&l两次&r&a可重载BentoBox' buttons: catalog: - name: "&6编目" - description: "&7打开编目界面" + name: '&6&l目录' + description: '&a打开目录' credits: - name: "&6贡献者名录" - description: "&7查看 &7&lBentoBox&r &7的贡献者名录" + name: '&6&l贡献者名录' + description: '&a打开Bentobox贡献者名录' empty-here: - name: "&b这里空空如也..." - description: "&7您也可以看看我们的编目" + name: '&b&l这里空空如也...' + description: '&a来目录看看?' information: state: - name: "&6兼容性" + name: '&6&l兼容性' description: COMPATIBLE: | - &7正在运行 &e[name] [version]&7。 - - &7&lBentoBox&r &7当前正运行在&a&l完全兼容 - &7的服务器软件和版本上。 - - &7它完全按照此运行环境设计， - &7所有功能均可以稳定运行。 + &a运行在: &e[name] [version] + &aBentoBox当前运行在&a&l&n完全兼容&r&a的服务端和版本上 + &a插件完全按照当前运行环境设计 + &a所有功能均可以稳定运行 SUPPORTED: | - &7正在运行 &e[name] [version]&7。 - - &7&lBentoBox&r &7当前正运行在&a&l支持的 - &7的服务器软件和版本上。 - - &7尽管它不是完全按照此运行环境 - &7设计， 但它的大部分功能能够在 - &7此环境良好运行。 + &a运行在: &e[name] [version] + &aBentoBox当前运行在&a&l&n受支持&r&a的服务端和版本上 + &a插件大部分功能可以在当前环境流畅运行 NOT_SUPPORTED: | - &7正在运行 &e[name] [version]&7。 - - &7&lBentoBox&r &7当前正运行在&6&lb不支持的 - &7的服务器软件和版本上。 - - &7虽然它的部分功能可以正常运 - &行， 但可能发生平台相关的错误。 + &a运行在: &e[name] [version] + &aBentoBox当前运行在&6&l&n不受支持&r&a的服务端或版本上 + &a虽然部分功能仍然可以正常运行 + &a但可能发生&6平台相关的BUG或问题 INCOMPATIBLE: | - &7正在运行 &e[name] [version]&7。 - - &7&lBentoBox&r &7当前正运行在&c&l不兼容 - &7的服务器软件和版本上。 - - &c它并不是为此运行环境设计的， 可能 - &c会发生奇怪的行为和错误， 并且大部 - &7分功能可能不稳定。 + &a运行在: &e[name] [version] + &aBentoBox当前运行在&c&l&n不兼容&r&a的服务端或版本上 + &c可能会发生奇怪的行为和错误 + &c大部分功能可能不稳定 catalog: panel: GAMEMODES: - title: "&l游戏模式编目" + title: '&6&l游戏模式目录' ADDONS: - title: "&l附加组件编目" + title: '&6&l附加组件(Addons)目录' views: gamemodes: - name: "&6游戏模式" - description: "&e点击 &7浏览可用的官方游戏模式" + name: '&6&l游戏模式' + description: '&e点击 &a浏览可用的官方游戏模式' addons: - name: "&6附加组件" - description: "&e点击 &7浏览可用的官方附加组件" + name: '&6&l附加组件(Addons)' + description: '&e点击 &a浏览可用的官方附加组件(Addons)' icon: description-template: | - &f[topic] + &8[topic] &a[install] - &7[description] + &7&o[description] - &e点击 &7获取最新版本的链接。 - already-installed: 已安装！ - install-now: 现在安装！ + &e点击 &a获取最新版本链接 + already-installed: 已安装! + install-now: 现在安装! + empty-here: - name: "&b&l这里空空如也..." + name: '&b&l这里空空如也...' description: | - &c&lBentoBox&r &c无法连接到 GitHub。 - - &a请修改配置允许&b&lBentoBox&a连接 - &a到互联网， 或稍后再试。 + &cBentoBox无法连接到GitHub + &a请修改配置文件允许BentoBox连接到GitHub或稍后重试 enums: DamageCause: - CONTACT: 接触（如仙人掌） - ENTITY_ATTACK: 直接攻击 - ENTITY_SWEEP_ATTACK: 范围攻击 - PROJECTILE: 弹射物 - SUFFOCATION: 窒息 - FALL: 坠落 - FIRE: 火焰 - FIRE_TICK: 点燃 - MELTING: 融化 - LAVA: 熔岩高温 - DROWNING: 溺水 - BLOCK_EXPLOSION: 方块爆炸 - ENTITY_EXPLOSION: 实体爆炸 - VOID: 坠入虚空 - LIGHTNING: 雷击 - SUICIDE: 自杀（如/kill） - STARVATION: 饥饿 - POISON: 中毒 - MAGIC: 魔法 - WITHER: 凋零 - FALLING_BLOCK: 砸伤 - THORNS: 荆棘 - DRAGON_BREATH: 龙息 - CUSTOM: 自定义 - FLY_INTO_WALL: 撞墙 - HOT_FLOOR: 岩浆块 - CRAMMING: 拥挤 - DRYOUT: 缺氧（鱼类暴露在空气中） + CONTACT: '&e接触(如仙人掌或甜浆果丛)' + ENTITY_ATTACK: '&e实体攻击' + ENTITY_SWEEP_ATTACK: '&e实体范围攻击' + PROJECTILE: '&e弹射物' + SUFFOCATION: '&e窒息' + FALL: '&e摔落' + FIRE: '&e接触火' + FIRE_TICK: '&e着火' + MELTING: '&e融化' + LAVA: '&e熔岩' + DROWNING: '&e溺水' + BLOCK_EXPLOSION: '&e方块爆炸' + ENTITY_EXPLOSION: '&e实体爆炸' + VOID: '&e虚空' + LIGHTNING: '&e雷击' + SUICIDE: '&e自杀' + STARVATION: '&e饥饿' + POISON: '&e中毒' + MAGIC: '&e魔法' + WITHER: '&e凋零' + FALLING_BLOCK: '&e坠落方块' + THORNS: '&e荆棘' + DRAGON_BREATH: '&e龙息' + CUSTOM: '&e自定义' + FLY_INTO_WALL: '&e撞击(鞘翅滑翔时高速撞击方块侧面)' + HOT_FLOOR: '&e岩浆块' + CRAMMING: '&e挤压' + DRYOUT: '&e脱水(如鱼暴露空气中)' + FREEZE: '&e冰冻' + KILL: '&e/kill' + SONIC_BOOM: '&e监守者音波尖啸' + WORLD_BORDER: '&e世界边界' + panel: credits: - title: "&8[name] &3贡献者名录" + title: '&8&l[name]&6&l贡献者名录' contributor: - name: "&a[name]" - description: "&a提交: &b[commits] &a个" + name: '&a[name]' + description: '&a提交次数: &b[commits]' empty-here: - name: "&c&l这里空空如也..." - description: |- - &c&lBentoBox&r &c无法收集此组件的贡献者。 + name: '&c&l这里空空如也...' + description: | + &cBentoBox无法获取此附加组件(Addon)的贡献者 + &a请修改配置文件允许BentoBox连接到GitHub或稍后重试 +# This section contains values for BentoBox panels. +panels: + # The section of translations used in Island Creation Panel + island_creation: + title: '&#FF00FF&l选择你的岛屿' + buttons: + # This button is used for displaying blueprint bundle in the island creation panel. + bundle: + name: '&l[name]' + description: '[description]' + uses: '&a可创建次数: &#FFE4B5[number]&f/&#FFE4B5[max]' + unlimited: '&a可创建次数: E90FF无限' + # The section of translations used in Language Panel + language: + title: '&2&l选择你的语言' + buttons: + # This button is used for displaying different locales that are available in language selection panel. + language: + name: '&f&l[name]' + description: |- + [authors] + |[selected] + authors: '&7作者: ' + author: '&7 - &b[name]' + selected: '&a当前已选择该语言' + # The set of common buttons used in multiple panels. + buttons: + # Button that is used in multi-page GUIs which allows to return to previous page. + previous: + name: '&f&l上一页' + description: '&7切换至第[number]页' # Button that is used in multi-page GUIs which allows to go to next page. + next: + name: '&f&l下一页' + description: '&7切换至第[number]页' + tips: + click-to-next: '&e点击 &7往下翻' + click-to-previous: '&e点击 &7往上翻' + click-to-choose: '&e点击 &7选择' + click-to-toggle: '&e点击 &7切换' + left-click-to-cycle-down: '&e左键 &7向下循环选择' + right-click-to-cycle-up: '&e右键 &7向上循环选择' - &a请修改配置允许&b&lBentoBox&a连接 - &a到互联网， 或稍后再试。 -successfully-loaded: |2 +successfully-loaded: |2- &6 ____ _ ____ - &6 | _ \ | | | _ \ &7由 &atastybento &7和 &aPoslovitch &7构建 - &6 | |_) | ___ _ __ | |_ ___ | |_) | _____ __ &72017 - 2022 + &6 | _ \ | | | _ \ &7由&atastybento&7和&aPoslovitch&7构建 + &6 | |_) | ___ _ __ | |_ ___ | |_) | _____ __ &72017 - 2024 &6 | _ < / _ \ '_ \| __/ _ \| _ < / _ \ \/ / &6 | |_) | __/ | | | || (_) | |_) | (_) > < &bv&e[version] - &6 |____/ \___|_| |_|\__\___/|____/ \___/_/\_\ &8加载用时 &e[time] &8毫秒 + &6 |____/ \___|_| |_|\__\___/|____/ \___/_/\_\ &8加载用时 &e[time]&8毫秒. +language: + panel-title: '&l选择你适用的语言' + description: + selected: '&a已选定' + click-to-select: '&e点击 &f选择' + authors: '&7作者：' + author: '&3- &b[name]' + edited: '&a已将你的语言更改为: &e[lang]' diff --git a/src/test/java/world/bentobox/bentobox/TestBentoBox.java b/src/test/java/world/bentobox/bentobox/TestBentoBox.java index fdfe61772..170cbb918 100644 --- a/src/test/java/world/bentobox/bentobox/TestBentoBox.java +++ b/src/test/java/world/bentobox/bentobox/TestBentoBox.java @@ -36,6 +36,8 @@ 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; @@ -50,11 +52,12 @@ import world.bentobox.bentobox.listeners.flags.AbstractCommonSetup; import world.bentobox.bentobox.lists.Flags; import world.bentobox.bentobox.managers.CommandsManager; import world.bentobox.bentobox.managers.FlagsManager; +import world.bentobox.bentobox.managers.IslandsManager; import world.bentobox.bentobox.managers.RanksManager; import world.bentobox.bentobox.util.Util; @RunWith(PowerMockRunner.class) -@PrepareForTest({ BentoBox.class, Flags.class, Util.class, Bukkit.class}) +@PrepareForTest({ BentoBox.class, Flags.class, Util.class, Bukkit.class, IslandsManager.class }) public class TestBentoBox extends AbstractCommonSetup { private static final UUID MEMBER_UUID = UUID.randomUUID(); private static final UUID VISITOR_UUID = UUID.randomUUID(); @@ -74,6 +77,9 @@ public class TestBentoBox extends AbstractCommonSetup { public void setUp() throws Exception { super.setUp(); + // IslandsManager static + PowerMockito.mockStatic(IslandsManager.class, Mockito.RETURNS_MOCKS); + when(plugin.getCommandsManager()).thenReturn(cm); SkullMeta skullMeta = mock(SkullMeta.class); @@ -83,18 +89,24 @@ public class TestBentoBox extends AbstractCommonSetup { when(Bukkit.getOfflinePlayer(any(UUID.class))).thenReturn(offlinePlayer); when(offlinePlayer.getName()).thenReturn("tastybento"); - when(player.hasPermission(anyString())).thenReturn(true); + when(mockPlayer.hasPermission(anyString())).thenReturn(true); + when(location.getWorld()).thenReturn(world); when(ownerOfIsland.getLocation()).thenReturn(location); when(visitorToIsland.getLocation()).thenReturn(location); when(location.clone()).thenReturn(location); - when(player.getUniqueId()).thenReturn(MEMBER_UUID); + when(mockPlayer.getUniqueId()).thenReturn(MEMBER_UUID); when(ownerOfIsland.getUniqueId()).thenReturn(uuid); when(visitorToIsland.getUniqueId()).thenReturn(VISITOR_UUID); + // Util + PowerMockito.mockStatic(Util.class); + when(Util.findFirstMatchingEnum(any(), any())).thenCallRealMethod(); + island.setOwner(uuid); island.setProtectionRange(100); + island.setCenter(location); HashMap members = new HashMap<>(); members.put(uuid, RanksManager.OWNER_RANK); members.put(MEMBER_UUID, RanksManager.MEMBER_RANK); @@ -139,36 +151,36 @@ public class TestBentoBox extends AbstractCommonSetup { String[] args = {""}; // Results are alphabetically sorted when(Util.tabLimit(any(), any())).thenCallRealMethod(); - assertEquals(Arrays.asList("help", "sub1","sub2"), testCommand.tabComplete(player, "test", args)); + assertEquals(Arrays.asList("help", "sub1","sub2"), testCommand.tabComplete(mockPlayer, "test", args)); assertNotSame(Arrays.asList("help", "sub1","sub2"), testCommand.tabComplete(sender, "test", args)); args[0] = "su"; - assertEquals(Arrays.asList("sub1","sub2"), testCommand.tabComplete(player, "test", args)); + assertEquals(Arrays.asList("sub1","sub2"), testCommand.tabComplete(mockPlayer, "test", args)); args[0] = "d"; - assertNotSame(Arrays.asList("help", "sub1","sub2"), testCommand.tabComplete(player, "test", args)); + assertNotSame(Arrays.asList("help", "sub1","sub2"), testCommand.tabComplete(mockPlayer, "test", args)); args[0] = "sub1"; - assertEquals(Collections.emptyList(), testCommand.tabComplete(player, "test", args)); + assertEquals(Collections.emptyList(), testCommand.tabComplete(mockPlayer, "test", args)); String[] args2 = {"sub2",""}; - assertEquals(Arrays.asList("help", "subsub"), testCommand.tabComplete(player, "test", args2)); + assertEquals(Arrays.asList("help", "subsub"), testCommand.tabComplete(mockPlayer, "test", args2)); args2[1] = "s"; - assertEquals(Collections.singletonList("subsub"), testCommand.tabComplete(player, "test", args2)); + assertEquals(Collections.singletonList("subsub"), testCommand.tabComplete(mockPlayer, "test", args2)); String[] args3 = {"sub2","subsub", ""}; - assertEquals(Arrays.asList("help", "subsubsub"), testCommand.tabComplete(player, "test", args3)); + assertEquals(Arrays.asList("help", "subsubsub"), testCommand.tabComplete(mockPlayer, "test", args3)); // Test for overridden tabcomplete assertEquals(Arrays.asList("Ben", "Bill", "Florian", "Ted", "help"), - testCommand.tabComplete(player, "test", new String[] {"sub2", "subsub", "subsubsub", ""})); + testCommand.tabComplete(mockPlayer, "test", new String[] {"sub2", "subsub", "subsubsub", ""})); // Test for partial word assertEquals(Arrays.asList("Ben", "Bill"), - testCommand.tabComplete(player, "test", new String[] {"sub2", "subsub", "subsubsub", "b"})); + testCommand.tabComplete(mockPlayer, "test", new String[] {"sub2", "subsub", "subsubsub", "b"})); // Test command arguments CompositeCommand argCmd = new Test3ArgsCommand(); argCmd.setOnlyPlayer(true); argCmd.setPermission("default.permission"); - assertTrue(argCmd.execute(player, "args", new String[]{"give", "100", "ben"})); - assertFalse(testCommand.execute(player, "test", new String[] {"sub2", "subsub", "subsubsub"})); - assertFalse(testCommand.execute(player, "test", new String[] {"sub2", "subsub", "subsubsub", "ben"})); - assertFalse(testCommand.execute(player, "test", new String[] {"sub2", "subsub", "subsubsub", "ben", "100"})); - assertTrue(testCommand.execute(player, "test", new String[] {"sub2", "subsub", "subsubsub", "ben", "100", "today"})); + assertTrue(argCmd.execute(mockPlayer, "args", new String[]{"give", "100", "ben"})); + assertFalse(testCommand.execute(mockPlayer, "test", new String[] {"sub2", "subsub", "subsubsub"})); + assertFalse(testCommand.execute(mockPlayer, "test", new String[] {"sub2", "subsub", "subsubsub", "ben"})); + assertFalse(testCommand.execute(mockPlayer, "test", new String[] {"sub2", "subsub", "subsubsub", "ben", "100"})); + assertTrue(testCommand.execute(mockPlayer, "test", new String[] {"sub2", "subsub", "subsubsub", "ben", "100", "today"})); // Usage tests assertEquals("/test", testCommand.getUsage()); @@ -409,8 +421,8 @@ public class TestBentoBox extends AbstractCommonSetup { Assert.assertTrue(fl.checkIsland(e, ownerOfIsland, location, Flags.BREAK_BLOCKS, true)); // checking events - member - Event e2 = new BlockBreakEvent(block, player); - Assert.assertTrue(fl.checkIsland(e2, player, location, Flags.BREAK_BLOCKS, true)); + Event e2 = new BlockBreakEvent(block, mockPlayer); + Assert.assertTrue(fl.checkIsland(e2, mockPlayer, location, Flags.BREAK_BLOCKS, true)); } 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 f3fb90554..5a26549f2 100644 --- a/src/test/java/world/bentobox/bentobox/api/addons/AddonClassLoaderTest.java +++ b/src/test/java/world/bentobox/bentobox/api/addons/AddonClassLoaderTest.java @@ -32,10 +32,13 @@ 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 org.powermock.reflect.Whitebox; +import com.github.puregero.multilib.MultiLib; + import world.bentobox.bentobox.BentoBox; import world.bentobox.bentobox.api.addons.exceptions.InvalidAddonDescriptionException; import world.bentobox.bentobox.managers.AddonsManager; @@ -46,7 +49,7 @@ import world.bentobox.bentobox.managers.AddonsManager; * */ @RunWith(PowerMockRunner.class) -@PrepareForTest( { BentoBox.class, Bukkit.class }) +@PrepareForTest({ BentoBox.class, Bukkit.class, MultiLib.class }) public class AddonClassLoaderTest { private enum mandatoryTags { @@ -80,6 +83,9 @@ public class AddonClassLoaderTest { */ @Before public void setUp() throws Exception { + PowerMockito.mockStatic(Bukkit.class, Mockito.RETURNS_MOCKS); + + PowerMockito.mockStatic(MultiLib.class, Mockito.RETURNS_MOCKS); // Set up plugin plugin = mock(BentoBox.class); Whitebox.setInternalState(BentoBox.class, "instance", plugin); diff --git a/src/test/java/world/bentobox/bentobox/api/addons/AddonTest.java b/src/test/java/world/bentobox/bentobox/api/addons/AddonTest.java index 6bb9c3e84..c3dd9b003 100644 --- a/src/test/java/world/bentobox/bentobox/api/addons/AddonTest.java +++ b/src/test/java/world/bentobox/bentobox/api/addons/AddonTest.java @@ -44,13 +44,15 @@ import org.powermock.core.classloader.annotations.PrepareForTest; import org.powermock.modules.junit4.PowerMockRunner; import org.powermock.reflect.Whitebox; +import com.github.puregero.multilib.MultiLib; + import world.bentobox.bentobox.BentoBox; import world.bentobox.bentobox.managers.AddonsManager; import world.bentobox.bentobox.managers.IslandsManager; import world.bentobox.bentobox.managers.PlayersManager; @RunWith(PowerMockRunner.class) -@PrepareForTest( { BentoBox.class, Bukkit.class }) +@PrepareForTest({ BentoBox.class, Bukkit.class, MultiLib.class }) public class AddonTest { public static int BUFFER_SIZE = 10240; @@ -69,6 +71,8 @@ public class AddonTest { @Before public void setUp() throws Exception { + PowerMockito.mockStatic(Bukkit.class, Mockito.RETURNS_MOCKS); + server = mock(Server.class); World world = mock(World.class); when(server.getLogger()).thenReturn(Logger.getAnonymousLogger()); @@ -77,8 +81,6 @@ public class AddonTest { PluginManager pluginManager = mock(PluginManager.class); - - PowerMockito.mockStatic(Bukkit.class); when(Bukkit.getPluginManager()).thenReturn(pluginManager); when(Bukkit.getServer()).thenReturn(server); when(Bukkit.getPluginManager()).thenReturn(pluginManager); @@ -90,6 +92,8 @@ public class AddonTest { // Addons manager when(plugin.getAddonsManager()).thenReturn(am); + // MultiLib + PowerMockito.mockStatic(MultiLib.class, Mockito.RETURNS_MOCKS); // Mock item factory (for itemstacks) ItemFactory itemFactory = mock(ItemFactory.class); diff --git a/src/test/java/world/bentobox/bentobox/api/commands/DelayedTeleportCommandTest.java b/src/test/java/world/bentobox/bentobox/api/commands/DelayedTeleportCommandTest.java index 4b947d2f7..5a25a0d82 100644 --- a/src/test/java/world/bentobox/bentobox/api/commands/DelayedTeleportCommandTest.java +++ b/src/test/java/world/bentobox/bentobox/api/commands/DelayedTeleportCommandTest.java @@ -94,7 +94,7 @@ public class DelayedTeleportCommandTest { when(plugin.getSettings()).thenReturn(settings); when(settings.getDelayTime()).thenReturn(10); // 10 seconds // Server & Scheduler - PowerMockito.mockStatic(Bukkit.class); + PowerMockito.mockStatic(Bukkit.class, Mockito.RETURNS_MOCKS); when(Bukkit.getScheduler()).thenReturn(sch); when(sch.runTaskLater(any(), any(Runnable.class), anyLong())).thenReturn(task); // Plugin manager diff --git a/src/test/java/world/bentobox/bentobox/api/commands/HiddenCommandTest.java b/src/test/java/world/bentobox/bentobox/api/commands/HiddenCommandTest.java index 3809a61f9..eb160ff08 100644 --- a/src/test/java/world/bentobox/bentobox/api/commands/HiddenCommandTest.java +++ b/src/test/java/world/bentobox/bentobox/api/commands/HiddenCommandTest.java @@ -12,6 +12,7 @@ import static org.mockito.Mockito.when; import java.util.List; +import org.bukkit.Bukkit; import org.bukkit.command.CommandSender; import org.bukkit.entity.Player; import org.junit.After; @@ -21,6 +22,7 @@ import org.junit.runner.RunWith; import org.mockito.Mock; import org.mockito.Mockito; import org.mockito.stubbing.Answer; +import org.powermock.api.mockito.PowerMockito; import org.powermock.core.classloader.annotations.PrepareForTest; import org.powermock.modules.junit4.PowerMockRunner; import org.powermock.reflect.Whitebox; @@ -36,7 +38,7 @@ import world.bentobox.bentobox.managers.CommandsManager; * */ @RunWith(PowerMockRunner.class) -@PrepareForTest({BentoBox.class, CommandEvent.class}) +@PrepareForTest({ BentoBox.class, CommandEvent.class, Bukkit.class }) public class HiddenCommandTest { @Mock @@ -49,6 +51,7 @@ public class HiddenCommandTest { */ @Before public void setUp() throws Exception { + PowerMockito.mockStatic(Bukkit.class, Mockito.RETURNS_MOCKS); // Set up plugin Whitebox.setInternalState(BentoBox.class, "instance", plugin); // Command manager diff --git a/src/test/java/world/bentobox/bentobox/api/commands/admin/AdminDeleteCommandTest.java b/src/test/java/world/bentobox/bentobox/api/commands/admin/AdminDeleteCommandTest.java index b678482fa..a047957f9 100644 --- a/src/test/java/world/bentobox/bentobox/api/commands/admin/AdminDeleteCommandTest.java +++ b/src/test/java/world/bentobox/bentobox/api/commands/admin/AdminDeleteCommandTest.java @@ -72,6 +72,8 @@ public class AdminDeleteCommandTest { */ @Before public void setUp() throws Exception { + PowerMockito.mockStatic(Bukkit.class, Mockito.RETURNS_MOCKS); + // Set up plugin BentoBox plugin = mock(BentoBox.class); Whitebox.setInternalState(BentoBox.class, "instance", plugin); @@ -117,6 +119,7 @@ public class AdminDeleteCommandTest { // when(im.isOwner(any(),any())).thenReturn(true); // when(im.getOwner(any(),any())).thenReturn(uuid); when(im.getIsland(world, user)).thenReturn(island); + when(im.getIslands(world, notUUID)).thenReturn(List.of(island)); when(plugin.getIslands()).thenReturn(im); // Island @@ -130,7 +133,6 @@ public class AdminDeleteCommandTest { // Server & Scheduler BukkitScheduler sch = mock(BukkitScheduler.class); - PowerMockito.mockStatic(Bukkit.class); when(Bukkit.getScheduler()).thenReturn(sch); BukkitTask task = mock(BukkitTask.class); when(sch.runTaskLater(any(), any(Runnable.class), any(Long.class))).thenReturn(task); @@ -179,7 +181,8 @@ public class AdminDeleteCommandTest { public void testExecutePlayerNoIsland() { AdminDeleteCommand itl = new AdminDeleteCommand(ac); when(pm.getUUID(any())).thenReturn(notUUID); - when(im.getIsland(world, user)).thenReturn(null); + when(im.hasIsland(world, notUUID)).thenReturn(false); + when(im.inTeam(world, notUUID)).thenReturn(false); assertFalse(itl.canExecute(user, "", List.of("tastybento"))); verify(user).sendMessage(eq("general.errors.player-has-no-island")); } @@ -189,14 +192,13 @@ public class AdminDeleteCommandTest { */ @Test public void testExecuteOwner() { - - when(im.inTeam(any(),any())).thenReturn(true); - when(island.inTeam(notUUID)).thenReturn(true); - //when(im.getOwner(any(), any())).thenReturn(notUUID); - String[] name = {"tastybento"}; + when(im.hasIsland(world, notUUID)).thenReturn(true); + when(im.inTeam(world, notUUID)).thenReturn(true); + when(island.getOwner()).thenReturn(notUUID); + when(island.hasTeam()).thenReturn(true); when(pm.getUUID(any())).thenReturn(notUUID); AdminDeleteCommand itl = new AdminDeleteCommand(ac); - assertFalse(itl.canExecute(user, itl.getLabel(), Arrays.asList(name))); + assertFalse(itl.canExecute(user, itl.getLabel(), List.of("tastybento"))); verify(user).sendMessage("commands.admin.delete.cannot-delete-owner"); } @@ -205,6 +207,7 @@ public class AdminDeleteCommandTest { */ @Test public void testcanExecuteSuccessUUID() { + when(im.hasIsland(world, uuid)).thenReturn(true); when(island.hasTeam()).thenReturn(false); when(im.inTeam(any(), any())).thenReturn(false); //when(im.getOwner(any(), any())).thenReturn(uuid); @@ -212,7 +215,7 @@ public class AdminDeleteCommandTest { Location loc = mock(Location.class); when(loc.toVector()).thenReturn(new Vector(123,123,432)); when(is.getCenter()).thenReturn(loc); - when(im.getIsland(any(), any(UUID.class))).thenReturn(is); + when(im.getIslands(any(), any(UUID.class))).thenReturn(List.of(is)); // No such name when(pm.getUUID(any())).thenReturn(null); diff --git a/src/test/java/world/bentobox/bentobox/api/commands/admin/AdminGetrankCommandTest.java b/src/test/java/world/bentobox/bentobox/api/commands/admin/AdminGetrankCommandTest.java index 8acac9556..5dcb9384a 100644 --- a/src/test/java/world/bentobox/bentobox/api/commands/admin/AdminGetrankCommandTest.java +++ b/src/test/java/world/bentobox/bentobox/api/commands/admin/AdminGetrankCommandTest.java @@ -74,6 +74,7 @@ public class AdminGetrankCommandTest { */ @Before public void setUp() throws Exception { + PowerMockito.mockStatic(Bukkit.class, Mockito.RETURNS_MOCKS); // Set up plugin BentoBox plugin = mock(BentoBox.class); Whitebox.setInternalState(BentoBox.class, "instance", plugin); @@ -107,7 +108,6 @@ public class AdminGetrankCommandTest { online.put(uuid, name); onlinePlayers.add(p1); } - PowerMockito.mockStatic(Bukkit.class); when(Bukkit.getOnlinePlayers()).then((Answer>) invocation -> onlinePlayers); // Command 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 85830a653..67f01afb7 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 @@ -51,7 +51,7 @@ import world.bentobox.bentobox.util.Util; * */ @RunWith(PowerMockRunner.class) -@PrepareForTest({ Bukkit.class, BentoBox.class, Util.class }) +@PrepareForTest({ Bukkit.class, BentoBox.class, Util.class, IslandsManager.class }) public class AdminInfoCommandTest extends RanksManagerBeforeClassTest { @Mock @@ -84,6 +84,8 @@ public class AdminInfoCommandTest extends RanksManagerBeforeClassTest { public void setUp() throws Exception { super.setUp(); + PowerMockito.mockStatic(IslandsManager.class, Mockito.RETURNS_MOCKS); + // IWM when(plugin.getIWM()).thenReturn(iwm); 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 ef9b8cf9c..8fb85183f 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 @@ -87,6 +87,7 @@ public class AdminRegisterCommandTest { */ @Before public void setUp() throws Exception { + PowerMockito.mockStatic(Bukkit.class, Mockito.RETURNS_MOCKS); // Set up plugin BentoBox plugin = mock(BentoBox.class); Whitebox.setInternalState(BentoBox.class, "instance", plugin); @@ -145,7 +146,6 @@ public class AdminRegisterCommandTest { // Server & Scheduler BukkitScheduler sch = mock(BukkitScheduler.class); - PowerMockito.mockStatic(Bukkit.class); when(Bukkit.getScheduler()).thenReturn(sch); // Locales 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 7e1260d6a..4fda23321 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 @@ -81,6 +81,7 @@ public class AdminResetFlagsCommandTest { */ @Before public void setUp() throws Exception { + PowerMockito.mockStatic(Bukkit.class, Mockito.RETURNS_MOCKS); // Set up plugin BentoBox plugin = mock(BentoBox.class); Whitebox.setInternalState(BentoBox.class, "instance", plugin); @@ -129,7 +130,6 @@ public class AdminResetFlagsCommandTest { // Server & Scheduler BukkitScheduler sch = mock(BukkitScheduler.class); - PowerMockito.mockStatic(Bukkit.class); when(Bukkit.getScheduler()).thenReturn(sch); 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 c22fc6c60..007bd91d7 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 @@ -42,7 +42,6 @@ import org.powermock.modules.junit4.PowerMockRunner; import world.bentobox.bentobox.BentoBox; import world.bentobox.bentobox.Settings; import world.bentobox.bentobox.api.commands.CompositeCommand; -import world.bentobox.bentobox.api.flags.Flag.Mode; import world.bentobox.bentobox.api.localization.TextVariables; import world.bentobox.bentobox.api.user.User; import world.bentobox.bentobox.database.objects.Island; @@ -144,7 +143,6 @@ public class AdminSettingsCommandTest extends RanksManagerBeforeClassTest { when(plugin.getIWM()).thenReturn(iwm); // Players manager when(plugin.getPlayers()).thenReturn(pm); - when(pm.getFlagsDisplayMode(any())).thenReturn(Mode.BASIC); //Island Manager when(plugin.getIslands()).thenReturn(im); // Island - player has island @@ -155,6 +153,7 @@ public class AdminSettingsCommandTest extends RanksManagerBeforeClassTest { PowerMockito.mockStatic(Util.class); when(Util.getUUID(anyString())).thenReturn(uuid); when(Util.tabLimit(any(), any())).thenCallRealMethod(); + when(Util.findFirstMatchingEnum(any(), any())).thenCallRealMethod(); // Settings Settings settings = new Settings(); @@ -267,16 +266,6 @@ public class AdminSettingsCommandTest extends RanksManagerBeforeClassTest { verify(user).sendMessage("general.errors.use-in-game"); } - /** - * Test method for {@link world.bentobox.bentobox.api.commands.admin.AdminSettingsCommand#execute(world.bentobox.bentobox.api.user.User, java.lang.String, java.util.List)}. - */ - @Test - public void testExecuteUserStringListOfStringNoArgs() { - assertTrue(asc.execute(user, "", Collections.emptyList())); - verify(pm).setFlagsDisplayMode(user.getUniqueId(), Mode.EXPERT); - // Open panel - } - /** * Test method for {@link world.bentobox.bentobox.api.commands.admin.AdminSettingsCommand#execute(world.bentobox.bentobox.api.user.User, java.lang.String, java.util.List)}. */ 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 86ea63f79..eebbd150c 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 @@ -20,6 +20,8 @@ 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 org.powermock.reflect.Whitebox; @@ -53,6 +55,7 @@ public class AdminSwitchCommandTest { */ @Before public void setUp() throws Exception { + PowerMockito.mockStatic(Bukkit.class, Mockito.RETURNS_MOCKS); // Set up plugin BentoBox plugin = mock(BentoBox.class); Whitebox.setInternalState(BentoBox.class, "instance", plugin); 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 a8027c5bd..745ad1865 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 @@ -82,6 +82,7 @@ public class AdminTeleportCommandTest { */ @Before public void setUp() throws Exception { + PowerMockito.mockStatic(Bukkit.class, Mockito.RETURNS_MOCKS); // Set up plugin BentoBox plugin = mock(BentoBox.class); Whitebox.setInternalState(BentoBox.class, "instance", plugin); @@ -142,7 +143,6 @@ public class AdminTeleportCommandTest { // Server & Scheduler BukkitScheduler sch = mock(BukkitScheduler.class); - PowerMockito.mockStatic(Bukkit.class, Mockito.RETURNS_MOCKS); when(Bukkit.getScheduler()).thenReturn(sch); // Locales diff --git a/src/test/java/world/bentobox/bentobox/api/commands/admin/AdminUnregisterCommandTest.java b/src/test/java/world/bentobox/bentobox/api/commands/admin/AdminUnregisterCommandTest.java index 8f4aaeb75..8b8c536d4 100644 --- a/src/test/java/world/bentobox/bentobox/api/commands/admin/AdminUnregisterCommandTest.java +++ b/src/test/java/world/bentobox/bentobox/api/commands/admin/AdminUnregisterCommandTest.java @@ -29,6 +29,7 @@ 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; @@ -54,7 +55,7 @@ import world.bentobox.bentobox.util.Util; * */ @RunWith(PowerMockRunner.class) -@PrepareForTest({ Bukkit.class, BentoBox.class }) +@PrepareForTest({ Bukkit.class, BentoBox.class, IslandsManager.class }) public class AdminUnregisterCommandTest { private UUID uuid = UUID.randomUUID(); @@ -83,6 +84,9 @@ public class AdminUnregisterCommandTest { */ @Before public void setUp() throws Exception { + PowerMockito.mockStatic(Bukkit.class, Mockito.RETURNS_MOCKS); + + PowerMockito.mockStatic(IslandsManager.class, Mockito.RETURNS_MOCKS); // Set up plugin BentoBox plugin = mock(BentoBox.class); Whitebox.setInternalState(BentoBox.class, "instance", plugin); @@ -135,7 +139,6 @@ public class AdminUnregisterCommandTest { // Server & Scheduler BukkitScheduler sch = mock(BukkitScheduler.class); - PowerMockito.mockStatic(Bukkit.class); when(Bukkit.getScheduler()).thenReturn(sch); // Locales diff --git a/src/test/java/world/bentobox/bentobox/api/commands/admin/purge/AdminPurgeCommandTest.java b/src/test/java/world/bentobox/bentobox/api/commands/admin/purge/AdminPurgeCommandTest.java index f06e3c69d..c75191fb0 100644 --- a/src/test/java/world/bentobox/bentobox/api/commands/admin/purge/AdminPurgeCommandTest.java +++ b/src/test/java/world/bentobox/bentobox/api/commands/admin/purge/AdminPurgeCommandTest.java @@ -11,14 +11,14 @@ import static org.mockito.Mockito.verify; import static org.mockito.Mockito.when; import java.util.Collections; -import java.util.HashMap; -import java.util.Map; import java.util.Optional; import java.util.UUID; import org.bukkit.Bukkit; +import org.bukkit.Location; import org.bukkit.OfflinePlayer; import org.bukkit.World; +import org.bukkit.util.Vector; import org.eclipse.jdt.annotation.NonNull; import org.junit.After; import org.junit.Before; @@ -31,6 +31,8 @@ import org.powermock.core.classloader.annotations.PrepareForTest; import org.powermock.modules.junit4.PowerMockRunner; import org.powermock.reflect.Whitebox; +import com.google.common.collect.ImmutableSet; + import world.bentobox.bentobox.BentoBox; import world.bentobox.bentobox.api.addons.Addon; import world.bentobox.bentobox.api.commands.CompositeCommand; @@ -41,7 +43,6 @@ import world.bentobox.bentobox.managers.CommandsManager; import world.bentobox.bentobox.managers.IslandWorldManager; import world.bentobox.bentobox.managers.IslandsManager; import world.bentobox.bentobox.managers.PlayersManager; -import world.bentobox.bentobox.managers.RanksManager; /** * @author tastybento @@ -69,11 +70,15 @@ public class AdminPurgeCommandTest { private World world; @Mock private PlayersManager pm; + @Mock + private @NonNull Location location; /** */ @Before public void setUp() throws Exception { + PowerMockito.mockStatic(Bukkit.class, Mockito.RETURNS_MOCKS); + // Set up plugin Whitebox.setInternalState(BentoBox.class, "instance", plugin); @@ -97,6 +102,8 @@ public class AdminPurgeCommandTest { // Island when(island.isOwned()).thenReturn(true); // Default owned + when(location.toVector()).thenReturn(new Vector(1, 2, 3)); + when(island.getCenter()).thenReturn(location); // Player manager when(plugin.getPlayers()).thenReturn(pm); @@ -237,11 +244,15 @@ public class AdminPurgeCommandTest { when(island.getPurgeProtected()).thenReturn(false); when(island.getWorld()).thenReturn(world); when(island.getOwner()).thenReturn(UUID.randomUUID()); - Map team = new HashMap<>(); - team.put(UUID.randomUUID(), RanksManager.OWNER_RANK); - team.put(UUID.randomUUID(), RanksManager.MEMBER_RANK); - when(island.getMembers()).thenReturn(team); + when(island.getMemberSet()).thenReturn(ImmutableSet.of(UUID.randomUUID(), UUID.randomUUID())); when(im.getIslands()).thenReturn(Collections.singleton(island)); + + // All players are up to date + PowerMockito.mockStatic(Bukkit.class); + OfflinePlayer op = mock(OfflinePlayer.class); + when(op.getLastPlayed()).thenReturn(System.currentTimeMillis()); + when(Bukkit.getOfflinePlayer(any(UUID.class))).thenReturn(op); + assertTrue(apc.execute(user, "", Collections.singletonList("10"))); verify(user).sendMessage(eq("commands.admin.purge.purgable-islands"), eq("[number]"), eq("0")); } @@ -254,9 +265,7 @@ public class AdminPurgeCommandTest { when(island.getPurgeProtected()).thenReturn(false); when(island.getWorld()).thenReturn(world); when(island.getOwner()).thenReturn(UUID.randomUUID()); - Map team = new HashMap<>(); - team.put(UUID.randomUUID(), RanksManager.OWNER_RANK); - when(island.getMembers()).thenReturn(team); + when(island.getMemberSet()).thenReturn(ImmutableSet.of(UUID.randomUUID())); when(im.getIslands()).thenReturn(Collections.singleton(island)); PowerMockito.mockStatic(Bukkit.class); OfflinePlayer op = mock(OfflinePlayer.class); @@ -275,11 +284,8 @@ public class AdminPurgeCommandTest { when(island.getWorld()).thenReturn(world); when(island.getOwner()).thenReturn(UUID.randomUUID()); when(island.isOwned()).thenReturn(true); - Map team = new HashMap<>(); - team.put(UUID.randomUUID(), RanksManager.OWNER_RANK); - when(island.getMembers()).thenReturn(team); + when(island.getMemberSet()).thenReturn(ImmutableSet.of(UUID.randomUUID())); when(im.getIslands()).thenReturn(Collections.singleton(island)); - PowerMockito.mockStatic(Bukkit.class); OfflinePlayer op = mock(OfflinePlayer.class); when(op.getLastPlayed()).thenReturn(0L); when(Bukkit.getOfflinePlayer(any(UUID.class))).thenReturn(op); @@ -300,7 +306,7 @@ public class AdminPurgeCommandTest { testExecuteUserStringListOfStringIslandsFound(); assertTrue(apc.execute(user, "", Collections.singletonList("confirm"))); verify(im).deleteIsland(eq(island), eq(true), eq(null)); - verify(plugin, times(2)).log(any()); + verify(plugin, times(4)).log(any()); verify(user).sendMessage(eq("commands.admin.purge.see-console-for-status"), eq("[label]"), eq("bsb")); } diff --git a/src/test/java/world/bentobox/bentobox/api/commands/admin/range/AdminRangeCommandTest.java b/src/test/java/world/bentobox/bentobox/api/commands/admin/range/AdminRangeCommandTest.java index 767c28f15..1e001f1de 100644 --- a/src/test/java/world/bentobox/bentobox/api/commands/admin/range/AdminRangeCommandTest.java +++ b/src/test/java/world/bentobox/bentobox/api/commands/admin/range/AdminRangeCommandTest.java @@ -45,6 +45,7 @@ public class AdminRangeCommandTest { */ @Before public void setUp() throws Exception { + PowerMockito.mockStatic(Bukkit.class, Mockito.RETURNS_MOCKS); // Set up plugin BentoBox plugin = mock(BentoBox.class); Whitebox.setInternalState(BentoBox.class, "instance", plugin); @@ -94,7 +95,6 @@ public class AdminRangeCommandTest { // Server & Scheduler BukkitScheduler sch = mock(BukkitScheduler.class); - PowerMockito.mockStatic(Bukkit.class); when(Bukkit.getScheduler()).thenReturn(sch); // Locales diff --git a/src/test/java/world/bentobox/bentobox/api/commands/admin/range/AdminRangeDisplayCommandTest.java b/src/test/java/world/bentobox/bentobox/api/commands/admin/range/AdminRangeDisplayCommandTest.java index 60d57e821..63b60dcb1 100644 --- a/src/test/java/world/bentobox/bentobox/api/commands/admin/range/AdminRangeDisplayCommandTest.java +++ b/src/test/java/world/bentobox/bentobox/api/commands/admin/range/AdminRangeDisplayCommandTest.java @@ -1,6 +1,10 @@ package world.bentobox.bentobox.api.commands.admin.range; +import static org.mockito.ArgumentMatchers.any; +import static org.mockito.ArgumentMatchers.eq; +import static org.mockito.Mockito.framework; import static org.mockito.Mockito.mock; +import static org.mockito.Mockito.verify; import static org.mockito.Mockito.when; import java.util.ArrayList; @@ -46,6 +50,7 @@ public class AdminRangeDisplayCommandTest { */ @Before public void setUp() throws Exception { + PowerMockito.mockStatic(Bukkit.class, Mockito.RETURNS_MOCKS); // Set up plugin BentoBox plugin = mock(BentoBox.class); Whitebox.setInternalState(BentoBox.class, "instance", plugin); @@ -76,37 +81,36 @@ public class AdminRangeDisplayCommandTest { // Island World Manager IslandWorldManager iwm = mock(IslandWorldManager.class); - when(iwm.getFriendlyName(Mockito.any())).thenReturn("BSkyBlock"); + when(iwm.getFriendlyName(any())).thenReturn("BSkyBlock"); when(plugin.getIWM()).thenReturn(iwm); // Player has island to begin with IslandsManager im = mock(IslandsManager.class); - when(im.hasIsland(Mockito.any(), Mockito.any(UUID.class))).thenReturn(true); - when(im.hasIsland(Mockito.any(), Mockito.any(User.class))).thenReturn(true); + when(im.hasIsland(any(), any(UUID.class))).thenReturn(true); + when(im.hasIsland(any(), any(User.class))).thenReturn(true); when(plugin.getIslands()).thenReturn(im); // Has team PlayersManager pm = mock(PlayersManager.class); - when(im.inTeam(Mockito.any(), Mockito.eq(uuid))).thenReturn(true); + when(im.inTeam(any(), eq(uuid))).thenReturn(true); when(plugin.getPlayers()).thenReturn(pm); // Server & Scheduler BukkitScheduler sch = mock(BukkitScheduler.class); - PowerMockito.mockStatic(Bukkit.class); when(Bukkit.getScheduler()).thenReturn(sch); // Locales LocalesManager lm = mock(LocalesManager.class); Answer answer = invocation -> invocation.getArgument(1, String.class); - when(lm.get(Mockito.any(), Mockito.any())).thenAnswer(answer); + when(lm.get(any(), any())).thenAnswer(answer); when(plugin.getLocalesManager()).thenReturn(lm); } @After public void tearDown() { User.clearUsers(); - Mockito.framework().clearInlineMocks(); + framework().clearInlineMocks(); } /** @@ -118,12 +122,12 @@ public class AdminRangeDisplayCommandTest { AdminRangeDisplayCommand ardc = new AdminRangeDisplayCommand(ac); ardc.execute(user, "display", new ArrayList<>()); // Show display - Mockito.verify(user).sendMessage("commands.admin.range.display.showing"); - Mockito.verify(user).sendMessage("commands.admin.range.display.hint"); + verify(user).sendMessage("commands.admin.range.display.showing"); + verify(user).sendMessage("commands.admin.range.display.hint"); // Run command again ardc.execute(user, "display", new ArrayList<>()); // Remove - Mockito.verify(user).sendMessage("commands.admin.range.display.hiding"); + verify(user).sendMessage("commands.admin.range.display.hiding"); } /** @@ -135,13 +139,13 @@ public class AdminRangeDisplayCommandTest { AdminRangeDisplayCommand ardc = new AdminRangeDisplayCommand(ac); ardc.execute(user, "show", new ArrayList<>()); // Show display - Mockito.verify(user).sendMessage("commands.admin.range.display.showing"); - Mockito.verify(user).sendMessage("commands.admin.range.display.hint"); + verify(user).sendMessage("commands.admin.range.display.showing"); + verify(user).sendMessage("commands.admin.range.display.hint"); // Run command again ardc.execute(user, "show", new ArrayList<>()); - Mockito.verify(user).sendMessage("commands.admin.range.display.already-on"); + verify(user).sendMessage("commands.admin.range.display.already-on"); ardc.execute(user, "hide", new ArrayList<>()); - Mockito.verify(user).sendMessage("commands.admin.range.display.hiding"); + verify(user).sendMessage("commands.admin.range.display.hiding"); } /** @@ -152,7 +156,7 @@ public class AdminRangeDisplayCommandTest { public void testExecutePlayeHideArgs() { AdminRangeDisplayCommand ardc = new AdminRangeDisplayCommand(ac); ardc.execute(user, "hide", new ArrayList<>()); - Mockito.verify(user).sendMessage("commands.admin.range.display.already-off"); + verify(user).sendMessage("commands.admin.range.display.already-off"); } } diff --git a/src/test/java/world/bentobox/bentobox/api/commands/admin/range/AdminRangeResetCommandTest.java b/src/test/java/world/bentobox/bentobox/api/commands/admin/range/AdminRangeResetCommandTest.java index 71eea3e04..9cc92d44e 100644 --- a/src/test/java/world/bentobox/bentobox/api/commands/admin/range/AdminRangeResetCommandTest.java +++ b/src/test/java/world/bentobox/bentobox/api/commands/admin/range/AdminRangeResetCommandTest.java @@ -61,6 +61,8 @@ public class AdminRangeResetCommandTest { */ @Before public void setUp() throws Exception { + PowerMockito.mockStatic(Bukkit.class, Mockito.RETURNS_MOCKS); + // Set up plugin BentoBox plugin = mock(BentoBox.class); Whitebox.setInternalState(BentoBox.class, "instance", plugin); @@ -112,7 +114,6 @@ public class AdminRangeResetCommandTest { // Server & Scheduler BukkitScheduler sch = mock(BukkitScheduler.class); - PowerMockito.mockStatic(Bukkit.class); when(Bukkit.getScheduler()).thenReturn(sch); when(Bukkit.getPluginManager()).thenReturn(pim); diff --git a/src/test/java/world/bentobox/bentobox/api/commands/admin/range/AdminRangeSetCommandTest.java b/src/test/java/world/bentobox/bentobox/api/commands/admin/range/AdminRangeSetCommandTest.java index f7c3b940a..99d144034 100644 --- a/src/test/java/world/bentobox/bentobox/api/commands/admin/range/AdminRangeSetCommandTest.java +++ b/src/test/java/world/bentobox/bentobox/api/commands/admin/range/AdminRangeSetCommandTest.java @@ -71,6 +71,7 @@ public class AdminRangeSetCommandTest { */ @Before public void setUp() throws Exception { + PowerMockito.mockStatic(Bukkit.class, Mockito.RETURNS_MOCKS); // Set up plugin BentoBox plugin = mock(BentoBox.class); Whitebox.setInternalState(BentoBox.class, "instance", plugin); @@ -126,7 +127,6 @@ public class AdminRangeSetCommandTest { // Server & Scheduler BukkitScheduler sch = mock(BukkitScheduler.class); - PowerMockito.mockStatic(Bukkit.class); when(Bukkit.getScheduler()).thenReturn(sch); when(Bukkit.getPluginManager()).thenReturn(pim); diff --git a/src/test/java/world/bentobox/bentobox/api/commands/admin/team/AdminTeamAddCommandTest.java b/src/test/java/world/bentobox/bentobox/api/commands/admin/team/AdminTeamAddCommandTest.java index 8a559854d..694777435 100644 --- a/src/test/java/world/bentobox/bentobox/api/commands/admin/team/AdminTeamAddCommandTest.java +++ b/src/test/java/world/bentobox/bentobox/api/commands/admin/team/AdminTeamAddCommandTest.java @@ -42,6 +42,7 @@ import world.bentobox.bentobox.managers.CommandsManager; import world.bentobox.bentobox.managers.IslandWorldManager; import world.bentobox.bentobox.managers.IslandsManager; import world.bentobox.bentobox.managers.LocalesManager; +import world.bentobox.bentobox.managers.PlaceholdersManager; import world.bentobox.bentobox.managers.PlayersManager; import world.bentobox.bentobox.util.Util; @@ -62,11 +63,15 @@ public class AdminTeamAddCommandTest { private UUID notUUID; @Mock private Island island; + @Mock + private PlaceholdersManager phm; /** */ @Before public void setUp() throws Exception { + PowerMockito.mockStatic(Bukkit.class, Mockito.RETURNS_MOCKS); + // Set up plugin plugin = mock(BentoBox.class); Whitebox.setInternalState(BentoBox.class, "instance", plugin); @@ -112,7 +117,6 @@ public class AdminTeamAddCommandTest { // Server & Scheduler BukkitScheduler sch = mock(BukkitScheduler.class); - PowerMockito.mockStatic(Bukkit.class); when(Bukkit.getScheduler()).thenReturn(sch); // Plugin Manager PluginManager pim = mock(PluginManager.class); @@ -122,6 +126,8 @@ public class AdminTeamAddCommandTest { LocalesManager lm = mock(LocalesManager.class); when(lm.get(any(), any())).thenReturn("mock translation"); when(plugin.getLocalesManager()).thenReturn(lm); + when(plugin.getPlaceholdersManager()).thenReturn(phm); + when(phm.replacePlaceholders(any(), any())).thenReturn("mock translation"); // Island World Manager IslandWorldManager iwm = mock(IslandWorldManager.class); @@ -317,7 +323,7 @@ public class AdminTeamAddCommandTest { // Success assertTrue(itl.execute(user, itl.getLabel(), Arrays.asList(name))); verify(im).setJoinTeam(eq(island), eq(notUUID)); - verify(user).sendMessage("commands.admin.team.add.success", TextVariables.NAME, name[1], "[owner]", name[0]); + verify(user).sendMessage("commands.admin.team.add.success", TextVariables.NAME, "", "[owner]", ""); } } diff --git a/src/test/java/world/bentobox/bentobox/api/commands/admin/team/AdminTeamDisbandCommandTest.java b/src/test/java/world/bentobox/bentobox/api/commands/admin/team/AdminTeamDisbandCommandTest.java index 5166a608f..5ec46b4e6 100644 --- a/src/test/java/world/bentobox/bentobox/api/commands/admin/team/AdminTeamDisbandCommandTest.java +++ b/src/test/java/world/bentobox/bentobox/api/commands/admin/team/AdminTeamDisbandCommandTest.java @@ -89,6 +89,8 @@ public class AdminTeamDisbandCommandTest { */ @Before public void setUp() throws Exception { + PowerMockito.mockStatic(Bukkit.class, Mockito.RETURNS_MOCKS); + // Set up plugin BentoBox plugin = mock(BentoBox.class); Whitebox.setInternalState(BentoBox.class, "instance", plugin); @@ -143,7 +145,6 @@ public class AdminTeamDisbandCommandTest { // Server & Scheduler BukkitScheduler sch = mock(BukkitScheduler.class); - PowerMockito.mockStatic(Bukkit.class); when(Bukkit.getScheduler()).thenReturn(sch); when(Bukkit.getPluginManager()).thenReturn(mock(PluginManager.class)); diff --git a/src/test/java/world/bentobox/bentobox/api/commands/admin/team/AdminTeamKickCommandTest.java b/src/test/java/world/bentobox/bentobox/api/commands/admin/team/AdminTeamKickCommandTest.java index 422e6166f..d860d0e18 100644 --- a/src/test/java/world/bentobox/bentobox/api/commands/admin/team/AdminTeamKickCommandTest.java +++ b/src/test/java/world/bentobox/bentobox/api/commands/admin/team/AdminTeamKickCommandTest.java @@ -73,6 +73,8 @@ public class AdminTeamKickCommandTest { */ @Before public void setUp() throws Exception { + PowerMockito.mockStatic(Bukkit.class); + when(Bukkit.getBukkitVersion()).thenReturn(""); // Set up plugin BentoBox plugin = mock(BentoBox.class); Whitebox.setInternalState(BentoBox.class, "instance", plugin); @@ -118,7 +120,6 @@ public class AdminTeamKickCommandTest { // Server & Scheduler BukkitScheduler sch = mock(BukkitScheduler.class); - PowerMockito.mockStatic(Bukkit.class); when(Bukkit.getScheduler()).thenReturn(sch); when(Bukkit.getPluginManager()).thenReturn(pim); diff --git a/src/test/java/world/bentobox/bentobox/api/commands/admin/team/AdminTeamSetownerCommandTest.java b/src/test/java/world/bentobox/bentobox/api/commands/admin/team/AdminTeamSetownerCommandTest.java index 86ae24bac..abd088128 100644 --- a/src/test/java/world/bentobox/bentobox/api/commands/admin/team/AdminTeamSetownerCommandTest.java +++ b/src/test/java/world/bentobox/bentobox/api/commands/admin/team/AdminTeamSetownerCommandTest.java @@ -79,6 +79,7 @@ public class AdminTeamSetownerCommandTest { */ @Before public void setUp() throws Exception { + PowerMockito.mockStatic(Bukkit.class, Mockito.RETURNS_MOCKS); // Set up plugin BentoBox plugin = mock(BentoBox.class); Whitebox.setInternalState(BentoBox.class, "instance", plugin); @@ -145,7 +146,6 @@ public class AdminTeamSetownerCommandTest { // Server & Scheduler BukkitScheduler sch = mock(BukkitScheduler.class); - PowerMockito.mockStatic(Bukkit.class); when(Bukkit.getScheduler()).thenReturn(sch); // Plugin Manager diff --git a/src/test/java/world/bentobox/bentobox/api/commands/island/DefaultPlayerCommandTest.java b/src/test/java/world/bentobox/bentobox/api/commands/island/DefaultPlayerCommandTest.java index 385da6c85..d703ef44a 100644 --- a/src/test/java/world/bentobox/bentobox/api/commands/island/DefaultPlayerCommandTest.java +++ b/src/test/java/world/bentobox/bentobox/api/commands/island/DefaultPlayerCommandTest.java @@ -39,7 +39,7 @@ import world.bentobox.bentobox.managers.RanksManagerBeforeClassTest; * */ @RunWith(PowerMockRunner.class) -@PrepareForTest({ Bukkit.class, BentoBox.class }) +@PrepareForTest({ Bukkit.class, BentoBox.class, IslandsManager.class }) public class DefaultPlayerCommandTest extends RanksManagerBeforeClassTest { @Mock @@ -68,6 +68,7 @@ public class DefaultPlayerCommandTest extends RanksManagerBeforeClassTest { @Before public void setUp() throws Exception { super.setUp(); + PowerMockito.mockStatic(IslandsManager.class, Mockito.RETURNS_MOCKS); // User when(user.getUniqueId()).thenReturn(UUID.randomUUID()); diff --git a/src/test/java/world/bentobox/bentobox/api/commands/island/IslandBanCommandTest.java b/src/test/java/world/bentobox/bentobox/api/commands/island/IslandBanCommandTest.java index e7fe5e71c..4ea40b3b6 100644 --- a/src/test/java/world/bentobox/bentobox/api/commands/island/IslandBanCommandTest.java +++ b/src/test/java/world/bentobox/bentobox/api/commands/island/IslandBanCommandTest.java @@ -33,7 +33,6 @@ import org.junit.runner.RunWith; import org.mockito.Mock; import org.mockito.Mockito; import org.mockito.stubbing.Answer; -import org.powermock.api.mockito.PowerMockito; import org.powermock.core.classloader.annotations.PrepareForTest; import org.powermock.modules.junit4.PowerMockRunner; @@ -120,7 +119,6 @@ public class IslandBanCommandTest extends RanksManagerBeforeClassTest { // Server & Scheduler BukkitScheduler sch = mock(BukkitScheduler.class); - PowerMockito.mockStatic(Bukkit.class); when(Bukkit.getScheduler()).thenReturn(sch); // Island Banned list initialization @@ -351,7 +349,6 @@ public class IslandBanCommandTest extends RanksManagerBeforeClassTest { .getOrDefault(invocation.getArgument(0, UUID.class), "tastybento")); // Return a set of online players - PowerMockito.mockStatic(Bukkit.class); when(Bukkit.getOnlinePlayers()).then((Answer>) invocation -> onlinePlayers); // Set up the user diff --git a/src/test/java/world/bentobox/bentobox/api/commands/island/IslandCreateCommandTest.java b/src/test/java/world/bentobox/bentobox/api/commands/island/IslandCreateCommandTest.java index d1f44e7fb..02da07fa3 100644 --- a/src/test/java/world/bentobox/bentobox/api/commands/island/IslandCreateCommandTest.java +++ b/src/test/java/world/bentobox/bentobox/api/commands/island/IslandCreateCommandTest.java @@ -92,6 +92,7 @@ public class IslandCreateCommandTest { */ @Before public void setUp() throws Exception { + PowerMockito.mockStatic(Bukkit.class, Mockito.RETURNS_MOCKS); // Set up plugin Whitebox.setInternalState(BentoBox.class, "instance", plugin); @@ -147,7 +148,6 @@ public class IslandCreateCommandTest { // Server & Scheduler BukkitScheduler sch = mock(BukkitScheduler.class); - PowerMockito.mockStatic(Bukkit.class); when(Bukkit.getScheduler()).thenReturn(sch); // IWM diff --git a/src/test/java/world/bentobox/bentobox/api/commands/island/IslandGoCommandTest.java b/src/test/java/world/bentobox/bentobox/api/commands/island/IslandGoCommandTest.java index cf55bd3d5..da5b15bf9 100644 --- a/src/test/java/world/bentobox/bentobox/api/commands/island/IslandGoCommandTest.java +++ b/src/test/java/world/bentobox/bentobox/api/commands/island/IslandGoCommandTest.java @@ -97,6 +97,7 @@ public class IslandGoCommandTest { */ @Before public void setUp() throws Exception { + PowerMockito.mockStatic(Bukkit.class, Mockito.RETURNS_MOCKS); // Set up plugin BentoBox plugin = mock(BentoBox.class); Whitebox.setInternalState(BentoBox.class, "instance", plugin); @@ -138,7 +139,6 @@ public class IslandGoCommandTest { // Server & Scheduler BukkitScheduler sch = mock(BukkitScheduler.class); - PowerMockito.mockStatic(Bukkit.class); when(Bukkit.getScheduler()).thenReturn(sch); when(sch.runTaskLater(any(), any(Runnable.class), any(Long.class))).thenReturn(task); // Event register @@ -160,6 +160,7 @@ public class IslandGoCommandTest { when(iwm.getAddon(any())).thenReturn(Optional.empty()); PowerMockito.mockStatic(Util.class); + when(Util.findFirstMatchingEnum(any(), any())).thenCallRealMethod(); // Locales LocalesManager lm = mock(LocalesManager.class); diff --git a/src/test/java/world/bentobox/bentobox/api/commands/island/IslandHomesCommandTest.java b/src/test/java/world/bentobox/bentobox/api/commands/island/IslandHomesCommandTest.java index b551c3ff5..a5702fcb9 100644 --- a/src/test/java/world/bentobox/bentobox/api/commands/island/IslandHomesCommandTest.java +++ b/src/test/java/world/bentobox/bentobox/api/commands/island/IslandHomesCommandTest.java @@ -74,6 +74,7 @@ public class IslandHomesCommandTest { */ @Before public void setUp() throws Exception { + PowerMockito.mockStatic(Bukkit.class, Mockito.RETURNS_MOCKS); // Set up plugin BentoBox plugin = mock(BentoBox.class); Whitebox.setInternalState(BentoBox.class, "instance", plugin); @@ -114,7 +115,6 @@ public class IslandHomesCommandTest { // Server & Scheduler BukkitScheduler sch = mock(BukkitScheduler.class); - PowerMockito.mockStatic(Bukkit.class); when(Bukkit.getScheduler()).thenReturn(sch); // Island diff --git a/src/test/java/world/bentobox/bentobox/api/commands/island/IslandInfoCommandTest.java b/src/test/java/world/bentobox/bentobox/api/commands/island/IslandInfoCommandTest.java index 964d9fbea..1a3c383c4 100644 --- a/src/test/java/world/bentobox/bentobox/api/commands/island/IslandInfoCommandTest.java +++ b/src/test/java/world/bentobox/bentobox/api/commands/island/IslandInfoCommandTest.java @@ -51,7 +51,7 @@ import world.bentobox.bentobox.util.Util; * */ @RunWith(PowerMockRunner.class) -@PrepareForTest({Bukkit.class, BentoBox.class, Util.class}) +@PrepareForTest({ Bukkit.class, BentoBox.class, Util.class, IslandsManager.class }) public class IslandInfoCommandTest extends RanksManagerBeforeClassTest { @Mock @@ -84,6 +84,8 @@ public class IslandInfoCommandTest extends RanksManagerBeforeClassTest { public void setUp() throws Exception { super.setUp(); + PowerMockito.mockStatic(IslandsManager.class, Mockito.RETURNS_MOCKS); + // IWM when(plugin.getIWM()).thenReturn(iwm); diff --git a/src/test/java/world/bentobox/bentobox/api/commands/island/IslandResetCommandTest.java b/src/test/java/world/bentobox/bentobox/api/commands/island/IslandResetCommandTest.java index da1505cd3..0ba16a1fb 100644 --- a/src/test/java/world/bentobox/bentobox/api/commands/island/IslandResetCommandTest.java +++ b/src/test/java/world/bentobox/bentobox/api/commands/island/IslandResetCommandTest.java @@ -62,7 +62,7 @@ import world.bentobox.bentobox.managers.island.NewIsland; * */ @RunWith(PowerMockRunner.class) -@PrepareForTest({ Bukkit.class, BentoBox.class, NewIsland.class }) +@PrepareForTest({ Bukkit.class, BentoBox.class, NewIsland.class, IslandsManager.class }) public class IslandResetCommandTest { @Mock @@ -97,6 +97,9 @@ public class IslandResetCommandTest { */ @Before public void setUp() throws Exception { + PowerMockito.mockStatic(Bukkit.class, Mockito.RETURNS_MOCKS); + + PowerMockito.mockStatic(IslandsManager.class, Mockito.RETURNS_MOCKS); // Set up plugin BentoBox plugin = mock(BentoBox.class); Whitebox.setInternalState(BentoBox.class, "instance", plugin); @@ -145,7 +148,6 @@ public class IslandResetCommandTest { BukkitTask task = mock(BukkitTask.class); when(sch.runTaskLater(any(), any(Runnable.class), any(Long.class))).thenReturn(task); - PowerMockito.mockStatic(Bukkit.class); when(Bukkit.getScheduler()).thenReturn(sch); // Event when(Bukkit.getPluginManager()).thenReturn(pim); diff --git a/src/test/java/world/bentobox/bentobox/api/commands/island/IslandSethomeCommandTest.java b/src/test/java/world/bentobox/bentobox/api/commands/island/IslandSethomeCommandTest.java index cf4624dc3..9dd2e46ab 100644 --- a/src/test/java/world/bentobox/bentobox/api/commands/island/IslandSethomeCommandTest.java +++ b/src/test/java/world/bentobox/bentobox/api/commands/island/IslandSethomeCommandTest.java @@ -114,7 +114,7 @@ public class IslandSethomeCommandTest { // Server & Scheduler BukkitScheduler sch = mock(BukkitScheduler.class); - PowerMockito.mockStatic(Bukkit.class); + PowerMockito.mockStatic(Bukkit.class, Mockito.RETURNS_MOCKS); when(Bukkit.getScheduler()).thenReturn(sch); // Island Banned list initialization diff --git a/src/test/java/world/bentobox/bentobox/api/commands/island/IslandSetnameCommandTest.java b/src/test/java/world/bentobox/bentobox/api/commands/island/IslandSetnameCommandTest.java index 890c4cde9..60fb0dd5b 100644 --- a/src/test/java/world/bentobox/bentobox/api/commands/island/IslandSetnameCommandTest.java +++ b/src/test/java/world/bentobox/bentobox/api/commands/island/IslandSetnameCommandTest.java @@ -9,7 +9,6 @@ import static org.junit.Assert.assertTrue; import static org.mockito.ArgumentMatchers.any; import static org.mockito.ArgumentMatchers.anyInt; import static org.mockito.ArgumentMatchers.anyString; -import static org.mockito.ArgumentMatchers.eq; import static org.mockito.Mockito.mock; import static org.mockito.Mockito.never; import static org.mockito.Mockito.times; @@ -227,29 +226,6 @@ public class IslandSetnameCommandTest { verify(user).sendMessage("commands.island.setname.name-too-long", TextVariables.NUMBER, "20"); } - /** - * Test method for {@link world.bentobox.bentobox.api.commands.island.IslandSetnameCommand#canExecute(world.bentobox.bentobox.api.user.User, java.lang.String, java.util.List)}. - */ - @Test - public void testIslandSetnameCommandNameNotUnique() { - settings.setNameUniqueness(true); - when(im.nameExists(eq(world), anyString())).thenReturn(true); - assertFalse(isc.canExecute(user, isc.getLabel(), List.of("name2"))); - verify(user).sendMessage("commands.island.setname.name-already-exists"); - } - - /** - * Test method for {@link world.bentobox.bentobox.api.commands.island.IslandSetnameCommand#canExecute(world.bentobox.bentobox.api.user.User, java.lang.String, java.util.List)}. - */ - @Test - public void testIslandSetnameCommandNameApplyColors() { - when(user.hasPermission(anyString())).thenReturn(true); - settings.setNameUniqueness(true); - when(im.nameExists(world, "name§b")).thenReturn(true); - assertFalse(isc.canExecute(user, isc.getLabel(), List.of("name&b"))); - verify(user).sendMessage("commands.island.setname.name-already-exists"); - } - /** * Test method for {@link world.bentobox.bentobox.api.commands.island.IslandSetnameCommand#canExecute(world.bentobox.bentobox.api.user.User, java.lang.String, java.util.List)}. */ diff --git a/src/test/java/world/bentobox/bentobox/api/commands/island/IslandSpawnCommandTest.java b/src/test/java/world/bentobox/bentobox/api/commands/island/IslandSpawnCommandTest.java index ec60c548c..417d6cc65 100644 --- a/src/test/java/world/bentobox/bentobox/api/commands/island/IslandSpawnCommandTest.java +++ b/src/test/java/world/bentobox/bentobox/api/commands/island/IslandSpawnCommandTest.java @@ -116,7 +116,7 @@ public class IslandSpawnCommandTest { // Server & Scheduler BukkitScheduler sch = mock(BukkitScheduler.class); - PowerMockito.mockStatic(Bukkit.class); + PowerMockito.mockStatic(Bukkit.class, Mockito.RETURNS_MOCKS); when(Bukkit.getScheduler()).thenReturn(sch); when(sch.runTaskLater(any(), any(Runnable.class), any(Long.class))).thenReturn(task); diff --git a/src/test/java/world/bentobox/bentobox/api/commands/island/IslandUnbanCommandTest.java b/src/test/java/world/bentobox/bentobox/api/commands/island/IslandUnbanCommandTest.java index 85d8db84c..c9451291a 100644 --- a/src/test/java/world/bentobox/bentobox/api/commands/island/IslandUnbanCommandTest.java +++ b/src/test/java/world/bentobox/bentobox/api/commands/island/IslandUnbanCommandTest.java @@ -106,7 +106,6 @@ public class IslandUnbanCommandTest extends RanksManagerBeforeClassTest { // Server & Scheduler BukkitScheduler sch = mock(BukkitScheduler.class); - PowerMockito.mockStatic(Bukkit.class); when(Bukkit.getScheduler()).thenReturn(sch); // Island Banned list initialization diff --git a/src/test/java/world/bentobox/bentobox/api/commands/island/team/IslandTeamCommandTest.java b/src/test/java/world/bentobox/bentobox/api/commands/island/team/IslandTeamCommandTest.java index b0f360d80..8537a1f7e 100644 --- a/src/test/java/world/bentobox/bentobox/api/commands/island/team/IslandTeamCommandTest.java +++ b/src/test/java/world/bentobox/bentobox/api/commands/island/team/IslandTeamCommandTest.java @@ -7,10 +7,13 @@ import static org.junit.Assert.assertTrue; import static org.mockito.ArgumentMatchers.any; import static org.mockito.ArgumentMatchers.anyInt; import static org.mockito.ArgumentMatchers.eq; +import static org.mockito.Mockito.atLeast; import static org.mockito.Mockito.mock; import static org.mockito.Mockito.verify; import static org.mockito.Mockito.when; +import java.beans.IntrospectionException; +import java.lang.reflect.InvocationTargetException; import java.util.Collections; import java.util.UUID; @@ -29,10 +32,11 @@ import org.powermock.modules.junit4.PowerMockRunner; import com.google.common.collect.ImmutableSet; import world.bentobox.bentobox.BentoBox; +import world.bentobox.bentobox.api.addons.GameModeAddon; import world.bentobox.bentobox.api.commands.CompositeCommand; -import world.bentobox.bentobox.api.commands.island.team.Invite.Type; import world.bentobox.bentobox.api.user.User; import world.bentobox.bentobox.database.objects.Island; +import world.bentobox.bentobox.database.objects.TeamInvite.Type; import world.bentobox.bentobox.managers.CommandsManager; import world.bentobox.bentobox.managers.IslandWorldManager; import world.bentobox.bentobox.managers.IslandsManager; @@ -74,6 +78,9 @@ public class IslandTeamCommandTest extends RanksManagerBeforeClassTest { @Mock private @Nullable Island island; + @Mock + private GameModeAddon addon; + /** */ @Before @@ -87,6 +94,7 @@ public class IslandTeamCommandTest extends RanksManagerBeforeClassTest { // Parent command when(ic.getPermissionPrefix()).thenReturn("bskyblock."); when(ic.getWorld()).thenReturn(world); + when(ic.getAddon()).thenReturn(addon); // user uuid = UUID.randomUUID(); @@ -171,11 +179,14 @@ public class IslandTeamCommandTest extends RanksManagerBeforeClassTest { /** * Test method for * {@link world.bentobox.bentobox.api.commands.island.team.IslandTeamCommand#addInvite(world.bentobox.bentobox.api.commands.island.team.Invite.Type, java.util.UUID, java.util.UUID)}. + * @throws IntrospectionException + * @throws InvocationTargetException + * @throws IllegalAccessException */ @Test - public void testAddInvite() { - tc.addInvite(Invite.Type.TEAM, uuid, invitee, island); - assertTrue(tc.isInvited(invitee)); + public void testAddInvite() throws IllegalAccessException, InvocationTargetException, IntrospectionException { + tc.addInvite(Type.TEAM, uuid, invitee, island); + verify(h, atLeast(1)).saveObject(any()); } /** @@ -193,8 +204,7 @@ public class IslandTeamCommandTest extends RanksManagerBeforeClassTest { */ @Test public void testGetInviter() { - tc.addInvite(Invite.Type.TEAM, uuid, invitee, island); - assertEquals(uuid, tc.getInviter(invitee)); + assertNull(tc.getInviter(invitee)); } /** @@ -213,12 +223,6 @@ public class IslandTeamCommandTest extends RanksManagerBeforeClassTest { @Test public void testGetInvite() { assertNull(tc.getInvite(invitee)); - tc.addInvite(Invite.Type.TEAM, uuid, invitee, island); - @Nullable - Invite invite = tc.getInvite(invitee); - assertEquals(invitee, invite.getInvitee()); - assertEquals(Type.TEAM, invite.getType()); - assertEquals(uuid, invite.getInviter()); } /** @@ -228,7 +232,7 @@ public class IslandTeamCommandTest extends RanksManagerBeforeClassTest { @Test public void testRemoveInvite() { assertNull(tc.getInvite(invitee)); - tc.addInvite(Invite.Type.TEAM, uuid, invitee, island); + tc.addInvite(Type.TEAM, uuid, invitee, island); tc.removeInvite(invitee); assertNull(tc.getInvite(invitee)); } diff --git a/src/test/java/world/bentobox/bentobox/api/commands/island/team/IslandTeamCoopCommandTest.java b/src/test/java/world/bentobox/bentobox/api/commands/island/team/IslandTeamCoopCommandTest.java index 955c8e211..c09cb590b 100644 --- a/src/test/java/world/bentobox/bentobox/api/commands/island/team/IslandTeamCoopCommandTest.java +++ b/src/test/java/world/bentobox/bentobox/api/commands/island/team/IslandTeamCoopCommandTest.java @@ -118,7 +118,6 @@ public class IslandTeamCoopCommandTest extends RanksManagerBeforeClassTest { // Server & Scheduler BukkitScheduler sch = mock(BukkitScheduler.class); - PowerMockito.mockStatic(Bukkit.class); when(Bukkit.getScheduler()).thenReturn(sch); // Locales diff --git a/src/test/java/world/bentobox/bentobox/api/commands/island/team/IslandTeamInviteAcceptCommandTest.java b/src/test/java/world/bentobox/bentobox/api/commands/island/team/IslandTeamInviteAcceptCommandTest.java index ca056a9ac..a10376f10 100644 --- a/src/test/java/world/bentobox/bentobox/api/commands/island/team/IslandTeamInviteAcceptCommandTest.java +++ b/src/test/java/world/bentobox/bentobox/api/commands/island/team/IslandTeamInviteAcceptCommandTest.java @@ -32,12 +32,13 @@ import org.powermock.reflect.Whitebox; import world.bentobox.bentobox.BentoBox; import world.bentobox.bentobox.Settings; import world.bentobox.bentobox.TestWorldSettings; -import world.bentobox.bentobox.api.commands.island.team.Invite.Type; import world.bentobox.bentobox.api.events.IslandBaseEvent; import world.bentobox.bentobox.api.events.team.TeamEvent; import world.bentobox.bentobox.api.events.team.TeamEvent.TeamEventBuilder; import world.bentobox.bentobox.api.user.User; import world.bentobox.bentobox.database.objects.Island; +import world.bentobox.bentobox.database.objects.TeamInvite; +import world.bentobox.bentobox.database.objects.TeamInvite.Type; import world.bentobox.bentobox.managers.CommandsManager; import world.bentobox.bentobox.managers.IslandWorldManager; import world.bentobox.bentobox.managers.IslandsManager; @@ -72,7 +73,7 @@ public class IslandTeamInviteAcceptCommandTest { @Mock private PluginManager pim; @Mock - private Invite invite; + private TeamInvite invite; /** */ @@ -148,7 +149,7 @@ public class IslandTeamInviteAcceptCommandTest { when(plugin.getIWM()).thenReturn(iwm); // Invite - when(invite.getType()).thenReturn(Invite.Type.TEAM); + when(invite.getType()).thenReturn(Type.TEAM); // Team invite accept command c = new IslandTeamInviteAcceptCommand(itc); @@ -281,7 +282,7 @@ public class IslandTeamInviteAcceptCommandTest { when(itc.isInvited(any())).thenReturn(true); when(itc.getInviter(any())).thenReturn(notUUID); when(itc.getInvite(any())).thenReturn(invite); - when(invite.getType()).thenReturn(Invite.Type.COOP); + when(invite.getType()).thenReturn(Type.COOP); when(im.inTeam(any(), any())).thenReturn(false); assertTrue(c.canExecute(user, "accept", Collections.emptyList())); verify(user, never()).sendMessage("commands.island.team.invite.errors.you-already-are-in-team"); @@ -332,7 +333,7 @@ public class IslandTeamInviteAcceptCommandTest { @Test public void testExecuteUserStringListOfStringCoop() { // Coop - when(invite.getType()).thenReturn(Invite.Type.COOP); + when(invite.getType()).thenReturn(Type.COOP); assertTrue(c.execute(user, "accept", Collections.emptyList())); verify(user).sendMessage("commands.confirmation.confirm", "[seconds]", "0"); } @@ -343,7 +344,7 @@ public class IslandTeamInviteAcceptCommandTest { @Test public void testExecuteUserStringListOfStringTrust() { // Trust - when(invite.getType()).thenReturn(Invite.Type.TRUST); + when(invite.getType()).thenReturn(Type.TRUST); assertTrue(c.execute(user, "accept", Collections.emptyList())); verify(user).sendMessage("commands.confirmation.confirm", "[seconds]", "0"); } diff --git a/src/test/java/world/bentobox/bentobox/api/commands/island/team/IslandTeamInviteCommandTest.java b/src/test/java/world/bentobox/bentobox/api/commands/island/team/IslandTeamInviteCommandTest.java index 3a50c1445..8d712a478 100644 --- a/src/test/java/world/bentobox/bentobox/api/commands/island/team/IslandTeamInviteCommandTest.java +++ b/src/test/java/world/bentobox/bentobox/api/commands/island/team/IslandTeamInviteCommandTest.java @@ -40,12 +40,13 @@ import com.google.common.collect.ImmutableSet; import world.bentobox.bentobox.BentoBox; import world.bentobox.bentobox.Settings; import world.bentobox.bentobox.TestWorldSettings; -import world.bentobox.bentobox.api.commands.island.team.Invite.Type; import world.bentobox.bentobox.api.configuration.WorldSettings; import world.bentobox.bentobox.api.events.IslandBaseEvent; import world.bentobox.bentobox.api.localization.TextVariables; import world.bentobox.bentobox.api.user.User; import world.bentobox.bentobox.database.objects.Island; +import world.bentobox.bentobox.database.objects.TeamInvite; +import world.bentobox.bentobox.database.objects.TeamInvite.Type; import world.bentobox.bentobox.managers.CommandsManager; import world.bentobox.bentobox.managers.IslandWorldManager; import world.bentobox.bentobox.managers.IslandsManager; @@ -160,7 +161,6 @@ public class IslandTeamInviteCommandTest extends RanksManagerBeforeClassTest { // Server & Scheduler BukkitScheduler sch = mock(BukkitScheduler.class); - PowerMockito.mockStatic(Bukkit.class); when(Bukkit.getScheduler()).thenReturn(sch); when(Bukkit.getPluginManager()).thenReturn(pim); @@ -319,7 +319,7 @@ public class IslandTeamInviteCommandTest extends RanksManagerBeforeClassTest { assertTrue(itl.execute(user, itl.getLabel(), List.of("target"))); verify(pim).callEvent(any(IslandBaseEvent.class)); verify(user, never()).sendMessage(eq("commands.island.team.invite.removing-invite")); - verify(ic).addInvite(Invite.Type.TEAM, uuid, notUUID, island); + verify(ic).addInvite(Type.TEAM, uuid, notUUID, island); verify(user).sendMessage("commands.island.team.invite.invitation-sent", TextVariables.NAME, "target", TextVariables.DISPLAY_NAME, "&Ctarget"); verify(target).sendMessage("commands.island.team.invite.name-has-invited-you", TextVariables.NAME, "tastybento", TextVariables.DISPLAY_NAME, "&Ctastbento"); verify(target).sendMessage("commands.island.team.invite.to-accept-or-reject", TextVariables.LABEL, "island"); @@ -338,7 +338,7 @@ public class IslandTeamInviteCommandTest extends RanksManagerBeforeClassTest { assertTrue(itl.execute(user, itl.getLabel(), List.of("target"))); verify(pim).callEvent(any(IslandBaseEvent.class)); verify(user, never()).sendMessage("commands.island.team.invite.removing-invite"); - verify(ic).addInvite(Invite.Type.TEAM, uuid, notUUID, island); + verify(ic).addInvite(Type.TEAM, uuid, notUUID, island); verify(user).sendMessage("commands.island.team.invite.invitation-sent", TextVariables.NAME, "target", TextVariables.DISPLAY_NAME, "&Ctarget"); verify(target).sendMessage("commands.island.team.invite.name-has-invited-you", TextVariables.NAME, "tastybento", @@ -359,7 +359,7 @@ public class IslandTeamInviteCommandTest extends RanksManagerBeforeClassTest { when(ic.isInvited(notUUID)).thenReturn(true); // Set up invite when(ic.getInviter(notUUID)).thenReturn(uuid); - Invite invite = mock(Invite.class); + TeamInvite invite = mock(TeamInvite.class); when(invite.getType()).thenReturn(Type.TEAM); when(ic.getInvite(notUUID)).thenReturn(invite); assertTrue(itl.execute(user, itl.getLabel(), List.of("target"))); diff --git a/src/test/java/world/bentobox/bentobox/api/commands/island/team/IslandTeamKickCommandTest.java b/src/test/java/world/bentobox/bentobox/api/commands/island/team/IslandTeamKickCommandTest.java index b12d5d922..92bbf2c63 100644 --- a/src/test/java/world/bentobox/bentobox/api/commands/island/team/IslandTeamKickCommandTest.java +++ b/src/test/java/world/bentobox/bentobox/api/commands/island/team/IslandTeamKickCommandTest.java @@ -29,7 +29,6 @@ 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; @@ -148,7 +147,6 @@ public class IslandTeamKickCommandTest extends RanksManagerBeforeClassTest { // Server & Scheduler BukkitScheduler sch = mock(BukkitScheduler.class); - PowerMockito.mockStatic(Bukkit.class); when(Bukkit.getScheduler()).thenReturn(sch); when(Bukkit.getPluginManager()).thenReturn(mock(PluginManager.class)); @@ -433,7 +431,6 @@ public class IslandTeamKickCommandTest extends RanksManagerBeforeClassTest { when(island.getMemberSet()).thenReturn(memberSet.build()); // Return a set of players - PowerMockito.mockStatic(Bukkit.class); OfflinePlayer offlinePlayer = mock(OfflinePlayer.class); when(Bukkit.getOfflinePlayer(any(UUID.class))).thenReturn(offlinePlayer); when(offlinePlayer.getName()).thenReturn("adam", "ben", "cara", "dave", "ed", "frank", "freddy", "george", @@ -468,7 +465,6 @@ public class IslandTeamKickCommandTest extends RanksManagerBeforeClassTest { when(island.getMemberSet()).thenReturn(memberSet.build()); // Return a set of players - PowerMockito.mockStatic(Bukkit.class); OfflinePlayer offlinePlayer = mock(OfflinePlayer.class); when(Bukkit.getOfflinePlayer(any(UUID.class))).thenReturn(offlinePlayer); when(offlinePlayer.getName()).thenReturn("adam", "ben", "cara", "dave", "ed", "frank", "freddy", "george", @@ -505,7 +501,6 @@ public class IslandTeamKickCommandTest extends RanksManagerBeforeClassTest { when(island.getMemberSet()).thenReturn(memberSet.build()); // Return a set of players - PowerMockito.mockStatic(Bukkit.class); OfflinePlayer offlinePlayer = mock(OfflinePlayer.class); when(Bukkit.getOfflinePlayer(any(UUID.class))).thenReturn(offlinePlayer); when(offlinePlayer.getName()).thenReturn("adam", "ben", "cara", "dave", "ed", "frank", "freddy", "george", diff --git a/src/test/java/world/bentobox/bentobox/api/commands/island/team/IslandTeamLeaveCommandTest.java b/src/test/java/world/bentobox/bentobox/api/commands/island/team/IslandTeamLeaveCommandTest.java index 0ca33eefa..7fcd5638b 100644 --- a/src/test/java/world/bentobox/bentobox/api/commands/island/team/IslandTeamLeaveCommandTest.java +++ b/src/test/java/world/bentobox/bentobox/api/commands/island/team/IslandTeamLeaveCommandTest.java @@ -76,6 +76,7 @@ public class IslandTeamLeaveCommandTest { */ @Before public void setUp() throws Exception { + PowerMockito.mockStatic(Bukkit.class, Mockito.RETURNS_MOCKS); // Set up plugin BentoBox plugin = mock(BentoBox.class); Whitebox.setInternalState(BentoBox.class, "instance", plugin); @@ -116,7 +117,6 @@ public class IslandTeamLeaveCommandTest { // Server & Scheduler BukkitScheduler sch = mock(BukkitScheduler.class); - PowerMockito.mockStatic(Bukkit.class); when(Bukkit.getScheduler()).thenReturn(sch); // Island World Manager diff --git a/src/test/java/world/bentobox/bentobox/api/commands/island/team/IslandTeamSetownerCommandTest.java b/src/test/java/world/bentobox/bentobox/api/commands/island/team/IslandTeamSetownerCommandTest.java index 63d6f1bd8..152a8355d 100644 --- a/src/test/java/world/bentobox/bentobox/api/commands/island/team/IslandTeamSetownerCommandTest.java +++ b/src/test/java/world/bentobox/bentobox/api/commands/island/team/IslandTeamSetownerCommandTest.java @@ -54,7 +54,7 @@ import world.bentobox.bentobox.managers.PlayersManager; * */ @RunWith(PowerMockRunner.class) -@PrepareForTest({ Bukkit.class, BentoBox.class, User.class }) +@PrepareForTest({ Bukkit.class, BentoBox.class, User.class, IslandsManager.class }) public class IslandTeamSetownerCommandTest { @Mock @@ -84,6 +84,10 @@ public class IslandTeamSetownerCommandTest { */ @Before public void setUp() throws Exception { + PowerMockito.mockStatic(Bukkit.class, Mockito.RETURNS_MOCKS); + + PowerMockito.mockStatic(IslandsManager.class, Mockito.RETURNS_MOCKS); + // Set up plugin BentoBox plugin = mock(BentoBox.class); Whitebox.setInternalState(BentoBox.class, "instance", plugin); @@ -126,7 +130,6 @@ public class IslandTeamSetownerCommandTest { // Server & Scheduler BukkitScheduler sch = mock(BukkitScheduler.class); - PowerMockito.mockStatic(Bukkit.class); when(Bukkit.getScheduler()).thenReturn(sch); // Island World Manager @@ -276,7 +279,6 @@ public class IslandTeamSetownerCommandTest { assertTrue(its.canExecute(user, "", List.of("tastybento"))); assertTrue(its.execute(user, "", List.of("tastybento"))); verify(im).setOwner(any(), eq(user), eq(target)); - verify(im).save(island); } /** @@ -292,7 +294,6 @@ public class IslandTeamSetownerCommandTest { assertTrue(its.canExecute(user, "", List.of("tastybento"))); assertTrue(its.execute(user, "", List.of("tastybento"))); verify(im).setOwner(any(), eq(user), eq(target)); - verify(im).save(island); } /** diff --git a/src/test/java/world/bentobox/bentobox/api/commands/island/team/IslandTeamTrustCommandTest.java b/src/test/java/world/bentobox/bentobox/api/commands/island/team/IslandTeamTrustCommandTest.java index 8b2a60673..0738e01ef 100644 --- a/src/test/java/world/bentobox/bentobox/api/commands/island/team/IslandTeamTrustCommandTest.java +++ b/src/test/java/world/bentobox/bentobox/api/commands/island/team/IslandTeamTrustCommandTest.java @@ -129,7 +129,6 @@ public class IslandTeamTrustCommandTest extends RanksManagerBeforeClassTest { // Server & Scheduler BukkitScheduler sch = mock(BukkitScheduler.class); - PowerMockito.mockStatic(Bukkit.class); when(Bukkit.getScheduler()).thenReturn(sch); // Locales diff --git a/src/test/java/world/bentobox/bentobox/api/commands/island/team/IslandTeamUncoopCommandTest.java b/src/test/java/world/bentobox/bentobox/api/commands/island/team/IslandTeamUncoopCommandTest.java index c5bb7976f..dd57146c7 100644 --- a/src/test/java/world/bentobox/bentobox/api/commands/island/team/IslandTeamUncoopCommandTest.java +++ b/src/test/java/world/bentobox/bentobox/api/commands/island/team/IslandTeamUncoopCommandTest.java @@ -121,7 +121,6 @@ public class IslandTeamUncoopCommandTest extends RanksManagerBeforeClassTest { // Server & Scheduler BukkitScheduler sch = mock(BukkitScheduler.class); - PowerMockito.mockStatic(Bukkit.class); when(Bukkit.getScheduler()).thenReturn(sch); // Locales @@ -272,7 +271,6 @@ public class IslandTeamUncoopCommandTest extends RanksManagerBeforeClassTest { when(island.getMembers()).thenReturn(map); // Return a set of players - PowerMockito.mockStatic(Bukkit.class); OfflinePlayer offlinePlayer = mock(OfflinePlayer.class); when(Bukkit.getOfflinePlayer(any(UUID.class))).thenReturn(offlinePlayer); when(offlinePlayer.getName()).thenReturn("adam", "ben", "cara", "dave", "ed", "frank", "freddy", "george", @@ -307,7 +305,6 @@ public class IslandTeamUncoopCommandTest extends RanksManagerBeforeClassTest { when(island.getMembers()).thenReturn(map); // Return a set of players - PowerMockito.mockStatic(Bukkit.class); OfflinePlayer offlinePlayer = mock(OfflinePlayer.class); when(Bukkit.getOfflinePlayer(any(UUID.class))).thenReturn(offlinePlayer); when(offlinePlayer.getName()).thenReturn("adam", "ben", "cara", "dave", "ed", "frank", "freddy", "george", diff --git a/src/test/java/world/bentobox/bentobox/api/commands/island/team/IslandTeamUntrustCommandTest.java b/src/test/java/world/bentobox/bentobox/api/commands/island/team/IslandTeamUntrustCommandTest.java index 4022b8c40..2955222e1 100644 --- a/src/test/java/world/bentobox/bentobox/api/commands/island/team/IslandTeamUntrustCommandTest.java +++ b/src/test/java/world/bentobox/bentobox/api/commands/island/team/IslandTeamUntrustCommandTest.java @@ -121,7 +121,6 @@ public class IslandTeamUntrustCommandTest extends RanksManagerBeforeClassTest { // Server & Scheduler BukkitScheduler sch = mock(BukkitScheduler.class); - PowerMockito.mockStatic(Bukkit.class); when(Bukkit.getScheduler()).thenReturn(sch); // Locales @@ -272,7 +271,6 @@ public class IslandTeamUntrustCommandTest extends RanksManagerBeforeClassTest { when(island.getMembers()).thenReturn(map); // Return a set of players - PowerMockito.mockStatic(Bukkit.class); OfflinePlayer offlinePlayer = mock(OfflinePlayer.class); when(Bukkit.getOfflinePlayer(any(UUID.class))).thenReturn(offlinePlayer); when(offlinePlayer.getName()).thenReturn("adam", "ben", "cara", "dave", "ed", "frank", "freddy", "george", @@ -307,7 +305,6 @@ public class IslandTeamUntrustCommandTest extends RanksManagerBeforeClassTest { when(island.getMembers()).thenReturn(map); // Return a set of players - PowerMockito.mockStatic(Bukkit.class); OfflinePlayer offlinePlayer = mock(OfflinePlayer.class); when(Bukkit.getOfflinePlayer(any(UUID.class))).thenReturn(offlinePlayer); when(offlinePlayer.getName()).thenReturn("adam", "ben", "cara", "dave", "ed", "frank", "freddy", "george", diff --git a/src/test/java/world/bentobox/bentobox/api/events/island/IslandEventTest.java b/src/test/java/world/bentobox/bentobox/api/events/island/IslandEventTest.java index 0677e8281..77bf06184 100644 --- a/src/test/java/world/bentobox/bentobox/api/events/island/IslandEventTest.java +++ b/src/test/java/world/bentobox/bentobox/api/events/island/IslandEventTest.java @@ -21,6 +21,7 @@ import org.mockito.Mockito; import org.powermock.api.mockito.PowerMockito; import org.powermock.core.classloader.annotations.PrepareForTest; import org.powermock.modules.junit4.PowerMockRunner; +import org.powermock.reflect.Whitebox; import world.bentobox.bentobox.BentoBox; import world.bentobox.bentobox.api.events.IslandBaseEvent; @@ -28,13 +29,14 @@ import world.bentobox.bentobox.api.events.island.IslandEvent.Reason; import world.bentobox.bentobox.blueprints.dataobjects.BlueprintBundle; import world.bentobox.bentobox.database.objects.Island; import world.bentobox.bentobox.database.objects.IslandDeletion; +import world.bentobox.bentobox.managers.IslandsManager; /** * @author tastybento * */ @RunWith(PowerMockRunner.class) -@PrepareForTest({ BentoBox.class, Bukkit.class }) +@PrepareForTest({ BentoBox.class, Bukkit.class, IslandsManager.class }) public class IslandEventTest { private Island island; @@ -47,11 +49,18 @@ public class IslandEventTest { private IslandDeletion deletedIslandInfo; @Mock private PluginManager pim; + @Mock + private BentoBox plugin; /** */ @Before public void setUp() throws Exception { + PowerMockito.mockStatic(IslandsManager.class, Mockito.RETURNS_MOCKS); + + // Set up plugin + Whitebox.setInternalState(BentoBox.class, "instance", plugin); + uuid = UUID.randomUUID(); // Bukkit PowerMockito.mockStatic(Bukkit.class); diff --git a/src/test/java/world/bentobox/bentobox/api/flags/FlagTest.java b/src/test/java/world/bentobox/bentobox/api/flags/FlagTest.java index 65a9f48a2..c860d2dd9 100644 --- a/src/test/java/world/bentobox/bentobox/api/flags/FlagTest.java +++ b/src/test/java/world/bentobox/bentobox/api/flags/FlagTest.java @@ -77,6 +77,8 @@ public class FlagTest { */ @Before public void setUp() throws Exception { + PowerMockito.mockStatic(Bukkit.class, Mockito.RETURNS_MOCKS); + // Set up plugin Whitebox.setInternalState(BentoBox.class, "instance", plugin); @@ -95,7 +97,6 @@ public class FlagTest { worldFlags = new HashMap<>(); when(ws.getWorldFlags()).thenReturn(worldFlags); - PowerMockito.mockStatic(Bukkit.class); ItemFactory itemF = mock(ItemFactory.class); ItemMeta im = mock(ItemMeta.class); when(itemF.getItemMeta(any())).thenReturn(im); diff --git a/src/test/java/world/bentobox/bentobox/api/flags/clicklisteners/CycleClickTest.java b/src/test/java/world/bentobox/bentobox/api/flags/clicklisteners/CycleClickTest.java index 9c86acc54..4f6f2c877 100644 --- a/src/test/java/world/bentobox/bentobox/api/flags/clicklisteners/CycleClickTest.java +++ b/src/test/java/world/bentobox/bentobox/api/flags/clicklisteners/CycleClickTest.java @@ -133,7 +133,7 @@ public class CycleClickTest { // Server & Scheduler BukkitScheduler sch = mock(BukkitScheduler.class); - PowerMockito.mockStatic(Bukkit.class); + PowerMockito.mockStatic(Bukkit.class, Mockito.RETURNS_MOCKS); when(Bukkit.getScheduler()).thenReturn(sch); // Locales @@ -215,6 +215,7 @@ public class CycleClickTest { // Util PowerMockito.mockStatic(Util.class); when(Util.getWorld(any())).thenReturn(world); + when(Util.findFirstMatchingEnum(any(), any())).thenCallRealMethod(); // Event when(Bukkit.getPluginManager()).thenReturn(pim); diff --git a/src/test/java/world/bentobox/bentobox/api/flags/clicklisteners/IslandToggleClickTest.java b/src/test/java/world/bentobox/bentobox/api/flags/clicklisteners/IslandToggleClickTest.java index 9a840f7bd..d45ef701a 100644 --- a/src/test/java/world/bentobox/bentobox/api/flags/clicklisteners/IslandToggleClickTest.java +++ b/src/test/java/world/bentobox/bentobox/api/flags/clicklisteners/IslandToggleClickTest.java @@ -67,6 +67,7 @@ public class IslandToggleClickTest { */ @Before public void setUp() throws Exception { + PowerMockito.mockStatic(Bukkit.class, Mockito.RETURNS_MOCKS); // Set up plugin BentoBox plugin = mock(BentoBox.class); @@ -92,6 +93,7 @@ public class IslandToggleClickTest { when(user.getUniqueId()).thenReturn(uuid); PowerMockito.mockStatic(Util.class); when(Util.getWorld(any())).thenReturn(mock(World.class)); + when(Util.findFirstMatchingEnum(any(), any())).thenCallRealMethod(); FlagsManager fm = mock(FlagsManager.class); when(flag.isSetForWorld(any())).thenReturn(false); @@ -108,7 +110,6 @@ public class IslandToggleClickTest { when(im.getIslandAt(any())).thenReturn(opIsland); // Event - PowerMockito.mockStatic(Bukkit.class); when(Bukkit.getPluginManager()).thenReturn(pim); // Active tab diff --git a/src/test/java/world/bentobox/bentobox/api/flags/clicklisteners/WorldToggleClickTest.java b/src/test/java/world/bentobox/bentobox/api/flags/clicklisteners/WorldToggleClickTest.java index c079284d8..a2ff9470d 100644 --- a/src/test/java/world/bentobox/bentobox/api/flags/clicklisteners/WorldToggleClickTest.java +++ b/src/test/java/world/bentobox/bentobox/api/flags/clicklisteners/WorldToggleClickTest.java @@ -61,7 +61,7 @@ public class WorldToggleClickTest { */ @Before public void setUp() throws Exception { - + PowerMockito.mockStatic(Bukkit.class, Mockito.RETURNS_MOCKS); // Set up plugin BentoBox plugin = mock(BentoBox.class); Whitebox.setInternalState(BentoBox.class, "instance", plugin); diff --git a/src/test/java/world/bentobox/bentobox/api/localization/BentoBoxLocaleTest.java b/src/test/java/world/bentobox/bentobox/api/localization/BentoBoxLocaleTest.java index a195ebecd..2404d66b9 100644 --- a/src/test/java/world/bentobox/bentobox/api/localization/BentoBoxLocaleTest.java +++ b/src/test/java/world/bentobox/bentobox/api/localization/BentoBoxLocaleTest.java @@ -55,7 +55,7 @@ public class BentoBoxLocaleTest { Locale locale = Locale.US; YamlConfiguration config = new YamlConfiguration(); - config.set("meta.banner", "WHITE_BANNER:1:STRIPE_SMALL:RED:SQUARE_TOP_RIGHT:CYAN:SQUARE_TOP_RIGHT:BLUE"); + config.set("meta.banner", "WHITE_BANNER:1:SMALL_STRIPES:RED:SQUARE_TOP_RIGHT:CYAN:SQUARE_TOP_RIGHT:BLUE"); List authors = new ArrayList<>(); authors.add("tastybento"); authors.add("tastybento2"); diff --git a/src/test/java/world/bentobox/bentobox/api/panels/builders/PanelBuilderTest.java b/src/test/java/world/bentobox/bentobox/api/panels/builders/PanelBuilderTest.java index aab11b812..03d9f1d8c 100644 --- a/src/test/java/world/bentobox/bentobox/api/panels/builders/PanelBuilderTest.java +++ b/src/test/java/world/bentobox/bentobox/api/panels/builders/PanelBuilderTest.java @@ -19,7 +19,9 @@ import org.mockito.Mockito; import org.powermock.api.mockito.PowerMockito; import org.powermock.core.classloader.annotations.PrepareForTest; import org.powermock.modules.junit4.PowerMockRunner; +import org.powermock.reflect.Whitebox; +import world.bentobox.bentobox.BentoBox; import world.bentobox.bentobox.api.panels.Panel; import world.bentobox.bentobox.api.panels.PanelItem; import world.bentobox.bentobox.api.panels.PanelListener; @@ -37,7 +39,11 @@ public class PanelBuilderTest { */ @Before public void setUp() throws Exception { - PowerMockito.mockStatic(Bukkit.class); + PowerMockito.mockStatic(Bukkit.class, Mockito.RETURNS_MOCKS); + // Set up plugin + BentoBox plugin = mock(BentoBox.class); + Whitebox.setInternalState(BentoBox.class, "instance", plugin); + Inventory inv = mock(Inventory.class); when(Bukkit.createInventory(Mockito.any(), Mockito.any(), Mockito.any())).thenReturn(inv); diff --git a/src/test/java/world/bentobox/bentobox/api/panels/builders/PanelItemBuilderTest.java b/src/test/java/world/bentobox/bentobox/api/panels/builders/PanelItemBuilderTest.java index 52e704100..6bbeeabed 100644 --- a/src/test/java/world/bentobox/bentobox/api/panels/builders/PanelItemBuilderTest.java +++ b/src/test/java/world/bentobox/bentobox/api/panels/builders/PanelItemBuilderTest.java @@ -32,7 +32,9 @@ import org.mockito.Mockito; import org.powermock.api.mockito.PowerMockito; import org.powermock.core.classloader.annotations.PrepareForTest; import org.powermock.modules.junit4.PowerMockRunner; +import org.powermock.reflect.Whitebox; +import world.bentobox.bentobox.BentoBox; import world.bentobox.bentobox.api.panels.Panel; import world.bentobox.bentobox.api.panels.PanelItem; import world.bentobox.bentobox.api.user.User; @@ -44,7 +46,10 @@ public class PanelItemBuilderTest { @SuppressWarnings("deprecation") @Before public void setUp() throws Exception { - PowerMockito.mockStatic(Bukkit.class); + PowerMockito.mockStatic(Bukkit.class, Mockito.RETURNS_MOCKS); + // Set up plugin + BentoBox plugin = mock(BentoBox.class); + Whitebox.setInternalState(BentoBox.class, "instance", plugin); Server server = mock(Server.class); World world = mock(World.class); diff --git a/src/test/java/world/bentobox/bentobox/api/user/UserTest.java b/src/test/java/world/bentobox/bentobox/api/user/UserTest.java index 4a487410d..5a93797dd 100644 --- a/src/test/java/world/bentobox/bentobox/api/user/UserTest.java +++ b/src/test/java/world/bentobox/bentobox/api/user/UserTest.java @@ -101,6 +101,7 @@ public class UserTest { @Before public void setUp() throws Exception { + PowerMockito.mockStatic(Bukkit.class, Mockito.RETURNS_MOCKS); // Set up plugin Whitebox.setInternalState(BentoBox.class, "instance", plugin); User.setPlugin(plugin); @@ -110,7 +111,6 @@ public class UserTest { ItemFactory itemFactory = mock(ItemFactory.class); - PowerMockito.mockStatic(Bukkit.class); when(Bukkit.getPlayer(any(UUID.class))).thenReturn(player); when(Bukkit.getPluginManager()).thenReturn(pim); when(Bukkit.getItemFactory()).thenReturn(itemFactory); @@ -178,7 +178,6 @@ public class UserTest { // If the player has been removed from the cache, then code will ask server for player // Return null and check if instance is null will show that the player is not in the cache when(Bukkit.getPlayer(any(UUID.class))).thenReturn(null); - verify(pm).removePlayer(player); } @Test @@ -842,9 +841,10 @@ public class UserTest { User.clearUsers(); User p = User.getInstance(player); try { - p.spawnParticle(Particle.REDSTONE, 4, 0.0d, 0.0d, 0.0d); + p.spawnParticle(Particle.DUST, 4, 0.0d, 0.0d, 0.0d); } catch (Exception e) { - assertEquals("A non-null DustOptions must be provided when using Particle.REDSTONE as particle.", e.getMessage()); + assertEquals("A non-null DustOptions must be provided when using Particle.DUST as particle.", + e.getMessage()); } } @@ -878,8 +878,8 @@ public class UserTest { User p = User.getInstance(player); DustOptions dust = mock(DustOptions.class); - p.spawnParticle(Particle.REDSTONE, dust, 0.0d, 0.0d, 0.0d); - verify(player).spawnParticle(Particle.REDSTONE, 0.0d, 0.0d, 0.0d, 1, 0, 0, 0, 1, dust); + p.spawnParticle(Particle.DUST, dust, 0.0d, 0.0d, 0.0d); + verify(player).spawnParticle(Particle.DUST, 0.0d, 0.0d, 0.0d, 1, 0, 0, 0, 1, dust); } @@ -896,8 +896,8 @@ public class UserTest { User p = User.getInstance(player); DustOptions dust = mock(DustOptions.class); - p.spawnParticle(Particle.REDSTONE, dust, 0.0d, 0.0d, 0.0d); - verify(player).spawnParticle(Particle.REDSTONE, 0.0d, 0.0d, 0.0d, 1, 0, 0, 0, 1, dust); + p.spawnParticle(Particle.DUST, dust, 0.0d, 0.0d, 0.0d); + verify(player).spawnParticle(Particle.DUST, 0.0d, 0.0d, 0.0d, 1, 0, 0, 0, 1, dust); } @@ -914,8 +914,8 @@ public class UserTest { User p = User.getInstance(player); DustOptions dust = mock(DustOptions.class); - p.spawnParticle(Particle.REDSTONE, dust, 0, 0, 0); - verify(player).spawnParticle(Particle.REDSTONE, 0.0d, 0.0d, 0.0d, 1, 0, 0, 0, 1, dust); + p.spawnParticle(Particle.DUST, dust, 0, 0, 0); + verify(player).spawnParticle(Particle.DUST, 0.0d, 0.0d, 0.0d, 1, 0, 0, 0, 1, dust); } diff --git a/src/test/java/world/bentobox/bentobox/database/json/adapters/FlagAdapterTest.java b/src/test/java/world/bentobox/bentobox/database/json/adapters/FlagAdapterTest.java index fd15364ee..492f90642 100644 --- a/src/test/java/world/bentobox/bentobox/database/json/adapters/FlagAdapterTest.java +++ b/src/test/java/world/bentobox/bentobox/database/json/adapters/FlagAdapterTest.java @@ -54,7 +54,7 @@ public class FlagAdapterTest { ItemFactory itemFactory = mock(ItemFactory.class); when(server.getItemFactory()).thenReturn(itemFactory); - PowerMockito.mockStatic(Bukkit.class); + PowerMockito.mockStatic(Bukkit.class, Mockito.RETURNS_MOCKS); when(Bukkit.getServer()).thenReturn(server); when(Bukkit.getPluginManager()).thenReturn(pim); diff --git a/src/test/java/world/bentobox/bentobox/database/objects/IslandTest.java b/src/test/java/world/bentobox/bentobox/database/objects/IslandTest.java index 527eef8f4..b2b149abc 100644 --- a/src/test/java/world/bentobox/bentobox/database/objects/IslandTest.java +++ b/src/test/java/world/bentobox/bentobox/database/objects/IslandTest.java @@ -46,6 +46,7 @@ import world.bentobox.bentobox.lists.Flags; import world.bentobox.bentobox.managers.CommandsManager; import world.bentobox.bentobox.managers.FlagsManager; import world.bentobox.bentobox.managers.IslandWorldManager; +import world.bentobox.bentobox.managers.IslandsManager; import world.bentobox.bentobox.managers.RanksManager; import world.bentobox.bentobox.util.Pair; @@ -54,7 +55,7 @@ import world.bentobox.bentobox.util.Pair; * */ @RunWith(PowerMockRunner.class) -@PrepareForTest({ Bukkit.class }) +@PrepareForTest({ Bukkit.class, IslandsManager.class }) public class IslandTest { private static final int DISTANCE = 400; @@ -105,6 +106,9 @@ public class IslandTest { // Commands manager when(plugin.getCommandsManager()).thenReturn(cm); + // Islands Manager + PowerMockito.mockStatic(IslandsManager.class, Mockito.RETURNS_MOCKS); + i = new Island(new Island(location, uuid, 100)); } @@ -1105,15 +1109,6 @@ public class IslandTest { assertTrue(ii.isChanged()); } - /** - * Test method for {@link world.bentobox.bentobox.database.objects.Island#setChanged(boolean)}. - */ - @Test - public void testSetChangedBoolean() { - i.setChanged(false); - assertFalse(i.isChanged()); - } - /** * Test method for {@link world.bentobox.bentobox.database.objects.Island#getProtectionCenter()}. */ diff --git a/src/test/java/world/bentobox/bentobox/listeners/BannedCommandsTest.java b/src/test/java/world/bentobox/bentobox/listeners/BannedCommandsTest.java index 40e69ae69..1af8737bc 100644 --- a/src/test/java/world/bentobox/bentobox/listeners/BannedCommandsTest.java +++ b/src/test/java/world/bentobox/bentobox/listeners/BannedCommandsTest.java @@ -33,6 +33,7 @@ import org.junit.runner.RunWith; import org.mockito.Mock; import org.mockito.Mockito; import org.mockito.stubbing.Answer; +import org.powermock.api.mockito.PowerMockito; import org.powermock.core.classloader.annotations.PrepareForTest; import org.powermock.modules.junit4.PowerMockRunner; import org.powermock.reflect.Whitebox; @@ -66,6 +67,7 @@ public class BannedCommandsTest { @Before public void setUp() throws Exception { + PowerMockito.mockStatic(Bukkit.class, Mockito.RETURNS_MOCKS); // Set up plugin plugin = mock(BentoBox.class); Whitebox.setInternalState(BentoBox.class, "instance", plugin); diff --git a/src/test/java/world/bentobox/bentobox/listeners/BlockEndDragonTest.java b/src/test/java/world/bentobox/bentobox/listeners/BlockEndDragonTest.java index 97b289488..cea8a5f88 100644 --- a/src/test/java/world/bentobox/bentobox/listeners/BlockEndDragonTest.java +++ b/src/test/java/world/bentobox/bentobox/listeners/BlockEndDragonTest.java @@ -38,6 +38,7 @@ 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 org.powermock.reflect.Whitebox; @@ -74,6 +75,7 @@ public class BlockEndDragonTest { */ @Before public void setUp() throws Exception { + PowerMockito.mockStatic(Bukkit.class, Mockito.RETURNS_MOCKS); // Set up plugin BentoBox plugin = mock(BentoBox.class); Whitebox.setInternalState(BentoBox.class, "instance", plugin); diff --git a/src/test/java/world/bentobox/bentobox/listeners/DeathListenerTest.java b/src/test/java/world/bentobox/bentobox/listeners/DeathListenerTest.java index c8a7e58f5..75a0f23db 100644 --- a/src/test/java/world/bentobox/bentobox/listeners/DeathListenerTest.java +++ b/src/test/java/world/bentobox/bentobox/listeners/DeathListenerTest.java @@ -10,6 +10,7 @@ import java.util.UUID; import org.bukkit.Bukkit; import org.bukkit.Location; import org.bukkit.World; +import org.bukkit.damage.DamageSource; import org.bukkit.entity.Player; import org.bukkit.event.entity.PlayerDeathEvent; import org.junit.After; @@ -39,6 +40,7 @@ public class DeathListenerTest { private World world; private UUID uuid; private IslandWorldManager iwm; + private DamageSource ds = null; @Before public void setUp() { diff --git a/src/test/java/world/bentobox/bentobox/listeners/JoinLeaveListenerTest.java b/src/test/java/world/bentobox/bentobox/listeners/JoinLeaveListenerTest.java index 3d1582420..21127e72e 100644 --- a/src/test/java/world/bentobox/bentobox/listeners/JoinLeaveListenerTest.java +++ b/src/test/java/world/bentobox/bentobox/listeners/JoinLeaveListenerTest.java @@ -65,7 +65,7 @@ import world.bentobox.bentobox.util.Util; * */ @RunWith(PowerMockRunner.class) -@PrepareForTest({ BentoBox.class, Util.class, Bukkit.class }) +@PrepareForTest({ BentoBox.class, Util.class, Bukkit.class, IslandsManager.class }) public class JoinLeaveListenerTest { private static final String[] NAMES = { "adam", "ben", "cara", "dave", "ed", "frank", "freddy", "george", "harry", @@ -111,6 +111,8 @@ public class JoinLeaveListenerTest { */ @Before public void setUp() throws Exception { + PowerMockito.mockStatic(IslandsManager.class, Mockito.RETURNS_MOCKS); + // Set up plugin Whitebox.setInternalState(BentoBox.class, "instance", plugin); @@ -164,6 +166,7 @@ public class JoinLeaveListenerTest { when(im.getIsland(any(), any(User.class))).thenReturn(island); when(im.getIsland(any(), any(UUID.class))).thenReturn(island); when(im.getIslands()).thenReturn(Collections.singletonList(island)); + when(im.getIslands(any(UUID.class))).thenReturn(Collections.singletonList(island)); Map memberMap = new HashMap<>(); memberMap.put(uuid, RanksManager.OWNER_RANK); @@ -175,7 +178,7 @@ public class JoinLeaveListenerTest { island.setMembers(memberMap); // Bukkit - PowerMockito.mockStatic(Bukkit.class); + PowerMockito.mockStatic(Bukkit.class, Mockito.RETURNS_MOCKS); when(Bukkit.getScheduler()).thenReturn(scheduler); when(Bukkit.getPluginManager()).thenReturn(pim); @@ -218,8 +221,6 @@ public class JoinLeaveListenerTest { jll = new JoinLeaveListener(plugin); } - /** - */ @After public void tearDown() { User.clearUsers(); @@ -235,8 +236,7 @@ public class JoinLeaveListenerTest { PlayerJoinEvent event = new PlayerJoinEvent(player, ""); jll.onPlayerJoin(event); // Verify - verify(pm, times(2)).addPlayer(any()); - verify(pm, times(2)).save(any()); + verify(pm, times(3)).getPlayer(any()); verify(player, never()).sendMessage(anyString()); // Verify resets verify(pm).setResets(eq(world), any(), eq(0)); @@ -245,7 +245,6 @@ public class JoinLeaveListenerTest { verify(chest).clear(); verify(inv).clear(); assertTrue(set.isEmpty()); - verify(pm, times(2)).save(any()); } /** @@ -262,7 +261,6 @@ public class JoinLeaveListenerTest { verify(chest, never()).clear(); verify(inv, never()).clear(); assertFalse(set.isEmpty()); - verify(pm).save(any()); } /** @@ -355,8 +353,7 @@ public class JoinLeaveListenerTest { PlayerJoinEvent event = new PlayerJoinEvent(player, ""); jll.onPlayerJoin(event); // Verify - verify(pm, times(2)).addPlayer(any()); - verify(pm, times(2)).save(any()); + verify(pm, times(3)).getPlayer(any()); verify(player).sendMessage(eq("commands.island.create.on-first-login")); } @@ -372,7 +369,6 @@ public class JoinLeaveListenerTest { verify(chest).clear(); verify(inv).clear(); assertTrue(set.isEmpty()); - verify(pm).save(any()); } /** @@ -387,7 +383,6 @@ public class JoinLeaveListenerTest { verify(chest, never()).clear(); verify(inv, never()).clear(); assertFalse(set.isEmpty()); - verify(pm, never()).save(any()); } /** diff --git a/src/test/java/world/bentobox/bentobox/listeners/StandardSpawnProtectionListenerTest.java b/src/test/java/world/bentobox/bentobox/listeners/StandardSpawnProtectionListenerTest.java index 8beb740c2..9d2bb94d7 100644 --- a/src/test/java/world/bentobox/bentobox/listeners/StandardSpawnProtectionListenerTest.java +++ b/src/test/java/world/bentobox/bentobox/listeners/StandardSpawnProtectionListenerTest.java @@ -90,6 +90,7 @@ public class StandardSpawnProtectionListenerTest { */ @Before public void setUp() throws Exception { + PowerMockito.mockStatic(Bukkit.class, Mockito.RETURNS_MOCKS); // Setup plugin Whitebox.setInternalState(BentoBox.class, "instance", plugin); when(plugin.getIWM()).thenReturn(iwm); @@ -134,6 +135,7 @@ public class StandardSpawnProtectionListenerTest { // Util translate color codes (used in user translate methods) when(Util.translateColorCodes(anyString())).thenAnswer((Answer) invocation -> invocation.getArgument(0, String.class)); + when(Util.findFirstMatchingEnum(any(), any())).thenCallRealMethod(); // Set up class ssp = new StandardSpawnProtectionListener(plugin); diff --git a/src/test/java/world/bentobox/bentobox/listeners/flags/AbstractCommonSetup.java b/src/test/java/world/bentobox/bentobox/listeners/flags/AbstractCommonSetup.java index e780d3b84..5f4e6ef5e 100644 --- a/src/test/java/world/bentobox/bentobox/listeners/flags/AbstractCommonSetup.java +++ b/src/test/java/world/bentobox/bentobox/listeners/flags/AbstractCommonSetup.java @@ -68,7 +68,7 @@ public abstract class AbstractCommonSetup { protected UUID uuid = UUID.randomUUID(); @Mock - protected Player player; + protected Player mockPlayer; @Mock protected PluginManager pim; @Mock @@ -94,10 +94,12 @@ public abstract class AbstractCommonSetup { public void setUp() throws Exception { - // Set up plugin - Whitebox.setInternalState(BentoBox.class, "instance", plugin); // Bukkit PowerMockito.mockStatic(Bukkit.class, Mockito.RETURNS_MOCKS); + // Set up plugin + Whitebox.setInternalState(BentoBox.class, "instance", plugin); + + when(Bukkit.getBukkitVersion()).thenReturn(""); when(Bukkit.getPluginManager()).thenReturn(pim); when(Bukkit.getItemFactory()).thenReturn(itemFactory); @@ -116,15 +118,15 @@ public abstract class AbstractCommonSetup { when(pm.getPlayer(any(UUID.class))).thenReturn(players); // Player - when(player.getUniqueId()).thenReturn(uuid); - when(player.getLocation()).thenReturn(location); - when(player.getWorld()).thenReturn(world); - when(player.getName()).thenReturn("tastybento"); - when(player.getInventory()).thenReturn(inv); + when(mockPlayer.getUniqueId()).thenReturn(uuid); + when(mockPlayer.getLocation()).thenReturn(location); + when(mockPlayer.getWorld()).thenReturn(world); + when(mockPlayer.getName()).thenReturn("tastybento"); + when(mockPlayer.getInventory()).thenReturn(inv); User.setPlugin(plugin); User.clearUsers(); - User.getInstance(player); + User.getInstance(mockPlayer); // IWM when(plugin.getIWM()).thenReturn(iwm); @@ -150,7 +152,7 @@ public abstract class AbstractCommonSetup { // Enable reporting from Flags class MetadataValue mdv = new FixedMetadataValue(plugin, "_why_debug"); - when(player.getMetadata(anyString())).thenReturn(Collections.singletonList(mdv)); + when(mockPlayer.getMetadata(anyString())).thenReturn(Collections.singletonList(mdv)); // Locales & Placeholders LocalesManager lm = mock(LocalesManager.class); @@ -169,6 +171,8 @@ public abstract class AbstractCommonSetup { PowerMockito.mockStatic(Util.class); when(Util.getWorld(any())).thenReturn(mock(World.class)); + // Util + when(Util.findFirstMatchingEnum(any(), any())).thenCallRealMethod(); // Util translate color codes (used in user translate methods) when(Util.translateColorCodes(anyString())).thenAnswer((Answer) invocation -> invocation.getArgument(0, String.class)); 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 4ecccedc1..2864222cc 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 @@ -76,7 +76,9 @@ public class GeoMobLimitTabTest { // IWM when(plugin.getIWM()).thenReturn(iwm); when(iwm.getAddon(any())).thenReturn(Optional.of(gma)); + // Make list of the first 4 creatures on the list - it's alphabetical and follows the list of Living Entities list = new ArrayList<>(); + list.add("ARMADILLO"); list.add("AXOLOTL"); list.add("BAT"); list.add("COW"); @@ -102,24 +104,27 @@ public class GeoMobLimitTabTest { @Test public void testOnClick() { GeoMobLimitTab tab = new GeoMobLimitTab(user, EntityLimitTabType.GEO_LIMIT, world); - // AXOLOTL, BAT, and COW in list + // ARMADILLO, AXOLOTL, BAT, and COW in list + assertEquals(4, list.size()); + assertEquals("COW", list.get(3)); + assertEquals("BAT", list.get(2)); + assertEquals("AXOLOTL", list.get(1)); + assertEquals("ARMADILLO", list.get(0)); + + // Click on ARMADILLO + tab.onClick(panel, user, ClickType.LEFT, 10); + list.forEach(System.out::println); assertEquals(3, list.size()); assertEquals("COW", list.get(2)); assertEquals("BAT", list.get(1)); assertEquals("AXOLOTL", list.get(0)); - - // Click on AXOLOTL + // Click on ARMADILLO again to have it added to the end of the list tab.onClick(panel, user, ClickType.LEFT, 10); - list.forEach(System.out::println); - assertEquals(2, list.size()); - assertEquals("COW", list.get(1)); - assertEquals("BAT", list.get(0)); - // Click on AXOLOTL again to have it added - tab.onClick(panel, user, ClickType.LEFT, 10); - assertEquals(3, list.size()); - assertEquals("BAT", list.get(0)); - assertEquals("COW", list.get(1)); - assertEquals("AXOLOTL", list.get(2)); + assertEquals(4, list.size()); + assertEquals("COW", list.get(2)); + assertEquals("BAT", list.get(1)); + assertEquals("AXOLOTL", list.get(0)); + assertEquals("ARMADILLO", list.get(3)); verify(gma, times(2)).saveWorldSettings(); } @@ -165,7 +170,8 @@ public class GeoMobLimitTabTest { List<@Nullable PanelItem> items = tab.getPanelItems(); assertFalse(items.isEmpty()); items.forEach(i -> { - if (i.getName().equals("Axolotl") || i.getName().equals("Cow") || i.getName().equals("Bat")) { + if (i.getName().equals("Armadillo") || i.getName().equals("Axolotl") || i.getName().equals("Cow") + || i.getName().equals("Bat")) { assertEquals("Name : " + i.getName(), Material.RED_SHULKER_BOX, i.getItem().getType()); } else { assertEquals("Name : " + i.getName(), Material.GREEN_SHULKER_BOX, i.getItem().getType()); @@ -182,7 +188,8 @@ public class GeoMobLimitTabTest { List<@Nullable PanelItem> items = tab.getPanelItems(); assertFalse(items.isEmpty()); items.forEach(i -> { - if (i.getName().equals("Axolotl") || i.getName().equals("Cow") || i.getName().equals("Bat")) { + if (i.getName().equals("Armadillo") || i.getName().equals("Axolotl") || i.getName().equals("Cow") + || i.getName().equals("Bat")) { assertEquals("Name : " + i.getName(), Material.GREEN_SHULKER_BOX, i.getItem().getType()); } else { assertEquals("Name : " + i.getName(), Material.RED_SHULKER_BOX, i.getItem().getType()); 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 6af574c9a..4560bb7f6 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 @@ -20,7 +20,6 @@ import org.bukkit.Material; import org.bukkit.Tag; import org.bukkit.block.Block; import org.bukkit.block.BlockFace; -import org.bukkit.block.BlockState; import org.bukkit.block.Sign; import org.bukkit.event.Event; import org.bukkit.event.block.Action; @@ -144,7 +143,7 @@ public class BlockInteractionListenerTest extends AbstractCommonSetup { hand = EquipmentSlot.HAND; // Nothing in hand right now when(item.getType()).thenReturn(Material.AIR); - when(player.getInventory()).thenReturn(inv); + when(mockPlayer.getInventory()).thenReturn(inv); when(inv.getItemInMainHand()).thenReturn(item); when(inv.getItemInOffHand()).thenReturn(new ItemStack(Material.BUCKET)); @@ -161,7 +160,7 @@ public class BlockInteractionListenerTest extends AbstractCommonSetup { @Test public void testOnPlayerInteractItemFrameNotAllowed() { when(clickedBlock.getType()).thenReturn(Material.ITEM_FRAME); - PlayerInteractEvent e = new PlayerInteractEvent(player, Action.RIGHT_CLICK_BLOCK, item, clickedBlock, BlockFace.EAST, hand); + PlayerInteractEvent e = new PlayerInteractEvent(mockPlayer, Action.RIGHT_CLICK_BLOCK, item, clickedBlock, BlockFace.EAST, hand); bil.onPlayerInteract(e); assertEquals(Event.Result.DENY, e.useInteractedBlock()); verify(notifier).notify(any(), eq("protection.protected")); @@ -175,7 +174,7 @@ public class BlockInteractionListenerTest extends AbstractCommonSetup { when(island.isAllowed(any(), eq(Flags.BREAK_BLOCKS))).thenReturn(true); when(island.isAllowed(any(), eq(Flags.PLACE_BLOCKS))).thenReturn(true); when(clickedBlock.getType()).thenReturn(Material.ITEM_FRAME); - PlayerInteractEvent e = new PlayerInteractEvent(player, Action.RIGHT_CLICK_BLOCK, item, clickedBlock, BlockFace.EAST, hand); + PlayerInteractEvent e = new PlayerInteractEvent(mockPlayer, Action.RIGHT_CLICK_BLOCK, item, clickedBlock, BlockFace.EAST, hand); bil.onPlayerInteract(e); assertEquals(Event.Result.DENY, e.useInteractedBlock()); verify(notifier).notify(any(), eq("protection.protected")); @@ -188,7 +187,7 @@ public class BlockInteractionListenerTest extends AbstractCommonSetup { public void testOnPlayerInteractNothingInHandPotsNotAllowed() { Arrays.stream(Material.values()).filter(m -> m.name().startsWith("POTTED")).forEach(bm -> { when(clickedBlock.getType()).thenReturn(bm); - PlayerInteractEvent e = new PlayerInteractEvent(player, Action.RIGHT_CLICK_BLOCK, item, clickedBlock, BlockFace.EAST, hand); + PlayerInteractEvent e = new PlayerInteractEvent(mockPlayer, Action.RIGHT_CLICK_BLOCK, item, clickedBlock, BlockFace.EAST, hand); bil.onPlayerInteract(e); assertEquals("Failure " + bm, Event.Result.DENY, e.useInteractedBlock()); }); @@ -208,7 +207,7 @@ public class BlockInteractionListenerTest extends AbstractCommonSetup { when(clickedBlock.getState()).thenReturn(sign); for (Material bm : clickedBlocks.keySet()) { when(clickedBlock.getType()).thenReturn(bm); - PlayerInteractEvent e = new PlayerInteractEvent(player, Action.RIGHT_CLICK_BLOCK, item, clickedBlock, BlockFace.EAST, hand); + PlayerInteractEvent e = new PlayerInteractEvent(mockPlayer, Action.RIGHT_CLICK_BLOCK, item, clickedBlock, BlockFace.EAST, hand); bil.onPlayerInteract(e); assertEquals("Failure " + bm, Event.Result.DENY, e.useInteractedBlock()); if (clickedBlocks.get(bm).getType().equals(Type.PROTECTION)) { @@ -235,7 +234,7 @@ public class BlockInteractionListenerTest extends AbstractCommonSetup { clickedBlocks.get(bm).setSetting(world, true); } when(clickedBlock.getType()).thenReturn(bm); - PlayerInteractEvent e = new PlayerInteractEvent(player, Action.RIGHT_CLICK_BLOCK, item, clickedBlock, BlockFace.EAST, hand); + PlayerInteractEvent e = new PlayerInteractEvent(mockPlayer, Action.RIGHT_CLICK_BLOCK, item, clickedBlock, BlockFace.EAST, hand); bil.onPlayerInteract(e); assertNotEquals("Failure " + bm, Event.Result.DENY, e.useInteractedBlock()); verify(notifier, never()).notify(any(), eq("protection.protected")); @@ -250,7 +249,7 @@ public class BlockInteractionListenerTest extends AbstractCommonSetup { public void testOnPlayerInteractSpawnEggInHandNotAllowed() { when(clickedBlock.getType()).thenReturn(Material.SPAWNER); when(item.getType()).thenReturn(Material.BLAZE_SPAWN_EGG); - PlayerInteractEvent e = new PlayerInteractEvent(player, Action.RIGHT_CLICK_BLOCK, item, clickedBlock, BlockFace.EAST, hand); + PlayerInteractEvent e = new PlayerInteractEvent(mockPlayer, Action.RIGHT_CLICK_BLOCK, item, clickedBlock, BlockFace.EAST, hand); bil.onPlayerInteract(e); assertEquals(Event.Result.DENY, e.useInteractedBlock()); assertEquals(Event.Result.DENY, e.useItemInHand()); @@ -265,7 +264,7 @@ public class BlockInteractionListenerTest extends AbstractCommonSetup { when(island.isAllowed(any(), any())).thenReturn(true); when(clickedBlock.getType()).thenReturn(Material.SPAWNER); when(item.getType()).thenReturn(Material.BLAZE_SPAWN_EGG); - PlayerInteractEvent e = new PlayerInteractEvent(player, Action.RIGHT_CLICK_BLOCK, item, clickedBlock, BlockFace.EAST, hand); + PlayerInteractEvent e = new PlayerInteractEvent(mockPlayer, Action.RIGHT_CLICK_BLOCK, item, clickedBlock, BlockFace.EAST, hand); bil.onPlayerInteract(e); assertNotEquals(Event.Result.DENY, e.useInteractedBlock()); assertNotEquals(Event.Result.DENY, e.useItemInHand()); @@ -281,7 +280,7 @@ public class BlockInteractionListenerTest extends AbstractCommonSetup { when(island.isAllowed(any(), eq(Flags.PLACE_BLOCKS))).thenReturn(true); when(clickedBlock.getType()).thenReturn(Material.ITEM_FRAME); when(item.getType()).thenReturn(Material.BLAZE_SPAWN_EGG); - PlayerInteractEvent e = new PlayerInteractEvent(player, Action.RIGHT_CLICK_BLOCK, item, clickedBlock, BlockFace.EAST, hand); + PlayerInteractEvent e = new PlayerInteractEvent(mockPlayer, Action.RIGHT_CLICK_BLOCK, item, clickedBlock, BlockFace.EAST, hand); bil.onPlayerInteract(e); assertEquals(Event.Result.DENY, e.useInteractedBlock()); assertEquals(Event.Result.DENY, e.useItemInHand()); 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 3344ce17d..2183780ca 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 @@ -16,6 +16,7 @@ import org.bukkit.Location; import org.bukkit.Material; import org.bukkit.block.Block; import org.bukkit.block.BlockFace; +import org.bukkit.block.data.type.CaveVinesPlant; import org.bukkit.entity.ArmorStand; import org.bukkit.entity.Arrow; import org.bukkit.entity.Creeper; @@ -40,6 +41,7 @@ import org.bukkit.inventory.ItemStack; import org.junit.Before; import org.junit.Test; import org.junit.runner.RunWith; +import org.mockito.Mock; import org.powermock.core.classloader.annotations.PrepareForTest; import org.powermock.modules.junit4.PowerMockRunner; @@ -57,6 +59,10 @@ import world.bentobox.bentobox.util.Util; public class BreakBlocksListenerTest extends AbstractCommonSetup { private BreakBlocksListener bbl; + @Mock + private Block mockBlock; + @Mock + private ItemStack mockItem; @Override @Before @@ -79,7 +85,7 @@ public class BreakBlocksListenerTest extends AbstractCommonSetup { Block block = mock(Block.class); when(block.getLocation()).thenReturn(location); when(block.getType()).thenReturn(Material.DIRT); - BlockBreakEvent e = new BlockBreakEvent(block, player); + BlockBreakEvent e = new BlockBreakEvent(block, mockPlayer); bbl.onBlockBreak(e); assertFalse(e.isCancelled()); } @@ -93,7 +99,7 @@ public class BreakBlocksListenerTest extends AbstractCommonSetup { Block block = mock(Block.class); when(block.getType()).thenReturn(Material.DIRT); when(block.getLocation()).thenReturn(location); - BlockBreakEvent e = new BlockBreakEvent(block, player); + BlockBreakEvent e = new BlockBreakEvent(block, mockPlayer); bbl.onBlockBreak(e); assertTrue(e.isCancelled()); verify(notifier).notify(any(), eq("protection.protected")); @@ -109,7 +115,7 @@ public class BreakBlocksListenerTest extends AbstractCommonSetup { Block block = mock(Block.class); when(block.getType()).thenReturn(Material.PUMPKIN); when(block.getLocation()).thenReturn(location); - BlockBreakEvent e = new BlockBreakEvent(block, player); + BlockBreakEvent e = new BlockBreakEvent(block, mockPlayer); bbl.onBlockBreak(e); assertTrue(e.isCancelled()); verify(notifier).notify(any(), eq("protection.protected")); @@ -125,7 +131,7 @@ public class BreakBlocksListenerTest extends AbstractCommonSetup { Block block = mock(Block.class); when(block.getType()).thenReturn(Material.PUMPKIN); when(block.getLocation()).thenReturn(location); - BlockBreakEvent e = new BlockBreakEvent(block, player); + BlockBreakEvent e = new BlockBreakEvent(block, mockPlayer); bbl.onBlockBreak(e); assertFalse(e.isCancelled()); } @@ -138,7 +144,7 @@ public class BreakBlocksListenerTest extends AbstractCommonSetup { Hanging hanging = mock(Hanging.class); when(hanging.getLocation()).thenReturn(location); RemoveCause cause = RemoveCause.ENTITY; - HangingBreakByEntityEvent e = new HangingBreakByEntityEvent(hanging, player, cause); + HangingBreakByEntityEvent e = new HangingBreakByEntityEvent(hanging, mockPlayer, cause); bbl.onBreakHanging(e); assertFalse(e.isCancelled()); } @@ -152,7 +158,7 @@ public class BreakBlocksListenerTest extends AbstractCommonSetup { Hanging hanging = mock(Hanging.class); when(hanging.getLocation()).thenReturn(location); RemoveCause cause = RemoveCause.ENTITY; - HangingBreakByEntityEvent e = new HangingBreakByEntityEvent(hanging, player, cause); + HangingBreakByEntityEvent e = new HangingBreakByEntityEvent(hanging, mockPlayer, cause); bbl.onBreakHanging(e); assertTrue(e.isCancelled()); verify(notifier).notify(any(), eq("protection.protected")); @@ -196,7 +202,7 @@ public class BreakBlocksListenerTest extends AbstractCommonSetup { when(hanging.getLocation()).thenReturn(location); RemoveCause cause = RemoveCause.PHYSICS; Arrow arrow = mock(Arrow.class); - when(arrow.getShooter()).thenReturn(player); + when(arrow.getShooter()).thenReturn(mockPlayer); HangingBreakByEntityEvent e = new HangingBreakByEntityEvent(hanging, arrow, cause); bbl.onBreakHanging(e); assertTrue(e.isCancelled()); @@ -212,7 +218,7 @@ public class BreakBlocksListenerTest extends AbstractCommonSetup { when(hanging.getLocation()).thenReturn(location); RemoveCause cause = RemoveCause.PHYSICS; Arrow arrow = mock(Arrow.class); - when(arrow.getShooter()).thenReturn(player); + when(arrow.getShooter()).thenReturn(mockPlayer); HangingBreakByEntityEvent e = new HangingBreakByEntityEvent(hanging, arrow, cause); bbl.onBreakHanging(e); assertFalse(e.isCancelled()); @@ -227,7 +233,7 @@ public class BreakBlocksListenerTest extends AbstractCommonSetup { ItemStack item = mock(ItemStack.class); Block block = mock(Block.class); when(block.getLocation()).thenReturn(location); - PlayerInteractEvent e = new PlayerInteractEvent(player, Action.LEFT_CLICK_AIR, item, block, BlockFace.EAST); + PlayerInteractEvent e = new PlayerInteractEvent(mockPlayer, Action.LEFT_CLICK_AIR, item, block, BlockFace.EAST); bbl.onPlayerInteract(e); assertEquals(e.useInteractedBlock(), Result.ALLOW); } @@ -241,7 +247,8 @@ public class BreakBlocksListenerTest extends AbstractCommonSetup { Block block = mock(Block.class); when(block.getLocation()).thenReturn(location); when(block.getType()).thenReturn(Material.STONE); - PlayerInteractEvent e = new PlayerInteractEvent(player, Action.LEFT_CLICK_BLOCK, item, block, BlockFace.EAST); + PlayerInteractEvent e = new PlayerInteractEvent(mockPlayer, Action.LEFT_CLICK_BLOCK, item, block, + BlockFace.EAST); bbl.onPlayerInteract(e); assertEquals(Result.ALLOW, e.useInteractedBlock()); } @@ -256,15 +263,16 @@ public class BreakBlocksListenerTest extends AbstractCommonSetup { Block block = mock(Block.class); when(block.getLocation()).thenReturn(location); when(block.getType()).thenReturn(Material.CAKE); - PlayerInteractEvent e = new PlayerInteractEvent(player, Action.LEFT_CLICK_BLOCK, item, block, BlockFace.EAST); + PlayerInteractEvent e = new PlayerInteractEvent(mockPlayer, Action.LEFT_CLICK_BLOCK, item, block, + BlockFace.EAST); bbl.onPlayerInteract(e); assertFalse(e.isCancelled()); when(block.getType()).thenReturn(Material.SPAWNER); - e = new PlayerInteractEvent(player, Action.LEFT_CLICK_BLOCK, item, block, BlockFace.EAST); + e = new PlayerInteractEvent(mockPlayer, Action.LEFT_CLICK_BLOCK, item, block, BlockFace.EAST); bbl.onPlayerInteract(e); assertFalse(e.isCancelled()); when(block.getType()).thenReturn(Material.DRAGON_EGG); - e = new PlayerInteractEvent(player, Action.LEFT_CLICK_BLOCK, item, block, BlockFace.EAST); + e = new PlayerInteractEvent(mockPlayer, Action.LEFT_CLICK_BLOCK, item, block, BlockFace.EAST); bbl.onPlayerInteract(e); assertFalse(e.isCancelled()); } @@ -279,15 +287,16 @@ public class BreakBlocksListenerTest extends AbstractCommonSetup { Block block = mock(Block.class); when(block.getLocation()).thenReturn(location); when(block.getType()).thenReturn(Material.CAKE); - PlayerInteractEvent e = new PlayerInteractEvent(player, Action.LEFT_CLICK_BLOCK, item, block, BlockFace.EAST); + PlayerInteractEvent e = new PlayerInteractEvent(mockPlayer, Action.LEFT_CLICK_BLOCK, item, block, + BlockFace.EAST); bbl.onPlayerInteract(e); assertEquals(Result.DENY, e.useInteractedBlock()); when(block.getType()).thenReturn(Material.SPAWNER); - e = new PlayerInteractEvent(player, Action.LEFT_CLICK_BLOCK, item, block, BlockFace.EAST); + e = new PlayerInteractEvent(mockPlayer, Action.LEFT_CLICK_BLOCK, item, block, BlockFace.EAST); bbl.onPlayerInteract(e); assertEquals(Result.DENY, e.useInteractedBlock()); when(block.getType()).thenReturn(Material.DRAGON_EGG); - e = new PlayerInteractEvent(player, Action.LEFT_CLICK_BLOCK, item, block, BlockFace.EAST); + e = new PlayerInteractEvent(mockPlayer, Action.LEFT_CLICK_BLOCK, item, block, BlockFace.EAST); bbl.onPlayerInteract(e); assertEquals(Result.DENY, e.useInteractedBlock()); verify(notifier, times(3)).notify(any(), eq("protection.protected")); @@ -301,7 +310,7 @@ public class BreakBlocksListenerTest extends AbstractCommonSetup { Vehicle vehicle = mock(Vehicle.class); when(vehicle.getLocation()).thenReturn(location); when(vehicle.getType()).thenReturn(EntityType.MINECART); - VehicleDamageEvent e = new VehicleDamageEvent(vehicle, player, 10); + VehicleDamageEvent e = new VehicleDamageEvent(vehicle, mockPlayer, 10); bbl.onVehicleDamageEvent(e); assertFalse(e.isCancelled()); } @@ -315,7 +324,7 @@ public class BreakBlocksListenerTest extends AbstractCommonSetup { Vehicle vehicle = mock(Vehicle.class); when(vehicle.getLocation()).thenReturn(location); when(vehicle.getType()).thenReturn(EntityType.MINECART); - VehicleDamageEvent e = new VehicleDamageEvent(vehicle, player, 10); + VehicleDamageEvent e = new VehicleDamageEvent(vehicle, mockPlayer, 10); bbl.onVehicleDamageEvent(e); assertTrue(e.isCancelled()); verify(notifier).notify(any(), eq("protection.protected")); @@ -330,7 +339,7 @@ public class BreakBlocksListenerTest extends AbstractCommonSetup { Vehicle vehicle = mock(Vehicle.class); when(vehicle.getLocation()).thenReturn(location); when(vehicle.getType()).thenReturn(EntityType.BOAT); - VehicleDamageEvent e = new VehicleDamageEvent(vehicle, player, 10); + VehicleDamageEvent e = new VehicleDamageEvent(vehicle, mockPlayer, 10); bbl.onVehicleDamageEvent(e); assertTrue(e.isCancelled()); verify(notifier).notify(any(), eq("protection.protected")); @@ -345,7 +354,7 @@ public class BreakBlocksListenerTest extends AbstractCommonSetup { Vehicle vehicle = mock(Vehicle.class); when(vehicle.getLocation()).thenReturn(location); when(vehicle.getType()).thenReturn(EntityType.TRIDENT); - VehicleDamageEvent e = new VehicleDamageEvent(vehicle, player, 10); + VehicleDamageEvent e = new VehicleDamageEvent(vehicle, mockPlayer, 10); bbl.onVehicleDamageEvent(e); assertTrue(e.isCancelled()); verify(notifier).notify(any(), eq("protection.protected")); @@ -359,7 +368,7 @@ public class BreakBlocksListenerTest extends AbstractCommonSetup { when(iwm.inWorld(any(Location.class))).thenReturn(false); Vehicle vehicle = mock(Vehicle.class); when(vehicle.getLocation()).thenReturn(location); - VehicleDamageEvent e = new VehicleDamageEvent(vehicle, player, 10); + VehicleDamageEvent e = new VehicleDamageEvent(vehicle, mockPlayer, 10); bbl.onVehicleDamageEvent(e); assertFalse(e.isCancelled()); } @@ -382,8 +391,8 @@ public class BreakBlocksListenerTest extends AbstractCommonSetup { @Test public void testOnEntityDamageNotCovered() { DamageCause cause = DamageCause.ENTITY_ATTACK; - Entity damagee = player; - Entity damager = player; + Entity damagee = mockPlayer; + Entity damager = mockPlayer; EntityDamageByEntityEvent e = new EntityDamageByEntityEvent(damager, damagee, cause, null, 10); bbl.onEntityDamage(e); assertFalse(e.isCancelled()); @@ -396,7 +405,7 @@ public class BreakBlocksListenerTest extends AbstractCommonSetup { public void testOnEntityDamageAllowed() { DamageCause cause = DamageCause.ENTITY_ATTACK; Entity damagee = mock(ArmorStand.class); - Entity damager = player; + Entity damager = mockPlayer; EntityDamageByEntityEvent e = new EntityDamageByEntityEvent(damager, damagee, cause, null, 10); bbl.onEntityDamage(e); assertFalse(e.isCancelled()); @@ -419,7 +428,7 @@ public class BreakBlocksListenerTest extends AbstractCommonSetup { DamageCause cause = DamageCause.ENTITY_ATTACK; Entity damagee = mock(ArmorStand.class); when(damagee.getLocation()).thenReturn(location); - Entity damager = player; + Entity damager = mockPlayer; EntityDamageByEntityEvent e = new EntityDamageByEntityEvent(damager, damagee, cause, null, 10); bbl.onEntityDamage(e); assertTrue(e.isCancelled()); @@ -444,7 +453,7 @@ public class BreakBlocksListenerTest extends AbstractCommonSetup { DamageCause cause = DamageCause.ENTITY_ATTACK; Entity damagee = mock(ArmorStand.class); Projectile damager = mock(Projectile.class); - when(damager.getShooter()).thenReturn(player); + when(damager.getShooter()).thenReturn(mockPlayer); EntityDamageByEntityEvent e = new EntityDamageByEntityEvent(damager, damagee, cause, null, 10); bbl.onEntityDamage(e); assertFalse(e.isCancelled()); @@ -490,7 +499,7 @@ public class BreakBlocksListenerTest extends AbstractCommonSetup { Entity damagee = mock(ArmorStand.class); when(damagee.getLocation()).thenReturn(location); Projectile damager = mock(Projectile.class); - when(damager.getShooter()).thenReturn(player); + when(damager.getShooter()).thenReturn(mockPlayer); EntityDamageByEntityEvent e = new EntityDamageByEntityEvent(damager, damagee, cause, null, 10); bbl.onEntityDamage(e); assertTrue(e.isCancelled()); @@ -511,4 +520,105 @@ public class BreakBlocksListenerTest extends AbstractCommonSetup { verify(notifier, times(3)).notify(any(), eq("protection.protected")); verify(damagee).setFireTicks(0); } + + /** + * Test method for {@link world.bentobox.bentobox.listeners.flags.protection.BreakBlocksListener#onPlayerInteract(PlayerInteractEvent)} + */ + @Test + public void testRightClickCaveVinesWithBerries() { + when(mockBlock.getType()).thenReturn(Material.CAVE_VINES); + when(mockBlock.getLocation()).thenReturn(location); + CaveVinesPlant mockCaveVinesPlant = mock(CaveVinesPlant.class); + when(mockBlock.getBlockData()).thenReturn(mockCaveVinesPlant); + when(mockCaveVinesPlant.isBerries()).thenReturn(true); + + PlayerInteractEvent e = new PlayerInteractEvent(mockPlayer, Action.RIGHT_CLICK_BLOCK, mockItem, mockBlock, + BlockFace.UP); + bbl.onPlayerInteract(e); + + assertTrue(e.useInteractedBlock() == Result.ALLOW); + } + + /** + * Test method for {@link world.bentobox.bentobox.listeners.flags.protection.BreakBlocksListener#onPlayerInteract(PlayerInteractEvent)} + */ + @Test + public void testRightClickSweetBerryBush() { + when(mockBlock.getType()).thenReturn(Material.SWEET_BERRY_BUSH); + when(mockBlock.getLocation()).thenReturn(location); + PlayerInteractEvent e = new PlayerInteractEvent(mockPlayer, Action.RIGHT_CLICK_BLOCK, mockItem, mockBlock, + BlockFace.UP); + bbl.onPlayerInteract(e); + + assertTrue(e.useInteractedBlock() == Result.ALLOW); + } + + /** + * Test method for {@link world.bentobox.bentobox.listeners.flags.protection.BreakBlocksListener#onPlayerInteract(PlayerInteractEvent)} + */ + @Test + public void testRightClickRootedDirt() { + when(mockBlock.getType()).thenReturn(Material.ROOTED_DIRT); + when(mockBlock.getLocation()).thenReturn(location); + PlayerInteractEvent e = new PlayerInteractEvent(mockPlayer, Action.RIGHT_CLICK_BLOCK, mockItem, mockBlock, + BlockFace.UP); + bbl.onPlayerInteract(e); + + assertTrue(e.useInteractedBlock() == Result.ALLOW); + } + + /** + * Test method for {@link world.bentobox.bentobox.listeners.flags.protection.BreakBlocksListener#onPlayerInteract(PlayerInteractEvent)} + */ + @Test + public void testLeftClickCake() { + when(mockBlock.getType()).thenReturn(Material.CAKE); + when(mockBlock.getLocation()).thenReturn(location); + PlayerInteractEvent e = new PlayerInteractEvent(mockPlayer, Action.LEFT_CLICK_BLOCK, mockItem, mockBlock, + BlockFace.UP); + bbl.onPlayerInteract(e); + assertTrue(e.useInteractedBlock() == Result.ALLOW); + } + + /** + * Test method for {@link world.bentobox.bentobox.listeners.flags.protection.BreakBlocksListener#onPlayerInteract(PlayerInteractEvent)} + */ + @Test + public void testLeftClickSpawner() { + when(mockBlock.getType()).thenReturn(Material.SPAWNER); + when(mockBlock.getLocation()).thenReturn(location); + PlayerInteractEvent e = new PlayerInteractEvent(mockPlayer, Action.LEFT_CLICK_BLOCK, mockItem, mockBlock, + BlockFace.UP); + bbl.onPlayerInteract(e); + + assertTrue(e.useInteractedBlock() == Result.ALLOW); + } + + /** + * Test method for {@link world.bentobox.bentobox.listeners.flags.protection.BreakBlocksListener#onPlayerInteract(PlayerInteractEvent)} + */ + @Test + public void testLeftClickDragonEgg() { + when(mockBlock.getType()).thenReturn(Material.DRAGON_EGG); + when(mockBlock.getLocation()).thenReturn(location); + PlayerInteractEvent e = new PlayerInteractEvent(mockPlayer, Action.LEFT_CLICK_BLOCK, mockItem, mockBlock, + BlockFace.UP); + bbl.onPlayerInteract(e); + + assertTrue(e.useInteractedBlock() == Result.ALLOW); + } + + /** + * Test method for {@link world.bentobox.bentobox.listeners.flags.protection.BreakBlocksListener#onPlayerInteract(PlayerInteractEvent)} + */ + @Test + public void testLeftClickHopper() { + when(mockBlock.getType()).thenReturn(Material.HOPPER); + when(mockBlock.getLocation()).thenReturn(location); + PlayerInteractEvent e = new PlayerInteractEvent(mockPlayer, Action.LEFT_CLICK_BLOCK, mockItem, mockBlock, + BlockFace.UP); + bbl.onPlayerInteract(e); + + assertTrue(e.useInteractedBlock() == Result.ALLOW); + } } diff --git a/src/test/java/world/bentobox/bentobox/listeners/flags/protection/BreedingListenerTest.java b/src/test/java/world/bentobox/bentobox/listeners/flags/protection/BreedingListenerTest.java index 4b0578525..fc88fc7aa 100644 --- a/src/test/java/world/bentobox/bentobox/listeners/flags/protection/BreedingListenerTest.java +++ b/src/test/java/world/bentobox/bentobox/listeners/flags/protection/BreedingListenerTest.java @@ -75,7 +75,7 @@ public class BreedingListenerTest extends AbstractCommonSetup { when(itemInOffHand.getType()).thenReturn(Material.AIR); when(inv.getItemInMainHand()).thenReturn(itemInMainHand); when(inv.getItemInOffHand()).thenReturn(itemInOffHand); - when(player.getInventory()).thenReturn(inv); + when(mockPlayer.getInventory()).thenReturn(inv); } @@ -86,7 +86,7 @@ public class BreedingListenerTest extends AbstractCommonSetup { public void testOnPlayerInteractNotAnimal() { Entity clickedEntity = mock(Entity.class); Vector position = new Vector(0,0,0); - PlayerInteractAtEntityEvent e = new PlayerInteractAtEntityEvent(player, clickedEntity, position); + PlayerInteractAtEntityEvent e = new PlayerInteractAtEntityEvent(mockPlayer, clickedEntity, position); new BreedingListener().onPlayerInteract(e); assertFalse("Not animal failed", e.isCancelled()); } @@ -98,7 +98,7 @@ public class BreedingListenerTest extends AbstractCommonSetup { public void testOnPlayerInteractAnimalNothingInMainHand() { Animals clickedEntity = mock(Animals.class); Vector position = new Vector(0,0,0); - PlayerInteractAtEntityEvent e = new PlayerInteractAtEntityEvent(player, clickedEntity, position); + PlayerInteractAtEntityEvent e = new PlayerInteractAtEntityEvent(mockPlayer, clickedEntity, position); new BreedingListener().onPlayerInteract(e); assertFalse("Animal, nothing in main hand failed", e.isCancelled()); } @@ -110,7 +110,7 @@ public class BreedingListenerTest extends AbstractCommonSetup { public void testOnPlayerInteractAnimalNothingInOffHand() { Animals clickedEntity = mock(Animals.class); Vector position = new Vector(0,0,0); - PlayerInteractAtEntityEvent e = new PlayerInteractAtEntityEvent(player, clickedEntity, position, EquipmentSlot.OFF_HAND); + PlayerInteractAtEntityEvent e = new PlayerInteractAtEntityEvent(mockPlayer, clickedEntity, position, EquipmentSlot.OFF_HAND); new BreedingListener().onPlayerInteract(e); assertFalse("Animal, nothing in off hand failed", e.isCancelled()); } @@ -127,7 +127,7 @@ public class BreedingListenerTest extends AbstractCommonSetup { when(iwm.inWorld(any(World.class))).thenReturn(false); when(iwm.inWorld(any(Location.class))).thenReturn(false); Vector position = new Vector(0,0,0); - PlayerInteractAtEntityEvent e = new PlayerInteractAtEntityEvent(player, clickedEntity, position); + PlayerInteractAtEntityEvent e = new PlayerInteractAtEntityEvent(mockPlayer, clickedEntity, position); BreedingListener bl = new BreedingListener(); Material breedingMat = BREEDABLE_WITH; @@ -149,7 +149,7 @@ public class BreedingListenerTest extends AbstractCommonSetup { when(clickedEntity.getLocation()).thenReturn(location); when(clickedEntity.getType()).thenReturn(EntityType.COW); Vector position = new Vector(0,0,0); - PlayerInteractAtEntityEvent e = new PlayerInteractAtEntityEvent(player, clickedEntity, position); + PlayerInteractAtEntityEvent e = new PlayerInteractAtEntityEvent(mockPlayer, clickedEntity, position); BreedingListener bl = new BreedingListener(); Material breedingMat = BREEDABLE_WITH; @@ -172,7 +172,7 @@ public class BreedingListenerTest extends AbstractCommonSetup { when(iwm.inWorld(any(World.class))).thenReturn(false); when(iwm.inWorld(any(Location.class))).thenReturn(false); Vector position = new Vector(0,0,0); - PlayerInteractAtEntityEvent e = new PlayerInteractAtEntityEvent(player, clickedEntity, position, EquipmentSlot.OFF_HAND); + PlayerInteractAtEntityEvent e = new PlayerInteractAtEntityEvent(mockPlayer, clickedEntity, position, EquipmentSlot.OFF_HAND); BreedingListener bl = new BreedingListener(); Material breedingMat = BREEDABLE_WITH; @@ -194,7 +194,7 @@ public class BreedingListenerTest extends AbstractCommonSetup { when(clickedEntity.getLocation()).thenReturn(location); when(clickedEntity.getType()).thenReturn(ENTITY_TYPE); Vector position = new Vector(0,0,0); - PlayerInteractAtEntityEvent e = new PlayerInteractAtEntityEvent(player, clickedEntity, position, EquipmentSlot.OFF_HAND); + PlayerInteractAtEntityEvent e = new PlayerInteractAtEntityEvent(mockPlayer, clickedEntity, position, EquipmentSlot.OFF_HAND); BreedingListener bl = new BreedingListener(); Material breedingMat = BREEDABLE_WITH; @@ -212,7 +212,7 @@ public class BreedingListenerTest extends AbstractCommonSetup { when(clickedEntity.getLocation()).thenReturn(location); when(clickedEntity.getType()).thenReturn(EntityType.COW); Vector position = new Vector(0,0,0); - PlayerInteractAtEntityEvent e = new PlayerInteractAtEntityEvent(player, clickedEntity, position); + PlayerInteractAtEntityEvent e = new PlayerInteractAtEntityEvent(mockPlayer, clickedEntity, position); BreedingListener bl = new BreedingListener(); Material breedingMat = NOT_BREEDABLE_WITH; 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 45ea1d3eb..049841d37 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 @@ -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, EquipmentSlot.HAND); + PlayerBucketEmptyEvent e = new PlayerBucketEmptyEvent(mockPlayer, 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, EquipmentSlot.HAND); + PlayerBucketEmptyEvent e = new PlayerBucketEmptyEvent(mockPlayer, 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, EquipmentSlot.HAND); + PlayerBucketFillEvent e = new PlayerBucketFillEvent(mockPlayer, 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, EquipmentSlot.HAND); + e = new PlayerBucketFillEvent(mockPlayer, 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, EquipmentSlot.HAND); + e = new PlayerBucketFillEvent(mockPlayer, 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, EquipmentSlot.HAND); + e = new PlayerBucketFillEvent(mockPlayer, 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, EquipmentSlot.HAND); + PlayerBucketFillEvent e = new PlayerBucketFillEvent(mockPlayer, 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, EquipmentSlot.HAND); + e = new PlayerBucketFillEvent(mockPlayer, 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, EquipmentSlot.HAND); + e = new PlayerBucketFillEvent(mockPlayer, 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, EquipmentSlot.HAND); + e = new PlayerBucketFillEvent(mockPlayer, 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, EquipmentSlot.HAND); + PlayerBucketFillEvent e = new PlayerBucketFillEvent(mockPlayer, 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, EquipmentSlot.HAND); + e = new PlayerBucketFillEvent(mockPlayer, 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, EquipmentSlot.HAND); + e = new PlayerBucketFillEvent(mockPlayer, 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, EquipmentSlot.HAND); + e = new PlayerBucketFillEvent(mockPlayer, block, block, BlockFace.UP, Material.WATER_BUCKET, item, EquipmentSlot.HAND); l.onBucketFill(e); assertFalse(e.isCancelled()); @@ -191,7 +191,7 @@ public class BucketListenerTest extends AbstractCommonSetup { */ @Test public void testOnTropicalFishScoopingNotFish() { - PlayerInteractEntityEvent e = new PlayerInteractEntityEvent(player, player); + PlayerInteractEntityEvent e = new PlayerInteractEntityEvent(mockPlayer, mockPlayer); l.onTropicalFishScooping(e); assertFalse(e.isCancelled()); } @@ -203,12 +203,12 @@ public class BucketListenerTest extends AbstractCommonSetup { public void testOnTropicalFishScoopingFishNoWaterBucket() { TropicalFish fish = mock(TropicalFish.class); when(fish.getLocation()).thenReturn(location); - PlayerInteractEntityEvent e = new PlayerInteractEntityEvent(player, fish ); + PlayerInteractEntityEvent e = new PlayerInteractEntityEvent(mockPlayer, fish ); PlayerInventory inv = mock(PlayerInventory.class); ItemStack item = mock(ItemStack.class); when(item.getType()).thenReturn(Material.STONE); when(inv.getItemInMainHand()).thenReturn(item); - when(player.getInventory()).thenReturn(inv); + when(mockPlayer.getInventory()).thenReturn(inv); l.onTropicalFishScooping(e); assertFalse(e.isCancelled()); } @@ -220,12 +220,12 @@ public class BucketListenerTest extends AbstractCommonSetup { public void testOnTropicalFishScoopingFishWaterBucket() { TropicalFish fish = mock(TropicalFish.class); when(fish.getLocation()).thenReturn(location); - PlayerInteractEntityEvent e = new PlayerInteractEntityEvent(player, fish ); + PlayerInteractEntityEvent e = new PlayerInteractEntityEvent(mockPlayer, fish ); PlayerInventory inv = mock(PlayerInventory.class); ItemStack item = mock(ItemStack.class); when(item.getType()).thenReturn(Material.WATER_BUCKET); when(inv.getItemInMainHand()).thenReturn(item); - when(player.getInventory()).thenReturn(inv); + when(mockPlayer.getInventory()).thenReturn(inv); l.onTropicalFishScooping(e); assertFalse(e.isCancelled()); } @@ -238,12 +238,12 @@ public class BucketListenerTest extends AbstractCommonSetup { when(island.isAllowed(any(), any())).thenReturn(false); TropicalFish fish = mock(TropicalFish.class); when(fish.getLocation()).thenReturn(location); - PlayerInteractEntityEvent e = new PlayerInteractEntityEvent(player, fish ); + PlayerInteractEntityEvent e = new PlayerInteractEntityEvent(mockPlayer, fish ); PlayerInventory inv = mock(PlayerInventory.class); ItemStack item = mock(ItemStack.class); when(item.getType()).thenReturn(Material.WATER_BUCKET); when(inv.getItemInMainHand()).thenReturn(item); - when(player.getInventory()).thenReturn(inv); + when(mockPlayer.getInventory()).thenReturn(inv); l.onTropicalFishScooping(e); assertTrue(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 b4103ff38..dfd94361a 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 @@ -54,7 +54,7 @@ public class EggListenerTest extends AbstractCommonSetup { public void testOnEggThrowAllowed() { Egg egg = mock(Egg.class); when(egg.getLocation()).thenReturn(location); - PlayerEggThrowEvent e = new PlayerEggThrowEvent(player, egg, false, (byte) 0, EntityType.CHICKEN); + PlayerEggThrowEvent e = new PlayerEggThrowEvent(mockPlayer, egg, false, (byte) 0, EntityType.CHICKEN); el.onEggThrow(e); verify(notifier, never()).notify(any(), anyString()); } @@ -67,7 +67,7 @@ public class EggListenerTest extends AbstractCommonSetup { when(island.isAllowed(any(), any())).thenReturn(false); Egg egg = mock(Egg.class); when(egg.getLocation()).thenReturn(location); - PlayerEggThrowEvent e = new PlayerEggThrowEvent(player, egg, false, (byte) 0, EntityType.CHICKEN); + PlayerEggThrowEvent e = new PlayerEggThrowEvent(mockPlayer, egg, false, (byte) 0, EntityType.CHICKEN); el.onEggThrow(e); assertFalse(e.isHatching()); verify(notifier).notify(any(), eq("protection.protected")); 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 7ede01502..74ac31b0d 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 @@ -40,7 +40,7 @@ public class ElytraListenerTest extends AbstractCommonSetup { super.setUp(); // Player - when(player.isGliding()).thenReturn(true); + when(mockPlayer.isGliding()).thenReturn(true); // Default is that everything is allowed when(island.isAllowed(any(), any())).thenReturn(true); @@ -54,7 +54,7 @@ public class ElytraListenerTest extends AbstractCommonSetup { */ @Test public void testOnGlideAllowed() { - EntityToggleGlideEvent e = new EntityToggleGlideEvent(player, false); + EntityToggleGlideEvent e = new EntityToggleGlideEvent(mockPlayer, false); el.onGlide(e); assertFalse(e.isCancelled()); verify(notifier, never()).notify(any(), anyString()); @@ -66,7 +66,7 @@ public class ElytraListenerTest extends AbstractCommonSetup { @Test public void testOnGlideNotAllowed() { when(island.isAllowed(any(), any())).thenReturn(false); - EntityToggleGlideEvent e = new EntityToggleGlideEvent(player, false); + EntityToggleGlideEvent e = new EntityToggleGlideEvent(mockPlayer, false); el.onGlide(e); assertTrue(e.isCancelled()); verify(notifier).notify(any(), eq("protection.protected")); @@ -77,7 +77,7 @@ public class ElytraListenerTest extends AbstractCommonSetup { */ @Test public void testGlidingAllowed() { - PlayerTeleportEvent e = new PlayerTeleportEvent(player, location, location); + PlayerTeleportEvent e = new PlayerTeleportEvent(mockPlayer, location, location); el.onGliding(e); verify(notifier, never()).notify(any(), anyString()); assertFalse(e.isCancelled()); @@ -89,7 +89,7 @@ public class ElytraListenerTest extends AbstractCommonSetup { @Test public void testGlidingNotAllowed() { when(island.isAllowed(any(), any())).thenReturn(false); - PlayerTeleportEvent e = new PlayerTeleportEvent(player, location, location); + PlayerTeleportEvent e = new PlayerTeleportEvent(mockPlayer, location, location); el.onGliding(e); verify(notifier).notify(any(), eq("protection.protected")); assertTrue(e.isCancelled()); @@ -100,8 +100,8 @@ public class ElytraListenerTest extends AbstractCommonSetup { @Test public void testGlidingNotGliding() { when(island.isAllowed(any(), any())).thenReturn(false); - when(player.isGliding()).thenReturn(false); - PlayerTeleportEvent e = new PlayerTeleportEvent(player, location, location); + when(mockPlayer.isGliding()).thenReturn(false); + PlayerTeleportEvent e = new PlayerTeleportEvent(mockPlayer, location, location); el.onGliding(e); verify(notifier, never()).notify(any(), anyString()); assertFalse(e.isCancelled()); 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 76010161b..a84dd0034 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 @@ -83,7 +83,7 @@ public class EntityInteractListenerTest extends AbstractCommonSetup { public void testOnPlayerInteractAtEntityArmorStandNoInteraction() { clickedEntity = mock(ArmorStand.class); when(clickedEntity.getLocation()).thenReturn(location); - PlayerInteractAtEntityEvent e = new PlayerInteractAtEntityEvent(player, clickedEntity, position, hand); + PlayerInteractAtEntityEvent e = new PlayerInteractAtEntityEvent(mockPlayer, clickedEntity, position, hand); eil.onPlayerInteractAtEntity(e); verify(notifier).notify(any(), eq("protection.protected")); assertTrue(e.isCancelled()); @@ -97,7 +97,7 @@ public class EntityInteractListenerTest extends AbstractCommonSetup { when(island.isAllowed(any(User.class), any())).thenReturn(true); clickedEntity = mock(ArmorStand.class); when(clickedEntity.getLocation()).thenReturn(location); - PlayerInteractAtEntityEvent e = new PlayerInteractAtEntityEvent(player, clickedEntity, position, hand); + PlayerInteractAtEntityEvent e = new PlayerInteractAtEntityEvent(mockPlayer, clickedEntity, position, hand); eil.onPlayerInteractAtEntity(e); verify(notifier, never()).notify(any(), eq("protection.protected")); assertFalse(e.isCancelled()); @@ -110,7 +110,7 @@ public class EntityInteractListenerTest extends AbstractCommonSetup { public void testOnPlayerInteractEntityHorseNoInteraction() { clickedEntity = mock(Horse.class); when(clickedEntity.getLocation()).thenReturn(location); - PlayerInteractEntityEvent e = new PlayerInteractEntityEvent(player, clickedEntity, hand); + PlayerInteractEntityEvent e = new PlayerInteractEntityEvent(mockPlayer, clickedEntity, hand); eil.onPlayerInteractEntity(e); verify(notifier).notify(any(), eq("protection.protected")); assertTrue(e.isCancelled()); @@ -124,7 +124,7 @@ public class EntityInteractListenerTest extends AbstractCommonSetup { when(island.isAllowed(any(User.class), any())).thenReturn(true); clickedEntity = mock(Horse.class); when(clickedEntity.getLocation()).thenReturn(location); - PlayerInteractEntityEvent e = new PlayerInteractEntityEvent(player, clickedEntity, hand); + PlayerInteractEntityEvent e = new PlayerInteractEntityEvent(mockPlayer, clickedEntity, hand); eil.onPlayerInteractEntity(e); verify(notifier, never()).notify(any(), eq("protection.protected")); assertFalse(e.isCancelled()); @@ -137,7 +137,7 @@ public class EntityInteractListenerTest extends AbstractCommonSetup { public void testOnPlayerInteractEntityMinecartNoInteraction() { clickedEntity = mock(RideableMinecart.class); when(clickedEntity.getLocation()).thenReturn(location); - PlayerInteractEntityEvent e = new PlayerInteractEntityEvent(player, clickedEntity, hand); + PlayerInteractEntityEvent e = new PlayerInteractEntityEvent(mockPlayer, clickedEntity, hand); eil.onPlayerInteractEntity(e); verify(notifier).notify(any(), eq("protection.protected")); assertTrue(e.isCancelled()); @@ -151,7 +151,7 @@ public class EntityInteractListenerTest extends AbstractCommonSetup { when(island.isAllowed(any(User.class), any())).thenReturn(true); clickedEntity = mock(RideableMinecart.class); when(clickedEntity.getLocation()).thenReturn(location); - PlayerInteractEntityEvent e = new PlayerInteractEntityEvent(player, clickedEntity, hand); + PlayerInteractEntityEvent e = new PlayerInteractEntityEvent(mockPlayer, clickedEntity, hand); eil.onPlayerInteractEntity(e); verify(notifier, never()).notify(any(), eq("protection.protected")); assertFalse(e.isCancelled()); @@ -164,7 +164,7 @@ public class EntityInteractListenerTest extends AbstractCommonSetup { public void testOnPlayerInteractEntityBoatNoInteraction() { clickedEntity = mock(Boat.class); when(clickedEntity.getLocation()).thenReturn(location); - PlayerInteractEntityEvent e = new PlayerInteractEntityEvent(player, clickedEntity, hand); + PlayerInteractEntityEvent e = new PlayerInteractEntityEvent(mockPlayer, clickedEntity, hand); eil.onPlayerInteractEntity(e); verify(notifier).notify(any(), eq("protection.protected")); assertTrue(e.isCancelled()); @@ -178,7 +178,7 @@ public class EntityInteractListenerTest extends AbstractCommonSetup { when(island.isAllowed(any(User.class), any())).thenReturn(true); clickedEntity = mock(Boat.class); when(clickedEntity.getLocation()).thenReturn(location); - PlayerInteractEntityEvent e = new PlayerInteractEntityEvent(player, clickedEntity, hand); + PlayerInteractEntityEvent e = new PlayerInteractEntityEvent(mockPlayer, clickedEntity, hand); eil.onPlayerInteractEntity(e); verify(notifier, never()).notify(any(), eq("protection.protected")); assertFalse(e.isCancelled()); @@ -191,7 +191,7 @@ public class EntityInteractListenerTest extends AbstractCommonSetup { public void testOnPlayerInteractEntityVillagerNoInteraction() { clickedEntity = mock(Villager.class); when(clickedEntity.getLocation()).thenReturn(location); - PlayerInteractEntityEvent e = new PlayerInteractEntityEvent(player, clickedEntity, hand); + PlayerInteractEntityEvent e = new PlayerInteractEntityEvent(mockPlayer, clickedEntity, hand); eil.onPlayerInteractEntity(e); verify(notifier, times(2)).notify(any(), eq("protection.protected")); assertTrue(e.isCancelled()); @@ -205,7 +205,7 @@ public class EntityInteractListenerTest extends AbstractCommonSetup { when(island.isAllowed(any(User.class), any())).thenReturn(true); clickedEntity = mock(Villager.class); when(clickedEntity.getLocation()).thenReturn(location); - PlayerInteractEntityEvent e = new PlayerInteractEntityEvent(player, clickedEntity, hand); + PlayerInteractEntityEvent e = new PlayerInteractEntityEvent(mockPlayer, clickedEntity, hand); eil.onPlayerInteractEntity(e); verify(notifier, never()).notify(any(), eq("protection.protected")); assertFalse(e.isCancelled()); @@ -221,7 +221,7 @@ public class EntityInteractListenerTest extends AbstractCommonSetup { when(island.isAllowed(any(User.class), eq(Flags.NAME_TAG))).thenReturn(true); clickedEntity = mock(Villager.class); when(clickedEntity.getLocation()).thenReturn(location); - PlayerInteractEntityEvent e = new PlayerInteractEntityEvent(player, clickedEntity, hand); + PlayerInteractEntityEvent e = new PlayerInteractEntityEvent(mockPlayer, clickedEntity, hand); eil.onPlayerInteractEntity(e); verify(notifier).notify(any(), eq("protection.protected")); assertTrue(e.isCancelled()); @@ -236,7 +236,7 @@ public class EntityInteractListenerTest extends AbstractCommonSetup { when(island.isAllowed(any(User.class), eq(Flags.NAME_TAG))).thenReturn(false); clickedEntity = mock(Villager.class); when(clickedEntity.getLocation()).thenReturn(location); - PlayerInteractEntityEvent e = new PlayerInteractEntityEvent(player, clickedEntity, hand); + PlayerInteractEntityEvent e = new PlayerInteractEntityEvent(mockPlayer, clickedEntity, hand); eil.onPlayerInteractEntity(e); verify(notifier).notify(any(), eq("protection.protected")); assertTrue(e.isCancelled()); @@ -250,7 +250,7 @@ public class EntityInteractListenerTest extends AbstractCommonSetup { clickedEntity = mock(WanderingTrader.class); when(clickedEntity.getLocation()).thenReturn(location); when(clickedEntity.getType()).thenReturn(EntityType.WANDERING_TRADER); - PlayerInteractEntityEvent e = new PlayerInteractEntityEvent(player, clickedEntity, hand); + PlayerInteractEntityEvent e = new PlayerInteractEntityEvent(mockPlayer, clickedEntity, hand); eil.onPlayerInteractEntity(e); verify(notifier, times(2)).notify(any(), eq("protection.protected")); assertTrue(e.isCancelled()); @@ -265,7 +265,7 @@ public class EntityInteractListenerTest extends AbstractCommonSetup { clickedEntity = mock(WanderingTrader.class); when(clickedEntity.getType()).thenReturn(EntityType.WANDERING_TRADER); when(clickedEntity.getLocation()).thenReturn(location); - PlayerInteractEntityEvent e = new PlayerInteractEntityEvent(player, clickedEntity, hand); + PlayerInteractEntityEvent e = new PlayerInteractEntityEvent(mockPlayer, clickedEntity, hand); eil.onPlayerInteractEntity(e); verify(notifier, never()).notify(any(), eq("protection.protected")); assertFalse(e.isCancelled()); @@ -284,7 +284,7 @@ public class EntityInteractListenerTest extends AbstractCommonSetup { clickedEntity = mock(WanderingTrader.class); when(clickedEntity.getType()).thenReturn(EntityType.WANDERING_TRADER); when(clickedEntity.getLocation()).thenReturn(location); - PlayerInteractEntityEvent e = new PlayerInteractEntityEvent(player, clickedEntity, hand); + PlayerInteractEntityEvent e = new PlayerInteractEntityEvent(mockPlayer, clickedEntity, hand); eil.onPlayerInteractEntity(e); verify(notifier).notify(any(), eq("protection.protected")); assertTrue(e.isCancelled()); @@ -301,7 +301,7 @@ public class EntityInteractListenerTest extends AbstractCommonSetup { clickedEntity = mock(WanderingTrader.class); when(clickedEntity.getType()).thenReturn(EntityType.WANDERING_TRADER); when(clickedEntity.getLocation()).thenReturn(location); - PlayerInteractEntityEvent e = new PlayerInteractEntityEvent(player, clickedEntity, hand); + PlayerInteractEntityEvent e = new PlayerInteractEntityEvent(mockPlayer, clickedEntity, hand); eil.onPlayerInteractEntity(e); verify(notifier).notify(any(), eq("protection.protected")); assertTrue(e.isCancelled()); @@ -316,7 +316,7 @@ public class EntityInteractListenerTest extends AbstractCommonSetup { when(clickedEntity.getLocation()).thenReturn(location); when(clickedEntity.getType()).thenReturn(EntityType.SHEEP); when(inv.getItemInMainHand()).thenReturn(new ItemStack(Material.AIR)); - PlayerInteractEntityEvent e = new PlayerInteractEntityEvent(player, clickedEntity, hand); + PlayerInteractEntityEvent e = new PlayerInteractEntityEvent(mockPlayer, clickedEntity, hand); eil.onPlayerInteractEntity(e); verify(notifier, never()).notify(any(), eq("protection.protected")); assertFalse(e.isCancelled()); @@ -330,7 +330,7 @@ public class EntityInteractListenerTest extends AbstractCommonSetup { clickedEntity = mock(Sheep.class); when(clickedEntity.getLocation()).thenReturn(location); when(clickedEntity.getType()).thenReturn(EntityType.SHEEP); - PlayerInteractEntityEvent e = new PlayerInteractEntityEvent(player, clickedEntity, hand); + PlayerInteractEntityEvent e = new PlayerInteractEntityEvent(mockPlayer, clickedEntity, hand); eil.onPlayerInteractEntity(e); verify(notifier).notify(any(), eq("protection.protected")); assertTrue(e.isCancelled()); 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 77a274bab..f4883d1a0 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 @@ -55,7 +55,7 @@ public class ExperiencePickupListenerTest extends AbstractCommonSetup { when(entity.getLocation()).thenReturn(location); TargetReason reason = TargetReason.CLOSEST_PLAYER; - e = new EntityTargetLivingEntityEvent(entity, player, reason); + e = new EntityTargetLivingEntityEvent(entity, mockPlayer, reason); epl = new ExperiencePickupListener(); } diff --git a/src/test/java/world/bentobox/bentobox/listeners/flags/protection/FireListenerTest.java b/src/test/java/world/bentobox/bentobox/listeners/flags/protection/FireListenerTest.java index 75a12c3eb..91fff7e00 100644 --- a/src/test/java/world/bentobox/bentobox/listeners/flags/protection/FireListenerTest.java +++ b/src/test/java/world/bentobox/bentobox/listeners/flags/protection/FireListenerTest.java @@ -67,7 +67,7 @@ public class FireListenerTest { public void setUp() { worldFlags.clear(); - PowerMockito.mockStatic(Bukkit.class); + PowerMockito.mockStatic(Bukkit.class, Mockito.RETURNS_MOCKS); // Set up plugin plugin = mock(BentoBox.class); Whitebox.setInternalState(BentoBox.class, "instance", plugin); 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 7949f1bd8..86740fe9b 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 @@ -69,7 +69,7 @@ public class HurtingListenerTest extends AbstractCommonSetup { when(Util.isHostileEntity(any())).thenCallRealMethod(); // User & player - user = User.getInstance(player); + user = User.getInstance(mockPlayer); } /** @@ -88,7 +88,7 @@ public class HurtingListenerTest extends AbstractCommonSetup { */ @Test public void testOnEntityDamagePlayeronMonster() { - EntityDamageByEntityEvent e = new EntityDamageByEntityEvent(player, enderman, null, null, 0); + EntityDamageByEntityEvent e = new EntityDamageByEntityEvent(mockPlayer, enderman, null, null, 0); HurtingListener hl = new HurtingListener(); hl.onEntityDamage(e); assertTrue(e.isCancelled()); @@ -100,8 +100,8 @@ public class HurtingListenerTest extends AbstractCommonSetup { */ @Test public void testOnEntityDamagePlayeronMonsterOp() { - when(player.isOp()).thenReturn(true); - EntityDamageByEntityEvent e = new EntityDamageByEntityEvent(player, enderman, null, null, 0); + when(mockPlayer.isOp()).thenReturn(true); + EntityDamageByEntityEvent e = new EntityDamageByEntityEvent(mockPlayer, enderman, null, null, 0); HurtingListener hl = new HurtingListener(); hl.onEntityDamage(e); assertFalse(e.isCancelled()); @@ -116,7 +116,7 @@ public class HurtingListenerTest extends AbstractCommonSetup { ArmorStand entity = mock(ArmorStand.class); when(entity.getLocation()).thenReturn(location); State state = State.CAUGHT_ENTITY; - PlayerFishEvent e = new PlayerFishEvent(player, entity, hookEntity, state); + PlayerFishEvent e = new PlayerFishEvent(mockPlayer, entity, hookEntity, state); HurtingListener hl = new HurtingListener(); hl.onFishing(e); // Verify @@ -131,7 +131,7 @@ public class HurtingListenerTest extends AbstractCommonSetup { ArmorStand entity = mock(ArmorStand.class); when(entity.getLocation()).thenReturn(location); State state = State.CAUGHT_ENTITY; - PlayerFishEvent e = new PlayerFishEvent(player, entity, hookEntity, state); + PlayerFishEvent e = new PlayerFishEvent(mockPlayer, entity, hookEntity, state); HurtingListener hl = new HurtingListener(); // Allow when(island.isAllowed(any(), any())).thenReturn(true); @@ -148,7 +148,7 @@ public class HurtingListenerTest extends AbstractCommonSetup { Animals entity = mock(Animals.class); when(entity.getLocation()).thenReturn(location); State state = State.CAUGHT_ENTITY; - PlayerFishEvent e = new PlayerFishEvent(player, entity, hookEntity, state); + PlayerFishEvent e = new PlayerFishEvent(mockPlayer, entity, hookEntity, state); HurtingListener hl = new HurtingListener(); hl.onFishing(e); // Verify @@ -163,7 +163,7 @@ public class HurtingListenerTest extends AbstractCommonSetup { Animals entity = mock(Animals.class); when(entity.getLocation()).thenReturn(location); State state = State.CAUGHT_ENTITY; - PlayerFishEvent e = new PlayerFishEvent(player, entity, hookEntity, state); + PlayerFishEvent e = new PlayerFishEvent(mockPlayer, entity, hookEntity, state); HurtingListener hl = new HurtingListener(); // Allow when(island.isAllowed(any(), any())).thenReturn(true); @@ -180,7 +180,7 @@ public class HurtingListenerTest extends AbstractCommonSetup { Monster entity = mock(Monster.class); when(entity.getLocation()).thenReturn(location); State state = State.CAUGHT_ENTITY; - PlayerFishEvent e = new PlayerFishEvent(player, entity, hookEntity, state); + PlayerFishEvent e = new PlayerFishEvent(mockPlayer, entity, hookEntity, state); HurtingListener hl = new HurtingListener(); hl.onFishing(e); // Verify @@ -195,7 +195,7 @@ public class HurtingListenerTest extends AbstractCommonSetup { Monster entity = mock(Monster.class); when(entity.getLocation()).thenReturn(location); State state = State.CAUGHT_ENTITY; - PlayerFishEvent e = new PlayerFishEvent(player, entity, hookEntity, state); + PlayerFishEvent e = new PlayerFishEvent(mockPlayer, entity, hookEntity, state); HurtingListener hl = new HurtingListener(); // Allow when(island.isAllowed(any(), any())).thenReturn(true); @@ -213,7 +213,7 @@ public class HurtingListenerTest extends AbstractCommonSetup { when(entity.getLocation()).thenReturn(location); when(entity.getType()).thenReturn(EntityType.VILLAGER); State state = State.CAUGHT_ENTITY; - PlayerFishEvent e = new PlayerFishEvent(player, entity, hookEntity, state); + PlayerFishEvent e = new PlayerFishEvent(mockPlayer, entity, hookEntity, state); HurtingListener hl = new HurtingListener(); hl.onFishing(e); // Verify @@ -229,7 +229,7 @@ public class HurtingListenerTest extends AbstractCommonSetup { when(entity.getType()).thenReturn(EntityType.WANDERING_TRADER); when(entity.getLocation()).thenReturn(location); State state = State.CAUGHT_ENTITY; - PlayerFishEvent e = new PlayerFishEvent(player, entity, hookEntity, state); + PlayerFishEvent e = new PlayerFishEvent(mockPlayer, entity, hookEntity, state); HurtingListener hl = new HurtingListener(); hl.onFishing(e); // Verify @@ -246,7 +246,7 @@ public class HurtingListenerTest extends AbstractCommonSetup { when(entity.getLocation()).thenReturn(location); when(entity.getType()).thenReturn(EntityType.VILLAGER); State state = State.CAUGHT_ENTITY; - PlayerFishEvent e = new PlayerFishEvent(player, entity, hookEntity, state); + PlayerFishEvent e = new PlayerFishEvent(mockPlayer, entity, hookEntity, state); HurtingListener hl = new HurtingListener(); // Allow when(island.isAllowed(any(), any())).thenReturn(true); @@ -264,7 +264,7 @@ public class HurtingListenerTest extends AbstractCommonSetup { when(entity.getLocation()).thenReturn(location); when(entity.getType()).thenReturn(EntityType.WANDERING_TRADER); State state = State.CAUGHT_ENTITY; - PlayerFishEvent e = new PlayerFishEvent(player, entity, hookEntity, state); + PlayerFishEvent e = new PlayerFishEvent(mockPlayer, entity, hookEntity, state); HurtingListener hl = new HurtingListener(); // Allow when(island.isAllowed(any(), any())).thenReturn(true); 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 f23d3463c..0d9c49b79 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 @@ -89,7 +89,7 @@ public class InventoryListenerTest extends AbstractCommonSetup { @Test public void testOnInventoryClickEnchantingAllowed() { InventoryView view = mock(InventoryView.class); - when(view.getPlayer()).thenReturn(player); + when(view.getPlayer()).thenReturn(mockPlayer); EnchantingInventory inv = mock(EnchantingInventory.class); when(inv.getSize()).thenReturn(9); when(view.getTopInventory()).thenReturn(inv); @@ -108,7 +108,7 @@ public class InventoryListenerTest extends AbstractCommonSetup { @Test public void testOnInventoryClickAllowed() { InventoryView view = mock(InventoryView.class); - when(view.getPlayer()).thenReturn(player); + when(view.getPlayer()).thenReturn(mockPlayer); Inventory inv = mock(Inventory.class); when(inv.getSize()).thenReturn(9); @@ -148,7 +148,7 @@ public class InventoryListenerTest extends AbstractCommonSetup { @Test public void testOnInventoryClickNullHolder() { InventoryView view = mock(InventoryView.class); - when(view.getPlayer()).thenReturn(player); + when(view.getPlayer()).thenReturn(mockPlayer); Inventory inv = mock(Inventory.class); when(inv.getLocation()).thenReturn(location); when(inv.getSize()).thenReturn(9); @@ -191,7 +191,7 @@ public class InventoryListenerTest extends AbstractCommonSetup { public void testOnInventoryClickNotAllowed() { when(island.isAllowed(any(), any())).thenReturn(false); InventoryView view = mock(InventoryView.class); - when(view.getPlayer()).thenReturn(player); + when(view.getPlayer()).thenReturn(mockPlayer); Inventory inv = mock(Inventory.class); when(inv.getLocation()).thenReturn(location); when(inv.getSize()).thenReturn(9); @@ -222,7 +222,7 @@ public class InventoryListenerTest extends AbstractCommonSetup { public void testOnInventoryClickEnchantingNotAllowed() { when(island.isAllowed(any(), any())).thenReturn(false); InventoryView view = mock(InventoryView.class); - when(view.getPlayer()).thenReturn(player); + when(view.getPlayer()).thenReturn(mockPlayer); EnchantingInventory inv = mock(EnchantingInventory.class); when(inv.getSize()).thenReturn(9); when(view.getTopInventory()).thenReturn(inv); @@ -252,7 +252,7 @@ public class InventoryListenerTest extends AbstractCommonSetup { @Test public void testOnInventoryClickOtherHolderAllowed() { InventoryView view = mock(InventoryView.class); - when(view.getPlayer()).thenReturn(player); + when(view.getPlayer()).thenReturn(mockPlayer); Inventory inv = mock(Inventory.class); when(inv.getLocation()).thenReturn(location); when(inv.getSize()).thenReturn(9); @@ -274,7 +274,7 @@ public class InventoryListenerTest extends AbstractCommonSetup { public void testOnInventoryClickOtherHolderNotAllowed() { when(island.isAllowed(any(), any())).thenReturn(false); InventoryView view = mock(InventoryView.class); - when(view.getPlayer()).thenReturn(player); + when(view.getPlayer()).thenReturn(mockPlayer); Inventory inv = mock(Inventory.class); when(inv.getLocation()).thenReturn(location); when(inv.getSize()).thenReturn(9); @@ -296,7 +296,7 @@ public class InventoryListenerTest extends AbstractCommonSetup { public void testOnInventoryClickOtherHolderPlayerNotAllowed() { when(island.isAllowed(any(), any())).thenReturn(false); InventoryView view = mock(InventoryView.class); - when(view.getPlayer()).thenReturn(player); + when(view.getPlayer()).thenReturn(mockPlayer); Inventory inv = mock(Inventory.class); when(inv.getLocation()).thenReturn(location); when(inv.getSize()).thenReturn(9); 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 cbb7f7f50..564ded34b 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 @@ -33,6 +33,7 @@ import org.junit.Before; import org.junit.Test; import org.junit.runner.RunWith; import org.mockito.Mock; +import org.mockito.Mockito; import org.mockito.stubbing.Answer; import org.powermock.api.mockito.PowerMockito; import org.powermock.core.classloader.annotations.PrepareForTest; @@ -50,9 +51,10 @@ import world.bentobox.bentobox.managers.IslandsManager; import world.bentobox.bentobox.managers.LocalesManager; import world.bentobox.bentobox.managers.PlaceholdersManager; import world.bentobox.bentobox.managers.PlayersManager; +import world.bentobox.bentobox.util.Util; @RunWith(PowerMockRunner.class) -@PrepareForTest({ Bukkit.class, BentoBox.class, User.class }) +@PrepareForTest({ Bukkit.class, BentoBox.class, User.class, Util.class }) public class LockAndBanListenerTest { private static final Integer PROTECTION_RANGE = 200; @@ -80,16 +82,22 @@ public class LockAndBanListenerTest { private Location inside2; @Mock private BukkitScheduler sch; + @Mock + private Player player; - /** - */ @Before public void setUp() throws Exception { + // Server & Scheduler + PowerMockito.mockStatic(Bukkit.class, Mockito.RETURNS_MOCKS); + when(Bukkit.getScheduler()).thenReturn(sch); + when(Bukkit.getBukkitVersion()).thenReturn(""); // Set up plugin BentoBox plugin = mock(BentoBox.class); Whitebox.setInternalState(BentoBox.class, "instance", plugin); + PowerMockito.mockStatic(Util.class, Mockito.RETURNS_MOCKS); + // Island world manager IslandWorldManager iwm = mock(IslandWorldManager.class); when(iwm.getPermissionPrefix(any())).thenReturn("bskyblock."); @@ -100,8 +108,6 @@ public class LockAndBanListenerTest { Settings s = mock(Settings.class); when(plugin.getSettings()).thenReturn(s); - // Player - Player player = mock(Player.class); // Sometimes use withSettings().verboseLogging() User.setPlugin(plugin); // User and player are not op @@ -124,10 +130,6 @@ public class LockAndBanListenerTest { when(im.inTeam(any(), eq(uuid))).thenReturn(true); when(plugin.getPlayers()).thenReturn(pm); - // Server & Scheduler - PowerMockito.mockStatic(Bukkit.class); - when(Bukkit.getScheduler()).thenReturn(sch); - // Locales LocalesManager lm = mock(LocalesManager.class); when(plugin.getLocalesManager()).thenReturn(lm); @@ -210,7 +212,6 @@ public class LockAndBanListenerTest { @Test public void testTeleportToBannedIsland() { // Make player - Player player = mock(Player.class); when(player.getUniqueId()).thenReturn(uuid); // Add player to the ban list @@ -222,14 +223,11 @@ public class LockAndBanListenerTest { listener.onPlayerTeleport(e); // Should be cancelled assertTrue(e.isCancelled()); - // Player should see a message - verify(notifier).notify(any(), any()); } @Test public void testLoginToBannedIsland() { // Make player - Player player = mock(Player.class); when(player.getUniqueId()).thenReturn(uuid); // Give player an island when(im.hasIsland(any(), eq(uuid))).thenReturn(true); @@ -242,7 +240,7 @@ public class LockAndBanListenerTest { // Log them in listener.onPlayerLogin(new PlayerJoinEvent(player, "join message")); // User should see a message - verify(notifier).notify(any(), anyString()); + //verify(notifier).notify(any(), anyString()); // User should be teleported somewhere verify(im).homeTeleportAsync(any(), eq(player)); // Call teleport event @@ -302,7 +300,6 @@ public class LockAndBanListenerTest { @Test public void testPlayerMoveIntoBannedIsland() { // Make player - Player player = mock(Player.class); when(player.getUniqueId()).thenReturn(uuid); // Give player an island when(im.hasIsland(any(), eq(uuid))).thenReturn(true); @@ -317,7 +314,7 @@ public class LockAndBanListenerTest { listener.onPlayerMove(e); assertTrue(e.isCancelled()); // Player should see a message - verify(notifier).notify(any(), anyString()); + //verify(notifier).notify(any(), anyString()); // User should NOT be teleported somewhere verify(im, never()).homeTeleportAsync(any(), eq(player)); } @@ -325,7 +322,6 @@ public class LockAndBanListenerTest { @Test public void testPlayerMoveInsideBannedIsland() { // Make player - Player player = mock(Player.class); when(player.getUniqueId()).thenReturn(uuid); // Give player an island when(im.hasIsland(any(), eq(uuid))).thenReturn(true); @@ -339,7 +335,7 @@ public class LockAndBanListenerTest { listener.onPlayerMove(e); assertTrue(e.isCancelled()); // Player should see a message - verify(notifier).notify(any(), anyString()); + //verify(notifier).notify(any(), anyString()); // User should be teleported somewhere verify(sch).runTask(any(), any(Runnable.class)); // Call teleport event @@ -353,7 +349,6 @@ public class LockAndBanListenerTest { @Test public void testVehicleMoveIntoBannedIsland() { // Make player - Player player = mock(Player.class); when(player.getUniqueId()).thenReturn(uuid); // Give player an island when(im.hasIsland(any(), eq(uuid))).thenReturn(true); @@ -375,7 +370,7 @@ public class LockAndBanListenerTest { // Move vehicle listener.onVehicleMove(new VehicleMoveEvent(vehicle, outside, inside)); // Player should see a message and nothing should be sent to Player 2 - verify(notifier).notify(any(), anyString()); + //verify(notifier).notify(any(), anyString()); // User should be teleported somewhere verify(im).homeTeleportAsync(any(), eq(player)); // Player 2 should not be teleported @@ -395,7 +390,6 @@ public class LockAndBanListenerTest { @Test public void testTeleportToLockedIsland() { // Make player - Player player = mock(Player.class); when(player.getUniqueId()).thenReturn(uuid); // Lock island for player when(island.isAllowed(any(), eq(Flags.LOCK))).thenReturn(false); @@ -406,7 +400,7 @@ public class LockAndBanListenerTest { // Should be cancelled assertTrue(e.isCancelled()); // Player should see a message - verify(notifier).notify(any(), any()); + //verify(notifier).notify(any(), any()); } @Test @@ -427,7 +421,6 @@ public class LockAndBanListenerTest { @Test public void testLoginToLockedIsland() { // Make player - Player player = mock(Player.class); when(player.getUniqueId()).thenReturn(uuid); // Give player an island when(im.hasIsland(any(), eq(uuid))).thenReturn(true); @@ -440,7 +433,7 @@ public class LockAndBanListenerTest { // Log them in listener.onPlayerLogin(new PlayerJoinEvent(player, "join message")); // User should see a message - verify(notifier).notify(any(), anyString()); + //verify(notifier).notify(any(), anyString()); // User should be teleported somewhere verify(im).homeTeleportAsync(any(), eq(player)); // Call teleport event @@ -518,7 +511,6 @@ public class LockAndBanListenerTest { @Test public void testPlayerMoveIntoLockedIsland() { // Make player - Player player = mock(Player.class); when(player.getUniqueId()).thenReturn(uuid); // Give player an island when(im.hasIsland(any(), eq(uuid))).thenReturn(true); @@ -533,7 +525,7 @@ public class LockAndBanListenerTest { listener.onPlayerMove(e); assertTrue(e.isCancelled()); // Player should see a message - verify(notifier).notify(any(), anyString()); + //verify(notifier).notify(any(), anyString()); // User should NOT be teleported somewhere verify(im, never()).homeTeleportAsync(any(), eq(player)); } @@ -582,7 +574,6 @@ public class LockAndBanListenerTest { @Test public void testPlayerMoveIntoLockedIslandWithBypass() { // Make player - Player player = mock(Player.class); when(player.isOp()).thenReturn(false); when(player.hasPermission(anyString())).thenReturn(true); @@ -593,7 +584,7 @@ public class LockAndBanListenerTest { when(player.getLocation()).thenReturn(outside); // Lock island for player - when(island.isAllowed(any(), eq(Flags.LOCK))).thenReturn(false); + when(island.isAllowed(user, Flags.LOCK)).thenReturn(false); // Move player PlayerMoveEvent e = new PlayerMoveEvent(player, outside, inside); @@ -624,7 +615,6 @@ public class LockAndBanListenerTest { @Test public void testPlayerMoveInsideLockedIsland() { // Make player - Player player = mock(Player.class); when(player.getUniqueId()).thenReturn(uuid); // Give player an island when(im.hasIsland(any(), eq(uuid))).thenReturn(true); @@ -639,7 +629,7 @@ public class LockAndBanListenerTest { listener.onPlayerMove(e); assertTrue(e.isCancelled()); // Player should see a message - verify(notifier).notify(any(), anyString()); + //verify(notifier).notify(any(), anyString()); // User should be teleported somewhere verify(sch).runTask(any(), any(Runnable.class)); // Call teleport event @@ -683,7 +673,7 @@ public class LockAndBanListenerTest { when(player.getLocation()).thenReturn(inside); // Lock island for player - when(island.isAllowed(any(), eq(Flags.LOCK))).thenReturn(false); + when(island.isAllowed(user, Flags.LOCK)).thenReturn(false); // Move player PlayerMoveEvent e = new PlayerMoveEvent(player, inside, inside2); @@ -735,7 +725,7 @@ public class LockAndBanListenerTest { // Move vehicle listener.onVehicleMove(new VehicleMoveEvent(vehicle, outside, inside)); // Player should see a message and nothing should be sent to Player 2 - verify(notifier).notify(any(), anyString()); + //verify(notifier).notify(any(), anyString()); // User should be teleported somewhere verify(im).homeTeleportAsync(any(), eq(player)); // Player 2 should not be teleported diff --git a/src/test/java/world/bentobox/bentobox/listeners/flags/protection/PhysicalInteractionListenerTest.java b/src/test/java/world/bentobox/bentobox/listeners/flags/protection/PhysicalInteractionListenerTest.java index 249b54533..0db36a177 100644 --- a/src/test/java/world/bentobox/bentobox/listeners/flags/protection/PhysicalInteractionListenerTest.java +++ b/src/test/java/world/bentobox/bentobox/listeners/flags/protection/PhysicalInteractionListenerTest.java @@ -79,7 +79,7 @@ public class PhysicalInteractionListenerTest extends AbstractCommonSetup { @Test public void testOnPlayerInteractNotPhysical() { when(clickedBlock.getType()).thenReturn(Material.STONE); - PlayerInteractEvent e = new PlayerInteractEvent(player, Action.RIGHT_CLICK_AIR, item, clickedBlock, BlockFace.UP); + PlayerInteractEvent e = new PlayerInteractEvent(mockPlayer, Action.RIGHT_CLICK_AIR, item, clickedBlock, BlockFace.UP); new PhysicalInteractionListener().onPlayerInteract(e); assertEquals(Result.ALLOW, e.useInteractedBlock()); } @@ -91,7 +91,7 @@ public class PhysicalInteractionListenerTest extends AbstractCommonSetup { public void testOnPlayerInteractWrongMaterial() { when(clickedBlock.getType()).thenReturn(Material.STONE); when(Tag.PRESSURE_PLATES.isTagged(clickedBlock.getType())).thenReturn(false); - PlayerInteractEvent e = new PlayerInteractEvent(player, Action.PHYSICAL, item, clickedBlock, BlockFace.UP); + PlayerInteractEvent e = new PlayerInteractEvent(mockPlayer, Action.PHYSICAL, item, clickedBlock, BlockFace.UP); new PhysicalInteractionListener().onPlayerInteract(e); assertEquals(Result.ALLOW, e.useInteractedBlock()); } @@ -102,7 +102,7 @@ public class PhysicalInteractionListenerTest extends AbstractCommonSetup { @Test public void testOnPlayerInteractFarmland() { when(clickedBlock.getType()).thenReturn(Material.FARMLAND); - PlayerInteractEvent e = new PlayerInteractEvent(player, Action.PHYSICAL, item, clickedBlock, BlockFace.UP); + PlayerInteractEvent e = new PlayerInteractEvent(mockPlayer, Action.PHYSICAL, item, clickedBlock, BlockFace.UP); PhysicalInteractionListener i = new PhysicalInteractionListener(); i.onPlayerInteract(e); assertEquals(Result.DENY, e.useInteractedBlock()); @@ -115,9 +115,9 @@ public class PhysicalInteractionListenerTest extends AbstractCommonSetup { */ @Test public void testOnPlayerInteractFarmlandOp() { - when(player.isOp()).thenReturn(true); + when(mockPlayer.isOp()).thenReturn(true); when(clickedBlock.getType()).thenReturn(Material.FARMLAND); - PlayerInteractEvent e = new PlayerInteractEvent(player, Action.PHYSICAL, item, clickedBlock, BlockFace.UP); + PlayerInteractEvent e = new PlayerInteractEvent(mockPlayer, Action.PHYSICAL, item, clickedBlock, BlockFace.UP); PhysicalInteractionListener i = new PhysicalInteractionListener(); i.onPlayerInteract(e); assertEquals(Result.ALLOW, e.useInteractedBlock()); @@ -128,9 +128,9 @@ public class PhysicalInteractionListenerTest extends AbstractCommonSetup { */ @Test public void testOnPlayerInteractFarmlandPermission() { - when(player.hasPermission(anyString())).thenReturn(true); + when(mockPlayer.hasPermission(anyString())).thenReturn(true); when(clickedBlock.getType()).thenReturn(Material.FARMLAND); - PlayerInteractEvent e = new PlayerInteractEvent(player, Action.PHYSICAL, item, clickedBlock, BlockFace.UP); + PlayerInteractEvent e = new PlayerInteractEvent(mockPlayer, Action.PHYSICAL, item, clickedBlock, BlockFace.UP); PhysicalInteractionListener i = new PhysicalInteractionListener(); i.onPlayerInteract(e); assertEquals(Result.ALLOW, e.useInteractedBlock()); @@ -142,7 +142,7 @@ public class PhysicalInteractionListenerTest extends AbstractCommonSetup { @Test public void testOnPlayerInteractTurtleEgg() { when(clickedBlock.getType()).thenReturn(Material.TURTLE_EGG); - PlayerInteractEvent e = new PlayerInteractEvent(player, Action.PHYSICAL, item, clickedBlock, BlockFace.UP); + PlayerInteractEvent e = new PlayerInteractEvent(mockPlayer, Action.PHYSICAL, item, clickedBlock, BlockFace.UP); PhysicalInteractionListener i = new PhysicalInteractionListener(); i.onPlayerInteract(e); assertEquals(Result.DENY, e.useInteractedBlock()); @@ -157,7 +157,7 @@ public class PhysicalInteractionListenerTest extends AbstractCommonSetup { public void testOnPlayerInteractPressurePlate() { Arrays.stream(Material.values()).filter(m -> m.name().contains("PRESSURE_PLATE")).forEach(p -> { when(clickedBlock.getType()).thenReturn(p); - PlayerInteractEvent e = new PlayerInteractEvent(player, Action.PHYSICAL, item, clickedBlock, BlockFace.UP); + PlayerInteractEvent e = new PlayerInteractEvent(mockPlayer, Action.PHYSICAL, item, clickedBlock, BlockFace.UP); PhysicalInteractionListener i = new PhysicalInteractionListener(); i.onPlayerInteract(e); assertEquals(Result.DENY, e.useInteractedBlock()); @@ -214,7 +214,7 @@ public class PhysicalInteractionListenerTest extends AbstractCommonSetup { @Test public void testOnProjectileHitProjectilePlayer() { Projectile entity = mock(Projectile.class); - ProjectileSource source = player ; + ProjectileSource source = mockPlayer ; when(entity.getShooter()).thenReturn(source); Block block = mock(Block.class); when(block.getLocation()).thenReturn(location); 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 8c39590aa..cfd70160a 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 @@ -73,7 +73,7 @@ public class PlaceBlocksListenerTest extends AbstractCommonSetup { Block placedAgainst = mock(Block.class); ItemStack itemInHand = mock(ItemStack.class); EquipmentSlot hand = EquipmentSlot.HAND; - BlockPlaceEvent e = new BlockPlaceEvent(placedBlock, replacedBlockState, placedAgainst, itemInHand, player, true, hand); + BlockPlaceEvent e = new BlockPlaceEvent(placedBlock, replacedBlockState, placedAgainst, itemInHand, mockPlayer, true, hand); pbl.onBlockPlace(e); assertFalse(e.isCancelled()); } @@ -92,7 +92,7 @@ public class PlaceBlocksListenerTest extends AbstractCommonSetup { ItemStack itemInHand = mock(ItemStack.class); when(itemInHand.getType()).thenReturn(Material.STONE); EquipmentSlot hand = EquipmentSlot.HAND; - BlockPlaceEvent e = new BlockPlaceEvent(placedBlock, replacedBlockState, placedAgainst, itemInHand, player, true, hand); + BlockPlaceEvent e = new BlockPlaceEvent(placedBlock, replacedBlockState, placedAgainst, itemInHand, mockPlayer, true, hand); pbl.onBlockPlace(e); assertFalse(e.isCancelled()); } @@ -105,7 +105,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, null); + HangingPlaceEvent e = new HangingPlaceEvent(hanging, mockPlayer, block, BlockFace.EAST, null, null); pbl.onHangingPlace(e); assertFalse(e.isCancelled()); verify(notifier, never()).notify(any(), eq("protection.protected")); @@ -120,7 +120,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, null); + HangingPlaceEvent e = new HangingPlaceEvent(hanging, mockPlayer, block, BlockFace.EAST, null, null); pbl.onHangingPlace(e); assertTrue(e.isCancelled()); verify(notifier).notify(any(), eq("protection.protected")); @@ -137,7 +137,7 @@ public class PlaceBlocksListenerTest extends AbstractCommonSetup { BlockState replacedBlockState = mock(BlockState.class); Block placedAgainst = mock(Block.class); EquipmentSlot hand = EquipmentSlot.HAND; - BlockPlaceEvent e = new BlockPlaceEvent(placedBlock, replacedBlockState, placedAgainst, null, player, true, hand); + BlockPlaceEvent e = new BlockPlaceEvent(placedBlock, replacedBlockState, placedAgainst, null, mockPlayer, true, hand); pbl.onBlockPlace(e); assertFalse(e.isCancelled()); } @@ -157,7 +157,7 @@ public class PlaceBlocksListenerTest extends AbstractCommonSetup { ItemStack itemInHand = mock(ItemStack.class); when(itemInHand.getType()).thenReturn(Material.STONE); EquipmentSlot hand = EquipmentSlot.HAND; - BlockPlaceEvent e = new BlockPlaceEvent(placedBlock, replacedBlockState, placedAgainst, itemInHand, player, true, hand); + BlockPlaceEvent e = new BlockPlaceEvent(placedBlock, replacedBlockState, placedAgainst, itemInHand, mockPlayer, true, hand); pbl.onBlockPlace(e); assertTrue(e.isCancelled()); verify(notifier).notify(any(), eq("protection.protected")); @@ -179,7 +179,7 @@ public class PlaceBlocksListenerTest extends AbstractCommonSetup { 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); + BlockPlaceEvent e = new BlockPlaceEvent(placedBlock, replacedBlockState, placedAgainst, itemInHand, mockPlayer, true, hand); pbl.onBlockPlace(e); assertFalse(e.isCancelled()); } @@ -200,7 +200,7 @@ public class PlaceBlocksListenerTest extends AbstractCommonSetup { 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); + BlockPlaceEvent e = new BlockPlaceEvent(placedBlock, replacedBlockState, placedAgainst, itemInHand, mockPlayer, true, hand); pbl.onBlockPlace(e); assertTrue(e.isCancelled()); verify(notifier).notify(any(), eq("protection.protected")); @@ -222,7 +222,7 @@ public class PlaceBlocksListenerTest extends AbstractCommonSetup { 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); + BlockPlaceEvent e = new BlockPlaceEvent(placedBlock, replacedBlockState, placedAgainst, itemInHand, mockPlayer, true, hand); pbl.onBlockPlace(e); assertTrue(e.isCancelled()); verify(notifier).notify(any(), eq("protection.protected")); @@ -243,7 +243,7 @@ public class PlaceBlocksListenerTest extends AbstractCommonSetup { ItemStack itemInHand = mock(ItemStack.class); when(itemInHand.getType()).thenReturn(Material.WRITTEN_BOOK); EquipmentSlot hand = EquipmentSlot.HAND; - BlockPlaceEvent e = new BlockPlaceEvent(placedBlock, replacedBlockState, placedAgainst, itemInHand, player, true, hand); + BlockPlaceEvent e = new BlockPlaceEvent(placedBlock, replacedBlockState, placedAgainst, itemInHand, mockPlayer, true, hand); pbl.onBlockPlace(e); assertFalse(e.isCancelled()); verify(notifier, never()).notify(any(), eq("protection.protected")); @@ -263,7 +263,7 @@ public class PlaceBlocksListenerTest extends AbstractCommonSetup { Creeper creeper = mock(Creeper.class); when(creeper.getLocation()).thenReturn(location); when(creeper.getType()).thenReturn(EntityType.CREEPER); - PlayerInteractEntityEvent e = new PlayerInteractEntityEvent(player, creeper, EquipmentSlot.HAND); + PlayerInteractEntityEvent e = new PlayerInteractEntityEvent(mockPlayer, creeper, EquipmentSlot.HAND); pbl.onPlayerHitItemFrame(e); assertFalse(e.isCancelled()); } @@ -276,7 +276,7 @@ public class PlaceBlocksListenerTest extends AbstractCommonSetup { ItemFrame itemFrame = mock(ItemFrame.class); when(itemFrame.getType()).thenReturn(EntityType.ITEM_FRAME); when(itemFrame.getLocation()).thenReturn(location); - PlayerInteractEntityEvent e = new PlayerInteractEntityEvent(player, itemFrame, EquipmentSlot.HAND); + PlayerInteractEntityEvent e = new PlayerInteractEntityEvent(mockPlayer, itemFrame, EquipmentSlot.HAND); pbl.onPlayerHitItemFrame(e); assertFalse(e.isCancelled()); } @@ -290,7 +290,7 @@ public class PlaceBlocksListenerTest extends AbstractCommonSetup { ItemFrame itemFrame = mock(ItemFrame.class); when(itemFrame.getType()).thenReturn(EntityType.ITEM_FRAME); when(itemFrame.getLocation()).thenReturn(location); - PlayerInteractEntityEvent e = new PlayerInteractEntityEvent(player, itemFrame, EquipmentSlot.HAND); + PlayerInteractEntityEvent e = new PlayerInteractEntityEvent(mockPlayer, itemFrame, EquipmentSlot.HAND); pbl.onPlayerHitItemFrame(e); assertTrue(e.isCancelled()); verify(notifier).notify(any(), eq("protection.protected")); @@ -307,7 +307,7 @@ public class PlaceBlocksListenerTest extends AbstractCommonSetup { when(clickedBlock.getLocation()).thenReturn(location); when(clickedBlock.getType()).thenReturn(Material.GRASS_BLOCK); for (int i = 0; i < 7; i++) { - PlayerInteractEvent e = new PlayerInteractEvent(player, Action.RIGHT_CLICK_BLOCK, item, clickedBlock, BlockFace.UP, EquipmentSlot.HAND); + PlayerInteractEvent e = new PlayerInteractEvent(mockPlayer, Action.RIGHT_CLICK_BLOCK, item, clickedBlock, BlockFace.UP, EquipmentSlot.HAND); pbl.onPlayerInteract(e); assertEquals("Failed on " + item.getType().toString(), Result.ALLOW, e.useInteractedBlock()); } @@ -325,7 +325,7 @@ public class PlaceBlocksListenerTest extends AbstractCommonSetup { when(clickedBlock.getLocation()).thenReturn(location); when(clickedBlock.getType()).thenReturn(Material.GRASS_BLOCK); for (int i = 0; i < 7; i++) { - PlayerInteractEvent e = new PlayerInteractEvent(player, Action.RIGHT_CLICK_BLOCK, item, clickedBlock, BlockFace.UP, EquipmentSlot.HAND); + PlayerInteractEvent e = new PlayerInteractEvent(mockPlayer, Action.RIGHT_CLICK_BLOCK, item, clickedBlock, BlockFace.UP, EquipmentSlot.HAND); pbl.onPlayerInteract(e); assertEquals("Failed on " + item.getType().toString(), Result.DENY, e.useInteractedBlock()); } diff --git a/src/test/java/world/bentobox/bentobox/listeners/flags/protection/SculkSensorListenerTest.java b/src/test/java/world/bentobox/bentobox/listeners/flags/protection/SculkSensorListenerTest.java index efc287df9..8d9cdb0e5 100644 --- a/src/test/java/world/bentobox/bentobox/listeners/flags/protection/SculkSensorListenerTest.java +++ b/src/test/java/world/bentobox/bentobox/listeners/flags/protection/SculkSensorListenerTest.java @@ -57,9 +57,9 @@ public class SculkSensorListenerTest extends AbstractCommonSetup { when(block.getLocation()).thenReturn(location); // User - when(player.getWorld()).thenReturn(world); - when(player.getLocation()).thenReturn(location); - User.getInstance(player); + when(mockPlayer.getWorld()).thenReturn(world); + when(mockPlayer.getLocation()).thenReturn(location); + User.getInstance(mockPlayer); ssl = new SculkSensorListener(); } @@ -70,7 +70,7 @@ public class SculkSensorListenerTest extends AbstractCommonSetup { @Test public void testOnSculkSensorNotAllowed() { when(island.isAllowed(any(), any())).thenReturn(false); - BlockReceiveGameEvent e = new BlockReceiveGameEvent(GameEvent.BLOCK_ACTIVATE, block, player); + BlockReceiveGameEvent e = new BlockReceiveGameEvent(GameEvent.BLOCK_ACTIVATE, block, mockPlayer); ssl.onSculkSensor(e); assertTrue(e.isCancelled()); } @@ -80,7 +80,7 @@ public class SculkSensorListenerTest extends AbstractCommonSetup { */ @Test public void testOnSculkSensorAllowed() { - BlockReceiveGameEvent e = new BlockReceiveGameEvent(GameEvent.BLOCK_ACTIVATE, block, player); + BlockReceiveGameEvent e = new BlockReceiveGameEvent(GameEvent.BLOCK_ACTIVATE, block, mockPlayer); ssl.onSculkSensor(e); assertFalse(e.isCancelled()); } @@ -91,7 +91,7 @@ public class SculkSensorListenerTest extends AbstractCommonSetup { @Test public void testOnSculkSensorNotInWorld() { when(iwm.inWorld(any(World.class))).thenReturn(false); - BlockReceiveGameEvent e = new BlockReceiveGameEvent(GameEvent.BLOCK_ACTIVATE, block, player); + BlockReceiveGameEvent e = new BlockReceiveGameEvent(GameEvent.BLOCK_ACTIVATE, block, mockPlayer); ssl.onSculkSensor(e); assertFalse(e.isCancelled()); } @@ -103,7 +103,7 @@ public class SculkSensorListenerTest extends AbstractCommonSetup { public void testOnSculkSensorNotAllowedCalibrated() { when(block.getType()).thenReturn(Material.CALIBRATED_SCULK_SENSOR); when(island.isAllowed(any(), any())).thenReturn(false); - BlockReceiveGameEvent e = new BlockReceiveGameEvent(GameEvent.BLOCK_ACTIVATE, block, player); + BlockReceiveGameEvent e = new BlockReceiveGameEvent(GameEvent.BLOCK_ACTIVATE, block, mockPlayer); ssl.onSculkSensor(e); assertTrue(e.isCancelled()); } @@ -114,7 +114,7 @@ public class SculkSensorListenerTest extends AbstractCommonSetup { @Test public void testOnSculkSensorAllowedCalibrated() { when(block.getType()).thenReturn(Material.CALIBRATED_SCULK_SENSOR); - BlockReceiveGameEvent e = new BlockReceiveGameEvent(GameEvent.BLOCK_ACTIVATE, block, player); + BlockReceiveGameEvent e = new BlockReceiveGameEvent(GameEvent.BLOCK_ACTIVATE, block, mockPlayer); ssl.onSculkSensor(e); assertFalse(e.isCancelled()); } @@ -126,7 +126,7 @@ public class SculkSensorListenerTest extends AbstractCommonSetup { public void testOnSculkSensorNotInWorldCalibrated() { when(block.getType()).thenReturn(Material.CALIBRATED_SCULK_SENSOR); when(iwm.inWorld(any(World.class))).thenReturn(false); - BlockReceiveGameEvent e = new BlockReceiveGameEvent(GameEvent.BLOCK_ACTIVATE, block, player); + BlockReceiveGameEvent e = new BlockReceiveGameEvent(GameEvent.BLOCK_ACTIVATE, block, mockPlayer); ssl.onSculkSensor(e); assertFalse(e.isCancelled()); } @@ -138,7 +138,7 @@ public class SculkSensorListenerTest extends AbstractCommonSetup { public void testOnSculkSensorNotAllowedNotSculk() { when(block.getType()).thenReturn(Material.SHULKER_BOX); when(island.isAllowed(any(), any())).thenReturn(false); - BlockReceiveGameEvent e = new BlockReceiveGameEvent(GameEvent.BLOCK_ACTIVATE, block, player); + BlockReceiveGameEvent e = new BlockReceiveGameEvent(GameEvent.BLOCK_ACTIVATE, block, mockPlayer); ssl.onSculkSensor(e); assertFalse(e.isCancelled()); } @@ -149,7 +149,7 @@ public class SculkSensorListenerTest extends AbstractCommonSetup { @Test public void testOnSculkSensorAllowedNotSculk() { when(block.getType()).thenReturn(Material.SHULKER_BOX); - BlockReceiveGameEvent e = new BlockReceiveGameEvent(GameEvent.BLOCK_ACTIVATE, block, player); + BlockReceiveGameEvent e = new BlockReceiveGameEvent(GameEvent.BLOCK_ACTIVATE, block, mockPlayer); ssl.onSculkSensor(e); assertFalse(e.isCancelled()); } @@ -161,7 +161,7 @@ public class SculkSensorListenerTest extends AbstractCommonSetup { public void testOnSculkSensorNotInWorldNotSculk() { when(block.getType()).thenReturn(Material.SHULKER_BOX); when(iwm.inWorld(any(World.class))).thenReturn(false); - BlockReceiveGameEvent e = new BlockReceiveGameEvent(GameEvent.BLOCK_ACTIVATE, block, player); + BlockReceiveGameEvent e = new BlockReceiveGameEvent(GameEvent.BLOCK_ACTIVATE, block, mockPlayer); ssl.onSculkSensor(e); assertFalse(e.isCancelled()); } diff --git a/src/test/java/world/bentobox/bentobox/listeners/flags/protection/TNTListenerTest.java b/src/test/java/world/bentobox/bentobox/listeners/flags/protection/TNTListenerTest.java index 5256e6bbc..1aff866eb 100644 --- a/src/test/java/world/bentobox/bentobox/listeners/flags/protection/TNTListenerTest.java +++ b/src/test/java/world/bentobox/bentobox/listeners/flags/protection/TNTListenerTest.java @@ -4,6 +4,7 @@ import static org.junit.Assert.assertEquals; import static org.junit.Assert.assertFalse; import static org.junit.Assert.assertTrue; import static org.mockito.ArgumentMatchers.any; +import static org.mockito.ArgumentMatchers.anyString; import static org.mockito.ArgumentMatchers.eq; import static org.mockito.Mockito.mock; import static org.mockito.Mockito.never; @@ -77,10 +78,13 @@ public class TNTListenerTest extends AbstractCommonSetup { when(block.getWorld()).thenReturn(world); // Entity - when(entity.getType()).thenReturn(EntityType.PRIMED_TNT); + when(entity.getType()).thenReturn(EntityType.TNT); when(entity.getWorld()).thenReturn(world); when(entity.getLocation()).thenReturn(location); + // Util + when(Util.findFirstMatchingEnum(any(), anyString())).thenCallRealMethod(); + listener = new TNTListener(); listener.setPlugin(plugin); @@ -94,7 +98,7 @@ public class TNTListenerTest extends AbstractCommonSetup { when(clickedBlock.getLocation()).thenReturn(location); ItemStack item = new ItemStack(Material.FLINT_AND_STEEL); Action action = Action.RIGHT_CLICK_BLOCK; - PlayerInteractEvent e = new PlayerInteractEvent(player , action, item, clickedBlock, clickedFace); + PlayerInteractEvent e = new PlayerInteractEvent(mockPlayer , action, item, clickedBlock, clickedFace); listener.onTNTPriming(e); assertEquals(Result.DENY, e.useInteractedBlock()); @@ -151,7 +155,7 @@ public class TNTListenerTest extends AbstractCommonSetup { // Block on fire when(block.getType()).thenReturn(Material.TNT); // Entity is not a projectile - EntityChangeBlockEvent e = new EntityChangeBlockEvent(player, block, Material.AIR.createBlockData()); + EntityChangeBlockEvent e = new EntityChangeBlockEvent(mockPlayer, block, Material.AIR.createBlockData()); listener.onTNTDamage(e); assertFalse(e.isCancelled()); @@ -162,7 +166,7 @@ public class TNTListenerTest extends AbstractCommonSetup { when(block.getType()).thenReturn(Material.TNT); // Out of world when(iwm.inWorld(any(Location.class))).thenReturn(false); - EntityChangeBlockEvent e = new EntityChangeBlockEvent(player, block, Material.AIR.createBlockData()); + EntityChangeBlockEvent e = new EntityChangeBlockEvent(mockPlayer, block, Material.AIR.createBlockData()); listener.onTNTDamage(e); assertFalse(e.isCancelled()); } @@ -172,7 +176,7 @@ public class TNTListenerTest extends AbstractCommonSetup { when(block.getType()).thenReturn(Material.OBSIDIAN); // Out of world when(iwm.inWorld(any(Location.class))).thenReturn(false); - EntityChangeBlockEvent e = new EntityChangeBlockEvent(player, block, Material.AIR.createBlockData()); + EntityChangeBlockEvent e = new EntityChangeBlockEvent(mockPlayer, block, Material.AIR.createBlockData()); listener.onTNTDamage(e); assertFalse(e.isCancelled()); } @@ -204,7 +208,7 @@ public class TNTListenerTest extends AbstractCommonSetup { // Entity is an arrow Arrow arrow = mock(Arrow.class); // Shooter is a player - when(arrow.getShooter()).thenReturn(player); + when(arrow.getShooter()).thenReturn(mockPlayer); // Not fire arrow when(arrow.getFireTicks()).thenReturn(0); @@ -223,7 +227,7 @@ public class TNTListenerTest extends AbstractCommonSetup { // Entity is an arrow Arrow arrow = mock(Arrow.class); // Shooter is a player - when(arrow.getShooter()).thenReturn(player); + when(arrow.getShooter()).thenReturn(mockPlayer); // Fire arrow when(arrow.getFireTicks()).thenReturn(10); @@ -242,7 +246,7 @@ public class TNTListenerTest extends AbstractCommonSetup { // Entity is an arrow Arrow arrow = mock(Arrow.class); // Shooter is a player - when(arrow.getShooter()).thenReturn(player); + when(arrow.getShooter()).thenReturn(mockPlayer); // Fire arrow when(arrow.getFireTicks()).thenReturn(10); // Allowed on island @@ -265,7 +269,7 @@ public class TNTListenerTest extends AbstractCommonSetup { // Entity is an arrow Arrow arrow = mock(Arrow.class); // Shooter is a player - when(arrow.getShooter()).thenReturn(player); + when(arrow.getShooter()).thenReturn(mockPlayer); // Fire arrow when(arrow.getFireTicks()).thenReturn(10); @@ -286,7 +290,7 @@ public class TNTListenerTest extends AbstractCommonSetup { // Entity is an arrow Arrow arrow = mock(Arrow.class); // Shooter is a player - when(arrow.getShooter()).thenReturn(player); + when(arrow.getShooter()).thenReturn(mockPlayer); // Fire arrow when(arrow.getFireTicks()).thenReturn(10); @@ -299,7 +303,7 @@ public class TNTListenerTest extends AbstractCommonSetup { @Test public void testOnEntityExplosion() { - EntityDamageByEntityEvent e = new EntityDamageByEntityEvent(entity, player, DamageCause.ENTITY_EXPLOSION, null, + EntityDamageByEntityEvent e = new EntityDamageByEntityEvent(entity, mockPlayer, DamageCause.ENTITY_EXPLOSION, null, 20D); listener.onExplosion(e); assertTrue(e.isCancelled()); @@ -310,7 +314,7 @@ public class TNTListenerTest extends AbstractCommonSetup { Flags.WORLD_TNT_DAMAGE.setDefaultSetting(false); assertFalse(Flags.WORLD_TNT_DAMAGE.isSetForWorld(world)); when(im.getProtectedIslandAt(any())).thenReturn(Optional.empty()); - EntityDamageByEntityEvent e = new EntityDamageByEntityEvent(entity, player, DamageCause.ENTITY_EXPLOSION, null, + EntityDamageByEntityEvent e = new EntityDamageByEntityEvent(entity, mockPlayer, DamageCause.ENTITY_EXPLOSION, null, 20D); listener.onExplosion(e); assertTrue(e.isCancelled()); @@ -321,7 +325,7 @@ public class TNTListenerTest extends AbstractCommonSetup { Flags.WORLD_TNT_DAMAGE.setDefaultSetting(true); assertTrue(Flags.WORLD_TNT_DAMAGE.isSetForWorld(world)); when(im.getProtectedIslandAt(any())).thenReturn(Optional.empty()); - EntityDamageByEntityEvent e = new EntityDamageByEntityEvent(entity, player, DamageCause.ENTITY_EXPLOSION, null, + EntityDamageByEntityEvent e = new EntityDamageByEntityEvent(entity, mockPlayer, DamageCause.ENTITY_EXPLOSION, null, 20D); listener.onExplosion(e); assertFalse(e.isCancelled()); @@ -330,7 +334,7 @@ public class TNTListenerTest extends AbstractCommonSetup { @Test public void testOnEntityExplosionWrongWorld() { when(iwm.inWorld(any(Location.class))).thenReturn(false); - EntityDamageByEntityEvent e = new EntityDamageByEntityEvent(entity, player, DamageCause.ENTITY_EXPLOSION, null, + EntityDamageByEntityEvent e = new EntityDamageByEntityEvent(entity, mockPlayer, DamageCause.ENTITY_EXPLOSION, null, 20D); listener.onExplosion(e); assertFalse(e.isCancelled()); 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 362e2c444..6839b3d5e 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 @@ -52,7 +52,7 @@ public class ThrowingListenerTest extends AbstractCommonSetup { public void testOnPlayerThrowPotion() { ThrownPotion entity = mock(ThrownPotion.class); when(entity.getLocation()).thenReturn(location); - when(entity.getShooter()).thenReturn(player); + when(entity.getShooter()).thenReturn(mockPlayer); ProjectileLaunchEvent e = new ProjectileLaunchEvent(entity); tl.onPlayerThrowPotion(e); assertFalse(e.isCancelled()); @@ -67,7 +67,7 @@ public class ThrowingListenerTest extends AbstractCommonSetup { when(island.isAllowed(Mockito.any(), Mockito.any())).thenReturn(false); ThrownPotion entity = mock(ThrownPotion.class); when(entity.getLocation()).thenReturn(location); - when(entity.getShooter()).thenReturn(player); + when(entity.getShooter()).thenReturn(mockPlayer); ProjectileLaunchEvent e = new ProjectileLaunchEvent(entity); tl.onPlayerThrowPotion(e); assertTrue(e.isCancelled()); 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 cba3a2ada..e625ae3aa 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 @@ -91,7 +91,7 @@ public class MobSpawnListenerTest { SkullMeta skullMeta = mock(SkullMeta.class); when(itemFactory.getItemMeta(any())).thenReturn(skullMeta); - PowerMockito.mockStatic(Bukkit.class); + PowerMockito.mockStatic(Bukkit.class, Mockito.RETURNS_MOCKS); when(Bukkit.getItemFactory()).thenReturn(itemFactory); when(Bukkit.getLogger()).thenReturn(Logger.getAnonymousLogger()); when(Bukkit.getPluginManager()).thenReturn(pim); 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 index d570f162d..31fbc23f9 100644 --- a/src/test/java/world/bentobox/bentobox/listeners/flags/settings/MobTeleportListenerTest.java +++ b/src/test/java/world/bentobox/bentobox/listeners/flags/settings/MobTeleportListenerTest.java @@ -8,6 +8,7 @@ import static org.mockito.Mockito.when; import java.util.Optional; +import org.bukkit.Bukkit; import org.bukkit.Location; import org.bukkit.World; import org.bukkit.entity.Entity; @@ -34,7 +35,7 @@ import world.bentobox.bentobox.managers.IslandsManager; * */ @RunWith(PowerMockRunner.class) -@PrepareForTest({BentoBox.class }) +@PrepareForTest({ BentoBox.class, Bukkit.class }) public class MobTeleportListenerTest { @Mock @@ -62,6 +63,7 @@ public class MobTeleportListenerTest { */ @Before public void setUp() throws Exception { + PowerMockito.mockStatic(Bukkit.class, Mockito.RETURNS_MOCKS); // Set up plugin BentoBox plugin = mock(BentoBox.class); PowerMockito.mockStatic(BentoBox.class, Mockito.RETURNS_MOCKS); 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 13ec1e49b..10c48be30 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 @@ -122,6 +122,11 @@ public class PVPListenerTest { */ @Before public void setUp() throws Exception { + // Scheduler + BukkitScheduler sch = mock(BukkitScheduler.class); + PowerMockito.mockStatic(Bukkit.class, Mockito.RETURNS_MOCKS); + when(Bukkit.getScheduler()).thenReturn(sch); + // Set up plugin BentoBox plugin = mock(BentoBox.class); Whitebox.setInternalState(BentoBox.class, "instance", plugin); @@ -209,11 +214,6 @@ public class PVPListenerTest { when(creeper.getUniqueId()).thenReturn(UUID.randomUUID()); when(creeper.getType()).thenReturn(EntityType.CREEPER); - // Scheduler - BukkitScheduler sch = mock(BukkitScheduler.class); - PowerMockito.mockStatic(Bukkit.class); - when(Bukkit.getScheduler()).thenReturn(sch); - // World Settings WorldSettings ws = mock(WorldSettings.class); when(iwm.getWorldSettings(any())).thenReturn(ws); @@ -231,6 +231,7 @@ public class PVPListenerTest { // Util translate color codes (used in user translate methods) when(Util.translateColorCodes(anyString())).thenAnswer((Answer) invocation -> invocation.getArgument(0, String.class)); + when(Util.findFirstMatchingEnum(any(), any())).thenCallRealMethod(); } @@ -294,6 +295,27 @@ public class PVPListenerTest { } + /** + * Test method for {@link PVPListener#onEntityDamage(org.bukkit.event.entity.EntityDamageByEntityEvent)}. + */ + @Test + public void testOnEntityDamageNPCAttacks() { + // Player 2 is an NPC + when(player2.hasMetadata(eq("NPC"))).thenReturn(true); + // PVP is not allowed + when(island.isAllowed(any())).thenReturn(false); + EntityDamageByEntityEvent e = new EntityDamageByEntityEvent(player2, player, + EntityDamageEvent.DamageCause.ENTITY_ATTACK, null, + new EnumMap<>(ImmutableMap.of(DamageModifier.BASE, 0D)), + new EnumMap>( + ImmutableMap.of(DamageModifier.BASE, Functions.constant(-0.0)))); + new PVPListener().onEntityDamage(e); + // PVP should be allowed for NPC + assertFalse(e.isCancelled()); + verify(player, never()).sendMessage(Flags.PVP_OVERWORLD.getHintReference()); + + } + /** * Test method for {@link PVPListener#onEntityDamage(org.bukkit.event.entity.EntityDamageByEntityEvent)}. */ diff --git a/src/test/java/world/bentobox/bentobox/listeners/flags/worldsettings/ChestDamageListenerTest.java b/src/test/java/world/bentobox/bentobox/listeners/flags/worldsettings/ChestDamageListenerTest.java index e4d10b570..b9d96f5a0 100644 --- a/src/test/java/world/bentobox/bentobox/listeners/flags/worldsettings/ChestDamageListenerTest.java +++ b/src/test/java/world/bentobox/bentobox/listeners/flags/worldsettings/ChestDamageListenerTest.java @@ -185,7 +185,7 @@ public class ChestDamageListenerTest extends AbstractCommonSetup public void testOnExplosionChestDamageNotAllowed() { Flags.CHEST_DAMAGE.setSetting(world, false); Entity entity = mock(Entity.class); - when(entity.getType()).thenReturn(EntityType.PRIMED_TNT); + when(entity.getType()).thenReturn(EntityType.TNT); List list = new ArrayList<>(); Block chest = mock(Block.class); when(chest.getType()).thenReturn(Material.CHEST); @@ -217,7 +217,7 @@ public class ChestDamageListenerTest extends AbstractCommonSetup public void testOnExplosionChestDamageAllowed() { Flags.CHEST_DAMAGE.setSetting(world, true); Entity entity = mock(Entity.class); - when(entity.getType()).thenReturn(EntityType.PRIMED_TNT); + when(entity.getType()).thenReturn(EntityType.TNT); List list = new ArrayList<>(); Block chest = mock(Block.class); when(chest.getType()).thenReturn(Material.CHEST); 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 603b0a503..9f5b7d58f 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 @@ -69,6 +69,7 @@ public class CleanSuperFlatListenerTest { */ @Before public void setUp() throws Exception { + PowerMockito.mockStatic(Bukkit.class, Mockito.RETURNS_MOCKS); // Set up plugin BentoBox plugin = mock(BentoBox.class); @@ -82,6 +83,7 @@ public class CleanSuperFlatListenerTest { PowerMockito.mockStatic(Util.class, Mockito.RETURNS_MOCKS); when(Util.getWorld(any())).thenReturn(world); + when(Util.findFirstMatchingEnum(any(), any())).thenCallRealMethod(); // Regenerator when(Util.getRegenerator()).thenReturn(regenerator); @@ -99,8 +101,6 @@ public class CleanSuperFlatListenerTest { when(iwm.isUseOwnGenerator(any())).thenReturn(false); when(iwm.getAddon(any())).thenReturn(Optional.empty()); - - PowerMockito.mockStatic(Bukkit.class); ItemFactory itemF = mock(ItemFactory.class); ItemMeta im = mock(ItemMeta.class); when(itemF.getItemMeta(any())).thenReturn(im); 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 aa1a13f9e..1a40dc00e 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 @@ -33,7 +33,9 @@ import org.junit.Before; import org.junit.Test; import org.junit.runner.RunWith; import org.mockito.Mock; +import org.mockito.Mockito; import org.mockito.stubbing.Answer; +import org.powermock.api.mockito.PowerMockito; import org.powermock.core.classloader.annotations.PrepareForTest; import org.powermock.modules.junit4.PowerMockRunner; import org.powermock.reflect.Whitebox; @@ -80,6 +82,7 @@ public class CoarseDirtTillingListenerTest { */ @Before public void setUp() throws Exception { + PowerMockito.mockStatic(Bukkit.class, Mockito.RETURNS_MOCKS); // Set up plugin BentoBox plugin = mock(BentoBox.class); Whitebox.setInternalState(BentoBox.class, "instance", plugin); diff --git a/src/test/java/world/bentobox/bentobox/listeners/flags/worldsettings/EnderChestListenerTest.java b/src/test/java/world/bentobox/bentobox/listeners/flags/worldsettings/EnderChestListenerTest.java index 7aca613f6..b7384a7db 100644 --- a/src/test/java/world/bentobox/bentobox/listeners/flags/worldsettings/EnderChestListenerTest.java +++ b/src/test/java/world/bentobox/bentobox/listeners/flags/worldsettings/EnderChestListenerTest.java @@ -60,7 +60,7 @@ public class EnderChestListenerTest extends AbstractCommonSetup { Flags.ENDER_CHEST.setSetting(world, false); // No special perms - when(player.hasPermission(anyString())).thenReturn(false); + when(mockPlayer.hasPermission(anyString())).thenReturn(false); // Action, Item and clicked block action = Action.RIGHT_CLICK_BLOCK; @@ -73,7 +73,7 @@ public class EnderChestListenerTest extends AbstractCommonSetup { public void testOnEnderChestOpenNotRightClick() { action = Action.LEFT_CLICK_AIR; BlockFace clickedBlockFace = BlockFace.EAST; - PlayerInteractEvent e = new PlayerInteractEvent(player, action, item, clickedBlock, clickedBlockFace); + PlayerInteractEvent e = new PlayerInteractEvent(mockPlayer, action, item, clickedBlock, clickedBlockFace); new BlockInteractionListener().onPlayerInteract(e); assertEquals(Result.ALLOW, e.useInteractedBlock()); } @@ -81,7 +81,7 @@ public class EnderChestListenerTest extends AbstractCommonSetup { @Test public void testOnEnderChestOpenEnderChestNotInWorld() { BlockFace clickedBlockFace = BlockFace.EAST; - PlayerInteractEvent e = new PlayerInteractEvent(player, action, item, clickedBlock, clickedBlockFace); + PlayerInteractEvent e = new PlayerInteractEvent(mockPlayer, action, item, clickedBlock, clickedBlockFace); // Not in world when(iwm.inWorld(any(World.class))).thenReturn(false); when(iwm.inWorld(any(Location.class))).thenReturn(false); @@ -92,9 +92,9 @@ public class EnderChestListenerTest extends AbstractCommonSetup { @Test public void testOnEnderChestOpenEnderChestOpPlayer() { BlockFace clickedBlockFace = BlockFace.EAST; - PlayerInteractEvent e = new PlayerInteractEvent(player, action, item, clickedBlock, clickedBlockFace); + PlayerInteractEvent e = new PlayerInteractEvent(mockPlayer, action, item, clickedBlock, clickedBlockFace); // Op player - when(player.isOp()).thenReturn(true); + when(mockPlayer.isOp()).thenReturn(true); new BlockInteractionListener().onPlayerInteract(e); assertEquals(Result.ALLOW, e.useInteractedBlock()); } @@ -102,9 +102,9 @@ public class EnderChestListenerTest extends AbstractCommonSetup { @Test public void testOnEnderChestOpenEnderChestHasBypassPerm() { BlockFace clickedBlockFace = BlockFace.EAST; - PlayerInteractEvent e = new PlayerInteractEvent(player, action, item, clickedBlock, clickedBlockFace); + PlayerInteractEvent e = new PlayerInteractEvent(mockPlayer, action, item, clickedBlock, clickedBlockFace); // Has bypass perm - when(player.hasPermission(anyString())).thenReturn(true); + when(mockPlayer.hasPermission(anyString())).thenReturn(true); new BlockInteractionListener().onPlayerInteract(e); assertEquals(Result.ALLOW, e.useInteractedBlock()); } @@ -112,7 +112,7 @@ public class EnderChestListenerTest extends AbstractCommonSetup { @Test public void testOnEnderChestOpenEnderChestOkay() { BlockFace clickedBlockFace = BlockFace.EAST; - PlayerInteractEvent e = new PlayerInteractEvent(player, action, item, clickedBlock, clickedBlockFace); + PlayerInteractEvent e = new PlayerInteractEvent(mockPlayer, action, item, clickedBlock, clickedBlockFace); // Enderchest use is okay Flags.ENDER_CHEST.setSetting(world, true); BlockInteractionListener bil = new BlockInteractionListener(); @@ -124,7 +124,7 @@ public class EnderChestListenerTest extends AbstractCommonSetup { @Test public void testOnEnderChestOpenEnderChestBlocked() { BlockFace clickedBlockFace = BlockFace.EAST; - PlayerInteractEvent e = new PlayerInteractEvent(player, action, item, clickedBlock, clickedBlockFace); + PlayerInteractEvent e = new PlayerInteractEvent(mockPlayer, action, item, clickedBlock, clickedBlockFace); // Enderchest use is blocked Flags.ENDER_CHEST.setSetting(world, false); new BlockInteractionListener().onPlayerInteract(e); @@ -139,7 +139,7 @@ public class EnderChestListenerTest extends AbstractCommonSetup { when(item.getType()).thenReturn(Material.STONE); when(recipe.getResult()).thenReturn(item); InventoryView view = mock(InventoryView.class); - when(view.getPlayer()).thenReturn(player); + when(view.getPlayer()).thenReturn(mockPlayer); Inventory top = mock(Inventory.class); when(top.getSize()).thenReturn(9); when(view.getTopInventory()).thenReturn(top); @@ -158,7 +158,7 @@ public class EnderChestListenerTest extends AbstractCommonSetup { when(item.getType()).thenReturn(Material.ENDER_CHEST); when(recipe.getResult()).thenReturn(item); InventoryView view = mock(InventoryView.class); - when(view.getPlayer()).thenReturn(player); + when(view.getPlayer()).thenReturn(mockPlayer); Inventory top = mock(Inventory.class); when(top.getSize()).thenReturn(9); when(view.getTopInventory()).thenReturn(top); diff --git a/src/test/java/world/bentobox/bentobox/listeners/flags/worldsettings/EndermanListenerTest.java b/src/test/java/world/bentobox/bentobox/listeners/flags/worldsettings/EndermanListenerTest.java index 3717a96d6..228c406be 100644 --- a/src/test/java/world/bentobox/bentobox/listeners/flags/worldsettings/EndermanListenerTest.java +++ b/src/test/java/world/bentobox/bentobox/listeners/flags/worldsettings/EndermanListenerTest.java @@ -66,6 +66,8 @@ public class EndermanListenerTest { @Before public void setUp() { + PowerMockito.mockStatic(Bukkit.class, Mockito.RETURNS_MOCKS); + // Set up plugin BentoBox plugin = mock(BentoBox.class); Whitebox.setInternalState(BentoBox.class, "instance", plugin); @@ -81,7 +83,6 @@ public class EndermanListenerTest { ItemFactory itemFactory = mock(ItemFactory.class); when(server.getItemFactory()).thenReturn(itemFactory); - PowerMockito.mockStatic(Bukkit.class); when(Bukkit.getServer()).thenReturn(server); when(Bukkit.getPluginManager()).thenReturn(pim); 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 09b45ac2b..fe1a34adf 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 @@ -95,13 +95,18 @@ public class EnterExitListenerTest { Whitebox.setInternalState(BentoBox.class, "instance", plugin); // Server - PowerMockito.mockStatic(Bukkit.class); + PowerMockito.mockStatic(Bukkit.class, Mockito.RETURNS_MOCKS); when(Bukkit.getPluginManager()).thenReturn(pim); // Settings Settings s = mock(Settings.class); when(plugin.getSettings()).thenReturn(s); + // Util + PowerMockito.mockStatic(Util.class); + when(Util.getWorld(any())).thenReturn(world); + when(Util.findFirstMatchingEnum(any(), any())).thenCallRealMethod(); + // Player Player p = mock(Player.class); // Sometimes use Mockito.withSettings().verboseLogging() @@ -189,9 +194,6 @@ public class EnterExitListenerTest { // Listener listener = new EnterExitListener(); - PowerMockito.mockStatic(Util.class); - when(Util.getWorld(any())).thenReturn(world); - // World Settings WorldSettings ws = mock(WorldSettings.class); when(iwm.getWorldSettings(any())).thenReturn(ws); 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 0a1f9c1a8..7a3ca7228 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 @@ -44,6 +44,7 @@ import org.junit.Before; import org.junit.Test; import org.junit.runner.RunWith; import org.mockito.Mock; +import org.mockito.Mockito; import org.mockito.stubbing.Answer; import org.powermock.api.mockito.PowerMockito; import org.powermock.core.classloader.annotations.PrepareForTest; @@ -93,6 +94,7 @@ public class InvincibleVisitorsListenerTest { */ @Before public void setUp() throws Exception { + PowerMockito.mockStatic(Bukkit.class, Mockito.RETURNS_MOCKS); // Set up plugin BentoBox plugin = mock(BentoBox.class); @@ -137,6 +139,7 @@ public class InvincibleVisitorsListenerTest { PowerMockito.mockStatic(Util.class); when(Util.getWorld(any())).thenReturn(mock(World.class)); when(Util.prettifyText(anyString())).thenCallRealMethod(); + when(Util.findFirstMatchingEnum(any(), any())).thenCallRealMethod(); // Util translate color codes (used in user translate methods) when(Util.translateColorCodes(anyString())).thenAnswer((Answer) invocation -> invocation.getArgument(0, String.class)); FlagsManager fm = mock(FlagsManager.class); @@ -168,7 +171,6 @@ public class InvincibleVisitorsListenerTest { ivSettings.add(EntityDamageEvent.DamageCause.VOID.name()); when(iwm.getIvSettings(any())).thenReturn(ivSettings); - PowerMockito.mockStatic(Bukkit.class); ItemFactory itemF = mock(ItemFactory.class); ItemMeta imeta = mock(ItemMeta.class); when(itemF.getItemMeta(any())).thenReturn(imeta); 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 4d5a85741..98c586f85 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 @@ -17,6 +17,7 @@ import java.util.Map; import java.util.Optional; import java.util.UUID; +import org.bukkit.Bukkit; import org.bukkit.Location; import org.bukkit.Server; import org.bukkit.World; @@ -53,7 +54,7 @@ import world.bentobox.bentobox.util.Util; * */ @RunWith(PowerMockRunner.class) -@PrepareForTest({ BentoBox.class, Flags.class, Util.class }) +@PrepareForTest({ BentoBox.class, Flags.class, Util.class, Bukkit.class }) public class IslandRespawnListenerTest { @Mock @@ -75,6 +76,7 @@ public class IslandRespawnListenerTest { */ @Before public void setUp() throws Exception { + PowerMockito.mockStatic(Bukkit.class, Mockito.RETURNS_MOCKS); // Set up plugin BentoBox plugin = mock(BentoBox.class); Whitebox.setInternalState(BentoBox.class, "instance", plugin); @@ -103,6 +105,7 @@ public class IslandRespawnListenerTest { PowerMockito.mockStatic(Util.class); when(Util.getWorld(any())).thenReturn(world); + when(Util.findFirstMatchingEnum(any(), any())).thenCallRealMethod(); // World Settings WorldSettings ws = mock(WorldSettings.class); diff --git a/src/test/java/world/bentobox/bentobox/listeners/flags/worldsettings/ItemFrameListenerTest.java b/src/test/java/world/bentobox/bentobox/listeners/flags/worldsettings/ItemFrameListenerTest.java index d2536adf5..b2f7c5933 100644 --- a/src/test/java/world/bentobox/bentobox/listeners/flags/worldsettings/ItemFrameListenerTest.java +++ b/src/test/java/world/bentobox/bentobox/listeners/flags/worldsettings/ItemFrameListenerTest.java @@ -69,6 +69,7 @@ public class ItemFrameListenerTest { @Before public void setUp() { + PowerMockito.mockStatic(Bukkit.class, Mockito.RETURNS_MOCKS); // Set up plugin BentoBox plugin = mock(BentoBox.class); Whitebox.setInternalState(BentoBox.class, "instance", plugin); @@ -78,7 +79,6 @@ public class ItemFrameListenerTest { when(server.getWorld("world")).thenReturn(world); when(server.getVersion()).thenReturn("BSB_Mocking"); - PowerMockito.mockStatic(Bukkit.class); when(Bukkit.getServer()).thenReturn(server); PluginManager pim = mock(PluginManager.class); when(Bukkit.getPluginManager()).thenReturn(pim); diff --git a/src/test/java/world/bentobox/bentobox/listeners/flags/worldsettings/LiquidsFlowingOutListenerTest.java b/src/test/java/world/bentobox/bentobox/listeners/flags/worldsettings/LiquidsFlowingOutListenerTest.java index 3fe2bcf73..466d5fb77 100644 --- a/src/test/java/world/bentobox/bentobox/listeners/flags/worldsettings/LiquidsFlowingOutListenerTest.java +++ b/src/test/java/world/bentobox/bentobox/listeners/flags/worldsettings/LiquidsFlowingOutListenerTest.java @@ -11,6 +11,7 @@ import java.util.HashMap; import java.util.Map; import java.util.Optional; +import org.bukkit.Bukkit; import org.bukkit.Location; import org.bukkit.World; import org.bukkit.block.Block; @@ -20,6 +21,7 @@ import org.junit.Before; import org.junit.Test; import org.junit.runner.RunWith; import org.mockito.Mockito; +import org.powermock.api.mockito.PowerMockito; import org.powermock.core.classloader.annotations.PrepareForTest; import org.powermock.modules.junit4.PowerMockRunner; import org.powermock.reflect.Whitebox; @@ -38,7 +40,7 @@ import world.bentobox.bentobox.managers.IslandsManager; * @since 1.3.0 */ @RunWith(PowerMockRunner.class) -@PrepareForTest({BentoBox.class}) +@PrepareForTest({ BentoBox.class, Bukkit.class }) public class LiquidsFlowingOutListenerTest { /* IslandWorldManager */ @@ -59,6 +61,8 @@ public class LiquidsFlowingOutListenerTest { @Before public void setUp() throws Exception { + PowerMockito.mockStatic(Bukkit.class, Mockito.RETURNS_MOCKS); + // Set up plugin BentoBox plugin = mock(BentoBox.class); Whitebox.setInternalState(BentoBox.class, "instance", plugin); diff --git a/src/test/java/world/bentobox/bentobox/listeners/flags/worldsettings/ObsidianScoopingListenerTest.java b/src/test/java/world/bentobox/bentobox/listeners/flags/worldsettings/ObsidianScoopingListenerTest.java index 8eb31b5b0..8804778fd 100644 --- a/src/test/java/world/bentobox/bentobox/listeners/flags/worldsettings/ObsidianScoopingListenerTest.java +++ b/src/test/java/world/bentobox/bentobox/listeners/flags/worldsettings/ObsidianScoopingListenerTest.java @@ -74,6 +74,7 @@ public class ObsidianScoopingListenerTest { @Before public void setUp() throws Exception { + PowerMockito.mockStatic(Bukkit.class, Mockito.RETURNS_MOCKS); // Set up plugin Whitebox.setInternalState(BentoBox.class, "instance", plugin); @@ -83,7 +84,6 @@ public class ObsidianScoopingListenerTest { when(server.getWorld("world")).thenReturn(world); when(server.getVersion()).thenReturn("BSB_Mocking"); - PowerMockito.mockStatic(Bukkit.class, Mockito.RETURNS_MOCKS); PluginManager pluginManager = mock(PluginManager.class); when(Bukkit.getPluginManager()).thenReturn(pluginManager); 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 17e6f7a2b..fea678028 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 @@ -62,10 +62,17 @@ public class OfflineGrowthListenerTest { @Before public void setUp() throws Exception { + PowerMockito.mockStatic(Bukkit.class, Mockito.RETURNS_MOCKS); + // Set up plugin BentoBox plugin = mock(BentoBox.class); Whitebox.setInternalState(BentoBox.class, "instance", plugin); + // Util + PowerMockito.mockStatic(Util.class); + when(Util.getWorld(any())).thenReturn(world); + when(Util.findFirstMatchingEnum(any(), any())).thenCallRealMethod(); + // Owner UUID uuid = UUID.randomUUID(); @@ -92,9 +99,6 @@ public class OfflineGrowthListenerTest { when(block.getLocation()).thenReturn(inside); when(block.getType()).thenReturn(Material.KELP); - PowerMockito.mockStatic(Util.class); - when(Util.getWorld(any())).thenReturn(world); - // World Settings when(iwm.inWorld(any(World.class))).thenReturn(true); when(plugin.getIWM()).thenReturn(iwm); @@ -104,7 +108,6 @@ public class OfflineGrowthListenerTest { when(ws.getWorldFlags()).thenReturn(worldFlags); when(iwm.getAddon(any())).thenReturn(Optional.empty()); - PowerMockito.mockStatic(Bukkit.class); } @After 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 1624808de..5557a7333 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 @@ -63,6 +63,7 @@ public class OfflineRedstoneListenerTest { @Before public void setUp() throws Exception { + PowerMockito.mockStatic(Bukkit.class, Mockito.RETURNS_MOCKS); // Set up plugin BentoBox plugin = mock(BentoBox.class); Whitebox.setInternalState(BentoBox.class, "instance", plugin); @@ -94,6 +95,7 @@ public class OfflineRedstoneListenerTest { // Util PowerMockito.mockStatic(Util.class); when(Util.getWorld(any())).thenReturn(world); + when(Util.findFirstMatchingEnum(any(), any())).thenCallRealMethod(); // World Settings when(iwm.inWorld(any(World.class))).thenReturn(true); @@ -104,7 +106,6 @@ public class OfflineRedstoneListenerTest { when(ws.getWorldFlags()).thenReturn(worldFlags); when(iwm.getAddon(any())).thenReturn(Optional.empty()); - PowerMockito.mockStatic(Bukkit.class); // Online players Set onlinePlayers = new HashSet<>(); for (String name : NAMES) { diff --git a/src/test/java/world/bentobox/bentobox/listeners/flags/worldsettings/PetTeleportListenerTest.java b/src/test/java/world/bentobox/bentobox/listeners/flags/worldsettings/PetTeleportListenerTest.java index a44122b8c..f18e22374 100644 --- a/src/test/java/world/bentobox/bentobox/listeners/flags/worldsettings/PetTeleportListenerTest.java +++ b/src/test/java/world/bentobox/bentobox/listeners/flags/worldsettings/PetTeleportListenerTest.java @@ -61,7 +61,7 @@ public class PetTeleportListenerTest extends AbstractCommonSetup { */ @Test public void testOnPetTeleportNotTameable() { - EntityTeleportEvent e = new EntityTeleportEvent(player, location, location); + EntityTeleportEvent e = new EntityTeleportEvent(mockPlayer, location, location); ptl.onPetTeleport(e); assertFalse(e.isCancelled()); } @@ -71,7 +71,7 @@ public class PetTeleportListenerTest extends AbstractCommonSetup { */ @Test public void testOnPetTeleportNullTo() { - EntityTeleportEvent e = new EntityTeleportEvent(player, location, null); + EntityTeleportEvent e = new EntityTeleportEvent(mockPlayer, location, null); ptl.onPetTeleport(e); assertFalse(e.isCancelled()); } diff --git a/src/test/java/world/bentobox/bentobox/listeners/flags/worldsettings/PistonPushListenerTest.java b/src/test/java/world/bentobox/bentobox/listeners/flags/worldsettings/PistonPushListenerTest.java index 1fe59ca16..db65ae405 100644 --- a/src/test/java/world/bentobox/bentobox/listeners/flags/worldsettings/PistonPushListenerTest.java +++ b/src/test/java/world/bentobox/bentobox/listeners/flags/worldsettings/PistonPushListenerTest.java @@ -14,6 +14,7 @@ import java.util.Map; import java.util.Optional; import java.util.UUID; +import org.bukkit.Bukkit; import org.bukkit.Location; import org.bukkit.World; import org.bukkit.block.Block; @@ -41,7 +42,7 @@ import world.bentobox.bentobox.managers.IslandsManager; import world.bentobox.bentobox.util.Util; @RunWith(PowerMockRunner.class) -@PrepareForTest({BentoBox.class, Util.class }) +@PrepareForTest({ BentoBox.class, Util.class, Bukkit.class }) public class PistonPushListenerTest { @Mock @@ -54,6 +55,7 @@ public class PistonPushListenerTest { @Before public void setUp() throws Exception { + PowerMockito.mockStatic(Bukkit.class, Mockito.RETURNS_MOCKS); // Set up plugin BentoBox plugin = mock(BentoBox.class); Whitebox.setInternalState(BentoBox.class, "instance", plugin); @@ -94,6 +96,7 @@ public class PistonPushListenerTest { PowerMockito.mockStatic(Util.class); when(Util.getWorld(any())).thenReturn(world); + when(Util.findFirstMatchingEnum(any(), any())).thenCallRealMethod(); // World Settings IslandWorldManager iwm = mock(IslandWorldManager.class); diff --git a/src/test/java/world/bentobox/bentobox/listeners/flags/worldsettings/RemoveMobsListenerTest.java b/src/test/java/world/bentobox/bentobox/listeners/flags/worldsettings/RemoveMobsListenerTest.java index 7a9883951..e64191f0b 100644 --- a/src/test/java/world/bentobox/bentobox/listeners/flags/worldsettings/RemoveMobsListenerTest.java +++ b/src/test/java/world/bentobox/bentobox/listeners/flags/worldsettings/RemoveMobsListenerTest.java @@ -67,6 +67,7 @@ public class RemoveMobsListenerTest { */ @Before public void setUp() throws Exception { + PowerMockito.mockStatic(Bukkit.class, Mockito.RETURNS_MOCKS); // Set up plugin BentoBox plugin = mock(BentoBox.class); Whitebox.setInternalState(BentoBox.class, "instance", plugin); @@ -97,6 +98,7 @@ public class RemoveMobsListenerTest { PowerMockito.mockStatic(Util.class); when(Util.getWorld(any())).thenReturn(world); + when(Util.findFirstMatchingEnum(any(), any())).thenCallRealMethod(); // World Settings IslandWorldManager iwm = mock(IslandWorldManager.class); @@ -115,7 +117,6 @@ public class RemoveMobsListenerTest { when(player.getWorld()).thenReturn(world); // Scheduler - PowerMockito.mockStatic(Bukkit.class); when(Bukkit.getScheduler()).thenReturn(scheduler); } diff --git a/src/test/java/world/bentobox/bentobox/listeners/flags/worldsettings/TreesGrowingOutsideRangeListenerTest.java b/src/test/java/world/bentobox/bentobox/listeners/flags/worldsettings/TreesGrowingOutsideRangeListenerTest.java index 655ef53f3..1c42fe154 100644 --- a/src/test/java/world/bentobox/bentobox/listeners/flags/worldsettings/TreesGrowingOutsideRangeListenerTest.java +++ b/src/test/java/world/bentobox/bentobox/listeners/flags/worldsettings/TreesGrowingOutsideRangeListenerTest.java @@ -13,6 +13,7 @@ import java.util.List; import java.util.Map; import java.util.Optional; +import org.bukkit.Bukkit; import org.bukkit.Location; import org.bukkit.Material; import org.bukkit.TreeType; @@ -26,6 +27,7 @@ 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 org.powermock.reflect.Whitebox; @@ -44,7 +46,7 @@ import world.bentobox.bentobox.managers.IslandsManager; * @since 1.3.0 */ @RunWith(PowerMockRunner.class) -@PrepareForTest({BentoBox.class}) +@PrepareForTest({ BentoBox.class, Bukkit.class }) public class TreesGrowingOutsideRangeListenerTest { /* IslandWorldManager */ @@ -79,6 +81,8 @@ public class TreesGrowingOutsideRangeListenerTest { @Before public void setUp() throws Exception { + PowerMockito.mockStatic(Bukkit.class, Mockito.RETURNS_MOCKS); + // Set up plugin BentoBox plugin = mock(BentoBox.class); Whitebox.setInternalState(BentoBox.class, "instance", plugin); diff --git a/src/test/java/world/bentobox/bentobox/listeners/flags/worldsettings/VisitorKeepInventoryListenerTest.java b/src/test/java/world/bentobox/bentobox/listeners/flags/worldsettings/VisitorKeepInventoryListenerTest.java index 9d67d68a9..7e6ec1143 100644 --- a/src/test/java/world/bentobox/bentobox/listeners/flags/worldsettings/VisitorKeepInventoryListenerTest.java +++ b/src/test/java/world/bentobox/bentobox/listeners/flags/worldsettings/VisitorKeepInventoryListenerTest.java @@ -20,6 +20,7 @@ import java.util.Map; import java.util.Optional; import java.util.UUID; +import org.bukkit.Bukkit; import org.bukkit.Location; import org.bukkit.Material; import org.bukkit.World; @@ -55,7 +56,7 @@ import world.bentobox.bentobox.util.Util; * */ @RunWith(PowerMockRunner.class) -@PrepareForTest({BentoBox.class, Util.class}) +@PrepareForTest({ BentoBox.class, Util.class, Bukkit.class }) public class VisitorKeepInventoryListenerTest { // Class under test @@ -84,6 +85,7 @@ public class VisitorKeepInventoryListenerTest { */ @Before public void setUp() throws Exception { + PowerMockito.mockStatic(Bukkit.class, Mockito.RETURNS_MOCKS); // Set up plugin BentoBox plugin = mock(BentoBox.class); Whitebox.setInternalState(BentoBox.class, "instance", plugin); diff --git a/src/test/java/world/bentobox/bentobox/listeners/flags/worldsettings/WitherListenerTest.java b/src/test/java/world/bentobox/bentobox/listeners/flags/worldsettings/WitherListenerTest.java index 078042882..f1f75789d 100644 --- a/src/test/java/world/bentobox/bentobox/listeners/flags/worldsettings/WitherListenerTest.java +++ b/src/test/java/world/bentobox/bentobox/listeners/flags/worldsettings/WitherListenerTest.java @@ -28,6 +28,7 @@ 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 org.powermock.reflect.Whitebox; @@ -67,6 +68,7 @@ public class WitherListenerTest { */ @Before public void setUp() throws Exception { + PowerMockito.mockStatic(Bukkit.class, Mockito.RETURNS_MOCKS); // Set up plugin BentoBox plugin = mock(BentoBox.class); Whitebox.setInternalState(BentoBox.class, "instance", plugin); diff --git a/src/test/java/world/bentobox/bentobox/listeners/teleports/EntityTeleportListenerTest.java b/src/test/java/world/bentobox/bentobox/listeners/teleports/EntityTeleportListenerTest.java index 66cd6f84a..03e697bf2 100644 --- a/src/test/java/world/bentobox/bentobox/listeners/teleports/EntityTeleportListenerTest.java +++ b/src/test/java/world/bentobox/bentobox/listeners/teleports/EntityTeleportListenerTest.java @@ -73,7 +73,7 @@ public class EntityTeleportListenerTest extends AbstractCommonSetup { public void testOnEntityPortalWrongWorld() { PowerMockito.mockStatic(Util.class, Mockito.RETURNS_MOCKS); when(Util.getWorld(any())).thenReturn(null); - EntityPortalEvent event = new EntityPortalEvent(player, location, location, 10); + EntityPortalEvent event = new EntityPortalEvent(mockPlayer, location, location, 10); etl.onEntityPortal(event); assertFalse(event.isCancelled()); } @@ -84,7 +84,7 @@ public class EntityTeleportListenerTest extends AbstractCommonSetup { @Test public void testOnEntityPortalWrongWorld2() { when(iwm.inWorld(any(World.class))).thenReturn(false); - EntityPortalEvent event = new EntityPortalEvent(player, location, location, 10); + EntityPortalEvent event = new EntityPortalEvent(mockPlayer, location, location, 10); etl.onEntityPortal(event); assertFalse(event.isCancelled()); } @@ -95,7 +95,7 @@ public class EntityTeleportListenerTest extends AbstractCommonSetup { */ @Test public void testOnEntityPortalNullTo() { - EntityPortalEvent event = new EntityPortalEvent(player, location, null, 10); + EntityPortalEvent event = new EntityPortalEvent(mockPlayer, location, null, 10); etl.onEntityPortal(event); assertFalse(event.isCancelled()); } @@ -106,7 +106,7 @@ public class EntityTeleportListenerTest extends AbstractCommonSetup { */ @Test public void testOnEntityPortalTeleportDisabled() { - EntityPortalEvent event = new EntityPortalEvent(player, location, location, 10); + EntityPortalEvent event = new EntityPortalEvent(mockPlayer, location, location, 10); etl.onEntityPortal(event); assertTrue(event.isCancelled()); } @@ -122,7 +122,7 @@ public class EntityTeleportListenerTest extends AbstractCommonSetup { when(world.getEnvironment()).thenReturn(Environment.NORMAL); Flags.ENTITY_PORTAL_TELEPORT.setSetting(world, true); - EntityPortalEvent event = new EntityPortalEvent(player, location, location, 10); + EntityPortalEvent event = new EntityPortalEvent(mockPlayer, location, location, 10); etl.onEntityPortal(event); assertFalse(event.isCancelled()); @@ -145,7 +145,7 @@ public class EntityTeleportListenerTest extends AbstractCommonSetup { when(location.getWorld()).thenReturn(world); Flags.ENTITY_PORTAL_TELEPORT.setSetting(world, true); - EntityPortalEvent event = new EntityPortalEvent(player, location, location2, 10); + EntityPortalEvent event = new EntityPortalEvent(mockPlayer, location, location2, 10); etl.onEntityPortal(event); assertTrue(event.isCancelled()); @@ -167,7 +167,7 @@ public class EntityTeleportListenerTest extends AbstractCommonSetup { when(Util.getWorld(any())).thenReturn(world2); Flags.ENTITY_PORTAL_TELEPORT.setSetting(world2, true); - EntityPortalEvent event = new EntityPortalEvent(player, location, location2, 10); + EntityPortalEvent event = new EntityPortalEvent(mockPlayer, location, location2, 10); etl.onEntityPortal(event); assertTrue(event.isCancelled()); @@ -192,7 +192,7 @@ public class EntityTeleportListenerTest extends AbstractCommonSetup { when(Util.getWorld(any())).thenReturn(world2); Flags.ENTITY_PORTAL_TELEPORT.setSetting(world2, true); - EntityPortalEvent event = new EntityPortalEvent(player, location, location2, 10); + EntityPortalEvent event = new EntityPortalEvent(mockPlayer, location, location2, 10); etl.onEntityPortal(event); assertTrue(event.isCancelled()); diff --git a/src/test/java/world/bentobox/bentobox/lists/GameModePlaceholderTest.java b/src/test/java/world/bentobox/bentobox/lists/GameModePlaceholderTest.java index 7d00eccdd..3c38f89e1 100644 --- a/src/test/java/world/bentobox/bentobox/lists/GameModePlaceholderTest.java +++ b/src/test/java/world/bentobox/bentobox/lists/GameModePlaceholderTest.java @@ -12,6 +12,7 @@ import static org.mockito.Mockito.when; import java.util.Optional; import java.util.UUID; +import org.bukkit.Bukkit; import org.bukkit.Location; import org.bukkit.World; import org.eclipse.jdt.annotation.Nullable; @@ -24,6 +25,7 @@ import org.mockito.stubbing.Answer; import org.powermock.api.mockito.PowerMockito; import org.powermock.core.classloader.annotations.PrepareForTest; import org.powermock.modules.junit4.PowerMockRunner; +import org.powermock.reflect.Whitebox; import com.google.common.collect.ImmutableSet; @@ -43,7 +45,7 @@ import world.bentobox.bentobox.managers.RanksManager; * */ @RunWith(PowerMockRunner.class) -@PrepareForTest(RanksManager.class) +@PrepareForTest({ RanksManager.class, Bukkit.class }) public class GameModePlaceholderTest { @Mock @@ -70,6 +72,9 @@ public class GameModePlaceholderTest { */ @Before public void setUp() throws Exception { + PowerMockito.mockStatic(Bukkit.class, Mockito.RETURNS_MOCKS); + + Whitebox.setInternalState(BentoBox.class, "instance", plugin); PowerMockito.mockStatic(RanksManager.class, Mockito.RETURNS_MOCKS); uuid = UUID.randomUUID(); when(addon.getPlayers()).thenReturn(pm); diff --git a/src/test/java/world/bentobox/bentobox/managers/AddonsManagerTest.java b/src/test/java/world/bentobox/bentobox/managers/AddonsManagerTest.java index afb1a3bcc..775f417e6 100644 --- a/src/test/java/world/bentobox/bentobox/managers/AddonsManagerTest.java +++ b/src/test/java/world/bentobox/bentobox/managers/AddonsManagerTest.java @@ -37,6 +37,8 @@ import org.powermock.core.classloader.annotations.PrepareForTest; import org.powermock.modules.junit4.PowerMockRunner; import org.powermock.reflect.Whitebox; +import com.github.puregero.multilib.MultiLib; + import world.bentobox.bentobox.BentoBox; import world.bentobox.bentobox.Settings; import world.bentobox.bentobox.api.addons.Addon; @@ -49,7 +51,7 @@ import world.bentobox.bentobox.database.DatabaseSetup.DatabaseType; import world.bentobox.bentobox.database.objects.DataObject; @RunWith(PowerMockRunner.class) -@PrepareForTest( {Bukkit.class, BentoBox.class, DefaultPermissions.class} ) +@PrepareForTest({ Bukkit.class, BentoBox.class, DefaultPermissions.class, MultiLib.class }) public class AddonsManagerTest { private BentoBox plugin; @@ -63,7 +65,7 @@ public class AddonsManagerTest { */ @Before public void setup() throws Exception { - PowerMockito.mockStatic(Bukkit.class); + PowerMockito.mockStatic(Bukkit.class, Mockito.RETURNS_MOCKS); when(Bukkit.getPluginManager()).thenReturn(pm); // Set up plugin plugin = mock(BentoBox.class); @@ -81,6 +83,8 @@ public class AddonsManagerTest { when(plugin.getSettings()).thenReturn(s); PowerMockito.mockStatic(DefaultPermissions.class); + + PowerMockito.mockStatic(MultiLib.class, Mockito.RETURNS_MOCKS); } /** diff --git a/src/test/java/world/bentobox/bentobox/managers/BlueprintClipboardManagerTest.java b/src/test/java/world/bentobox/bentobox/managers/BlueprintClipboardManagerTest.java index 53804ab00..ed338ad83 100644 --- a/src/test/java/world/bentobox/bentobox/managers/BlueprintClipboardManagerTest.java +++ b/src/test/java/world/bentobox/bentobox/managers/BlueprintClipboardManagerTest.java @@ -128,6 +128,8 @@ public class BlueprintClipboardManagerTest { */ @Before public void setUp() throws Exception { + PowerMockito.mockStatic(Bukkit.class, Mockito.RETURNS_MOCKS); + blueprintFolder = new File("blueprints"); // Clear any residual files tearDown(); @@ -139,7 +141,6 @@ public class BlueprintClipboardManagerTest { when(hooksManager.getHook(anyString())).thenReturn(Optional.empty()); when(plugin.getHooks()).thenReturn(hooksManager); - PowerMockito.mockStatic(Bukkit.class); BlockData blockData = mock(BlockData.class); when(Bukkit.createBlockData(any(Material.class))).thenReturn(blockData); when(blockData.getAsString()).thenReturn("test123"); diff --git a/src/test/java/world/bentobox/bentobox/managers/BlueprintsManagerTest.java b/src/test/java/world/bentobox/bentobox/managers/BlueprintsManagerTest.java index b3b24ab42..da730c1cd 100644 --- a/src/test/java/world/bentobox/bentobox/managers/BlueprintsManagerTest.java +++ b/src/test/java/world/bentobox/bentobox/managers/BlueprintsManagerTest.java @@ -6,6 +6,7 @@ import static org.junit.Assert.assertNull; import static org.junit.Assert.assertTrue; import static org.mockito.ArgumentMatchers.any; import static org.mockito.ArgumentMatchers.eq; +import static org.mockito.Mockito.mock; import static org.mockito.Mockito.verify; import static org.mockito.Mockito.when; @@ -44,6 +45,9 @@ import org.mockito.stubbing.Answer; import org.powermock.api.mockito.PowerMockito; import org.powermock.core.classloader.annotations.PrepareForTest; import org.powermock.modules.junit4.PowerMockRunner; +import org.powermock.reflect.Whitebox; + +import com.github.puregero.multilib.MultiLib; import world.bentobox.bentobox.BentoBox; import world.bentobox.bentobox.api.addons.Addon; @@ -56,13 +60,14 @@ import world.bentobox.bentobox.blueprints.BlueprintPaster; import world.bentobox.bentobox.blueprints.dataobjects.BlueprintBlock; import world.bentobox.bentobox.blueprints.dataobjects.BlueprintBundle; import world.bentobox.bentobox.database.objects.Island; +import world.bentobox.bentobox.util.Util; /** * @author tastybento * */ @RunWith(PowerMockRunner.class) -@PrepareForTest( {Bukkit.class, BentoBox.class, BlueprintPaster.class} ) +@PrepareForTest({ Bukkit.class, BentoBox.class, BlueprintPaster.class, MultiLib.class, Util.class }) public class BlueprintsManagerTest { public static int BUFFER_SIZE = 10240; @@ -95,10 +100,22 @@ public class BlueprintsManagerTest { private int times; @Mock private Server server; - /** - */ + @Before public void setUp() throws Exception { + // Set up plugin + BentoBox plugin = mock(BentoBox.class); + Whitebox.setInternalState(BentoBox.class, "instance", plugin); + + PowerMockito.mockStatic(Bukkit.class, Mockito.RETURNS_MOCKS); + + // Multilib + PowerMockito.mockStatic(MultiLib.class, Mockito.RETURNS_MOCKS); + + // Util + PowerMockito.mockStatic(Util.class, Mockito.CALLS_REAL_METHODS); + when(Util.inTest()).thenReturn(true); + // Make the addon dataFolder = new File("dataFolder"); jarFile = new File("addon.jar"); @@ -115,7 +132,6 @@ public class BlueprintsManagerTest { map.put(new Vector(0,0,0), new BlueprintBlock("minecraft:bedrock")); defaultBp.setBlocks(map); // Scheduler - PowerMockito.mockStatic(Bukkit.class); when(Bukkit.getScheduler()).thenReturn(scheduler); when(server.getBukkitVersion()).thenReturn("version"); when(Bukkit.getServer()).thenReturn(server); diff --git a/src/test/java/world/bentobox/bentobox/managers/FlagsManagerTest.java b/src/test/java/world/bentobox/bentobox/managers/FlagsManagerTest.java index 5b92a5a7d..2cc674d87 100644 --- a/src/test/java/world/bentobox/bentobox/managers/FlagsManagerTest.java +++ b/src/test/java/world/bentobox/bentobox/managers/FlagsManagerTest.java @@ -56,6 +56,8 @@ public class FlagsManagerTest { @Before public void setUp() throws Exception { + PowerMockito.mockStatic(Bukkit.class, Mockito.RETURNS_MOCKS); + // Set up plugin Whitebox.setInternalState(BentoBox.class, "instance", plugin); @@ -75,7 +77,6 @@ public class FlagsManagerTest { when(server.getWorld("world")).thenReturn(world); when(server.getVersion()).thenReturn("BSB_Mocking"); - PowerMockito.mockStatic(Bukkit.class); when(Bukkit.getPluginManager()).thenReturn(pluginManager); ItemFactory itemFactory = mock(ItemFactory.class); @@ -87,6 +88,9 @@ public class FlagsManagerTest { when(Bukkit.getLogger()).thenReturn(Logger.getAnonymousLogger()); //PowerMockito.mockStatic(Flags.class); + // Util + when(Util.findFirstMatchingEnum(any(), any())).thenCallRealMethod(); + } @After diff --git a/src/test/java/world/bentobox/bentobox/managers/IslandDeletionManagerTest.java b/src/test/java/world/bentobox/bentobox/managers/IslandDeletionManagerTest.java index 36acd6362..c19a9e0d3 100644 --- a/src/test/java/world/bentobox/bentobox/managers/IslandDeletionManagerTest.java +++ b/src/test/java/world/bentobox/bentobox/managers/IslandDeletionManagerTest.java @@ -73,13 +73,14 @@ public class IslandDeletionManagerTest { @Before public void setUp() throws Exception { // Bukkit - PowerMockito.mockStatic(Bukkit.class); + PowerMockito.mockStatic(Bukkit.class, Mockito.RETURNS_MOCKS); Server server = mock(Server.class); when(server.getWorld(anyString())).thenReturn(world); when(Bukkit.getServer()).thenReturn(server); when(Bukkit.getPluginManager()).thenReturn(pim); when(server.getPluginManager()).thenReturn(pim); when(Bukkit.getScheduler()).thenReturn(scheduler); + when(server.getBukkitVersion()).thenReturn("1.20.6-R0.2-SNAPSHOT"); // Clear any remaining database deleteAll(new File("database")); diff --git a/src/test/java/world/bentobox/bentobox/managers/IslandsManagerTest.java b/src/test/java/world/bentobox/bentobox/managers/IslandsManagerTest.java index 7931f9df7..e6f355dda 100644 --- a/src/test/java/world/bentobox/bentobox/managers/IslandsManagerTest.java +++ b/src/test/java/world/bentobox/bentobox/managers/IslandsManagerTest.java @@ -13,8 +13,10 @@ import static org.mockito.Mockito.never; import static org.mockito.Mockito.verify; import static org.mockito.Mockito.when; +import java.beans.IntrospectionException; import java.io.File; import java.io.IOException; +import java.lang.reflect.InvocationTargetException; import java.nio.file.Files; import java.nio.file.Path; import java.util.ArrayList; @@ -29,6 +31,7 @@ import java.util.Map; import java.util.Optional; import java.util.Set; import java.util.UUID; +import java.util.concurrent.CompletableFuture; import org.bukkit.Bukkit; import org.bukkit.Chunk; @@ -54,6 +57,7 @@ import org.bukkit.plugin.PluginManager; import org.bukkit.scheduler.BukkitScheduler; import org.junit.After; import org.junit.Before; +import org.junit.BeforeClass; import org.junit.Test; import org.junit.runner.RunWith; import org.mockito.ArgumentCaptor; @@ -65,6 +69,7 @@ import org.powermock.core.classloader.annotations.PrepareForTest; import org.powermock.modules.junit4.PowerMockRunner; import org.powermock.reflect.Whitebox; +import com.github.puregero.multilib.MultiLib; import com.google.common.collect.ImmutableSet; import com.google.common.collect.ImmutableSet.Builder; @@ -76,7 +81,9 @@ import world.bentobox.bentobox.Settings; import world.bentobox.bentobox.api.configuration.WorldSettings; import world.bentobox.bentobox.api.events.island.IslandDeleteEvent; import world.bentobox.bentobox.api.user.User; +import world.bentobox.bentobox.database.AbstractDatabaseHandler; import world.bentobox.bentobox.database.Database; +import world.bentobox.bentobox.database.DatabaseSetup; import world.bentobox.bentobox.database.DatabaseSetup.DatabaseType; import world.bentobox.bentobox.database.objects.Island; import world.bentobox.bentobox.listeners.flags.AbstractCommonSetup; @@ -85,9 +92,10 @@ import world.bentobox.bentobox.managers.island.IslandCache; import world.bentobox.bentobox.util.Util; @RunWith(PowerMockRunner.class) -@PrepareForTest({ Bukkit.class, BentoBox.class, Util.class, Location.class }) +@PrepareForTest({ Bukkit.class, BentoBox.class, Util.class, Location.class, MultiLib.class, DatabaseSetup.class, }) public class IslandsManagerTest extends AbstractCommonSetup { + private static AbstractDatabaseHandler h; @Mock private BentoBox plugin; private UUID uuid; @@ -145,6 +153,20 @@ public class IslandsManagerTest extends AbstractCommonSetup { // Class under test IslandsManager im; + @SuppressWarnings("unchecked") + @BeforeClass + public static void beforeClass() throws IllegalAccessException, InvocationTargetException, IntrospectionException { + // This has to be done beforeClass otherwise the tests will interfere with each + // other + h = mock(AbstractDatabaseHandler.class); + // Database + PowerMockito.mockStatic(DatabaseSetup.class); + DatabaseSetup dbSetup = mock(DatabaseSetup.class); + when(DatabaseSetup.getDatabase()).thenReturn(dbSetup); + when(dbSetup.getHandler(any())).thenReturn(h); + when(h.saveObject(any())).thenReturn(CompletableFuture.completedFuture(true)); + } + @Override @SuppressWarnings("unchecked") @Before @@ -157,6 +179,9 @@ public class IslandsManagerTest extends AbstractCommonSetup { plugin = mock(BentoBox.class); Whitebox.setInternalState(BentoBox.class, "instance", plugin); + // Mutilib + PowerMockito.mockStatic(MultiLib.class, Mockito.RETURNS_MOCKS); + // island world mgr when(world.getName()).thenReturn("world"); when(world.getEnvironment()).thenReturn(World.Environment.NORMAL); @@ -238,18 +263,19 @@ public class IslandsManagerTest extends AbstractCommonSetup { // Worlds translate to world PowerMockito.mockStatic(Util.class); when(Util.getWorld(any())).thenReturn(world); + when(Util.findFirstMatchingEnum(any(), any())).thenCallRealMethod(); // Island when(island.getOwner()).thenReturn(uuid); when(island.getWorld()).thenReturn(world); - when(island.getMaxMembers()).thenReturn(null); // default + when(island.getMaxMembers()).thenReturn(new HashMap<>()); // default when(island.getMaxMembers(Mockito.anyInt())).thenReturn(null); // default when(island.getCenter()).thenReturn(location); when(island.getProtectionCenter()).thenReturn(location); // Mock island cache when(islandCache.getIslandAt(any(Location.class))).thenReturn(island); - when(islandCache.get(any(), any())).thenReturn(island); + when(islandCache.getIsland(any(), any())).thenReturn(island); optionalIsland = Optional.ofNullable(island); when(islandCache.getIslands(world, uuid)).thenReturn(List.of(island)); @@ -329,6 +355,9 @@ public class IslandsManagerTest extends AbstractCommonSetup { // Util strip spaces when(Util.stripSpaceAfterColorCodes(anyString())).thenCallRealMethod(); + // World UID + when(world.getUID()).thenReturn(uuid); + // Class under test im = new IslandsManager(plugin); // Set cache @@ -595,23 +624,39 @@ public class IslandsManagerTest extends AbstractCommonSetup { /** * Test method for * {@link world.bentobox.bentobox.managers.IslandsManager#getIsland(World, User)} + * @throws IntrospectionException + * @throws NoSuchMethodException + * @throws ClassNotFoundException + * @throws InvocationTargetException + * @throws IllegalAccessException + * @throws InstantiationException */ @Test - public void testGetIslandWorldUser() { - Island island = im.createIsland(location, user.getUniqueId()); - assertEquals(island, im.getIsland(world, user)); + public void testGetIslandWorldUser() throws InstantiationException, IllegalAccessException, + InvocationTargetException, ClassNotFoundException, NoSuchMethodException, IntrospectionException { + Island is = im.createIsland(location, user.getUniqueId()); + when(h.loadObject(anyString())).thenReturn(is); + assertEquals(is, im.getIsland(world, user)); assertNull(im.getIsland(world, (User) null)); } /** * Test method for * {@link world.bentobox.bentobox.managers.IslandsManager#getIsland(World, UUID)}. + * @throws IntrospectionException + * @throws NoSuchMethodException + * @throws ClassNotFoundException + * @throws InvocationTargetException + * @throws IllegalAccessException + * @throws InstantiationException */ @Test - public void testGetIsland() { + public void testGetIsland() throws InstantiationException, IllegalAccessException, InvocationTargetException, + ClassNotFoundException, NoSuchMethodException, IntrospectionException { UUID owner = UUID.randomUUID(); - Island island = im.createIsland(location, owner); - assertEquals(island, im.getIsland(world, owner)); + Island is = im.createIsland(location, owner); + when(h.loadObject(anyString())).thenReturn(is); + assertEquals(is, im.getIsland(world, owner)); assertNull(im.getIsland(world, UUID.randomUUID())); } @@ -639,12 +684,25 @@ public class IslandsManagerTest extends AbstractCommonSetup { /** * Test method for * {@link world.bentobox.bentobox.managers.IslandsManager#getIslandLocation(World, UUID)}. + * @throws IntrospectionException + * @throws NoSuchMethodException + * @throws ClassNotFoundException + * @throws InvocationTargetException + * @throws IllegalAccessException + * @throws InstantiationException */ @Test - public void testGetIslandLocation() { - Island i = im.createIsland(location, uuid); + public void testGetIslandLocation() throws InstantiationException, IllegalAccessException, + InvocationTargetException, ClassNotFoundException, NoSuchMethodException, IntrospectionException { + // Store island in database + when(h.loadObject(anyString())).thenReturn(island); + im.createIsland(location, uuid); assertEquals(world, im.getIslandLocation(world, uuid).getWorld()); - assertEquals(i.getProtectionCenter(), im.getIslandLocation(world, uuid)); + Location l = im.getIslandLocation(world, uuid); + assertEquals(location.getWorld(), l.getWorld()); + assertEquals(location.getBlockX(), l.getBlockX()); + assertEquals(location.getBlockY(), l.getBlockY()); + assertEquals(location.getBlockZ(), l.getBlockZ()); assertNull(im.getIslandLocation(world, UUID.randomUUID())); } @@ -656,7 +714,6 @@ public class IslandsManagerTest extends AbstractCommonSetup { public void testGetLast() { im.setLast(location); assertEquals(location, im.getLast(world)); - assertNull(im.getLast(null)); } /** @@ -711,41 +768,6 @@ public class IslandsManagerTest extends AbstractCommonSetup { assertEquals(Optional.empty(), im.getProtectedIslandAt(location)); } - /** - * Test method for - * {@link world.bentobox.bentobox.managers.IslandsManager#getSafeHomeLocation(World, User, int)}. - */ - /* - * @Test public void testGetSafeHomeLocation() { im.setIslandCache(islandCache); - * when(island.getHome(any())).thenReturn(location); - * when(iwm.inWorld(eq(world))).thenReturn(true); assertEquals(location, - * im.getSafeHomeLocation(world, user, "")); - * - * // Change location so that it is not safe // TODO } - */ - - /** - * Test method for - * {@link world.bentobox.bentobox.managers.IslandsManager#getSafeHomeLocation(World, User, int)}. - * Ensures that the method returns {@code null} if the world is not an island - * world. - */ - /* - * @Test public void testGetSafeHomeLocationWorldNotIslandWorld() { - * when(iwm.inWorld(world)).thenReturn(false); - * assertNull(im.getSafeHomeLocation(world, user, "")); } - */ - - /** - * Test method for - * {@link world.bentobox.bentobox.managers.IslandsManager#getSafeHomeLocation(World, User, int)}. - */ - /* - * @Test public void testGetSafeHomeLocationNoIsland() { - * assertNull(im.getSafeHomeLocation(world, user, "")); - * verify(plugin).logWarning(eq("null player has no island in world world!")); } - */ - /** * Test method for * {@link world.bentobox.bentobox.managers.IslandsManager#getSpawnPoint(World)}. @@ -970,7 +992,7 @@ public class IslandsManagerTest extends AbstractCommonSetup { /** * Test method for - * {@link world.bentobox.bentobox.managers.IslandsManager#save(Island)}. + * {@link world.bentobox.bentobox.managers.IslandsManager#updateIsland(Island)}. */ @Test public void testSave() { @@ -1023,7 +1045,7 @@ public class IslandsManagerTest extends AbstractCommonSetup { Collection collection = new ArrayList<>(); collection.add(is); - when(islandCache.getIslands()).thenReturn(collection); + when(islandCache.getCachedIslands()).thenReturn(collection); im.setIslandCache(islandCache); Map members = new HashMap<>(); @@ -1063,7 +1085,7 @@ public class IslandsManagerTest extends AbstractCommonSetup { Collection collection = new ArrayList<>(); collection.add(is); - when(islandCache.getIslands()).thenReturn(collection); + when(islandCache.getCachedIslands()).thenReturn(collection); im.setIslandCache(islandCache); Map members = new HashMap<>(); @@ -1372,14 +1394,14 @@ public class IslandsManagerTest extends AbstractCommonSetup { Island island = mock(Island.class); when(island.getOwner()).thenReturn(uuid); when(island.getWorld()).thenReturn(world); - when(island.getMaxMembers()).thenReturn(null); + when(island.getMaxMembers()).thenReturn(new HashMap<>()); when(island.getMaxMembers(Mockito.anyInt())).thenReturn(null); when(iwm.getMaxTeamSize(eq(world))).thenReturn(4); // Offline owner when(Bukkit.getPlayer(any(UUID.class))).thenReturn(null); // Test assertEquals(4, im.getMaxMembers(island, RanksManager.MEMBER_RANK)); - verify(island).setMaxMembers(eq(RanksManager.MEMBER_RANK), eq(null)); + verify(island, never()).setMaxMembers(eq(RanksManager.MEMBER_RANK), eq(null)); // No change } /** @@ -1391,14 +1413,14 @@ public class IslandsManagerTest extends AbstractCommonSetup { Island island = mock(Island.class); when(island.getOwner()).thenReturn(uuid); when(island.getWorld()).thenReturn(world); - when(island.getMaxMembers()).thenReturn(null); + when(island.getMaxMembers()).thenReturn(new HashMap<>()); when(island.getMaxMembers(Mockito.anyInt())).thenReturn(null); when(iwm.getMaxTeamSize(eq(world))).thenReturn(4); // Online owner when(Bukkit.getPlayer(any(UUID.class))).thenReturn(player); // Test assertEquals(4, im.getMaxMembers(island, RanksManager.MEMBER_RANK)); - verify(island).setMaxMembers(eq(RanksManager.MEMBER_RANK), eq(null)); + verify(island, never()).setMaxMembers(RanksManager.MEMBER_RANK, null); } /** @@ -1410,7 +1432,7 @@ public class IslandsManagerTest extends AbstractCommonSetup { Island island = mock(Island.class); when(island.getOwner()).thenReturn(uuid); when(island.getWorld()).thenReturn(world); - when(island.getMaxMembers()).thenReturn(null); + when(island.getMaxMembers()).thenReturn(new HashMap<>()); when(island.getMaxMembers(Mockito.anyInt())).thenReturn(null); when(iwm.getMaxTeamSize(eq(world))).thenReturn(4); when(iwm.getMaxCoopSize(eq(world))).thenReturn(2); @@ -1419,9 +1441,9 @@ public class IslandsManagerTest extends AbstractCommonSetup { when(Bukkit.getPlayer(any(UUID.class))).thenReturn(player); // Test assertEquals(2, im.getMaxMembers(island, RanksManager.COOP_RANK)); - verify(island).setMaxMembers(eq(RanksManager.COOP_RANK), eq(null)); + verify(island, never()).setMaxMembers(RanksManager.COOP_RANK, null); // No change assertEquals(3, im.getMaxMembers(island, RanksManager.TRUSTED_RANK)); - verify(island).setMaxMembers(eq(RanksManager.TRUSTED_RANK), eq(null)); + verify(island, never()).setMaxMembers(RanksManager.TRUSTED_RANK, null); } /** @@ -1439,7 +1461,7 @@ public class IslandsManagerTest extends AbstractCommonSetup { when(Bukkit.getPlayer(any(UUID.class))).thenReturn(player); // Test assertEquals(10, im.getMaxMembers(island, RanksManager.MEMBER_RANK)); - verify(island).setMaxMembers(eq(RanksManager.MEMBER_RANK), eq(10)); + verify(island).setMaxMembers(RanksManager.MEMBER_RANK, 10); } /** @@ -1457,7 +1479,7 @@ public class IslandsManagerTest extends AbstractCommonSetup { when(Bukkit.getPlayer(any(UUID.class))).thenReturn(player); // Test assertEquals(10, im.getMaxMembers(island, RanksManager.MEMBER_RANK)); - verify(island).setMaxMembers(eq(RanksManager.MEMBER_RANK), eq(10)); + verify(island).setMaxMembers(RanksManager.MEMBER_RANK, 10); } /** @@ -1469,7 +1491,7 @@ public class IslandsManagerTest extends AbstractCommonSetup { Island island = mock(Island.class); when(island.getOwner()).thenReturn(uuid); when(island.getWorld()).thenReturn(world); - when(island.getMaxMembers()).thenReturn(null); + when(island.getMaxMembers()).thenReturn(new HashMap<>()); when(iwm.getMaxTeamSize(eq(world))).thenReturn(4); // Permission when(iwm.getPermissionPrefix(any())).thenReturn("bskyblock."); @@ -1482,7 +1504,7 @@ public class IslandsManagerTest extends AbstractCommonSetup { when(Bukkit.getPlayer(any(UUID.class))).thenReturn(player); // Test assertEquals(8, im.getMaxMembers(island, RanksManager.MEMBER_RANK)); - verify(island).setMaxMembers(eq(RanksManager.MEMBER_RANK), eq(8)); + verify(island).setMaxMembers(RanksManager.MEMBER_RANK, 8); } /** @@ -1494,7 +1516,7 @@ public class IslandsManagerTest extends AbstractCommonSetup { Island island = mock(Island.class); // Test im.setMaxMembers(island, RanksManager.MEMBER_RANK, 40); - verify(island).setMaxMembers(eq(RanksManager.MEMBER_RANK), eq(40)); + verify(island).setMaxMembers(RanksManager.MEMBER_RANK, 40); } /** @@ -1546,7 +1568,7 @@ public class IslandsManagerTest extends AbstractCommonSetup { // Test IslandsManager im = new IslandsManager(plugin); assertEquals(4, im.getMaxHomes(island)); - verify(island).setMaxHomes(eq(null)); + verify(island, never()).setMaxHomes(null); } /** @@ -1572,7 +1594,7 @@ public class IslandsManagerTest extends AbstractCommonSetup { // Test IslandsManager im = new IslandsManager(plugin); assertEquals(20, im.getMaxHomes(island)); - verify(island).setMaxHomes(eq(20)); + verify(island, never()).setMaxHomes(20); } /** @@ -1598,7 +1620,7 @@ public class IslandsManagerTest extends AbstractCommonSetup { // Test IslandsManager im = new IslandsManager(plugin); assertEquals(8, im.getMaxHomes(island)); - verify(island).setMaxHomes(eq(8)); + verify(island).setMaxHomes(8); } /** diff --git a/src/test/java/world/bentobox/bentobox/managers/LocalesManagerTest.java b/src/test/java/world/bentobox/bentobox/managers/LocalesManagerTest.java index 005e72494..5a5764833 100644 --- a/src/test/java/world/bentobox/bentobox/managers/LocalesManagerTest.java +++ b/src/test/java/world/bentobox/bentobox/managers/LocalesManagerTest.java @@ -30,6 +30,7 @@ import org.junit.Before; import org.junit.Test; import org.junit.runner.RunWith; import org.mockito.Mockito; +import org.powermock.api.mockito.PowerMockito; import org.powermock.core.classloader.annotations.PrepareForTest; import org.powermock.modules.junit4.PowerMockRunner; import org.powermock.reflect.Whitebox; @@ -57,6 +58,7 @@ public class LocalesManagerTest { */ @Before public void setUp() throws Exception { + PowerMockito.mockStatic(Bukkit.class, Mockito.RETURNS_MOCKS); // Set up plugin plugin = mock(BentoBox.class); Whitebox.setInternalState(BentoBox.class, "instance", plugin); diff --git a/src/test/java/world/bentobox/bentobox/managers/PlayersManagerTest.java b/src/test/java/world/bentobox/bentobox/managers/PlayersManagerTest.java index 96790efba..2313e9488 100644 --- a/src/test/java/world/bentobox/bentobox/managers/PlayersManagerTest.java +++ b/src/test/java/world/bentobox/bentobox/managers/PlayersManagerTest.java @@ -6,7 +6,9 @@ import static org.junit.Assert.assertNotNull; import static org.junit.Assert.assertNull; import static org.junit.Assert.assertTrue; import static org.mockito.ArgumentMatchers.any; +import static org.mockito.ArgumentMatchers.anyString; import static org.mockito.ArgumentMatchers.eq; +import static org.mockito.Mockito.atLeast; import static org.mockito.Mockito.mock; import static org.mockito.Mockito.never; import static org.mockito.Mockito.verify; @@ -53,13 +55,13 @@ import org.powermock.reflect.Whitebox; import world.bentobox.bentobox.BentoBox; import world.bentobox.bentobox.Settings; -import world.bentobox.bentobox.api.flags.Flag.Mode; import world.bentobox.bentobox.api.user.User; import world.bentobox.bentobox.database.AbstractDatabaseHandler; import world.bentobox.bentobox.database.Database; import world.bentobox.bentobox.database.DatabaseSetup; import world.bentobox.bentobox.database.DatabaseSetup.DatabaseType; import world.bentobox.bentobox.database.objects.Island; +import world.bentobox.bentobox.database.objects.Names; import world.bentobox.bentobox.database.objects.Players; import world.bentobox.bentobox.hooks.VaultHook; import world.bentobox.bentobox.util.Util; @@ -72,7 +74,7 @@ import world.bentobox.bentobox.util.Util; @PrepareForTest({ Bukkit.class, BentoBox.class, User.class, Util.class, Logger.class, DatabaseSetup.class, }) public class PlayersManagerTest { - private static AbstractDatabaseHandler h; + private static AbstractDatabaseHandler handler; private Database db; @Mock private World end; @@ -108,13 +110,13 @@ public class PlayersManagerTest { public static void beforeClass() throws IllegalAccessException, InvocationTargetException, IntrospectionException { // This has to be done beforeClass otherwise the tests will interfere with each // other - h = mock(AbstractDatabaseHandler.class); + handler = mock(AbstractDatabaseHandler.class); // Database PowerMockito.mockStatic(DatabaseSetup.class); DatabaseSetup dbSetup = mock(DatabaseSetup.class); when(DatabaseSetup.getDatabase()).thenReturn(dbSetup); - when(dbSetup.getHandler(any())).thenReturn(h); - when(h.saveObject(any())).thenReturn(CompletableFuture.completedFuture(true)); + when(dbSetup.getHandler(any())).thenReturn(handler); + when(handler.saveObject(any())).thenReturn(CompletableFuture.completedFuture(true)); } private void deleteAll(File file) throws IOException { @@ -192,8 +194,18 @@ public class PlayersManagerTest { OfflinePlayer olp = mock(OfflinePlayer.class); when(olp.getUniqueId()).thenReturn(uuid); when(olp.getName()).thenReturn("tastybento"); - PowerMockito.mockStatic(Bukkit.class); - when(Bukkit.getOfflinePlayer(Mockito.any(UUID.class))).thenReturn(olp); + PowerMockito.mockStatic(Bukkit.class, Mockito.RETURNS_MOCKS); + when(Bukkit.getOfflinePlayer(any(UUID.class))).thenAnswer(invocation -> { + UUID inputUUID = invocation.getArgument(0); + if (inputUUID.equals(uuid)) { + return olp; + } else { + OfflinePlayer differentOlp = mock(OfflinePlayer.class); + when(differentOlp.getUniqueId()).thenReturn(inputUUID); + when(differentOlp.getName()).thenReturn(""); + return differentOlp; + } + }); // Player has island to begin with IslandsManager im = mock(IslandsManager.class); @@ -240,6 +252,18 @@ public class PlayersManagerTest { when(tamed.getOwner()).thenReturn(p); when(world.getEntitiesByClass(Tameable.class)).thenReturn(list); + // Loading objects + Object players = new Players(); + when(handler.loadObject(anyString())).thenReturn(players); + // Set up names database + List names = new ArrayList<>(); + Names name = new Names(); + name.setUniqueId("tastybento"); + name.setUuid(uuid); + names.add(name); + when(handler.loadObjects()).thenReturn(names); + when(handler.objectExists(anyString())).thenReturn(true); + // Class under test pm = new PlayersManager(plugin); } @@ -263,21 +287,6 @@ public class PlayersManagerTest { assertEquals(deaths + 1, pm.getDeaths(world, uuid)); } - /** - * Test method for - * {@link world.bentobox.bentobox.managers.PlayersManager#addPlayer(java.util.UUID)}. - */ - @Test - public void testAddPlayer() { - - pm.addPlayer(null); - // Add twice - assertFalse(pm.isKnown(uuid)); - pm.addPlayer(uuid); - assertTrue(pm.isKnown(uuid)); - pm.addPlayer(uuid); - } - /** * Test method for * {@link world.bentobox.bentobox.managers.PlayersManager#addReset(org.bukkit.World, java.util.UUID)}. @@ -372,15 +381,6 @@ public class PlayersManagerTest { assertEquals(0, pm.getDeaths(world, uuid)); } - /** - * Test method for - * {@link world.bentobox.bentobox.managers.PlayersManager#getFlagsDisplayMode(java.util.UUID)}. - */ - @Test - public void testGetFlagsDisplayMode() { - assertEquals(Mode.BASIC, pm.getFlagsDisplayMode(uuid)); - } - /** * Test method for * {@link world.bentobox.bentobox.managers.PlayersManager#getLocale(java.util.UUID)}. @@ -395,21 +395,35 @@ public class PlayersManagerTest { * {@link world.bentobox.bentobox.managers.PlayersManager#getName(java.util.UUID)}. */ @Test - public void testGetName() { + public void testGetNameNull() throws InstantiationException, IllegalAccessException, InvocationTargetException, + ClassNotFoundException, NoSuchMethodException, IntrospectionException { + // Null UUID assertTrue(pm.getName(null).isEmpty()); - String name = pm.getName(uuid); - assertEquals("tastybento", name); } /** * Test method for - * {@link world.bentobox.bentobox.managers.PlayersManager#getPlayer(java.util.UUID)}. + * {@link world.bentobox.bentobox.managers.PlayersManager#getName(java.util.UUID)}. */ @Test - public void testGetPlayer() { - Players player = pm.getPlayer(uuid); - assertEquals("tastybento", player.getPlayerName()); - assertEquals(uuid.toString(), player.getUniqueId()); + public void testGetNameKnown() throws InstantiationException, IllegalAccessException, InvocationTargetException, + ClassNotFoundException, NoSuchMethodException, IntrospectionException { + pm.setPlayerName(user); + // Known UUID + assertEquals("tastybento", pm.getName(uuid)); + } + + /** + * Test method for + * {@link world.bentobox.bentobox.managers.PlayersManager#getName(java.util.UUID)}. + */ + @Test + public void testGetNameUnknown() throws InstantiationException, IllegalAccessException, InvocationTargetException, + ClassNotFoundException, NoSuchMethodException, IntrospectionException { + // Unknown UUID - nothing in database + when(handler.objectExists(anyString())).thenReturn(false); + + assertEquals("", pm.getName(UUID.randomUUID())); } /** @@ -418,7 +432,7 @@ public class PlayersManagerTest { */ @Test public void testGetPlayers() { - assertTrue(pm.getPlayers().isEmpty()); + assertFalse(pm.getPlayers().isEmpty()); } /** @@ -442,11 +456,18 @@ public class PlayersManagerTest { /** * Test method for * {@link world.bentobox.bentobox.managers.PlayersManager#setResets(World, UUID, int)}. + * @throws IntrospectionException + * @throws NoSuchMethodException + * @throws ClassNotFoundException + * @throws InvocationTargetException + * @throws IllegalAccessException + * @throws InstantiationException */ @Test - public void testGetSetResetsLeft() { + public void testGetSetResetsLeft() throws InstantiationException, IllegalAccessException, InvocationTargetException, + ClassNotFoundException, NoSuchMethodException, IntrospectionException { // Add a player - pm.addPlayer(uuid); + pm.getPlayer(uuid); assertEquals(0, pm.getResets(world, uuid)); pm.setResets(world, uuid, 20); assertEquals(20, pm.getResets(world, uuid)); @@ -455,12 +476,19 @@ public class PlayersManagerTest { /** * Test method for * {@link world.bentobox.bentobox.managers.PlayersManager#getUser(java.lang.String)}. + * @throws IntrospectionException + * @throws NoSuchMethodException + * @throws ClassNotFoundException + * @throws InvocationTargetException + * @throws IllegalAccessException + * @throws InstantiationException */ @Test - public void testGetUserString() { + public void testGetUserString() throws InstantiationException, IllegalAccessException, InvocationTargetException, + ClassNotFoundException, NoSuchMethodException, IntrospectionException { User user = pm.getUser("random"); assertNull(user); - pm.addPlayer(uuid); + pm.getPlayer(uuid); user = pm.getUser("tastybento"); assertEquals("tastybento", user.getName()); } @@ -481,7 +509,7 @@ public class PlayersManagerTest { */ @Test public void testGetUUID() { - pm.addPlayer(uuid); + pm.getPlayer(uuid); assertEquals(uuid, pm.getUUID("tastybento")); assertNull(pm.getUUID("unknown")); } @@ -494,7 +522,7 @@ public class PlayersManagerTest { public void testGetUUIDOfflinePlayer() { pm.setHandler(db); // Add a player to the cache - pm.addPlayer(uuid); + pm.getPlayer(uuid); UUID uuidResult = pm.getUUID("tastybento"); assertEquals(uuid, uuidResult); } @@ -507,7 +535,7 @@ public class PlayersManagerTest { public void testGetUUIDUnknownPlayer() { pm.setHandler(db); // Add a player to the cache - pm.addPlayer(uuid); + pm.getPlayer(uuid); // Unknown player should return null assertNull(pm.getUUID("tastybento123")); } @@ -537,8 +565,8 @@ public class PlayersManagerTest { @Test public void testIsKnown() { - pm.addPlayer(uuid); - pm.addPlayer(notUUID); + pm.getPlayer(uuid); + pm.getPlayer(notUUID); assertFalse(pm.isKnown(null)); assertTrue(pm.isKnown(uuid)); @@ -547,21 +575,11 @@ public class PlayersManagerTest { /** * Test method for - * {@link world.bentobox.bentobox.managers.PlayersManager#isSaveTaskRunning()}. + * {@link world.bentobox.bentobox.managers.PlayersManager#setHandler(Database)} */ @Test - public void testIsSaveTaskRunning() { - assertFalse(pm.isSaveTaskRunning()); - } - - /** - * Test method for - * {@link world.bentobox.bentobox.managers.PlayersManager#load()}. - */ - @Test - public void testLoad() { + public void testSetHandler() { pm.setHandler(db); - pm.load(); } /** @@ -596,43 +614,6 @@ public class PlayersManagerTest { assertNull(pm.getUUID("tastybeto")); } - /** - * Test method for - * {@link world.bentobox.bentobox.managers.PlayersManager#saveAll()}. - */ - @Test - public void testSaveAll() { - pm.setHandler(db); - pm.addPlayer(uuid); - pm.saveAll(); - verify(db).saveObjectAsync(any()); - } - - /** - * Test method for - * {@link world.bentobox.bentobox.managers.PlayersManager#saveAll(boolean)}. - */ - @Test - public void testSaveAllBoolean() { - pm.setHandler(db); - pm.addPlayer(uuid); - pm.saveAll(true); - assertTrue(pm.isSaveTaskRunning()); - } - - /** - * Test method for - * {@link world.bentobox.bentobox.managers.PlayersManager#save(java.util.UUID)}. - */ - @Test - public void testSave() { - pm.setHandler(db); - // Add a player - pm.addPlayer(uuid); - pm.save(uuid); - verify(db).saveObjectAsync(any()); - } - /** * Test method for * {@link world.bentobox.bentobox.managers.PlayersManager#setPlayerName(world.bentobox.bentobox.api.user.User)}. @@ -641,7 +622,7 @@ public class PlayersManagerTest { public void testSetandGetPlayerName() { pm.setHandler(db); // Add a player - pm.addPlayer(uuid); + pm.getPlayer(uuid); assertEquals("tastybento", pm.getName(user.getUniqueId())); pm.setPlayerName(user); assertEquals(user.getName(), pm.getName(user.getUniqueId())); @@ -658,16 +639,6 @@ public class PlayersManagerTest { } - /** - * Test method for - * {@link world.bentobox.bentobox.managers.PlayersManager#setFlagsDisplayMode(java.util.UUID, world.bentobox.bentobox.api.flags.Flag.Mode)}. - */ - @Test - public void testSetFlagsDisplayMode() { - pm.setFlagsDisplayMode(uuid, Mode.ADVANCED); - assertEquals(Mode.ADVANCED, pm.getFlagsDisplayMode(uuid)); - } - /** * Test method for * {@link world.bentobox.bentobox.managers.PlayersManager#setInTeleport(java.util.UUID)}. @@ -692,15 +663,15 @@ public class PlayersManagerTest { /** * Test method for * {@link world.bentobox.bentobox.managers.PlayersManager#setPlayerName(world.bentobox.bentobox.api.user.User)}. + * @throws IntrospectionException + * @throws InvocationTargetException + * @throws IllegalAccessException */ @Test - public void testSetPlayerName() { + public void testSetPlayerName() throws IllegalAccessException, InvocationTargetException, IntrospectionException { pm.setPlayerName(user); - assertEquals("tastybento", pm.getName(uuid)); - when(user.getName()).thenReturn("newName"); - assertEquals("tastybento", pm.getName(uuid)); - pm.setPlayerName(user); - assertEquals("newName", pm.getName(uuid)); + // Player and names database saves + verify(handler, atLeast(2)).saveObject(any()); } /** diff --git a/src/test/java/world/bentobox/bentobox/managers/RanksManagerBeforeClassTest.java b/src/test/java/world/bentobox/bentobox/managers/RanksManagerBeforeClassTest.java index ee4d3fb92..ff956dfb9 100644 --- a/src/test/java/world/bentobox/bentobox/managers/RanksManagerBeforeClassTest.java +++ b/src/test/java/world/bentobox/bentobox/managers/RanksManagerBeforeClassTest.java @@ -1,17 +1,26 @@ package world.bentobox.bentobox.managers; +import static org.mockito.ArgumentMatchers.any; import static org.mockito.ArgumentMatchers.anyInt; +import static org.mockito.ArgumentMatchers.anyString; +import static org.mockito.Mockito.doAnswer; +import static org.mockito.Mockito.mock; import static org.mockito.Mockito.when; +import java.beans.IntrospectionException; import java.io.File; import java.io.IOException; +import java.lang.reflect.InvocationTargetException; import java.nio.file.Files; import java.nio.file.Path; import java.util.Comparator; import java.util.Map; +import java.util.concurrent.CompletableFuture; +import org.bukkit.Bukkit; import org.junit.After; import org.junit.Before; +import org.junit.BeforeClass; import org.junit.runner.RunWith; import org.mockito.Mock; import org.mockito.Mockito; @@ -22,6 +31,7 @@ import org.powermock.reflect.Whitebox; import world.bentobox.bentobox.BentoBox; import world.bentobox.bentobox.api.user.User; +import world.bentobox.bentobox.database.AbstractDatabaseHandler; import world.bentobox.bentobox.database.DatabaseSetup; /** @@ -29,7 +39,7 @@ import world.bentobox.bentobox.database.DatabaseSetup; * */ @RunWith(PowerMockRunner.class) -@PrepareForTest({ BentoBox.class, DatabaseSetup.class, RanksManager.class }) +@PrepareForTest({ BentoBox.class, DatabaseSetup.class, RanksManager.class, Bukkit.class }) public abstract class RanksManagerBeforeClassTest { // Constants that define the hard coded rank values @@ -63,8 +73,48 @@ public abstract class RanksManagerBeforeClassTest { @Mock public RanksManager rm; + protected static AbstractDatabaseHandler h; + protected static Object savedObject; + + @SuppressWarnings("unchecked") + @BeforeClass + public static void beforeClass() throws IllegalAccessException, InvocationTargetException, IntrospectionException, + InstantiationException, ClassNotFoundException, NoSuchMethodException { + // This has to be done beforeClass otherwise the tests will interfere with each + // other + h = mock(AbstractDatabaseHandler.class); + // Database + PowerMockito.mockStatic(DatabaseSetup.class); + DatabaseSetup dbSetup = mock(DatabaseSetup.class); + when(DatabaseSetup.getDatabase()).thenReturn(dbSetup); + when(dbSetup.getHandler(any())).thenReturn(h); + //when(h.saveObject(any())).thenReturn(CompletableFuture.completedFuture(true)); + // Capture the parameter passed to saveObject() and store it in savedObject + doAnswer(invocation -> { + savedObject = invocation.getArgument(0); + return CompletableFuture.completedFuture(true); + }).when(h).saveObject(any()); + + // Now when loadObject() is called, return the savedObject + when(h.loadObject(any())).thenAnswer(invocation -> savedObject); + + // Delete object + doAnswer(invocation -> { + savedObject = null; + return null; + }).when(h).deleteObject(any()); + + doAnswer(invocation -> { + savedObject = null; + return null; + }).when(h).deleteID(anyString()); + + } + @Before public void setUp() throws Exception { + PowerMockito.mockStatic(Bukkit.class, Mockito.RETURNS_MOCKS); + when(Bukkit.getBukkitVersion()).thenReturn(""); // Set up plugin Whitebox.setInternalState(BentoBox.class, "instance", plugin); // RanksManager @@ -72,6 +122,8 @@ public abstract class RanksManagerBeforeClassTest { when(RanksManager.getInstance()).thenReturn(rm); when(rm.getRanks()).thenReturn(DEFAULT_RANKS); when(rm.getRank(anyInt())).thenReturn(""); + // Clear savedObject + savedObject = null; } @After diff --git a/src/test/java/world/bentobox/bentobox/managers/island/DefaultNewIslandLocationStrategyTest.java b/src/test/java/world/bentobox/bentobox/managers/island/DefaultNewIslandLocationStrategyTest.java index 8b0a8021f..535c9e269 100644 --- a/src/test/java/world/bentobox/bentobox/managers/island/DefaultNewIslandLocationStrategyTest.java +++ b/src/test/java/world/bentobox/bentobox/managers/island/DefaultNewIslandLocationStrategyTest.java @@ -10,6 +10,7 @@ import static org.mockito.Mockito.when; import java.util.Optional; +import org.bukkit.Bukkit; import org.bukkit.Location; import org.bukkit.Material; import org.bukkit.World; @@ -39,7 +40,7 @@ import world.bentobox.bentobox.util.Util; * */ @RunWith(PowerMockRunner.class) -@PrepareForTest(Util.class) +@PrepareForTest({ Bukkit.class, Util.class }) public class DefaultNewIslandLocationStrategyTest { private DefaultNewIslandLocationStrategy dnils; @@ -67,6 +68,8 @@ public class DefaultNewIslandLocationStrategyTest { */ @Before public void setUp() throws Exception { + PowerMockito.mockStatic(Bukkit.class, Mockito.RETURNS_MOCKS); + Whitebox.setInternalState(BentoBox.class, "instance", plugin); // Location when(location.getWorld()).thenReturn(world); diff --git a/src/test/java/world/bentobox/bentobox/managers/island/IslandCacheTest.java b/src/test/java/world/bentobox/bentobox/managers/island/IslandCacheTest.java index 2d71f055d..2a8410ec7 100644 --- a/src/test/java/world/bentobox/bentobox/managers/island/IslandCacheTest.java +++ b/src/test/java/world/bentobox/bentobox/managers/island/IslandCacheTest.java @@ -2,23 +2,38 @@ package world.bentobox.bentobox.managers.island; import static org.junit.Assert.assertEquals; import static org.junit.Assert.assertFalse; +import static org.junit.Assert.assertNotNull; import static org.junit.Assert.assertNotSame; import static org.junit.Assert.assertNull; import static org.junit.Assert.assertTrue; import static org.mockito.ArgumentMatchers.any; +import static org.mockito.ArgumentMatchers.anyInt; +import static org.mockito.ArgumentMatchers.anyString; import static org.mockito.ArgumentMatchers.eq; import static org.mockito.Mockito.mock; +import static org.mockito.Mockito.never; import static org.mockito.Mockito.verify; import static org.mockito.Mockito.when; +import java.beans.IntrospectionException; +import java.io.File; +import java.io.IOException; +import java.lang.reflect.InvocationTargetException; +import java.nio.file.Files; +import java.nio.file.Path; import java.util.Collections; +import java.util.Comparator; +import java.util.Map; import java.util.UUID; +import java.util.concurrent.CompletableFuture; +import org.bukkit.Bukkit; import org.bukkit.Location; import org.bukkit.World; -import org.eclipse.jdt.annotation.NonNull; +import org.bukkit.scheduler.BukkitScheduler; import org.junit.After; import org.junit.Before; +import org.junit.BeforeClass; import org.junit.Test; import org.junit.runner.RunWith; import org.mockito.Mock; @@ -33,17 +48,20 @@ import com.google.common.collect.ImmutableSet.Builder; import world.bentobox.bentobox.BentoBox; import world.bentobox.bentobox.api.flags.Flag; +import world.bentobox.bentobox.database.AbstractDatabaseHandler; +import world.bentobox.bentobox.database.Database; +import world.bentobox.bentobox.database.DatabaseSetup; import world.bentobox.bentobox.database.objects.Island; +import world.bentobox.bentobox.listeners.flags.AbstractCommonSetup; import world.bentobox.bentobox.managers.IslandWorldManager; import world.bentobox.bentobox.managers.IslandsManager; import world.bentobox.bentobox.util.Util; @RunWith(PowerMockRunner.class) -@PrepareForTest({ BentoBox.class, Util.class }) -public class IslandCacheTest { +@PrepareForTest({ Bukkit.class, BentoBox.class, Util.class, Location.class, DatabaseSetup.class, }) +public class IslandCacheTest extends AbstractCommonSetup { - @Mock - private BentoBox plugin; + private static AbstractDatabaseHandler handler; @Mock private World world; @Mock @@ -60,10 +78,29 @@ public class IslandCacheTest { private Flag flag; @Mock private IslandsManager im; + // Database + Database db; + @SuppressWarnings("unchecked") + @BeforeClass + public static void beforeClass() throws IllegalAccessException, InvocationTargetException, IntrospectionException { + // This has to be done beforeClass otherwise the tests will interfere with each + // other + handler = mock(AbstractDatabaseHandler.class); + // Database + PowerMockito.mockStatic(DatabaseSetup.class); + DatabaseSetup dbSetup = mock(DatabaseSetup.class); + when(DatabaseSetup.getDatabase()).thenReturn(dbSetup); + when(dbSetup.getHandler(any())).thenReturn(handler); + when(handler.saveObject(any())).thenReturn(CompletableFuture.completedFuture(true)); + + } + + @SuppressWarnings("unchecked") @Before public void setUp() throws Exception { - // Plugin + PowerMockito.mockStatic(Bukkit.class, Mockito.RETURNS_MOCKS); + // Set up plugin Whitebox.setInternalState(BentoBox.class, "instance", plugin); // Worlds @@ -74,21 +111,21 @@ public class IslandCacheTest { when(iwm.inWorld(any(Location.class))).thenReturn(true); PowerMockito.mockStatic(Util.class); - when(Util.getWorld(Mockito.any())).thenReturn(world); + when(Util.getWorld(any())).thenReturn(world); // Mock up IslandsManager when(plugin.getIslands()).thenReturn(im); - // Island - when(island.getWorld()).thenReturn(world); - @NonNull - String uniqueId = UUID.randomUUID().toString(); - when(island.getUniqueId()).thenReturn(uniqueId); // Location when(location.getWorld()).thenReturn(world); when(location.getBlockX()).thenReturn(0); when(location.getBlockY()).thenReturn(0); when(location.getBlockZ()).thenReturn(0); + + // Island + when(island.getWorld()).thenReturn(world); + when(island.getUniqueId()).thenReturn("uniqueId"); + when(island.inIslandSpace(anyInt(), anyInt())).thenReturn(true); when(island.getCenter()).thenReturn(location); when(island.getOwner()).thenReturn(owner); when(island.isOwned()).thenReturn(true); @@ -101,13 +138,29 @@ public class IslandCacheTest { when(island.getMinX()).thenReturn(-200); when(island.getMinZ()).thenReturn(-200); + // database must be mocked here + db = mock(Database.class); + when(db.loadObject(anyString())).thenReturn(island); + when(db.saveObjectAsync(any())).thenReturn(CompletableFuture.completedFuture(true)); + // New cache - ic = new IslandCache(); + ic = new IslandCache(db); } + @Override @After - public void tearDown() { + public void tearDown() throws Exception { + super.tearDown(); Mockito.framework().clearInlineMocks(); + deleteAll(new File("database")); + deleteAll(new File("database_backup")); + } + + private void deleteAll(File file) throws IOException { + if (file.exists()) { + Files.walk(file.toPath()).sorted(Comparator.reverseOrder()).map(Path::toFile).forEach(File::delete); + } + } /** @@ -116,9 +169,9 @@ public class IslandCacheTest { @Test public void testAddIsland() { assertTrue(ic.addIsland(island)); + assertEquals(island, ic.getIslandAt(island.getCenter())); // Check if they are added - assertEquals(island, ic.get(world, owner)); - assertEquals(island, ic.get(location)); + assertEquals(island, ic.getIsland(world, owner)); } /** @@ -126,11 +179,12 @@ public class IslandCacheTest { */ @Test public void testAddPlayer() { + ic.addIsland(island); UUID playerUUID = UUID.randomUUID(); ic.addPlayer(playerUUID, island); // Check if they are added - assertEquals(island, ic.get(world, playerUUID)); - assertNotSame(island, ic.get(world, UUID.randomUUID())); + assertEquals(island, ic.getIsland(world, playerUUID)); + assertNotSame(island, ic.getIsland(world, UUID.randomUUID())); } @@ -141,76 +195,35 @@ public class IslandCacheTest { public void testClear() { ic.addIsland(island); // Check if they are added - assertEquals(island, ic.get(world, owner)); - assertEquals(island, ic.get(location)); + assertEquals(island, ic.getIsland(world, owner)); ic.clear(); - assertNull(ic.get(world, owner)); - assertNull(ic.get(location)); + assertNull(ic.getIsland(world, owner)); } /** - * Test for {@link IslandCache#deleteIslandFromCache(Island)} - */ - @Test - public void testDeleteIslandFromCache() { - ic.addIsland(island); - // Check if they are added - assertEquals(island, ic.get(world, owner)); - assertEquals(island, ic.get(location)); - boolean result = ic.deleteIslandFromCache(island); - assertTrue(result); - assertNull(ic.get(world, owner)); - assertNull(ic.get(location)); - - // Test removing an island that is not in the cache - World world = mock(World.class); - Island island2 = mock(Island.class); - Location location2 = mock(Location.class); - when(location2.getWorld()).thenReturn(world); - when(location2.getBlockX()).thenReturn(0); - when(location2.getBlockY()).thenReturn(0); - when(location2.getBlockZ()).thenReturn(0); - when(island2.getCenter()).thenReturn(location2); - when(island2.getOwner()).thenReturn(UUID.randomUUID()); - Builder members = new ImmutableSet.Builder<>(); - members.add(UUID.randomUUID()); - members.add(UUID.randomUUID()); - members.add(UUID.randomUUID()); - when(island2.getMemberSet()).thenReturn(members.build()); - when(island2.getMinX()).thenReturn(-400); - when(island2.getMinZ()).thenReturn(-400); - - assertFalse(ic.deleteIslandFromCache(island2)); - - } - - /** - * Test for {@link IslandCache#get(Location)} - */ - @Test - public void testGetLocation() { - ic.addIsland(island); - // Check if they are added - assertEquals(island, ic.get(location)); - } - - /** - * Test for {@link IslandCache#get(World, UUID)} + * Test for {@link IslandCache#getIsland(World, UUID)} */ @Test public void testGetUUID() { ic.addIsland(island); // Check if they are added - assertEquals(island, ic.get(world, owner)); + assertEquals(island, ic.getIsland(world, owner)); } /** * Test for {@link IslandCache#getIslandAt(Location)} + * @throws IntrospectionException + * @throws NoSuchMethodException + * @throws ClassNotFoundException + * @throws InvocationTargetException + * @throws IllegalAccessException + * @throws InstantiationException */ @Test - public void testGetIslandAtLocation() { + public void testGetIslandAtLocation() throws InstantiationException, IllegalAccessException, + InvocationTargetException, ClassNotFoundException, NoSuchMethodException, IntrospectionException { // Set coords to be in island space - when(island.inIslandSpace(Mockito.any(Integer.class), Mockito.any(Integer.class))).thenReturn(true); + when(island.inIslandSpace(any(Integer.class), any(Integer.class))).thenReturn(true); // Set plugin Util.setPlugin(plugin); ic.addIsland(island); @@ -218,47 +231,17 @@ public class IslandCacheTest { // Check exact match for location assertEquals(island, ic.getIslandAt(island.getCenter())); - Location location2 = mock(Location.class); when(location2.getWorld()).thenReturn(world); when(location2.getBlockX()).thenReturn(10); when(location2.getBlockY()).thenReturn(10); when(location2.getBlockZ()).thenReturn(10); - assertEquals(island, ic.getIslandAt(location2)); - when(island.inIslandSpace(Mockito.any(Integer.class), Mockito.any(Integer.class))).thenReturn(false); + when(island.inIslandSpace(any(Integer.class), any(Integer.class))).thenReturn(false); assertNull(ic.getIslandAt(location2)); } - /** - * Test for {@link IslandCache#getMembers(World, UUID, int)} - */ - @Test - public void testGetMembers() { - ic.addIsland(island); - /* - * assertTrue(ic.getMembers(world, null, RanksManager.MEMBER_RANK).isEmpty()); - * assertTrue(ic.getMembers(world, UUID.randomUUID(), - * RanksManager.MEMBER_RANK).isEmpty()); assertFalse(ic.getMembers(world, - * island.getOwner(), RanksManager.MEMBER_RANK).isEmpty()); assertEquals(3, - * ic.getMembers(world, island.getOwner(), RanksManager.MEMBER_RANK).size()); - */ - } - - /** - * Test for {@link IslandCache#getOwner(World, UUID)} - */ - @Test - public void testGetOwner() { - ic.addIsland(island); - // Should be no owner, so null - /* - * assertEquals(owner, ic.getOwner(world, owner)); assertNull(ic.getOwner(world, - * UUID.randomUUID())); - */ - } - /** * Test for {@link IslandCache#hasIsland(World, UUID)} */ @@ -303,8 +286,7 @@ public class IslandCacheTest { ic.setOwner(island, newOwnerUUID); Mockito.verify(island).setOwner(newOwnerUUID); - assertEquals(island, ic.get(world, newOwnerUUID)); - assertEquals(island, ic.get(island.getCenter())); + assertEquals(island, ic.getIsland(world, newOwnerUUID)); } /** @@ -324,7 +306,164 @@ public class IslandCacheTest { @Test public void testResetAllFlags() { ic.addIsland(island); + BukkitScheduler scheduler = mock(BukkitScheduler.class); + PowerMockito.mockStatic(Bukkit.class, Mockito.RETURNS_MOCKS); + when(Bukkit.getScheduler()).thenReturn(scheduler); ic.resetAllFlags(world); - verify(island).setFlagsDefaults(); + + verify(scheduler).runTaskAsynchronously(eq(plugin), any(Runnable.class)); } + + /** + * Test method for {@link world.bentobox.bentobox.managers.island.IslandCache#IslandCache(world.bentobox.bentobox.database.Database)}. + */ + @Test + public void testIslandCache() { + assertNotNull(ic); + } + + /** + * Test method for {@link world.bentobox.bentobox.managers.island.IslandCache#updateIsland(world.bentobox.bentobox.database.objects.Island)}. + */ + @Test + public void testUpdateIsland() { + // Add island to cache + ic.setIslandById(island); + // Copy island + Island newIsland = mock(Island.class); + when(newIsland.getUniqueId()).thenReturn("uniqueId"); + when(newIsland.getMembers()).thenReturn(Map.of()); // no members + + ic.updateIsland(newIsland); + verify(plugin, never()).logError(anyString()); + } + + /** + * Test method for {@link world.bentobox.bentobox.managers.island.IslandCache#deleteIslandFromCache(world.bentobox.bentobox.database.objects.Island)}. + */ + @Test + public void testDeleteIslandFromCacheIsland() { + // Fill the cache + ic.addIsland(island); + ic.setIslandById(island); + // Remove it + ic.deleteIslandFromCache(island); + // TODO need to verify + } + + /** + * Test method for {@link world.bentobox.bentobox.managers.island.IslandCache#deleteIslandFromCache(java.lang.String)}. + */ + @Test + public void testDeleteIslandFromCacheString() { + // Fill the cache + ic.addIsland(island); + ic.setIslandById(island); + + ic.deleteIslandFromCache("uniqueId"); + } + + /** + * Test method for {@link world.bentobox.bentobox.managers.island.IslandCache#getIsland(org.bukkit.World, java.util.UUID)}. + */ + @Test + public void testGetIsland() { + assertNull(ic.getIsland(world, owner)); + } + + /** + * Test method for {@link world.bentobox.bentobox.managers.island.IslandCache#getIslands(org.bukkit.World, java.util.UUID)}. + */ + @Test + public void testGetIslandsWorldUUID() { + assertNull(ic.getIsland(world, this.owner)); + } + + /** + * Test method for {@link world.bentobox.bentobox.managers.island.IslandCache#setPrimaryIsland(java.util.UUID, world.bentobox.bentobox.database.objects.Island)}. + */ + @Test + public void testSetPrimaryIsland() { + ic.setPrimaryIsland(owner, island); + } + + /** + * Test method for {@link world.bentobox.bentobox.managers.island.IslandCache#getIslandAt(org.bukkit.Location)}. + */ + @Test + public void testGetIslandAt() { + ic.addIsland(island); + ic.setIslandById(island); + assertEquals(island, ic.getIslandAt(location)); + } + + /** + * Test method for {@link world.bentobox.bentobox.managers.island.IslandCache#getIslands()}. + */ + @Test + public void testGetIslands() { + assertTrue(ic.getIslands().isEmpty()); + } + + /** + * Test method for {@link world.bentobox.bentobox.managers.island.IslandCache#getIslands(org.bukkit.World)}. + */ + @Test + public void testGetIslandsWorld() { + assertTrue(ic.getIslands(world).isEmpty()); + } + + /** + * Test method for {@link world.bentobox.bentobox.managers.island.IslandCache#removePlayer(org.bukkit.World, java.util.UUID)}. + */ + @Test + public void testRemovePlayerWorldUUID() { + assertTrue(ic.getIslands(owner).isEmpty()); + } + + /** + * Test method for {@link world.bentobox.bentobox.managers.island.IslandCache#removePlayer(world.bentobox.bentobox.database.objects.Island, java.util.UUID)}. + */ + @Test + public void testRemovePlayerIslandUUID() { + ic.addIsland(island); + ic.setIslandById(island); + ic.removePlayer(island, owner); + } + + /** + * Test method for {@link world.bentobox.bentobox.managers.island.IslandCache#size(org.bukkit.World)}. + */ + @Test + public void testSizeWorld() { + assertEquals(0, ic.size(world)); + } + + /** + * Test method for {@link world.bentobox.bentobox.managers.island.IslandCache#getIslandById(java.lang.String)}. + */ + @Test + public void testGetIslandById() { + ic.addIsland(island); + ic.setIslandById(island); + + assertEquals(island, ic.getIslandById("uniqueId")); + } + + /** + * Test method for {@link world.bentobox.bentobox.managers.island.IslandCache#getAllIslandIds()}. + */ + @Test + public void testGetAllIslandIds() { + assertTrue(ic.getAllIslandIds().isEmpty()); + } + + /** + * Test method for {@link world.bentobox.bentobox.managers.island.IslandCache#getIslands(java.util.UUID)}. + */ + @Test + public void testGetIslandsUUID() { + assertTrue(ic.getIslands(owner).isEmpty()); + } + } diff --git a/src/test/java/world/bentobox/bentobox/managers/island/NewIslandTest.java b/src/test/java/world/bentobox/bentobox/managers/island/NewIslandTest.java index 70a723e2a..b0a9cbdfa 100644 --- a/src/test/java/world/bentobox/bentobox/managers/island/NewIslandTest.java +++ b/src/test/java/world/bentobox/bentobox/managers/island/NewIslandTest.java @@ -5,6 +5,7 @@ import static org.mockito.ArgumentMatchers.any; import static org.mockito.ArgumentMatchers.anyBoolean; import static org.mockito.ArgumentMatchers.anyInt; import static org.mockito.ArgumentMatchers.eq; +import static org.mockito.Mockito.mock; import static org.mockito.Mockito.never; import static org.mockito.Mockito.times; import static org.mockito.Mockito.verify; @@ -56,7 +57,7 @@ import world.bentobox.bentobox.util.Util; * */ @RunWith(PowerMockRunner.class) -@PrepareForTest({ Util.class, IslandEvent.class, Bukkit.class }) +@PrepareForTest({ Util.class, IslandEvent.class, Bukkit.class, IslandsManager.class }) public class NewIslandTest { private static final String NAME = "name"; @@ -105,7 +106,11 @@ public class NewIslandTest { */ @Before public void setUp() throws Exception { + PowerMockito.mockStatic(Bukkit.class, Mockito.RETURNS_MOCKS); + // Set up plugin + BentoBox plugin = mock(BentoBox.class); Whitebox.setInternalState(BentoBox.class, "instance", plugin); + PowerMockito.mockStatic(IslandsManager.class, Mockito.RETURNS_MOCKS); // Islands manager when(plugin.getIslands()).thenReturn(im); when(im.createIsland(any(), any())).thenReturn(island); @@ -205,7 +210,8 @@ public class NewIslandTest { NewIsland.builder().addon(addon).name(NAME).player(user).noPaste().reason(Reason.CREATE).oldIsland(oldIsland) .build(); // Verifications - verify(im).save(eq(island)); + PowerMockito.verifyStatic(IslandsManager.class); + IslandsManager.updateIsland(eq(island)); verify(island).setFlagsDefaults(); verify(scheduler).runTask(any(BentoBox.class), any(Runnable.class)); verify(builder, times(2)).build(); @@ -224,7 +230,8 @@ public class NewIslandTest { when(builder.build()).thenReturn(ire); NewIsland.builder().addon(addon).name(NAME).player(user).noPaste().reason(Reason.RESET).oldIsland(oldIsland).build(); // Verifications - verify(im).save(eq(island)); + PowerMockito.verifyStatic(IslandsManager.class); + IslandsManager.updateIsland(eq(island)); verify(island).setFlagsDefaults(); verify(scheduler).runTask(any(BentoBox.class), any(Runnable.class)); verify(builder, times(2)).build(); @@ -243,7 +250,8 @@ public class NewIslandTest { public void testBuilderNoOldIsland() throws Exception { NewIsland.builder().addon(addon).name(NAME).player(user).noPaste().reason(Reason.CREATE).build(); // Verifications - verify(im).save(eq(island)); + PowerMockito.verifyStatic(IslandsManager.class); + IslandsManager.updateIsland(eq(island)); verify(island).setFlagsDefaults(); verify(scheduler).runTask(any(BentoBox.class), any(Runnable.class)); verify(builder, times(2)).build(); @@ -262,7 +270,8 @@ public class NewIslandTest { when(location.distance(any())).thenReturn(30D); NewIsland.builder().addon(addon).name(NAME).player(user).reason(Reason.CREATE).build(); // Verifications - verify(im).save(eq(island)); + PowerMockito.verifyStatic(IslandsManager.class); + IslandsManager.updateIsland(eq(island)); verify(island).setFlagsDefaults(); verify(bpm).paste(eq(addon), eq(island), eq(NAME), any(Runnable.class), eq(false)); verify(builder, times(2)).build(); @@ -281,7 +290,8 @@ public class NewIslandTest { NewIsland.builder().addon(addon).name(NAME).player(user).reason(Reason.CREATE).build(); PowerMockito.mockStatic(Bukkit.class); // Verifications - verify(im).save(island); + PowerMockito.verifyStatic(IslandsManager.class); + IslandsManager.updateIsland(eq(island)); verify(island).setFlagsDefaults(); verify(bpm).paste(eq(addon), eq(island), eq(NAME), any(Runnable.class), eq(true)); verify(builder, times(2)).build(); @@ -299,7 +309,8 @@ public class NewIslandTest { when(im.hasIsland(any(), any(User.class))).thenReturn(true); NewIsland.builder().addon(addon).name(NAME).player(user).noPaste().reason(Reason.CREATE).oldIsland(oldIsland).build(); // Verifications - verify(im).save(eq(island)); + PowerMockito.verifyStatic(IslandsManager.class); + IslandsManager.updateIsland(eq(island)); verify(island).setFlagsDefaults(); verify(scheduler).runTask(any(BentoBox.class), any(Runnable.class)); verify(builder, times(2)).build(); @@ -320,7 +331,8 @@ public class NewIslandTest { when(im.hasIsland(any(), any(User.class))).thenReturn(true); NewIsland.builder().addon(addon).name(NAME).player(user).noPaste().reason(Reason.CREATE).oldIsland(oldIsland).build(); // Verifications - verify(im).save(eq(island)); + PowerMockito.verifyStatic(IslandsManager.class); + IslandsManager.updateIsland(eq(island)); verify(island).setFlagsDefaults(); verify(scheduler).runTask(any(BentoBox.class), any(Runnable.class)); verify(builder, times(2)).build(); @@ -342,7 +354,8 @@ public class NewIslandTest { when(im.hasIsland(any(), any(User.class))).thenReturn(true); NewIsland.builder().addon(addon).name(NAME).player(user).noPaste().reason(Reason.CREATE).oldIsland(oldIsland).build(); // Verifications - verify(im).save(eq(island)); + PowerMockito.verifyStatic(IslandsManager.class); + IslandsManager.updateIsland(eq(island)); verify(island).setFlagsDefaults(); verify(scheduler).runTask(any(BentoBox.class), any(Runnable.class)); verify(builder, times(2)).build(); diff --git a/src/test/java/world/bentobox/bentobox/panels/BlueprintManagementPanelTest.java b/src/test/java/world/bentobox/bentobox/panels/BlueprintManagementPanelTest.java index 59516412e..aa0b06016 100644 --- a/src/test/java/world/bentobox/bentobox/panels/BlueprintManagementPanelTest.java +++ b/src/test/java/world/bentobox/bentobox/panels/BlueprintManagementPanelTest.java @@ -76,7 +76,7 @@ public class BlueprintManagementPanelTest { // Set up plugin Whitebox.setInternalState(BentoBox.class, "instance", plugin); // Bukkit - PowerMockito.mockStatic(Bukkit.class); + PowerMockito.mockStatic(Bukkit.class, Mockito.RETURNS_MOCKS); ItemFactory itemFac = mock(ItemFactory.class); when(Bukkit.getItemFactory()).thenReturn(itemFac); // Panel inventory diff --git a/src/test/java/world/bentobox/bentobox/panels/customizable/IslandCreationPanelTest.java b/src/test/java/world/bentobox/bentobox/panels/customizable/IslandCreationPanelTest.java index 12b982e36..9931a7642 100644 --- a/src/test/java/world/bentobox/bentobox/panels/customizable/IslandCreationPanelTest.java +++ b/src/test/java/world/bentobox/bentobox/panels/customizable/IslandCreationPanelTest.java @@ -9,7 +9,12 @@ import static org.mockito.Mockito.when; import java.nio.file.Path; import java.nio.file.Paths; -import java.util.*; +import java.util.Collections; +import java.util.HashMap; +import java.util.List; +import java.util.Map; +import java.util.Optional; +import java.util.UUID; import org.bukkit.Bukkit; import org.bukkit.Material; @@ -84,6 +89,8 @@ public class IslandCreationPanelTest { */ @Before public void setUp() throws Exception { + PowerMockito.mockStatic(Bukkit.class, Mockito.RETURNS_MOCKS); + // Set up plugin Whitebox.setInternalState(BentoBox.class, "instance", plugin); @@ -145,7 +152,6 @@ public class IslandCreationPanelTest { // Server & Scheduler BukkitScheduler sch = mock(BukkitScheduler.class); - PowerMockito.mockStatic(Bukkit.class); when(Bukkit.getScheduler()).thenReturn(sch); // IWM friendly name @@ -209,7 +215,6 @@ public class IslandCreationPanelTest { verify(inv).setItem(eq(0), any()); verify(inv).setItem(eq(1), any()); verify(meta).setDisplayName(eq("test")); - verify(meta).setLocalizedName(eq("test")); verify(meta).setLore(eq(List.of("A description", "", "panels.tips.click-to-choose"))); } @@ -224,15 +229,12 @@ public class IslandCreationPanelTest { verify(inv).setItem(eq(0), any()); verify(inv).setItem(eq(1), any()); verify(meta).setDisplayName(eq("test")); - verify(meta).setLocalizedName(eq("test")); verify(meta).setLore(eq(List.of("A description", "", "panels.tips.click-to-choose"))); verify(inv).setItem(eq(0), any()); verify(meta).setDisplayName(eq("test2")); - verify(meta).setLocalizedName(eq("test2")); verify(meta).setLore(eq(List.of("A description 2", "", "panels.tips.click-to-choose"))); verify(inv).setItem(eq(1), any()); verify(meta).setDisplayName(eq("test3")); - verify(meta).setLocalizedName(eq("test3")); verify(meta).setLore(eq(List.of("A description 3", "", "panels.tips.click-to-choose"))); } diff --git a/src/test/java/world/bentobox/bentobox/panels/customizable/LanguagePanelTest.java b/src/test/java/world/bentobox/bentobox/panels/customizable/LanguagePanelTest.java index aaed88101..94adc7e89 100644 --- a/src/test/java/world/bentobox/bentobox/panels/customizable/LanguagePanelTest.java +++ b/src/test/java/world/bentobox/bentobox/panels/customizable/LanguagePanelTest.java @@ -1,6 +1,23 @@ package world.bentobox.bentobox.panels.customizable; +import static org.junit.Assert.assertEquals; +import static org.mockito.ArgumentMatchers.any; +import static org.mockito.ArgumentMatchers.anyString; +import static org.mockito.ArgumentMatchers.eq; +import static org.mockito.Mockito.mock; +import static org.mockito.Mockito.times; +import static org.mockito.Mockito.verify; +import static org.mockito.Mockito.when; + +import java.nio.file.Path; +import java.nio.file.Paths; +import java.util.ArrayList; +import java.util.HashMap; +import java.util.Locale; +import java.util.Map; +import java.util.UUID; + import org.bukkit.Bukkit; import org.bukkit.Material; import org.bukkit.World; @@ -23,23 +40,14 @@ import org.powermock.api.mockito.PowerMockito; import org.powermock.core.classloader.annotations.PrepareForTest; import org.powermock.modules.junit4.PowerMockRunner; import org.powermock.reflect.Whitebox; -import java.awt.Panel; -import java.nio.file.Path; -import java.nio.file.Paths; -import java.util.*; import world.bentobox.bentobox.BentoBox; import world.bentobox.bentobox.api.addons.GameModeAddon; import world.bentobox.bentobox.api.commands.CompositeCommand; import world.bentobox.bentobox.api.localization.BentoBoxLocale; -import world.bentobox.bentobox.api.panels.builders.PanelBuilder; import world.bentobox.bentobox.api.user.User; import world.bentobox.bentobox.managers.LocalesManager; -import static org.junit.Assert.assertEquals; -import static org.mockito.ArgumentMatchers.*; -import static org.mockito.Mockito.*; - /** * @author tastybento * @@ -121,7 +129,7 @@ public class LanguagePanelTest { when(lm.getLanguages()).thenReturn(map); // Panel - PowerMockito.mockStatic(Bukkit.class); + PowerMockito.mockStatic(Bukkit.class, Mockito.RETURNS_MOCKS); when(Bukkit.createInventory(any(), Mockito.anyInt(), any())).thenReturn(inv); // Item Factory (needed for ItemStack) diff --git a/src/test/java/world/bentobox/bentobox/util/DefaultPasteUtilTest.java b/src/test/java/world/bentobox/bentobox/util/DefaultPasteUtilTest.java index 75cc62b8b..38135c66d 100644 --- a/src/test/java/world/bentobox/bentobox/util/DefaultPasteUtilTest.java +++ b/src/test/java/world/bentobox/bentobox/util/DefaultPasteUtilTest.java @@ -17,6 +17,7 @@ import java.util.List; import java.util.Optional; import java.util.UUID; +import org.bukkit.Bukkit; import org.bukkit.Location; import org.bukkit.Material; import org.bukkit.World; @@ -40,6 +41,8 @@ import org.junit.runner.RunWith; import org.mockito.ArgumentCaptor; 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 org.powermock.reflect.Whitebox; @@ -63,6 +66,7 @@ import world.bentobox.bentobox.managers.PlayersManager; * */ @RunWith(PowerMockRunner.class) +@PrepareForTest({ BentoBox.class, Bukkit.class }) public class DefaultPasteUtilTest { @Mock @@ -110,6 +114,7 @@ public class DefaultPasteUtilTest { */ @Before public void setUp() throws Exception { + PowerMockito.mockStatic(Bukkit.class, Mockito.RETURNS_MOCKS); // Set up plugin Whitebox.setInternalState(BentoBox.class, "instance", plugin); AddonDescription desc = new AddonDescription.Builder("", "", "").build(); diff --git a/src/test/java/world/bentobox/bentobox/util/ItemParserTest.java b/src/test/java/world/bentobox/bentobox/util/ItemParserTest.java index b14cc32ee..278bf34a2 100644 --- a/src/test/java/world/bentobox/bentobox/util/ItemParserTest.java +++ b/src/test/java/world/bentobox/bentobox/util/ItemParserTest.java @@ -6,13 +6,9 @@ import static org.junit.Assert.assertNull; import static org.mockito.ArgumentMatchers.any; import static org.mockito.Mockito.mock; import static org.mockito.Mockito.never; -import static org.mockito.Mockito.times; import static org.mockito.Mockito.verify; import static org.mockito.Mockito.when; -import java.util.Arrays; -import java.util.List; - import org.bukkit.Bukkit; import org.bukkit.Material; import org.bukkit.UnsafeValues; @@ -22,12 +18,9 @@ import org.bukkit.inventory.meta.BannerMeta; import org.bukkit.inventory.meta.ItemMeta; import org.bukkit.inventory.meta.PotionMeta; import org.bukkit.inventory.meta.SkullMeta; -import org.bukkit.potion.PotionData; import org.bukkit.potion.PotionType; -import org.bukkit.profile.PlayerProfile; import org.junit.After; import org.junit.Before; -import org.junit.Ignore; import org.junit.Test; import org.junit.runner.RunWith; import org.mockito.Mock; diff --git a/src/test/java/world/bentobox/bentobox/util/UtilTest.java b/src/test/java/world/bentobox/bentobox/util/UtilTest.java index fe94c8194..0577d687b 100644 --- a/src/test/java/world/bentobox/bentobox/util/UtilTest.java +++ b/src/test/java/world/bentobox/bentobox/util/UtilTest.java @@ -40,6 +40,7 @@ import org.mockito.stubbing.Answer; import org.powermock.api.mockito.PowerMockito; import org.powermock.core.classloader.annotations.PrepareForTest; import org.powermock.modules.junit4.PowerMockRunner; +import org.powermock.reflect.Whitebox; import net.md_5.bungee.api.ChatColor; import world.bentobox.bentobox.BentoBox; @@ -54,7 +55,7 @@ import world.bentobox.bentobox.managers.PlaceholdersManager; * */ @RunWith(PowerMockRunner.class) -@PrepareForTest( { Bukkit.class }) +@PrepareForTest({ Bukkit.class, BentoBox.class }) public class UtilTest { private static final String[] NAMES = {"adam", "ben", "cara", "dave", "ed", "frank", "freddy", "george", "harry", "ian", "joe"}; @@ -76,6 +77,10 @@ public class UtilTest { */ @Before public void setUp() throws Exception { + PowerMockito.mockStatic(Bukkit.class, Mockito.RETURNS_MOCKS); + // Set up plugin + Whitebox.setInternalState(BentoBox.class, "instance", plugin); + // Set up plugin Util.setPlugin(plugin); // World @@ -92,7 +97,6 @@ public class UtilTest { when(location.getYaw()).thenReturn(10F); when(location.getPitch()).thenReturn(20F); - PowerMockito.mockStatic(Bukkit.class, Mockito.RETURNS_MOCKS); Server server = mock(Server.class); when(Bukkit.getServer()).thenReturn(server); when(Bukkit.getWorld(anyString())).thenReturn(world); diff --git a/src/test/java/world/bentobox/bentobox/util/teleport/ClosestSafeSpotTeleportTest.java b/src/test/java/world/bentobox/bentobox/util/teleport/ClosestSafeSpotTeleportTest.java index 9724d82fe..cc1cf5380 100644 --- a/src/test/java/world/bentobox/bentobox/util/teleport/ClosestSafeSpotTeleportTest.java +++ b/src/test/java/world/bentobox/bentobox/util/teleport/ClosestSafeSpotTeleportTest.java @@ -58,7 +58,7 @@ import world.bentobox.bentobox.util.teleport.ClosestSafeSpotTeleport.PositionDat * */ @RunWith(PowerMockRunner.class) -@PrepareForTest({Util.class, Bukkit.class}) +@PrepareForTest({ Util.class, Bukkit.class, IslandsManager.class }) public class ClosestSafeSpotTeleportTest { // Class under test @@ -102,6 +102,11 @@ public class ClosestSafeSpotTeleportTest { */ @Before public void setUp() throws Exception { + PowerMockito.mockStatic(Bukkit.class, Mockito.RETURNS_MOCKS); + + // IslandsManager static + PowerMockito.mockStatic(IslandsManager.class, Mockito.RETURNS_MOCKS); + // Setup instance Whitebox.setInternalState(BentoBox.class, "instance", plugin); // IWM @@ -144,7 +149,6 @@ public class ClosestSafeSpotTeleportTest { // Bukkit scheduler when(scheduler.runTaskTimer(eq(plugin), any(Runnable.class), anyLong(), anyLong())).thenReturn(task); - PowerMockito.mockStatic(Bukkit.class, Mockito.RETURNS_MOCKS); when(Bukkit.getScheduler()).thenReturn(scheduler); // DUT diff --git a/src/test/java/world/bentobox/bentobox/util/teleport/SafeSpotTeleportTest.java b/src/test/java/world/bentobox/bentobox/util/teleport/SafeSpotTeleportTest.java index d69972d8e..7c6cfd79d 100644 --- a/src/test/java/world/bentobox/bentobox/util/teleport/SafeSpotTeleportTest.java +++ b/src/test/java/world/bentobox/bentobox/util/teleport/SafeSpotTeleportTest.java @@ -47,7 +47,7 @@ import world.bentobox.bentobox.util.Util; * */ @RunWith(PowerMockRunner.class) -@PrepareForTest({Util.class, Bukkit.class}) +@PrepareForTest({ Util.class, Bukkit.class, IslandsManager.class }) public class SafeSpotTeleportTest { // Class under test @@ -92,6 +92,9 @@ public class SafeSpotTeleportTest { */ @Before public void setUp() throws Exception { + PowerMockito.mockStatic(Bukkit.class, Mockito.RETURNS_MOCKS); + + PowerMockito.mockStatic(IslandsManager.class, Mockito.RETURNS_MOCKS); // Setup instance Whitebox.setInternalState(BentoBox.class, "instance", plugin); // IWM @@ -131,7 +134,6 @@ public class SafeSpotTeleportTest { // Bukkit scheduler when(scheduler.runTaskTimer(eq(plugin), any(Runnable.class), anyLong(), anyLong())).thenReturn(task); - PowerMockito.mockStatic(Bukkit.class, Mockito.RETURNS_MOCKS); when(Bukkit.getScheduler()).thenReturn(scheduler); }