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

Rename Region to Scene

Browse Source
This commit is contained in:
Max Weber
2018-07-16 02:39:03 -06:00
parent 10ad7897a8
commit d7473bdb07
34 changed files with 161 additions and 182 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
runelite-client/src/main/java/net/runelite/client/callback/Hooks.java
View File

@@ -341,7 +341,7 @@ public class Hooks implements Callbacks
}
@Override
public void drawRegion()
public void drawScene()
{
MainBufferProvider bufferProvider = (MainBufferProvider) client.getBufferProvider();
BufferedImage image = (BufferedImage) bufferProvider.getImage();

6
runelite-client/src/main/java/net/runelite/client/plugins/PluginManager.java
View File

@@ -67,7 +67,7 @@ import net.runelite.client.events.PluginChanged;
import net.runelite.client.task.Schedule;
import net.runelite.client.task.ScheduledMethod;
import net.runelite.client.task.Scheduler;
import net.runelite.client.util.RegionTileManager;
import net.runelite.client.util.SceneTileManager;
@Singleton
@Slf4j
@@ -91,7 +91,7 @@ public class PluginManager
ScheduledExecutorService executor;
@Inject
RegionTileManager regionTileManager;
SceneTileManager sceneTileManager;
@Setter
boolean isOutdated;
@@ -314,7 +314,7 @@ public class PluginManager
});
log.debug("Plugin {} is now running", plugin.getClass().getSimpleName());
regionTileManager.simulateObjectSpawns(plugin);
sceneTileManager.simulateObjectSpawns(plugin);
eventBus.register(plugin);
schedule(plugin);
eventBus.post(new PluginChanged(plugin, true));

2
runelite-client/src/main/java/net/runelite/client/plugins/blastmine/BlastMineRockOverlay.java
View File

@@ -90,7 +90,7 @@ public class BlastMineRockOverlay extends Overlay
return null;
}
final Tile[][][] tiles = client.getRegion().getTiles();
final Tile[][][] tiles = client.getScene().getTiles();
final Widget viewport = client.getViewportWidget();
for (final BlastMineRock rock : rocks.values())

8
runelite-client/src/main/java/net/runelite/client/plugins/cluescrolls/ClueScrollPlugin.java
View File

@@ -49,7 +49,7 @@ import net.runelite.api.ItemComposition;
import net.runelite.api.ItemContainer;
import net.runelite.api.NPC;
import net.runelite.api.Query;
import net.runelite.api.Region;
import net.runelite.api.Scene;
import net.runelite.api.Tile;
import net.runelite.api.coords.LocalPoint;
import net.runelite.api.coords.WorldPoint;
@@ -339,9 +339,9 @@ public class ClueScrollPlugin extends Plugin
if (localLocation != null)
{
final Region region = client.getRegion();
final Tile[][][] tiles = region.getTiles();
final Tile tile = tiles[client.getPlane()][localLocation.getRegionX()][localLocation.getRegionY()];
final Scene scene = client.getScene();
final Tile[][][] tiles = scene.getTiles();
final Tile tile = tiles[client.getPlane()][localLocation.getSceneX()][localLocation.getSceneY()];
objectsToMark = Arrays.stream(tile.getGameObjects())
.filter(object -> object != null && object.getId() == objectId)

12
runelite-client/src/main/java/net/runelite/client/plugins/devtools/DevToolsOverlay.java
View File

@@ -37,6 +37,7 @@ import java.util.List;
import javax.inject.Inject;
import net.runelite.api.Actor;
import net.runelite.api.Client;
import net.runelite.api.Constants;
import net.runelite.api.DecorativeObject;
import net.runelite.api.GameObject;
import net.runelite.api.GraphicsObject;
@@ -50,7 +51,7 @@ import net.runelite.api.Perspective;
import net.runelite.api.Player;
import net.runelite.api.Point;
import net.runelite.api.Projectile;
import net.runelite.api.Region;
import net.runelite.api.Scene;
import net.runelite.api.Tile;
import net.runelite.api.WallObject;
import net.runelite.api.coords.LocalPoint;
@@ -79,7 +80,6 @@ public class DevToolsOverlay extends Overlay
private static final Color PURPLE = new Color(170, 0, 255);
private static final Color GRAY = new Color(158, 158, 158);
private static final int REGION_SIZE = 104;
private static final int MAX_DISTANCE = 2400;
private final Client client;
@@ -191,14 +191,14 @@ public class DevToolsOverlay extends Overlay
private void renderTileObjects(Graphics2D graphics)
{
Region region = client.getRegion();
Tile[][][] tiles = region.getTiles();
Scene scene = client.getScene();
Tile[][][] tiles = scene.getTiles();
int z = client.getPlane();
for (int x = 0; x < REGION_SIZE; ++x)
for (int x = 0; x < Constants.SCENE_SIZE; ++x)
{
for (int y = 0; y < REGION_SIZE; ++y)
for (int y = 0; y < Constants.SCENE_SIZE; ++y)
{
Tile tile = tiles[z][x][y];

8
runelite-client/src/main/java/net/runelite/client/plugins/devtools/LocationOverlay.java
View File

@@ -74,14 +74,14 @@ public class LocationOverlay extends Overlay
int[][][] instanceTemplateChunks = client.getInstanceTemplateChunks();
int z = client.getPlane();
int chunkData = instanceTemplateChunks[z][localPoint.getRegionX() / CHUNK_SIZE][localPoint.getRegionY() / CHUNK_SIZE];
int chunkData = instanceTemplateChunks[z][localPoint.getSceneX() / CHUNK_SIZE][localPoint.getSceneY() / CHUNK_SIZE];
int rotation = chunkData >> 1 & 0x3;
int chunkY = (chunkData >> 3 & 0x7FF) * CHUNK_SIZE;
int chunkX = (chunkData >> 14 & 0x3FF) * CHUNK_SIZE;
panelComponent.getChildren().add(LineComponent.builder()
.left("Chunk " + localPoint.getRegionX() / CHUNK_SIZE + "," + localPoint.getRegionY() / CHUNK_SIZE)
.left("Chunk " + localPoint.getSceneX() / CHUNK_SIZE + "," + localPoint.getSceneY() / CHUNK_SIZE)
.right(rotation + " " + chunkX + " " + chunkY)
.build());
}
@@ -97,8 +97,8 @@ public class LocationOverlay extends Overlay
.build());
panelComponent.getChildren().add(LineComponent.builder()
.left("Region")
.right(localPoint.getRegionX() + ", " + localPoint.getRegionY())
.left("Scene")
.right(localPoint.getSceneX() + ", " + localPoint.getSceneY())
.build());
panelComponent.getChildren().add(LineComponent.builder()

2
runelite-client/src/main/java/net/runelite/client/plugins/discord/DiscordPlugin.java
View File

@@ -253,7 +253,7 @@ public class DiscordPlugin extends Plugin
final LocalPoint localPoint = client.getLocalPlayer().getLocalLocation();
final int[][][] instanceTemplateChunks = client.getInstanceTemplateChunks();
final int z = client.getPlane();
final int chunkData = instanceTemplateChunks[z][localPoint.getRegionX() / CHUNK_SIZE][localPoint.getRegionY() / CHUNK_SIZE];
final int chunkData = instanceTemplateChunks[z][localPoint.getSceneX() / CHUNK_SIZE][localPoint.getSceneY() / CHUNK_SIZE];
// extract world point from chunk data
final int chunkY = (chunkData >> 3 & 0x7FF) * CHUNK_SIZE;

16
runelite-client/src/main/java/net/runelite/client/plugins/grounditems/GroundItemsPlugin.java
View File

@@ -53,7 +53,7 @@ import lombok.Getter;
import lombok.Setter;
import lombok.extern.slf4j.Slf4j;
import net.runelite.api.Client;
import static net.runelite.api.Constants.REGION_SIZE;
import static net.runelite.api.Constants.SCENE_SIZE;
import net.runelite.api.GameState;
import net.runelite.api.Item;
import net.runelite.api.ItemComposition;
@@ -63,7 +63,7 @@ import net.runelite.api.MenuAction;
import net.runelite.api.MenuEntry;
import net.runelite.api.Node;
import net.runelite.api.Player;
import net.runelite.api.Region;
import net.runelite.api.Scene;
import net.runelite.api.Tile;
import net.runelite.api.coords.LocalPoint;
import net.runelite.api.events.ConfigChanged;
@@ -232,16 +232,16 @@ public class GroundItemsPlugin extends Plugin
dirty = false;
final Region region = client.getRegion();
final Tile[][][] tiles = region.getTiles();
final Scene scene = client.getScene();
final Tile[][][] tiles = scene.getTiles();
final int z = client.getPlane();
final LocalPoint from = player.getLocalLocation();
groundItems.clear();
for (int x = 0; x < REGION_SIZE; ++x)
for (int x = 0; x < SCENE_SIZE; ++x)
{
for (int y = 0; y < REGION_SIZE; ++y)
for (int y = 0; y < SCENE_SIZE; ++y)
{
Tile tile = tiles[z][x][y];
if (tile == null)
@@ -369,8 +369,8 @@ public class GroundItemsPlugin extends Plugin
&& event.getType() == MenuAction.GROUND_ITEM_THIRD_OPTION.getId())
{
int itemId = event.getIdentifier();
Region region = client.getRegion();
Tile tile = region.getTiles()[client.getPlane()][event.getActionParam0()][event.getActionParam1()];
Scene scene = client.getScene();
Tile tile = scene.getTiles()[client.getPlane()][event.getActionParam0()][event.getActionParam1()];
ItemLayer itemLayer = tile.getItemLayer();
if (itemLayer == null)

6
runelite-client/src/main/java/net/runelite/client/plugins/groundmarkers/GroundMarkerPlugin.java
View File

@@ -285,7 +285,7 @@ public class GroundMarkerPlugin extends Plugin
return;
}
Tile target = client.getSelectedRegionTile();
Tile target = client.getSelectedSceneTile();
markTile(target.getLocalLocation());
}
@@ -316,8 +316,8 @@ public class GroundMarkerPlugin extends Plugin
if (client.isInInstancedRegion())
{
// get position in the scene
int sceneX = localPoint.getRegionX();
int sceneY = localPoint.getRegionY();
int sceneX = localPoint.getSceneX();
int sceneY = localPoint.getSceneY();
// get chunk from scene
int chunkX = sceneX / CHUNK_SIZE;

4
runelite-client/src/main/java/net/runelite/client/plugins/hunter/HunterPlugin.java
View File

@@ -306,7 +306,7 @@ public class HunterPlugin extends Plugin
{
// Check if all traps are still there, and remove the ones that are not.
Iterator<Map.Entry<WorldPoint, HunterTrap>> it = traps.entrySet().iterator();
Tile[][][] tiles = client.getRegion().getTiles();
Tile[][][] tiles = client.getScene().getTiles();
Instant expire = Instant.now().minus(HunterTrap.TRAP_TIME.multipliedBy(2));
@@ -330,7 +330,7 @@ public class HunterPlugin extends Plugin
continue;
}
Tile tile = tiles[world.getPlane()][local.getRegionX()][local.getRegionY()];
Tile tile = tiles[world.getPlane()][local.getSceneX()][local.getSceneY()];
GameObject[] objects = tile.getGameObjects();
boolean containsBoulder = false;

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

@@ -72,7 +72,7 @@ class InstanceMapOverlay extends Overlay
private final Client client;
/**
* Saved image of the region, no reason to draw the whole thing every
* Saved image of the scene, no reason to draw the whole thing every
* frame.
*/
private volatile BufferedImage mapImage;
@@ -182,8 +182,8 @@ class InstanceMapOverlay extends Overlay
*/
private Tile[][] getTiles()
{
Tile[][][] regionTiles = client.getRegion().getTiles();
return regionTiles[viewedPlane];
Tile[][][] sceneTiles = client.getScene().getTiles();
return sceneTiles[viewedPlane];
}
/**
@@ -197,8 +197,8 @@ class InstanceMapOverlay extends Overlay
LocalPoint playerLoc = player.getLocalLocation();
Tile[][] tiles = getTiles();
int tileX = playerLoc.getRegionX();
int tileY = (tiles[0].length - 1) - playerLoc.getRegionY(); // flip the y value
int tileX = playerLoc.getSceneX();
int tileY = (tiles[0].length - 1) - playerLoc.getSceneY(); // flip the y value
int x = tileX * TILE_SIZE;
int y = tileY * TILE_SIZE;

2
runelite-client/src/main/java/net/runelite/client/plugins/kourendlibrary/KourendLibraryPlugin.java
View File

@@ -171,7 +171,7 @@ public class KourendLibraryPlugin extends Plugin
{
if (MenuAction.GAME_OBJECT_FIRST_OPTION == menuOpt.getMenuAction() && menuOpt.getMenuTarget().contains("Bookshelf"))
{
lastBookcaseClick = WorldPoint.fromRegion(client, menuOpt.getActionParam(), menuOpt.getWidgetId(), client.getPlane());
lastBookcaseClick = WorldPoint.fromScene(client, menuOpt.getActionParam(), menuOpt.getWidgetId(), client.getPlane());
}
}

8
runelite-client/src/main/java/net/runelite/client/plugins/raids/RaidsPlugin.java
View File

@@ -410,7 +410,7 @@ public class RaidsPlugin extends Plugin
private Point findLobbyBase()
{
Tile[][] tiles = client.getRegion().getTiles()[LOBBY_PLANE];
Tile[][] tiles = client.getScene().getTiles()[LOBBY_PLANE];
for (int x = 0; x < SCENE_SIZE; x++)
{
@@ -423,7 +423,7 @@ public class RaidsPlugin extends Plugin
if (tiles[x][y].getWallObject().getId() == NullObjectID.NULL_12231)
{
return tiles[x][y].getRegionLocation();
return tiles[x][y].getSceneLocation();
}
}
}
@@ -447,7 +447,7 @@ public class RaidsPlugin extends Plugin
for (int plane = 3; plane > 1; plane--)
{
tiles = client.getRegion().getTiles()[plane];
tiles = client.getScene().getTiles()[plane];
if (tiles[gridBase.getX() + RaidRoom.ROOM_MAX_SIZE][gridBase.getY()] == null)
{
@@ -510,7 +510,7 @@ public class RaidsPlugin extends Plugin
private RaidRoom determineRoom(Tile base)
{
RaidRoom room = new RaidRoom(base, RaidRoom.Type.EMPTY);
int chunkData = client.getInstanceTemplateChunks()[base.getPlane()][(base.getRegionLocation().getX()) / 8][base.getRegionLocation().getY() / 8];
int chunkData = client.getInstanceTemplateChunks()[base.getPlane()][(base.getSceneLocation().getX()) / 8][base.getSceneLocation().getY() / 8];
InstanceTemplates template = InstanceTemplates.findMatch(chunkData);
if (template == null)

16
runelite-client/src/main/java/net/runelite/client/util/RegionTileManager.java → runelite-client/src/main/java/net/runelite/client/util/SceneTileManager.java
View File

@@ -35,7 +35,7 @@ import javax.inject.Singleton;
import net.runelite.api.Client;
import net.runelite.api.Constants;
import net.runelite.api.GameState;
import net.runelite.api.Region;
import net.runelite.api.Scene;
import net.runelite.api.Tile;
import net.runelite.api.events.DecorativeObjectSpawned;
import net.runelite.api.events.GameObjectSpawned;
@@ -43,19 +43,19 @@ import net.runelite.api.events.GroundObjectSpawned;
import net.runelite.api.events.WallObjectSpawned;
@Singleton
public class RegionTileManager
public class SceneTileManager
{
private final EventBus eventBus = new EventBus();
private final Provider<Client> clientProvider;
@Inject
public RegionTileManager(Provider<Client> clientProvider)
public SceneTileManager(Provider<Client> clientProvider)
{
this.clientProvider = clientProvider;
}
/**
* Iterates over each tile in current region if player is logged in
* Iterates over each tile in the scene if player is logged in
* @param consumer consumer accepting tile as parameter
*/
public void forEachTile(Consumer<Tile> consumer)
@@ -67,14 +67,14 @@ public class RegionTileManager
return;
}
final Region region = client.getRegion();
final Tile[][][] tiles = region.getTiles();
final Scene scene = client.getScene();
final Tile[][][] tiles = scene.getTiles();
for (int z = 0; z < Constants.MAX_Z; ++z)
{
for (int x = 0; x < Constants.REGION_SIZE; ++x)
for (int x = 0; x < Constants.SCENE_SIZE; ++x)
{
for (int y = 0; y < Constants.REGION_SIZE; ++y)
for (int y = 0; y < Constants.SCENE_SIZE; ++y)
{
Tile tile = tiles[z][x][y];