We need to extend BungeeServerInfo, so now we depend on the BungeeCord jar

Author: jamezrin

.circleci/config.yml

@@ -30,6 +30,7 @@ jobs:
           # fallback to using the latest cache if no exact match is found
           - v1-dependencies-
 
+      - run: sh ./setup.sh
       - run: mvn dependency:go-offline
 
       - save_cache:

.gitignore

@@ -5,4 +5,5 @@ target/
 dependency-reduced-pom.xml
 *.class
 *.jar
-*~
+*~
+libs/

.travis.yml

@@ -14,14 +14,6 @@
     </properties>
 
     <repositories>
-        <repository>
-            <id>bungee-repo</id>
-            <url>https://oss.sonatype.org/content/repositories/snapshots</url>
-        </repository>
-        <repository>
-            <id>md_5-snapshots</id>
-            <url>http://repo.md-5.net/content/repositories/snapshots/</url>
-        </repository>
         <repository>
             <id>inventive-repo</id>
             <url>https://repo.inventivetalent.org/content/groups/public/</url>
@@ -80,8 +72,8 @@
     <dependencies>
         <dependency>
             <groupId>net.md-5</groupId>
-            <artifactId>bungeecord-api</artifactId>
-            <version>1.11-SNAPSHOT</version>
+            <artifactId>bungeecord-proxy</artifactId>
+            <version>local</version>
             <scope>provided</scope>
         </dependency>
         <dependency>

pom.xml

@@ -0,0 +1,6 @@
+@echo off
+
+mkdir libs
+cd libs
+powershell -Command "Invoke-WebRequest https://ci.md-5.net/job/BungeeCord/lastSuccessfulBuild/artifact/bootstrap/target/BungeeCord.jar -OutFile BungeeCord.jar"
+mvn install:install-file -Dfile=BungeeCord.jar -DgroupId=net.md-5 -DartifactId=bungeecord-proxy -Dversion=local -Dpackaging=jar

setup.bat

@@ -0,0 +1,5 @@
+#!/usr/bin/env bash
+
+mkdir libs && cd "$_"
+wget https://ci.md-5.net/job/BungeeCord/lastSuccessfulBuild/artifact/bootstrap/target/BungeeCord.jar
+mvn install:install-file -Dfile=BungeeCord.jar -DgroupId=net.md-5 -DartifactId=bungeecord-proxy -Dversion=local -Dpackaging=jar

setup.sh

@@ -14,8 +14,6 @@
 import net.md_5.bungee.api.connection.ProxiedPlayer;
 import net.md_5.bungee.api.plugin.Command;
 
-import java.util.ArrayList;
-
 public class FallbackCommand extends Command {
     protected final PlayerBalancer plugin;
     protected final MessagesProps messages;
@@ -43,11 +41,18 @@ public void execute(CommandSender sender, String[] args) {
                         } else if (number > target.getServers().size()) {
                             MessageUtils.send(player, messages.getFailureMessage());
                         } else {
-                            //todo improve this!!! javafx.collections.transformation.SortedList?
-                            ServerInfo server = new ArrayList<>(target.getServers()).get(number - 1);
-                            ConnectionIntent.direct(plugin, player, server, (response, throwable) -> {
-                                //todo something missing
-                            });
+                            int iterations = 0;
+                            for (ServerInfo server : target.getServers()) {
+                                if (iterations++ < number) {
+                                    continue;
+                                }
+
+                                ConnectionIntent.direct(plugin, player, server, (response, throwable) -> {
+                                    //todo nothing to do?
+                                });
+
+                                break;
+                            }
                         }
                     } catch (NumberFormatException e) {
                         MessageUtils.send(player, messages.getInvalidInputMessage());

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

@@ -24,7 +24,7 @@ public ConnectionIntent(PlayerBalancer plugin, ProxiedPlayer player, ProviderTyp
         this.player = player;
         this.section = section;
 
-        MessageUtils.send(player, plugin.getSettings().getMessagesProps().getConnectedMessage(),
+        MessageUtils.send(player, plugin.getSettings().getMessagesProps().getConnectingMessage(),
                 (str) -> str.replace("{section}", section.getName())
         );
 

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

@@ -69,6 +69,7 @@ public ProviderType getImplicitProvider() {
         } else {
             return props.getProvider();
         }
+
     }
 
     public ProviderType getExplicitProvider() {

src/main/java/com/jaimemartz/playerbalancer/section/ServerSection.java

@@ -73,4 +73,16 @@ public boolean isDebug() {
     public void setDebug(boolean debug) {
         this.debug = debug;
     }
+
+    @Override
+    public String toString() {
+        return "ServerCheckerProps{" +
+                "enabled=" + enabled +
+                ", tactic=" + tactic +
+                ", attempts=" + attempts +
+                ", interval=" + interval +
+                ", markerDescs=" + markerDescs +
+                ", debug=" + debug +
+                '}';
+    }
 }