Skip to content

Commit a8e8557

Browse files
AlexProgrammerDEAlexProgrammerDE
committed
Improve and modernize some code
1 parent 22a33bb commit a8e8557

File tree

6 files changed

+130
-146
lines changed

6 files changed

+130
-146
lines changed

‎bungee/src/main/java/net/pistonmaster/pistonqueue/bungee/PistonQueueBungee.java‎

Lines changed: 10 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -21,6 +21,7 @@
2121

2222
import lombok.Getter;
2323
import net.md_5.bungee.api.ChatColor;
24+
import net.md_5.bungee.api.ChatMessageType;
2425
import net.md_5.bungee.api.config.ServerInfo;
2526
import net.md_5.bungee.api.connection.ProxiedPlayer;
2627
import net.md_5.bungee.api.plugin.Plugin;
@@ -190,7 +191,7 @@ public boolean hasPermission(String node) {
190191
public void connect(String server) {
191192
Optional<ServerInfo> optional = Optional.ofNullable(getProxy().getServerInfo(server));
192193

193-
if (!optional.isPresent()) {
194+
if (optional.isEmpty()) {
194195
error("Server" + server + " not found!!!");
195196
return;
196197
}
@@ -205,7 +206,14 @@ public Optional<String> getCurrentServer() {
205206

206207
@Override
207208
public void sendMessage(MessageType type, String message) {
208-
ChatUtils.sendMessage(type, player, message);
209+
if (message.equalsIgnoreCase("/") || message.isBlank()) {
210+
return;
211+
}
212+
213+
switch (type) {
214+
case CHAT -> player.sendMessage(ChatMessageType.CHAT, ChatUtils.parseToComponent(message));
215+
case ACTION_BAR -> player.sendMessage(ChatMessageType.ACTION_BAR, ChatUtils.parseToComponent(message));
216+
}
209217
}
210218

211219
@Override

‎bungee/src/main/java/net/pistonmaster/pistonqueue/bungee/utils/ChatUtils.java‎

Lines changed: 0 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -20,12 +20,9 @@
2020
package net.pistonmaster.pistonqueue.bungee.utils;
2121

2222
import net.md_5.bungee.api.ChatColor;
23-
import net.md_5.bungee.api.ChatMessageType;
2423
import net.md_5.bungee.api.chat.BaseComponent;
2524
import net.md_5.bungee.api.chat.ComponentBuilder;
2625
import net.md_5.bungee.api.chat.TextComponent;
27-
import net.md_5.bungee.api.connection.ProxiedPlayer;
28-
import net.pistonmaster.pistonqueue.shared.chat.MessageType;
2926
import net.pistonmaster.pistonqueue.shared.utils.SharedChatUtils;
3027

3128
import java.util.List;
@@ -34,15 +31,6 @@ public final class ChatUtils {
3431
private ChatUtils() {
3532
}
3633

37-
public static void sendMessage(MessageType type, ProxiedPlayer p, String str) {
38-
if (!str.equalsIgnoreCase("/")) {
39-
switch (type) {
40-
case CHAT -> p.sendMessage(ChatMessageType.CHAT, parseToComponent(str));
41-
case ACTION_BAR -> p.sendMessage(ChatMessageType.ACTION_BAR, parseToComponent(str));
42-
}
43-
}
44-
}
45-
4634
public static String parseToString(String str) {
4735
return ChatColor.translateAlternateColorCodes('&', SharedChatUtils.parseText(str));
4836
}

‎shared/src/main/java/net/pistonmaster/pistonqueue/shared/command/MainCommandShared.java‎

Lines changed: 110 additions & 112 deletions
Original file line numberDiff line numberDiff line change
@@ -42,132 +42,130 @@ default void onCommand(CommandSourceWrapper sender, String[] args, PistonQueuePl
4242
return;
4343
}
4444

45-
switch (args[0].toLowerCase(Locale.ROOT)) {
46-
case "version":
47-
sendLine(sender);
48-
sender.sendMessage(component().text("PistonQueue").color(TextColorWrapper.GOLD));
49-
sender.sendMessage(component().text("Version " + plugin.getVersion() + " by").color(TextColorWrapper.GOLD));
50-
sender.sendMessage(component().text(String.join(", ", plugin.getAuthors())).color(TextColorWrapper.GOLD));
51-
sendLine(sender);
52-
return;
53-
case "stats":
54-
sendLine(sender);
55-
sender.sendMessage(component().text("Queue stats").color(TextColorWrapper.GOLD));
56-
for (QueueType type : Config.QUEUE_TYPES) {
57-
sender.sendMessage(component().text(type.getName() + ": ").color(TextColorWrapper.GOLD)
58-
.append(component().text(String.valueOf(type.getQueueMap().size())).color(TextColorWrapper.GOLD).decorate(TextDecorationWrapper.BOLD)));
59-
}
60-
sendLine(sender);
61-
return;
62-
case "slotstats":
63-
if (!sender.hasPermission(Config.ADMIN_PERMISSION)) {
64-
noPermission(sender);
65-
return;
66-
}
67-
68-
sendLine(sender);
69-
sender.sendMessage(component().text("Target slot stats").color(TextColorWrapper.GOLD));
70-
for (QueueType type : Config.QUEUE_TYPES) {
71-
sender.sendMessage(component().text(type.getName() + ": ").color(TextColorWrapper.GOLD).append(component().text(type.getPlayersWithTypeInTarget().get() + " / " + type.getReservedSlots()).color(TextColorWrapper.GOLD).decorate(TextDecorationWrapper.BOLD)));
72-
}
73-
sendLine(sender);
74-
return;
75-
case "reload":
76-
if (!sender.hasPermission(Config.ADMIN_PERMISSION)) {
77-
noPermission(sender);
78-
return;
79-
}
80-
81-
plugin.processConfig(plugin.getDataDirectory());
82-
83-
sendLine(sender);
84-
sender.sendMessage(component().text("PistonQueue").color(TextColorWrapper.GOLD));
85-
sender.sendMessage(component().text("Config reloaded").color(TextColorWrapper.GREEN));
86-
sendLine(sender);
87-
return;
88-
case "shadowban":
89-
if (!sender.hasPermission(Config.ADMIN_PERMISSION)) {
90-
noPermission(sender);
91-
return;
92-
}
45+
switch (args[0].toLowerCase(Locale.ROOT)) {
46+
case "version" -> {
47+
sendLine(sender);
48+
sender.sendMessage(component().text("PistonQueue").color(TextColorWrapper.GOLD));
49+
sender.sendMessage(component().text("Version " + plugin.getVersion() + " by").color(TextColorWrapper.GOLD));
50+
sender.sendMessage(component().text(String.join(", ", plugin.getAuthors())).color(TextColorWrapper.GOLD));
51+
sendLine(sender);
52+
}
53+
case "stats" -> {
54+
sendLine(sender);
55+
sender.sendMessage(component().text("Queue stats").color(TextColorWrapper.GOLD));
56+
for (QueueType type : Config.QUEUE_TYPES) {
57+
sender.sendMessage(component().text(type.getName() + ": ").color(TextColorWrapper.GOLD)
58+
.append(component().text(String.valueOf(type.getQueueMap().size())).color(TextColorWrapper.GOLD).decorate(TextDecorationWrapper.BOLD)));
59+
}
60+
sendLine(sender);
61+
}
62+
case "slotstats" -> {
63+
if (!sender.hasPermission(Config.ADMIN_PERMISSION)) {
64+
noPermission(sender);
65+
return;
66+
}
67+
68+
sendLine(sender);
69+
sender.sendMessage(component().text("Target slot stats").color(TextColorWrapper.GOLD));
70+
for (QueueType type : Config.QUEUE_TYPES) {
71+
sender.sendMessage(component().text(type.getName() + ": ").color(TextColorWrapper.GOLD).append(component().text(type.getPlayersWithTypeInTarget().get() + " / " + type.getReservedSlots()).color(TextColorWrapper.GOLD).decorate(TextDecorationWrapper.BOLD)));
72+
}
73+
sendLine(sender);
74+
}
75+
case "reload" -> {
76+
if (!sender.hasPermission(Config.ADMIN_PERMISSION)) {
77+
noPermission(sender);
78+
return;
79+
}
9380

94-
if (args.length == 1) {
95-
sendBanHelp(sender);
96-
return;
97-
}
81+
plugin.processConfig(plugin.getDataDirectory());
9882

99-
if (args.length == 2) {
100-
sendBanHelp(sender);
101-
return;
102-
}
83+
sendLine(sender);
84+
sender.sendMessage(component().text("PistonQueue").color(TextColorWrapper.GOLD));
85+
sender.sendMessage(component().text("Config reloaded").color(TextColorWrapper.GREEN));
86+
sendLine(sender);
87+
}
88+
case "shadowban" -> {
89+
if (!sender.hasPermission(Config.ADMIN_PERMISSION)) {
90+
noPermission(sender);
91+
return;
92+
}
10393

104-
Calendar calendar = Calendar.getInstance();
105-
calendar.setTime(new Date());
94+
if (args.length == 1) {
95+
sendBanHelp(sender);
96+
return;
97+
}
10698

107-
if (args[2].toLowerCase(Locale.ROOT).endsWith("d")) {
108-
int d = Integer.parseInt(args[2].toLowerCase(Locale.ROOT).replace("d", ""));
99+
if (args.length == 2) {
100+
sendBanHelp(sender);
101+
return;
102+
}
109103

110-
calendar.add(Calendar.DAY_OF_WEEK, d);
111-
} else if (args[2].toLowerCase(Locale.ROOT).endsWith("h")) {
112-
int h = Integer.parseInt(args[2].toLowerCase(Locale.ROOT).replace("h", ""));
104+
Calendar calendar = Calendar.getInstance();
105+
calendar.setTime(new Date());
113106

114-
calendar.add(Calendar.HOUR_OF_DAY, h);
115-
} else if (args[2].toLowerCase(Locale.ROOT).endsWith("m")) {
116-
int m = Integer.parseInt(args[2].toLowerCase(Locale.ROOT).replace("m", ""));
107+
if (args[2].toLowerCase(Locale.ROOT).endsWith("d")) {
108+
int d = Integer.parseInt(args[2].toLowerCase(Locale.ROOT).replace("d", ""));
117109

118-
calendar.add(Calendar.MINUTE, m);
119-
} else if (args[2].toLowerCase(Locale.ROOT).endsWith("s")) {
120-
int s = Integer.parseInt(args[2].toLowerCase(Locale.ROOT).replace("s", ""));
110+
calendar.add(Calendar.DAY_OF_WEEK, d);
111+
} else if (args[2].toLowerCase(Locale.ROOT).endsWith("h")) {
112+
int h = Integer.parseInt(args[2].toLowerCase(Locale.ROOT).replace("h", ""));
121113

122-
calendar.add(Calendar.SECOND, s);
123-
} else {
124-
sendBanHelp(sender);
125-
return;
126-
}
114+
calendar.add(Calendar.HOUR_OF_DAY, h);
115+
} else if (args[2].toLowerCase(Locale.ROOT).endsWith("m")) {
116+
int m = Integer.parseInt(args[2].toLowerCase(Locale.ROOT).replace("m", ""));
127117

128-
String banPlayerName = args[1];
129-
if (StorageTool.shadowBanPlayer(banPlayerName, calendar.getTime())) {
130-
sendLine(sender);
131-
sender.sendMessage(component().text("PistonQueue").color(TextColorWrapper.GOLD));
132-
sender.sendMessage(component().text("Successfully shadowbanned " + banPlayerName + "!").color(TextColorWrapper.GREEN));
133-
sendLine(sender);
134-
} else {
135-
sendLine(sender);
136-
sender.sendMessage(component().text("PistonQueue").color(TextColorWrapper.GOLD));
137-
sender.sendMessage(component().text(banPlayerName + " is already shadowbanned!").color(TextColorWrapper.RED));
138-
sendLine(sender);
139-
}
118+
calendar.add(Calendar.MINUTE, m);
119+
} else if (args[2].toLowerCase(Locale.ROOT).endsWith("s")) {
120+
int s = Integer.parseInt(args[2].toLowerCase(Locale.ROOT).replace("s", ""));
140121

141-
return;
142-
case "unshadowban":
143-
if (!sender.hasPermission(Config.ADMIN_PERMISSION)) {
144-
noPermission(sender);
145-
return;
146-
}
122+
calendar.add(Calendar.SECOND, s);
123+
} else {
124+
sendBanHelp(sender);
125+
return;
126+
}
127+
128+
String banPlayerName = args[1];
129+
if (StorageTool.shadowBanPlayer(banPlayerName, calendar.getTime())) {
130+
sendLine(sender);
131+
sender.sendMessage(component().text("PistonQueue").color(TextColorWrapper.GOLD));
132+
sender.sendMessage(component().text("Successfully shadowbanned " + banPlayerName + "!").color(TextColorWrapper.GREEN));
133+
sendLine(sender);
134+
} else {
135+
sendLine(sender);
136+
sender.sendMessage(component().text("PistonQueue").color(TextColorWrapper.GOLD));
137+
sender.sendMessage(component().text(banPlayerName + " is already shadowbanned!").color(TextColorWrapper.RED));
138+
sendLine(sender);
139+
}
147140

148-
if (args.length == 1) {
149-
sendUnBanHelp(sender);
150-
return;
151-
}
141+
}
142+
case "unshadowban" -> {
143+
if (!sender.hasPermission(Config.ADMIN_PERMISSION)) {
144+
noPermission(sender);
145+
return;
146+
}
152147

153-
String unBanPlayerName = args[1];
154-
if (StorageTool.unShadowBanPlayer(unBanPlayerName)) {
155-
sendLine(sender);
156-
sender.sendMessage(component().text("PistonQueue").color(TextColorWrapper.GOLD));
157-
sender.sendMessage(component().text("Successfully unshadowbanned " + unBanPlayerName + "!").color(TextColorWrapper.GREEN));
158-
sendLine(sender);
159-
} else {
160-
sendLine(sender);
161-
sender.sendMessage(component().text("PistonQueue").color(TextColorWrapper.GOLD));
162-
sender.sendMessage(component().text(unBanPlayerName + " is not shadowbanned!").color(TextColorWrapper.RED));
163-
sendLine(sender);
164-
}
148+
if (args.length == 1) {
149+
sendUnBanHelp(sender);
150+
return;
151+
}
152+
153+
String unBanPlayerName = args[1];
154+
if (StorageTool.unShadowBanPlayer(unBanPlayerName)) {
155+
sendLine(sender);
156+
sender.sendMessage(component().text("PistonQueue").color(TextColorWrapper.GOLD));
157+
sender.sendMessage(component().text("Successfully unshadowbanned " + unBanPlayerName + "!").color(TextColorWrapper.GREEN));
158+
sendLine(sender);
159+
} else {
160+
sendLine(sender);
161+
sender.sendMessage(component().text("PistonQueue").color(TextColorWrapper.GOLD));
162+
sender.sendMessage(component().text(unBanPlayerName + " is not shadowbanned!").color(TextColorWrapper.RED));
163+
sendLine(sender);
164+
}
165165

166-
return;
167-
default: {
168-
help(sender);
169-
}
170166
}
167+
default -> help(sender);
168+
}
171169
}
172170

173171
default void noPermission(CommandSourceWrapper sender) {

‎shared/src/main/java/net/pistonmaster/pistonqueue/shared/config/Config.java‎

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -31,8 +31,9 @@ public final class Config {
3131
USERNAME_REGEX_MESSAGE, PAUSE_QUEUE_IF_TARGET_DOWN_MESSAGE,
3232
SHADOW_BAN_MESSAGE, IF_TARGET_DOWN_SEND_TO_QUEUE_MESSAGE, RECOVERY_MESSAGE;
3333

34-
public static boolean POSITION_MESSAGE_HOT_BAR, POSITION_PLAYER_LIST, ENABLE_KICK_MESSAGE,
35-
ENABLE_SOURCE_SERVER, ALWAYS_QUEUE, REGISTER_TAB, POSITION_MESSAGE_CHAT,
34+
public static boolean POSITION_PLAYER_LIST, ENABLE_KICK_MESSAGE,
35+
ENABLE_SOURCE_SERVER, ALWAYS_QUEUE, REGISTER_TAB,
36+
POSITION_MESSAGE_CHAT, POSITION_MESSAGE_HOT_BAR,
3637
PAUSE_QUEUE_IF_TARGET_DOWN, KICK_WHEN_DOWN, FORCE_TARGET_SERVER,
3738
IF_TARGET_DOWN_SEND_TO_QUEUE, RECOVERY, ENABLE_USERNAME_REGEX, SEND_XP_SOUND;
3839

‎velocity/src/main/java/net/pistonmaster/pistonqueue/velocity/PistonQueueVelocity.java‎

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -214,7 +214,7 @@ public boolean hasPermission(String node) {
214214
public void connect(String server) {
215215
Optional<RegisteredServer> optional = proxyServer.getServer(server);
216216

217-
if (!optional.isPresent()) {
217+
if (optional.isEmpty()) {
218218
error("Server" + server + " not found!!!");
219219
return;
220220
}
@@ -233,13 +233,13 @@ public Optional<String> getCurrentServer() {
233233

234234
@Override
235235
public void sendMessage(MessageType type, String message) {
236+
if (message.equalsIgnoreCase("/") || message.isBlank()) {
237+
return;
238+
}
239+
236240
switch (type) {
237-
case CHAT:
238-
ChatUtils.sendMessage(MessageType.CHAT, player, message);
239-
break;
240-
case ACTION_BAR:
241-
ChatUtils.sendMessage(MessageType.ACTION_BAR, player, message);
242-
break;
241+
case CHAT -> player.sendMessage(ChatUtils.parseToComponent(message));
242+
case ACTION_BAR -> player.sendActionBar(ChatUtils.parseToComponent(message));
243243
}
244244
}
245245

‎velocity/src/main/java/net/pistonmaster/pistonqueue/velocity/utils/ChatUtils.java‎

Lines changed: 0 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -19,11 +19,9 @@
1919
*/
2020
package net.pistonmaster.pistonqueue.velocity.utils;
2121

22-
import com.velocitypowered.api.proxy.Player;
2322
import net.kyori.adventure.text.Component;
2423
import net.kyori.adventure.text.TextComponent;
2524
import net.kyori.adventure.text.serializer.legacy.LegacyComponentSerializer;
26-
import net.pistonmaster.pistonqueue.shared.chat.MessageType;
2725
import net.pistonmaster.pistonqueue.shared.utils.SharedChatUtils;
2826

2927
import java.util.List;
@@ -32,15 +30,6 @@ public final class ChatUtils {
3230
private ChatUtils() {
3331
}
3432

35-
public static void sendMessage(MessageType type, Player p, String str) {
36-
if (!str.equalsIgnoreCase("/")) {
37-
switch (type) {
38-
case CHAT -> p.sendMessage(parseToComponent(str));
39-
case ACTION_BAR -> p.sendActionBar(parseToComponent(str));
40-
}
41-
}
42-
}
43-
4433
public static TextComponent parseToComponent(String str) {
4534
return LegacyComponentSerializer.legacySection().deserialize(parseToString(str));
4635
}

0 commit comments

Comments
 (0)