2009Scape/rt4-client
1
0
Fork 0
mirror of https://gitlab.com/2009scape/rt4-client.git synced 2025-12-10 10:20:44 -07:00
Code Issues Projects Releases Packages Wiki Activity

Started moving around static methods/fields

Browse source
This commit is contained in:
Pazaz 2022-04-25 00:49:33 -04:00
parent bed128bd19
commit 6ba1f2f808
305 changed files with 5027 additions and 5075 deletions
Download patch file Download diff file Expand all files Collapse all files

2
client/src/main/java/AnimFrameset.java
View file

@ -30,7 +30,7 @@ public final class AnimFrameset extends SecondaryNode {
if (local58 == null) {
@Pc(85) byte[] local85 = arg1.method4502(0, local51);
local58 = new AnimBase(local51, local85);
local5.method2282(local58);
local5.addTail(local58);
}
this.frames[local19[local21]] = new AnimFrame(local37, local58);
}

2
client/src/main/java/AudioChannel.java
View file

@ -370,7 +370,7 @@ public class AudioChannel {
if (local6) {
Static60.thread.stop = true;
while (Static60.thread.running) {
Static231.sleep(50L);
ThreadUtils.sleep(50L);
}
Static60.thread = null;
}

4
client/src/main/java/AudioThread.java
View file

@ -29,11 +29,11 @@ public final class AudioThread implements Runnable {
channel.loop();
}
}
Static231.sleep(10L);
ThreadUtils.sleep(10L);
GameShell.flush(this.signLink, null);
}
} catch (@Pc(43) Exception ex) {
Static89.report(null, ex);
TracingException.report(null, ex);
} finally {
this.running = false;
}

2
client/src/main/java/BrokenInputStream.java
View file

@ -8,7 +8,7 @@ public final class BrokenInputStream extends InputStream {
@OriginalMember(owner = "client!qk", name = "read", descriptor = "()I")
@Override
public final int read() {
Static231.sleep(30000L);
ThreadUtils.sleep(30000L);
return -1;
}
}

16
client/src/main/java/BufferedFile.java
View file

@ -79,7 +79,7 @@ public final class BufferedFile {
}
if (start > -1L && end > start) {
@Pc(208) int copyLen = (int) (end - start);
Static289.copy(this.writeBuffer, (int) (start - this.writePosition), this.readBuffer, (int) (start - this.readPosition), copyLen);
JagString.copy(this.writeBuffer, (int) (start - this.writePosition), this.readBuffer, (int) (start - this.readPosition), copyLen);
}
this.writeLen = 0;
this.writePosition = -1L;
@ -102,7 +102,7 @@ public final class BufferedFile {
throw new ArrayIndexOutOfBoundsException(len - b.length);
}
if (this.writePosition != -1L && this.virtualPosition >= this.writePosition && (long) this.writeLen + this.writePosition >= (long) len + this.virtualPosition) {
Static289.copy(this.writeBuffer, (int) (this.virtualPosition - this.writePosition), b, 0, len);
JagString.copy(this.writeBuffer, (int) (this.virtualPosition - this.writePosition), b, 0, len);
this.virtualPosition += len;
return;
}
@ -114,7 +114,7 @@ public final class BufferedFile {
if (n > len) {
n = len;
}
Static289.copy(this.readBuffer, (int) (this.virtualPosition - this.readPosition), b, 0, n);
JagString.copy(this.readBuffer, (int) (this.virtualPosition - this.readPosition), b, 0, n);
off = n;
len -= n;
this.virtualPosition += n;
@ -138,7 +138,7 @@ public final class BufferedFile {
if (len > this.readLen) {
n = this.readLen;
}
Static289.copy(this.readBuffer, 0, b, off, n);
JagString.copy(this.readBuffer, 0, b, off, n);
len -= n;
off += n;
this.virtualPosition += n;
@ -169,7 +169,7 @@ public final class BufferedFile {
}
if (end > -1L && start > end) {
@Pc(426) int copyLen = (int) (start - end);
Static289.copy(this.writeBuffer, (int) (end - this.writePosition), b, (int) (end - originalPosition), copyLen);
JagString.copy(this.writeBuffer, (int) (end - this.writePosition), b, (int) (end - originalPosition), copyLen);
if (this.virtualPosition < start) {
len = (int) ((long) len + this.virtualPosition - start);
this.virtualPosition = start;
@ -230,7 +230,7 @@ public final class BufferedFile {
if (this.writePosition != -1L && (long) this.writeBuffer.length + this.writePosition < (long) len + this.virtualPosition) {
@Pc(90) int n = (int) ((long) this.writeBuffer.length + this.writePosition - this.virtualPosition);
len -= n;
Static289.copy(b, off, this.writeBuffer, (int) (this.virtualPosition - this.writePosition), n);
JagString.copy(b, off, this.writeBuffer, (int) (this.virtualPosition - this.writePosition), n);
this.virtualPosition += n;
this.writeLen = this.writeBuffer.length;
this.flush();
@ -260,14 +260,14 @@ public final class BufferedFile {
}
if (start > -1L && end > start) {
@Pc(324) int copyLen = (int) (end - start);
Static289.copy(b, (int) (start + (long) off - this.virtualPosition), this.readBuffer, (int) (start - this.readPosition), copyLen);
JagString.copy(b, (int) (start + (long) off - this.virtualPosition), this.readBuffer, (int) (start - this.readPosition), copyLen);
}
this.virtualPosition += len;
} else if (len > 0) {
if (this.writePosition == -1L) {
this.writePosition = this.virtualPosition;
}
Static289.copy(b, off, this.writeBuffer, (int) (this.virtualPosition - this.writePosition), len);
JagString.copy(b, off, this.writeBuffer, (int) (this.virtualPosition - this.writePosition), len);
this.virtualPosition += len;
if ((long) this.writeLen < this.virtualPosition - this.writePosition) {
this.writeLen = (int) (this.virtualPosition - this.writePosition);

4
client/src/main/java/BufferedSocket.java
View file

@ -111,7 +111,7 @@ public final class BufferedSocket implements Runnable {
}
}
} catch (@Pc(124) Exception ex) {
Static89.report(null, ex);
TracingException.report(null, ex);
}
}
@ -200,7 +200,7 @@ public final class BufferedSocket implements Runnable {
}
if (this.thread != null) {
while (this.thread.status == 0) {
Static231.sleep(1L);
ThreadUtils.sleep(1L);
}
if (this.thread.status == 1) {
try {

14
client/src/main/java/Cheat.java Normal file
View file

@ -0,0 +1,14 @@
import org.openrs2.deob.annotation.OriginalMember;
public class Cheat {
@OriginalMember(owner = "client!p", name = "f", descriptor = "Lclient!na;")
public static final JagString JS5DROP = Static28.parse("::serverjs5drop");
@OriginalMember(owner = "client!v", name = "d", descriptor = "Lclient!na;")
public static final JagString CLIENTDROP = Static28.parse("::clientdrop");
@OriginalMember(owner = "client!dg", name = "b", descriptor = "Lclient!na;")
public static final JagString aClass100_333 = Static28.parse("Shift)2click ENABLED(Q");
@OriginalMember(owner = "client!dg", name = "d", descriptor = "Lclient!na;")
public static final JagString aClass100_334 = Static28.parse("Cache:");
@OriginalMember(owner = "client!dg", name = "f", descriptor = "Z")
public static boolean displayFps = false;
}

6
client/src/main/java/Component.java
View file

@ -504,7 +504,7 @@ public final class Component {
if (local18 == null) {
return false;
}
local18.method1396();
local18.trim();
this.anIntArray37 = new int[local18.height];
this.anIntArray45 = new int[local18.height];
for (@Pc(37) int local37 = 0; local37 < local18.height; local37++) {
@ -778,7 +778,7 @@ public final class Component {
if (local43 != null) {
return local43;
}
local43 = Static150.method2800(local29, Static23.aClass153_12);
local43 = SpriteLoader.loadSprites(local29, Static23.aClass153_12);
if (local43 == null) {
Static211.aBoolean72 = true;
} else {
@ -938,7 +938,7 @@ public final class Component {
if (this.aBoolean18) {
local85 = Static80.loadSoftwareAlphaSprite(Static23.aClass153_12, local12);
} else {
local85 = Static78.method1693(0, Static23.aClass153_12, local12);
local85 = SpriteLoader.loadSoftwareSprite(0, Static23.aClass153_12, local12);
}
if (local85 == null) {
Static211.aBoolean72 = true;

19
client/src/main/java/DelayedStateChange.java
View file

@ -5,6 +5,12 @@ import org.openrs2.deob.annotation.OriginalMember;
@OriginalClass("client!da")
public final class DelayedStateChange extends SecondaryNode {
@OriginalMember(owner = "client!client", name = "U", descriptor = "Lclient!sc;")
public static final HashTable changes = new HashTable(16);
@OriginalMember(owner = "client!la", name = "f", descriptor = "Lclient!ce;")
public static final SecondaryLinkedList clientQueue = new SecondaryLinkedList();
@OriginalMember(owner = "client!rh", name = "e", descriptor = "Lclient!ce;")
public static final SecondaryLinkedList serverQueue = new SecondaryLinkedList();
@OriginalMember(owner = "client!da", name = "T", descriptor = "I")
public int intArg2;
@ -22,10 +28,17 @@ public final class DelayedStateChange extends SecondaryNode {
this.key = (long) arg0 << 32 | (long) arg1;
}
@OriginalMember(owner = "client!da", name = "a", descriptor = "(Z)V")
@OriginalMember(owner = "client!bj", name = "d", descriptor = "(B)V")
public static void clear() {
changes.clear();
clientQueue.clear();
serverQueue.clear();
}
@OriginalMember(owner = "client!da", name = "a", descriptor = "(Z)V")
public final void pushClient() {
this.secondaryKey = MonotonicClock.currentTimeMillis() + 500L | Long.MIN_VALUE & this.secondaryKey;
Static140.clientQueue.addTail(this);
clientQueue.addTail(this);
}
@OriginalMember(owner = "client!da", name = "b", descriptor = "(Z)J")
@ -47,7 +60,7 @@ public final class DelayedStateChange extends SecondaryNode {
public final void pushServer() {
this.secondaryKey |= Long.MIN_VALUE;
if (this.getTime() == 0L) {
Static215.serverQueue.addTail(this);
serverQueue.addTail(this);
}
}
}

23
client/src/main/java/DisplayMode.java Normal file
View file

@ -0,0 +1,23 @@
import org.openrs2.deob.annotation.OriginalArg;
import org.openrs2.deob.annotation.OriginalMember;
import org.openrs2.deob.annotation.Pc;
import java.awt.*;
public class DisplayMode {
@OriginalMember(owner = "client!c", name = "a", descriptor = "(Ljava/awt/Frame;ZLsignlink!ll;)V")
public static void exitFullScreen(@OriginalArg(0) Frame arg0, @OriginalArg(2) SignLink arg1) {
while (true) {
@Pc(16) PrivilegedRequest local16 = arg1.exitFullScreen(arg0);
while (local16.status == 0) {
ThreadUtils.sleep(10L);
}
if (local16.status == 1) {
arg0.setVisible(false);
arg0.dispose();
return;
}
ThreadUtils.sleep(100L);
}
}
}

6
client/src/main/java/FloType.java
View file

@ -6,7 +6,9 @@ import org.openrs2.deob.annotation.Pc;
@OriginalClass("client!wl")
public final class FloType {
@OriginalMember(owner = "client!wl", name = "j", descriptor = "Z")
@OriginalMember(owner = "client!ca", name = "db", descriptor = "I")
public static int anInt865 = 0;
@OriginalMember(owner = "client!wl", name = "j", descriptor = "Z")
public boolean aBoolean310 = false;
@OriginalMember(owner = "client!wl", name = "l", descriptor = "Z")
@ -63,7 +65,7 @@ public final class FloType {
} else if (arg0 == 7) {
this.anInt5894 = Static15.method492(arg1.g3());
} else if (arg0 == 8) {
Static26.anInt865 = arg2;
anInt865 = arg2;
} else if (arg0 == 9) {
this.anInt5885 = arg1.g2();
} else if (arg0 == 10) {

6
client/src/main/java/FloTypeList.java Normal file
View file

@ -0,0 +1,6 @@
import org.openrs2.deob.annotation.OriginalMember;
public class FloTypeList {
@OriginalMember(owner = "client!hj", name = "a", descriptor = "I")
public static int capacity;
}

8
client/src/main/java/Font.java
View file

@ -152,14 +152,14 @@ public abstract class Font extends SecondaryNode {
if (GlRenderer.enabled) {
Static46.method1174(arg1, local4 + (int) ((double) this.lineHeight * 0.7D), local323, Static218.strikethroughColor);
} else {
Static129.method2489(arg1, local4 + (int) ((double) this.lineHeight * 0.7D), local323, Static218.strikethroughColor);
SoftwareRaster.drawHorizontalLine(arg1, local4 + (int) ((double) this.lineHeight * 0.7D), local323, Static218.strikethroughColor);
}
}
if (Static218.underlineColor != -1) {
if (GlRenderer.enabled) {
Static46.method1174(arg1, local4 + this.lineHeight + 1, local323, Static218.underlineColor);
} else {
Static129.method2489(arg1, local4 + this.lineHeight + 1, local323, Static218.underlineColor);
SoftwareRaster.drawHorizontalLine(arg1, local4 + this.lineHeight + 1, local323, Static218.underlineColor);
}
}
arg1 += local323;
@ -844,14 +844,14 @@ public abstract class Font extends SecondaryNode {
if (GlRenderer.enabled) {
Static46.method1174(arg1, local4 + (int) ((double) this.lineHeight * 0.7D), local387, Static218.strikethroughColor);
} else {
Static129.method2489(arg1, local4 + (int) ((double) this.lineHeight * 0.7D), local387, Static218.strikethroughColor);
SoftwareRaster.drawHorizontalLine(arg1, local4 + (int) ((double) this.lineHeight * 0.7D), local387, Static218.strikethroughColor);
}
}
if (Static218.underlineColor != -1) {
if (GlRenderer.enabled) {
Static46.method1174(arg1, local4 + this.lineHeight, local387, Static218.underlineColor);
} else {
Static129.method2489(arg1, local4 + this.lineHeight, local387, Static218.underlineColor);
SoftwareRaster.drawHorizontalLine(arg1, local4 + this.lineHeight, local387, Static218.underlineColor);
}
}
arg1 += local387;

36
client/src/main/java/Fonts.java Normal file
View file

@ -0,0 +1,36 @@
import org.openrs2.deob.annotation.OriginalArg;
import org.openrs2.deob.annotation.OriginalMember;
import org.openrs2.deob.annotation.Pc;
public class Fonts {
@OriginalMember(owner = "client!j", name = "x", descriptor = "Lclient!rk;")
public static Font p11Full;
@OriginalMember(owner = "client!rh", name = "h", descriptor = "Lclient!rk;")
public static Font p12Full;
@OriginalMember(owner = "client!wl", name = "q", descriptor = "Lclient!rk;")
public static Font b12Full;
@OriginalMember(owner = "client!fn", name = "a", descriptor = "(Lclient!ve;Lclient!ve;Z)I")
public static int getReady(@OriginalArg(0) Js5 arg0, @OriginalArg(1) Js5 arg1) {
@Pc(5) int ready = 0;
if (arg0.isFileReady(Sprites.p11FullId)) {
ready++;
}
if (arg0.isFileReady(Sprites.p12FullId)) {
ready++;
}
if (arg0.isFileReady(Sprites.b12FullId)) {
ready++;
}
if (arg1.isFileReady(Sprites.p11FullId)) {
ready++;
}
if (arg1.isFileReady(Sprites.p12FullId)) {
ready++;
}
if (arg1.isFileReady(Sprites.b12FullId)) {
ready++;
}
return ready;
}
}

2
client/src/main/java/FrameBuffer.java
View file

@ -25,7 +25,7 @@ public abstract class FrameBuffer {
@OriginalMember(owner = "client!vk", name = "a", descriptor = "(I)V")
public final void makeTarget() {
Static129.method2491(this.pixels, this.width, this.height);
SoftwareRaster.method2491(this.pixels, this.width, this.height);
}
@OriginalMember(owner = "client!vk", name = "a", descriptor = "(IIIILjava/awt/Graphics;I)V")

33
client/src/main/java/GameShell.java
View file

@ -158,14 +158,27 @@ public abstract class GameShell extends Applet implements Runnable, FocusListene
}
for (@Pc(19) int i = 0; i < 50 && signLink.eventQueue.peekEvent() != null; i++) {
Static231.sleep(1L);
ThreadUtils.sleep(1L);
}
if (source != null) {
signLink.eventQueue.postEvent(new ActionEvent(source, 1001, "dummy"));
}
}
@OriginalMember(owner = "client!rc", name = "focusLost", descriptor = "(Ljava/awt/event/FocusEvent;)V")
@OriginalMember(owner = "client!ta", name = "a", descriptor = "(Z)V")
public static void resetTimer() {
timer.reset();
@Pc(10) int local10;
for (local10 = 0; local10 < 32; local10++) {
redrawTimes[local10] = 0L;
}
for (local10 = 0; local10 < 32; local10++) {
logicTimes[local10] = 0L;
}
logicCycles = 0;
}
@OriginalMember(owner = "client!rc", name = "focusLost", descriptor = "(Ljava/awt/event/FocusEvent;)V")
@Override
public final void focusLost(@OriginalArg(0) FocusEvent event) {
focusIn = false;
@ -256,7 +269,7 @@ public abstract class GameShell extends Applet implements Runnable, FocusListene
public final void destroy() {
if (instance == this && !shutdown) {
killTime = MonotonicClock.currentTimeMillis();
Static231.sleep(5000L);
ThreadUtils.sleep(5000L);
Static69.signLink = null;
this.shutdown(false);
}
@ -507,9 +520,9 @@ public abstract class GameShell extends Applet implements Runnable, FocusListene
}
getMaxMemory();
this.addCanvas();
Static260.frameBuffer = Static131.create(canvasHeight, canvasWidth, canvas);
client.frameBuffer = Static131.create(canvasHeight, canvasWidth, canvas);
this.mainInit();
timer = Static70.create();
timer = Timer.create();
long lastUpdateTime = 0;
long lastDrawTime = 0;
@ -542,7 +555,7 @@ public abstract class GameShell extends Applet implements Runnable, FocusListene
}
}
} catch (@Pc(198) Exception ex) {
Static89.report(null, ex);
TracingException.report(null, ex);
this.error("crash");
}
this.shutdown(true);
@ -595,11 +608,11 @@ public abstract class GameShell extends Applet implements Runnable, FocusListene
Static69.signLink = signLink = new SignLink(null, cacheId, cacheSubDir, 28);
@Pc(76) PrivilegedRequest request = signLink.startThread(1, this);
while (request.status == 0) {
Static231.sleep(10L);
ThreadUtils.sleep(10L);
}
thread = (Thread) request.result;
} catch (@Pc(91) Exception ex) {
Static89.report(null, ex);
TracingException.report(null, ex);
}
}
@ -647,11 +660,11 @@ public abstract class GameShell extends Applet implements Runnable, FocusListene
}
@Pc(86) PrivilegedRequest request = signLink.startThread(1, this);
while (request.status == 0) {
Static231.sleep(10L);
ThreadUtils.sleep(10L);
}
thread = (Thread) request.result;
} catch (@Pc(103) Exception ex) {
Static89.report(null, ex);
TracingException.report(null, ex);
this.error("crash");
}
}

20
client/src/main/java/GlModel.java
View file

@ -208,7 +208,7 @@ public final class GlModel extends Model {
this.aClass5_1 = new Class5();
this.aClass127_4 = new GlBuffer();
this.aClass127_1 = new GlBuffer();
if (Static178.highDetailLighting) {
if (Preferences.highDetailLighting) {
this.aClass127_2 = new GlBuffer();
}
this.aClass127_3 = new GlBuffer();
@ -1940,7 +1940,7 @@ public final class GlModel extends Model {
throw new IllegalArgumentException();
} else if (this.anInt5296 != 0) {
if (arg5) {
@Pc(26) boolean local26 = !this.aClass127_1.aBoolean235 && (arg1 || arg2 && !Static178.highDetailLighting);
@Pc(26) boolean local26 = !this.aClass127_1.aBoolean235 && (arg1 || arg2 && !Preferences.highDetailLighting);
this.method4113(false, !this.aClass127_4.aBoolean235 && arg0, local26, this.aClass127_2 != null && !this.aClass127_2.aBoolean235 && arg2, !this.aClass127_3.aBoolean235);
if (!this.aClass127_5.aBoolean235 && arg3 && arg1) {
this.method4103();
@ -1968,7 +1968,7 @@ public final class GlModel extends Model {
this.aByte19 = (byte) (this.aByte19 | 0x2);
}
}
if (arg2 && Static178.highDetailLighting) {
if (arg2 && Preferences.highDetailLighting) {
if (this.aClass127_2.aBoolean235) {
this.aShortArray76 = null;
this.aShortArray79 = null;
@ -2077,7 +2077,7 @@ public final class GlModel extends Model {
}
}
if (arg2) {
if (Static178.highDetailLighting) {
if (Preferences.highDetailLighting) {
for (local60 = 0; local60 < this.anInt5297; local60++) {
local71 = Static237.method4096(this.aShortArray75[local60], this.aShortArray80[local60], this.aShort29, this.aByteArray71[local60]);
Static237.aClass3_Sub15_8.offset = this.aClass127_1.anInt4777 + this.aShortArray77[local60] * local1;
@ -2426,7 +2426,7 @@ public final class GlModel extends Model {
arg3.aShortArray85[local69] = this.aShortArray85[local69];
arg3.aShortArray86[local69] = this.aShortArray86[local69];
}
if (Static178.highDetailLighting) {
if (Preferences.highDetailLighting) {
if (arg4.aClass127_2 == null) {
arg4.aClass127_2 = new GlBuffer();
}
@ -2531,7 +2531,7 @@ public final class GlModel extends Model {
local3.aShortArray75 = Static263.method4511(this.aShortArray75);
}
local3.aByteArray71 = this.aByteArray71;
if (arg2 && arg3 && (arg6 && arg4 || Static178.highDetailLighting)) {
if (arg2 && arg3 && (arg6 && arg4 || Preferences.highDetailLighting)) {
local3.aClass127_1 = this.aClass127_1;
} else {
local3.aClass127_1 = new GlBuffer();
@ -2547,7 +2547,7 @@ public final class GlModel extends Model {
local3.aShortArray85 = Static263.method4511(this.aShortArray85);
local3.aShortArray86 = Static263.method4511(this.aShortArray86);
}
if (!Static178.highDetailLighting) {
if (!Preferences.highDetailLighting) {
local3.aClass127_2 = null;
} else if (arg4 && arg5 && arg6) {
local3.aClass127_2 = this.aClass127_2;
@ -3022,7 +3022,7 @@ public final class GlModel extends Model {
}
local1.glColorPointer(4, GL2.GL_UNSIGNED_BYTE, this.aClass127_1.anInt4782, (long) this.aClass127_1.anInt4777);
}
if (Static178.highDetailLighting && this.aClass127_2.aClass155_4 != null) {
if (Preferences.highDetailLighting && this.aClass127_2.aClass155_4 != null) {
if (local172 != this.aClass127_2.aClass155_4) {
this.aClass127_2.aClass155_4.method4516();
local172 = this.aClass127_2.aClass155_4;
@ -3039,7 +3039,7 @@ public final class GlModel extends Model {
if (this.aClass127_5.aClass155_4 != null) {
this.aClass127_5.aClass155_4.method4518();
}
if (this.aClass127_4.aClass155_4 == null || this.aClass127_1.aClass155_4 == null || Static178.highDetailLighting && this.aClass127_2.aClass155_4 == null || this.aClass127_3.aClass155_4 == null) {
if (this.aClass127_4.aClass155_4 == null || this.aClass127_1.aClass155_4 == null || Preferences.highDetailLighting && this.aClass127_2.aClass155_4 == null || this.aClass127_3.aClass155_4 == null) {
if (GlRenderer.arbVboSupported) {
local1.glBindBuffer(GL2.GL_ARRAY_BUFFER, 0);
}
@ -3051,7 +3051,7 @@ public final class GlModel extends Model {
this.aClass127_1.aByteBuffer8.position(this.aClass127_1.anInt4777);
local1.glColorPointer(4, GL2.GL_UNSIGNED_BYTE, this.aClass127_1.anInt4782, this.aClass127_1.aByteBuffer8);
}
if (Static178.highDetailLighting && this.aClass127_2.aClass155_4 == null) {
if (Preferences.highDetailLighting && this.aClass127_2.aClass155_4 == null) {
this.aClass127_2.aByteBuffer8.position(this.aClass127_2.anInt4777);
local1.glNormalPointer(GL2.GL_FLOAT, this.aClass127_2.anInt4782, this.aClass127_2.aByteBuffer8);
}

6
client/src/main/java/GlRenderer.java
View file

@ -565,7 +565,7 @@ public final class GlRenderer {
@OriginalMember(owner = "client!tf", name = "p", descriptor = "()V")
public static void method4173() {
if (Static178.highDetailLighting) {
if (Preferences.highDetailLighting) {
setLightingEnabled(true);
setNormalArrayEnabled(true);
} else {
@ -686,7 +686,7 @@ public final class GlRenderer {
if (swapBuffersAttempts++ > 5) {
return -2;
}
Static231.sleep(1000L);
ThreadUtils.sleep(1000L);
}
if (window.getLock().isLocked()) {
window.unlockSurface();
@ -714,7 +714,7 @@ public final class GlRenderer {
quit();
return -3;
}
Static231.sleep(100L);
ThreadUtils.sleep(100L);
}
}
gl.glClear(GL2.GL_COLOR_BUFFER_BIT);

4
client/src/main/java/GlTile.java
View file

@ -291,7 +291,7 @@ public final class GlTile extends Node {
local257.glVertexPointer(3, GL2.GL_FLOAT, local282, this.aByteBuffer3);
this.aByteBuffer3.position(12);
local257.glColorPointer(4, GL2.GL_UNSIGNED_BYTE, local282, this.aByteBuffer3);
if (Static178.highDetailLighting) {
if (Preferences.highDetailLighting) {
this.aByteBuffer3.position(16);
local257.glNormalPointer(GL2.GL_FLOAT, local282, this.aByteBuffer3);
}
@ -307,7 +307,7 @@ public final class GlTile extends Node {
this.aClass155_3.method4516();
local257.glVertexPointer(3, GL2.GL_FLOAT, local282, 0L);
local257.glColorPointer(4, GL2.GL_UNSIGNED_BYTE, local282, 12L);
if (Static178.highDetailLighting) {
if (Preferences.highDetailLighting) {
local257.glNormalPointer(GL2.GL_FLOAT, local282, 16L);
}
local257.glTexCoordPointer(2, GL2.GL_FLOAT, local282, 28L);

2
client/src/main/java/HashTable.java
View file

@ -36,7 +36,7 @@ public final class HashTable {
}
@OriginalMember(owner = "client!sc", name = "a", descriptor = "(I)V")
public final void method3856() {
public final void clear() {
for (@Pc(5) int local5 = 0; local5 < this.anInt5023; local5++) {
@Pc(14) Node local14 = this.aClass3Array1[local5];
while (true) {

22
client/src/main/java/IntUtils.java Normal file
View file

@ -0,0 +1,22 @@
import org.openrs2.deob.annotation.OriginalArg;
import org.openrs2.deob.annotation.OriginalMember;
import org.openrs2.deob.annotation.Pc;
public class IntUtils {
@OriginalMember(owner = "client!ra", name = "b", descriptor = "(III)I")
public static int pow(@OriginalArg(0) int arg0, @OriginalArg(1) int arg1) {
@Pc(15) int local15 = 1;
while (arg0 > 1) {
if ((arg0 & 0x1) != 0) {
local15 *= arg1;
}
arg1 *= arg1;
arg0 >>= 0x1;
}
if (arg0 == 1) {
return local15 * arg1;
} else {
return local15;
}
}
}

12
client/src/main/java/InterfaceList.java Normal file
View file

@ -0,0 +1,12 @@
import org.openrs2.deob.annotation.OriginalMember;
public class InterfaceList {
@OriginalMember(owner = "client!p", name = "c", descriptor = "Lclient!ih;")
public static final LinkedList lowPriorityRequests = new LinkedList();
@OriginalMember(owner = "client!ch", name = "y", descriptor = "[Z")
public static final boolean[] rectangleRedraw = new boolean[100];
@OriginalMember(owner = "client!bn", name = "V", descriptor = "I")
public static int anInt766 = 0;
@OriginalMember(owner = "client!md", name = "W", descriptor = "I")
public static int topLevelInterface = -1;
}

104
client/src/main/java/JagString.java
View file

@ -12,7 +12,9 @@ import org.openrs2.deob.annotation.Pc;
@OriginalClass("client!na")
public final class JagString implements StringInterface {
@OriginalMember(owner = "client!na", name = "T", descriptor = "[B")
@OriginalMember(owner = "client!pa", name = "O", descriptor = "Lclient!na;")
public static final JagString EMPTY = Static28.parse("");
@OriginalMember(owner = "client!na", name = "T", descriptor = "[B")
public byte[] chars;
@OriginalMember(owner = "client!na", name = "lb", descriptor = "I")
@ -21,6 +23,84 @@ public final class JagString implements StringInterface {
@OriginalMember(owner = "client!na", name = "N", descriptor = "Z")
private boolean aBoolean193 = true;
@OriginalMember(owner = "client!ck", name = "a", descriptor = "([Lclient!na;B)Lclient!na;")
public static JagString concatenate(@OriginalArg(0) JagString[] arg0) {
if (arg0.length < 2) {
throw new IllegalArgumentException();
}
return method2355(0, arg0.length, arg0);
}
@OriginalMember(owner = "client!jd", name = "a", descriptor = "(II[Lclient!na;I)Lclient!na;")
public static JagString method2355(@OriginalArg(0) int arg0, @OriginalArg(1) int arg1, @OriginalArg(2) JagString[] arg2) {
@Pc(5) int local5 = 0;
for (@Pc(7) int local7 = 0; local7 < arg1; local7++) {
if (arg2[arg0 + local7] == null) {
arg2[local7 + arg0] = Static193.aClass100_853;
}
local5 += arg2[local7 + arg0].length;
}
@Pc(39) byte[] local39 = new byte[local5];
@Pc(41) int local41 = 0;
for (@Pc(43) int local43 = 0; local43 < arg1; local43++) {
@Pc(52) JagString local52 = arg2[local43 + arg0];
copy(local52.chars, 0, local39, local41, local52.length);
local41 += local52.length;
}
@Pc(71) JagString local71 = new JagString();
local71.length = local5;
local71.chars = local39;
return local71;
}
@OriginalMember(owner = "client!kg", name = "a", descriptor = "([BI[BII)V")
public static void copy(@OriginalArg(0) byte[] arg0, @OriginalArg(1) int arg1, @OriginalArg(2) byte[] arg2, @OriginalArg(3) int arg3, @OriginalArg(4) int arg4) {
@Pc(15) int local15;
if (arg0 == arg2) {
if (arg1 == arg3) {
return;
}
if (arg3 > arg1 && arg3 < arg1 + arg4) {
local15 = arg4 - 1;
@Pc(19) int local19 = arg1 + local15;
@Pc(23) int local23 = arg3 + local15;
local15 = local19 - local15;
local15 += 7;
while (local19 >= local15) {
arg2[local23--] = arg0[local19--];
arg2[local23--] = arg0[local19--];
arg2[local23--] = arg0[local19--];
arg2[local23--] = arg0[local19--];
arg2[local23--] = arg0[local19--];
arg2[local23--] = arg0[local19--];
arg2[local23--] = arg0[local19--];
arg2[local23--] = arg0[local19--];
}
local15 -= 7;
while (local19 >= local15) {
arg2[local23--] = arg0[local19--];
}
return;
}
}
local15 = arg4 + arg1;
@Pc(115) int local115 = local15 - 7;
while (arg1 < local115) {
arg2[arg3++] = arg0[arg1++];
arg2[arg3++] = arg0[arg1++];
arg2[arg3++] = arg0[arg1++];
arg2[arg3++] = arg0[arg1++];
arg2[arg3++] = arg0[arg1++];
arg2[arg3++] = arg0[arg1++];
arg2[arg3++] = arg0[arg1++];
arg2[arg3++] = arg0[arg1++];
}
local15 = local115 + 7;
while (arg1 < local15) {
arg2[arg3++] = arg0[arg1++];
}
}
@OriginalMember(owner = "client!na", name = "a", descriptor = "(Z)Ljava/net/URL;")
public final URL method3107() throws MalformedURLException {
return new URL(new String(this.chars, 0, this.length));
@ -135,10 +215,10 @@ public final class JagString implements StringInterface {
for (local31 = 1; local31 < arg0.length + this.length; local31 += local31) {
}
@Pc(51) byte[] local51 = new byte[local31];
Static289.copy(this.chars, 0, local51, 0, this.length);
copy(this.chars, 0, local51, 0, this.length);
this.chars = local51;
}
Static289.copy(arg0.chars, 0, this.chars, this.length, arg0.length);
copy(arg0.chars, 0, this.chars, this.length, arg0.length);
this.length += arg0.length;
return this;
}
@ -212,10 +292,10 @@ public final class JagString implements StringInterface {
for (local43 = 1; local43 < this.length + arg0.length; local43 += local43) {
}
@Pc(63) byte[] local63 = new byte[local43];
Static289.copy(this.chars, 0, local63, 0, this.length);
copy(this.chars, 0, local63, 0, this.length);
this.chars = local63;
}
Static289.copy(arg0.chars, arg1, this.chars, this.length, arg2 - arg1);
copy(arg0.chars, arg1, this.chars, this.length, arg2 - arg1);
this.length += arg2 - arg1;
return this;
} else {
@ -329,7 +409,7 @@ public final class JagString implements StringInterface {
@Pc(23) JagString local23 = new JagString();
local23.chars = new byte[this.length + 1];
local23.length = this.length + 1;
Static289.copy(this.chars, 0, local23.chars, 0, this.length);
copy(this.chars, 0, local23.chars, 0, this.length);
local23.chars[this.length] = (byte) arg0;
return local23;
}
@ -381,7 +461,7 @@ public final class JagString implements StringInterface {
for (local30 = 1; local30 < arg0; local30 += local30) {
}
@Pc(45) byte[] local45 = new byte[local30];
Static289.copy(this.chars, 0, local45, 0, this.length);
copy(this.chars, 0, local45, 0, this.length);
this.chars = local45;
}
for (local30 = this.length; local30 < arg0; local30++) {
@ -424,7 +504,7 @@ public final class JagString implements StringInterface {
@Pc(7) JagString local7 = new JagString();
local7.length = arg0 - arg1;
local7.chars = new byte[arg0 - arg1];
Static289.copy(this.chars, arg1, local7.chars, 0, local7.length);
copy(this.chars, arg1, local7.chars, 0, local7.length);
return local7;
}
@ -683,7 +763,7 @@ public final class JagString implements StringInterface {
@OriginalMember(owner = "client!na", name = "i", descriptor = "(I)[B")
public final byte[] method3148() {
@Pc(7) byte[] local7 = new byte[this.length];
Static289.copy(this.chars, 0, local7, 0, this.length);
copy(this.chars, 0, local7, 0, this.length);
return local7;
}
@ -725,7 +805,7 @@ public final class JagString implements StringInterface {
for (local44 = 1; local44 <= this.length; local44 += local44) {
}
@Pc(61) byte[] local61 = new byte[local44];
Static289.copy(this.chars, 0, local61, 0, this.length);
copy(this.chars, 0, local61, 0, this.length);
this.chars = local61;
}
this.chars[this.length++] = (byte) arg0;
@ -769,7 +849,7 @@ public final class JagString implements StringInterface {
}
if (this.chars.length != this.length) {
@Pc(26) byte[] local26 = new byte[this.length];
Static289.copy(this.chars, 0, local26, 0, this.length);
copy(this.chars, 0, local26, 0, this.length);
this.chars = local26;
}
return this;
@ -814,7 +894,7 @@ public final class JagString implements StringInterface {
@OriginalMember(owner = "client!na", name = "a", descriptor = "(Z[BIII)I")
public final int encodeString(@OriginalArg(1) byte[] arg0, @OriginalArg(2) int arg1, @OriginalArg(4) int arg2) {
Static289.copy(this.chars, 0, arg0, arg1, arg2);
copy(this.chars, 0, arg0, arg1, arg2);
return arg2;
}
}

8
client/src/main/java/Js5.java
View file

@ -72,7 +72,7 @@ public final class Js5 {
}
@OriginalMember(owner = "client!ve", name = "a", descriptor = "(ILclient!na;)I")
public final int method4478(@OriginalArg(1) JagString arg0) {
public final int getPercentageComplete(@OriginalArg(1) JagString arg0) {
if (this.method4484()) {
@Pc(15) JagString local15 = arg0.toLowerCase();
@Pc(29) int local29 = this.aClass70_2.aClass76_1.method2405(local15.method3154());
@ -286,7 +286,7 @@ public final class Js5 {
}
@Pc(140) byte[] local140;
try {
local140 = Static162.method3092(local114);
local140 = Js5Compression.uncompress(local114);
} catch (@Pc(142) RuntimeException local142) {
System.out.println("T3 - " + (arg1 != null) + "," + arg0 + "," + local114.length + "," + Static71.method1442(local114, local114.length) + "," + Static71.method1442(local114, local114.length - 2) + "," + this.aClass70_2.anIntArray268[arg0] + "," + this.aClass70_2.anInt2911);
local140 = new byte[] { 0 };
@ -326,7 +326,7 @@ public final class Js5 {
local320 = 0;
for (@Pc(322) int local322 = 0; local322 < local31; local322++) {
local320 += local233.g4();
Static289.copy(local140, local250, local282[local322], local239[local322], local320);
JagString.copy(local140, local250, local282[local322], local239[local322], local320);
local250 += local320;
local239[local322] += local320;
}
@ -374,7 +374,7 @@ public final class Js5 {
}
@OriginalMember(owner = "client!ve", name = "a", descriptor = "(Lclient!na;I)Z")
public final boolean method4497(@OriginalArg(0) JagString arg0) {
public final boolean isGroupNameValid(@OriginalArg(0) JagString arg0) {
if (this.method4484()) {
@Pc(19) JagString local19 = arg0.toLowerCase();
@Pc(28) int local28 = this.aClass70_2.aClass76_1.method2405(local19.method3154());

4
client/src/main/java/Js5CacheQueue.java
View file

@ -22,7 +22,7 @@ public final class Js5CacheQueue implements Runnable {
public Js5CacheQueue() {
@Pc(20) PrivilegedRequest local20 = GameShell.signLink.startThread(5, this);
while (local20.status == 0) {
Static231.sleep(10L);
ThreadUtils.sleep(10L);
}
if (local20.status == 2) {
throw new RuntimeException();
@ -126,7 +126,7 @@ public final class Js5CacheQueue implements Runnable {
local19.aByteArray11 = local19.aClass49_3.read((int) local19.secondaryKey);
}
} catch (@Pc(83) Exception local83) {
Static89.report(null, local83);
TracingException.report(null, local83);
}
local19.aBoolean226 = false;
}

6
client/src/main/java/Js5CachedResourceProvider.java
View file

@ -98,7 +98,7 @@ public final class Js5CachedResourceProvider extends Js5ResourceProvider {
}
local15 = new Node();
local15.key = arg0;
this.aClass69_16.method2282(local15);
this.aClass69_16.addTail(local15);
}
@OriginalMember(owner = "client!bg", name = "b", descriptor = "(I)Lclient!ii;")
@ -227,7 +227,7 @@ public final class Js5CachedResourceProvider extends Js5ResourceProvider {
local32 = false;
local37 = new Node();
local37.key = this.anInt578;
this.aClass69_17.method2282(local37);
this.aClass69_17.addTail(local37);
}
this.anInt578++;
}
@ -263,7 +263,7 @@ public final class Js5CachedResourceProvider extends Js5ResourceProvider {
if (this.aByteArray9[this.anInt578] != 1) {
local37 = new Node();
local37.key = this.anInt578;
this.aClass69_17.method2282(local37);
this.aClass69_17.addTail(local37);
local32 = false;
}
this.anInt578++;

38
client/src/main/java/Js5Compression.java Normal file
View file

@ -0,0 +1,38 @@
import org.openrs2.deob.annotation.OriginalArg;
import org.openrs2.deob.annotation.OriginalMember;
import org.openrs2.deob.annotation.Pc;
public final class Js5Compression {
@OriginalMember(owner = "client!mf", name = "x", descriptor = "Lclient!ha;")
public static final GzipDecompressor GZIP_DECOMPRESSOR = new GzipDecompressor();
@OriginalMember(owner = "client!kf", name = "j", descriptor = "I")
public static final int MAX_LENGTH = 0;
@OriginalMember(owner = "client!ml", name = "a", descriptor = "(B[B)[B")
public static byte[] uncompress(@OriginalArg(1) byte[] in) {
@Pc(17) Buffer buffer = new Buffer(in);
@Pc(21) int type = buffer.g1();
@Pc(25) int len = buffer.g4();
if (len < 0 || MAX_LENGTH != 0 && MAX_LENGTH < len) {
throw new RuntimeException();
} else if (type == 0) {
@Pc(53) byte[] bytes = new byte[len];
buffer.gBytes(len, bytes);
return bytes;
} else {
@Pc(65) int uncompressedLen = buffer.g4();
if (uncompressedLen < 0 || MAX_LENGTH != 0 && MAX_LENGTH < uncompressedLen) {
throw new RuntimeException();
}
@Pc(85) byte[] out = new byte[uncompressedLen];
if (type == 1) {
Bzip2Decompressor.bunzip2(out, uncompressedLen, in, len);
} else {
GZIP_DECOMPRESSOR.method1842(out, buffer);
}
return out;
}
}
}

2
client/src/main/java/Js5Index.java
View file

@ -59,7 +59,7 @@ public final class Js5Index {
@OriginalMember(owner = "client!ii", name = "a", descriptor = "(I[B)V")
private void method2293(@OriginalArg(1) byte[] arg0) {
@Pc(12) Buffer local12 = new Buffer(Static162.method3092(arg0));
@Pc(12) Buffer local12 = new Buffer(Js5Compression.uncompress(arg0));
@Pc(16) int local16 = local12.g1();
if (local16 != 5 && local16 != 6) {
throw new RuntimeException();

12
client/src/main/java/Keyboard.java
View file

@ -275,7 +275,17 @@ public final class Keyboard implements KeyListener, FocusListener {
component.addFocusListener(instance);
}
@OriginalMember(owner = "client!uf", name = "keyPressed", descriptor = "(Ljava/awt/event/KeyEvent;)V")
@OriginalMember(owner = "client!ag", name = "h", descriptor = "(I)V")
public static void quit() {
if (instance != null) {
@Pc(4) Keyboard local4 = instance;
synchronized (instance) {
instance = null;
}
}
}
@OriginalMember(owner = "client!uf", name = "keyPressed", descriptor = "(Ljava/awt/event/KeyEvent;)V")
@Override
public final synchronized void keyPressed(@OriginalArg(0) KeyEvent event) {
if (instance == null) {

2
client/src/main/java/LinkedList.java
View file

@ -43,7 +43,7 @@ public final class LinkedList {
}
@OriginalMember(owner = "client!ih", name = "a", descriptor = "(ZLclient!ab;)V")
public final void method2282(@OriginalArg(1) Node arg0) {
public final void addTail(@OriginalArg(1) Node arg0) {
if (arg0.aClass3_223 != null) {
arg0.unlink();
}

30
client/src/main/java/LoadingBar.java Normal file
View file

@ -0,0 +1,30 @@
import org.openrs2.deob.annotation.OriginalArg;
import org.openrs2.deob.annotation.OriginalMember;
import org.openrs2.deob.annotation.Pc;
public class LoadingBar {
@OriginalMember(owner = "client!oj", name = "a", descriptor = "(BZLclient!rk;)V")
public static void render(@OriginalArg(1) boolean arg0, @OriginalArg(2) Font arg1) {
@Pc(9) int local9;
if (GlRenderer.enabled || arg0) {
local9 = GameShell.canvasHeight;
@Pc(15) int local15 = local9 * 956 / 503;
Static78.titleBg.renderResizedTransparent((GameShell.canvasWidth - local15) / 2, 0, local15, local9);
Static243.logo.renderTransparent(GameShell.canvasWidth / 2 - Static243.logo.width / 2, 18);
}
arg1.renderCenter(LocalizedText.GAME0_LOADING, GameShell.canvasWidth / 2, GameShell.canvasHeight / 2 - 26, 16777215, -1);
local9 = GameShell.canvasHeight / 2 - 18;
if (GlRenderer.enabled) {
Static46.method1179(GameShell.canvasWidth / 2 - 152, local9, 304, 34, 9179409);
Static46.method1179(GameShell.canvasWidth / 2 - 151, local9 - -1, 302, 32, 0);
Static46.method1186(GameShell.canvasWidth / 2 - 150, local9 + 2, Static199.mainLoadPercentage * 3, 30, 9179409);
Static46.method1186(GameShell.canvasWidth / 2 + Static199.mainLoadPercentage * 3 - 150, local9 + 2, 300 - Static199.mainLoadPercentage * 3, 30, 0);
} else {
SoftwareRaster.drawRect(GameShell.canvasWidth / 2 - 152, local9, 304, 34, 9179409);
SoftwareRaster.drawRect(GameShell.canvasWidth / 2 - 151, local9 + 1, 302, 32, 0);
SoftwareRaster.fillRect(GameShell.canvasWidth / 2 - 150, local9 + 2, Static199.mainLoadPercentage * 3, 30, 9179409);
SoftwareRaster.fillRect(Static199.mainLoadPercentage * 3 + GameShell.canvasWidth / 2 - 150, local9 + 2, 300 - Static199.mainLoadPercentage * 3, 30, 0);
}
arg1.renderCenter(Static126.mainLoadSecondaryText, GameShell.canvasWidth / 2, GameShell.canvasHeight / 2 + 4, 16777215, -1);
}
}

61
client/src/main/java/LoadingBarAwt.java Normal file
View file

@ -0,0 +1,61 @@
import org.openrs2.deob.annotation.OriginalArg;
import org.openrs2.deob.annotation.OriginalMember;
import org.openrs2.deob.annotation.Pc;
import java.awt.*;
import java.awt.Font;
public class LoadingBarAwt {
@OriginalMember(owner = "client!bc", name = "a", descriptor = "(Ljava/awt/Color;ZZLclient!na;I)V")
public static void render(@OriginalArg(0) Color arg0, @OriginalArg(2) boolean arg1, @OriginalArg(3) JagString arg2, @OriginalArg(4) int arg3) {
try {
@Pc(6) Graphics local6 = GameShell.canvas.getGraphics();
if (Static222.aFont1 == null) {
Static222.aFont1 = new Font("Helvetica", 1, 13);
Static240.aFontMetrics1 = GameShell.canvas.getFontMetrics(Static222.aFont1);
}
if (arg1) {
local6.setColor(Color.black);
local6.fillRect(0, 0, GameShell.canvasWidth, GameShell.canvasHeight);
}
if (arg0 == null) {
arg0 = new Color(140, 17, 17);
}
try {
if (Static149.anImage3 == null) {
Static149.anImage3 = GameShell.canvas.createImage(304, 34);
}
@Pc(56) Graphics local56 = Static149.anImage3.getGraphics();
local56.setColor(arg0);
local56.drawRect(0, 0, 303, 33);
local56.fillRect(2, 2, arg3 * 3, 30);
local56.setColor(Color.black);
local56.drawRect(1, 1, 301, 31);
local56.fillRect(arg3 * 3 + 2, 2, 300 - arg3 * 3, 30);
local56.setFont(Static222.aFont1);
local56.setColor(Color.white);
arg2.method3112(22, (304 - arg2.method3155(Static240.aFontMetrics1)) / 2, local56);
local6.drawImage(Static149.anImage3, GameShell.canvasWidth / 2 - 152, GameShell.canvasHeight / 2 + -18, null);
} catch (@Pc(134) Exception local134) {
@Pc(140) int local140 = GameShell.canvasWidth / 2 - 152;
@Pc(146) int local146 = GameShell.canvasHeight / 2 - 18;
local6.setColor(arg0);
local6.drawRect(local140, local146, 303, 33);
local6.fillRect(local140 + 2, local146 + 2, arg3 * 3, 30);
local6.setColor(Color.black);
local6.drawRect(local140 + 1, local146 - -1, 301, 31);
local6.fillRect(arg3 * 3 + local140 + 2, local146 + 2, 300 - arg3 * 3, 30);
local6.setFont(Static222.aFont1);
local6.setColor(Color.white);
arg2.method3112(local146 + 22, local140 + (-arg2.method3155(Static240.aFontMetrics1) + 304) / 2, local6);
}
if (Static278.mainLoadPrimaryText != null) {
local6.setFont(Static222.aFont1);
local6.setColor(Color.white);
Static278.mainLoadPrimaryText.method3112(GameShell.canvasHeight / 2 - 26, GameShell.canvasWidth / 2 - Static278.mainLoadPrimaryText.method3155(Static240.aFontMetrics1) / 2, local6);
}
} catch (@Pc(252) Exception local252) {
GameShell.canvas.repaint();
}
}
}

6
client/src/main/java/Loc.java
View file

@ -197,7 +197,7 @@ public final class Loc extends Entity {
}
}
while (local10 > this.aClass144_2.anIntArray474[this.anInt1297]) {
Static152.method2836(arg0, this.aClass144_2, arg1, false, this.anInt1297);
SoundPlayer.playSeqSound(arg0, this.aClass144_2, arg1, false, this.anInt1297);
local10 -= this.aClass144_2.anIntArray474[this.anInt1297];
this.anInt1297++;
if (this.aClass144_2.frames.length <= this.anInt1297) {
@ -234,7 +234,7 @@ public final class Loc extends Entity {
return null;
}
@Pc(69) int local69;
if (Static266.game != 0 && this.aBoolean80 && (this.aClass144_2 == null || this.aClass144_2 != null && this.aClass144_2.anInt5361 != local19.anInt4430)) {
if (client.game != 0 && this.aBoolean80 && (this.aClass144_2 == null || this.aClass144_2 != null && this.aClass144_2.anInt5361 != local19.anInt4430)) {
local69 = local19.anInt4430;
if (local19.anInt4430 == -1) {
local69 = local22;
@ -269,7 +269,7 @@ public final class Loc extends Entity {
@Pc(192) int local192 = (local157 >> 1) + this.anInt1300;
@Pc(201) int local201 = (local157 + 1 >> 1) + this.anInt1300;
this.method1047(local192 * 128, local185 * 128);
@Pc(256) boolean local256 = !local12 && local19.aBoolean212 && (local19.anInt4426 != this.anInt1321 || (this.anInt1297 != this.anInt1322 || this.aClass144_2 != null && (this.aClass144_2.aBoolean280 || Static204.applyTweening) && this.anInt1297 != this.anInt1304) && Static139.sceneryShadowsType >= 2);
@Pc(256) boolean local256 = !local12 && local19.aBoolean212 && (local19.anInt4426 != this.anInt1321 || (this.anInt1297 != this.anInt1322 || this.aClass144_2 != null && (this.aClass144_2.aBoolean280 || Static204.applyTweening) && this.anInt1297 != this.anInt1304) && Preferences.sceneryShadowsType >= 2);
if (arg0 && !local256) {
return null;
}

4
client/src/main/java/LocType.java
View file

@ -85,7 +85,7 @@ public final class LocType {
public int anInt4419 = 0;
@OriginalMember(owner = "client!pb", name = "h", descriptor = "I")
public int anInt4400 = -1;
public int mapElement = -1;
@OriginalMember(owner = "client!pb", name = "L", descriptor = "Z")
public boolean aBoolean214 = false;
@ -484,7 +484,7 @@ public final class LocType {
this.aByteArray63[len] = arg0.g1s();
}
} else if (arg1 == 60) {
this.anInt4400 = arg0.g2();
this.mapElement = arg0.g2();
} else if (arg1 == 62) {
this.aBoolean217 = true;
} else if (arg1 == 64) {

15
client/src/main/java/LocalizedText.java
View file

@ -1,3 +1,4 @@
import org.openrs2.deob.annotation.OriginalArg;
import org.openrs2.deob.annotation.OriginalMember;
public class LocalizedText {
@ -1304,5 +1305,19 @@ public class LocalizedText {
CHATEFFECT4 = FR_CHATEFFECT4;
MAINLOAD135 = FR_MAINLOAD135;
}
@OriginalMember(owner = "client!ab", name = "a", descriptor = "(II)V")
public static void setLanguage(@OriginalArg(1) int arg0) {
if (arg0 == 0) {
return;
}
if (arg0 == 1) {
switchToGerman();
} else if (arg0 == 2) {
switchToFrench();
} else {
throw new RuntimeException();
}
}
//endregion
}

4
client/src/main/java/LongNode.java
View file

@ -6,10 +6,10 @@ import org.openrs2.deob.annotation.OriginalMember;
public final class LongNode extends Node {
@OriginalMember(owner = "client!eb", name = "v", descriptor = "J")
public long aLong55;
public long value;
@OriginalMember(owner = "client!eb", name = "<init>", descriptor = "(J)V")
public LongNode(@OriginalArg(0) long arg0) {
this.aLong55 = arg0;
this.value = arg0;
}
}

4
client/src/main/java/LruHashTable.java
View file

@ -71,8 +71,8 @@ public final class LruHashTable {
@OriginalMember(owner = "client!gn", name = "c", descriptor = "(I)V")
public final void clear() {
this.aClass16_1.method802();
this.aClass133_5.method3856();
this.aClass16_1.clear();
this.aClass133_5.clear();
this.aClass3_Sub2_37 = new SecondaryNode();
this.anInt2314 = this.anInt2313;
}

12
client/src/main/java/Map.java
View file

@ -25,13 +25,13 @@ public final class Map extends SecondaryNode {
public boolean aBoolean50 = true;
@OriginalMember(owner = "client!bn", name = "db", descriptor = "I")
public int anInt772 = -1;
public int defaultZoom = -1;
@OriginalMember(owner = "client!bn", name = "T", descriptor = "I")
public final int anInt764;
@OriginalMember(owner = "client!bn", name = "bb", descriptor = "Lclient!na;")
public final JagString aClass100_138;
public final JagString group;
@OriginalMember(owner = "client!bn", name = "Q", descriptor = "Lclient!na;")
public final JagString aClass100_137;
@ -47,12 +47,12 @@ public final class Map extends SecondaryNode {
this.anInt764 = arg3;
this.anInt759 = arg4;
this.aBoolean50 = arg5;
this.aClass100_138 = arg0;
this.group = arg0;
this.aClass100_137 = arg1;
this.anInt772 = arg6;
this.defaultZoom = arg6;
this.anInt769 = arg2;
if (this.anInt772 == 255) {
this.anInt772 = 0;
if (this.defaultZoom == 255) {
this.defaultZoom = 0;
}
this.aClass69_23 = new LinkedList();
}

4
client/src/main/java/Class3_Sub26.java → client/src/main/java/MapElement.java
View file

@ -2,13 +2,13 @@ import org.openrs2.deob.annotation.OriginalClass;
import org.openrs2.deob.annotation.OriginalMember;
@OriginalClass("client!oj")
public final class Class3_Sub26 extends Node {
public final class MapElement extends Node {
@OriginalMember(owner = "client!oj", name = "q", descriptor = "I")
public int anInt4307;
@OriginalMember(owner = "client!oj", name = "r", descriptor = "I")
public int anInt4308;
public int id;
@OriginalMember(owner = "client!oj", name = "A", descriptor = "I")
public int anInt4314;

26
client/src/main/java/MapFunctionGroup.java → client/src/main/java/MapElementList.java
View file

@ -1,9 +1,10 @@
import org.openrs2.deob.annotation.OriginalArg;
import org.openrs2.deob.annotation.OriginalClass;
import org.openrs2.deob.annotation.OriginalMember;
import org.openrs2.deob.annotation.Pc;
@OriginalClass("client!se")
public final class MapFunctionGroup {
public final class MapElementList {
@OriginalMember(owner = "client!se", name = "i", descriptor = "I")
public final int anInt5074;
@ -24,7 +25,7 @@ public final class MapFunctionGroup {
public final short[] aShortArray73;
@OriginalMember(owner = "client!se", name = "<init>", descriptor = "(I)V")
public MapFunctionGroup(@OriginalArg(0) int arg0) {
public MapElementList(@OriginalArg(0) int arg0) {
this.anInt5074 = arg0;
this.aClass100Array153 = new JagString[this.anInt5074];
this.aShortArray72 = new short[this.anInt5074];
@ -33,7 +34,26 @@ public final class MapFunctionGroup {
this.aShortArray73 = new short[this.anInt5074];
}
@OriginalMember(owner = "client!se", name = "a", descriptor = "(IB)Z")
@OriginalMember(owner = "client!la", name = "a", descriptor = "(ILclient!na;Lclient!ve;)Lclient!se;")
public static MapElementList create(@OriginalArg(1) JagString arg0, @OriginalArg(2) Js5 arg1) {
@Pc(10) int local10 = arg1.getGroupId(arg0);
if (local10 == -1) {
return new MapElementList(0);
}
@Pc(29) int[] local29 = arg1.method4503(local10);
@Pc(35) MapElementList local35 = new MapElementList(local29.length);
for (@Pc(37) int local37 = 0; local37 < local35.anInt5074; local37++) {
@Pc(56) Buffer local56 = new Buffer(arg1.getFile(local10, local29[local37]));
local35.aClass100Array153[local37] = local56.gjstr();
local35.aByteArray69[local37] = local56.g1s();
local35.aShortArray73[local37] = (short) local56.g2();
local35.aShortArray72[local37] = (short) local56.g2();
local35.anIntArray444[local37] = local56.g4();
}
return local35;
}
@OriginalMember(owner = "client!se", name = "a", descriptor = "(IB)Z")
public final boolean method3890(@OriginalArg(0) int arg0) {
return (this.aByteArray69[arg0] & 0x8) != 0;
}

6
client/src/main/java/MapList.java Normal file
View file

@ -0,0 +1,6 @@
import org.openrs2.deob.annotation.OriginalMember;
public class MapList {
@OriginalMember(owner = "client!je", name = "W", descriptor = "Lclient!ve;")
public static Js5 archive;
}

2
client/src/main/java/MidiPcmStream.java
View file

@ -316,7 +316,7 @@ public final class MidiPcmStream extends PcmStream {
}
this.aClass3_Sub25ArrayArray2[arg1][local133.anInt3776] = local133;
}
this.aClass3_Sub3_Sub3_1.aClass69_126.method2282(local133);
this.aClass3_Sub3_Sub3_1.aClass69_126.addTail(local133);
this.aClass3_Sub25ArrayArray1[arg1][arg2] = local133;
}

42
client/src/main/java/MidiPlayer.java Normal file
View file

@ -0,0 +1,42 @@
import org.openrs2.deob.annotation.OriginalMember;
import org.openrs2.deob.annotation.Pc;
public class MidiPlayer {
@OriginalMember(owner = "client!le", name = "k", descriptor = "Z")
public static boolean jingle = false;
@OriginalMember(owner = "client!km", name = "c", descriptor = "(Z)Z")
public static boolean method2699() {
try {
if (Static14.anInt441 == 2) {
if (Static144.aClass3_Sub29_1 == null) {
Static144.aClass3_Sub29_1 = Song.create(Static172.aClass153_70, Static277.anInt5853, Static226.anInt5085);
if (Static144.aClass3_Sub29_1 == null) {
return false;
}
}
if (Static27.aClass89_1 == null) {
Static27.aClass89_1 = new SoundBank(Static78.aClass153_32, Static252.aClass153_103);
}
if (Static172.aClass3_Sub3_Sub4_2.method4411(Static144.aClass3_Sub29_1, Static210.aClass153_87, Static27.aClass89_1)) {
Static172.aClass3_Sub3_Sub4_2.method4412();
Static172.aClass3_Sub3_Sub4_2.method4447(Static253.anInt5527);
Static172.aClass3_Sub3_Sub4_2.method4431(Static72.aBoolean116, Static144.aClass3_Sub29_1);
Static14.anInt441 = 0;
Static144.aClass3_Sub29_1 = null;
Static27.aClass89_1 = null;
Static172.aClass153_70 = null;
return true;
}
}
} catch (@Pc(68) Exception local68) {
local68.printStackTrace();
Static172.aClass3_Sub3_Sub4_2.method4446();
Static172.aClass153_70 = null;
Static144.aClass3_Sub29_1 = null;
Static14.anInt441 = 0;
Static27.aClass89_1 = null;
}
return false;
}
}

4
client/src/main/java/MillisTimer.java
View file

@ -33,7 +33,7 @@ public final class MillisTimer extends Timer {
@OriginalMember(owner = "client!lj", name = "b", descriptor = "(I)V")
@Override
public final void method3394() {
public final void reset() {
for (@Pc(7) int local7 = 0; local7 < 10; local7++) {
this.aLongArray4[local7] = 0L;
}
@ -76,7 +76,7 @@ public final class MillisTimer extends Timer {
if (arg0 > this.anInt3552) {
this.anInt3552 = arg0;
}
Static231.sleep((long) this.anInt3552);
ThreadUtils.sleep((long) this.anInt3552);
local139 = 0;
while (this.anInt3553 < 256) {
this.anInt3553 += this.anInt3550;

6
client/src/main/java/MiniMenu.java Normal file
View file

@ -0,0 +1,6 @@
import org.openrs2.deob.annotation.OriginalMember;
public class MiniMenu {
@OriginalMember(owner = "client!df", name = "l", descriptor = "Lclient!na;")
public static final JagString COLOR_GREEN = Static28.parse("<col=00ff00>");
}

19
client/src/main/java/Mouse.java
View file

@ -1,3 +1,4 @@
import java.awt.Component;
import java.awt.event.FocusEvent;
import java.awt.event.FocusListener;
import java.awt.event.MouseEvent;
@ -16,6 +17,24 @@ public final class Mouse implements MouseListener, MouseMotionListener, FocusLis
public int mouseWheelX;
public int mouseWheelY;
@OriginalMember(owner = "client!sc", name = "a", descriptor = "(ILjava/awt/Component;)V")
public static void stop(@OriginalArg(1) Component arg0) {
arg0.removeMouseListener(Static93.instance);
arg0.removeMouseMotionListener(Static93.instance);
arg0.removeFocusListener(Static93.instance);
Static57.anInt1759 = 0;
}
@OriginalMember(owner = "client!ug", name = "a", descriptor = "(I)V")
public static void quit() {
if (Static93.instance != null) {
@Pc(5) Mouse local5 = Static93.instance;
synchronized (Static93.instance) {
Static93.instance = null;
}
}
}
@OriginalMember(owner = "client!ug", name = "mouseMoved", descriptor = "(Ljava/awt/event/MouseEvent;)V")
@Override
public final synchronized void mouseMoved(@OriginalArg(0) MouseEvent arg0) {

6
client/src/main/java/MouseRecorder.java
View file

@ -5,7 +5,9 @@ import org.openrs2.deob.annotation.Pc;
@OriginalClass("client!jd")
public final class MouseRecorder implements Runnable {
@OriginalMember(owner = "client!jd", name = "e", descriptor = "Z")
@OriginalMember(owner = "client!od", name = "f", descriptor = "Lclient!jd;")
public static MouseRecorder instance;
@OriginalMember(owner = "client!jd", name = "e", descriptor = "Z")
public boolean running = true;
@OriginalMember(owner = "client!jd", name = "f", descriptor = "Ljava/lang/Object;")
@ -32,7 +34,7 @@ public final class MouseRecorder implements Runnable {
this.samples++;
}
}
Static231.sleep(50L);
ThreadUtils.sleep(50L);
}
}
}

20
client/src/main/java/MsiTypeList.java Normal file
View file

@ -0,0 +1,20 @@
import org.openrs2.deob.annotation.OriginalArg;
import org.openrs2.deob.annotation.OriginalMember;
import org.openrs2.deob.annotation.Pc;
public class MsiTypeList {
@OriginalMember(owner = "client!da", name = "c", descriptor = "(II)Lclient!aa;")
public static MsiType get(@OriginalArg(0) int arg0) {
@Pc(10) MsiType local10 = (MsiType) Static231.aClass99_29.get((long) arg0);
if (local10 != null) {
return local10;
}
@Pc(20) byte[] local20 = Static98.aClass153_42.getFile(34, arg0);
local10 = new MsiType();
if (local20 != null) {
local10.decode(new Buffer(local20), arg0);
}
Static231.aClass99_29.put(local10, (long) arg0);
return local10;
}
}

4
client/src/main/java/NanoTimer.java
View file

@ -11,7 +11,7 @@ public final class NanoTimer extends Timer {
@OriginalMember(owner = "client!om", name = "b", descriptor = "(I)V")
@Override
public final void method3394() {
public final void reset() {
this.aLong142 = System.nanoTime();
}
@ -23,7 +23,7 @@ public final class NanoTimer extends Timer {
if (local9 > local14) {
local14 = local9;
}
Static231.sleep(local14 / 1000000L);
ThreadUtils.sleep(local14 / 1000000L);
@Pc(31) int local31 = 0;
@Pc(33) long local33 = System.nanoTime();
while (local31 < 10 && (local31 < 1 || this.aLong142 < local33)) {

6
client/src/main/java/Npc.java
View file

@ -26,7 +26,7 @@ public final class Npc extends PathingEntity {
if (this.type == null) {
return;
}
@Pc(29) SeqType local29 = this.anInt3369 != -1 && this.anInt3420 == 0 ? Static36.get(this.anInt3369) : null;
@Pc(29) SeqType local29 = this.seqId != -1 && this.anInt3420 == 0 ? Static36.get(this.seqId) : null;
@Pc(53) SeqType local53 = this.anInt3366 == -1 || this.anInt3366 == this.method2681().idleAnimationId && local29 != null ? null : Static36.get(this.anInt3366);
@Pc(74) Model local74 = this.type.getBodyModel(this.aClass147Array3, this.anInt3388, this.anInt3407, this.anInt3373, this.anInt3360, this.anInt3425, local53, this.anInt3396, local29);
if (local74 == null) {
@ -38,7 +38,7 @@ public final class Npc extends PathingEntity {
local84 = local84.getMultiNpc();
}
@Pc(140) Model local140;
if (Static209.characterShadowsOn && local84.shadow) {
if (Preferences.characterShadowsOn && local84.shadow) {
local140 = Static41.method1043(this.type.aByte13, this.aBoolean171, local53 == null ? local29 : local53, this.xFine, this.type.aShort23, this.zFine, this.type.aShort24, this.type.soze, local74, arg0, local53 == null ? this.anInt3425 : this.anInt3407, this.anInt3424, this.type.aByte12);
if (GlRenderer.enabled) {
@Pc(144) float local144 = GlRenderer.method4179();
@ -98,7 +98,7 @@ public final class Npc extends PathingEntity {
@OriginalMember(owner = "client!km", name = "b", descriptor = "(I)I")
@Override
protected final int method2688() {
if (Static266.game != 0 && this.type.multiNpcs != null) {
if (client.game != 0 && this.type.multiNpcs != null) {
@Pc(17) NpcType local17 = this.type.getMultiNpc();
if (local17 != null && local17.basId != -1) {
return local17.basId;

12
client/src/main/java/PathingEntity.java
View file

@ -97,7 +97,7 @@ public abstract class PathingEntity extends Entity {
public int anInt3360 = 0;
@OriginalMember(owner = "client!fe", name = "O", descriptor = "I")
public int anInt3369 = -1;
public int seqId = -1;
@OriginalMember(owner = "client!fe", name = "ab", descriptor = "Z")
private boolean aBoolean169 = false;
@ -265,8 +265,8 @@ public abstract class PathingEntity extends Entity {
@OriginalMember(owner = "client!fe", name = "a", descriptor = "(IIIIZ)V")
public final void method2683(@OriginalArg(1) int arg0, @OriginalArg(2) int arg1, @OriginalArg(3) int arg2, @OriginalArg(4) boolean arg3) {
if (this.anInt3369 != -1 && Static36.get(this.anInt3369).anInt5349 == 1) {
this.anInt3369 = -1;
if (this.seqId != -1 && Static36.get(this.seqId).anInt5349 == 1) {
this.seqId = -1;
}
if (!arg3) {
@Pc(32) int local32 = arg1 - this.movementQueueX[0];
@ -293,7 +293,7 @@ public abstract class PathingEntity extends Entity {
this.anInt3405 = 0;
this.zFine = arg0 * 64 + this.movementQueueZ[0] * 128;
this.xFine = arg0 * 64 + this.movementQueueX[0] * 128;
if (GlRenderer.enabled && Static173.self == this) {
if (GlRenderer.enabled && PlayerList.self == this) {
Static86.setInstantFade();
}
}
@ -306,8 +306,8 @@ public abstract class PathingEntity extends Entity {
local10--;
local15++;
}
if (this.anInt3369 != -1 && Static36.get(this.anInt3369).anInt5349 == 1) {
this.anInt3369 = -1;
if (this.seqId != -1 && Static36.get(this.seqId).anInt5349 == 1) {
this.seqId = -1;
}
if (this.movementQueueSize < 9) {
this.movementQueueSize++;

76
client/src/main/java/Player.java
View file

@ -6,8 +6,12 @@ import org.openrs2.deob.annotation.Pc;
@OriginalClass("client!e")
public final class Player extends PathingEntity {
@OriginalMember(owner = "client!pa", name = "P", descriptor = "Lclient!na;")
public static JagString password = JagString.EMPTY;
@OriginalMember(owner = "client!pa", name = "S", descriptor = "Lclient!na;")
public static JagString username = JagString.EMPTY;
@OriginalMember(owner = "client!e", name = "Bc", descriptor = "Lclient!hh;")
public PlayerAppearance aClass59_1;
public PlayerAppearance appearance;
@OriginalMember(owner = "client!e", name = "Mc", descriptor = "Lclient!na;")
public JagString aClass100_364;
@ -54,10 +58,40 @@ public final class Player extends PathingEntity {
@OriginalMember(owner = "client!e", name = "Wc", descriptor = "I")
public int anInt1670 = -1;
@OriginalMember(owner = "client!pa", name = "a", descriptor = "(IIILclient!e;)V")
public static void animate(@OriginalArg(1) int arg0, @OriginalArg(2) int arg1, @OriginalArg(3) Player arg2) {
if (arg1 == arg2.seqId && arg1 != -1) {
@Pc(89) SeqType local89 = Static36.get(arg1);
@Pc(92) int local92 = local89.anInt5347;
if (local92 == 1) {
arg2.anInt3420 = arg0;
arg2.anInt3360 = 0;
arg2.anInt3373 = 1;
arg2.anInt3425 = 0;
arg2.anInt3371 = 0;
SoundPlayer.playSeqSound(arg2.zFine, local89, arg2.xFine, PlayerList.self == arg2, arg2.anInt3425);
}
if (local92 == 2) {
arg2.anInt3371 = 0;
}
} else if (arg1 == -1 || arg2.seqId == -1 || Static36.get(arg1).anInt5355 >= Static36.get(arg2.seqId).anInt5355) {
arg2.anInt3373 = 1;
arg2.anInt3425 = 0;
arg2.anInt3420 = arg0;
arg2.anInt3405 = arg2.movementQueueSize;
arg2.anInt3371 = 0;
arg2.anInt3360 = 0;
arg2.seqId = arg1;
if (arg2.seqId != -1) {
SoundPlayer.playSeqSound(arg2.zFine, Static36.get(arg2.seqId), arg2.xFine, arg2 == PlayerList.self, arg2.anInt3425);
}
}
}
@OriginalMember(owner = "client!e", name = "c", descriptor = "(B)I")
@Override
public final int getSize() {
return this.aClass59_1 == null || this.aClass59_1.anInt2492 == -1 ? super.getSize() : Static214.get(this.aClass59_1.anInt2492).soze;
return this.appearance == null || this.appearance.anInt2492 == -1 ? super.getSize() : Static214.get(this.appearance.anInt2492).soze;
}
@OriginalMember(owner = "client!e", name = "b", descriptor = "(I)I")
@ -151,11 +185,11 @@ public final class Player extends PathingEntity {
Static214.method4359(this);
}
}
if (this.aClass59_1 == null) {
this.aClass59_1 = new PlayerAppearance();
if (this.appearance == null) {
this.appearance = new PlayerAppearance();
}
local175 = this.aClass59_1.anInt2492;
this.aClass59_1.method1950(local197, local22, local26 == 1, local44, this.anInt3365);
local175 = this.appearance.anInt2492;
this.appearance.method1950(local197, local22, local26 == 1, local44, this.anInt3365);
if (local175 != local22) {
this.xFine = this.movementQueueX[0] * 128 + this.getSize() * 64;
this.zFine = this.movementQueueZ[0] * 128 + this.getSize() * 64;
@ -168,18 +202,18 @@ public final class Player extends PathingEntity {
@OriginalMember(owner = "client!e", name = "a", descriptor = "(IIIIIIIIJILclient!ga;)V")
@Override
public final void method4546(@OriginalArg(0) int arg0, @OriginalArg(1) int arg1, @OriginalArg(2) int arg2, @OriginalArg(3) int arg3, @OriginalArg(4) int arg4, @OriginalArg(5) int arg5, @OriginalArg(6) int arg6, @OriginalArg(7) int arg7, @OriginalArg(8) long arg8, @OriginalArg(9) int arg9, @OriginalArg(10) ParticleSystem arg10) {
if (this.aClass59_1 == null) {
if (this.appearance == null) {
return;
}
@Pc(25) SeqType local25 = this.anInt3369 != -1 && this.anInt3420 == 0 ? Static36.get(this.anInt3369) : null;
@Pc(25) SeqType local25 = this.seqId != -1 && this.anInt3420 == 0 ? Static36.get(this.seqId) : null;
@Pc(54) SeqType local54 = this.anInt3366 == -1 || this.aBoolean98 || this.anInt3366 == this.method2681().idleAnimationId && local25 != null ? null : Static36.get(this.anInt3366);
@Pc(76) Model local76 = this.aClass59_1.method1954(this.aClass147Array3, this.anInt3373, local54, local25, this.anInt3396, this.anInt3388, this.anInt3360, this.anInt3425, this.anInt3407);
@Pc(76) Model local76 = this.appearance.method1954(this.aClass147Array3, this.anInt3373, local54, local25, this.anInt3396, this.anInt3388, this.anInt3360, this.anInt3425, this.anInt3407);
@Pc(79) int local79 = Static198.method1029();
if (GlRenderer.enabled && GameShell.maxMemory < 96 && local79 > 50) {
Static16.method501();
}
@Pc(102) int local102;
if (Static81.modeWhat != 0 && local79 < 50) {
if (client.modeWhat != 0 && local79 < 50) {
local102 = 50 - local79;
while (Static105.anInt2863 < local102) {
Static51.aByteArrayArray8[Static105.anInt2863] = new byte[102400];
@ -195,7 +229,7 @@ public final class Player extends PathingEntity {
}
this.anInt3413 = local76.method4549();
@Pc(184) Model local184;
if (Static209.characterShadowsOn && (this.aClass59_1.anInt2492 == -1 || Static214.get(this.aClass59_1.anInt2492).shadow)) {
if (Preferences.characterShadowsOn && (this.appearance.anInt2492 == -1 || Static214.get(this.appearance.anInt2492).shadow)) {
local184 = Static41.method1043(160, this.aBoolean171, local54 == null ? local25 : local54, this.xFine, 0, this.zFine, 0, 1, local76, arg0, local54 == null ? this.anInt3425 : this.anInt3407, this.anInt3424, 240);
if (GlRenderer.enabled) {
@Pc(188) float local188 = GlRenderer.method4179();
@ -209,7 +243,7 @@ public final class Player extends PathingEntity {
local184.method4546(0, arg1, arg2, arg3, arg4, arg5, arg6, arg7, -1L, arg9, null);
}
}
if (Static173.self == this) {
if (PlayerList.self == this) {
for (local102 = Static143.aClass102Array1.length - 1; local102 >= 0; local102--) {
@Pc(245) Class102 local245 = Static143.aClass102Array1[local102];
if (local245 != null && local245.anInt4052 != -1) {
@ -218,21 +252,21 @@ public final class Player extends PathingEntity {
if (local245.anInt4058 == 1 && local245.anInt4057 >= 0 && Static175.npcs.length > local245.anInt4057) {
@Pc(278) Npc local278 = Static175.npcs[local245.anInt4057];
if (local278 != null) {
local291 = local278.xFine / 32 - Static173.self.xFine / 32;
local302 = local278.zFine / 32 - Static173.self.zFine / 32;
local291 = local278.xFine / 32 - PlayerList.self.xFine / 32;
local302 = local278.zFine / 32 - PlayerList.self.zFine / 32;
this.method1263(null, local302, local76, local291, arg5, arg9, arg0, arg7, arg4, arg3, arg1, local245.anInt4052, arg2, arg6);
}
}
if (local245.anInt4058 == 2) {
@Pc(340) int local340 = (local245.anInt4053 - Static225.originX) * 4 + 2 - Static173.self.xFine / 32;
local291 = (local245.anInt4046 - Static142.originZ) * 4 + 2 - Static173.self.zFine / 32;
@Pc(340) int local340 = (local245.anInt4053 - Static225.originX) * 4 + 2 - PlayerList.self.xFine / 32;
local291 = (local245.anInt4046 - Static142.originZ) * 4 + 2 - PlayerList.self.zFine / 32;
this.method1263(null, local291, local76, local340, arg5, arg9, arg0, arg7, arg4, arg3, arg1, local245.anInt4052, arg2, arg6);
}
if (local245.anInt4058 == 10 && local245.anInt4057 >= 0 && Static159.players.length > local245.anInt4057) {
@Pc(395) Player local395 = Static159.players[local245.anInt4057];
if (local395 != null) {
local291 = local395.xFine / 32 - Static173.self.xFine / 32;
local302 = local395.zFine / 32 - Static173.self.zFine / 32;
local291 = local395.xFine / 32 - PlayerList.self.xFine / 32;
local302 = local395.zFine / 32 - PlayerList.self.zFine / 32;
this.method1263(null, local302, local76, local291, arg5, arg9, arg0, arg7, arg4, arg3, arg1, local245.anInt4052, arg2, arg6);
}
}
@ -338,17 +372,17 @@ public final class Player extends PathingEntity {
@OriginalMember(owner = "client!e", name = "a", descriptor = "(B)Z")
@Override
public final boolean method2682() {
return this.aClass59_1 != null;
return this.appearance != null;
}
@OriginalMember(owner = "client!e", name = "e", descriptor = "(I)Lclient!na;")
public final JagString method1264() {
@Pc(2) JagString local2 = this.aClass100_364;
if (Static103.aClass100Array88 != null) {
local2 = Static34.concatenate(new JagString[] { Static103.aClass100Array88[this.anInt1651], local2 });
local2 = JagString.concatenate(new JagString[] { Static103.aClass100Array88[this.anInt1651], local2 });
}
if (Static263.aClass100Array174 != null) {
local2 = Static34.concatenate(new JagString[] { local2, Static263.aClass100Array174[this.anInt1651] });
local2 = JagString.concatenate(new JagString[] { local2, Static263.aClass100Array174[this.anInt1651] });
}
return local2;
}

4
client/src/main/java/PlayerAppearance.java
View file

@ -6,7 +6,9 @@ import org.openrs2.deob.annotation.Pc;
@OriginalClass("client!hh")
public final class PlayerAppearance {
@OriginalMember(owner = "client!hh", name = "e", descriptor = "I")
@OriginalMember(owner = "client!bj", name = "t", descriptor = "[S")
public static final short[] aShortArray5 = new short[] { -4160, -4163, -8256, -8259, 22461 };
@OriginalMember(owner = "client!hh", name = "e", descriptor = "I")
public int anInt2492;
@OriginalMember(owner = "client!hh", name = "i", descriptor = "J")

6
client/src/main/java/PlayerList.java Normal file
View file

@ -0,0 +1,6 @@
import org.openrs2.deob.annotation.OriginalMember;
public class PlayerList {
@OriginalMember(owner = "client!nk", name = "O", descriptor = "Lclient!e;")
public static Player self;
}

319
client/src/main/java/Preferences.java Normal file
View file

@ -0,0 +1,319 @@
import org.openrs2.deob.annotation.OriginalArg;
import org.openrs2.deob.annotation.OriginalMember;
import org.openrs2.deob.annotation.Pc;
import java.io.IOException;
public class Preferences {
@OriginalMember(owner = "client!pa", name = "N", descriptor = "I")
public static int antiAliasingMode = 0;
@OriginalMember(owner = "client!na", name = "h", descriptor = "Z")
public static boolean safeMode = false;
@OriginalMember(owner = "client!il", name = "I", descriptor = "I")
public static int brightness = 3;
@OriginalMember(owner = "client!gf", name = "N", descriptor = "Z")
public static boolean removeRoofsSelectively = true;
@OriginalMember(owner = "client!hk", name = "eb", descriptor = "Z")
public static boolean stereo = true;
@OriginalMember(owner = "client!rm", name = "g", descriptor = "Z")
public static boolean highWaterDetail = true;
@OriginalMember(owner = "client!hn", name = "X", descriptor = "I")
public static int windowMode = 0;
@OriginalMember(owner = "client!bl", name = "W", descriptor = "I")
public static int fullScreenHeight = 0;
@OriginalMember(owner = "client!uf", name = "b", descriptor = "Z")
public static boolean showGroundDecorations = true;
@OriginalMember(owner = "client!ba", name = "x", descriptor = "Z")
public static boolean flickeringEffectsOn = true;
@OriginalMember(owner = "client!be", name = "Kb", descriptor = "Z")
public static boolean manyIdleAnimations = true;
@OriginalMember(owner = "client!cg", name = "f", descriptor = "I")
public static int ambientSoundsVolume = 127;
@OriginalMember(owner = "client!fk", name = "g", descriptor = "Z")
public static boolean fogEnabled = true;
@OriginalMember(owner = "client!ra", name = "R", descriptor = "Z")
public static boolean characterShadowsOn = true;
@OriginalMember(owner = "client!j", name = "v", descriptor = "I")
public static int fullScreenWidth = 0;
@OriginalMember(owner = "client!l", name = "k", descriptor = "I")
public static int sceneryShadowsType = 2;
@OriginalMember(owner = "client!mi", name = "ab", descriptor = "Z")
public static boolean manyGroundTextures = true;
@OriginalMember(owner = "client!od", name = "c", descriptor = "Z")
public static boolean highDetailLighting = true;
@OriginalMember(owner = "client!bb", name = "n", descriptor = "I")
public static int musicVolume = 255;
@OriginalMember(owner = "client!ec", name = "n", descriptor = "Z")
public static boolean highDetailTextures = true;
@OriginalMember(owner = "client!jl", name = "J", descriptor = "I")
public static int soundEffectVolume = 127;
@OriginalMember(owner = "client!na", name = "o", descriptor = "I")
public static int lastWorldId = 0;
@OriginalMember(owner = "client!lb", name = "A", descriptor = "I")
public static int buildArea = 0;
@OriginalMember(owner = "client!ml", name = "ab", descriptor = "Z")
public static boolean allLevelsVisible = true;
@OriginalMember(owner = "client!cj", name = "h", descriptor = "Z")
public static boolean aBoolean63;
@OriginalMember(owner = "client!fb", name = "m", descriptor = "Z")
public static boolean cursorsEnabled = true;
@OriginalMember(owner = "client!k", name = "c", descriptor = "Z")
public static boolean hdr = false;
@OriginalMember(owner = "client!rg", name = "F", descriptor = "I")
public static int favoriteWorlds = 0;
@OriginalMember(owner = "client!ga", name = "e", descriptor = "I")
static int particles = 2;
@OriginalMember(owner = "client!qh", name = "a", descriptor = "(Lsignlink!ll;B)V")
public static void write(@OriginalArg(0) SignLink arg0) {
@Pc(11) FileOnDisk local11 = null;
try {
@Pc(16) PrivilegedRequest local16 = arg0.openPreferences("runescape");
while (local16.status == 0) {
ThreadUtils.sleep(1L);
}
if (local16.status == 1) {
local11 = (FileOnDisk) local16.result;
@Pc(39) Buffer local39 = encode();
local11.write(local39.data, local39.offset, 0);
}
} catch (@Pc(49) Exception local49) {
}
try {
if (local11 != null) {
local11.close();
}
} catch (@Pc(56) Exception local56) {
}
}
@OriginalMember(owner = "client!gf", name = "a", descriptor = "(Lsignlink!ll;I)V")
public static void read(@OriginalArg(0) SignLink arg0) {
brightness = 3;
setAllVisibleLevels(true);
removeRoofsSelectively = true;
stereo = true;
highWaterDetail = true;
windowMode = 0;
fullScreenHeight = 0;
showGroundDecorations = true;
flickeringEffectsOn = true;
manyIdleAnimations = true;
ambientSoundsVolume = 127;
fogEnabled = true;
characterShadowsOn = true;
fullScreenWidth = 0;
sceneryShadowsType = 2;
manyGroundTextures = true;
highDetailLighting = true;
musicVolume = 255;
highDetailTextures = true;
antiAliasingMode = 0;
@Pc(48) FileOnDisk local48 = null;
soundEffectVolume = 127;
if (GameShell.maxMemory >= 96) {
setParticles(2);
} else {
setParticles(0);
}
lastWorldId = 0;
buildArea = 0;
aBoolean63 = false;
cursorsEnabled = true;
safeMode = false;
hdr = false;
favoriteWorlds = 0;
try {
@Pc(78) PrivilegedRequest request = arg0.openPreferences("runescape");
while (request.status == 0) {
ThreadUtils.sleep(1L);
}
if (request.status == 1) {
local48 = (FileOnDisk) request.result;
@Pc(106) byte[] local106 = new byte[(int) local48.length()];
@Pc(128) int local128;
for (@Pc(108) int local108 = 0; local108 < local106.length; local108 += local128) {
local128 = local48.read(local108, local106.length - local108, local106);
if (local128 == -1) {
throw new IOException("EOF");
}
}
decode(new Buffer(local106));
}
} catch (@Pc(151) Exception local151) {
}
try {
if (local48 != null) {
local48.close();
}
} catch (@Pc(158) Exception local158) {
}
}
@OriginalMember(owner = "client!ec", name = "a", descriptor = "(IZ)V")
public static void setAllVisibleLevels(@OriginalArg(1) boolean arg0) {
allLevelsVisible = arg0;
Static87.aBoolean130 = !SceneGraph.allLevelsAreVisible();
}
@OriginalMember(owner = "client!ga", name = "b", descriptor = "(I)V")
public static void setParticles(@OriginalArg(0) int arg0) {
particles = arg0;
}
@OriginalMember(owner = "client!ga", name = "c", descriptor = "()I")
public static int getParticleSetting() {
return particles;
}
@OriginalMember(owner = "client!kk", name = "b", descriptor = "(Lclient!wa;I)V")
public static void decode(@OriginalArg(0) Buffer buffer) {
if (buffer.data.length - buffer.offset < 1) {
return;
}
@Pc(21) int version = buffer.g1();
if (version < 0 || version > 11) {
return;
}
@Pc(34) byte len;
if (version == 11) {
len = 33;
} else if (version == 10) {
len = 32;
} else if (version == 9) {
len = 31;
} else if (version == 8) {
len = 30;
} else if (version == 7) {
len = 29;
} else if (version == 6) {
len = 28;
} else if (version == 5) {
len = 28;
} else if (version == 4) {
len = 24;
} else if (version == 3) {
len = 23;
} else if (version == 2) {
len = 22;
} else if (version == 1) {
len = 23;
} else {
len = 19;
}
if (buffer.data.length - buffer.offset < len) {
return;
}
brightness = buffer.g1();
if (brightness < 1) {
brightness = 1;
} else if (brightness > 4) {
brightness = 4;
}
setAllVisibleLevels(buffer.g1() == 1);
removeRoofsSelectively = buffer.g1() == 1;
showGroundDecorations = buffer.g1() == 1;
highDetailTextures = buffer.g1() == 1;
manyIdleAnimations = buffer.g1() == 1;
flickeringEffectsOn = buffer.g1() == 1;
manyGroundTextures = buffer.g1() == 1;
characterShadowsOn = buffer.g1() == 1;
sceneryShadowsType = buffer.g1();
if (sceneryShadowsType > 2) {
sceneryShadowsType = 2;
}
if (version < 2) {
highDetailLighting = buffer.g1() == 1;
buffer.g1();
} else {
highDetailLighting = buffer.g1() == 1;
}
highWaterDetail = buffer.g1() == 1;
fogEnabled = buffer.g1() == 1;
windowMode = buffer.g1();
if (windowMode > 2) {
windowMode = 2;
}
antiAliasingMode = windowMode;
stereo = buffer.g1() == 1;
soundEffectVolume = buffer.g1();
if (soundEffectVolume > 127) {
soundEffectVolume = 127;
}
musicVolume = buffer.g1();
ambientSoundsVolume = buffer.g1();
if (ambientSoundsVolume > 127) {
ambientSoundsVolume = 127;
}
if (version >= 1) {
fullScreenWidth = buffer.g2();
fullScreenHeight = buffer.g2();
}
if (version >= 3 && version < 6) {
buffer.g1();
}
if (version >= 4) {
@Pc(386) int particles = buffer.g1();
if (GameShell.maxMemory < 96) {
particles = 0;
}
setParticles(particles);
}
if (version >= 5) {
lastWorldId = buffer.g4();
}
if (version >= 6) {
favoriteWorlds = buffer.g1();
}
if (version >= 7) {
safeMode = buffer.g1() == 1;
}
if (version >= 8) {
aBoolean63 = buffer.g1() == 1;
}
if (version >= 9) {
buildArea = buffer.g1();
}
if (version >= 10) {
hdr = buffer.g1() != 0;
}
if (version >= 11) {
cursorsEnabled = buffer.g1() != 0;
}
}
@OriginalMember(owner = "client!dl", name = "a", descriptor = "(B)Lclient!wa;")
public static Buffer encode() {
@Pc(4) Buffer local4 = new Buffer(34);
local4.p1(11);
local4.p1(brightness);
local4.p1(allLevelsVisible ? 1 : 0);
local4.p1(removeRoofsSelectively ? 1 : 0);
local4.p1(showGroundDecorations ? 1 : 0);
local4.p1(highDetailTextures ? 1 : 0);
local4.p1(manyIdleAnimations ? 1 : 0);
local4.p1(flickeringEffectsOn ? 1 : 0);
local4.p1(manyGroundTextures ? 1 : 0);
local4.p1(characterShadowsOn ? 1 : 0);
local4.p1(sceneryShadowsType);
local4.p1(highDetailLighting ? 1 : 0);
local4.p1(highWaterDetail ? 1 : 0);
local4.p1(fogEnabled ? 1 : 0);
local4.p1(windowMode);
local4.p1(stereo ? 1 : 0);
local4.p1(soundEffectVolume);
local4.p1(musicVolume);
local4.p1(ambientSoundsVolume);
local4.p2(fullScreenWidth);
local4.p2(fullScreenHeight);
local4.p1(getParticleSetting());
local4.p4(lastWorldId);
local4.p1(favoriteWorlds);
local4.p1(safeMode ? 1 : 0);
local4.p1(aBoolean63 ? 1 : 0);
local4.p1(buildArea);
local4.p1(hdr ? 1 : 0);
local4.p1(cursorsEnabled ? 1 : 0);
return local4;
}
}

6
client/src/main/java/Protocol.java Normal file
View file

@ -0,0 +1,6 @@
import org.openrs2.deob.annotation.OriginalMember;
public class Protocol {
@OriginalMember(owner = "client!jk", name = "B", descriptor = "Lclient!ma;")
public static BufferedSocket socket;
}

398
client/src/main/java/Rasteriser.java
View file

File diff suppressed because it is too large Load diff

8
client/src/main/java/SceneGraph.java Normal file
View file

@ -0,0 +1,8 @@
import org.openrs2.deob.annotation.OriginalMember;
public class SceneGraph {
@OriginalMember(owner = "client!km", name = "f", descriptor = "(I)Z")
public static boolean allLevelsAreVisible() {
return GlRenderer.enabled ? true : Preferences.allLevelsVisible;
}
}

2
client/src/main/java/SecondaryLinkedList.java
View file

@ -76,7 +76,7 @@ public final class SecondaryLinkedList {
}
@OriginalMember(owner = "client!ce", name = "d", descriptor = "(I)V")
public final void method802() {
public final void clear() {
while (true) {
@Pc(15) SecondaryNode local15 = this.aClass3_Sub2_21.aClass3_Sub2_67;
if (this.aClass3_Sub2_21 == local15) {

10
client/src/main/java/Shadow.java
View file

@ -9,7 +9,9 @@ import org.openrs2.deob.annotation.Pc;
@OriginalClass("client!wm")
public final class Shadow {
@OriginalMember(owner = "client!wm", name = "a", descriptor = "Lclient!vi;")
@OriginalMember(owner = "client!wm", name = "g", descriptor = "[B")
public static final byte[] pixels = new byte[16384];
@OriginalMember(owner = "client!wm", name = "a", descriptor = "Lclient!vi;")
private GlVertexBufferObject aClass155_6;
@OriginalMember(owner = "client!wm", name = "c", descriptor = "Ljava/nio/ByteBuffer;")
@ -144,16 +146,16 @@ public final class Shadow {
if (local2[local19 + local5] != 0) {
local96++;
}
Static281.aByteArray82[local23++] = (byte) (local96 * 17);
pixels[local23++] = (byte) (local96 * 17);
} else {
Static281.aByteArray82[local23++] = 68;
pixels[local23++] = 68;
}
local19++;
}
local19 += local5 - 128;
}
@Pc(145) GL2 local145 = GlRenderer.gl;
@Pc(148) ByteBuffer local148 = ByteBuffer.wrap(Static281.aByteArray82);
@Pc(148) ByteBuffer local148 = ByteBuffer.wrap(pixels);
local148.limit(16384);
GlRenderer.setTextureId(this.anInt5901);
local145.glTexImage2D(GL2.GL_TEXTURE_2D, 0, GL2.GL_ALPHA, 128, 128, 0, GL2.GL_ALPHA, GL2.GL_UNSIGNED_BYTE, local148);

4
client/src/main/java/SoftLruHashTable.java
View file

@ -100,8 +100,8 @@ public final class SoftLruHashTable {
@OriginalMember(owner = "client!n", name = "c", descriptor = "(I)V")
public final void clear() {
this.aClass16_8.method802();
this.aClass133_18.method3856();
this.aClass16_8.clear();
this.aClass133_18.clear();
this.anInt3966 = this.anInt3970;
}

256
client/src/main/java/SoftwareAlphaSprite.java
View file

@ -21,23 +21,23 @@ public final class SoftwareAlphaSprite extends SoftwareSprite {
@Pc(33) int local33 = local21 * 256 >> 8;
@Pc(45) int local45 = local27 * -10 + local33 * -10 + 983040;
@Pc(57) int local57 = local33 * -10 + 983040 - local27 * -10;
@Pc(63) int local63 = arg0 + arg1 * Static129.width;
@Pc(63) int local63 = arg0 + arg1 * SoftwareRaster.width;
for (@Pc(65) int local65 = 0; local65 < 20; local65++) {
@Pc(70) int local70 = local63;
@Pc(72) int local72 = local45;
@Pc(74) int local74 = local57;
for (@Pc(77) int local77 = -20; local77 < 0; local77++) {
@Pc(93) int local93 = this.anIntArray20[(local72 >> 16) + (local74 >> 16) * this.anInt1867];
@Pc(97) int local97 = Static129.pixels[local70];
@Pc(97) int local97 = SoftwareRaster.pixels[local70];
@Pc(101) int local101 = local93 >>> 24;
@Pc(105) int local105 = 256 - local101;
Static129.pixels[local70++] = ((local93 & 0xFF00FF) * local101 + (local97 & 0xFF00FF) * local105 & 0xFF00FF00) + ((local93 & 0xFF00) * local101 + (local97 & 0xFF00) * local105 & 0xFF0000) >>> 8;
SoftwareRaster.pixels[local70++] = ((local93 & 0xFF00FF) * local101 + (local97 & 0xFF00FF) * local105 & 0xFF00FF00) + ((local93 & 0xFF00) * local101 + (local97 & 0xFF00) * local105 & 0xFF0000) >>> 8;
local72 += local33;
local74 -= local27;
}
local45 += local27;
local57 += local33;
local63 += Static129.width;
local63 += SoftwareRaster.width;
}
} catch (@Pc(164) Exception local164) {
}
@ -48,40 +48,40 @@ public final class SoftwareAlphaSprite extends SoftwareSprite {
public final void method1423(@OriginalArg(0) int arg0, @OriginalArg(1) int arg1) {
arg0 += this.anInt1863;
arg1 += this.anInt1861;
@Pc(15) int local15 = arg0 + arg1 * Static129.width;
@Pc(15) int local15 = arg0 + arg1 * SoftwareRaster.width;
@Pc(17) int local17 = 0;
@Pc(20) int local20 = this.anInt1859;
@Pc(23) int local23 = this.anInt1867;
@Pc(27) int local27 = Static129.width - local23;
@Pc(27) int local27 = SoftwareRaster.width - local23;
@Pc(29) int local29 = 0;
@Pc(36) int local36;
if (arg1 < Static129.clipTop) {
local36 = Static129.clipTop - arg1;
if (arg1 < SoftwareRaster.clipTop) {
local36 = SoftwareRaster.clipTop - arg1;
local20 -= local36;
arg1 = Static129.clipTop;
arg1 = SoftwareRaster.clipTop;
local17 = local36 * local23;
local15 += local36 * Static129.width;
local15 += local36 * SoftwareRaster.width;
}
if (arg1 + local20 > Static129.clipBottom) {
local20 -= arg1 + local20 - Static129.clipBottom;
if (arg1 + local20 > SoftwareRaster.clipBottom) {
local20 -= arg1 + local20 - SoftwareRaster.clipBottom;
}
if (arg0 < Static129.clipLeft) {
local36 = Static129.clipLeft - arg0;
if (arg0 < SoftwareRaster.clipLeft) {
local36 = SoftwareRaster.clipLeft - arg0;
local23 -= local36;
arg0 = Static129.clipLeft;
arg0 = SoftwareRaster.clipLeft;
local17 += local36;
local15 += local36;
local29 = local36;
local27 += local36;
}
if (arg0 + local23 > Static129.clipRight) {
local36 = arg0 + local23 - Static129.clipRight;
if (arg0 + local23 > SoftwareRaster.clipRight) {
local36 = arg0 + local23 - SoftwareRaster.clipRight;
local23 -= local36;
local29 += local36;
local27 += local36;
}
if (local23 > 0 && local20 > 0) {
Static283.method319(Static129.pixels, this.anIntArray20, local17, local15, local23, local20, local27, local29);
Static283.method319(SoftwareRaster.pixels, this.anIntArray20, local17, local15, local23, local20, local27, local29);
}
}
@ -90,40 +90,40 @@ public final class SoftwareAlphaSprite extends SoftwareSprite {
public final void method1415(@OriginalArg(0) int arg0, @OriginalArg(1) int arg1) {
arg0 += this.anInt1863;
arg1 += this.anInt1861;
@Pc(15) int local15 = arg0 + arg1 * Static129.width;
@Pc(15) int local15 = arg0 + arg1 * SoftwareRaster.width;
@Pc(17) int local17 = 0;
@Pc(20) int local20 = this.anInt1859;
@Pc(23) int local23 = this.anInt1867;
@Pc(27) int local27 = Static129.width - local23;
@Pc(27) int local27 = SoftwareRaster.width - local23;
@Pc(29) int local29 = 0;
@Pc(36) int local36;
if (arg1 < Static129.clipTop) {
local36 = Static129.clipTop - arg1;
if (arg1 < SoftwareRaster.clipTop) {
local36 = SoftwareRaster.clipTop - arg1;
local20 -= local36;
arg1 = Static129.clipTop;
arg1 = SoftwareRaster.clipTop;
local17 = local36 * local23;
local15 += local36 * Static129.width;
local15 += local36 * SoftwareRaster.width;
}
if (arg1 + local20 > Static129.clipBottom) {
local20 -= arg1 + local20 - Static129.clipBottom;
if (arg1 + local20 > SoftwareRaster.clipBottom) {
local20 -= arg1 + local20 - SoftwareRaster.clipBottom;
}
if (arg0 < Static129.clipLeft) {
local36 = Static129.clipLeft - arg0;
if (arg0 < SoftwareRaster.clipLeft) {
local36 = SoftwareRaster.clipLeft - arg0;
local23 -= local36;
arg0 = Static129.clipLeft;
arg0 = SoftwareRaster.clipLeft;
local17 += local36;
local15 += local36;
local29 = local36;
local27 += local36;
}
if (arg0 + local23 > Static129.clipRight) {
local36 = arg0 + local23 - Static129.clipRight;
if (arg0 + local23 > SoftwareRaster.clipRight) {
local36 = arg0 + local23 - SoftwareRaster.clipRight;
local23 -= local36;
local29 += local36;
local27 += local36;
}
if (local23 > 0 && local20 > 0) {
Static283.method319(Static129.pixels, this.anIntArray20, local17, local15, local23, local20, local27, local29);
Static283.method319(SoftwareRaster.pixels, this.anIntArray20, local17, local15, local23, local20, local27, local29);
}
}
@ -200,17 +200,17 @@ public final class SoftwareAlphaSprite extends SoftwareSprite {
local166 = local166 + 15 >> 4;
local196 >>= 0x4;
local198 = local198 + 15 >> 4;
if (local164 < Static129.clipLeft) {
local164 = Static129.clipLeft;
if (local164 < SoftwareRaster.clipLeft) {
local164 = SoftwareRaster.clipLeft;
}
if (local166 > Static129.clipRight) {
local166 = Static129.clipRight;
if (local166 > SoftwareRaster.clipRight) {
local166 = SoftwareRaster.clipRight;
}
if (local196 < Static129.clipTop) {
local196 = Static129.clipTop;
if (local196 < SoftwareRaster.clipTop) {
local196 = SoftwareRaster.clipTop;
}
if (local198 > Static129.clipBottom) {
local198 = Static129.clipBottom;
if (local198 > SoftwareRaster.clipBottom) {
local198 = SoftwareRaster.clipBottom;
}
local166 = local164 - local166;
if (local166 >= 0) {
@ -220,7 +220,7 @@ public final class SoftwareAlphaSprite extends SoftwareSprite {
if (local198 >= 0) {
return;
}
@Pc(319) int local319 = local196 * Static129.width + local164;
@Pc(319) int local319 = local196 * SoftwareRaster.width + local164;
@Pc(324) double local324 = 1.6777216E7D / (double) arg5;
@Pc(333) int local333 = (int) Math.floor(Math.sin(local23) * local324 + 0.5D);
@Pc(342) int local342 = (int) Math.floor(Math.cos(local23) * local324 + 0.5D);
@ -260,17 +260,17 @@ public final class SoftwareAlphaSprite extends SoftwareSprite {
}
while (local394 < 0) {
local432 = this.anIntArray20[(local378 >> 12) * this.anInt1867 + (local802 >> 12)];
local436 = Static129.pixels[local388];
local436 = SoftwareRaster.pixels[local388];
local440 = local432 >>> 24;
local444 = 256 - local440;
Static129.pixels[local388++] = ((local432 & 0xFF00FF) * local440 + (local436 & 0xFF00FF) * local444 & 0xFF00FF00) + ((local432 & 0xFF00) * local440 + (local436 & 0xFF00) * local444 & 0xFF0000) >>> 8;
SoftwareRaster.pixels[local388++] = ((local432 & 0xFF00FF) * local440 + (local436 & 0xFF00FF) * local444 & 0xFF00FF00) + ((local432 & 0xFF00) * local440 + (local436 & 0xFF00) * local444 & 0xFF0000) >>> 8;
local802 += local342;
local394++;
}
}
local384++;
local378 += local342;
local319 += Static129.width;
local319 += SoftwareRaster.width;
}
} else if (local333 < 0) {
local384 = local198;
@ -305,10 +305,10 @@ public final class SoftwareAlphaSprite extends SoftwareSprite {
}
while (local394 < 0) {
local432 = this.anIntArray20[(local504 >> 12) * this.anInt1867 + (local802 >> 12)];
local436 = Static129.pixels[local388];
local436 = SoftwareRaster.pixels[local388];
local440 = local432 >>> 24;
local444 = 256 - local440;
Static129.pixels[local388++] = ((local432 & 0xFF00FF) * local440 + (local436 & 0xFF00FF) * local444 & 0xFF00FF00) + ((local432 & 0xFF00) * local440 + (local436 & 0xFF00) * local444 & 0xFF0000) >>> 8;
SoftwareRaster.pixels[local388++] = ((local432 & 0xFF00FF) * local440 + (local436 & 0xFF00FF) * local444 & 0xFF00FF00) + ((local432 & 0xFF00) * local440 + (local436 & 0xFF00) * local444 & 0xFF0000) >>> 8;
local802 += local342;
local504 += local333;
local394++;
@ -316,7 +316,7 @@ public final class SoftwareAlphaSprite extends SoftwareSprite {
local384++;
local368 -= local333;
local378 += local342;
local319 += Static129.width;
local319 += SoftwareRaster.width;
}
} else {
local384 = local198;
@ -350,10 +350,10 @@ public final class SoftwareAlphaSprite extends SoftwareSprite {
}
while (local394 < 0) {
local432 = this.anIntArray20[(local504 >> 12) * this.anInt1867 + (local802 >> 12)];
local436 = Static129.pixels[local388];
local436 = SoftwareRaster.pixels[local388];
local440 = local432 >>> 24;
local444 = 256 - local440;
Static129.pixels[local388++] = ((local432 & 0xFF00FF) * local440 + (local436 & 0xFF00FF) * local444 & 0xFF00FF00) + ((local432 & 0xFF00) * local440 + (local436 & 0xFF00) * local444 & 0xFF0000) >>> 8;
SoftwareRaster.pixels[local388++] = ((local432 & 0xFF00FF) * local440 + (local436 & 0xFF00FF) * local444 & 0xFF00FF00) + ((local432 & 0xFF00) * local440 + (local436 & 0xFF00) * local444 & 0xFF0000) >>> 8;
local802 += local342;
local504 += local333;
local394++;
@ -361,7 +361,7 @@ public final class SoftwareAlphaSprite extends SoftwareSprite {
local384++;
local368 -= local333;
local378 += local342;
local319 += Static129.width;
local319 += SoftwareRaster.width;
}
}
} else if (local333 == 0) {
@ -383,17 +383,17 @@ public final class SoftwareAlphaSprite extends SoftwareSprite {
}
while (local394 < 0) {
local432 = this.anIntArray20[(local378 >> 12) * this.anInt1867 + (local802 >> 12)];
local436 = Static129.pixels[local388];
local436 = SoftwareRaster.pixels[local388];
local440 = local432 >>> 24;
local444 = 256 - local440;
Static129.pixels[local388++] = ((local432 & 0xFF00FF) * local440 + (local436 & 0xFF00FF) * local444 & 0xFF00FF00) + ((local432 & 0xFF00) * local440 + (local436 & 0xFF00) * local444 & 0xFF0000) >>> 8;
SoftwareRaster.pixels[local388++] = ((local432 & 0xFF00FF) * local440 + (local436 & 0xFF00FF) * local444 & 0xFF00FF00) + ((local432 & 0xFF00) * local440 + (local436 & 0xFF00) * local444 & 0xFF0000) >>> 8;
local802 += local342;
local394++;
}
}
local384++;
local378 += local342;
local319 += Static129.width;
local319 += SoftwareRaster.width;
}
} else if (local333 < 0) {
local384 = local198;
@ -427,10 +427,10 @@ public final class SoftwareAlphaSprite extends SoftwareSprite {
}
while (local394 < 0) {
local432 = this.anIntArray20[(local504 >> 12) * this.anInt1867 + (local802 >> 12)];
local436 = Static129.pixels[local388];
local436 = SoftwareRaster.pixels[local388];
local440 = local432 >>> 24;
local444 = 256 - local440;
Static129.pixels[local388++] = ((local432 & 0xFF00FF) * local440 + (local436 & 0xFF00FF) * local444 & 0xFF00FF00) + ((local432 & 0xFF00) * local440 + (local436 & 0xFF00) * local444 & 0xFF0000) >>> 8;
SoftwareRaster.pixels[local388++] = ((local432 & 0xFF00FF) * local440 + (local436 & 0xFF00FF) * local444 & 0xFF00FF00) + ((local432 & 0xFF00) * local440 + (local436 & 0xFF00) * local444 & 0xFF0000) >>> 8;
local802 += local342;
local504 += local333;
local394++;
@ -438,7 +438,7 @@ public final class SoftwareAlphaSprite extends SoftwareSprite {
local384++;
local368 -= local333;
local378 += local342;
local319 += Static129.width;
local319 += SoftwareRaster.width;
}
} else {
local384 = local198;
@ -471,10 +471,10 @@ public final class SoftwareAlphaSprite extends SoftwareSprite {
}
while (local394 < 0) {
local432 = this.anIntArray20[(local504 >> 12) * this.anInt1867 + (local802 >> 12)];
local436 = Static129.pixels[local388];
local436 = SoftwareRaster.pixels[local388];
local440 = local432 >>> 24;
local444 = 256 - local440;
Static129.pixels[local388++] = ((local432 & 0xFF00FF) * local440 + (local436 & 0xFF00FF) * local444 & 0xFF00FF00) + ((local432 & 0xFF00) * local440 + (local436 & 0xFF00) * local444 & 0xFF0000) >>> 8;
SoftwareRaster.pixels[local388++] = ((local432 & 0xFF00FF) * local440 + (local436 & 0xFF00FF) * local444 & 0xFF00FF00) + ((local432 & 0xFF00) * local440 + (local436 & 0xFF00) * local444 & 0xFF0000) >>> 8;
local802 += local342;
local504 += local333;
local394++;
@ -482,7 +482,7 @@ public final class SoftwareAlphaSprite extends SoftwareSprite {
local384++;
local368 -= local333;
local378 += local342;
local319 += Static129.width;
local319 += SoftwareRaster.width;
}
}
} else if (local333 == 0) {
@ -493,15 +493,15 @@ public final class SoftwareAlphaSprite extends SoftwareSprite {
if (local368 >= 0 && local378 >= 0 && local368 - (this.anInt1867 << 12) < 0 && local378 - (this.anInt1859 << 12) < 0) {
while (local394 < 0) {
local432 = this.anIntArray20[(local378 >> 12) * this.anInt1867 + (local368 >> 12)];
local436 = Static129.pixels[local388];
local436 = SoftwareRaster.pixels[local388];
local440 = local432 >>> 24;
local444 = 256 - local440;
Static129.pixels[local388++] = ((local432 & 0xFF00FF) * local440 + (local436 & 0xFF00FF) * local444 & 0xFF00FF00) + ((local432 & 0xFF00) * local440 + (local436 & 0xFF00) * local444 & 0xFF0000) >>> 8;
SoftwareRaster.pixels[local388++] = ((local432 & 0xFF00FF) * local440 + (local436 & 0xFF00FF) * local444 & 0xFF00FF00) + ((local432 & 0xFF00) * local440 + (local436 & 0xFF00) * local444 & 0xFF0000) >>> 8;
local394++;
}
}
local384++;
local319 += Static129.width;
local319 += SoftwareRaster.width;
}
} else if (local333 < 0) {
local384 = local198;
@ -523,17 +523,17 @@ public final class SoftwareAlphaSprite extends SoftwareSprite {
}
while (local394 < 0) {
local432 = this.anIntArray20[(local504 >> 12) * this.anInt1867 + (local368 >> 12)];
local436 = Static129.pixels[local388];
local436 = SoftwareRaster.pixels[local388];
local440 = local432 >>> 24;
local444 = 256 - local440;
Static129.pixels[local388++] = ((local432 & 0xFF00FF) * local440 + (local436 & 0xFF00FF) * local444 & 0xFF00FF00) + ((local432 & 0xFF00) * local440 + (local436 & 0xFF00) * local444 & 0xFF0000) >>> 8;
SoftwareRaster.pixels[local388++] = ((local432 & 0xFF00FF) * local440 + (local436 & 0xFF00FF) * local444 & 0xFF00FF00) + ((local432 & 0xFF00) * local440 + (local436 & 0xFF00) * local444 & 0xFF0000) >>> 8;
local504 += local333;
local394++;
}
}
local384++;
local368 -= local333;
local319 += Static129.width;
local319 += SoftwareRaster.width;
}
} else {
local384 = local198;
@ -554,17 +554,17 @@ public final class SoftwareAlphaSprite extends SoftwareSprite {
}
while (local394 < 0) {
local432 = this.anIntArray20[(local504 >> 12) * this.anInt1867 + (local368 >> 12)];
local436 = Static129.pixels[local388];
local436 = SoftwareRaster.pixels[local388];
local440 = local432 >>> 24;
local444 = 256 - local440;
Static129.pixels[local388++] = ((local432 & 0xFF00FF) * local440 + (local436 & 0xFF00FF) * local444 & 0xFF00FF00) + ((local432 & 0xFF00) * local440 + (local436 & 0xFF00) * local444 & 0xFF0000) >>> 8;
SoftwareRaster.pixels[local388++] = ((local432 & 0xFF00FF) * local440 + (local436 & 0xFF00FF) * local444 & 0xFF00FF00) + ((local432 & 0xFF00) * local440 + (local436 & 0xFF00) * local444 & 0xFF0000) >>> 8;
local504 += local333;
local394++;
}
}
local384++;
local368 -= local333;
local319 += Static129.width;
local319 += SoftwareRaster.width;
}
}
}
@ -581,7 +581,7 @@ public final class SoftwareAlphaSprite extends SoftwareSprite {
@Pc(39) int local39 = local27 * arg7 >> 8;
@Pc(51) int local51 = (arg4 << 16) + local9 * local33 + local4 * local39;
@Pc(63) int local63 = (arg5 << 16) + (local9 * local39 - local4 * local33);
@Pc(69) int local69 = arg0 + arg1 * Static129.width;
@Pc(69) int local69 = arg0 + arg1 * SoftwareRaster.width;
for (@Pc(71) int local71 = 0; local71 < arg3; local71++) {
@Pc(78) int local78 = arg8[local71];
@Pc(82) int local82 = local69 + local78;
@ -589,16 +589,16 @@ public final class SoftwareAlphaSprite extends SoftwareSprite {
@Pc(94) int local94 = local63 - local33 * local78;
for (@Pc(99) int local99 = -arg9[local71]; local99 < 0; local99++) {
@Pc(115) int local115 = this.anIntArray20[(local88 >> 16) + (local94 >> 16) * this.anInt1867];
@Pc(119) int local119 = Static129.pixels[local82];
@Pc(119) int local119 = SoftwareRaster.pixels[local82];
@Pc(123) int local123 = local115 >>> 24;
@Pc(127) int local127 = 256 - local123;
Static129.pixels[local82++] = ((local115 & 0xFF00FF) * local123 + (local119 & 0xFF00FF) * local127 & 0xFF00FF00) + ((local115 & 0xFF00) * local123 + (local119 & 0xFF00) * local127 & 0xFF0000) >>> 8;
SoftwareRaster.pixels[local82++] = ((local115 & 0xFF00FF) * local123 + (local119 & 0xFF00FF) * local127 & 0xFF00FF00) + ((local115 & 0xFF00) * local123 + (local119 & 0xFF00) * local127 & 0xFF0000) >>> 8;
local88 += local39;
local94 -= local33;
}
local51 += local33;
local63 += local39;
local69 += Static129.width;
local69 += SoftwareRaster.width;
}
} catch (@Pc(186) Exception local186) {
}
@ -616,7 +616,7 @@ public final class SoftwareAlphaSprite extends SoftwareSprite {
@Pc(39) int local39 = local27 * 256 >> 8;
@Pc(51) int local51 = (arg4 << 16) + local9 * local33 + local4 * local39;
@Pc(63) int local63 = (arg5 << 16) + (local9 * local39 - local4 * local33);
@Pc(69) int local69 = arg0 + arg1 * Static129.width;
@Pc(69) int local69 = arg0 + arg1 * SoftwareRaster.width;
for (@Pc(71) int local71 = 0; local71 < arg3; local71++) {
@Pc(78) int local78 = arg7[local71];
@Pc(82) int local82 = local69 + local78;
@ -624,16 +624,16 @@ public final class SoftwareAlphaSprite extends SoftwareSprite {
@Pc(94) int local94 = local63 - local33 * local78;
for (@Pc(99) int local99 = -arg8[local71]; local99 < 0; local99++) {
@Pc(115) int local115 = this.anIntArray20[(local88 >> 16) + (local94 >> 16) * this.anInt1867];
@Pc(119) int local119 = Static129.pixels[local82];
@Pc(119) int local119 = SoftwareRaster.pixels[local82];
@Pc(123) int local123 = local115 >>> 24;
@Pc(127) int local127 = 256 - local123;
Static129.pixels[local82++] = ((local115 & 0xFF00FF) * local123 + (local119 & 0xFF00FF) * local127 & 0xFF00FF00) + ((local115 & 0xFF00) * local123 + (local119 & 0xFF00) * local127 & 0xFF0000) >>> 8;
SoftwareRaster.pixels[local82++] = ((local115 & 0xFF00FF) * local123 + (local119 & 0xFF00FF) * local127 & 0xFF00FF00) + ((local115 & 0xFF00) * local123 + (local119 & 0xFF00) * local127 & 0xFF0000) >>> 8;
local88 += local39;
local94 -= local33;
}
local51 += local33;
local63 += local39;
local69 += Static129.width;
local69 += SoftwareRaster.width;
}
} catch (@Pc(186) Exception local186) {
}
@ -670,31 +670,31 @@ public final class SoftwareAlphaSprite extends SoftwareSprite {
if (local10 < local20) {
arg3 = ((local10 << 16) + local32 - local14 - 1) / local32;
}
local46 = arg0 + arg1 * Static129.width;
@Pc(130) int local130 = Static129.width - arg2;
if (arg1 + arg3 > Static129.clipBottom) {
arg3 -= arg1 + arg3 - Static129.clipBottom;
local46 = arg0 + arg1 * SoftwareRaster.width;
@Pc(130) int local130 = SoftwareRaster.width - arg2;
if (arg1 + arg3 > SoftwareRaster.clipBottom) {
arg3 -= arg1 + arg3 - SoftwareRaster.clipBottom;
}
@Pc(150) int local150;
if (arg1 < Static129.clipTop) {
local150 = Static129.clipTop - arg1;
if (arg1 < SoftwareRaster.clipTop) {
local150 = SoftwareRaster.clipTop - arg1;
arg3 -= local150;
local46 += local150 * Static129.width;
local46 += local150 * SoftwareRaster.width;
local14 += local32 * local150;
}
if (arg0 + arg2 > Static129.clipRight) {
local150 = arg0 + arg2 - Static129.clipRight;
if (arg0 + arg2 > SoftwareRaster.clipRight) {
local150 = arg0 + arg2 - SoftwareRaster.clipRight;
arg2 -= local150;
local130 += local150;
}
if (arg0 < Static129.clipLeft) {
local150 = Static129.clipLeft - arg0;
if (arg0 < SoftwareRaster.clipLeft) {
local150 = SoftwareRaster.clipLeft - arg0;
arg2 -= local150;
local46 += local150;
local12 += local26 * local150;
local130 += local150;
}
Static283.method317(Static129.pixels, this.anIntArray20, local12, local14, local46, local130, arg2, arg3, local26, local32, local7, arg4);
Static283.method317(SoftwareRaster.pixels, this.anIntArray20, local12, local14, local46, local130, arg2, arg3, local26, local32, local7, arg4);
}
@OriginalMember(owner = "client!am", name = "a", descriptor = "(IIII)V")
@ -728,31 +728,31 @@ public final class SoftwareAlphaSprite extends SoftwareSprite {
if (local10 < local20) {
arg3 = ((local10 << 16) + local32 - local14 - 1) / local32;
}
local46 = arg0 + arg1 * Static129.width;
@Pc(130) int local130 = Static129.width - arg2;
if (arg1 + arg3 > Static129.clipBottom) {
arg3 -= arg1 + arg3 - Static129.clipBottom;
local46 = arg0 + arg1 * SoftwareRaster.width;
@Pc(130) int local130 = SoftwareRaster.width - arg2;
if (arg1 + arg3 > SoftwareRaster.clipBottom) {
arg3 -= arg1 + arg3 - SoftwareRaster.clipBottom;
}
@Pc(150) int local150;
if (arg1 < Static129.clipTop) {
local150 = Static129.clipTop - arg1;
if (arg1 < SoftwareRaster.clipTop) {
local150 = SoftwareRaster.clipTop - arg1;
arg3 -= local150;
local46 += local150 * Static129.width;
local46 += local150 * SoftwareRaster.width;
local14 += local32 * local150;
}
if (arg0 + arg2 > Static129.clipRight) {
local150 = arg0 + arg2 - Static129.clipRight;
if (arg0 + arg2 > SoftwareRaster.clipRight) {
local150 = arg0 + arg2 - SoftwareRaster.clipRight;
arg2 -= local150;
local130 += local150;
}
if (arg0 < Static129.clipLeft) {
local150 = Static129.clipLeft - arg0;
if (arg0 < SoftwareRaster.clipLeft) {
local150 = SoftwareRaster.clipLeft - arg0;
arg2 -= local150;
local46 += local150;
local12 += local26 * local150;
local130 += local150;
}
Static283.method321(Static129.pixels, this.anIntArray20, local12, local14, local46, local130, arg2, arg3, local26, local32, local7);
Static283.method321(SoftwareRaster.pixels, this.anIntArray20, local12, local14, local46, local130, arg2, arg3, local26, local32, local7);
}
@OriginalMember(owner = "client!am", name = "d", descriptor = "(II)V")
@ -760,40 +760,40 @@ public final class SoftwareAlphaSprite extends SoftwareSprite {
public final void method1421(@OriginalArg(0) int arg0, @OriginalArg(1) int arg1) {
arg0 += this.anInt1860 - this.anInt1867 - this.anInt1863;
arg1 += this.anInt1861;
@Pc(21) int local21 = arg0 + arg1 * Static129.width;
@Pc(21) int local21 = arg0 + arg1 * SoftwareRaster.width;
@Pc(26) int local26 = this.anInt1867 - 1;
@Pc(29) int local29 = this.anInt1859;
@Pc(32) int local32 = this.anInt1867;
@Pc(36) int local36 = Static129.width - local32;
@Pc(36) int local36 = SoftwareRaster.width - local32;
@Pc(40) int local40 = local32 + local32;
@Pc(47) int local47;
if (arg1 < Static129.clipTop) {
local47 = Static129.clipTop - arg1;
if (arg1 < SoftwareRaster.clipTop) {
local47 = SoftwareRaster.clipTop - arg1;
local29 -= local47;
arg1 = Static129.clipTop;
arg1 = SoftwareRaster.clipTop;
local26 += local47 * local32;
local21 += local47 * Static129.width;
local21 += local47 * SoftwareRaster.width;
}
if (arg1 + local29 > Static129.clipBottom) {
local29 -= arg1 + local29 - Static129.clipBottom;
if (arg1 + local29 > SoftwareRaster.clipBottom) {
local29 -= arg1 + local29 - SoftwareRaster.clipBottom;
}
if (arg0 < Static129.clipLeft) {
local47 = Static129.clipLeft - arg0;
if (arg0 < SoftwareRaster.clipLeft) {
local47 = SoftwareRaster.clipLeft - arg0;
local32 -= local47;
arg0 = Static129.clipLeft;
arg0 = SoftwareRaster.clipLeft;
local26 -= local47;
local21 += local47;
local40 -= local47;
local36 += local47;
}
if (arg0 + local32 > Static129.clipRight) {
local47 = arg0 + local32 - Static129.clipRight;
if (arg0 + local32 > SoftwareRaster.clipRight) {
local47 = arg0 + local32 - SoftwareRaster.clipRight;
local32 -= local47;
local40 -= local47;
local36 += local47;
}
if (local32 > 0 && local29 > 0) {
Static283.method318(Static129.pixels, this.anIntArray20, local26, local21, local32, local29, local36, local40);
Static283.method318(SoftwareRaster.pixels, this.anIntArray20, local26, local21, local32, local29, local36, local40);
}
}
@ -802,40 +802,40 @@ public final class SoftwareAlphaSprite extends SoftwareSprite {
public final void method1417(@OriginalArg(0) int arg0, @OriginalArg(1) int arg1, @OriginalArg(2) int arg2) {
arg0 += this.anInt1863;
arg1 += this.anInt1861;
@Pc(15) int local15 = arg0 + arg1 * Static129.width;
@Pc(15) int local15 = arg0 + arg1 * SoftwareRaster.width;
@Pc(17) int local17 = 0;
@Pc(20) int local20 = this.anInt1859;
@Pc(23) int local23 = this.anInt1867;
@Pc(27) int local27 = Static129.width - local23;
@Pc(27) int local27 = SoftwareRaster.width - local23;
@Pc(29) int local29 = 0;
@Pc(36) int local36;
if (arg1 < Static129.clipTop) {
local36 = Static129.clipTop - arg1;
if (arg1 < SoftwareRaster.clipTop) {
local36 = SoftwareRaster.clipTop - arg1;
local20 -= local36;
arg1 = Static129.clipTop;
arg1 = SoftwareRaster.clipTop;
local17 = local36 * local23;
local15 += local36 * Static129.width;
local15 += local36 * SoftwareRaster.width;
}
if (arg1 + local20 > Static129.clipBottom) {
local20 -= arg1 + local20 - Static129.clipBottom;
if (arg1 + local20 > SoftwareRaster.clipBottom) {
local20 -= arg1 + local20 - SoftwareRaster.clipBottom;
}
if (arg0 < Static129.clipLeft) {
local36 = Static129.clipLeft - arg0;
if (arg0 < SoftwareRaster.clipLeft) {
local36 = SoftwareRaster.clipLeft - arg0;
local23 -= local36;
arg0 = Static129.clipLeft;
arg0 = SoftwareRaster.clipLeft;
local17 += local36;
local15 += local36;
local29 = local36;
local27 += local36;
}
if (arg0 + local23 > Static129.clipRight) {
local36 = arg0 + local23 - Static129.clipRight;
if (arg0 + local23 > SoftwareRaster.clipRight) {
local36 = arg0 + local23 - SoftwareRaster.clipRight;
local23 -= local36;
local29 += local36;
local27 += local36;
}
if (local23 > 0 && local20 > 0) {
Static283.method320(Static129.pixels, this.anIntArray20, local17, local15, local23, local20, local27, local29, arg2);
Static283.method320(SoftwareRaster.pixels, this.anIntArray20, local17, local15, local23, local20, local27, local29, arg2);
}
}
}

60
client/src/main/java/SoftwareFont.java
View file

@ -23,70 +23,70 @@ public final class SoftwareFont extends Font {
@OriginalMember(owner = "client!dd", name = "a", descriptor = "(IIIIIIIZ)V")
@Override
protected final void renderGlyphTransparent(@OriginalArg(0) int arg0, @OriginalArg(1) int arg1, @OriginalArg(2) int arg2, @OriginalArg(3) int arg3, @OriginalArg(4) int arg4, @OriginalArg(5) int arg5, @OriginalArg(6) int arg6) {
@Pc(5) int local5 = arg1 + arg2 * Static129.width;
@Pc(9) int local9 = Static129.width - arg3;
@Pc(5) int local5 = arg1 + arg2 * SoftwareRaster.width;
@Pc(9) int local9 = SoftwareRaster.width - arg3;
@Pc(11) int local11 = 0;
@Pc(13) int local13 = 0;
@Pc(20) int local20;
if (arg2 < Static129.clipTop) {
local20 = Static129.clipTop - arg2;
if (arg2 < SoftwareRaster.clipTop) {
local20 = SoftwareRaster.clipTop - arg2;
arg4 -= local20;
arg2 = Static129.clipTop;
arg2 = SoftwareRaster.clipTop;
local13 = local20 * arg3;
local5 += local20 * Static129.width;
local5 += local20 * SoftwareRaster.width;
}
if (arg2 + arg4 > Static129.clipBottom) {
arg4 -= arg2 + arg4 - Static129.clipBottom;
if (arg2 + arg4 > SoftwareRaster.clipBottom) {
arg4 -= arg2 + arg4 - SoftwareRaster.clipBottom;
}
if (arg1 < Static129.clipLeft) {
local20 = Static129.clipLeft - arg1;
if (arg1 < SoftwareRaster.clipLeft) {
local20 = SoftwareRaster.clipLeft - arg1;
arg3 -= local20;
arg1 = Static129.clipLeft;
arg1 = SoftwareRaster.clipLeft;
local13 += local20;
local5 += local20;
local11 = local20;
local9 += local20;
}
if (arg1 + arg3 > Static129.clipRight) {
local20 = arg1 + arg3 - Static129.clipRight;
if (arg1 + arg3 > SoftwareRaster.clipRight) {
local20 = arg1 + arg3 - SoftwareRaster.clipRight;
arg3 -= local20;
local11 += local20;
local9 += local20;
}
if (arg3 > 0 && arg4 > 0) {
Static285.method1139(Static129.pixels, this.aByteArrayArray7[arg0], arg5, local13, local5, arg3, arg4, local9, local11, arg6);
Static285.method1139(SoftwareRaster.pixels, this.aByteArrayArray7[arg0], arg5, local13, local5, arg3, arg4, local9, local11, arg6);
}
}
@OriginalMember(owner = "client!dd", name = "a", descriptor = "(IIIIIIZ)V")
@Override
protected final void renderGlyph(@OriginalArg(0) int arg0, @OriginalArg(1) int arg1, @OriginalArg(2) int arg2, @OriginalArg(3) int arg3, @OriginalArg(4) int arg4, @OriginalArg(5) int arg5) {
@Pc(5) int local5 = arg1 + arg2 * Static129.width;
@Pc(9) int local9 = Static129.width - arg3;
@Pc(5) int local5 = arg1 + arg2 * SoftwareRaster.width;
@Pc(9) int local9 = SoftwareRaster.width - arg3;
@Pc(11) int local11 = 0;
@Pc(13) int local13 = 0;
@Pc(20) int local20;
if (arg2 < Static129.clipTop) {
local20 = Static129.clipTop - arg2;
if (arg2 < SoftwareRaster.clipTop) {
local20 = SoftwareRaster.clipTop - arg2;
arg4 -= local20;
arg2 = Static129.clipTop;
arg2 = SoftwareRaster.clipTop;
local13 = local20 * arg3;
local5 += local20 * Static129.width;
local5 += local20 * SoftwareRaster.width;
}
if (arg2 + arg4 > Static129.clipBottom) {
arg4 -= arg2 + arg4 - Static129.clipBottom;
if (arg2 + arg4 > SoftwareRaster.clipBottom) {
arg4 -= arg2 + arg4 - SoftwareRaster.clipBottom;
}
if (arg1 < Static129.clipLeft) {
local20 = Static129.clipLeft - arg1;
if (arg1 < SoftwareRaster.clipLeft) {
local20 = SoftwareRaster.clipLeft - arg1;
arg3 -= local20;
arg1 = Static129.clipLeft;
arg1 = SoftwareRaster.clipLeft;
local13 += local20;
local5 += local20;
local11 = local20;
local9 += local20;
}
if (arg1 + arg3 > Static129.clipRight) {
local20 = arg1 + arg3 - Static129.clipRight;
if (arg1 + arg3 > SoftwareRaster.clipRight) {
local20 = arg1 + arg3 - SoftwareRaster.clipRight;
arg3 -= local20;
local11 += local20;
local9 += local20;
@ -94,10 +94,10 @@ public final class SoftwareFont extends Font {
if (arg3 <= 0 || arg4 <= 0) {
return;
}
if (Static129.anIntArray295 == null) {
Static285.method1137(Static129.pixels, this.aByteArrayArray7[arg0], arg5, local13, local5, arg3, arg4, local9, local11);
if (SoftwareRaster.anIntArray295 == null) {
Static285.method1137(SoftwareRaster.pixels, this.aByteArrayArray7[arg0], arg5, local13, local5, arg3, arg4, local9, local11);
} else {
Static285.method1138(Static129.pixels, this.aByteArrayArray7[arg0], arg1, arg2, arg3, arg4, arg5, local13, local5, local9, local11, Static129.anIntArray295, Static129.anIntArray296);
Static285.method1138(SoftwareRaster.pixels, this.aByteArrayArray7[arg0], arg1, arg2, arg3, arg4, arg5, local13, local5, local9, local11, SoftwareRaster.anIntArray295, SoftwareRaster.anIntArray296);
}
}
}

106
client/src/main/java/SoftwareIndexedSprite.java
View file

@ -88,31 +88,31 @@ public final class SoftwareIndexedSprite extends IndexedSprite {
if (local5 < local15) {
arg3 = ((local5 << 16) + local27 - local9 - 1) / local27;
}
local41 = arg0 + arg1 * Static129.width;
@Pc(125) int local125 = Static129.width - arg2;
if (arg1 + arg3 > Static129.clipBottom) {
arg3 -= arg1 + arg3 - Static129.clipBottom;
local41 = arg0 + arg1 * SoftwareRaster.width;
@Pc(125) int local125 = SoftwareRaster.width - arg2;
if (arg1 + arg3 > SoftwareRaster.clipBottom) {
arg3 -= arg1 + arg3 - SoftwareRaster.clipBottom;
}
@Pc(145) int local145;
if (arg1 < Static129.clipTop) {
local145 = Static129.clipTop - arg1;
if (arg1 < SoftwareRaster.clipTop) {
local145 = SoftwareRaster.clipTop - arg1;
arg3 -= local145;
local41 += local145 * Static129.width;
local41 += local145 * SoftwareRaster.width;
local9 += local27 * local145;
}
if (arg0 + arg2 > Static129.clipRight) {
local145 = arg0 + arg2 - Static129.clipRight;
if (arg0 + arg2 > SoftwareRaster.clipRight) {
local145 = arg0 + arg2 - SoftwareRaster.clipRight;
arg2 -= local145;
local125 += local145;
}
if (arg0 < Static129.clipLeft) {
local145 = Static129.clipLeft - arg0;
if (arg0 < SoftwareRaster.clipLeft) {
local145 = SoftwareRaster.clipLeft - arg0;
arg2 -= local145;
local41 += local145;
local7 += local21 * local145;
local125 += local145;
}
Static286.method1394(Static129.pixels, this.aByteArray18, this.anIntArray144, local7, local9, local41, local125, arg2, arg3, local21, local27, local2, arg4);
Static286.method1394(SoftwareRaster.pixels, this.aByteArray18, this.anIntArray144, local7, local9, local41, local125, arg2, arg3, local21, local27, local2, arg4);
}
@OriginalMember(owner = "client!ek", name = "a", descriptor = "()V")
@ -162,45 +162,45 @@ public final class SoftwareIndexedSprite extends IndexedSprite {
public final void method3335(@OriginalArg(0) int arg0, @OriginalArg(1) int arg1, @OriginalArg(2) int arg2) {
arg0 += this.anInt4280;
arg1 += this.anInt4273;
@Pc(15) int local15 = arg0 + arg1 * Static129.width;
@Pc(15) int local15 = arg0 + arg1 * SoftwareRaster.width;
@Pc(17) int local17 = 0;
@Pc(20) int local20 = this.height;
@Pc(23) int local23 = this.width;
@Pc(27) int local27 = Static129.width - local23;
@Pc(27) int local27 = SoftwareRaster.width - local23;
@Pc(29) int local29 = 0;
@Pc(36) int local36;
if (arg1 < Static129.clipTop) {
local36 = Static129.clipTop - arg1;
if (arg1 < SoftwareRaster.clipTop) {
local36 = SoftwareRaster.clipTop - arg1;
local20 -= local36;
arg1 = Static129.clipTop;
arg1 = SoftwareRaster.clipTop;
local17 = local36 * local23;
local15 += local36 * Static129.width;
local15 += local36 * SoftwareRaster.width;
}
if (arg1 + local20 > Static129.clipBottom) {
local20 -= arg1 + local20 - Static129.clipBottom;
if (arg1 + local20 > SoftwareRaster.clipBottom) {
local20 -= arg1 + local20 - SoftwareRaster.clipBottom;
}
if (arg0 < Static129.clipLeft) {
local36 = Static129.clipLeft - arg0;
if (arg0 < SoftwareRaster.clipLeft) {
local36 = SoftwareRaster.clipLeft - arg0;
local23 -= local36;
arg0 = Static129.clipLeft;
arg0 = SoftwareRaster.clipLeft;
local17 += local36;
local15 += local36;
local29 = local36;
local27 += local36;
}
if (arg0 + local23 > Static129.clipRight) {
local36 = arg0 + local23 - Static129.clipRight;
if (arg0 + local23 > SoftwareRaster.clipRight) {
local36 = arg0 + local23 - SoftwareRaster.clipRight;
local23 -= local36;
local29 += local36;
local27 += local36;
}
if (local23 > 0 && local20 > 0) {
Static286.method1397(Static129.pixels, this.aByteArray18, this.anIntArray144, local17, local15, local23, local20, local27, local29, arg2);
Static286.method1397(SoftwareRaster.pixels, this.aByteArray18, this.anIntArray144, local17, local15, local23, local20, local27, local29, arg2);
}
}
@OriginalMember(owner = "client!ek", name = "c", descriptor = "()V")
public final void method1396() {
public final void trim() {
if (this.width == this.innerWidth && this.height == this.innerHeight) {
return;
}
@ -245,31 +245,31 @@ public final class SoftwareIndexedSprite extends IndexedSprite {
if (local5 < local15) {
arg3 = ((local5 << 16) + local27 - local9 - 1) / local27;
}
local41 = arg0 + arg1 * Static129.width;
@Pc(125) int local125 = Static129.width - arg2;
if (arg1 + arg3 > Static129.clipBottom) {
arg3 -= arg1 + arg3 - Static129.clipBottom;
local41 = arg0 + arg1 * SoftwareRaster.width;
@Pc(125) int local125 = SoftwareRaster.width - arg2;
if (arg1 + arg3 > SoftwareRaster.clipBottom) {
arg3 -= arg1 + arg3 - SoftwareRaster.clipBottom;
}
@Pc(145) int local145;
if (arg1 < Static129.clipTop) {
local145 = Static129.clipTop - arg1;
if (arg1 < SoftwareRaster.clipTop) {
local145 = SoftwareRaster.clipTop - arg1;
arg3 -= local145;
local41 += local145 * Static129.width;
local41 += local145 * SoftwareRaster.width;
local9 += local27 * local145;
}
if (arg0 + arg2 > Static129.clipRight) {
local145 = arg0 + arg2 - Static129.clipRight;
if (arg0 + arg2 > SoftwareRaster.clipRight) {
local145 = arg0 + arg2 - SoftwareRaster.clipRight;
arg2 -= local145;
local125 += local145;
}
if (arg0 < Static129.clipLeft) {
local145 = Static129.clipLeft - arg0;
if (arg0 < SoftwareRaster.clipLeft) {
local145 = SoftwareRaster.clipLeft - arg0;
arg2 -= local145;
local41 += local145;
local7 += local21 * local145;
local125 += local145;
}
Static286.method1391(Static129.pixels, this.aByteArray18, this.anIntArray144, local7, local9, local41, local125, arg2, arg3, local21, local27, local2);
Static286.method1391(SoftwareRaster.pixels, this.aByteArray18, this.anIntArray144, local7, local9, local41, local125, arg2, arg3, local21, local27, local2);
}
@OriginalMember(owner = "client!ek", name = "a", descriptor = "(II)V")
@ -277,40 +277,40 @@ public final class SoftwareIndexedSprite extends IndexedSprite {
public final void renderTransparent(@OriginalArg(0) int arg0, @OriginalArg(1) int arg1) {
arg0 += this.anInt4280;
arg1 += this.anInt4273;
@Pc(15) int local15 = arg0 + arg1 * Static129.width;
@Pc(15) int local15 = arg0 + arg1 * SoftwareRaster.width;
@Pc(17) int local17 = 0;
@Pc(20) int local20 = this.height;
@Pc(23) int local23 = this.width;
@Pc(27) int local27 = Static129.width - local23;
@Pc(27) int local27 = SoftwareRaster.width - local23;
@Pc(29) int local29 = 0;
@Pc(36) int local36;
if (arg1 < Static129.clipTop) {
local36 = Static129.clipTop - arg1;
if (arg1 < SoftwareRaster.clipTop) {
local36 = SoftwareRaster.clipTop - arg1;
local20 -= local36;
arg1 = Static129.clipTop;
arg1 = SoftwareRaster.clipTop;
local17 = local36 * local23;
local15 += local36 * Static129.width;
local15 += local36 * SoftwareRaster.width;
}
if (arg1 + local20 > Static129.clipBottom) {
local20 -= arg1 + local20 - Static129.clipBottom;
if (arg1 + local20 > SoftwareRaster.clipBottom) {
local20 -= arg1 + local20 - SoftwareRaster.clipBottom;
}
if (arg0 < Static129.clipLeft) {
local36 = Static129.clipLeft - arg0;
if (arg0 < SoftwareRaster.clipLeft) {
local36 = SoftwareRaster.clipLeft - arg0;
local23 -= local36;
arg0 = Static129.clipLeft;
arg0 = SoftwareRaster.clipLeft;
local17 += local36;
local15 += local36;
local29 = local36;
local27 += local36;
}
if (arg0 + local23 > Static129.clipRight) {
local36 = arg0 + local23 - Static129.clipRight;
if (arg0 + local23 > SoftwareRaster.clipRight) {
local36 = arg0 + local23 - SoftwareRaster.clipRight;
local23 -= local36;
local29 += local36;
local27 += local36;
}
if (local23 > 0 && local20 > 0) {
Static286.method1393(Static129.pixels, this.aByteArray18, this.anIntArray144, local17, local15, local23, local20, local27, local29);
Static286.method1393(SoftwareRaster.pixels, this.aByteArray18, this.anIntArray144, local17, local15, local23, local20, local27, local29);
}
}
}

38
client/src/main/java/Static129.java → client/src/main/java/SoftwareRaster.java
View file

@ -2,13 +2,13 @@ import org.openrs2.deob.annotation.OriginalArg;
import org.openrs2.deob.annotation.OriginalMember;
import org.openrs2.deob.annotation.Pc;
public final class Static129 {
public final class SoftwareRaster {
@OriginalMember(owner = "client!kb", name = "a", descriptor = "I")
public static int width;
@OriginalMember(owner = "client!kb", name = "c", descriptor = "I")
public static int anInt3146;
public static int height;
@OriginalMember(owner = "client!kb", name = "f", descriptor = "[I")
public static int[] anIntArray295;
@ -38,11 +38,11 @@ public final class Static129 {
}
@OriginalMember(owner = "client!kb", name = "a", descriptor = "(IIIII)V")
public static void method2483(@OriginalArg(0) int arg0, @OriginalArg(1) int arg1, @OriginalArg(2) int arg2, @OriginalArg(3) int arg3, @OriginalArg(4) int arg4) {
method2489(arg0, arg1, arg2, arg4);
method2489(arg0, arg1 + arg3 - 1, arg2, arg4);
method2490(arg0, arg1, arg3, arg4);
method2490(arg0 + arg2 - 1, arg1, arg3, arg4);
public static void drawRect(@OriginalArg(0) int arg0, @OriginalArg(1) int arg1, @OriginalArg(2) int arg2, @OriginalArg(3) int arg3, @OriginalArg(4) int arg4) {
drawHorizontalLine(arg0, arg1, arg2, arg4);
drawHorizontalLine(arg0, arg1 + arg3 - 1, arg2, arg4);
drawVerticalLine(arg0, arg1, arg3, arg4);
drawVerticalLine(arg0 + arg2 - 1, arg1, arg3, arg4);
}
@OriginalMember(owner = "client!kb", name = "a", descriptor = "(IIIIII)V")
@ -111,7 +111,7 @@ public final class Static129 {
}
@OriginalMember(owner = "client!kb", name = "a", descriptor = "(IIII)V")
public static void method2489(@OriginalArg(0) int arg0, @OriginalArg(1) int arg1, @OriginalArg(2) int arg2, @OriginalArg(3) int arg3) {
public static void drawHorizontalLine(@OriginalArg(0) int arg0, @OriginalArg(1) int arg1, @OriginalArg(2) int arg2, @OriginalArg(3) int arg3) {
if (arg1 < clipTop || arg1 >= clipBottom) {
return;
}
@ -129,7 +129,7 @@ public final class Static129 {
}
@OriginalMember(owner = "client!kb", name = "b", descriptor = "(IIII)V")
public static void method2490(@OriginalArg(0) int arg0, @OriginalArg(1) int arg1, @OriginalArg(2) int arg2, @OriginalArg(3) int arg3) {
public static void drawVerticalLine(@OriginalArg(0) int arg0, @OriginalArg(1) int arg1, @OriginalArg(2) int arg2, @OriginalArg(3) int arg3) {
if (arg0 < clipLeft || arg0 >= clipRight) {
return;
}
@ -150,14 +150,14 @@ public final class Static129 {
public static void method2491(@OriginalArg(0) int[] arg0, @OriginalArg(1) int arg1, @OriginalArg(2) int arg2) {
pixels = arg0;
width = arg1;
anInt3146 = arg2;
height = arg2;
method2496(0, 0, arg1, arg2);
}
@OriginalMember(owner = "client!kb", name = "b", descriptor = "()V")
public static void clear() {
@Pc(1) int local1 = 0;
@Pc(7) int local7 = width * anInt3146 - 7;
@Pc(7) int local7 = width * height - 7;
while (local1 < local7) {
pixels[local1++] = 0;
pixels[local1++] = 0;
@ -241,7 +241,7 @@ public final class Static129 {
}
@OriginalMember(owner = "client!kb", name = "c", descriptor = "(IIIII)V")
public static void method2495(@OriginalArg(0) int arg0, @OriginalArg(1) int arg1, @OriginalArg(2) int arg2, @OriginalArg(3) int arg3, @OriginalArg(4) int arg4) {
public static void fillRect(@OriginalArg(0) int arg0, @OriginalArg(1) int arg1, @OriginalArg(2) int arg2, @OriginalArg(3) int arg3, @OriginalArg(4) int arg4) {
if (arg0 < clipLeft) {
arg2 -= clipLeft - arg0;
arg0 = clipLeft;
@ -277,8 +277,8 @@ public final class Static129 {
if (arg2 > width) {
arg2 = width;
}
if (arg3 > anInt3146) {
arg3 = anInt3146;
if (arg3 > height) {
arg3 = height;
}
clipLeft = arg0;
clipTop = arg1;
@ -345,9 +345,9 @@ public final class Static129 {
arg3 -= arg1;
if (arg3 == 0) {
if (arg2 >= 0) {
method2489(arg0, arg1, arg2 + 1, arg4);
drawHorizontalLine(arg0, arg1, arg2 + 1, arg4);
} else {
method2489(arg0 + arg2, arg1, 1 - arg2, arg4);
drawHorizontalLine(arg0 + arg2, arg1, 1 - arg2, arg4);
}
} else if (arg2 != 0) {
if (arg2 + arg3 < 0) {
@ -402,9 +402,9 @@ public final class Static129 {
}
}
} else if (arg3 >= 0) {
method2490(arg0, arg1, arg3 + 1, arg4);
drawVerticalLine(arg0, arg1, arg3 + 1, arg4);
} else {
method2490(arg0, arg1 + arg3, -arg3 + 1, arg4);
drawVerticalLine(arg0, arg1 + arg3, -arg3 + 1, arg4);
}
}
@ -587,7 +587,7 @@ public final class Static129 {
clipLeft = 0;
clipTop = 0;
clipRight = width;
clipBottom = anInt3146;
clipBottom = height;
method2482();
}

270
client/src/main/java/SoftwareSprite.java
View file

@ -82,40 +82,40 @@ public class SoftwareSprite extends Sprite {
public void method1415(@OriginalArg(0) int arg0, @OriginalArg(1) int arg1) {
arg0 += this.anInt1863;
arg1 += this.anInt1861;
@Pc(15) int local15 = arg0 + arg1 * Static129.width;
@Pc(15) int local15 = arg0 + arg1 * SoftwareRaster.width;
@Pc(17) int local17 = 0;
@Pc(20) int local20 = this.anInt1859;
@Pc(23) int local23 = this.anInt1867;
@Pc(27) int local27 = Static129.width - local23;
@Pc(27) int local27 = SoftwareRaster.width - local23;
@Pc(29) int local29 = 0;
@Pc(36) int local36;
if (arg1 < Static129.clipTop) {
local36 = Static129.clipTop - arg1;
if (arg1 < SoftwareRaster.clipTop) {
local36 = SoftwareRaster.clipTop - arg1;
local20 -= local36;
arg1 = Static129.clipTop;
arg1 = SoftwareRaster.clipTop;
local17 = local36 * local23;
local15 += local36 * Static129.width;
local15 += local36 * SoftwareRaster.width;
}
if (arg1 + local20 > Static129.clipBottom) {
local20 -= arg1 + local20 - Static129.clipBottom;
if (arg1 + local20 > SoftwareRaster.clipBottom) {
local20 -= arg1 + local20 - SoftwareRaster.clipBottom;
}
if (arg0 < Static129.clipLeft) {
local36 = Static129.clipLeft - arg0;
if (arg0 < SoftwareRaster.clipLeft) {
local36 = SoftwareRaster.clipLeft - arg0;
local23 -= local36;
arg0 = Static129.clipLeft;
arg0 = SoftwareRaster.clipLeft;
local17 += local36;
local15 += local36;
local29 = local36;
local27 += local36;
}
if (arg0 + local23 > Static129.clipRight) {
local36 = arg0 + local23 - Static129.clipRight;
if (arg0 + local23 > SoftwareRaster.clipRight) {
local36 = arg0 + local23 - SoftwareRaster.clipRight;
local23 -= local36;
local29 += local36;
local27 += local36;
}
if (local23 > 0 && local20 > 0) {
Static290.method305(Static129.pixels, this.anIntArray20, local17, local15, local23, local20, local27, local29);
Static290.method305(SoftwareRaster.pixels, this.anIntArray20, local17, local15, local23, local20, local27, local29);
}
}
@ -206,17 +206,17 @@ public class SoftwareSprite extends Sprite {
local166 = local166 + 15 >> 4;
local196 >>= 0x4;
local198 = local198 + 15 >> 4;
if (local164 < Static129.clipLeft) {
local164 = Static129.clipLeft;
if (local164 < SoftwareRaster.clipLeft) {
local164 = SoftwareRaster.clipLeft;
}
if (local166 > Static129.clipRight) {
local166 = Static129.clipRight;
if (local166 > SoftwareRaster.clipRight) {
local166 = SoftwareRaster.clipRight;
}
if (local196 < Static129.clipTop) {
local196 = Static129.clipTop;
if (local196 < SoftwareRaster.clipTop) {
local196 = SoftwareRaster.clipTop;
}
if (local198 > Static129.clipBottom) {
local198 = Static129.clipBottom;
if (local198 > SoftwareRaster.clipBottom) {
local198 = SoftwareRaster.clipBottom;
}
local166 = local164 - local166;
if (local166 >= 0) {
@ -226,7 +226,7 @@ public class SoftwareSprite extends Sprite {
if (local198 >= 0) {
return;
}
@Pc(319) int local319 = local196 * Static129.width + local164;
@Pc(319) int local319 = local196 * SoftwareRaster.width + local164;
@Pc(324) double local324 = 1.6777216E7D / (double) arg5;
@Pc(333) int local333 = (int) Math.floor(Math.sin(local23) * local324 + 0.5D);
@Pc(342) int local342 = (int) Math.floor(Math.cos(local23) * local324 + 0.5D);
@ -266,7 +266,7 @@ public class SoftwareSprite extends Sprite {
if (local432 == 0) {
local388++;
} else {
Static129.pixels[local388++] = local432;
SoftwareRaster.pixels[local388++] = local432;
}
local694 += local342;
local394++;
@ -274,7 +274,7 @@ public class SoftwareSprite extends Sprite {
}
local384++;
local378 += local342;
local319 += Static129.width;
local319 += SoftwareRaster.width;
}
} else if (local333 < 0) {
local384 = local198;
@ -312,7 +312,7 @@ public class SoftwareSprite extends Sprite {
if (local432 == 0) {
local388++;
} else {
Static129.pixels[local388++] = local432;
SoftwareRaster.pixels[local388++] = local432;
}
local694 += local342;
local468 += local333;
@ -321,7 +321,7 @@ public class SoftwareSprite extends Sprite {
local384++;
local368 -= local333;
local378 += local342;
local319 += Static129.width;
local319 += SoftwareRaster.width;
}
} else {
local384 = local198;
@ -358,7 +358,7 @@ public class SoftwareSprite extends Sprite {
if (local432 == 0) {
local388++;
} else {
Static129.pixels[local388++] = local432;
SoftwareRaster.pixels[local388++] = local432;
}
local694 += local342;
local468 += local333;
@ -367,7 +367,7 @@ public class SoftwareSprite extends Sprite {
local384++;
local368 -= local333;
local378 += local342;
local319 += Static129.width;
local319 += SoftwareRaster.width;
}
}
} else if (local333 == 0) {
@ -392,7 +392,7 @@ public class SoftwareSprite extends Sprite {
if (local432 == 0) {
local388++;
} else {
Static129.pixels[local388++] = local432;
SoftwareRaster.pixels[local388++] = local432;
}
local694 += local342;
local394++;
@ -400,7 +400,7 @@ public class SoftwareSprite extends Sprite {
}
local384++;
local378 += local342;
local319 += Static129.width;
local319 += SoftwareRaster.width;
}
} else if (local333 < 0) {
local384 = local198;
@ -437,7 +437,7 @@ public class SoftwareSprite extends Sprite {
if (local432 == 0) {
local388++;
} else {
Static129.pixels[local388++] = local432;
SoftwareRaster.pixels[local388++] = local432;
}
local694 += local342;
local468 += local333;
@ -446,7 +446,7 @@ public class SoftwareSprite extends Sprite {
local384++;
local368 -= local333;
local378 += local342;
local319 += Static129.width;
local319 += SoftwareRaster.width;
}
} else {
local384 = local198;
@ -482,7 +482,7 @@ public class SoftwareSprite extends Sprite {
if (local432 == 0) {
local388++;
} else {
Static129.pixels[local388++] = local432;
SoftwareRaster.pixels[local388++] = local432;
}
local694 += local342;
local468 += local333;
@ -491,7 +491,7 @@ public class SoftwareSprite extends Sprite {
local384++;
local368 -= local333;
local378 += local342;
local319 += Static129.width;
local319 += SoftwareRaster.width;
}
}
} else if (local333 == 0) {
@ -505,13 +505,13 @@ public class SoftwareSprite extends Sprite {
if (local432 == 0) {
local388++;
} else {
Static129.pixels[local388++] = local432;
SoftwareRaster.pixels[local388++] = local432;
}
local394++;
}
}
local384++;
local319 += Static129.width;
local319 += SoftwareRaster.width;
}
} else if (local333 < 0) {
local384 = local198;
@ -536,7 +536,7 @@ public class SoftwareSprite extends Sprite {
if (local432 == 0) {
local388++;
} else {
Static129.pixels[local388++] = local432;
SoftwareRaster.pixels[local388++] = local432;
}
local468 += local333;
local394++;
@ -544,7 +544,7 @@ public class SoftwareSprite extends Sprite {
}
local384++;
local368 -= local333;
local319 += Static129.width;
local319 += SoftwareRaster.width;
}
} else {
local384 = local198;
@ -568,7 +568,7 @@ public class SoftwareSprite extends Sprite {
if (local432 == 0) {
local388++;
} else {
Static129.pixels[local388++] = local432;
SoftwareRaster.pixels[local388++] = local432;
}
local468 += local333;
local394++;
@ -576,7 +576,7 @@ public class SoftwareSprite extends Sprite {
}
local384++;
local368 -= local333;
local319 += Static129.width;
local319 += SoftwareRaster.width;
}
}
}
@ -607,7 +607,7 @@ public class SoftwareSprite extends Sprite {
@OriginalMember(owner = "client!mm", name = "c", descriptor = "()V")
public final void method304() {
Static129.method2491(this.anIntArray20, this.anInt1867, this.anInt1859);
SoftwareRaster.method2491(this.anIntArray20, this.anInt1867, this.anInt1859);
}
@OriginalMember(owner = "client!mm", name = "a", descriptor = "(IIIIIIDI)V")
@ -619,7 +619,7 @@ public class SoftwareSprite extends Sprite {
@Pc(33) int local33 = local21 * 256 >> 8;
@Pc(45) int local45 = local27 * -10 + local33 * -10 + 983040;
@Pc(57) int local57 = local33 * -10 + 983040 - local27 * -10;
@Pc(63) int local63 = arg0 + arg1 * Static129.width;
@Pc(63) int local63 = arg0 + arg1 * SoftwareRaster.width;
for (@Pc(65) int local65 = 0; local65 < 20; local65++) {
@Pc(70) int local70 = local63;
@Pc(72) int local72 = local45;
@ -629,14 +629,14 @@ public class SoftwareSprite extends Sprite {
if (local93 == 0) {
local70++;
} else {
Static129.pixels[local70++] = local93;
SoftwareRaster.pixels[local70++] = local93;
}
local72 += local33;
local74 -= local27;
}
local45 += local27;
local57 += local33;
local63 += Static129.width;
local63 += SoftwareRaster.width;
}
} catch (@Pc(128) Exception local128) {
}
@ -647,40 +647,40 @@ public class SoftwareSprite extends Sprite {
public void method1421(@OriginalArg(0) int arg0, @OriginalArg(1) int arg1) {
arg0 += this.anInt1860 - this.anInt1867 - this.anInt1863;
arg1 += this.anInt1861;
@Pc(21) int local21 = arg0 + arg1 * Static129.width;
@Pc(21) int local21 = arg0 + arg1 * SoftwareRaster.width;
@Pc(26) int local26 = this.anInt1867 - 1;
@Pc(29) int local29 = this.anInt1859;
@Pc(32) int local32 = this.anInt1867;
@Pc(36) int local36 = Static129.width - local32;
@Pc(36) int local36 = SoftwareRaster.width - local32;
@Pc(40) int local40 = local32 + local32;
@Pc(47) int local47;
if (arg1 < Static129.clipTop) {
local47 = Static129.clipTop - arg1;
if (arg1 < SoftwareRaster.clipTop) {
local47 = SoftwareRaster.clipTop - arg1;
local29 -= local47;
arg1 = Static129.clipTop;
arg1 = SoftwareRaster.clipTop;
local26 += local47 * local32;
local21 += local47 * Static129.width;
local21 += local47 * SoftwareRaster.width;
}
if (arg1 + local29 > Static129.clipBottom) {
local29 -= arg1 + local29 - Static129.clipBottom;
if (arg1 + local29 > SoftwareRaster.clipBottom) {
local29 -= arg1 + local29 - SoftwareRaster.clipBottom;
}
if (arg0 < Static129.clipLeft) {
local47 = Static129.clipLeft - arg0;
if (arg0 < SoftwareRaster.clipLeft) {
local47 = SoftwareRaster.clipLeft - arg0;
local32 -= local47;
arg0 = Static129.clipLeft;
arg0 = SoftwareRaster.clipLeft;
local26 -= local47;
local21 += local47;
local40 -= local47;
local36 += local47;
}
if (arg0 + local32 > Static129.clipRight) {
local47 = arg0 + local32 - Static129.clipRight;
if (arg0 + local32 > SoftwareRaster.clipRight) {
local47 = arg0 + local32 - SoftwareRaster.clipRight;
local32 -= local47;
local40 -= local47;
local36 += local47;
}
if (local32 > 0 && local29 > 0) {
Static290.method302(Static129.pixels, this.anIntArray20, local26, local21, local32, local29, local36, local40);
Static290.method302(SoftwareRaster.pixels, this.anIntArray20, local26, local21, local32, local29, local36, local40);
}
}
@ -689,40 +689,40 @@ public class SoftwareSprite extends Sprite {
public void method1417(@OriginalArg(0) int arg0, @OriginalArg(1) int arg1, @OriginalArg(2) int arg2) {
arg0 += this.anInt1863;
arg1 += this.anInt1861;
@Pc(15) int local15 = arg0 + arg1 * Static129.width;
@Pc(15) int local15 = arg0 + arg1 * SoftwareRaster.width;
@Pc(17) int local17 = 0;
@Pc(20) int local20 = this.anInt1859;
@Pc(23) int local23 = this.anInt1867;
@Pc(27) int local27 = Static129.width - local23;
@Pc(27) int local27 = SoftwareRaster.width - local23;
@Pc(29) int local29 = 0;
@Pc(36) int local36;
if (arg1 < Static129.clipTop) {
local36 = Static129.clipTop - arg1;
if (arg1 < SoftwareRaster.clipTop) {
local36 = SoftwareRaster.clipTop - arg1;
local20 -= local36;
arg1 = Static129.clipTop;
arg1 = SoftwareRaster.clipTop;
local17 = local36 * local23;
local15 += local36 * Static129.width;
local15 += local36 * SoftwareRaster.width;
}
if (arg1 + local20 > Static129.clipBottom) {
local20 -= arg1 + local20 - Static129.clipBottom;
if (arg1 + local20 > SoftwareRaster.clipBottom) {
local20 -= arg1 + local20 - SoftwareRaster.clipBottom;
}
if (arg0 < Static129.clipLeft) {
local36 = Static129.clipLeft - arg0;
if (arg0 < SoftwareRaster.clipLeft) {
local36 = SoftwareRaster.clipLeft - arg0;
local23 -= local36;
arg0 = Static129.clipLeft;
arg0 = SoftwareRaster.clipLeft;
local17 += local36;
local15 += local36;
local29 = local36;
local27 += local36;
}
if (arg0 + local23 > Static129.clipRight) {
local36 = arg0 + local23 - Static129.clipRight;
if (arg0 + local23 > SoftwareRaster.clipRight) {
local36 = arg0 + local23 - SoftwareRaster.clipRight;
local23 -= local36;
local29 += local36;
local27 += local36;
}
if (local23 > 0 && local20 > 0) {
Static290.method308(Static129.pixels, this.anIntArray20, local17, local15, local23, local20, local27, local29, arg2);
Static290.method308(SoftwareRaster.pixels, this.anIntArray20, local17, local15, local23, local20, local27, local29, arg2);
}
}
@ -731,40 +731,40 @@ public class SoftwareSprite extends Sprite {
public void method1423(@OriginalArg(0) int arg0, @OriginalArg(1) int arg1) {
arg0 += this.anInt1863;
arg1 += this.anInt1861;
@Pc(15) int local15 = arg0 + arg1 * Static129.width;
@Pc(15) int local15 = arg0 + arg1 * SoftwareRaster.width;
@Pc(17) int local17 = 0;
@Pc(20) int local20 = this.anInt1859;
@Pc(23) int local23 = this.anInt1867;
@Pc(27) int local27 = Static129.width - local23;
@Pc(27) int local27 = SoftwareRaster.width - local23;
@Pc(29) int local29 = 0;
@Pc(36) int local36;
if (arg1 < Static129.clipTop) {
local36 = Static129.clipTop - arg1;
if (arg1 < SoftwareRaster.clipTop) {
local36 = SoftwareRaster.clipTop - arg1;
local20 -= local36;
arg1 = Static129.clipTop;
arg1 = SoftwareRaster.clipTop;
local17 = local36 * local23;
local15 += local36 * Static129.width;
local15 += local36 * SoftwareRaster.width;
}
if (arg1 + local20 > Static129.clipBottom) {
local20 -= arg1 + local20 - Static129.clipBottom;
if (arg1 + local20 > SoftwareRaster.clipBottom) {
local20 -= arg1 + local20 - SoftwareRaster.clipBottom;
}
if (arg0 < Static129.clipLeft) {
local36 = Static129.clipLeft - arg0;
if (arg0 < SoftwareRaster.clipLeft) {
local36 = SoftwareRaster.clipLeft - arg0;
local23 -= local36;
arg0 = Static129.clipLeft;
arg0 = SoftwareRaster.clipLeft;
local17 += local36;
local15 += local36;
local29 = local36;
local27 += local36;
}
if (arg0 + local23 > Static129.clipRight) {
local36 = arg0 + local23 - Static129.clipRight;
if (arg0 + local23 > SoftwareRaster.clipRight) {
local36 = arg0 + local23 - SoftwareRaster.clipRight;
local23 -= local36;
local29 += local36;
local27 += local36;
}
if (local23 > 0 && local20 > 0) {
Static290.method300(Static129.pixels, this.anIntArray20, local17, local15, local23, local20, local27, local29);
Static290.method300(SoftwareRaster.pixels, this.anIntArray20, local17, local15, local23, local20, local27, local29);
}
}
@ -792,27 +792,27 @@ public class SoftwareSprite extends Sprite {
@Pc(39) int local39 = local27 * arg7 >> 8;
@Pc(51) int local51 = (arg4 << 16) + local9 * local33 + local4 * local39;
@Pc(63) int local63 = (arg5 << 16) + (local9 * local39 - local4 * local33);
@Pc(69) int local69 = arg0 + arg1 * Static129.width;
@Pc(69) int local69 = arg0 + arg1 * SoftwareRaster.width;
for (@Pc(71) int local71 = 0; local71 < arg3; local71++) {
@Pc(78) int local78 = arg8[local71];
@Pc(82) int local82 = local69 + local78;
@Pc(88) int local88 = local51 + local39 * local78;
@Pc(94) int local94 = local63 - local33 * local78;
for (@Pc(99) int local99 = -arg9[local71]; local99 < 0; local99++) {
Static129.pixels[local82++] = this.anIntArray20[(local88 >> 16) + (local94 >> 16) * this.anInt1867];
SoftwareRaster.pixels[local82++] = this.anIntArray20[(local88 >> 16) + (local94 >> 16) * this.anInt1867];
local88 += local39;
local94 -= local33;
}
local51 += local33;
local63 += local39;
local69 += Static129.width;
local69 += SoftwareRaster.width;
}
} catch (@Pc(144) Exception local144) {
}
}
@OriginalMember(owner = "client!mm", name = "e", descriptor = "()V")
public final void method311() {
public final void trim() {
if (this.anInt1867 == this.anInt1860 && this.anInt1859 == this.anInt1866) {
return;
}
@ -831,7 +831,7 @@ public class SoftwareSprite extends Sprite {
@OriginalMember(owner = "client!mm", name = "a", descriptor = "(II[I[I)V")
public final void method312(@OriginalArg(0) int arg0, @OriginalArg(1) int arg1, @OriginalArg(2) int[] arg2, @OriginalArg(3) int[] arg3) {
if (Static129.clipBottom - Static129.clipTop != arg2.length) {
if (SoftwareRaster.clipBottom - SoftwareRaster.clipTop != arg2.length) {
throw new IllegalStateException();
}
arg0 += this.anInt1863;
@ -839,31 +839,31 @@ public class SoftwareSprite extends Sprite {
@Pc(21) int local21 = 0;
@Pc(24) int local24 = this.anInt1859;
@Pc(27) int local27 = this.anInt1867;
@Pc(31) int local31 = Static129.width - local27;
@Pc(31) int local31 = SoftwareRaster.width - local27;
@Pc(33) int local33 = 0;
@Pc(39) int local39 = arg0 + arg1 * Static129.width;
@Pc(39) int local39 = arg0 + arg1 * SoftwareRaster.width;
@Pc(46) int local46;
if (arg1 < Static129.clipTop) {
local46 = Static129.clipTop - arg1;
if (arg1 < SoftwareRaster.clipTop) {
local46 = SoftwareRaster.clipTop - arg1;
local24 -= local46;
arg1 = Static129.clipTop;
arg1 = SoftwareRaster.clipTop;
local21 = local46 * local27;
local39 += local46 * Static129.width;
local39 += local46 * SoftwareRaster.width;
}
if (arg1 + local24 > Static129.clipBottom) {
local24 -= arg1 + local24 - Static129.clipBottom;
if (arg1 + local24 > SoftwareRaster.clipBottom) {
local24 -= arg1 + local24 - SoftwareRaster.clipBottom;
}
if (arg0 < Static129.clipLeft) {
local46 = Static129.clipLeft - arg0;
if (arg0 < SoftwareRaster.clipLeft) {
local46 = SoftwareRaster.clipLeft - arg0;
local27 -= local46;
arg0 = Static129.clipLeft;
arg0 = SoftwareRaster.clipLeft;
local21 += local46;
local39 += local46;
local33 = local46;
local31 += local46;
}
if (arg0 + local27 > Static129.clipRight) {
local46 = arg0 + local27 - Static129.clipRight;
if (arg0 + local27 > SoftwareRaster.clipRight) {
local46 = arg0 + local27 - SoftwareRaster.clipRight;
local27 -= local46;
local33 += local46;
local31 += local46;
@ -871,8 +871,8 @@ public class SoftwareSprite extends Sprite {
if (local27 <= 0 || local24 <= 0) {
return;
}
local46 = arg0 - Static129.clipLeft;
@Pc(142) int local142 = arg1 - Static129.clipTop;
local46 = arg0 - SoftwareRaster.clipLeft;
@Pc(142) int local142 = arg1 - SoftwareRaster.clipTop;
for (@Pc(144) int local144 = local142; local144 < local142 + local24; local144++) {
@Pc(153) int local153 = arg2[local144];
@Pc(157) int local157 = arg3[local144];
@ -908,7 +908,7 @@ public class SoftwareSprite extends Sprite {
if (local242 == 0) {
local39++;
} else {
Static129.pixels[local39++] = local242;
SoftwareRaster.pixels[local39++] = local242;
}
}
local21 += local166 + local33;
@ -927,7 +927,7 @@ public class SoftwareSprite extends Sprite {
@Pc(39) int local39 = local27 * 256 >> 8;
@Pc(51) int local51 = (arg4 << 16) + local9 * local33 + local4 * local39;
@Pc(63) int local63 = (arg5 << 16) + (local9 * local39 - local4 * local33);
@Pc(69) int local69 = arg0 + arg1 * Static129.width;
@Pc(69) int local69 = arg0 + arg1 * SoftwareRaster.width;
for (@Pc(71) int local71 = 0; local71 < arg3; local71++) {
@Pc(78) int local78 = arg7[local71];
@Pc(82) int local82 = local69 + local78;
@ -938,14 +938,14 @@ public class SoftwareSprite extends Sprite {
if (local115 == 0) {
local82++;
} else {
Static129.pixels[local82++] = local115;
SoftwareRaster.pixels[local82++] = local115;
}
local88 += local39;
local94 -= local33;
}
local51 += local33;
local63 += local39;
local69 += Static129.width;
local69 += SoftwareRaster.width;
}
} catch (@Pc(150) Exception local150) {
}
@ -994,31 +994,31 @@ public class SoftwareSprite extends Sprite {
if (local10 < local20) {
arg3 = ((local10 << 16) + local32 - local14 - 1) / local32;
}
local46 = arg0 + arg1 * Static129.width;
@Pc(130) int local130 = Static129.width - arg2;
if (arg1 + arg3 > Static129.clipBottom) {
arg3 -= arg1 + arg3 - Static129.clipBottom;
local46 = arg0 + arg1 * SoftwareRaster.width;
@Pc(130) int local130 = SoftwareRaster.width - arg2;
if (arg1 + arg3 > SoftwareRaster.clipBottom) {
arg3 -= arg1 + arg3 - SoftwareRaster.clipBottom;
}
@Pc(150) int local150;
if (arg1 < Static129.clipTop) {
local150 = Static129.clipTop - arg1;
if (arg1 < SoftwareRaster.clipTop) {
local150 = SoftwareRaster.clipTop - arg1;
arg3 -= local150;
local46 += local150 * Static129.width;
local46 += local150 * SoftwareRaster.width;
local14 += local32 * local150;
}
if (arg0 + arg2 > Static129.clipRight) {
local150 = arg0 + arg2 - Static129.clipRight;
if (arg0 + arg2 > SoftwareRaster.clipRight) {
local150 = arg0 + arg2 - SoftwareRaster.clipRight;
arg2 -= local150;
local130 += local150;
}
if (arg0 < Static129.clipLeft) {
local150 = Static129.clipLeft - arg0;
if (arg0 < SoftwareRaster.clipLeft) {
local150 = SoftwareRaster.clipLeft - arg0;
arg2 -= local150;
local46 += local150;
local12 += local26 * local150;
local130 += local150;
}
Static290.method307(Static129.pixels, this.anIntArray20, local12, local14, local46, local130, arg2, arg3, local26, local32, local7, arg4);
Static290.method307(SoftwareRaster.pixels, this.anIntArray20, local12, local14, local46, local130, arg2, arg3, local26, local32, local7, arg4);
}
@OriginalMember(owner = "client!mm", name = "b", descriptor = "(III)V")
@ -1083,30 +1083,30 @@ public class SoftwareSprite extends Sprite {
if (local10 < local20) {
arg3 = ((local10 << 16) + local32 - local14 - 1) / local32;
}
local46 = arg0 + arg1 * Static129.width;
@Pc(130) int local130 = Static129.width - arg2;
if (arg1 + arg3 > Static129.clipBottom) {
arg3 -= arg1 + arg3 - Static129.clipBottom;
local46 = arg0 + arg1 * SoftwareRaster.width;
@Pc(130) int local130 = SoftwareRaster.width - arg2;
if (arg1 + arg3 > SoftwareRaster.clipBottom) {
arg3 -= arg1 + arg3 - SoftwareRaster.clipBottom;
}
@Pc(150) int local150;
if (arg1 < Static129.clipTop) {
local150 = Static129.clipTop - arg1;
if (arg1 < SoftwareRaster.clipTop) {
local150 = SoftwareRaster.clipTop - arg1;
arg3 -= local150;
local46 += local150 * Static129.width;
local46 += local150 * SoftwareRaster.width;
local14 += local32 * local150;
}
if (arg0 + arg2 > Static129.clipRight) {
local150 = arg0 + arg2 - Static129.clipRight;
if (arg0 + arg2 > SoftwareRaster.clipRight) {
local150 = arg0 + arg2 - SoftwareRaster.clipRight;
arg2 -= local150;
local130 += local150;
}
if (arg0 < Static129.clipLeft) {
local150 = Static129.clipLeft - arg0;
if (arg0 < SoftwareRaster.clipLeft) {
local150 = SoftwareRaster.clipLeft - arg0;
arg2 -= local150;
local46 += local150;
local12 += local26 * local150;
local130 += local150;
}
Static290.method316(Static129.pixels, this.anIntArray20, local12, local14, local46, local130, arg2, arg3, local26, local32, local7);
Static290.method316(SoftwareRaster.pixels, this.anIntArray20, local12, local14, local46, local130, arg2, arg3, local26, local32, local7);
}
}

8
client/src/main/java/Song.java
View file

@ -297,7 +297,13 @@ public final class Song extends Node {
}
}
@OriginalMember(owner = "client!rf", name = "a", descriptor = "()V")
@OriginalMember(owner = "client!rf", name = "a", descriptor = "(Lclient!ve;II)Lclient!rf;")
public static Song create(@OriginalArg(0) Js5 arg0, @OriginalArg(1) int arg1, @OriginalArg(2) int arg2) {
@Pc(5) byte[] local5 = arg0.getFile(arg1, arg2);
return local5 == null ? null : new Song(new Buffer(local5));
}
@OriginalMember(owner = "client!rf", name = "a", descriptor = "()V")
public final void method3740() {
this.aClass133_22 = null;
}

2
client/src/main/java/SoundBank.java
View file

@ -33,7 +33,7 @@ public final class SoundBank {
if (local37 != null) {
return local37;
} else if (arg0 == null || arg0[0] > 0) {
@Pc(59) SynthSound local59 = Static292.method3988(this.aClass153_52, arg1, arg2);
@Pc(59) SynthSound local59 = SynthSound.create(this.aClass153_52, arg1, arg2);
if (local59 == null) {
return null;
}

37
client/src/main/java/SoundPlayer.java Normal file
View file

@ -0,0 +1,37 @@
import org.openrs2.deob.annotation.OriginalArg;
import org.openrs2.deob.annotation.OriginalMember;
import org.openrs2.deob.annotation.Pc;
public class SoundPlayer {
@OriginalMember(owner = "client!ma", name = "a", descriptor = "(ILclient!tk;IIZI)V")
public static void playSeqSound(@OriginalArg(0) int arg0, @OriginalArg(1) SeqType arg1, @OriginalArg(3) int arg2, @OriginalArg(4) boolean arg3, @OriginalArg(5) int arg4) {
if (Static189.anInt4451 >= 50 || (arg1.anIntArrayArray38 == null || arg4 >= arg1.anIntArrayArray38.length || arg1.anIntArrayArray38[arg4] == null)) {
return;
}
@Pc(36) int local36 = arg1.anIntArrayArray38[arg4][0];
@Pc(40) int local40 = local36 >> 8;
@Pc(57) int local57;
if (arg1.anIntArrayArray38[arg4].length > 1) {
local57 = (int) ((double) arg1.anIntArrayArray38[arg4].length * Math.random());
if (local57 > 0) {
local40 = arg1.anIntArrayArray38[arg4][local57];
}
}
@Pc(73) int local73 = local36 >> 5 & 0x7;
@Pc(77) int local77 = local36 & 0x1F;
if (local77 == 0) {
if (arg3) {
Static26.method744(local73, local40, 0);
}
} else if (Preferences.ambientSoundsVolume != 0) {
Static200.anIntArray421[Static189.anInt4451] = local40;
Static276.anIntArray563[Static189.anInt4451] = local73;
@Pc(111) int local111 = (arg0 - 64) / 128;
local57 = (arg2 - 64) / 128;
Static164.anIntArray362[Static189.anInt4451] = 0;
Static173.aClass138Array1[Static189.anInt4451] = null;
Static26.anIntArray68[Static189.anInt4451] = local77 + (local57 << 16) + (local111 << 8);
Static189.anInt4451++;
}
}
}

6
client/src/main/java/SpecularMaterialRenderer.java
View file

@ -126,7 +126,7 @@ public final class SpecularMaterialRenderer implements MaterialRenderer {
@Override
public final void method4602() {
@Pc(1) GL2 local1 = GlRenderer.gl;
if (Static178.highDetailLighting) {
if (Preferences.highDetailLighting) {
local1.glCallList(this.anInt5777 + 1);
} else {
local1.glTexEnvi(GL2.GL_TEXTURE_ENV, GL2.GL_SRC0_ALPHA, GL2.GL_TEXTURE);
@ -144,7 +144,7 @@ public final class SpecularMaterialRenderer implements MaterialRenderer {
public final void method4603() {
@Pc(1) GL2 local1 = GlRenderer.gl;
GlRenderer.setTextureCombineAlphaMode(1);
if (Static178.highDetailLighting) {
if (Preferences.highDetailLighting) {
local1.glCallList(this.anInt5777);
} else {
local1.glTexEnvi(GL2.GL_TEXTURE_ENV, GL2.GL_SRC0_ALPHA, GL2.GL_PRIMARY_COLOR);
@ -155,7 +155,7 @@ public final class SpecularMaterialRenderer implements MaterialRenderer {
@Override
public final void method4604(@OriginalArg(0) int arg0) {
@Pc(1) GL2 local1 = GlRenderer.gl;
if (Static178.highDetailLighting && this.anIntArray519 != null) {
if (Preferences.highDetailLighting && this.anIntArray519 != null) {
local1.glActiveTexture(GL2.GL_TEXTURE1);
local1.glBindTexture(GL2.GL_TEXTURE_CUBE_MAP, this.anIntArray519[arg0 - 1]);
local1.glActiveTexture(GL2.GL_TEXTURE0);

313
client/src/main/java/SpriteLoader.java Normal file
View file

@ -0,0 +1,313 @@
import org.openrs2.deob.annotation.OriginalArg;
import org.openrs2.deob.annotation.OriginalMember;
import org.openrs2.deob.annotation.Pc;
public class SpriteLoader {
@OriginalMember(owner = "client!uj", name = "x", descriptor = "[I")
public static int[] innerWidths;
@OriginalMember(owner = "client!wa", name = "z", descriptor = "[I")
public static int[] yOffsets;
@OriginalMember(owner = "client!ca", name = "Y", descriptor = "[I")
public static int[] innerHeights;
@OriginalMember(owner = "client!ah", name = "l", descriptor = "[[B")
public static byte[][] pixels;
@OriginalMember(owner = "client!wf", name = "b", descriptor = "[I")
public static int[] xOffsets;
@OriginalMember(owner = "client!vc", name = "R", descriptor = "[I")
public static int[] palette;
@OriginalMember(owner = "client!nb", name = "h", descriptor = "I")
public static int frames;
@OriginalMember(owner = "client!fb", name = "n", descriptor = "[[B")
public static byte[][] alpha;
@OriginalMember(owner = "client!mi", name = "W", descriptor = "[Z")
public static boolean[] hasAlpha;
@OriginalMember(owner = "client!jk", name = "x", descriptor = "I")
public static int width;
@OriginalMember(owner = "client!sg", name = "h", descriptor = "I")
public static int height;
@OriginalMember(owner = "client!cg", name = "a", descriptor = "(ZILclient!ve;I)[Lclient!ek;")
static SoftwareIndexedSprite[] loadSoftwareIndexedSprites(@OriginalArg(1) int arg0, @OriginalArg(2) Js5 arg1) {
return decode(arg1, 0, arg0) ? createSoftwareIndexedSprites() : null;
}
@OriginalMember(owner = "client!ta", name = "a", descriptor = "(Lclient!ve;III)Z")
public static boolean decode(@OriginalArg(0) Js5 arg0, @OriginalArg(1) int arg1, @OriginalArg(2) int arg2) {
@Pc(9) byte[] local9 = arg0.getFile(arg2, arg1);
if (local9 == null) {
return false;
} else {
decode(local9);
return true;
}
}
@OriginalMember(owner = "client!jg", name = "a", descriptor = "(I)[Lclient!ek;")
public static SoftwareIndexedSprite[] createSoftwareIndexedSprites() {
@Pc(2) SoftwareIndexedSprite[] sprites = new SoftwareIndexedSprite[frames];
for (@Pc(8) int local8 = 0; local8 < frames; local8++) {
sprites[local8] = new SoftwareIndexedSprite(width, height, xOffsets[local8], yOffsets[local8], innerWidths[local8], innerHeights[local8], pixels[local8], palette);
}
clear();
return sprites;
}
@OriginalMember(owner = "client!gk", name = "a", descriptor = "([BI)V")
public static void decode(@OriginalArg(0) byte[] arg0) {
@Pc(4) Buffer buffer = new Buffer(arg0);
buffer.offset = arg0.length - 2;
frames = buffer.g2();
innerHeights = new int[frames];
innerWidths = new int[frames];
xOffsets = new int[frames];
hasAlpha = new boolean[frames];
alpha = new byte[frames][];
yOffsets = new int[frames];
pixels = new byte[frames][];
buffer.offset = arg0.length - frames * 8 - 7;
width = buffer.g2();
height = buffer.g2();
@Pc(66) int paletteSize = (buffer.g1() & 0xFF) + 1;
@Pc(68) int i;
for (i = 0; i < frames; i++) {
xOffsets[i] = buffer.g2();
}
for (i = 0; i < frames; i++) {
yOffsets[i] = buffer.g2();
}
for (i = 0; i < frames; i++) {
innerWidths[i] = buffer.g2();
}
for (i = 0; i < frames; i++) {
innerHeights[i] = buffer.g2();
}
buffer.offset = arg0.length + 3 - frames * 8 - paletteSize * 3 - 7;
palette = new int[paletteSize];
for (i = 1; i < paletteSize; i++) {
palette[i] = buffer.g3();
if (palette[i] == 0) {
palette[i] = 1;
}
}
buffer.offset = 0;
for (i = 0; i < frames; i++) {
@Pc(195) int local195 = innerWidths[i];
@Pc(199) int local199 = innerHeights[i];
@Pc(203) int local203 = local195 * local199;
@Pc(206) byte[] local206 = new byte[local203];
@Pc(208) boolean local208 = false;
pixels[i] = local206;
@Pc(215) byte[] local215 = new byte[local203];
alpha[i] = local215;
@Pc(223) int local223 = buffer.g1();
@Pc(232) int local232;
if ((local223 & 0x1) == 0) {
for (local232 = 0; local232 < local203; local232++) {
local206[local232] = buffer.g1s();
}
if ((local223 & 0x2) != 0) {
for (local232 = 0; local232 < local203; local232++) {
@Pc(343) byte local343 = local215[local232] = buffer.g1s();
local208 |= local343 != -1;
}
}
} else {
local232 = 0;
label88: while (true) {
@Pc(241) int local241;
if (local232 >= local195) {
if ((local223 & 0x2) == 0) {
break;
}
local232 = 0;
while (true) {
if (local232 >= local195) {
break label88;
}
for (local241 = 0; local241 < local199; local241++) {
@Pc(291) byte local291 = local215[local195 * local241 + local232] = buffer.g1s();
local208 |= local291 != -1;
}
local232++;
}
}
for (local241 = 0; local241 < local199; local241++) {
local206[local232 + local241 * local195] = buffer.g1s();
}
local232++;
}
}
hasAlpha[i] = local208;
}
}
@OriginalMember(owner = "client!g", name = "a", descriptor = "(B)V")
public static void clear() {
innerWidths = null;
yOffsets = null;
innerHeights = null;
pixels = null;
xOffsets = null;
palette = null;
}
@OriginalMember(owner = "client!ra", name = "a", descriptor = "(IBILclient!ve;)[Lclient!qf;")
public static Sprite[] loadAlphaSprites(@OriginalArg(2) int arg0, @OriginalArg(3) Js5 arg1) {
return decode(arg1, 0, arg0) ? method3730() : null;
}
@OriginalMember(owner = "client!vj", name = "a", descriptor = "(IIILclient!ve;)[Lclient!mm;")
public static SoftwareSprite[] loadSoftwareSprites(@OriginalArg(2) int arg0, @OriginalArg(3) Js5 arg1) {
return decode(arg1, 0, arg0) ? method474() : null;
}
@OriginalMember(owner = "client!gd", name = "a", descriptor = "(ILclient!ve;II)Lclient!mm;")
public static SoftwareSprite loadSoftwareSprite(@OriginalArg(0) int arg0, @OriginalArg(1) Js5 arg1, @OriginalArg(3) int arg2) {
return decode(arg1, arg0, arg2) ? method3537() : null;
}
@OriginalMember(owner = "client!lg", name = "a", descriptor = "(Lclient!ve;BII)[Lclient!ok;")
public static IndexedSprite[] loadIndexedSprites(@OriginalArg(0) Js5 arg0, @OriginalArg(3) int arg1) {
return decode(arg0, 0, arg1) ? method4331() : null;
}
@OriginalMember(owner = "client!kd", name = "a", descriptor = "(IIILclient!ve;)[Lclient!qf;")
public static Sprite[] method2580(@OriginalArg(2) int arg0, @OriginalArg(3) Js5 arg1) {
return decode(arg1, 0, arg0) ? method870() : null;
}
@OriginalMember(owner = "client!lk", name = "a", descriptor = "(IIBLclient!ve;)Lclient!qf;")
public static Sprite loadSprites(@OriginalArg(1) int arg0, @OriginalArg(3) Js5 arg1) {
return decode(arg1, 0, arg0) ? method1764() : null;
}
@OriginalMember(owner = "client!re", name = "b", descriptor = "(I)[Lclient!qf;")
public static Sprite[] method3730() {
@Pc(14) Sprite[] local14 = new Sprite[frames];
for (@Pc(16) int local16 = 0; local16 < frames; local16++) {
@Pc(23) byte[] local23 = pixels[local16];
@Pc(31) int local31 = innerHeights[local16] * innerWidths[local16];
if (hasAlpha[local16]) {
@Pc(38) int[] local38 = new int[local31];
@Pc(42) byte[] local42 = alpha[local16];
for (@Pc(44) int local44 = 0; local44 < local31; local44++) {
local38[local44] = palette[local23[local44] & 0xFF] | (local42[local44] & 0xFF) << 24;
}
if (GlRenderer.enabled) {
local14[local16] = new GlAlphaSprite(width, height, xOffsets[local16], yOffsets[local16], innerWidths[local16], innerHeights[local16], local38);
} else {
local14[local16] = new SoftwareAlphaSprite(width, height, xOffsets[local16], yOffsets[local16], innerWidths[local16], innerHeights[local16], local38);
}
} else {
@Pc(119) int[] local119 = new int[local31];
for (@Pc(121) int local121 = 0; local121 < local31; local121++) {
local119[local121] = palette[local23[local121] & 0xFF];
}
if (GlRenderer.enabled) {
local14[local16] = new GlSprite(width, height, xOffsets[local16], yOffsets[local16], innerWidths[local16], innerHeights[local16], local119);
} else {
local14[local16] = new SoftwareSprite(width, height, xOffsets[local16], yOffsets[local16], innerWidths[local16], innerHeights[local16], local119);
}
}
}
clear();
return local14;
}
@OriginalMember(owner = "client!bd", name = "a", descriptor = "(Z)[Lclient!mm;")
public static SoftwareSprite[] method474() {
@Pc(4) SoftwareSprite[] local4 = new SoftwareSprite[frames];
for (@Pc(12) int local12 = 0; local12 < frames; local12++) {
@Pc(27) int local27 = innerHeights[local12] * innerWidths[local12];
@Pc(31) byte[] local31 = pixels[local12];
@Pc(34) int[] local34 = new int[local27];
for (@Pc(36) int local36 = 0; local36 < local27; local36++) {
local34[local36] = palette[local31[local36] & 0xFF];
}
local4[local12] = new SoftwareSprite(width, height, xOffsets[local12], yOffsets[local12], innerWidths[local12], innerHeights[local12], local34);
}
clear();
return local4;
}
@OriginalMember(owner = "client!pl", name = "a", descriptor = "(I)Lclient!mm;")
public static SoftwareSprite method3537() {
@Pc(13) int local13 = innerWidths[0] * innerHeights[0];
@Pc(17) byte[] local17 = pixels[0];
@Pc(20) int[] local20 = new int[local13];
for (@Pc(22) int local22 = 0; local22 < local13; local22++) {
local20[local22] = palette[local17[local22] & 0xFF];
}
@Pc(57) SoftwareSprite local57 = new SoftwareSprite(width, height, xOffsets[0], yOffsets[0], innerWidths[0], innerHeights[0], local20);
clear();
return local57;
}
@OriginalMember(owner = "client!ui", name = "h", descriptor = "(I)[Lclient!ok;")
public static IndexedSprite[] method4331() {
@Pc(8) IndexedSprite[] local8 = new IndexedSprite[frames];
for (@Pc(10) int local10 = 0; local10 < frames; local10++) {
if (GlRenderer.enabled) {
local8[local10] = new GlIndexedSprite(width, height, xOffsets[local10], yOffsets[local10], innerWidths[local10], innerHeights[local10], pixels[local10], palette);
} else {
local8[local10] = new SoftwareIndexedSprite(width, height, xOffsets[local10], yOffsets[local10], innerWidths[local10], innerHeights[local10], pixels[local10], palette);
}
}
clear();
return local8;
}
@OriginalMember(owner = "client!cj", name = "a", descriptor = "(I)[Lclient!qf;")
public static Sprite[] method870() {
@Pc(6) Sprite[] local6 = new Sprite[frames];
for (@Pc(15) int local15 = 0; local15 < frames; local15++) {
@Pc(30) int local30 = innerWidths[local15] * innerHeights[local15];
@Pc(34) byte[] local34 = pixels[local15];
@Pc(37) int[] local37 = new int[local30];
for (@Pc(39) int local39 = 0; local39 < local30; local39++) {
local37[local39] = palette[local34[local39] & 0xFF];
}
if (GlRenderer.enabled) {
local6[local15] = new GlSprite(width, height, xOffsets[local15], yOffsets[local15], innerWidths[local15], innerHeights[local15], local37);
} else {
local6[local15] = new SoftwareSprite(width, height, xOffsets[local15], yOffsets[local15], innerWidths[local15], innerHeights[local15], local37);
}
}
clear();
return local6;
}
@OriginalMember(owner = "client!gi", name = "b", descriptor = "(I)Lclient!qf;")
public static Sprite method1764() {
@Pc(9) byte[] local9 = pixels[0];
@Pc(17) int local17 = innerWidths[0] * innerHeights[0];
@Pc(20) int[] local20 = new int[local17];
for (@Pc(28) int local28 = 0; local28 < local17; local28++) {
local20[local28] = palette[local9[local28] & 0xFF];
}
@Pc(69) Sprite local69;
if (GlRenderer.enabled) {
local69 = new GlSprite(width, height, xOffsets[0], yOffsets[0], innerWidths[0], innerHeights[0], local20);
} else {
local69 = new SoftwareSprite(width, height, xOffsets[0], yOffsets[0], innerWidths[0], innerHeights[0], local20);
}
clear();
return local69;
}
@OriginalMember(owner = "client!uj", name = "a", descriptor = "(BLclient!ve;I)Z")
public static boolean decode(@OriginalArg(1) Js5 arg0, @OriginalArg(2) int arg1) {
@Pc(13) byte[] local13 = arg0.method4500(arg1);
if (local13 == null) {
return false;
} else {
decode(local13);
return true;
}
}
@OriginalMember(owner = "client!ml", name = "a", descriptor = "(BILclient!ve;)[Lclient!ek;")
public static SoftwareIndexedSprite[] method3088(@OriginalArg(1) int arg0, @OriginalArg(2) Js5 arg1) {
return decode(arg1, arg0) ? createSoftwareIndexedSprites() : null;
}
}

273
client/src/main/java/Sprites.java Normal file
View file

@ -0,0 +1,273 @@
import org.openrs2.deob.annotation.OriginalArg;
import org.openrs2.deob.annotation.OriginalMember;
import org.openrs2.deob.annotation.Pc;
public class Sprites {
@OriginalMember(owner = "client!bh", name = "s", descriptor = "Lclient!na;")
public static final JagString P11_FULL = Static28.parse("p11_full");
@OriginalMember(owner = "client!ee", name = "e", descriptor = "Lclient!na;")
public static final JagString P12_FULL = Static28.parse("p12_full");
@OriginalMember(owner = "client!fm", name = "eb", descriptor = "Lclient!na;")
public static final JagString B12_FULL = Static28.parse("b12_full");
@OriginalMember(owner = "client!bg", name = "N", descriptor = "Lclient!na;")
public static final JagString MAPFUNCTION = Static28.parse("mapfunction");
@OriginalMember(owner = "client!rl", name = "S", descriptor = "Lclient!na;")
public static final JagString HITMARKS = Static28.parse("hitmarks");
@OriginalMember(owner = "client!vd", name = "v", descriptor = "Lclient!na;")
public static final JagString HITBAR_DEFAULT = Static28.parse("hitbar_default");
@OriginalMember(owner = "client!jj", name = "d", descriptor = "Lclient!na;")
public static final JagString HEADICONS_PK = Static28.parse("headicons_pk");
@OriginalMember(owner = "client!sh", name = "j", descriptor = "Lclient!na;")
public static final JagString HEADICONS_PRAYER = Static28.parse("headicons_prayer");
@OriginalMember(owner = "client!hj", name = "d", descriptor = "Lclient!na;")
public static final JagString HINT_HEADICONS = Static28.parse("hint_headicons");
@OriginalMember(owner = "client!pe", name = "n", descriptor = "Lclient!na;")
public static final JagString HINT_MAPMARKERS = Static28.parse("hint_mapmarkers");
@OriginalMember(owner = "client!vc", name = "ab", descriptor = "Lclient!na;")
public static final JagString MAPFLAG = Static28.parse("mapflag");
@OriginalMember(owner = "client!gm", name = "db", descriptor = "Lclient!na;")
public static final JagString CROSS = Static28.parse("cross");
@OriginalMember(owner = "client!pe", name = "z", descriptor = "Lclient!na;")
public static final JagString MAPDOTS = Static28.parse("mapdots");
@OriginalMember(owner = "client!uf", name = "o", descriptor = "Lclient!na;")
public static final JagString SCROLLBAR = Static28.parse("scrollbar");
@OriginalMember(owner = "client!cb", name = "eb", descriptor = "Lclient!na;")
public static final JagString NAME_ICONS = Static28.parse("name_icons");
@OriginalMember(owner = "client!bh", name = "v", descriptor = "Lclient!na;")
public static final JagString FLOORSHADOWS = Static28.parse("floorshadows");
@OriginalMember(owner = "client!wl", name = "d", descriptor = "Lclient!na;")
public static final JagString COMPASS = Static28.parse("compass");
@OriginalMember(owner = "client!af", name = "g", descriptor = "Lclient!na;")
public static final JagString HINT_MAPEDGE = Static28.parse("hint_mapedge");
@OriginalMember(owner = "client!nc", name = "h", descriptor = "I")
public static int p11FullId;
@OriginalMember(owner = "client!kc", name = "t", descriptor = "I")
public static int p12FullId;
@OriginalMember(owner = "client!fm", name = "V", descriptor = "I")
public static int b12FullId;
@OriginalMember(owner = "client!wl", name = "A", descriptor = "I")
public static int mapfunctionId;
@OriginalMember(owner = "client!kd", name = "Cb", descriptor = "I")
public static int hitmarksId;
@OriginalMember(owner = "client!client", name = "W", descriptor = "I")
public static int hitbarId;
@OriginalMember(owner = "client!rg", name = "C", descriptor = "I")
public static int headiconsPkId;
@OriginalMember(owner = "client!ck", name = "F", descriptor = "I")
public static int headiconsPrayerId;
@OriginalMember(owner = "client!qg", name = "R", descriptor = "I")
public static int hintHeadId;
@OriginalMember(owner = "client!lj", name = "s", descriptor = "I")
public static int hintMapMarkId;
@OriginalMember(owner = "client!bi", name = "fb", descriptor = "I")
public static int mapflagId;
@OriginalMember(owner = "client!ci", name = "t", descriptor = "I")
public static int crossId;
@OriginalMember(owner = "client!gd", name = "l", descriptor = "I")
public static int mapdotsId;
@OriginalMember(owner = "client!jk", name = "J", descriptor = "I")
public static int scrollbarId;
@OriginalMember(owner = "client!sd", name = "I", descriptor = "I")
public static int nameIconsId;
@OriginalMember(owner = "client!gk", name = "j", descriptor = "I")
public static int floorShadowsId;
@OriginalMember(owner = "client!n", name = "b", descriptor = "I")
public static int compassId;
@OriginalMember(owner = "client!ka", name = "u", descriptor = "I")
public static int hintMapEdgeId;
@OriginalMember(owner = "client!tj", name = "d", descriptor = "[Lclient!ek;")
public static SoftwareIndexedSprite[] floorShadows;
@OriginalMember(owner = "client!nk", name = "L", descriptor = "[Lclient!mm;")
public static SoftwareSprite[] mapfunctions;
@OriginalMember(owner = "client!re", name = "w", descriptor = "[Lclient!qf;")
public static Sprite[] hitmarks;
@OriginalMember(owner = "client!jb", name = "k", descriptor = "[Lclient!qf;")
public static Sprite[] hitbars;
@OriginalMember(owner = "client!rl", name = "V", descriptor = "[Lclient!qf;")
public static Sprite[] headiconPks;
@OriginalMember(owner = "client!km", name = "sc", descriptor = "[Lclient!qf;")
public static Sprite[] headiconPrayers;
@OriginalMember(owner = "client!wh", name = "l", descriptor = "[Lclient!qf;")
public static Sprite[] headhints;
@OriginalMember(owner = "client!lj", name = "t", descriptor = "[Lclient!qf;")
public static Sprite[] mapmarkhints;
@OriginalMember(owner = "client!tg", name = "d", descriptor = "[Lclient!qf;")
public static Sprite[] crosses;
@OriginalMember(owner = "client!gk", name = "l", descriptor = "Lclient!qf;")
public static Sprite mapflags;
@OriginalMember(owner = "client!l", name = "j", descriptor = "[Lclient!qf;")
public static Sprite[] mapdots;
@OriginalMember(owner = "client!mi", name = "T", descriptor = "[Lclient!ok;")
public static IndexedSprite[] nameIcons;
@OriginalMember(owner = "client!th", name = "f", descriptor = "[Lclient!ok;")
public static IndexedSprite[] scrollbars;
@OriginalMember(owner = "client!g", name = "a", descriptor = "(ILclient!ve;)V")
public static void init(@OriginalArg(1) Js5 archive) {
p11FullId = archive.getGroupId(P11_FULL);
p12FullId = archive.getGroupId(P12_FULL);
b12FullId = archive.getGroupId(B12_FULL);
mapfunctionId = archive.getGroupId(MAPFUNCTION);
hitmarksId = archive.getGroupId(HITMARKS);
hitbarId = archive.getGroupId(HITBAR_DEFAULT);
headiconsPkId = archive.getGroupId(HEADICONS_PK);
headiconsPrayerId = archive.getGroupId(HEADICONS_PRAYER);
hintHeadId = archive.getGroupId(HINT_HEADICONS);
hintMapMarkId = archive.getGroupId(HINT_MAPMARKERS);
mapflagId = archive.getGroupId(MAPFLAG);
crossId = archive.getGroupId(CROSS);
mapdotsId = archive.getGroupId(MAPDOTS);
scrollbarId = archive.getGroupId(SCROLLBAR);
nameIconsId = archive.getGroupId(NAME_ICONS);
floorShadowsId = archive.getGroupId(FLOORSHADOWS);
compassId = archive.getGroupId(COMPASS);
hintMapEdgeId = archive.getGroupId(HINT_MAPEDGE);
}
@OriginalMember(owner = "client!cd", name = "a", descriptor = "(Lclient!ve;B)I")
public static int getReady(@OriginalArg(0) Js5 archive) {
@Pc(5) int ready = 0;
if (archive.isFileReady(mapfunctionId)) {
ready++;
}
if (archive.isFileReady(hitmarksId)) {
ready++;
}
if (archive.isFileReady(hitbarId)) {
ready++;
}
if (archive.isFileReady(headiconsPkId)) {
ready++;
}
if (archive.isFileReady(headiconsPrayerId)) {
ready++;
}
if (archive.isFileReady(hintHeadId)) {
ready++;
}
if (archive.isFileReady(hintMapMarkId)) {
ready++;
}
if (archive.isFileReady(mapflagId)) {
ready++;
}
if (archive.isFileReady(crossId)) {
ready++;
}
if (archive.isFileReady(mapdotsId)) {
ready++;
}
if (archive.isFileReady(scrollbarId)) {
ready++;
}
if (archive.isFileReady(nameIconsId)) {
ready++;
}
if (archive.isFileReady(floorShadowsId)) {
ready++;
}
if (archive.isFileReady(compassId)) {
ready++;
}
if (archive.isFileReady(hintMapEdgeId)) {
ready++;
}
return ready;
}
@OriginalMember(owner = "client!cg", name = "a", descriptor = "(ILclient!ve;)V")
public static void load(@OriginalArg(1) Js5 arg0) {
mapfunctions = SpriteLoader.loadSoftwareSprites(mapfunctionId, arg0);
hitmarks = SpriteLoader.loadAlphaSprites(hitmarksId, arg0);
hitbars = SpriteLoader.loadAlphaSprites(hitbarId, arg0);
headiconPks = SpriteLoader.loadAlphaSprites(headiconsPkId, arg0);
headiconPrayers = SpriteLoader.loadAlphaSprites(headiconsPrayerId, arg0);
headhints = SpriteLoader.loadAlphaSprites(hintHeadId, arg0);
mapmarkhints = SpriteLoader.loadAlphaSprites(hintMapMarkId, arg0);
mapflags = SpriteLoader.loadSprites(mapflagId, arg0);
crosses = SpriteLoader.method2580(crossId, arg0);
mapdots = SpriteLoader.method2580(mapdotsId, arg0);
scrollbars = SpriteLoader.loadIndexedSprites(arg0, scrollbarId);
nameIcons = SpriteLoader.loadIndexedSprites(arg0, nameIconsId);
Fonts.p11Full.setNameIcons(nameIcons, null);
Fonts.p12Full.setNameIcons(nameIcons, null);
Fonts.b12Full.setNameIcons(nameIcons, null);
if (GlRenderer.enabled) {
floorShadows = SpriteLoader.loadSoftwareIndexedSprites(floorShadowsId, arg0);
for (@Pc(101) int local101 = 0; local101 < floorShadows.length; local101++) {
floorShadows[local101].trim();
}
}
@Pc(124) SoftwareSprite compass = SpriteLoader.loadSoftwareSprite(0, arg0, compassId);
compass.trim();
if (GlRenderer.enabled) {
Static106.compass = new GlSprite(compass);
} else {
Static106.compass = compass;
}
@Pc(143) SoftwareSprite[] local143 = SpriteLoader.loadSoftwareSprites(hintMapEdgeId, arg0);
@Pc(145) int local145;
for (local145 = 0; local145 < local143.length; local145++) {
local143[local145].trim();
}
if (GlRenderer.enabled) {
Static277.hintMapEdge = new Sprite[local143.length];
for (local145 = 0; local145 < local143.length; local145++) {
Static277.hintMapEdge[local145] = new GlSprite(local143[local145]);
}
} else {
Static277.hintMapEdge = local143;
}
@Pc(196) int local196 = (int) ((double) 21 * Math.random()) - 10;
local145 = (int) (Math.random() * 21.0D) - 10;
@Pc(210) int local210 = (int) (Math.random() * 21.0D) - 10;
@Pc(217) int local217 = (int) (Math.random() * 41.0D) - 20;
@Pc(219) int local219;
for (local219 = 0; local219 < mapfunctions.length; local219++) {
mapfunctions[local219].method315(local145 + local217, local217 + local196, local217 + local210);
}
if (GlRenderer.enabled) {
Static67.mapfuncs = new Sprite[mapfunctions.length];
for (local219 = 0; local219 < mapfunctions.length; local219++) {
Static67.mapfuncs[local219] = new GlSprite(mapfunctions[local219]);
}
} else {
Static67.mapfuncs = mapfunctions;
}
}
}

38
client/src/main/java/Static1.java
View file

@ -539,42 +539,42 @@ public final class Static1 {
Static46.method1187(arg0, arg3, arg2 + arg0, arg1 + arg3);
Static46.method1186(arg0, arg3, arg2, arg1, 0);
} else {
Static129.method2496(arg0, arg3, arg2 + arg0, arg3 + arg1);
Static129.method2495(arg0, arg3, arg2, arg1, 0);
SoftwareRaster.method2496(arg0, arg3, arg2 + arg0, arg3 + arg1);
SoftwareRaster.fillRect(arg0, arg3, arg2, arg1, 0);
}
if (Static41.anInt1309 < 100) {
if (WorldMap.loadPercentage < 100) {
return;
}
if (Static70.aClass3_Sub2_Sub1_2 == null || arg2 != Static70.aClass3_Sub2_Sub1_2.anInt1867 || Static70.aClass3_Sub2_Sub1_2.anInt1859 != arg1) {
@Pc(63) SoftwareSprite local63 = new SoftwareSprite(arg2, arg1);
Static129.method2491(local63.anIntArray20, arg2, arg1);
Static214.method4364(arg2, 0, Static48.anInt1449, 0, 0, Static181.anInt4296, arg1, 0);
SoftwareRaster.method2491(local63.anIntArray20, arg2, arg1);
Static214.method4364(arg2, 0, WorldMap.width, 0, 0, WorldMap.length, arg1, 0);
if (GlRenderer.enabled) {
Static70.aClass3_Sub2_Sub1_2 = new GlSprite(local63);
} else {
Static70.aClass3_Sub2_Sub1_2 = local63;
}
if (GlRenderer.enabled) {
Static129.pixels = null;
SoftwareRaster.pixels = null;
} else {
Static260.frameBuffer.makeTarget();
client.frameBuffer.makeTarget();
}
}
Static70.aClass3_Sub2_Sub1_2.method1415(arg0, arg3);
@Pc(147) int local147 = arg1 * Static109.anInt2884 / Static181.anInt4296 + arg3;
@Pc(153) int local153 = Static37.anInt1176 * arg1 / Static181.anInt4296;
@Pc(161) int local161 = arg0 + arg2 * Static109.anInt2882 / Static48.anInt1449;
@Pc(167) int local167 = arg2 * Static89.anInt2387 / Static48.anInt1449;
@Pc(147) int local147 = arg1 * Static109.anInt2884 / WorldMap.length + arg3;
@Pc(153) int local153 = Static37.anInt1176 * arg1 / WorldMap.length;
@Pc(161) int local161 = arg0 + arg2 * Static109.anInt2882 / WorldMap.width;
@Pc(167) int local167 = arg2 * Static89.anInt2387 / WorldMap.width;
@Pc(169) int local169 = 16711680;
if (Static266.game == 1) {
if (client.game == 1) {
local169 = 16777215;
}
if (GlRenderer.enabled) {
Static46.method1182(local161, local147, local167, local153, local169, 128);
Static46.method1179(local161, local147, local167, local153, local169);
} else {
Static129.method2484(local161, local147, local167, local153, local169, 128);
Static129.method2483(local161, local147, local167, local153, local169);
SoftwareRaster.method2484(local161, local147, local167, local153, local169, 128);
SoftwareRaster.drawRect(local161, local147, local167, local153, local169);
}
if (Static201.anInt1864 <= 0) {
return;
@ -585,14 +585,14 @@ public final class Static1 {
} else {
local225 = Static91.anInt2428 * 25;
}
for (@Pc(238) Class3_Sub26 local238 = (Class3_Sub26) Static145.aClass69_84.method2289(); local238 != null; local238 = (Class3_Sub26) Static145.aClass69_84.method2288()) {
if (local238.anInt4308 == Static9.anInt172) {
@Pc(258) int local258 = arg3 + local238.anInt4314 * arg1 / Static181.anInt4296;
@Pc(267) int local267 = arg2 * local238.anInt4307 / Static48.anInt1449 + arg0;
for (@Pc(238) MapElement local238 = (MapElement) WorldMap.mapElements.method2289(); local238 != null; local238 = (MapElement) WorldMap.mapElements.method2288()) {
if (local238.id == Static9.anInt172) {
@Pc(258) int local258 = arg3 + local238.anInt4314 * arg1 / WorldMap.length;
@Pc(267) int local267 = arg2 * local238.anInt4307 / WorldMap.width + arg0;
if (GlRenderer.enabled) {
Static46.method1182(local267 - 2, local258 + -2, 4, 4, 16776960, local225);
} else {
Static129.method2484(local267 - 2, local258 + -2, 4, 4, 16776960, local225);
SoftwareRaster.method2484(local267 - 2, local258 + -2, 4, 4, 16776960, local225);
}
}
}

10
client/src/main/java/Static10.java
View file

@ -23,9 +23,9 @@ public final class Static10 {
@OriginalMember(owner = "client!an", name = "a", descriptor = "(BI)I")
public static int method347(@OriginalArg(1) int arg0) {
if (Static124.socket != null) {
Static124.socket.close();
Static124.socket = null;
if (Protocol.socket != null) {
Protocol.socket.close();
Protocol.socket = null;
}
Static127.anInt3132++;
if (Static127.anInt3132 > 4) {
@ -76,11 +76,11 @@ public final class Static10 {
Static175.method3279();
return true;
} catch (@Pc(19) Exception local19) {
@Pc(61) String local61 = "T2 - " + Static164.anInt3985 + "," + Static5.anInt45 + "," + Static49.anInt1462 + " - " + Static223.anInt5028 + "," + (Static225.originX + Static173.self.movementQueueX[0]) + "," + (Static173.self.movementQueueZ[0] + Static142.originZ) + " - ";
@Pc(61) String local61 = "T2 - " + Static164.anInt3985 + "," + Static5.anInt45 + "," + Static49.anInt1462 + " - " + Static223.anInt5028 + "," + (Static225.originX + PlayerList.self.movementQueueX[0]) + "," + (PlayerList.self.movementQueueZ[0] + Static142.originZ) + " - ";
for (@Pc(63) int local63 = 0; local63 < Static223.anInt5028 && local63 < 50; local63++) {
local61 = local61 + Static57.aClass3_Sub15_Sub1_3.data[local63] + ",";
}
Static89.report(local61, local19);
TracingException.report(local61, local19);
Static278.processLogout();
return true;
}

39
client/src/main/java/Static102.java
View file

@ -11,32 +11,29 @@ public final class Static102 {
@OriginalMember(owner = "client!hn", name = "W", descriptor = "Lclient!na;")
public static JagString aClass100_545 = null;
@OriginalMember(owner = "client!hn", name = "X", descriptor = "I")
public static int windowMode = 0;
@OriginalMember(owner = "client!hn", name = "Y", descriptor = "I")
@OriginalMember(owner = "client!hn", name = "Y", descriptor = "I")
public static int anInt2680 = 0;
@OriginalMember(owner = "client!hn", name = "d", descriptor = "(I)Lclient!mm;")
public static SoftwareSprite method2071() {
@Pc(13) int local13 = Static26.anIntArray66[0] * Static254.anIntArray488[0];
@Pc(17) byte[] local17 = Static7.aByteArrayArray5[0];
@Pc(13) int local13 = SpriteLoader.innerHeights[0] * SpriteLoader.innerWidths[0];
@Pc(17) byte[] local17 = SpriteLoader.pixels[0];
@Pc(78) SoftwareSprite local78;
if (Static159.aBooleanArray87[0]) {
@Pc(30) byte[] local30 = Static64.aByteArrayArray9[0];
if (SpriteLoader.hasAlpha[0]) {
@Pc(30) byte[] local30 = SpriteLoader.alpha[0];
@Pc(33) int[] local33 = new int[local13];
for (@Pc(35) int local35 = 0; local35 < local13; local35++) {
local33[local35] = (local30[local35] & 0xFF) << 24 | Static259.anIntArray513[local17[local35] & 0xFF];
local33[local35] = (local30[local35] & 0xFF) << 24 | SpriteLoader.palette[local17[local35] & 0xFF];
}
local78 = new SoftwareAlphaSprite(Static124.anInt3080, Static227.anInt5091, Static274.anIntArray440[0], Static269.anIntArray252[0], Static254.anIntArray488[0], Static26.anIntArray66[0], local33);
local78 = new SoftwareAlphaSprite(SpriteLoader.width, SpriteLoader.height, SpriteLoader.xOffsets[0], SpriteLoader.yOffsets[0], SpriteLoader.innerWidths[0], SpriteLoader.innerHeights[0], local33);
} else {
@Pc(83) int[] local83 = new int[local13];
for (@Pc(85) int local85 = 0; local85 < local13; local85++) {
local83[local85] = Static259.anIntArray513[local17[local85] & 0xFF];
local83[local85] = SpriteLoader.palette[local17[local85] & 0xFF];
}
local78 = new SoftwareSprite(Static124.anInt3080, Static227.anInt5091, Static274.anIntArray440[0], Static269.anIntArray252[0], Static254.anIntArray488[0], Static26.anIntArray66[0], local83);
local78 = new SoftwareSprite(SpriteLoader.width, SpriteLoader.height, SpriteLoader.xOffsets[0], SpriteLoader.yOffsets[0], SpriteLoader.innerWidths[0], SpriteLoader.innerHeights[0], local83);
}
Static75.method1631();
SpriteLoader.clear();
return local78;
}
@ -47,24 +44,24 @@ public final class Static102 {
@OriginalMember(owner = "client!hn", name = "a", descriptor = "(Lclient!ve;ILclient!ve;)V")
public static void load(@OriginalArg(0) Js5 arg0, @OriginalArg(2) Js5 arg1) {
Static114.aClass3_Sub2_Sub9_42 = Static127.method2462(Static166.anInt4049, arg1, arg0);
Fonts.p11Full = Static127.method2462(Sprites.p11FullId, arg1, arg0);
if (GlRenderer.enabled) {
Static265.p11FullSoftware = Static122.method2412(Static166.anInt4049, arg0, arg1);
Static265.p11FullSoftware = Static122.method2412(Sprites.p11FullId, arg0, arg1);
} else {
Static265.p11FullSoftware = (SoftwareFont) Static114.aClass3_Sub2_Sub9_42;
Static265.p11FullSoftware = (SoftwareFont) Fonts.p11Full;
}
Static215.aClass3_Sub2_Sub9_32 = Static127.method2462(Static130.anInt3161, arg1, arg0);
Static280.aClass3_Sub2_Sub9_43 = Static127.method2462(Static73.anInt2077, arg1, arg0);
Fonts.p12Full = Static127.method2462(Sprites.p12FullId, arg1, arg0);
Fonts.b12Full = Static127.method2462(Sprites.b12FullId, arg1, arg0);
}
@OriginalMember(owner = "client!hn", name = "a", descriptor = "(IIIZIIIIIIII)Z")
public static boolean method2075(@OriginalArg(0) int arg0, @OriginalArg(1) int arg1, @OriginalArg(2) int arg2, @OriginalArg(3) boolean arg3, @OriginalArg(4) int arg4, @OriginalArg(6) int arg5, @OriginalArg(7) int arg6, @OriginalArg(8) int arg7, @OriginalArg(9) int arg8, @OriginalArg(10) int arg9, @OriginalArg(11) int arg10) {
if (Static173.self.getSize() == 2) {
if (PlayerList.self.getSize() == 2) {
return Static2.method8(arg6, arg7, arg4, arg0, arg9, arg3, arg2, arg1, arg5, arg8, arg10);
} else if (Static173.self.getSize() <= 2) {
} else if (PlayerList.self.getSize() <= 2) {
return Static45.method1171(arg5, arg4, arg10, arg9, arg8, arg2, arg1, arg3, arg7, arg0, arg6);
} else {
return Static96.method1955(arg9, arg6, arg8, arg1, Static173.self.getSize(), arg5, arg7, arg4, arg10, arg2, arg3, arg0);
return Static96.method1955(arg9, arg6, arg8, arg1, PlayerList.self.getSize(), arg5, arg7, arg4, arg10, arg2, arg3, arg0);
}
}
}

98
client/src/main/java/Static103.java
View file

@ -38,7 +38,7 @@ public final class Static103 {
if (local23 == 31) {
local43 = Static159.players[local36];
if (local43 != null) {
Static102.method2075(Static173.self.movementQueueZ[0], 0, 1, false, 0, local43.movementQueueX[0], 1, 0, 2, local43.movementQueueZ[0], Static173.self.movementQueueX[0]);
Static102.method2075(PlayerList.self.movementQueueZ[0], 0, 1, false, 0, local43.movementQueueX[0], 1, 0, 2, local43.movementQueueZ[0], PlayerList.self.movementQueueX[0]);
Static70.type = 2;
Static17.milliseconds = 0;
Static122.x = Static7.clickX;
@ -70,7 +70,7 @@ public final class Static103 {
if (local23 == 19) {
local192 = Static175.npcs[local36];
if (local192 != null) {
Static102.method2075(Static173.self.movementQueueZ[0], 0, 1, false, 0, local192.movementQueueX[0], 1, 0, 2, local192.movementQueueZ[0], Static173.self.movementQueueX[0]);
Static102.method2075(PlayerList.self.movementQueueZ[0], 0, 1, false, 0, local192.movementQueueX[0], 1, 0, 2, local192.movementQueueZ[0], PlayerList.self.movementQueueX[0]);
Static122.x = Static7.clickX;
Static70.type = 2;
Static17.milliseconds = 0;
@ -82,7 +82,7 @@ public final class Static103 {
if (local23 == 17) {
local192 = Static175.npcs[local36];
if (local192 != null) {
Static102.method2075(Static173.self.movementQueueZ[0], 0, 1, false, 0, local192.movementQueueX[0], 1, 0, 2, local192.movementQueueZ[0], Static173.self.movementQueueX[0]);
Static102.method2075(PlayerList.self.movementQueueZ[0], 0, 1, false, 0, local192.movementQueueX[0], 1, 0, 2, local192.movementQueueZ[0], PlayerList.self.movementQueueX[0]);
Static122.x = Static7.clickX;
Static17.milliseconds = 0;
Static70.type = 2;
@ -94,7 +94,7 @@ public final class Static103 {
if (local23 == 44) {
local43 = Static159.players[local36];
if (local43 != null) {
Static102.method2075(Static173.self.movementQueueZ[0], 0, 1, false, 0, local43.movementQueueX[0], 1, 0, 2, local43.movementQueueZ[0], Static173.self.movementQueueX[0]);
Static102.method2075(PlayerList.self.movementQueueZ[0], 0, 1, false, 0, local43.movementQueueX[0], 1, 0, 2, local43.movementQueueZ[0], PlayerList.self.movementQueueX[0]);
Static122.x = Static7.clickX;
Static70.type = 2;
Static25.y = Static60.clickY;
@ -125,7 +125,7 @@ public final class Static103 {
if (local23 == 45) {
local192 = Static175.npcs[local36];
if (local192 != null) {
Static102.method2075(Static173.self.movementQueueZ[0], 0, 1, false, 0, local192.movementQueueX[0], 1, 0, 2, local192.movementQueueZ[0], Static173.self.movementQueueX[0]);
Static102.method2075(PlayerList.self.movementQueueZ[0], 0, 1, false, 0, local192.movementQueueX[0], 1, 0, 2, local192.movementQueueZ[0], PlayerList.self.movementQueueX[0]);
Static122.x = Static7.clickX;
Static70.type = 2;
Static17.milliseconds = 0;
@ -138,12 +138,12 @@ public final class Static103 {
}
@Pc(560) boolean local560;
if (local23 == 18) {
if (Static266.game == 1) {
Static102.method2075(Static173.self.movementQueueZ[0], 0, 1, false, 0, local15, 1, 0, 2, local19, Static173.self.movementQueueX[0]);
if (client.game == 1) {
Static102.method2075(PlayerList.self.movementQueueZ[0], 0, 1, false, 0, local15, 1, 0, 2, local19, PlayerList.self.movementQueueX[0]);
} else {
local560 = Static102.method2075(Static173.self.movementQueueZ[0], 0, 0, false, 0, local15, 0, 0, 2, local19, Static173.self.movementQueueX[0]);
local560 = Static102.method2075(PlayerList.self.movementQueueZ[0], 0, 0, false, 0, local15, 0, 0, 2, local19, PlayerList.self.movementQueueX[0]);
if (!local560) {
Static102.method2075(Static173.self.movementQueueZ[0], 0, 1, false, 0, local15, 1, 0, 2, local19, Static173.self.movementQueueX[0]);
Static102.method2075(PlayerList.self.movementQueueZ[0], 0, 1, false, 0, local15, 1, 0, 2, local19, PlayerList.self.movementQueueX[0]);
}
}
Static122.x = Static7.clickX;
@ -177,7 +177,7 @@ public final class Static103 {
Static6.outboundBuffer.p1isaac(92);
Static6.outboundBuffer.p2leadd(local36);
} else {
method2231(Static186.EMPTY, 0, Static34.concatenate(new JagString[] { Static123.parseInt(local693.objCounts[local15]), Static249.aClass100_1039, Static71.get(local36).name}));
method2231(JagString.EMPTY, 0, JagString.concatenate(new JagString[] { Static123.parseInt(local693.objCounts[local15]), Static249.aClass100_1039, Static71.get(local36).name}));
}
Static72.anInt2043 = 0;
Static257.aClass13_7 = Static5.getComponent(local19);
@ -189,7 +189,7 @@ public final class Static103 {
} else if (local36 == 1) {
if (Static191.staffModLevel > 0 && Keyboard.pressedKeys[Keyboard.KEY_CTRL] && Keyboard.pressedKeys[Keyboard.KEY_SHIFT]) {
Static61.teleport(Static225.originX + local15, Static142.originZ + local19, Static55.level);
} else if (Static102.method2075(Static173.self.movementQueueZ[0], 0, 0, true, 0, local15, 0, 0, 1, local19, Static173.self.movementQueueX[0])) {
} else if (Static102.method2075(PlayerList.self.movementQueueZ[0], 0, 0, true, 0, local15, 0, 0, 1, local19, PlayerList.self.movementQueueX[0])) {
Static6.outboundBuffer.p1(Static1.anInt5);
Static6.outboundBuffer.p1(Static107.anInt2878);
Static6.outboundBuffer.p2((int)Camera.yawTarget);
@ -197,8 +197,8 @@ public final class Static103 {
Static6.outboundBuffer.p1(Static59.anInt1814);
Static6.outboundBuffer.p1(Static273.anInt4130);
Static6.outboundBuffer.p1(89);
Static6.outboundBuffer.p2(Static173.self.xFine);
Static6.outboundBuffer.p2(Static173.self.zFine);
Static6.outboundBuffer.p2(PlayerList.self.xFine);
Static6.outboundBuffer.p2(PlayerList.self.zFine);
Static6.outboundBuffer.p1(Static221.anInt4364);
Static6.outboundBuffer.p1(63);
}
@ -244,7 +244,7 @@ public final class Static103 {
if (local23 == 10) {
local43 = Static159.players[local36];
if (local43 != null) {
Static102.method2075(Static173.self.movementQueueZ[0], 0, 1, false, 0, local43.movementQueueX[0], 1, 0, 2, local43.movementQueueZ[0], Static173.self.movementQueueX[0]);
Static102.method2075(PlayerList.self.movementQueueZ[0], 0, 1, false, 0, local43.movementQueueX[0], 1, 0, 2, local43.movementQueueZ[0], PlayerList.self.movementQueueX[0]);
Static70.type = 2;
Static25.y = Static60.clickY;
Static122.x = Static7.clickX;
@ -286,7 +286,7 @@ public final class Static103 {
if (local23 == 37) {
local43 = Static159.players[local36];
if (local43 != null) {
Static102.method2075(Static173.self.movementQueueZ[0], 0, 1, false, 0, local43.movementQueueX[0], 1, 0, 2, local43.movementQueueZ[0], Static173.self.movementQueueX[0]);
Static102.method2075(PlayerList.self.movementQueueZ[0], 0, 1, false, 0, local43.movementQueueX[0], 1, 0, 2, local43.movementQueueZ[0], PlayerList.self.movementQueueX[0]);
Static17.milliseconds = 0;
Static70.type = 2;
Static25.y = Static60.clickY;
@ -308,12 +308,12 @@ public final class Static103 {
Static250.anInt5444 = local15;
}
if (local23 == 21) {
if (Static266.game == 1) {
Static102.method2075(Static173.self.movementQueueZ[0], 0, 1, false, 0, local15, 1, 0, 2, local19, Static173.self.movementQueueX[0]);
if (client.game == 1) {
Static102.method2075(PlayerList.self.movementQueueZ[0], 0, 1, false, 0, local15, 1, 0, 2, local19, PlayerList.self.movementQueueX[0]);
} else {
local560 = Static102.method2075(Static173.self.movementQueueZ[0], 0, 0, false, 0, local15, 0, 0, 2, local19, Static173.self.movementQueueX[0]);
local560 = Static102.method2075(PlayerList.self.movementQueueZ[0], 0, 0, false, 0, local15, 0, 0, 2, local19, PlayerList.self.movementQueueX[0]);
if (!local560) {
Static102.method2075(Static173.self.movementQueueZ[0], 0, 1, false, 0, local15, 1, 0, 2, local19, Static173.self.movementQueueX[0]);
Static102.method2075(PlayerList.self.movementQueueZ[0], 0, 1, false, 0, local15, 1, 0, 2, local19, PlayerList.self.movementQueueX[0]);
}
}
Static70.type = 2;
@ -328,7 +328,7 @@ public final class Static103 {
if (local23 == 4) {
local192 = Static175.npcs[local36];
if (local192 != null) {
Static102.method2075(Static173.self.movementQueueZ[0], 0, 1, false, 0, local192.movementQueueX[0], 1, 0, 2, local192.movementQueueZ[0], Static173.self.movementQueueX[0]);
Static102.method2075(PlayerList.self.movementQueueZ[0], 0, 1, false, 0, local192.movementQueueX[0], 1, 0, 2, local192.movementQueueZ[0], PlayerList.self.movementQueueX[0]);
Static70.type = 2;
Static17.milliseconds = 0;
Static25.y = Static60.clickY;
@ -349,9 +349,9 @@ public final class Static103 {
Static102.aClass100_545 = Static250.aClass100_1042;
}
if (local693.aBoolean32) {
Static78.aClass100_466 = Static34.concatenate(new JagString[] { local693.aClass100_88, Static204.aClass100_896 });
Static78.aClass100_466 = JagString.concatenate(new JagString[] { local693.aClass100_88, Static204.aClass100_896 });
} else {
Static78.aClass100_466 = Static34.concatenate(new JagString[] { Static42.aClass100_332, local693.aClass100_85, Static204.aClass100_896 });
Static78.aClass100_466 = JagString.concatenate(new JagString[] { MiniMenu.COLOR_GREEN, local693.aClass100_85, Static204.aClass100_896 });
}
}
return;
@ -359,7 +359,7 @@ public final class Static103 {
if (local23 == 29) {
local43 = Static159.players[local36];
if (local43 != null) {
Static102.method2075(Static173.self.movementQueueZ[0], 0, 1, false, 0, local43.movementQueueX[0], 1, 0, 2, local43.movementQueueZ[0], Static173.self.movementQueueX[0]);
Static102.method2075(PlayerList.self.movementQueueZ[0], 0, 1, false, 0, local43.movementQueueX[0], 1, 0, 2, local43.movementQueueZ[0], PlayerList.self.movementQueueX[0]);
Static25.y = Static60.clickY;
Static17.milliseconds = 0;
Static70.type = 2;
@ -380,7 +380,7 @@ public final class Static103 {
if (local23 == 15) {
local43 = Static159.players[local36];
if (local43 != null) {
Static102.method2075(Static173.self.movementQueueZ[0], 0, 1, false, 0, local43.movementQueueX[0], 1, 0, 2, local43.movementQueueZ[0], Static173.self.movementQueueX[0]);
Static102.method2075(PlayerList.self.movementQueueZ[0], 0, 1, false, 0, local43.movementQueueX[0], 1, 0, 2, local43.movementQueueZ[0], PlayerList.self.movementQueueX[0]);
Static17.milliseconds = 0;
Static70.type = 2;
Static122.x = Static7.clickX;
@ -392,12 +392,12 @@ public final class Static103 {
}
}
if (local23 == 34) {
if (Static266.game == 1) {
Static102.method2075(Static173.self.movementQueueZ[0], 0, 1, false, 0, local15, 1, 0, 2, local19, Static173.self.movementQueueX[0]);
if (client.game == 1) {
Static102.method2075(PlayerList.self.movementQueueZ[0], 0, 1, false, 0, local15, 1, 0, 2, local19, PlayerList.self.movementQueueX[0]);
} else {
local560 = Static102.method2075(Static173.self.movementQueueZ[0], 0, 0, false, 0, local15, 0, 0, 2, local19, Static173.self.movementQueueX[0]);
local560 = Static102.method2075(PlayerList.self.movementQueueZ[0], 0, 0, false, 0, local15, 0, 0, 2, local19, PlayerList.self.movementQueueX[0]);
if (!local560) {
Static102.method2075(Static173.self.movementQueueZ[0], 0, 1, false, 0, local15, 1, 0, 2, local19, Static173.self.movementQueueX[0]);
Static102.method2075(PlayerList.self.movementQueueZ[0], 0, 1, false, 0, local15, 1, 0, 2, local19, PlayerList.self.movementQueueX[0]);
}
}
Static122.x = Static7.clickX;
@ -421,7 +421,7 @@ public final class Static103 {
if (local23 == 2) {
local192 = Static175.npcs[local36];
if (local192 != null) {
Static102.method2075(Static173.self.movementQueueZ[0], 0, 1, false, 0, local192.movementQueueX[0], 1, 0, 2, local192.movementQueueZ[0], Static173.self.movementQueueX[0]);
Static102.method2075(PlayerList.self.movementQueueZ[0], 0, 1, false, 0, local192.movementQueueX[0], 1, 0, 2, local192.movementQueueZ[0], PlayerList.self.movementQueueX[0]);
Static25.y = Static60.clickY;
Static70.type = 2;
Static122.x = Static7.clickX;
@ -446,7 +446,7 @@ public final class Static103 {
if (local23 == 26) {
local192 = Static175.npcs[local36];
if (local192 != null) {
Static102.method2075(Static173.self.movementQueueZ[0], 0, 1, false, 0, local192.movementQueueX[0], 1, 0, 2, local192.movementQueueZ[0], Static173.self.movementQueueX[0]);
Static102.method2075(PlayerList.self.movementQueueZ[0], 0, 1, false, 0, local192.movementQueueX[0], 1, 0, 2, local192.movementQueueZ[0], PlayerList.self.movementQueueX[0]);
Static70.type = 2;
Static17.milliseconds = 0;
Static25.y = Static60.clickY;
@ -469,9 +469,9 @@ public final class Static103 {
}
}
if (local23 == 33) {
local560 = Static102.method2075(Static173.self.movementQueueZ[0], 0, 0, false, 0, local15, 0, 0, 2, local19, Static173.self.movementQueueX[0]);
local560 = Static102.method2075(PlayerList.self.movementQueueZ[0], 0, 0, false, 0, local15, 0, 0, 2, local19, PlayerList.self.movementQueueX[0]);
if (!local560) {
Static102.method2075(Static173.self.movementQueueZ[0], 0, 1, false, 0, local15, 1, 0, 2, local19, Static173.self.movementQueueX[0]);
Static102.method2075(PlayerList.self.movementQueueZ[0], 0, 1, false, 0, local15, 1, 0, 2, local19, PlayerList.self.movementQueueX[0]);
}
Static122.x = Static7.clickX;
Static17.milliseconds = 0;
@ -519,7 +519,7 @@ public final class Static103 {
if (local23 == 1) {
local43 = Static159.players[local36];
if (local43 != null) {
Static102.method2075(Static173.self.movementQueueZ[0], 0, 1, false, 0, local43.movementQueueX[0], 1, 0, 2, local43.movementQueueZ[0], Static173.self.movementQueueX[0]);
Static102.method2075(PlayerList.self.movementQueueZ[0], 0, 1, false, 0, local43.movementQueueX[0], 1, 0, 2, local43.movementQueueZ[0], PlayerList.self.movementQueueX[0]);
Static17.milliseconds = 0;
Static25.y = Static60.clickY;
Static70.type = 2;
@ -541,12 +541,12 @@ public final class Static103 {
Static250.anInt5444 = local15;
}
if (local23 == 24) {
if (Static266.game == 1) {
Static102.method2075(Static173.self.movementQueueZ[0], 0, 1, false, 0, local15, 1, 0, 2, local19, Static173.self.movementQueueX[0]);
if (client.game == 1) {
Static102.method2075(PlayerList.self.movementQueueZ[0], 0, 1, false, 0, local15, 1, 0, 2, local19, PlayerList.self.movementQueueX[0]);
} else {
local560 = Static102.method2075(Static173.self.movementQueueZ[0], 0, 0, false, 0, local15, 0, 0, 2, local19, Static173.self.movementQueueX[0]);
local560 = Static102.method2075(PlayerList.self.movementQueueZ[0], 0, 0, false, 0, local15, 0, 0, 2, local19, PlayerList.self.movementQueueX[0]);
if (!local560) {
Static102.method2075(Static173.self.movementQueueZ[0], 0, 1, false, 0, local15, 1, 0, 2, local19, Static173.self.movementQueueX[0]);
Static102.method2075(PlayerList.self.movementQueueZ[0], 0, 1, false, 0, local15, 1, 0, 2, local19, PlayerList.self.movementQueueX[0]);
}
}
Static70.type = 2;
@ -578,7 +578,7 @@ public final class Static103 {
if (local23 == 57) {
local43 = Static159.players[local36];
if (local43 != null) {
Static102.method2075(Static173.self.movementQueueZ[0], 0, 1, false, 0, local43.movementQueueX[0], 1, 0, 2, local43.movementQueueZ[0], Static173.self.movementQueueX[0]);
Static102.method2075(PlayerList.self.movementQueueZ[0], 0, 1, false, 0, local43.movementQueueX[0], 1, 0, 2, local43.movementQueueZ[0], PlayerList.self.movementQueueX[0]);
Static70.type = 2;
Static25.y = Static60.clickY;
Static122.x = Static7.clickX;
@ -595,7 +595,7 @@ public final class Static103 {
Static260.anInt5014 = 1;
Static274.anInt4997 = local36;
Static43.redraw(local693);
Static34.aClass100_203 = Static34.concatenate(new JagString[] { Static8.aClass100_32, Static71.get(local36).name, Static204.aClass100_896 });
Static34.aClass100_203 = JagString.concatenate(new JagString[] { Static8.aClass100_32, Static71.get(local36).name, Static204.aClass100_896 });
if (Static34.aClass100_203 == null) {
Static34.aClass100_203 = Static92.aClass100_510;
}
@ -620,7 +620,7 @@ public final class Static103 {
if (local23 == 30) {
local43 = Static159.players[local36];
if (local43 != null) {
Static102.method2075(Static173.self.movementQueueZ[0], 0, 1, false, 0, local43.movementQueueX[0], 1, 0, 2, local43.movementQueueZ[0], Static173.self.movementQueueX[0]);
Static102.method2075(PlayerList.self.movementQueueZ[0], 0, 1, false, 0, local43.movementQueueX[0], 1, 0, 2, local43.movementQueueZ[0], PlayerList.self.movementQueueX[0]);
Static17.milliseconds = 0;
Static122.x = Static7.clickX;
Static25.y = Static60.clickY;
@ -639,9 +639,9 @@ public final class Static103 {
Static250.anInt5444 = local15;
}
if (local23 == 39) {
local560 = Static102.method2075(Static173.self.movementQueueZ[0], 0, 0, false, 0, local15, 0, 0, 2, local19, Static173.self.movementQueueX[0]);
local560 = Static102.method2075(PlayerList.self.movementQueueZ[0], 0, 0, false, 0, local15, 0, 0, 2, local19, PlayerList.self.movementQueueX[0]);
if (!local560) {
Static102.method2075(Static173.self.movementQueueZ[0], 0, 1, false, 0, local15, 1, 0, 2, local19, Static173.self.movementQueueX[0]);
Static102.method2075(PlayerList.self.movementQueueZ[0], 0, 1, false, 0, local15, 1, 0, 2, local19, PlayerList.self.movementQueueX[0]);
}
Static25.y = Static60.clickY;
Static122.x = Static7.clickX;
@ -676,7 +676,7 @@ public final class Static103 {
if (local23 == 6) {
local43 = Static159.players[local36];
if (local43 != null) {
Static102.method2075(Static173.self.movementQueueZ[0], 0, 1, false, 0, local43.movementQueueX[0], 1, 0, 2, local43.movementQueueZ[0], Static173.self.movementQueueX[0]);
Static102.method2075(PlayerList.self.movementQueueZ[0], 0, 1, false, 0, local43.movementQueueX[0], 1, 0, 2, local43.movementQueueZ[0], PlayerList.self.movementQueueX[0]);
Static25.y = Static60.clickY;
Static17.milliseconds = 0;
Static70.type = 2;
@ -686,12 +686,12 @@ public final class Static103 {
}
}
if (local23 == 20) {
if (Static266.game == 1) {
Static102.method2075(Static173.self.movementQueueZ[0], 0, 1, false, 0, local15, 1, 0, 2, local19, Static173.self.movementQueueX[0]);
if (client.game == 1) {
Static102.method2075(PlayerList.self.movementQueueZ[0], 0, 1, false, 0, local15, 1, 0, 2, local19, PlayerList.self.movementQueueX[0]);
} else {
local560 = Static102.method2075(Static173.self.movementQueueZ[0], 0, 0, false, 0, local15, 0, 0, 2, local19, Static173.self.movementQueueX[0]);
local560 = Static102.method2075(PlayerList.self.movementQueueZ[0], 0, 0, false, 0, local15, 0, 0, 2, local19, PlayerList.self.movementQueueX[0]);
if (!local560) {
Static102.method2075(Static173.self.movementQueueZ[0], 0, 1, false, 0, local15, 1, 0, 2, local19, Static173.self.movementQueueX[0]);
Static102.method2075(PlayerList.self.movementQueueZ[0], 0, 1, false, 0, local15, 1, 0, 2, local19, PlayerList.self.movementQueueX[0]);
}
}
Static25.y = Static60.clickY;
@ -706,7 +706,7 @@ public final class Static103 {
if (local23 == 16) {
local192 = Static175.npcs[local36];
if (local192 != null) {
Static102.method2075(Static173.self.movementQueueZ[0], 0, 1, false, 0, local192.movementQueueX[0], 1, 0, 2, local192.movementQueueZ[0], Static173.self.movementQueueX[0]);
Static102.method2075(PlayerList.self.movementQueueZ[0], 0, 1, false, 0, local192.movementQueueX[0], 1, 0, 2, local192.movementQueueZ[0], PlayerList.self.movementQueueX[0]);
Static122.x = Static7.clickX;
Static17.milliseconds = 0;
Static25.y = Static60.clickY;
@ -739,7 +739,7 @@ public final class Static103 {
@Pc(31) int local31 = local15.anInt3526;
@Pc(34) int local34 = local15.anInt3529;
@Pc(37) int local37 = local15.anInt3525;
if (!Static71.fogEnabled) {
if (!Preferences.fogEnabled) {
local34 = 0;
}
@Pc(44) float local44 = local15.aFloat17;

4
client/src/main/java/Static104.java
View file

@ -15,8 +15,8 @@ public final class Static104 {
arg0.anInt3417 = 0;
return;
}
if (arg0.anInt3369 != -1 && arg0.anInt3420 == 0) {
@Pc(40) SeqType local40 = Static36.get(arg0.anInt3369);
if (arg0.seqId != -1 && arg0.anInt3420 == 0) {
@Pc(40) SeqType local40 = Static36.get(arg0.seqId);
if (arg0.anInt3405 > 0 && local40.anInt5363 == 0) {
arg0.anInt3417++;
return;

2
client/src/main/java/Static106.java
View file

@ -3,7 +3,7 @@ import org.openrs2.deob.annotation.OriginalMember;
public final class Static106 {
@OriginalMember(owner = "client!ic", name = "a", descriptor = "Lclient!qf;")
public static Sprite aClass3_Sub2_Sub1_7;
public static Sprite compass;
@OriginalMember(owner = "client!ic", name = "n", descriptor = "I")
public static int anInt2871;

14
client/src/main/java/Static107.java
View file

@ -9,9 +9,6 @@ public final class Static107 {
@OriginalMember(owner = "client!id", name = "k", descriptor = "I")
public static int anInt2878;
@OriginalMember(owner = "client!id", name = "l", descriptor = "Lclient!jb;")
public static Js5NetQueue js5NetQueue;
@OriginalMember(owner = "client!id", name = "b", descriptor = "I")
public static int anInt2875 = -1;
@ -24,19 +21,16 @@ public final class Static107 {
@OriginalMember(owner = "client!id", name = "e", descriptor = "[I")
public static final int[] anIntArray259 = new int[14];
@OriginalMember(owner = "client!id", name = "f", descriptor = "Z")
public static boolean clean = false;
@OriginalMember(owner = "client!id", name = "j", descriptor = "Lclient!of;")
public static QuickChatCommandDecoder anInterface3_1 = null;
@OriginalMember(owner = "client!id", name = "b", descriptor = "(I)V")
public static void loop() {
if (Static147.soundChannel != null) {
Static147.soundChannel.loop();
if (client.soundChannel != null) {
client.soundChannel.loop();
}
if (Static11.musicChannel != null) {
Static11.musicChannel.loop();
if (client.musicChannel != null) {
client.musicChannel.loop();
}
}

10
client/src/main/java/Static11.java
View file

@ -4,16 +4,10 @@ import org.openrs2.deob.annotation.Pc;
public final class Static11 {
@OriginalMember(owner = "client!ba", name = "D", descriptor = "Lclient!vh;")
public static AudioChannel musicChannel;
@OriginalMember(owner = "client!ba", name = "w", descriptor = "I")
@OriginalMember(owner = "client!ba", name = "w", descriptor = "I")
public static int anInt384 = 0;
@OriginalMember(owner = "client!ba", name = "x", descriptor = "Z")
public static boolean flickeringEffectsOn = true;
@OriginalMember(owner = "client!ba", name = "e", descriptor = "(I)V")
@OriginalMember(owner = "client!ba", name = "e", descriptor = "(I)V")
public static void method443() {
Static262.headModels.clear();
}

10
client/src/main/java/Static112.java
View file

@ -32,7 +32,7 @@ public final class Static112 {
} else if (GlRenderer.enabled) {
Static46.method1182(local3, local9, local13, 20, Static40.anInt1275, 256 - Static111.anInt2910);
} else {
Static129.method2484(local3, local9, local13, 20, Static40.anInt1275, 256 - Static111.anInt2910);
SoftwareRaster.method2484(local3, local9, local13, 20, Static40.anInt1275, 256 - Static111.anInt2910);
}
}
@Pc(112) int local112;
@ -45,11 +45,11 @@ public final class Static112 {
Static181.aClass3_Sub2_Sub1_9.method1423(local3, local9);
Static181.aClass3_Sub2_Sub1_9.method1421(local3 + local13 - Static181.aClass3_Sub2_Sub1_9.anInt1867, local9);
}
Static280.aClass3_Sub2_Sub9_43.method2857(LocalizedText.CHOOSE_OPTION, local3 + 3, local9 + 14, Static195.anInt4581, -1);
Fonts.b12Full.method2857(LocalizedText.CHOOSE_OPTION, local3 + 3, local9 + 14, Static195.anInt4581, -1);
if (GlRenderer.enabled) {
Static46.method1182(local3, local9 + 20, local13, local11 - 20, Static40.anInt1275, 256 - Static111.anInt2910);
} else {
Static129.method2484(local3, local9 + 20, local13, local11 - 20, Static40.anInt1275, 256 - Static111.anInt2910);
SoftwareRaster.method2484(local3, local9 + 20, local13, local11 - 20, Static40.anInt1275, 256 - Static111.anInt2910);
}
local114 = Static223.anInt5032;
local112 = Static215.anInt4873;
@ -61,7 +61,7 @@ public final class Static112 {
if (GlRenderer.enabled) {
Static46.method1182(local3, local219 - 13, local13, 16, Static251.anInt5457, 256 - Static232.anInt5208);
} else {
Static129.method2484(local3, local219 - 13, local13, 16, Static251.anInt5457, 256 - Static232.anInt5208);
SoftwareRaster.method2484(local3, local219 - 13, local13, 16, Static251.anInt5457, 256 - Static232.anInt5208);
}
}
}
@ -107,7 +107,7 @@ public final class Static112 {
if (local3 < local112 && local13 + local3 > local112 && local219 - 13 < local114 && local114 < local219 + 3) {
local418 = Static262.anInt5752;
}
Static280.aClass3_Sub2_Sub9_43.method2857(Static269.method2228(local203), local3 + 3, local219, local418, 0);
Fonts.b12Full.method2857(Static269.method2228(local203), local3 + 3, local219, local418, 0);
}
Static121.method2407(Static183.anInt4271, Static229.anInt5138, Static13.anInt436, Static24.anInt761);
}

5
client/src/main/java/Static113.java
View file

@ -7,10 +7,7 @@ public final class Static113 {
@OriginalMember(owner = "client!il", name = "O", descriptor = "I")
public static int anInt4612;
@OriginalMember(owner = "client!il", name = "I", descriptor = "I")
public static int brightness = 3;
@OriginalMember(owner = "client!il", name = "a", descriptor = "(III)V")
@OriginalMember(owner = "client!il", name = "a", descriptor = "(III)V")
public static void method3556(@OriginalArg(0) int arg0, @OriginalArg(1) int arg1, @OriginalArg(2) int arg2) {
Static158.aBoolean187 = true;
Static160.anInt3902 = arg0;

22
client/src/main/java/Static114.java
View file

@ -5,12 +5,6 @@ import org.openrs2.deob.annotation.Pc;
public final class Static114 {
@OriginalMember(owner = "client!j", name = "x", descriptor = "Lclient!rk;")
public static Font aClass3_Sub2_Sub9_42;
@OriginalMember(owner = "client!j", name = "v", descriptor = "I")
public static int anInt5831 = 0;
@OriginalMember(owner = "client!j", name = "z", descriptor = "Lclient!na;")
public static final JagString aClass100_1099 = Static28.parse("::shiftclick");
@ -33,24 +27,24 @@ public final class Static114 {
if (arg0 == null) {
return null;
} else {
@Pc(22) SoftwareFont local22 = new SoftwareFont(arg0, Static274.anIntArray440, Static269.anIntArray252, Static254.anIntArray488, Static26.anIntArray66, Static7.aByteArrayArray5);
Static75.method1631();
@Pc(22) SoftwareFont local22 = new SoftwareFont(arg0, SpriteLoader.xOffsets, SpriteLoader.yOffsets, SpriteLoader.innerWidths, SpriteLoader.innerHeights, SpriteLoader.pixels);
SpriteLoader.clear();
return local22;
}
}
@OriginalMember(owner = "client!j", name = "a", descriptor = "(BZLclient!na;)V")
public static void drawTextOnScreen(@OriginalArg(1) boolean arg0, @OriginalArg(2) JagString arg1) {
@Pc(24) int local24 = Static215.aClass3_Sub2_Sub9_32.method2856(arg1, 250);
@Pc(31) int local31 = Static215.aClass3_Sub2_Sub9_32.getParagraphLineCount(arg1, 250) * 13;
@Pc(24) int local24 = Fonts.p12Full.method2856(arg1, 250);
@Pc(31) int local31 = Fonts.p12Full.getParagraphLineCount(arg1, 250) * 13;
if (GlRenderer.enabled) {
Static46.method1186(6, 6, local24 + 4 + 4, local31 + 8, 0);
Static46.method1179(6, 6, local24 + 4 + 4, local31 + 4 + 4, 16777215);
} else {
Static129.method2495(6, 6, local24 + 4 + 4, local31 + 8, 0);
Static129.method2483(6, 6, local24 + 8, 4 + 4 + local31, 16777215);
SoftwareRaster.fillRect(6, 6, local24 + 4 + 4, local31 + 8, 0);
SoftwareRaster.drawRect(6, 6, local24 + 8, 4 + 4 + local31, 16777215);
}
Static215.aClass3_Sub2_Sub9_32.method2852(arg1, 10, 10, local24, local31, 16777215, -1, 1, 1, 0);
Fonts.p12Full.method2852(arg1, 10, 10, local24, local31, 16777215, -1, 1, 1, 0);
Static133.method4012(6, local24 + 8, 6, local31 + 4 + 4);
if (!arg0) {
Static121.method2407(10, 10, local31, local24);
@ -59,7 +53,7 @@ public final class Static114 {
} else {
try {
@Pc(159) Graphics local159 = GameShell.canvas.getGraphics();
Static260.frameBuffer.draw(local159);
client.frameBuffer.draw(local159);
} catch (@Pc(167) Exception local167) {
GameShell.canvas.repaint();
}

40
client/src/main/java/Static115.java
View file

@ -57,10 +57,10 @@ public final class Static115 {
@OriginalMember(owner = "client!ja", name = "a", descriptor = "(IIIIB)V")
public static void method2310(@OriginalArg(0) int arg0, @OriginalArg(1) int arg1, @OriginalArg(2) int arg2, @OriginalArg(3) int arg3) {
if (Static70.type == 1) {
Static240.aClass3_Sub2_Sub1Array10[Static17.milliseconds / 100].method1423(Static122.x - 8, Static25.y + -8);
Sprites.crosses[Static17.milliseconds / 100].method1423(Static122.x - 8, Static25.y + -8);
}
if (Static70.type == 2) {
Static240.aClass3_Sub2_Sub1Array10[Static17.milliseconds / 100 + 4].method1423(Static122.x - 8, Static25.y + -8);
Sprites.crosses[Static17.milliseconds / 100 + 4].method1423(Static122.x - 8, Static25.y + -8);
}
Static256.method4392();
}
@ -142,24 +142,24 @@ public final class Static115 {
@OriginalMember(owner = "client!ja", name = "a", descriptor = "(Z)V")
public static void clear() {
Static215.aClass3_Sub2_Sub9_32 = null;
Static213.aClass3_Sub2_Sub1Array8 = null;
Static240.aClass3_Sub2_Sub1Array10 = null;
Static159.aClass36Array12 = null;
Fonts.p12Full = null;
Sprites.hitmarks = null;
Sprites.crosses = null;
Sprites.nameIcons = null;
Static265.p11FullSoftware = null;
Static173.aClass3_Sub2_Sub1_Sub1Array9 = null;
Static67.aClass3_Sub2_Sub1Array4 = null;
Static149.aClass3_Sub2_Sub1Array7 = null;
Static138.aClass3_Sub2_Sub1Array5 = null;
Static280.aClass3_Sub2_Sub9_43 = null;
Static106.aClass3_Sub2_Sub1_7 = null;
Static139.aClass3_Sub2_Sub1Array6 = null;
Static114.aClass3_Sub2_Sub9_42 = null;
Static84.aClass3_Sub2_Sub1_4 = null;
Static116.aClass3_Sub2_Sub1Array3 = null;
Static277.aClass3_Sub2_Sub1Array12 = null;
Static276.aClass3_Sub2_Sub1Array11 = null;
Static219.aClass3_Sub2_Sub1Array9 = null;
Static241.aClass36Array16 = null;
Sprites.mapfunctions = null;
Static67.mapfuncs = null;
Sprites.mapmarkhints = null;
Sprites.headiconPrayers = null;
Fonts.b12Full = null;
Static106.compass = null;
Sprites.mapdots = null;
Fonts.p11Full = null;
Sprites.mapflags = null;
Sprites.hitbars = null;
Static277.hintMapEdge = null;
Sprites.headhints = null;
Sprites.headiconPks = null;
Sprites.scrollbars = null;
}
}

53
client/src/main/java/Static116.java
View file

@ -4,9 +4,6 @@ import org.openrs2.deob.annotation.Pc;
public final class Static116 {
@OriginalMember(owner = "client!jb", name = "k", descriptor = "[Lclient!qf;")
public static Sprite[] aClass3_Sub2_Sub1Array3;
@OriginalMember(owner = "client!jb", name = "c", descriptor = "Lclient!na;")
public static final JagString aClass100_583 = Static28.parse("(Y<)4col>");
@ -30,36 +27,36 @@ public final class Static116 {
@OriginalMember(owner = "client!jb", name = "a", descriptor = "(IZ)V")
public static void clear(@OriginalArg(1) boolean arg0) {
Static90.aByteArrayArrayArray8 = null;
Static83.anIntArrayArrayArray3 = null;
WorldMap.aByteArrayArrayArray8 = null;
WorldMap.underlayColors = null;
Static24.component = null;
Static34.aByteArrayArrayArray3 = null;
Static145.anIntArray330 = null;
Static125.aByteArrayArrayArray10 = null;
if (arg0 && Static269.aClass3_Sub2_Sub4_2 != null) {
Static153.aClass100_724 = Static269.aClass3_Sub2_Sub4_2.aClass100_138;
WorldMap.aByteArrayArrayArray3 = null;
WorldMap.overlayColors = null;
WorldMap.aByteArrayArrayArray10 = null;
if (arg0 && WorldMap.currentMap != null) {
Static153.aClass100_724 = WorldMap.currentMap.group;
} else {
Static153.aClass100_724 = null;
}
Static70.aByteArrayArrayArray7 = null;
Static229.aByteArrayArrayArray12 = null;
Static58.anIntArrayArrayArray5 = null;
Static248.anIntArrayArrayArray17 = null;
Static41.anInt1309 = 0;
Static269.aClass3_Sub2_Sub4_2 = null;
Static145.aClass69_84.clear();
Static203.aClass134_1 = null;
Static217.anInt4901 = -1;
Static130.aClass41_2 = null;
Static160.aClass41_4 = null;
Static152.aClass41_3 = null;
Static270.aClass41_9 = null;
Static273.aClass41_7 = null;
Static169.aClass41_5 = null;
Static130.aClass41_1 = null;
Static203.aClass41_8 = null;
WorldMap.aByteArrayArrayArray7 = null;
WorldMap.aByteArrayArrayArray12 = null;
WorldMap.scenery = null;
WorldMap.anIntArrayArrayArray17 = null;
WorldMap.loadPercentage = 0;
WorldMap.currentMap = null;
WorldMap.mapElements.clear();
WorldMap.labels = null;
WorldMap.anInt4901 = -1;
WorldMap.font22 = null;
WorldMap.font30 = null;
WorldMap.font12 = null;
WorldMap.font26 = null;
WorldMap.font11 = null;
WorldMap.font14 = null;
WorldMap.font17 = null;
WorldMap.font19 = null;
Static70.aClass3_Sub2_Sub1_2 = null;
Static142.anInt3482 = -1;
WorldMap.anInt3482 = -1;
Static153.aClass3_Sub2_Sub1_Sub1_2 = null;
}
}

22
client/src/main/java/Static118.java
View file

@ -91,28 +91,6 @@ public final class Static118 {
}
}
@OriginalMember(owner = "client!jd", name = "a", descriptor = "(II[Lclient!na;I)Lclient!na;")
public static JagString method2355(@OriginalArg(0) int arg0, @OriginalArg(1) int arg1, @OriginalArg(2) JagString[] arg2) {
@Pc(5) int local5 = 0;
for (@Pc(7) int local7 = 0; local7 < arg1; local7++) {
if (arg2[arg0 + local7] == null) {
arg2[local7 + arg0] = Static193.aClass100_853;
}
local5 += arg2[local7 + arg0].length;
}
@Pc(39) byte[] local39 = new byte[local5];
@Pc(41) int local41 = 0;
for (@Pc(43) int local43 = 0; local43 < arg1; local43++) {
@Pc(52) JagString local52 = arg2[local43 + arg0];
Static289.copy(local52.chars, 0, local39, local41, local52.length);
local41 += local52.length;
}
@Pc(71) JagString local71 = new JagString();
local71.length = local5;
local71.chars = local39;
return local71;
}
@OriginalMember(owner = "client!jd", name = "a", descriptor = "(II)I")
public static int method2356(@OriginalArg(1) int arg0) {
return arg0 & 0x7F;

19
client/src/main/java/Static119.java
View file

@ -4,9 +4,6 @@ import org.openrs2.deob.annotation.Pc;
public final class Static119 {
@OriginalMember(owner = "client!je", name = "W", descriptor = "Lclient!ve;")
public static Js5 aClass153_44;
@OriginalMember(owner = "client!je", name = "eb", descriptor = "[I")
public static int[] anIntArray282;
@ -65,11 +62,11 @@ public final class Static119 {
@OriginalMember(owner = "client!je", name = "j", descriptor = "(I)I")
public static int method2385() {
if (Static203.aClass134_1 == null) {
if (WorldMap.labels == null) {
return -1;
}
while (Static232.anInt5212 < Static203.aClass134_1.anInt5074) {
if (Static203.aClass134_1.method3897(Static232.anInt5212)) {
while (Static232.anInt5212 < WorldMap.labels.anInt5074) {
if (WorldMap.labels.method3897(Static232.anInt5212)) {
return Static232.anInt5212++;
}
Static232.anInt5212++;
@ -94,10 +91,10 @@ public final class Static119 {
@OriginalMember(owner = "client!je", name = "a", descriptor = "(IIIII)V")
public static void method2387(@OriginalArg(1) int arg0, @OriginalArg(2) int arg1, @OriginalArg(3) int arg2, @OriginalArg(4) int arg3) {
Static13.anInt435 = Static48.anInt1449 * arg2 / arg0;
Static28.anInt919 = Static181.anInt4296 * arg1 / arg3;
Static142.anInt3482 = -1;
Static217.anInt4901 = -1;
Static38.method965();
WorldMap.anInt435 = WorldMap.width * arg2 / arg0;
WorldMap.anInt919 = WorldMap.length * arg1 / arg3;
WorldMap.anInt3482 = -1;
WorldMap.anInt4901 = -1;
WorldMap.method965();
}
}

41
client/src/main/java/Static12.java
View file

@ -12,10 +12,7 @@ public final class Static12 {
@OriginalMember(owner = "client!bb", name = "m", descriptor = "Lclient!na;")
public static final JagString aClass100_73 = Static28.parse("runes");
@OriginalMember(owner = "client!bb", name = "n", descriptor = "I")
public static int musicVolume = 255;
@OriginalMember(owner = "client!bb", name = "t", descriptor = "[[B")
@OriginalMember(owner = "client!bb", name = "t", descriptor = "[[B")
public static final byte[][] aByteArrayArray2 = new byte[250][];
@OriginalMember(owner = "client!bb", name = "A", descriptor = "Lclient!na;")
@ -26,37 +23,37 @@ public final class Static12 {
@OriginalMember(owner = "client!bb", name = "a", descriptor = "(I)V")
public static void method447() {
if (Static83.aFloat3 < Static138.aFloat14) {
Static83.aFloat3 = (float) ((double) Static83.aFloat3 + (double) Static83.aFloat3 / 30.0D);
if (Static138.aFloat14 < Static83.aFloat3) {
Static83.aFloat3 = Static138.aFloat14;
if (WorldMap.zoom < WorldMap.targetZoom) {
WorldMap.zoom = (float) ((double) WorldMap.zoom + (double) WorldMap.zoom / 30.0D);
if (WorldMap.targetZoom < WorldMap.zoom) {
WorldMap.zoom = WorldMap.targetZoom;
}
Static38.method965();
} else if (Static138.aFloat14 < Static83.aFloat3) {
Static83.aFloat3 = (float) ((double) Static83.aFloat3 - (double) Static83.aFloat3 / 30.0D);
if (Static138.aFloat14 > Static83.aFloat3) {
Static83.aFloat3 = Static138.aFloat14;
WorldMap.method965();
} else if (WorldMap.targetZoom < WorldMap.zoom) {
WorldMap.zoom = (float) ((double) WorldMap.zoom - (double) WorldMap.zoom / 30.0D);
if (WorldMap.targetZoom > WorldMap.zoom) {
WorldMap.zoom = WorldMap.targetZoom;
}
Static38.method965();
WorldMap.method965();
}
if (Static142.anInt3482 == -1 || Static217.anInt4901 == -1) {
if (WorldMap.anInt3482 == -1 || WorldMap.anInt4901 == -1) {
return;
}
@Pc(60) int local60 = Static142.anInt3482 - Static13.anInt435;
@Pc(60) int local60 = WorldMap.anInt3482 - WorldMap.anInt435;
if (local60 < 2 || local60 > 2) {
local60 >>= 0x4;
}
@Pc(78) int local78 = Static217.anInt4901 - Static28.anInt919;
@Pc(78) int local78 = WorldMap.anInt4901 - WorldMap.anInt919;
if (local78 < 2 || local78 > 2) {
local78 >>= 0x4;
}
Static28.anInt919 -= -local78;
Static13.anInt435 += local60;
WorldMap.anInt919 -= -local78;
WorldMap.anInt435 += local60;
if (local60 == 0 && local78 == 0) {
Static142.anInt3482 = -1;
Static217.anInt4901 = -1;
WorldMap.anInt3482 = -1;
WorldMap.anInt4901 = -1;
}
Static38.method965();
WorldMap.method965();
}
}

10
client/src/main/java/Static120.java
View file

@ -55,7 +55,7 @@ public final class Static120 {
@OriginalMember(owner = "client!jf", name = "a", descriptor = "(IIIIIII)V")
public static void method2388(@OriginalArg(0) int arg0, @OriginalArg(1) int arg1, @OriginalArg(2) int arg2, @OriginalArg(3) int arg3, @OriginalArg(4) int arg4, @OriginalArg(5) int arg5, @OriginalArg(6) int arg6) {
if (!Static178.highDetailLighting) {
if (!Preferences.highDetailLighting) {
return;
}
if (arg0 == 1 && arg5 > 0) {
@ -96,7 +96,7 @@ public final class Static120 {
@OriginalMember(owner = "client!jf", name = "a", descriptor = "(IIIIIIII)V")
public static void method2391(@OriginalArg(0) int arg0, @OriginalArg(1) int arg1, @OriginalArg(2) int arg2, @OriginalArg(3) int arg3, @OriginalArg(4) int arg4, @OriginalArg(5) int arg5, @OriginalArg(6) int arg6, @OriginalArg(7) int arg7) {
if (!Static178.highDetailLighting || anInt3031 == arg3 && anInt3033 == arg4 && anInt3029 == arg5 && anInt3035 == arg6 && anInt3030 == arg7) {
if (!Preferences.highDetailLighting || anInt3031 == arg3 && anInt3033 == arg4 && anInt3029 == arg5 && anInt3035 == arg6 && anInt3030 == arg7) {
return;
}
@Pc(20) int local20;
@ -179,7 +179,7 @@ public final class Static120 {
@OriginalMember(owner = "client!jf", name = "a", descriptor = "(IIIIII)V")
public static void method2393(@OriginalArg(0) int arg0, @OriginalArg(1) int arg1, @OriginalArg(2) int arg2, @OriginalArg(3) int arg3, @OriginalArg(4) int arg4, @OriginalArg(5) int arg5) {
if (!Static178.highDetailLighting || anInt3031 == arg3 && anInt3033 == arg4 && anInt3029 == arg5 && anInt3035 == arg4 && anInt3030 == arg5) {
if (!Preferences.highDetailLighting || anInt3031 == arg3 && anInt3033 == arg4 && anInt3029 == arg5 && anInt3035 == arg4 && anInt3030 == arg5) {
return;
}
@Pc(20) int local20;
@ -301,7 +301,7 @@ public final class Static120 {
@OriginalMember(owner = "client!jf", name = "a", descriptor = "(IIIII)V")
public static void method2397(@OriginalArg(0) int arg0, @OriginalArg(1) int arg1, @OriginalArg(2) int arg2, @OriginalArg(3) int arg3, @OriginalArg(4) int arg4) {
if (!Static178.highDetailLighting) {
if (!Preferences.highDetailLighting) {
return;
}
label43: for (@Pc(4) int local4 = 0; local4 < 4; local4++) {
@ -367,7 +367,7 @@ public final class Static120 {
@OriginalMember(owner = "client!jf", name = "a", descriptor = "(II[[[Lclient!bj;)V")
public static void method2402(@OriginalArg(0) int arg0, @OriginalArg(1) int arg1, @OriginalArg(2) Tile[][][] arg2) {
if (!Static178.highDetailLighting) {
if (!Preferences.highDetailLighting) {
return;
}
@Pc(4) GL2 local4 = GlRenderer.gl;

19
client/src/main/java/Static121.java
View file

@ -10,10 +10,7 @@ public final class Static121 {
@OriginalMember(owner = "client!jg", name = "b", descriptor = "I")
public static int anInt3039;
@OriginalMember(owner = "client!jg", name = "c", descriptor = "Lclient!en;")
public static BufferedFile uid;
@OriginalMember(owner = "client!jg", name = "g", descriptor = "I")
@OriginalMember(owner = "client!jg", name = "g", descriptor = "I")
public static int anInt3041;
@OriginalMember(owner = "client!jg", name = "j", descriptor = "Lclient!ve;")
@ -22,21 +19,11 @@ public final class Static121 {
@OriginalMember(owner = "client!jg", name = "e", descriptor = "Z")
public static boolean aBoolean154 = false;
@OriginalMember(owner = "client!jg", name = "a", descriptor = "(I)[Lclient!ek;")
public static SoftwareIndexedSprite[] method2406() {
@Pc(2) SoftwareIndexedSprite[] local2 = new SoftwareIndexedSprite[Static165.anInt4038];
for (@Pc(8) int local8 = 0; local8 < Static165.anInt4038; local8++) {
local2[local8] = new SoftwareIndexedSprite(Static124.anInt3080, Static227.anInt5091, Static274.anIntArray440[local8], Static269.anIntArray252[local8], Static254.anIntArray488[local8], Static26.anIntArray66[local8], Static7.aByteArrayArray5[local8], Static259.anIntArray513);
}
Static75.method1631();
return local2;
}
@OriginalMember(owner = "client!jg", name = "a", descriptor = "(IBIII)V")
public static void method2407(@OriginalArg(0) int arg0, @OriginalArg(2) int arg1, @OriginalArg(3) int arg2, @OriginalArg(4) int arg3) {
for (@Pc(3) int local3 = 0; local3 < Static24.anInt766; local3++) {
for (@Pc(3) int local3 = 0; local3 < InterfaceList.anInt766; local3++) {
if (arg0 < Static264.anIntArray410[local3] + Static224.anIntArray443[local3] && arg0 + arg3 > Static264.anIntArray410[local3] && Static50.anIntArray133[local3] + Static67.anIntArray320[local3] > arg1 && Static50.anIntArray133[local3] < arg2 + arg1) {
Static31.rectangleRedraw[local3] = true;
InterfaceList.rectangleRedraw[local3] = true;
}
}
}

6
client/src/main/java/Static122.java
View file

@ -61,7 +61,7 @@ public final class Static122 {
if (local13.sounds != null) {
local13.anInt2034 = local13.anInt2032 + (int) (Math.random() * (double) (local13.anInt2040 - local13.anInt2032));
}
Static3.aClass69_135.method2282(local13);
Static3.aClass69_135.addTail(local13);
} else if (arg3 != null) {
local13.npc = arg3;
@Pc(138) NpcType local138 = arg3.type;
@ -75,7 +75,7 @@ public final class Static122 {
local13.sound = Static112.getSound(arg3);
local13.radius = local138.soundRadius * 128;
}
Static152.aClass69_87.method2282(local13);
Static152.aClass69_87.addTail(local13);
} else if (arg6 != null) {
local13.player = arg6;
local13.anInt2037 = (arg6.getSize() + arg4) * 128;
@ -88,6 +88,6 @@ public final class Static122 {
@OriginalMember(owner = "client!jh", name = "a", descriptor = "(IILclient!ve;Lclient!ve;I)Lclient!dd;")
public static SoftwareFont method2412(@OriginalArg(0) int arg0, @OriginalArg(2) Js5 arg1, @OriginalArg(3) Js5 arg2) {
return Static234.method4016(arg2, 0, arg0) ? Static114.method4635(arg1.getFile(arg0, 0)) : null;
return SpriteLoader.decode(arg2, 0, arg0) ? Static114.method4635(arg1.getFile(arg0, 0)) : null;
}
}

40
client/src/main/java/Static123.java
View file

@ -4,10 +4,7 @@ import org.openrs2.deob.annotation.Pc;
public final class Static123 {
@OriginalMember(owner = "client!jj", name = "d", descriptor = "Lclient!na;")
public static final JagString aClass100_592 = Static28.parse("headicons_pk");
@OriginalMember(owner = "client!jj", name = "e", descriptor = "I")
@OriginalMember(owner = "client!jj", name = "e", descriptor = "I")
public static int anInt3058 = 0;
@OriginalMember(owner = "client!jj", name = "g", descriptor = "Lclient!na;")
@ -18,6 +15,8 @@ public final class Static123 {
@OriginalMember(owner = "client!jj", name = "m", descriptor = "Lclient!na;")
public static final JagString aClass100_594 = Static28.parse("<)4col>");
@OriginalMember(owner = "client!ml", name = "K", descriptor = "I")
public static int anInt3947;
@OriginalMember(owner = "client!jj", name = "a", descriptor = "(BI)Lclient!lk;")
public static StructType method2417(@OriginalArg(1) int arg0) {
@ -28,7 +27,7 @@ public final class Static123 {
@Pc(26) byte[] local26 = Static23.aClass153_11.getFile(26, arg0);
local10 = new StructType();
if (local26 != null) {
local10.method2806(new Buffer(local26));
local10.decode(new Buffer(local26));
}
Static231.aClass54_13.put(local10, (long) arg0);
return local10;
@ -36,9 +35,9 @@ public final class Static123 {
@OriginalMember(owner = "client!jj", name = "a", descriptor = "(Z)V")
public static void topBannerRefresh() {
if (!Static249.advertSuppressed && Static83.modeWhere != 2) {
if (!client.advertSuppressed && client.modeWhere != 2) {
try {
Static206.aClass100_900.method3157(Static215.instance);
Static206.aClass100_900.method3157(client.instance);
} catch (@Pc(26) Throwable local26) {
}
}
@ -92,8 +91,8 @@ public final class Static123 {
}
local10.anInt4454 = (local10.anInt4458 - Static217.anInt4903 << 8) / local158;
local10.anInt4450 = (local10.anInt4449 - Static217.anInt4903 << 8) / local158;
local10.anInt4459 = (local10.anInt4444 - Static162.anInt3947 << 8) / local158;
local10.anInt4463 = (local10.anInt4447 - Static162.anInt3947 << 8) / local158;
local10.anInt4459 = (local10.anInt4444 - anInt3947 << 8) / local158;
local10.anInt4463 = (local10.anInt4447 - anInt3947 << 8) / local158;
Static247.aClass120Array2[Static215.anInt4870++] = local10;
}
}
@ -128,13 +127,13 @@ public final class Static123 {
}
local10.anInt4448 = (local10.anInt4460 - Static149.anInt3555 << 8) / local158;
local10.anInt4456 = (local10.anInt4445 - Static149.anInt3555 << 8) / local158;
local10.anInt4459 = (local10.anInt4444 - Static162.anInt3947 << 8) / local158;
local10.anInt4463 = (local10.anInt4447 - Static162.anInt3947 << 8) / local158;
local10.anInt4459 = (local10.anInt4444 - anInt3947 << 8) / local158;
local10.anInt4463 = (local10.anInt4447 - anInt3947 << 8) / local158;
Static247.aClass120Array2[Static215.anInt4870++] = local10;
}
}
} else if (local10.anInt4453 == 4) {
local14 = local10.anInt4444 - Static162.anInt3947;
local14 = local10.anInt4444 - anInt3947;
if (local14 > 128) {
local115 = local10.anInt4461 + Static277.tileVisibilityDistance - Static193.anInt4539;
if (local115 < 0) {
@ -188,7 +187,7 @@ public final class Static123 {
} else if (local4 < 0) {
return Static229.aClass100_972;
} else if (local4 > 9) {
return Static42.aClass100_332;
return MiniMenu.COLOR_GREEN;
} else if (local4 > 6) {
return Static6.aClass100_18;
} else if (local4 <= 3) {
@ -198,21 +197,6 @@ public final class Static123 {
}
}
@OriginalMember(owner = "client!jj", name = "a", descriptor = "(B)[F")
public static float[] method2422() {
@Pc(3) float local3 = Static161.method3068() + Static161.method3059();
@Pc(9) int local9 = Static161.method3064();
@Pc(18) float local18 = (float) (local9 >> 16 & 0xFF) / 255.0F;
Static251.aFloatArray28[3] = 1.0F;
@Pc(37) float local37 = (float) (local9 >> 8 & 0xFF) / 255.0F;
@Pc(39) float local39 = 0.58823526F;
@Pc(46) float local46 = (float) (local9 & 0xFF) / 255.0F;
Static251.aFloatArray28[2] = Static257.aFloatArray2[2] * local46 * local39 * local3;
Static251.aFloatArray28[0] = Static257.aFloatArray2[0] * local18 * local39 * local3;
Static251.aFloatArray28[1] = local3 * local39 * local37 * Static257.aFloatArray2[1];
return Static251.aFloatArray28;
}
@OriginalMember(owner = "client!jj", name = "b", descriptor = "(BI)Lclient!na;")
public static JagString parseInt(@OriginalArg(1) int arg0) {
return Static198.method1025(false, arg0);

13
client/src/main/java/Static124.java
View file

@ -4,16 +4,7 @@ import org.openrs2.deob.annotation.Pc;
public final class Static124 {
@OriginalMember(owner = "client!jk", name = "x", descriptor = "I")
public static int anInt3080;
@OriginalMember(owner = "client!jk", name = "B", descriptor = "Lclient!ma;")
public static BufferedSocket socket;
@OriginalMember(owner = "client!jk", name = "J", descriptor = "I")
public static int anInt3083;
@OriginalMember(owner = "client!jk", name = "p", descriptor = "I")
@OriginalMember(owner = "client!jk", name = "p", descriptor = "I")
public static int anInt3075 = -1;
@OriginalMember(owner = "client!jk", name = "y", descriptor = "Z")
@ -36,7 +27,7 @@ public final class Static124 {
@OriginalMember(owner = "client!jk", name = "a", descriptor = "(ILclient!na;)Lclient!bn;")
public static Map method2434(@OriginalArg(1) JagString arg0) {
for (@Pc(15) Map local15 = (Map) Static228.aClass69_120.method2289(); local15 != null; local15 = (Map) Static228.aClass69_120.method2288()) {
if (local15.aClass100_138.strEquals(arg0)) {
if (local15.group.strEquals(arg0)) {
return local15;
}
}

10
client/src/main/java/Static125.java
View file

@ -4,10 +4,7 @@ import org.openrs2.deob.annotation.Pc;
public final class Static125 {
@OriginalMember(owner = "client!jl", name = "I", descriptor = "[[[B")
public static byte[][][] aByteArrayArrayArray10;
@OriginalMember(owner = "client!jl", name = "v", descriptor = "I")
@OriginalMember(owner = "client!jl", name = "v", descriptor = "I")
public static int anInt3096 = 0;
@OriginalMember(owner = "client!jl", name = "x", descriptor = "Lclient!n;")
@ -19,10 +16,7 @@ public final class Static125 {
@OriginalMember(owner = "client!jl", name = "H", descriptor = "I")
public static int worldId = -1;
@OriginalMember(owner = "client!jl", name = "J", descriptor = "I")
public static int soundEffectVolume = 127;
@OriginalMember(owner = "client!jl", name = "a", descriptor = "(ILclient!ve;Lclient!ve;)V")
@OriginalMember(owner = "client!jl", name = "a", descriptor = "(ILclient!ve;Lclient!ve;)V")
public static void init(@OriginalArg(1) Js5 arg0, @OriginalArg(2) Js5 arg1) {
Static14.modelsArchive = arg0;
Static216.aClass153_31 = arg1;

14
client/src/main/java/Static126.java
View file

@ -17,12 +17,12 @@ public final class Static126 {
@OriginalMember(owner = "client!jm", name = "a", descriptor = "(Z)V")
public static void method2460() {
if (Static154.topLevelInterface != -1) {
Static96.method1949(Static154.topLevelInterface);
if (InterfaceList.topLevelInterface != -1) {
Static96.method1949(InterfaceList.topLevelInterface);
}
for (@Pc(15) int local15 = 0; local15 < Static24.anInt766; local15++) {
for (@Pc(15) int local15 = 0; local15 < InterfaceList.anInt766; local15++) {
if (Static186.aBooleanArray100[local15]) {
Static31.rectangleRedraw[local15] = true;
InterfaceList.rectangleRedraw[local15] = true;
}
Static223.aBooleanArray116[local15] = Static186.aBooleanArray100[local15];
Static186.aBooleanArray100[local15] = false;
@ -34,14 +34,14 @@ public final class Static126 {
Static263.aBoolean299 = true;
}
Static214.anInt5574 = -1;
if (Static154.topLevelInterface != -1) {
Static24.anInt766 = 0;
if (InterfaceList.topLevelInterface != -1) {
InterfaceList.anInt766 = 0;
Static9.method182();
}
if (GlRenderer.enabled) {
Static46.method1177();
} else {
Static129.method2503();
SoftwareRaster.method2503();
}
Static178.anInt4247 = 0;
}

65
client/src/main/java/Static127.java
View file

@ -11,9 +11,6 @@ public final class Static127 {
@OriginalMember(owner = "client!k", name = "l", descriptor = "[I")
public static int[] anIntArray292;
@OriginalMember(owner = "client!k", name = "c", descriptor = "Z")
public static boolean aBoolean159 = false;
@OriginalMember(owner = "client!k", name = "i", descriptor = "I")
public static int anInt3125 = 0;
@ -25,18 +22,18 @@ public final class Static127 {
@OriginalMember(owner = "client!k", name = "a", descriptor = "(IIBLclient!ve;Lclient!ve;)Lclient!rk;")
public static Font method2462(@OriginalArg(1) int arg0, @OriginalArg(3) Js5 arg1, @OriginalArg(4) Js5 arg2) {
return Static234.method4016(arg1, 0, arg0) ? Static29.method799(arg2.getFile(arg0, 0)) : null;
return SpriteLoader.decode(arg1, 0, arg0) ? Static29.method799(arg2.getFile(arg0, 0)) : null;
}
@OriginalMember(owner = "client!k", name = "a", descriptor = "(IIIIZIZ)V")
public static void method2463(@OriginalArg(0) int arg0, @OriginalArg(1) int arg1, @OriginalArg(2) int arg2, @OriginalArg(3) int arg3, @OriginalArg(4) boolean arg4, @OriginalArg(5) int arg5) {
if (Static80.anInt4701 == arg2 && arg1 == Static52.anInt1695 && (Static41.anInt1316 == arg0 || Static138.allLevelsAreVisible())) {
if (Static80.anInt4701 == arg2 && arg1 == Static52.anInt1695 && (Static41.anInt1316 == arg0 || SceneGraph.allLevelsAreVisible())) {
return;
}
Static80.anInt4701 = arg2;
Static52.anInt1695 = arg1;
Static41.anInt1316 = arg0;
if (Static138.allLevelsAreVisible()) {
if (SceneGraph.allLevelsAreVisible()) {
Static41.anInt1316 = 0;
}
if (arg4) {
@ -52,7 +49,7 @@ public final class Static127 {
Static158.aClass3_Sub2_Sub4_3 = Static29.method803(Static80.anInt4701 * 8, Static52.anInt1695 * 8);
@Pc(81) int local81 = Static142.originZ - local53;
@Pc(86) int local86 = Static225.originX - local55;
Static235.mapFunctionGroup = null;
Static235.mapElementList = null;
@Pc(96) int local96;
@Pc(103) Npc local103;
@Pc(109) int local109;
@ -100,7 +97,7 @@ public final class Static127 {
}
}
Static55.level = arg0;
Static173.self.method1265(arg5, false, arg3);
PlayerList.self.method1265(arg5, false, arg3);
@Pc(322) byte local322 = 104;
@Pc(324) byte local324 = 0;
@Pc(326) byte local326 = 0;
@ -162,14 +159,14 @@ public final class Static127 {
@OriginalMember(owner = "client!k", name = "a", descriptor = "(B)Lclient!da;")
public static DelayedStateChange poll() {
@Pc(10) DelayedStateChange local10 = (DelayedStateChange) Static215.serverQueue.method795();
@Pc(10) DelayedStateChange local10 = (DelayedStateChange) DelayedStateChange.serverQueue.method795();
if (local10 != null) {
local10.unlink();
local10.method4365();
return local10;
}
do {
local10 = (DelayedStateChange) Static140.clientQueue.method795();
local10 = (DelayedStateChange) DelayedStateChange.clientQueue.method795();
if (local10 == null) {
return null;
}
@ -207,7 +204,7 @@ public final class Static127 {
if (local14 == -1) {
return arg1;
}
@Pc(246) JagString local246 = Static186.EMPTY;
@Pc(246) JagString local246 = JagString.EMPTY;
if (Static232.aClass212_5 != null) {
local246 = Static181.method3341(Static232.aClass212_5.intArg2);
try {
@ -218,22 +215,22 @@ public final class Static127 {
} catch (@Pc(274) UnsupportedEncodingException local274) {
}
}
arg1 = Static34.concatenate(new JagString[] { arg1.substring(local14, 0), local246, arg1.substring(local14 + 4) });
arg1 = JagString.concatenate(new JagString[] { arg1.substring(local14, 0), local246, arg1.substring(local14 + 4) });
}
}
arg1 = Static34.concatenate(new JagString[] { arg1.substring(local14, 0), Static262.method4510(Static273.method3212(4, arg0)), arg1.substring(local14 + 2) });
arg1 = JagString.concatenate(new JagString[] { arg1.substring(local14, 0), Static262.method4510(Static273.method3212(4, arg0)), arg1.substring(local14 + 2) });
}
}
arg1 = Static34.concatenate(new JagString[] { arg1.substring(local14, 0), Static262.method4510(Static273.method3212(3, arg0)), arg1.substring(local14 + 2) });
arg1 = JagString.concatenate(new JagString[] { arg1.substring(local14, 0), Static262.method4510(Static273.method3212(3, arg0)), arg1.substring(local14 + 2) });
}
}
arg1 = Static34.concatenate(new JagString[] { arg1.substring(local14, 0), Static262.method4510(Static273.method3212(2, arg0)), arg1.substring(local14 + 2) });
arg1 = JagString.concatenate(new JagString[] { arg1.substring(local14, 0), Static262.method4510(Static273.method3212(2, arg0)), arg1.substring(local14 + 2) });
}
}
arg1 = Static34.concatenate(new JagString[] { arg1.substring(local14, 0), Static262.method4510(Static273.method3212(1, arg0)), arg1.substring(local14 + 2) });
arg1 = JagString.concatenate(new JagString[] { arg1.substring(local14, 0), Static262.method4510(Static273.method3212(1, arg0)), arg1.substring(local14 + 2) });
}
}
arg1 = Static34.concatenate(new JagString[] { arg1.substring(local14, 0), Static262.method4510(Static273.method3212(0, arg0)), arg1.substring(local14 + 2) });
arg1 = JagString.concatenate(new JagString[] { arg1.substring(local14, 0), Static262.method4510(Static273.method3212(0, arg0)), arg1.substring(local14 + 2) });
}
}
@ -250,7 +247,7 @@ public final class Static127 {
}
local29 = Runtime.getRuntime();
local38 = (int) ((local29.totalMemory() - local29.freeMemory()) / 1024L);
Static103.method2231(null, 0, Static34.concatenate(new JagString[] { Static202.aClass100_892, Static123.parseInt(local38), Static17.aClass100_101 }));
Static103.method2231(null, 0, JagString.concatenate(new JagString[] { Static202.aClass100_892, Static123.parseInt(local38), Static17.aClass100_101 }));
}
@Pc(117) int local117;
if (arg0.equalsIgnoreCase(Static154.aClass100_735)) {
@ -260,36 +257,36 @@ public final class Static127 {
}
local29 = Runtime.getRuntime();
local38 = (int) ((local29.totalMemory() - local29.freeMemory()) / 1024L);
Static103.method2231(null, 0, Static34.concatenate(new JagString[] { Static203.aClass100_893, Static123.parseInt(local38), Static17.aClass100_101 }));
Static103.method2231(null, 0, JagString.concatenate(new JagString[] { Static203.aClass100_893, Static123.parseInt(local38), Static17.aClass100_101 }));
Static16.method501();
Static119.method2380();
for (local117 = 0; local117 < 10; local117++) {
System.gc();
}
local38 = (int) ((local29.totalMemory() - local29.freeMemory()) / 1024L);
Static103.method2231(null, 0, Static34.concatenate(new JagString[] { Static270.aClass100_1093, Static123.parseInt(local38), Static17.aClass100_101 }));
Static103.method2231(null, 0, JagString.concatenate(new JagString[] { Static270.aClass100_1093, Static123.parseInt(local38), Static17.aClass100_101 }));
}
if (arg0.equalsIgnoreCase(Static240.aClass100_1009)) {
Static103.method2231(null, 0, Static34.concatenate(new JagString[] { Static44.aClass100_335, Static123.parseInt(Static198.method1029()) }));
Static103.method2231(null, 0, JagString.concatenate(new JagString[] { Static44.aClass100_335, Static123.parseInt(Static198.method1029()) }));
}
if (GlRenderer.enabled && arg0.equalsIgnoreCase(Static201.aClass100_406)) {
System.out.println("oncard_geometry:" + Static63.anInt1945);
System.out.println("oncard_2d:" + Static63.onCard2d);
System.out.println("oncard_texture:" + Static63.onCardTexture);
}
if (arg0.equalsIgnoreCase(Static257.aClass100_99)) {
if (arg0.equalsIgnoreCase(Cheat.CLIENTDROP)) {
Static175.method3279();
}
if (arg0.equalsIgnoreCase(Static279.aClass100_1106)) {
Static107.js5NetQueue.quit();
client.js5NetQueue.quit();
}
if (arg0.equalsIgnoreCase(Static185.aClass100_823)) {
Static107.js5NetQueue.method2319();
if (arg0.equalsIgnoreCase(Cheat.JS5DROP)) {
client.js5NetQueue.method2319();
}
if (arg0.equalsIgnoreCase(Static165.aClass100_775)) {
GameShell.signLink.breakConnection();
Static124.socket.breakConnection();
Static107.js5NetQueue.method2323();
Protocol.socket.breakConnection();
client.js5NetQueue.method2323();
}
if (arg0.equalsIgnoreCase(Static114.aClass100_1100)) {
GameShell.replaceCanvas = true;
@ -298,10 +295,10 @@ public final class Static127 {
Static196.setGameState(25);
}
if (arg0.equalsIgnoreCase(Static107.aClass100_566)) {
Static43.displayFps = true;
Cheat.displayFps = true;
}
if (arg0.equalsIgnoreCase(Static61.aClass100_422)) {
Static43.displayFps = false;
Cheat.displayFps = false;
}
if (arg0.equalsIgnoreCase(Static96.aClass100_522)) {
Static241.setWindowMode(false, 0, -1, -1);
@ -325,11 +322,11 @@ public final class Static127 {
}
}
if (arg0.startsWith(Static241.aClass100_1088)) {
Static76.setParticles(arg0.substring(15).parseInt());
Static203.savePreferences(GameShell.signLink);
Preferences.setParticles(arg0.substring(15).parseInt());
Preferences.write(GameShell.signLink);
Static18.serverUpdatedPreferences = false;
}
if (arg0.startsWith(Static170.aClass100_623) && Static83.modeWhere != 0) {
if (arg0.startsWith(Static170.aClass100_623) && client.modeWhere != 0) {
Static115.method2312(arg0.substring(6).parseInt());
}
if (arg0.equalsIgnoreCase(Static272.aClass100_990)) {
@ -337,7 +334,7 @@ public final class Static127 {
}
if (arg0.startsWith(Static211.aClass100_232)) {
Static199.rectDebug = arg0.substring(12).method3144().parseInt();
Static103.method2231(null, 0, Static34.concatenate(new JagString[] { Static276.aClass100_1096, Static123.parseInt(Static199.rectDebug) }));
Static103.method2231(null, 0, JagString.concatenate(new JagString[] { Static276.aClass100_1096, Static123.parseInt(Static199.rectDebug) }));
}
if (arg0.equalsIgnoreCase(Static181.aClass100_810)) {
Static121.aBoolean154 = true;
@ -356,7 +353,7 @@ public final class Static127 {
Static154.aClass100_736.method3129();
Static172.shiftClick = false;
} else {
Static43.aClass100_333.method3129();
Cheat.aClass100_333.method3129();
Static172.shiftClick = true;
}
}

5
client/src/main/java/Static128.java
View file

@ -7,10 +7,7 @@ public final class Static128 {
@OriginalMember(owner = "client!ka", name = "r", descriptor = "[I")
public static int[] anIntArray293;
@OriginalMember(owner = "client!ka", name = "u", descriptor = "I")
public static int anInt3143;
@OriginalMember(owner = "client!ka", name = "q", descriptor = "Lclient!ih;")
@OriginalMember(owner = "client!ka", name = "q", descriptor = "Lclient!ih;")
public static final LinkedList aClass69_77 = new LinkedList();
@OriginalMember(owner = "client!ka", name = "t", descriptor = "[I")

67
client/src/main/java/Static13.java
View file

@ -1,17 +1,10 @@
import java.awt.Color;
import java.awt.Font;
import java.awt.Graphics;
import org.openrs2.deob.annotation.OriginalArg;
import org.openrs2.deob.annotation.OriginalMember;
import org.openrs2.deob.annotation.Pc;
public final class Static13 {
@OriginalMember(owner = "client!bc", name = "W", descriptor = "I")
public static int anInt435;
@OriginalMember(owner = "client!bc", name = "X", descriptor = "I")
@OriginalMember(owner = "client!bc", name = "X", descriptor = "I")
public static int anInt436;
@OriginalMember(owner = "client!bc", name = "Z", descriptor = "I")
@ -27,16 +20,16 @@ public final class Static13 {
public static JagString method471() {
@Pc(32) JagString local32;
if (Static260.anInt5014 == 1 && Static231.anInt5204 < 2) {
local32 = Static34.concatenate(new JagString[] { LocalizedText.USE, LocalizedText.MINISEPARATOR, Static34.aClass100_203, Static225.aClass100_961 });
local32 = JagString.concatenate(new JagString[] { LocalizedText.USE, LocalizedText.MINISEPARATOR, Static34.aClass100_203, Static225.aClass100_961 });
} else if (Static241.aBoolean302 && Static231.anInt5204 < 2) {
local32 = Static34.concatenate(new JagString[] { Static102.aClass100_545, LocalizedText.MINISEPARATOR, Static78.aClass100_466, Static225.aClass100_961 });
local32 = JagString.concatenate(new JagString[] { Static102.aClass100_545, LocalizedText.MINISEPARATOR, Static78.aClass100_466, Static225.aClass100_961 });
} else if (Static172.shiftClick && Keyboard.pressedKeys[Keyboard.KEY_SHIFT] && Static231.anInt5204 > 2) {
local32 = Static269.method2228(Static231.anInt5204 - 2);
} else {
local32 = Static269.method2228(Static231.anInt5204 - 1);
}
if (Static231.anInt5204 > 2) {
local32 = Static34.concatenate(new JagString[] { local32, Static1.aClass100_2, Static123.parseInt(Static231.anInt5204 - 2), LocalizedText.MOREOPTIONS});
local32 = JagString.concatenate(new JagString[] { local32, Static1.aClass100_2, Static123.parseInt(Static231.anInt5204 - 2), LocalizedText.MOREOPTIONS});
}
return local32;
}
@ -49,56 +42,4 @@ public final class Static13 {
}
}
@OriginalMember(owner = "client!bc", name = "a", descriptor = "(Ljava/awt/Color;ZZLclient!na;I)V")
public static void render(@OriginalArg(0) Color arg0, @OriginalArg(2) boolean arg1, @OriginalArg(3) JagString arg2, @OriginalArg(4) int arg3) {
try {
@Pc(6) Graphics local6 = GameShell.canvas.getGraphics();
if (Static222.aFont1 == null) {
Static222.aFont1 = new Font("Helvetica", 1, 13);
Static240.aFontMetrics1 = GameShell.canvas.getFontMetrics(Static222.aFont1);
}
if (arg1) {
local6.setColor(Color.black);
local6.fillRect(0, 0, GameShell.canvasWidth, GameShell.canvasHeight);
}
if (arg0 == null) {
arg0 = new Color(140, 17, 17);
}
try {
if (Static149.anImage3 == null) {
Static149.anImage3 = GameShell.canvas.createImage(304, 34);
}
@Pc(56) Graphics local56 = Static149.anImage3.getGraphics();
local56.setColor(arg0);
local56.drawRect(0, 0, 303, 33);
local56.fillRect(2, 2, arg3 * 3, 30);
local56.setColor(Color.black);
local56.drawRect(1, 1, 301, 31);
local56.fillRect(arg3 * 3 + 2, 2, 300 - arg3 * 3, 30);
local56.setFont(Static222.aFont1);
local56.setColor(Color.white);
arg2.method3112(22, (304 - arg2.method3155(Static240.aFontMetrics1)) / 2, local56);
local6.drawImage(Static149.anImage3, GameShell.canvasWidth / 2 - 152, GameShell.canvasHeight / 2 + -18, null);
} catch (@Pc(134) Exception local134) {
@Pc(140) int local140 = GameShell.canvasWidth / 2 - 152;
@Pc(146) int local146 = GameShell.canvasHeight / 2 - 18;
local6.setColor(arg0);
local6.drawRect(local140, local146, 303, 33);
local6.fillRect(local140 + 2, local146 + 2, arg3 * 3, 30);
local6.setColor(Color.black);
local6.drawRect(local140 + 1, local146 - -1, 301, 31);
local6.fillRect(arg3 * 3 + local140 + 2, local146 + 2, 300 - arg3 * 3, 30);
local6.setFont(Static222.aFont1);
local6.setColor(Color.white);
arg2.method3112(local146 + 22, local140 + (-arg2.method3155(Static240.aFontMetrics1) + 304) / 2, local6);
}
if (Static278.mainLoadPrimaryText != null) {
local6.setFont(Static222.aFont1);
local6.setColor(Color.white);
Static278.mainLoadPrimaryText.method3112(GameShell.canvasHeight / 2 - 26, GameShell.canvasWidth / 2 - Static278.mainLoadPrimaryText.method3155(Static240.aFontMetrics1) / 2, local6);
}
} catch (@Pc(252) Exception local252) {
GameShell.canvas.repaint();
}
}
}

13
client/src/main/java/Static130.java
View file

@ -3,29 +3,20 @@ import org.openrs2.deob.annotation.OriginalMember;
public final class Static130 {
@OriginalMember(owner = "client!kc", name = "n", descriptor = "Lclient!fd;")
public static WorldMapFont aClass41_1;
@OriginalMember(owner = "client!kc", name = "o", descriptor = "[[[Lclient!bj;")
public static Tile[][][] aClass3_Sub5ArrayArrayArray1;
@OriginalMember(owner = "client!kc", name = "p", descriptor = "[I")
public static int[] anIntArray299;
@OriginalMember(owner = "client!kc", name = "t", descriptor = "I")
public static int anInt3161;
@OriginalMember(owner = "client!kc", name = "w", descriptor = "Lclient!ve;")
@OriginalMember(owner = "client!kc", name = "w", descriptor = "Lclient!ve;")
public static Js5 js5Archive6;
@OriginalMember(owner = "client!kc", name = "C", descriptor = "Lclient!fd;")
public static WorldMapFont aClass41_2;
@OriginalMember(owner = "client!kc", name = "s", descriptor = "[I")
public static final int[] anIntArray300 = new int[] { 1, 1, 1, 1, 4, 1, 1, 5, 6, 1, 5, 0, 7, 0, 4, 1, 7, 2, 1, 1, 6, 1, 1, 3, 6, 1, 7, 0, 0, 6, 7, 0, 1, 7, 6, 1, 1, 1, 5, 4, 3, 2, 1, 1, 0, 4, 1, 5 };
@OriginalMember(owner = "client!kc", name = "a", descriptor = "(ILclient!ve;I)Lclient!qf;")
public static Sprite loadSpriteAutoDetect(@OriginalArg(1) Js5 arg0, @OriginalArg(2) int arg1) {
return Static254.method4346(arg0, arg1) ? Static82.method1764() : null;
return SpriteLoader.decode(arg0, arg1) ? SpriteLoader.method1764() : null;
}
}

20
client/src/main/java/Static131.java
View file

@ -8,19 +8,13 @@ public final class Static131 {
@OriginalMember(owner = "client!kd", name = "ub", descriptor = "I")
public static int anInt3255;
@OriginalMember(owner = "client!kd", name = "Cb", descriptor = "I")
public static int anInt3261;
@OriginalMember(owner = "client!kd", name = "mb", descriptor = "[Lclient!cl;")
@OriginalMember(owner = "client!kd", name = "mb", descriptor = "[Lclient!cl;")
public static final AnimFrameset[] aClass3_Sub2_Sub7Array5 = new AnimFrameset[14];
@OriginalMember(owner = "client!kd", name = "ob", descriptor = "I")
public static int anInt3251 = 0;
@OriginalMember(owner = "client!kd", name = "rb", descriptor = "I")
public static final int anInt3254 = (int) (Math.random() * 17.0D) - 8;
@OriginalMember(owner = "client!kd", name = "sb", descriptor = "[I")
@OriginalMember(owner = "client!kd", name = "sb", descriptor = "[I")
public static final int[] anIntArray307 = new int[] { 1, 1, 0, 0, 0, 8, 0, 0, 8 };
@OriginalMember(owner = "client!kd", name = "yb", descriptor = "S")
@ -61,12 +55,6 @@ public final class Static131 {
}
}
@OriginalMember(owner = "client!kd", name = "a", descriptor = "(Ljava/lang/String;B)V")
public static void method2577(@OriginalArg(0) String arg0) {
System.out.println("Bad " + arg0 + ", Usage: worldid, <live/rc/wip>, <english/german>, <game0/game1>");
System.exit(1);
}
@OriginalMember(owner = "client!kd", name = "a", descriptor = "([[F[[II[[FI[ILclient!fj;BLclient!gi;[[FI)V")
public static void method2578(@OriginalArg(0) float[][] arg0, @OriginalArg(1) int[][] arg1, @OriginalArg(2) int arg2, @OriginalArg(3) float[][] arg3, @OriginalArg(4) int arg4, @OriginalArg(5) int[] arg5, @OriginalArg(6) Class45 arg6, @OriginalArg(8) Light arg7, @OriginalArg(9) float[][] arg8, @OriginalArg(10) int arg9) {
@Pc(7) int[] local7 = new int[arg5.length / 2];
@ -146,8 +134,4 @@ public final class Static131 {
}
}
@OriginalMember(owner = "client!kd", name = "a", descriptor = "(IIILclient!ve;)[Lclient!qf;")
public static Sprite[] method2580(@OriginalArg(2) int arg0, @OriginalArg(3) Js5 arg1) {
return Static234.method4016(arg1, 0, arg0) ? Static33.method870() : null;
}
}

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