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

xtea plugin: batch xteas on gamestate change event

Browse Source
This commit is contained in:
Adam
2018-06-07 18:08:56 -04:00
parent 69380ab459
commit 2bc5c4eddd
2 changed files with 31 additions and 24 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
http-api/src/main/java/net/runelite/http/api/xtea/XteaClient.java
View File

@@ -47,17 +47,8 @@ public class XteaClient
private static final Logger logger = LoggerFactory.getLogger(XteaClient.class); private static final Logger logger = LoggerFactory.getLogger(XteaClient.class);
public void submit(int revision, int region, int[] keys) public void submit(XteaRequest xteaRequest)
{ {
XteaRequest xteaRequest = new XteaRequest();
xteaRequest.setRevision(revision);
XteaKey xteaKey = new XteaKey();
xteaKey.setRegion(region);
xteaKey.setKeys(keys);
xteaRequest.addKey(xteaKey);
String json = RuneLiteAPI.GSON.toJson(xteaRequest); String json = RuneLiteAPI.GSON.toJson(xteaRequest);
HttpUrl url = RuneLiteAPI.getApiBase().newBuilder() HttpUrl url = RuneLiteAPI.getApiBase().newBuilder()

44
runelite-client/src/main/java/net/runelite/client/plugins/xtea/XteaPlugin.java
View File

@@ -30,10 +30,13 @@ import java.util.Set;
import javax.inject.Inject; import javax.inject.Inject;
import lombok.extern.slf4j.Slf4j; import lombok.extern.slf4j.Slf4j;
import net.runelite.api.Client; import net.runelite.api.Client;
import net.runelite.api.events.MapRegionChanged; import net.runelite.api.GameState;
import net.runelite.api.events.GameStateChanged;
import net.runelite.client.plugins.Plugin; import net.runelite.client.plugins.Plugin;
import net.runelite.client.plugins.PluginDescriptor; import net.runelite.client.plugins.PluginDescriptor;
import net.runelite.http.api.xtea.XteaClient; import net.runelite.http.api.xtea.XteaClient;
import net.runelite.http.api.xtea.XteaKey;
import net.runelite.http.api.xtea.XteaRequest;
@PluginDescriptor( @PluginDescriptor(
name = "Xtea", name = "Xtea",
@@ -50,32 +53,45 @@ public class XteaPlugin extends Plugin
private Client client; private Client client;
@Subscribe @Subscribe
public void onMapRegionChanged(MapRegionChanged event) public void onGameStateChanged(GameStateChanged gameStateChanged)
{ {
int idx = event.getIndex(); if (gameStateChanged.getGameState() != GameState.LOGGED_IN)
if (idx == -1)
{ {
return; // this is the new array being assigned to the field return;
} }
int revision = client.getRevision(); int revision = client.getRevision();
int[] regions = client.getMapRegions(); int[] regions = client.getMapRegions();
int[][] xteaKeys = client.getXteaKeys(); int[][] xteaKeys = client.getXteaKeys();
int region = regions[idx]; XteaRequest xteaRequest = new XteaRequest();
int[] keys = xteaKeys[idx]; xteaRequest.setRevision(revision);
log.debug("Region {} keys {}, {}, {}, {}", region, keys[0], keys[1], keys[2], keys[3]); for (int idx = 0; idx < regions.length; ++idx)
{
int region = regions[idx];
int[] keys = xteaKeys[idx];
// No need to ever send more than once if (sentRegions.contains(region))
if (sentRegions.contains(region)) {
continue;
}
sentRegions.add(region);
log.debug("Region {} keys {}, {}, {}, {}", region, keys[0], keys[1], keys[2], keys[3]);
XteaKey xteaKey = new XteaKey();
xteaKey.setRegion(region);
xteaKey.setKeys(keys);
xteaRequest.addKey(xteaKey);
}
if (xteaRequest.getKeys().isEmpty())
{ {
return; return;
} }
sentRegions.add(region); xteaClient.submit(xteaRequest);
xteaClient.submit(revision, region, keys);
} }
} }