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

Reorganized some static classes and deleted empty leftover ones

Browse source
This commit is contained in:
Pazaz 2022-06-15 14:40:14 -04:00
parent 8708007fd1
commit 53d9d9d904
55 changed files with 430 additions and 559 deletions
Download patch file Download diff file Expand all files Collapse all files

14
client/src/main/java/rt4/Camera.java
View file

@ -64,6 +64,10 @@ public class Camera {
public static int anInt5765;
@OriginalMember(owner = "client!tm", name = "g", descriptor = "I")
public static int anInt5375;
@OriginalMember(owner = "client!pa", name = "K", descriptor = "Z")
public static boolean aBoolean205 = false;
@OriginalMember(owner = "client!gk", name = "d", descriptor = "F")
public static float aFloat10;
public static double mod(double a, double b) {
return ((a % b) + b) % b;
@ -222,14 +226,14 @@ public class Camera {
anInt5224 += local27;
if (anInt5224 >= 65535) {
anInt5224 = 65535;
if (Static186.aBoolean205) {
if (aBoolean205) {
aBoolean16 = false;
} else {
aBoolean16 = true;
}
Static186.aBoolean205 = true;
aBoolean205 = true;
} else {
Static186.aBoolean205 = false;
aBoolean205 = false;
aBoolean16 = false;
}
@Pc(66) float local66 = (float) anInt5224 / 65535.0F;
@ -271,9 +275,9 @@ public class Camera {
@Pc(382) float local382 = (local226[1] - renderCoordinates[1]) * -1.0F;
@Pc(392) double local392 = Math.sqrt((double) (local371 * local371 + local363 * local363));
Static146.aFloat15 = (float) Math.atan2((double) local382, local392);
Static84.aFloat10 = -((float) Math.atan2((double) local363, (double) local371));
aFloat10 = -((float) Math.atan2((double) local363, (double) local371));
cameraPitch = (int) ((double) Static146.aFloat15 * 325.949D) & 0x7FF;
cameraYaw = (int) ((double) Static84.aFloat10 * 325.949D) & 0x7FF;
cameraYaw = (int) ((double) aFloat10 * 325.949D) & 0x7FF;
}
@OriginalMember(owner = "client!vd", name = "a", descriptor = "(IIIIBI)V")

4
client/src/main/java/rt4/ClientProt.java
View file

@ -121,7 +121,7 @@ public class ClientProt {
Protocol.outboundBuffer.p1isaac(184);
for (@Pc(18) ComponentPointer local18 = (ComponentPointer) InterfaceList.openInterfaces.head(); local18 != null; local18 = (ComponentPointer) InterfaceList.openInterfaces.next()) {
if (local18.anInt5879 == 0) {
Static132.closeInterface(true, local18);
InterfaceList.closeInterface(true, local18);
}
}
if (Static39.aClass13_10 != null) {
@ -470,7 +470,7 @@ public class ClientProt {
local41 = Static228.anInt5103 + Static40.aClass13_1.height - Static40.aClass13_14.height;
}
@Pc(109) int local109 = local41 - Static36.anInt660;
@Pc(114) int local114 = local30 - Static124.anInt3075;
@Pc(114) int local114 = local30 - Static36.anInt3075;
@Pc(122) int local122 = local30 + Static40.aClass13_1.scrollX - Static81.anInt2225;
@Pc(130) int local130 = Static40.aClass13_1.scrollY + local41 - Static228.anInt5103;
@Pc(133) int local133 = Static40.aClass13_14.dragDeadzone;

4
client/src/main/java/rt4/DisplayMode.java
View file

@ -231,13 +231,13 @@ public final class DisplayMode {
aBoolean156 = false;
}
if (InterfaceList.topLevelInterface != -1) {
Static210.method3712(true);
InterfaceList.method3712(true);
}
if (Protocol.socket != null && (client.gameState == 30 || client.gameState == 25)) {
ClientProt.method1373();
}
for (@Pc(466) int local466 = 0; local466 < 100; local466++) {
Static186.aBooleanArray100[local466] = true;
InterfaceList.aBooleanArray100[local466] = true;
}
GameShell.fullRedraw = true;
}

2
client/src/main/java/rt4/GameShell.java
View file

@ -217,7 +217,7 @@ public abstract class GameShell extends Applet implements Runnable, FocusListene
canvas.setLocation(leftMargin, topMargin);
}
if (InterfaceList.topLevelInterface != -1) {
Static210.method3712(true);
InterfaceList.method3712(true);
}
Static139.method2704();
}

129
client/src/main/java/rt4/InterfaceList.java
View file

@ -23,6 +23,8 @@ public class InterfaceList {
public static final int[] rectangleWidth = new int[100];
@OriginalMember(owner = "client!fe", name = "lb", descriptor = "[I")
public static final int[] rectangleHeight = new int[100];
@OriginalMember(owner = "client!pa", name = "R", descriptor = "[Z")
public static final boolean[] aBooleanArray100 = new boolean[100];
@OriginalMember(owner = "client!bn", name = "V", descriptor = "I")
public static int rectangles = 0;
@OriginalMember(owner = "client!md", name = "W", descriptor = "I")
@ -183,7 +185,7 @@ public class InterfaceList {
@OriginalMember(owner = "client!dg", name = "a", descriptor = "(ILclient!be;)V")
public static void redraw(@OriginalArg(1) Component arg0) {
if (Static182.anInt4311 == arg0.rectangleLoop) {
Static186.aBooleanArray100[arg0.rectangle] = true;
aBooleanArray100[arg0.rectangle] = true;
}
}
@ -209,4 +211,129 @@ public class InterfaceList {
return local7.createdComponents[arg1];
}
}
@OriginalMember(owner = "client!gg", name = "e", descriptor = "(II)V")
public static void method1753(@OriginalArg(0) int arg0) {
if (!load(arg0)) {
return;
}
@Pc(15) Component[] local15 = components[arg0];
for (@Pc(17) int local17 = 0; local17 < local15.length; local17++) {
@Pc(29) Component local29 = local15[local17];
if (local29 != null) {
local29.anInt496 = 1;
local29.anInt510 = 0;
local29.anInt500 = 0;
}
}
}
@OriginalMember(owner = "client!rb", name = "a", descriptor = "(ZB)V")
public static void method3712(@OriginalArg(0) boolean arg0) {
method4017(GameShell.canvasHeight, arg0, topLevelInterface, GameShell.canvasWidth);
}
@OriginalMember(owner = "client!ta", name = "a", descriptor = "(IZIII)V")
public static void method4017(@OriginalArg(0) int arg0, @OriginalArg(1) boolean arg1, @OriginalArg(3) int arg2, @OriginalArg(4) int arg3) {
if (load(arg2)) {
method4190(-1, arg1, arg3, arg0, components[arg2]);
}
}
@OriginalMember(owner = "client!bg", name = "a", descriptor = "(Lclient!be;ZI)V")
public static void method531(@OriginalArg(0) Component arg0, @OriginalArg(1) boolean arg1) {
@Pc(20) int local20 = arg0.scrollMaxH == 0 ? arg0.width : arg0.scrollMaxH;
@Pc(32) int local32 = arg0.scrollMaxV == 0 ? arg0.height : arg0.scrollMaxV;
method4190(arg0.id, arg1, local20, local32, components[arg0.id >> 16]);
if (arg0.createdComponents != null) {
method4190(arg0.id, arg1, local20, local32, arg0.createdComponents);
}
@Pc(66) ComponentPointer local66 = (ComponentPointer) openInterfaces.get((long) arg0.id);
if (local66 != null) {
method4017(local32, arg1, local66.anInt5878, local20);
}
}
@OriginalMember(owner = "client!vk", name = "a", descriptor = "(IZIII[Lclient!be;)V")
public static void method4190(@OriginalArg(0) int arg0, @OriginalArg(1) boolean arg1, @OriginalArg(2) int arg2, @OriginalArg(4) int arg3, @OriginalArg(5) Component[] arg4) {
for (@Pc(3) int local3 = 0; local3 < arg4.length; local3++) {
@Pc(19) Component local19 = arg4[local3];
if (local19 != null && local19.layer == arg0) {
Static150.method2801(arg3, arg2, local19, arg1);
Static111.method2291(local19, arg3, arg2);
if (local19.scrollMaxH - local19.width < local19.scrollX) {
local19.scrollX = local19.scrollMaxH - local19.width;
}
if (local19.scrollY > local19.scrollMaxV - local19.height) {
local19.scrollY = local19.scrollMaxV - local19.height;
}
if (local19.scrollY < 0) {
local19.scrollY = 0;
}
if (local19.scrollX < 0) {
local19.scrollX = 0;
}
if (local19.type == 0) {
method531(local19, arg1);
}
}
}
}
@OriginalMember(owner = "client!fn", name = "c", descriptor = "(II)V")
public static void method1626(@OriginalArg(0) int arg0) {
if (arg0 == -1 || !load(arg0)) {
return;
}
@Pc(31) Component[] local31 = components[arg0];
for (@Pc(33) int local33 = 0; local33 < local31.length; local33++) {
@Pc(41) Component local41 = local31[local33];
if (local41.anObjectArray3 != null) {
@Pc(50) HookRequest local50 = new HookRequest();
local50.arguments = local41.anObjectArray3;
local50.source = local41;
ScriptRunner.run(2000000, local50);
}
}
}
@OriginalMember(owner = "client!ke", name = "a", descriptor = "(ZLclient!wk;Z)V")
public static void closeInterface(@OriginalArg(0) boolean arg0, @OriginalArg(1) ComponentPointer arg1) {
@Pc(9) int local9 = (int) arg1.key;
@Pc(16) int local16 = arg1.anInt5878;
arg1.unlink();
if (arg0) {
method2275(local16);
}
Static132.method3214(local16);
@Pc(32) Component local32 = getComponent(local9);
if (local32 != null) {
redraw(local32);
}
@Pc(41) int local41 = MiniMenu.size;
@Pc(43) int local43;
for (local43 = 0; local43 < local41; local43++) {
if (Static2.method5(MiniMenu.actions[local43])) {
MiniMenu.remove(local43);
}
}
if (MiniMenu.size == 1) {
Static40.aBoolean108 = false;
Static133.method4012(Static183.anInt4271, Static24.anInt761, Static229.anInt5138, Static13.anInt436);
} else {
Static133.method4012(Static183.anInt4271, Static24.anInt761, Static229.anInt5138, Static13.anInt436);
local43 = Fonts.b12Full.getStringWidth(LocalizedText.CHOOSE_OPTION);
for (@Pc(75) int local75 = 0; local75 < MiniMenu.size; local75++) {
@Pc(88) int local88 = Fonts.b12Full.getStringWidth(MiniMenu.getOp(local75));
if (local43 < local88) {
local43 = local88;
}
}
Static13.anInt436 = MiniMenu.size * 15 + (Static40.aBoolean298 ? 26 : 22);
Static24.anInt761 = local43 + 8;
}
if (topLevelInterface != -1) {
Static54.runScripts(1, topLevelInterface);
}
}
}

2
client/src/main/java/rt4/LoginManager.java
View file

@ -805,7 +805,7 @@ public class LoginManager {
Camera.cameraType = 1;
client.setGameState(30);
for (local35 = 0; local35 < 100; local35++) {
Static186.aBooleanArray100[local35] = true;
InterfaceList.aBooleanArray100[local35] = true;
}
ClientProt.method1373();
}

71
client/src/main/java/rt4/MidiPlayer.java
View file

@ -27,13 +27,19 @@ public class MidiPlayer {
public static Js5 aClass153_32;
@OriginalMember(owner = "client!le", name = "c", descriptor = "Lclient!rf;")
public static Song aClass3_Sub29_1;
@OriginalMember(owner = "client!nj", name = "g", descriptor = "Lclient!ve;")
public static Js5 aClass153_70;
@OriginalMember(owner = "client!nj", name = "e", descriptor = "Lclient!va;")
public static MidiPcmStream midiPcmStream;
@OriginalMember(owner = "client!sf", name = "j", descriptor = "I")
public static int anInt5085;
@OriginalMember(owner = "client!km", name = "c", descriptor = "(Z)Z")
public static boolean method2699() {
try {
if (anInt441 == 2) {
if (aClass3_Sub29_1 == null) {
aClass3_Sub29_1 = Song.create(Static172.aClass153_70, anInt5853, Static226.anInt5085);
aClass3_Sub29_1 = Song.create(aClass153_70, anInt5853, anInt5085);
if (aClass3_Sub29_1 == null) {
return false;
}
@ -41,21 +47,21 @@ public class MidiPlayer {
if (aClass89_1 == null) {
aClass89_1 = new SoundBank(aClass153_32, aClass153_103);
}
if (Static172.midiPcmStream.method4411(aClass3_Sub29_1, aClass153_87, aClass89_1)) {
Static172.midiPcmStream.method4412();
Static172.midiPcmStream.method4447(anInt5527);
Static172.midiPcmStream.method4431(aBoolean116, aClass3_Sub29_1);
if (midiPcmStream.method4411(aClass3_Sub29_1, aClass153_87, aClass89_1)) {
midiPcmStream.method4412();
midiPcmStream.method4447(anInt5527);
midiPcmStream.method4431(aBoolean116, aClass3_Sub29_1);
anInt441 = 0;
aClass3_Sub29_1 = null;
aClass89_1 = null;
Static172.aClass153_70 = null;
aClass153_70 = null;
return true;
}
}
} catch (@Pc(68) Exception local68) {
local68.printStackTrace();
Static172.midiPcmStream.method4446();
Static172.aClass153_70 = null;
midiPcmStream.method4446();
aClass153_70 = null;
aClass3_Sub29_1 = null;
anInt441 = 0;
aClass89_1 = null;
@ -66,18 +72,18 @@ public class MidiPlayer {
@OriginalMember(owner = "client!ce", name = "a", descriptor = "(II)V")
public static void method801() {
anInt5527 = 0;
Static226.anInt5085 = -1;
anInt5085 = -1;
anInt441 = 1;
anInt1757 = 2;
aBoolean116 = false;
Static172.aClass153_70 = null;
aClass153_70 = null;
anInt5853 = -1;
}
@OriginalMember(owner = "client!v", name = "a", descriptor = "(ZIILclient!ve;ZII)V")
public static void playFadeOut(@OriginalArg(1) int arg0, @OriginalArg(3) Js5 arg1, @OriginalArg(5) int arg2) {
Static172.aClass153_70 = arg1;
Static226.anInt5085 = 0;
aClass153_70 = arg1;
anInt5085 = 0;
anInt5853 = arg0;
aBoolean116 = false;
anInt441 = 1;
@ -90,7 +96,7 @@ public class MidiPlayer {
aClass153_87 = arg1;
aClass153_32 = arg3;
aClass153_103 = arg2;
Static172.midiPcmStream = arg0;
midiPcmStream = arg0;
return true;
}
@ -98,20 +104,20 @@ public class MidiPlayer {
public static void loop() {
try {
if (anInt441 == 1) {
@Pc(16) int local16 = Static172.midiPcmStream.method4440();
if (local16 > 0 && Static172.midiPcmStream.method4414()) {
@Pc(16) int local16 = midiPcmStream.method4440();
if (local16 > 0 && midiPcmStream.method4414()) {
local16 -= anInt1757;
if (local16 < 0) {
local16 = 0;
}
Static172.midiPcmStream.method4447(local16);
midiPcmStream.method4447(local16);
return;
}
Static172.midiPcmStream.method4446();
Static172.midiPcmStream.method4426();
midiPcmStream.method4446();
midiPcmStream.method4426();
aClass3_Sub29_1 = null;
aClass89_1 = null;
if (Static172.aClass153_70 == null) {
if (aClass153_70 == null) {
anInt441 = 0;
} else {
anInt441 = 2;
@ -119,11 +125,34 @@ public class MidiPlayer {
}
} catch (@Pc(62) Exception local62) {
local62.printStackTrace();
Static172.midiPcmStream.method4446();
Static172.aClass153_70 = null;
midiPcmStream.method4446();
aClass153_70 = null;
aClass3_Sub29_1 = null;
anInt441 = 0;
aClass89_1 = null;
}
}
@OriginalMember(owner = "client!kk", name = "a", descriptor = "(I)Z")
public static boolean method2655() {
return anInt441 != 0 || midiPcmStream.method4414();
}
@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) {
aClass153_70 = arg0;
anInt441 = 1;
anInt5527 = arg2;
anInt5085 = 0;
anInt5853 = arg1;
aBoolean116 = false;
anInt1757 = 10000;
}
@OriginalMember(owner = "client!th", name = "a", descriptor = "(Z)V")
public static void method4548() {
midiPcmStream.method4446();
anInt441 = 1;
aClass153_70 = null;
}
}

8
client/src/main/java/rt4/MiniMenu.java
View file

@ -113,6 +113,10 @@ public class MiniMenu {
public static int anInt5393;
@OriginalMember(owner = "client!uf", name = "t", descriptor = "I")
public static int anInt5444 = 0;
@OriginalMember(owner = "client!pk", name = "bb", descriptor = "Lclient!na;")
public static JagString walkText;
@OriginalMember(owner = "client!jl", name = "v", descriptor = "I")
public static int anInt3096 = 0;
@OriginalMember(owner = "client!va", name = "a", descriptor = "(IZILclient!be;)V")
public static void addComponentEntries(@OriginalArg(0) int arg0, @OriginalArg(2) int arg1, @OriginalArg(3) Component component) {
@ -810,7 +814,7 @@ public class MiniMenu {
}
if (local23 == 11) {
if (local36 == 0) {
Static125.anInt3096 = 1;
anInt3096 = 1;
method3556(Player.level, local15, local19);
} else if (local36 == 1) {
Protocol.outboundBuffer.p1isaac(131);
@ -1086,7 +1090,7 @@ public class MiniMenu {
if (client.game == 1) {
add(-1, 0L, JagString.EMPTY, local33, (short) 36, LocalizedText.FACEHERE, x);
}
add(-1, 0L, JagString.EMPTY, local33, (short) 60, Static195.walkText, x);
add(-1, 0L, JagString.EMPTY, local33, (short) 60, walkText, x);
}
}
@Pc(112) long local112 = -1L;

6
client/src/main/java/rt4/MusicPlayer.java
View file

@ -12,8 +12,8 @@ public class MusicPlayer {
@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.method4548();
} else if (arg0 != -1 && (groupId != arg0 || !MidiPlayer.method2655()) && Preferences.musicVolume != 0 && !MidiPlayer.jingle) {
MidiPlayer.playFadeOut(arg0, client.js5Archive6, Preferences.musicVolume);
}
groupId = arg0;
@ -22,7 +22,7 @@ public class MusicPlayer {
@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.method2410(client.js5Archive11, arg1, Preferences.musicVolume);
MidiPlayer.jingle = true;
}
}

6
client/src/main/java/rt4/PlayerAppearance.java
View file

@ -82,6 +82,12 @@ public final class PlayerAppearance {
aClass99_21.clean(5);
}
@OriginalMember(owner = "client!ph", name = "b", descriptor = "(B)V")
public static void method3474() {
aClass99_33.method3103();
aClass99_21.method3103();
}
@OriginalMember(owner = "client!hh", name = "a", descriptor = "(IIIILclient!tk;III)Lclient!ak;")
public final Model method1946(@OriginalArg(0) int arg0, @OriginalArg(1) int arg1, @OriginalArg(2) int arg2, @OriginalArg(3) int arg3, @OriginalArg(4) SeqType arg4, @OriginalArg(5) int arg5, @OriginalArg(6) int arg6) {
@Pc(24) long local24 = (long) arg2 | (long) (arg6 << 16) | (long) arg1 << 32;

98
client/src/main/java/rt4/Protocol.java
View file

@ -63,16 +63,16 @@ public class Protocol {
int local23 = local15 >> 2;
int local27 = Loc.LAYERS[local23];
int local31 = inboundBuffer.g1();
int local39 = (local31 >> 4 & 0x7) + Static115.currentChunkX;
int local45 = (local31 & 0x7) + Static180.currentChunkZ;
int local39 = (local31 >> 4 & 0x7) + SceneGraph.currentChunkX;
int local45 = (local31 & 0x7) + SceneGraph.currentChunkZ;
if (local39 >= 0 && local45 >= 0 && local39 < 104 && local45 < 104) {
ChangeLocRequest.push(Player.level, local45, local19, local39, -1, -1, local27, local23, 0);
}
} else if (opcode == ServerProt.LOCATION_PACKET_33) {
int local15 = inboundBuffer.ig2();
int local23 = inboundBuffer.g1();
int local27 = (local23 & 0x7) + Static180.currentChunkZ;
int local19 = (local23 >> 4 & 0x7) + Static115.currentChunkX;
int local27 = (local23 & 0x7) + SceneGraph.currentChunkZ;
int local19 = (local23 >> 4 & 0x7) + SceneGraph.currentChunkX;
int local31 = inboundBuffer.g2add();
if (local19 >= 0 && local27 >= 0 && local19 < 104 && local27 < 104) {
@Pc(122) ObjStack local122 = new ObjStack();
@ -86,8 +86,8 @@ public class Protocol {
}
} else if (opcode == ServerProt.LOCATION_PACKET_121) {
int local15 = inboundBuffer.g1();
int local23 = Static115.currentChunkX * 2 + (local15 >> 4 & 0xF);
int local19 = (local15 & 0xF) + Static180.currentChunkZ * 2;
int local23 = SceneGraph.currentChunkX * 2 + (local15 >> 4 & 0xF);
int local19 = (local15 & 0xF) + SceneGraph.currentChunkZ * 2;
int local27 = local23 + inboundBuffer.g1b();
int local31 = inboundBuffer.g1b() + local19;
int local39 = inboundBuffer.g2b();
@ -112,8 +112,8 @@ public class Protocol {
}
} else if (opcode == ServerProt.LOCATION_PACKET_17) {
int local15 = inboundBuffer.g1();
int local23 = Static115.currentChunkX + (local15 >> 4 & 0x7);
int local19 = Static180.currentChunkZ + (local15 & 0x7);
int local23 = SceneGraph.currentChunkX + (local15 >> 4 & 0x7);
int local19 = SceneGraph.currentChunkZ + (local15 & 0x7);
int local27 = inboundBuffer.g2();
int local31 = inboundBuffer.g1();
int local39 = inboundBuffer.g2();
@ -129,16 +129,16 @@ public class Protocol {
int local19 = local15 & 0x3;
int local27 = Loc.LAYERS[local23];
int local31 = inboundBuffer.g1();
int local39 = Static115.currentChunkX + (local31 >> 4 & 0x7);
int local45 = (local31 & 0x7) + Static180.currentChunkZ;
int local39 = SceneGraph.currentChunkX + (local31 >> 4 & 0x7);
int local45 = (local31 & 0x7) + SceneGraph.currentChunkZ;
int local218 = inboundBuffer.g2add();
if (local39 >= 0 && local45 >= 0 && local39 < 104 && local45 < 104) {
ChangeLocRequest.push(Player.level, local45, local19, local39, -1, local218, local27, local23, 0);
}
} else if (opcode == ServerProt.LOCATION_PACKET_20) {
int local15 = inboundBuffer.g1sub();
int local23 = (local15 >> 4 & 0x7) + Static115.currentChunkX;
int local19 = Static180.currentChunkZ + (local15 & 0x7);
int local23 = (local15 >> 4 & 0x7) + SceneGraph.currentChunkX;
int local19 = SceneGraph.currentChunkZ + (local15 & 0x7);
int local27 = inboundBuffer.g1sub();
int local31 = local27 >> 2;
int local39 = local27 & 0x3;
@ -153,8 +153,8 @@ public class Protocol {
int local23 = local15 >> 2;
int local19 = local15 & 0x3;
int local27 = inboundBuffer.g1();
int local31 = (local27 >> 4 & 0x7) + Static115.currentChunkX;
int local39 = (local27 & 0x7) + Static180.currentChunkZ;
int local31 = (local27 >> 4 & 0x7) + SceneGraph.currentChunkX;
int local39 = (local27 & 0x7) + SceneGraph.currentChunkZ;
@Pc(605) byte local605 = inboundBuffer.g1badd();
@Pc(609) byte local609 = inboundBuffer.g1badd();
@Pc(613) byte local613 = inboundBuffer.g1bsub();
@ -168,8 +168,8 @@ public class Protocol {
}
} else if (opcode == ServerProt.LOCATION_PACKET_14) {
int local15 = inboundBuffer.g1();
int local19 = Static180.currentChunkZ + (local15 & 0x7);
int local23 = (local15 >> 4 & 0x7) + Static115.currentChunkX;
int local19 = SceneGraph.currentChunkZ + (local15 & 0x7);
int local23 = (local15 >> 4 & 0x7) + SceneGraph.currentChunkX;
int local27 = inboundBuffer.g2();
int local31 = inboundBuffer.g2();
int local39 = inboundBuffer.g2();
@ -189,8 +189,8 @@ public class Protocol {
} else if (opcode == ServerProt.LOCATION_PACKET_135) {
int local15 = inboundBuffer.ig2add();
int local23 = inboundBuffer.g1neg();
int local27 = Static180.currentChunkZ + (local23 & 0x7);
int local19 = (local23 >> 4 & 0x7) + Static115.currentChunkX;
int local27 = SceneGraph.currentChunkZ + (local23 & 0x7);
int local19 = (local23 >> 4 & 0x7) + SceneGraph.currentChunkX;
int local31 = inboundBuffer.ig2();
int local39 = inboundBuffer.ig2();
if (local19 >= 0 && local27 >= 0 && local19 < 104 && local27 < 104 && PlayerList.selfId != local15) {
@ -205,8 +205,8 @@ public class Protocol {
}
} else if (opcode == ServerProt.LOCATION_PACKET_16) {
int local15 = inboundBuffer.g1();
int local23 = Static115.currentChunkX + (local15 >> 4 & 0x7);
int local19 = (local15 & 0x7) + Static180.currentChunkZ;
int local23 = SceneGraph.currentChunkX + (local15 >> 4 & 0x7);
int local19 = (local15 & 0x7) + SceneGraph.currentChunkZ;
int local27 = local23 + inboundBuffer.g1b();
int local31 = inboundBuffer.g1b() + local19;
int local39 = inboundBuffer.g2b();
@ -231,8 +231,8 @@ public class Protocol {
}
} else if (opcode == ServerProt.LOCATION_PACKET_104) {
int local15 = inboundBuffer.g1();
int local19 = Static180.currentChunkZ * 2 + (local15 & 0xF);
int local23 = Static115.currentChunkX * 2 + (local15 >> 4 & 0xF);
int local19 = SceneGraph.currentChunkZ * 2 + (local15 & 0xF);
int local23 = SceneGraph.currentChunkX * 2 + (local15 >> 4 & 0xF);
int local27 = inboundBuffer.g1b() + local23;
int local31 = inboundBuffer.g1b() + local19;
int local39 = inboundBuffer.g2b();
@ -293,8 +293,8 @@ public class Protocol {
}
} else if (opcode == ServerProt.LOCATION_PACKET_97) {
int local15 = inboundBuffer.g1();
int local23 = Static115.currentChunkX + (local15 >> 4 & 0x7);
int local19 = Static180.currentChunkZ + (local15 & 0x7);
int local23 = SceneGraph.currentChunkX + (local15 >> 4 & 0x7);
int local19 = SceneGraph.currentChunkZ + (local15 & 0x7);
int local27 = inboundBuffer.g2();
if (local27 == 65535) {
local27 = -1;
@ -316,8 +316,8 @@ public class Protocol {
}
} else if (opcode == ServerProt.LOCATION_PACKET_240) {
int local15 = inboundBuffer.g1sub();
int local19 = Static180.currentChunkZ + (local15 & 0x7);
int local23 = (local15 >> 4 & 0x7) + Static115.currentChunkX;
int local19 = SceneGraph.currentChunkZ + (local15 & 0x7);
int local23 = (local15 >> 4 & 0x7) + SceneGraph.currentChunkX;
int local27 = inboundBuffer.g2();
if (local23 >= 0 && local19 >= 0 && local23 < 104 && local19 < 104) {
@Pc(1565) LinkedList local1565 = SceneGraph.objStacks[Player.level][local23][local19];
@ -1020,8 +1020,8 @@ public class Protocol {
opcode = -1;
return true;
} else if (opcode == ServerProt.BATCH_LOCATION_PACKET) {
Static180.currentChunkZ = inboundBuffer.g1add();
Static115.currentChunkX = inboundBuffer.g1sub();
SceneGraph.currentChunkZ = inboundBuffer.g1add();
SceneGraph.currentChunkX = inboundBuffer.g1sub();
while (length > inboundBuffer.offset) {
opcode = inboundBuffer.g1();
readLocationPacket();
@ -1206,11 +1206,11 @@ public class Protocol {
WorldMap.reset();
}
InterfaceList.topLevelInterface = parent;
Static81.method1753(parent);
Static210.method3712(false);
Static74.method1626(InterfaceList.topLevelInterface);
InterfaceList.method1753(parent);
InterfaceList.method3712(false);
InterfaceList.method1626(InterfaceList.topLevelInterface);
for (int i = 0; i < 100; i++) {
Static186.aBooleanArray100[i] = true;
InterfaceList.aBooleanArray100[i] = true;
}
opcode = -1;
return true;
@ -1406,7 +1406,7 @@ public class Protocol {
setVerifyId(tracknum);
@Pc(2441) ComponentPointer pointer = (ComponentPointer) InterfaceList.openInterfaces.get(id);
if (pointer != null) {
Static132.closeInterface(true, pointer);
InterfaceList.closeInterface(true, pointer);
}
if (Static39.aClass13_10 != null) {
InterfaceList.redraw(Static39.aClass13_10);
@ -1439,10 +1439,10 @@ public class Protocol {
opcode = -1;
return true;
} else if (opcode == ServerProt.CLEAR_GROUND_ITEMS) {
Static115.currentChunkX = inboundBuffer.g1();
Static180.currentChunkZ = inboundBuffer.g1neg();
for (int x = Static115.currentChunkX; x < Static115.currentChunkX + 8; x++) {
for (int z = Static180.currentChunkZ; z < Static180.currentChunkZ + 8; z++) {
SceneGraph.currentChunkX = inboundBuffer.g1();
SceneGraph.currentChunkZ = inboundBuffer.g1neg();
for (int x = SceneGraph.currentChunkX; x < SceneGraph.currentChunkX + 8; x++) {
for (int z = SceneGraph.currentChunkZ; z < SceneGraph.currentChunkZ + 8; z++) {
if (SceneGraph.objStacks[Player.level][x][z] != null) {
SceneGraph.objStacks[Player.level][x][z] = null;
Static220.spawnGroundObject(z, x);
@ -1450,7 +1450,7 @@ public class Protocol {
}
}
for (@Pc(2604) ChangeLocRequest loc = (ChangeLocRequest) ChangeLocRequest.queue.head(); loc != null; loc = (ChangeLocRequest) ChangeLocRequest.queue.next()) {
if (loc.x >= Static115.currentChunkX && Static115.currentChunkX + 8 > loc.x && loc.z >= Static180.currentChunkZ && loc.z < Static180.currentChunkZ + 8 && loc.level == Player.level) {
if (loc.x >= SceneGraph.currentChunkX && SceneGraph.currentChunkX + 8 > loc.x && loc.z >= SceneGraph.currentChunkZ && loc.z < SceneGraph.currentChunkZ + 8 && loc.level == Player.level) {
loc.resetLoops = 0;
}
}
@ -1566,9 +1566,9 @@ public class Protocol {
return true;
} else if (opcode == ServerProt.SET_WALK_TEXT) {
if (length == 0) {
Static195.walkText = LocalizedText.WALKHERE;
MiniMenu.walkText = LocalizedText.WALKHERE;
} else {
Static195.walkText = inboundBuffer.gjstr();
MiniMenu.walkText = inboundBuffer.gjstr();
}
opcode = -1;
return true;
@ -1646,7 +1646,7 @@ public class Protocol {
@Pc(3449) ComponentPointer src = (ComponentPointer) InterfaceList.openInterfaces.get(source);
ComponentPointer tgt = (ComponentPointer) InterfaceList.openInterfaces.get(target);
if (tgt != null) {
Static132.closeInterface(src == null || tgt.anInt5878 != src.anInt5878, tgt);
InterfaceList.closeInterface(src == null || tgt.anInt5878 != src.anInt5878, tgt);
}
if (src != null) {
src.unlink();
@ -1659,7 +1659,7 @@ public class Protocol {
component = InterfaceList.getComponent(target);
if (component != null) {
InterfaceList.redraw(component);
Static17.method531(component, true);
InterfaceList.method531(component, true);
}
if (InterfaceList.topLevelInterface != -1) {
Static54.runScripts(1, InterfaceList.topLevelInterface);
@ -1786,7 +1786,7 @@ public class Protocol {
setVerifyId(tracknum);
ComponentPointer ptr = (ComponentPointer) InterfaceList.openInterfaces.get(pointer);
if (ptr != null) {
Static132.closeInterface(ptr.anInt5878 != component, ptr);
InterfaceList.closeInterface(ptr.anInt5878 != component, ptr);
}
Static44.method1148(component, pointer, type);
opcode = -1;
@ -2264,8 +2264,8 @@ public class Protocol {
opcode = -1;
return true;
} else if (opcode == ServerProt.UPDATE_CURRENT_LOCATION) {
Static115.currentChunkX = inboundBuffer.g1neg();
Static180.currentChunkZ = inboundBuffer.g1();
SceneGraph.currentChunkX = inboundBuffer.g1neg();
SceneGraph.currentChunkZ = inboundBuffer.g1();
opcode = -1;
return true;
} else if (opcode == ServerProt.MIDI_SONG) {
@ -2748,8 +2748,8 @@ public class Protocol {
Cheat.teleport(Camera.originX + MiniMenu.anInt1742, Camera.originZ - -MiniMenu.anInt2954, Player.level);
}
Static187.anInt4422 = 0;
Static125.anInt3096 = 0;
} else if (Static125.anInt3096 == 2) {
MiniMenu.anInt3096 = 0;
} else if (MiniMenu.anInt3096 == 2) {
if (MiniMenu.anInt1742 != -1) {
outboundBuffer.p1isaac(131);
outboundBuffer.mp4(MiniMenu.anInt2512);
@ -2761,7 +2761,7 @@ public class Protocol {
Cross.y = Mouse.clickY;
Cross.x = Mouse.clickX;
}
Static125.anInt3096 = 0;
MiniMenu.anInt3096 = 0;
} else if (Static187.anInt4422 == 2) {
if (MiniMenu.anInt1742 != -1) {
outboundBuffer.p1isaac(179);
@ -2773,7 +2773,7 @@ public class Protocol {
Cross.y = Mouse.clickY;
}
Static187.anInt4422 = 0;
} else if (MiniMenu.anInt1742 != -1 && Static125.anInt3096 == 0 && Static187.anInt4422 == 0) {
} else if (MiniMenu.anInt1742 != -1 && MiniMenu.anInt3096 == 0 && Static187.anInt4422 == 0) {
@Pc(1871) boolean local1871 = PathFinder.findPath(PlayerList.self.movementQueueZ[0], 0, 0, true, 0, MiniMenu.anInt1742, 0, 0, 0, MiniMenu.anInt2954, PlayerList.self.movementQueueX[0]);
if (local1871) {
Cross.y = Mouse.clickY;

4
client/src/main/java/rt4/SceneGraph.java
View file

@ -84,6 +84,10 @@ public class SceneGraph {
public static boolean[][] aBooleanArrayArray1;
@OriginalMember(owner = "client!ha", name = "k", descriptor = "[[Z")
public static boolean[][] aBooleanArrayArray3;
@OriginalMember(owner = "client!og", name = "b", descriptor = "I")
public static int currentChunkZ;
@OriginalMember(owner = "client!ja", name = "q", descriptor = "I")
public static int currentChunkX;
@OriginalMember(owner = "client!km", name = "f", descriptor = "(I)Z")
public static boolean allLevelsAreVisible() {

10
client/src/main/java/rt4/ScriptRunner.java
View file

@ -1003,7 +1003,7 @@ public final class ScriptRunner {
component.scrollMaxV = intStack[isp + 1];
InterfaceList.redraw(component);
if (component.type == 0) {
Static17.method531(component, false);
InterfaceList.method531(component, false);
}
continue;
}
@ -3746,10 +3746,10 @@ public final class ScriptRunner {
}
if (int1 != Preferences.musicVolume) {
if (Preferences.musicVolume == 0 && MusicPlayer.groupId != -1) {
Static122.method2410(client.js5Archive6, MusicPlayer.groupId, int1);
MidiPlayer.method2410(client.js5Archive6, MusicPlayer.groupId, int1);
MidiPlayer.jingle = false;
} else if (int1 == 0) {
Static241.method4548();
MidiPlayer.method4548();
MidiPlayer.jingle = false;
} else {
Static230.method3956(int1);
@ -4432,7 +4432,7 @@ public final class ScriptRunner {
InterfaceList.redraw(component);
Static74.update(component);
if (component.type == 0) {
Static17.method531(component, false);
InterfaceList.method531(component, false);
}
continue;
}
@ -4455,7 +4455,7 @@ public final class ScriptRunner {
InterfaceList.redraw(component);
Static74.update(component);
if (component.type == 0) {
Static17.method531(component, false);
InterfaceList.method531(component, false);
}
continue;
}

6
client/src/main/java/rt4/SoundPlayer.java
View file

@ -123,12 +123,12 @@ public class SoundPlayer {
local5--;
}
}
if (MidiPlayer.jingle && !Static136.method2655()) {
if (MidiPlayer.jingle && !MidiPlayer.method2655()) {
if (Preferences.musicVolume != 0 && MusicPlayer.groupId != -1) {
Static122.method2410(client.js5Archive6, MusicPlayer.groupId, Preferences.musicVolume);
MidiPlayer.method2410(client.js5Archive6, MusicPlayer.groupId, Preferences.musicVolume);
}
MidiPlayer.jingle = false;
} else if (Preferences.musicVolume != 0 && MusicPlayer.groupId != -1 && !Static136.method2655()) {
} else if (Preferences.musicVolume != 0 && MusicPlayer.groupId != -1 && !MidiPlayer.method2655()) {
Protocol.outboundBuffer.p1isaac(137);
Protocol.outboundBuffer.p4(MusicPlayer.groupId);
MusicPlayer.groupId = -1;

3
client/src/main/java/rt4/Static115.java
View file

@ -6,9 +6,6 @@ import org.openrs2.deob.annotation.Pc;
public final class Static115 {
@OriginalMember(owner = "client!ja", name = "q", descriptor = "I")
public static int currentChunkX;
@OriginalMember(owner = "client!ja", name = "f", descriptor = "Lclient!ih;")
public static final LinkedList mediumPriorityRequests = new LinkedList();

5
client/src/main/java/rt4/Static116.java
View file

@ -1,5 +0,0 @@
package rt4;
public final class Static116 {
}

19
client/src/main/java/rt4/Static122.java
View file

@ -1,19 +0,0 @@
package rt4;
import org.openrs2.deob.annotation.OriginalArg;
import org.openrs2.deob.annotation.OriginalMember;
public final class Static122 {
@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) {
Static172.aClass153_70 = arg0;
MidiPlayer.anInt441 = 1;
MidiPlayer.anInt5527 = arg2;
Static226.anInt5085 = 0;
MidiPlayer.anInt5853 = arg1;
MidiPlayer.aBoolean116 = false;
MidiPlayer.anInt1757 = 10000;
}
}

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

@ -1,10 +0,0 @@
package rt4;
import org.openrs2.deob.annotation.OriginalMember;
public final class Static124 {
@OriginalMember(owner = "client!jk", name = "p", descriptor = "I")
public static int anInt3075 = -1;
}

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

@ -1,10 +0,0 @@
package rt4;
import org.openrs2.deob.annotation.OriginalMember;
public final class Static125 {
@OriginalMember(owner = "client!jl", name = "v", descriptor = "I")
public static int anInt3096 = 0;
}

6
client/src/main/java/rt4/Static126.java
View file

@ -11,11 +11,11 @@ public final class Static126 {
Static96.method1949(InterfaceList.topLevelInterface);
}
for (@Pc(15) int local15 = 0; local15 < InterfaceList.rectangles; local15++) {
if (Static186.aBooleanArray100[local15]) {
if (InterfaceList.aBooleanArray100[local15]) {
InterfaceList.rectangleRedraw[local15] = true;
}
Static223.aBooleanArray116[local15] = Static186.aBooleanArray100[local15];
Static186.aBooleanArray100[local15] = false;
Static223.aBooleanArray116[local15] = InterfaceList.aBooleanArray100[local15];
InterfaceList.aBooleanArray100[local15] = false;
}
Static97.anInt2503 = -1;
Static169.mouseOverInventoryInterface = null;

40
client/src/main/java/rt4/Static132.java
View file

@ -9,46 +9,6 @@ public final class Static132 {
@OriginalMember(owner = "client!ke", name = "U", descriptor = "I")
public static int anInt3291 = 0;
@OriginalMember(owner = "client!ke", name = "a", descriptor = "(ZLclient!wk;Z)V")
public static void closeInterface(@OriginalArg(0) boolean arg0, @OriginalArg(1) ComponentPointer arg1) {
@Pc(9) int local9 = (int) arg1.key;
@Pc(16) int local16 = arg1.anInt5878;
arg1.unlink();
if (arg0) {
InterfaceList.method2275(local16);
}
method3214(local16);
@Pc(32) Component local32 = InterfaceList.getComponent(local9);
if (local32 != null) {
InterfaceList.redraw(local32);
}
@Pc(41) int local41 = MiniMenu.size;
@Pc(43) int local43;
for (local43 = 0; local43 < local41; local43++) {
if (Static2.method5(MiniMenu.actions[local43])) {
MiniMenu.remove(local43);
}
}
if (MiniMenu.size == 1) {
Static40.aBoolean108 = false;
Static133.method4012(Static183.anInt4271, Static24.anInt761, Static229.anInt5138, Static13.anInt436);
} else {
Static133.method4012(Static183.anInt4271, Static24.anInt761, Static229.anInt5138, Static13.anInt436);
local43 = Fonts.b12Full.getStringWidth(LocalizedText.CHOOSE_OPTION);
for (@Pc(75) int local75 = 0; local75 < MiniMenu.size; local75++) {
@Pc(88) int local88 = Fonts.b12Full.getStringWidth(MiniMenu.getOp(local75));
if (local43 < local88) {
local43 = local88;
}
}
Static13.anInt436 = MiniMenu.size * 15 + (Static40.aBoolean298 ? 26 : 22);
Static24.anInt761 = local43 + 8;
}
if (InterfaceList.topLevelInterface != -1) {
Static54.runScripts(1, InterfaceList.topLevelInterface);
}
}
@OriginalMember(owner = "client!ke", name = "f", descriptor = "(B)V")
public static void method2608() {
@Pc(7) int local7 = 0;

2
client/src/main/java/rt4/Static133.java
View file

@ -19,7 +19,7 @@ public final class Static133 {
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.rectangles; local12++) {
if (InterfaceList.rectangleWidth[local12] + InterfaceList.rectangleX[local12] > arg0 && arg1 + arg0 > InterfaceList.rectangleX[local12] && arg2 < InterfaceList.rectangleHeight[local12] + InterfaceList.rectangleY[local12] && InterfaceList.rectangleY[local12] < arg2 + arg3) {
Static186.aBooleanArray100[local12] = true;
InterfaceList.aBooleanArray100[local12] = true;
}
}
}

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

@ -1,11 +0,0 @@
package rt4;
import org.openrs2.deob.annotation.OriginalMember;
public final class Static136 {
@OriginalMember(owner = "client!kk", name = "a", descriptor = "(I)Z")
public static boolean method2655() {
return MidiPlayer.anInt441 != 0 || Static172.midiPcmStream.method4414();
}
}

5
client/src/main/java/rt4/Static140.java
View file

@ -1,5 +0,0 @@
package rt4;
public final class Static140 {
}

125
client/src/main/java/rt4/Static165.java
View file

@ -55,11 +55,11 @@ public final class Static165 {
@OriginalMember(owner = "client!nb", name = "a", descriptor = "(IIIIII)V")
public static void method3163(@OriginalArg(0) int arg0, @OriginalArg(1) int arg1, @OriginalArg(2) int arg2, @OriginalArg(3) int arg3, @OriginalArg(5) int arg4) {
if (arg1 == arg4) {
Static82.method1760(arg4, arg2, arg0, arg3);
method1760(arg4, arg2, arg0, arg3);
} else if (TextureOp29.anInt4164 <= arg2 - arg4 && arg2 + arg4 <= TextureOp29.anInt5063 && arg3 - arg1 >= TextureOp29.anInt5773 && arg3 + arg1 <= TextureOp29.anInt2869) {
Static72.method1568(arg3, arg2, arg4, arg1, arg0);
method1568(arg3, arg2, arg4, arg1, arg0);
} else {
Static35.method898(arg0, arg1, arg4, arg2, arg3);
method898(arg0, arg1, arg4, arg2, arg3);
}
}
@ -71,4 +71,123 @@ public final class Static165 {
local21.chars[0] = -96;
return local21;
}
@OriginalMember(owner = "client!gi", name = "a", descriptor = "(IIIIB)V")
public static void method1760(@OriginalArg(0) int arg0, @OriginalArg(1) int arg1, @OriginalArg(2) int arg2, @OriginalArg(3) int arg3) {
if (arg1 - arg0 >= TextureOp29.anInt4164 && TextureOp29.anInt5063 >= arg0 + arg1 && arg3 - arg0 >= TextureOp29.anInt5773 && TextureOp29.anInt2869 >= arg0 + arg3) {
Static49.method1206(arg1, arg0, arg2, arg3);
} else {
Static89.method1843(arg2, arg3, arg0, arg1);
}
}
@OriginalMember(owner = "client!fl", name = "a", descriptor = "(IIIIII)V")
public static void method1568(@OriginalArg(0) int arg0, @OriginalArg(1) int arg1, @OriginalArg(2) int arg2, @OriginalArg(4) int arg3, @OriginalArg(5) int arg4) {
Static131.method2576(Static71.anIntArrayArray10[arg0], arg1 - arg2, arg2 + arg1, arg4);
@Pc(17) int local17 = 0;
@Pc(21) int local21 = arg2 * arg2;
@Pc(25) int local25 = arg3 * arg3;
@Pc(27) int local27 = arg3;
@Pc(31) int local31 = local25 << 1;
@Pc(35) int local35 = local21 << 1;
@Pc(39) int local39 = arg3 << 1;
@Pc(48) int local48 = local31 + (1 - local39) * local21;
@Pc(56) int local56 = local25 - local35 * (local39 - 1);
@Pc(60) int local60 = local21 << 2;
@Pc(70) int local70 = local25 << 2;
@Pc(78) int local78 = local31 * 3;
@Pc(86) int local86 = local35 * ((arg3 << 1) - 3);
@Pc(92) int local92 = local70;
@Pc(98) int local98 = local60 * (arg3 - 1);
while (local27 > 0) {
local27--;
@Pc(105) int local105 = local27 + arg0;
@Pc(109) int local109 = arg0 - local27;
if (local48 < 0) {
while (local48 < 0) {
local17++;
local48 += local78;
local56 += local92;
local92 += local70;
local78 += local70;
}
}
if (local56 < 0) {
local48 += local78;
local78 += local70;
local56 += local92;
local17++;
local92 += local70;
}
@Pc(160) int local160 = local17 + arg1;
local56 += -local86;
local86 -= local60;
local48 += -local98;
@Pc(179) int local179 = arg1 - local17;
local98 -= local60;
Static131.method2576(Static71.anIntArrayArray10[local109], local179, local160, arg4);
Static131.method2576(Static71.anIntArrayArray10[local105], local179, local160, arg4);
}
}
@OriginalMember(owner = "client!cl", name = "a", descriptor = "(IIIBII)V")
public static void method898(@OriginalArg(0) int arg0, @OriginalArg(1) int arg1, @OriginalArg(2) int arg2, @OriginalArg(4) int arg3, @OriginalArg(5) int arg4) {
@Pc(13) int local13 = arg2 * arg2;
@Pc(15) int local15 = 0;
@Pc(17) int local17 = arg1;
@Pc(21) int local21 = local13 << 1;
@Pc(25) int local25 = arg1 * arg1;
@Pc(29) int local29 = arg1 << 1;
@Pc(33) int local33 = local25 << 1;
@Pc(42) int local42 = local13 * (1 - local29) + local33;
@Pc(51) int local51 = local25 - local21 * (local29 - 1);
@Pc(55) int local55 = local25 << 2;
@Pc(63) int local63 = local33 * 3;
@Pc(67) int local67 = local13 << 2;
@Pc(75) int local75 = ((arg1 << 1) - 3) * local21;
@Pc(81) int local81 = local55;
@Pc(95) int local95;
@Pc(104) int local104;
if (arg4 >= TextureOp29.anInt5773 && TextureOp29.anInt2869 >= arg4) {
local95 = Static78.method1690(TextureOp29.anInt5063, arg2 + arg3, TextureOp29.anInt4164);
local104 = Static78.method1690(TextureOp29.anInt5063, arg3 - arg2, TextureOp29.anInt4164);
Static131.method2576(Static71.anIntArrayArray10[arg4], local104, local95, arg0);
}
@Pc(118) int local118 = local67 * (arg1 - 1);
while (local17 > 0) {
local17--;
if (local42 < 0) {
while (local42 < 0) {
local15++;
local42 += local63;
local51 += local81;
local81 += local55;
local63 += local55;
}
}
local95 = arg4 - local17;
if (local51 < 0) {
local51 += local81;
local42 += local63;
local63 += local55;
local81 += local55;
local15++;
}
local51 += -local75;
local75 -= local67;
local42 += -local118;
local104 = local17 + arg4;
if (TextureOp29.anInt5773 <= local104 && TextureOp29.anInt2869 >= local95) {
@Pc(213) int local213 = Static78.method1690(TextureOp29.anInt5063, local15 + arg3, TextureOp29.anInt4164);
@Pc(222) int local222 = Static78.method1690(TextureOp29.anInt5063, arg3 - local15, TextureOp29.anInt4164);
if (local95 >= TextureOp29.anInt5773) {
Static131.method2576(Static71.anIntArrayArray10[local95], local222, local213, arg0);
}
if (TextureOp29.anInt2869 >= local104) {
Static131.method2576(Static71.anIntArrayArray10[local104], local222, local213, arg0);
}
}
local118 -= local67;
}
}
}

22
client/src/main/java/rt4/Static17.java
View file

@ -1,22 +0,0 @@
package rt4;
import org.openrs2.deob.annotation.OriginalArg;
import org.openrs2.deob.annotation.OriginalMember;
import org.openrs2.deob.annotation.Pc;
public final class Static17 {
@OriginalMember(owner = "client!bg", name = "a", descriptor = "(Lclient!be;ZI)V")
public static void method531(@OriginalArg(0) Component arg0, @OriginalArg(1) boolean arg1) {
@Pc(20) int local20 = arg0.scrollMaxH == 0 ? arg0.width : arg0.scrollMaxH;
@Pc(32) int local32 = arg0.scrollMaxV == 0 ? arg0.height : arg0.scrollMaxV;
Static266.method4190(arg0.id, arg1, local20, local32, InterfaceList.components[arg0.id >> 16]);
if (arg0.createdComponents != null) {
Static266.method4190(arg0.id, arg1, local20, local32, arg0.createdComponents);
}
@Pc(66) ComponentPointer local66 = (ComponentPointer) InterfaceList.openInterfaces.get((long) arg0.id);
if (local66 != null) {
Static234.method4017(local32, arg1, local66.anInt5878, local20);
}
}
}

6
client/src/main/java/rt4/Static172.java
View file

@ -6,12 +6,6 @@ import org.openrs2.deob.annotation.Pc;
public final class Static172 {
@OriginalMember(owner = "client!nj", name = "e", descriptor = "Lclient!va;")
public static MidiPcmStream midiPcmStream;
@OriginalMember(owner = "client!nj", name = "g", descriptor = "Lclient!ve;")
public static Js5 aClass153_70;
@OriginalMember(owner = "client!nj", name = "k", descriptor = "I")
public static int anInt4165;

5
client/src/main/java/rt4/Static179.java
View file

@ -1,5 +0,0 @@
package rt4;
public final class Static179 {
}

3
client/src/main/java/rt4/Static180.java
View file

@ -6,9 +6,6 @@ import org.openrs2.deob.annotation.Pc;
public final class Static180 {
@OriginalMember(owner = "client!og", name = "b", descriptor = "I")
public static int currentChunkZ;
@OriginalMember(owner = "client!og", name = "e", descriptor = "Lclient!be;")
public static Component aClass13_22;

13
client/src/main/java/rt4/Static186.java
View file

@ -1,13 +0,0 @@
package rt4;
import org.openrs2.deob.annotation.OriginalMember;
public final class Static186 {
@OriginalMember(owner = "client!pa", name = "K", descriptor = "Z")
public static boolean aBoolean205 = false;
@OriginalMember(owner = "client!pa", name = "R", descriptor = "[Z")
public static final boolean[] aBooleanArray100 = new boolean[100];
}

12
client/src/main/java/rt4/Static192.java
View file

@ -1,12 +0,0 @@
package rt4;
import org.openrs2.deob.annotation.OriginalMember;
public final class Static192 {
@OriginalMember(owner = "client!ph", name = "b", descriptor = "(B)V")
public static void method3474() {
PlayerAppearance.aClass99_33.method3103();
PlayerAppearance.aClass99_21.method3103();
}
}

10
client/src/main/java/rt4/Static195.java
View file

@ -1,10 +0,0 @@
package rt4;
import org.openrs2.deob.annotation.OriginalMember;
public final class Static195 {
@OriginalMember(owner = "client!pk", name = "bb", descriptor = "Lclient!na;")
public static JagString walkText;
}

13
client/src/main/java/rt4/Static210.java
View file

@ -1,13 +0,0 @@
package rt4;
import org.openrs2.deob.annotation.OriginalArg;
import org.openrs2.deob.annotation.OriginalMember;
public final class Static210 {
@OriginalMember(owner = "client!rb", name = "a", descriptor = "(ZB)V")
public static void method3712(@OriginalArg(0) boolean arg0) {
Static234.method4017(GameShell.canvasHeight, arg0, InterfaceList.topLevelInterface, GameShell.canvasWidth);
}
}

3
client/src/main/java/rt4/Static226.java
View file

@ -5,9 +5,6 @@ import org.openrs2.deob.annotation.Pc;
public final class Static226 {
@OriginalMember(owner = "client!sf", name = "j", descriptor = "I")
public static int anInt5085;
@OriginalMember(owner = "client!sf", name = "i", descriptor = "I")
public static int anInt5084 = 0;
@OriginalMember(owner = "client!ml", name = "Q", descriptor = "I")

2
client/src/main/java/rt4/Static230.java
View file

@ -110,7 +110,7 @@ public final class Static230 {
@OriginalMember(owner = "client!sj", name = "c", descriptor = "(II)V")
public static void method3956(@OriginalArg(0) int arg0) {
if (MidiPlayer.anInt441 == 0) {
Static172.midiPcmStream.method4447(arg0);
MidiPlayer.midiPcmStream.method4447(arg0);
} else {
MidiPlayer.anInt5527 = arg0;
}

7
client/src/main/java/rt4/Static234.java
View file

@ -12,13 +12,6 @@ public final class Static234 {
@OriginalMember(owner = "client!ta", name = "B", descriptor = "I")
public static int anInt5245 = 0;
@OriginalMember(owner = "client!ta", name = "a", descriptor = "(IZIII)V")
public static void method4017(@OriginalArg(0) int arg0, @OriginalArg(1) boolean arg1, @OriginalArg(3) int arg2, @OriginalArg(4) int arg3) {
if (InterfaceList.load(arg2)) {
Static266.method4190(-1, arg1, arg3, arg0, InterfaceList.components[arg2]);
}
}
@OriginalMember(owner = "client!ta", name = "a", descriptor = "(IIZII)V")
public static void method4019(@OriginalArg(0) int arg0, @OriginalArg(1) int arg1, @OriginalArg(3) int arg2, @OriginalArg(4) int arg3) {
if (arg3 >= TextureOp29.anInt5773 && arg3 <= TextureOp29.anInt2869) {

6
client/src/main/java/rt4/Static241.java
View file

@ -104,10 +104,4 @@ public final class Static241 {
}
}
@OriginalMember(owner = "client!th", name = "a", descriptor = "(Z)V")
public static void method4548() {
Static172.midiPcmStream.method4446();
MidiPlayer.anInt441 = 1;
Static172.aClass153_70 = null;
}
}

2
client/src/main/java/rt4/Static253.java
View file

@ -97,7 +97,7 @@ public final class Static253 {
@Pc(253) float local253 = (float) Camera.cameraYaw * 0.17578125F;
if (Camera.cameraType == 3) {
local248 = Static146.aFloat15 * 360.0F / 6.2831855F;
local253 = Static84.aFloat10 * 360.0F / 6.2831855F;
local253 = Camera.aFloat10 * 360.0F / 6.2831855F;
}
GlRenderer.method4171(arg2, arg4, arg3, arg0, arg3 / 2 + arg2, arg4 - -(arg0 / 2), local248, local253, Static115.anInt5029, Static115.anInt5029);
} else {

5
client/src/main/java/rt4/Static258.java
View file

@ -1,5 +0,0 @@
package rt4;
public final class Static258 {
}

5
client/src/main/java/rt4/Static265.java
View file

@ -1,5 +0,0 @@
package rt4;
public final class Static265 {
}

26
client/src/main/java/rt4/Static266.java
View file

@ -15,32 +15,6 @@ public final class Static266 {
@OriginalMember(owner = "client!vk", name = "d", descriptor = "Lclient!na;")
public static final JagString aClass100_1010 = JagString.parse("null");
@OriginalMember(owner = "client!vk", name = "a", descriptor = "(IZIII[Lclient!be;)V")
public static void method4190(@OriginalArg(0) int arg0, @OriginalArg(1) boolean arg1, @OriginalArg(2) int arg2, @OriginalArg(4) int arg3, @OriginalArg(5) Component[] arg4) {
for (@Pc(3) int local3 = 0; local3 < arg4.length; local3++) {
@Pc(19) Component local19 = arg4[local3];
if (local19 != null && local19.layer == arg0) {
Static150.method2801(arg3, arg2, local19, arg1);
Static111.method2291(local19, arg3, arg2);
if (local19.scrollMaxH - local19.width < local19.scrollX) {
local19.scrollX = local19.scrollMaxH - local19.width;
}
if (local19.scrollY > local19.scrollMaxV - local19.height) {
local19.scrollY = local19.scrollMaxV - local19.height;
}
if (local19.scrollY < 0) {
local19.scrollY = 0;
}
if (local19.scrollX < 0) {
local19.scrollX = 0;
}
if (local19.type == 0) {
Static17.method531(local19, arg1);
}
}
}
}
@OriginalMember(owner = "client!vk", name = "a", descriptor = "(Lclient!ec;)V")
public static void method4193(@OriginalArg(0) Scenery arg0) {
for (@Pc(2) int local2 = arg0.anInt1701; local2 <= arg0.anInt1713; local2++) {

5
client/src/main/java/rt4/Static28.java
View file

@ -1,5 +0,0 @@
package rt4;
public final class Static28 {
}

64
client/src/main/java/rt4/Static35.java
View file

@ -2,9 +2,8 @@ package rt4;
import java.util.Calendar;
import java.util.TimeZone;
import org.openrs2.deob.annotation.OriginalArg;
import org.openrs2.deob.annotation.OriginalMember;
import org.openrs2.deob.annotation.Pc;
public final class Static35 {
@ -17,65 +16,4 @@ public final class Static35 {
@OriginalMember(owner = "client!cl", name = "ab", descriptor = "[I")
public static final int[] anIntArray83 = new int[256];
@OriginalMember(owner = "client!cl", name = "a", descriptor = "(IIIBII)V")
public static void method898(@OriginalArg(0) int arg0, @OriginalArg(1) int arg1, @OriginalArg(2) int arg2, @OriginalArg(4) int arg3, @OriginalArg(5) int arg4) {
@Pc(13) int local13 = arg2 * arg2;
@Pc(15) int local15 = 0;
@Pc(17) int local17 = arg1;
@Pc(21) int local21 = local13 << 1;
@Pc(25) int local25 = arg1 * arg1;
@Pc(29) int local29 = arg1 << 1;
@Pc(33) int local33 = local25 << 1;
@Pc(42) int local42 = local13 * (1 - local29) + local33;
@Pc(51) int local51 = local25 - local21 * (local29 - 1);
@Pc(55) int local55 = local25 << 2;
@Pc(63) int local63 = local33 * 3;
@Pc(67) int local67 = local13 << 2;
@Pc(75) int local75 = ((arg1 << 1) - 3) * local21;
@Pc(81) int local81 = local55;
@Pc(95) int local95;
@Pc(104) int local104;
if (arg4 >= TextureOp29.anInt5773 && TextureOp29.anInt2869 >= arg4) {
local95 = Static78.method1690(TextureOp29.anInt5063, arg2 + arg3, TextureOp29.anInt4164);
local104 = Static78.method1690(TextureOp29.anInt5063, arg3 - arg2, TextureOp29.anInt4164);
Static131.method2576(Static71.anIntArrayArray10[arg4], local104, local95, arg0);
}
@Pc(118) int local118 = local67 * (arg1 - 1);
while (local17 > 0) {
local17--;
if (local42 < 0) {
while (local42 < 0) {
local15++;
local42 += local63;
local51 += local81;
local81 += local55;
local63 += local55;
}
}
local95 = arg4 - local17;
if (local51 < 0) {
local51 += local81;
local42 += local63;
local63 += local55;
local81 += local55;
local15++;
}
local51 += -local75;
local75 -= local67;
local42 += -local118;
local104 = local17 + arg4;
if (TextureOp29.anInt5773 <= local104 && TextureOp29.anInt2869 >= local95) {
@Pc(213) int local213 = Static78.method1690(TextureOp29.anInt5063, local15 + arg3, TextureOp29.anInt4164);
@Pc(222) int local222 = Static78.method1690(TextureOp29.anInt5063, arg3 - local15, TextureOp29.anInt4164);
if (local95 >= TextureOp29.anInt5773) {
Static131.method2576(Static71.anIntArrayArray10[local95], local222, local213, arg0);
}
if (TextureOp29.anInt2869 >= local104) {
Static131.method2576(Static71.anIntArrayArray10[local104], local222, local213, arg0);
}
}
local118 -= local67;
}
}
}

4
client/src/main/java/rt4/Static36.java
View file

@ -12,6 +12,8 @@ public final class Static36 {
public static int anInt660 = -1;
@OriginalMember(owner = "client!kl", name = "s", descriptor = "I")
public static int anInt3337 = 0;
@OriginalMember(owner = "client!jk", name = "p", descriptor = "I")
public static int anInt3075 = -1;
@OriginalMember(owner = "client!client", name = "a", descriptor = "(Lclient!be;)Lclient!be;")
public static Component method938(@OriginalArg(0) Component arg0) {
@ -58,7 +60,7 @@ public final class Static36 {
}
if (component == Static40.aClass13_14) {
Static44.aBoolean83 = true;
Static124.anInt3075 = local50;
anInt3075 = local50;
anInt660 = local55;
}
if (!component.if3 || local61 < local65 && local63 < local67) {

6
client/src/main/java/rt4/Static44.java
View file

@ -18,7 +18,7 @@ public final class Static44 {
local9.anInt5879 = arg2;
local9.anInt5878 = arg0;
InterfaceList.openInterfaces.put(local9, (long) arg1);
Static81.method1753(arg0);
InterfaceList.method1753(arg0);
@Pc(28) Component local28 = InterfaceList.getComponent(arg1);
if (local28 != null) {
InterfaceList.redraw(local28);
@ -50,9 +50,9 @@ public final class Static44 {
Static13.anInt436 = MiniMenu.size * 15 + (Static40.aBoolean298 ? 26 : 22);
}
if (local28 != null) {
Static17.method531(local28, false);
InterfaceList.method531(local28, false);
}
Static74.method1626(arg0);
InterfaceList.method1626(arg0);
if (InterfaceList.topLevelInterface != -1) {
Static54.runScripts(1, InterfaceList.topLevelInterface);
}

4
client/src/main/java/rt4/Static6.java
View file

@ -47,10 +47,10 @@ public final class Static6 {
Static87.method1809(arg1, arg7, arg3, InterfaceList.components[arg0], arg2, -1, arg6, arg5, arg4);
} else if (arg4 == -1) {
for (@Pc(27) int local27 = 0; local27 < 100; local27++) {
Static186.aBooleanArray100[local27] = true;
InterfaceList.aBooleanArray100[local27] = true;
}
} else {
Static186.aBooleanArray100[arg4] = true;
InterfaceList.aBooleanArray100[arg4] = true;
}
}
}

58
client/src/main/java/rt4/Static72.java
View file

@ -1,58 +0,0 @@
package rt4;
import org.openrs2.deob.annotation.OriginalArg;
import org.openrs2.deob.annotation.OriginalMember;
import org.openrs2.deob.annotation.Pc;
public final class Static72 {
@OriginalMember(owner = "client!fl", name = "a", descriptor = "(IIIIII)V")
public static void method1568(@OriginalArg(0) int arg0, @OriginalArg(1) int arg1, @OriginalArg(2) int arg2, @OriginalArg(4) int arg3, @OriginalArg(5) int arg4) {
Static131.method2576(Static71.anIntArrayArray10[arg0], arg1 - arg2, arg2 + arg1, arg4);
@Pc(17) int local17 = 0;
@Pc(21) int local21 = arg2 * arg2;
@Pc(25) int local25 = arg3 * arg3;
@Pc(27) int local27 = arg3;
@Pc(31) int local31 = local25 << 1;
@Pc(35) int local35 = local21 << 1;
@Pc(39) int local39 = arg3 << 1;
@Pc(48) int local48 = local31 + (1 - local39) * local21;
@Pc(56) int local56 = local25 - local35 * (local39 - 1);
@Pc(60) int local60 = local21 << 2;
@Pc(70) int local70 = local25 << 2;
@Pc(78) int local78 = local31 * 3;
@Pc(86) int local86 = local35 * ((arg3 << 1) - 3);
@Pc(92) int local92 = local70;
@Pc(98) int local98 = local60 * (arg3 - 1);
while (local27 > 0) {
local27--;
@Pc(105) int local105 = local27 + arg0;
@Pc(109) int local109 = arg0 - local27;
if (local48 < 0) {
while (local48 < 0) {
local17++;
local48 += local78;
local56 += local92;
local92 += local70;
local78 += local70;
}
}
if (local56 < 0) {
local48 += local78;
local78 += local70;
local56 += local92;
local17++;
local92 += local70;
}
@Pc(160) int local160 = local17 + arg1;
local56 += -local86;
local86 -= local60;
local48 += -local98;
@Pc(179) int local179 = arg1 - local17;
local98 -= local60;
Static131.method2576(Static71.anIntArrayArray10[local109], local179, local160, arg4);
Static131.method2576(Static71.anIntArrayArray10[local105], local179, local160, arg4);
}
}
}

6
client/src/main/java/rt4/Static73.java
View file

@ -19,15 +19,15 @@ public final class Static73 {
InterfaceList.method2275(InterfaceList.topLevelInterface);
}
for (@Pc(18) ComponentPointer local18 = (ComponentPointer) InterfaceList.openInterfaces.head(); local18 != null; local18 = (ComponentPointer) InterfaceList.openInterfaces.next()) {
Static132.closeInterface(true, local18);
InterfaceList.closeInterface(true, local18);
}
InterfaceList.topLevelInterface = -1;
InterfaceList.openInterfaces = new HashTable(8);
InterfaceList.method1287();
InterfaceList.topLevelInterface = Static156.loginScreenId;
Static210.method3712(false);
InterfaceList.method3712(false);
Static87.method1807();
Static74.method1626(InterfaceList.topLevelInterface);
InterfaceList.method1626(InterfaceList.topLevelInterface);
}
Static35.anInt1092 = -1;
Static81.method1750(Static270.anInt5794);

17
client/src/main/java/rt4/Static74.java
View file

@ -33,23 +33,6 @@ public final class Static74 {
Static111.method2291(arg0, local17, local19);
}
@OriginalMember(owner = "client!fn", name = "c", descriptor = "(II)V")
public static void method1626(@OriginalArg(0) int arg0) {
if (arg0 == -1 || !InterfaceList.load(arg0)) {
return;
}
@Pc(31) Component[] local31 = InterfaceList.components[arg0];
for (@Pc(33) int local33 = 0; local33 < local31.length; local33++) {
@Pc(41) Component local41 = local31[local33];
if (local41.anObjectArray3 != null) {
@Pc(50) HookRequest local50 = new HookRequest();
local50.arguments = local41.anObjectArray3;
local50.source = local41;
ScriptRunner.run(2000000, local50);
}
}
}
@OriginalMember(owner = "client!wl", name = "a", descriptor = "(Lclient!be;I)Lclient!be;")
public static Component method4668(@OriginalArg(0) Component arg0) {
if (arg0.layer != -1) {

16
client/src/main/java/rt4/Static81.java
View file

@ -43,20 +43,4 @@ public final class Static81 {
Static71.anIntArrayArray10 = arg0;
}
@OriginalMember(owner = "client!gg", name = "e", descriptor = "(II)V")
public static void method1753(@OriginalArg(0) int arg0) {
if (!InterfaceList.load(arg0)) {
return;
}
@Pc(15) Component[] local15 = InterfaceList.components[arg0];
for (@Pc(17) int local17 = 0; local17 < local15.length; local17++) {
@Pc(29) Component local29 = local15[local17];
if (local29 != null) {
local29.anInt496 = 1;
local29.anInt510 = 0;
local29.anInt500 = 0;
}
}
}
}

17
client/src/main/java/rt4/Static82.java
View file

@ -1,17 +0,0 @@
package rt4;
import org.openrs2.deob.annotation.OriginalArg;
import org.openrs2.deob.annotation.OriginalMember;
public final class Static82 {
@OriginalMember(owner = "client!gi", name = "a", descriptor = "(IIIIB)V")
public static void method1760(@OriginalArg(0) int arg0, @OriginalArg(1) int arg1, @OriginalArg(2) int arg2, @OriginalArg(3) int arg3) {
if (arg1 - arg0 >= TextureOp29.anInt4164 && TextureOp29.anInt5063 >= arg0 + arg1 && arg3 - arg0 >= TextureOp29.anInt5773 && TextureOp29.anInt2869 >= arg0 + arg3) {
Static49.method1206(arg1, arg0, arg2, arg3);
} else {
Static89.method1843(arg2, arg3, arg0, arg1);
}
}
}

10
client/src/main/java/rt4/Static84.java
View file

@ -1,10 +0,0 @@
package rt4;
import org.openrs2.deob.annotation.OriginalMember;
public final class Static84 {
@OriginalMember(owner = "client!gk", name = "d", descriptor = "F")
public static float aFloat10;
}

14
client/src/main/java/rt4/Static87.java
View file

@ -85,7 +85,7 @@ public final class Static87 {
@OriginalMember(owner = "client!gn", name = "b", descriptor = "(Z)V")
public static void method1807() {
for (@Pc(11) int local11 = 0; local11 < 100; local11++) {
Static186.aBooleanArray100[local11] = true;
InterfaceList.aBooleanArray100[local11] = true;
}
}
@ -240,7 +240,7 @@ public final class Static87 {
if (client.game == 1) {
MiniMenu.add(-1, 1L, JagString.EMPTY, local563, (short) 36, LocalizedText.FACEHERE, local571);
}
MiniMenu.add(-1, 1L, JagString.EMPTY, local563, (short) 60, Static195.walkText, local571);
MiniMenu.add(-1, 1L, JagString.EMPTY, local563, (short) 60, MiniMenu.walkText, local571);
continue;
}
if (component.clientCode == 1339) {
@ -256,7 +256,7 @@ public final class Static87 {
}
if (component.clientCode == 1400) {
Static269.method2225(local123, local114, component.height, component.width);
Static186.aBooleanArray100[rectangle] = true;
InterfaceList.aBooleanArray100[rectangle] = true;
InterfaceList.rectangleRedraw[rectangle] = true;
if (GlRenderer.enabled) {
GlRaster.setClip(arg0, arg6, arg4, arg7);
@ -267,7 +267,7 @@ public final class Static87 {
}
if (component.clientCode == 1401) {
Static1.method4(local123, component.height, component.width, local114);
Static186.aBooleanArray100[rectangle] = true;
InterfaceList.aBooleanArray100[rectangle] = true;
InterfaceList.rectangleRedraw[rectangle] = true;
if (GlRenderer.enabled) {
GlRaster.setClip(arg0, arg6, arg4, arg7);
@ -279,7 +279,7 @@ public final class Static87 {
if (component.clientCode == 1402) {
if (!GlRenderer.enabled) {
Static221.method3392(local123, local114);
Static186.aBooleanArray100[rectangle] = true;
InterfaceList.aBooleanArray100[rectangle] = true;
InterfaceList.rectangleRedraw[rectangle] = true;
}
continue;
@ -322,7 +322,7 @@ public final class Static87 {
@Pc(968) JagString local968 = JagString.concatenate(new JagString[] { Cheat.DEBUG_CAHE, StringUtils.formatNumber(0, true, 2, (long) local571), Static147.aClass100_672, JagString.parseInt(local563), Static14.aClass100_80 });
Fonts.p11Full.renderRight(local968, local270, local276, 16776960, 0);
local276 += 12;
Static186.aBooleanArray100[rectangle] = true;
InterfaceList.aBooleanArray100[rectangle] = true;
InterfaceList.rectangleRedraw[rectangle] = true;
continue;
}
@ -407,7 +407,7 @@ public final class Static87 {
}
if (Rasteriser.textureHasTransparency) {
Static186.aBooleanArray100[rectangle] = true;
InterfaceList.aBooleanArray100[rectangle] = true;
}
if (sprite == null) {

10
client/src/main/java/rt4/Static89.java
View file

@ -106,11 +106,11 @@ public final class Static89 {
}
@Pc(60) int local60;
for (local60 = 0; local60 < InterfaceList.rectangles; local60++) {
if (Static186.aBooleanArray100[local60]) {
if (InterfaceList.aBooleanArray100[local60]) {
InterfaceList.rectangleRedraw[local60] = true;
}
Static223.aBooleanArray116[local60] = Static186.aBooleanArray100[local60];
Static186.aBooleanArray100[local60] = false;
Static223.aBooleanArray116[local60] = InterfaceList.aBooleanArray100[local60];
InterfaceList.aBooleanArray100[local60] = false;
}
Static201.aClass13_13 = null;
Static97.anInt2503 = -1;
@ -146,8 +146,8 @@ public final class Static89 {
local60 = Static270.anInt5794;
}
Static81.method1750(local60);
if (Static125.anInt3096 == 1) {
Static125.anInt3096 = 2;
if (MiniMenu.anInt3096 == 1) {
MiniMenu.anInt3096 = 2;
}
if (Static187.anInt4422 == 1) {
Static187.anInt4422 = 2;

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

@ -376,7 +376,7 @@ public final class client extends GameShell {
MsiTypeList.method4529();
LightTypeList.method1882();
CursorTypeList.method741();
Static192.method3474();
PlayerAppearance.method3474();
Static40.method1019();
HintArrowManager.method3329();
ShadowModelList.method4276();
@ -589,7 +589,7 @@ public final class client extends GameShell {
InterfaceList.method2275(InterfaceList.topLevelInterface);
}
for (@Pc(3755) ComponentPointer local3755 = (ComponentPointer) InterfaceList.openInterfaces.head(); local3755 != null; local3755 = (ComponentPointer) InterfaceList.openInterfaces.next()) {
Static132.closeInterface(true, local3755);
InterfaceList.closeInterface(true, local3755);
}
InterfaceList.topLevelInterface = -1;
InterfaceList.openInterfaces = new HashTable(8);
@ -606,7 +606,7 @@ public final class client extends GameShell {
Inv.method2073();
Static253.aBoolean43 = true;
for (local3506 = 0; local3506 < 100; local3506++) {
Static186.aBooleanArray100[local3506] = true;
InterfaceList.aBooleanArray100[local3506] = true;
}
ClanChat.size = 0;
ClanChat.members = null;
@ -624,7 +624,7 @@ public final class client extends GameShell {
}
Static197.aBoolean228 = true;
Protocol.verifyId = 0;
Static195.walkText = LocalizedText.WALKHERE;
MiniMenu.walkText = LocalizedText.WALKHERE;
Static127.neverRemoveRoofs = false;
aShortArray88 = aShortArray19 = aShortArray74 = aShortArray87 = new short[256];
Static40.method4637();
@ -696,7 +696,7 @@ public final class client extends GameShell {
}
if (GlRenderer.enabled) {
for (local80 = 0; local80 < 100; local80++) {
Static186.aBooleanArray100[local80] = true;
InterfaceList.aBooleanArray100[local80] = true;
}
}
if (gameState == 0) {