Skip to content

Commit cb24876

Browse files
Jakubk15vLuckyyygemini-code-assist[bot]
authored
GH-1236 Standarize plugin theme (#1238)
* GH01236 wip * Replace green prefixes with purple ones * Standarize theme. * Update color codes for enable/disable translations in EN and PL formats. * Update eternalcore-core/src/main/java/com/eternalcode/core/litecommand/argument/messages/PLArgumentMessages.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/litecommand/argument/messages/ENArgumentMessages.java Co-authored-by: gemini-code-assist[bot] <176961590+gemini-code-assist[bot]@users.noreply.github.com> * Remove unnecessary empty comment lines from EN and PL AutoMessageMessages classes. --------- Co-authored-by: Martin Sulikowski <[email protected]> Co-authored-by: gemini-code-assist[bot] <176961590+gemini-code-assist[bot]@users.noreply.github.com>
1 parent 80bdcf5 commit cb24876

File tree

111 files changed

+934
-964
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

111 files changed

+934
-964
lines changed

‎eternalcore-core/src/main/java/com/eternalcode/core/EternalCoreCommand.java‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,8 @@
2020
@Permission("eternalcore.eternalcore")
2121
class EternalCoreCommand {
2222

23-
private static final String RELOAD_MESSAGE = "<b><gradient:#29fbff:#38b3ff>EternalCore:</gradient></b> <green>Configuration has ben successfully reloaded in %d ms.</green>";
23+
private static final String RELOAD_MESSAGE = "<b><gradient:#29fbff:#38b3ff>EternalCore:</gradient></b> "
24+
+ "<color:#9d6eef>Configuration has been successfully reloaded in %d ms.</color:#9d6eef>";
2425

2526
private final ConfigurationManager configurationManager;
2627
private final MiniMessage miniMessage;

‎eternalcore-core/src/main/java/com/eternalcode/core/feature/adminchat/messages/ENAdminChatMessages.java‎

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -10,12 +10,12 @@
1010
@Accessors(fluent = true)
1111
public class ENAdminChatMessages extends OkaeriConfig implements AdminChatMessages {
1212

13-
@Comment({"# {PLAYER} - Player who sent message on adminchat, {TEXT} - message"})
14-
Notice format = Notice.chat("<dark_gray>[<dark_red>AdminChat<dark_gray>] <red>{PLAYER}<dark_gray>: <white>{TEXT}");
13+
@Comment("# {PLAYER} - player name, {TEXT} - message content")
14+
Notice format = Notice.chat("<dark_gray>[<color:#9d6eef>Admin<dark_gray>] <gradient:#9d6eef:#A1AAFF>{PLAYER}</gradient><dark_gray>: <white>{TEXT}");
1515

16-
Notice enabled = Notice.chat("<green>► <white>Enabled persistent admin chat!");
16+
Notice enabled = Notice.chat("<color:#9d6eef>► <white>Enabled persistent admin chat!");
1717

18-
Notice disabled = Notice.chat("<green>► <white>Disabled persistent admin chat!");
18+
Notice disabled = Notice.chat("<color:#9d6eef>► <white>Disabled persistent admin chat!");
1919

20-
Notice enabledReminder = Notice.actionbar("<green>AdminChat channel is enabled!");
20+
Notice enabledReminder = Notice.actionbar("<color:#9d6eef>AdminChat channel is enabled!");
2121
}

‎eternalcore-core/src/main/java/com/eternalcode/core/feature/adminchat/messages/PLAdminChatMessages.java‎

Lines changed: 6 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -10,12 +10,13 @@
1010
@Accessors(fluent = true)
1111
public class PLAdminChatMessages extends OkaeriConfig implements AdminChatMessages {
1212

13-
@Comment({"# {PLAYER} - Gracz który wysłał wiadomość na czacie administracji, {TEXT} - Treść wysłanej wiadomości"})
14-
Notice format = Notice.chat("<dark_gray>[<dark_red>Administracja<dark_gray>] <red>{PLAYER}<dark_gray>: <white>{TEXT}");
13+
@Comment("# {PLAYER} - nazwa gracza, {TEXT} - treść wiadomości")
14+
Notice format = Notice.chat(
15+
"<dark_gray>[<color:#9d6eef>Admin<dark_gray>] <gradient:#9d6eef:#A1AAFF>{PLAYER}</gradient><dark_gray>: <white>{TEXT}");
1516

16-
Notice enabled = Notice.chat("<green>► <white>Włączono trwały czat administracji!");
17+
Notice enabled = Notice.chat("<color:#9d6eef>► <white>Włączono trwały czat administracji!");
1718

18-
Notice disabled = Notice.chat("<green>► <white>Wyłączono trwały czat administracji!");
19+
Notice disabled = Notice.chat("<color:#9d6eef>► <white>Wyłączono trwały czat administracji!");
1920

20-
Notice enabledReminder = Notice.actionbar("<green> Trwały czat administracji jest włączony!");
21+
Notice enabledReminder = Notice.actionbar("<color:#9d6eef>Trwały czat administracji jest włączony!");
2122
}

‎eternalcore-core/src/main/java/com/eternalcode/core/feature/afk/messages/ENAfkMessages.java‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -11,8 +11,8 @@
1111
public class ENAfkMessages extends OkaeriConfig implements AfkMessages {
1212

1313
@Comment("# {PLAYER} - Player who is in AFK")
14-
Notice afkOn = Notice.chat("<green>► <white>{PLAYER} is AFK!");
15-
Notice afkOff = Notice.chat("<green>► <white>{PLAYER} is no more AFK!");
14+
Notice afkOn = Notice.chat("<color:#9d6eef>► <white>{PLAYER} is AFK!");
15+
Notice afkOff = Notice.chat("<color:#9d6eef>► <white>{PLAYER} is no more AFK!");
1616

1717
@Comment({" ", "# {TIME} - Time after the player can execute the command."})
1818
Notice afkDelay = Notice.chat("<red>► <dark_red>You can use this command only after <red>{TIME}!");

‎eternalcore-core/src/main/java/com/eternalcode/core/feature/afk/messages/PLAfkMessages.java‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -2,19 +2,19 @@
22

33
import com.eternalcode.multification.notice.Notice;
44
import eu.okaeri.configs.OkaeriConfig;
5-
import lombok.Getter;
65
import eu.okaeri.configs.annotation.Comment;
6+
import lombok.Getter;
77
import lombok.experimental.Accessors;
88

99
@Getter
1010
@Accessors(fluent = true)
1111
public class PLAfkMessages extends OkaeriConfig implements AfkMessages {
1212

1313
@Comment("# {PLAYER} - Gracz ")
14-
Notice afkOn = Notice.chat("<green>► <white>{PLAYER} jest AFK!");
14+
Notice afkOn = Notice.chat("<color:#9d6eef>► <white>{PLAYER} jest AFK!");
1515

1616
@Comment("# {PLAYER} - Gracz ")
17-
Notice afkOff = Notice.chat("<green>► <white>{PLAYER} już nie jest AFK!");
17+
Notice afkOff = Notice.chat("<color:#9d6eef>► <white>{PLAYER} już nie jest AFK!");
1818

1919
@Comment({" ", "# {TIME} - Czas po którym gracz może użyć komendy"})
2020
Notice afkDelay = Notice.chat("<red>► <dark_red>Możesz użyć tej komendy dopiero po <dark_red>{TIME}!");

‎eternalcore-core/src/main/java/com/eternalcode/core/feature/automessage/messages/ENAutoMessageMessages.java‎

Lines changed: 17 additions & 19 deletions
Original file line numberDiff line numberDiff line change
@@ -15,27 +15,25 @@
1515
public class ENAutoMessageMessages extends OkaeriConfig implements AutoMessageMessages {
1616

1717
@Comment({
18-
"",
19-
"# If you want to use placeholder %server_online% you need to install",
20-
"# PlaceholderAPI plugin and download placeholders for Server",
21-
"# like /papi ecloud download Server",
18+
"# If you want to use placeholder %server_online% you need to install",
19+
"# PlaceholderAPI plugin and download placeholders for Server",
20+
"# like /papi ecloud download Server",
2221
})
2322
public Map<String, Notice> messages = Map.of(
24-
"1", BukkitNotice.builder()
25-
.actionBar("<dark_gray>» <gold>There are <white>%server_online% <gold>people online on the server!")
26-
.sound(Sound.ITEM_ARMOR_EQUIP_IRON, 1.0f, 1.0f)
27-
.build(),
28-
29-
"2", BukkitNotice.builder()
30-
.chat("<dark_gray>» <gold>You need help from an admin?")
31-
.chat("<dark_gray>» <gold>Type command <white>/helpop <gold>to ask!")
32-
.chat("<dark_gray>» <green><click:suggest_command:'/helpop'>Click to execute!</click></green>")
33-
.sound(Sound.BLOCK_ANVIL_BREAK, 1.0f, 1.0f)
34-
.build()
35-
);
36-
37-
Notice enabled = Notice.chat("<green>► <white>Enabled auto messages!");
38-
Notice disabled = Notice.chat("<green>► <white>Disabled auto messages!");
23+
"1", BukkitNotice.builder()
24+
.actionBar("<color:#9d6eef>► <white>There are <color:#9d6eef>%server_online% <white>people online on the server!")
25+
.sound(Sound.ITEM_ARMOR_EQUIP_IRON, 1.0f, 1.0f)
26+
.build(),
27+
28+
"2", BukkitNotice.builder()
29+
.chat("<color:#9d6eef>► <white>You need help from an admin?")
30+
.chat("<color:#9d6eef>► <white>Type command <color:#9d6eef>/helpop <white>to ask!")
31+
.chat("<color:#9d6eef>► <color:#9d6eef><click:suggest_command:'/helpop'>Click to execute!</click></color:#9d6eef>")
32+
.sound(Sound.BLOCK_ANVIL_BREAK, 1.0f, 1.0f)
33+
.build());
34+
35+
Notice enabled = Notice.chat("<color:#9d6eef>► <white>Enabled auto messages!");
36+
Notice disabled = Notice.chat("<color:#9d6eef>► <white>Disabled auto messages!");
3937

4038
@Override
4139
public Collection<Notice> messages() {

‎eternalcore-core/src/main/java/com/eternalcode/core/feature/automessage/messages/PLAutoMessageMessages.java‎

Lines changed: 16 additions & 17 deletions
Original file line numberDiff line numberDiff line change
@@ -14,27 +14,26 @@
1414
@Accessors(fluent = true)
1515
public class PLAutoMessageMessages extends OkaeriConfig implements AutoMessageMessages {
1616
@Comment({
17-
"",
18-
"# Jeżeli chcesz użyć placeholder'a %server_online% musisz zainstalować plugin",
19-
"# PlaceholderAPI oraz pobrać placeholdery dla Server'a",
20-
"# za pomocą komendy /papi ecloud download Server",
17+
"# Jeżeli chcesz użyć placeholder'a %server_online% musisz zainstalować plugin",
18+
"# PlaceholderAPI oraz pobrać placeholdery dla Server'a",
19+
"# za pomocą komendy /papi ecloud download Server",
2120
})
2221
public Map<String, Notice> messages = Map.of(
23-
"1", BukkitNotice.builder()
24-
.actionBar("<dark_gray>» <gold>Na serwerze jest: <white>%server_online% <gold>graczy online!")
25-
.sound(Sound.ITEM_ARMOR_EQUIP_IRON, 1.0f, 1.0f)
26-
.build(),
22+
"1", BukkitNotice.builder()
23+
.actionBar(
24+
"<color:#9d6eef>► <white>Na serwerze jest: <color:#9d6eef>%server_online% <white>graczy online!")
25+
.sound(Sound.ITEM_ARMOR_EQUIP_IRON, 1.0f, 1.0f)
26+
.build(),
2727

28-
"2", BukkitNotice.builder()
29-
.chat("<dark_gray>» <gold>Potrzebujesz pomocy od admina?")
30-
.chat("<dark_gray>» <gold>Użyj komendy <white>/helpop <gold>aby zgłosić problem!")
31-
.chat("<dark_gray>» <green><click:suggest_command:'/helpop'>Kliknij aby wykonać!</click></green>")
32-
.sound(Sound.BLOCK_ANVIL_BREAK, 1.0f, 1.0f)
33-
.build()
34-
);
28+
"2", BukkitNotice.builder()
29+
.chat("<color:#9d6eef>► <white>Potrzebujesz pomocy od admina?")
30+
.chat("<color:#9d6eef>► <white>Użyj komendy <color:#9d6eef>/helpop <white>aby zgłosić problem!")
31+
.chat("<color:#9d6eef>► <color:#9d6eef><click:suggest_command:'/helpop'>Kliknij aby wykonać!</click></color:#9d6eef>")
32+
.sound(Sound.BLOCK_ANVIL_BREAK, 1.0f, 1.0f)
33+
.build());
3534

36-
Notice enabled = Notice.chat("<green>► <white>Włączono automatyczne wiadomości!");
37-
Notice disabled = Notice.chat("<green>► <white>Wyłączono automatyczne wiadomości!");
35+
Notice enabled = Notice.chat("<color:#9d6eef>► <white>Włączono automatyczne wiadomości!");
36+
Notice disabled = Notice.chat("<color:#9d6eef>► <white>Wyłączono automatyczne wiadomości!");
3837

3938
@Override
4039
public Collection<Notice> messages() {

‎eternalcore-core/src/main/java/com/eternalcode/core/feature/broadcast/messages/ENBroadcastMessages.java‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -10,9 +10,9 @@
1010
public class ENBroadcastMessages extends OkaeriConfig implements BroadcastMessages {
1111

1212
@Comment("# {BROADCAST} - Broadcast")
13-
public String messageFormat = "<red><bold>BROADCAST:</bold> <gray>{BROADCAST}";
13+
public String messageFormat = "<color:#9d6eef><bold>BROADCAST:</bold> <white>{BROADCAST}";
1414

1515
@Comment("# Used only in title broadcasts")
16-
public String titleHeader = "<red><bold>BROADCAST:</bold>";
16+
public String titleHeader = "<color:#9d6eef><bold>BROADCAST:</bold>";
1717

1818
}

‎eternalcore-core/src/main/java/com/eternalcode/core/feature/broadcast/messages/PLBroadcastMessages.java‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -10,9 +10,9 @@
1010
public class PLBroadcastMessages extends OkaeriConfig implements BroadcastMessages {
1111

1212
@Comment("# {BROADCAST} - Ogłoszenie")
13-
public String messageFormat = "<red><bold>OGŁOSZENIE:</bold> <gray>{BROADCAST}";
13+
public String messageFormat = "<color:#9d6eef><bold>OGŁOSZENIE:</bold> <white>{BROADCAST}";
1414

1515
@Comment("# Używane tylko w ogłoszeniach tytułowych")
16-
public String titleHeader = "<red><bold>OGŁOSZENIE:</bold>";
16+
public String titleHeader = "<color:#9d6eef><bold>OGŁOSZENIE:</bold>";
1717

1818
}

‎eternalcore-core/src/main/java/com/eternalcode/core/feature/burn/messages/ENBurnMessages.java‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -11,8 +11,8 @@
1111
public class ENBurnMessages extends OkaeriConfig implements BurnMessages {
1212

1313
@Comment("# Available placeholders: {PLAYER} - burned player, {TICKS} - number of ticks the player is on fire")
14-
Notice burnedSelf = Notice.chat("<green>► <white>You have been set on fire for <green>{TICKS}<white> ticks!");
14+
Notice burnedSelf = Notice.chat("<color:#9d6eef>► <white>You have been set on fire for <color:#9d6eef>{TICKS}<white> ticks!");
1515

1616
@Comment(" ")
17-
Notice burnedOther = Notice.chat("<green>► {PLAYER} <white>has been set on fire for <green>{TICKS} <white>ticks!");
17+
Notice burnedOther = Notice.chat("<color:#9d6eef>► {PLAYER} <white>has been set on fire for <color:#9d6eef>{TICKS} <white>ticks!");
1818
}

0 commit comments

Comments
 (0)