diff --git a/README.md b/README.md index 9dd3a15b..43313a51 100644 --- a/README.md +++ b/README.md @@ -84,14 +84,14 @@ A: It's whatever you want it to be! ## Installation -0. Install BentoBox and run it on the server at least once to create its data folders. -1. Place this jar in the addons folder of the BentoBox plugin. -2. Restart the server. -3. The addon will create worlds and a data folder and inside the folder will be a config.yml and config files in phases folder. -4. Stop the server. -5. Edit config.yml and the .yml config files how you want. -6. Delete any worlds that were created by default if you made changes that would affect them. -7. Restart the server. +1. Install BentoBox and run it on the server at least once to create its data folders. +2. Place this jar in the addons folder of the BentoBox plugin. +3. Restart the server. +4. The addon will create worlds and a data folder and inside the folder will be a config.yml and config files in phases folder. +5. Stop the server. +6. Edit config.yml and the .yml config files how you want. +7. Delete any worlds that were created by default if you made changes that would affect them. +8. Restart the server. ## Phase config files diff --git a/pom.xml b/pom.xml index f0c28a59..0ddbe508 100644 --- a/pom.xml +++ b/pom.xml @@ -52,7 +52,9 @@ UTF-8 21 - 2.0.9 + 5.10.2 + 5.11.0 + v1.21-SNAPSHOT 2.7.1-SNAPSHOT 4.0.10 @@ -63,7 +65,7 @@ -LOCAL - 1.21.1 + 1.22.0 BentoBoxWorld_AOneBlock bentobox-world @@ -183,24 +185,32 @@ provided + + + org.junit.jupiter + junit-jupiter-api + ${junit.version} + test + + + org.junit.jupiter + junit-jupiter-engine + ${junit.version} + test + + + org.mockito + mockito-junit-jupiter + 5.11.0 + test + org.mockito mockito-core - 3.11.1 - test - - - org.powermock - powermock-module-junit4 - ${powermock.version} - test - - - org.powermock - powermock-api-mockito2 - ${powermock.version} + ${mockito.version} test + world.bentobox bentobox @@ -290,7 +300,7 @@ org.apache.maven.plugins maven-surefire-plugin - 3.0.0-M5 + 3.5.4 --add-opens java.base/java.lang=ALL-UNNAMED diff --git a/src/main/java/world/bentobox/aoneblock/AOneBlock.java b/src/main/java/world/bentobox/aoneblock/AOneBlock.java index 3ea3ba7b..a92de61b 100644 --- a/src/main/java/world/bentobox/aoneblock/AOneBlock.java +++ b/src/main/java/world/bentobox/aoneblock/AOneBlock.java @@ -19,11 +19,11 @@ import world.bentobox.aoneblock.generators.ChunkGeneratorWorld; import world.bentobox.aoneblock.listeners.BlockListener; import world.bentobox.aoneblock.listeners.BlockProtect; +import world.bentobox.aoneblock.listeners.BossBarListener; import world.bentobox.aoneblock.listeners.HoloListener; import world.bentobox.aoneblock.listeners.InfoListener; import world.bentobox.aoneblock.listeners.ItemsAdderListener; import world.bentobox.aoneblock.listeners.JoinLeaveListener; -import world.bentobox.aoneblock.listeners.BossBarListener; import world.bentobox.aoneblock.listeners.NoBlockHandler; import world.bentobox.aoneblock.listeners.StartSafetyListener; import world.bentobox.aoneblock.oneblocks.OneBlockCustomBlockCreator; @@ -79,7 +79,7 @@ public class AOneBlock extends GameModeAddon { .defaultSetting(false) .build(); /** The listener for the boss bar */ - private BossBarListener bossBar = new BossBarListener(this); + private final BossBarListener bossBar = new BossBarListener(this); /** * Flag to enable or disable the OneBlock boss bar. */ @@ -130,7 +130,13 @@ public void onLoad() { // Register protection flag with BentoBox getPlugin().getFlagsManager().registerFlag(this, START_SAFETY); // Bossbar - getPlugin().getFlagsManager().registerFlag(this, this.ONEBLOCK_BOSSBAR); + if (getSettings().isBossBar()) { + getPlugin().getFlagsManager().registerFlag(this, this.ONEBLOCK_BOSSBAR); + } + // Actionbar + if (getSettings().isActionBar()) { + getPlugin().getFlagsManager().registerFlag(this, this.ONEBLOCK_ACTIONBAR); + } // Magic Block protection getPlugin().getFlagsManager().registerFlag(this, this.MAGIC_BLOCK); } @@ -171,7 +177,9 @@ public void onEnable() { registerListener(new BlockProtect(this)); registerListener(new JoinLeaveListener(this)); registerListener(new InfoListener(this)); - registerListener(bossBar); + if (getSettings().isBossBar() && getSettings().isActionBar()) { + registerListener(bossBar); + } // Register placeholders phManager = new AOneBlockPlaceholders(this, getPlugin().getPlaceholdersManager()); diff --git a/src/main/java/world/bentobox/aoneblock/AOneBlockPlaceholders.java b/src/main/java/world/bentobox/aoneblock/AOneBlockPlaceholders.java index 7e42a372..cfc7d2a0 100644 --- a/src/main/java/world/bentobox/aoneblock/AOneBlockPlaceholders.java +++ b/src/main/java/world/bentobox/aoneblock/AOneBlockPlaceholders.java @@ -82,7 +82,7 @@ private Optional getUsersIsland(User user) { .filter(is -> user.getUniqueId().equals(is.getOwner())).toList(); if (ownedIslands.size() == 1) { // Replace with the owned island - i = ownedIslands.get(0); // pick one + i = ownedIslands.getFirst(); // pick one } // Return what we have found return Optional.ofNullable(i); diff --git a/src/main/java/world/bentobox/aoneblock/Settings.java b/src/main/java/world/bentobox/aoneblock/Settings.java index d17cb518..cc14c3f7 100644 --- a/src/main/java/world/bentobox/aoneblock/Settings.java +++ b/src/main/java/world/bentobox/aoneblock/Settings.java @@ -37,59 +37,72 @@ public class Settings implements WorldSettings { /* Commands */ @ConfigComment("Player command. What command users will run to access their island.") @ConfigComment("To define alias, just separate commands with white space.") - @ConfigEntry(path = "aoneblock.command.island", since = "1.3.0") + @ConfigEntry(path = "aoneblock.command.island") //, since = "1.3.0") private String playerCommandAliases = "ob oneblock"; @ConfigComment("The admin command.") @ConfigComment("To define alias, just separate commands with white space.") - @ConfigEntry(path = "aoneblock.command.admin", since = "1.3.0") + @ConfigEntry(path = "aoneblock.command.admin") // , since = "1.3.0") private String adminCommandAliases = "oba obadmin"; @ConfigComment("The default action for new player command call.") @ConfigComment("Sub-command of main player command that will be run on first player command call.") @ConfigComment("By default it is sub-command 'create'.") - @ConfigEntry(path = "aoneblock.command.new-player-action", since = "1.2.0") + @ConfigEntry(path = "aoneblock.command.new-player-action") // , since = "1.2.0") private String defaultNewPlayerAction = "create"; @ConfigComment("The default action for player command.") @ConfigComment("Sub-command of main player command that will be run on each player command call.") @ConfigComment("By default it is sub-command 'go'.") - @ConfigEntry(path = "aoneblock.command.default-action", since = "1.2.0") + @ConfigEntry(path = "aoneblock.command.default-action") // , since = "1.2.0") private String defaultPlayerAction = "go"; @ConfigComment("The command label that shows current phase progress.") @ConfigComment("By default it is 'count'.") - @ConfigEntry(path = "aoneblock.command.count-command", since = "1.10.0") + @ConfigEntry(path = "aoneblock.command.count-command") // , since = "1.10.0") private String countCommand = "count"; @ConfigComment("The command label that opens phases GUI.") @ConfigComment("By default it is 'phases'.") - @ConfigEntry(path = "aoneblock.command.phases-command", since = "1.10.0") + @ConfigEntry(path = "aoneblock.command.phases-command") // , since = "1.10.0") private String phasesCommand = "phases"; @ConfigComment("The command label that allows to change island phase.") @ConfigComment("By default it is 'setCount'.") - @ConfigEntry(path = "aoneblock.command.set-count-command", since = "1.10.0") + @ConfigEntry(path = "aoneblock.command.set-count-command") // , since = "1.10.0") private String setCountCommand = "setCount"; - @ConfigComment("The command label that toggers the progress bar.") + @ConfigComment("Enables the bossbar and its command to show progress.") + @ConfigEntry(path = "aoneblock.command.bossbar", since = "1.21.2") + private boolean bossBar = true; + + @ConfigComment("The command label that toggles the progress bar.") @ConfigComment("By default it is 'bossbar'.") - @ConfigEntry(path = "aoneblock.command.bossbar-command", since = "1.19.0") + @ConfigEntry(path = "aoneblock.command.bossbar-command") // , since = "1.19.0") private String bossBarCommand = "bossbar"; + + @ConfigComment("Enables the action bar and its command to show progress.") + @ConfigEntry(path = "aoneblock.command.actionbar", since = "1.21.2") + private boolean actionBar = true; + + @ConfigComment("The command label that toggles the action bar progress.") + @ConfigComment("By default it is 'actionbar'.") + @ConfigEntry(path = "aoneblock.command.actionbar-command", since = "1.21.2") + private String actionBarCommand = "actionbar"; @ConfigComment("How long a player must wait until they can use the setCount command again. In minutes.") @ConfigComment("This is the command that is run from the phases panel.") - @ConfigEntry(path = "aoneblock.command.set-count-cooldown", since = "1.13.0") + @ConfigEntry(path = "aoneblock.command.set-count-cooldown") // , since = "1.13.0") private int setCountCooldown = 5; @ConfigComment("The command label that allows to check if magic block is present and respawns it if not.") @ConfigComment("By default it is 'respawnBlock check'.") - @ConfigEntry(path = "aoneblock.command.respawn-block-command", since = "1.10.0") + @ConfigEntry(path = "aoneblock.command.respawn-block-command") // , since = "1.10.0") private String respawnBlockCommand = "respawnBlock check"; @ConfigComment("Placeholder customization") @ConfigComment("Symbol for the percentage completed scale bar") - @ConfigEntry(path = "aoneblock.placeholders.scale-symbol", since = "1.9.0") + @ConfigEntry(path = "aoneblock.placeholders.scale-symbol") // , since = "1.9.0") private String percentCompleteSymbol = "■"; /* WORLD */ @@ -150,21 +163,21 @@ public class Settings implements WorldSettings { @ConfigComment("Spawn limits. These override the limits set in bukkit.yml") @ConfigComment("If set to a negative number, the server defaults will be used") - @ConfigEntry(path = "world.spawn-limits.monsters", since = "1.11.2") + @ConfigEntry(path = "world.spawn-limits.monsters") // , since = "1.11.2") private int spawnLimitMonsters = -1; - @ConfigEntry(path = "world.spawn-limits.animals", since = "1.11.2") + @ConfigEntry(path = "world.spawn-limits.animals") // , since = "1.11.2") private int spawnLimitAnimals = -1; - @ConfigEntry(path = "world.spawn-limits.water-animals", since = "1.11.2") + @ConfigEntry(path = "world.spawn-limits.water-animals") // , since = "1.11.2") private int spawnLimitWaterAnimals = -1; - @ConfigEntry(path = "world.spawn-limits.ambient", since = "1.11.2") + @ConfigEntry(path = "world.spawn-limits.ambient") // , since = "1.11.2") private int spawnLimitAmbient = -1; @ConfigComment("Setting to 0 will disable animal spawns, but this is not recommended. Minecraft default is 400.") @ConfigComment("A negative value uses the server default") - @ConfigEntry(path = "world.spawn-limits.ticks-per-animal-spawns", since = "1.11.2") + @ConfigEntry(path = "world.spawn-limits.ticks-per-animal-spawns") // , since = "1.11.2") private int ticksPerAnimalSpawns = -1; @ConfigComment("Setting to 0 will disable monster spawns, but this is not recommended. Minecraft default is 400.") @ConfigComment("A negative value uses the server default") - @ConfigEntry(path = "world.spawn-limits.ticks-per-monster-spawns", since = "1.11.2") + @ConfigEntry(path = "world.spawn-limits.ticks-per-monster-spawns") // , since = "1.11.2") private int ticksPerMonsterSpawns = -1; @ConfigComment("Radius of island in blocks. (So distance between islands is twice this)") @@ -280,7 +293,7 @@ public class Settings implements WorldSettings { @ConfigComment("Option will simulate vanilla portal mechanics that links portals together") @ConfigComment("or creates a new portal, if there is not a portal in that dimension.") @ConfigComment("This option requires `allow-nether=true` in server.properties.") - @ConfigEntry(path = "world.nether.create-and-link-portals", since = "1.16") + @ConfigEntry(path = "world.nether.create-and-link-portals") // , since = "1.16") private boolean makeNetherPortals = false; // End @@ -297,7 +310,7 @@ public class Settings implements WorldSettings { @ConfigComment("This option indicates if obsidian platform in the end should be generated") @ConfigComment("when player enters the end world.") @ConfigComment("This option requires `allow-end=true` in bukkit.yml.") - @ConfigEntry(path = "world.end.create-obsidian-platform", since = "1.16") + @ConfigEntry(path = "world.end.create-obsidian-platform") // , since = "1.16") private boolean makeEndPortals = false; @ConfigComment("Mob white list - these mobs will NOT be removed when logging in or doing /island") @@ -327,7 +340,7 @@ public class Settings implements WorldSettings { @ConfigComment("These settings/flags are hidden from users") @ConfigComment("Ops can toggle hiding in-game using SHIFT-LEFT-CLICK on flags in settings") - @ConfigEntry(path = "world.hidden-flags", since = "1.4.1") + @ConfigEntry(path = "world.hidden-flags") // , since = "1.4.1") private List hiddenFlags = new ArrayList<>(); @ConfigComment("Visitor banned commands - Visitors to islands cannot use these commands in this world") @@ -336,7 +349,7 @@ public class Settings implements WorldSettings { @ConfigComment("Falling banned commands - players cannot use these commands when falling") @ConfigComment("if the PREVENT_TELEPORT_WHEN_FALLING world setting flag is active") - @ConfigEntry(path = "world.falling-banned-commands", since = "1.8.0") + @ConfigEntry(path = "world.falling-banned-commands") // , since = "1.8.0") private List fallingBannedCommands = new ArrayList<>(); // --------------------------------------------- @@ -344,7 +357,7 @@ public class Settings implements WorldSettings { /* ISLAND */ @ConfigComment("Drop broken blocks on top of magic block") @ConfigComment("If you want Jobs or other plugins to recognize magic block breaking this must be false") - @ConfigEntry(path = "island.drop-on-top", since = "1.3.0") + @ConfigEntry(path = "island.drop-on-top") // , since = "1.3.0") private boolean dropOnTop = true; @ConfigComment("Magic block mob warning") @@ -365,13 +378,13 @@ public class Settings implements WorldSettings { @ConfigComment("Default maximum number of coop rank members per island") @ConfigComment("Players can have the aoneblock.coop.maxsize. permission to be bigger but") @ConfigComment("permission size cannot be less than the default below. ") - @ConfigEntry(path = "island.max-coop-size", since = "1.13.0") + @ConfigEntry(path = "island.max-coop-size") // , since = "1.13.0") private int maxCoopSize = 4; @ConfigComment("Default maximum number of trusted rank members per island") @ConfigComment("Players can have the aoneblock.trust.maxsize. permission to be bigger but") @ConfigComment("permission size cannot be less than the default below. ") - @ConfigEntry(path = "island.max-trusted-size", since = "1.13.0") + @ConfigEntry(path = "island.max-trusted-size") // , since = "1.13.0") private int maxTrustSize = 4; @ConfigComment("Default maximum number of homes a player can have. Min = 1") @@ -413,15 +426,15 @@ public class Settings implements WorldSettings { private boolean onJoinResetInventory = true; @ConfigComment("Reset health - if true, the player's health will be reset.") - @ConfigEntry(path = "island.reset.on-join.health", since = "1.8.0") + @ConfigEntry(path = "island.reset.on-join.health") // , since = "1.8.0") private boolean onJoinResetHealth = true; @ConfigComment("Reset hunger - if true, the player's hunger will be reset.") - @ConfigEntry(path = "island.reset.on-join.hunger", since = "1.8.0") + @ConfigEntry(path = "island.reset.on-join.hunger") // , since = "1.8.0") private boolean onJoinResetHunger = true; @ConfigComment("Reset experience points - if true, the player's experience will be reset.") - @ConfigEntry(path = "island.reset.on-join.exp", since = "1.8.0") + @ConfigEntry(path = "island.reset.on-join.exp") // , since = "1.8.0") private boolean onJoinResetXP = true; @@ -443,15 +456,15 @@ public class Settings implements WorldSettings { private boolean onLeaveResetInventory = false; @ConfigComment("Reset health - if true, the player's health will be reset.") - @ConfigEntry(path = "island.reset.on-leave.health", since = "1.8.0") + @ConfigEntry(path = "island.reset.on-leave.health") // , since = "1.8.0") private boolean onLeaveResetHealth = false; @ConfigComment("Reset hunger - if true, the player's hunger will be reset.") - @ConfigEntry(path = "island.reset.on-leave.hunger", since = "1.8.0") + @ConfigEntry(path = "island.reset.on-leave.hunger") // , since = "1.8.0") private boolean onLeaveResetHunger = false; @ConfigComment("Reset experience - if true, the player's experience will be reset.") - @ConfigEntry(path = "island.reset.on-leave.exp", since = "1.8.0") + @ConfigEntry(path = "island.reset.on-leave.exp") // , since = "1.8.0") private boolean onLeaveResetXP = false; @ConfigComment("Reset Ender Chest - if true, the player's Ender Chest will be cleared.") @@ -473,13 +486,13 @@ public class Settings implements WorldSettings { @ConfigComment(" * Island creation can be resource-intensive, please consider the options below to help mitigate") @ConfigComment(" the potential issues, especially if you expect a lot of players to connect to your server") @ConfigComment(" in a limited period of time.") - @ConfigEntry(path = "island.create-island-on-first-login.enable", since = "1.9.0") + @ConfigEntry(path = "island.create-island-on-first-login.enable") // , since = "1.9.0") private boolean createIslandOnFirstLoginEnabled; @ConfigComment("Time in seconds after the player logged in, before his island gets created.") @ConfigComment("If set to 0 or less, the island will be created directly upon the player's login.") @ConfigComment("It is recommended to keep this value under a minute's time.") - @ConfigEntry(path = "island.create-island-on-first-login.delay", since = "1.9.0") + @ConfigEntry(path = "island.create-island-on-first-login.delay") // , since = "1.9.0") private int createIslandOnFirstLoginDelay = 5; @ConfigComment("Toggles whether the island creation should be aborted if the player logged off while the") @@ -492,19 +505,19 @@ public class Settings implements WorldSettings { @ConfigComment(" * If the island creation started before the player logged off, it will continue.") @ConfigComment("If set to false, the player's island will be created even if he went offline in the meantime.") @ConfigComment("Note this option has no effect if the delay (see the option above) is set to 0 or less.") - @ConfigEntry(path = "island.create-island-on-first-login.abort-on-logout", since = "1.9.0") + @ConfigEntry(path = "island.create-island-on-first-login.abort-on-logout") // , since = "1.9.0") private boolean createIslandOnFirstLoginAbortOnLogout = true; @ConfigComment("Toggles whether the player should be teleported automatically to his island when it is created.") @ConfigComment("If set to false, the player will be told his island is ready but will have to teleport to his island using the command.") - @ConfigEntry(path = "island.teleport-player-to-island-when-created", since = "1.10.0") + @ConfigEntry(path = "island.teleport-player-to-island-when-created") // , since = "1.10.0") private boolean teleportPlayerToIslandUponIslandCreation = true; @ConfigComment("Create Nether or End islands if they are missing when a player goes through a portal.") @ConfigComment("Nether and End islands are usually pasted when a player makes their island, but if they are") @ConfigComment("missing for some reason, you can switch this on.") @ConfigComment("Note that bedrock removal glitches can exploit this option.") - @ConfigEntry(path = "island.create-missing-nether-end-islands", since = "1.10.0") + @ConfigEntry(path = "island.create-missing-nether-end-islands") // , since = "1.10.0") private boolean pasteMissingIslands = false; // Commands @@ -518,7 +531,7 @@ public class Settings implements WorldSettings { @ConfigComment("Here are some examples of valid commands to execute:") @ConfigComment(" * \"[SUDO] bbox version\"") @ConfigComment(" * \"obadmin deaths set [player] 0\"") - @ConfigEntry(path = "island.commands.on-join", since = "1.8.0") + @ConfigEntry(path = "island.commands.on-join") // , since = "1.8.0") private List onJoinCommands = new ArrayList<>(); @ConfigComment("List of commands to run when a player leaves an island, resets his island or gets kicked from it.") @@ -533,7 +546,7 @@ public class Settings implements WorldSettings { @ConfigComment(" * 'obadmin deaths set [player] 0'") @ConfigComment("") @ConfigComment("Note that player-executed commands might not work, as these commands can be run with said player being offline.") - @ConfigEntry(path = "island.commands.on-leave", since = "1.8.0") + @ConfigEntry(path = "island.commands.on-leave") // , since = "1.8.0") private List onLeaveCommands = new ArrayList<>(); @ConfigComment("List of commands that should be executed when the player respawns after death if Flags.ISLAND_RESPAWN is true.") @@ -548,7 +561,7 @@ public class Settings implements WorldSettings { @ConfigComment(" * 'obadmin deaths set [player] 0'") @ConfigComment("") @ConfigComment("Note that player-executed commands might not work, as these commands can be run with said player being offline.") - @ConfigEntry(path = "island.commands.on-respawn", since = "1.14.0") + @ConfigEntry(path = "island.commands.on-respawn") // , since = "1.14.0") private List onRespawnCommands = new ArrayList<>(); // Sethome @@ -578,7 +591,7 @@ public class Settings implements WorldSettings { private boolean teamJoinDeathReset = true; @ConfigComment("Reset player death count when they start a new island or reset an island") - @ConfigEntry(path = "island.deaths.reset-on-new-island", since = "1.6.0") + @ConfigEntry(path = "island.deaths.reset-on-new-island") // , since = "1.6.0") private boolean deathsResetOnNewIsland = true; // --------------------------------------------- @@ -591,7 +604,7 @@ public class Settings implements WorldSettings { @ConfigComment("AOneBlock blocked mobs.") @ConfigComment("List of mobs that should not spawn in AOneBlock.") - @ConfigEntry(path = "protection.block-mobs", since = "1.2.0") + @ConfigEntry(path = "protection.block-mobs") // , since = "1.2.0") private List mobLimitSettings = new ArrayList<>(); @@ -2252,4 +2265,46 @@ public void setBossBarCommand(String bossBarCommand) { this.bossBarCommand = bossBarCommand; } + /** + * @return the bossBar + */ + public boolean isBossBar() { + return bossBar; + } + + /** + * @param bossBar the bossBar to set + */ + public void setBossBar(boolean bossBar) { + this.bossBar = bossBar; + } + + /** + * @return the actionBar + */ + public boolean isActionBar() { + return actionBar; + } + + /** + * @param actionBar the actionBar to set + */ + public void setActionBar(boolean actionBar) { + this.actionBar = actionBar; + } + + /** + * @return the actionBarCommand + */ + public String getActionBarCommand() { + return actionBarCommand; + } + + /** + * @param actionBarCommand the actionBarCommand to set + */ + public void setActionBarCommand(String actionBarCommand) { + this.actionBarCommand = actionBarCommand; + } + } \ No newline at end of file diff --git a/src/main/java/world/bentobox/aoneblock/commands/admin/AdminSanityCheck.java b/src/main/java/world/bentobox/aoneblock/commands/admin/AdminSanityCheck.java index 8f27cfd4..deb0d061 100644 --- a/src/main/java/world/bentobox/aoneblock/commands/admin/AdminSanityCheck.java +++ b/src/main/java/world/bentobox/aoneblock/commands/admin/AdminSanityCheck.java @@ -40,7 +40,7 @@ public boolean canExecute(User user, String label, List args) { } if (args.isEmpty()) return true; // Check phase - Optional opPhase = addon.getOneBlockManager().getPhase(args.get(0).toUpperCase()); + Optional opPhase = addon.getOneBlockManager().getPhase(args.getFirst().toUpperCase()); if (opPhase.isEmpty()) { user.sendMessage("aoneblock.commands.admin.setchest.unknown-phase"); return false; diff --git a/src/main/java/world/bentobox/aoneblock/commands/admin/AdminSetCountCommand.java b/src/main/java/world/bentobox/aoneblock/commands/admin/AdminSetCountCommand.java index 1b93241a..88f3e297 100644 --- a/src/main/java/world/bentobox/aoneblock/commands/admin/AdminSetCountCommand.java +++ b/src/main/java/world/bentobox/aoneblock/commands/admin/AdminSetCountCommand.java @@ -45,7 +45,7 @@ public boolean execute(User user, String label, List args) { // Get target player UUID targetUUID = getPlayers().getUUID(args.get(0)); if (targetUUID == null) { - user.sendMessage("general.errors.unknown-player", TextVariables.NAME, args.get(0)); + user.sendMessage("general.errors.unknown-player", TextVariables.NAME, args.getFirst()); return false; } // Get their island diff --git a/src/main/java/world/bentobox/aoneblock/commands/island/IslandActionBarCommand.java b/src/main/java/world/bentobox/aoneblock/commands/island/IslandActionBarCommand.java index 4ac71d6f..30422de2 100644 --- a/src/main/java/world/bentobox/aoneblock/commands/island/IslandActionBarCommand.java +++ b/src/main/java/world/bentobox/aoneblock/commands/island/IslandActionBarCommand.java @@ -3,7 +3,9 @@ import java.util.List; import world.bentobox.aoneblock.AOneBlock; +import world.bentobox.aoneblock.listeners.BossBarListener; import world.bentobox.bentobox.api.commands.CompositeCommand; +import world.bentobox.bentobox.api.metadata.MetaDataValue; import world.bentobox.bentobox.api.user.User; public class IslandActionBarCommand extends CompositeCommand { @@ -26,12 +28,19 @@ public void setup() { @Override public boolean execute(User user, String label, List args) { - addon.getBossBar().toggleUser(user); getIslands().getIslandAt(user.getLocation()).ifPresent(i -> { if (!i.isAllowed(addon.ONEBLOCK_ACTIONBAR)) { user.sendMessage("aoneblock.actionbar.not-active"); } }); + // Toggle state + boolean newState = !user.getMetaData(BossBarListener.AONEBLOCK_ACTIONBAR).map(MetaDataValue::asBoolean).orElse(true); + user.putMetaData(BossBarListener.AONEBLOCK_ACTIONBAR, new MetaDataValue(newState)); + if (newState) { + user.sendMessage("aoneblock.commands.island.actionbar.status_on"); + } else { + user.sendMessage("aoneblock.commands.island.actionbar.status_off"); + } return true; } } diff --git a/src/main/java/world/bentobox/aoneblock/commands/island/IslandRespawnBlockCommand.java b/src/main/java/world/bentobox/aoneblock/commands/island/IslandRespawnBlockCommand.java index 7937f784..33a3c1a7 100644 --- a/src/main/java/world/bentobox/aoneblock/commands/island/IslandRespawnBlockCommand.java +++ b/src/main/java/world/bentobox/aoneblock/commands/island/IslandRespawnBlockCommand.java @@ -1,6 +1,7 @@ package world.bentobox.aoneblock.commands.island; import java.util.List; +import java.util.Objects; import org.bukkit.Bukkit; import org.bukkit.Material; @@ -67,14 +68,10 @@ public boolean canExecute(User user, String label, List args) public boolean execute(User user, String label, List args) { Island island = this.getIslands().getIsland(this.getWorld(), user); - - if (island == null) - { - // Hmm, lost island so fast. Well, no, just idea null-pointer check bypass. - user.sendMessage("general.errors.no-island"); - } - else if (Material.BEDROCK.equals(island.getCenter().getBlock().getType()) || - Material.AIR.equals(island.getCenter().getBlock().getType())) + Objects.requireNonNull(island); + + if (island.getCenter().getBlock().getType() == Material.BEDROCK || + island.getCenter().getBlock().getType() == Material.AIR) { // Trigger manual block break event. Bukkit.getServer().getPluginManager().callEvent( diff --git a/src/main/java/world/bentobox/aoneblock/commands/island/IslandSetCountCommand.java b/src/main/java/world/bentobox/aoneblock/commands/island/IslandSetCountCommand.java index d455510d..c96cbf12 100644 --- a/src/main/java/world/bentobox/aoneblock/commands/island/IslandSetCountCommand.java +++ b/src/main/java/world/bentobox/aoneblock/commands/island/IslandSetCountCommand.java @@ -67,11 +67,11 @@ public boolean execute(User user, String label, List args) { } // Get value // Get new range - if (!Util.isInteger(args.get(0), true) || Integer.parseInt(args.get(0)) < 0) { - user.sendMessage("general.errors.must-be-positive-number", TextVariables.NUMBER, args.get(0)); + if (!Util.isInteger(args.getFirst(), true) || Integer.parseInt(args.getFirst()) < 0) { + user.sendMessage("general.errors.must-be-positive-number", TextVariables.NUMBER, args.getFirst()); return false; } - int count = Integer.parseInt(args.get(0)); + int count = Integer.parseInt(args.getFirst()); // Check the value is lower than played so far @NonNull OneBlockIslands i = addon.getBlockListener().getIsland(island); diff --git a/src/main/java/world/bentobox/aoneblock/commands/island/PlayerCommand.java b/src/main/java/world/bentobox/aoneblock/commands/island/PlayerCommand.java index f268edcc..a3e5be87 100644 --- a/src/main/java/world/bentobox/aoneblock/commands/island/PlayerCommand.java +++ b/src/main/java/world/bentobox/aoneblock/commands/island/PlayerCommand.java @@ -21,22 +21,31 @@ public void setup() { // Count new IslandCountCommand(this, - settings.getCountCommand().split(" ")[0], - settings.getCountCommand().split(" ")); + settings.getCountCommand().split(" ")[0], + settings.getCountCommand().split(" ")); // Phase list new IslandPhasesCommand(this, - settings.getPhasesCommand().split(" ")[0], - settings.getPhasesCommand().split(" ")); + settings.getPhasesCommand().split(" ")[0], + settings.getPhasesCommand().split(" ")); // Set Count new IslandSetCountCommand(this, - settings.getSetCountCommand().split(" ")[0], - settings.getSetCountCommand().split(" ")); + settings.getSetCountCommand().split(" ")[0], + settings.getSetCountCommand().split(" ")); // Force block respawn new IslandRespawnBlockCommand(this, - settings.getRespawnBlockCommand().split(" ")[0], - settings.getRespawnBlockCommand().split(" ")); + settings.getRespawnBlockCommand().split(" ")[0], + settings.getRespawnBlockCommand().split(" ")); + + // Action bar + if (settings.isActionBar()) { + new IslandActionBarCommand(this, settings.getActionBarCommand().split(" ")[0], + settings.getActionBarCommand().split(" ")); + } + // Boss bar - new IslandBossBarCommand(this, settings.getBossBarCommand().split(" ")[0], - settings.getBossBarCommand().split(" ")); + if (settings.isBossBar()) { + new IslandBossBarCommand(this, settings.getBossBarCommand().split(" ")[0], + settings.getBossBarCommand().split(" ")); + } } } diff --git a/src/main/java/world/bentobox/aoneblock/listeners/BlockListener.java b/src/main/java/world/bentobox/aoneblock/listeners/BlockListener.java index 7cdeed88..ee2efe42 100644 --- a/src/main/java/world/bentobox/aoneblock/listeners/BlockListener.java +++ b/src/main/java/world/bentobox/aoneblock/listeners/BlockListener.java @@ -716,7 +716,7 @@ public void onPlayerInteract(PlayerInteractEvent e) { return; } - if (block != null && block.getBlockData() instanceof Brushable bb) { + if (block.getBlockData() instanceof Brushable bb) { int dusted = bb.getDusted() + 1; if (dusted > bb.getMaximumDusted()) { /// === Brushing is FINISHED! === diff --git a/src/main/java/world/bentobox/aoneblock/listeners/BossBarListener.java b/src/main/java/world/bentobox/aoneblock/listeners/BossBarListener.java index 822f3771..d3c1474c 100644 --- a/src/main/java/world/bentobox/aoneblock/listeners/BossBarListener.java +++ b/src/main/java/world/bentobox/aoneblock/listeners/BossBarListener.java @@ -18,7 +18,6 @@ import org.eclipse.jdt.annotation.NonNull; import net.kyori.adventure.text.Component; -import net.kyori.adventure.text.format.NamedTextColor; import net.kyori.adventure.text.serializer.legacy.LegacyComponentSerializer; import world.bentobox.aoneblock.AOneBlock; import world.bentobox.aoneblock.dataobjects.OneBlockIslands; @@ -33,7 +32,7 @@ public class BossBarListener implements Listener { private static final String AONEBLOCK_BOSSBAR = "aoneblock.bossbar"; - private static final String AONEBLOCK_ACTIONBAR = "aoneblock.actionbar"; + public static final String AONEBLOCK_ACTIONBAR = "aoneblock.actionbar"; private static final LegacyComponentSerializer LEGACY_SERIALIZER = LegacyComponentSerializer.builder() .character('&') @@ -45,7 +44,7 @@ public BossBarListener(AOneBlock addon) { this.addon = addon; } - private AOneBlock addon; + private final AOneBlock addon; // Store a boss bar for each player (using their UUID) private final Map islandBossBars = new HashMap<>(); @@ -98,11 +97,9 @@ private void tryToShowActionBar(UUID uuid, Island island) { if (!island.isAllowed(addon.ONEBLOCK_ACTIONBAR)) { return; } - // Default to showing boss bar unless it is explicitly turned off + // Default to showing action bar unless it is explicitly turned off if (!user.getMetaData(AONEBLOCK_ACTIONBAR).map(MetaDataValue::asBoolean).orElse(true)) { - // Remove any boss bar from user if they are in the world - removeBar(user, island); - // Do not show a boss bar + // Do not show an action bar return; } // Get the progress @@ -221,7 +218,7 @@ public void onJoin(PlayerJoinEvent e) { @EventHandler(priority = EventPriority.NORMAL, ignoreCancelled = true) public void onQuit(PlayerQuitEvent e) { // Clean up boss bars - islandBossBars.values().stream().forEach(bb -> bb.removePlayer(e.getPlayer())); + islandBossBars.values().forEach(bb -> bb.removePlayer(e.getPlayer())); islandBossBars.values().removeIf(bb -> bb.getPlayers().isEmpty()); } diff --git a/src/main/java/world/bentobox/aoneblock/listeners/ItemsAdderListener.java b/src/main/java/world/bentobox/aoneblock/listeners/ItemsAdderListener.java index bf4c25bb..ec97f0e2 100644 --- a/src/main/java/world/bentobox/aoneblock/listeners/ItemsAdderListener.java +++ b/src/main/java/world/bentobox/aoneblock/listeners/ItemsAdderListener.java @@ -7,7 +7,7 @@ import world.bentobox.aoneblock.AOneBlock; /** - * Handles ItemsAdderLoadDataEvent which fired when ItemsAdder loaded it's data or reload it's data + * Handles ItemsAdderLoadDataEvent which fired when ItemsAdder loaded its data or reload its data * * @author Teenkung123 */ diff --git a/src/main/java/world/bentobox/aoneblock/oneblocks/OneBlocksManager.java b/src/main/java/world/bentobox/aoneblock/oneblocks/OneBlocksManager.java index 0a6d23b8..7f52544d 100644 --- a/src/main/java/world/bentobox/aoneblock/oneblocks/OneBlocksManager.java +++ b/src/main/java/world/bentobox/aoneblock/oneblocks/OneBlocksManager.java @@ -572,7 +572,7 @@ public NavigableMap getBlockProbs() { } /** - * Get phase by name. Name should have any spaces converted to underscores. Case + * Get phase by name. Name should have any spaces converted to underscores. Case- * insensitive. * * @param name - name to search @@ -859,7 +859,7 @@ public void getProbs(OneBlockPhase phase) { } /** - * Get all the probs for each phases and log to console + * Get all the probs for each phase and log to console */ public void getAllProbs() { blockProbs.values().forEach(this::getProbs); diff --git a/src/main/java/world/bentobox/aoneblock/panels/PhasesPanel.java b/src/main/java/world/bentobox/aoneblock/panels/PhasesPanel.java index d2acc5d5..b1268493 100644 --- a/src/main/java/world/bentobox/aoneblock/panels/PhasesPanel.java +++ b/src/main/java/world/bentobox/aoneblock/panels/PhasesPanel.java @@ -27,7 +27,6 @@ import world.bentobox.aoneblock.oneblocks.OneBlockPhase; import world.bentobox.aoneblock.oneblocks.Requirement; import world.bentobox.bank.Bank; -import world.bentobox.bentobox.BentoBox; import world.bentobox.bentobox.api.addons.Addon; import world.bentobox.bentobox.api.localization.TextVariables; import world.bentobox.bentobox.api.panels.PanelItem; @@ -429,7 +428,7 @@ private PanelItem createPhaseButton(ItemTemplateRecord template, Map.Entry= 0) { // Append color code result.append(ChatColor.COLOR_CHAR); diff --git a/src/main/resources/addon.yml b/src/main/resources/addon.yml index fc1623ad..7eeb0e7c 100755 --- a/src/main/resources/addon.yml +++ b/src/main/resources/addon.yml @@ -50,9 +50,12 @@ permissions: aoneblock.island: description: Allow use of '/ob' command - the main island command default: TRUE + aoneblock.island.actionbar: + description: Allow use of '/ob actionbar' command - toggle the actionbar + default: TRUE aoneblock.island.bossbar: - description: Allow use of '/ob bossbar' command - toggle the bossbar - default: FALSE + description: Allow use of '/ob bossbar' command - toggle the bossbar + default: TRUE aoneblock.island.home: description: Allow use of '/ob go' command - teleport you to your island default: TRUE diff --git a/src/main/resources/config.yml b/src/main/resources/config.yml index a5f60bbb..5708bea7 100644 --- a/src/main/resources/config.yml +++ b/src/main/resources/config.yml @@ -3,46 +3,49 @@ aoneblock: command: # Player command. What command users will run to access their island. # To define alias, just separate commands with white space. - # Added since 1.3.0. island: ob oneblock # The admin command. # To define alias, just separate commands with white space. - # Added since 1.3.0. admin: obadmin oneblockadmin oba # The default action for new player command call. # Sub-command of main player command that will be run on first player command call. - # By default it is sub-command 'create'. - # Added since 1.2.0. + # By default, it is sub-command 'create'. new-player-action: create # The default action for player command. # Sub-command of main player command that will be run on each player command call. - # By default it is sub-command 'go'. - # Added since 1.2.0. + # By default, it is sub-command 'go'. default-action: go # The command label that shows current phase progress. - # By default it is 'count'. - # Added since 1.10.0. + # By default, it is 'count'. count-command: count # The command label that opens phases GUI. - # By default it is 'phases'. - # Added since 1.10.0. + # By default, it is 'phases'. phases-command: phases # The command label that allows to change island phase. - # By default it is 'setCount'. - # Added since 1.10.0. + # By default, it is 'setCount'. set-count-command: setCount + # Enables the bossbar and its command to show progress. + # Added since 1.21.2. + bossbar: true + # The command label that toggles the progress bar. + # By default, it is 'bossbar'. + bossbar-command: bossbar + # Enables the action bar and its command to show progress. + # Added since 1.21.2. + actionbar: true + # The command label that toggles the action bar progress. + # By default, it is 'actionbar'. + # Added since 1.21.2. + actionbar-command: actionbar # How long a player must wait until they can use the setCount command again. In minutes. # This is the command that is run from the phases panel. - # Added since 1.13.0. set-count-cooldown: 5 # The command label that allows to check if magic block is present and respawns it if not. - # By default it is 'respawnBlock check'. - # Added since 1.10.0. + # By default, it is 'respawnBlock check'. respawn-block-command: respawnBlock check placeholders: # Placeholder customization # Symbol for the percentage completed scale bar - # Added since 1.9.0. scale-symbol: ■ world: # Friendly name for this world. Used in admin commands. Must be a single word @@ -70,7 +73,7 @@ world: click-type: LEFT # Size of particles. Default is 0.5. Must be greater than 0. particle-size: 0.5 - # Density of particles - Value from 0.1 to 1. Default is 0.65. Smaller values are more dense, higher are less. + # Density of particles - Value from 0.1 to 1. Default is 0.65. Smaller values are denser, higher are less. particle-density: 0.65 # Color of particles particle-color: @@ -86,21 +89,15 @@ world: spawn-limits: # Spawn limits. These override the limits set in bukkit.yml # If set to a negative number, the server defaults will be used - # Added since 1.11.2. monsters: -1 - # Added since 1.11.2. animals: -1 - # Added since 1.11.2. water-animals: -1 - # Added since 1.11.2. ambient: -1 # Setting to 0 will disable animal spawns, but this is not recommended. Minecraft default is 400. # A negative value uses the server default - # Added since 1.11.2. ticks-per-animal-spawns: -1 # Setting to 0 will disable monster spawns, but this is not recommended. Minecraft default is 400. # A negative value uses the server default - # Added since 1.11.2. ticks-per-monster-spawns: -1 # Radius of island in blocks. (So distance between islands is twice this) # It is the same for every dimension : Overworld, Nether and End. @@ -125,6 +122,9 @@ world: # Island height - Lowest is 5. # It is the y coordinate of the bedrock block in the schem. island-height: 80 + # The number of concurrent islands a player can have in the world + # A value of 0 will use the BentoBox config.yml default + concurrent-islands: 1 # Disallow team members from having their own islands. disallow-team-member-islands: true # Use your own world generator for this world. @@ -132,7 +132,7 @@ world: # If used, you must specify the world name and generator in the bukkit.yml file. # See https://bukkit.gamepedia.com/Bukkit.yml#.2AOPTIONAL.2A_worlds use-own-generator: false - # Sea height (don't changes this mid-game unless you delete the world) + # Sea height (don't change this mid-game unless you delete the world) # Minimum is 0 # If sea height is less than about 10, then players will drop right through it # if it exists. @@ -145,11 +145,11 @@ world: # a new island for example. Options are SURVIVAL, CREATIVE, ADVENTURE, SPECTATOR default-game-mode: SURVIVAL # The default biome for the overworld - default-biome: PLAINS + default-biome: plains # The default biome for the nether world (this may affect what mobs can spawn) - default-nether-biome: NETHER_WASTES + default-nether-biome: nether_wastes # The default biome for the end world (this may affect what mobs can spawn) - default-end-biome: THE_END + default-end-biome: the_end # The maximum number of players a player can ban at any one time in this game mode. # The permission acidisland.ban.maxlimit.X where X is a number can also be used per player # -1 = unlimited @@ -159,7 +159,7 @@ world: # the nether will not occur. Other plugins may still enable portal usage. # Note: Some default challenges will not be possible if there is no nether. # Note that with a standard nether all players arrive at the same portal and entering a - # portal will return them back to their islands. + # portal will return them to their islands. generate: true # Islands in Nether. Change to false for standard vanilla nether. # Note that there is currently no magic block in the Nether @@ -178,7 +178,6 @@ world: # Option will simulate vanilla portal mechanics that links portals together # or creates a new portal, if there is not a portal in that dimension. # This option requires `allow-nether=true` in server.properties. - # Added since 1.16. create-and-link-portals: false end: # End Nether - if this is false, the end world will not be made and access to @@ -191,13 +190,12 @@ world: # This option indicates if obsidian platform in the end should be generated # when player enters the end world. # This option requires `allow-end=true` in bukkit.yml. - # Added since 1.16. create-obsidian-platform: false # Mob white list - these mobs will NOT be removed when logging in or doing /island remove-mobs-whitelist: - - ENDERMAN - - ZOMBIE_VILLAGER - - WITHER + - enderman + - wither + - zombie_villager # World flags. These are boolean settings for various flags for this world flags: CREEPER_DAMAGE: true @@ -228,7 +226,7 @@ world: ITEM_FRAME_DAMAGE: false SPAWNER_SPAWN_EGGS: true # These are the default protection settings for new islands. - # The value is the minimum island rank required allowed to do the action + # The value is the minimum island rank required to do the action # Ranks are the following: # VISITOR = 0 # COOP = 200 @@ -244,9 +242,11 @@ world: BUCKET: 500 LOCK: 0 ENDER_PEARL: 500 + BELL_RINGING: 500 DOOR: 500 BREAK_HOPPERS: 500 FURNACE: 500 + HURT_TAMED_ANIMALS: 500 ANVIL: 500 MINECART: 500 FISH_SCOOPING: 500 @@ -296,6 +296,7 @@ world: COMMAND_RANKS: 500 BEACON: 500 ALLAY: 500 + CRAFTER: 500 TRAPDOOR: 500 PRESSURE_PLATE: 0 EXPERIENCE_BOTTLE_THROWING: 500 @@ -318,11 +319,13 @@ world: SMITHING: 500 EXPERIENCE_PICKUP: 500 HOPPER: 500 + CANDLES: 500 LEASH: 500 MOUNT_INVENTORY: 500 BREAK_BLOCKS: 500 CHORUS_FRUIT: 500 CONTAINER: 500 + MAGIC_BLOCK: 200 JUKEBOX: 500 POTION_THROWING: 500 BARREL: 500 @@ -339,15 +342,16 @@ world: SHULKER_TELEPORT: true FIRE_SPREAD: true FIRE_BURNING: true + COMMAND_RANKS: true PVP_OVERWORLD: false TNT_DAMAGE: true MONSTER_SPAWNERS_SPAWN: true FIRE_IGNITE: true + ONEBLOCK_BOSSBAR: true BLOCK_EXPLODE_DAMAGE: true ANIMAL_SPAWNERS_SPAWN: true # These settings/flags are hidden from users # Ops can toggle hiding in-game using SHIFT-LEFT-CLICK on flags in settings - # Added since 1.4.1. hidden-flags: [] # Visitor banned commands - Visitors to islands cannot use these commands in this world visitor-banned-commands: @@ -355,14 +359,12 @@ world: - spawnmob # Falling banned commands - players cannot use these commands when falling # if the PREVENT_TELEPORT_WHEN_FALLING world setting flag is active - # Added since 1.8.0. falling-banned-commands: - warp - spawn island: # Drop broken blocks on top of magic block # If you want Jobs or other plugins to recognize magic block breaking this must be false - # Added since 1.3.0. drop-on-top: true # Magic block mob warning # Players might be able to hear hostile mobs up to this many blocks away @@ -376,12 +378,10 @@ island: # Default maximum number of coop rank members per island # Players can have the aoneblock.coop.maxsize. permission to be bigger but # permission size cannot be less than the default below. - # Added since 1.13.0. max-coop-size: 4 # Default maximum number of trusted rank members per island # Players can have the aoneblock.trust.maxsize. permission to be bigger but # permission size cannot be less than the default below. - # Added since 1.13.0. max-trusted-size: 4 # Default maximum number of homes a player can have. Min = 1 # Accessed via /is sethome or /is go @@ -411,13 +411,10 @@ island: # plugin may still reset the inventory when the world changes. inventory: false # Reset health - if true, the player's health will be reset. - # Added since 1.8.0. health: false # Reset hunger - if true, the player's hunger will be reset. - # Added since 1.8.0. hunger: false # Reset experience points - if true, the player's experience will be reset. - # Added since 1.8.0. exp: false # Reset Ender Chest - if true, the player's Ender Chest will be cleared. ender-chest: false @@ -432,13 +429,10 @@ island: # plugin may still reset the inventory when the world changes. inventory: true # Reset health - if true, the player's health will be reset. - # Added since 1.8.0. health: false # Reset hunger - if true, the player's hunger will be reset. - # Added since 1.8.0. hunger: false # Reset experience - if true, the player's experience will be reset. - # Added since 1.8.0. exp: false # Reset Ender Chest - if true, the player's Ender Chest will be cleared. ender-chest: false @@ -454,16 +448,14 @@ island: # Warning: # * If you are running multiple gamemodes on your server, and all of them have # this feature enabled, an island in all the gamemodes will be created simultaneously. - # However, it is impossible to know on which island the player will be teleported to afterwards. + # However, it is impossible to know on which island the player will be teleported to afterward. # * Island creation can be resource-intensive, please consider the options below to help mitigate # the potential issues, especially if you expect a lot of players to connect to your server # in a limited period of time. - # Added since 1.9.0. enable: false # Time in seconds after the player logged in, before his island gets created. # If set to 0 or less, the island will be created directly upon the player's login. # It is recommended to keep this value under a minute's time. - # Added since 1.9.0. delay: 5 # Toggles whether the island creation should be aborted if the player logged off while the # delay (see the option above) has not worn off yet. @@ -475,17 +467,14 @@ island: # * If the island creation started before the player logged off, it will continue. # If set to false, the player's island will be created even if he went offline in the meantime. # Note this option has no effect if the delay (see the option above) is set to 0 or less. - # Added since 1.9.0. abort-on-logout: true # Toggles whether the player should be teleported automatically to his island when it is created. # If set to false, the player will be told his island is ready but will have to teleport to his island using the command. - # Added since 1.10.0. teleport-player-to-island-when-created: true # Create Nether or End islands if they are missing when a player goes through a portal. # Nether and End islands are usually pasted when a player makes their island, but if they are # missing for some reason, you can switch this on. # Note that bedrock removal glitches can exploit this option. - # Added since 1.10.0. create-missing-nether-end-islands: false commands: # List of commands to run when a player joins an island or creates one. @@ -498,7 +487,6 @@ island: # Here are some examples of valid commands to execute: # * "[SUDO] bbox version" # * "obadmin deaths set [player] 0" - # Added since 1.8.0. on-join: [] # List of commands to run when a player leaves an island, resets his island or gets kicked from it. # These commands are run by the console, unless otherwise stated using the [SUDO] prefix, @@ -512,7 +500,6 @@ island: # * 'obadmin deaths set [player] 0' # # Note that player-executed commands might not work, as these commands can be run with said player being offline. - # Added since 1.8.0. on-leave: [] # List of commands that should be executed when the player respawns after death if Flags.ISLAND_RESPAWN is true. # These commands are run by the console, unless otherwise stated using the [SUDO] prefix, @@ -526,7 +513,6 @@ island: # * 'obadmin deaths set [player] 0' # # Note that player-executed commands might not work, as these commands can be run with said player being offline. - # Added since 1.14.0. on-respawn: [] sethome: nether: @@ -543,7 +529,6 @@ island: # When a player joins a team, reset their death count team-join-reset: true # Reset player death count when they start a new island or reset an island - # Added since 1.6.0. reset-on-new-island: true protection: # Geo restrict mobs. @@ -554,7 +539,6 @@ protection: - BLAZE # AOneBlock blocked mobs. # List of mobs that should not spawn in AOneBlock. - # Added since 1.2.0. block-mobs: [] # Invincible visitors. List of damages that will not affect visitors. # Make list blank if visitors should receive all damages diff --git a/src/main/resources/locales/cs.yml b/src/main/resources/locales/cs.yml index 44b2ff60..3b3f1dec 100644 --- a/src/main/resources/locales/cs.yml +++ b/src/main/resources/locales/cs.yml @@ -1,18 +1,31 @@ protection: flags: + MAGIC_BLOCK: + name: Ochrana Kouzelného Bloku + description: |- + &b Hodnost, která může rozbít + &b kouzelný blok, pokud + &b dokáže rozbíjet bloky. + hint: "&c Vaše hodnost nemůže rozbít kouzelný blok!" START_SAFETY: - name: Počáteční bezpečnost - description: | - &b Zabraňuje novým hráčům - &b from moving for 1 minute - &b takže nespadnou. - hint: '&c pohyb zablokován pro bezpečnost po [number] více sekund!' - free-to-move: '&a Můžete se volně pohybovat. ' + name: Počáteční Bezpečnost + description: |- + &b Zabrání novým hráčům + &b v pohybu po dobu 1 minuty, + &b aby nespadli. + hint: "&c Pohyb zablokován kvůli bezpečnosti na [number] sekund!" + free-to-move: "&a Můžete se volně pohybovat. Buďte opatrní!" ONEBLOCK_BOSSBAR: - name: Boss Bar - description: | - &b Ukazuje stavový řádek - &b pro každou fázi. + name: Boss Bar + description: |- + &b Zobrazuje stavový panel + &b pro každou fázi. + ONEBLOCK_ACTIONBAR: + name: Action Bar + description: |- + &b Zobrazuje stav + &b pro každou fázi + &b v Action Baru. aoneblock: bossbar: title: Bloky zbývající diff --git a/src/main/resources/locales/de.yml b/src/main/resources/locales/de.yml index 4801f7a2..574391c0 100644 --- a/src/main/resources/locales/de.yml +++ b/src/main/resources/locales/de.yml @@ -1,18 +1,31 @@ protection: flags: + MAGIC_BLOCK: + name: Schutz des Magischen Blocks + description: |- + &b Rang, der den magischen + &b Block zerstören kann, falls + &b Blöcke zerstört werden können. + hint: "&c Dein Rang kann den magischen Block nicht zerstören!" START_SAFETY: - name: Sicherheit beginnen - description: | - &b verhindert neue Spieler - &b vor dem Umzug für 1 Minute - &b damit sie nicht abfallen. - hint: '&c Bewegung für die Sicherheit für [number] mehr Sekunden!' - free-to-move: '&a Sie können sich frei bewegen. ' + name: Start-Sicherheit + description: |- + &b Verhindert, dass neue Spieler + &b sich 1 Minute lang bewegen, + &b damit sie nicht herunterfallen. + hint: "&c Bewegung aus Sicherheitsgründen für [number] weitere Sekunden blockiert!" + free-to-move: "&a Du kannst dich frei bewegen. Sei vorsichtig!" ONEBLOCK_BOSSBAR: - name: Boss Bar - description: | - &b Zeigt eine Statusleiste - &b für jede Phase. + name: Boss-Balken + description: |- + &b Zeigt eine Statusleiste + &b für jede Phase. + ONEBLOCK_ACTIONBAR: + name: Action-Leiste + description: |- + &b Zeigt einen Status + &b für jede Phase + &b in der Action-Leiste. aoneblock: bossbar: title: Verbleibende Blöcke diff --git a/src/main/resources/locales/en-US.yml b/src/main/resources/locales/en-US.yml index 19a340e1..492723ec 100755 --- a/src/main/resources/locales/en-US.yml +++ b/src/main/resources/locales/en-US.yml @@ -7,13 +7,13 @@ protection: flags: MAGIC_BLOCK: name: Magic Block Protection - description: | + description: |- &b Rank that can break the magic &b block if they can break blocks. hint: "&c Your rank cannot break the magic block!" START_SAFETY: name: Starting Safety - description: | + description: |- &b Prevents new players &b from moving for 1 minute &b so they don't fall off. @@ -21,13 +21,12 @@ protection: free-to-move: "&a You are free to move. Be careful!" ONEBLOCK_BOSSBAR: name: Boss Bar - description: | + description: |- &b Shows a status bar &b for each phase. - ONEBLOCK_ACTIONBAR: name: Action Bar - description: | + description: |- &b Shows a status &b for each phase &b in the Action Bar. @@ -109,12 +108,12 @@ aoneblock: # This section contains all button names and lore (description) buttons: # List of buttons in GUI's - # Button that is used in multi-page GUIs which allows to return to previous page. + # Button that is used in multipage GUIs which allows to return to previous page. previous: name: "&f&l Previous Page" description: |- &7 Switch to [number] page - # Button that is used in multi-page GUIs which allows to go to next page. + # Button that is used in multipage GUIs which allows to go to next page. next: name: "&f&l Next Page" description: |- diff --git a/src/main/resources/locales/es.yml b/src/main/resources/locales/es.yml index 45f9ce6a..3cf8af86 100644 --- a/src/main/resources/locales/es.yml +++ b/src/main/resources/locales/es.yml @@ -1,18 +1,31 @@ protection: flags: + MAGIC_BLOCK: + name: Protección de Bloque Mágico + description: |- + &b Rango que puede romper el + &b bloque mágico si puede + &b romper bloques. + hint: "&c ¡Tu rango no puede romper el bloque mágico!" START_SAFETY: - name: Seguridad inicial - description: | - &b Previene nuevos jugadores - &b de moverse por 1 minuto - &b Entonces no se caen. - hint: '&c ¡Movimiento bloqueado por seguridad por [number] más segundos!' - free-to-move: '&c Eres libre de moverte. ' + name: Seguridad Inicial + description: |- + &b Evita que los nuevos jugadores + &b se muevan durante 1 minuto + &b para que no se caigan. + hint: "&c Movimiento bloqueado por seguridad durante [number] segundos más!" + free-to-move: "&a Eres libre de moverte. ¡Ten cuidado!" ONEBLOCK_BOSSBAR: - name: Bar del jefe - description: | - &b Muestra una barra de estado - &b para cada fase. + name: Barra de Jefe (Boss Bar) + description: |- + &b Muestra una barra de estado + &b para cada fase. + ONEBLOCK_ACTIONBAR: + name: Barra de Acción (Action Bar) + description: |- + &b Muestra un estado + &b para cada fase + &b en la Barra de Acción. aoneblock: bossbar: title: Bloques restantes diff --git a/src/main/resources/locales/fr.yml b/src/main/resources/locales/fr.yml index 7492bcde..09e96625 100644 --- a/src/main/resources/locales/fr.yml +++ b/src/main/resources/locales/fr.yml @@ -1,18 +1,31 @@ protection: flags: + MAGIC_BLOCK: + name: Protection du Bloc Magique + description: |- + &b Rang qui peut casser le bloc + &b magique s'il peut casser + &b des blocs. + hint: "&c Votre rang ne peut pas casser le bloc magique!" START_SAFETY: - name: Sécurité de démarrage - description: | + name: Sécurité de Départ + description: |- &b Empêche les nouveaux joueurs - &b de déménager pendant 1 minute - &b Alors ils ne tombent pas. - hint: '&c Mouvement bloqué pour la sécurité pendant [number] plus de secondes!' - free-to-move: '&a Vous êtes libre de bouger. ' + &b de bouger pendant 1 minute + &b pour qu'ils ne tombent pas. + hint: "&c Mouvement bloqué par sécurité pendant [number] secondes supplémentaires!" + free-to-move: "&a Vous êtes libre de bouger. Faites attention!" ONEBLOCK_BOSSBAR: - name: Barre de boss - description: | - &b Affiche une barre d'état - pour chaque phase. + name: Barre de Boss + description: |- + &b Affiche une barre de statut + &b pour chaque phase. + ONEBLOCK_ACTIONBAR: + name: Barre d'Action + description: |- + &b Affiche un statut + &b pour chaque phase + &b dans la Barre d'Action. aoneblock: bossbar: title: Blocs restants diff --git a/src/main/resources/locales/hr.yml b/src/main/resources/locales/hr.yml index 8a7141f9..34a98ad3 100644 --- a/src/main/resources/locales/hr.yml +++ b/src/main/resources/locales/hr.yml @@ -1,18 +1,31 @@ protection: flags: + MAGIC_BLOCK: + name: Zaštita Magičnog Bloka + description: |- + &b Rang koji može razbiti + &b magični blok, ako + &b može razbiti blokove. + hint: "&c Vaš rang ne može razbiti magični blok!" START_SAFETY: - name: Pokretanje sigurnosti - description: | + name: Početna Sigurnost + description: |- &b Sprječava nove igrače - &b od kretanja u 1 minutu - &b Tako da ne padaju. - hint: '&c Kretanje je blokirano zbog sigurnosti za [number] više sekundi!' - free-to-move: '&a Slobodno se krećete. ' + &b da se kreću 1 minutu + &b da ne padnu. + hint: "&c Kretanje je blokirano iz sigurnosnih razloga još [number] sekundi!" + free-to-move: "&a Slobodni ste za kretanje. Budite oprezni!" ONEBLOCK_BOSSBAR: - name: Boss bar - description: | - &b Prikazuje traku statusa - &b za svaku fazu. + name: Boss Traka + description: |- + &b Prikazuje statusnu traku + &b za svaku fazu. + ONEBLOCK_ACTIONBAR: + name: Traka Akcije + description: |- + &b Prikazuje status + &b za svaku fazu + &b u Traci Akcije. aoneblock: bossbar: title: Preostali blokovi diff --git a/src/main/resources/locales/hu.yml b/src/main/resources/locales/hu.yml index f49fe4b7..4b5b6a81 100644 --- a/src/main/resources/locales/hu.yml +++ b/src/main/resources/locales/hu.yml @@ -1,20 +1,32 @@ protection: flags: + MAGIC_BLOCK: + name: Mágikus Blokk Védelem + description: |- + &b Rang, amely képes + &b szétrombolni a mágikus + &b blokkot, ha tud blokkokat + &b rombolni. + hint: "&c A rangod nem törheti szét a mágikus blokkot!" START_SAFETY: - name: Induló biztonság - description: | + name: Kezdő Biztonság + description: |- &b Megakadályozza az új játékosokat - &b 1 percig mozogva - &b Tehát nem esnek le. - hint: >- - &c A mozgás blokkolva a biztonság érdekében, a [number] több - másodpercre! - free-to-move: '&a Szabadon mozoghatsz. ' + &b a mozgásban 1 percig, + &b hogy ne essenek le. + hint: "&c Mozgás blokkolva biztonsági okokból még [number] másodpercig!" + free-to-move: "&a Szabadon mozoghatsz. Légy óvatos!" ONEBLOCK_BOSSBAR: - name: Főnök - description: | - &b Mutat egy állapotsorot - &b minden fázisra. + name: Boss Bar + description: |- + &b Állapotjelző sávot + &b mutat minden fázishoz. + ONEBLOCK_ACTIONBAR: + name: Műveleti Sáv (Action Bar) + description: |- + &b Állapotot mutat + &b minden fázishoz + &b a Műveleti Sávban. aoneblock: bossbar: title: Blokkok maradtak diff --git a/src/main/resources/locales/id.yml b/src/main/resources/locales/id.yml index b680c6a3..8fa45c9d 100644 --- a/src/main/resources/locales/id.yml +++ b/src/main/resources/locales/id.yml @@ -1,18 +1,31 @@ protection: flags: + MAGIC_BLOCK: + name: Perlindungan Blok Ajaib + description: |- + &b Pangkat yang dapat + &b menghancurkan blok ajaib + &b jika mereka dapat menghancurkan blok. + hint: "&c Pangkatmu tidak dapat menghancurkan blok ajaib!" START_SAFETY: - name: Mulai keamanan - description: | + name: Keamanan Awal + description: |- &b Mencegah pemain baru - &b dari bergerak selama 1 menit - &b Jadi mereka tidak jatuh. - hint: '&c Gerakan diblokir untuk keamanan selama [number] lebih banyak detik!' - free-to-move: '&a Anda bebas untuk pindah. ' + &b bergerak selama 1 menit + &b agar mereka tidak jatuh. + hint: "&c Pergerakan diblokir untuk keselamatan selama [number] detik lagi!" + free-to-move: "&a Anda bebas bergerak. Hati-hati!" ONEBLOCK_BOSSBAR: - name: Bos Bar - description: | - &b Menunjukkan bilah status - &b untuk setiap fase. + name: Boss Bar + description: |- + &b Menampilkan bilah status + &b untuk setiap fase. + ONEBLOCK_ACTIONBAR: + name: Action Bar + description: |- + &b Menampilkan status + &b untuk setiap fase + &b di Action Bar. aoneblock: bossbar: title: Blok tersisa diff --git a/src/main/resources/locales/it.yml b/src/main/resources/locales/it.yml index 17269d8d..f8c6a343 100644 --- a/src/main/resources/locales/it.yml +++ b/src/main/resources/locales/it.yml @@ -1,18 +1,31 @@ protection: flags: + MAGIC_BLOCK: + name: Protezione Blocco Magico + description: |- + &b Rango che può rompere il + &b blocco magico se può + &b rompere i blocchi. + hint: "&c Il tuo rango non può rompere il blocco magico!" START_SAFETY: - name: Avvio della sicurezza - description: | - &b Impedisce nuovi giocatori - &b dal muoversi per 1 minuto - &b Quindi non cadono. - hint: '&c Movimento bloccato per sicurezza per [number] più secondi!' - free-to-move: '&a Sei libero di muoverti. ' + name: Sicurezza Iniziale + description: |- + &b Impedisce ai nuovi giocatori + &b di muoversi per 1 minuto + &b in modo che non cadano. + hint: "&c Movimento bloccato per sicurezza per [number] secondi ancora!" + free-to-move: "&a Sei libero di muoverti. Fai attenzione!" ONEBLOCK_BOSSBAR: - name: Boss Bar - description: | - &b Mostra una barra di stato - &b per ogni fase. + name: Boss Bar + description: |- + &b Mostra una barra di stato + &b per ogni fase. + ONEBLOCK_ACTIONBAR: + name: Action Bar + description: |- + &b Mostra uno stato + &b per ogni fase + &b nella Action Bar. aoneblock: bossbar: title: Blocca i restanti diff --git a/src/main/resources/locales/ja.yml b/src/main/resources/locales/ja.yml index 1d980f27..652b3115 100644 --- a/src/main/resources/locales/ja.yml +++ b/src/main/resources/locales/ja.yml @@ -1,18 +1,31 @@ protection: flags: + MAGIC_BLOCK: + name: 魔法ブロック保護 + description: |- + &b ブロックを破壊できる場合、 + &b 魔法ブロックを破壊できる + &b ランク。 + hint: "&c あなたのランクでは魔法ブロックを破壊できません！" START_SAFETY: - name: 安全性の開始 - description: | - &b 新しいプレイヤーを防ぎます - &b 1分間移動することから - &b だから彼らは落ちません。 - hint: '&c [number]のために安全のために動きがブロックされました。' - free-to-move: '&a あなたは自由に動くことができます。' + name: 開始時の安全対策 + description: |- + &b 新しいプレイヤーが + &b 1分間移動するのを防ぎ、 + &b 落下を防ぎます。 + hint: "&c 安全のため、あと [number] 秒間移動がブロックされています！" + free-to-move: "&a 自由に動けます。注意してください！" ONEBLOCK_BOSSBAR: - name: ボスバー - description: | - &b ステータスバーを表示します - &b 各フェーズについて。 + name: ボスバー + description: |- + &b 各フェーズの + &b ステータスバーを表示します。 + ONEBLOCK_ACTIONBAR: + name: アクションバー + description: |- + &b 各フェーズの + &b ステータスを + &b アクションバーに表示します。 aoneblock: bossbar: title: 残りのブロック diff --git a/src/main/resources/locales/pl.yml b/src/main/resources/locales/pl.yml index 4b12c92a..7a14e0e0 100644 --- a/src/main/resources/locales/pl.yml +++ b/src/main/resources/locales/pl.yml @@ -1,18 +1,31 @@ protection: flags: + MAGIC_BLOCK: + name: Ochrona Magicznego Bloku + description: |- + &b Ranga, która może zniszczyć + &b magiczny blok, jeśli + &b może niszczyć bloki. + hint: "&c Twoja ranga nie może zniszczyć magicznego bloku!" START_SAFETY: - name: Początkowe bezpieczeństwo - description: | - &b Zapobiega nowych graczy - &b Od przeprowadzki na 1 minutę - &b Więc nie spadają. - hint: '&c Ruch zablokowany dla bezpieczeństwa przez [number] więcej sekund!' - free-to-move: '&a Możesz się poruszać. ' + name: Bezpieczeństwo Początkowe + description: |- + &b Zapobiega poruszaniu się + &b nowym graczom przez 1 minutę, + &b aby nie spadli. + hint: "&c Ruch zablokowany ze względów bezpieczeństwa na kolejne [number] sekund!" + free-to-move: "&a Możesz się swobodnie poruszać. Bądź ostrożny!" ONEBLOCK_BOSSBAR: - name: Bar Boss - description: | - &b Pokazuje pasek stanu - &b dla każdej fazy. + name: Pasek Bossa + description: |- + &b Pokazuje pasek statusu + &b dla każdej fazy. + ONEBLOCK_ACTIONBAR: + name: Pasek Akcji + description: |- + &b Pokazuje status + &b dla każdej fazy + &b na Pasku Akcji. aoneblock: bossbar: title: Pozostałe bloki diff --git a/src/main/resources/locales/pt.yml b/src/main/resources/locales/pt.yml index c9617f8d..223591b2 100644 --- a/src/main/resources/locales/pt.yml +++ b/src/main/resources/locales/pt.yml @@ -1,18 +1,31 @@ protection: flags: + MAGIC_BLOCK: + name: Proteção de Bloco Mágico + description: |- + &b Rank que pode quebrar o + &b bloco mágico se puder + &b quebrar blocos. + hint: "&c Seu rank não pode quebrar o bloco mágico!" START_SAFETY: - name: Segurança inicial - description: | - &b Impede novos jogadores - &b de se mudar por 1 minuto - &b Então eles não caem. - hint: '&c Movimento bloqueado por segurança por [número] mais segundos!' - free-to-move: '&a Você está livre para se mover. ' + name: Segurança Inicial + description: |- + &b Impede que novos jogadores + &b se movam por 1 minuto + &b para que não caiam. + hint: "&c Movimento bloqueado por segurança por mais [number] segundos!" + free-to-move: "&a Você está livre para se mover. Tenha cuidado!" ONEBLOCK_BOSSBAR: - name: Boss Bar - description: | - &b Mostra uma barra de status - &b para cada fase. + name: Boss Bar + description: |- + &b Mostra uma barra de status + &b para cada fase. + ONEBLOCK_ACTIONBAR: + name: Action Bar + description: |- + &b Mostra um status + &b para cada fase + &b na Action Bar. aoneblock: bossbar: title: Bloqueia o restante diff --git a/src/main/resources/locales/ru.yml b/src/main/resources/locales/ru.yml index 156a930d..ab82eda7 100644 --- a/src/main/resources/locales/ru.yml +++ b/src/main/resources/locales/ru.yml @@ -1,18 +1,31 @@ protection: flags: + MAGIC_BLOCK: + name: Защита Магического Блока + description: |- + &b Ранг, который может сломать + &b магический блок, если + &b он может ломать блоки. + hint: "&c Ваш ранг не может сломать магический блок!" START_SAFETY: - name: Начальная безопасность - description: | - &b Предотвращает новых игроков - &b от переезда на 1 минуту - &b Так что они не падают. - hint: '&c Движение заблокировано для безопасности для [number] больше секунд!' - free-to-move: '&a Вы можете свободно двигаться. ' + name: Начальная Безопасность + description: |- + &b Предотвращает движение + &b новых игроков в течение 1 минуты, + &b чтобы они не упали. + hint: "&c Движение заблокировано в целях безопасности еще на [number] секунд!" + free-to-move: "&a Вы можете свободно двигаться. Будьте осторожны!" ONEBLOCK_BOSSBAR: - name: Boss Bar - description: | - &b Показывает строку статуса - &b Для каждого этапа. + name: Boss Bar + description: |- + &b Показывает панель состояния + &b для каждой фазы. + ONEBLOCK_ACTIONBAR: + name: Action Bar + description: |- + &b Показывает статус + &b для каждой фазы + &b в Action Bar. aoneblock: bossbar: title: Блоки остались diff --git a/src/main/resources/locales/tr.yml b/src/main/resources/locales/tr.yml index 6c1d5071..8a11ab93 100644 --- a/src/main/resources/locales/tr.yml +++ b/src/main/resources/locales/tr.yml @@ -1,17 +1,31 @@ protection: flags: + MAGIC_BLOCK: + name: Büyülü Blok Koruması + description: |- + &b Blokları kırabilirlerse + &b büyülü bloğu kırabilecek + &b rütbe. + hint: "&c Rütbeniz büyülü bloğu kıramaz!" START_SAFETY: - name: Güvenli mod başlatılıyor - description: | - &b Yeni oyuncuları 1 dakika boyunca kıpırdamasını engeller - &b böylece aşağı düşmezler. - hint: '&c Haraketler [number] saniye daha güvenlik için engellenmiştir!' - free-to-move: '&a Artık kıpırdayabilirsin dikkatli ol!' + name: Başlangıç Güvenliği + description: |- + &b Yeni oyuncuların 1 dakika + &b boyunca hareket etmesini + &b engelleyerek düşmelerini önler. + hint: "&c Güvenlik için hareket [number] saniye daha engellendi!" + free-to-move: "&a Serbestçe hareket edebilirsiniz. Dikkatli olun!" ONEBLOCK_BOSSBAR: - name: Patron bar - description: | - &b Bir durum çubuğu gösterir - &b her aşama için. + name: Boss Çubuğu + description: |- + &b Her aşama için bir + &b durum çubuğu gösterir. + ONEBLOCK_ACTIONBAR: + name: Eylem Çubuğu (Action Bar) + description: |- + &b Her aşama için bir + &b durumu Eylem Çubuğunda + &b gösterir. aoneblock: bossbar: title: Kalan bloklar diff --git a/src/main/resources/locales/uk.yml b/src/main/resources/locales/uk.yml index 8c742a19..2dbd180e 100644 --- a/src/main/resources/locales/uk.yml +++ b/src/main/resources/locales/uk.yml @@ -1,18 +1,31 @@ protection: flags: + MAGIC_BLOCK: + name: Захист Магічного Блоку + description: |- + &b Ранг, який може зламати + &b магічний блок, якщо + &b може ламати блоки. + hint: "&c Ваш ранг не може зламати магічний блок!" START_SAFETY: - name: Початкова безпека - description: | - &b Запобігає новим гравцям - &b від переміщення протягом 1 хвилини - &b Тож вони не падають. - hint: '&c Рух заблокований для безпеки для [number] більше секунд!' - free-to-move: '&a Ви вільно рухаєтесь. ' + name: Початкова Безпека + description: |- + &b Запобігає руху нових гравців + &b протягом 1 хвилини, + &b щоб вони не впали. + hint: "&c Рух заблоковано з міркувань безпеки ще на [number] секунд!" + free-to-move: "&a Ви можете вільно рухатися. Будьте обережні!" ONEBLOCK_BOSSBAR: - name: Бар для боса - description: | - &b Показує панель стану - &b для кожної фази. + name: Boss Bar + description: |- + &b Показує панель стану + &b для кожної фази. + ONEBLOCK_ACTIONBAR: + name: Action Bar + description: |- + &b Показує статус + &b для кожної фази + &b в Action Bar. aoneblock: bossbar: title: Блоки, що залишилися diff --git a/src/main/resources/locales/vi.yml b/src/main/resources/locales/vi.yml index 0d25e415..19485439 100644 --- a/src/main/resources/locales/vi.yml +++ b/src/main/resources/locales/vi.yml @@ -1,18 +1,31 @@ protection: flags: + MAGIC_BLOCK: + name: Bảo Vệ Khối Ma Thuật + description: |- + &b Xếp hạng có thể phá + &b khối ma thuật nếu họ + &b có thể phá khối. + hint: "&c Xếp hạng của bạn không thể phá khối ma thuật!" START_SAFETY: - name: Khởi đầu an toàn - description: | - &b Ngăn chặn người chơi mới - &b Từ việc di chuyển trong 1 phút - &b Vì vậy, họ không rơi ra. - hint: '&c Chuyển động bị chặn để an toàn cho [number] thêm giây!' - free-to-move: '&a Bạn có thể tự do di chuyển. ' + name: An Toàn Khởi Đầu + description: |- + &b Ngăn người chơi mới + &b di chuyển trong 1 phút + &b để họ không bị rơi. + hint: "&c Di chuyển bị chặn vì lý do an toàn trong [number] giây nữa!" + free-to-move: "&a Bạn được phép di chuyển tự do. Hãy cẩn thận!" ONEBLOCK_BOSSBAR: - name: Boss Bar - description: | - &b Hiển thị một thanh trạng thái - &b cho mỗi pha. + name: Thanh Boss + description: |- + &b Hiển thị thanh trạng thái + &b cho mỗi giai đoạn. + ONEBLOCK_ACTIONBAR: + name: Thanh Hành Động (Action Bar) + description: |- + &b Hiển thị trạng thái + &b cho mỗi giai đoạn + &b trên Thanh Hành Động. aoneblock: bossbar: title: Khối còn lại diff --git a/src/main/resources/locales/zh-CN.yml b/src/main/resources/locales/zh-CN.yml index 1d33b340..3b736e8f 100644 --- a/src/main/resources/locales/zh-CN.yml +++ b/src/main/resources/locales/zh-CN.yml @@ -1,18 +1,30 @@ protection: flags: + MAGIC_BLOCK: + name: 魔法方块保护 + description: |- + &b 如果玩家可以破坏方块， + &b 则该等级可以破坏 + &b 魔法方块。 + hint: "&c 您的等级无法破坏魔法方块！" START_SAFETY: - name: 开始安全 - description: | - &b 防止新球员 - &b 从移动1分钟 - &b 所以他们不会掉下来。 - hint: '&c 移动被阻塞，以确保[number]更多秒！' - free-to-move: '&a 您可以自由移动。' + name: 初始安全保护 + description: |- + &b 阻止新玩家在1分钟内 + &b 移动，以防他们跌落。 + hint: "&c 出于安全考虑，移动已被阻止 [number] 秒！" + free-to-move: "&a 您可以自由移动了。请小心！" ONEBLOCK_BOSSBAR: - name: 老板酒吧 - description: | - &b 显示状态栏 - &b 对于每个阶段。 + name: Boss 血条 + description: |- + &b 为每个阶段 + &b 显示一个状态条。 + ONEBLOCK_ACTIONBAR: + name: 动作栏 + description: |- + &b 在动作栏中 + &b 显示每个阶段 + &b 的状态。 aoneblock: bossbar: title: 剩余的块 diff --git a/src/main/resources/locales/zh-TW.yml b/src/main/resources/locales/zh-TW.yml index 24c830fb..90c15699 100644 --- a/src/main/resources/locales/zh-TW.yml +++ b/src/main/resources/locales/zh-TW.yml @@ -1,18 +1,30 @@ protection: flags: + MAGIC_BLOCK: + name: 魔法方塊保護 + description: |- + &b 如果玩家可以破壞方塊， + &b 則該等級可以破壞 + &b 魔法方塊。 + hint: "&c 您的等級無法破壞魔法方塊！" START_SAFETY: - name: 開始安全 - description: | - &b 防止新球員 - &b 從移動1分鐘 - &b 所以他們不會掉下來。 - hint: '&c 移動被阻塞，以確保[number]更多秒！' - free-to-move: '&a 您可以自由移動。當心！' + name: 初始安全保護 + description: |- + &b 阻止新玩家在1分鐘內 + &b 移動，以防他們跌落。 + hint: "&c 出於安全考慮，移動已被阻止 [number] 秒！" + free-to-move: "&a 您可以自由移動了。請小心！" ONEBLOCK_BOSSBAR: - name: 老闆酒吧 - description: | - &b 顯示狀態欄 - &b 對於每個階段。 + name: Boss 血條 + description: |- + &b 為每個階段 + &b 顯示一個狀態條。 + ONEBLOCK_ACTIONBAR: + name: 動作欄 + description: |- + &b 在動作欄中 + &b 顯示每個階段 + &b 的狀態。 aoneblock: bossbar: title: 剩餘的塊 diff --git a/src/test/java/world/bentobox/aoneblock/AOneBlockTest.java b/src/test/java/world/bentobox/aoneblock/AOneBlockTest.java index 1b0d21c7..5be15415 100644 --- a/src/test/java/world/bentobox/aoneblock/AOneBlockTest.java +++ b/src/test/java/world/bentobox/aoneblock/AOneBlockTest.java @@ -1,356 +1,286 @@ package world.bentobox.aoneblock; -import static org.junit.Assert.assertEquals; -import static org.junit.Assert.assertNotEquals; -import static org.junit.Assert.assertNotNull; -import static org.junit.Assert.assertNull; -import static org.junit.Assert.assertTrue; +import static org.junit.jupiter.api.Assertions.assertEquals; +import static org.junit.jupiter.api.Assertions.assertNotEquals; +import static org.junit.jupiter.api.Assertions.assertNotNull; +import static org.junit.jupiter.api.Assertions.assertNull; +import static org.junit.jupiter.api.Assertions.assertTrue; import static org.mockito.ArgumentMatchers.any; -import static org.mockito.ArgumentMatchers.anyString; -import static org.mockito.Mockito.RETURNS_MOCKS; import static org.mockito.Mockito.mock; import static org.mockito.Mockito.verify; import static org.mockito.Mockito.when; -import java.beans.IntrospectionException; import java.io.File; import java.io.FileInputStream; import java.io.FileNotFoundException; import java.io.FileOutputStream; import java.io.IOException; -import java.lang.reflect.InvocationTargetException; import java.nio.file.Files; import java.nio.file.Path; import java.nio.file.Paths; import java.util.Collections; -import java.util.Comparator; import java.util.UUID; import java.util.concurrent.CompletableFuture; import java.util.jar.JarEntry; import java.util.jar.JarOutputStream; -import java.util.logging.Logger; -import org.bukkit.Bukkit; -import org.bukkit.Server; -import org.bukkit.entity.Player; -import org.bukkit.plugin.PluginManager; import org.eclipse.jdt.annotation.NonNull; -import org.junit.After; -import org.junit.Before; -import org.junit.BeforeClass; -import org.junit.Test; -import org.junit.runner.RunWith; -import org.mockbukkit.mockbukkit.MockBukkit; +import org.junit.jupiter.api.AfterEach; +import org.junit.jupiter.api.BeforeEach; +import org.junit.jupiter.api.Test; import org.mockito.Mock; +import org.mockito.MockedStatic; 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; import world.bentobox.aoneblock.dataobjects.OneBlockIslands; -import world.bentobox.bentobox.BentoBox; import world.bentobox.bentobox.Settings; import world.bentobox.bentobox.api.addons.Addon.State; import world.bentobox.bentobox.api.addons.AddonDescription; -import world.bentobox.bentobox.api.configuration.Config; import world.bentobox.bentobox.api.user.User; import world.bentobox.bentobox.database.AbstractDatabaseHandler; import world.bentobox.bentobox.database.DatabaseSetup; import world.bentobox.bentobox.database.DatabaseSetup.DatabaseType; -import world.bentobox.bentobox.database.objects.Island; import world.bentobox.bentobox.managers.AddonsManager; 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.PlaceholdersManager; /** * @author tastybento * */ -@RunWith(PowerMockRunner.class) -@PrepareForTest({ Bukkit.class, BentoBox.class, User.class, Config.class, DatabaseSetup.class }) -public class AOneBlockTest { - - @Mock - private User user; - @Mock - private IslandsManager im; - @Mock - private Island island; - - private AOneBlock addon; - @Mock - private BentoBox plugin; - @Mock - private FlagsManager fm; - @Mock - private Settings settings; - @Mock - private PlaceholdersManager phm; - - private static AbstractDatabaseHandler h; - - @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)); - } - - @After - public void tearDown() throws IOException { - MockBukkit.unmock(); - User.clearUsers(); - Mockito.framework().clearInlineMocks(); - deleteAll(new File("database")); - deleteAll(new File("database_backup")); - new File("config.yml").delete(); - deleteAll(new File("addons")); - deleteAll(new File("panels")); - } - - private void deleteAll(File file) throws IOException { - if (file.exists()) { - Files.walk(file.toPath()).sorted(Comparator.reverseOrder()).map(Path::toFile).forEach(File::delete); - } - - } - - /** - * @throws java.lang.Exception - */ - @Before - public void setUp() throws Exception { - PowerMockito.mockStatic(Bukkit.class, Mockito.RETURNS_MOCKS); - Server server = MockBukkit.mock(); - // Set up plugin - Whitebox.setInternalState(BentoBox.class, "instance", plugin); - when(plugin.getLogger()).thenReturn(Logger.getAnonymousLogger()); - - // The database type has to be created one line before the thenReturn() to work! - DatabaseType value = DatabaseType.JSON; - when(plugin.getSettings()).thenReturn(settings); - when(settings.getDatabaseType()).thenReturn(value); - when(plugin.getPlaceholdersManager()).thenReturn(phm); - // Placeholders - when(phm.replacePlaceholders(any(), anyString())).thenAnswer(a -> (String) a.getArgument(1, String.class)); - - // Command manager - CommandsManager cm = mock(CommandsManager.class); - when(plugin.getCommandsManager()).thenReturn(cm); - - // Player - Player p = mock(Player.class); - // Sometimes use Mockito.withSettings().verboseLogging() - when(user.isOp()).thenReturn(false); - UUID uuid = UUID.randomUUID(); - when(user.getUniqueId()).thenReturn(uuid); - when(user.getPlayer()).thenReturn(p); - when(user.getName()).thenReturn("tastybento"); - User.setPlugin(plugin); - - // Island World Manager - IslandWorldManager iwm = mock(IslandWorldManager.class); - when(plugin.getIWM()).thenReturn(iwm); - - // Player has island to begin with - island = mock(Island.class); - when(im.getIsland(Mockito.any(), Mockito.any(UUID.class))).thenReturn(island); - when(plugin.getIslands()).thenReturn(im); - - // Locales - // Return the reference (USE THIS IN THE FUTURE) - when(user.getTranslation(Mockito.anyString())) - .thenAnswer((Answer) invocation -> invocation.getArgument(0, String.class)); - - // Server - PowerMockito.mockStatic(Bukkit.class, RETURNS_MOCKS); - when(Bukkit.getServer()).thenReturn(server); - when(Bukkit.getLogger()).thenReturn(Logger.getAnonymousLogger()); - when(Bukkit.getPluginManager()).thenReturn(mock(PluginManager.class)); - - // Create an Addon - addon = new AOneBlock(); - File jFile = new File("addon.jar"); - try (JarOutputStream tempJarOutputStream = new JarOutputStream(new FileOutputStream(jFile))) { - - // Copy over config file from src folder - Path fromPath = Paths.get("src/main/resources/config.yml"); - Path path = Paths.get("config.yml"); - Files.copy(fromPath, path); - - // Add the new files to the jar. - add(path, tempJarOutputStream); - - // Copy over panels file from src folder - fromPath = Paths.get("src/main/resources/panels/phases_panel.yml"); - path = Paths.get("panels"); - Files.createDirectory(path); - path = Paths.get("panels/phases_panel.yml"); - Files.copy(fromPath, path); - - // Add the new files to the jar. - add(path, tempJarOutputStream); - } - - File dataFolder = new File("addons/AOneBlock"); - addon.setDataFolder(dataFolder); - addon.setFile(jFile); - AddonDescription desc = new AddonDescription.Builder("bentobox", "aoneblock", "1.3").description("test") - .authors("tasty").build(); - addon.setDescription(desc); - // Addons manager - AddonsManager am = mock(AddonsManager.class); - when(plugin.getAddonsManager()).thenReturn(am); - - // Flags manager - when(plugin.getFlagsManager()).thenReturn(fm); - when(fm.getFlags()).thenReturn(Collections.emptyList()); - - } - - private void add(Path path, JarOutputStream tempJarOutputStream) throws FileNotFoundException, IOException { - try (FileInputStream fis = new FileInputStream(path.toFile())) { - byte[] buffer = new byte[1024]; - int bytesRead = 0; - JarEntry entry = new JarEntry(path.toString()); - tempJarOutputStream.putNextEntry(entry); - while ((bytesRead = fis.read(buffer)) != -1) { - tempJarOutputStream.write(buffer, 0, bytesRead); - } - } - - } - - /** - * Test method for {@link world.bentobox.aoneblock.AOneBlock#onEnable()}. - */ - @Test - public void testOnEnable() { - testOnLoad(); - addon.setState(State.ENABLED); - addon.onEnable(); - //verify(plugin, never()).logError(anyString()); - assertNotEquals(State.DISABLED, addon.getState()); - assertNotNull(addon.getBlockListener()); - assertNotNull(addon.getOneBlockManager()); - - } - - /** - * Test method for {@link world.bentobox.aoneblock.AOneBlock#onLoad()}. - */ - @Test - public void testOnLoad() { - addon.onLoad(); - // Check that config.yml file has been saved - File check = new File("addons/AOneBlock", "config.yml"); - assertTrue(check.exists()); - assertTrue(addon.getPlayerCommand().isPresent()); - assertTrue(addon.getAdminCommand().isPresent()); - - } - - /** - * Test method for {@link world.bentobox.aoneblock.AOneBlock#onReload()}. - */ - @Test - public void testOnReload() { - addon.onEnable(); - addon.onReload(); - // Check that config.yml file has been saved - File check = new File("addons/AOneBlock", "config.yml"); - assertTrue(check.exists()); - } - - /** - * Test method for {@link world.bentobox.aoneblock.AOneBlock#createWorlds()}. - */ - @Test - public void testCreateWorlds() { - addon.onLoad(); - addon.createWorlds(); - verify(plugin).log("[aoneblock] Creating AOneBlock world ..."); - verify(plugin).log("[aoneblock] Creating AOneBlock's Nether..."); - verify(plugin).log("[aoneblock] Creating AOneBlock's End World..."); - - } - - /** - * Test method for {@link world.bentobox.aoneblock.AOneBlock#getSettings()}. - */ - @Test - public void testGetSettings() { - addon.onLoad(); - assertNotNull(addon.getSettings()); - - } - - /** - * Test method for - * {@link world.bentobox.aoneblock.AOneBlock#getWorldSettings()}. - */ - @Test - public void testGetWorldSettings() { - addon.onLoad(); - assertEquals(addon.getSettings(), addon.getWorldSettings()); - } - - /** - * Test method for - * {@link world.bentobox.aoneblock.AOneBlock#getOneBlocksIsland(world.bentobox.bentobox.database.objects.Island)}. - */ - @Test - public void testGetOneBlocksIsland() { - addon.onEnable(); - @NonNull - OneBlockIslands i = addon.getOneBlocksIsland(island); - assertEquals(island.getUniqueId(), i.getUniqueId()); - } - - /** - * Test method for - * {@link world.bentobox.aoneblock.AOneBlock#getOneBlockManager()}. - */ - @Test - public void testGetOneBlockManager() { - assertNull(addon.getOneBlockManager()); - } - - /** - * Test method for - * {@link world.bentobox.aoneblock.AOneBlock#getBlockListener()}. - */ - @Test - public void testGetBlockListener() { - assertNull(addon.getBlockListener()); - } - - /** - * Test method for - * {@link world.bentobox.aoneblock.AOneBlock#getPlaceholdersManager()}. - */ - @Test - public void testGetPlaceholdersManager() { - assertNull(addon.getPlaceholdersManager()); - } - - /** - * Test method for {@link world.bentobox.aoneblock.AOneBlock#getHoloListener()}. - */ - @Test - public void testGetHoloListener() { - assertNull(addon.getHoloListener()); - } +public class AOneBlockTest extends CommonTestSetup { + + @Mock + private User user; + + private AOneBlock addon; + @Mock + private FlagsManager fm; + @Mock + private Settings settings; + + @Override + @AfterEach + public void tearDown() throws Exception { + super.tearDown(); + deleteAll(new File("database")); + deleteAll(new File("database_backup")); + new File("config.yml").delete(); + deleteAll(new File("addons")); + deleteAll(new File("panels")); + } + + /** + * @throws java.lang.Exception + */ + @SuppressWarnings("unchecked") + @Override + @BeforeEach + public void setUp() throws Exception { + super.setUp(); + // This has to be done beforeClass otherwise the tests will interfere with each + // other + AbstractDatabaseHandler h = mock(AbstractDatabaseHandler.class); + // Database + MockedStatic mockDb = Mockito.mockStatic(DatabaseSetup.class); + DatabaseSetup dbSetup = mock(DatabaseSetup.class); + mockDb.when(DatabaseSetup::getDatabase).thenReturn(dbSetup); + when(dbSetup.getHandler(any())).thenReturn(h); + when(h.saveObject(any())).thenReturn(CompletableFuture.completedFuture(true)); + + + // The database type has to be created one line before the thenReturn() to work! + DatabaseType value = DatabaseType.JSON; + when(plugin.getSettings()).thenReturn(settings); + when(settings.getDatabaseType()).thenReturn(value); + + // Command manager + CommandsManager cm = mock(CommandsManager.class); + when(plugin.getCommandsManager()).thenReturn(cm); + + // Player + when(user.isOp()).thenReturn(false); + UUID uuid = UUID.randomUUID(); + when(user.getUniqueId()).thenReturn(uuid); + when(user.getPlayer()).thenReturn(mockPlayer); + when(user.getName()).thenReturn("tastybento"); + User.setPlugin(plugin); + + // Player has island to begin with + when(im.getIsland(any(), any(UUID.class))).thenReturn(island); + + // Create an Addon + addon = new AOneBlock(); + File jFile = new File("addon.jar"); + try (JarOutputStream tempJarOutputStream = new JarOutputStream(new FileOutputStream(jFile))) { + + // Copy over config file from src folder + Path fromPath = Paths.get("src/main/resources/config.yml"); + Path path = Paths.get("config.yml"); + Files.copy(fromPath, path); + + // Add the new files to the jar. + add(path, tempJarOutputStream); + + // Copy over panels file from src folder + fromPath = Paths.get("src/main/resources/panels/phases_panel.yml"); + path = Paths.get("panels"); + Files.createDirectory(path); + path = Paths.get("panels/phases_panel.yml"); + Files.copy(fromPath, path); + + // Add the new files to the jar. + add(path, tempJarOutputStream); + } + + File dataFolder = new File("addons/AOneBlock"); + addon.setDataFolder(dataFolder); + addon.setFile(jFile); + AddonDescription desc = new AddonDescription.Builder("bentobox", "aoneblock", "1.3").description("test") + .authors("tasty").build(); + addon.setDescription(desc); + // Addons manager + AddonsManager am = mock(AddonsManager.class); + when(plugin.getAddonsManager()).thenReturn(am); + + // Flags manager + when(plugin.getFlagsManager()).thenReturn(fm); + when(fm.getFlags()).thenReturn(Collections.emptyList()); + + } + + private void add(Path path, JarOutputStream tempJarOutputStream) throws FileNotFoundException, IOException { + try (FileInputStream fis = new FileInputStream(path.toFile())) { + byte[] buffer = new byte[1024]; + int bytesRead = 0; + JarEntry entry = new JarEntry(path.toString()); + tempJarOutputStream.putNextEntry(entry); + while ((bytesRead = fis.read(buffer)) != -1) { + tempJarOutputStream.write(buffer, 0, bytesRead); + } + } + + } + + /** + * Test method for {@link world.bentobox.aoneblock.AOneBlock#onEnable()}. + */ + @Test + public void testOnEnable() { + testOnLoad(); + addon.setState(State.ENABLED); + addon.onEnable(); + assertNotEquals(State.DISABLED, addon.getState()); + assertNotNull(addon.getBlockListener()); + assertNotNull(addon.getOneBlockManager()); + + } + + /** + * Test method for {@link world.bentobox.aoneblock.AOneBlock#onLoad()}. + */ + @Test + public void testOnLoad() { + addon.onLoad(); + // Check that config.yml file has been saved + File check = new File("addons/AOneBlock", "config.yml"); + assertTrue(check.exists()); + assertTrue(addon.getPlayerCommand().isPresent()); + assertTrue(addon.getAdminCommand().isPresent()); + + } + + /** + * Test method for {@link world.bentobox.aoneblock.AOneBlock#onReload()}. + */ + @Test + public void testOnReload() { + addon.onLoad(); + addon.onEnable(); + addon.onReload(); + // Check that config.yml file has been saved + File check = new File("addons/AOneBlock", "config.yml"); + assertTrue(check.exists()); + } + + /** + * Test method for {@link world.bentobox.aoneblock.AOneBlock#createWorlds()}. + */ + @Test + public void testCreateWorlds() { + addon.onLoad(); + addon.createWorlds(); + verify(plugin).log("[aoneblock] Creating AOneBlock world ..."); + verify(plugin).log("[aoneblock] Creating AOneBlock's Nether..."); + verify(plugin).log("[aoneblock] Creating AOneBlock's End World..."); + + } + + /** + * Test method for {@link world.bentobox.aoneblock.AOneBlock#getSettings()}. + */ + @Test + public void testGetSettings() { + addon.onLoad(); + assertNotNull(addon.getSettings()); + + } + + /** + * Test method for + * {@link world.bentobox.aoneblock.AOneBlock#getWorldSettings()}. + */ + @Test + public void testGetWorldSettings() { + addon.onLoad(); + assertEquals(addon.getSettings(), addon.getWorldSettings()); + } + + /** + * Test method for + * {@link world.bentobox.aoneblock.AOneBlock#getOneBlocksIsland(world.bentobox.bentobox.database.objects.Island)}. + */ + @Test + public void testGetOneBlocksIsland() { + addon.onLoad(); + addon.onEnable(); + @NonNull + OneBlockIslands i = addon.getOneBlocksIsland(island); + assertEquals(island.getUniqueId(), i.getUniqueId()); + } + + /** + * Test method for + * {@link world.bentobox.aoneblock.AOneBlock#getOneBlockManager()}. + */ + @Test + public void testGetOneBlockManager() { + assertNull(addon.getOneBlockManager()); + } + + /** + * Test method for + * {@link world.bentobox.aoneblock.AOneBlock#getBlockListener()}. + */ + @Test + public void testGetBlockListener() { + assertNull(addon.getBlockListener()); + } + + /** + * Test method for + * {@link world.bentobox.aoneblock.AOneBlock#getPlaceholdersManager()}. + */ + @Test + public void testGetPlaceholdersManager() { + assertNull(addon.getPlaceholdersManager()); + } + + /** + * Test method for {@link world.bentobox.aoneblock.AOneBlock#getHoloListener()}. + */ + @Test + public void testGetHoloListener() { + assertNull(addon.getHoloListener()); + } } diff --git a/src/test/java/world/bentobox/aoneblock/CommonTestSetup.java b/src/test/java/world/bentobox/aoneblock/CommonTestSetup.java new file mode 100644 index 00000000..b8281c1f --- /dev/null +++ b/src/test/java/world/bentobox/aoneblock/CommonTestSetup.java @@ -0,0 +1,310 @@ +package world.bentobox.aoneblock; + +import static org.junit.jupiter.api.Assertions.assertEquals; +import static org.mockito.ArgumentMatchers.any; +import static org.mockito.ArgumentMatchers.anyString; +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.io.File; +import java.io.IOException; +import java.nio.file.Files; +import java.nio.file.Path; +import java.util.Collections; +import java.util.Comparator; +import java.util.List; +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; +import org.bukkit.entity.Entity; +import org.bukkit.entity.EntityType; +import org.bukkit.entity.Player; +import org.bukkit.entity.Player.Spigot; +import org.bukkit.event.entity.EntityExplodeEvent; +import org.bukkit.event.entity.PlayerDeathEvent; +import org.bukkit.inventory.ItemFactory; +import org.bukkit.inventory.ItemStack; +import org.bukkit.inventory.PlayerInventory; +import org.bukkit.metadata.FixedMetadataValue; +import org.bukkit.metadata.MetadataValue; +import org.bukkit.plugin.PluginManager; +import org.bukkit.scheduler.BukkitScheduler; +import org.bukkit.util.Vector; +import org.eclipse.jdt.annotation.Nullable; +import org.junit.jupiter.api.AfterEach; +import org.junit.jupiter.api.BeforeEach; +import org.mockbukkit.mockbukkit.MockBukkit; +import org.mockbukkit.mockbukkit.ServerMock; +import org.mockito.ArgumentCaptor; +import org.mockito.Mock; +import org.mockito.MockedStatic; +import org.mockito.Mockito; +import org.mockito.MockitoAnnotations; +import org.mockito.stubbing.Answer; + +import com.google.common.collect.ImmutableSet; + +import net.md_5.bungee.api.chat.TextComponent; +import world.bentobox.bentobox.BentoBox; +import world.bentobox.bentobox.api.configuration.WorldSettings; +import world.bentobox.bentobox.api.user.Notifier; +import world.bentobox.bentobox.api.user.User; +import world.bentobox.bentobox.database.objects.Island; +import world.bentobox.bentobox.database.objects.Players; +import world.bentobox.bentobox.managers.BlueprintsManager; +import world.bentobox.bentobox.managers.FlagsManager; +import world.bentobox.bentobox.managers.HooksManager; +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; + +/** + * Common items for testing. Don't forget to use super.setUp()! + *

+ * Sets up BentoBox plugin, pluginManager and ItemFactory. + * Location, world, playersManager and player. + * IWM, Addon and WorldSettings. IslandManager with one + * island with protection and nothing allowed by default. + * Owner of island is player with same UUID. + * Locales, placeholders. + * @author tastybento + * + */ +public abstract class CommonTestSetup { + + protected UUID uuid = UUID.randomUUID(); + + @Mock + protected Player mockPlayer; + @Mock + protected PluginManager pim; + @Mock + protected ItemFactory itemFactory; + @Mock + protected Location location; + @Mock + protected World world; + @Mock + protected IslandWorldManager iwm; + @Mock + protected IslandsManager im; + @Mock + protected Island island; + @Mock + protected BentoBox plugin; + @Mock + protected PlayerInventory inv; + @Mock + protected Notifier notifier; + @Mock + protected FlagsManager fm; + @Mock + protected Spigot spigot; + @Mock + protected HooksManager hooksManager; + @Mock + protected BlueprintsManager bm; + + protected ServerMock server; + + protected MockedStatic mockedBukkit; + protected MockedStatic mockedUtil; + + protected AutoCloseable closeable; + + @Mock + protected BukkitScheduler sch; + @Mock + protected LocalesManager lm; + + @Mock + protected PlaceholdersManager phm; + + + @BeforeEach + public void setUp() throws Exception { + MockitoAnnotations.openMocks(this); + // Processes the @Mock annotations and initializes the field + closeable = MockitoAnnotations.openMocks(this); + server = MockBukkit.mock(); + // Bukkit + // Set up plugin + WhiteBox.setInternalState(BentoBox.class, "instance", plugin); + + // Register the static mock + mockedBukkit = Mockito.mockStatic(Bukkit.class, Mockito.RETURNS_DEEP_STUBS); + mockedBukkit.when(Bukkit::getMinecraftVersion).thenReturn("1.21.10"); + mockedBukkit.when(Bukkit::getBukkitVersion).thenReturn(""); + mockedBukkit.when(Bukkit::getPluginManager).thenReturn(pim); + mockedBukkit.when(Bukkit::getItemFactory).thenReturn(itemFactory); + mockedBukkit.when(Bukkit::getServer).thenReturn(server); + // Location + when(location.getWorld()).thenReturn(world); + when(location.getBlockX()).thenReturn(0); + when(location.getBlockY()).thenReturn(0); + when(location.getBlockZ()).thenReturn(0); + when(location.toVector()).thenReturn(new Vector(0,0,0)); + when(location.clone()).thenReturn(location); // Paper + + // Players Manager and meta data + PlayersManager pm = mock(PlayersManager.class); + when(plugin.getPlayers()).thenReturn(pm); + Players players = mock(Players.class); + when(players.getMetaData()).thenReturn(Optional.empty()); + when(pm.getPlayer(any(UUID.class))).thenReturn(players); + + // Player + 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); + when(mockPlayer.spigot()).thenReturn(spigot); + when(mockPlayer.getType()).thenReturn(EntityType.PLAYER); + when(mockPlayer.getWorld()).thenReturn(world); + + User.setPlugin(plugin); + User.clearUsers(); + User.getInstance(mockPlayer); + + // IWM + when(plugin.getIWM()).thenReturn(iwm); + when(iwm.inWorld(any(Location.class))).thenReturn(true); + when(iwm.inWorld(any(World.class))).thenReturn(true); + when(iwm.getFriendlyName(any())).thenReturn("BSkyBlock"); + // Addon + when(iwm.getAddon(any())).thenReturn(Optional.empty()); + + // World Settings + WorldSettings worldSet = new TestWorldSettings(); + when(iwm.getWorldSettings(any())).thenReturn(worldSet); + + // Island Manager + when(plugin.getIslands()).thenReturn(im); + Optional optionalIsland = Optional.of(island); + when(im.getProtectedIslandAt(any())).thenReturn(optionalIsland); + + // Island - nothing is allowed by default + when(island.isAllowed(any())).thenReturn(false); + when(island.isAllowed(any(User.class), any())).thenReturn(false); + when(island.getOwner()).thenReturn(uuid); + when(island.getMemberSet()).thenReturn(ImmutableSet.of(uuid)); + + // Enable reporting from Flags class + MetadataValue mdv = new FixedMetadataValue(plugin, "_why_debug"); + when(mockPlayer.getMetadata(anyString())).thenReturn(Collections.singletonList(mdv)); + + // Locales & Placeholders + when(lm.get(any(), any())).thenAnswer((Answer) invocation -> invocation.getArgument(1, String.class)); + when(plugin.getPlaceholdersManager()).thenReturn(phm); + when(phm.replacePlaceholders(any(), any())).thenAnswer((Answer) invocation -> invocation.getArgument(1, String.class)); + when(plugin.getLocalesManager()).thenReturn(lm); + // Notifier + when(plugin.getNotifier()).thenReturn(notifier); + + // Fake players + world.bentobox.bentobox.Settings settings = new world.bentobox.bentobox.Settings(); + when(plugin.getSettings()).thenReturn(settings); + + //Util + mockedUtil = Mockito.mockStatic(Util.class, Mockito.CALLS_REAL_METHODS); + mockedUtil.when(() -> Util.getWorld(any())).thenReturn(mock(World.class)); + Util.setPlugin(plugin); + + // Util + mockedUtil.when(() -> Util.findFirstMatchingEnum(any(), any())).thenCallRealMethod(); + // Util translate color codes (used in user translate methods) + //mockedUtil.when(() -> translateColorCodes(anyString())).thenAnswer((Answer) invocation -> invocation.getArgument(0, String.class)); + + // Server & Scheduler + mockedBukkit.when(Bukkit::getScheduler).thenReturn(sch); + + // Hooks + when(hooksManager.getHook(anyString())).thenReturn(Optional.empty()); + when(plugin.getHooks()).thenReturn(hooksManager); + + // Blueprints Manager + when(plugin.getBlueprintsManager()).thenReturn(bm); + } + + /** + * @throws Exception + */ + @AfterEach + public void tearDown() throws Exception { + // IMPORTANT: Explicitly close the mock to prevent leakage + mockedBukkit.closeOnDemand(); + mockedUtil.closeOnDemand(); + closeable.close(); + MockBukkit.unmock(); + User.clearUsers(); + Mockito.framework().clearInlineMocks(); + deleteAll(new File("database")); + deleteAll(new File("database_backup")); + } + + protected static void deleteAll(File file) throws IOException { + if (file.exists()) { + Files.walk(file.toPath()).sorted(Comparator.reverseOrder()).map(Path::toFile).forEach(File::delete); + } + + } + + /** + * Check that spigot sent the message + * @param message - message to check + */ + public void checkSpigotMessage(String expectedMessage) { + checkSpigotMessage(expectedMessage, 1); + } + + @SuppressWarnings("deprecation") + public void checkSpigotMessage(String expectedMessage, int expectedOccurrences) { + // Capture the argument passed to spigot().sendMessage(...) if messages are sent + ArgumentCaptor captor = ArgumentCaptor.forClass(TextComponent.class); + + // Verify that sendMessage() was called at least 0 times (capture any sent messages) + verify(spigot, atLeast(0)).sendMessage(captor.capture()); + + // Get all captured TextComponents + List capturedMessages = captor.getAllValues(); + + // Count the number of occurrences of the expectedMessage in the captured messages + long actualOccurrences = capturedMessages.stream().map(component -> component.toLegacyText()) // Convert each TextComponent to plain text + .filter(messageText -> messageText.contains(expectedMessage)) // Check if the message contains the expected text + .count(); // Count how many times the expected message appears + + // Assert that the number of occurrences matches the expectedOccurrences + assertEquals(expectedOccurrences, + actualOccurrences, "Expected message occurrence mismatch: " + expectedMessage); + } + + /** + * Get the exploded event + * @param entity + * @param l + * @param list + * @return + */ + public EntityExplodeEvent getExplodeEvent(Entity entity, Location l, List list) { + //return new EntityExplodeEvent(entity, l, list, 0, null); + return new EntityExplodeEvent(entity, l, list, 0, null); + } + + public PlayerDeathEvent getPlayerDeathEvent(Player player, List drops, int droppedExp, int newExp, + int newTotalExp, int newLevel, @Nullable String deathMessage) { + //Technically this null is not allowed, but it works right now + return new PlayerDeathEvent(player, null, drops, droppedExp, newExp, + newTotalExp, newLevel, deathMessage); + } + +} diff --git a/src/test/java/world/bentobox/aoneblock/PlaceholdersManagerTest.java b/src/test/java/world/bentobox/aoneblock/PlaceholdersManagerTest.java index adf7e17e..c20a78d7 100644 --- a/src/test/java/world/bentobox/aoneblock/PlaceholdersManagerTest.java +++ b/src/test/java/world/bentobox/aoneblock/PlaceholdersManagerTest.java @@ -1,64 +1,42 @@ package world.bentobox.aoneblock; -import static org.junit.Assert.assertEquals; +import static org.junit.jupiter.api.Assertions.assertEquals; import static org.mockito.ArgumentMatchers.any; import static org.mockito.Mockito.when; import java.util.List; import java.util.Optional; -import java.util.UUID; -import org.bukkit.Location; -import org.bukkit.World; import org.eclipse.jdt.annotation.NonNull; -import org.eclipse.jdt.annotation.Nullable; -import org.junit.Before; -import org.junit.Test; -import org.junit.runner.RunWith; +import org.junit.jupiter.api.BeforeEach; +import org.junit.jupiter.api.Test; import org.mockito.Mock; -import org.powermock.modules.junit4.PowerMockRunner; import world.bentobox.aoneblock.dataobjects.OneBlockIslands; import world.bentobox.aoneblock.oneblocks.OneBlocksManager; import world.bentobox.bentobox.api.user.User; -import world.bentobox.bentobox.database.objects.Island; -import world.bentobox.bentobox.managers.IslandsManager; -import world.bentobox.bentobox.managers.PlaceholdersManager; /** * @author tastybento * */ -@RunWith(PowerMockRunner.class) -public class PlaceholdersManagerTest { +public class PlaceholdersManagerTest extends CommonTestSetup { @Mock private AOneBlock addon; @Mock private User user; - private UUID uuid = UUID.randomUUID(); - private AOneBlockPlaceholders pm; @Mock - private IslandsManager im; - @Mock - private Island island; - @Mock - private @Nullable Location location; - private @NonNull OneBlockIslands obi; - @Mock - private World world; - @Mock private OneBlocksManager obm; - private Settings settings; - @Mock - private PlaceholdersManager phm; /** * @throws java.lang.Exception */ - @Before + @Override + @BeforeEach public void setUp() throws Exception { + super.setUp(); // User when(user.getLocation()).thenReturn(location); when(user.getTranslation("aoneblock.placeholders.infinite")).thenReturn("Infinite"); @@ -71,7 +49,7 @@ public void setUp() throws Exception { when(im.getProtectedIslandAt(any())).thenReturn(Optional.of(island)); when(im.getIsland(world, user)).thenReturn(island); when(im.getIslands(world, user)).thenReturn(List.of(island)); - obi = new OneBlockIslands("uniqueId"); + @NonNull OneBlockIslands obi = new OneBlockIslands("uniqueId"); obi.setPhaseName("first"); obi.setBlockNumber(1000); when(addon.getOneBlocksIsland(any())).thenReturn(obi); @@ -80,7 +58,7 @@ public void setUp() throws Exception { when(obm.getPercentageDone(any(OneBlockIslands.class))).thenReturn(70D); when(obm.getNextPhaseBlocks(any(OneBlockIslands.class))).thenReturn(123); // Settings - settings = new Settings(); + Settings settings = new Settings(); when(addon.getSettings()).thenReturn(settings); // Island when(island.getOwner()).thenReturn(uuid); diff --git a/src/test/java/world/bentobox/aoneblock/SettingsTest.java b/src/test/java/world/bentobox/aoneblock/SettingsTest.java index e8b8a9a4..bdac14d6 100644 --- a/src/test/java/world/bentobox/aoneblock/SettingsTest.java +++ b/src/test/java/world/bentobox/aoneblock/SettingsTest.java @@ -1,28 +1,20 @@ package world.bentobox.aoneblock; -import static org.junit.Assert.assertEquals; -import static org.junit.Assert.assertFalse; -import static org.junit.Assert.assertTrue; +import static org.junit.jupiter.api.Assertions.assertEquals; +import static org.junit.jupiter.api.Assertions.assertFalse; +import static org.junit.jupiter.api.Assertions.assertTrue; import java.util.Collections; import java.util.List; import java.util.Map; -import org.bukkit.Bukkit; import org.bukkit.Difficulty; import org.bukkit.GameMode; -import org.bukkit.Registry; import org.bukkit.block.Biome; import org.bukkit.entity.EntityType; -import org.junit.After; -import org.junit.Before; -import org.junit.Ignore; -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.junit.jupiter.api.AfterEach; +import org.junit.jupiter.api.BeforeEach; +import org.junit.jupiter.api.Test; import world.bentobox.aoneblock.listeners.BlockListener; @@ -30,26 +22,27 @@ * @author tastybento * */ -@RunWith(PowerMockRunner.class) -@PrepareForTest({ Bukkit.class, Biome.class, Registry.class }) -public class SettingsTest { +public class SettingsTest extends CommonTestSetup { private Settings s; /** * @throws java.lang.Exception */ - @Before + @Override + @BeforeEach public void setUp() throws Exception { - PowerMockito.mockStatic(Bukkit.class, Mockito.RETURNS_MOCKS); + super.setUp(); s = new Settings(); } /** * @throws java.lang.Exception */ - @After + @Override + @AfterEach public void tearDown() throws Exception { + super.tearDown(); } /** @@ -702,7 +695,7 @@ public void testSetWorldFlags() { @Test public void testSetDefaultIslandFlagNames() { s.setDefaultIslandFlagNames(Map.of("TEST", 500)); - assertTrue(s.getDefaultIslandFlagNames().get("TEST") == 500); + assertEquals(500, (int) s.getDefaultIslandFlagNames().get("TEST")); } /** @@ -711,7 +704,7 @@ public void testSetDefaultIslandFlagNames() { @Test public void testSetDefaultIslandSettingNames() { s.setDefaultIslandSettingNames(Map.of("SETTING", 456)); - assertTrue(s.getDefaultIslandSettingNames().get("SETTING") == 456); + assertEquals(456, (int) s.getDefaultIslandSettingNames().get("SETTING")); } /** @@ -1012,7 +1005,7 @@ public void testIsWaterUnsafe() { * Test method for {@link world.bentobox.aoneblock.Settings#getDefaultBiome()}. */ @Test - @Ignore("Need to solve Biome enum issue") + //@Ignore("Need to solve Biome enum issue") public void testGetDefaultBiome() { assertEquals(Biome.PLAINS, s.getDefaultBiome()); } @@ -1021,7 +1014,7 @@ public void testGetDefaultBiome() { * Test method for {@link world.bentobox.aoneblock.Settings#setDefaultBiome(org.bukkit.block.Biome)}. */ @Test - @Ignore("Need to solve Biome enum issue") + //@Ignore("Need to solve Biome enum issue") public void testSetDefaultBiome() { assertEquals(Biome.PLAINS, s.getDefaultBiome()); s.setDefaultBiome(Biome.BAMBOO_JUNGLE); @@ -1281,8 +1274,6 @@ public void testSetPasteMissingIslands() { assertFalse(s.isPasteMissingIslands()); s.setPasteMissingIslands(true); assertTrue(s.isPasteMissingIslands()); - - } /** @@ -1533,7 +1524,7 @@ public void testGetMobLimitSettings() { @Test public void testSetMobLimitSettings() { s.setMobLimitSettings(List.of("test")); - assertEquals("test", s.getMobLimitSettings().get(0)); + assertEquals("test", s.getMobLimitSettings().getFirst()); } /** @@ -1559,7 +1550,6 @@ public void testSetDropOnTop() { * Test method for {@link world.bentobox.aoneblock.Settings#getDefaultNetherBiome()}. */ @Test - @Ignore("Biome enum conversion") public void testGetDefaultNetherBiome() { assertEquals(Biome.NETHER_WASTES, s.getDefaultNetherBiome()); } @@ -1568,7 +1558,6 @@ public void testGetDefaultNetherBiome() { * Test method for {@link world.bentobox.aoneblock.Settings#setDefaultNetherBiome(org.bukkit.block.Biome)}. */ @Test - @Ignore("Biome enum conversion") public void testSetDefaultNetherBiome() { assertEquals(Biome.NETHER_WASTES, s.getDefaultNetherBiome()); s.setDefaultNetherBiome(Biome.BADLANDS); @@ -1579,7 +1568,6 @@ public void testSetDefaultNetherBiome() { * Test method for {@link world.bentobox.aoneblock.Settings#getDefaultEndBiome()}. */ @Test - @Ignore("Biome enum conversion") public void testGetDefaultEndBiome() { assertEquals(Biome.THE_END, s.getDefaultEndBiome()); } @@ -1588,7 +1576,6 @@ public void testGetDefaultEndBiome() { * Test method for {@link world.bentobox.aoneblock.Settings#setDefaultEndBiome(org.bukkit.block.Biome)}. */ @Test - @Ignore("Biome enum conversion") public void testSetDefaultEndBiome() { assertEquals(Biome.THE_END, s.getDefaultEndBiome()); s.setDefaultEndBiome(Biome.BADLANDS); diff --git a/src/test/java/world/bentobox/aoneblock/TestWorldSettings.java b/src/test/java/world/bentobox/aoneblock/TestWorldSettings.java new file mode 100644 index 00000000..b6b3a1ae --- /dev/null +++ b/src/test/java/world/bentobox/aoneblock/TestWorldSettings.java @@ -0,0 +1,409 @@ +package world.bentobox.aoneblock; + +import java.util.Collections; +import java.util.List; +import java.util.Map; +import java.util.Set; + +import org.bukkit.Difficulty; +import org.bukkit.GameMode; +import org.bukkit.entity.EntityType; +import org.eclipse.jdt.annotation.NonNull; + +import world.bentobox.bentobox.api.configuration.WorldSettings; +import world.bentobox.bentobox.api.flags.Flag; + +/** + * Class for tests that require world settings + * @author tastybento + * + */ +public class TestWorldSettings implements WorldSettings { + + private long epoch; + + @Override + public GameMode getDefaultGameMode() { + + return GameMode.SURVIVAL; + } + + @Override + public Map getDefaultIslandFlags() { + + return Collections.emptyMap(); + } + + @Override + public Map getDefaultIslandSettings() { + + return Collections.emptyMap(); + } + + @Override + public Difficulty getDifficulty() { + + return Difficulty.EASY; + } + + @Override + public void setDifficulty(Difficulty difficulty) { + + + } + + @Override + public String getFriendlyName() { + + return "friendly_name"; + } + + @Override + public int getIslandDistance() { + + return 0; + } + + @Override + public int getIslandHeight() { + + return 0; + } + + @Override + public int getIslandProtectionRange() { + + return 0; + } + + @Override + public int getIslandStartX() { + + return 0; + } + + @Override + public int getIslandStartZ() { + + return 0; + } + + @Override + public int getIslandXOffset() { + + return 0; + } + + @Override + public int getIslandZOffset() { + + return 0; + } + + @Override + public List getIvSettings() { + + return Collections.emptyList(); + } + + @Override + public int getMaxHomes() { + + return 3; + } + + @Override + public int getMaxIslands() { + + return 0; + } + + @Override + public int getMaxTeamSize() { + + return 4; + } + + @Override + public int getNetherSpawnRadius() { + + return 10; + } + + @Override + public String getPermissionPrefix() { + + return "perm."; + } + + @Override + public Set getRemoveMobsWhitelist() { + + return Collections.emptySet(); + } + + @Override + public int getSeaHeight() { + + return 0; + } + + @Override + public List getHiddenFlags() { + + return Collections.emptyList(); + } + + @Override + public List getVisitorBannedCommands() { + + return Collections.emptyList(); + } + + @Override + public Map getWorldFlags() { + + return Collections.emptyMap(); + } + + @Override + public String getWorldName() { + + return "world_name"; + } + + @Override + public boolean isDragonSpawn() { + + return false; + } + + @Override + public boolean isEndGenerate() { + + return true; + } + + @Override + public boolean isEndIslands() { + + return true; + } + + @Override + public boolean isNetherGenerate() { + + return true; + } + + @Override + public boolean isNetherIslands() { + + return true; + } + + @Override + public boolean isOnJoinResetEnderChest() { + + return false; + } + + @Override + public boolean isOnJoinResetInventory() { + + return false; + } + + @Override + public boolean isOnJoinResetMoney() { + + return false; + } + + @Override + public boolean isOnJoinResetHealth() { + + return false; + } + + @Override + public boolean isOnJoinResetHunger() { + + return false; + } + + @Override + public boolean isOnJoinResetXP() { + + return false; + } + + @Override + public @NonNull List getOnJoinCommands() { + + return Collections.emptyList(); + } + + @Override + public boolean isOnLeaveResetEnderChest() { + + return false; + } + + @Override + public boolean isOnLeaveResetInventory() { + + return false; + } + + @Override + public boolean isOnLeaveResetMoney() { + + return false; + } + + @Override + public boolean isOnLeaveResetHealth() { + + return false; + } + + @Override + public boolean isOnLeaveResetHunger() { + + return false; + } + + @Override + public boolean isOnLeaveResetXP() { + + return false; + } + + @Override + public @NonNull List getOnLeaveCommands() { + + return Collections.emptyList(); + } + + @Override + public boolean isUseOwnGenerator() { + + return false; + } + + @Override + public boolean isWaterUnsafe() { + + return false; + } + + @Override + public List getGeoLimitSettings() { + + return Collections.emptyList(); + } + + @Override + public int getResetLimit() { + + return 0; + } + + @Override + public long getResetEpoch() { + + return epoch; + } + + @Override + public void setResetEpoch(long timestamp) { + this.epoch = timestamp; + + } + + @Override + public boolean isTeamJoinDeathReset() { + + return false; + } + + @Override + public int getDeathsMax() { + + return 0; + } + + @Override + public boolean isDeathsCounted() { + + return true; + } + + @Override + public boolean isDeathsResetOnNewIsland() { + + return true; + } + + @Override + public boolean isAllowSetHomeInNether() { + + return false; + } + + @Override + public boolean isAllowSetHomeInTheEnd() { + + return false; + } + + @Override + public boolean isRequireConfirmationToSetHomeInNether() { + + return false; + } + + @Override + public boolean isRequireConfirmationToSetHomeInTheEnd() { + + return false; + } + + @Override + public int getBanLimit() { + + return 10; + } + + @Override + public boolean isLeaversLoseReset() { + + return true; + } + + @Override + public boolean isKickedKeepInventory() { + + return true; + } + + @Override + public boolean isCreateIslandOnFirstLoginEnabled() { + + return false; + } + + @Override + public int getCreateIslandOnFirstLoginDelay() { + + return 0; + } + + @Override + public boolean isCreateIslandOnFirstLoginAbortOnLogout() { + + return false; + } + +} diff --git a/src/test/java/world/bentobox/aoneblock/WhiteBox.java b/src/test/java/world/bentobox/aoneblock/WhiteBox.java new file mode 100644 index 00000000..a65316cd --- /dev/null +++ b/src/test/java/world/bentobox/aoneblock/WhiteBox.java @@ -0,0 +1,26 @@ +package world.bentobox.aoneblock; + +public class WhiteBox { + /** + * Sets the value of a private static field using Java Reflection. + * @param targetClass The class containing the static field. + * @param fieldName The name of the private static field. + * @param value The value to set the field to. + */ + public static void setInternalState(Class targetClass, String fieldName, Object value) { + try { + // 1. Get the Field object from the class + java.lang.reflect.Field field = targetClass.getDeclaredField(fieldName); + + // 2. Make the field accessible (required for private fields) + field.setAccessible(true); + + // 3. Set the new value. The first argument is 'null' for static fields. + field.set(null, value); + + } catch (NoSuchFieldException | IllegalAccessException e) { + // Wrap reflection exceptions in a runtime exception for clarity + throw new RuntimeException("Failed to set static field '" + fieldName + "' on class " + targetClass.getName(), e); + } + } +} diff --git a/src/test/java/world/bentobox/aoneblock/commands/island/IslandActionBarCommandTest.java b/src/test/java/world/bentobox/aoneblock/commands/island/IslandActionBarCommandTest.java new file mode 100644 index 00000000..5cc35687 --- /dev/null +++ b/src/test/java/world/bentobox/aoneblock/commands/island/IslandActionBarCommandTest.java @@ -0,0 +1,94 @@ +package world.bentobox.aoneblock.commands.island; + +import static org.junit.jupiter.api.Assertions.assertEquals; +import static org.junit.jupiter.api.Assertions.assertNotNull; +import static org.junit.jupiter.api.Assertions.assertTrue; +import static org.mockito.ArgumentMatchers.any; +import static org.mockito.ArgumentMatchers.eq; +import static org.mockito.Mockito.verify; +import static org.mockito.Mockito.when; + +import java.util.List; + +import org.junit.jupiter.api.AfterEach; +import org.junit.jupiter.api.BeforeEach; +import org.junit.jupiter.api.Test; +import org.mockito.Mock; + +import world.bentobox.aoneblock.AOneBlock; +import world.bentobox.aoneblock.CommonTestSetup; +import world.bentobox.aoneblock.Settings; +import world.bentobox.bentobox.api.commands.CompositeCommand; +import world.bentobox.bentobox.api.user.User; + +/** + * Test class + */ +class IslandActionBarCommandTest extends CommonTestSetup { + + @Mock + private CompositeCommand ac; + + @Mock + private User user; + @Mock + private AOneBlock addon; + + private IslandActionBarCommand abc; + + + /** + * @throws java.lang.Exception + */ + @Override + @BeforeEach + public void setUp() throws Exception { + super.setUp(); + + // Settings + Settings settings = new Settings(); + when(addon.getSettings()).thenReturn(settings); + + abc = new IslandActionBarCommand(ac, settings.getActionBarCommand().split(" ")[0], + settings.getActionBarCommand().split(" ")); + } + + /** + * @throws java.lang.Exception + */ + @Override + @AfterEach + public void tearDown() throws Exception { + super.tearDown(); + } + + /** + * Test method for {@link world.bentobox.aoneblock.commands.island.IslandActionBarCommand#IslandActionBarCommand(world.bentobox.bentobox.api.commands.CompositeCommand, java.lang.String, java.lang.String[])}. + */ + @Test + void testIslandActionBarCommand() { + assertNotNull(abc); + } + + /** + * Test method for {@link world.bentobox.aoneblock.commands.island.IslandActionBarCommand#setup()}. + */ + @Test + void testSetup() { + assertEquals("island.actionbar", abc.getPermission()); + assertEquals("aoneblock.commands.island.actionbar.description", abc.getDescription()); + assertTrue(abc.isOnlyPlayer()); + } + + /** + * Test method for {@link world.bentobox.aoneblock.commands.island.IslandActionBarCommand#execute(world.bentobox.bentobox.api.user.User, java.lang.String, java.util.List)}. + */ + @Test + void testExecuteUserStringListOfString() { + abc.execute(user, "", List.of()); + verify(user).getMetaData("aoneblock.actionbar"); + verify(user).putMetaData(eq("aoneblock.actionbar"), any()); + verify(user).sendMessage("aoneblock.commands.island.actionbar.status_off"); + } + +} diff --git a/src/test/java/world/bentobox/aoneblock/commands/island/IslandBossBarCommandTest.java b/src/test/java/world/bentobox/aoneblock/commands/island/IslandBossBarCommandTest.java new file mode 100644 index 00000000..e2378339 --- /dev/null +++ b/src/test/java/world/bentobox/aoneblock/commands/island/IslandBossBarCommandTest.java @@ -0,0 +1,104 @@ +package world.bentobox.aoneblock.commands.island; + +import static org.junit.jupiter.api.Assertions.assertEquals; +import static org.junit.jupiter.api.Assertions.assertNotNull; +import static org.junit.jupiter.api.Assertions.assertTrue; +import static org.mockito.Mockito.verify; +import static org.mockito.Mockito.when; + +import java.util.List; +import java.util.Optional; + +import org.junit.jupiter.api.AfterEach; +import org.junit.jupiter.api.BeforeEach; +import org.junit.jupiter.api.Test; +import org.mockito.Mock; + +import world.bentobox.aoneblock.AOneBlock; +import world.bentobox.aoneblock.CommonTestSetup; +import world.bentobox.aoneblock.Settings; +import world.bentobox.aoneblock.listeners.BossBarListener; +import world.bentobox.bentobox.api.commands.CompositeCommand; +import world.bentobox.bentobox.api.user.User; + +/** + * Test class + */ +class IslandBossBarCommandTest extends CommonTestSetup { + + @Mock + private CompositeCommand ac; + + @Mock + private User user; + @Mock + private AOneBlock addon; + + private IslandBossBarCommand bbc; + + @Mock + private BossBarListener bb; + + + /** + * @throws java.lang.Exception + */ + @Override + @BeforeEach + public void setUp() throws Exception { + super.setUp(); + + when(ac.getAddon()).thenReturn(addon); + + when(addon.getBossBar()).thenReturn(bb); + + when(user.getLocation()).thenReturn(location); + + when(im.getIslandAt(location)).thenReturn(Optional.of(island)); + + // Settings + Settings settings = new Settings(); + when(addon.getSettings()).thenReturn(settings); + + bbc = new IslandBossBarCommand(ac, settings.getBossBarCommand().split(" ")[0], + settings.getBossBarCommand().split(" ")); + } + + /** + * @throws java.lang.Exception + */ + @Override + @AfterEach + public void tearDown() throws Exception { + super.tearDown(); + } + + /** + * Test method for {@link world.bentobox.aoneblock.commands.island.IslandBossBarCommand#IslandBossBarCommand(world.bentobox.bentobox.api.commands.CompositeCommand, java.lang.String, java.lang.String[])}. + */ + @Test + void testIslandBossBarCommand() { + assertNotNull(bbc); + } + + /** + * Test method for {@link world.bentobox.aoneblock.commands.island.IslandBossBarCommand#setup()}. + */ + @Test + void testSetup() { + assertEquals("island.bossbar", bbc.getPermission()); + assertEquals("aoneblock.commands.island.bossbar.description", bbc.getDescription()); + assertTrue(bbc.isOnlyPlayer()); + } + + /** + * Test method for {@link world.bentobox.aoneblock.commands.island.IslandBossBarCommand#execute(world.bentobox.bentobox.api.user.User, java.lang.String, java.util.List)}. + */ + @Test + void testExecuteUserStringListOfString() { + bbc.execute(user, "", List.of()); + verify(bb).toggleUser(user); + verify(user).sendMessage("aoneblock.bossbar.not-active"); + } + +} diff --git a/src/test/java/world/bentobox/aoneblock/commands/island/IslandPhasesCommandTest.java b/src/test/java/world/bentobox/aoneblock/commands/island/IslandPhasesCommandTest.java new file mode 100644 index 00000000..c52c4d5c --- /dev/null +++ b/src/test/java/world/bentobox/aoneblock/commands/island/IslandPhasesCommandTest.java @@ -0,0 +1,101 @@ +package world.bentobox.aoneblock.commands.island; + +import static org.junit.jupiter.api.Assertions.assertEquals; +import static org.junit.jupiter.api.Assertions.assertNotNull; +import static org.junit.jupiter.api.Assertions.assertTrue; +import static org.mockito.Mockito.verify; +import static org.mockito.Mockito.when; + +import java.util.List; +import java.util.TreeMap; + +import org.junit.jupiter.api.AfterEach; +import org.junit.jupiter.api.BeforeEach; +import org.junit.jupiter.api.Test; +import org.mockito.Mock; + +import world.bentobox.aoneblock.AOneBlock; +import world.bentobox.aoneblock.CommonTestSetup; +import world.bentobox.aoneblock.Settings; +import world.bentobox.aoneblock.oneblocks.OneBlocksManager; +import world.bentobox.bentobox.api.addons.AddonDescription; +import world.bentobox.bentobox.api.commands.CompositeCommand; +import world.bentobox.bentobox.api.localization.TextVariables; +import world.bentobox.bentobox.api.user.User; + +/** + * Test class + */ +class IslandPhasesCommandTest extends CommonTestSetup { + + @Mock + private CompositeCommand ac; + @Mock + private User user; + @Mock + private AOneBlock addon; + @Mock + private OneBlocksManager obm; + + private IslandPhasesCommand ipc; + + /** + * @throws java.lang.Exception + */ + @Override + @BeforeEach + public void setUp() throws Exception { + super.setUp(); + when(ac.getAddon()).thenReturn(addon); + when(obm.getBlockProbs()).thenReturn(new TreeMap<>()); + when(addon.getOneBlockManager()).thenReturn(obm); + when(addon.getIslandsManager()).thenReturn(im); + AddonDescription desc = new AddonDescription.Builder("name", "", "").build(); + when(addon.getDescription()).thenReturn(desc); + + // Settings + Settings settings = new Settings(); + when(addon.getSettings()).thenReturn(settings); + ipc = new IslandPhasesCommand(ac, settings.getPhasesCommand().split(" ")[0], + settings.getPhasesCommand().split(" ")); + } + + /** + * @throws java.lang.Exception + */ + @Override + @AfterEach + public void tearDown() throws Exception { + super.tearDown(); + } + + /** + * Test method for {@link world.bentobox.aoneblock.commands.island.IslandPhasesCommand#IslandPhasesCommand(world.bentobox.bentobox.api.commands.CompositeCommand, java.lang.String, java.lang.String[])}. + */ + @Test + void testIslandPhasesCommand() { + assertNotNull(ipc); + } + + /** + * Test method for {@link world.bentobox.aoneblock.commands.island.IslandPhasesCommand#setup()}. + */ + @Test + void testSetup() { + assertEquals("phases", ipc.getPermission()); + assertEquals("aoneblock.commands.phases.description", ipc.getDescription()); + assertTrue(ipc.isOnlyPlayer()); + } + + /** + * Test method for {@link world.bentobox.aoneblock.commands.island.IslandPhasesCommand#execute(world.bentobox.bentobox.api.user.User, java.lang.String, java.util.List)}. + */ + @Test + void testExecuteUserStringListOfString() { + ipc.execute(user, "", List.of()); + verify(addon).logError("There are no available phases for selection!"); + verify(user).sendMessage("no-phases", + TextVariables.GAMEMODE, this.addon.getDescription().getName()); + } + +} diff --git a/src/test/java/world/bentobox/aoneblock/commands/island/IslandRespawnBlockCommandTest.java b/src/test/java/world/bentobox/aoneblock/commands/island/IslandRespawnBlockCommandTest.java new file mode 100644 index 00000000..958164aa --- /dev/null +++ b/src/test/java/world/bentobox/aoneblock/commands/island/IslandRespawnBlockCommandTest.java @@ -0,0 +1,160 @@ +package world.bentobox.aoneblock.commands.island; + +import static org.junit.jupiter.api.Assertions.assertEquals; +import static org.junit.jupiter.api.Assertions.assertFalse; +import static org.junit.jupiter.api.Assertions.assertNotNull; +import static org.junit.jupiter.api.Assertions.assertTrue; +import static org.mockito.ArgumentMatchers.any; +import static org.mockito.ArgumentMatchers.anyString; +import static org.mockito.ArgumentMatchers.eq; +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.List; + +import org.bukkit.Material; +import org.bukkit.Particle; +import org.bukkit.World; +import org.bukkit.block.Block; +import org.bukkit.util.Vector; +import org.jetbrains.annotations.NotNull; +import org.junit.jupiter.api.AfterEach; +import org.junit.jupiter.api.BeforeEach; +import org.junit.jupiter.api.Test; +import org.mockito.Mock; + +import world.bentobox.aoneblock.AOneBlock; +import world.bentobox.aoneblock.CommonTestSetup; +import world.bentobox.aoneblock.Settings; +import world.bentobox.bentobox.api.commands.CompositeCommand; +import world.bentobox.bentobox.api.user.User; +import world.bentobox.bentobox.util.Util; + +/** + * Test class + */ +class IslandRespawnBlockCommandTest extends CommonTestSetup { + + @Mock + private CompositeCommand ac; + @Mock + private User user; + @Mock + private AOneBlock addon; + private IslandRespawnBlockCommand rbc; + @Mock + private @NotNull Block block; + + /** + * @throws java.lang.Exception + */ + @BeforeEach + public void setUp() throws Exception { + super.setUp(); + when(ac.getAddon()).thenReturn(addon); + when(ac.getWorld()).thenReturn(world); + when(user.getWorld()).thenReturn(world); + mockedUtil.when(() -> Util.sameWorld(any(World.class), any(World.class))).thenReturn(true); + // User has island + when(im.getIsland(world, user)).thenReturn(island); + // Island center block + when(island.getWorld()).thenReturn(world); + when(island.getCenter()).thenReturn(location); + when(location.getBlock()).thenReturn(block); + when(block.getType()).thenReturn(Material.BEDROCK); + when(location.add(any(Vector.class))).thenReturn(location); + + Settings settings = new Settings(); + when(addon.getSettings()).thenReturn(settings); + rbc = new IslandRespawnBlockCommand(ac, settings.getRespawnBlockCommand().split(" ")[0], + settings.getRespawnBlockCommand().split(" ")); + } + + /** + * @throws java.lang.Exception + */ + @AfterEach + public void tearDown() throws Exception { + super.tearDown(); + } + + /** + * Test method for {@link world.bentobox.aoneblock.commands.island.IslandRespawnBlockCommand#IslandRespawnBlockCommand(world.bentobox.bentobox.api.commands.CompositeCommand, java.lang.String, java.lang.String[])}. + */ + @Test + void testIslandRespawnBlockCommand() { + assertNotNull(rbc); + } + + /** + * Test method for {@link world.bentobox.aoneblock.commands.island.IslandRespawnBlockCommand#setup()}. + */ + @Test + void testSetup() { + assertEquals("respawn-block", rbc.getPermission()); + assertEquals("aoneblock.commands.respawn-block.description", rbc.getDescription()); + assertTrue(rbc.isOnlyPlayer()); + } + + /** + * Test method for {@link world.bentobox.aoneblock.commands.island.IslandRespawnBlockCommand#canExecute(world.bentobox.bentobox.api.user.User, java.lang.String, java.util.List)}. + */ + @Test + void testCanExecute() { + assertTrue(rbc.canExecute(user, "", List.of())); + verify(user, never()).sendMessage(anyString()); + } + /** + * Test method for {@link world.bentobox.aoneblock.commands.island.IslandRespawnBlockCommand#canExecute(world.bentobox.bentobox.api.user.User, java.lang.String, java.util.List)}. + */ + @Test + void testCanExecuteWrongWorld() { + mockedUtil.when(() -> Util.sameWorld(any(World.class), any(World.class))).thenReturn(false); + assertFalse(rbc.canExecute(user, "", List.of())); + verify(user).sendMessage("general.errors.wrong-world"); + } + + /** + * Test method for {@link world.bentobox.aoneblock.commands.island.IslandRespawnBlockCommand#canExecute(world.bentobox.bentobox.api.user.User, java.lang.String, java.util.List)}. + */ + @Test + void testCanExecuteNoIsland() { + when(im.getIsland(world, user)).thenReturn(null); + assertFalse(rbc.canExecute(user, "", List.of())); + verify(user).sendMessage("general.errors.no-island"); + } + + /** + * Test method for {@link world.bentobox.aoneblock.commands.island.IslandRespawnBlockCommand#execute(world.bentobox.bentobox.api.user.User, java.lang.String, java.util.List)}. + */ + @Test + void testExecuteUserStringListOfString() { + // when(block.getType()).thenReturn(Material.STONE); + rbc.execute(user, "", List.of()); + verify(user).sendMessage("aoneblock.commands.respawn-block.block-respawned"); + } + + /** + * Test method for {@link world.bentobox.aoneblock.commands.island.IslandRespawnBlockCommand#execute(world.bentobox.bentobox.api.user.User, java.lang.String, java.util.List)}. + */ + @Test + void testExecuteUserStringListOfStringAir() { + when(block.getType()).thenReturn(Material.AIR); + rbc.execute(user, "", List.of()); + verify(user).sendMessage("aoneblock.commands.respawn-block.block-respawned"); + } + + /** + * Test method for {@link world.bentobox.aoneblock.commands.island.IslandRespawnBlockCommand#execute(world.bentobox.bentobox.api.user.User, java.lang.String, java.util.List)}. + */ + @Test + void testExecuteUserStringListOfStringSomething() { + when(block.getType()).thenReturn(Material.STONE); + rbc.execute(user, "", List.of()); + verify(user).sendMessage("aoneblock.commands.respawn-block.block-exist"); + verify(world, times(18)).spawnParticle(eq(Particle.DUST), eq(location), eq(5), eq(0.1), eq(0.0d), eq(0.1), eq(1.0d), any()); + } + +} diff --git a/src/test/java/world/bentobox/aoneblock/commands/island/IslandSetCountCommandTest.java b/src/test/java/world/bentobox/aoneblock/commands/island/IslandSetCountCommandTest.java index 58e50193..ff63e114 100644 --- a/src/test/java/world/bentobox/aoneblock/commands/island/IslandSetCountCommandTest.java +++ b/src/test/java/world/bentobox/aoneblock/commands/island/IslandSetCountCommandTest.java @@ -1,9 +1,9 @@ package world.bentobox.aoneblock.commands.island; -import static org.junit.Assert.assertEquals; -import static org.junit.Assert.assertFalse; -import static org.junit.Assert.assertNotNull; -import static org.junit.Assert.assertTrue; +import static org.junit.jupiter.api.Assertions.assertEquals; +import static org.junit.jupiter.api.Assertions.assertFalse; +import static org.junit.jupiter.api.Assertions.assertNotNull; +import static org.junit.jupiter.api.Assertions.assertTrue; import static org.mockito.ArgumentMatchers.any; import static org.mockito.ArgumentMatchers.anyInt; import static org.mockito.ArgumentMatchers.anyString; @@ -11,212 +11,165 @@ 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.HashMap; import java.util.List; import java.util.UUID; import java.util.concurrent.CompletableFuture; -import org.bukkit.Bukkit; -import org.bukkit.World; import org.bukkit.entity.EntityType; -import org.bukkit.entity.Player; import org.eclipse.jdt.annotation.NonNull; -import org.eclipse.jdt.annotation.Nullable; -import org.junit.After; -import org.junit.Before; -import org.junit.BeforeClass; -import org.junit.Test; -import org.junit.runner.RunWith; +import org.junit.jupiter.api.AfterEach; +import org.junit.jupiter.api.BeforeEach; +import org.junit.jupiter.api.Test; import org.mockito.Mock; +import org.mockito.MockedStatic; 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.aoneblock.AOneBlock; +import world.bentobox.aoneblock.CommonTestSetup; import world.bentobox.aoneblock.Settings; +import world.bentobox.aoneblock.WhiteBox; import world.bentobox.aoneblock.dataobjects.OneBlockIslands; import world.bentobox.aoneblock.listeners.BlockListener; import world.bentobox.aoneblock.oneblocks.OneBlockObject; -import world.bentobox.bentobox.BentoBox; 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.AbstractDatabaseHandler; import world.bentobox.bentobox.database.DatabaseSetup; -import world.bentobox.bentobox.database.objects.Island; 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.RanksManager; /** * @author tastybento * */ -@RunWith(PowerMockRunner.class) -@PrepareForTest({ Bukkit.class, BentoBox.class, User.class, DatabaseSetup.class, RanksManager.class }) -public class IslandSetCountCommandTest { - @Mock - private BentoBox plugin; - @Mock - private CompositeCommand ac; - @Mock - private User user; - @Mock - private LocalesManager lm; - @Mock - private AOneBlock addon; - private UUID uuid; - @Mock - private World world; - @Mock - private IslandsManager im; - @Mock - private @Nullable Island island; - @Mock - private IslandWorldManager iwm; - private IslandSetCountCommand iscc; - @Mock - private BlockListener bl; +public class IslandSetCountCommandTest extends CommonTestSetup { @Mock - private RanksManager rm; - - private @NonNull OneBlockIslands oneBlockIsland = new OneBlockIslands(UUID.randomUUID().toString()); + private CompositeCommand ac; - private static AbstractDatabaseHandler h; + @Mock + private User user; + @Mock + private AOneBlock addon; + private IslandSetCountCommand iscc; + @Mock + private BlockListener bl; + @Mock + private RanksManager rm; - @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)); - } + private final @NonNull OneBlockIslands oneBlockIsland = new OneBlockIslands(UUID.randomUUID().toString()); - @After - public void tearDown() throws IOException { - User.clearUsers(); - 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); - } + @Override + @AfterEach + public void tearDown() throws Exception { + super.tearDown(); + deleteAll(new File("database")); + deleteAll(new File("database_backup")); + } - } + /** + * @throws java.lang.Exception + */ + @SuppressWarnings("unchecked") + @Override + @BeforeEach + public void setUp() throws Exception { + super.setUp(); + AbstractDatabaseHandler h = mock(AbstractDatabaseHandler.class); + // Database + MockedStatic mockedDb = Mockito.mockStatic(DatabaseSetup.class); + DatabaseSetup dbSetup = mock(DatabaseSetup.class); + mockedDb.when(DatabaseSetup::getDatabase).thenReturn(dbSetup); + when(dbSetup.getHandler(any())).thenReturn(h); + when(h.saveObject(any())).thenReturn(CompletableFuture.completedFuture(true)); - /** - * @throws java.lang.Exception - */ - @Before - public void setUp() throws Exception { - // Set up plugin - BentoBox plugin = mock(BentoBox.class); - Whitebox.setInternalState(BentoBox.class, "instance", plugin); // Set up RanksManager - Whitebox.setInternalState(RanksManager.class, "instance", rm); - - // Command manager - CommandsManager cm = mock(CommandsManager.class); - when(plugin.getCommandsManager()).thenReturn(cm); - - // Player - Player p = mock(Player.class); - // Sometimes use Mockito.withSettings().verboseLogging() - when(user.isOp()).thenReturn(false); - when(user.getPermissionValue(anyString(), anyInt())).thenReturn(4); - when(user.getWorld()).thenReturn(world); - uuid = UUID.randomUUID(); - when(user.getUniqueId()).thenReturn(uuid); - when(user.getPlayer()).thenReturn(p); - when(user.getName()).thenReturn("tastybento"); - when(user.getTranslation(any())).thenAnswer(invocation -> invocation.getArgument(0, String.class)); - User.setPlugin(plugin); - - // Parent command has no aliases - when(ac.getSubCommandAliases()).thenReturn(new HashMap<>()); - when(ac.getWorld()).thenReturn(world); - when(ac.getAddon()).thenReturn(addon); - - // Islands - when(plugin.getIslands()).thenReturn(im); - when(im.getIsland(world, user)).thenReturn(island); - when(im.hasIsland(world, user)).thenReturn(true); - when(im.inTeam(world, uuid)).thenReturn(true); - when(island.getRankCommand(anyString())).thenReturn(RanksManager.OWNER_RANK); - when(island.getRank(user)).thenReturn(RanksManager.MEMBER_RANK); - - // IWM - when(plugin.getIWM()).thenReturn(iwm); - when(iwm.getPermissionPrefix(any())).thenReturn("bskyblock."); - - // Settings - Settings settings = new Settings(); - when(addon.getSettings()).thenReturn(settings); - - // BlockListener - when(addon.getBlockListener()).thenReturn(bl); - when(bl.getIsland(island)).thenReturn(oneBlockIsland); - - // DUT - iscc = new IslandSetCountCommand(this.ac, settings.getSetCountCommand().split(" ")[0], - settings.getSetCountCommand().split(" ")); - } + WhiteBox.setInternalState(RanksManager.class, "instance", rm); + + // Command manager + CommandsManager cm = mock(CommandsManager.class); + when(plugin.getCommandsManager()).thenReturn(cm); + + // Player + // Sometimes use Mockito.withSettings().verboseLogging() + when(user.isOp()).thenReturn(false); + when(user.getPermissionValue(anyString(), anyInt())).thenReturn(4); + when(user.getWorld()).thenReturn(world); + uuid = UUID.randomUUID(); + when(user.getUniqueId()).thenReturn(uuid); + when(user.getPlayer()).thenReturn(mockPlayer); + when(user.getName()).thenReturn("tastybento"); + when(user.getTranslation(any())).thenAnswer(invocation -> invocation.getArgument(0, String.class)); + User.setPlugin(plugin); + + // Parent command has no aliases + when(ac.getSubCommandAliases()).thenReturn(new HashMap<>()); + when(ac.getWorld()).thenReturn(world); + when(ac.getAddon()).thenReturn(addon); + + // Islands + //when(plugin.getIslands()).thenReturn(im); + when(im.getIsland(world, user)).thenReturn(island); + when(im.hasIsland(world, user)).thenReturn(true); + when(im.inTeam(world, uuid)).thenReturn(true); + when(island.getRankCommand(anyString())).thenReturn(RanksManager.OWNER_RANK); + when(island.getRank(user)).thenReturn(RanksManager.MEMBER_RANK); + + // IWM + //when(plugin.getIWM()).thenReturn(iwm); + when(iwm.getPermissionPrefix(any())).thenReturn("bskyblock."); + + // Settings + Settings settings = new Settings(); + when(addon.getSettings()).thenReturn(settings); + + // BlockListener + when(addon.getBlockListener()).thenReturn(bl); + when(bl.getIsland(island)).thenReturn(oneBlockIsland); + + // DUT + iscc = new IslandSetCountCommand(this.ac, settings.getSetCountCommand().split(" ")[0], + settings.getSetCountCommand().split(" ")); + } - /** - * Test method for - * {@link world.bentobox.aoneblock.commands.island.IslandSetCountCommand#IslandSetCountCommand(world.bentobox.bentobox.api.commands.CompositeCommand, java.lang.String, java.lang.String[])}. - */ - @Test - public void testIslandSetCountCommand() { - assertNotNull(iscc); - } + /** + * Test method for + * {@link world.bentobox.aoneblock.commands.island.IslandSetCountCommand#IslandSetCountCommand(world.bentobox.bentobox.api.commands.CompositeCommand, java.lang.String, java.lang.String[])}. + */ + @Test + public void testIslandSetCountCommand() { + assertNotNull(iscc); + } - /** - * Test method for - * {@link world.bentobox.aoneblock.commands.island.IslandSetCountCommand#setup()}. - */ - @Test - public void testSetup() { - assertEquals("island.setcount", iscc.getPermission()); - assertEquals("aoneblock.commands.island.setcount.parameters", iscc.getParameters()); - assertEquals("aoneblock.commands.island.setcount.description", iscc.getDescription()); - assertTrue(iscc.isConfigurableRankCommand()); - assertTrue(iscc.isOnlyPlayer()); + /** + * Test method for + * {@link world.bentobox.aoneblock.commands.island.IslandSetCountCommand#setup()}. + */ + @Test + public void testSetup() { + assertEquals("island.setcount", iscc.getPermission()); + assertEquals("aoneblock.commands.island.setcount.parameters", iscc.getParameters()); + assertEquals("aoneblock.commands.island.setcount.description", iscc.getDescription()); + assertTrue(iscc.isConfigurableRankCommand()); + assertTrue(iscc.isOnlyPlayer()); - } + } - /** - * Test method for - * {@link world.bentobox.aoneblock.commands.island.IslandSetCountCommand#execute(world.bentobox.bentobox.api.user.User, java.lang.String, java.util.List)}. - */ - public void testExecuteUserStringListOfStringShowHelp() { - assertFalse(iscc.execute(user, "", Collections.emptyList())); - verify(user).sendMessage("commands.help.header", "[label]", null); - } + /** + * Test method for + * {@link world.bentobox.aoneblock.commands.island.IslandSetCountCommand#execute(world.bentobox.bentobox.api.user.User, java.lang.String, java.util.List)}. + */ + public void testExecuteUserStringListOfStringShowHelp() { + assertFalse(iscc.execute(user, "", Collections.emptyList())); + verify(user).sendMessage("commands.help.header", "[label]", null); + } - /** + /** * Test method for {@link world.bentobox.aoneblock.commands.island.IslandSetCountCommand#execute(world.bentobox.bentobox.api.user.User, java.lang.String, java.util.List)}. */ @Test @@ -227,18 +180,18 @@ public void testExecuteUserStringListOfStringNoIsland() { verify(user).sendMessage("general.errors.no-island"); } - /** - * Test method for - * {@link world.bentobox.aoneblock.commands.island.IslandSetCountCommand#execute(world.bentobox.bentobox.api.user.User, java.lang.String, java.util.List)}. - */ - @Test - public void testExecuteUserStringListOfStringLowRank() { + /** + * Test method for + * {@link world.bentobox.aoneblock.commands.island.IslandSetCountCommand#execute(world.bentobox.bentobox.api.user.User, java.lang.String, java.util.List)}. + */ + @Test + public void testExecuteUserStringListOfStringLowRank() { when(rm.getRank(anyInt())).thenReturn(RanksManager.MEMBER_RANK_REF); - assertFalse(iscc.execute(user, "", List.of("2000"))); - verify(user).sendMessage("general.errors.insufficient-rank", TextVariables.RANK, RanksManager.MEMBER_RANK_REF); - } + assertFalse(iscc.execute(user, "", List.of("2000"))); + verify(user).sendMessage("general.errors.insufficient-rank", TextVariables.RANK, RanksManager.MEMBER_RANK_REF); + } - /** + /** * Test method for {@link world.bentobox.aoneblock.commands.island.IslandSetCountCommand#execute(world.bentobox.bentobox.api.user.User, java.lang.String, java.util.List)}. */ @Test @@ -248,7 +201,7 @@ public void testExecuteUserStringListOfStringRankOKNegativeCount() { verify(user).sendMessage("general.errors.must-be-positive-number", TextVariables.NUMBER, "-2000"); } - /** + /** * Test method for {@link world.bentobox.aoneblock.commands.island.IslandSetCountCommand#execute(world.bentobox.bentobox.api.user.User, java.lang.String, java.util.List)}. */ @Test @@ -259,7 +212,7 @@ public void testExecuteUserStringListOfStringRankOKTooHighCount() { verify(user).sendMessage("aoneblock.commands.island.setcount.too-high", TextVariables.NUMBER, "0"); } - /** + /** * Test method for {@link world.bentobox.aoneblock.commands.island.IslandSetCountCommand#execute(world.bentobox.bentobox.api.user.User, java.lang.String, java.util.List)}. */ @Test diff --git a/src/test/java/world/bentobox/aoneblock/dataobjects/OneBlockIslandsTest.java b/src/test/java/world/bentobox/aoneblock/dataobjects/OneBlockIslandsTest.java index 714e915f..de238ba2 100644 --- a/src/test/java/world/bentobox/aoneblock/dataobjects/OneBlockIslandsTest.java +++ b/src/test/java/world/bentobox/aoneblock/dataobjects/OneBlockIslandsTest.java @@ -1,29 +1,28 @@ package world.bentobox.aoneblock.dataobjects; -import static org.junit.Assert.assertEquals; -import static org.junit.Assert.assertNotNull; -import static org.junit.Assert.assertNull; -import static org.junit.Assert.assertTrue; + +import static org.junit.jupiter.api.Assertions.assertEquals; +import static org.junit.jupiter.api.Assertions.assertNotNull; +import static org.junit.jupiter.api.Assertions.assertNull; +import static org.junit.jupiter.api.Assertions.assertTrue; import java.util.List; import java.util.Queue; import java.util.UUID; import org.bukkit.entity.EntityType; -import org.junit.After; -import org.junit.Before; -import org.junit.Test; -import org.junit.runner.RunWith; -import org.powermock.modules.junit4.PowerMockRunner; +import org.junit.jupiter.api.AfterEach; +import org.junit.jupiter.api.BeforeEach; +import org.junit.jupiter.api.Test; +import world.bentobox.aoneblock.CommonTestSetup; import world.bentobox.aoneblock.oneblocks.OneBlockObject; /** * @author tastybento * */ -@RunWith(PowerMockRunner.class) -public class OneBlockIslandsTest { +public class OneBlockIslandsTest extends CommonTestSetup { private OneBlockIslands obi; private String id; @@ -31,8 +30,10 @@ public class OneBlockIslandsTest { /** * @throws java.lang.Exception */ - @Before + @Override + @BeforeEach public void setUp() throws Exception { + super.setUp(); id = UUID.randomUUID().toString(); obi = new OneBlockIslands(id); } @@ -40,8 +41,10 @@ public void setUp() throws Exception { /** * @throws java.lang.Exception */ - @After + @Override + @AfterEach public void tearDown() throws Exception { + super.tearDown(); } /** diff --git a/src/test/java/world/bentobox/aoneblock/listeners/BlockListenerTest.java b/src/test/java/world/bentobox/aoneblock/listeners/BlockListenerTest.java index a43cca7d..63f39f46 100644 --- a/src/test/java/world/bentobox/aoneblock/listeners/BlockListenerTest.java +++ b/src/test/java/world/bentobox/aoneblock/listeners/BlockListenerTest.java @@ -1,135 +1,90 @@ package world.bentobox.aoneblock.listeners; -import static org.junit.Assert.assertFalse; -import static org.junit.Assert.assertTrue; +import static org.junit.jupiter.api.Assertions.assertFalse; +import static org.junit.jupiter.api.Assertions.assertTrue; import static org.mockito.ArgumentMatchers.any; import static org.mockito.ArgumentMatchers.eq; 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.Optional; import java.util.UUID; import java.util.concurrent.CompletableFuture; -import org.bukkit.Bukkit; -import org.bukkit.Location; import org.bukkit.World; import org.bukkit.block.Block; import org.bukkit.block.BlockFace; -import org.bukkit.entity.Player; import org.bukkit.event.block.BlockFromToEvent; import org.eclipse.jdt.annotation.NonNull; -import org.eclipse.jdt.annotation.Nullable; -import org.junit.After; -import org.junit.Before; -import org.junit.BeforeClass; -import org.junit.Test; -import org.junit.runner.RunWith; +import org.junit.jupiter.api.AfterEach; +import org.junit.jupiter.api.BeforeEach; +import org.junit.jupiter.api.Test; import org.mockito.Mock; +import org.mockito.MockedStatic; 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.aoneblock.AOneBlock; +import world.bentobox.aoneblock.CommonTestSetup; import world.bentobox.aoneblock.dataobjects.OneBlockIslands; import world.bentobox.aoneblock.oneblocks.OneBlockPhase; import world.bentobox.aoneblock.oneblocks.OneBlocksManager; import world.bentobox.bank.Bank; import world.bentobox.bank.BankManager; import world.bentobox.bank.data.Money; -import world.bentobox.bentobox.BentoBox; import world.bentobox.bentobox.Settings; import world.bentobox.bentobox.api.user.User; import world.bentobox.bentobox.database.AbstractDatabaseHandler; import world.bentobox.bentobox.database.DatabaseSetup; -import world.bentobox.bentobox.database.DatabaseSetup.DatabaseType; import world.bentobox.bentobox.database.objects.Island; -import world.bentobox.bentobox.managers.IslandsManager; import world.bentobox.bentobox.managers.PlayersManager; -import world.bentobox.bentobox.util.Util; import world.bentobox.level.Level; /** * @author tastybento * */ -@RunWith(PowerMockRunner.class) -@PrepareForTest({Bukkit.class, BentoBox.class, DatabaseSetup.class, Util.class}) -public class BlockListenerTest { +public class BlockListenerTest extends CommonTestSetup { // Class under test private BlockListener bl; - @Mock - BentoBox plugin; @Mock AOneBlock addon; - private static AbstractDatabaseHandler h; @Mock private Settings pluginSettings; - private User user; - @Mock - private World world; @Mock private OneBlocksManager obm; private Island island; - @Mock - private @Nullable Player player; - @Mock private PlayersManager pm; @Mock private Bank bank; @Mock private Level level; - @Mock - private Location location; - @Mock - private IslandsManager im; private @NonNull OneBlockIslands is; private @NonNull OneBlockPhase phase; + /** + * @throws java.lang.Exception + */ @SuppressWarnings("unchecked") - @BeforeClass - public static void beforeClass() throws IllegalAccessException, InvocationTargetException, IntrospectionException { + @BeforeEach + public void setUp() throws Exception { + super.setUp(); // This has to be done beforeClass otherwise the tests will interfere with each other - h = mock(AbstractDatabaseHandler.class); + AbstractDatabaseHandler h = mock(AbstractDatabaseHandler.class); // Database - PowerMockito.mockStatic(DatabaseSetup.class); + MockedStatic mockDb = Mockito.mockStatic(DatabaseSetup.class); DatabaseSetup dbSetup = mock(DatabaseSetup.class); - when(DatabaseSetup.getDatabase()).thenReturn(dbSetup); + mockDb.when(DatabaseSetup::getDatabase).thenReturn(dbSetup); when(dbSetup.getHandler(any())).thenReturn(h); when(h.saveObject(any())).thenReturn(CompletableFuture.completedFuture(true)); - } - - /** - * @throws java.lang.Exception - */ - @Before - public void setUp() throws Exception { - tearDown(); - // Set up plugin - Whitebox.setInternalState(BentoBox.class, "instance", plugin); - - PowerMockito.mockStatic(Bukkit.class, Mockito.RETURNS_MOCKS); - // The database type has to be created one line before the thenReturn() to work! - DatabaseType value = DatabaseType.JSON; - when(plugin.getSettings()).thenReturn(pluginSettings); - when(pluginSettings.getDatabaseType()).thenReturn(value); // Addon when(addon.getPlugin()).thenReturn(plugin); @@ -140,12 +95,12 @@ public void setUp() throws Exception { when(addon.inWorld(world)).thenReturn(true); // Player - when(player.getUniqueId()).thenReturn(UUID.randomUUID()); - when(player.getName()).thenReturn("tastybento"); - when(player.isOnline()).thenReturn(true); - when(player.getWorld()).thenReturn(world); + when(mockPlayer.getUniqueId()).thenReturn(UUID.randomUUID()); + when(mockPlayer.getName()).thenReturn("tastybento"); + when(mockPlayer.isOnline()).thenReturn(true); + when(mockPlayer.getWorld()).thenReturn(world); User.setPlugin(plugin); - user = User.getInstance(player); + User user = User.getInstance(mockPlayer); // Island island = new Island(); @@ -176,20 +131,11 @@ public void setUp() throws Exception { /** * @throws java.lang.Exception - exception */ - @After + @Override + @AfterEach public void tearDown() throws Exception { + super.tearDown(); deleteAll(new File("database")); - User.clearUsers(); - Mockito.framework().clearInlineMocks(); - } - - private static void deleteAll(File file) throws IOException { - if (file.exists()) { - Files.walk(file.toPath()) - .sorted(Comparator.reverseOrder()) - .map(Path::toFile) - .forEach(File::delete); - } } /** diff --git a/src/test/java/world/bentobox/aoneblock/listeners/BlockProtectTest.java b/src/test/java/world/bentobox/aoneblock/listeners/BlockProtectTest.java index 66236c75..d96b9ac0 100644 --- a/src/test/java/world/bentobox/aoneblock/listeners/BlockProtectTest.java +++ b/src/test/java/world/bentobox/aoneblock/listeners/BlockProtectTest.java @@ -1,8 +1,8 @@ package world.bentobox.aoneblock.listeners; -import static org.junit.Assert.assertFalse; -import static org.junit.Assert.assertNotNull; -import static org.junit.Assert.assertTrue; +import static org.junit.jupiter.api.Assertions.assertFalse; +import static org.junit.jupiter.api.Assertions.assertNotNull; +import static org.junit.jupiter.api.Assertions.assertTrue; import static org.mockito.ArgumentMatchers.any; import static org.mockito.ArgumentMatchers.anyDouble; import static org.mockito.ArgumentMatchers.anyInt; @@ -20,14 +20,12 @@ import org.bukkit.Location; import org.bukkit.Material; import org.bukkit.Particle; -import org.bukkit.Server; import org.bukkit.World; import org.bukkit.block.Block; import org.bukkit.block.BlockFace; import org.bukkit.block.data.BlockData; import org.bukkit.entity.Entity; import org.bukkit.entity.EntityType; -import org.bukkit.entity.Player; import org.bukkit.event.block.Action; import org.bukkit.event.block.BlockPistonExtendEvent; import org.bukkit.event.block.BlockPistonRetractEvent; @@ -36,51 +34,36 @@ import org.bukkit.event.entity.EntitySpawnEvent; import org.bukkit.event.player.PlayerInteractEvent; import org.bukkit.inventory.ItemStack; -import org.junit.After; -import org.junit.Before; -import org.junit.Test; -import org.junit.runner.RunWith; -import org.mockbukkit.mockbukkit.MockBukkit; +import org.junit.jupiter.api.AfterEach; +import org.junit.jupiter.api.BeforeEach; +import org.junit.jupiter.api.Test; import org.mockito.Mock; -import org.powermock.modules.junit4.PowerMockRunner; import world.bentobox.aoneblock.AOneBlock; +import world.bentobox.aoneblock.CommonTestSetup; import world.bentobox.aoneblock.Settings; -import world.bentobox.bentobox.database.objects.Island; -import world.bentobox.bentobox.managers.IslandsManager; /** * @author tastybento * */ -@RunWith(PowerMockRunner.class) -public class BlockProtectTest { +public class BlockProtectTest extends CommonTestSetup { private BlockProtect bp; @Mock AOneBlock addon; @Mock - private Player p; - @Mock private Block block; - @Mock - private World world; - @Mock - private Location location; - @Mock - private IslandsManager im; - @Mock - private Island island; /** * @throws java.lang.Exception */ - @Before + @Override + @BeforeEach public void setUp() throws Exception { - - Server server = MockBukkit.mock(); - - when(p.getWorld()).thenReturn(world); + super.setUp(); + + when(mockPlayer.getWorld()).thenReturn(world); // In World when(addon.inWorld(world)).thenReturn(true); @@ -107,9 +90,10 @@ public void setUp() throws Exception { /** * @throws java.lang.Exception */ - @After + @Override + @AfterEach public void tearDown() throws Exception { - MockBukkit.unmock(); + super.tearDown(); } /** @@ -121,12 +105,12 @@ public void testBlockProtect() { } /** - * Test method for {@link world.bentobox.aoneblock.listeners.BlockProtect#onBlockDamage(org.bukkit.event.block.BlockDamageEvent)}. + * Test method for {@link world.bentobox.aoneblock.listeners.BlockProtect#onBlockDamage(PlayerInteractEvent)}. */ @Test public void testOnBlockDamage() { ItemStack item = new ItemStack(Material.DIAMOND_PICKAXE); - PlayerInteractEvent blockDamageEvent = new PlayerInteractEvent(p, Action.LEFT_CLICK_BLOCK, item, block, + PlayerInteractEvent blockDamageEvent = new PlayerInteractEvent(mockPlayer, Action.LEFT_CLICK_BLOCK, item, block, BlockFace.UP); bp.onBlockDamage(blockDamageEvent); verify(addon).inWorld(world); @@ -136,13 +120,13 @@ public void testOnBlockDamage() { } /** - * Test method for {@link world.bentobox.aoneblock.listeners.BlockProtect#onBlockDamage(org.bukkit.event.block.BlockDamageEvent)}. + * Test method for {@link world.bentobox.aoneblock.listeners.BlockProtect#onBlockDamage(PlayerInteractEvent)}. */ @Test public void testOnBlockDamageWrongWorld() { - when(p.getWorld()).thenReturn(mock(World.class)); + when(mockPlayer.getWorld()).thenReturn(mock(World.class)); ItemStack item = new ItemStack(Material.DIAMOND_PICKAXE); - PlayerInteractEvent blockDamageEvent = new PlayerInteractEvent(p, Action.LEFT_CLICK_BLOCK, item, block, + PlayerInteractEvent blockDamageEvent = new PlayerInteractEvent(mockPlayer, Action.LEFT_CLICK_BLOCK, item, block, BlockFace.UP); bp.onBlockDamage(blockDamageEvent); verify(im, never()).getIslandAt(location); @@ -151,13 +135,13 @@ public void testOnBlockDamageWrongWorld() { } /** - * Test method for {@link world.bentobox.aoneblock.listeners.BlockProtect#onBlockDamage(org.bukkit.event.block.BlockDamageEvent)}. + * Test method for {@link world.bentobox.aoneblock.listeners.BlockProtect#onBlockDamage(PlayerInteractEvent)}. */ @Test public void testOnBlockDamageNotCenterMagicBlock() { when(block.getLocation()).thenReturn(mock(Location.class)); ItemStack item = new ItemStack(Material.DIAMOND_PICKAXE); - PlayerInteractEvent blockDamageEvent = new PlayerInteractEvent(p, Action.LEFT_CLICK_BLOCK, item, block, + PlayerInteractEvent blockDamageEvent = new PlayerInteractEvent(mockPlayer, Action.LEFT_CLICK_BLOCK, item, block, BlockFace.UP); bp.onBlockDamage(blockDamageEvent); verify(addon).inWorld(world); @@ -172,7 +156,7 @@ public void testOnBlockDamageNotCenterMagicBlock() { @Test public void testOnBlockChange() { BlockData blockData = mock(BlockData.class); - EntityChangeBlockEvent event = new EntityChangeBlockEvent(p, block, blockData); + EntityChangeBlockEvent event = new EntityChangeBlockEvent(mockPlayer, block, blockData); bp.onBlockChange(event); assertTrue(event.isCancelled()); } @@ -184,7 +168,7 @@ public void testOnBlockChange() { public void testOnBlockChangeWrongWorld() { when(block.getWorld()).thenReturn(mock(World.class)); BlockData blockData = mock(BlockData.class); - EntityChangeBlockEvent event = new EntityChangeBlockEvent(p, block, blockData); + EntityChangeBlockEvent event = new EntityChangeBlockEvent(mockPlayer, block, blockData); bp.onBlockChange(event); assertFalse(event.isCancelled()); } @@ -196,7 +180,7 @@ public void testOnBlockChangeWrongWorld() { public void testOnBlockChangeNotMagicBlock() { when(block.getLocation()).thenReturn(mock(Location.class)); BlockData blockData = mock(BlockData.class); - EntityChangeBlockEvent event = new EntityChangeBlockEvent(p, block, blockData); + EntityChangeBlockEvent event = new EntityChangeBlockEvent(mockPlayer, block, blockData); bp.onBlockChange(event); assertFalse(event.isCancelled()); } @@ -207,7 +191,7 @@ public void testOnBlockChangeNotMagicBlock() { @Test public void testOnExplosion() { List blocks = new ArrayList<>(); - EntityExplodeEvent event = new EntityExplodeEvent(p, location, blocks, 0, null); + EntityExplodeEvent event = new EntityExplodeEvent(mockPlayer, location, blocks, 0, null); bp.onExplosion(event); assertTrue(blocks.isEmpty()); // Add the magic block @@ -230,14 +214,14 @@ public void testOnExplosion() { public void testOnExplosionWrongWorld() { when(location.getWorld()).thenReturn(mock(World.class)); List blocks = new ArrayList<>(); - EntityExplodeEvent event = new EntityExplodeEvent(p, location, blocks, 0, null); + EntityExplodeEvent event = new EntityExplodeEvent(mockPlayer, location, blocks, 0, null); blocks.add(block); // Block as correct location, but wrong world bp.onExplosion(event); assertFalse(blocks.isEmpty()); // Normal blocks remain blocks.add(mock(Block.class)); - event = new EntityExplodeEvent(p, location, blocks, 0, null); + event = new EntityExplodeEvent(mockPlayer, location, blocks, 0, null); bp.onExplosion(event); assertFalse(blocks.isEmpty()); } diff --git a/src/test/java/world/bentobox/aoneblock/listeners/CheckPhaseTest.java b/src/test/java/world/bentobox/aoneblock/listeners/CheckPhaseTest.java index c5a91791..557ed5e0 100644 --- a/src/test/java/world/bentobox/aoneblock/listeners/CheckPhaseTest.java +++ b/src/test/java/world/bentobox/aoneblock/listeners/CheckPhaseTest.java @@ -1,6 +1,6 @@ package world.bentobox.aoneblock.listeners; -import static org.junit.Assert.assertEquals; +import static org.junit.jupiter.api.Assertions.assertEquals; import static org.mockito.ArgumentMatchers.any; import static org.mockito.ArgumentMatchers.anyString; import static org.mockito.ArgumentMatchers.eq; @@ -15,68 +15,45 @@ import java.util.Optional; import java.util.UUID; -import org.bukkit.Bukkit; -import org.bukkit.World; import org.bukkit.entity.Player; import org.eclipse.jdt.annotation.NonNull; -import org.eclipse.jdt.annotation.Nullable; -import org.junit.After; -import org.junit.Before; -import org.junit.Test; -import org.junit.runner.RunWith; +import org.junit.jupiter.api.AfterEach; +import org.junit.jupiter.api.BeforeEach; +import org.junit.jupiter.api.Test; 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 world.bentobox.aoneblock.AOneBlock; +import world.bentobox.aoneblock.CommonTestSetup; import world.bentobox.aoneblock.dataobjects.OneBlockIslands; import world.bentobox.aoneblock.oneblocks.OneBlockPhase; import world.bentobox.aoneblock.oneblocks.OneBlocksManager; import world.bentobox.bank.Bank; import world.bentobox.bank.BankManager; import world.bentobox.bank.data.Money; -import world.bentobox.bentobox.BentoBox; import world.bentobox.bentobox.api.user.User; -import world.bentobox.bentobox.database.DatabaseSetup; import world.bentobox.bentobox.database.objects.Island; -import world.bentobox.bentobox.managers.IslandsManager; import world.bentobox.bentobox.managers.PlaceholdersManager; import world.bentobox.bentobox.managers.PlayersManager; -import world.bentobox.bentobox.util.Util; import world.bentobox.level.Level; /** * @author tastybento * */ -@RunWith(PowerMockRunner.class) -@PrepareForTest({ Bukkit.class, BentoBox.class, DatabaseSetup.class, Util.class }) -public class CheckPhaseTest { +public class CheckPhaseTest extends CommonTestSetup { - @Mock - BentoBox plugin; @Mock AOneBlock addon; @Mock - private World world; - @Mock private PlayersManager pm; - @Mock - private IslandsManager im; private @NonNull OneBlockIslands is; private @NonNull OneBlockPhase phase; @Mock private OneBlocksManager obm; - @Mock - private @Nullable Player player; private Island island; private CheckPhase bl; - private User user; @Mock private PlaceholdersManager phm; @Mock @@ -89,60 +66,60 @@ public class CheckPhaseTest { /** * @throws java.lang.Exception */ - @Before + @Override + @BeforeEach public void setUp() throws Exception { - // Bukkit - PowerMockito.mockStatic(Bukkit.class, Mockito.RETURNS_MOCKS); - // Set up plugin - Whitebox.setInternalState(BentoBox.class, "instance", plugin); - - // Addon - when(addon.getPlugin()).thenReturn(plugin); - when(addon.getOneBlockManager()).thenReturn(obm); - when(addon.getPlayers()).thenReturn(pm); - when(addon.getOverWorld()).thenReturn(world); - when(addon.getIslands()).thenReturn(im); - when(addon.inWorld(world)).thenReturn(true); - when(addon.getBlockListener()).thenReturn(blis); - - // Player - when(player.getUniqueId()).thenReturn(UUID.randomUUID()); - when(player.getName()).thenReturn("tastybento"); - when(player.isOnline()).thenReturn(true); - when(player.getWorld()).thenReturn(world); - User.setPlugin(plugin); - user = User.getInstance(player); - - // Island - island = new Island(); - island.setOwner(UUID.randomUUID()); - island.setName("island_name"); - // Players Manager - when(pm.getName(any())).thenReturn("tastybento2"); - when(pm.getUser(any(UUID.class))).thenReturn(user); - - // Bank - BankManager bm = mock(BankManager.class); - when(bank.getBankManager()).thenReturn(bm); - // Phat balance to start - when(bm.getBalance(island)).thenReturn(new Money(100000D)); - when(addon.getAddonByName("Bank")).thenReturn(Optional.of(bank)); - // Level - when(level.getIslandLevel(eq(world), any())).thenReturn(1000L); - when(addon.getAddonByName("Level")).thenReturn(Optional.of(level)); - - // Placeholders - when(plugin.getPlaceholdersManager()).thenReturn(phm); - when(phm.replacePlaceholders(any(), anyString())).thenAnswer(a -> (String) a.getArgument(1, String.class)); - - bl = new CheckPhase(addon, blis); + super.setUp(); + + // Addon + when(addon.getPlugin()).thenReturn(plugin); + when(addon.getOneBlockManager()).thenReturn(obm); + when(addon.getPlayers()).thenReturn(pm); + when(addon.getOverWorld()).thenReturn(world); + when(addon.getIslands()).thenReturn(im); + when(addon.inWorld(world)).thenReturn(true); + when(addon.getBlockListener()).thenReturn(blis); + + // Player + when(mockPlayer.getUniqueId()).thenReturn(UUID.randomUUID()); + when(mockPlayer.getName()).thenReturn("tastybento"); + when(mockPlayer.isOnline()).thenReturn(true); + when(mockPlayer.getWorld()).thenReturn(world); + User.setPlugin(plugin); + User user = User.getInstance(mockPlayer); + + // Island + island = new Island(); + island.setOwner(UUID.randomUUID()); + island.setName("island_name"); + // Players Manager + when(pm.getName(any())).thenReturn("tastybento2"); + when(pm.getUser(any(UUID.class))).thenReturn(user); + + // Bank + BankManager bm = mock(BankManager.class); + when(bank.getBankManager()).thenReturn(bm); + // Phat balance to start + when(bm.getBalance(island)).thenReturn(new Money(100000D)); + when(addon.getAddonByName("Bank")).thenReturn(Optional.of(bank)); + // Level + when(level.getIslandLevel(eq(world), any())).thenReturn(1000L); + when(addon.getAddonByName("Level")).thenReturn(Optional.of(level)); + + // Placeholders + when(plugin.getPlaceholdersManager()).thenReturn(phm); + when(phm.replacePlaceholders(any(), anyString())).thenAnswer(a -> (String) a.getArgument(1, String.class)); + + bl = new CheckPhase(addon, blis); } /** * @throws java.lang.Exception */ - @After + @Override + @AfterEach public void tearDown() throws Exception { + super.tearDown(); } /** @@ -151,30 +128,30 @@ public void tearDown() throws Exception { */ @Test public void testSetNewPhase() { - // Set up that a phase has been completed - is = new OneBlockIslands(UUID.randomUUID().toString()); - is.setPhaseName("Previous"); - is.setBlockNumber(500); - is.setLifetime(500L); - // The phase the user has just moved to - phase = new OneBlockPhase("500"); - phase.setPhaseName("Next Phase"); - phase.setStartCommands(List.of("start1", "start2")); - - // The previous phase - OneBlockPhase previous = mock(OneBlockPhase.class); - when(previous.getPhaseName()).thenReturn("Previous"); - - when(obm.getPhase("Previous")).thenReturn(Optional.of(previous)); - - bl.setNewPhase(player, island, is, phase); - // Verify commands run - verify(previous).getEndCommands(); - verify(previous).getFirstTimeEndCommands(); - // Verify phase name change - assertEquals("Next Phase", is.getPhaseName()); - // Verify title shown - verify(player).sendTitle("Next Phase", null, -1, -1, -1); + // Set up that a phase has been completed + is = new OneBlockIslands(UUID.randomUUID().toString()); + is.setPhaseName("Previous"); + is.setBlockNumber(500); + is.setLifetime(500L); + // The phase the user has just moved to + phase = new OneBlockPhase("500"); + phase.setPhaseName("Next Phase"); + phase.setStartCommands(List.of("start1", "start2")); + + // The previous phase + OneBlockPhase previous = mock(OneBlockPhase.class); + when(previous.getPhaseName()).thenReturn("Previous"); + + when(obm.getPhase("Previous")).thenReturn(Optional.of(previous)); + + bl.setNewPhase(mockPlayer, island, is, phase); + // Verify commands run + verify(previous).getEndCommands(); + verify(previous).getFirstTimeEndCommands(); + // Verify phase name change + assertEquals("Next Phase", is.getPhaseName()); + // Verify title shown + verify(mockPlayer).sendTitle("Next Phase", null, -1, -1, -1); } @@ -184,30 +161,30 @@ public void testSetNewPhase() { */ @Test public void testSetNewPhaseSecondTime() { - // Set up that a phase has been completed - is = new OneBlockIslands(UUID.randomUUID().toString()); - is.setPhaseName("Previous"); - is.setBlockNumber(500); - is.setLifetime(10500L); - // The phase the user has just moved to - phase = new OneBlockPhase("500"); - phase.setPhaseName("Next Phase"); - phase.setStartCommands(List.of("start1", "start2")); - - // The previous phase - OneBlockPhase previous = mock(OneBlockPhase.class); - when(previous.getPhaseName()).thenReturn("Previous"); - - when(obm.getPhase("Previous")).thenReturn(Optional.of(previous)); - - bl.setNewPhase(player, island, is, phase); - // Verify commands run - verify(previous).getEndCommands(); - verify(previous, never()).getFirstTimeEndCommands(); - // Verify phase name change - assertEquals("Next Phase", is.getPhaseName()); - // Verify title shown - verify(player).sendTitle("Next Phase", null, -1, -1, -1); + // Set up that a phase has been completed + is = new OneBlockIslands(UUID.randomUUID().toString()); + is.setPhaseName("Previous"); + is.setBlockNumber(500); + is.setLifetime(10500L); + // The phase the user has just moved to + phase = new OneBlockPhase("500"); + phase.setPhaseName("Next Phase"); + phase.setStartCommands(List.of("start1", "start2")); + + // The previous phase + OneBlockPhase previous = mock(OneBlockPhase.class); + when(previous.getPhaseName()).thenReturn("Previous"); + + when(obm.getPhase("Previous")).thenReturn(Optional.of(previous)); + + bl.setNewPhase(mockPlayer, island, is, phase); + // Verify commands run + verify(previous).getEndCommands(); + verify(previous, never()).getFirstTimeEndCommands(); + // Verify phase name change + assertEquals("Next Phase", is.getPhaseName()); + // Verify title shown + verify(mockPlayer).sendTitle("Next Phase", null, -1, -1, -1); } @@ -217,30 +194,30 @@ public void testSetNewPhaseSecondTime() { */ @Test public void testSetNewPhaseNullPlayer() { - // Set up that a phase has been completed - is = new OneBlockIslands(UUID.randomUUID().toString()); - is.setPhaseName("Previous"); - is.setBlockNumber(500); - is.setLifetime(500L); - // The phase the user has just moved to - phase = new OneBlockPhase("500"); - phase.setPhaseName("Next Phase"); - phase.setStartCommands(List.of("start1", "start2")); - - // The previous phase - OneBlockPhase previous = mock(OneBlockPhase.class); - when(previous.getPhaseName()).thenReturn("Previous"); - - when(obm.getPhase("Previous")).thenReturn(Optional.of(previous)); - - bl.setNewPhase(null, island, is, phase); - // Verify commands run - verify(previous).getEndCommands(); - verify(previous).getFirstTimeEndCommands(); - // Verify phase name change - assertEquals("Next Phase", is.getPhaseName()); - // Verify title shown - verify(player).sendTitle("Next Phase", null, -1, -1, -1); + // Set up that a phase has been completed + is = new OneBlockIslands(UUID.randomUUID().toString()); + is.setPhaseName("Previous"); + is.setBlockNumber(500); + is.setLifetime(500L); + // The phase the user has just moved to + phase = new OneBlockPhase("500"); + phase.setPhaseName("Next Phase"); + phase.setStartCommands(List.of("start1", "start2")); + + // The previous phase + OneBlockPhase previous = mock(OneBlockPhase.class); + when(previous.getPhaseName()).thenReturn("Previous"); + + when(obm.getPhase("Previous")).thenReturn(Optional.of(previous)); + + bl.setNewPhase(null, island, is, phase); + // Verify commands run + verify(previous).getEndCommands(); + verify(previous).getFirstTimeEndCommands(); + // Verify phase name change + assertEquals("Next Phase", is.getPhaseName()); + // Verify title shown + verify(mockPlayer).sendTitle("Next Phase", null, -1, -1, -1); } @@ -249,7 +226,7 @@ public void testSetNewPhaseNullPlayer() { */ @Test public void testCheckPhaseNPCPlayer() { - when(player.hasMetadata("NPC")).thenReturn(true); + when(mockPlayer.hasMetadata("NPC")).thenReturn(true); // Set up that a phase has been completed is = new OneBlockIslands(UUID.randomUUID().toString()); is.setPhaseName("Previous"); @@ -266,14 +243,14 @@ public void testCheckPhaseNPCPlayer() { when(obm.getPhase("Previous")).thenReturn(Optional.of(previous)); - bl.setNewPhase(player, island, is, phase); + bl.setNewPhase(mockPlayer, island, is, phase); // Verify commands run verify(previous).getEndCommands(); verify(previous).getFirstTimeEndCommands(); // Verify phase name change assertEquals("Next Phase", is.getPhaseName()); // Verify title shown - verify(player).sendTitle("Next Phase", null, -1, -1, -1); + verify(mockPlayer).sendTitle("Next Phase", null, -1, -1, -1); } @@ -283,24 +260,24 @@ public void testCheckPhaseNPCPlayer() { */ @Test public void testReplacePlaceholders() { - // Commands - /* - * [island] - Island name [owner] - Island owner's name [player] - The name of - * the player who broke the block triggering the commands [phase] - the name of - * this phase [blocks] - the number of blocks broken [level] - island level - * (Requires Levels Addon) [bank-balance] - island bank balance (Requires Bank - * Addon) [eco-balance] - player's economy balance (Requires Vault and an - * economy plugin) - * - */ - List commandList = new ArrayList<>(); - - commandList.add("no replacement"); - commandList.add("[island] [owner] [phase] [blocks] [level] [bank-balance] [eco-balance]"); - List r = bl.replacePlaceholders(player, "phaseName", "1000", island, commandList); - assertEquals(2, r.size()); - assertEquals("no replacement", r.get(0)); - assertEquals("island_name tastybento2 phaseName 1000 1000 100000.0 0.0", r.get(1)); - verify(phm, times(2)).replacePlaceholders(eq(player), any()); + // Commands + /* + * [island] - Island name [owner] - Island owner's name [player] - The name of + * the player who broke the block triggering the commands [phase] - the name of + * this phase [blocks] - the number of blocks broken [level] - island level + * (Requires Levels Addon) [bank-balance] - island bank balance (Requires Bank + * Addon) [eco-balance] - player's economy balance (Requires Vault and an + * economy plugin) + * + */ + List commandList = new ArrayList<>(); + + commandList.add("no replacement"); + commandList.add("[island] [owner] [phase] [blocks] [level] [bank-balance] [eco-balance]"); + List r = bl.replacePlaceholders(mockPlayer, "phaseName", "1000", island, commandList); + assertEquals(2, r.size()); + assertEquals("no replacement", r.get(0)); + assertEquals("island_name tastybento2 phaseName 1000 1000 100000.0 0.0", r.get(1)); + verify(phm, times(2)).replacePlaceholders(eq(mockPlayer), any()); } } diff --git a/src/test/java/world/bentobox/aoneblock/listeners/HoloListenerTest.java b/src/test/java/world/bentobox/aoneblock/listeners/HoloListenerTest.java index 5b4f40a9..5bb1b2a4 100644 --- a/src/test/java/world/bentobox/aoneblock/listeners/HoloListenerTest.java +++ b/src/test/java/world/bentobox/aoneblock/listeners/HoloListenerTest.java @@ -1,6 +1,6 @@ package world.bentobox.aoneblock.listeners; -import static org.junit.Assert.assertNotNull; +import static org.junit.jupiter.api.Assertions.assertNotNull; import static org.mockito.ArgumentMatchers.any; import static org.mockito.ArgumentMatchers.anyDouble; import static org.mockito.ArgumentMatchers.anyInt; @@ -16,86 +16,54 @@ import java.util.Collection; import java.util.List; -import java.util.UUID; import java.util.concurrent.CompletableFuture; -import org.bukkit.Bukkit; import org.bukkit.Chunk; import org.bukkit.Location; -import org.bukkit.World; import org.bukkit.entity.Entity; import org.bukkit.entity.EntityType; import org.bukkit.entity.Player; import org.bukkit.entity.TextDisplay; -import org.bukkit.scheduler.BukkitScheduler; import org.bukkit.util.Vector; import org.eclipse.jdt.annotation.NonNull; -import org.junit.After; -import org.junit.Before; -import org.junit.Test; -import org.junit.runner.RunWith; +import org.junit.jupiter.api.AfterEach; +import org.junit.jupiter.api.BeforeEach; +import org.junit.jupiter.api.Test; 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 world.bentobox.aoneblock.AOneBlock; +import world.bentobox.aoneblock.CommonTestSetup; import world.bentobox.aoneblock.Settings; import world.bentobox.aoneblock.dataobjects.OneBlockIslands; import world.bentobox.aoneblock.oneblocks.OneBlockPhase; -import world.bentobox.bentobox.BentoBox; import world.bentobox.bentobox.api.events.island.IslandDeleteEvent; import world.bentobox.bentobox.api.user.User; -import world.bentobox.bentobox.database.objects.Island; -import world.bentobox.bentobox.managers.LocalesManager; -import world.bentobox.bentobox.managers.PlaceholdersManager; import world.bentobox.bentobox.util.Util; /** * @author tastybento * */ -@RunWith(PowerMockRunner.class) -@PrepareForTest({ Bukkit.class, BentoBox.class, User.class, Util.class }) -public class HoloListenerTest { - @Mock - private BentoBox plugin; +public class HoloListenerTest extends CommonTestSetup { @Mock AOneBlock addon; private HoloListener hl; @Mock - private Island island; - private UUID uuid = UUID.randomUUID(); - @Mock - private Location location; - @Mock - private World world; - @Mock private TextDisplay hologram; private Settings settings; @Mock private @NonNull OneBlockIslands is; @Mock - private Player player; - @Mock - private LocalesManager lm; - @Mock - private PlaceholdersManager pm; - @Mock - private BukkitScheduler scheduler; - @Mock private @NonNull OneBlockPhase phase; /** * @throws java.lang.Exception */ - @Before + @Override + @BeforeEach public void setUp() throws Exception { - // Set up plugin - Whitebox.setInternalState(BentoBox.class, "instance", plugin); + super.setUp(); // Settings settings = new Settings(); when(addon.getSettings()).thenReturn(settings); @@ -115,9 +83,8 @@ public void setUp() throws Exception { when(location.clone()).thenReturn(location); when(location.add(any(Vector.class))).thenReturn(location); // Chunks - PowerMockito.mockStatic(Util.class, Mockito.RETURNS_MOCKS); CompletableFuture future = CompletableFuture.completedFuture(null); - when(Util.getChunkAtAsync(location)).thenReturn(future); // Load the chunk immediately + mockedUtil.when(() -> Util.getChunkAtAsync(location)).thenReturn(future); // Load the chunk immediately Player nonHolo = mock(Player.class); @@ -127,24 +94,18 @@ public void setUp() throws Exception { when(world.getNearbyEntities(any(Location.class), anyDouble(), anyDouble(), anyDouble())).thenReturn(entities); // Player and translations - when(player.getUniqueId()).thenReturn(uuid); - User.getInstance(player); + when(mockPlayer.getUniqueId()).thenReturn(uuid); + User.getInstance(mockPlayer); User.setPlugin(plugin); - when(plugin.getLocalesManager()).thenReturn(lm); - when(plugin.getPlaceholdersManager()).thenReturn(pm); - - // Bukkit - PowerMockito.mockStatic(Bukkit.class, Mockito.RETURNS_MOCKS); - when(Bukkit.getScheduler()).thenReturn(scheduler); - // DUT hl = new HoloListener(addon); } - @After - public void tearDown() { - User.clearUsers(); + @Override + @AfterEach + public void tearDown()throws Exception { + super.tearDown(); } /** @@ -183,7 +144,7 @@ public void testOnDisable() { public void testSetUpNoHolograms() { settings.setUseHolograms(false); hl.setUp(island, is, true); - verify(scheduler, never()).runTaskLater(isNull(), any(Runnable.class), anyLong()); + verify(sch, never()).runTaskLater(isNull(), any(Runnable.class), anyLong()); } /** @@ -193,7 +154,7 @@ public void testSetUpNoHolograms() { public void testSetUpNoScheduling() { settings.setHologramDuration(0); hl.setUp(island, is, true); - verify(scheduler, never()).runTaskLater(isNull(), any(Runnable.class), anyLong()); + verify(sch, never()).runTaskLater(isNull(), any(Runnable.class), anyLong()); } /** @@ -202,8 +163,8 @@ public void testSetUpNoScheduling() { @Test public void testSetUpNewIsland() { hl.setUp(island, is, true); - verify(is).setHologram(""); - verify(scheduler).runTaskLater(isNull(), any(Runnable.class), anyLong()); + verify(is).setHologram("aoneblock.island.starting-hologram"); + verify(sch).runTaskLater(isNull(), any(Runnable.class), anyLong()); } /** @@ -213,7 +174,7 @@ public void testSetUpNewIsland() { public void testSetUpNotNewIsland() { hl.setUp(island, is, false); verify(is, never()).setHologram(anyString()); - verify(scheduler).runTaskLater(isNull(), any(Runnable.class), anyLong()); + verify(sch).runTaskLater(isNull(), any(Runnable.class), anyLong()); } @@ -225,7 +186,7 @@ public void testProcessNull() { when(phase.getHologramLine(anyInt())).thenReturn(null); when(is.getHologram()).thenReturn(""); // Return blank hl.process(island, is, phase); - verify(scheduler, never()).runTaskLater(isNull(), any(Runnable.class), anyLong()); + verify(sch, never()).runTaskLater(isNull(), any(Runnable.class), anyLong()); } /** @@ -235,7 +196,7 @@ public void testProcessNull() { public void testProcess() { when(phase.getHologramLine(anyInt())).thenReturn("my Holo"); hl.process(island, is, phase); - verify(scheduler).runTaskLater(isNull(), any(Runnable.class), anyLong()); + verify(sch).runTaskLater(isNull(), any(Runnable.class), anyLong()); } } diff --git a/src/test/java/world/bentobox/aoneblock/listeners/InfoListenerTest.java b/src/test/java/world/bentobox/aoneblock/listeners/InfoListenerTest.java index 4a55b186..1ff37cbf 100644 --- a/src/test/java/world/bentobox/aoneblock/listeners/InfoListenerTest.java +++ b/src/test/java/world/bentobox/aoneblock/listeners/InfoListenerTest.java @@ -1,76 +1,47 @@ package world.bentobox.aoneblock.listeners; -import static org.junit.Assert.assertEquals; -import static org.junit.Assert.assertNotNull; -import static org.mockito.ArgumentMatchers.any; +import static org.junit.jupiter.api.Assertions.assertEquals; +import static org.junit.jupiter.api.Assertions.assertNotNull; import static org.mockito.Mockito.atLeast; 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.util.List; import java.util.UUID; -import org.bukkit.Location; -import org.bukkit.World; import org.bukkit.entity.Player; import org.bukkit.entity.Player.Spigot; import org.eclipse.jdt.annotation.NonNull; -import org.junit.After; -import org.junit.Before; -import org.junit.Test; -import org.junit.runner.RunWith; +import org.junit.jupiter.api.AfterEach; +import org.junit.jupiter.api.BeforeEach; +import org.junit.jupiter.api.Test; import org.mockito.ArgumentCaptor; import org.mockito.Mock; -import org.mockito.Mockito; -import org.powermock.modules.junit4.PowerMockRunner; import net.md_5.bungee.api.chat.TextComponent; import world.bentobox.aoneblock.AOneBlock; +import world.bentobox.aoneblock.CommonTestSetup; import world.bentobox.aoneblock.dataobjects.OneBlockIslands; -import world.bentobox.bentobox.BentoBox; import world.bentobox.bentobox.api.addons.Addon; import world.bentobox.bentobox.api.events.island.IslandInfoEvent; import world.bentobox.bentobox.api.user.User; -import world.bentobox.bentobox.database.objects.Island; -import world.bentobox.bentobox.managers.IslandsManager; -import world.bentobox.bentobox.managers.LocalesManager; -import world.bentobox.bentobox.managers.PlaceholdersManager; /** * @author tastybento * */ -@RunWith(PowerMockRunner.class) -public class InfoListenerTest { - @Mock - private BentoBox plugin; +public class InfoListenerTest extends CommonTestSetup { @Mock private AOneBlock addon; - @Mock - private Player p; - @Mock private BlockListener bl; @Mock - private Location location; - @Mock - private IslandsManager im; - @Mock - private Island island; - @Mock private Player player; - @Mock - private World world; private InfoListener il; @Mock private @NonNull OneBlockIslands is; @Mock - private LocalesManager lm; - @Mock - private PlaceholdersManager phm; - @Mock private Spigot spigot; private static final UUID ID = UUID.randomUUID(); @@ -78,14 +49,12 @@ public class InfoListenerTest { /** * @throws java.lang.Exception */ - @Before + @Override + @BeforeEach public void setUp() throws Exception { + super.setUp(); when(addon.getPlugin()).thenReturn(plugin); - when(plugin.getLocalesManager()).thenReturn(lm); - when(lm.get(toString())).thenAnswer(invocation -> invocation.getArgument(0, String.class)); - when(phm.replacePlaceholders(any(), any())).thenAnswer(invocation -> invocation.getArgument(1, String.class)); - when(plugin.getPlaceholdersManager()).thenReturn(phm); User.setPlugin(plugin); // Player @@ -99,7 +68,7 @@ public void setUp() throws Exception { when(addon.getOverWorld()).thenReturn(world); // Player - when(p.getUniqueId()).thenReturn(ID); + when(mockPlayer.getUniqueId()).thenReturn(ID); User.getInstance(player); // Island @@ -118,10 +87,10 @@ public void setUp() throws Exception { /** * @throws java.lang.Exception - exception */ - @After + @Override + @AfterEach public void tearDown() throws Exception { - User.clearUsers(); - Mockito.framework().clearInlineMocks(); + super.tearDown(); } @@ -177,8 +146,8 @@ public void checkSpigotMessage(String expectedMessage, int expectedOccurrences) .count(); // Count how many times the expected message appears // Assert that the number of occurrences matches the expectedOccurrences - assertEquals("Expected message occurrence mismatch: " + expectedMessage, expectedOccurrences, - actualOccurrences); + assertEquals(expectedOccurrences, + actualOccurrences, "Expected message occurrence mismatch: " + expectedMessage); } } diff --git a/src/test/java/world/bentobox/aoneblock/listeners/JoinLeaveListenerTest.java b/src/test/java/world/bentobox/aoneblock/listeners/JoinLeaveListenerTest.java index e88d1269..e19b073f 100644 --- a/src/test/java/world/bentobox/aoneblock/listeners/JoinLeaveListenerTest.java +++ b/src/test/java/world/bentobox/aoneblock/listeners/JoinLeaveListenerTest.java @@ -1,6 +1,6 @@ package world.bentobox.aoneblock.listeners; -import static org.junit.Assert.assertNotNull; +import static org.junit.jupiter.api.Assertions.assertNotNull; import static org.mockito.ArgumentMatchers.any; import static org.mockito.ArgumentMatchers.anyString; import static org.mockito.Mockito.never; @@ -10,56 +10,40 @@ import java.util.UUID; import java.util.concurrent.CompletableFuture; -import org.bukkit.Location; -import org.bukkit.World; -import org.bukkit.entity.Player; import org.bukkit.event.player.PlayerQuitEvent; import org.bukkit.util.Vector; -import org.junit.After; -import org.junit.Before; -import org.junit.Test; -import org.junit.runner.RunWith; +import org.junit.jupiter.api.AfterEach; +import org.junit.jupiter.api.BeforeEach; +import org.junit.jupiter.api.Test; import org.mockito.Mock; -import org.powermock.modules.junit4.PowerMockRunner; import world.bentobox.aoneblock.AOneBlock; -import world.bentobox.bentobox.database.objects.Island; -import world.bentobox.bentobox.managers.IslandsManager; +import world.bentobox.aoneblock.CommonTestSetup; /** * @author tastybento */ -@RunWith(PowerMockRunner.class) -public class JoinLeaveListenerTest { +public class JoinLeaveListenerTest extends CommonTestSetup { @Mock private AOneBlock aob; - @Mock - private Player p; - private JoinLeaveListener jll; @Mock private BlockListener bl; - @Mock - private Location location; - @Mock - private IslandsManager im; - @Mock - private Island island; - @Mock - private World world; private static final UUID ID = UUID.randomUUID(); private static final Vector VECTOR = new Vector(123,120,456); /** * @throws java.lang.Exception */ - @Before + @Override + @BeforeEach public void setUp() throws Exception { + super.setUp(); when(aob.getOverWorld()).thenReturn(world); // Player - when(p.getUniqueId()).thenReturn(ID); + when(mockPlayer.getUniqueId()).thenReturn(ID); // Island when(island.getCenter()).thenReturn(location); @@ -80,8 +64,10 @@ public void setUp() throws Exception { /** * @throws java.lang.Exception */ - @After + @Override + @AfterEach public void tearDown() throws Exception { + super.tearDown(); } /** @@ -97,7 +83,7 @@ public void testJoinLeaveListener() { */ @Test public void testOnPlayerQuit() { - PlayerQuitEvent event = new PlayerQuitEvent(p, "nothing"); + PlayerQuitEvent event = new PlayerQuitEvent(mockPlayer, "nothing"); jll.onPlayerQuit(event); verify(aob,never()).logError(anyString()); verify(bl).saveIsland(island); @@ -109,7 +95,7 @@ public void testOnPlayerQuit() { @Test public void testOnPlayerQuitNoIsland() { when(im.getIsland(world, ID)).thenReturn(null); - PlayerQuitEvent event = new PlayerQuitEvent(p, "nothing"); + PlayerQuitEvent event = new PlayerQuitEvent(mockPlayer, "nothing"); jll.onPlayerQuit(event); verify(aob,never()).logError(anyString()); verify(bl, never()).saveIsland(island); @@ -121,7 +107,7 @@ public void testOnPlayerQuitNoIsland() { @Test public void testOnPlayerQuitSaveError() { when(bl.saveIsland(any())).thenReturn(CompletableFuture.completedFuture(Boolean.FALSE)); - PlayerQuitEvent event = new PlayerQuitEvent(p, "nothing"); + PlayerQuitEvent event = new PlayerQuitEvent(mockPlayer, "nothing"); jll.onPlayerQuit(event); verify(aob).logError(anyString()); verify(bl).saveIsland(island); diff --git a/src/test/java/world/bentobox/aoneblock/listeners/NoBlockHandlerTest.java b/src/test/java/world/bentobox/aoneblock/listeners/NoBlockHandlerTest.java index 379f85b2..78f6a129 100644 --- a/src/test/java/world/bentobox/aoneblock/listeners/NoBlockHandlerTest.java +++ b/src/test/java/world/bentobox/aoneblock/listeners/NoBlockHandlerTest.java @@ -1,6 +1,6 @@ package world.bentobox.aoneblock.listeners; -import static org.junit.Assert.assertNotNull; +import static org.junit.jupiter.api.Assertions.assertNotNull; import static org.mockito.ArgumentMatchers.any; import static org.mockito.Mockito.never; import static org.mockito.Mockito.verify; @@ -8,60 +8,45 @@ import java.util.UUID; -import org.bukkit.Location; import org.bukkit.Material; -import org.bukkit.World; import org.bukkit.block.Block; -import org.bukkit.entity.Player; import org.bukkit.event.player.PlayerRespawnEvent; import org.bukkit.event.player.PlayerRespawnEvent.RespawnReason; -import org.junit.After; -import org.junit.Before; -import org.junit.Test; -import org.junit.runner.RunWith; +import org.junit.jupiter.api.AfterEach; +import org.junit.jupiter.api.BeforeEach; +import org.junit.jupiter.api.Test; import org.mockito.Mock; -import org.powermock.modules.junit4.PowerMockRunner; import world.bentobox.aoneblock.AOneBlock; -import world.bentobox.bentobox.database.objects.Island; -import world.bentobox.bentobox.managers.IslandsManager; +import world.bentobox.aoneblock.CommonTestSetup; /** * @author tastybento * */ -@RunWith(PowerMockRunner.class) -public class NoBlockHandlerTest { +public class NoBlockHandlerTest extends CommonTestSetup { private static final UUID ID = UUID.randomUUID(); @Mock private AOneBlock aob; - @Mock - private Player p; - + private NoBlockHandler nbh; @Mock private Block block; @Mock private BlockListener bl; - @Mock - private Location location; - @Mock - private IslandsManager im; - @Mock - private Island island; - @Mock - private World world; - + /** * @throws java.lang.Exception */ - @Before + @Override + @BeforeEach public void setUp() throws Exception { + super.setUp(); // Player - when(p.getUniqueId()).thenReturn(ID); + when(mockPlayer.getUniqueId()).thenReturn(ID); // In world when(aob.inWorld(world)).thenReturn(true); @@ -88,8 +73,10 @@ public void setUp() throws Exception { /** * @throws java.lang.Exception */ - @After + @Override + @AfterEach public void tearDown() throws Exception { + super.tearDown(); } /** @@ -107,7 +94,7 @@ public void testNoBlockHandler() { */ @Test public void testOnRespawnSolidBlock() { - PlayerRespawnEvent event = new PlayerRespawnEvent(p, location, false, false, false, RespawnReason.DEATH); + PlayerRespawnEvent event = new PlayerRespawnEvent(mockPlayer, location, false, false, false, RespawnReason.DEATH); nbh.onRespawn(event); verify(block, never()).setType(any(Material.class)); @@ -119,7 +106,7 @@ public void testOnRespawnSolidBlock() { @Test public void testOnRespawnAirBlock() { when(block.isEmpty()).thenReturn(true); - PlayerRespawnEvent event = new PlayerRespawnEvent(p, location, false, false, false, RespawnReason.DEATH); + PlayerRespawnEvent event = new PlayerRespawnEvent(mockPlayer, location, false, false, false, RespawnReason.DEATH); nbh.onRespawn(event); verify(block).setType(any(Material.class)); @@ -132,7 +119,7 @@ public void testOnRespawnAirBlock() { public void testOnRespawnAirBlockWrongWorld() { when(aob.inWorld(world)).thenReturn(false); when(block.isEmpty()).thenReturn(true); - PlayerRespawnEvent event = new PlayerRespawnEvent(p, location, false, false, true, RespawnReason.DEATH); + PlayerRespawnEvent event = new PlayerRespawnEvent(mockPlayer, location, false, false, true, RespawnReason.DEATH); nbh.onRespawn(event); verify(block, never()).setType(any(Material.class)); @@ -145,7 +132,7 @@ public void testOnRespawnAirBlockWrongWorld() { public void testOnRespawnAirBlockNoIsland() { when(im.getIsland(world, ID)).thenReturn(null); when(block.isEmpty()).thenReturn(true); - PlayerRespawnEvent event = new PlayerRespawnEvent(p, location, false, false, false, RespawnReason.DEATH); + PlayerRespawnEvent event = new PlayerRespawnEvent(mockPlayer, location, false, false, false, RespawnReason.DEATH); nbh.onRespawn(event); verify(block, never()).setType(any(Material.class)); diff --git a/src/test/java/world/bentobox/aoneblock/listeners/StartSafetyListenerTest.java b/src/test/java/world/bentobox/aoneblock/listeners/StartSafetyListenerTest.java index c3d351d8..644b5f54 100644 --- a/src/test/java/world/bentobox/aoneblock/listeners/StartSafetyListenerTest.java +++ b/src/test/java/world/bentobox/aoneblock/listeners/StartSafetyListenerTest.java @@ -1,10 +1,9 @@ package world.bentobox.aoneblock.listeners; -import static org.junit.Assert.assertEquals; -import static org.junit.Assert.assertNotNull; +import static org.junit.jupiter.api.Assertions.assertEquals; +import static org.junit.jupiter.api.Assertions.assertNotNull; import static org.mockito.ArgumentMatchers.any; import static org.mockito.ArgumentMatchers.anyLong; -import static org.mockito.ArgumentMatchers.anyString; import static org.mockito.ArgumentMatchers.eq; import static org.mockito.Mockito.verify; import static org.mockito.Mockito.when; @@ -13,101 +12,55 @@ import java.util.List; import java.util.Map; import java.util.Set; -import java.util.UUID; -import org.bukkit.Bukkit; import org.bukkit.Difficulty; import org.bukkit.GameMode; import org.bukkit.Location; -import org.bukkit.World; import org.bukkit.entity.EntityType; -import org.bukkit.entity.Player; import org.bukkit.event.player.PlayerMoveEvent; -import org.bukkit.scheduler.BukkitScheduler; import org.eclipse.jdt.annotation.NonNull; -import org.junit.After; -import org.junit.Before; -import org.junit.Test; -import org.junit.runner.RunWith; +import org.junit.jupiter.api.AfterEach; +import org.junit.jupiter.api.BeforeEach; +import org.junit.jupiter.api.Test; 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; import world.bentobox.aoneblock.AOneBlock; +import world.bentobox.aoneblock.CommonTestSetup; import world.bentobox.aoneblock.Settings; -import world.bentobox.bentobox.BentoBox; import world.bentobox.bentobox.api.configuration.WorldSettings; import world.bentobox.bentobox.api.events.island.IslandCreatedEvent; import world.bentobox.bentobox.api.events.island.IslandResetEvent; import world.bentobox.bentobox.api.flags.Flag; -import world.bentobox.bentobox.api.user.Notifier; import world.bentobox.bentobox.api.user.User; -import world.bentobox.bentobox.database.objects.Island; -import world.bentobox.bentobox.managers.IslandWorldManager; -import world.bentobox.bentobox.managers.LocalesManager; -import world.bentobox.bentobox.managers.PlaceholdersManager; /** * @author tastybento */ -@RunWith(PowerMockRunner.class) -@PrepareForTest({ Bukkit.class, BentoBox.class }) -public class StartSafetyListenerTest { +public class StartSafetyListenerTest extends CommonTestSetup { - private AOneBlock addon; private StartSafetyListener ssl; @Mock - private Island island; - private UUID uuid = UUID.randomUUID(); - @Mock - private Location location; - @Mock private Location location2; @Mock - private World world; - @Mock - private BentoBox plugin; - @Mock - private IslandWorldManager iwm; - @Mock private Flag flag; - private @NonNull WSettings ws = new WSettings(); - @Mock - private BukkitScheduler scheduler; - @Mock - private Player player; - @Mock - private LocalesManager lm; - @Mock - private PlaceholdersManager phm; - @Mock - private Notifier notifier; - + private final @NonNull WSettings ws = new WSettings(); /** * @throws java.lang.Exception */ - @Before + @Override + @BeforeEach public void setUp() throws Exception { + super.setUp(); - PowerMockito.mockStatic(Bukkit.class, Mockito.RETURNS_MOCKS); - when(Bukkit.getScheduler()).thenReturn(scheduler); - - // Set up plugin - Whitebox.setInternalState(BentoBox.class, "instance", plugin); - - addon = new AOneBlock(); + AOneBlock addon = new AOneBlock(); addon.setIslandWorld(world); addon.setSettings(new Settings()); // Player - when(player.getUniqueId()).thenReturn(uuid); - when(player.getWorld()).thenReturn(world); - User.getInstance(player); + when(mockPlayer.getUniqueId()).thenReturn(uuid); + when(mockPlayer.getWorld()).thenReturn(world); + User.getInstance(mockPlayer); when(world.getName()).thenReturn("world"); @@ -115,23 +68,12 @@ public void setUp() throws Exception { when(iwm.inWorld(world)).thenReturn(true); when(iwm.getWorldSettings(world)).thenReturn(ws); - when(plugin.getIWM()).thenReturn(iwm); when(location.getWorld()).thenReturn(world); when(location2.getWorld()).thenReturn(world); when(island.getWorld()).thenReturn(world); when(island.getCenter()).thenReturn(location); - when(plugin.getNotifier()).thenReturn(notifier); - - // Placeholders - when(phm.replacePlaceholders(any(), anyString())) - .thenAnswer((Answer) invocation -> invocation.getArgument(1, String.class)); - - // BentoBox - when(plugin.getLocalesManager()).thenReturn(lm); - when(plugin.getPlaceholdersManager()).thenReturn(phm); - when(location2.getX()).thenReturn(0.5D); addon.START_SAFETY.setSetting(world, true); @@ -142,9 +84,10 @@ public void setUp() throws Exception { /** * @throws java.lang.Exception */ - @After + @Override + @AfterEach public void tearDown() throws Exception { - User.clearUsers(); + super.tearDown(); } /** @@ -162,7 +105,7 @@ public void testStartSafetyListener() { public void testOnNewIsland() { IslandCreatedEvent e = new IslandCreatedEvent(island, uuid, false, location); ssl.onNewIsland(e); - verify(scheduler).runTaskLater(eq(plugin), any(Runnable.class), anyLong()); + verify(sch).runTaskLater(eq(plugin), any(Runnable.class), anyLong()); } /** @@ -172,7 +115,7 @@ public void testOnNewIsland() { public void testOnResetIsland() { IslandResetEvent e = new IslandResetEvent(island, uuid, false, location, null, island); ssl.onResetIsland(e); - verify(scheduler).runTaskLater(eq(plugin), any(Runnable.class), anyLong()); + verify(sch).runTaskLater(eq(plugin), any(Runnable.class), anyLong()); } @@ -182,18 +125,18 @@ public void testOnResetIsland() { @Test public void testOnPlayerMove() { testOnResetIsland(); - PlayerMoveEvent e = new PlayerMoveEvent(player, location, location2); + PlayerMoveEvent e = new PlayerMoveEvent(mockPlayer, location, location2); ssl.onPlayerMove(e); // No movement assertEquals(0D, e.getTo().getX(), 0D); assertEquals(0D, e.getTo().getZ(), 0D); - verify(player).isSneaking(); + verify(mockPlayer).isSneaking(); } class WSettings implements WorldSettings { - private Map flags = new HashMap<>(); + private final Map flags = new HashMap<>(); @Override public GameMode getDefaultGameMode() { diff --git a/src/test/java/world/bentobox/aoneblock/oneblocks/OneBlocksManagerTest3.java b/src/test/java/world/bentobox/aoneblock/oneblocks/OneBlocksManagerTest3.java index 57323b39..7bef532d 100644 --- a/src/test/java/world/bentobox/aoneblock/oneblocks/OneBlocksManagerTest3.java +++ b/src/test/java/world/bentobox/aoneblock/oneblocks/OneBlocksManagerTest3.java @@ -1,12 +1,10 @@ package world.bentobox.aoneblock.oneblocks; -import static org.junit.Assert.assertEquals; -import static org.junit.Assert.assertFalse; -import static org.junit.Assert.assertNull; -import static org.junit.Assert.assertTrue; -import static org.mockito.ArgumentMatchers.any; +import static org.junit.jupiter.api.Assertions.assertEquals; +import static org.junit.jupiter.api.Assertions.assertFalse; +import static org.junit.jupiter.api.Assertions.assertNull; +import static org.junit.jupiter.api.Assertions.assertTrue; import static org.mockito.ArgumentMatchers.anyString; -import static org.mockito.Mockito.mock; import static org.mockito.Mockito.never; import static org.mockito.Mockito.verify; import static org.mockito.Mockito.when; @@ -15,65 +13,47 @@ import java.io.FileInputStream; import java.io.FileOutputStream; import java.io.IOException; -import java.nio.file.Files; -import java.nio.file.Path; -import java.util.Comparator; import java.util.List; import java.util.NavigableMap; import java.util.jar.JarEntry; import java.util.jar.JarOutputStream; -import org.bukkit.Bukkit; import org.bukkit.Material; -import org.bukkit.UnsafeValues; import org.bukkit.block.Biome; import org.bukkit.configuration.InvalidConfigurationException; import org.bukkit.configuration.file.YamlConfiguration; -import org.bukkit.inventory.ItemFactory; -import org.bukkit.inventory.meta.ItemMeta; import org.eclipse.jdt.annotation.NonNull; import org.eclipse.jdt.annotation.Nullable; -import org.junit.After; -import org.junit.AfterClass; -import org.junit.Before; -import org.junit.BeforeClass; -import org.junit.Ignore; -import org.junit.Test; -import org.junit.runner.RunWith; +import org.junit.jupiter.api.AfterAll; +import org.junit.jupiter.api.AfterEach; +import org.junit.jupiter.api.BeforeAll; +import org.junit.jupiter.api.BeforeEach; +import org.junit.jupiter.api.Disabled; +import org.junit.jupiter.api.Test; import org.mockito.Mock; -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.aoneblock.AOneBlock; +import world.bentobox.aoneblock.CommonTestSetup; import world.bentobox.aoneblock.dataobjects.OneBlockIslands; -import world.bentobox.bentobox.BentoBox; import world.bentobox.bentobox.api.addons.AddonDescription; -import world.bentobox.bentobox.api.user.User; import world.bentobox.bentobox.managers.AddonsManager; /** * @author tastybento * */ -@RunWith(PowerMockRunner.class) -@PrepareForTest({ Bukkit.class, BentoBox.class, User.class }) -public class OneBlocksManagerTest3 { +public class OneBlocksManagerTest3 extends CommonTestSetup { private static File jFile; private static YamlConfiguration oneBlocks; - @Mock - private BentoBox plugin; - private AOneBlock addon; - @Mock + @Mock private AddonsManager am; private OneBlocksManager obm; private OneBlockPhase obPhase; @Mock private @NonNull OneBlockIslands obi; - @BeforeClass + @BeforeAll public static void beforeClass() throws IOException, InvalidConfigurationException { // Make the addon jar jFile = new File("addon.jar"); @@ -83,12 +63,33 @@ public static void beforeClass() throws IOException, InvalidConfigurationExcepti * Paths.get("config.yml"); Files.copy(fromPath, path); */ // Dummy oneblocks.yml - String oneblocks = "'0':\n" + " name: Plains\n" + " icon: GRASS_BLOCK\n" + " firstBlock: GRASS_BLOCK\n" - + " biome: PLAINS\n" + " fixedBlocks:\n" + " 0: GRASS_BLOCK\n" + " 1: GRASS_BLOCK\n" - + " holograms:\n" + " 0: &aGood Luck!\n" + " blocks:\n" + " GRASS_BLOCK: 2000\n" - + " BIRCH_LOG: 500\n" + " mobs:\n" + " SHEEP: 150\n" + " VILLAGER: 30\n" + "'700':\n" - + " name: Underground\n" + " firstBlock: STONE\n" + " biome: TAIGA\n" + " blocks:\n" - + " EMERALD_ORE: 5\n" + " COBWEB: 250\n" + " DIRT: 500\n" + "'11000':\n" + " gotoBlock: 0"; + String oneblocks = """ + '0': + name: Plains + icon: GRASS_BLOCK + firstBlock: GRASS_BLOCK + biome: PLAINS + fixedBlocks: + 0: GRASS_BLOCK + 1: GRASS_BLOCK + holograms: + 0: &aGood Luck! + blocks: + GRASS_BLOCK: 2000 + BIRCH_LOG: 500 + mobs: + SHEEP: 150 + VILLAGER: 30 + '700': + name: Underground + firstBlock: STONE + biome: TAIGA + blocks: + EMERALD_ORE: 5 + COBWEB: 250 + DIRT: 500 + '11000': + gotoBlock: 0"""; oneBlocks = new YamlConfiguration(); oneBlocks.loadFromString(oneblocks); // Save @@ -119,32 +120,21 @@ public static void beforeClass() throws IOException, InvalidConfigurationExcepti /** * @throws java.lang.Exception */ - @Before + @Override + @BeforeEach public void setUp() throws Exception { - // Set up plugin - Whitebox.setInternalState(BentoBox.class, "instance", plugin); + super.setUp(); // Addon - addon = new AOneBlock(); + AOneBlock addon = new AOneBlock(); File dataFolder = new File("addons/AOneBlock"); addon.setDataFolder(dataFolder); addon.setFile(jFile); AddonDescription desc = new AddonDescription.Builder("bentobox", "AOneBlock", "1.3").description("test") .authors("tastybento").build(); addon.setDescription(desc); - // addon.setSettings(new Settings()); // Addons manager when(plugin.getAddonsManager()).thenReturn(am); - // Bukkit - PowerMockito.mockStatic(Bukkit.class); - ItemMeta meta = mock(ItemMeta.class); - ItemFactory itemFactory = mock(ItemFactory.class); - when(itemFactory.getItemMeta(any())).thenReturn(meta); - when(Bukkit.getItemFactory()).thenReturn(itemFactory); - UnsafeValues unsafe = mock(UnsafeValues.class); - when(unsafe.getDataVersion()).thenReturn(777); - when(Bukkit.getUnsafe()).thenReturn(unsafe); - // Phase obPhase = new OneBlockPhase("0"); @@ -155,12 +145,14 @@ public void setUp() throws Exception { /** * @throws java.lang.Exception */ - @After + @Override + @AfterEach public void tearDown() throws Exception { + super.tearDown(); deleteAll(new File("database")); } - @AfterClass + @AfterAll public static void cleanUp() throws Exception { new File("addon.jar").delete(); @@ -170,20 +162,13 @@ public static void cleanUp() throws Exception { deleteAll(new File("phases")); } - private static void deleteAll(File file) throws IOException { - if (file.exists()) { - Files.walk(file.toPath()).sorted(Comparator.reverseOrder()).map(Path::toFile).forEach(File::delete); - } - } - /** * Test method for * {@link world.bentobox.aoneblock.oneblocks.OneBlocksManager#OneBlocksManager(world.bentobox.aoneblock.AOneBlock)}. - * - * @throws IOException - */ + * + */ @Test - public void testOneBlocksManager() throws IOException { + public void testOneBlocksManager() { File f = new File("phases", "0_plains.yml"); assertTrue(f.exists()); } @@ -192,13 +177,12 @@ public void testOneBlocksManager() throws IOException { * Test method for * {@link world.bentobox.aoneblock.oneblocks.OneBlocksManager#loadPhases()}. * - * @throws InvalidConfigurationException * @throws IOException * @throws NumberFormatException */ // @Ignore("Cannot deserialize objects right now") @Test - public void testLoadPhases() throws NumberFormatException, IOException, InvalidConfigurationException { + public void testLoadPhases() throws NumberFormatException, IOException { obm.loadPhases(); verify(plugin, never()).logError(anyString()); assertEquals(Material.GRASS_BLOCK, obm.getPhase(0).getFirstBlock().getMaterial()); @@ -253,15 +237,14 @@ public void testGetPhaseString() throws NumberFormatException, IOException, Inva * Test method for * {@link world.bentobox.aoneblock.oneblocks.OneBlocksManager#saveOneBlockConfig()}. * - * @throws InvalidConfigurationException - * @throws IOException * @throws NumberFormatException + * @throws IOException */ - @Ignore("Not saving") + @Disabled("Not saving") @Test - public void testSaveOneBlockConfig() throws NumberFormatException, IOException, InvalidConfigurationException { - // testLoadPhases(); - // assertTrue(obm.saveOneBlockConfig()); + public void testSaveOneBlockConfig() throws NumberFormatException, IOException { + testLoadPhases(); + assertTrue(obm.saveOneBlockConfig()); } /** @@ -307,7 +290,7 @@ public void testCopyPhasesFromAddonJar() throws IOException { * @throws IOException */ @Test - @Ignore + @Disabled public void testInitBlock() throws IOException { System.out.println(oneBlocks); obm.initBlock("0", obPhase, oneBlocks); @@ -383,7 +366,7 @@ public void testAddMobs() throws IOException { * {@link world.bentobox.aoneblock.oneblocks.OneBlocksManager#addBlocks(world.bentobox.aoneblock.oneblocks.OneBlockPhase, org.bukkit.configuration.ConfigurationSection)}. */ @Test - public void testAddBlocks() throws IOException { + public void testAddBlocks() { obm.addBlocks(obPhase, oneBlocks); }