From 0572763eb340a9c132fd0107e557fdb2f5913f5d Mon Sep 17 00:00:00 2001 From: TheRealNull Date: Mon, 6 Jan 2020 17:40:39 -0500 Subject: [PATCH] cleanup --- .../java/net/runelite/client/RuneLite.java | 4 +- .../client/plugins/party/PartyPlugin.java | 79 ++++++++----------- .../java/net/runelite/client/ws/WSClient.java | 28 +++---- 3 files changed, 50 insertions(+), 61 deletions(-) diff --git a/runelite-client/src/main/java/net/runelite/client/RuneLite.java b/runelite-client/src/main/java/net/runelite/client/RuneLite.java index 7b14b2d48c..14f93d3cc3 100644 --- a/runelite-client/src/main/java/net/runelite/client/RuneLite.java +++ b/runelite-client/src/main/java/net/runelite/client/RuneLite.java @@ -162,8 +162,8 @@ public class RuneLite @Inject private Provider chatboxPanelManager; - @Inject - private Provider partyService; + @Inject + private Provider partyService; @Inject private Hooks hooks; diff --git a/runelite-client/src/main/java/net/runelite/client/plugins/party/PartyPlugin.java b/runelite-client/src/main/java/net/runelite/client/plugins/party/PartyPlugin.java index 5aa260b5e8..daa7fa3e37 100644 --- a/runelite-client/src/main/java/net/runelite/client/plugins/party/PartyPlugin.java +++ b/runelite-client/src/main/java/net/runelite/client/plugins/party/PartyPlugin.java @@ -30,7 +30,6 @@ import com.google.inject.Binder; import com.google.inject.Provides; import java.awt.Color; import java.awt.event.KeyEvent; -import java.lang.reflect.Member; import java.time.temporal.ChronoUnit; import java.util.ArrayList; import java.util.Collections; @@ -87,7 +86,12 @@ import net.runelite.client.ws.PartyMember; import net.runelite.client.ws.PartyService; import net.runelite.client.ws.WSClient; import net.runelite.http.api.ws.WebsocketMessage; -import net.runelite.http.api.ws.messages.party.*; +import net.runelite.http.api.ws.messages.party.Join; +import net.runelite.http.api.ws.messages.party.PartyChatMessage; +import net.runelite.http.api.ws.messages.party.PartyMemberMessage; +import net.runelite.http.api.ws.messages.party.UserJoin; +import net.runelite.http.api.ws.messages.party.UserPart; +import net.runelite.http.api.ws.messages.party.UserSync; @PluginDescriptor( name = "Party", @@ -97,52 +101,37 @@ import net.runelite.http.api.ws.messages.party.*; @Singleton public class PartyPlugin extends Plugin implements KeyListener { - @Inject - private Client client; - - @Inject - private PartyService party; - - @Inject - private WSClient ws; - - @Inject - private OverlayManager overlayManager; - - @Inject - private PartyStatsOverlay partyStatsOverlay; - - @Inject - private PartyPingOverlay partyPingOverlay; - - @Inject - private KeyManager keyManager; - - @Inject - private WSClient wsClient; - - @Inject - private WorldMapPointManager worldMapManager; - - @Inject - private PartyConfig config; - - @Inject - private ChatMessageManager chatMessageManager; - - @Inject - private EventBus eventBus; - + @Getter(AccessLevel.PACKAGE) + private final Map partyDataMap = Collections.synchronizedMap(new HashMap<>()); + @Getter(AccessLevel.PACKAGE) + private final List pendingTilePings = Collections.synchronizedList(new ArrayList<>()); @Inject @Named("developerMode") boolean developerMode; - - @Getter(AccessLevel.PACKAGE) - private final Map partyDataMap = Collections.synchronizedMap(new HashMap<>()); - - @Getter(AccessLevel.PACKAGE) - private final List pendingTilePings = Collections.synchronizedList(new ArrayList<>()); - + @Inject + private Client client; + @Inject + private PartyService party; + @Inject + private WSClient ws; + @Inject + private OverlayManager overlayManager; + @Inject + private PartyStatsOverlay partyStatsOverlay; + @Inject + private PartyPingOverlay partyPingOverlay; + @Inject + private KeyManager keyManager; + @Inject + private WSClient wsClient; + @Inject + private WorldMapPointManager worldMapManager; + @Inject + private PartyConfig config; + @Inject + private ChatMessageManager chatMessageManager; + @Inject + private EventBus eventBus; private int lastHp, lastPray; private boolean hotkeyDown, doSync; private boolean sendAlert; diff --git a/runelite-client/src/main/java/net/runelite/client/ws/WSClient.java b/runelite-client/src/main/java/net/runelite/client/ws/WSClient.java index a0b2496f3c..caa840efbf 100644 --- a/runelite-client/src/main/java/net/runelite/client/ws/WSClient.java +++ b/runelite-client/src/main/java/net/runelite/client/ws/WSClient.java @@ -39,7 +39,7 @@ import net.runelite.http.api.RuneLiteAPI; import net.runelite.http.api.ws.WebsocketGsonFactory; import net.runelite.http.api.ws.WebsocketMessage; import net.runelite.http.api.ws.messages.Handshake; -import net.runelite.http.api.ws.messages.party.*; +import net.runelite.http.api.ws.messages.party.PartyMemberMessage; import okhttp3.Request; import okhttp3.Response; import okhttp3.WebSocket; @@ -148,9 +148,17 @@ public class WSClient extends WebSocketListener implements AutoCloseable } @Override - public void onOpen(@NotNull WebSocket webSocket, @NotNull Response response) + public void onClosed(@NotNull WebSocket webSocket, int code, @NotNull String reason) { - log.info("Websocket {} opened", webSocket); + log.info("Websocket {} closed: {}/{}", webSocket, code, reason); + this.webSocket = null; + } + + @Override + public void onFailure(@NotNull WebSocket webSocket, @NotNull Throwable t, Response response) + { + log.warn("Error in websocket {}:{}", response, t); + this.webSocket = null; } @Override @@ -175,21 +183,13 @@ public class WSClient extends WebSocketListener implements AutoCloseable } else { - eventBus.post(WebsocketMessage.class, message); + eventBus.post(WebsocketMessage.class, message); } } @Override - public void onClosed(@NotNull WebSocket webSocket, int code, @NotNull String reason) + public void onOpen(@NotNull WebSocket webSocket, @NotNull Response response) { - log.info("Websocket {} closed: {}/{}", webSocket, code, reason); - this.webSocket = null; - } - - @Override - public void onFailure(@NotNull WebSocket webSocket, @NotNull Throwable t, Response response) - { - log.warn("Error in websocket {}:{}", response, t); - this.webSocket = null; + log.info("Websocket {} opened", webSocket); } }