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

Started organizing CS2/Protocol-related functions

Browse source
This commit is contained in:
Pazaz 2022-04-25 04:02:02 -04:00
parent 46740027df
commit ef6a5d7385
268 changed files with 5936 additions and 6093 deletions
Download patch file Download diff file Expand all files Collapse all files

72
client/src/main/java/AreaSoundManager.java
View file

@ -3,9 +3,12 @@ import org.openrs2.deob.annotation.OriginalMember;
import org.openrs2.deob.annotation.Pc; import org.openrs2.deob.annotation.Pc;
public class AreaSoundManager { public class AreaSoundManager {
@OriginalMember(owner = "client!he", name = "ab", descriptor = "Lclient!sc;")
public static final HashTable aClass133_7 = new HashTable(16);
@OriginalMember(owner = "client!wc", name = "a", descriptor = "(Lclient!e;I)V") @OriginalMember(owner = "client!wc", name = "a", descriptor = "(Lclient!e;I)V")
public static void remove(@OriginalArg(0) Player arg0) { public static void remove(@OriginalArg(0) Player arg0) {
@Pc(10) AreaSound local10 = (AreaSound) Static93.aClass133_7.get(arg0.username.encode37()); @Pc(10) AreaSound local10 = (AreaSound) aClass133_7.get(arg0.username.encode37());
if (local10 == null) { if (local10 == null) {
return; return;
} }
@ -15,4 +18,71 @@ public class AreaSoundManager {
} }
local10.unlink(); local10.unlink();
} }
@OriginalMember(owner = "client!jh", name = "a", descriptor = "(IZLclient!pb;ILclient!km;IILclient!e;)V")
public static void add(@OriginalArg(0) int arg0, @OriginalArg(2) LocType arg1, @OriginalArg(3) int arg2, @OriginalArg(4) Npc arg3, @OriginalArg(5) int arg4, @OriginalArg(6) int arg5, @OriginalArg(7) Player arg6) {
@Pc(13) AreaSound local13 = new AreaSound();
local13.anInt2029 = arg0 * 128;
local13.anInt2041 = arg4 * 128;
local13.anInt2033 = arg5;
if (arg1 != null) {
local13.sounds = arg1.anIntArray381;
local13.radius = arg1.soundRadius * 128;
local13.anInt2040 = arg1.anInt4414;
local13.locType = arg1;
local13.sound = arg1.sound;
local13.anInt2032 = arg1.anInt4419;
@Pc(57) int local57 = arg1.width;
@Pc(60) int local60 = arg1.length;
if (arg2 == 1 || arg2 == 3) {
local57 = arg1.length;
local60 = arg1.width;
}
local13.anInt2028 = (local60 + arg0) * 128;
local13.anInt2037 = (arg4 + local57) * 128;
if (arg1.multiLocs != null) {
local13.multiLocOrNpc = true;
local13.update();
}
if (local13.sounds != null) {
local13.anInt2034 = local13.anInt2032 + (int) (Math.random() * (double) (local13.anInt2040 - local13.anInt2032));
}
Static3.aClass69_135.addTail(local13);
} else if (arg3 != null) {
local13.npc = arg3;
@Pc(138) NpcType local138 = arg3.type;
if (local138.multiNpcs != null) {
local13.multiLocOrNpc = true;
local138 = local138.getMultiNpc();
}
if (local138 != null) {
local13.anInt2028 = (local138.soze + arg0) * 128;
local13.anInt2037 = (arg4 + local138.soze) * 128;
local13.sound = Static112.getSound(arg3);
local13.radius = local138.soundRadius * 128;
}
Static152.aClass69_87.addTail(local13);
} else if (arg6 != null) {
local13.player = arg6;
local13.anInt2037 = (arg6.getSize() + arg4) * 128;
local13.anInt2028 = (arg6.getSize() + arg0) * 128;
local13.sound = Static140.getSound(arg6);
local13.radius = arg6.soundRadius * 128;
aClass133_7.put(local13, arg6.username.encode37());
}
}
@OriginalMember(owner = "client!hc", name = "a", descriptor = "(Lclient!km;Z)V")
public static void remove(@OriginalArg(0) Npc arg0) {
for (@Pc(13) AreaSound local13 = (AreaSound) Static152.aClass69_87.method2289(); local13 != null; local13 = (AreaSound) Static152.aClass69_87.method2288()) {
if (arg0 == local13.npc) {
if (local13.primaryStream != null) {
client.soundStream.removeSubStream(local13.primaryStream);
local13.primaryStream = null;
}
local13.unlink();
return;
}
}
}
} }

98
client/src/main/java/AttachLocRequest.java Normal file
View file

@ -0,0 +1,98 @@
import org.openrs2.deob.annotation.OriginalMember;
import org.openrs2.deob.annotation.Pc;
public class AttachLocRequest {
@OriginalMember(owner = "client!ph", name = "a", descriptor = "(B)V")
public static void loop() {
while (true) {
@Pc(17) Class3_Sub8 local17 = (Class3_Sub8) Static128.aClass69_77.removeHead();
if (local17 == null) {
return;
}
@Pc(40) PathingEntity local40;
@Pc(29) int local29;
if (local17.anInt1192 < 0) {
local29 = -local17.anInt1192 - 1;
if (local29 == PlayerList.selfId) {
local40 = PlayerList.self;
} else {
local40 = PlayerList.players[local29];
}
} else {
local29 = local17.anInt1192 - 1;
local40 = NpcList.npcs[local29];
}
if (local40 != null) {
@Pc(63) LocType local63 = LocTypeList.get(local17.anInt1189);
if (Player.level < 3) {
}
@Pc(86) int local86;
@Pc(83) int local83;
if (local17.anInt1206 == 1 || local17.anInt1206 == 3) {
local83 = local63.width;
local86 = local63.length;
} else {
local86 = local63.width;
local83 = local63.length;
}
@Pc(103) int local103 = (local86 + 1 >> 1) + local17.anInt1190;
@Pc(110) int local110 = (local86 >> 1) + local17.anInt1190;
@Pc(117) int local117 = (local83 >> 1) + local17.anInt1204;
@Pc(126) int local126 = (local83 + 1 >> 1) + local17.anInt1204;
@Pc(130) int[][] local130 = Static83.activeTileHeightMap[Player.level];
@Pc(157) int local157 = local130[local103][local126] + local130[local110][local126] + local130[local110][local117] + local130[local103][local117] >> 2;
@Pc(159) Entity local159 = null;
@Pc(164) int local164 = Static133.anIntArray453[local17.anInt1198];
if (local164 == 0) {
@Pc(176) Wall local176 = Static262.method4509(Player.level, local17.anInt1190, local17.anInt1204);
if (local176 != null) {
local159 = local176.aClass8_5;
}
} else if (local164 == 1) {
@Pc(231) WallDecor local231 = Static83.method435(Player.level, local17.anInt1190, local17.anInt1204);
if (local231 != null) {
local159 = local231.aClass8_3;
}
} else if (local164 == 2) {
@Pc(198) Scenery local198 = Static133.method4008(Player.level, local17.anInt1190, local17.anInt1204);
if (local198 != null) {
local159 = local198.aClass8_4;
}
} else if (local164 == 3) {
@Pc(216) GroundDecor local216 = Static269.method2210(Player.level, local17.anInt1190, local17.anInt1204);
if (local216 != null) {
local159 = local216.aClass8_1;
}
}
if (local159 != null) {
Static29.method800(Player.level, local17.anInt1204, 0, local17.anInt1190, local17.anInt1205 + 1, -1, local164, 0, local17.anInt1187 + 1);
local40.anInt3375 = local17.anInt1205 + client.loop;
local40.anInt3426 = local83 * 64 + local17.anInt1204 * 128;
local40.anInt3379 = local86 * 64 + local17.anInt1190 * 128;
local40.attachment = local159;
@Pc(292) int local292 = local17.anInt1188;
local40.anInt3406 = local157;
local40.anInt3390 = client.loop + local17.anInt1187;
@Pc(304) int local304 = local17.anInt1191;
@Pc(307) int local307 = local17.anInt1197;
@Pc(310) int local310 = local17.anInt1200;
@Pc(316) int local316;
if (local292 > local304) {
local316 = local292;
local292 = local304;
local304 = local316;
}
local40.anInt3411 = local17.anInt1190 + local304;
if (local307 > local310) {
local316 = local307;
local307 = local310;
local310 = local316;
}
local40.anInt3374 = local17.anInt1204 + local307;
local40.anInt3410 = local310 + local17.anInt1204;
local40.anInt3384 = local17.anInt1190 + local292;
}
}
}
}
}

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

@ -11,6 +11,8 @@ public class AudioChannel {
public static boolean stereo; public static boolean stereo;
@OriginalMember(owner = "client!va", name = "O", descriptor = "I") @OriginalMember(owner = "client!va", name = "O", descriptor = "I")
public static int threadPriority; public static int threadPriority;
@OriginalMember(owner = "client!em", name = "x", descriptor = "Lclient!cj;")
public static AudioThread thread;
@OriginalMember(owner = "client!vh", name = "h", descriptor = "Lclient!qb;") @OriginalMember(owner = "client!vh", name = "h", descriptor = "Lclient!qb;")
private PcmStream stream; private PcmStream stream;
@ -82,16 +84,16 @@ public class AudioChannel {
local33.bufferCapacity = 16384; local33.bufferCapacity = 16384;
} }
local33.open(local33.bufferCapacity); local33.open(local33.bufferCapacity);
if (threadPriority > 0 && Static60.thread == null) { if (threadPriority > 0 && thread == null) {
Static60.thread = new AudioThread(); thread = new AudioThread();
Static60.thread.signLink = arg1; thread.signLink = arg1;
arg1.startThread(threadPriority, Static60.thread); arg1.startThread(threadPriority, thread);
} }
if (Static60.thread != null) { if (thread != null) {
if (Static60.thread.channels[arg3] != null) { if (thread.channels[arg3] != null) {
throw new IllegalArgumentException(); throw new IllegalArgumentException();
} }
Static60.thread.channels[arg3] = local33; thread.channels[arg3] = local33;
} }
return local33; return local33;
} catch (@Pc(109) Throwable local109) { } catch (@Pc(109) Throwable local109) {
@ -102,16 +104,16 @@ public class AudioChannel {
local120.init(arg2); local120.init(arg2);
local120.bufferCapacity = 16384; local120.bufferCapacity = 16384;
local120.open(local120.bufferCapacity); local120.open(local120.bufferCapacity);
if (threadPriority > 0 && Static60.thread == null) { if (threadPriority > 0 && thread == null) {
Static60.thread = new AudioThread(); thread = new AudioThread();
Static60.thread.signLink = arg1; thread.signLink = arg1;
arg1.startThread(threadPriority, Static60.thread); arg1.startThread(threadPriority, thread);
} }
if (Static60.thread != null) { if (thread != null) {
if (Static60.thread.channels[arg3] != null) { if (thread.channels[arg3] != null) {
throw new IllegalArgumentException(); throw new IllegalArgumentException();
} }
Static60.thread.channels[arg3] = local120; thread.channels[arg3] = local120;
} }
return local120; return local120;
} catch (@Pc(186) Throwable local186) { } catch (@Pc(186) Throwable local186) {
@ -359,22 +361,22 @@ public class AudioChannel {
@OriginalMember(owner = "client!vh", name = "a", descriptor = "(Z)V") @OriginalMember(owner = "client!vh", name = "a", descriptor = "(Z)V")
public final synchronized void quit() { public final synchronized void quit() {
if (Static60.thread != null) { if (thread != null) {
@Pc(6) boolean local6 = true; @Pc(6) boolean local6 = true;
for (@Pc(8) int local8 = 0; local8 < 2; local8++) { for (@Pc(8) int local8 = 0; local8 < 2; local8++) {
if (Static60.thread.channels[local8] == this) { if (thread.channels[local8] == this) {
Static60.thread.channels[local8] = null; thread.channels[local8] = null;
} }
if (Static60.thread.channels[local8] != null) { if (thread.channels[local8] != null) {
local6 = false; local6 = false;
} }
} }
if (local6) { if (local6) {
Static60.thread.stop = true; thread.stop = true;
while (Static60.thread.running) { while (thread.running) {
ThreadUtils.sleep(50L); ThreadUtils.sleep(50L);
} }
Static60.thread = null; thread = null;
} }
} }
this.flush(); this.flush();

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

@ -4,7 +4,7 @@ import org.openrs2.deob.annotation.Pc;
public class Base37 { public class Base37 {
@OriginalMember(owner = "client!ge", name = "a", descriptor = "(IJ)Lclient!na;") @OriginalMember(owner = "client!ge", name = "a", descriptor = "(IJ)Lclient!na;")
public static JagString decodeLowerCase(@OriginalArg(1) long arg0) { public static JagString decode37(@OriginalArg(1) long arg0) {
if (arg0 <= 0L || arg0 >= 6582952005840035281L) { if (arg0 <= 0L || arg0 >= 6582952005840035281L) {
return null; return null;
} else if (arg0 % 37L == 0L) { } else if (arg0 % 37L == 0L) {

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

@ -8,17 +8,8 @@ public class Camera {
@OriginalMember(owner = "client!eg", name = "d", descriptor = "I") @OriginalMember(owner = "client!eg", name = "d", descriptor = "I")
public static double yawTarget = 0; public static double yawTarget = 0;
public static int pitchDirection = -1; @OriginalMember(owner = "client!ef", name = "i", descriptor = "I")
public static double pitchAccel = 0;
public static int yawDirection = -1;
public static int getPitch() {
return pitchDirection == 1 ? (int)Math.ceil(pitchTarget) : (int)pitchTarget;
}
public static int getYaw() {
return yawDirection == 1 ? (int)Math.floor(yawTarget) : (int)yawTarget;
}
public static double mod(double a, double b) { public static double mod(double a, double b) {
return ((a % b) + b) % b; return ((a % b) + b) % b;

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

@ -0,0 +1,30 @@
import org.openrs2.deob.annotation.OriginalMember;
import org.openrs2.deob.annotation.Pc;
public class ChangeLocRequest {
@OriginalMember(owner = "client!ug", name = "a", descriptor = "(B)V")
public static void loop() {
for (@Pc(10) Class3_Sub7 local10 = (Class3_Sub7) Static26.aClass69_27.method2289(); local10 != null; local10 = (Class3_Sub7) Static26.aClass69_27.method2288()) {
if (local10.anInt924 > 0) {
local10.anInt924--;
}
if (local10.anInt924 != 0) {
if (local10.anInt925 > 0) {
local10.anInt925--;
}
if (local10.anInt925 == 0 && local10.anInt928 >= 1 && local10.anInt916 >= 1 && local10.anInt928 <= 102 && local10.anInt916 <= 102 && (local10.anInt929 < 0 || Static113.method3557(local10.anInt929, local10.anInt926))) {
Static79.method1698(local10.anInt929, local10.anInt928, local10.anInt918, local10.anInt922, local10.anInt916, local10.anInt926, local10.anInt927);
local10.anInt925 = -1;
if (local10.anInt921 == local10.anInt929 && local10.anInt921 == -1) {
local10.unlink();
} else if (local10.anInt929 == local10.anInt921 && local10.anInt922 == local10.anInt923 && local10.anInt920 == local10.anInt926) {
local10.unlink();
}
}
} else if (local10.anInt921 < 0 || Static113.method3557(local10.anInt921, local10.anInt920)) {
Static79.method1698(local10.anInt921, local10.anInt928, local10.anInt918, local10.anInt923, local10.anInt916, local10.anInt920, local10.anInt927);
local10.unlink();
}
}
}
}

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

@ -4,36 +4,42 @@ import org.openrs2.deob.annotation.Pc;
public class Chat { public class Chat {
@OriginalMember(owner = "client!ca", name = "eb", descriptor = "[I") @OriginalMember(owner = "client!ca", name = "eb", descriptor = "[I")
public static final int[] anIntArray67 = new int[100]; public static final int[] types = new int[100];
@OriginalMember(owner = "client!fb", name = "l", descriptor = "[Lclient!na;") @OriginalMember(owner = "client!fb", name = "l", descriptor = "[Lclient!na;")
public static final JagString[] aClass100Array62 = new JagString[100]; public static final JagString[] clans = new JagString[100];
@OriginalMember(owner = "client!sj", name = "q", descriptor = "[Lclient!na;") @OriginalMember(owner = "client!sj", name = "q", descriptor = "[Lclient!na;")
public static final JagString[] aClass100Array158 = new JagString[100]; public static final JagString[] messages = new JagString[100];
@OriginalMember(owner = "client!th", name = "l", descriptor = "[I") @OriginalMember(owner = "client!th", name = "l", descriptor = "[I")
public static final int[] anIntArray521 = new int[100]; public static final int[] phraseIds = new int[100];
@OriginalMember(owner = "client!mc", name = "Y", descriptor = "[Lclient!na;") @OriginalMember(owner = "client!mc", name = "Y", descriptor = "[Lclient!na;")
public static final JagString[] aClass100Array112 = new JagString[100]; public static final JagString[] names = new JagString[100];
@OriginalMember(owner = "client!dm", name = "u", descriptor = "I") @OriginalMember(owner = "client!dm", name = "u", descriptor = "I")
public static int transmitAt = 0; public static int transmitAt = 0;
@OriginalMember(owner = "client!f", name = "Z", descriptor = "I") @OriginalMember(owner = "client!f", name = "Z", descriptor = "I")
public static int anInt1941 = 0; public static int size = 0;
@OriginalMember(owner = "client!gk", name = "i", descriptor = "I")
public static int tradeFilter = 0;
@OriginalMember(owner = "client!dm", name = "m", descriptor = "I")
public static int privateFilter = 0;
@OriginalMember(owner = "client!ej", name = "U", descriptor = "I")
public static int publicFilter = 0;
@OriginalMember(owner = "client!md", name = "a", descriptor = "(IILclient!na;Lclient!na;BLclient!na;)V") @OriginalMember(owner = "client!md", name = "a", descriptor = "(IILclient!na;Lclient!na;BLclient!na;)V")
public static void add(@OriginalArg(0) int arg0, @OriginalArg(1) int arg1, @OriginalArg(2) JagString arg2, @OriginalArg(3) JagString arg3, @OriginalArg(5) JagString arg4) { public static void add(@OriginalArg(0) int arg0, @OriginalArg(1) int arg1, @OriginalArg(2) JagString arg2, @OriginalArg(3) JagString arg3, @OriginalArg(5) JagString arg4) {
for (@Pc(14) int local14 = 99; local14 > 0; local14--) { for (@Pc(14) int local14 = 99; local14 > 0; local14--) {
anIntArray67[local14] = anIntArray67[local14 - 1]; types[local14] = types[local14 - 1];
aClass100Array112[local14] = aClass100Array112[local14 - 1]; names[local14] = names[local14 - 1];
aClass100Array158[local14] = aClass100Array158[local14 - 1]; messages[local14] = messages[local14 - 1];
aClass100Array62[local14] = aClass100Array62[local14 - 1]; clans[local14] = clans[local14 - 1];
anIntArray521[local14] = anIntArray521[local14 - 1]; phraseIds[local14] = phraseIds[local14 - 1];
} }
anInt1941++; size++;
anIntArray67[0] = arg1; types[0] = arg1;
aClass100Array112[0] = arg4; names[0] = arg4;
transmitAt = InterfaceList.transmitTimer; transmitAt = InterfaceList.transmitTimer;
anIntArray521[0] = arg0; phraseIds[0] = arg0;
aClass100Array158[0] = arg2; messages[0] = arg2;
aClass100Array62[0] = arg3; clans[0] = arg3;
} }
@OriginalMember(owner = "client!i", name = "a", descriptor = "(Lclient!na;ILclient!na;I)V") @OriginalMember(owner = "client!i", name = "a", descriptor = "(Lclient!na;ILclient!na;I)V")

147
client/src/main/java/Cheat.java
View file

@ -27,13 +27,154 @@ public class Cheat {
public static final JagString aClass100_1088 = JagString.parse("::setparticles"); public static final JagString aClass100_1088 = JagString.parse("::setparticles");
@OriginalMember(owner = "client!rc", name = "K", descriptor = "Lclient!na;") @OriginalMember(owner = "client!rc", name = "K", descriptor = "Lclient!na;")
public static final JagString aClass100_232 = JagString.parse("::rect_debug"); public static final JagString aClass100_232 = JagString.parse("::rect_debug");
@OriginalMember(owner = "client!hh", name = "b", descriptor = "Lclient!na;")
public static final JagString aClass100_521 = JagString.parse("::tele ");
@OriginalMember(owner = "client!hh", name = "k", descriptor = "Lclient!na;")
public static final JagString aClass100_522 = JagString.parse("::wm0");
@OriginalMember(owner = "client!tg", name = "i", descriptor = "Lclient!na;")
public static final JagString aClass100_1009 = JagString.parse("::pcachesize");
@OriginalMember(owner = "client!fh", name = "ab", descriptor = "Lclient!na;")
public static final JagString aClass100_443 = JagString.parse("::noclip");
@OriginalMember(owner = "client!en", name = "e", descriptor = "Lclient!na;")
public static final JagString aClass100_422 = JagString.parse("::fpsoff");
@OriginalMember(owner = "client!dg", name = "f", descriptor = "Z") @OriginalMember(owner = "client!dg", name = "f", descriptor = "Z")
public static boolean displayFps = false; public static boolean displayFps = false;
@OriginalMember(owner = "client!nj", name = "a", descriptor = "Z")
public static boolean shiftClick = false;
@OriginalMember(owner = "client!en", name = "a", descriptor = "(IIIB)V") @OriginalMember(owner = "client!en", name = "a", descriptor = "(IIIB)V")
public static void teleport(@OriginalArg(0) int arg0, @OriginalArg(1) int arg1, @OriginalArg(2) int arg2) { public static void teleport(@OriginalArg(0) int arg0, @OriginalArg(1) int arg1, @OriginalArg(2) int arg2) {
@Pc(66) JagString local66 = JagString.concatenate(new JagString[] { Static96.aClass100_521, Static123.parseInt(arg2), Static159.aClass100_760, Static123.parseInt(arg0 >> 6), Static159.aClass100_760, Static123.parseInt(arg1 >> 6), Static159.aClass100_760, Static123.parseInt(arg0 & 0x3F), Static159.aClass100_760, Static123.parseInt(arg1 & 0x3F) }); @Pc(66) JagString local66 = JagString.concatenate(new JagString[] { aClass100_521, Static123.parseInt(arg2), Static159.aClass100_760, Static123.parseInt(arg0 >> 6), Static159.aClass100_760, Static123.parseInt(arg1 >> 6), Static159.aClass100_760, Static123.parseInt(arg0 & 0x3F), Static159.aClass100_760, Static123.parseInt(arg1 & 0x3F) });
local66.method3129(); local66.print();
Static127.method2470(local66); execute(local66);
} }
@OriginalMember(owner = "client!k", name = "a", descriptor = "(Lclient!na;Z)V")
public static void execute(@OriginalArg(0) JagString arg0) {
if (LoginManager.staffModLevel >= 2) {
@Pc(18) int local18;
@Pc(38) int local38;
@Pc(29) Runtime local29;
if (arg0.equalsIgnoreCase(Static81.aClass100_476)) {
client.method2380();
for (local18 = 0; local18 < 10; local18++) {
System.gc();
}
local29 = Runtime.getRuntime();
local38 = (int) ((local29.totalMemory() - local29.freeMemory()) / 1024L);
Chat.add(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)) {
client.method2380();
for (local18 = 0; local18 < 10; local18++) {
System.gc();
}
local29 = Runtime.getRuntime();
local38 = (int) ((local29.totalMemory() - local29.freeMemory()) / 1024L);
Chat.add(null, 0, JagString.concatenate(new JagString[] { Static203.aClass100_893, Static123.parseInt(local38), Static17.aClass100_101 }));
Static16.method501();
client.method2380();
for (local117 = 0; local117 < 10; local117++) {
System.gc();
}
local38 = (int) ((local29.totalMemory() - local29.freeMemory()) / 1024L);
Chat.add(null, 0, JagString.concatenate(new JagString[] {aClass100_1093, Static123.parseInt(local38), Static17.aClass100_101 }));
}
if (arg0.equalsIgnoreCase(aClass100_1009)) {
Chat.add(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:" + GlCleaner.anInt1945);
System.out.println("oncard_2d:" + GlCleaner.onCard2d);
System.out.println("oncard_texture:" + GlCleaner.onCardTexture);
}
if (arg0.equalsIgnoreCase(CLIENTDROP)) {
Static175.method3279();
}
if (arg0.equalsIgnoreCase(Static279.aClass100_1106)) {
client.js5NetQueue.quit();
}
if (arg0.equalsIgnoreCase(JS5DROP)) {
client.js5NetQueue.method2319();
}
if (arg0.equalsIgnoreCase(aClass100_775)) {
GameShell.signLink.breakConnection();
Protocol.socket.breakConnection();
client.js5NetQueue.method2323();
}
if (arg0.equalsIgnoreCase(Static114.aClass100_1100)) {
GameShell.replaceCanvas = true;
}
if (arg0.equalsIgnoreCase(Static148.aClass100_677)) {
client.setGameState(25);
}
if (arg0.equalsIgnoreCase(Static107.aClass100_566)) {
displayFps = true;
}
if (arg0.equalsIgnoreCase(aClass100_422)) {
displayFps = false;
}
if (arg0.equalsIgnoreCase(aClass100_522)) {
Static241.setWindowMode(false, 0, -1, -1);
}
if (arg0.equalsIgnoreCase(Static181.aClass100_811)) {
Static241.setWindowMode(false, 1, -1, -1);
}
if (arg0.equalsIgnoreCase(Static207.aClass100_904)) {
Static241.setWindowMode(false, 2, -1, -1);
}
if (arg0.equalsIgnoreCase(Static99.aClass100_529)) {
Static241.setWindowMode(false, 3, 1024, 768);
}
if (arg0.equalsIgnoreCase(aClass100_443)) {
for (local18 = 0; local18 < 4; local18++) {
for (local38 = 1; local38 < 103; local38++) {
for (local117 = 1; local117 < 103; local117++) {
PathFinder.collisionMaps[local18].anIntArrayArray30[local38][local117] = 0;
}
}
}
}
if (arg0.startsWith(aClass100_1088)) {
Preferences.setParticles(arg0.substring(15).parseInt());
Preferences.write(GameShell.signLink);
Preferences.sentToServer = false;
}
if (arg0.startsWith(aClass100_623) && client.modeWhere != 0) {
Static115.method2312(arg0.substring(6).parseInt());
}
if (arg0.equalsIgnoreCase(aClass100_990)) {
throw new RuntimeException();
}
if (arg0.startsWith(aClass100_232)) {
Static199.rectDebug = arg0.substring(12).trim().parseInt();
Chat.add(null, 0, JagString.concatenate(new JagString[] { Static276.aClass100_1096, Static123.parseInt(Static199.rectDebug) }));
}
if (arg0.equalsIgnoreCase(Static181.aClass100_810)) {
Static121.aBoolean154 = true;
}
if (arg0.equalsIgnoreCase(Static124.aClass100_596)) {
if (client.applyTweening) {
client.applyTweening = false;
Chat.add(null, 0, aClass100_943);
} else {
client.applyTweening = true;
Chat.add(null, 0, Static50.aClass100_362);
}
}
if (arg0.equalsIgnoreCase(Static114.aClass100_1099)) {
if (shiftClick) {
Static154.aClass100_736.print();
shiftClick = false;
} else {
aClass100_333.print();
shiftClick = true;
}
}
}
Protocol.outboundBuffer.p1isaac(44);
Protocol.outboundBuffer.p1(arg0.length() - 1);
Protocol.outboundBuffer.pjstr(arg0.substring(2));
}
} }

47
client/src/main/java/ClanChat.java
View file

@ -1,6 +1,53 @@
import org.openrs2.deob.annotation.OriginalArg;
import org.openrs2.deob.annotation.OriginalMember; import org.openrs2.deob.annotation.OriginalMember;
import org.openrs2.deob.annotation.Pc;
public class ClanChat { public class ClanChat {
@OriginalMember(owner = "client!wj", name = "l", descriptor = "I") @OriginalMember(owner = "client!wj", name = "l", descriptor = "I")
public static int transmitAt = 0; public static int transmitAt = 0;
@OriginalMember(owner = "client!mj", name = "u", descriptor = "B")
public static byte rank;
@OriginalMember(owner = "client!e", name = "rc", descriptor = "B")
public static byte minKick;
@OriginalMember(owner = "client!wb", name = "m", descriptor = "Lclient!na;")
public static JagString owner = null;
@OriginalMember(owner = "client!be", name = "ac", descriptor = "Lclient!na;")
public static JagString name = null;
@OriginalMember(owner = "client!rg", name = "y", descriptor = "I")
public static int size;
@OriginalMember(owner = "client!qc", name = "bb", descriptor = "[Lclient!kl;")
public static Class3_Sub22[] members;
@OriginalMember(owner = "client!kh", name = "b", descriptor = "(I)V")
public static void leave() {
Protocol.outboundBuffer.p1isaac(104);
Protocol.outboundBuffer.p8(0L);
}
@OriginalMember(owner = "client!mf", name = "a", descriptor = "(JI)V")
public static void join(@OriginalArg(0) long arg0) {
if ((long) 0 != arg0) {
Protocol.outboundBuffer.p1isaac(104);
Protocol.outboundBuffer.p8(arg0);
}
}
@OriginalMember(owner = "client!od", name = "a", descriptor = "(ILclient!na;)V")
public static void kick(@OriginalArg(1) JagString arg0) {
if (members == null) {
return;
}
@Pc(22) long local22 = arg0.encode37();
@Pc(24) int local24 = 0;
if (local22 == 0L) {
return;
}
while (members.length > local24 && members[local24].key != local22) {
local24++;
}
if (local24 < members.length && members[local24] != null) {
Protocol.outboundBuffer.p1isaac(162);
Protocol.outboundBuffer.p8(members[local24].key);
}
}
} }

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

@ -5,14 +5,14 @@ import org.openrs2.deob.annotation.OriginalMember;
public final class Class3_Sub22 extends Node { public final class Class3_Sub22 extends Node {
@OriginalMember(owner = "client!kl", name = "p", descriptor = "B") @OriginalMember(owner = "client!kl", name = "p", descriptor = "B")
public byte aByte9; public byte rank;
@OriginalMember(owner = "client!kl", name = "q", descriptor = "Lclient!na;") @OriginalMember(owner = "client!kl", name = "q", descriptor = "Lclient!na;")
public JagString aClass100_635; public JagString aClass100_635;
@OriginalMember(owner = "client!kl", name = "t", descriptor = "Lclient!na;") @OriginalMember(owner = "client!kl", name = "t", descriptor = "Lclient!na;")
public JagString aClass100_636; public JagString username;
@OriginalMember(owner = "client!kl", name = "x", descriptor = "I") @OriginalMember(owner = "client!kl", name = "x", descriptor = "I")
public int anInt3340; public int world;
} }

66
client/src/main/java/ClientScriptList.java Normal file
View file

@ -0,0 +1,66 @@
import org.openrs2.deob.annotation.OriginalArg;
import org.openrs2.deob.annotation.OriginalMember;
import org.openrs2.deob.annotation.Pc;
public class ClientScriptList {
@OriginalMember(owner = "client!ib", name = "d", descriptor = "Lclient!gn;")
public static final LruHashTable scripts = new LruHashTable(128);
@OriginalMember(owner = "client!hc", name = "a", descriptor = "(IB)Lclient!qc;")
public static ClientScript get(@OriginalArg(0) int id) {
@Pc(12) ClientScript local12 = (ClientScript) scripts.get((long) id);
if (local12 != null) {
return local12;
}
@Pc(22) byte[] local22 = client.js5Archive12.getFile(id, 0);
if (local22 == null) {
return null;
}
local12 = new ClientScript();
@Pc(42) Buffer local42 = new Buffer(local22);
local42.offset = local42.data.length - 2;
@Pc(53) int local53 = local42.g2();
@Pc(63) int local63 = local42.data.length - local53 - 12 - 2;
local42.offset = local63;
@Pc(70) int local70 = local42.g4();
local12.anInt4667 = local42.g2();
local12.anInt4671 = local42.g2();
local12.anInt4665 = local42.g2();
local12.anInt4669 = local42.g2();
@Pc(98) int local98 = local42.g1();
@Pc(107) int local107;
@Pc(114) int local114;
if (local98 > 0) {
local12.aClass133Array1 = new HashTable[local98];
for (local107 = 0; local107 < local98; local107++) {
local114 = local42.g2();
@Pc(121) HashTable local121 = new HashTable(Static165.clp2(local114));
local12.aClass133Array1[local107] = local121;
while (local114-- > 0) {
@Pc(136) int local136 = local42.g4();
@Pc(140) int local140 = local42.g4();
local121.put(new IntNode(local140), (long) local136);
}
}
}
local42.offset = 0;
local12.name = local42.gjstrFast();
local12.opcodes = new int[local70];
local12.stringOperands = new JagString[local70];
local107 = 0;
local12.intOperands = new int[local70];
while (local63 > local42.offset) {
local114 = local42.g2();
if (local114 == 3) {
local12.stringOperands[local107] = local42.gjstr();
} else if (local114 >= 100 || local114 == 21 || local114 == 38 || local114 == 39) {
local12.intOperands[local107] = local42.g1();
} else {
local12.intOperands[local107] = local42.g4();
}
local12.opcodes[local107++] = local114;
}
scripts.put(local12, (long) id);
return local12;
}
}

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

@ -31,7 +31,7 @@ public final class Component {
public Object[] anObjectArray6; public Object[] anObjectArray6;
@OriginalMember(owner = "client!be", name = "q", descriptor = "[Lclient!na;") @OriginalMember(owner = "client!be", name = "q", descriptor = "[Lclient!na;")
public JagString[] aClass100Array18; public JagString[] ops;
@OriginalMember(owner = "client!be", name = "s", descriptor = "[Lclient!na;") @OriginalMember(owner = "client!be", name = "s", descriptor = "[Lclient!na;")
public JagString[] aClass100Array19; public JagString[] aClass100Array19;
@ -301,7 +301,7 @@ public final class Component {
public int anInt492 = 0; public int anInt492 = 0;
@OriginalMember(owner = "client!be", name = "Gb", descriptor = "Lclient!na;") @OriginalMember(owner = "client!be", name = "Gb", descriptor = "Lclient!na;")
public JagString aClass100_84 = Static176.aClass100_800; public JagString text = Static176.aClass100_800;
@OriginalMember(owner = "client!be", name = "n", descriptor = "I") @OriginalMember(owner = "client!be", name = "n", descriptor = "I")
public int anInt445 = 0; public int anInt445 = 0;
@ -331,7 +331,7 @@ public final class Component {
public int modelZOffset = 0; public int modelZOffset = 0;
@OriginalMember(owner = "client!be", name = "Dc", descriptor = "Lclient!na;") @OriginalMember(owner = "client!be", name = "Dc", descriptor = "Lclient!na;")
public JagString aClass100_88 = Static176.aClass100_800; public JagString opBase = Static176.aClass100_800;
@OriginalMember(owner = "client!be", name = "Lc", descriptor = "I") @OriginalMember(owner = "client!be", name = "Lc", descriptor = "I")
public int updatedVarcsReaderIndex = 0; public int updatedVarcsReaderIndex = 0;
@ -412,7 +412,7 @@ public final class Component {
public int anInt521 = 0; public int anInt521 = 0;
@OriginalMember(owner = "client!be", name = "id", descriptor = "I") @OriginalMember(owner = "client!be", name = "id", descriptor = "I")
public int anInt522 = -1; public int modelSeqId = -1;
@OriginalMember(owner = "client!be", name = "Rc", descriptor = "Lclient!na;") @OriginalMember(owner = "client!be", name = "Rc", descriptor = "Lclient!na;")
public JagString aClass100_89 = LocalizedText.OK; public JagString aClass100_89 = LocalizedText.OK;
@ -478,7 +478,7 @@ public final class Component {
public int updatedVarpsReaderIndex = 0; public int updatedVarpsReaderIndex = 0;
@OriginalMember(owner = "client!be", name = "rb", descriptor = "I") @OriginalMember(owner = "client!be", name = "rb", descriptor = "I")
public int anInt474 = 0; public int color = 0;
@OriginalMember(owner = "client!be", name = "xd", descriptor = "I") @OriginalMember(owner = "client!be", name = "xd", descriptor = "I")
public int anInt530 = 0; public int anInt530 = 0;
@ -544,16 +544,16 @@ public final class Component {
@OriginalMember(owner = "client!be", name = "a", descriptor = "(BLclient!na;I)V") @OriginalMember(owner = "client!be", name = "a", descriptor = "(BLclient!na;I)V")
public final void method480(@OriginalArg(1) JagString arg0, @OriginalArg(2) int arg1) { public final void method480(@OriginalArg(1) JagString arg0, @OriginalArg(2) int arg1) {
if (this.aClass100Array18 == null || this.aClass100Array18.length <= arg1) { if (this.ops == null || this.ops.length <= arg1) {
@Pc(23) JagString[] local23 = new JagString[arg1 + 1]; @Pc(23) JagString[] local23 = new JagString[arg1 + 1];
if (this.aClass100Array18 != null) { if (this.ops != null) {
for (@Pc(30) int local30 = 0; local30 < this.aClass100Array18.length; local30++) { for (@Pc(30) int local30 = 0; local30 < this.ops.length; local30++) {
local23[local30] = this.aClass100Array18[local30]; local23[local30] = this.ops[local30];
} }
} }
this.aClass100Array18 = local23; this.ops = local23;
} }
this.aClass100Array18[arg1] = arg0; this.ops[arg1] = arg0;
} }
@OriginalMember(owner = "client!be", name = "a", descriptor = "(ILclient!wa;)V") @OriginalMember(owner = "client!be", name = "a", descriptor = "(ILclient!wa;)V")
@ -677,11 +677,11 @@ public final class Component {
this.aBoolean28 = arg0.g1() == 1; this.aBoolean28 = arg0.g1() == 1;
} }
if (this.type == 4) { if (this.type == 4) {
this.aClass100_84 = arg0.gjstr(); this.text = arg0.gjstr();
this.aClass100_82 = arg0.gjstr(); this.aClass100_82 = arg0.gjstr();
} }
if (this.type == 1 || this.type == 3 || this.type == 4) { if (this.type == 1 || this.type == 3 || this.type == 4) {
this.anInt474 = arg0.g4(); this.color = arg0.g4();
} }
if (this.type == 3 || this.type == 4) { if (this.type == 3 || this.type == 4) {
this.anInt492 = arg0.g4(); this.anInt492 = arg0.g4();
@ -703,9 +703,9 @@ public final class Component {
if (this.anInt461 == 65535) { if (this.anInt461 == 65535) {
this.anInt461 = -1; this.anInt461 = -1;
} }
this.anInt522 = arg0.g2(); this.modelSeqId = arg0.g2();
if (this.anInt522 == 65535) { if (this.modelSeqId == 65535) {
this.anInt522 = -1; this.modelSeqId = -1;
} }
this.anInt462 = arg0.g2(); this.anInt462 = arg0.g2();
if (this.anInt462 == 65535) { if (this.anInt462 == 65535) {
@ -726,7 +726,7 @@ public final class Component {
this.anInt502 = -1; this.anInt502 = -1;
} }
this.aBoolean28 = arg0.g1() == 1; this.aBoolean28 = arg0.g1() == 1;
this.anInt474 = arg0.g4(); this.color = arg0.g4();
this.anInt512 = arg0.g2s(); this.anInt512 = arg0.g2s();
this.anInt516 = arg0.g2s(); this.anInt516 = arg0.g2s();
local175 = arg0.g1(); local175 = arg0.g1();
@ -743,7 +743,7 @@ public final class Component {
} }
} }
if (this.type == 8) { if (this.type == 8) {
this.aClass100_84 = arg0.gjstr(); this.text = arg0.gjstr();
} }
if (this.anInt530 == 2 || this.type == 2) { if (this.anInt530 == 2 || this.type == 2) {
this.aClass100_86 = arg0.gjstr(); this.aClass100_86 = arg0.gjstr();
@ -1041,9 +1041,9 @@ public final class Component {
this.modelYAngle = arg0.g2(); this.modelYAngle = arg0.g2();
this.modelYOffset = arg0.g2(); this.modelYOffset = arg0.g2();
this.modelZoom = arg0.g2(); this.modelZoom = arg0.g2();
this.anInt522 = arg0.g2(); this.modelSeqId = arg0.g2();
if (this.anInt522 == 65535) { if (this.modelSeqId == 65535) {
this.anInt522 = -1; this.modelSeqId = -1;
} }
this.aBoolean22 = arg0.g1() == 1; this.aBoolean22 = arg0.g1() == 1;
this.aShort11 = (short) arg0.g2(); this.aShort11 = (short) arg0.g2();
@ -1061,21 +1061,21 @@ public final class Component {
if (this.anInt502 == 65535) { if (this.anInt502 == 65535) {
this.anInt502 = -1; this.anInt502 = -1;
} }
this.aClass100_84 = arg0.gjstr(); this.text = arg0.gjstr();
this.anInt467 = arg0.g1(); this.anInt467 = arg0.g1();
this.anInt460 = arg0.g1(); this.anInt460 = arg0.g1();
this.anInt478 = arg0.g1(); this.anInt478 = arg0.g1();
this.aBoolean28 = arg0.g1() == 1; this.aBoolean28 = arg0.g1() == 1;
this.anInt474 = arg0.g4(); this.color = arg0.g4();
} }
if (this.type == 3) { if (this.type == 3) {
this.anInt474 = arg0.g4(); this.color = arg0.g4();
this.aBoolean30 = arg0.g1() == 1; this.aBoolean30 = arg0.g1() == 1;
this.anInt476 = arg0.g1(); this.anInt476 = arg0.g1();
} }
if (this.type == 9) { if (this.type == 9) {
this.anInt490 = arg0.g1(); this.anInt490 = arg0.g1();
this.anInt474 = arg0.g4(); this.color = arg0.g4();
this.aBoolean20 = arg0.g1() == 1; this.aBoolean20 = arg0.g1() == 1;
} }
local175 = arg0.g3(); local175 = arg0.g3();
@ -1099,14 +1099,14 @@ public final class Component {
local471 = arg0.g1(); local471 = arg0.g1();
} }
} }
this.aClass100_88 = arg0.gjstr(); this.opBase = arg0.gjstr();
local497 = arg0.g1(); local497 = arg0.g1();
@Pc(557) int local557 = local497 & 0xF; @Pc(557) int local557 = local497 & 0xF;
@Pc(567) int local567; @Pc(567) int local567;
if (local557 > 0) { if (local557 > 0) {
this.aClass100Array18 = new JagString[local557]; this.ops = new JagString[local557];
for (local567 = 0; local567 < local557; local567++) { for (local567 = 0; local567 < local557; local567++) {
this.aClass100Array18[local567] = arg0.gjstr(); this.ops[local567] = arg0.gjstr();
} }
} }
@Pc(584) int local584 = local497 >> 4; @Pc(584) int local584 = local497 >> 4;

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

@ -92,7 +92,7 @@ public class CreateManager {
Protocol.inboundBuffer.offset = 0; Protocol.inboundBuffer.offset = 0;
Protocol.socket.read(0, suggestedNames.length * 8, Protocol.inboundBuffer.data); Protocol.socket.read(0, suggestedNames.length * 8, Protocol.inboundBuffer.data);
for (local120 = 0; local120 < suggestedNames.length; local120++) { for (local120 = 0; local120 < suggestedNames.length; local120++) {
suggestedNames[local120] = Base37.decodeLowerCase(Protocol.inboundBuffer.g8()); suggestedNames[local120] = Base37.decode37(Protocol.inboundBuffer.g8());
} }
reply = 21; reply = 21;
step = 0; step = 0;

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

@ -0,0 +1,12 @@
import org.openrs2.deob.annotation.OriginalMember;
public class Cross {
@OriginalMember(owner = "client!fi", name = "k", descriptor = "I")
public static int type = 0;
@OriginalMember(owner = "client!bg", name = "M", descriptor = "I")
public static int milliseconds = 0;
@OriginalMember(owner = "client!c", name = "eb", descriptor = "I")
public static int y = 0;
@OriginalMember(owner = "client!jh", name = "j", descriptor = "I")
public static int x = 0;
}

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

@ -1,6 +1,7 @@
import org.openrs2.deob.annotation.OriginalArg; import org.openrs2.deob.annotation.OriginalArg;
import org.openrs2.deob.annotation.OriginalClass; import org.openrs2.deob.annotation.OriginalClass;
import org.openrs2.deob.annotation.OriginalMember; import org.openrs2.deob.annotation.OriginalMember;
import org.openrs2.deob.annotation.Pc;
@OriginalClass("client!da") @OriginalClass("client!da")
public final class DelayedStateChange extends SecondaryNode { public final class DelayedStateChange extends SecondaryNode {
@ -35,6 +36,81 @@ public final class DelayedStateChange extends SecondaryNode {
serverQueue.clear(); serverQueue.clear();
} }
@OriginalMember(owner = "client!pf", name = "a", descriptor = "(III)V")
public static void setComponentModelRotationSpeedServer(@OriginalArg(0) int arg0, @OriginalArg(1) int arg1) {
@Pc(14) DelayedStateChange local14 = Static238.method4143(13, arg1);
local14.pushServer();
local14.intArg1 = arg0;
}
@OriginalMember(owner = "client!pi", name = "a", descriptor = "(Lclient!na;BI)V")
public static void method3498(@OriginalArg(0) JagString arg0, @OriginalArg(2) int arg1) {
@Pc(10) DelayedStateChange local10 = Static238.method4143(2, arg1);
local10.pushServer();
local10.stringArg = arg0;
}
@OriginalMember(owner = "client!mc", name = "c", descriptor = "(III)V")
public static void method2905(@OriginalArg(1) int arg0, @OriginalArg(2) int arg1) {
@Pc(14) DelayedStateChange local14 = Static238.method4143(7, arg0);
local14.pushServer();
local14.intArg1 = arg1;
}
@OriginalMember(owner = "client!ke", name = "c", descriptor = "(III)V")
public static void method2606(@OriginalArg(0) int arg0, @OriginalArg(1) int arg1) {
@Pc(8) DelayedStateChange local8 = Static238.method4143(1, arg0);
local8.pushServer();
local8.intArg1 = arg1;
}
@OriginalMember(owner = "client!ke", name = "a", descriptor = "(IIIBI)V")
public static void method2607(@OriginalArg(0) int arg0, @OriginalArg(1) int arg1, @OriginalArg(2) int arg2, @OriginalArg(4) int arg3) {
@Pc(8) DelayedStateChange local8 = Static238.method4143(4, arg2);
local8.pushServer();
local8.intArg3 = arg3;
local8.intArg2 = arg0;
local8.intArg1 = arg1;
}
@OriginalMember(owner = "client!se", name = "a", descriptor = "(III)V")
public static void method3893(@OriginalArg(0) int arg0, @OriginalArg(1) int arg1) {
@Pc(14) DelayedStateChange local14 = Static238.method4143(5, arg0);
local14.pushServer();
local14.intArg1 = arg1;
}
@OriginalMember(owner = "client!ve", name = "a", descriptor = "(BIIII)V")
public static void method4505(@OriginalArg(1) int arg0, @OriginalArg(2) int arg1, @OriginalArg(3) int arg2, @OriginalArg(4) int arg3) {
@Pc(8) DelayedStateChange local8 = Static238.method4143(8, arg1);
local8.pushServer();
local8.intArg2 = arg0;
local8.intArg1 = arg3;
local8.intArg3 = arg2;
}
@OriginalMember(owner = "client!kk", name = "a", descriptor = "(IIB)V")
public static void method2649(@OriginalArg(0) int arg0, @OriginalArg(1) int arg1) {
@Pc(4) DelayedStateChange local4 = Static238.method4143(6, arg1);
local4.pushServer();
local4.intArg1 = arg0;
}
@OriginalMember(owner = "client!wl", name = "a", descriptor = "(IIII)V")
public static void method4666(@OriginalArg(0) int arg0, @OriginalArg(1) int arg1, @OriginalArg(3) int arg2) {
@Pc(18) DelayedStateChange local18 = Static238.method4143(11, arg1);
local18.pushServer();
local18.intArg3 = arg2;
local18.intArg1 = arg0;
}
@OriginalMember(owner = "client!gf", name = "a", descriptor = "(Lclient!na;II)V")
public static void method3617(@OriginalArg(0) JagString arg0, @OriginalArg(2) int arg1) {
@Pc(6) DelayedStateChange local6 = Static238.method4143(3, arg1);
local6.pushServer();
local6.stringArg = arg0;
}
@OriginalMember(owner = "client!da", name = "a", descriptor = "(Z)V") @OriginalMember(owner = "client!da", name = "a", descriptor = "(Z)V")
public final void pushClient() { public final void pushClient() {
this.secondaryKey = MonotonicClock.currentTimeMillis() + 500L | Long.MIN_VALUE & this.secondaryKey; this.secondaryKey = MonotonicClock.currentTimeMillis() + 500L | Long.MIN_VALUE & this.secondaryKey;

47
client/src/main/java/Find.java Normal file
View file

@ -0,0 +1,47 @@
import org.openrs2.deob.annotation.OriginalArg;
import org.openrs2.deob.annotation.OriginalMember;
import org.openrs2.deob.annotation.Pc;
public class Find {
@OriginalMember(owner = "client!nf", name = "c", descriptor = "[S")
public static short[] results;
@OriginalMember(owner = "client!fe", name = "x", descriptor = "I")
public static int size;
@OriginalMember(owner = "client!ii", name = "l", descriptor = "I")
public static int index;
@OriginalMember(owner = "client!bn", name = "a", descriptor = "(BZLclient!na;)V")
public static void findQuickChatPhrases(@OriginalArg(1) boolean arg0, @OriginalArg(2) JagString arg1) {
@Pc(9) JagString local9 = arg1.toLowerCase();
@Pc(11) int local11 = 0;
@Pc(22) short[] local22 = new short[16];
@Pc(28) int local28 = arg0 ? 32768 : 0;
@Pc(36) int local36 = (arg0 ? QuickChatPhraseTypeList.anInt1047 : QuickChatPhraseTypeList.anInt3490) + local28;
for (@Pc(38) int local38 = local28; local38 < local36; local38++) {
@Pc(45) QuickChatPhraseType local45 = QuickChatPhraseTypeList.get(local38);
if (local45.aBoolean60 && local45.getText().toLowerCase().indexOf(local9) != -1) {
if (local11 >= 50) {
index = -1;
results = null;
return;
}
if (local11 >= local22.length) {
@Pc(79) short[] local79 = new short[local22.length * 2];
for (@Pc(81) int local81 = 0; local81 < local11; local81++) {
local79[local81] = local22[local81];
}
local22 = local79;
}
local22[local11++] = (short) local38;
}
}
results = local22;
index = local11;
size = 0;
@Pc(113) JagString[] local113 = new JagString[index];
for (@Pc(115) int local115 = 0; local115 < index; local115++) {
local113[local115] = QuickChatPhraseTypeList.get(local22[local115]).getText();
}
Static202.method3656(local113, results);
}
}

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

@ -7,6 +7,80 @@ import org.openrs2.deob.annotation.Pc;
@OriginalClass("client!rk") @OriginalClass("client!rk")
public abstract class Font extends SecondaryNode { public abstract class Font extends SecondaryNode {
@OriginalMember(owner = "client!rk", name = "K", descriptor = "Lclient!na;")
public static final JagString TAG_GT = JagString.parse("gt");
@OriginalMember(owner = "client!rk", name = "L", descriptor = "Lclient!na;")
public static final JagString TAG_LT = JagString.parse("lt");
@OriginalMember(owner = "client!rk", name = "M", descriptor = "Lclient!na;")
public static final JagString TAG_SHAD1 = JagString.parse("shad=");
@OriginalMember(owner = "client!rk", name = "N", descriptor = "Lclient!na;")
public static final JagString TAB_SHY = JagString.parse("shy");
@OriginalMember(owner = "client!rk", name = "O", descriptor = "Lclient!na;")
public static final JagString TAG_TRANS1 = JagString.parse("trans=");
@OriginalMember(owner = "client!rk", name = "P", descriptor = "Lclient!na;")
public static final JagString TAG_U1 = JagString.parse("u=");
@OriginalMember(owner = "client!rk", name = "Q", descriptor = "Lclient!na;")
public static final JagString TAG_STR1 = JagString.parse("str=");
@OriginalMember(owner = "client!rk", name = "R", descriptor = "Lclient!na;")
public static final JagString TAB_EURO = JagString.parse("euro");
@OriginalMember(owner = "client!rk", name = "T", descriptor = "Lclient!na;")
public static final JagString TAG_COL2 = JagString.parse(")4col");
@OriginalMember(owner = "client!rk", name = "X", descriptor = "Lclient!na;")
public static final JagString TAG_SHAD3 = JagString.parse(")4shad");
@OriginalMember(owner = "client!rk", name = "Y", descriptor = "Lclient!na;")
public static final JagString TAG_COL1 = JagString.parse("col=");
@OriginalMember(owner = "client!rk", name = "bb", descriptor = "Lclient!na;")
public static final JagString TAG_U2 = JagString.parse("u");
@OriginalMember(owner = "client!rk", name = "cb", descriptor = "Lclient!na;")
public static final JagString TAB_TIMES = JagString.parse("times");
@OriginalMember(owner = "client!rk", name = "eb", descriptor = "Lclient!na;")
public static final JagString TAG_TRANS2 = JagString.parse(")4trans");
@OriginalMember(owner = "client!rk", name = "fb", descriptor = "Lclient!na;")
public static final JagString TAG_NBSP = JagString.parse("nbsp");
@OriginalMember(owner = "client!rk", name = "ib", descriptor = "Lclient!na;")
public static final JagString TAG_U3 = JagString.parse(")4u");
@OriginalMember(owner = "client!rk", name = "kb", descriptor = "Lclient!na;")
public static final JagString TAG_BR = JagString.parse("br");
@OriginalMember(owner = "client!rk", name = "lb", descriptor = "Lclient!na;")
public static final JagString TAG_SHAD2 = JagString.parse("shad");
@OriginalMember(owner = "client!rk", name = "mb", descriptor = "Lclient!na;")
public static final JagString TAG_IMG = JagString.parse("img=");
@OriginalMember(owner = "client!rk", name = "ob", descriptor = "Lclient!na;")
public static final JagString TAB_COPY = JagString.parse("copy");
@OriginalMember(owner = "client!rk", name = "pb", descriptor = "Lclient!na;")
public static final JagString TAG_STR3 = JagString.parse(")4str");
@OriginalMember(owner = "client!rk", name = "qb", descriptor = "Lclient!na;")
public static final JagString TAG_REG = JagString.parse("reg");
@OriginalMember(owner = "client!rk", name = "rb", descriptor = "Lclient!na;")
public static final JagString TAG_STR2 = JagString.parse("str");
@OriginalMember(owner = "client!rk", name = "sb", descriptor = "Lclient!na;")
public static final JagString buffer = Static87.allocate(100);
@OriginalMember(owner = "client!rk", name = "Ab", descriptor = "[Lclient!na;")
public static final JagString[] lines = new JagString[100];
@OriginalMember(owner = "client!rk", name = "Z", descriptor = "Lclient!na;")
private static final JagString aClass100_706 = JagString.parse("<gt>");
@OriginalMember(owner = "client!rk", name = "hb", descriptor = "Lclient!na;")
private static final JagString aClass100_711 = JagString.parse("<lt>");
@OriginalMember(owner = "client!rk", name = "tb", descriptor = "I")
public static int strikethroughColor = -1;
@OriginalMember(owner = "client!rk", name = "ub", descriptor = "I")
public static int underlineColor = -1;
@OriginalMember(owner = "client!rk", name = "vb", descriptor = "I")
public static int anInt3629 = 0;
@OriginalMember(owner = "client!rk", name = "wb", descriptor = "I")
public static int color = 0;
@OriginalMember(owner = "client!rk", name = "xb", descriptor = "I")
public static int alphaOverride = 256;
@OriginalMember(owner = "client!rk", name = "yb", descriptor = "I")
public static int alpha = 256;
@OriginalMember(owner = "client!rk", name = "zb", descriptor = "I")
public static int shadowColor = -1;
@OriginalMember(owner = "client!rk", name = "Bb", descriptor = "I")
public static int shadowColorOverride = -1;
@OriginalMember(owner = "client!rk", name = "Cb", descriptor = "I")
public static int colorOverride = 0;
@OriginalMember(owner = "client!rk", name = "Db", descriptor = "I")
public static int spaceWidth = 0;
@OriginalMember(owner = "client!rk", name = "W", descriptor = "[I") @OriginalMember(owner = "client!rk", name = "W", descriptor = "[I")
private int[] nameIconHeights; private int[] nameIconHeights;
@ -66,6 +140,62 @@ public abstract class Font extends SecondaryNode {
this.decode(arg0); this.decode(arg0);
} }
@OriginalMember(owner = "client!rk", name = "c", descriptor = "(Lclient!na;)Lclient!na;")
public static JagString escape(@OriginalArg(0) JagString arg0) {
@Pc(3) int local3 = arg0.length();
@Pc(5) int local5 = 0;
@Pc(15) int local15;
for (@Pc(7) int local7 = 0; local7 < local3; local7++) {
local15 = arg0.charAt(local7);
if (local15 == 60 || local15 == 62) {
local5 += 3;
}
}
@Pc(30) JagString local30 = Static87.allocate(local3 + local5);
for (local15 = 0; local15 < local3; local15++) {
@Pc(40) int local40 = arg0.charAt(local15);
if (local40 == 60) {
local30.method3113(aClass100_711);
} else if (local40 == 62) {
local30.method3113(aClass100_706);
} else {
local30.append(local40);
}
}
return local30;
}
@OriginalMember(owner = "client!rk", name = "a", descriptor = "([[B[[B[I[I[III)I")
public static int method2870(@OriginalArg(0) byte[][] arg0, @OriginalArg(1) byte[][] arg1, @OriginalArg(2) int[] arg2, @OriginalArg(3) int[] arg3, @OriginalArg(4) int[] arg4, @OriginalArg(5) int arg5, @OriginalArg(6) int arg6) {
@Pc(3) int local3 = arg2[arg5];
@Pc(9) int local9 = local3 + arg4[arg5];
@Pc(13) int local13 = arg2[arg6];
@Pc(19) int local19 = local13 + arg4[arg6];
@Pc(21) int local21 = local3;
if (local13 > local3) {
local21 = local13;
}
@Pc(28) int local28 = local9;
if (local19 < local9) {
local28 = local19;
}
@Pc(37) int local37 = arg3[arg5];
if (arg3[arg6] < local37) {
local37 = arg3[arg6];
}
@Pc(50) byte[] local50 = arg1[arg5];
@Pc(54) byte[] local54 = arg0[arg6];
@Pc(58) int local58 = local21 - local3;
@Pc(62) int local62 = local21 - local13;
for (@Pc(64) int local64 = local21; local64 < local28; local64++) {
@Pc(77) int local77 = local50[local58++] + local54[local62++];
if (local77 < local37) {
local37 = local77;
}
}
return -local37;
}
@OriginalMember(owner = "client!rk", name = "a", descriptor = "(Lclient!na;IIIIIIIII)I") @OriginalMember(owner = "client!rk", name = "a", descriptor = "(Lclient!na;IIIIIIIII)I")
public final int method2852(@OriginalArg(0) JagString 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) int arg8, @OriginalArg(9) int arg9) { public final int method2852(@OriginalArg(0) JagString 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) int arg8, @OriginalArg(9) int arg9) {
return this.renderParagraphAlpha(arg0, arg1, arg2, arg3, arg4, arg5, arg6, arg7, arg8, arg9); return this.renderParagraphAlpha(arg0, arg1, arg2, arg3, arg4, arg5, arg6, arg7, arg8, arg9);
@ -86,31 +216,31 @@ public abstract class Font extends SecondaryNode {
if (local22 == 62 && local6 != -1) { if (local22 == 62 && local6 != -1) {
@Pc(42) JagString local42 = arg0.substring(local14, local6 + 1); @Pc(42) JagString local42 = arg0.substring(local14, local6 + 1);
local6 = -1; local6 = -1;
if (local42.strEquals(Static218.TAG_LT)) { if (local42.strEquals(TAG_LT)) {
local22 = 60; local22 = 60;
} else if (local42.strEquals(Static218.TAG_GT)) { } else if (local42.strEquals(TAG_GT)) {
local22 = 62; local22 = 62;
} else if (local42.strEquals(Static218.TAG_NBSP)) { } else if (local42.strEquals(TAG_NBSP)) {
local22 = 160; local22 = 160;
} else if (local42.strEquals(Static218.TAB_SHY)) { } else if (local42.strEquals(TAB_SHY)) {
local22 = 173; local22 = 173;
} else if (local42.strEquals(Static218.TAB_TIMES)) { } else if (local42.strEquals(TAB_TIMES)) {
local22 = 215; local22 = 215;
} else if (local42.strEquals(Static218.TAB_EURO)) { } else if (local42.strEquals(TAB_EURO)) {
local22 = 128; local22 = 128;
} else if (local42.strEquals(Static218.TAB_COPY)) { } else if (local42.strEquals(TAB_COPY)) {
local22 = 169; local22 = 169;
} else { } else {
if (!local42.strEquals(Static218.TAG_REG)) { if (!local42.strEquals(TAG_REG)) {
if (local42.startsWith(Static218.TAG_IMG)) { if (local42.startsWith(TAG_IMG)) {
try { try {
local120 = local42.substring(4).parseInt(); local120 = local42.substring(4).parseInt();
@Pc(125) IndexedSprite local125 = this.nameIcons[local120]; @Pc(125) IndexedSprite local125 = this.nameIcons[local120];
@Pc(136) int local136 = this.nameIconHeights == null ? local125.innerHeight : this.nameIconHeights[local120]; @Pc(136) int local136 = this.nameIconHeights == null ? local125.innerHeight : this.nameIconHeights[local120];
if (Static218.alphaOverride == 256) { if (alphaOverride == 256) {
local125.renderTransparent(arg1, local4 + this.lineHeight - local136); local125.renderTransparent(arg1, local4 + this.lineHeight - local136);
} else { } else {
local125.method3335(arg1, local4 + this.lineHeight - local136, Static218.alphaOverride); local125.method3335(arg1, local4 + this.lineHeight - local136, alphaOverride);
} }
arg1 += local125.innerWidth; arg1 += local125.innerWidth;
local8 = 0; local8 = 0;
@ -131,35 +261,35 @@ public abstract class Font extends SecondaryNode {
@Pc(197) int local197 = this.spriteInnerWidths[local22]; @Pc(197) int local197 = this.spriteInnerWidths[local22];
local120 = this.spriteInnerHeights[local22]; local120 = this.spriteInnerHeights[local22];
if (local22 == 32) { if (local22 == 32) {
if (Static218.spaceWidth > 0) { if (spaceWidth > 0) {
Static218.anInt3629 += Static218.spaceWidth; anInt3629 += spaceWidth;
arg1 += Static218.anInt3629 >> 8; arg1 += anInt3629 >> 8;
Static218.anInt3629 &= 0xFF; anInt3629 &= 0xFF;
} }
} else if (Static218.alphaOverride == 256) { } else if (alphaOverride == 256) {
if (Static218.shadowColorOverride != -1) { if (shadowColorOverride != -1) {
this.renderGlyph(local22, arg1 + this.spriteXOffsets[local22] + 1, local4 + this.spriteYOffsets[local22] + 1, local197, local120, Static218.shadowColorOverride); this.renderGlyph(local22, arg1 + this.spriteXOffsets[local22] + 1, local4 + this.spriteYOffsets[local22] + 1, local197, local120, shadowColorOverride);
} }
this.renderGlyph(local22, arg1 + this.spriteXOffsets[local22], local4 + this.spriteYOffsets[local22], local197, local120, Static218.colorOverride); this.renderGlyph(local22, arg1 + this.spriteXOffsets[local22], local4 + this.spriteYOffsets[local22], local197, local120, colorOverride);
} else { } else {
if (Static218.shadowColorOverride != -1) { if (shadowColorOverride != -1) {
this.renderGlyphTransparent(local22, arg1 + this.spriteXOffsets[local22] + 1, local4 + this.spriteYOffsets[local22] + 1, local197, local120, Static218.shadowColorOverride, Static218.alphaOverride); this.renderGlyphTransparent(local22, arg1 + this.spriteXOffsets[local22] + 1, local4 + this.spriteYOffsets[local22] + 1, local197, local120, shadowColorOverride, alphaOverride);
} }
this.renderGlyphTransparent(local22, arg1 + this.spriteXOffsets[local22], local4 + this.spriteYOffsets[local22], local197, local120, Static218.colorOverride, Static218.alphaOverride); this.renderGlyphTransparent(local22, arg1 + this.spriteXOffsets[local22], local4 + this.spriteYOffsets[local22], local197, local120, colorOverride, alphaOverride);
} }
@Pc(323) int local323 = this.glyphWidths[local22]; @Pc(323) int local323 = this.glyphWidths[local22];
if (Static218.strikethroughColor != -1) { if (strikethroughColor != -1) {
if (GlRenderer.enabled) { if (GlRenderer.enabled) {
Static46.method1174(arg1, local4 + (int) ((double) this.lineHeight * 0.7D), local323, Static218.strikethroughColor); Static46.method1174(arg1, local4 + (int) ((double) this.lineHeight * 0.7D), local323, strikethroughColor);
} else { } else {
SoftwareRaster.drawHorizontalLine(arg1, local4 + (int) ((double) this.lineHeight * 0.7D), local323, Static218.strikethroughColor); SoftwareRaster.drawHorizontalLine(arg1, local4 + (int) ((double) this.lineHeight * 0.7D), local323, strikethroughColor);
} }
} }
if (Static218.underlineColor != -1) { if (underlineColor != -1) {
if (GlRenderer.enabled) { if (GlRenderer.enabled) {
Static46.method1174(arg1, local4 + this.lineHeight + 1, local323, Static218.underlineColor); Static46.method1174(arg1, local4 + this.lineHeight + 1, local323, underlineColor);
} else { } else {
SoftwareRaster.drawHorizontalLine(arg1, local4 + this.lineHeight + 1, local323, Static218.underlineColor); SoftwareRaster.drawHorizontalLine(arg1, local4 + this.lineHeight + 1, local323, underlineColor);
} }
} }
arg1 += local323; arg1 += local323;
@ -177,10 +307,10 @@ public abstract class Font extends SecondaryNode {
@OriginalMember(owner = "client!rk", name = "b", descriptor = "(Lclient!na;I)I") @OriginalMember(owner = "client!rk", name = "b", descriptor = "(Lclient!na;I)I")
public final int method2856(@OriginalArg(0) JagString arg0, @OriginalArg(1) int arg1) { public final int method2856(@OriginalArg(0) JagString arg0, @OriginalArg(1) int arg1) {
@Pc(10) int local10 = this.splitParagraph(arg0, new int[] { arg1 }, Static218.lines); @Pc(10) int local10 = this.splitParagraph(arg0, new int[] { arg1 }, lines);
@Pc(12) int local12 = 0; @Pc(12) int local12 = 0;
for (@Pc(14) int local14 = 0; local14 < local10; local14++) { for (@Pc(14) int local14 = 0; local14 < local10; local14++) {
@Pc(23) int local23 = this.getStringWidth(Static218.lines[local14]); @Pc(23) int local23 = this.getStringWidth(lines[local14]);
if (local23 > local12) { if (local23 > local12) {
local12 = local23; local12 = local23;
} }
@ -213,23 +343,23 @@ public abstract class Font extends SecondaryNode {
if (local23 == 62 && local5 != -1) { if (local23 == 62 && local5 != -1) {
@Pc(43) JagString local43 = arg0.substring(local15, local5 + 1); @Pc(43) JagString local43 = arg0.substring(local15, local5 + 1);
local5 = -1; local5 = -1;
if (local43.strEquals(Static218.TAG_LT)) { if (local43.strEquals(TAG_LT)) {
local23 = 60; local23 = 60;
} else if (local43.strEquals(Static218.TAG_GT)) { } else if (local43.strEquals(TAG_GT)) {
local23 = 62; local23 = 62;
} else if (local43.strEquals(Static218.TAG_NBSP)) { } else if (local43.strEquals(TAG_NBSP)) {
local23 = 160; local23 = 160;
} else if (local43.strEquals(Static218.TAB_SHY)) { } else if (local43.strEquals(TAB_SHY)) {
local23 = 173; local23 = 173;
} else if (local43.strEquals(Static218.TAB_TIMES)) { } else if (local43.strEquals(TAB_TIMES)) {
local23 = 215; local23 = 215;
} else if (local43.strEquals(Static218.TAB_EURO)) { } else if (local43.strEquals(TAB_EURO)) {
local23 = 128; local23 = 128;
} else if (local43.strEquals(Static218.TAB_COPY)) { } else if (local43.strEquals(TAB_COPY)) {
local23 = 169; local23 = 169;
} else { } else {
if (!local43.strEquals(Static218.TAG_REG)) { if (!local43.strEquals(TAG_REG)) {
if (local43.startsWith(Static218.TAG_IMG)) { if (local43.startsWith(TAG_IMG)) {
try { try {
@Pc(121) int local121 = local43.substring(4).parseInt(); @Pc(121) int local121 = local43.substring(4).parseInt();
local9 += this.nameIcons[local121].innerWidth; local9 += this.nameIcons[local121].innerWidth;
@ -276,40 +406,40 @@ public abstract class Font extends SecondaryNode {
@OriginalMember(owner = "client!rk", name = "c", descriptor = "(Lclient!na;I)I") @OriginalMember(owner = "client!rk", name = "c", descriptor = "(Lclient!na;I)I")
public final int getParagraphLineCount(@OriginalArg(0) JagString arg0, @OriginalArg(1) int arg1) { public final int getParagraphLineCount(@OriginalArg(0) JagString arg0, @OriginalArg(1) int arg1) {
return this.splitParagraph(arg0, new int[] { arg1 }, Static218.lines); return this.splitParagraph(arg0, new int[] { arg1 }, lines);
} }
@OriginalMember(owner = "client!rk", name = "b", descriptor = "(Lclient!na;)V") @OriginalMember(owner = "client!rk", name = "b", descriptor = "(Lclient!na;)V")
private void parseTag(@OriginalArg(0) JagString arg0) { private void parseTag(@OriginalArg(0) JagString arg0) {
try { try {
if (arg0.startsWith(Static218.TAG_COL1)) { if (arg0.startsWith(TAG_COL1)) {
Static218.colorOverride = arg0.substring(4).parseHexString(16); colorOverride = arg0.substring(4).parseHexString(16);
} else if (arg0.strEquals(Static218.TAG_COL2)) { } else if (arg0.strEquals(TAG_COL2)) {
Static218.colorOverride = Static218.color; colorOverride = color;
} else if (arg0.startsWith(Static218.TAG_TRANS1)) { } else if (arg0.startsWith(TAG_TRANS1)) {
Static218.alphaOverride = arg0.substring(6).parseInt(); alphaOverride = arg0.substring(6).parseInt();
} else if (arg0.strEquals(Static218.TAG_TRANS2)) { } else if (arg0.strEquals(TAG_TRANS2)) {
Static218.alphaOverride = Static218.alpha; alphaOverride = alpha;
} else if (arg0.startsWith(Static218.TAG_STR1)) { } else if (arg0.startsWith(TAG_STR1)) {
Static218.strikethroughColor = arg0.substring(4).parseHexString(16); strikethroughColor = arg0.substring(4).parseHexString(16);
} else if (arg0.strEquals(Static218.TAG_STR2)) { } else if (arg0.strEquals(TAG_STR2)) {
Static218.strikethroughColor = 0x800000; strikethroughColor = 0x800000;
} else if (arg0.strEquals(Static218.TAG_STR3)) { } else if (arg0.strEquals(TAG_STR3)) {
Static218.strikethroughColor = -1; strikethroughColor = -1;
} else if (arg0.startsWith(Static218.TAG_U1)) { } else if (arg0.startsWith(TAG_U1)) {
Static218.underlineColor = arg0.substring(2).parseHexString(16); underlineColor = arg0.substring(2).parseHexString(16);
} else if (arg0.strEquals(Static218.TAG_U2)) { } else if (arg0.strEquals(TAG_U2)) {
Static218.underlineColor = 0; underlineColor = 0;
} else if (arg0.strEquals(Static218.TAG_U3)) { } else if (arg0.strEquals(TAG_U3)) {
Static218.underlineColor = -1; underlineColor = -1;
} else if (arg0.startsWith(Static218.TAG_SHAD1)) { } else if (arg0.startsWith(TAG_SHAD1)) {
Static218.shadowColorOverride = arg0.substring(5).parseHexString(16); shadowColorOverride = arg0.substring(5).parseHexString(16);
} else if (arg0.strEquals(Static218.TAG_SHAD2)) { } else if (arg0.strEquals(TAG_SHAD2)) {
Static218.shadowColorOverride = 0; shadowColorOverride = 0;
} else if (arg0.strEquals(Static218.TAG_SHAD3)) { } else if (arg0.strEquals(TAG_SHAD3)) {
Static218.shadowColorOverride = Static218.shadowColor; shadowColorOverride = shadowColor;
} else if (arg0.strEquals(Static218.TAG_BR)) { } else if (arg0.strEquals(TAG_BR)) {
this.setColors(Static218.color, Static218.shadowColor, Static218.alpha); this.setColors(color, shadowColor, alpha);
} }
} catch (@Pc(144) Exception local144) { } catch (@Pc(144) Exception local144) {
} }
@ -344,7 +474,7 @@ public abstract class Font extends SecondaryNode {
} }
} }
if (local1 > 0) { if (local1 > 0) {
Static218.spaceWidth = (arg1 - this.getStringWidth(arg0) << 8) / local1; spaceWidth = (arg1 - this.getStringWidth(arg0) << 8) / local1;
} }
} }
@ -353,7 +483,7 @@ public abstract class Font extends SecondaryNode {
if (arg0 == null) { if (arg0 == null) {
return 0; return 0;
} }
Static218.buffer.method3133(0); buffer.method3133(0);
@Pc(9) int local9 = 0; @Pc(9) int local9 = 0;
@Pc(11) int local11 = 0; @Pc(11) int local11 = 0;
@Pc(13) int local13 = -1; @Pc(13) int local13 = -1;
@ -371,70 +501,70 @@ public abstract class Font extends SecondaryNode {
if (local37 == 62 && local19 != -1) { if (local37 == 62 && local19 != -1) {
@Pc(57) JagString local57 = arg0.substring(local29, local19 + 1); @Pc(57) JagString local57 = arg0.substring(local29, local19 + 1);
local19 = -1; local19 = -1;
Static218.buffer.append(60); buffer.append(60);
Static218.buffer.method3113(local57); buffer.method3113(local57);
Static218.buffer.append(62); buffer.append(62);
if (local57.strEquals(Static218.TAG_BR)) { if (local57.strEquals(TAG_BR)) {
if (arg2[local23] == null) { if (arg2[local23] == null) {
arg2[local23] = Static218.buffer.asString().substring(Static218.buffer.length(), local11); arg2[local23] = buffer.asString().substring(buffer.length(), local11);
} else { } else {
arg2[local23].method3133(0); arg2[local23].method3133(0);
arg2[local23].method3122(Static218.buffer, local11, Static218.buffer.length()); arg2[local23].method3122(buffer, local11, buffer.length());
} }
local23++; local23++;
local11 = Static218.buffer.length(); local11 = buffer.length();
local9 = 0; local9 = 0;
local13 = -1; local13 = -1;
local21 = 0; local21 = 0;
} else if (local57.strEquals(Static218.TAG_LT)) { } else if (local57.strEquals(TAG_LT)) {
local9 += this.getGlyphWidth(60); local9 += this.getGlyphWidth(60);
if (this.kerning != null && local21 != 0) { if (this.kerning != null && local21 != 0) {
local9 += this.kerning[(local21 << 8) + 60]; local9 += this.kerning[(local21 << 8) + 60];
} }
local21 = 60; local21 = 60;
} else if (local57.strEquals(Static218.TAG_GT)) { } else if (local57.strEquals(TAG_GT)) {
local9 += this.getGlyphWidth(62); local9 += this.getGlyphWidth(62);
if (this.kerning != null && local21 != 0) { if (this.kerning != null && local21 != 0) {
local9 += this.kerning[(local21 << 8) + 62]; local9 += this.kerning[(local21 << 8) + 62];
} }
local21 = 62; local21 = 62;
} else if (local57.strEquals(Static218.TAG_NBSP)) { } else if (local57.strEquals(TAG_NBSP)) {
local9 += this.getGlyphWidth(160); local9 += this.getGlyphWidth(160);
if (this.kerning != null && local21 != 0) { if (this.kerning != null && local21 != 0) {
local9 += this.kerning[(local21 << 8) + 160]; local9 += this.kerning[(local21 << 8) + 160];
} }
local21 = 160; local21 = 160;
} else if (local57.strEquals(Static218.TAB_SHY)) { } else if (local57.strEquals(TAB_SHY)) {
local9 += this.getGlyphWidth(173); local9 += this.getGlyphWidth(173);
if (this.kerning != null && local21 != 0) { if (this.kerning != null && local21 != 0) {
local9 += this.kerning[(local21 << 8) + 173]; local9 += this.kerning[(local21 << 8) + 173];
} }
local21 = 173; local21 = 173;
} else if (local57.strEquals(Static218.TAB_TIMES)) { } else if (local57.strEquals(TAB_TIMES)) {
local9 += this.getGlyphWidth(215); local9 += this.getGlyphWidth(215);
if (this.kerning != null && local21 != 0) { if (this.kerning != null && local21 != 0) {
local9 += this.kerning[(local21 << 8) + 215]; local9 += this.kerning[(local21 << 8) + 215];
} }
local21 = 215; local21 = 215;
} else if (local57.strEquals(Static218.TAB_EURO)) { } else if (local57.strEquals(TAB_EURO)) {
local9 += this.getGlyphWidth(128); local9 += this.getGlyphWidth(128);
if (this.kerning != null && local21 != 0) { if (this.kerning != null && local21 != 0) {
local9 += this.kerning[(local21 << 8) + 128]; local9 += this.kerning[(local21 << 8) + 128];
} }
local21 = 128; local21 = 128;
} else if (local57.strEquals(Static218.TAB_COPY)) { } else if (local57.strEquals(TAB_COPY)) {
local9 += this.getGlyphWidth(169); local9 += this.getGlyphWidth(169);
if (this.kerning != null && local21 != 0) { if (this.kerning != null && local21 != 0) {
local9 += this.kerning[(local21 << 8) + 169]; local9 += this.kerning[(local21 << 8) + 169];
} }
local21 = 169; local21 = 169;
} else if (local57.strEquals(Static218.TAG_REG)) { } else if (local57.strEquals(TAG_REG)) {
local9 += this.getGlyphWidth(174); local9 += this.getGlyphWidth(174);
if (this.kerning != null && local21 != 0) { if (this.kerning != null && local21 != 0) {
local9 += this.kerning[(local21 << 8) + 174]; local9 += this.kerning[(local21 << 8) + 174];
} }
local21 = 174; local21 = 174;
} else if (local57.startsWith(Static218.TAG_IMG)) { } else if (local57.startsWith(TAG_IMG)) {
try { try {
@Pc(377) int local377 = local57.substring(4).parseInt(); @Pc(377) int local377 = local57.substring(4).parseInt();
local9 += this.nameIcons[local377].innerWidth; local9 += this.nameIcons[local377].innerWidth;
@ -446,7 +576,7 @@ public abstract class Font extends SecondaryNode {
} }
if (local19 == -1) { if (local19 == -1) {
if (local37 != 0) { if (local37 != 0) {
Static218.buffer.append(local37); buffer.append(local37);
local9 += this.glyphWidths[local37]; local9 += this.glyphWidths[local37];
if (this.kerning != null && local21 != 0) { if (this.kerning != null && local21 != 0) {
local9 += this.kerning[(local21 << 8) + local37]; local9 += this.kerning[(local21 << 8) + local37];
@ -454,16 +584,16 @@ public abstract class Font extends SecondaryNode {
local21 = local37; local21 = local37;
} }
if (local37 == 32) { if (local37 == 32) {
local13 = Static218.buffer.length(); local13 = buffer.length();
local15 = local9; local15 = local9;
local17 = 1; local17 = 1;
} }
if (arg1 != null && local9 > arg1[local23 < arg1.length ? local23 : arg1.length - 1] && local13 >= 0) { if (arg1 != null && local9 > arg1[local23 < arg1.length ? local23 : arg1.length - 1] && local13 >= 0) {
if (arg2[local23] == null) { if (arg2[local23] == null) {
arg2[local23] = Static218.buffer.asString().substring(local13 - local17, local11); arg2[local23] = buffer.asString().substring(local13 - local17, local11);
} else { } else {
arg2[local23].method3133(0); arg2[local23].method3133(0);
arg2[local23] = arg2[local23].method3122(Static218.buffer, local11, local13 - local17); arg2[local23] = arg2[local23].method3122(buffer, local11, local13 - local17);
} }
local23++; local23++;
local11 = local13; local11 = local13;
@ -472,19 +602,19 @@ public abstract class Font extends SecondaryNode {
local21 = 0; local21 = 0;
} }
if (local37 == 45) { if (local37 == 45) {
local13 = Static218.buffer.length(); local13 = buffer.length();
local15 = local9; local15 = local9;
local17 = 0; local17 = 0;
} }
} }
} }
} }
if (Static218.buffer.length() > local11) { if (buffer.length() > local11) {
if (arg2[local23] == null) { if (arg2[local23] == null) {
arg2[local23] = Static218.buffer.asString().substring(Static218.buffer.length(), local11); arg2[local23] = buffer.asString().substring(buffer.length(), local11);
} else { } else {
arg2[local23].method3133(0); arg2[local23].method3133(0);
arg2[local23] = arg2[local23].method3122(Static218.buffer, local11, Static218.buffer.length()); arg2[local23] = arg2[local23].method3122(buffer, local11, buffer.length());
} }
local23++; local23++;
} }
@ -522,7 +652,7 @@ public abstract class Font extends SecondaryNode {
if (arg4 < this.paragraphTopPadding + this.paragraphBottomPadding + arg9 && arg4 < arg9 + arg9) { if (arg4 < this.paragraphTopPadding + this.paragraphBottomPadding + arg9 && arg4 < arg9 + arg9) {
local20 = null; local20 = null;
} }
@Pc(42) int local42 = this.splitParagraph(arg0, local20, Static218.lines); @Pc(42) int local42 = this.splitParagraph(arg0, local20, lines);
if (arg8 == 3 && local42 == 1) { if (arg8 == 3 && local42 == 1) {
arg8 = 1; arg8 = 1;
} }
@ -544,17 +674,17 @@ public abstract class Font extends SecondaryNode {
} }
for (local118 = 0; local118 < local42; local118++) { for (local118 = 0; local118 < local42; local118++) {
if (arg7 == 0) { if (arg7 == 0) {
this.render(Static218.lines[local118], arg1, local57); this.render(lines[local118], arg1, local57);
} else if (arg7 == 1) { } else if (arg7 == 1) {
this.render(Static218.lines[local118], arg1 + (arg3 - this.getStringWidth(Static218.lines[local118])) / 2, local57); this.render(lines[local118], arg1 + (arg3 - this.getStringWidth(lines[local118])) / 2, local57);
} else if (arg7 == 2) { } else if (arg7 == 2) {
this.render(Static218.lines[local118], arg1 + arg3 - this.getStringWidth(Static218.lines[local118]), local57); this.render(lines[local118], arg1 + arg3 - this.getStringWidth(lines[local118]), local57);
} else if (local118 == local42 - 1) { } else if (local118 == local42 - 1) {
this.render(Static218.lines[local118], arg1, local57); this.render(lines[local118], arg1, local57);
} else { } else {
this.justify(Static218.lines[local118], arg3); this.justify(lines[local118], arg3);
this.render(Static218.lines[local118], arg1, local57); this.render(lines[local118], arg1, local57);
Static218.spaceWidth = 0; spaceWidth = 0;
} }
local57 += arg9; local57 += arg9;
} }
@ -602,16 +732,16 @@ public abstract class Font extends SecondaryNode {
@OriginalMember(owner = "client!rk", name = "c", descriptor = "(II)V") @OriginalMember(owner = "client!rk", name = "c", descriptor = "(II)V")
private void setColors(@OriginalArg(0) int arg0, @OriginalArg(1) int arg1) { private void setColors(@OriginalArg(0) int arg0, @OriginalArg(1) int arg1) {
Static218.strikethroughColor = -1; strikethroughColor = -1;
Static218.underlineColor = -1; underlineColor = -1;
Static218.shadowColor = arg1; shadowColor = arg1;
Static218.shadowColorOverride = arg1; shadowColorOverride = arg1;
Static218.color = arg0; color = arg0;
Static218.colorOverride = arg0; colorOverride = arg0;
Static218.alpha = 256; alpha = 256;
Static218.alphaOverride = 256; alphaOverride = 256;
Static218.spaceWidth = 0; spaceWidth = 0;
Static218.anInt3629 = 0; anInt3629 = 0;
} }
@OriginalMember(owner = "client!rk", name = "c", descriptor = "(Lclient!na;IIII)V") @OriginalMember(owner = "client!rk", name = "c", descriptor = "(Lclient!na;IIII)V")
@ -671,7 +801,7 @@ public abstract class Font extends SecondaryNode {
if (local138 != 32 && local138 != 160) { if (local138 != 32 && local138 != 160) {
for (local109 = 0; local109 < 256; local109++) { for (local109 = 0; local109 < 256; local109++) {
if (local109 != 32 && local109 != 160) { if (local109 != 32 && local109 != 160) {
this.kerning[(local138 << 8) + local109] = (byte) Static218.method2870(local93, local136, local58, this.glyphWidths, local55, local138, local109); this.kerning[(local138 << 8) + local109] = (byte) method2870(local93, local136, local58, this.glyphWidths, local55, local138, local109);
} }
} }
} }
@ -681,16 +811,16 @@ public abstract class Font extends SecondaryNode {
@OriginalMember(owner = "client!rk", name = "a", descriptor = "(III)V") @OriginalMember(owner = "client!rk", name = "a", descriptor = "(III)V")
private void setColors(@OriginalArg(0) int arg0, @OriginalArg(1) int arg1, @OriginalArg(2) int arg2) { private void setColors(@OriginalArg(0) int arg0, @OriginalArg(1) int arg1, @OriginalArg(2) int arg2) {
Static218.strikethroughColor = -1; strikethroughColor = -1;
Static218.underlineColor = -1; underlineColor = -1;
Static218.shadowColor = arg1; shadowColor = arg1;
Static218.shadowColorOverride = arg1; shadowColorOverride = arg1;
Static218.color = arg0; color = arg0;
Static218.colorOverride = arg0; colorOverride = arg0;
Static218.alpha = arg2; alpha = arg2;
Static218.alphaOverride = arg2; alphaOverride = arg2;
Static218.spaceWidth = 0; spaceWidth = 0;
Static218.anInt3629 = 0; anInt3629 = 0;
} }
@OriginalMember(owner = "client!rk", name = "a", descriptor = "(Lclient!na;IIIIIIIILjava/util/Random;I[I)I") @OriginalMember(owner = "client!rk", name = "a", descriptor = "(Lclient!na;IIIIIIIILjava/util/Random;I[I)I")
@ -756,23 +886,23 @@ public abstract class Font extends SecondaryNode {
if (local24 == 62 && local6 != -1) { if (local24 == 62 && local6 != -1) {
@Pc(44) JagString local44 = arg0.substring(local16, local6 + 1); @Pc(44) JagString local44 = arg0.substring(local16, local6 + 1);
local6 = -1; local6 = -1;
if (local44.strEquals(Static218.TAG_LT)) { if (local44.strEquals(TAG_LT)) {
local24 = 60; local24 = 60;
} else if (local44.strEquals(Static218.TAG_GT)) { } else if (local44.strEquals(TAG_GT)) {
local24 = 62; local24 = 62;
} else if (local44.strEquals(Static218.TAG_NBSP)) { } else if (local44.strEquals(TAG_NBSP)) {
local24 = 160; local24 = 160;
} else if (local44.strEquals(Static218.TAB_SHY)) { } else if (local44.strEquals(TAB_SHY)) {
local24 = 173; local24 = 173;
} else if (local44.strEquals(Static218.TAB_TIMES)) { } else if (local44.strEquals(TAB_TIMES)) {
local24 = 215; local24 = 215;
} else if (local44.strEquals(Static218.TAB_EURO)) { } else if (local44.strEquals(TAB_EURO)) {
local24 = 128; local24 = 128;
} else if (local44.strEquals(Static218.TAB_COPY)) { } else if (local44.strEquals(TAB_COPY)) {
local24 = 169; local24 = 169;
} else { } else {
if (!local44.strEquals(Static218.TAG_REG)) { if (!local44.strEquals(TAG_REG)) {
if (local44.startsWith(Static218.TAG_IMG)) { if (local44.startsWith(TAG_IMG)) {
try { try {
if (arg3 == null) { if (arg3 == null) {
local121 = 0; local121 = 0;
@ -788,10 +918,10 @@ public abstract class Font extends SecondaryNode {
local141 = local44.substring(4).parseInt(); local141 = local44.substring(4).parseInt();
@Pc(146) IndexedSprite local146 = this.nameIcons[local141]; @Pc(146) IndexedSprite local146 = this.nameIcons[local141];
@Pc(157) int local157 = this.nameIconHeights == null ? local146.innerHeight : this.nameIconHeights[local141]; @Pc(157) int local157 = this.nameIconHeights == null ? local146.innerHeight : this.nameIconHeights[local141];
if (Static218.alphaOverride == 256) { if (alphaOverride == 256) {
local146.renderTransparent(arg1 + local121, local4 + this.lineHeight - local157 + local130); local146.renderTransparent(arg1 + local121, local4 + this.lineHeight - local157 + local130);
} else { } else {
local146.method3335(arg1 + local121, local4 + this.lineHeight - local157 + local130, Static218.alphaOverride); local146.method3335(arg1 + local121, local4 + this.lineHeight - local157 + local130, alphaOverride);
} }
arg1 += local146.innerWidth; arg1 += local146.innerWidth;
local8 = 0; local8 = 0;
@ -823,35 +953,35 @@ public abstract class Font extends SecondaryNode {
} }
local10++; local10++;
if (local24 == 32) { if (local24 == 32) {
if (Static218.spaceWidth > 0) { if (spaceWidth > 0) {
Static218.anInt3629 += Static218.spaceWidth; anInt3629 += spaceWidth;
arg1 += Static218.anInt3629 >> 8; arg1 += anInt3629 >> 8;
Static218.anInt3629 &= 0xFF; anInt3629 &= 0xFF;
} }
} else if (Static218.alphaOverride == 256) { } else if (alphaOverride == 256) {
if (Static218.shadowColorOverride != -1) { if (shadowColorOverride != -1) {
this.renderGlyph(local24, arg1 + this.spriteXOffsets[local24] + local130 + 1, local4 + this.spriteYOffsets[local24] + 1 + local141, local226, local121, Static218.shadowColorOverride); this.renderGlyph(local24, arg1 + this.spriteXOffsets[local24] + local130 + 1, local4 + this.spriteYOffsets[local24] + 1 + local141, local226, local121, shadowColorOverride);
} }
this.renderGlyph(local24, arg1 + this.spriteXOffsets[local24] + local130, local4 + this.spriteYOffsets[local24] + local141, local226, local121, Static218.colorOverride); this.renderGlyph(local24, arg1 + this.spriteXOffsets[local24] + local130, local4 + this.spriteYOffsets[local24] + local141, local226, local121, colorOverride);
} else { } else {
if (Static218.shadowColorOverride != -1) { if (shadowColorOverride != -1) {
this.renderGlyphTransparent(local24, arg1 + this.spriteXOffsets[local24] + local130 + 1, local4 + this.spriteYOffsets[local24] + 1 + local141, local226, local121, Static218.shadowColorOverride, Static218.alphaOverride); this.renderGlyphTransparent(local24, arg1 + this.spriteXOffsets[local24] + local130 + 1, local4 + this.spriteYOffsets[local24] + 1 + local141, local226, local121, shadowColorOverride, alphaOverride);
} }
this.renderGlyphTransparent(local24, arg1 + this.spriteXOffsets[local24] + local130, local4 + this.spriteYOffsets[local24] + local141, local226, local121, Static218.colorOverride, Static218.alphaOverride); this.renderGlyphTransparent(local24, arg1 + this.spriteXOffsets[local24] + local130, local4 + this.spriteYOffsets[local24] + local141, local226, local121, colorOverride, alphaOverride);
} }
@Pc(387) int local387 = this.glyphWidths[local24]; @Pc(387) int local387 = this.glyphWidths[local24];
if (Static218.strikethroughColor != -1) { if (strikethroughColor != -1) {
if (GlRenderer.enabled) { if (GlRenderer.enabled) {
Static46.method1174(arg1, local4 + (int) ((double) this.lineHeight * 0.7D), local387, Static218.strikethroughColor); Static46.method1174(arg1, local4 + (int) ((double) this.lineHeight * 0.7D), local387, strikethroughColor);
} else { } else {
SoftwareRaster.drawHorizontalLine(arg1, local4 + (int) ((double) this.lineHeight * 0.7D), local387, Static218.strikethroughColor); SoftwareRaster.drawHorizontalLine(arg1, local4 + (int) ((double) this.lineHeight * 0.7D), local387, strikethroughColor);
} }
} }
if (Static218.underlineColor != -1) { if (underlineColor != -1) {
if (GlRenderer.enabled) { if (GlRenderer.enabled) {
Static46.method1174(arg1, local4 + this.lineHeight, local387, Static218.underlineColor); Static46.method1174(arg1, local4 + this.lineHeight, local387, underlineColor);
} else { } else {
SoftwareRaster.drawHorizontalLine(arg1, local4 + this.lineHeight, local387, Static218.underlineColor); SoftwareRaster.drawHorizontalLine(arg1, local4 + this.lineHeight, local387, underlineColor);
} }
} }
arg1 += local387; arg1 += local387;

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

@ -1,6 +1,21 @@
import org.openrs2.deob.annotation.OriginalArg;
import org.openrs2.deob.annotation.OriginalMember; import org.openrs2.deob.annotation.OriginalMember;
import org.openrs2.deob.annotation.Pc;
public class FontMetricsList { public class FontMetricsList {
@OriginalMember(owner = "client!l", name = "f", descriptor = "Lclient!n;") @OriginalMember(owner = "client!l", name = "f", descriptor = "Lclient!n;")
public static final SoftLruHashTable fontMetrics = new SoftLruHashTable(4); public static final SoftLruHashTable fontMetrics = new SoftLruHashTable(4);
@OriginalMember(owner = "client!li", name = "a", descriptor = "(II)Lclient!dd;")
public static SoftwareFont get(@OriginalArg(1) int arg0) {
@Pc(16) SoftwareFont local16 = (SoftwareFont) fontMetrics.get((long) arg0);
if (local16 != null) {
return local16;
}
@Pc(26) byte[] local26 = client.js5Archive13.getFile(arg0, 0);
local16 = new SoftwareFont(local26);
local16.setNameIcons(Sprites.nameIcons, null);
fontMetrics.put(local16, (long) arg0);
return local16;
}
} }

103
client/src/main/java/FriendsList.java
View file

@ -1,6 +1,109 @@
import org.openrs2.deob.annotation.OriginalArg;
import org.openrs2.deob.annotation.OriginalMember; import org.openrs2.deob.annotation.OriginalMember;
import org.openrs2.deob.annotation.Pc;
public class FriendsList { public class FriendsList {
@OriginalMember(owner = "client!hd", name = "g", descriptor = "[J")
public static final long[] encodedUsernames = new long[200];
@OriginalMember(owner = "client!rg", name = "r", descriptor = "[Lclient!na;")
public static final JagString[] worldNames = new JagString[200];
@OriginalMember(owner = "client!ic", name = "l", descriptor = "[I")
public static final int[] ranks = new int[200];
@OriginalMember(owner = "client!ia", name = "d", descriptor = "[I")
public static final int[] worlds = new int[200];
@OriginalMember(owner = "client!jh", name = "b", descriptor = "[Lclient!na;")
public static final JagString[] usernames = new JagString[200];
@OriginalMember(owner = "client!p", name = "d", descriptor = "I") @OriginalMember(owner = "client!p", name = "d", descriptor = "I")
public static int transmitAt = 0; public static int transmitAt = 0;
@OriginalMember(owner = "client!nc", name = "m", descriptor = "I")
public static int state = 0;
@OriginalMember(owner = "client!al", name = "m", descriptor = "I")
public static int size = 0;
@OriginalMember(owner = "client!hj", name = "a", descriptor = "(Lclient!na;B)Z")
public static boolean contains(@OriginalArg(0) JagString arg0) {
if (arg0 == null) {
return false;
}
for (@Pc(12) int local12 = 0; local12 < size; local12++) {
if (arg0.equalsIgnoreCase(usernames[local12])) {
return true;
}
}
if (arg0.equalsIgnoreCase(PlayerList.self.username)) {
return true;
} else {
return false;
}
}
@OriginalMember(owner = "client!fb", name = "a", descriptor = "(JB)V")
public static void add(@OriginalArg(0) long arg0) {
if (arg0 == 0L) {
return;
}
if (size >= 100 && !LoginManager.playerMember || size >= 200) {
Chat.add(JagString.EMPTY, 0, LocalizedText.FRIENDLISTFULL);
return;
}
@Pc(35) JagString local35 = Base37.decode37(arg0).toTitleCase();
@Pc(42) int local42;
for (local42 = 0; local42 < size; local42++) {
if (encodedUsernames[local42] == arg0) {
Chat.add(JagString.EMPTY, 0, JagString.concatenate(new JagString[] { local35, LocalizedText.FRIENDLISTDUPE}));
return;
}
}
for (local42 = 0; local42 < IgnoreList.size; local42++) {
if (arg0 == IgnoreList.encodedUsernames[local42]) {
Chat.add(JagString.EMPTY, 0, JagString.concatenate(new JagString[] { LocalizedText.REMOVESOCIAL1, local35, LocalizedText.REMOVEIGNORE}));
return;
}
}
if (local35.strEquals(PlayerList.self.username)) {
Chat.add(JagString.EMPTY, 0, LocalizedText.FRIENDCANTADDSELF);
return;
}
usernames[size] = local35;
encodedUsernames[size] = arg0;
worlds[size] = 0;
worldNames[size] = JagString.EMPTY;
ranks[size] = 0;
Static3.aBooleanArray135[size] = false;
size++;
transmitAt = InterfaceList.transmitTimer;
Protocol.outboundBuffer.p1isaac(120);
Protocol.outboundBuffer.p8(arg0);
}
@OriginalMember(owner = "client!pi", name = "a", descriptor = "(JI)V")
public static void remove(@OriginalArg(0) long arg0) {
if (arg0 == 0L) {
return;
}
for (@Pc(13) int local13 = 0; local13 < size; local13++) {
if (encodedUsernames[local13] == arg0) {
size--;
for (@Pc(41) int local41 = local13; local41 < size; local41++) {
usernames[local41] = usernames[local41 + 1];
worlds[local41] = worlds[local41 + 1];
worldNames[local41] = worldNames[local41 + 1];
encodedUsernames[local41] = encodedUsernames[local41 + 1];
ranks[local41] = ranks[local41 + 1];
Static3.aBooleanArray135[local41] = Static3.aBooleanArray135[local41 + 1];
}
transmitAt = InterfaceList.transmitTimer;
Protocol.outboundBuffer.p1isaac(57);
Protocol.outboundBuffer.p8(arg0);
break;
}
}
}
@OriginalMember(owner = "client!ni", name = "a", descriptor = "(ILclient!na;I)V")
public static void setRank(@OriginalArg(1) JagString arg0, @OriginalArg(2) int arg1) {
Protocol.outboundBuffer.p1isaac(188);
Protocol.outboundBuffer.p1a(arg1);
Protocol.outboundBuffer.p8(arg0.encode37());
}
} }

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

@ -451,24 +451,16 @@ public abstract class GameShell extends Applet implements Runnable, FocusListene
if (Keyboard.pressedKeys[Keyboard.KEY_UP] || Keyboard.pressedKeys[Keyboard.KEY_DOWN] || Keyboard.pressedKeys[Keyboard.KEY_LEFT] || Keyboard.pressedKeys[Keyboard.KEY_RIGHT]) { if (Keyboard.pressedKeys[Keyboard.KEY_UP] || Keyboard.pressedKeys[Keyboard.KEY_DOWN] || Keyboard.pressedKeys[Keyboard.KEY_LEFT] || Keyboard.pressedKeys[Keyboard.KEY_RIGHT]) {
double vertical = calcRenderDelta(18.0d); double vertical = calcRenderDelta(18.0d);
if (Keyboard.pressedKeys[Keyboard.KEY_UP]) { if (Keyboard.pressedKeys[Keyboard.KEY_UP]) {
Camera.pitchDirection = 0;
Camera.pitchTarget += vertical; Camera.pitchTarget += vertical;
} else if (Keyboard.pressedKeys[Keyboard.KEY_DOWN]) { } else if (Keyboard.pressedKeys[Keyboard.KEY_DOWN]) {
Camera.pitchDirection = 1;
Camera.pitchTarget -= vertical; Camera.pitchTarget -= vertical;
} else {
Camera.pitchDirection = -1;
} }
double horizontal = calcRenderDelta(24.0d); double horizontal = calcRenderDelta(24.0d);
if (Keyboard.pressedKeys[Keyboard.KEY_LEFT]) { if (Keyboard.pressedKeys[Keyboard.KEY_LEFT]) {
Camera.yawDirection = 1;
Camera.yawTarget -= horizontal; Camera.yawTarget -= horizontal;
} else if (Keyboard.pressedKeys[Keyboard.KEY_RIGHT]) { } else if (Keyboard.pressedKeys[Keyboard.KEY_RIGHT]) {
Camera.yawDirection = 0;
Camera.yawTarget += horizontal; Camera.yawTarget += horizontal;
} else {
Camera.yawDirection = -1;
} }
Camera.clampCameraAngle(); Camera.clampCameraAngle();

21
client/src/main/java/GlFont.java
View file

@ -8,7 +8,9 @@ import org.openrs2.deob.annotation.Pc;
@OriginalClass("client!mb") @OriginalClass("client!mb")
public final class GlFont extends Font { public final class GlFont extends Font {
@OriginalMember(owner = "client!mb", name = "Gb", descriptor = "[I") @OriginalMember(owner = "client!dj", name = "a", descriptor = "Lclient!cf;")
public static GlSprite masked = null;
@OriginalMember(owner = "client!mb", name = "Gb", descriptor = "[I")
private int[] listIds; private int[] listIds;
@OriginalMember(owner = "client!mb", name = "Hb", descriptor = "I") @OriginalMember(owner = "client!mb", name = "Hb", descriptor = "I")
@ -30,6 +32,19 @@ public final class GlFont extends Font {
this.createLists(); this.createLists();
} }
@OriginalMember(owner = "client!dj", name = "a", descriptor = "()V")
public static void method1173() {
masked = null;
}
@OriginalMember(owner = "client!dj", name = "a", descriptor = "(Lclient!cf;)V")
public static void method1188(@OriginalArg(0) GlSprite arg0) {
if (arg0.anInt1859 != Static46.anInt1441 - Static46.clipY) {
throw new IllegalArgumentException();
}
masked = arg0;
}
@OriginalMember(owner = "client!mb", name = "finalize", descriptor = "()V") @OriginalMember(owner = "client!mb", name = "finalize", descriptor = "()V")
@Override @Override
protected void finalize() throws Throwable { protected void finalize() throws Throwable {
@ -51,7 +66,7 @@ public final class GlFont extends Font {
@Override @Override
protected final void renderGlyph(@OriginalArg(0) int glyph, @OriginalArg(1) int x, @OriginalArg(2) int y, @OriginalArg(3) int width, @OriginalArg(4) int height, @OriginalArg(5) int color) { protected final void renderGlyph(@OriginalArg(0) int glyph, @OriginalArg(1) int x, @OriginalArg(2) int y, @OriginalArg(3) int width, @OriginalArg(4) int height, @OriginalArg(5) int color) {
@Pc(4) GL2 gl; @Pc(4) GL2 gl;
if (Static46.mask == null) { if (masked == null) {
GlRenderer.method4151(); GlRenderer.method4151();
gl = GlRenderer.gl; gl = GlRenderer.gl;
GlRenderer.setTextureId(this.textureId); GlRenderer.setTextureId(this.textureId);
@ -70,7 +85,7 @@ public final class GlFont extends Font {
@Pc(51) float s1 = s0 + (float) this.spriteInnerWidths[glyph] / (float) this.powerOfTwoSize; @Pc(51) float s1 = s0 + (float) this.spriteInnerWidths[glyph] / (float) this.powerOfTwoSize;
@Pc(63) float t1 = t0 + (float) this.spriteInnerHeights[glyph] / (float) this.powerOfTwoSize; @Pc(63) float t1 = t0 + (float) this.spriteInnerHeights[glyph] / (float) this.powerOfTwoSize;
GlRenderer.setTextureId(this.textureId); GlRenderer.setTextureId(this.textureId);
@Pc(68) GlSprite mask = Static46.mask; @Pc(68) GlSprite mask = masked;
gl.glActiveTexture(GL2.GL_TEXTURE1); gl.glActiveTexture(GL2.GL_TEXTURE1);
gl.glEnable(GL2.GL_TEXTURE_2D); gl.glEnable(GL2.GL_TEXTURE_2D);
gl.glBindTexture(GL2.GL_TEXTURE_2D, mask.textureId); gl.glBindTexture(GL2.GL_TEXTURE_2D, mask.textureId);

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

File diff suppressed because it is too large Load diff

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

@ -49,7 +49,7 @@ public class GlSprite extends Sprite {
this.anInt1861 = arg0.anInt1861; this.anInt1861 = arg0.anInt1861;
this.anInt1867 = arg0.anInt1867; this.anInt1867 = arg0.anInt1867;
this.anInt1859 = arg0.anInt1859; this.anInt1859 = arg0.anInt1859;
this.method1430(arg0.anIntArray20); this.method1430(arg0.pixels);
this.method1431(); this.method1431();
} }

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

@ -9,6 +9,14 @@ import org.openrs2.deob.annotation.Pc;
@OriginalClass("client!hg") @OriginalClass("client!hg")
public final class GlTile extends Node { public final class GlTile extends Node {
@OriginalMember(owner = "client!hg", name = "J", descriptor = "Ljava/nio/ByteBuffer;")
public static ByteBuffer aByteBuffer4;
@OriginalMember(owner = "client!hg", name = "U", descriptor = "Lclient!wa;")
public static Buffer aClass3_Sub15_3;
@OriginalMember(owner = "client!hg", name = "K", descriptor = "Lclient!wa;")
public static Buffer aClass3_Sub15_2;
@OriginalMember(owner = "client!hg", name = "Q", descriptor = "Ljava/nio/ByteBuffer;")
public static ByteBuffer aByteBuffer5;
@OriginalMember(owner = "client!hg", name = "s", descriptor = "Ljava/nio/ByteBuffer;") @OriginalMember(owner = "client!hg", name = "s", descriptor = "Ljava/nio/ByteBuffer;")
private ByteBuffer aByteBuffer3; private ByteBuffer aByteBuffer3;
@ -102,6 +110,14 @@ public final class GlTile extends Node {
this.anInt2486 = arg4; this.anInt2486 = arg4;
} }
@OriginalMember(owner = "client!hg", name = "a", descriptor = "()V")
public static void method1939() {
aClass3_Sub15_3 = null;
aClass3_Sub15_2 = null;
aByteBuffer5 = null;
aByteBuffer4 = null;
}
@OriginalMember(owner = "client!hg", name = "b", descriptor = "()V") @OriginalMember(owner = "client!hg", name = "b", descriptor = "()V")
public final void method1940() { public final void method1940() {
this.anIntArray232 = new int[this.anInt2482]; this.anIntArray232 = new int[this.anInt2482];
@ -208,15 +224,15 @@ public final class GlTile extends Node {
@OriginalMember(owner = "client!hg", name = "a", descriptor = "([[[Lclient!bj;FZ)V") @OriginalMember(owner = "client!hg", name = "a", descriptor = "([[[Lclient!bj;FZ)V")
public final void method1944(@OriginalArg(0) Tile[][][] arg0, @OriginalArg(1) float arg1, @OriginalArg(2) boolean arg2) { public final void method1944(@OriginalArg(0) Tile[][][] arg0, @OriginalArg(1) float arg1, @OriginalArg(2) boolean arg2) {
if (Static95.aClass3_Sub15_3 == null || Static95.aClass3_Sub15_3.data.length < this.anInt2488 * 4) { if (aClass3_Sub15_3 == null || aClass3_Sub15_3.data.length < this.anInt2488 * 4) {
Static95.aClass3_Sub15_3 = new Buffer(this.anInt2488 * 4); aClass3_Sub15_3 = new Buffer(this.anInt2488 * 4);
} else { } else {
Static95.aClass3_Sub15_3.offset = 0; aClass3_Sub15_3.offset = 0;
} }
if (Static95.aClass3_Sub15_2 == null || Static95.aClass3_Sub15_2.data.length < this.anInt2487 * 4) { if (aClass3_Sub15_2 == null || aClass3_Sub15_2.data.length < this.anInt2487 * 4) {
Static95.aClass3_Sub15_2 = new Buffer(this.anInt2487 * 4); aClass3_Sub15_2 = new Buffer(this.anInt2487 * 4);
} else { } else {
Static95.aClass3_Sub15_2.offset = 0; aClass3_Sub15_2.offset = 0;
} }
@Pc(47) int local47; @Pc(47) int local47;
@Pc(68) Tile local68; @Pc(68) Tile local68;
@ -234,12 +250,12 @@ public final class GlTile extends Node {
local86 = this.anIntArrayArray18[local47]; local86 = this.anIntArrayArray18[local47];
if (local86 != null) { if (local86 != null) {
for (local90 = 0; local90 < local86.length; local90++) { for (local90 = 0; local90 < local86.length; local90++) {
Static95.aClass3_Sub15_2.p4(local86[local90]); aClass3_Sub15_2.p4(local86[local90]);
} }
} }
local111 = this.aBooleanArray54[local47] ? Static95.aClass3_Sub15_2 : Static95.aClass3_Sub15_3; local111 = this.aBooleanArray54[local47] ? aClass3_Sub15_2 : aClass3_Sub15_3;
} else { } else {
local111 = Static95.aClass3_Sub15_3; local111 = aClass3_Sub15_3;
} }
for (local116 = 1; local116 < local78.length - 1; local116++) { for (local116 = 1; local116 < local78.length - 1; local116++) {
local111.p4(local78[0]); local111.p4(local78[0]);
@ -257,12 +273,12 @@ public final class GlTile extends Node {
local86 = this.anIntArrayArray18[local47]; local86 = this.anIntArrayArray18[local47];
if (local86 != null) { if (local86 != null) {
for (local90 = 0; local90 < local86.length; local90++) { for (local90 = 0; local90 < local86.length; local90++) {
Static95.aClass3_Sub15_2.p4le(local86[local90]); aClass3_Sub15_2.p4le(local86[local90]);
} }
} }
local111 = this.aBooleanArray54[local47] ? Static95.aClass3_Sub15_2 : Static95.aClass3_Sub15_3; local111 = this.aBooleanArray54[local47] ? aClass3_Sub15_2 : aClass3_Sub15_3;
} else { } else {
local111 = Static95.aClass3_Sub15_3; local111 = aClass3_Sub15_3;
} }
for (local116 = 1; local116 < local78.length - 1; local116++) { for (local116 = 1; local116 < local78.length - 1; local116++) {
local111.p4le(local78[0]); local111.p4le(local78[0]);
@ -272,7 +288,7 @@ public final class GlTile extends Node {
} }
} }
} }
if (Static95.aClass3_Sub15_3.offset == 0 && Static95.aClass3_Sub15_2.offset == 0) { if (aClass3_Sub15_3.offset == 0 && aClass3_Sub15_2.offset == 0) {
return; return;
} }
@Pc(257) GL2 local257 = GlRenderer.gl; @Pc(257) GL2 local257 = GlRenderer.gl;
@ -320,30 +336,30 @@ public final class GlTile extends Node {
if (GlRenderer.arbVboSupported) { if (GlRenderer.arbVboSupported) {
local257.glBindBuffer(GL2.GL_ELEMENT_ARRAY_BUFFER, 0); local257.glBindBuffer(GL2.GL_ELEMENT_ARRAY_BUFFER, 0);
} }
if (Static95.aClass3_Sub15_3.offset != 0) { if (aClass3_Sub15_3.offset != 0) {
if (Static95.aByteBuffer5 == null || Static95.aByteBuffer5.capacity() < Static95.aClass3_Sub15_3.offset) { if (aByteBuffer5 == null || aByteBuffer5.capacity() < aClass3_Sub15_3.offset) {
Static95.aByteBuffer5 = ByteBuffer.allocateDirect(Static95.aClass3_Sub15_3.offset).order(ByteOrder.nativeOrder()); aByteBuffer5 = ByteBuffer.allocateDirect(aClass3_Sub15_3.offset).order(ByteOrder.nativeOrder());
} else { } else {
Static95.aByteBuffer5.clear(); aByteBuffer5.clear();
} }
Static95.aByteBuffer5.put(Static95.aClass3_Sub15_3.data, 0, Static95.aClass3_Sub15_3.offset); aByteBuffer5.put(aClass3_Sub15_3.data, 0, aClass3_Sub15_3.offset);
Static95.aByteBuffer5.flip(); aByteBuffer5.flip();
GlRenderer.method4159(arg1); GlRenderer.method4159(arg1);
local257.glDrawElements(GL2.GL_TRIANGLES, Static95.aClass3_Sub15_3.offset / 4, GL2.GL_UNSIGNED_INT, Static95.aByteBuffer5); local257.glDrawElements(GL2.GL_TRIANGLES, aClass3_Sub15_3.offset / 4, GL2.GL_UNSIGNED_INT, aByteBuffer5);
} }
if (Static95.aClass3_Sub15_2.offset == 0) { if (aClass3_Sub15_2.offset == 0) {
return; return;
} }
if (Static95.aByteBuffer4 == null || Static95.aByteBuffer4.capacity() < Static95.aClass3_Sub15_2.offset) { if (aByteBuffer4 == null || aByteBuffer4.capacity() < aClass3_Sub15_2.offset) {
Static95.aByteBuffer4 = ByteBuffer.allocateDirect(Static95.aClass3_Sub15_2.offset).order(ByteOrder.nativeOrder()); aByteBuffer4 = ByteBuffer.allocateDirect(aClass3_Sub15_2.offset).order(ByteOrder.nativeOrder());
} else { } else {
Static95.aByteBuffer4.clear(); aByteBuffer4.clear();
} }
Static95.aByteBuffer4.put(Static95.aClass3_Sub15_2.data, 0, Static95.aClass3_Sub15_2.offset); aByteBuffer4.put(aClass3_Sub15_2.data, 0, aClass3_Sub15_2.offset);
Static95.aByteBuffer4.flip(); aByteBuffer4.flip();
GlRenderer.method4159(arg1 - 100.0F); GlRenderer.method4159(arg1 - 100.0F);
GlRenderer.disableDepthMask(); GlRenderer.disableDepthMask();
local257.glDrawElements(GL2.GL_TRIANGLES, Static95.aClass3_Sub15_2.offset / 4, GL2.GL_UNSIGNED_INT, Static95.aByteBuffer4); local257.glDrawElements(GL2.GL_TRIANGLES, aClass3_Sub15_2.offset / 4, GL2.GL_UNSIGNED_INT, aByteBuffer4);
GlRenderer.enableDepthMask(); GlRenderer.enableDepthMask();
} }

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

@ -104,7 +104,7 @@ public final class HashTable {
} }
@OriginalMember(owner = "client!sc", name = "e", descriptor = "(I)I") @OriginalMember(owner = "client!sc", name = "e", descriptor = "(I)I")
public final int method3864() { public final int size() {
@Pc(15) int local15 = 0; @Pc(15) int local15 = 0;
for (@Pc(17) int local17 = 0; local17 < this.anInt5023; local17++) { for (@Pc(17) int local17 = 0; local17 < this.anInt5023; local17++) {
@Pc(26) Node local26 = this.aClass3Array1[local17]; @Pc(26) Node local26 = this.aClass3Array1[local17];

71
client/src/main/java/IgnoreList.java
View file

@ -1,6 +1,77 @@
import org.openrs2.deob.annotation.OriginalArg;
import org.openrs2.deob.annotation.OriginalMember; import org.openrs2.deob.annotation.OriginalMember;
import org.openrs2.deob.annotation.Pc;
public class IgnoreList { public class IgnoreList {
@OriginalMember(owner = "client!pf", name = "h", descriptor = "[J") @OriginalMember(owner = "client!pf", name = "h", descriptor = "[J")
public static final long[] encodedUsernames = new long[100]; public static final long[] encodedUsernames = new long[100];
@OriginalMember(owner = "client!cl", name = "Z", descriptor = "I")
public static int size = 0;
@OriginalMember(owner = "client!te", name = "b", descriptor = "(Lclient!na;I)Z")
public static boolean contains(@OriginalArg(0) JagString arg0) {
if (arg0 == null) {
return false;
}
for (@Pc(11) int local11 = 0; local11 < size; local11++) {
if (arg0.equalsIgnoreCase(Static193.aClass100Array134[local11])) {
return true;
}
}
return false;
}
@OriginalMember(owner = "client!la", name = "a", descriptor = "(IJ)V")
public static void add(@OriginalArg(1) long arg0) {
if (arg0 == 0L) {
return;
}
if (size >= 100) {
Chat.add(JagString.EMPTY, 0, LocalizedText.IGNORELISTFULL);
return;
}
@Pc(34) JagString local34 = Base37.decode37(arg0).toTitleCase();
@Pc(36) int local36;
for (local36 = 0; local36 < size; local36++) {
if (encodedUsernames[local36] == arg0) {
Chat.add(JagString.EMPTY, 0, JagString.concatenate(new JagString[] { local34, LocalizedText.IGNORELISTDUPE}));
return;
}
}
for (local36 = 0; local36 < FriendsList.size; local36++) {
if (FriendsList.encodedUsernames[local36] == arg0) {
Chat.add(JagString.EMPTY, 0, JagString.concatenate(new JagString[] { LocalizedText.REMOVESOCIAL2, local34, LocalizedText.REMOVEFRIEND}));
return;
}
}
if (local34.strEquals(PlayerList.self.username)) {
Chat.add(JagString.EMPTY, 0, LocalizedText.IGNORECANTADDSELF);
return;
}
encodedUsernames[size] = arg0;
Static193.aClass100Array134[size++] = Base37.decode37(arg0);
FriendsList.transmitAt = InterfaceList.transmitTimer;
Protocol.outboundBuffer.p1isaac(34);
Protocol.outboundBuffer.p8(arg0);
}
@OriginalMember(owner = "client!fh", name = "a", descriptor = "(JI)V")
public static void remove(@OriginalArg(0) long arg0) {
if (arg0 == 0L) {
return;
}
for (@Pc(12) int local12 = 0; local12 < size; local12++) {
if (encodedUsernames[local12] == arg0) {
size--;
for (@Pc(36) int local36 = local12; local36 < size; local36++) {
encodedUsernames[local36] = encodedUsernames[local36 + 1];
Static193.aClass100Array134[local36] = Static193.aClass100Array134[local36 + 1];
}
FriendsList.transmitAt = InterfaceList.transmitTimer;
Protocol.outboundBuffer.p1isaac(213);
Protocol.outboundBuffer.p8(arg0);
break;
}
}
}
} }

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

@ -150,4 +150,10 @@ public class InterfaceList {
} }
return components[interfaceId][componentId]; return components[interfaceId][componentId];
} }
@OriginalMember(owner = "client!client", name = "b", descriptor = "(Lclient!be;)Lclient!bf;")
public static ServerActiveProperties getServerActiveProperties(@OriginalArg(0) Component arg0) {
@Pc(13) ServerActiveProperties local13 = (ServerActiveProperties) Static210.aClass133_21.get(((long) arg0.id << 32) + (long) arg0.createdComponentId);
return local13 == null ? arg0.aClass3_Sub4_1 : local13;
}
} }

87
client/src/main/java/Inv.java
View file

@ -1,5 +1,7 @@
import org.openrs2.deob.annotation.OriginalArg;
import org.openrs2.deob.annotation.OriginalClass; import org.openrs2.deob.annotation.OriginalClass;
import org.openrs2.deob.annotation.OriginalMember; import org.openrs2.deob.annotation.OriginalMember;
import org.openrs2.deob.annotation.Pc;
@OriginalClass("client!qe") @OriginalClass("client!qe")
public final class Inv extends Node { public final class Inv extends Node {
@ -11,4 +13,89 @@ public final class Inv extends Node {
@OriginalMember(owner = "client!qe", name = "u", descriptor = "[I") @OriginalMember(owner = "client!qe", name = "u", descriptor = "[I")
public int[] anIntArray422 = new int[] { 0 }; public int[] anIntArray422 = new int[] { 0 };
@OriginalMember(owner = "client!ba", name = "a", descriptor = "(IB)I")
public static int getFreeSpace(@OriginalArg(0) int arg0) {
if (arg0 < 0) {
return 0;
}
@Pc(17) Inv local17 = (Inv) Static20.objectContainerCache.get((long) arg0);
if (local17 == null) {
return InvTypeList.list(arg0).size;
}
@Pc(31) int freeSpaces = 0;
for (@Pc(33) int id = 0; id < local17.objectIds.length; id++) {
if (local17.objectIds[id] == -1) {
freeSpaces++;
}
}
return freeSpaces + InvTypeList.list(arg0).size - local17.objectIds.length;
}
@OriginalMember(owner = "client!od", name = "a", descriptor = "(IZII)I")
public static int getTotalParam(@OriginalArg(1) boolean arg0, @OriginalArg(2) int arg1, @OriginalArg(3) int arg2) {
@Pc(19) Inv local19 = (Inv) Static20.objectContainerCache.get((long) arg1);
if (local19 == null) {
return 0;
}
@Pc(27) int local27 = 0;
for (@Pc(29) int local29 = 0; local29 < local19.objectIds.length; local29++) {
if (local19.objectIds[local29] >= 0 && ObjTypeList.anInt3245 > local19.objectIds[local29]) {
@Pc(56) ObjType local56 = ObjTypeList.get(local19.objectIds[local29]);
if (local56.params != null) {
@Pc(68) IntNode local68 = (IntNode) local56.params.get((long) arg2);
if (local68 != null) {
if (arg0) {
local27 += local19.anIntArray422[local29] * local68.value;
} else {
local27 += local68.value;
}
}
}
}
}
return local27;
}
@OriginalMember(owner = "client!wj", name = "a", descriptor = "(BII)I")
public static int getSlotTotal(@OriginalArg(1) int arg0, @OriginalArg(2) int arg1) {
@Pc(8) Inv local8 = (Inv) Static20.objectContainerCache.get((long) arg0);
if (local8 == null) {
return 0;
} else if (arg1 == -1) {
return 0;
} else {
@Pc(25) int local25 = 0;
for (@Pc(27) int local27 = 0; local27 < local8.anIntArray422.length; local27++) {
if (arg1 == local8.objectIds[local27]) {
local25 += local8.anIntArray422[local27];
}
}
return local25;
}
}
@OriginalMember(owner = "client!bm", name = "a", descriptor = "(III)I")
public static int getItemCount(@OriginalArg(1) int arg0, @OriginalArg(2) int arg1) {
@Pc(10) Inv local10 = (Inv) Static20.objectContainerCache.get((long) arg0);
if (local10 == null) {
return 0;
} else if (arg1 >= 0 && arg1 < local10.anIntArray422.length) {
return local10.anIntArray422[arg1];
} else {
return 0;
}
}
@OriginalMember(owner = "client!be", name = "a", descriptor = "(III)I")
public static int getItemType(@OriginalArg(0) int arg0, @OriginalArg(2) int arg1) {
@Pc(10) Inv local10 = (Inv) Static20.objectContainerCache.get((long) arg0);
if (local10 == null) {
return -1;
} else if (arg1 >= 0 && arg1 < local10.objectIds.length) {
return local10.objectIds[arg1];
} else {
return -1;
}
}
} }

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

@ -124,7 +124,7 @@ public final class JagString implements StringInterface {
return local13.method3151(); return local13.method3151();
} }
@OriginalMember(owner = "client!na", name = "a", descriptor = "(Z)Ljava/net/URL;") @OriginalMember(owner = "client!na", name = "a", descriptor = "(Z)Ljava/net/URL;")
public final URL method3107() throws MalformedURLException { public final URL method3107() throws MalformedURLException {
return new URL(new String(this.chars, 0, this.length)); return new URL(new String(this.chars, 0, this.length));
} }
@ -343,7 +343,7 @@ public final class JagString implements StringInterface {
} }
@OriginalMember(owner = "client!na", name = "a", descriptor = "(B)Lclient!na;") @OriginalMember(owner = "client!na", name = "a", descriptor = "(B)Lclient!na;")
public final JagString method3125() { public final JagString toTitleCase() {
@Pc(9) JagString local9 = new JagString(); @Pc(9) JagString local9 = new JagString();
local9.length = this.length; local9.length = this.length;
local9.chars = new byte[this.length]; local9.chars = new byte[this.length];
@ -438,7 +438,7 @@ public final class JagString implements StringInterface {
} }
@OriginalMember(owner = "client!na", name = "c", descriptor = "(Z)V") @OriginalMember(owner = "client!na", name = "c", descriptor = "(Z)V")
public final void method3129() { public final void print() {
@Pc(16) String local16; @Pc(16) String local16;
try { try {
local16 = new String(this.chars, 0, this.length, "ISO-8859-1"); local16 = new String(this.chars, 0, this.length, "ISO-8859-1");
@ -911,7 +911,7 @@ public final class JagString implements StringInterface {
@OriginalMember(owner = "client!na", name = "k", descriptor = "(I)Lclient!na;") @OriginalMember(owner = "client!na", name = "k", descriptor = "(I)Lclient!na;")
public final JagString method3159() { public final JagString method3159() {
@Pc(9) JagString local9 = Base37.decodeLowerCase(this.encode37()); @Pc(9) JagString local9 = Base37.decode37(this.encode37());
return local9 == null ? Static228.aClass100_967 : local9; return local9 == null ? Static228.aClass100_967 : local9;
} }

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

@ -31,7 +31,22 @@ public final class Js5 {
this.aBoolean297 = arg2; this.aBoolean297 = arg2;
} }
@OriginalMember(owner = "client!ve", name = "a", descriptor = "(B)Z") @OriginalMember(owner = "client!km", name = "a", descriptor = "(ILjava/lang/Object;Z)[B")
public static byte[] method2696(@OriginalArg(1) Object arg0, @OriginalArg(2) boolean arg1) {
if (arg0 == null) {
return null;
} else if (arg0 instanceof byte[]) {
@Pc(14) byte[] local14 = (byte[]) arg0;
return arg1 ? Static23.method648(local14) : local14;
} else if (arg0 instanceof ByteArray) {
@Pc(34) ByteArray local34 = (ByteArray) arg0;
return local34.get();
} else {
throw new IllegalArgumentException();
}
}
@OriginalMember(owner = "client!ve", name = "a", descriptor = "(B)Z")
public final boolean fetchAll() { public final boolean fetchAll() {
if (!this.method4484()) { if (!this.method4484()) {
return false; return false;
@ -187,7 +202,7 @@ public final class Js5 {
} }
} }
} }
@Pc(64) byte[] local64 = Static138.method2696(this.anObjectArrayArray1[arg0][arg2], false); @Pc(64) byte[] local64 = method2696(this.anObjectArrayArray1[arg0][arg2], false);
if (this.aBoolean297) { if (this.aBoolean297) {
this.anObjectArrayArray1[arg0][arg2] = null; this.anObjectArrayArray1[arg0][arg2] = null;
if (this.aClass70_2.anIntArray270[arg0] == 1) { if (this.aClass70_2.anIntArray270[arg0] == 1) {
@ -278,9 +293,9 @@ public final class Js5 {
} }
@Pc(114) byte[] local114; @Pc(114) byte[] local114;
if (arg1 == null || arg1[0] == 0 && arg1[1] == 0 && arg1[2] == 0 && arg1[3] == 0) { if (arg1 == null || arg1[0] == 0 && arg1[1] == 0 && arg1[2] == 0 && arg1[3] == 0) {
local114 = Static138.method2696(this.anObjectArray32[arg0], false); local114 = method2696(this.anObjectArray32[arg0], false);
} else { } else {
local114 = Static138.method2696(this.anObjectArray32[arg0], true); local114 = method2696(this.anObjectArray32[arg0], true);
@Pc(128) Buffer local128 = new Buffer(local114); @Pc(128) Buffer local128 = new Buffer(local114);
local128.decryptXtea(arg1, local128.data.length); local128.decryptXtea(arg1, local128.data.length);
} }
@ -456,7 +471,7 @@ public final class Js5 {
} }
} }
} }
return Static138.method2696(this.anObjectArrayArray1[arg1][arg0], false); return method2696(this.anObjectArrayArray1[arg1][arg0], false);
} }
@OriginalMember(owner = "client!ve", name = "a", descriptor = "(BI)[I") @OriginalMember(owner = "client!ve", name = "a", descriptor = "(BI)[I")

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

@ -3,10 +3,15 @@ import org.openrs2.deob.annotation.OriginalClass;
import org.openrs2.deob.annotation.OriginalMember; import org.openrs2.deob.annotation.OriginalMember;
import org.openrs2.deob.annotation.Pc; import org.openrs2.deob.annotation.Pc;
import java.util.zip.CRC32;
@OriginalClass("client!bg") @OriginalClass("client!bg")
public final class Js5CachedResourceProvider extends Js5ResourceProvider { public final class Js5CachedResourceProvider extends Js5ResourceProvider {
@OriginalMember(owner = "client!bg", name = "m", descriptor = "Lclient!ii;") @OriginalMember(owner = "client!fn", name = "X", descriptor = "Ljava/util/zip/CRC32;")
public static final CRC32 aCRC32_1 = new CRC32();
@OriginalMember(owner = "client!bg", name = "m", descriptor = "Lclient!ii;")
private Js5Index aClass70_1; private Js5Index aClass70_1;
@OriginalMember(owner = "client!bg", name = "w", descriptor = "[B") @OriginalMember(owner = "client!bg", name = "w", descriptor = "[B")
@ -356,9 +361,9 @@ public final class Js5CachedResourceProvider extends Js5ResourceProvider {
if (local161 == null || local161.length <= 2) { if (local161 == null || local161.length <= 2) {
throw new RuntimeException(); throw new RuntimeException();
} }
Static74.aCRC32_1.reset(); aCRC32_1.reset();
Static74.aCRC32_1.update(local161, 0, local161.length - 2); aCRC32_1.update(local161, 0, local161.length - 2);
local199 = (int) Static74.aCRC32_1.getValue(); local199 = (int) aCRC32_1.getValue();
if (this.aClass70_1.anIntArray268[arg1] != local199) { if (this.aClass70_1.anIntArray268[arg1] != local199) {
throw new RuntimeException(); throw new RuntimeException();
} }
@ -391,9 +396,9 @@ public final class Js5CachedResourceProvider extends Js5ResourceProvider {
if (local161 == null || local161.length <= 2) { if (local161 == null || local161.length <= 2) {
throw new RuntimeException(); throw new RuntimeException();
} }
Static74.aCRC32_1.reset(); aCRC32_1.reset();
Static74.aCRC32_1.update(local161, 0, local161.length - 2); aCRC32_1.update(local161, 0, local161.length - 2);
local199 = (int) Static74.aCRC32_1.getValue(); local199 = (int) aCRC32_1.getValue();
if (this.aClass70_1.anIntArray268[arg1] != local199) { if (this.aClass70_1.anIntArray268[arg1] != local199) {
throw new RuntimeException(); throw new RuntimeException();
} }

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

@ -285,6 +285,11 @@ public final class Keyboard implements KeyListener, FocusListener {
} }
} }
@OriginalMember(owner = "client!pk", name = "f", descriptor = "(B)I")
public static int getIdleLoops() {
return idleLoops;
}
@OriginalMember(owner = "client!uf", name = "keyPressed", descriptor = "(Ljava/awt/event/KeyEvent;)V") @OriginalMember(owner = "client!uf", name = "keyPressed", descriptor = "(Ljava/awt/event/KeyEvent;)V")
@Override @Override
public final synchronized void keyPressed(@OriginalArg(0) KeyEvent event) { public final synchronized void keyPressed(@OriginalArg(0) KeyEvent event) {

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

@ -0,0 +1,8 @@
import org.openrs2.deob.annotation.OriginalMember;
public class LightingManager {
@OriginalMember(owner = "client!jf", name = "l", descriptor = "I")
public static int lightCount = 0;
@OriginalMember(owner = "client!jf", name = "a", descriptor = "[Lclient!gi;")
public static Light[] lights;
}

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

@ -6,13 +6,16 @@ import java.awt.*;
import java.awt.Font; import java.awt.Font;
public class LoadingBarAwt { public class LoadingBarAwt {
@OriginalMember(owner = "client!tg", name = "a", descriptor = "Ljava/awt/FontMetrics;")
public static FontMetrics aFontMetrics1;
@OriginalMember(owner = "client!bc", name = "a", descriptor = "(Ljava/awt/Color;ZZLclient!na;I)V") @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) { public static void render(@OriginalArg(0) Color arg0, @OriginalArg(2) boolean arg1, @OriginalArg(3) JagString arg2, @OriginalArg(4) int arg3) {
try { try {
@Pc(6) Graphics local6 = GameShell.canvas.getGraphics(); @Pc(6) Graphics local6 = GameShell.canvas.getGraphics();
if (Static222.aFont1 == null) { if (Static222.aFont1 == null) {
Static222.aFont1 = new Font("Helvetica", 1, 13); Static222.aFont1 = new Font("Helvetica", 1, 13);
Static240.aFontMetrics1 = GameShell.canvas.getFontMetrics(Static222.aFont1); aFontMetrics1 = GameShell.canvas.getFontMetrics(Static222.aFont1);
} }
if (arg1) { if (arg1) {
local6.setColor(Color.black); local6.setColor(Color.black);
@ -34,7 +37,7 @@ public class LoadingBarAwt {
local56.fillRect(arg3 * 3 + 2, 2, 300 - arg3 * 3, 30); local56.fillRect(arg3 * 3 + 2, 2, 300 - arg3 * 3, 30);
local56.setFont(Static222.aFont1); local56.setFont(Static222.aFont1);
local56.setColor(Color.white); local56.setColor(Color.white);
arg2.method3112(22, (304 - arg2.method3155(Static240.aFontMetrics1)) / 2, local56); arg2.method3112(22, (304 - arg2.method3155(aFontMetrics1)) / 2, local56);
local6.drawImage(Static149.anImage3, GameShell.canvasWidth / 2 - 152, GameShell.canvasHeight / 2 + -18, null); local6.drawImage(Static149.anImage3, GameShell.canvasWidth / 2 - 152, GameShell.canvasHeight / 2 + -18, null);
} catch (@Pc(134) Exception local134) { } catch (@Pc(134) Exception local134) {
@Pc(140) int local140 = GameShell.canvasWidth / 2 - 152; @Pc(140) int local140 = GameShell.canvasWidth / 2 - 152;
@ -47,12 +50,12 @@ public class LoadingBarAwt {
local6.fillRect(arg3 * 3 + local140 + 2, local146 + 2, 300 - arg3 * 3, 30); local6.fillRect(arg3 * 3 + local140 + 2, local146 + 2, 300 - arg3 * 3, 30);
local6.setFont(Static222.aFont1); local6.setFont(Static222.aFont1);
local6.setColor(Color.white); local6.setColor(Color.white);
arg2.method3112(local146 + 22, local140 + (-arg2.method3155(Static240.aFontMetrics1) + 304) / 2, local6); arg2.method3112(local146 + 22, local140 + (-arg2.method3155(aFontMetrics1) + 304) / 2, local6);
} }
if (Static278.mainLoadPrimaryText != null) { if (Static278.mainLoadPrimaryText != null) {
local6.setFont(Static222.aFont1); local6.setFont(Static222.aFont1);
local6.setColor(Color.white); local6.setColor(Color.white);
Static278.mainLoadPrimaryText.method3112(GameShell.canvasHeight / 2 - 26, GameShell.canvasWidth / 2 - Static278.mainLoadPrimaryText.method3155(Static240.aFontMetrics1) / 2, local6); Static278.mainLoadPrimaryText.method3112(GameShell.canvasHeight / 2 - 26, GameShell.canvasWidth / 2 - Static278.mainLoadPrimaryText.method3155(aFontMetrics1) / 2, local6);
} }
} catch (@Pc(252) Exception local252) { } catch (@Pc(252) Exception local252) {
GameShell.canvas.repaint(); GameShell.canvas.repaint();
@ -61,7 +64,7 @@ public class LoadingBarAwt {
@OriginalMember(owner = "client!n", name = "a", descriptor = "(B)V") @OriginalMember(owner = "client!n", name = "a", descriptor = "(B)V")
public static void clear() { public static void clear() {
Static240.aFontMetrics1 = null; aFontMetrics1 = null;
Static222.aFont1 = null; Static222.aFont1 = null;
Static149.anImage3 = null; Static149.anImage3 = null;
} }

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

@ -271,7 +271,7 @@ public final class Loc extends Entity {
@Pc(192) int local192 = (local157 >> 1) + this.anInt1300; @Pc(192) int local192 = (local157 >> 1) + this.anInt1300;
@Pc(201) int local201 = (local157 + 1 >> 1) + this.anInt1300; @Pc(201) int local201 = (local157 + 1 >> 1) + this.anInt1300;
this.method1047(local192 * 128, local185 * 128); this.method1047(local192 * 128, local185 * 128);
@Pc(256) boolean local256 = !local12 && local19.aBoolean212 && (local19.id != this.anInt1321 || (this.anInt1297 != this.anInt1322 || this.aClass144_2 != null && (this.aClass144_2.aBoolean280 || Static204.applyTweening) && this.anInt1297 != this.anInt1304) && Preferences.sceneryShadowsType >= 2); @Pc(256) boolean local256 = !local12 && local19.aBoolean212 && (local19.id != this.anInt1321 || (this.anInt1297 != this.anInt1322 || this.aClass144_2 != null && (this.aClass144_2.aBoolean280 || client.applyTweening) && this.anInt1297 != this.anInt1304) && Preferences.sceneryShadowsType >= 2);
if (arg0 && !local256) { if (arg0 && !local256) {
return null; return null;
} }

42
client/src/main/java/LoginManager.java
View file

@ -1,3 +1,4 @@
import org.openrs2.deob.annotation.OriginalArg;
import org.openrs2.deob.annotation.OriginalMember; import org.openrs2.deob.annotation.OriginalMember;
import org.openrs2.deob.annotation.Pc; import org.openrs2.deob.annotation.Pc;
@ -131,7 +132,7 @@ public class LoginManager {
} }
local126 = Protocol.socket.read() << 8 | Protocol.socket.read(); local126 = Protocol.socket.read() << 8 | Protocol.socket.read();
Static176.hopWorld(local126); Static176.hopWorld(local126);
if (Static125.worldId == -1) { if (Player.worldId == -1) {
anInt4937 = 0; anInt4937 = 0;
reply = 6; reply = 6;
Protocol.socket.close(); Protocol.socket.close();
@ -428,7 +429,7 @@ public class LoginManager {
Protocol.socket.read(0, Protocol.length, Protocol.inboundBuffer.data); Protocol.socket.read(0, Protocol.length, Protocol.inboundBuffer.data);
reply = 2; reply = 2;
step = 0; step = 0;
Static243.method4221(); client.method4221();
Static80.centralZoneX = -1; Static80.centralZoneX = -1;
Protocol.readRebuildPacket(false); Protocol.readRebuildPacket(false);
Protocol.opcode = -1; Protocol.opcode = -1;
@ -454,4 +455,41 @@ public class LoginManager {
} }
} }
} }
@OriginalMember(owner = "client!p", name = "a", descriptor = "(I)V")
public static void method3395() {
if (step == 5) {
step = 6;
}
}
@OriginalMember(owner = "client!se", name = "a", descriptor = "(Lclient!na;Lclient!na;IB)V")
public static void method3896(@OriginalArg(0) JagString arg0, @OriginalArg(1) JagString arg1, @OriginalArg(2) int arg2) {
Player.password = arg1;
anInt39 = arg2;
Player.usernameInput = arg0;
if (Player.usernameInput.strEquals(JagString.EMPTY) || Player.password.strEquals(JagString.EMPTY)) {
reply = 3;
} else if (Player.worldId == -1) {
anInt673 = 0;
anInt4587 = 0;
reply = -3;
anInt4937 = 1;
@Pc(43) Buffer local43 = new Buffer(128);
local43.p1(10);
local43.p2((int) (Math.random() * 99999.0D));
local43.p2(530);
local43.p8(Player.usernameInput.encode37());
local43.p4((int) (Math.random() * 9.9999999E7D));
local43.pjstr(Player.password);
local43.p4((int) (Math.random() * 9.9999999E7D));
local43.encryptRsa(GlobalConfig.RSA_EXPONENT, GlobalConfig.RSA_MODULUS);
Protocol.outboundBuffer.offset = 0;
Protocol.outboundBuffer.p1(210);
Protocol.outboundBuffer.p1(local43.offset);
Protocol.outboundBuffer.pBytes(local43.data, local43.offset);
} else {
clear();
}
}
} }

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

@ -24,4 +24,24 @@ public class MapList {
aClass69_120.addTail(Map.create(new Buffer(archive.getFile(local25, local30[local32])))); aClass69_120.addTail(Map.create(new Buffer(archive.getFile(local25, local30[local32]))));
} }
} }
@OriginalMember(owner = "client!jk", name = "a", descriptor = "(ILclient!na;)Lclient!bn;")
public static Map get(@OriginalArg(1) JagString arg0) {
for (@Pc(15) Map local15 = (Map) aClass69_120.method2289(); local15 != null; local15 = (Map) aClass69_120.method2288()) {
if (local15.group.strEquals(arg0)) {
return local15;
}
}
return null;
}
@OriginalMember(owner = "client!ce", name = "a", descriptor = "(IBI)Lclient!bn;")
public static Map getContainingSource(@OriginalArg(0) int arg0, @OriginalArg(2) int arg1) {
for (@Pc(10) Map local10 = (Map) aClass69_120.method2289(); local10 != null; local10 = (Map) aClass69_120.method2288()) {
if (local10.aBoolean50 && local10.method664(arg1, arg0)) {
return local10;
}
}
return null;
}
} }

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

@ -6,7 +6,9 @@ import org.openrs2.deob.annotation.Pc;
@OriginalClass("client!ki") @OriginalClass("client!ki")
public final class MidiDecoder { public final class MidiDecoder {
@OriginalMember(owner = "client!ki", name = "b", descriptor = "[I") @OriginalMember(owner = "client!ki", name = "e", descriptor = "[B")
public static final byte[] STATUS_LENGTHS = new byte[] { 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 0, 1, 2, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 };
@OriginalMember(owner = "client!ki", name = "b", descriptor = "[I")
public int[] anIntArray310; public int[] anIntArray310;
@OriginalMember(owner = "client!ki", name = "c", descriptor = "[I") @OriginalMember(owner = "client!ki", name = "c", descriptor = "[I")
@ -98,7 +100,7 @@ public final class MidiDecoder {
private int method2633(@OriginalArg(0) int arg0, @OriginalArg(1) int arg1) { private int method2633(@OriginalArg(0) int arg0, @OriginalArg(1) int arg1) {
@Pc(12) int local12; @Pc(12) int local12;
if (arg1 != 255) { if (arg1 != 255) {
@Pc(78) byte local78 = Static135.aByteArray46[arg1 - 128]; @Pc(78) byte local78 = STATUS_LENGTHS[arg1 - 128];
local12 = arg1; local12 = arg1;
if (local78 >= 1) { if (local78 >= 1) {
local12 = arg1 | this.aClass3_Sub15_6.g1() << 8; local12 = arg1 | this.aClass3_Sub15_6.g1() << 8;

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

@ -7,11 +7,13 @@ public class MidiPlayer {
public static boolean jingle = false; public static boolean jingle = false;
@OriginalMember(owner = "client!cb", name = "hb", descriptor = "Lclient!le;") @OriginalMember(owner = "client!cb", name = "hb", descriptor = "Lclient!le;")
public static SoundBank aClass89_1; public static SoundBank aClass89_1;
@OriginalMember(owner = "client!bd", name = "i", descriptor = "I")
public static int anInt441 = 0;
@OriginalMember(owner = "client!km", name = "c", descriptor = "(Z)Z") @OriginalMember(owner = "client!km", name = "c", descriptor = "(Z)Z")
public static boolean method2699() { public static boolean method2699() {
try { try {
if (Static14.anInt441 == 2) { if (anInt441 == 2) {
if (Static144.aClass3_Sub29_1 == null) { if (Static144.aClass3_Sub29_1 == null) {
Static144.aClass3_Sub29_1 = Song.create(Static172.aClass153_70, Static277.anInt5853, Static226.anInt5085); Static144.aClass3_Sub29_1 = Song.create(Static172.aClass153_70, Static277.anInt5853, Static226.anInt5085);
if (Static144.aClass3_Sub29_1 == null) { if (Static144.aClass3_Sub29_1 == null) {
@ -25,7 +27,7 @@ public class MidiPlayer {
Static172.aClass3_Sub3_Sub4_2.method4412(); Static172.aClass3_Sub3_Sub4_2.method4412();
Static172.aClass3_Sub3_Sub4_2.method4447(Static253.anInt5527); Static172.aClass3_Sub3_Sub4_2.method4447(Static253.anInt5527);
Static172.aClass3_Sub3_Sub4_2.method4431(Static72.aBoolean116, Static144.aClass3_Sub29_1); Static172.aClass3_Sub3_Sub4_2.method4431(Static72.aBoolean116, Static144.aClass3_Sub29_1);
Static14.anInt441 = 0; anInt441 = 0;
Static144.aClass3_Sub29_1 = null; Static144.aClass3_Sub29_1 = null;
aClass89_1 = null; aClass89_1 = null;
Static172.aClass153_70 = null; Static172.aClass153_70 = null;
@ -37,7 +39,7 @@ public class MidiPlayer {
Static172.aClass3_Sub3_Sub4_2.method4446(); Static172.aClass3_Sub3_Sub4_2.method4446();
Static172.aClass153_70 = null; Static172.aClass153_70 = null;
Static144.aClass3_Sub29_1 = null; Static144.aClass3_Sub29_1 = null;
Static14.anInt441 = 0; anInt441 = 0;
aClass89_1 = null; aClass89_1 = null;
} }
return false; return false;
@ -47,7 +49,7 @@ public class MidiPlayer {
public static void method801() { public static void method801() {
Static253.anInt5527 = 0; Static253.anInt5527 = 0;
Static226.anInt5085 = -1; Static226.anInt5085 = -1;
Static14.anInt441 = 1; anInt441 = 1;
Static57.anInt1757 = 2; Static57.anInt1757 = 2;
Static72.aBoolean116 = false; Static72.aBoolean116 = false;
Static172.aClass153_70 = null; Static172.aClass153_70 = null;
@ -60,7 +62,7 @@ public class MidiPlayer {
Static226.anInt5085 = 0; Static226.anInt5085 = 0;
Static277.anInt5853 = arg0; Static277.anInt5853 = arg0;
Static72.aBoolean116 = false; Static72.aBoolean116 = false;
Static14.anInt441 = 1; anInt441 = 1;
Static57.anInt1757 = 2; Static57.anInt1757 = 2;
Static253.anInt5527 = arg2; Static253.anInt5527 = arg2;
} }
@ -77,7 +79,7 @@ public class MidiPlayer {
@OriginalMember(owner = "client!sj", name = "a", descriptor = "(Z)V") @OriginalMember(owner = "client!sj", name = "a", descriptor = "(Z)V")
public static void loop() { public static void loop() {
try { try {
if (Static14.anInt441 == 1) { if (anInt441 == 1) {
@Pc(16) int local16 = Static172.aClass3_Sub3_Sub4_2.method4440(); @Pc(16) int local16 = Static172.aClass3_Sub3_Sub4_2.method4440();
if (local16 > 0 && Static172.aClass3_Sub3_Sub4_2.method4414()) { if (local16 > 0 && Static172.aClass3_Sub3_Sub4_2.method4414()) {
local16 -= Static57.anInt1757; local16 -= Static57.anInt1757;
@ -92,9 +94,9 @@ public class MidiPlayer {
Static144.aClass3_Sub29_1 = null; Static144.aClass3_Sub29_1 = null;
aClass89_1 = null; aClass89_1 = null;
if (Static172.aClass153_70 == null) { if (Static172.aClass153_70 == null) {
Static14.anInt441 = 0; anInt441 = 0;
} else { } else {
Static14.anInt441 = 2; anInt441 = 2;
} }
} }
} catch (@Pc(62) Exception local62) { } catch (@Pc(62) Exception local62) {
@ -102,7 +104,7 @@ public class MidiPlayer {
Static172.aClass3_Sub3_Sub4_2.method4446(); Static172.aClass3_Sub3_Sub4_2.method4446();
Static172.aClass153_70 = null; Static172.aClass153_70 = null;
Static144.aClass3_Sub29_1 = null; Static144.aClass3_Sub29_1 = null;
Static14.anInt441 = 0; anInt441 = 0;
aClass89_1 = null; aClass89_1 = null;
} }
} }

204
client/src/main/java/MiniMap.java Normal file
View file

@ -0,0 +1,204 @@
import org.openrs2.deob.annotation.OriginalArg;
import org.openrs2.deob.annotation.OriginalMember;
import org.openrs2.deob.annotation.Pc;
public class MiniMap {
@OriginalMember(owner = "client!ke", name = "T", descriptor = "[[I")
public static final int[][] anIntArrayArray24 = new int[][] { { 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 }, { 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1 }, { 1, 0, 0, 0, 1, 1, 0, 0, 1, 1, 1, 0, 1, 1, 1, 1 }, { 1, 1, 0, 0, 1, 1, 0, 0, 1, 0, 0, 0, 1, 0, 0, 0 }, { 0, 0, 1, 1, 0, 0, 1, 1, 0, 0, 0, 1, 0, 0, 0, 1 }, { 0, 1, 1, 1, 0, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1 }, { 1, 1, 1, 0, 1, 1, 1, 0, 1, 1, 1, 1, 1, 1, 1, 1 }, { 1, 1, 0, 0, 1, 1, 0, 0, 1, 1, 0, 0, 1, 1, 0, 0 }, { 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 1, 1, 0, 0 }, { 1, 1, 1, 1, 1, 1, 1, 1, 0, 1, 1, 1, 0, 0, 1, 1 }, { 1, 1, 1, 1, 1, 1, 0, 0, 1, 0, 0, 0, 1, 0, 0, 0 }, { 0, 0, 0, 0, 0, 0, 1, 1, 0, 1, 1, 1, 0, 1, 1, 1 }, { 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 1, 0, 1, 1, 1, 1 } };
@OriginalMember(owner = "client!wc", name = "h", descriptor = "[[I")
public static final int[][] anIntArrayArray46 = new int[][] { { 0, 1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12, 13, 14, 15 }, { 12, 8, 4, 0, 13, 9, 5, 1, 14, 10, 6, 2, 15, 11, 7, 3 }, { 15, 14, 13, 12, 11, 10, 9, 8, 7, 6, 5, 4, 3, 2, 1, 0 }, { 3, 7, 11, 15, 2, 6, 10, 14, 1, 5, 9, 13, 0, 4, 8, 12 } };
@OriginalMember(owner = "client!qc", name = "ab", descriptor = "[I")
public static final int[] locId = new int[1000];
@OriginalMember(owner = "client!lf", name = "d", descriptor = "[I")
public static final int[] locX = new int[1000];
@OriginalMember(owner = "client!he", name = "eb", descriptor = "[I")
public static final int[] locZ = new int[1000];
@OriginalMember(owner = "client!ef", name = "j", descriptor = "Lclient!mm;")
public static SoftwareSprite softwareSprite;
@OriginalMember(owner = "client!ha", name = "i", descriptor = "Lclient!qf;")
public static Sprite sprite;
@OriginalMember(owner = "client!ug", name = "m", descriptor = "I")
public static int locs = 0;
@OriginalMember(owner = "client!ma", name = "a", descriptor = "([IIIIII)V")
public static void renderTile(@OriginalArg(0) int[] pixels, @OriginalArg(1) int index, @OriginalArg(3) int arg2, @OriginalArg(4) int arg3, @OriginalArg(5) int arg4) {
@Pc(7) Tile local7 = SceneGraph.tiles[arg2][arg3][arg4];
if (local7 == null) {
return;
}
@Pc(13) PlainTile local13 = local7.plainTile;
@Pc(23) int local23;
if (local13 != null) {
@Pc(18) int local18 = local13.anInt4871;
if (local18 != 0) {
for (local23 = 0; local23 < 4; local23++) {
pixels[index] = local18;
pixels[index + 1] = local18;
pixels[index + 2] = local18;
pixels[index + 3] = local18;
index += 512;
}
}
return;
}
@Pc(58) ShapedTile local58 = local7.shapedTile;
if (local58 == null) {
return;
}
local23 = local58.anInt1966;
@Pc(67) int local67 = local58.anInt1967;
@Pc(70) int local70 = local58.anInt1969;
@Pc(73) int local73 = local58.anInt1968;
@Pc(77) int[] local77 = anIntArrayArray24[local23];
@Pc(81) int[] local81 = anIntArrayArray46[local67];
@Pc(83) int local83 = 0;
@Pc(87) int local87;
if (local70 != 0) {
for (local87 = 0; local87 < 4; local87++) {
pixels[index] = local77[local81[local83++]] == 0 ? local70 : local73;
pixels[index + 1] = local77[local81[local83++]] == 0 ? local70 : local73;
pixels[index + 2] = local77[local81[local83++]] == 0 ? local70 : local73;
pixels[index + 3] = local77[local81[local83++]] == 0 ? local70 : local73;
index += 512;
}
return;
}
for (local87 = 0; local87 < 4; local87++) {
if (local77[local81[local83++]] != 0) {
pixels[index] = local73;
}
if (local77[local81[local83++]] != 0) {
pixels[index + 1] = local73;
}
if (local77[local81[local83++]] != 0) {
pixels[index + 2] = local73;
}
if (local77[local81[local83++]] != 0) {
pixels[index + 3] = local73;
}
index += 512;
}
}
@OriginalMember(owner = "client!kl", name = "b", descriptor = "(II)Z")
public static boolean renderMap(@OriginalArg(1) int arg0) {
@Pc(35) int local35;
@Pc(37) int local37;
@Pc(76) int local76;
@Pc(80) int local80;
if (softwareSprite == null) {
if (GlRenderer.enabled || sprite == null) {
softwareSprite = new SoftwareSprite(512, 512);
} else {
softwareSprite = (SoftwareSprite) sprite;
}
@Pc(32) int[] local32 = softwareSprite.pixels;
local35 = local32.length;
for (local37 = 0; local37 < local35; local37++) {
local32[local37] = 1;
}
for (local37 = 1; local37 < 103; local37++) {
local76 = 4 * 512 * (103 - local37) + 24628;
for (local80 = 1; local80 < 103; local80++) {
if ((Static12.tileSettings[arg0][local80][local37] & 0x18) == 0) {
renderTile(local32, local76, arg0, local80, local37);
}
if (arg0 < 3 && (Static12.tileSettings[arg0 + 1][local80][local37] & 0x8) != 0) {
renderTile(local32, local76, arg0 + 1, local80, local37);
}
local76 += 4;
}
}
locs = 0;
for (local37 = 0; local37 < 104; local37++) {
for (local76 = 0; local76 < 104; local76++) {
@Pc(169) long local169 = Static20.method602(Player.level, local37 + 0, local76);
if (local169 != 0L) {
@Pc(184) LocType local184 = LocTypeList.get((int) (local169 >>> 32) & Integer.MAX_VALUE);
@Pc(187) int local187 = local184.mapElement;
@Pc(194) int local194;
if (local184.multiLocs != null) {
for (local194 = 0; local194 < local184.multiLocs.length; local194++) {
if (local184.multiLocs[local194] != -1) {
@Pc(216) LocType local216 = LocTypeList.get(local184.multiLocs[local194]);
if (local216.mapElement >= 0) {
local187 = local216.mapElement;
break;
}
}
}
}
if (local187 >= 0) {
@Pc(237) int local237 = local76;
local194 = local37;
if (local187 != 22 && local187 != 29 && local187 != 34 && local187 != 36 && local187 != 46 && local187 != 47 && local187 != 48) {
@Pc(269) int[][] local269 = PathFinder.collisionMaps[Player.level].anIntArrayArray30;
for (@Pc(271) int local271 = 0; local271 < 10; local271++) {
@Pc(281) int local281 = (int) (Math.random() * 4.0D);
if (local281 == 0 && local194 > 0 && local37 - 3 < local194 && (local269[local194 - 1][local237] & 0x12C0108) == 0) {
local194--;
}
if (local281 == 1 && local194 < 103 && local37 + 3 > local194 && (local269[local194 + 1][local237] & 0x12C0180) == 0) {
local194++;
}
if (local281 == 2 && local237 > 0 && local76 - 3 < local237 && (local269[local194][local237 - 1] & 0x12C0102) == 0) {
local237--;
}
if (local281 == 3 && local237 < 103 && local237 < local76 + 3 && (local269[local194][local237 + 1] & 0x12C0120) == 0) {
local237++;
}
}
}
locId[locs] = local184.id;
locX[locs] = local194;
locZ[locs] = local237;
locs++;
}
}
}
}
}
softwareSprite.makeTarget();
@Pc(455) int local455 = ((int) (Math.random() * 20.0D) + 238 - 10 << 8) + ((int) (Math.random() * 20.0D) + 238 - 10 << 16) + (int) (Math.random() * 20.0D) + 228;
local35 = (int) (Math.random() * 20.0D) + 238 - 10 << 16;
for (local37 = 1; local37 < 103; local37++) {
for (local76 = 1; local76 < 103; local76++) {
if ((Static12.tileSettings[arg0][local76][local37] & 0x18) == 0 && !Static164.method3109(local76, local455, local37, local35, arg0)) {
if (GlRenderer.enabled) {
SoftwareRaster.pixels = null;
} else {
client.frameBuffer.makeTarget();
}
return false;
}
if (arg0 < 3 && (Static12.tileSettings[arg0 + 1][local76][local37] & 0x8) != 0 && !Static164.method3109(local76, local455, local37, local35, arg0 + 1)) {
if (GlRenderer.enabled) {
SoftwareRaster.pixels = null;
} else {
client.frameBuffer.makeTarget();
}
return false;
}
}
}
if (GlRenderer.enabled) {
@Pc(576) int[] local576 = softwareSprite.pixels;
local76 = local576.length;
for (local80 = 0; local80 < local76; local80++) {
if (local576[local80] == 0) {
local576[local80] = 1;
}
}
sprite = new GlSprite(softwareSprite);
} else {
sprite = softwareSprite;
}
if (GlRenderer.enabled) {
SoftwareRaster.pixels = null;
} else {
client.frameBuffer.makeTarget();
}
softwareSprite = null;
return true;
}
}

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

@ -22,65 +22,94 @@ public final class Mouse implements MouseListener, MouseMotionListener, FocusLis
public static int anInt5032 = 0; public static int anInt5032 = 0;
@OriginalMember(owner = "client!rh", name = "o", descriptor = "I") @OriginalMember(owner = "client!rh", name = "o", descriptor = "I")
public static int anInt4873 = 0; public static int anInt4873 = 0;
@OriginalMember(owner = "client!he", name = "bb", descriptor = "Lclient!ug;")
public static Mouse instance = new Mouse();
@OriginalMember(owner = "client!he", name = "Y", descriptor = "I")
public static volatile int anInt2467 = 0;
@OriginalMember(owner = "client!lk", name = "Z", descriptor = "I")
public static int clickButton = 0;
@OriginalMember(owner = "client!bl", name = "Q", descriptor = "I")
public static int pressedButton = 0;
@OriginalMember(owner = "client!ra", name = "jb", descriptor = "J")
public static volatile long aLong161 = 0L;
@OriginalMember(owner = "client!ck", name = "k", descriptor = "I")
public static volatile int anInt1034 = 0;
@OriginalMember(owner = "client!eg", name = "w", descriptor = "I")
public static volatile int anInt1759 = 0;
@OriginalMember(owner = "client!kf", name = "c", descriptor = "J")
public static long clickTime = 0L;
@OriginalMember(owner = "client!dc", name = "W", descriptor = "I")
public static volatile int anInt1313 = 0;
@OriginalMember(owner = "client!nb", name = "j", descriptor = "I")
public static volatile int anInt4039 = -1;
@OriginalMember(owner = "client!lh", name = "u", descriptor = "I")
public static volatile int anInt3521 = -1;
@OriginalMember(owner = "client!sa", name = "Y", descriptor = "I")
public static volatile int anInt4973 = 0;
public int mouseWheelX; public int mouseWheelX;
public int mouseWheelY; public int mouseWheelY;
@OriginalMember(owner = "client!sc", name = "a", descriptor = "(ILjava/awt/Component;)V") @OriginalMember(owner = "client!sc", name = "a", descriptor = "(ILjava/awt/Component;)V")
public static void stop(@OriginalArg(1) Component arg0) { public static void stop(@OriginalArg(1) Component arg0) {
arg0.removeMouseListener(Static93.instance); arg0.removeMouseListener(instance);
arg0.removeMouseMotionListener(Static93.instance); arg0.removeMouseMotionListener(instance);
arg0.removeFocusListener(Static93.instance); arg0.removeFocusListener(instance);
Static57.anInt1759 = 0; anInt1759 = 0;
} }
@OriginalMember(owner = "client!ug", name = "a", descriptor = "(I)V") @OriginalMember(owner = "client!ug", name = "a", descriptor = "(I)V")
public static void quit() { public static void quit() {
if (Static93.instance != null) { if (instance != null) {
@Pc(5) Mouse local5 = Static93.instance; @Pc(5) Mouse local5 = instance;
synchronized (Static93.instance) { synchronized (instance) {
Static93.instance = null; instance = null;
} }
} }
} }
@OriginalMember(owner = "client!ii", name = "b", descriptor = "(I)V") @OriginalMember(owner = "client!ii", name = "b", descriptor = "(I)V")
public static void loop() { public static void loop() {
@Pc(2) Mouse local2 = Static93.instance; @Pc(2) Mouse local2 = instance;
synchronized (Static93.instance) { synchronized (instance) {
Static22.anInt723 = Static57.anInt1759; pressedButton = anInt1759;
anInt4873 = Static147.anInt3521; anInt4873 = anInt3521;
anInt5032 = Static165.anInt4039; anInt5032 = anInt4039;
Static150.clickButton = Static41.anInt1313; clickButton = anInt1313;
clickX = Static34.anInt1034; clickX = anInt1034;
Static93.anInt2467++; anInt2467++;
clickY = Static222.anInt4973; clickY = anInt4973;
Static133.clickTime = Static209.aLong161; clickTime = aLong161;
Static41.anInt1313 = 0; anInt1313 = 0;
} }
} }
@OriginalMember(owner = "client!h", name = "a", descriptor = "(Ljava/awt/Component;Z)V") @OriginalMember(owner = "client!h", name = "a", descriptor = "(Ljava/awt/Component;Z)V")
public static void start(@OriginalArg(0) Component arg0) { public static void start(@OriginalArg(0) Component arg0) {
arg0.addMouseListener(Static93.instance); arg0.addMouseListener(instance);
arg0.addMouseMotionListener(Static93.instance); arg0.addMouseMotionListener(instance);
arg0.addFocusListener(Static93.instance); arg0.addFocusListener(instance);
}
@OriginalMember(owner = "client!lc", name = "a", descriptor = "(B)I")
public static int getIdleLoops() {
return anInt2467;
} }
@OriginalMember(owner = "client!ug", name = "mouseMoved", descriptor = "(Ljava/awt/event/MouseEvent;)V") @OriginalMember(owner = "client!ug", name = "mouseMoved", descriptor = "(Ljava/awt/event/MouseEvent;)V")
@Override @Override
public final synchronized void mouseMoved(@OriginalArg(0) MouseEvent arg0) { public final synchronized void mouseMoved(@OriginalArg(0) MouseEvent arg0) {
if (Static93.instance != null) { if (instance != null) {
Static93.anInt2467 = 0; anInt2467 = 0;
Static147.anInt3521 = arg0.getX(); anInt3521 = arg0.getX();
Static165.anInt4039 = arg0.getY(); anInt4039 = arg0.getY();
} }
} }
@OriginalMember(owner = "client!ug", name = "focusLost", descriptor = "(Ljava/awt/event/FocusEvent;)V") @OriginalMember(owner = "client!ug", name = "focusLost", descriptor = "(Ljava/awt/event/FocusEvent;)V")
@Override @Override
public final synchronized void focusLost(@OriginalArg(0) FocusEvent arg0) { public final synchronized void focusLost(@OriginalArg(0) FocusEvent arg0) {
if (Static93.instance != null) { if (instance != null) {
Static57.anInt1759 = 0; anInt1759 = 0;
} }
} }
@ -94,27 +123,25 @@ public final class Mouse implements MouseListener, MouseMotionListener, FocusLis
int accelY = this.mouseWheelY - y; int accelY = this.mouseWheelY - y;
this.mouseWheelX = x; this.mouseWheelX = x;
this.mouseWheelY = y; this.mouseWheelY = y;
Camera.yawDirection = -1;
Camera.yawTarget += accelX * 2; Camera.yawTarget += accelX * 2;
Camera.pitchDirection = -1;
Camera.pitchTarget -= accelY * 2; Camera.pitchTarget -= accelY * 2;
Camera.clampCameraAngle(); Camera.clampCameraAngle();
return; return;
} }
if (Static93.instance != null) { if (instance != null) {
Static93.anInt2467 = 0; anInt2467 = 0;
Static147.anInt3521 = x; anInt3521 = x;
Static165.anInt4039 = y; anInt4039 = y;
} }
} }
@OriginalMember(owner = "client!ug", name = "mouseReleased", descriptor = "(Ljava/awt/event/MouseEvent;)V") @OriginalMember(owner = "client!ug", name = "mouseReleased", descriptor = "(Ljava/awt/event/MouseEvent;)V")
@Override @Override
public final synchronized void mouseReleased(@OriginalArg(0) MouseEvent arg0) { public final synchronized void mouseReleased(@OriginalArg(0) MouseEvent arg0) {
if (Static93.instance != null) { if (instance != null) {
Static93.anInt2467 = 0; anInt2467 = 0;
Static57.anInt1759 = 0; anInt1759 = 0;
@Pc(14) int local14 = arg0.getModifiers(); @Pc(14) int local14 = arg0.getModifiers();
if ((local14 & 0x10) == 0) { if ((local14 & 0x10) == 0) {
} }
@ -150,17 +177,17 @@ public final class Mouse implements MouseListener, MouseMotionListener, FocusLis
return; return;
} }
if (Static93.instance != null) { if (instance != null) {
Static93.anInt2467 = 0; anInt2467 = 0;
Static34.anInt1034 = event.getX(); anInt1034 = event.getX();
Static222.anInt4973 = event.getY(); anInt4973 = event.getY();
Static209.aLong161 = MonotonicClock.currentTimeMillis(); aLong161 = MonotonicClock.currentTimeMillis();
if ((event.getModifiersEx() & MouseEvent.BUTTON3_DOWN_MASK) == 0) { if ((event.getModifiersEx() & MouseEvent.BUTTON3_DOWN_MASK) == 0) {
Static41.anInt1313 = 1; anInt1313 = 1;
Static57.anInt1759 = 1; anInt1759 = 1;
} else { } else {
Static41.anInt1313 = 2; anInt1313 = 2;
Static57.anInt1759 = 2; anInt1759 = 2;
} }
@Pc(29) int local29 = event.getModifiers(); @Pc(29) int local29 = event.getModifiers();
if ((local29 & 0x10) == 0) { if ((local29 & 0x10) == 0) {
@ -178,20 +205,20 @@ public final class Mouse implements MouseListener, MouseMotionListener, FocusLis
@OriginalMember(owner = "client!ug", name = "mouseExited", descriptor = "(Ljava/awt/event/MouseEvent;)V") @OriginalMember(owner = "client!ug", name = "mouseExited", descriptor = "(Ljava/awt/event/MouseEvent;)V")
@Override @Override
public final synchronized void mouseExited(@OriginalArg(0) MouseEvent arg0) { public final synchronized void mouseExited(@OriginalArg(0) MouseEvent arg0) {
if (Static93.instance != null) { if (instance != null) {
Static93.anInt2467 = 0; anInt2467 = 0;
Static147.anInt3521 = -1; anInt3521 = -1;
Static165.anInt4039 = -1; anInt4039 = -1;
} }
} }
@OriginalMember(owner = "client!ug", name = "mouseEntered", descriptor = "(Ljava/awt/event/MouseEvent;)V") @OriginalMember(owner = "client!ug", name = "mouseEntered", descriptor = "(Ljava/awt/event/MouseEvent;)V")
@Override @Override
public final synchronized void mouseEntered(@OriginalArg(0) MouseEvent arg0) { public final synchronized void mouseEntered(@OriginalArg(0) MouseEvent arg0) {
if (Static93.instance != null) { if (instance != null) {
Static93.anInt2467 = 0; anInt2467 = 0;
Static147.anInt3521 = arg0.getX(); anInt3521 = arg0.getX();
Static165.anInt4039 = arg0.getY(); anInt4039 = arg0.getY();
} }
} }
} }

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

@ -1,3 +1,4 @@
import org.openrs2.deob.annotation.OriginalArg;
import org.openrs2.deob.annotation.OriginalMember; import org.openrs2.deob.annotation.OriginalMember;
public class MusicPlayer { public class MusicPlayer {
@ -5,4 +6,22 @@ public class MusicPlayer {
public static int groupId = -1; public static int groupId = -1;
@OriginalMember(owner = "client!uf", name = "m", descriptor = "I") @OriginalMember(owner = "client!uf", name = "m", descriptor = "I")
public static int titleSong; public static int titleSong;
@OriginalMember(owner = "client!li", name = "a", descriptor = "(ZI)V")
public static void playSong(@OriginalArg(1) int arg0) {
if (arg0 == -1 && !MidiPlayer.jingle) {
Static241.method4548();
} else if (arg0 != -1 && (groupId != arg0 || !Static136.method2655()) && Preferences.musicVolume != 0 && !MidiPlayer.jingle) {
MidiPlayer.playFadeOut(arg0, client.js5Archive6, Preferences.musicVolume);
}
groupId = arg0;
}
@OriginalMember(owner = "client!wj", name = "a", descriptor = "(IIB)V")
public static void playJingle(@OriginalArg(0) int arg0, @OriginalArg(1) int arg1) {
if (Preferences.musicVolume != 0 && arg1 != -1) {
Static122.method2410(client.js5Archive11, arg1, Preferences.musicVolume);
MidiPlayer.jingle = true;
}
}
} }

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

@ -0,0 +1,6 @@
import org.openrs2.deob.annotation.OriginalMember;
public class NpcList {
@OriginalMember(owner = "client!nm", name = "S", descriptor = "[Lclient!km;")
public static final Npc[] npcs = new Npc[32768];
}

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

@ -358,7 +358,7 @@ public final class NpcType {
local721 |= Static6.aClass3_Sub2_Sub7Array1[local235].isAlphaTransformed(local214); local721 |= Static6.aClass3_Sub2_Sub7Array1[local235].isAlphaTransformed(local214);
local725 |= local753.aBoolean278; local725 |= local753.aBoolean278;
} }
if ((local753.tween || Static204.applyTweening) && local207 != -1 && local753.frames.length > local207) { if ((local753.tween || client.applyTweening) && local207 != -1 && local753.frames.length > local207) {
Static71.anIntArray147[local235] = local753.anIntArray474[local200]; Static71.anIntArray147[local235] = local753.anIntArray474[local200];
Static214.anIntArray492[local235] = arg0[local235].anInt5404; Static214.anIntArray492[local235] = arg0[local235].anInt5404;
local228 = local753.frames[local207]; local228 = local753.frames[local207];
@ -401,7 +401,7 @@ public final class NpcType {
local721 |= local962.isAlphaTransformed(local235); local721 |= local962.isAlphaTransformed(local235);
local725 |= arg8.aBoolean278; local725 |= arg8.aBoolean278;
} }
if ((arg8.tween || Static204.applyTweening) && arg3 != -1 && arg8.frames.length > arg3) { if ((arg8.tween || client.applyTweening) && arg3 != -1 && arg8.frames.length > arg3) {
local200 = arg8.anIntArray474[arg5]; local200 = arg8.anIntArray474[arg5];
local221 = arg8.frames[arg3]; local221 = arg8.frames[arg3];
local1040 = local221 >>> 16; local1040 = local221 >>> 16;
@ -432,7 +432,7 @@ public final class NpcType {
local721 |= local1088.isAlphaTransformed(local228); local721 |= local1088.isAlphaTransformed(local228);
local725 |= arg6.aBoolean278; local725 |= arg6.aBoolean278;
} }
if ((arg6.tween || Static204.applyTweening) && arg1 != -1 && arg1 < arg6.frames.length) { if ((arg6.tween || client.applyTweening) && arg1 != -1 && arg1 < arg6.frames.length) {
local300 = arg6.anIntArray474[arg2]; local300 = arg6.anIntArray474[arg2];
local1040 = arg6.frames[arg1]; local1040 = arg6.frames[arg1];
local318 = local1040 >>> 16; local318 = local1040 >>> 16;

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

@ -203,7 +203,7 @@ public final class ObjType {
} }
@OriginalMember(owner = "client!h", name = "a", descriptor = "(ILclient!na;I)Lclient!na;") @OriginalMember(owner = "client!h", name = "a", descriptor = "(ILclient!na;I)Lclient!na;")
public final JagString method1819(@OriginalArg(1) JagString arg0, @OriginalArg(2) int arg1) { public final JagString getParam(@OriginalArg(1) JagString arg0, @OriginalArg(2) int arg1) {
if (this.params == null) { if (this.params == null) {
return arg0; return arg0;
} else { } else {

34
client/src/main/java/OverheadChat.java Normal file
View file

@ -0,0 +1,34 @@
import org.openrs2.deob.annotation.OriginalMember;
import org.openrs2.deob.annotation.Pc;
public class OverheadChat {
@OriginalMember(owner = "client!bi", name = "f", descriptor = "(B)V")
public static void loop() {
@Pc(11) int local11;
for (local11 = -1; local11 < PlayerList.size; local11++) {
@Pc(22) int local22;
if (local11 == -1) {
local22 = 2047;
} else {
local22 = PlayerList.ids[local11];
}
@Pc(30) Player local30 = PlayerList.players[local22];
if (local30 != null && local30.chatLoops > 0) {
local30.chatLoops--;
if (local30.chatLoops == 0) {
local30.chatMessage = null;
}
}
}
for (local11 = 0; local11 < Static272.anInt5214; local11++) {
@Pc(68) int local68 = Static33.anIntArray79[local11];
@Pc(72) Npc local72 = NpcList.npcs[local68];
if (local72 != null && local72.chatLoops > 0) {
local72.chatLoops--;
if (local72.chatLoops == 0) {
local72.chatMessage = null;
}
}
}
}
}

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

@ -6,7 +6,9 @@ import org.openrs2.deob.annotation.Pc;
@OriginalClass("client!fe") @OriginalClass("client!fe")
public abstract class PathingEntity extends Entity { public abstract class PathingEntity extends Entity {
@OriginalMember(owner = "client!fe", name = "A", descriptor = "I") @OriginalMember(owner = "client!ef", name = "a", descriptor = "[I")
public static final int[] ANGLES = new int[] { 768, 1024, 1280, 512, 1536, 256, 0, 1792 };
@OriginalMember(owner = "client!fe", name = "A", descriptor = "I")
public int spotAnimStart; public int spotAnimStart;
@OriginalMember(owner = "client!fe", name = "S", descriptor = "I") @OriginalMember(owner = "client!fe", name = "S", descriptor = "I")

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

@ -14,6 +14,14 @@ public final class Player extends PathingEntity {
public static int inTutorialIsland = 0; public static int inTutorialIsland = 0;
@OriginalMember(owner = "client!ee", name = "b", descriptor = "I") @OriginalMember(owner = "client!ee", name = "b", descriptor = "I")
public static int level; public static int level;
@OriginalMember(owner = "client!bb", name = "E", descriptor = "I")
public static int runEnergy = 0;
@OriginalMember(owner = "client!ug", name = "o", descriptor = "I")
public static int weight = 0;
@OriginalMember(owner = "client!jl", name = "H", descriptor = "I")
public static int worldId = -1;
@OriginalMember(owner = "client!em", name = "B", descriptor = "I")
public static int rebootTimer = 0;
@OriginalMember(owner = "client!e", name = "Bc", descriptor = "Lclient!hh;") @OriginalMember(owner = "client!e", name = "Bc", descriptor = "Lclient!hh;")
public PlayerAppearance appearance; public PlayerAppearance appearance;
@ -30,7 +38,7 @@ public final class Player extends PathingEntity {
public int anInt1650 = 0; public int anInt1650 = 0;
@OriginalMember(owner = "client!e", name = "yc", descriptor = "I") @OriginalMember(owner = "client!e", name = "yc", descriptor = "I")
public int anInt1652 = 0; public int combatLevel = 0;
@OriginalMember(owner = "client!e", name = "Fc", descriptor = "I") @OriginalMember(owner = "client!e", name = "Fc", descriptor = "I")
public int anInt1656 = 0; public int anInt1656 = 0;
@ -209,11 +217,11 @@ public final class Player extends PathingEntity {
} }
this.anInt3365 = arg0.g2(); this.anInt3365 = arg0.g2();
@Pc(236) long local236 = arg0.g8(); @Pc(236) long local236 = arg0.g8();
this.username = Base37.decodeLowerCase(local236).method3125(); this.username = Base37.decode37(local236).toTitleCase();
this.anInt1652 = arg0.g1(); this.combatLevel = arg0.g1();
if (local37) { if (local37) {
this.anInt1671 = arg0.g2(); this.anInt1671 = arg0.g2();
this.anInt1656 = this.anInt1652; this.anInt1656 = this.combatLevel;
this.anInt1667 = -1; this.anInt1667 = -1;
} else { } else {
this.anInt1671 = 0; this.anInt1671 = 0;
@ -304,8 +312,8 @@ public final class Player extends PathingEntity {
if (local245 != null && local245.anInt4052 != -1) { if (local245 != null && local245.anInt4052 != -1) {
@Pc(291) int local291; @Pc(291) int local291;
@Pc(302) int local302; @Pc(302) int local302;
if (local245.anInt4058 == 1 && local245.anInt4057 >= 0 && Static175.npcs.length > local245.anInt4057) { if (local245.anInt4058 == 1 && local245.anInt4057 >= 0 && NpcList.npcs.length > local245.anInt4057) {
@Pc(278) Npc local278 = Static175.npcs[local245.anInt4057]; @Pc(278) Npc local278 = NpcList.npcs[local245.anInt4057];
if (local278 != null) { if (local278 != null) {
local291 = local278.xFine / 32 - PlayerList.self.xFine / 32; local291 = local278.xFine / 32 - PlayerList.self.xFine / 32;
local302 = local278.zFine / 32 - PlayerList.self.zFine / 32; local302 = local278.zFine / 32 - PlayerList.self.zFine / 32;

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

@ -32,7 +32,11 @@ public final class PlayerAppearance {
public static final short[] aShortArray64 = new short[] { -10304, 9104, -1, -1, -1 }; public static final short[] aShortArray64 = new short[] { -10304, 9104, -1, -1, -1 };
@OriginalMember(owner = "client!vd", name = "B", descriptor = "[S") @OriginalMember(owner = "client!vd", name = "B", descriptor = "[S")
public static final short[] aShortArray71 = new short[] { 6798, 8741, 25238, 4626, 4550 }; public static final short[] aShortArray71 = new short[] { 6798, 8741, 25238, 4626, 4550 };
@OriginalMember(owner = "client!cj", name = "e", descriptor = "[[S") @OriginalMember(owner = "client!qi", name = "x", descriptor = "[I")
public static final int[] MALE_FEATURES = new int[] { 0, 1, 2, 3, 4, 5, 6, 14 };
@OriginalMember(owner = "client!kh", name = "g", descriptor = "Lclient!hh;")
public static final PlayerAppearance DEFAULT = new PlayerAppearance();
@OriginalMember(owner = "client!cj", name = "e", descriptor = "[[S")
public static short[][] aShortArrayArray2; public static short[][] aShortArrayArray2;
@OriginalMember(owner = "client!nj", name = "m", descriptor = "[[S") @OriginalMember(owner = "client!nj", name = "m", descriptor = "[[S")
public static short[][] aShortArrayArray7; public static short[][] aShortArrayArray7;
@ -62,7 +66,7 @@ public final class PlayerAppearance {
private int[][] anIntArrayArray19; private int[][] anIntArrayArray19;
@OriginalMember(owner = "client!hh", name = "x", descriptor = "Z") @OriginalMember(owner = "client!hh", name = "x", descriptor = "Z")
public boolean aBoolean141; public boolean gender;
@OriginalMember(owner = "client!wk", name = "b", descriptor = "(II)V") @OriginalMember(owner = "client!wk", name = "b", descriptor = "(II)V")
public static void clean() { public static void clean() {
@ -128,7 +132,7 @@ public final class PlayerAppearance {
for (local53 = 0; local53 < 5; local53++) { for (local53 = 0; local53 < 5; local53++) {
this.aLong88 = local13[(int) (((long) this.anIntArray236[local53] ^ this.aLong88) & 0xFFL)] ^ this.aLong88 >>> 8; this.aLong88 = local13[(int) (((long) this.anIntArray236[local53] ^ this.aLong88) & 0xFFL)] ^ this.aLong88 >>> 8;
} }
this.aLong88 = local13[(int) (((long) (this.aBoolean141 ? 1 : 0) ^ this.aLong88) & 0xFFL)] ^ this.aLong88 >>> 8; this.aLong88 = local13[(int) (((long) (this.gender ? 1 : 0) ^ this.aLong88) & 0xFFL)] ^ this.aLong88 >>> 8;
if (local8 != 0L && this.aLong88 != local8) { if (local8 != 0L && this.aLong88 != local8) {
aClass99_33.method3098(local8); aClass99_33.method3098(local8);
} }
@ -136,7 +140,7 @@ public final class PlayerAppearance {
@OriginalMember(owner = "client!hh", name = "a", descriptor = "(ZZ)V") @OriginalMember(owner = "client!hh", name = "a", descriptor = "(ZZ)V")
public final void method1948(@OriginalArg(0) boolean arg0) { public final void method1948(@OriginalArg(0) boolean arg0) {
this.aBoolean141 = arg0; this.gender = arg0;
this.method1947(); this.method1947();
} }
@ -151,7 +155,7 @@ public final class PlayerAppearance {
for (@Pc(24) int local24 = 0; local24 < 8; local24++) { for (@Pc(24) int local24 = 0; local24 < 8; local24++) {
for (@Pc(31) int local31 = 0; local31 < IdkTypeList.anInt1716; local31++) { for (@Pc(31) int local31 = 0; local31 < IdkTypeList.anInt1716; local31++) {
@Pc(38) IdkType local38 = IdkTypeList.get(local31); @Pc(38) IdkType local38 = IdkTypeList.get(local31);
if (local38 != null && !local38.aBoolean85 && local38.feature == (arg2 ? Static153.anIntArray351[local24] : Static204.anIntArray425[local24])) { if (local38 != null && !local38.aBoolean85 && local38.feature == (arg2 ? Static153.anIntArray351[local24] : MALE_FEATURES[local24])) {
arg3[anIntArray451[local24]] = Integer.MIN_VALUE | local31; arg3[anIntArray451[local24]] = Integer.MIN_VALUE | local31;
break; break;
} }
@ -159,7 +163,7 @@ public final class PlayerAppearance {
} }
} }
this.anInt2492 = arg1; this.anInt2492 = arg1;
this.aBoolean141 = arg2; this.gender = arg2;
this.anIntArray236 = arg0; this.anIntArray236 = arg0;
this.anIntArray233 = arg3; this.anIntArray233 = arg3;
this.method1947(); this.method1947();
@ -238,7 +242,7 @@ public final class PlayerAppearance {
if ((local169 & Integer.MIN_VALUE) != 0 && !IdkTypeList.get(local169 & 0x3FFFFFFF).isBodyModelReady()) { if ((local169 & Integer.MIN_VALUE) != 0 && !IdkTypeList.get(local169 & 0x3FFFFFFF).isBodyModelReady()) {
local158 = true; local158 = true;
} }
} else if (!ObjTypeList.get(local169 & 0x3FFFFFFF).method1822(this.aBoolean141)) { } else if (!ObjTypeList.get(local169 & 0x3FFFFFFF).method1822(this.gender)) {
local158 = true; local158 = true;
} }
} }
@ -257,7 +261,7 @@ public final class PlayerAppearance {
local250 = local38[local169]; local250 = local38[local169];
@Pc(272) RawModel local272; @Pc(272) RawModel local272;
if ((local250 & 0x40000000) != 0) { if ((local250 & 0x40000000) != 0) {
local272 = ObjTypeList.get(local250 & 0x3FFFFFFF).getBodyModel(this.aBoolean141); local272 = ObjTypeList.get(local250 & 0x3FFFFFFF).getBodyModel(this.gender);
if (local272 != null) { if (local272 != null) {
local239[local169] = local272; local239[local169] = local272;
} }
@ -366,7 +370,7 @@ public final class PlayerAppearance {
local827 |= Static276.aClass3_Sub2_Sub7Array8[local353].isAlphaTransformed(local381); local827 |= Static276.aClass3_Sub2_Sub7Array8[local353].isAlphaTransformed(local381);
local838 |= local858.aBoolean278; local838 |= local858.aBoolean278;
} }
if ((local858.tween || Static204.applyTweening) && local367 != -1 && local367 < local858.frames.length) { if ((local858.tween || client.applyTweening) && local367 != -1 && local367 < local858.frames.length) {
Static262.anIntArray515[local353] = local858.anIntArray474[local374]; Static262.anIntArray515[local353] = local858.anIntArray474[local374];
Static73.anIntArray183[local353] = arg0[local353].anInt5404; Static73.anIntArray183[local353] = arg0[local353].anInt5404;
local979 = local858.frames[local367]; local979 = local858.frames[local367];
@ -404,7 +408,7 @@ public final class PlayerAppearance {
local827 |= local1042.isAlphaTransformed(local353); local827 |= local1042.isAlphaTransformed(local353);
local838 |= arg3.aBoolean278; local838 |= arg3.aBoolean278;
} }
if ((arg3.tween || Static204.applyTweening) && arg1 != -1 && arg3.frames.length > arg1) { if ((arg3.tween || client.applyTweening) && arg1 != -1 && arg3.frames.length > arg1) {
local360 = arg3.frames[arg1]; local360 = arg3.frames[arg1];
local451 = local360 >>> 16; local451 = local360 >>> 16;
local360 &= 0xFFFF; local360 &= 0xFFFF;
@ -435,7 +439,7 @@ public final class PlayerAppearance {
local827 |= local1154.isAlphaTransformed(local979); local827 |= local1154.isAlphaTransformed(local979);
local838 |= arg2.aBoolean278; local838 |= arg2.aBoolean278;
} }
if ((arg2.tween || Static204.applyTweening) && arg5 != -1 && arg2.frames.length > arg5) { if ((arg2.tween || client.applyTweening) && arg5 != -1 && arg2.frames.length > arg5) {
local457 = arg2.anIntArray474[arg8]; local457 = arg2.anIntArray474[arg8];
local451 = arg2.frames[arg5]; local451 = arg2.frames[arg5];
local481 = local451 >>> 16; local481 = local451 >>> 16;
@ -491,7 +495,7 @@ public final class PlayerAppearance {
if ((local52 & Integer.MIN_VALUE) != 0 && !IdkTypeList.get(local52 & 0x3FFFFFFF).isHeadModelReady()) { if ((local52 & Integer.MIN_VALUE) != 0 && !IdkTypeList.get(local52 & 0x3FFFFFFF).isHeadModelReady()) {
local42 = true; local42 = true;
} }
} else if (!ObjTypeList.get(local52 & 0x3FFFFFFF).method1816(this.aBoolean141)) { } else if (!ObjTypeList.get(local52 & 0x3FFFFFFF).method1816(this.gender)) {
local42 = true; local42 = true;
} }
} }
@ -505,7 +509,7 @@ public final class PlayerAppearance {
local114 = this.anIntArray233[local104]; local114 = this.anIntArray233[local104];
@Pc(134) RawModel local134; @Pc(134) RawModel local134;
if ((local114 & 0x40000000) != 0) { if ((local114 & 0x40000000) != 0) {
local134 = ObjTypeList.get(local114 & 0x3FFFFFFF).getHeadModel(this.aBoolean141); local134 = ObjTypeList.get(local114 & 0x3FFFFFFF).getHeadModel(this.gender);
if (local134 != null) { if (local134 != null) {
local100[local52++] = local134; local100[local52++] = local134;
} }

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

@ -3,6 +3,12 @@ import org.openrs2.deob.annotation.OriginalMember;
public class PlayerSkillXpTable { public class PlayerSkillXpTable {
@OriginalMember(owner = "client!ud", name = "T", descriptor = "[I") @OriginalMember(owner = "client!ud", name = "T", descriptor = "[I")
public static final int[] updatedStats = new int[32]; public static final int[] updatedStats = new int[32];
@OriginalMember(owner = "client!lb", name = "p", descriptor = "[I")
public static final int[] baseLevels = new int[25];
@OriginalMember(owner = "client!hk", name = "fb", descriptor = "[I")
public static final int[] boostedLevels = new int[25];
@OriginalMember(owner = "client!sg", name = "b", descriptor = "[I")
public static final int[] experience = new int[25];
@OriginalMember(owner = "client!ha", name = "m", descriptor = "I") @OriginalMember(owner = "client!ha", name = "m", descriptor = "I")
public static int updatedStatsWriterIndex = 0; public static int updatedStatsWriterIndex = 0;
} }

1226
client/src/main/java/Protocol.java
View file

File diff suppressed because it is too large Load diff

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

@ -7,43 +7,43 @@ import org.openrs2.deob.annotation.Pc;
public final class QuickChatCatType extends SecondaryNode { public final class QuickChatCatType extends SecondaryNode {
@OriginalMember(owner = "client!bc", name = "O", descriptor = "[I") @OriginalMember(owner = "client!bc", name = "O", descriptor = "[I")
public int[] anIntArray29; public int[] phraseShortcuts;
@OriginalMember(owner = "client!bc", name = "P", descriptor = "[I") @OriginalMember(owner = "client!bc", name = "P", descriptor = "[I")
public int[] anIntArray30; public int[] subcategories;
@OriginalMember(owner = "client!bc", name = "T", descriptor = "[I") @OriginalMember(owner = "client!bc", name = "T", descriptor = "[I")
public int[] anIntArray31; public int[] subcategoryShortcuts;
@OriginalMember(owner = "client!bc", name = "Y", descriptor = "Lclient!na;") @OriginalMember(owner = "client!bc", name = "Y", descriptor = "Lclient!na;")
public JagString aClass100_79; public JagString description;
@OriginalMember(owner = "client!bc", name = "ab", descriptor = "[I") @OriginalMember(owner = "client!bc", name = "ab", descriptor = "[I")
public int[] anIntArray32; public int[] phrases;
@OriginalMember(owner = "client!bc", name = "d", descriptor = "(I)V") @OriginalMember(owner = "client!bc", name = "d", descriptor = "(I)V")
public final void method465() { public final void method465() {
@Pc(8) int local8; @Pc(8) int local8;
if (this.anIntArray32 != null) { if (this.phrases != null) {
for (local8 = 0; local8 < this.anIntArray32.length; local8++) { for (local8 = 0; local8 < this.phrases.length; local8++) {
this.anIntArray32[local8] |= 0x8000; this.phrases[local8] |= 0x8000;
} }
} }
if (this.anIntArray30 != null) { if (this.subcategories != null) {
for (local8 = 0; local8 < this.anIntArray30.length; local8++) { for (local8 = 0; local8 < this.subcategories.length; local8++) {
this.anIntArray30[local8] |= 0x8000; this.subcategories[local8] |= 0x8000;
} }
} }
} }
@OriginalMember(owner = "client!bc", name = "c", descriptor = "(II)I") @OriginalMember(owner = "client!bc", name = "c", descriptor = "(II)I")
public final int method466(@OriginalArg(0) int arg0) { public final int getPhraseByShortcut(@OriginalArg(0) int arg0) {
if (this.anIntArray32 == null) { if (this.phrases == null) {
return -1; return -1;
} }
for (@Pc(13) int local13 = 0; local13 < this.anIntArray32.length; local13++) { for (@Pc(13) int local13 = 0; local13 < this.phrases.length; local13++) {
if (arg0 == this.anIntArray29[local13]) { if (arg0 == this.phraseShortcuts[local13]) {
return this.anIntArray32[local13]; return this.phrases[local13];
} }
} }
return -1; return -1;
@ -52,39 +52,39 @@ public final class QuickChatCatType extends SecondaryNode {
@OriginalMember(owner = "client!bc", name = "a", descriptor = "(Lclient!wa;II)V") @OriginalMember(owner = "client!bc", name = "a", descriptor = "(Lclient!wa;II)V")
private void method467(@OriginalArg(0) Buffer arg0, @OriginalArg(2) int arg1) { private void method467(@OriginalArg(0) Buffer arg0, @OriginalArg(2) int arg1) {
if (arg1 == 1) { if (arg1 == 1) {
this.aClass100_79 = arg0.gjstr(); this.description = arg0.gjstr();
return; return;
} }
@Pc(28) int local28; @Pc(28) int local28;
@Pc(38) int local38; @Pc(38) int local38;
if (arg1 == 2) { if (arg1 == 2) {
local28 = arg0.g1(); local28 = arg0.g1();
this.anIntArray30 = new int[local28]; this.subcategories = new int[local28];
this.anIntArray31 = new int[local28]; this.subcategoryShortcuts = new int[local28];
for (local38 = 0; local38 < local28; local38++) { for (local38 = 0; local38 < local28; local38++) {
this.anIntArray30[local38] = arg0.g2(); this.subcategories[local38] = arg0.g2();
this.anIntArray31[local38] = Static229.method3933(arg0.g1s()); this.subcategoryShortcuts[local38] = Static229.method3933(arg0.g1s());
} }
} else if (arg1 == 3) { } else if (arg1 == 3) {
local28 = arg0.g1(); local28 = arg0.g1();
this.anIntArray32 = new int[local28]; this.phrases = new int[local28];
this.anIntArray29 = new int[local28]; this.phraseShortcuts = new int[local28];
for (local38 = 0; local38 < local28; local38++) { for (local38 = 0; local38 < local28; local38++) {
this.anIntArray32[local38] = arg0.g2(); this.phrases[local38] = arg0.g2();
this.anIntArray29[local38] = Static229.method3933(arg0.g1s()); this.phraseShortcuts[local38] = Static229.method3933(arg0.g1s());
} }
} else if (arg1 == 4) { } else if (arg1 == 4) {
} }
} }
@OriginalMember(owner = "client!bc", name = "a", descriptor = "(BI)I") @OriginalMember(owner = "client!bc", name = "a", descriptor = "(BI)I")
public final int method469(@OriginalArg(1) int arg0) { public final int getSubcategoryByShortcut(@OriginalArg(1) int arg0) {
if (this.anIntArray30 == null) { if (this.subcategories == null) {
return -1; return -1;
} }
for (@Pc(21) int local21 = 0; local21 < this.anIntArray30.length; local21++) { for (@Pc(21) int local21 = 0; local21 < this.subcategories.length; local21++) {
if (this.anIntArray31[local21] == arg0) { if (this.subcategoryShortcuts[local21] == arg0) {
return this.anIntArray30[local21]; return this.subcategories[local21];
} }
} }
return -1; return -1;

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

@ -17,7 +17,7 @@ public class QuickChatCatTypeList {
} }
@OriginalMember(owner = "client!tb", name = "b", descriptor = "(IB)Lclient!bc;") @OriginalMember(owner = "client!tb", name = "b", descriptor = "(IB)Lclient!bc;")
public static QuickChatCatType method4045(@OriginalArg(0) int arg0) { public static QuickChatCatType get(@OriginalArg(0) int arg0) {
@Pc(10) QuickChatCatType local10 = (QuickChatCatType) types.get((long) arg0); @Pc(10) QuickChatCatType local10 = (QuickChatCatType) types.get((long) arg0);
if (local10 != null) { if (local10 != null) {
return local10; return local10;

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

@ -11,5 +11,5 @@ public final class QuickChatPhrase {
public QuickChatPhraseType type; public QuickChatPhraseType type;
@OriginalMember(owner = "client!bd", name = "h", descriptor = "[I") @OriginalMember(owner = "client!bd", name = "h", descriptor = "[I")
public int[] anIntArray33; public int[] values;
} }

28
client/src/main/java/QuickChatPhraseType.java
View file

@ -6,11 +6,13 @@ import org.openrs2.deob.annotation.Pc;
@OriginalClass("client!cb") @OriginalClass("client!cb")
public final class QuickChatPhraseType extends SecondaryNode { public final class QuickChatPhraseType extends SecondaryNode {
@OriginalMember(owner = "client!cb", name = "L", descriptor = "[I") @OriginalMember(owner = "client!ld", name = "a", descriptor = "[I")
public static final int[] DYNAMIC_COMMAND_ENCODE_BYTES = new int[] { 2, 2, 4, 0, 1, 8, 0, 0, 0, 0, 2, 0, 0, 0, 0, 0 };
@OriginalMember(owner = "client!cb", name = "L", descriptor = "[I")
private int[] anIntArray71; private int[] anIntArray71;
@OriginalMember(owner = "client!cb", name = "M", descriptor = "[I") @OriginalMember(owner = "client!cb", name = "M", descriptor = "[I")
public int[] anIntArray72; public int[] automaticResponses;
@OriginalMember(owner = "client!cb", name = "U", descriptor = "[[I") @OriginalMember(owner = "client!cb", name = "U", descriptor = "[[I")
private int[][] anIntArrayArray5; private int[][] anIntArrayArray5;
@ -22,12 +24,12 @@ public final class QuickChatPhraseType extends SecondaryNode {
public boolean aBoolean60 = true; public boolean aBoolean60 = true;
@OriginalMember(owner = "client!cb", name = "a", descriptor = "(Lclient!wa;[IZ)V") @OriginalMember(owner = "client!cb", name = "a", descriptor = "(Lclient!wa;[IZ)V")
public final void method760(@OriginalArg(0) Buffer arg0, @OriginalArg(1) int[] arg1) { public final void encodeMessage(@OriginalArg(0) Buffer arg0, @OriginalArg(1) int[] arg1) {
if (this.anIntArray71 == null) { if (this.anIntArray71 == null) {
return; return;
} }
for (@Pc(14) int local14 = 0; this.anIntArray71.length > local14 && local14 < arg1.length; local14++) { for (@Pc(14) int local14 = 0; this.anIntArray71.length > local14 && local14 < arg1.length; local14++) {
@Pc(38) int local38 = Static143.anIntArray329[this.method765(local14)]; @Pc(38) int local38 = DYNAMIC_COMMAND_ENCODE_BYTES[this.getDynamicCommand(local14)];
if (local38 > 0) { if (local38 > 0) {
arg0.pVarLong(local38, (long) arg1[local14]); arg0.pVarLong(local38, (long) arg1[local14]);
} }
@ -47,15 +49,15 @@ public final class QuickChatPhraseType extends SecondaryNode {
@OriginalMember(owner = "client!cb", name = "e", descriptor = "(I)V") @OriginalMember(owner = "client!cb", name = "e", descriptor = "(I)V")
public final void method763() { public final void method763() {
if (this.anIntArray72 != null) { if (this.automaticResponses != null) {
for (@Pc(7) int local7 = 0; local7 < this.anIntArray72.length; local7++) { for (@Pc(7) int local7 = 0; local7 < this.automaticResponses.length; local7++) {
this.anIntArray72[local7] |= 0x8000; this.automaticResponses[local7] |= 0x8000;
} }
} }
} }
@OriginalMember(owner = "client!cb", name = "a", descriptor = "(III)I") @OriginalMember(owner = "client!cb", name = "a", descriptor = "(III)I")
public final int method764(@OriginalArg(1) int arg0, @OriginalArg(2) int arg1) { public final int getDynamicCommandParam(@OriginalArg(1) int arg0, @OriginalArg(2) int arg1) {
if (this.anIntArray71 == null || arg1 < 0 || arg1 > this.anIntArray71.length) { if (this.anIntArray71 == null || arg1 < 0 || arg1 > this.anIntArray71.length) {
return -1; return -1;
} else if (this.anIntArrayArray5[arg1] == null || arg0 < 0 || arg0 > this.anIntArrayArray5[arg1].length) { } else if (this.anIntArrayArray5[arg1] == null || arg0 < 0 || arg0 > this.anIntArrayArray5[arg1].length) {
@ -66,12 +68,12 @@ public final class QuickChatPhraseType extends SecondaryNode {
} }
@OriginalMember(owner = "client!cb", name = "c", descriptor = "(II)I") @OriginalMember(owner = "client!cb", name = "c", descriptor = "(II)I")
public final int method765(@OriginalArg(1) int arg0) { public final int getDynamicCommand(@OriginalArg(1) int arg0) {
return this.anIntArray71 == null || arg0 < 0 || arg0 > this.anIntArray71.length ? -1 : this.anIntArray71[arg0]; return this.anIntArray71 == null || arg0 < 0 || arg0 > this.anIntArray71.length ? -1 : this.anIntArray71[arg0];
} }
@OriginalMember(owner = "client!cb", name = "a", descriptor = "(Z)I") @OriginalMember(owner = "client!cb", name = "a", descriptor = "(Z)I")
public final int method767() { public final int getDynamicCommandCount() {
return this.anIntArray71 == null ? 0 : this.anIntArray71.length; return this.anIntArray71 == null ? 0 : this.anIntArray71.length;
} }
@ -85,9 +87,9 @@ public final class QuickChatPhraseType extends SecondaryNode {
@Pc(42) int local42; @Pc(42) int local42;
if (arg1 == 2) { if (arg1 == 2) {
local32 = arg0.g1(); local32 = arg0.g1();
this.anIntArray72 = new int[local32]; this.automaticResponses = new int[local32];
for (local42 = 0; local42 < local32; local42++) { for (local42 = 0; local42 < local32; local42++) {
this.anIntArray72[local42] = arg0.g2(); this.automaticResponses[local42] = arg0.g2();
} }
} else if (arg1 == 3) { } else if (arg1 == 3) {
local32 = arg0.g1(); local32 = arg0.g1();
@ -107,7 +109,7 @@ public final class QuickChatPhraseType extends SecondaryNode {
} }
@OriginalMember(owner = "client!cb", name = "f", descriptor = "(I)Lclient!na;") @OriginalMember(owner = "client!cb", name = "f", descriptor = "(I)Lclient!na;")
public final JagString method769() { public final JagString getText() {
@Pc(15) JagString local15 = Static87.allocate(80); @Pc(15) JagString local15 = Static87.allocate(80);
if (this.aClass100Array35 == null) { if (this.aClass100Array35 == null) {
return Static202.aClass100_891; return Static202.aClass100_891;

124
client/src/main/java/ReflectionCheck.java
View file

@ -1,5 +1,12 @@
import org.openrs2.deob.annotation.OriginalArg;
import org.openrs2.deob.annotation.OriginalClass; import org.openrs2.deob.annotation.OriginalClass;
import org.openrs2.deob.annotation.OriginalMember; import org.openrs2.deob.annotation.OriginalMember;
import org.openrs2.deob.annotation.Pc;
import java.io.*;
import java.lang.reflect.Field;
import java.lang.reflect.InvocationTargetException;
import java.lang.reflect.Method;
@OriginalClass("client!ed") @OriginalClass("client!ed")
public final class ReflectionCheck extends Node { public final class ReflectionCheck extends Node {
@ -27,4 +34,121 @@ public final class ReflectionCheck extends Node {
@OriginalMember(owner = "client!ed", name = "F", descriptor = "I") @OriginalMember(owner = "client!ed", name = "F", descriptor = "I")
public int anInt1732; public int anInt1732;
@OriginalMember(owner = "client!t", name = "a", descriptor = "(Lclient!i;II)V")
public static void loop(@OriginalArg(0) Packet arg0) {
while (true) {
@Pc(18) ReflectionCheck local18 = (ReflectionCheck) Static204.aClass69_113.method2289();
if (local18 == null) {
return;
}
@Pc(23) boolean local23 = false;
@Pc(25) int local25;
for (local25 = 0; local25 < local18.anInt1725; local25++) {
if (local18.aClass212Array2[local25] != null) {
if (local18.aClass212Array2[local25].status == 2) {
local18.anIntArray138[local25] = -5;
}
if (local18.aClass212Array2[local25].status == 0) {
local23 = true;
}
}
if (local18.aClass212Array1[local25] != null) {
if (local18.aClass212Array1[local25].status == 2) {
local18.anIntArray138[local25] = -6;
}
if (local18.aClass212Array1[local25].status == 0) {
local23 = true;
}
}
}
if (local23) {
return;
}
arg0.p1isaac(163);
arg0.p1(0);
local25 = arg0.offset;
arg0.p4(local18.anInt1732);
for (@Pc(121) int local121 = 0; local121 < local18.anInt1725; local121++) {
if (local18.anIntArray138[local121] == 0) {
try {
@Pc(151) int local151 = local18.anIntArray139[local121];
@Pc(168) Field local168;
@Pc(195) int local195;
if (local151 == 0) {
local168 = (Field) local18.aClass212Array2[local121].result;
local195 = local168.getInt(null);
arg0.p1(0);
arg0.p4(local195);
} else if (local151 == 1) {
local168 = (Field) local18.aClass212Array2[local121].result;
local168.setInt(null, local18.anIntArray137[local121]);
arg0.p1(0);
} else if (local151 == 2) {
local168 = (Field) local18.aClass212Array2[local121].result;
local195 = local168.getModifiers();
arg0.p1(0);
arg0.p4(local195);
}
@Pc(234) Method local234;
if (local151 == 3) {
local234 = (Method) local18.aClass212Array1[local121].result;
@Pc(239) byte[][] local239 = local18.aByteArrayArrayArray6[local121];
@Pc(243) Object[] local243 = new Object[local239.length];
for (@Pc(245) int local245 = 0; local245 < local239.length; local245++) {
@Pc(259) ObjectInputStream local259 = new ObjectInputStream(new ByteArrayInputStream(local239[local245]));
local243[local245] = local259.readObject();
}
@Pc(272) Object local272 = local234.invoke(null, local243);
if (local272 == null) {
arg0.p1(0);
} else if (local272 instanceof Number) {
arg0.p1(1);
arg0.p8(((Number) local272).longValue());
} else if (local272 instanceof JagString) {
arg0.p1(2);
arg0.pjstr((JagString) local272);
} else {
arg0.p1(4);
}
} else if (local151 == 4) {
local234 = (Method) local18.aClass212Array1[local121].result;
local195 = local234.getModifiers();
arg0.p1(0);
arg0.p4(local195);
}
} catch (@Pc(338) ClassNotFoundException local338) {
arg0.p1(-10);
} catch (@Pc(344) InvalidClassException local344) {
arg0.p1(-11);
} catch (@Pc(350) StreamCorruptedException local350) {
arg0.p1(-12);
} catch (@Pc(356) OptionalDataException local356) {
arg0.p1(-13);
} catch (@Pc(362) IllegalAccessException local362) {
arg0.p1(-14);
} catch (@Pc(368) IllegalArgumentException local368) {
arg0.p1(-15);
} catch (@Pc(374) InvocationTargetException local374) {
arg0.p1(-16);
} catch (@Pc(380) SecurityException local380) {
arg0.p1(-17);
} catch (@Pc(386) IOException local386) {
arg0.p1(-18);
} catch (@Pc(392) NullPointerException local392) {
arg0.p1(-19);
} catch (@Pc(398) Exception local398) {
arg0.p1(-20);
} catch (@Pc(404) Throwable local404) {
arg0.p1(-21);
}
} else {
arg0.p1(local18.anIntArray138[local121]);
}
}
arg0.pCrc32(local25);
arg0.p1len(arg0.offset - local25);
local18.unlink();
}
}
} }

59
client/src/main/java/SceneGraph.java
View file

@ -3,6 +3,9 @@ import org.openrs2.deob.annotation.OriginalMember;
import org.openrs2.deob.annotation.Pc; import org.openrs2.deob.annotation.Pc;
public class SceneGraph { public class SceneGraph {
@OriginalMember(owner = "client!kc", name = "o", descriptor = "[[[Lclient!bj;")
public static Tile[][][] tiles;
@OriginalMember(owner = "client!km", name = "f", descriptor = "(I)Z") @OriginalMember(owner = "client!km", name = "f", descriptor = "(I)Z")
public static boolean allLevelsAreVisible() { public static boolean allLevelsAreVisible() {
return GlRenderer.enabled || Preferences.allLevelsVisible; return GlRenderer.enabled || Preferences.allLevelsVisible;
@ -28,4 +31,60 @@ public class SceneGraph {
@Pc(118) int local118 = local36 * Static83.activeTileHeightMap[local42][local12 + 1][local16] + (128 - local36) * Static83.activeTileHeightMap[local42][local12][local16] >> 7; @Pc(118) int local118 = local36 * Static83.activeTileHeightMap[local42][local12 + 1][local16] + (128 - local36) * Static83.activeTileHeightMap[local42][local12][local16] >> 7;
return local40 * local91 + (128 - local40) * local118 >> 7; return local40 * local91 + (128 - local40) * local118 >> 7;
} }
@OriginalMember(owner = "client!ih", name = "a", descriptor = "(III)Lclient!jh;")
public static Wall removeWall(@OriginalArg(0) int arg0, @OriginalArg(1) int arg1, @OriginalArg(2) int arg2) {
@Pc(7) Tile local7 = tiles[arg0][arg1][arg2];
if (local7 == null) {
return null;
} else {
@Pc(14) Wall local14 = local7.aClass77_1;
local7.aClass77_1 = null;
return local14;
}
}
@OriginalMember(owner = "client!fc", name = "a", descriptor = "()V")
public static void clear() {
@Pc(3) int local3;
@Pc(9) int local9;
@Pc(14) int local14;
if (Static197.surfaceGroundTiles != null) {
for (local3 = 0; local3 < Static197.surfaceGroundTiles.length; local3++) {
for (local9 = 0; local9 < Static152.mapSizeX; local9++) {
for (local14 = 0; local14 < Static99.mapSizeZ; local14++) {
Static197.surfaceGroundTiles[local3][local9][local14] = null;
}
}
}
}
Static36.surfaceHdTiles = null;
if (Static276.underWaterGroundTiles != null) {
for (local3 = 0; local3 < Static276.underWaterGroundTiles.length; local3++) {
for (local9 = 0; local9 < Static152.mapSizeX; local9++) {
for (local14 = 0; local14 < Static99.mapSizeZ; local14++) {
Static276.underWaterGroundTiles[local3][local9][local14] = null;
}
}
}
}
Static195.underWaterHdTiles = null;
Static28.anInt917 = 0;
if (Static91.aClass120Array1 != null) {
for (local3 = 0; local3 < Static28.anInt917; local3++) {
Static91.aClass120Array1[local3] = null;
}
}
if (Static243.aClass31Array3 != null) {
for (local3 = 0; local3 < Static22.anInt726; local3++) {
Static243.aClass31Array3[local3] = null;
}
Static22.anInt726 = 0;
}
if (Static25.aClass31Array2 != null) {
for (local3 = 0; local3 < Static25.aClass31Array2.length; local3++) {
Static25.aClass31Array2[local3] = null;
}
}
}
} }

2386
client/src/main/java/Static88.java → client/src/main/java/ScriptRunner.java
View file

File diff suppressed because it is too large Load diff

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

@ -82,7 +82,7 @@ public final class SeqType {
} }
@Pc(39) int local39 = arg3 & 0x3; @Pc(39) int local39 = arg3 & 0x3;
@Pc(41) AnimFrameset local41 = null; @Pc(41) AnimFrameset local41 = null;
if ((this.tween || Static204.applyTweening) && arg1 != -1 && this.frames.length > arg1) { if ((this.tween || client.applyTweening) && arg1 != -1 && this.frames.length > arg1) {
@Pc(69) int local69 = this.frames[arg1]; @Pc(69) int local69 = this.frames[arg1];
local41 = Static72.getAnimFrameset(local69 >> 16); local41 = Static72.getAnimFrameset(local69 >> 16);
arg1 = local69 & 0xFFFF; arg1 = local69 & 0xFFFF;
@ -137,7 +137,7 @@ public final class SeqType {
return arg0.method4572(true, true, true); return arg0.method4572(true, true, true);
} }
@Pc(34) AnimFrameset local34 = null; @Pc(34) AnimFrameset local34 = null;
if ((this.tween || Static204.applyTweening) && arg1 != -1 && arg1 < this.frames.length) { if ((this.tween || client.applyTweening) && arg1 != -1 && arg1 < this.frames.length) {
@Pc(59) int local59 = this.frames[arg1]; @Pc(59) int local59 = this.frames[arg1];
local34 = Static72.getAnimFrameset(local59 >> 16); local34 = Static72.getAnimFrameset(local59 >> 16);
arg1 = local59 & 0xFFFF; arg1 = local59 & 0xFFFF;
@ -154,7 +154,7 @@ public final class SeqType {
local83 &= 0xFFFF; local83 &= 0xFFFF;
} }
} }
if ((this.tween || Static204.applyTweening) && arg1 != -1 && this.anIntArray475.length > arg1) { if ((this.tween || client.applyTweening) && arg1 != -1 && this.anIntArray475.length > arg1) {
local85 = this.anIntArray475[arg1]; local85 = this.anIntArray475[arg1];
if (local85 != 65535) { if (local85 != 65535) {
local81 = Static72.getAnimFrameset(local85 >> 16); local81 = Static72.getAnimFrameset(local85 >> 16);
@ -195,7 +195,7 @@ public final class SeqType {
} }
@Pc(40) int local40 = arg3 & 0x3; @Pc(40) int local40 = arg3 & 0x3;
@Pc(42) AnimFrameset local42 = null; @Pc(42) AnimFrameset local42 = null;
if ((this.tween || Static204.applyTweening) && arg0 != -1 && arg0 < this.frames.length) { if ((this.tween || client.applyTweening) && arg0 != -1 && arg0 < this.frames.length) {
@Pc(66) int local66 = this.frames[arg0]; @Pc(66) int local66 = this.frames[arg0];
local42 = Static72.getAnimFrameset(local66 >> 16); local42 = Static72.getAnimFrameset(local66 >> 16);
arg0 = local66 & 0xFFFF; arg0 = local66 & 0xFFFF;
@ -269,7 +269,7 @@ public final class SeqType {
return arg3.method4560(true, true, true); return arg3.method4560(true, true, true);
} }
@Pc(42) AnimFrameset local42 = null; @Pc(42) AnimFrameset local42 = null;
if ((this.tween || Static204.applyTweening) && arg0 != -1 && this.frames.length > arg0) { if ((this.tween || client.applyTweening) && arg0 != -1 && this.frames.length > arg0) {
@Pc(65) int local65 = this.frames[arg0]; @Pc(65) int local65 = this.frames[arg0];
local42 = Static72.getAnimFrameset(local65 >> 16); local42 = Static72.getAnimFrameset(local65 >> 16);
arg0 = local65 & 0xFFFF; arg0 = local65 & 0xFFFF;

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

@ -23,7 +23,7 @@ public final class ServerActiveProperties extends Node {
} }
@OriginalMember(owner = "client!bf", name = "d", descriptor = "(I)Z") @OriginalMember(owner = "client!bf", name = "d", descriptor = "(I)Z")
public final boolean method504() { public final boolean isObjReplaceEnabled() {
return (this.anInt546 >> 29 & 0x1) != 0; return (this.anInt546 >> 29 & 0x1) != 0;
} }
@ -63,7 +63,7 @@ public final class ServerActiveProperties extends Node {
} }
@OriginalMember(owner = "client!bf", name = "i", descriptor = "(I)I") @OriginalMember(owner = "client!bf", name = "i", descriptor = "(I)I")
public final int method512() { public final int getTargetMask() {
return Static199.method3594(this.anInt546); return Static199.method3594(this.anInt546);
} }
} }

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

@ -27,7 +27,7 @@ public final class SoftwareAlphaSprite extends SoftwareSprite {
@Pc(72) int local72 = local45; @Pc(72) int local72 = local45;
@Pc(74) int local74 = local57; @Pc(74) int local74 = local57;
for (@Pc(77) int local77 = -20; local77 < 0; local77++) { for (@Pc(77) int local77 = -20; local77 < 0; local77++) {
@Pc(93) int local93 = this.anIntArray20[(local72 >> 16) + (local74 >> 16) * this.anInt1867]; @Pc(93) int local93 = this.pixels[(local72 >> 16) + (local74 >> 16) * this.anInt1867];
@Pc(97) int local97 = SoftwareRaster.pixels[local70]; @Pc(97) int local97 = SoftwareRaster.pixels[local70];
@Pc(101) int local101 = local93 >>> 24; @Pc(101) int local101 = local93 >>> 24;
@Pc(105) int local105 = 256 - local101; @Pc(105) int local105 = 256 - local101;
@ -81,7 +81,7 @@ public final class SoftwareAlphaSprite extends SoftwareSprite {
local27 += local36; local27 += local36;
} }
if (local23 > 0 && local20 > 0) { if (local23 > 0 && local20 > 0) {
Static283.method319(SoftwareRaster.pixels, this.anIntArray20, local17, local15, local23, local20, local27, local29); Static283.method319(SoftwareRaster.pixels, this.pixels, local17, local15, local23, local20, local27, local29);
} }
} }
@ -123,7 +123,7 @@ public final class SoftwareAlphaSprite extends SoftwareSprite {
local27 += local36; local27 += local36;
} }
if (local23 > 0 && local20 > 0) { if (local23 > 0 && local20 > 0) {
Static283.method319(SoftwareRaster.pixels, this.anIntArray20, local17, local15, local23, local20, local27, local29); Static283.method319(SoftwareRaster.pixels, this.pixels, local17, local15, local23, local20, local27, local29);
} }
} }
@ -259,7 +259,7 @@ public final class SoftwareAlphaSprite extends SoftwareSprite {
local394 = local853; local394 = local853;
} }
while (local394 < 0) { while (local394 < 0) {
local432 = this.anIntArray20[(local378 >> 12) * this.anInt1867 + (local802 >> 12)]; local432 = this.pixels[(local378 >> 12) * this.anInt1867 + (local802 >> 12)];
local436 = SoftwareRaster.pixels[local388]; local436 = SoftwareRaster.pixels[local388];
local440 = local432 >>> 24; local440 = local432 >>> 24;
local444 = 256 - local440; local444 = 256 - local440;
@ -304,7 +304,7 @@ public final class SoftwareAlphaSprite extends SoftwareSprite {
local394 = local1049; local394 = local1049;
} }
while (local394 < 0) { while (local394 < 0) {
local432 = this.anIntArray20[(local504 >> 12) * this.anInt1867 + (local802 >> 12)]; local432 = this.pixels[(local504 >> 12) * this.anInt1867 + (local802 >> 12)];
local436 = SoftwareRaster.pixels[local388]; local436 = SoftwareRaster.pixels[local388];
local440 = local432 >>> 24; local440 = local432 >>> 24;
local444 = 256 - local440; local444 = 256 - local440;
@ -349,7 +349,7 @@ public final class SoftwareAlphaSprite extends SoftwareSprite {
local394 = local1253; local394 = local1253;
} }
while (local394 < 0) { while (local394 < 0) {
local432 = this.anIntArray20[(local504 >> 12) * this.anInt1867 + (local802 >> 12)]; local432 = this.pixels[(local504 >> 12) * this.anInt1867 + (local802 >> 12)];
local436 = SoftwareRaster.pixels[local388]; local436 = SoftwareRaster.pixels[local388];
local440 = local432 >>> 24; local440 = local432 >>> 24;
local444 = 256 - local440; local444 = 256 - local440;
@ -382,7 +382,7 @@ public final class SoftwareAlphaSprite extends SoftwareSprite {
local394 = local1412; local394 = local1412;
} }
while (local394 < 0) { while (local394 < 0) {
local432 = this.anIntArray20[(local378 >> 12) * this.anInt1867 + (local802 >> 12)]; local432 = this.pixels[(local378 >> 12) * this.anInt1867 + (local802 >> 12)];
local436 = SoftwareRaster.pixels[local388]; local436 = SoftwareRaster.pixels[local388];
local440 = local432 >>> 24; local440 = local432 >>> 24;
local444 = 256 - local440; local444 = 256 - local440;
@ -426,7 +426,7 @@ public final class SoftwareAlphaSprite extends SoftwareSprite {
local394 = local1610; local394 = local1610;
} }
while (local394 < 0) { while (local394 < 0) {
local432 = this.anIntArray20[(local504 >> 12) * this.anInt1867 + (local802 >> 12)]; local432 = this.pixels[(local504 >> 12) * this.anInt1867 + (local802 >> 12)];
local436 = SoftwareRaster.pixels[local388]; local436 = SoftwareRaster.pixels[local388];
local440 = local432 >>> 24; local440 = local432 >>> 24;
local444 = 256 - local440; local444 = 256 - local440;
@ -470,7 +470,7 @@ public final class SoftwareAlphaSprite extends SoftwareSprite {
local394 = local1816; local394 = local1816;
} }
while (local394 < 0) { while (local394 < 0) {
local432 = this.anIntArray20[(local504 >> 12) * this.anInt1867 + (local802 >> 12)]; local432 = this.pixels[(local504 >> 12) * this.anInt1867 + (local802 >> 12)];
local436 = SoftwareRaster.pixels[local388]; local436 = SoftwareRaster.pixels[local388];
local440 = local432 >>> 24; local440 = local432 >>> 24;
local444 = 256 - local440; local444 = 256 - local440;
@ -492,7 +492,7 @@ public final class SoftwareAlphaSprite extends SoftwareSprite {
local394 = local166; local394 = local166;
if (local368 >= 0 && local378 >= 0 && local368 - (this.anInt1867 << 12) < 0 && local378 - (this.anInt1859 << 12) < 0) { if (local368 >= 0 && local378 >= 0 && local368 - (this.anInt1867 << 12) < 0 && local378 - (this.anInt1859 << 12) < 0) {
while (local394 < 0) { while (local394 < 0) {
local432 = this.anIntArray20[(local378 >> 12) * this.anInt1867 + (local368 >> 12)]; local432 = this.pixels[(local378 >> 12) * this.anInt1867 + (local368 >> 12)];
local436 = SoftwareRaster.pixels[local388]; local436 = SoftwareRaster.pixels[local388];
local440 = local432 >>> 24; local440 = local432 >>> 24;
local444 = 256 - local440; local444 = 256 - local440;
@ -522,7 +522,7 @@ public final class SoftwareAlphaSprite extends SoftwareSprite {
local394 = local553; local394 = local553;
} }
while (local394 < 0) { while (local394 < 0) {
local432 = this.anIntArray20[(local504 >> 12) * this.anInt1867 + (local368 >> 12)]; local432 = this.pixels[(local504 >> 12) * this.anInt1867 + (local368 >> 12)];
local436 = SoftwareRaster.pixels[local388]; local436 = SoftwareRaster.pixels[local388];
local440 = local432 >>> 24; local440 = local432 >>> 24;
local444 = 256 - local440; local444 = 256 - local440;
@ -553,7 +553,7 @@ public final class SoftwareAlphaSprite extends SoftwareSprite {
local394 = local702; local394 = local702;
} }
while (local394 < 0) { while (local394 < 0) {
local432 = this.anIntArray20[(local504 >> 12) * this.anInt1867 + (local368 >> 12)]; local432 = this.pixels[(local504 >> 12) * this.anInt1867 + (local368 >> 12)];
local436 = SoftwareRaster.pixels[local388]; local436 = SoftwareRaster.pixels[local388];
local440 = local432 >>> 24; local440 = local432 >>> 24;
local444 = 256 - local440; local444 = 256 - local440;
@ -588,7 +588,7 @@ public final class SoftwareAlphaSprite extends SoftwareSprite {
@Pc(88) int local88 = local51 + local39 * local78; @Pc(88) int local88 = local51 + local39 * local78;
@Pc(94) int local94 = local63 - local33 * local78; @Pc(94) int local94 = local63 - local33 * local78;
for (@Pc(99) int local99 = -arg9[local71]; local99 < 0; local99++) { for (@Pc(99) int local99 = -arg9[local71]; local99 < 0; local99++) {
@Pc(115) int local115 = this.anIntArray20[(local88 >> 16) + (local94 >> 16) * this.anInt1867]; @Pc(115) int local115 = this.pixels[(local88 >> 16) + (local94 >> 16) * this.anInt1867];
@Pc(119) int local119 = SoftwareRaster.pixels[local82]; @Pc(119) int local119 = SoftwareRaster.pixels[local82];
@Pc(123) int local123 = local115 >>> 24; @Pc(123) int local123 = local115 >>> 24;
@Pc(127) int local127 = 256 - local123; @Pc(127) int local127 = 256 - local123;
@ -623,7 +623,7 @@ public final class SoftwareAlphaSprite extends SoftwareSprite {
@Pc(88) int local88 = local51 + local39 * local78; @Pc(88) int local88 = local51 + local39 * local78;
@Pc(94) int local94 = local63 - local33 * local78; @Pc(94) int local94 = local63 - local33 * local78;
for (@Pc(99) int local99 = -arg8[local71]; local99 < 0; local99++) { for (@Pc(99) int local99 = -arg8[local71]; local99 < 0; local99++) {
@Pc(115) int local115 = this.anIntArray20[(local88 >> 16) + (local94 >> 16) * this.anInt1867]; @Pc(115) int local115 = this.pixels[(local88 >> 16) + (local94 >> 16) * this.anInt1867];
@Pc(119) int local119 = SoftwareRaster.pixels[local82]; @Pc(119) int local119 = SoftwareRaster.pixels[local82];
@Pc(123) int local123 = local115 >>> 24; @Pc(123) int local123 = local115 >>> 24;
@Pc(127) int local127 = 256 - local123; @Pc(127) int local127 = 256 - local123;
@ -694,7 +694,7 @@ public final class SoftwareAlphaSprite extends SoftwareSprite {
local12 += local26 * local150; local12 += local26 * local150;
local130 += local150; local130 += local150;
} }
Static283.method317(SoftwareRaster.pixels, this.anIntArray20, local12, local14, local46, local130, arg2, arg3, local26, local32, local7, arg4); Static283.method317(SoftwareRaster.pixels, this.pixels, local12, local14, local46, local130, arg2, arg3, local26, local32, local7, arg4);
} }
@OriginalMember(owner = "client!am", name = "a", descriptor = "(IIII)V") @OriginalMember(owner = "client!am", name = "a", descriptor = "(IIII)V")
@ -752,7 +752,7 @@ public final class SoftwareAlphaSprite extends SoftwareSprite {
local12 += local26 * local150; local12 += local26 * local150;
local130 += local150; local130 += local150;
} }
Static283.method321(SoftwareRaster.pixels, this.anIntArray20, local12, local14, local46, local130, arg2, arg3, local26, local32, local7); Static283.method321(SoftwareRaster.pixels, this.pixels, local12, local14, local46, local130, arg2, arg3, local26, local32, local7);
} }
@OriginalMember(owner = "client!am", name = "d", descriptor = "(II)V") @OriginalMember(owner = "client!am", name = "d", descriptor = "(II)V")
@ -793,7 +793,7 @@ public final class SoftwareAlphaSprite extends SoftwareSprite {
local36 += local47; local36 += local47;
} }
if (local32 > 0 && local29 > 0) { if (local32 > 0 && local29 > 0) {
Static283.method318(SoftwareRaster.pixels, this.anIntArray20, local26, local21, local32, local29, local36, local40); Static283.method318(SoftwareRaster.pixels, this.pixels, local26, local21, local32, local29, local36, local40);
} }
} }
@ -835,7 +835,7 @@ public final class SoftwareAlphaSprite extends SoftwareSprite {
local27 += local36; local27 += local36;
} }
if (local23 > 0 && local20 > 0) { if (local23 > 0 && local20 > 0) {
Static283.method320(SoftwareRaster.pixels, this.anIntArray20, local17, local15, local23, local20, local27, local29, arg2); Static283.method320(SoftwareRaster.pixels, this.pixels, local17, local15, local23, local20, local27, local29, arg2);
} }
} }
} }

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

@ -7,7 +7,7 @@ import org.openrs2.deob.annotation.Pc;
public class SoftwareSprite extends Sprite { public class SoftwareSprite extends Sprite {
@OriginalMember(owner = "client!mm", name = "L", descriptor = "[I") @OriginalMember(owner = "client!mm", name = "L", descriptor = "[I")
public int[] anIntArray20; public int[] pixels;
@OriginalMember(owner = "client!mm", name = "<init>", descriptor = "(IIIIII[I)V") @OriginalMember(owner = "client!mm", name = "<init>", descriptor = "(IIIIII[I)V")
public SoftwareSprite(@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) { public SoftwareSprite(@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) {
@ -17,12 +17,12 @@ public class SoftwareSprite extends Sprite {
this.anInt1861 = arg3; this.anInt1861 = arg3;
this.anInt1867 = arg4; this.anInt1867 = arg4;
this.anInt1859 = arg5; this.anInt1859 = arg5;
this.anIntArray20 = arg6; this.pixels = arg6;
} }
@OriginalMember(owner = "client!mm", name = "<init>", descriptor = "(II)V") @OriginalMember(owner = "client!mm", name = "<init>", descriptor = "(II)V")
public SoftwareSprite(@OriginalArg(0) int arg0, @OriginalArg(1) int arg1) { public SoftwareSprite(@OriginalArg(0) int arg0, @OriginalArg(1) int arg1) {
this.anIntArray20 = new int[arg0 * arg1]; this.pixels = new int[arg0 * arg1];
this.anInt1867 = this.anInt1860 = arg0; this.anInt1867 = this.anInt1860 = arg0;
this.anInt1859 = this.anInt1866 = arg1; this.anInt1859 = this.anInt1866 = arg1;
this.anInt1863 = this.anInt1861 = 0; this.anInt1863 = this.anInt1861 = 0;
@ -54,10 +54,10 @@ public class SoftwareSprite extends Sprite {
@Pc(89) int[] local89 = new int[local77 * local84]; @Pc(89) int[] local89 = new int[local77 * local84];
for (@Pc(91) int local91 = 0; local91 < this.anInt1859; local91++) { for (@Pc(91) int local91 = 0; local91 < this.anInt1859; local91++) {
for (@Pc(97) int local97 = 0; local97 < this.anInt1867; local97++) { for (@Pc(97) int local97 = 0; local97 < this.anInt1867; local97++) {
local89[(local91 + local42) * local77 + local97 + local12] = this.anIntArray20[local91 * this.anInt1867 + local97]; local89[(local91 + local42) * local77 + local97 + local12] = this.pixels[local91 * this.anInt1867 + local97];
} }
} }
this.anIntArray20 = local89; this.pixels = local89;
this.anInt1867 = local77; this.anInt1867 = local77;
this.anInt1859 = local84; this.anInt1859 = local84;
this.anInt1863 -= local12; this.anInt1863 -= local12;
@ -70,10 +70,10 @@ public class SoftwareSprite extends Sprite {
@Pc(8) int local8 = 0; @Pc(8) int local8 = 0;
for (@Pc(10) int local10 = 0; local10 < this.anInt1859; local10++) { for (@Pc(10) int local10 = 0; local10 < this.anInt1859; local10++) {
for (@Pc(19) int local19 = this.anInt1867 - 1; local19 >= 0; local19--) { for (@Pc(19) int local19 = this.anInt1867 - 1; local19 >= 0; local19--) {
local6[local8++] = this.anIntArray20[local19 + local10 * this.anInt1867]; local6[local8++] = this.pixels[local19 + local10 * this.anInt1867];
} }
} }
this.anIntArray20 = local6; this.pixels = local6;
this.anInt1863 = this.anInt1860 - this.anInt1867 - this.anInt1863; this.anInt1863 = this.anInt1860 - this.anInt1867 - this.anInt1863;
} }
@ -115,7 +115,7 @@ public class SoftwareSprite extends Sprite {
local27 += local36; local27 += local36;
} }
if (local23 > 0 && local20 > 0) { if (local23 > 0 && local20 > 0) {
Static290.method305(SoftwareRaster.pixels, this.anIntArray20, local17, local15, local23, local20, local27, local29); Static290.method305(SoftwareRaster.pixels, this.pixels, local17, local15, local23, local20, local27, local29);
} }
} }
@ -126,7 +126,7 @@ public class SoftwareSprite extends Sprite {
@Pc(17) int local17 = local8 * this.anInt1867; @Pc(17) int local17 = local8 * this.anInt1867;
@Pc(28) int local28 = this.anInt1863 + (local8 + this.anInt1861) * this.anInt1860; @Pc(28) int local28 = this.anInt1863 + (local8 + this.anInt1861) * this.anInt1860;
for (@Pc(30) int local30 = 0; local30 < this.anInt1867; local30++) { for (@Pc(30) int local30 = 0; local30 < this.anInt1867; local30++) {
@Pc(40) int local40 = this.anIntArray20[local17++]; @Pc(40) int local40 = this.pixels[local17++];
local6[local28++] = local40 == 0 ? 0 : local40 | 0xFF000000; local6[local28++] = local40 == 0 ? 0 : local40 | 0xFF000000;
} }
} }
@ -262,7 +262,7 @@ public class SoftwareSprite extends Sprite {
local394 = local745; local394 = local745;
} }
while (local394 < 0) { while (local394 < 0) {
local432 = this.anIntArray20[(local378 >> 12) * this.anInt1867 + (local694 >> 12)]; local432 = this.pixels[(local378 >> 12) * this.anInt1867 + (local694 >> 12)];
if (local432 == 0) { if (local432 == 0) {
local388++; local388++;
} else { } else {
@ -308,7 +308,7 @@ public class SoftwareSprite extends Sprite {
local394 = local905; local394 = local905;
} }
while (local394 < 0) { while (local394 < 0) {
local432 = this.anIntArray20[(local468 >> 12) * this.anInt1867 + (local694 >> 12)]; local432 = this.pixels[(local468 >> 12) * this.anInt1867 + (local694 >> 12)];
if (local432 == 0) { if (local432 == 0) {
local388++; local388++;
} else { } else {
@ -354,7 +354,7 @@ public class SoftwareSprite extends Sprite {
local394 = local1073; local394 = local1073;
} }
while (local394 < 0) { while (local394 < 0) {
local432 = this.anIntArray20[(local468 >> 12) * this.anInt1867 + (local694 >> 12)]; local432 = this.pixels[(local468 >> 12) * this.anInt1867 + (local694 >> 12)];
if (local432 == 0) { if (local432 == 0) {
local388++; local388++;
} else { } else {
@ -388,7 +388,7 @@ public class SoftwareSprite extends Sprite {
local394 = local1196; local394 = local1196;
} }
while (local394 < 0) { while (local394 < 0) {
local432 = this.anIntArray20[(local378 >> 12) * this.anInt1867 + (local694 >> 12)]; local432 = this.pixels[(local378 >> 12) * this.anInt1867 + (local694 >> 12)];
if (local432 == 0) { if (local432 == 0) {
local388++; local388++;
} else { } else {
@ -433,7 +433,7 @@ public class SoftwareSprite extends Sprite {
local394 = local1358; local394 = local1358;
} }
while (local394 < 0) { while (local394 < 0) {
local432 = this.anIntArray20[(local468 >> 12) * this.anInt1867 + (local694 >> 12)]; local432 = this.pixels[(local468 >> 12) * this.anInt1867 + (local694 >> 12)];
if (local432 == 0) { if (local432 == 0) {
local388++; local388++;
} else { } else {
@ -478,7 +478,7 @@ public class SoftwareSprite extends Sprite {
local394 = local1528; local394 = local1528;
} }
while (local394 < 0) { while (local394 < 0) {
local432 = this.anIntArray20[(local468 >> 12) * this.anInt1867 + (local694 >> 12)]; local432 = this.pixels[(local468 >> 12) * this.anInt1867 + (local694 >> 12)];
if (local432 == 0) { if (local432 == 0) {
local388++; local388++;
} else { } else {
@ -501,7 +501,7 @@ public class SoftwareSprite extends Sprite {
local394 = local166; local394 = local166;
if (local368 >= 0 && local378 >= 0 && local368 - (this.anInt1867 << 12) < 0 && local378 - (this.anInt1859 << 12) < 0) { if (local368 >= 0 && local378 >= 0 && local368 - (this.anInt1867 << 12) < 0 && local378 - (this.anInt1859 << 12) < 0) {
while (local394 < 0) { while (local394 < 0) {
local432 = this.anIntArray20[(local378 >> 12) * this.anInt1867 + (local368 >> 12)]; local432 = this.pixels[(local378 >> 12) * this.anInt1867 + (local368 >> 12)];
if (local432 == 0) { if (local432 == 0) {
local388++; local388++;
} else { } else {
@ -532,7 +532,7 @@ public class SoftwareSprite extends Sprite {
local394 = local517; local394 = local517;
} }
while (local394 < 0) { while (local394 < 0) {
local432 = this.anIntArray20[(local468 >> 12) * this.anInt1867 + (local368 >> 12)]; local432 = this.pixels[(local468 >> 12) * this.anInt1867 + (local368 >> 12)];
if (local432 == 0) { if (local432 == 0) {
local388++; local388++;
} else { } else {
@ -564,7 +564,7 @@ public class SoftwareSprite extends Sprite {
local394 = local630; local394 = local630;
} }
while (local394 < 0) { while (local394 < 0) {
local432 = this.anIntArray20[(local468 >> 12) * this.anInt1867 + (local368 >> 12)]; local432 = this.pixels[(local468 >> 12) * this.anInt1867 + (local368 >> 12)];
if (local432 == 0) { if (local432 == 0) {
local388++; local388++;
} else { } else {
@ -587,27 +587,27 @@ public class SoftwareSprite extends Sprite {
@Pc(8) int local8 = 0; @Pc(8) int local8 = 0;
for (@Pc(10) int local10 = 0; local10 < this.anInt1859; local10++) { for (@Pc(10) int local10 = 0; local10 < this.anInt1859; local10++) {
for (@Pc(16) int local16 = 0; local16 < this.anInt1867; local16++) { for (@Pc(16) int local16 = 0; local16 < this.anInt1867; local16++) {
@Pc(25) int local25 = this.anIntArray20[local8]; @Pc(25) int local25 = this.pixels[local8];
if (local25 == 0) { if (local25 == 0) {
if (local16 > 0 && this.anIntArray20[local8 - 1] != 0) { if (local16 > 0 && this.pixels[local8 - 1] != 0) {
local25 = arg0; local25 = arg0;
} else if (local10 > 0 && this.anIntArray20[local8 - this.anInt1867] != 0) { } else if (local10 > 0 && this.pixels[local8 - this.anInt1867] != 0) {
local25 = arg0; local25 = arg0;
} else if (local16 < this.anInt1867 - 1 && this.anIntArray20[local8 + 1] != 0) { } else if (local16 < this.anInt1867 - 1 && this.pixels[local8 + 1] != 0) {
local25 = arg0; local25 = arg0;
} else if (local10 < this.anInt1859 - 1 && this.anIntArray20[local8 + this.anInt1867] != 0) { } else if (local10 < this.anInt1859 - 1 && this.pixels[local8 + this.anInt1867] != 0) {
local25 = arg0; local25 = arg0;
} }
} }
local6[local8++] = local25; local6[local8++] = local25;
} }
} }
this.anIntArray20 = local6; this.pixels = local6;
} }
@OriginalMember(owner = "client!mm", name = "c", descriptor = "()V") @OriginalMember(owner = "client!mm", name = "c", descriptor = "()V")
public final void method304() { public final void makeTarget() {
SoftwareRaster.method2491(this.anIntArray20, this.anInt1867, this.anInt1859); SoftwareRaster.method2491(this.pixels, this.anInt1867, this.anInt1859);
} }
@OriginalMember(owner = "client!mm", name = "a", descriptor = "(IIIIIIDI)V") @OriginalMember(owner = "client!mm", name = "a", descriptor = "(IIIIIIDI)V")
@ -625,7 +625,7 @@ public class SoftwareSprite extends Sprite {
@Pc(72) int local72 = local45; @Pc(72) int local72 = local45;
@Pc(74) int local74 = local57; @Pc(74) int local74 = local57;
for (@Pc(77) int local77 = -20; local77 < 0; local77++) { for (@Pc(77) int local77 = -20; local77 < 0; local77++) {
@Pc(93) int local93 = this.anIntArray20[(local72 >> 16) + (local74 >> 16) * this.anInt1867]; @Pc(93) int local93 = this.pixels[(local72 >> 16) + (local74 >> 16) * this.anInt1867];
if (local93 == 0) { if (local93 == 0) {
local70++; local70++;
} else { } else {
@ -680,7 +680,7 @@ public class SoftwareSprite extends Sprite {
local36 += local47; local36 += local47;
} }
if (local32 > 0 && local29 > 0) { if (local32 > 0 && local29 > 0) {
Static290.method302(SoftwareRaster.pixels, this.anIntArray20, local26, local21, local32, local29, local36, local40); Static290.method302(SoftwareRaster.pixels, this.pixels, local26, local21, local32, local29, local36, local40);
} }
} }
@ -722,7 +722,7 @@ public class SoftwareSprite extends Sprite {
local27 += local36; local27 += local36;
} }
if (local23 > 0 && local20 > 0) { if (local23 > 0 && local20 > 0) {
Static290.method308(SoftwareRaster.pixels, this.anIntArray20, local17, local15, local23, local20, local27, local29, arg2); Static290.method308(SoftwareRaster.pixels, this.pixels, local17, local15, local23, local20, local27, local29, arg2);
} }
} }
@ -764,7 +764,7 @@ public class SoftwareSprite extends Sprite {
local27 += local36; local27 += local36;
} }
if (local23 > 0 && local20 > 0) { if (local23 > 0 && local20 > 0) {
Static290.method300(SoftwareRaster.pixels, this.anIntArray20, local17, local15, local23, local20, local27, local29); Static290.method300(SoftwareRaster.pixels, this.pixels, local17, local15, local23, local20, local27, local29);
} }
} }
@ -774,10 +774,10 @@ public class SoftwareSprite extends Sprite {
@Pc(8) int local8 = 0; @Pc(8) int local8 = 0;
for (@Pc(13) int local13 = this.anInt1859 - 1; local13 >= 0; local13--) { for (@Pc(13) int local13 = this.anInt1859 - 1; local13 >= 0; local13--) {
for (@Pc(17) int local17 = 0; local17 < this.anInt1867; local17++) { for (@Pc(17) int local17 = 0; local17 < this.anInt1867; local17++) {
local6[local8++] = this.anIntArray20[local17 + local13 * this.anInt1867]; local6[local8++] = this.pixels[local17 + local13 * this.anInt1867];
} }
} }
this.anIntArray20 = local6; this.pixels = local6;
this.anInt1861 = this.anInt1866 - this.anInt1859 - this.anInt1861; this.anInt1861 = this.anInt1866 - this.anInt1859 - this.anInt1861;
} }
@ -799,7 +799,7 @@ public class SoftwareSprite extends Sprite {
@Pc(88) int local88 = local51 + local39 * local78; @Pc(88) int local88 = local51 + local39 * local78;
@Pc(94) int local94 = local63 - local33 * local78; @Pc(94) int local94 = local63 - local33 * local78;
for (@Pc(99) int local99 = -arg9[local71]; local99 < 0; local99++) { for (@Pc(99) int local99 = -arg9[local71]; local99 < 0; local99++) {
SoftwareRaster.pixels[local82++] = this.anIntArray20[(local88 >> 16) + (local94 >> 16) * this.anInt1867]; SoftwareRaster.pixels[local82++] = this.pixels[(local88 >> 16) + (local94 >> 16) * this.anInt1867];
local88 += local39; local88 += local39;
local94 -= local33; local94 -= local33;
} }
@ -819,10 +819,10 @@ public class SoftwareSprite extends Sprite {
@Pc(17) int[] local17 = new int[this.anInt1860 * this.anInt1866]; @Pc(17) int[] local17 = new int[this.anInt1860 * this.anInt1866];
for (@Pc(19) int local19 = 0; local19 < this.anInt1859; local19++) { for (@Pc(19) int local19 = 0; local19 < this.anInt1859; local19++) {
for (@Pc(25) int local25 = 0; local25 < this.anInt1867; local25++) { for (@Pc(25) int local25 = 0; local25 < this.anInt1867; local25++) {
local17[(local19 + this.anInt1861) * this.anInt1860 + local25 + this.anInt1863] = this.anIntArray20[local19 * this.anInt1867 + local25]; local17[(local19 + this.anInt1861) * this.anInt1860 + local25 + this.anInt1863] = this.pixels[local19 * this.anInt1867 + local25];
} }
} }
this.anIntArray20 = local17; this.pixels = local17;
this.anInt1867 = this.anInt1860; this.anInt1867 = this.anInt1860;
this.anInt1859 = this.anInt1866; this.anInt1859 = this.anInt1866;
this.anInt1863 = 0; this.anInt1863 = 0;
@ -904,7 +904,7 @@ public class SoftwareSprite extends Sprite {
local166 = local159 - local157; local166 = local159 - local157;
} }
for (@Pc(234) int local234 = -local157; local234 < 0; local234++) { for (@Pc(234) int local234 = -local157; local234 < 0; local234++) {
@Pc(242) int local242 = this.anIntArray20[local21++]; @Pc(242) int local242 = this.pixels[local21++];
if (local242 == 0) { if (local242 == 0) {
local39++; local39++;
} else { } else {
@ -934,7 +934,7 @@ public class SoftwareSprite extends Sprite {
@Pc(88) int local88 = local51 + local39 * local78; @Pc(88) int local88 = local51 + local39 * local78;
@Pc(94) int local94 = local63 - local33 * local78; @Pc(94) int local94 = local63 - local33 * local78;
for (@Pc(99) int local99 = -arg8[local71]; local99 < 0; local99++) { for (@Pc(99) int local99 = -arg8[local71]; local99 < 0; local99++) {
@Pc(115) int local115 = this.anIntArray20[(local88 >> 16) + (local94 >> 16) * this.anInt1867]; @Pc(115) int local115 = this.pixels[(local88 >> 16) + (local94 >> 16) * this.anInt1867];
if (local115 == 0) { if (local115 == 0) {
local82++; local82++;
} else { } else {
@ -956,8 +956,8 @@ public class SoftwareSprite extends Sprite {
for (@Pc(4) int local4 = this.anInt1859 - 1; local4 > 0; local4--) { for (@Pc(4) int local4 = this.anInt1859 - 1; local4 > 0; local4--) {
@Pc(11) int local11 = local4 * this.anInt1867; @Pc(11) int local11 = local4 * this.anInt1867;
for (@Pc(16) int local16 = this.anInt1867 - 1; local16 > 0; local16--) { for (@Pc(16) int local16 = this.anInt1867 - 1; local16 > 0; local16--) {
if (this.anIntArray20[local16 + local11] == 0 && this.anIntArray20[local16 + local11 - this.anInt1867 - 1] != 0) { if (this.pixels[local16 + local11] == 0 && this.pixels[local16 + local11 - this.anInt1867 - 1] != 0) {
this.anIntArray20[local16 + local11] = arg0; this.pixels[local16 + local11] = arg0;
} }
} }
} }
@ -1018,13 +1018,13 @@ public class SoftwareSprite extends Sprite {
local12 += local26 * local150; local12 += local26 * local150;
local130 += local150; local130 += local150;
} }
Static290.method307(SoftwareRaster.pixels, this.anIntArray20, local12, local14, local46, local130, arg2, arg3, local26, local32, local7, arg4); Static290.method307(SoftwareRaster.pixels, this.pixels, local12, local14, local46, local130, arg2, arg3, local26, local32, local7, arg4);
} }
@OriginalMember(owner = "client!mm", name = "b", descriptor = "(III)V") @OriginalMember(owner = "client!mm", name = "b", descriptor = "(III)V")
public final void method315(@OriginalArg(0) int arg0, @OriginalArg(1) int arg1, @OriginalArg(2) int arg2) { public final void method315(@OriginalArg(0) int arg0, @OriginalArg(1) int arg1, @OriginalArg(2) int arg2) {
for (@Pc(1) int local1 = 0; local1 < this.anIntArray20.length; local1++) { for (@Pc(1) int local1 = 0; local1 < this.pixels.length; local1++) {
@Pc(11) int local11 = this.anIntArray20[local1]; @Pc(11) int local11 = this.pixels[local1];
if (local11 != 0) { if (local11 != 0) {
@Pc(19) int local19 = local11 >> 16 & 0xFF; @Pc(19) int local19 = local11 >> 16 & 0xFF;
local19 += arg0; local19 += arg0;
@ -1047,7 +1047,7 @@ public class SoftwareSprite extends Sprite {
} else if (local59 > 255) { } else if (local59 > 255) {
local59 = 255; local59 = 255;
} }
this.anIntArray20[local1] = (local19 << 16) + (local40 << 8) + local59; this.pixels[local1] = (local19 << 16) + (local40 << 8) + local59;
} }
} }
} }
@ -1107,6 +1107,6 @@ public class SoftwareSprite extends Sprite {
local12 += local26 * local150; local12 += local26 * local150;
local130 += local150; local130 += local150;
} }
Static290.method316(SoftwareRaster.pixels, this.anIntArray20, local12, local14, local46, local130, arg2, arg3, local26, local32, local7); Static290.method316(SoftwareRaster.pixels, this.pixels, local12, local14, local46, local130, arg2, arg3, local26, local32, local7);
} }
} }

72
client/src/main/java/SoundPlayer.java
View file

@ -60,4 +60,76 @@ public class SoundPlayer {
anIntArray68[anInt4451] = 0; anIntArray68[anInt4451] = 0;
anInt4451++; anInt4451++;
} }
@OriginalMember(owner = "client!ed", name = "d", descriptor = "(B)V")
public static void loop() {
for (@Pc(5) int local5 = 0; local5 < anInt4451; local5++) {
@Pc(12) int local12 = anIntArray362[local5]--;
if (anIntArray362[local5] >= -10) {
@Pc(79) SynthSound local79 = aClass138Array1[local5];
if (local79 == null) {
local79 = SynthSound.create(client.js5Archive4, anIntArray421[local5], 0);
if (local79 == null) {
continue;
}
anIntArray362[local5] += local79.method3990();
aClass138Array1[local5] = local79;
}
if (anIntArray362[local5] < 0) {
@Pc(209) int local209;
if (anIntArray68[local5] == 0) {
local209 = Preferences.soundEffectVolume;
} else {
@Pc(125) int local125 = (anIntArray68[local5] & 0xFF) * 128;
@Pc(133) int local133 = anIntArray68[local5] >> 8 & 0xFF;
@Pc(141) int local141 = anIntArray68[local5] >> 16 & 0xFF;
@Pc(151) int local151 = local133 * 128 + 64 - PlayerList.self.zFine;
if (local151 < 0) {
local151 = -local151;
}
@Pc(167) int local167 = local141 * 128 + 64 - PlayerList.self.xFine;
if (local167 < 0) {
local167 = -local167;
}
@Pc(180) int local180 = local167 + local151 - 128;
if (local125 < local180) {
anIntArray362[local5] = -100;
continue;
}
if (local180 < 0) {
local180 = 0;
}
local209 = Preferences.ambientSoundsVolume * (local125 - local180) / local125;
}
if (local209 > 0) {
@Pc(223) PcmSound local223 = local79.method3989().method2648(client.resampler);
@Pc(228) SoundPcmStream local228 = Static284.method404(local223, local209);
local228.method396(anIntArray563[local5] - 1);
client.soundStream.method1343(local228);
}
anIntArray362[local5] = -100;
}
} else {
anInt4451--;
for (@Pc(28) int local28 = local5; local28 < anInt4451; local28++) {
anIntArray421[local28] = anIntArray421[local28 + 1];
aClass138Array1[local28] = aClass138Array1[local28 + 1];
anIntArray563[local28] = anIntArray563[local28 + 1];
anIntArray362[local28] = anIntArray362[local28 + 1];
anIntArray68[local28] = anIntArray68[local28 + 1];
}
local5--;
}
}
if (MidiPlayer.jingle && !Static136.method2655()) {
if (Preferences.musicVolume != 0 && MusicPlayer.groupId != -1) {
Static122.method2410(client.js5Archive6, MusicPlayer.groupId, Preferences.musicVolume);
}
MidiPlayer.jingle = false;
} else if (Preferences.musicVolume != 0 && MusicPlayer.groupId != -1 && !Static136.method2655()) {
Protocol.outboundBuffer.p1isaac(137);
Protocol.outboundBuffer.p4(MusicPlayer.groupId);
MusicPlayer.groupId = -1;
}
}
} }

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

@ -517,7 +517,7 @@ public final class Static1 {
local1161.method1943(); local1161.method1943();
} }
} }
local12 = local10.method3864(); local12 = local10.size();
@Pc(2823) GlTile[] local2823 = new GlTile[local12]; @Pc(2823) GlTile[] local2823 = new GlTile[local12];
@Pc(2826) long[] local2826 = new long[local12]; @Pc(2826) long[] local2826 = new long[local12];
local10.method3865(local2823); local10.method3865(local2823);
@ -542,7 +542,7 @@ public final class Static1 {
} }
if (WorldMap.aClass3_Sub2_Sub1_2 == null || arg2 != WorldMap.aClass3_Sub2_Sub1_2.anInt1867 || WorldMap.aClass3_Sub2_Sub1_2.anInt1859 != arg1) { if (WorldMap.aClass3_Sub2_Sub1_2 == null || arg2 != WorldMap.aClass3_Sub2_Sub1_2.anInt1867 || WorldMap.aClass3_Sub2_Sub1_2.anInt1859 != arg1) {
@Pc(63) SoftwareSprite local63 = new SoftwareSprite(arg2, arg1); @Pc(63) SoftwareSprite local63 = new SoftwareSprite(arg2, arg1);
SoftwareRaster.method2491(local63.anIntArray20, arg2, arg1); SoftwareRaster.method2491(local63.pixels, arg2, arg1);
Static214.method4364(arg2, 0, WorldMap.width, 0, 0, WorldMap.length, arg1, 0); Static214.method4364(arg2, 0, WorldMap.width, 0, 0, WorldMap.length, arg1, 0);
if (GlRenderer.enabled) { if (GlRenderer.enabled) {
WorldMap.aClass3_Sub2_Sub1_2 = new GlSprite(local63); WorldMap.aClass3_Sub2_Sub1_2 = new GlSprite(local63);

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

@ -48,12 +48,12 @@ public final class Static10 {
@OriginalMember(owner = "client!an", name = "a", descriptor = "(IIIIIII)V") @OriginalMember(owner = "client!an", name = "a", descriptor = "(IIIIIII)V")
public static void method352(@OriginalArg(0) int arg0, @OriginalArg(1) int arg1, @OriginalArg(2) int arg2, @OriginalArg(3) int arg3, @OriginalArg(5) int arg4, @OriginalArg(6) int arg5) { public static void method352(@OriginalArg(0) int arg0, @OriginalArg(1) int arg1, @OriginalArg(2) int arg2, @OriginalArg(3) int arg3, @OriginalArg(5) int arg4, @OriginalArg(6) int arg5) {
@Pc(11) int local11 = Static78.method1690(Static106.anInt2869, arg5, Static267.anInt5773); @Pc(11) int local11 = Static78.method1690(TextureOp29.anInt2869, arg5, TextureOp29.anInt5773);
@Pc(17) int local17 = Static78.method1690(Static106.anInt2869, arg0, Static267.anInt5773); @Pc(17) int local17 = Static78.method1690(TextureOp29.anInt2869, arg0, TextureOp29.anInt5773);
@Pc(23) int local23 = Static78.method1690(Static224.anInt5063, arg3, Static172.anInt4164); @Pc(23) int local23 = Static78.method1690(TextureOp29.anInt5063, arg3, TextureOp29.anInt4164);
@Pc(29) int local29 = Static78.method1690(Static224.anInt5063, arg2, Static172.anInt4164); @Pc(29) int local29 = Static78.method1690(TextureOp29.anInt5063, arg2, TextureOp29.anInt4164);
@Pc(42) int local42 = Static78.method1690(Static106.anInt2869, arg5 + arg1, Static267.anInt5773); @Pc(42) int local42 = Static78.method1690(TextureOp29.anInt2869, arg5 + arg1, TextureOp29.anInt5773);
@Pc(51) int local51 = Static78.method1690(Static106.anInt2869, arg0 - arg1, Static267.anInt5773); @Pc(51) int local51 = Static78.method1690(TextureOp29.anInt2869, arg0 - arg1, TextureOp29.anInt5773);
@Pc(53) int local53; @Pc(53) int local53;
for (local53 = local11; local53 < local42; local53++) { for (local53 = local11; local53 < local42; local53++) {
Static131.method2576(Static71.anIntArrayArray10[local53], local23, local29, arg4); Static131.method2576(Static71.anIntArrayArray10[local53], local23, local29, arg4);
@ -61,8 +61,8 @@ public final class Static10 {
for (local53 = local17; local53 > local51; local53--) { for (local53 = local17; local53 > local51; local53--) {
Static131.method2576(Static71.anIntArrayArray10[local53], local23, local29, arg4); Static131.method2576(Static71.anIntArrayArray10[local53], local23, local29, arg4);
} }
@Pc(95) int local95 = Static78.method1690(Static224.anInt5063, arg1 + arg3, Static172.anInt4164); @Pc(95) int local95 = Static78.method1690(TextureOp29.anInt5063, arg1 + arg3, TextureOp29.anInt4164);
@Pc(104) int local104 = Static78.method1690(Static224.anInt5063, arg2 - arg1, Static172.anInt4164); @Pc(104) int local104 = Static78.method1690(TextureOp29.anInt5063, arg2 - arg1, TextureOp29.anInt4164);
for (local53 = local42; local53 <= local51; local53++) { for (local53 = local42; local53 <= local51; local53++) {
@Pc(117) int[] local117 = Static71.anIntArrayArray10[local53]; @Pc(117) int[] local117 = Static71.anIntArrayArray10[local53];
Static131.method2576(local117, local23, local95, arg4); Static131.method2576(local117, local23, local95, arg4);

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

@ -10,9 +10,6 @@ public final class Static103 {
@OriginalMember(owner = "client!i", name = "ec", descriptor = "[I") @OriginalMember(owner = "client!i", name = "ec", descriptor = "[I")
public static int[] anIntArray254; public static int[] anIntArray254;
@OriginalMember(owner = "client!i", name = "ac", descriptor = "[I")
public static final int[] anIntArray253 = new int[256];
@OriginalMember(owner = "client!i", name = "ic", descriptor = "Lclient!na;") @OriginalMember(owner = "client!i", name = "ic", descriptor = "Lclient!na;")
public static final JagString aClass100_558 = JagString.parse("m"); public static final JagString aClass100_558 = JagString.parse("m");
@ -34,10 +31,10 @@ public final class Static103 {
local43 = PlayerList.players[local36]; local43 = PlayerList.players[local36];
if (local43 != null) { if (local43 != null) {
Static102.method2075(PlayerList.self.movementQueueZ[0], 0, 1, false, 0, local43.movementQueueX[0], 1, 0, 2, local43.movementQueueZ[0], PlayerList.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; Cross.type = 2;
Static17.milliseconds = 0; Cross.milliseconds = 0;
Static122.x = Mouse.clickX; Cross.x = Mouse.clickX;
Static25.y = Mouse.clickY; Cross.y = Mouse.clickY;
Protocol.outboundBuffer.p1isaac(71); Protocol.outboundBuffer.p1isaac(71);
Protocol.outboundBuffer.p2leadd(local36); Protocol.outboundBuffer.p2leadd(local36);
} }
@ -63,25 +60,25 @@ public final class Static103 {
} }
@Pc(192) Npc local192; @Pc(192) Npc local192;
if (local23 == 19) { if (local23 == 19) {
local192 = Static175.npcs[local36]; local192 = NpcList.npcs[local36];
if (local192 != null) { if (local192 != null) {
Static102.method2075(PlayerList.self.movementQueueZ[0], 0, 1, false, 0, local192.movementQueueX[0], 1, 0, 2, local192.movementQueueZ[0], PlayerList.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 = Mouse.clickX; Cross.x = Mouse.clickX;
Static70.type = 2; Cross.type = 2;
Static17.milliseconds = 0; Cross.milliseconds = 0;
Static25.y = Mouse.clickY; Cross.y = Mouse.clickY;
Protocol.outboundBuffer.p1isaac(30); Protocol.outboundBuffer.p1isaac(30);
Protocol.outboundBuffer.p2(local36); Protocol.outboundBuffer.p2(local36);
} }
} }
if (local23 == 17) { if (local23 == 17) {
local192 = Static175.npcs[local36]; local192 = NpcList.npcs[local36];
if (local192 != null) { if (local192 != null) {
Static102.method2075(PlayerList.self.movementQueueZ[0], 0, 1, false, 0, local192.movementQueueX[0], 1, 0, 2, local192.movementQueueZ[0], PlayerList.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 = Mouse.clickX; Cross.x = Mouse.clickX;
Static17.milliseconds = 0; Cross.milliseconds = 0;
Static70.type = 2; Cross.type = 2;
Static25.y = Mouse.clickY; Cross.y = Mouse.clickY;
Protocol.outboundBuffer.p1isaac(78); Protocol.outboundBuffer.p1isaac(78);
Protocol.outboundBuffer.p2le(local36); Protocol.outboundBuffer.p2le(local36);
} }
@ -90,10 +87,10 @@ public final class Static103 {
local43 = PlayerList.players[local36]; local43 = PlayerList.players[local36];
if (local43 != null) { if (local43 != null) {
Static102.method2075(PlayerList.self.movementQueueZ[0], 0, 1, false, 0, local43.movementQueueX[0], 1, 0, 2, local43.movementQueueZ[0], PlayerList.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 = Mouse.clickX; Cross.x = Mouse.clickX;
Static70.type = 2; Cross.type = 2;
Static25.y = Mouse.clickY; Cross.y = Mouse.clickY;
Static17.milliseconds = 0; Cross.milliseconds = 0;
Protocol.outboundBuffer.p1isaac(133); Protocol.outboundBuffer.p1isaac(133);
Protocol.outboundBuffer.p2le(local36); Protocol.outboundBuffer.p2le(local36);
} }
@ -118,13 +115,13 @@ public final class Static103 {
Static153.method2909(); Static153.method2909();
} }
if (local23 == 45) { if (local23 == 45) {
local192 = Static175.npcs[local36]; local192 = NpcList.npcs[local36];
if (local192 != null) { if (local192 != null) {
Static102.method2075(PlayerList.self.movementQueueZ[0], 0, 1, false, 0, local192.movementQueueX[0], 1, 0, 2, local192.movementQueueZ[0], PlayerList.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 = Mouse.clickX; Cross.x = Mouse.clickX;
Static70.type = 2; Cross.type = 2;
Static17.milliseconds = 0; Cross.milliseconds = 0;
Static25.y = Mouse.clickY; Cross.y = Mouse.clickY;
Protocol.outboundBuffer.p1isaac(239); Protocol.outboundBuffer.p1isaac(239);
Protocol.outboundBuffer.p4le2(Static98.anInt2512); Protocol.outboundBuffer.p4le2(Static98.anInt2512);
Protocol.outboundBuffer.p2add(Static15.anInt506); Protocol.outboundBuffer.p2add(Static15.anInt506);
@ -141,10 +138,10 @@ public final class Static103 {
Static102.method2075(PlayerList.self.movementQueueZ[0], 0, 1, false, 0, local15, 1, 0, 2, local19, PlayerList.self.movementQueueX[0]); Static102.method2075(PlayerList.self.movementQueueZ[0], 0, 1, false, 0, local15, 1, 0, 2, local19, PlayerList.self.movementQueueX[0]);
} }
} }
Static122.x = Mouse.clickX; Cross.x = Mouse.clickX;
Static17.milliseconds = 0; Cross.milliseconds = 0;
Static70.type = 2; Cross.type = 2;
Static25.y = Mouse.clickY; Cross.y = Mouse.clickY;
Protocol.outboundBuffer.p1isaac(66); Protocol.outboundBuffer.p1isaac(66);
Protocol.outboundBuffer.p2le(Static225.originX + local15); Protocol.outboundBuffer.p2le(Static225.originX + local15);
Protocol.outboundBuffer.p2(local36); Protocol.outboundBuffer.p2(local36);
@ -158,10 +155,10 @@ public final class Static103 {
Protocol.outboundBuffer.p2leadd(local19 + Static142.originZ); Protocol.outboundBuffer.p2leadd(local19 + Static142.originZ);
} }
if (local23 == 1002) { if (local23 == 1002) {
Static70.type = 2; Cross.type = 2;
Static122.x = Mouse.clickX; Cross.x = Mouse.clickX;
Static25.y = Mouse.clickY; Cross.y = Mouse.clickY;
Static17.milliseconds = 0; Cross.milliseconds = 0;
Protocol.outboundBuffer.p1isaac(92); Protocol.outboundBuffer.p1isaac(92);
Protocol.outboundBuffer.p2leadd(local36); Protocol.outboundBuffer.p2leadd(local36);
} }
@ -200,11 +197,11 @@ public final class Static103 {
} }
} }
if (local23 == 1007) { if (local23 == 1007) {
Static17.milliseconds = 0; Cross.milliseconds = 0;
Static70.type = 2; Cross.type = 2;
Static25.y = Mouse.clickY; Cross.y = Mouse.clickY;
Static122.x = Mouse.clickX; Cross.x = Mouse.clickX;
local192 = Static175.npcs[local36]; local192 = NpcList.npcs[local36];
if (local192 != null) { if (local192 != null) {
@Pc(884) NpcType local884 = local192.type; @Pc(884) NpcType local884 = local192.type;
if (local884.multiNpcs != null) { if (local884.multiNpcs != null) {
@ -240,10 +237,10 @@ public final class Static103 {
local43 = PlayerList.players[local36]; local43 = PlayerList.players[local36];
if (local43 != null) { if (local43 != null) {
Static102.method2075(PlayerList.self.movementQueueZ[0], 0, 1, false, 0, local43.movementQueueX[0], 1, 0, 2, local43.movementQueueZ[0], PlayerList.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; Cross.type = 2;
Static25.y = Mouse.clickY; Cross.y = Mouse.clickY;
Static122.x = Mouse.clickX; Cross.x = Mouse.clickX;
Static17.milliseconds = 0; Cross.milliseconds = 0;
Protocol.outboundBuffer.p1isaac(4); Protocol.outboundBuffer.p1isaac(4);
Protocol.outboundBuffer.p2le(local36); Protocol.outboundBuffer.p2le(local36);
} }
@ -282,10 +279,10 @@ public final class Static103 {
local43 = PlayerList.players[local36]; local43 = PlayerList.players[local36];
if (local43 != null) { if (local43 != null) {
Static102.method2075(PlayerList.self.movementQueueZ[0], 0, 1, false, 0, local43.movementQueueX[0], 1, 0, 2, local43.movementQueueZ[0], PlayerList.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; Cross.milliseconds = 0;
Static70.type = 2; Cross.type = 2;
Static25.y = Mouse.clickY; Cross.y = Mouse.clickY;
Static122.x = Mouse.clickX; Cross.x = Mouse.clickX;
Protocol.outboundBuffer.p1isaac(114); Protocol.outboundBuffer.p1isaac(114);
Protocol.outboundBuffer.p2leadd(local36); Protocol.outboundBuffer.p2leadd(local36);
} }
@ -311,23 +308,23 @@ public final class Static103 {
Static102.method2075(PlayerList.self.movementQueueZ[0], 0, 1, false, 0, local15, 1, 0, 2, local19, PlayerList.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; Cross.type = 2;
Static122.x = Mouse.clickX; Cross.x = Mouse.clickX;
Static17.milliseconds = 0; Cross.milliseconds = 0;
Static25.y = Mouse.clickY; Cross.y = Mouse.clickY;
Protocol.outboundBuffer.p1isaac(228); Protocol.outboundBuffer.p1isaac(228);
Protocol.outboundBuffer.p2(local36); Protocol.outboundBuffer.p2(local36);
Protocol.outboundBuffer.p2le(Static225.originX + local15); Protocol.outboundBuffer.p2le(Static225.originX + local15);
Protocol.outboundBuffer.p2leadd(Static142.originZ + local19); Protocol.outboundBuffer.p2leadd(Static142.originZ + local19);
} }
if (local23 == 4) { if (local23 == 4) {
local192 = Static175.npcs[local36]; local192 = NpcList.npcs[local36];
if (local192 != null) { if (local192 != null) {
Static102.method2075(PlayerList.self.movementQueueZ[0], 0, 1, false, 0, local192.movementQueueX[0], 1, 0, 2, local192.movementQueueZ[0], PlayerList.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; Cross.type = 2;
Static17.milliseconds = 0; Cross.milliseconds = 0;
Static25.y = Mouse.clickY; Cross.y = Mouse.clickY;
Static122.x = Mouse.clickX; Cross.x = Mouse.clickX;
Protocol.outboundBuffer.p1isaac(148); Protocol.outboundBuffer.p1isaac(148);
Protocol.outboundBuffer.p2add(local36); Protocol.outboundBuffer.p2add(local36);
} }
@ -336,15 +333,15 @@ public final class Static103 {
local693 = Static201.method1418(local19, local15); local693 = Static201.method1418(local19, local15);
if (local693 != null) { if (local693 != null) {
Static53.method1294(); Static53.method1294();
@Pc(1493) ServerActiveProperties local1493 = Static36.method940(local693); @Pc(1493) ServerActiveProperties local1493 = InterfaceList.getServerActiveProperties(local693);
Static247.method4246(local19, local15, local1493.method512(), local1493.anInt540, local693.anInt499, local693.anInt484); Static247.method4246(local19, local15, local1493.getTargetMask(), local1493.anInt540, local693.anInt499, local693.anInt484);
Static260.anInt5014 = 0; Static260.anInt5014 = 0;
Static102.aClass100_545 = Static97.method1963(local693); Static102.aClass100_545 = Static97.method1963(local693);
if (Static102.aClass100_545 == null) { if (Static102.aClass100_545 == null) {
Static102.aClass100_545 = Static250.aClass100_1042; Static102.aClass100_545 = Static250.aClass100_1042;
} }
if (local693.aBoolean32) { if (local693.aBoolean32) {
Static78.aClass100_466 = JagString.concatenate(new JagString[] { local693.aClass100_88, Static204.aClass100_896 }); Static78.aClass100_466 = JagString.concatenate(new JagString[] { local693.opBase, Static204.aClass100_896 });
} else { } else {
Static78.aClass100_466 = JagString.concatenate(new JagString[] { MiniMenu.COLOR_GREEN, local693.aClass100_85, Static204.aClass100_896 }); Static78.aClass100_466 = JagString.concatenate(new JagString[] { MiniMenu.COLOR_GREEN, local693.aClass100_85, Static204.aClass100_896 });
} }
@ -355,10 +352,10 @@ public final class Static103 {
local43 = PlayerList.players[local36]; local43 = PlayerList.players[local36];
if (local43 != null) { if (local43 != null) {
Static102.method2075(PlayerList.self.movementQueueZ[0], 0, 1, false, 0, local43.movementQueueX[0], 1, 0, 2, local43.movementQueueZ[0], PlayerList.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 = Mouse.clickY; Cross.y = Mouse.clickY;
Static17.milliseconds = 0; Cross.milliseconds = 0;
Static70.type = 2; Cross.type = 2;
Static122.x = Mouse.clickX; Cross.x = Mouse.clickX;
Protocol.outboundBuffer.p1isaac(180); Protocol.outboundBuffer.p1isaac(180);
Protocol.outboundBuffer.p2leadd(local36); Protocol.outboundBuffer.p2leadd(local36);
} }
@ -376,10 +373,10 @@ public final class Static103 {
local43 = PlayerList.players[local36]; local43 = PlayerList.players[local36];
if (local43 != null) { if (local43 != null) {
Static102.method2075(PlayerList.self.movementQueueZ[0], 0, 1, false, 0, local43.movementQueueX[0], 1, 0, 2, local43.movementQueueZ[0], PlayerList.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; Cross.milliseconds = 0;
Static70.type = 2; Cross.type = 2;
Static122.x = Mouse.clickX; Cross.x = Mouse.clickX;
Static25.y = Mouse.clickY; Cross.y = Mouse.clickY;
Protocol.outboundBuffer.p1isaac(195); Protocol.outboundBuffer.p1isaac(195);
Protocol.outboundBuffer.p2add(Static15.anInt506); Protocol.outboundBuffer.p2add(Static15.anInt506);
Protocol.outboundBuffer.p4le2(Static98.anInt2512); Protocol.outboundBuffer.p4le2(Static98.anInt2512);
@ -395,10 +392,10 @@ public final class Static103 {
Static102.method2075(PlayerList.self.movementQueueZ[0], 0, 1, false, 0, local15, 1, 0, 2, local19, PlayerList.self.movementQueueX[0]); Static102.method2075(PlayerList.self.movementQueueZ[0], 0, 1, false, 0, local15, 1, 0, 2, local19, PlayerList.self.movementQueueX[0]);
} }
} }
Static122.x = Mouse.clickX; Cross.x = Mouse.clickX;
Static70.type = 2; Cross.type = 2;
Static25.y = Mouse.clickY; Cross.y = Mouse.clickY;
Static17.milliseconds = 0; Cross.milliseconds = 0;
Protocol.outboundBuffer.p1isaac(109); Protocol.outboundBuffer.p1isaac(109);
Protocol.outboundBuffer.p2le(local19 + Static142.originZ); Protocol.outboundBuffer.p2le(local19 + Static142.originZ);
Protocol.outboundBuffer.p2(local15 + Static225.originX); Protocol.outboundBuffer.p2(local15 + Static225.originX);
@ -414,13 +411,13 @@ public final class Static103 {
Static250.anInt5444 = local15; Static250.anInt5444 = local15;
} }
if (local23 == 2) { if (local23 == 2) {
local192 = Static175.npcs[local36]; local192 = NpcList.npcs[local36];
if (local192 != null) { if (local192 != null) {
Static102.method2075(PlayerList.self.movementQueueZ[0], 0, 1, false, 0, local192.movementQueueX[0], 1, 0, 2, local192.movementQueueZ[0], PlayerList.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 = Mouse.clickY; Cross.y = Mouse.clickY;
Static70.type = 2; Cross.type = 2;
Static122.x = Mouse.clickX; Cross.x = Mouse.clickX;
Static17.milliseconds = 0; Cross.milliseconds = 0;
Protocol.outboundBuffer.p1isaac(218); Protocol.outboundBuffer.p1isaac(218);
Protocol.outboundBuffer.p2le(local36); Protocol.outboundBuffer.p2le(local36);
} }
@ -439,13 +436,13 @@ public final class Static103 {
} }
} }
if (local23 == 26) { if (local23 == 26) {
local192 = Static175.npcs[local36]; local192 = NpcList.npcs[local36];
if (local192 != null) { if (local192 != null) {
Static102.method2075(PlayerList.self.movementQueueZ[0], 0, 1, false, 0, local192.movementQueueX[0], 1, 0, 2, local192.movementQueueZ[0], PlayerList.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; Cross.type = 2;
Static17.milliseconds = 0; Cross.milliseconds = 0;
Static25.y = Mouse.clickY; Cross.y = Mouse.clickY;
Static122.x = Mouse.clickX; Cross.x = Mouse.clickX;
Protocol.outboundBuffer.p1isaac(115); Protocol.outboundBuffer.p1isaac(115);
Protocol.outboundBuffer.p4me(Static224.anInt5062); Protocol.outboundBuffer.p4me(Static224.anInt5062);
Protocol.outboundBuffer.p2le(Static185.anInt4370); Protocol.outboundBuffer.p2le(Static185.anInt4370);
@ -468,10 +465,10 @@ public final class Static103 {
if (!local560) { if (!local560) {
Static102.method2075(PlayerList.self.movementQueueZ[0], 0, 1, false, 0, local15, 1, 0, 2, local19, PlayerList.self.movementQueueX[0]); Static102.method2075(PlayerList.self.movementQueueZ[0], 0, 1, false, 0, local15, 1, 0, 2, local19, PlayerList.self.movementQueueX[0]);
} }
Static122.x = Mouse.clickX; Cross.x = Mouse.clickX;
Static17.milliseconds = 0; Cross.milliseconds = 0;
Static25.y = Mouse.clickY; Cross.y = Mouse.clickY;
Static70.type = 2; Cross.type = 2;
Protocol.outboundBuffer.p1isaac(101); Protocol.outboundBuffer.p1isaac(101);
Protocol.outboundBuffer.p2leadd(local15 + Static225.originX); Protocol.outboundBuffer.p2leadd(local15 + Static225.originX);
Protocol.outboundBuffer.p2le(Static185.anInt4370); Protocol.outboundBuffer.p2le(Static185.anInt4370);
@ -481,10 +478,10 @@ public final class Static103 {
Protocol.outboundBuffer.p4me(Static224.anInt5062); Protocol.outboundBuffer.p4me(Static224.anInt5062);
} }
if (local23 == 1004) { if (local23 == 1004) {
Static17.milliseconds = 0; Cross.milliseconds = 0;
Static122.x = Mouse.clickX; Cross.x = Mouse.clickX;
Static70.type = 2; Cross.type = 2;
Static25.y = Mouse.clickY; Cross.y = Mouse.clickY;
Protocol.outboundBuffer.p1isaac(94); Protocol.outboundBuffer.p1isaac(94);
Protocol.outboundBuffer.p2leadd(local36); Protocol.outboundBuffer.p2leadd(local36);
} }
@ -515,10 +512,10 @@ public final class Static103 {
local43 = PlayerList.players[local36]; local43 = PlayerList.players[local36];
if (local43 != null) { if (local43 != null) {
Static102.method2075(PlayerList.self.movementQueueZ[0], 0, 1, false, 0, local43.movementQueueX[0], 1, 0, 2, local43.movementQueueZ[0], PlayerList.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; Cross.milliseconds = 0;
Static25.y = Mouse.clickY; Cross.y = Mouse.clickY;
Static70.type = 2; Cross.type = 2;
Static122.x = Mouse.clickX; Cross.x = Mouse.clickX;
Protocol.outboundBuffer.p1isaac(248); Protocol.outboundBuffer.p1isaac(248);
Protocol.outboundBuffer.p2leadd(local36); Protocol.outboundBuffer.p2leadd(local36);
Protocol.outboundBuffer.p2(Static274.anInt4997); Protocol.outboundBuffer.p2(Static274.anInt4997);
@ -544,10 +541,10 @@ public final class Static103 {
Static102.method2075(PlayerList.self.movementQueueZ[0], 0, 1, false, 0, local15, 1, 0, 2, local19, PlayerList.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; Cross.type = 2;
Static25.y = Mouse.clickY; Cross.y = Mouse.clickY;
Static122.x = Mouse.clickX; Cross.x = Mouse.clickX;
Static17.milliseconds = 0; Cross.milliseconds = 0;
Protocol.outboundBuffer.p1isaac(48); Protocol.outboundBuffer.p1isaac(48);
Protocol.outboundBuffer.p2add(local15 + Static225.originX); Protocol.outboundBuffer.p2add(local15 + Static225.originX);
Protocol.outboundBuffer.p2leadd(local36); Protocol.outboundBuffer.p2leadd(local36);
@ -574,10 +571,10 @@ public final class Static103 {
local43 = PlayerList.players[local36]; local43 = PlayerList.players[local36];
if (local43 != null) { if (local43 != null) {
Static102.method2075(PlayerList.self.movementQueueZ[0], 0, 1, false, 0, local43.movementQueueX[0], 1, 0, 2, local43.movementQueueZ[0], PlayerList.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; Cross.type = 2;
Static25.y = Mouse.clickY; Cross.y = Mouse.clickY;
Static122.x = Mouse.clickX; Cross.x = Mouse.clickX;
Static17.milliseconds = 0; Cross.milliseconds = 0;
Protocol.outboundBuffer.p1isaac(175); Protocol.outboundBuffer.p1isaac(175);
Protocol.outboundBuffer.p2add(local36); Protocol.outboundBuffer.p2add(local36);
} }
@ -616,10 +613,10 @@ public final class Static103 {
local43 = PlayerList.players[local36]; local43 = PlayerList.players[local36];
if (local43 != null) { if (local43 != null) {
Static102.method2075(PlayerList.self.movementQueueZ[0], 0, 1, false, 0, local43.movementQueueX[0], 1, 0, 2, local43.movementQueueZ[0], PlayerList.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; Cross.milliseconds = 0;
Static122.x = Mouse.clickX; Cross.x = Mouse.clickX;
Static25.y = Mouse.clickY; Cross.y = Mouse.clickY;
Static70.type = 2; Cross.type = 2;
Protocol.outboundBuffer.p1isaac(68); Protocol.outboundBuffer.p1isaac(68);
Protocol.outboundBuffer.p2leadd(local36); Protocol.outboundBuffer.p2leadd(local36);
} }
@ -638,10 +635,10 @@ public final class Static103 {
if (!local560) { if (!local560) {
Static102.method2075(PlayerList.self.movementQueueZ[0], 0, 1, false, 0, local15, 1, 0, 2, local19, PlayerList.self.movementQueueX[0]); Static102.method2075(PlayerList.self.movementQueueZ[0], 0, 1, false, 0, local15, 1, 0, 2, local19, PlayerList.self.movementQueueX[0]);
} }
Static25.y = Mouse.clickY; Cross.y = Mouse.clickY;
Static122.x = Mouse.clickX; Cross.x = Mouse.clickX;
Static70.type = 2; Cross.type = 2;
Static17.milliseconds = 0; Cross.milliseconds = 0;
Protocol.outboundBuffer.p1isaac(73); Protocol.outboundBuffer.p1isaac(73);
Protocol.outboundBuffer.p4rme(Static98.anInt2512); Protocol.outboundBuffer.p4rme(Static98.anInt2512);
Protocol.outboundBuffer.p2(Static142.originZ + local19); Protocol.outboundBuffer.p2(Static142.originZ + local19);
@ -672,10 +669,10 @@ public final class Static103 {
local43 = PlayerList.players[local36]; local43 = PlayerList.players[local36];
if (local43 != null) { if (local43 != null) {
Static102.method2075(PlayerList.self.movementQueueZ[0], 0, 1, false, 0, local43.movementQueueX[0], 1, 0, 2, local43.movementQueueZ[0], PlayerList.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 = Mouse.clickY; Cross.y = Mouse.clickY;
Static17.milliseconds = 0; Cross.milliseconds = 0;
Static70.type = 2; Cross.type = 2;
Static122.x = Mouse.clickX; Cross.x = Mouse.clickX;
Protocol.outboundBuffer.p1isaac(106); Protocol.outboundBuffer.p1isaac(106);
Protocol.outboundBuffer.p2(local36); Protocol.outboundBuffer.p2(local36);
} }
@ -689,23 +686,23 @@ public final class Static103 {
Static102.method2075(PlayerList.self.movementQueueZ[0], 0, 1, false, 0, local15, 1, 0, 2, local19, PlayerList.self.movementQueueX[0]); Static102.method2075(PlayerList.self.movementQueueZ[0], 0, 1, false, 0, local15, 1, 0, 2, local19, PlayerList.self.movementQueueX[0]);
} }
} }
Static25.y = Mouse.clickY; Cross.y = Mouse.clickY;
Static17.milliseconds = 0; Cross.milliseconds = 0;
Static122.x = Mouse.clickX; Cross.x = Mouse.clickX;
Static70.type = 2; Cross.type = 2;
Protocol.outboundBuffer.p1isaac(33); Protocol.outboundBuffer.p1isaac(33);
Protocol.outboundBuffer.p2(local36); Protocol.outboundBuffer.p2(local36);
Protocol.outboundBuffer.p2(Static225.originX + local15); Protocol.outboundBuffer.p2(Static225.originX + local15);
Protocol.outboundBuffer.p2le(Static142.originZ + local19); Protocol.outboundBuffer.p2le(Static142.originZ + local19);
} }
if (local23 == 16) { if (local23 == 16) {
local192 = Static175.npcs[local36]; local192 = NpcList.npcs[local36];
if (local192 != null) { if (local192 != null) {
Static102.method2075(PlayerList.self.movementQueueZ[0], 0, 1, false, 0, local192.movementQueueX[0], 1, 0, 2, local192.movementQueueZ[0], PlayerList.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 = Mouse.clickX; Cross.x = Mouse.clickX;
Static17.milliseconds = 0; Cross.milliseconds = 0;
Static25.y = Mouse.clickY; Cross.y = Mouse.clickY;
Static70.type = 2; Cross.type = 2;
Protocol.outboundBuffer.p1isaac(3); Protocol.outboundBuffer.p1isaac(3);
Protocol.outboundBuffer.p2leadd(local36); Protocol.outboundBuffer.p2leadd(local36);
} }

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

@ -4,9 +4,6 @@ import org.openrs2.deob.annotation.Pc;
public final class Static104 { public final class Static104 {
@OriginalMember(owner = "client!ia", name = "d", descriptor = "[I")
public static final int[] anIntArray255 = new int[200];
@OriginalMember(owner = "client!ia", name = "a", descriptor = "(BLclient!fe;)V") @OriginalMember(owner = "client!ia", name = "a", descriptor = "(BLclient!fe;)V")
public static void method2247(@OriginalArg(1) PathingEntity arg0) { public static void method2247(@OriginalArg(1) PathingEntity arg0) {
@Pc(9) BasType local9 = arg0.method2681(); @Pc(9) BasType local9 = arg0.method2681();

11
client/src/main/java/Static105.java
View file

@ -10,9 +10,6 @@ public final class Static105 {
@OriginalMember(owner = "client!ib", name = "c", descriptor = "Lclient!qi;") @OriginalMember(owner = "client!ib", name = "c", descriptor = "Lclient!qi;")
public static final ColorImageCacheEntry VALID = new ColorImageCacheEntry(0, 0); public static final ColorImageCacheEntry VALID = new ColorImageCacheEntry(0, 0);
@OriginalMember(owner = "client!ib", name = "d", descriptor = "Lclient!gn;")
public static final LruHashTable aClass54_9 = new LruHashTable(128);
@OriginalMember(owner = "client!ib", name = "e", descriptor = "Lclient!be;") @OriginalMember(owner = "client!ib", name = "e", descriptor = "Lclient!be;")
public static Component aClass13_14 = null; public static Component aClass13_14 = null;
@ -113,7 +110,7 @@ public final class Static105 {
if (local10 < 0 || local17 < 0 || local10 >= Static152.mapSizeX || local17 >= Static99.mapSizeZ) { if (local10 < 0 || local17 < 0 || local10 >= Static152.mapSizeX || local17 >= Static99.mapSizeZ) {
return false; return false;
} }
@Pc(42) Tile local42 = Static130.aClass3_Sub5ArrayArrayArray1[arg0][local10][local17]; @Pc(42) Tile local42 = SceneGraph.tiles[arg0][local10][local17];
if (local42 != null && local42.anInt662 >= 5) { if (local42 != null && local42.anInt662 >= 5) {
return false; return false;
} }
@ -148,11 +145,11 @@ public final class Static105 {
local115 += 2; local115 += 2;
} }
for (@Pc(141) int local141 = arg0; local141 >= 0; local141--) { for (@Pc(141) int local141 = arg0; local141 >= 0; local141--) {
if (Static130.aClass3_Sub5ArrayArrayArray1[local141][local17][local108] == null) { if (SceneGraph.tiles[local141][local17][local108] == null) {
Static130.aClass3_Sub5ArrayArrayArray1[local141][local17][local108] = new Tile(local141, local17, local108); SceneGraph.tiles[local141][local17][local108] = new Tile(local141, local17, local108);
} }
} }
@Pc(174) Tile local174 = Static130.aClass3_Sub5ArrayArrayArray1[arg0][local17][local108]; @Pc(174) Tile local174 = SceneGraph.tiles[arg0][local17][local108];
local174.aClass31Array1[local174.anInt662] = local58; local174.aClass31Array1[local174.anInt662] = local58;
local174.anIntArray59[local174.anInt662] = local115; local174.anIntArray59[local174.anInt662] = local115;
local174.anInt664 |= local115; local174.anInt664 |= local115;

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

@ -8,10 +8,4 @@ public final class Static106 {
@OriginalMember(owner = "client!ic", name = "e", descriptor = "[I") @OriginalMember(owner = "client!ic", name = "e", descriptor = "[I")
public static final int[] anIntArray257 = new int[2500]; public static final int[] anIntArray257 = new int[2500];
@OriginalMember(owner = "client!ic", name = "j", descriptor = "I")
public static int anInt2869 = 100;
@OriginalMember(owner = "client!ic", name = "l", descriptor = "[I")
public static final int[] anIntArray258 = new int[200];
} }

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

@ -1,4 +1,3 @@
import org.openrs2.deob.annotation.OriginalArg;
import org.openrs2.deob.annotation.OriginalMember; import org.openrs2.deob.annotation.OriginalMember;
public final class Static107 { public final class Static107 {
@ -21,12 +20,4 @@ public final class Static107 {
@OriginalMember(owner = "client!id", name = "e", descriptor = "[I") @OriginalMember(owner = "client!id", name = "e", descriptor = "[I")
public static final int[] anIntArray259 = new int[14]; public static final int[] anIntArray259 = new int[14];
@OriginalMember(owner = "client!id", name = "a", descriptor = "(IIBII)V")
public static void method2263(@OriginalArg(3) int arg0, @OriginalArg(4) int arg1) {
Static224.anInt5063 = arg1;
Static172.anInt4164 = 0;
Static267.anInt5773 = 0;
Static106.anInt2869 = arg0;
}
} }

3
client/src/main/java/Static108.java
View file

@ -16,9 +16,6 @@ public final class Static108 {
@OriginalMember(owner = "client!ie", name = "k", descriptor = "[I") @OriginalMember(owner = "client!ie", name = "k", descriptor = "[I")
public static final int[] anIntArray267 = new int[] { 256, 128, 86, 64 }; public static final int[] anIntArray267 = new int[] { 256, 128, 86, 64 };
@OriginalMember(owner = "client!ie", name = "l", descriptor = "[F")
public static final float[] aFloatArray8 = new float[] { 1.0649863E-7F, 1.1341951E-7F, 1.2079015E-7F, 1.2863978E-7F, 1.369995E-7F, 1.459025E-7F, 1.5538409E-7F, 1.6548181E-7F, 1.7623574E-7F, 1.8768856E-7F, 1.998856E-7F, 2.128753E-7F, 2.2670913E-7F, 2.4144197E-7F, 2.5713223E-7F, 2.7384212E-7F, 2.9163792E-7F, 3.1059022E-7F, 3.307741E-7F, 3.5226967E-7F, 3.7516213E-7F, 3.995423E-7F, 4.255068E-7F, 4.5315863E-7F, 4.8260745E-7F, 5.1397E-7F, 5.4737063E-7F, 5.829419E-7F, 6.208247E-7F, 6.611694E-7F, 7.041359E-7F, 7.4989464E-7F, 7.98627E-7F, 8.505263E-7F, 9.057983E-7F, 9.646621E-7F, 1.0273513E-6F, 1.0941144E-6F, 1.1652161E-6F, 1.2409384E-6F, 1.3215816E-6F, 1.4074654E-6F, 1.4989305E-6F, 1.5963394E-6F, 1.7000785E-6F, 1.8105592E-6F, 1.9282195E-6F, 2.053526E-6F, 2.1869757E-6F, 2.3290977E-6F, 2.4804558E-6F, 2.6416496E-6F, 2.813319E-6F, 2.9961443E-6F, 3.1908505E-6F, 3.39821E-6F, 3.619045E-6F, 3.8542307E-6F, 4.1047006E-6F, 4.371447E-6F, 4.6555283E-6F, 4.958071E-6F, 5.280274E-6F, 5.623416E-6F, 5.988857E-6F, 6.3780467E-6F, 6.7925284E-6F, 7.2339453E-6F, 7.704048E-6F, 8.2047E-6F, 8.737888E-6F, 9.305725E-6F, 9.910464E-6F, 1.0554501E-5F, 1.1240392E-5F, 1.1970856E-5F, 1.2748789E-5F, 1.3577278E-5F, 1.4459606E-5F, 1.5399271E-5F, 1.6400005E-5F, 1.7465769E-5F, 1.8600793E-5F, 1.9809577E-5F, 2.1096914E-5F, 2.2467912E-5F, 2.3928002E-5F, 2.5482977E-5F, 2.7139005E-5F, 2.890265E-5F, 3.078091E-5F, 3.2781227E-5F, 3.4911533E-5F, 3.718028E-5F, 3.9596467E-5F, 4.2169668E-5F, 4.491009E-5F, 4.7828602E-5F, 5.0936775E-5F, 5.424693E-5F, 5.7772202E-5F, 6.152657E-5F, 6.552491E-5F, 6.9783084E-5F, 7.4317984E-5F, 7.914758E-5F, 8.429104E-5F, 8.976875E-5F, 9.560242E-5F, 1.0181521E-4F, 1.0843174E-4F, 1.1547824E-4F, 1.2298267E-4F, 1.3097477E-4F, 1.3948625E-4F, 1.4855085E-4F, 1.5820454E-4F, 1.6848555E-4F, 1.7943469E-4F, 1.9109536E-4F, 2.0351382E-4F, 2.167393E-4F, 2.3082423E-4F, 2.4582449E-4F, 2.6179955E-4F, 2.7881275E-4F, 2.9693157E-4F, 3.1622787E-4F, 3.3677815E-4F, 3.5866388E-4F, 3.8197188E-4F, 4.0679457E-4F, 4.3323037E-4F, 4.613841E-4F, 4.913675E-4F, 5.2329927E-4F, 5.573062E-4F, 5.935231E-4F, 6.320936E-4F, 6.731706E-4F, 7.16917E-4F, 7.635063E-4F, 8.1312325E-4F, 8.6596457E-4F, 9.2223985E-4F, 9.821722E-4F, 0.0010459992F, 0.0011139743F, 0.0011863665F, 0.0012634633F, 0.0013455702F, 0.0014330129F, 0.0015261382F, 0.0016253153F, 0.0017309374F, 0.0018434235F, 0.0019632196F, 0.0020908006F, 0.0022266726F, 0.0023713743F, 0.0025254795F, 0.0026895993F, 0.0028643848F, 0.0030505287F, 0.003248769F, 0.0034598925F, 0.0036847359F, 0.0039241905F, 0.0041792067F, 0.004450795F, 0.004740033F, 0.005048067F, 0.0053761187F, 0.005725489F, 0.0060975635F, 0.0064938175F, 0.0069158226F, 0.0073652514F, 0.007843887F, 0.008353627F, 0.008896492F, 0.009474637F, 0.010090352F, 0.01074608F, 0.011444421F, 0.012188144F, 0.012980198F, 0.013823725F, 0.014722068F, 0.015678791F, 0.016697686F, 0.017782796F, 0.018938422F, 0.020169148F, 0.021479854F, 0.022875736F, 0.02436233F, 0.025945531F, 0.027631618F, 0.029427277F, 0.031339627F, 0.03337625F, 0.035545226F, 0.037855156F, 0.0403152F, 0.042935107F, 0.045725275F, 0.048696756F, 0.05186135F, 0.05523159F, 0.05882085F, 0.062643364F, 0.06671428F, 0.07104975F, 0.075666964F, 0.08058423F, 0.08582105F, 0.09139818F, 0.097337745F, 0.1036633F, 0.11039993F, 0.11757434F, 0.12521498F, 0.13335215F, 0.14201812F, 0.15124726F, 0.16107617F, 0.1715438F, 0.18269168F, 0.19456401F, 0.20720787F, 0.22067343F, 0.23501402F, 0.25028655F, 0.26655158F, 0.28387362F, 0.3023213F, 0.32196787F, 0.34289113F, 0.36517414F, 0.3889052F, 0.41417846F, 0.44109413F, 0.4697589F, 0.50028646F, 0.53279793F, 0.5674221F, 0.6042964F, 0.64356697F, 0.6853896F, 0.72993004F, 0.777365F, 0.8278826F, 0.88168305F, 0.9389798F, 1.0F };
@OriginalMember(owner = "client!ie", name = "a", descriptor = "([II)I") @OriginalMember(owner = "client!ie", name = "a", descriptor = "([II)I")
public static int method2268(@OriginalArg(0) int[] arg0, @OriginalArg(1) int arg1) { public static int method2268(@OriginalArg(0) int[] arg0, @OriginalArg(1) int arg1) {
@Pc(3) int local3 = arg0[arg1]; @Pc(3) int local3 = arg0[arg1];

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

@ -19,7 +19,7 @@ public final class Static109 {
public static void method2274() { public static void method2274() {
for (@Pc(7) int local7 = 0; local7 < Static272.anInt5214; local7++) { for (@Pc(7) int local7 = 0; local7 < Static272.anInt5214; local7++) {
@Pc(18) int local18 = Static33.anIntArray79[local7]; @Pc(18) int local18 = Static33.anIntArray79[local7];
@Pc(22) Npc local22 = Static175.npcs[local18]; @Pc(22) Npc local22 = NpcList.npcs[local18];
if (local22 != null) { if (local22 != null) {
Static263.method4514(local22.type.soze, local22); Static263.method4514(local22.type.soze, local22);
} }

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

@ -1,6 +1,4 @@
import org.openrs2.deob.annotation.OriginalArg;
import org.openrs2.deob.annotation.OriginalMember; import org.openrs2.deob.annotation.OriginalMember;
import org.openrs2.deob.annotation.Pc;
public final class Static11 { public final class Static11 {
@ -9,21 +7,4 @@ public final class Static11 {
NpcTypeList.headModels.clear(); NpcTypeList.headModels.clear();
} }
@OriginalMember(owner = "client!ba", name = "a", descriptor = "(IB)I")
public static int getFreeSpaces(@OriginalArg(0) int arg0) {
if (arg0 < 0) {
return 0;
}
@Pc(17) Inv local17 = (Inv) Static20.objectContainerCache.get((long) arg0);
if (local17 == null) {
return InvTypeList.list(arg0).size;
}
@Pc(31) int freeSpaces = 0;
for (@Pc(33) int id = 0; id < local17.objectIds.length; id++) {
if (local17.objectIds[id] == -1) {
freeSpaces++;
}
}
return freeSpaces + InvTypeList.list(arg0).size - local17.objectIds.length;
}
} }

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

@ -4,18 +4,6 @@ import org.openrs2.deob.annotation.Pc;
public final class Static110 { public final class Static110 {
@OriginalMember(owner = "client!ih", name = "a", descriptor = "(III)Lclient!jh;")
public static Wall method2276(@OriginalArg(0) int arg0, @OriginalArg(1) int arg1, @OriginalArg(2) int arg2) {
@Pc(7) Tile local7 = Static130.aClass3_Sub5ArrayArrayArray1[arg0][arg1][arg2];
if (local7 == null) {
return null;
} else {
@Pc(14) Wall local14 = local7.aClass77_1;
local7.aClass77_1 = null;
return local14;
}
}
@OriginalMember(owner = "client!ih", name = "a", descriptor = "(I[Lclient!hg;)V") @OriginalMember(owner = "client!ih", name = "a", descriptor = "(I[Lclient!hg;)V")
public static void method2280(@OriginalArg(0) int arg0, @OriginalArg(1) GlTile[] arg1) { public static void method2280(@OriginalArg(0) int arg0, @OriginalArg(1) GlTile[] arg1) {
Static182.aClass3_Sub14ArrayArray2[arg0] = arg1; Static182.aClass3_Sub14ArrayArray2[arg0] = arg1;
@ -57,7 +45,7 @@ public final class Static110 {
local6.anInt2028 = local6.npc.zFine + local6.npc.getSize() * 64; local6.anInt2028 = local6.npc.zFine + local6.npc.getSize() * 64;
Static150.method2804(arg1, local6, arg3, arg0, arg2); Static150.method2804(arg1, local6, arg3, arg0, arg2);
} }
for (local6 = (AreaSound) Static93.aClass133_7.head(); local6 != null; local6 = (AreaSound) Static93.aClass133_7.next()) { for (local6 = (AreaSound) AreaSoundManager.aClass133_7.head(); local6 != null; local6 = (AreaSound) AreaSoundManager.aClass133_7.next()) {
local37 = 1; local37 = 1;
local42 = local6.player.method2681(); local42 = local6.player.method2681();
if (local6.player.anInt3366 == local42.idleAnimationId) { if (local6.player.anInt3366 == local42.idleAnimationId) {

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

@ -6,9 +6,6 @@ public final class Static111 {
@OriginalMember(owner = "client!ii", name = "a", descriptor = "I") @OriginalMember(owner = "client!ii", name = "a", descriptor = "I")
public static int cameraZ; public static int cameraZ;
@OriginalMember(owner = "client!ii", name = "l", descriptor = "I")
public static int anInt2905;
@OriginalMember(owner = "client!ii", name = "y", descriptor = "I") @OriginalMember(owner = "client!ii", name = "y", descriptor = "I")
public static int anInt2910; public static int anInt2910;
@ -46,7 +43,7 @@ public final class Static111 {
} else { } else {
arg0.x = arg2 - (arg2 * arg0.baseX >> 14) - arg0.anInt445; arg0.x = arg2 - (arg2 * arg0.baseX >> 14) - arg0.anInt445;
} }
if (!Static121.aBoolean154 || Static36.method940(arg0).anInt546 == 0 && arg0.type != 0) { if (!Static121.aBoolean154 || InterfaceList.getServerActiveProperties(arg0).anInt546 == 0 && arg0.type != 0) {
return; return;
} }
if (arg0.y < 0) { if (arg0.y < 0) {

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

@ -53,11 +53,11 @@ public final class Static115 {
@OriginalMember(owner = "client!ja", name = "a", descriptor = "(IIIIB)V") @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) { public static void method2310(@OriginalArg(0) int arg0, @OriginalArg(1) int arg1, @OriginalArg(2) int arg2, @OriginalArg(3) int arg3) {
if (Static70.type == 1) { if (Cross.type == 1) {
Sprites.crosses[Static17.milliseconds / 100].method1423(Static122.x - 8, Static25.y + -8); Sprites.crosses[Cross.milliseconds / 100].method1423(Cross.x - 8, Cross.y + -8);
} }
if (Static70.type == 2) { if (Cross.type == 2) {
Sprites.crosses[Static17.milliseconds / 100 + 4].method1423(Static122.x - 8, Static25.y + -8); Sprites.crosses[Cross.milliseconds / 100 + 4].method1423(Cross.x - 8, Cross.y + -8);
} }
Static256.method4392(); Static256.method4392();
} }

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

@ -42,12 +42,12 @@ public final class Static118 {
} }
if (local15.type == 6) { if (local15.type == 6) {
@Pc(105) int local105; @Pc(105) int local105;
if (local15.anInt522 != -1 || local15.anInt462 != -1) { if (local15.modelSeqId != -1 || local15.anInt462 != -1) {
@Pc(100) boolean local100 = Static154.method2926(local15); @Pc(100) boolean local100 = Static154.method2926(local15);
if (local100) { if (local100) {
local105 = local15.anInt462; local105 = local15.anInt462;
} else { } else {
local105 = local15.anInt522; local105 = local15.modelSeqId;
} }
if (local105 != -1) { if (local105 != -1) {
@Pc(118) SeqType local118 = SeqTypeList.get(local105); @Pc(118) SeqType local118 = SeqTypeList.get(local105);

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

@ -15,9 +15,6 @@ public final class Static12 {
@OriginalMember(owner = "client!bb", name = "A", descriptor = "Lclient!na;") @OriginalMember(owner = "client!bb", name = "A", descriptor = "Lclient!na;")
public static final JagString aClass100_74 = JagString.parse("::"); public static final JagString aClass100_74 = JagString.parse("::");
@OriginalMember(owner = "client!bb", name = "E", descriptor = "I")
public static int anInt400 = 0;
@OriginalMember(owner = "client!bb", name = "a", descriptor = "(I)V") @OriginalMember(owner = "client!bb", name = "a", descriptor = "(I)V")
public static void method447() { public static void method447() {
if (WorldMap.zoom < WorldMap.targetZoom) { if (WorldMap.zoom < WorldMap.targetZoom) {

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

@ -5,9 +5,6 @@ import org.openrs2.deob.annotation.Pc;
public final class Static120 { public final class Static120 {
@OriginalMember(owner = "client!jf", name = "a", descriptor = "[Lclient!gi;")
public static Light[] lights;
@OriginalMember(owner = "client!jf", name = "c", descriptor = "[I") @OriginalMember(owner = "client!jf", name = "c", descriptor = "[I")
private static int[] anIntArray283; private static int[] anIntArray283;
@ -50,10 +47,7 @@ public final class Static120 {
@OriginalMember(owner = "client!jf", name = "b", descriptor = "[F") @OriginalMember(owner = "client!jf", name = "b", descriptor = "[F")
private static final float[] aFloatArray17 = new float[] { 0.0F, 0.0F, 0.0F, 1.0F }; private static final float[] aFloatArray17 = new float[] { 0.0F, 0.0F, 0.0F, 1.0F };
@OriginalMember(owner = "client!jf", name = "l", descriptor = "I") @OriginalMember(owner = "client!jf", name = "a", descriptor = "(IIIIIII)V")
public static int lightCount = 0;
@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) { 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 (!Preferences.highDetailLighting) { if (!Preferences.highDetailLighting) {
return; return;
@ -79,10 +73,10 @@ public final class Static120 {
@OriginalMember(owner = "client!jf", name = "a", descriptor = "(Lclient!gi;)V") @OriginalMember(owner = "client!jf", name = "a", descriptor = "(Lclient!gi;)V")
public static void method2389(@OriginalArg(0) Light arg0) { public static void method2389(@OriginalArg(0) Light arg0) {
if (lightCount >= 255) { if (LightingManager.lightCount >= 255) {
System.out.println("Number of lights added exceeds maximum!"); System.out.println("Number of lights added exceeds maximum!");
} else { } else {
lights[lightCount++] = arg0; LightingManager.lights[LightingManager.lightCount++] = arg0;
} }
} }
@ -151,7 +145,7 @@ public final class Static120 {
if (!aBooleanArray66[local40]) { if (!aBooleanArray66[local40]) {
anIntArray284[local40] = anIntArray283[local35]; anIntArray284[local40] = anIntArray283[local35];
aBooleanArray66[local40] = true; aBooleanArray66[local40] = true;
method2403(local40, lights[anIntArray283[local35]], arg0, arg1, arg2); method2403(local40, LightingManager.lights[anIntArray283[local35]], arg0, arg1, arg2);
break; break;
} }
} }
@ -207,7 +201,7 @@ public final class Static120 {
if (!aBooleanArray66[local53]) { if (!aBooleanArray66[local53]) {
anIntArray284[local53] = anIntArray283[local47]; anIntArray284[local53] = anIntArray283[local47];
aBooleanArray66[local53] = true; aBooleanArray66[local53] = true;
method2403(local53, lights[anIntArray283[local47]], arg0, arg1, arg2); method2403(local53, LightingManager.lights[anIntArray283[local47]], arg0, arg1, arg2);
break; break;
} }
} }
@ -229,8 +223,8 @@ public final class Static120 {
@OriginalMember(owner = "client!jf", name = "a", descriptor = "(IZ)V") @OriginalMember(owner = "client!jf", name = "a", descriptor = "(IZ)V")
public static void method2394(@OriginalArg(0) int arg0, @OriginalArg(1) boolean arg1) { public static void method2394(@OriginalArg(0) int arg0, @OriginalArg(1) boolean arg1) {
for (@Pc(1) int local1 = 0; local1 < lightCount; local1++) { for (@Pc(1) int local1 = 0; local1 < LightingManager.lightCount; local1++) {
lights[local1].method1765(arg1, arg0); LightingManager.lights[local1].method1765(arg1, arg0);
} }
anInt3031 = -1; anInt3031 = -1;
anInt3033 = -1; anInt3033 = -1;
@ -241,8 +235,8 @@ public final class Static120 {
@OriginalMember(owner = "client!jf", name = "b", descriptor = "()V") @OriginalMember(owner = "client!jf", name = "b", descriptor = "()V")
public static void method2395() { public static void method2395() {
for (@Pc(1) int local1 = 0; local1 < lightCount; local1++) { for (@Pc(1) int local1 = 0; local1 < LightingManager.lightCount; local1++) {
@Pc(8) Light local8 = lights[local1]; @Pc(8) Light local8 = LightingManager.lights[local1];
@Pc(11) int local11 = local8.anInt2241; @Pc(11) int local11 = local8.anInt2241;
if (local8.aBoolean124) { if (local8.aBoolean124) {
local11 = 0; local11 = 0;
@ -331,7 +325,7 @@ public final class Static120 {
@OriginalMember(owner = "client!jf", name = "c", descriptor = "()V") @OriginalMember(owner = "client!jf", name = "c", descriptor = "()V")
public static void method2398() { public static void method2398() {
lights = null; LightingManager.lights = null;
anIntArray284 = null; anIntArray284 = null;
aBooleanArray65 = null; aBooleanArray65 = null;
anIntArray283 = null; anIntArray283 = null;
@ -357,7 +351,7 @@ public final class Static120 {
@OriginalMember(owner = "client!jf", name = "f", descriptor = "()V") @OriginalMember(owner = "client!jf", name = "f", descriptor = "()V")
public static void method2401() { public static void method2401() {
lights = new Light[255]; LightingManager.lights = new Light[255];
anIntArray284 = new int[4]; anIntArray284 = new int[4];
aBooleanArray65 = new boolean[4]; aBooleanArray65 = new boolean[4];
anIntArray283 = new int[4]; anIntArray283 = new int[4];
@ -381,8 +375,8 @@ public final class Static120 {
local4.glFogfv(GL2.GL_FOG_COLOR, new float[] { 0.0F, 0.0F, 0.0F, 0.0F }, 0); local4.glFogfv(GL2.GL_FOG_COLOR, new float[] { 0.0F, 0.0F, 0.0F, 0.0F }, 0);
local4.glTexEnvi(GL2.GL_TEXTURE_ENV, GL2.GL_SRC0_RGB, GL2.GL_CONSTANT); local4.glTexEnvi(GL2.GL_TEXTURE_ENV, GL2.GL_SRC0_RGB, GL2.GL_CONSTANT);
local4.glTexEnvi(GL2.GL_TEXTURE_ENV, GL2.GL_OPERAND0_RGB, GL2.GL_SRC_ALPHA); local4.glTexEnvi(GL2.GL_TEXTURE_ENV, GL2.GL_OPERAND0_RGB, GL2.GL_SRC_ALPHA);
label71: for (@Pc(56) int local56 = 0; local56 < lightCount; local56++) { label71: for (@Pc(56) int local56 = 0; local56 < LightingManager.lightCount; local56++) {
@Pc(63) Light local63 = lights[local56]; @Pc(63) Light local63 = LightingManager.lights[local56];
@Pc(66) int local66 = local63.anInt2241; @Pc(66) int local66 = local63.anInt2241;
if (local63.aBoolean125) { if (local63.aBoolean125) {
local66--; local66--;
@ -450,7 +444,7 @@ public final class Static120 {
@OriginalMember(owner = "client!jf", name = "g", descriptor = "()V") @OriginalMember(owner = "client!jf", name = "g", descriptor = "()V")
public static void method2404() { public static void method2404() {
lightCount = 0; LightingManager.lightCount = 0;
for (@Pc(3) int local3 = 0; local3 < anInt3032; local3++) { for (@Pc(3) int local3 = 0; local3 < anInt3032; local3++) {
for (@Pc(8) int local8 = 0; local8 < anInt3037; local8++) { for (@Pc(8) int local8 = 0; local8 < anInt3037; local8++) {
for (@Pc(13) int local13 = 0; local13 < anInt3036; local13++) { for (@Pc(13) int local13 = 0; local13 < anInt3036; local13++) {

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

@ -1,28 +1,15 @@
import org.openrs2.deob.annotation.OriginalArg; import org.openrs2.deob.annotation.OriginalArg;
import org.openrs2.deob.annotation.OriginalMember; import org.openrs2.deob.annotation.OriginalMember;
import org.openrs2.deob.annotation.Pc;
public final class Static122 { public final class Static122 {
@OriginalMember(owner = "client!jh", name = "n", descriptor = "Lclient!bd;")
public static QuickChatPhrase aClass12_1;
@OriginalMember(owner = "client!jh", name = "b", descriptor = "[Lclient!na;")
public static final JagString[] aClass100Array92 = new JagString[200];
@OriginalMember(owner = "client!jh", name = "f", descriptor = "D")
public static double aDouble1 = -1.0D;
@OriginalMember(owner = "client!jh", name = "g", descriptor = "Lclient!na;") @OriginalMember(owner = "client!jh", name = "g", descriptor = "Lclient!na;")
public static final JagString aClass100_591 = JagString.parse("(Udns"); public static final JagString aClass100_591 = JagString.parse("(Udns");
@OriginalMember(owner = "client!jh", name = "j", descriptor = "I") @OriginalMember(owner = "client!jh", name = "a", descriptor = "(Lclient!ve;ZIIZI)V")
public static int x = 0;
@OriginalMember(owner = "client!jh", name = "a", descriptor = "(Lclient!ve;ZIIZI)V")
public static void method2410(@OriginalArg(0) Js5 arg0, @OriginalArg(2) int arg1, @OriginalArg(5) int arg2) { public static void method2410(@OriginalArg(0) Js5 arg0, @OriginalArg(2) int arg1, @OriginalArg(5) int arg2) {
Static172.aClass153_70 = arg0; Static172.aClass153_70 = arg0;
Static14.anInt441 = 1; MidiPlayer.anInt441 = 1;
Static253.anInt5527 = arg2; Static253.anInt5527 = arg2;
Static226.anInt5085 = 0; Static226.anInt5085 = 0;
Static277.anInt5853 = arg1; Static277.anInt5853 = arg1;
@ -30,60 +17,7 @@ public final class Static122 {
Static57.anInt1757 = 10000; Static57.anInt1757 = 10000;
} }
@OriginalMember(owner = "client!jh", name = "a", descriptor = "(IZLclient!pb;ILclient!km;IILclient!e;)V") @OriginalMember(owner = "client!jh", name = "a", descriptor = "(IILclient!ve;Lclient!ve;I)Lclient!dd;")
public static void method2411(@OriginalArg(0) int arg0, @OriginalArg(2) LocType arg1, @OriginalArg(3) int arg2, @OriginalArg(4) Npc arg3, @OriginalArg(5) int arg4, @OriginalArg(6) int arg5, @OriginalArg(7) Player arg6) {
@Pc(13) AreaSound local13 = new AreaSound();
local13.anInt2029 = arg0 * 128;
local13.anInt2041 = arg4 * 128;
local13.anInt2033 = arg5;
if (arg1 != null) {
local13.sounds = arg1.anIntArray381;
local13.radius = arg1.soundRadius * 128;
local13.anInt2040 = arg1.anInt4414;
local13.locType = arg1;
local13.sound = arg1.sound;
local13.anInt2032 = arg1.anInt4419;
@Pc(57) int local57 = arg1.width;
@Pc(60) int local60 = arg1.length;
if (arg2 == 1 || arg2 == 3) {
local57 = arg1.length;
local60 = arg1.width;
}
local13.anInt2028 = (local60 + arg0) * 128;
local13.anInt2037 = (arg4 + local57) * 128;
if (arg1.multiLocs != null) {
local13.multiLocOrNpc = true;
local13.update();
}
if (local13.sounds != null) {
local13.anInt2034 = local13.anInt2032 + (int) (Math.random() * (double) (local13.anInt2040 - local13.anInt2032));
}
Static3.aClass69_135.addTail(local13);
} else if (arg3 != null) {
local13.npc = arg3;
@Pc(138) NpcType local138 = arg3.type;
if (local138.multiNpcs != null) {
local13.multiLocOrNpc = true;
local138 = local138.getMultiNpc();
}
if (local138 != null) {
local13.anInt2028 = (local138.soze + arg0) * 128;
local13.anInt2037 = (arg4 + local138.soze) * 128;
local13.sound = Static112.getSound(arg3);
local13.radius = local138.soundRadius * 128;
}
Static152.aClass69_87.addTail(local13);
} else if (arg6 != null) {
local13.player = arg6;
local13.anInt2037 = (arg6.getSize() + arg4) * 128;
local13.anInt2028 = (arg6.getSize() + arg0) * 128;
local13.sound = Static140.getSound(arg6);
local13.radius = arg6.soundRadius * 128;
Static93.aClass133_7.put(local13, arg6.username.encode37());
}
}
@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) { public static SoftwareFont method2412(@OriginalArg(0) int arg0, @OriginalArg(2) Js5 arg1, @OriginalArg(3) Js5 arg2) {
return SpriteLoader.decode(arg2, 0, arg0) ? Static114.method4635(arg1.getFile(arg0, 0)) : null; return SpriteLoader.decode(arg2, 0, arg0) ? Static114.method4635(arg1.getFile(arg0, 0)) : null;
} }

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

@ -13,16 +13,6 @@ public final class Static124 {
@OriginalMember(owner = "client!jk", name = "F", descriptor = "Lclient!na;") @OriginalMember(owner = "client!jk", name = "F", descriptor = "Lclient!na;")
public static final JagString aClass100_596 = JagString.parse("::tween"); public static final JagString aClass100_596 = JagString.parse("::tween");
@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) MapList.aClass69_120.method2289(); local15 != null; local15 = (Map) MapList.aClass69_120.method2288()) {
if (local15.group.strEquals(arg0)) {
return local15;
}
}
return null;
}
@OriginalMember(owner = "client!jk", name = "a", descriptor = "(IZ[BII[Lclient!mj;)V") @OriginalMember(owner = "client!jk", name = "a", descriptor = "(IZ[BII[Lclient!mj;)V")
public static void method2437(@OriginalArg(0) int arg0, @OriginalArg(1) boolean arg1, @OriginalArg(2) byte[] arg2, @OriginalArg(3) int arg3, @OriginalArg(5) CollisionMap[] arg4) { public static void method2437(@OriginalArg(0) int arg0, @OriginalArg(1) boolean arg1, @OriginalArg(2) byte[] arg2, @OriginalArg(3) int arg3, @OriginalArg(5) CollisionMap[] arg4) {
@Pc(10) Buffer local10 = new Buffer(arg2); @Pc(10) Buffer local10 = new Buffer(arg2);

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

@ -7,9 +7,6 @@ public final class Static125 {
@OriginalMember(owner = "client!jl", name = "v", descriptor = "I") @OriginalMember(owner = "client!jl", name = "v", descriptor = "I")
public static int anInt3096 = 0; public static int anInt3096 = 0;
@OriginalMember(owner = "client!jl", name = "H", descriptor = "I")
public static int worldId = -1;
@OriginalMember(owner = "client!jl", name = "a", descriptor = "(IIIII)V") @OriginalMember(owner = "client!jl", name = "a", descriptor = "(IIIII)V")
public static void method2448(@OriginalArg(0) int arg0, @OriginalArg(1) int arg1, @OriginalArg(2) int arg2, @OriginalArg(3) int arg3) { public static void method2448(@OriginalArg(0) int arg0, @OriginalArg(1) int arg1, @OriginalArg(2) int arg2, @OriginalArg(3) int arg3) {
Protocol.outboundBuffer.offset = 0; Protocol.outboundBuffer.offset = 0;

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

@ -43,7 +43,7 @@ public final class Static127 {
@Pc(55) int local55 = Static225.originX; @Pc(55) int local55 = Static225.originX;
Static142.originZ = arg1 * 8 - 48; Static142.originZ = arg1 * 8 - 48;
Static225.originX = (arg2 - 6) * 8; Static225.originX = (arg2 - 6) * 8;
Static158.aClass3_Sub2_Sub4_3 = Static29.method803(Static80.centralZoneX * 8, Static52.anInt1695 * 8); Static158.aClass3_Sub2_Sub4_3 = MapList.getContainingSource(Static80.centralZoneX * 8, Static52.anInt1695 * 8);
@Pc(81) int local81 = Static142.originZ - local53; @Pc(81) int local81 = Static142.originZ - local53;
@Pc(86) int local86 = Static225.originX - local55; @Pc(86) int local86 = Static225.originX - local55;
Static235.mapElementList = null; Static235.mapElementList = null;
@ -53,7 +53,7 @@ public final class Static127 {
if (arg4) { if (arg4) {
Static272.anInt5214 = 0; Static272.anInt5214 = 0;
for (local96 = 0; local96 < 32768; local96++) { for (local96 = 0; local96 < 32768; local96++) {
local103 = Static175.npcs[local96]; local103 = NpcList.npcs[local96];
if (local103 != null) { if (local103 != null) {
local103.xFine -= local86 * 128; local103.xFine -= local86 * 128;
local103.zFine -= local81 * 128; local103.zFine -= local81 * 128;
@ -64,14 +64,14 @@ public final class Static127 {
} }
Static33.anIntArray79[Static272.anInt5214++] = local96; Static33.anIntArray79[Static272.anInt5214++] = local96;
} else { } else {
Static175.npcs[local96].method2698(null); NpcList.npcs[local96].method2698(null);
Static175.npcs[local96] = null; NpcList.npcs[local96] = null;
} }
} }
} }
} else { } else {
for (local96 = 0; local96 < 32768; local96++) { for (local96 = 0; local96 < 32768; local96++) {
local103 = Static175.npcs[local96]; local103 = NpcList.npcs[local96];
if (local103 != null) { if (local103 != null) {
for (local109 = 0; local109 < 10; local109++) { for (local109 = 0; local109 < 10; local109++) {
local103.movementQueueX[local109] -= local86; local103.movementQueueX[local109] -= local86;
@ -231,132 +231,4 @@ public final class Static127 {
} }
} }
@OriginalMember(owner = "client!k", name = "a", descriptor = "(Lclient!na;Z)V")
public static void method2470(@OriginalArg(0) JagString arg0) {
if (LoginManager.staffModLevel >= 2) {
@Pc(18) int local18;
@Pc(38) int local38;
@Pc(29) Runtime local29;
if (arg0.equalsIgnoreCase(Static81.aClass100_476)) {
client.method2380();
for (local18 = 0; local18 < 10; local18++) {
System.gc();
}
local29 = Runtime.getRuntime();
local38 = (int) ((local29.totalMemory() - local29.freeMemory()) / 1024L);
Chat.add(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)) {
client.method2380();
for (local18 = 0; local18 < 10; local18++) {
System.gc();
}
local29 = Runtime.getRuntime();
local38 = (int) ((local29.totalMemory() - local29.freeMemory()) / 1024L);
Chat.add(null, 0, JagString.concatenate(new JagString[] { Static203.aClass100_893, Static123.parseInt(local38), Static17.aClass100_101 }));
Static16.method501();
client.method2380();
for (local117 = 0; local117 < 10; local117++) {
System.gc();
}
local38 = (int) ((local29.totalMemory() - local29.freeMemory()) / 1024L);
Chat.add(null, 0, JagString.concatenate(new JagString[] { Cheat.aClass100_1093, Static123.parseInt(local38), Static17.aClass100_101 }));
}
if (arg0.equalsIgnoreCase(Static240.aClass100_1009)) {
Chat.add(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:" + GlCleaner.anInt1945);
System.out.println("oncard_2d:" + GlCleaner.onCard2d);
System.out.println("oncard_texture:" + GlCleaner.onCardTexture);
}
if (arg0.equalsIgnoreCase(Cheat.CLIENTDROP)) {
Static175.method3279();
}
if (arg0.equalsIgnoreCase(Static279.aClass100_1106)) {
client.js5NetQueue.quit();
}
if (arg0.equalsIgnoreCase(Cheat.JS5DROP)) {
client.js5NetQueue.method2319();
}
if (arg0.equalsIgnoreCase(Cheat.aClass100_775)) {
GameShell.signLink.breakConnection();
Protocol.socket.breakConnection();
client.js5NetQueue.method2323();
}
if (arg0.equalsIgnoreCase(Static114.aClass100_1100)) {
GameShell.replaceCanvas = true;
}
if (arg0.equalsIgnoreCase(Static148.aClass100_677)) {
client.setGameState(25);
}
if (arg0.equalsIgnoreCase(Static107.aClass100_566)) {
Cheat.displayFps = true;
}
if (arg0.equalsIgnoreCase(Static61.aClass100_422)) {
Cheat.displayFps = false;
}
if (arg0.equalsIgnoreCase(Static96.aClass100_522)) {
Static241.setWindowMode(false, 0, -1, -1);
}
if (arg0.equalsIgnoreCase(Static181.aClass100_811)) {
Static241.setWindowMode(false, 1, -1, -1);
}
if (arg0.equalsIgnoreCase(Static207.aClass100_904)) {
Static241.setWindowMode(false, 2, -1, -1);
}
if (arg0.equalsIgnoreCase(Static99.aClass100_529)) {
Static241.setWindowMode(false, 3, 1024, 768);
}
if (arg0.equalsIgnoreCase(Static69.aClass100_443)) {
for (local18 = 0; local18 < 4; local18++) {
for (local38 = 1; local38 < 103; local38++) {
for (local117 = 1; local117 < 103; local117++) {
PathFinder.collisionMaps[local18].anIntArrayArray30[local38][local117] = 0;
}
}
}
}
if (arg0.startsWith(Cheat.aClass100_1088)) {
Preferences.setParticles(arg0.substring(15).parseInt());
Preferences.write(GameShell.signLink);
Preferences.sentToServer = false;
}
if (arg0.startsWith(Cheat.aClass100_623) && client.modeWhere != 0) {
Static115.method2312(arg0.substring(6).parseInt());
}
if (arg0.equalsIgnoreCase(Cheat.aClass100_990)) {
throw new RuntimeException();
}
if (arg0.startsWith(Cheat.aClass100_232)) {
Static199.rectDebug = arg0.substring(12).trim().parseInt();
Chat.add(null, 0, JagString.concatenate(new JagString[] { Static276.aClass100_1096, Static123.parseInt(Static199.rectDebug) }));
}
if (arg0.equalsIgnoreCase(Static181.aClass100_810)) {
Static121.aBoolean154 = true;
}
if (arg0.equalsIgnoreCase(Static124.aClass100_596)) {
if (Static204.applyTweening) {
Static204.applyTweening = false;
Chat.add(null, 0, Cheat.aClass100_943);
} else {
Static204.applyTweening = true;
Chat.add(null, 0, Static50.aClass100_362);
}
}
if (arg0.equalsIgnoreCase(Static114.aClass100_1099)) {
if (Static172.shiftClick) {
Static154.aClass100_736.method3129();
Static172.shiftClick = false;
} else {
Cheat.aClass100_333.method3129();
Static172.shiftClick = true;
}
}
}
Protocol.outboundBuffer.p1isaac(44);
Protocol.outboundBuffer.p1(arg0.length() - 1);
Protocol.outboundBuffer.pjstr(arg0.substring(2));
}
} }

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

@ -23,7 +23,7 @@ public final class Static13 {
local32 = JagString.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) { } else if (Static241.aBoolean302 && Static231.anInt5204 < 2) {
local32 = JagString.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) { } else if (Cheat.shiftClick && Keyboard.pressedKeys[Keyboard.KEY_SHIFT] && Static231.anInt5204 > 2) {
local32 = Static269.method2228(Static231.anInt5204 - 2); local32 = Static269.method2228(Static231.anInt5204 - 2);
} else { } else {
local32 = Static269.method2228(Static231.anInt5204 - 1); local32 = Static269.method2228(Static231.anInt5204 - 1);

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

@ -3,9 +3,6 @@ import org.openrs2.deob.annotation.OriginalMember;
public final class Static130 { public final class Static130 {
@OriginalMember(owner = "client!kc", name = "o", descriptor = "[[[Lclient!bj;")
public static Tile[][][] aClass3_Sub5ArrayArrayArray1;
@OriginalMember(owner = "client!kc", name = "p", descriptor = "[I") @OriginalMember(owner = "client!kc", name = "p", descriptor = "[I")
public static int[] anIntArray299; public static int[] anIntArray299;

21
client/src/main/java/Static132.java
View file

@ -4,9 +4,6 @@ import org.openrs2.deob.annotation.Pc;
public final class Static132 { public final class Static132 {
@OriginalMember(owner = "client!ke", name = "T", descriptor = "[[I")
public static final int[][] anIntArrayArray24 = new int[][] { { 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 }, { 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1 }, { 1, 0, 0, 0, 1, 1, 0, 0, 1, 1, 1, 0, 1, 1, 1, 1 }, { 1, 1, 0, 0, 1, 1, 0, 0, 1, 0, 0, 0, 1, 0, 0, 0 }, { 0, 0, 1, 1, 0, 0, 1, 1, 0, 0, 0, 1, 0, 0, 0, 1 }, { 0, 1, 1, 1, 0, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1 }, { 1, 1, 1, 0, 1, 1, 1, 0, 1, 1, 1, 1, 1, 1, 1, 1 }, { 1, 1, 0, 0, 1, 1, 0, 0, 1, 1, 0, 0, 1, 1, 0, 0 }, { 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 1, 1, 0, 0 }, { 1, 1, 1, 1, 1, 1, 1, 1, 0, 1, 1, 1, 0, 0, 1, 1 }, { 1, 1, 1, 1, 1, 1, 0, 0, 1, 0, 0, 0, 1, 0, 0, 0 }, { 0, 0, 0, 0, 0, 0, 1, 1, 0, 1, 1, 1, 0, 1, 1, 1 }, { 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 1, 0, 1, 1, 1, 1 } };
@OriginalMember(owner = "client!ke", name = "U", descriptor = "I") @OriginalMember(owner = "client!ke", name = "U", descriptor = "I")
public static int anInt3291 = 0; public static int anInt3291 = 0;
@ -53,28 +50,12 @@ public final class Static132 {
} }
} }
@OriginalMember(owner = "client!ke", name = "c", descriptor = "(III)V")
public static void method2606(@OriginalArg(0) int arg0, @OriginalArg(1) int arg1) {
@Pc(8) DelayedStateChange local8 = Static238.method4143(1, arg0);
local8.pushServer();
local8.intArg1 = arg1;
}
@OriginalMember(owner = "client!ke", name = "a", descriptor = "(IIIBI)V")
public static void method2607(@OriginalArg(0) int arg0, @OriginalArg(1) int arg1, @OriginalArg(2) int arg2, @OriginalArg(4) int arg3) {
@Pc(8) DelayedStateChange local8 = Static238.method4143(4, arg2);
local8.pushServer();
local8.intArg3 = arg3;
local8.intArg2 = arg0;
local8.intArg1 = arg1;
}
@OriginalMember(owner = "client!ke", name = "f", descriptor = "(B)V") @OriginalMember(owner = "client!ke", name = "f", descriptor = "(B)V")
public static void method2608() { public static void method2608() {
@Pc(7) int local7 = 0; @Pc(7) int local7 = 0;
for (@Pc(23) int local23 = 0; local23 < 104; local23++) { for (@Pc(23) int local23 = 0; local23 < 104; local23++) {
for (@Pc(30) int local30 = 0; local30 < 104; local30++) { for (@Pc(30) int local30 = 0; local30 < 104; local30++) {
if (Static254.method4348(true, local23, local30, Static130.aClass3_Sub5ArrayArrayArray1, local7)) { if (Static254.method4348(true, local23, local30, SceneGraph.tiles, local7)) {
local7++; local7++;
} }
if (local7 >= 512) { if (local7 >= 512) {

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

@ -7,10 +7,7 @@ public final class Static133 {
@OriginalMember(owner = "client!kf", name = "f", descriptor = "I") @OriginalMember(owner = "client!kf", name = "f", descriptor = "I")
public static int anInt5230; public static int anInt5230;
@OriginalMember(owner = "client!kf", name = "c", descriptor = "J") @OriginalMember(owner = "client!kf", name = "d", descriptor = "[Lclient!cl;")
public static long clickTime = 0L;
@OriginalMember(owner = "client!kf", name = "d", descriptor = "[Lclient!cl;")
public static final AnimFrameset[] aClass3_Sub2_Sub7Array7 = new AnimFrameset[14]; public static final AnimFrameset[] aClass3_Sub2_Sub7Array7 = new AnimFrameset[14];
@OriginalMember(owner = "client!kf", name = "h", descriptor = "[I") @OriginalMember(owner = "client!kf", name = "h", descriptor = "[I")
@ -21,7 +18,7 @@ public final class Static133 {
@OriginalMember(owner = "client!kf", name = "b", descriptor = "(III)Lclient!ec;") @OriginalMember(owner = "client!kf", name = "b", descriptor = "(III)Lclient!ec;")
public static Scenery method4008(@OriginalArg(0) int arg0, @OriginalArg(1) int arg1, @OriginalArg(2) int arg2) { public static Scenery method4008(@OriginalArg(0) int arg0, @OriginalArg(1) int arg1, @OriginalArg(2) int arg2) {
@Pc(7) Tile local7 = Static130.aClass3_Sub5ArrayArrayArray1[arg0][arg1][arg2]; @Pc(7) Tile local7 = SceneGraph.tiles[arg0][arg1][arg2];
if (local7 == null) { if (local7 == null) {
return null; return null;
} }
@ -34,17 +31,7 @@ public final class Static133 {
return null; return null;
} }
@OriginalMember(owner = "client!kf", name = "a", descriptor = "(Lclient!na;I)V") @OriginalMember(owner = "client!kf", name = "a", descriptor = "(IIBII)V")
public static void method4011(@OriginalArg(0) JagString arg0) {
for (@Pc(15) Map local15 = (Map) MapList.aClass69_120.method2289(); local15 != null; local15 = (Map) MapList.aClass69_120.method2288()) {
if (local15.group.strEquals(arg0)) {
WorldMap.currentMap = local15;
return;
}
}
}
@OriginalMember(owner = "client!kf", name = "a", descriptor = "(IIBII)V")
public static void method4012(@OriginalArg(0) int arg0, @OriginalArg(1) int arg1, @OriginalArg(3) int arg2, @OriginalArg(4) int arg3) { public static void method4012(@OriginalArg(0) int arg0, @OriginalArg(1) int arg1, @OriginalArg(3) int arg2, @OriginalArg(4) int arg3) {
for (@Pc(12) int local12 = 0; local12 < InterfaceList.anInt766; local12++) { for (@Pc(12) int local12 = 0; local12 < InterfaceList.anInt766; local12++) {
if (Static224.anIntArray443[local12] + Static264.anIntArray410[local12] > arg0 && arg1 + arg0 > Static264.anIntArray410[local12] && arg2 < Static67.anIntArray320[local12] + Static50.anIntArray133[local12] && Static50.anIntArray133[local12] < arg2 + arg3) { if (Static224.anIntArray443[local12] + Static264.anIntArray410[local12] > arg0 && arg1 + arg0 > Static264.anIntArray410[local12] && arg2 < Static67.anIntArray320[local12] + Static50.anIntArray133[local12] && Static50.anIntArray133[local12] < arg2 + arg3) {

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

@ -7,9 +7,6 @@ public final class Static134 {
@OriginalMember(owner = "client!kh", name = "f", descriptor = "I") @OriginalMember(owner = "client!kh", name = "f", descriptor = "I")
public static int renderZ; public static int renderZ;
@OriginalMember(owner = "client!kh", name = "g", descriptor = "Lclient!hh;")
public static final PlayerAppearance aClass59_2 = new PlayerAppearance();
@OriginalMember(owner = "client!kh", name = "a", descriptor = "(B)Lclient!ek;") @OriginalMember(owner = "client!kh", name = "a", descriptor = "(B)Lclient!ek;")
public static SoftwareIndexedSprite method2619() { public static SoftwareIndexedSprite method2619() {
@Pc(25) SoftwareIndexedSprite local25 = new SoftwareIndexedSprite(SpriteLoader.width, SpriteLoader.height, SpriteLoader.xOffsets[0], SpriteLoader.yOffsets[0], SpriteLoader.innerWidths[0], SpriteLoader.innerHeights[0], SpriteLoader.pixels[0], SpriteLoader.palette); @Pc(25) SoftwareIndexedSprite local25 = new SoftwareIndexedSprite(SpriteLoader.width, SpriteLoader.height, SpriteLoader.xOffsets[0], SpriteLoader.yOffsets[0], SpriteLoader.innerWidths[0], SpriteLoader.innerHeights[0], SpriteLoader.pixels[0], SpriteLoader.palette);
@ -29,9 +26,4 @@ public final class Static134 {
} }
} }
@OriginalMember(owner = "client!kh", name = "b", descriptor = "(I)V")
public static void method2623() {
Protocol.outboundBuffer.p1isaac(104);
Protocol.outboundBuffer.p8(0L);
}
} }

7
client/src/main/java/Static135.java
View file

@ -1,7 +0,0 @@
import org.openrs2.deob.annotation.OriginalMember;
public final class Static135 {
@OriginalMember(owner = "client!ki", name = "e", descriptor = "[B")
public static final byte[] aByteArray46 = new byte[] { 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 0, 1, 2, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 };
}

11
client/src/main/java/Static136.java
View file

@ -1,6 +1,4 @@
import org.openrs2.deob.annotation.OriginalArg;
import org.openrs2.deob.annotation.OriginalMember; import org.openrs2.deob.annotation.OriginalMember;
import org.openrs2.deob.annotation.Pc;
public final class Static136 { public final class Static136 {
@ -16,15 +14,8 @@ public final class Static136 {
@OriginalMember(owner = "client!kk", name = "m", descriptor = "Lclient!na;") @OriginalMember(owner = "client!kk", name = "m", descriptor = "Lclient!na;")
public static final JagString CS_ERROR = JagString.parse("Clientscript error )2 check log for details"); public static final JagString CS_ERROR = JagString.parse("Clientscript error )2 check log for details");
@OriginalMember(owner = "client!kk", name = "a", descriptor = "(IIB)V")
public static void method2649(@OriginalArg(0) int arg0, @OriginalArg(1) int arg1) {
@Pc(4) DelayedStateChange local4 = Static238.method4143(6, arg1);
local4.pushServer();
local4.intArg1 = arg0;
}
@OriginalMember(owner = "client!kk", name = "a", descriptor = "(I)Z") @OriginalMember(owner = "client!kk", name = "a", descriptor = "(I)Z")
public static boolean method2655() { public static boolean method2655() {
return Static14.anInt441 == 0 ? Static172.aClass3_Sub3_Sub4_2.method4414() : true; return MidiPlayer.anInt441 == 0 ? Static172.aClass3_Sub3_Sub4_2.method4414() : true;
} }
} }

123
client/src/main/java/Static137.java
View file

@ -1,6 +1,5 @@
import org.openrs2.deob.annotation.OriginalArg; import org.openrs2.deob.annotation.OriginalArg;
import org.openrs2.deob.annotation.OriginalMember; import org.openrs2.deob.annotation.OriginalMember;
import org.openrs2.deob.annotation.Pc;
public final class Static137 { public final class Static137 {
@ -15,126 +14,4 @@ public final class Static137 {
return new TextureOp29SubOp2(arg0.g2s(), arg0.g2s(), arg0.g2s(), arg0.g2s(), arg0.g3(), arg0.g3(), arg0.g1()); return new TextureOp29SubOp2(arg0.g2s(), arg0.g2s(), arg0.g2s(), arg0.g2s(), arg0.g3(), arg0.g3(), arg0.g1());
} }
@OriginalMember(owner = "client!kl", name = "b", descriptor = "(II)Z")
public static boolean method2665(@OriginalArg(1) int arg0) {
@Pc(35) int local35;
@Pc(37) int local37;
@Pc(76) int local76;
@Pc(80) int local80;
if (Static56.aClass3_Sub2_Sub1_Sub1_1 == null) {
if (GlRenderer.enabled || Static89.aClass3_Sub2_Sub1_5 == null) {
Static56.aClass3_Sub2_Sub1_Sub1_1 = new SoftwareSprite(512, 512);
} else {
Static56.aClass3_Sub2_Sub1_Sub1_1 = (SoftwareSprite) Static89.aClass3_Sub2_Sub1_5;
}
@Pc(32) int[] local32 = Static56.aClass3_Sub2_Sub1_Sub1_1.anIntArray20;
local35 = local32.length;
for (local37 = 0; local37 < local35; local37++) {
local32[local37] = 1;
}
for (local37 = 1; local37 < 103; local37++) {
local76 = 4 * 512 * (103 - local37) + 24628;
for (local80 = 1; local80 < 103; local80++) {
if ((Static12.tileSettings[arg0][local80][local37] & 0x18) == 0) {
Static152.method2835(local32, local76, arg0, local80, local37);
}
if (arg0 < 3 && (Static12.tileSettings[arg0 + 1][local80][local37] & 0x8) != 0) {
Static152.method2835(local32, local76, arg0 + 1, local80, local37);
}
local76 += 4;
}
}
Static251.anInt5454 = 0;
for (local37 = 0; local37 < 104; local37++) {
for (local76 = 0; local76 < 104; local76++) {
@Pc(169) long local169 = Static20.method602(Player.level, local37 + 0, local76);
if (local169 != 0L) {
@Pc(184) LocType local184 = LocTypeList.get((int) (local169 >>> 32) & Integer.MAX_VALUE);
@Pc(187) int local187 = local184.mapElement;
@Pc(194) int local194;
if (local184.multiLocs != null) {
for (local194 = 0; local194 < local184.multiLocs.length; local194++) {
if (local184.multiLocs[local194] != -1) {
@Pc(216) LocType local216 = LocTypeList.get(local184.multiLocs[local194]);
if (local216.mapElement >= 0) {
local187 = local216.mapElement;
break;
}
}
}
}
if (local187 >= 0) {
@Pc(237) int local237 = local76;
local194 = local37;
if (local187 != 22 && local187 != 29 && local187 != 34 && local187 != 36 && local187 != 46 && local187 != 47 && local187 != 48) {
@Pc(269) int[][] local269 = PathFinder.collisionMaps[Player.level].anIntArrayArray30;
for (@Pc(271) int local271 = 0; local271 < 10; local271++) {
@Pc(281) int local281 = (int) (Math.random() * 4.0D);
if (local281 == 0 && local194 > 0 && local37 - 3 < local194 && (local269[local194 - 1][local237] & 0x12C0108) == 0) {
local194--;
}
if (local281 == 1 && local194 < 103 && local37 + 3 > local194 && (local269[local194 + 1][local237] & 0x12C0180) == 0) {
local194++;
}
if (local281 == 2 && local237 > 0 && local76 - 3 < local237 && (local269[local194][local237 - 1] & 0x12C0102) == 0) {
local237--;
}
if (local281 == 3 && local237 < 103 && local237 < local76 + 3 && (local269[local194][local237 + 1] & 0x12C0120) == 0) {
local237++;
}
}
}
Static199.anIntArray417[Static251.anInt5454] = local184.id;
Static145.anIntArray331[Static251.anInt5454] = local194;
Static93.anIntArray219[Static251.anInt5454] = local237;
Static251.anInt5454++;
}
}
}
}
}
Static56.aClass3_Sub2_Sub1_Sub1_1.method304();
@Pc(455) int local455 = ((int) (Math.random() * 20.0D) + 238 - 10 << 8) + ((int) (Math.random() * 20.0D) + 238 - 10 << 16) + (int) (Math.random() * 20.0D) + 228;
local35 = (int) (Math.random() * 20.0D) + 238 - 10 << 16;
for (local37 = 1; local37 < 103; local37++) {
for (local76 = 1; local76 < 103; local76++) {
if ((Static12.tileSettings[arg0][local76][local37] & 0x18) == 0 && !Static164.method3109(local76, local455, local37, local35, arg0)) {
if (GlRenderer.enabled) {
SoftwareRaster.pixels = null;
} else {
client.frameBuffer.makeTarget();
}
return false;
}
if (arg0 < 3 && (Static12.tileSettings[arg0 + 1][local76][local37] & 0x8) != 0 && !Static164.method3109(local76, local455, local37, local35, arg0 + 1)) {
if (GlRenderer.enabled) {
SoftwareRaster.pixels = null;
} else {
client.frameBuffer.makeTarget();
}
return false;
}
}
}
if (GlRenderer.enabled) {
@Pc(576) int[] local576 = Static56.aClass3_Sub2_Sub1_Sub1_1.anIntArray20;
local76 = local576.length;
for (local80 = 0; local80 < local76; local80++) {
if (local576[local80] == 0) {
local576[local80] = 1;
}
}
Static89.aClass3_Sub2_Sub1_5 = new GlSprite(Static56.aClass3_Sub2_Sub1_Sub1_1);
} else {
Static89.aClass3_Sub2_Sub1_5 = Static56.aClass3_Sub2_Sub1_Sub1_1;
}
if (GlRenderer.enabled) {
SoftwareRaster.pixels = null;
} else {
client.frameBuffer.makeTarget();
}
Static56.aClass3_Sub2_Sub1_Sub1_1 = null;
return true;
}
} }

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

@ -69,19 +69,4 @@ public final class Static138 {
return local34 >> 19 & 0xFF; return local34 >> 19 & 0xFF;
} }
@OriginalMember(owner = "client!km", name = "a", descriptor = "(ILjava/lang/Object;Z)[B")
public static byte[] method2696(@OriginalArg(1) Object arg0, @OriginalArg(2) boolean arg1) {
if (arg0 == null) {
return null;
} else if (arg0 instanceof byte[]) {
@Pc(14) byte[] local14 = (byte[]) arg0;
return arg1 ? Static23.method648(local14) : local14;
} else if (arg0 instanceof ByteArray) {
@Pc(34) ByteArray local34 = (ByteArray) arg0;
return local34.get();
} else {
throw new IllegalArgumentException();
}
}
} }

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

@ -16,7 +16,7 @@ public final class Static139 {
@OriginalMember(owner = "client!l", name = "a", descriptor = "(III)J") @OriginalMember(owner = "client!l", name = "a", descriptor = "(III)J")
public static long method2703(@OriginalArg(0) int arg0, @OriginalArg(1) int arg1, @OriginalArg(2) int arg2) { public static long method2703(@OriginalArg(0) int arg0, @OriginalArg(1) int arg1, @OriginalArg(2) int arg2) {
@Pc(7) Tile local7 = Static130.aClass3_Sub5ArrayArrayArray1[arg0][arg1][arg2]; @Pc(7) Tile local7 = SceneGraph.tiles[arg0][arg1][arg2];
return local7 == null || local7.aClass24_1 == null ? 0L : local7.aClass24_1.key; return local7 == null || local7.aClass24_1 == null ? 0L : local7.aClass24_1.key;
} }

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

@ -7,10 +7,7 @@ public final class Static14 {
@OriginalMember(owner = "client!bd", name = "b", descriptor = "Lclient!na;") @OriginalMember(owner = "client!bd", name = "b", descriptor = "Lclient!na;")
public static final JagString aClass100_80 = JagString.parse("(U(Y"); public static final JagString aClass100_80 = JagString.parse("(U(Y");
@OriginalMember(owner = "client!bd", name = "i", descriptor = "I") @OriginalMember(owner = "client!bd", name = "a", descriptor = "(BI)V")
public static int anInt441 = 0;
@OriginalMember(owner = "client!bd", name = "a", descriptor = "(BI)V")
public static void method475(@OriginalArg(1) int arg0) { public static void method475(@OriginalArg(1) int arg0) {
@Pc(8) Inv local8 = (Inv) Static20.objectContainerCache.get((long) arg0); @Pc(8) Inv local8 = (Inv) Static20.objectContainerCache.get((long) arg0);
if (local8 != null) { if (local8 != null) {

34
client/src/main/java/Static140.java
View file

@ -21,38 +21,4 @@ public final class Static140 {
return local14; return local14;
} }
@OriginalMember(owner = "client!la", name = "a", descriptor = "(IJ)V")
public static void method2707(@OriginalArg(1) long arg0) {
if (arg0 == 0L) {
return;
}
if (Static35.anInt1093 >= 100) {
Chat.add(JagString.EMPTY, 0, LocalizedText.IGNORELISTFULL);
return;
}
@Pc(34) JagString local34 = Base37.decodeLowerCase(arg0).method3125();
@Pc(36) int local36;
for (local36 = 0; local36 < Static35.anInt1093; local36++) {
if (IgnoreList.encodedUsernames[local36] == arg0) {
Chat.add(JagString.EMPTY, 0, JagString.concatenate(new JagString[] { local34, LocalizedText.IGNORELISTDUPE}));
return;
}
}
for (local36 = 0; local36 < Static9.anInt178; local36++) {
if (Static92.aLongArray3[local36] == arg0) {
Chat.add(JagString.EMPTY, 0, JagString.concatenate(new JagString[] { LocalizedText.REMOVESOCIAL2, local34, LocalizedText.REMOVEFRIEND}));
return;
}
}
if (local34.strEquals(PlayerList.self.username)) {
Chat.add(JagString.EMPTY, 0, LocalizedText.IGNORECANTADDSELF);
return;
}
IgnoreList.encodedUsernames[Static35.anInt1093] = arg0;
Static193.aClass100Array134[Static35.anInt1093++] = Base37.decodeLowerCase(arg0);
FriendsList.transmitAt = InterfaceList.transmitTimer;
Protocol.outboundBuffer.p1isaac(34);
Protocol.outboundBuffer.p8(arg0);
}
} }

52
client/src/main/java/Static141.java
View file

@ -1,70 +1,22 @@
import org.openrs2.deob.annotation.OriginalArg; import org.openrs2.deob.annotation.OriginalArg;
import org.openrs2.deob.annotation.OriginalMember; import org.openrs2.deob.annotation.OriginalMember;
import org.openrs2.deob.annotation.Pc;
public final class Static141 { public final class Static141 {
@OriginalMember(owner = "client!lb", name = "z", descriptor = "I") @OriginalMember(owner = "client!lb", name = "z", descriptor = "I")
public static int anInt3473; public static int anInt3473;
@OriginalMember(owner = "client!lb", name = "p", descriptor = "[I") @OriginalMember(owner = "client!lb", name = "s", descriptor = "Lclient!na;")
public static final int[] anIntArray326 = new int[25];
@OriginalMember(owner = "client!lb", name = "s", descriptor = "Lclient!na;")
public static final JagString aClass100_664 = JagString.parse(":clan:"); public static final JagString aClass100_664 = JagString.parse(":clan:");
@OriginalMember(owner = "client!lb", name = "d", descriptor = "(B)V") @OriginalMember(owner = "client!lb", name = "d", descriptor = "(B)V")
public static void method2720() { public static void method2720() {
if (WorldMap.aClass100_724 != null) { if (WorldMap.aClass100_724 != null) {
Static90.method1853(WorldMap.aClass100_724); WorldMap.method1853(WorldMap.aClass100_724);
WorldMap.aClass100_724 = null; WorldMap.aClass100_724 = null;
} }
} }
@OriginalMember(owner = "client!lb", name = "a", descriptor = "(Z)V")
public static void method2721() {
Static65.method1500();
Static89.aClass3_Sub2_Sub1_5 = null;
Static107.anInt2875 = -1;
client.method3768();
Static255.cache.clear();
Static171.aClass139_1 = new Class139();
((Js5GlTextureProvider) Rasteriser.textureProvider).clear();
Static120.lightCount = 0;
Static120.lights = new Light[255];
Static237.method4120();
Static242.method4203();
Static115.clear();
WorldMap.clear(false);
TitleScreen.clear();
for (@Pc(39) int local39 = 0; local39 < 2048; local39++) {
@Pc(46) Player player = PlayerList.players[local39];
if (player != null) {
player.attachment = null;
}
}
if (GlRenderer.enabled) {
Static242.method4201();
Static76.method1642();
}
Fonts.load(client.js5Archive13, client.js5Archive8);
Sprites.load(client.js5Archive8);
Static204.aClass3_Sub2_Sub1_10 = null;
Static39.aClass3_Sub2_Sub1_1 = null;
Static92.aClass3_Sub2_Sub1_6 = null;
Static165.aClass3_Sub2_Sub1_8 = null;
Static181.aClass3_Sub2_Sub1_9 = null;
if (client.gameState == 5) {
TitleScreen.load(client.js5Archive8);
}
if (client.gameState == 10) {
Static73.method1596(false);
}
if (client.gameState == 30) {
client.setGameState(25);
}
}
@OriginalMember(owner = "client!lb", name = "a", descriptor = "(ZIIIBII)V") @OriginalMember(owner = "client!lb", name = "a", descriptor = "(ZIIIBII)V")
public static void method2722(@OriginalArg(0) boolean arg0, @OriginalArg(1) int arg1, @OriginalArg(2) int arg2, @OriginalArg(3) int arg3, @OriginalArg(5) int arg4, @OriginalArg(6) int arg5) { public static void method2722(@OriginalArg(0) boolean arg0, @OriginalArg(1) int arg1, @OriginalArg(2) int arg2, @OriginalArg(3) int arg3, @OriginalArg(5) int arg4, @OriginalArg(6) int arg5) {
Static113.anInt4612 = arg3; Static113.anInt4612 = arg3;

11
client/src/main/java/Static142.java
View file

@ -7,9 +7,6 @@ public final class Static142 {
@OriginalMember(owner = "client!lc", name = "n", descriptor = "I") @OriginalMember(owner = "client!lc", name = "n", descriptor = "I")
public static int originZ; public static int originZ;
@OriginalMember(owner = "client!lc", name = "m", descriptor = "Lclient!na;")
public static final JagString aClass100_667 = JagString.parse("settings=");
@OriginalMember(owner = "client!lc", name = "a", descriptor = "(IIIIIII)V") @OriginalMember(owner = "client!lc", name = "a", descriptor = "(IIIIIII)V")
public static void method2726(@OriginalArg(0) int arg0, @OriginalArg(1) int arg1, @OriginalArg(2) int arg2, @OriginalArg(3) int arg3, @OriginalArg(4) int arg4, @OriginalArg(5) int arg5) { public static void method2726(@OriginalArg(0) int arg0, @OriginalArg(1) int arg1, @OriginalArg(2) int arg2, @OriginalArg(3) int arg3, @OriginalArg(4) int arg4, @OriginalArg(5) int arg5) {
Static277.anInt5854 = 0; Static277.anInt5854 = 0;
@ -27,7 +24,7 @@ public final class Static142 {
} else if (PlayerList.size > local5) { } else if (PlayerList.size > local5) {
local17 = PlayerList.players[PlayerList.ids[local5]]; local17 = PlayerList.players[PlayerList.ids[local5]];
} else { } else {
local17 = Static175.npcs[Static33.anIntArray79[local5 - PlayerList.size]]; local17 = NpcList.npcs[Static33.anIntArray79[local5 - PlayerList.size]];
} }
if (local17 != null && local17.method2682()) { if (local17 != null && local17.method2682()) {
@Pc(58) NpcType local58; @Pc(58) NpcType local58;
@ -101,7 +98,7 @@ public final class Static142 {
} }
} }
} }
if (local17.chatMessage != null && (local5 >= PlayerList.size || Static59.anInt1812 == 0 || Static59.anInt1812 == 3 || Static59.anInt1812 == 1 && Static98.method1965(((Player) local17).username))) { if (local17.chatMessage != null && (local5 >= PlayerList.size || Chat.publicFilter == 0 || Chat.publicFilter == 3 || Chat.publicFilter == 1 && FriendsList.contains(((Player) local17).username))) {
Static180.method3326(arg4 >> 1, arg3, local17, arg5, local17.method2691(), arg1 >> 1); Static180.method3326(arg4 >> 1, arg3, local17, arg5, local17.method2691(), arg1 >> 1);
if (Static65.anInt1951 > -1 && Static277.anInt5854 < Static191.anInt4506) { if (Static65.anInt1951 > -1 && Static277.anInt5854 < Static191.anInt4506) {
Static191.anIntArray389[Static277.anInt5854] = Fonts.b12Full.getStringWidth(local17.chatMessage) / 2; Static191.anIntArray389[Static277.anInt5854] = Fonts.b12Full.getStringWidth(local17.chatMessage) / 2;
@ -307,8 +304,4 @@ public final class Static142 {
} }
} }
@OriginalMember(owner = "client!lc", name = "a", descriptor = "(B)I")
public static int getIdleLoops() {
return Static93.anInt2467;
}
} }

3
client/src/main/java/Static143.java
View file

@ -3,9 +3,6 @@ import org.openrs2.deob.annotation.OriginalMember;
public final class Static143 { public final class Static143 {
@OriginalMember(owner = "client!ld", name = "a", descriptor = "[I")
public static final int[] anIntArray329 = new int[] { 2, 2, 4, 0, 1, 8, 0, 0, 0, 0, 2, 0, 0, 0, 0, 0 };
@OriginalMember(owner = "client!ld", name = "b", descriptor = "[Lclient!nc;") @OriginalMember(owner = "client!ld", name = "b", descriptor = "[Lclient!nc;")
public static final Class102[] aClass102Array1 = new Class102[4]; public static final Class102[] aClass102Array1 = new Class102[4];

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

@ -7,10 +7,7 @@ public final class Static145 {
@OriginalMember(owner = "client!lf", name = "a", descriptor = "[[I") @OriginalMember(owner = "client!lf", name = "a", descriptor = "[[I")
public static final int[][] anIntArrayArray25 = new int[104][104]; public static final int[][] anIntArrayArray25 = new int[104][104];
@OriginalMember(owner = "client!lf", name = "d", descriptor = "[I") @OriginalMember(owner = "client!lf", name = "k", descriptor = "I")
public static final int[] anIntArray331 = new int[1000];
@OriginalMember(owner = "client!lf", name = "k", descriptor = "I")
public static int anInt3502 = -1; public static int anInt3502 = -1;
@OriginalMember(owner = "client!lf", name = "a", descriptor = "(I)V") @OriginalMember(owner = "client!lf", name = "a", descriptor = "(I)V")

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

@ -30,8 +30,8 @@ public final class Static146 {
Static235.anInt5276 = arg0; Static235.anInt5276 = arg0;
for (@Pc(3) int local3 = 0; local3 < Static152.mapSizeX; local3++) { for (@Pc(3) int local3 = 0; local3 < Static152.mapSizeX; local3++) {
for (@Pc(8) int local8 = 0; local8 < Static99.mapSizeZ; local8++) { for (@Pc(8) int local8 = 0; local8 < Static99.mapSizeZ; local8++) {
if (Static130.aClass3_Sub5ArrayArrayArray1[arg0][local3][local8] == null) { if (SceneGraph.tiles[arg0][local3][local8] == null) {
Static130.aClass3_Sub5ArrayArrayArray1[arg0][local3][local8] = new Tile(arg0, local3, local8); SceneGraph.tiles[arg0][local3][local8] = new Tile(arg0, local3, local8);
} }
} }
} }

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