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

develop

Browse Source
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
Download Patch File Download Diff File Expand all files Collapse all files

4
runelite-mixins/src/main/java/net/runelite/mixins/EntityHiderMixin.java
View File

@@ -36,7 +36,7 @@ import net.runelite.api.mixins.Shadow;
import net.runelite.api.util.Text;
import net.runelite.rs.api.RSActor;
import net.runelite.rs.api.RSClient;
import net.runelite.rs.api.RSEntity;
import net.runelite.rs.api.RSRenderable;
import net.runelite.rs.api.RSNPC;
import net.runelite.rs.api.RSPlayer;
import net.runelite.rs.api.RSProjectile;
@@ -101,7 +101,7 @@ public abstract class EntityHiderMixin implements RSScene
@Copy("newGameObject")
@Replace("newGameObject")
boolean copy$addEntityMarker(int var1, int var2, int var3, int var4, int var5, int x, int y, int var8, RSEntity entity, int var10, boolean var11, long var12, int var13)
boolean copy$addEntityMarker(int var1, int var2, int var3, int var4, int var5, int x, int y, int var8, RSRenderable entity, int var10, boolean var11, long var12, int var13)
{
final boolean shouldDraw = shouldDraw(entity, false);

4
runelite-mixins/src/main/java/net/runelite/mixins/MenuMixin.java
View File

@@ -188,7 +188,7 @@ public abstract class MenuMixin implements RSClient
getMenuTargets()[i] = entry.getTarget();
getMenuIdentifiers()[i] = entry.getIdentifier();
getMenuOpcodes()[i] = entry.getOpcode();
getMenuArguments1()[i] = entry.getActionParam0();
getMenuArguments1()[i] = entry.getActionParam();
getMenuArguments2()[i] = entry.getActionParam1();
getMenuForceLeftClick()[i] = entry.isForceLeftClick();
}
@@ -215,7 +215,7 @@ public abstract class MenuMixin implements RSClient
tempMenuAction.setOption(entry.getOption());
tempMenuAction.setOpcode(entry.getOpcode());
tempMenuAction.setIdentifier(entry.getIdentifier());
tempMenuAction.setParam0(entry.getActionParam0());
tempMenuAction.setParam0(entry.getActionParam());
tempMenuAction.setParam1(entry.getActionParam1());
}
}

6
runelite-mixins/src/main/java/net/runelite/mixins/RSBoundaryObjectMixin.java
View File

@@ -10,7 +10,7 @@ import net.runelite.api.mixins.Mixin;
import net.runelite.api.mixins.Shadow;
import net.runelite.rs.api.RSBoundaryObject;
import net.runelite.rs.api.RSClient;
import net.runelite.rs.api.RSEntity;
import net.runelite.rs.api.RSRenderable;
import net.runelite.rs.api.RSModel;
@Mixin(RSBoundaryObject.class)
@@ -39,7 +39,7 @@ public abstract class RSBoundaryObjectMixin implements RSBoundaryObject
@Inject
public RSModel getModelA()
{
RSEntity entity = getEntity1();
RSRenderable entity = getRenderable();
if (entity == null)
{
return null;
@@ -58,7 +58,7 @@ public abstract class RSBoundaryObjectMixin implements RSBoundaryObject
@Inject
public RSModel getModelB()
{
RSEntity entity = getEntity2();
RSRenderable entity = getRenderable2();
if (entity == null)
{
return null;

14
runelite-mixins/src/main/java/net/runelite/mixins/RSClientMixin.java
View File

@@ -67,7 +67,7 @@ import net.runelite.api.NPC;
import net.runelite.api.NPCComposition;
import net.runelite.api.NameableContainer;
import net.runelite.api.Node;
import net.runelite.api.ObjectDefinition;
import net.runelite.api.ObjectComposition;
import static net.runelite.api.Perspective.LOCAL_TILE_SIZE;
import net.runelite.api.Player;
import net.runelite.api.Point;
@@ -754,7 +754,7 @@ public abstract class RSClientMixin implements RSClient
entry.setTarget(menuTargets[i]);
entry.setIdentifier(menuIdentifiers[i]);
entry.setOpcode(menuTypes[i]);
entry.setActionParam0(params0[i]);
entry.setActionParam(params0[i]);
entry.setActionParam1(params1[i]);
entry.setForceLeftClick(leftClick[i]);
}
@@ -785,7 +785,7 @@ public abstract class RSClientMixin implements RSClient
menuTargets[count] = entry.getTarget();
menuIdentifiers[count] = entry.getIdentifier();
menuTypes[count] = entry.getOpcode();
params0[count] = entry.getActionParam0();
params0[count] = entry.getActionParam();
params1[count] = entry.getActionParam1();
leftClick[count] = entry.isForceLeftClick();
++count;
@@ -832,7 +832,7 @@ public abstract class RSClientMixin implements RSClient
targets[oldCount] = event.getTarget();
identifiers[oldCount] = event.getIdentifier();
opcodes[oldCount] = event.getOpcode();
arguments1[oldCount] = event.getActionParam0();
arguments1[oldCount] = event.getActionParam();
arguments2[oldCount] = event.getActionParam1();
forceLeftClick[oldCount] = event.isForceLeftClick();
}
@@ -1426,12 +1426,12 @@ public abstract class RSClientMixin implements RSClient
client.getLogger().info(
"|MenuAction|: MenuOption={} MenuTarget={} Id={} Opcode={} Param0={} Param1={} CanvasX={} CanvasY={} Authentic={}",
menuOptionClicked.getOption(), menuOptionClicked.getTarget(), menuOptionClicked.getIdentifier(),
menuOptionClicked.getOpcode(), menuOptionClicked.getActionParam0(), menuOptionClicked.getActionParam1(),
menuOptionClicked.getOpcode(), menuOptionClicked.getActionParam(), menuOptionClicked.getActionParam1(),
canvasX, canvasY, authentic
);
}
copy$menuAction(menuOptionClicked.getActionParam0(), menuOptionClicked.getActionParam1(), menuOptionClicked.getOpcode(),
copy$menuAction(menuOptionClicked.getActionParam(), menuOptionClicked.getActionParam1(), menuOptionClicked.getOpcode(),
menuOptionClicked.getIdentifier(), menuOptionClicked.getOption(), menuOptionClicked.getTarget(), canvasX, canvasY);
}
@@ -1925,7 +1925,7 @@ public abstract class RSClientMixin implements RSClient
@Inject
@Override
public ObjectDefinition getObjectComposition(int objectId)
public ObjectComposition getObjectDefinition(int objectId)
{
assert this.isClientThread() : "getObjectDefinition must be called on client thread";
return getRSObjectComposition(objectId);

4
runelite-mixins/src/main/java/net/runelite/mixins/RSDynamicObjectMixin.java
View File

@@ -34,7 +34,7 @@ import net.runelite.api.mixins.Replace;
import net.runelite.api.mixins.Shadow;
import net.runelite.rs.api.RSClient;
import net.runelite.rs.api.RSDynamicObject;
import net.runelite.rs.api.RSEntity;
import net.runelite.rs.api.RSRenderable;
import net.runelite.rs.api.RSModel;
@Mixin(RSDynamicObject.class)
@@ -83,7 +83,7 @@ public abstract class RSDynamicObjectMixin implements RSDynamicObject
@MethodHook(value = "<init>", end = true)
@Inject
public void rl$init(int id, int type, int orientation, int plane, int x, int y, int animationID, boolean var8, RSEntity var9)
public void rl$init(int id, int type, int orientation, int plane, int x, int y, int animationID, boolean var8, RSRenderable var9)
{
if (animationID != -1)
{

4
runelite-mixins/src/main/java/net/runelite/mixins/RSFloorDecorationMixin.java
View File

@@ -8,7 +8,7 @@ import net.runelite.api.mixins.Inject;
import net.runelite.api.mixins.Mixin;
import net.runelite.api.mixins.Shadow;
import net.runelite.rs.api.RSClient;
import net.runelite.rs.api.RSEntity;
import net.runelite.rs.api.RSRenderable;
import net.runelite.rs.api.RSFloorDecoration;
import net.runelite.rs.api.RSModel;
@@ -39,7 +39,7 @@ public abstract class RSFloorDecorationMixin implements RSFloorDecoration
@Override
public RSModel getModel()
{
RSEntity entity = getEntity();
RSRenderable entity = getRenderable();
if (entity == null)
{
return null;

4
runelite-mixins/src/main/java/net/runelite/mixins/RSGameObjectMixin.java
View File

@@ -33,7 +33,7 @@ import net.runelite.api.mixins.Inject;
import net.runelite.api.mixins.Mixin;
import net.runelite.api.mixins.Shadow;
import net.runelite.rs.api.RSClient;
import net.runelite.rs.api.RSEntity;
import net.runelite.rs.api.RSRenderable;
import net.runelite.rs.api.RSGameObject;
import net.runelite.rs.api.RSModel;
@@ -61,7 +61,7 @@ public abstract class RSGameObjectMixin implements RSGameObject
@Override
public RSModel getModel()
{
RSEntity renderable = getEntity();
RSRenderable renderable = getRenderable();
if (renderable == null)
{
return null;

28
runelite-mixins/src/main/java/net/runelite/mixins/RSSceneMixin.java
View File

@@ -24,11 +24,11 @@
*/
package net.runelite.mixins;
import net.runelite.api.Entity;
import net.runelite.api.Renderable;
import net.runelite.api.Perspective;
import net.runelite.api.Tile;
import net.runelite.api.TileModel;
import net.runelite.api.TilePaint;
import net.runelite.api.SceneTileModel;
import net.runelite.api.SceneTilePaint;
import net.runelite.api.coords.WorldPoint;
import net.runelite.api.hooks.DrawCallbacks;
import net.runelite.api.mixins.Copy;
@@ -45,7 +45,7 @@ import net.runelite.rs.api.RSScene;
import net.runelite.rs.api.RSTile;
import net.runelite.rs.api.RSTileItem;
import net.runelite.rs.api.RSTileItemPile;
import net.runelite.rs.api.RSTileModel;
import net.runelite.rs.api.RSSceneTileModel;
import net.runelite.rs.api.RSWallDecoration;
@Mixin(RSScene.class)
@@ -412,7 +412,7 @@ public abstract class RSSceneMixin implements RSScene
@Copy("newWallDecoration")
@Replace("newWallDecoration")
@SuppressWarnings("InfiniteRecursion")
public void copy$addBoundaryDecoration(int plane, int x, int y, int floor, Entity var5, Entity var6, int var7, int var8, int var9, int var10, long hash, int var12)
public void copy$addBoundaryDecoration(int plane, int x, int y, int floor, Renderable var5, Renderable var6, int var7, int var8, int var9, int var10, long hash, int var12)
{
copy$addBoundaryDecoration(plane, x, y, floor, var5, var6, var7, var8, var9, var10, hash, var12);
Tile tile = getTiles()[plane][x][y];
@@ -429,7 +429,7 @@ public abstract class RSSceneMixin implements RSScene
@Copy("newGroundItemPile")
@Replace("newGroundItemPile")
@SuppressWarnings("InfiniteRecursion")
public void copy$addItemPile(int plane, int x, int y, int hash, Entity var5, long var6, Entity var7, Entity var8)
public void copy$addItemPile(int plane, int x, int y, int hash, Renderable var5, long var6, Renderable var7, Renderable var8)
{
copy$addItemPile(plane, x, y, hash, var5, var6, var7, var8);
Tile tile = getTiles()[plane][x][y];
@@ -446,7 +446,7 @@ public abstract class RSSceneMixin implements RSScene
@Copy("newFloorDecoration")
@Replace("newFloorDecoration")
@SuppressWarnings("InfiniteRecursion")
public void copy$groundObjectSpawned(int plane, int x, int y, int floor, Entity var5, long hash, int var7)
public void copy$groundObjectSpawned(int plane, int x, int y, int floor, Renderable var5, long hash, int var7)
{
copy$groundObjectSpawned(plane, x, y, floor, var5, hash, var7);
Tile tile = getTiles()[plane][x][y];
@@ -463,7 +463,7 @@ public abstract class RSSceneMixin implements RSScene
@Copy("newBoundaryObject")
@Replace("newBoundaryObject")
@SuppressWarnings("InfiniteRecursion")
public void copy$addBoundary(int plane, int x, int y, int floor, Entity var5, Entity var6, int var7, int var8, long hash, int var10)
public void copy$addBoundary(int plane, int x, int y, int floor, Renderable var5, Renderable var6, int var7, int var8, long hash, int var10)
{
copy$addBoundary(plane, x, y, floor, var5, var6, var7, var8, hash, var10);
Tile tile = getTiles()[plane][x][y];
@@ -479,7 +479,7 @@ public abstract class RSSceneMixin implements RSScene
@Copy("drawTileUnderlay")
@Replace("drawTileUnderlay")
public void copy$drawTileUnderlay(TilePaint tile, int z, int pitchSin, int pitchCos, int yawSin, int yawCos, int x, int y)
public void copy$drawTileUnderlay(SceneTilePaint tile, int z, int pitchSin, int pitchCos, int yawSin, int yawCos, int x, int y)
{
if (!client.isGpu())
{
@@ -604,7 +604,7 @@ public abstract class RSSceneMixin implements RSScene
@Copy("drawTileOverlay")
@Replace("drawTileOverlay")
public void copy$drawTileOverlay(TileModel tile, int pitchSin, int pitchCos, int yawSin, int yawCos, int tileX, int tileY)
public void copy$drawTileOverlay(SceneTileModel tile, int pitchSin, int pitchCos, int yawSin, int yawCos, int tileX, int tileY)
{
if (!client.isGpu())
{
@@ -638,7 +638,7 @@ public abstract class RSSceneMixin implements RSScene
return;
}
RSTileModel tileModel = (RSTileModel) tile;
RSSceneTileModel tileModel = (RSSceneTileModel) tile;
final int[] faceX = tileModel.getFaceX();
final int[] faceY = tileModel.getFaceY();
@@ -806,7 +806,7 @@ public abstract class RSSceneMixin implements RSScene
if (shape != 0 && shape != 1)
{
Tile tile = getTiles()[z][x][y];
TileModel sceneTileModel = tile.getTileModel();
SceneTileModel sceneTileModel = tile.getSceneTileModel();
sceneTileModel.setUnderlaySwColor(underlaySwColor);
sceneTileModel.setUnderlayNwColor(underlayNwColor);
@@ -834,7 +834,7 @@ public abstract class RSSceneMixin implements RSScene
{
return;
}
TilePaint sceneTilePaint = tile.getTilePaint();
SceneTilePaint sceneTilePaint = tile.getSceneTilePaint();
if (sceneTilePaint != null)
{
int rgb = sceneTilePaint.getRBG();
@@ -889,7 +889,7 @@ public abstract class RSSceneMixin implements RSScene
return;
}
TileModel sceneTileModel = tile.getTileModel();
SceneTileModel sceneTileModel = tile.getSceneTileModel();
if (sceneTileModel != null)
{
int shape = sceneTileModel.getShape();

6
runelite-mixins/src/main/java/net/runelite/mixins/RSTileModelMixin.java → runelite-mixins/src/main/java/net/runelite/mixins/RSSceneTileModelMixin.java
View File

@@ -2,10 +2,10 @@ package net.runelite.mixins;
import net.runelite.api.mixins.Inject;
import net.runelite.api.mixins.Mixin;
import net.runelite.rs.api.RSTileModel;
import net.runelite.rs.api.RSSceneTileModel;
@Mixin(RSTileModel.class)
public abstract class RSTileModelMixin implements RSTileModel
@Mixin(RSSceneTileModel.class)
public abstract class RSSceneTileModelMixin implements RSSceneTileModel
{
@Inject
private int rl$modelBufferOffset;

6
runelite-mixins/src/main/java/net/runelite/mixins/RSTilePaintMixin.java → runelite-mixins/src/main/java/net/runelite/mixins/RSSceneTilePaintMixin.java
View File

@@ -2,10 +2,10 @@ package net.runelite.mixins;
import net.runelite.api.mixins.Inject;
import net.runelite.api.mixins.Mixin;
import net.runelite.rs.api.RSTilePaint;
import net.runelite.rs.api.RSSceneTilePaint;
@Mixin(RSTilePaint.class)
public abstract class RSTilePaintMixin implements RSTilePaint
@Mixin(RSSceneTilePaint.class)
public abstract class RSSceneTilePaintMixin implements RSSceneTilePaint
{
@Inject
private int rl$paintModelBufferOffset;

32
runelite-mixins/src/main/java/net/runelite/mixins/RSTileItemPileMixin.java
View File

@@ -1,7 +1,7 @@
package net.runelite.mixins;
import java.awt.geom.Area;
import net.runelite.api.Entity;
import net.runelite.api.Renderable;
import net.runelite.api.Model;
import net.runelite.api.mixins.Inject;
import net.runelite.api.mixins.Mixin;
@@ -38,19 +38,19 @@ public abstract class RSTileItemPileMixin implements RSTileItemPile
@Override
public Model getModelBottom()
{
Entity entity = getBottom();
if (entity == null)
Renderable renderable = getBottom();
if (renderable == null)
{
return null;
}
if (entity instanceof Model)
if (renderable instanceof Model)
{
return (Model) entity;
return (Model) renderable;
}
else
{
return entity.getModel();
return renderable.getModel();
}
}
@@ -58,19 +58,19 @@ public abstract class RSTileItemPileMixin implements RSTileItemPile
@Override
public Model getModelMiddle()
{
Entity entity = getMiddle();
if (entity == null)
Renderable renderable = getMiddle();
if (renderable == null)
{
return null;
}
if (entity instanceof Model)
if (renderable instanceof Model)
{
return (Model) entity;
return (Model) renderable;
}
else
{
return entity.getModel();
return renderable.getModel();
}
}
@@ -78,19 +78,19 @@ public abstract class RSTileItemPileMixin implements RSTileItemPile
@Override
public Model getModelTop()
{
Entity entity = getTop();
if (entity == null)
Renderable renderable = getTop();
if (renderable == null)
{
return null;
}
if (entity instanceof Model)
if (renderable instanceof Model)
{
return (Model) entity;
return (Model) renderable;
}
else
{
return entity.getModel();
return renderable.getModel();
}
}
}

6
runelite-mixins/src/main/java/net/runelite/mixins/RSTileMixin.java
View File

@@ -61,7 +61,7 @@ import net.runelite.api.mixins.Mixin;
import net.runelite.api.mixins.Shadow;
import net.runelite.rs.api.RSActor;
import net.runelite.rs.api.RSClient;
import net.runelite.rs.api.RSEntity;
import net.runelite.rs.api.RSRenderable;
import net.runelite.rs.api.RSGameObject;
import net.runelite.rs.api.RSGraphicsObject;
import net.runelite.rs.api.RSTileItemPile;
@@ -403,13 +403,13 @@ public abstract class RSTileMixin implements RSTile
boolean currentInvalid = false, prevInvalid = false;
if (current != null)
{
RSEntity renderable = current.getEntity();
RSRenderable renderable = current.getRenderable();
currentInvalid = renderable instanceof RSActor || renderable instanceof RSProjectile || renderable instanceof RSGraphicsObject;
}
if (previous != null)
{
RSEntity renderable = previous.getEntity();
RSRenderable renderable = previous.getRenderable();
prevInvalid = renderable instanceof RSActor || renderable instanceof RSProjectile || renderable instanceof RSGraphicsObject;
}

6
runelite-mixins/src/main/java/net/runelite/mixins/RSWallDecorationMixin.java
View File

@@ -9,7 +9,7 @@ import net.runelite.api.mixins.Inject;
import net.runelite.api.mixins.Mixin;
import net.runelite.api.mixins.Shadow;
import net.runelite.rs.api.RSClient;
import net.runelite.rs.api.RSEntity;
import net.runelite.rs.api.RSRenderable;
import net.runelite.rs.api.RSModel;
import net.runelite.rs.api.RSWallDecoration;
@@ -40,7 +40,7 @@ public abstract class RSWallDecorationMixin implements RSWallDecoration
@Override
public RSModel getModel1()
{
RSEntity renderable = getEntity1();
RSRenderable renderable = getRenderable();
if (renderable == null)
{
return null;
@@ -64,7 +64,7 @@ public abstract class RSWallDecorationMixin implements RSWallDecoration
@Override
public RSModel getModel2()
{
RSEntity renderable = getEntity2();
RSRenderable renderable = getRenderable2();
if (renderable == null)
{
return null;