Skip to content

Commit 1c9b895

Browse files
vLuckyyygemini-code-assist[bot]Jakubk15
authored
GH-1232 Move chat-related messages to dedicated config section and adjust translations and controllers accordingly (#1232)
* Move chat-related messages to dedicated config section and adjust translations and controllers accordingly * Update eternalcore-core/src/main/java/com/eternalcode/core/feature/chat/ChatSlowModeController.java Co-authored-by: gemini-code-assist[bot] <176961590+gemini-code-assist[bot]@users.noreply.github.com> * Update eternalcore-core/src/main/java/com/eternalcode/core/feature/chat/messages/PLChatMessages.java Co-authored-by: Jakub Kędziora <[email protected]> * Update eternalcore-core/src/main/java/com/eternalcode/core/feature/chat/messages/ENChatMessages.java Co-authored-by: Jakub Kędziora <[email protected]> --------- Co-authored-by: gemini-code-assist[bot] <176961590+gemini-code-assist[bot]@users.noreply.github.com> Co-authored-by: Jakub Kędziora <[email protected]>
1 parent 9b2fcc3 commit 1c9b895

File tree

11 files changed

+143
-97
lines changed

11 files changed

+143
-97
lines changed

‎eternalcore-core/src/main/java/com/eternalcode/core/configuration/migrations/Migration_0034_Move_chat_settings_messages_to_dedicated_section.java‎

Lines changed: 25 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,25 @@
1+
package com.eternalcode.core.configuration.migrations;
2+
3+
import static eu.okaeri.configs.migrate.ConfigMigrationDsl.move;
4+
5+
import eu.okaeri.configs.migrate.builtin.NamedMigration;
6+
7+
public class Migration_0034_Move_chat_settings_messages_to_dedicated_section extends NamedMigration {
8+
Migration_0034_Move_chat_settings_messages_to_dedicated_section() {
9+
super(
10+
"Move chat settings messages to dedicated section",
11+
12+
move("chat.disabled", "chat.chatDisabled"),
13+
move("chat.enabled", "chat.chatEnabled"),
14+
move("chat.cleared", "chat.chatCleared"),
15+
16+
move("chat.alreadyDisabled", "chat.chatAlreadyDisabled"),
17+
move("chat.alreadyEnabled", "chat.chatAlreadyEnabled"),
18+
19+
move("chat.slowModeOff", "chat.slowModeDisabled"),
20+
move("chat.slowMode", "chat.slowModeNotReady"),
21+
22+
move("chat.disabledChatInfo", "chat.chatDisabledInfo")
23+
);
24+
}
25+
}

‎eternalcore-core/src/main/java/com/eternalcode/core/configuration/migrations/Migrations.java‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -35,5 +35,6 @@ public class Migrations {
3535
new Migration_0031_Move_death_messages_to_dedicated_section(),
3636
new Migration_0032_Move_join_quit_messages_to_dedicated_section(),
3737
new Migration_0033_Move_disposal_messages_to_dedicated_section(),
38+
new Migration_0034_Move_chat_settings_messages_to_dedicated_section(),
3839
};
3940
}

‎eternalcore-core/src/main/java/com/eternalcode/core/feature/chat/ChatCommand.java‎

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -71,7 +71,7 @@ void clear(@Sender CommandSender sender) {
7171
});
7272

7373
this.noticeService.create()
74-
.notice(translation -> translation.chat().cleared())
74+
.notice(translation -> translation.chat().chatCleared())
7575
.placeholder("{PLAYER}", sender.getName())
7676
.onlinePlayers()
7777
.send();
@@ -81,7 +81,7 @@ void clear(@Sender CommandSender sender) {
8181
@DescriptionDocs(description = "Enables chat")
8282
void enable(@Sender Viewer viewer, @Sender CommandSender sender) {
8383
if (this.chatSettings.chatEnabled()) {
84-
this.noticeService.viewer(viewer, translation -> translation.chat().alreadyEnabled());
84+
this.noticeService.viewer(viewer, translation -> translation.chat().chatAlreadyEnabled());
8585
return;
8686
}
8787

@@ -94,7 +94,7 @@ void enable(@Sender Viewer viewer, @Sender CommandSender sender) {
9494
this.chatSettings.chatEnabled(true);
9595

9696
this.noticeService.create()
97-
.notice(translation -> translation.chat().enabled())
97+
.notice(translation -> translation.chat().chatEnabled())
9898
.placeholder("{PLAYER}", sender.getName())
9999
.onlinePlayers()
100100
.send();
@@ -104,7 +104,7 @@ void enable(@Sender Viewer viewer, @Sender CommandSender sender) {
104104
@DescriptionDocs(description = "Disables chat")
105105
void disable(@Sender Viewer viewer, @Sender CommandSender sender) {
106106
if (!this.chatSettings.chatEnabled()) {
107-
this.noticeService.viewer(viewer, translation -> translation.chat().alreadyDisabled());
107+
this.noticeService.viewer(viewer, translation -> translation.chat().chatAlreadyDisabled());
108108
return;
109109
}
110110

@@ -117,7 +117,7 @@ void disable(@Sender Viewer viewer, @Sender CommandSender sender) {
117117
this.chatSettings.chatEnabled(false);
118118

119119
this.noticeService.create()
120-
.notice(translation -> translation.chat().disabled())
120+
.notice(translation -> translation.chat().chatDisabled())
121121
.placeholder("{PLAYER}", sender.getName())
122122
.onlinePlayers()
123123
.send();
@@ -144,7 +144,7 @@ void slowmode(@Sender Viewer viewer, @Arg Duration duration) {
144144

145145
if (duration.isZero()) {
146146
this.noticeService.create()
147-
.notice(translation -> translation.chat().slowModeOff())
147+
.notice(translation -> translation.chat().slowModeDisabled())
148148
.placeholder("{PLAYER}", viewer.getName())
149149
.onlinePlayers()
150150
.send();

‎eternalcore-core/src/main/java/com/eternalcode/core/feature/chat/ChatManagerController.java‎ renamed to ‎eternalcore-core/src/main/java/com/eternalcode/core/feature/chat/ChatSlowModeController.java‎

Lines changed: 10 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
package com.eternalcode.core.feature.chat;
22

3-
import static com.eternalcode.core.feature.chat.ChatManagerController.CHAT_BYPASS_PERMISSION;
4-
import static com.eternalcode.core.feature.chat.ChatManagerController.CHAT_SLOWMODE_BYPASS_PERMISSION;
3+
import static com.eternalcode.core.feature.chat.ChatSlowModeController.CHAT_BYPASS_PERMISSION;
4+
import static com.eternalcode.core.feature.chat.ChatSlowModeController.CHAT_SLOWMODE_BYPASS_PERMISSION;
55

66
import com.eternalcode.annotations.scan.permission.PermissionDocs;
77
import com.eternalcode.core.event.EventCaller;
@@ -22,10 +22,10 @@
2222
@PermissionDocs(
2323
name = "Bypass chat slowmode or disabled chat",
2424
description = "Allows you to bypass chat restrictions such as slowmode or disabled chat.",
25-
permission = { CHAT_SLOWMODE_BYPASS_PERMISSION, CHAT_BYPASS_PERMISSION }
25+
permission = {CHAT_SLOWMODE_BYPASS_PERMISSION, CHAT_BYPASS_PERMISSION}
2626
)
2727
@Controller
28-
class ChatManagerController implements Listener {
28+
class ChatSlowModeController implements Listener {
2929

3030
static final String CHAT_SLOWMODE_BYPASS_PERMISSION = "eternalcore.chat.noslowmode";
3131
static final String CHAT_BYPASS_PERMISSION = "eternalcore.chat.bypass";
@@ -36,7 +36,7 @@ class ChatManagerController implements Listener {
3636
private final EventCaller eventCaller;
3737

3838
@Inject
39-
ChatManagerController(
39+
ChatSlowModeController(
4040
ChatService chatService,
4141
ChatSettings chatSettings,
4242
NoticeService noticeService,
@@ -56,11 +56,12 @@ void onChatSlowMode(AsyncPlayerChatEvent event) {
5656

5757
if (!this.chatSettings.chatEnabled() && !player.hasPermission(CHAT_BYPASS_PERMISSION)) {
5858
this.noticeService.create()
59-
.notice(translation -> translation.chat().disabledChatInfo())
59+
.notice(translation -> translation.chat().chatDisabledInfo())
6060
.player(uniqueId)
6161
.send();
6262

63-
ChatRestrictEvent chatRestrictEvent = this.eventCaller.callEvent(new ChatRestrictEvent(uniqueId, ChatRestrictCause.CHAT_DISABLED));
63+
ChatRestrictEvent chatRestrictEvent =
64+
this.eventCaller.callEvent(new ChatRestrictEvent(uniqueId, ChatRestrictCause.CHAT_DISABLED));
6465

6566
if (!chatRestrictEvent.isCancelled()) {
6667
event.setCancelled(true);
@@ -74,10 +75,9 @@ void onChatSlowMode(AsyncPlayerChatEvent event) {
7475
if (!chatRestrictEvent.isCancelled()) {
7576
Duration remainingDuration = this.chatService.getRemainingSlowDown(uniqueId);
7677

77-
this.noticeService
78-
.create()
78+
this.noticeService.create()
7979
.player(uniqueId)
80-
.notice(translation -> translation.chat().slowMode())
80+
.notice(translation -> translation.chat().slowModeNotReady())
8181
.placeholder("{TIME}", DurationUtil.format(remainingDuration, true))
8282
.send();
8383

‎eternalcore-core/src/main/java/com/eternalcode/core/feature/unknowncommand/UnknownCommandMessageController.java‎ renamed to ‎eternalcore-core/src/main/java/com/eternalcode/core/feature/chat/ChatUnknownCommandController.java‎

Lines changed: 4 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,6 @@
1-
package com.eternalcode.core.feature.unknowncommand;
1+
package com.eternalcode.core.feature.chat;
22

33
import com.eternalcode.annotations.scan.permission.PermissionDocs;
4-
import com.eternalcode.core.feature.chat.ChatSettings;
54
import com.eternalcode.core.injector.annotations.Inject;
65
import com.eternalcode.core.injector.annotations.component.Controller;
76
import com.eternalcode.core.notice.NoticeService;
@@ -15,10 +14,10 @@
1514
@PermissionDocs(
1615
name = "Bypass Unknown Command Message",
1716
description = "Bypass replaced unknown command message, and keep the original message.",
18-
permission = UnknownCommandMessageController.COMMANDBLOCKER_BYPASS
17+
permission = ChatUnknownCommandController.COMMANDBLOCKER_BYPASS
1918
)
2019
@Controller
21-
class UnknownCommandMessageController implements Listener {
20+
class ChatUnknownCommandController implements Listener {
2221

2322
static final String COMMANDBLOCKER_BYPASS = "eternalcore.commandblocker.bypass";
2423

@@ -27,7 +26,7 @@ class UnknownCommandMessageController implements Listener {
2726
private final Server server;
2827

2928
@Inject
30-
UnknownCommandMessageController(
29+
ChatUnknownCommandController(
3130
NoticeService noticeService,
3231
ChatSettings chatSettings,
3332
Server server

‎eternalcore-core/src/main/java/com/eternalcode/core/feature/chat/messages/ChatMessages.java‎

Lines changed: 21 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,21 @@
1+
package com.eternalcode.core.feature.chat.messages;
2+
3+
import com.eternalcode.multification.notice.Notice;
4+
5+
public interface ChatMessages {
6+
7+
Notice chatDisabled();
8+
Notice chatEnabled();
9+
Notice chatCleared();
10+
11+
Notice chatAlreadyDisabled();
12+
Notice chatAlreadyEnabled();
13+
14+
Notice slowModeSet();
15+
Notice slowModeDisabled();
16+
Notice slowModeNotReady();
17+
18+
Notice chatDisabledInfo();
19+
20+
Notice commandNotFound();
21+
}

‎eternalcore-core/src/main/java/com/eternalcode/core/feature/chat/messages/ENChatMessages.java‎

Lines changed: 33 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,33 @@
1+
package com.eternalcode.core.feature.chat.messages;
2+
3+
import com.eternalcode.multification.notice.Notice;
4+
import eu.okaeri.configs.OkaeriConfig;
5+
import eu.okaeri.configs.annotation.Comment;
6+
import lombok.Getter;
7+
import lombok.experimental.Accessors;
8+
9+
@Getter
10+
@Accessors(fluent = true)
11+
public class ENChatMessages extends OkaeriConfig implements ChatMessages {
12+
Notice chatDisabled = Notice.chat("<green>► <white>Chat has been disabled by <green>{PLAYER}<white>!");
13+
Notice chatEnabled = Notice.chat("<green>► <white>Chat has been enabled by <green>{PLAYER}<white>!");
14+
Notice chatCleared = Notice.chat("<green>► <white>Chat has been cleared by <green>{PLAYER}<white>!");
15+
16+
@Comment
17+
Notice chatAlreadyDisabled = Notice.chat("<red>✘ <dark_red>Chat is already disabled!");
18+
Notice chatAlreadyEnabled = Notice.chat("<red>✘ <dark_red>Chat is already enabled!");
19+
20+
@Comment
21+
Notice slowModeSet = Notice.chat("<green>► <white>Slow mode has been set to {SLOWMODE}");
22+
Notice slowModeDisabled = Notice.chat("<green>► <white>Slow mode has been disabled by <green>{PLAYER}<white>!");
23+
24+
@Comment({" ", "# {TIME} - Slow mode time"})
25+
Notice slowModeNotReady = Notice.chat("<red>✘ <dark_red>You can send the next message in <red>{TIME}<dark_red>!");
26+
27+
@Comment
28+
Notice chatDisabledInfo = Notice.chat("<red>✘ <dark_red>Chat is currently disabled!");
29+
30+
@Comment
31+
Notice commandNotFound = Notice.chat("<red>✘ <dark_red>Command <red>{COMMAND} <dark_red>does not exist!");
32+
33+
}

‎eternalcore-core/src/main/java/com/eternalcode/core/feature/chat/messages/PLChatMessages.java‎

Lines changed: 31 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,31 @@
1+
package com.eternalcode.core.feature.chat.messages;
2+
3+
import com.eternalcode.multification.notice.Notice;
4+
import eu.okaeri.configs.OkaeriConfig;
5+
import eu.okaeri.configs.annotation.Comment;
6+
import lombok.Getter;
7+
import lombok.experimental.Accessors;
8+
9+
@Getter
10+
@Accessors(fluent = true)
11+
public class PLChatMessages extends OkaeriConfig implements ChatMessages {
12+
Notice chatDisabled = Notice.chat("<green>► <white>Czat został wyłączony przez <green>{PLAYER}<white>!");
13+
Notice chatEnabled = Notice.chat("<green>► <white>Czat został włączony przez <green>{PLAYER}<white>!");
14+
Notice chatCleared = Notice.chat("<green>► <white>Czat został wyczyszczony przez <green>{PLAYER}<white>!");
15+
16+
@Comment
17+
Notice chatAlreadyDisabled = Notice.chat("<red>✘ <dark_red>Czat jest już wyłączony!");
18+
Notice chatAlreadyEnabled = Notice.chat("<red>✘ <dark_red>Czat jest już włączony!");
19+
20+
@Comment
21+
Notice slowModeSet = Notice.chat("<green>► <white>Tryb powolnego wysyłania został ustawiony na {SLOWMODE}");
22+
Notice slowModeDisabled = Notice.chat("<green>► <white>Tryb powolnego wysyłania został wyłączony przez <green>{PLAYER}<white>!");
23+
@Comment({" ", "# {TIME} - Czas powolnego wysyłania wiadomości"})
24+
Notice slowModeNotReady = Notice.chat("<red>✘ <dark_red>Następną wiadomość możesz wysłać za <red>{TIME}<dark_red>!");
25+
26+
@Comment
27+
Notice chatDisabledInfo = Notice.chat("<red>✘ <dark_red>Czat jest obecnie wyłączony!");
28+
29+
@Comment
30+
Notice commandNotFound = Notice.chat("<red>✘ <dark_red>Komenda <red>{COMMAND} <dark_red>nie istnieje!");
31+
}

‎eternalcore-core/src/main/java/com/eternalcode/core/translation/Translation.java‎

Lines changed: 3 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -6,6 +6,7 @@
66
import com.eternalcode.core.feature.broadcast.messages.BroadcastMessages;
77
import com.eternalcode.core.feature.burn.messages.BurnMessages;
88
import com.eternalcode.core.feature.butcher.messages.ButcherMessages;
9+
import com.eternalcode.core.feature.chat.messages.ChatMessages;
910
import com.eternalcode.core.feature.clear.messages.ClearMessages;
1011
import com.eternalcode.core.feature.container.messages.ContainerMessages;
1112
import com.eternalcode.core.feature.deathmessage.messages.DeathMessages;
@@ -86,18 +87,8 @@ interface TeleportSection {
8687
Notice lastLocationNoExist();
8788
}
8889

89-
interface ChatSection {
90-
Notice disabled();
91-
Notice enabled();
92-
Notice cleared();
93-
Notice alreadyDisabled();
94-
Notice alreadyEnabled();
95-
Notice slowModeSet();
96-
Notice slowModeOff();
97-
Notice slowMode();
98-
Notice disabledChatInfo();
99-
Notice commandNotFound();
100-
}
90+
91+
ChatMessages chat();
10192

10293
DisposalMessages disposal();
10394

@@ -171,8 +162,6 @@ interface ChatSection {
171162
TeleportToRandomPlayerMessages teleportToRandomPlayer();
172163
// Random Teleport Section
173164
RandomTeleportMessages randomTeleport();
174-
// Chat Section
175-
ChatSection chat();
176165
// Broadcast Section
177166
BroadcastMessages broadcast();
178167
// Warp Section

‎eternalcore-core/src/main/java/com/eternalcode/core/translation/implementation/ENTranslation.java‎

Lines changed: 6 additions & 31 deletions
Original file line numberDiff line numberDiff line change
@@ -6,6 +6,7 @@
66
import com.eternalcode.core.feature.broadcast.messages.ENBroadcastMessages;
77
import com.eternalcode.core.feature.burn.messages.ENBurnMessages;
88
import com.eternalcode.core.feature.butcher.messages.ENButcherMessages;
9+
import com.eternalcode.core.feature.chat.messages.ENChatMessages;
910
import com.eternalcode.core.feature.clear.messages.ENClearMessages;
1011
import com.eternalcode.core.feature.container.messages.ENContainerMessages;
1112
import com.eternalcode.core.feature.deathmessage.messages.ENDeathMessages;
@@ -259,37 +260,11 @@ public static class ENTeleportSection extends OkaeriConfig implements TeleportSe
259260
})
260261
public ENRandomTeleportMessages randomTeleport = new ENRandomTeleportMessages();
261262

262-
public ENChatSection chat = new ENChatSection();
263-
264-
@Getter
265-
public static class ENChatSection extends OkaeriConfig implements ChatSection {
266-
@Comment({"# {PLAYER} - Player who performed the actions for the chat"})
267-
Notice disabled = Notice.chat("<green>► <white>Chat has been disabled by <green>{PLAYER}<white>!");
268-
Notice enabled = Notice.chat("<green>► <white>The chat has been enabled by <green>{PLAYER}<white>!");
269-
Notice cleared = Notice.chat("<green>► <white>Chat has been cleared by <green>{PLAYER}<white>!");
270-
271-
@Comment(" ")
272-
Notice alreadyDisabled = Notice.chat("<red>✘ <dark_red>Chat already off!");
273-
Notice alreadyEnabled = Notice.chat("<red>✘ <dark_red>Chat already on!");
274-
275-
@Comment({" ", "# {SLOWMODE} - Time for next message"})
276-
Notice slowModeSet = Notice.chat("<green>► <white>SlowMode set to: {SLOWMODE}");
277-
278-
@Comment({" ", "# {PLAYER} - Player who performed the actions for the chat"})
279-
Notice slowModeOff =
280-
Notice.chat("<green>► <white>SlowMode has been disabled by <green>{PLAYER}<white>!");
281-
282-
@Comment({" ", "# {TIME} - Time to next use (cooldown)"})
283-
Notice slowMode =
284-
Notice.chat("<red>✘ <dark_red>You can write the next message for: <red>{TIME}<dark_red>!");
285-
286-
@Comment(" ")
287-
Notice disabledChatInfo = Notice.chat("<red>✘ <dark_red>Chat is currently disabled!");
288-
289-
@Comment(" ")
290-
Notice commandNotFound =
291-
Notice.chat("<red>✘ <dark_red>Command <red>{COMMAND} <dark_red>doesn't exists!");
292-
}
263+
@Comment({
264+
" ",
265+
"# This section is responsible for messages related to chat",
266+
})
267+
public ENChatMessages chat = new ENChatMessages();
293268

294269
@Comment({
295270
" ",

0 commit comments

Comments
 (0)