From 097a0bdf7b5ed60ab26fa380c5f48ba45d18d666 Mon Sep 17 00:00:00 2001 From: Jak Date: Sun, 29 Jul 2018 14:49:01 +0100 Subject: [PATCH 1/3] Fix ServerDesc comparitor to allow duplicate server names --- src/main/java/org/parabot/core/desc/ServerDescription.java | 2 ++ 1 file changed, 2 insertions(+) diff --git a/src/main/java/org/parabot/core/desc/ServerDescription.java b/src/main/java/org/parabot/core/desc/ServerDescription.java index 687410c..89b191b 100644 --- a/src/main/java/org/parabot/core/desc/ServerDescription.java +++ b/src/main/java/org/parabot/core/desc/ServerDescription.java @@ -37,6 +37,8 @@ public class ServerDescription implements Comparable { @Override public int compareTo(ServerDescription o) { + if (this.getServerName().equalsIgnoreCase(o.getServerName())) + return 1; return this.getServerName().compareTo(o.getServerName()); } From b4ba5efb49ff791fbcf6cec1693969407073d4f0 Mon Sep 17 00:00:00 2001 From: Shadowrs Date: Sat, 1 Sep 2018 20:11:12 +0100 Subject: [PATCH 2/3] Brackets --- src/main/java/org/parabot/core/desc/ServerDescription.java | 3 ++- 1 file changed, 2 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 89b191b..f908842 100644 --- a/src/main/java/org/parabot/core/desc/ServerDescription.java +++ b/src/main/java/org/parabot/core/desc/ServerDescription.java @@ -37,8 +37,9 @@ public class ServerDescription implements Comparable { @Override public int compareTo(ServerDescription o) { - if (this.getServerName().equalsIgnoreCase(o.getServerName())) + if (this.getServerName().equalsIgnoreCase(o.getServerName())) { return 1; + } return this.getServerName().compareTo(o.getServerName()); } From beeaebf323c0998a21b9be5bd2bf19b72f920748 Mon Sep 17 00:00:00 2001 From: Shadowrs Date: Tue, 4 Sep 2018 22:21:07 +0100 Subject: [PATCH 3/3] Add waypoint methods for Applet pre init and post start --- src/main/java/org/parabot/core/Context.java | 4 ++++ .../environment/servers/ServerProvider.java | 16 ++++++++++++++++ 2 files changed, 20 insertions(+) diff --git a/src/main/java/org/parabot/core/Context.java b/src/main/java/org/parabot/core/Context.java index 943d051..e709ff9 100644 --- a/src/main/java/org/parabot/core/Context.java +++ b/src/main/java/org/parabot/core/Context.java @@ -185,9 +185,13 @@ public class Context { panel.add(gameApplet); panel.validate(); + serverProvider.preAppletInit(); + gameApplet.init(); gameApplet.start(); + serverProvider.postAppletStart(); + java.util.Timer t = new java.util.Timer(); t.schedule(new TimerTask() { @Override diff --git a/src/main/java/org/parabot/environment/servers/ServerProvider.java b/src/main/java/org/parabot/environment/servers/ServerProvider.java index da9b465..6765781 100644 --- a/src/main/java/org/parabot/environment/servers/ServerProvider.java +++ b/src/main/java/org/parabot/environment/servers/ServerProvider.java @@ -146,4 +146,20 @@ public abstract class ServerProvider implements Opcodes { } + /** + * Called in Context.setApplet before applet.init() is called. Exclusively used for manipulating the Frame attached + * to the applet of Roatpkz. + */ + public void preAppletInit() { + + } + + /** + * Called in Context.setApplet before after applet.start() and applet.init() are called. Exclusively used for manipulating the Frame attached + * to the applet of Roatpkz. + */ + public void postAppletStart() { + + } + }