Notice`s package-private #1197
+456
−514
There are no files selected for viewing
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
|
|
@@ -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") | ||
| Notice burnedSelf = Notice.chat("<green>► <white>You have been set on fire for <green>{TICKS}<white> ticks!"); | ||
|
|
||
| @Comment(" ") | ||
| Notice burnedOther = Notice.chat("<green>► {PLAYER} <white>has been set on fire for <green>{TICKS} <white>ticks!"); | ||
| } | ||
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
|
|
@@ -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, | ||
| 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); | ||
| } | ||
| } | ||
| } | ||
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
|
|
@@ -10,7 +10,7 @@ | |
| @Accessors(fluent = true) | ||
| public class ENClearMessages extends OkaeriConfig implements ClearMessages { | ||
|
|
||
| Notice inventoryCleared = Notice.chat("<green>► <white>Your inventory has been cleared"); | ||
| Notice targetInventoryCleared = Notice.chat("<green>► <white>Player inventory: <green>{PLAYER} <white>has been cleared"); | ||
|
|
||
| } | ||
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
|
|
@@ -9,30 +9,30 @@ | |
| @Accessors(fluent = true) | ||
| public class ENContainerMessages extends OkaeriConfig implements ContainerMessages { | ||
|
|
||
| Notice anvilOpened = Notice.chat("<green>► <white>Anvil opened!"); | ||
| Notice targetAnvilOpened = Notice.chat("<green>► <white>Opened an anvil for {PLAYER}!"); | ||
|
|
||
| Notice cartographyOpened = Notice.chat("<green>► <white>Cartography table opened!"); | ||
| Notice targetCartographyOpened = Notice.chat("<green>► <white>Opened a cartography table for {PLAYER}!"); | ||
|
|
||
| Notice disposalOpened = Notice.chat("<green>► <white>Disposal opened!"); | ||
| Notice targetDisposalOpened = Notice.chat("<green>► <white>Opened a disposal for {PLAYER}!"); | ||
|
|
||
| Notice enderchestOpened = Notice.chat("<green>► <white>Ender chest opened!"); | ||
| Notice targetEnderchestOpened = Notice.chat("<green>► <white>Opened an ender chest for {PLAYER}!"); | ||
|
|
||
| Notice grindstoneOpened = Notice.chat("<green>► <white>Grindstone opened!"); | ||
| Notice targetGrindstoneOpened = Notice.chat("<green>► <white>Opened a grindstone for {PLAYER}!"); | ||
|
|
||
| Notice loomOpened = Notice.chat("<green>► <white>Loom opened!"); | ||
| Notice targetLoomOpened = Notice.chat("<green>► <white>Opened a loom for {PLAYER}!"); | ||
|
|
||
| Notice smithingOpened = Notice.chat("<green>► <white>Smithing table opened!"); | ||
| Notice targetSmithingOpened = Notice.chat("<green>► <white>Opened a smithing table for {PLAYER}!"); | ||
|
|
||
| Notice stonecutterOpened = Notice.chat("<green>► <white>Stonecutter opened!"); | ||
| Notice targetStonecutterOpened = Notice.chat("<green>► <white>Opened a stonecutter for {PLAYER}!"); | ||
|
|
||
| Notice workbenchOpened = Notice.chat("<green>► <white>Workbench opened!"); | ||
| Notice targetWorkbenchOpened = Notice.chat("<green>► <white>Opened a workbench for {PLAYER}!"); | ||
| } | ||
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
|
|
@@ -9,19 +9,19 @@ | |
| @Accessors(fluent = true) | ||
| public class ENFreezeMessages extends OkaeriConfig implements FreezeMessages { | ||
|
|
||
| Notice frozenSelf = Notice.chat("<green>► <white>You have frozen yourself for <green>{DURATION}</green>!</white>"); | ||
|
|
||
| Notice unfrozenSelf = Notice.chat("<green>► <white>You have unfrozen yourself!</white>"); | ||
|
|
||
| Notice frozenOther = Notice.chat("<green>► <white>You have frozen player <green>{PLAYER}</green> for <green>{DURATION}</green>!</white>"); | ||
|
|
||
| Notice unfrozenOther = Notice.chat("<green>► <white>You have unfrozen player <green>{PLAYER}</green>!</white>"); | ||
|
|
||
| Notice frozenByOther = Notice.chat("<green>► <white>You have been frozen by player <green>{PLAYER}</green> for <green>{DURATION}</green>!</white>"); | ||
|
|
||
| Notice unfrozenByOther = Notice.chat("<green>► <white>You have been unfrozen by player <green>{PLAYER}</green>!</white>"); | ||
|
|
||
| Notice selfNotFrozen = Notice.chat("<red>► <dark_red>You are not frozen!</dark_red>"); | ||
|
|
||
| Notice otherNotFrozen = Notice.chat("<red>► <dark_red>Player <red>{PLAYER}</red> is not frozen!</dark_red>"); | ||
| } | ||
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
|
|
@@ -10,6 +10,6 @@ | |
|
|
||
| public class ENDemoScreenMessages extends OkaeriConfig implements DemoScreenMessages { | ||
|
|
||
| Notice shownToSelf = Notice.chat("<green>► <white>You have shown the demo screen to yourself!"); | ||
| Notice shownToOtherPlayer = Notice.chat("<green>► <white>You have shown the demo screen to player <green>{PLAYER}!"); | ||
| } | ||
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
|
|
@@ -9,8 +9,8 @@ | |
| @Accessors(fluent = true) | ||
| public class ENElderGuardianMessages extends OkaeriConfig implements ElderGuardianMessages { | ||
|
|
||
| Notice elderGuardianShown = | ||
| Notice.chat("<green>► <white>Shown elder guardian to player <green>{PLAYER}<white>!"); | ||
| Notice elderGuardianShownSilently = | ||
| Notice.chat("<green>► <white>Shown elder guardian to player <green>{PLAYER}<white> silently!"); | ||
| } | ||
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
|
|
@@ -11,8 +11,8 @@ | |
|
|
||
| public class ENEndScreenMessages extends OkaeriConfig implements EndScreenMessages { | ||
|
|
||
| Notice shownToSelf = Notice.chat("<green>► <white>You have shown the end screen to yourself!</white>"); | ||
|
|
||
| @Comment("# {PLAYER} - returns player's name") | ||
| Notice shownToOtherPlayer = Notice.chat("<green>► <white>You have shown the end screen to player <green>{PLAYER}!</green>"); | ||
| } | ||
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
|
|
@@ -10,10 +10,10 @@ | |
| @Accessors(fluent = true) | ||
| public class ENHelpOpMessages extends OkaeriConfig implements HelpOpSection { | ||
| @Comment("# {PLAYER} - Player who send message on /helpop, {TEXT} - message") | ||
| Notice format = | ||
| Notice.chat("<dark_gray>[<dark_red>HelpOp<dark_gray>] <yellow>{PLAYER}<dark_gray>: <white>{TEXT}"); | ||
| @Comment(" ") | ||
| Notice send = Notice.chat("<green>► <white>This message has been successfully sent to administration"); | ||
| @Comment("# {TIME} - Time to next use (cooldown)") | ||
| Notice helpOpDelay = Notice.chat("<gold>✘ <red>You can use this command for: <gold>{TIME}"); | ||
| } | ||
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
|
|
@@ -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"}) | ||
| Notice format = | ||
| Notice.chat("<dark_gray>[<dark_red>HelpOp<dark_gray>] <yellow>{PLAYER}<white>: <white>{TEXT}"); | ||
| @Comment(" ") | ||
| Notice send = Notice.chat("<green>► <white>Wiadomość została wysłana do administracji"); | ||
| @Comment("# {TIME} - Czas do końca blokady (cooldown)") | ||
| Notice helpOpDelay = Notice.chat("<white>► <red>Możesz użyć tej komendy dopiero za <gold>{TIME}!"); | ||
| } | ||
Oops, something went wrong.
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
te zmiany na pewno są do tego PR?
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
jeszcze widzę parę usuniętych plików
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
oj przez przypadek się połączyły poprawie to ;)