From e9b39c0402410018800aa2a8cb9ef2fd93feebb7 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Pawe=C5=82=20Malanich?= Date: Mon, 6 Oct 2025 22:08:20 +0200 Subject: [PATCH 1/2] Make Notice`s package-private --- .../messages/ENAdminChatMessages.java | 8 +- .../messages/PLAdminChatMessages.java | 8 +- .../feature/afk/messages/ENAfkMessages.java | 6 +- .../messages/ENAutoMessageMessages.java | 4 +- .../feature/broadcast/BroadcastCommand.java | 15 +- .../feature/burn/messages/ENBurnMessages.java | 4 +- .../feature/chat/ChatManagerController.java | 28 +++- .../clear/messages/ENClearMessages.java | 4 +- .../messages/ENContainerMessages.java | 36 ++--- .../freeze/messages/ENFreezeMessages.java | 16 +-- .../messages/ENDemoScreenMessages.java | 4 +- .../messages/ENElderGuardianMessages.java | 4 +- .../messages/ENEndScreenMessages.java | 4 +- .../helpop/messages/ENHelpOpMessages.java | 6 +- .../helpop/messages/PLHelpOpMessages.java | 6 +- .../feature/home/messages/ENHomeMessages.java | 22 +-- .../itemedit/messages/ENItemEditMessages.java | 20 +-- .../itemedit/messages/PLItemEditMessages.java | 20 +-- .../feature/jail/messages/ENJailMessages.java | 36 ++--- .../feature/motd/messages/ENMotdMessages.java | 2 +- .../feature/msg/messages/ENMsgMessages.java | 38 ++--- .../feature/near/messages/ENNearMessages.java | 8 +- .../feature/near/messages/PLNearMessages.java | 8 +- .../playtime/messages/ENPlaytimeMessages.java | 4 +- .../messages/ENPowertoolMessages.java | 14 +- .../messages/ENRandomTeleportMessages.java | 10 +- .../repair/messages/ENRepairMessages.java | 8 +- .../feature/seen/messages/ENSeenMessages.java | 6 +- .../PlayerJoinMessageController.java | 17 ++- .../PlayerQuitMessageController.java | 17 ++- .../setslot/messages/ENSetSlotMessages.java | 2 +- .../messages/ENSignEditorMessages.java | 6 +- .../messages/PLSignEditorMessages.java | 6 +- .../sound/PlayerChatSoundListener.java | 39 ------ .../sound/PlayerJoinSoundListener.java | 34 ----- .../sound/PlayerQuitSoundListener.java | 33 ----- .../spawn/messages/ENSpawnMessages.java | 8 +- .../feature/sudo/messages/ENSudoMessages.java | 4 +- .../messages/ENTeleportOfflineMessages.java | 6 +- .../ENTeleportToRandomPlayerMessages.java | 8 +- .../messages/ENTeleportRequestMessages.java | 32 ++--- .../messages/ENTimeAndWeatherMessages.java | 14 +- .../vanish/messages/ENVanishMessages.java | 28 ++-- .../feature/warp/messages/ENWarpMessages.java | 34 ++--- .../argument/messages/ENArgumentMessages.java | 38 ++--- .../argument/messages/PLArgumentMessages.java | 38 ++--- .../EternalCoreNoticeBukkitResolver.java | 2 +- .../core/notice/NoticeService.java | 2 +- .../implementation/ENTranslation.java | 131 +++++++++--------- .../implementation/PLTranslation.java | 122 ++++++++-------- gradlew | 2 +- 51 files changed, 457 insertions(+), 515 deletions(-) rename eternalcore-core/src/main/java/com/eternalcode/core/feature/{joinmessage => session}/PlayerJoinMessageController.java (71%) rename eternalcore-core/src/main/java/com/eternalcode/core/feature/{quitmessage => session}/PlayerQuitMessageController.java (67%) delete mode 100644 eternalcore-core/src/main/java/com/eternalcode/core/feature/sound/PlayerChatSoundListener.java delete mode 100644 eternalcore-core/src/main/java/com/eternalcode/core/feature/sound/PlayerJoinSoundListener.java delete mode 100644 eternalcore-core/src/main/java/com/eternalcode/core/feature/sound/PlayerQuitSoundListener.java diff --git a/eternalcore-core/src/main/java/com/eternalcode/core/feature/adminchat/messages/ENAdminChatMessages.java b/eternalcore-core/src/main/java/com/eternalcode/core/feature/adminchat/messages/ENAdminChatMessages.java index 95047ab76..d07189067 100644 --- a/eternalcore-core/src/main/java/com/eternalcode/core/feature/adminchat/messages/ENAdminChatMessages.java +++ b/eternalcore-core/src/main/java/com/eternalcode/core/feature/adminchat/messages/ENAdminChatMessages.java @@ -11,11 +11,11 @@ public class ENAdminChatMessages extends OkaeriConfig implements AdminChatMessages { @Comment({"# {PLAYER} - Player who sent message on adminchat, {TEXT} - message"}) - public Notice format = Notice.chat("[AdminChat] {PLAYER}: {TEXT}"); + Notice format = Notice.chat("[AdminChat] {PLAYER}: {TEXT}"); - public Notice enabled = Notice.chat("► Enabled persistent admin chat!"); + Notice enabled = Notice.chat("► Enabled persistent admin chat!"); - public Notice disabled = Notice.chat("► Disabled persistent admin chat!"); + Notice disabled = Notice.chat("► Disabled persistent admin chat!"); - public Notice enabledReminder = Notice.actionbar("AdminChat channel is enabled!"); + Notice enabledReminder = Notice.actionbar("AdminChat channel is enabled!"); } diff --git a/eternalcore-core/src/main/java/com/eternalcode/core/feature/adminchat/messages/PLAdminChatMessages.java b/eternalcore-core/src/main/java/com/eternalcode/core/feature/adminchat/messages/PLAdminChatMessages.java index 9ffa59faa..9aac045c7 100644 --- a/eternalcore-core/src/main/java/com/eternalcode/core/feature/adminchat/messages/PLAdminChatMessages.java +++ b/eternalcore-core/src/main/java/com/eternalcode/core/feature/adminchat/messages/PLAdminChatMessages.java @@ -11,11 +11,11 @@ public class PLAdminChatMessages extends OkaeriConfig implements AdminChatMessages { @Comment({"# {PLAYER} - Gracz który wysłał wiadomość na czacie administracji, {TEXT} - Treść wysłanej wiadomości"}) - public Notice format = Notice.chat("[Administracja] {PLAYER}: {TEXT}"); + Notice format = Notice.chat("[Administracja] {PLAYER}: {TEXT}"); - public Notice enabled = Notice.chat("► Włączono trwały czat administracji!"); + Notice enabled = Notice.chat("► Włączono trwały czat administracji!"); - public Notice disabled = Notice.chat("► Wyłączono trwały czat administracji!"); + Notice disabled = Notice.chat("► Wyłączono trwały czat administracji!"); - public Notice enabledReminder = Notice.actionbar(" Trwały czat administracji jest włączony!"); + Notice enabledReminder = Notice.actionbar(" Trwały czat administracji jest włączony!"); } diff --git a/eternalcore-core/src/main/java/com/eternalcode/core/feature/afk/messages/ENAfkMessages.java b/eternalcore-core/src/main/java/com/eternalcode/core/feature/afk/messages/ENAfkMessages.java index a030866de..796e89ae1 100644 --- a/eternalcore-core/src/main/java/com/eternalcode/core/feature/afk/messages/ENAfkMessages.java +++ b/eternalcore-core/src/main/java/com/eternalcode/core/feature/afk/messages/ENAfkMessages.java @@ -11,11 +11,11 @@ public class ENAfkMessages extends OkaeriConfig implements AfkMessages { @Comment("# {PLAYER} - Player who is in AFK") - public Notice afkOn = Notice.chat("► {PLAYER} is AFK!"); - public Notice afkOff = Notice.chat("► {PLAYER} is no more AFK!"); + Notice afkOn = Notice.chat("► {PLAYER} is AFK!"); + Notice afkOff = Notice.chat("► {PLAYER} is no more AFK!"); @Comment({" ", "# {TIME} - Time after the player can execute the command."}) - public Notice afkDelay = Notice.chat("► You can use this command only after {TIME}!"); + Notice afkDelay = Notice.chat("► You can use this command only after {TIME}!"); @Comment({" "}) public String afkKickReason = "You have been kicked due to inactivity!"; diff --git a/eternalcore-core/src/main/java/com/eternalcode/core/feature/automessage/messages/ENAutoMessageMessages.java b/eternalcore-core/src/main/java/com/eternalcode/core/feature/automessage/messages/ENAutoMessageMessages.java index 8046a07fc..8496501c2 100644 --- a/eternalcore-core/src/main/java/com/eternalcode/core/feature/automessage/messages/ENAutoMessageMessages.java +++ b/eternalcore-core/src/main/java/com/eternalcode/core/feature/automessage/messages/ENAutoMessageMessages.java @@ -34,8 +34,8 @@ public class ENAutoMessageMessages extends OkaeriConfig implements AutoMessageMe .build() ); - public Notice enabled = Notice.chat("► Enabled auto messages!"); - public Notice disabled = Notice.chat("► Disabled auto messages!"); + Notice enabled = Notice.chat("► Enabled auto messages!"); + Notice disabled = Notice.chat("► Disabled auto messages!"); @Override public Collection messages() { diff --git a/eternalcore-core/src/main/java/com/eternalcode/core/feature/broadcast/BroadcastCommand.java b/eternalcore-core/src/main/java/com/eternalcode/core/feature/broadcast/BroadcastCommand.java index 0700cd2a7..feaa5c19a 100644 --- a/eternalcore-core/src/main/java/com/eternalcode/core/feature/broadcast/BroadcastCommand.java +++ b/eternalcore-core/src/main/java/com/eternalcode/core/feature/broadcast/BroadcastCommand.java @@ -35,15 +35,14 @@ void executeChat(@Flag("-raw") boolean raw, @Join String text) { } @Execute(name = "title") - @DescriptionDocs(description = "Broadcasts a TITLE message to all players.", arguments = "[-raw] ") - void executeTitle(@Flag("-raw") boolean raw, @Join String title) { - this.sendBroadcast(formatted -> Notice.title(formatted, "", this.settings.titleFadeIn(), this.settings.titleStay(), this.settings.titleFadeOut()), title, raw); - } + @DescriptionDocs(description = "Broadcasts a combined title message to all players.", arguments = "[-raw] ") + void executeTitle(@Flag("-raw") boolean raw, @Join String text) { - @Execute(name = "subtitle") - @DescriptionDocs(description = "Broadcasts a SUBTITLE message to all players.", arguments = "[-raw] ") - void executeSubtitle(@Flag("-raw") boolean raw, @Join String subtitle) { - this.sendBroadcast(formatted -> Notice.title("", formatted, this.settings.titleFadeIn(), this.settings.titleStay(), this.settings.titleFadeOut()), subtitle, raw); + this.noticeService.create() + .notice(translation -> Notice.title(raw ? " " : translation.broadcast().messageFormat(), text, + this.settings.titleFadeIn(), this.settings.titleStay(), this.settings.titleFadeOut())) + .onlinePlayers() + .send(); } @Execute(name = "actionbar") diff --git a/eternalcore-core/src/main/java/com/eternalcode/core/feature/burn/messages/ENBurnMessages.java b/eternalcore-core/src/main/java/com/eternalcode/core/feature/burn/messages/ENBurnMessages.java index 67c2ff29a..605eda54f 100644 --- a/eternalcore-core/src/main/java/com/eternalcode/core/feature/burn/messages/ENBurnMessages.java +++ b/eternalcore-core/src/main/java/com/eternalcode/core/feature/burn/messages/ENBurnMessages.java @@ -11,8 +11,8 @@ public class ENBurnMessages extends OkaeriConfig implements BurnMessages { @Comment("# Available placeholders: {PLAYER} - burned player, {TICKS} - number of ticks the player is on fire") - public Notice burnedSelf = Notice.chat("► You have been set on fire for {TICKS} ticks!"); + Notice burnedSelf = Notice.chat("► You have been set on fire for {TICKS} ticks!"); @Comment(" ") - public Notice burnedOther = Notice.chat("► {PLAYER} has been set on fire for {TICKS} ticks!"); + Notice burnedOther = Notice.chat("► {PLAYER} has been set on fire for {TICKS} ticks!"); } diff --git a/eternalcore-core/src/main/java/com/eternalcode/core/feature/chat/ChatManagerController.java b/eternalcore-core/src/main/java/com/eternalcode/core/feature/chat/ChatManagerController.java index 170c93a3e..6aff519a7 100644 --- a/eternalcore-core/src/main/java/com/eternalcode/core/feature/chat/ChatManagerController.java +++ b/eternalcore-core/src/main/java/com/eternalcode/core/feature/chat/ChatManagerController.java @@ -4,6 +4,7 @@ import static com.eternalcode.core.feature.chat.ChatManagerController.CHAT_SLOWMODE_BYPASS_PERMISSION; import com.eternalcode.annotations.scan.permission.PermissionDocs; +import com.eternalcode.core.configuration.implementation.PluginConfiguration; import com.eternalcode.core.event.EventCaller; import com.eternalcode.core.feature.chat.event.restrict.ChatRestrictCause; import com.eternalcode.core.feature.chat.event.restrict.ChatRestrictEvent; @@ -13,6 +14,8 @@ import com.eternalcode.core.util.DurationUtil; import java.time.Duration; import java.util.UUID; + +import org.bukkit.Server; import org.bukkit.entity.Player; import org.bukkit.event.EventHandler; import org.bukkit.event.EventPriority; @@ -34,18 +37,24 @@ class ChatManagerController implements Listener { private final ChatSettings chatSettings; private final NoticeService noticeService; private final EventCaller eventCaller; + private final PluginConfiguration config; + private final Server server; @Inject ChatManagerController( ChatService chatService, ChatSettings chatSettings, NoticeService noticeService, - EventCaller eventCaller + EventCaller eventCaller, + PluginConfiguration config, + Server server ) { this.chatService = chatService; this.chatSettings = chatSettings; this.noticeService = noticeService; this.eventCaller = eventCaller; + this.config = config; + this.server = server; } @EventHandler(ignoreCancelled = true, priority = EventPriority.HIGHEST) @@ -90,4 +99,21 @@ void onChatSlowMode(AsyncPlayerChatEvent event) { void markUseChat(AsyncPlayerChatEvent event) { this.chatService.markUseChat(event.getPlayer().getUniqueId()); } + + @EventHandler(ignoreCancelled = true, priority = EventPriority.MONITOR) + void sendSound(AsyncPlayerChatEvent event) { + PluginConfiguration.Sounds sound = this.config.sound; + + if (!sound.enableAfterChatMessage) { + return; + } + + if (!this.chatSettings.chatEnabled()) { + return; + } + + for (Player online : this.server.getOnlinePlayers()) { + online.playSound(online.getLocation(), sound.afterChatMessage, sound.afterChatMessageVolume, sound.afterChatMessagePitch); + } + } } diff --git a/eternalcore-core/src/main/java/com/eternalcode/core/feature/clear/messages/ENClearMessages.java b/eternalcore-core/src/main/java/com/eternalcode/core/feature/clear/messages/ENClearMessages.java index 3baa3ca05..891aef894 100644 --- a/eternalcore-core/src/main/java/com/eternalcode/core/feature/clear/messages/ENClearMessages.java +++ b/eternalcore-core/src/main/java/com/eternalcode/core/feature/clear/messages/ENClearMessages.java @@ -10,7 +10,7 @@ @Accessors(fluent = true) public class ENClearMessages extends OkaeriConfig implements ClearMessages { - public Notice inventoryCleared = Notice.chat("► Your inventory has been cleared"); - public Notice targetInventoryCleared = Notice.chat("► Player inventory: {PLAYER} has been cleared"); + Notice inventoryCleared = Notice.chat("► Your inventory has been cleared"); + Notice targetInventoryCleared = Notice.chat("► Player inventory: {PLAYER} has been cleared"); } diff --git a/eternalcore-core/src/main/java/com/eternalcode/core/feature/container/messages/ENContainerMessages.java b/eternalcore-core/src/main/java/com/eternalcode/core/feature/container/messages/ENContainerMessages.java index 8d112463e..1d0d5e0b9 100644 --- a/eternalcore-core/src/main/java/com/eternalcode/core/feature/container/messages/ENContainerMessages.java +++ b/eternalcore-core/src/main/java/com/eternalcode/core/feature/container/messages/ENContainerMessages.java @@ -9,30 +9,30 @@ @Accessors(fluent = true) public class ENContainerMessages extends OkaeriConfig implements ContainerMessages { - public Notice anvilOpened = Notice.chat("► Anvil opened!"); - public Notice targetAnvilOpened = Notice.chat("► Opened an anvil for {PLAYER}!"); + Notice anvilOpened = Notice.chat("► Anvil opened!"); + Notice targetAnvilOpened = Notice.chat("► Opened an anvil for {PLAYER}!"); - public Notice cartographyOpened = Notice.chat("► Cartography table opened!"); - public Notice targetCartographyOpened = Notice.chat("► Opened a cartography table for {PLAYER}!"); + Notice cartographyOpened = Notice.chat("► Cartography table opened!"); + Notice targetCartographyOpened = Notice.chat("► Opened a cartography table for {PLAYER}!"); - public Notice disposalOpened = Notice.chat("► Disposal opened!"); - public Notice targetDisposalOpened = Notice.chat("► Opened a disposal for {PLAYER}!"); + Notice disposalOpened = Notice.chat("► Disposal opened!"); + Notice targetDisposalOpened = Notice.chat("► Opened a disposal for {PLAYER}!"); - public Notice enderchestOpened = Notice.chat("► Ender chest opened!"); - public Notice targetEnderchestOpened = Notice.chat("► Opened an ender chest for {PLAYER}!"); + Notice enderchestOpened = Notice.chat("► Ender chest opened!"); + Notice targetEnderchestOpened = Notice.chat("► Opened an ender chest for {PLAYER}!"); - public Notice grindstoneOpened = Notice.chat("► Grindstone opened!"); - public Notice targetGrindstoneOpened = Notice.chat("► Opened a grindstone for {PLAYER}!"); + Notice grindstoneOpened = Notice.chat("► Grindstone opened!"); + Notice targetGrindstoneOpened = Notice.chat("► Opened a grindstone for {PLAYER}!"); - public Notice loomOpened = Notice.chat("► Loom opened!"); - public Notice targetLoomOpened = Notice.chat("► Opened a loom for {PLAYER}!"); + Notice loomOpened = Notice.chat("► Loom opened!"); + Notice targetLoomOpened = Notice.chat("► Opened a loom for {PLAYER}!"); - public Notice smithingOpened = Notice.chat("► Smithing table opened!"); - public Notice targetSmithingOpened = Notice.chat("► Opened a smithing table for {PLAYER}!"); + Notice smithingOpened = Notice.chat("► Smithing table opened!"); + Notice targetSmithingOpened = Notice.chat("► Opened a smithing table for {PLAYER}!"); - public Notice stonecutterOpened = Notice.chat("► Stonecutter opened!"); - public Notice targetStonecutterOpened = Notice.chat("► Opened a stonecutter for {PLAYER}!"); + Notice stonecutterOpened = Notice.chat("► Stonecutter opened!"); + Notice targetStonecutterOpened = Notice.chat("► Opened a stonecutter for {PLAYER}!"); - public Notice workbenchOpened = Notice.chat("► Workbench opened!"); - public Notice targetWorkbenchOpened = Notice.chat("► Opened a workbench for {PLAYER}!"); + Notice workbenchOpened = Notice.chat("► Workbench opened!"); + Notice targetWorkbenchOpened = Notice.chat("► Opened a workbench for {PLAYER}!"); } diff --git a/eternalcore-core/src/main/java/com/eternalcode/core/feature/freeze/messages/ENFreezeMessages.java b/eternalcore-core/src/main/java/com/eternalcode/core/feature/freeze/messages/ENFreezeMessages.java index e7096436b..33e7d5e04 100644 --- a/eternalcore-core/src/main/java/com/eternalcode/core/feature/freeze/messages/ENFreezeMessages.java +++ b/eternalcore-core/src/main/java/com/eternalcode/core/feature/freeze/messages/ENFreezeMessages.java @@ -9,19 +9,19 @@ @Accessors(fluent = true) public class ENFreezeMessages extends OkaeriConfig implements FreezeMessages { - public Notice frozenSelf = Notice.chat("► You have frozen yourself for {DURATION}!"); + Notice frozenSelf = Notice.chat("► You have frozen yourself for {DURATION}!"); - public Notice unfrozenSelf = Notice.chat("► You have unfrozen yourself!"); + Notice unfrozenSelf = Notice.chat("► You have unfrozen yourself!"); - public Notice frozenOther = Notice.chat("► You have frozen player {PLAYER} for {DURATION}!"); + Notice frozenOther = Notice.chat("► You have frozen player {PLAYER} for {DURATION}!"); - public Notice unfrozenOther = Notice.chat("► You have unfrozen player {PLAYER}!"); + Notice unfrozenOther = Notice.chat("► You have unfrozen player {PLAYER}!"); - public Notice frozenByOther = Notice.chat("► You have been frozen by player {PLAYER} for {DURATION}!"); + Notice frozenByOther = Notice.chat("► You have been frozen by player {PLAYER} for {DURATION}!"); - public Notice unfrozenByOther = Notice.chat("► You have been unfrozen by player {PLAYER}!"); + Notice unfrozenByOther = Notice.chat("► You have been unfrozen by player {PLAYER}!"); - public Notice selfNotFrozen = Notice.chat("► You are not frozen!"); + Notice selfNotFrozen = Notice.chat("► You are not frozen!"); - public Notice otherNotFrozen = Notice.chat("► Player {PLAYER} is not frozen!"); + Notice otherNotFrozen = Notice.chat("► Player {PLAYER} is not frozen!"); } diff --git a/eternalcore-core/src/main/java/com/eternalcode/core/feature/fun/demoscreen/messages/ENDemoScreenMessages.java b/eternalcore-core/src/main/java/com/eternalcode/core/feature/fun/demoscreen/messages/ENDemoScreenMessages.java index c761001ba..092297417 100644 --- a/eternalcore-core/src/main/java/com/eternalcode/core/feature/fun/demoscreen/messages/ENDemoScreenMessages.java +++ b/eternalcore-core/src/main/java/com/eternalcode/core/feature/fun/demoscreen/messages/ENDemoScreenMessages.java @@ -10,6 +10,6 @@ public class ENDemoScreenMessages extends OkaeriConfig implements DemoScreenMessages { - public Notice shownToSelf = Notice.chat("► You have shown the demo screen to yourself!"); - public Notice shownToOtherPlayer = Notice.chat("► You have shown the demo screen to player {PLAYER}!"); + Notice shownToSelf = Notice.chat("► You have shown the demo screen to yourself!"); + Notice shownToOtherPlayer = Notice.chat("► You have shown the demo screen to player {PLAYER}!"); } diff --git a/eternalcore-core/src/main/java/com/eternalcode/core/feature/fun/elderguardian/messages/ENElderGuardianMessages.java b/eternalcore-core/src/main/java/com/eternalcode/core/feature/fun/elderguardian/messages/ENElderGuardianMessages.java index 23d57f712..76a427944 100644 --- a/eternalcore-core/src/main/java/com/eternalcode/core/feature/fun/elderguardian/messages/ENElderGuardianMessages.java +++ b/eternalcore-core/src/main/java/com/eternalcode/core/feature/fun/elderguardian/messages/ENElderGuardianMessages.java @@ -9,8 +9,8 @@ @Accessors(fluent = true) public class ENElderGuardianMessages extends OkaeriConfig implements ElderGuardianMessages { - public Notice elderGuardianShown = + Notice elderGuardianShown = Notice.chat("► Shown elder guardian to player {PLAYER}!"); - public Notice elderGuardianShownSilently = + Notice elderGuardianShownSilently = Notice.chat("► Shown elder guardian to player {PLAYER} silently!"); } diff --git a/eternalcore-core/src/main/java/com/eternalcode/core/feature/fun/endscreen/messages/ENEndScreenMessages.java b/eternalcore-core/src/main/java/com/eternalcode/core/feature/fun/endscreen/messages/ENEndScreenMessages.java index bb5a3796f..200be668a 100644 --- a/eternalcore-core/src/main/java/com/eternalcode/core/feature/fun/endscreen/messages/ENEndScreenMessages.java +++ b/eternalcore-core/src/main/java/com/eternalcode/core/feature/fun/endscreen/messages/ENEndScreenMessages.java @@ -11,8 +11,8 @@ public class ENEndScreenMessages extends OkaeriConfig implements EndScreenMessages { - public Notice shownToSelf = Notice.chat("► You have shown the end screen to yourself!"); + Notice shownToSelf = Notice.chat("► You have shown the end screen to yourself!"); @Comment("# {PLAYER} - returns player's name") - public Notice shownToOtherPlayer = Notice.chat("► You have shown the end screen to player {PLAYER}!"); + Notice shownToOtherPlayer = Notice.chat("► You have shown the end screen to player {PLAYER}!"); } diff --git a/eternalcore-core/src/main/java/com/eternalcode/core/feature/helpop/messages/ENHelpOpMessages.java b/eternalcore-core/src/main/java/com/eternalcode/core/feature/helpop/messages/ENHelpOpMessages.java index 0f0f509c5..d56be8384 100644 --- a/eternalcore-core/src/main/java/com/eternalcode/core/feature/helpop/messages/ENHelpOpMessages.java +++ b/eternalcore-core/src/main/java/com/eternalcode/core/feature/helpop/messages/ENHelpOpMessages.java @@ -10,10 +10,10 @@ @Accessors(fluent = true) public class ENHelpOpMessages extends OkaeriConfig implements HelpOpSection { @Comment("# {PLAYER} - Player who send message on /helpop, {TEXT} - message") - public Notice format = + Notice format = Notice.chat("[HelpOp] {PLAYER}: {TEXT}"); @Comment(" ") - public Notice send = Notice.chat("► This message has been successfully sent to administration"); + Notice send = Notice.chat("► This message has been successfully sent to administration"); @Comment("# {TIME} - Time to next use (cooldown)") - public Notice helpOpDelay = Notice.chat("✘ You can use this command for: {TIME}"); + Notice helpOpDelay = Notice.chat("✘ You can use this command for: {TIME}"); } diff --git a/eternalcore-core/src/main/java/com/eternalcode/core/feature/helpop/messages/PLHelpOpMessages.java b/eternalcore-core/src/main/java/com/eternalcode/core/feature/helpop/messages/PLHelpOpMessages.java index 0ae7bd905..07330702b 100644 --- a/eternalcore-core/src/main/java/com/eternalcode/core/feature/helpop/messages/PLHelpOpMessages.java +++ b/eternalcore-core/src/main/java/com/eternalcode/core/feature/helpop/messages/PLHelpOpMessages.java @@ -10,10 +10,10 @@ @Accessors(fluent = true) public class PLHelpOpMessages extends OkaeriConfig implements HelpOpSection { @Comment({"# {PLAYER} - Gracz który wysłał wiadomość na helpop, {TEXT} - Treść wysłanej wiadomości"}) - public Notice format = + Notice format = Notice.chat("[HelpOp] {PLAYER}: {TEXT}"); @Comment(" ") - public Notice send = Notice.chat("► Wiadomość została wysłana do administracji"); + Notice send = Notice.chat("► Wiadomość została wysłana do administracji"); @Comment("# {TIME} - Czas do końca blokady (cooldown)") - public Notice helpOpDelay = Notice.chat("► Możesz użyć tej komendy dopiero za {TIME}!"); + Notice helpOpDelay = Notice.chat("► Możesz użyć tej komendy dopiero za {TIME}!"); } diff --git a/eternalcore-core/src/main/java/com/eternalcode/core/feature/home/messages/ENHomeMessages.java b/eternalcore-core/src/main/java/com/eternalcode/core/feature/home/messages/ENHomeMessages.java index 55a515d40..a7296d1c8 100644 --- a/eternalcore-core/src/main/java/com/eternalcode/core/feature/home/messages/ENHomeMessages.java +++ b/eternalcore-core/src/main/java/com/eternalcode/core/feature/home/messages/ENHomeMessages.java @@ -10,16 +10,16 @@ @Accessors(fluent = true) public class ENHomeMessages extends OkaeriConfig implements HomeMessages { @Comment("# {HOMES} - List of homes (separated by commas)") - public Notice homeList = Notice.chat("► Available homes: {HOMES}"); + Notice homeList = Notice.chat("► Available homes: {HOMES}"); @Comment({" ", "# {HOME} - Home name"}) - public Notice create = Notice.chat("► Home {HOME} has been created."); - public Notice delete = Notice.chat("► Home {HOME} has been deleted."); - public Notice overrideHomeLocation = Notice.chat("► Home {HOME} has been overridden."); + Notice create = Notice.chat("► Home {HOME} has been created."); + Notice delete = Notice.chat("► Home {HOME} has been deleted."); + Notice overrideHomeLocation = Notice.chat("► Home {HOME} has been overridden."); @Comment({" ", "# {LIMIT} - Homes limit"}) - public Notice limit = + Notice limit = Notice.chat("► You have reached the limit of homes! Your limit is {LIMIT}."); - public Notice noHomesOwned = Notice.chat("✘ You don't have any homes."); + Notice noHomesOwned = Notice.chat("✘ You don't have any homes."); @Comment({" ", "# Placeholders messages"}) public String noHomesOwnedPlaceholder = "You don't have any homes."; @@ -29,14 +29,14 @@ public class ENHomeMessages extends OkaeriConfig implements HomeMessages { "# Home Admin Section, you can edit player homes as admin", "# {HOME} - Home name, {PLAYER} - Player name, {HOMES} - List of homes (separated by commas)" }) - public Notice overrideHomeLocationAsAdmin = + Notice overrideHomeLocationAsAdmin = Notice.chat("► Home {HOME} has been overridden for {PLAYER}."); - public Notice playerNoOwnedHomes = + Notice playerNoOwnedHomes = Notice.chat("✘ Player {PLAYER} doesn't have any homes."); - public Notice createAsAdmin = + Notice createAsAdmin = Notice.chat("► Home {HOME} has been created for {PLAYER}."); - public Notice deleteAsAdmin = + Notice deleteAsAdmin = Notice.chat("► Home {HOME} has been deleted for {PLAYER}."); - public Notice homeListAsAdmin = + Notice homeListAsAdmin = Notice.chat("► Available homes for {PLAYER}: {HOMES}"); } diff --git a/eternalcore-core/src/main/java/com/eternalcode/core/feature/itemedit/messages/ENItemEditMessages.java b/eternalcore-core/src/main/java/com/eternalcode/core/feature/itemedit/messages/ENItemEditMessages.java index 246765d26..686728fdd 100644 --- a/eternalcore-core/src/main/java/com/eternalcode/core/feature/itemedit/messages/ENItemEditMessages.java +++ b/eternalcore-core/src/main/java/com/eternalcode/core/feature/itemedit/messages/ENItemEditMessages.java @@ -11,30 +11,30 @@ public class ENItemEditMessages extends OkaeriConfig implements ItemEditMessages { @Comment("# {ITEM_NAME} - New item name") - public Notice itemChangeNameMessage = Notice.chat("► Name changed to: {ITEM_NAME}"); + Notice itemChangeNameMessage = Notice.chat("► Name changed to: {ITEM_NAME}"); @Comment(" ") - public Notice itemClearNameMessage = Notice.chat("► Item name cleared!"); + Notice itemClearNameMessage = Notice.chat("► Item name cleared!"); @Comment({" ", "# {ITEM_LORE} - New item lore"}) - public Notice itemChangeLoreMessage = Notice.chat("► Lore changed to: {ITEM_LORE}"); + Notice itemChangeLoreMessage = Notice.chat("► Lore changed to: {ITEM_LORE}"); @Comment(" ") - public Notice itemClearLoreMessage = Notice.chat("► Item lore cleared!"); + Notice itemClearLoreMessage = Notice.chat("► Item lore cleared!"); @Comment({" ", "# {LINE} - Line number removed"}) - public Notice itemLoreLineRemoved = Notice.chat("► Removed lore line: {LINE}"); + Notice itemLoreLineRemoved = Notice.chat("► Removed lore line: {LINE}"); @Comment({" ", "# {ITEM_FLAG} - Flag name"}) - public Notice itemFlagRemovedMessage = Notice.chat("► Removed item flag: {ITEM_FLAG}"); - public Notice itemFlagAddedMessage = Notice.chat("► Added item flag: {ITEM_FLAG}"); + Notice itemFlagRemovedMessage = Notice.chat("► Removed item flag: {ITEM_FLAG}"); + Notice itemFlagAddedMessage = Notice.chat("► Added item flag: {ITEM_FLAG}"); @Comment(" ") - public Notice itemFlagClearedMessage = Notice.chat("► All item flags cleared!"); + Notice itemFlagClearedMessage = Notice.chat("► All item flags cleared!"); @Comment(" ") - public Notice noLore = Notice.chat("✖ This item has no lore!"); + Notice noLore = Notice.chat("✖ This item has no lore!"); @Comment(" ") - public Notice invalidLoreLine = Notice.chat("✖ Invalid lore line number!"); + Notice invalidLoreLine = Notice.chat("✖ Invalid lore line number!"); } diff --git a/eternalcore-core/src/main/java/com/eternalcode/core/feature/itemedit/messages/PLItemEditMessages.java b/eternalcore-core/src/main/java/com/eternalcode/core/feature/itemedit/messages/PLItemEditMessages.java index ed4dadea8..0df863f54 100644 --- a/eternalcore-core/src/main/java/com/eternalcode/core/feature/itemedit/messages/PLItemEditMessages.java +++ b/eternalcore-core/src/main/java/com/eternalcode/core/feature/itemedit/messages/PLItemEditMessages.java @@ -11,30 +11,30 @@ public class PLItemEditMessages extends OkaeriConfig implements ItemEditMessages { @Comment("# {ITEM_NAME} - Nowa nazwa przedmiotu") - public Notice itemChangeNameMessage = Notice.chat("► Nowa nazwa przedmiotu: {ITEM_NAME}"); + Notice itemChangeNameMessage = Notice.chat("► Nowa nazwa przedmiotu: {ITEM_NAME}"); @Comment(" ") - public Notice itemClearNameMessage = Notice.chat("► Wyczyszczono nazwę przedmiotu!"); + Notice itemClearNameMessage = Notice.chat("► Wyczyszczono nazwę przedmiotu!"); @Comment({" ", "# {ITEM_LORE} - Nowa linia opisu"}) - public Notice itemChangeLoreMessage = Notice.chat("► Zmieniono linię opisu na: {ITEM_LORE}"); + Notice itemChangeLoreMessage = Notice.chat("► Zmieniono linię opisu na: {ITEM_LORE}"); @Comment(" ") - public Notice itemClearLoreMessage = Notice.chat("► Wyczyszczono wszystkie linie opisu!"); + Notice itemClearLoreMessage = Notice.chat("► Wyczyszczono wszystkie linie opisu!"); @Comment({" ", "# {LINE} - Numer linii usuniętej"}) - public Notice itemLoreLineRemoved = Notice.chat("► Usunięto linię opisu (numer): {LINE}"); + Notice itemLoreLineRemoved = Notice.chat("► Usunięto linię opisu (numer): {LINE}"); @Comment({" ", "# {ITEM_FLAG} - Nazwa flagi"}) - public Notice itemFlagRemovedMessage = Notice.chat("► Usunięto flagę przedmiotu: {ITEM_FLAG}"); - public Notice itemFlagAddedMessage = Notice.chat("► Dodano flagę przedmiotu: {ITEM_FLAG}"); + Notice itemFlagRemovedMessage = Notice.chat("► Usunięto flagę przedmiotu: {ITEM_FLAG}"); + Notice itemFlagAddedMessage = Notice.chat("► Dodano flagę przedmiotu: {ITEM_FLAG}"); @Comment(" ") - public Notice itemFlagClearedMessage = Notice.chat("► Wyczyszczono wszystkie flagi przedmiotu!"); + Notice itemFlagClearedMessage = Notice.chat("► Wyczyszczono wszystkie flagi przedmiotu!"); @Comment(" ") - public Notice noLore = Notice.chat("✖ Ten przedmiot nie ma opisu!"); + Notice noLore = Notice.chat("✖ Ten przedmiot nie ma opisu!"); @Comment(" ") - public Notice invalidLoreLine = Notice.chat("✖ Nieprawidłowy numer linii opisu!"); + Notice invalidLoreLine = Notice.chat("✖ Nieprawidłowy numer linii opisu!"); } diff --git a/eternalcore-core/src/main/java/com/eternalcode/core/feature/jail/messages/ENJailMessages.java b/eternalcore-core/src/main/java/com/eternalcode/core/feature/jail/messages/ENJailMessages.java index 946ec7309..81456b30c 100644 --- a/eternalcore-core/src/main/java/com/eternalcode/core/feature/jail/messages/ENJailMessages.java +++ b/eternalcore-core/src/main/java/com/eternalcode/core/feature/jail/messages/ENJailMessages.java @@ -10,41 +10,41 @@ @Accessors(fluent = true) public class ENJailMessages extends OkaeriConfig implements JailMessages { @Comment({" ", "# Section responsible for location of jail setup"}) - public Notice jailLocationSet = Notice.chat("► Jail location has been set!"); - public Notice jailLocationRemove = Notice.chat("✘ Jail location has been removed!"); - public Notice jailLocationNotSet = Notice.chat("✘ Jail location is not set!"); - public Notice jailLocationOverride = Notice.chat("► Jail location has been overridden!"); + Notice jailLocationSet = Notice.chat("► Jail location has been set!"); + Notice jailLocationRemove = Notice.chat("✘ Jail location has been removed!"); + Notice jailLocationNotSet = Notice.chat("✘ Jail location is not set!"); + Notice jailLocationOverride = Notice.chat("► Jail location has been overridden!"); @Comment({" ", "# Section responsible for detaining players"}) - public Notice jailDetainPrivate = Notice.chat("► You have been jailed!"); - public Notice jailCannotUseCommand = Notice.chat("✘ You can't use this command! You are in jail!"); + Notice jailDetainPrivate = Notice.chat("► You have been jailed!"); + Notice jailCannotUseCommand = Notice.chat("✘ You can't use this command! You are in jail!"); @Comment({" ", "# {PLAYER} - Player who has been detained"}) - public Notice jailDetainOverride = + Notice jailDetainOverride = Notice.chat("► You have overridden the jail for {PLAYER} !"); @Comment({" ", "# {PLAYER} - Player who has been detained"}) - public Notice jailDetainBroadcast = Notice.chat("► Player {PLAYER} has been jailed!"); + Notice jailDetainBroadcast = Notice.chat("► Player {PLAYER} has been jailed!"); @Comment({" ", "# {REMAINING_TIME} - Time left to release"}) - public Notice jailDetainCountdown = + Notice jailDetainCountdown = Notice.actionbar(" You are in jail! Time left: {REMAINING_TIME}!"); @Comment({" ", "# {PLAYER} - Admin who you can't detain"}) - public Notice jailDetainAdmin = + Notice jailDetainAdmin = Notice.chat("✘ You can't jail {PLAYER} because he is an admin!"); @Comment({" ", "# Section responsible for releasing players from jail"}) @Comment({" ", "# {PLAYER} - Player who has been released from jail"}) - public Notice jailReleaseBroadcast = + Notice jailReleaseBroadcast = Notice.chat("► Player {PLAYER} has been granted freedom!"); - public Notice jailReleasePrivate = Notice.actionbar(" You have been released from jail!"); - public Notice jailReleaseAll = Notice.chat("► All players have been released from jail!"); - public Notice jailReleaseNoPlayers = Notice.chat("✘ No players found in jail!"); + Notice jailReleasePrivate = Notice.actionbar(" You have been released from jail!"); + Notice jailReleaseAll = Notice.chat("► All players have been released from jail!"); + Notice jailReleaseNoPlayers = Notice.chat("✘ No players found in jail!"); @Comment({" ", "# {PLAYER} - Player nickname"}) - public Notice jailIsNotPrisoner = Notice.chat("✘ Player {PLAYER} is not a prisoner!"); + Notice jailIsNotPrisoner = Notice.chat("✘ Player {PLAYER} is not a prisoner!"); @Comment({" ", "# Section responsible for listing players in jail"}) - public Notice jailListHeader = Notice.chat("► Players in jail: "); - public Notice jailListEmpty = Notice.chat("✘ No players found in jail!"); + Notice jailListHeader = Notice.chat("► Players in jail: "); + Notice jailListEmpty = Notice.chat("✘ No players found in jail!"); @Comment({" ", "# {PLAYER} - Player who has been detained", "# {REMAINING_TIME} - Time of detention", "# {DETAINED_BY} - Player who detained the player"}) - public Notice jailListPlayerEntry = Notice.chat( + Notice jailListPlayerEntry = Notice.chat( "► {PLAYER} ({REMAINING_TIME}) detained by {DETAINED_BY} !"); } diff --git a/eternalcore-core/src/main/java/com/eternalcode/core/feature/motd/messages/ENMotdMessages.java b/eternalcore-core/src/main/java/com/eternalcode/core/feature/motd/messages/ENMotdMessages.java index 07418bcc2..9098b282e 100644 --- a/eternalcore-core/src/main/java/com/eternalcode/core/feature/motd/messages/ENMotdMessages.java +++ b/eternalcore-core/src/main/java/com/eternalcode/core/feature/motd/messages/ENMotdMessages.java @@ -17,7 +17,7 @@ public class ENMotdMessages extends OkaeriConfig implements MotdMessages { @Comment("# Out of the box supported placeholders: {PLAYER}, {WORLD}") @Comment("# You can add your own placeholders using the PlaceholderAPI.") @Comment("# You can check our Notification Generator: https://www.eternalcode.pl/notification-generator") - public Notice motdContent = BukkitNotice.builder() + Notice motdContent = BukkitNotice.builder() .chat(List.of( " ", " 🠚 Welcome Back, {PLAYER}!", diff --git a/eternalcore-core/src/main/java/com/eternalcode/core/feature/msg/messages/ENMsgMessages.java b/eternalcore-core/src/main/java/com/eternalcode/core/feature/msg/messages/ENMsgMessages.java index 86c5748b8..5d726c5ba 100644 --- a/eternalcore-core/src/main/java/com/eternalcode/core/feature/msg/messages/ENMsgMessages.java +++ b/eternalcore-core/src/main/java/com/eternalcode/core/feature/msg/messages/ENMsgMessages.java @@ -9,51 +9,51 @@ @Getter @Accessors(fluent = true) public class ENMsgMessages extends OkaeriConfig implements MsgMessages { - public Notice noReply = Notice.chat("► You have no one to reply!"); + Notice noReply = Notice.chat("► You have no one to reply!"); @Comment("# {TARGET} - Player that you want to send messages, {MESSAGE} - Message") - public Notice msgYouToTarget = + Notice msgYouToTarget = Notice.chat("[You -> {TARGET}]: {MESSAGE}"); @Comment({" ", "# {SENDER} - Message sender, {MESSAGE} - Message"}) - public Notice msgTargetToYou = + Notice msgTargetToYou = Notice.chat("[{SENDER} -> You]: {MESSAGE}"); @Comment("# {SENDER} - Sender, {TARGET} - Target, {MESSAGE} - Message") - public Notice socialSpyMessage = Notice.chat( + Notice socialSpyMessage = Notice.chat( "[ss] [{SENDER} -> {TARGET}]: {MESSAGE}"); - public Notice receiverDisabledMessages = Notice.chat("► This player has disabled private messages!"); + Notice receiverDisabledMessages = Notice.chat("► This player has disabled private messages!"); - public Notice selfMessagesDisabled = Notice.chat("► Private messages have been disabled!"); - public Notice selfMessagesEnabled = Notice.chat("► Private messages have been enabled!"); + Notice selfMessagesDisabled = Notice.chat("► Private messages have been disabled!"); + Notice selfMessagesEnabled = Notice.chat("► Private messages have been enabled!"); @Comment("# {PLAYER} - Player") - public Notice otherMessagesDisabled = Notice.chat("► Private messages have been disabled for {PLAYER}!"); - public Notice otherMessagesEnabled = Notice.chat("► Private messages have been enabled for {PLAYER}!"); + Notice otherMessagesDisabled = Notice.chat("► Private messages have been disabled for {PLAYER}!"); + Notice otherMessagesEnabled = Notice.chat("► Private messages have been enabled for {PLAYER}!"); @Comment(" ") - public Notice socialSpyEnable = Notice.chat("► SocialSpy has been {STATE}!"); - public Notice socialSpyDisable = Notice.chat("► SocialSpy has been {STATE}!"); + Notice socialSpyEnable = Notice.chat("► SocialSpy has been {STATE}!"); + Notice socialSpyDisable = Notice.chat("► SocialSpy has been {STATE}!"); @Comment({" ", "# {PLAYER} - Ignored player"}) - public Notice ignorePlayer = Notice.chat("► {PLAYER} player has been ignored!"); + Notice ignorePlayer = Notice.chat("► {PLAYER} player has been ignored!"); @Comment(" ") - public Notice ignoreAll = Notice.chat("► All players have been ignored!"); - public Notice cantIgnoreYourself = Notice.chat("► You can't ignore yourself!"); + Notice ignoreAll = Notice.chat("► All players have been ignored!"); + Notice cantIgnoreYourself = Notice.chat("► You can't ignore yourself!"); @Comment({" ", "# {PLAYER} - Ignored player."}) - public Notice alreadyIgnorePlayer = Notice.chat("► You already ignore this player!"); + Notice alreadyIgnorePlayer = Notice.chat("► You already ignore this player!"); @Comment("# {PLAYER} - Unignored player") - public Notice unIgnorePlayer = Notice.chat("► {PLAYER} player has been unignored!"); + Notice unIgnorePlayer = Notice.chat("► {PLAYER} player has been unignored!"); @Comment(" ") - public Notice unIgnoreAll = Notice.chat("► All players have been unignored!"); - public Notice cantUnIgnoreYourself = Notice.chat("► You can't unignore yourself!"); + Notice unIgnoreAll = Notice.chat("► All players have been unignored!"); + Notice cantUnIgnoreYourself = Notice.chat("► You can't unignore yourself!"); @Comment({" ", "# {PLAYER} - Ignored player"}) - public Notice notIgnorePlayer = + Notice notIgnorePlayer = Notice.chat("► You don't ignore this player, so you can unignore him!"); } diff --git a/eternalcore-core/src/main/java/com/eternalcode/core/feature/near/messages/ENNearMessages.java b/eternalcore-core/src/main/java/com/eternalcode/core/feature/near/messages/ENNearMessages.java index 067cc265f..89073b27a 100644 --- a/eternalcore-core/src/main/java/com/eternalcode/core/feature/near/messages/ENNearMessages.java +++ b/eternalcore-core/src/main/java/com/eternalcode/core/feature/near/messages/ENNearMessages.java @@ -11,13 +11,13 @@ public class ENNearMessages extends OkaeriConfig implements NearMessages { @Comment("# Available placeholders: {RADIUS} - the radius within which entities were searched") - public Notice entitiesNotFound = Notice.chat("► No entities found within a radius of {RADIUS} blocks. Please try again with a different radius."); + Notice entitiesNotFound = Notice.chat("► No entities found within a radius of {RADIUS} blocks. Please try again with a different radius."); @Comment("# Available placeholders: {ENTITY_AMOUNT} - the amount of entities found and shown, {RADIUS} - the radius within which entities were searched") - public Notice entitiesFound = Notice.chat("► {ENTITY_AMOUNT} entities found and shown within a radius of {RADIUS} blocks:"); + Notice entitiesFound = Notice.chat("► {ENTITY_AMOUNT} entities found and shown within a radius of {RADIUS} blocks:"); @Comment("# Entry format for each entity type in the list. Placeholders: {ENTITY_TYPE} - type of entity, {COUNT} - amount of entities of this type") - public Notice entityEntry = Notice.chat("- {ENTITY_TYPE}: {COUNT}"); - public Notice invalidEntityType = Notice.chat("✘ No valid entity scope provided! Use a suggested option."); + Notice entityEntry = Notice.chat("- {ENTITY_TYPE}: {COUNT}"); + Notice invalidEntityType = Notice.chat("✘ No valid entity scope provided! Use a suggested option."); } diff --git a/eternalcore-core/src/main/java/com/eternalcode/core/feature/near/messages/PLNearMessages.java b/eternalcore-core/src/main/java/com/eternalcode/core/feature/near/messages/PLNearMessages.java index 05da5b2e2..b564142ca 100644 --- a/eternalcore-core/src/main/java/com/eternalcode/core/feature/near/messages/PLNearMessages.java +++ b/eternalcore-core/src/main/java/com/eternalcode/core/feature/near/messages/PLNearMessages.java @@ -11,17 +11,17 @@ public class PLNearMessages extends OkaeriConfig implements NearMessages { @Comment("# Dostępne placeholdery: {RADIUS} - zasięg wyszukiwania stworzeń") - public Notice entitiesNotFound = Notice.chat("► Nie znaleziono żadnych stworzeń w zasięgu {RADIUS} bloków. Spróbuj ponownie z większym zasięgiem"); + Notice entitiesNotFound = Notice.chat("► Nie znaleziono żadnych stworzeń w zasięgu {RADIUS} bloków. Spróbuj ponownie z większym zasięgiem"); @Comment({ "# Dostępne placeholdery: ", "{ENTITY_AMOUNT} - ilość znalezionych i wyświetlonych stworzeń,", "{RADIUS} - zasięg wyszukiwania stworzeń" }) - public Notice entitiesFound = Notice.chat("► Liczba {ENTITY_AMOUNT} stworzeń w zasięgu: {RADIUS} bloków:"); + Notice entitiesFound = Notice.chat("► Liczba {ENTITY_AMOUNT} stworzeń w zasięgu: {RADIUS} bloków:"); @Comment("# Wejście na lisćie wyszukanych stworzeń. Dostępne placeholdery: {ENTITY_TYPE} - typ stworzenia, {COUNT} - ilość stworzeń danego typu") - public Notice entityEntry = Notice.chat("- {ENTITY_TYPE}: {COUNT}"); - public Notice invalidEntityType = Notice.chat("✘ Nie podano prawidłowego zakresu entity! Użyj sugerowanej opcji."); + Notice entityEntry = Notice.chat("- {ENTITY_TYPE}: {COUNT}"); + Notice invalidEntityType = Notice.chat("✘ Nie podano prawidłowego zakresu entity! Użyj sugerowanej opcji."); } diff --git a/eternalcore-core/src/main/java/com/eternalcode/core/feature/playtime/messages/ENPlaytimeMessages.java b/eternalcore-core/src/main/java/com/eternalcode/core/feature/playtime/messages/ENPlaytimeMessages.java index 311525857..75c1ce5a3 100644 --- a/eternalcore-core/src/main/java/com/eternalcode/core/feature/playtime/messages/ENPlaytimeMessages.java +++ b/eternalcore-core/src/main/java/com/eternalcode/core/feature/playtime/messages/ENPlaytimeMessages.java @@ -9,7 +9,7 @@ @Accessors(fluent = true) public class ENPlaytimeMessages extends OkaeriConfig implements PlaytimeMessages { - public Notice self = Notice.chat("► Your playing time is {PLAYTIME}!"); + Notice self = Notice.chat("► Your playing time is {PLAYTIME}!"); - public Notice other = Notice.chat("► The playing time of {PLAYER} is {PLAYTIME}!"); + Notice other = Notice.chat("► The playing time of {PLAYER} is {PLAYTIME}!"); } diff --git a/eternalcore-core/src/main/java/com/eternalcode/core/feature/powertool/messages/ENPowertoolMessages.java b/eternalcore-core/src/main/java/com/eternalcode/core/feature/powertool/messages/ENPowertoolMessages.java index f7129f272..153d82ac5 100644 --- a/eternalcore-core/src/main/java/com/eternalcode/core/feature/powertool/messages/ENPowertoolMessages.java +++ b/eternalcore-core/src/main/java/com/eternalcode/core/feature/powertool/messages/ENPowertoolMessages.java @@ -14,17 +14,17 @@ public class ENPowertoolMessages extends OkaeriConfig implements PowertoolMessag "# {COMMAND} - Command that is assigned to the tool", "# {ITEM} - Item that is a power tool"} ) - public Notice assigned = + Notice assigned = Notice.chat("► Assigned command /{COMMAND} to tool {ITEM}."); - public Notice removed = Notice.chat("► Removed command from tool {ITEM}."); - public Notice notAssigned = Notice.chat("✘ This item is not a power tool. Use /powertool " + Notice removed = Notice.chat("► Removed command from tool {ITEM}."); + Notice notAssigned = Notice.chat("✘ This item is not a power tool. Use /powertool " + "to assign a command to it."); - public Notice noItemInMainHand = Notice.chat("✘ You must hold an item in your main hand to assign " + Notice noItemInMainHand = Notice.chat("✘ You must hold an item in your main hand to assign " + "a command/remove a command."); - public Notice emptyCommand = Notice.chat("✘ The command cannot be empty! Please provide a valid " + Notice emptyCommand = Notice.chat("✘ The command cannot be empty! Please provide a valid " + "command to assign to the power tool."); - public Notice invalidCommand = + Notice invalidCommand = Notice.chat("✘ The provided command is invalid! Make sure the command exists."); - public Notice executionFailed = Notice.chat( + Notice executionFailed = Notice.chat( "✘ An error occurred while executing the command {COMMAND} assigned to the power tool."); } diff --git a/eternalcore-core/src/main/java/com/eternalcode/core/feature/randomteleport/messages/ENRandomTeleportMessages.java b/eternalcore-core/src/main/java/com/eternalcode/core/feature/randomteleport/messages/ENRandomTeleportMessages.java index e4c639e96..43504a95d 100644 --- a/eternalcore-core/src/main/java/com/eternalcode/core/feature/randomteleport/messages/ENRandomTeleportMessages.java +++ b/eternalcore-core/src/main/java/com/eternalcode/core/feature/randomteleport/messages/ENRandomTeleportMessages.java @@ -8,24 +8,24 @@ @Getter @Accessors(fluent = true) public class ENRandomTeleportMessages extends OkaeriConfig implements RandomTeleportMessages { - public Notice randomTeleportStarted = Notice.builder() + Notice randomTeleportStarted = Notice.builder() .chat("► Teleportation to a random location has started!") .title("Random teleport") .subtitle("Searching, please wait...") .build(); - public Notice randomTeleportFailed = + Notice randomTeleportFailed = Notice.chat("✘ A safe location could not be found, please try again!"); @Comment({ "# {PLAYER} - Player who has been teleported, {WORLD} - World name, {X} - X coordinate, {Y} - Y coordinate, {Z} - Z coordinate"}) - public Notice teleportedToRandomLocation = + Notice teleportedToRandomLocation = Notice.chat("► You have been teleported to a random location!"); @Comment(" ") - public Notice teleportedSpecifiedPlayerToRandomLocation = Notice.chat( + Notice teleportedSpecifiedPlayerToRandomLocation = Notice.chat( "► You have teleported {PLAYER} to a random location! His current location is: world: {WORLD}, x: {X}, y: {Y}, z: {Z}."); @Comment({" ", "# {TIME} - Time to next use (cooldown)"}) - public Notice randomTeleportDelay = Notice.chat("✘ You can use random teleport after {TIME}!"); + Notice randomTeleportDelay = Notice.chat("✘ You can use random teleport after {TIME}!"); } diff --git a/eternalcore-core/src/main/java/com/eternalcode/core/feature/repair/messages/ENRepairMessages.java b/eternalcore-core/src/main/java/com/eternalcode/core/feature/repair/messages/ENRepairMessages.java index 5fa696e3e..1f86bddab 100644 --- a/eternalcore-core/src/main/java/com/eternalcode/core/feature/repair/messages/ENRepairMessages.java +++ b/eternalcore-core/src/main/java/com/eternalcode/core/feature/repair/messages/ENRepairMessages.java @@ -10,10 +10,10 @@ @Accessors(fluent = true) public class ENRepairMessages extends OkaeriConfig implements RepairMessages { - public Notice itemRepaired = Notice.chat("► Item in your hand has been repaired!"); - public Notice allItemsRepaired = Notice.chat("► All items in your inventory has been repaired!"); - public Notice armorRepaired = Notice.chat("► Your armor has been repaired!"); + Notice itemRepaired = Notice.chat("► Item in your hand has been repaired!"); + Notice allItemsRepaired = Notice.chat("► All items in your inventory has been repaired!"); + Notice armorRepaired = Notice.chat("► Your armor has been repaired!"); - public Notice delay = Notice.chat("✘ You can use this command in {TIME}!"); + Notice delay = Notice.chat("✘ You can use this command in {TIME}!"); } diff --git a/eternalcore-core/src/main/java/com/eternalcode/core/feature/seen/messages/ENSeenMessages.java b/eternalcore-core/src/main/java/com/eternalcode/core/feature/seen/messages/ENSeenMessages.java index a6b013edf..9c22fdd41 100644 --- a/eternalcore-core/src/main/java/com/eternalcode/core/feature/seen/messages/ENSeenMessages.java +++ b/eternalcore-core/src/main/java/com/eternalcode/core/feature/seen/messages/ENSeenMessages.java @@ -11,12 +11,12 @@ public class ENSeenMessages extends OkaeriConfig implements SeenMessages { @Comment("# {PLAYER} - The player who is never played before on the server") - public Notice neverPlayedBefore = Notice.chat("{PLAYER} has not played before on this server."); + Notice neverPlayedBefore = Notice.chat("{PLAYER} has not played before on this server."); @Comment("# {PLAYER} - The player who was last seen on the server, {SEEN} - Time since last login") - public Notice lastSeen = Notice.chat("{PLAYER} was last seen {SEEN} ago."); + Notice lastSeen = Notice.chat("{PLAYER} was last seen {SEEN} ago."); @Comment("# {PLAYER} - The player who is now online") - public Notice nowOnline = Notice.chat("{PLAYER} is now online!"); + Notice nowOnline = Notice.chat("{PLAYER} is now online!"); } diff --git a/eternalcore-core/src/main/java/com/eternalcode/core/feature/joinmessage/PlayerJoinMessageController.java b/eternalcore-core/src/main/java/com/eternalcode/core/feature/session/PlayerJoinMessageController.java similarity index 71% rename from eternalcore-core/src/main/java/com/eternalcode/core/feature/joinmessage/PlayerJoinMessageController.java rename to eternalcore-core/src/main/java/com/eternalcode/core/feature/session/PlayerJoinMessageController.java index 5632b7522..14198c43e 100644 --- a/eternalcore-core/src/main/java/com/eternalcode/core/feature/joinmessage/PlayerJoinMessageController.java +++ b/eternalcore-core/src/main/java/com/eternalcode/core/feature/session/PlayerJoinMessageController.java @@ -1,11 +1,13 @@ -package com.eternalcode.core.feature.joinmessage; +package com.eternalcode.core.feature.session; import com.eternalcode.commons.RandomElementUtil; +import com.eternalcode.core.configuration.implementation.PluginConfiguration; import com.eternalcode.core.feature.vanish.VanishService; import com.eternalcode.core.injector.annotations.Inject; import com.eternalcode.core.injector.annotations.component.Controller; import com.eternalcode.core.notice.NoticeService; +import org.bukkit.Server; import org.bukkit.entity.Player; import org.bukkit.event.EventHandler; import org.bukkit.event.Listener; @@ -17,11 +19,15 @@ class PlayerJoinMessageController implements Listener { private final NoticeService noticeService; private final VanishService vanishService; + private final PluginConfiguration config; + private final Server server; @Inject - PlayerJoinMessageController(NoticeService noticeService, VanishService vanishService) { + PlayerJoinMessageController(NoticeService noticeService, VanishService vanishService, PluginConfiguration config, Server server) { this.noticeService = noticeService; this.vanishService = vanishService; + this.config = config; + this.server = server; } @EventHandler @@ -42,6 +48,13 @@ void onPlayerJoin(PlayerJoinEvent event) { } event.setJoinMessage(StringUtils.EMPTY); + PluginConfiguration.Sounds sound = this.config.sound; + + if (sound.enabledAfterJoin) { + for (Player online : this.server.getOnlinePlayers()) { + online.playSound(online.getLocation(), sound.afterJoin, sound.afterJoinVolume, sound.afterJoinPitch); + } + } this.noticeService.create() .noticeOptional(translation -> RandomElementUtil.randomElement(translation.event().joinMessage())) diff --git a/eternalcore-core/src/main/java/com/eternalcode/core/feature/quitmessage/PlayerQuitMessageController.java b/eternalcore-core/src/main/java/com/eternalcode/core/feature/session/PlayerQuitMessageController.java similarity index 67% rename from eternalcore-core/src/main/java/com/eternalcode/core/feature/quitmessage/PlayerQuitMessageController.java rename to eternalcore-core/src/main/java/com/eternalcode/core/feature/session/PlayerQuitMessageController.java index d614ec8eb..31940143d 100644 --- a/eternalcore-core/src/main/java/com/eternalcode/core/feature/quitmessage/PlayerQuitMessageController.java +++ b/eternalcore-core/src/main/java/com/eternalcode/core/feature/session/PlayerQuitMessageController.java @@ -1,11 +1,13 @@ -package com.eternalcode.core.feature.quitmessage; +package com.eternalcode.core.feature.session; import com.eternalcode.commons.RandomElementUtil; +import com.eternalcode.core.configuration.implementation.PluginConfiguration; import com.eternalcode.core.feature.vanish.VanishService; import com.eternalcode.core.injector.annotations.Inject; import com.eternalcode.core.injector.annotations.component.Controller; import com.eternalcode.core.notice.NoticeService; +import org.bukkit.Server; import org.bukkit.entity.Player; import org.bukkit.event.EventHandler; import org.bukkit.event.Listener; @@ -17,11 +19,15 @@ class PlayerQuitMessageController implements Listener { private final NoticeService noticeService; private final VanishService vanishService; + private final PluginConfiguration config; + private final Server server; @Inject - PlayerQuitMessageController(NoticeService noticeService, VanishService vanishService) { + PlayerQuitMessageController(NoticeService noticeService, VanishService vanishService, PluginConfiguration config, Server server) { this.noticeService = noticeService; this.vanishService = vanishService; + this.config = config; + this.server = server; } @EventHandler @@ -34,6 +40,13 @@ void onPlayerQuit(PlayerQuitEvent event) { } event.setQuitMessage(StringUtils.EMPTY); + PluginConfiguration.Sounds sound = this.config.sound; + + if (sound.enableAfterQuit) { + for (Player online : this.server.getOnlinePlayers()) { + online.playSound(online.getLocation(), sound.afterQuit, sound.afterQuitVolume, sound.afterQuitPitch); + } + } this.noticeService.create() .noticeOptional(translation -> RandomElementUtil.randomElement(translation.event().quitMessage())) diff --git a/eternalcore-core/src/main/java/com/eternalcode/core/feature/setslot/messages/ENSetSlotMessages.java b/eternalcore-core/src/main/java/com/eternalcode/core/feature/setslot/messages/ENSetSlotMessages.java index 59c80a87e..57ff5d406 100644 --- a/eternalcore-core/src/main/java/com/eternalcode/core/feature/setslot/messages/ENSetSlotMessages.java +++ b/eternalcore-core/src/main/java/com/eternalcode/core/feature/setslot/messages/ENSetSlotMessages.java @@ -8,5 +8,5 @@ @Getter @Accessors(fluent = true) public class ENSetSlotMessages extends OkaeriConfig implements SetSlotMessages { - public Notice slotSaved = Notice.chat("► Server slots have been set to {SLOTS} and saved!"); + Notice slotSaved = Notice.chat("► Server slots have been set to {SLOTS} and saved!"); } diff --git a/eternalcore-core/src/main/java/com/eternalcode/core/feature/signeditor/messages/ENSignEditorMessages.java b/eternalcore-core/src/main/java/com/eternalcode/core/feature/signeditor/messages/ENSignEditorMessages.java index eb1eecd45..42d540835 100644 --- a/eternalcore-core/src/main/java/com/eternalcode/core/feature/signeditor/messages/ENSignEditorMessages.java +++ b/eternalcore-core/src/main/java/com/eternalcode/core/feature/signeditor/messages/ENSignEditorMessages.java @@ -8,7 +8,7 @@ @Getter @Accessors(fluent = true) public class ENSignEditorMessages extends OkaeriConfig implements SignEditorMessages { - public Notice noSignFound = Notice.chat("✘ Look at the sign to edit it!"); - public Notice invalidIndex = Notice.chat("✘ The value {LINE} is invalid! Please select a number between 1 and 4!"); - public Notice lineSet = Notice.chat("► Line {LINE} set to {TEXT}"); + Notice noSignFound = Notice.chat("✘ Look at the sign to edit it!"); + Notice invalidIndex = Notice.chat("✘ The value {LINE} is invalid! Please select a number between 1 and 4!"); + Notice lineSet = Notice.chat("► Line {LINE} set to {TEXT}"); } diff --git a/eternalcore-core/src/main/java/com/eternalcode/core/feature/signeditor/messages/PLSignEditorMessages.java b/eternalcore-core/src/main/java/com/eternalcode/core/feature/signeditor/messages/PLSignEditorMessages.java index 3810ddff6..de2511f63 100644 --- a/eternalcore-core/src/main/java/com/eternalcode/core/feature/signeditor/messages/PLSignEditorMessages.java +++ b/eternalcore-core/src/main/java/com/eternalcode/core/feature/signeditor/messages/PLSignEditorMessages.java @@ -8,7 +8,7 @@ @Getter @Accessors(fluent = true) public class PLSignEditorMessages extends OkaeriConfig implements SignEditorMessages { - public Notice noSignFound = Notice.chat("✘ Spójrz na tabliczkę, aby ją edytować!"); - public Notice invalidIndex = Notice.chat("✘ Wartość {LINE} jest nieprawidłowa! Wybierz numer od 1 do 4!"); - public Notice lineSet = Notice.chat("► Zmieniono linię {LINE} na {TEXT}"); + Notice noSignFound = Notice.chat("✘ Spójrz na tabliczkę, aby ją edytować!"); + Notice invalidIndex = Notice.chat("✘ Wartość {LINE} jest nieprawidłowa! Wybierz numer od 1 do 4!"); + Notice lineSet = Notice.chat("► Zmieniono linię {LINE} na {TEXT}"); } diff --git a/eternalcore-core/src/main/java/com/eternalcode/core/feature/sound/PlayerChatSoundListener.java b/eternalcore-core/src/main/java/com/eternalcode/core/feature/sound/PlayerChatSoundListener.java deleted file mode 100644 index 88af118bd..000000000 --- a/eternalcore-core/src/main/java/com/eternalcode/core/feature/sound/PlayerChatSoundListener.java +++ /dev/null @@ -1,39 +0,0 @@ -package com.eternalcode.core.feature.sound; - - -import com.eternalcode.core.configuration.implementation.PluginConfiguration; -import com.eternalcode.core.injector.annotations.Inject; -import com.eternalcode.core.injector.annotations.component.Controller; -import org.bukkit.Server; -import org.bukkit.entity.Player; -import org.bukkit.event.EventHandler; -import org.bukkit.event.EventPriority; -import org.bukkit.event.Listener; -import org.bukkit.event.player.AsyncPlayerChatEvent; - -@Controller -class PlayerChatSoundListener implements Listener { - - private final PluginConfiguration config; - private final Server server; - - @Inject - PlayerChatSoundListener(PluginConfiguration config, Server server) { - this.config = config; - this.server = server; - } - - @EventHandler(ignoreCancelled = true, priority = EventPriority.MONITOR) - void playSound(AsyncPlayerChatEvent event) { - PluginConfiguration.Sounds sound = this.config.sound; - - if (!sound.enableAfterChatMessage) { - return; - } - - for (Player online : this.server.getOnlinePlayers()) { - online.playSound(online.getLocation(), sound.afterChatMessage, sound.afterChatMessageVolume, sound.afterChatMessagePitch); - } - } - -} diff --git a/eternalcore-core/src/main/java/com/eternalcode/core/feature/sound/PlayerJoinSoundListener.java b/eternalcore-core/src/main/java/com/eternalcode/core/feature/sound/PlayerJoinSoundListener.java deleted file mode 100644 index be13d1769..000000000 --- a/eternalcore-core/src/main/java/com/eternalcode/core/feature/sound/PlayerJoinSoundListener.java +++ /dev/null @@ -1,34 +0,0 @@ -package com.eternalcode.core.feature.sound; - - -import com.eternalcode.core.configuration.implementation.PluginConfiguration; -import com.eternalcode.core.injector.annotations.Inject; -import com.eternalcode.core.injector.annotations.component.Controller; -import org.bukkit.Server; -import org.bukkit.entity.Player; -import org.bukkit.event.EventHandler; -import org.bukkit.event.Listener; -import org.bukkit.event.player.PlayerJoinEvent; - -@Controller -class PlayerJoinSoundListener implements Listener { - - private final PluginConfiguration config; - private final Server server; - - @Inject - PlayerJoinSoundListener(PluginConfiguration config, Server server) { - this.config = config; - this.server = server; - } - - @EventHandler - void onPlayerJoinSound(PlayerJoinEvent event) { - if (this.config.sound.enabledAfterJoin) { - for (Player online : this.server.getOnlinePlayers()) { - online.playSound(online.getLocation(), this.config.sound.afterJoin, this.config.sound.afterJoinVolume, this.config.sound.afterJoinPitch); - } - } - } - -} diff --git a/eternalcore-core/src/main/java/com/eternalcode/core/feature/sound/PlayerQuitSoundListener.java b/eternalcore-core/src/main/java/com/eternalcode/core/feature/sound/PlayerQuitSoundListener.java deleted file mode 100644 index 752c0bcb0..000000000 --- a/eternalcore-core/src/main/java/com/eternalcode/core/feature/sound/PlayerQuitSoundListener.java +++ /dev/null @@ -1,33 +0,0 @@ -package com.eternalcode.core.feature.sound; - - -import com.eternalcode.core.configuration.implementation.PluginConfiguration; -import com.eternalcode.core.injector.annotations.Inject; -import com.eternalcode.core.injector.annotations.component.Controller; -import org.bukkit.Server; -import org.bukkit.entity.Player; -import org.bukkit.event.EventHandler; -import org.bukkit.event.player.PlayerQuitEvent; - -@Controller -class PlayerQuitSoundListener { - - private final PluginConfiguration config; - private final Server server; - - @Inject - PlayerQuitSoundListener(PluginConfiguration config, Server server) { - this.config = config; - this.server = server; - } - - @EventHandler - void onPlayerQuitSound(PlayerQuitEvent event) { - if (this.config.sound.enableAfterQuit) { - for (Player online : this.server.getOnlinePlayers()) { - online.playSound(online.getLocation(), this.config.sound.afterQuit, this.config.sound.afterQuitVolume, this.config.sound.afterQuitPitch); - } - } - } - -} diff --git a/eternalcore-core/src/main/java/com/eternalcode/core/feature/spawn/messages/ENSpawnMessages.java b/eternalcore-core/src/main/java/com/eternalcode/core/feature/spawn/messages/ENSpawnMessages.java index 3a0b6678d..b0f362cc0 100644 --- a/eternalcore-core/src/main/java/com/eternalcode/core/feature/spawn/messages/ENSpawnMessages.java +++ b/eternalcore-core/src/main/java/com/eternalcode/core/feature/spawn/messages/ENSpawnMessages.java @@ -10,14 +10,14 @@ @Accessors(fluent = true) public class ENSpawnMessages extends OkaeriConfig implements SpawnMessages { - public Notice spawnSet = Notice.chat("► Spawn set!"); - public Notice spawnNoSet = Notice.chat("✘ Spawn is not set!"); + Notice spawnSet = Notice.chat("► Spawn set!"); + Notice spawnNoSet = Notice.chat("✘ Spawn is not set!"); @Comment("# {PLAYER} - Player who teleported you to spawn") - public Notice spawnTeleportedBy = + Notice spawnTeleportedBy = Notice.chat("► You have been teleported to spawn by {PLAYER}!"); @Comment("# {PLAYER} - Teleported player") - public Notice spawnTeleportedOther = + Notice spawnTeleportedOther = Notice.chat("► You teleported player {PLAYER} to spawn!"); } diff --git a/eternalcore-core/src/main/java/com/eternalcode/core/feature/sudo/messages/ENSudoMessages.java b/eternalcore-core/src/main/java/com/eternalcode/core/feature/sudo/messages/ENSudoMessages.java index 3a378f161..30fd89e0c 100644 --- a/eternalcore-core/src/main/java/com/eternalcode/core/feature/sudo/messages/ENSudoMessages.java +++ b/eternalcore-core/src/main/java/com/eternalcode/core/feature/sudo/messages/ENSudoMessages.java @@ -10,8 +10,8 @@ @Accessors(fluent = true) public class ENSudoMessages extends OkaeriConfig implements SudoMessages { @Comment({"# {PLAYER} - Player who executed the command, {TARGET} - Player or console on which the command was executed, {COMMAND} - Command"}) - public Notice sudoMessageSpy = Notice.chat("[Sudo] {PLAYER} executed command: {COMMAND} on: {TARGET}"); + Notice sudoMessageSpy = Notice.chat("[Sudo] {PLAYER} executed command: {COMMAND} on: {TARGET}"); @Comment({"# {TARGET} - Player or console on which the command was executed, {COMMAND} - Command"}) - public Notice sudoMessage = Notice.chat("► You executed command: {COMMAND} on: {TARGET}"); + Notice sudoMessage = Notice.chat("► You executed command: {COMMAND} on: {TARGET}"); } diff --git a/eternalcore-core/src/main/java/com/eternalcode/core/feature/teleport/messages/ENTeleportOfflineMessages.java b/eternalcore-core/src/main/java/com/eternalcode/core/feature/teleport/messages/ENTeleportOfflineMessages.java index c8999a874..1502747e2 100644 --- a/eternalcore-core/src/main/java/com/eternalcode/core/feature/teleport/messages/ENTeleportOfflineMessages.java +++ b/eternalcore-core/src/main/java/com/eternalcode/core/feature/teleport/messages/ENTeleportOfflineMessages.java @@ -11,7 +11,7 @@ public class ENTeleportOfflineMessages extends OkaeriConfig implements TeleportOfflineMessages { @Comment({" ", "# {PLAYER} - Player who has never played before"}) - public Notice offlinePlayerNotPlayedBefore = Notice.chat("✘ Player {PLAYER} has never played on this server before!"); - public Notice lastLocationNotFound = Notice.chat("✘ Last location of player {PLAYER} was not found!"); - public Notice teleportedToPlayerLastLocation = Notice.chat("✔ Teleported to the last location of player {PLAYER}!"); + Notice offlinePlayerNotPlayedBefore = Notice.chat("✘ Player {PLAYER} has never played on this server before!"); + Notice lastLocationNotFound = Notice.chat("✘ Last location of player {PLAYER} was not found!"); + Notice teleportedToPlayerLastLocation = Notice.chat("✔ Teleported to the last location of player {PLAYER}!"); } diff --git a/eternalcore-core/src/main/java/com/eternalcode/core/feature/teleportrandomplayer/messages/ENTeleportToRandomPlayerMessages.java b/eternalcore-core/src/main/java/com/eternalcode/core/feature/teleportrandomplayer/messages/ENTeleportToRandomPlayerMessages.java index 83a2aaeb5..893266f56 100644 --- a/eternalcore-core/src/main/java/com/eternalcode/core/feature/teleportrandomplayer/messages/ENTeleportToRandomPlayerMessages.java +++ b/eternalcore-core/src/main/java/com/eternalcode/core/feature/teleportrandomplayer/messages/ENTeleportToRandomPlayerMessages.java @@ -10,18 +10,18 @@ @Accessors(fluent = true) public class ENTeleportToRandomPlayerMessages extends OkaeriConfig implements TeleportToRandomPlayerMessages { - public Notice randomPlayerNotFound = + Notice randomPlayerNotFound = Notice.chat("✘ No player found to teleport!"); @Comment("{PLAYER} - The name of the player you have been teleported to") - public Notice teleportedToRandomPlayer = + Notice teleportedToRandomPlayer = Notice.chat("► Teleported to random player {PLAYER}!"); - public Notice randomPlayerInRangeNotFound = + Notice randomPlayerInRangeNotFound = Notice.chat("✘ No player found in range to teleport!"); @Comment("{PLAYER} - The name of the player you have been teleported to within range") - public Notice teleportedToRandomPlayerInRange = + Notice teleportedToRandomPlayerInRange = Notice.chat("► Teleported to a random player in range: {PLAYER}!"); } 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 b70caa19f..31861d4b1 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 @@ -9,15 +9,15 @@ @Getter @Accessors(fluent = true) public class ENTeleportRequestMessages extends OkaeriConfig implements TeleportRequestMessages { - public Notice tpaSelfMessage = Notice.chat("✘ You can't teleport to yourself!"); - public Notice tpaAlreadySentMessage = + Notice tpaSelfMessage = Notice.chat("✘ You can't teleport to yourself!"); + Notice tpaAlreadySentMessage = Notice.chat("✘ You have already sent a teleportation request!"); - public Notice tpaSentMessage = + Notice tpaSentMessage = Notice.chat("► You have sent a request for player {PLAYER} to teleport to you!"); - public Notice tpaHereSent = Notice.chat("► You have sent a request for teleportation to you for a player: {PLAYER}!"); - public Notice tpaHereSentToAll = Notice.chat("► You have sent a request for teleportation to all players!"); - public Notice tpaHereReceived = Notice.builder() + Notice tpaHereSent = Notice.chat("► You have sent a request for teleportation to you for a player: {PLAYER}!"); + Notice tpaHereSentToAll = Notice.chat("► You have sent a request for teleportation to all players!"); + 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)") @@ -32,7 +32,7 @@ public class ENTeleportRequestMessages extends OkaeriConfig implements TeleportR "# More information about MiniMessages: https://docs.adventure.kyori.net/minimessage/format.html", }) @Comment({" ", "# {PLAYER} - Player who sent the request to another player"}) - public Notice tpaReceivedMessage = Notice.builder() + Notice tpaReceivedMessage = Notice.builder() .chat("► You have received a request for teleportation from a player: {PLAYER}!") .chat( "Accept request for teleports?'>» /tpaccept {PLAYER} to accept! (Click)") @@ -41,36 +41,36 @@ public class ENTeleportRequestMessages extends OkaeriConfig implements TeleportR .build(); @Comment(" ") - public Notice tpaDenyNoRequestMessage = + Notice tpaDenyNoRequestMessage = Notice.chat("✘ You do not have a teleport request from this player!"); @Comment({" ", "# {PLAYER} - Player who sent a request to teleport to another player"}) - public Notice tpaDenyDoneMessage = + Notice tpaDenyDoneMessage = Notice.chat("✘ You have declined a teleport request from a player: {PLAYER}!"); @Comment({" ", "# {PLAYER} - Player who declines the tpa request"}) - public Notice tpaDenyReceivedMessage = + Notice tpaDenyReceivedMessage = Notice.chat("✘ Player: {PLAYER} rejected your teleport request!"); @Comment(" ") - public Notice tpaDenyAllDenied = Notice.chat("► All players have denied your teleport request!"); + Notice tpaDenyAllDenied = Notice.chat("► All players have denied your teleport request!"); @Comment({" ", "# {PLAYER} - Player who sent tpa request to another player"}) - public Notice tpaAcceptMessage = + Notice tpaAcceptMessage = Notice.chat("► You have accepted the teleportation from the player: {PLAYER}!"); @Comment(" ") - public Notice tpaAcceptNoRequestMessage = + Notice tpaAcceptNoRequestMessage = Notice.chat("✘ This player has not sent you a teleport request!"); @Comment({" ", "# {PLAYER} - Player who sent a request to teleport to another player"}) - public Notice tpaAcceptReceivedMessage = + Notice tpaAcceptReceivedMessage = Notice.chat("► Player: {PLAYER} accepted your teleportation request!"); @Comment(" ") - public Notice tpaAcceptAllAccepted = + Notice tpaAcceptAllAccepted = Notice.chat("► All players have accepted your teleport request!"); @Comment(" ") - public Notice tpaTargetIgnoresYou = Notice.chat("► {PLAYER} is ignoring you!"); + Notice tpaTargetIgnoresYou = Notice.chat("► {PLAYER} is ignoring you!"); } diff --git a/eternalcore-core/src/main/java/com/eternalcode/core/feature/time/messages/ENTimeAndWeatherMessages.java b/eternalcore-core/src/main/java/com/eternalcode/core/feature/time/messages/ENTimeAndWeatherMessages.java index ceb5f3cff..ed2302c5f 100644 --- a/eternalcore-core/src/main/java/com/eternalcode/core/feature/time/messages/ENTimeAndWeatherMessages.java +++ b/eternalcore-core/src/main/java/com/eternalcode/core/feature/time/messages/ENTimeAndWeatherMessages.java @@ -10,16 +10,16 @@ @Accessors(fluent = true) public class ENTimeAndWeatherMessages extends OkaeriConfig implements TimeAndWeatherMessages { @Comment("# {WORLD} - World name") - public Notice timeSetDay = Notice.chat("► Time set to day in the {WORLD}!"); - public Notice timeSetNight = Notice.chat("► Time set to night in the {WORLD}!"); + Notice timeSetDay = Notice.chat("► Time set to day in the {WORLD}!"); + Notice timeSetNight = Notice.chat("► Time set to night in the {WORLD}!"); @Comment("# {TIME} - Changed time in ticks") - public Notice timeSet = Notice.chat("► Time set to {TIME}"); - public Notice timeAdd = Notice.chat("► Time added {TIME}"); + Notice timeSet = Notice.chat("► Time set to {TIME}"); + Notice timeAdd = Notice.chat("► Time added {TIME}"); @Comment("# {WORLD} - World name") - public Notice weatherSetRain = Notice.chat("► Weather set to rain in the {WORLD}!"); - public Notice weatherSetSun = Notice.chat("► Weather set to sun in the {WORLD}!"); - public Notice weatherSetThunder = + Notice weatherSetRain = Notice.chat("► Weather set to rain in the {WORLD}!"); + Notice weatherSetSun = Notice.chat("► Weather set to sun in the {WORLD}!"); + Notice weatherSetThunder = Notice.chat("► Weather set to thunder in the {WORLD}!"); } diff --git a/eternalcore-core/src/main/java/com/eternalcode/core/feature/vanish/messages/ENVanishMessages.java b/eternalcore-core/src/main/java/com/eternalcode/core/feature/vanish/messages/ENVanishMessages.java index 9c8cda7e2..892116fb1 100644 --- a/eternalcore-core/src/main/java/com/eternalcode/core/feature/vanish/messages/ENVanishMessages.java +++ b/eternalcore-core/src/main/java/com/eternalcode/core/feature/vanish/messages/ENVanishMessages.java @@ -9,23 +9,23 @@ @Accessors(fluent = true) public class ENVanishMessages extends OkaeriConfig implements VanishMessages { - public Notice vanishEnabled = Notice.chat("► Vanish mode enabled!"); - public Notice vanishDisabled = Notice.chat("► Vanish mode disabled!"); + Notice vanishEnabled = Notice.chat("► Vanish mode enabled!"); + Notice vanishDisabled = Notice.chat("► Vanish mode disabled!"); - public Notice vanishEnabledForOther = Notice.chat("► Enabled vanish mode for {PLAYER}!"); - public Notice vanishDisabledForOther = Notice.chat("► Disabled vanish mode for {PLAYER}!"); + Notice vanishEnabledForOther = Notice.chat("► Enabled vanish mode for {PLAYER}!"); + Notice vanishDisabledForOther = Notice.chat("► Disabled vanish mode for {PLAYER}!"); - public Notice vanishEnabledByStaff = Notice.chat("► Administrator {PLAYER} has enabled your vanish mode!"); - public Notice vanishDisabledByStaff = Notice.chat("► Administrator {PLAYER} has disabled your vanish mode!"); + Notice vanishEnabledByStaff = Notice.chat("► Administrator {PLAYER} has enabled your vanish mode!"); + Notice vanishDisabledByStaff = Notice.chat("► Administrator {PLAYER} has disabled your vanish mode!"); - public Notice currentlyInVanish = Notice.actionbar("You are currently invisible! (/vanish)"); + Notice currentlyInVanish = Notice.actionbar("You are currently invisible! (/vanish)"); - public Notice joinedInVanish = Notice.chat("► You have joined the server in vanish mode."); - public Notice playerJoinedInVanish = Notice.chat("► {PLAYER} has joined the server in vanish mode."); + Notice joinedInVanish = Notice.chat("► You have joined the server in vanish mode."); + Notice playerJoinedInVanish = Notice.chat("► {PLAYER} has joined the server in vanish mode."); - public Notice cantBlockPlaceWhileVanished = Notice.chat("You cannot place blocks while vanished."); - public Notice cantBlockBreakWhileVanished = Notice.chat("You cannot break blocks while vanished."); - public Notice cantUseChatWhileVanished = Notice.chat("You cannot use chat while vanished."); - public Notice cantDropItemsWhileVanished = Notice.chat("You cannot drop items while vanished."); - public Notice cantOpenInventoryWhileVanished = Notice.chat("You cannot open your inventory while vanished."); + Notice cantBlockPlaceWhileVanished = Notice.chat("You cannot place blocks while vanished."); + Notice cantBlockBreakWhileVanished = Notice.chat("You cannot break blocks while vanished."); + Notice cantUseChatWhileVanished = Notice.chat("You cannot use chat while vanished."); + Notice cantDropItemsWhileVanished = Notice.chat("You cannot drop items while vanished."); + Notice cantOpenInventoryWhileVanished = Notice.chat("You cannot open your inventory while vanished."); } diff --git a/eternalcore-core/src/main/java/com/eternalcode/core/feature/warp/messages/ENWarpMessages.java b/eternalcore-core/src/main/java/com/eternalcode/core/feature/warp/messages/ENWarpMessages.java index e28152d22..c9753ff6a 100644 --- a/eternalcore-core/src/main/java/com/eternalcode/core/feature/warp/messages/ENWarpMessages.java +++ b/eternalcore-core/src/main/java/com/eternalcode/core/feature/warp/messages/ENWarpMessages.java @@ -17,29 +17,29 @@ @Accessors(fluent = true) public class ENWarpMessages extends OkaeriConfig implements WarpMessages { @Comment("# {WARP} - Warp name") - public Notice warpAlreadyExists = Notice.chat("✘ Warp {WARP} already exists!"); - public Notice create = Notice.chat("► Warp {WARP} has been created."); - public Notice remove = Notice.chat("► Warp {WARP} has been deleted."); - public Notice notExist = Notice.chat("► This warp doesn't exist"); - public Notice itemAdded = Notice.chat("► Warp has been added to GUI!"); - public Notice noWarps = Notice.chat("✘ There are no warps!"); - public Notice itemLimit = + Notice warpAlreadyExists = Notice.chat("✘ Warp {WARP} already exists!"); + Notice create = Notice.chat("► Warp {WARP} has been created."); + Notice remove = Notice.chat("► Warp {WARP} has been deleted."); + Notice notExist = Notice.chat("► This warp doesn't exist"); + Notice itemAdded = Notice.chat("► Warp has been added to GUI!"); + Notice noWarps = Notice.chat("✘ There are no warps!"); + Notice itemLimit = Notice.chat("✘ You have reached the limit of warps! Your limit is {LIMIT}."); - public Notice noPermission = Notice.chat("✘ You don't have permission to use this warp ({WARP})!"); - public Notice addPermissions = Notice.chat("► Added permissions to warp {WARP}!"); - public Notice removePermission = + Notice noPermission = Notice.chat("✘ You don't have permission to use this warp ({WARP})!"); + Notice addPermissions = Notice.chat("► Added permissions to warp {WARP}!"); + Notice removePermission = Notice.chat("► Removed permission {PERMISSION} from warp {WARP}!"); - public Notice noPermissionsProvided = Notice.chat("✘ No permissions provided!"); - public Notice permissionDoesNotExist = + Notice noPermissionsProvided = Notice.chat("✘ No permissions provided!"); + Notice permissionDoesNotExist = Notice.chat("✘ Permission {PERMISSION} doesn't exist!"); - public Notice permissionAlreadyExist = + Notice permissionAlreadyExist = Notice.chat("✘ Permission {PERMISSION} already exists!"); - public Notice noPermissionAssigned = Notice.chat("✘ There are no permissions assigned to this warp!"); - public Notice missingWarpArgument = Notice.chat("✘ You must provide a warp name!"); - public Notice missingPermissionArgument = Notice.chat("✘ You must provide a permission!"); + Notice noPermissionAssigned = Notice.chat("✘ There are no permissions assigned to this warp!"); + Notice missingWarpArgument = Notice.chat("✘ You must provide a warp name!"); + Notice missingPermissionArgument = Notice.chat("✘ You must provide a permission!"); @Comment({" ", "# {WARPS} - List of warps (separated by commas)"}) - public Notice available = Notice.chat("► Available warps: {WARPS}"); + Notice available = Notice.chat("► Available warps: {WARPS}"); @Comment({" ", "# Settings for warp inventory"}) public ENWarpInventory warpInventory = new ENWarpInventory(); diff --git a/eternalcore-core/src/main/java/com/eternalcode/core/litecommand/argument/messages/ENArgumentMessages.java b/eternalcore-core/src/main/java/com/eternalcode/core/litecommand/argument/messages/ENArgumentMessages.java index 2392054aa..36ada1475 100644 --- a/eternalcore-core/src/main/java/com/eternalcode/core/litecommand/argument/messages/ENArgumentMessages.java +++ b/eternalcore-core/src/main/java/com/eternalcode/core/litecommand/argument/messages/ENArgumentMessages.java @@ -10,27 +10,27 @@ @Accessors(fluent = true) public class ENArgumentMessages extends OkaeriConfig implements ArgumentMessages { @Comment("# {PERMISSIONS} - Required permission") - public Notice permissionMessage = Notice.chat("✘ You don't have permission to perform this command! ({PERMISSIONS})"); + Notice permissionMessage = Notice.chat("✘ You don't have permission to perform this command! ({PERMISSIONS})"); @Comment({" ", "# {USAGE} - Correct usage"}) - public Notice usageMessage = Notice.chat("✘ Correct usage: {USAGE}"); - public Notice usageMessageHead = Notice.chat("► Correct usage:"); - public Notice usageMessageEntry = Notice.chat("► {USAGE}"); + Notice usageMessage = Notice.chat("✘ Correct usage: {USAGE}"); + Notice usageMessageHead = Notice.chat("► Correct usage:"); + Notice usageMessageEntry = Notice.chat("► {USAGE}"); @Comment(" ") - public Notice missingPlayerName = Notice.chat("✘ You must provide a player name!"); - public Notice offlinePlayer = Notice.chat("✘ This player is currently offline!"); - public Notice onlyPlayer = Notice.chat("✘ Command is only for players!"); - public Notice numberBiggerThanZero = Notice.chat("✘ The number must be greater than 0!"); - public Notice numberBiggerThanOrEqualZero = Notice.chat("✘ The number must be greater than or equal to 0!"); - public Notice noItem = Notice.chat("✘ You need item to use this command!"); - public Notice noMaterial = Notice.chat("✘ This item doesn't exist"); - public Notice noArgument = Notice.chat("✘ This argument doesn't exist"); - public Notice noDamaged = Notice.chat("✘ This item can't be repaired"); - public Notice noDamagedItems = Notice.chat("✘ You need damaged items to use this command!"); - public Notice noEnchantment = Notice.chat("✘ This enchantment doesn't exist"); - public Notice noValidEnchantmentLevel = Notice.chat("✘ This enchantment level is not supported!"); - public Notice worldDoesntExist = Notice.chat("✘ World {WORLD} doesn't exist!"); - public Notice incorrectNumberOfChunks = Notice.chat("✘ Incorrect number of chunks!"); - public Notice incorrectLocation = Notice.chat("✘ Incorrect location format! ({LOCATION})"); + Notice missingPlayerName = Notice.chat("✘ You must provide a player name!"); + Notice offlinePlayer = Notice.chat("✘ This player is currently offline!"); + Notice onlyPlayer = Notice.chat("✘ Command is only for players!"); + Notice numberBiggerThanZero = Notice.chat("✘ The number must be greater than 0!"); + Notice numberBiggerThanOrEqualZero = Notice.chat("✘ The number must be greater than or equal to 0!"); + Notice noItem = Notice.chat("✘ You need item to use this command!"); + Notice noMaterial = Notice.chat("✘ This item doesn't exist"); + Notice noArgument = Notice.chat("✘ This argument doesn't exist"); + Notice noDamaged = Notice.chat("✘ This item can't be repaired"); + Notice noDamagedItems = Notice.chat("✘ You need damaged items to use this command!"); + Notice noEnchantment = Notice.chat("✘ This enchantment doesn't exist"); + Notice noValidEnchantmentLevel = Notice.chat("✘ This enchantment level is not supported!"); + Notice worldDoesntExist = Notice.chat("✘ World {WORLD} doesn't exist!"); + Notice incorrectNumberOfChunks = Notice.chat("✘ Incorrect number of chunks!"); + Notice incorrectLocation = Notice.chat("✘ Incorrect location format! ({LOCATION})"); } diff --git a/eternalcore-core/src/main/java/com/eternalcode/core/litecommand/argument/messages/PLArgumentMessages.java b/eternalcore-core/src/main/java/com/eternalcode/core/litecommand/argument/messages/PLArgumentMessages.java index 0ce55371c..1550b76d8 100644 --- a/eternalcore-core/src/main/java/com/eternalcode/core/litecommand/argument/messages/PLArgumentMessages.java +++ b/eternalcore-core/src/main/java/com/eternalcode/core/litecommand/argument/messages/PLArgumentMessages.java @@ -10,29 +10,29 @@ @Accessors(fluent = true) public class PLArgumentMessages extends OkaeriConfig implements ArgumentMessages { @Comment("# {PERMISSIONS} - Wyświetla wymagane uprawnienia") - public Notice permissionMessage = + Notice permissionMessage = Notice.chat("✘ Nie masz uprawnień do tej komendy! ({PERMISSIONS})"); @Comment({" ", "# {USAGE} - Wyświetla poprawne użycie komendy"}) - public Notice usageMessage = Notice.chat("✘ Poprawne użycie: {USAGE}"); - public Notice usageMessageHead = Notice.chat("✘ Poprawne użycie:"); - public Notice usageMessageEntry = Notice.chat("✘ {USAGE}"); + Notice usageMessage = Notice.chat("✘ Poprawne użycie: {USAGE}"); + Notice usageMessageHead = Notice.chat("✘ Poprawne użycie:"); + Notice usageMessageEntry = Notice.chat("✘ {USAGE}"); @Comment(" ") - public Notice missingPlayerName = Notice.chat("✘ Musisz podać nazwę gracza!"); - public Notice offlinePlayer = Notice.chat("✘ Ten gracz jest obecnie offline!"); - public Notice onlyPlayer = Notice.chat("✘ Ta komenda jest dostępna tylko dla graczy!"); - public Notice numberBiggerThanZero = Notice.chat("✘ Liczba musi być większa od 0!"); - public Notice numberBiggerThanOrEqualZero = Notice.chat("✘ Liczba musi być równa lub większa od 0!"); - public Notice noItem = Notice.chat("✘ Musisz trzymać przedmiot w dłoni!"); - public Notice noMaterial = Notice.chat("✘ Taki materiał nie istnieje!"); - public Notice noArgument = Notice.chat("✘ Taki argument nie istnieje!"); - public Notice noDamaged = Notice.chat("✘ Ten przedmiot nie może być naprawiony!"); - public Notice noDamagedItems = Notice.chat("✘ Musisz posiadać uszkodzone przedmioty!"); - public Notice noEnchantment = Notice.chat("✘ Takie zaklęcie nie istnieje!"); - public Notice noValidEnchantmentLevel = Notice.chat("✘ Ten poziom zaklęcia nie jest wspierany!"); - public Notice worldDoesntExist = Notice.chat("✘ Świat {WORLD} nie istnieje!"); - public Notice incorrectNumberOfChunks = Notice.chat("✘ Niepoprawna liczba chunków!"); - public Notice incorrectLocation = Notice.chat("✘ Niepoprawna lokalizacja! ({LOCATION})"); + Notice missingPlayerName = Notice.chat("✘ Musisz podać nazwę gracza!"); + Notice offlinePlayer = Notice.chat("✘ Ten gracz jest obecnie offline!"); + Notice onlyPlayer = Notice.chat("✘ Ta komenda jest dostępna tylko dla graczy!"); + Notice numberBiggerThanZero = Notice.chat("✘ Liczba musi być większa od 0!"); + Notice numberBiggerThanOrEqualZero = Notice.chat("✘ Liczba musi być równa lub większa od 0!"); + Notice noItem = Notice.chat("✘ Musisz trzymać przedmiot w dłoni!"); + Notice noMaterial = Notice.chat("✘ Taki materiał nie istnieje!"); + Notice noArgument = Notice.chat("✘ Taki argument nie istnieje!"); + Notice noDamaged = Notice.chat("✘ Ten przedmiot nie może być naprawiony!"); + Notice noDamagedItems = Notice.chat("✘ Musisz posiadać uszkodzone przedmioty!"); + Notice noEnchantment = Notice.chat("✘ Takie zaklęcie nie istnieje!"); + Notice noValidEnchantmentLevel = Notice.chat("✘ Ten poziom zaklęcia nie jest wspierany!"); + Notice worldDoesntExist = Notice.chat("✘ Świat {WORLD} nie istnieje!"); + Notice incorrectNumberOfChunks = Notice.chat("✘ Niepoprawna liczba chunków!"); + Notice incorrectLocation = Notice.chat("✘ Niepoprawna lokalizacja! ({LOCATION})"); } diff --git a/eternalcore-core/src/main/java/com/eternalcode/core/notice/EternalCoreNoticeBukkitResolver.java b/eternalcore-core/src/main/java/com/eternalcode/core/notice/EternalCoreNoticeBukkitResolver.java index 8f1eeeff9..a6eea6b10 100644 --- a/eternalcore-core/src/main/java/com/eternalcode/core/notice/EternalCoreNoticeBukkitResolver.java +++ b/eternalcore-core/src/main/java/com/eternalcode/core/notice/EternalCoreNoticeBukkitResolver.java @@ -10,7 +10,7 @@ public class EternalCoreNoticeBukkitResolver { @Bean - public NoticeResolverRegistry resolverRegistry() { + NoticeResolverRegistry resolverRegistry() { return NoticeResolverDefaults.createRegistry() .registerResolver(new SoundBukkitResolver()); } diff --git a/eternalcore-core/src/main/java/com/eternalcode/core/notice/NoticeService.java b/eternalcore-core/src/main/java/com/eternalcode/core/notice/NoticeService.java index fbb3e0f32..e65e1476b 100644 --- a/eternalcore-core/src/main/java/com/eternalcode/core/notice/NoticeService.java +++ b/eternalcore-core/src/main/java/com/eternalcode/core/notice/NoticeService.java @@ -39,7 +39,7 @@ public class NoticeService extends Multification { private final NoticeResolverRegistry noticeRegistry; @Inject - public NoticeService( + NoticeService( UserManager userManager, Scheduler scheduler, Server server, diff --git a/eternalcore-core/src/main/java/com/eternalcode/core/translation/implementation/ENTranslation.java b/eternalcore-core/src/main/java/com/eternalcode/core/translation/implementation/ENTranslation.java index b04fe194c..6f614c1f9 100644 --- a/eternalcore-core/src/main/java/com/eternalcode/core/translation/implementation/ENTranslation.java +++ b/eternalcore-core/src/main/java/com/eternalcode/core/translation/implementation/ENTranslation.java @@ -1,10 +1,12 @@ package com.eternalcode.core.translation.implementation; import com.eternalcode.core.feature.freeze.messages.ENFreezeMessages; -import com.eternalcode.core.feature.playtime.messages.ENPlaytimeMessages; +import com.eternalcode.core.feature.near.messages.ENNearMessages; import com.eternalcode.core.feature.clear.messages.ENClearMessages; import com.eternalcode.core.feature.container.messages.ENContainerMessages; +import com.eternalcode.core.feature.playtime.messages.ENPlaytimeMessages; import com.eternalcode.core.feature.repair.messages.ENRepairMessages; +import com.eternalcode.core.feature.teleportrandomplayer.messages.ENTeleportToRandomPlayerMessages; import com.eternalcode.core.litecommand.argument.messages.ENArgumentMessages; import com.eternalcode.core.configuration.contextual.ConfigItem; import com.eternalcode.core.feature.adminchat.messages.ENAdminChatMessages; @@ -24,23 +26,18 @@ import com.eternalcode.core.feature.motd.messages.ENMotdMessages; import com.eternalcode.core.feature.msg.messages.ENMsgMessages; import com.eternalcode.core.feature.near.messages.ENNearMessages; -import com.eternalcode.core.feature.playtime.messages.ENPlaytimeMessages; import com.eternalcode.core.feature.powertool.messages.ENPowertoolMessages; import com.eternalcode.core.feature.randomteleport.messages.ENRandomTeleportMessages; -import com.eternalcode.core.feature.repair.messages.ENRepairMessages; import com.eternalcode.core.feature.seen.messages.ENSeenMessages; import com.eternalcode.core.feature.setslot.messages.ENSetSlotMessages; import com.eternalcode.core.feature.signeditor.messages.ENSignEditorMessages; import com.eternalcode.core.feature.spawn.messages.ENSpawnMessages; import com.eternalcode.core.feature.sudo.messages.ENSudoMessages; import com.eternalcode.core.feature.teleport.messages.ENTeleportOfflineMessages; -import com.eternalcode.core.feature.teleportrandomplayer.messages.ENTeleportToRandomPlayerMessages; import com.eternalcode.core.feature.teleportrequest.messages.ENTeleportRequestMessages; import com.eternalcode.core.feature.time.messages.ENTimeAndWeatherMessages; import com.eternalcode.core.feature.vanish.messages.ENVanishMessages; import com.eternalcode.core.feature.warp.messages.ENWarpMessages; -import com.eternalcode.core.litecommand.argument.messages.ENArgumentMessages; -import com.eternalcode.core.litecommand.argument.messages.ENArgumentMessages; import com.eternalcode.core.translation.AbstractTranslation; import com.eternalcode.core.translation.Language; import com.eternalcode.multification.notice.Notice; @@ -192,39 +189,39 @@ public static class ENFormatSection extends OkaeriConfig implements Format { public static class ENTeleportSection extends OkaeriConfig implements TeleportSection { // teleport @Comment({"# {PLAYER} - Teleported players"}) - public Notice teleportedToPlayer = Notice.chat("► Successfully teleported to {PLAYER}!"); + Notice teleportedToPlayer = Notice.chat("► Successfully teleported to {PLAYER}!"); @Comment({"# {PLAYER} - Teleported player, {ARG-PLAYER} - Player to whom another player has been transferred"}) - public Notice teleportedPlayerToPlayer = Notice.chat("► Successfully teleported {PLAYER} to {ARG-PLAYER}!"); + Notice teleportedPlayerToPlayer = Notice.chat("► Successfully teleported {PLAYER} to {ARG-PLAYER}!"); @Comment({"# {Y} - Y coordinate of the highest block"}) - public Notice teleportedToHighestBlock = Notice.chat("► Teleported successfully to the highest block! (Y: {Y})"); + Notice teleportedToHighestBlock = Notice.chat("► Teleported successfully to the highest block! (Y: {Y})"); @Comment(" ") - public Notice teleportedAllToPlayer = Notice.chat("► All players have been teleported to you!"); + Notice teleportedAllToPlayer = Notice.chat("► All players have been teleported to you!"); // Task @Comment({"# {TIME} - Teleportation time"}) - public Notice teleportTimerFormat = Notice.actionbar("► Teleporting in {TIME}"); + Notice teleportTimerFormat = Notice.actionbar("► Teleporting in {TIME}"); @Comment(" ") - public Notice teleported = Notice.chat("► Teleported!"); - public Notice teleporting = Notice.chat("► Teleporting..."); - public Notice teleportTaskCanceled = Notice.chat("✘ You've moved, teleportation canceled!"); - public Notice teleportTaskAlreadyExist = Notice.chat("✘ You are in teleport!"); + Notice teleported = Notice.chat("► Teleported!"); + Notice teleporting = Notice.chat("► Teleporting..."); + Notice teleportTaskCanceled = Notice.chat("✘ You've moved, teleportation canceled!"); + Notice teleportTaskAlreadyExist = Notice.chat("✘ You are in teleport!"); // Coordinates XYZ @Comment({" ", "# {X} - X coordinate, {Y} - Y coordinate, {Z} - Z coordinate"}) - public Notice teleportedToCoordinates = Notice.chat("► Teleported to location x: {X}, y: {Y}, z: {Z}"); + Notice teleportedToCoordinates = Notice.chat("► Teleported to location x: {X}, y: {Y}, z: {Z}"); @Comment({" ", "# {PLAYER} - Player who has been teleported, {X} - X coordinate, {Y} - Y coordinate, {Z} - Z coordinate"}) - public Notice teleportedSpecifiedPlayerToCoordinates = Notice.chat("► Teleported {PLAYER} to location x: {X}, y: {Y}, z: {Z}"); + Notice teleportedSpecifiedPlayerToCoordinates = Notice.chat("► Teleported {PLAYER} to location x: {X}, y: {Y}, z: {Z}"); // Back @Comment(" ") - public Notice teleportedToLastLocation = Notice.chat("► Teleported to the last location!"); + Notice teleportedToLastLocation = Notice.chat("► Teleported to the last location!"); @Comment({" ", "# {PLAYER} - Player who has been teleported"}) - public Notice teleportedSpecifiedPlayerLastLocation = Notice.chat("► Teleported {PLAYER} to the last location!"); + Notice teleportedSpecifiedPlayerLastLocation = Notice.chat("► Teleported {PLAYER} to the last location!"); @Comment(" ") - public Notice lastLocationNoExist = Notice.chat("✘ Last location is not exist!"); + Notice lastLocationNoExist = Notice.chat("✘ Last location is not exist!"); } @Comment({ @@ -244,28 +241,28 @@ public static class ENTeleportSection extends OkaeriConfig implements TeleportSe @Getter public static class ENChatSection extends OkaeriConfig implements ChatSection { @Comment({"# {PLAYER} - Player who performed the actions for the chat"}) - public Notice disabled = Notice.chat("► Chat has been disabled by {PLAYER}!"); - public Notice enabled = Notice.chat("► The chat has been enabled by {PLAYER}!"); - public Notice cleared = Notice.chat("► Chat has been cleared by {PLAYER}!"); + Notice disabled = Notice.chat("► Chat has been disabled by {PLAYER}!"); + Notice enabled = Notice.chat("► The chat has been enabled by {PLAYER}!"); + Notice cleared = Notice.chat("► Chat has been cleared by {PLAYER}!"); @Comment(" ") - public Notice alreadyDisabled = Notice.chat("✘ Chat already off!"); - public Notice alreadyEnabled = Notice.chat("✘ Chat already on!"); + Notice alreadyDisabled = Notice.chat("✘ Chat already off!"); + Notice alreadyEnabled = Notice.chat("✘ Chat already on!"); @Comment({" ", "# {SLOWMODE} - Time for next message"}) - public Notice slowModeSet = Notice.chat("► SlowMode set to: {SLOWMODE}"); + Notice slowModeSet = Notice.chat("► SlowMode set to: {SLOWMODE}"); @Comment({" ", "# {PLAYER} - Player who performed the actions for the chat"}) - public Notice slowModeOff = Notice.chat("► SlowMode has been disabled by {PLAYER}!"); + Notice slowModeOff = Notice.chat("► SlowMode has been disabled by {PLAYER}!"); @Comment({" ", "# {TIME} - Time to next use (cooldown)"}) - public Notice slowMode = Notice.chat("✘ You can write the next message for: {TIME}!"); + Notice slowMode = Notice.chat("✘ You can write the next message for: {TIME}!"); @Comment(" ") - public Notice disabledChatInfo = Notice.chat("✘ Chat is currently disabled!"); + Notice disabledChatInfo = Notice.chat("✘ Chat is currently disabled!"); @Comment(" ") - public Notice commandNotFound = Notice.chat("✘ Command {COMMAND} doesn't exists!"); + Notice commandNotFound = Notice.chat("✘ Command {COMMAND} doesn't exists!"); } @@ -383,70 +380,70 @@ public static class ENInventorySection extends OkaeriConfig implements Inventory @Getter public static class ENPlayerSection extends OkaeriConfig implements PlayerSection { - public Notice feedMessage = Notice.chat("► You've been fed!"); + Notice feedMessage = Notice.chat("► You've been fed!"); @Comment(" # {PLAYER} - Player who has been fed") - public Notice feedMessageBy = Notice.chat("► You've fed the {PLAYER}"); + Notice feedMessageBy = Notice.chat("► You've fed the {PLAYER}"); @Comment(" ") - public Notice healMessage = Notice.chat("► You've been healed!"); + Notice healMessage = Notice.chat("► You've been healed!"); @Comment("# {PLAYER} - Healed player") - public Notice healMessageBy = Notice.chat("► Healed {PLAYER}"); + Notice healMessageBy = Notice.chat("► Healed {PLAYER}"); @Comment(" ") - public Notice killSelf = Notice.chat("► You killed yourself!"); + Notice killSelf = Notice.chat("► You killed yourself!"); @Comment("# {PLAYER} - Killed player") - public Notice killedMessage = Notice.chat("► Killed {PLAYER}"); + Notice killedMessage = Notice.chat("► Killed {PLAYER}"); @Comment(" ") - public Notice speedBetweenZeroAndTen = Notice.chat("✘ Enter speed from 0 to 10!"); - public Notice speedTypeNotCorrect = Notice.chat("✘ Invalid speed type!"); + Notice speedBetweenZeroAndTen = Notice.chat("✘ Enter speed from 0 to 10!"); + Notice speedTypeNotCorrect = Notice.chat("✘ Invalid speed type!"); @Comment("# {SPEED} - Walk or fly speed value") - public Notice speedWalkSet = Notice.chat("► Walking speed is set to {SPEED}"); - public Notice speedFlySet = Notice.chat("► Flying speed is set to {SPEED}"); + Notice speedWalkSet = Notice.chat("► Walking speed is set to {SPEED}"); + Notice speedFlySet = Notice.chat("► Flying speed is set to {SPEED}"); @Comment("# {PLAYER} - Target player, {SPEED} - Target player walk or fly speed value") - public Notice speedWalkSetBy = Notice.chat("► Walking speed for {PLAYER} is set to {SPEED}"); - public Notice speedFlySetBy = Notice.chat("► Flying speed for {PLAYER} is set to {SPEED}"); + Notice speedWalkSetBy = Notice.chat("► Walking speed for {PLAYER} is set to {SPEED}"); + Notice speedFlySetBy = Notice.chat("► Flying speed for {PLAYER} is set to {SPEED}"); @Comment({" ", "# {STATE} - Godmode status"}) - public Notice godEnable = Notice.chat("► God is now {STATE}"); - public Notice godDisable = Notice.chat("► God is now {STATE}"); + Notice godEnable = Notice.chat("► God is now {STATE}"); + Notice godDisable = Notice.chat("► God is now {STATE}"); @Comment({" ", "# {PLAYER} - Target player, {STATE} - Target player godmode status"}) - public Notice godSetEnable = Notice.chat("► Player {PLAYER} god is now: {STATE}"); - public Notice godSetDisable = Notice.chat("► Player {PLAYER} god is now: {STATE}"); + Notice godSetEnable = Notice.chat("► Player {PLAYER} god is now: {STATE}"); + Notice godSetDisable = Notice.chat("► Player {PLAYER} god is now: {STATE}"); @Comment({" ", "# {STATE} - Fly status"}) - public Notice flyEnable = Notice.chat("► Fly is now {STATE}"); - public Notice flyDisable = Notice.chat("► Fly is now {STATE}"); + Notice flyEnable = Notice.chat("► Fly is now {STATE}"); + Notice flyDisable = Notice.chat("► Fly is now {STATE}"); @Comment("# {PLAYER} - Target player, {STATE} - Target player fly status") - public Notice flySetEnable = Notice.chat("► Fly for {PLAYER} is now {STATE}"); - public Notice flySetDisable = Notice.chat("► Fly for {PLAYER} is now {STATE}"); + Notice flySetEnable = Notice.chat("► Fly for {PLAYER} is now {STATE}"); + Notice flySetDisable = Notice.chat("► Fly for {PLAYER} is now {STATE}"); @Comment({" ", "# {PING} - Current ping"}) - public Notice pingMessage = Notice.chat("► Your ping is: {PING}ms"); + Notice pingMessage = Notice.chat("► Your ping is: {PING}ms"); @Comment("# {PLAYER} - Target player, {PING} - Ping of target player") - public Notice pingOtherMessage = Notice.chat("► Ping of the {PLAYER} is: {PING}ms"); + Notice pingOtherMessage = Notice.chat("► Ping of the {PLAYER} is: {PING}ms"); @Comment(" ") - public Notice gameModeNotCorrect = Notice.chat("✘ Not a valid gamemode type"); + Notice gameModeNotCorrect = Notice.chat("✘ Not a valid gamemode type"); @Comment("# {GAMEMODE} - Gamemode name") - public Notice gameModeMessage = Notice.chat("► Gamemode now is set to: {GAMEMODE}"); + Notice gameModeMessage = Notice.chat("► Gamemode now is set to: {GAMEMODE}"); @Comment("# {PLAYER} - Target player, {GAMEMODE} - Gamemode") - public Notice gameModeSetMessage = Notice.chat("► Gamemode for {PLAYER} now is set to: {GAMEMODE}"); + Notice gameModeSetMessage = Notice.chat("► Gamemode for {PLAYER} now is set to: {GAMEMODE}"); @Comment({" ", "# {ONLINE} - Number of online players"}) - public Notice onlinePlayersCountMessage = Notice.chat("► On server now is: {ONLINE} players!"); + Notice onlinePlayersCountMessage = Notice.chat("► On server now is: {ONLINE} players!"); @Comment("# {ONLINE} - Current online players, {PLAYERS} - Player list") - public Notice onlinePlayersMessage = Notice.chat("► On server is: ({ONLINE}): {PLAYERS}"); + Notice onlinePlayersMessage = Notice.chat("► On server is: ({ONLINE}): {PLAYERS}"); public List fullServerSlots = List.of( " ", @@ -478,10 +475,10 @@ public static class ENPlayerSection extends OkaeriConfig implements PlayerSectio ); @Comment({" ", "# {KILLED} - Number of killed mobs"}) - public Notice butcherCommand = Notice.chat("► You killed {KILLED} mobs!"); + Notice butcherCommand = Notice.chat("► You killed {KILLED} mobs!"); @Comment({" ", "# {SAFE_CHUNKS} - The number of safe chunks"}) - public Notice safeChunksMessage = Notice.chat("✘ You have exceeded the number of safe chunks {SAFE_CHUNKS}"); + Notice safeChunksMessage = Notice.chat("✘ You have exceeded the number of safe chunks {SAFE_CHUNKS}"); } @Comment({" ", "# This section is responsible for spawn-related stuff."}) @@ -496,22 +493,22 @@ public static class ENPlayerSection extends OkaeriConfig implements PlayerSectio @Getter public static class ENItemSection extends OkaeriConfig implements ItemSection { @Comment({" ", "# {ITEM} - Name of received item"}) - public Notice giveReceived = Notice.chat("► You have received: {ITEM}"); + Notice giveReceived = Notice.chat("► You have received: {ITEM}"); @Comment({" ", "# {PLAYER} - Name of item receiver, {ITEM} - the item"}) - public Notice giveGiven = Notice.chat("► Player {PLAYER} has received {ITEM}"); - public Notice giveNoSpace = Notice.chat("✘ Not enough space in inventory!"); + Notice giveGiven = Notice.chat("► Player {PLAYER} has received {ITEM}"); + Notice giveNoSpace = Notice.chat("✘ Not enough space in inventory!"); @Comment(" ") - public Notice giveNotItem = Notice.chat("► Not a valid obtainable item!"); + Notice giveNotItem = Notice.chat("► Not a valid obtainable item!"); @Comment({" ", "# {SKULL} - Name of the skull owner"}) - public Notice skullMessage = Notice.chat("► Player {SKULL} heads received"); + Notice skullMessage = Notice.chat("► Player {SKULL} heads received"); @Comment(" ") - public Notice enchantedMessage = Notice.chat("► Item in hand is enchanted!"); - public Notice enchantedMessageFor = Notice.chat("► Item in hand of {PLAYER} is enchanted!"); - public Notice enchantedMessageBy = Notice.chat("► Administrator {PLAYER} enchanted your item!"); + Notice enchantedMessage = Notice.chat("► Item in hand is enchanted!"); + Notice enchantedMessageFor = Notice.chat("► Item in hand of {PLAYER} is enchanted!"); + Notice enchantedMessageBy = Notice.chat("► Administrator {PLAYER} enchanted your item!"); } @Comment({ diff --git a/eternalcore-core/src/main/java/com/eternalcode/core/translation/implementation/PLTranslation.java b/eternalcore-core/src/main/java/com/eternalcode/core/translation/implementation/PLTranslation.java index 70616d43f..4cdee4469 100644 --- a/eternalcore-core/src/main/java/com/eternalcode/core/translation/implementation/PLTranslation.java +++ b/eternalcore-core/src/main/java/com/eternalcode/core/translation/implementation/PLTranslation.java @@ -194,43 +194,43 @@ public static class PLFormatSection extends OkaeriConfig implements Format { public static class PLTeleportSection extends OkaeriConfig implements TeleportSection { // teleport @Comment({"# {PLAYER} - Gracz który został teleportowany"}) - public Notice teleportedToPlayer = Notice.chat("► Przeteleportowano do gracza {PLAYER}!"); + Notice teleportedToPlayer = Notice.chat("► Przeteleportowano do gracza {PLAYER}!"); @Comment({"# {PLAYER} - Gracz który został teleportowany, {ARG-PLAYER} - Gracz do którego został teleportowany inny gracz"}) - public Notice teleportedPlayerToPlayer = Notice.chat("► Przeteleportowano gracza {PLAYER} do gracza {ARG-PLAYER}!"); + Notice teleportedPlayerToPlayer = Notice.chat("► Przeteleportowano gracza {PLAYER} do gracza {ARG-PLAYER}!"); @Comment({"# {Y} - Koordynat Y najwyżej położonego bloku"}) - public Notice teleportedToHighestBlock = Notice.chat("► Pomyślnie przeteleportowano do najwyższego bloku! (Y: {Y})"); + Notice teleportedToHighestBlock = Notice.chat("► Pomyślnie przeteleportowano do najwyższego bloku! (Y: {Y})"); @Comment(" ") - public Notice teleportedAllToPlayer = Notice.chat("► Przeteleportowano wszystkich graczy do ciebie!"); + Notice teleportedAllToPlayer = Notice.chat("► Przeteleportowano wszystkich graczy do ciebie!"); // Task @Comment({"# {TIME} - Czas teleportacji"}) - public Notice teleportTimerFormat = Notice.actionbar("► Teleportacja za {TIME}"); + Notice teleportTimerFormat = Notice.actionbar("► Teleportacja za {TIME}"); @Comment(" ") - public Notice teleported = Notice.builder() + Notice teleported = Notice.builder() .chat("► Przeteleportowano!") .actionBar("► Przeteleportowano!") .build(); - public Notice teleporting = Notice.chat("► Teleportowanie..."); - public Notice teleportTaskCanceled = Notice.chat("✘ Ruszyłeś się, teleportacja została przerwana!"); - public Notice teleportTaskAlreadyExist = Notice.chat("✘ Teleportujesz się już!"); + Notice teleporting = Notice.chat("► Teleportowanie..."); + Notice teleportTaskCanceled = Notice.chat("✘ Ruszyłeś się, teleportacja została przerwana!"); + Notice teleportTaskAlreadyExist = Notice.chat("✘ Teleportujesz się już!"); // Coordinates XYZ @Comment({" ", "# {X} - Koordynat X, {Y} - Koordynat Y, {Z} - Koordynat Z"}) - public Notice teleportedToCoordinates = Notice.chat("► Przeteleportowano na współrzędne x: {X}, y: {Y}, z: {Z}"); + Notice teleportedToCoordinates = Notice.chat("► Przeteleportowano na współrzędne x: {X}, y: {Y}, z: {Z}"); @Comment({" ", "# {PLAYER} - Gracz który został teleportowany, {X} - Koordynat X, {Y} - Koordynat Y, {Z} - Koordynat Z"}) - public Notice teleportedSpecifiedPlayerToCoordinates = Notice.chat("► Przeteleportowano gracza {PLAYER} na współrzędne x: {X}, y: {Y}, z: {Z}"); + Notice teleportedSpecifiedPlayerToCoordinates = Notice.chat("► Przeteleportowano gracza {PLAYER} na współrzędne x: {X}, y: {Y}, z: {Z}"); // Back @Comment(" ") - public Notice teleportedToLastLocation = Notice.chat("► Przeteleportowano do ostatniej lokalizacji!"); + Notice teleportedToLastLocation = Notice.chat("► Przeteleportowano do ostatniej lokalizacji!"); @Comment({" ", "# {PLAYER} - Gracz który został teleportowany"}) - public Notice teleportedSpecifiedPlayerLastLocation = Notice.chat("► Przeteleportowano gracza {PLAYER} do ostatniej lokalizacji!"); + Notice teleportedSpecifiedPlayerLastLocation = Notice.chat("► Przeteleportowano gracza {PLAYER} do ostatniej lokalizacji!"); @Comment(" ") - public Notice lastLocationNoExist = Notice.chat("✘ Nie ma zapisanej ostatniej lokalizacji!"); + Notice lastLocationNoExist = Notice.chat("✘ Nie ma zapisanej ostatniej lokalizacji!"); } @Comment({ @@ -254,29 +254,29 @@ public static class PLTeleportSection extends OkaeriConfig implements TeleportSe @Getter public static class PLChatSection extends OkaeriConfig implements ChatSection { @Comment({"# {PLAYER} - Gracz który wykonał akcje dla czatu"}) - public Notice disabled = Notice.chat("► Czat został wyłączony przez {PLAYER}!"); - public Notice enabled = Notice.chat("► Czat został włączony przez {PLAYER}!"); - public Notice cleared = Notice.chat("► Czat został wyczyszczony przez {PLAYER}!"); + Notice disabled = Notice.chat("► Czat został wyłączony przez {PLAYER}!"); + Notice enabled = Notice.chat("► Czat został włączony przez {PLAYER}!"); + Notice cleared = Notice.chat("► Czat został wyczyszczony przez {PLAYER}!"); @Comment(" ") - public Notice alreadyDisabled = Notice.chat("✘ Czat jest już wyłączony!"); - public Notice alreadyEnabled = Notice.chat("✘ Czat jest już włączony!"); + Notice alreadyDisabled = Notice.chat("✘ Czat jest już wyłączony!"); + Notice alreadyEnabled = Notice.chat("✘ Czat jest już włączony!"); @Comment({" ", "# {SLOWMODE} - Czas powolnego wysyłania wiadomości"}) - public Notice slowModeSet = Notice.chat("► Tryb powolnego wysyłania został ustawiony na {SLOWMODE}"); + Notice slowModeSet = Notice.chat("► Tryb powolnego wysyłania został ustawiony na {SLOWMODE}"); @Comment({" ", "# {PLAYER} - Gracz który wyłączył tryb powolnego wysyłania wiadomości"}) - public Notice slowModeOff = Notice.chat("► Tryb powolnego wysyłania został wyłączony przez {PLAYER}!"); + Notice slowModeOff = Notice.chat("► Tryb powolnego wysyłania został wyłączony przez {PLAYER}!"); @Comment({" ", "# {TIME} - Czas powolnego wysyłania wiadomości"}) - public Notice slowMode = Notice.chat("✘ Następną wiadomość możesz wysłać za: {TIME}!"); + Notice slowMode = Notice.chat("✘ Następną wiadomość możesz wysłać za: {TIME}!"); @Comment(" ") - public Notice disabledChatInfo = Notice.chat("✘ Czat jest obecnie wyłączony!"); + Notice disabledChatInfo = Notice.chat("✘ Czat jest obecnie wyłączony!"); @Comment(" ") - public Notice commandNotFound = Notice.chat("✘ Komenda {COMMAND} nie istnieje!"); + Notice commandNotFound = Notice.chat("✘ Komenda {COMMAND} nie istnieje!"); } @Comment({ @@ -411,63 +411,63 @@ public static class PLInventorySection extends OkaeriConfig implements Inventory @Getter public static class PLPlayerSection extends OkaeriConfig implements PlayerSection { - public Notice feedMessage = Notice.chat("► Zostałeś nakarmiony!"); + Notice feedMessage = Notice.chat("► Zostałeś nakarmiony!"); @Comment(" # {PLAYER} - Gracz który został nakarmiony") - public Notice feedMessageBy = Notice.chat("► Nakarmiłeś gracza {PLAYER}"); + Notice feedMessageBy = Notice.chat("► Nakarmiłeś gracza {PLAYER}"); @Comment(" ") - public Notice healMessage = Notice.chat("► Zostałeś uleczony!"); + Notice healMessage = Notice.chat("► Zostałeś uleczony!"); @Comment("# {PLAYER} - Gracz który został uleczony") - public Notice healMessageBy = Notice.chat("► Uleczyłeś gracza {PLAYER}"); + Notice healMessageBy = Notice.chat("► Uleczyłeś gracza {PLAYER}"); @Comment(" ") - public Notice killSelf = Notice.chat("► Popełniłeś samobójstwo!"); + Notice killSelf = Notice.chat("► Popełniłeś samobójstwo!"); @Comment("# {PLAYER} - Gracz który został zabity") - public Notice killedMessage = Notice.chat("► Zabito gracza {PLAYER}"); + Notice killedMessage = Notice.chat("► Zabito gracza {PLAYER}"); @Comment(" ") - public Notice speedBetweenZeroAndTen = Notice.chat("✘ Ustaw prędkość w zakresie 0-10!"); - public Notice speedTypeNotCorrect = Notice.chat("✘ Nieprawidłowy typ prędkości"); + Notice speedBetweenZeroAndTen = Notice.chat("✘ Ustaw prędkość w zakresie 0-10!"); + Notice speedTypeNotCorrect = Notice.chat("✘ Nieprawidłowy typ prędkości"); @Comment("# {SPEED} - Ustawiona prędkość chodzenia lub latania") - public Notice speedWalkSet = Notice.chat("► Ustawiono prędkość chodzenia na {SPEED}"); - public Notice speedFlySet = Notice.chat("► Ustawiono prędkość latania na {SPEED}"); + Notice speedWalkSet = Notice.chat("► Ustawiono prędkość chodzenia na {SPEED}"); + Notice speedFlySet = Notice.chat("► Ustawiono prędkość latania na {SPEED}"); @Comment("# {PLAYER} - Gracz któremu została ustawiona prędkość chodzenia lub latania, {SPEED} - Ustawiona prędkość") - public Notice speedWalkSetBy = Notice.chat("► Ustawiono prędkość chodzenia gracza {PLAYER} na {SPEED}"); - public Notice speedFlySetBy = Notice.chat("► Ustawiono prędkość latania gracza {PLAYER} na {SPEED}"); + Notice speedWalkSetBy = Notice.chat("► Ustawiono prędkość chodzenia gracza {PLAYER} na {SPEED}"); + Notice speedFlySetBy = Notice.chat("► Ustawiono prędkość latania gracza {PLAYER} na {SPEED}"); @Comment({" ", "# {STATE} - Status nieśmiertelności"}) - public Notice godEnable = Notice.chat("► Tryb nieśmiertelności został {STATE}"); - public Notice godDisable = Notice.chat("► Tryb nieśmiertelności został {STATE}"); + Notice godEnable = Notice.chat("► Tryb nieśmiertelności został {STATE}"); + Notice godDisable = Notice.chat("► Tryb nieśmiertelności został {STATE}"); @Comment("# {PLAYER} - Gracz któremu został ustawiony tryb nieśmiertelności, {STATE} - Status nieśmiertelności") - public Notice godSetEnable = Notice.chat("► Tryb nieśmiertelności dla gracza {PLAYER} został {STATE}"); - public Notice godSetDisable = Notice.chat("► Tryb nieśmiertelności dla gracza {PLAYER} został {STATE}"); + Notice godSetEnable = Notice.chat("► Tryb nieśmiertelności dla gracza {PLAYER} został {STATE}"); + Notice godSetDisable = Notice.chat("► Tryb nieśmiertelności dla gracza {PLAYER} został {STATE}"); @Comment({" ", "# {STATE} - Status latania"}) - public Notice flyEnable = Notice.chat("► Latanie zostało {STATE}"); - public Notice flyDisable = Notice.chat("► Latanie zostało {STATE}"); + Notice flyEnable = Notice.chat("► Latanie zostało {STATE}"); + Notice flyDisable = Notice.chat("► Latanie zostało {STATE}"); @Comment("# {PLAYER} - Gracz któremu zostało ustawione latanie, {STATE} - Status latania") - public Notice flySetEnable = Notice.chat("► Latanie dla gracza {PLAYER} zostało {STATE}"); - public Notice flySetDisable = Notice.chat("► Latanie dla gracza {PLAYER} zostało {STATE}"); + Notice flySetEnable = Notice.chat("► Latanie dla gracza {PLAYER} zostało {STATE}"); + Notice flySetDisable = Notice.chat("► Latanie dla gracza {PLAYER} zostało {STATE}"); @Comment({" ", "# {PING} - Aktualna ilość pingu."}) - public Notice pingMessage = Notice.chat("► Twój ping: {PING}ms"); + Notice pingMessage = Notice.chat("► Twój ping: {PING}ms"); @Comment("# {PLAYER} - Gracz któremu został ustawiony tryb nieśmiertelności, {PING} - Aktualna ilość pingu dla gracza.") - public Notice pingOtherMessage = Notice.chat("► Gracz {PLAYER} ma ping: {PING}ms"); + Notice pingOtherMessage = Notice.chat("► Gracz {PLAYER} ma ping: {PING}ms"); @Comment(" ") - public Notice gameModeNotCorrect = Notice.chat("✘ Niepoprawny typ!"); + Notice gameModeNotCorrect = Notice.chat("✘ Niepoprawny typ!"); @Comment("# {GAMEMODE} - Ustawiony tryb gry") - public Notice gameModeMessage = Notice.chat("► Ustawiono tryb gry na: {GAMEMODE}"); + Notice gameModeMessage = Notice.chat("► Ustawiono tryb gry na: {GAMEMODE}"); @Comment("# {PLAYER} - Gracz któremu został ustawiony tryb gry, {GAMEMODE} - Ustawiony tryb gry dla gracza") - public Notice gameModeSetMessage = Notice.chat("► Ustawiono tryb gry graczowi {PLAYER} na: {GAMEMODE}"); + Notice gameModeSetMessage = Notice.chat("► Ustawiono tryb gry graczowi {PLAYER} na: {GAMEMODE}"); @Comment({" ", "# {ONLINE} - Aktualna ilość graczy online"}) - public Notice onlinePlayersCountMessage = Notice.chat("► Na serwerze jest: {ONLINE} graczy online!"); + Notice onlinePlayersCountMessage = Notice.chat("► Na serwerze jest: {ONLINE} graczy online!"); @Comment("# {ONLINE} - Aktualna ilość graczy online, {PLAYERS} - Lista graczy online") - public Notice onlinePlayersMessage = Notice.chat("► Na serwerze jest: ({ONLINE}): {PLAYERS} "); + Notice onlinePlayersMessage = Notice.chat("► Na serwerze jest: ({ONLINE}): {PLAYERS} "); public List fullServerSlots = List.of( " ", @@ -499,10 +499,10 @@ public static class PLPlayerSection extends OkaeriConfig implements PlayerSectio ); @Comment({" ", "# {KILLED} - Liczba zabitych mobów"}) - public Notice butcherCommand = Notice.chat("► Zabiłeś {KILLED} mobów!"); + Notice butcherCommand = Notice.chat("► Zabiłeś {KILLED} mobów!"); @Comment({" ", "# {SAFE_CHUNKS} - Liczba bezpiecznych chunków"}) - public Notice safeChunksMessage = Notice.chat("✘ Przekroczyłeś liczbę bezpiecznych chunków {SAFE_CHUNKS}"); + Notice safeChunksMessage = Notice.chat("✘ Przekroczyłeś liczbę bezpiecznych chunków {SAFE_CHUNKS}"); } @Comment({" ", "# Ta sekcja odpowiada za zmianę punktu spawn oraz teleportację graczy na spawn"}) @@ -518,23 +518,23 @@ public static class PLPlayerSection extends OkaeriConfig implements PlayerSectio @Getter public static class PLItemSection extends OkaeriConfig implements ItemSection { @Comment({" ", "# {ITEM} - Nazwa otrzymanego itemu"}) - public Notice giveReceived = Notice.chat("► Otrzymałeś: {ITEM}"); + Notice giveReceived = Notice.chat("► Otrzymałeś: {ITEM}"); @Comment({" ", "# {PLAYER} - Osoba której został przydzielony przedmiot, {ITEM} - Nazwa otrzymanego przedmiotu"}) - public Notice giveGiven = Notice.chat("► Gracz {PLAYER} otrzymał: {ITEM}"); + Notice giveGiven = Notice.chat("► Gracz {PLAYER} otrzymał: {ITEM}"); - public Notice giveNoSpace = Notice.chat("✘ Brak miejsca w ekwipunku!"); + Notice giveNoSpace = Notice.chat("✘ Brak miejsca w ekwipunku!"); @Comment(" ") - public Notice giveNotItem = Notice.chat("✘ Podany przedmiot nie istnieje!"); + Notice giveNotItem = Notice.chat("✘ Podany przedmiot nie istnieje!"); @Comment({" ", "# {SKULL} - Nazwa gracza do którego należy głowa"}) - public Notice skullMessage = Notice.chat("► Otrzymałeś głowę gracza: {SKULL}"); + Notice skullMessage = Notice.chat("► Otrzymałeś głowę gracza: {SKULL}"); @Comment(" ") - public Notice enchantedMessage = Notice.chat("► Item w twojej ręce został zaklęty!"); - public Notice enchantedMessageFor = Notice.chat("► Item w ręce gracza {PLAYER} został zaklęty!"); - public Notice enchantedMessageBy = Notice.chat("► Administrator {PLAYER} zaklął twój item!"); + Notice enchantedMessage = Notice.chat("► Item w twojej ręce został zaklęty!"); + Notice enchantedMessageFor = Notice.chat("► Item w ręce gracza {PLAYER} został zaklęty!"); + Notice enchantedMessageBy = Notice.chat("► Administrator {PLAYER} zaklął twój item!"); } @Comment({ " ", diff --git a/gradlew b/gradlew index adff685a0..8057ad57e 100644 --- a/gradlew +++ b/gradlew @@ -4,7 +4,7 @@ # Copyright © 2015 the original authors. # # Licensed under the Apache License, Version 2.0 (the "License"); -# you may not use this file except in compliance with the License. +# you may not use this file except in comENiance with the License. # You may obtain a copy of the License at # # https://www.apache.org/licenses/LICENSE-2.0 From aecd51423bf34d44f8e5e8e514295e3783cce867 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jakub=20K=C4=99dziora?= <77227023+Jakubk15@users.noreply.github.com> Date: Tue, 7 Oct 2025 07:22:50 +0200 Subject: [PATCH 2/2] Update gradlew Co-authored-by: gemini-code-assist[bot] <176961590+gemini-code-assist[bot]@users.noreply.github.com> --- gradlew | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/gradlew b/gradlew index 8057ad57e..adff685a0 100644 --- a/gradlew +++ b/gradlew @@ -4,7 +4,7 @@ # Copyright © 2015 the original authors. # # Licensed under the Apache License, Version 2.0 (the "License"); -# you may not use this file except in comENiance with the License. +# you may not use this file except in compliance with the License. # You may obtain a copy of the License at # # https://www.apache.org/licenses/LICENSE-2.0