Merge branch 'development' into feature/expand-progresslistener

.travis.yml

@@ -34,7 +34,7 @@ env:
     - secure: UG+b1tEgc8xv9x4r//2OAIK1RrYv6n209KTTFMMwcnAa7DI8HaP8nljRa5/VhDhuKHdlVrYH/tI90v7UVBs0GDVNwK5V17Io0fMm3FUGZekSthTCqqno5wAGa9r6a6mMLtSaSmIFeIKi0+0d2ZwplRuhj/dtEYjjBBj+kK8g4nE=
     - secure: St/fecUDInFBCRriYqgp2F8PU9/SooorgxD9Mrs+b0EsC7AbtSsQXvdIv2Lp6xzdQ0VSXPcLIhULPOYrmBKnGQ/NjXTIZXxnroyQxxnI6xyEWIZwiHRY/bKRJDRbQTxD9NL32szKiDSwnw7pu6llF4D64UqQvziq4Gm6VohU75M=
     - secure: bD15GVZWowiknbfLavh8CxSh0GsnF5kT4kZ6ggCuUDGyj0mzqf7dNRnchQIKkCG0WRYyTrFN4pEiygeywWsipEeAVv9Xhx3cuUZmzeQaR5KCWabSwJ8gK6jZd1YhcWmM9vrdPHobZr65MP0y/8mu/Fovgky9dY7KDf4G3SebNrM=
-    - PARABOT_VERSION=2.6.8
+    - PARABOT_VERSION=2.7
 
 cache:
   directories:

README.md

@@ -3,7 +3,7 @@
 
 # Parabot
 
-Parabot V2.6.8.
+Parabot V2.7
 
 #### Links
 
@@ -42,7 +42,7 @@ Then you'll need to add the dependency:
         <dependency>
             <groupId>org.parabot</groupId>
             <artifactId>client</artifactId>
-            <version>2.6.3</version>
+            <version>2.7</version>
         </dependency>
     </dependencies>
 ```

pom.xml

@@ -6,7 +6,7 @@
 
     <groupId>org.parabot</groupId>
     <artifactId>client</artifactId>
-    <version>2.6.8</version>
+    <version>2.7</version>
   
     <packaging>jar</packaging>
 

src/main/java/org/parabot/Landing.java

@@ -15,10 +15,10 @@ import java.io.File;
 import java.io.IOException;
 
 /**
- * Parabot v2.6
+ * Parabot v2.7
  *
  * @author Everel, JKetelaar, Matt, Dane
- * @version 2.6
+ * @version 2.7
  * @see <a href="http://www.parabot.org">Homepage</a>
  */
 public final class Landing {

src/main/java/org/parabot/core/asm/RedirectClassAdapter.java

@@ -16,8 +16,12 @@ import java.util.Map;
 
 public class RedirectClassAdapter extends ClassVisitor implements Opcodes {
 
+    public static Map<String, Class<?>> getRedirects() {
+        return redirects;
+    }
+
     private static final Map<String, Class<?>> redirects = new HashMap<String, Class<?>>();
-    private static PrintStream str_out, class_out;
+    private static       PrintStream           str_out, class_out;
 
     static {
         redirects.put("java/awt/Toolkit", ToolkitRedirect.class);

src/main/java/org/parabot/core/desc/ServerDescription.java

@@ -39,7 +39,10 @@ public class ServerDescription implements Comparable<ServerDescription> {
     @Override
     public int compareTo(ServerDescription o) {
         if (this.getServerName().equalsIgnoreCase(o.getServerName())) {
-            return 1;
+            if (getAuthor().equals(o.getAuthor())) {
+                return Double.compare(o.getRevision(), getRevision());
+            }
+            return getAuthor().compareTo(o.getAuthor());
         }
         return this.getServerName().compareTo(o.getServerName());
     }