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

Identified Class114 as DisplayMode, reorganized some static methods

Browse source
This commit is contained in:
Pazaz 2022-05-16 00:46:10 -04:00
parent 5f4a83c394
commit c988509e8e
No known key found for this signature in database
GPG key ID: 8658637376F9B835
139 changed files with 1209 additions and 1383 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -7,6 +7,8 @@ import org.openrs2.deob.annotation.Pc;
public class Camera { public class Camera {
@OriginalMember(owner = "client!id", name = "d", descriptor = "[[[I") @OriginalMember(owner = "client!id", name = "d", descriptor = "[[[I")
public static final int[][][] anIntArrayArrayArray9 = new int[2][][]; public static final int[][][] anIntArrayArrayArray9 = new int[2][][];
@OriginalMember(owner = "client!sa", name = "Q", descriptor = "[I")
public static final int[] cameraJitter = new int[5];
@OriginalMember(owner = "client!fl", name = "s", descriptor = "I") @OriginalMember(owner = "client!fl", name = "s", descriptor = "I")
public static double pitchTarget = 128; public static double pitchTarget = 128;
@ -44,6 +46,12 @@ public class Camera {
public static int originZ; public static int originZ;
@OriginalMember(owner = "client!se", name = "a", descriptor = "I") @OriginalMember(owner = "client!se", name = "a", descriptor = "I")
public static int originX; public static int originX;
@OriginalMember(owner = "client!bc", name = "I", descriptor = "Z")
public static boolean aBoolean16 = false;
@OriginalMember(owner = "client!km", name = "Pc", descriptor = "I")
public static int renderX;
@OriginalMember(owner = "client!kh", name = "f", descriptor = "I")
public static int renderZ;
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;
@ -97,14 +105,14 @@ public class Camera {
@Pc(15) int local15 = Static245.anInt5375 * 128 + 64; @Pc(15) int local15 = Static245.anInt5375 * 128 + 64;
@Pc(23) int local23 = SceneGraph.getTileHeight(Player.level, local15, local9) - Static231.anInt5203; @Pc(23) int local23 = SceneGraph.getTileHeight(Player.level, local15, local9) - Static231.anInt5203;
if (Static113.anInt4612 >= 100) { if (Static113.anInt4612 >= 100) {
Static138.renderX = Static245.anInt5375 * 128 + 64; renderX = Static245.anInt5375 * 128 + 64;
Static134.renderZ = Static248.anInt4232 * 128 + 64; renderZ = Static248.anInt4232 * 128 + 64;
Static5.anInt40 = SceneGraph.getTileHeight(Player.level, Static138.renderX, Static134.renderZ) - Static231.anInt5203; Static5.anInt40 = SceneGraph.getTileHeight(Player.level, renderX, renderZ) - Static231.anInt5203;
} else { } else {
if (Static138.renderX < local15) { if (renderX < local15) {
Static138.renderX += Static233.anInt5225 + Static113.anInt4612 * (local15 - Static138.renderX) / 1000; renderX += Static233.anInt5225 + Static113.anInt4612 * (local15 - renderX) / 1000;
if (Static138.renderX > local15) { if (renderX > local15) {
Static138.renderX = local15; renderX = local15;
} }
} }
if (Static5.anInt40 < local23) { if (Static5.anInt40 < local23) {
@ -113,16 +121,16 @@ public class Camera {
Static5.anInt40 = local23; Static5.anInt40 = local23;
} }
} }
if (Static138.renderX > local15) { if (renderX > local15) {
Static138.renderX -= Static233.anInt5225 + (Static138.renderX - local15) * Static113.anInt4612 / 1000; renderX -= Static233.anInt5225 + (renderX - local15) * Static113.anInt4612 / 1000;
if (Static138.renderX < local15) { if (renderX < local15) {
Static138.renderX = local15; renderX = local15;
} }
} }
if (Static134.renderZ < local9) { if (renderZ < local9) {
Static134.renderZ += Static233.anInt5225 + Static113.anInt4612 * (local9 - Static134.renderZ) / 1000; renderZ += Static233.anInt5225 + Static113.anInt4612 * (local9 - renderZ) / 1000;
if (local9 < Static134.renderZ) { if (local9 < renderZ) {
Static134.renderZ = local9; renderZ = local9;
} }
} }
if (local23 < Static5.anInt40) { if (local23 < Static5.anInt40) {
@ -131,10 +139,10 @@ public class Camera {
Static5.anInt40 = local23; Static5.anInt40 = local23;
} }
} }
if (Static134.renderZ > local9) { if (renderZ > local9) {
Static134.renderZ -= Static233.anInt5225 + (Static134.renderZ - local9) * Static113.anInt4612 / 1000; renderZ -= Static233.anInt5225 + (renderZ - local9) * Static113.anInt4612 / 1000;
if (local9 > Static134.renderZ) { if (local9 > renderZ) {
Static134.renderZ = local9; renderZ = local9;
} }
} }
} }
@ -142,8 +150,8 @@ public class Camera {
local15 = Static251.anInt5449 * 128 + 64; local15 = Static251.anInt5449 * 128 + 64;
local23 = SceneGraph.getTileHeight(Player.level, local15, local9) - Static260.anInt1744; local23 = SceneGraph.getTileHeight(Player.level, local15, local9) - Static260.anInt1744;
@Pc(236) int local236 = local23 - Static5.anInt40; @Pc(236) int local236 = local23 - Static5.anInt40;
@Pc(241) int local241 = local9 - Static134.renderZ; @Pc(241) int local241 = local9 - renderZ;
@Pc(246) int local246 = local15 - Static138.renderX; @Pc(246) int local246 = local15 - renderX;
@Pc(257) int local257 = (int) Math.sqrt((double) (local246 * local246 + local241 * local241)); @Pc(257) int local257 = (int) Math.sqrt((double) (local246 * local246 + local241 * local241));
@Pc(268) int local268 = (int) (Math.atan2((double) local236, (double) local257) * 325.949D) & 0x7FF; @Pc(268) int local268 = (int) (Math.atan2((double) local236, (double) local257) * 325.949D) & 0x7FF;
if (local268 < 128) { if (local268 < 128) {
@ -203,14 +211,14 @@ public class Camera {
if (anInt5224 >= 65535) { if (anInt5224 >= 65535) {
anInt5224 = 65535; anInt5224 = 65535;
if (Static186.aBoolean205) { if (Static186.aBoolean205) {
Static13.aBoolean16 = false; aBoolean16 = false;
} else { } else {
Static13.aBoolean16 = true; aBoolean16 = true;
} }
Static186.aBoolean205 = true; Static186.aBoolean205 = true;
} else { } else {
Static186.aBoolean205 = false; Static186.aBoolean205 = false;
Static13.aBoolean16 = false; aBoolean16 = false;
} }
@Pc(66) float local66 = (float) anInt5224 / 65535.0F; @Pc(66) float local66 = (float) anInt5224 / 65535.0F;
@Pc(70) int local70 = anInt3125 * 2; @Pc(70) int local70 = anInt3125 * 2;
@ -232,8 +240,8 @@ public class Camera {
renderCoordinates[local72] = (float) local119 + (((float) local173 * local66 + (float) local155) * local66 + (float) local146) * local66; renderCoordinates[local72] = (float) local119 + (((float) local173 * local66 + (float) local155) * local66 + (float) local146) * local66;
} }
Static5.anInt40 = (int) renderCoordinates[1] * -1; Static5.anInt40 = (int) renderCoordinates[1] * -1;
Static138.renderX = (int) renderCoordinates[0] - originX * 128; renderX = (int) renderCoordinates[0] - originX * 128;
Static134.renderZ = (int) renderCoordinates[2] - originZ * 128; renderZ = (int) renderCoordinates[2] - originZ * 128;
@Pc(226) float[] local226 = new float[3]; @Pc(226) float[] local226 = new float[3];
local141 = anInt2119 * 2; local141 = anInt2119 * 2;
for (local131 = 0; local131 < 3; local131++) { for (local131 = 0; local131 < 3; local131++) {
@ -268,8 +276,8 @@ public class Camera {
@Pc(36) int local36 = Static265.anInt5765 * 128 + 64; @Pc(36) int local36 = Static265.anInt5765 * 128 + 64;
@Pc(44) int local44 = SceneGraph.getTileHeight(Player.level, local30, local36) - Static260.anInt1744; @Pc(44) int local44 = SceneGraph.getTileHeight(Player.level, local30, local36) - Static260.anInt1744;
@Pc(49) int local49 = local44 - Static5.anInt40; @Pc(49) int local49 = local44 - Static5.anInt40;
@Pc(54) int local54 = local30 - Static138.renderX; @Pc(54) int local54 = local30 - renderX;
@Pc(59) int local59 = local36 - Static134.renderZ; @Pc(59) int local59 = local36 - renderZ;
@Pc(70) int local70 = (int) Math.sqrt((double) (local59 * local59 + local54 * local54)); @Pc(70) int local70 = (int) Math.sqrt((double) (local59 * local59 + local54 * local54));
cameraPitch = (int) (Math.atan2((double) local49, (double) local70) * 325.949D) & 0x7FF; cameraPitch = (int) (Math.atan2((double) local49, (double) local70) * 325.949D) & 0x7FF;
cameraYaw = (int) (Math.atan2((double) local54, (double) local59) * -325.949D) & 0x7FF; cameraYaw = (int) (Math.atan2((double) local54, (double) local59) * -325.949D) & 0x7FF;
@ -291,9 +299,9 @@ public class Camera {
Static233.anInt5225 = arg1; Static233.anInt5225 = arg1;
Static248.anInt4232 = arg4; Static248.anInt4232 = arg4;
if (arg0 && Static113.anInt4612 >= 100) { if (arg0 && Static113.anInt4612 >= 100) {
Static138.renderX = Static245.anInt5375 * 128 + 64; renderX = Static245.anInt5375 * 128 + 64;
Static134.renderZ = Static248.anInt4232 * 128 + 64; renderZ = Static248.anInt4232 * 128 + 64;
Static5.anInt40 = SceneGraph.getTileHeight(Player.level, Static138.renderX, Static134.renderZ) - Static231.anInt5203; Static5.anInt40 = SceneGraph.getTileHeight(Player.level, renderX, renderZ) - Static231.anInt5203;
} }
cameraType = 2; cameraType = 2;
} }

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

@ -170,16 +170,16 @@ public class Cheat {
displayFps = false; displayFps = false;
} }
if (arg0.equalsIgnoreCase(WM0)) { if (arg0.equalsIgnoreCase(WM0)) {
Static241.setWindowMode(false, 0, -1, -1); DisplayMode.setWindowMode(false, 0, -1, -1);
} }
if (arg0.equalsIgnoreCase(WM1)) { if (arg0.equalsIgnoreCase(WM1)) {
Static241.setWindowMode(false, 1, -1, -1); DisplayMode.setWindowMode(false, 1, -1, -1);
} }
if (arg0.equalsIgnoreCase(WM2)) { if (arg0.equalsIgnoreCase(WM2)) {
Static241.setWindowMode(false, 2, -1, -1); DisplayMode.setWindowMode(false, 2, -1, -1);
} }
if (arg0.equalsIgnoreCase(WM3)) { if (arg0.equalsIgnoreCase(WM3)) {
Static241.setWindowMode(false, 3, 1024, 768); DisplayMode.setWindowMode(false, 3, 1024, 768);
} }
if (arg0.equalsIgnoreCase(NOCLIP)) { if (arg0.equalsIgnoreCase(NOCLIP)) {
for (local18 = 0; local18 < 4; local18++) { for (local18 = 0; local18 < 4; local18++) {

20
client/src/main/java/rt4/Class114.java
View file

@ -1,20 +0,0 @@
package rt4;
import org.openrs2.deob.annotation.OriginalClass;
import org.openrs2.deob.annotation.OriginalMember;
@OriginalClass("client!od")
public final class Class114 {
@OriginalMember(owner = "client!od", name = "j", descriptor = "I")
public int anInt4248;
@OriginalMember(owner = "client!od", name = "k", descriptor = "I")
public int anInt4249;
@OriginalMember(owner = "client!od", name = "l", descriptor = "I")
public int anInt4250;
@OriginalMember(owner = "client!od", name = "m", descriptor = "I")
public int anInt4251;
}

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

@ -9,7 +9,7 @@ import java.io.IOException;
public class ClientProt { public class ClientProt {
@OriginalMember(owner = "client!vg", name = "a", descriptor = "(Lclient!na;IIBI)V") @OriginalMember(owner = "client!vg", name = "a", descriptor = "(Lclient!na;IIBI)V")
public static void method4512(@OriginalArg(0) JagString arg0, @OriginalArg(1) int arg1, @OriginalArg(2) int arg2, @OriginalArg(4) int arg3) { public static void method4512(@OriginalArg(0) JagString arg0, @OriginalArg(1) int arg1, @OriginalArg(2) int arg2, @OriginalArg(4) int arg3) {
@Pc(8) Component local8 = Static201.method1418(arg3, arg1); @Pc(8) Component local8 = InterfaceList.method1418(arg3, arg1);
if (local8 == null) { if (local8 == null) {
return; return;
} }
@ -114,7 +114,7 @@ public class ClientProt {
} }
@OriginalMember(owner = "client!mc", name = "f", descriptor = "(B)V") @OriginalMember(owner = "client!mc", name = "f", descriptor = "(B)V")
public static void method2909() { public static void closeWidget() {
Protocol.outboundBuffer.p1isaac(184); Protocol.outboundBuffer.p1isaac(184);
for (@Pc(18) ComponentPointer local18 = (ComponentPointer) InterfaceList.openInterfaces.head(); local18 != null; local18 = (ComponentPointer) InterfaceList.openInterfaces.next()) { for (@Pc(18) ComponentPointer local18 = (ComponentPointer) InterfaceList.openInterfaces.head(); local18 != null; local18 = (ComponentPointer) InterfaceList.openInterfaces.next()) {
if (local18.anInt5879 == 0) { if (local18.anInt5879 == 0) {
@ -128,7 +128,7 @@ public class ClientProt {
} }
@OriginalMember(owner = "client!wh", name = "a", descriptor = "(IILclient!na;)V") @OriginalMember(owner = "client!wh", name = "a", descriptor = "(IILclient!na;)V")
public static void method4613(@OriginalArg(0) int arg0, @OriginalArg(2) JagString arg1) { public static void clickPlayerOption(@OriginalArg(0) int arg0, @OriginalArg(2) JagString arg1) {
@Pc(7) JagString local7 = arg1.method3159().toTitleCase(); @Pc(7) JagString local7 = arg1.method3159().toTitleCase();
@Pc(13) boolean local13 = false; @Pc(13) boolean local13 = false;
for (@Pc(15) int local15 = 0; local15 < PlayerList.size; local15++) { for (@Pc(15) int local15 = 0; local15 < PlayerList.size; local15++) {
@ -394,8 +394,8 @@ public class ClientProt {
for (@Pc(837) int local837 = chunkX - 1; local837 <= chunkZ + 1; local837++) { for (@Pc(837) int local837 = chunkX - 1; local837 <= chunkZ + 1; local837++) {
for (@Pc(850) int local850 = local821 - 1; local850 <= local815 + 1; local850++) { for (@Pc(850) int local850 = local821 - 1; local850 <= local815 + 1; local850++) {
if (local837 < chunkX || local837 > chunkZ || local850 < local821 || local850 > local815) { if (local837 < chunkX || local837 > chunkZ || local850 < local821 || local850 > local815) {
client.js5Archive5.method4486(JagString.concatenate(new JagString[] { Static103.aClass100_558, JagString.parseInt(local837), Static86.aClass100_488, JagString.parseInt(local850) })); client.js5Archive5.method4486(JagString.concatenate(new JagString[] { Static103.aClass100_558, JagString.parseInt(local837), Static86.UNDERSCORE, JagString.parseInt(local850) }));
client.js5Archive5.method4486(JagString.concatenate(new JagString[] { Static270.aClass100_1090, JagString.parseInt(local837), Static86.aClass100_488, JagString.parseInt(local850) })); client.js5Archive5.method4486(JagString.concatenate(new JagString[] { Static270.aClass100_1090, JagString.parseInt(local837), Static86.UNDERSCORE, JagString.parseInt(local850) }));
} }
} }
} }
@ -416,7 +416,7 @@ public class ClientProt {
@OriginalMember(owner = "client!ej", name = "i", descriptor = "(I)V") @OriginalMember(owner = "client!ej", name = "i", descriptor = "(I)V")
public static void method1373() { public static void method1373() {
Protocol.outboundBuffer.p1isaac(243); Protocol.outboundBuffer.p1isaac(243);
Protocol.outboundBuffer.p1(Static144.getWindowMode()); Protocol.outboundBuffer.p1(DisplayMode.getWindowMode());
Protocol.outboundBuffer.p2(GameShell.canvasWidth); Protocol.outboundBuffer.p2(GameShell.canvasWidth);
Protocol.outboundBuffer.p2(GameShell.canvasHeight); Protocol.outboundBuffer.p2(GameShell.canvasHeight);
Protocol.outboundBuffer.p1(Preferences.antiAliasingMode); Protocol.outboundBuffer.p1(Preferences.antiAliasingMode);
@ -447,69 +447,69 @@ public class ClientProt {
@OriginalMember(owner = "client!ac", name = "b", descriptor = "(I)V") @OriginalMember(owner = "client!ac", name = "b", descriptor = "(I)V")
public static void method28() { public static void method28() {
InterfaceList.redraw(Static105.aClass13_14); InterfaceList.redraw(Static40.aClass13_14);
Static213.anInt4851++; Static40.anInt4851++;
if (Static44.aBoolean83 && Static146.aBoolean174) { if (Static44.aBoolean83 && Static146.aBoolean174) {
@Pc(30) int local30 = Mouse.anInt4873; @Pc(30) int local30 = Mouse.anInt4873;
local30 -= Static246.anInt5388; local30 -= Static40.anInt5388;
if (Static81.anInt2225 > local30) { if (Static81.anInt2225 > local30) {
local30 = Static81.anInt2225; local30 = Static81.anInt2225;
} }
@Pc(41) int local41 = Mouse.anInt5032; @Pc(41) int local41 = Mouse.anInt5032;
if (Static81.anInt2225 + Static4.aClass13_1.width < local30 - -Static105.aClass13_14.width) { if (Static81.anInt2225 + Static40.aClass13_1.width < local30 - -Static40.aClass13_14.width) {
local30 = Static81.anInt2225 + Static4.aClass13_1.width - Static105.aClass13_14.width; local30 = Static81.anInt2225 + Static40.aClass13_1.width - Static40.aClass13_14.width;
} }
local41 -= Static165.anInt4035; local41 -= Static40.anInt4035;
if (local41 < Static228.anInt5103) { if (local41 < Static228.anInt5103) {
local41 = Static228.anInt5103; local41 = Static228.anInt5103;
} }
if (Static228.anInt5103 + Static4.aClass13_1.height < local41 - -Static105.aClass13_14.height) { if (Static228.anInt5103 + Static40.aClass13_1.height < local41 - -Static40.aClass13_14.height) {
local41 = Static228.anInt5103 + Static4.aClass13_1.height - Static105.aClass13_14.height; local41 = Static228.anInt5103 + Static40.aClass13_1.height - Static40.aClass13_14.height;
} }
@Pc(109) int local109 = local41 - Static20.anInt660; @Pc(109) int local109 = local41 - Static36.anInt660;
@Pc(114) int local114 = local30 - Static124.anInt3075; @Pc(114) int local114 = local30 - Static124.anInt3075;
@Pc(122) int local122 = local30 + Static4.aClass13_1.scrollX - Static81.anInt2225; @Pc(122) int local122 = local30 + Static40.aClass13_1.scrollX - Static81.anInt2225;
@Pc(130) int local130 = Static4.aClass13_1.scrollY + local41 - Static228.anInt5103; @Pc(130) int local130 = Static40.aClass13_1.scrollY + local41 - Static228.anInt5103;
@Pc(133) int local133 = Static105.aClass13_14.dragDeadzone; @Pc(133) int local133 = Static40.aClass13_14.dragDeadzone;
if (Static213.anInt4851 > Static105.aClass13_14.dragDeadtime && (local133 < local114 || -local133 > local114 || local109 > local133 || local109 < -local133)) { if (Static40.anInt4851 > Static40.aClass13_14.dragDeadtime && (local133 < local114 || -local133 > local114 || local109 > local133 || local109 < -local133)) {
Static138.aBoolean172 = true; Static40.aBoolean172 = true;
} }
@Pc(176) HookRequest local176; @Pc(176) HookRequest local176;
if (Static105.aClass13_14.onDragStart != null && Static138.aBoolean172) { if (Static40.aClass13_14.onDragStart != null && Static40.aBoolean172) {
local176 = new HookRequest(); local176 = new HookRequest();
local176.source = Static105.aClass13_14; local176.source = Static40.aClass13_14;
local176.arguments = Static105.aClass13_14.onDragStart; local176.arguments = Static40.aClass13_14.onDragStart;
local176.mouseX = local122; local176.mouseX = local122;
local176.mouseY = local130; local176.mouseY = local130;
ScriptRunner.run(local176); ScriptRunner.run(local176);
} }
if (Mouse.pressedButton == 0) { if (Mouse.pressedButton == 0) {
if (Static138.aBoolean172) { if (Static40.aBoolean172) {
if (Static105.aClass13_14.onDragRelease != null) { if (Static40.aClass13_14.onDragRelease != null) {
local176 = new HookRequest(); local176 = new HookRequest();
local176.mouseY = local130; local176.mouseY = local130;
local176.target = Static56.aClass13_12; local176.target = Static56.aClass13_12;
local176.mouseX = local122; local176.mouseX = local122;
local176.arguments = Static105.aClass13_14.onDragRelease; local176.arguments = Static40.aClass13_14.onDragRelease;
local176.source = Static105.aClass13_14; local176.source = Static40.aClass13_14;
ScriptRunner.run(local176); ScriptRunner.run(local176);
} }
if (Static56.aClass13_12 != null && Static36.method938(Static105.aClass13_14) != null) { if (Static56.aClass13_12 != null && Static36.method938(Static40.aClass13_14) != null) {
Protocol.outboundBuffer.p1isaac(79); Protocol.outboundBuffer.p1isaac(79);
Protocol.outboundBuffer.p4me(Static105.aClass13_14.id); Protocol.outboundBuffer.p4me(Static40.aClass13_14.id);
Protocol.outboundBuffer.p2le(Static56.aClass13_12.createdComponentId); Protocol.outboundBuffer.p2le(Static56.aClass13_12.createdComponentId);
Protocol.outboundBuffer.p4(Static56.aClass13_12.id); Protocol.outboundBuffer.p4(Static56.aClass13_12.id);
Protocol.outboundBuffer.p2le(Static105.aClass13_14.createdComponentId); Protocol.outboundBuffer.p2le(Static40.aClass13_14.createdComponentId);
} }
} else if ((Static116.anInt2952 == 1 || Static277.method4640(MiniMenu.size - 1)) && MiniMenu.size > 2) { } else if ((Static116.anInt2952 == 1 || Static277.method4640(MiniMenu.size - 1)) && MiniMenu.size > 2) {
Static226.method3901(); Static226.method3901();
} else if (MiniMenu.size > 0) { } else if (MiniMenu.size > 0) {
Static59.method1372(); Static59.method1372();
} }
Static105.aClass13_14 = null; Static40.aClass13_14 = null;
} }
} else if (Static213.anInt4851 > 1) { } else if (Static40.anInt4851 > 1) {
Static105.aClass13_14 = null; Static40.aClass13_14 = null;
} }
} }

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

@ -70,8 +70,8 @@ public class ColorUtils {
@OriginalMember(owner = "client!pf", name = "a", descriptor = "(II)[F") @OriginalMember(owner = "client!pf", name = "a", descriptor = "(II)[F")
public static float[] getRgbFloat(@OriginalArg(0) int arg0) { public static float[] getRgbFloat(@OriginalArg(0) int arg0) {
@Pc(7) float local7 = Static161.method3068() + Static161.method3059(); @Pc(7) float local7 = FogManager.method3068() + FogManager.method3059();
@Pc(9) int local9 = Static161.method3064(); @Pc(9) int local9 = FogManager.method3064();
@Pc(11) float local11 = 0.58823526F; @Pc(11) float local11 = 0.58823526F;
Static251.aFloatArray28[3] = 1.0F; Static251.aFloatArray28[3] = 1.0F;
@Pc(24) float local24 = (float) (local9 >> 16 & 0xFF) / 255.0F; @Pc(24) float local24 = (float) (local9 >> 16 & 0xFF) / 255.0F;

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

@ -1,12 +1,30 @@
package rt4; package rt4;
import org.openrs2.deob.annotation.OriginalArg; import org.openrs2.deob.annotation.OriginalArg;
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.awt.*; import java.awt.*;
public class DisplayMode { @OriginalClass("client!od")
public final class DisplayMode {
@OriginalMember(owner = "client!ib", name = "i", descriptor = "[Lclient!od;")
public static DisplayMode[] aClass114Array1;
@OriginalMember(owner = "client!od", name = "j", descriptor = "I")
public int width;
@OriginalMember(owner = "client!od", name = "k", descriptor = "I")
public int refreshRate;
@OriginalMember(owner = "client!od", name = "l", descriptor = "I")
public int height;
@OriginalMember(owner = "client!od", name = "m", descriptor = "I")
public int bitDepth;
@OriginalMember(owner = "client!c", name = "a", descriptor = "(Ljava/awt/Frame;ZLsignlink!ll;)V") @OriginalMember(owner = "client!c", name = "a", descriptor = "(Ljava/awt/Frame;ZLsignlink!ll;)V")
public static void exitFullScreen(@OriginalArg(0) Frame arg0, @OriginalArg(2) SignLink arg1) { public static void exitFullScreen(@OriginalArg(0) Frame arg0, @OriginalArg(2) SignLink arg1) {
while (true) { while (true) {
@ -22,4 +40,260 @@ public class DisplayMode {
ThreadUtils.sleep(100L); ThreadUtils.sleep(100L);
} }
} }
@OriginalMember(owner = "client!th", name = "a", descriptor = "(ZIIII)V")
public static void setWindowMode(@OriginalArg(0) boolean arg0, @OriginalArg(1) int arg1, @OriginalArg(3) int arg2, @OriginalArg(4) int arg3) {
Static97.aLong89 = 0L;
@Pc(4) int mode = getWindowMode();
if (arg1 == 3 || mode == 3) {
arg0 = true;
}
@Pc(44) boolean useHd = false;
if (mode > 0 != arg1 > 0) {
useHd = true;
}
if (arg0 && arg1 > 0) {
useHd = true;
}
setWindowMode(arg0, arg1, useHd, mode, arg2, arg3);
}
@OriginalMember(owner = "client!le", name = "a", descriptor = "(I)I")
public static int getWindowMode() {
if (GameShell.fullScreenFrame != null) {
return 3;
} else if (GlRenderer.enabled && Static124.aBoolean156) {
return 2;
} else if (GlRenderer.enabled && !Static124.aBoolean156) {
return 1;
} else {
return 0;
}
}
@OriginalMember(owner = "client!pm", name = "a", descriptor = "(ZIZIZII)V")
public static void setWindowMode(@OriginalArg(0) boolean arg0, @OriginalArg(1) int arg1, @OriginalArg(2) boolean arg2, @OriginalArg(3) int arg3, @OriginalArg(5) int arg4, @OriginalArg(6) int arg5) {
if (arg2) {
GlRenderer.quit();
}
if (GameShell.fullScreenFrame != null && (arg1 != 3 || arg4 != Preferences.fullScreenWidth || arg5 != Preferences.fullScreenHeight)) {
exitFullScreen(GameShell.fullScreenFrame, GameShell.signLink);
GameShell.fullScreenFrame = null;
}
if (arg1 == 3 && GameShell.fullScreenFrame == null) {
GameShell.fullScreenFrame = Static169.method3176(0, arg5, arg4, GameShell.signLink);
if (GameShell.fullScreenFrame != null) {
Preferences.fullScreenHeight = arg5;
Preferences.fullScreenWidth = arg4;
Preferences.write(GameShell.signLink);
}
}
if (arg1 == 3 && GameShell.fullScreenFrame == null) {
setWindowMode(true, Preferences.favoriteWorlds, true, arg3, -1, -1);
return;
}
@Pc(85) Container local85;
if (GameShell.fullScreenFrame != null) {
local85 = GameShell.fullScreenFrame;
} else if (GameShell.frame == null) {
local85 = GameShell.signLink.applet;
} else {
local85 = GameShell.frame;
}
GameShell.frameWidth = local85.getSize().width;
GameShell.frameHeight = local85.getSize().height;
@Pc(109) Insets local109;
if (GameShell.frame == local85) {
local109 = GameShell.frame.getInsets();
GameShell.frameWidth -= local109.right + local109.left;
GameShell.frameHeight -= local109.bottom + local109.top;
}
if (arg1 >= 2) {
GameShell.canvasWidth = GameShell.frameWidth;
GameShell.canvasHeight = GameShell.frameHeight;
GameShell.leftMargin = 0;
GameShell.topMargin = 0;
} else {
GameShell.topMargin = 0;
GameShell.leftMargin = (GameShell.frameWidth - 765) / 2;
GameShell.canvasWidth = 765;
GameShell.canvasHeight = 503;
}
if (arg0) {
Keyboard.stop(GameShell.canvas);
Mouse.stop(GameShell.canvas);
if (client.mouseWheel != null) {
client.mouseWheel.stop(GameShell.canvas);
}
client.instance.addCanvas();
Keyboard.start(GameShell.canvas);
Mouse.start(GameShell.canvas);
if (client.mouseWheel != null) {
client.mouseWheel.start(GameShell.canvas);
}
} else {
if (GlRenderer.enabled) {
GlRenderer.setCanvasSize(GameShell.canvasWidth, GameShell.canvasHeight);
}
GameShell.canvas.setSize(GameShell.canvasWidth, GameShell.canvasHeight);
if (GameShell.frame == local85) {
local109 = GameShell.frame.getInsets();
GameShell.canvas.setLocation(local109.left + GameShell.leftMargin, local109.top + GameShell.topMargin);
} else {
GameShell.canvas.setLocation(GameShell.leftMargin, GameShell.topMargin);
}
}
if (arg1 == 0 && arg3 > 0) {
GlRenderer.createAndDestroyContext(GameShell.canvas);
}
if (arg2 && arg1 > 0) {
GameShell.canvas.setIgnoreRepaint(true);
if (!Static211.aBoolean73) {
SceneGraph.clear();
SoftwareRaster.frameBuffer = null;
SoftwareRaster.frameBuffer = Static131.create(GameShell.canvasHeight, GameShell.canvasWidth, GameShell.canvas);
SoftwareRaster.clear();
if (client.gameState == 5) {
LoadingBar.render(true, Fonts.b12Full);
} else {
Static114.drawTextOnScreen(false, LocalizedText.LOADING);
}
try {
@Pc(269) Graphics local269 = GameShell.canvas.getGraphics();
SoftwareRaster.frameBuffer.draw(local269);
} catch (@Pc(277) Exception local277) {
}
Static139.method2704();
if (arg3 == 0) {
SoftwareRaster.frameBuffer = Static131.create(503, 765, GameShell.canvas);
} else {
SoftwareRaster.frameBuffer = null;
}
@Pc(300) PrivilegedRequest local300 = GameShell.signLink.loadGlNatives(client.instance.getClass());
while (local300.status == 0) {
ThreadUtils.sleep(100L);
}
if (local300.status == 1) {
Static211.aBoolean73 = true;
}
}
if (Static211.aBoolean73) {
GlRenderer.init(GameShell.canvas, Preferences.antiAliasingMode * 2);
}
}
if (!GlRenderer.enabled && arg1 > 0) {
setWindowMode(true, 0, true, arg3, -1, -1);
return;
}
if (arg1 > 0 && arg3 == 0) {
GameShell.thread.setPriority(5);
SoftwareRaster.frameBuffer = null;
SoftwareModel.method4580();
((Js5GlTextureProvider) Rasteriser.textureProvider).method3248(200);
if (Preferences.highDetailLighting) {
Rasteriser.setBrightness(0.7F);
}
Static40.method4637();
} else if (arg1 == 0 && arg3 > 0) {
GameShell.thread.setPriority(1);
SoftwareRaster.frameBuffer = Static131.create(503, 765, GameShell.canvas);
SoftwareModel.method4583();
Static76.method1643();
((Js5GlTextureProvider) Rasteriser.textureProvider).method3248(20);
if (Preferences.highDetailLighting) {
if (Preferences.brightness == 1) {
Rasteriser.setBrightness(0.9F);
}
if (Preferences.brightness == 2) {
Rasteriser.setBrightness(0.8F);
}
if (Preferences.brightness == 3) {
Rasteriser.setBrightness(0.7F);
}
if (Preferences.brightness == 4) {
Rasteriser.setBrightness(0.6F);
}
}
GlTile.method1939();
Static40.method4637();
}
Static87.aBoolean130 = !SceneGraph.allLevelsAreVisible();
if (arg2) {
client.method2721();
}
if (arg1 >= 2) {
Static124.aBoolean156 = true;
} else {
Static124.aBoolean156 = false;
}
if (InterfaceList.topLevelInterface != -1) {
Static210.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;
}
GameShell.fullRedraw = true;
}
@OriginalMember(owner = "client!ab", name = "c", descriptor = "(B)[Lclient!od;")
public static DisplayMode[] getDisplayModes() {
if (aClass114Array1 == null) {
@Pc(16) DisplayMode[] local16 = method3558(GameShell.signLink);
@Pc(20) DisplayMode[] local20 = new DisplayMode[local16.length];
@Pc(22) int local22 = 0;
label52: for (@Pc(24) int local24 = 0; local24 < local16.length; local24++) {
@Pc(32) DisplayMode local32 = local16[local24];
if ((local32.bitDepth <= 0 || local32.bitDepth >= 24) && local32.width >= 800 && local32.height >= 600) {
for (@Pc(52) int local52 = 0; local52 < local22; local52++) {
@Pc(59) DisplayMode local59 = local20[local52];
if (local32.width == local59.width && local59.height == local32.height) {
if (local32.bitDepth > local59.bitDepth) {
local20[local52] = local32;
}
continue label52;
}
}
local20[local22] = local32;
local22++;
}
}
aClass114Array1 = new DisplayMode[local22];
ArrayUtils.copy(local20, 0, aClass114Array1, 0, local22);
@Pc(112) int[] local112 = new int[aClass114Array1.length];
for (@Pc(114) int local114 = 0; local114 < aClass114Array1.length; local114++) {
@Pc(122) DisplayMode local122 = aClass114Array1[local114];
local112[local114] = local122.height * local122.width;
}
Static181.method3346(local112, aClass114Array1);
}
return aClass114Array1;
}
@OriginalMember(owner = "client!pm", name = "a", descriptor = "(ILsignlink!ll;)[Lclient!od;")
public static DisplayMode[] method3558(@OriginalArg(1) SignLink arg0) {
if (!arg0.isFullScreenSupported()) {
return new DisplayMode[0];
}
@Pc(17) PrivilegedRequest local17 = arg0.getDisplayModes();
while (local17.status == 0) {
ThreadUtils.sleep(10L);
}
if (local17.status == 2) {
return new DisplayMode[0];
}
@Pc(39) int[] local39 = (int[]) local17.result;
@Pc(45) DisplayMode[] local45 = new DisplayMode[local39.length >> 2];
for (@Pc(47) int local47 = 0; local47 < local45.length; local47++) {
@Pc(59) DisplayMode local59 = new DisplayMode();
local45[local47] = local59;
local59.width = local39[local47 << 2];
local59.height = local39[(local47 << 2) + 1];
local59.bitDepth = local39[(local47 << 2) + 2];
local59.refreshRate = local39[(local47 << 2) + 3];
}
return local45;
}
} }

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

@ -37,11 +37,11 @@ public final class Environment {
@OriginalMember(owner = "client!li", name = "<init>", descriptor = "()V") @OriginalMember(owner = "client!li", name = "<init>", descriptor = "()V")
public Environment() { public Environment() {
this.anInt3526 = Static161.anInt3923; this.anInt3526 = FogManager.anInt3923;
this.aFloat17 = 1.2F; this.aFloat17 = 1.2F;
this.anInt3527 = -50; this.anInt3527 = -50;
this.aFloat16 = 1.1523438F; this.aFloat16 = 1.1523438F;
this.anInt3525 = Static161.anInt3922; this.anInt3525 = FogManager.anInt3922;
this.anInt3528 = -60; this.anInt3528 = -60;
this.aFloat18 = 0.69921875F; this.aFloat18 = 0.69921875F;
this.anInt3529 = 0; this.anInt3529 = 0;
@ -52,7 +52,7 @@ public final class Environment {
public Environment(@OriginalArg(0) Buffer arg0) { public Environment(@OriginalArg(0) Buffer arg0) {
@Pc(7) int local7 = arg0.g1(); @Pc(7) int local7 = arg0.g1();
if ((local7 & 0x1) == 0) { if ((local7 & 0x1) == 0) {
this.anInt3526 = Static161.anInt3923; this.anInt3526 = FogManager.anInt3923;
} else { } else {
this.anInt3526 = arg0.g4(); this.anInt3526 = arg0.g4();
} }
@ -81,7 +81,7 @@ public final class Environment {
this.anInt3527 = arg0.g2s(); this.anInt3527 = arg0.g2s();
} }
if ((local7 & 0x20) == 0) { if ((local7 & 0x20) == 0) {
this.anInt3525 = Static161.anInt3922; this.anInt3525 = FogManager.anInt3922;
} else { } else {
this.anInt3525 = arg0.g4(); this.anInt3525 = arg0.g4();
} }

2
client/src/main/java/rt4/Static161.java → client/src/main/java/rt4/FogManager.java
View file

@ -5,7 +5,7 @@ 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;
public final class Static161 { public final class FogManager {
@OriginalMember(owner = "client!mk", name = "c", descriptor = "I") @OriginalMember(owner = "client!mk", name = "c", descriptor = "I")
public static int anInt3920; public static int anInt3920;

30
client/src/main/java/rt4/GlModel.java
View file

@ -2379,9 +2379,9 @@ public final class GlModel extends Model {
aClass3_Sub15_8.p4(local71); aClass3_Sub15_8.p4(local71);
} }
} else { } else {
local60 = (int) Static161.aFloatArray18[0]; local60 = (int) FogManager.aFloatArray18[0];
local71 = (int) Static161.aFloatArray18[1]; local71 = (int) FogManager.aFloatArray18[1];
local78 = (int) Static161.aFloatArray18[2]; local78 = (int) FogManager.aFloatArray18[2];
local85 = (int) Math.sqrt((double) (local60 * local60 + local71 * local71 + local78 * local78)); local85 = (int) Math.sqrt((double) (local60 * local60 + local71 * local71 + local78 * local78));
local90 = (int) ((float) this.aShort29 * 1.3F); local90 = (int) ((float) this.aShort29 * 1.3F);
local97 = this.aShort28 * local85 >> 8; local97 = this.aShort28 * local85 >> 8;
@ -3461,21 +3461,21 @@ public final class GlModel extends Model {
} }
@Pc(26) int local26; @Pc(26) int local26;
@Pc(40) int local40; @Pc(40) int local40;
if (Static161.anInt3920 > 0) { if (FogManager.anInt3920 > 0) {
local26 = this.vertexBuffer.aShort6 - (this.vertexBuffer.aShort3 * Static161.anInt3920 >> 8) >> 3; local26 = this.vertexBuffer.aShort6 - (this.vertexBuffer.aShort3 * FogManager.anInt3920 >> 8) >> 3;
local40 = this.vertexBuffer.aShort5 - (this.vertexBuffer.aShort2 * Static161.anInt3920 >> 8) >> 3; local40 = this.vertexBuffer.aShort5 - (this.vertexBuffer.aShort2 * FogManager.anInt3920 >> 8) >> 3;
} else { } else {
local26 = this.vertexBuffer.aShort6 - (this.vertexBuffer.aShort2 * Static161.anInt3920 >> 8) >> 3; local26 = this.vertexBuffer.aShort6 - (this.vertexBuffer.aShort2 * FogManager.anInt3920 >> 8) >> 3;
local40 = this.vertexBuffer.aShort5 - (this.vertexBuffer.aShort3 * Static161.anInt3920 >> 8) >> 3; local40 = this.vertexBuffer.aShort5 - (this.vertexBuffer.aShort3 * FogManager.anInt3920 >> 8) >> 3;
} }
@Pc(85) int local85; @Pc(85) int local85;
@Pc(99) int local99; @Pc(99) int local99;
if (Static161.anInt3921 > 0) { if (FogManager.anInt3921 > 0) {
local85 = this.vertexBuffer.aShort8 - (this.vertexBuffer.aShort3 * Static161.anInt3921 >> 8) >> 3; local85 = this.vertexBuffer.aShort8 - (this.vertexBuffer.aShort3 * FogManager.anInt3921 >> 8) >> 3;
local99 = this.vertexBuffer.aShort7 - (this.vertexBuffer.aShort2 * Static161.anInt3921 >> 8) >> 3; local99 = this.vertexBuffer.aShort7 - (this.vertexBuffer.aShort2 * FogManager.anInt3921 >> 8) >> 3;
} else { } else {
local85 = this.vertexBuffer.aShort8 - (this.vertexBuffer.aShort2 * Static161.anInt3921 >> 8) >> 3; local85 = this.vertexBuffer.aShort8 - (this.vertexBuffer.aShort2 * FogManager.anInt3921 >> 8) >> 3;
local99 = this.vertexBuffer.aShort7 - (this.vertexBuffer.aShort3 * Static161.anInt3921 >> 8) >> 3; local99 = this.vertexBuffer.aShort7 - (this.vertexBuffer.aShort3 * FogManager.anInt3921 >> 8) >> 3;
} }
@Pc(134) int local134 = local40 + 1 - local26; @Pc(134) int local134 = local40 + 1 - local26;
@Pc(140) int local140 = local99 + 1 - local85; @Pc(140) int local140 = local99 + 1 - local85;
@ -3499,8 +3499,8 @@ public final class GlModel extends Model {
@Pc(248) int local248; @Pc(248) int local248;
@Pc(258) int local258; @Pc(258) int local258;
for (local194 = 0; local194 < this.vertexCount; local194++) { for (local194 = 0; local194 < this.vertexCount; local194++) {
@Pc(216) int local216 = (this.anIntArray461[local194] - (this.anIntArray465[local194] * Static161.anInt3920 >> 8) >> 3) - local26; @Pc(216) int local216 = (this.anIntArray461[local194] - (this.anIntArray465[local194] * FogManager.anInt3920 >> 8) >> 3) - local26;
@Pc(234) int local234 = (this.anIntArray466[local194] - (this.anIntArray465[local194] * Static161.anInt3921 >> 8) >> 3) - local85; @Pc(234) int local234 = (this.anIntArray466[local194] - (this.anIntArray465[local194] * FogManager.anInt3921 >> 8) >> 3) - local85;
@Pc(239) int local239 = this.anIntArray462[local194]; @Pc(239) int local239 = this.anIntArray462[local194];
local246 = this.anIntArray462[local194 + 1]; local246 = this.anIntArray462[local194 + 1];
for (local248 = local239; local248 < local246; local248++) { for (local248 = local239; local248 < local246; local248++) {

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

@ -270,8 +270,8 @@ public final class GlRenderer {
gl.glEnableClientState(GL2.GL_TEXTURE_COORD_ARRAY); gl.glEnableClientState(GL2.GL_TEXTURE_COORD_ARRAY);
gl.glMatrixMode(GL2.GL_MODELVIEW); gl.glMatrixMode(GL2.GL_MODELVIEW);
gl.glLoadIdentity(); gl.glLoadIdentity();
Static161.method3065(); FogManager.method3065();
LightingManager.method2400(); // LightingManager LightingManager.method2400();
} }
@OriginalMember(owner = "client!tf", name = "g", descriptor = "()V") @OriginalMember(owner = "client!tf", name = "g", descriptor = "()V")

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

@ -190,4 +190,16 @@ public class InterfaceList {
return arg0.ops[arg1]; return arg0.ops[arg1];
} }
} }
@OriginalMember(owner = "client!qf", name = "a", descriptor = "(BII)Lclient!be;")
public static Component method1418(@OriginalArg(1) int arg0, @OriginalArg(2) int arg1) {
@Pc(7) Component local7 = getComponent(arg0);
if (arg1 == -1) {
return local7;
} else if (local7 == null || local7.createdComponents == null || local7.createdComponents.length <= arg1) {
return null;
} else {
return local7.createdComponents[arg1];
}
}
} }

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

@ -19,6 +19,8 @@ public final class JagString implements StringInterface {
public static final JagString EMPTY = parse(""); public static final JagString EMPTY = parse("");
@OriginalMember(owner = "client!pi", name = "Q", descriptor = "Lclient!na;") @OriginalMember(owner = "client!pi", name = "Q", descriptor = "Lclient!na;")
public static final JagString aClass100_853 = parse("null"); public static final JagString aClass100_853 = parse("null");
@OriginalMember(owner = "client!t", name = "C", descriptor = "Lclient!na;")
public static final JagString aClass100_994 = parse(")3");
@OriginalMember(owner = "client!na", name = "T", descriptor = "[B") @OriginalMember(owner = "client!na", name = "T", descriptor = "[B")
public byte[] chars; public byte[] chars;
@ -192,6 +194,11 @@ public final class JagString implements StringInterface {
return parseInt(true, arg0); return parseInt(true, arg0);
} }
@OriginalMember(owner = "client!oi", name = "a", descriptor = "(II)Lclient!na;")
public static JagString formatIp(@OriginalArg(0) int arg0) {
return concatenate(new JagString[] { parseInt(arg0 >> 24 & 0xFF), aClass100_994, parseInt(arg0 >> 16 & 0xFF), aClass100_994, parseInt(arg0 >> 8 & 0xFF), aClass100_994, parseInt(arg0 & 0xFF) });
}
@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));

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

@ -413,7 +413,7 @@ public class LightingManager {
local4.glTexEnvi(GL2.GL_TEXTURE_ENV, GL2.GL_OPERAND0_RGB, GL2.GL_SRC_COLOR); local4.glTexEnvi(GL2.GL_TEXTURE_ENV, GL2.GL_OPERAND0_RGB, GL2.GL_SRC_COLOR);
local4.glBlendFunc(GL2.GL_SRC_ALPHA, GL2.GL_ONE_MINUS_SRC_ALPHA); local4.glBlendFunc(GL2.GL_SRC_ALPHA, GL2.GL_ONE_MINUS_SRC_ALPHA);
local4.glDepthMask(true); local4.glDepthMask(true);
local4.glFogfv(GL2.GL_FOG_COLOR, Static161.fogColor, 0); local4.glFogfv(GL2.GL_FOG_COLOR, FogManager.fogColor, 0);
local4.glEnableClientState(GL2.GL_TEXTURE_COORD_ARRAY); local4.glEnableClientState(GL2.GL_TEXTURE_COORD_ARRAY);
GlRenderer.restoreLighting(); GlRenderer.restoreLighting();
} }

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

@ -12,14 +12,16 @@ public class LoadingBarAwt {
public static FontMetrics aFontMetrics1; public static FontMetrics aFontMetrics1;
@OriginalMember(owner = "client!lj", name = "y", descriptor = "Ljava/awt/Image;") @OriginalMember(owner = "client!lj", name = "y", descriptor = "Ljava/awt/Image;")
public static Image anImage3; public static Image anImage3;
@OriginalMember(owner = "client!sa", name = "R", descriptor = "Ljava/awt/Font;")
public static Font aFont1;
@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 (aFont1 == null) {
Static222.aFont1 = new Font("Helvetica", 1, 13); aFont1 = new Font("Helvetica", 1, 13);
aFontMetrics1 = GameShell.canvas.getFontMetrics(Static222.aFont1); aFontMetrics1 = GameShell.canvas.getFontMetrics(aFont1);
} }
if (arg1) { if (arg1) {
local6.setColor(Color.black); local6.setColor(Color.black);
@ -39,7 +41,7 @@ public class LoadingBarAwt {
local56.setColor(Color.black); local56.setColor(Color.black);
local56.drawRect(1, 1, 301, 31); local56.drawRect(1, 1, 301, 31);
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(aFont1);
local56.setColor(Color.white); local56.setColor(Color.white);
arg2.method3112(22, (304 - arg2.method3155(aFontMetrics1)) / 2, local56); arg2.method3112(22, (304 - arg2.method3155(aFontMetrics1)) / 2, local56);
local6.drawImage(anImage3, GameShell.canvasWidth / 2 - 152, GameShell.canvasHeight / 2 + -18, null); local6.drawImage(anImage3, GameShell.canvasWidth / 2 - 152, GameShell.canvasHeight / 2 + -18, null);
@ -52,12 +54,12 @@ public class LoadingBarAwt {
local6.setColor(Color.black); local6.setColor(Color.black);
local6.drawRect(local140 + 1, local146 - -1, 301, 31); local6.drawRect(local140 + 1, local146 - -1, 301, 31);
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(aFont1);
local6.setColor(Color.white); local6.setColor(Color.white);
arg2.method3112(local146 + 22, local140 + (-arg2.method3155(aFontMetrics1) + 304) / 2, local6); arg2.method3112(local146 + 22, local140 + (-arg2.method3155(aFontMetrics1) + 304) / 2, local6);
} }
if (client.mainLoadPrimaryText != null) { if (client.mainLoadPrimaryText != null) {
local6.setFont(Static222.aFont1); local6.setFont(aFont1);
local6.setColor(Color.white); local6.setColor(Color.white);
client.mainLoadPrimaryText.method3112(GameShell.canvasHeight / 2 - 26, GameShell.canvasWidth / 2 - client.mainLoadPrimaryText.method3155(aFontMetrics1) / 2, local6); client.mainLoadPrimaryText.method3112(GameShell.canvasHeight / 2 - 26, GameShell.canvasWidth / 2 - client.mainLoadPrimaryText.method3155(aFontMetrics1) / 2, local6);
} }
@ -69,7 +71,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() {
aFontMetrics1 = null; aFontMetrics1 = null;
Static222.aFont1 = null; aFont1 = null;
anImage3 = null; anImage3 = null;
} }
} }

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

@ -217,7 +217,7 @@ public final class LocType {
public final LocType getMultiLoc() { public final LocType getMultiLoc() {
@Pc(26) int local26 = -1; @Pc(26) int local26 = -1;
if (this.multiLocVarbit != -1) { if (this.multiLocVarbit != -1) {
local26 = Static155.getVarbit(this.multiLocVarbit); local26 = VarpDomain.getVarbit(this.multiLocVarbit);
} else if (this.multiLocVarp != -1) { } else if (this.multiLocVarp != -1) {
local26 = VarpDomain.activeVarps[this.multiLocVarp]; local26 = VarpDomain.activeVarps[this.multiLocVarp];
} }

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

@ -41,7 +41,7 @@ public class LoginManager {
@OriginalMember(owner = "client!pg", name = "S", descriptor = "I") @OriginalMember(owner = "client!pg", name = "S", descriptor = "I")
public static int staffModLevel = 0; public static int staffModLevel = 0;
@OriginalMember(owner = "client!ud", name = "O", descriptor = "I") @OriginalMember(owner = "client!ud", name = "O", descriptor = "I")
public static int playerModLevel = 0; public static int blackmarks = 0;
@OriginalMember(owner = "client!jk", name = "G", descriptor = "Z") @OriginalMember(owner = "client!jk", name = "G", descriptor = "Z")
public static boolean playerUnderage = false; public static boolean playerUnderage = false;
@OriginalMember(owner = "client!ql", name = "c", descriptor = "Z") @OriginalMember(owner = "client!ql", name = "c", descriptor = "Z")
@ -275,7 +275,7 @@ public class LoginManager {
buffer.p1(anInt39); buffer.p1(anInt39);
buffer.p1(client.advertSuppressed ? 1 : 0); buffer.p1(client.advertSuppressed ? 1 : 0);
buffer.p1(1); buffer.p1(1);
buffer.p1(Static144.getWindowMode()); buffer.p1(DisplayMode.getWindowMode());
buffer.p2(GameShell.canvasWidth); buffer.p2(GameShell.canvasWidth);
buffer.p2(GameShell.canvasHeight); buffer.p2(GameShell.canvasHeight);
buffer.p1(Preferences.antiAliasingMode); buffer.p1(Preferences.antiAliasingMode);
@ -395,7 +395,7 @@ public class LoginManager {
Protocol.socket.read(0, 14, Protocol.inboundBuffer.data); Protocol.socket.read(0, 14, Protocol.inboundBuffer.data);
Protocol.inboundBuffer.offset = 0; Protocol.inboundBuffer.offset = 0;
staffModLevel = Protocol.inboundBuffer.g1(); staffModLevel = Protocol.inboundBuffer.g1();
playerModLevel = Protocol.inboundBuffer.g1(); blackmarks = Protocol.inboundBuffer.g1();
playerUnderage = Protocol.inboundBuffer.g1() == 1; playerUnderage = Protocol.inboundBuffer.g1() == 1;
parentalChatConsent = Protocol.inboundBuffer.g1() == 1; parentalChatConsent = Protocol.inboundBuffer.g1() == 1;
parentalAdvertConsent = Protocol.inboundBuffer.g1() == 1; parentalAdvertConsent = Protocol.inboundBuffer.g1() == 1;
@ -497,8 +497,8 @@ public class LoginManager {
@OriginalMember(owner = "client!ca", name = "h", descriptor = "(I)V") @OriginalMember(owner = "client!ca", name = "h", descriptor = "(I)V")
public static void setupLoadingScreenRegion() { public static void setupLoadingScreenRegion() {
@Pc(10) int local10 = (Static138.renderX >> 10) + (Camera.originX >> 3); @Pc(10) int local10 = (Camera.renderX >> 10) + (Camera.originX >> 3);
@Pc(23) int local23 = (Static134.renderZ >> 10) + (Camera.originZ >> 3); @Pc(23) int local23 = (Camera.renderZ >> 10) + (Camera.originZ >> 3);
Static156.locationMapFilesBuffer = new byte[18][]; Static156.locationMapFilesBuffer = new byte[18][];
Static35.underWaterLocationsMapFileIds = new int[18]; Static35.underWaterLocationsMapFileIds = new int[18];
Static191.npcSpawnsFilesBuffer = new byte[18][]; Static191.npcSpawnsFilesBuffer = new byte[18][];
@ -517,11 +517,11 @@ public class LoginManager {
for (@Pc(97) int local97 = (local23 - 6) / 8; local97 <= (local23 + 6) / 8; local97++) { for (@Pc(97) int local97 = (local23 - 6) / 8; local97 <= (local23 + 6) / 8; local97++) {
@Pc(115) int local115 = (local80 << 8) + local97; @Pc(115) int local115 = (local80 << 8) + local97;
Static238.regionBitPacked[local74] = local115; Static238.regionBitPacked[local74] = local115;
Static36.mapFileIds[local74] = client.js5Archive5.getGroupId(JagString.concatenate(new JagString[] { Static103.aClass100_558, JagString.parseInt(local80), Static86.aClass100_488, JagString.parseInt(local97) })); Static36.mapFileIds[local74] = client.js5Archive5.getGroupId(JagString.concatenate(new JagString[] { Static103.aClass100_558, JagString.parseInt(local80), Static86.UNDERSCORE, JagString.parseInt(local97) }));
Static172.locationsMapFileIds[local74] = client.js5Archive5.getGroupId(JagString.concatenate(new JagString[] { Static270.aClass100_1090, JagString.parseInt(local80), Static86.aClass100_488, JagString.parseInt(local97) })); Static172.locationsMapFileIds[local74] = client.js5Archive5.getGroupId(JagString.concatenate(new JagString[] { Static270.aClass100_1090, JagString.parseInt(local80), Static86.UNDERSCORE, JagString.parseInt(local97) }));
Static175.npcSpawnsFileIds[local74] = client.js5Archive5.getGroupId(JagString.concatenate(new JagString[] { Static179.aClass100_807, JagString.parseInt(local80), Static86.aClass100_488, JagString.parseInt(local97) })); Static175.npcSpawnsFileIds[local74] = client.js5Archive5.getGroupId(JagString.concatenate(new JagString[] { Static179.aClass100_807, JagString.parseInt(local80), Static86.UNDERSCORE, JagString.parseInt(local97) }));
Static99.underWaterMapFileIds[local74] = client.js5Archive5.getGroupId(JagString.concatenate(new JagString[] { Static165.aClass100_772, JagString.parseInt(local80), Static86.aClass100_488, JagString.parseInt(local97) })); Static99.underWaterMapFileIds[local74] = client.js5Archive5.getGroupId(JagString.concatenate(new JagString[] { Static165.aClass100_772, JagString.parseInt(local80), Static86.UNDERSCORE, JagString.parseInt(local97) }));
Static35.underWaterLocationsMapFileIds[local74] = client.js5Archive5.getGroupId(JagString.concatenate(new JagString[] { Static278.aClass100_1103, JagString.parseInt(local80), Static86.aClass100_488, JagString.parseInt(local97) })); Static35.underWaterLocationsMapFileIds[local74] = client.js5Archive5.getGroupId(JagString.concatenate(new JagString[] { Static278.aClass100_1103, JagString.parseInt(local80), Static86.UNDERSCORE, JagString.parseInt(local97) }));
if (Static175.npcSpawnsFileIds[local74] == -1) { if (Static175.npcSpawnsFileIds[local74] == -1) {
Static36.mapFileIds[local74] = -1; Static36.mapFileIds[local74] = -1;
Static172.locationsMapFileIds[local74] = -1; Static172.locationsMapFileIds[local74] = -1;

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

@ -283,7 +283,7 @@ public class MiniMap {
continue; continue;
} }
} }
method1446(arg3, Static67.mapfuncs[local382.mapElement], local150, local181, arg1, arg2); method1446(arg3, Sprites.mapfuncs[local382.mapElement], local150, local181, arg1, arg2);
} }
for (local146 = 0; local146 < 104; local146++) { for (local146 = 0; local146 < 104; local146++) {
for (local181 = 0; local181 < 104; local181++) { for (local181 = 0; local181 < 104; local181++) {
@ -308,7 +308,7 @@ public class MiniMap {
if (local507.anInt3739 == -1) { if (local507.anInt3739 == -1) {
method1446(arg3, Sprites.mapdots[1], local231, local154, arg1, arg2); method1446(arg3, Sprites.mapdots[1], local231, local154, arg1, arg2);
} else { } else {
method1446(arg3, Static67.mapfuncs[local507.anInt3739], local231, local154, arg1, arg2); method1446(arg3, Sprites.mapfuncs[local507.anInt3739], local231, local154, arg1, arg2);
} }
} }
} }

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

@ -61,6 +61,8 @@ public class MiniMenu {
public static final JagString OPEN_PARENTHESIS = JagString.parse(" (X"); public static final JagString OPEN_PARENTHESIS = JagString.parse(" (X");
@OriginalMember(owner = "client!qi", name = "B", descriptor = "Lclient!na;") @OriginalMember(owner = "client!qi", name = "B", descriptor = "Lclient!na;")
public static final JagString COLOR_WHITE = JagString.parse("<col=ffffff>"); public static final JagString COLOR_WHITE = JagString.parse("<col=ffffff>");
@OriginalMember(owner = "client!cb", name = "ab", descriptor = "Lclient!na;")
public static final JagString aClass100_164 = JagString.parse(" )2> <col=00ffff>");
@OriginalMember(owner = "client!ck", name = "D", descriptor = "Lclient!na;") @OriginalMember(owner = "client!ck", name = "D", descriptor = "Lclient!na;")
public static JagString aClass100_203 = null; public static JagString aClass100_203 = null;
@OriginalMember(owner = "client!hn", name = "W", descriptor = "Lclient!na;") @OriginalMember(owner = "client!hn", name = "W", descriptor = "Lclient!na;")
@ -251,7 +253,7 @@ public class MiniMenu {
@OriginalMember(owner = "client!hj", name = "a", descriptor = "(IJBLclient!na;ISLclient!na;I)V") @OriginalMember(owner = "client!hj", name = "a", descriptor = "(IJBLclient!na;ISLclient!na;I)V")
public static void add(@OriginalArg(0) int cursor, @OriginalArg(1) long arg1, @OriginalArg(3) JagString arg2, @OriginalArg(4) int arg3, @OriginalArg(5) short arg4, @OriginalArg(6) JagString arg5, @OriginalArg(7) int arg6) { public static void add(@OriginalArg(0) int cursor, @OriginalArg(1) long arg1, @OriginalArg(3) JagString arg2, @OriginalArg(4) int arg3, @OriginalArg(5) short arg4, @OriginalArg(6) JagString arg5, @OriginalArg(7) int arg6) {
if (Static60.aBoolean108 || size >= 500) { if (Static40.aBoolean108 || size >= 500) {
return; return;
} }
ops[size] = arg5; ops[size] = arg5;
@ -417,7 +419,7 @@ public class MiniMenu {
Protocol.outboundBuffer.p2(local19 + Camera.originZ); Protocol.outboundBuffer.p2(local19 + Camera.originZ);
} }
if (local23 == 28) { if (local23 == 28) {
ClientProt.method2909(); ClientProt.closeWidget();
} }
if (local23 == 45) { if (local23 == 45) {
local192 = NpcList.npcs[local36]; local192 = NpcList.npcs[local36];
@ -552,7 +554,7 @@ public class MiniMenu {
} }
if (local23 == 41 && Static39.aClass13_10 == null) { if (local23 == 41 && Static39.aClass13_10 == null) {
ClientProt.method10(local15, local19); ClientProt.method10(local15, local19);
Static39.aClass13_10 = Static201.method1418(local19, local15); Static39.aClass13_10 = InterfaceList.method1418(local19, local15);
InterfaceList.redraw(Static39.aClass13_10); InterfaceList.redraw(Static39.aClass13_10);
} }
if (local23 == 49) { if (local23 == 49) {
@ -635,7 +637,7 @@ public class MiniMenu {
} }
} }
if (local23 == 32) { if (local23 == 32) {
local693 = Static201.method1418(local19, local15); local693 = InterfaceList.method1418(local19, local15);
if (local693 != null) { if (local693 != null) {
Static53.method1294(); Static53.method1294();
@Pc(1493) ServerActiveProperties local1493 = InterfaceList.getServerActiveProperties(local693); @Pc(1493) ServerActiveProperties local1493 = InterfaceList.getServerActiveProperties(local693);
@ -1058,7 +1060,7 @@ public class MiniMenu {
@Pc(33) int local33 = (arg5 - arg3) * (local17 - local19) / arg1 + local19; @Pc(33) int local33 = (arg5 - arg3) * (local17 - local19) / arg1 + local19;
x = local15 + (local13 - local15) * (arg4 - arg0) / arg2; x = local15 + (local13 - local15) * (arg4 - arg0) / arg2;
if (Static241.aBoolean302 && (anInt4999 & 0x40) != 0) { if (Static241.aBoolean302 && (anInt4999 & 0x40) != 0) {
@Pc(61) Component local61 = Static201.method1418(anInt2512, anInt506); @Pc(61) Component local61 = InterfaceList.method1418(anInt2512, anInt506);
if (local61 == null) { if (local61 == null) {
Static53.method1294(); Static53.method1294();
} else { } else {
@ -1090,11 +1092,11 @@ public class MiniMenu {
continue; continue;
} }
if (anInt5014 == 1) { if (anInt5014 == 1) {
add(Static169.anInt4075, local121, JagString.concatenate(new JagString[] {aClass100_203, Static27.aClass100_164, local172.name}), x, (short) 14, LocalizedText.USE, z); add(Static169.anInt4075, local121, JagString.concatenate(new JagString[] {aClass100_203, aClass100_164, local172.name}), x, (short) 14, LocalizedText.USE, z);
} else if (Static241.aBoolean302) { } else if (Static241.aBoolean302) {
@Pc(363) ParamType local363 = Static121.anInt3039 == -1 ? null : ParamTypeList.get(Static121.anInt3039); @Pc(363) ParamType local363 = Static121.anInt3039 == -1 ? null : ParamTypeList.get(Static121.anInt3039);
if ((anInt4999 & 0x4) != 0 && (local363 == null || local172.getParam(local363.defaultInt, Static121.anInt3039) != local363.defaultInt)) { if ((anInt4999 & 0x4) != 0 && (local363 == null || local172.getParam(local363.defaultInt, Static121.anInt3039) != local363.defaultInt)) {
add(Static246.anInt5393, local121, JagString.concatenate(new JagString[] { aClass100_466, Static27.aClass100_164, local172.name}), x, (short) 38, aClass100_545, z); add(Static246.anInt5393, local121, JagString.concatenate(new JagString[] { aClass100_466, aClass100_164, local172.name}), x, (short) 38, aClass100_545, z);
} }
} else { } else {
@Pc(228) JagString[] local228 = local172.ops; @Pc(228) JagString[] local228 = local172.ops;

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

@ -9,6 +9,9 @@ import org.openrs2.deob.annotation.Pc;
@OriginalClass("client!uc") @OriginalClass("client!uc")
public abstract class MouseWheel { public abstract class MouseWheel {
@OriginalMember(owner = "client!eh", name = "j", descriptor = "I")
public static int wheelRotation = 0;
@OriginalMember(owner = "client!dh", name = "a", descriptor = "(B)Lclient!uc;") @OriginalMember(owner = "client!dh", name = "a", descriptor = "(B)Lclient!uc;")
public static MouseWheel create() { public static MouseWheel create() {
try { try {

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

@ -173,7 +173,7 @@ public final class NpcType {
public final NpcType getMultiNpc() { public final NpcType getMultiNpc() {
@Pc(5) int local5 = -1; @Pc(5) int local5 = -1;
if (this.multiNpcVarbit != -1) { if (this.multiNpcVarbit != -1) {
local5 = Static155.getVarbit(this.multiNpcVarbit); local5 = VarpDomain.getVarbit(this.multiNpcVarbit);
} else if (this.multiNpcVarp != -1) { } else if (this.multiNpcVarp != -1) {
local5 = VarpDomain.activeVarps[this.multiNpcVarp]; local5 = VarpDomain.activeVarps[this.multiNpcVarp];
} }
@ -192,7 +192,7 @@ public final class NpcType {
} }
@Pc(16) int local16 = -1; @Pc(16) int local16 = -1;
if (this.multiNpcVarbit != -1) { if (this.multiNpcVarbit != -1) {
local16 = Static155.getVarbit(this.multiNpcVarbit); local16 = VarpDomain.getVarbit(this.multiNpcVarbit);
} else if (this.multiNpcVarp != -1) { } else if (this.multiNpcVarp != -1) {
local16 = VarpDomain.activeVarps[this.multiNpcVarp]; local16 = VarpDomain.activeVarps[this.multiNpcVarp];
} }

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

@ -300,7 +300,7 @@ public abstract class PathingEntity extends Entity {
this.zFine = arg0 * 64 + this.movementQueueZ[0] * 128; this.zFine = arg0 * 64 + this.movementQueueZ[0] * 128;
this.xFine = arg0 * 64 + this.movementQueueX[0] * 128; this.xFine = arg0 * 64 + this.movementQueueX[0] * 128;
if (GlRenderer.enabled && PlayerList.self == this) { if (GlRenderer.enabled && PlayerList.self == this) {
Static86.setInstantFade(); Static103.setInstantFade();
} }
} }

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

@ -483,11 +483,11 @@ public final class Player extends PathingEntity {
@OriginalMember(owner = "client!e", name = "e", descriptor = "(I)Lclient!na;") @OriginalMember(owner = "client!e", name = "e", descriptor = "(I)Lclient!na;")
public final JagString getName() { public final JagString getName() {
@Pc(2) JagString local2 = this.username; @Pc(2) JagString local2 = this.username;
if (Static103.aClass100Array88 != null) { if (PlayerList.playerNames != null) {
local2 = JagString.concatenate(new JagString[] { Static103.aClass100Array88[this.anInt1651], local2 }); local2 = JagString.concatenate(new JagString[] { PlayerList.playerNames[this.anInt1651], local2 });
} }
if (Static263.aClass100Array174 != null) { if (PlayerList.playerNames2 != null) {
local2 = JagString.concatenate(new JagString[] { local2, Static263.aClass100Array174[this.anInt1651] }); local2 = JagString.concatenate(new JagString[] { local2, PlayerList.playerNames2[this.anInt1651] });
} }
return local2; return local2;
} }

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

@ -38,6 +38,8 @@ public final class PlayerAppearance {
public static final int[] MALE_FEATURES = new int[] { 0, 1, 2, 3, 4, 5, 6, 14 }; 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;") @OriginalMember(owner = "client!kh", name = "g", descriptor = "Lclient!hh;")
public static final PlayerAppearance DEFAULT = new PlayerAppearance(); public static final PlayerAppearance DEFAULT = new PlayerAppearance();
@OriginalMember(owner = "client!mc", name = "ab", descriptor = "[I")
public static final int[] FEMALE_FEATURES = new int[] { 7, 8, 9, 10, 11, 12, 13, 15 };
@OriginalMember(owner = "client!cj", name = "e", descriptor = "[[S") @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")
@ -157,7 +159,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] : MALE_FEATURES[local24])) { if (local38 != null && !local38.aBoolean85 && local38.feature == (arg2 ? FEMALE_FEATURES[local24] : MALE_FEATURES[local24])) {
arg3[anIntArray451[local24]] = Integer.MIN_VALUE | local31; arg3[anIntArray451[local24]] = Integer.MIN_VALUE | local31;
break; break;
} }

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

@ -9,10 +9,16 @@ public class PlayerList {
public static final Player[] players = new Player[2048]; public static final Player[] players = new Player[2048];
@OriginalMember(owner = "client!ib", name = "f", descriptor = "[I") @OriginalMember(owner = "client!ib", name = "f", descriptor = "[I")
public static final int[] ids = new int[2048]; public static final int[] ids = new int[2048];
@OriginalMember(owner = "client!ke", name = "Y", descriptor = "[I")
public static final int[] anIntArray309 = new int[] { 1, 4 };
@OriginalMember(owner = "client!nk", name = "O", descriptor = "Lclient!e;") @OriginalMember(owner = "client!nk", name = "O", descriptor = "Lclient!e;")
public static Player self; public static Player self;
@OriginalMember(owner = "client!bf", name = "E", descriptor = "I") @OriginalMember(owner = "client!bf", name = "E", descriptor = "I")
public static int selfId = -1; public static int selfId = -1;
@OriginalMember(owner = "client!vl", name = "j", descriptor = "I") @OriginalMember(owner = "client!vl", name = "j", descriptor = "I")
public static int size = 0; public static int size = 0;
@OriginalMember(owner = "client!i", name = "Ub", descriptor = "[Lclient!na;")
public static JagString[] playerNames;
@OriginalMember(owner = "client!vg", name = "a", descriptor = "[Lclient!na;")
public static JagString[] playerNames2;
} }

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

@ -52,6 +52,8 @@ public class Protocol {
public static int opcode3 = 0; public static int opcode3 = 0;
@OriginalMember(owner = "client!sj", name = "t", descriptor = "I") @OriginalMember(owner = "client!sj", name = "t", descriptor = "I")
public static int opcode2 = 0; public static int opcode2 = 0;
@OriginalMember(owner = "client!bj", name = "r", descriptor = "I")
public static int anInt659 = 2;
@OriginalMember(owner = "client!g", name = "b", descriptor = "(B)V") @OriginalMember(owner = "client!g", name = "b", descriptor = "(B)V")
public static void readLocationPacket() { public static void readLocationPacket() {
@ -390,10 +392,10 @@ public class Protocol {
Static35.underWaterLocationsMapFileIds[local20] = -1; Static35.underWaterLocationsMapFileIds[local20] = -1;
} else { } else {
Static238.regionBitPacked[local20] = local169; Static238.regionBitPacked[local20] = local169;
Static36.mapFileIds[local20] = client.js5Archive5.getGroupId(JagString.concatenate(new JagString[] { Static103.aClass100_558, JagString.parseInt(local138), Static86.aClass100_488, JagString.parseInt(local151) })); Static36.mapFileIds[local20] = client.js5Archive5.getGroupId(JagString.concatenate(new JagString[] { Static103.aClass100_558, JagString.parseInt(local138), Static86.UNDERSCORE, JagString.parseInt(local151) }));
Static172.locationsMapFileIds[local20] = client.js5Archive5.getGroupId(JagString.concatenate(new JagString[] { Static270.aClass100_1090, JagString.parseInt(local138), Static86.aClass100_488, JagString.parseInt(local151) })); Static172.locationsMapFileIds[local20] = client.js5Archive5.getGroupId(JagString.concatenate(new JagString[] { Static270.aClass100_1090, JagString.parseInt(local138), Static86.UNDERSCORE, JagString.parseInt(local151) }));
Static99.underWaterMapFileIds[local20] = client.js5Archive5.getGroupId(JagString.concatenate(new JagString[] { Static165.aClass100_772, JagString.parseInt(local138), Static86.aClass100_488, JagString.parseInt(local151) })); Static99.underWaterMapFileIds[local20] = client.js5Archive5.getGroupId(JagString.concatenate(new JagString[] { Static165.aClass100_772, JagString.parseInt(local138), Static86.UNDERSCORE, JagString.parseInt(local151) }));
Static35.underWaterLocationsMapFileIds[local20] = client.js5Archive5.getGroupId(JagString.concatenate(new JagString[] { Static278.aClass100_1103, JagString.parseInt(local138), Static86.aClass100_488, JagString.parseInt(local151) })); Static35.underWaterLocationsMapFileIds[local20] = client.js5Archive5.getGroupId(JagString.concatenate(new JagString[] { Static278.aClass100_1103, JagString.parseInt(local138), Static86.UNDERSCORE, JagString.parseInt(local151) }));
} }
local20++; local20++;
} }
@ -459,10 +461,10 @@ public class Protocol {
Static238.regionBitPacked[local60] = local571; Static238.regionBitPacked[local60] = local571;
@Pc(609) int local609 = local571 & 0xFF; @Pc(609) int local609 = local571 & 0xFF;
local573 = local571 >> 8 & 0xFF; local573 = local571 >> 8 & 0xFF;
Static36.mapFileIds[local60] = client.js5Archive5.getGroupId(JagString.concatenate(new JagString[] { Static103.aClass100_558, JagString.parseInt(local573), Static86.aClass100_488, JagString.parseInt(local609) })); Static36.mapFileIds[local60] = client.js5Archive5.getGroupId(JagString.concatenate(new JagString[] { Static103.aClass100_558, JagString.parseInt(local573), Static86.UNDERSCORE, JagString.parseInt(local609) }));
Static172.locationsMapFileIds[local60] = client.js5Archive5.getGroupId(JagString.concatenate(new JagString[] { Static270.aClass100_1090, JagString.parseInt(local573), Static86.aClass100_488, JagString.parseInt(local609) })); Static172.locationsMapFileIds[local60] = client.js5Archive5.getGroupId(JagString.concatenate(new JagString[] { Static270.aClass100_1090, JagString.parseInt(local573), Static86.UNDERSCORE, JagString.parseInt(local609) }));
Static99.underWaterMapFileIds[local60] = client.js5Archive5.getGroupId(JagString.concatenate(new JagString[] { Static165.aClass100_772, JagString.parseInt(local573), Static86.aClass100_488, JagString.parseInt(local609) })); Static99.underWaterMapFileIds[local60] = client.js5Archive5.getGroupId(JagString.concatenate(new JagString[] { Static165.aClass100_772, JagString.parseInt(local573), Static86.UNDERSCORE, JagString.parseInt(local609) }));
Static35.underWaterLocationsMapFileIds[local60] = client.js5Archive5.getGroupId(JagString.concatenate(new JagString[] { Static278.aClass100_1103, JagString.parseInt(local573), Static86.aClass100_488, JagString.parseInt(local609) })); Static35.underWaterLocationsMapFileIds[local60] = client.js5Archive5.getGroupId(JagString.concatenate(new JagString[] { Static278.aClass100_1103, JagString.parseInt(local573), Static86.UNDERSCORE, JagString.parseInt(local609) }));
local60++; local60++;
} }
} }
@ -1679,7 +1681,7 @@ public class Protocol {
int shake4 = inboundBuffer.g2(); int shake4 = inboundBuffer.g2();
setVerifyId(tracknum); setVerifyId(tracknum);
Static176.customCameraActive[cameraId] = true; Static176.customCameraActive[cameraId] = true;
Static222.cameraJitter[cameraId] = jitter; Camera.cameraJitter[cameraId] = jitter;
Static276.cameraAmplitude[cameraId] = amplitude; Static276.cameraAmplitude[cameraId] = amplitude;
Static202.cameraFrequency[cameraId] = frequency; Static202.cameraFrequency[cameraId] = frequency;
Static31.anIntArray76[cameraId] = shake4; Static31.anIntArray76[cameraId] = shake4;
@ -1752,7 +1754,7 @@ public class Protocol {
return true; return true;
} else if (opcode == ServerProt.URL_OPEN) { } else if (opcode == ServerProt.URL_OPEN) {
if (GameShell.fullScreenFrame != null) { if (GameShell.fullScreenFrame != null) {
Static241.setWindowMode(false, Preferences.favoriteWorlds, -1, -1); DisplayMode.setWindowMode(false, Preferences.favoriteWorlds, -1, -1);
} }
@Pc(3848) byte[] data = new byte[length]; @Pc(3848) byte[] data = new byte[length];
inboundBuffer.gBytesIsaac(data, length); inboundBuffer.gBytesIsaac(data, length);
@ -2730,11 +2732,11 @@ public class Protocol {
if (WorldMap.component == null) { if (WorldMap.component == null) {
Static137.anInt3337 = 0; Static137.anInt3337 = 0;
} }
if (Static105.aClass13_14 != null) { if (Static40.aClass13_14 != null) {
ClientProt.method28(); ClientProt.method28();
} }
if (LoginManager.staffModLevel > 0 && Keyboard.pressedKeys[Keyboard.KEY_CTRL] && Keyboard.pressedKeys[Keyboard.KEY_SHIFT] && Static58.wheelRotation != 0) { if (LoginManager.staffModLevel > 0 && Keyboard.pressedKeys[Keyboard.KEY_CTRL] && Keyboard.pressedKeys[Keyboard.KEY_SHIFT] && MouseWheel.wheelRotation != 0) {
y = Player.level - Static58.wheelRotation; y = Player.level - MouseWheel.wheelRotation;
if (y < 0) { if (y < 0) {
y = 0; y = 0;
} else if (y > 3) { } else if (y > 3) {
@ -2845,7 +2847,7 @@ public class Protocol {
Static230.anInt5161 += Static220.anInt4941; Static230.anInt5161 += Static220.anInt4941;
} }
if ((modelId & 0x2) == 2) { if ((modelId & 0x2) == 2) {
Static206.anInt4774 += Static20.anInt659; Static206.anInt4774 += anInt659;
} }
if ((modelId & 0x1) == 1) { if ((modelId & 0x1) == 1) {
Static132.anInt3291 += Static248.anInt4229; Static132.anInt3291 += Static248.anInt4229;
@ -2871,10 +2873,10 @@ public class Protocol {
Static179.anInt4262 = 1; Static179.anInt4262 = 1;
} }
if (Static206.anInt4774 < -55) { if (Static206.anInt4774 < -55) {
Static20.anInt659 = 2; anInt659 = 2;
} }
if (Static206.anInt4774 > 55) { if (Static206.anInt4774 > 55) {
Static20.anInt659 = -2; anInt659 = -2;
} }
if (Static230.anInt5161 < -40) { if (Static230.anInt5161 < -40) {
Static220.anInt4941 = 1; Static220.anInt4941 = 1;

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

@ -31,6 +31,12 @@ public final class ScriptRunner {
public static final Calendar aCalendar2 = Calendar.getInstance(); public static final Calendar aCalendar2 = Calendar.getInstance();
@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!fe", name = "nc", descriptor = "[Lclient!hj;")
public static final GoSubFrame[] callStack = new GoSubFrame[50];
@OriginalMember(owner = "client!ee", name = "j", descriptor = "[I")
public static final int[] anIntArray140 = new int[5];
@OriginalMember(owner = "client!oe", name = "i", descriptor = "[[I")
public static final int[][] anIntArrayArray33 = new int[5][5000];
@OriginalMember(owner = "client!jh", name = "n", descriptor = "Lclient!bd;") @OriginalMember(owner = "client!jh", name = "n", descriptor = "Lclient!bd;")
public static QuickChatPhrase activePhrase; public static QuickChatPhrase activePhrase;
@OriginalMember(owner = "client!wf", name = "j", descriptor = "Lclient!be;") @OriginalMember(owner = "client!wf", name = "j", descriptor = "Lclient!be;")
@ -39,6 +45,10 @@ public final class ScriptRunner {
public static Component staticActiveComponent2; public static Component staticActiveComponent2;
@OriginalMember(owner = "client!og", name = "g", descriptor = "[Lclient!na;") @OriginalMember(owner = "client!og", name = "g", descriptor = "[Lclient!na;")
public static JagString[] stringLocals; public static JagString[] stringLocals;
@OriginalMember(owner = "client!rh", name = "a", descriptor = "[I")
public static int[] intLocals;
@OriginalMember(owner = "client!km", name = "ad", descriptor = "I")
public static int fp = 0;
public static class Cs2Opcodes { public static class Cs2Opcodes {
// Component setters // Component setters
@ -366,7 +376,7 @@ public final class ScriptRunner {
if (script == null) { if (script == null) {
return; return;
} }
Static138.fp = 0; fp = 0;
@Pc(26) int ssp = 0; @Pc(26) int ssp = 0;
@Pc(28) int isp = 0; @Pc(28) int isp = 0;
@Pc(30) int pc = -1; @Pc(30) int pc = -1;
@ -375,7 +385,7 @@ public final class ScriptRunner {
@Pc(44) byte op = -1; @Pc(44) byte op = -1;
@Pc(58) int cycles; @Pc(58) int cycles;
try { try {
Static215.intLocals = new int[script.anInt4667]; intLocals = new int[script.anInt4667];
@Pc(50) int intLocalIndex = 0; @Pc(50) int intLocalIndex = 0;
stringLocals = new JagString[script.anInt4671]; stringLocals = new JagString[script.anInt4671];
@Pc(56) int stringLocalIndex = 0; @Pc(56) int stringLocalIndex = 0;
@ -411,7 +421,7 @@ public final class ScriptRunner {
if (id == 0x80000009) { if (id == 0x80000009) {
id = request.keyChar; id = request.keyChar;
} }
Static215.intLocals[intLocalIndex++] = id; intLocals[intLocalIndex++] = id;
} else if (local4[cycles] instanceof JagString) { } else if (local4[cycles] instanceof JagString) {
value = (JagString) local4[cycles]; value = (JagString) local4[cycles];
if (value.strEquals(EVENT_OPBASE)) { if (value.strEquals(EVENT_OPBASE)) {
@ -445,7 +455,7 @@ public final class ScriptRunner {
if (opcode == 2) { if (opcode == 2) {
id = intOperands[pc]; id = intOperands[pc];
isp--; isp--;
Static148.method2766(id, intStack[isp]); VarpDomain.method2766(id, intStack[isp]);
continue; continue;
} }
if (opcode == 3) { if (opcode == 3) {
@ -485,12 +495,12 @@ public final class ScriptRunner {
continue; continue;
} }
if (opcode == 21) { if (opcode == 21) {
if (Static138.fp == 0) { if (fp == 0) {
return; return;
} }
@Pc(423) GoSubFrame frame = Static67.callStack[--Static138.fp]; @Pc(423) GoSubFrame frame = callStack[--fp];
script = frame.script; script = frame.script;
Static215.intLocals = frame.intLocals; intLocals = frame.intLocals;
opcodes = script.opcodes; opcodes = script.opcodes;
pc = frame.pc; pc = frame.pc;
stringLocals = frame.stringLocals; stringLocals = frame.stringLocals;
@ -499,13 +509,13 @@ public final class ScriptRunner {
} }
if (opcode == 25) { if (opcode == 25) {
id = intOperands[pc]; id = intOperands[pc];
intStack[isp++] = Static155.getVarbit(id); intStack[isp++] = VarpDomain.getVarbit(id);
continue; continue;
} }
if (opcode == 27) { if (opcode == 27) {
id = intOperands[pc]; id = intOperands[pc];
isp--; isp--;
Static202.setVarbitClient(id, intStack[isp]); VarpDomain.setVarbitClient(id, intStack[isp]);
continue; continue;
} }
if (opcode == 31) { if (opcode == 31) {
@ -523,14 +533,14 @@ public final class ScriptRunner {
continue; continue;
} }
if (opcode == 33) { if (opcode == 33) {
intStack[isp++] = Static215.intLocals[intOperands[pc]]; intStack[isp++] = intLocals[intOperands[pc]];
continue; continue;
} }
@Pc(555) int local; @Pc(555) int local;
if (opcode == 34) { if (opcode == 34) {
local = intOperands[pc]; local = intOperands[pc];
isp--; isp--;
Static215.intLocals[local] = intStack[isp]; intLocals[local] = intStack[isp];
continue; continue;
} }
if (opcode == 35) { if (opcode == 35) {
@ -573,16 +583,16 @@ public final class ScriptRunner {
ssp -= local642.anInt4669; ssp -= local642.anInt4669;
@Pc(705) GoSubFrame local705 = new GoSubFrame(); @Pc(705) GoSubFrame local705 = new GoSubFrame();
local705.stringLocals = stringLocals; local705.stringLocals = stringLocals;
local705.intLocals = Static215.intLocals; local705.intLocals = intLocals;
local705.pc = pc; local705.pc = pc;
local705.script = script; local705.script = script;
if (Static138.fp >= Static67.callStack.length) { if (fp >= callStack.length) {
throw new RuntimeException(); throw new RuntimeException();
} }
script = local642; script = local642;
pc = -1; pc = -1;
Static67.callStack[Static138.fp++] = local705; callStack[fp++] = local705;
Static215.intLocals = local646; intLocals = local646;
intOperands = local642.intOperands; intOperands = local642.intOperands;
opcodes = local642.opcodes; opcodes = local642.opcodes;
stringLocals = local650; stringLocals = local650;
@ -605,7 +615,7 @@ public final class ScriptRunner {
int3 = intStack[isp]; int3 = intStack[isp];
int1 = intOperands[pc] & 0xFFFF; int1 = intOperands[pc] & 0xFFFF;
if (int3 >= 0 && int3 <= 5000) { if (int3 >= 0 && int3 <= 5000) {
Static55.anIntArray140[id] = int3; anIntArray140[id] = int3;
@Pc(828) byte local828 = -1; @Pc(828) byte local828 = -1;
if (int1 == 105) { if (int1 == 105) {
local828 = 0; local828 = 0;
@ -615,7 +625,7 @@ public final class ScriptRunner {
if (int3 <= local652) { if (int3 <= local652) {
continue nextOp; continue nextOp;
} }
Static179.anIntArrayArray33[id][local652] = local828; anIntArrayArray33[id][local652] = local828;
local652++; local652++;
} }
} }
@ -625,8 +635,8 @@ public final class ScriptRunner {
id = intOperands[pc]; id = intOperands[pc];
isp--; isp--;
int1 = intStack[isp]; int1 = intStack[isp];
if (int1 >= 0 && int1 < Static55.anIntArray140[id]) { if (int1 >= 0 && int1 < anIntArray140[id]) {
intStack[isp++] = Static179.anIntArrayArray33[id][int1]; intStack[isp++] = anIntArrayArray33[id][int1];
continue; continue;
} }
throw new RuntimeException(); throw new RuntimeException();
@ -635,8 +645,8 @@ public final class ScriptRunner {
id = intOperands[pc]; id = intOperands[pc];
isp -= 2; isp -= 2;
int1 = intStack[isp]; int1 = intStack[isp];
if (int1 >= 0 && int1 < Static55.anIntArray140[id]) { if (int1 >= 0 && int1 < anIntArray140[id]) {
Static179.anIntArrayArray33[id][int1] = intStack[isp + 1]; anIntArrayArray33[id][int1] = intStack[isp + 1];
continue; continue;
} }
throw new RuntimeException(); throw new RuntimeException();
@ -644,7 +654,7 @@ public final class ScriptRunner {
if (opcode == 47) { if (opcode == 47) {
value = VarcDomain.varcstrs[intOperands[pc]]; value = VarcDomain.varcstrs[intOperands[pc]];
if (value == null) { if (value == null) {
value = Static254.aClass100_1061; value = VarpDomain.aClass100_1061;
} }
stringStack[ssp++] = value; stringStack[ssp++] = value;
continue; continue;
@ -739,7 +749,7 @@ public final class ScriptRunner {
isp -= 2; isp -= 2;
int1 = intStack[isp]; int1 = intStack[isp];
int3 = intStack[isp + 1]; int3 = intStack[isp + 1];
local1256 = Static201.method1418(int1, int3); local1256 = InterfaceList.method1418(int1, int3);
if (local1256 != null && int3 != -1) { if (local1256 != null && int3 != -1) {
intStack[isp++] = 1; intStack[isp++] = 1;
if (local1020) { if (local1020) {
@ -783,10 +793,10 @@ public final class ScriptRunner {
} }
int2 = 0; int2 = 0;
while (true) { while (true) {
if (int2 >= Static153.anIntArray351.length) { if (int2 >= PlayerAppearance.FEMALE_FEATURES.length) {
continue nextOp; continue nextOp;
} }
if (int1 == Static153.anIntArray351[int2]) { if (int1 == PlayerAppearance.FEMALE_FEATURES[int2]) {
PlayerList.self.appearance.method1953(int2, int3); PlayerList.self.appearance.method1953(int2, int3);
continue nextOp; continue nextOp;
} }
@ -809,7 +819,7 @@ public final class ScriptRunner {
} else { } else {
@Pc(1552) boolean local1552; @Pc(1552) boolean local1552;
if ((opcode < 1000 || opcode >= 1100) && (opcode < 2000 || opcode >= 2100)) { if ((opcode < 1000 || opcode >= 1100) && (opcode < 2000 || opcode >= 2100)) {
@Pc(2522) JagString local2522; @Pc(2522) JagString str1;
if (opcode >= 1100 && opcode < 1200 || !(opcode < 2100 || opcode >= 2200)) { if (opcode >= 1100 && opcode < 1200 || !(opcode < 2100 || opcode >= 2200)) {
if (opcode < 2000) { if (opcode < 2000) {
component = local1020 ? staticActiveComponent1 : staticActiveComponent2; component = local1020 ? staticActiveComponent1 : staticActiveComponent2;
@ -933,9 +943,9 @@ public final class ScriptRunner {
} }
if (opcode == Cs2Opcodes.setText) { if (opcode == Cs2Opcodes.setText) {
ssp--; ssp--;
local2522 = stringStack[ssp]; str1 = stringStack[ssp];
if (!local2522.strEquals(component.text)) { if (!str1.strEquals(component.text)) {
component.text = local2522; component.text = str1;
InterfaceList.redraw(component); InterfaceList.redraw(component);
} }
if (component.createdComponentId == -1) { if (component.createdComponentId == -1) {
@ -1122,7 +1132,7 @@ public final class ScriptRunner {
isp -= 2; isp -= 2;
int2 = intStack[isp + 1]; int2 = intStack[isp + 1];
int3 = intStack[isp]; int3 = intStack[isp];
component.aClass13_5 = Static201.method1418(int3, int2); component.aClass13_5 = InterfaceList.method1418(int3, int2);
continue; continue;
} }
if (opcode == Cs2Opcodes.setDragRenderBehaviour) { if (opcode == Cs2Opcodes.setDragRenderBehaviour) {
@ -1183,8 +1193,8 @@ public final class ScriptRunner {
} }
@Pc(12937) int[] local12937 = null; @Pc(12937) int[] local12937 = null;
ssp--; ssp--;
local2522 = stringStack[ssp]; str1 = stringStack[ssp];
if (local2522.length() > 0 && local2522.charAt(local2522.length() - 1) == 89) { if (str1.length() > 0 && str1.charAt(str1.length() - 1) == 89) {
isp--; isp--;
local652 = intStack[isp]; local652 = intStack[isp];
if (local652 > 0) { if (local652 > 0) {
@ -1194,16 +1204,16 @@ public final class ScriptRunner {
local12937[local652] = intStack[isp]; local12937[local652] = intStack[isp];
} }
} }
local2522 = local2522.substring(local2522.length() - 1, 0); str1 = str1.substring(str1.length() - 1, 0);
} }
@Pc(13000) Object[] local13000 = new Object[local2522.length() + 1]; @Pc(13000) Object[] local13000 = new Object[str1.length() + 1];
for (c = local13000.length - 1; c >= 1; c--) { for (c = local13000.length - 1; c >= 1; c--) {
if (local2522.charAt(c - 1) == 115) { if (str1.charAt(c - 1) == 115) {
ssp--; ssp--;
local13000[c] = stringStack[ssp]; local13000[c] = stringStack[ssp];
} else { } else {
isp--; isp--;
local13000[c] = Integer.valueOf(intStack[isp]); local13000[c] = intStack[isp];
} }
} }
isp--; isp--;
@ -1211,7 +1221,7 @@ public final class ScriptRunner {
if (c == -1) { if (c == -1) {
local13000 = null; local13000 = null;
} else { } else {
local13000[0] = Integer.valueOf(c); local13000[0] = c;
} }
component.aBoolean25 = true; component.aBoolean25 = true;
if (opcode == Cs2Opcodes.hookMousePress) { if (opcode == Cs2Opcodes.hookMousePress) {
@ -1581,7 +1591,7 @@ public final class ScriptRunner {
continue; continue;
} }
if (opcode == Cs2Opcodes.sendCloseWidgetPacket) { if (opcode == Cs2Opcodes.sendCloseWidgetPacket) {
ClientProt.method2909(); ClientProt.closeWidget();
continue; continue;
} }
if (opcode == Cs2Opcodes.sendIntegerInput) { if (opcode == Cs2Opcodes.sendIntegerInput) {
@ -1614,8 +1624,8 @@ public final class ScriptRunner {
isp--; isp--;
int1 = intStack[isp]; int1 = intStack[isp];
ssp--; ssp--;
local2522 = stringStack[ssp]; str1 = stringStack[ssp];
ClientProt.method4613(int1, local2522); ClientProt.clickPlayerOption(int1, str1);
continue; continue;
} }
if (opcode == 3108) { if (opcode == 3108) {
@ -1783,7 +1793,7 @@ public final class ScriptRunner {
continue; continue;
} }
if (opcode == Cs2Opcodes.hasMoreThen5Blackmarks) { if (opcode == Cs2Opcodes.hasMoreThen5Blackmarks) {
if (LoginManager.playerModLevel >= 5 && LoginManager.playerModLevel <= 9) { if (LoginManager.blackmarks >= 5 && LoginManager.blackmarks <= 9) {
intStack[isp++] = 1; intStack[isp++] = 1;
continue; continue;
} }
@ -1791,8 +1801,8 @@ public final class ScriptRunner {
continue; continue;
} }
if (opcode == Cs2Opcodes.getBlackmarks) { if (opcode == Cs2Opcodes.getBlackmarks) {
if (LoginManager.playerModLevel >= 5 && LoginManager.playerModLevel <= 9) { if (LoginManager.blackmarks >= 5 && LoginManager.blackmarks <= 9) {
intStack[isp++] = LoginManager.playerModLevel; intStack[isp++] = LoginManager.blackmarks;
continue; continue;
} }
intStack[isp++] = 0; intStack[isp++] = 0;
@ -1910,7 +1920,7 @@ public final class ScriptRunner {
isp--; isp--;
int1 = intStack[isp]; int1 = intStack[isp];
ssp--; ssp--;
local2522 = stringStack[ssp]; str1 = stringStack[ssp];
if (int1 == -1) { if (int1 == -1) {
throw new RuntimeException("C3410-2"); throw new RuntimeException("C3410-2");
} }
@ -1918,7 +1928,7 @@ public final class ScriptRunner {
if (local3422.valueType != 115) { if (local3422.valueType != 115) {
throw new RuntimeException("C3410-1"); throw new RuntimeException("C3410-1");
} }
intStack[isp++] = local3422.containsValue(local2522) ? 1 : 0; intStack[isp++] = local3422.containsValue(str1) ? 1 : 0;
continue; continue;
} }
if (opcode == Cs2Opcodes.datamapSize) { if (opcode == Cs2Opcodes.datamapSize) {
@ -2328,7 +2338,7 @@ public final class ScriptRunner {
if (int1 == 0) { if (int1 == 0) {
intStack[isp++] = 0; intStack[isp++] = 0;
} else { } else {
intStack[isp++] = (int) Math.pow((double) int1, (double) int3); intStack[isp++] = (int) Math.pow(int1, int3);
} }
continue; continue;
} }
@ -2341,7 +2351,7 @@ public final class ScriptRunner {
} else if (int3 == 0) { } else if (int3 == 0) {
intStack[isp++] = Integer.MAX_VALUE; intStack[isp++] = Integer.MAX_VALUE;
} else { } else {
intStack[isp++] = (int) Math.pow((double) int1, 1.0D / (double) int3); intStack[isp++] = (int) Math.pow(int1, 1.0D / (double) int3);
} }
continue; continue;
} }
@ -2533,16 +2543,16 @@ public final class ScriptRunner {
continue; continue;
} }
if (opcode == 5003) { if (opcode == 5003) {
local2522 = null; str1 = null;
isp--; isp--;
int1 = intStack[isp]; int1 = intStack[isp];
if (int1 < 100) { if (int1 < 100) {
local2522 = Chat.messages[int1]; str1 = Chat.messages[int1];
} }
if (local2522 == null) { if (str1 == null) {
local2522 = EMPTY_STRING; str1 = EMPTY_STRING;
} }
stringStack[ssp++] = local2522; stringStack[ssp++] = str1;
continue; continue;
} }
if (opcode == 5004) { if (opcode == 5004) {
@ -2566,114 +2576,114 @@ public final class ScriptRunner {
if (LoginManager.staffModLevel == 0 && (LoginManager.playerUnderage && !LoginManager.parentalChatConsent || LoginManager.mapQuickChat)) { if (LoginManager.staffModLevel == 0 && (LoginManager.playerUnderage && !LoginManager.parentalChatConsent || LoginManager.mapQuickChat)) {
continue; continue;
} }
local2522 = string.toLowerCase(); str1 = string.toLowerCase();
@Pc(5555) byte local5555 = 0; @Pc(5555) byte local5555 = 0;
if (local2522.startsWith(LocalizedText.STABLE_CHATCOL0)) { if (str1.startsWith(LocalizedText.STABLE_CHATCOL0)) {
local5555 = 0; local5555 = 0;
string = string.substring(LocalizedText.STABLE_CHATCOL0.length()); string = string.substring(LocalizedText.STABLE_CHATCOL0.length());
} else if (local2522.startsWith(LocalizedText.STABLE_CHATCOL1)) { } else if (str1.startsWith(LocalizedText.STABLE_CHATCOL1)) {
string = string.substring(LocalizedText.STABLE_CHATCOL1.length()); string = string.substring(LocalizedText.STABLE_CHATCOL1.length());
local5555 = 1; local5555 = 1;
} else if (local2522.startsWith(LocalizedText.STABLE_CHATCOL2)) { } else if (str1.startsWith(LocalizedText.STABLE_CHATCOL2)) {
string = string.substring(LocalizedText.STABLE_CHATCOL2.length()); string = string.substring(LocalizedText.STABLE_CHATCOL2.length());
local5555 = 2; local5555 = 2;
} else if (local2522.startsWith(LocalizedText.STABLE_CHATCOL3)) { } else if (str1.startsWith(LocalizedText.STABLE_CHATCOL3)) {
local5555 = 3; local5555 = 3;
string = string.substring(LocalizedText.STABLE_CHATCOL3.length()); string = string.substring(LocalizedText.STABLE_CHATCOL3.length());
} else if (local2522.startsWith(LocalizedText.STABLE_CHATCOL4)) { } else if (str1.startsWith(LocalizedText.STABLE_CHATCOL4)) {
string = string.substring(LocalizedText.STABLE_CHATCOL4.length()); string = string.substring(LocalizedText.STABLE_CHATCOL4.length());
local5555 = 4; local5555 = 4;
} else if (local2522.startsWith(LocalizedText.STABLE_CHATCOL5)) { } else if (str1.startsWith(LocalizedText.STABLE_CHATCOL5)) {
string = string.substring(LocalizedText.STABLE_CHATCOL5.length()); string = string.substring(LocalizedText.STABLE_CHATCOL5.length());
local5555 = 5; local5555 = 5;
} else if (local2522.startsWith(LocalizedText.STABLE_CHATCOL6)) { } else if (str1.startsWith(LocalizedText.STABLE_CHATCOL6)) {
local5555 = 6; local5555 = 6;
string = string.substring(LocalizedText.STABLE_CHATCOL6.length()); string = string.substring(LocalizedText.STABLE_CHATCOL6.length());
} else if (local2522.startsWith(LocalizedText.STABLE_CHATCOL7)) { } else if (str1.startsWith(LocalizedText.STABLE_CHATCOL7)) {
local5555 = 7; local5555 = 7;
string = string.substring(LocalizedText.STABLE_CHATCOL7.length()); string = string.substring(LocalizedText.STABLE_CHATCOL7.length());
} else if (local2522.startsWith(LocalizedText.STABLE_CHATCOL8)) { } else if (str1.startsWith(LocalizedText.STABLE_CHATCOL8)) {
string = string.substring(LocalizedText.STABLE_CHATCOL8.length()); string = string.substring(LocalizedText.STABLE_CHATCOL8.length());
local5555 = 8; local5555 = 8;
} else if (local2522.startsWith(LocalizedText.STABLE_CHATCOL9)) { } else if (str1.startsWith(LocalizedText.STABLE_CHATCOL9)) {
local5555 = 9; local5555 = 9;
string = string.substring(LocalizedText.STABLE_CHATCOL9.length()); string = string.substring(LocalizedText.STABLE_CHATCOL9.length());
} else if (local2522.startsWith(LocalizedText.STABLE_CHATCOL10)) { } else if (str1.startsWith(LocalizedText.STABLE_CHATCOL10)) {
local5555 = 10; local5555 = 10;
string = string.substring(LocalizedText.STABLE_CHATCOL10.length()); string = string.substring(LocalizedText.STABLE_CHATCOL10.length());
} else if (local2522.startsWith(LocalizedText.STABLE_CHATCOL11)) { } else if (str1.startsWith(LocalizedText.STABLE_CHATCOL11)) {
string = string.substring(LocalizedText.STABLE_CHATCOL11.length()); string = string.substring(LocalizedText.STABLE_CHATCOL11.length());
local5555 = 11; local5555 = 11;
} else if (client.language != 0) { } else if (client.language != 0) {
if (local2522.startsWith(LocalizedText.CHATCOL0)) { if (str1.startsWith(LocalizedText.CHATCOL0)) {
local5555 = 0; local5555 = 0;
string = string.substring(LocalizedText.CHATCOL0.length()); string = string.substring(LocalizedText.CHATCOL0.length());
} else if (local2522.startsWith(LocalizedText.CHATCOL1)) { } else if (str1.startsWith(LocalizedText.CHATCOL1)) {
string = string.substring(LocalizedText.CHATCOL1.length()); string = string.substring(LocalizedText.CHATCOL1.length());
local5555 = 1; local5555 = 1;
} else if (local2522.startsWith(LocalizedText.CHATCOL2)) { } else if (str1.startsWith(LocalizedText.CHATCOL2)) {
string = string.substring(LocalizedText.CHATCOL2.length()); string = string.substring(LocalizedText.CHATCOL2.length());
local5555 = 2; local5555 = 2;
} else if (local2522.startsWith(LocalizedText.CHATCOL3)) { } else if (str1.startsWith(LocalizedText.CHATCOL3)) {
string = string.substring(LocalizedText.CHATCOL3.length()); string = string.substring(LocalizedText.CHATCOL3.length());
local5555 = 3; local5555 = 3;
} else if (local2522.startsWith(LocalizedText.CHATCOL4)) { } else if (str1.startsWith(LocalizedText.CHATCOL4)) {
string = string.substring(LocalizedText.CHATCOL4.length()); string = string.substring(LocalizedText.CHATCOL4.length());
local5555 = 4; local5555 = 4;
} else if (local2522.startsWith(LocalizedText.CHATCOL5)) { } else if (str1.startsWith(LocalizedText.CHATCOL5)) {
local5555 = 5; local5555 = 5;
string = string.substring(LocalizedText.CHATCOL5.length()); string = string.substring(LocalizedText.CHATCOL5.length());
} else if (local2522.startsWith(LocalizedText.CHATCOL6)) { } else if (str1.startsWith(LocalizedText.CHATCOL6)) {
string = string.substring(LocalizedText.CHATCOL6.length()); string = string.substring(LocalizedText.CHATCOL6.length());
local5555 = 6; local5555 = 6;
} else if (local2522.startsWith(LocalizedText.CHATCOL7)) { } else if (str1.startsWith(LocalizedText.CHATCOL7)) {
local5555 = 7; local5555 = 7;
string = string.substring(LocalizedText.CHATCOL7.length()); string = string.substring(LocalizedText.CHATCOL7.length());
} else if (local2522.startsWith(LocalizedText.CHATCOL8)) { } else if (str1.startsWith(LocalizedText.CHATCOL8)) {
local5555 = 8; local5555 = 8;
string = string.substring(LocalizedText.CHATCOL8.length()); string = string.substring(LocalizedText.CHATCOL8.length());
} else if (local2522.startsWith(LocalizedText.CHATCOL9)) { } else if (str1.startsWith(LocalizedText.CHATCOL9)) {
local5555 = 9; local5555 = 9;
string = string.substring(LocalizedText.CHATCOL9.length()); string = string.substring(LocalizedText.CHATCOL9.length());
} else if (local2522.startsWith(LocalizedText.CHATCOL10)) { } else if (str1.startsWith(LocalizedText.CHATCOL10)) {
string = string.substring(LocalizedText.CHATCOL10.length()); string = string.substring(LocalizedText.CHATCOL10.length());
local5555 = 10; local5555 = 10;
} else if (local2522.startsWith(LocalizedText.CHATCOL11)) { } else if (str1.startsWith(LocalizedText.CHATCOL11)) {
string = string.substring(LocalizedText.CHATCOL11.length()); string = string.substring(LocalizedText.CHATCOL11.length());
local5555 = 11; local5555 = 11;
} }
} }
@Pc(5943) byte local5943 = 0; @Pc(5943) byte local5943 = 0;
local2522 = string.toLowerCase(); str1 = string.toLowerCase();
if (local2522.startsWith(LocalizedText.STABLE_CHATEFFECT1)) { if (str1.startsWith(LocalizedText.STABLE_CHATEFFECT1)) {
string = string.substring(LocalizedText.STABLE_CHATEFFECT1.length()); string = string.substring(LocalizedText.STABLE_CHATEFFECT1.length());
local5943 = 1; local5943 = 1;
} else if (local2522.startsWith(LocalizedText.STABLE_CHATEFFECT2)) { } else if (str1.startsWith(LocalizedText.STABLE_CHATEFFECT2)) {
local5943 = 2; local5943 = 2;
string = string.substring(LocalizedText.STABLE_CHATEFFECT2.length()); string = string.substring(LocalizedText.STABLE_CHATEFFECT2.length());
} else if (local2522.startsWith(LocalizedText.STABLE_CHATEFFECT3)) { } else if (str1.startsWith(LocalizedText.STABLE_CHATEFFECT3)) {
string = string.substring(LocalizedText.STABLE_CHATEFFECT3.length()); string = string.substring(LocalizedText.STABLE_CHATEFFECT3.length());
local5943 = 3; local5943 = 3;
} else if (local2522.startsWith(LocalizedText.STABLE_CHATEFFECT4)) { } else if (str1.startsWith(LocalizedText.STABLE_CHATEFFECT4)) {
local5943 = 4; local5943 = 4;
string = string.substring(LocalizedText.STABLE_CHATEFFECT4.length()); string = string.substring(LocalizedText.STABLE_CHATEFFECT4.length());
} else if (local2522.startsWith(LocalizedText.STABLE_CHATEFFECTC5)) { } else if (str1.startsWith(LocalizedText.STABLE_CHATEFFECTC5)) {
local5943 = 5; local5943 = 5;
string = string.substring(LocalizedText.STABLE_CHATEFFECTC5.length()); string = string.substring(LocalizedText.STABLE_CHATEFFECTC5.length());
} else if (client.language != 0) { } else if (client.language != 0) {
if (local2522.startsWith(LocalizedText.CHATEFFECT1)) { if (str1.startsWith(LocalizedText.CHATEFFECT1)) {
string = string.substring(LocalizedText.CHATEFFECT1.length()); string = string.substring(LocalizedText.CHATEFFECT1.length());
local5943 = 1; local5943 = 1;
} else if (local2522.startsWith(LocalizedText.CHATEFFECT2)) { } else if (str1.startsWith(LocalizedText.CHATEFFECT2)) {
local5943 = 2; local5943 = 2;
string = string.substring(LocalizedText.CHATEFFECT2.length()); string = string.substring(LocalizedText.CHATEFFECT2.length());
} else if (local2522.startsWith(LocalizedText.CHATEFFECT3)) { } else if (str1.startsWith(LocalizedText.CHATEFFECT3)) {
local5943 = 3; local5943 = 3;
string = string.substring(LocalizedText.CHATEFFECT3.length()); string = string.substring(LocalizedText.CHATEFFECT3.length());
} else if (local2522.startsWith(LocalizedText.CHATEFFECT4)) { } else if (str1.startsWith(LocalizedText.CHATEFFECT4)) {
local5943 = 4; local5943 = 4;
string = string.substring(LocalizedText.CHATEFFECT4.length()); string = string.substring(LocalizedText.CHATEFFECT4.length());
} else if (local2522.startsWith(LocalizedText.CHATEFFECT5)) { } else if (str1.startsWith(LocalizedText.CHATEFFECT5)) {
string = string.substring(LocalizedText.CHATEFFECT5.length()); string = string.substring(LocalizedText.CHATEFFECT5.length());
local5943 = 5; local5943 = 5;
} }
@ -2683,7 +2693,7 @@ public final class ScriptRunner {
c = Protocol.outboundBuffer.offset; c = Protocol.outboundBuffer.offset;
Protocol.outboundBuffer.p1(local5555); Protocol.outboundBuffer.p1(local5555);
Protocol.outboundBuffer.p1(local5943); Protocol.outboundBuffer.p1(local5943);
Static146.method2748(Protocol.outboundBuffer, string); WordPack.encode(Protocol.outboundBuffer, string);
Protocol.outboundBuffer.p1len(Protocol.outboundBuffer.offset - c); Protocol.outboundBuffer.p1len(Protocol.outboundBuffer.offset - c);
continue; continue;
} }
@ -2692,14 +2702,14 @@ public final class ScriptRunner {
} }
if (opcode == 5009) { if (opcode == 5009) {
ssp -= 2; ssp -= 2;
local2522 = stringStack[ssp + 1]; str1 = stringStack[ssp + 1];
string = stringStack[ssp]; string = stringStack[ssp];
if (LoginManager.staffModLevel != 0 || (!LoginManager.playerUnderage || LoginManager.parentalChatConsent) && !LoginManager.mapQuickChat) { if (LoginManager.staffModLevel != 0 || (!LoginManager.playerUnderage || LoginManager.parentalChatConsent) && !LoginManager.mapQuickChat) {
Protocol.outboundBuffer.p1isaac(201); Protocol.outboundBuffer.p1isaac(201);
Protocol.outboundBuffer.p1(0); Protocol.outboundBuffer.p1(0);
int2 = Protocol.outboundBuffer.offset; int2 = Protocol.outboundBuffer.offset;
Protocol.outboundBuffer.p8(string.encode37()); Protocol.outboundBuffer.p8(string.encode37());
Static146.method2748(Protocol.outboundBuffer, local2522); WordPack.encode(Protocol.outboundBuffer, str1);
Protocol.outboundBuffer.p1len(Protocol.outboundBuffer.offset - int2); Protocol.outboundBuffer.p1len(Protocol.outboundBuffer.offset - int2);
} }
continue; continue;
@ -2707,27 +2717,27 @@ public final class ScriptRunner {
if (opcode == 5010) { if (opcode == 5010) {
isp--; isp--;
int1 = intStack[isp]; int1 = intStack[isp];
local2522 = null; str1 = null;
if (int1 < 100) { if (int1 < 100) {
local2522 = Chat.names[int1]; str1 = Chat.names[int1];
} }
if (local2522 == null) { if (str1 == null) {
local2522 = EMPTY_STRING; str1 = EMPTY_STRING;
} }
stringStack[ssp++] = local2522; stringStack[ssp++] = str1;
continue; continue;
} }
if (opcode == 5011) { if (opcode == 5011) {
isp--; isp--;
int1 = intStack[isp]; int1 = intStack[isp];
local2522 = null; str1 = null;
if (int1 < 100) { if (int1 < 100) {
local2522 = Chat.clans[int1]; str1 = Chat.clans[int1];
} }
if (local2522 == null) { if (str1 == null) {
local2522 = EMPTY_STRING; str1 = EMPTY_STRING;
} }
stringStack[ssp++] = local2522; stringStack[ssp++] = str1;
continue; continue;
} }
if (opcode == 5012) { if (opcode == 5012) {
@ -3077,13 +3087,13 @@ public final class ScriptRunner {
int1 = WorldMap.method2352(); int1 = WorldMap.method2352();
int2 = 0; int2 = 0;
if (int1 == -1) { if (int1 == -1) {
local2522 = EMPTY_STRING; str1 = EMPTY_STRING;
} else { } else {
local2522 = WorldMap.labels.aClass100Array153[int1]; str1 = WorldMap.labels.aClass100Array153[int1];
int2 = WorldMap.labels.method3894(int1); int2 = WorldMap.labels.method3894(int1);
} }
local2522 = local2522.method3140(Static67.aClass100_639, Static5.aClass100_10); str1 = str1.method3140(Static67.aClass100_639, Static5.aClass100_10);
stringStack[ssp++] = local2522; stringStack[ssp++] = str1;
intStack[isp++] = int2; intStack[isp++] = int2;
continue; continue;
} }
@ -3091,13 +3101,13 @@ public final class ScriptRunner {
int2 = 0; int2 = 0;
int1 = WorldMap.method2385(); int1 = WorldMap.method2385();
if (int1 == -1) { if (int1 == -1) {
local2522 = EMPTY_STRING; str1 = EMPTY_STRING;
} else { } else {
local2522 = WorldMap.labels.aClass100Array153[int1]; str1 = WorldMap.labels.aClass100Array153[int1];
int2 = WorldMap.labels.method3894(int1); int2 = WorldMap.labels.method3894(int1);
} }
local2522 = local2522.method3140(Static67.aClass100_639, Static5.aClass100_10); str1 = str1.method3140(Static67.aClass100_639, Static5.aClass100_10);
stringStack[ssp++] = local2522; stringStack[ssp++] = str1;
intStack[isp++] = int2; intStack[isp++] = int2;
continue; continue;
} }
@ -3111,11 +3121,11 @@ public final class ScriptRunner {
isp--; isp--;
int1 = intStack[isp]; int1 = intStack[isp];
ssp--; ssp--;
local2522 = stringStack[ssp]; str1 = stringStack[ssp];
local7566 = false; local7566 = false;
@Pc(7577) SecondaryLinkedList local7577 = Static183.method3333(int1 >> 14 & 0x3FFF, int1 & 0x3FFF); @Pc(7577) SecondaryLinkedList local7577 = Static183.method3333(int1 >> 14 & 0x3FFF, int1 & 0x3FFF);
for (@Pc(7582) Map local7582 = (Map) local7577.method795(); local7582 != null; local7582 = (Map) local7577.method797()) { for (@Pc(7582) Map local7582 = (Map) local7577.method795(); local7582 != null; local7582 = (Map) local7577.method797()) {
if (local7582.group.equalsIgnoreCase(local2522)) { if (local7582.group.equalsIgnoreCase(str1)) {
local7566 = true; local7566 = true;
break; break;
} }
@ -3166,37 +3176,37 @@ public final class ScriptRunner {
isp -= 2; isp -= 2;
int3 = intStack[isp + 1]; int3 = intStack[isp + 1];
int1 = intStack[isp]; int1 = intStack[isp];
Static241.setWindowMode(false, 3, int1, int3); DisplayMode.setWindowMode(false, 3, int1, int3);
intStack[isp++] = GameShell.fullScreenFrame == null ? 0 : 1; intStack[isp++] = GameShell.fullScreenFrame == null ? 0 : 1;
continue; continue;
} }
if (opcode == 5301) { if (opcode == 5301) {
if (GameShell.fullScreenFrame != null) { if (GameShell.fullScreenFrame != null) {
Static241.setWindowMode(false, Preferences.favoriteWorlds, -1, -1); DisplayMode.setWindowMode(false, Preferences.favoriteWorlds, -1, -1);
} }
continue; continue;
} }
if (opcode == 5302) { if (opcode == 5302) {
@Pc(7780) Class114[] local7780 = Static3.method4660(); @Pc(7780) DisplayMode[] local7780 = DisplayMode.getDisplayModes();
intStack[isp++] = local7780.length; intStack[isp++] = local7780.length;
continue; continue;
} }
if (opcode == 5303) { if (opcode == 5303) {
isp--; isp--;
int1 = intStack[isp]; int1 = intStack[isp];
@Pc(7800) Class114[] local7800 = Static3.method4660(); @Pc(7800) DisplayMode[] local7800 = DisplayMode.getDisplayModes();
intStack[isp++] = local7800[int1].anInt4248; intStack[isp++] = local7800[int1].width;
intStack[isp++] = local7800[int1].anInt4250; intStack[isp++] = local7800[int1].height;
continue; continue;
} }
if (opcode == 5305) { if (opcode == 5305) {
int3 = Preferences.fullScreenHeight; int3 = Preferences.fullScreenHeight;
int1 = Preferences.fullScreenWidth; int1 = Preferences.fullScreenWidth;
int2 = -1; int2 = -1;
@Pc(7833) Class114[] local7833 = Static3.method4660(); @Pc(7833) DisplayMode[] local7833 = DisplayMode.getDisplayModes();
for (c = 0; c < local7833.length; c++) { for (c = 0; c < local7833.length; c++) {
@Pc(7843) Class114 local7843 = local7833[c]; @Pc(7843) DisplayMode local7843 = local7833[c];
if (int1 == local7843.anInt4248 && local7843.anInt4250 == int3) { if (int1 == local7843.width && local7843.height == int3) {
int2 = c; int2 = c;
break; break;
} }
@ -3205,7 +3215,7 @@ public final class ScriptRunner {
continue; continue;
} }
if (opcode == Cs2Opcodes.getDisplayMode) { if (opcode == Cs2Opcodes.getDisplayMode) {
intStack[isp++] = Static144.getWindowMode(); intStack[isp++] = DisplayMode.getWindowMode();
continue; continue;
} }
if (opcode == 5307) { if (opcode == 5307) {
@ -3214,7 +3224,7 @@ public final class ScriptRunner {
if (int1 < 0 || int1 > 2) { if (int1 < 0 || int1 > 2) {
int1 = 0; int1 = 0;
} }
Static241.setWindowMode(false, int1, -1, -1); DisplayMode.setWindowMode(false, int1, -1, -1);
continue; continue;
} }
if (opcode == 5308) { if (opcode == 5308) {
@ -3235,13 +3245,13 @@ public final class ScriptRunner {
if (opcode == 5400) { if (opcode == 5400) {
ssp -= 2; ssp -= 2;
string = stringStack[ssp]; string = stringStack[ssp];
local2522 = stringStack[ssp + 1]; str1 = stringStack[ssp + 1];
isp--; isp--;
int2 = intStack[isp]; int2 = intStack[isp];
Protocol.outboundBuffer.p1isaac(117); Protocol.outboundBuffer.p1isaac(117);
Protocol.outboundBuffer.p1(Buffer.getStringLength(string) + Buffer.getStringLength(local2522) + 1); Protocol.outboundBuffer.p1(Buffer.getStringLength(string) + Buffer.getStringLength(str1) + 1);
Protocol.outboundBuffer.pjstr(string); Protocol.outboundBuffer.pjstr(string);
Protocol.outboundBuffer.pjstr(local2522); Protocol.outboundBuffer.pjstr(str1);
Protocol.outboundBuffer.p1(int2); Protocol.outboundBuffer.p1(int2);
continue; continue;
} }
@ -3287,7 +3297,7 @@ public final class ScriptRunner {
} }
if (opcode == 5411) { if (opcode == 5411) {
if (GameShell.fullScreenFrame != null) { if (GameShell.fullScreenFrame != null) {
Static241.setWindowMode(false, Preferences.favoriteWorlds, -1, -1); DisplayMode.setWindowMode(false, Preferences.favoriteWorlds, -1, -1);
} }
if (GameShell.frame == null) { if (GameShell.frame == null) {
Static169.openUrl(Static15.method479(), false); Static169.openUrl(Static15.method479(), false);
@ -3299,7 +3309,7 @@ public final class ScriptRunner {
if (opcode == Cs2Opcodes.getLastIp5419) { if (opcode == Cs2Opcodes.getLastIp5419) {
string = EMPTY_STRING; string = EMPTY_STRING;
if (Player.lastLogAddress != null) { if (Player.lastLogAddress != null) {
string = Static181.method3341(Player.lastLogAddress.intArg2); string = JagString.formatIp(Player.lastLogAddress.intArg2);
if (Player.lastLogAddress.result != null) { if (Player.lastLogAddress.result != null) {
@Pc(8281) byte[] local8281 = ((String) Player.lastLogAddress.result).getBytes(StandardCharsets.ISO_8859_1); @Pc(8281) byte[] local8281 = ((String) Player.lastLogAddress.result).getBytes(StandardCharsets.ISO_8859_1);
string = JagString.decodeString(local8281, local8281.length, 0); string = JagString.decodeString(local8281, local8281.length, 0);
@ -3314,7 +3324,7 @@ public final class ScriptRunner {
} }
if (opcode == 5421) { if (opcode == 5421) {
if (GameShell.fullScreenFrame != null) { if (GameShell.fullScreenFrame != null) {
Static241.setWindowMode(false, Preferences.favoriteWorlds, -1, -1); DisplayMode.setWindowMode(false, Preferences.favoriteWorlds, -1, -1);
} }
isp--; isp--;
local1552 = intStack[isp] == 1; local1552 = intStack[isp] == 1;
@ -3334,19 +3344,19 @@ public final class ScriptRunner {
isp--; isp--;
int2 = intStack[isp]; int2 = intStack[isp];
ssp -= 2; ssp -= 2;
local2522 = stringStack[ssp + 1]; str1 = stringStack[ssp + 1];
string = stringStack[ssp]; string = stringStack[ssp];
if (string.length() > 0) { if (string.length() > 0) {
if (Static103.aClass100Array88 == null) { if (PlayerList.playerNames == null) {
Static103.aClass100Array88 = new JagString[Static132.anIntArray309[client.game]]; PlayerList.playerNames = new JagString[PlayerList.anIntArray309[client.game]];
} }
Static103.aClass100Array88[int2] = string; PlayerList.playerNames[int2] = string;
} }
if (local2522.length() > 0) { if (str1.length() > 0) {
if (Static263.aClass100Array174 == null) { if (PlayerList.playerNames2 == null) {
Static263.aClass100Array174 = new JagString[Static132.anIntArray309[client.game]]; PlayerList.playerNames2 = new JagString[PlayerList.anIntArray309[client.game]];
} }
Static263.aClass100Array174[int2] = local2522; PlayerList.playerNames2[int2] = str1;
} }
continue; continue;
} }
@ -3358,27 +3368,27 @@ public final class ScriptRunner {
if (opcode == 5424) { if (opcode == 5424) {
isp -= 11; isp -= 11;
Static40.anInt1275 = intStack[isp]; Static40.anInt1275 = intStack[isp];
Static111.anInt2910 = intStack[isp + 1]; Static40.anInt2910 = intStack[isp + 1];
Static251.anInt5457 = intStack[isp + 2]; Static40.anInt5457 = intStack[isp + 2];
Static232.anInt5208 = intStack[isp + 3]; Static40.anInt5208 = intStack[isp + 3];
Static55.anInt1736 = intStack[isp + 4]; Static40.anInt1736 = intStack[isp + 4];
Static169.anInt4073 = intStack[isp + 5]; Static40.anInt4073 = intStack[isp + 5];
Static85.anInt2261 = intStack[isp + 6]; Static40.anInt2261 = intStack[isp + 6];
Static136.anInt3324 = intStack[isp + 7]; Static40.anInt3324 = intStack[isp + 7];
Static254.anInt5556 = intStack[isp + 8]; Static40.anInt5556 = intStack[isp + 8];
Static195.anInt4581 = intStack[isp + 9]; Static40.anInt4581 = intStack[isp + 9];
Static262.anInt5752 = intStack[isp + 10]; Static40.anInt5752 = intStack[isp + 10];
client.js5Archive8.isFileReady(Static55.anInt1736); client.js5Archive8.isFileReady(Static40.anInt1736);
client.js5Archive8.isFileReady(Static169.anInt4073); client.js5Archive8.isFileReady(Static40.anInt4073);
client.js5Archive8.isFileReady(Static85.anInt2261); client.js5Archive8.isFileReady(Static40.anInt2261);
client.js5Archive8.isFileReady(Static136.anInt3324); client.js5Archive8.isFileReady(Static40.anInt3324);
client.js5Archive8.isFileReady(Static254.anInt5556); client.js5Archive8.isFileReady(Static40.anInt5556);
Static261.aBoolean298 = true; Static40.aBoolean298 = true;
continue; continue;
} }
if (opcode == 5425) { if (opcode == 5425) {
Static114.method4637(); Static40.method4637();
Static261.aBoolean298 = false; Static40.aBoolean298 = false;
continue; continue;
} }
if (opcode == 5426) { if (opcode == 5426) {
@ -3466,11 +3476,11 @@ public final class ScriptRunner {
if (opcode == Cs2Opcodes.directlogin) { if (opcode == Cs2Opcodes.directlogin) {
ssp -= 2; ssp -= 2;
string = stringStack[ssp]; string = stringStack[ssp];
local2522 = stringStack[ssp + 1]; str1 = stringStack[ssp + 1];
isp--; isp--;
int2 = intStack[isp]; int2 = intStack[isp];
if (client.gameState == 10 && LoginManager.anInt4937 == 0 && LoginManager.step == 0 && CreateManager.step == 0 && WorldList.step == 0) { if (client.gameState == 10 && LoginManager.anInt4937 == 0 && LoginManager.step == 0 && CreateManager.step == 0 && WorldList.step == 0) {
LoginManager.method3896(string, local2522, int2); LoginManager.method3896(string, str1, int2);
} }
continue; continue;
} }
@ -3561,7 +3571,7 @@ public final class ScriptRunner {
} }
} }
if (GlRenderer.enabled) { if (GlRenderer.enabled) {
Static86.setInstantFade(); Static103.setInstantFade();
if (!Preferences.highDetailLighting) { if (!Preferences.highDetailLighting) {
Static145.method2742(); Static145.method2742();
} }
@ -3685,7 +3695,7 @@ public final class ScriptRunner {
isp--; isp--;
Preferences.fogEnabled = intStack[isp] == 1; Preferences.fogEnabled = intStack[isp] == 1;
if (GlRenderer.enabled) { if (GlRenderer.enabled) {
Static86.setInstantFade(); Static103.setInstantFade();
} }
Preferences.write(GameShell.signLink); Preferences.write(GameShell.signLink);
Preferences.sentToServer = false; Preferences.sentToServer = false;
@ -3902,13 +3912,13 @@ public final class ScriptRunner {
} else if (opcode < 6300) { } else if (opcode < 6300) {
if (opcode == 6200) { if (opcode == 6200) {
isp -= 2; isp -= 2;
Static178.aShort25 = (short) intStack[isp]; Static115.aShort25 = (short) intStack[isp];
if (Static178.aShort25 <= 0) { if (Static115.aShort25 <= 0) {
Static178.aShort25 = 256; Static115.aShort25 = 256;
} }
Static10.aShort9 = (short) intStack[isp + 1]; Static115.aShort9 = (short) intStack[isp + 1];
if (Static10.aShort9 <= 0) { if (Static115.aShort9 <= 0) {
Static10.aShort9 = 205; Static115.aShort9 = 205;
} }
continue; continue;
} }
@ -3926,32 +3936,32 @@ public final class ScriptRunner {
} }
if (opcode == 6202) { if (opcode == 6202) {
isp -= 4; isp -= 4;
Static153.aShort22 = (short) intStack[isp]; Static115.aShort22 = (short) intStack[isp];
if (Static153.aShort22 <= 0) { if (Static115.aShort22 <= 0) {
Static153.aShort22 = 1; Static115.aShort22 = 1;
} }
Static4.aShort1 = (short) intStack[isp + 1]; Static115.aShort1 = (short) intStack[isp + 1];
if (Static4.aShort1 <= 0) { if (Static115.aShort1 <= 0) {
Static4.aShort1 = 32767; Static115.aShort1 = 32767;
} else if (Static153.aShort22 > Static4.aShort1) { } else if (Static115.aShort22 > Static115.aShort1) {
Static4.aShort1 = Static153.aShort22; Static115.aShort1 = Static115.aShort22;
} }
Static55.aShort12 = (short) intStack[isp + 2]; Static115.aShort12 = (short) intStack[isp + 2];
if (Static55.aShort12 <= 0) { if (Static115.aShort12 <= 0) {
Static55.aShort12 = 1; Static115.aShort12 = 1;
} }
Static131.aShort21 = (short) intStack[isp + 3]; Static115.aShort21 = (short) intStack[isp + 3];
if (Static131.aShort21 <= 0) { if (Static115.aShort21 <= 0) {
Static131.aShort21 = 32767; Static115.aShort21 = 32767;
} else if (Static131.aShort21 < Static55.aShort12) { } else if (Static115.aShort21 < Static115.aShort12) {
Static131.aShort21 = Static55.aShort12; Static115.aShort21 = Static115.aShort12;
} }
continue; continue;
} }
if (opcode == 6203) { if (opcode == 6203) {
Static115.method2314(Static280.aClass13_26.width, 0, Static280.aClass13_26.height, 0, false); Static115.method2314(Static280.aClass13_26.width, 0, Static280.aClass13_26.height, 0, false);
intStack[isp++] = Static166.anInt4055; intStack[isp++] = Static115.anInt4055;
intStack[isp++] = Static245.anInt5377; intStack[isp++] = Static115.anInt5377;
continue; continue;
} }
if (opcode == 6204) { if (opcode == 6204) {
@ -3960,8 +3970,8 @@ public final class ScriptRunner {
continue; continue;
} }
if (opcode == 6205) { if (opcode == 6205) {
intStack[isp++] = Static178.aShort25; intStack[isp++] = Static115.aShort25;
intStack[isp++] = Static10.aShort9; intStack[isp++] = Static115.aShort9;
continue; continue;
} }
} else if (opcode < 6400) { } else if (opcode < 6400) {
@ -4165,9 +4175,9 @@ public final class ScriptRunner {
} }
if (opcode == Cs2Opcodes.concatString) { if (opcode == Cs2Opcodes.concatString) {
ssp -= 2; ssp -= 2;
local2522 = stringStack[ssp + 1]; str1 = stringStack[ssp + 1];
string = stringStack[ssp]; string = stringStack[ssp];
stringStack[ssp++] = JagString.concatenate(new JagString[] { string, local2522 }); stringStack[ssp++] = JagString.concatenate(new JagString[] { string, str1 });
continue; continue;
} }
if (opcode == Cs2Opcodes.concatSignedInt) { if (opcode == Cs2Opcodes.concatSignedInt) {
@ -4197,10 +4207,10 @@ public final class ScriptRunner {
} }
if (opcode == Cs2Opcodes.strForGender) { if (opcode == Cs2Opcodes.strForGender) {
ssp -= 2; ssp -= 2;
local2522 = stringStack[ssp + 1]; str1 = stringStack[ssp + 1];
string = stringStack[ssp]; string = stringStack[ssp];
if (PlayerList.self.appearance != null && PlayerList.self.appearance.gender) { if (PlayerList.self.appearance != null && PlayerList.self.appearance.gender) {
stringStack[ssp++] = local2522; stringStack[ssp++] = str1;
continue; continue;
} }
stringStack[ssp++] = string; stringStack[ssp++] = string;
@ -4238,12 +4248,12 @@ public final class ScriptRunner {
if (opcode == Cs2Opcodes.chooseString) { if (opcode == Cs2Opcodes.chooseString) {
ssp -= 2; ssp -= 2;
string = stringStack[ssp]; string = stringStack[ssp];
local2522 = stringStack[ssp + 1]; str1 = stringStack[ssp + 1];
isp--; isp--;
if (intStack[isp] == 1) { if (intStack[isp] == 1) {
stringStack[ssp++] = string; stringStack[ssp++] = string;
} else { } else {
stringStack[ssp++] = local2522; stringStack[ssp++] = str1;
} }
continue; continue;
} }
@ -4310,7 +4320,7 @@ public final class ScriptRunner {
if (opcode == Cs2Opcodes.removeTags) { if (opcode == Cs2Opcodes.removeTags) {
ssp--; ssp--;
string = stringStack[ssp]; string = stringStack[ssp];
local2522 = Static87.allocate(string.length()); str1 = Static87.allocate(string.length());
@Pc(12220) boolean local12220 = false; @Pc(12220) boolean local12220 = false;
for (local652 = 0; local652 < string.length(); local652++) { for (local652 = 0; local652 < string.length(); local652++) {
c = string.charAt(local652); c = string.charAt(local652);
@ -4319,11 +4329,11 @@ public final class ScriptRunner {
} else if (c == 62) { } else if (c == 62) {
local12220 = false; local12220 = false;
} else if (!local12220) { } else if (!local12220) {
local2522.append(c); str1.append(c);
} }
} }
local2522.method3156(); str1.method3156();
stringStack[ssp++] = local2522; stringStack[ssp++] = str1;
continue; continue;
} }
if (opcode == Cs2Opcodes.indexOfChar) { if (opcode == Cs2Opcodes.indexOfChar) {
@ -4338,10 +4348,10 @@ public final class ScriptRunner {
if (opcode == Cs2Opcodes.indexOfStr) { if (opcode == Cs2Opcodes.indexOfStr) {
ssp -= 2; ssp -= 2;
string = stringStack[ssp]; string = stringStack[ssp];
local2522 = stringStack[ssp + 1]; str1 = stringStack[ssp + 1];
isp--; isp--;
int2 = intStack[isp]; int2 = intStack[isp];
intStack[isp++] = string.indexOf(local2522, int2); intStack[isp++] = string.indexOf(str1, int2);
continue; continue;
} }
if (opcode == Cs2Opcodes.toLower) { if (opcode == Cs2Opcodes.toLower) {
@ -4468,8 +4478,8 @@ public final class ScriptRunner {
} else { } else {
@Pc(14385) JagString str = Static87.allocate(30); @Pc(14385) JagString str = Static87.allocate(30);
str.method3113(Static219.aClass100_928).method3113(script.name); str.method3113(Static219.aClass100_928).method3113(script.name);
for (cycles = Static138.fp - 1; cycles >= 0; cycles--) { for (cycles = fp - 1; cycles >= 0; cycles--) {
str.method3113(aClass100_253).method3113(Static67.callStack[cycles].script.name); str.method3113(aClass100_253).method3113(callStack[cycles].script.name);
} }
if (op == 40) { if (op == 40) {
cycles = intOperands[pc]; cycles = intOperands[pc];

49
client/src/main/java/rt4/Sprites.java
View file

@ -138,6 +138,12 @@ public class Sprites {
public static IndexedSprite[] nameIcons; public static IndexedSprite[] nameIcons;
@OriginalMember(owner = "client!th", name = "f", descriptor = "[Lclient!ok;") @OriginalMember(owner = "client!th", name = "f", descriptor = "[Lclient!ok;")
public static IndexedSprite[] scrollbars; public static IndexedSprite[] scrollbars;
@OriginalMember(owner = "client!ic", name = "a", descriptor = "Lclient!qf;")
public static Sprite compass;
@OriginalMember(owner = "client!wi", name = "R", descriptor = "[Lclient!qf;")
public static Sprite[] hintMapEdge;
@OriginalMember(owner = "client!fe", name = "lc", descriptor = "[Lclient!qf;")
public static Sprite[] mapfuncs;
@OriginalMember(owner = "client!g", name = "a", descriptor = "(ILclient!ve;)V") @OriginalMember(owner = "client!g", name = "a", descriptor = "(ILclient!ve;)V")
public static void init(@OriginalArg(1) Js5 archive) { public static void init(@OriginalArg(1) Js5 archive) {
@ -235,12 +241,12 @@ public class Sprites {
floorShadows[local101].trim(); floorShadows[local101].trim();
} }
} }
@Pc(124) SoftwareSprite compass = SpriteLoader.loadSoftwareSprite(0, archive, compassId); @Pc(124) SoftwareSprite newCompass = SpriteLoader.loadSoftwareSprite(0, archive, compassId);
compass.trim(); newCompass.trim();
if (GlRenderer.enabled) { if (GlRenderer.enabled) {
Static106.compass = new GlSprite(compass); compass = new GlSprite(newCompass);
} else { } else {
Static106.compass = compass; compass = newCompass;
} }
@Pc(143) SoftwareSprite[] local143 = SpriteLoader.loadSoftwareSprites(hintMapEdgeId, archive); @Pc(143) SoftwareSprite[] local143 = SpriteLoader.loadSoftwareSprites(hintMapEdgeId, archive);
@Pc(145) int local145; @Pc(145) int local145;
@ -248,12 +254,12 @@ public class Sprites {
local143[local145].trim(); local143[local145].trim();
} }
if (GlRenderer.enabled) { if (GlRenderer.enabled) {
Static277.hintMapEdge = new Sprite[local143.length]; hintMapEdge = new Sprite[local143.length];
for (local145 = 0; local145 < local143.length; local145++) { for (local145 = 0; local145 < local143.length; local145++) {
Static277.hintMapEdge[local145] = new GlSprite(local143[local145]); hintMapEdge[local145] = new GlSprite(local143[local145]);
} }
} else { } else {
Static277.hintMapEdge = local143; hintMapEdge = local143;
} }
@Pc(196) int local196 = (int) ((double) 21 * Math.random()) - 10; @Pc(196) int local196 = (int) ((double) 21 * Math.random()) - 10;
local145 = (int) (Math.random() * 21.0D) - 10; local145 = (int) (Math.random() * 21.0D) - 10;
@ -264,12 +270,12 @@ public class Sprites {
mapfunctions[local219].method315(local145 + local217, local217 + local196, local217 + local210); mapfunctions[local219].method315(local145 + local217, local217 + local196, local217 + local210);
} }
if (GlRenderer.enabled) { if (GlRenderer.enabled) {
Static67.mapfuncs = new Sprite[mapfunctions.length]; mapfuncs = new Sprite[mapfunctions.length];
for (local219 = 0; local219 < mapfunctions.length; local219++) { for (local219 = 0; local219 < mapfunctions.length; local219++) {
Static67.mapfuncs[local219] = new GlSprite(mapfunctions[local219]); mapfuncs[local219] = new GlSprite(mapfunctions[local219]);
} }
} else { } else {
Static67.mapfuncs = mapfunctions; mapfuncs = mapfunctions;
} }
} }
@ -277,4 +283,27 @@ public class Sprites {
public static int total() { public static int total() {
return 15; return 15;
} }
@OriginalMember(owner = "client!ja", name = "a", descriptor = "(Z)V")
public static void clear() {
Fonts.p12Full = null;
hitmarks = null;
crosses = null;
nameIcons = null;
Fonts.p11FullSoftware = null;
mapfunctions = null;
mapfuncs = null;
mapmarkhints = null;
headiconPrayers = null;
Fonts.b12Full = null;
compass = null;
mapdots = null;
Fonts.p11Full = null;
mapflags = null;
hitbars = null;
hintMapEdge = null;
headhints = null;
headiconPks = null;
scrollbars = null;
}
} }

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

@ -6,9 +6,6 @@ import org.openrs2.deob.annotation.Pc;
public final class Static10 { public final class Static10 {
@OriginalMember(owner = "client!an", name = "db", descriptor = "S")
public static short aShort9 = 205;
@OriginalMember(owner = "client!an", name = "c", descriptor = "(III)V") @OriginalMember(owner = "client!an", name = "c", descriptor = "(III)V")
public static void method348(@OriginalArg(1) int arg0, @OriginalArg(2) int arg1) { public static void method348(@OriginalArg(1) int arg0, @OriginalArg(2) int arg1) {
if (Static189.anInt4457 != arg1) { if (Static189.anInt4457 != arg1) {

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

@ -8,14 +8,24 @@ public final class Static101 {
@OriginalMember(owner = "client!hm", name = "T", descriptor = "Lclient!na;") @OriginalMember(owner = "client!hm", name = "T", descriptor = "Lclient!na;")
public static final JagString aClass100_538 = JagString.parse(" "); public static final JagString aClass100_538 = JagString.parse(" ");
@OriginalMember(owner = "client!mc", name = "fb", descriptor = "Lclient!na;")
private static final JagString LANG_PT = JagString.parse("pt");
@OriginalMember(owner = "client!mc", name = "mb", descriptor = "Lclient!na;")
private static final JagString LANG_EN = JagString.parse("en");
@OriginalMember(owner = "client!mc", name = "vb", descriptor = "Lclient!na;")
private static final JagString LANG_DE = JagString.parse("de");
@OriginalMember(owner = "client!mc", name = "pb", descriptor = "Lclient!na;")
private static final JagString LANG_FR = JagString.parse("fr");
@OriginalMember(owner = "client!mc", name = "ob", descriptor = "[Lclient!na;")
public static final JagString[] LANGUAGES = new JagString[] {LANG_EN, LANG_DE, LANG_FR, LANG_PT};
@OriginalMember(owner = "client!hm", name = "ab", descriptor = "I") @OriginalMember(owner = "client!hm", name = "ab", descriptor = "I")
public static int anInt2640 = 0; public static int anInt2640 = 0;
@OriginalMember(owner = "client!hm", name = "a", descriptor = "(Lclient!na;B)I") @OriginalMember(owner = "client!hm", name = "a", descriptor = "(Lclient!na;B)I")
public static int method2053(@OriginalArg(0) JagString arg0) { public static int method2053(@OriginalArg(0) JagString arg0) {
for (@Pc(12) int local12 = 0; local12 < Static153.aClass100Array113.length; local12++) { for (@Pc(12) int local12 = 0; local12 < LANGUAGES.length; local12++) {
if (Static153.aClass100Array113[local12].equalsIgnoreCase(arg0)) { if (LANGUAGES[local12].equalsIgnoreCase(arg0)) {
return local12; return local12;
} }
} }

121
client/src/main/java/rt4/Static103.java
View file

@ -6,22 +6,61 @@ import org.openrs2.deob.annotation.Pc;
public final class Static103 { public final class Static103 {
@OriginalMember(owner = "client!i", name = "Ub", descriptor = "[Lclient!na;") @OriginalMember(owner = "client!ph", name = "b", descriptor = "[[Lclient!li;")
public static JagString[] aClass100Array88; public static final Environment[][] aClass92ArrayArray1 = new Environment[13][13];
@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 = "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");
@OriginalMember(owner = "client!ig", name = "d", descriptor = "I")
public static int anInt2883;
@OriginalMember(owner = "client!jm", name = "s", descriptor = "F")
public static float aFloat13;
@OriginalMember(owner = "client!ui", name = "mb", descriptor = "F")
public static float aFloat37;
@OriginalMember(owner = "client!ej", name = "bb", descriptor = "F")
public static float aFloat6;
@OriginalMember(owner = "client!vh", name = "e", descriptor = "I")
public static int anInt4623;
@OriginalMember(owner = "client!ni", name = "h", descriptor = "I")
public static int anInt4153;
@OriginalMember(owner = "client!be", name = "Vb", descriptor = "F")
public static float aFloat4;
@OriginalMember(owner = "client!ab", name = "b", descriptor = "I")
public static int anInt5868 = 0;
@OriginalMember(owner = "client!sf", name = "c", descriptor = "I")
public static int anInt5080;
@OriginalMember(owner = "client!kd", name = "ub", descriptor = "I")
public static int anInt3255;
@OriginalMember(owner = "client!aj", name = "X", descriptor = "F")
public static float aFloat1;
@OriginalMember(owner = "client!p", name = "g", descriptor = "F")
public static float aFloat23;
@OriginalMember(owner = "client!nc", name = "a", descriptor = "I")
public static int anInt4044;
@OriginalMember(owner = "client!bm", name = "a", descriptor = "F")
public static float aFloat5;
@OriginalMember(owner = "client!ve", name = "t", descriptor = "I")
public static int anInt5731;
@OriginalMember(owner = "client!md", name = "S", descriptor = "I")
public static int anInt3709;
@OriginalMember(owner = "client!ui", name = "T", descriptor = "F")
public static float aFloat36;
@OriginalMember(owner = "client!en", name = "z", descriptor = "F")
public static float aFloat7;
@OriginalMember(owner = "client!ge", name = "q", descriptor = "I")
public static int anInt2161;
@OriginalMember(owner = "client!sa", name = "W", descriptor = "Z")
public static boolean instantScreenFade = true;
@OriginalMember(owner = "client!i", name = "b", descriptor = "(IIIII)I") @OriginalMember(owner = "client!i", name = "b", descriptor = "(IIIII)I")
public static int method2235(@OriginalArg(0) int arg0, @OriginalArg(1) int arg1, @OriginalArg(2) int arg2, @OriginalArg(3) int arg3) { public static int method2235(@OriginalArg(0) int arg0, @OriginalArg(1) int arg1, @OriginalArg(2) int arg2, @OriginalArg(3) int arg3) {
if (Static222.instantScreenFade) { if (instantScreenFade) {
arg0 = 1000000; arg0 = 1000000;
Static222.instantScreenFade = false; instantScreenFade = false;
} }
@Pc(15) Environment local15 = Static192.aClass92ArrayArray1[arg3][arg1]; @Pc(15) Environment local15 = aClass92ArrayArray1[arg3][arg1];
@Pc(25) float local25 = ((float) arg2 * 0.1F + 0.7F) * local15.aFloat16; @Pc(25) float local25 = ((float) arg2 * 0.1F + 0.7F) * local15.aFloat16;
@Pc(28) float local28 = local15.aFloat18; @Pc(28) float local28 = local15.aFloat18;
@Pc(31) int local31 = local15.anInt3526; @Pc(31) int local31 = local15.anInt3526;
@ -31,42 +70,42 @@ public final class Static103 {
local34 = 0; local34 = 0;
} }
@Pc(44) float local44 = local15.aFloat17; @Pc(44) float local44 = local15.aFloat17;
if (local31 != Static109.anInt2883 || Static126.aFloat13 != local25 || Static8.aFloat1 != local28 || local44 != Static15.aFloat4 || Static166.anInt4044 != local37 || Static226.anInt5080 != local34) { if (local31 != anInt2883 || aFloat13 != local25 || aFloat1 != local28 || local44 != aFloat4 || anInt4044 != local37 || anInt5080 != local34) {
Static126.aFloat13 = local25; aFloat13 = local25;
Static253.aFloat37 = Static253.aFloat36; aFloat37 = aFloat36;
Static59.aFloat6 = Static61.aFloat7; aFloat6 = aFloat7;
Static109.anInt2883 = local31; anInt2883 = local31;
Static264.anInt4623 = Static154.anInt3709; anInt4623 = anInt3709;
Static171.anInt4153 = Static79.anInt2161; anInt4153 = anInt2161;
Static15.aFloat4 = local44; aFloat4 = local44;
Static3.anInt5868 = 0; anInt5868 = 0;
Static131.anInt3255 = Static261.anInt5731; anInt3255 = anInt5731;
Static226.anInt5080 = local34; anInt5080 = local34;
Static8.aFloat1 = local28; aFloat1 = local28;
Static166.anInt4044 = local37; anInt4044 = local37;
Static185.aFloat23 = Static23.aFloat5; aFloat23 = aFloat5;
} }
if (Static3.anInt5868 < 65536) { if (anInt5868 < 65536) {
Static3.anInt5868 += arg0 * 250; anInt5868 += arg0 * 250;
if (Static3.anInt5868 >= 65536) { if (anInt5868 >= 65536) {
Static3.anInt5868 = 65536; anInt5868 = 65536;
} }
@Pc(114) float local114 = (float) Static3.anInt5868 / 65536.0F; @Pc(114) float local114 = (float) anInt5868 / 65536.0F;
@Pc(118) int local118 = Static3.anInt5868 >> 8; @Pc(118) int local118 = anInt5868 >> 8;
@Pc(125) int local125 = 65536 - Static3.anInt5868 >> 8; @Pc(125) int local125 = 65536 - anInt5868 >> 8;
Static154.anInt3709 = (local118 * (Static166.anInt4044 & 0xFF00FF) + (Static264.anInt4623 & 0xFF00FF) * local125 & 0xFF00FF00) + (local125 * (Static264.anInt4623 & 0xFF00) + (Static166.anInt4044 & 0xFF00) * local118 & 0xFF0000) >> 8; anInt3709 = (local118 * (anInt4044 & 0xFF00FF) + (anInt4623 & 0xFF00FF) * local125 & 0xFF00FF00) + (local125 * (anInt4623 & 0xFF00) + (anInt4044 & 0xFF00) * local118 & 0xFF0000) >> 8;
@Pc(162) float local162 = (float) (65536 - Static3.anInt5868) / 65536.0F; @Pc(162) float local162 = (float) (65536 - anInt5868) / 65536.0F;
Static61.aFloat7 = local162 * Static59.aFloat6 + local114 * Static126.aFloat13; aFloat7 = local162 * aFloat6 + local114 * aFloat13;
Static253.aFloat36 = Static253.aFloat37 * local162 + local114 * Static8.aFloat1; aFloat36 = aFloat37 * local162 + local114 * aFloat1;
Static23.aFloat5 = local114 * Static15.aFloat4 + local162 * Static185.aFloat23; aFloat5 = local114 * aFloat4 + local162 * aFloat23;
Static261.anInt5731 = ((Static109.anInt2883 & 0xFF00) * local118 + local125 * (Static131.anInt3255 & 0xFF00) & 0xFF0000) + ((Static131.anInt3255 & 0xFF00FF) * local125 + ((Static109.anInt2883 & 0xFF00FF) * local118) & 0xFF00FF00) >> 8; anInt5731 = ((anInt2883 & 0xFF00) * local118 + local125 * (anInt3255 & 0xFF00) & 0xFF0000) + ((anInt3255 & 0xFF00FF) * local125 + ((anInt2883 & 0xFF00FF) * local118) & 0xFF00FF00) >> 8;
Static79.anInt2161 = local118 * Static226.anInt5080 + local125 * Static171.anInt4153 >> 8; anInt2161 = local118 * anInt5080 + local125 * anInt4153 >> 8;
} }
Static161.method3060(Static261.anInt5731, Static61.aFloat7, Static253.aFloat36, Static23.aFloat5); FogManager.method3060(anInt5731, aFloat7, aFloat36, aFloat5);
Static161.method3062(Static154.anInt3709, Static79.anInt2161); FogManager.method3062(anInt3709, anInt2161);
Static161.method3063((float) Static85.anInt2263, (float) Static159.anInt3893, (float) Static148.anInt3534); FogManager.method3063((float) Static85.anInt2263, (float) Static159.anInt3893, (float) Static148.anInt3534);
Static161.method3058(); FogManager.method3058();
return Static154.anInt3709; return anInt3709;
} }
@OriginalMember(owner = "client!i", name = "e", descriptor = "(BI)I") @OriginalMember(owner = "client!i", name = "e", descriptor = "(BI)I")
@ -74,4 +113,8 @@ public final class Static103 {
return arg0 & 0xFF; return arg0 & 0xFF;
} }
@OriginalMember(owner = "client!gm", name = "f", descriptor = "(B)V")
public static void setInstantFade() {
instantScreenFade = true;
}
} }

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

@ -6,15 +6,9 @@ import org.openrs2.deob.annotation.Pc;
public final class Static105 { public final class Static105 {
@OriginalMember(owner = "client!ib", name = "i", descriptor = "[Lclient!od;")
public static Class114[] aClass114Array1;
@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 = "e", descriptor = "Lclient!be;")
public static Component aClass13_14 = null;
@OriginalMember(owner = "client!ib", name = "k", descriptor = "Lclient!na;") @OriginalMember(owner = "client!ib", name = "k", descriptor = "Lclient!na;")
public static final JagString aClass100_561 = JagString.parse(" )2> <col=ffffff>"); public static final JagString aClass100_561 = JagString.parse(" )2> <col=ffffff>");

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

@ -1,10 +0,0 @@
package rt4;
import org.openrs2.deob.annotation.OriginalMember;
public final class Static106 {
@OriginalMember(owner = "client!ic", name = "a", descriptor = "Lclient!qf;")
public static Sprite compass;
}

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

@ -7,9 +7,6 @@ public final class Static109 {
@OriginalMember(owner = "client!ig", name = "b", descriptor = "I") @OriginalMember(owner = "client!ig", name = "b", descriptor = "I")
public static int anInt2882; public static int anInt2882;
@OriginalMember(owner = "client!ig", name = "d", descriptor = "I")
public static int anInt2883;
@OriginalMember(owner = "client!ig", name = "f", descriptor = "I") @OriginalMember(owner = "client!ig", name = "f", descriptor = "I")
public static int anInt2884; public static int anInt2884;

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

@ -5,9 +5,6 @@ import org.openrs2.deob.annotation.OriginalMember;
public final class Static111 { public final class Static111 {
@OriginalMember(owner = "client!ii", name = "y", descriptor = "I")
public static int anInt2910;
@OriginalMember(owner = "client!ii", name = "a", descriptor = "(Lclient!be;III)V") @OriginalMember(owner = "client!ii", name = "a", descriptor = "(Lclient!be;III)V")
public static void method2291(@OriginalArg(0) Component arg0, @OriginalArg(2) int arg1, @OriginalArg(3) int arg2) { public static void method2291(@OriginalArg(0) Component arg0, @OriginalArg(2) int arg1, @OriginalArg(3) int arg2) {
if (arg0.xMode == 0) { if (arg0.xMode == 0) {

32
client/src/main/java/rt4/Static112.java
View file

@ -12,9 +12,9 @@ public final class Static112 {
@Pc(11) int local11 = Static13.anInt436; @Pc(11) int local11 = Static13.anInt436;
@Pc(13) int local13 = Static24.anInt761; @Pc(13) int local13 = Static24.anInt761;
if (Static39.aClass3_Sub2_Sub1_1 == null || Static181.aClass3_Sub2_Sub1_9 == null) { if (Static39.aClass3_Sub2_Sub1_1 == null || Static181.aClass3_Sub2_Sub1_9 == null) {
if (client.js5Archive8.isFileReady(Static55.anInt1736) && client.js5Archive8.isFileReady(Static169.anInt4073)) { if (client.js5Archive8.isFileReady(Static40.anInt1736) && client.js5Archive8.isFileReady(Static40.anInt4073)) {
Static39.aClass3_Sub2_Sub1_1 = SoftwareSprite.loadSoftwareAlphaSprite(client.js5Archive8, Static55.anInt1736); Static39.aClass3_Sub2_Sub1_1 = SoftwareSprite.loadSoftwareAlphaSprite(client.js5Archive8, Static40.anInt1736);
Static181.aClass3_Sub2_Sub1_9 = SoftwareSprite.loadSoftwareAlphaSprite(client.js5Archive8, Static169.anInt4073); Static181.aClass3_Sub2_Sub1_9 = SoftwareSprite.loadSoftwareAlphaSprite(client.js5Archive8, Static40.anInt4073);
if (GlRenderer.enabled) { if (GlRenderer.enabled) {
if (Static39.aClass3_Sub2_Sub1_1 instanceof SoftwareAlphaSprite) { if (Static39.aClass3_Sub2_Sub1_1 instanceof SoftwareAlphaSprite) {
Static39.aClass3_Sub2_Sub1_1 = new GlAlphaSprite((SoftwareSprite) Static39.aClass3_Sub2_Sub1_1); Static39.aClass3_Sub2_Sub1_1 = new GlAlphaSprite((SoftwareSprite) Static39.aClass3_Sub2_Sub1_1);
@ -28,9 +28,9 @@ public final class Static112 {
} }
} }
} else if (GlRenderer.enabled) { } else if (GlRenderer.enabled) {
GlRaster.fillRectAlpha(local3, local9, local13, 20, Static40.anInt1275, 256 - Static111.anInt2910); GlRaster.fillRectAlpha(local3, local9, local13, 20, Static40.anInt1275, 256 - Static40.anInt2910);
} else { } else {
SoftwareRaster.fillRectAlpha(local3, local9, local13, 20, Static40.anInt1275, 256 - Static111.anInt2910); SoftwareRaster.fillRectAlpha(local3, local9, local13, 20, Static40.anInt1275, 256 - Static40.anInt2910);
} }
} }
@Pc(112) int local112; @Pc(112) int local112;
@ -43,11 +43,11 @@ public final class Static112 {
Static181.aClass3_Sub2_Sub1_9.render(local3, local9); Static181.aClass3_Sub2_Sub1_9.render(local3, local9);
Static181.aClass3_Sub2_Sub1_9.renderHorizontalFlip(local3 + local13 - Static181.aClass3_Sub2_Sub1_9.width, local9); Static181.aClass3_Sub2_Sub1_9.renderHorizontalFlip(local3 + local13 - Static181.aClass3_Sub2_Sub1_9.width, local9);
} }
Fonts.b12Full.renderLeft(LocalizedText.CHOOSE_OPTION, local3 + 3, local9 + 14, Static195.anInt4581, -1); Fonts.b12Full.renderLeft(LocalizedText.CHOOSE_OPTION, local3 + 3, local9 + 14, Static40.anInt4581, -1);
if (GlRenderer.enabled) { if (GlRenderer.enabled) {
GlRaster.fillRectAlpha(local3, local9 + 20, local13, local11 - 20, Static40.anInt1275, 256 - Static111.anInt2910); GlRaster.fillRectAlpha(local3, local9 + 20, local13, local11 - 20, Static40.anInt1275, 256 - Static40.anInt2910);
} else { } else {
SoftwareRaster.fillRectAlpha(local3, local9 + 20, local13, local11 - 20, Static40.anInt1275, 256 - Static111.anInt2910); SoftwareRaster.fillRectAlpha(local3, local9 + 20, local13, local11 - 20, Static40.anInt1275, 256 - Static40.anInt2910);
} }
local114 = Mouse.anInt5032; local114 = Mouse.anInt5032;
local112 = Mouse.anInt4873; local112 = Mouse.anInt4873;
@ -57,16 +57,16 @@ public final class Static112 {
local219 = (MiniMenu.size - local203 - 1) * 15 + local9 + 35; local219 = (MiniMenu.size - local203 - 1) * 15 + local9 + 35;
if (local3 < local112 && local112 < local3 + local13 && local114 > local219 - 13 && local114 < local219 + 3) { if (local3 < local112 && local112 < local3 + local13 && local114 > local219 - 13 && local114 < local219 + 3) {
if (GlRenderer.enabled) { if (GlRenderer.enabled) {
GlRaster.fillRectAlpha(local3, local219 - 13, local13, 16, Static251.anInt5457, 256 - Static232.anInt5208); GlRaster.fillRectAlpha(local3, local219 - 13, local13, 16, Static40.anInt5457, 256 - Static40.anInt5208);
} else { } else {
SoftwareRaster.fillRectAlpha(local3, local219 - 13, local13, 16, Static251.anInt5457, 256 - Static232.anInt5208); SoftwareRaster.fillRectAlpha(local3, local219 - 13, local13, 16, Static40.anInt5457, 256 - Static40.anInt5208);
} }
} }
} }
if ((Static165.aClass3_Sub2_Sub1_8 == null || Static92.aClass3_Sub2_Sub1_6 == null || Static204.aClass3_Sub2_Sub1_10 == null) && client.js5Archive8.isFileReady(Static85.anInt2261) && client.js5Archive8.isFileReady(Static136.anInt3324) && client.js5Archive8.isFileReady(Static254.anInt5556)) { if ((Static165.aClass3_Sub2_Sub1_8 == null || Static92.aClass3_Sub2_Sub1_6 == null || Static204.aClass3_Sub2_Sub1_10 == null) && client.js5Archive8.isFileReady(Static40.anInt2261) && client.js5Archive8.isFileReady(Static40.anInt3324) && client.js5Archive8.isFileReady(Static40.anInt5556)) {
Static165.aClass3_Sub2_Sub1_8 = SoftwareSprite.loadSoftwareAlphaSprite(client.js5Archive8, Static85.anInt2261); Static165.aClass3_Sub2_Sub1_8 = SoftwareSprite.loadSoftwareAlphaSprite(client.js5Archive8, Static40.anInt2261);
Static92.aClass3_Sub2_Sub1_6 = SoftwareSprite.loadSoftwareAlphaSprite(client.js5Archive8, Static136.anInt3324); Static92.aClass3_Sub2_Sub1_6 = SoftwareSprite.loadSoftwareAlphaSprite(client.js5Archive8, Static40.anInt3324);
Static204.aClass3_Sub2_Sub1_10 = SoftwareSprite.loadSoftwareAlphaSprite(client.js5Archive8, Static254.anInt5556); Static204.aClass3_Sub2_Sub1_10 = SoftwareSprite.loadSoftwareAlphaSprite(client.js5Archive8, Static40.anInt5556);
if (GlRenderer.enabled) { if (GlRenderer.enabled) {
if (Static165.aClass3_Sub2_Sub1_8 instanceof SoftwareAlphaSprite) { if (Static165.aClass3_Sub2_Sub1_8 instanceof SoftwareAlphaSprite) {
Static165.aClass3_Sub2_Sub1_8 = new GlAlphaSprite((SoftwareSprite) Static165.aClass3_Sub2_Sub1_8); Static165.aClass3_Sub2_Sub1_8 = new GlAlphaSprite((SoftwareSprite) Static165.aClass3_Sub2_Sub1_8);
@ -101,9 +101,9 @@ public final class Static112 {
} }
for (local203 = 0; local203 < MiniMenu.size; local203++) { for (local203 = 0; local203 < MiniMenu.size; local203++) {
local219 = (MiniMenu.size - local203 - 1) * 15 + local9 + 35; local219 = (MiniMenu.size - local203 - 1) * 15 + local9 + 35;
local418 = Static195.anInt4581; local418 = Static40.anInt4581;
if (local3 < local112 && local13 + local3 > local112 && local219 - 13 < local114 && local114 < local219 + 3) { if (local3 < local112 && local13 + local3 > local112 && local219 - 13 < local114 && local114 < local219 + 3) {
local418 = Static262.anInt5752; local418 = Static40.anInt5752;
} }
Fonts.b12Full.renderLeft(MiniMenu.getOp(local203), local3 + 3, local219, local418, 0); Fonts.b12Full.renderLeft(MiniMenu.getOp(local203), local3 + 3, local219, local418, 0);
} }

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

@ -37,12 +37,4 @@ public final class Static114 {
} }
} }
@OriginalMember(owner = "client!j", name = "g", descriptor = "(I)V")
public static void method4637() {
Static165.aClass3_Sub2_Sub1_8 = null;
Static39.aClass3_Sub2_Sub1_1 = null;
Static92.aClass3_Sub2_Sub1_6 = null;
Static181.aClass3_Sub2_Sub1_9 = null;
Static204.aClass3_Sub2_Sub1_10 = null;
}
} }

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

@ -22,7 +22,29 @@ public final class Static115 {
public static int anInt2941 = -1; public static int anInt2941 = -1;
@OriginalMember(owner = "client!ja", name = "s", descriptor = "Lclient!na;") @OriginalMember(owner = "client!ja", name = "s", descriptor = "Lclient!na;")
public static final JagString aClass100_582 = JagString.parse("http:)4)4"); public static final JagString HTTP_PROTOCOL = JagString.parse("http:)4)4");
@OriginalMember(owner = "client!od", name = "g", descriptor = "S")
public static short aShort25 = 256;
@OriginalMember(owner = "client!an", name = "db", descriptor = "S")
public static short aShort9 = 205;
@OriginalMember(owner = "client!mc", name = "tb", descriptor = "S")
public static short aShort22 = 1;
@OriginalMember(owner = "client!ac", name = "k", descriptor = "S")
public static short aShort1 = 32767;
@OriginalMember(owner = "client!nc", name = "n", descriptor = "I")
public static int anInt4055 = 0;
@OriginalMember(owner = "client!tm", name = "i", descriptor = "I")
public static int anInt5377 = 0;
@OriginalMember(owner = "client!bn", name = "eb", descriptor = "I")
public static int anInt773 = 0;
@OriginalMember(owner = "client!ah", name = "n", descriptor = "I")
public static int anInt983 = 0;
@OriginalMember(owner = "client!sc", name = "p", descriptor = "I")
public static int anInt5029 = 0;
@OriginalMember(owner = "client!kd", name = "yb", descriptor = "S")
public static short aShort21 = 32767;
@OriginalMember(owner = "client!ee", name = "f", descriptor = "S")
public static short aShort12 = 1;
@OriginalMember(owner = "client!ja", name = "a", descriptor = "([II)[I") @OriginalMember(owner = "client!ja", name = "a", descriptor = "([II)[I")
public static int[] method2308(@OriginalArg(0) int[] arg0) { public static int[] method2308(@OriginalArg(0) int[] arg0) {
@ -61,21 +83,21 @@ public final class Static115 {
} else if (local25 > 100) { } else if (local25 > 100) {
local25 = 100; local25 = 100;
} }
@Pc(51) int local51 = local25 * (Static10.aShort9 - Static178.aShort25) / 100 + Static178.aShort25; @Pc(51) int local51 = local25 * (aShort9 - aShort25) / 100 + aShort25;
if (Static153.aShort22 > local51) { if (aShort22 > local51) {
local51 = Static153.aShort22; local51 = aShort22;
} else if (Static4.aShort1 < local51) { } else if (aShort1 < local51) {
local51 = Static4.aShort1; local51 = aShort1;
} }
@Pc(73) int local73 = local51 * arg2 * 512 / (arg0 * 334); @Pc(73) int local73 = local51 * arg2 * 512 / (arg0 * 334);
@Pc(115) int local115; @Pc(115) int local115;
@Pc(122) int local122; @Pc(122) int local122;
@Pc(86) short local86; @Pc(86) short local86;
if (local73 < Static55.aShort12) { if (local73 < aShort12) {
local86 = Static55.aShort12; local86 = aShort12;
local51 = arg0 * 334 * local86 / (arg2 * 512); local51 = arg0 * 334 * local86 / (arg2 * 512);
if (Static4.aShort1 < local51) { if (aShort1 < local51) {
local51 = Static4.aShort1; local51 = aShort1;
local115 = arg2 * 512 * local51 / (local86 * 334); local115 = arg2 * 512 * local51 / (local86 * 334);
local122 = (arg0 - local115) / 2; local122 = (arg0 - local115) / 2;
if (arg4) { if (arg4) {
@ -86,11 +108,11 @@ public final class Static115 {
arg3 += local122; arg3 += local122;
arg0 -= local122 * 2; arg0 -= local122 * 2;
} }
} else if (Static131.aShort21 < local73) { } else if (aShort21 < local73) {
local86 = Static131.aShort21; local86 = aShort21;
local51 = local86 * arg0 * 334 / (arg2 * 512); local51 = local86 * arg0 * 334 / (arg2 * 512);
if (Static153.aShort22 > local51) { if (aShort22 > local51) {
local51 = Static153.aShort22; local51 = aShort22;
local115 = local86 * arg0 * 334 / (local51 * 512); local115 = local86 * arg0 * 334 / (local51 * 512);
local122 = (arg2 - local115) / 2; local122 = (arg2 - local115) / 2;
if (arg4) { if (arg4) {
@ -102,34 +124,12 @@ public final class Static115 {
arg1 += local122; arg1 += local122;
} }
} }
Static223.anInt5029 = local51 * arg2 / 334; anInt5029 = local51 * arg2 / 334;
} }
Static166.anInt4055 = (short) arg0; anInt4055 = (short) arg0;
Static245.anInt5377 = (short) arg2; anInt5377 = (short) arg2;
Static24.anInt773 = arg1; anInt773 = arg1;
Static7.anInt983 = arg3; anInt983 = arg3;
} }
@OriginalMember(owner = "client!ja", name = "a", descriptor = "(Z)V")
public static void clear() {
Fonts.p12Full = null;
Sprites.hitmarks = null;
Sprites.crosses = null;
Sprites.nameIcons = null;
Fonts.p11FullSoftware = null;
Sprites.mapfunctions = null;
Static67.mapfuncs = null;
Sprites.mapmarkhints = null;
Sprites.headiconPrayers = null;
Fonts.b12Full = null;
Static106.compass = null;
Sprites.mapdots = null;
Fonts.p11Full = null;
Sprites.mapflags = null;
Sprites.hitbars = null;
Static277.hintMapEdge = null;
Sprites.headhints = null;
Sprites.headiconPks = null;
Sprites.scrollbars = null;
}
} }

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

@ -8,9 +8,6 @@ public final class Static126 {
@OriginalMember(owner = "client!jm", name = "r", descriptor = "I") @OriginalMember(owner = "client!jm", name = "r", descriptor = "I")
public static int anInt3114; public static int anInt3114;
@OriginalMember(owner = "client!jm", name = "s", descriptor = "F")
public static float aFloat13;
@OriginalMember(owner = "client!jm", name = "a", descriptor = "(Z)V") @OriginalMember(owner = "client!jm", name = "a", descriptor = "(Z)V")
public static void method2460() { public static void method2460() {
if (InterfaceList.topLevelInterface != -1) { if (InterfaceList.topLevelInterface != -1) {

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

@ -146,8 +146,8 @@ public final class Static127 {
} }
} }
if (arg4) { if (arg4) {
Static138.renderX -= local86 * 128; Camera.renderX -= local86 * 128;
Static134.renderZ -= local81 * 128; Camera.renderZ -= local81 * 128;
Static248.anInt4232 -= local81; Static248.anInt4232 -= local81;
Static251.anInt5449 -= local86; Static251.anInt5449 -= local86;
Static265.anInt5765 -= local81; Static265.anInt5765 -= local81;
@ -161,7 +161,7 @@ public final class Static127 {
Static115.mapFlagX -= local86; Static115.mapFlagX -= local86;
} }
if (GlRenderer.enabled && arg4 && (Math.abs(local86) > 104 || Math.abs(local81) > 104)) { if (GlRenderer.enabled && arg4 && (Math.abs(local86) > 104 || Math.abs(local81) > 104)) {
Static86.setInstantFade(); Static103.setInstantFade();
} }
Static107.anInt2875 = -1; Static107.anInt2875 = -1;
Static99.aClass69_64.clear(); Static99.aClass69_64.clear();
@ -195,7 +195,7 @@ public final class Static127 {
} }
@Pc(246) JagString local246 = JagString.EMPTY; @Pc(246) JagString local246 = JagString.EMPTY;
if (Player.lastLogAddress != null) { if (Player.lastLogAddress != null) {
local246 = Static181.method3341(Player.lastLogAddress.intArg2); local246 = JagString.formatIp(Player.lastLogAddress.intArg2);
if (Player.lastLogAddress.result != null) { if (Player.lastLogAddress.result != null) {
@Pc(265) byte[] local265 = ((String) Player.lastLogAddress.result).getBytes(StandardCharsets.ISO_8859_1); @Pc(265) byte[] local265 = ((String) Player.lastLogAddress.result).getBytes(StandardCharsets.ISO_8859_1);
local246 = JagString.decodeString(local265, local265.length, 0); local246 = JagString.decodeString(local265, local265.length, 0);

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

@ -10,7 +10,4 @@ public final class Static13 {
@OriginalMember(owner = "client!bc", name = "Z", descriptor = "I") @OriginalMember(owner = "client!bc", name = "Z", descriptor = "I")
public static int anInt437; public static int anInt437;
@OriginalMember(owner = "client!bc", name = "I", descriptor = "Z")
public static boolean aBoolean16 = false;
} }

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

@ -7,18 +7,12 @@ import org.openrs2.deob.annotation.Pc;
public final class Static131 { public final class Static131 {
@OriginalMember(owner = "client!kd", name = "ub", descriptor = "I")
public static int anInt3255;
@OriginalMember(owner = "client!kd", name = "ob", descriptor = "I") @OriginalMember(owner = "client!kd", name = "ob", descriptor = "I")
public static int anInt3251 = 0; public static int anInt3251 = 0;
@OriginalMember(owner = "client!kd", name = "sb", descriptor = "[I") @OriginalMember(owner = "client!kd", name = "sb", descriptor = "[I")
public static final int[] anIntArray307 = new int[] { 1, 1, 0, 0, 0, 8, 0, 0, 8 }; public static final int[] anIntArray307 = new int[] { 1, 1, 0, 0, 0, 8, 0, 0, 8 };
@OriginalMember(owner = "client!kd", name = "yb", descriptor = "S")
public static short aShort21 = 32767;
@OriginalMember(owner = "client!kd", name = "Bb", descriptor = "I") @OriginalMember(owner = "client!kd", name = "Bb", descriptor = "I")
public static int anInt3260 = -1; public static int anInt3260 = -1;

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

@ -9,9 +9,6 @@ public final class Static132 {
@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;
@OriginalMember(owner = "client!ke", name = "Y", descriptor = "[I")
public static final int[] anIntArray309 = new int[] { 1, 4 };
@OriginalMember(owner = "client!ke", name = "a", descriptor = "(ZLclient!wk;Z)V") @OriginalMember(owner = "client!ke", name = "a", descriptor = "(ZLclient!wk;Z)V")
public static void closeInterface(@OriginalArg(0) boolean arg0, @OriginalArg(1) ComponentPointer arg1) { public static void closeInterface(@OriginalArg(0) boolean arg0, @OriginalArg(1) ComponentPointer arg1) {
@Pc(9) int local9 = (int) arg1.key; @Pc(9) int local9 = (int) arg1.key;
@ -33,7 +30,7 @@ public final class Static132 {
} }
} }
if (MiniMenu.size == 1) { if (MiniMenu.size == 1) {
Static60.aBoolean108 = false; Static40.aBoolean108 = false;
Static133.method4012(Static183.anInt4271, Static24.anInt761, Static229.anInt5138, Static13.anInt436); Static133.method4012(Static183.anInt4271, Static24.anInt761, Static229.anInt5138, Static13.anInt436);
} else { } else {
Static133.method4012(Static183.anInt4271, Static24.anInt761, Static229.anInt5138, Static13.anInt436); Static133.method4012(Static183.anInt4271, Static24.anInt761, Static229.anInt5138, Static13.anInt436);
@ -44,7 +41,7 @@ public final class Static132 {
local43 = local88; local43 = local88;
} }
} }
Static13.anInt436 = MiniMenu.size * 15 + (Static261.aBoolean298 ? 26 : 22); Static13.anInt436 = MiniMenu.size * 15 + (Static40.aBoolean298 ? 26 : 22);
Static24.anInt761 = local43 + 8; Static24.anInt761 = local43 + 8;
} }
if (InterfaceList.topLevelInterface != -1) { if (InterfaceList.topLevelInterface != -1) {

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

@ -6,9 +6,6 @@ import org.openrs2.deob.annotation.Pc;
public final class Static134 { public final class Static134 {
@OriginalMember(owner = "client!kh", name = "f", descriptor = "I")
public static int renderZ;
@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);

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

@ -4,9 +4,6 @@ import org.openrs2.deob.annotation.OriginalMember;
public final class Static136 { public final class Static136 {
@OriginalMember(owner = "client!kk", name = "i", descriptor = "I")
public static int anInt3324;
@OriginalMember(owner = "client!kk", name = "j", descriptor = "I") @OriginalMember(owner = "client!kk", name = "j", descriptor = "I")
public static int anInt3325 = 0; public static int anInt3325 = 0;

9
client/src/main/java/rt4/Static138.java
View file

@ -4,12 +4,6 @@ import org.openrs2.deob.annotation.OriginalMember;
public final class Static138 { public final class Static138 {
@OriginalMember(owner = "client!km", name = "Pc", descriptor = "I")
public static int renderX;
@OriginalMember(owner = "client!km", name = "pc", descriptor = "Z")
public static boolean aBoolean172 = false;
@OriginalMember(owner = "client!km", name = "tc", descriptor = "Lclient!na;") @OriginalMember(owner = "client!km", name = "tc", descriptor = "Lclient!na;")
private static final JagString aClass100_641 = JagString.parse("Dec"); private static final JagString aClass100_641 = JagString.parse("Dec");
@ -58,7 +52,4 @@ public final class Static138 {
@OriginalMember(owner = "client!km", name = "Sc", descriptor = "Lclient!na;") @OriginalMember(owner = "client!km", name = "Sc", descriptor = "Lclient!na;")
public static final JagString TRADE = JagString.parse(":trade:"); public static final JagString TRADE = JagString.parse(":trade:");
@OriginalMember(owner = "client!km", name = "ad", descriptor = "I")
public static int fp = 0;
} }

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

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

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

@ -7,16 +7,4 @@ public final class Static144 {
@OriginalMember(owner = "client!le", name = "c", descriptor = "Lclient!rf;") @OriginalMember(owner = "client!le", name = "c", descriptor = "Lclient!rf;")
public static Song aClass3_Sub29_1; public static Song aClass3_Sub29_1;
@OriginalMember(owner = "client!le", name = "a", descriptor = "(I)I")
public static int getWindowMode() {
if (GameShell.fullScreenFrame != null) {
return 3;
} else if (GlRenderer.enabled && Static124.aBoolean156) {
return 2;
} else if (GlRenderer.enabled && !Static124.aBoolean156) {
return 1;
} else {
return 0;
}
}
} }

9
client/src/main/java/rt4/Static146.java
View file

@ -12,15 +12,6 @@ public final class Static146 {
@OriginalMember(owner = "client!lg", name = "b", descriptor = "Z") @OriginalMember(owner = "client!lg", name = "b", descriptor = "Z")
public static boolean aBoolean174 = false; public static boolean aBoolean174 = false;
@OriginalMember(owner = "client!lg", name = "a", descriptor = "(ZLclient!wa;Lclient!na;)I")
public static int method2748(@OriginalArg(1) Buffer arg0, @OriginalArg(2) JagString arg1) {
@Pc(6) int local6 = arg0.offset;
@Pc(14) byte[] local14 = arg1.method3148();
arg0.pSmart1or2(local14.length);
arg0.offset += WordPack.codec.method1550(local14.length, arg0.data, local14, 0, arg0.offset);
return arg0.offset - local6;
}
@OriginalMember(owner = "client!lg", name = "a", descriptor = "(I)V") @OriginalMember(owner = "client!lg", name = "a", descriptor = "(I)V")
public static void method2750(@OriginalArg(0) int arg0) { public static void method2750(@OriginalArg(0) int arg0) {
Static235.anInt5276 = arg0; Static235.anInt5276 = arg0;

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

@ -1,8 +1,6 @@
package rt4; package rt4;
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 Static148 { public final class Static148 {
@ -12,16 +10,4 @@ public final class Static148 {
@OriginalMember(owner = "client!li", name = "w", descriptor = "Lclient!sc;") @OriginalMember(owner = "client!li", name = "w", descriptor = "Lclient!sc;")
public static HashTable aClass133_13; public static HashTable aClass133_13;
@OriginalMember(owner = "client!li", name = "a", descriptor = "(III)V")
public static void method2766(@OriginalArg(0) int arg0, @OriginalArg(2) int arg1) {
VarpDomain.activeVarps[arg0] = arg1;
@Pc(21) LongNode local21 = (LongNode) VarpDomain.aClass133_20.get((long) arg0);
if (local21 == null) {
local21 = new LongNode(MonotonicClock.currentTimeMillis() + 500L);
VarpDomain.aClass133_20.put(local21, (long) arg0);
} else {
local21.value = MonotonicClock.currentTimeMillis() + 500L;
}
}
} }

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

@ -19,8 +19,6 @@ public final class Static15 {
public static final JagString aClass100_886 = JagString.parse(")3runescape)3com)4l="); public static final JagString aClass100_886 = JagString.parse(")3runescape)3com)4l=");
@OriginalMember(owner = "client!v", name = "a", descriptor = "Lclient!na;") @OriginalMember(owner = "client!v", name = "a", descriptor = "Lclient!na;")
public static final JagString aClass100_98 = JagString.parse(")4a="); public static final JagString aClass100_98 = JagString.parse(")4a=");
@OriginalMember(owner = "client!be", name = "Vb", descriptor = "F")
public static float aFloat4;
@OriginalMember(owner = "client!be", name = "a", descriptor = "(Z)Lclient!na;") @OriginalMember(owner = "client!be", name = "a", descriptor = "(Z)Lclient!na;")
public static JagString method479() { public static JagString method479() {

28
client/src/main/java/rt4/Static153.java
View file

@ -1,28 +0,0 @@
package rt4;
import org.openrs2.deob.annotation.OriginalMember;
public final class Static153 {
@OriginalMember(owner = "client!mc", name = "ab", descriptor = "[I")
public static final int[] anIntArray351 = new int[] { 7, 8, 9, 10, 11, 12, 13, 15 };
@OriginalMember(owner = "client!mc", name = "fb", descriptor = "Lclient!na;")
private static final JagString aClass100_725 = JagString.parse("pt");
@OriginalMember(owner = "client!mc", name = "mb", descriptor = "Lclient!na;")
private static final JagString aClass100_726 = JagString.parse("en");
@OriginalMember(owner = "client!mc", name = "vb", descriptor = "Lclient!na;")
private static final JagString aClass100_728 = JagString.parse("de");
@OriginalMember(owner = "client!mc", name = "pb", descriptor = "Lclient!na;")
private static final JagString aClass100_727 = JagString.parse("fr");
@OriginalMember(owner = "client!mc", name = "ob", descriptor = "[Lclient!na;")
public static final JagString[] aClass100Array113 = new JagString[] { aClass100_726, aClass100_728, aClass100_727, aClass100_725 };
@OriginalMember(owner = "client!mc", name = "tb", descriptor = "S")
public static short aShort22 = 1;
}

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

@ -6,9 +6,6 @@ import org.openrs2.deob.annotation.Pc;
public final class Static154 { public final class Static154 {
@OriginalMember(owner = "client!md", name = "S", descriptor = "I")
public static int anInt3709;
@OriginalMember(owner = "client!md", name = "a", descriptor = "(Lclient!be;I)Z") @OriginalMember(owner = "client!md", name = "a", descriptor = "(Lclient!be;I)Z")
public static boolean method2926(@OriginalArg(0) Component arg0) { public static boolean method2926(@OriginalArg(0) Component arg0) {
if (arg0.anIntArray43 == null) { if (arg0.anIntArray43 == null) {

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

@ -1,21 +1,10 @@
package rt4; package rt4;
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 Static155 { public final class Static155 {
@OriginalMember(owner = "client!me", name = "nb", descriptor = "I") @OriginalMember(owner = "client!me", name = "nb", descriptor = "I")
public static int anInt3751; public static int anInt3751;
@OriginalMember(owner = "client!me", name = "a", descriptor = "(II)I")
public static int getVarbit(@OriginalArg(1) int arg0) {
@Pc(13) VarbitType local13 = VarbitTypeList.get(arg0);
@Pc(16) int local16 = local13.baseVar;
@Pc(19) int local19 = local13.endBit;
@Pc(22) int local22 = local13.startBit;
@Pc(29) int local29 = Song_Class3_Sub9.anIntArray135[local19 - local22];
return VarpDomain.activeVarps[local16] >> local22 & local29;
}
} }

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

@ -1,6 +1,5 @@
package rt4; package rt4;
import com.jogamp.opengl.*;
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; import org.openrs2.deob.annotation.Pc;
@ -95,7 +94,7 @@ public final class Static156 {
if (GlRenderer.enabled) { if (GlRenderer.enabled) {
MaterialManager.renderingUnderwater = false; MaterialManager.renderingUnderwater = false;
MaterialManager.setMaterial(0, 0); MaterialManager.setMaterial(0, 0);
Static161.method3066(null); FogManager.method3066(null);
LightingManager.method2390(); LightingManager.method2390();
} }
Static278.setRenderTiles(false); Static278.setRenderTiles(false);

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

@ -21,9 +21,9 @@ public final class Static160 {
SoftwareRaster.method2504(arg0, arg1, arg2.anIntArray37, arg2.anIntArray45); SoftwareRaster.method2504(arg0, arg1, arg2.anIntArray37, arg2.anIntArray45);
} }
} else if (GlRenderer.enabled) { } else if (GlRenderer.enabled) {
((GlSprite) Static106.compass).renderRotatedTransparent(arg0, arg1, arg2.width, arg2.height, Static106.compass.width / 2, Static106.compass.height / 2, (int)Camera.yawTarget, 256, (GlSprite) arg2.method489(false)); ((GlSprite) Sprites.compass).renderRotatedTransparent(arg0, arg1, arg2.width, arg2.height, Sprites.compass.width / 2, Sprites.compass.height / 2, (int)Camera.yawTarget, 256, (GlSprite) arg2.method489(false));
} else { } else {
((SoftwareSprite) Static106.compass).renderRotated(arg0, arg1, arg2.width, arg2.height, Static106.compass.width / 2, Static106.compass.height / 2, (int)Camera.yawTarget, arg2.anIntArray37, arg2.anIntArray45); ((SoftwareSprite) Sprites.compass).renderRotated(arg0, arg1, arg2.width, arg2.height, Sprites.compass.width / 2, Sprites.compass.height / 2, (int)Camera.yawTarget, arg2.anIntArray37, arg2.anIntArray45);
} }
InterfaceList.rectangleRedraw[arg3] = true; InterfaceList.rectangleRedraw[arg3] = true;
} }

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

@ -15,9 +15,6 @@ public final class Static165 {
@OriginalMember(owner = "client!nb", name = "a", descriptor = "Lclient!na;") @OriginalMember(owner = "client!nb", name = "a", descriptor = "Lclient!na;")
public static final JagString aClass100_772 = JagString.parse("um"); public static final JagString aClass100_772 = JagString.parse("um");
@OriginalMember(owner = "client!nb", name = "d", descriptor = "I")
public static int anInt4035 = 0;
@OriginalMember(owner = "client!nb", name = "n", descriptor = "Lclient!na;") @OriginalMember(owner = "client!nb", name = "n", descriptor = "Lclient!na;")
public static final JagString DETAILS = JagString.parse("details"); public static final JagString DETAILS = JagString.parse("details");

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

@ -1,13 +1,5 @@
package rt4; package rt4;
import org.openrs2.deob.annotation.OriginalMember;
public final class Static166 { public final class Static166 {
@OriginalMember(owner = "client!nc", name = "a", descriptor = "I")
public static int anInt4044;
@OriginalMember(owner = "client!nc", name = "n", descriptor = "I")
public static int anInt4055 = 0;
} }

9
client/src/main/java/rt4/Static169.java
View file

@ -7,9 +7,6 @@ import org.openrs2.deob.annotation.Pc;
public final class Static169 { public final class Static169 {
@OriginalMember(owner = "client!nf", name = "e", descriptor = "I")
public static int anInt4073;
@OriginalMember(owner = "client!nf", name = "h", descriptor = "Lclient!be;") @OriginalMember(owner = "client!nf", name = "h", descriptor = "Lclient!be;")
public static Component aClass13_18; public static Component aClass13_18;
@ -43,14 +40,14 @@ public final class Static169 {
if (!arg3.isFullScreenSupported()) { if (!arg3.isFullScreenSupported()) {
return null; return null;
} }
@Pc(20) Class114[] local20 = Static197.method3558(arg3); @Pc(20) DisplayMode[] local20 = DisplayMode.method3558(arg3);
if (local20 == null) { if (local20 == null) {
return null; return null;
} }
@Pc(27) boolean local27 = false; @Pc(27) boolean local27 = false;
for (@Pc(29) int local29 = 0; local29 < local20.length; local29++) { for (@Pc(29) int local29 = 0; local29 < local20.length; local29++) {
if (arg2 == local20[local29].anInt4248 && arg1 == local20[local29].anInt4250 && (!local27 || local20[local29].anInt4251 > arg0)) { if (arg2 == local20[local29].width && arg1 == local20[local29].height && (!local27 || local20[local29].bitDepth > arg0)) {
arg0 = local20[local29].anInt4251; arg0 = local20[local29].bitDepth;
local27 = true; local27 = true;
} }
} }

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

@ -7,9 +7,6 @@ import org.openrs2.deob.annotation.Pc;
public final class Static171 { public final class Static171 {
@OriginalMember(owner = "client!ni", name = "h", descriptor = "I")
public static int anInt4153;
@OriginalMember(owner = "client!ni", name = "a", descriptor = "(ILclient!na;)I") @OriginalMember(owner = "client!ni", name = "a", descriptor = "(ILclient!na;)I")
public static int method3218(@OriginalArg(1) JagString arg0) { public static int method3218(@OriginalArg(1) JagString arg0) {
if (WorldMap.labels == null || arg0.length() == 0) { if (WorldMap.labels == null || arg0.length() == 0) {

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

@ -55,7 +55,7 @@ public final class Static176 {
if (client.settings != null) { if (client.settings != null) {
local89 = JagString.concatenate(new JagString[] { aClass100_783, client.settings}); local89 = JagString.concatenate(new JagString[] { aClass100_783, client.settings});
} }
@Pc(182) JagString local182 = JagString.concatenate(new JagString[] { Static115.aClass100_582, local3.hostname, local62, aClass100_1107, JagString.parseInt(client.language), aClass100_801, JagString.parseInt(client.affiliate), local89, Static139.aClass100_659, client.objectTag ? aClass100_184 : Static260.aClass100_945, aClass100_420, client.javaScript ? aClass100_184 : Static260.aClass100_945, Static198.aClass100_260, client.advertSuppressed ? aClass100_184 : Static260.aClass100_945 }); @Pc(182) JagString local182 = JagString.concatenate(new JagString[] { Static115.HTTP_PROTOCOL, local3.hostname, local62, aClass100_1107, JagString.parseInt(client.language), aClass100_801, JagString.parseInt(client.affiliate), local89, Static139.aClass100_659, client.objectTag ? aClass100_184 : Static260.aClass100_945, aClass100_420, client.javaScript ? aClass100_184 : Static260.aClass100_945, Static198.aClass100_260, client.advertSuppressed ? aClass100_184 : Static260.aClass100_945 });
try { try {
client.instance.getAppletContext().showDocument(local182.method3107(), "_self"); client.instance.getAppletContext().showDocument(local182.method3107(), "_self");
return true; return true;

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

@ -4,9 +4,6 @@ import org.openrs2.deob.annotation.OriginalMember;
public final class Static178 { public final class Static178 {
@OriginalMember(owner = "client!od", name = "g", descriptor = "S")
public static short aShort25 = 256;
@OriginalMember(owner = "client!od", name = "i", descriptor = "I") @OriginalMember(owner = "client!od", name = "i", descriptor = "I")
public static int anInt4247 = 0; public static int anInt4247 = 0;

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

@ -7,9 +7,6 @@ public final class Static179 {
@OriginalMember(owner = "client!oe", name = "b", descriptor = "I") @OriginalMember(owner = "client!oe", name = "b", descriptor = "I")
public static int anInt4254 = 0; public static int anInt4254 = 0;
@OriginalMember(owner = "client!oe", name = "i", descriptor = "[[I")
public static final int[][] anIntArrayArray33 = new int[5][5000];
@OriginalMember(owner = "client!oe", name = "n", descriptor = "I") @OriginalMember(owner = "client!oe", name = "n", descriptor = "I")
public static int anInt4262 = 1; public static int anInt4262 = 1;

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

@ -52,8 +52,8 @@ public final class Static18 {
} }
Camera.cameraPitch = arg6; Camera.cameraPitch = arg6;
Camera.cameraYaw = arg4; Camera.cameraYaw = arg4;
Static134.renderZ = arg5 - local57; Camera.renderZ = arg5 - local57;
Static138.renderX = arg0 - local55; Camera.renderX = arg0 - local55;
Static5.anInt40 = arg2 - local59; Static5.anInt40 = arg2 - local59;
} }

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

@ -17,11 +17,6 @@ public final class Static181 {
} }
} }
@OriginalMember(owner = "client!oi", name = "a", descriptor = "(II)Lclient!na;")
public static JagString method3341(@OriginalArg(0) int arg0) {
return JagString.concatenate(new JagString[] { JagString.parseInt(arg0 >> 24 & 0xFF), Static233.aClass100_994, JagString.parseInt(arg0 >> 16 & 0xFF), Static233.aClass100_994, JagString.parseInt(arg0 >> 8 & 0xFF), Static233.aClass100_994, JagString.parseInt(arg0 & 0xFF) });
}
@OriginalMember(owner = "client!oi", name = "a", descriptor = "(I[I[Ljava/lang/Object;)V") @OriginalMember(owner = "client!oi", name = "a", descriptor = "(I[I[Ljava/lang/Object;)V")
public static void method3346(@OriginalArg(1) int[] arg0, @OriginalArg(2) Object[] arg1) { public static void method3346(@OriginalArg(1) int[] arg0, @OriginalArg(2) Object[] arg1) {
Static53.method1292(arg1, arg0.length - 1, arg0, 0); Static53.method1292(arg1, arg0.length - 1, arg0, 0);

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

@ -9,9 +9,6 @@ public final class Static185 {
@OriginalMember(owner = "client!p", name = "e", descriptor = "I") @OriginalMember(owner = "client!p", name = "e", descriptor = "I")
public static int anInt4370; public static int anInt4370;
@OriginalMember(owner = "client!p", name = "g", descriptor = "F")
public static float aFloat23;
@OriginalMember(owner = "client!p", name = "a", descriptor = "(IZIZLclient!mj;IIIBII)V") @OriginalMember(owner = "client!p", name = "a", descriptor = "(IZIZLclient!mj;IIIBII)V")
public static void method3397(@OriginalArg(0) int arg0, @OriginalArg(1) boolean arg1, @OriginalArg(2) int arg2, @OriginalArg(3) boolean arg3, @OriginalArg(4) CollisionMap arg4, @OriginalArg(5) int arg5, @OriginalArg(6) int arg6, @OriginalArg(7) int arg7, @OriginalArg(9) int arg8, @OriginalArg(10) int arg9) { public static void method3397(@OriginalArg(0) int arg0, @OriginalArg(1) boolean arg1, @OriginalArg(2) int arg2, @OriginalArg(3) boolean arg3, @OriginalArg(4) CollisionMap arg4, @OriginalArg(5) int arg5, @OriginalArg(6) int arg6, @OriginalArg(7) int arg7, @OriginalArg(9) int arg8, @OriginalArg(10) int arg9) {
if (arg1 && !SceneGraph.allLevelsAreVisible() && (SceneGraph.tileFlags[0][arg7][arg8] & 0x2) == 0) { if (arg1 && !SceneGraph.allLevelsAreVisible() && (SceneGraph.tileFlags[0][arg7][arg8] & 0x2) == 0) {

9
client/src/main/java/rt4/Static188.java
View file

@ -1,9 +0,0 @@
package rt4;
import org.openrs2.deob.annotation.OriginalMember;
public final class Static188 {
@OriginalMember(owner = "client!pd", name = "b", descriptor = "[F")
public static final float[] aFloatArray22 = new float[] { 0.1F, 0.1F, 0.15F, 0.1F };
}

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

@ -9,9 +9,6 @@ public final class Static19 {
@OriginalMember(owner = "client!bi", name = "Y", descriptor = "[[B") @OriginalMember(owner = "client!bi", name = "Y", descriptor = "[[B")
public static byte[][] underWaterLocationsMapFilesBuffer; public static byte[][] underWaterLocationsMapFilesBuffer;
@OriginalMember(owner = "client!bi", name = "jb", descriptor = "Z")
public static boolean aBoolean43 = true;
@OriginalMember(owner = "client!bi", name = "a", descriptor = "(IIIIIIII)Z") @OriginalMember(owner = "client!bi", name = "a", descriptor = "(IIIIIIII)Z")
public static boolean method583(@OriginalArg(0) int arg0, @OriginalArg(1) int arg1, @OriginalArg(2) int arg2, @OriginalArg(3) int arg3, @OriginalArg(4) int arg4, @OriginalArg(5) int arg5, @OriginalArg(6) int arg6, @OriginalArg(7) int arg7) { public static boolean method583(@OriginalArg(0) int arg0, @OriginalArg(1) int arg1, @OriginalArg(2) int arg2, @OriginalArg(3) int arg3, @OriginalArg(4) int arg4, @OriginalArg(5) int arg5, @OriginalArg(6) int arg6, @OriginalArg(7) int arg7) {
if (arg1 < arg2 && arg1 < arg3 && arg1 < arg4) { if (arg1 < arg2 && arg1 < arg3 && arg1 < arg4) {

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

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

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

@ -4,9 +4,6 @@ import org.openrs2.deob.annotation.OriginalMember;
public final class Static192 { public final class Static192 {
@OriginalMember(owner = "client!ph", name = "b", descriptor = "[[Lclient!li;")
public static final Environment[][] aClass92ArrayArray1 = new Environment[13][13];
@OriginalMember(owner = "client!ph", name = "b", descriptor = "(B)V") @OriginalMember(owner = "client!ph", name = "b", descriptor = "(B)V")
public static void method3474() { public static void method3474() {
PlayerAppearance.aClass99_33.method3103(); PlayerAppearance.aClass99_33.method3103();

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

@ -5,9 +5,6 @@ import org.openrs2.deob.annotation.Pc;
public final class Static195 { public final class Static195 {
@OriginalMember(owner = "client!pk", name = "Y", descriptor = "I")
public static int anInt4581;
@OriginalMember(owner = "client!pk", name = "bb", descriptor = "Lclient!na;") @OriginalMember(owner = "client!pk", name = "bb", descriptor = "Lclient!na;")
public static JagString walkText; public static JagString walkText;

196
client/src/main/java/rt4/Static197.java
View file

@ -1,11 +1,6 @@
package rt4; package rt4;
import java.awt.Container;
import java.awt.Graphics;
import java.awt.Insets;
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 Static197 { public final class Static197 {
@ -18,195 +13,4 @@ public final class Static197 {
@OriginalMember(owner = "client!pm", name = "ab", descriptor = "Z") @OriginalMember(owner = "client!pm", name = "ab", descriptor = "Z")
public static boolean aBoolean228 = true; public static boolean aBoolean228 = true;
@OriginalMember(owner = "client!pm", name = "a", descriptor = "(ILsignlink!ll;)[Lclient!od;")
public static Class114[] method3558(@OriginalArg(1) SignLink arg0) {
if (!arg0.isFullScreenSupported()) {
return new Class114[0];
}
@Pc(17) PrivilegedRequest local17 = arg0.getDisplayModes();
while (local17.status == 0) {
ThreadUtils.sleep(10L);
}
if (local17.status == 2) {
return new Class114[0];
}
@Pc(39) int[] local39 = (int[]) local17.result;
@Pc(45) Class114[] local45 = new Class114[local39.length >> 2];
for (@Pc(47) int local47 = 0; local47 < local45.length; local47++) {
@Pc(59) Class114 local59 = new Class114();
local45[local47] = local59;
local59.anInt4248 = local39[local47 << 2];
local59.anInt4250 = local39[(local47 << 2) + 1];
local59.anInt4251 = local39[(local47 << 2) + 2];
local59.anInt4249 = local39[(local47 << 2) + 3];
}
return local45;
}
@OriginalMember(owner = "client!pm", name = "a", descriptor = "(ZIZIZII)V")
public static void setWindowMode(@OriginalArg(0) boolean arg0, @OriginalArg(1) int arg1, @OriginalArg(2) boolean arg2, @OriginalArg(3) int arg3, @OriginalArg(5) int arg4, @OriginalArg(6) int arg5) {
if (arg2) {
GlRenderer.quit();
}
if (GameShell.fullScreenFrame != null && (arg1 != 3 || arg4 != Preferences.fullScreenWidth || arg5 != Preferences.fullScreenHeight)) {
DisplayMode.exitFullScreen(GameShell.fullScreenFrame, GameShell.signLink);
GameShell.fullScreenFrame = null;
}
if (arg1 == 3 && GameShell.fullScreenFrame == null) {
GameShell.fullScreenFrame = Static169.method3176(0, arg5, arg4, GameShell.signLink);
if (GameShell.fullScreenFrame != null) {
Preferences.fullScreenHeight = arg5;
Preferences.fullScreenWidth = arg4;
Preferences.write(GameShell.signLink);
}
}
if (arg1 == 3 && GameShell.fullScreenFrame == null) {
setWindowMode(true, Preferences.favoriteWorlds, true, arg3, -1, -1);
return;
}
@Pc(85) Container local85;
if (GameShell.fullScreenFrame != null) {
local85 = GameShell.fullScreenFrame;
} else if (GameShell.frame == null) {
local85 = GameShell.signLink.applet;
} else {
local85 = GameShell.frame;
}
GameShell.frameWidth = local85.getSize().width;
GameShell.frameHeight = local85.getSize().height;
@Pc(109) Insets local109;
if (GameShell.frame == local85) {
local109 = GameShell.frame.getInsets();
GameShell.frameWidth -= local109.right + local109.left;
GameShell.frameHeight -= local109.bottom + local109.top;
}
if (arg1 >= 2) {
GameShell.canvasWidth = GameShell.frameWidth;
GameShell.canvasHeight = GameShell.frameHeight;
GameShell.leftMargin = 0;
GameShell.topMargin = 0;
} else {
GameShell.topMargin = 0;
GameShell.leftMargin = (GameShell.frameWidth - 765) / 2;
GameShell.canvasWidth = 765;
GameShell.canvasHeight = 503;
}
if (arg0) {
Keyboard.stop(GameShell.canvas);
Mouse.stop(GameShell.canvas);
if (client.mouseWheel != null) {
client.mouseWheel.stop(GameShell.canvas);
}
client.instance.addCanvas();
Keyboard.start(GameShell.canvas);
Mouse.start(GameShell.canvas);
if (client.mouseWheel != null) {
client.mouseWheel.start(GameShell.canvas);
}
} else {
if (GlRenderer.enabled) {
GlRenderer.setCanvasSize(GameShell.canvasWidth, GameShell.canvasHeight);
}
GameShell.canvas.setSize(GameShell.canvasWidth, GameShell.canvasHeight);
if (GameShell.frame == local85) {
local109 = GameShell.frame.getInsets();
GameShell.canvas.setLocation(local109.left + GameShell.leftMargin, local109.top + GameShell.topMargin);
} else {
GameShell.canvas.setLocation(GameShell.leftMargin, GameShell.topMargin);
}
}
if (arg1 == 0 && arg3 > 0) {
GlRenderer.createAndDestroyContext(GameShell.canvas);
}
if (arg2 && arg1 > 0) {
GameShell.canvas.setIgnoreRepaint(true);
if (!Static211.aBoolean73) {
SceneGraph.clear();
SoftwareRaster.frameBuffer = null;
SoftwareRaster.frameBuffer = Static131.create(GameShell.canvasHeight, GameShell.canvasWidth, GameShell.canvas);
SoftwareRaster.clear();
if (client.gameState == 5) {
LoadingBar.render(true, Fonts.b12Full);
} else {
Static114.drawTextOnScreen(false, LocalizedText.LOADING);
}
try {
@Pc(269) Graphics local269 = GameShell.canvas.getGraphics();
SoftwareRaster.frameBuffer.draw(local269);
} catch (@Pc(277) Exception local277) {
}
Static139.method2704();
if (arg3 == 0) {
SoftwareRaster.frameBuffer = Static131.create(503, 765, GameShell.canvas);
} else {
SoftwareRaster.frameBuffer = null;
}
@Pc(300) PrivilegedRequest local300 = GameShell.signLink.loadGlNatives(client.instance.getClass());
while (local300.status == 0) {
ThreadUtils.sleep(100L);
}
if (local300.status == 1) {
Static211.aBoolean73 = true;
}
}
if (Static211.aBoolean73) {
GlRenderer.init(GameShell.canvas, Preferences.antiAliasingMode * 2);
}
}
if (!GlRenderer.enabled && arg1 > 0) {
setWindowMode(true, 0, true, arg3, -1, -1);
return;
}
if (arg1 > 0 && arg3 == 0) {
GameShell.thread.setPriority(5);
SoftwareRaster.frameBuffer = null;
SoftwareModel.method4580();
((Js5GlTextureProvider) Rasteriser.textureProvider).method3248(200);
if (Preferences.highDetailLighting) {
Rasteriser.setBrightness(0.7F);
}
Static114.method4637();
} else if (arg1 == 0 && arg3 > 0) {
GameShell.thread.setPriority(1);
SoftwareRaster.frameBuffer = Static131.create(503, 765, GameShell.canvas);
SoftwareModel.method4583();
Static76.method1643();
((Js5GlTextureProvider) Rasteriser.textureProvider).method3248(20);
if (Preferences.highDetailLighting) {
if (Preferences.brightness == 1) {
Rasteriser.setBrightness(0.9F);
}
if (Preferences.brightness == 2) {
Rasteriser.setBrightness(0.8F);
}
if (Preferences.brightness == 3) {
Rasteriser.setBrightness(0.7F);
}
if (Preferences.brightness == 4) {
Rasteriser.setBrightness(0.6F);
}
}
GlTile.method1939();
Static114.method4637();
}
Static87.aBoolean130 = !SceneGraph.allLevelsAreVisible();
if (arg2) {
client.method2721();
}
if (arg1 >= 2) {
Static124.aBoolean156 = true;
} else {
Static124.aBoolean156 = false;
}
if (InterfaceList.topLevelInterface != -1) {
Static210.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;
}
GameShell.fullRedraw = true;
}
} }

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

@ -17,9 +17,9 @@ public final class Static198 {
return; return;
} }
@Pc(38) int local38 = SceneGraph.getTileHeight(Player.level, arg5, arg2) - arg3; @Pc(38) int local38 = SceneGraph.getTileHeight(Player.level, arg5, arg2) - arg3;
@Pc(42) int local42 = arg2 - Static134.renderZ; @Pc(42) int local42 = arg2 - Camera.renderZ;
@Pc(46) int local46 = local38 - Static5.anInt40; @Pc(46) int local46 = local38 - Static5.anInt40;
@Pc(50) int local50 = arg5 - Static138.renderX; @Pc(50) int local50 = arg5 - Camera.renderX;
@Pc(54) int local54 = MathUtils.sin[Camera.cameraPitch]; @Pc(54) int local54 = MathUtils.sin[Camera.cameraPitch];
@Pc(58) int local58 = MathUtils.cos[Camera.cameraPitch]; @Pc(58) int local58 = MathUtils.cos[Camera.cameraPitch];
@Pc(62) int local62 = MathUtils.sin[Camera.cameraYaw]; @Pc(62) int local62 = MathUtils.sin[Camera.cameraYaw];

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

@ -1,16 +0,0 @@
package rt4;
import org.openrs2.deob.annotation.OriginalMember;
public final class Static20 {
@OriginalMember(owner = "client!bj", name = "r", descriptor = "I")
public static int anInt659 = 2;
@OriginalMember(owner = "client!bj", name = "s", descriptor = "I")
public static int anInt660 = -1;
@OriginalMember(owner = "client!bj", name = "V", descriptor = "I")
public static final int anInt671 = 3353893;
}

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

@ -1,8 +1,6 @@
package rt4; package rt4;
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 Static201 { public final class Static201 {
@ -15,15 +13,4 @@ public final class Static201 {
@OriginalMember(owner = "client!qf", name = "X", descriptor = "Lclient!be;") @OriginalMember(owner = "client!qf", name = "X", descriptor = "Lclient!be;")
public static Component aClass13_13 = null; public static Component aClass13_13 = null;
@OriginalMember(owner = "client!qf", name = "a", descriptor = "(BII)Lclient!be;")
public static Component method1418(@OriginalArg(1) int arg0, @OriginalArg(2) int arg1) {
@Pc(7) Component local7 = InterfaceList.getComponent(arg0);
if (arg1 == -1) {
return local7;
} else if (local7 == null || local7.createdComponents == null || local7.createdComponents.length <= arg1) {
return null;
} else {
return local7.createdComponents[arg1];
}
}
} }

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

@ -9,20 +9,6 @@ public final class Static202 {
@OriginalMember(owner = "client!qg", name = "Y", descriptor = "[I") @OriginalMember(owner = "client!qg", name = "Y", descriptor = "[I")
public static final int[] cameraFrequency = new int[5]; public static final int[] cameraFrequency = new int[5];
@OriginalMember(owner = "client!qg", name = "a", descriptor = "(IZI)V")
public static void setVarbitClient(@OriginalArg(0) int arg0, @OriginalArg(2) int arg1) {
@Pc(7) VarbitType local7 = VarbitTypeList.get(arg0);
@Pc(10) int local10 = local7.endBit;
@Pc(16) int local16 = local7.startBit;
@Pc(19) int local19 = local7.baseVar;
@Pc(25) int local25 = Song_Class3_Sub9.anIntArray135[local10 - local16];
if (arg1 < 0 || arg1 > local25) {
arg1 = 0;
}
local25 <<= local16;
Static148.method2766(local19, local25 & arg1 << local16 | VarpDomain.activeVarps[local19] & ~local25);
}
@OriginalMember(owner = "client!qg", name = "a", descriptor = "([Lclient!na;[SI)V") @OriginalMember(owner = "client!qg", name = "a", descriptor = "([Lclient!na;[SI)V")
public static void method3656(@OriginalArg(0) JagString[] arg0, @OriginalArg(1) short[] arg1) { public static void method3656(@OriginalArg(0) JagString[] arg0, @OriginalArg(1) short[] arg1) {
Static54.method1307(arg1, arg0.length - 1, arg0, 0); Static54.method1307(arg1, arg0.length - 1, arg0, 0);

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

@ -26,7 +26,7 @@ public final class Static203 {
GameShell.frameHeight -= local35.bottom + local35.top; GameShell.frameHeight -= local35.bottom + local35.top;
GameShell.frameWidth -= local35.right + local35.left; GameShell.frameWidth -= local35.right + local35.left;
} }
if (Static144.getWindowMode() >= 2) { if (DisplayMode.getWindowMode() >= 2) {
GameShell.canvasWidth = GameShell.frameWidth; GameShell.canvasWidth = GameShell.frameWidth;
GameShell.leftMargin = 0; GameShell.leftMargin = 0;
GameShell.topMargin = 0; GameShell.topMargin = 0;

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

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

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

@ -4,9 +4,6 @@ import org.openrs2.deob.annotation.OriginalMember;
public final class Static215 { public final class Static215 {
@OriginalMember(owner = "client!rh", name = "a", descriptor = "[I")
public static int[] intLocals;
@OriginalMember(owner = "client!rh", name = "d", descriptor = "I") @OriginalMember(owner = "client!rh", name = "d", descriptor = "I")
public static int anInt4866; public static int anInt4866;

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

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

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

@ -1,20 +1,10 @@
package rt4; package rt4;
import java.awt.Font;
import org.openrs2.deob.annotation.OriginalArg; import org.openrs2.deob.annotation.OriginalArg;
import org.openrs2.deob.annotation.OriginalMember; import org.openrs2.deob.annotation.OriginalMember;
public final class Static222 { public final class Static222 {
@OriginalMember(owner = "client!sa", name = "R", descriptor = "Ljava/awt/Font;")
public static Font aFont1;
@OriginalMember(owner = "client!sa", name = "Q", descriptor = "[I")
public static final int[] cameraJitter = new int[5];
@OriginalMember(owner = "client!sa", name = "W", descriptor = "Z")
public static boolean instantScreenFade = true;
@OriginalMember(owner = "client!sa", name = "a", descriptor = "(IIIBI)V") @OriginalMember(owner = "client!sa", name = "a", descriptor = "(IIIBI)V")
public static void method3826(@OriginalArg(0) int arg0, @OriginalArg(1) int arg1, @OriginalArg(2) int arg2, @OriginalArg(4) int arg3) { public static void method3826(@OriginalArg(0) int arg0, @OriginalArg(1) int arg1, @OriginalArg(2) int arg2, @OriginalArg(4) int arg3) {
if (arg3 <= arg2) { if (arg3 <= arg2) {

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

@ -6,9 +6,6 @@ import org.openrs2.deob.annotation.Pc;
public final class Static223 { public final class Static223 {
@OriginalMember(owner = "client!sc", name = "p", descriptor = "I")
public static int anInt5029 = 0;
@OriginalMember(owner = "client!sc", name = "z", descriptor = "[Z") @OriginalMember(owner = "client!sc", name = "z", descriptor = "[Z")
public static final boolean[] aBooleanArray116 = new boolean[100]; public static final boolean[] aBooleanArray116 = new boolean[100];

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

@ -6,9 +6,6 @@ import org.openrs2.deob.annotation.Pc;
public final class Static226 { public final class Static226 {
@OriginalMember(owner = "client!sf", name = "c", descriptor = "I")
public static int anInt5080;
@OriginalMember(owner = "client!sf", name = "j", descriptor = "I") @OriginalMember(owner = "client!sf", name = "j", descriptor = "I")
public static int anInt5085; public static int anInt5085;
@ -74,11 +71,11 @@ public final class Static226 {
} }
if (anInt3953 == 1) { if (anInt3953 == 1) {
if (Static155.anInt3751 == Static277.anInt5850 && Static280.anInt5895 == Static60.anInt1892) { if (Static155.anInt3751 == Static277.anInt5850 && Static280.anInt5895 == Static60.anInt1892) {
Static13.anInt436 = MiniMenu.size * 15 + (Static261.aBoolean298 ? 26 : 22); Static13.anInt436 = MiniMenu.size * 15 + (Static40.aBoolean298 ? 26 : 22);
anInt3953 = 0; anInt3953 = 0;
Static229.anInt5138 = local43; Static229.anInt5138 = local43;
Static183.anInt4271 = local27; Static183.anInt4271 = local27;
Static60.aBoolean108 = true; Static40.aBoolean108 = true;
Static24.anInt761 = local16; Static24.anInt761 = local16;
} }
} else if (Static155.anInt3751 == Mouse.clickX && Static60.anInt1892 == Mouse.clickY) { } else if (Static155.anInt3751 == Mouse.clickX && Static60.anInt1892 == Mouse.clickY) {
@ -86,8 +83,8 @@ public final class Static226 {
anInt3953 = 0; anInt3953 = 0;
Static24.anInt761 = local16; Static24.anInt761 = local16;
Static229.anInt5138 = local43; Static229.anInt5138 = local43;
Static13.anInt436 = (Static261.aBoolean298 ? 26 : 22) + MiniMenu.size * 15; Static13.anInt436 = (Static40.aBoolean298 ? 26 : 22) + MiniMenu.size * 15;
Static60.aBoolean108 = true; Static40.aBoolean108 = true;
} else { } else {
Static280.anInt5895 = Mouse.clickY; Static280.anInt5895 = Mouse.clickY;
Static277.anInt5850 = Mouse.clickX; Static277.anInt5850 = Mouse.clickX;

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

@ -13,10 +13,10 @@ public final class Static229 {
@OriginalMember(owner = "client!si", name = "a", descriptor = "(IZ)V") @OriginalMember(owner = "client!si", name = "a", descriptor = "(IZ)V")
public static void method3935(@OriginalArg(0) int arg0) { public static void method3935(@OriginalArg(0) int arg0) {
Static161.method3060(Static161.anInt3923, ((float) arg0 * 0.1F + 0.7F) * 1.1523438F, 0.69921875F, 0.69921875F); FogManager.method3060(FogManager.anInt3923, ((float) arg0 * 0.1F + 0.7F) * 1.1523438F, 0.69921875F, 0.69921875F);
Static161.method3063(-50.0F, -60.0F, -50.0F); FogManager.method3063(-50.0F, -60.0F, -50.0F);
Static161.method3062(Static161.anInt3922, 0); FogManager.method3062(FogManager.anInt3922, 0);
Static161.method3058(); FogManager.method3058();
} }
} }

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

@ -6,9 +6,6 @@ import org.openrs2.deob.annotation.Pc;
public final class Static23 { public final class Static23 {
@OriginalMember(owner = "client!bm", name = "a", descriptor = "F")
public static float aFloat5;
@OriginalMember(owner = "client!bm", name = "a", descriptor = "(IBIIII)V") @OriginalMember(owner = "client!bm", name = "a", descriptor = "(IBIIII)V")
public static void method645(@OriginalArg(0) int arg0, @OriginalArg(2) int arg1, @OriginalArg(3) int arg2, @OriginalArg(4) int arg3, @OriginalArg(5) int arg4) { public static void method645(@OriginalArg(0) int arg0, @OriginalArg(2) int arg1, @OriginalArg(3) int arg2, @OriginalArg(4) int arg3, @OriginalArg(5) int arg4) {
@Pc(3) int local3; @Pc(3) int local3;

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

@ -6,9 +6,6 @@ import org.openrs2.deob.annotation.Pc;
public final class Static232 { public final class Static232 {
@OriginalMember(owner = "client!sm", name = "b", descriptor = "I")
public static int anInt5208;
@OriginalMember(owner = "client!sm", name = "e", descriptor = "[[[B") @OriginalMember(owner = "client!sm", name = "e", descriptor = "[[[B")
public static byte[][][] aByteArrayArrayArray13; public static byte[][][] aByteArrayArrayArray13;

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

@ -21,9 +21,6 @@ public final class Static233 {
@OriginalMember(owner = "client!t", name = "y", descriptor = "I") @OriginalMember(owner = "client!t", name = "y", descriptor = "I")
public static int loadingScreenState = 0; public static int loadingScreenState = 0;
@OriginalMember(owner = "client!t", name = "C", descriptor = "Lclient!na;")
public static final JagString aClass100_994 = JagString.parse(")3");
@OriginalMember(owner = "client!t", name = "a", descriptor = "(IIIZIII)V") @OriginalMember(owner = "client!t", name = "a", descriptor = "(IIIZIII)V")
public static void method4000(@OriginalArg(0) int arg0, @OriginalArg(1) int arg1, @OriginalArg(2) int arg2, @OriginalArg(4) int arg3, @OriginalArg(5) int arg4, @OriginalArg(6) int arg5) { public static void method4000(@OriginalArg(0) int arg0, @OriginalArg(1) int arg1, @OriginalArg(2) int arg2, @OriginalArg(4) int arg3, @OriginalArg(5) int arg4, @OriginalArg(6) int arg5) {
@Pc(3) int local3 = 0; @Pc(3) int local3 = 0;

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

@ -50,12 +50,12 @@ public final class Static236 {
aBoolean84 = true; aBoolean84 = true;
} }
} }
if (Static58.wheelRotation == 0) { if (MouseWheel.wheelRotation == 0) {
return; return;
} }
local139 = arg2.width; local139 = arg2.width;
if (arg4 - local139 <= arg3 && arg5 <= arg0 && arg3 < arg4 + 16 && arg1 + arg5 >= arg0) { if (arg4 - local139 <= arg3 && arg5 <= arg0 && arg3 < arg4 + 16 && arg1 + arg5 >= arg0) {
arg2.scrollY += Static58.wheelRotation * 45; arg2.scrollY += MouseWheel.wheelRotation * 45;
InterfaceList.redraw(arg2); InterfaceList.redraw(arg2);
} }
} }

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

@ -9,9 +9,6 @@ public final class Static24 {
@OriginalMember(owner = "client!bn", name = "O", descriptor = "I") @OriginalMember(owner = "client!bn", name = "O", descriptor = "I")
public static int anInt761; public static int anInt761;
@OriginalMember(owner = "client!bn", name = "eb", descriptor = "I")
public static int anInt773 = 0;
@OriginalMember(owner = "client!bn", name = "a", descriptor = "(III)I") @OriginalMember(owner = "client!bn", name = "a", descriptor = "(III)I")
public static int method667(@OriginalArg(0) int arg0, @OriginalArg(2) int arg1) { public static int method667(@OriginalArg(0) int arg0, @OriginalArg(2) int arg1) {
@Pc(8) int local8 = 0; @Pc(8) int local8 = 0;

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

@ -18,23 +18,6 @@ public final class Static241 {
@OriginalMember(owner = "client!th", name = "n", descriptor = "Z") @OriginalMember(owner = "client!th", name = "n", descriptor = "Z")
public static boolean aBoolean302 = false; public static boolean aBoolean302 = false;
@OriginalMember(owner = "client!th", name = "a", descriptor = "(ZIIII)V")
public static void setWindowMode(@OriginalArg(0) boolean arg0, @OriginalArg(1) int arg1, @OriginalArg(3) int arg2, @OriginalArg(4) int arg3) {
Static97.aLong89 = 0L;
@Pc(4) int mode = Static144.getWindowMode();
if (arg1 == 3 || mode == 3) {
arg0 = true;
}
@Pc(44) boolean useHd = false;
if (mode > 0 != arg1 > 0) {
useHd = true;
}
if (arg0 && arg1 > 0) {
useHd = true;
}
Static197.setWindowMode(arg0, arg1, useHd, mode, arg2, arg3);
}
@OriginalMember(owner = "client!th", name = "a", descriptor = "(IIBIIII)I") @OriginalMember(owner = "client!th", name = "a", descriptor = "(IIBIIII)I")
public static int method4541(@OriginalArg(0) int arg0, @OriginalArg(1) int arg1, @OriginalArg(3) int arg2, @OriginalArg(4) int arg3, @OriginalArg(5) int arg4, @OriginalArg(6) int arg5) { public static int method4541(@OriginalArg(0) int arg0, @OriginalArg(1) int arg1, @OriginalArg(3) int arg2, @OriginalArg(4) int arg3, @OriginalArg(5) int arg4, @OriginalArg(6) int arg5) {
if ((arg4 & 0x1) == 1) { if ((arg4 & 0x1) == 1) {

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

@ -109,8 +109,8 @@ public final class Static242 {
@Pc(19) int local19 = arg4 << 7; @Pc(19) int local19 = arg4 << 7;
@Pc(29) int local29 = arg6 + arg7 + arg8 + arg9 >> 2; @Pc(29) int local29 = arg6 + arg7 + arg8 + arg9 >> 2;
@Pc(33) int local33 = arg5 << 7; @Pc(33) int local33 = arg5 << 7;
@Pc(43) int local43 = local19 - (local29 * Static161.anInt3920 >> 8) >> 3; @Pc(43) int local43 = local19 - (local29 * FogManager.anInt3920 >> 8) >> 3;
@Pc(53) int local53 = local33 - (local29 * Static161.anInt3921 >> 8) >> 3; @Pc(53) int local53 = local33 - (local29 * FogManager.anInt3921 >> 8) >> 3;
if (arg0 != 0 && arg0 != 1 && (arg2 || arg3)) { if (arg0 != 0 && arg0 != 1 && (arg2 || arg3)) {
method4210(Sprites.floorShadows[arg0], shadowMapImage, local43 + 1, local53 + 1, arg1, arg2); method4210(Sprites.floorShadows[arg0], shadowMapImage, local43 + 1, local53 + 1, arg1, arg2);
} else { } else {
@ -335,8 +335,8 @@ public final class Static242 {
@OriginalMember(owner = "client!tj", name = "a", descriptor = "(Lclient!ek;III)V") @OriginalMember(owner = "client!tj", name = "a", descriptor = "(Lclient!ek;III)V")
public static void method4207(@OriginalArg(0) SoftwareIndexedSprite arg0, @OriginalArg(1) int arg1, @OriginalArg(2) int arg2, @OriginalArg(3) int arg3) { public static void method4207(@OriginalArg(0) SoftwareIndexedSprite arg0, @OriginalArg(1) int arg1, @OriginalArg(2) int arg2, @OriginalArg(3) int arg3) {
if (arg0 != null) { if (arg0 != null) {
@Pc(12) int local12 = arg1 - (arg2 * Static161.anInt3920 >> 8) >> 3; @Pc(12) int local12 = arg1 - (arg2 * FogManager.anInt3920 >> 8) >> 3;
@Pc(22) int local22 = arg3 - (arg2 * Static161.anInt3921 >> 8) >> 3; @Pc(22) int local22 = arg3 - (arg2 * FogManager.anInt3921 >> 8) >> 3;
method4202(arg0, shadowMapImage, local12 + 1, local22 + 1); method4202(arg0, shadowMapImage, local12 + 1, local22 + 1);
} }
} }
@ -368,8 +368,8 @@ public final class Static242 {
if (arg0 == null) { if (arg0 == null) {
return false; return false;
} else { } else {
@Pc(13) int local13 = arg1 - (arg2 * Static161.anInt3920 >> 8) >> 3; @Pc(13) int local13 = arg1 - (arg2 * FogManager.anInt3920 >> 8) >> 3;
@Pc(23) int local23 = arg3 - (arg2 * Static161.anInt3921 >> 8) >> 3; @Pc(23) int local23 = arg3 - (arg2 * FogManager.anInt3921 >> 8) >> 3;
return method4200(arg0, shadowMapImage, local13 + 1, local23 + 1); return method4200(arg0, shadowMapImage, local13 + 1, local23 + 1);
} }
} }
@ -412,8 +412,8 @@ public final class Static242 {
@OriginalMember(owner = "client!tj", name = "c", descriptor = "(Lclient!ek;III)V") @OriginalMember(owner = "client!tj", name = "c", descriptor = "(Lclient!ek;III)V")
public static void method4211(@OriginalArg(0) SoftwareIndexedSprite arg0, @OriginalArg(1) int arg1, @OriginalArg(2) int arg2, @OriginalArg(3) int arg3) { public static void method4211(@OriginalArg(0) SoftwareIndexedSprite arg0, @OriginalArg(1) int arg1, @OriginalArg(2) int arg2, @OriginalArg(3) int arg3) {
if (arg0 != null) { if (arg0 != null) {
@Pc(12) int local12 = arg1 - (arg2 * Static161.anInt3920 >> 8) >> 3; @Pc(12) int local12 = arg1 - (arg2 * FogManager.anInt3920 >> 8) >> 3;
@Pc(22) int local22 = arg3 - (arg2 * Static161.anInt3921 >> 8) >> 3; @Pc(22) int local22 = arg3 - (arg2 * FogManager.anInt3921 >> 8) >> 3;
method4194(arg0, shadowMapImage, local12 + 1, local22 + 1); method4194(arg0, shadowMapImage, local12 + 1, local22 + 1);
} }
} }

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

@ -9,9 +9,6 @@ public final class Static245 {
@OriginalMember(owner = "client!tm", name = "g", descriptor = "I") @OriginalMember(owner = "client!tm", name = "g", descriptor = "I")
public static int anInt5375; public static int anInt5375;
@OriginalMember(owner = "client!tm", name = "i", descriptor = "I")
public static int anInt5377 = 0;
@OriginalMember(owner = "client!tm", name = "a", descriptor = "(III[Lclient!mj;IB[BIIIZ)V") @OriginalMember(owner = "client!tm", name = "a", descriptor = "(III[Lclient!mj;IB[BIIIZ)V")
public static void method4228(@OriginalArg(0) int arg0, @OriginalArg(1) int arg1, @OriginalArg(2) int arg2, @OriginalArg(3) CollisionMap[] arg3, @OriginalArg(4) int arg4, @OriginalArg(6) byte[] arg5, @OriginalArg(7) int arg6, @OriginalArg(8) int arg7, @OriginalArg(9) int arg8, @OriginalArg(10) boolean arg9) { public static void method4228(@OriginalArg(0) int arg0, @OriginalArg(1) int arg1, @OriginalArg(2) int arg2, @OriginalArg(3) CollisionMap[] arg3, @OriginalArg(4) int arg4, @OriginalArg(6) byte[] arg5, @OriginalArg(7) int arg6, @OriginalArg(8) int arg7, @OriginalArg(9) int arg8, @OriginalArg(10) boolean arg9) {
@Pc(17) int local17; @Pc(17) int local17;
@ -134,7 +131,7 @@ public final class Static245 {
if (local472 == null) { if (local472 == null) {
local472 = new Environment(); local472 = new Environment();
} }
Static192.aClass92ArrayArray1[arg1 >> 3][arg4 >> 3] = local472; Static103.aClass92ArrayArray1[arg1 >> 3][arg4 >> 3] = local472;
break label207; break label207;
} while (local497 <= 0); } while (local497 <= 0);
for (local232 = 0; local232 < local497; local232++) { for (local232 = 0; local232 < local497; local232++) {

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

@ -8,9 +8,6 @@ public final class Static246 {
@OriginalMember(owner = "client!u", name = "i", descriptor = "I") @OriginalMember(owner = "client!u", name = "i", descriptor = "I")
public static int anInt5393; public static int anInt5393;
@OriginalMember(owner = "client!u", name = "a", descriptor = "I")
public static int anInt5388 = 0;
@OriginalMember(owner = "client!u", name = "a", descriptor = "(Z)V") @OriginalMember(owner = "client!u", name = "a", descriptor = "(Z)V")
public static void method4239() { public static void method4239() {
for (@Pc(9) SpotAnimNode local9 = (SpotAnimNode) Static99.aClass69_64.head(); local9 != null; local9 = (SpotAnimNode) Static99.aClass69_64.next()) { for (@Pc(9) SpotAnimNode local9 = (SpotAnimNode) Static99.aClass69_64.head(); local9 != null; local9 = (SpotAnimNode) Static99.aClass69_64.next()) {

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

@ -6,6 +6,9 @@ import org.openrs2.deob.annotation.Pc;
public final class Static247 { public final class Static247 {
@OriginalMember(owner = "client!bl", name = "X", descriptor = "I")
public static int anInt730 = -1;
@OriginalMember(owner = "client!ub", name = "a", descriptor = "(IIIIIII)V") @OriginalMember(owner = "client!ub", name = "a", descriptor = "(IIIIIII)V")
public static void method4244(@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 method4244(@OriginalArg(0) int arg0, @OriginalArg(1) int arg1, @OriginalArg(2) int arg2, @OriginalArg(3) int arg3, @OriginalArg(4) int arg4, @OriginalArg(5) int arg5) {
if (TextureOp29.anInt4164 <= arg1 && TextureOp29.anInt5063 >= arg3 && TextureOp29.anInt5773 <= arg2 && arg4 <= TextureOp29.anInt2869) { if (TextureOp29.anInt4164 <= arg1 && TextureOp29.anInt5063 >= arg3 && TextureOp29.anInt5773 <= arg2 && arg4 <= TextureOp29.anInt2869) {
@ -73,11 +76,11 @@ public final class Static247 {
if (var10 != Static152.anInt3604) { if (var10 != Static152.anInt3604) {
Static152.anInt3604 = var10; Static152.anInt3604 = var10;
WaterMaterialRenderer.method619(var10); WaterMaterialRenderer.method619(var10);
Static161.method3066(WaterMaterialRenderer.method2422()); FogManager.method3066(WaterMaterialRenderer.method2422());
} }
local65 = var9 >>> 24 << 3; local65 = var9 >>> 24 << 3;
if (local65 != Static22.anInt730) { if (local65 != anInt730) {
Static22.anInt730 = local65; anInt730 = local65;
Static147.method2761(local65); Static147.method2761(local65);
} }
local115 = SceneGraph.surfaceTileHeights[0][local18][local21] + SceneGraph.surfaceTileHeights[0][local18 + 1][local21] + SceneGraph.surfaceTileHeights[0][local18][local21 + 1] + SceneGraph.surfaceTileHeights[0][local18 + 1][local21 + 1] >> 2; local115 = SceneGraph.surfaceTileHeights[0][local18][local21] + SceneGraph.surfaceTileHeights[0][local18 + 1][local21] + SceneGraph.surfaceTileHeights[0][local18][local21 + 1] + SceneGraph.surfaceTileHeights[0][local18 + 1][local21 + 1] >> 2;
@ -656,7 +659,7 @@ public final class Static247 {
@OriginalMember(owner = "client!ub", name = "b", descriptor = "(IIIIIII)V") @OriginalMember(owner = "client!ub", name = "b", descriptor = "(IIIIIII)V")
public static void method4246(@OriginalArg(0) int arg0, @OriginalArg(1) int arg1, @OriginalArg(2) int arg2, @OriginalArg(3) int arg3, @OriginalArg(4) int arg4, @OriginalArg(6) int arg5) { public static void method4246(@OriginalArg(0) int arg0, @OriginalArg(1) int arg1, @OriginalArg(2) int arg2, @OriginalArg(3) int arg3, @OriginalArg(4) int arg4, @OriginalArg(6) int arg5) {
@Pc(8) Component local8 = Static201.method1418(arg0, arg1); @Pc(8) Component local8 = InterfaceList.method1418(arg0, arg1);
if (local8 != null && local8.onUse != null) { if (local8 != null && local8.onUse != null) {
@Pc(19) HookRequest local19 = new HookRequest(); @Pc(19) HookRequest local19 = new HookRequest();
local19.source = local8; local19.source = local8;

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

@ -85,14 +85,14 @@ public final class Static248 {
MaterialManager.renderingUnderwater = true; MaterialManager.renderingUnderwater = true;
UnderwaterMaterialRenderer.method4609(); UnderwaterMaterialRenderer.method4609();
Static152.anInt3604 = -1; Static152.anInt3604 = -1;
Static22.anInt730 = -1; Static247.anInt730 = -1;
for (local32 = 0; local32 < Static182.aClass3_Sub14ArrayArray2[0].length; local32++) { for (local32 = 0; local32 < Static182.aClass3_Sub14ArrayArray2[0].length; local32++) {
@Pc(285) GlTile local285 = Static182.aClass3_Sub14ArrayArray2[0][local32]; @Pc(285) GlTile local285 = Static182.aClass3_Sub14ArrayArray2[0][local32];
@Pc(294) float local294 = 251.5F - (local285.blend ? 1.0F : 0.5F); @Pc(294) float local294 = 251.5F - (local285.blend ? 1.0F : 0.5F);
if (local285.underwaterColor != Static152.anInt3604) { if (local285.underwaterColor != Static152.anInt3604) {
Static152.anInt3604 = local285.underwaterColor; Static152.anInt3604 = local285.underwaterColor;
WaterMaterialRenderer.method619(local285.underwaterColor); WaterMaterialRenderer.method619(local285.underwaterColor);
Static161.method3066(WaterMaterialRenderer.method2422()); FogManager.method3066(WaterMaterialRenderer.method2422());
} }
local285.method1944(SceneGraph.tiles, local294, false); local285.method1944(SceneGraph.tiles, local294, false);
} }

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

@ -8,9 +8,6 @@ public final class Static251 {
@OriginalMember(owner = "client!ug", name = "h", descriptor = "I") @OriginalMember(owner = "client!ug", name = "h", descriptor = "I")
public static int anInt5449; public static int anInt5449;
@OriginalMember(owner = "client!ug", name = "p", descriptor = "I")
public static int anInt5457;
@OriginalMember(owner = "client!ug", name = "b", descriptor = "[F") @OriginalMember(owner = "client!ug", name = "b", descriptor = "[F")
public static final float[] aFloatArray28 = new float[4]; public static final float[] aFloatArray28 = new float[4];

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

@ -33,9 +33,9 @@ public final class Static252 {
Static50.anIntArray134[local33] = 0; Static50.anIntArray134[local33] = 0;
} }
if (Camera.cameraType != 1) { if (Camera.cameraType != 1) {
local33 = SceneGraph.getTileHeight(Player.level, Static138.renderX, Static134.renderZ); local33 = SceneGraph.getTileHeight(Player.level, Camera.renderX, Camera.renderZ);
if (local33 - Static5.anInt40 < 800 && (SceneGraph.tileFlags[Player.level][Static138.renderX >> 7][Static134.renderZ >> 7] & 0x4) != 0) { if (local33 - Static5.anInt40 < 800 && (SceneGraph.tileFlags[Player.level][Camera.renderX >> 7][Camera.renderZ >> 7] & 0x4) != 0) {
Static254.method4348(false, Static138.renderX >> 7, Static134.renderZ >> 7, SceneGraph.tiles, 1); Static254.method4348(false, Camera.renderX >> 7, Camera.renderZ >> 7, SceneGraph.tiles, 1);
} }
return; return;
} }
@ -46,14 +46,14 @@ public final class Static252 {
return; return;
} }
@Pc(135) int local135 = PlayerList.self.zFine >> 7; @Pc(135) int local135 = PlayerList.self.zFine >> 7;
local40 = Static134.renderZ >> 7; local40 = Camera.renderZ >> 7;
@Pc(146) int local146; @Pc(146) int local146;
if (local40 < local135) { if (local40 < local135) {
local146 = local135 - local40; local146 = local135 - local40;
} else { } else {
local146 = local40 - local135; local146 = local40 - local135;
} }
local33 = Static138.renderX >> 7; local33 = Camera.renderX >> 7;
@Pc(162) int local162 = PlayerList.self.xFine >> 7; @Pc(162) int local162 = PlayerList.self.xFine >> 7;
@Pc(174) int local174; @Pc(174) int local174;
if (local162 > local33) { if (local162 > local33) {

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

@ -6,11 +6,8 @@ import org.openrs2.deob.annotation.Pc;
public final class Static253 { public final class Static253 {
@OriginalMember(owner = "client!ui", name = "T", descriptor = "F") @OriginalMember(owner = "client!bi", name = "jb", descriptor = "Z")
public static float aFloat36; public static boolean aBoolean43 = true;
@OriginalMember(owner = "client!ui", name = "mb", descriptor = "F")
public static float aFloat37;
@OriginalMember(owner = "client!ui", name = "a", descriptor = "(IIZIII)V") @OriginalMember(owner = "client!ui", name = "a", descriptor = "(IIZIII)V")
public static void method4326(@OriginalArg(1) int arg0, @OriginalArg(2) boolean arg1, @OriginalArg(3) int arg2, @OriginalArg(4) int arg3, @OriginalArg(5) int arg4) { public static void method4326(@OriginalArg(1) int arg0, @OriginalArg(2) boolean arg1, @OriginalArg(3) int arg2, @OriginalArg(4) int arg3, @OriginalArg(5) int arg4) {
@ -28,10 +25,10 @@ public final class Static253 {
Static246.method4239(); Static246.method4239();
if (GlRenderer.enabled) { if (GlRenderer.enabled) {
Static115.method2314(arg3, arg4, arg0, arg2, true); Static115.method2314(arg3, arg4, arg0, arg2, true);
arg2 = Static7.anInt983; arg2 = Static115.anInt983;
arg4 = Static24.anInt773; arg4 = Static115.anInt773;
arg3 = Static166.anInt4055; arg3 = Static115.anInt4055;
arg0 = Static245.anInt5377; arg0 = Static115.anInt5377;
} }
@Pc(59) int local59; @Pc(59) int local59;
@Pc(57) int local57; @Pc(57) int local57;
@ -47,15 +44,15 @@ public final class Static253 {
Static18.method555(Camera.cameraX, arg0, SceneGraph.getTileHeight(Player.level, PlayerList.self.xFine, PlayerList.self.zFine) - 50, 600 - -(local59 * 3), local57, Camera.cameraZ, local59); Static18.method555(Camera.cameraX, arg0, SceneGraph.getTileHeight(Player.level, PlayerList.self.xFine, PlayerList.self.zFine) - 50, 600 - -(local59 * 3), local57, Camera.cameraZ, local59);
} }
local57 = Static5.anInt40; local57 = Static5.anInt40;
local59 = Static138.renderX; local59 = Camera.renderX;
@Pc(121) int local121 = Static134.renderZ; @Pc(121) int local121 = Camera.renderZ;
@Pc(123) int local123 = Camera.cameraPitch; @Pc(123) int local123 = Camera.cameraPitch;
@Pc(125) int local125 = Camera.cameraYaw; @Pc(125) int local125 = Camera.cameraYaw;
@Pc(127) int local127; @Pc(127) int local127;
@Pc(171) int local171; @Pc(171) int local171;
for (local127 = 0; local127 < 5; local127++) { for (local127 = 0; local127 < 5; local127++) {
if (Static176.customCameraActive[local127]) { if (Static176.customCameraActive[local127]) {
local171 = (int) ((double) -Static222.cameraJitter[local127] + (double) (Static222.cameraJitter[local127] * 2 + 1) * Math.random() + Math.sin((double) Static31.anIntArray76[local127] * ((double) Static202.cameraFrequency[local127] / 100.0D)) * (double) Static276.cameraAmplitude[local127]); local171 = (int) ((double) -Camera.cameraJitter[local127] + (double) (Camera.cameraJitter[local127] * 2 + 1) * Math.random() + Math.sin((double) Static31.anIntArray76[local127] * ((double) Static202.cameraFrequency[local127] / 100.0D)) * (double) Static276.cameraAmplitude[local127]);
if (local127 == 3) { if (local127 == 3) {
Camera.cameraYaw = local171 + Camera.cameraYaw & 0x7FF; Camera.cameraYaw = local171 + Camera.cameraYaw & 0x7FF;
} }
@ -69,13 +66,13 @@ public final class Static253 {
} }
} }
if (local127 == 2) { if (local127 == 2) {
Static134.renderZ += local171; Camera.renderZ += local171;
} }
if (local127 == 1) { if (local127 == 1) {
Static5.anInt40 += local171; Static5.anInt40 += local171;
} }
if (local127 == 0) { if (local127 == 0) {
Static138.renderX += local171; Camera.renderX += local171;
} }
} }
} }
@ -88,12 +85,12 @@ public final class Static253 {
local248 = Static146.aFloat15 * 360.0F / 6.2831855F; local248 = Static146.aFloat15 * 360.0F / 6.2831855F;
local253 = Static84.aFloat10 * 360.0F / 6.2831855F; local253 = Static84.aFloat10 * 360.0F / 6.2831855F;
} }
GlRenderer.method4171(arg2, arg4, arg3, arg0, arg3 / 2 + arg2, arg4 - -(arg0 / 2), local248, local253, Static223.anInt5029, Static223.anInt5029); GlRenderer.method4171(arg2, arg4, arg3, arg0, arg3 / 2 + arg2, arg4 - -(arg0 / 2), local248, local253, Static115.anInt5029, Static115.anInt5029);
} else { } else {
SoftwareRaster.setClip(arg2, arg4, arg3 + arg2, arg0 + arg4); SoftwareRaster.setClip(arg2, arg4, arg3 + arg2, arg0 + arg4);
Rasteriser.prepare(); Rasteriser.prepare();
} }
if (Static60.aBoolean108 || Static155.anInt3751 < arg2 || Static155.anInt3751 >= arg3 + arg2 || arg4 > Static60.anInt1892 || arg0 + arg4 <= Static60.anInt1892) { if (Static40.aBoolean108 || Static155.anInt3751 < arg2 || Static155.anInt3751 >= arg3 + arg2 || arg4 > Static60.anInt1892 || arg0 + arg4 <= Static60.anInt1892) {
Static39.aBoolean77 = false; Static39.aBoolean77 = false;
Static2.anInt7 = 0; Static2.anInt7 = 0;
} else { } else {
@ -113,25 +110,25 @@ public final class Static253 {
GlRenderer.setDepthTestEnabled(true); GlRenderer.setDepthTestEnabled(true);
GlRenderer.setFogEnabled(true); GlRenderer.setFogEnabled(true);
if (client.gameState == 10) { if (client.gameState == 10) {
local171 = Static103.method2235(Static178.anInt4247, Static134.renderZ >> 10, Preferences.brightness, Static138.renderX >> 10); local171 = Static103.method2235(Static178.anInt4247, Camera.renderZ >> 10, Preferences.brightness, Camera.renderX >> 10);
} else { } else {
local171 = Static103.method2235(Static178.anInt4247, PlayerList.self.movementQueueZ[0] >> 3, Preferences.brightness, PlayerList.self.movementQueueX[0] >> 3); local171 = Static103.method2235(Static178.anInt4247, PlayerList.self.movementQueueZ[0] >> 3, Preferences.brightness, PlayerList.self.movementQueueX[0] >> 3);
} }
LightingManager.method2394(client.loop, !Preferences.flickeringEffectsOn); LightingManager.method2394(client.loop, !Preferences.flickeringEffectsOn);
GlRenderer.clearColorAndDepthBuffers(local171); GlRenderer.clearColorAndDepthBuffers(local171);
Static143.method2731(Camera.cameraPitch, Static134.renderZ, Static5.anInt40, Static138.renderX, Camera.cameraYaw); Static143.method2731(Camera.cameraPitch, Camera.renderZ, Static5.anInt40, Camera.renderX, Camera.cameraYaw);
GlRenderer.anInt5323 = client.loop; GlRenderer.anInt5323 = client.loop;
Static156.method2954(Static138.renderX, Static5.anInt40, Static134.renderZ, Camera.cameraPitch, Camera.cameraYaw, Static266.aByteArrayArrayArray15, Static79.anIntArray205, Static149.anIntArray338, Static267.anIntArray518, Static50.anIntArray134, Static243.anIntArray476, Player.level + 1, local387, PlayerList.self.xFine >> 7, PlayerList.self.zFine >> 7); Static156.method2954(Camera.renderX, Static5.anInt40, Camera.renderZ, Camera.cameraPitch, Camera.cameraYaw, Static266.aByteArrayArrayArray15, Static79.anIntArray205, Static149.anIntArray338, Static267.anIntArray518, Static50.anIntArray134, Static243.anIntArray476, Player.level + 1, local387, PlayerList.self.xFine >> 7, PlayerList.self.zFine >> 7);
Static263.aBoolean299 = true; Static263.aBoolean299 = true;
LightingManager.method2390(); LightingManager.method2390();
Static143.method2731(0, 0, 0, 0, 0); Static143.method2731(0, 0, 0, 0, 0);
client.audioLoop(); client.audioLoop();
Static223.method3858(); Static223.method3858();
method2726(arg4, arg3, arg2, Static223.anInt5029, arg0, Static223.anInt5029); method2726(arg4, arg3, arg2, Static115.anInt5029, arg0, Static115.anInt5029);
Static233.method4000(arg3, arg2, arg0, Static223.anInt5029, Static223.anInt5029, arg4); Static233.method4000(arg3, arg2, arg0, Static115.anInt5029, Static115.anInt5029, arg4);
} else { } else {
SoftwareRaster.fillRect(arg2, arg4, arg3, arg0, 0); SoftwareRaster.fillRect(arg2, arg4, arg3, arg0, 0);
Static156.method2954(Static138.renderX, Static5.anInt40, Static134.renderZ, Camera.cameraPitch, Camera.cameraYaw, Static266.aByteArrayArrayArray15, Static79.anIntArray205, Static149.anIntArray338, Static267.anIntArray518, Static50.anIntArray134, Static243.anIntArray476, Player.level + 1, local387, PlayerList.self.xFine >> 7, PlayerList.self.zFine >> 7); Static156.method2954(Camera.renderX, Static5.anInt40, Camera.renderZ, Camera.cameraPitch, Camera.cameraYaw, Static266.aByteArrayArrayArray15, Static79.anIntArray205, Static149.anIntArray338, Static267.anIntArray518, Static50.anIntArray134, Static243.anIntArray476, Player.level + 1, local387, PlayerList.self.xFine >> 7, PlayerList.self.zFine >> 7);
client.audioLoop(); client.audioLoop();
Static223.method3858(); Static223.method3858();
method2726(arg4, arg3, arg2, 256, arg0, 256); method2726(arg4, arg3, arg2, 256, arg0, 256);
@ -140,14 +137,14 @@ public final class Static253 {
((Js5GlTextureProvider) Rasteriser.textureProvider).method3239(Static178.anInt4247); ((Js5GlTextureProvider) Rasteriser.textureProvider).method3239(Static178.anInt4247);
Static115.method2310(arg3, arg4, arg0, arg2); Static115.method2310(arg3, arg4, arg0, arg2);
Camera.cameraPitch = local123; Camera.cameraPitch = local123;
Static134.renderZ = local121; Camera.renderZ = local121;
Static5.anInt40 = local57; Static5.anInt40 = local57;
Static138.renderX = local59; Camera.renderX = local59;
Camera.cameraYaw = local125; Camera.cameraYaw = local125;
if (Static19.aBoolean43 && client.js5NetQueue.method2328() == 0) { if (aBoolean43 && client.js5NetQueue.method2328() == 0) {
Static19.aBoolean43 = false; aBoolean43 = false;
} }
if (Static19.aBoolean43) { if (aBoolean43) {
if (GlRenderer.enabled) { if (GlRenderer.enabled) {
GlRaster.method1186(arg2, arg4, arg3, arg0, 0); GlRaster.method1186(arg2, arg4, arg3, arg0, 0);
} else { } else {
@ -155,7 +152,7 @@ public final class Static253 {
} }
Static114.drawTextOnScreen(false, LocalizedText.LOADING); Static114.drawTextOnScreen(false, LocalizedText.LOADING);
} }
if (!arg1 && !Static19.aBoolean43 && !Static60.aBoolean108 && arg2 <= Static155.anInt3751 && arg3 + arg2 > Static155.anInt3751 && arg4 <= Static60.anInt1892 && arg0 + arg4 > Static60.anInt1892) { if (!arg1 && !aBoolean43 && !Static40.aBoolean108 && arg2 <= Static155.anInt3751 && arg3 + arg2 > Static155.anInt3751 && arg4 <= Static60.anInt1892 && arg0 + arg4 > Static60.anInt1892) {
MiniMenu.addEntries(arg4, arg3, arg0, arg2, Static60.anInt1892, Static155.anInt3751); MiniMenu.addEntries(arg4, arg3, arg0, arg2, Static60.anInt1892, Static155.anInt3751);
} }
} }

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

@ -6,15 +6,9 @@ import org.openrs2.deob.annotation.Pc;
public final class Static254 { public final class Static254 {
@OriginalMember(owner = "client!uj", name = "E", descriptor = "I")
public static int anInt5556;
@OriginalMember(owner = "client!uj", name = "H", descriptor = "I") @OriginalMember(owner = "client!uj", name = "H", descriptor = "I")
public static int anInt5559; public static int anInt5559;
@OriginalMember(owner = "client!uj", name = "s", descriptor = "Lclient!na;")
public static final JagString aClass100_1061 = JagString.parse("null");
@OriginalMember(owner = "client!uj", name = "A", descriptor = "[I") @OriginalMember(owner = "client!uj", name = "A", descriptor = "[I")
public static final int[] anIntArray489 = new int[] { 2, 0, 0, 2, 0, 0, 0, 4, 4 }; public static final int[] anIntArray489 = new int[] { 2, 0, 0, 2, 0, 0, 0, 4, 4 };

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

@ -1,13 +0,0 @@
package rt4;
import org.openrs2.deob.annotation.OriginalMember;
public final class Static261 {
@OriginalMember(owner = "client!ve", name = "t", descriptor = "I")
public static int anInt5731;
@OriginalMember(owner = "client!ve", name = "w", descriptor = "Z")
public static boolean aBoolean298 = false;
}

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

@ -6,9 +6,6 @@ import org.openrs2.deob.annotation.Pc;
public final class Static262 { public final class Static262 {
@OriginalMember(owner = "client!vf", name = "c", descriptor = "I")
public static int anInt5752;
@OriginalMember(owner = "client!vf", name = "g", descriptor = "[I") @OriginalMember(owner = "client!vf", name = "g", descriptor = "[I")
public static final int[] anIntArray515 = new int[14]; public static final int[] anIntArray515 = new int[14];

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