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

Merge pull request #3675 from Adam-/xtea

Browse Source 
Batch xteas in one request
This commit is contained in:
Adam
2018-06-08 14:11:57 -04:00
committed by GitHub
parent a7d14b85d7 cbec088a6b
commit aefbf81f29
7 changed files with 31 additions and 103 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
runelite-client/src/main/java/net/runelite/client/plugins/instancemap/InstanceMapOverlay.java
View File

@@ -37,7 +37,6 @@ import net.runelite.api.SpritePixels;
import net.runelite.api.Tile;
import net.runelite.api.coords.LocalPoint;
import net.runelite.api.events.GameStateChanged;
import net.runelite.api.events.MapRegionChanged;
import net.runelite.client.ui.overlay.Overlay;
import net.runelite.client.ui.overlay.OverlayLayer;
import net.runelite.client.ui.overlay.OverlayPosition;
@@ -214,16 +213,6 @@ class InstanceMapOverlay extends Overlay
graphics.drawRect(x, y, PLAYER_MARKER_SIZE, PLAYER_MARKER_SIZE);//outline
}
/**
* Handles region changes and re-draws the map
*
* @param event The region change event
*/
public void onRegionChange(MapRegionChanged event)
{
mapImage = null;
}
/**
* Handles game state changes and re-draws the map
*

7
runelite-client/src/main/java/net/runelite/client/plugins/instancemap/InstanceMapPlugin.java
View File

@@ -28,7 +28,6 @@ import com.google.common.eventbus.Subscribe;
import com.google.inject.Binder;
import javax.inject.Inject;
import net.runelite.api.events.GameStateChanged;
import net.runelite.api.events.MapRegionChanged;
import net.runelite.api.events.WidgetMenuOptionClicked;
import net.runelite.api.widgets.WidgetInfo;
import static net.runelite.api.widgets.WidgetInfo.WORLD_MAP_OPTION;
@@ -96,12 +95,6 @@ public class InstanceMapPlugin extends Plugin
mouseManager.unregisterMouseWheelListener(inputListener);
}
@Subscribe
public void regionChange(MapRegionChanged event)
{
overlay.onRegionChange(event);
}
@Subscribe
public void gameStateChange(GameStateChanged event)
{

7
runelite-client/src/main/java/net/runelite/client/plugins/motherlode/MotherlodePlugin.java
View File

@@ -62,7 +62,6 @@ import net.runelite.api.events.GameObjectChanged;
import net.runelite.api.events.GameObjectDespawned;
import net.runelite.api.events.GameObjectSpawned;
import net.runelite.api.events.GameStateChanged;
import net.runelite.api.events.MapRegionChanged;
import net.runelite.api.events.VarbitChanged;
import net.runelite.api.events.WallObjectChanged;
import net.runelite.api.events.WallObjectDespawned;
@@ -334,12 +333,6 @@ public class MotherlodePlugin extends Plugin
rocks.remove(gameObject);
}
@Subscribe
public void onRegionChanged(MapRegionChanged event)
{
inMlm = checkInMlm();
}
@Subscribe
public void onGameStateChanged(GameStateChanged event)
{

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 lombok.extern.slf4j.Slf4j;
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.PluginDescriptor;
import net.runelite.http.api.xtea.XteaClient;
import net.runelite.http.api.xtea.XteaKey;
import net.runelite.http.api.xtea.XteaRequest;
@PluginDescriptor(
name = "Xtea",
@@ -50,32 +53,45 @@ public class XteaPlugin extends Plugin
private Client client;
@Subscribe
public void onMapRegionChanged(MapRegionChanged event)
public void onGameStateChanged(GameStateChanged gameStateChanged)
{
int idx = event.getIndex();
if (idx == -1)
if (gameStateChanged.getGameState() != GameState.LOGGED_IN)
{
return; // this is the new array being assigned to the field
return;
}
int revision = client.getRevision();
int[] regions = client.getMapRegions();
int[][] xteaKeys = client.getXteaKeys();
int region = regions[idx];
int[] keys = xteaKeys[idx];
XteaRequest xteaRequest = new XteaRequest();
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;
}
sentRegions.add(region);
xteaClient.submit(revision, region, keys);
xteaClient.submit(xteaRequest);
}
}