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

Make updatemappings parameter renamer work, add importmappings parameter renamer, more refactoring

Browse Source
This commit is contained in:
Lucas
2019-07-07 12:15:54 +02:00
parent c92553f86f
commit e1a815eddd
98 changed files with 41069 additions and 32880 deletions
Download Patch File Download Diff File Expand all files Collapse all files

20
runescape-client/src/main/java/AbstractByteArrayCopier.java
View File

@@ -58,17 +58,17 @@ public abstract class AbstractByteArrayCopier {
signature = "(II)V",
garbageValue = "-1941491045"
)
@Export("unloadWidgetGroup")
public static void unloadWidgetGroup(int var0) {
if (var0 != -1 && Widget.loadedWidgetGroups[var0]) {
@Export("unloadInterface")
public static void unloadInterface(int var0) {
if (var0 != -1 && Widget.loadedInterfaces[var0]) {
Widget.Widget_archive.method7(var0);
if (Widget.widgets[var0] != null) {
if (Widget.interfaceComponents[var0] != null) {
boolean var1 = true;
for (int var2 = 0; var2 < Widget.widgets[var0].length; ++var2) {
if (Widget.widgets[var0][var2] != null) {
if (Widget.widgets[var0][var2].type != 2) {
Widget.widgets[var0][var2] = null;
for (int var2 = 0; var2 < Widget.interfaceComponents[var0].length; ++var2) {
if (Widget.interfaceComponents[var0][var2] != null) {
if (Widget.interfaceComponents[var0][var2].type != 2) {
Widget.interfaceComponents[var0][var2] = null;
} else {
var1 = false;
}
@@ -76,10 +76,10 @@ public abstract class AbstractByteArrayCopier {
}
if (var1) {
Widget.widgets[var0] = null;
Widget.interfaceComponents[var0] = null;
}
Widget.loadedWidgetGroups[var0] = false;
Widget.loadedInterfaces[var0] = false;
}
}

2
runescape-client/src/main/java/AbstractSocket.java
View File

@@ -63,7 +63,7 @@ public abstract class AbstractSocket {
public static void method3488(int var0) {
class214.field1129 = 1;
class214.field1130 = null;
class30.musicTrackArchiveId = -1;
class30.musicTrackGroupId = -1;
GrandExchangeOffer.musicTrackFileId = -1;
WorldMapLabel.field1039 = 0;
RectangleMode.musicTrackBoolean = false;

2
runescape-client/src/main/java/AbstractUserComparator.java
View File

@@ -52,7 +52,7 @@ public abstract class AbstractUserComparator implements Comparator {
int var2 = Client.field128;
class214.field1129 = 1;
class214.field1130 = var1;
class30.musicTrackArchiveId = var0;
class30.musicTrackGroupId = var0;
GrandExchangeOffer.musicTrackFileId = 0;
WorldMapLabel.field1039 = var2;
RectangleMode.musicTrackBoolean = false;

24
runescape-client/src/main/java/Actor.java
View File

@@ -42,8 +42,8 @@ public abstract class Actor extends Entity {
@ObfuscatedGetter(
intValue = -299122235
)
@Export("idleSequence")
int idleSequence;
@Export("readySequence")
int readySequence;
@ObfuscatedName("al")
@ObfuscatedGetter(
intValue = -831787909
@@ -66,20 +66,20 @@ public abstract class Actor extends Entity {
@ObfuscatedGetter(
intValue = -1598871111
)
@Export("walkTurnSequence")
int walkTurnSequence;
@Export("walkBackSequence")
int walkBackSequence;
@ObfuscatedName("ad")
@ObfuscatedGetter(
intValue = -568830521
)
@Export("walkTurnLeftSequence")
int walkTurnLeftSequence;
@Export("walkLeftSequence")
int walkLeftSequence;
@ObfuscatedName("ap")
@ObfuscatedGetter(
intValue = -257240117
)
@Export("walkTurnRightSequence")
int walkTurnRightSequence;
@Export("walkRightSequence")
int walkRightSequence;
@ObfuscatedName("as")
@ObfuscatedGetter(
intValue = 1708570917
@@ -318,13 +318,13 @@ public abstract class Actor extends Entity {
Actor() {
this.field10 = false;
this.size = 1;
this.idleSequence = -1;
this.readySequence = -1;
this.turnLeftSequence = -1;
this.turnRightSequence = -1;
this.walkSequence = -1;
this.walkTurnSequence = -1;
this.walkTurnLeftSequence = -1;
this.walkTurnRightSequence = -1;
this.walkBackSequence = -1;
this.walkLeftSequence = -1;
this.walkRightSequence = -1;
this.runSequence = -1;
this.overheadText = null;
this.field11 = false;

6
runescape-client/src/main/java/Archive.java
View File

@@ -71,7 +71,7 @@ public class Archive extends AbstractArchive {
Players.NetCache_reference.index = var7 * 8 + 5;
int var8 = Players.NetCache_reference.readInt();
int var9 = Players.NetCache_reference.readInt();
this.loadIndexReference(var8, var9);
this.loadIndex(var8, var9);
} else {
PacketBuffer.requestNetFile((Archive)null, 255, 255, 0, (byte)0, true);
NetCache.NetCache_archives[var7] = this;
@@ -171,8 +171,8 @@ public class Archive extends AbstractArchive {
signature = "(III)V",
garbageValue = "-1621053520"
)
@Export("loadIndexReference")
public void loadIndexReference(int var1, int var2) {
@Export("loadIndex")
public void loadIndex(int var1, int var2) {
this.indexCrc = var1;
this.indexVersion = var2;
if (this.masterDisk != null) {

70
runescape-client/src/main/java/ArchiveDisk.java
View File

@@ -11,8 +11,8 @@ import net.runelite.mapping.ObfuscatedSignature;
public final class ArchiveDisk
{
@ObfuscatedName("m")
@Export("IndexStore_buffer")
static byte[] IndexStore_buffer;
@Export("ArchiveDisk_buffer")
static byte[] ArchiveDisk_buffer;
@ObfuscatedName("f")
@ObfuscatedSignature(
signature = "Ldy;"
@@ -70,9 +70,9 @@ public final class ArchiveDisk
}
this.idxFile.seek((long)(var1 * 6));
this.idxFile.read(IndexStore_buffer, 0, 6);
int var5 = ((IndexStore_buffer[0] & 255) << 16) + (IndexStore_buffer[2] & 255) + ((IndexStore_buffer[1] & 255) << 8);
int var6 = (IndexStore_buffer[5] & 255) + ((IndexStore_buffer[3] & 255) << 16) + ((IndexStore_buffer[4] & 255) << 8);
this.idxFile.read(ArchiveDisk_buffer, 0, 6);
int var5 = ((ArchiveDisk_buffer[0] & 255) << 16) + (ArchiveDisk_buffer[2] & 255) + ((ArchiveDisk_buffer[1] & 255) << 8);
int var6 = (ArchiveDisk_buffer[5] & 255) + ((ArchiveDisk_buffer[3] & 255) << 16) + ((ArchiveDisk_buffer[4] & 255) << 8);
if (var5 < 0 || var5 > this.maxEntrySize) {
var4 = null;
var10000 = ((byte[])var4);
@@ -97,15 +97,15 @@ public final class ArchiveDisk
var10 = 512;
}
this.datFile.read(IndexStore_buffer, 0, var10 + 8);
int var11 = (IndexStore_buffer[1] & 255) + ((IndexStore_buffer[0] & 255) << 8);
int var12 = (IndexStore_buffer[3] & 255) + ((IndexStore_buffer[2] & 255) << 8);
int var13 = ((IndexStore_buffer[5] & 255) << 8) + ((IndexStore_buffer[4] & 255) << 16) + (IndexStore_buffer[6] & 255);
int var14 = IndexStore_buffer[7] & 255;
this.datFile.read(ArchiveDisk_buffer, 0, var10 + 8);
int var11 = (ArchiveDisk_buffer[1] & 255) + ((ArchiveDisk_buffer[0] & 255) << 8);
int var12 = (ArchiveDisk_buffer[3] & 255) + ((ArchiveDisk_buffer[2] & 255) << 8);
int var13 = ((ArchiveDisk_buffer[5] & 255) << 8) + ((ArchiveDisk_buffer[4] & 255) << 16) + (ArchiveDisk_buffer[6] & 255);
int var14 = ArchiveDisk_buffer[7] & 255;
if (var11 == var1 && var9 == var12 && var14 == this.archive) {
if (var13 >= 0 && (long)var13 <= this.datFile.length() / 520L) {
for (int var15 = 0; var15 < var10; ++var15) {
var7[var8++] = IndexStore_buffer[var15 + 8];
var7[var8++] = ArchiveDisk_buffer[var15 + 8];
}
var6 = var13;
@@ -180,8 +180,8 @@ public final class ArchiveDisk
}
this.idxFile.seek((long)(var1 * 6));
this.idxFile.read(IndexStore_buffer, 0, 6);
var7 = (IndexStore_buffer[5] & 255) + ((IndexStore_buffer[3] & 255) << 16) + ((IndexStore_buffer[4] & 255) << 8);
this.idxFile.read(ArchiveDisk_buffer, 0, 6);
var7 = (ArchiveDisk_buffer[5] & 255) + ((ArchiveDisk_buffer[3] & 255) << 16) + ((ArchiveDisk_buffer[4] & 255) << 8);
if (var7 <= 0 || (long)var7 > this.datFile.length() / 520L) {
var8 = false;
var10000 = var8;
@@ -194,14 +194,14 @@ public final class ArchiveDisk
}
}
IndexStore_buffer[0] = (byte)(var3 >> 16);
IndexStore_buffer[1] = (byte)(var3 >> 8);
IndexStore_buffer[2] = (byte)var3;
IndexStore_buffer[3] = (byte)(var7 >> 16);
IndexStore_buffer[4] = (byte)(var7 >> 8);
IndexStore_buffer[5] = (byte)var7;
ArchiveDisk_buffer[0] = (byte)(var3 >> 16);
ArchiveDisk_buffer[1] = (byte)(var3 >> 8);
ArchiveDisk_buffer[2] = (byte)var3;
ArchiveDisk_buffer[3] = (byte)(var7 >> 16);
ArchiveDisk_buffer[4] = (byte)(var7 >> 8);
ArchiveDisk_buffer[5] = (byte)var7;
this.idxFile.seek((long)(var1 * 6));
this.idxFile.write(IndexStore_buffer, 0, 6);
this.idxFile.write(ArchiveDisk_buffer, 0, 6);
int var9 = 0;
int var10 = 0;
@@ -214,15 +214,15 @@ public final class ArchiveDisk
this.datFile.seek((long)(var7 * 520));
try {
this.datFile.read(IndexStore_buffer, 0, 8);
this.datFile.read(ArchiveDisk_buffer, 0, 8);
} catch (EOFException var16) {
break label129;
}
var12 = (IndexStore_buffer[1] & 255) + ((IndexStore_buffer[0] & 255) << 8);
int var13 = (IndexStore_buffer[3] & 255) + ((IndexStore_buffer[2] & 255) << 8);
var11 = ((IndexStore_buffer[5] & 255) << 8) + ((IndexStore_buffer[4] & 255) << 16) + (IndexStore_buffer[6] & 255);
int var14 = IndexStore_buffer[7] & 255;
var12 = (ArchiveDisk_buffer[1] & 255) + ((ArchiveDisk_buffer[0] & 255) << 8);
int var13 = (ArchiveDisk_buffer[3] & 255) + ((ArchiveDisk_buffer[2] & 255) << 8);
var11 = ((ArchiveDisk_buffer[5] & 255) << 8) + ((ArchiveDisk_buffer[4] & 255) << 16) + (ArchiveDisk_buffer[6] & 255);
int var14 = ArchiveDisk_buffer[7] & 255;
if (var12 != var1 || var13 != var10 || var14 != this.archive) {
var8 = false;
var10000 = var8;
@@ -252,16 +252,16 @@ public final class ArchiveDisk
var11 = 0;
}
IndexStore_buffer[0] = (byte)(var1 >> 8);
IndexStore_buffer[1] = (byte)var1;
IndexStore_buffer[2] = (byte)(var10 >> 8);
IndexStore_buffer[3] = (byte)var10;
IndexStore_buffer[4] = (byte)(var11 >> 16);
IndexStore_buffer[5] = (byte)(var11 >> 8);
IndexStore_buffer[6] = (byte)var11;
IndexStore_buffer[7] = (byte)this.archive;
ArchiveDisk_buffer[0] = (byte)(var1 >> 8);
ArchiveDisk_buffer[1] = (byte)var1;
ArchiveDisk_buffer[2] = (byte)(var10 >> 8);
ArchiveDisk_buffer[3] = (byte)var10;
ArchiveDisk_buffer[4] = (byte)(var11 >> 16);
ArchiveDisk_buffer[5] = (byte)(var11 >> 8);
ArchiveDisk_buffer[6] = (byte)var11;
ArchiveDisk_buffer[7] = (byte)this.archive;
this.datFile.seek((long)(var7 * 520));
this.datFile.write(IndexStore_buffer, 0, 8);
this.datFile.write(ArchiveDisk_buffer, 0, 8);
var12 = var3 - var9;
if (var12 > 512) {
var12 = 512;
@@ -491,6 +491,6 @@ public final class ArchiveDisk
}
static {
IndexStore_buffer = new byte[520];
ArchiveDisk_buffer = new byte[520];
}
}

4
runescape-client/src/main/java/ArchiveDiskAction.java
View File

@@ -94,7 +94,7 @@ public class ArchiveDiskAction extends Node {
var5 = false;
}
if (var0.movementSequence == var0.idleSequence && (var0.field22 > 25 || var5)) {
if (var0.movementSequence == var0.readySequence && (var0.field22 > 25 || var5)) {
if (var0.turnLeftSequence != -1) {
var0.movementSequence = var0.turnLeftSequence;
} else {
@@ -109,7 +109,7 @@ public class ArchiveDiskAction extends Node {
var5 = false;
}
if (var0.movementSequence == var0.idleSequence && (var0.field22 > 25 || var5)) {
if (var0.movementSequence == var0.readySequence && (var0.field22 > 25 || var5)) {
if (var0.turnRightSequence != -1) {
var0.movementSequence = var0.turnRightSequence;
} else {

2
runescape-client/src/main/java/BoundaryObject.java
View File

@@ -101,7 +101,7 @@ public final class BoundaryObject {
Client.showMouseOverText = !Client.showMouseOverText;
}
if (Client.rights >= 2) {
if (Client.staffModLevel >= 2) {
if (var0.equalsIgnoreCase("errortest")) {
throw new RuntimeException();
}

6
runescape-client/src/main/java/Canvas.java
View File

@@ -223,7 +223,7 @@ public final class Canvas extends java.awt.Canvas {
int var7 = var1.getFileId(var6, var3);
class214.field1129 = 1;
class214.field1130 = var1;
class30.musicTrackArchiveId = var6;
class30.musicTrackGroupId = var6;
GrandExchangeOffer.musicTrackFileId = var7;
WorldMapLabel.field1039 = var4;
RectangleMode.musicTrackBoolean = var5;
@@ -243,7 +243,7 @@ public final class Canvas extends java.awt.Canvas {
if (var0.hitpoints == 0) {
if (var0.field903 < 0 || VarbitDefinition.method4910(var0.field903, var0.field905)) {
ParamKeyDefinition.method4933(var0.level, var0.type, var0.x, var0.y, var0.field903, var0.field904, var0.field905);
ParamDefinition.method4933(var0.level, var0.type, var0.x, var0.y, var0.field903, var0.field904, var0.field905);
var0.remove();
}
} else {
@@ -252,7 +252,7 @@ public final class Canvas extends java.awt.Canvas {
}
if (var0.delay == 0 && var0.x >= 1 && var0.y >= 1 && var0.x <= 102 && var0.y <= 102 && (var0.id < 0 || VarbitDefinition.method4910(var0.id, var0.field908))) {
ParamKeyDefinition.method4933(var0.level, var0.type, var0.x, var0.y, var0.id, var0.orientation, var0.field908);
ParamDefinition.method4933(var0.level, var0.type, var0.x, var0.y, var0.id, var0.orientation, var0.field908);
var0.delay = -1;
if (var0.field903 == var0.id && var0.field903 == -1) {
var0.remove();

110
runescape-client/src/main/java/Client.java
View File

@@ -18,8 +18,8 @@ public final class Client extends GameShell implements Usernamed {
@ObfuscatedGetter(
intValue = -783816509
)
@Export("rootWidgetGroup")
static int rootWidgetGroup;
@Export("rootInterface")
static int rootInterface;
@ObfuscatedName("mc")
@ObfuscatedSignature(
signature = "Lho;"
@@ -132,8 +132,8 @@ public final class Client extends GameShell implements Usernamed {
@ObfuscatedGetter(
intValue = 821563709
)
@Export("rights")
static int rights;
@Export("staffModLevel")
static int staffModLevel;
@ObfuscatedName("oi")
@Export("rootWidgetYs")
static int[] rootWidgetYs;
@@ -860,14 +860,14 @@ public final class Client extends GameShell implements Usernamed {
@ObfuscatedGetter(
intValue = 410614005
)
@Export("cameraPitchTarget")
static int cameraPitchTarget;
@Export("camAngleX")
static int camAngleX;
@ObfuscatedName("hp")
@ObfuscatedGetter(
intValue = -1163038981
)
@Export("minimapOrientation")
static int minimapOrientation;
@Export("camAngleY")
static int camAngleY;
@ObfuscatedName("hv")
@ObfuscatedGetter(
intValue = 218086227
@@ -898,8 +898,8 @@ public final class Client extends GameShell implements Usernamed {
@ObfuscatedGetter(
intValue = 1005832199
)
@Export("cameraFollowHeight")
static int cameraFollowHeight;
@Export("camFollowHeight")
static int camFollowHeight;
@ObfuscatedName("hc")
@ObfuscatedGetter(
intValue = -441913785
@@ -1252,7 +1252,7 @@ public final class Client extends GameShell implements Usernamed {
protected final void vmethod107() {
field99 = class203.currentTimeMs() + 500L;
this.method84();
if (rootWidgetGroup != -1) {
if (rootInterface != -1) {
this.method87(true);
}
@@ -1277,7 +1277,7 @@ public final class Client extends GameShell implements Usernamed {
this.setUpKeyboard();
this.setUpMouse();
class16.mouseWheel = this.mouseWheel();
Fonts.archiveDisk255 = new ArchiveDisk(255, class168.dat2File, class168.idx255File, 500000);
Fonts.masterDisk = new ArchiveDisk(255, class168.dat2File, class168.idx255File, 500000);
ReflectionCheck.clientPreferences = class306.method5780();
this.setUpClipboard();
String var1 = Ignored.field402;
@@ -1299,8 +1299,8 @@ public final class Client extends GameShell implements Usernamed {
signature = "(I)V",
garbageValue = "1445885427"
)
@Export("packetHandler")
protected final void packetHandler() {
@Export("doCycle")
protected final void doCycle() {
++cycle;
this.doCycleJs5();
class3.method41();
@@ -2214,14 +2214,14 @@ public final class Client extends GameShell implements Usernamed {
signature = "(ZI)V",
garbageValue = "106302203"
)
@Export("methodDraw")
protected final void methodDraw(boolean var1) {
@Export("draw")
protected final void draw(boolean var1) {
boolean var2;
label139: {
try {
if (class214.field1129 == 2) {
if (class13.musicTrack == null) {
class13.musicTrack = MusicTrack.readTrack(class214.field1130, class30.musicTrackArchiveId, GrandExchangeOffer.musicTrackFileId);
class13.musicTrack = MusicTrack.readTrack(class214.field1130, class30.musicTrackGroupId, GrandExchangeOffer.musicTrackFileId);
if (class13.musicTrack == null) {
var2 = false;
break label139;
@@ -2872,7 +2872,7 @@ public final class Client extends GameShell implements Usernamed {
Players.NetCache_reference.index = var12 * 8 + 5;
var13 = Players.NetCache_reference.readInt();
int var23 = Players.NetCache_reference.readInt();
var22.loadIndexReference(var13, var23);
var22.loadIndex(var13, var23);
}
}
} else {
@@ -3436,7 +3436,7 @@ public final class Client extends GameShell implements Usernamed {
}
WorldMapSection0.savePreferences();
rights = ((AbstractSocket)var1).readUnsignedByte();
staffModLevel = ((AbstractSocket)var1).readUnsignedByte();
field155 = ((AbstractSocket)var1).readUnsignedByte() == 1;
localPlayerIndex = ((AbstractSocket)var1).readUnsignedByte();
localPlayerIndex <<= 8;
@@ -3817,8 +3817,8 @@ public final class Client extends GameShell implements Usernamed {
field200 = 20;
field201 = false;
var6 = Interpreter.method1915(ClientPacket.field261, packetWriter.isaacCipher);
var6.packetBuffer.method64(cameraPitchTarget);
var6.packetBuffer.writeShortLE(minimapOrientation);
var6.packetBuffer.method64(camAngleX);
var6.packetBuffer.writeShortLE(camAngleY);
packetWriter.method241(var6);
}
@@ -3899,7 +3899,7 @@ public final class Client extends GameShell implements Usernamed {
field137 = 0;
while (Decimator.method2490() && field137 < 128) {
if (rights >= 2 && KeyHandler.KeyHandler_pressedKeys[82] && ArchiveDiskAction.field411 == 66) {
if (staffModLevel >= 2 && KeyHandler.KeyHandler_pressedKeys[82] && ArchiveDiskAction.field411 == 66) {
String var22 = KeyHandler.method839();
TextureProvider.client.clipboardSetString(var22);
} else if (oculusOrbState != 1 || GzipDecompressor.field378 <= 0) {
@@ -3931,8 +3931,8 @@ public final class Client extends GameShell implements Usernamed {
mouseWheelRotation = 0;
}
if (rootWidgetGroup != -1) {
WorldMapDecorationType.method4517(rootWidgetGroup, 0, 0, SoundCache.canvasWidth, Huffman.canvasHeight, 0, 0);
if (rootInterface != -1) {
WorldMapDecorationType.method4517(rootInterface, 0, 0, SoundCache.canvasWidth, Huffman.canvasHeight, 0, 0);
}
++cycleCntr;
@@ -4295,8 +4295,8 @@ public final class Client extends GameShell implements Usernamed {
)
@Export("drawLoggedIn")
final void drawLoggedIn() {
if (rootWidgetGroup != -1) {
ClientPreferences.method1809(rootWidgetGroup);
if (rootInterface != -1) {
ClientPreferences.method1809(rootInterface);
}
int var1;
@@ -4313,9 +4313,9 @@ public final class Client extends GameShell implements Usernamed {
field216 = -1;
field217 = -1;
UserComparator6.field937 = null;
if (rootWidgetGroup != -1) {
if (rootInterface != -1) {
rootWidgetCount = 0;
Interpreter.drawWidgets(rootWidgetGroup, 0, 0, SoundCache.canvasWidth, Huffman.canvasHeight, 0, 0, -1);
Interpreter.drawWidgets(rootInterface, 0, 0, SoundCache.canvasWidth, Huffman.canvasHeight, 0, 0, -1);
}
Rasterizer2D.Rasterizer2D_resetClip();
@@ -4781,10 +4781,10 @@ public final class Client extends GameShell implements Usernamed {
if (ServerPacket.field873 == var1.serverPacket0) {
var37 = var3.method67();
rootWidgetGroup = var37;
rootInterface = var37;
this.method87(false);
DevicePcmPlayerProvider.method845(var37);
WorldMapSection3.runWidgetOnLoadListener(rootWidgetGroup);
WorldMapSection3.runWidgetOnLoadListener(rootInterface);
for (var6 = 0; var6 < 100; ++var6) {
field100[var6] = true;
@@ -4891,8 +4891,8 @@ public final class Client extends GameShell implements Usernamed {
}
if (ServerPacket.field841 == var1.serverPacket0) {
if (rootWidgetGroup != -1) {
GrandExchangeEvents.method74(rootWidgetGroup, 0);
if (rootInterface != -1) {
GrandExchangeEvents.method74(rootInterface, 0);
}
var1.serverPacket0 = null;
@@ -5176,7 +5176,7 @@ public final class Client extends GameShell implements Usernamed {
class22.method295(var16);
this.alignWidget(var16);
if (var16.type == 0) {
class39.revalidateWidgetScroll(Widget.widgets[var37 >> 16], var16, false);
class39.revalidateWidgetScroll(Widget.interfaceComponents[var37 >> 16], var16, false);
}
}
@@ -5233,7 +5233,7 @@ public final class Client extends GameShell implements Usernamed {
InterfaceParent var48 = (InterfaceParent)interfaceParents.get((long)var6);
var22 = (InterfaceParent)interfaceParents.get((long)var37);
if (var22 != null) {
MenuAction.closeWidgetGroup(var22, var48 == null || var48.group != var22.group);
MenuAction.closeInterface(var22, var48 == null || var48.group != var22.group);
}
if (var48 != null) {
@@ -5249,11 +5249,11 @@ public final class Client extends GameShell implements Usernamed {
var15 = Huffman.getWidget(var37);
if (var15 != null) {
class22.method295(var15);
class39.revalidateWidgetScroll(Widget.widgets[var15.id >>> 16], var15, true);
class39.revalidateWidgetScroll(Widget.interfaceComponents[var15.id >>> 16], var15, true);
}
if (rootWidgetGroup != -1) {
GrandExchangeEvents.method74(rootWidgetGroup, 1);
if (rootInterface != -1) {
GrandExchangeEvents.method74(rootInterface, 1);
}
var1.serverPacket0 = null;
@@ -5378,9 +5378,9 @@ public final class Client extends GameShell implements Usernamed {
field156 = (field156 + 1) % 100;
String var55 = AbstractFont.escapeBrackets(class233.method4527(KitDefinition.method4866(var3)));
if (var29.modIcon != -1) {
GrandExchangeEvents.addChatMessage(9, ItemContainer.method1170(var29.modIcon) + var21, var55, Clock.method3534(var25));
GrandExchangeEvents.addMessage(9, ItemContainer.method1170(var29.modIcon) + var21, var55, Clock.method3534(var25));
} else {
GrandExchangeEvents.addChatMessage(9, var21, var55, Clock.method3534(var25));
GrandExchangeEvents.addMessage(9, var21, var55, Clock.method3534(var25));
}
}
@@ -5579,11 +5579,11 @@ public final class Client extends GameShell implements Usernamed {
var37 = var3.index + var1.serverPacket0Length;
var6 = var3.readUnsignedShort();
var5 = var3.readUnsignedShort();
if (var6 != rootWidgetGroup) {
rootWidgetGroup = var6;
if (var6 != rootInterface) {
rootInterface = var6;
this.method87(false);
DevicePcmPlayerProvider.method845(rootWidgetGroup);
WorldMapSection3.runWidgetOnLoadListener(rootWidgetGroup);
DevicePcmPlayerProvider.method845(rootInterface);
WorldMapSection3.runWidgetOnLoadListener(rootInterface);
for (var10 = 0; var10 < 100; ++var10) {
field100[var10] = true;
@@ -5596,7 +5596,7 @@ public final class Client extends GameShell implements Usernamed {
var12 = var3.readUnsignedByte();
var50 = (InterfaceParent)interfaceParents.get((long)var10);
if (var50 != null && var11 != var50.group) {
MenuAction.closeWidgetGroup(var50, true);
MenuAction.closeInterface(var50, true);
var50 = null;
}
@@ -5609,7 +5609,7 @@ public final class Client extends GameShell implements Usernamed {
if (var22.keep) {
var22.keep = false;
} else {
MenuAction.closeWidgetGroup(var22, true);
MenuAction.closeInterface(var22, true);
}
}
@@ -5694,7 +5694,7 @@ public final class Client extends GameShell implements Usernamed {
var37 = var3.readInt();
var50 = (InterfaceParent)interfaceParents.get((long)var37);
if (var50 != null) {
MenuAction.closeWidgetGroup(var50, true);
MenuAction.closeInterface(var50, true);
}
if (field127 != null) {
@@ -5755,7 +5755,7 @@ public final class Client extends GameShell implements Usernamed {
var5 = var3.method67();
var22 = (InterfaceParent)interfaceParents.get((long)var6);
if (var22 != null) {
MenuAction.closeWidgetGroup(var22, var5 != var22.group);
MenuAction.closeInterface(var22, var5 != var22.group);
}
SecureRandomCallable.method1143(var6, var5, var37);
@@ -6065,11 +6065,11 @@ public final class Client extends GameShell implements Usernamed {
garbageValue = "-271438207"
)
final void method87(boolean var1) {
int var2 = rootWidgetGroup;
int var2 = rootInterface;
int var3 = SoundCache.canvasWidth;
int var4 = Huffman.canvasHeight;
if (GroundItemPile.loadWidgetGroup(var2)) {
WorldMapRegion.notRevalidateWidgetScroll(Widget.widgets[var2], -1, var3, var4, var1);
if (GroundItemPile.loadInterface(var2)) {
WorldMapRegion.notRevalidateWidgetScroll(Widget.interfaceComponents[var2], -1, var3, var4, var1);
}
}
@@ -6310,14 +6310,14 @@ public final class Client extends GameShell implements Usernamed {
field187 = 7759444;
field188 = false;
field189 = 0;
cameraPitchTarget = 128;
minimapOrientation = 0;
camAngleX = 128;
camAngleY = 0;
field190 = 0;
field191 = 0;
field192 = 0;
field193 = 0;
oculusOrbState = 0;
cameraFollowHeight = 50;
camFollowHeight = 50;
field194 = 0;
field195 = 0;
field196 = 0;
@@ -6401,7 +6401,7 @@ public final class Client extends GameShell implements Usernamed {
field157 = -1;
selectedSpellActionName = null;
selectedSpellName = null;
rootWidgetGroup = -1;
rootInterface = -1;
interfaceParents = new NodeHashTable(8);
field151 = 0;
field153 = -1;
@@ -6410,7 +6410,7 @@ public final class Client extends GameShell implements Usernamed {
field127 = null;
runEnergy = 0;
weight = 0;
rights = 0;
staffModLevel = 0;
followerIndex = -1;
field155 = false;
viewportWidget = null;

4
runescape-client/src/main/java/ClientPreferences.java
View File

@@ -149,8 +149,8 @@ public class ClientPreferences {
garbageValue = "0"
)
static final void method1809(int var0) {
if (GroundItemPile.loadWidgetGroup(var0)) {
NetFileRequest.method4555(Widget.widgets[var0], -1);
if (GroundItemPile.loadInterface(var0)) {
NetFileRequest.method4555(Widget.interfaceComponents[var0], -1);
}
}

12
runescape-client/src/main/java/DevicePcmPlayerProvider.java
View File

@@ -149,8 +149,8 @@ public class DevicePcmPlayerProvider implements PcmPlayerProvider {
signature = "([Lho;IIIIIIIII)V",
garbageValue = "-1516599170"
)
@Export("drawWidgetGroup")
static final void drawWidgetGroup(Widget[] var0, int var1, int var2, int var3, int var4, int var5, int var6, int var7, int var8) {
@Export("drawInterface")
static final void drawInterface(Widget[] var0, int var1, int var2, int var3, int var4, int var5, int var6, int var7, int var8) {
Rasterizer2D.Rasterizer2D_setClip(var2, var3, var4, var5);
Rasterizer3D.Rasterizer3D_method1();
@@ -328,9 +328,9 @@ public class DevicePcmPlayerProvider implements PcmPlayerProvider {
}
}
drawWidgetGroup(var0, var10.id, var15, var16, var17, var18, var12 - var10.scrollX, var13 - var10.scrollY, var11);
drawInterface(var0, var10.id, var15, var16, var17, var18, var12 - var10.scrollX, var13 - var10.scrollY, var11);
if (var10.children != null) {
drawWidgetGroup(var10.children, var10.id, var15, var16, var17, var18, var12 - var10.scrollX, var13 - var10.scrollY, var11);
drawInterface(var10.children, var10.id, var15, var16, var17, var18, var12 - var10.scrollX, var13 - var10.scrollY, var11);
}
InterfaceParent var23 = (InterfaceParent)Client.interfaceParents.get((long)var10.id);
@@ -781,8 +781,8 @@ public class DevicePcmPlayerProvider implements PcmPlayerProvider {
garbageValue = "-1666917204"
)
static final void method845(int var0) {
if (GroundItemPile.loadWidgetGroup(var0)) {
Widget[] var1 = Widget.widgets[var0];
if (GroundItemPile.loadInterface(var0)) {
Widget[] var1 = Widget.interfaceComponents[var0];
for (int var2 = 0; var2 < var1.length; ++var2) {
Widget var3 = var1[var2];

6
runescape-client/src/main/java/Entity.java
View File

@@ -29,12 +29,12 @@ public abstract class Entity extends DualNode {
}
@ObfuscatedName("cy")
@Export("renderDraw")
void renderDraw(int var1, int var2, int var3, int var4, int var5, int var6, int var7, int var8, long var9) {
@Export("draw")
void draw(int var1, int var2, int var3, int var4, int var5, int var6, int var7, int var8, long var9) {
Model var11 = this.getModel();
if (var11 != null) {
this.height = var11.height;
var11.renderDraw(var1, var2, var3, var4, var5, var6, var7, var8, var9);
var11.draw(var1, var2, var3, var4, var5, var6, var7, var8, var9);
}
}

10
runescape-client/src/main/java/FloorUnderlayDefinition.java
View File

@@ -11,14 +11,14 @@ public class FloorUnderlayDefinition extends DualNode {
@ObfuscatedSignature(
signature = "Lir;"
)
@Export("UnderlayDefinition_archive")
static AbstractArchive UnderlayDefinition_archive;
@Export("FloorUnderlayDefinition_archive")
static AbstractArchive FloorUnderlayDefinition_archive;
@ObfuscatedName("f")
@ObfuscatedSignature(
signature = "Ler;"
)
@Export("UnderlayDefinition_cached")
static EvictingDualNodeHashTable UnderlayDefinition_cached;
@Export("FloorUnderlayDefinition_cached")
static EvictingDualNodeHashTable FloorUnderlayDefinition_cached;
@ObfuscatedName("q")
@ObfuscatedGetter(
intValue = -635678213
@@ -181,6 +181,6 @@ public class FloorUnderlayDefinition extends DualNode {
}
static {
UnderlayDefinition_cached = new EvictingDualNodeHashTable(64);
FloorUnderlayDefinition_cached = new EvictingDualNodeHashTable(64);
}
}

4
runescape-client/src/main/java/Fonts.java
View File

@@ -11,8 +11,8 @@ public class Fonts {
@ObfuscatedSignature(
signature = "Lff;"
)
@Export("archiveDisk255")
static ArchiveDisk archiveDisk255;
@Export("masterDisk")
static ArchiveDisk masterDisk;
@ObfuscatedName("o")
static byte[][][] field350;
@ObfuscatedName("l")

2
runescape-client/src/main/java/FriendSystem.java
View File

@@ -332,6 +332,6 @@ public class FriendSystem {
)
@Export("jmodCheck")
public static boolean jmodCheck() {
return Client.rights >= 2;
return Client.staffModLevel >= 2;
}
}

14
runescape-client/src/main/java/GameShell.java
View File

@@ -598,7 +598,7 @@ public abstract class GameShell extends Applet implements Runnable, FocusListene
class230.field1138 = hasFocus;
}
this.packetHandler();
this.doCycle();
}
@ObfuscatedName("ar")
@@ -635,7 +635,7 @@ public abstract class GameShell extends Applet implements Runnable, FocusListene
}
this.method110();
this.methodDraw(this.field369);
this.draw(this.field369);
if (this.field369) {
this.clearBackground();
}
@@ -718,16 +718,16 @@ public abstract class GameShell extends Applet implements Runnable, FocusListene
signature = "(I)V",
garbageValue = "1445885427"
)
@Export("packetHandler")
protected abstract void packetHandler();
@Export("doCycle")
protected abstract void doCycle();
@ObfuscatedName("ab")
@ObfuscatedSignature(
signature = "(ZI)V",
garbageValue = "106302203"
)
@Export("methodDraw")
protected abstract void methodDraw(boolean var1);
@Export("draw")
protected abstract void draw(boolean var1);
@ObfuscatedName("ae")
@ObfuscatedSignature(
@@ -1001,7 +1001,7 @@ public abstract class GameShell extends Applet implements Runnable, FocusListene
public final void windowOpened(WindowEvent var1) {
}
@ObfuscatedName("init")
@ObfuscatedName("postDecode")
public abstract void vmethod117();
@ObfuscatedName("stop")

8
runescape-client/src/main/java/GrandExchangeEvents.java
View File

@@ -78,8 +78,8 @@ public class GrandExchangeEvents {
signature = "(ILjava/lang/String;Ljava/lang/String;Ljava/lang/String;I)V",
garbageValue = "1601363438"
)
@Export("addChatMessage")
static void addChatMessage(int var0, String var1, String var2, String var3) {
@Export("addMessage")
static void addMessage(int var0, String var1, String var2, String var3) {
ChatChannel var4 = (ChatChannel)Messages.Messages_channels.get(var0);
if (var4 == null) {
var4 = new ChatChannel();
@@ -166,8 +166,8 @@ public class GrandExchangeEvents {
garbageValue = "-635606409"
)
static final void method74(int var0, int var1) {
if (GroundItemPile.loadWidgetGroup(var0)) {
class30.method570(Widget.widgets[var0], var1);
if (GroundItemPile.loadInterface(var0)) {
class30.method570(Widget.interfaceComponents[var0], var1);
}
}

24
runescape-client/src/main/java/GroundItemPile.java
View File

@@ -67,38 +67,38 @@ public final class GroundItemPile {
signature = "(IB)Z",
garbageValue = "-60"
)
@Export("loadWidgetGroup")
public static boolean loadWidgetGroup(int var0) {
if (Widget.loadedWidgetGroups[var0]) {
@Export("loadInterface")
public static boolean loadInterface(int var0) {
if (Widget.loadedInterfaces[var0]) {
return true;
} else if (!Widget.Widget_archive.tryLoadGroup(var0)) {
return false;
} else {
int var1 = Widget.Widget_archive.method4(var0);
if (var1 == 0) {
Widget.loadedWidgetGroups[var0] = true;
Widget.loadedInterfaces[var0] = true;
return true;
} else {
if (Widget.widgets[var0] == null) {
Widget.widgets[var0] = new Widget[var1];
if (Widget.interfaceComponents[var0] == null) {
Widget.interfaceComponents[var0] = new Widget[var1];
}
for (int var2 = 0; var2 < var1; ++var2) {
if (Widget.widgets[var0][var2] == null) {
if (Widget.interfaceComponents[var0][var2] == null) {
byte[] var3 = Widget.Widget_archive.takeFile(var0, var2);
if (var3 != null) {
Widget.widgets[var0][var2] = new Widget();
Widget.widgets[var0][var2].id = var2 + (var0 << 16);
Widget.interfaceComponents[var0][var2] = new Widget();
Widget.interfaceComponents[var0][var2].id = var2 + (var0 << 16);
if (var3[0] == -1) {
Widget.widgets[var0][var2].decode(new Buffer(var3));
Widget.interfaceComponents[var0][var2].decode(new Buffer(var3));
} else {
Widget.widgets[var0][var2].decodeLegacy(new Buffer(var3));
Widget.interfaceComponents[var0][var2].decodeLegacy(new Buffer(var3));
}
}
}
}
Widget.loadedWidgetGroups[var0] = true;
Widget.loadedInterfaces[var0] = true;
return true;
}
}

2
runescape-client/src/main/java/GzipDecompressor.java
View File

@@ -66,7 +66,7 @@ public class GzipDecompressor {
var1.decode(new Buffer(var2));
}
var1.init();
var1.postDecode();
StructDefinition.field886.put(var1, (long)var0);
return var1;
}

6
runescape-client/src/main/java/Huffman.java
View File

@@ -307,14 +307,14 @@ public class Huffman {
public static Widget getWidget(int var0) {
int var1 = var0 >> 16;
int var2 = var0 & 65535;
if (Widget.widgets[var1] == null || Widget.widgets[var1][var2] == null) {
boolean var3 = GroundItemPile.loadWidgetGroup(var1);
if (Widget.interfaceComponents[var1] == null || Widget.interfaceComponents[var1][var2] == null) {
boolean var3 = GroundItemPile.loadInterface(var1);
if (!var3) {
return null;
}
}
return Widget.widgets[var1][var2];
return Widget.interfaceComponents[var1][var2];
}
@ObfuscatedName("m")

6
runescape-client/src/main/java/Interpreter.java
View File

@@ -187,11 +187,11 @@ public class Interpreter {
)
@Export("drawWidgets")
static final void drawWidgets(int var0, int var1, int var2, int var3, int var4, int var5, int var6, int var7) {
if (GroundItemPile.loadWidgetGroup(var0)) {
if (GroundItemPile.loadInterface(var0)) {
class279.field1145 = null;
DevicePcmPlayerProvider.drawWidgetGroup(Widget.widgets[var0], -1, var1, var2, var3, var4, var5, var6, var7);
DevicePcmPlayerProvider.drawInterface(Widget.interfaceComponents[var0], -1, var1, var2, var3, var4, var5, var6, var7);
if (class279.field1145 != null) {
DevicePcmPlayerProvider.drawWidgetGroup(class279.field1145, -1412584499, var1, var2, var3, var4, class54.field1161, class157.field1114, var7);
DevicePcmPlayerProvider.drawInterface(class279.field1145, -1412584499, var1, var2, var3, var4, class54.field1161, class157.field1114, var7);
class279.field1145 = null;
}
} else if (var7 != -1) {

2
runescape-client/src/main/java/InvDefinition.java
View File

@@ -60,7 +60,7 @@ public class InvDefinition extends DualNode {
garbageValue = "-121177696"
)
public static void method4754() {
ParamKeyDefinition.ParamKeyDefinition_cached.clear();
ParamDefinition.ParamDefinition_cached.clear();
}
static {

20
runescape-client/src/main/java/ItemDefinition.java
View File

@@ -124,8 +124,8 @@ public class ItemDefinition extends DualNode {
@ObfuscatedGetter(
intValue = 881309855
)
@Export("shiftClickIndex0")
int shiftClickIndex0;
@Export("shiftClickIndex")
int shiftClickIndex;
@ObfuscatedName("ah")
@ObfuscatedGetter(
intValue = 939367983
@@ -248,8 +248,8 @@ public class ItemDefinition extends DualNode {
@ObfuscatedGetter(
intValue = -1057008657
)
@Export("int1")
public int int1;
@Export("team")
public int team;
@ObfuscatedName("bq")
@ObfuscatedSignature(
signature = "Llh;"
@@ -297,7 +297,7 @@ public class ItemDefinition extends DualNode {
this.isMembersOnly = false;
this.groundActions = new String[]{null, null, "Take", null, null};
this.inventoryActions = new String[]{null, null, null, null, "Drop"};
this.shiftClickIndex0 = -2;
this.shiftClickIndex = -2;
this.maleModel = -1;
this.maleModel1 = -1;
this.maleOffset = 0;
@@ -317,7 +317,7 @@ public class ItemDefinition extends DualNode {
this.resizeZ = 128;
this.ambient = 0;
this.contrast = 0;
this.int1 = 0;
this.team = 0;
this.isTradable = false;
this.unnotedId = -1;
this.notedId = -1;
@@ -423,7 +423,7 @@ public class ItemDefinition extends DualNode {
this.retextureTo[var4] = (short)var1.readUnsignedShort();
}
} else if (var2 == 42) {
this.shiftClickIndex0 = var1.readByte();
this.shiftClickIndex = var1.readByte();
} else if (var2 == 65) {
this.isTradable = true;
} else if (var2 == 78) {
@@ -463,7 +463,7 @@ public class ItemDefinition extends DualNode {
} else if (var2 == 114) {
this.contrast = var1.readByte();
} else if (var2 == 115) {
this.int1 = var1.readUnsignedByte();
this.team = var1.readUnsignedByte();
} else if (var2 == 139) {
this.unnotedId = var1.readUnsignedShort();
} else if (var2 == 140) {
@@ -532,7 +532,7 @@ public class ItemDefinition extends DualNode {
this.maleHeadModel2 = var2.maleHeadModel2;
this.femaleHeadModel = var2.femaleHeadModel;
this.femaleHeadModel2 = var2.femaleHeadModel2;
this.int1 = var2.int1;
this.team = var2.team;
this.groundActions = var2.groundActions;
this.inventoryActions = new String[5];
if (var2.inventoryActions != null) {
@@ -891,7 +891,7 @@ public class ItemDefinition extends DualNode {
)
@Export("getShiftClickIndex")
public int getShiftClickIndex() {
return this.shiftClickIndex0 != -1 && this.inventoryActions != null ? (this.shiftClickIndex0 >= 0 ? (this.inventoryActions[this.shiftClickIndex0] != null ? this.shiftClickIndex0 : -1) : ("Drop".equalsIgnoreCase(this.inventoryActions[4]) ? 4 : -1)) : -1;
return this.shiftClickIndex != -1 && this.inventoryActions != null ? (this.shiftClickIndex >= 0 ? (this.inventoryActions[this.shiftClickIndex] != null ? this.shiftClickIndex : -1) : ("Drop".equalsIgnoreCase(this.inventoryActions[4]) ? 4 : -1)) : -1;
}
static {

36
runescape-client/src/main/java/KitDefinition.java
View File

@@ -36,8 +36,8 @@ public class KitDefinition extends DualNode {
@Export("bodypartID")
public int bodypartID;
@ObfuscatedName("u")
@Export("modelIDs")
int[] modelIDs;
@Export("models2")
int[] models2;
@ObfuscatedName("g")
@Export("recolorFrom")
short[] recolorFrom;
@@ -51,15 +51,15 @@ public class KitDefinition extends DualNode {
@Export("retextureTo")
short[] retextureTo;
@ObfuscatedName("d")
@Export("archives")
int[] archives;
@Export("models")
int[] models;
@ObfuscatedName("k")
@Export("nonSelectable")
public boolean nonSelectable;
KitDefinition() {
this.bodypartID = -1;
this.archives = new int[]{-1, -1, -1, -1, -1};
this.models = new int[]{-1, -1, -1, -1, -1};
this.nonSelectable = false;
}
@@ -94,10 +94,10 @@ public class KitDefinition extends DualNode {
int var4;
if (var2 == 2) {
var3 = var1.readUnsignedByte();
this.modelIDs = new int[var3];
this.models2 = new int[var3];
for (var4 = 0; var4 < var3; ++var4) {
this.modelIDs[var4] = var1.readUnsignedShort();
this.models2[var4] = var1.readUnsignedShort();
}
} else if (var2 == 3) {
this.nonSelectable = true;
@@ -120,7 +120,7 @@ public class KitDefinition extends DualNode {
this.retextureTo[var4] = (short)var1.readUnsignedShort();
}
} else if (var2 >= 60 && var2 < 70) {
this.archives[var2 - 60] = var1.readUnsignedShort();
this.models[var2 - 60] = var1.readUnsignedShort();
}
}
@@ -133,13 +133,13 @@ public class KitDefinition extends DualNode {
)
@Export("ready")
public boolean ready() {
if (this.modelIDs == null) {
if (this.models2 == null) {
return true;
} else {
boolean var1 = true;
for (int var2 = 0; var2 < this.modelIDs.length; ++var2) {
if (!field456.tryLoadFile(this.modelIDs[var2], 0)) {
for (int var2 = 0; var2 < this.models2.length; ++var2) {
if (!field456.tryLoadFile(this.models2[var2], 0)) {
var1 = false;
}
}
@@ -155,13 +155,13 @@ public class KitDefinition extends DualNode {
)
@Export("getModelData")
public ModelData getModelData() {
if (this.modelIDs == null) {
if (this.models2 == null) {
return null;
} else {
ModelData[] var1 = new ModelData[this.modelIDs.length];
ModelData[] var1 = new ModelData[this.models2.length];
for (int var2 = 0; var2 < this.modelIDs.length; ++var2) {
var1[var2] = ModelData.method2788(field456, this.modelIDs[var2], 0);
for (int var2 = 0; var2 < this.models2.length; ++var2) {
var1[var2] = ModelData.method2788(field456, this.models2[var2], 0);
}
ModelData var4;
@@ -197,7 +197,7 @@ public class KitDefinition extends DualNode {
boolean var1 = true;
for (int var2 = 0; var2 < 5; ++var2) {
if (this.archives[var2] != -1 && !field456.tryLoadFile(this.archives[var2], 0)) {
if (this.models[var2] != -1 && !field456.tryLoadFile(this.models[var2], 0)) {
var1 = false;
}
}
@@ -215,8 +215,8 @@ public class KitDefinition extends DualNode {
int var2 = 0;
for (int var3 = 0; var3 < 5; ++var3) {
if (this.archives[var3] != -1) {
var1[var2++] = ModelData.method2788(field456, this.archives[var3], 0);
if (this.models[var3] != -1) {
var1[var2++] = ModelData.method2788(field456, this.models[var3], 0);
}
}

2
runescape-client/src/main/java/Login.java
View File

@@ -189,7 +189,7 @@ public class Login {
public static void method2076(AbstractArchive var0, int var1, int var2, int var3, boolean var4) {
class214.field1129 = 1;
class214.field1130 = var0;
class30.musicTrackArchiveId = var1;
class30.musicTrackGroupId = var1;
GrandExchangeOffer.musicTrackFileId = var2;
WorldMapLabel.field1039 = var3;
RectangleMode.musicTrackBoolean = var4;

10
runescape-client/src/main/java/MenuAction.java
View File

@@ -65,13 +65,13 @@ public class MenuAction {
signature = "(Lbx;ZI)V",
garbageValue = "1537219807"
)
@Export("closeWidgetGroup")
static final void closeWidgetGroup(InterfaceParent var0, boolean var1) {
@Export("closeInterface")
static final void closeInterface(InterfaceParent var0, boolean var1) {
int var2 = var0.group;
int var3 = (int)var0.key;
var0.remove();
if (var1) {
AbstractByteArrayCopier.unloadWidgetGroup(var2);
AbstractByteArrayCopier.unloadInterface(var2);
}
for (IntegerNode var4 = (IntegerNode)Client.widgetClickMasks.first(); var4 != null; var4 = (IntegerNode)Client.widgetClickMasks.next()) {
@@ -152,8 +152,8 @@ public class MenuAction {
GameShell.menuY = var14;
class214.menuWidth = var7;
AbstractWorldMapIcon.menuHeight = Client.menuOptionsCount * 15 + 22;
if (Client.rootWidgetGroup != -1) {
GrandExchangeEvents.method74(Client.rootWidgetGroup, 1);
if (Client.rootInterface != -1) {
GrandExchangeEvents.method74(Client.rootInterface, 1);
}
}

4
runescape-client/src/main/java/Model.java
View File

@@ -1527,8 +1527,8 @@ public class Model extends Entity {
}
@ObfuscatedName("cy")
@Export("renderDraw")
void renderDraw(int var1, int var2, int var3, int var4, int var5, int var6, int var7, int var8, long var9) {
@Export("draw")
void draw(int var1, int var2, int var3, int var4, int var5, int var6, int var7, int var8, long var9) {
field529[0] = -1;
if (this.boundsType != 1) {
this.calculateBoundsCylinder();

2
runescape-client/src/main/java/MouseRecorder.java
View File

@@ -272,7 +272,7 @@ public class MouseRecorder implements Runnable {
if (var4 != null) {
Rasterizer2D.Rasterizer2D_setClip(var1, var2, var4.width + var1, var2 + var4.height);
if (Client.minimapState != 2 && Client.minimapState != 5) {
int var5 = Client.minimapOrientation & 2047;
int var5 = Client.camAngleY & 2047;
int var6 = Canvas.localPlayer.x / 32 + 48;
int var7 = 464 - Canvas.localPlayer.y / 32;
InterfaceParent.sceneMinimapSprite.method315(var1, var2, var4.width, var4.height, var6, var7, var5, 256, var4.xStarts, var4.xWidths);

2
runescape-client/src/main/java/NPC.java
View File

@@ -127,7 +127,7 @@ public final class NPC extends Actor {
return null;
} else {
SequenceDefinition var1 = super.sequence != -1 && super.sequenceDelay == 0 ? WorldMapAreaData.getSequenceDefinition(super.sequence) : null;
SequenceDefinition var2 = super.movementSequence == -1 || super.movementSequence == super.idleSequence && var1 != null ? null : WorldMapAreaData.getSequenceDefinition(super.movementSequence);
SequenceDefinition var2 = super.movementSequence == -1 || super.movementSequence == super.readySequence && var1 != null ? null : WorldMapAreaData.getSequenceDefinition(super.movementSequence);
Model var3 = this.definition.getModel(var1, super.sequenceFrame, var2, super.movementFrame);
if (var3 == null) {
return null;

54
runescape-client/src/main/java/NPCDefinition.java
View File

@@ -52,16 +52,16 @@ public class NPCDefinition extends DualNode {
@Export("size")
public int size;
@ObfuscatedName("l")
@Export("archives")
int[] archives;
@Export("models")
int[] models;
@ObfuscatedName("e")
int[] field636;
@ObfuscatedName("x")
@ObfuscatedGetter(
intValue = 275200787
)
@Export("idleSequence")
public int idleSequence;
@Export("readySequence")
public int readySequence;
@ObfuscatedName("d")
@ObfuscatedGetter(
intValue = 819690597
@@ -84,20 +84,20 @@ public class NPCDefinition extends DualNode {
@ObfuscatedGetter(
intValue = 1952230339
)
@Export("walkTurnSequence")
public int walkTurnSequence;
@Export("walkBackSequence")
public int walkBackSequence;
@ObfuscatedName("a")
@ObfuscatedGetter(
intValue = -1213774321
)
@Export("walkTurnLeftSequence")
public int walkTurnLeftSequence;
@Export("walkLeftSequence")
public int walkLeftSequence;
@ObfuscatedName("z")
@ObfuscatedGetter(
intValue = -96930503
)
@Export("walkTurnRightSequence")
public int walkTurnRightSequence;
@Export("walkRightSequence")
public int walkRightSequence;
@ObfuscatedName("j")
@Export("recolorFrom")
short[] recolorFrom;
@@ -192,13 +192,13 @@ public class NPCDefinition extends DualNode {
NPCDefinition() {
this.name = "null";
this.size = 1;
this.idleSequence = -1;
this.readySequence = -1;
this.turnLeftSequence = -1;
this.turnRightSequence = -1;
this.walkSequence = -1;
this.walkTurnSequence = -1;
this.walkTurnLeftSequence = -1;
this.walkTurnRightSequence = -1;
this.walkBackSequence = -1;
this.walkLeftSequence = -1;
this.walkRightSequence = -1;
this.actions = new String[5];
this.drawMapDot = true;
this.combatLevel = -1;
@@ -221,8 +221,8 @@ public class NPCDefinition extends DualNode {
signature = "(I)V",
garbageValue = "482179419"
)
@Export("init")
void init() {
@Export("postDecode")
void postDecode() {
}
@ObfuscatedName("w")
@@ -253,17 +253,17 @@ public class NPCDefinition extends DualNode {
int var4;
if (var2 == 1) {
var3 = var1.readUnsignedByte();
this.archives = new int[var3];
this.models = new int[var3];
for (var4 = 0; var4 < var3; ++var4) {
this.archives[var4] = var1.readUnsignedShort();
this.models[var4] = var1.readUnsignedShort();
}
} else if (var2 == 2) {
this.name = var1.readStringCp1252NullTerminated();
} else if (var2 == 12) {
this.size = var1.readUnsignedByte();
} else if (var2 == 13) {
this.idleSequence = var1.readUnsignedShort();
this.readySequence = var1.readUnsignedShort();
} else if (var2 == 14) {
this.walkSequence = var1.readUnsignedShort();
} else if (var2 == 15) {
@@ -272,9 +272,9 @@ public class NPCDefinition extends DualNode {
this.turnRightSequence = var1.readUnsignedShort();
} else if (var2 == 17) {
this.walkSequence = var1.readUnsignedShort();
this.walkTurnSequence = var1.readUnsignedShort();
this.walkTurnLeftSequence = var1.readUnsignedShort();
this.walkTurnRightSequence = var1.readUnsignedShort();
this.walkBackSequence = var1.readUnsignedShort();
this.walkLeftSequence = var1.readUnsignedShort();
this.walkRightSequence = var1.readUnsignedShort();
} else if (var2 >= 30 && var2 < 35) {
this.actions[var2 - 30] = var1.readStringCp1252NullTerminated();
if (this.actions[var2 - 30].equalsIgnoreCase("Hidden")) {
@@ -382,8 +382,8 @@ public class NPCDefinition extends DualNode {
if (var5 == null) {
boolean var6 = false;
for (int var7 = 0; var7 < this.archives.length; ++var7) {
if (!NpcDefinition_modelArchive.tryLoadFile(this.archives[var7], 0)) {
for (int var7 = 0; var7 < this.models.length; ++var7) {
if (!NpcDefinition_modelArchive.tryLoadFile(this.models[var7], 0)) {
var6 = true;
}
}
@@ -392,11 +392,11 @@ public class NPCDefinition extends DualNode {
return null;
}
ModelData[] var12 = new ModelData[this.archives.length];
ModelData[] var12 = new ModelData[this.models.length];
int var8;
for (var8 = 0; var8 < this.archives.length; ++var8) {
var12[var8] = ModelData.method2788(NpcDefinition_modelArchive, this.archives[var8], 0);
for (var8 = 0; var8 < this.models.length; ++var8) {
var12[var8] = ModelData.method2788(NpcDefinition_modelArchive, this.models[var8], 0);
}
ModelData var9;

2
runescape-client/src/main/java/NetFileRequest.java
View File

@@ -96,7 +96,7 @@ public class NetFileRequest extends DualNode {
)
static final void method4554(int var0, int var1, int var2, int var3, Sprite var4, SpriteMask var5) {
if (var4 != null) {
int var6 = Client.minimapOrientation & 2047;
int var6 = Client.camAngleY & 2047;
int var7 = var3 * var3 + var2 * var2;
if (var7 <= 6400) {
int var8 = Rasterizer3D.Rasterizer3D_sine[var6];

22
runescape-client/src/main/java/ObjectDefinition.java
View File

@@ -218,8 +218,8 @@ public class ObjectDefinition extends DualNode {
@ObfuscatedGetter(
intValue = -2119965579
)
@Export("transformConfigId")
int transformConfigId;
@Export("transformVarp")
int transformVarp;
@ObfuscatedName("az")
@ObfuscatedGetter(
intValue = 374616127
@@ -282,7 +282,7 @@ public class ObjectDefinition extends DualNode {
this.isSolid = false;
this.int3 = -1;
this.transformVarbit = -1;
this.transformConfigId = -1;
this.transformVarp = -1;
this.ambientSoundId = -1;
this.int4 = 0;
this.int5 = 0;
@@ -294,8 +294,8 @@ public class ObjectDefinition extends DualNode {
signature = "(I)V",
garbageValue = "-245255765"
)
@Export("init")
void init() {
@Export("postDecode")
void postDecode() {
if (this.int1 == -1) {
this.int1 = 0;
if (this.field644 != null && (this.field645 == null || this.field645[0] == 10)) {
@@ -478,9 +478,9 @@ public class ObjectDefinition extends DualNode {
this.transformVarbit = -1;
}
this.transformConfigId = var1.readUnsignedShort();
if (this.transformConfigId == 65535) {
this.transformConfigId = -1;
this.transformVarp = var1.readUnsignedShort();
if (this.transformVarp == 65535) {
this.transformVarp = -1;
}
var3 = -1;
@@ -827,8 +827,8 @@ public class ObjectDefinition extends DualNode {
int var1 = -1;
if (this.transformVarbit != -1) {
var1 = WorldMapSection2.getVarbit(this.transformVarbit);
} else if (this.transformConfigId != -1) {
var1 = Varps.Varps_main[this.transformConfigId];
} else if (this.transformVarp != -1) {
var1 = Varps.Varps_main[this.transformVarp];
}
int var2;
@@ -914,7 +914,7 @@ public class ObjectDefinition extends DualNode {
var1.decode(new Buffer(var2));
}
var1.init();
var1.postDecode();
NPCDefinition.NpcDefinition_cached.put(var1, (long)var0);
return var1;
}

12
runescape-client/src/main/java/OwnWorldComparator.java
View File

@@ -57,16 +57,16 @@ public class OwnWorldComparator implements Comparator {
var3 = Interpreter.Interpreter_intStack[RouteStrategy.Interpreter_intStackSize];
int var4 = Interpreter.Interpreter_intStack[RouteStrategy.Interpreter_intStackSize + 1];
if (!Client.isCameraLocked) {
Client.cameraPitchTarget = var3;
Client.minimapOrientation = var4;
Client.camAngleX = var3;
Client.camAngleY = var4;
}
return 1;
} else if (var0 == ScriptOpcodes.CAM_GETANGLE_XA) {
Interpreter.Interpreter_intStack[++RouteStrategy.Interpreter_intStackSize - 1] = Client.cameraPitchTarget;
Interpreter.Interpreter_intStack[++RouteStrategy.Interpreter_intStackSize - 1] = Client.camAngleX;
return 1;
} else if (var0 == ScriptOpcodes.CAM_GETANGLE_YA) {
Interpreter.Interpreter_intStack[++RouteStrategy.Interpreter_intStackSize - 1] = Client.minimapOrientation;
Interpreter.Interpreter_intStack[++RouteStrategy.Interpreter_intStackSize - 1] = Client.camAngleY;
return 1;
} else if (var0 == ScriptOpcodes.CAM_SETFOLLOWHEIGHT) {
var3 = Interpreter.Interpreter_intStack[--RouteStrategy.Interpreter_intStackSize];
@@ -74,10 +74,10 @@ public class OwnWorldComparator implements Comparator {
var3 = 0;
}
Client.cameraFollowHeight = var3;
Client.camFollowHeight = var3;
return 1;
} else if (var0 == ScriptOpcodes.CAM_GETFOLLOWHEIGHT) {
Interpreter.Interpreter_intStack[++RouteStrategy.Interpreter_intStackSize - 1] = Client.cameraFollowHeight;
Interpreter.Interpreter_intStack[++RouteStrategy.Interpreter_intStackSize - 1] = Client.camFollowHeight;
return 1;
} else {
return 2;

36
runescape-client/src/main/java/ParamKeyDefinition.java → runescape-client/src/main/java/ParamDefinition.java
View File

@@ -5,8 +5,8 @@ import net.runelite.mapping.ObfuscatedName;
import net.runelite.mapping.ObfuscatedSignature;
@ObfuscatedName("jb")
@Implements("ParamKeyDefinition")
public class ParamKeyDefinition extends DualNode {
@Implements("ParamDefinition")
public class ParamDefinition extends DualNode {
@ObfuscatedName("m")
@ObfuscatedSignature(
signature = "Lir;"
@@ -16,8 +16,8 @@ public class ParamKeyDefinition extends DualNode {
@ObfuscatedSignature(
signature = "Ler;"
)
@Export("ParamKeyDefinition_cached")
static EvictingDualNodeHashTable ParamKeyDefinition_cached;
@Export("ParamDefinition_cached")
static EvictingDualNodeHashTable ParamDefinition_cached;
@ObfuscatedName("q")
@Export("type")
char type;
@@ -25,17 +25,17 @@ public class ParamKeyDefinition extends DualNode {
@ObfuscatedGetter(
intValue = 1133042753
)
@Export("keyInt")
public int keyInt;
@Export("defaultInt")
public int defaultInt;
@ObfuscatedName("o")
@Export("keyString")
public String keyString;
@Export("defaultStr")
public String defaultStr;
@ObfuscatedName("u")
@Export("isMembersOnly")
boolean isMembersOnly;
@Export("autoDisable")
boolean autoDisable;
ParamKeyDefinition() {
this.isMembersOnly = true;
ParamDefinition() {
this.autoDisable = true;
}
@ObfuscatedName("f")
@@ -43,8 +43,8 @@ public class ParamKeyDefinition extends DualNode {
signature = "(B)V",
garbageValue = "121"
)
@Export("init")
void init() {
@Export("postDecode")
void postDecode() {
}
@ObfuscatedName("q")
@@ -74,11 +74,11 @@ public class ParamKeyDefinition extends DualNode {
if (var2 == 1) {
this.type = class14.method171(var1.readByte());
} else if (var2 == 2) {
this.keyInt = var1.readInt();
this.defaultInt = var1.readInt();
} else if (var2 == 4) {
this.isMembersOnly = false;
this.autoDisable = false;
} else if (var2 == 5) {
this.keyString = var1.readStringCp1252NullTerminated();
this.defaultStr = var1.readStringCp1252NullTerminated();
}
}
@@ -391,6 +391,6 @@ public class ParamKeyDefinition extends DualNode {
}
static {
ParamKeyDefinition_cached = new EvictingDualNodeHashTable(64);
ParamDefinition_cached = new EvictingDualNodeHashTable(64);
}
}

6
runescape-client/src/main/java/PendingSpawn.java
View File

@@ -97,9 +97,9 @@ public final class PendingSpawn extends Node {
)
public static void method1695(int var0, int var1) {
VarbitDefinition var2 = Occluder.method3255(var0);
int var3 = var2.varp;
int var4 = var2.lowBit;
int var5 = var2.highBit;
int var3 = var2.baseVar;
int var4 = var2.startBit;
int var5 = var2.endBit;
int var6 = Varps.Varps_masks[var5 - var4];
if (var1 < 0 || var1 > var6) {
var1 = 0;

30
runescape-client/src/main/java/Player.java
View File

@@ -214,7 +214,7 @@ public final class Player extends Actor {
}
if (var4[var7] >= 512) {
int var8 = Skills.getItemDefinition(var4[var7] - 512).int1;
int var8 = Skills.getItemDefinition(var4[var7] - 512).team;
if (var8 != 0) {
this.team = var8;
}
@@ -233,9 +233,9 @@ public final class Player extends Actor {
var9[var5] = var6;
}
super.idleSequence = var1.readUnsignedShort();
if (super.idleSequence == 65535) {
super.idleSequence = -1;
super.readySequence = var1.readUnsignedShort();
if (super.readySequence == 65535) {
super.readySequence = -1;
}
super.turnLeftSequence = var1.readUnsignedShort();
@@ -249,19 +249,19 @@ public final class Player extends Actor {
super.walkSequence = -1;
}
super.walkTurnSequence = var1.readUnsignedShort();
if (super.walkTurnSequence == 65535) {
super.walkTurnSequence = -1;
super.walkBackSequence = var1.readUnsignedShort();
if (super.walkBackSequence == 65535) {
super.walkBackSequence = -1;
}
super.walkTurnLeftSequence = var1.readUnsignedShort();
if (super.walkTurnLeftSequence == 65535) {
super.walkTurnLeftSequence = -1;
super.walkLeftSequence = var1.readUnsignedShort();
if (super.walkLeftSequence == 65535) {
super.walkLeftSequence = -1;
}
super.walkTurnRightSequence = var1.readUnsignedShort();
if (super.walkTurnRightSequence == 65535) {
super.walkTurnRightSequence = -1;
super.walkRightSequence = var1.readUnsignedShort();
if (super.walkRightSequence == 65535) {
super.walkRightSequence = -1;
}
super.runSequence = var1.readUnsignedShort();
@@ -279,7 +279,7 @@ public final class Player extends Actor {
this.combatLevel = var1.readUnsignedByte();
this.skillLevel = var1.readUnsignedShort();
this.isHidden = var1.readUnsignedByte() == 1;
if (Client.gameBuild == 0 && Client.rights >= 2) {
if (Client.gameBuild == 0 && Client.staffModLevel >= 2) {
this.isHidden = false;
}
@@ -379,7 +379,7 @@ public final class Player extends Actor {
return null;
} else {
SequenceDefinition var1 = super.sequence != -1 && super.sequenceDelay == 0 ? WorldMapAreaData.getSequenceDefinition(super.sequence) : null;
SequenceDefinition var2 = super.movementSequence != -1 && !this.isUnanimated && (super.idleSequence != super.movementSequence || var1 == null) ? WorldMapAreaData.getSequenceDefinition(super.movementSequence) : null;
SequenceDefinition var2 = super.movementSequence != -1 && !this.isUnanimated && (super.readySequence != super.movementSequence || var1 == null) ? WorldMapAreaData.getSequenceDefinition(super.movementSequence) : null;
Model var3 = this.appearance.getModel(var1, super.sequenceFrame, var2, super.movementFrame);
if (var3 == null) {
return null;

76
runescape-client/src/main/java/Scene.java
View File

@@ -61,8 +61,8 @@ public class Scene {
@ObfuscatedSignature(
signature = "[Leh;"
)
@Export("Scene_gameObjects")
static GameObject[] Scene_gameObjects;
@Export("gameObjects")
static GameObject[] gameObjects;
@ObfuscatedName("ac")
@Export("checkClick")
static boolean checkClick;
@@ -168,8 +168,8 @@ public class Scene {
@Export("tiles")
Tile[][][] tiles;
@ObfuscatedName("g")
@Export("Scene_minPlane")
int Scene_minPlane;
@Export("minPlane")
int minPlane;
@ObfuscatedName("l")
@Export("tempGameObjectsCount")
int tempGameObjectsCount;
@@ -187,7 +187,7 @@ public class Scene {
int[][] field771;
public Scene(int var1, int var2, int var3, int[][][] var4) {
this.Scene_minPlane = 0;
this.minPlane = 0;
this.tempGameObjectsCount = 0;
this.tempGameObjects = new GameObject[5000];
this.field770 = new int[][]{{0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0}, {1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1}, {1, 0, 0, 0, 1, 1, 0, 0, 1, 1, 1, 0, 1, 1, 1, 1}, {1, 1, 0, 0, 1, 1, 0, 0, 1, 0, 0, 0, 1, 0, 0, 0}, {0, 0, 1, 1, 0, 0, 1, 1, 0, 0, 0, 1, 0, 0, 0, 1}, {0, 1, 1, 1, 0, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1}, {1, 1, 1, 0, 1, 1, 1, 0, 1, 1, 1, 1, 1, 1, 1, 1}, {1, 1, 0, 0, 1, 1, 0, 0, 1, 1, 0, 0, 1, 1, 0, 0}, {0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 1, 1, 0, 0}, {1, 1, 1, 1, 1, 1, 1, 1, 0, 1, 1, 1, 0, 0, 1, 1}, {1, 1, 1, 1, 1, 1, 0, 0, 1, 0, 0, 0, 1, 0, 0, 0}, {0, 0, 0, 0, 0, 0, 1, 1, 0, 1, 1, 1, 0, 1, 1, 1}, {0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 1, 0, 1, 1, 1, 1}};
@@ -228,8 +228,8 @@ public class Scene {
this.tempGameObjectsCount = 0;
for (var1 = 0; var1 < Scene_gameObjects.length; ++var1) {
Scene_gameObjects[var1] = null;
for (var1 = 0; var1 < gameObjects.length; ++var1) {
gameObjects[var1] = null;
}
}
@@ -237,7 +237,7 @@ public class Scene {
@ObfuscatedName("f")
@Export("init")
public void init(int var1) {
this.Scene_minPlane = var1;
this.minPlane = var1;
for (int var2 = 0; var2 < this.xSize; ++var2) {
for (int var3 = 0; var3 < this.ySize; ++var3) {
@@ -1100,7 +1100,7 @@ public class Scene {
Tile[][] var8;
int var9;
int var10;
for (var7 = this.Scene_minPlane; var7 < this.planes; ++var7) {
for (var7 = this.minPlane; var7 < this.planes; ++var7) {
var8 = this.tiles[var7];
for (var9 = Scene_cameraXTileMin; var9 < Scene_cameraXTileMax; ++var9) {
@@ -1132,7 +1132,7 @@ public class Scene {
Tile var14;
int var15;
int var16;
for (var7 = this.Scene_minPlane; var7 < this.planes; ++var7) {
for (var7 = this.minPlane; var7 < this.planes; ++var7) {
var8 = this.tiles[var7];
for (var9 = -25; var9 <= 0; ++var9) {
@@ -1183,7 +1183,7 @@ public class Scene {
}
}
for (var7 = this.Scene_minPlane; var7 < this.planes; ++var7) {
for (var7 = this.minPlane; var7 < this.planes; ++var7) {
var8 = this.tiles[var7];
for (var9 = -25; var9 <= 0; ++var9) {
@@ -1342,13 +1342,13 @@ public class Scene {
var16 = var9.boundaryObject;
if (var16 != null) {
var16.entity1.renderDraw(0, Scene_cameraPitchSine, Scene_cameraPitchCosine, Scene_cameraYawSine, Scene_cameraYawCosine, var16.x - Scene_cameraX, var16.tileHeight - Scene_cameraY, var16.y - Scene_cameraZ, var16.tag);
var16.entity1.draw(0, Scene_cameraPitchSine, Scene_cameraPitchCosine, Scene_cameraYawSine, Scene_cameraYawCosine, var16.x - Scene_cameraX, var16.tileHeight - Scene_cameraY, var16.y - Scene_cameraZ, var16.tag);
}
for (var10 = 0; var10 < var9.gameObjectsCount; ++var10) {
var17 = var9.gameObjects[var10];
if (var17 != null) {
var17.entity.renderDraw(var17.orientation, Scene_cameraPitchSine, Scene_cameraPitchCosine, Scene_cameraYawSine, Scene_cameraYawCosine, var17.centerX - Scene_cameraX, var17.height - Scene_cameraY, var17.centerY - Scene_cameraZ, var17.tag);
var17.entity.draw(var17.orientation, Scene_cameraPitchSine, Scene_cameraPitchCosine, Scene_cameraYawSine, Scene_cameraYawCosine, var17.centerX - Scene_cameraX, var17.height - Scene_cameraY, var17.centerY - Scene_cameraZ, var17.tag);
}
}
}
@@ -1411,17 +1411,17 @@ public class Scene {
}
if ((var23.orientationA & var10) != 0 && !this.method298(var7, var4, var5, var23.orientationA)) {
var23.entity1.renderDraw(0, Scene_cameraPitchSine, Scene_cameraPitchCosine, Scene_cameraYawSine, Scene_cameraYawCosine, var23.x - Scene_cameraX, var23.tileHeight - Scene_cameraY, var23.y - Scene_cameraZ, var23.tag);
var23.entity1.draw(0, Scene_cameraPitchSine, Scene_cameraPitchCosine, Scene_cameraYawSine, Scene_cameraYawCosine, var23.x - Scene_cameraX, var23.tileHeight - Scene_cameraY, var23.y - Scene_cameraZ, var23.tag);
}
if ((var23.orientationB & var10) != 0 && !this.method298(var7, var4, var5, var23.orientationB)) {
var23.entity2.renderDraw(0, Scene_cameraPitchSine, Scene_cameraPitchCosine, Scene_cameraYawSine, Scene_cameraYawCosine, var23.x - Scene_cameraX, var23.tileHeight - Scene_cameraY, var23.y - Scene_cameraZ, var23.tag);
var23.entity2.draw(0, Scene_cameraPitchSine, Scene_cameraPitchCosine, Scene_cameraYawSine, Scene_cameraYawCosine, var23.x - Scene_cameraX, var23.tileHeight - Scene_cameraY, var23.y - Scene_cameraZ, var23.tag);
}
}
if (var24 != null && !this.method299(var7, var4, var5, var24.entity1.height)) {
if ((var24.orientation & var10) != 0) {
var24.entity1.renderDraw(0, Scene_cameraPitchSine, Scene_cameraPitchCosine, Scene_cameraYawSine, Scene_cameraYawCosine, var24.x - Scene_cameraX + var24.xOffset, var24.tileHeight - Scene_cameraY, var24.y - Scene_cameraZ + var24.yOffset, var24.tag);
var24.entity1.draw(0, Scene_cameraPitchSine, Scene_cameraPitchCosine, Scene_cameraYawSine, Scene_cameraYawCosine, var24.x - Scene_cameraX + var24.xOffset, var24.tileHeight - Scene_cameraY, var24.y - Scene_cameraZ + var24.yOffset, var24.tag);
} else if (var24.orientation == 256) {
var11 = var24.x - Scene_cameraX;
var12 = var24.tileHeight - Scene_cameraY;
@@ -1441,9 +1441,9 @@ public class Scene {
}
if (var25 < var19) {
var24.entity1.renderDraw(0, Scene_cameraPitchSine, Scene_cameraPitchCosine, Scene_cameraYawSine, Scene_cameraYawCosine, var11 + var24.xOffset, var12, var13 + var24.yOffset, var24.tag);
var24.entity1.draw(0, Scene_cameraPitchSine, Scene_cameraPitchCosine, Scene_cameraYawSine, Scene_cameraYawCosine, var11 + var24.xOffset, var12, var13 + var24.yOffset, var24.tag);
} else if (var24.entity2 != null) {
var24.entity2.renderDraw(0, Scene_cameraPitchSine, Scene_cameraPitchCosine, Scene_cameraYawSine, Scene_cameraYawCosine, var11, var12, var13, var24.tag);
var24.entity2.draw(0, Scene_cameraPitchSine, Scene_cameraPitchCosine, Scene_cameraYawSine, Scene_cameraYawCosine, var11, var12, var13, var24.tag);
}
}
}
@@ -1451,21 +1451,21 @@ public class Scene {
if (var20) {
FloorDecoration var34 = var3.floorDecoration;
if (var34 != null) {
var34.entity.renderDraw(0, Scene_cameraPitchSine, Scene_cameraPitchCosine, Scene_cameraYawSine, Scene_cameraYawCosine, var34.x - Scene_cameraX, var34.tileHeight - Scene_cameraY, var34.y - Scene_cameraZ, var34.tag);
var34.entity.draw(0, Scene_cameraPitchSine, Scene_cameraPitchCosine, Scene_cameraYawSine, Scene_cameraYawCosine, var34.x - Scene_cameraX, var34.tileHeight - Scene_cameraY, var34.y - Scene_cameraZ, var34.tag);
}
GroundItemPile var26 = var3.groundItemPile;
if (var26 != null && var26.height == 0) {
if (var26.second != null) {
var26.second.renderDraw(0, Scene_cameraPitchSine, Scene_cameraPitchCosine, Scene_cameraYawSine, Scene_cameraYawCosine, var26.x - Scene_cameraX, var26.tileHeight - Scene_cameraY, var26.y - Scene_cameraZ, var26.tag);
var26.second.draw(0, Scene_cameraPitchSine, Scene_cameraPitchCosine, Scene_cameraYawSine, Scene_cameraYawCosine, var26.x - Scene_cameraX, var26.tileHeight - Scene_cameraY, var26.y - Scene_cameraZ, var26.tag);
}
if (var26.third != null) {
var26.third.renderDraw(0, Scene_cameraPitchSine, Scene_cameraPitchCosine, Scene_cameraYawSine, Scene_cameraYawCosine, var26.x - Scene_cameraX, var26.tileHeight - Scene_cameraY, var26.y - Scene_cameraZ, var26.tag);
var26.third.draw(0, Scene_cameraPitchSine, Scene_cameraPitchCosine, Scene_cameraYawSine, Scene_cameraYawCosine, var26.x - Scene_cameraX, var26.tileHeight - Scene_cameraY, var26.y - Scene_cameraZ, var26.tag);
}
if (var26.first != null) {
var26.first.renderDraw(0, Scene_cameraPitchSine, Scene_cameraPitchCosine, Scene_cameraYawSine, Scene_cameraYawCosine, var26.x - Scene_cameraX, var26.tileHeight - Scene_cameraY, var26.y - Scene_cameraZ, var26.tag);
var26.first.draw(0, Scene_cameraPitchSine, Scene_cameraPitchCosine, Scene_cameraYawSine, Scene_cameraYawCosine, var26.x - Scene_cameraX, var26.tileHeight - Scene_cameraY, var26.y - Scene_cameraZ, var26.tag);
}
}
}
@@ -1516,7 +1516,7 @@ public class Scene {
if (var20) {
var16 = var3.boundaryObject;
if (!this.method298(var7, var4, var5, var16.orientationA)) {
var16.entity1.renderDraw(0, Scene_cameraPitchSine, Scene_cameraPitchCosine, Scene_cameraYawSine, Scene_cameraYawCosine, var16.x - Scene_cameraX, var16.tileHeight - Scene_cameraY, var16.y - Scene_cameraZ, var16.tag);
var16.entity1.draw(0, Scene_cameraPitchSine, Scene_cameraPitchCosine, Scene_cameraYawSine, Scene_cameraYawCosine, var16.x - Scene_cameraX, var16.tileHeight - Scene_cameraY, var16.y - Scene_cameraZ, var16.tag);
}
var3.drawGameObjectEdges = 0;
@@ -1570,7 +1570,7 @@ public class Scene {
}
}
Scene_gameObjects[var21++] = var17;
gameObjects[var21++] = var17;
var14 = Scene_cameraXTile - var17.startX;
var11 = var17.endX - Scene_cameraXTile;
if (var11 > var14) {
@@ -1593,7 +1593,7 @@ public class Scene {
GameObject var33;
for (var14 = 0; var14 < var21; ++var14) {
var33 = Scene_gameObjects[var14];
var33 = gameObjects[var14];
if (var33.lastDrawn != Scene_drawnCount) {
if (var33.field360 > var10) {
var10 = var33.field360;
@@ -1601,8 +1601,8 @@ public class Scene {
} else if (var10 == var33.field360) {
var12 = var33.centerX - Scene_cameraX;
var13 = var33.centerY - Scene_cameraZ;
var18 = Scene_gameObjects[var15].centerX - Scene_cameraX;
var19 = Scene_gameObjects[var15].centerY - Scene_cameraZ;
var18 = gameObjects[var15].centerX - Scene_cameraX;
var19 = gameObjects[var15].centerY - Scene_cameraZ;
if (var12 * var12 + var13 * var13 > var18 * var18 + var19 * var19) {
var15 = var14;
}
@@ -1614,10 +1614,10 @@ public class Scene {
break;
}
var33 = Scene_gameObjects[var15];
var33 = gameObjects[var15];
var33.lastDrawn = Scene_drawnCount;
if (!this.method300(var7, var33.startX, var33.endX, var33.startY, var33.endY, var33.entity.height)) {
var33.entity.renderDraw(var33.orientation, Scene_cameraPitchSine, Scene_cameraPitchCosine, Scene_cameraYawSine, Scene_cameraYawCosine, var33.centerX - Scene_cameraX, var33.height - Scene_cameraY, var33.centerY - Scene_cameraZ, var33.tag);
var33.entity.draw(var33.orientation, Scene_cameraPitchSine, Scene_cameraPitchCosine, Scene_cameraYawSine, Scene_cameraYawCosine, var33.centerX - Scene_cameraX, var33.height - Scene_cameraY, var33.centerY - Scene_cameraZ, var33.tag);
}
for (var11 = var33.startX; var11 <= var33.endX; ++var11) {
@@ -1676,15 +1676,15 @@ public class Scene {
GroundItemPile var28 = var3.groundItemPile;
if (var28 != null && var28.height != 0) {
if (var28.second != null) {
var28.second.renderDraw(0, Scene_cameraPitchSine, Scene_cameraPitchCosine, Scene_cameraYawSine, Scene_cameraYawCosine, var28.x - Scene_cameraX, var28.tileHeight - Scene_cameraY - var28.height, var28.y - Scene_cameraZ, var28.tag);
var28.second.draw(0, Scene_cameraPitchSine, Scene_cameraPitchCosine, Scene_cameraYawSine, Scene_cameraYawCosine, var28.x - Scene_cameraX, var28.tileHeight - Scene_cameraY - var28.height, var28.y - Scene_cameraZ, var28.tag);
}
if (var28.third != null) {
var28.third.renderDraw(0, Scene_cameraPitchSine, Scene_cameraPitchCosine, Scene_cameraYawSine, Scene_cameraYawCosine, var28.x - Scene_cameraX, var28.tileHeight - Scene_cameraY - var28.height, var28.y - Scene_cameraZ, var28.tag);
var28.third.draw(0, Scene_cameraPitchSine, Scene_cameraPitchCosine, Scene_cameraYawSine, Scene_cameraYawCosine, var28.x - Scene_cameraX, var28.tileHeight - Scene_cameraY - var28.height, var28.y - Scene_cameraZ, var28.tag);
}
if (var28.first != null) {
var28.first.renderDraw(0, Scene_cameraPitchSine, Scene_cameraPitchCosine, Scene_cameraYawSine, Scene_cameraYawCosine, var28.x - Scene_cameraX, var28.tileHeight - Scene_cameraY - var28.height, var28.y - Scene_cameraZ, var28.tag);
var28.first.draw(0, Scene_cameraPitchSine, Scene_cameraPitchCosine, Scene_cameraYawSine, Scene_cameraYawCosine, var28.x - Scene_cameraX, var28.tileHeight - Scene_cameraY - var28.height, var28.y - Scene_cameraZ, var28.tag);
}
}
@@ -1692,7 +1692,7 @@ public class Scene {
WallDecoration var29 = var3.wallDecoration;
if (var29 != null && !this.method299(var7, var4, var5, var29.entity1.height)) {
if ((var29.orientation & var3.field899) != 0) {
var29.entity1.renderDraw(0, Scene_cameraPitchSine, Scene_cameraPitchCosine, Scene_cameraYawSine, Scene_cameraYawCosine, var29.x - Scene_cameraX + var29.xOffset, var29.tileHeight - Scene_cameraY, var29.y - Scene_cameraZ + var29.yOffset, var29.tag);
var29.entity1.draw(0, Scene_cameraPitchSine, Scene_cameraPitchCosine, Scene_cameraYawSine, Scene_cameraYawCosine, var29.x - Scene_cameraX + var29.xOffset, var29.tileHeight - Scene_cameraY, var29.y - Scene_cameraZ + var29.yOffset, var29.tag);
} else if (var29.orientation == 256) {
var10 = var29.x - Scene_cameraX;
var15 = var29.tileHeight - Scene_cameraY;
@@ -1711,9 +1711,9 @@ public class Scene {
}
if (var13 >= var12) {
var29.entity1.renderDraw(0, Scene_cameraPitchSine, Scene_cameraPitchCosine, Scene_cameraYawSine, Scene_cameraYawCosine, var10 + var29.xOffset, var15, var14 + var29.yOffset, var29.tag);
var29.entity1.draw(0, Scene_cameraPitchSine, Scene_cameraPitchCosine, Scene_cameraYawSine, Scene_cameraYawCosine, var10 + var29.xOffset, var15, var14 + var29.yOffset, var29.tag);
} else if (var29.entity2 != null) {
var29.entity2.renderDraw(0, Scene_cameraPitchSine, Scene_cameraPitchCosine, Scene_cameraYawSine, Scene_cameraYawCosine, var10, var15, var14, var29.tag);
var29.entity2.draw(0, Scene_cameraPitchSine, Scene_cameraPitchCosine, Scene_cameraYawSine, Scene_cameraYawCosine, var10, var15, var14, var29.tag);
}
}
}
@@ -1721,11 +1721,11 @@ public class Scene {
BoundaryObject var31 = var3.boundaryObject;
if (var31 != null) {
if ((var31.orientationB & var3.field899) != 0 && !this.method298(var7, var4, var5, var31.orientationB)) {
var31.entity2.renderDraw(0, Scene_cameraPitchSine, Scene_cameraPitchCosine, Scene_cameraYawSine, Scene_cameraYawCosine, var31.x - Scene_cameraX, var31.tileHeight - Scene_cameraY, var31.y - Scene_cameraZ, var31.tag);
var31.entity2.draw(0, Scene_cameraPitchSine, Scene_cameraPitchCosine, Scene_cameraYawSine, Scene_cameraYawCosine, var31.x - Scene_cameraX, var31.tileHeight - Scene_cameraY, var31.y - Scene_cameraZ, var31.tag);
}
if ((var31.orientationA & var3.field899) != 0 && !this.method298(var7, var4, var5, var31.orientationA)) {
var31.entity1.renderDraw(0, Scene_cameraPitchSine, Scene_cameraPitchCosine, Scene_cameraYawSine, Scene_cameraYawCosine, var31.x - Scene_cameraX, var31.tileHeight - Scene_cameraY, var31.y - Scene_cameraZ, var31.tag);
var31.entity1.draw(0, Scene_cameraPitchSine, Scene_cameraPitchCosine, Scene_cameraYawSine, Scene_cameraYawCosine, var31.x - Scene_cameraX, var31.tileHeight - Scene_cameraY, var31.y - Scene_cameraZ, var31.tag);
}
}
}
@@ -2560,7 +2560,7 @@ public class Scene {
Scene_isLowDetail = true;
tileUpdateCount = 0;
Scene_plane = 0;
Scene_gameObjects = new GameObject[100];
gameObjects = new GameObject[100];
checkClick = false;
Scene_selectedPlane = 0;
Scene_selectedScreenX = 0;

4
runescape-client/src/main/java/ScriptEvent.java
View File

@@ -252,8 +252,8 @@ public class ScriptEvent extends Node {
Interpreter.Interpreter_intStack[++RouteStrategy.Interpreter_intStackSize - 1] = class1.method18(var3, var4);
return 1;
} else if (var0 == ScriptOpcodes.STAFFMODLEVEL) {
if (Client.rights >= 2) {
Interpreter.Interpreter_intStack[++RouteStrategy.Interpreter_intStackSize - 1] = Client.rights;
if (Client.staffModLevel >= 2) {
Interpreter.Interpreter_intStack[++RouteStrategy.Interpreter_intStackSize - 1] = Client.staffModLevel;
} else {
Interpreter.Interpreter_intStack[++RouteStrategy.Interpreter_intStackSize - 1] = 0;
}

6
runescape-client/src/main/java/SecureRandomCallable.java
View File

@@ -132,10 +132,10 @@ public class SecureRandomCallable implements Callable {
GameShell.menuY = var13;
class214.menuWidth = var7;
AbstractWorldMapIcon.menuHeight = Client.menuOptionsCount * 15 + 22;
class39.revalidateWidgetScroll(Widget.widgets[var0 >> 16], var4, false);
class39.revalidateWidgetScroll(Widget.interfaceComponents[var0 >> 16], var4, false);
WorldMapSection3.runWidgetOnLoadListener(var1);
if (Client.rootWidgetGroup != -1) {
GrandExchangeEvents.method74(Client.rootWidgetGroup, 1);
if (Client.rootInterface != -1) {
GrandExchangeEvents.method74(Client.rootInterface, 1);
}
return var3;

4
runescape-client/src/main/java/SequenceDefinition.java
View File

@@ -205,8 +205,8 @@ public class SequenceDefinition extends DualNode {
signature = "(B)V",
garbageValue = "1"
)
@Export("init")
void init() {
@Export("postDecode")
void postDecode() {
if (this.field781 == -1) {
if (this.field777 != null) {
this.field781 = 2;

8
runescape-client/src/main/java/Skills.java
View File

@@ -51,14 +51,14 @@ public class Skills {
var1.isTradable = false;
var1.groundActions = null;
var1.inventoryActions = null;
var1.shiftClickIndex0 = -1;
var1.int1 = 0;
var1.shiftClickIndex = -1;
var1.team = 0;
if (var1.params != null) {
boolean var3 = false;
for (Node var4 = var1.params.first(); var4 != null; var4 = var1.params.next()) {
ParamKeyDefinition var5 = class229.getParamKeyDefinition((int)var4.key);
if (var5.isMembersOnly) {
ParamDefinition var5 = class229.getParamDefinition((int)var4.key);
if (var5.autoDisable) {
var4.remove();
} else {
var3 = true;

6
runescape-client/src/main/java/StructDefinition.java
View File

@@ -29,8 +29,8 @@ public class StructDefinition extends DualNode {
signature = "(B)V",
garbageValue = "-16"
)
@Export("init")
void init() {
@Export("postDecode")
void postDecode() {
}
@ObfuscatedName("q")
@@ -238,7 +238,7 @@ public class StructDefinition extends DualNode {
var4.scrollHeight = Interpreter.Interpreter_intStack[RouteStrategy.Interpreter_intStackSize + 1];
class22.method295(var4);
if (var3 != -1 && var4.type == 0) {
class39.revalidateWidgetScroll(Widget.widgets[var3 >> 16], var4, false);
class39.revalidateWidgetScroll(Widget.interfaceComponents[var3 >> 16], var4, false);
}
return 1;

6
runescape-client/src/main/java/StudioGame.java
View File

@@ -69,18 +69,18 @@ public enum StudioGame implements Enumerated {
garbageValue = "-2058685786"
)
public static FloorUnderlayDefinition method4550(int var0) {
FloorUnderlayDefinition var1 = (FloorUnderlayDefinition) FloorUnderlayDefinition.UnderlayDefinition_cached.get((long)var0);
FloorUnderlayDefinition var1 = (FloorUnderlayDefinition) FloorUnderlayDefinition.FloorUnderlayDefinition_cached.get((long)var0);
if (var1 != null) {
return var1;
} else {
byte[] var2 = FloorUnderlayDefinition.UnderlayDefinition_archive.takeFile(1, var0);
byte[] var2 = FloorUnderlayDefinition.FloorUnderlayDefinition_archive.takeFile(1, var0);
var1 = new FloorUnderlayDefinition();
if (var2 != null) {
var1.decode(new Buffer(var2), var0);
}
var1.postDecode();
FloorUnderlayDefinition.UnderlayDefinition_cached.put(var1, (long)var0);
FloorUnderlayDefinition.FloorUnderlayDefinition_cached.put(var1, (long)var0);
return var1;
}
}

4
runescape-client/src/main/java/Texture.java
View File

@@ -184,8 +184,8 @@ public class Texture extends Node {
}
@ObfuscatedName("q")
@Export("Texture_animate")
void Texture_animate(int var1) {
@Export("animate")
void animate(int var1) {
if (this.pixels != null) {
short var2;
int var3;

2
runescape-client/src/main/java/TextureProvider.java
View File

@@ -205,7 +205,7 @@ public class TextureProvider implements TextureLoader {
for (int var2 = 0; var2 < this.textures.length; ++var2) {
Texture var3 = this.textures[var2];
if (var3 != null && var3.animationDirection != 0 && var3.isLoaded) {
var3.Texture_animate(var1);
var3.animate(var1);
var3.isLoaded = false;
}
}

2
runescape-client/src/main/java/Tile.java
View File

@@ -146,7 +146,7 @@ public final class Tile extends Node {
garbageValue = "-1899580455"
)
public static void method2867() {
FloorUnderlayDefinition.UnderlayDefinition_cached.clear();
FloorUnderlayDefinition.FloorUnderlayDefinition_cached.clear();
}
@ObfuscatedName("is")

2
runescape-client/src/main/java/UserComparator5.java
View File

@@ -45,7 +45,7 @@ public class UserComparator5 extends AbstractUserComparator {
static final void worldToMinimap(int var0, int var1, int var2, int var3, Sprite var4, SpriteMask var5) {
int var6 = var3 * var3 + var2 * var2;
if (var6 > 4225 && var6 < 90000) {
int var7 = Client.minimapOrientation & 2047;
int var7 = Client.camAngleY & 2047;
int var8 = Rasterizer3D.Rasterizer3D_sine[var7];
int var9 = Rasterizer3D.Rasterizer3D_cosine[var7];
int var10 = var3 * var8 + var9 * var2 >> 16;

18
runescape-client/src/main/java/VarbitDefinition.java
View File

@@ -26,20 +26,20 @@ public class VarbitDefinition extends DualNode {
@ObfuscatedGetter(
intValue = 1552575189
)
@Export("varp")
public int varp;
@Export("baseVar")
public int baseVar;
@ObfuscatedName("w")
@ObfuscatedGetter(
intValue = -870948181
)
@Export("lowBit")
public int lowBit;
@Export("startBit")
public int startBit;
@ObfuscatedName("o")
@ObfuscatedGetter(
intValue = -1710935305
)
@Export("highBit")
public int highBit;
@Export("endBit")
public int endBit;
@ObfuscatedName("q")
@ObfuscatedSignature(
@@ -66,9 +66,9 @@ public class VarbitDefinition extends DualNode {
@Export("decodeNext")
void decodeNext(Buffer var1, int var2) {
if (var2 == 1) {
this.varp = var1.readUnsignedShort();
this.lowBit = var1.readUnsignedByte();
this.highBit = var1.readUnsignedByte();
this.baseVar = var1.readUnsignedShort();
this.startBit = var1.readUnsignedByte();
this.endBit = var1.readUnsignedByte();
}
}

2
runescape-client/src/main/java/Varps.java
View File

@@ -29,7 +29,7 @@ public class Varps {
garbageValue = "2111080001"
)
public static void method4393(AbstractArchive var0) {
FloorUnderlayDefinition.UnderlayDefinition_archive = var0;
FloorUnderlayDefinition.FloorUnderlayDefinition_archive = var0;
}
@ObfuscatedName("ki")

16
runescape-client/src/main/java/Widget.java
View File

@@ -17,11 +17,11 @@ public class Widget extends Node {
@ObfuscatedSignature(
signature = "[[Lho;"
)
@Export("widgets")
public static Widget[][] widgets;
@Export("interfaceComponents")
public static Widget[][] interfaceComponents;
@ObfuscatedName("l")
@Export("loadedWidgetGroups")
public static boolean[] loadedWidgetGroups;
@Export("loadedInterfaces")
public static boolean[] loadedInterfaces;
@ObfuscatedName("e")
@ObfuscatedSignature(
signature = "Lir;"
@@ -562,8 +562,8 @@ public class Widget extends Node {
@ObfuscatedName("em")
public Object[] field970;
@ObfuscatedName("ed")
@Export("onKeyListener")
public Object[] onKeyListener;
@Export("onKey")
public Object[] onKey;
@ObfuscatedName("ex")
public Object[] field971;
@ObfuscatedName("ej")
@@ -571,8 +571,8 @@ public class Widget extends Node {
@ObfuscatedName("el")
public Object[] field973;
@ObfuscatedName("en")
@Export("onDialogAbortListener")
public Object[] onDialogAbortListener;
@Export("onDialogAbort")
public Object[] onDialogAbort;
@ObfuscatedName("ei")
public Object[] field974;
@ObfuscatedName("ee")

8
runescape-client/src/main/java/WorldComparator.java
View File

@@ -127,10 +127,10 @@ final class WorldComparator implements Comparator {
var3.size = var3.definition.size;
var3.field23 = var3.definition.field639;
var3.walkSequence = var3.definition.walkSequence;
var3.walkTurnSequence = var3.definition.walkTurnSequence;
var3.walkTurnLeftSequence = var3.definition.walkTurnLeftSequence;
var3.walkTurnRightSequence = var3.definition.walkTurnRightSequence;
var3.idleSequence = var3.definition.idleSequence;
var3.walkBackSequence = var3.definition.walkBackSequence;
var3.walkLeftSequence = var3.definition.walkLeftSequence;
var3.walkRightSequence = var3.definition.walkRightSequence;
var3.readySequence = var3.definition.readySequence;
var3.turnLeftSequence = var3.definition.turnLeftSequence;
var3.turnRightSequence = var3.definition.turnRightSequence;
}

8
runescape-client/src/main/java/WorldMap.java
View File

@@ -652,7 +652,7 @@ public class WorldMap {
@Export("setCurrentMapArea")
void setCurrentMapArea(WorldMapArea var1) {
if (this.currentMapArea == null || var1 != this.currentMapArea) {
this.initializeWorldMap(var1);
this.initializeWorldMapManager(var1);
this.jump(-1, -1, -1);
}
@@ -663,8 +663,8 @@ public class WorldMap {
signature = "(Lag;I)V",
garbageValue = "-1072205896"
)
@Export("initializeWorldMap")
void initializeWorldMap(WorldMapArea var1) {
@Export("initializeWorldMapManager")
void initializeWorldMapManager(WorldMapArea var1) {
this.currentMapArea = var1;
this.worldMapManager = new WorldMapManager(this.mapSceneSprites, this.fonts, this.field990, this.field991);
this.cacheLoader.reset(this.currentMapArea.archiveName());
@@ -678,7 +678,7 @@ public class WorldMap {
public void method367(WorldMapArea var1, Coord var2, Coord var3, boolean var4) {
if (var1 != null) {
if (this.currentMapArea == null || var1 != this.currentMapArea) {
this.initializeWorldMap(var1);
this.initializeWorldMapManager(var1);
}
if (!var4 && this.currentMapArea.containsCoord(var2.plane, var2.x, var2.y)) {

2
runescape-client/src/main/java/WorldMapAreaData.java
View File

@@ -95,7 +95,7 @@ public class WorldMapAreaData extends WorldMapArea {
var1.decode(new Buffer(var2));
}
var1.init();
var1.postDecode();
SequenceDefinition.SequenceDefinition_cached.put(var1, (long)var0);
return var1;
}

2
runescape-client/src/main/java/WorldMapCacheName.java
View File

@@ -148,7 +148,7 @@ public class WorldMapCacheName {
static void addPlayerToScene(Player var0, boolean var1) {
if (var0 != null && var0.isVisible() && !var0.isHidden) {
var0.isUnanimated = false;
if ((Client.isLowDetail && Players.Players_count > 50 || Players.Players_count > 200) && var1 && var0.movementSequence == var0.idleSequence) {
if ((Client.isLowDetail && Players.Players_count > 50 || Players.Players_count > 200) && var1 && var0.movementSequence == var0.readySequence) {
var0.isUnanimated = true;
}

4
runescape-client/src/main/java/WorldMapDecorationType.java
View File

@@ -192,8 +192,8 @@ public enum WorldMapDecorationType implements Enumerated {
garbageValue = "1521012895"
)
static final void method4517(int var0, int var1, int var2, int var3, int var4, int var5, int var6) {
if (GroundItemPile.loadWidgetGroup(var0)) {
class238.updateWidgetGroup(Widget.widgets[var0], -1, var1, var2, var3, var4, var5, var6);
if (GroundItemPile.loadInterface(var0)) {
class238.updateInterface(Widget.interfaceComponents[var0], -1, var1, var2, var3, var4, var5, var6);
}
}

2
runescape-client/src/main/java/WorldMapIcon1.java
View File

@@ -112,7 +112,7 @@ public class WorldMapIcon1 extends AbstractWorldMapIcon {
)
@Export("addGameMessage")
static void addGameMessage(int var0, String var1, String var2) {
GrandExchangeEvents.addChatMessage(var0, var1, var2, (String)null);
GrandExchangeEvents.addMessage(var0, var1, var2, (String)null);
}
@ObfuscatedName("fz")

2
runescape-client/src/main/java/WorldMapLabelSize.java
View File

@@ -110,7 +110,7 @@ public class WorldMapLabelSize {
for (InterfaceParent var1 = (InterfaceParent)Client.interfaceParents.first(); var1 != null; var1 = (InterfaceParent)Client.interfaceParents.next()) {
if (var1.type == 0 || var1.type == 3) {
MenuAction.closeWidgetGroup(var1, true);
MenuAction.closeInterface(var1, true);
}
}

4
runescape-client/src/main/java/WorldMapRegion.java
View File

@@ -1061,7 +1061,7 @@ public class WorldMapRegion {
if (var3.contains(var4, var5)) {
var4 -= var3.width / 2;
var5 -= var3.height / 2;
int var6 = Client.minimapOrientation & 2047;
int var6 = Client.camAngleY & 2047;
int var7 = Rasterizer3D.Rasterizer3D_sine[var6];
int var8 = Rasterizer3D.Rasterizer3D_cosine[var6];
int var9 = var4 * var8 + var7 * var5 >> 11;
@@ -1075,7 +1075,7 @@ public class WorldMapRegion {
var13.packetBuffer.method55(KeyHandler.KeyHandler_pressedKeys[82] ? (KeyHandler.KeyHandler_pressedKeys[81] ? 2 : 1) : 0);
var13.packetBuffer.writeByte(var4);
var13.packetBuffer.writeByte(var5);
var13.packetBuffer.writeShort(Client.minimapOrientation);
var13.packetBuffer.writeShort(Client.camAngleY);
var13.packetBuffer.writeByte(57);
var13.packetBuffer.writeByte(0);
var13.packetBuffer.writeByte(0);

10
runescape-client/src/main/java/WorldMapSection1.java
View File

@@ -234,7 +234,7 @@ public class WorldMapSection1 implements WorldMapSection {
Client.isItemSelected = 0;
Client.isSpellSelected = false;
Client.soundEffectCount = 0;
Client.minimapOrientation = 0;
Client.camAngleY = 0;
Client.oculusOrbState = 0;
ClientParameter.field3645 = null;
Client.minimapState = 0;
@@ -285,15 +285,15 @@ public class WorldMapSection1 implements WorldMapSection {
class196.varcs.clearTransient();
Client.followerIndex = -1;
if (Client.rootWidgetGroup != -1) {
AbstractByteArrayCopier.unloadWidgetGroup(Client.rootWidgetGroup);
if (Client.rootInterface != -1) {
AbstractByteArrayCopier.unloadInterface(Client.rootInterface);
}
for (InterfaceParent var4 = (InterfaceParent)Client.interfaceParents.first(); var4 != null; var4 = (InterfaceParent)Client.interfaceParents.next()) {
MenuAction.closeWidgetGroup(var4, true);
MenuAction.closeInterface(var4, true);
}
Client.rootWidgetGroup = -1;
Client.rootInterface = -1;
Client.interfaceParents = new NodeHashTable(8);
Client.field127 = null;
Client.menuOptionsCount = 0;

6
runescape-client/src/main/java/WorldMapSection2.java
View File

@@ -151,9 +151,9 @@ public class WorldMapSection2 implements WorldMapSection {
@Export("getVarbit")
public static int getVarbit(int var0) {
VarbitDefinition var1 = Occluder.method3255(var0);
int var2 = var1.varp;
int var3 = var1.lowBit;
int var4 = var1.highBit;
int var2 = var1.baseVar;
int var3 = var1.startBit;
int var4 = var1.endBit;
int var5 = Varps.Varps_masks[var4 - var3];
return Varps.Varps_main[var2] >> var3 & var5;
}

4
runescape-client/src/main/java/WorldMapSection3.java
View File

@@ -200,8 +200,8 @@ public class WorldMapSection3 implements WorldMapSection {
)
@Export("runWidgetOnLoadListener")
static void runWidgetOnLoadListener(int var0) {
if (var0 != -1 && GroundItemPile.loadWidgetGroup(var0)) {
Widget[] var1 = Widget.widgets[var0];
if (var0 != -1 && GroundItemPile.loadInterface(var0)) {
Widget[] var1 = Widget.interfaceComponents[var0];
for (int var2 = 0; var2 < var1.length; ++var2) {
Widget var3 = var1[var2];

4
runescape-client/src/main/java/class1.java
View File

@@ -96,7 +96,7 @@ final class class1 implements class0 {
class22.method295(var4);
TextureProvider.client.alignWidget(var4);
if (var3 != -1 && var4.type == 0) {
class39.revalidateWidgetScroll(Widget.widgets[var3 >> 16], var4, false);
class39.revalidateWidgetScroll(Widget.interfaceComponents[var3 >> 16], var4, false);
}
return 1;
@@ -109,7 +109,7 @@ final class class1 implements class0 {
class22.method295(var4);
TextureProvider.client.alignWidget(var4);
if (var3 != -1 && var4.type == 0) {
class39.revalidateWidgetScroll(Widget.widgets[var3 >> 16], var4, false);
class39.revalidateWidgetScroll(Widget.interfaceComponents[var3 >> 16], var4, false);
}
return 1;

6
runescape-client/src/main/java/class11.java
View File

@@ -161,7 +161,7 @@ final class class11 implements Comparator {
} else if (var0 == ScriptOpcodes.CC_SETONCHATTRANSMIT) {
var3.field970 = var8;
} else if (var0 == ScriptOpcodes.CC_SETONKEY) {
var3.onKeyListener = var8;
var3.onKey = var8;
} else if (var0 == ScriptOpcodes.CC_SETONFRIENDTRANSMIT) {
var3.field971 = var8;
} else if (var0 == ScriptOpcodes.CC_SETONCLANTRANSMIT) {
@@ -169,7 +169,7 @@ final class class11 implements Comparator {
} else if (var0 == ScriptOpcodes.CC_SETONMISCTRANSMIT) {
var3.field973 = var8;
} else if (var0 == ScriptOpcodes.CC_SETONDIALOGABORT) {
var3.onDialogAbortListener = var8;
var3.onDialogAbort = var8;
} else if (var0 == ScriptOpcodes.CC_SETONSUBCHANGE) {
var3.field974 = var8;
} else if (var0 == ScriptOpcodes.CC_SETONSTOCKTRANSMIT) {
@@ -219,7 +219,7 @@ final class class11 implements Comparator {
return 1;
} else if (var0 == ScriptOpcodes.IF_GETTOP) {
Interpreter.Interpreter_intStack[++RouteStrategy.Interpreter_intStackSize - 1] = Client.rootWidgetGroup;
Interpreter.Interpreter_intStack[++RouteStrategy.Interpreter_intStackSize - 1] = Client.rootInterface;
return 1;
} else {
return 2;

4
runescape-client/src/main/java/class12.java
View File

@@ -125,9 +125,9 @@ final class class12 implements Comparator {
static void method159() {
for (InterfaceParent var0 = (InterfaceParent)Client.interfaceParents.first(); var0 != null; var0 = (InterfaceParent)Client.interfaceParents.next()) {
int var1 = var0.group;
if (GroundItemPile.loadWidgetGroup(var1)) {
if (GroundItemPile.loadInterface(var1)) {
boolean var2 = true;
Widget[] var3 = Widget.widgets[var1];
Widget[] var3 = Widget.interfaceComponents[var1];
int var4;
for (var4 = 0; var4 < var3.length; ++var4) {

32
runescape-client/src/main/java/class171.java
View File

@@ -164,8 +164,8 @@ public class class171 {
AbstractWorldMapIcon.method625(ItemContainer.field434, "World Map");
AbstractWorldMapIcon.method625(WorldMapLabelSize.field1040, "World Map Geography");
AbstractWorldMapIcon.method625(AbstractByteArrayCopier.field0, "World Map Ground");
class211.graphicsDefaults = new GraphicsDefaults();
class211.graphicsDefaults.decode(class22.archive16);
class211.spriteIds = new GraphicsDefaults();
class211.spriteIds.decode(class22.archive16);
Login.Login_loadingText = "Loaded update list";
Login.Login_loadingPercent = 30;
Client.titleLoadingStage = 45;
@@ -266,15 +266,15 @@ public class class171 {
BufferedSource.field54 = var16;
Widget.field955 = var17;
class27.field1143 = var18;
Widget.widgets = new Widget[Widget.Widget_archive.method5()][];
Widget.loadedWidgetGroups = new boolean[Widget.Widget_archive.method5()];
Widget.interfaceComponents = new Widget[Widget.Widget_archive.method5()][];
Widget.loadedInterfaces = new boolean[Widget.Widget_archive.method5()];
Archive var19 = ObjectSound.archive2;
class4.field1158 = var19;
Archive var20 = ObjectSound.archive2;
EnumDefinition.EnumDefinition_archive = var20;
Frames.method3241(ObjectSound.archive2);
Archive var21 = ObjectSound.archive2;
ParamKeyDefinition.field679 = var21;
ParamDefinition.field679 = var21;
class196.varcs = new Varcs();
class60.method1172(ObjectSound.archive2, WorldMapSection3.archive8, ByteArrayPool.archive13);
Archive var22 = ObjectSound.archive2;
@@ -305,13 +305,13 @@ public class class171 {
} else if (Client.titleLoadingStage == 80) {
var0 = 0;
if (UnitPriceComparator.compass == null) {
UnitPriceComparator.compass = class322.readSprite(WorldMapSection3.archive8, class211.graphicsDefaults.field878, 0);
UnitPriceComparator.compass = class322.readSprite(WorldMapSection3.archive8, class211.spriteIds.field878, 0);
} else {
++var0;
}
if (FaceNormal.field345 == null) {
FaceNormal.field345 = class322.readSprite(WorldMapSection3.archive8, class211.graphicsDefaults.field879, 0);
FaceNormal.field345 = class322.readSprite(WorldMapSection3.archive8, class211.spriteIds.field879, 0);
} else {
++var0;
}
@@ -320,7 +320,7 @@ public class class171 {
int var34;
if (class192.mapSceneSprites == null) {
var30 = WorldMapSection3.archive8;
var34 = class211.graphicsDefaults.mapScenes;
var34 = class211.spriteIds.mapScenes;
if (!SpriteMask.loadSprite(var30, var34, 0)) {
var32 = null;
} else {
@@ -335,7 +335,7 @@ public class class171 {
Sprite[] var35;
if (class15.headIconPkSprites == null) {
var30 = WorldMapSection3.archive8;
var34 = class211.graphicsDefaults.headIconsPk;
var34 = class211.spriteIds.headIconsPk;
if (!SpriteMask.loadSprite(var30, var34, 0)) {
var35 = null;
} else {
@@ -349,7 +349,7 @@ public class class171 {
if (ClientPreferences.headIconPrayerSprites == null) {
var30 = WorldMapSection3.archive8;
var34 = class211.graphicsDefaults.headIconsPrayer;
var34 = class211.spriteIds.headIconsPrayer;
if (!SpriteMask.loadSprite(var30, var34, 0)) {
var35 = null;
} else {
@@ -363,7 +363,7 @@ public class class171 {
if (Player.headIconHintSprites == null) {
var30 = WorldMapSection3.archive8;
var34 = class211.graphicsDefaults.headIconsHint;
var34 = class211.spriteIds.headIconsHint;
if (!SpriteMask.loadSprite(var30, var34, 0)) {
var35 = null;
} else {
@@ -377,7 +377,7 @@ public class class171 {
if (class16.mapMarkerSprites == null) {
var30 = WorldMapSection3.archive8;
var34 = class211.graphicsDefaults.mapMarkers;
var34 = class211.spriteIds.mapMarkers;
if (!SpriteMask.loadSprite(var30, var34, 0)) {
var35 = null;
} else {
@@ -391,7 +391,7 @@ public class class171 {
if (KeyHandler.crossSprites == null) {
var30 = WorldMapSection3.archive8;
var34 = class211.graphicsDefaults.crosses;
var34 = class211.spriteIds.crosses;
if (!SpriteMask.loadSprite(var30, var34, 0)) {
var35 = null;
} else {
@@ -405,7 +405,7 @@ public class class171 {
if (class39.mapDotSprites == null) {
var30 = WorldMapSection3.archive8;
var34 = class211.graphicsDefaults.mapDots;
var34 = class211.spriteIds.mapDots;
if (!SpriteMask.loadSprite(var30, var34, 0)) {
var35 = null;
} else {
@@ -419,7 +419,7 @@ public class class171 {
if (class32.scrollBarSprites == null) {
var30 = WorldMapSection3.archive8;
var34 = class211.graphicsDefaults.scrollBars;
var34 = class211.spriteIds.scrollBars;
if (!SpriteMask.loadSprite(var30, var34, 0)) {
var32 = null;
} else {
@@ -433,7 +433,7 @@ public class class171 {
if (WorldMapSectionType.modIconSprites == null) {
var30 = WorldMapSection3.archive8;
var34 = class211.graphicsDefaults.modIcons;
var34 = class211.spriteIds.modIcons;
if (!SpriteMask.loadSprite(var30, var34, 0)) {
var32 = null;
} else {

4
runescape-client/src/main/java/class211.java
View File

@@ -18,8 +18,8 @@ public class class211 {
@ObfuscatedSignature(
signature = "Llg;"
)
@Export("graphicsDefaults")
static GraphicsDefaults graphicsDefaults;
@Export("spriteIds")
static GraphicsDefaults spriteIds;
@ObfuscatedName("m")
@ObfuscatedSignature(

4
runescape-client/src/main/java/class22.java
View File

@@ -88,7 +88,7 @@ public final class class22 {
var4 = new ArchiveDisk(var0, class168.dat2File, ArchiveDiskAction.idxFiles[var0], 1000000);
}
return new Archive(var4, Fonts.archiveDisk255, var0, var1, var2, var3);
return new Archive(var4, Fonts.masterDisk, var0, var1, var2, var3);
}
@ObfuscatedName("jp")
@@ -112,7 +112,7 @@ public final class class22 {
SpriteMask var4 = var0.getSpriteMask(false);
if (var4 != null) {
if (Client.minimapState < 3) {
UnitPriceComparator.compass.method315(var1, var2, var4.width, var4.height, 25, 25, Client.minimapOrientation, 256, var4.xStarts, var4.xWidths);
UnitPriceComparator.compass.method315(var1, var2, var4.width, var4.height, 25, 25, Client.camAngleY, 256, var4.xStarts, var4.xWidths);
} else {
Rasterizer2D.method5948(var1, var2, 0, var4.xStarts, var4.xWidths);
}

14
runescape-client/src/main/java/class229.java
View File

@@ -13,20 +13,20 @@ public class class229 {
signature = "(IB)Ljb;",
garbageValue = "-41"
)
@Export("getParamKeyDefinition")
public static ParamKeyDefinition getParamKeyDefinition(int var0) {
ParamKeyDefinition var1 = (ParamKeyDefinition)ParamKeyDefinition.ParamKeyDefinition_cached.get((long)var0);
@Export("getParamDefinition")
public static ParamDefinition getParamDefinition(int var0) {
ParamDefinition var1 = (ParamDefinition) ParamDefinition.ParamDefinition_cached.get((long)var0);
if (var1 != null) {
return var1;
} else {
byte[] var2 = ParamKeyDefinition.field679.takeFile(11, var0);
var1 = new ParamKeyDefinition();
byte[] var2 = ParamDefinition.field679.takeFile(11, var0);
var1 = new ParamDefinition();
if (var2 != null) {
var1.decode(new Buffer(var2));
}
var1.init();
ParamKeyDefinition.ParamKeyDefinition_cached.put(var1, (long)var0);
var1.postDecode();
ParamDefinition.ParamDefinition_cached.put(var1, (long)var0);
return var1;
}
}

12
runescape-client/src/main/java/class238.java
View File

@@ -50,8 +50,8 @@ public final class class238 {
signature = "([Lho;IIIIIIII)V",
garbageValue = "1706481742"
)
@Export("updateWidgetGroup")
static final void updateWidgetGroup(Widget[] var0, int var1, int var2, int var3, int var4, int var5, int var6, int var7) {
@Export("updateInterface")
static final void updateInterface(Widget[] var0, int var1, int var2, int var3, int var4, int var5, int var6, int var7) {
for (int var8 = 0; var8 < var0.length; ++var8) {
Widget var9 = var0[var8];
if (var9 != null && var9.parentId == var1 && (!var9.isIf3 || var9.type == 0 || var9.hasListener || class1.getWidgetClickMask(var9) != 0 || var9 == Client.clickedWidgetParent || var9.contentType == 1338)) {
@@ -525,13 +525,13 @@ public final class class238 {
}
var9.field980 = Client.cycleCntr;
if (var9.onKeyListener != null) {
if (var9.onKey != null) {
for (var35 = 0; var35 < Client.field137; ++var35) {
ScriptEvent var27 = new ScriptEvent();
var27.widget = var9;
var27.keyTyped = Client.field145[var35];
var27.keyPressed = Client.field146[var35];
var27.args0 = var9.onKeyListener;
var27.args0 = var9.onKey;
Client.scriptEvents.addFirst(var27);
}
}
@@ -561,9 +561,9 @@ public final class class238 {
}
if (var9.type == 0) {
updateWidgetGroup(var0, var9.id, var12, var13, var14, var15, var10 - var9.scrollX, var11 - var9.scrollY);
updateInterface(var0, var9.id, var12, var13, var14, var15, var10 - var9.scrollX, var11 - var9.scrollY);
if (var9.children != null) {
updateWidgetGroup(var9.children, var9.id, var12, var13, var14, var15, var10 - var9.scrollX, var11 - var9.scrollY);
updateInterface(var9.children, var9.id, var12, var13, var14, var15, var10 - var9.scrollX, var11 - var9.scrollY);
}
InterfaceParent var33 = (InterfaceParent)Client.interfaceParents.get((long)var9.id);

8
runescape-client/src/main/java/class3.java
View File

@@ -289,10 +289,10 @@ public class class3 implements Enumerated {
}
var15.walkSequence = var15.definition.walkSequence;
var15.walkTurnSequence = var15.definition.walkTurnSequence;
var15.walkTurnLeftSequence = var15.definition.walkTurnLeftSequence;
var15.walkTurnRightSequence = var15.definition.walkTurnRightSequence;
var15.idleSequence = var15.definition.idleSequence;
var15.walkBackSequence = var15.definition.walkBackSequence;
var15.walkLeftSequence = var15.definition.walkLeftSequence;
var15.walkRightSequence = var15.definition.walkRightSequence;
var15.readySequence = var15.definition.readySequence;
var15.turnLeftSequence = var15.definition.turnLeftSequence;
var15.turnRightSequence = var15.definition.turnRightSequence;
var15.method228(Canvas.localPlayer.pathX[0] + var5, Canvas.localPlayer.pathY[0] + var8, var12 == 1);

8
runescape-client/src/main/java/class30.java
View File

@@ -24,8 +24,8 @@ public class class30 {
@ObfuscatedGetter(
intValue = -18917723
)
@Export("musicTrackArchiveId")
public static int musicTrackArchiveId;
@Export("musicTrackGroupId")
public static int musicTrackGroupId;
@ObfuscatedName("l")
@Export("inMembersWorld")
public static boolean inMembersWorld;
@@ -91,10 +91,10 @@ public class class30 {
}
ScriptEvent var6;
if (var1 == 0 && var3.onDialogAbortListener != null) {
if (var1 == 0 && var3.onDialogAbort != null) {
var6 = new ScriptEvent();
var6.widget = var3;
var6.args0 = var3.onDialogAbortListener;
var6.args0 = var3.onDialogAbort;
AbstractArchive.runScript(var6);
}

26
runescape-client/src/main/java/class31.java
View File

@@ -145,16 +145,16 @@ public class class31 {
return 1;
} else {
int var7;
ParamKeyDefinition var8;
ParamDefinition var8;
if (var0 == ScriptOpcodes.NC_PARAM) {
RouteStrategy.Interpreter_intStackSize -= 2;
var6 = Interpreter.Interpreter_intStack[RouteStrategy.Interpreter_intStackSize];
var7 = Interpreter.Interpreter_intStack[RouteStrategy.Interpreter_intStackSize + 1];
var8 = class229.getParamKeyDefinition(var7);
var8 = class229.getParamDefinition(var7);
if (var8.isString()) {
Interpreter.Interpreter_stringStack[++Interpreter.Interpreter_stringStackSize - 1] = ObjectDefinition.getNpcDefinition(var6).getStringParam(var7, var8.keyString);
Interpreter.Interpreter_stringStack[++Interpreter.Interpreter_stringStackSize - 1] = ObjectDefinition.getNpcDefinition(var6).getStringParam(var7, var8.defaultStr);
} else {
Interpreter.Interpreter_intStack[++RouteStrategy.Interpreter_intStackSize - 1] = ObjectDefinition.getNpcDefinition(var6).getIntParam(var7, var8.keyInt);
Interpreter.Interpreter_intStack[++RouteStrategy.Interpreter_intStackSize - 1] = ObjectDefinition.getNpcDefinition(var6).getIntParam(var7, var8.defaultInt);
}
return 1;
@@ -162,11 +162,11 @@ public class class31 {
RouteStrategy.Interpreter_intStackSize -= 2;
var6 = Interpreter.Interpreter_intStack[RouteStrategy.Interpreter_intStackSize];
var7 = Interpreter.Interpreter_intStack[RouteStrategy.Interpreter_intStackSize + 1];
var8 = class229.getParamKeyDefinition(var7);
var8 = class229.getParamDefinition(var7);
if (var8.isString()) {
Interpreter.Interpreter_stringStack[++Interpreter.Interpreter_stringStackSize - 1] = class50.getObjectDefinition(var6).getStringParam(var7, var8.keyString);
Interpreter.Interpreter_stringStack[++Interpreter.Interpreter_stringStackSize - 1] = class50.getObjectDefinition(var6).getStringParam(var7, var8.defaultStr);
} else {
Interpreter.Interpreter_intStack[++RouteStrategy.Interpreter_intStackSize - 1] = class50.getObjectDefinition(var6).getIntParam(var7, var8.keyInt);
Interpreter.Interpreter_intStack[++RouteStrategy.Interpreter_intStackSize - 1] = class50.getObjectDefinition(var6).getIntParam(var7, var8.defaultInt);
}
return 1;
@@ -174,11 +174,11 @@ public class class31 {
RouteStrategy.Interpreter_intStackSize -= 2;
var6 = Interpreter.Interpreter_intStack[RouteStrategy.Interpreter_intStackSize];
var7 = Interpreter.Interpreter_intStack[RouteStrategy.Interpreter_intStackSize + 1];
var8 = class229.getParamKeyDefinition(var7);
var8 = class229.getParamDefinition(var7);
if (var8.isString()) {
Interpreter.Interpreter_stringStack[++Interpreter.Interpreter_stringStackSize - 1] = Skills.getItemDefinition(var6).getStringParam(var7, var8.keyString);
Interpreter.Interpreter_stringStack[++Interpreter.Interpreter_stringStackSize - 1] = Skills.getItemDefinition(var6).getStringParam(var7, var8.defaultStr);
} else {
Interpreter.Interpreter_intStack[++RouteStrategy.Interpreter_intStackSize - 1] = Skills.getItemDefinition(var6).getIntParam(var7, var8.keyInt);
Interpreter.Interpreter_intStack[++RouteStrategy.Interpreter_intStackSize - 1] = Skills.getItemDefinition(var6).getIntParam(var7, var8.defaultInt);
}
return 1;
@@ -186,11 +186,11 @@ public class class31 {
RouteStrategy.Interpreter_intStackSize -= 2;
var6 = Interpreter.Interpreter_intStack[RouteStrategy.Interpreter_intStackSize];
var7 = Interpreter.Interpreter_intStack[RouteStrategy.Interpreter_intStackSize + 1];
var8 = class229.getParamKeyDefinition(var7);
var8 = class229.getParamDefinition(var7);
if (var8.isString()) {
Interpreter.Interpreter_stringStack[++Interpreter.Interpreter_stringStackSize - 1] = GzipDecompressor.method3702(var6).getStringParam(var7, var8.keyString);
Interpreter.Interpreter_stringStack[++Interpreter.Interpreter_stringStackSize - 1] = GzipDecompressor.method3702(var6).getStringParam(var7, var8.defaultStr);
} else {
Interpreter.Interpreter_intStack[++RouteStrategy.Interpreter_intStackSize - 1] = GzipDecompressor.method3702(var6).getIntParam(var7, var8.keyInt);
Interpreter.Interpreter_intStack[++RouteStrategy.Interpreter_intStackSize - 1] = GzipDecompressor.method3702(var6).getIntParam(var7, var8.defaultInt);
}
return 1;

4
runescape-client/src/main/java/class39.java
View File

@@ -813,8 +813,8 @@ public class class39 extends class21 {
InterfaceParent var5 = (InterfaceParent)Client.interfaceParents.get((long)var1.id);
if (var5 != null) {
int var6 = var5.group;
if (GroundItemPile.loadWidgetGroup(var6)) {
WorldMapRegion.notRevalidateWidgetScroll(Widget.widgets[var6], -1, var3, var4, var2);
if (GroundItemPile.loadInterface(var6)) {
WorldMapRegion.notRevalidateWidgetScroll(Widget.interfaceComponents[var6], -1, var3, var4, var2);
}
}

6
runescape-client/src/main/java/class40.java
View File

@@ -716,7 +716,7 @@ public class class40 {
int var22;
int var24;
if (!Client.isCameraLocked) {
var4 = Client.cameraPitchTarget;
var4 = Client.camAngleX;
if (Client.field202 / 256 > var4) {
var4 = Client.field202 / 256;
}
@@ -725,7 +725,7 @@ public class class40 {
var4 = Client.field142[4] + 128;
}
var15 = Client.minimapOrientation & 2047;
var15 = Client.camAngleY & 2047;
var6 = MouseHandler.oculusOrbFocalPointX;
var22 = MouseRecorder.field566;
var24 = ScriptEvent.oculusOrbFocalPointY;
@@ -760,7 +760,7 @@ public class class40 {
class11.cameraZ = var24 - var16;
WorldMapIcon1.cameraPitch = var4;
MusicPatchNode.cameraYaw = var15;
if (Client.oculusOrbState == 1 && Client.rights >= 2 && Client.cycle % 50 == 0 && (MouseHandler.oculusOrbFocalPointX >> 7 != Canvas.localPlayer.x >> 7 || ScriptEvent.oculusOrbFocalPointY >> 7 != Canvas.localPlayer.y >> 7)) {
if (Client.oculusOrbState == 1 && Client.staffModLevel >= 2 && Client.cycle % 50 == 0 && (MouseHandler.oculusOrbFocalPointX >> 7 != Canvas.localPlayer.x >> 7 || ScriptEvent.oculusOrbFocalPointY >> 7 != Canvas.localPlayer.y >> 7)) {
var17 = Canvas.localPlayer.plane;
var18 = (MouseHandler.oculusOrbFocalPointX >> 7) + class50.baseX;
var19 = (ScriptEvent.oculusOrbFocalPointY >> 7) + GraphicsObject.baseY;

2
runescape-client/src/main/java/class50.java
View File

@@ -61,7 +61,7 @@ public class class50 {
var1.decode(new Buffer(var2));
}
var1.init();
var1.postDecode();
if (var1.isSolid) {
var1.interactType = 0;
var1.boolean1 = false;

16
runescape-client/src/main/java/class54.java
View File

@@ -1046,14 +1046,14 @@ public final class class54 {
Client.field202 += (var6 - Client.field202) / 80;
}
MouseRecorder.field566 = class32.getTileHeight(Canvas.localPlayer.x, Canvas.localPlayer.y, SoundSystem.plane) - Client.cameraFollowHeight;
MouseRecorder.field566 = class32.getTileHeight(Canvas.localPlayer.x, Canvas.localPlayer.y, SoundSystem.plane) - Client.camFollowHeight;
} else if (Client.oculusOrbState == 1) {
if (Client.field199 && Canvas.localPlayer != null) {
var0 = Canvas.localPlayer.pathX[0];
var1 = Canvas.localPlayer.pathY[0];
if (var0 >= 0 && var1 >= 0 && var0 < 104 && var1 < 104) {
MouseHandler.oculusOrbFocalPointX = Canvas.localPlayer.x;
var2 = class32.getTileHeight(Canvas.localPlayer.x, Canvas.localPlayer.y, SoundSystem.plane) - Client.cameraFollowHeight;
var2 = class32.getTileHeight(Canvas.localPlayer.x, Canvas.localPlayer.y, SoundSystem.plane) - Client.camFollowHeight;
if (var2 < MouseRecorder.field566) {
MouseRecorder.field566 = var2;
}
@@ -1167,14 +1167,14 @@ public final class class54 {
Client.field192 = MouseHandler.MouseHandler_x;
}
Client.minimapOrientation = Client.field190 / 2 + Client.minimapOrientation & 2047;
Client.cameraPitchTarget += Client.field191 / 2;
if (Client.cameraPitchTarget < 128) {
Client.cameraPitchTarget = 128;
Client.camAngleY = Client.field190 / 2 + Client.camAngleY & 2047;
Client.camAngleX += Client.field191 / 2;
if (Client.camAngleX < 128) {
Client.camAngleX = 128;
}
if (Client.cameraPitchTarget > 383) {
Client.cameraPitchTarget = 383;
if (Client.camAngleX > 383) {
Client.camAngleX = 383;
}
}

8
runescape-client/src/main/java/class65.java
View File

@@ -56,7 +56,7 @@ public class class65 extends RouteStrategy {
var0.orientation = var0.field21;
var0.field9 = var0.orientation;
} else {
var0.movementSequence = var0.idleSequence;
var0.movementSequence = var0.readySequence;
if (var0.pathLength == 0) {
var0.field24 = 0;
} else {
@@ -107,13 +107,13 @@ public class class65 extends RouteStrategy {
var6 -= 2048;
}
int var8 = var0.walkTurnSequence;
int var8 = var0.walkBackSequence;
if (var6 >= -256 && var6 <= 256) {
var8 = var0.walkSequence;
} else if (var6 >= 256 && var6 < 768) {
var8 = var0.walkTurnRightSequence;
var8 = var0.walkRightSequence;
} else if (var6 >= -768 && var6 <= -256) {
var8 = var0.walkTurnLeftSequence;
var8 = var0.walkLeftSequence;
}
if (var8 == -1) {