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

Merge branch 'master' of https://github.com/Pazaz/RT4-Client

Browse source
This commit is contained in:
Pazaz 2022-05-25 00:51:27 -04:00
commit 1c9e73d540
232 changed files with 6634 additions and 4913 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -1,9 +1,18 @@
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; import org.openrs2.deob.annotation.Pc;
public class Camera { public class Camera {
@OriginalMember(owner = "client!id", name = "d", descriptor = "[[[I")
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!wh", name = "m", descriptor = "[I")
public static final int[] cameraAmplitude = new int[5];
@OriginalMember(owner = "client!qg", name = "Y", descriptor = "[I")
public static final int[] cameraFrequency = 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;
@ -17,6 +26,44 @@ public class Camera {
public static int cameraZ; public static int cameraZ;
@OriginalMember(owner = "client!gg", name = "bb", descriptor = "I") @OriginalMember(owner = "client!gg", name = "bb", descriptor = "I")
public static int cameraX; public static int cameraX;
@OriginalMember(owner = "client!tg", name = "b", descriptor = "I")
public static int cameraPitch;
@OriginalMember(owner = "client!ol", name = "ib", descriptor = "I")
public static int cameraYaw;
@OriginalMember(owner = "client!sg", name = "o", descriptor = "I")
public static int cameraType;
@OriginalMember(owner = "client!g", name = "d", descriptor = "I")
public static int anInt2119 = 0;
@OriginalMember(owner = "client!eb", name = "t", descriptor = "I")
public static int anInt1694 = -1;
@OriginalMember(owner = "client!j", name = "K", descriptor = "I")
public static int anInt5843 = 0;
@OriginalMember(owner = "client!sh", name = "c", descriptor = "I")
public static int anInt5101 = 0;
@OriginalMember(owner = "client!t", name = "z", descriptor = "I")
public static int anInt5224 = 0;
@OriginalMember(owner = "client!k", name = "i", descriptor = "I")
public static int anInt3125 = 0;
@OriginalMember(owner = "client!me", name = "k", descriptor = "I")
public static int anInt3718 = -1;
@OriginalMember(owner = "client!lc", name = "n", descriptor = "I")
public static int originZ;
@OriginalMember(owner = "client!se", name = "a", descriptor = "I")
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;
@OriginalMember(owner = "client!uc", name = "f", descriptor = "I")
public static int anInt4232;
@OriginalMember(owner = "client!ug", name = "h", descriptor = "I")
public static int anInt5449;
@OriginalMember(owner = "client!vj", name = "d", descriptor = "I")
public static int anInt5765;
@OriginalMember(owner = "client!tm", name = "g", descriptor = "I")
public static int anInt5375;
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;
@ -43,7 +90,7 @@ public class Camera {
if (local80 < 3 && (SceneGraph.tileFlags[1][local64][local73] & 0x2) == 2) { if (local80 < 3 && (SceneGraph.tileFlags[1][local64][local73] & 0x2) == 2) {
local80++; local80++;
} }
@Pc(117) int local117 = (Static232.aByteArrayArrayArray13[local80][local64][local73] & 0xFF) * 8 + local43 - SceneGraph.tileHeights[local80][local64][local73]; @Pc(117) int local117 = (SceneGraph.aByteArrayArrayArray13[local80][local64][local73] & 0xFF) * 8 + local43 - SceneGraph.tileHeights[local80][local64][local73];
if (local117 > local45) { if (local117 > local45) {
local45 = local117; local45 = local117;
} }
@ -66,18 +113,18 @@ public class Camera {
@OriginalMember(owner = "client!jl", name = "c", descriptor = "(I)V") @OriginalMember(owner = "client!jl", name = "c", descriptor = "(I)V")
public static void updateLockedCamera() { public static void updateLockedCamera() {
@Pc(9) int local9 = Static248.anInt4232 * 128 + 64; @Pc(9) int local9 = anInt4232 * 128 + 64;
@Pc(15) int local15 = Static245.anInt5375 * 128 + 64; @Pc(15) int local15 = 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 = anInt5375 * 128 + 64;
Static134.renderZ = Static248.anInt4232 * 128 + 64; renderZ = 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) {
@ -86,16 +133,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) {
@ -104,19 +151,19 @@ 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;
} }
} }
} }
local9 = Static265.anInt5765 * 128 + 64; local9 = anInt5765 * 128 + 64;
local15 = Static251.anInt5449 * 128 + 64; local15 = 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) {
@ -126,19 +173,19 @@ public class Camera {
local268 = 383; local268 = 383;
} }
@Pc(292) int local292 = (int) (-325.949D * Math.atan2((double) local246, (double) local241)) & 0x7FF; @Pc(292) int local292 = (int) (-325.949D * Math.atan2((double) local246, (double) local241)) & 0x7FF;
if (Static240.cameraPitch < local268) { if (cameraPitch < local268) {
Static240.cameraPitch += Static133.anInt5230 + Static233.anInt5217 * (local268 - Static240.cameraPitch) / 1000; cameraPitch += Static133.anInt5230 + Static233.anInt5217 * (local268 - cameraPitch) / 1000;
if (Static240.cameraPitch > local268) { if (cameraPitch > local268) {
Static240.cameraPitch = local268; cameraPitch = local268;
} }
} }
if (Static240.cameraPitch > local268) { if (cameraPitch > local268) {
Static240.cameraPitch -= (Static240.cameraPitch - local268) * Static233.anInt5217 / 1000 + Static133.anInt5230; cameraPitch -= (cameraPitch - local268) * Static233.anInt5217 / 1000 + Static133.anInt5230;
if (Static240.cameraPitch < local268) { if (cameraPitch < local268) {
Static240.cameraPitch = local268; cameraPitch = local268;
} }
} }
@Pc(350) int local350 = local292 - Static184.cameraYaw; @Pc(350) int local350 = local292 - cameraYaw;
if (local350 > 1024) { if (local350 > 1024) {
local350 -= 2048; local350 -= 2048;
} }
@ -146,14 +193,14 @@ public class Camera {
local350 += 2048; local350 += 2048;
} }
if (local350 > 0) { if (local350 > 0) {
Static184.cameraYaw += local350 * Static233.anInt5217 / 1000 + Static133.anInt5230; cameraYaw += local350 * Static233.anInt5217 / 1000 + Static133.anInt5230;
Static184.cameraYaw &= 0x7FF; cameraYaw &= 0x7FF;
} }
if (local350 < 0) { if (local350 < 0) {
Static184.cameraYaw -= Static233.anInt5217 * -local350 / 1000 + Static133.anInt5230; cameraYaw -= Static233.anInt5217 * -local350 / 1000 + Static133.anInt5230;
Static184.cameraYaw &= 0x7FF; cameraYaw &= 0x7FF;
} }
@Pc(404) int local404 = local292 - Static184.cameraYaw; @Pc(404) int local404 = local292 - cameraYaw;
if (local404 > 1024) { if (local404 > 1024) {
local404 -= 2048; local404 -= 2048;
} }
@ -161,32 +208,32 @@ public class Camera {
local404 += 2048; local404 += 2048;
} }
if (local404 < 0 && local350 > 0 || local404 > 0 && local350 < 0) { if (local404 < 0 && local350 > 0 || local404 > 0 && local350 < 0) {
Static184.cameraYaw = local292; cameraYaw = local292;
} }
} }
@OriginalMember(owner = "client!da", name = "d", descriptor = "(I)V") @OriginalMember(owner = "client!da", name = "d", descriptor = "(I)V")
public static void updateLoginScreenCamera() { public static void updateLoginScreenCamera() {
if (Static155.anInt3718 == -1 || Static52.anInt1694 == -1) { if (anInt3718 == -1 || anInt1694 == -1) {
return; return;
} }
@Pc(27) int local27 = (Static233.anInt5224 * (Static114.anInt5843 - Static228.anInt5101) >> 16) + Static228.anInt5101; @Pc(27) int local27 = (anInt5224 * (anInt5843 - anInt5101) >> 16) + anInt5101;
@Pc(30) float[] renderCoordinates = new float[3]; @Pc(30) float[] renderCoordinates = new float[3];
Static233.anInt5224 += local27; anInt5224 += local27;
if (Static233.anInt5224 >= 65535) { if (anInt5224 >= 65535) {
Static233.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) Static233.anInt5224 / 65535.0F; @Pc(66) float local66 = (float) anInt5224 / 65535.0F;
@Pc(70) int local70 = Static127.anInt3125 * 2; @Pc(70) int local70 = anInt3125 * 2;
@Pc(141) int local141; @Pc(141) int local141;
@Pc(131) int local131; @Pc(131) int local131;
@Pc(111) int local111; @Pc(111) int local111;
@ -195,28 +242,28 @@ public class Camera {
@Pc(155) int local155; @Pc(155) int local155;
@Pc(173) int local173; @Pc(173) int local173;
for (@Pc(72) int local72 = 0; local72 < 3; local72++) { for (@Pc(72) int local72 = 0; local72 < 3; local72++) {
local111 = (Static107.anIntArrayArrayArray9[Static155.anInt3718][local70 + 2][local72] + Static107.anIntArrayArrayArray9[Static155.anInt3718][local70 + 2][local72] - Static107.anIntArrayArrayArray9[Static155.anInt3718][local70 + 3][local72]) * 3; local111 = (anIntArrayArrayArray9[anInt3718][local70 + 2][local72] + anIntArrayArrayArray9[anInt3718][local70 + 2][local72] - anIntArrayArrayArray9[anInt3718][local70 + 3][local72]) * 3;
local119 = Static107.anIntArrayArrayArray9[Static155.anInt3718][local70][local72]; local119 = anIntArrayArrayArray9[anInt3718][local70][local72];
local131 = Static107.anIntArrayArrayArray9[Static155.anInt3718][local70 + 1][local72] * 3; local131 = anIntArrayArrayArray9[anInt3718][local70 + 1][local72] * 3;
local141 = Static107.anIntArrayArrayArray9[Static155.anInt3718][local70][local72] * 3; local141 = anIntArrayArrayArray9[anInt3718][local70][local72] * 3;
local146 = local131 - local141; local146 = local131 - local141;
local155 = local111 + local141 - local131 * 2; local155 = local111 + local141 - local131 * 2;
local173 = Static107.anIntArrayArrayArray9[Static155.anInt3718][local70 + 2][local72] + local131 - local119 - local111; local173 = anIntArrayArrayArray9[anInt3718][local70 + 2][local72] + local131 - local119 - local111;
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] - Static225.originX * 128; renderX = (int) renderCoordinates[0] - originX * 128;
Static134.renderZ = (int) renderCoordinates[2] - Static142.originZ * 128; renderZ = (int) renderCoordinates[2] - originZ * 128;
@Pc(226) float[] local226 = new float[3]; @Pc(226) float[] local226 = new float[3];
local141 = Static75.anInt2119 * 2; local141 = anInt2119 * 2;
for (local131 = 0; local131 < 3; local131++) { for (local131 = 0; local131 < 3; local131++) {
local111 = Static107.anIntArrayArrayArray9[Static52.anInt1694][local141][local131] * 3; local111 = anIntArrayArrayArray9[anInt1694][local141][local131] * 3;
local146 = (Static107.anIntArrayArrayArray9[Static52.anInt1694][local141 + 2][local131] + Static107.anIntArrayArrayArray9[Static52.anInt1694][local141 + 2][local131] - Static107.anIntArrayArrayArray9[Static52.anInt1694][local141 + 3][local131]) * 3; local146 = (anIntArrayArrayArray9[anInt1694][local141 + 2][local131] + anIntArrayArrayArray9[anInt1694][local141 + 2][local131] - anIntArrayArrayArray9[anInt1694][local141 + 3][local131]) * 3;
local155 = Static107.anIntArrayArrayArray9[Static52.anInt1694][local141][local131]; local155 = anIntArrayArrayArray9[anInt1694][local141][local131];
local119 = Static107.anIntArrayArrayArray9[Static52.anInt1694][local141 + 1][local131] * 3; local119 = anIntArrayArrayArray9[anInt1694][local141 + 1][local131] * 3;
local173 = local119 - local111; local173 = local119 - local111;
@Pc(313) int local313 = local146 + local111 - local119 * 2; @Pc(313) int local313 = local146 + local111 - local119 * 2;
@Pc(331) int local331 = Static107.anIntArrayArrayArray9[Static52.anInt1694][local141 + 2][local131] + local119 - local146 - local155; @Pc(331) int local331 = anIntArrayArrayArray9[anInt1694][local141 + 2][local131] + local119 - local146 - local155;
local226[local131] = (float) local155 + local66 * (local66 * (local66 * (float) local331 + (float) local313) + (float) local173); local226[local131] = (float) local155 + local66 * (local66 * (local66 * (float) local331 + (float) local313) + (float) local173);
} }
@Pc(363) float local363 = local226[0] - renderCoordinates[0]; @Pc(363) float local363 = local226[0] - renderCoordinates[0];
@ -225,7 +272,92 @@ public class Camera {
@Pc(392) double local392 = Math.sqrt((double) (local371 * local371 + local363 * local363)); @Pc(392) double local392 = Math.sqrt((double) (local371 * local371 + local363 * local363));
Static146.aFloat15 = (float) Math.atan2((double) local382, local392); Static146.aFloat15 = (float) Math.atan2((double) local382, local392);
Static84.aFloat10 = -((float) Math.atan2((double) local363, (double) local371)); Static84.aFloat10 = -((float) Math.atan2((double) local363, (double) local371));
Static240.cameraPitch = (int) ((double) Static146.aFloat15 * 325.949D) & 0x7FF; cameraPitch = (int) ((double) Static146.aFloat15 * 325.949D) & 0x7FF;
Static184.cameraYaw = (int) ((double) Static84.aFloat10 * 325.949D) & 0x7FF; cameraYaw = (int) ((double) Static84.aFloat10 * 325.949D) & 0x7FF;
}
@OriginalMember(owner = "client!vd", name = "a", descriptor = "(IIIIBI)V")
public static void method3849(@OriginalArg(0) int arg0, @OriginalArg(1) int arg1, @OriginalArg(2) int arg2, @OriginalArg(3) int arg3, @OriginalArg(5) int arg4) {
Static133.anInt5230 = arg2;
anInt5765 = arg1;
Static233.anInt5217 = arg4;
anInt5449 = arg3;
Static260.anInt1744 = arg0;
if (Static233.anInt5217 >= 100) {
@Pc(30) int local30 = anInt5449 * 128 + 64;
@Pc(36) int local36 = anInt5765 * 128 + 64;
@Pc(44) int local44 = SceneGraph.getTileHeight(Player.level, local30, local36) - Static260.anInt1744;
@Pc(49) int local49 = local44 - Static5.anInt40;
@Pc(54) int local54 = local30 - renderX;
@Pc(59) int local59 = local36 - renderZ;
@Pc(70) int local70 = (int) Math.sqrt((double) (local59 * local59 + local54 * local54));
cameraPitch = (int) (Math.atan2((double) local49, (double) local70) * 325.949D) & 0x7FF;
cameraYaw = (int) (Math.atan2((double) local54, (double) local59) * -325.949D) & 0x7FF;
if (cameraPitch < 128) {
cameraPitch = 128;
}
if (cameraPitch > 383) {
cameraPitch = 383;
}
}
cameraType = 2;
}
@OriginalMember(owner = "client!lb", name = "a", descriptor = "(ZIIIBII)V")
public static void method2722(@OriginalArg(0) boolean arg0, @OriginalArg(1) int arg1, @OriginalArg(2) int arg2, @OriginalArg(3) int arg3, @OriginalArg(5) int arg4, @OriginalArg(6) int arg5) {
Static113.anInt4612 = arg3;
Static231.anInt5203 = arg2;
anInt5375 = arg5;
Static233.anInt5225 = arg1;
anInt4232 = arg4;
if (arg0 && Static113.anInt4612 >= 100) {
renderX = anInt5375 * 128 + 64;
renderZ = anInt4232 * 128 + 64;
Static5.anInt40 = SceneGraph.getTileHeight(Player.level, renderX, renderZ) - Static231.anInt5203;
}
cameraType = 2;
}
@OriginalMember(owner = "client!cl", name = "e", descriptor = "(I)V")
public static void resetCameraEffects() {
for (@Pc(3) int local3 = 0; local3 < 5; local3++) {
Static176.customCameraActive[local3] = false;
}
Static133.anInt5230 = 0;
Static233.anInt5217 = 0;
anInt3718 = -1;
anInt1694 = -1;
cameraType = 1;
}
@OriginalMember(owner = "client!uf", name = "a", descriptor = "(B)V")
public static void method4273() {
@Pc(14) int playerX = PlayerList.self.xFine + Static132.anInt3291;
@Pc(20) int playerZ = PlayerList.self.zFine + Static206.anInt4774;
if (cameraX - playerX < -500 || cameraX - playerX > 500 || cameraZ - playerZ < -500 || cameraZ - playerZ > 500) {
cameraX = playerX;
cameraZ = playerZ;
}
if (cameraZ != playerZ) {
cameraZ += (playerZ - cameraZ) / 16;
}
if (cameraX != playerX) {
cameraX += (playerX - cameraX) / 16;
}
if (Preferences.aBoolean63) {
for (@Pc(93) int local93 = 0; local93 < InterfaceList.keyQueueSize; local93++) {
@Pc(104) int code = InterfaceList.keyCodes[local93];
if (code == Keyboard.KEY_UP) {
pitchTarget += 47;
} else if (code == Keyboard.KEY_DOWN) {
pitchTarget -= 17;
} else if (code == Keyboard.KEY_LEFT) {
yawTarget -= 65;
} else if (code == Keyboard.KEY_RIGHT) {
yawTarget += 191;
}
}
clampCameraAngle();
}
} }
} }

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;
}

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

@ -7,9 +7,12 @@ import org.openrs2.deob.annotation.Pc;
import java.io.IOException; import java.io.IOException;
public class ClientProt { public class ClientProt {
@OriginalMember(owner = "client!wc", name = "g", descriptor = "I")
public static int anInt5804 = 0;
@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;
} }
@ -23,7 +26,7 @@ public class ClientProt {
} }
@Pc(37) boolean local37 = true; @Pc(37) boolean local37 = true;
if (local8.anInt453 > 0) { if (local8.anInt453 > 0) {
local37 = Static249.method4265(local8); local37 = MiniMenu.method4265(local8);
} }
if (!local37 || !InterfaceList.getServerActiveProperties(local8).method503(arg2 - 1)) { if (!local37 || !InterfaceList.getServerActiveProperties(local8).method503(arg2 - 1)) {
return; return;
@ -102,10 +105,10 @@ public class ClientProt {
Protocol.outboundBuffer.p1(local13 + local13 + 3); Protocol.outboundBuffer.p1(local13 + local13 + 3);
} }
Protocol.outboundBuffer.p1a(Keyboard.pressedKeys[Keyboard.KEY_CTRL] ? 1 : 0); Protocol.outboundBuffer.p1a(Keyboard.pressedKeys[Keyboard.KEY_CTRL] ? 1 : 0);
Protocol.outboundBuffer.p2(Static225.originX + local23); Protocol.outboundBuffer.p2(Camera.originX + local23);
Protocol.outboundBuffer.p2add(Static142.originZ + local27); Protocol.outboundBuffer.p2add(Camera.originZ + local27);
Static84.anInt2255 = PathFinder.queueZ[0]; LoginManager.mapFlagZ = PathFinder.queueZ[0];
Static115.mapFlagX = PathFinder.queueX[0]; LoginManager.mapFlagX = PathFinder.queueX[0];
for (@Pc(126) int local126 = 1; local126 < local13; local126++) { for (@Pc(126) int local126 = 1; local126 < local13; local126++) {
arg0--; arg0--;
Protocol.outboundBuffer.p1a(PathFinder.queueX[arg0] - local23); Protocol.outboundBuffer.p1a(PathFinder.queueX[arg0] - local23);
@ -114,7 +117,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 +131,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++) {
@ -160,74 +163,59 @@ public class ClientProt {
} }
} }
@OriginalMember(owner = "client!gd", name = "a", descriptor = "(JI)V")
public static void method1691(@OriginalArg(0) long name) {
Protocol.outboundBuffer.offset = 0;
Protocol.outboundBuffer.p1(186);
if (GlobalConfig.LOGIN_USE_STRINGS) {
Protocol.outboundBuffer.pjstr(Base37.decode37(name));
} else {
Protocol.outboundBuffer.p8(name);
}
CreateManager.step = 1;
CreateManager.loops = 0;
CreateManager.errors = 0;
CreateManager.reply = -3;
}
@OriginalMember(owner = "client!gd", name = "c", descriptor = "(I)V") @OriginalMember(owner = "client!gd", name = "c", descriptor = "(I)V")
public static void rebuildMap() { public static void rebuildMap() {
ping(false); ping(false);
Static175.mapFilesMissingCount = 0; Static175.mapFilesMissingCount = 0;
@Pc(12) boolean fileExists = true; @Pc(12) boolean fileExists = true;
@Pc(14) int id; @Pc(14) int id;
for (id = 0; id < Static273.mapFilesBuffer.length; id++) { for (id = 0; id < LoginManager.mapFilesBuffer.length; id++) {
if (Static36.mapFileIds[id] != -1 && Static273.mapFilesBuffer[id] == null) { if (LoginManager.mapFileIds[id] != -1 && LoginManager.mapFilesBuffer[id] == null) {
Static273.mapFilesBuffer[id] = client.js5Archive5.getFile(Static36.mapFileIds[id], 0); LoginManager.mapFilesBuffer[id] = client.js5Archive5.getFile(LoginManager.mapFileIds[id], 0);
if (Static273.mapFilesBuffer[id] == null) { if (LoginManager.mapFilesBuffer[id] == null) {
Static175.mapFilesMissingCount++; Static175.mapFilesMissingCount++;
fileExists = false; fileExists = false;
} }
} }
if (Static172.locationsMapFileIds[id] != -1 && Static156.locationMapFilesBuffer[id] == null) { if (LoginManager.locationsMapFileIds[id] != -1 && LoginManager.locationMapFilesBuffer[id] == null) {
Static156.locationMapFilesBuffer[id] = client.js5Archive5.getFileXTEA(Static172.locationsMapFileIds[id], Static72.regionsXteaKeys[id], 0); LoginManager.locationMapFilesBuffer[id] = client.js5Archive5.getFileXTEA(LoginManager.locationsMapFileIds[id], LoginManager.regionsXteaKeys[id], 0);
if (Static156.locationMapFilesBuffer[id] == null) { if (LoginManager.locationMapFilesBuffer[id] == null) {
fileExists = false; fileExists = false;
Static175.mapFilesMissingCount++; Static175.mapFilesMissingCount++;
} }
} }
if (GlRenderer.enabled) { if (GlRenderer.enabled) {
if (Static99.underWaterMapFileIds[id] != -1 && Static186.underWaterMapFilesBuffer[id] == null) { if (LoginManager.underWaterMapFileIds[id] != -1 && LoginManager.underWaterMapFilesBuffer[id] == null) {
Static186.underWaterMapFilesBuffer[id] = client.js5Archive5.getFile(Static99.underWaterMapFileIds[id], 0); LoginManager.underWaterMapFilesBuffer[id] = client.js5Archive5.getFile(LoginManager.underWaterMapFileIds[id], 0);
if (Static186.underWaterMapFilesBuffer[id] == null) { if (LoginManager.underWaterMapFilesBuffer[id] == null) {
fileExists = false; fileExists = false;
Static175.mapFilesMissingCount++; Static175.mapFilesMissingCount++;
} }
} }
if (Static35.underWaterLocationsMapFileIds[id] != -1 && Static19.underWaterLocationsMapFilesBuffer[id] == null) { if (LoginManager.underWaterLocationsMapFileIds[id] != -1 && LoginManager.underWaterLocationsMapFilesBuffer[id] == null) {
Static19.underWaterLocationsMapFilesBuffer[id] = client.js5Archive5.getFile(Static35.underWaterLocationsMapFileIds[id], 0); LoginManager.underWaterLocationsMapFilesBuffer[id] = client.js5Archive5.getFile(LoginManager.underWaterLocationsMapFileIds[id], 0);
if (Static19.underWaterLocationsMapFilesBuffer[id] == null) { if (LoginManager.underWaterLocationsMapFilesBuffer[id] == null) {
Static175.mapFilesMissingCount++; Static175.mapFilesMissingCount++;
fileExists = false; fileExists = false;
} }
} }
} }
if (Static175.npcSpawnsFileIds != null && Static191.npcSpawnsFilesBuffer[id] == null && Static175.npcSpawnsFileIds[id] != -1) { if (LoginManager.npcSpawnsFileIds != null && LoginManager.npcSpawnsFilesBuffer[id] == null && LoginManager.npcSpawnsFileIds[id] != -1) {
Static191.npcSpawnsFilesBuffer[id] = client.js5Archive5.getFileXTEA(Static175.npcSpawnsFileIds[id], Static72.regionsXteaKeys[id], 0); LoginManager.npcSpawnsFilesBuffer[id] = client.js5Archive5.getFileXTEA(LoginManager.npcSpawnsFileIds[id], LoginManager.regionsXteaKeys[id], 0);
if (Static191.npcSpawnsFilesBuffer[id] == null) { if (LoginManager.npcSpawnsFilesBuffer[id] == null) {
Static175.mapFilesMissingCount++; Static175.mapFilesMissingCount++;
fileExists = false; fileExists = false;
} }
} }
} }
if (Static235.mapElementList == null) { if (LoginManager.mapElementList == null) {
if (Static158.aClass3_Sub2_Sub4_3 == null || !client.js5Archive23.isGroupNameValid(JagString.concatenate(new JagString[] { Static158.aClass3_Sub2_Sub4_3.group, Static50.aClass100_363 }))) { if (LoginManager.map == null || !client.js5Archive23.isGroupNameValid(JagString.concatenate(new JagString[] { LoginManager.map.group, Static50.aClass100_363 }))) {
Static235.mapElementList = new MapElementList(0); LoginManager.mapElementList = new MapElementList(0);
} else if (client.js5Archive23.allFilesComplete(JagString.concatenate(new JagString[] { Static158.aClass3_Sub2_Sub4_3.group, Static50.aClass100_363 }))) { } else if (client.js5Archive23.allFilesComplete(JagString.concatenate(new JagString[] { LoginManager.map.group, Static50.aClass100_363 }))) {
Static235.mapElementList = MapElementList.create(JagString.concatenate(new JagString[] { Static158.aClass3_Sub2_Sub4_3.group, Static50.aClass100_363 }), client.js5Archive23); LoginManager.mapElementList = MapElementList.create(JagString.concatenate(new JagString[] { LoginManager.map.group, Static50.aClass100_363 }), client.js5Archive23);
} else { } else {
fileExists = false; fileExists = false;
Static175.mapFilesMissingCount++; Static175.mapFilesMissingCount++;
@ -239,15 +227,15 @@ public class ClientProt {
return; return;
} }
Static271.anInt5804 = 0; anInt5804 = 0;
fileExists = true; fileExists = true;
@Pc(320) int chunkX; @Pc(320) int chunkX;
@Pc(309) int chunkZ; @Pc(309) int chunkZ;
for (id = 0; id < Static273.mapFilesBuffer.length; id++) { for (id = 0; id < LoginManager.mapFilesBuffer.length; id++) {
@Pc(294) byte[] local294 = Static156.locationMapFilesBuffer[id]; @Pc(294) byte[] local294 = LoginManager.locationMapFilesBuffer[id];
if (local294 != null) { if (local294 != null) {
chunkZ = (Static238.regionBitPacked[id] & 0xFF) * 64 - Static142.originZ; chunkZ = (LoginManager.regionBitPacked[id] & 0xFF) * 64 - Camera.originZ;
chunkX = (Static238.regionBitPacked[id] >> 8) * 64 - Static225.originX; chunkX = (LoginManager.regionBitPacked[id] >> 8) * 64 - Camera.originX;
if (Static230.dynamicMapRegion) { if (Static230.dynamicMapRegion) {
chunkZ = 10; chunkZ = 10;
chunkX = 10; chunkX = 10;
@ -255,10 +243,10 @@ public class ClientProt {
fileExists &= Static49.method1201(chunkX, chunkZ, local294); fileExists &= Static49.method1201(chunkX, chunkZ, local294);
} }
if (GlRenderer.enabled) { if (GlRenderer.enabled) {
local294 = Static19.underWaterLocationsMapFilesBuffer[id]; local294 = LoginManager.underWaterLocationsMapFilesBuffer[id];
if (local294 != null) { if (local294 != null) {
chunkX = (Static238.regionBitPacked[id] >> 8) * 64 - Static225.originX; chunkX = (LoginManager.regionBitPacked[id] >> 8) * 64 - Camera.originX;
chunkZ = (Static238.regionBitPacked[id] & 0xFF) * 64 - Static142.originZ; chunkZ = (LoginManager.regionBitPacked[id] & 0xFF) * 64 - Camera.originZ;
if (Static230.dynamicMapRegion) { if (Static230.dynamicMapRegion) {
chunkZ = 10; chunkZ = 10;
chunkX = 10; chunkX = 10;
@ -281,8 +269,8 @@ public class ClientProt {
@Pc(420) boolean hasUnderWaterMap = false; @Pc(420) boolean hasUnderWaterMap = false;
@Pc(427) int i; @Pc(427) int i;
if (GlRenderer.enabled && Preferences.highWaterDetail) { if (GlRenderer.enabled && Preferences.highWaterDetail) {
for (i = 0; i < Static273.mapFilesBuffer.length; i++) { for (i = 0; i < LoginManager.mapFilesBuffer.length; i++) {
if (Static19.underWaterLocationsMapFilesBuffer[i] != null || Static186.underWaterMapFilesBuffer[i] != null) { if (LoginManager.underWaterLocationsMapFilesBuffer[i] != null || LoginManager.underWaterMapFilesBuffer[i] != null) {
hasUnderWaterMap = true; hasUnderWaterMap = true;
break; break;
} }
@ -327,7 +315,7 @@ public class ClientProt {
Static73.setLightPosition(chunkX, i); Static73.setLightPosition(chunkX, i);
} }
Static26.method743(false); Static26.method743(false);
if (Static191.npcSpawnsFilesBuffer != null) { if (LoginManager.npcSpawnsFilesBuffer != null) {
Static158.decodeNpcFiles(); Static158.decodeNpcFiles();
} }
} }
@ -361,7 +349,7 @@ public class ClientProt {
} }
SceneGraph.method2255(); SceneGraph.method2255();
if (GlRenderer.enabled && hasUnderWaterMap) { if (GlRenderer.enabled && hasUnderWaterMap) {
Static278.setRenderTiles(true); SceneGraph.setRenderTiles(true);
SceneGraph.method3535(true); SceneGraph.method3535(true);
if (!Static230.dynamicMapRegion) { if (!Static230.dynamicMapRegion) {
Static87.method1805(true); Static87.method1805(true);
@ -378,7 +366,7 @@ public class ClientProt {
Static45.method1169(PathFinder.collisionMaps, true); Static45.method1169(PathFinder.collisionMaps, true);
ping(true); ping(true);
SceneGraph.method2255(); SceneGraph.method2255();
Static278.setRenderTiles(false); SceneGraph.setRenderTiles(false);
} }
if (GlRenderer.enabled) { if (GlRenderer.enabled) {
for (chunkX = 0; chunkX < 13; chunkX++) { for (chunkX = 0; chunkX < 13; chunkX++) {
@ -402,15 +390,15 @@ public class ClientProt {
Protocol.outboundBuffer.p4(1057001181); Protocol.outboundBuffer.p4(1057001181);
} }
if (!Static230.dynamicMapRegion) { if (!Static230.dynamicMapRegion) {
@Pc(815) int local815 = (Static52.anInt1695 + 6) / 8; @Pc(815) int local815 = (LoginManager.centralZoneZ + 6) / 8;
@Pc(821) int local821 = (Static52.anInt1695 - 6) / 8; @Pc(821) int local821 = (LoginManager.centralZoneZ - 6) / 8;
chunkX = (Static80.centralZoneX - 6) / 8; chunkX = (LoginManager.centralZoneX - 6) / 8;
chunkZ = (Static80.centralZoneX + 6) / 8; chunkZ = (LoginManager.centralZoneX + 6) / 8;
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[] { LoginManager.aClass100_558, JagString.parseInt(local837), LoginManager.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[] { LoginManager.aClass100_1090, JagString.parseInt(local837), LoginManager.UNDERSCORE, JagString.parseInt(local850) }));
} }
} }
} }
@ -431,7 +419,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);
@ -462,69 +450,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 || MiniMenu.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;

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

@ -14,7 +14,9 @@ public final class Component {
public static final SoftLruHashTable models = new SoftLruHashTable(50); public static final SoftLruHashTable models = new SoftLruHashTable(50);
@OriginalMember(owner = "client!gn", name = "i", descriptor = "Lclient!n;") @OriginalMember(owner = "client!gn", name = "i", descriptor = "Lclient!n;")
public static final SoftLruHashTable fonts = new SoftLruHashTable(20); public static final SoftLruHashTable fonts = new SoftLruHashTable(20);
@OriginalMember(owner = "client!be", name = "b", descriptor = "[Ljava/lang/Object;") @OriginalMember(owner = "client!rc", name = "C", descriptor = "Z")
public static boolean aBoolean72 = false;
@OriginalMember(owner = "client!be", name = "b", descriptor = "[Ljava/lang/Object;")
public Object[] onFriendTransmit; public Object[] onFriendTransmit;
@OriginalMember(owner = "client!be", name = "d", descriptor = "[Ljava/lang/Object;") @OriginalMember(owner = "client!be", name = "d", descriptor = "[Ljava/lang/Object;")
@ -225,7 +227,7 @@ public final class Component {
public boolean modelOrtho = false; public boolean modelOrtho = false;
@OriginalMember(owner = "client!be", name = "zb", descriptor = "Z") @OriginalMember(owner = "client!be", name = "zb", descriptor = "Z")
public boolean aBoolean30 = false; public boolean filled = false;
@OriginalMember(owner = "client!be", name = "y", descriptor = "I") @OriginalMember(owner = "client!be", name = "y", descriptor = "I")
public int dragDeadtime = 0; public int dragDeadtime = 0;
@ -518,7 +520,7 @@ public final class Component {
if (this.anIntArray37 != null) { if (this.anIntArray37 != null) {
return true; return true;
} }
@Pc(18) SoftwareIndexedSprite local18 = Static164.loadSoftwareIndexedSprite(this.spriteId, InterfaceList.aClass153_12); @Pc(18) SoftwareIndexedSprite local18 = SpriteLoader.loadSoftwareIndexedSprite(this.spriteId, InterfaceList.aClass153_12);
if (local18 == null) { if (local18 == null) {
return false; return false;
} }
@ -669,7 +671,7 @@ public final class Component {
} }
} }
if (this.type == 3) { if (this.type == 3) {
this.aBoolean30 = arg0.g1() == 1; this.filled = arg0.g1() == 1;
} }
if (this.type == 4 || this.type == 1) { if (this.type == 4 || this.type == 1) {
this.anInt460 = arg0.g1(); this.anInt460 = arg0.g1();
@ -784,7 +786,7 @@ public final class Component {
@OriginalMember(owner = "client!be", name = "a", descriptor = "(ZI)Lclient!qf;") @OriginalMember(owner = "client!be", name = "a", descriptor = "(ZI)Lclient!qf;")
public final Sprite method482(@OriginalArg(1) int arg0) { public final Sprite method482(@OriginalArg(1) int arg0) {
Static211.aBoolean72 = false; aBoolean72 = false;
if (arg0 < 0 || arg0 >= this.anIntArray36.length) { if (arg0 < 0 || arg0 >= this.anIntArray36.length) {
return null; return null;
} }
@ -798,7 +800,7 @@ public final class Component {
} }
local43 = SpriteLoader.loadSprites(local29, InterfaceList.aClass153_12); local43 = SpriteLoader.loadSprites(local29, InterfaceList.aClass153_12);
if (local43 == null) { if (local43 == null) {
Static211.aBoolean72 = true; aBoolean72 = true;
} else { } else {
sprites.put(local43, (long) local29); sprites.put(local43, (long) local29);
} }
@ -849,7 +851,7 @@ public final class Component {
@OriginalMember(owner = "client!be", name = "a", descriptor = "(ILclient!tk;IIIZLclient!hh;)Lclient!ak;") @OriginalMember(owner = "client!be", name = "a", descriptor = "(ILclient!tk;IIIZLclient!hh;)Lclient!ak;")
public final Model method488(@OriginalArg(0) int arg0, @OriginalArg(1) SeqType arg1, @OriginalArg(2) int arg2, @OriginalArg(4) int arg3, @OriginalArg(5) boolean arg4, @OriginalArg(6) PlayerAppearance arg5) { public final Model method488(@OriginalArg(0) int arg0, @OriginalArg(1) SeqType arg1, @OriginalArg(2) int arg2, @OriginalArg(4) int arg3, @OriginalArg(5) boolean arg4, @OriginalArg(6) PlayerAppearance arg5) {
Static211.aBoolean72 = false; aBoolean72 = false;
@Pc(10) int local10; @Pc(10) int local10;
@Pc(13) int local13; @Pc(13) int local13;
if (arg4) { if (arg4) {
@ -870,7 +872,7 @@ public final class Component {
if (local61 == null) { if (local61 == null) {
@Pc(69) RawModel local69 = RawModel.create(InterfaceList.aClass153_85, local13); @Pc(69) RawModel local69 = RawModel.create(InterfaceList.aClass153_85, local13);
if (local69 == null) { if (local69 == null) {
Static211.aBoolean72 = true; aBoolean72 = true;
return null; return null;
} }
local61 = local69.createModel(64, 768, -50, -10, -50); local61 = local69.createModel(64, 768, -50, -10, -50);
@ -883,7 +885,7 @@ public final class Component {
} else if (local10 == 2) { } else if (local10 == 2) {
local61 = NpcTypeList.get(local13).getHeadModel(arg1, arg3, arg0, arg2); local61 = NpcTypeList.get(local13).getHeadModel(arg1, arg3, arg0, arg2);
if (local61 == null) { if (local61 == null) {
Static211.aBoolean72 = true; aBoolean72 = true;
return null; return null;
} else { } else {
return local61; return local61;
@ -894,7 +896,7 @@ public final class Component {
} }
local61 = arg5.method1956(arg3, arg1, arg2, arg0); local61 = arg5.method1956(arg3, arg1, arg2, arg0);
if (local61 == null) { if (local61 == null) {
Static211.aBoolean72 = true; aBoolean72 = true;
return null; return null;
} else { } else {
return local61; return local61;
@ -903,7 +905,7 @@ public final class Component {
@Pc(164) ObjType local164 = ObjTypeList.get(local13); @Pc(164) ObjType local164 = ObjTypeList.get(local13);
@Pc(173) Model local173 = local164.getModel(arg0, arg3, arg1, 10, arg2); @Pc(173) Model local173 = local164.getModel(arg0, arg3, arg1, 10, arg2);
if (local173 == null) { if (local173 == null) {
Static211.aBoolean72 = true; aBoolean72 = true;
return null; return null;
} else { } else {
return local173; return local173;
@ -911,7 +913,7 @@ public final class Component {
} else if (local10 == 6) { } else if (local10 == 6) {
local61 = NpcTypeList.get(local13).getBodyModel(null, 0, 0, arg0, arg3, arg2, null, 0, arg1); local61 = NpcTypeList.get(local13).getBodyModel(null, 0, 0, arg0, arg3, arg2, null, 0, arg1);
if (local61 == null) { if (local61 == null) {
Static211.aBoolean72 = true; aBoolean72 = true;
return null; return null;
} else { } else {
return local61; return local61;
@ -926,7 +928,7 @@ public final class Component {
@Pc(235) int local235 = this.anInt498; @Pc(235) int local235 = this.anInt498;
@Pc(246) Model local246 = arg5.method1946(arg0, local235, local227, arg3, arg1, arg2, local232); @Pc(246) Model local246 = arg5.method1946(arg0, local235, local227, arg3, arg1, arg2, local232);
if (local246 == null) { if (local246 == null) {
Static211.aBoolean72 = true; aBoolean72 = true;
return null; return null;
} else { } else {
return local246; return local246;
@ -937,7 +939,7 @@ public final class Component {
@OriginalMember(owner = "client!be", name = "a", descriptor = "(BZ)Lclient!qf;") @OriginalMember(owner = "client!be", name = "a", descriptor = "(BZ)Lclient!qf;")
public final Sprite method489(@OriginalArg(1) boolean arg0) { public final Sprite method489(@OriginalArg(1) boolean arg0) {
Static211.aBoolean72 = false; aBoolean72 = false;
@Pc(12) int local12; @Pc(12) int local12;
if (arg0) { if (arg0) {
local12 = this.anInt519; local12 = this.anInt519;
@ -959,7 +961,7 @@ public final class Component {
local85 = SpriteLoader.loadSoftwareSprite(0, InterfaceList.aClass153_12, local12); local85 = SpriteLoader.loadSoftwareSprite(0, InterfaceList.aClass153_12, local12);
} }
if (local85 == null) { if (local85 == null) {
Static211.aBoolean72 = true; aBoolean72 = true;
return null; return null;
} }
if (this.vFlip) { if (this.vFlip) {
@ -1075,7 +1077,7 @@ public final class Component {
} }
if (this.type == 3) { if (this.type == 3) {
this.color = buffer.g4(); this.color = buffer.g4();
this.aBoolean30 = buffer.g1() == 1; this.filled = buffer.g1() == 1;
this.alpha = buffer.g1(); this.alpha = buffer.g1();
} }
if (this.type == 9) { if (this.type == 9) {
@ -1176,7 +1178,7 @@ public final class Component {
@OriginalMember(owner = "client!be", name = "a", descriptor = "([Lclient!ok;I)Lclient!rk;") @OriginalMember(owner = "client!be", name = "a", descriptor = "([Lclient!ok;I)Lclient!rk;")
public final Font method491(@OriginalArg(0) IndexedSprite[] arg0) { public final Font method491(@OriginalArg(0) IndexedSprite[] arg0) {
Static211.aBoolean72 = false; aBoolean72 = false;
if (this.font == -1) { if (this.font == -1) {
return null; return null;
} }
@ -1184,9 +1186,9 @@ public final class Component {
if (local21 != null) { if (local21 != null) {
return local21; return local21;
} }
local21 = Static127.method2462(this.font, InterfaceList.aClass153_12, InterfaceList.aClass153_64); local21 = Font.method2462(this.font, InterfaceList.aClass153_12, InterfaceList.aClass153_64);
if (local21 == null) { if (local21 == null) {
Static211.aBoolean72 = true; aBoolean72 = true;
} else { } else {
local21.setNameIcons(arg0, null); local21.setNameIcons(arg0, null);
fonts.put(local21, (long) this.font); fonts.put(local21, (long) this.font);

62
client/src/main/java/rt4/CreateManager.java
View file

@ -1,5 +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; import org.openrs2.deob.annotation.Pc;
@ -122,4 +123,65 @@ public class CreateManager {
} }
} }
} }
@OriginalMember(owner = "client!gd", name = "a", descriptor = "(JI)V")
public static void method1691(@OriginalArg(0) long name) {
Protocol.outboundBuffer.offset = 0;
Protocol.outboundBuffer.p1(186);
if (GlobalConfig.LOGIN_USE_STRINGS) {
Protocol.outboundBuffer.pjstr(Base37.decode37(name));
} else {
Protocol.outboundBuffer.p8(name);
}
step = 1;
loops = 0;
errors = 0;
reply = -3;
}
@OriginalMember(owner = "client!jl", name = "a", descriptor = "(IIIII)V")
public static void method2448(@OriginalArg(0) int arg0, @OriginalArg(1) int arg1, @OriginalArg(2) int arg2, @OriginalArg(3) int arg3) {
Protocol.outboundBuffer.offset = 0;
Protocol.outboundBuffer.p1(147);
Protocol.outboundBuffer.p1(arg2);
Protocol.outboundBuffer.p1(arg3);
Protocol.outboundBuffer.p2(arg0);
Protocol.outboundBuffer.p2(arg1);
loops = 0;
errors = 0;
step = 1;
reply = -3;
}
@OriginalMember(owner = "client!da", name = "a", descriptor = "(IIIILclient!na;JI)V")
public static void method1016(@OriginalArg(0) int arg0, @OriginalArg(2) int arg1, @OriginalArg(3) int arg2, @OriginalArg(4) JagString password, @OriginalArg(5) long name, @OriginalArg(6) int arg5) {
@Pc(8) Buffer local8 = new Buffer(GlobalConfig.LOGIN_USE_STRINGS ? 129 : 128);
local8.p1(10);
local8.p2((int) (Math.random() * 99999.0D));
local8.p2(530);
if (GlobalConfig.LOGIN_USE_STRINGS) {
local8.pjstr(Base37.decode37(name));
} else {
local8.p8(name);
}
local8.p4((int) (Math.random() * 9.9999999E7D));
local8.pjstr(password);
local8.p4((int) (Math.random() * 9.9999999E7D));
local8.p2(client.affiliate);
local8.p1(arg0);
local8.p1(arg2);
local8.p4((int) (Math.random() * 9.9999999E7D));
local8.p2(arg5);
local8.p2(arg1);
local8.p4((int) (Math.random() * 9.9999999E7D));
local8.encryptRsa(GlobalConfig.RSA_EXPONENT, GlobalConfig.RSA_MODULUS);
Protocol.outboundBuffer.offset = 0;
Protocol.outboundBuffer.p1(36);
Protocol.outboundBuffer.p1(local8.offset);
Protocol.outboundBuffer.pBytes(local8.data, local8.offset);
reply = -3;
step = 1;
loops = 0;
errors = 0;
}
} }

4
client/src/main/java/rt4/Static255.java → client/src/main/java/rt4/DeadClass.java
View file

@ -2,7 +2,9 @@ package rt4;
import org.openrs2.deob.annotation.OriginalMember; import org.openrs2.deob.annotation.OriginalMember;
public final class Static255 { // Has no usages.
public final class DeadClass {
@OriginalMember(owner = "client!ul", name = "I", descriptor = "Lclient!gn;") @OriginalMember(owner = "client!ul", name = "I", descriptor = "Lclient!gn;")
public static final LruHashTable cache = new LruHashTable(4); public static final LruHashTable cache = new LruHashTable(4);

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

@ -1,25 +1,301 @@
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")
@OriginalMember(owner = "client!c", name = "a", descriptor = "(Ljava/awt/Frame;ZLsignlink!ll;)V") public final class DisplayMode {
public static void exitFullScreen(@OriginalArg(0) Frame arg0, @OriginalArg(2) SignLink arg1) {
while (true) { @OriginalMember(owner = "client!ib", name = "i", descriptor = "[Lclient!od;")
@Pc(16) PrivilegedRequest local16 = arg1.exitFullScreen(arg0); public static DisplayMode[] aClass114Array1;
while (local16.status == 0) { @OriginalMember(owner = "client!rc", name = "M", descriptor = "Z")
ThreadUtils.sleep(10L); public static boolean aBoolean73 = false;
}
if (local16.status == 1) { @OriginalMember(owner = "client!od", name = "j", descriptor = "I")
arg0.setVisible(false); public int width;
arg0.dispose();
return; @OriginalMember(owner = "client!od", name = "k", descriptor = "I")
} public int refreshRate;
ThreadUtils.sleep(100L);
} @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")
public static void exitFullScreen(@OriginalArg(0) Frame arg0, @OriginalArg(2) SignLink arg1) {
while (true) {
@Pc(16) PrivilegedRequest local16 = arg1.exitFullScreen(arg0);
while (local16.status == 0) {
ThreadUtils.sleep(10L);
}
if (local16.status == 1) {
arg0.setVisible(false);
arg0.dispose();
return;
}
ThreadUtils.sleep(100L);
}
}
@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 (!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) {
aBoolean73 = true;
}
}
if (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();
} }

10
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;
@ -159,4 +159,12 @@ public final class Static161 {
public static float method3068() { public static float method3068() {
return aFloat21; return aFloat21;
} }
@OriginalMember(owner = "client!si", name = "a", descriptor = "(IZ)V")
public static void method3935(@OriginalArg(0) int arg0) {
method3060(anInt3923, ((float) arg0 * 0.1F + 0.7F) * 1.1523438F, 0.69921875F, 0.69921875F);
method3063(-50.0F, -60.0F, -50.0F);
method3062(anInt3922, 0);
method3058();
}
} }

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

@ -213,7 +213,12 @@ public abstract class Font extends SecondaryNode {
return local27; return local27;
} }
@OriginalMember(owner = "client!rk", name = "a", descriptor = "(Lclient!na;IIIIIIIII)I") @OriginalMember(owner = "client!k", name = "a", descriptor = "(IIBLclient!ve;Lclient!ve;)Lclient!rk;")
public static Font method2462(@OriginalArg(1) int arg0, @OriginalArg(3) Js5 arg1, @OriginalArg(4) Js5 arg2) {
return SpriteLoader.decode(arg1, 0, arg0) ? method799(arg2.getFile(arg0, 0)) : null;
}
@OriginalMember(owner = "client!rk", name = "a", descriptor = "(Lclient!na;IIIIIIIII)I")
public final int method2852(@OriginalArg(0) JagString arg0, @OriginalArg(1) int arg1, @OriginalArg(2) int arg2, @OriginalArg(3) int arg3, @OriginalArg(4) int arg4, @OriginalArg(5) int arg5, @OriginalArg(6) int arg6, @OriginalArg(7) int arg7, @OriginalArg(8) int arg8, @OriginalArg(9) int arg9) { public final int method2852(@OriginalArg(0) JagString arg0, @OriginalArg(1) int arg1, @OriginalArg(2) int arg2, @OriginalArg(3) int arg3, @OriginalArg(4) int arg4, @OriginalArg(5) int arg5, @OriginalArg(6) int arg6, @OriginalArg(7) int arg7, @OriginalArg(8) int arg8, @OriginalArg(9) int arg9) {
return this.renderParagraphAlpha(arg0, arg1, arg2, arg3, arg4, arg5, arg6, arg7, arg8, arg9); return this.renderParagraphAlpha(arg0, arg1, arg2, arg3, arg4, arg5, arg6, arg7, arg8, arg9);
} }

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

@ -45,13 +45,13 @@ public class Fonts {
@OriginalMember(owner = "client!hn", name = "a", descriptor = "(Lclient!ve;ILclient!ve;)V") @OriginalMember(owner = "client!hn", name = "a", descriptor = "(Lclient!ve;ILclient!ve;)V")
public static void load(@OriginalArg(0) Js5 arg0, @OriginalArg(2) Js5 arg1) { public static void load(@OriginalArg(0) Js5 arg0, @OriginalArg(2) Js5 arg1) {
p11Full = Static127.method2462(Sprites.p11FullId, arg1, arg0); p11Full = Font.method2462(Sprites.p11FullId, arg1, arg0);
if (GlRenderer.enabled) { if (GlRenderer.enabled) {
p11FullSoftware = SoftwareFont.method2412(Sprites.p11FullId, arg0, arg1); p11FullSoftware = SoftwareFont.method2412(Sprites.p11FullId, arg0, arg1);
} else { } else {
p11FullSoftware = (SoftwareFont) p11Full; p11FullSoftware = (SoftwareFont) p11Full;
} }
p12Full = Static127.method2462(Sprites.p12FullId, arg1, arg0); p12Full = Font.method2462(Sprites.p12FullId, arg1, arg0);
b12Full = Static127.method2462(Sprites.b12FullId, arg1, arg0); b12Full = Font.method2462(Sprites.b12FullId, arg1, arg0);
} }
} }

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

@ -177,6 +177,51 @@ public abstract class GameShell extends Applet implements Runnable, FocusListene
VARIABLE_RENDER_RATE_NS = (int)(VARIABLE_RENDER_RATE * 1_000_000.0d); VARIABLE_RENDER_RATE_NS = (int)(VARIABLE_RENDER_RATE * 1_000_000.0d);
} }
@OriginalMember(owner = "client!qh", name = "a", descriptor = "(Z)V")
public static void method3662() {
@Pc(8) Container local8;
if (fullScreenFrame != null) {
local8 = fullScreenFrame;
} else if (frame == null) {
local8 = signLink.applet;
} else {
local8 = frame;
}
frameWidth = local8.getSize().width;
frameHeight = local8.getSize().height;
@Pc(35) Insets local35;
if (local8 == frame) {
local35 = frame.getInsets();
frameHeight -= local35.bottom + local35.top;
frameWidth -= local35.right + local35.left;
}
if (DisplayMode.getWindowMode() >= 2) {
canvasWidth = frameWidth;
leftMargin = 0;
topMargin = 0;
canvasHeight = frameHeight;
} else {
topMargin = 0;
leftMargin = (frameWidth - 765) / 2;
canvasHeight = 503;
canvasWidth = 765;
}
if (GlRenderer.enabled) {
GlRenderer.setCanvasSize(canvasWidth, canvasHeight);
}
canvas.setSize(canvasWidth, canvasHeight);
if (local8 == frame) {
local35 = frame.getInsets();
canvas.setLocation(local35.left + leftMargin, topMargin + local35.top);
} else {
canvas.setLocation(leftMargin, topMargin);
}
if (InterfaceList.topLevelInterface != -1) {
Static210.method3712(true);
}
Static139.method2704();
}
@OriginalMember(owner = "client!rc", name = "focusLost", descriptor = "(Ljava/awt/event/FocusEvent;)V") @OriginalMember(owner = "client!rc", name = "focusLost", descriptor = "(Ljava/awt/event/FocusEvent;)V")
@Override @Override
public final void focusLost(@OriginalArg(0) FocusEvent event) { public final void focusLost(@OriginalArg(0) FocusEvent event) {

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

@ -1035,7 +1035,7 @@ public final class GlModel extends Model {
} }
if (Static150.anInt3582 >= local187 && Static150.anInt3582 <= local191 && Static34.anInt1053 >= local206 && Static34.anInt1053 <= local210) { if (Static150.anInt3582 >= local187 && Static150.anInt3582 <= local191 && Static34.anInt1053 >= local206 && Static34.anInt1053 <= local210) {
if (this.aBoolean303) { if (this.aBoolean303) {
Static259.aLongArray11[Static2.anInt7++] = arg8; Model.aLongArray11[Static2.anInt7++] = arg8;
} else { } else {
if (anIntArray468.length < this.anInt5296) { if (anIntArray468.length < this.anInt5296) {
anIntArray468 = new int[this.anInt5296]; anIntArray468 = new int[this.anInt5296];
@ -1053,7 +1053,7 @@ public final class GlModel extends Model {
@Pc(703) short local703 = this.aShortArray82[local362]; @Pc(703) short local703 = this.aShortArray82[local362];
@Pc(708) short local708 = this.aShortArray83[local362]; @Pc(708) short local708 = this.aShortArray83[local362];
if (this.method4118(Static150.anInt3582, Static34.anInt1053, anIntArray467[local698], anIntArray467[local703], anIntArray467[local708], anIntArray468[local698], anIntArray468[local703], anIntArray468[local708])) { if (this.method4118(Static150.anInt3582, Static34.anInt1053, anIntArray467[local698], anIntArray467[local703], anIntArray467[local708], anIntArray468[local698], anIntArray468[local703], anIntArray468[local708])) {
Static259.aLongArray11[Static2.anInt7++] = arg8; Model.aLongArray11[Static2.anInt7++] = arg8;
break label118; break label118;
} }
local362++; local362++;
@ -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];
}
}
} }

61
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,7 +194,64 @@ public final class JagString implements StringInterface {
return parseInt(true, arg0); return parseInt(true, arg0);
} }
@OriginalMember(owner = "client!na", name = "a", descriptor = "(Z)Ljava/net/URL;") @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!k", name = "a", descriptor = "(Lclient!be;Lclient!na;I)Lclient!na;")
public static JagString method2465(@OriginalArg(0) Component arg0, @OriginalArg(1) JagString arg1) {
if (arg1.indexOf(Static127.PERCENT_SIGN) == -1) {
return arg1;
}
while (true) {
@Pc(14) int local14 = arg1.indexOf(Static127.aClass100_133);
if (local14 == -1) {
while (true) {
local14 = arg1.indexOf(Static127.aClass100_1097);
if (local14 == -1) {
while (true) {
local14 = arg1.indexOf(Static127.aClass100_761);
if (local14 == -1) {
while (true) {
local14 = arg1.indexOf(Static127.aClass100_520);
if (local14 == -1) {
while (true) {
local14 = arg1.indexOf(Static127.aClass100_1002);
if (local14 == -1) {
while (true) {
local14 = arg1.indexOf(Static127.aClass100_591);
if (local14 == -1) {
return arg1;
}
@Pc(246) JagString local246 = EMPTY;
if (Player.lastLogAddress != null) {
local246 = formatIp(Player.lastLogAddress.intArg2);
if (Player.lastLogAddress.result != null) {
@Pc(265) byte[] local265 = ((String) Player.lastLogAddress.result).getBytes(StandardCharsets.ISO_8859_1);
local246 = decodeString(local265, local265.length, 0);
}
}
arg1 = concatenate(new JagString[] { arg1.substring(local14, 0), local246, arg1.substring(local14 + 4) });
}
}
arg1 = concatenate(new JagString[] { arg1.substring(local14, 0), StringUtils.method4510(Static127.method3212(4, arg0)), arg1.substring(local14 + 2) });
}
}
arg1 = concatenate(new JagString[] { arg1.substring(local14, 0), StringUtils.method4510(Static127.method3212(3, arg0)), arg1.substring(local14 + 2) });
}
}
arg1 = concatenate(new JagString[] { arg1.substring(local14, 0), StringUtils.method4510(Static127.method3212(2, arg0)), arg1.substring(local14 + 2) });
}
}
arg1 = concatenate(new JagString[] { arg1.substring(local14, 0), StringUtils.method4510(Static127.method3212(1, arg0)), arg1.substring(local14 + 2) });
}
}
arg1 = concatenate(new JagString[] { arg1.substring(local14, 0), StringUtils.method4510(Static127.method3212(0, arg0)), arg1.substring(local14 + 2) });
}
}
@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));
} }

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

@ -73,7 +73,7 @@ public final class Light {
@OriginalMember(owner = "client!gi", name = "<init>", descriptor = "(Lclient!wa;)V") @OriginalMember(owner = "client!gi", name = "<init>", descriptor = "(Lclient!wa;)V")
public Light(@OriginalArg(0) Buffer arg0) { public Light(@OriginalArg(0) Buffer arg0) {
if (anIntArray150 == null) { if (anIntArray150 == null) {
Static84.method1771(); method1771();
} }
this.anInt2241 = arg0.g1(); this.anInt2241 = arg0.g1();
this.aBoolean124 = (this.anInt2241 & 0x10) != 0; this.aBoolean124 = (this.anInt2241 & 0x10) != 0;
@ -98,6 +98,11 @@ public final class Light {
} }
} }
@OriginalMember(owner = "client!gk", name = "b", descriptor = "(B)V")
public static void method1771() {
anIntArray150 = Static206.method3679(0.4F);
}
@OriginalMember(owner = "client!gi", name = "a", descriptor = "(BIIII)V") @OriginalMember(owner = "client!gi", name = "a", descriptor = "(BIIII)V")
public final void method1762(@OriginalArg(1) int arg0, @OriginalArg(2) int arg1, @OriginalArg(3) int arg2, @OriginalArg(4) int arg3) { public final void method1762(@OriginalArg(1) int arg0, @OriginalArg(2) int arg1, @OriginalArg(3) int arg2, @OriginalArg(4) int arg3) {
this.anInt2233 = arg0; this.anInt2233 = arg0;

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];
} }

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

@ -14,6 +14,18 @@ public class LoginManager {
public static final JagString ZAP = JagString.parse("zap"); public static final JagString ZAP = JagString.parse("zap");
@OriginalMember(owner = "client!ef", name = "h", descriptor = "Lclient!na;") @OriginalMember(owner = "client!ef", name = "h", descriptor = "Lclient!na;")
public static final JagString UNZAP = JagString.parse("unzap"); public static final JagString UNZAP = JagString.parse("unzap");
@OriginalMember(owner = "client!wj", name = "f", descriptor = "Lclient!na;")
public static final JagString aClass100_1103 = JagString.parse("ul");
@OriginalMember(owner = "client!i", name = "ic", descriptor = "Lclient!na;")
public static final JagString aClass100_558 = JagString.parse("m");
@OriginalMember(owner = "client!wb", name = "e", descriptor = "Lclient!na;")
public static final JagString aClass100_1090 = JagString.parse("l");
@OriginalMember(owner = "client!oe", name = "o", descriptor = "Lclient!na;")
public static final JagString aClass100_807 = JagString.parse("n");
@OriginalMember(owner = "client!nb", name = "a", descriptor = "Lclient!na;")
public static final JagString aClass100_772 = JagString.parse("um");
@OriginalMember(owner = "client!gm", name = "W", descriptor = "Lclient!na;")
public static final JagString UNDERSCORE = JagString.parse("_");
@OriginalMember(owner = "client!rl", name = "X", descriptor = "I") @OriginalMember(owner = "client!rl", name = "X", descriptor = "I")
public static int anInt4937 = 0; public static int anInt4937 = 0;
@OriginalMember(owner = "client!sd", name = "X", descriptor = "Z") @OriginalMember(owner = "client!sd", name = "X", descriptor = "Z")
@ -41,7 +53,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")
@ -54,6 +66,44 @@ public class LoginManager {
public static boolean mapQuickChat = false; public static boolean mapQuickChat = false;
@OriginalMember(owner = "client!c", name = "hb", descriptor = "Z") @OriginalMember(owner = "client!c", name = "hb", descriptor = "Z")
public static boolean parentalAdvertConsent = false; public static boolean parentalAdvertConsent = false;
@OriginalMember(owner = "client!we", name = "H", descriptor = "[[B")
public static byte[][] mapFilesBuffer;
@OriginalMember(owner = "client!mf", name = "O", descriptor = "[[B")
public static byte[][] locationMapFilesBuffer;
@OriginalMember(owner = "client!cl", name = "V", descriptor = "[I")
public static int[] underWaterLocationsMapFileIds;
@OriginalMember(owner = "client!pg", name = "jb", descriptor = "[[B")
public static byte[][] npcSpawnsFilesBuffer;
@OriginalMember(owner = "client!client", name = "lb", descriptor = "[I")
public static int[] mapFileIds;
@OriginalMember(owner = "client!pa", name = "L", descriptor = "[[B")
public static byte[][] underWaterMapFilesBuffer;
@OriginalMember(owner = "client!fl", name = "D", descriptor = "[[I")
public static int[][] regionsXteaKeys;
@OriginalMember(owner = "client!te", name = "H", descriptor = "[I")
public static int[] regionBitPacked;
@OriginalMember(owner = "client!nm", name = "P", descriptor = "[I")
public static int[] npcSpawnsFileIds;
@OriginalMember(owner = "client!hk", name = "bb", descriptor = "[I")
public static int[] underWaterMapFileIds;
@OriginalMember(owner = "client!nj", name = "j", descriptor = "[I")
public static int[] locationsMapFileIds;
@OriginalMember(owner = "client!bi", name = "Y", descriptor = "[[B")
public static byte[][] underWaterLocationsMapFilesBuffer;
@OriginalMember(owner = "client!gf", name = "R", descriptor = "I")
public static int centralZoneX;
@OriginalMember(owner = "client!eb", name = "u", descriptor = "I")
public static int centralZoneZ;
@OriginalMember(owner = "client!dc", name = "ab", descriptor = "I")
public static int centralPlane = 0;
@OriginalMember(owner = "client!mh", name = "hb", descriptor = "Lclient!bn;")
public static Map map;
@OriginalMember(owner = "client!tb", name = "X", descriptor = "Lclient!se;")
public static MapElementList mapElementList;
@OriginalMember(owner = "client!ja", name = "n", descriptor = "I")
public static int mapFlagX = 0;
@OriginalMember(owner = "client!gk", name = "h", descriptor = "I")
public static int mapFlagZ = 0;
@OriginalMember(owner = "client!dm", name = "d", descriptor = "(I)V") @OriginalMember(owner = "client!dm", name = "d", descriptor = "(I)V")
public static void clear() { public static void clear() {
@ -275,7 +325,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 +445,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;
@ -432,7 +482,7 @@ public class LoginManager {
reply = 2; reply = 2;
step = 0; step = 0;
client.method4221(); client.method4221();
Static80.centralZoneX = -1; centralZoneX = -1;
Protocol.readRebuildPacket(false); Protocol.readRebuildPacket(false);
Protocol.opcode = -1; Protocol.opcode = -1;
return; return;
@ -497,47 +547,227 @@ 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) + (Static225.originX >> 3); @Pc(10) int local10 = (Camera.renderX >> 10) + (Camera.originX >> 3);
@Pc(23) int local23 = (Static134.renderZ >> 10) + (Static142.originZ >> 3); @Pc(23) int local23 = (Camera.renderZ >> 10) + (Camera.originZ >> 3);
Static156.locationMapFilesBuffer = new byte[18][]; locationMapFilesBuffer = new byte[18][];
Static35.underWaterLocationsMapFileIds = new int[18]; underWaterLocationsMapFileIds = new int[18];
Static191.npcSpawnsFilesBuffer = new byte[18][]; npcSpawnsFilesBuffer = new byte[18][];
Static36.mapFileIds = new int[18]; mapFileIds = new int[18];
Static72.regionsXteaKeys = new int[18][4]; regionsXteaKeys = new int[18][4];
Static186.underWaterMapFilesBuffer = new byte[18][]; underWaterMapFilesBuffer = new byte[18][];
Static238.regionBitPacked = new int[18]; regionBitPacked = new int[18];
Static273.mapFilesBuffer = new byte[18][]; mapFilesBuffer = new byte[18][];
Static175.npcSpawnsFileIds = new int[18]; npcSpawnsFileIds = new int[18];
Static99.underWaterMapFileIds = new int[18]; underWaterMapFileIds = new int[18];
Static172.locationsMapFileIds = new int[18]; locationsMapFileIds = new int[18];
Static19.underWaterLocationsMapFilesBuffer = new byte[18][]; underWaterLocationsMapFilesBuffer = new byte[18][];
@Pc(74) int local74 = 0; @Pc(74) int local74 = 0;
@Pc(80) int local80; @Pc(80) int local80;
for (local80 = (local10 - 6) / 8; local80 <= (local10 + 6) / 8; local80++) { for (local80 = (local10 - 6) / 8; local80 <= (local10 + 6) / 8; local80++) {
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; 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) })); mapFileIds[local74] = client.js5Archive5.getGroupId(JagString.concatenate(new JagString[] { aClass100_558, JagString.parseInt(local80), 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) })); locationsMapFileIds[local74] = client.js5Archive5.getGroupId(JagString.concatenate(new JagString[] { aClass100_1090, JagString.parseInt(local80), 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) })); npcSpawnsFileIds[local74] = client.js5Archive5.getGroupId(JagString.concatenate(new JagString[] { aClass100_807, JagString.parseInt(local80), 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) })); underWaterMapFileIds[local74] = client.js5Archive5.getGroupId(JagString.concatenate(new JagString[] { aClass100_772, JagString.parseInt(local80), 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) })); underWaterLocationsMapFileIds[local74] = client.js5Archive5.getGroupId(JagString.concatenate(new JagString[] { aClass100_1103, JagString.parseInt(local80), UNDERSCORE, JagString.parseInt(local97) }));
if (Static175.npcSpawnsFileIds[local74] == -1) { if (npcSpawnsFileIds[local74] == -1) {
Static36.mapFileIds[local74] = -1; mapFileIds[local74] = -1;
Static172.locationsMapFileIds[local74] = -1; locationsMapFileIds[local74] = -1;
Static99.underWaterMapFileIds[local74] = -1; underWaterMapFileIds[local74] = -1;
Static35.underWaterLocationsMapFileIds[local74] = -1; underWaterLocationsMapFileIds[local74] = -1;
} }
local74++; local74++;
} }
} }
for (local80 = local74; local80 < Static175.npcSpawnsFileIds.length; local80++) { for (local80 = local74; local80 < npcSpawnsFileIds.length; local80++) {
Static175.npcSpawnsFileIds[local80] = -1; npcSpawnsFileIds[local80] = -1;
Static36.mapFileIds[local80] = -1; mapFileIds[local80] = -1;
Static172.locationsMapFileIds[local80] = -1; locationsMapFileIds[local80] = -1;
Static99.underWaterMapFileIds[local80] = -1; underWaterMapFileIds[local80] = -1;
Static35.underWaterLocationsMapFileIds[local80] = -1; underWaterLocationsMapFileIds[local80] = -1;
} }
Static127.method2463(0, local23, local10, 8, true, 8); method2463(0, local23, local10, 8, true, 8);
} }
@OriginalMember(owner = "client!wj", name = "b", descriptor = "(B)V")
public static void processLogout() {
if (Protocol.socket != null) {
Protocol.socket.close();
Protocol.socket = null;
}
client.method3768();
SceneGraph.clear();
@Pc(19) int local19;
for (local19 = 0; local19 < 4; local19++) {
PathFinder.collisionMaps[local19].resetFlags();
}
WorldMap.clear(false);
System.gc();
MidiPlayer.method801();
MidiPlayer.jingle = false;
MusicPlayer.groupId = -1;
AreaSoundManager.clear(true);
Static230.dynamicMapRegion = false;
Camera.originZ = 0;
centralZoneX = 0;
centralZoneZ = 0;
Camera.originX = 0;
for (local19 = 0; local19 < Static143.hintMapMarkers.length; local19++) {
Static143.hintMapMarkers[local19] = null;
}
PlayerList.size = 0;
NpcList.size = 0;
for (local19 = 0; local19 < 2048; local19++) {
PlayerList.players[local19] = null;
PlayerList.appearanceCache[local19] = null;
}
for (local19 = 0; local19 < 32768; local19++) {
NpcList.npcs[local19] = null;
}
for (local19 = 0; local19 < 4; local19++) {
for (@Pc(115) int local115 = 0; local115 < 104; local115++) {
for (@Pc(122) int local122 = 0; local122 < 104; local122++) {
SceneGraph.objStacks[local19][local115][local122] = null;
}
}
}
Camera.resetCameraEffects();
Protocol.verifyId = 0;
VarpDomain.reset();
Static73.method1596(true);
}
@OriginalMember(owner = "client!k", name = "a", descriptor = "(IIIIZIZ)V")
public static void method2463(@OriginalArg(0) int arg0, @OriginalArg(1) int arg1, @OriginalArg(2) int arg2, @OriginalArg(3) int arg3, @OriginalArg(4) boolean arg4, @OriginalArg(5) int arg5) {
if (centralZoneX == arg2 && arg1 == centralZoneZ && (centralPlane == arg0 || SceneGraph.allLevelsAreVisible())) {
return;
}
centralZoneX = arg2;
centralZoneZ = arg1;
centralPlane = arg0;
if (SceneGraph.allLevelsAreVisible()) {
centralPlane = 0;
}
if (arg4) {
client.setGameState(28);
} else {
client.setGameState(25);
}
Static114.drawTextOnScreen(true, LocalizedText.LOADING);
@Pc(53) int local53 = Camera.originZ;
@Pc(55) int local55 = Camera.originX;
Camera.originZ = arg1 * 8 - 48;
Camera.originX = (arg2 - 6) * 8;
map = MapList.getContainingSource(centralZoneX * 8, centralZoneZ * 8);
@Pc(81) int local81 = Camera.originZ - local53;
@Pc(86) int local86 = Camera.originX - local55;
mapElementList = null;
@Pc(96) int local96;
@Pc(103) Npc local103;
@Pc(109) int local109;
if (arg4) {
NpcList.size = 0;
for (local96 = 0; local96 < 32768; local96++) {
local103 = NpcList.npcs[local96];
if (local103 != null) {
local103.xFine -= local86 * 128;
local103.zFine -= local81 * 128;
if (local103.xFine >= 0 && local103.xFine <= 13184 && local103.zFine >= 0 && local103.zFine <= 13184) {
for (local109 = 0; local109 < 10; local109++) {
local103.movementQueueX[local109] -= local86;
local103.movementQueueZ[local109] -= local81;
}
NpcList.ids[NpcList.size++] = local96;
} else {
NpcList.npcs[local96].setNpcType(null);
NpcList.npcs[local96] = null;
}
}
}
} else {
for (local96 = 0; local96 < 32768; local96++) {
local103 = NpcList.npcs[local96];
if (local103 != null) {
for (local109 = 0; local109 < 10; local109++) {
local103.movementQueueX[local109] -= local86;
local103.movementQueueZ[local109] -= local81;
}
local103.xFine -= local86 * 128;
local103.zFine -= local81 * 128;
}
}
}
for (local96 = 0; local96 < 2048; local96++) {
@Pc(265) Player local265 = PlayerList.players[local96];
if (local265 != null) {
for (local109 = 0; local109 < 10; local109++) {
local265.movementQueueX[local109] -= local86;
local265.movementQueueZ[local109] -= local81;
}
local265.xFine -= local86 * 128;
local265.zFine -= local81 * 128;
}
}
Player.level = arg0;
PlayerList.self.teleport(arg5, false, arg3);
@Pc(322) byte local322 = 104;
@Pc(324) byte local324 = 0;
@Pc(326) byte local326 = 0;
@Pc(328) byte local328 = 1;
@Pc(330) byte local330 = 104;
@Pc(332) byte local332 = 1;
if (local81 < 0) {
local328 = -1;
local330 = -1;
local326 = 103;
}
if (local86 < 0) {
local332 = -1;
local324 = 103;
local322 = -1;
}
for (@Pc(358) int local358 = local324; local358 != local322; local358 += local332) {
for (@Pc(367) int local367 = local326; local367 != local330; local367 += local328) {
@Pc(378) int local378 = local86 + local358;
@Pc(382) int local382 = local367 + local81;
for (@Pc(384) int local384 = 0; local384 < 4; local384++) {
if (local378 >= 0 && local382 >= 0 && local378 < 104 && local382 < 104) {
SceneGraph.objStacks[local384][local358][local367] = SceneGraph.objStacks[local384][local378][local382];
} else {
SceneGraph.objStacks[local384][local358][local367] = null;
}
}
}
}
for (@Pc(451) SceneryStack local451 = (SceneryStack) Static26.sceneryList.head(); local451 != null; local451 = (SceneryStack) Static26.sceneryList.next()) {
local451.z -= local81;
local451.x -= local86;
if (local451.x < 0 || local451.z < 0 || local451.x >= 104 || local451.z >= 104) {
local451.unlink();
}
}
if (arg4) {
Camera.renderX -= local86 * 128;
Camera.renderZ -= local81 * 128;
Camera.anInt4232 -= local81;
Camera.anInt5449 -= local86;
Camera.anInt5765 -= local81;
Camera.anInt5375 -= local86;
} else {
Camera.cameraType = 1;
}
SoundPlayer.anInt4451 = 0;
if (mapFlagX != 0) {
mapFlagZ -= local81;
mapFlagX -= local86;
}
if (GlRenderer.enabled && arg4 && (Math.abs(local86) > 104 || Math.abs(local81) > 104)) {
Static103.setInstantFade();
}
Static107.anInt2875 = -1;
Static99.aClass69_64.clear();
Static217.aClass69_116.clear();
}
} }

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

@ -25,6 +25,14 @@ public class MiniMap {
public static int state = 0; public static int state = 0;
@OriginalMember(owner = "client!we", name = "w", descriptor = "I") @OriginalMember(owner = "client!we", name = "w", descriptor = "I")
public static int anInt4130 = 0; public static int anInt4130 = 0;
@OriginalMember(owner = "client!ej", name = "W", descriptor = "I")
public static int anInt1814 = 0;
@OriginalMember(owner = "client!vg", name = "d", descriptor = "I")
public static int anInt5755 = 2;
@OriginalMember(owner = "client!oe", name = "n", descriptor = "I")
public static int anInt4262 = 1;
@OriginalMember(owner = "client!gi", name = "H", descriptor = "I")
public static int anInt2252 = 0;
@OriginalMember(owner = "client!ma", name = "a", descriptor = "([IIIIII)V") @OriginalMember(owner = "client!ma", name = "a", descriptor = "([IIIIII)V")
public static void renderTile(@OriginalArg(0) int[] pixels, @OriginalArg(1) int index, @OriginalArg(3) int arg2, @OriginalArg(4) int arg3, @OriginalArg(5) int arg4) { public static void renderTile(@OriginalArg(0) int[] pixels, @OriginalArg(1) int index, @OriginalArg(3) int arg2, @OriginalArg(4) int arg3, @OriginalArg(5) int arg4) {
@ -217,7 +225,7 @@ public class MiniMap {
SoftwareRaster.setClip(arg2, arg1, arg2 + arg3.width, arg1 + arg3.height); SoftwareRaster.setClip(arg2, arg1, arg2 + arg3.width, arg1 + arg3.height);
} }
if (state != 2 && state != 5 && sprite != null) { if (state != 2 && state != 5 && sprite != null) {
@Pc(48) int local48 = Static59.anInt1814 + (int)Camera.yawTarget & 0x7FF; @Pc(48) int local48 = anInt1814 + (int)Camera.yawTarget & 0x7FF;
@Pc(57) int local57 = PlayerList.self.xFine / 32 + 48; @Pc(57) int local57 = PlayerList.self.xFine / 32 + 48;
@Pc(67) int local67 = 464 - PlayerList.self.zFine / 32; @Pc(67) int local67 = 464 - PlayerList.self.zFine / 32;
if (GlRenderer.enabled) { if (GlRenderer.enabled) {
@ -233,37 +241,37 @@ public class MiniMap {
@Pc(200) int local200; @Pc(200) int local200;
@Pc(239) int local239; @Pc(239) int local239;
@Pc(271) int local271; @Pc(271) int local271;
if (Static235.mapElementList != null) { if (LoginManager.mapElementList != null) {
for (@Pc(117) int local117 = 0; local117 < Static235.mapElementList.anInt5074; local117++) { for (@Pc(117) int local117 = 0; local117 < LoginManager.mapElementList.anInt5074; local117++) {
if (Static235.mapElementList.method3892(local117)) { if (LoginManager.mapElementList.method3892(local117)) {
local146 = (Static235.mapElementList.aShortArray73[local117] - Static225.originX) * 4 + 2 - PlayerList.self.xFine / 32; local146 = (LoginManager.mapElementList.aShortArray73[local117] - Camera.originX) * 4 + 2 - PlayerList.self.xFine / 32;
local150 = MathUtils.sin[local48]; local150 = MathUtils.sin[local48];
local154 = MathUtils.cos[local48]; local154 = MathUtils.cos[local48];
@Pc(156) Font local156 = Fonts.p11Full; @Pc(156) Font local156 = Fonts.p11Full;
@Pc(164) int local164 = local150 * 256 / (anInt4130 + 256); @Pc(164) int local164 = local150 * 256 / (anInt4130 + 256);
local181 = (Static235.mapElementList.aShortArray72[local117] - Static142.originZ) * 4 + 2 - PlayerList.self.zFine / 32; local181 = (LoginManager.mapElementList.aShortArray72[local117] - Camera.originZ) * 4 + 2 - PlayerList.self.zFine / 32;
@Pc(189) int local189 = local154 * 256 / (anInt4130 + 256); @Pc(189) int local189 = local154 * 256 / (anInt4130 + 256);
local200 = local181 * local189 - local146 * local164 >> 16; local200 = local181 * local189 - local146 * local164 >> 16;
if (Static235.mapElementList.method3894(local117) == 1) { if (LoginManager.mapElementList.method3894(local117) == 1) {
local156 = Fonts.p12Full; local156 = Fonts.p12Full;
} }
if (Static235.mapElementList.method3894(local117) == 2) { if (LoginManager.mapElementList.method3894(local117) == 2) {
local156 = Fonts.b12Full; local156 = Fonts.b12Full;
} }
local231 = local164 * local181 + local189 * local146 >> 16; local231 = local164 * local181 + local189 * local146 >> 16;
local239 = local156.getMaxLineWidth(Static235.mapElementList.aClass100Array153[local117], 100); local239 = local156.getMaxLineWidth(LoginManager.mapElementList.aClass100Array153[local117], 100);
@Pc(245) int local245 = local231 - local239 / 2; @Pc(245) int local245 = local231 - local239 / 2;
if (local245 >= -arg3.width && local245 <= arg3.width && local200 >= -arg3.height && local200 <= arg3.height) { if (local245 >= -arg3.width && local245 <= arg3.width && local200 >= -arg3.height && local200 <= arg3.height) {
local271 = 16777215; local271 = 16777215;
if (Static235.mapElementList.anIntArray444[local117] != -1) { if (LoginManager.mapElementList.anIntArray444[local117] != -1) {
local271 = Static235.mapElementList.anIntArray444[local117]; local271 = LoginManager.mapElementList.anIntArray444[local117];
} }
if (GlRenderer.enabled) { if (GlRenderer.enabled) {
GlFont.method1188((GlSprite) arg3.method489(false)); GlFont.method1188((GlSprite) arg3.method489(false));
} else { } else {
SoftwareRaster.method2486(arg3.anIntArray37, arg3.anIntArray45); SoftwareRaster.method2486(arg3.anIntArray37, arg3.anIntArray45);
} }
local156.renderParagraphAlpha(Static235.mapElementList.aClass100Array153[local117], arg2 + local245 + arg3.width / 2, arg1 + arg3.height / 2 + -local200, local239, 50, local271, 0, 1, 0, 0); local156.renderParagraphAlpha(LoginManager.mapElementList.aClass100Array153[local117], arg2 + local245 + arg3.width / 2, arg1 + arg3.height / 2 + -local200, local239, 50, local271, 0, 1, 0, 0);
if (GlRenderer.enabled) { if (GlRenderer.enabled) {
GlFont.method1173(); GlFont.method1173();
} else { } else {
@ -283,7 +291,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 +316,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);
} }
} }
} }
@ -361,8 +369,8 @@ public class MiniMap {
} }
} }
if (local770.type == 2) { if (local770.type == 2) {
local154 = (local770.targetX - Static225.originX) * 4 + 2 - PlayerList.self.xFine / 32; local154 = (local770.targetX - Camera.originX) * 4 + 2 - PlayerList.self.xFine / 32;
local231 = (-Static142.originZ + local770.anInt4046) * 4 + 2 - PlayerList.self.zFine / 32; local231 = (-Camera.originZ + local770.anInt4046) * 4 + 2 - PlayerList.self.zFine / 32;
Static97.method1960(local770.anInt4048, arg1, arg2, local154, local231, arg3); Static97.method1960(local770.anInt4048, arg1, arg2, local154, local231, arg3);
} }
if (local770.type == 10 && local770.actorTargetId >= 0 && PlayerList.players.length > local770.actorTargetId) { if (local770.type == 10 && local770.actorTargetId >= 0 && PlayerList.players.length > local770.actorTargetId) {
@ -375,9 +383,9 @@ public class MiniMap {
} }
} }
} }
if (Static115.mapFlagX != 0) { if (LoginManager.mapFlagX != 0) {
local146 = Static115.mapFlagX * 4 + 2 - PlayerList.self.xFine / 32; local146 = LoginManager.mapFlagX * 4 + 2 - PlayerList.self.xFine / 32;
local181 = Static84.anInt2255 * 4 + 2 - PlayerList.self.zFine / 32; local181 = LoginManager.mapFlagZ * 4 + 2 - PlayerList.self.zFine / 32;
method1446(arg3, Sprites.mapflags, local181, local146, arg1, arg2); method1446(arg3, Sprites.mapflags, local181, local146, arg1, arg2);
} }
if (GlRenderer.enabled) { if (GlRenderer.enabled) {
@ -402,7 +410,7 @@ public class MiniMap {
return; return;
} }
@Pc(21) int local21 = arg3 * arg3 + arg2 * arg2; @Pc(21) int local21 = arg3 * arg3 + arg2 * arg2;
@Pc(27) int local27 = Static59.anInt1814 + (int)Camera.yawTarget & 0x7FF; @Pc(27) int local27 = anInt1814 + (int)Camera.yawTarget & 0x7FF;
@Pc(39) int local39 = Math.max(arg0.width / 2, arg0.height / 2) + 10; @Pc(39) int local39 = Math.max(arg0.width / 2, arg0.height / 2) + 10;
if (local39 * local39 < local21) { if (local39 * local39 < local21) {
return; return;

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

@ -61,6 +61,12 @@ 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!ud", name = "Q", descriptor = "Lclient!na;")
public static final JagString aClass100_1039 = JagString.parse(" x ");
@OriginalMember(owner = "client!hd", name = "l", descriptor = "Lclient!na;")
public static final JagString NULL = JagString.parse("null");
@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 +257,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;
@ -347,8 +353,8 @@ public class MiniMenu {
if (local23 == 46) { if (local23 == 46) {
PathFinder.findPathToLoc(local31, local19, local15); PathFinder.findPathToLoc(local31, local19, local15);
Protocol.outboundBuffer.p1isaac(247); Protocol.outboundBuffer.p1isaac(247);
Protocol.outboundBuffer.p2le(Static142.originZ + local19); Protocol.outboundBuffer.p2le(Camera.originZ + local19);
Protocol.outboundBuffer.p2leadd(local15 + Static225.originX); Protocol.outboundBuffer.p2leadd(local15 + Camera.originX);
Protocol.outboundBuffer.p2(Integer.MAX_VALUE & (int) (local31 >>> 32)); Protocol.outboundBuffer.p2(Integer.MAX_VALUE & (int) (local31 >>> 32));
} }
if (local23 == 40) { if (local23 == 40) {
@ -412,12 +418,12 @@ public class MiniMenu {
if (local23 == 42) { if (local23 == 42) {
PathFinder.findPathToLoc(local31, local19, local15); PathFinder.findPathToLoc(local31, local19, local15);
Protocol.outboundBuffer.p1isaac(254); Protocol.outboundBuffer.p1isaac(254);
Protocol.outboundBuffer.p2le(local15 + Static225.originX); Protocol.outboundBuffer.p2le(local15 + Camera.originX);
Protocol.outboundBuffer.p2add((int) (local31 >>> 32) & Integer.MAX_VALUE); Protocol.outboundBuffer.p2add((int) (local31 >>> 32) & Integer.MAX_VALUE);
Protocol.outboundBuffer.p2(local19 + Static142.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];
@ -448,16 +454,16 @@ public class MiniMenu {
Cross.type = 2; Cross.type = 2;
Cross.y = Mouse.clickY; Cross.y = Mouse.clickY;
Protocol.outboundBuffer.p1isaac(66); Protocol.outboundBuffer.p1isaac(66);
Protocol.outboundBuffer.p2le(Static225.originX + local15); Protocol.outboundBuffer.p2le(Camera.originX + local15);
Protocol.outboundBuffer.p2(local36); Protocol.outboundBuffer.p2(local36);
Protocol.outboundBuffer.p2leadd(local19 + Static142.originZ); Protocol.outboundBuffer.p2leadd(local19 + Camera.originZ);
} }
if (local23 == 1001) { if (local23 == 1001) {
PathFinder.findPathToLoc(local31, local19, local15); PathFinder.findPathToLoc(local31, local19, local15);
Protocol.outboundBuffer.p1isaac(170); Protocol.outboundBuffer.p1isaac(170);
Protocol.outboundBuffer.p2leadd(Integer.MAX_VALUE & (int) (local31 >>> 32)); Protocol.outboundBuffer.p2leadd(Integer.MAX_VALUE & (int) (local31 >>> 32));
Protocol.outboundBuffer.p2leadd(local15 + Static225.originX); Protocol.outboundBuffer.p2leadd(local15 + Camera.originX);
Protocol.outboundBuffer.p2leadd(local19 + Static142.originZ); Protocol.outboundBuffer.p2leadd(local19 + Camera.originZ);
} }
if (local23 == 1002) { if (local23 == 1002) {
Cross.type = 2; Cross.type = 2;
@ -474,7 +480,7 @@ public class MiniMenu {
Protocol.outboundBuffer.p1isaac(92); Protocol.outboundBuffer.p1isaac(92);
Protocol.outboundBuffer.p2leadd(local36); Protocol.outboundBuffer.p2leadd(local36);
} else { } else {
Chat.add(JagString.EMPTY, 0, JagString.concatenate(new JagString[] { JagString.parseInt(local693.objCounts[local15]), Static249.aClass100_1039, ObjTypeList.get(local36).name})); Chat.add(JagString.EMPTY, 0, JagString.concatenate(new JagString[] { JagString.parseInt(local693.objCounts[local15]), aClass100_1039, ObjTypeList.get(local36).name}));
} }
anInt2043 = 0; anInt2043 = 0;
aClass13_7 = InterfaceList.getComponent(local19); aClass13_7 = InterfaceList.getComponent(local19);
@ -485,13 +491,13 @@ public class MiniMenu {
method3556(Player.level, local15, local19); method3556(Player.level, local15, local19);
} else if (local36 == 1) { } else if (local36 == 1) {
if (LoginManager.staffModLevel > 0 && Keyboard.pressedKeys[Keyboard.KEY_CTRL] && Keyboard.pressedKeys[Keyboard.KEY_SHIFT]) { if (LoginManager.staffModLevel > 0 && Keyboard.pressedKeys[Keyboard.KEY_CTRL] && Keyboard.pressedKeys[Keyboard.KEY_SHIFT]) {
Cheat.teleport(Static225.originX + local15, Static142.originZ + local19, Player.level); Cheat.teleport(Camera.originX + local15, Camera.originZ + local19, Player.level);
} else if (PathFinder.findPath(PlayerList.self.movementQueueZ[0], 0, 0, true, 0, local15, 0, 0, 1, local19, PlayerList.self.movementQueueX[0])) { } else if (PathFinder.findPath(PlayerList.self.movementQueueZ[0], 0, 0, true, 0, local15, 0, 0, 1, local19, PlayerList.self.movementQueueX[0])) {
Protocol.outboundBuffer.p1(Static1.anInt5); Protocol.outboundBuffer.p1(Static1.anInt5);
Protocol.outboundBuffer.p1(Static107.anInt2878); Protocol.outboundBuffer.p1(Static107.anInt2878);
Protocol.outboundBuffer.p2((int)Camera.yawTarget); Protocol.outboundBuffer.p2((int)Camera.yawTarget);
Protocol.outboundBuffer.p1(57); Protocol.outboundBuffer.p1(57);
Protocol.outboundBuffer.p1(Static59.anInt1814); Protocol.outboundBuffer.p1(MiniMap.anInt1814);
Protocol.outboundBuffer.p1(MiniMap.anInt4130); Protocol.outboundBuffer.p1(MiniMap.anInt4130);
Protocol.outboundBuffer.p1(89); Protocol.outboundBuffer.p1(89);
Protocol.outboundBuffer.p2(PlayerList.self.xFine); Protocol.outboundBuffer.p2(PlayerList.self.xFine);
@ -552,15 +558,15 @@ 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) {
PathFinder.findPathToLoc(local31, local19, local15); PathFinder.findPathToLoc(local31, local19, local15);
Protocol.outboundBuffer.p1isaac(84); Protocol.outboundBuffer.p1isaac(84);
Protocol.outboundBuffer.p2leadd(Integer.MAX_VALUE & (int) (local31 >>> 32)); Protocol.outboundBuffer.p2leadd(Integer.MAX_VALUE & (int) (local31 >>> 32));
Protocol.outboundBuffer.p2leadd(Static142.originZ + local19); Protocol.outboundBuffer.p2leadd(Camera.originZ + local19);
Protocol.outboundBuffer.p2le(local15 + Static225.originX); Protocol.outboundBuffer.p2le(local15 + Camera.originX);
} }
if (local23 == 23) { if (local23 == 23) {
Protocol.outboundBuffer.p1isaac(206); Protocol.outboundBuffer.p1isaac(206);
@ -573,9 +579,9 @@ public class MiniMenu {
} }
if (local23 == 14 && PathFinder.findPathToLoc(local31, local19, local15)) { if (local23 == 14 && PathFinder.findPathToLoc(local31, local19, local15)) {
Protocol.outboundBuffer.p1isaac(134); Protocol.outboundBuffer.p1isaac(134);
Protocol.outboundBuffer.p2add(Static225.originX + local15); Protocol.outboundBuffer.p2add(Camera.originX + local15);
Protocol.outboundBuffer.p2(anInt4997); Protocol.outboundBuffer.p2(anInt4997);
Protocol.outboundBuffer.p2le(local19 + Static142.originZ); Protocol.outboundBuffer.p2le(local19 + Camera.originZ);
Protocol.outboundBuffer.p2(Static185.anInt4370); Protocol.outboundBuffer.p2(Static185.anInt4370);
Protocol.outboundBuffer.p4me(Static224.anInt5062); Protocol.outboundBuffer.p4me(Static224.anInt5062);
Protocol.outboundBuffer.p2add((int) (local31 >>> 32) & Integer.MAX_VALUE); Protocol.outboundBuffer.p2add((int) (local31 >>> 32) & Integer.MAX_VALUE);
@ -619,8 +625,8 @@ public class MiniMenu {
Cross.y = Mouse.clickY; Cross.y = Mouse.clickY;
Protocol.outboundBuffer.p1isaac(228); Protocol.outboundBuffer.p1isaac(228);
Protocol.outboundBuffer.p2(local36); Protocol.outboundBuffer.p2(local36);
Protocol.outboundBuffer.p2le(Static225.originX + local15); Protocol.outboundBuffer.p2le(Camera.originX + local15);
Protocol.outboundBuffer.p2leadd(Static142.originZ + local19); Protocol.outboundBuffer.p2leadd(Camera.originZ + local19);
} }
if (local23 == 4) { if (local23 == 4) {
local192 = NpcList.npcs[local36]; local192 = NpcList.npcs[local36];
@ -635,7 +641,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);
@ -702,8 +708,8 @@ public class MiniMenu {
Cross.y = Mouse.clickY; Cross.y = Mouse.clickY;
Cross.milliseconds = 0; Cross.milliseconds = 0;
Protocol.outboundBuffer.p1isaac(109); Protocol.outboundBuffer.p1isaac(109);
Protocol.outboundBuffer.p2le(local19 + Static142.originZ); Protocol.outboundBuffer.p2le(local19 + Camera.originZ);
Protocol.outboundBuffer.p2(local15 + Static225.originX); Protocol.outboundBuffer.p2(local15 + Camera.originX);
Protocol.outboundBuffer.p2leadd(local36); Protocol.outboundBuffer.p2leadd(local36);
} }
if (local23 == 25) { if (local23 == 25) {
@ -736,7 +742,7 @@ public class MiniMenu {
local1955 = local693.anIntArrayArray4[0][1]; local1955 = local693.anIntArrayArray4[0][1];
if (VarpDomain.activeVarps[local1955] != local693.anIntArray48[0]) { if (VarpDomain.activeVarps[local1955] != local693.anIntArray48[0]) {
VarpDomain.activeVarps[local1955] = local693.anIntArray48[0]; VarpDomain.activeVarps[local1955] = local693.anIntArray48[0];
Static85.refreshMagicVarp(local1955); VarpDomain.refreshMagicVarp(local1955);
} }
} }
} }
@ -762,7 +768,7 @@ public class MiniMenu {
if (local693.anIntArrayArray4 != null && local693.anIntArrayArray4[0][0] == 5) { if (local693.anIntArrayArray4 != null && local693.anIntArrayArray4[0][0] == 5) {
local1955 = local693.anIntArrayArray4[0][1]; local1955 = local693.anIntArrayArray4[0][1];
VarpDomain.activeVarps[local1955] = 1 - VarpDomain.activeVarps[local1955]; VarpDomain.activeVarps[local1955] = 1 - VarpDomain.activeVarps[local1955];
Static85.refreshMagicVarp(local1955); VarpDomain.refreshMagicVarp(local1955);
} }
} }
if (local23 == 33) { if (local23 == 33) {
@ -775,11 +781,11 @@ public class MiniMenu {
Cross.y = Mouse.clickY; Cross.y = Mouse.clickY;
Cross.type = 2; Cross.type = 2;
Protocol.outboundBuffer.p1isaac(101); Protocol.outboundBuffer.p1isaac(101);
Protocol.outboundBuffer.p2leadd(local15 + Static225.originX); Protocol.outboundBuffer.p2leadd(local15 + Camera.originX);
Protocol.outboundBuffer.p2le(Static185.anInt4370); Protocol.outboundBuffer.p2le(Static185.anInt4370);
Protocol.outboundBuffer.p2le(anInt4997); Protocol.outboundBuffer.p2le(anInt4997);
Protocol.outboundBuffer.p2le(local36); Protocol.outboundBuffer.p2le(local36);
Protocol.outboundBuffer.p2leadd(Static142.originZ + local19); Protocol.outboundBuffer.p2leadd(Camera.originZ + local19);
Protocol.outboundBuffer.p4me(Static224.anInt5062); Protocol.outboundBuffer.p4me(Static224.anInt5062);
} }
if (local23 == 1004) { if (local23 == 1004) {
@ -797,16 +803,16 @@ public class MiniMenu {
} else if (local36 == 1) { } else if (local36 == 1) {
Protocol.outboundBuffer.p1isaac(131); Protocol.outboundBuffer.p1isaac(131);
Protocol.outboundBuffer.p4me(anInt2512); Protocol.outboundBuffer.p4me(anInt2512);
Protocol.outboundBuffer.p2add(Static225.originX + local15); Protocol.outboundBuffer.p2add(Camera.originX + local15);
Protocol.outboundBuffer.p2leadd(anInt506); Protocol.outboundBuffer.p2leadd(anInt506);
Protocol.outboundBuffer.p2add(local19 + Static142.originZ); Protocol.outboundBuffer.p2add(local19 + Camera.originZ);
} }
} }
if (local23 == 8) { if (local23 == 8) {
local693 = InterfaceList.getComponent(local19); local693 = InterfaceList.getComponent(local19);
@Pc(2287) boolean local2287 = true; @Pc(2287) boolean local2287 = true;
if (local693.anInt453 > 0) { if (local693.anInt453 > 0) {
local2287 = Static249.method4265(local693); local2287 = method4265(local693);
} }
if (local2287) { if (local2287) {
Protocol.outboundBuffer.p1isaac(10); Protocol.outboundBuffer.p1isaac(10);
@ -851,14 +857,14 @@ public class MiniMenu {
Cross.x = Mouse.clickX; Cross.x = Mouse.clickX;
Cross.milliseconds = 0; Cross.milliseconds = 0;
Protocol.outboundBuffer.p1isaac(48); Protocol.outboundBuffer.p1isaac(48);
Protocol.outboundBuffer.p2add(local15 + Static225.originX); Protocol.outboundBuffer.p2add(local15 + Camera.originX);
Protocol.outboundBuffer.p2leadd(local36); Protocol.outboundBuffer.p2leadd(local36);
Protocol.outboundBuffer.p2le(Static142.originZ + local19); Protocol.outboundBuffer.p2le(Camera.originZ + local19);
} }
if (local23 == 38 && PathFinder.findPathToLoc(local31, local19, local15)) { if (local23 == 38 && PathFinder.findPathToLoc(local31, local19, local15)) {
Protocol.outboundBuffer.p1isaac(233); Protocol.outboundBuffer.p1isaac(233);
Protocol.outboundBuffer.p2leadd(local19 + Static142.originZ); Protocol.outboundBuffer.p2leadd(local19 + Camera.originZ);
Protocol.outboundBuffer.p2add(Static225.originX + local15); Protocol.outboundBuffer.p2add(Camera.originX + local15);
Protocol.outboundBuffer.p2leadd(anInt506); Protocol.outboundBuffer.p2leadd(anInt506);
Protocol.outboundBuffer.p4rme(anInt2512); Protocol.outboundBuffer.p4rme(anInt2512);
Protocol.outboundBuffer.p2add((int) (local31 >>> 32) & Integer.MAX_VALUE); Protocol.outboundBuffer.p2add((int) (local31 >>> 32) & Integer.MAX_VALUE);
@ -894,15 +900,15 @@ public class MiniMenu {
InterfaceList.redraw(local693); InterfaceList.redraw(local693);
aClass100_203 = JagString.concatenate(new JagString[] { aClass100_32, ObjTypeList.get(local36).name, COLOR_WHITE}); aClass100_203 = JagString.concatenate(new JagString[] { aClass100_32, ObjTypeList.get(local36).name, COLOR_WHITE});
if (aClass100_203 == null) { if (aClass100_203 == null) {
aClass100_203 = Static92.NULL; aClass100_203 = NULL;
} }
return; return;
} }
if (local23 == 50) { if (local23 == 50) {
PathFinder.findPathToLoc(local31, local19, local15); PathFinder.findPathToLoc(local31, local19, local15);
Protocol.outboundBuffer.p1isaac(194); Protocol.outboundBuffer.p1isaac(194);
Protocol.outboundBuffer.p2leadd(local19 + Static142.originZ); Protocol.outboundBuffer.p2leadd(local19 + Camera.originZ);
Protocol.outboundBuffer.p2le(Static225.originX + local15); Protocol.outboundBuffer.p2le(Camera.originX + local15);
Protocol.outboundBuffer.p2((int) (local31 >>> 32) & Integer.MAX_VALUE); Protocol.outboundBuffer.p2((int) (local31 >>> 32) & Integer.MAX_VALUE);
} }
if (local23 == 48) { if (local23 == 48) {
@ -946,9 +952,9 @@ public class MiniMenu {
Cross.milliseconds = 0; Cross.milliseconds = 0;
Protocol.outboundBuffer.p1isaac(73); Protocol.outboundBuffer.p1isaac(73);
Protocol.outboundBuffer.p4rme(anInt2512); Protocol.outboundBuffer.p4rme(anInt2512);
Protocol.outboundBuffer.p2(Static142.originZ + local19); Protocol.outboundBuffer.p2(Camera.originZ + local19);
Protocol.outboundBuffer.p2leadd(local36); Protocol.outboundBuffer.p2leadd(local36);
Protocol.outboundBuffer.p2leadd(local15 + Static225.originX); Protocol.outboundBuffer.p2leadd(local15 + Camera.originX);
Protocol.outboundBuffer.p2le(anInt506); Protocol.outboundBuffer.p2le(anInt506);
} }
if (local23 == 12) { if (local23 == 12) {
@ -963,11 +969,11 @@ public class MiniMenu {
Static187.anInt4422 = 1; Static187.anInt4422 = 1;
method3556(Player.level, local15, local19); method3556(Player.level, local15, local19);
} else if (LoginManager.staffModLevel > 0 && Keyboard.pressedKeys[Keyboard.KEY_CTRL] && Keyboard.pressedKeys[Keyboard.KEY_SHIFT]) { } else if (LoginManager.staffModLevel > 0 && Keyboard.pressedKeys[Keyboard.KEY_CTRL] && Keyboard.pressedKeys[Keyboard.KEY_SHIFT]) {
Cheat.teleport(local15 + Static225.originX, Static142.originZ - -local19, Player.level); Cheat.teleport(local15 + Camera.originX, Camera.originZ - -local19, Player.level);
} else { } else {
Protocol.outboundBuffer.p1isaac(179); Protocol.outboundBuffer.p1isaac(179);
Protocol.outboundBuffer.p2(local19 + Static142.originZ); Protocol.outboundBuffer.p2(local19 + Camera.originZ);
Protocol.outboundBuffer.p2(local15 + Static225.originX); Protocol.outboundBuffer.p2(local15 + Camera.originX);
} }
} }
if (local23 == 6) { if (local23 == 6) {
@ -997,8 +1003,8 @@ public class MiniMenu {
Cross.type = 2; Cross.type = 2;
Protocol.outboundBuffer.p1isaac(33); Protocol.outboundBuffer.p1isaac(33);
Protocol.outboundBuffer.p2(local36); Protocol.outboundBuffer.p2(local36);
Protocol.outboundBuffer.p2(Static225.originX + local15); Protocol.outboundBuffer.p2(Camera.originX + local15);
Protocol.outboundBuffer.p2le(Static142.originZ + local19); Protocol.outboundBuffer.p2le(Camera.originZ + local19);
} }
if (local23 == 16) { if (local23 == 16) {
local192 = NpcList.npcs[local36]; local192 = NpcList.npcs[local36];
@ -1058,7 +1064,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 {
@ -1073,7 +1079,7 @@ public class MiniMenu {
} }
@Pc(112) long local112 = -1L; @Pc(112) long local112 = -1L;
for (local15 = 0; local15 < Static2.anInt7; local15++) { for (local15 = 0; local15 < Static2.anInt7; local15++) {
@Pc(121) long local121 = Static259.aLongArray11[local15]; @Pc(121) long local121 = Model.aLongArray11[local15];
x = (int) local121 & 0x7F; x = (int) local121 & 0x7F;
@Pc(133) int local133 = (int) local121 >> 29 & 0x3; @Pc(133) int local133 = (int) local121 >> 29 & 0x3;
@Pc(140) int local140 = (int) (local121 >>> 32) & Integer.MAX_VALUE; @Pc(140) int local140 = (int) (local121 >>> 32) & Integer.MAX_VALUE;
@ -1090,11 +1096,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;
@ -1452,4 +1458,26 @@ public class MiniMenu {
anInt1742 = -1; anInt1742 = -1;
anInt2954 = -1; anInt2954 = -1;
} }
@OriginalMember(owner = "client!wi", name = "c", descriptor = "(II)Z")
public static boolean method4640(@OriginalArg(0) int arg0) {
if (arg0 < 0) {
return false;
}
@Pc(12) int local12 = actions[arg0];
if (local12 >= 2000) {
local12 -= 2000;
}
return local12 == 1003;
}
@OriginalMember(owner = "client!ud", name = "a", descriptor = "(ILclient!be;)Z")
public static boolean method4265(@OriginalArg(1) Component arg0) {
if (arg0.anInt453 == 205) {
Static267.anInt5775 = 250;
return true;
} else {
return false;
}
}
} }

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

@ -8,7 +8,9 @@ import org.openrs2.deob.annotation.Pc;
@OriginalClass("client!ak") @OriginalClass("client!ak")
public abstract class Model extends Entity { public abstract class Model extends Entity {
@OriginalMember(owner = "client!ak", name = "s", descriptor = "Z") @OriginalMember(owner = "client!vc", name = "V", descriptor = "[J")
public static final long[] aLongArray11 = new long[1000];
@OriginalMember(owner = "client!ak", name = "s", descriptor = "Z")
public boolean aBoolean303 = false; public boolean aBoolean303 = false;
@OriginalMember(owner = "client!ak", name = "a", descriptor = "([[III)I") @OriginalMember(owner = "client!ak", name = "a", descriptor = "([[III)I")

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

@ -48,7 +48,9 @@ public final class Mouse implements MouseListener, MouseMotionListener, FocusLis
public static volatile int anInt3521 = -1; public static volatile int anInt3521 = -1;
@OriginalMember(owner = "client!sa", name = "Y", descriptor = "I") @OriginalMember(owner = "client!sa", name = "Y", descriptor = "I")
public static volatile int anInt4973 = 0; public static volatile int anInt4973 = 0;
public int mouseWheelX; @OriginalMember(owner = "client!wi", name = "W", descriptor = "I")
public static int anInt5850 = 0;
public int mouseWheelX;
public int mouseWheelY; public int mouseWheelY;
@OriginalMember(owner = "client!sc", name = "a", descriptor = "(ILjava/awt/Component;)V") @OriginalMember(owner = "client!sc", name = "a", descriptor = "(ILjava/awt/Component;)V")

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 {

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

@ -35,7 +35,7 @@ public final class MsiType {
return local17; return local17;
} }
MsiTypeList.spritesArchive.isFileReady(this.spriteId); MsiTypeList.spritesArchive.isFileReady(this.spriteId);
local17 = Static164.loadSoftwareIndexedSprite(this.spriteId, MsiTypeList.spritesArchive); local17 = SpriteLoader.loadSoftwareIndexedSprite(this.spriteId, MsiTypeList.spritesArchive);
if (local17 != null) { if (local17 != null) {
local17.adjustPalette(MsiTypeList.redDelta, MsiTypeList.greenDelta, MsiTypeList.blueDelta); local17.adjustPalette(MsiTypeList.redDelta, MsiTypeList.greenDelta, MsiTypeList.blueDelta);
local17.innerWidth = local17.width; local17.innerWidth = local17.width;

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

@ -93,8 +93,8 @@ public final class Npc extends PathingEntity {
if (Static101.anInt2640 != 0) { if (Static101.anInt2640 != 0) {
model.rotateX(Static101.anInt2640); model.rotateX(Static101.anInt2640);
} }
if (Static102.anInt2680 != 0) { if (PathingEntity.anInt2680 != 0) {
model.rotateZ(Static102.anInt2680); model.rotateZ(PathingEntity.anInt2680);
} }
if (Static62.anInt1938 != 0) { if (Static62.anInt1938 != 0) {
model.translate(0, Static62.anInt1938, 0); model.translate(0, Static62.anInt1938, 0);

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

@ -331,8 +331,8 @@ public class NpcList {
} }
} }
if ((arg0.faceX != 0 || arg0.faceY != 0) && (arg0.movementQueueSize == 0 || arg0.anInt3417 > 0)) { if ((arg0.faceX != 0 || arg0.faceY != 0) && (arg0.movementQueueSize == 0 || arg0.anInt3417 > 0)) {
local70 = arg0.xFine - (arg0.faceX - Static225.originX - Static225.originX) * 64; local70 = arg0.xFine - (arg0.faceX - Camera.originX - Camera.originX) * 64;
local43 = arg0.zFine - (arg0.faceY - Static142.originZ - Static142.originZ) * 64; local43 = arg0.zFine - (arg0.faceY - Camera.originZ - Camera.originZ) * 64;
if (local70 != 0 || local43 != 0) { if (local70 != 0 || local43 != 0) {
arg0.anInt3400 = (int) (Math.atan2((double) local70, (double) local43) * 325.949D) & 0x7FF; arg0.anInt3400 = (int) (Math.atan2((double) local70, (double) local43) * 325.949D) & 0x7FF;
} }

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];
} }

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

@ -12,7 +12,9 @@ public abstract class PathingEntity extends Entity {
public static final int[] ANGLES = new int[] { 768, 1024, 1280, 512, 1536, 256, 0, 1792 }; public static final int[] ANGLES = new int[] { 768, 1024, 1280, 512, 1536, 256, 0, 1792 };
@OriginalMember(owner = "client!ac", name = "l", descriptor = "Lclient!ck;") @OriginalMember(owner = "client!ac", name = "l", descriptor = "Lclient!ck;")
public static final BasType aClass20_1 = new BasType(); public static final BasType aClass20_1 = new BasType();
@OriginalMember(owner = "client!fe", name = "A", descriptor = "I") @OriginalMember(owner = "client!hn", name = "Y", descriptor = "I")
public static int anInt2680 = 0;
@OriginalMember(owner = "client!fe", name = "A", descriptor = "I")
public int spotAnimStart; public int spotAnimStart;
@OriginalMember(owner = "client!fe", name = "S", descriptor = "I") @OriginalMember(owner = "client!fe", name = "S", descriptor = "I")
@ -300,7 +302,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();
} }
} }
@ -354,7 +356,7 @@ public abstract class PathingEntity extends Entity {
@OriginalMember(owner = "client!fe", name = "a", descriptor = "(BLclient!ak;I)V") @OriginalMember(owner = "client!fe", name = "a", descriptor = "(BLclient!ak;I)V")
protected final void method2685(@OriginalArg(1) Model arg0, @OriginalArg(2) int arg1) { protected final void method2685(@OriginalArg(1) Model arg0, @OriginalArg(2) int arg1) {
Static102.anInt2680 = 0; anInt2680 = 0;
Static101.anInt2640 = 0; Static101.anInt2640 = 0;
Static62.anInt1938 = 0; Static62.anInt1938 = 0;
@Pc(21) BasType local21 = this.getBasType(); @Pc(21) BasType local21 = this.getBasType();
@ -393,9 +395,9 @@ public abstract class PathingEntity extends Entity {
if (Static101.anInt2640 != 0) { if (Static101.anInt2640 != 0) {
arg0.rotateX(Static101.anInt2640); arg0.rotateX(Static101.anInt2640);
} }
Static102.anInt2680 = (int) (Math.atan2((double) (local245 - local238), (double) local24) * 325.95D) & 0x7FF; anInt2680 = (int) (Math.atan2((double) (local245 - local238), (double) local24) * 325.95D) & 0x7FF;
if (Static102.anInt2680 != 0) { if (anInt2680 != 0) {
arg0.rotateZ(Static102.anInt2680); arg0.rotateZ(anInt2680);
} }
Static62.anInt1938 = local224 + local87; Static62.anInt1938 = local224 + local87;
if (local201 + local134 < Static62.anInt1938) { if (local201 + local134 < Static62.anInt1938) {

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

@ -180,8 +180,8 @@ public final class Player extends PathingEntity {
@OriginalMember(owner = "client!um", name = "a", descriptor = "(Z)V") @OriginalMember(owner = "client!um", name = "a", descriptor = "(Z)V")
public static void setTutorialIsland() { public static void setTutorialIsland() {
inTutorialIsland = 0; inTutorialIsland = 0;
@Pc(17) int local17 = Static225.originX + (PlayerList.self.xFine >> 7); @Pc(17) int local17 = Camera.originX + (PlayerList.self.xFine >> 7);
@Pc(25) int local25 = (PlayerList.self.zFine >> 7) + Static142.originZ; @Pc(25) int local25 = (PlayerList.self.zFine >> 7) + Camera.originZ;
if (local17 >= 3053 && local17 <= 3156 && local25 >= 3056 && local25 <= 3136) { if (local17 >= 3053 && local17 <= 3156 && local25 >= 3056 && local25 <= 3136) {
inTutorialIsland = 1; inTutorialIsland = 1;
} }
@ -363,8 +363,8 @@ public final class Player extends PathingEntity {
} }
} }
if (local245.type == 2) { if (local245.type == 2) {
@Pc(340) int local340 = (local245.targetX - Static225.originX) * 4 + 2 - PlayerList.self.xFine / 32; @Pc(340) int local340 = (local245.targetX - Camera.originX) * 4 + 2 - PlayerList.self.xFine / 32;
local291 = (local245.anInt4046 - Static142.originZ) * 4 + 2 - PlayerList.self.zFine / 32; local291 = (local245.anInt4046 - Camera.originZ) * 4 + 2 - PlayerList.self.zFine / 32;
this.method1263(null, local291, local76, local340, arg5, arg9, arg0, arg7, arg4, arg3, arg1, local245.playerModelId, arg2, arg6); this.method1263(null, local291, local76, local340, arg5, arg9, arg0, arg7, arg4, arg3, arg1, local245.playerModelId, arg2, arg6);
} }
if (local245.type == 10 && local245.actorTargetId >= 0 && PlayerList.players.length > local245.actorTargetId) { if (local245.type == 10 && local245.actorTargetId >= 0 && PlayerList.players.length > local245.actorTargetId) {
@ -390,8 +390,8 @@ public final class Player extends PathingEntity {
if (Static101.anInt2640 != 0) { if (Static101.anInt2640 != 0) {
local184.rotateX(Static101.anInt2640); local184.rotateX(Static101.anInt2640);
} }
if (Static102.anInt2680 != 0) { if (PathingEntity.anInt2680 != 0) {
local184.rotateZ(Static102.anInt2680); local184.rotateZ(PathingEntity.anInt2680);
} }
if (Static62.anInt1938 != 0) { if (Static62.anInt1938 != 0) {
local184.translate(0, Static62.anInt1938, 0); local184.translate(0, Static62.anInt1938, 0);
@ -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;
} }

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

@ -38,6 +38,12 @@ 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!wh", name = "j", descriptor = "[Lclient!cl;")
public static final AnimFrameset[] aClass3_Sub2_Sub7Array8 = new AnimFrameset[14];
@OriginalMember(owner = "client!vf", name = "g", descriptor = "[I")
public static final int[] anIntArray515 = new int[14];
@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")
@ -141,7 +147,7 @@ public final class PlayerAppearance {
} }
@OriginalMember(owner = "client!hh", name = "a", descriptor = "(ZZ)V") @OriginalMember(owner = "client!hh", name = "a", descriptor = "(ZZ)V")
public final void method1948(@OriginalArg(0) boolean arg0) { public final void setFemale(@OriginalArg(0) boolean arg0) {
this.gender = arg0; this.gender = arg0;
this.method1947(); this.method1947();
} }
@ -157,7 +163,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;
} }
@ -172,7 +178,7 @@ public final class PlayerAppearance {
} }
@OriginalMember(owner = "client!hh", name = "a", descriptor = "(IZI)V") @OriginalMember(owner = "client!hh", name = "a", descriptor = "(IZI)V")
public final void method1951(@OriginalArg(0) int arg0, @OriginalArg(2) int arg1) { public final void setBaseColor(@OriginalArg(0) int arg0, @OriginalArg(2) int arg1) {
this.anIntArray236[arg0] = arg1; this.anIntArray236[arg0] = arg1;
this.method1947(); this.method1947();
} }
@ -364,16 +370,16 @@ public final class PlayerAppearance {
local374 = arg0[local353].anInt5399; local374 = arg0[local353].anInt5399;
local367 = arg0[local353].anInt5398; local367 = arg0[local353].anInt5398;
local381 = local858.frames[local374]; local381 = local858.frames[local374];
Static276.aClass3_Sub2_Sub7Array8[local353] = SeqTypeList.getAnimFrameset(local381 >>> 16); aClass3_Sub2_Sub7Array8[local353] = SeqTypeList.getAnimFrameset(local381 >>> 16);
local381 &= 0xFFFF; local381 &= 0xFFFF;
Static241.anIntArray520[local353] = local381; Static241.anIntArray520[local353] = local381;
if (Static276.aClass3_Sub2_Sub7Array8[local353] != null) { if (aClass3_Sub2_Sub7Array8[local353] != null) {
local836 |= Static276.aClass3_Sub2_Sub7Array8[local353].isColorTransformed(local381); local836 |= aClass3_Sub2_Sub7Array8[local353].isColorTransformed(local381);
local827 |= Static276.aClass3_Sub2_Sub7Array8[local353].isAlphaTransformed(local381); local827 |= aClass3_Sub2_Sub7Array8[local353].isAlphaTransformed(local381);
local838 |= local858.aBoolean278; local838 |= local858.aBoolean278;
} }
if ((local858.tween || SeqType.applyTweening) && local367 != -1 && local367 < local858.frames.length) { if ((local858.tween || SeqType.applyTweening) && local367 != -1 && local367 < local858.frames.length) {
Static262.anIntArray515[local353] = local858.anIntArray474[local374]; anIntArray515[local353] = local858.anIntArray474[local374];
Static73.anIntArray183[local353] = arg0[local353].anInt5404; Static73.anIntArray183[local353] = arg0[local353].anInt5404;
local979 = local858.frames[local367]; local979 = local858.frames[local367];
Static133.aClass3_Sub2_Sub7Array7[local353] = SeqTypeList.getAnimFrameset(local979 >>> 16); Static133.aClass3_Sub2_Sub7Array7[local353] = SeqTypeList.getAnimFrameset(local979 >>> 16);
@ -384,7 +390,7 @@ public final class PlayerAppearance {
local827 |= Static133.aClass3_Sub2_Sub7Array7[local353].isAlphaTransformed(local991); local827 |= Static133.aClass3_Sub2_Sub7Array7[local353].isAlphaTransformed(local991);
} }
} else { } else {
Static262.anIntArray515[local353] = 0; anIntArray515[local353] = 0;
Static73.anIntArray183[local353] = 0; Static73.anIntArray183[local353] = 0;
Static133.aClass3_Sub2_Sub7Array7[local353] = null; Static133.aClass3_Sub2_Sub7Array7[local353] = null;
anIntArray187[local353] = -1; anIntArray187[local353] = -1;
@ -461,8 +467,8 @@ public final class PlayerAppearance {
local481 = 0; local481 = 0;
local598 = 1; local598 = 1;
while (local481 < local346) { while (local481 < local346) {
if (Static276.aClass3_Sub2_Sub7Array8[local481] != null) { if (aClass3_Sub2_Sub7Array8[local481] != null) {
local1284.method4565(Static276.aClass3_Sub2_Sub7Array8[local481], Static241.anIntArray520[local481], Static133.aClass3_Sub2_Sub7Array7[local481], anIntArray187[local481], Static73.anIntArray183[local481] - 1, Static262.anIntArray515[local481], local598, aClass144Array2[local481].aBoolean278, this.anIntArrayArray19[local481]); local1284.method4565(aClass3_Sub2_Sub7Array8[local481], Static241.anIntArray520[local481], Static133.aClass3_Sub2_Sub7Array7[local481], anIntArray187[local481], Static73.anIntArray183[local481] - 1, anIntArray515[local481], local598, aClass144Array2[local481].aBoolean278, this.anIntArrayArray19[local481]);
} }
local481++; local481++;
local598 <<= 0x1; local598 <<= 0x1;
@ -475,7 +481,7 @@ public final class PlayerAppearance {
local1284.method4558(local1154, local979, local1156, local451, arg4 - 1, local457, arg2.aBoolean278); local1284.method4558(local1154, local979, local1156, local451, arg4 - 1, local457, arg2.aBoolean278);
} }
for (local481 = 0; local481 < local346; local481++) { for (local481 = 0; local481 < local346; local481++) {
Static276.aClass3_Sub2_Sub7Array8[local481] = null; aClass3_Sub2_Sub7Array8[local481] = null;
Static133.aClass3_Sub2_Sub7Array7[local481] = null; Static133.aClass3_Sub2_Sub7Array7[local481] = null;
aClass144Array2[local481] = null; aClass144Array2[local481] = null;
} }

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;
} }

214
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() {
@ -145,7 +147,7 @@ public class Protocol {
if (local218 == 65535) { if (local218 == 65535) {
local218 = -1; local218 = -1;
} }
Static92.method1881(Player.level, local39, local31, local19, local45, local23, local218); SceneGraph.method1881(Player.level, local39, local31, local19, local45, local23, local218);
} else if (opcode == ServerProt.LOCATION_PACKET_202) { } else if (opcode == ServerProt.LOCATION_PACKET_202) {
int local15 = inboundBuffer.g1(); int local15 = inboundBuffer.g1();
int local23 = local15 >> 2; int local23 = local15 >> 2;
@ -162,7 +164,7 @@ public class Protocol {
int local247 = inboundBuffer.g2(); int local247 = inboundBuffer.g2();
int local633 = inboundBuffer.g2lesadd(); int local633 = inboundBuffer.g2lesadd();
if (!GlRenderer.enabled) { if (!GlRenderer.enabled) {
Static170.method2574(local625, local247, local633, local232, local39, local613, local19, local605, local31, local23, local609, local228); SceneGraph.method2574(local625, local247, local633, local232, local39, local613, local19, local605, local31, local23, local609, local228);
} }
} else if (opcode == ServerProt.LOCATION_PACKET_14) { } else if (opcode == ServerProt.LOCATION_PACKET_14) {
int local15 = inboundBuffer.g1(); int local15 = inboundBuffer.g1();
@ -350,27 +352,27 @@ public class Protocol {
if (!Static230.dynamicMapRegion) { if (!Static230.dynamicMapRegion) {
local13 = inboundBuffer.g2sub(); local13 = inboundBuffer.g2sub();
local20 = (length - inboundBuffer.offset) / 16; local20 = (length - inboundBuffer.offset) / 16;
Static72.regionsXteaKeys = new int[local20][4]; LoginManager.regionsXteaKeys = new int[local20][4];
for (local26 = 0; local26 < local20; local26++) { for (local26 = 0; local26 < local20; local26++) {
for (local31 = 0; local31 < 4; local31++) { for (local31 = 0; local31 < 4; local31++) {
Static72.regionsXteaKeys[local26][local31] = inboundBuffer.g4me(); LoginManager.regionsXteaKeys[local26][local31] = inboundBuffer.g4me();
} }
} }
local26 = inboundBuffer.g1ssub(); local26 = inboundBuffer.g1ssub();
local31 = inboundBuffer.g2(); local31 = inboundBuffer.g2();
local60 = inboundBuffer.g2sub(); local60 = inboundBuffer.g2sub();
local64 = inboundBuffer.g2sub(); local64 = inboundBuffer.g2sub();
Static238.regionBitPacked = new int[local20]; LoginManager.regionBitPacked = new int[local20];
Static273.mapFilesBuffer = new byte[local20][]; LoginManager.mapFilesBuffer = new byte[local20][];
Static191.npcSpawnsFilesBuffer = null; LoginManager.npcSpawnsFilesBuffer = null;
Static99.underWaterMapFileIds = new int[local20]; LoginManager.underWaterMapFileIds = new int[local20];
Static156.locationMapFilesBuffer = new byte[local20][]; LoginManager.locationMapFilesBuffer = new byte[local20][];
Static19.underWaterLocationsMapFilesBuffer = new byte[local20][]; LoginManager.underWaterLocationsMapFilesBuffer = new byte[local20][];
Static175.npcSpawnsFileIds = null; LoginManager.npcSpawnsFileIds = null;
Static36.mapFileIds = new int[local20]; LoginManager.mapFileIds = new int[local20];
Static186.underWaterMapFilesBuffer = new byte[local20][]; LoginManager.underWaterMapFilesBuffer = new byte[local20][];
Static172.locationsMapFileIds = new int[local20]; LoginManager.locationsMapFileIds = new int[local20];
Static35.underWaterLocationsMapFileIds = new int[local20]; LoginManager.underWaterLocationsMapFileIds = new int[local20];
local20 = 0; local20 = 0;
@Pc(100) boolean local100 = false; @Pc(100) boolean local100 = false;
if ((local31 / 8 == 48 || local31 / 8 == 49) && local60 / 8 == 48) { if ((local31 / 8 == 48 || local31 / 8 == 49) && local60 / 8 == 48) {
@ -383,22 +385,22 @@ public class Protocol {
for (local151 = (local60 - 6) / 8; local151 <= (local60 + 6) / 8; local151++) { for (local151 = (local60 - 6) / 8; local151 <= (local60 + 6) / 8; local151++) {
local169 = (local138 << 8) + local151; local169 = (local138 << 8) + local151;
if (local100 && (local151 == 49 || local151 == 149 || local151 == 147 || local138 == 50 || local138 == 49 && local151 == 47)) { if (local100 && (local151 == 49 || local151 == 149 || local151 == 147 || local138 == 50 || local138 == 49 && local151 == 47)) {
Static238.regionBitPacked[local20] = local169; LoginManager.regionBitPacked[local20] = local169;
Static36.mapFileIds[local20] = -1; LoginManager.mapFileIds[local20] = -1;
Static172.locationsMapFileIds[local20] = -1; LoginManager.locationsMapFileIds[local20] = -1;
Static99.underWaterMapFileIds[local20] = -1; LoginManager.underWaterMapFileIds[local20] = -1;
Static35.underWaterLocationsMapFileIds[local20] = -1; LoginManager.underWaterLocationsMapFileIds[local20] = -1;
} else { } else {
Static238.regionBitPacked[local20] = local169; LoginManager.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) })); LoginManager.mapFileIds[local20] = client.js5Archive5.getGroupId(JagString.concatenate(new JagString[] { LoginManager.aClass100_558, JagString.parseInt(local138), LoginManager.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) })); LoginManager.locationsMapFileIds[local20] = client.js5Archive5.getGroupId(JagString.concatenate(new JagString[] { LoginManager.aClass100_1090, JagString.parseInt(local138), LoginManager.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) })); LoginManager.underWaterMapFileIds[local20] = client.js5Archive5.getGroupId(JagString.concatenate(new JagString[] { LoginManager.aClass100_772, JagString.parseInt(local138), LoginManager.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) })); LoginManager.underWaterLocationsMapFileIds[local20] = client.js5Archive5.getGroupId(JagString.concatenate(new JagString[] { LoginManager.aClass100_1103, JagString.parseInt(local138), LoginManager.UNDERSCORE, JagString.parseInt(local151) }));
} }
local20++; local20++;
} }
} }
Static127.method2463(local26, local60, local31, local64, false, local13); LoginManager.method2463(local26, local60, local31, local64, false, local13);
return; return;
} }
local13 = inboundBuffer.g2leadd(); local13 = inboundBuffer.g2leadd();
@ -421,24 +423,24 @@ public class Protocol {
} }
inboundBuffer.accessBytes(); inboundBuffer.accessBytes();
local60 = (length - inboundBuffer.offset) / 16; local60 = (length - inboundBuffer.offset) / 16;
Static72.regionsXteaKeys = new int[local60][4]; LoginManager.regionsXteaKeys = new int[local60][4];
for (local64 = 0; local64 < local60; local64++) { for (local64 = 0; local64 < local60; local64++) {
for (local391 = 0; local391 < 4; local391++) { for (local391 = 0; local391 < 4; local391++) {
Static72.regionsXteaKeys[local64][local391] = inboundBuffer.g4me(); LoginManager.regionsXteaKeys[local64][local391] = inboundBuffer.g4me();
} }
} }
local64 = inboundBuffer.g2(); local64 = inboundBuffer.g2();
Static35.underWaterLocationsMapFileIds = new int[local60]; LoginManager.underWaterLocationsMapFileIds = new int[local60];
Static172.locationsMapFileIds = new int[local60]; LoginManager.locationsMapFileIds = new int[local60];
Static36.mapFileIds = new int[local60]; LoginManager.mapFileIds = new int[local60];
Static19.underWaterLocationsMapFilesBuffer = new byte[local60][]; LoginManager.underWaterLocationsMapFilesBuffer = new byte[local60][];
Static175.npcSpawnsFileIds = null; LoginManager.npcSpawnsFileIds = null;
Static99.underWaterMapFileIds = new int[local60]; LoginManager.underWaterMapFileIds = new int[local60];
Static156.locationMapFilesBuffer = new byte[local60][]; LoginManager.locationMapFilesBuffer = new byte[local60][];
Static273.mapFilesBuffer = new byte[local60][]; LoginManager.mapFilesBuffer = new byte[local60][];
Static238.regionBitPacked = new int[local60]; LoginManager.regionBitPacked = new int[local60];
Static191.npcSpawnsFilesBuffer = null; LoginManager.npcSpawnsFilesBuffer = null;
Static186.underWaterMapFilesBuffer = new byte[local60][]; LoginManager.underWaterMapFilesBuffer = new byte[local60][];
local60 = 0; local60 = 0;
for (local391 = 0; local391 < 4; local391++) { for (local391 = 0; local391 < 4; local391++) {
for (local138 = 0; local138 < 13; local138++) { for (local138 = 0; local138 < 13; local138++) {
@ -450,26 +452,26 @@ public class Protocol {
@Pc(571) int local571 = local561 / 8 + (local555 / 8 << 8); @Pc(571) int local571 = local561 / 8 + (local555 / 8 << 8);
@Pc(573) int local573; @Pc(573) int local573;
for (local573 = 0; local573 < local60; local573++) { for (local573 = 0; local573 < local60; local573++) {
if (local571 == Static238.regionBitPacked[local573]) { if (local571 == LoginManager.regionBitPacked[local573]) {
local571 = -1; local571 = -1;
break; break;
} }
} }
if (local571 != -1) { if (local571 != -1) {
Static238.regionBitPacked[local60] = local571; LoginManager.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) })); LoginManager.mapFileIds[local60] = client.js5Archive5.getGroupId(JagString.concatenate(new JagString[] { LoginManager.aClass100_558, JagString.parseInt(local573), LoginManager.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) })); LoginManager.locationsMapFileIds[local60] = client.js5Archive5.getGroupId(JagString.concatenate(new JagString[] { LoginManager.aClass100_1090, JagString.parseInt(local573), LoginManager.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) })); LoginManager.underWaterMapFileIds[local60] = client.js5Archive5.getGroupId(JagString.concatenate(new JagString[] { LoginManager.aClass100_772, JagString.parseInt(local573), LoginManager.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) })); LoginManager.underWaterLocationsMapFileIds[local60] = client.js5Archive5.getGroupId(JagString.concatenate(new JagString[] { LoginManager.aClass100_1103, JagString.parseInt(local573), LoginManager.UNDERSCORE, JagString.parseInt(local609) }));
local60++; local60++;
} }
} }
} }
} }
} }
Static127.method2463(local26, local64, local20, local31, false, local13); LoginManager.method2463(local26, local64, local20, local31, false, local13);
} }
@OriginalMember(owner = "client!gk", name = "a", descriptor = "(IIBLclient!e;)V") @OriginalMember(owner = "client!gk", name = "a", descriptor = "(IIBLclient!e;)V")
@ -1034,7 +1036,7 @@ public class Protocol {
return true; return true;
} else if (opcode == ServerProt.CLEAR_MINIMAP_FLAG) { } else if (opcode == ServerProt.CLEAR_MINIMAP_FLAG) {
opcode = -1; opcode = -1;
Static115.mapFlagX = 0; LoginManager.mapFlagX = 0;
return true; return true;
} else if (opcode == ServerProt.IF_SETSCROLLPOS) { } else if (opcode == ServerProt.IF_SETSCROLLPOS) {
int id = inboundBuffer.g4me(); int id = inboundBuffer.g4me();
@ -1178,7 +1180,7 @@ public class Protocol {
int optId = inboundBuffer.g1(); int optId = inboundBuffer.g1();
JagString option = inboundBuffer.gjstr(); JagString option = inboundBuffer.gjstr();
if (optId >= 1 && optId <= 8) { if (optId >= 1 && optId <= 8) {
if (option.equalsIgnoreCase(Static92.NULL)) { if (option.equalsIgnoreCase(MiniMenu.NULL)) {
option = null; option = null;
} }
Player.options[optId - 1] = option; Player.options[optId - 1] = option;
@ -1234,7 +1236,7 @@ public class Protocol {
opcode = -1; opcode = -1;
return true; return true;
} else if (opcode == ServerProt.UPDATE_UID192) { } else if (opcode == ServerProt.UPDATE_UID192) {
Static271.writeRandom(inboundBuffer); writeRandom(inboundBuffer);
opcode = -1; opcode = -1;
return true; return true;
} else if (opcode == ServerProt.RESET_CLIENT_VARCACHE) { } else if (opcode == ServerProt.RESET_CLIENT_VARCACHE) {
@ -1251,7 +1253,7 @@ public class Protocol {
int step = inboundBuffer.g1(); int step = inboundBuffer.g1();
int dur = inboundBuffer.g1(); int dur = inboundBuffer.g1();
setVerifyId(tracknum); setVerifyId(tracknum);
Static260.method3849(cy, tz, step, tx, dur); Camera.method3849(cy, tz, step, tx, dur);
opcode = -1; opcode = -1;
return true; return true;
} else if (opcode == ServerProt.IF_SETANIM) { } else if (opcode == ServerProt.IF_SETANIM) {
@ -1364,8 +1366,8 @@ public class Protocol {
} }
} else { } else {
int plane = target >> 28 & 0x3; int plane = target >> 28 & 0x3;
int posX = (target >> 14 & 0x3FFF) - Static225.originX; int posX = (target >> 14 & 0x3FFF) - Camera.originX;
int posZ = (target & 0x3FFF) - Static142.originZ; int posZ = (target & 0x3FFF) - Camera.originZ;
if (posX >= 0 && posZ >= 0 && posX < 104 && posZ < 104) { if (posX >= 0 && posZ >= 0 && posX < 104 && posZ < 104) {
posZ = posZ * 128 + 64; posZ = posZ * 128 + 64;
posX = posX * 128 + 64; posX = posX * 128 + 64;
@ -1425,9 +1427,9 @@ public class Protocol {
setVerifyId(tracknum); setVerifyId(tracknum);
Camera.yawTarget = yaw; Camera.yawTarget = yaw;
Camera.pitchTarget = pitch; Camera.pitchTarget = pitch;
if (Static227.cameraType == 2) { if (Camera.cameraType == 2) {
Static240.cameraPitch = (int)Camera.pitchTarget; Camera.cameraPitch = (int)Camera.pitchTarget;
Static184.cameraYaw = (int)Camera.yawTarget; Camera.cameraYaw = (int)Camera.yawTarget;
} }
Camera.clampCameraAngle(); Camera.clampCameraAngle();
opcode = -1; opcode = -1;
@ -1580,7 +1582,7 @@ public class Protocol {
for (int i = 0; i < VarpDomain.activeVarps.length; i++) { for (int i = 0; i < VarpDomain.activeVarps.length; i++) {
if (VarpDomain.varp[i] != VarpDomain.activeVarps[i]) { if (VarpDomain.varp[i] != VarpDomain.activeVarps[i]) {
VarpDomain.activeVarps[i] = VarpDomain.varp[i]; VarpDomain.activeVarps[i] = VarpDomain.varp[i];
Static85.refreshMagicVarp(i); VarpDomain.refreshMagicVarp(i);
VarpDomain.updatedVarps[VarpDomain.updatedVarpsWriterIndex++ & 0x1F] = i; VarpDomain.updatedVarps[VarpDomain.updatedVarpsWriterIndex++ & 0x1F] = i;
} }
} }
@ -1594,7 +1596,7 @@ public class Protocol {
int local1146 = inboundBuffer.g1(); int local1146 = inboundBuffer.g1();
int local277 = inboundBuffer.g1(); int local277 = inboundBuffer.g1();
setVerifyId(tracknum); setVerifyId(tracknum);
Static141.method2722(true, local1146, counter, local277, modelId, local786); Camera.method2722(true, local1146, counter, local277, modelId, local786);
opcode = -1; opcode = -1;
return true; return true;
} else if (opcode == ServerProt.MESSAGE_QUICKCHAT_PRIVATE) { } else if (opcode == ServerProt.MESSAGE_QUICKCHAT_PRIVATE) {
@ -1679,9 +1681,9 @@ 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; Camera.cameraAmplitude[cameraId] = amplitude;
Static202.cameraFrequency[cameraId] = frequency; Camera.cameraFrequency[cameraId] = frequency;
Static31.anIntArray76[cameraId] = shake4; Static31.anIntArray76[cameraId] = shake4;
opcode = -1; opcode = -1;
return true; return true;
@ -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);
@ -1779,7 +1781,7 @@ public class Protocol {
} else if (opcode == ServerProt.VARBIT_SMALL) { } else if (opcode == ServerProt.VARBIT_SMALL) {
int value = inboundBuffer.g1add(); int value = inboundBuffer.g1add();
int id = inboundBuffer.g2le(); int id = inboundBuffer.g2le();
Static272.setVarbit(value, id); VarpDomain.setVarbit(value, id);
opcode = -1; opcode = -1;
return true; return true;
} else if (opcode == ServerProt.IF_OPENTOP) { } else if (opcode == ServerProt.IF_OPENTOP) {
@ -1886,10 +1888,10 @@ public class Protocol {
} }
int z = pos & 0x3FFF; int z = pos & 0x3FFF;
int x = pos >> 14 & 0x3FFF; int x = pos >> 14 & 0x3FFF;
x -= Static225.originX; x -= Camera.originX;
z -= Static142.originZ; z -= Camera.originZ;
int plane = pos >> 28 & 0x3; int plane = pos >> 28 & 0x3;
Static92.method1881(plane, rotation, type, z, type2, x, seqId); SceneGraph.method1881(plane, rotation, type, z, type2, x, seqId);
opcode = -1; opcode = -1;
return true; return true;
} else if (opcode == ServerProt.MESSAGE_PRIVATE) { } else if (opcode == ServerProt.MESSAGE_PRIVATE) {
@ -2018,7 +2020,7 @@ public class Protocol {
} else if (opcode == ServerProt.VARBIT_LARGE) { } else if (opcode == ServerProt.VARBIT_LARGE) {
int value = inboundBuffer.g4le(); int value = inboundBuffer.g4le();
int id = inboundBuffer.g2leadd(); int id = inboundBuffer.g2leadd();
Static272.setVarbit(value, id); VarpDomain.setVarbit(value, id);
opcode = -1; opcode = -1;
return true; return true;
} else if (opcode == ServerProt.UPDATE_INV_PARTIAL) { } else if (opcode == ServerProt.UPDATE_INV_PARTIAL) {
@ -2059,11 +2061,11 @@ public class Protocol {
} else if (opcode == ServerProt.CAM_RESET) { } else if (opcode == ServerProt.CAM_RESET) {
int tracknum = inboundBuffer.g2(); int tracknum = inboundBuffer.g2();
setVerifyId(tracknum); setVerifyId(tracknum);
Static35.resetCameraEffects(); Camera.resetCameraEffects();
opcode = -1; opcode = -1;
return true; return true;
} else if (opcode == ServerProt.LOGOUT) { } else if (opcode == ServerProt.LOGOUT) {
Static278.processLogout(); LoginManager.processLogout();
opcode = -1; opcode = -1;
return false; return false;
} else if (opcode == ServerProt.GRAND_EXCHANGE_OFFERS) { } else if (opcode == ServerProt.GRAND_EXCHANGE_OFFERS) {
@ -2294,7 +2296,7 @@ public class Protocol {
return true; return true;
} else { } else {
TracingException.report("T1 - " + opcode + "," + opcode3 + "," + opcode4 + " - " + length, null); TracingException.report("T1 - " + opcode + "," + opcode3 + "," + opcode4 + " - " + length, null);
Static278.processLogout(); LoginManager.processLogout();
return true; return true;
} }
} }
@ -2307,12 +2309,12 @@ public class Protocol {
Static175.method3279(); Static175.method3279();
return true; return true;
} catch (@Pc(19) Exception local19) { } catch (@Pc(19) Exception local19) {
@Pc(61) String local61 = "T2 - " + opcode + "," + opcode3 + "," + opcode4 + " - " + length + "," + (Static225.originX + PlayerList.self.movementQueueX[0]) + "," + (PlayerList.self.movementQueueZ[0] + Static142.originZ) + " - "; @Pc(61) String local61 = "T2 - " + opcode + "," + opcode3 + "," + opcode4 + " - " + length + "," + (Camera.originX + PlayerList.self.movementQueueX[0]) + "," + (PlayerList.self.movementQueueZ[0] + Camera.originZ) + " - ";
for (@Pc(63) int local63 = 0; local63 < length && local63 < 50; local63++) { for (@Pc(63) int local63 = 0; local63 < length && local63 < 50; local63++) {
local61 = local61 + inboundBuffer.data[local63] + ","; local61 = local61 + inboundBuffer.data[local63] + ",";
} }
TracingException.report(local61, local19); TracingException.report(local61, local19);
Static278.processLogout(); LoginManager.processLogout();
return true; return true;
} }
} }
@ -2506,7 +2508,7 @@ public class Protocol {
} }
// VarpDomain // VarpDomain
for (i = Static38.poll(true); i != -1; i = Static38.poll(false)) { for (i = Static38.poll(true); i != -1; i = Static38.poll(false)) {
Static85.refreshMagicVarp(i); VarpDomain.refreshMagicVarp(i);
VarpDomain.updatedVarps[VarpDomain.updatedVarpsWriterIndex++ & 0x1F] = i; VarpDomain.updatedVarps[VarpDomain.updatedVarpsWriterIndex++ & 0x1F] = i;
} }
@Pc(782) int modelId; @Pc(782) int modelId;
@ -2684,7 +2686,7 @@ public class Protocol {
outboundBuffer.p2add(Static18.anInt588); outboundBuffer.p2add(Static18.anInt588);
outboundBuffer.p1sub(local1363); outboundBuffer.p1sub(local1363);
} }
} else if ((Static116.anInt2952 == 1 || Static277.method4640(MiniMenu.size - 1)) && MiniMenu.size > 2) { } else if ((Static116.anInt2952 == 1 || MiniMenu.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();
@ -2728,24 +2730,24 @@ public class Protocol {
priorityRequest = (HookRequest) InterfaceList.lowPriorityRequests.removeHead(); priorityRequest = (HookRequest) InterfaceList.lowPriorityRequests.removeHead();
if (priorityRequest == null) { if (priorityRequest == null) {
if (WorldMap.component == null) { if (WorldMap.component == null) {
Static137.anInt3337 = 0; Static36.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) {
y = 3; y = 3;
} }
// Cheat // Cheat
Cheat.teleport(PlayerList.self.movementQueueX[0] + Static225.originX, PlayerList.self.movementQueueZ[0] + Static142.originZ, y); Cheat.teleport(PlayerList.self.movementQueueX[0] + Camera.originX, PlayerList.self.movementQueueZ[0] + Camera.originZ, y);
} }
if (LoginManager.staffModLevel > 0 && Keyboard.pressedKeys[Keyboard.KEY_CTRL] && Keyboard.pressedKeys[Keyboard.KEY_SHIFT]) { if (LoginManager.staffModLevel > 0 && Keyboard.pressedKeys[Keyboard.KEY_CTRL] && Keyboard.pressedKeys[Keyboard.KEY_SHIFT]) {
if (MiniMenu.anInt1742 != -1) { if (MiniMenu.anInt1742 != -1) {
Cheat.teleport(Static225.originX + MiniMenu.anInt1742, Static142.originZ - -MiniMenu.anInt2954, Player.level); Cheat.teleport(Camera.originX + MiniMenu.anInt1742, Camera.originZ - -MiniMenu.anInt2954, Player.level);
} }
Static187.anInt4422 = 0; Static187.anInt4422 = 0;
Static125.anInt3096 = 0; Static125.anInt3096 = 0;
@ -2753,9 +2755,9 @@ public class Protocol {
if (MiniMenu.anInt1742 != -1) { if (MiniMenu.anInt1742 != -1) {
outboundBuffer.p1isaac(131); outboundBuffer.p1isaac(131);
outboundBuffer.p4me(MiniMenu.anInt2512); outboundBuffer.p4me(MiniMenu.anInt2512);
outboundBuffer.p2add(Static225.originX + MiniMenu.anInt1742); outboundBuffer.p2add(Camera.originX + MiniMenu.anInt1742);
outboundBuffer.p2leadd(MiniMenu.anInt506); outboundBuffer.p2leadd(MiniMenu.anInt506);
outboundBuffer.p2add(MiniMenu.anInt2954 + Static142.originZ); outboundBuffer.p2add(MiniMenu.anInt2954 + Camera.originZ);
Cross.type = 1; Cross.type = 1;
Cross.milliseconds = 0; Cross.milliseconds = 0;
Cross.y = Mouse.clickY; Cross.y = Mouse.clickY;
@ -2765,8 +2767,8 @@ public class Protocol {
} else if (Static187.anInt4422 == 2) { } else if (Static187.anInt4422 == 2) {
if (MiniMenu.anInt1742 != -1) { if (MiniMenu.anInt1742 != -1) {
outboundBuffer.p1isaac(179); outboundBuffer.p1isaac(179);
outboundBuffer.p2(Static142.originZ + MiniMenu.anInt2954); outboundBuffer.p2(Camera.originZ + MiniMenu.anInt2954);
outboundBuffer.p2(MiniMenu.anInt1742 + Static225.originX); outboundBuffer.p2(MiniMenu.anInt1742 + Camera.originX);
Cross.milliseconds = 0; Cross.milliseconds = 0;
Cross.type = 1; Cross.type = 1;
Cross.x = Mouse.clickX; Cross.x = Mouse.clickX;
@ -2810,9 +2812,9 @@ public class Protocol {
InterfaceList.redraw(Static43.aClass13_11); InterfaceList.redraw(Static43.aClass13_11);
} }
} }
if (Static227.cameraType == 1) { if (Camera.cameraType == 1) {
Static250.method4273(); Camera.method4273();
} else if (Static227.cameraType == 2) { } else if (Camera.cameraType == 2) {
Camera.updateLockedCamera(); Camera.updateLockedCamera();
} else { } else {
Camera.updateLoginScreenCamera(); Camera.updateLoginScreenCamera();
@ -2836,7 +2838,7 @@ public class Protocol {
Static164.newTab = false; Static164.newTab = false;
} }
Static131.anInt3251++; Static131.anInt3251++;
Static82.anInt2252++; MiniMap.anInt2252++;
Static143.anInt3486++; Static143.anInt3486++;
if (Static143.anInt3486 > 500) { if (Static143.anInt3486 > 500) {
Static143.anInt3486 = 0; Static143.anInt3486 = 0;
@ -2845,36 +2847,36 @@ 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;
} }
} }
if (Static82.anInt2252 > 500) { if (MiniMap.anInt2252 > 500) {
Static82.anInt2252 = 0; MiniMap.anInt2252 = 0;
modelId = (int) (Math.random() * 8.0D); modelId = (int) (Math.random() * 8.0D);
if ((modelId & 0x1) == 1) { if ((modelId & 0x1) == 1) {
Static59.anInt1814 += Static263.anInt5755; MiniMap.anInt1814 += MiniMap.anInt5755;
} }
if ((modelId & 0x2) == 2) { if ((modelId & 0x2) == 2) {
MiniMap.anInt4130 += Static179.anInt4262; MiniMap.anInt4130 += MiniMap.anInt4262;
} }
} }
if (Static132.anInt3291 < -50) { if (Static132.anInt3291 < -50) {
Static248.anInt4229 = 2; Static248.anInt4229 = 2;
} }
if (Static59.anInt1814 < -60) { if (MiniMap.anInt1814 < -60) {
Static263.anInt5755 = 2; MiniMap.anInt5755 = 2;
} }
if (MiniMap.anInt4130 < -20) { if (MiniMap.anInt4130 < -20) {
Static179.anInt4262 = 1; MiniMap.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;
@ -2886,10 +2888,10 @@ public class Protocol {
Static220.anInt4941 = -1; Static220.anInt4941 = -1;
} }
if (MiniMap.anInt4130 > 10) { if (MiniMap.anInt4130 > 10) {
Static179.anInt4262 = -1; MiniMap.anInt4262 = -1;
} }
if (Static59.anInt1814 > 60) { if (MiniMap.anInt1814 > 60) {
Static263.anInt5755 = -2; MiniMap.anInt5755 = -2;
} }
if (Static131.anInt3251 > 50) { if (Static131.anInt3251 > 50) {
outboundBuffer.p1isaac(93); outboundBuffer.p1isaac(93);
@ -3199,4 +3201,16 @@ public class Protocol {
outboundBuffer.p1isaac(177); outboundBuffer.p1isaac(177);
outboundBuffer.p2(verifyId); outboundBuffer.p2(verifyId);
} }
@OriginalMember(owner = "client!wc", name = "a", descriptor = "(Lclient!wa;I)V")
public static void writeRandom(@OriginalArg(0) Buffer arg0) {
if (client.uid != null) {
try {
client.uid.seek(0L);
client.uid.write(arg0.data, arg0.offset, 24);
} catch (@Pc(16) Exception local16) {
}
}
arg0.offset += 24;
}
} }

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

@ -68,6 +68,12 @@ public class SceneGraph {
public static Scenery[] aClass31Array2; public static Scenery[] aClass31Array2;
@OriginalMember(owner = "client!gf", name = "O", descriptor = "[[[I") @OriginalMember(owner = "client!gf", name = "O", descriptor = "[[[I")
public static int[][][] underwaterTileHeights; public static int[][][] underwaterTileHeights;
@OriginalMember(owner = "client!oj", name = "E", descriptor = "[[Lclient!hg;")
public static GlTile[][] underwaterHdTiles;
@OriginalMember(owner = "client!jm", name = "r", descriptor = "I")
public static int anInt3114;
@OriginalMember(owner = "client!sm", name = "e", descriptor = "[[[B")
public static byte[][][] aByteArrayArrayArray13;
@OriginalMember(owner = "client!km", name = "f", descriptor = "(I)Z") @OriginalMember(owner = "client!km", name = "f", descriptor = "(I)Z")
public static boolean allLevelsAreVisible() { public static boolean allLevelsAreVisible() {
@ -316,4 +322,223 @@ public class SceneGraph {
@Pc(7) Tile local7 = tiles[arg0][arg1][arg2]; @Pc(7) Tile local7 = tiles[arg0][arg1][arg2];
return local7 == null || local7.groundDecor == null ? 0L : local7.groundDecor.key; return local7 == null || local7.groundDecor == null ? 0L : local7.groundDecor.key;
} }
@OriginalMember(owner = "client!wj", name = "a", descriptor = "(Z)V")
public static void setRenderTiles(@OriginalArg(0) boolean arg0) {
if (arg0) {
tiles = underWaterGroundTiles;
tileHeights = underwaterTileHeights;
underwaterHdTiles = underWaterHdTiles;
} else {
tiles = surfaceGroundTiles;
tileHeights = surfaceTileHeights;
underwaterHdTiles = surfaceHdTiles;
}
anInt3114 = tiles.length;
}
@OriginalMember(owner = "client!wj", name = "a", descriptor = "(IIZLclient!wa;IIBII)V")
public static void readTile(@OriginalArg(0) int arg0, @OriginalArg(1) int arg1, @OriginalArg(2) boolean arg2, @OriginalArg(3) Buffer arg3, @OriginalArg(4) int arg4, @OriginalArg(5) int arg5, @OriginalArg(7) int arg6, @OriginalArg(8) int arg7) {
@Pc(32) int local32;
if (arg5 < 0 || arg5 >= 104 || arg4 < 0 || arg4 >= 104) {
while (true) {
local32 = arg3.g1();
if (local32 == 0) {
break;
}
if (local32 == 1) {
arg3.g1();
break;
}
if (local32 <= 49) {
arg3.g1();
}
}
return;
}
if (!arg2) {
tileFlags[arg7][arg5][arg4] = 0;
}
while (true) {
local32 = arg3.g1();
if (local32 == 0) {
if (arg2) {
tileHeights[0][arg5][arg4] = surfaceTileHeights[0][arg5][arg4];
} else if (arg7 == 0) {
tileHeights[0][arg5][arg4] = -PerlinNoise.getTileHeight(arg4 + arg1 + 556238, arg0 + arg5 + 932731) * 8;
} else {
tileHeights[arg7][arg5][arg4] = tileHeights[arg7 - 1][arg5][arg4] - 240;
}
break;
}
if (local32 == 1) {
@Pc(111) int local111 = arg3.g1();
if (arg2) {
tileHeights[0][arg5][arg4] = surfaceTileHeights[0][arg5][arg4] + local111 * 8;
} else {
if (local111 == 1) {
local111 = 0;
}
if (arg7 == 0) {
tileHeights[0][arg5][arg4] = -local111 * 8;
} else {
tileHeights[arg7][arg5][arg4] = tileHeights[arg7 - 1][arg5][arg4] - local111 * 8;
}
}
break;
}
if (local32 <= 49) {
tileOverlays[arg7][arg5][arg4] = arg3.g1s();
tileShapes[arg7][arg5][arg4] = (byte) ((local32 - 2) / 4);
tileAngles[arg7][arg5][arg4] = (byte) (local32 + arg6 - 2 & 0x3);
} else if (local32 > 81) {
tileUnderlays[arg7][arg5][arg4] = (byte) (local32 - 81);
} else if (!arg2) {
tileFlags[arg7][arg5][arg4] = (byte) (local32 - 49);
}
}
}
@OriginalMember(owner = "client!hd", name = "a", descriptor = "(IIIIIIII)V")
public static void method1881(@OriginalArg(0) int arg0, @OriginalArg(2) int arg1, @OriginalArg(3) int arg2, @OriginalArg(4) int arg3, @OriginalArg(5) int arg4, @OriginalArg(6) int arg5, @OriginalArg(7) int arg6) {
if (arg5 < 0 || arg3 < 0 || arg5 >= 103 || arg3 >= 103) {
return;
}
@Pc(38) int local38;
if (arg4 == 0) {
@Pc(28) Wall local28 = getWall(arg0, arg5, arg3);
if (local28 != null) {
local38 = Integer.MAX_VALUE & (int) (local28.key >>> 32);
if (arg2 == 2) {
local28.primary = new Loc(local38, 2, arg1 + 4, arg0, arg5, arg3, arg6, false, local28.primary);
local28.aClass8_6 = new Loc(local38, 2, arg1 + 1 & 0x3, arg0, arg5, arg3, arg6, false, local28.aClass8_6);
} else {
local28.primary = new Loc(local38, arg2, arg1, arg0, arg5, arg3, arg6, false, local28.primary);
}
}
}
if (arg4 == 1) {
@Pc(106) WallDecor local106 = getWallDecor(arg0, arg5, arg3);
if (local106 != null) {
local38 = (int) (local106.key >>> 32) & Integer.MAX_VALUE;
if (arg2 == 4 || arg2 == 5) {
local106.primary = new Loc(local38, 4, arg1, arg0, arg5, arg3, arg6, false, local106.primary);
} else if (arg2 == 6) {
local106.primary = new Loc(local38, 4, arg1 + 4, arg0, arg5, arg3, arg6, false, local106.primary);
} else if (arg2 == 7) {
local106.primary = new Loc(local38, 4, (arg1 + 2 & 0x3) + 4, arg0, arg5, arg3, arg6, false, local106.primary);
} else if (arg2 == 8) {
local106.primary = new Loc(local38, 4, arg1 + 4, arg0, arg5, arg3, arg6, false, local106.primary);
local106.aClass8_2 = new Loc(local38, 4, (arg1 + 2 & 0x3) + 4, arg0, arg5, arg3, arg6, false, local106.aClass8_2);
}
}
}
if (arg4 == 2) {
if (arg2 == 11) {
arg2 = 10;
}
@Pc(255) Scenery local255 = getScenery(arg0, arg5, arg3);
if (local255 != null) {
local255.primary = new Loc((int) (local255.key >>> 32) & Integer.MAX_VALUE, arg2, arg1, arg0, arg5, arg3, arg6, false, local255.primary);
}
}
if (arg4 == 3) {
@Pc(290) GroundDecor local290 = getGroundDecor(arg0, arg5, arg3);
if (local290 != null) {
local290.primary = new Loc(Integer.MAX_VALUE & (int) (local290.key >>> 32), 22, arg1, arg0, arg5, arg3, arg6, false, local290.primary);
}
}
}
@OriginalMember(owner = "client!nh", name = "a", descriptor = "(IIIILclient!th;JZ)V")
public static void method2570(@OriginalArg(0) int arg0, @OriginalArg(1) int arg1, @OriginalArg(2) int arg2, @OriginalArg(3) int arg3, @OriginalArg(4) Entity arg4, @OriginalArg(5) long arg5, @OriginalArg(6) boolean arg6) {
if (arg4 == null) {
return;
}
@Pc(6) GroundDecor local6 = new GroundDecor();
local6.primary = arg4;
local6.anInt732 = arg1 * 128 + 64;
local6.anInt736 = arg2 * 128 + 64;
local6.anInt733 = arg3;
local6.key = arg5;
local6.aBoolean49 = arg6;
if (tiles[arg0][arg1][arg2] == null) {
tiles[arg0][arg1][arg2] = new Tile(arg0, arg1, arg2);
}
tiles[arg0][arg1][arg2].groundDecor = local6;
}
@OriginalMember(owner = "client!nh", name = "a", descriptor = "(IIIIIIIIIIIII)V")
public static void method2574(@OriginalArg(0) int arg0, @OriginalArg(1) int arg1, @OriginalArg(2) int arg2, @OriginalArg(3) int arg3, @OriginalArg(4) int arg4, @OriginalArg(5) int arg5, @OriginalArg(6) int arg6, @OriginalArg(7) int arg7, @OriginalArg(8) int arg8, @OriginalArg(9) int arg9, @OriginalArg(11) int arg10, @OriginalArg(12) int arg11) {
@Pc(7) AttachLocRequest local7 = new AttachLocRequest();
local7.angle = arg6;
local7.anInt1205 = arg3;
local7.anInt1187 = arg1;
local7.anInt1200 = arg5;
local7.entityId = arg2;
local7.x = arg8;
local7.anInt1197 = arg10;
local7.z = arg4;
local7.locId = arg11;
local7.anInt1188 = arg7;
local7.anInt1191 = arg0;
local7.shape = arg9;
AttachLocRequest.queue.addTail(local7);
}
@OriginalMember(owner = "client!ia", name = "a", descriptor = "(IB)I")
public static int method2251(@OriginalArg(0) int arg0) {
@Pc(11) int local11 = arg0 & 0x3F;
@Pc(17) int local17 = arg0 >> 6 & 0x3;
if (local11 == 18) {
if (local17 == 0) {
return 1;
}
if (local17 == 1) {
return 2;
}
if (local17 == 2) {
return 4;
}
if (local17 == 3) {
return 8;
}
} else if (local11 == 19 || local11 == 21) {
if (local17 == 0) {
return 16;
}
if (local17 == 1) {
return 32;
}
if (local17 == 2) {
return 64;
}
if (local17 == 3) {
return 128;
}
}
return 0;
}
@OriginalMember(owner = "client!vf", name = "a", descriptor = "(IIIILclient!th;Lclient!th;IIJ)V")
public static void method4508(@OriginalArg(0) int arg0, @OriginalArg(1) int arg1, @OriginalArg(2) int arg2, @OriginalArg(3) int arg3, @OriginalArg(4) Entity arg4, @OriginalArg(5) Entity arg5, @OriginalArg(6) int arg6, @OriginalArg(7) int arg7, @OriginalArg(8) long arg8) {
if (arg4 == null && arg5 == null) {
return;
}
@Pc(8) Wall local8 = new Wall();
local8.key = arg8;
local8.anInt3048 = arg1 * 128 + 64;
local8.anInt3044 = arg2 * 128 + 64;
local8.anInt3051 = arg3;
local8.primary = arg4;
local8.aClass8_6 = arg5;
local8.anInt3049 = arg6;
local8.anInt3052 = arg7;
for (@Pc(42) int local42 = arg0; local42 >= 0; local42--) {
if (tiles[local42][arg1][arg2] == null) {
tiles[local42][arg1][arg2] = new Tile(local42, arg1, arg2);
}
}
tiles[arg0][arg1][arg2].wall = local8;
}
} }

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

File diff suppressed because it is too large Load diff

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

@ -30,6 +30,17 @@ public final class SoftLruHashTable {
this.aClass133_18 = new HashTable(local11); this.aClass133_18 = new HashTable(local11);
} }
@OriginalMember(owner = "client!gk", name = "a", descriptor = "(Lclient!rg;Lclient!rg;B)V")
public static void method1772(@OriginalArg(0) SecondaryNode arg0, @OriginalArg(1) SecondaryNode arg1) {
if (arg1.aClass3_Sub2_66 != null) {
arg1.method4365();
}
arg1.aClass3_Sub2_66 = arg0;
arg1.aClass3_Sub2_67 = arg0.aClass3_Sub2_67;
arg1.aClass3_Sub2_66.aClass3_Sub2_67 = arg1;
arg1.aClass3_Sub2_67.aClass3_Sub2_66 = arg1;
}
@OriginalMember(owner = "client!n", name = "a", descriptor = "(BLjava/lang/Object;J)V") @OriginalMember(owner = "client!n", name = "a", descriptor = "(BLjava/lang/Object;J)V")
public final void put(@OriginalArg(1) Object arg0, @OriginalArg(2) long arg1) { public final void put(@OriginalArg(1) Object arg0, @OriginalArg(2) long arg1) {
this.method3098(arg1); this.method3098(arg1);
@ -82,7 +93,7 @@ public final class SoftLruHashTable {
} else if (++local9.secondaryKey > (long) arg0) { } else if (++local9.secondaryKey > (long) arg0) {
@Pc(33) ReferenceNode local33 = ReferenceNodeFactory.SOFT_REFERENCE_NODE_FACTORY.create(local9); @Pc(33) ReferenceNode local33 = ReferenceNodeFactory.SOFT_REFERENCE_NODE_FACTORY.create(local9);
this.aClass133_18.put(local33, local9.key); this.aClass133_18.put(local33, local9.key);
Static84.method1772(local9, local33); method1772(local9, local33);
local9.unlink(); local9.unlink();
local9.method4365(); local9.method4365();
} }

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

@ -862,7 +862,7 @@ public final class SoftwareModel extends Model {
} }
if (Static150.anInt3582 >= local204 && Static150.anInt3582 <= local208 && Static34.anInt1053 >= local223 && Static34.anInt1053 <= local227) { if (Static150.anInt3582 >= local204 && Static150.anInt3582 <= local208 && Static34.anInt1053 >= local223 && Static34.anInt1053 <= local227) {
if (this.aBoolean303) { if (this.aBoolean303) {
Static259.aLongArray11[Static2.anInt7++] = arg8; Model.aLongArray11[Static2.anInt7++] = arg8;
} else { } else {
local190 = true; local190 = true;
} }
@ -1628,7 +1628,7 @@ public final class SoftwareModel extends Model {
} }
} else { } else {
if (arg1 && this.method4589(Static150.anInt3582 + Rasteriser.centerX, Static34.anInt1053 + Rasteriser.centerY, anIntArray551[local51], anIntArray551[local56], anIntArray551[local61], local65, local69, local73)) { if (arg1 && this.method4589(Static150.anInt3582 + Rasteriser.centerX, Static34.anInt1053 + Rasteriser.centerY, anIntArray551[local51], anIntArray551[local56], anIntArray551[local61], local65, local69, local73)) {
Static259.aLongArray11[Static2.anInt7++] = arg2; Model.aLongArray11[Static2.anInt7++] = arg2;
arg1 = false; arg1 = false;
} }
if ((local65 - local69) * (anIntArray551[local61] - anIntArray551[local56]) - (anIntArray551[local51] - anIntArray551[local56]) * (local73 - local69) > 0) { if ((local65 - local69) * (anIntArray551[local61] - anIntArray551[local56]) - (anIntArray551[local51] - anIntArray551[local56]) * (local73 - local69) > 0) {

24
client/src/main/java/rt4/SpriteLoader.java
View file

@ -315,11 +315,33 @@ public class SpriteLoader {
@OriginalMember(owner = "client!da", name = "a", descriptor = "(ILclient!ve;Z)Lclient!ok;") @OriginalMember(owner = "client!da", name = "a", descriptor = "(ILclient!ve;Z)Lclient!ok;")
public static IndexedSprite loadIndexedSpriteAutoDetect(@OriginalArg(0) int arg0, @OriginalArg(1) Js5 arg1) { public static IndexedSprite loadIndexedSpriteAutoDetect(@OriginalArg(0) int arg0, @OriginalArg(1) Js5 arg1) {
return decode(arg1, arg0) ? Static276.method4614() : null; return decode(arg1, arg0) ? method4614() : null;
} }
@OriginalMember(owner = "client!kc", name = "a", descriptor = "(ILclient!ve;I)Lclient!qf;") @OriginalMember(owner = "client!kc", name = "a", descriptor = "(ILclient!ve;I)Lclient!qf;")
public static Sprite loadSpriteAutoDetect(@OriginalArg(1) Js5 arg0, @OriginalArg(2) int arg1) { public static Sprite loadSpriteAutoDetect(@OriginalArg(1) Js5 arg0, @OriginalArg(2) int arg1) {
return decode(arg0, arg1) ? method1764() : null; return decode(arg0, arg1) ? method1764() : null;
} }
@OriginalMember(owner = "client!wh", name = "b", descriptor = "(B)Lclient!ok;")
public static IndexedSprite method4614() {
@Pc(27) IndexedSprite local27;
if (GlRenderer.enabled) {
local27 = new GlIndexedSprite(width, height, xOffsets[0], yOffsets[0], innerWidths[0], innerHeights[0], pixels[0], palette);
} else {
local27 = new SoftwareIndexedSprite(width, height, xOffsets[0], yOffsets[0], innerWidths[0], innerHeights[0], pixels[0], palette);
}
clear();
return local27;
}
@OriginalMember(owner = "client!na", name = "a", descriptor = "(IZILclient!ve;)Lclient!ek;")
public static SoftwareIndexedSprite loadSoftwareIndexedSprite(@OriginalArg(2) int arg0, @OriginalArg(3) Js5 arg1) {
return decode(arg1, 0, arg0) ? Static134.method2619() : null;
}
@OriginalMember(owner = "client!na", name = "a", descriptor = "(Lclient!ve;IZ)Lclient!mm;")
public static SoftwareSprite method3117(@OriginalArg(0) Js5 arg0, @OriginalArg(1) int arg1) {
return decode(arg0, arg1) ? method3537() : null;
}
} }

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;
}
} }

86
client/src/main/java/rt4/Static1.java
View file

@ -6,7 +6,11 @@ import org.openrs2.deob.annotation.Pc;
public final class Static1 { public final class Static1 {
@OriginalMember(owner = "client!a", name = "h", descriptor = "I") @OriginalMember(owner = "client!wi", name = "hb", descriptor = "[[Z")
public static final boolean[][] aBooleanArrayArray4 = new boolean[][] { { true, true, true }, { false, false }, { false, true }, { true, false }, { false, true, true }, { true, false, true }, { false, true, false }, { true, false, false } };
@OriginalMember(owner = "client!kc", name = "s", descriptor = "[I")
public static final int[] anIntArray300 = new int[] { 1, 1, 1, 1, 4, 1, 1, 5, 6, 1, 5, 0, 7, 0, 4, 1, 7, 2, 1, 1, 6, 1, 1, 3, 6, 1, 7, 0, 0, 6, 7, 0, 1, 7, 6, 1, 1, 1, 5, 4, 3, 2, 1, 1, 0, 4, 1, 5 };
@OriginalMember(owner = "client!a", name = "h", descriptor = "I")
public static int anInt5; public static int anInt5;
@OriginalMember(owner = "client!a", name = "e", descriptor = "Lclient!na;") @OriginalMember(owner = "client!a", name = "e", descriptor = "Lclient!na;")
@ -83,9 +87,9 @@ public final class Static1 {
if (local242.aBoolean310 && local242.anInt5899 != -1) { if (local242.aBoolean310 && local242.anInt5899 != -1) {
local264 = arg5[local12 - 1][local17 + 1]; local264 = arg5[local12 - 1][local17 + 1];
local274 = arg7[local12 - 1][local17 + 1]; local274 = arg7[local12 - 1][local17 + 1];
local287 = Static130.anIntArray300[local274 * 4 + (local264 + 2 & 0x3)]; local287 = anIntArray300[local274 * 4 + (local264 + 2 & 0x3)];
local299 = Static130.anIntArray300[(local264 + 3 & 0x3) + local274 * 4]; local299 = anIntArray300[(local264 + 3 & 0x3) + local274 * 4];
if (!Static277.aBooleanArrayArray4[local299][1] || !Static277.aBooleanArrayArray4[local287][0]) { if (!aBooleanArrayArray4[local299][1] || !aBooleanArrayArray4[local287][0]) {
for (local317 = 0; local317 < 8; local317++) { for (local317 = 0; local317 < 8; local317++) {
if (local317 == 0) { if (local317 == 0) {
local127++; local127++;
@ -104,9 +108,9 @@ public final class Static1 {
if (local242.aBoolean310 && local242.anInt5899 != -1) { if (local242.aBoolean310 && local242.anInt5899 != -1) {
local264 = arg5[local12 - 1][local17 - 1]; local264 = arg5[local12 - 1][local17 - 1];
local274 = arg7[local12 - 1][local17 - 1]; local274 = arg7[local12 - 1][local17 - 1];
local287 = Static130.anIntArray300[local274 * 4 + (local264 & 0x3)]; local287 = anIntArray300[local274 * 4 + (local264 & 0x3)];
local299 = Static130.anIntArray300[(local264 + 3 & 0x3) + local274 * 4]; local299 = anIntArray300[(local264 + 3 & 0x3) + local274 * 4];
if (!Static277.aBooleanArrayArray4[local287][1] || !Static277.aBooleanArrayArray4[local299][0]) { if (!aBooleanArrayArray4[local287][1] || !aBooleanArrayArray4[local299][0]) {
for (local317 = 0; local317 < 8; local317++) { for (local317 = 0; local317 < 8; local317++) {
if (local127 == local317) { if (local127 == local317) {
local166[local127++] = local214; local166[local127++] = local214;
@ -124,9 +128,9 @@ public final class Static1 {
if (local242.aBoolean310 && local242.anInt5899 != -1) { if (local242.aBoolean310 && local242.anInt5899 != -1) {
local264 = arg5[local12 + 1][local17 - 1]; local264 = arg5[local12 + 1][local17 - 1];
local274 = arg7[local12 + 1][local17 - 1]; local274 = arg7[local12 + 1][local17 - 1];
local299 = Static130.anIntArray300[local274 * 4 + (local264 + 1 & 0x3)]; local299 = anIntArray300[local274 * 4 + (local264 + 1 & 0x3)];
local287 = Static130.anIntArray300[local274 * 4 + (local264 & 0x3)]; local287 = anIntArray300[local274 * 4 + (local264 & 0x3)];
if (!Static277.aBooleanArrayArray4[local299][1] || !Static277.aBooleanArrayArray4[local287][0]) { if (!aBooleanArrayArray4[local299][1] || !aBooleanArrayArray4[local287][0]) {
for (local317 = 0; local317 < 8; local317++) { for (local317 = 0; local317 < 8; local317++) {
if (local127 == local317) { if (local127 == local317) {
local166[local127++] = local202; local166[local127++] = local202;
@ -144,9 +148,9 @@ public final class Static1 {
if (local242.aBoolean310 && local242.anInt5899 != -1) { if (local242.aBoolean310 && local242.anInt5899 != -1) {
local264 = arg5[local12 + 1][local17 + 1]; local264 = arg5[local12 + 1][local17 + 1];
local274 = arg7[local12 + 1][local17 + 1]; local274 = arg7[local12 + 1][local17 + 1];
local299 = Static130.anIntArray300[local274 * 4 + (local264 + 1 & 0x3)]; local299 = anIntArray300[local274 * 4 + (local264 + 1 & 0x3)];
local287 = Static130.anIntArray300[local274 * 4 + (local264 + 2 & 0x3)]; local287 = anIntArray300[local274 * 4 + (local264 + 2 & 0x3)];
if (!Static277.aBooleanArrayArray4[local287][1] || !Static277.aBooleanArrayArray4[local299][0]) { if (!aBooleanArrayArray4[local287][1] || !aBooleanArrayArray4[local299][0]) {
for (local317 = 0; local317 < 8; local317++) { for (local317 = 0; local317 < 8; local317++) {
if (local127 == local317) { if (local127 == local317) {
local166[local127++] = local226; local166[local127++] = local226;
@ -162,7 +166,7 @@ public final class Static1 {
if (local143 != 0 && local38 != local143) { if (local143 != 0 && local38 != local143) {
local242 = FloTypeList.method4395(local143 - 1); local242 = FloTypeList.method4395(local143 - 1);
if (local242.aBoolean310 && local242.anInt5899 != -1) { if (local242.aBoolean310 && local242.anInt5899 != -1) {
local129 = Static130.anIntArray300[arg7[local12][local17 + 1] * 4 + (arg5[local12][local17 + 1] + 2 & 0x3)]; local129 = anIntArray300[arg7[local12][local17 + 1] * 4 + (arg5[local12][local17 + 1] + 2 & 0x3)];
for (local777 = 0; local777 < 8; local777++) { for (local777 = 0; local777 < 8; local777++) {
if (local127 == local777) { if (local127 == local777) {
local166[local127++] = local143; local166[local127++] = local143;
@ -177,7 +181,7 @@ public final class Static1 {
if (local163 != 0 && local38 != local163) { if (local163 != 0 && local38 != local163) {
local242 = FloTypeList.method4395(local163 - 1); local242 = FloTypeList.method4395(local163 - 1);
if (local242.aBoolean310 && local242.anInt5899 != -1) { if (local242.aBoolean310 && local242.anInt5899 != -1) {
local133 = Static130.anIntArray300[(arg5[local12 - 1][local17] + 3 & 0x3) + arg7[local12 - 1][local17] * 4]; local133 = anIntArray300[(arg5[local12 - 1][local17] + 3 & 0x3) + arg7[local12 - 1][local17] * 4];
for (local777 = 0; local777 < 8; local777++) { for (local777 = 0; local777 < 8; local777++) {
if (local127 == local777) { if (local127 == local777) {
local166[local127++] = local163; local166[local127++] = local163;
@ -192,7 +196,7 @@ public final class Static1 {
if (local153 != 0 && local38 != local153) { if (local153 != 0 && local38 != local153) {
local242 = FloTypeList.method4395(local153 - 1); local242 = FloTypeList.method4395(local153 - 1);
if (local242.aBoolean310 && local242.anInt5899 != -1) { if (local242.aBoolean310 && local242.anInt5899 != -1) {
local131 = Static130.anIntArray300[(arg5[local12][local17 - 1] & 0x3) + arg7[local12][local17 - 1] * 4]; local131 = anIntArray300[(arg5[local12][local17 - 1] & 0x3) + arg7[local12][local17 - 1] * 4];
for (local777 = 0; local777 < 8; local777++) { for (local777 = 0; local777 < 8; local777++) {
if (local777 == local127) { if (local777 == local127) {
local166[local127++] = local153; local166[local127++] = local153;
@ -207,7 +211,7 @@ public final class Static1 {
if (local190 != 0 && local38 != local190) { if (local190 != 0 && local38 != local190) {
local242 = FloTypeList.method4395(local190 - 1); local242 = FloTypeList.method4395(local190 - 1);
if (local242.aBoolean310 && local242.anInt5899 != -1) { if (local242.aBoolean310 && local242.anInt5899 != -1) {
local168 = Static130.anIntArray300[(arg5[local12 + 1][local17] + 1 & 0x3) + arg7[local12 + 1][local17] * 4]; local168 = anIntArray300[(arg5[local12 + 1][local17] + 1 & 0x3) + arg7[local12 + 1][local17] * 4];
for (local777 = 0; local777 < 8; local777++) { for (local777 = 0; local777 < 8; local777++) {
if (local127 == local777) { if (local127 == local777) {
local166[local127++] = local190; local166[local127++] = local190;
@ -221,10 +225,10 @@ public final class Static1 {
} }
for (local1035 = 0; local1035 < local127; local1035++) { for (local1035 = 0; local1035 < local127; local1035++) {
local777 = local166[local1035]; local777 = local166[local1035];
local1055 = Static277.aBooleanArrayArray4[local163 == local777 ? local133 : 0]; local1055 = aBooleanArrayArray4[local163 == local777 ? local133 : 0];
local1068 = Static277.aBooleanArrayArray4[local777 == local153 ? local131 : 0]; local1068 = aBooleanArrayArray4[local777 == local153 ? local131 : 0];
@Pc(1077) boolean[] local1077 = Static277.aBooleanArrayArray4[local143 == local777 ? local129 : 0]; @Pc(1077) boolean[] local1077 = aBooleanArrayArray4[local143 == local777 ? local129 : 0];
local1086 = Static277.aBooleanArrayArray4[local190 == local777 ? local168 : 0]; local1086 = aBooleanArrayArray4[local190 == local777 ? local168 : 0];
@Pc(1092) FloType local1092 = FloTypeList.method4395(local777 - 1); @Pc(1092) FloType local1092 = FloTypeList.method4395(local777 - 1);
@Pc(1097) GlTile local1097 = Static243.method4212(local10, local1092); @Pc(1097) GlTile local1097 = Static243.method4212(local10, local1092);
local1097.anInt2482 += 5; local1097.anInt2482 += 5;
@ -291,9 +295,9 @@ public final class Static1 {
if (local1496.aBoolean310 && local1496.anInt5899 != -1) { if (local1496.aBoolean310 && local1496.anInt5899 != -1) {
local274 = arg5[local12 - 1][local17 + 1]; local274 = arg5[local12 - 1][local17 + 1];
local1527 = arg7[local12 - 1][local17 + 1]; local1527 = arg7[local12 - 1][local17 + 1];
local299 = Static130.anIntArray300[local1527 * 4 + (local274 + 2 & 0x3)]; local299 = anIntArray300[local1527 * 4 + (local274 + 2 & 0x3)];
local317 = Static130.anIntArray300[local1527 * 4 + (local274 + 3 & 0x3)]; local317 = anIntArray300[local1527 * 4 + (local274 + 3 & 0x3)];
if (Static277.aBooleanArrayArray4[local317][1] && Static277.aBooleanArrayArray4[local299][0]) { if (aBooleanArrayArray4[local317][1] && aBooleanArrayArray4[local299][0]) {
local214 = 0; local214 = 0;
} else { } else {
for (local1571 = 0; local1571 < 8; local1571++) { for (local1571 = 0; local1571 < 8; local1571++) {
@ -318,9 +322,9 @@ public final class Static1 {
if (local1496.aBoolean310 && local1496.anInt5899 != -1) { if (local1496.aBoolean310 && local1496.anInt5899 != -1) {
local274 = arg5[local12 - 1][local17 - 1]; local274 = arg5[local12 - 1][local17 - 1];
local1527 = arg7[local12 - 1][local17 - 1]; local1527 = arg7[local12 - 1][local17 - 1];
local299 = Static130.anIntArray300[(local274 & 0x3) + local1527 * 4]; local299 = anIntArray300[(local274 & 0x3) + local1527 * 4];
local317 = Static130.anIntArray300[(local274 + 3 & 0x3) + local1527 * 4]; local317 = anIntArray300[(local274 + 3 & 0x3) + local1527 * 4];
if (Static277.aBooleanArrayArray4[local299][1] && Static277.aBooleanArrayArray4[local317][0]) { if (aBooleanArrayArray4[local299][1] && aBooleanArrayArray4[local317][0]) {
local202 = 0; local202 = 0;
} else { } else {
for (local1571 = 0; local1571 < 8; local1571++) { for (local1571 = 0; local1571 < 8; local1571++) {
@ -344,9 +348,9 @@ public final class Static1 {
if (local1496.aBoolean310 && local1496.anInt5899 != -1) { if (local1496.aBoolean310 && local1496.anInt5899 != -1) {
local274 = arg5[local12 + 1][local17 - 1]; local274 = arg5[local12 + 1][local17 - 1];
local1527 = arg7[local12 + 1][local17 - 1]; local1527 = arg7[local12 + 1][local17 - 1];
local317 = Static130.anIntArray300[(local274 + 1 & 0x3) + local1527 * 4]; local317 = anIntArray300[(local274 + 1 & 0x3) + local1527 * 4];
local299 = Static130.anIntArray300[local1527 * 4 + (local274 & 0x3)]; local299 = anIntArray300[local1527 * 4 + (local274 & 0x3)];
if (Static277.aBooleanArrayArray4[local317][1] && Static277.aBooleanArrayArray4[local299][0]) { if (aBooleanArrayArray4[local317][1] && aBooleanArrayArray4[local299][0]) {
local226 = 0; local226 = 0;
} else { } else {
for (local1571 = 0; local1571 < 8; local1571++) { for (local1571 = 0; local1571 < 8; local1571++) {
@ -370,9 +374,9 @@ public final class Static1 {
if (local1496.aBoolean310 && local1496.anInt5899 != -1) { if (local1496.aBoolean310 && local1496.anInt5899 != -1) {
local1527 = arg7[local12 + 1][local17 + 1]; local1527 = arg7[local12 + 1][local17 + 1];
local274 = arg5[local12 + 1][local17 + 1]; local274 = arg5[local12 + 1][local17 + 1];
local299 = Static130.anIntArray300[(local274 + 2 & 0x3) + local1527 * 4]; local299 = anIntArray300[(local274 + 2 & 0x3) + local1527 * 4];
local317 = Static130.anIntArray300[(local274 + 1 & 0x3) + local1527 * 4]; local317 = anIntArray300[(local274 + 1 & 0x3) + local1527 * 4];
if (Static277.aBooleanArrayArray4[local299][1] && Static277.aBooleanArrayArray4[local317][0]) { if (aBooleanArrayArray4[local299][1] && aBooleanArrayArray4[local317][0]) {
local1035 = 0; local1035 = 0;
} else { } else {
for (local1571 = 0; local1571 < 8; local1571++) { for (local1571 = 0; local1571 < 8; local1571++) {
@ -393,7 +397,7 @@ public final class Static1 {
if (local163 != 0 && local163 != local127) { if (local163 != 0 && local163 != local127) {
local1496 = FloTypeList.method4395(local163 - 1); local1496 = FloTypeList.method4395(local163 - 1);
if (local1496.aBoolean310 && local1496.anInt5899 != -1) { if (local1496.aBoolean310 && local1496.anInt5899 != -1) {
local133 = Static130.anIntArray300[arg7[local12][local17 + 1] * 4 + (arg5[local12][local17 + 1] + 2 & 0x3)]; local133 = anIntArray300[arg7[local12][local17 + 1] * 4 + (arg5[local12][local17 + 1] + 2 & 0x3)];
for (local2003 = 0; local2003 < 8; local2003++) { for (local2003 = 0; local2003 < 8; local2003++) {
if (local2003 == local1386) { if (local2003 == local1386) {
local1382[local1386++] = local163; local1382[local1386++] = local163;
@ -408,7 +412,7 @@ public final class Static1 {
if (local153 != 0 && local127 != local153) { if (local153 != 0 && local127 != local153) {
local1496 = FloTypeList.method4395(local153 - 1); local1496 = FloTypeList.method4395(local153 - 1);
if (local1496.aBoolean310 && local1496.anInt5899 != -1) { if (local1496.aBoolean310 && local1496.anInt5899 != -1) {
local131 = Static130.anIntArray300[(arg5[local12 - 1][local17] + 3 & 0x3) + arg7[local12 - 1][local17] * 4]; local131 = anIntArray300[(arg5[local12 - 1][local17] + 3 & 0x3) + arg7[local12 - 1][local17] * 4];
for (local2003 = 0; local2003 < 8; local2003++) { for (local2003 = 0; local2003 < 8; local2003++) {
if (local1386 == local2003) { if (local1386 == local2003) {
local1382[local1386++] = local153; local1382[local1386++] = local153;
@ -423,7 +427,7 @@ public final class Static1 {
if (local190 != 0 && local190 != local127) { if (local190 != 0 && local190 != local127) {
local1496 = FloTypeList.method4395(local190 - 1); local1496 = FloTypeList.method4395(local190 - 1);
if (local1496.aBoolean310 && local1496.anInt5899 != -1) { if (local1496.aBoolean310 && local1496.anInt5899 != -1) {
local168 = Static130.anIntArray300[(arg5[local12][local17 - 1] & 0x3) + arg7[local12][local17 - 1] * 4]; local168 = anIntArray300[(arg5[local12][local17 - 1] & 0x3) + arg7[local12][local17 - 1] * 4];
for (local2003 = 0; local2003 < 8; local2003++) { for (local2003 = 0; local2003 < 8; local2003++) {
if (local1386 == local2003) { if (local1386 == local2003) {
local1382[local1386++] = local190; local1382[local1386++] = local190;
@ -438,7 +442,7 @@ public final class Static1 {
if (local180 != 0 && local180 != local127) { if (local180 != 0 && local180 != local127) {
local1496 = FloTypeList.method4395(local180 - 1); local1496 = FloTypeList.method4395(local180 - 1);
if (local1496.aBoolean310 && local1496.anInt5899 != -1) { if (local1496.aBoolean310 && local1496.anInt5899 != -1) {
local143 = Static130.anIntArray300[arg7[local12 + 1][local17] * 4 + (arg5[local12 + 1][local17] + 1 & 0x3)]; local143 = anIntArray300[arg7[local12 + 1][local17] * 4 + (arg5[local12 + 1][local17] + 1 & 0x3)];
for (local2003 = 0; local2003 < 8; local2003++) { for (local2003 = 0; local2003 < 8; local2003++) {
if (local2003 == local1386) { if (local2003 == local1386) {
local1382[local1386++] = local180; local1382[local1386++] = local180;
@ -452,10 +456,10 @@ public final class Static1 {
} }
for (local777 = 0; local777 < local1386; local777++) { for (local777 = 0; local777 < local1386; local777++) {
local2003 = local1382[local777]; local2003 = local1382[local777];
local1055 = Static277.aBooleanArrayArray4[local2003 == local163 ? local133 : 0]; local1055 = aBooleanArrayArray4[local2003 == local163 ? local133 : 0];
local1068 = Static277.aBooleanArrayArray4[local153 == local2003 ? local131 : 0]; local1068 = aBooleanArrayArray4[local153 == local2003 ? local131 : 0];
local1086 = Static277.aBooleanArrayArray4[local2003 == local190 ? local168 : 0]; local1086 = aBooleanArrayArray4[local2003 == local190 ? local168 : 0];
@Pc(2318) boolean[] local2318 = Static277.aBooleanArrayArray4[local2003 == local180 ? local143 : 0]; @Pc(2318) boolean[] local2318 = aBooleanArrayArray4[local2003 == local180 ? local143 : 0];
@Pc(2324) FloType local2324 = FloTypeList.method4395(local2003 - 1); @Pc(2324) FloType local2324 = FloTypeList.method4395(local2003 - 1);
@Pc(2329) GlTile local2329 = Static243.method4212(local10, local2324); @Pc(2329) GlTile local2329 = Static243.method4212(local10, local2324);
@Pc(2345) int local2345 = Static19.method588(local2324.texture, local2324.anInt5899, arg6[local12][local17]) << 8 | 0xFF; @Pc(2345) int local2345 = Static19.method588(local2324.texture, local2324.anInt5899, arg6[local12][local17]) << 8 | 0xFF;

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

@ -6,10 +6,7 @@ import org.openrs2.deob.annotation.Pc;
public final class Static10 { public final class Static10 {
@OriginalMember(owner = "client!an", name = "db", descriptor = "S") @OriginalMember(owner = "client!an", name = "c", descriptor = "(III)V")
public static short aShort9 = 205;
@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) {
Static173.anIntArray367 = new int[arg1]; Static173.anIntArray367 = new int[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;
} }
} }

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

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

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

@ -6,22 +6,59 @@ 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!ig", name = "d", descriptor = "I")
public static final JagString aClass100_558 = JagString.parse("m"); 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 +68,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 +111,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;
}
} }

43
client/src/main/java/rt4/Static104.java
View file

@ -1,43 +0,0 @@
package rt4;
import org.openrs2.deob.annotation.OriginalArg;
import org.openrs2.deob.annotation.OriginalMember;
import org.openrs2.deob.annotation.Pc;
public final class Static104 {
@OriginalMember(owner = "client!ia", name = "a", descriptor = "(IB)I")
public static int method2251(@OriginalArg(0) int arg0) {
@Pc(11) int local11 = arg0 & 0x3F;
@Pc(17) int local17 = arg0 >> 6 & 0x3;
if (local11 == 18) {
if (local17 == 0) {
return 1;
}
if (local17 == 1) {
return 2;
}
if (local17 == 2) {
return 4;
}
if (local17 == 3) {
return 8;
}
} else if (local11 == 19 || local11 == 21) {
if (local17 == 0) {
return 16;
}
if (local17 == 1) {
return 32;
}
if (local17 == 2) {
return 64;
}
if (local17 == 3) {
return 128;
}
}
return 0;
}
}

8
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;") @OriginalMember(owner = "client!ib", name = "c", descriptor = "Lclient!qi;")
public static Class114[] aClass114Array1;
@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/Static107.java
View file

@ -10,7 +10,4 @@ public final class Static107 {
@OriginalMember(owner = "client!id", name = "b", descriptor = "I") @OriginalMember(owner = "client!id", name = "b", descriptor = "I")
public static int anInt2875 = -1; public static int anInt2875 = -1;
@OriginalMember(owner = "client!id", name = "d", descriptor = "[[[I")
public static final int[][][] anIntArrayArrayArray9 = new int[2][][];
} }

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

@ -7,10 +7,7 @@ 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") @OriginalMember(owner = "client!ig", name = "f", descriptor = "I")
public static int anInt2883;
@OriginalMember(owner = "client!ig", name = "f", descriptor = "I")
public static int anInt2884; public static int anInt2884;
@OriginalMember(owner = "client!ig", name = "i", descriptor = "I") @OriginalMember(owner = "client!ig", name = "i", descriptor = "I")

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

@ -7,7 +7,7 @@ public final class Static110 {
@OriginalMember(owner = "client!ih", name = "a", descriptor = "(I[Lclient!hg;)V") @OriginalMember(owner = "client!ih", name = "a", descriptor = "(I[Lclient!hg;)V")
public static void method2280(@OriginalArg(0) int arg0, @OriginalArg(1) GlTile[] arg1) { public static void method2280(@OriginalArg(0) int arg0, @OriginalArg(1) GlTile[] arg1) {
Static182.aClass3_Sub14ArrayArray2[arg0] = arg1; SceneGraph.underwaterHdTiles[arg0] = arg1;
} }
} }

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

@ -5,10 +5,7 @@ import org.openrs2.deob.annotation.OriginalMember;
public final class Static111 { public final class Static111 {
@OriginalMember(owner = "client!ii", name = "y", descriptor = "I") @OriginalMember(owner = "client!ii", name = "a", descriptor = "(Lclient!be;III)V")
public static int anInt2910;
@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) {
arg0.y = arg0.baseY; arg0.y = arg0.baseY;

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

@ -5,16 +5,19 @@ import org.openrs2.deob.annotation.Pc;
public final class Static112 { public final class Static112 {
@OriginalMember(owner = "client!ij", name = "a", descriptor = "(B)V") @OriginalMember(owner = "client!hd", name = "e", descriptor = "Lclient!qf;")
public static Sprite aClass3_Sub2_Sub1_6;
@OriginalMember(owner = "client!ij", name = "a", descriptor = "(B)V")
public static void method2297() { public static void method2297() {
@Pc(3) int local3 = Static183.anInt4271; @Pc(3) int local3 = Static183.anInt4271;
@Pc(9) int local9 = Static229.anInt5138; @Pc(9) int local9 = Static229.anInt5138;
@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 +31,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 +46,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,26 +60,26 @@ 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 || 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); 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);
} else { } else {
Static165.aClass3_Sub2_Sub1_8 = new GlSprite((SoftwareSprite) Static165.aClass3_Sub2_Sub1_8); Static165.aClass3_Sub2_Sub1_8 = new GlSprite((SoftwareSprite) Static165.aClass3_Sub2_Sub1_8);
} }
if (Static92.aClass3_Sub2_Sub1_6 instanceof SoftwareAlphaSprite) { if (aClass3_Sub2_Sub1_6 instanceof SoftwareAlphaSprite) {
Static92.aClass3_Sub2_Sub1_6 = new GlAlphaSprite((SoftwareSprite) Static92.aClass3_Sub2_Sub1_6); aClass3_Sub2_Sub1_6 = new GlAlphaSprite((SoftwareSprite) aClass3_Sub2_Sub1_6);
} else { } else {
Static92.aClass3_Sub2_Sub1_6 = new GlSprite((SoftwareSprite) Static92.aClass3_Sub2_Sub1_6); aClass3_Sub2_Sub1_6 = new GlSprite((SoftwareSprite) aClass3_Sub2_Sub1_6);
} }
if (Static204.aClass3_Sub2_Sub1_10 instanceof SoftwareAlphaSprite) { if (Static204.aClass3_Sub2_Sub1_10 instanceof SoftwareAlphaSprite) {
Static204.aClass3_Sub2_Sub1_10 = new GlAlphaSprite((SoftwareSprite) Static204.aClass3_Sub2_Sub1_10); Static204.aClass3_Sub2_Sub1_10 = new GlAlphaSprite((SoftwareSprite) Static204.aClass3_Sub2_Sub1_10);
@ -86,24 +89,24 @@ public final class Static112 {
} }
} }
@Pc(418) int local418; @Pc(418) int local418;
if (Static165.aClass3_Sub2_Sub1_8 != null && Static92.aClass3_Sub2_Sub1_6 != null && Static204.aClass3_Sub2_Sub1_10 != null) { if (Static165.aClass3_Sub2_Sub1_8 != null && aClass3_Sub2_Sub1_6 != null && Static204.aClass3_Sub2_Sub1_10 != null) {
local203 = local13 / Static165.aClass3_Sub2_Sub1_8.width; local203 = local13 / Static165.aClass3_Sub2_Sub1_8.width;
for (local219 = 0; local219 < local203; local219++) { for (local219 = 0; local219 < local203; local219++) {
Static165.aClass3_Sub2_Sub1_8.render(local3 + Static165.aClass3_Sub2_Sub1_8.width * local219, local11 + local9 + -Static165.aClass3_Sub2_Sub1_8.height); Static165.aClass3_Sub2_Sub1_8.render(local3 + Static165.aClass3_Sub2_Sub1_8.width * local219, local11 + local9 + -Static165.aClass3_Sub2_Sub1_8.height);
} }
local219 = (local11 - 20) / Static92.aClass3_Sub2_Sub1_6.height; local219 = (local11 - 20) / aClass3_Sub2_Sub1_6.height;
for (local418 = 0; local418 < local219; local418++) { for (local418 = 0; local418 < local219; local418++) {
Static92.aClass3_Sub2_Sub1_6.render(local3, local9 + local418 * Static92.aClass3_Sub2_Sub1_6.height + 20); aClass3_Sub2_Sub1_6.render(local3, local9 + local418 * aClass3_Sub2_Sub1_6.height + 20);
Static92.aClass3_Sub2_Sub1_6.renderHorizontalFlip(local3 + local13 - Static92.aClass3_Sub2_Sub1_6.width, local9 + 20 + local418 * Static92.aClass3_Sub2_Sub1_6.height); aClass3_Sub2_Sub1_6.renderHorizontalFlip(local3 + local13 - aClass3_Sub2_Sub1_6.width, local9 + 20 + local418 * aClass3_Sub2_Sub1_6.height);
} }
Static204.aClass3_Sub2_Sub1_10.render(local3, local11 + local9 - Static204.aClass3_Sub2_Sub1_10.height); Static204.aClass3_Sub2_Sub1_10.render(local3, local11 + local9 - Static204.aClass3_Sub2_Sub1_10.height);
Static204.aClass3_Sub2_Sub1_10.renderHorizontalFlip(local3 + local13 - Static204.aClass3_Sub2_Sub1_10.width, local9 - -local11 + -Static204.aClass3_Sub2_Sub1_10.height); Static204.aClass3_Sub2_Sub1_10.renderHorizontalFlip(local3 + local13 - Static204.aClass3_Sub2_Sub1_10.width, local9 - -local11 + -Static204.aClass3_Sub2_Sub1_10.height);
} }
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);
} }

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

@ -7,9 +7,6 @@ import org.openrs2.deob.annotation.Pc;
public final class Static114 { public final class Static114 {
@OriginalMember(owner = "client!j", name = "K", descriptor = "I")
public static int anInt5843 = 0;
@OriginalMember(owner = "client!j", name = "O", descriptor = "[I") @OriginalMember(owner = "client!j", name = "O", descriptor = "[I")
public static final int[] anIntArray565 = new int[] { 1, -1, -1, 1 }; public static final int[] anIntArray565 = new int[] { 1, -1, -1, 1 };
@ -40,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;
}
} }

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

@ -15,14 +15,33 @@ public final class Static115 {
@OriginalMember(owner = "client!ja", name = "j", descriptor = "I") @OriginalMember(owner = "client!ja", name = "j", descriptor = "I")
public static int anInt2937 = 0; public static int anInt2937 = 0;
@OriginalMember(owner = "client!ja", name = "n", descriptor = "I")
public static int mapFlagX = 0;
@OriginalMember(owner = "client!ja", name = "r", descriptor = "I") @OriginalMember(owner = "client!ja", name = "r", descriptor = "I")
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 +80,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 +105,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 +121,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/Static12.java
View file

@ -7,7 +7,4 @@ public final class Static12 {
@OriginalMember(owner = "client!bb", name = "M", descriptor = "I") @OriginalMember(owner = "client!bb", name = "M", descriptor = "I")
public static int anInt406; public static int anInt406;
@OriginalMember(owner = "client!bb", name = "t", descriptor = "[[B")
public static final byte[][] aByteArrayArray2 = new byte[250][];
} }

44
client/src/main/java/rt4/Static123.java
View file

@ -13,8 +13,10 @@ public final class Static123 {
@OriginalMember(owner = "client!ml", name = "K", descriptor = "I") @OriginalMember(owner = "client!ml", name = "K", descriptor = "I")
public static int anInt3947; public static int anInt3947;
@OriginalMember(owner = "client!wi", name = "db", descriptor = "I")
public static int tileVisibilityDistance;
@OriginalMember(owner = "client!jj", name = "a", descriptor = "(Z)V") @OriginalMember(owner = "client!jj", name = "a", descriptor = "(Z)V")
public static void topBannerRefresh() { public static void topBannerRefresh() {
if (!client.advertSuppressed && client.modeWhere != 2) { if (!client.advertSuppressed && client.modeWhere != 2) {
try { try {
@ -42,15 +44,15 @@ public final class Static123 {
@Pc(158) int local158; @Pc(158) int local158;
@Pc(137) boolean local137; @Pc(137) boolean local137;
if (local10.anInt4453 == 1) { if (local10.anInt4453 == 1) {
local14 = local10.anInt4452 + Static277.tileVisibilityDistance - Static167.anInt4069; local14 = local10.anInt4452 + tileVisibilityDistance - Static167.anInt4069;
if (local14 >= 0 && local14 <= Static277.tileVisibilityDistance + Static277.tileVisibilityDistance) { if (local14 >= 0 && local14 <= tileVisibilityDistance + tileVisibilityDistance) {
local115 = local10.anInt4461 + Static277.tileVisibilityDistance - Static193.anInt4539; local115 = local10.anInt4461 + tileVisibilityDistance - Static193.anInt4539;
if (local115 < 0) { if (local115 < 0) {
local115 = 0; local115 = 0;
} }
local126 = local10.anInt4464 + Static277.tileVisibilityDistance - Static193.anInt4539; local126 = local10.anInt4464 + tileVisibilityDistance - Static193.anInt4539;
if (local126 > Static277.tileVisibilityDistance + Static277.tileVisibilityDistance) { if (local126 > tileVisibilityDistance + tileVisibilityDistance) {
local126 = Static277.tileVisibilityDistance + Static277.tileVisibilityDistance; local126 = tileVisibilityDistance + tileVisibilityDistance;
} }
local137 = false; local137 = false;
while (local115 <= local126) { while (local115 <= local126) {
@ -78,15 +80,15 @@ public final class Static123 {
} }
} }
} else if (local10.anInt4453 == 2) { } else if (local10.anInt4453 == 2) {
local14 = local10.anInt4461 + Static277.tileVisibilityDistance - Static193.anInt4539; local14 = local10.anInt4461 + tileVisibilityDistance - Static193.anInt4539;
if (local14 >= 0 && local14 <= Static277.tileVisibilityDistance + Static277.tileVisibilityDistance) { if (local14 >= 0 && local14 <= tileVisibilityDistance + tileVisibilityDistance) {
local115 = local10.anInt4452 + Static277.tileVisibilityDistance - Static167.anInt4069; local115 = local10.anInt4452 + tileVisibilityDistance - Static167.anInt4069;
if (local115 < 0) { if (local115 < 0) {
local115 = 0; local115 = 0;
} }
local126 = local10.anInt4446 + Static277.tileVisibilityDistance - Static167.anInt4069; local126 = local10.anInt4446 + tileVisibilityDistance - Static167.anInt4069;
if (local126 > Static277.tileVisibilityDistance + Static277.tileVisibilityDistance) { if (local126 > tileVisibilityDistance + tileVisibilityDistance) {
local126 = Static277.tileVisibilityDistance + Static277.tileVisibilityDistance; local126 = tileVisibilityDistance + tileVisibilityDistance;
} }
local137 = false; local137 = false;
while (local115 <= local126) { while (local115 <= local126) {
@ -116,22 +118,22 @@ public final class Static123 {
} else if (local10.anInt4453 == 4) { } else if (local10.anInt4453 == 4) {
local14 = local10.anInt4444 - anInt3947; local14 = local10.anInt4444 - anInt3947;
if (local14 > 128) { if (local14 > 128) {
local115 = local10.anInt4461 + Static277.tileVisibilityDistance - Static193.anInt4539; local115 = local10.anInt4461 + tileVisibilityDistance - Static193.anInt4539;
if (local115 < 0) { if (local115 < 0) {
local115 = 0; local115 = 0;
} }
local126 = local10.anInt4464 + Static277.tileVisibilityDistance - Static193.anInt4539; local126 = local10.anInt4464 + tileVisibilityDistance - Static193.anInt4539;
if (local126 > Static277.tileVisibilityDistance + Static277.tileVisibilityDistance) { if (local126 > tileVisibilityDistance + tileVisibilityDistance) {
local126 = Static277.tileVisibilityDistance + Static277.tileVisibilityDistance; local126 = tileVisibilityDistance + tileVisibilityDistance;
} }
if (local115 <= local126) { if (local115 <= local126) {
@Pc(408) int local408 = local10.anInt4452 + Static277.tileVisibilityDistance - Static167.anInt4069; @Pc(408) int local408 = local10.anInt4452 + tileVisibilityDistance - Static167.anInt4069;
if (local408 < 0) { if (local408 < 0) {
local408 = 0; local408 = 0;
} }
local158 = local10.anInt4446 + Static277.tileVisibilityDistance - Static167.anInt4069; local158 = local10.anInt4446 + tileVisibilityDistance - Static167.anInt4069;
if (local158 > Static277.tileVisibilityDistance + Static277.tileVisibilityDistance) { if (local158 > tileVisibilityDistance + tileVisibilityDistance) {
local158 = Static277.tileVisibilityDistance + Static277.tileVisibilityDistance; local158 = tileVisibilityDistance + tileVisibilityDistance;
} }
@Pc(430) boolean local430 = false; @Pc(430) boolean local430 = false;
label166: for (@Pc(432) int local432 = local408; local432 <= local158; local432++) { label166: for (@Pc(432) int local432 = local408; local432 <= local158; local432++) {

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

@ -1,6 +1,5 @@
package rt4; package rt4;
import org.openrs2.deob.annotation.OriginalArg;
import org.openrs2.deob.annotation.OriginalMember; import org.openrs2.deob.annotation.OriginalMember;
public final class Static125 { public final class Static125 {
@ -8,18 +7,4 @@ public final class Static125 {
@OriginalMember(owner = "client!jl", name = "v", descriptor = "I") @OriginalMember(owner = "client!jl", name = "v", descriptor = "I")
public static int anInt3096 = 0; public static int anInt3096 = 0;
@OriginalMember(owner = "client!jl", name = "a", descriptor = "(IIIII)V")
public static void method2448(@OriginalArg(0) int arg0, @OriginalArg(1) int arg1, @OriginalArg(2) int arg2, @OriginalArg(3) int arg3) {
Protocol.outboundBuffer.offset = 0;
Protocol.outboundBuffer.p1(147);
Protocol.outboundBuffer.p1(arg2);
Protocol.outboundBuffer.p1(arg3);
Protocol.outboundBuffer.p2(arg0);
Protocol.outboundBuffer.p2(arg1);
CreateManager.loops = 0;
CreateManager.errors = 0;
CreateManager.step = 1;
CreateManager.reply = -3;
}
} }

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

@ -5,13 +5,7 @@ import org.openrs2.deob.annotation.Pc;
public final class Static126 { public final class Static126 {
@OriginalMember(owner = "client!jm", name = "r", descriptor = "I") @OriginalMember(owner = "client!jm", name = "a", descriptor = "(Z)V")
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")
public static void method2460() { public static void method2460() {
if (InterfaceList.topLevelInterface != -1) { if (InterfaceList.topLevelInterface != -1) {
Static96.method1949(InterfaceList.topLevelInterface); Static96.method1949(InterfaceList.topLevelInterface);

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

@ -1,8 +1,5 @@
package rt4; package rt4;
import java.io.UnsupportedEncodingException;
import java.nio.charset.StandardCharsets;
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;
@ -29,199 +26,138 @@ public final class Static127 {
@OriginalMember(owner = "client!k", name = "l", descriptor = "[I") @OriginalMember(owner = "client!k", name = "l", descriptor = "[I")
public static int[] anIntArray292; public static int[] anIntArray292;
@OriginalMember(owner = "client!k", name = "i", descriptor = "I")
public static int anInt3125 = 0;
@OriginalMember(owner = "client!k", name = "m", descriptor = "Z") @OriginalMember(owner = "client!k", name = "m", descriptor = "Z")
public static boolean neverRemoveRoofs = false; public static boolean neverRemoveRoofs = false;
@OriginalMember(owner = "client!k", name = "a", descriptor = "(IIBLclient!ve;Lclient!ve;)Lclient!rk;") @OriginalMember(owner = "client!we", name = "a", descriptor = "(BILclient!be;)I")
public static Font method2462(@OriginalArg(1) int arg0, @OriginalArg(3) Js5 arg1, @OriginalArg(4) Js5 arg2) { public static int method3212(@OriginalArg(1) int arg0, @OriginalArg(2) Component arg1) {
return SpriteLoader.decode(arg1, 0, arg0) ? Font.method799(arg2.getFile(arg0, 0)) : null; if (arg1.anIntArrayArray4 == null || arg0 >= arg1.anIntArrayArray4.length) {
} return -2;
}
@OriginalMember(owner = "client!k", name = "a", descriptor = "(IIIIZIZ)V") try {
public static void method2463(@OriginalArg(0) int arg0, @OriginalArg(1) int arg1, @OriginalArg(2) int arg2, @OriginalArg(3) int arg3, @OriginalArg(4) boolean arg4, @OriginalArg(5) int arg5) { @Pc(33) int[] local33 = arg1.anIntArrayArray4[arg0];
if (Static80.centralZoneX == arg2 && arg1 == Static52.anInt1695 && (Static41.anInt1316 == arg0 || SceneGraph.allLevelsAreVisible())) { @Pc(35) byte local35 = 0;
return; @Pc(37) int local37 = 0;
} @Pc(39) int local39 = 0;
Static80.centralZoneX = arg2; while (true) {
Static52.anInt1695 = arg1; @Pc(41) int local41 = 0;
Static41.anInt1316 = arg0; @Pc(46) int local46 = local33[local39++];
if (SceneGraph.allLevelsAreVisible()) { @Pc(48) byte local48 = 0;
Static41.anInt1316 = 0; if (local46 == 0) {
} return local37;
if (arg4) { }
client.setGameState(28); if (local46 == 15) {
} else { local48 = 1;
client.setGameState(25); }
} if (local46 == 16) {
Static114.drawTextOnScreen(true, LocalizedText.LOADING); local48 = 2;
@Pc(53) int local53 = Static142.originZ; }
@Pc(55) int local55 = Static225.originX; if (local46 == 1) {
Static142.originZ = arg1 * 8 - 48; local41 = PlayerSkillXpTable.boostedLevels[local33[local39++]];
Static225.originX = (arg2 - 6) * 8; }
Static158.aClass3_Sub2_Sub4_3 = MapList.getContainingSource(Static80.centralZoneX * 8, Static52.anInt1695 * 8); if (local46 == 17) {
@Pc(81) int local81 = Static142.originZ - local53; local48 = 3;
@Pc(86) int local86 = Static225.originX - local55; }
Static235.mapElementList = null; if (local46 == 2) {
@Pc(96) int local96; local41 = PlayerSkillXpTable.baseLevels[local33[local39++]];
@Pc(103) Npc local103; }
@Pc(109) int local109; if (local46 == 3) {
if (arg4) { local41 = PlayerSkillXpTable.experience[local33[local39++]];
NpcList.size = 0; }
for (local96 = 0; local96 < 32768; local96++) { @Pc(124) int local124;
local103 = NpcList.npcs[local96]; @Pc(135) Component local135;
if (local103 != null) { @Pc(140) int local140;
local103.xFine -= local86 * 128; @Pc(152) int local152;
local103.zFine -= local81 * 128; if (local46 == 4) {
if (local103.xFine >= 0 && local103.xFine <= 13184 && local103.zFine >= 0 && local103.zFine <= 13184) { local124 = local33[local39++] << 16;
for (local109 = 0; local109 < 10; local109++) { @Pc(131) int local131 = local124 + local33[local39++];
local103.movementQueueX[local109] -= local86; local135 = InterfaceList.getComponent(local131);
local103.movementQueueZ[local109] -= local81; local140 = local33[local39++];
} if (local140 != -1 && (!ObjTypeList.get(local140).members || LoginManager.mapMembers)) {
NpcList.ids[NpcList.size++] = local96; for (local152 = 0; local152 < local135.objTypes.length; local152++) {
} else { if (local140 + 1 == local135.objTypes[local152]) {
NpcList.npcs[local96].setNpcType(null); local41 += local135.objCounts[local152];
NpcList.npcs[local96] = null; }
} }
} }
} }
} else { if (local46 == 5) {
for (local96 = 0; local96 < 32768; local96++) { local41 = VarpDomain.activeVarps[local33[local39++]];
local103 = NpcList.npcs[local96]; }
if (local103 != null) { if (local46 == 6) {
for (local109 = 0; local109 < 10; local109++) { local41 = PlayerSkillXpTable.xpLevelLookup[PlayerSkillXpTable.baseLevels[local33[local39++]] - 1];
local103.movementQueueX[local109] -= local86; }
local103.movementQueueZ[local109] -= local81; if (local46 == 7) {
} local41 = VarpDomain.activeVarps[local33[local39++]] * 100 / 46875;
local103.xFine -= local86 * 128; }
local103.zFine -= local81 * 128; if (local46 == 8) {
} local41 = PlayerList.self.combatLevel;
} }
} if (local46 == 9) {
for (local96 = 0; local96 < 2048; local96++) { for (local124 = 0; local124 < 25; local124++) {
@Pc(265) Player local265 = PlayerList.players[local96]; if (Static182.aBooleanArray97[local124]) {
if (local265 != null) { local41 += PlayerSkillXpTable.baseLevels[local124];
for (local109 = 0; local109 < 10; local109++) { }
local265.movementQueueX[local109] -= local86; }
local265.movementQueueZ[local109] -= local81; }
} if (local46 == 10) {
local265.xFine -= local86 * 128; local124 = local33[local39++] << 16;
local265.zFine -= local81 * 128; local124 += local33[local39++];
} local135 = InterfaceList.getComponent(local124);
} local140 = local33[local39++];
Player.level = arg0; if (local140 != -1 && (!ObjTypeList.get(local140).members || LoginManager.mapMembers)) {
PlayerList.self.teleport(arg5, false, arg3); for (local152 = 0; local152 < local135.objTypes.length; local152++) {
@Pc(322) byte local322 = 104; if (local135.objTypes[local152] == local140 + 1) {
@Pc(324) byte local324 = 0; local41 = 999999999;
@Pc(326) byte local326 = 0; break;
@Pc(328) byte local328 = 1; }
@Pc(330) byte local330 = 104; }
@Pc(332) byte local332 = 1; }
if (local81 < 0) { }
local328 = -1; if (local46 == 11) {
local330 = -1; local41 = Player.runEnergy;
local326 = 103; }
} if (local46 == 12) {
if (local86 < 0) { local41 = Player.weight;
local332 = -1; }
local324 = 103; if (local46 == 13) {
local322 = -1; local124 = VarpDomain.activeVarps[local33[local39++]];
} @Pc(353) int local353 = local33[local39++];
for (@Pc(358) int local358 = local324; local358 != local322; local358 += local332) { local41 = (0x1 << local353 & local124) == 0 ? 0 : 1;
for (@Pc(367) int local367 = local326; local367 != local330; local367 += local328) { }
@Pc(378) int local378 = local86 + local358; if (local46 == 14) {
@Pc(382) int local382 = local367 + local81; local124 = local33[local39++];
for (@Pc(384) int local384 = 0; local384 < 4; local384++) { local41 = VarpDomain.getVarbit(local124);
if (local378 >= 0 && local382 >= 0 && local378 < 104 && local382 < 104) { }
SceneGraph.objStacks[local384][local358][local367] = SceneGraph.objStacks[local384][local378][local382]; if (local46 == 18) {
} else { local41 = (PlayerList.self.xFine >> 7) + Camera.originX;
SceneGraph.objStacks[local384][local358][local367] = null; }
} if (local46 == 19) {
} local41 = (PlayerList.self.zFine >> 7) + Camera.originZ;
} }
} if (local46 == 20) {
for (@Pc(451) SceneryStack local451 = (SceneryStack) Static26.sceneryList.head(); local451 != null; local451 = (SceneryStack) Static26.sceneryList.next()) { local41 = local33[local39++];
local451.z -= local81; }
local451.x -= local86; if (local48 == 0) {
if (local451.x < 0 || local451.z < 0 || local451.x >= 104 || local451.z >= 104) { if (local35 == 0) {
local451.unlink(); local37 += local41;
} }
} if (local35 == 1) {
if (arg4) { local37 -= local41;
Static138.renderX -= local86 * 128; }
Static134.renderZ -= local81 * 128; if (local35 == 2 && local41 != 0) {
Static248.anInt4232 -= local81; local37 /= local41;
Static251.anInt5449 -= local86; }
Static265.anInt5765 -= local81; if (local35 == 3) {
Static245.anInt5375 -= local86; local37 *= local41;
} else { }
Static227.cameraType = 1; local35 = 0;
} } else {
SoundPlayer.anInt4451 = 0; local35 = local48;
if (Static115.mapFlagX != 0) { }
Static84.anInt2255 -= local81; }
Static115.mapFlagX -= local86; } catch (@Pc(464) Exception local464) {
} return -1;
if (GlRenderer.enabled && arg4 && (Math.abs(local86) > 104 || Math.abs(local81) > 104)) { }
Static86.setInstantFade(); }
}
Static107.anInt2875 = -1;
Static99.aClass69_64.clear();
Static217.aClass69_116.clear();
}
@OriginalMember(owner = "client!k", name = "a", descriptor = "(Lclient!be;Lclient!na;I)Lclient!na;")
public static JagString method2465(@OriginalArg(0) Component arg0, @OriginalArg(1) JagString arg1) {
if (arg1.indexOf(PERCENT_SIGN) == -1) {
return arg1;
}
while (true) {
@Pc(14) int local14 = arg1.indexOf(aClass100_133);
if (local14 == -1) {
while (true) {
local14 = arg1.indexOf(aClass100_1097);
if (local14 == -1) {
while (true) {
local14 = arg1.indexOf(aClass100_761);
if (local14 == -1) {
while (true) {
local14 = arg1.indexOf(aClass100_520);
if (local14 == -1) {
while (true) {
local14 = arg1.indexOf(aClass100_1002);
if (local14 == -1) {
while (true) {
local14 = arg1.indexOf(aClass100_591);
if (local14 == -1) {
return arg1;
}
@Pc(246) JagString local246 = JagString.EMPTY;
if (Player.lastLogAddress != null) {
local246 = Static181.method3341(Player.lastLogAddress.intArg2);
if (Player.lastLogAddress.result != null) {
@Pc(265) byte[] local265 = ((String) Player.lastLogAddress.result).getBytes(StandardCharsets.ISO_8859_1);
local246 = JagString.decodeString(local265, local265.length, 0);
}
}
arg1 = JagString.concatenate(new JagString[] { arg1.substring(local14, 0), local246, arg1.substring(local14 + 4) });
}
}
arg1 = JagString.concatenate(new JagString[] { arg1.substring(local14, 0), Static262.method4510(Static273.method3212(4, arg0)), arg1.substring(local14 + 2) });
}
}
arg1 = JagString.concatenate(new JagString[] { arg1.substring(local14, 0), Static262.method4510(Static273.method3212(3, arg0)), arg1.substring(local14 + 2) });
}
}
arg1 = JagString.concatenate(new JagString[] { arg1.substring(local14, 0), Static262.method4510(Static273.method3212(2, arg0)), arg1.substring(local14 + 2) });
}
}
arg1 = JagString.concatenate(new JagString[] { arg1.substring(local14, 0), Static262.method4510(Static273.method3212(1, arg0)), arg1.substring(local14 + 2) });
}
}
arg1 = JagString.concatenate(new JagString[] { arg1.substring(local14, 0), Static262.method4510(Static273.method3212(0, arg0)), arg1.substring(local14 + 2) });
}
}
} }

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

@ -1,10 +1,5 @@
package rt4; package rt4;
import org.openrs2.deob.annotation.OriginalMember;
public final class Static128 { public final class Static128 {
@OriginalMember(owner = "client!ka", name = "t", descriptor = "[I")
public static final int[] anIntArray294 = new int[] { 0, 0, 2, 0, 0, 2, 1, 1, 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;
} }

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

@ -7,7 +7,4 @@ public final class Static130 {
@OriginalMember(owner = "client!kc", name = "p", descriptor = "[I") @OriginalMember(owner = "client!kc", name = "p", descriptor = "[I")
public static int[] anIntArray299; public static int[] anIntArray299;
@OriginalMember(owner = "client!kc", name = "s", descriptor = "[I")
public static final int[] anIntArray300 = new int[] { 1, 1, 1, 1, 4, 1, 1, 5, 6, 1, 5, 0, 7, 0, 4, 1, 7, 2, 1, 1, 6, 1, 1, 3, 6, 1, 7, 0, 0, 6, 7, 0, 1, 7, 6, 1, 1, 1, 5, 4, 3, 2, 1, 1, 0, 4, 1, 5 };
} }

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

@ -7,18 +7,9 @@ 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")
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;

18
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;
@ -20,7 +17,7 @@ public final class Static132 {
if (arg0) { if (arg0) {
InterfaceList.method2275(local16); InterfaceList.method2275(local16);
} }
Static273.method3214(local16); method3214(local16);
@Pc(32) Component local32 = InterfaceList.getComponent(local9); @Pc(32) Component local32 = InterfaceList.getComponent(local9);
if (local32 != null) { if (local32 != null) {
InterfaceList.redraw(local32); InterfaceList.redraw(local32);
@ -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) {
@ -175,4 +172,13 @@ public final class Static132 {
Rasteriser.fillGouraudTriangle(local283, local299, local331, local275, local291, local323, Static216.method1640(local475, arg0.anInt4872), Static216.method1640(local475, arg0.anInt4867), Static216.method1640(local475, arg0.anInt4864)); Rasteriser.fillGouraudTriangle(local283, local299, local331, local275, local291, local323, Static216.method1640(local475, arg0.anInt4872), Static216.method1640(local475, arg0.anInt4867), Static216.method1640(local475, arg0.anInt4864));
} }
} }
@OriginalMember(owner = "client!we", name = "b", descriptor = "(BI)V")
public static void method3214(@OriginalArg(1) int arg0) {
for (@Pc(11) Node local11 = InterfaceList.properties.head(); local11 != null; local11 = InterfaceList.properties.next()) {
if ((local11.key >> 48 & 0xFFFFL) == (long) arg0) {
local11.unlink();
}
}
}
} }

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);

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

@ -4,13 +4,7 @@ import org.openrs2.deob.annotation.OriginalMember;
public final class Static136 { public final class Static136 {
@OriginalMember(owner = "client!kk", name = "i", descriptor = "I") @OriginalMember(owner = "client!kk", name = "a", descriptor = "(I)Z")
public static int anInt3324;
@OriginalMember(owner = "client!kk", name = "j", descriptor = "I")
public static int anInt3325 = 0;
@OriginalMember(owner = "client!kk", name = "a", descriptor = "(I)Z")
public static boolean method2655() { public static boolean method2655() {
return MidiPlayer.anInt441 != 0 || Static172.midiPcmStream.method4414(); return MidiPlayer.anInt441 != 0 || Static172.midiPcmStream.method4414();
} }

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

@ -1,16 +0,0 @@
package rt4;
import org.openrs2.deob.annotation.OriginalArg;
import org.openrs2.deob.annotation.OriginalMember;
public final class Static137 {
@OriginalMember(owner = "client!kl", name = "s", descriptor = "I")
public static int anInt3337 = 0;
@OriginalMember(owner = "client!kl", name = "a", descriptor = "(Lclient!wa;B)Lclient!kc;")
public static TextureOp29SubOp2 method2664(@OriginalArg(0) Buffer arg0) {
return new TextureOp29SubOp2(arg0.g2s(), arg0.g2s(), arg0.g2s(), arg0.g2s(), arg0.g3(), arg0.g3(), arg0.g1());
}
}

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;
} }

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

@ -1,6 +1,5 @@
package rt4; package rt4;
import org.openrs2.deob.annotation.OriginalArg;
import org.openrs2.deob.annotation.OriginalMember; import org.openrs2.deob.annotation.OriginalMember;
public final class Static141 { public final class Static141 {
@ -8,19 +7,4 @@ public final class Static141 {
@OriginalMember(owner = "client!lb", name = "z", descriptor = "I") @OriginalMember(owner = "client!lb", name = "z", descriptor = "I")
public static int anInt3473; public static int anInt3473;
@OriginalMember(owner = "client!lb", name = "a", descriptor = "(ZIIIBII)V")
public static void method2722(@OriginalArg(0) boolean arg0, @OriginalArg(1) int arg1, @OriginalArg(2) int arg2, @OriginalArg(3) int arg3, @OriginalArg(5) int arg4, @OriginalArg(6) int arg5) {
Static113.anInt4612 = arg3;
Static231.anInt5203 = arg2;
Static245.anInt5375 = arg5;
Static233.anInt5225 = arg1;
Static248.anInt4232 = arg4;
if (arg0 && Static113.anInt4612 >= 100) {
Static138.renderX = Static245.anInt5375 * 128 + 64;
Static134.renderZ = Static248.anInt4232 * 128 + 64;
Static5.anInt40 = SceneGraph.getTileHeight(Player.level, Static138.renderX, Static134.renderZ) - Static231.anInt5203;
}
Static227.cameraType = 2;
}
} }

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

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

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;
}
}
} }

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

@ -22,7 +22,7 @@ public final class Static145 {
@OriginalMember(owner = "client!lf", name = "a", descriptor = "(ILclient!ve;)V") @OriginalMember(owner = "client!lf", name = "a", descriptor = "(ILclient!ve;)V")
public static void method2743(@OriginalArg(1) Js5 arg0) { public static void method2743(@OriginalArg(1) Js5 arg0) {
Static233.aClass36_Sub1Array1 = SpriteLoader.method3088(Flames.anInt3443, arg0); Static233.aClass36_Sub1Array1 = SpriteLoader.method3088(Flames.anInt3443, arg0);
Static96.anIntArray235 = new int[256]; Static221.anIntArray235 = new int[256];
@Pc(15) int local15; @Pc(15) int local15;
for (local15 = 0; local15 < 3; local15++) { for (local15 = 0; local15 < 3; local15++) {
@Pc(30) int local30 = Flames.anIntArray445[local15 + 1] >> 16 & 0xFF; @Pc(30) int local30 = Flames.anIntArray445[local15 + 1] >> 16 & 0xFF;
@ -35,21 +35,21 @@ public final class Static145 {
@Pc(88) int local88 = Flames.anIntArray445[local15 + 1] & 0xFF; @Pc(88) int local88 = Flames.anIntArray445[local15 + 1] & 0xFF;
@Pc(95) float local95 = ((float) local88 - local55) / 64.0F; @Pc(95) float local95 = ((float) local88 - local55) / 64.0F;
for (@Pc(97) int local97 = 0; local97 < 64; local97++) { for (@Pc(97) int local97 = 0; local97 < 64; local97++) {
Static96.anIntArray235[local97 + local15 * 64] = (int) local55 | (int) local48 << 8 | (int) local39 << 16; Static221.anIntArray235[local97 + local15 * 64] = (int) local55 | (int) local48 << 8 | (int) local39 << 16;
local48 += local80; local48 += local80;
local55 += local95; local55 += local95;
local39 += local62; local39 += local62;
} }
} }
for (local15 = 192; local15 < 255; local15++) { for (local15 = 192; local15 < 255; local15++) {
Static96.anIntArray235[local15] = Flames.anIntArray445[3]; Static221.anIntArray235[local15] = Flames.anIntArray445[3];
} }
Static270.anIntArray562 = new int[32768]; Static270.anIntArray562 = new int[32768];
Static263.anIntArray516 = new int[32768]; Static263.anIntArray516 = new int[32768];
Static69.method1545(null); Static69.method1545(null);
Static103.anIntArray254 = new int[32768]; Static103.anIntArray254 = new int[32768];
Static216.anIntArray188 = new int[32768]; Static216.anIntArray188 = new int[32768];
Static167.aClass3_Sub2_Sub1_Sub1_3 = new SoftwareSprite(128, 254); Static221.aClass3_Sub2_Sub1_Sub1_3 = new SoftwareSprite(128, 254);
} }
@OriginalMember(owner = "client!lf", name = "b", descriptor = "(I)V") @OriginalMember(owner = "client!lf", name = "b", descriptor = "(I)V")

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;

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

@ -11,7 +11,7 @@ public final class Static147 {
@OriginalMember(owner = "client!lh", name = "b", descriptor = "(II)V") @OriginalMember(owner = "client!lh", name = "b", descriptor = "(II)V")
public static void method2761(@OriginalArg(0) int arg0) { public static void method2761(@OriginalArg(0) int arg0) {
Static170.anInt3241 = arg0; UnderwaterMaterialRenderer.anInt3241 = arg0;
MaterialManager.resetArgument(3); MaterialManager.resetArgument(3);
MaterialManager.resetArgument(4); MaterialManager.resetArgument(4);
} }

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;
}
}
} }

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

@ -19,10 +19,8 @@ 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() {
@Pc(8) JagString local8 = aClass100_518; @Pc(8) JagString local8 = aClass100_518;
@Pc(10) JagString local10 = JagString.EMPTY; @Pc(10) JagString local10 = JagString.EMPTY;

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

@ -2,19 +2,126 @@ package rt4;
import org.openrs2.deob.annotation.OriginalArg; import org.openrs2.deob.annotation.OriginalArg;
import org.openrs2.deob.annotation.OriginalMember; import org.openrs2.deob.annotation.OriginalMember;
import org.openrs2.deob.annotation.Pc;
public final class Static152 { public final class Static152 {
@OriginalMember(owner = "client!ma", name = "z", descriptor = "I") @OriginalMember(owner = "client!ma", name = "z", descriptor = "I")
public static int anInt3604 = -1; public static int anInt3604 = -1;
@OriginalMember(owner = "client!ma", name = "a", descriptor = "(IIBIIII)V") @OriginalMember(owner = "client!wl", name = "a", descriptor = "(IBIIIII)V")
public static void method2826(@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 void method4670(@OriginalArg(0) int arg0, @OriginalArg(2) int arg1, @OriginalArg(3) int arg2, @OriginalArg(4) int arg3, @OriginalArg(5) int arg4, @OriginalArg(6) int arg5) {
if (arg4 - arg3 >= TextureOp29.anInt4164 && TextureOp29.anInt5063 >= arg4 + arg3 && TextureOp29.anInt5773 <= arg1 - arg3 && TextureOp29.anInt2869 >= arg3 + arg1) { @Pc(18) int local18 = arg2 - arg4;
Static8.method120(arg5, arg0, arg1, arg2, arg3, arg4); Static251.method4278(arg2);
} else { @Pc(23) int local23 = 0;
Static280.method4670(arg2, arg1, arg3, arg5, arg0, arg4); if (local18 < 0) {
local18 = 0;
}
@Pc(32) int local32 = arg2;
@Pc(35) int local35 = -arg2;
@Pc(38) int local38 = -local18;
@Pc(40) int local40 = local18;
@Pc(42) int local42 = -1;
@Pc(61) int local61;
@Pc(69) int local69;
@Pc(78) int local78;
@Pc(87) int local87;
if (arg1 >= TextureOp29.anInt5773 && TextureOp29.anInt2869 >= arg1) {
@Pc(52) int[] local52 = Static71.anIntArrayArray10[arg1];
local61 = Static78.method1690(TextureOp29.anInt5063, arg5 - arg2, TextureOp29.anInt4164);
local69 = Static78.method1690(TextureOp29.anInt5063, arg2 + arg5, TextureOp29.anInt4164);
local78 = Static78.method1690(TextureOp29.anInt5063, arg5 - local18, TextureOp29.anInt4164);
local87 = Static78.method1690(TextureOp29.anInt5063, arg5 + local18, TextureOp29.anInt4164);
Static131.method2576(local52, local61, local78, arg3);
Static131.method2576(local52, local78, local87, arg0);
Static131.method2576(local52, local87, local69, arg3);
}
@Pc(107) int local107 = -1;
while (local23 < local32) {
local42 += 2;
local107 += 2;
local38 += local107;
local35 += local42;
if (local38 >= 0 && local40 >= 1) {
local40--;
Static241.anIntArray522[local40] = local23;
local38 -= local40 << 1;
}
local23++;
@Pc(264) int local264;
@Pc(273) int local273;
@Pc(280) int[] local280;
@Pc(161) int local161;
if (local35 >= 0) {
local32--;
local35 -= local32 << 1;
local161 = arg1 - local32;
local61 = arg1 + local32;
if (TextureOp29.anInt5773 <= local61 && TextureOp29.anInt2869 >= local161) {
if (local32 >= local18) {
local69 = Static78.method1690(TextureOp29.anInt5063, local23 + arg5, TextureOp29.anInt4164);
local78 = Static78.method1690(TextureOp29.anInt5063, arg5 - local23, TextureOp29.anInt4164);
if (TextureOp29.anInt2869 >= local61) {
Static131.method2576(Static71.anIntArrayArray10[local61], local78, local69, arg3);
}
if (local161 >= TextureOp29.anInt5773) {
Static131.method2576(Static71.anIntArrayArray10[local161], local78, local69, arg3);
}
} else {
local69 = Static241.anIntArray522[local32];
local78 = Static78.method1690(TextureOp29.anInt5063, local23 + arg5, TextureOp29.anInt4164);
local87 = Static78.method1690(TextureOp29.anInt5063, arg5 - local23, TextureOp29.anInt4164);
local264 = Static78.method1690(TextureOp29.anInt5063, arg5 + local69, TextureOp29.anInt4164);
local273 = Static78.method1690(TextureOp29.anInt5063, arg5 - local69, TextureOp29.anInt4164);
if (TextureOp29.anInt2869 >= local61) {
local280 = Static71.anIntArrayArray10[local61];
Static131.method2576(local280, local87, local273, arg3);
Static131.method2576(local280, local273, local264, arg0);
Static131.method2576(local280, local264, local78, arg3);
}
if (local161 >= TextureOp29.anInt5773) {
local280 = Static71.anIntArrayArray10[local161];
Static131.method2576(local280, local87, local273, arg3);
Static131.method2576(local280, local273, local264, arg0);
Static131.method2576(local280, local264, local78, arg3);
}
}
}
}
local161 = arg1 - local23;
local61 = arg1 + local23;
if (TextureOp29.anInt5773 <= local61 && TextureOp29.anInt2869 >= local161) {
local69 = arg5 + local32;
local78 = arg5 - local32;
if (local69 >= TextureOp29.anInt4164 && TextureOp29.anInt5063 >= local78) {
local69 = Static78.method1690(TextureOp29.anInt5063, local69, TextureOp29.anInt4164);
local78 = Static78.method1690(TextureOp29.anInt5063, local78, TextureOp29.anInt4164);
if (local23 < local18) {
local87 = local40 >= local23 ? local40 : Static241.anIntArray522[local23];
local264 = Static78.method1690(TextureOp29.anInt5063, local87 + arg5, TextureOp29.anInt4164);
local273 = Static78.method1690(TextureOp29.anInt5063, arg5 - local87, TextureOp29.anInt4164);
if (TextureOp29.anInt2869 >= local61) {
local280 = Static71.anIntArrayArray10[local61];
Static131.method2576(local280, local78, local273, arg3);
Static131.method2576(local280, local273, local264, arg0);
Static131.method2576(local280, local264, local69, arg3);
}
if (local161 >= TextureOp29.anInt5773) {
local280 = Static71.anIntArrayArray10[local161];
Static131.method2576(local280, local78, local273, arg3);
Static131.method2576(local280, local273, local264, arg0);
Static131.method2576(local280, local264, local69, arg3);
}
} else {
if (TextureOp29.anInt2869 >= local61) {
Static131.method2576(Static71.anIntArrayArray10[local61], local78, local69, arg3);
}
if (local161 >= TextureOp29.anInt5773) {
Static131.method2576(Static71.anIntArrayArray10[local161], local78, local69, arg3);
}
}
}
}
} }
} }
} }

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;
}

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

@ -6,16 +6,13 @@ 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) {
return false; return false;
} }
for (@Pc(14) int local14 = 0; local14 < arg0.anIntArray43.length; local14++) { for (@Pc(14) int local14 = 0; local14 < arg0.anIntArray43.length; local14++) {
@Pc(34) int local34 = Static273.method3212(local14, arg0); @Pc(34) int local34 = Static127.method3212(local14, arg0);
@Pc(39) int local39 = arg0.anIntArray48[local14]; @Pc(39) int local39 = arg0.anIntArray48[local14];
if (arg0.anIntArray43[local14] == 2) { if (arg0.anIntArray43[local14] == 2) {
if (local39 <= local34) { if (local39 <= local34) {

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

@ -1,24 +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 = "k", descriptor = "I")
public static int anInt3718 = -1;
@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;
}
} }

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

@ -1,15 +1,11 @@
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;
public final class Static156 { public final class Static156 {
@OriginalMember(owner = "client!mf", name = "O", descriptor = "[[B")
public static byte[][] locationMapFilesBuffer;
@OriginalMember(owner = "client!mf", name = "X", descriptor = "I") @OriginalMember(owner = "client!mf", name = "X", descriptor = "I")
public static int loginScreenId; public static int loginScreenId;
@ -34,19 +30,19 @@ public final class Static156 {
Static217.anInt4903 = arg2; Static217.anInt4903 = arg2;
Static167.anInt4069 = arg0 / 128; Static167.anInt4069 = arg0 / 128;
Static193.anInt4539 = arg2 / 128; Static193.anInt4539 = arg2 / 128;
Static31.anInt987 = Static167.anInt4069 - Static277.tileVisibilityDistance; Static31.anInt987 = Static167.anInt4069 - Static123.tileVisibilityDistance;
if (Static31.anInt987 < 0) { if (Static31.anInt987 < 0) {
Static31.anInt987 = 0; Static31.anInt987 = 0;
} }
Static80.anInt4698 = Static193.anInt4539 - Static277.tileVisibilityDistance; Static80.anInt4698 = Static193.anInt4539 - Static123.tileVisibilityDistance;
if (Static80.anInt4698 < 0) { if (Static80.anInt4698 < 0) {
Static80.anInt4698 = 0; Static80.anInt4698 = 0;
} }
Static2.anInt15 = Static167.anInt4069 + Static277.tileVisibilityDistance; Static2.anInt15 = Static167.anInt4069 + Static123.tileVisibilityDistance;
if (Static2.anInt15 > SceneGraph.mapSizeX) { if (Static2.anInt15 > SceneGraph.mapSizeX) {
Static2.anInt15 = SceneGraph.mapSizeX; Static2.anInt15 = SceneGraph.mapSizeX;
} }
Static215.anInt4866 = Static193.anInt4539 + Static277.tileVisibilityDistance; Static215.anInt4866 = Static193.anInt4539 + Static123.tileVisibilityDistance;
if (Static215.anInt4866 > SceneGraph.mapSizeZ) { if (Static215.anInt4866 > SceneGraph.mapSizeZ) {
Static215.anInt4866 = SceneGraph.mapSizeZ; Static215.anInt4866 = SceneGraph.mapSizeZ;
} }
@ -58,12 +54,12 @@ public final class Static156 {
} }
@Pc(104) int local104; @Pc(104) int local104;
@Pc(113) int local113; @Pc(113) int local113;
for (local104 = 0; local104 < Static277.tileVisibilityDistance + Static277.tileVisibilityDistance + 2; local104++) { for (local104 = 0; local104 < Static123.tileVisibilityDistance + Static123.tileVisibilityDistance + 2; local104++) {
for (local113 = 0; local113 < Static277.tileVisibilityDistance + Static277.tileVisibilityDistance + 2; local113++) { for (local113 = 0; local113 < Static123.tileVisibilityDistance + Static123.tileVisibilityDistance + 2; local113++) {
@Pc(130) int local130 = (local104 - Static277.tileVisibilityDistance << 7) - (Static149.anInt3555 & 0x7F); @Pc(130) int local130 = (local104 - Static123.tileVisibilityDistance << 7) - (Static149.anInt3555 & 0x7F);
@Pc(140) int local140 = (local113 - Static277.tileVisibilityDistance << 7) - (Static217.anInt4903 & 0x7F); @Pc(140) int local140 = (local113 - Static123.tileVisibilityDistance << 7) - (Static217.anInt4903 & 0x7F);
@Pc(146) int local146 = Static167.anInt4069 + local104 - Static277.tileVisibilityDistance; @Pc(146) int local146 = Static167.anInt4069 + local104 - Static123.tileVisibilityDistance;
@Pc(152) int local152 = Static193.anInt4539 + local113 - Static277.tileVisibilityDistance; @Pc(152) int local152 = Static193.anInt4539 + local113 - Static123.tileVisibilityDistance;
if (local146 >= 0 && local152 >= 0 && local146 < SceneGraph.mapSizeX && local152 < SceneGraph.mapSizeZ) { if (local146 >= 0 && local152 >= 0 && local146 < SceneGraph.mapSizeX && local152 < SceneGraph.mapSizeZ) {
@Pc(176) int local176; @Pc(176) int local176;
if (SceneGraph.underwaterTileHeights == null) { if (SceneGraph.underwaterTileHeights == null) {
@ -78,8 +74,8 @@ public final class Static156 {
} }
} }
} }
for (local104 = 0; local104 < Static277.tileVisibilityDistance + Static277.tileVisibilityDistance + 1; local104++) { for (local104 = 0; local104 < Static123.tileVisibilityDistance + Static123.tileVisibilityDistance + 1; local104++) {
for (local113 = 0; local113 < Static277.tileVisibilityDistance + Static277.tileVisibilityDistance + 1; local113++) { for (local113 = 0; local113 < Static123.tileVisibilityDistance + Static123.tileVisibilityDistance + 1; local113++) {
Static48.aBooleanArrayArray1[local104][local113] = Static89.aBooleanArrayArray3[local104][local113] || Static89.aBooleanArrayArray3[local104 + 1][local113] || Static89.aBooleanArrayArray3[local104][local113 + 1] || Static89.aBooleanArrayArray3[local104 + 1][local113 + 1]; Static48.aBooleanArrayArray1[local104][local113] = Static89.aBooleanArrayArray3[local104][local113] || Static89.aBooleanArrayArray3[local104 + 1][local113] || Static89.aBooleanArrayArray3[local104][local113 + 1] || Static89.aBooleanArrayArray3[local104 + 1][local113 + 1];
} }
} }
@ -90,15 +86,15 @@ public final class Static156 {
Static206.anIntArray427 = arg10; Static206.anIntArray427 = arg10;
Static123.method2419(); Static123.method2419();
if (SceneGraph.underWaterGroundTiles != null) { if (SceneGraph.underWaterGroundTiles != null) {
Static278.setRenderTiles(true); SceneGraph.setRenderTiles(true);
Static248.method3292(arg0, arg1, arg2, null, 0, (byte) 0, arg13, arg14); Static248.method3292(arg0, arg1, arg2, null, 0, (byte) 0, arg13, arg14);
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); SceneGraph.setRenderTiles(false);
} }
Static248.method3292(arg0, arg1, arg2, arg5, arg11, arg12, arg13, arg14); Static248.method3292(arg0, arg1, arg2, arg5, arg11, arg12, arg13, arg14);
} }

21
client/src/main/java/rt4/Static158.java
View file

@ -5,9 +5,6 @@ import org.openrs2.deob.annotation.Pc;
public final class Static158 { public final class Static158 {
@OriginalMember(owner = "client!mh", name = "hb", descriptor = "Lclient!bn;")
public static Map aClass3_Sub2_Sub4_3;
@OriginalMember(owner = "client!mh", name = "X", descriptor = "I") @OriginalMember(owner = "client!mh", name = "X", descriptor = "I")
public static int anInt3851 = -1; public static int anInt3851 = -1;
@OriginalMember(owner = "client!mg", name = "Q", descriptor = "I") @OriginalMember(owner = "client!mg", name = "Q", descriptor = "I")
@ -15,32 +12,32 @@ public final class Static158 {
@OriginalMember(owner = "client!mh", name = "h", descriptor = "(B)V") @OriginalMember(owner = "client!mh", name = "h", descriptor = "(B)V")
public static void decodeNpcFiles() { public static void decodeNpcFiles() {
@Pc(10) int local10 = Static191.npcSpawnsFilesBuffer.length; @Pc(10) int local10 = LoginManager.npcSpawnsFilesBuffer.length;
for (@Pc(16) int local16 = 0; local16 < local10; local16++) { for (@Pc(16) int local16 = 0; local16 < local10; local16++) {
if (Static191.npcSpawnsFilesBuffer[local16] != null) { if (LoginManager.npcSpawnsFilesBuffer[local16] != null) {
@Pc(25) int local25 = -1; @Pc(25) int local25 = -1;
for (@Pc(27) int local27 = 0; local27 < anInt3811; local27++) { for (@Pc(27) int local27 = 0; local27 < anInt3811; local27++) {
if (Static217.anIntArray434[local27] == Static238.regionBitPacked[local16]) { if (Static217.anIntArray434[local27] == LoginManager.regionBitPacked[local16]) {
local25 = local27; local25 = local27;
break; break;
} }
} }
if (local25 == -1) { if (local25 == -1) {
Static217.anIntArray434[anInt3811] = Static238.regionBitPacked[local16]; Static217.anIntArray434[anInt3811] = LoginManager.regionBitPacked[local16];
local25 = anInt3811++; local25 = anInt3811++;
} }
@Pc(67) int local67 = 0; @Pc(67) int local67 = 0;
@Pc(74) Buffer local74 = new Buffer(Static191.npcSpawnsFilesBuffer[local16]); @Pc(74) Buffer local74 = new Buffer(LoginManager.npcSpawnsFilesBuffer[local16]);
while (local74.offset < Static191.npcSpawnsFilesBuffer[local16].length && local67 < 511) { while (local74.offset < LoginManager.npcSpawnsFilesBuffer[local16].length && local67 < 511) {
@Pc(97) int local97 = local67++ << 6 | local25; @Pc(97) int local97 = local67++ << 6 | local25;
@Pc(103) int local103 = local74.g2(); @Pc(103) int local103 = local74.g2();
@Pc(107) int local107 = local103 >> 14; @Pc(107) int local107 = local103 >> 14;
@Pc(113) int local113 = local103 >> 7 & 0x3F; @Pc(113) int local113 = local103 >> 7 & 0x3F;
@Pc(125) int local125 = local113 + (Static238.regionBitPacked[local16] >> 8) * 64 - Static225.originX; @Pc(125) int local125 = local113 + (LoginManager.regionBitPacked[local16] >> 8) * 64 - Camera.originX;
@Pc(129) int local129 = local103 & 0x3F; @Pc(129) int local129 = local103 & 0x3F;
@Pc(142) int local142 = local129 + (Static238.regionBitPacked[local16] & 0xFF) * 64 - Static142.originZ; @Pc(142) int local142 = local129 + (LoginManager.regionBitPacked[local16] & 0xFF) * 64 - Camera.originZ;
@Pc(148) NpcType local148 = NpcTypeList.get(local74.g2()); @Pc(148) NpcType local148 = NpcTypeList.get(local74.g2());
if (NpcList.npcs[local97] == null && (local148.aByte10 & 0x1) > 0 && local107 == Static41.anInt1316 && local125 >= 0 && local148.size + local125 < 104 && local142 >= 0 && local142 + local148.size < 104) { if (NpcList.npcs[local97] == null && (local148.aByte10 & 0x1) > 0 && local107 == LoginManager.centralPlane && local125 >= 0 && local148.size + local125 < 104 && local142 >= 0 && local142 + local148.size < 104) {
NpcList.npcs[local97] = new Npc(); NpcList.npcs[local97] = new Npc();
@Pc(198) Npc local198 = NpcList.npcs[local97]; @Pc(198) Npc local198 = NpcList.npcs[local97];
NpcList.ids[NpcList.size++] = local97; NpcList.ids[NpcList.size++] = local97;

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;
} }

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

@ -150,14 +150,4 @@ public final class Static164 {
} }
} }
@OriginalMember(owner = "client!na", name = "a", descriptor = "(Lclient!ve;IZ)Lclient!mm;")
public static SoftwareSprite method3117(@OriginalArg(0) Js5 arg0, @OriginalArg(1) int arg1) {
return SpriteLoader.decode(arg0, arg1) ? SpriteLoader.method3537() : null;
}
@OriginalMember(owner = "client!na", name = "a", descriptor = "(IZILclient!ve;)Lclient!ek;")
public static SoftwareIndexedSprite loadSoftwareIndexedSprite(@OriginalArg(2) int arg0, @OriginalArg(3) Js5 arg1) {
return SpriteLoader.decode(arg1, 0, arg0) ? Static134.method2619() : null;
}
} }

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

@ -12,13 +12,7 @@ public final class Static165 {
@OriginalMember(owner = "client!nb", name = "o", descriptor = "I") @OriginalMember(owner = "client!nb", name = "o", descriptor = "I")
public static int anInt4042; public static int anInt4042;
@OriginalMember(owner = "client!nb", name = "a", descriptor = "Lclient!na;") @OriginalMember(owner = "client!nb", name = "n", descriptor = "Lclient!na;")
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;")
public static final JagString DETAILS = JagString.parse("details"); public static final JagString DETAILS = JagString.parse("details");
@OriginalMember(owner = "client!nb", name = "a", descriptor = "(IIIIIIIIII)V") @OriginalMember(owner = "client!nb", name = "a", descriptor = "(IIIIIIIIII)V")

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;
} }

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

@ -7,7 +7,4 @@ public final class Static167 {
@OriginalMember(owner = "client!nd", name = "s", descriptor = "I") @OriginalMember(owner = "client!nd", name = "s", descriptor = "I")
public static int anInt4069; public static int anInt4069;
@OriginalMember(owner = "client!nd", name = "y", descriptor = "Lclient!mm;")
public static SoftwareSprite aClass3_Sub2_Sub1_Sub1_3;
} }

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

@ -7,10 +7,7 @@ import org.openrs2.deob.annotation.Pc;
public final class Static169 { public final class Static169 {
@OriginalMember(owner = "client!nf", name = "e", descriptor = "I") @OriginalMember(owner = "client!nf", name = "h", descriptor = "Lclient!be;")
public static int anInt4073;
@OriginalMember(owner = "client!nf", name = "h", descriptor = "Lclient!be;")
public static Component aClass13_18; public static Component aClass13_18;
@OriginalMember(owner = "client!nf", name = "i", descriptor = "I") @OriginalMember(owner = "client!nf", name = "i", descriptor = "I")
@ -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;
} }
} }

51
client/src/main/java/rt4/Static170.java
View file

@ -1,51 +0,0 @@
package rt4;
import org.openrs2.deob.annotation.OriginalArg;
import org.openrs2.deob.annotation.OriginalMember;
import org.openrs2.deob.annotation.Pc;
public final class Static170 {
@OriginalMember(owner = "client!nh", name = "Z", descriptor = "I")
public static int anInt3241 = 128;
@OriginalMember(owner = "client!nh", name = "fb", descriptor = "[I")
public static final int[] JS5_ARCHIVE_WEIGHTS = new int[] { 4, 4, 1, 2, 6, 4, 2, 49, 2, 2, 2, 2, 2, 2, 2, 2, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1 };
@OriginalMember(owner = "client!nh", name = "a", descriptor = "(IIIILclient!th;JZ)V")
public static void method2570(@OriginalArg(0) int arg0, @OriginalArg(1) int arg1, @OriginalArg(2) int arg2, @OriginalArg(3) int arg3, @OriginalArg(4) Entity arg4, @OriginalArg(5) long arg5, @OriginalArg(6) boolean arg6) {
if (arg4 == null) {
return;
}
@Pc(6) GroundDecor local6 = new GroundDecor();
local6.primary = arg4;
local6.anInt732 = arg1 * 128 + 64;
local6.anInt736 = arg2 * 128 + 64;
local6.anInt733 = arg3;
local6.key = arg5;
local6.aBoolean49 = arg6;
if (SceneGraph.tiles[arg0][arg1][arg2] == null) {
SceneGraph.tiles[arg0][arg1][arg2] = new Tile(arg0, arg1, arg2);
}
SceneGraph.tiles[arg0][arg1][arg2].groundDecor = local6;
}
@OriginalMember(owner = "client!nh", name = "a", descriptor = "(IIIIIIIIIIIII)V")
public static void method2574(@OriginalArg(0) int arg0, @OriginalArg(1) int arg1, @OriginalArg(2) int arg2, @OriginalArg(3) int arg3, @OriginalArg(4) int arg4, @OriginalArg(5) int arg5, @OriginalArg(6) int arg6, @OriginalArg(7) int arg7, @OriginalArg(8) int arg8, @OriginalArg(9) int arg9, @OriginalArg(11) int arg10, @OriginalArg(12) int arg11) {
@Pc(7) AttachLocRequest local7 = new AttachLocRequest();
local7.angle = arg6;
local7.anInt1205 = arg3;
local7.anInt1187 = arg1;
local7.anInt1200 = arg5;
local7.entityId = arg2;
local7.x = arg8;
local7.anInt1197 = arg10;
local7.z = arg4;
local7.locId = arg11;
local7.anInt1188 = arg7;
local7.anInt1191 = arg0;
local7.shape = arg9;
AttachLocRequest.queue.addTail(local7);
}
}

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

@ -7,10 +7,7 @@ import org.openrs2.deob.annotation.Pc;
public final class Static171 { public final class Static171 {
@OriginalMember(owner = "client!ni", name = "h", descriptor = "I") @OriginalMember(owner = "client!ni", name = "a", descriptor = "(ILclient!na;)I")
public static int anInt4153;
@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) {
return -1; return -1;

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

@ -12,9 +12,6 @@ public final class Static172 {
@OriginalMember(owner = "client!nj", name = "g", descriptor = "Lclient!ve;") @OriginalMember(owner = "client!nj", name = "g", descriptor = "Lclient!ve;")
public static Js5 aClass153_70; public static Js5 aClass153_70;
@OriginalMember(owner = "client!nj", name = "j", descriptor = "[I")
public static int[] locationsMapFileIds;
@OriginalMember(owner = "client!nj", name = "k", descriptor = "I") @OriginalMember(owner = "client!nj", name = "k", descriptor = "I")
public static int anInt4165; public static int anInt4165;

117
client/src/main/java/rt4/Static173.java
View file

@ -9,122 +9,7 @@ public final class Static173 {
@OriginalMember(owner = "client!nk", name = "d", descriptor = "[I") @OriginalMember(owner = "client!nk", name = "d", descriptor = "[I")
public static int[] anIntArray367; public static int[] anIntArray367;
@OriginalMember(owner = "client!nk", name = "c", descriptor = "(IZ)V") @OriginalMember(owner = "client!nk", name = "a", descriptor = "(Z[J[I)V")
public static void method3240(@OriginalArg(1) boolean arg0) {
@Pc(7) int local7;
@Pc(16) Npc local16;
@Pc(107) int local107;
@Pc(113) int local113;
@Pc(133) int local133;
@Pc(149) int local149;
@Pc(158) int local158;
@Pc(171) int local171;
for (local7 = 0; local7 < NpcList.size; local7++) {
local16 = NpcList.npcs[NpcList.ids[local7]];
if (local16 != null && local16.method2682() && local16.type.aBoolean182 == arg0 && local16.type.isMultiNpcValid()) {
@Pc(42) int local42 = local16.getSize();
@Pc(97) int local97;
if (local42 == 1) {
if ((local16.xFine & 0x7F) == 64 && (local16.zFine & 0x7F) == 64) {
local97 = local16.xFine >> 7;
local107 = local16.zFine >> 7;
if (local97 >= 0 && local97 < 104 && local107 >= 0 && local107 < 104) {
local171 = Static31.anIntArrayArray6[local97][local107]++;
}
}
} else if (((local42 & 0x1) != 0 || (local16.xFine & 0x7F) == 0 && (local16.zFine & 0x7F) == 0) && ((local42 & 0x1) != 1 || (local16.xFine & 0x7F) == 64 && (local16.zFine & 0x7F) == 64)) {
local97 = local16.xFine - local42 * 64 >> 7;
local107 = local16.zFine - local42 * 64 >> 7;
local113 = local16.getSize() + local97;
if (local97 < 0) {
local97 = 0;
}
if (local113 > 104) {
local113 = 104;
}
local133 = local107 + local16.getSize();
if (local107 < 0) {
local107 = 0;
}
if (local133 > 104) {
local133 = 104;
}
for (local149 = local97; local149 < local113; local149++) {
for (local158 = local107; local158 < local133; local158++) {
local171 = Static31.anIntArrayArray6[local149][local158]++;
}
}
}
}
}
label200: for (local7 = 0; local7 < NpcList.size; local7++) {
local16 = NpcList.npcs[NpcList.ids[local7]];
@Pc(262) long local262 = (long) NpcList.ids[local7] << 32 | 0x20000000L;
if (local16 != null && local16.method2682() && local16.type.aBoolean182 == arg0 && local16.type.isMultiNpcValid()) {
local107 = local16.getSize();
if (local107 == 1) {
if ((local16.xFine & 0x7F) == 64 && (local16.zFine & 0x7F) == 64) {
local113 = local16.xFine >> 7;
local133 = local16.zFine >> 7;
if (local113 < 0 || local113 >= 104 || local133 < 0 || local133 >= 104) {
continue;
}
if (Static31.anIntArrayArray6[local113][local133] > 1) {
local171 = Static31.anIntArrayArray6[local113][local133]--;
continue;
}
}
} else if ((local107 & 0x1) == 0 && (local16.xFine & 0x7F) == 0 && (local16.zFine & 0x7F) == 0 || (local107 & 0x1) == 1 && (local16.xFine & 0x7F) == 64 && (local16.zFine & 0x7F) == 64) {
local113 = local16.xFine - local107 * 64 >> 7;
local133 = local16.zFine - local107 * 64 >> 7;
local158 = local133 + local107;
if (local133 < 0) {
local133 = 0;
}
@Pc(368) boolean local368 = true;
local149 = local113 + local107;
if (local158 > 104) {
local158 = 104;
}
if (local113 < 0) {
local113 = 0;
}
if (local149 > 104) {
local149 = 104;
}
@Pc(396) int local396;
@Pc(401) int local401;
for (local396 = local113; local396 < local149; local396++) {
for (local401 = local133; local401 < local158; local401++) {
if (Static31.anIntArrayArray6[local396][local401] <= 1) {
local368 = false;
break;
}
}
}
if (local368) {
local396 = local113;
while (true) {
if (local396 >= local149) {
continue label200;
}
for (local401 = local133; local401 < local158; local401++) {
local171 = Static31.anIntArrayArray6[local396][local401]--;
}
local396++;
}
}
}
if (!local16.type.aBoolean183) {
local262 |= Long.MIN_VALUE;
}
local16.anInt3424 = SceneGraph.getTileHeight(Player.level, local16.xFine, local16.zFine);
Static43.method1141(Player.level, local16.xFine, local16.zFine, local16.anInt3424, local107 * 64 + 60 - 64, local16, local16.anInt3381, local262, local16.aBoolean171);
}
}
}
@OriginalMember(owner = "client!nk", name = "a", descriptor = "(Z[J[I)V")
public static void method3243(@OriginalArg(1) long[] arg0, @OriginalArg(2) int[] arg1) { public static void method3243(@OriginalArg(1) long[] arg0, @OriginalArg(2) int[] arg1) {
Static83.method436(arg0, 0, arg0.length - 1, arg1); Static83.method436(arg0, 0, arg0.length - 1, arg1);
} }

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

@ -1,26 +0,0 @@
package rt4;
import org.openrs2.deob.annotation.OriginalArg;
import org.openrs2.deob.annotation.OriginalMember;
import org.openrs2.deob.annotation.Pc;
public final class Static174 {
@OriginalMember(owner = "client!nl", name = "d", descriptor = "F")
public static float aFloat22;
@OriginalMember(owner = "client!nl", name = "g", descriptor = "I")
public static int anInt4191;
@OriginalMember(owner = "client!nl", name = "b", descriptor = "[[F")
public static final float[][] aFloatArrayArray2 = new float[2][8];
@OriginalMember(owner = "client!nl", name = "f", descriptor = "[[I")
public static final int[][] anIntArrayArray32 = new int[2][8];
@OriginalMember(owner = "client!nl", name = "a", descriptor = "(F)F")
public static float method3250(@OriginalArg(0) float arg0) {
@Pc(7) float local7 = (float) Math.pow(2.0D, (double) arg0) * 32.703197F;
return local7 * 3.1415927F / 11025.0F;
}
}

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

@ -4,10 +4,7 @@ import org.openrs2.deob.annotation.OriginalMember;
public final class Static175 { public final class Static175 {
@OriginalMember(owner = "client!nm", name = "P", descriptor = "[I") @OriginalMember(owner = "client!nm", name = "W", descriptor = "Lclient!na;")
public static int[] npcSpawnsFileIds;
@OriginalMember(owner = "client!nm", name = "W", descriptor = "Lclient!na;")
public static JagString url; public static JagString url;
@OriginalMember(owner = "client!nm", name = "U", descriptor = "I") @OriginalMember(owner = "client!nm", name = "U", descriptor = "I")
@ -16,7 +13,7 @@ public final class Static175 {
@OriginalMember(owner = "client!nm", name = "a", descriptor = "(Z)V") @OriginalMember(owner = "client!nm", name = "a", descriptor = "(Z)V")
public static void method3279() { public static void method3279() {
if (Static267.anInt5775 > 0) { if (Static267.anInt5775 > 0) {
Static278.processLogout(); LoginManager.processLogout();
} else { } else {
Static233.aClass95_4 = Protocol.socket; Static233.aClass95_4 = Protocol.socket;
Protocol.socket = null; Protocol.socket = null;

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

@ -16,7 +16,9 @@ public final class Static176 {
public static final JagString aClass100_420 = JagString.parse(")1o"); public static final JagString aClass100_420 = JagString.parse(")1o");
@OriginalMember(owner = "client!nd", name = "x", descriptor = "Lclient!na;") @OriginalMember(owner = "client!nd", name = "x", descriptor = "Lclient!na;")
public static final JagString aClass100_783 = JagString.parse(")4p="); public static final JagString aClass100_783 = JagString.parse(")4p=");
@OriginalMember(owner = "client!ob", name = "f", descriptor = "Lclient!ve;") @OriginalMember(owner = "client!rc", name = "G", descriptor = "Lclient!na;")
public static final JagString aClass100_230 = JagString.parse("");
@OriginalMember(owner = "client!ob", name = "f", descriptor = "Lclient!ve;")
public static Js5 aClass153_76; public static Js5 aClass153_76;
@OriginalMember(owner = "client!ob", name = "a", descriptor = "[Z") @OriginalMember(owner = "client!ob", name = "a", descriptor = "[Z")
@ -47,15 +49,15 @@ public final class Static176 {
} }
return true; return true;
} else { } else {
@Pc(62) JagString local62 = Static211.aClass100_230; @Pc(62) JagString local62 = aClass100_230;
if (client.modeWhere != 0) { if (client.modeWhere != 0) {
local62 = JagString.concatenate(new JagString[] { aClass100_193, JagString.parseInt(local3.id + 7000) }); local62 = JagString.concatenate(new JagString[] { aClass100_193, JagString.parseInt(local3.id + 7000) });
} }
@Pc(89) JagString local89 = Static211.aClass100_230; @Pc(89) JagString local89 = aClass100_230;
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;

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