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

Merge branch 'master' of https://github.com/runelite/runelite

Browse Source 
 Conflicts:
	cache-client/pom.xml
	cache-updater/pom.xml
	cache/pom.xml
	pom.xml
	runelite-api/pom.xml
	runelite-api/src/main/java/net/runelite/api/GraphicID.java
	runelite-client/pom.xml
	runelite-jshell/pom.xml
	runelite-script-assembler-plugin/pom.xml
This commit is contained in:
zjustin
2022-03-20 16:24:49 +11:00
parent 9f10d5162d 3097531564
commit 57a73b0611
13 changed files with 124 additions and 63 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
runelite-api/src/main/java/net/runelite/api/GraphicID.java
View File

@@ -61,6 +61,8 @@ public final class GraphicID
public static final int XERIC_TELEPORT = 1612;
public static final int GRAPHICS_OBJECT_ROCKFALL = 1727;
public static final int ZALCANO_PROJECTILE_FIREBALL = 1728;
public static final int CANNONBALL_OR = 2018;
public static final int GRANITE_CANNONBALL_OR = 2019;
public static final int LIZARDMAN_SHAMAN_AOE = 1293;
public static final int CRAZY_ARCHAEOLOGIST_AOE = 1260;

6
runelite-api/src/main/java/net/runelite/api/GraphicsObject.java
View File

@@ -60,11 +60,9 @@ public interface GraphicsObject extends Renderable
int getLevel();
/**
* Gets the height of the graphic.
*
* @return the height
* Gets the z coordinate
*/
int getHeight();
int getZ();
/**
* Checks if this spotanim is done animating

11
runelite-api/src/main/java/net/runelite/api/Perspective.java
View File

@@ -43,6 +43,7 @@ import net.runelite.api.geometry.SimplePolygon;
import net.runelite.api.model.Jarvis;
import net.runelite.api.widgets.Widget;
import net.runelite.api.widgets.WidgetInfo;
import org.jetbrains.annotations.ApiStatus;
/**
* A utility class containing methods to help with conversion between
@@ -678,21 +679,19 @@ public class Perspective
* @param client the game client
* @param model the model to calculate a clickbox for
* @param orientation the orientation of the model (0-2048, where 0 is north)
* @param point the coordinate of the tile
* @param x x coord in local space
* @param z y coord in local space
* @return the clickable area of the model
*/
@Nullable
public static Shape getClickbox(@Nonnull Client client, Model model, int orientation, LocalPoint point)
@ApiStatus.Internal
public static Shape getClickbox(@Nonnull Client client, Model model, int orientation, int x, int y, int z)
{
if (model == null)
{
return null;
}
int x = point.getX();
int y = point.getY();
int z = getTileHeight(client, point, client.getPlane());
SimplePolygon bounds = calculateAABB(client, model, orientation, x, y, z);
if (bounds == null)

5
runelite-api/src/main/java/net/runelite/api/TileObject.java
View File

@@ -51,6 +51,11 @@ public interface TileObject extends Locatable
*/
int getY();
/**
* Gets the vertical coordinate of this object
*/
int getZ();
/**
* Gets the plane of the tile that the object is on.
*/