This commit is contained in:
therealunull
2020-12-14 05:25:01 -05:00
parent 77ea6c6154
commit b86aa9c5cc
207 changed files with 16762 additions and 3374 deletions

View File

@@ -28,7 +28,7 @@ package net.runelite.rs.api;
import net.runelite.api.Actor;
import net.runelite.mapping.Import;
public interface RSActor extends RSEntity, Actor
public interface RSActor extends RSRenderable, Actor
{
@Import("targetIndex")
@Override

View File

@@ -25,13 +25,13 @@ public interface RSBoundaryObject extends WallObject
@Override
int getOrientationB();
@Import("entity1")
@Import("renderable1")
@Override
RSEntity getEntity1();
RSRenderable getRenderable();
@Import("entity2")
@Import("renderable2")
@Override
RSEntity getEntity2();
RSRenderable getRenderable2();
@Import("flags")
@Override

View File

@@ -1,10 +1,10 @@
package net.runelite.rs.api;
import net.runelite.api.DynamicObject;
import net.runelite.api.Entity;
import net.runelite.api.Renderable;
import net.runelite.mapping.Import;
public interface RSDynamicObject extends RSEntity, DynamicObject, Entity
public interface RSDynamicObject extends RSRenderable, DynamicObject, Renderable
{
@Import("id")
int getId();

View File

@@ -15,9 +15,9 @@ public interface RSFloorDecoration extends GroundObject
@Import("y")
int getY();
@Import("entity")
@Import("renderable")
@Override
RSEntity getEntity();
RSRenderable getRenderable();
void setPlane(int plane);
}

View File

@@ -5,8 +5,8 @@ import net.runelite.mapping.Import;
public interface RSGameObject extends GameObject
{
@Import("entity")
RSEntity getEntity();
@Import("renderable")
RSRenderable getRenderable();
@Import("plane")
int getPlane();

View File

@@ -3,7 +3,7 @@ package net.runelite.rs.api;
import net.runelite.api.GraphicsObject;
import net.runelite.mapping.Import;
public interface RSGraphicsObject extends GraphicsObject, RSEntity
public interface RSGraphicsObject extends GraphicsObject, RSRenderable
{
@Import("id")
@Override

View File

@@ -28,7 +28,7 @@ import java.awt.Shape;
import net.runelite.api.Model;
import net.runelite.mapping.Import;
public interface RSModel extends RSEntity, Model
public interface RSModel extends RSRenderable, Model
{
@Import("verticesCount")
@Override

View File

@@ -2,7 +2,7 @@ package net.runelite.rs.api;
import net.runelite.mapping.Import;
public interface RSModelData extends RSEntity
public interface RSModelData extends RSRenderable
{
@Import("faceCount")
int getTriangleFaceCount();

View File

@@ -1,9 +1,9 @@
package net.runelite.rs.api;
import net.runelite.api.ObjectDefinition;
import net.runelite.api.ObjectComposition;
import net.runelite.mapping.Import;
public interface RSObjectComposition extends ObjectDefinition
public interface RSObjectComposition extends ObjectComposition
{
@Import("id")
@Override

View File

@@ -31,7 +31,7 @@ package net.runelite.rs.api;
import net.runelite.api.Projectile;
import net.runelite.mapping.Import;
public interface RSProjectile extends RSEntity, Projectile
public interface RSProjectile extends RSRenderable, Projectile
{
@Import("id")
@Override

View File

@@ -24,10 +24,10 @@
*/
package net.runelite.rs.api;
import net.runelite.api.Entity;
import net.runelite.api.Renderable;
import net.runelite.mapping.Import;
public interface RSEntity extends RSNode, Entity
public interface RSRenderable extends RSNode, Renderable
{
@Import("height")
int getModelHeight();

View File

@@ -45,10 +45,10 @@ public interface RSScene extends Scene
int getMinLevel();
@Import("newGroundItemPile")
void newGroundItemPile(int plane, int x, int y, int hash, RSEntity var5, long var6, RSEntity var7, RSEntity var8);
void newGroundItemPile(int plane, int x, int y, int hash, RSRenderable var5, long var6, RSRenderable var7, RSRenderable var8);
@Import("newGameObject")
boolean newGameObject(int plane, int startX, int startY, int var4, int var5, int centerX, int centerY, int height, RSEntity entity, int orientation, boolean tmp, long tag, int flags);
boolean newGameObject(int plane, int startX, int startY, int var4, int var5, int centerX, int centerY, int height, RSRenderable entity, int orientation, boolean tmp, long tag, int flags);
@Import("removeGameObject")
void removeGameObject(GameObject gameObject);

View File

@@ -1,9 +1,9 @@
package net.runelite.rs.api;
import net.runelite.api.TileModel;
import net.runelite.api.SceneTileModel;
import net.runelite.mapping.Import;
public interface RSTileModel extends TileModel
public interface RSSceneTileModel extends SceneTileModel
{
@Import("underlayRgb")
@Override

View File

@@ -1,9 +1,9 @@
package net.runelite.rs.api;
import net.runelite.api.TilePaint;
import net.runelite.api.SceneTilePaint;
import net.runelite.mapping.Import;
public interface RSTilePaint extends TilePaint
public interface RSSceneTilePaint extends SceneTilePaint
{
@Import("rgb")
@Override

View File

@@ -4,8 +4,8 @@ import net.runelite.api.DecorativeObject;
import net.runelite.api.GameObject;
import net.runelite.api.GroundObject;
import net.runelite.api.TileItemPile;
import net.runelite.api.TileModel;
import net.runelite.api.TilePaint;
import net.runelite.api.SceneTileModel;
import net.runelite.api.SceneTilePaint;
import net.runelite.api.Tile;
import net.runelite.api.WallObject;
import net.runelite.mapping.Import;
@@ -34,11 +34,11 @@ public interface RSTile extends Tile
@Import("paint")
@Override
TilePaint getTilePaint();
SceneTilePaint getSceneTilePaint();
@Import("model")
@Override
TileModel getTileModel();
SceneTileModel getSceneTileModel();
@Import("x")
int getX();

View File

@@ -3,7 +3,7 @@ import net.runelite.api.Tile;
import net.runelite.api.TileItem;
import net.runelite.mapping.Import;
public interface RSTileItem extends RSEntity, TileItem
public interface RSTileItem extends RSRenderable, TileItem
{
@Import("id")
@Override

View File

@@ -20,15 +20,15 @@ public interface RSTileItemPile extends TileItemPile
@Import("first")
@Override
RSEntity getBottom();
RSRenderable getBottom();
@Import("second")
@Override
RSEntity getMiddle();
RSRenderable getMiddle();
@Import("third")
@Override
RSEntity getTop();
RSRenderable getTop();
void setPlane(int plane);
}

View File

@@ -24,13 +24,13 @@ public interface RSWallDecoration extends DecorativeObject
@Import("orientation2")
int getOrientation();
@Import("entity1")
@Import("renderable1")
@Override
RSEntity getEntity1();
RSRenderable getRenderable();
@Import("entity2")
@Import("renderable2")
@Override
RSEntity getEntity2();
RSRenderable getRenderable2();
void setPlane(int plane);
}

View File

@@ -546,7 +546,7 @@ public interface RSWidget extends Widget
@Import("onInvTransmit")
@Override
Object[] getOnInvTransmit();
Object[] getOnInvTransmitListener();
@Import("containsMouse")
@Override