ra/runelite
1
0
Fork 0
Code Issues Pull Requests Actions 3 Packages Projects Releases Wiki Activity

cleanup

Browse Source
This commit is contained in:
TheRealNull
2020-01-06 17:40:39 -05:00
parent 87ecf13e8a
commit 0572763eb3
3 changed files with 50 additions and 61 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
runelite-client/src/main/java/net/runelite/client/RuneLite.java
View File

@@ -162,8 +162,8 @@ public class RuneLite
@Inject @Inject
private Provider<ChatboxPanelManager> chatboxPanelManager; private Provider<ChatboxPanelManager> chatboxPanelManager;
@Inject @Inject
private Provider<PartyService> partyService; private Provider<PartyService> partyService;
@Inject @Inject
private Hooks hooks; private Hooks hooks;

79
runelite-client/src/main/java/net/runelite/client/plugins/party/PartyPlugin.java
View File

@@ -30,7 +30,6 @@ import com.google.inject.Binder;
import com.google.inject.Provides; import com.google.inject.Provides;
import java.awt.Color; import java.awt.Color;
import java.awt.event.KeyEvent; import java.awt.event.KeyEvent;
import java.lang.reflect.Member;
import java.time.temporal.ChronoUnit; import java.time.temporal.ChronoUnit;
import java.util.ArrayList; import java.util.ArrayList;
import java.util.Collections; 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.PartyService;
import net.runelite.client.ws.WSClient; import net.runelite.client.ws.WSClient;
import net.runelite.http.api.ws.WebsocketMessage; 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( @PluginDescriptor(
name = "Party", name = "Party",
@@ -97,52 +101,37 @@ import net.runelite.http.api.ws.messages.party.*;
@Singleton @Singleton
public class PartyPlugin extends Plugin implements KeyListener public class PartyPlugin extends Plugin implements KeyListener
{ {
@Inject @Getter(AccessLevel.PACKAGE)
private Client client; private final Map<UUID, PartyData> partyDataMap = Collections.synchronizedMap(new HashMap<>());
@Getter(AccessLevel.PACKAGE)
@Inject private final List<PartyTilePingData> pendingTilePings = Collections.synchronizedList(new ArrayList<>());
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;
@Inject @Inject
@Named("developerMode") @Named("developerMode")
boolean developerMode; boolean developerMode;
@Inject
@Getter(AccessLevel.PACKAGE) private Client client;
private final Map<UUID, PartyData> partyDataMap = Collections.synchronizedMap(new HashMap<>()); @Inject
private PartyService party;
@Getter(AccessLevel.PACKAGE) @Inject
private final List<PartyTilePingData> pendingTilePings = Collections.synchronizedList(new ArrayList<>()); 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 int lastHp, lastPray;
private boolean hotkeyDown, doSync; private boolean hotkeyDown, doSync;
private boolean sendAlert; private boolean sendAlert;

28
runelite-client/src/main/java/net/runelite/client/ws/WSClient.java
View File

@@ -39,7 +39,7 @@ import net.runelite.http.api.RuneLiteAPI;
import net.runelite.http.api.ws.WebsocketGsonFactory; import net.runelite.http.api.ws.WebsocketGsonFactory;
import net.runelite.http.api.ws.WebsocketMessage; import net.runelite.http.api.ws.WebsocketMessage;
import net.runelite.http.api.ws.messages.Handshake; 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.Request;
import okhttp3.Response; import okhttp3.Response;
import okhttp3.WebSocket; import okhttp3.WebSocket;
@@ -148,9 +148,17 @@ public class WSClient extends WebSocketListener implements AutoCloseable
} }
@Override @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 @Override
@@ -175,21 +183,13 @@ public class WSClient extends WebSocketListener implements AutoCloseable
} }
else else
{ {
eventBus.post(WebsocketMessage.class, message); eventBus.post(WebsocketMessage.class, message);
} }
} }
@Override @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); log.info("Websocket {} opened", webSocket);
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;
} }
} }