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

Revert "project: 184 (#1670)"

Browse Source 
This reverts commit 42acd14658.
This commit is contained in:
Kyle
2019-09-28 17:11:53 +01:00
committed by GitHub
parent 42acd14658
commit b5c6468d19
341 changed files with 90740 additions and 90582 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
deobfuscator/src/main/java/net/runelite/deob/Deob.java
View File

@@ -64,7 +64,7 @@ public class Deob
{
private static final Logger logger = LoggerFactory.getLogger(Deob.class);
public static final int OBFUSCATED_NAME_MAX_LEN = 3;
public static final int OBFUSCATED_NAME_MAX_LEN = 2;
private static final boolean CHECK_EXEC = false;
public static void main(String[] args) throws IOException
@@ -152,15 +152,7 @@ public class Deob
public static boolean isObfuscated(String name)
{
if (name.length() <= OBFUSCATED_NAME_MAX_LEN)
{
return !name.equals("run") && !name.equals("add");
}
return name.startsWith("method")
|| name.startsWith("vmethod")
|| name.startsWith("field")
|| name.startsWith("class")
|| name.startsWith("__");
return name.length() <= OBFUSCATED_NAME_MAX_LEN || name.startsWith("method") || name.startsWith("vmethod") || name.startsWith("field") || name.startsWith("class") || name.startsWith("__");
}
private static void runMath(ClassGroup group)

10
deobfuscator/src/main/java/net/runelite/deob/deobfuscators/RenameUnique.java
View File

@@ -48,9 +48,7 @@ public class RenameUnique implements Deobfuscator
for (ClassFile cf : group.getClasses())
{
if (cf.getName().length() > Deob.OBFUSCATED_NAME_MAX_LEN)
{
continue;
}
map.map(cf.getPoolClass(), "class" + i++);
}
@@ -63,10 +61,8 @@ public class RenameUnique implements Deobfuscator
for (ClassFile cf : group.getClasses())
for (Field field : cf.getFields())
{
if (!Deob.isObfuscated(field.getName()) || field.getName().equals(DeobAnnotations.getExportedName(field.getAnnotations())))
{
if (field.getName().length() > Deob.OBFUSCATED_NAME_MAX_LEN && !field.getName().startsWith("__") || field.getName().equals(DeobAnnotations.getExportedName(field.getAnnotations())))
continue;
}
map.map(field.getPoolField(), "field" + i++);
}
@@ -79,10 +75,8 @@ public class RenameUnique implements Deobfuscator
for (ClassFile cf : group.getClasses())
for (Method method : cf.getMethods())
{
if (!Deob.isObfuscated(method.getName()) || method.getName().equals(DeobAnnotations.getExportedName(method.getAnnotations())))
{
if (method.getName().length() > Deob.OBFUSCATED_NAME_MAX_LEN && !method.getName().startsWith("__") || method.getName().equals(DeobAnnotations.getExportedName(method.getAnnotations())))
continue;
}
List<Method> virtualMethods = VirtualMethods.getVirtualMethods(method);
assert !virtualMethods.isEmpty();

4
deobfuscator/src/test/java/net/runelite/deob/deobfuscators/RenameUniqueTest.java
View File

@@ -112,9 +112,7 @@ public class RenameUniqueTest
InvokeInstruction ii = (InvokeInstruction) i;
Assert.assertTrue(ii.getMethod().getName().length() > Deob.OBFUSCATED_NAME_MAX_LEN
|| ii.getMethod().getClazz().getName().length() > Deob.OBFUSCATED_NAME_MAX_LEN
|| ii.getMethod().getName().equals("run")
|| ii.getMethod().getName().equals("add"));
|| ii.getMethod().getClazz().getName().length() > Deob.OBFUSCATED_NAME_MAX_LEN);
}
}
}

5
injector-plugin/src/main/java/net/runelite/injector/Inject.java
View File

@@ -48,6 +48,8 @@ import net.runelite.deob.deobfuscators.arithmetic.DMath;
import static net.runelite.injector.InjectUtil.getFieldType;
import net.runelite.injector.raw.ClearColorBuffer;
import net.runelite.injector.raw.DrawAfterWidgets;
// import net.runelite.injector.raw.DrawMenu;
// import net.runelite.injector.raw.HidePlayerAttacks;
import net.runelite.injector.raw.Occluder;
import net.runelite.injector.raw.RasterizerHook;
import net.runelite.injector.raw.RenderDraw;
@@ -57,9 +59,6 @@ import net.runelite.rs.api.RSClient;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
// import net.runelite.injector.raw.DrawMenu;
// import net.runelite.injector.raw.HidePlayerAttacks;
public class Inject
{
public static final java.lang.Class<?> CLIENT_CLASS = RSClient.class;

BIN
runescape-client/.DS_Store vendored
View File

Binary file not shown.

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

@@ -99,7 +99,7 @@ public abstract class AbstractArchive {
)
@Export("decodeIndex")
void decodeIndex(byte[] var1) {
this.hash = Username.method5147(var1, var1.length);
this.hash = Username.method5132(var1, var1.length);
Buffer var2 = new Buffer(MusicPatch.decompressBytes(var1));
int var3 = var2.readUnsignedByte();
if (var3 >= 5 && var3 <= 7) {
@@ -109,7 +109,7 @@ public abstract class AbstractArchive {
int var4 = var2.readUnsignedByte();
if (var3 >= 7) {
this.groupCount = var2.method5458();
this.groupCount = var2.method5443();
} else {
this.groupCount = var2.readUnsignedShort();
}
@@ -120,7 +120,7 @@ public abstract class AbstractArchive {
int var7;
if (var3 >= 7) {
for (var7 = 0; var7 < this.groupCount; ++var7) {
this.groupIds[var7] = var5 += var2.method5458();
this.groupIds[var7] = var5 += var2.method5443();
if (this.groupIds[var7] > var6) {
var6 = this.groupIds[var7];
}
@@ -176,7 +176,7 @@ public abstract class AbstractArchive {
this.fileIds[var8] = new int[var9];
for (var11 = 0; var11 < var9; ++var11) {
var12 = this.fileIds[var8][var11] = var5 += var2.method5458();
var12 = this.fileIds[var8][var11] = var5 += var2.method5443();
if (var12 > var10) {
var10 = var12;
}
@@ -300,7 +300,7 @@ public abstract class AbstractArchive {
signature = "(II)Z",
garbageValue = "-812316387"
)
public boolean method4127(int var1) {
public boolean method4115(int var1) {
if (this.files.length == 1) {
return this.tryLoadFile(0, var1);
} else if (this.files[var1].length == 1) {
@@ -523,12 +523,12 @@ public abstract class AbstractArchive {
return true;
} else {
byte[] var18;
if (var2 != null && (var2[0] != 0 || var2[1] != 0 || var2[2] != 0 || var2[3] != 0)) {
if (var2 == null || var2[0] == 0 && var2[1] == 0 && var2[2] == 0 && var2[3] == 0) {
var18 = GrandExchangeOfferUnitPriceComparator.serialize(this.groups[var1], false);
} else {
var18 = GrandExchangeOfferUnitPriceComparator.serialize(this.groups[var1], true);
Buffer var8 = new Buffer(var18);
var8.xteaDecrypt(var2, 5, var8.array.length);
} else {
var18 = GrandExchangeOfferUnitPriceComparator.serialize(this.groups[var1], false);
}
byte[] var20 = MusicPatch.decompressBytes(var18);

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

@@ -193,7 +193,7 @@ public abstract class AbstractFont extends Rasterizer2D {
if (var13 != 32 && var13 != 160) {
for (var8 = 0; var8 < 256; ++var8) {
if (var8 != 32 && var8 != 160) {
this.kerning[var8 + (var13 << 8)] = (byte)method5290(var11, var12, var4, this.advances, var10, var13, var8);
this.kerning[var8 + (var13 << 8)] = (byte)method5275(var11, var12, var4, this.advances, var10, var13, var8);
}
}
}
@@ -712,11 +712,11 @@ public abstract class AbstractFont extends Rasterizer2D {
int var13 = this.advances[var7];
if (AbstractFont_strike != -1) {
Rasterizer2D.method5958(var2, var3 + (int)((double)this.ascent * 0.7D), var13, AbstractFont_strike);
Rasterizer2D.Rasterizer2D_drawHorizontalLine(var2, var3 + (int)((double)this.ascent * 0.7D), var13, AbstractFont_strike);
}
if (AbstractFont_underline != -1) {
Rasterizer2D.method5958(var2, var3 + this.ascent + 1, var13, AbstractFont_underline);
Rasterizer2D.Rasterizer2D_drawHorizontalLine(var2, var3 + this.ascent + 1, var13, AbstractFont_underline);
}
var2 += var13;
@@ -830,11 +830,11 @@ public abstract class AbstractFont extends Rasterizer2D {
int var18 = this.advances[var10];
if (AbstractFont_strike != -1) {
Rasterizer2D.method5958(var2, var3 + (int)((double)this.ascent * 0.7D), var18, AbstractFont_strike);
Rasterizer2D.Rasterizer2D_drawHorizontalLine(var2, var3 + (int)((double)this.ascent * 0.7D), var18, AbstractFont_strike);
}
if (AbstractFont_underline != -1) {
Rasterizer2D.method5958(var2, var3 + this.ascent, var18, AbstractFont_underline);
Rasterizer2D.Rasterizer2D_drawHorizontalLine(var2, var3 + this.ascent, var18, AbstractFont_underline);
}
var2 += var18;
@@ -847,7 +847,7 @@ public abstract class AbstractFont extends Rasterizer2D {
}
@ObfuscatedName("i")
static int method5290(byte[][] var0, byte[][] var1, int[] var2, int[] var3, int[] var4, int var5, int var6) {
static int method5275(byte[][] var0, byte[][] var1, int[] var2, int[] var3, int[] var4, int var5, int var6) {
int var7 = var2[var5];
int var8 = var7 + var4[var5];
int var9 = var2[var6];

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

@@ -17,7 +17,7 @@ public abstract class AbstractWorldMapData {
static int selectedItemId;
@ObfuscatedName("z")
@ObfuscatedGetter(
intValue = -517574656
intValue = 461674944
)
@Export("regionXLow")
int regionXLow;
@@ -210,7 +210,7 @@ public abstract class AbstractWorldMapData {
WorldMapDecoration[] var14 = this.decorations[var8][var1][var2] = new WorldMapDecoration[var9];
for (var11 = 0; var11 < var9; ++var11) {
int var12 = var3.method5453();
int var12 = var3.method5438();
int var13 = var3.readUnsignedByte();
var14[var11] = new WorldMapDecoration(var12, var13 >> 2, var13 & 3);
}

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

@@ -136,4 +136,20 @@ public final class AccessFile {
}
}
protected void aav() throws Throwable {
if (this.file != null) {
System.out.println("");
this.close();
}
}
protected void aao() throws Throwable {
if (this.file != null) {
System.out.println("");
this.close();
}
}
}

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

@@ -14,9 +14,6 @@ public abstract class Actor extends Entity {
@Export("x")
int x;
@ObfuscatedName("ap")
@ObfuscatedGetter(
intValue = 682054857
)
@Export("y")
int y;
@ObfuscatedName("ar")
@@ -164,7 +161,8 @@ public abstract class Actor extends Entity {
@ObfuscatedGetter(
intValue = -1979514767
)
int field953;
@Export("movementFrameCycle")
int movementFrameCycle;
@ObfuscatedName("bn")
@ObfuscatedGetter(
intValue = -1879648645
@@ -340,7 +338,7 @@ public abstract class Actor extends Entity {
this.field957 = -1;
this.movementSequence = -1;
this.movementFrame = 0;
this.field953 = 0;
this.movementFrameCycle = 0;
this.sequence = -1;
this.sequenceFrame = 0;
this.sequenceFrameCycle = 0;
@@ -376,7 +374,7 @@ public abstract class Actor extends Entity {
signature = "(B)V",
garbageValue = "4"
)
final void method1765() {
final void method1761() {
this.pathLength = 0;
this.field988 = 0;
}

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

@@ -150,7 +150,7 @@ public class Archive extends AbstractArchive {
signature = "(I)Z",
garbageValue = "2035998705"
)
public boolean method4235() {
public boolean method4223() {
return this.field3131;
}
@@ -214,7 +214,7 @@ public class Archive extends AbstractArchive {
}
if (this.masterDisk != null) {
CollisionMap.method3536(this.index, var2, this.masterDisk);
CollisionMap.method3530(this.index, var2, this.masterDisk);
}
this.decodeIndex(var2);
@@ -223,7 +223,7 @@ public class Archive extends AbstractArchive {
var2[var2.length - 2] = (byte)(super.groupVersions[var1] >> 8);
var2[var2.length - 1] = (byte)super.groupVersions[var1];
if (this.archiveDisk != null) {
CollisionMap.method3536(var1, var2, this.archiveDisk);
CollisionMap.method3530(var1, var2, this.archiveDisk);
this.validGroups[var1] = true;
}
@@ -371,7 +371,7 @@ public class Archive extends AbstractArchive {
signature = "(II)Z",
garbageValue = "-433634856"
)
public boolean method4243(int var1) {
public boolean method4231(int var1) {
return this.validGroups[var1];
}
@@ -380,7 +380,7 @@ public class Archive extends AbstractArchive {
signature = "(II)Z",
garbageValue = "805361618"
)
public boolean method4244(int var1) {
public boolean method4232(int var1) {
return this.getGroupFileIds(var1) != null;
}
@@ -415,7 +415,7 @@ public class Archive extends AbstractArchive {
signature = "(I)V",
garbageValue = "-212508230"
)
static final void method4278() {
static final void method4266() {
for (int var0 = 0; var0 < Players.Players_count; ++var0) {
Player var1 = Client.players[Players.Players_indices[var0]];
var1.clearIsInClanChat();
@@ -428,14 +428,14 @@ public class Archive extends AbstractArchive {
signature = "(I)V",
garbageValue = "26372698"
)
static void method4250() {
static void method4238() {
if (StudioGame.field3086 != null) {
Client.field905 = Client.cycle;
StudioGame.field3086.method4300();
StudioGame.field3086.method4288();
for (int var0 = 0; var0 < Client.players.length; ++var0) {
if (Client.players[var0] != null) {
StudioGame.field3086.method4301(class223.baseX * 64 + (Client.players[var0].x >> 7), class286.baseY * 64 + (Client.players[var0].y >> 7));
StudioGame.field3086.method4289(class223.baseX * 64 + (Client.players[var0].x >> 7), class286.baseY * 64 + (Client.players[var0].y * 682054857 >> 7));
}
}
}

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

@@ -337,14 +337,26 @@ public final class ArchiveDisk {
return "" + this.archive;
}
public String aak() {
return "" + this.archive;
}
public String aah() {
return "" + this.archive;
}
public String aae() {
return "" + this.archive;
}
@ObfuscatedName("z")
@ObfuscatedSignature(
signature = "(Lkl;Ljava/lang/String;I)I",
garbageValue = "1895940511"
)
public static int method5796(Buffer var0, String var1) {
public static int method5779(Buffer var0, String var1) {
int var2 = var0.offset;
byte[] var3 = UserComparator3.method3394(var1);
byte[] var3 = UserComparator3.method3390(var1);
var0.writeSmartByteShort(var3.length);
var0.offset += class210.huffman.compress(var3, 0, var3.length, var0.array, var0.offset);
return var0.offset - var2;
@@ -451,8 +463,8 @@ public final class ArchiveDisk {
signature = "(Lkl;IB)V",
garbageValue = "16"
)
static void method5801(Buffer var0, int var1) {
LoginScreenAnimation.method1832(var0.array, var1);
SoundSystem.method2468(var0, var1);
static void method5781(Buffer var0, int var1) {
LoginScreenAnimation.method1828(var0.array, var1);
SoundSystem.method2464(var0, var1);
}
}

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

@@ -57,7 +57,7 @@ public class ArchiveLoader {
this.loadedCount = 0;
for (int var1 = 0; var1 < this.groupCount; ++var1) {
if (!this.archive.method4244(var1) || this.archive.method4243(var1)) {
if (!this.archive.method4232(var1) || this.archive.method4231(var1)) {
++this.loadedCount;
}
}

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

@@ -77,7 +77,7 @@ public enum AttackOption implements Enumerated {
signature = "(I)Ljava/security/SecureRandom;",
garbageValue = "639446581"
)
static SecureRandom method2081() {
static SecureRandom method2077() {
SecureRandom var0 = new SecureRandom();
var0.nextInt();
return var0;
@@ -101,7 +101,7 @@ public enum AttackOption implements Enumerated {
var2.pathX[0] = var5 - class223.baseX * 64;
var2.x = (var2.pathX[0] << 7) + (var2.transformedSize() << 6);
var2.pathY[0] = var6 - class286.baseY * 64;
var2.y = (var2.pathY[0] << 7) + (var2.transformedSize() << 6);
var2.y = ((var2.pathY[0] << 7) + (var2.transformedSize() << 6)) * -944175751;
WorldMapRectangle.plane = var2.plane = var4;
if (Players.field1236[var1] != null) {
var2.read(Players.field1236[var1]);

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

@@ -39,14 +39,14 @@ public class AudioFilter {
}
@ObfuscatedName("z")
float method2674(int var1, int var2, float var3) {
float method2670(int var1, int var2, float var3) {
float var4 = (float)this.field1452[var1][0][var2] + var3 * (float)(this.field1452[var1][1][var2] - this.field1452[var1][0][var2]);
var4 *= 0.0015258789F;
return 1.0F - (float)Math.pow(10.0D, (double)(-var4 / 20.0F));
}
@ObfuscatedName("v")
float method2676(int var1, int var2, float var3) {
float method2672(int var1, int var2, float var3) {
float var4 = (float)this.field1458[var1][0][var2] + var3 * (float)(this.field1458[var1][1][var2] - this.field1458[var1][0][var2]);
var4 *= 1.2207031E-4F;
return normalize(var4);
@@ -66,15 +66,15 @@ public class AudioFilter {
if (this.pairs[var1] == 0) {
return 0;
} else {
var3 = this.method2674(var1, 0, var2);
field1454[var1][0] = -2.0F * var3 * (float)Math.cos((double)this.method2676(var1, 0, var2));
var3 = this.method2670(var1, 0, var2);
field1454[var1][0] = -2.0F * var3 * (float)Math.cos((double)this.method2672(var1, 0, var2));
field1454[var1][1] = var3 * var3;
float[] var10000;
int var4;
for (var4 = 1; var4 < this.pairs[var1]; ++var4) {
var3 = this.method2674(var1, var4, var2);
float var5 = -2.0F * var3 * (float)Math.cos((double)this.method2676(var1, var4, var2));
var3 = this.method2670(var1, var4, var2);
float var5 = -2.0F * var3 * (float)Math.cos((double)this.method2672(var1, var4, var2));
float var6 = var3 * var3;
field1454[var1][var4 * 2 + 1] = field1454[var1][var4 * 2 - 1] * var6;
field1454[var1][var4 * 2] = field1454[var1][var4 * 2 - 1] * var5 + field1454[var1][var4 * 2 - 2] * var6;
@@ -109,7 +109,7 @@ public class AudioFilter {
@ObfuscatedSignature(
signature = "(Lkl;Ldm;)V"
)
final void method2678(Buffer var1, SoundEnvelope var2) {
final void method2674(Buffer var1, SoundEnvelope var2) {
int var3 = var1.readUnsignedByte();
this.pairs[0] = var3 >> 4;
this.pairs[1] = var3 & 15;

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

@@ -42,7 +42,7 @@ public final class BZip2Decompressor {
@ObfuscatedSignature(
signature = "(Lkj;)V"
)
static void method5705(BZip2State var0) {
static void method5690(BZip2State var0) {
byte var2 = var0.out_char;
int var3 = var0.su_rNToGo;
int var4 = var0.nblocks_used;
@@ -523,7 +523,7 @@ public final class BZip2Decompressor {
var0.field3732 >>= 8;
++var0.nblocks_used;
var0.field3750 = var47;
method5705(var0);
method5690(var0);
if (var0.field3750 + 1 == var0.nblocks_used && var0.su_rNToGo == 0) {
var26 = true;
break;

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

@@ -204,7 +204,7 @@ public final class BZip2State {
signature = "(II)Z",
garbageValue = "157596925"
)
static boolean method5703(int var0) {
static boolean method5688(int var0) {
return var0 == 57 || var0 == 58 || var0 == 1007 || var0 == 25 || var0 == 30;
}
}

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

@@ -78,7 +78,7 @@ public final class BoundaryObject {
signature = "(CB)Z",
garbageValue = "31"
)
static final boolean method3226(char var0) {
static final boolean method3222(char var0) {
return var0 == 160 || var0 == ' ' || var0 == '_' || var0 == '-';
}
}

34
runescape-client/src/main/java/Bounds.java
View File

@@ -68,9 +68,9 @@ public class Bounds {
signature = "(Lll;Lll;I)V",
garbageValue = "2079875928"
)
public void method5913(Bounds var1, Bounds var2) {
this.method5927(var1, var2);
this.method5914(var1, var2);
public void method5893(Bounds var1, Bounds var2) {
this.method5905(var1, var2);
this.method5894(var1, var2);
}
@ObfuscatedName("u")
@@ -78,7 +78,7 @@ public class Bounds {
signature = "(Lll;Lll;B)V",
garbageValue = "-1"
)
void method5927(Bounds var1, Bounds var2) {
void method5905(Bounds var1, Bounds var2) {
var2.lowX = this.lowX;
var2.highX = this.highX;
if (this.lowX < var1.lowX) {
@@ -86,8 +86,8 @@ public class Bounds {
var2.lowX = var1.lowX;
}
if (var2.method5916() > var1.method5916()) {
var2.highX -= var2.method5916() - var1.method5916();
if (var2.method5896() > var1.method5896()) {
var2.highX -= var2.method5896() - var1.method5896();
}
if (var2.highX < 0) {
@@ -101,7 +101,7 @@ public class Bounds {
signature = "(Lll;Lll;I)V",
garbageValue = "-1654040739"
)
void method5914(Bounds var1, Bounds var2) {
void method5894(Bounds var1, Bounds var2) {
var2.lowY = this.lowY;
var2.highY = this.highY;
if (this.lowY < var1.lowY) {
@@ -109,8 +109,8 @@ public class Bounds {
var2.lowY = var1.lowY;
}
if (var2.method5912() > var1.method5912()) {
var2.highY -= var2.method5912() - var1.method5912();
if (var2.method5892() > var1.method5892()) {
var2.highY -= var2.method5892() - var1.method5892();
}
if (var2.highY < 0) {
@@ -124,7 +124,7 @@ public class Bounds {
signature = "(I)I",
garbageValue = "769635987"
)
int method5916() {
int method5896() {
return this.lowX + this.highX;
}
@@ -133,11 +133,23 @@ public class Bounds {
signature = "(B)I",
garbageValue = "59"
)
int method5912() {
int method5892() {
return this.highY + this.lowY;
}
public String toString() {
return null;
}
public String aak() {
return null;
}
public String aae() {
return null;
}
public String aah() {
return null;
}
}

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

@@ -67,7 +67,7 @@ public class Buddy extends User {
signature = "(ILcu;ZI)I",
garbageValue = "1426462552"
)
static int method5111(int var0, Script var1, boolean var2) {
static int method5099(int var0, Script var1, boolean var2) {
if (var0 == ScriptOpcodes.FRIEND_COUNT) {
if (Tiles.friendSystem.field1052 == 0) {
Interpreter.Interpreter_intStack[++Interpreter.Interpreter_intStackSize - 1] = -2;
@@ -82,7 +82,7 @@ public class Buddy extends User {
int var3;
if (var0 == ScriptOpcodes.FRIEND_GETNAME) {
var3 = Interpreter.Interpreter_intStack[--Interpreter.Interpreter_intStackSize];
if (Tiles.friendSystem.method1863() && var3 >= 0 && var3 < Tiles.friendSystem.friendsList.getSize()) {
if (Tiles.friendSystem.method1859() && var3 >= 0 && var3 < Tiles.friendSystem.friendsList.getSize()) {
Friend var8 = (Friend)Tiles.friendSystem.friendsList.get(var3);
Interpreter.Interpreter_stringStack[++Interpreter.Interpreter_stringStackSize - 1] = var8.getName();
Interpreter.Interpreter_stringStack[++Interpreter.Interpreter_stringStackSize - 1] = var8.getPreviousName();
@@ -94,7 +94,7 @@ public class Buddy extends User {
return 1;
} else if (var0 == ScriptOpcodes.FRIEND_GETWORLD) {
var3 = Interpreter.Interpreter_intStack[--Interpreter.Interpreter_intStackSize];
if (Tiles.friendSystem.method1863() && var3 >= 0 && var3 < Tiles.friendSystem.friendsList.getSize()) {
if (Tiles.friendSystem.method1859() && var3 >= 0 && var3 < Tiles.friendSystem.friendsList.getSize()) {
Interpreter.Interpreter_intStack[++Interpreter.Interpreter_intStackSize - 1] = ((Buddy)Tiles.friendSystem.friendsList.get(var3)).world;
} else {
Interpreter.Interpreter_intStack[++Interpreter.Interpreter_intStackSize - 1] = 0;
@@ -103,7 +103,7 @@ public class Buddy extends User {
return 1;
} else if (var0 == ScriptOpcodes.FRIEND_GETRANK) {
var3 = Interpreter.Interpreter_intStack[--Interpreter.Interpreter_intStackSize];
if (Tiles.friendSystem.method1863() && var3 >= 0 && var3 < Tiles.friendSystem.friendsList.getSize()) {
if (Tiles.friendSystem.method1859() && var3 >= 0 && var3 < Tiles.friendSystem.friendsList.getSize()) {
Interpreter.Interpreter_intStack[++Interpreter.Interpreter_intStackSize - 1] = ((Buddy)Tiles.friendSystem.friendsList.get(var3)).rank;
} else {
Interpreter.Interpreter_intStack[++Interpreter.Interpreter_intStackSize - 1] = 0;
@@ -115,7 +115,7 @@ public class Buddy extends User {
if (var0 == ScriptOpcodes.FRIEND_SETRANK) {
var5 = Interpreter.Interpreter_stringStack[--Interpreter.Interpreter_stringStackSize];
int var6 = Interpreter.Interpreter_intStack[--Interpreter.Interpreter_intStackSize];
NPC.method2050(var5, var6);
NPC.method2046(var5, var6);
return 1;
} else if (var0 == ScriptOpcodes.FRIEND_ADD) {
var5 = Interpreter.Interpreter_stringStack[--Interpreter.Interpreter_stringStackSize];
@@ -199,7 +199,7 @@ public class Buddy extends User {
WorldMapLabel.Clan_leaveChat();
return 1;
} else if (var0 == ScriptOpcodes.IGNORE_COUNT) {
if (!Tiles.friendSystem.method1863()) {
if (!Tiles.friendSystem.method1859()) {
Interpreter.Interpreter_intStack[++Interpreter.Interpreter_intStackSize - 1] = -1;
} else {
Interpreter.Interpreter_intStack[++Interpreter.Interpreter_intStackSize - 1] = Tiles.friendSystem.ignoreList.getSize();
@@ -208,7 +208,7 @@ public class Buddy extends User {
return 1;
} else if (var0 == ScriptOpcodes.IGNORE_GETNAME) {
var3 = Interpreter.Interpreter_intStack[--Interpreter.Interpreter_intStackSize];
if (Tiles.friendSystem.method1863() && var3 >= 0 && var3 < Tiles.friendSystem.ignoreList.getSize()) {
if (Tiles.friendSystem.method1859() && var3 >= 0 && var3 < Tiles.friendSystem.ignoreList.getSize()) {
Ignored var4 = (Ignored)Tiles.friendSystem.ignoreList.get(var3);
Interpreter.Interpreter_stringStack[++Interpreter.Interpreter_stringStackSize - 1] = var4.getName();
Interpreter.Interpreter_stringStack[++Interpreter.Interpreter_stringStackSize - 1] = var4.getPreviousName();

64
runescape-client/src/main/java/Buffer.java
View File

@@ -204,7 +204,7 @@ public class Buffer extends Node {
)
@Export("writeCESU8")
public void writeCESU8(CharSequence var1) {
int var2 = class173.method3556(var1);
int var2 = class173.method3550(var1);
this.array[++this.offset - 1] = 0;
this.writeVarInt(var2);
this.offset += AbstractWorldMapIcon.method640(this.array, this.offset, var1);
@@ -469,7 +469,7 @@ public class Buffer extends Node {
if (var2 + this.offset > this.array.length) {
throw new IllegalStateException("");
} else {
String var3 = UserComparator6.method3408(this.array, this.offset, var2);
String var3 = UserComparator6.method3404(this.array, this.offset, var2);
this.offset += var2;
return var3;
}
@@ -516,7 +516,7 @@ public class Buffer extends Node {
signature = "(I)I",
garbageValue = "-1994836425"
)
public int method5457() {
public int method5442() {
int var1 = 0;
int var2;
@@ -533,7 +533,7 @@ public class Buffer extends Node {
signature = "(I)I",
garbageValue = "1856744569"
)
public int method5458() {
public int method5443() {
return this.array[this.offset] < 0 ? this.readInt() & Integer.MAX_VALUE : this.readUnsignedShort();
}
@@ -542,7 +542,7 @@ public class Buffer extends Node {
signature = "(S)I",
garbageValue = "-9085"
)
public int method5453() {
public int method5438() {
if (this.array[this.offset] < 0) {
return this.readInt() & Integer.MAX_VALUE;
} else {
@@ -710,7 +710,7 @@ public class Buffer extends Node {
)
@Export("writeCrc")
public int writeCrc(int var1) {
int var2 = LoginScreenAnimation.method1848(this.array, var1, this.offset);
int var2 = LoginScreenAnimation.method1844(this.array, var1, this.offset);
this.writeInt(var2);
return var2;
}
@@ -723,7 +723,7 @@ public class Buffer extends Node {
@Export("checkCrc")
public boolean checkCrc() {
this.offset -= 4;
int var1 = LoginScreenAnimation.method1848(this.array, 0, this.offset);
int var1 = LoginScreenAnimation.method1844(this.array, 0, this.offset);
int var2 = this.readInt();
return var2 == var1;
}
@@ -733,7 +733,7 @@ public class Buffer extends Node {
signature = "(II)V",
garbageValue = "1145773072"
)
public void method5467(int var1) {
public void method5452(int var1) {
this.array[++this.offset - 1] = (byte)(var1 + 128);
}
@@ -742,7 +742,7 @@ public class Buffer extends Node {
signature = "(IB)V",
garbageValue = "8"
)
public void method5468(int var1) {
public void method5453(int var1) {
this.array[++this.offset - 1] = (byte)(0 - var1);
}
@@ -751,7 +751,7 @@ public class Buffer extends Node {
signature = "(IB)V",
garbageValue = "91"
)
public void method5461(int var1) {
public void method5446(int var1) {
this.array[++this.offset - 1] = (byte)(128 - var1);
}
@@ -760,7 +760,7 @@ public class Buffer extends Node {
signature = "(I)I",
garbageValue = "-108626677"
)
public int method5470() {
public int method5455() {
return this.array[++this.offset - 1] - 128 & 255;
}
@@ -769,7 +769,7 @@ public class Buffer extends Node {
signature = "(I)I",
garbageValue = "-313206497"
)
public int method5471() {
public int method5456() {
return 0 - this.array[++this.offset - 1] & 255;
}
@@ -778,7 +778,7 @@ public class Buffer extends Node {
signature = "(I)I",
garbageValue = "-1489408789"
)
public int method5511() {
public int method5496() {
return 128 - this.array[++this.offset - 1] & 255;
}
@@ -787,7 +787,7 @@ public class Buffer extends Node {
signature = "(I)B",
garbageValue = "-961755482"
)
public byte method5473() {
public byte method5458() {
return (byte)(this.array[++this.offset - 1] - 128);
}
@@ -796,7 +796,7 @@ public class Buffer extends Node {
signature = "(I)B",
garbageValue = "-675073982"
)
public byte method5474() {
public byte method5459() {
return (byte)(0 - this.array[++this.offset - 1]);
}
@@ -805,7 +805,7 @@ public class Buffer extends Node {
signature = "(I)B",
garbageValue = "-598630050"
)
public byte method5475() {
public byte method5460() {
return (byte)(128 - this.array[++this.offset - 1]);
}
@@ -814,7 +814,7 @@ public class Buffer extends Node {
signature = "(II)V",
garbageValue = "1760464682"
)
public void method5476(int var1) {
public void method5461(int var1) {
this.array[++this.offset - 1] = (byte)var1;
this.array[++this.offset - 1] = (byte)(var1 >> 8);
}
@@ -846,7 +846,7 @@ public class Buffer extends Node {
signature = "(I)I",
garbageValue = "-509396216"
)
public int method5479() {
public int method5464() {
this.offset += 2;
return ((this.array[this.offset - 1] & 255) << 8) + (this.array[this.offset - 2] & 255);
}
@@ -856,7 +856,7 @@ public class Buffer extends Node {
signature = "(I)I",
garbageValue = "2084520877"
)
public int method5480() {
public int method5465() {
this.offset += 2;
return (this.array[this.offset - 1] - 128 & 255) + ((this.array[this.offset - 2] & 255) << 8);
}
@@ -866,7 +866,7 @@ public class Buffer extends Node {
signature = "(I)I",
garbageValue = "1941268038"
)
public int method5647() {
public int method5632() {
this.offset += 2;
return ((this.array[this.offset - 1] & 255) << 8) + (this.array[this.offset - 2] - 128 & 255);
}
@@ -876,7 +876,7 @@ public class Buffer extends Node {
signature = "(I)I",
garbageValue = "-1363651075"
)
public int method5486() {
public int method5471() {
this.offset += 2;
int var1 = ((this.array[this.offset - 1] & 255) << 8) + (this.array[this.offset - 2] & 255);
if (var1 > 32767) {
@@ -891,7 +891,7 @@ public class Buffer extends Node {
signature = "(I)I",
garbageValue = "649688108"
)
public int method5504() {
public int method5489() {
this.offset += 2;
int var1 = (this.array[this.offset - 1] - 128 & 255) + ((this.array[this.offset - 2] & 255) << 8);
if (var1 > 32767) {
@@ -906,7 +906,7 @@ public class Buffer extends Node {
signature = "(I)I",
garbageValue = "-1593001312"
)
public int method5484() {
public int method5469() {
this.offset += 2;
int var1 = ((this.array[this.offset - 1] & 255) << 8) + (this.array[this.offset - 2] - 128 & 255);
if (var1 > 32767) {
@@ -921,7 +921,7 @@ public class Buffer extends Node {
signature = "(II)V",
garbageValue = "-1821828851"
)
public void method5485(int var1) {
public void method5470(int var1) {
this.array[++this.offset - 1] = (byte)var1;
this.array[++this.offset - 1] = (byte)(var1 >> 8);
this.array[++this.offset - 1] = (byte)(var1 >> 16);
@@ -932,7 +932,7 @@ public class Buffer extends Node {
signature = "(I)I",
garbageValue = "-715044381"
)
public int method5488() {
public int method5473() {
this.offset += 3;
return (this.array[this.offset - 3] & 255) + ((this.array[this.offset - 2] & 255) << 8) + ((this.array[this.offset - 1] & 255) << 16);
}
@@ -955,7 +955,7 @@ public class Buffer extends Node {
signature = "(IB)V",
garbageValue = "81"
)
public void method5630(int var1) {
public void method5615(int var1) {
this.array[++this.offset - 1] = (byte)(var1 >> 8);
this.array[++this.offset - 1] = (byte)var1;
this.array[++this.offset - 1] = (byte)(var1 >> 24);
@@ -967,7 +967,7 @@ public class Buffer extends Node {
signature = "(II)V",
garbageValue = "775210063"
)
public void method5489(int var1) {
public void method5474(int var1) {
this.array[++this.offset - 1] = (byte)(var1 >> 16);
this.array[++this.offset - 1] = (byte)(var1 >> 24);
this.array[++this.offset - 1] = (byte)var1;
@@ -979,7 +979,7 @@ public class Buffer extends Node {
signature = "(I)I",
garbageValue = "338391955"
)
public int method5482() {
public int method5467() {
this.offset += 4;
return (this.array[this.offset - 4] & 255) + ((this.array[this.offset - 3] & 255) << 8) + ((this.array[this.offset - 2] & 255) << 16) + ((this.array[this.offset - 1] & 255) << 24);
}
@@ -989,7 +989,7 @@ public class Buffer extends Node {
signature = "(I)I",
garbageValue = "311573145"
)
public int method5561() {
public int method5546() {
this.offset += 4;
return ((this.array[this.offset - 2] & 255) << 24) + ((this.array[this.offset - 4] & 255) << 8) + (this.array[this.offset - 3] & 255) + ((this.array[this.offset - 1] & 255) << 16);
}
@@ -999,7 +999,7 @@ public class Buffer extends Node {
signature = "(B)I",
garbageValue = "5"
)
public int method5492() {
public int method5477() {
this.offset += 4;
return ((this.array[this.offset - 1] & 255) << 8) + ((this.array[this.offset - 4] & 255) << 16) + (this.array[this.offset - 2] & 255) + ((this.array[this.offset - 3] & 255) << 24);
}
@@ -1009,7 +1009,7 @@ public class Buffer extends Node {
signature = "([BIII)V",
garbageValue = "641640947"
)
public void method5493(byte[] var1, int var2, int var3) {
public void method5478(byte[] var1, int var2, int var3) {
for (int var4 = var2; var4 < var3 + var2; ++var4) {
var1[var4] = (byte)(this.array[++this.offset - 1] - 128);
}
@@ -1021,7 +1021,7 @@ public class Buffer extends Node {
signature = "([BIII)V",
garbageValue = "666802900"
)
public void method5494(byte[] var1, int var2, int var3) {
public void method5479(byte[] var1, int var2, int var3) {
for (int var4 = var3 + var2 - 1; var4 >= var2; --var4) {
var1[var4] = (byte)(this.array[++this.offset - 1] - 128);
}

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

@@ -113,6 +113,14 @@ public class BufferedNetSocket extends AbstractSocket {
this.close();
}
protected void aav() {
this.close();
}
protected void aao() {
this.close();
}
@ObfuscatedName("z")
@ObfuscatedSignature(
signature = "(I)Z",

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

@@ -209,7 +209,7 @@ public class BufferedSink implements Runnable {
signature = "(Lli;I)I",
garbageValue = "-828018974"
)
static final int method5794(LoginType var0) {
static final int method5777(LoginType var0) {
if (var0 == null) {
return 12;
} else {
@@ -247,12 +247,12 @@ public class BufferedSink implements Runnable {
int var9 = var5 * var7 + var4 * var8 >> 11;
int var10 = var5 * var8 - var7 * var4 >> 11;
int var11 = var9 + class223.localPlayer.x >> 7;
int var12 = class223.localPlayer.y - var10 >> 7;
int var12 = class223.localPlayer.y * 682054857 - var10 >> 7;
PacketBufferNode var13 = InterfaceParent.getPacketBufferNode(ClientPacket.field2275, Client.packetWriter.isaacCipher);
var13.packetBuffer.writeByte(18);
var13.packetBuffer.writeShortLE(class223.baseX * 64 + var11);
var13.packetBuffer.method5476(class286.baseY * 64 + var12);
var13.packetBuffer.method5468(KeyHandler.KeyHandler_pressedKeys[82] ? (KeyHandler.KeyHandler_pressedKeys[81] ? 2 : 1) : 0);
var13.packetBuffer.method5461(class286.baseY * 64 + var12);
var13.packetBuffer.method5453(KeyHandler.KeyHandler_pressedKeys[82] ? (KeyHandler.KeyHandler_pressedKeys[81] ? 2 : 1) : 0);
var13.packetBuffer.writeByte(var4);
var13.packetBuffer.writeByte(var5);
var13.packetBuffer.writeShort(Client.camAngleY);
@@ -261,7 +261,7 @@ public class BufferedSink implements Runnable {
var13.packetBuffer.writeByte(0);
var13.packetBuffer.writeByte(89);
var13.packetBuffer.writeShort(class223.localPlayer.x);
var13.packetBuffer.writeShort(class223.localPlayer.y);
var13.packetBuffer.writeShort(class223.localPlayer.y * 682054857);
var13.packetBuffer.writeByte(63);
Client.packetWriter.addNode(var13);
Client.destinationX = var11;

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

@@ -51,7 +51,7 @@ public final class Canvas extends java.awt.Canvas {
)
@Export("SpriteBuffer_getSpriteArray")
public static Sprite[] SpriteBuffer_getSpriteArray(AbstractArchive var0, int var1, int var2) {
return !VertexNormal.method2962(var0, var1, var2) ? null : AbstractWorldMapIcon.method642();
return !VertexNormal.method2958(var0, var1, var2) ? null : AbstractWorldMapIcon.method642();
}
@ObfuscatedName("al")

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

@@ -80,9 +80,9 @@ public class ChatChannel {
signature = "(I)V",
garbageValue = "247037730"
)
static final void method2237() {
int var0 = class225.field3045 * 128 + 64;
int var1 = Clock.field2039 * 16384 + 64;
static final void method2233() {
int var0 = class225.field3045 * 16384 + 64;
int var1 = Clock.field2039 * 128 + 64;
int var2 = MusicPatchPcmStream.getTileHeight(var0, var1, WorldMapRectangle.plane) - GrandExchangeOfferOwnWorldComparator.field627;
if (GrandExchangeOfferOwnWorldComparator.cameraX < var0) {
GrandExchangeOfferOwnWorldComparator.cameraX = (var0 - GrandExchangeOfferOwnWorldComparator.cameraX) * Messages.field1262 / 1000 + GrandExchangeOfferOwnWorldComparator.cameraX + MouseRecorder.field572;
@@ -126,7 +126,7 @@ public class ChatChannel {
}
}
var0 = GameShell.field455 * 16384 + 64;
var0 = GameShell.field455 * 128 + 64;
var1 = SecureRandomFuture.field1228 * 16384 + 64;
var2 = MusicPatchPcmStream.getTileHeight(var0, var1, WorldMapRectangle.plane) - class14.field90;
int var3 = var0 - GrandExchangeOfferOwnWorldComparator.cameraX;
@@ -196,7 +196,7 @@ public class ChatChannel {
signature = "(IB)V",
garbageValue = "73"
)
static void method2229(int var0) {
static void method2225(int var0) {
ParamDefinition.tempMenuAction = new MenuAction();
ParamDefinition.tempMenuAction.argument1 = Client.menuArguments1[var0];
ParamDefinition.tempMenuAction.argument2 = Client.menuArguments2[var0];

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

@@ -79,7 +79,7 @@ public class ClanChat extends UserList {
)
@Export("readName")
final void readName(String var1) {
this.name = VertexNormal.method2961(var1);
this.name = VertexNormal.method2957(var1);
}
@ObfuscatedName("m")
@@ -89,7 +89,7 @@ public class ClanChat extends UserList {
)
@Export("setOwner")
final void setOwner(String var1) {
this.owner = VertexNormal.method2961(var1);
this.owner = VertexNormal.method2957(var1);
}
@ObfuscatedName("y")
@@ -151,7 +151,7 @@ public class ClanChat extends UserList {
signature = "(Lkl;B)V",
garbageValue = "-31"
)
public final void method5166(Buffer var1) {
public final void method5151(Buffer var1) {
Username var2 = new Username(var1.readStringCp1252NullTerminated(), this.loginType);
int var3 = var1.readUnsignedShort();
byte var4 = var1.readByte();

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

@@ -103,7 +103,7 @@ public class ClanMate extends Buddy {
signature = "(Lhp;Lhp;III)Lkn;",
garbageValue = "-569680121"
)
public static Font method4976(AbstractArchive var0, AbstractArchive var1, int var2, int var3) {
return !VertexNormal.method2962(var0, var2, var3) ? null : class49.method893(var1.takeFile(var2, var3));
public static Font method4964(AbstractArchive var0, AbstractArchive var1, int var2, int var3) {
return !VertexNormal.method2958(var0, var2, var3) ? null : class49.method893(var1.takeFile(var2, var3));
}
}

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

File diff suppressed because it is too large Load Diff

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

@@ -640,7 +640,7 @@ public class ClientPacket implements class181 {
signature = "(I)V",
garbageValue = "470229947"
)
static void method3581() {
static void method3575() {
for (ObjectSound var0 = (ObjectSound)ObjectSound.objectSounds.last(); var0 != null; var0 = (ObjectSound)ObjectSound.objectSounds.previous()) {
if (var0.stream1 != null) {
WorldMapLabelSize.pcmStreamMixer.removeSubStream(var0.stream1);
@@ -661,7 +661,7 @@ public class ClientPacket implements class181 {
signature = "(ZZI)Llp;",
garbageValue = "-1999354479"
)
static IndexedSprite method3578(boolean var0, boolean var1) {
static IndexedSprite method3572(boolean var0, boolean var1) {
return var0 ? (var1 ? Login.field1163 : class42.options_buttons_2Sprite) : (var1 ? ClientPreferences.field1046 : class195.options_buttons_0Sprite);
}
@@ -670,7 +670,7 @@ public class ClientPacket implements class181 {
signature = "(ILcu;ZI)I",
garbageValue = "-2131546736"
)
static int method3579(int var0, Script var1, boolean var2) {
static int method3573(int var0, Script var1, boolean var2) {
Widget var3;
if (var0 >= 2000) {
var0 -= 1000;
@@ -705,7 +705,7 @@ public class ClientPacket implements class181 {
@Export("playSoundJingle")
static void playSoundJingle(int var0, int var1) {
if (Client.field761 != 0 && var0 != -1) {
class83.method2068(ClanMate.archive11, var0, 0, Client.field761, false);
class83.method2064(ClanMate.archive11, var0, 0, Client.field761, false);
Client.field759 = true;
}

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

@@ -58,7 +58,7 @@ public class ClientPreferences {
this.rememberedUsername = null;
this.hideUsername = false;
this.parameters = new LinkedHashMap();
this.method1851(true);
this.method1847(true);
}
@ObfuscatedSignature(
@@ -102,10 +102,10 @@ public class ClientPreferences {
this.hideUsername = var1.readBoolean();
}
} else {
this.method1851(true);
this.method1847(true);
}
} else {
this.method1851(true);
this.method1847(true);
}
}
@@ -115,7 +115,7 @@ public class ClientPreferences {
signature = "(ZI)V",
garbageValue = "864937253"
)
void method1851(boolean var1) {
void method1847(boolean var1) {
}
@ObfuscatedName("n")
@@ -149,7 +149,7 @@ public class ClientPreferences {
signature = "(B)V",
garbageValue = "-70"
)
static void method1861() {
static void method1857() {
Players.Players_count = 0;
for (int var0 = 0; var0 < 2048; ++var0) {
@@ -173,7 +173,7 @@ public class ClientPreferences {
if (Client.minimapState != 2 && Client.minimapState != 5) {
int var5 = Client.camAngleY & 2047;
int var6 = class223.localPlayer.x / 32 + 48;
int var7 = 464 - class223.localPlayer.y / 32;
int var7 = 464 - class223.localPlayer.y * 682054857 / 32;
ObjectSound.sceneMinimapSprite.drawRotatedMaskedCenteredAround(var1, var2, var4.width, var4.height, var6, var7, var5, 256, var4.xStarts, var4.xWidths);
int var8;
@@ -181,7 +181,7 @@ public class ClientPreferences {
int var10;
for (var8 = 0; var8 < Client.mapIconCount; ++var8) {
var9 = Client.mapIconXs[var8] * 4 + 2 - class223.localPlayer.x / 32;
var10 = Client.mapIconYs[var8] * 4 + 2 - class223.localPlayer.y / 32;
var10 = Client.mapIconYs[var8] * 4 + 2 - class223.localPlayer.y * 682054857 / 32;
class208.drawSpriteOnMinimap(var1, var2, var9, var10, Client.mapIcons[var8], var4);
}
@@ -192,7 +192,7 @@ public class ClientPreferences {
NodeDeque var15 = Client.groundItems[WorldMapRectangle.plane][var8][var9];
if (var15 != null) {
var11 = var8 * 4 + 2 - class223.localPlayer.x / 32;
var12 = var9 * 4 + 2 - class223.localPlayer.y / 32;
var12 = var9 * 4 + 2 - class223.localPlayer.y * 682054857 / 32;
class208.drawSpriteOnMinimap(var1, var2, var11, var12, class13.mapDotSprites[0], var4);
}
}
@@ -208,7 +208,7 @@ public class ClientPreferences {
if (var18 != null && var18.drawMapDot && var18.isInteractable) {
var11 = var16.x / 32 - class223.localPlayer.x / 32;
var12 = var16.y / 32 - class223.localPlayer.y / 32;
var12 = var16.y * 682054857 / 32 - class223.localPlayer.y * 682054857 / 32;
class208.drawSpriteOnMinimap(var1, var2, var11, var12, class13.mapDotSprites[1], var4);
}
}
@@ -221,7 +221,7 @@ public class ClientPreferences {
Player var17 = Client.players[var19[var10]];
if (var17 != null && var17.isVisible() && !var17.isHidden && var17 != class223.localPlayer) {
var12 = var17.x / 32 - class223.localPlayer.x / 32;
int var13 = var17.y / 32 - class223.localPlayer.y / 32;
int var13 = var17.y * 682054857 / 32 - class223.localPlayer.y * 682054857 / 32;
boolean var14 = false;
if (class223.localPlayer.team != 0 && var17.team != 0 && var17.team == class223.localPlayer.team) {
var14 = true;
@@ -244,14 +244,14 @@ public class ClientPreferences {
NPC var20 = Client.npcs[Client.hintArrowNpcIndex];
if (var20 != null) {
var11 = var20.x / 32 - class223.localPlayer.x / 32;
var12 = var20.y / 32 - class223.localPlayer.y / 32;
var12 = var20.y * 682054857 / 32 - class223.localPlayer.y * 682054857 / 32;
FloorDecoration.worldToMinimap(var1, var2, var11, var12, GameObject.mapMarkerSprites[1], var4);
}
}
if (Client.hintArrowType == 2) {
var10 = Client.hintArrowX * 4 - class223.baseX * 256 + 2 - class223.localPlayer.x / 32;
var11 = Client.hintArrowY * 4 - class286.baseY * 256 + 2 - class223.localPlayer.y / 32;
var11 = Client.hintArrowY * 4 - class286.baseY * 256 + 2 - class223.localPlayer.y * 682054857 / 32;
FloorDecoration.worldToMinimap(var1, var2, var10, var11, GameObject.mapMarkerSprites[1], var4);
}
@@ -259,7 +259,7 @@ public class ClientPreferences {
Player var21 = Client.players[Client.hintArrowPlayerIndex];
if (var21 != null) {
var11 = var21.x / 32 - class223.localPlayer.x / 32;
var12 = var21.y / 32 - class223.localPlayer.y / 32;
var12 = var21.y * 682054857 / 32 - class223.localPlayer.y * 682054857 / 32;
FloorDecoration.worldToMinimap(var1, var2, var11, var12, GameObject.mapMarkerSprites[1], var4);
}
}
@@ -267,7 +267,7 @@ public class ClientPreferences {
if (Client.destinationX != 0) {
var10 = Client.destinationX * 4 + 2 - class223.localPlayer.x / 32;
var11 = Client.destinationY * 4 + 2 - class223.localPlayer.y / 32;
var11 = Client.destinationY * 4 + 2 - class223.localPlayer.y * 682054857 / 32;
class208.drawSpriteOnMinimap(var1, var2, var10, var11, GameObject.mapMarkerSprites[0], var4);
}

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

@@ -9,7 +9,7 @@ import net.runelite.mapping.ObfuscatedSignature;
public abstract class Clock {
@ObfuscatedName("qq")
@ObfuscatedGetter(
intValue = -757684608
intValue = 1800617984
)
static int field2039;
@@ -52,7 +52,7 @@ public abstract class Clock {
signature = "(I)I",
garbageValue = "1644538233"
)
static final int method3463() {
static final int method3459() {
return ViewportMouse.ViewportMouse_x;
}

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

@@ -69,7 +69,7 @@ public class CollisionMap {
signature = "(IIIIZI)V",
garbageValue = "1400659630"
)
public void method3508(int var1, int var2, int var3, int var4, boolean var5) {
public void method3502(int var1, int var2, int var3, int var4, boolean var5) {
var1 -= this.xInset;
var2 -= this.yInset;
if (var3 == 0) {
@@ -285,7 +285,7 @@ public class CollisionMap {
signature = "(IIIIZI)V",
garbageValue = "1060838313"
)
public void method3514(int var1, int var2, int var3, int var4, boolean var5) {
public void method3508(int var1, int var2, int var3, int var4, boolean var5) {
var1 -= this.xInset;
var2 -= this.yInset;
if (var3 == 0) {
@@ -481,7 +481,7 @@ public class CollisionMap {
signature = "(IIS)V",
garbageValue = "-6856"
)
public void method3517(int var1, int var2) {
public void method3511(int var1, int var2) {
var1 -= this.xInset;
var2 -= this.yInset;
int[] var10000 = this.flags[var1];
@@ -493,7 +493,7 @@ public class CollisionMap {
signature = "(I[BLkg;I)V",
garbageValue = "1190241493"
)
static void method3536(int var0, byte[] var1, ArchiveDisk var2) {
static void method3530(int var0, byte[] var1, ArchiveDisk var2) {
ArchiveDiskAction var3 = new ArchiveDiskAction();
var3.type = 0;
var3.key = (long)var0;
@@ -520,7 +520,7 @@ public class CollisionMap {
signature = "(Ljava/awt/Component;I)V",
garbageValue = "-1662439433"
)
static void method3544(Component var0) {
static void method3538(Component var0) {
var0.removeMouseListener(MouseHandler.MouseHandler_instance);
var0.removeMouseMotionListener(MouseHandler.MouseHandler_instance);
var0.removeFocusListener(MouseHandler.MouseHandler_instance);

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

@@ -104,12 +104,24 @@ public class Coord {
return this.toString(",");
}
public String aah() {
return this.toString(",");
}
public String aae() {
return this.toString(",");
}
public String aak() {
return this.toString(",");
}
@ObfuscatedName("i")
@ObfuscatedSignature(
signature = "(I)V",
garbageValue = "-2118719705"
)
static void method3976() {
static void method3964() {
Login.worldSelectOpen = false;
WorldMapID.leftTitleSprite.drawAt(Login.xPadding, 0);
class51.rightTitleSprite.drawAt(Login.xPadding + 382, 0);

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

@@ -171,7 +171,7 @@ public class Decimator {
signature = "(I)V",
garbageValue = "851552801"
)
static final void method2500() {
static final void method2496() {
PacketBuffer var0 = Client.packetWriter.packetBuffer;
var0.importIndex();
int var1 = var0.readBits(8);
@@ -207,7 +207,7 @@ public class Decimator {
Client.npcIndices[++Client.npcCount - 1] = var3;
var4.npcCycle = Client.cycle;
var7 = var0.readBits(3);
var4.method2048(var7, (byte)1);
var4.method2044(var7, (byte)1);
var8 = var0.readBits(1);
if (var8 == 1) {
Client.field681[++Client.field633 - 1] = var3;
@@ -216,9 +216,9 @@ public class Decimator {
Client.npcIndices[++Client.npcCount - 1] = var3;
var4.npcCycle = Client.cycle;
var7 = var0.readBits(3);
var4.method2048(var7, (byte)2);
var4.method2044(var7, (byte)2);
var8 = var0.readBits(3);
var4.method2048(var8, (byte)2);
var4.method2044(var8, (byte)2);
int var9 = var0.readBits(1);
if (var9 == 1) {
Client.field681[++Client.field633 - 1] = var3;

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

@@ -114,7 +114,7 @@ public final class DemotingHashTable {
this.removeWrapper(var5);
if (this.field1944 != null) {
this.field1944.method3302(var5.get());
this.field1944.method3298(var5.get());
}
}

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

@@ -137,7 +137,7 @@ public class DesktopPlatformInfoProvider implements PlatformInfoProvider {
var8 = 4;
}
this.method6239(var5);
this.method6216(var5);
Runtime.getRuntime();
int var10 = (int)((long)((new Random()).nextInt(31457280) + 230686720) / 1048576L) + 1;
int var11;
@@ -163,11 +163,11 @@ public class DesktopPlatformInfoProvider implements PlatformInfoProvider {
signature = "(Ljava/lang/String;I)V",
garbageValue = "-611564637"
)
void method6239(String var1) {
void method6216(String var1) {
if (var1.startsWith("1.")) {
this.method6232(var1);
this.method6209(var1);
} else {
this.method6233(var1);
this.method6210(var1);
}
}
@@ -177,7 +177,7 @@ public class DesktopPlatformInfoProvider implements PlatformInfoProvider {
signature = "(Ljava/lang/String;I)V",
garbageValue = "1764264863"
)
void method6232(String var1) {
void method6209(String var1) {
String[] var2 = var1.split("\\.");
try {
@@ -195,7 +195,7 @@ public class DesktopPlatformInfoProvider implements PlatformInfoProvider {
signature = "(Ljava/lang/String;I)V",
garbageValue = "-775775529"
)
void method6233(String var1) {
void method6210(String var1) {
String[] var2 = var1.split("\\.");
try {

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

@@ -63,7 +63,7 @@ public class DevicePcmPlayer extends PcmPlayer {
var4 += var4 >>> 16;
int var3 = var4 & 255;
if (var3 != 1) {
this.open(Timer.method4935(var1));
this.open(Timer.method4923(var1));
} else {
this.line = null;
throw var5;

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

@@ -88,10 +88,10 @@ public class DevicePcmPlayerProvider implements PcmPlayerProvider {
int var22 = var1 - var16;
int var23 = var7 + var1 - var16;
int var24 = var15 + var7 + var1;
Rasterizer3D.method2972(var17, var18, var19);
Rasterizer3D.method2975(var21, var22, var23, var17, var18, var19, var4);
Rasterizer3D.method2972(var17, var19, var20);
Rasterizer3D.method2975(var21, var23, var24, var17, var19, var20, var4);
Rasterizer3D.method2968(var17, var18, var19);
Rasterizer3D.method2971(var21, var22, var23, var17, var18, var19, var4);
Rasterizer3D.method2968(var17, var19, var20);
Rasterizer3D.method2971(var21, var23, var24, var17, var19, var20, var4);
}
}
}

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

@@ -50,7 +50,7 @@ public class DirectByteArrayCopier extends AbstractByteArrayCopier {
signature = "(ZI)V",
garbageValue = "-2052817052"
)
public static void method3924(boolean var0) {
public static void method3915(boolean var0) {
if (NetCache.NetCache_socket != null) {
try {
Buffer var1 = new Buffer(4);

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

@@ -198,7 +198,7 @@ public class DynamicObject extends Entity {
signature = "(I)V",
garbageValue = "274251023"
)
static final void method2223() {
static final void method2219() {
Client.packetWriter.close();
WorldMapIcon_1.method314();
PacketWriter.scene.clear();
@@ -217,7 +217,7 @@ public class DynamicObject extends Entity {
MusicPatchNode2.field2382 = 2;
Client.field666 = -1;
Client.field759 = false;
ClientPacket.method3581();
ClientPacket.method3575();
MouseRecorder.updateGameState(10);
}
@@ -226,14 +226,14 @@ public class DynamicObject extends Entity {
signature = "(I)V",
garbageValue = "652940971"
)
static final void method2225() {
static final void method2221() {
for (Projectile var0 = (Projectile)Client.projectiles.last(); var0 != null; var0 = (Projectile)Client.projectiles.previous()) {
if (var0.plane == WorldMapRectangle.plane && Client.cycle <= var0.cycleEnd) {
if (Client.cycle >= var0.cycleStart) {
if (var0.targetIndex > 0) {
NPC var1 = Client.npcs[var0.targetIndex - 1];
if (var1 != null && var1.x >= 0 && var1.x < 13312 && var1.y >= 0 && var1.y < 13312) {
var0.setDestination(var1.x, var1.y, MusicPatchPcmStream.getTileHeight(var1.x, var1.y, var0.plane) - var0.endHeight, Client.cycle);
if (var1 != null && var1.x >= 0 && var1.x < 13312 && var1.y * 682054857 >= 0 && var1.y * 682054857 < 13312) {
var0.setDestination(var1.x, var1.y * 682054857, MusicPatchPcmStream.getTileHeight(var1.x, var1.y * 682054857, var0.plane) - var0.endHeight, Client.cycle);
}
}
@@ -246,8 +246,8 @@ public class DynamicObject extends Entity {
var3 = Client.players[var2];
}
if (var3 != null && var3.x >= 0 && var3.x < 13312 && var3.y >= 0 && var3.y < 13312) {
var0.setDestination(var3.x, var3.y, MusicPatchPcmStream.getTileHeight(var3.x, var3.y, var0.plane) - var0.endHeight, Client.cycle);
if (var3 != null && var3.x >= 0 && var3.x < 13312 && var3.y * 682054857 >= 0 && var3.y * 682054857 < 13312) {
var0.setDestination(var3.x, var3.y * 682054857, MusicPatchPcmStream.getTileHeight(var3.x, var3.y * 682054857, var0.plane) - var0.endHeight, Client.cycle);
}
}

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

@@ -117,7 +117,7 @@ public abstract class Entity extends DualNode {
signature = "(I)Ljava/lang/String;",
garbageValue = "67381036"
)
static String method3225() {
static String method3221() {
String var0 = "";
Message var2;
@@ -133,15 +133,15 @@ public abstract class Entity extends DualNode {
signature = "(ILcu;ZI)I",
garbageValue = "160012965"
)
static int method3216(int var0, Script var1, boolean var2) {
static int method3212(int var0, Script var1, boolean var2) {
if (var0 == ScriptOpcodes.VIEWPORT_SETFOV) {
Interpreter.Interpreter_intStackSize -= 2;
Client.field880 = (short)PlayerAppearance.method3978(Interpreter.Interpreter_intStack[Interpreter.Interpreter_intStackSize]);
Client.field880 = (short)PlayerAppearance.method3966(Interpreter.Interpreter_intStack[Interpreter.Interpreter_intStackSize]);
if (Client.field880 <= 0) {
Client.field880 = 256;
}
Client.field887 = (short)PlayerAppearance.method3978(Interpreter.Interpreter_intStack[Interpreter.Interpreter_intStackSize + 1]);
Client.field887 = (short)PlayerAppearance.method3966(Interpreter.Interpreter_intStack[Interpreter.Interpreter_intStackSize + 1]);
if (Client.field887 <= 0) {
Client.field887 = 256;
}
@@ -203,8 +203,8 @@ public abstract class Entity extends DualNode {
Interpreter.Interpreter_intStack[++Interpreter.Interpreter_intStackSize - 1] = Client.zoomWidth;
return 1;
} else if (var0 == ScriptOpcodes.VIEWPORT_GETFOV) {
Interpreter.Interpreter_intStack[++Interpreter.Interpreter_intStackSize - 1] = class219.method4081(Client.field880);
Interpreter.Interpreter_intStack[++Interpreter.Interpreter_intStackSize - 1] = class219.method4081(Client.field887);
Interpreter.Interpreter_intStack[++Interpreter.Interpreter_intStackSize - 1] = class219.method4069(Client.field880);
Interpreter.Interpreter_intStack[++Interpreter.Interpreter_intStackSize - 1] = class219.method4069(Client.field887);
return 1;
} else if (var0 == 6220) {
Interpreter.Interpreter_intStack[++Interpreter.Interpreter_intStackSize - 1] = 0;

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

@@ -137,7 +137,7 @@ public class EnumDefinition extends DualNode {
signature = "(Ljava/lang/String;B)V",
garbageValue = "54"
)
static final void method4508(String var0) {
static final void method4496(String var0) {
class210.addGameMessage(30, "", var0);
}
}

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

@@ -88,7 +88,7 @@ public class FaceNormal {
signature = "(Lho;II)Ljava/lang/String;",
garbageValue = "-1147965976"
)
static String method3228(Widget var0, int var1) {
static String method3224(Widget var0, int var1) {
int var3 = class2.getWidgetClickMask(var0);
boolean var2 = (var3 >> var1 + 1 & 1) != 0;
if (!var2 && var0.onOp == null) {
@@ -103,7 +103,7 @@ public class FaceNormal {
signature = "(Ljava/lang/String;ZB)Ljava/lang/String;",
garbageValue = "17"
)
static String method3229(String var0, boolean var1) {
static String method3225(String var0, boolean var1) {
String var2 = var1 ? "https://" : "http://";
if (Client.gameBuild == 1) {
var0 = var0 + "-wtrc";

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

@@ -57,7 +57,7 @@ public enum FillMode implements Enumerated {
signature = "(I)Llf;",
garbageValue = "1508787563"
)
static Sprite method6030() {
static Sprite method6007() {
Sprite var0 = new Sprite();
var0.width = class325.SpriteBuffer_spriteWidth;
var0.height = Frames.SpriteBuffer_spriteHeight;

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

@@ -58,7 +58,7 @@ public final class FloorDecoration {
signature = "(II)Lhs;",
garbageValue = "-1156266256"
)
public static ServerBuild method2841(int var0) {
public static ServerBuild method2837(int var0) {
ServerBuild[] var1 = new ServerBuild[]{ServerBuild.BUILDLIVE, ServerBuild.LIVE, ServerBuild.RC, ServerBuild.WIP};
ServerBuild[] var2 = var1;
@@ -91,7 +91,7 @@ public final class FloorDecoration {
int var15 = (int)(Math.sin(var12) * (double)var14);
int var16 = (int)(Math.cos(var12) * (double)var14);
byte var17 = 20;
PendingSpawn.redHintArrowSprite.method6090(var15 + (var0 + var5.width / 2 - var17 / 2), var5.height / 2 + var1 - var17 / 2 - var16 - 10, var17, var17, 15, 15, var12, 256);
PendingSpawn.redHintArrowSprite.method6067(var15 + (var0 + var5.width / 2 - var17 / 2), var5.height / 2 + var1 - var17 / 2 - var16 - 10, var17, var17, 15, 15, var12, 256);
} else {
class208.drawSpriteOnMinimap(var0, var1, var2, var3, var4, var5);
}

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

@@ -218,7 +218,7 @@ public class FloorOverlayDefinition extends DualNode {
signature = "([Ljava/lang/CharSequence;III)Ljava/lang/String;",
garbageValue = "137024567"
)
public static String method4716(CharSequence[] var0, int var1, int var2) {
public static String method4704(CharSequence[] var0, int var1, int var2) {
if (var2 == 0) {
return "";
} else if (var2 == 1) {

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

@@ -180,7 +180,7 @@ public class FloorUnderlayDefinition extends DualNode {
signature = "(B)[Lcn;",
garbageValue = "126"
)
static AttackOption[] method4395() {
static AttackOption[] method4383() {
return new AttackOption[]{AttackOption.AttackOption_hidden, AttackOption.AttackOption_leftClickWhereAvailable, AttackOption.AttackOption_alwaysRightClick, AttackOption.AttackOption_dependsOnCombatLevels};
}

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

@@ -74,7 +74,7 @@ public class FontName {
signature = "(B)[Lko;",
garbageValue = "-88"
)
public static FontName[] method5272() {
public static FontName[] method5257() {
return new FontName[]{FontName_verdana13, FontName_bold12, FontName_verdana11, FontName_plain12, FontName_verdana15, FontName_plain11};
}
@@ -83,7 +83,7 @@ public class FontName {
signature = "(B)V",
garbageValue = "14"
)
static void method5266() {
static void method5251() {
ItemContainer.itemContainers = new NodeHashTable(32);
}
@@ -92,7 +92,7 @@ public class FontName {
signature = "(ILcu;ZI)I",
garbageValue = "-1537038267"
)
static int method5271(int var0, Script var1, boolean var2) {
static int method5256(int var0, Script var1, boolean var2) {
Widget var3 = var2 ? GrandExchangeOfferAgeComparator.field76 : KitDefinition.field3252;
if (var0 == ScriptOpcodes.CC_GETX) {
Interpreter.Interpreter_intStack[++Interpreter.Interpreter_intStackSize - 1] = var3.x;
@@ -142,7 +142,7 @@ public class FontName {
WorldMapSectionType.invalidateWidget(var5);
}
SecureRandomFuture.method2138();
SecureRandomFuture.method2134();
if (Client.rootInterface != -1) {
class40.runIntfCloseListeners(Client.rootInterface, 1);
}

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

@@ -52,7 +52,7 @@ public class Fonts {
String var9 = var5.name;
int var10 = var7.getGroupId(var9);
int var11 = var7.getFileId(var10, "");
Font var6 = ClanMate.method4976(var7, var8, var10, var11);
Font var6 = ClanMate.method4964(var7, var8, var10, var11);
if (var6 != null) {
this.map.put(var5, var6);
var2.put(var5, var6);
@@ -68,7 +68,7 @@ public class Fonts {
signature = "(II)Lkc;",
garbageValue = "202775938"
)
public static PrivateChatMode method5273(int var0) {
public static PrivateChatMode method5258(int var0) {
PrivateChatMode[] var1 = BZip2State.ChatMode_values();
for (int var2 = 0; var2 < var1.length; ++var2) {

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

@@ -61,7 +61,7 @@ public class Friend extends Buddy {
signature = "(I)V",
garbageValue = "530220947"
)
static void method5148() {
static void method5133() {
Tiles.field501 = null;
Tiles.field483 = null;
DevicePcmPlayerProvider.field393 = null;
@@ -84,7 +84,7 @@ public class Friend extends Buddy {
@Export("drawEntities")
static final void drawEntities(int var0, int var1, int var2, int var3) {
++Client.viewportDrawCount;
if (class223.localPlayer.x >> 7 == Client.destinationX && class223.localPlayer.y >> 7 == Client.destinationY) {
if (class223.localPlayer.x >> 7 == Client.destinationX && class223.localPlayer.y * 682054857 >> 7 == Client.destinationY) {
Client.destinationX = 0;
}
@@ -92,11 +92,11 @@ public class Friend extends Buddy {
Players.addPlayerToScene(class223.localPlayer, false);
}
UrlRequest.method3279();
UrlRequest.method3275();
class4.addNpcsToScene(true);
Login.method2114();
Login.method2110();
class4.addNpcsToScene(false);
DynamicObject.method2225();
DynamicObject.method2221();
for (GraphicsObject var4 = (GraphicsObject)Client.graphicsObjects.last(); var4 != null; var4 = (GraphicsObject)Client.graphicsObjects.previous()) {
if (var4.plane == WorldMapRectangle.plane && !var4.isFinished) {
@@ -138,10 +138,10 @@ public class Friend extends Buddy {
var5 = Client.camAngleY & 2047;
var6 = ObjectSound.oculusOrbFocalPointX;
var7 = ModelData0.field1840;
var7 = ModelData0.field1840 * -1351160427;
var8 = class14.oculusOrbFocalPointY;
var11 = var15 * 3 + 600;
NPCDefinition.method4677(var6, var7, var8, var15, var5, var11, var3);
NPCDefinition.method4665(var6, var7, var8, var15, var5, var11, var3);
}
int var9;
@@ -161,7 +161,7 @@ public class Friend extends Buddy {
var8 = class14.oculusOrbFocalPointY >> 7;
} else {
var7 = class223.localPlayer.x >> 7;
var8 = class223.localPlayer.y >> 7;
var8 = class223.localPlayer.y * 682054857 >> 7;
}
var9 = GrandExchangeOfferOwnWorldComparator.cameraX >> 7;
@@ -253,8 +253,8 @@ public class Friend extends Buddy {
}
}
if (class223.localPlayer.x >= 0 && class223.localPlayer.y >= 0 && class223.localPlayer.x < 13312 && class223.localPlayer.y < 13312) {
if ((Tiles.Tiles_renderFlags[WorldMapRectangle.plane][class223.localPlayer.x >> 7][class223.localPlayer.y >> 7] & 4) != 0) {
if (class223.localPlayer.x >= 0 && class223.localPlayer.y * 682054857 >= 0 && class223.localPlayer.x < 13312 && class223.localPlayer.y * 682054857 < 13312) {
if ((Tiles.Tiles_renderFlags[WorldMapRectangle.plane][class223.localPlayer.x >> 7][class223.localPlayer.y * 682054857 >> 7] & 4) != 0) {
var6 = WorldMapRectangle.plane;
}
@@ -318,7 +318,7 @@ public class Friend extends Buddy {
if (var10 >= var0 && var10 < var0 + var2 && var11 >= var1 && var11 < var3 + var1) {
WorldMapSection1.method582(var10 - var0, var11 - var1);
} else {
MenuAction.method2066();
MenuAction.method2062();
}
WorldMapID.playPcmPlayers();
@@ -330,12 +330,12 @@ public class Friend extends Buddy {
Rasterizer3D.Rasterizer3D_zoom = var12;
WorldMapID.playPcmPlayers();
PacketWriter.scene.clearTempGameObjects();
ViewportMouse.method2954(var0, var1, var2, var3);
ViewportMouse.method2950(var0, var1, var2, var3);
Message.method1231(var0, var1);
((TextureProvider)Rasterizer3D.Rasterizer3D_textureLoader).animate(Client.field698);
Client.field634 = 0;
var13 = class223.baseX * 64 + (class223.localPlayer.x >> 7);
var14 = class286.baseY * 64 + (class223.localPlayer.y >> 7);
var14 = class286.baseY * 64 + (class223.localPlayer.y * 682054857 >> 7);
if (var13 >= 3053 && var13 <= 3156 && var14 >= 3056 && var14 <= 3136) {
Client.field634 = 1;
}

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

@@ -43,7 +43,7 @@ public class FriendLoginUpdate extends Link {
signature = "(ILcu;ZS)I",
garbageValue = "-14883"
)
static int method5193(int var0, Script var1, boolean var2) {
static int method5178(int var0, Script var1, boolean var2) {
Widget var3;
if (var0 >= 2000) {
var0 -= 1000;

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

@@ -52,7 +52,7 @@ public class FriendSystem {
signature = "(I)Z",
garbageValue = "-537546182"
)
boolean method1863() {
boolean method1859() {
return this.field1052 == 2;
}
@@ -61,7 +61,7 @@ public class FriendSystem {
signature = "(I)V",
garbageValue = "-1827488115"
)
final void method1864() {
final void method1860() {
this.field1052 = 1;
}

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

@@ -29,7 +29,7 @@ import net.runelite.mapping.ObfuscatedSignature;
public abstract class GameShell extends Applet implements Runnable, FocusListener, WindowListener {
@ObfuscatedName("rx")
@ObfuscatedGetter(
intValue = 1980034688
intValue = 41369600
)
static int field455;
@ObfuscatedName("z")
@@ -307,7 +307,7 @@ public abstract class GameShell extends Applet implements Runnable, FocusListene
)
@Export("setUpKeyboard")
protected final void setUpKeyboard() {
Skills.method4088();
Skills.method4076();
java.awt.Canvas var1 = this.canvas;
var1.setFocusTraversalKeysEnabled(false);
var1.addKeyListener(KeyHandler.KeyHandler_instance);
@@ -422,8 +422,8 @@ public abstract class GameShell extends Applet implements Runnable, FocusListene
)
@Export("replaceCanvas")
final void replaceCanvas() {
class83.method2069(this.canvas);
CollisionMap.method3544(this.canvas);
class83.method2065(this.canvas);
CollisionMap.method3538(this.canvas);
if (this.mouseWheelHandler != null) {
this.mouseWheelHandler.removeFrom(this.canvas);
}
@@ -1018,13 +1018,13 @@ public abstract class GameShell extends Applet implements Runnable, FocusListene
int var6 = (var3 - 32 - var5) * var2 / (var4 - var3);
Rasterizer2D.Rasterizer2D_fillRectangle(var0, var6 + var1 + 16, 16, var5, Client.field700);
Rasterizer2D.method5960(var0, var6 + var1 + 16, var5, Client.field702);
Rasterizer2D.method5960(var0 + 1, var6 + var1 + 16, var5, Client.field702);
Rasterizer2D.method5958(var0, var6 + var1 + 16, 16, Client.field702);
Rasterizer2D.method5958(var0, var6 + var1 + 17, 16, Client.field702);
Rasterizer2D.method5960(var0 + 15, var6 + var1 + 16, var5, Client.field701);
Rasterizer2D.method5960(var0 + 14, var6 + var1 + 17, var5 - 1, Client.field701);
Rasterizer2D.method5958(var0, var6 + var5 + var1 + 15, 16, Client.field701);
Rasterizer2D.method5958(var0 + 1, var5 + var6 + var1 + 14, 15, Client.field701);
Rasterizer2D.Rasterizer2D_drawVerticalLine(var0, var6 + var1 + 16, var5, Client.field702);
Rasterizer2D.Rasterizer2D_drawVerticalLine(var0 + 1, var6 + var1 + 16, var5, Client.field702);
Rasterizer2D.Rasterizer2D_drawHorizontalLine(var0, var6 + var1 + 16, 16, Client.field702);
Rasterizer2D.Rasterizer2D_drawHorizontalLine(var0, var6 + var1 + 17, 16, Client.field702);
Rasterizer2D.Rasterizer2D_drawVerticalLine(var0 + 15, var6 + var1 + 16, var5, Client.field701);
Rasterizer2D.Rasterizer2D_drawVerticalLine(var0 + 14, var6 + var1 + 17, var5 - 1, Client.field701);
Rasterizer2D.Rasterizer2D_drawHorizontalLine(var0, var6 + var5 + var1 + 15, 16, Client.field701);
Rasterizer2D.Rasterizer2D_drawHorizontalLine(var0 + 1, var5 + var6 + var1 + 14, 15, Client.field701);
}
}

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

@@ -95,7 +95,7 @@ public class GrandExchangeEvents {
garbageValue = "91"
)
static Widget method81(Widget var0) {
int var1 = UserComparator9.method3359(class2.getWidgetClickMask(var0));
int var1 = UserComparator9.method3355(class2.getWidgetClickMask(var0));
if (var1 == 0) {
return null;
} else {

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

@@ -64,7 +64,7 @@ final class GrandExchangeOfferAgeComparator implements Comparator {
} else {
long var1;
try {
URL var3 = new URL(FaceNormal.method3229("services", false) + "m=accountappeal/login.ws");
URL var3 = new URL(FaceNormal.method3225("services", false) + "m=accountappeal/login.ws");
URLConnection var4 = var3.openConnection();
var4.setRequestProperty("connection", "close");
var4.setDoInput(true);
@@ -179,7 +179,7 @@ final class GrandExchangeOfferAgeComparator implements Comparator {
byte var43;
try {
URL var17 = new URL(FaceNormal.method3229("services", false) + "m=accountappeal/login.ws");
URL var17 = new URL(FaceNormal.method3225("services", false) + "m=accountappeal/login.ws");
URLConnection var18 = var17.openConnection();
var18.setDoInput(true);
var18.setDoOutput(true);
@@ -382,7 +382,7 @@ final class GrandExchangeOfferAgeComparator implements Comparator {
ObjectSound var22 = new ObjectSound();
var22.plane = var0;
var22.x = var1 * 128;
var22.y = var2 * 16384;
var22.y = var2 * 128;
var23 = var8.sizeX;
var24 = var8.sizeY;
if (var4 == 1 || var4 == 3) {
@@ -390,8 +390,8 @@ final class GrandExchangeOfferAgeComparator implements Comparator {
var24 = var8.sizeX;
}
var22.field1059 = (var23 + var1) * 16384;
var22.field1060 = (var24 + var2) * 16384;
var22.field1059 = (var23 + var1) * 128;
var22.field1060 = (var24 + var2) * 128;
var22.soundEffectId = var8.ambientSoundId;
var22.field1061 = var8.int4 * 128;
var22.field1064 = var8.int5;
@@ -432,7 +432,7 @@ final class GrandExchangeOfferAgeComparator implements Comparator {
var34 = new DynamicObject(var3, var5, var4, var0, var1, var2, var8.animationId, true, (Entity)null);
}
var6.method3056(var0, var1, var2, var16, 1, 1, (Entity)var34, 0, var19, var21);
var6.method3052(var0, var1, var2, var16, 1, 1, (Entity)var34, 0, var19, var21);
if (var5 >= 12 && var5 <= 17 && var5 != 13 && var0 > 0) {
var10000 = Tiles.field488[var0][var1];
var10000[var2] |= 2340;
@@ -493,11 +493,11 @@ final class GrandExchangeOfferAgeComparator implements Comparator {
}
if (var8.interactType != 0 && var7 != null) {
var7.method3508(var1, var2, var5, var4, var8.boolean1);
var7.method3502(var1, var2, var5, var4, var8.boolean1);
}
if (var8.int2 != 16) {
var6.method3127(var0, var1, var2, var8.int2);
var6.method3123(var0, var1, var2, var8.int2);
}
} else if (var5 == 1) {
@@ -521,7 +521,7 @@ final class GrandExchangeOfferAgeComparator implements Comparator {
}
if (var8.interactType != 0 && var7 != null) {
var7.method3508(var1, var2, var5, var4, var8.boolean1);
var7.method3502(var1, var2, var5, var4, var8.boolean1);
}
} else {
@@ -564,11 +564,11 @@ final class GrandExchangeOfferAgeComparator implements Comparator {
}
if (var8.interactType != 0 && var7 != null) {
var7.method3508(var1, var2, var5, var4, var8.boolean1);
var7.method3502(var1, var2, var5, var4, var8.boolean1);
}
if (var8.int2 != 16) {
var6.method3127(var0, var1, var2, var8.int2);
var6.method3123(var0, var1, var2, var8.int2);
}
} else if (var5 == 3) {
@@ -592,7 +592,7 @@ final class GrandExchangeOfferAgeComparator implements Comparator {
}
if (var8.interactType != 0 && var7 != null) {
var7.method3508(var1, var2, var5, var4, var8.boolean1);
var7.method3502(var1, var2, var5, var4, var8.boolean1);
}
} else if (var5 == 9) {
@@ -602,13 +602,13 @@ final class GrandExchangeOfferAgeComparator implements Comparator {
var34 = new DynamicObject(var3, var5, var4, var0, var1, var2, var8.animationId, true, (Entity)null);
}
var6.method3056(var0, var1, var2, var16, 1, 1, (Entity)var34, 0, var19, var21);
var6.method3052(var0, var1, var2, var16, 1, 1, (Entity)var34, 0, var19, var21);
if (var8.interactType != 0 && var7 != null) {
var7.addGameObject(var1, var2, var9, var10, var8.boolean1);
}
if (var8.int2 != 16) {
var6.method3127(var0, var1, var2, var8.int2);
var6.method3123(var0, var1, var2, var8.int2);
}
} else if (var5 == 4) {
@@ -687,10 +687,10 @@ final class GrandExchangeOfferAgeComparator implements Comparator {
var34 = new DynamicObject(var3, 10, var4, var0, var1, var2, var8.animationId, true, (Entity)null);
}
if (var34 != null && var6.method3056(var0, var1, var2, var16, var9, var10, (Entity)var34, var5 == 11 ? 256 : 0, var19, var21) && var8.clipped) {
if (var34 != null && var6.method3052(var0, var1, var2, var16, var9, var10, (Entity)var34, var5 == 11 ? 256 : 0, var19, var21) && var8.clipped) {
var23 = 15;
if (var34 instanceof Model) {
var23 = ((Model)var34).method2859() / 4;
var23 = ((Model)var34).method2855() / 4;
if (var23 > 30) {
var23 = 30;
}

80
runescape-client/src/main/java/GrandExchangeOfferTotalQuantityComparator.java
View File

@@ -111,15 +111,15 @@ final class GrandExchangeOfferTotalQuantityComparator implements Comparator {
var5 = var4 >> 2;
var6 = var4 & 3;
var7 = Client.field697[var5];
var8 = var1.method5471();
var8 = var1.method5456();
var9 = (var8 >> 4 & 7) + class40.field326;
var10 = (var8 & 7) + WorldMapSection2.field195;
byte var11 = var1.method5474();
var12 = var1.method5480();
var13 = var1.method5479();
byte var11 = var1.method5459();
var12 = var1.method5465();
var13 = var1.method5464();
var14 = var1.readUnsignedShort();
int var15 = var1.method5480();
byte var16 = var1.method5473();
int var15 = var1.method5465();
byte var16 = var1.method5458();
Player var17;
if (var15 == Client.localPlayerIndex) {
var17 = class223.localPlayer;
@@ -181,8 +181,8 @@ final class GrandExchangeOfferTotalQuantityComparator implements Comparator {
int var38;
int var40;
if (class185.field2302 == var0) {
var37 = var1.method5480();
var38 = var1.method5471();
var37 = var1.method5465();
var38 = var1.method5456();
var4 = (var38 >> 4 & 7) + class40.field326;
var5 = (var38 & 7) + WorldMapSection2.field195;
var6 = var1.readUnsignedByte();
@@ -191,7 +191,7 @@ final class GrandExchangeOfferTotalQuantityComparator implements Comparator {
var9 = Client.field697[var7];
if (var4 >= 0 && var5 >= 0 && var4 < 103 && var5 < 103) {
if (var9 == 0) {
BoundaryObject var31 = PacketWriter.scene.method3068(WorldMapRectangle.plane, var4, var5);
BoundaryObject var31 = PacketWriter.scene.method3064(WorldMapRectangle.plane, var4, var5);
if (var31 != null) {
var40 = class81.Entity_unpackID(var31.tag);
if (var7 == 2) {
@@ -204,7 +204,7 @@ final class GrandExchangeOfferTotalQuantityComparator implements Comparator {
}
if (var9 == 1) {
WallDecoration var42 = PacketWriter.scene.method3069(WorldMapRectangle.plane, var4, var5);
WallDecoration var42 = PacketWriter.scene.method3065(WorldMapRectangle.plane, var4, var5);
if (var42 != null) {
var40 = class81.Entity_unpackID(var42.tag);
if (var7 != 4 && var7 != 5) {
@@ -223,7 +223,7 @@ final class GrandExchangeOfferTotalQuantityComparator implements Comparator {
}
if (var9 == 2) {
GameObject var43 = PacketWriter.scene.method3070(WorldMapRectangle.plane, var4, var5);
GameObject var43 = PacketWriter.scene.method3066(WorldMapRectangle.plane, var4, var5);
if (var7 == 11) {
var7 = 10;
}
@@ -244,10 +244,10 @@ final class GrandExchangeOfferTotalQuantityComparator implements Comparator {
} else {
TileItem var33;
if (class185.field2304 == var0) {
var37 = var1.method5470();
var37 = var1.method5455();
var38 = (var37 >> 4 & 7) + class40.field326;
var4 = (var37 & 7) + WorldMapSection2.field195;
var5 = var1.method5647();
var5 = var1.method5632();
if (var38 >= 0 && var4 >= 0 && var38 < 104 && var4 < 104) {
NodeDeque var32 = Client.groundItems[WorldMapRectangle.plane][var38][var4];
if (var32 != null) {
@@ -267,11 +267,11 @@ final class GrandExchangeOfferTotalQuantityComparator implements Comparator {
}
} else if (class185.field2296 == var0) {
var37 = var1.method5471();
var37 = var1.method5456();
var38 = var37 >> 2;
var4 = var37 & 3;
var5 = Client.field697[var38];
var6 = var1.method5470();
var6 = var1.method5455();
var7 = (var6 >> 4 & 7) + class40.field326;
var8 = (var6 & 7) + WorldMapSection2.field195;
if (var7 >= 0 && var8 >= 0 && var7 < 104 && var8 < 104) {
@@ -279,9 +279,9 @@ final class GrandExchangeOfferTotalQuantityComparator implements Comparator {
}
} else if (class185.field2297 == var0) {
var37 = var1.method5480();
var38 = var1.method5479();
var4 = var1.method5470();
var37 = var1.method5465();
var38 = var1.method5464();
var4 = var1.method5455();
var5 = (var4 >> 4 & 7) + class40.field326;
var6 = (var4 & 7) + WorldMapSection2.field195;
if (var5 >= 0 && var6 >= 0 && var5 < 104 && var6 < 104) {
@@ -298,14 +298,14 @@ final class GrandExchangeOfferTotalQuantityComparator implements Comparator {
} else {
if (class185.field2300 == var0) {
var37 = var1.method5511();
var37 = var1.method5496();
var38 = (var37 >> 4 & 7) + class40.field326;
var4 = (var37 & 7) + WorldMapSection2.field195;
var5 = var1.method5511();
var5 = var1.method5496();
var6 = var5 >> 4 & 15;
var7 = var5 & 7;
var8 = var1.readUnsignedShort();
var9 = var1.method5511();
var9 = var1.method5496();
if (var38 >= 0 && var4 >= 0 && var38 < 104 && var4 < 104) {
var10 = var6 + 1;
if (class223.localPlayer.pathX[0] >= var38 - var10 && class223.localPlayer.pathX[0] <= var10 + var38 && class223.localPlayer.pathY[0] >= var4 - var10 && class223.localPlayer.pathY[0] <= var10 + var4 && Client.field868 != 0 && var7 > 0 && Client.soundEffectCount < 50) {
@@ -324,7 +324,7 @@ final class GrandExchangeOfferTotalQuantityComparator implements Comparator {
var38 = var37 >> 2;
var4 = var37 & 3;
var5 = Client.field697[var38];
var6 = var1.method5470();
var6 = var1.method5455();
var7 = (var6 >> 4 & 7) + class40.field326;
var8 = (var6 & 7) + WorldMapSection2.field195;
var9 = var1.readUnsignedShort();
@@ -333,19 +333,19 @@ final class GrandExchangeOfferTotalQuantityComparator implements Comparator {
}
} else if (class185.field2295 == var0) {
var37 = var1.method5647();
var38 = var1.method5511();
var37 = var1.method5632();
var38 = var1.method5496();
var4 = (var38 >> 4 & 7) + class40.field326;
var5 = (var38 & 7) + WorldMapSection2.field195;
var6 = var1.method5479();
var7 = var1.method5647();
byte var39 = var1.method5475();
var9 = var1.method5511() * 4;
var6 = var1.method5464();
var7 = var1.method5632();
byte var39 = var1.method5460();
var9 = var1.method5496() * 4;
var10 = var1.readUnsignedByte();
var40 = var1.method5470();
byte var41 = var1.method5473();
var13 = var1.method5486();
var14 = var1.method5511() * 4;
var40 = var1.method5455();
byte var41 = var1.method5458();
var13 = var1.method5471();
var14 = var1.method5496() * 4;
var12 = var41 + var4;
var8 = var39 + var5;
if (var4 >= 0 && var5 >= 0 && var4 < 104 && var5 < 104 && var12 >= 0 && var8 >= 0 && var12 < 104 && var8 < 104 && var37 != 65535) {
@@ -360,12 +360,12 @@ final class GrandExchangeOfferTotalQuantityComparator implements Comparator {
} else if (class185.field2303 != var0) {
if (class185.field2301 == var0) {
var37 = var1.method5647();
var38 = var1.method5470();
var4 = var1.method5470();
var37 = var1.method5632();
var38 = var1.method5455();
var4 = var1.method5455();
var5 = (var4 >> 4 & 7) + class40.field326;
var6 = (var4 & 7) + WorldMapSection2.field195;
var7 = var1.method5479();
var7 = var1.method5464();
if (var5 >= 0 && var6 >= 0 && var5 < 104 && var6 < 104) {
var5 = var5 * 128 + 64;
var6 = var6 * 128 + 64;
@@ -375,12 +375,12 @@ final class GrandExchangeOfferTotalQuantityComparator implements Comparator {
}
} else {
var37 = var1.method5479();
var38 = var1.method5480();
var4 = var1.method5471();
var37 = var1.method5464();
var38 = var1.method5465();
var4 = var1.method5456();
var5 = (var4 >> 4 & 7) + class40.field326;
var6 = (var4 & 7) + WorldMapSection2.field195;
var7 = var1.method5480();
var7 = var1.method5465();
if (var5 >= 0 && var6 >= 0 && var5 < 104 && var6 < 104) {
NodeDeque var35 = Client.groundItems[WorldMapRectangle.plane][var5][var6];
if (var35 != null) {

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

@@ -181,7 +181,7 @@ final class GrandExchangeOfferWorldComparator implements Comparator {
Rasterizer2D.Rasterizer2D_replace(var8.pixels, 36, 32);
Rasterizer2D.Rasterizer2D_clear();
Rasterizer3D.Rasterizer3D_setClipFromRasterizer2D();
Rasterizer3D.method2992(16, 16);
Rasterizer3D.method2988(16, 16);
Rasterizer3D.field1754 = false;
if (var9.placeholderTemplate != -1) {
var20.drawTransBgAt(0, 0);
@@ -197,7 +197,7 @@ final class GrandExchangeOfferWorldComparator implements Comparator {
int var17 = var16 * Rasterizer3D.Rasterizer3D_sine[var9.xan2d] >> 16;
int var18 = var16 * Rasterizer3D.Rasterizer3D_cosine[var9.xan2d] >> 16;
var19.calculateBoundsCylinder();
var19.method2870(0, var9.yan2d, var9.zan2d, var9.xan2d, var9.offsetX2d, var19.height / 2 + var17 + var9.offsetY2d, var18 + var9.offsetY2d);
var19.method2866(0, var9.yan2d, var9.zan2d, var9.xan2d, var9.offsetX2d, var19.height / 2 + var17 + var9.offsetY2d, var18 + var9.offsetY2d);
if (var9.notedId != -1) {
var20.drawTransBgAt(0, 0);
}

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

@@ -107,17 +107,17 @@ public class GraphicsDefaults {
var3.readMedium();
break;
case 2:
this.compass = var3.method5453();
this.field3797 = var3.method5453();
this.mapScenes = var3.method5453();
this.headIconsPk = var3.method5453();
this.field3800 = var3.method5453();
this.field3796 = var3.method5453();
this.field3802 = var3.method5453();
this.field3803 = var3.method5453();
this.field3804 = var3.method5453();
this.field3807 = var3.method5453();
this.field3806 = var3.method5453();
this.compass = var3.method5438();
this.field3797 = var3.method5438();
this.mapScenes = var3.method5438();
this.headIconsPk = var3.method5438();
this.field3800 = var3.method5438();
this.field3796 = var3.method5438();
this.field3802 = var3.method5438();
this.field3803 = var3.method5438();
this.field3804 = var3.method5438();
this.field3807 = var3.method5438();
this.field3806 = var3.method5438();
}
}
}

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

@@ -101,7 +101,7 @@ public class HealthBar extends Node {
)
@Export("isEmpty")
boolean isEmpty() {
return this.updates.method4775();
return this.updates.method4763();
}
@ObfuscatedName("n")
@@ -109,7 +109,7 @@ public class HealthBar extends Node {
signature = "(Llb;III)I",
garbageValue = "-1932083268"
)
static int method2034(IterableNodeHashTable var0, int var1, int var2) {
static int method2030(IterableNodeHashTable var0, int var1, int var2) {
if (var0 == null) {
return var2;
} else {
@@ -165,7 +165,7 @@ public class HealthBar extends Node {
signature = "(Lby;I)V",
garbageValue = "1394806934"
)
static final void method2032(Actor var0) {
static final void method2028(Actor var0) {
if (var0.field976 == Client.cycle || var0.sequence == -1 || var0.sequenceDelay != 0 || var0.sequenceFrameCycle + 1 > GrandExchangeOfferUnitPriceComparator.SequenceDefinition_get(var0.sequence).frameLengths[var0.sequenceFrame]) {
int var1 = var0.field976 - var0.field948;
int var2 = Client.cycle - var0.field948;
@@ -174,7 +174,7 @@ public class HealthBar extends Node {
int var5 = var0.field972 * 128 + var0.field932 * -527978816;
int var6 = var0.field932 * -527978816 + var0.field974 * 128;
var0.x = (var2 * var5 + var3 * (var1 - var2)) / var1;
var0.y = (var6 * var2 + var4 * (var1 - var2)) / var1;
var0.y = (var6 * var2 + var4 * (var1 - var2)) / var1 * -944175751;
}
var0.field949 = 0;

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

@@ -145,9 +145,9 @@ public class HealthBarDefinition extends DualNode {
} else if (var2 == 6) {
var1.readUnsignedByte();
} else if (var2 == 7) {
this.frontSpriteID = var1.method5453();
this.frontSpriteID = var1.method5438();
} else if (var2 == 8) {
this.backSpriteID = var1.method5453();
this.backSpriteID = var1.method5438();
} else if (var2 == 11) {
this.int3 = var1.readUnsignedShort();
} else if (var2 == 14) {

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

@@ -70,7 +70,7 @@ public class HealthBarUpdate extends Node {
signature = "(I)V",
garbageValue = "146894465"
)
static final void method1769() {
static final void method1765() {
for (int var0 = 0; var0 < Client.soundEffectCount; ++var0) {
int var10002 = Client.queuedSoundEffectDelays[var0]--;
if (Client.queuedSoundEffectDelays[var0] >= -10) {
@@ -98,7 +98,7 @@ public class HealthBarUpdate extends Node {
}
int var6 = Client.soundLocations[var0] >> 8 & 255;
int var7 = var6 * 128 + 64 - class223.localPlayer.y;
int var7 = var6 * 128 + 64 - class223.localPlayer.y * 682054857;
if (var7 < 0) {
var7 = -var7;
}
@@ -152,7 +152,7 @@ public class HealthBarUpdate extends Node {
if (!var12) {
if (Client.field761 != 0 && Client.field666 != -1) {
class83.method2068(class225.archive6, Client.field666, 0, Client.field761, false);
class83.method2064(class225.archive6, Client.field666, 0, Client.field761, false);
}
Client.field759 = false;

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

@@ -172,17 +172,17 @@ public class HitSplatDefinition extends DualNode {
@Export("decodeNext")
void decodeNext(Buffer var1, int var2) {
if (var2 == 1) {
this.fontId = var1.method5453();
this.fontId = var1.method5438();
} else if (var2 == 2) {
this.textColor = var1.readMedium();
} else if (var2 == 3) {
this.field3319 = var1.method5453();
this.field3319 = var1.method5438();
} else if (var2 == 4) {
this.field3321 = var1.method5453();
this.field3321 = var1.method5438();
} else if (var2 == 5) {
this.field3332 = var1.method5453();
this.field3332 = var1.method5438();
} else if (var2 == 6) {
this.field3322 = var1.method5453();
this.field3322 = var1.method5438();
} else if (var2 == 7) {
this.field3323 = var1.readShort();
} else if (var2 == 8) {
@@ -300,7 +300,7 @@ public class HitSplatDefinition extends DualNode {
signature = "(I)Llf;",
garbageValue = "106816510"
)
public Sprite method4520() {
public Sprite method4508() {
if (this.field3319 < 0) {
return null;
} else {
@@ -323,7 +323,7 @@ public class HitSplatDefinition extends DualNode {
signature = "(I)Llf;",
garbageValue = "-123360505"
)
public Sprite method4517() {
public Sprite method4505() {
if (this.field3332 < 0) {
return null;
} else {
@@ -346,7 +346,7 @@ public class HitSplatDefinition extends DualNode {
signature = "(B)Llf;",
garbageValue = "88"
)
public Sprite method4518() {
public Sprite method4506() {
if (this.field3321 < 0) {
return null;
} else {
@@ -369,7 +369,7 @@ public class HitSplatDefinition extends DualNode {
signature = "(I)Llf;",
garbageValue = "750571201"
)
public Sprite method4542() {
public Sprite method4530() {
if (this.field3322 < 0) {
return null;
} else {
@@ -401,7 +401,7 @@ public class HitSplatDefinition extends DualNode {
if (var1 != null) {
return var1;
} else {
var1 = ClanMate.method4976(GrandExchangeOfferNameComparator.field66, HitSplatDefinition_fontsArchive, this.fontId, 0);
var1 = ClanMate.method4964(GrandExchangeOfferNameComparator.field66, HitSplatDefinition_fontsArchive, this.fontId, 0);
if (var1 != null) {
HitSplatDefinition_cachedFonts.put(var1, (long)this.fontId);
}

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

@@ -131,7 +131,7 @@ public final class IndexedSprite extends Rasterizer2D {
}
@ObfuscatedName("r")
public void method6042(int var1, int var2, int var3, int var4) {
public void method6019(int var1, int var2, int var3, int var4) {
int var5 = this.subWidth;
int var6 = this.subHeight;
int var7 = 0;

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

@@ -421,6 +421,6 @@ public class Instrument {
this.offset = var1.readUnsignedShort();
this.filter = new AudioFilter();
this.filterEnvelope = new SoundEnvelope();
this.filter.method2678(var1, this.filterEnvelope);
this.filter.method2674(var1, this.filterEnvelope);
}
}

28
runescape-client/src/main/java/InterfaceParent.java
View File

@@ -152,7 +152,7 @@ public class InterfaceParent extends Node {
static final void updateNpcs(boolean var0, PacketBuffer var1) {
Client.field640 = 0;
Client.field633 = 0;
Decimator.method2500();
Decimator.method2496();
int var2;
NPC var4;
@@ -225,7 +225,7 @@ public class InterfaceParent extends Node {
var4.readySequence = var4.definition.readySequence;
var4.turnLeftSequence = var4.definition.turnLeftSequence;
var4.turnRightSequence = var4.definition.turnRightSequence;
var4.method2042(class223.localPlayer.pathX[0] + var5, class223.localPlayer.pathY[0] + var6, var9 == 1);
var4.method2038(class223.localPlayer.pathX[0] + var5, class223.localPlayer.pathY[0] + var6, var9 == 1);
}
var1.exportIndex();
@@ -241,7 +241,7 @@ public class InterfaceParent extends Node {
var6 = -1;
}
var7 = var1.method5511();
var7 = var1.method5496();
if (var6 == var4.sequence && var6 != -1) {
var8 = GrandExchangeOfferUnitPriceComparator.SequenceDefinition_get(var6).field3517;
if (var8 == 1) {
@@ -265,7 +265,7 @@ public class InterfaceParent extends Node {
}
if ((var5 & 1) != 0) {
var6 = var1.method5471();
var6 = var1.method5456();
int var10;
int var11;
int var12;
@@ -291,15 +291,15 @@ public class InterfaceParent extends Node {
}
}
var7 = var1.method5511();
var7 = var1.method5496();
if (var7 > 0) {
for (var8 = 0; var8 < var7; ++var8) {
var9 = var1.readUShortSmart();
var10 = var1.readUShortSmart();
if (var10 != 32767) {
var11 = var1.readUShortSmart();
var12 = var1.method5471();
int var13 = var10 > 0 ? var1.method5471() : var12;
var12 = var1.method5456();
int var13 = var10 > 0 ? var1.method5456() : var12;
var4.addHealthBar(var9, Client.cycle, var10, var11, var12, var13);
} else {
var4.removeHealthBar(var9);
@@ -309,14 +309,14 @@ public class InterfaceParent extends Node {
}
if ((var5 & 2) != 0) {
var4.targetIndex = var1.method5480();
var4.targetIndex = var1.method5465();
if (var4.targetIndex == 65535) {
var4.targetIndex = -1;
}
}
if ((var5 & 32) != 0) {
var4.definition = PacketBufferNode.getNpcDefinition(var1.method5647());
var4.definition = PacketBufferNode.getNpcDefinition(var1.method5632());
var4.field932 = var4.definition.size * 772175475;
var4.field982 = var4.definition.rotation;
var4.walkSequence = var4.definition.walkSequence;
@@ -329,18 +329,18 @@ public class InterfaceParent extends Node {
}
if ((var5 & 4) != 0) {
var6 = var1.method5480();
var7 = var1.method5647();
var6 = var1.method5465();
var7 = var1.method5632();
var8 = var4.x - (var6 - class223.baseX * 64 - class223.baseX * 64) * 64;
var9 = var4.y - (var7 - class286.baseY * 64 - class286.baseY * 64) * 64;
var9 = var4.y * 682054857 - (var7 - class286.baseY * 64 - class286.baseY * 64) * 64;
if (var8 != 0 || var9 != 0) {
var4.field957 = (int)(Math.atan2((double)var8, (double)var9) * 325.949D) & 2047;
}
}
if ((var5 & 8) != 0) {
var4.spotAnimation = var1.method5647();
var6 = var1.method5561();
var4.spotAnimation = var1.method5632();
var6 = var1.method5546();
var4.heightOffset = var6 >> 16;
var4.field969 = (var6 & 65535) + Client.cycle;
var4.spotAnimationFrame = 0;

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

@@ -182,7 +182,7 @@ public class Interpreter {
signature = "(Ljava/lang/String;IB)Z",
garbageValue = "106"
)
static boolean method2025(String var0, int var1) {
static boolean method2021(String var0, int var1) {
return WorldMapID.method567(var0, var1, "openjs");
}
}

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

@@ -84,13 +84,13 @@ public class InvDefinition extends DualNode {
Client.destinationX = var0;
Client.destinationY = var1;
var8 = InterfaceParent.getPacketBufferNode(ClientPacket.field2230, Client.packetWriter.isaacCipher);
var8.packetBuffer.method5476(class223.baseX * 64 + var0);
var8.packetBuffer.method5461(class223.baseX * 64 + var0);
var8.packetBuffer.writeShort(class286.baseY * 64 + var1);
var8.packetBuffer.writeIntME(AbstractWorldMapData.selectedItemId);
var8.packetBuffer.method5630(class2.selectedItemWidget);
var8.packetBuffer.method5615(class2.selectedItemWidget);
var8.packetBuffer.writeShort(DevicePcmPlayerProvider.selectedItemSlot);
var8.packetBuffer.writeShortLE(var3);
var8.packetBuffer.method5468(KeyHandler.KeyHandler_pressedKeys[82] ? 1 : 0);
var8.packetBuffer.method5453(KeyHandler.KeyHandler_pressedKeys[82] ? 1 : 0);
Client.packetWriter.addNode(var8);
} else if (var2 == 2) {
Client.mouseCrossX = var6;
@@ -115,7 +115,7 @@ public class InvDefinition extends DualNode {
Client.destinationX = var0;
Client.destinationY = var1;
var8 = InterfaceParent.getPacketBufferNode(ClientPacket.field2235, Client.packetWriter.isaacCipher);
var8.packetBuffer.method5468(KeyHandler.KeyHandler_pressedKeys[82] ? 1 : 0);
var8.packetBuffer.method5453(KeyHandler.KeyHandler_pressedKeys[82] ? 1 : 0);
var8.packetBuffer.writeShort(var3);
var8.packetBuffer.writeIntME(class286.baseY * 64 + var1);
var8.packetBuffer.writeShortLE(class223.baseX * 64 + var0);
@@ -130,7 +130,7 @@ public class InvDefinition extends DualNode {
var8 = InterfaceParent.getPacketBufferNode(ClientPacket.field2190, Client.packetWriter.isaacCipher);
var8.packetBuffer.writeShortLE(var3);
var8.packetBuffer.writeShort(class223.baseX * 64 + var0);
var8.packetBuffer.method5461(KeyHandler.KeyHandler_pressedKeys[82] ? 1 : 0);
var8.packetBuffer.method5446(KeyHandler.KeyHandler_pressedKeys[82] ? 1 : 0);
var8.packetBuffer.writeIntME(class286.baseY * 64 + var1);
Client.packetWriter.addNode(var8);
} else if (var2 == 5) {
@@ -144,7 +144,7 @@ public class InvDefinition extends DualNode {
var8.packetBuffer.writeShort(var3);
var8.packetBuffer.writeIntME(class223.baseX * 64 + var0);
var8.packetBuffer.writeShortLE(class286.baseY * 64 + var1);
var8.packetBuffer.method5467(KeyHandler.KeyHandler_pressedKeys[82] ? 1 : 0);
var8.packetBuffer.method5452(KeyHandler.KeyHandler_pressedKeys[82] ? 1 : 0);
Client.packetWriter.addNode(var8);
} else if (var2 == 6) {
Client.mouseCrossX = var6;
@@ -155,7 +155,7 @@ public class InvDefinition extends DualNode {
Client.destinationY = var1;
var8 = InterfaceParent.getPacketBufferNode(ClientPacket.field2266, Client.packetWriter.isaacCipher);
var8.packetBuffer.writeShort(class223.baseX * 64 + var0);
var8.packetBuffer.method5468(KeyHandler.KeyHandler_pressedKeys[82] ? 1 : 0);
var8.packetBuffer.method5453(KeyHandler.KeyHandler_pressedKeys[82] ? 1 : 0);
var8.packetBuffer.writeIntME(var3);
var8.packetBuffer.writeIntME(class286.baseY * 64 + var1);
Client.packetWriter.addNode(var8);
@@ -176,7 +176,7 @@ public class InvDefinition extends DualNode {
var9.packetBuffer.writeShortLE(AbstractWorldMapData.selectedItemId);
var9.packetBuffer.writeIntME(var3);
var9.packetBuffer.writeShortLE(DevicePcmPlayerProvider.selectedItemSlot);
var9.packetBuffer.method5461(KeyHandler.KeyHandler_pressedKeys[82] ? 1 : 0);
var9.packetBuffer.method5446(KeyHandler.KeyHandler_pressedKeys[82] ? 1 : 0);
Client.packetWriter.addNode(var9);
}
} else if (var2 == 8) {
@@ -189,8 +189,8 @@ public class InvDefinition extends DualNode {
Client.destinationX = var0;
Client.destinationY = var1;
var9 = InterfaceParent.getPacketBufferNode(ClientPacket.field2260, Client.packetWriter.isaacCipher);
var9.packetBuffer.method5476(Client.selectedSpellChildIndex);
var9.packetBuffer.method5476(var3);
var9.packetBuffer.method5461(Client.selectedSpellChildIndex);
var9.packetBuffer.method5461(var3);
var9.packetBuffer.writeIntLE16(AttackOption.selectedSpellWidget);
var9.packetBuffer.writeByte(KeyHandler.KeyHandler_pressedKeys[82] ? 1 : 0);
Client.packetWriter.addNode(var9);
@@ -205,8 +205,8 @@ public class InvDefinition extends DualNode {
Client.destinationX = var0;
Client.destinationY = var1;
var9 = InterfaceParent.getPacketBufferNode(ClientPacket.field2273, Client.packetWriter.isaacCipher);
var9.packetBuffer.method5461(KeyHandler.KeyHandler_pressedKeys[82] ? 1 : 0);
var9.packetBuffer.method5476(var3);
var9.packetBuffer.method5446(KeyHandler.KeyHandler_pressedKeys[82] ? 1 : 0);
var9.packetBuffer.method5461(var3);
Client.packetWriter.addNode(var9);
}
} else if (var2 == 10) {
@@ -219,7 +219,7 @@ public class InvDefinition extends DualNode {
Client.destinationX = var0;
Client.destinationY = var1;
var9 = InterfaceParent.getPacketBufferNode(ClientPacket.field2280, Client.packetWriter.isaacCipher);
var9.packetBuffer.method5461(KeyHandler.KeyHandler_pressedKeys[82] ? 1 : 0);
var9.packetBuffer.method5446(KeyHandler.KeyHandler_pressedKeys[82] ? 1 : 0);
var9.packetBuffer.writeIntME(var3);
Client.packetWriter.addNode(var9);
}
@@ -234,7 +234,7 @@ public class InvDefinition extends DualNode {
Client.destinationY = var1;
var9 = InterfaceParent.getPacketBufferNode(ClientPacket.field2219, Client.packetWriter.isaacCipher);
var9.packetBuffer.writeByte(KeyHandler.KeyHandler_pressedKeys[82] ? 1 : 0);
var9.packetBuffer.method5476(var3);
var9.packetBuffer.method5461(var3);
Client.packetWriter.addNode(var9);
}
} else if (var2 == 12) {
@@ -248,7 +248,7 @@ public class InvDefinition extends DualNode {
Client.destinationY = var1;
var9 = InterfaceParent.getPacketBufferNode(ClientPacket.field2263, Client.packetWriter.isaacCipher);
var9.packetBuffer.writeByte(KeyHandler.KeyHandler_pressedKeys[82] ? 1 : 0);
var9.packetBuffer.method5476(var3);
var9.packetBuffer.method5461(var3);
Client.packetWriter.addNode(var9);
}
} else if (var2 == 13) {
@@ -261,8 +261,8 @@ public class InvDefinition extends DualNode {
Client.destinationX = var0;
Client.destinationY = var1;
var9 = InterfaceParent.getPacketBufferNode(ClientPacket.field2221, Client.packetWriter.isaacCipher);
var9.packetBuffer.method5461(KeyHandler.KeyHandler_pressedKeys[82] ? 1 : 0);
var9.packetBuffer.method5476(var3);
var9.packetBuffer.method5446(KeyHandler.KeyHandler_pressedKeys[82] ? 1 : 0);
var9.packetBuffer.method5461(var3);
Client.packetWriter.addNode(var9);
}
} else {
@@ -278,9 +278,9 @@ public class InvDefinition extends DualNode {
Client.destinationY = var1;
var9 = InterfaceParent.getPacketBufferNode(ClientPacket.field2243, Client.packetWriter.isaacCipher);
var9.packetBuffer.writeShortLE(var3);
var9.packetBuffer.method5630(class2.selectedItemWidget);
var9.packetBuffer.method5615(class2.selectedItemWidget);
var9.packetBuffer.writeShort(AbstractWorldMapData.selectedItemId);
var9.packetBuffer.method5476(DevicePcmPlayerProvider.selectedItemSlot);
var9.packetBuffer.method5461(DevicePcmPlayerProvider.selectedItemSlot);
var9.packetBuffer.writeByte(KeyHandler.KeyHandler_pressedKeys[82] ? 1 : 0);
Client.packetWriter.addNode(var9);
}
@@ -294,10 +294,10 @@ public class InvDefinition extends DualNode {
Client.destinationX = var0;
Client.destinationY = var1;
var9 = InterfaceParent.getPacketBufferNode(ClientPacket.field2239, Client.packetWriter.isaacCipher);
var9.packetBuffer.method5476(var3);
var9.packetBuffer.method5461(var3);
var9.packetBuffer.writeIntME(Client.selectedSpellChildIndex);
var9.packetBuffer.writeByte(KeyHandler.KeyHandler_pressedKeys[82] ? 1 : 0);
var9.packetBuffer.method5489(AttackOption.selectedSpellWidget);
var9.packetBuffer.method5474(AttackOption.selectedSpellWidget);
Client.packetWriter.addNode(var9);
}
} else if (var2 == 16) {
@@ -312,7 +312,7 @@ public class InvDefinition extends DualNode {
var8.packetBuffer.writeInt(class2.selectedItemWidget);
var8.packetBuffer.writeIntME(DevicePcmPlayerProvider.selectedItemSlot);
var8.packetBuffer.writeShortLE(class286.baseY * 64 + var1);
var8.packetBuffer.method5461(KeyHandler.KeyHandler_pressedKeys[82] ? 1 : 0);
var8.packetBuffer.method5446(KeyHandler.KeyHandler_pressedKeys[82] ? 1 : 0);
var8.packetBuffer.writeIntME(class223.baseX * 64 + var0);
var8.packetBuffer.writeIntME(AbstractWorldMapData.selectedItemId);
Client.packetWriter.addNode(var8);
@@ -328,8 +328,8 @@ public class InvDefinition extends DualNode {
var8.packetBuffer.writeIntLE16(AttackOption.selectedSpellWidget);
var8.packetBuffer.writeShortLE(var3);
var8.packetBuffer.writeIntME(Client.selectedSpellChildIndex);
var8.packetBuffer.method5476(class223.baseX * 64 + var0);
var8.packetBuffer.method5467(KeyHandler.KeyHandler_pressedKeys[82] ? 1 : 0);
var8.packetBuffer.method5461(class223.baseX * 64 + var0);
var8.packetBuffer.method5452(KeyHandler.KeyHandler_pressedKeys[82] ? 1 : 0);
Client.packetWriter.addNode(var8);
} else if (var2 == 18) {
Client.mouseCrossX = var6;
@@ -339,8 +339,8 @@ public class InvDefinition extends DualNode {
Client.destinationX = var0;
Client.destinationY = var1;
var8 = InterfaceParent.getPacketBufferNode(ClientPacket.field2277, Client.packetWriter.isaacCipher);
var8.packetBuffer.method5461(KeyHandler.KeyHandler_pressedKeys[82] ? 1 : 0);
var8.packetBuffer.method5476(class286.baseY * 64 + var1);
var8.packetBuffer.method5446(KeyHandler.KeyHandler_pressedKeys[82] ? 1 : 0);
var8.packetBuffer.method5461(class286.baseY * 64 + var1);
var8.packetBuffer.writeIntME(class223.baseX * 64 + var0);
var8.packetBuffer.writeShortLE(var3);
Client.packetWriter.addNode(var8);
@@ -352,7 +352,7 @@ public class InvDefinition extends DualNode {
Client.destinationX = var0;
Client.destinationY = var1;
var8 = InterfaceParent.getPacketBufferNode(ClientPacket.field2205, Client.packetWriter.isaacCipher);
var8.packetBuffer.method5467(KeyHandler.KeyHandler_pressedKeys[82] ? 1 : 0);
var8.packetBuffer.method5452(KeyHandler.KeyHandler_pressedKeys[82] ? 1 : 0);
var8.packetBuffer.writeIntME(class223.baseX * 64 + var0);
var8.packetBuffer.writeIntME(var3);
var8.packetBuffer.writeIntME(class286.baseY * 64 + var1);
@@ -365,10 +365,10 @@ public class InvDefinition extends DualNode {
Client.destinationX = var0;
Client.destinationY = var1;
var8 = InterfaceParent.getPacketBufferNode(ClientPacket.field2240, Client.packetWriter.isaacCipher);
var8.packetBuffer.method5468(KeyHandler.KeyHandler_pressedKeys[82] ? 1 : 0);
var8.packetBuffer.method5453(KeyHandler.KeyHandler_pressedKeys[82] ? 1 : 0);
var8.packetBuffer.writeShortLE(class223.baseX * 64 + var0);
var8.packetBuffer.writeIntME(class286.baseY * 64 + var1);
var8.packetBuffer.method5476(var3);
var8.packetBuffer.method5461(var3);
Client.packetWriter.addNode(var8);
} else if (var2 == 21) {
Client.mouseCrossX = var6;
@@ -380,7 +380,7 @@ public class InvDefinition extends DualNode {
var8 = InterfaceParent.getPacketBufferNode(ClientPacket.field2265, Client.packetWriter.isaacCipher);
var8.packetBuffer.writeShortLE(class223.baseX * 64 + var0);
var8.packetBuffer.writeIntME(class286.baseY * 64 + var1);
var8.packetBuffer.method5461(KeyHandler.KeyHandler_pressedKeys[82] ? 1 : 0);
var8.packetBuffer.method5446(KeyHandler.KeyHandler_pressedKeys[82] ? 1 : 0);
var8.packetBuffer.writeShort(var3);
Client.packetWriter.addNode(var8);
} else if (var2 == 22) {
@@ -391,10 +391,10 @@ public class InvDefinition extends DualNode {
Client.destinationX = var0;
Client.destinationY = var1;
var8 = InterfaceParent.getPacketBufferNode(ClientPacket.field2192, Client.packetWriter.isaacCipher);
var8.packetBuffer.method5476(class223.baseX * 64 + var0);
var8.packetBuffer.method5476(class286.baseY * 64 + var1);
var8.packetBuffer.method5461(class223.baseX * 64 + var0);
var8.packetBuffer.method5461(class286.baseY * 64 + var1);
var8.packetBuffer.writeShortLE(var3);
var8.packetBuffer.method5461(KeyHandler.KeyHandler_pressedKeys[82] ? 1 : 0);
var8.packetBuffer.method5446(KeyHandler.KeyHandler_pressedKeys[82] ? 1 : 0);
Client.packetWriter.addNode(var8);
} else if (var2 == 23) {
if (Client.isMenuOpen) {
@@ -424,7 +424,7 @@ public class InvDefinition extends DualNode {
class208.Widget_runOnTargetLeave();
class32.selectSpell(var1, var0, class2.method30(class2.getWidgetClickMask(var16)), var16.itemId);
Client.isItemSelected = 0;
Client.selectedSpellActionName = VerticalAlignment.method4321(var16);
Client.selectedSpellActionName = VerticalAlignment.method4309(var16);
if (Client.selectedSpellActionName == null) {
Client.selectedSpellActionName = "null";
}
@@ -452,7 +452,7 @@ public class InvDefinition extends DualNode {
if (var14.cs1Instructions != null && var14.cs1Instructions[0][0] == 5) {
var12 = var14.cs1Instructions[0][1];
Varps.Varps_main[var12] = 1 - Varps.Varps_main[var12];
NetSocket.method3472(var12);
NetSocket.method3468(var12);
}
} else if (var2 == 29) {
var8 = InterfaceParent.getPacketBufferNode(ClientPacket.field2261, Client.packetWriter.isaacCipher);
@@ -463,7 +463,7 @@ public class InvDefinition extends DualNode {
var12 = var14.cs1Instructions[0][1];
if (Varps.Varps_main[var12] != var14.cs1ComparisonValues[0]) {
Varps.Varps_main[var12] = var14.cs1ComparisonValues[0];
NetSocket.method3472(var12);
NetSocket.method3468(var12);
}
}
} else if (var2 == 30) {
@@ -474,7 +474,7 @@ public class InvDefinition extends DualNode {
}
} else if (var2 == 31) {
var8 = InterfaceParent.getPacketBufferNode(ClientPacket.field2269, Client.packetWriter.isaacCipher);
var8.packetBuffer.method5630(var1);
var8.packetBuffer.method5615(var1);
var8.packetBuffer.writeShortLE(DevicePcmPlayerProvider.selectedItemSlot);
var8.packetBuffer.writeInt(class2.selectedItemWidget);
var8.packetBuffer.writeShort(AbstractWorldMapData.selectedItemId);
@@ -487,10 +487,10 @@ public class InvDefinition extends DualNode {
} else if (var2 == 32) {
var8 = InterfaceParent.getPacketBufferNode(ClientPacket.field2246, Client.packetWriter.isaacCipher);
var8.packetBuffer.writeShortLE(Client.selectedSpellChildIndex);
var8.packetBuffer.method5476(var0);
var8.packetBuffer.method5476(var3);
var8.packetBuffer.method5630(var1);
var8.packetBuffer.method5489(AttackOption.selectedSpellWidget);
var8.packetBuffer.method5461(var0);
var8.packetBuffer.method5461(var3);
var8.packetBuffer.method5615(var1);
var8.packetBuffer.method5474(AttackOption.selectedSpellWidget);
Client.packetWriter.addNode(var8);
Client.field750 = 0;
GrandExchangeOfferOwnWorldComparator.field628 = Canvas.getWidget(var1);
@@ -498,8 +498,8 @@ public class InvDefinition extends DualNode {
} else if (var2 == 33) {
var8 = InterfaceParent.getPacketBufferNode(ClientPacket.field2211, Client.packetWriter.isaacCipher);
var8.packetBuffer.writeInt(var1);
var8.packetBuffer.method5476(var0);
var8.packetBuffer.method5476(var3);
var8.packetBuffer.method5461(var0);
var8.packetBuffer.method5461(var3);
Client.packetWriter.addNode(var8);
Client.field750 = 0;
GrandExchangeOfferOwnWorldComparator.field628 = Canvas.getWidget(var1);
@@ -507,7 +507,7 @@ public class InvDefinition extends DualNode {
} else if (var2 == 34) {
var8 = InterfaceParent.getPacketBufferNode(ClientPacket.field2255, Client.packetWriter.isaacCipher);
var8.packetBuffer.writeInt(var1);
var8.packetBuffer.method5476(var0);
var8.packetBuffer.method5461(var0);
var8.packetBuffer.writeIntME(var3);
Client.packetWriter.addNode(var8);
Client.field750 = 0;
@@ -515,7 +515,7 @@ public class InvDefinition extends DualNode {
Client.field743 = var0;
} else if (var2 == 35) {
var8 = InterfaceParent.getPacketBufferNode(ClientPacket.field2189, Client.packetWriter.isaacCipher);
var8.packetBuffer.method5476(var3);
var8.packetBuffer.method5461(var3);
var8.packetBuffer.writeIntLE16(var1);
var8.packetBuffer.writeShort(var0);
Client.packetWriter.addNode(var8);
@@ -525,8 +525,8 @@ public class InvDefinition extends DualNode {
} else if (var2 == 36) {
var8 = InterfaceParent.getPacketBufferNode(ClientPacket.field2198, Client.packetWriter.isaacCipher);
var8.packetBuffer.writeShortLE(var3);
var8.packetBuffer.method5476(var0);
var8.packetBuffer.method5630(var1);
var8.packetBuffer.method5461(var0);
var8.packetBuffer.method5615(var1);
Client.packetWriter.addNode(var8);
Client.field750 = 0;
GrandExchangeOfferOwnWorldComparator.field628 = Canvas.getWidget(var1);
@@ -534,7 +534,7 @@ public class InvDefinition extends DualNode {
} else if (var2 == 37) {
var8 = InterfaceParent.getPacketBufferNode(ClientPacket.field2247, Client.packetWriter.isaacCipher);
var8.packetBuffer.writeIntME(var0);
var8.packetBuffer.method5630(var1);
var8.packetBuffer.method5615(var1);
var8.packetBuffer.writeIntME(var3);
Client.packetWriter.addNode(var8);
Client.field750 = 0;
@@ -561,14 +561,14 @@ public class InvDefinition extends DualNode {
var8 = InterfaceParent.getPacketBufferNode(ClientPacket.field2217, Client.packetWriter.isaacCipher);
var8.packetBuffer.writeIntME(var0);
var8.packetBuffer.writeShort(var3);
var8.packetBuffer.method5489(var1);
var8.packetBuffer.method5474(var1);
Client.packetWriter.addNode(var8);
Client.field750 = 0;
GrandExchangeOfferOwnWorldComparator.field628 = Canvas.getWidget(var1);
Client.field743 = var0;
} else if (var2 == 40) {
var8 = InterfaceParent.getPacketBufferNode(ClientPacket.field2272, Client.packetWriter.isaacCipher);
var8.packetBuffer.method5630(var1);
var8.packetBuffer.method5615(var1);
var8.packetBuffer.writeIntME(var0);
var8.packetBuffer.writeShortLE(var3);
Client.packetWriter.addNode(var8);
@@ -577,9 +577,9 @@ public class InvDefinition extends DualNode {
Client.field743 = var0;
} else if (var2 == 41) {
var8 = InterfaceParent.getPacketBufferNode(ClientPacket.field2250, Client.packetWriter.isaacCipher);
var8.packetBuffer.method5476(var0);
var8.packetBuffer.method5489(var1);
var8.packetBuffer.method5476(var3);
var8.packetBuffer.method5461(var0);
var8.packetBuffer.method5474(var1);
var8.packetBuffer.method5461(var3);
Client.packetWriter.addNode(var8);
Client.field750 = 0;
GrandExchangeOfferOwnWorldComparator.field628 = Canvas.getWidget(var1);
@@ -588,7 +588,7 @@ public class InvDefinition extends DualNode {
var8 = InterfaceParent.getPacketBufferNode(ClientPacket.field2259, Client.packetWriter.isaacCipher);
var8.packetBuffer.writeShort(var3);
var8.packetBuffer.writeShort(var0);
var8.packetBuffer.method5630(var1);
var8.packetBuffer.method5615(var1);
Client.packetWriter.addNode(var8);
Client.field750 = 0;
GrandExchangeOfferOwnWorldComparator.field628 = Canvas.getWidget(var1);
@@ -596,7 +596,7 @@ public class InvDefinition extends DualNode {
} else if (var2 == 43) {
var8 = InterfaceParent.getPacketBufferNode(ClientPacket.field2282, Client.packetWriter.isaacCipher);
var8.packetBuffer.writeShort(var3);
var8.packetBuffer.method5489(var1);
var8.packetBuffer.method5474(var1);
var8.packetBuffer.writeShort(var0);
Client.packetWriter.addNode(var8);
Client.field750 = 0;
@@ -613,7 +613,7 @@ public class InvDefinition extends DualNode {
Client.destinationY = var1;
var9 = InterfaceParent.getPacketBufferNode(ClientPacket.field2231, Client.packetWriter.isaacCipher);
var9.packetBuffer.writeIntME(var3);
var9.packetBuffer.method5467(KeyHandler.KeyHandler_pressedKeys[82] ? 1 : 0);
var9.packetBuffer.method5452(KeyHandler.KeyHandler_pressedKeys[82] ? 1 : 0);
Client.packetWriter.addNode(var9);
}
} else if (var2 == 45) {
@@ -640,8 +640,8 @@ public class InvDefinition extends DualNode {
Client.destinationX = var0;
Client.destinationY = var1;
var9 = InterfaceParent.getPacketBufferNode(ClientPacket.field2206, Client.packetWriter.isaacCipher);
var9.packetBuffer.method5461(KeyHandler.KeyHandler_pressedKeys[82] ? 1 : 0);
var9.packetBuffer.method5476(var3);
var9.packetBuffer.method5446(KeyHandler.KeyHandler_pressedKeys[82] ? 1 : 0);
var9.packetBuffer.method5461(var3);
Client.packetWriter.addNode(var9);
}
} else if (var2 == 47) {
@@ -655,7 +655,7 @@ public class InvDefinition extends DualNode {
Client.destinationY = var1;
var9 = InterfaceParent.getPacketBufferNode(ClientPacket.field2271, Client.packetWriter.isaacCipher);
var9.packetBuffer.writeShortLE(var3);
var9.packetBuffer.method5468(KeyHandler.KeyHandler_pressedKeys[82] ? 1 : 0);
var9.packetBuffer.method5453(KeyHandler.KeyHandler_pressedKeys[82] ? 1 : 0);
Client.packetWriter.addNode(var9);
}
} else if (var2 == 48) {
@@ -668,8 +668,8 @@ public class InvDefinition extends DualNode {
Client.destinationX = var0;
Client.destinationY = var1;
var9 = InterfaceParent.getPacketBufferNode(ClientPacket.field2242, Client.packetWriter.isaacCipher);
var9.packetBuffer.method5468(KeyHandler.KeyHandler_pressedKeys[82] ? 1 : 0);
var9.packetBuffer.method5476(var3);
var9.packetBuffer.method5453(KeyHandler.KeyHandler_pressedKeys[82] ? 1 : 0);
var9.packetBuffer.method5461(var3);
Client.packetWriter.addNode(var9);
}
} else if (var2 == 49) {
@@ -683,7 +683,7 @@ public class InvDefinition extends DualNode {
Client.destinationY = var1;
var9 = InterfaceParent.getPacketBufferNode(ClientPacket.field2214, Client.packetWriter.isaacCipher);
var9.packetBuffer.writeShort(var3);
var9.packetBuffer.method5467(KeyHandler.KeyHandler_pressedKeys[82] ? 1 : 0);
var9.packetBuffer.method5452(KeyHandler.KeyHandler_pressedKeys[82] ? 1 : 0);
Client.packetWriter.addNode(var9);
}
} else if (var2 == 50) {
@@ -696,8 +696,8 @@ public class InvDefinition extends DualNode {
Client.destinationX = var0;
Client.destinationY = var1;
var9 = InterfaceParent.getPacketBufferNode(ClientPacket.field2274, Client.packetWriter.isaacCipher);
var9.packetBuffer.method5476(var3);
var9.packetBuffer.method5467(KeyHandler.KeyHandler_pressedKeys[82] ? 1 : 0);
var9.packetBuffer.method5461(var3);
var9.packetBuffer.method5452(KeyHandler.KeyHandler_pressedKeys[82] ? 1 : 0);
Client.packetWriter.addNode(var9);
}
} else if (var2 == 51) {
@@ -710,7 +710,7 @@ public class InvDefinition extends DualNode {
Client.destinationX = var0;
Client.destinationY = var1;
var9 = InterfaceParent.getPacketBufferNode(ClientPacket.field2262, Client.packetWriter.isaacCipher);
var9.packetBuffer.method5467(KeyHandler.KeyHandler_pressedKeys[82] ? 1 : 0);
var9.packetBuffer.method5452(KeyHandler.KeyHandler_pressedKeys[82] ? 1 : 0);
var9.packetBuffer.writeIntME(var3);
Client.packetWriter.addNode(var9);
}
@@ -721,7 +721,7 @@ public class InvDefinition extends DualNode {
var16 = GrandExchangeOfferWorldComparator.getWidgetChild(var1, var0);
if (var16 != null) {
var9 = InterfaceParent.getPacketBufferNode(ClientPacket.field2236, Client.packetWriter.isaacCipher);
var9.packetBuffer.method5630(var1);
var9.packetBuffer.method5615(var1);
var9.packetBuffer.writeShort(var16.itemId);
var9.packetBuffer.writeIntLE16(AttackOption.selectedSpellWidget);
var9.packetBuffer.writeShortLE(var0);
@@ -743,7 +743,7 @@ public class InvDefinition extends DualNode {
var8.packetBuffer.writeShort(class286.baseY * 64 + var1);
var8.packetBuffer.writeShort(class223.baseX * 64 + var0);
var8.packetBuffer.writeShort(var3);
var8.packetBuffer.method5467(KeyHandler.KeyHandler_pressedKeys[82] ? 1 : 0);
var8.packetBuffer.method5452(KeyHandler.KeyHandler_pressedKeys[82] ? 1 : 0);
Client.packetWriter.addNode(var8);
break label960;
}
@@ -754,7 +754,7 @@ public class InvDefinition extends DualNode {
Client.mouseCrossColor = 2;
Client.mouseCrossState = 0;
var8 = InterfaceParent.getPacketBufferNode(ClientPacket.field2220, Client.packetWriter.isaacCipher);
var8.packetBuffer.method5476(var3);
var8.packetBuffer.method5461(var3);
Client.packetWriter.addNode(var8);
break label960;
}
@@ -808,7 +808,7 @@ public class InvDefinition extends DualNode {
}
if (var2 != 1007) {
if (var2 == 1011 || var2 == 1008 || var2 == 1009 || var2 == 1010 || var2 == 1012) {
if (var2 == 1011 || var2 == 1010 || var2 == 1009 || var2 == 1008 || var2 == 1012) {
Tiles.worldMap.menuAction(var2, var3, new Coord(var0), new Coord(var1));
}
break label960;
@@ -848,7 +848,7 @@ public class InvDefinition extends DualNode {
signature = "(Ljava/lang/String;Lho;I)Ljava/lang/String;",
garbageValue = "-1374184738"
)
static String method4335(String var0, Widget var1) {
static String method4323(String var0, Widget var1) {
if (var0.indexOf("%") != -1) {
for (int var2 = 1; var2 <= 5; ++var2) {
while (true) {
@@ -858,7 +858,7 @@ public class InvDefinition extends DualNode {
}
String var4 = var0.substring(0, var3);
int var6 = class216.method4015(var1, var2 - 1);
int var6 = class216.method4003(var1, var2 - 1);
String var5;
if (var6 < 999999999) {
var5 = Integer.toString(var6);

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

@@ -46,7 +46,7 @@ public final class IsaacCipher {
this.results[var2] = var1[var2];
}
this.method6216();
this.method6193();
}
@ObfuscatedName("z")
@@ -69,7 +69,7 @@ public final class IsaacCipher {
signature = "(I)I",
garbageValue = "2039703989"
)
public final int method6214() {
public final int method6191() {
if (this.valuesRemaining == 0) {
this.generateMoreResults();
this.valuesRemaining = 256;
@@ -114,7 +114,7 @@ public final class IsaacCipher {
signature = "(I)V",
garbageValue = "-135595454"
)
final void method6216() {
final void method6193() {
int var9 = -1640531527;
int var8 = -1640531527;
int var7 = -1640531527;

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

@@ -244,7 +244,7 @@ public class ItemDefinition extends DualNode {
public int ambient;
@ObfuscatedName("bh")
@ObfuscatedGetter(
intValue = 1020464737
intValue = 807356389
)
@Export("contrast")
public int contrast;
@@ -471,7 +471,7 @@ public class ItemDefinition extends DualNode {
} else if (var2 == 113) {
this.ambient = var1.readByte();
} else if (var2 == 114) {
this.contrast = var1.readByte();
this.contrast = var1.readByte() * 5;
} else if (var2 == 115) {
this.team = var1.readUnsignedByte();
} else if (var2 == 139) {
@@ -674,7 +674,7 @@ public class ItemDefinition extends DualNode {
}
}
var5 = var6.toModel(this.ambient + 64, this.contrast * 5 + 768, -50, -10, -50);
var5 = var6.toModel(this.ambient + 64, this.contrast + 768, -50, -10, -50);
var5.isSingleTile = true;
ItemDefinition_cachedModels.put(var5, (long)this.id);
return var5;
@@ -747,7 +747,7 @@ public class ItemDefinition extends DualNode {
signature = "(ZB)Ldw;",
garbageValue = "22"
)
public final ModelData method4605(boolean var1) {
public final ModelData method4593(boolean var1) {
int var2 = this.maleModel;
int var3 = this.maleModel1;
int var4 = this.maleModel2;
@@ -803,7 +803,7 @@ public class ItemDefinition extends DualNode {
signature = "(ZB)Z",
garbageValue = "100"
)
public final boolean method4623(boolean var1) {
public final boolean method4611(boolean var1) {
int var2 = this.maleHeadModel;
int var3 = this.maleHeadModel2;
if (var1) {
@@ -832,7 +832,7 @@ public class ItemDefinition extends DualNode {
signature = "(ZI)Ldw;",
garbageValue = "1830989293"
)
public final ModelData method4607(boolean var1) {
public final ModelData method4595(boolean var1) {
int var2 = this.maleHeadModel;
int var3 = this.maleHeadModel2;
if (var1) {
@@ -874,7 +874,7 @@ public class ItemDefinition extends DualNode {
)
@Export("getIntParam")
public int getIntParam(int var1, int var2) {
return HealthBar.method2034(this.params, var1, var2);
return HealthBar.method2030(this.params, var1, var2);
}
@ObfuscatedName("f")
@@ -884,7 +884,7 @@ public class ItemDefinition extends DualNode {
)
@Export("getStringParam")
public String getStringParam(int var1, String var2) {
return class96.method2263(this.params, var1, var2);
return class96.method2259(this.params, var1, var2);
}
@ObfuscatedName("j")
@@ -910,7 +910,7 @@ public class ItemDefinition extends DualNode {
signature = "(B)Lbl;",
garbageValue = "66"
)
static ClientPreferences method4667() {
static ClientPreferences method4655() {
AccessFile var0 = null;
ClientPreferences var1 = new ClientPreferences();

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

@@ -73,14 +73,14 @@ public class IterableNodeDeque implements Iterable, Collection {
)
@Export("last")
public Node last() {
return this.method4796((Node)null);
return this.method4784((Node)null);
}
@ObfuscatedName("p")
@ObfuscatedSignature(
signature = "(Lfx;)Lfx;"
)
Node method4796(Node var1) {
Node method4784(Node var1) {
Node var2;
if (var1 == null) {
var2 = this.sentinel.previous;
@@ -114,7 +114,7 @@ public class IterableNodeDeque implements Iterable, Collection {
}
@ObfuscatedName("m")
int method4774() {
int method4762() {
int var1 = 0;
for (Node var2 = this.sentinel.previous; var2 != this.sentinel; var2 = var2.previous) {
@@ -125,7 +125,7 @@ public class IterableNodeDeque implements Iterable, Collection {
}
@ObfuscatedName("y")
public boolean method4775() {
public boolean method4763() {
return this.sentinel.previous == this.sentinel;
}
@@ -133,8 +133,8 @@ public class IterableNodeDeque implements Iterable, Collection {
@ObfuscatedSignature(
signature = "()[Lfx;"
)
Node[] method4819() {
Node[] var1 = new Node[this.method4774()];
Node[] method4807() {
Node[] var1 = new Node[this.method4762()];
int var2 = 0;
for (Node var3 = this.sentinel.previous; var3 != this.sentinel; var3 = var3.previous) {
@@ -148,7 +148,7 @@ public class IterableNodeDeque implements Iterable, Collection {
@ObfuscatedSignature(
signature = "(Lfx;)Z"
)
boolean method4778(Node var1) {
boolean method4766(Node var1) {
this.addFirst(var1);
return true;
}
@@ -158,11 +158,11 @@ public class IterableNodeDeque implements Iterable, Collection {
}
public int size() {
return this.method4774();
return this.method4762();
}
public boolean isEmpty() {
return this.method4775();
return this.method4763();
}
public boolean contains(Object var1) {
@@ -184,7 +184,7 @@ public class IterableNodeDeque implements Iterable, Collection {
}
public boolean add(Object var1) {
return this.method4778((Node)var1);
return this.method4766((Node)var1);
}
public boolean equals(Object var1) {
@@ -212,7 +212,7 @@ public class IterableNodeDeque implements Iterable, Collection {
}
public Object[] toArray() {
return this.method4819();
return this.method4807();
}
public boolean removeAll(Collection var1) {

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

@@ -170,7 +170,7 @@ public final class KeyHandler implements KeyListener, FocusListener {
public final void keyTyped(KeyEvent var1) {
if (KeyHandler_instance != null) {
char var2 = var1.getKeyChar();
if (var2 != 0 && var2 != '\uffff' && LoginScreenAnimation.method1843(var2)) {
if (var2 != 0 && var2 != '\uffff' && LoginScreenAnimation.method1839(var2)) {
int var3 = field371 + 1 & 127;
if (var3 != field378) {
field375[field371] = -1;
@@ -302,7 +302,7 @@ public final class KeyHandler implements KeyListener, FocusListener {
var32 = false;
}
var20 = TileItem.method2129(var29, var3, var32);
var20 = TileItem.method2125(var29, var3, var32);
switch(var20) {
case 0:
return;
@@ -320,7 +320,7 @@ public final class KeyHandler implements KeyListener, FocusListener {
} else if (var29 == ScriptOpcodes.SET_VARP) {
var11 = var6[var17];
Varps.Varps_main[var11] = Interpreter.Interpreter_intStack[--Interpreter.Interpreter_intStackSize];
NetSocket.method3472(var11);
NetSocket.method3468(var11);
} else if (var29 == ScriptOpcodes.SCONST) {
Interpreter.Interpreter_stringStack[++Interpreter.Interpreter_stringStackSize - 1] = var3.stringOperands[var17];
} else if (var29 == ScriptOpcodes.JUMP) {
@@ -362,7 +362,7 @@ public final class KeyHandler implements KeyListener, FocusListener {
Interpreter.Interpreter_intStack[++Interpreter.Interpreter_intStackSize - 1] = WorldMapSprite.getVarbit(var11);
} else if (var29 == ScriptOpcodes.SET_VARBIT) {
var11 = var6[var17];
WorldMapElement.method4360(var11, Interpreter.Interpreter_intStack[--Interpreter.Interpreter_intStackSize]);
WorldMapElement.method4348(var11, Interpreter.Interpreter_intStack[--Interpreter.Interpreter_intStackSize]);
} else if (var29 == ScriptOpcodes.IF_ICMPLE) {
Interpreter.Interpreter_intStackSize -= 2;
if (Interpreter.Interpreter_intStack[Interpreter.Interpreter_intStackSize] <= Interpreter.Interpreter_intStack[Interpreter.Interpreter_intStackSize + 1]) {
@@ -384,7 +384,7 @@ public final class KeyHandler implements KeyListener, FocusListener {
} else if (var29 == ScriptOpcodes.JOIN_STRING) {
var11 = var6[var17];
Interpreter.Interpreter_stringStackSize -= var11;
String var31 = FloorOverlayDefinition.method4716(Interpreter.Interpreter_stringStack, Interpreter.Interpreter_stringStackSize, var11);
String var31 = FloorOverlayDefinition.method4704(Interpreter.Interpreter_stringStack, Interpreter.Interpreter_stringStackSize, var11);
Interpreter.Interpreter_stringStack[++Interpreter.Interpreter_stringStackSize - 1] = var31;
} else if (var29 == ScriptOpcodes.POP_INT) {
--Interpreter.Interpreter_intStackSize;
@@ -588,7 +588,7 @@ public final class KeyHandler implements KeyListener, FocusListener {
label1329:
while (true) {
var10 = var8.method5457();
var10 = var8.method5442();
if (var10 == 0) {
var0 &= var7;
break;
@@ -659,9 +659,9 @@ public final class KeyHandler implements KeyListener, FocusListener {
}
WorldMapID.playPcmPlayers();
TextureProvider.method2757();
TextureProvider.method2753();
var1 = WorldMapIcon_1.regionLandArchives.length;
ClientPacket.method3581();
ClientPacket.method3575();
GrandExchangeOffer.method129(true);
int var5;
int var20;
@@ -704,7 +704,7 @@ public final class KeyHandler implements KeyListener, FocusListener {
var9 = -1;
while (true) {
var10 = var8.method5457();
var10 = var8.method5442();
if (var10 == 0) {
break;
}
@@ -872,7 +872,7 @@ public final class KeyHandler implements KeyListener, FocusListener {
for (var11 = 0; var11 < MouseHandler.regions.length; ++var11) {
if (MouseHandler.regions[var11] == var10 && ArchiveLoader.regionMapArchives[var11] != null) {
class80.method2051(ArchiveLoader.regionMapArchives[var11], var46, var3 * 8, var4 * 8, var6, (var48 & 7) * 8, (var9 & 7) * 8, var65, PacketWriter.scene, Client.collisionMaps);
class80.method2047(ArchiveLoader.regionMapArchives[var11], var46, var3 * 8, var4 * 8, var6, (var48 & 7) * 8, (var9 & 7) * 8, var65, PacketWriter.scene, Client.collisionMaps);
break;
}
}
@@ -1085,11 +1085,11 @@ public final class KeyHandler implements KeyListener, FocusListener {
var34 = 0;
if (var33 != -1) {
var34 = Rasterizer3D.Rasterizer3D_colorPalette[class192.method3648(var33, 96)];
var34 = Rasterizer3D.Rasterizer3D_colorPalette[class192.method3639(var33, 96)];
}
if (var57 == 0) {
var63.addTile(var4, var13, var51, 0, 0, -1, var24, var25, var26, var27, class192.method3648(var32, var28), class192.method3648(var32, var29), class192.method3648(var32, var58), class192.method3648(var32, var31), 0, 0, 0, 0, var34, 0);
var63.addTile(var4, var13, var51, 0, 0, -1, var24, var25, var26, var27, class192.method3639(var32, var28), class192.method3639(var32, var29), class192.method3639(var32, var58), class192.method3639(var32, var31), 0, 0, 0, 0, var34, 0);
} else {
var35 = DevicePcmPlayerProvider.field393[var4][var13][var51] + 1;
byte var70 = class287.field3634[var4][var13][var51];
@@ -1152,7 +1152,7 @@ public final class KeyHandler implements KeyListener, FocusListener {
var43 = Rasterizer3D.Rasterizer3D_colorPalette[WorldMapEvent.method800(var42, 96)];
}
var63.addTile(var4, var13, var51, var35, var70, var40, var24, var25, var26, var27, class192.method3648(var32, var28), class192.method3648(var32, var29), class192.method3648(var32, var58), class192.method3648(var32, var31), WorldMapEvent.method800(var41, var28), WorldMapEvent.method800(var41, var29), WorldMapEvent.method800(var41, var58), WorldMapEvent.method800(var41, var31), var34, var43);
var63.addTile(var4, var13, var51, var35, var70, var40, var24, var25, var26, var27, class192.method3639(var32, var28), class192.method3639(var32, var29), class192.method3639(var32, var58), class192.method3639(var32, var31), WorldMapEvent.method800(var41, var28), WorldMapEvent.method800(var41, var29), WorldMapEvent.method800(var41, var58), WorldMapEvent.method800(var41, var31), var34, var43);
}
}
}
@@ -1162,7 +1162,7 @@ public final class KeyHandler implements KeyListener, FocusListener {
for (var13 = 1; var13 < 103; ++var13) {
for (var14 = 1; var14 < 103; ++var14) {
var63.setTileMinPlane(var4, var14, var13, class189.method3612(var4, var14, var13));
var63.setTileMinPlane(var4, var14, var13, class189.method3606(var4, var14, var13));
}
}
@@ -1173,7 +1173,7 @@ public final class KeyHandler implements KeyListener, FocusListener {
Tiles.field486[var4] = null;
}
var63.method3071(-50, -10, -50);
var63.method3067(-50, -10, -50);
for (var4 = 0; var4 < 104; ++var4) {
for (var5 = 0; var5 < 104; ++var5) {
@@ -1408,7 +1408,7 @@ public final class KeyHandler implements KeyListener, FocusListener {
MouseRecorder.updateGameState(30);
WorldMapID.playPcmPlayers();
Friend.method5148();
Friend.method5133();
var73 = InterfaceParent.getPacketBufferNode(ClientPacket.field2229, Client.packetWriter.isaacCipher);
Client.packetWriter.addNode(var73);
WorldMapDecoration.method343();

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

@@ -192,7 +192,7 @@ public class KitDefinition extends DualNode {
signature = "(I)Z",
garbageValue = "-361074735"
)
public boolean method4423() {
public boolean method4411() {
boolean var1 = true;
for (int var2 = 0; var2 < 5; ++var2) {

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

@@ -88,7 +88,7 @@ public class Language implements Enumerated {
Language_NL = new Language("NL", "nl", "Dutch", class192.field2353, 4, "NL");
Language_ES = new Language("ES", "es", "Spanish", class192.field2353, 5, "ES");
Language_ES_MX = new Language("ES_MX", "es-mx", "Spanish (Latin American)", class192.field2362, 6, "MX");
Language[] var0 = method3638();
Language[] var0 = method3629();
Language_valuesOrdered = new Language[var0.length];
Language[] var1 = var0;
@@ -142,17 +142,29 @@ public class Language implements Enumerated {
return this.getLanguage().toLowerCase(Locale.ENGLISH);
}
public String aae() {
return this.getLanguage().toLowerCase(Locale.ENGLISH);
}
public String aah() {
return this.getLanguage().toLowerCase(Locale.ENGLISH);
}
public String aak() {
return this.getLanguage().toLowerCase(Locale.ENGLISH);
}
@ObfuscatedName("z")
@ObfuscatedSignature(
signature = "(I)[Lgt;",
garbageValue = "1567762755"
)
static Language[] method3638() {
static Language[] method3629() {
return new Language[]{Language_PT, Language_EN, Language_NL, Language_ES, Language_FR, Language_ES_MX, Language_DE};
}
@ObfuscatedName("n")
public static boolean method3635(long var0) {
public static boolean method3627(long var0) {
boolean var2 = 0L != var0;
if (var2) {
boolean var3 = (int)(var0 >>> 16 & 1L) == 1;
@@ -167,7 +179,7 @@ public class Language implements Enumerated {
signature = "(II)Lgt;",
garbageValue = "-1627784008"
)
public static Language method3618(int var0) {
public static Language method3612(int var0) {
return var0 >= 0 && var0 < Language_valuesOrdered.length ? Language_valuesOrdered[var0] : null;
}

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

@@ -160,7 +160,7 @@ public class Login {
signature = "(ILcu;ZI)I",
garbageValue = "432150558"
)
static int method2115(int var0, Script var1, boolean var2) {
static int method2111(int var0, Script var1, boolean var2) {
int var3 = -1;
Widget var4;
if (var0 >= 2000) {
@@ -221,10 +221,10 @@ public class Login {
signature = "(III)I",
garbageValue = "-161600604"
)
static final int method2100(int var0, int var1) {
int var2 = class160.method3416(var0 - 1, var1 - 1) + class160.method3416(var0 + 1, var1 - 1) + class160.method3416(var0 - 1, 1 + var1) + class160.method3416(1 + var0, var1 + 1);
int var3 = class160.method3416(var0 - 1, var1) + class160.method3416(var0 + 1, var1) + class160.method3416(var0, var1 - 1) + class160.method3416(var0, var1 + 1);
int var4 = class160.method3416(var0, var1);
static final int method2096(int var0, int var1) {
int var2 = class160.method3412(var0 - 1, var1 - 1) + class160.method3412(var0 + 1, var1 - 1) + class160.method3412(var0 - 1, 1 + var1) + class160.method3412(1 + var0, var1 + 1);
int var3 = class160.method3412(var0 - 1, var1) + class160.method3412(var0 + 1, var1) + class160.method3412(var0, var1 - 1) + class160.method3412(var0, var1 + 1);
int var4 = class160.method3412(var0, var1);
return var2 / 16 + var3 / 8 + var4 / 4;
}
@@ -233,7 +233,7 @@ public class Login {
signature = "(B)V",
garbageValue = "8"
)
static void method2114() {
static void method2110() {
int var0 = Players.Players_count;
int[] var1 = Players.Players_indices;

56
runescape-client/src/main/java/LoginPacket.java
View File

@@ -58,7 +58,7 @@ public class LoginPacket implements class181 {
field2290 = new LoginPacket(18, -2);
field2291 = new LoginPacket(27, 0);
LoginPacket_indexedValues = new LoginPacket[32];
LoginPacket[] var0 = class192.method3649();
LoginPacket[] var0 = class192.method3640();
for (int var1 = 0; var1 < var0.length; ++var1) {
LoginPacket_indexedValues[var0[var1].id] = var0[var1];
@@ -101,7 +101,7 @@ public class LoginPacket implements class181 {
signature = "(Lbh;S)V",
garbageValue = "21228"
)
static void method3587(GameShell var0) {
static void method3581(GameShell var0) {
int var4;
if (Login.worldSelectOpen) {
while (true) {
@@ -155,14 +155,14 @@ public class LoginPacket implements class181 {
}
if (MouseHandler.MouseHandler_lastPressedX >= Login.xPadding + 708 && MouseHandler.MouseHandler_lastPressedY >= 4 && MouseHandler.MouseHandler_lastPressedX <= Login.xPadding + 708 + 50 && MouseHandler.MouseHandler_lastPressedY <= 20) {
Coord.method3976();
Coord.method3964();
break;
}
if (Login.hoveredWorldIndex != -1) {
World var5 = World.World_worlds[Login.hoveredWorldIndex];
class4.changeWorld(var5);
Coord.method3976();
Coord.method3964();
} else {
if (Login.worldSelectPage > 0 && WorldMapIcon_0.worldSelectLeftSprite != null && MouseHandler.MouseHandler_lastPressedX >= 0 && MouseHandler.MouseHandler_lastPressedX <= WorldMapIcon_0.worldSelectLeftSprite.subWidth && MouseHandler.MouseHandler_lastPressedY >= WallDecoration.canvasHeight / 2 - 50 && MouseHandler.MouseHandler_lastPressedY <= WallDecoration.canvasHeight / 2 + 50) {
--Login.worldSelectPage;
@@ -176,7 +176,7 @@ public class LoginPacket implements class181 {
}
if (SecureRandomFuture.field1230 == 13) {
Coord.method3976();
Coord.method3964();
break;
}
@@ -194,9 +194,9 @@ public class LoginPacket implements class181 {
AbstractArchive.clientPreferences.titleMusicDisabled = !AbstractArchive.clientPreferences.titleMusicDisabled;
Language.savePreferences();
if (!AbstractArchive.clientPreferences.titleMusicDisabled) {
UserComparator4.method3349(class225.archive6, "scape main", "", 255, false);
UserComparator4.method3345(class225.archive6, "scape main", "", 255, false);
} else {
VertexNormal.method2960();
VertexNormal.method2956();
}
}
@@ -284,7 +284,7 @@ public class LoginPacket implements class181 {
var8 = GrandExchangeOfferUnitPriceComparator.loginBoxCenter - 80;
var9 = 291;
if (var4 == 1 && var25 >= var8 - 75 && var25 <= var8 + 75 && var18 >= var9 - 20 && var18 <= var9 + 20) {
ArchiveDiskActionHandler.openURL(FaceNormal.method3229("secure", true) + "m=account-creation/g=oldscape/create_account_funnel.ws", true, false);
ArchiveDiskActionHandler.openURL(FaceNormal.method3225("secure", true) + "m=account-creation/g=oldscape/create_account_funnel.ws", true, false);
}
var8 = GrandExchangeOfferUnitPriceComparator.loginBoxCenter + 80;
@@ -330,7 +330,7 @@ public class LoginPacket implements class181 {
Login.currentLoginField = 0;
}
} else {
TilePaint.method3043(false);
TilePaint.method3039(false);
}
}
} else {
@@ -383,7 +383,7 @@ public class LoginPacket implements class181 {
}
PlayerType.setLoginResponseString("", "Connecting to server...", "");
PlayerType.method4104(false);
PlayerType.method4092(false);
MouseRecorder.updateGameState(20);
return;
}
@@ -479,7 +479,7 @@ public class LoginPacket implements class181 {
}
PlayerType.setLoginResponseString("", "Connecting to server...", "");
PlayerType.method4104(false);
PlayerType.method4092(false);
MouseRecorder.updateGameState(20);
return;
}
@@ -496,7 +496,7 @@ public class LoginPacket implements class181 {
var20 = Login.loginBoxX + 180;
var22 = 276;
if (var4 == 1 && var25 >= var20 - 75 && var25 <= var20 + 75 && var18 >= var22 - 20 && var18 <= var22 + 20) {
TilePaint.method3043(false);
TilePaint.method3039(false);
}
var20 = Login.loginBoxX + 180;
@@ -520,7 +520,7 @@ public class LoginPacket implements class181 {
class185.field2305 = Integer.parseInt(DesktopPlatformInfoProvider.otp);
DesktopPlatformInfoProvider.otp = "";
PlayerType.method4104(true);
PlayerType.method4092(true);
PlayerType.setLoginResponseString("", "Connecting to server...", "");
MouseRecorder.updateGameState(20);
return;
@@ -531,7 +531,7 @@ public class LoginPacket implements class181 {
}
if (var4 == 1 && var25 >= Login.loginBoxX + 180 - 34 && var25 <= Login.loginBoxX + 34 + 180 && var18 >= 351 && var18 <= 363) {
ArchiveDiskActionHandler.openURL(FaceNormal.method3229("secure", true) + "m=totp-authenticator/disableTOTPRequest", true, false);
ArchiveDiskActionHandler.openURL(FaceNormal.method3225("secure", true) + "m=totp-authenticator/disableTOTPRequest", true, false);
}
var20 = Login.loginBoxX + 180 + 80;
@@ -573,7 +573,7 @@ public class LoginPacket implements class181 {
class185.field2305 = Integer.parseInt(DesktopPlatformInfoProvider.otp);
DesktopPlatformInfoProvider.otp = "";
PlayerType.method4104(true);
PlayerType.method4092(true);
PlayerType.setLoginResponseString("", "Connecting to server...", "");
MouseRecorder.updateGameState(20);
return;
@@ -594,14 +594,14 @@ public class LoginPacket implements class181 {
var20 = Login.loginBoxX + 180 + 80;
if (var4 == 1 && var25 >= var20 - 75 && var25 <= var20 + 75 && var18 >= var22 - 20 && var18 <= var22 + 20) {
TilePaint.method3043(true);
TilePaint.method3039(true);
}
var9 = 361;
if (class162.field1988 != null) {
var24 = class162.field1988.highX / 2;
if (var4 == 1 && var25 >= class162.field1988.lowX - var24 && var25 <= var24 + class162.field1988.lowX && var18 >= var9 - 15 && var18 < var9) {
ArchiveDiskActionHandler.openURL(FaceNormal.method3229("secure", true) + "m=weblogin/g=oldscape/cant_log_in", true, false);
ArchiveDiskActionHandler.openURL(FaceNormal.method3225("secure", true) + "m=weblogin/g=oldscape/cant_log_in", true, false);
}
}
@@ -616,7 +616,7 @@ public class LoginPacket implements class181 {
}
if (SecureRandomFuture.field1230 == 13) {
TilePaint.method3043(true);
TilePaint.method3039(true);
} else {
if (SecureRandomFuture.field1230 == 85 && Login.Login_username.length() > 0) {
Login.Login_username = Login.Login_username.substring(0, Login.Login_username.length() - 1);
@@ -638,20 +638,20 @@ public class LoginPacket implements class181 {
if (!DynamicObject.isKeyDown()) {
var21 = 321;
if (var4 == 1 && var18 >= var21 - 20 && var18 <= var21 + 20) {
TilePaint.method3043(true);
TilePaint.method3039(true);
}
return;
}
} while(SecureRandomFuture.field1230 != 84 && SecureRandomFuture.field1230 != 13);
TilePaint.method3043(true);
TilePaint.method3039(true);
}
} else if (Login.loginIndex == 7) {
var20 = Login.loginBoxX + 180 - 80;
var22 = 321;
if (var4 == 1 && var25 >= var20 - 75 && var25 <= var20 + 75 && var18 >= var22 - 20 && var18 <= var22 + 20) {
ArchiveDiskActionHandler.openURL(FaceNormal.method3229("secure", true) + "m=dob/set_dob.ws", true, false);
ArchiveDiskActionHandler.openURL(FaceNormal.method3225("secure", true) + "m=dob/set_dob.ws", true, false);
PlayerType.setLoginResponseString("", "Page has opened in a new window.", "(Please check your popup blocker.)");
Login.loginIndex = 6;
return;
@@ -659,7 +659,7 @@ public class LoginPacket implements class181 {
var20 = Login.loginBoxX + 180 + 80;
if (var4 == 1 && var25 >= var20 - 75 && var25 <= var20 + 75 && var18 >= var22 - 20 && var18 <= var22 + 20) {
TilePaint.method3043(true);
TilePaint.method3039(true);
}
} else if (Login.loginIndex == 8) {
var20 = Login.loginBoxX + 180 - 80;
@@ -673,7 +673,7 @@ public class LoginPacket implements class181 {
var20 = Login.loginBoxX + 180 + 80;
if (var4 == 1 && var25 >= var20 - 75 && var25 <= var20 + 75 && var18 >= var22 - 20 && var18 <= var22 + 20) {
TilePaint.method3043(true);
TilePaint.method3039(true);
}
} else if (Login.loginIndex == 12) {
String var16 = "";
@@ -685,7 +685,7 @@ public class LoginPacket implements class181 {
var16 = "https://support.runescape.com/hc/en-gb/articles/206103939-My-account-is-locked";
break;
default:
TilePaint.method3043(false);
TilePaint.method3039(false);
}
var8 = Login.loginBoxX + 180;
@@ -700,20 +700,20 @@ public class LoginPacket implements class181 {
var8 = Login.loginBoxX + 180;
var9 = 326;
if (var4 == 1 && var25 >= var8 - 75 && var25 <= var8 + 75 && var18 >= var9 - 20 && var18 <= var9 + 20) {
TilePaint.method3043(false);
TilePaint.method3039(false);
}
} else if (Login.loginIndex == 24) {
var20 = Login.loginBoxX + 180;
var22 = 301;
if (var4 == 1 && var25 >= var20 - 75 && var25 <= var20 + 75 && var18 >= var22 - 20 && var18 <= var22 + 20) {
TilePaint.method3043(false);
TilePaint.method3039(false);
}
}
}
} else {
while (DynamicObject.isKeyDown()) {
if (SecureRandomFuture.field1230 == 84) {
TilePaint.method3043(false);
TilePaint.method3039(false);
} else if (SecureRandomFuture.field1230 == 13) {
Login.loginIndex = 0;
}
@@ -722,7 +722,7 @@ public class LoginPacket implements class181 {
var20 = GrandExchangeOfferUnitPriceComparator.loginBoxCenter - 80;
var22 = 321;
if (var4 == 1 && var25 >= var20 - 75 && var25 <= var20 + 75 && var18 >= var22 - 20 && var18 <= var22 + 20) {
TilePaint.method3043(false);
TilePaint.method3039(false);
}
var20 = GrandExchangeOfferUnitPriceComparator.loginBoxCenter + 80;

38
runescape-client/src/main/java/LoginScreenAnimation.java
View File

@@ -150,7 +150,7 @@ public class LoginScreenAnimation {
this.field1029 = 0;
this.field1031 = new int[32768];
this.field1015 = new int[32768];
this.method1828((IndexedSprite)null);
this.method1824((IndexedSprite)null);
this.field1020 = new int[32768];
this.field1027 = new int[32768];
}
@@ -160,7 +160,7 @@ public class LoginScreenAnimation {
signature = "(I)V",
garbageValue = "-1384251878"
)
void method1821() {
void method1817() {
this.field1030 = null;
this.field1021 = null;
this.field1022 = null;
@@ -195,10 +195,10 @@ public class LoginScreenAnimation {
this.field1025 = var2;
if (var3 > 0) {
this.method1823(var3);
this.method1819(var3);
}
this.method1840(var1);
this.method1836(var1);
}
@ObfuscatedName("u")
@@ -206,13 +206,13 @@ public class LoginScreenAnimation {
signature = "(II)V",
garbageValue = "-1108655518"
)
final void method1823(int var1) {
final void method1819(int var1) {
this.field1029 += var1 * 128;
int var2;
if (this.field1029 > this.field1031.length) {
this.field1029 -= this.field1031.length;
var2 = (int)(Math.random() * 12.0D);
this.method1828(this.sprites[var2]);
this.method1824(this.sprites[var2]);
}
var2 = 0;
@@ -340,7 +340,7 @@ public class LoginScreenAnimation {
signature = "(IIII)I",
garbageValue = "1638746019"
)
final int method1824(int var1, int var2, int var3) {
final int method1820(int var1, int var2, int var3) {
int var4 = 256 - var3;
return (var3 * (var2 & 65280) + var4 * (var1 & 65280) & 16711680) + (var4 * (var1 & 16711935) + var3 * (var2 & 16711935) & -16711936) >> 8;
}
@@ -350,19 +350,19 @@ public class LoginScreenAnimation {
signature = "(IB)V",
garbageValue = "97"
)
final void method1840(int var1) {
final void method1836(int var1) {
int var2 = this.field1019.length;
if (this.field1023 * 16 > 0) {
this.method1826(this.field1023 * 16, this.field1021);
this.method1822(this.field1023 * 16, this.field1021);
} else if (this.field1014 * 16 > 0) {
this.method1826(this.field1014 * 16, this.field1022);
this.method1822(this.field1014 * 16, this.field1022);
} else {
for (int var3 = 0; var3 < var2; ++var3) {
this.field1019[var3] = this.field1030[var3];
}
}
this.method1827(var1);
this.method1823(var1);
}
@ObfuscatedName("q")
@@ -370,16 +370,16 @@ public class LoginScreenAnimation {
signature = "(I[II)V",
garbageValue = "-1982126918"
)
final void method1826(int var1, int[] var2) {
final void method1822(int var1, int[] var2) {
int var3 = this.field1019.length;
for (int var4 = 0; var4 < var3; ++var4) {
if (var1 > 768) {
this.field1019[var4] = this.method1824(this.field1030[var4], var2[var4], 1024 - var1);
this.field1019[var4] = this.method1820(this.field1030[var4], var2[var4], 1024 - var1);
} else if (var1 > 256) {
this.field1019[var4] = var2[var4];
} else {
this.field1019[var4] = this.method1824(var2[var4], this.field1030[var4], 256 - var1);
this.field1019[var4] = this.method1820(var2[var4], this.field1030[var4], 256 - var1);
}
}
@@ -390,7 +390,7 @@ public class LoginScreenAnimation {
signature = "(II)V",
garbageValue = "-224486060"
)
final void method1827(int var1) {
final void method1823(int var1) {
int var2 = 0;
for (int var3 = 1; var3 < 255; ++var3) {
@@ -434,7 +434,7 @@ public class LoginScreenAnimation {
signature = "(Llp;I)V",
garbageValue = "1363271921"
)
final void method1828(IndexedSprite var1) {
final void method1824(IndexedSprite var1) {
int var2;
for (var2 = 0; var2 < this.field1031.length; ++var2) {
this.field1031[var2] = 0;
@@ -502,7 +502,7 @@ public class LoginScreenAnimation {
signature = "(CI)Z",
garbageValue = "1979853088"
)
public static boolean method1843(char var0) {
public static boolean method1839(char var0) {
if ((var0 <= 0 || var0 >= 128) && (var0 < 160 || var0 > 255)) {
if (var0 != 0) {
char[] var1 = class287.cp1252AsciiExtension;
@@ -541,7 +541,7 @@ public class LoginScreenAnimation {
signature = "([BIII)I",
garbageValue = "-1562433827"
)
static int method1848(byte[] var0, int var1, int var2) {
static int method1844(byte[] var0, int var1, int var2) {
int var3 = -1;
for (int var4 = var1; var4 < var2; ++var4) {
@@ -557,7 +557,7 @@ public class LoginScreenAnimation {
signature = "([BII)V",
garbageValue = "-2002563170"
)
static void method1832(byte[] var0, int var1) {
static void method1828(byte[] var0, int var1) {
if (Client.randomDatData == null) {
Client.randomDatData = new byte[24];
}

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

@@ -86,7 +86,19 @@ public class LoginType {
this.field4034 = var4;
}
public String aak() {
return this.field4034;
}
public String toString() {
return this.field4034;
}
public String aah() {
return this.field4034;
}
public String aae() {
return this.field4034;
}
}

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

@@ -50,7 +50,7 @@ public class MenuAction {
signature = "(Lky;ZS)V",
garbageValue = "-32250"
)
public static void method2067(AbstractSocket var0, boolean var1) {
public static void method2063(AbstractSocket var0, boolean var1) {
if (NetCache.NetCache_socket != null) {
try {
NetCache.NetCache_socket.close();
@@ -61,7 +61,7 @@ public class MenuAction {
}
NetCache.NetCache_socket = var0;
DirectByteArrayCopier.method3924(var1);
DirectByteArrayCopier.method3915(var1);
NetCache.NetCache_responseHeaderBuffer.offset = 0;
WorldMapEvent.NetCache_currentResponse = null;
FaceNormal.NetCache_responseArchiveBuffer = null;
@@ -114,7 +114,7 @@ public class MenuAction {
signature = "(I)V",
garbageValue = "1201643852"
)
public static final void method2066() {
public static final void method2062() {
ViewportMouse.ViewportMouse_isInViewport = false;
ViewportMouse.ViewportMouse_entityCount = 0;
}

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

@@ -49,7 +49,7 @@ public class Messages {
signature = "(ILcu;ZI)I",
garbageValue = "-1500079981"
)
static int method2211(int var0, Script var1, boolean var2) {
static int method2207(int var0, Script var1, boolean var2) {
String var3;
if (var0 == ScriptOpcodes.MES) {
var3 = Interpreter.Interpreter_stringStack[--Interpreter.Interpreter_stringStackSize];
@@ -152,7 +152,7 @@ public class Messages {
var6.packetBuffer.writeShort(1 + class268.stringCp1252NullTerminatedByteSize(var7) + class268.stringCp1252NullTerminatedByteSize(var5));
var6.packetBuffer.writeStringCp1252NullTerminated(var7);
var6.packetBuffer.writeStringCp1252NullTerminated(var5);
var6.packetBuffer.method5468(var15);
var6.packetBuffer.method5453(var15);
Client.packetWriter.addNode(var6);
return 1;
}

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

@@ -150,7 +150,7 @@ public class MidiFileReader {
}
if (var5 != 240 && var5 != 247) {
return this.method3812(var1, var5);
return this.method3803(var1, var5);
} else {
int var3 = this.buffer.readVarInt();
if (var5 == 247 && var3 > 0) {
@@ -158,7 +158,7 @@ public class MidiFileReader {
if (var4 >= 241 && var4 <= 243 || var4 == 246 || var4 == 248 || var4 >= 250 && var4 <= 252 || var4 == 254) {
++this.buffer.offset;
this.field2453[var1] = var4;
return this.method3812(var1, var4);
return this.method3803(var1, var4);
}
}
@@ -169,7 +169,7 @@ public class MidiFileReader {
}
@ObfuscatedName("c")
int method3812(int var1, int var2) {
int method3803(int var1, int var2) {
int var4;
if (var2 == 255) {
int var7 = this.buffer.readUnsignedByte();
@@ -209,7 +209,7 @@ public class MidiFileReader {
}
@ObfuscatedName("b")
long method3813(int var1) {
long method3804(int var1) {
return this.field2450 + (long)var1 * (long)this.field2442;
}

166
runescape-client/src/main/java/MidiPcmStream.java
View File

@@ -123,7 +123,7 @@ public class MidiPcmStream extends PcmStream {
this.midiFile = new MidiFileReader();
this.patchStream = new MusicPatchPcmStream(this);
this.musicPatches = new NodeHashTable(128);
this.method3690();
this.method3681();
}
@ObfuscatedName("z")
@@ -131,7 +131,7 @@ public class MidiPcmStream extends PcmStream {
signature = "(II)V",
garbageValue = "-1812413582"
)
public synchronized void method3760(int var1) {
public synchronized void method3751(int var1) {
this.field2393 = var1;
}
@@ -140,7 +140,7 @@ public class MidiPcmStream extends PcmStream {
signature = "(I)I",
garbageValue = "-1892008992"
)
public int method3745() {
public int method3736() {
return this.field2393;
}
@@ -151,7 +151,7 @@ public class MidiPcmStream extends PcmStream {
)
@Export("loadMusicTrack")
public synchronized boolean loadMusicTrack(MusicTrack var1, AbstractArchive var2, SoundCache var3, int var4) {
var1.method3895();
var1.method3886();
boolean var5 = true;
int[] var6 = null;
if (var4 > 0) {
@@ -171,7 +171,7 @@ public class MidiPcmStream extends PcmStream {
this.musicPatches.put(var9, (long)var8);
}
if (!var9.method3856(var3, var7.byteArray, var6)) {
if (!var9.method3847(var3, var7.byteArray, var6)) {
var5 = false;
}
}
@@ -228,7 +228,7 @@ public class MidiPcmStream extends PcmStream {
}
@ObfuscatedName("m")
protected synchronized int vmethod3882() {
protected synchronized int vmethod3873() {
return 0;
}
@@ -250,7 +250,7 @@ public class MidiPcmStream extends PcmStream {
this.patchStream.fill(var1, var2, var7);
var2 += var7;
var3 -= var7;
this.method3740();
this.method3731();
} while(this.midiFile.isReady());
}
@@ -278,7 +278,7 @@ public class MidiPcmStream extends PcmStream {
this.track = this.midiFile.getPrioritizedTrack();
this.trackLength = this.midiFile.trackLengths[this.track];
this.field2417 = this.midiFile.method3813(this.trackLength);
this.field2417 = this.midiFile.method3804(this.trackLength);
}
@ObfuscatedName("c")
@@ -298,7 +298,7 @@ public class MidiPcmStream extends PcmStream {
this.field2416 += (long)var5 * (long)var2;
this.patchStream.skip(var5);
var1 -= var5;
this.method3740();
this.method3731();
} while(this.midiFile.isReady());
}
@@ -313,7 +313,7 @@ public class MidiPcmStream extends PcmStream {
@Export("clear")
public synchronized void clear() {
this.midiFile.clear();
this.method3690();
this.method3681();
}
@ObfuscatedName("o")
@@ -331,8 +331,8 @@ public class MidiPcmStream extends PcmStream {
signature = "(IIB)V",
garbageValue = "-50"
)
public synchronized void method3746(int var1, int var2) {
this.method3747(var1, var2);
public synchronized void method3737(int var1, int var2) {
this.method3738(var1, var2);
}
@ObfuscatedName("e")
@@ -340,10 +340,10 @@ public class MidiPcmStream extends PcmStream {
signature = "(IIB)V",
garbageValue = "14"
)
void method3747(int var1, int var2) {
void method3738(int var1, int var2) {
this.field2398[var1] = var2;
this.field2400[var1] = var2 & -128;
this.method3680(var1, var2);
this.method3671(var1, var2);
}
@ObfuscatedName("x")
@@ -351,7 +351,7 @@ public class MidiPcmStream extends PcmStream {
signature = "(III)V",
garbageValue = "1745754026"
)
void method3680(int var1, int var2) {
void method3671(int var1, int var2) {
if (var2 != this.field2395[var1]) {
this.field2395[var1] = var2;
@@ -367,8 +367,8 @@ public class MidiPcmStream extends PcmStream {
signature = "(IIII)V",
garbageValue = "828963250"
)
void method3738(int var1, int var2, int var3) {
this.method3683(var1, var2, 64);
void method3729(int var1, int var2, int var3) {
this.method3674(var1, var2, 64);
if ((this.field2404[var1] & 2) != 0) {
for (MusicPatchNode var4 = (MusicPatchNode)this.patchStream.queue.first(); var4 != null; var4 = (MusicPatchNode)this.patchStream.queue.next()) {
if (var4.field2420 == var1 && var4.field2433 < 0) {
@@ -404,10 +404,10 @@ public class MidiPcmStream extends PcmStream {
var6.field2433 = -1;
var6.field2434 = 0;
if (this.field2408[var1] == 0) {
var6.stream = RawPcmStream.method2548(var8, this.method3695(var6), this.method3696(var6), this.method3751(var6));
var6.stream = RawPcmStream.method2544(var8, this.method3686(var6), this.method3687(var6), this.method3742(var6));
} else {
var6.stream = RawPcmStream.method2548(var8, this.method3695(var6), 0, this.method3751(var6));
this.method3682(var6, var9.field2457[var2] < 0);
var6.stream = RawPcmStream.method2544(var8, this.method3686(var6), 0, this.method3742(var6));
this.method3673(var6, var9.field2457[var2] < 0);
}
if (var9.field2457[var2] < 0) {
@@ -435,7 +435,7 @@ public class MidiPcmStream extends PcmStream {
signature = "(Lgu;ZB)V",
garbageValue = "-87"
)
void method3682(MusicPatchNode var1, boolean var2) {
void method3673(MusicPatchNode var1, boolean var2) {
int var3 = var1.rawSound.samples.length;
int var4;
if (var2 && var1.rawSound.field1369) {
@@ -444,13 +444,13 @@ public class MidiPcmStream extends PcmStream {
var3 <<= 8;
if (var4 >= var3) {
var4 = var3 + var3 - 1 - var4;
var1.stream.method2525();
var1.stream.method2521();
}
} else {
var4 = (int)((long)var3 * (long)this.field2408[var1.field2420] >> 6);
}
var1.stream.method2581(var4);
var1.stream.method2577(var4);
}
@ObfuscatedName("f")
@@ -458,7 +458,7 @@ public class MidiPcmStream extends PcmStream {
signature = "(IIII)V",
garbageValue = "97221829"
)
void method3683(int var1, int var2, int var3) {
void method3674(int var1, int var2, int var3) {
MusicPatchNode var4 = this.field2410[var1][var2];
if (var4 != null) {
this.field2410[var1][var2] = null;
@@ -481,7 +481,7 @@ public class MidiPcmStream extends PcmStream {
signature = "(IIII)V",
garbageValue = "-1518043222"
)
void method3684(int var1, int var2, int var3) {
void method3675(int var1, int var2, int var3) {
}
@ObfuscatedName("d")
@@ -489,7 +489,7 @@ public class MidiPcmStream extends PcmStream {
signature = "(III)V",
garbageValue = "-752934894"
)
void method3788(int var1, int var2) {
void method3779(int var1, int var2) {
}
@ObfuscatedName("l")
@@ -497,7 +497,7 @@ public class MidiPcmStream extends PcmStream {
signature = "(III)V",
garbageValue = "896514567"
)
void method3686(int var1, int var2) {
void method3677(int var1, int var2) {
this.field2399[var1] = var2;
}
@@ -506,16 +506,16 @@ public class MidiPcmStream extends PcmStream {
signature = "(II)V",
garbageValue = "1124863656"
)
void method3687(int var1) {
void method3678(int var1) {
for (MusicPatchNode var2 = (MusicPatchNode)this.patchStream.queue.last(); var2 != null; var2 = (MusicPatchNode)this.patchStream.queue.previous()) {
if (var1 < 0 || var2.field2420 == var1) {
if (var2.stream != null) {
var2.stream.method2529(UrlRequest.PcmPlayer_sampleRate / 100);
if (var2.stream.method2533()) {
var2.stream.method2525(UrlRequest.PcmPlayer_sampleRate / 100);
if (var2.stream.method2529()) {
this.patchStream.mixer.addSubStream(var2.stream);
}
var2.method3794();
var2.method3785();
}
if (var2.field2433 < 0) {
@@ -533,7 +533,7 @@ public class MidiPcmStream extends PcmStream {
signature = "(IB)V",
garbageValue = "-61"
)
void method3688(int var1) {
void method3679(int var1) {
if (var1 >= 0) {
this.field2409[var1] = 12800;
this.field2405[var1] = 8192;
@@ -541,16 +541,16 @@ public class MidiPcmStream extends PcmStream {
this.field2399[var1] = 8192;
this.field2402[var1] = 0;
this.field2403[var1] = 8192;
this.method3691(var1);
this.method3692(var1);
this.method3682(var1);
this.method3683(var1);
this.field2404[var1] = 0;
this.field2392[var1] = 32767;
this.field2418[var1] = 256;
this.field2408[var1] = 0;
this.method3744(var1, 8192);
this.method3735(var1, 8192);
} else {
for (var1 = 0; var1 < 16; ++var1) {
this.method3688(var1);
this.method3679(var1);
}
}
@@ -561,7 +561,7 @@ public class MidiPcmStream extends PcmStream {
signature = "(IB)V",
garbageValue = "-91"
)
void method3785(int var1) {
void method3776(int var1) {
for (MusicPatchNode var2 = (MusicPatchNode)this.patchStream.queue.last(); var2 != null; var2 = (MusicPatchNode)this.patchStream.queue.previous()) {
if ((var1 < 0 || var2.field2420 == var1) && var2.field2433 < 0) {
this.field2410[var2.field2420][var2.field2424] = null;
@@ -576,9 +576,9 @@ public class MidiPcmStream extends PcmStream {
signature = "(I)V",
garbageValue = "997152444"
)
void method3690() {
this.method3687(-1);
this.method3688(-1);
void method3681() {
this.method3678(-1);
this.method3679(-1);
int var1;
for (var1 = 0; var1 < 16; ++var1) {
@@ -596,7 +596,7 @@ public class MidiPcmStream extends PcmStream {
signature = "(IB)V",
garbageValue = "91"
)
void method3691(int var1) {
void method3682(int var1) {
if ((this.field2404[var1] & 2) != 0) {
for (MusicPatchNode var2 = (MusicPatchNode)this.patchStream.queue.last(); var2 != null; var2 = (MusicPatchNode)this.patchStream.queue.previous()) {
if (var2.field2420 == var1 && this.field2410[var1][var2.field2424] == null && var2.field2433 < 0) {
@@ -612,7 +612,7 @@ public class MidiPcmStream extends PcmStream {
signature = "(II)V",
garbageValue = "-1884831875"
)
void method3692(int var1) {
void method3683(int var1) {
if ((this.field2404[var1] & 4) != 0) {
for (MusicPatchNode var2 = (MusicPatchNode)this.patchStream.queue.last(); var2 != null; var2 = (MusicPatchNode)this.patchStream.queue.previous()) {
if (var2.field2420 == var1) {
@@ -628,7 +628,7 @@ public class MidiPcmStream extends PcmStream {
signature = "(II)V",
garbageValue = "-1837545367"
)
void method3768(int var1) {
void method3759(int var1) {
int var2 = var1 & 240;
int var3;
int var4;
@@ -637,22 +637,22 @@ public class MidiPcmStream extends PcmStream {
var3 = var1 & 15;
var4 = var1 >> 8 & 127;
var5 = var1 >> 16 & 127;
this.method3683(var3, var4, var5);
this.method3674(var3, var4, var5);
} else if (var2 == 144) {
var3 = var1 & 15;
var4 = var1 >> 8 & 127;
var5 = var1 >> 16 & 127;
if (var5 > 0) {
this.method3738(var3, var4, var5);
this.method3729(var3, var4, var5);
} else {
this.method3683(var3, var4, 64);
this.method3674(var3, var4, 64);
}
} else if (var2 == 160) {
var3 = var1 & 15;
var4 = var1 >> 8 & 127;
var5 = var1 >> 16 & 127;
this.method3684(var3, var4, var5);
this.method3675(var3, var4, var5);
} else if (var2 == 176) {
var3 = var1 & 15;
var4 = var1 >> 8 & 127;
@@ -721,7 +721,7 @@ public class MidiPcmStream extends PcmStream {
var10000 = this.field2404;
var10000[var3] |= 2;
} else {
this.method3691(var3);
this.method3682(var3);
var10000 = this.field2404;
var10000[var3] &= -3;
}
@@ -744,15 +744,15 @@ public class MidiPcmStream extends PcmStream {
}
if (var4 == 120) {
this.method3687(var3);
this.method3678(var3);
}
if (var4 == 121) {
this.method3688(var3);
this.method3679(var3);
}
if (var4 == 123) {
this.method3785(var3);
this.method3776(var3);
}
int var6;
@@ -783,36 +783,36 @@ public class MidiPcmStream extends PcmStream {
var10000 = this.field2404;
var10000[var3] |= 4;
} else {
this.method3692(var3);
this.method3683(var3);
var10000 = this.field2404;
var10000[var3] &= -5;
}
}
if (var4 == 17) {
this.method3744(var3, (var5 << 7) + (this.field2406[var3] & -16257));
this.method3735(var3, (var5 << 7) + (this.field2406[var3] & -16257));
}
if (var4 == 49) {
this.method3744(var3, var5 + (this.field2406[var3] & -128));
this.method3735(var3, var5 + (this.field2406[var3] & -128));
}
} else if (var2 == 192) {
var3 = var1 & 15;
var4 = var1 >> 8 & 127;
this.method3680(var3, var4 + this.field2400[var3]);
this.method3671(var3, var4 + this.field2400[var3]);
} else if (var2 == 208) {
var3 = var1 & 15;
var4 = var1 >> 8 & 127;
this.method3788(var3, var4);
this.method3779(var3, var4);
} else if (var2 == 224) {
var3 = var1 & 15;
var4 = (var1 >> 8 & 127) + (var1 >> 9 & 16256);
this.method3686(var3, var4);
this.method3677(var3, var4);
} else {
var2 = var1 & 255;
if (var2 == 255) {
this.method3690();
this.method3681();
}
}
}
@@ -822,7 +822,7 @@ public class MidiPcmStream extends PcmStream {
signature = "(III)V",
garbageValue = "-1166869867"
)
void method3744(int var1, int var2) {
void method3735(int var1, int var2) {
this.field2406[var1] = var2;
this.field2401[var1] = (int)(2097152.0D * Math.pow(2.0D, 5.4931640625E-4D * (double)var2) + 0.5D);
}
@@ -832,7 +832,7 @@ public class MidiPcmStream extends PcmStream {
signature = "(Lgu;I)I",
garbageValue = "-1249853166"
)
int method3695(MusicPatchNode var1) {
int method3686(MusicPatchNode var1) {
int var2 = (var1.field2441 * var1.field2429 >> 12) + var1.field2427;
var2 += (this.field2399[var1.field2420] - 8192) * this.field2418[var1.field2420] >> 12;
MusicPatchNode2 var3 = var1.field2435;
@@ -858,7 +858,7 @@ public class MidiPcmStream extends PcmStream {
signature = "(Lgu;I)I",
garbageValue = "8582462"
)
int method3696(MusicPatchNode var1) {
int method3687(MusicPatchNode var1) {
MusicPatchNode2 var2 = var1.field2435;
int var3 = this.field2409[var1.field2420] * this.field2407[var1.field2420] + 4096 >> 13;
var3 = var3 * var3 + 16384 >> 15;
@@ -874,11 +874,11 @@ public class MidiPcmStream extends PcmStream {
int var7;
if (var2.field2376 != null) {
var4 = var1.field2431;
var5 = var2.field2376[var1.field2432 * 2 + 1];
if (var1.field2432 * 2 < var2.field2376.length - 2) {
var6 = (var2.field2376[var1.field2432 * 2] & 255) << 8;
var7 = (var2.field2376[var1.field2432 * 2 + 2] & 255) << 8;
var5 += (var2.field2376[var1.field2432 * 2 + 3] - var5) * (var4 - var6) / (var7 - var6);
var5 = var2.field2376[var1.field2432 * 4 + 1];
if (var1.field2432 * 4 < var2.field2376.length - 2) {
var6 = (var2.field2376[var1.field2432 * 4] & 255) << 8;
var7 = (var2.field2376[var1.field2432 * 4 + 2] & 255) << 8;
var5 += (var4 - var6) * (var2.field2376[var1.field2432 * 4 + 3] - var5) / (var7 - var6);
}
var3 = var5 * var3 + 32 >> 6;
@@ -904,7 +904,7 @@ public class MidiPcmStream extends PcmStream {
signature = "(Lgu;I)I",
garbageValue = "19850751"
)
int method3751(MusicPatchNode var1) {
int method3742(MusicPatchNode var1) {
int var2 = this.field2405[var1.field2420];
return var2 < 8192 ? var2 * var1.field2426 + 32 >> 6 : 16384 - ((128 - var1.field2426) * (16384 - var2) + 32 >> 6);
}
@@ -914,12 +914,12 @@ public class MidiPcmStream extends PcmStream {
signature = "(I)V",
garbageValue = "-1542890504"
)
void method3740() {
void method3731() {
int var1 = this.track;
int var2 = this.trackLength;
long var3;
for (var3 = this.field2417; var2 == this.trackLength; var3 = this.midiFile.method3813(var2)) {
for (var3 = this.field2417; var2 == this.trackLength; var3 = this.midiFile.method3804(var2)) {
while (var2 == this.midiFile.trackLengths[var1]) {
this.midiFile.gotoTrack(var1);
int var5 = this.midiFile.readMessage(var1);
@@ -928,7 +928,7 @@ public class MidiPcmStream extends PcmStream {
this.midiFile.markTrackPosition(var1);
if (this.midiFile.isDone()) {
if (!this.field2413 || var2 == 0) {
this.method3690();
this.method3681();
this.midiFile.clear();
return;
}
@@ -939,7 +939,7 @@ public class MidiPcmStream extends PcmStream {
}
if ((var5 & 128) != 0) {
this.method3768(var5);
this.method3759(var5);
}
this.midiFile.readTrackLength(var1);
@@ -960,7 +960,7 @@ public class MidiPcmStream extends PcmStream {
signature = "(Lgu;I)Z",
garbageValue = "1629954628"
)
boolean method3704(MusicPatchNode var1) {
boolean method3695(MusicPatchNode var1) {
if (var1.stream == null) {
if (var1.field2433 >= 0) {
var1.remove();
@@ -980,9 +980,9 @@ public class MidiPcmStream extends PcmStream {
signature = "(Lgu;[IIII)Z",
garbageValue = "-1178188591"
)
boolean method3705(MusicPatchNode var1, int[] var2, int var3, int var4) {
boolean method3696(MusicPatchNode var1, int[] var2, int var3, int var4) {
var1.field2438 = UrlRequest.PcmPlayer_sampleRate / 100;
if (var1.field2433 < 0 || var1.stream != null && !var1.stream.method2532()) {
if (var1.field2433 < 0 || var1.stream != null && !var1.stream.method2528()) {
int var5 = var1.field2429;
if (var5 > 0) {
var5 -= (int)(16.0D * Math.pow(2.0D, 4.921259842519685E-4D * (double)this.field2403[var1.field2420]) + 0.5D);
@@ -993,7 +993,7 @@ public class MidiPcmStream extends PcmStream {
var1.field2429 = var5;
}
var1.stream.method2530(this.method3695(var1));
var1.stream.method2526(this.method3686(var1));
MusicPatchNode2 var6 = var1.field2435;
boolean var7 = false;
++var1.field2439;
@@ -1014,11 +1014,11 @@ public class MidiPcmStream extends PcmStream {
var1.field2431 += 128;
}
while (var1.field2432 * 2 < var6.field2376.length - 2 && var1.field2431 > (var6.field2376[var1.field2432 * 2 + 2] & 255) << 8) {
var1.field2432 = var1.field2432 * 4 + 4;
while (var1.field2432 * 4 < var6.field2376.length - 2 && var1.field2431 > (var6.field2376[var1.field2432 * 4 + 2] & 255) << 8) {
var1.field2432 = var1.field2432 * 4 + 2;
}
if (var1.field2432 * 2 == var6.field2376.length - 2 && var6.field2376[var1.field2432 * 2 + 1] == 0) {
if (var1.field2432 * 4 == var6.field2376.length - 2 && var6.field2376[var1.field2432 * 4 + 1] == 0) {
var7 = true;
}
}
@@ -1040,18 +1040,18 @@ public class MidiPcmStream extends PcmStream {
}
if (var7) {
var1.stream.method2529(var1.field2438);
var1.stream.method2525(var1.field2438);
if (var2 != null) {
var1.stream.fill(var2, var3, var4);
} else {
var1.stream.skip(var4);
}
if (var1.stream.method2533()) {
if (var1.stream.method2529()) {
this.patchStream.mixer.addSubStream(var1.stream);
}
var1.method3794();
var1.method3785();
if (var1.field2433 >= 0) {
var1.remove();
if (var1.field2423 > 0 && var1 == this.field2411[var1.field2420][var1.field2423]) {
@@ -1061,11 +1061,11 @@ public class MidiPcmStream extends PcmStream {
return true;
} else {
var1.stream.method2528(var1.field2438, this.method3696(var1), this.method3751(var1));
var1.stream.method2524(var1.field2438, this.method3687(var1), this.method3742(var1));
return false;
}
} else {
var1.method3794();
var1.method3785();
var1.remove();
if (var1.field2423 > 0 && var1 == this.field2411[var1.field2420][var1.field2423]) {
this.field2411[var1.field2420][var1.field2423] = null;

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

@@ -558,9 +558,9 @@ public class Model extends Entity {
int var9 = Model_sine[var1];
for (int var10 = 0; var10 < this.verticesCount; ++var10) {
int var11 = Rasterizer3D.method2982(this.verticesX[var10], this.verticesZ[var10], var8, var9);
int var11 = Rasterizer3D.method2978(this.verticesX[var10], this.verticesZ[var10], var8, var9);
int var12 = this.verticesY[var10];
int var13 = Rasterizer3D.method2983(this.verticesX[var10], this.verticesZ[var10], var8, var9);
int var13 = Rasterizer3D.method2979(this.verticesX[var10], this.verticesZ[var10], var8, var9);
if (var11 < var2) {
var2 = var11;
}
@@ -642,7 +642,7 @@ public class Model extends Entity {
}
@ObfuscatedName("q")
void method2858() {
void method2854() {
if (this.boundsType != 2) {
this.boundsType = 2;
this.xzRadius = 0;
@@ -664,7 +664,7 @@ public class Model extends Entity {
}
@ObfuscatedName("m")
public int method2859() {
public int method2855() {
this.calculateBoundsCylinder();
return this.xzRadius;
}
@@ -998,10 +998,10 @@ public class Model extends Entity {
}
@ObfuscatedName("j")
public final void method2870(int var1, int var2, int var3, int var4, int var5, int var6, int var7) {
public final void method2866(int var1, int var2, int var3, int var4, int var5, int var6, int var7) {
field1681[0] = -1;
if (this.boundsType != 2 && this.boundsType != 1) {
this.method2858();
this.method2854();
}
int var8 = Rasterizer3D.Rasterizer3D_clipMidX;
@@ -1062,10 +1062,10 @@ public class Model extends Entity {
}
@ObfuscatedName("d")
public final void method2871(int var1, int var2, int var3, int var4, int var5, int var6, int var7, int var8) {
public final void method2867(int var1, int var2, int var3, int var4, int var5, int var6, int var7, int var8) {
field1681[0] = -1;
if (this.boundsType != 2 && this.boundsType != 1) {
this.method2858();
this.method2854();
}
int var9 = Rasterizer3D.Rasterizer3D_clipMidX;
@@ -1237,7 +1237,7 @@ public class Model extends Entity {
var9 = field1682[var7];
for (var10 = 0; var10 < var8; ++var10) {
this.method2874(var9[var10]);
this.method2870(var9[var10]);
}
}
}
@@ -1304,7 +1304,7 @@ public class Model extends Entity {
for (var15 = 0; var15 < 10; ++var15) {
while (var15 == 0 && var10 > var7) {
this.method2874(var30[var11++]);
this.method2870(var30[var11++]);
if (var11 == var12 && var30 != field1645[11]) {
var11 = 0;
var12 = field1683[11];
@@ -1320,7 +1320,7 @@ public class Model extends Entity {
}
while (var15 == 3 && var10 > var8) {
this.method2874(var30[var11++]);
this.method2870(var30[var11++]);
if (var11 == var12 && var30 != field1645[11]) {
var11 = 0;
var12 = field1683[11];
@@ -1336,7 +1336,7 @@ public class Model extends Entity {
}
while (var15 == 5 && var10 > var27) {
this.method2874(var30[var11++]);
this.method2870(var30[var11++]);
if (var11 == var12 && var30 != field1645[11]) {
var11 = 0;
var12 = field1683[11];
@@ -1355,12 +1355,12 @@ public class Model extends Entity {
int[] var32 = field1645[var15];
for (var18 = 0; var18 < var16; ++var18) {
this.method2874(var32[var18]);
this.method2870(var32[var18]);
}
}
while (var10 != -1000) {
this.method2874(var30[var11++]);
this.method2870(var30[var11++]);
if (var11 == var12 && var30 != field1645[11]) {
var11 = 0;
var30 = field1645[11];
@@ -1380,9 +1380,9 @@ public class Model extends Entity {
}
@ObfuscatedName("k")
final void method2874(int var1) {
final void method2870(int var1) {
if (field1673[var1]) {
this.method2875(var1);
this.method2871(var1);
} else {
int var2 = this.indices1[var1];
int var3 = this.indices2[var1];
@@ -1410,21 +1410,21 @@ public class Model extends Entity {
}
if (this.faceColors3[var1] == -1) {
Rasterizer3D.method2977(modelViewportYs[var2], modelViewportYs[var3], modelViewportYs[var4], modelViewportXs[var2], modelViewportXs[var3], modelViewportXs[var4], this.faceColors1[var1], this.faceColors1[var1], this.faceColors1[var1], field1677[var5], field1677[var6], field1677[var7], field1652[var5], field1652[var6], field1652[var7], field1679[var5], field1679[var6], field1679[var7], this.faceTextures[var1]);
Rasterizer3D.method2973(modelViewportYs[var2], modelViewportYs[var3], modelViewportYs[var4], modelViewportXs[var2], modelViewportXs[var3], modelViewportXs[var4], this.faceColors1[var1], this.faceColors1[var1], this.faceColors1[var1], field1677[var5], field1677[var6], field1677[var7], field1652[var5], field1652[var6], field1652[var7], field1679[var5], field1679[var6], field1679[var7], this.faceTextures[var1]);
} else {
Rasterizer3D.method2977(modelViewportYs[var2], modelViewportYs[var3], modelViewportYs[var4], modelViewportXs[var2], modelViewportXs[var3], modelViewportXs[var4], this.faceColors1[var1], this.faceColors2[var1], this.faceColors3[var1], field1677[var5], field1677[var6], field1677[var7], field1652[var5], field1652[var6], field1652[var7], field1679[var5], field1679[var6], field1679[var7], this.faceTextures[var1]);
Rasterizer3D.method2973(modelViewportYs[var2], modelViewportYs[var3], modelViewportYs[var4], modelViewportXs[var2], modelViewportXs[var3], modelViewportXs[var4], this.faceColors1[var1], this.faceColors2[var1], this.faceColors3[var1], field1677[var5], field1677[var6], field1677[var7], field1652[var5], field1652[var6], field1652[var7], field1679[var5], field1679[var6], field1679[var7], this.faceTextures[var1]);
}
} else if (this.faceColors3[var1] == -1) {
Rasterizer3D.method2975(modelViewportYs[var2], modelViewportYs[var3], modelViewportYs[var4], modelViewportXs[var2], modelViewportXs[var3], modelViewportXs[var4], field1699[this.faceColors1[var1]]);
Rasterizer3D.method2971(modelViewportYs[var2], modelViewportYs[var3], modelViewportYs[var4], modelViewportXs[var2], modelViewportXs[var3], modelViewportXs[var4], field1699[this.faceColors1[var1]]);
} else {
Rasterizer3D.method2973(modelViewportYs[var2], modelViewportYs[var3], modelViewportYs[var4], modelViewportXs[var2], modelViewportXs[var3], modelViewportXs[var4], this.faceColors1[var1], this.faceColors2[var1], this.faceColors3[var1]);
Rasterizer3D.method2969(modelViewportYs[var2], modelViewportYs[var3], modelViewportYs[var4], modelViewportXs[var2], modelViewportXs[var3], modelViewportXs[var4], this.faceColors1[var1], this.faceColors2[var1], this.faceColors3[var1]);
}
}
}
@ObfuscatedName("ac")
final void method2875(int var1) {
final void method2871(int var1) {
int var2 = Rasterizer3D.Rasterizer3D_clipMidX;
int var3 = Rasterizer3D.Rasterizer3D_clipMidY;
int var4 = 0;
@@ -1542,14 +1542,14 @@ public class Model extends Entity {
}
if (this.faceColors3[var1] == -1) {
Rasterizer3D.method2977(var14, var15, var16, var11, var12, var13, this.faceColors1[var1], this.faceColors1[var1], this.faceColors1[var1], field1677[var17], field1677[var18], field1677[var19], field1652[var17], field1652[var18], field1652[var19], field1679[var17], field1679[var18], field1679[var19], this.faceTextures[var1]);
Rasterizer3D.method2973(var14, var15, var16, var11, var12, var13, this.faceColors1[var1], this.faceColors1[var1], this.faceColors1[var1], field1677[var17], field1677[var18], field1677[var19], field1652[var17], field1652[var18], field1652[var19], field1679[var17], field1679[var18], field1679[var19], this.faceTextures[var1]);
} else {
Rasterizer3D.method2977(var14, var15, var16, var11, var12, var13, field1690[0], field1690[1], field1690[2], field1677[var17], field1677[var18], field1677[var19], field1652[var17], field1652[var18], field1652[var19], field1679[var17], field1679[var18], field1679[var19], this.faceTextures[var1]);
Rasterizer3D.method2973(var14, var15, var16, var11, var12, var13, field1690[0], field1690[1], field1690[2], field1677[var17], field1677[var18], field1677[var19], field1652[var17], field1652[var18], field1652[var19], field1679[var17], field1679[var18], field1679[var19], this.faceTextures[var1]);
}
} else if (this.faceColors3[var1] == -1) {
Rasterizer3D.method2975(var14, var15, var16, var11, var12, var13, field1699[this.faceColors1[var1]]);
Rasterizer3D.method2971(var14, var15, var16, var11, var12, var13, field1699[this.faceColors1[var1]]);
} else {
Rasterizer3D.method2973(var14, var15, var16, var11, var12, var13, field1690[0], field1690[1], field1690[2]);
Rasterizer3D.method2969(var14, var15, var16, var11, var12, var13, field1690[0], field1690[1], field1690[2]);
}
}
@@ -1572,19 +1572,19 @@ public class Model extends Entity {
short var21 = this.faceTextures[var1];
if (this.faceColors3[var1] == -1) {
Rasterizer3D.method2977(var14, var15, var16, var11, var12, var13, this.faceColors1[var1], this.faceColors1[var1], this.faceColors1[var1], field1677[var17], field1677[var18], field1677[var19], field1652[var17], field1652[var18], field1652[var19], field1679[var17], field1679[var18], field1679[var19], var21);
Rasterizer3D.method2977(var14, var16, field1676[3], var11, var13, field1688[3], this.faceColors1[var1], this.faceColors1[var1], this.faceColors1[var1], field1677[var17], field1677[var18], field1677[var19], field1652[var17], field1652[var18], field1652[var19], field1679[var17], field1679[var18], field1679[var19], var21);
Rasterizer3D.method2973(var14, var15, var16, var11, var12, var13, this.faceColors1[var1], this.faceColors1[var1], this.faceColors1[var1], field1677[var17], field1677[var18], field1677[var19], field1652[var17], field1652[var18], field1652[var19], field1679[var17], field1679[var18], field1679[var19], var21);
Rasterizer3D.method2973(var14, var16, field1676[3], var11, var13, field1688[3], this.faceColors1[var1], this.faceColors1[var1], this.faceColors1[var1], field1677[var17], field1677[var18], field1677[var19], field1652[var17], field1652[var18], field1652[var19], field1679[var17], field1679[var18], field1679[var19], var21);
} else {
Rasterizer3D.method2977(var14, var15, var16, var11, var12, var13, field1690[0], field1690[1], field1690[2], field1677[var17], field1677[var18], field1677[var19], field1652[var17], field1652[var18], field1652[var19], field1679[var17], field1679[var18], field1679[var19], var21);
Rasterizer3D.method2977(var14, var16, field1676[3], var11, var13, field1688[3], field1690[0], field1690[2], field1690[3], field1677[var17], field1677[var18], field1677[var19], field1652[var17], field1652[var18], field1652[var19], field1679[var17], field1679[var18], field1679[var19], var21);
Rasterizer3D.method2973(var14, var15, var16, var11, var12, var13, field1690[0], field1690[1], field1690[2], field1677[var17], field1677[var18], field1677[var19], field1652[var17], field1652[var18], field1652[var19], field1679[var17], field1679[var18], field1679[var19], var21);
Rasterizer3D.method2973(var14, var16, field1676[3], var11, var13, field1688[3], field1690[0], field1690[2], field1690[3], field1677[var17], field1677[var18], field1677[var19], field1652[var17], field1652[var18], field1652[var19], field1679[var17], field1679[var18], field1679[var19], var21);
}
} else if (this.faceColors3[var1] == -1) {
var17 = field1699[this.faceColors1[var1]];
Rasterizer3D.method2975(var14, var15, var16, var11, var12, var13, var17);
Rasterizer3D.method2975(var14, var16, field1676[3], var11, var13, field1688[3], var17);
Rasterizer3D.method2971(var14, var15, var16, var11, var12, var13, var17);
Rasterizer3D.method2971(var14, var16, field1676[3], var11, var13, field1688[3], var17);
} else {
Rasterizer3D.method2973(var14, var15, var16, var11, var12, var13, field1690[0], field1690[1], field1690[2]);
Rasterizer3D.method2973(var14, var16, field1676[3], var11, var13, field1688[3], field1690[0], field1690[2], field1690[3]);
Rasterizer3D.method2969(var14, var15, var16, var11, var12, var13, field1690[0], field1690[1], field1690[2]);
Rasterizer3D.method2969(var14, var16, field1676[3], var11, var13, field1688[3], field1690[0], field1690[2], field1690[3]);
}
}
@@ -1624,10 +1624,10 @@ public class Model extends Entity {
}
boolean var26 = var25 || this.field1685 > 0;
int var27 = Clock.method3463();
int var27 = Clock.method3459();
int var28 = ViewportMouse.ViewportMouse_y;
boolean var30 = ViewportMouse.ViewportMouse_isInViewport;
boolean var32 = Language.method3635(var9);
boolean var32 = Language.method3627(var9);
boolean var33 = false;
int var35;
int var36;

62
runescape-client/src/main/java/ModelData.java
View File

@@ -274,18 +274,18 @@ public class ModelData extends Entity {
}
this.faceColors[this.faceCount] = var10.faceColors[var11];
this.indices1[this.faceCount] = this.method2763(var10, var10.indices1[var11]);
this.indices2[this.faceCount] = this.method2763(var10, var10.indices2[var11]);
this.indices3[this.faceCount] = this.method2763(var10, var10.indices3[var11]);
this.indices1[this.faceCount] = this.method2759(var10, var10.indices1[var11]);
this.indices2[this.faceCount] = this.method2759(var10, var10.indices2[var11]);
this.indices3[this.faceCount] = this.method2759(var10, var10.indices3[var11]);
++this.faceCount;
}
for (var11 = 0; var11 < var10.textureTriangleCount; ++var11) {
byte var12 = this.textureRenderTypes[this.textureTriangleCount] = var10.textureRenderTypes[var11];
if (var12 == 0) {
this.texTriangleX[this.textureTriangleCount] = (short)this.method2763(var10, var10.texTriangleX[var11]);
this.texTriangleY[this.textureTriangleCount] = (short)this.method2763(var10, var10.texTriangleY[var11]);
this.texTriangleZ[this.textureTriangleCount] = (short)this.method2763(var10, var10.texTriangleZ[var11]);
this.texTriangleX[this.textureTriangleCount] = (short)this.method2759(var10, var10.texTriangleX[var11]);
this.texTriangleY[this.textureTriangleCount] = (short)this.method2759(var10, var10.texTriangleY[var11]);
this.texTriangleZ[this.textureTriangleCount] = (short)this.method2759(var10, var10.texTriangleZ[var11]);
}
++this.textureTriangleCount;
@@ -301,9 +301,9 @@ public class ModelData extends Entity {
this.priority = 0;
this.isBoundsCalculated = false;
if (var1[var1.length - 1] == -1 && var1[var1.length - 2] == -1) {
this.method2820(var1);
this.method2816(var1);
} else {
this.method2762(var1);
this.method2758(var1);
}
}
@@ -381,7 +381,7 @@ public class ModelData extends Entity {
}
@ObfuscatedName("n")
void method2820(byte[] var1) {
void method2816(byte[] var1) {
Buffer var2 = new Buffer(var1);
Buffer var3 = new Buffer(var1);
Buffer var4 = new Buffer(var1);
@@ -687,7 +687,7 @@ public class ModelData extends Entity {
}
@ObfuscatedName("v")
void method2762(byte[] var1) {
void method2758(byte[] var1) {
boolean var2 = false;
boolean var3 = false;
Buffer var4 = new Buffer(var1);
@@ -967,7 +967,7 @@ public class ModelData extends Entity {
@ObfuscatedSignature(
signature = "(Ldw;I)I"
)
final int method2763(ModelData var1, int var2) {
final int method2759(ModelData var1, int var2) {
int var3 = -1;
int var4 = var1.verticesX[var2];
int var5 = var1.verticesY[var2];
@@ -998,7 +998,7 @@ public class ModelData extends Entity {
@ObfuscatedSignature(
signature = "()Ldw;"
)
public ModelData method2764() {
public ModelData method2760() {
ModelData var1 = new ModelData();
if (this.faceRenderTypes != null) {
var1.faceRenderTypes = new byte[this.faceCount];
@@ -1042,7 +1042,7 @@ public class ModelData extends Entity {
@ObfuscatedSignature(
signature = "([[IIIIZI)Ldw;"
)
public ModelData method2765(int[][] var1, int var2, int var3, int var4, boolean var5, int var6) {
public ModelData method2761(int[][] var1, int var2, int var3, int var4, boolean var5, int var6) {
this.calculateBounds();
int var7 = var2 + this.field1544;
int var8 = var2 + this.field1513;
@@ -1133,7 +1133,7 @@ public class ModelData extends Entity {
}
@ObfuscatedName("q")
void method2766() {
void method2762() {
int[] var1;
int var2;
int var10002;
@@ -1194,7 +1194,7 @@ public class ModelData extends Entity {
}
@ObfuscatedName("m")
public void method2835() {
public void method2831() {
for (int var1 = 0; var1 < this.verticesCount; ++var1) {
int var2 = this.verticesX[var1];
this.verticesX[var1] = this.verticesZ[var1];
@@ -1205,7 +1205,7 @@ public class ModelData extends Entity {
}
@ObfuscatedName("i")
public void method2761() {
public void method2757() {
for (int var1 = 0; var1 < this.verticesCount; ++var1) {
this.verticesX[var1] = -this.verticesX[var1];
this.verticesZ[var1] = -this.verticesZ[var1];
@@ -1215,7 +1215,7 @@ public class ModelData extends Entity {
}
@ObfuscatedName("c")
public void method2800() {
public void method2796() {
for (int var1 = 0; var1 < this.verticesCount; ++var1) {
int var2 = this.verticesZ[var1];
this.verticesZ[var1] = this.verticesX[var1];
@@ -1226,7 +1226,7 @@ public class ModelData extends Entity {
}
@ObfuscatedName("b")
public void method2767(int var1) {
public void method2763(int var1) {
int var2 = ModelData_sine[var1];
int var3 = ModelData_cosine[var1];
@@ -1279,7 +1279,7 @@ public class ModelData extends Entity {
}
@ObfuscatedName("x")
public void method2774() {
public void method2770() {
int var1;
for (var1 = 0; var1 < this.verticesCount; ++var1) {
this.verticesZ[var1] = -this.verticesZ[var1];
@@ -1532,7 +1532,7 @@ public class ModelData extends Entity {
if (var17 == 1) {
var19 = this.faceNormals[var16];
var14 = (var4 * var19.y + var5 * var19.z + var3 * var19.x) / (var7 / 2 + var7) + var1;
var8.faceColors1[var16] = method2781(this.faceColors[var16] & '\uffff', var14);
var8.faceColors1[var16] = method2777(this.faceColors[var16] & '\uffff', var14);
var8.faceColors3[var16] = -1;
} else if (var17 == 3) {
var8.faceColors1[var16] = 128;
@@ -1549,7 +1549,7 @@ public class ModelData extends Entity {
}
var14 = (var4 * var13.y + var5 * var13.z + var3 * var13.x) / (var7 * var13.magnitude) + var1;
var8.faceColors1[var16] = method2781(var15, var14);
var8.faceColors1[var16] = method2777(var15, var14);
if (this.field1545 != null && this.field1545[this.indices2[var16]] != null) {
var13 = this.field1545[this.indices2[var16]];
} else {
@@ -1557,7 +1557,7 @@ public class ModelData extends Entity {
}
var14 = (var4 * var13.y + var5 * var13.z + var3 * var13.x) / (var7 * var13.magnitude) + var1;
var8.faceColors2[var16] = method2781(var15, var14);
var8.faceColors2[var16] = method2777(var15, var14);
if (this.field1545 != null && this.field1545[this.indices3[var16]] != null) {
var13 = this.field1545[this.indices3[var16]];
} else {
@@ -1565,13 +1565,13 @@ public class ModelData extends Entity {
}
var14 = (var4 * var13.y + var5 * var13.z + var3 * var13.x) / (var7 * var13.magnitude) + var1;
var8.faceColors3[var16] = method2781(var15, var14);
var8.faceColors3[var16] = method2777(var15, var14);
}
} else if (var17 != 0) {
if (var17 == 1) {
var19 = this.faceNormals[var16];
var14 = (var4 * var19.y + var5 * var19.z + var3 * var19.x) / (var7 / 2 + var7) + var1;
var8.faceColors1[var16] = method2771(var14);
var8.faceColors1[var16] = method2767(var14);
var8.faceColors3[var16] = -1;
} else {
var8.faceColors3[var16] = -2;
@@ -1584,7 +1584,7 @@ public class ModelData extends Entity {
}
var14 = (var4 * var13.y + var5 * var13.z + var3 * var13.x) / (var7 * var13.magnitude) + var1;
var8.faceColors1[var16] = method2771(var14);
var8.faceColors1[var16] = method2767(var14);
if (this.field1545 != null && this.field1545[this.indices2[var16]] != null) {
var13 = this.field1545[this.indices2[var16]];
} else {
@@ -1592,7 +1592,7 @@ public class ModelData extends Entity {
}
var14 = (var4 * var13.y + var5 * var13.z + var3 * var13.x) / (var7 * var13.magnitude) + var1;
var8.faceColors2[var16] = method2771(var14);
var8.faceColors2[var16] = method2767(var14);
if (this.field1545 != null && this.field1545[this.indices3[var16]] != null) {
var13 = this.field1545[this.indices3[var16]];
} else {
@@ -1600,11 +1600,11 @@ public class ModelData extends Entity {
}
var14 = (var4 * var13.y + var5 * var13.z + var3 * var13.x) / (var7 * var13.magnitude) + var1;
var8.faceColors3[var16] = method2771(var14);
var8.faceColors3[var16] = method2767(var14);
}
}
this.method2766();
this.method2762();
var8.verticesCount = this.verticesCount;
var8.verticesX = this.verticesX;
var8.verticesY = this.verticesY;
@@ -1636,7 +1636,7 @@ public class ModelData extends Entity {
@ObfuscatedSignature(
signature = "(Ldw;Ldw;IIIZ)V"
)
static void method2779(ModelData var0, ModelData var1, int var2, int var3, int var4, boolean var5) {
static void method2775(ModelData var0, ModelData var1, int var2, int var3, int var4, boolean var5) {
var0.calculateBounds();
var0.calculateVertexNormals();
var1.calculateBounds();
@@ -1721,7 +1721,7 @@ public class ModelData extends Entity {
}
@ObfuscatedName("k")
static final int method2781(int var0, int var1) {
static final int method2777(int var0, int var1) {
var1 = (var0 & 127) * var1 >> 7;
if (var1 < 2) {
var1 = 2;
@@ -1733,7 +1733,7 @@ public class ModelData extends Entity {
}
@ObfuscatedName("ac")
static final int method2771(int var0) {
static final int method2767(int var0) {
if (var0 < 2) {
var0 = 2;
} else if (var0 > 126) {

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

@@ -1,6 +1,5 @@
import net.runelite.mapping.Export;
import net.runelite.mapping.Implements;
import net.runelite.mapping.ObfuscatedGetter;
import net.runelite.mapping.ObfuscatedName;
import net.runelite.mapping.ObfuscatedSignature;
@@ -8,9 +7,6 @@ import net.runelite.mapping.ObfuscatedSignature;
@Implements("ModelData0")
public class ModelData0 {
@ObfuscatedName("ha")
@ObfuscatedGetter(
intValue = -1351160427
)
static int field1840;
ModelData0() {
@@ -21,7 +17,7 @@ public class ModelData0 {
signature = "(II)Z",
garbageValue = "1264128253"
)
public static boolean method3215(int var0) {
public static boolean method3211(int var0) {
return (var0 >> 28 & 1) != 0;
}
@@ -41,7 +37,7 @@ public class ModelData0 {
signature = "(II)V",
garbageValue = "1738289394"
)
static final void method3214(int var0) {
static final void method3210(int var0) {
if (var0 >= 0) {
int var1 = Client.menuArguments1[var0];
int var2 = Client.menuArguments2[var0];

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

@@ -161,9 +161,9 @@ public class MouseRecorder implements Runnable {
Client.loginState = 0;
Client.field669 = 0;
Client.field670 = 0;
Client.timer.method4938(var0);
Client.timer.method4926(var0);
if (var0 != 20) {
PlayerType.method4104(false);
PlayerType.method4092(false);
}
}
@@ -200,7 +200,7 @@ public class MouseRecorder implements Runnable {
GrandExchangeOfferTotalQuantityComparator.worldSelectArrows = null;
Frames.worldSelectStars = null;
Skeleton.field1767 = null;
BufferedSink.loginScreenRunesAnimation.method1821();
BufferedSink.loginScreenRunesAnimation.method1817();
class197.field2386 = 1;
class197.musicTrackArchive = null;
class188.musicTrackGroupId = -1;
@@ -208,7 +208,7 @@ public class MouseRecorder implements Runnable {
TileItem.field1223 = 0;
WorldMapSectionType.musicTrackBoolean = false;
MusicPatchNode2.field2382 = 2;
DirectByteArrayCopier.method3924(true);
DirectByteArrayCopier.method3915(true);
Login.field1160 = false;
}
} else {
@@ -226,9 +226,9 @@ public class MouseRecorder implements Runnable {
)
static final void method1213() {
if (Client.logoutTimer > 0) {
DynamicObject.method2223();
DynamicObject.method2219();
} else {
Client.timer.method4937();
Client.timer.method4925();
updateGameState(40);
class30.field251 = Client.packetWriter.getSocket();
Client.packetWriter.removeSocket();

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

@@ -357,7 +357,7 @@ public class MusicPatch extends Node {
var32 = var41 * (var30 - var44) + (var30 - var44) / 2;
for (var33 = var44; var33 < var30; ++var33) {
var34 = World.method1814(var32, var30 - var44);
var34 = World.method1810(var32, var30 - var44);
this.field2459[var33] = (byte)(var34 * this.field2459[var33] + 32 >> 6);
var32 += var31 - var41;
}
@@ -405,7 +405,7 @@ public class MusicPatch extends Node {
var32 = var47 * (var30 - var44) + (var30 - var44) / 2;
for (var33 = var44; var33 < var30; ++var33) {
var34 = World.method1814(var32, var30 - var44);
var34 = World.method1810(var32, var30 - var44);
int var35 = var34 + (this.field2456[var33] & 255);
if (var35 < 0) {
var35 = 0;
@@ -483,7 +483,7 @@ public class MusicPatch extends Node {
signature = "(Ldq;[B[IB)Z",
garbageValue = "43"
)
boolean method3856(SoundCache var1, byte[] var2, int[] var3) {
boolean method3847(SoundCache var1, byte[] var2, int[] var3) {
boolean var4 = true;
int var5 = 0;
RawSound var6 = null;
@@ -531,7 +531,7 @@ public class MusicPatch extends Node {
signature = "(B)V",
garbageValue = "10"
)
public static void method3868() {
public static void method3859() {
VarpDefinition.VarpDefinition_cached.clear();
}

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

@@ -81,7 +81,7 @@ public class MusicPatchNode extends Node {
int field2431;
@ObfuscatedName("a")
@ObfuscatedGetter(
intValue = 1967284030
intValue = -1163841633
)
int field2432;
@ObfuscatedName("e")
@@ -129,7 +129,7 @@ public class MusicPatchNode extends Node {
signature = "(B)V",
garbageValue = "2"
)
void method3794() {
void method3785() {
this.patch = null;
this.rawSound = null;
this.field2435 = null;
@@ -161,14 +161,14 @@ public class MusicPatchNode extends Node {
signature = "(Lho;III)V",
garbageValue = "1345950027"
)
static final void method3798(Widget var0, int var1, int var2) {
static final void method3789(Widget var0, int var1, int var2) {
if (var0.buttonType == 1) {
WorldMapData_1.insertMenuItemNoShift(var0.buttonText, "", 24, 0, 0, var0.id);
}
String var3;
if (var0.buttonType == 2 && !Client.isSpellSelected) {
var3 = VerticalAlignment.method4321(var0);
var3 = VerticalAlignment.method4309(var0);
if (var3 != null) {
WorldMapData_1.insertMenuItemNoShift(var3, World.colorStartTag(65280) + var0.spellName, 25, 0, -1, var0.id);
}
@@ -321,19 +321,19 @@ public class MusicPatchNode extends Node {
}
} else {
for (var19 = 9; var19 >= 5; --var19) {
String var21 = FaceNormal.method3228(var0, var19);
String var21 = FaceNormal.method3224(var0, var19);
if (var21 != null) {
WorldMapData_1.insertMenuItemNoShift(var21, var0.dataText, 1007, var19 + 1, var0.childIndex, var0.id);
}
}
var3 = VerticalAlignment.method4321(var0);
var3 = VerticalAlignment.method4309(var0);
if (var3 != null) {
WorldMapData_1.insertMenuItemNoShift(var3, var0.dataText, 25, 0, var0.childIndex, var0.id);
}
for (var4 = 4; var4 >= 0; --var4) {
String var22 = FaceNormal.method3228(var0, var4);
String var22 = FaceNormal.method3224(var0, var4);
if (var22 != null) {
AttackOption.insertMenuItem(var22, var0.dataText, 57, var4 + 1, var0.childIndex, var0.id, var0.field2687);
}
@@ -492,7 +492,7 @@ public class MusicPatchNode extends Node {
if (var9.contentType == 1400) {
Tiles.worldMap.addElementMenuOptions(var10, var11, var9.width, var9.height, var17, var18);
} else {
method3798(var9, var17 - var10, var18 - var11);
method3789(var9, var17 - var10, var18 - var11);
}
}
@@ -509,7 +509,7 @@ public class MusicPatchNode extends Node {
var24 = KeyHandler.KeyHandler_pressedKeys[var9.field2552[var20][var23]];
}
if (MusicPatchNode2.method3658(var9.field2552[var20][var23]) || var24) {
if (MusicPatchNode2.method3649(var9.field2552[var20][var23]) || var24) {
var21 = true;
if (var9.field2684 != null && var9.field2684[var20] > Client.cycle) {
break;
@@ -530,7 +530,7 @@ public class MusicPatchNode extends Node {
} else if (var20 == 10) {
class208.Widget_runOnTargetLeave();
class32.selectSpell(var9.id, var9.childIndex, class2.method30(class2.getWidgetClickMask(var9)), var9.itemId);
Client.selectedSpellActionName = VerticalAlignment.method4321(var9);
Client.selectedSpellActionName = VerticalAlignment.method4309(var9);
if (Client.selectedSpellActionName == null) {
Client.selectedSpellActionName = "null";
}
@@ -586,7 +586,7 @@ public class MusicPatchNode extends Node {
}
if (var9.contentType == 1400) {
Tiles.worldMap.method6445(var17, var18, var33 & var34, var33 & var21);
Tiles.worldMap.method6422(var17, var18, var33 & var34, var33 & var21);
}
if (Client.clickedWidget != null && var9 != Client.clickedWidget && var33 && GrandExchangeOfferTotalQuantityComparator.method93(class2.getWidgetClickMask(var9))) {

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

@@ -63,7 +63,7 @@ public class MusicPatchNode2 {
@Export("playSong")
static void playSong(int var0) {
if (var0 == -1 && !Client.field759) {
VertexNormal.method2960();
VertexNormal.method2956();
} else if (var0 != -1 && var0 != Client.field666 && Client.field761 != 0 && !Client.field759) {
Archive var1 = class225.archive6;
int var2 = Client.field761;
@@ -84,7 +84,7 @@ public class MusicPatchNode2 {
signature = "(IB)Z",
garbageValue = "-93"
)
static boolean method3658(int var0) {
static boolean method3649(int var0) {
for (int var1 = 0; var1 < Client.field857; ++var1) {
if (Client.field859[var1] == var0) {
return true;

42
runescape-client/src/main/java/MusicPatchPcmStream.java
View File

@@ -42,7 +42,7 @@ public class MusicPatchPcmStream extends PcmStream {
signature = "(Lgu;[IIIII)V",
garbageValue = "1901627378"
)
void method3879(MusicPatchNode var1, int[] var2, int var3, int var4, int var5) {
void method3870(MusicPatchNode var1, int[] var2, int var3, int var4, int var5) {
if ((this.superStream.field2404[var1.field2420] & 4) != 0 && var1.field2433 < 0) {
int var6 = this.superStream.field2401[var1.field2420] / UrlRequest.PcmPlayer_sampleRate;
@@ -65,20 +65,20 @@ public class MusicPatchPcmStream extends PcmStream {
RawPcmStream var10 = var1.stream;
if (this.superStream.field2408[var1.field2420] == 0) {
var1.stream = RawPcmStream.method2548(var1.rawSound, var10.method2531(), var10.method2522(), var10.method2523());
var1.stream = RawPcmStream.method2544(var1.rawSound, var10.method2527(), var10.method2518(), var10.method2519());
} else {
var1.stream = RawPcmStream.method2548(var1.rawSound, var10.method2531(), 0, var10.method2523());
this.superStream.method3682(var1, var1.patch.field2457[var1.field2424] < 0);
var1.stream.method2527(var8, var10.method2522());
var1.stream = RawPcmStream.method2544(var1.rawSound, var10.method2527(), 0, var10.method2519());
this.superStream.method3673(var1, var1.patch.field2457[var1.field2424] < 0);
var1.stream.method2523(var8, var10.method2518());
}
if (var1.patch.field2457[var1.field2424] < 0) {
var1.stream.setNumLoops(-1);
}
var10.method2529(var8);
var10.method2525(var8);
var10.fill(var2, var3, var5 - var3);
if (var10.method2533()) {
if (var10.method2529()) {
this.mixer.addSubStream(var10);
}
}
@@ -92,17 +92,17 @@ public class MusicPatchPcmStream extends PcmStream {
signature = "(Lgu;IB)V",
garbageValue = "66"
)
void method3875(MusicPatchNode var1, int var2) {
void method3866(MusicPatchNode var1, int var2) {
if ((this.superStream.field2404[var1.field2420] & 4) != 0 && var1.field2433 < 0) {
int var3 = this.superStream.field2401[var1.field2420] / UrlRequest.PcmPlayer_sampleRate;
int var4 = (var3 + 1048575 - var1.field2419) / var3;
var1.field2419 = var3 * var2 + var1.field2419 & 1048575;
if (var4 <= var2) {
if (this.superStream.field2408[var1.field2420] == 0) {
var1.stream = RawPcmStream.method2548(var1.rawSound, var1.stream.method2531(), var1.stream.method2522(), var1.stream.method2523());
var1.stream = RawPcmStream.method2544(var1.rawSound, var1.stream.method2527(), var1.stream.method2518(), var1.stream.method2519());
} else {
var1.stream = RawPcmStream.method2548(var1.rawSound, var1.stream.method2531(), 0, var1.stream.method2523());
this.superStream.method3682(var1, var1.patch.field2457[var1.field2424] < 0);
var1.stream = RawPcmStream.method2544(var1.rawSound, var1.stream.method2527(), 0, var1.stream.method2519());
this.superStream.method3673(var1, var1.patch.field2457[var1.field2424] < 0);
}
if (var1.patch.field2457[var1.field2424] < 0) {
@@ -148,7 +148,7 @@ public class MusicPatchPcmStream extends PcmStream {
}
@ObfuscatedName("m")
protected int vmethod3882() {
protected int vmethod3873() {
return 0;
}
@@ -158,21 +158,21 @@ public class MusicPatchPcmStream extends PcmStream {
this.mixer.fill(var1, var2, var3);
for (MusicPatchNode var6 = (MusicPatchNode)this.queue.last(); var6 != null; var6 = (MusicPatchNode)this.queue.previous()) {
if (!this.superStream.method3704(var6)) {
if (!this.superStream.method3695(var6)) {
int var4 = var2;
int var5 = var3;
do {
if (var5 <= var6.field2438) {
this.method3879(var6, var1, var4, var5, var4 + var5);
this.method3870(var6, var1, var4, var5, var4 + var5);
var6.field2438 -= var5;
break;
}
this.method3879(var6, var1, var4, var6.field2438, var4 + var5);
this.method3870(var6, var1, var4, var6.field2438, var4 + var5);
var4 += var6.field2438;
var5 -= var6.field2438;
} while(!this.superStream.method3705(var6, var1, var4, var5));
} while(!this.superStream.method3696(var6, var1, var4, var5));
}
}
@@ -184,19 +184,19 @@ public class MusicPatchPcmStream extends PcmStream {
this.mixer.skip(var1);
for (MusicPatchNode var3 = (MusicPatchNode)this.queue.last(); var3 != null; var3 = (MusicPatchNode)this.queue.previous()) {
if (!this.superStream.method3704(var3)) {
if (!this.superStream.method3695(var3)) {
int var2 = var1;
do {
if (var2 <= var3.field2438) {
this.method3875(var3, var2);
this.method3866(var3, var2);
var3.field2438 -= var2;
break;
}
this.method3875(var3, var3.field2438);
this.method3866(var3, var3.field2438);
var2 -= var3.field2438;
} while(!this.superStream.method3705(var3, (int[])null, 0, var2));
} while(!this.superStream.method3696(var3, (int[])null, 0, var2));
}
}
@@ -205,7 +205,7 @@ public class MusicPatchPcmStream extends PcmStream {
@ObfuscatedName("gf")
@ObfuscatedSignature(
signature = "(IIII)I",
garbageValue = "-2075145984"
garbageValue = "-781967444"
)
@Export("getTileHeight")
static final int getTileHeight(int var0, int var1, int var2) {

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

@@ -336,7 +336,7 @@ public class MusicTrack extends Node {
}
@ObfuscatedName("n")
void method3895() {
void method3886() {
if (this.table == null) {
this.table = new NodeHashTable(16);
int[] var1 = new int[16];

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

@@ -28,7 +28,7 @@ public final class NPC extends Actor {
signature = "(IBB)V",
garbageValue = "-90"
)
final void method2048(int var1, byte var2) {
final void method2044(int var1, byte var2) {
int var3 = super.pathX[0];
int var4 = super.pathY[0];
if (var1 == 0) {
@@ -91,7 +91,7 @@ public final class NPC extends Actor {
signature = "(IIZB)V",
garbageValue = "1"
)
final void method2042(int var1, int var2, boolean var3) {
final void method2038(int var1, int var2, boolean var3) {
if (super.sequence != -1 && GrandExchangeOfferUnitPriceComparator.SequenceDefinition_get(super.sequence).field3510 == 1) {
super.sequence = -1;
}
@@ -123,7 +123,7 @@ public final class NPC extends Actor {
super.pathX[0] = var1;
super.pathY[0] = var2;
super.x = super.pathX[0] * 128 + super.field932 * -527978816;
super.y = super.pathY[0] * 128 + super.field932 * -527978816;
super.y = super.field932 * 1330337984 + super.pathY[0] * -595411840;
}
@ObfuscatedName("y")
@@ -177,7 +177,7 @@ public final class NPC extends Actor {
signature = "(Ljava/lang/String;II)V",
garbageValue = "89732729"
)
static final void method2050(String var0, int var1) {
static final void method2046(String var0, int var1) {
PacketBufferNode var2 = InterfaceParent.getPacketBufferNode(ClientPacket.field2254, Client.packetWriter.isaacCipher);
var2.packetBuffer.writeByte(class268.stringCp1252NullTerminatedByteSize(var0) + 1);
var2.packetBuffer.writeByte(var1);

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

@@ -140,7 +140,7 @@ public class NPCDefinition extends DualNode {
int ambient;
@ObfuscatedName("az")
@ObfuscatedGetter(
intValue = -1785698549
intValue = -1216133169
)
@Export("contrast")
int contrast;
@@ -321,7 +321,7 @@ public class NPCDefinition extends DualNode {
} else if (var2 == 100) {
this.ambient = var1.readByte();
} else if (var2 == 101) {
this.contrast = var1.readByte() * 5;
this.contrast = var1.readByte();
} else if (var2 == 102) {
this.headIconPrayer = var1.readUnsignedShort();
} else if (var2 == 103) {
@@ -421,7 +421,7 @@ public class NPCDefinition extends DualNode {
}
}
var5 = var11.toModel(this.ambient + 64, this.contrast + 850, -30, -50, -30);
var5 = var11.toModel(this.ambient + 64, this.contrast * 5 + 850, -30, -50, -30);
NpcDefinition_cachedModels.put(var5, (long)this.id);
}
@@ -555,7 +555,7 @@ public class NPCDefinition extends DualNode {
)
@Export("getIntParam")
public int getIntParam(int var1, int var2) {
return HealthBar.method2034(this.params, var1, var2);
return HealthBar.method2030(this.params, var1, var2);
}
@ObfuscatedName("i")
@@ -565,7 +565,7 @@ public class NPCDefinition extends DualNode {
)
@Export("getStringParam")
public String getStringParam(int var1, String var2) {
return class96.method2263(this.params, var1, var2);
return class96.method2259(this.params, var1, var2);
}
@ObfuscatedName("v")
@@ -575,7 +575,7 @@ public class NPCDefinition extends DualNode {
)
@Export("SpriteBuffer_getSprite")
public static Sprite SpriteBuffer_getSprite(AbstractArchive var0, int var1, int var2) {
return !VertexNormal.method2962(var0, var1, var2) ? null : FillMode.method6030();
return !VertexNormal.method2958(var0, var1, var2) ? null : FillMode.method6007();
}
@ObfuscatedName("gr")
@@ -583,7 +583,7 @@ public class NPCDefinition extends DualNode {
signature = "(IIIIIIII)V",
garbageValue = "474931921"
)
static final void method4677(int var0, int var1, int var2, int var3, int var4, int var5, int var6) {
static final void method4665(int var0, int var1, int var2, int var3, int var4, int var5, int var6) {
int var8 = var6 - 334;
if (var8 < 0) {
var8 = 0;
@@ -622,11 +622,11 @@ public class NPCDefinition extends DualNode {
WorldMapIcon_1.cameraZ = var2 - var12;
IgnoreList.cameraPitch = var3;
WorldMapSection2.cameraYaw = var4;
if (Client.oculusOrbState == 1 && Client.staffModLevel >= 2 && Client.cycle % 50 == 0 && (ObjectSound.oculusOrbFocalPointX >> 7 != class223.localPlayer.x >> 7 || class14.oculusOrbFocalPointY >> 7 != class223.localPlayer.y >> 7)) {
if (Client.oculusOrbState == 1 && Client.staffModLevel >= 2 && Client.cycle % 50 == 0 && (ObjectSound.oculusOrbFocalPointX >> 7 != class223.localPlayer.x >> 7 || class14.oculusOrbFocalPointY >> 7 != class223.localPlayer.y * 682054857 >> 7)) {
var13 = class223.localPlayer.plane;
var14 = class223.baseX * 64 + (ObjectSound.oculusOrbFocalPointX >> 7);
var15 = class286.baseY * 64 + (class14.oculusOrbFocalPointY >> 7);
class287.method5220(var14, var15, var13, true);
class287.method5205(var14, var15, var13, true);
}
}

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

@@ -139,7 +139,7 @@ public class NetCache {
signature = "(IIS)Z",
garbageValue = "20573"
)
static boolean method4296(int var0, int var1) {
static boolean method4284(int var0, int var1) {
return var0 != 4 || var1 < 8;
}
@@ -163,7 +163,7 @@ public class NetCache {
signature = "(IB)V",
garbageValue = "-101"
)
static void method4279(int var0) {
static void method4267(int var0) {
Client.oculusOrbState = var0;
}
}

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

@@ -234,6 +234,14 @@ public final class NetSocket extends AbstractSocket implements Runnable {
this.close();
}
protected void aav() {
this.close();
}
protected void aao() {
this.close();
}
public void run() {
try {
while (true) {
@@ -340,7 +348,7 @@ public final class NetSocket extends AbstractSocket implements Runnable {
signature = "(Ljava/lang/String;I)Ljava/lang/String;",
garbageValue = "-175447114"
)
public static String method3471(String var0) {
public static String method3467(String var0) {
int var1 = var0.length();
char[] var2 = new char[var1];
byte var3 = 2;
@@ -350,7 +358,7 @@ public final class NetSocket extends AbstractSocket implements Runnable {
if (var3 == 0) {
var5 = Character.toLowerCase(var5);
} else if (var3 == 2 || Character.isUpperCase(var5)) {
var5 = UrlRequester.method3260(var5);
var5 = UrlRequester.method3256(var5);
}
if (Character.isLetter(var5)) {
@@ -378,8 +386,8 @@ public final class NetSocket extends AbstractSocket implements Runnable {
signature = "(II)V",
garbageValue = "-1514465632"
)
static final void method3472(int var0) {
class325.method6190();
static final void method3468(int var0) {
class325.method6167();
for (ObjectSound var1 = (ObjectSound)ObjectSound.objectSounds.last(); var1 != null; var1 = (ObjectSound)ObjectSound.objectSounds.previous()) {
if (var1.obj != null) {
@@ -438,15 +446,15 @@ public final class NetSocket extends AbstractSocket implements Runnable {
if (var3 != Client.field761) {
if (Client.field761 == 0 && Client.field666 != -1) {
class83.method2068(class225.archive6, Client.field666, 0, var3, false);
class83.method2064(class225.archive6, Client.field666, 0, var3, false);
Client.field759 = false;
} else if (var3 == 0) {
VertexNormal.method2960();
VertexNormal.method2956();
Client.field759 = false;
} else if (class197.field2386 != 0) {
TileItem.field1223 = var3;
} else {
class49.midiPcmStream.method3760(var3);
class49.midiPcmStream.method3751(var3);
}
Client.field761 = var3;
@@ -514,7 +522,7 @@ public final class NetSocket extends AbstractSocket implements Runnable {
}
if (var4 == 18) {
Client.playerAttackOption = (AttackOption)findEnumerated(FloorUnderlayDefinition.method4395(), var2);
Client.playerAttackOption = (AttackOption)findEnumerated(FloorUnderlayDefinition.method4383(), var2);
if (Client.playerAttackOption == null) {
Client.playerAttackOption = AttackOption.AttackOption_dependsOnCombatLevels;
}
@@ -529,7 +537,7 @@ public final class NetSocket extends AbstractSocket implements Runnable {
}
if (var4 == 22) {
Client.npcAttackOption = (AttackOption)findEnumerated(FloorUnderlayDefinition.method4395(), var2);
Client.npcAttackOption = (AttackOption)findEnumerated(FloorUnderlayDefinition.method4383(), var2);
if (Client.npcAttackOption == null) {
Client.npcAttackOption = AttackOption.AttackOption_dependsOnCombatLevels;
}

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

@@ -107,7 +107,7 @@ public class ObjectDefinition extends DualNode {
public int int1;
@ObfuscatedName("f")
@ObfuscatedGetter(
intValue = -1687714560
intValue = 1385916293
)
@Export("clipType")
int clipType;
@@ -137,7 +137,7 @@ public class ObjectDefinition extends DualNode {
int ambient;
@ObfuscatedName("az")
@ObfuscatedGetter(
intValue = -308737111
intValue = -1558537711
)
@Export("contrast")
int contrast;
@@ -275,7 +275,7 @@ public class ObjectDefinition extends DualNode {
this.interactType = 2;
this.boolean1 = true;
this.int1 = -1;
this.clipType = -256;
this.clipType = -1;
this.nonFlatShading = false;
this.modelClipped = false;
this.animationId = -1;
@@ -416,7 +416,7 @@ public class ObjectDefinition extends DualNode {
} else if (var2 == 29) {
this.ambient = var1.readByte();
} else if (var2 == 39) {
this.contrast = var1.readByte() * 25;
this.contrast = var1.readByte();
} else if (var2 >= 30 && var2 < 35) {
this.actions[var2 - 30] = var1.readStringCp1252NullTerminated();
if (this.actions[var2 - 30].equalsIgnoreCase("Hidden")) {
@@ -481,7 +481,7 @@ public class ObjectDefinition extends DualNode {
this.soundEffectIds[var4] = var1.readUnsignedShort();
}
} else if (var2 == 81) {
this.clipType = var1.readUnsignedByte() * 65536;
this.clipType = var1.readUnsignedByte() * 256;
} else if (var2 == 82) {
this.mapIconId = var1.readUnsignedShort();
} else if (var2 == 249) {
@@ -526,7 +526,7 @@ public class ObjectDefinition extends DualNode {
signature = "(II)Z",
garbageValue = "1830976839"
)
public final boolean method4567(int var1) {
public final boolean method4555(int var1) {
if (this.models != null) {
for (int var4 = 0; var4 < this.models.length; ++var4) {
if (this.models[var4] == var1) {
@@ -592,10 +592,10 @@ public class ObjectDefinition extends DualNode {
}
if (!this.nonFlatShading) {
var9 = var10.toModel(this.ambient + 64, this.contrast + 768, -50, -10, -50);
var9 = var10.toModel(this.ambient + 64, this.contrast * 25 + 768, -50, -10, -50);
} else {
var10.ambient = (short)(this.ambient + 64);
var10.contrast = (short)(this.contrast + 768);
var10.contrast = (short)(this.contrast * 25 + 768);
var10.calculateVertexNormals();
var9 = var10;
}
@@ -604,14 +604,14 @@ public class ObjectDefinition extends DualNode {
}
if (this.nonFlatShading) {
var9 = ((ModelData)var9).method2764();
var9 = ((ModelData)var9).method2760();
}
if (this.clipType * 256 >= 0) {
if (this.clipType * 65536 >= 0) {
if (var9 instanceof Model) {
var9 = ((Model)var9).contourGround(var3, var4, var5, var6, true, this.clipType * 256);
var9 = ((Model)var9).contourGround(var3, var4, var5, var6, true, this.clipType * 65536);
} else if (var9 instanceof ModelData) {
var9 = ((ModelData)var9).method2765(var3, var4, var5, var6, true, this.clipType * 256);
var9 = ((ModelData)var9).method2761(var3, var4, var5, var6, true, this.clipType * 65536);
}
}
@@ -639,12 +639,12 @@ public class ObjectDefinition extends DualNode {
return null;
}
var9 = var10.toModel(this.ambient + 64, this.contrast + 768, -50, -10, -50);
var9 = var10.toModel(this.ambient + 64, this.contrast * 25 + 768, -50, -10, -50);
ObjectDefinition_cachedModels.put(var9, var7);
}
if (this.clipType * 256 >= 0) {
var9 = var9.contourGround(var3, var4, var5, var6, true, this.clipType * 256);
if (this.clipType * 65536 >= 0) {
var9 = var9.contourGround(var3, var4, var5, var6, true, this.clipType * 65536);
}
return var9;
@@ -671,11 +671,11 @@ public class ObjectDefinition extends DualNode {
return null;
}
var11 = var12.toModel(this.ambient + 64, this.contrast + 768, -50, -10, -50);
var11 = var12.toModel(this.ambient + 64, this.contrast * 25 + 768, -50, -10, -50);
ObjectDefinition_cachedModels.put(var11, var9);
}
if (var7 == null && this.clipType * 256 == -1) {
if (var7 == null && this.clipType * 65536 == -1) {
return var11;
} else {
if (var7 != null) {
@@ -684,8 +684,8 @@ public class ObjectDefinition extends DualNode {
var11 = var11.toSharedSequenceModel(true);
}
if (this.clipType * 256 >= 0) {
var11 = var11.contourGround(var3, var4, var5, var6, false, this.clipType * 256);
if (this.clipType * 65536 >= 0) {
var11 = var11.contourGround(var3, var4, var5, var6, false, this.clipType * 65536);
}
return var11;
@@ -733,7 +733,7 @@ public class ObjectDefinition extends DualNode {
}
if (var4) {
var3.method2774();
var3.method2770();
}
ObjectDefinition_cachedModelData.put(var3, (long)var7);
@@ -775,7 +775,7 @@ public class ObjectDefinition extends DualNode {
}
if (var10) {
var3.method2774();
var3.method2770();
}
ObjectDefinition_cachedModelData.put(var3, (long)var5);
@@ -797,17 +797,17 @@ public class ObjectDefinition extends DualNode {
ModelData var8 = new ModelData(var3, var2 == 0 && !var4 && !var11, this.recolorFrom == null, null == this.retextureFrom, true);
if (var1 == 4 && var2 > 3) {
var8.method2767(256);
var8.method2763(256);
var8.changeOffset(45, 0, -45);
}
var2 &= 3;
if (var2 == 1) {
var8.method2835();
var8.method2831();
} else if (var2 == 2) {
var8.method2761();
var8.method2757();
} else if (var2 == 3) {
var8.method2800();
var8.method2796();
}
if (this.recolorFrom != null) {
@@ -864,7 +864,7 @@ public class ObjectDefinition extends DualNode {
)
@Export("getIntParam")
public int getIntParam(int var1, int var2) {
return HealthBar.method2034(this.params, var1, var2);
return HealthBar.method2030(this.params, var1, var2);
}
@ObfuscatedName("o")
@@ -874,7 +874,7 @@ public class ObjectDefinition extends DualNode {
)
@Export("getStringParam")
public String getStringParam(int var1, String var2) {
return class96.method2263(this.params, var1, var2);
return class96.method2259(this.params, var1, var2);
}
@ObfuscatedName("a")

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

@@ -27,7 +27,7 @@ public final class ObjectSound extends Node {
static int oculusOrbFocalPointX;
@ObfuscatedName("z")
@ObfuscatedGetter(
intValue = 1492014720
intValue = 1622269101
)
int field1059;
@ObfuscatedName("v")
@@ -50,13 +50,13 @@ public final class ObjectSound extends Node {
ObjectDefinition obj;
@ObfuscatedName("p")
@ObfuscatedGetter(
intValue = 1473760896
intValue = 514830237
)
@Export("y")
int y;
@ObfuscatedName("q")
@ObfuscatedGetter(
intValue = 1080681344
intValue = -394210361
)
int field1060;
@ObfuscatedName("m")

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

@@ -184,7 +184,7 @@ public final class Occluder {
signature = "(B)V",
garbageValue = "-37"
)
public static void method3252() {
public static void method3248() {
try {
JagexCache.JagexCache_dat2File.close();
@@ -204,7 +204,7 @@ public final class Occluder {
signature = "(Ljava/lang/String;I)V",
garbageValue = "-1221499190"
)
static void method3251(String var0) {
static void method3247(String var0) {
class197.field2390 = var0;
try {

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

@@ -76,8 +76,8 @@ public class PacketBuffer extends Buffer {
signature = "(I)Z",
garbageValue = "-1080759401"
)
public boolean method5395() {
int var1 = super.array[super.offset] - this.isaacCipher.method6214() & 255;
public boolean method5380() {
int var1 = super.array[super.offset] - this.isaacCipher.method6191() & 255;
return var1 >= 128;
}
@@ -97,7 +97,7 @@ public class PacketBuffer extends Buffer {
signature = "([BIII)V",
garbageValue = "1740365961"
)
public void method5400(byte[] var1, int var2, int var3) {
public void method5385(byte[] var1, int var2, int var3) {
for (int var4 = 0; var4 < var3; ++var4) {
var1[var4 + var2] = (byte)(super.array[++super.offset - 1] - this.isaacCipher.nextInt());
}
@@ -164,7 +164,7 @@ public class PacketBuffer extends Buffer {
signature = "(ILcu;ZB)I",
garbageValue = "82"
)
static int method5423(int var0, Script var1, boolean var2) {
static int method5408(int var0, Script var1, boolean var2) {
int var3;
int var4;
int var6;

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

@@ -124,7 +124,7 @@ public class ParamDefinition extends DualNode {
signature = "(II)Z",
garbageValue = "-786706549"
)
static final boolean method4480(int var0) {
static final boolean method4468(int var0) {
if (var0 < 0) {
return false;
} else {

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

@@ -272,7 +272,7 @@ public class PcmPlayer {
signature = "(I)V",
garbageValue = "580966872"
)
public final void method2397() {
public final void method2393() {
this.field1394 = true;
}
@@ -356,7 +356,7 @@ public class PcmPlayer {
if (this.stream != null && this.field1399 <= 0) {
this.field1399 += UrlRequest.PcmPlayer_sampleRate >> 4;
DynamicObject.PcmStream_disable(this.stream);
this.method2402(this.stream, this.stream.vmethod2691());
this.method2398(this.stream, this.stream.vmethod2687());
int var4 = 0;
int var5 = 255;
@@ -394,7 +394,7 @@ public class PcmPlayer {
var11 = var11.after;
} else {
var11.active = true;
int var13 = var11.vmethod3882();
int var13 = var11.vmethod3873();
var4 += var13;
if (var12 != null) {
var12.position += var13;
@@ -407,7 +407,7 @@ public class PcmPlayer {
PcmStream var14 = var11.firstSubStream();
if (var14 != null) {
for (int var15 = var11.field1462; var14 != null; var14 = var11.nextSubStream()) {
this.method2402(var14, var15 * var14.vmethod2691() >> 8);
this.method2398(var14, var15 * var14.vmethod2687() >> 8);
}
}
@@ -462,7 +462,7 @@ public class PcmPlayer {
signature = "(Ldc;II)V",
garbageValue = "1373941757"
)
final void method2402(PcmStream var1, int var2) {
final void method2398(PcmStream var1, int var2) {
int var3 = var2 >> 5;
PcmStream var4 = this.field1401[var3];
if (var4 == null) {

Some files were not shown because too many files have changed in this diff Show More