Skip to content

Commit 4f8840c

Browse files
jamezrinjamezrin
committed
Before service refractor
1 parent 562bfec commit 4f8840c

File tree

6 files changed

+32
-26
lines changed

6 files changed

+32
-26
lines changed

‎Main Plugin/src/main/java/com/jaimemartz/playerbalancer/PlayerBalancer.java‎

Lines changed: 7 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -4,17 +4,13 @@
44
import com.jaimemartz.playerbalancer.commands.MainCommand;
55
import com.jaimemartz.playerbalancer.commands.ManageCommand;
66
import com.jaimemartz.playerbalancer.connection.ServerAssignRegistry;
7-
import com.jaimemartz.playerbalancer.listeners.PlayerDisconnectListener;
8-
import com.jaimemartz.playerbalancer.listeners.ProxyReloadListener;
9-
import com.jaimemartz.playerbalancer.listeners.ServerConnectListener;
10-
import com.jaimemartz.playerbalancer.listeners.ServerKickListener;
7+
import com.jaimemartz.playerbalancer.listeners.*;
118
import com.jaimemartz.playerbalancer.manager.NetworkManager;
129
import com.jaimemartz.playerbalancer.manager.PasteHelper;
1310
import com.jaimemartz.playerbalancer.manager.PlayerLocker;
1411
import com.jaimemartz.playerbalancer.ping.StatusManager;
1512
import com.jaimemartz.playerbalancer.section.SectionManager;
1613
import com.jaimemartz.playerbalancer.services.FallbackService;
17-
import com.jaimemartz.playerbalancer.services.MessagingService;
1814
import com.jaimemartz.playerbalancer.settings.SettingsHolder;
1915
import net.md_5.bungee.api.plugin.Command;
2016
import net.md_5.bungee.api.plugin.Listener;
@@ -40,8 +36,7 @@ public class PlayerBalancer extends Plugin {
4036
private ConfigurationLoader<CommentedConfigurationNode> loader;
4137
private FallbackService fallbackService;
4238
private Command mainCommand, manageCommand;
43-
private MessagingService messagingService;
44-
private Listener connectListener, kickListener, reloadListener;
39+
private Listener connectListener, kickListener, reloadListener, pluginMessageListener;
4540

4641
@Override
4742
public void onEnable() {
@@ -138,8 +133,8 @@ private void execStart() {
138133

139134
getProxy().getPluginManager().registerListener(this, statusManager);
140135

141-
messagingService = new MessagingService(this);
142-
getProxy().getPluginManager().registerListener(this, messagingService);
136+
pluginMessageListener = new PluginMessageListener(this);
137+
getProxy().getPluginManager().registerListener(this, pluginMessageListener);
143138
}
144139

145140
manageCommand = new ManageCommand(this);
@@ -214,10 +209,10 @@ private void execStop() {
214209
}
215210

216211
if (settings.getGeneralProps().isPluginMessaging()) {
217-
if (messagingService != null) {
212+
if (pluginMessageListener != null) {
218213
getProxy().unregisterChannel("PlayerBalancer");
219-
getProxy().getPluginManager().unregisterListener(messagingService);
220-
messagingService = null;
214+
getProxy().getPluginManager().unregisterListener(pluginMessageListener);
215+
pluginMessageListener = null;
221216
}
222217
}
223218

‎Main Plugin/src/main/java/com/jaimemartz/playerbalancer/commands/ManageCommand.java‎

Lines changed: 15 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -148,9 +148,11 @@ public void execute(CommandSender sender, String[] args) {
148148
.color(ChatColor.AQUA)
149149
.event(new HoverEvent(HoverEvent.Action.SHOW_TEXT, new ComponentBuilder("Permission: ")
150150
.color(ChatColor.GRAY)
151-
.append(section.getCommand().getPermission().equals("") ? "None" : section.getCommand().getPermission())
151+
.append("\"")
152+
.append(section.getCommand().getPermission())
152153
.color(ChatColor.AQUA)
153-
.append("\nAliases: ")
154+
.append("\n")
155+
.append("Aliases: ")
154156
.color(ChatColor.GRAY)
155157
.append(Arrays.toString(section.getCommand().getAliases()))
156158
.color(ChatColor.AQUA)
@@ -179,23 +181,30 @@ public void execute(CommandSender sender, String[] args) {
179181
.color(ChatColor.GRAY)
180182
.append(server.getName())
181183
.color(ChatColor.AQUA)
182-
.event(new HoverEvent(HoverEvent.Action.SHOW_TEXT, new ComponentBuilder("Online: ")
184+
.event(new HoverEvent(HoverEvent.Action.SHOW_TEXT,
185+
new ComponentBuilder("Online: ")
183186
.color(ChatColor.GRAY)
184187
.append(status.isOnline() ? "yes" : "no")
185188
.color(status.isOnline() ? ChatColor.GREEN : ChatColor.RED)
186-
.append("\nAccessible: ")
189+
190+
.append("\n")
191+
.append("Accessible: ")
187192
.color(ChatColor.GRAY)
188193
.append(accessible ? "yes" : "no")
189194
.color(accessible ? ChatColor.GREEN : ChatColor.RED)
190-
.append("\nDescription: ")
195+
196+
.append("\n")
197+
.append("Description: ")
191198
.color(ChatColor.GRAY)
192199
.append("\"")
193200
.color(ChatColor.AQUA)
194201
.append(status.getDescription())
195202
.color(ChatColor.WHITE)
196203
.append("\"")
197204
.color(ChatColor.AQUA)
198-
.append("\nAddress: ")
205+
206+
.append("\n")
207+
.append("Address: ")
199208
.color(ChatColor.GRAY)
200209
.append(server.getAddress().toString())
201210
.color(ChatColor.AQUA)

Main Plugin/src/main/java/com/jaimemartz/playerbalancer/services/MessagingService.java renamed to Main Plugin/src/main/java/com/jaimemartz/playerbalancer/listeners/PluginMessageListener.java

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
package com.jaimemartz.playerbalancer.services;
1+
package com.jaimemartz.playerbalancer.listeners;
22

33
import com.google.common.io.ByteArrayDataInput;
44
import com.google.common.io.ByteStreams;
@@ -22,11 +22,11 @@
2222
import java.io.IOException;
2323
import java.util.concurrent.TimeUnit;
2424

25-
public class MessagingService implements Listener {
25+
public class PluginMessageListener implements Listener {
2626
private final PlayerBalancer plugin;
2727
private final Gson gson;
2828

29-
public MessagingService(PlayerBalancer plugin) {
29+
public PluginMessageListener(PlayerBalancer plugin) {
3030
this.plugin = plugin;
3131
GsonBuilder builder = new GsonBuilder();
3232

‎Main Plugin/src/main/java/com/jaimemartz/playerbalancer/ping/ServerStatus.java‎

Lines changed: 2 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,9 @@
11
package com.jaimemartz.playerbalancer.ping;
22

3-
import net.md_5.bungee.api.ChatColor;
43
import net.md_5.bungee.api.config.ServerInfo;
54

5+
import static com.jaimemartz.playerbalancer.utils.MessageUtils.revertColor;
6+
67
public class ServerStatus {
78
private final String description;
89
private final int players, maximum;
@@ -75,8 +76,4 @@ public boolean isOutdated() {
7576
public void setOutdated(boolean outdated) {
7677
this.outdated = outdated;
7778
}
78-
79-
private static String revertColor(String string) {
80-
return string.replace(ChatColor.COLOR_CHAR, '&');
81-
}
8279
}

‎Main Plugin/src/main/java/com/jaimemartz/playerbalancer/section/SectionCommand.java‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -4,6 +4,7 @@
44
import com.jaimemartz.playerbalancer.services.FallbackService;
55
import net.md_5.bungee.api.connection.ProxiedPlayer;
66

7+
//This is unsafe, make it extend just the command, not the listener too
78
public class SectionCommand extends FallbackService {
89
private final ServerSection section;
910

‎Main Plugin/src/main/java/com/jaimemartz/playerbalancer/utils/MessageUtils.java‎

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -21,4 +21,8 @@ public static void send(CommandSender sender, String text, Function<String, Stri
2121

2222
send(sender, text);
2323
}
24+
25+
public static String revertColor(String string) {
26+
return string.replace(ChatColor.COLOR_CHAR, '&');
27+
}
2428
}

0 commit comments

Comments
 (0)