From 153e8be6a0d203a9ff3c534e4879929fbe83b2dd Mon Sep 17 00:00:00 2001 From: BONNe Date: Tue, 17 May 2022 12:32:25 +0300 Subject: [PATCH 01/23] Init next version --- pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pom.xml b/pom.xml index 0c9c8b5..676cc30 100644 --- a/pom.xml +++ b/pom.xml @@ -66,7 +66,7 @@ -LOCAL - 1.12.0 + 1.13.0 BentoBoxWorld_Warps bentobox-world From 57162145276fb5da7dc21f4de076f25bdfd71c3b Mon Sep 17 00:00:00 2001 From: wiktorm12 Date: Tue, 23 Aug 2022 07:53:37 +0000 Subject: [PATCH 02/23] Translate pl.yml via GitLocalize --- src/main/resources/locales/pl.yml | 53 +++++++++++++++++++------------ 1 file changed, 33 insertions(+), 20 deletions(-) diff --git a/src/main/resources/locales/pl.yml b/src/main/resources/locales/pl.yml index 9840a95..698a908 100644 --- a/src/main/resources/locales/pl.yml +++ b/src/main/resources/locales/pl.yml @@ -1,27 +1,40 @@ +--- warp: help: description: teleportuje cię do tabliczki innego gracza - parameters: + parameters: "" warps: - deactivate: '&c Stary teleport zdezaktywowany!' + deactivate: "&c Stary teleport zdezaktywowany!" error: - does-not-exist: '&c Ten teleport nie istnieje.' - no-permission: '&c Brak uprawnień!' - no-remove: '&c Nie możesz usunąć tej tabliczki!' - no-warps-yet: '&c Nie ma jeszcze teleportów.' - not-enough-level: '&c Twój poziom wyspy nie jest wystarczająco wysoki!' - not-on-island: '&c Musisz być na wyspie, by to zrobić.' - not-safe: '&c Ten teleport nie jest bezpieczny!' - your-level-is: '&c Twój poziom wyspy to [level], a musi wynosić co namniej [required]. - Użyj komendy /is level.' + does-not-exist: "&c Ten teleport nie istnieje." + no-permission: "&c Brak uprawnień!" + no-remove: "&c Nie możesz usunąć tej tabliczki!" + no-warps-yet: "&c Nie ma jeszcze teleportów." + not-enough-level: "&c Twój poziom wyspy nie jest wystarczająco wysoki!" + not-on-island: "&c Musisz być na wyspie, by to zrobić." + not-safe: "&c Ten teleport nie jest bezpieczny!" + your-level-is: "&c Twój poziom wyspy to [level], a musi wynosić co namniej [required]. + Użyj komendy /is level." help: description: otwiera panel warpów - next: '&6 Następna strona' - player-warped: '&2 [name] teleportował się do twojej tabliczki!' - previous: '&6 Poprzednia strona' - random: '&4 Losowy teleport' - sign-removed: '&c Usunięto tabliczkę!' - success: '&a Sukces!' - title: Tabliczki teleportacyjne - warpTip: '&6 Postaw tabliczkę z napisem [text]' - warpToPlayersSign: '&6 Teleportowanie do tabliczki gracza [player]' + player-warped: "&2 [name] teleportował się do twojej tabliczki!" + sign-removed: "&c Usunięto tabliczkę!" + success: "&a Sukces!" + warpTip: "&6 Postaw tabliczkę z napisem [text]" + warpToPlayersSign: "&6 Teleportowanie do tabliczki gracza [player]" + gui: + titles: + warp-title: "&0&l Lista dostępnych wysp" + buttons: + previous: + description: "&7 Przełącz na stronę [number]" + next: + description: "&7 Przełącz na stronę [number]" + warp: + name: "&f&l [name]" + description: "[sing_text]" + random: + name: "&f&l Losowa wyspa" + tips: + click-to-warp: "&e Kliknij &7, aby przenieść." + conversations: {} From 39b94e09d89e10b3a8f3991a346f138605ff4577 Mon Sep 17 00:00:00 2001 From: mt-gitlocalize Date: Tue, 23 Aug 2022 07:53:37 +0000 Subject: [PATCH 03/23] Translate pl.yml via GitLocalize --- src/main/resources/locales/pl.yml | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) diff --git a/src/main/resources/locales/pl.yml b/src/main/resources/locales/pl.yml index 698a908..7dc32e8 100644 --- a/src/main/resources/locales/pl.yml +++ b/src/main/resources/locales/pl.yml @@ -27,14 +27,20 @@ warps: warp-title: "&0&l Lista dostępnych wysp" buttons: previous: + name: "&f&l Poprzednia strona" description: "&7 Przełącz na stronę [number]" next: + name: "&f&l następna strona" description: "&7 Przełącz na stronę [number]" warp: name: "&f&l [name]" description: "[sing_text]" random: name: "&f&l Losowa wyspa" + description: "&7 Hmm, gdzie się pojawię?" tips: + click-to-previous: "&e Kliknij &7, aby wyświetlić poprzednią stronę." + click-to-next: "&e Kliknij &7, aby wyświetlić następną stronę." click-to-warp: "&e Kliknij &7, aby przenieść." - conversations: {} + conversations: + prefix: "&l&6 [BentoBox]: &r" From 7dbb5d39adc3b8c0091675aaa914a1afd87c2a68 Mon Sep 17 00:00:00 2001 From: DevSolaris <105156235+DevSolaris@users.noreply.github.com> Date: Wed, 18 Jan 2023 22:14:50 +0100 Subject: [PATCH 04/23] Add gamemode placeholder to message (#115) --- .../world/bentobox/warps/managers/WarpSignsManager.java | 7 ++++++- src/main/resources/locales/en-US.yml | 2 +- 2 files changed, 7 insertions(+), 2 deletions(-) diff --git a/src/main/java/world/bentobox/warps/managers/WarpSignsManager.java b/src/main/java/world/bentobox/warps/managers/WarpSignsManager.java index e635bfd..05bda2b 100644 --- a/src/main/java/world/bentobox/warps/managers/WarpSignsManager.java +++ b/src/main/java/world/bentobox/warps/managers/WarpSignsManager.java @@ -363,7 +363,12 @@ public class WarpSignsManager { user.getWorld().playSound(Objects.requireNonNull(user.getLocation()), Sound.ENTITY_BAT_TAKEOFF, 1F, 1F); } if (!warpOwner.equals(user)) { - warpOwner.sendMessage("warps.player-warped", "[name]", user.getName()); + final String gameMode = BentoBox + .getInstance() + .getIWM() + .getFriendlyName(actualWarp.getWorld()); + + warpOwner.sendMessage("warps.player-warped", "[name]", user.getName(), "[gamemode]", gameMode); } } diff --git a/src/main/resources/locales/en-US.yml b/src/main/resources/locales/en-US.yml index 757677e..1ba6190 100755 --- a/src/main/resources/locales/en-US.yml +++ b/src/main/resources/locales/en-US.yml @@ -20,7 +20,7 @@ warps: your-level-is: "&c Your island level is only [level] and must be higher than [required]. Run the level command." help: description: "open the warps panel" - player-warped: "&2 [name] warped to your warp sign!" + player-warped: "&2 [name] warped to your [gamemode] warp sign!" sign-removed: "&c Warp sign removed!" success: "&a Success!" warpTip: "&6 Place a warp sign with [text] on the top" From b3a36c75bb59a7019f27cfb203469065569a5855 Mon Sep 17 00:00:00 2001 From: DevSolaris <105156235+DevSolaris@users.noreply.github.com> Date: Thu, 19 Jan 2023 21:56:31 +0100 Subject: [PATCH 05/23] Create set warp flag (#117) --- src/main/java/world/bentobox/warps/Warp.java | 23 +++++++ .../world/bentobox/warps/config/Settings.java | 22 ++++++- .../warps/listeners/WarpSignsListener.java | 56 +++++++++++++++-- src/main/resources/config.yml | 5 ++ src/main/resources/locales/en-US.yml | 9 ++- .../listeners/WarpSignsListenerTest.java | 61 +++++++++++++++++-- 6 files changed, 164 insertions(+), 12 deletions(-) diff --git a/src/main/java/world/bentobox/warps/Warp.java b/src/main/java/world/bentobox/warps/Warp.java index fc762a8..fe3838c 100644 --- a/src/main/java/world/bentobox/warps/Warp.java +++ b/src/main/java/world/bentobox/warps/Warp.java @@ -7,10 +7,13 @@ import java.util.Set; import java.util.UUID; import org.bukkit.Bukkit; +import org.bukkit.Material; import org.bukkit.World; import world.bentobox.bentobox.api.addons.Addon; import world.bentobox.bentobox.api.configuration.Config; +import world.bentobox.bentobox.api.flags.Flag; +import world.bentobox.bentobox.managers.RanksManager; import world.bentobox.bentobox.util.Util; import world.bentobox.level.Level; import world.bentobox.warps.commands.WarpCommand; @@ -71,6 +74,11 @@ public class Warp extends Addon { */ private Config settingsConfig; + /** + * Create Warp Flag + */ + private Flag createWarpFlag; + // --------------------------------------------------------------------- // Section: Methods // --------------------------------------------------------------------- @@ -146,6 +154,14 @@ public class Warp extends Addon { logWarning("Addon did not hook into anything and is not running stand-alone"); this.setState(State.DISABLED); } + + this.createWarpFlag = new Flag.Builder("SET-WARP", Material.OAK_SIGN) + .addon(this) + .defaultRank(RanksManager.MEMBER_RANK) + .mode(Flag.Mode.EXPERT) + .build(); + + getPlugin().getFlagsManager().registerFlag(this, this.createWarpFlag); } @@ -213,6 +229,13 @@ public class Warp extends Addon { return settings; } + /** + * @return the createWarpFlag + */ + public Flag getCreateWarpFlag() { + return createWarpFlag; + } + /** * Get the island level * @param world - world diff --git a/src/main/java/world/bentobox/warps/config/Settings.java b/src/main/java/world/bentobox/warps/config/Settings.java index 5e9bfbb..883687b 100644 --- a/src/main/java/world/bentobox/warps/config/Settings.java +++ b/src/main/java/world/bentobox/warps/config/Settings.java @@ -23,6 +23,13 @@ public class Settings implements ConfigObject @ConfigEntry(path = "warplevelrestriction") private int warpLevelRestriction = 10; + @ConfigComment("") + @ConfigComment("Should warps be removed when the island protection settings") + @ConfigComment("change, and the owner of the warp does no longer have") + @ConfigComment("the correct rank") + @ConfigEntry(path = "removeExistingWarpsWhenFlagChanges") + private boolean removeExistingWarpsWhenFlagChanges = false; + @ConfigComment("") @ConfigComment("Text that player must put on sign to make it a warp sign") @ConfigComment("Not case sensitive!") @@ -55,7 +62,6 @@ public class Settings implements ConfigObject @ConfigEntry(path = "warps-command") String warpsCommand = "warps"; - // --------------------------------------------------------------------- // Section: Constructor // --------------------------------------------------------------------- @@ -198,4 +204,18 @@ public class Settings implements ConfigObject public void setWarpsCommand(String warpsCommand) { this.warpsCommand = warpsCommand; } + + /** + * @return the removeExistingWarpsWhenFlagChanges + */ + public boolean getRemoveExistingWarpsWhenFlagChanges() { + return removeExistingWarpsWhenFlagChanges; + } + + /** + * @param removeExistingWarpsWhenFlagChanges the removeExistingWarpsWhenFlagChanges to set + */ + public void setRemoveExistingWarpsWhenFlagChanges(boolean removeExistingWarpsWhenFlagChanges) { + this.removeExistingWarpsWhenFlagChanges = removeExistingWarpsWhenFlagChanges; + } } diff --git a/src/main/java/world/bentobox/warps/listeners/WarpSignsListener.java b/src/main/java/world/bentobox/warps/listeners/WarpSignsListener.java index 36d2805..0be6ef1 100644 --- a/src/main/java/world/bentobox/warps/listeners/WarpSignsListener.java +++ b/src/main/java/world/bentobox/warps/listeners/WarpSignsListener.java @@ -1,10 +1,7 @@ package world.bentobox.warps.listeners; -import java.util.HashMap; -import java.util.Iterator; -import java.util.Map; -import java.util.Objects; -import java.util.UUID; +import java.util.*; +import java.util.stream.Collectors; import org.bukkit.Bukkit; import org.bukkit.ChatColor; @@ -25,9 +22,11 @@ import org.eclipse.jdt.annotation.Nullable; import world.bentobox.bentobox.BentoBox; import world.bentobox.bentobox.api.events.addon.AddonEvent; +import world.bentobox.bentobox.api.events.flags.FlagProtectionChangeEvent; import world.bentobox.bentobox.api.events.team.TeamKickEvent; import world.bentobox.bentobox.api.events.team.TeamLeaveEvent; import world.bentobox.bentobox.api.user.User; +import world.bentobox.bentobox.database.objects.Island; import world.bentobox.bentobox.util.Util; import world.bentobox.warps.Warp; import world.bentobox.warps.event.WarpRemoveEvent; @@ -164,6 +163,13 @@ public class WarpSignsListener implements Listener { e.setLine(0, ChatColor.RED + addon.getSettings().getWelcomeLine()); return; } + + if(!hasCorrectIslandRank(b, user)) { + e.setLine(0, ChatColor.RED + addon.getSettings().getWelcomeLine()); + user.sendMessage("warps.error.not-correct-rank"); + return; + } + // Check if the player already has a sign final Location oldSignLoc = addon.getWarpSignsManager().getWarp(b.getWorld(), user.getUniqueId()); if (oldSignLoc != null) { @@ -192,6 +198,46 @@ public class WarpSignsListener implements Listener { } + private boolean hasCorrectIslandRank(Block b, User user) { + final Optional islandOpt = plugin.getIslands().getIslandAt(b.getLocation()); + + if(islandOpt.isEmpty()) return false; + + final Island island = islandOpt.get(); + + final int userRank = island.getRank(user); + + return userRank >= island.getFlag(addon.getCreateWarpFlag()); + } + + @EventHandler + public void onFlagChange(FlagProtectionChangeEvent e) { + if(!e.getEditedFlag().equals(addon.getCreateWarpFlag())) return; + if(!addon.getSettings().getRemoveExistingWarpsWhenFlagChanges()) return; + + final Island island = e.getIsland(); + + final Map islandWarps = addon + .getWarpSignsManager() + .getWarpMap(island.getWorld()) + .entrySet() + .stream() + .filter(x -> island.inIslandSpace(x.getValue())) + .collect(Collectors.toMap(Map.Entry::getKey, Map.Entry::getValue)); + + for(Map.Entry entry : islandWarps.entrySet()) { + if(island.getRank(entry.getKey()) >= e.getSetTo()) continue; + + //The user has a lower rank than the new set value. + //We need to remove the warp. + addon.getWarpSignsManager().removeWarp(island.getWorld(), entry.getKey()); + + if(Bukkit.getPlayer(entry.getKey()) != null) { + Objects.requireNonNull(User.getInstance(entry.getKey())).sendMessage(WARPS_DEACTIVATE); + } + } + } + private boolean noLevelOrIsland(User user, World world) { // Get level if level addon is available Long level = addon.getLevel(Util.getWorld(world), user.getUniqueId()); diff --git a/src/main/resources/config.yml b/src/main/resources/config.yml index a647e5c..1975fd0 100644 --- a/src/main/resources/config.yml +++ b/src/main/resources/config.yml @@ -7,6 +7,11 @@ # Warp Restriction - needed levels to be able to create a warp # 0 or negative values will disable this restriction 10 is default warplevelrestriction: 10 +# +# Should warps be removed when the island protection settings +# change, and the owner of the warp does no longer have +# the correct rank +removeExistingWarpsWhenFlagChanges: true # # Text that player must put on sign to make it a warp sign # Not case sensitive! diff --git a/src/main/resources/locales/en-US.yml b/src/main/resources/locales/en-US.yml index 1ba6190..cd880e3 100755 --- a/src/main/resources/locales/en-US.yml +++ b/src/main/resources/locales/en-US.yml @@ -18,7 +18,8 @@ warps: not-on-island: "&c You must be on your island to do that!" not-safe: "&c That warp is not safe!" your-level-is: "&c Your island level is only [level] and must be higher than [required]. Run the level command." - help: + not-correct-rank: "&c You do not have the correct rank to set a warp!" + help: description: "open the warps panel" player-warped: "&2 [name] warped to your [gamemode] warp sign!" sign-removed: "&c Warp sign removed!" @@ -59,4 +60,8 @@ warps: # Prefix for messages that are send from server. prefix: "&l&6 [BentoBox]: &r" - +protection: + flags: + SET-WARP: + name: Set warp + description: Allow setting up warp signs diff --git a/src/test/java/world/bentobox/warps/listeners/WarpSignsListenerTest.java b/src/test/java/world/bentobox/warps/listeners/WarpSignsListenerTest.java index 9ecb1c6..f98d1be 100644 --- a/src/test/java/world/bentobox/warps/listeners/WarpSignsListenerTest.java +++ b/src/test/java/world/bentobox/warps/listeners/WarpSignsListenerTest.java @@ -8,10 +8,7 @@ import static org.junit.Assert.assertTrue; import static org.mockito.ArgumentMatchers.any; import static org.mockito.ArgumentMatchers.anyInt; import static org.mockito.ArgumentMatchers.anyString; -import static org.mockito.Mockito.mock; -import static org.mockito.Mockito.never; -import static org.mockito.Mockito.verify; -import static org.mockito.Mockito.when; +import static org.mockito.Mockito.*; import java.util.HashMap; import java.util.Map; @@ -44,7 +41,10 @@ import org.powermock.core.classloader.annotations.PrepareForTest; import org.powermock.modules.junit4.PowerMockRunner; import world.bentobox.bentobox.BentoBox; +import world.bentobox.bentobox.api.events.flags.FlagProtectionChangeEvent; +import world.bentobox.bentobox.api.flags.Flag; 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.IslandsManager; import world.bentobox.bentobox.managers.LocalesManager; @@ -83,6 +83,8 @@ public class WarpSignsListenerTest { private IslandsManager im; @Mock private IslandWorldManager iwm; + @Mock + private Island island; @Before public void setUp() { @@ -148,6 +150,9 @@ public class WarpSignsListenerTest { when(settings.getWelcomeLine()).thenReturn("[WELCOME]"); when(addon.getSettings()).thenReturn(settings); + island = mock(Island.class); + when(im.getIslandAt(any())).thenReturn(Optional.of(island)); + // On island when(plugin.getIslands()).thenReturn(im); when(im.userIsOnIsland(any(World.class), any(User.class))).thenReturn(true); @@ -299,6 +304,54 @@ public class WarpSignsListenerTest { assertEquals(ChatColor.GREEN + "[WELCOME]", e.getLine(0)); } + @Test + public void testOnCreateWithoutCorrectRankNotAllowed() { + WarpSignsListener wsl = new WarpSignsListener(addon); + SignChangeEvent e = new SignChangeEvent(block, player, lines); + when(player.hasPermission(anyString())).thenReturn(true); + when(addon.inRegisteredWorld(any())).thenReturn(true); + when(island.getRank(player.getUniqueId())).thenReturn(0); + when(island.getFlag(any())).thenReturn(1000); + wsl.onSignWarpCreate(e); + verify(player).sendMessage("warps.error.not-correct-rank"); + } + + @Test + public void testOnFlagChangeWhenSettingIsOffNothingHappens() { + Flag flag = mock(Flag.class); + + when(addon.getCreateWarpFlag()).thenReturn(flag); + when(settings.getRemoveExistingWarpsWhenFlagChanges()).thenReturn(false); + WarpSignsListener wsl = new WarpSignsListener(addon); + + FlagProtectionChangeEvent e = new FlagProtectionChangeEvent(island, player.getUniqueId(), flag, 1000); + + wsl.onFlagChange(e); + + verifyNoInteractions(island); + } + + @Test + public void testOnFlagChangeWhenSettingIsOnWarpGetsRemoved() { + Flag flag = mock(Flag.class); + + when(addon.getCreateWarpFlag()).thenReturn(flag); + when(settings.getRemoveExistingWarpsWhenFlagChanges()).thenReturn(true); + WarpSignsListener wsl = new WarpSignsListener(addon); + + Map warps = Map.of( + player.getUniqueId(), block.getLocation() + ); + + when(wsm.getWarpMap(any())).thenReturn(warps); + when(island.inIslandSpace(any(Location.class))).thenReturn(true); + + FlagProtectionChangeEvent e = new FlagProtectionChangeEvent(island, player.getUniqueId(), flag, 1000); + + wsl.onFlagChange(e); + verify(addon.getWarpSignsManager()).removeWarp(any(), any()); + } + @Test public void testOnCreateNotGameWorldNotAllowed() { when(settings.isAllowInOtherWorlds()).thenReturn(false); From 8be844b59fe2e3aa8948a52744033678f40ef8f7 Mon Sep 17 00:00:00 2001 From: DevSolaris <105156235+DevSolaris@users.noreply.github.com> Date: Thu, 19 Jan 2023 21:59:39 +0100 Subject: [PATCH 06/23] Closes #69 - Fix message from being sent when the user is banned. (#116) --- .../warps/managers/WarpSignsManager.java | 47 +++++++++++-------- .../bentobox/warps/WarpSignsManagerTest.java | 1 + 2 files changed, 28 insertions(+), 20 deletions(-) diff --git a/src/main/java/world/bentobox/warps/managers/WarpSignsManager.java b/src/main/java/world/bentobox/warps/managers/WarpSignsManager.java index 05bda2b..fe00ca5 100644 --- a/src/main/java/world/bentobox/warps/managers/WarpSignsManager.java +++ b/src/main/java/world/bentobox/warps/managers/WarpSignsManager.java @@ -26,7 +26,6 @@ import org.bukkit.block.Block; import org.bukkit.block.BlockFace; import org.bukkit.block.Sign; import org.bukkit.event.player.PlayerTeleportEvent.TeleportCause; -import org.bukkit.permissions.PermissionAttachmentInfo; import org.eclipse.jdt.annotation.NonNull; import org.eclipse.jdt.annotation.Nullable; @@ -350,26 +349,34 @@ public class WarpSignsManager { float yaw = Util.blockFaceToFloat(directionFacing); final Location actualWarp = new Location(inFront.getWorld(), inFront.getBlockX() + 0.5D, inFront.getBlockY(), inFront.getBlockZ() + 0.5D, yaw, 30F); - Util.teleportAsync(user.getPlayer(), actualWarp, TeleportCause.COMMAND); - User warpOwner = Objects.requireNonNull(User.getInstance(signOwner)); - // Hide invisible players - if (warpOwner.isOnline() && !warpOwner.getPlayer().canSee(user.getPlayer())) { - return; - } - if (pvp) { - user.sendMessage("protection.flags.PVP_OVERWORLD.enabled"); - user.getWorld().playSound(Objects.requireNonNull(user.getLocation()), Sound.ENTITY_ARROW_HIT, 1F, 1F); - } else { - user.getWorld().playSound(Objects.requireNonNull(user.getLocation()), Sound.ENTITY_BAT_TAKEOFF, 1F, 1F); - } - if (!warpOwner.equals(user)) { - final String gameMode = BentoBox - .getInstance() - .getIWM() - .getFriendlyName(actualWarp.getWorld()); + //BentoBox prevents people from teleporting to an island when + //the user is banned from the island for example. + //By checking if the teleport succeeded before sending the messages, + //we prevent issues where no one teleported, but people still + //get messages about it. + Util.teleportAsync(user.getPlayer(), actualWarp, TeleportCause.COMMAND).thenAccept(tpResult -> { + if(!tpResult) return; - warpOwner.sendMessage("warps.player-warped", "[name]", user.getName(), "[gamemode]", gameMode); - } + User warpOwner = Objects.requireNonNull(User.getInstance(signOwner)); + // Hide invisible players + if (warpOwner.isOnline() && !warpOwner.getPlayer().canSee(user.getPlayer())) { + return; + } + if (pvp) { + user.sendMessage("protection.flags.PVP_OVERWORLD.enabled"); + user.getWorld().playSound(Objects.requireNonNull(user.getLocation()), Sound.ENTITY_ARROW_HIT, 1F, 1F); + } else { + user.getWorld().playSound(Objects.requireNonNull(user.getLocation()), Sound.ENTITY_BAT_TAKEOFF, 1F, 1F); + } + if (!warpOwner.equals(user)) { + final String gameMode = BentoBox + .getInstance() + .getIWM() + .getFriendlyName(actualWarp.getWorld()); + + warpOwner.sendMessage("warps.player-warped", "[name]", user.getName(), "[gamemode]", gameMode); + } + }); } /** diff --git a/src/test/java/world/bentobox/warps/WarpSignsManagerTest.java b/src/test/java/world/bentobox/warps/WarpSignsManagerTest.java index b9c474d..154d57a 100644 --- a/src/test/java/world/bentobox/warps/WarpSignsManagerTest.java +++ b/src/test/java/world/bentobox/warps/WarpSignsManagerTest.java @@ -428,6 +428,7 @@ public class WarpSignsManagerTest { when(p.getLocation()).thenReturn(location); @Nullable User u = User.getInstance(p); + PowerMockito.when(Util.teleportAsync(any(), any(), any())).thenReturn(CompletableFuture.completedFuture(true)); wsm.warpPlayer(world, u, uuid); PowerMockito.verifyStatic(Util.class); Util.teleportAsync(eq(p), any(), eq(TeleportCause.COMMAND)); From 363a628244ca753e5496c73f857e7b5ceab7aa9a Mon Sep 17 00:00:00 2001 From: BONNe Date: Thu, 19 Jan 2023 23:06:45 +0200 Subject: [PATCH 07/23] Improve create warps flag. Rename the flag to PLACE_WARP as it is a more proper name. Also, add a click handler that limits setting value from member to owner, as visitors should not be allowed. Also, set default value outside island range as false. --- src/main/java/world/bentobox/warps/Warp.java | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/src/main/java/world/bentobox/warps/Warp.java b/src/main/java/world/bentobox/warps/Warp.java index fe3838c..989168f 100644 --- a/src/main/java/world/bentobox/warps/Warp.java +++ b/src/main/java/world/bentobox/warps/Warp.java @@ -155,9 +155,13 @@ public class Warp extends Addon { this.setState(State.DISABLED); } - this.createWarpFlag = new Flag.Builder("SET-WARP", Material.OAK_SIGN) + this.createWarpFlag = new Flag.Builder("PLACE_WARP", Material.OAK_SIGN) .addon(this) .defaultRank(RanksManager.MEMBER_RANK) + .clickHandler(new CycleClick("PLACE_WARP", + RanksManager.MEMBER_RANK, + RanksManager.OWNER_RANK)). + .defaultSetting(false). .mode(Flag.Mode.EXPERT) .build(); From d2b95406502d800a4d73b053f2097e42c3a37192 Mon Sep 17 00:00:00 2001 From: BONNe Date: Thu, 19 Jan 2023 23:06:57 +0200 Subject: [PATCH 08/23] Update locale --- src/main/resources/locales/en-US.yml | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/src/main/resources/locales/en-US.yml b/src/main/resources/locales/en-US.yml index cd880e3..7198653 100755 --- a/src/main/resources/locales/en-US.yml +++ b/src/main/resources/locales/en-US.yml @@ -62,6 +62,6 @@ warps: protection: flags: - SET-WARP: - name: Set warp - description: Allow setting up warp signs + PLACE_WARP: + name: Place Warp + description: Allow placing warp sign From d3b45396fd7bf38e85c0b1a39e603af3d12cdfea Mon Sep 17 00:00:00 2001 From: BONNe Date: Thu, 19 Jan 2023 23:10:00 +0200 Subject: [PATCH 09/23] Add missing import --- src/main/java/world/bentobox/warps/Warp.java | 1 + 1 file changed, 1 insertion(+) diff --git a/src/main/java/world/bentobox/warps/Warp.java b/src/main/java/world/bentobox/warps/Warp.java index 989168f..2b8d485 100644 --- a/src/main/java/world/bentobox/warps/Warp.java +++ b/src/main/java/world/bentobox/warps/Warp.java @@ -13,6 +13,7 @@ import org.bukkit.World; import world.bentobox.bentobox.api.addons.Addon; import world.bentobox.bentobox.api.configuration.Config; import world.bentobox.bentobox.api.flags.Flag; +import world.bentobox.bentobox.api.flags.clicklisteners.CycleClick; import world.bentobox.bentobox.managers.RanksManager; import world.bentobox.bentobox.util.Util; import world.bentobox.level.Level; From 225b4d66f8c42777a8d7570297abcb843b07de33 Mon Sep 17 00:00:00 2001 From: BONNe Date: Thu, 19 Jan 2023 23:15:38 +0200 Subject: [PATCH 10/23] Update Warp.java --- src/main/java/world/bentobox/warps/Warp.java | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/main/java/world/bentobox/warps/Warp.java b/src/main/java/world/bentobox/warps/Warp.java index 2b8d485..97b2557 100644 --- a/src/main/java/world/bentobox/warps/Warp.java +++ b/src/main/java/world/bentobox/warps/Warp.java @@ -161,8 +161,8 @@ public class Warp extends Addon { .defaultRank(RanksManager.MEMBER_RANK) .clickHandler(new CycleClick("PLACE_WARP", RanksManager.MEMBER_RANK, - RanksManager.OWNER_RANK)). - .defaultSetting(false). + RanksManager.OWNER_RANK)) + .defaultSetting(false) .mode(Flag.Mode.EXPERT) .build(); From 94e9208941cea1201e8b463f0bbd2e5cbdf79e82 Mon Sep 17 00:00:00 2001 From: DevSolaris Date: Tue, 24 Jan 2023 13:18:06 +0000 Subject: [PATCH 11/23] Translate nl.yml via GitLocalize --- src/main/resources/locales/nl.yml | 52 +++++++++++++++++++++++++++++++ 1 file changed, 52 insertions(+) create mode 100644 src/main/resources/locales/nl.yml diff --git a/src/main/resources/locales/nl.yml b/src/main/resources/locales/nl.yml new file mode 100644 index 0000000..5654a14 --- /dev/null +++ b/src/main/resources/locales/nl.yml @@ -0,0 +1,52 @@ +--- +warp: + help: + description: teleporteer naar een speler zijn warp bord + parameters: "" +warps: + deactivate: "&c Oude warp bord is gedeactiveerd!" + error: + does-not-exist: "&c Oh nee! Deze warp bestaat niet meer!" + no-permission: "&c Je hebt geen permissies om dit te doen!" + no-remove: "&c Je kan dit bord niet weghalen!" + no-warps-yet: "&c Er bestaan nog geen warps op dit moment" + not-enough-level: "&c Je eiland level is nog niet hoog genoeg!" + not-on-island: "&c Je moet een eiland hebben om dit te doen!" + not-safe: "&c Deze warp is niet veilig!" + your-level-is: "&c Je eiland level is [level], maar het moet op zijn minst [required] + zijn. Gebruik het level commando." + not-correct-rank: "&c Je hebt niet de correcte rank om een warp te maken!" + help: + description: open het warp paneel + player-warped: "&2 [name] teleporteerde naar jou [gamemode] warp!" + sign-removed: "&c Warp bord verwijderd!" + success: "&a Geslaagd!" + warpTip: "&6 Plaats een warp bord met [text] op de eerste regel" + warpToPlayersSign: "&6 Teleporteren naar [player]'s warp" + gui: + titles: + warp-title: "&0&l Warp Borden" + buttons: + previous: + name: "&f&l Vorige pagina" + description: "&7 Ga naar pagina [number]" + next: + name: "&f&l Volgende pagina" + description: "&7 Ga naar pagina [number]" + warp: + name: "&f&l [name]" + description: "[sign_text]" + random: + name: "&f&l Willekeurige Warp" + description: "&7 Hmm, waar ga ik heen?" + tips: + click-to-previous: "&e Klik &7 om naar de vorige pagina te gaan." + click-to-next: "&e Klik &7 om naar de volgende pagina te gaan." + click-to-warp: "&e Klik &7 om te teleporteren." + conversations: + prefix: "&l&6 [BentoBox]: &r" +protection: + flags: + PLACE_WARP: + name: Plaats warp + description: Staat het toe om een warp bord te plaatsen From 62f1f2e966ba9afd2a377add9266f97f95a77191 Mon Sep 17 00:00:00 2001 From: tastybento Date: Thu, 9 Feb 2023 15:13:34 -0800 Subject: [PATCH 12/23] Add ${argLine} to get jacoco coverage --- pom.xml | 1 + 1 file changed, 1 insertion(+) diff --git a/pom.xml b/pom.xml index 676cc30..c7bab70 100644 --- a/pom.xml +++ b/pom.xml @@ -234,6 +234,7 @@ 3.0.0-M5 + ${argLine} --add-opens java.base/java.lang=ALL-UNNAMED --add-opens java.base/java.math=ALL-UNNAMED --add-opens java.base/java.io=ALL-UNNAMED From 67c5c9f8c3b5f1f40f4704eabbe88425207701ee Mon Sep 17 00:00:00 2001 From: tastybento Date: Thu, 9 Feb 2023 17:38:25 -0800 Subject: [PATCH 13/23] Updated Jacoco POM --- pom.xml | 11 ++++++++--- 1 file changed, 8 insertions(+), 3 deletions(-) diff --git a/pom.xml b/pom.xml index c7bab70..e360bae 100644 --- a/pom.xml +++ b/pom.xml @@ -317,7 +317,7 @@ org.jacoco jacoco-maven-plugin - 0.8.3 + 0.8.7 true @@ -328,16 +328,21 @@ - pre-unit-test + prepare-agent prepare-agent - post-unit-test + report report + + + XML + + From 2be57a66d21e8b3da5cdec3389a9896affa47593 Mon Sep 17 00:00:00 2001 From: tastybento Date: Thu, 9 Feb 2023 17:44:25 -0800 Subject: [PATCH 14/23] Fix SonarCloud bugs and smells. --- .../bentobox/warps/listeners/WarpSignsListener.java | 1 - .../bentobox/warps/managers/WarpSignsManager.java | 10 +++++----- 2 files changed, 5 insertions(+), 6 deletions(-) diff --git a/src/main/java/world/bentobox/warps/listeners/WarpSignsListener.java b/src/main/java/world/bentobox/warps/listeners/WarpSignsListener.java index 0be6ef1..dce3236 100644 --- a/src/main/java/world/bentobox/warps/listeners/WarpSignsListener.java +++ b/src/main/java/world/bentobox/warps/listeners/WarpSignsListener.java @@ -113,7 +113,6 @@ public class WarpSignsListener implements Listener { return; } User user = User.getInstance(e.getPlayer()); - if (user == null) return; UUID owner = addon.getWarpSignsManager().getWarpOwnerUUID(b.getLocation()).orElse(null); if (isPlayersSign(e.getPlayer(), b, inWorld)) { addon.getWarpSignsManager().removeWarp(b.getLocation()); diff --git a/src/main/java/world/bentobox/warps/managers/WarpSignsManager.java b/src/main/java/world/bentobox/warps/managers/WarpSignsManager.java index fe00ca5..52e95bd 100644 --- a/src/main/java/world/bentobox/warps/managers/WarpSignsManager.java +++ b/src/main/java/world/bentobox/warps/managers/WarpSignsManager.java @@ -244,8 +244,8 @@ public class WarpSignsManager { if (en.getValue().equals(loc)) { // Inform player Optional.ofNullable(addon.getServer().getPlayer(en.getKey())) - .map(User::getInstance) - .ifPresent(user -> user.sendMessage("warps.sign-removed")); + .map(User::getInstance) + .ifPresent(user -> user.sendMessage("warps.sign-removed")); // Remove sign from warp panel cache addon.getSignCacheManager().removeWarp(loc.getWorld(), en.getKey()); it.remove(); @@ -319,8 +319,8 @@ public class WarpSignsManager { if (!prefix.isEmpty()) { icon = Material.matchMaterial( - Utils.getPermissionValue(User.getInstance(uuid), prefix + "island.warp", - Material.OAK_SIGN.name())); + Utils.getPermissionValue(User.getInstance(uuid), prefix + "island.warp", + Material.OAK_SIGN.name())); } else { @@ -355,7 +355,7 @@ public class WarpSignsManager { //we prevent issues where no one teleported, but people still //get messages about it. Util.teleportAsync(user.getPlayer(), actualWarp, TeleportCause.COMMAND).thenAccept(tpResult -> { - if(!tpResult) return; + if(Boolean.FALSE.equals(tpResult)) return; User warpOwner = Objects.requireNonNull(User.getInstance(signOwner)); // Hide invisible players From 7a26acefd9d167e4f93f9dda120a1113133f16f6 Mon Sep 17 00:00:00 2001 From: DevSolaris <105156235+DevSolaris@users.noreply.github.com> Date: Sun, 12 Feb 2023 19:44:49 +0100 Subject: [PATCH 15/23] Flip bool expression (#114) --- src/main/java/world/bentobox/warps/Warp.java | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/src/main/java/world/bentobox/warps/Warp.java b/src/main/java/world/bentobox/warps/Warp.java index 97b2557..1cbdd71 100644 --- a/src/main/java/world/bentobox/warps/Warp.java +++ b/src/main/java/world/bentobox/warps/Warp.java @@ -252,8 +252,11 @@ public class Warp extends Addon { String name = this.getPlugin().getIWM().getAddon(world).map(g -> g.getDescription().getName()).orElse(""); return this.getPlugin().getAddonsManager().getAddonByName(LEVEL_ADDON_NAME) .map(l -> { - if (!name.isEmpty() && ((Level) l).getSettings().getGameModes().contains(name)) { - return ((Level) l).getIslandLevel(world, uniqueId); + final Level addon = (Level) l; + //getGameModes is a list of gamemodes that Level is DISABLED in, + //so we need the opposite of the contains. + if (!name.isEmpty() && !addon.getSettings().getGameModes().contains(name)) { + return addon.getIslandLevel(world, uniqueId); } return null; }).orElse(null); From ff4850d32a95ddd65ef986eeb3d74cbeda54c0e1 Mon Sep 17 00:00:00 2001 From: tastybento Date: Sat, 25 Mar 2023 09:59:53 -0700 Subject: [PATCH 16/23] Use addon name in annotation --- src/main/java/world/bentobox/warps/WarpsPladdon.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/main/java/world/bentobox/warps/WarpsPladdon.java b/src/main/java/world/bentobox/warps/WarpsPladdon.java index 44bd214..aa34010 100644 --- a/src/main/java/world/bentobox/warps/WarpsPladdon.java +++ b/src/main/java/world/bentobox/warps/WarpsPladdon.java @@ -7,7 +7,7 @@ import org.bukkit.plugin.java.annotation.plugin.Plugin; import world.bentobox.bentobox.api.addons.Addon; import world.bentobox.bentobox.api.addons.Pladdon; -@Plugin(name="Pladdon", version="1.0") +@Plugin(name="Warps", version="1.0") @ApiVersion(ApiVersion.Target.v1_16) @Dependency(value = "BentoBox") public class WarpsPladdon extends Pladdon { From 5a9f6495adec6bc36b7d7f4743df3334d89a23f4 Mon Sep 17 00:00:00 2001 From: tastybento Date: Sat, 25 Mar 2023 10:12:07 -0700 Subject: [PATCH 17/23] Updated pladdon dependencies. Removed unused imports. --- src/main/java/world/bentobox/warps/WarpsPladdon.java | 2 -- src/test/java/world/bentobox/warps/WarpSignsManagerTest.java | 1 - 2 files changed, 3 deletions(-) diff --git a/src/main/java/world/bentobox/warps/WarpsPladdon.java b/src/main/java/world/bentobox/warps/WarpsPladdon.java index aa34010..03635f4 100644 --- a/src/main/java/world/bentobox/warps/WarpsPladdon.java +++ b/src/main/java/world/bentobox/warps/WarpsPladdon.java @@ -1,6 +1,5 @@ package world.bentobox.warps; -import org.bukkit.plugin.java.annotation.dependency.Dependency; import org.bukkit.plugin.java.annotation.plugin.ApiVersion; import org.bukkit.plugin.java.annotation.plugin.Plugin; @@ -9,7 +8,6 @@ import world.bentobox.bentobox.api.addons.Pladdon; @Plugin(name="Warps", version="1.0") @ApiVersion(ApiVersion.Target.v1_16) -@Dependency(value = "BentoBox") public class WarpsPladdon extends Pladdon { @Override diff --git a/src/test/java/world/bentobox/warps/WarpSignsManagerTest.java b/src/test/java/world/bentobox/warps/WarpSignsManagerTest.java index 154d57a..946dc5b 100644 --- a/src/test/java/world/bentobox/warps/WarpSignsManagerTest.java +++ b/src/test/java/world/bentobox/warps/WarpSignsManagerTest.java @@ -61,7 +61,6 @@ import world.bentobox.bentobox.managers.PlayersManager; import world.bentobox.bentobox.util.Util; import world.bentobox.warps.config.Settings; import world.bentobox.warps.event.WarpInitiateEvent; -import world.bentobox.warps.managers.SignCacheItem; import world.bentobox.warps.managers.SignCacheManager; import world.bentobox.warps.managers.WarpSignsManager; import world.bentobox.warps.objects.WarpsData; From e58010547b32d0494f25ffc44377fa76799a85dc Mon Sep 17 00:00:00 2001 From: BONNe Date: Sat, 8 Apr 2023 19:09:38 +0300 Subject: [PATCH 18/23] Create plugin.yml --- src/main/resources/plugin.yml | 9 +++++++++ 1 file changed, 9 insertions(+) create mode 100644 src/main/resources/plugin.yml diff --git a/src/main/resources/plugin.yml b/src/main/resources/plugin.yml new file mode 100644 index 0000000..bbd3194 --- /dev/null +++ b/src/main/resources/plugin.yml @@ -0,0 +1,9 @@ +name: BentoBox-Warps +main: world.bentobox.warps.WarpsPladdon +version: ${project.version}${build.number} +api-version: "1.17" + +authors: [tastybento] +contributors: ["The BentoBoxWorld Community"] +website: https://bentobox.world +description: ${project.description} From d2dde61d8b60aef0160dc4e5e8e3e61163cfbd62 Mon Sep 17 00:00:00 2001 From: BONNe Date: Sat, 8 Apr 2023 19:10:15 +0300 Subject: [PATCH 19/23] Update pom.xml --- pom.xml | 5 ----- 1 file changed, 5 deletions(-) diff --git a/pom.xml b/pom.xml index e360bae..a4ff247 100644 --- a/pom.xml +++ b/pom.xml @@ -138,11 +138,6 @@ ${spigot.version} provided - - org.spigotmc - plugin-annotations - 1.2.3-SNAPSHOT - org.mockito From fe6b020ac8485f5845c087a9e2015c742a296ceb Mon Sep 17 00:00:00 2001 From: BONNe Date: Sat, 8 Apr 2023 19:10:32 +0300 Subject: [PATCH 20/23] Update WarpsPladdon.java --- src/main/java/world/bentobox/warps/WarpsPladdon.java | 5 +---- 1 file changed, 1 insertion(+), 4 deletions(-) diff --git a/src/main/java/world/bentobox/warps/WarpsPladdon.java b/src/main/java/world/bentobox/warps/WarpsPladdon.java index 03635f4..7898648 100644 --- a/src/main/java/world/bentobox/warps/WarpsPladdon.java +++ b/src/main/java/world/bentobox/warps/WarpsPladdon.java @@ -1,13 +1,10 @@ package world.bentobox.warps; -import org.bukkit.plugin.java.annotation.plugin.ApiVersion; -import org.bukkit.plugin.java.annotation.plugin.Plugin; import world.bentobox.bentobox.api.addons.Addon; import world.bentobox.bentobox.api.addons.Pladdon; -@Plugin(name="Warps", version="1.0") -@ApiVersion(ApiVersion.Target.v1_16) + public class WarpsPladdon extends Pladdon { @Override From cb165e52b04ac39fcc973a81b314840f991cfaf4 Mon Sep 17 00:00:00 2001 From: tastybento Date: Sat, 15 Apr 2023 13:08:55 -0700 Subject: [PATCH 21/23] Updated POM; fixed tests. --- pom.xml | 6 +++--- .../bentobox/warps/managers/WarpSignsManager.java | 1 - .../world/bentobox/warps/WarpSignsManagerTest.java | 13 +++++++++---- 3 files changed, 12 insertions(+), 8 deletions(-) diff --git a/pom.xml b/pom.xml index a4ff247..415bda0 100644 --- a/pom.xml +++ b/pom.xml @@ -54,12 +54,12 @@ UTF-8 UTF-8 - 16 + 17 2.0.9 - 1.17-R0.1-SNAPSHOT - 1.18.0-SNAPSHOT + 1.19.4-R0.1-SNAPSHOT + 1.23.0-SNAPSHOT 2.7.0-SNAPSHOT ${build.version}-SNAPSHOT diff --git a/src/main/java/world/bentobox/warps/managers/WarpSignsManager.java b/src/main/java/world/bentobox/warps/managers/WarpSignsManager.java index 52e95bd..3d32b95 100644 --- a/src/main/java/world/bentobox/warps/managers/WarpSignsManager.java +++ b/src/main/java/world/bentobox/warps/managers/WarpSignsManager.java @@ -373,7 +373,6 @@ public class WarpSignsManager { .getInstance() .getIWM() .getFriendlyName(actualWarp.getWorld()); - warpOwner.sendMessage("warps.player-warped", "[name]", user.getName(), "[gamemode]", gameMode); } }); diff --git a/src/test/java/world/bentobox/warps/WarpSignsManagerTest.java b/src/test/java/world/bentobox/warps/WarpSignsManagerTest.java index 946dc5b..8a53f70 100644 --- a/src/test/java/world/bentobox/warps/WarpSignsManagerTest.java +++ b/src/test/java/world/bentobox/warps/WarpSignsManagerTest.java @@ -21,7 +21,6 @@ import java.util.concurrent.CompletableFuture; import java.util.logging.Logger; import org.bukkit.Bukkit; -import org.bukkit.ChatColor; import org.bukkit.Location; import org.bukkit.Material; import org.bukkit.OfflinePlayer; @@ -71,7 +70,7 @@ import world.bentobox.warps.objects.WarpsData; * */ @RunWith(PowerMockRunner.class) -@PrepareForTest({Bukkit.class, Util.class, DatabaseSetup.class, ChatColor.class}) +@PrepareForTest({Bukkit.class, Util.class, DatabaseSetup.class}) public class WarpSignsManagerTest { @Mock @@ -139,12 +138,15 @@ public class WarpSignsManagerTest { // Player when(player.getUniqueId()).thenReturn(uuid); + when(player.isOnline()).thenReturn(true); + when(player.canSee(any(Player.class))).thenReturn(true); User.setPlugin(plugin); User.getInstance(player); // Locales LocalesManager lm = mock(LocalesManager.class); - when(lm.get(Mockito.any(), Mockito.any())).thenReturn(null); + when(lm.getAvailablePrefixes(any())).thenReturn(Collections.emptySet()); + when(lm.get(Mockito.any(), Mockito.any())).thenAnswer((Answer) invocation -> invocation.getArgument(1, String.class)); when(plugin.getLocalesManager()).thenReturn(lm); // Return the same string PlaceholdersManager phm = mock(PlaceholdersManager.class); @@ -212,6 +214,7 @@ public class WarpSignsManagerTest { // IWM when(plugin.getIWM()).thenReturn(iwm); when(iwm.getPermissionPrefix(any())).thenReturn("bskyblock."); + when(iwm.getFriendlyName(any())).thenReturn("BSkyBlock"); // Island Manager when(addon.getIslands()).thenReturn(im); @@ -425,13 +428,15 @@ public class WarpSignsManagerTest { when(p.getWorld()).thenReturn(world); when(p.getName()).thenReturn("tastybento"); when(p.getLocation()).thenReturn(location); + when(p.isOnline()).thenReturn(true); + when(p.canSee(any(Player.class))).thenReturn(true); @Nullable User u = User.getInstance(p); PowerMockito.when(Util.teleportAsync(any(), any(), any())).thenReturn(CompletableFuture.completedFuture(true)); wsm.warpPlayer(world, u, uuid); PowerMockito.verifyStatic(Util.class); Util.teleportAsync(eq(p), any(), eq(TeleportCause.COMMAND)); - verify(player).sendMessage("warps.player-warped"); + verify(player).sendMessage(anyString()); } /** From b998b46fd53b3b09a75593316754c434d5743124 Mon Sep 17 00:00:00 2001 From: tastybento Date: Sun, 16 Apr 2023 11:00:06 -0700 Subject: [PATCH 22/23] User BentoBox release build --- pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pom.xml b/pom.xml index 415bda0..6185cdb 100644 --- a/pom.xml +++ b/pom.xml @@ -59,7 +59,7 @@ 2.0.9 1.19.4-R0.1-SNAPSHOT - 1.23.0-SNAPSHOT + 1.23.0 2.7.0-SNAPSHOT ${build.version}-SNAPSHOT From 9e57851c629623cfb37cb84c3cf0f059681db14a Mon Sep 17 00:00:00 2001 From: tastybento Date: Sun, 16 Apr 2023 11:02:01 -0700 Subject: [PATCH 23/23] Update GitHub build script to Java 17 --- .github/workflows/build.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index c13f2b9..ac22f52 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -14,11 +14,11 @@ jobs: - uses: actions/checkout@v2 with: fetch-depth: 0 # Shallow clones should be disabled for a better relevancy of analysis - - name: Set up JDK 16 + - name: Set up JDK 17 uses: actions/setup-java@v2 with: distribution: 'adopt' - java-version: '16' + java-version: '17' - name: Cache SonarCloud packages uses: actions/cache@v2 with: