Skip to content

Commit d0863e2

Browse files
jamezrinjamezrin
committed
Commented stuff out, now compiles and I can test things
1 parent aba3c16 commit d0863e2

30 files changed

+225
-276
lines changed

‎README.md‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -10,11 +10,11 @@
1010
- [ ] Add option to force joining a specific section
1111
- [x] Add tooltip when you hover over a server in /section info
1212
- [ ] Stop using inventivetalent's deprecated bungee-update
13-
- [ ] Create a spigot addon that adds connector signs and placeholders
14-
- [ ] Separate the types of connections in classes instead of being in ConnectionIntent
13+
- [] Create a spigot addon that adds connector signs and placeholders
14+
- [x] Separate the types of connections in classes instead of being in ConnectionIntent
1515
- [ ] Make the plugin API be not so dependent on a instance of PlayerBalancer
1616
- [ ] Separate connection providers in classes instead of being hardcoded in an enum
17-
- [ ] Make the feature `marker-descs` work per section
17+
- [x] Make the feature `marker-descs` work per section
1818
- [ ] Add a identifier to get the servers of a section (auto complete)
1919
- [ ] Implement fast connect (dimension change)
2020
- [ ] Implement a way to redirect premium players to a section and cracked ones to other section (not sure how this works)

‎pom.xml‎

Lines changed: 13 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -68,6 +68,19 @@
6868
</execution>
6969
</executions>
7070
</plugin>
71+
<plugin>
72+
<groupId>org.codehaus.mojo</groupId>
73+
<artifactId>license-maven-plugin</artifactId>
74+
<version>1.13</version>
75+
<executions>
76+
<execution>
77+
<id>download-licenses</id>
78+
<goals>
79+
<goal>download-licenses</goal>
80+
</goals>
81+
</execution>
82+
</executions>
83+
</plugin>
7184
</plugins>
7285
<resources>
7386
<resource>

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

Lines changed: 16 additions & 28 deletions
Original file line numberDiff line numberDiff line change
@@ -1,45 +1,26 @@
11
package com.jaimemartz.playerbalancer;
22

3-
import ch.jalu.configme.SettingsManager;
43
import ch.jalu.injector.Injector;
54
import ch.jalu.injector.InjectorBuilder;
6-
import com.jaimemartz.playerbalancer.commands.FallbackCommand;
75
import com.jaimemartz.playerbalancer.commands.MainCommand;
8-
import com.jaimemartz.playerbalancer.commands.ManageCommand;
9-
import com.jaimemartz.playerbalancer.connection.ServerAssignRegistry;
10-
import com.jaimemartz.playerbalancer.listener.*;
11-
import com.jaimemartz.playerbalancer.manager.PasteHelper;
12-
import com.jaimemartz.playerbalancer.manager.PlayerLocker;
13-
import com.jaimemartz.playerbalancer.ping.StatusManager;
14-
import com.jaimemartz.playerbalancer.section.SectionManager;
15-
import com.jaimemartz.playerbalancer.settings.beans.SectionHandler;
6+
import com.jaimemartz.playerbalancer.settings.Settings;
7+
import com.jaimemartz.playerbalancer.settings.beans.SectionsHandler;
168
import com.jaimemartz.playerbalancer.settings.provider.SectionHandlerProvider;
179
import com.jaimemartz.playerbalancer.settings.provider.SettingsProvider;
18-
import com.jaimemartz.playerbalancer.settings.types.CheckerProperties;
19-
import com.jaimemartz.playerbalancer.settings.types.CommandProperties;
20-
import com.jaimemartz.playerbalancer.settings.types.GeneralProperties;
21-
import com.jaimemartz.playerbalancer.settings.types.ReconnectorProperties;
2210
import lombok.Getter;
2311
import net.md_5.bungee.api.ProxyServer;
2412
import net.md_5.bungee.api.plugin.Command;
2513
import net.md_5.bungee.api.plugin.Listener;
2614
import net.md_5.bungee.api.plugin.Plugin;
2715
import org.bstats.bungeecord.Metrics;
28-
import org.bstats.bungeecord.Metrics.SingleLineChart;
29-
import org.inventivetalent.update.bungee.BungeeUpdater;
30-
31-
import java.io.IOException;
32-
import java.util.logging.Level;
33-
import java.util.stream.Stream;
3416

3517
public class PlayerBalancer extends Plugin {
3618
@Getter private boolean failed = false;
3719

3820
//Private instances
3921
private Injector injector;
40-
private SettingsManager settings;
41-
private StatusManager statusManager;
42-
private SectionManager sectionManager;
22+
private Settings settings;
23+
private SectionsHandler handler;
4324

4425
private Command fallbackCommand, mainCommand, manageCommand;
4526
private Listener connectListener, kickListener, messageListener, reloadListener;
@@ -52,20 +33,24 @@ public void onEnable() {
5233

5334
injector.register(PlayerBalancer.class, this);
5435
injector.register(ProxyServer.class, this.getProxy());
55-
injector.registerProvider(SettingsManager.class, SettingsProvider.class);
56-
injector.registerProvider(SectionHandler.class, SectionHandlerProvider.class);
57-
settings = injector.getSingleton(SettingsManager.class);
36+
37+
injector.registerProvider(Settings.class, SettingsProvider.class);
38+
injector.registerProvider(SectionsHandler.class, SectionHandlerProvider.class);
39+
40+
settings = injector.getSingleton(Settings.class);
41+
handler = injector.getSingleton(SectionsHandler.class);
5842

5943
Metrics metrics = new Metrics(this);
6044
if (this.enable()) {
61-
metrics.addCustomChart(new SingleLineChart("configured_sections", () -> sectionManager.getSections().size()));
45+
//metrics.addCustomChart(new SingleLineChart("configured_sections", () -> handler.getSections().size()));
6246
}
6347
}
6448

6549
private boolean enable() {
6650
mainCommand = new MainCommand(this);
6751
getProxy().getPluginManager().registerCommand(this, mainCommand);
6852

53+
/*
6954
if (settings.getProperty(GeneralProperties.ENABLED)) {
7055
if (settings.getProperty(GeneralProperties.SILENT)) {
7156
getLogger().setLevel(Level.WARNING);
@@ -93,7 +78,7 @@ private boolean enable() {
9378
}
9479
9580
if (settings.getProperty(CommandProperties.ENABLED)) {
96-
fallbackCommand = injector.newInstance(FallbackCommand.class);
81+
fallbackCommand = injector.getSingleton(FallbackCommand.class);
9782
getProxy().getPluginManager().registerCommand(this, fallbackCommand);
9883
}
9984
@@ -130,6 +115,7 @@ private boolean enable() {
130115
getLogger().warning("Nothing is going to work until you do that, you can reload me by using the /balancer command");
131116
getLogger().warning("-----------------------------------------------------");
132117
}
118+
*/
133119
return false;
134120
}
135121

@@ -142,6 +128,7 @@ private void disable() {
142128
getProxy().getPluginManager().unregisterCommand(mainCommand);
143129
mainCommand = null;
144130

131+
/*
145132
if (settings.getProperty(GeneralProperties.ENABLED)) {
146133
//Do not try to do anything if the plugin has not loaded correctly
147134
if (isFailed()) return;
@@ -183,6 +170,7 @@ private void disable() {
183170
184171
PlayerLocker.flush();
185172
failed = false;
173+
*/
186174
}
187175

188176
public boolean reloadPlugin() {

‎src/main/java/com/jaimemartz/playerbalancer/commands/FallbackCommand.java‎

Lines changed: 13 additions & 22 deletions
Original file line numberDiff line numberDiff line change
@@ -1,34 +1,23 @@
11
package com.jaimemartz.playerbalancer.commands;
22

3-
import ch.jalu.configme.SettingsManager;
43
import com.google.common.collect.Iterables;
5-
import com.jaimemartz.playerbalancer.connection.ConnectionIntent;
6-
import com.jaimemartz.playerbalancer.section.ServerSection;
7-
import com.jaimemartz.playerbalancer.settings.beans.MapBean;
4+
import com.jaimemartz.playerbalancer.settings.Settings;
85
import com.jaimemartz.playerbalancer.settings.types.CommandProperties;
9-
import com.jaimemartz.playerbalancer.settings.types.GeneralProperties;
10-
import com.jaimemartz.playerbalancer.settings.types.MessageProperties;
116
import com.jaimemartz.playerbalancer.settings.types.SectionsHolder;
12-
import com.jaimemartz.playerbalancer.utils.MessageUtils;
13-
import net.md_5.bungee.api.ChatColor;
147
import net.md_5.bungee.api.CommandSender;
15-
import net.md_5.bungee.api.chat.ComponentBuilder;
16-
import net.md_5.bungee.api.config.ServerInfo;
17-
import net.md_5.bungee.api.connection.ProxiedPlayer;
188
import net.md_5.bungee.api.plugin.Command;
199

2010
import javax.inject.Inject;
21-
import java.util.concurrent.Callable;
2211

2312
public class FallbackCommand extends Command {
2413
@Inject
25-
private SettingsManager settings;
14+
private Settings settings;
2615

2716
@Inject
28-
private SectionsHolder sections;
17+
private SectionsHolder holder;
2918

30-
@Inject
31-
public FallbackCommand(SettingsManager settings) {
19+
@Inject //todo maybe make this job of the main class (initializer)
20+
public FallbackCommand(Settings settings) {
3221
super(
3322
settings.getProperty(CommandProperties.COMMAND).getName(),
3423
settings.getProperty(CommandProperties.COMMAND).getPermission(),
@@ -38,11 +27,12 @@ public FallbackCommand(SettingsManager settings) {
3827

3928
@Override
4029
public void execute(CommandSender sender, String[] args) {
30+
/*
4131
if (sender instanceof ProxiedPlayer) {
4232
ProxiedPlayer player = (ProxiedPlayer) sender;
4333
4434
Callable<ServerSection> callable = () -> {
45-
ServerSection current = sections.getByPlayer(player);
35+
ServerSection current = holder.getByPlayer(player);
4636
4737
if (current != null) {
4838
if (settings.getProperty(CommandProperties.IGNORED_SECTIONS).contains(current.getName())) {
@@ -52,7 +42,7 @@ public void execute(CommandSender sender, String[] args) {
5242
5343
MapBean rules = settings.getProperty(CommandProperties.RULES);
5444
String bind = rules.getMap().get(current.getName());
55-
ServerSection target = sections.getByName(bind);
45+
ServerSection target = holder.getByName(bind);
5646
5747
if (target == null) {
5848
if (current.getParent() != null) {
@@ -73,7 +63,7 @@ public void execute(CommandSender sender, String[] args) {
7363
return target;
7464
} else {
7565
if (settings.getProperty(GeneralProperties.FALLBACK_PRINCIPAL)) {
76-
return sections.getPrincipal();
66+
return holder.getPrincipal();
7767
}
7868
}
7969
@@ -87,15 +77,15 @@ public void execute(CommandSender sender, String[] args) {
8777
try {
8878
int number = Integer.parseInt(args[0]);
8979
if (number <= 0) {
90-
MessageUtils.send(player, ConfigEntries.INVALID_INPUT_MESSAGE.get());
80+
MessageUtils.send(player, settings.getProperty(MessageProperties.INVALID_INPUT));
9181
} else if (number > target.getServers().size()) {
92-
MessageUtils.send(player, ConfigEntries.FAILURE_MESSAGE.get());
82+
MessageUtils.send(player, settings.getProperty(MessageProperties.MISC_FAILURE));
9383
} else {
9484
ServerInfo server = target.getSortedServers().get(number - 1);
9585
ConnectionIntent.direct(plugin, player, server, (response, throwable) -> {});
9686
}
9787
} catch (NumberFormatException e) {
98-
MessageUtils.send(player, ConfigEntries.INVALID_INPUT_MESSAGE.get());
88+
MessageUtils.send(player, settings.getProperty(MessageProperties.INVALID_INPUT));
9989
}
10090
} else {
10191
ConnectionIntent.simple(plugin, player, target);
@@ -107,5 +97,6 @@ public void execute(CommandSender sender, String[] args) {
10797
} else {
10898
sender.sendMessage(new ComponentBuilder("This command can only be executed by a player").color(ChatColor.RED).create());
10999
}
100+
*/
110101
}
111102
}

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

Lines changed: 24 additions & 21 deletions
Original file line numberDiff line numberDiff line change
@@ -1,39 +1,41 @@
11
package com.jaimemartz.playerbalancer.commands;
22

3-
import com.google.common.base.Strings;
43
import com.jaimemartz.playerbalancer.PlayerBalancer;
5-
import com.jaimemartz.playerbalancer.connection.ConnectionIntent;
6-
import com.jaimemartz.playerbalancer.ping.ServerStatus;
7-
import com.jaimemartz.playerbalancer.section.ServerSection;
8-
import com.jaimemartz.playerbalancer.utils.MessageUtils;
9-
import net.md_5.bungee.api.ChatColor;
4+
import com.jaimemartz.playerbalancer.ping.StatusManager;
5+
import com.jaimemartz.playerbalancer.settings.Settings;
6+
import com.jaimemartz.playerbalancer.settings.beans.SectionsHandler;
107
import net.md_5.bungee.api.CommandSender;
11-
import net.md_5.bungee.api.chat.ClickEvent;
12-
import net.md_5.bungee.api.chat.ComponentBuilder;
13-
import net.md_5.bungee.api.chat.HoverEvent;
14-
import net.md_5.bungee.api.connection.ProxiedPlayer;
158
import net.md_5.bungee.api.plugin.Command;
169

17-
import java.util.Arrays;
18-
import java.util.Map;
10+
import javax.inject.Inject;
1911

2012
public class ManageCommand extends Command {
21-
private final PlayerBalancer plugin;
13+
@Inject
14+
private PlayerBalancer plugin;
2215

23-
public ManageCommand(PlayerBalancer plugin) {
16+
@Inject
17+
private SectionsHandler holder;
18+
19+
@Inject
20+
private StatusManager checker;
21+
22+
@Inject
23+
private Settings settings;
24+
25+
public ManageCommand() {
2426
super("section");
25-
this.plugin = plugin;
2627
}
2728

2829
@Override
2930
public void execute(CommandSender sender, String[] args) {
31+
/*
3032
if (sender.hasPermission("playerbalancer.admin")) {
3133
if (args.length != 0) {
3234
switch (args[0].toLowerCase()) {
3335
case "connect": {
3436
if (args.length >= 2) {
3537
String input = args[1];
36-
ServerSection section = plugin.getSectionManager().getByName(input);
38+
ServerSection section = holder.getByName(input);
3739
if (section != null) {
3840
if (args.length == 3) {
3941
ProxiedPlayer player = plugin.getProxy().getPlayer(args[2]);
@@ -50,7 +52,7 @@ public void execute(CommandSender sender, String[] args) {
5052
}
5153
}
5254
} else {
53-
MessageUtils.send(sender, ConfigEntries.UNKNOWN_SECTION_MESSAGE.get());
55+
MessageUtils.send(sender, settings.getProperty(MessageProperties.UNKNOWN_SECTION));
5456
}
5557
} else {
5658
sender.sendMessage(new ComponentBuilder("Usage: /balancer connect <section> [player]").color(ChatColor.RED).create());
@@ -61,7 +63,7 @@ public void execute(CommandSender sender, String[] args) {
6163
case "info": {
6264
if (args.length == 2) {
6365
String input = args[1];
64-
ServerSection section = plugin.getSectionManager().getByName(input);
66+
ServerSection section = holder.getByName(input);
6567
if (section != null) {
6668
sender.sendMessage(new ComponentBuilder(Strings.repeat("-", 53)).strikethrough(true).color(ChatColor.GRAY).create());
6769
@@ -165,7 +167,7 @@ public void execute(CommandSender sender, String[] args) {
165167
);
166168
167169
section.getServers().forEach(server -> {
168-
ServerStatus status = plugin.getStatusManager().getStatus(server);
170+
ServerStatus status = checker.getStatus(server);
169171
sender.sendMessage(new ComponentBuilder("\u2022 Server: ")
170172
.color(ChatColor.GRAY)
171173
.append(server.getName())
@@ -202,7 +204,7 @@ public void execute(CommandSender sender, String[] args) {
202204
203205
sender.sendMessage(new ComponentBuilder(Strings.repeat("-", 53)).strikethrough(true).color(ChatColor.GRAY).create());
204206
} else {
205-
MessageUtils.send(sender, ConfigEntries.UNKNOWN_SECTION_MESSAGE.get());
207+
MessageUtils.send(sender, settings.getProperty(MessageProperties.UNKNOWN_SECTION));
206208
}
207209
} else {
208210
sender.sendMessage(new ComponentBuilder("Usage: /balancer info <section>").color(ChatColor.RED).create());
@@ -211,7 +213,7 @@ public void execute(CommandSender sender, String[] args) {
211213
}
212214
213215
case "list": {
214-
Map<String, ServerSection> sections = plugin.getSectionManager().getSections();
216+
Map<String, ServerSection> sections = sections.getSections();
215217
216218
if (!sections.isEmpty()) {
217219
sender.sendMessage(new ComponentBuilder("These are the registered sections: ").color(ChatColor.GRAY).create());
@@ -248,5 +250,6 @@ public void execute(CommandSender sender, String[] args) {
248250
} else {
249251
sender.sendMessage(new ComponentBuilder("You do not have permission to execute this command!").color(ChatColor.RED).create());
250252
}
253+
*/
251254
}
252255
}

‎src/main/java/com/jaimemartz/playerbalancer/connection/ConnectionIntent.java‎

Lines changed: 2 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -1,21 +1,7 @@
11
package com.jaimemartz.playerbalancer.connection;
22

3-
import com.jaimemartz.playerbalancer.PlayerBalancer;
4-
import com.jaimemartz.playerbalancer.manager.PlayerLocker;
5-
import com.jaimemartz.playerbalancer.ping.ServerStatus;
6-
import com.jaimemartz.playerbalancer.section.ServerSection;
7-
import com.jaimemartz.playerbalancer.settings.ConfigEntries;
8-
import com.jaimemartz.playerbalancer.utils.MessageUtils;
9-
import net.md_5.bungee.api.Callback;
10-
import net.md_5.bungee.api.config.ServerInfo;
11-
import net.md_5.bungee.api.connection.ProxiedPlayer;
12-
import net.md_5.bungee.api.connection.Server;
13-
14-
import java.util.ArrayList;
15-
import java.util.List;
16-
import java.util.concurrent.TimeUnit;
17-
183
public abstract class ConnectionIntent {
4+
/*
195
protected final PlayerBalancer plugin;
206
protected final ProxiedPlayer player;
217
protected final ServerSection section;
@@ -122,4 +108,5 @@ public static void direct(PlayerBalancer plugin, ProxiedPlayer player, ServerInf
122108
callback.done(result, throwable);
123109
});
124110
}
111+
*/
125112
}

0 commit comments

Comments
 (0)