From 8a2255ac90dd1e8204f8f4238d8dd892ed702b91 Mon Sep 17 00:00:00 2001 From: Shadowrs Date: Fri, 14 Sep 2018 13:16:30 +0100 Subject: [PATCH 1/4] [Bugfix] Fix ServerDescription to use proper compare() to prevent conflict with matching names, authors and versions --- src/main/java/org/parabot/core/desc/ServerDescription.java | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/src/main/java/org/parabot/core/desc/ServerDescription.java b/src/main/java/org/parabot/core/desc/ServerDescription.java index a32695c..dcae4c8 100644 --- a/src/main/java/org/parabot/core/desc/ServerDescription.java +++ b/src/main/java/org/parabot/core/desc/ServerDescription.java @@ -39,7 +39,10 @@ public class ServerDescription implements Comparable { @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()); } From 031cde33fb9fdd6895da743c648e5132132dfed8 Mon Sep 17 00:00:00 2001 From: SCoutinho Date: Mon, 24 Sep 2018 17:30:26 +0100 Subject: [PATCH 2/4] [TASK] Version Bump --- .travis.yml | 2 +- README.md | 2 +- pom.xml | 2 +- src/main/java/org/parabot/Landing.java | 4 ++-- 4 files changed, 5 insertions(+), 5 deletions(-) diff --git a/.travis.yml b/.travis.yml index ee17f98..49ff419 100644 --- a/.travis.yml +++ b/.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: diff --git a/README.md b/README.md index 8f46946..3fcdbdd 100644 --- a/README.md +++ b/README.md @@ -3,7 +3,7 @@ # Parabot -Parabot V2.6.8. +Parabot V2.7 #### Links diff --git a/pom.xml b/pom.xml index 7a4d27a..fc2e9eb 100755 --- a/pom.xml +++ b/pom.xml @@ -6,7 +6,7 @@ org.parabot client - 2.6.8 + 2.7 jar diff --git a/src/main/java/org/parabot/Landing.java b/src/main/java/org/parabot/Landing.java index b3a9ea2..ed3efc2 100644 --- a/src/main/java/org/parabot/Landing.java +++ b/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 Homepage */ public final class Landing { From e742e0385e5bee3e4984f50f4d4822da24b0cf17 Mon Sep 17 00:00:00 2001 From: SCoutinho Date: Mon, 24 Sep 2018 19:06:15 +0100 Subject: [PATCH 3/4] [TASK] Changed dependecy version --- README.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/README.md b/README.md index 3fcdbdd..dfb55fb 100644 --- a/README.md +++ b/README.md @@ -42,7 +42,7 @@ Then you'll need to add the dependency: org.parabot client - 2.6.3 + 2.7 ``` From cb6a5831f177dbc328c874bfdb3ed563a6c85c28 Mon Sep 17 00:00:00 2001 From: Shadowrs Date: Fri, 5 Oct 2018 23:46:59 +0100 Subject: [PATCH 4/4] Add getter --- .../java/org/parabot/core/asm/RedirectClassAdapter.java | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/src/main/java/org/parabot/core/asm/RedirectClassAdapter.java b/src/main/java/org/parabot/core/asm/RedirectClassAdapter.java index 9ecebad..6bd0e49 100644 --- a/src/main/java/org/parabot/core/asm/RedirectClassAdapter.java +++ b/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> getRedirects() { + return redirects; + } + private static final Map> redirects = new HashMap>(); - private static PrintStream str_out, class_out; + private static PrintStream str_out, class_out; static { redirects.put("java/awt/Toolkit", ToolkitRedirect.class);