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

devtools

Browse Source
This commit is contained in:
therealunull
2020-12-14 09:08:42 -05:00
parent aa44329202
commit a55f9502e2
115 changed files with 5376 additions and 267 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
runelite-mixins/src/main/java/net/runelite/mixins/RSTileItemPileMixin.java → runelite-mixins/src/main/java/net/runelite/mixins/RSItemLayerMixin.java
View File

@@ -5,10 +5,10 @@ import net.runelite.api.Renderable;
import net.runelite.api.Model;
import net.runelite.api.mixins.Inject;
import net.runelite.api.mixins.Mixin;
import net.runelite.rs.api.RSTileItemPile;
import net.runelite.rs.api.RSItemLayer;
@Mixin(RSTileItemPile.class)
public abstract class RSTileItemPileMixin implements RSTileItemPile
@Mixin(RSItemLayer.class)
public abstract class RSItemLayerMixin implements RSItemLayer
{
@Inject
private int itemLayerPlane;

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

@@ -134,7 +134,7 @@ public abstract class RSNPCMixin implements RSNPC
// without having to change method calls
setActionFrame(Integer.MIN_VALUE | getActionFrameCycle() << 16 | actionFrame);
setPoseFrame(Integer.MIN_VALUE | getPoseFrameCycle() << 16 | poseFrame);
setSpotAnimationFrame(Integer.MIN_VALUE | getSpotAnimationFrameCycle() << 16 | spotAnimFrame);
setSpotAnimFrame(Integer.MIN_VALUE | getSpotAnimationFrameCycle() << 16 | spotAnimFrame);
return copy$getModel();
}
finally
@@ -142,7 +142,7 @@ public abstract class RSNPCMixin implements RSNPC
// reset frames
setActionFrame(actionFrame);
setPoseFrame(poseFrame);
setSpotAnimationFrame(spotAnimFrame);
setSpotAnimFrame(spotAnimFrame);
}
}

6
runelite-mixins/src/main/java/net/runelite/mixins/RSPlayerAppearanceMixin.java → runelite-mixins/src/main/java/net/runelite/mixins/RSPlayerCompositionMixin.java
View File

@@ -3,10 +3,10 @@ package net.runelite.mixins;
import net.runelite.api.kit.KitType;
import net.runelite.api.mixins.Inject;
import net.runelite.api.mixins.Mixin;
import net.runelite.rs.api.RSPlayerAppearance;
import net.runelite.rs.api.RSPlayerComposition;
@Mixin(RSPlayerAppearance.class)
public abstract class RSPlayerAppearanceMixin implements RSPlayerAppearance
@Mixin(RSPlayerComposition.class)
public abstract class RSPlayerCompositionMixin implements RSPlayerComposition
{
@Inject
@Override

8
runelite-mixins/src/main/java/net/runelite/mixins/RSPlayerMixin.java
View File

@@ -263,7 +263,7 @@ public abstract class RSPlayerMixin implements RSPlayer
// without having to change method calls
setActionFrame(Integer.MIN_VALUE | getActionFrameCycle() << 16 | actionFrame);
setPoseFrame(Integer.MIN_VALUE | getPoseFrameCycle() << 16 | poseFrame);
setSpotAnimationFrame(Integer.MIN_VALUE | getSpotAnimationFrameCycle() << 16 | spotAnimFrame);
setSpotAnimFrame(Integer.MIN_VALUE | getSpotAnimationFrameCycle() << 16 | spotAnimFrame);
return copy$getModel();
}
finally
@@ -271,7 +271,7 @@ public abstract class RSPlayerMixin implements RSPlayer
// reset frames
setActionFrame(actionFrame);
setPoseFrame(poseFrame);
setSpotAnimationFrame(spotAnimFrame);
setSpotAnimFrame(spotAnimFrame);
}
}
@@ -293,11 +293,11 @@ public abstract class RSPlayerMixin implements RSPlayer
@SuppressWarnings("InfiniteRecursion")
public void copy$read(RSBuffer buffer)
{
final long appearanceHash = getPlayerAppearance() == null ? 0 : getPlayerAppearance().getHash();
final long appearanceHash = getPlayerComposition() == null ? 0 : getPlayerComposition().getHash();
this.copy$read(buffer);
if (client.isComparingAppearance() && getPlayerAppearance().getHash() != appearanceHash)
if (client.isComparingAppearance() && getPlayerComposition().getHash() != appearanceHash)
{
client.getCallbacks().post(new PlayerChanged(this));
}

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

@@ -44,7 +44,7 @@ import net.runelite.rs.api.RSNodeDeque;
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.RSItemLayer;
import net.runelite.rs.api.RSSceneTileModel;
import net.runelite.rs.api.RSWallDecoration;
@@ -435,7 +435,7 @@ public abstract class RSSceneMixin implements RSScene
Tile tile = getTiles()[plane][x][y];
if (tile != null)
{
RSTileItemPile itemLayer = (RSTileItemPile) tile.getItemLayer();
RSItemLayer itemLayer = (RSItemLayer) tile.getItemLayer();
if (itemLayer != null)
{
itemLayer.setPlane(plane);

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

@@ -33,7 +33,7 @@ import net.runelite.api.Constants;
import net.runelite.api.DecorativeObject;
import net.runelite.api.GameState;
import net.runelite.api.GroundObject;
import net.runelite.api.TileItemPile;
import net.runelite.api.ItemLayer;
import net.runelite.api.Node;
import net.runelite.api.Point;
import net.runelite.api.Tile;
@@ -64,7 +64,7 @@ import net.runelite.rs.api.RSClient;
import net.runelite.rs.api.RSRenderable;
import net.runelite.rs.api.RSGameObject;
import net.runelite.rs.api.RSGraphicsObject;
import net.runelite.rs.api.RSTileItemPile;
import net.runelite.rs.api.RSItemLayer;
import net.runelite.rs.api.RSNode;
import net.runelite.rs.api.RSNodeDeque;
import net.runelite.rs.api.RSProjectile;
@@ -237,7 +237,7 @@ public abstract class RSTileMixin implements RSTile
@Override
public List<TileItem> getGroundItems()
{
TileItemPile layer = this.getItemLayer();
ItemLayer layer = this.getItemLayer();
if (layer == null)
{
return null;
@@ -459,7 +459,7 @@ public abstract class RSTileMixin implements RSTile
}
}
@FieldHook("tileItemPile")
@FieldHook("itemLayer")
@Inject
public void itemLayerChanged(int idx)
{
@@ -500,7 +500,7 @@ public abstract class RSTileMixin implements RSTile
client.setLastItemDespawn(null);
}
RSTileItemPile itemLayer = (RSTileItemPile) getItemLayer();
RSItemLayer itemLayer = (RSItemLayer) getItemLayer();
if (itemLayer == null)
{
if (lastUnlink != null)

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

@@ -15,14 +15,14 @@ import net.runelite.rs.api.RSBoundaryObject;
import net.runelite.rs.api.RSClient;
import net.runelite.rs.api.RSFloorDecoration;
import net.runelite.rs.api.RSGameObject;
import net.runelite.rs.api.RSTileItemPile;
import net.runelite.rs.api.RSItemLayer;
import net.runelite.rs.api.RSWallDecoration;
@Mixins({
@Mixin(RSWallDecoration.class),
@Mixin(RSGameObject.class),
@Mixin(RSFloorDecoration.class),
@Mixin(RSTileItemPile.class),
@Mixin(RSItemLayer.class),
@Mixin(RSBoundaryObject.class)
})
public abstract class RSTileObjectMixin implements TileObject

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

@@ -42,7 +42,7 @@ import net.runelite.rs.api.RSClient;
import net.runelite.rs.api.RSModel;
import net.runelite.rs.api.RSNode;
import net.runelite.rs.api.RSNodeHashTable;
import net.runelite.rs.api.RSPlayerAppearance;
import net.runelite.rs.api.RSPlayerComposition;
import net.runelite.rs.api.RSSequenceDefinition;
import net.runelite.rs.api.RSWidget;
import java.awt.Rectangle;
@@ -592,7 +592,7 @@ public abstract class RSWidgetMixin implements RSWidget
@Copy("getModel")
@Replace("getModel")
@SuppressWarnings("InfiniteRecursion")
public RSModel copy$getModel(RSSequenceDefinition sequence, int frame, boolean alternate, RSPlayerAppearance playerComposition)
public RSModel copy$getModel(RSSequenceDefinition sequence, int frame, boolean alternate, RSPlayerComposition playerComposition)
{
if (frame != -1 && client.isInterpolateWidgetAnimations())
{

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

@@ -10,7 +10,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.RSVarbitDefinition;
import net.runelite.rs.api.RSVarbitComposition;
@Mixin(RSClient.class)
public abstract class VarbitMixin implements RSClient
@@ -21,7 +21,7 @@ public abstract class VarbitMixin implements RSClient
private static RSClient client;
@Inject
private Cache<Integer, RSVarbitDefinition> varbitCache = CacheBuilder.newBuilder()
private Cache<Integer, RSVarbitComposition> varbitCache = CacheBuilder.newBuilder()
.maximumSize(128)
.build();
@@ -55,17 +55,17 @@ public abstract class VarbitMixin implements RSClient
@Inject
@Override
public RSVarbitDefinition getVarbitDefinition(int id)
public RSVarbitComposition getVarbitDefinition(int id)
{
assert isClientThread();
RSVarbitDefinition varbit;
RSVarbitComposition varbit;
varbit = varbitCache.getIfPresent(id);
if (varbit != null)
{
return varbit;
}
varbit = (RSVarbitDefinition) getVarbitCache().get(id);
varbit = (RSVarbitComposition) getVarbitCache().get(id);
if (varbit != null && !(varbit.getIndex() == 0 && varbit.getMostSignificantBit() == 0 && varbit.getLeastSignificantBit() == 0))
{
return varbit;
@@ -87,7 +87,7 @@ public abstract class VarbitMixin implements RSClient
{
assert client.isClientThread();
RSVarbitDefinition v = getVarbitDefinition(varbitId);
RSVarbitComposition v = getVarbitDefinition(varbitId);
if (v == null)
{
throw new IndexOutOfBoundsException(String.format("Varbit %d does not exist!", varbitId)); // oob for "backwards compatibility lol"
@@ -104,7 +104,7 @@ public abstract class VarbitMixin implements RSClient
@Override
public void setVarbitValue(int[] varps, int varbitId, int value)
{
RSVarbitDefinition v = getVarbitDefinition(varbitId);
RSVarbitComposition v = getVarbitDefinition(varbitId);
if (v == null)
{
throw new IndexOutOfBoundsException(String.format("Varbit %d does not exist!", varbitId)); // oob for "backwards compatibility lol"