From 10ec79ae642ed67a89f0f5b83a9efef92d8f7650 Mon Sep 17 00:00:00 2001 From: Jakubk15 <77227023+Jakubk15@users.noreply.github.com> Date: Sun, 16 Mar 2025 16:28:11 +0100 Subject: [PATCH 1/9] Add teleport timer to TeleportBackCommand, add self-teleport request functionality --- .../teleport/command/TeleportBackCommand.java | 27 ++++- .../messages/ENTeleportRequestMessages.java | 9 ++ .../messages/PLTeleportRequestMessages.java | 8 ++ .../messages/TeleportRequestMessages.java | 3 + .../self/SelfRequesterArgument.java | 63 ++++++++++ .../self/TeleportHereRequestService.java | 61 ++++++++++ .../self/TpaHereActionCommand.java | 114 ++++++++++++++++++ .../teleportrequest/self/TpaHereCommand.java | 73 +++++++++++ 8 files changed, 353 insertions(+), 5 deletions(-) create mode 100644 eternalcore-core/src/main/java/com/eternalcode/core/feature/teleportrequest/self/SelfRequesterArgument.java create mode 100644 eternalcore-core/src/main/java/com/eternalcode/core/feature/teleportrequest/self/TeleportHereRequestService.java create mode 100644 eternalcore-core/src/main/java/com/eternalcode/core/feature/teleportrequest/self/TpaHereActionCommand.java create mode 100644 eternalcore-core/src/main/java/com/eternalcode/core/feature/teleportrequest/self/TpaHereCommand.java diff --git a/eternalcore-core/src/main/java/com/eternalcode/core/feature/teleport/command/TeleportBackCommand.java b/eternalcore-core/src/main/java/com/eternalcode/core/feature/teleport/command/TeleportBackCommand.java index dc9dfa4a1..be7e3cea2 100644 --- a/eternalcore-core/src/main/java/com/eternalcode/core/feature/teleport/command/TeleportBackCommand.java +++ b/eternalcore-core/src/main/java/com/eternalcode/core/feature/teleport/command/TeleportBackCommand.java @@ -1,15 +1,18 @@ package com.eternalcode.core.feature.teleport.command; import com.eternalcode.annotations.scan.command.DescriptionDocs; +import com.eternalcode.commons.bukkit.position.PositionAdapter; +import com.eternalcode.core.feature.teleport.TeleportService; +import com.eternalcode.core.feature.teleport.TeleportTaskService; +import com.eternalcode.core.feature.teleportrequest.TeleportRequestSettings; import com.eternalcode.core.injector.annotations.Inject; import com.eternalcode.core.notice.NoticeService; -import com.eternalcode.core.feature.teleport.TeleportService; import com.eternalcode.core.viewer.Viewer; import dev.rollczi.litecommands.annotations.argument.Arg; +import dev.rollczi.litecommands.annotations.command.Command; import dev.rollczi.litecommands.annotations.context.Context; import dev.rollczi.litecommands.annotations.execute.Execute; import dev.rollczi.litecommands.annotations.permission.Permission; -import dev.rollczi.litecommands.annotations.command.Command; import org.bukkit.Location; import org.bukkit.entity.Player; @@ -18,12 +21,17 @@ @Command(name = "back") class TeleportBackCommand { + private static final String TIMER_BYPASS_PERMISSION = "eternalcore.teleport.bypass"; private final TeleportService teleportService; + private final TeleportTaskService teleportTaskService; + private final TeleportRequestSettings settings; private final NoticeService noticeService; @Inject - TeleportBackCommand(TeleportService teleportService, NoticeService noticeService) { + TeleportBackCommand(TeleportService teleportService, TeleportTaskService teleportTaskService, TeleportRequestSettings settings, NoticeService noticeService) { this.teleportService = teleportService; + this.teleportTaskService = teleportTaskService; + this.settings = settings; this.noticeService = noticeService; } @@ -39,7 +47,12 @@ void execute(@Context Player player) { return; } - this.teleportService.teleport(player, location.get()); + if (player.hasPermission(TIMER_BYPASS_PERMISSION)) { + this.teleportService.teleport(player, location.get()); + } else { + this.teleportTaskService.createTeleport(player.getUniqueId(), PositionAdapter.convert(player.getLocation()), PositionAdapter.convert(location.get()), this.settings.teleportTime()); + } + this.noticeService.player(player.getUniqueId(), translation -> translation.teleport().teleportedToLastLocation()); } @@ -55,7 +68,11 @@ void execute(@Context Viewer viewer, @Arg Player player) { return; } - this.teleportService.teleport(player, location.get()); + if (player.hasPermission(TIMER_BYPASS_PERMISSION)){ + this.teleportService.teleport(player, location.get()); + } else { + this.teleportTaskService.createTeleport(player.getUniqueId(), PositionAdapter.convert(player.getLocation()), PositionAdapter.convert(location.get()), this.settings.teleportTime()); + } this.noticeService.player(player.getUniqueId(), translation -> translation.teleport().teleportedToLastLocation()); diff --git a/eternalcore-core/src/main/java/com/eternalcode/core/feature/teleportrequest/messages/ENTeleportRequestMessages.java b/eternalcore-core/src/main/java/com/eternalcode/core/feature/teleportrequest/messages/ENTeleportRequestMessages.java index 1a72ebf12..8cfd0c501 100644 --- a/eternalcore-core/src/main/java/com/eternalcode/core/feature/teleportrequest/messages/ENTeleportRequestMessages.java +++ b/eternalcore-core/src/main/java/com/eternalcode/core/feature/teleportrequest/messages/ENTeleportRequestMessages.java @@ -16,6 +16,15 @@ public class ENTeleportRequestMessages implements TeleportRequestMessages { public Notice tpaSentMessage = Notice.chat("► You have sent a request for teleportation to a player: {PLAYER}!"); + public Notice tpaHereSentMessage = Notice.chat("► You have sent a request for teleportation to you for a player: {PLAYER}!"); + public Notice tpaHereReceivedMessage = Notice.builder() + .chat("► You have received a request for teleportation TO a player: {PLAYER}!") + .chat( + "Teleport to the player?'>» /tpahereaccept {PLAYER} to accept! (Click)") + .chat( + "Decline a teleportation request?'>» /tpaheredeny {PLAYER} to deny! (Click)") + .build(); + @Description({ " ", "# We used MiniMessages formatting in these messages", diff --git a/eternalcore-core/src/main/java/com/eternalcode/core/feature/teleportrequest/messages/PLTeleportRequestMessages.java b/eternalcore-core/src/main/java/com/eternalcode/core/feature/teleportrequest/messages/PLTeleportRequestMessages.java index 8bdb73462..f689ac3b9 100644 --- a/eternalcore-core/src/main/java/com/eternalcode/core/feature/teleportrequest/messages/PLTeleportRequestMessages.java +++ b/eternalcore-core/src/main/java/com/eternalcode/core/feature/teleportrequest/messages/PLTeleportRequestMessages.java @@ -16,6 +16,14 @@ public class PLTeleportRequestMessages implements TeleportRequestMessages { public Notice tpaSentMessage = Notice.chat("► Wysłałeś prośbę o teleportację do gracza: {PLAYER}!"); + public Notice tpaHereSentMessage = Notice.chat("► Wysłałeś prośbę o teleportację do ciebie dla gracza: {PLAYER}!"); + public Notice tpaHereReceivedMessage = Notice.builder() + .chat("► Otrzymałeś prośbę o teleportację do gracza: {PLAYER}!") + .chat( + "Teleportować się do gracza?'>» /tpahereaccept {PLAYER} by ją zaakceptować! (Kliknij)") + .chat( + "Odrzucić prośbę o teleportacje?'>» /tpaheredeny {PLAYER} by ją odrzucić! (Kliknij)") + .build(); @Description({ " ", "# W tych wiadomościach użyliśmy formatowania MiniMessages", diff --git a/eternalcore-core/src/main/java/com/eternalcode/core/feature/teleportrequest/messages/TeleportRequestMessages.java b/eternalcore-core/src/main/java/com/eternalcode/core/feature/teleportrequest/messages/TeleportRequestMessages.java index d45d45189..b3eb1f248 100644 --- a/eternalcore-core/src/main/java/com/eternalcode/core/feature/teleportrequest/messages/TeleportRequestMessages.java +++ b/eternalcore-core/src/main/java/com/eternalcode/core/feature/teleportrequest/messages/TeleportRequestMessages.java @@ -9,6 +9,9 @@ public interface TeleportRequestMessages { Notice tpaReceivedMessage(); Notice tpaTargetIgnoresYou(); + Notice tpaHereSentMessage(); + Notice tpaHereReceivedMessage(); + Notice tpaDenyNoRequestMessage(); Notice tpaDenyDoneMessage(); Notice tpaDenyReceivedMessage(); diff --git a/eternalcore-core/src/main/java/com/eternalcode/core/feature/teleportrequest/self/SelfRequesterArgument.java b/eternalcore-core/src/main/java/com/eternalcode/core/feature/teleportrequest/self/SelfRequesterArgument.java new file mode 100644 index 000000000..7b0f51706 --- /dev/null +++ b/eternalcore-core/src/main/java/com/eternalcode/core/feature/teleportrequest/self/SelfRequesterArgument.java @@ -0,0 +1,63 @@ +package com.eternalcode.core.feature.teleportrequest.self; + +import com.eternalcode.core.bridge.litecommand.argument.AbstractViewerArgument; +import com.eternalcode.core.injector.annotations.Inject; +import com.eternalcode.core.injector.annotations.lite.LiteArgument; +import com.eternalcode.core.translation.Translation; +import com.eternalcode.core.translation.TranslationManager; +import dev.rollczi.litecommands.argument.Argument; +import dev.rollczi.litecommands.argument.parser.ParseResult; +import dev.rollczi.litecommands.invocation.Invocation; +import dev.rollczi.litecommands.suggestion.SuggestionContext; +import dev.rollczi.litecommands.suggestion.SuggestionResult; +import org.bukkit.Server; +import org.bukkit.command.CommandSender; +import org.bukkit.entity.HumanEntity; +import org.bukkit.entity.Player; + +import java.util.Objects; + +@LiteArgument(type = Player.class, name = SelfRequesterArgument.KEY) +class SelfRequesterArgument extends AbstractViewerArgument { + + static final String KEY = "selfrequester"; + + private final TeleportHereRequestService requestService; + private final Server server; + + @Inject + SelfRequesterArgument(TeleportHereRequestService requestService, TranslationManager translationManager, Server server) { + super(translationManager); + this.requestService = requestService; + this.server = server; + } + + @Override + public ParseResult parse(Invocation invocation, String argument, Translation translation) { + Player target = this.server.getPlayer(argument); + + if (!(invocation.sender() instanceof Player player)) { + return ParseResult.failure(translation.argument().onlyPlayer()); + } + + if (target == null || !this.requestService.hasRequest(target.getUniqueId(), player.getUniqueId())) { + return ParseResult.failure(translation.tpa().tpaDenyNoRequestMessage()); + } + + return ParseResult.success(target); + } + + @Override + public SuggestionResult suggest(Invocation invocation, Argument argument, SuggestionContext context) { + if (!(invocation.sender() instanceof Player player)) { + return SuggestionResult.empty(); + } + + return this.requestService.findRequests(player.getUniqueId()).stream() + .map(this.server::getPlayer) + .filter(Objects::nonNull) + .map(HumanEntity::getName) + .collect(SuggestionResult.collector()); + } + +} diff --git a/eternalcore-core/src/main/java/com/eternalcode/core/feature/teleportrequest/self/TeleportHereRequestService.java b/eternalcore-core/src/main/java/com/eternalcode/core/feature/teleportrequest/self/TeleportHereRequestService.java new file mode 100644 index 000000000..d15045bc1 --- /dev/null +++ b/eternalcore-core/src/main/java/com/eternalcode/core/feature/teleportrequest/self/TeleportHereRequestService.java @@ -0,0 +1,61 @@ +package com.eternalcode.core.feature.teleportrequest.self; + +import com.eternalcode.core.feature.teleportrequest.TeleportRequestSettings; +import com.eternalcode.core.injector.annotations.Inject; +import com.eternalcode.core.injector.annotations.component.Service; +import com.google.common.cache.Cache; +import com.google.common.cache.CacheBuilder; + +import java.util.ArrayList; +import java.util.List; +import java.util.Map; +import java.util.UUID; + +@Service +class TeleportHereRequestService { + + private final Cache requests; + + @Inject + TeleportHereRequestService(TeleportRequestSettings settings) { + this.requests = CacheBuilder + .newBuilder() + .expireAfterWrite(settings.teleportExpire()) + .build(); + } + + void createRequest(UUID requester, UUID target) { + this.requests.put(requester, target); + } + + void removeRequest(UUID requester) { + this.requests.asMap().remove(requester); + } + + boolean hasRequest(UUID requester, UUID target) { + Map map = this.requests.asMap(); + + for (Map.Entry entry : map.entrySet()) { + if (entry.getKey().equals(requester) && entry.getValue().equals(target)) { + return true; + } + } + + return false; + } + + List findRequests(UUID target) { + Map map = this.requests.asMap(); + + List requesters = new ArrayList<>(); + + for (Map.Entry entry : map.entrySet()) { + if (entry.getValue().equals(target)) { + requesters.add(entry.getKey()); + } + } + + return requesters; + } + +} diff --git a/eternalcore-core/src/main/java/com/eternalcode/core/feature/teleportrequest/self/TpaHereActionCommand.java b/eternalcore-core/src/main/java/com/eternalcode/core/feature/teleportrequest/self/TpaHereActionCommand.java new file mode 100644 index 000000000..587db30e2 --- /dev/null +++ b/eternalcore-core/src/main/java/com/eternalcode/core/feature/teleportrequest/self/TpaHereActionCommand.java @@ -0,0 +1,114 @@ +package com.eternalcode.core.feature.teleportrequest.self; + +import com.eternalcode.annotations.scan.command.DescriptionDocs; +import com.eternalcode.commons.bukkit.position.PositionAdapter; +import com.eternalcode.core.feature.teleport.TeleportTaskService; +import com.eternalcode.core.feature.teleportrequest.TeleportRequestSettings; +import com.eternalcode.core.injector.annotations.Inject; +import com.eternalcode.core.notice.NoticeService; +import dev.rollczi.litecommands.annotations.argument.Arg; +import dev.rollczi.litecommands.annotations.command.RootCommand; +import dev.rollczi.litecommands.annotations.context.Context; +import dev.rollczi.litecommands.annotations.execute.Execute; +import org.bukkit.Server; +import org.bukkit.entity.Player; + +import java.util.List; +import java.util.UUID; + +@RootCommand +public class TpaHereActionCommand { + + private final TeleportHereRequestService requestService; + private final TeleportTaskService teleportTaskService; + private final TeleportRequestSettings settings; + private final NoticeService noticeService; + private final Server server; + + @Inject + TpaHereActionCommand(TeleportHereRequestService requestService, TeleportTaskService teleportTaskService, TeleportRequestSettings settings, NoticeService noticeService, Server server) { + this.requestService = requestService; + this.teleportTaskService = teleportTaskService; + this.settings = settings; + this.noticeService = noticeService; + this.server = server; + } + + @Execute(name = "tpahereaccept") + void accept(@Context Player player, @Arg(SelfRequesterArgument.KEY) Player target) { + this.teleportTaskService.createTeleport( + player.getUniqueId(), + PositionAdapter.convert(player.getLocation()), + PositionAdapter.convert(target.getLocation()), + this.settings.teleportTime() + ); + + this.requestService.removeRequest(target.getUniqueId()); + + this.noticeService + .create() + .player(player.getUniqueId()) + .notice(translation -> translation.tpa().tpaAcceptMessage()) + .placeholder("{PLAYER}", target.getName()) + .send(); + + this.noticeService + .create() + .player(target.getUniqueId()) + .notice(translation -> translation.tpa().tpaAcceptReceivedMessage()) + .placeholder("{PLAYER}", player.getName()) + .send(); + } + + @Execute(name = "tpaheredeny") + @DescriptionDocs(description = "Deny a teleport here request") + void executeTarget(@Context Player player, @Arg(SelfRequesterArgument.KEY) Player target) { + this.requestService.removeRequest(target.getUniqueId()); + + this.noticeService + .create() + .player(player.getUniqueId()) + .notice(translation -> translation.tpa().tpaDenyDoneMessage()) + .placeholder("{PLAYER}", target.getName()) + .send(); + + this.noticeService + .create() + .player(target.getUniqueId()) + .notice(translation -> translation.tpa().tpaDenyReceivedMessage()) + .placeholder("{PLAYER}", player.getName()) + .send(); + } + + @Execute(name = "tpaheredeny -all") + @DescriptionDocs(description = "Deny all teleport here requests") + void executeAll(@Context Player player) { + List requests = this.requestService.findRequests(player.getUniqueId()); + + if (requests.isEmpty()) { + + this.noticeService.player(player.getUniqueId(), translation -> translation.tpa().tpaDenyNoRequestMessage()); + + return; + } + + for (UUID uniqueId : requests) { + Player requester = this.server.getPlayer(uniqueId); + + this.requestService.removeRequest(uniqueId); + + if (requester != null) { + + this.noticeService + .create() + .player(uniqueId) + .notice(translation -> translation.tpa().tpaDenyReceivedMessage()) + .placeholder("{PLAYER}", player.getName()) + .send(); + } + } + + this.noticeService.player(player.getUniqueId(), translation -> translation.tpa().tpaDenyAllDenied()); + } + +} diff --git a/eternalcore-core/src/main/java/com/eternalcode/core/feature/teleportrequest/self/TpaHereCommand.java b/eternalcore-core/src/main/java/com/eternalcode/core/feature/teleportrequest/self/TpaHereCommand.java new file mode 100644 index 000000000..ee2bf1bad --- /dev/null +++ b/eternalcore-core/src/main/java/com/eternalcode/core/feature/teleportrequest/self/TpaHereCommand.java @@ -0,0 +1,73 @@ +package com.eternalcode.core.feature.teleportrequest.self; + +import com.eternalcode.core.feature.ignore.IgnoreService; +import com.eternalcode.core.injector.annotations.Inject; +import com.eternalcode.core.notice.NoticeService; +import dev.rollczi.litecommands.annotations.argument.Arg; +import dev.rollczi.litecommands.annotations.command.Command; +import dev.rollczi.litecommands.annotations.context.Context; +import dev.rollczi.litecommands.annotations.execute.Execute; +import dev.rollczi.litecommands.annotations.permission.Permission; +import org.bukkit.entity.Player; + +import java.util.concurrent.CompletableFuture; + +@Command(name = "tpahere") +@Permission("eternalcore.tpahere") +public class TpaHereCommand { + + private final TeleportHereRequestService requestService; + private final IgnoreService ignoreService; + private final NoticeService noticeService; + + @Inject + TpaHereCommand(TeleportHereRequestService requestService, IgnoreService ignoreService, NoticeService noticeService) { + this.requestService = requestService; + this.ignoreService = ignoreService; + this.noticeService = noticeService; + } + + @Execute + void execute(@Context Player sender, @Arg Player target) { + if (sender.equals(target)) { + this.noticeService.player(sender.getUniqueId() , translation -> translation.tpa().tpaSelfMessage()); + + return; + } + + if (this.requestService.hasRequest(sender.getUniqueId(), target.getUniqueId())) { + this.noticeService.player(sender.getUniqueId(), translation -> translation.tpa().tpaAlreadySentMessage()); + + return; + } + + this.noticeService + .create() + .player(sender.getUniqueId()) + .notice(translation -> translation.tpa().tpaSentMessage()) + .placeholder("{PLAYER}", target.getName()) + .send(); + + this.isIgnoring(target, sender).thenAccept(isIgnoring -> { + if (isIgnoring) { + this.noticeService.create() + .player(sender.getUniqueId()) + .notice(translation -> translation.tpa().tpaTargetIgnoresYou()) + .placeholder("{PLAYER}", target.getName()) + .send(); + return; + } + this.noticeService.create() + .player(target.getUniqueId()) + .notice(translation -> translation.tpa().tpaHereReceivedMessage()) + .placeholder("{PLAYER}", sender.getName()) + .send(); + + this.requestService.createRequest(sender.getUniqueId(), target.getUniqueId()); + }); + } + + CompletableFuture isIgnoring(Player target, Player sender) { + return this.ignoreService.isIgnored(target.getUniqueId(), sender.getUniqueId()); + } +} From 855beaaf5a4da9f80a5de99ba26972f8fd344891 Mon Sep 17 00:00:00 2001 From: Jakubk15 <77227023+Jakubk15@users.noreply.github.com> Date: Sun, 16 Mar 2025 16:34:30 +0100 Subject: [PATCH 2/9] Add LuckPerms to runServer task for testing purposes --- buildSrc/src/main/kotlin/Versions.kt | 2 ++ eternalcore-plugin/build.gradle.kts | 1 + 2 files changed, 3 insertions(+) diff --git a/buildSrc/src/main/kotlin/Versions.kt b/buildSrc/src/main/kotlin/Versions.kt index f86c6c165..431339d48 100644 --- a/buildSrc/src/main/kotlin/Versions.kt +++ b/buildSrc/src/main/kotlin/Versions.kt @@ -35,6 +35,8 @@ object Versions { const val TRIUMPH_GUI = "3.1.11" + const val LUCKPERMS = "5.4.156" + const val BSTATS = "3.1.0" const val CAFFEINE = "3.2.0" diff --git a/eternalcore-plugin/build.gradle.kts b/eternalcore-plugin/build.gradle.kts index 9ac557482..caabfd571 100644 --- a/eternalcore-plugin/build.gradle.kts +++ b/eternalcore-plugin/build.gradle.kts @@ -39,5 +39,6 @@ dependencies { tasks { runServer { minecraftVersion("1.21.4") + downloadPlugins.url("https://ci.lucko.me/job/LuckPerms/lastBuild/artifact/bukkit/loader/build/libs/LuckPerms-Bukkit-${Versions.LUCKPERMS}.jar") } } From d73ce90be5aba0bf8ff2cbfdb3ad17be8ccf9317 Mon Sep 17 00:00:00 2001 From: Jakubk15 <77227023+Jakubk15@users.noreply.github.com> Date: Mon, 17 Mar 2025 19:11:34 +0100 Subject: [PATCH 3/9] Add missing permissions, change translations to reflect Mike's suggestions --- .../teleportrequest/messages/ENTeleportRequestMessages.java | 2 +- .../teleportrequest/messages/PLTeleportRequestMessages.java | 2 +- .../feature/teleportrequest/self/TpaHereActionCommand.java | 4 ++++ 3 files changed, 6 insertions(+), 2 deletions(-) diff --git a/eternalcore-core/src/main/java/com/eternalcode/core/feature/teleportrequest/messages/ENTeleportRequestMessages.java b/eternalcore-core/src/main/java/com/eternalcode/core/feature/teleportrequest/messages/ENTeleportRequestMessages.java index 8cfd0c501..df187240d 100644 --- a/eternalcore-core/src/main/java/com/eternalcode/core/feature/teleportrequest/messages/ENTeleportRequestMessages.java +++ b/eternalcore-core/src/main/java/com/eternalcode/core/feature/teleportrequest/messages/ENTeleportRequestMessages.java @@ -14,7 +14,7 @@ public class ENTeleportRequestMessages implements TeleportRequestMessages { public Notice tpaAlreadySentMessage = Notice.chat("✘ You have already sent a teleportation request!"); public Notice tpaSentMessage = - Notice.chat("► You have sent a request for teleportation to a player: {PLAYER}!"); + Notice.chat("► You have sent a request for player {PLAYER}{PLAYER} to teleport to you!"); public Notice tpaHereSentMessage = Notice.chat("► You have sent a request for teleportation to you for a player: {PLAYER}!"); public Notice tpaHereReceivedMessage = Notice.builder() diff --git a/eternalcore-core/src/main/java/com/eternalcode/core/feature/teleportrequest/messages/PLTeleportRequestMessages.java b/eternalcore-core/src/main/java/com/eternalcode/core/feature/teleportrequest/messages/PLTeleportRequestMessages.java index f689ac3b9..ac79a8acf 100644 --- a/eternalcore-core/src/main/java/com/eternalcode/core/feature/teleportrequest/messages/PLTeleportRequestMessages.java +++ b/eternalcore-core/src/main/java/com/eternalcode/core/feature/teleportrequest/messages/PLTeleportRequestMessages.java @@ -16,7 +16,7 @@ public class PLTeleportRequestMessages implements TeleportRequestMessages { public Notice tpaSentMessage = Notice.chat("► Wysłałeś prośbę o teleportację do gracza: {PLAYER}!"); - public Notice tpaHereSentMessage = Notice.chat("► Wysłałeś prośbę o teleportację do ciebie dla gracza: {PLAYER}!"); + public Notice tpaHereSentMessage = Notice.chat("► Wysłałeś prośbę o teleportację gracza {PLAYER} do twojej lokalizacji!"); public Notice tpaHereReceivedMessage = Notice.builder() .chat("► Otrzymałeś prośbę o teleportację do gracza: {PLAYER}!") .chat( diff --git a/eternalcore-core/src/main/java/com/eternalcode/core/feature/teleportrequest/self/TpaHereActionCommand.java b/eternalcore-core/src/main/java/com/eternalcode/core/feature/teleportrequest/self/TpaHereActionCommand.java index 587db30e2..36a336804 100644 --- a/eternalcore-core/src/main/java/com/eternalcode/core/feature/teleportrequest/self/TpaHereActionCommand.java +++ b/eternalcore-core/src/main/java/com/eternalcode/core/feature/teleportrequest/self/TpaHereActionCommand.java @@ -10,6 +10,7 @@ import dev.rollczi.litecommands.annotations.command.RootCommand; import dev.rollczi.litecommands.annotations.context.Context; import dev.rollczi.litecommands.annotations.execute.Execute; +import dev.rollczi.litecommands.annotations.permission.Permission; import org.bukkit.Server; import org.bukkit.entity.Player; @@ -35,6 +36,7 @@ public class TpaHereActionCommand { } @Execute(name = "tpahereaccept") + @Permission("eternalcore.tpahere.accept") void accept(@Context Player player, @Arg(SelfRequesterArgument.KEY) Player target) { this.teleportTaskService.createTeleport( player.getUniqueId(), @@ -61,6 +63,7 @@ void accept(@Context Player player, @Arg(SelfRequesterArgument.KEY) Player targe } @Execute(name = "tpaheredeny") + @Permission("eternalcore.tpahere.deny") @DescriptionDocs(description = "Deny a teleport here request") void executeTarget(@Context Player player, @Arg(SelfRequesterArgument.KEY) Player target) { this.requestService.removeRequest(target.getUniqueId()); @@ -81,6 +84,7 @@ void executeTarget(@Context Player player, @Arg(SelfRequesterArgument.KEY) Playe } @Execute(name = "tpaheredeny -all") + @Permission("eternalcore.tpahere.deny") @DescriptionDocs(description = "Deny all teleport here requests") void executeAll(@Context Player player) { List requests = this.requestService.findRequests(player.getUniqueId()); From bab4e639732f66dbad2b3d1bf3077b3f18dfddff Mon Sep 17 00:00:00 2001 From: Jakubk15 <77227023+Jakubk15@users.noreply.github.com> Date: Mon, 17 Mar 2025 19:17:52 +0100 Subject: [PATCH 4/9] Move permissions to constants class --- .../teleport/command/TeleportBackCommand.java | 7 ++++--- .../TeleportRequestPermissionConstant.java | 14 ++++++++++++++ .../teleportrequest/self/TpaHereActionCommand.java | 9 ++++++--- .../teleportrequest/self/TpaHereCommand.java | 4 +++- 4 files changed, 27 insertions(+), 7 deletions(-) create mode 100644 eternalcore-core/src/main/java/com/eternalcode/core/feature/teleportrequest/TeleportRequestPermissionConstant.java diff --git a/eternalcore-core/src/main/java/com/eternalcode/core/feature/teleport/command/TeleportBackCommand.java b/eternalcore-core/src/main/java/com/eternalcode/core/feature/teleport/command/TeleportBackCommand.java index be7e3cea2..3da8e14c9 100644 --- a/eternalcore-core/src/main/java/com/eternalcode/core/feature/teleport/command/TeleportBackCommand.java +++ b/eternalcore-core/src/main/java/com/eternalcode/core/feature/teleport/command/TeleportBackCommand.java @@ -18,10 +18,11 @@ import java.util.Optional; +import static com.eternalcode.core.feature.teleportrequest.TeleportRequestPermissionConstant.TELEPORT_TIMER_BYPASS_PERMISSION; + @Command(name = "back") class TeleportBackCommand { - private static final String TIMER_BYPASS_PERMISSION = "eternalcore.teleport.bypass"; private final TeleportService teleportService; private final TeleportTaskService teleportTaskService; private final TeleportRequestSettings settings; @@ -47,7 +48,7 @@ void execute(@Context Player player) { return; } - if (player.hasPermission(TIMER_BYPASS_PERMISSION)) { + if (player.hasPermission(TELEPORT_TIMER_BYPASS_PERMISSION)) { this.teleportService.teleport(player, location.get()); } else { this.teleportTaskService.createTeleport(player.getUniqueId(), PositionAdapter.convert(player.getLocation()), PositionAdapter.convert(location.get()), this.settings.teleportTime()); @@ -68,7 +69,7 @@ void execute(@Context Viewer viewer, @Arg Player player) { return; } - if (player.hasPermission(TIMER_BYPASS_PERMISSION)){ + if (player.hasPermission(TELEPORT_TIMER_BYPASS_PERMISSION)){ this.teleportService.teleport(player, location.get()); } else { this.teleportTaskService.createTeleport(player.getUniqueId(), PositionAdapter.convert(player.getLocation()), PositionAdapter.convert(location.get()), this.settings.teleportTime()); diff --git a/eternalcore-core/src/main/java/com/eternalcode/core/feature/teleportrequest/TeleportRequestPermissionConstant.java b/eternalcore-core/src/main/java/com/eternalcode/core/feature/teleportrequest/TeleportRequestPermissionConstant.java new file mode 100644 index 000000000..fba6b1e22 --- /dev/null +++ b/eternalcore-core/src/main/java/com/eternalcode/core/feature/teleportrequest/TeleportRequestPermissionConstant.java @@ -0,0 +1,14 @@ +package com.eternalcode.core.feature.teleportrequest; + +public interface TeleportRequestPermissionConstant { + + String TELEPORT_REQUEST_PERMISSION = "eternalcore.tpa"; + String TELEPORT_REQUEST_ACCEPT_PERMISSION = "eternalcore.tpaccept"; + String TELEPORT_REQUEST_DENY_PERMISSION = "eternalcore.tpdeny"; + String TELEPORT_REQUEST_HERE_PERMISSION = "eternalcore.tpahere"; + String TELEPORT_REQUEST_HERE_ACCEPT_PERMISSION = "eternalcore.tpahere.accept"; + String TELEPORT_REQUEST_HERE_DENY_PERMISSION = "eternalcore.tpahere.deny"; + + String TELEPORT_TIMER_BYPASS_PERMISSION = "eternalcore.teleport.bypass"; + +} diff --git a/eternalcore-core/src/main/java/com/eternalcode/core/feature/teleportrequest/self/TpaHereActionCommand.java b/eternalcore-core/src/main/java/com/eternalcode/core/feature/teleportrequest/self/TpaHereActionCommand.java index 36a336804..7e8741802 100644 --- a/eternalcore-core/src/main/java/com/eternalcode/core/feature/teleportrequest/self/TpaHereActionCommand.java +++ b/eternalcore-core/src/main/java/com/eternalcode/core/feature/teleportrequest/self/TpaHereActionCommand.java @@ -17,6 +17,9 @@ import java.util.List; import java.util.UUID; +import static com.eternalcode.core.feature.teleportrequest.TeleportRequestPermissionConstant.TELEPORT_REQUEST_ACCEPT_PERMISSION; +import static com.eternalcode.core.feature.teleportrequest.TeleportRequestPermissionConstant.TELEPORT_REQUEST_HERE_DENY_PERMISSION; + @RootCommand public class TpaHereActionCommand { @@ -36,7 +39,7 @@ public class TpaHereActionCommand { } @Execute(name = "tpahereaccept") - @Permission("eternalcore.tpahere.accept") + @Permission(TELEPORT_REQUEST_ACCEPT_PERMISSION) void accept(@Context Player player, @Arg(SelfRequesterArgument.KEY) Player target) { this.teleportTaskService.createTeleport( player.getUniqueId(), @@ -63,7 +66,7 @@ void accept(@Context Player player, @Arg(SelfRequesterArgument.KEY) Player targe } @Execute(name = "tpaheredeny") - @Permission("eternalcore.tpahere.deny") + @Permission(TELEPORT_REQUEST_HERE_DENY_PERMISSION) @DescriptionDocs(description = "Deny a teleport here request") void executeTarget(@Context Player player, @Arg(SelfRequesterArgument.KEY) Player target) { this.requestService.removeRequest(target.getUniqueId()); @@ -84,7 +87,7 @@ void executeTarget(@Context Player player, @Arg(SelfRequesterArgument.KEY) Playe } @Execute(name = "tpaheredeny -all") - @Permission("eternalcore.tpahere.deny") + @Permission(TELEPORT_REQUEST_HERE_DENY_PERMISSION) @DescriptionDocs(description = "Deny all teleport here requests") void executeAll(@Context Player player) { List requests = this.requestService.findRequests(player.getUniqueId()); diff --git a/eternalcore-core/src/main/java/com/eternalcode/core/feature/teleportrequest/self/TpaHereCommand.java b/eternalcore-core/src/main/java/com/eternalcode/core/feature/teleportrequest/self/TpaHereCommand.java index ee2bf1bad..209b75613 100644 --- a/eternalcore-core/src/main/java/com/eternalcode/core/feature/teleportrequest/self/TpaHereCommand.java +++ b/eternalcore-core/src/main/java/com/eternalcode/core/feature/teleportrequest/self/TpaHereCommand.java @@ -12,8 +12,10 @@ import java.util.concurrent.CompletableFuture; +import static com.eternalcode.core.feature.teleportrequest.TeleportRequestPermissionConstant.TELEPORT_REQUEST_HERE_PERMISSION; + @Command(name = "tpahere") -@Permission("eternalcore.tpahere") +@Permission(TELEPORT_REQUEST_HERE_PERMISSION) public class TpaHereCommand { private final TeleportHereRequestService requestService; From f4d518bef8bb211ea8a654e1004775f1a618ea9e Mon Sep 17 00:00:00 2001 From: Jakubk15 <77227023+Jakubk15@users.noreply.github.com> Date: Mon, 17 Mar 2025 19:19:23 +0100 Subject: [PATCH 5/9] Use class instead of interface --- .../TeleportRequestPermissionConstant.java | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) diff --git a/eternalcore-core/src/main/java/com/eternalcode/core/feature/teleportrequest/TeleportRequestPermissionConstant.java b/eternalcore-core/src/main/java/com/eternalcode/core/feature/teleportrequest/TeleportRequestPermissionConstant.java index fba6b1e22..e0c3ce321 100644 --- a/eternalcore-core/src/main/java/com/eternalcode/core/feature/teleportrequest/TeleportRequestPermissionConstant.java +++ b/eternalcore-core/src/main/java/com/eternalcode/core/feature/teleportrequest/TeleportRequestPermissionConstant.java @@ -1,14 +1,14 @@ package com.eternalcode.core.feature.teleportrequest; -public interface TeleportRequestPermissionConstant { +public class TeleportRequestPermissionConstant { - String TELEPORT_REQUEST_PERMISSION = "eternalcore.tpa"; - String TELEPORT_REQUEST_ACCEPT_PERMISSION = "eternalcore.tpaccept"; - String TELEPORT_REQUEST_DENY_PERMISSION = "eternalcore.tpdeny"; - String TELEPORT_REQUEST_HERE_PERMISSION = "eternalcore.tpahere"; - String TELEPORT_REQUEST_HERE_ACCEPT_PERMISSION = "eternalcore.tpahere.accept"; - String TELEPORT_REQUEST_HERE_DENY_PERMISSION = "eternalcore.tpahere.deny"; + public static final String TELEPORT_REQUEST_PERMISSION = "eternalcore.tpa"; + public static final String TELEPORT_REQUEST_ACCEPT_PERMISSION = "eternalcore.tpaccept"; + public static final String TELEPORT_REQUEST_DENY_PERMISSION = "eternalcore.tpdeny"; + public static final String TELEPORT_REQUEST_HERE_PERMISSION = "eternalcore.tpahere"; + public static final String TELEPORT_REQUEST_HERE_ACCEPT_PERMISSION = "eternalcore.tpahere.accept"; + public static final String TELEPORT_REQUEST_HERE_DENY_PERMISSION = "eternalcore.tpahere.deny"; - String TELEPORT_TIMER_BYPASS_PERMISSION = "eternalcore.teleport.bypass"; + public static final String TELEPORT_TIMER_BYPASS_PERMISSION = "eternalcore.teleport.bypass"; } From e4a955dfeb918af8bf2ca8c64df682ff9cdf90f9 Mon Sep 17 00:00:00 2001 From: Jakubk15 <77227023+Jakubk15@users.noreply.github.com> Date: Sat, 24 May 2025 16:19:21 +0200 Subject: [PATCH 6/9] remove unnecessary new lines, inline fields, change access --- .../teleport/command/TeleportBackCommand.java | 6 ++---- .../TeleportRequestPermissionConstant.java | 14 -------------- .../self/TpaHereActionCommand.java | 15 ++++----------- .../teleportrequest/self/TpaHereCommand.java | 8 +++----- 4 files changed, 9 insertions(+), 34 deletions(-) delete mode 100644 eternalcore-core/src/main/java/com/eternalcode/core/feature/teleportrequest/TeleportRequestPermissionConstant.java diff --git a/eternalcore-core/src/main/java/com/eternalcode/core/feature/teleport/command/TeleportBackCommand.java b/eternalcore-core/src/main/java/com/eternalcode/core/feature/teleport/command/TeleportBackCommand.java index 3da8e14c9..f9b0956e7 100644 --- a/eternalcore-core/src/main/java/com/eternalcode/core/feature/teleport/command/TeleportBackCommand.java +++ b/eternalcore-core/src/main/java/com/eternalcode/core/feature/teleport/command/TeleportBackCommand.java @@ -18,8 +18,6 @@ import java.util.Optional; -import static com.eternalcode.core.feature.teleportrequest.TeleportRequestPermissionConstant.TELEPORT_TIMER_BYPASS_PERMISSION; - @Command(name = "back") class TeleportBackCommand { @@ -48,7 +46,7 @@ void execute(@Context Player player) { return; } - if (player.hasPermission(TELEPORT_TIMER_BYPASS_PERMISSION)) { + if (player.hasPermission("eternalcore.teleport.bypass")) { this.teleportService.teleport(player, location.get()); } else { this.teleportTaskService.createTeleport(player.getUniqueId(), PositionAdapter.convert(player.getLocation()), PositionAdapter.convert(location.get()), this.settings.teleportTime()); @@ -69,7 +67,7 @@ void execute(@Context Viewer viewer, @Arg Player player) { return; } - if (player.hasPermission(TELEPORT_TIMER_BYPASS_PERMISSION)){ + if (player.hasPermission("eternalcore.teleport.bypass")){ this.teleportService.teleport(player, location.get()); } else { this.teleportTaskService.createTeleport(player.getUniqueId(), PositionAdapter.convert(player.getLocation()), PositionAdapter.convert(location.get()), this.settings.teleportTime()); diff --git a/eternalcore-core/src/main/java/com/eternalcode/core/feature/teleportrequest/TeleportRequestPermissionConstant.java b/eternalcore-core/src/main/java/com/eternalcode/core/feature/teleportrequest/TeleportRequestPermissionConstant.java deleted file mode 100644 index e0c3ce321..000000000 --- a/eternalcore-core/src/main/java/com/eternalcode/core/feature/teleportrequest/TeleportRequestPermissionConstant.java +++ /dev/null @@ -1,14 +0,0 @@ -package com.eternalcode.core.feature.teleportrequest; - -public class TeleportRequestPermissionConstant { - - public static final String TELEPORT_REQUEST_PERMISSION = "eternalcore.tpa"; - public static final String TELEPORT_REQUEST_ACCEPT_PERMISSION = "eternalcore.tpaccept"; - public static final String TELEPORT_REQUEST_DENY_PERMISSION = "eternalcore.tpdeny"; - public static final String TELEPORT_REQUEST_HERE_PERMISSION = "eternalcore.tpahere"; - public static final String TELEPORT_REQUEST_HERE_ACCEPT_PERMISSION = "eternalcore.tpahere.accept"; - public static final String TELEPORT_REQUEST_HERE_DENY_PERMISSION = "eternalcore.tpahere.deny"; - - public static final String TELEPORT_TIMER_BYPASS_PERMISSION = "eternalcore.teleport.bypass"; - -} diff --git a/eternalcore-core/src/main/java/com/eternalcode/core/feature/teleportrequest/self/TpaHereActionCommand.java b/eternalcore-core/src/main/java/com/eternalcode/core/feature/teleportrequest/self/TpaHereActionCommand.java index 7e8741802..caf263665 100644 --- a/eternalcore-core/src/main/java/com/eternalcode/core/feature/teleportrequest/self/TpaHereActionCommand.java +++ b/eternalcore-core/src/main/java/com/eternalcode/core/feature/teleportrequest/self/TpaHereActionCommand.java @@ -17,11 +17,8 @@ import java.util.List; import java.util.UUID; -import static com.eternalcode.core.feature.teleportrequest.TeleportRequestPermissionConstant.TELEPORT_REQUEST_ACCEPT_PERMISSION; -import static com.eternalcode.core.feature.teleportrequest.TeleportRequestPermissionConstant.TELEPORT_REQUEST_HERE_DENY_PERMISSION; - @RootCommand -public class TpaHereActionCommand { +class TpaHereActionCommand { private final TeleportHereRequestService requestService; private final TeleportTaskService teleportTaskService; @@ -39,7 +36,7 @@ public class TpaHereActionCommand { } @Execute(name = "tpahereaccept") - @Permission(TELEPORT_REQUEST_ACCEPT_PERMISSION) + @Permission("eternalcore.tpaccept") void accept(@Context Player player, @Arg(SelfRequesterArgument.KEY) Player target) { this.teleportTaskService.createTeleport( player.getUniqueId(), @@ -66,7 +63,7 @@ void accept(@Context Player player, @Arg(SelfRequesterArgument.KEY) Player targe } @Execute(name = "tpaheredeny") - @Permission(TELEPORT_REQUEST_HERE_DENY_PERMISSION) + @Permission("eternalcore.tpahere.deny") @DescriptionDocs(description = "Deny a teleport here request") void executeTarget(@Context Player player, @Arg(SelfRequesterArgument.KEY) Player target) { this.requestService.removeRequest(target.getUniqueId()); @@ -87,25 +84,21 @@ void executeTarget(@Context Player player, @Arg(SelfRequesterArgument.KEY) Playe } @Execute(name = "tpaheredeny -all") - @Permission(TELEPORT_REQUEST_HERE_DENY_PERMISSION) + @Permission("eternalcore.tpahere.deny") @DescriptionDocs(description = "Deny all teleport here requests") void executeAll(@Context Player player) { List requests = this.requestService.findRequests(player.getUniqueId()); if (requests.isEmpty()) { - this.noticeService.player(player.getUniqueId(), translation -> translation.tpa().tpaDenyNoRequestMessage()); - return; } for (UUID uniqueId : requests) { Player requester = this.server.getPlayer(uniqueId); - this.requestService.removeRequest(uniqueId); if (requester != null) { - this.noticeService .create() .player(uniqueId) diff --git a/eternalcore-core/src/main/java/com/eternalcode/core/feature/teleportrequest/self/TpaHereCommand.java b/eternalcore-core/src/main/java/com/eternalcode/core/feature/teleportrequest/self/TpaHereCommand.java index 209b75613..5bdd6839e 100644 --- a/eternalcore-core/src/main/java/com/eternalcode/core/feature/teleportrequest/self/TpaHereCommand.java +++ b/eternalcore-core/src/main/java/com/eternalcode/core/feature/teleportrequest/self/TpaHereCommand.java @@ -12,11 +12,9 @@ import java.util.concurrent.CompletableFuture; -import static com.eternalcode.core.feature.teleportrequest.TeleportRequestPermissionConstant.TELEPORT_REQUEST_HERE_PERMISSION; - @Command(name = "tpahere") -@Permission(TELEPORT_REQUEST_HERE_PERMISSION) -public class TpaHereCommand { +@Permission("eternalcore.tpahere") +class TpaHereCommand { private final TeleportHereRequestService requestService; private final IgnoreService ignoreService; @@ -69,7 +67,7 @@ void execute(@Context Player sender, @Arg Player target) { }); } - CompletableFuture isIgnoring(Player target, Player sender) { + private CompletableFuture isIgnoring(Player target, Player sender) { return this.ignoreService.isIgnored(target.getUniqueId(), sender.getUniqueId()); } } From 04e3fe9cab16354e7a8785225bdbe0c95776af52 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jakub=20K=C4=99dziora?= <77227023+Jakubk15@users.noreply.github.com> Date: Fri, 6 Jun 2025 20:31:01 +0200 Subject: [PATCH 7/9] Update eternalcore-core/src/main/java/com/eternalcode/core/feature/teleportrequest/self/TpaHereCommand.java Co-authored-by: coderabbitai[bot] <136622811+coderabbitai[bot]@users.noreply.github.com> --- .../teleportrequest/self/TpaHereCommand.java | 15 ++++++++------- 1 file changed, 8 insertions(+), 7 deletions(-) diff --git a/eternalcore-core/src/main/java/com/eternalcode/core/feature/teleportrequest/self/TpaHereCommand.java b/eternalcore-core/src/main/java/com/eternalcode/core/feature/teleportrequest/self/TpaHereCommand.java index 5bdd6839e..3553a2395 100644 --- a/eternalcore-core/src/main/java/com/eternalcode/core/feature/teleportrequest/self/TpaHereCommand.java +++ b/eternalcore-core/src/main/java/com/eternalcode/core/feature/teleportrequest/self/TpaHereCommand.java @@ -41,13 +41,6 @@ void execute(@Context Player sender, @Arg Player target) { return; } - this.noticeService - .create() - .player(sender.getUniqueId()) - .notice(translation -> translation.tpa().tpaSentMessage()) - .placeholder("{PLAYER}", target.getName()) - .send(); - this.isIgnoring(target, sender).thenAccept(isIgnoring -> { if (isIgnoring) { this.noticeService.create() @@ -57,6 +50,14 @@ void execute(@Context Player sender, @Arg Player target) { .send(); return; } + + this.noticeService + .create() + .player(sender.getUniqueId()) + .notice(translation -> translation.tpa().tpaSentMessage()) + .placeholder("{PLAYER}", target.getName()) + .send(); + this.noticeService.create() .player(target.getUniqueId()) .notice(translation -> translation.tpa().tpaHereReceivedMessage()) From 8a51009209343b5815cbe1d93bf8b0c750e31d13 Mon Sep 17 00:00:00 2001 From: Jakubk15 <77227023+Jakubk15@users.noreply.github.com> Date: Wed, 23 Jul 2025 18:59:42 +0200 Subject: [PATCH 8/9] Download luckperms from modrinth on startup, fix wrong message being sent on command execution --- buildSrc/src/main/kotlin/Versions.kt | 2 +- .../core/feature/teleportrequest/self/TpaHereCommand.java | 2 +- eternalcore-plugin/build.gradle.kts | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/buildSrc/src/main/kotlin/Versions.kt b/buildSrc/src/main/kotlin/Versions.kt index b5e0b8887..1bd4ed313 100644 --- a/buildSrc/src/main/kotlin/Versions.kt +++ b/buildSrc/src/main/kotlin/Versions.kt @@ -36,7 +36,7 @@ object Versions { const val XSERIES = "13.3.3" - const val LUCKPERMS = "5.4.156" + const val LUCKPERMS = "5.5.0" const val BSTATS = "3.1.0" diff --git a/eternalcore-core/src/main/java/com/eternalcode/core/feature/teleportrequest/self/TpaHereCommand.java b/eternalcore-core/src/main/java/com/eternalcode/core/feature/teleportrequest/self/TpaHereCommand.java index 3553a2395..da3716cbc 100644 --- a/eternalcore-core/src/main/java/com/eternalcode/core/feature/teleportrequest/self/TpaHereCommand.java +++ b/eternalcore-core/src/main/java/com/eternalcode/core/feature/teleportrequest/self/TpaHereCommand.java @@ -54,7 +54,7 @@ void execute(@Context Player sender, @Arg Player target) { this.noticeService .create() .player(sender.getUniqueId()) - .notice(translation -> translation.tpa().tpaSentMessage()) + .notice(translation -> translation.tpa().tpaHereSentMessage()) .placeholder("{PLAYER}", target.getName()) .send(); diff --git a/eternalcore-plugin/build.gradle.kts b/eternalcore-plugin/build.gradle.kts index bd1b6cac1..6f9a54761 100644 --- a/eternalcore-plugin/build.gradle.kts +++ b/eternalcore-plugin/build.gradle.kts @@ -37,6 +37,6 @@ dependencies { tasks { runServer { minecraftVersion("1.21.6") - downloadPlugins.url("https://ci.lucko.me/job/LuckPerms/lastBuild/artifact/bukkit/loader/build/libs/LuckPerms-Bukkit-${Versions.LUCKPERMS}.jar") + downloadPlugins.modrinth("luckperms", "v${Versions.LUCKPERMS}-bukkit") } } From f76abd68bd1f5c4d277158d6682e7ddca3c5df7f Mon Sep 17 00:00:00 2001 From: Rollczi Date: Wed, 23 Jul 2025 23:32:26 +0200 Subject: [PATCH 9/9] Remove "Message" suffix --- .../teleportrequest/messages/ENTeleportRequestMessages.java | 4 ++-- .../teleportrequest/messages/PLTeleportRequestMessages.java | 4 ++-- .../teleportrequest/messages/TeleportRequestMessages.java | 4 ++-- .../core/feature/teleportrequest/self/TpaHereCommand.java | 4 ++-- 4 files changed, 8 insertions(+), 8 deletions(-) diff --git a/eternalcore-core/src/main/java/com/eternalcode/core/feature/teleportrequest/messages/ENTeleportRequestMessages.java b/eternalcore-core/src/main/java/com/eternalcode/core/feature/teleportrequest/messages/ENTeleportRequestMessages.java index 571632e1c..1f17822a6 100644 --- a/eternalcore-core/src/main/java/com/eternalcode/core/feature/teleportrequest/messages/ENTeleportRequestMessages.java +++ b/eternalcore-core/src/main/java/com/eternalcode/core/feature/teleportrequest/messages/ENTeleportRequestMessages.java @@ -15,8 +15,8 @@ public class ENTeleportRequestMessages extends OkaeriConfig implements TeleportR public Notice tpaSentMessage = Notice.chat("► You have sent a request for player {PLAYER}{PLAYER} to teleport to you!"); - public Notice tpaHereSentMessage = Notice.chat("► You have sent a request for teleportation to you for a player: {PLAYER}!"); - public Notice tpaHereReceivedMessage = Notice.builder() + public Notice tpaHereSent = Notice.chat("► You have sent a request for teleportation to you for a player: {PLAYER}!"); + public Notice tpaHereReceived = Notice.builder() .chat("► You have received a request for teleportation TO a player: {PLAYER}!") .chat( "Teleport to the player?'>» /tpahereaccept {PLAYER} to accept! (Click)") diff --git a/eternalcore-core/src/main/java/com/eternalcode/core/feature/teleportrequest/messages/PLTeleportRequestMessages.java b/eternalcore-core/src/main/java/com/eternalcode/core/feature/teleportrequest/messages/PLTeleportRequestMessages.java index a3ae395cf..a66e6f0e7 100644 --- a/eternalcore-core/src/main/java/com/eternalcode/core/feature/teleportrequest/messages/PLTeleportRequestMessages.java +++ b/eternalcore-core/src/main/java/com/eternalcode/core/feature/teleportrequest/messages/PLTeleportRequestMessages.java @@ -15,8 +15,8 @@ public class PLTeleportRequestMessages extends OkaeriConfig implements TeleportR public Notice tpaSentMessage = Notice.chat("► Wysłałeś prośbę o teleportację do gracza: {PLAYER}!"); - public Notice tpaHereSentMessage = Notice.chat("► Wysłałeś prośbę o teleportację gracza {PLAYER} do twojej lokalizacji!"); - public Notice tpaHereReceivedMessage = Notice.builder() + public Notice tpaHereSent = Notice.chat("► Wysłałeś prośbę o teleportację gracza {PLAYER} do twojej lokalizacji!"); + public Notice tpaHereReceived = Notice.builder() .chat("► Otrzymałeś prośbę o teleportację do gracza: {PLAYER}!") .chat( "Teleportować się do gracza?'>» /tpahereaccept {PLAYER} by ją zaakceptować! (Kliknij)") diff --git a/eternalcore-core/src/main/java/com/eternalcode/core/feature/teleportrequest/messages/TeleportRequestMessages.java b/eternalcore-core/src/main/java/com/eternalcode/core/feature/teleportrequest/messages/TeleportRequestMessages.java index b3eb1f248..3868753ea 100644 --- a/eternalcore-core/src/main/java/com/eternalcode/core/feature/teleportrequest/messages/TeleportRequestMessages.java +++ b/eternalcore-core/src/main/java/com/eternalcode/core/feature/teleportrequest/messages/TeleportRequestMessages.java @@ -9,8 +9,8 @@ public interface TeleportRequestMessages { Notice tpaReceivedMessage(); Notice tpaTargetIgnoresYou(); - Notice tpaHereSentMessage(); - Notice tpaHereReceivedMessage(); + Notice tpaHereSent(); + Notice tpaHereReceived(); Notice tpaDenyNoRequestMessage(); Notice tpaDenyDoneMessage(); diff --git a/eternalcore-core/src/main/java/com/eternalcode/core/feature/teleportrequest/self/TpaHereCommand.java b/eternalcore-core/src/main/java/com/eternalcode/core/feature/teleportrequest/self/TpaHereCommand.java index da3716cbc..8b4cfe69f 100644 --- a/eternalcore-core/src/main/java/com/eternalcode/core/feature/teleportrequest/self/TpaHereCommand.java +++ b/eternalcore-core/src/main/java/com/eternalcode/core/feature/teleportrequest/self/TpaHereCommand.java @@ -54,13 +54,13 @@ void execute(@Context Player sender, @Arg Player target) { this.noticeService .create() .player(sender.getUniqueId()) - .notice(translation -> translation.tpa().tpaHereSentMessage()) + .notice(translation -> translation.tpa().tpaHereSent()) .placeholder("{PLAYER}", target.getName()) .send(); this.noticeService.create() .player(target.getUniqueId()) - .notice(translation -> translation.tpa().tpaHereReceivedMessage()) + .notice(translation -> translation.tpa().tpaHereReceived()) .placeholder("{PLAYER}", sender.getName()) .send();