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

Added more CS2 opcodes, need to adopt NXT naming next

Browse source
This commit is contained in:
Pazaz 2022-05-15 23:47:55 -04:00
parent 3531b1c57c
commit 5f4a83c394
45 changed files with 2725 additions and 601 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -1,9 +1,12 @@
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!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 +20,30 @@ 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;
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;
@ -126,19 +153,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 +173,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,20 +188,20 @@ 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; Static13.aBoolean16 = false;
} else { } else {
@ -185,8 +212,8 @@ public class Camera {
Static186.aBoolean205 = false; Static186.aBoolean205 = false;
Static13.aBoolean16 = false; Static13.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 +222,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; Static138.renderX = (int) renderCoordinates[0] - originX * 128;
Static134.renderZ = (int) renderCoordinates[2] - Static142.originZ * 128; Static134.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 +252,61 @@ 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;
Static265.anInt5765 = arg1;
Static233.anInt5217 = arg4;
Static251.anInt5449 = arg3;
Static260.anInt1744 = arg0;
if (Static233.anInt5217 >= 100) {
@Pc(30) int local30 = Static251.anInt5449 * 128 + 64;
@Pc(36) int local36 = Static265.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 - Static138.renderX;
@Pc(59) int local59 = local36 - Static134.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;
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;
}
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;
} }
} }

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

@ -102,8 +102,8 @@ 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]; Static84.anInt2255 = PathFinder.queueZ[0];
Static115.mapFlagX = PathFinder.queueX[0]; Static115.mapFlagX = PathFinder.queueX[0];
for (@Pc(126) int local126 = 1; local126 < local13; local126++) { for (@Pc(126) int local126 = 1; local126 < local13; local126++) {
@ -160,21 +160,6 @@ 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);
@ -246,8 +231,8 @@ public class ClientProt {
for (id = 0; id < Static273.mapFilesBuffer.length; id++) { for (id = 0; id < Static273.mapFilesBuffer.length; id++) {
@Pc(294) byte[] local294 = Static156.locationMapFilesBuffer[id]; @Pc(294) byte[] local294 = Static156.locationMapFilesBuffer[id];
if (local294 != null) { if (local294 != null) {
chunkZ = (Static238.regionBitPacked[id] & 0xFF) * 64 - Static142.originZ; chunkZ = (Static238.regionBitPacked[id] & 0xFF) * 64 - Camera.originZ;
chunkX = (Static238.regionBitPacked[id] >> 8) * 64 - Static225.originX; chunkX = (Static238.regionBitPacked[id] >> 8) * 64 - Camera.originX;
if (Static230.dynamicMapRegion) { if (Static230.dynamicMapRegion) {
chunkZ = 10; chunkZ = 10;
chunkX = 10; chunkX = 10;
@ -257,8 +242,8 @@ public class ClientProt {
if (GlRenderer.enabled) { if (GlRenderer.enabled) {
local294 = Static19.underWaterLocationsMapFilesBuffer[id]; local294 = Static19.underWaterLocationsMapFilesBuffer[id];
if (local294 != null) { if (local294 != null) {
chunkX = (Static238.regionBitPacked[id] >> 8) * 64 - Static225.originX; chunkX = (Static238.regionBitPacked[id] >> 8) * 64 - Camera.originX;
chunkZ = (Static238.regionBitPacked[id] & 0xFF) * 64 - Static142.originZ; chunkZ = (Static238.regionBitPacked[id] & 0xFF) * 64 - Camera.originZ;
if (Static230.dynamicMapRegion) { if (Static230.dynamicMapRegion) {
chunkZ = 10; chunkZ = 10;
chunkX = 10; chunkX = 10;

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

@ -225,7 +225,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;
@ -669,7 +669,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();
@ -1075,7 +1075,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) {

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/LoginManager.java
View file

@ -497,8 +497,8 @@ public class LoginManager {
@OriginalMember(owner = "client!ca", name = "h", descriptor = "(I)V") @OriginalMember(owner = "client!ca", name = "h", descriptor = "(I)V")
public static void setupLoadingScreenRegion() { public static void setupLoadingScreenRegion() {
@Pc(10) int local10 = (Static138.renderX >> 10) + (Static225.originX >> 3); @Pc(10) int local10 = (Static138.renderX >> 10) + (Camera.originX >> 3);
@Pc(23) int local23 = (Static134.renderZ >> 10) + (Static142.originZ >> 3); @Pc(23) int local23 = (Static134.renderZ >> 10) + (Camera.originZ >> 3);
Static156.locationMapFilesBuffer = new byte[18][]; Static156.locationMapFilesBuffer = new byte[18][];
Static35.underWaterLocationsMapFileIds = new int[18]; Static35.underWaterLocationsMapFileIds = new int[18];
Static191.npcSpawnsFilesBuffer = new byte[18][]; Static191.npcSpawnsFilesBuffer = new byte[18][];

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

@ -236,12 +236,12 @@ public class MiniMap {
if (Static235.mapElementList != null) { if (Static235.mapElementList != null) {
for (@Pc(117) int local117 = 0; local117 < Static235.mapElementList.anInt5074; local117++) { for (@Pc(117) int local117 = 0; local117 < Static235.mapElementList.anInt5074; local117++) {
if (Static235.mapElementList.method3892(local117)) { if (Static235.mapElementList.method3892(local117)) {
local146 = (Static235.mapElementList.aShortArray73[local117] - Static225.originX) * 4 + 2 - PlayerList.self.xFine / 32; local146 = (Static235.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 = (Static235.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 (Static235.mapElementList.method3894(local117) == 1) {
@ -361,8 +361,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) {

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

@ -347,8 +347,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,9 +412,9 @@ 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.method2909();
@ -448,16 +448,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;
@ -485,7 +485,7 @@ 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);
@ -559,8 +559,8 @@ public class MiniMenu {
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 +573,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 +619,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];
@ -702,8 +702,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) {
@ -775,11 +775,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,9 +797,9 @@ 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) {
@ -851,14 +851,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);
@ -901,8 +901,8 @@ public class MiniMenu {
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 +946,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 +963,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 +997,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];

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

8
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) {

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

@ -141,7 +141,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();
} }
@ -172,7 +172,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();
} }

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

@ -1251,7 +1251,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 +1364,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 +1425,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;
@ -1594,7 +1594,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) {
@ -1886,8 +1886,8 @@ 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); Static92.method1881(plane, rotation, type, z, type2, x, seqId);
opcode = -1; opcode = -1;
@ -2059,7 +2059,7 @@ 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) {
@ -2307,7 +2307,7 @@ 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] + ",";
} }
@ -2741,11 +2741,11 @@ public class Protocol {
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 +2753,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 +2765,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 +2810,9 @@ public class Protocol {
InterfaceList.redraw(Static43.aClass13_11); InterfaceList.redraw(Static43.aClass13_11);
} }
} }
if (Static227.cameraType == 1) { if (Camera.cameraType == 1) {
Static250.method4273(); Static250.method4273();
} else if (Static227.cameraType == 2) { } else if (Camera.cameraType == 2) {
Camera.updateLockedCamera(); Camera.updateLockedCamera();
} else { } else {
Camera.updateLoginScreenCamera(); Camera.updateLoginScreenCamera();

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

File diff suppressed because it is too large Load diff

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

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

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

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

@ -1,6 +1,5 @@
package rt4; package rt4;
import java.io.UnsupportedEncodingException;
import java.nio.charset.StandardCharsets; import java.nio.charset.StandardCharsets;
import org.openrs2.deob.annotation.OriginalArg; import org.openrs2.deob.annotation.OriginalArg;
@ -29,9 +28,6 @@ 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;
@ -57,13 +53,13 @@ public final class Static127 {
client.setGameState(25); client.setGameState(25);
} }
Static114.drawTextOnScreen(true, LocalizedText.LOADING); Static114.drawTextOnScreen(true, LocalizedText.LOADING);
@Pc(53) int local53 = Static142.originZ; @Pc(53) int local53 = Camera.originZ;
@Pc(55) int local55 = Static225.originX; @Pc(55) int local55 = Camera.originX;
Static142.originZ = arg1 * 8 - 48; Camera.originZ = arg1 * 8 - 48;
Static225.originX = (arg2 - 6) * 8; Camera.originX = (arg2 - 6) * 8;
Static158.aClass3_Sub2_Sub4_3 = MapList.getContainingSource(Static80.centralZoneX * 8, Static52.anInt1695 * 8); Static158.aClass3_Sub2_Sub4_3 = MapList.getContainingSource(Static80.centralZoneX * 8, Static52.anInt1695 * 8);
@Pc(81) int local81 = Static142.originZ - local53; @Pc(81) int local81 = Camera.originZ - local53;
@Pc(86) int local86 = Static225.originX - local55; @Pc(86) int local86 = Camera.originX - local55;
Static235.mapElementList = null; Static235.mapElementList = null;
@Pc(96) int local96; @Pc(96) int local96;
@Pc(103) Npc local103; @Pc(103) Npc local103;
@ -157,7 +153,7 @@ public final class Static127 {
Static265.anInt5765 -= local81; Static265.anInt5765 -= local81;
Static245.anInt5375 -= local86; Static245.anInt5375 -= local86;
} else { } else {
Static227.cameraType = 1; Camera.cameraType = 1;
} }
SoundPlayer.anInt4451 = 0; SoundPlayer.anInt4451 = 0;
if (Static115.mapFlagX != 0) { if (Static115.mapFlagX != 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;
}
} }

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

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

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

@ -9,9 +9,6 @@ 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") @OriginalMember(owner = "client!me", name = "a", descriptor = "(II)I")
public static int getVarbit(@OriginalArg(1) int arg0) { public static int getVarbit(@OriginalArg(1) int arg0) {
@Pc(13) VarbitType local13 = VarbitTypeList.get(arg0); @Pc(13) VarbitType local13 = VarbitTypeList.get(arg0);

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

@ -36,9 +36,9 @@ public final class Static158 {
@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 + (Static238.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 + (Static238.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 == Static41.anInt1316 && local125 >= 0 && local148.size + local125 < 104 && local142 >= 0 && local142 + local148.size < 104) {
NpcList.npcs[local97] = new Npc(); NpcList.npcs[local97] = new Npc();

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

@ -50,8 +50,8 @@ public final class Static18 {
local55 = local72 * local57 >> 16; local55 = local72 * local57 >> 16;
local57 = local57 * local68 >> 16; local57 = local57 * local68 >> 16;
} }
Static240.cameraPitch = arg6; Camera.cameraPitch = arg6;
Static184.cameraYaw = arg4; Camera.cameraYaw = arg4;
Static134.renderZ = arg5 - local57; Static134.renderZ = arg5 - local57;
Static138.renderX = arg0 - local55; Static138.renderX = arg0 - local55;
Static5.anInt40 = arg2 - local59; Static5.anInt40 = arg2 - local59;

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

@ -6,9 +6,6 @@ import org.openrs2.deob.annotation.Pc;
public final class Static184 { public final class Static184 {
@OriginalMember(owner = "client!ol", name = "ib", descriptor = "I")
public static int cameraYaw;
@OriginalMember(owner = "client!ol", name = "a", descriptor = "(IIIILclient!th;IJIIII)Z") @OriginalMember(owner = "client!ol", name = "a", descriptor = "(IIIILclient!th;IJIIII)Z")
public static boolean method3387(@OriginalArg(0) int arg0, @OriginalArg(1) int arg1, @OriginalArg(2) int arg2, @OriginalArg(3) int arg3, @OriginalArg(4) Entity arg4, @OriginalArg(5) int arg5, @OriginalArg(6) long arg6, @OriginalArg(7) int arg7, @OriginalArg(8) int arg8, @OriginalArg(9) int arg9, @OriginalArg(10) int arg10) { public static boolean method3387(@OriginalArg(0) int arg0, @OriginalArg(1) int arg1, @OriginalArg(2) int arg2, @OriginalArg(3) int arg3, @OriginalArg(4) Entity arg4, @OriginalArg(5) int arg5, @OriginalArg(6) long arg6, @OriginalArg(7) int arg7, @OriginalArg(8) int arg8, @OriginalArg(9) int arg9, @OriginalArg(10) int arg10) {
return arg4 == null ? true : Static105.method2256(arg0, arg7, arg8, arg9 + 1 - arg7, arg10 - arg8 + 1, arg1, arg2, arg3, arg4, arg5, true, arg6); return arg4 == null ? true : Static105.method2256(arg0, arg7, arg8, arg9 + 1 - arg7, arg10 - arg8 + 1, arg1, arg2, arg3, arg4, arg5, true, arg6);

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

@ -20,10 +20,10 @@ public final class Static198 {
@Pc(42) int local42 = arg2 - Static134.renderZ; @Pc(42) int local42 = arg2 - Static134.renderZ;
@Pc(46) int local46 = local38 - Static5.anInt40; @Pc(46) int local46 = local38 - Static5.anInt40;
@Pc(50) int local50 = arg5 - Static138.renderX; @Pc(50) int local50 = arg5 - Static138.renderX;
@Pc(54) int local54 = MathUtils.sin[Static240.cameraPitch]; @Pc(54) int local54 = MathUtils.sin[Camera.cameraPitch];
@Pc(58) int local58 = MathUtils.cos[Static240.cameraPitch]; @Pc(58) int local58 = MathUtils.cos[Camera.cameraPitch];
@Pc(62) int local62 = MathUtils.sin[Static184.cameraYaw]; @Pc(62) int local62 = MathUtils.sin[Camera.cameraYaw];
@Pc(66) int local66 = MathUtils.cos[Static184.cameraYaw]; @Pc(66) int local66 = MathUtils.cos[Camera.cameraYaw];
@Pc(76) int local76 = local50 * local66 + local62 * local42 >> 16; @Pc(76) int local76 = local50 * local66 + local62 * local42 >> 16;
@Pc(87) int local87 = local42 * local66 - local62 * local50 >> 16; @Pc(87) int local87 = local42 * local66 - local62 * local50 >> 16;
@Pc(89) int local89 = local76; @Pc(89) int local89 = local76;

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

@ -6,9 +6,6 @@ import org.openrs2.deob.annotation.Pc;
public final class Static225 { public final class Static225 {
@OriginalMember(owner = "client!se", name = "a", descriptor = "I")
public static int originX;
@OriginalMember(owner = "client!se", name = "h", descriptor = "I") @OriginalMember(owner = "client!se", name = "h", descriptor = "I")
public static int anInt5073 = -1; public static int anInt5073 = -1;

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

@ -4,9 +4,6 @@ import org.openrs2.deob.annotation.OriginalMember;
public final class Static227 { public final class Static227 {
@OriginalMember(owner = "client!sg", name = "o", descriptor = "I")
public static int cameraType;
@OriginalMember(owner = "client!sg", name = "e", descriptor = "Lclient!na;") @OriginalMember(owner = "client!sg", name = "e", descriptor = "Lclient!na;")
public static final JagString SETTINGS = JagString.parse("settings"); public static final JagString SETTINGS = JagString.parse("settings");

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

@ -8,8 +8,6 @@ public final class Static228 {
@OriginalMember(owner = "client!dc", name = "db", descriptor = "[[B") @OriginalMember(owner = "client!dc", name = "db", descriptor = "[[B")
public static final byte[][] aByteArrayArray6 = new byte[50][]; public static final byte[][] aByteArrayArray6 = new byte[50][];
@OriginalMember(owner = "client!sh", name = "c", descriptor = "I")
public static int anInt5101 = 0;
@OriginalMember(owner = "client!sh", name = "e", descriptor = "Lclient!na;") @OriginalMember(owner = "client!sh", name = "e", descriptor = "Lclient!na;")
public static final JagString aClass100_967 = JagString.parse(""); public static final JagString aClass100_967 = JagString.parse("");

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

@ -21,9 +21,6 @@ public final class Static233 {
@OriginalMember(owner = "client!t", name = "y", descriptor = "I") @OriginalMember(owner = "client!t", name = "y", descriptor = "I")
public static int loadingScreenState = 0; public static int loadingScreenState = 0;
@OriginalMember(owner = "client!t", name = "z", descriptor = "I")
public static int anInt5224 = 0;
@OriginalMember(owner = "client!t", name = "C", descriptor = "Lclient!na;") @OriginalMember(owner = "client!t", name = "C", descriptor = "Lclient!na;")
public static final JagString aClass100_994 = JagString.parse(")3"); public static final JagString aClass100_994 = JagString.parse(")3");
@ -34,7 +31,7 @@ public final class Static233 {
while (local5.length > local3) { while (local5.length > local3) {
@Pc(17) MapMarker local17 = local5[local3]; @Pc(17) MapMarker local17 = local5[local3];
if (local17 != null && local17.type == 2) { if (local17 != null && local17.type == 2) {
Static198.method1026(arg0 >> 1, arg4, (local17.anInt4046 - Static142.originZ << 7) + local17.anInt4047, local17.anInt4050 * 2, arg2 >> 1, local17.anInt4045 + (local17.targetX - Static225.originX << 7), arg3); Static198.method1026(arg0 >> 1, arg4, (local17.anInt4046 - Camera.originZ << 7) + local17.anInt4047, local17.anInt4050 * 2, arg2 >> 1, local17.anInt4045 + (local17.targetX - Camera.originX << 7), arg3);
if (Static65.anInt1951 > -1 && client.loop % 20 < 10) { if (Static65.anInt1951 > -1 && client.loop % 20 < 10) {
Sprites.headhints[local17.anInt4048].render(arg1 + Static65.anInt1951 - 12, arg5 + -28 - -Static16.anInt548); Sprites.headhints[local17.anInt4048].render(arg1 + Static65.anInt1951 - 12, arg5 + -28 - -Static16.anInt548);
} }

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

@ -4,9 +4,6 @@ import org.openrs2.deob.annotation.OriginalMember;
public final class Static240 { public final class Static240 {
@OriginalMember(owner = "client!tg", name = "b", descriptor = "I")
public static int cameraPitch;
@OriginalMember(owner = "client!tg", name = "e", descriptor = "Lclient!na;") @OriginalMember(owner = "client!tg", name = "e", descriptor = "Lclient!na;")
public static final JagString aClass100_1008 = JagString.parse("<col=00ffff>"); public static final JagString aClass100_1008 = JagString.parse("<col=00ffff>");

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

@ -32,7 +32,7 @@ public final class Static252 {
Static243.anIntArray476[local33] = 1000000; Static243.anIntArray476[local33] = 1000000;
Static50.anIntArray134[local33] = 0; Static50.anIntArray134[local33] = 0;
} }
if (Static227.cameraType != 1) { if (Camera.cameraType != 1) {
local33 = SceneGraph.getTileHeight(Player.level, Static138.renderX, Static134.renderZ); local33 = SceneGraph.getTileHeight(Player.level, Static138.renderX, Static134.renderZ);
if (local33 - Static5.anInt40 < 800 && (SceneGraph.tileFlags[Player.level][Static138.renderX >> 7][Static134.renderZ >> 7] & 0x4) != 0) { if (local33 - Static5.anInt40 < 800 && (SceneGraph.tileFlags[Player.level][Static138.renderX >> 7][Static134.renderZ >> 7] & 0x4) != 0) {
Static254.method4348(false, Static138.renderX >> 7, Static134.renderZ >> 7, SceneGraph.tiles, 1); Static254.method4348(false, Static138.renderX >> 7, Static134.renderZ >> 7, SceneGraph.tiles, 1);
@ -42,7 +42,7 @@ public final class Static252 {
if ((SceneGraph.tileFlags[Player.level][PlayerList.self.xFine >> 7][PlayerList.self.zFine >> 7] & 0x4) != 0) { if ((SceneGraph.tileFlags[Player.level][PlayerList.self.xFine >> 7][PlayerList.self.zFine >> 7] & 0x4) != 0) {
Static254.method4348(false, PlayerList.self.xFine >> 7, PlayerList.self.zFine >> 7, SceneGraph.tiles, 0); Static254.method4348(false, PlayerList.self.xFine >> 7, PlayerList.self.zFine >> 7, SceneGraph.tiles, 0);
} }
if (Static240.cameraPitch >= 310) { if (Camera.cameraPitch >= 310) {
return; return;
} }
@Pc(135) int local135 = PlayerList.self.zFine >> 7; @Pc(135) int local135 = PlayerList.self.zFine >> 7;

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

@ -35,7 +35,7 @@ public final class Static253 {
} }
@Pc(59) int local59; @Pc(59) int local59;
@Pc(57) int local57; @Pc(57) int local57;
if (Static227.cameraType == 1) { if (Camera.cameraType == 1) {
local57 = Static230.anInt5161 + (int)Camera.yawTarget & 0x7FF; local57 = Static230.anInt5161 + (int)Camera.yawTarget & 0x7FF;
local59 = (int)Camera.pitchTarget; local59 = (int)Camera.pitchTarget;
if (local59 < Static234.anInt5245 / 256) { if (local59 < Static234.anInt5245 / 256) {
@ -49,23 +49,23 @@ public final class Static253 {
local57 = Static5.anInt40; local57 = Static5.anInt40;
local59 = Static138.renderX; local59 = Static138.renderX;
@Pc(121) int local121 = Static134.renderZ; @Pc(121) int local121 = Static134.renderZ;
@Pc(123) int local123 = Static240.cameraPitch; @Pc(123) int local123 = Camera.cameraPitch;
@Pc(125) int local125 = Static184.cameraYaw; @Pc(125) int local125 = Camera.cameraYaw;
@Pc(127) int local127; @Pc(127) int local127;
@Pc(171) int local171; @Pc(171) int local171;
for (local127 = 0; local127 < 5; local127++) { for (local127 = 0; local127 < 5; local127++) {
if (Static176.customCameraActive[local127]) { if (Static176.customCameraActive[local127]) {
local171 = (int) ((double) -Static222.cameraJitter[local127] + (double) (Static222.cameraJitter[local127] * 2 + 1) * Math.random() + Math.sin((double) Static31.anIntArray76[local127] * ((double) Static202.cameraFrequency[local127] / 100.0D)) * (double) Static276.cameraAmplitude[local127]); local171 = (int) ((double) -Static222.cameraJitter[local127] + (double) (Static222.cameraJitter[local127] * 2 + 1) * Math.random() + Math.sin((double) Static31.anIntArray76[local127] * ((double) Static202.cameraFrequency[local127] / 100.0D)) * (double) Static276.cameraAmplitude[local127]);
if (local127 == 3) { if (local127 == 3) {
Static184.cameraYaw = local171 + Static184.cameraYaw & 0x7FF; Camera.cameraYaw = local171 + Camera.cameraYaw & 0x7FF;
} }
if (local127 == 4) { if (local127 == 4) {
Static240.cameraPitch += local171; Camera.cameraPitch += local171;
if (Static240.cameraPitch < 128) { if (Camera.cameraPitch < 128) {
Static240.cameraPitch = 128; Camera.cameraPitch = 128;
} }
if (Static240.cameraPitch > 383) { if (Camera.cameraPitch > 383) {
Static240.cameraPitch = 383; Camera.cameraPitch = 383;
} }
} }
if (local127 == 2) { if (local127 == 2) {
@ -82,9 +82,9 @@ public final class Static253 {
Static252.method4302(); Static252.method4302();
if (GlRenderer.enabled) { if (GlRenderer.enabled) {
GlRaster.setClip(arg2, arg4, arg2 + arg3, arg4 - -arg0); GlRaster.setClip(arg2, arg4, arg2 + arg3, arg4 - -arg0);
@Pc(248) float local248 = (float) Static240.cameraPitch * 0.17578125F; @Pc(248) float local248 = (float) Camera.cameraPitch * 0.17578125F;
@Pc(253) float local253 = (float) Static184.cameraYaw * 0.17578125F; @Pc(253) float local253 = (float) Camera.cameraYaw * 0.17578125F;
if (Static227.cameraType == 3) { if (Camera.cameraType == 3) {
local248 = Static146.aFloat15 * 360.0F / 6.2831855F; local248 = Static146.aFloat15 * 360.0F / 6.2831855F;
local253 = Static84.aFloat10 * 360.0F / 6.2831855F; local253 = Static84.aFloat10 * 360.0F / 6.2831855F;
} }
@ -119,9 +119,9 @@ public final class Static253 {
} }
LightingManager.method2394(client.loop, !Preferences.flickeringEffectsOn); LightingManager.method2394(client.loop, !Preferences.flickeringEffectsOn);
GlRenderer.clearColorAndDepthBuffers(local171); GlRenderer.clearColorAndDepthBuffers(local171);
Static143.method2731(Static240.cameraPitch, Static134.renderZ, Static5.anInt40, Static138.renderX, Static184.cameraYaw); Static143.method2731(Camera.cameraPitch, Static134.renderZ, Static5.anInt40, Static138.renderX, Camera.cameraYaw);
GlRenderer.anInt5323 = client.loop; GlRenderer.anInt5323 = client.loop;
Static156.method2954(Static138.renderX, Static5.anInt40, Static134.renderZ, Static240.cameraPitch, Static184.cameraYaw, Static266.aByteArrayArrayArray15, Static79.anIntArray205, Static149.anIntArray338, Static267.anIntArray518, Static50.anIntArray134, Static243.anIntArray476, Player.level + 1, local387, PlayerList.self.xFine >> 7, PlayerList.self.zFine >> 7); Static156.method2954(Static138.renderX, Static5.anInt40, Static134.renderZ, Camera.cameraPitch, Camera.cameraYaw, Static266.aByteArrayArrayArray15, Static79.anIntArray205, Static149.anIntArray338, Static267.anIntArray518, Static50.anIntArray134, Static243.anIntArray476, Player.level + 1, local387, PlayerList.self.xFine >> 7, PlayerList.self.zFine >> 7);
Static263.aBoolean299 = true; Static263.aBoolean299 = true;
LightingManager.method2390(); LightingManager.method2390();
Static143.method2731(0, 0, 0, 0, 0); Static143.method2731(0, 0, 0, 0, 0);
@ -131,7 +131,7 @@ public final class Static253 {
Static233.method4000(arg3, arg2, arg0, Static223.anInt5029, Static223.anInt5029, arg4); Static233.method4000(arg3, arg2, arg0, Static223.anInt5029, Static223.anInt5029, arg4);
} else { } else {
SoftwareRaster.fillRect(arg2, arg4, arg3, arg0, 0); SoftwareRaster.fillRect(arg2, arg4, arg3, arg0, 0);
Static156.method2954(Static138.renderX, Static5.anInt40, Static134.renderZ, Static240.cameraPitch, Static184.cameraYaw, Static266.aByteArrayArrayArray15, Static79.anIntArray205, Static149.anIntArray338, Static267.anIntArray518, Static50.anIntArray134, Static243.anIntArray476, Player.level + 1, local387, PlayerList.self.xFine >> 7, PlayerList.self.zFine >> 7); Static156.method2954(Static138.renderX, Static5.anInt40, Static134.renderZ, Camera.cameraPitch, Camera.cameraYaw, Static266.aByteArrayArrayArray15, Static79.anIntArray205, Static149.anIntArray338, Static267.anIntArray518, Static50.anIntArray134, Static243.anIntArray476, Player.level + 1, local387, PlayerList.self.xFine >> 7, PlayerList.self.zFine >> 7);
client.audioLoop(); client.audioLoop();
Static223.method3858(); Static223.method3858();
method2726(arg4, arg3, arg2, 256, arg0, 256); method2726(arg4, arg3, arg2, 256, arg0, 256);
@ -139,11 +139,11 @@ public final class Static253 {
} }
((Js5GlTextureProvider) Rasteriser.textureProvider).method3239(Static178.anInt4247); ((Js5GlTextureProvider) Rasteriser.textureProvider).method3239(Static178.anInt4247);
Static115.method2310(arg3, arg4, arg0, arg2); Static115.method2310(arg3, arg4, arg0, arg2);
Static240.cameraPitch = local123; Camera.cameraPitch = local123;
Static134.renderZ = local121; Static134.renderZ = local121;
Static5.anInt40 = local57; Static5.anInt40 = local57;
Static138.renderX = local59; Static138.renderX = local59;
Static184.cameraYaw = local125; Camera.cameraYaw = local125;
if (Static19.aBoolean43 && client.js5NetQueue.method2328() == 0) { if (Static19.aBoolean43 && client.js5NetQueue.method2328() == 0) {
Static19.aBoolean43 = false; Static19.aBoolean43 = false;
} }

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

@ -24,8 +24,8 @@ public final class Static26 {
for (@Pc(25) int local25 = 0; local25 < local13; local25++) { for (@Pc(25) int local25 = 0; local25 < local13; local25++) {
@Pc(32) byte[] local32 = local19[local25]; @Pc(32) byte[] local32 = local19[local25];
if (local32 != null) { if (local32 != null) {
@Pc(45) int local45 = (Static238.regionBitPacked[local25] >> 8) * 64 - Static225.originX; @Pc(45) int local45 = (Static238.regionBitPacked[local25] >> 8) * 64 - Camera.originX;
@Pc(56) int local56 = (Static238.regionBitPacked[local25] & 0xFF) * 64 - Static142.originZ; @Pc(56) int local56 = (Static238.regionBitPacked[local25] & 0xFF) * 64 - Camera.originZ;
client.audioLoop(); client.audioLoop();
Static124.method2437(local45, arg0, local32, local56, PathFinder.collisionMaps); Static124.method2437(local45, arg0, local32, local56, PathFinder.collisionMaps);
} }

27
client/src/main/java/rt4/Static260.java
View file

@ -11,33 +11,6 @@ public final class Static260 {
@OriginalMember(owner = "client!eg", name = "a", descriptor = "I") @OriginalMember(owner = "client!eg", name = "a", descriptor = "I")
public static int anInt1744; public static int anInt1744;
@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;
Static265.anInt5765 = arg1;
Static233.anInt5217 = arg4;
Static251.anInt5449 = arg3;
anInt1744 = arg0;
if (Static233.anInt5217 >= 100) {
@Pc(30) int local30 = Static251.anInt5449 * 128 + 64;
@Pc(36) int local36 = Static265.anInt5765 * 128 + 64;
@Pc(44) int local44 = SceneGraph.getTileHeight(Player.level, local30, local36) - anInt1744;
@Pc(49) int local49 = local44 - Static5.anInt40;
@Pc(54) int local54 = local30 - Static138.renderX;
@Pc(59) int local59 = local36 - Static134.renderZ;
@Pc(70) int local70 = (int) Math.sqrt((double) (local59 * local59 + local54 * local54));
Static240.cameraPitch = (int) (Math.atan2((double) local49, (double) local70) * 325.949D) & 0x7FF;
Static184.cameraYaw = (int) (Math.atan2((double) local54, (double) local59) * -325.949D) & 0x7FF;
if (Static240.cameraPitch < 128) {
Static240.cameraPitch = 128;
}
if (Static240.cameraPitch > 383) {
Static240.cameraPitch = 383;
}
}
Static227.cameraType = 2;
}
@OriginalMember(owner = "client!vd", name = "b", descriptor = "(IIII)Z") @OriginalMember(owner = "client!vd", name = "b", descriptor = "(IIII)Z")
public static boolean method3850(@OriginalArg(0) int arg0, @OriginalArg(1) int arg1, @OriginalArg(2) int arg2, @OriginalArg(3) int arg3) { public static boolean method3850(@OriginalArg(0) int arg0, @OriginalArg(1) int arg1, @OriginalArg(2) int arg2, @OriginalArg(3) int arg3) {
if (!Static9.method187(arg0, arg1, arg2)) { if (!Static9.method187(arg0, arg1, arg2)) {

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

@ -110,10 +110,10 @@ public final class Static273 {
local41 = Static155.getVarbit(local124); local41 = Static155.getVarbit(local124);
} }
if (local46 == 18) { if (local46 == 18) {
local41 = (PlayerList.self.xFine >> 7) + Static225.originX; local41 = (PlayerList.self.xFine >> 7) + Camera.originX;
} }
if (local46 == 19) { if (local46 == 19) {
local41 = (PlayerList.self.zFine >> 7) + Static142.originZ; local41 = (PlayerList.self.zFine >> 7) + Camera.originZ;
} }
if (local46 == 20) { if (local46 == 20) {
local41 = local33[local39++]; local41 = local33[local39++];

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

@ -121,10 +121,10 @@ public final class Static278 {
MusicPlayer.groupId = -1; MusicPlayer.groupId = -1;
AreaSoundManager.clear(true); AreaSoundManager.clear(true);
Static230.dynamicMapRegion = false; Static230.dynamicMapRegion = false;
Static142.originZ = 0; Camera.originZ = 0;
Static80.centralZoneX = 0; Static80.centralZoneX = 0;
Static52.anInt1695 = 0; Static52.anInt1695 = 0;
Static225.originX = 0; Camera.originX = 0;
for (local19 = 0; local19 < Static143.hintMapMarkers.length; local19++) { for (local19 = 0; local19 < Static143.hintMapMarkers.length; local19++) {
Static143.hintMapMarkers[local19] = null; Static143.hintMapMarkers[local19] = null;
} }
@ -144,7 +144,7 @@ public final class Static278 {
} }
} }
} }
Static35.resetCameraEffects(); Camera.resetCameraEffects();
Protocol.verifyId = 0; Protocol.verifyId = 0;
VarpDomain.reset(); VarpDomain.reset();
Static73.method1596(true); Static73.method1596(true);

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

@ -99,15 +99,4 @@ public final class Static35 {
return 0L; return 0L;
} }
@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;
Static155.anInt3718 = -1;
Static52.anInt1694 = -1;
Static227.cameraType = 1;
}
} }

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

@ -30,38 +30,6 @@ public final class Static40 {
Static165.anInt4035 = arg0; Static165.anInt4035 = arg0;
} }
@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);
CreateManager.reply = -3;
CreateManager.step = 1;
CreateManager.loops = 0;
CreateManager.errors = 0;
}
@OriginalMember(owner = "client!da", name = "h", descriptor = "(B)V") @OriginalMember(owner = "client!da", name = "h", descriptor = "(B)V")
public static void method1019() { public static void method1019() {
Component.sprites.method3103(); Component.sprites.method3103();

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

@ -39,7 +39,7 @@ public final class Static44 {
} }
} }
Inv.method2073(); Inv.method2073();
Static227.cameraType = 1; Camera.cameraType = 1;
client.setGameState(30); client.setGameState(30);
for (local35 = 0; local35 < 100; local35++) { for (local35 = 0; local35 < 100; local35++) {
Static186.aBooleanArray100[local35] = true; Static186.aBooleanArray100[local35] = true;

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

@ -17,9 +17,6 @@ public final class Static52 {
@OriginalMember(owner = "client!eb", name = "u", descriptor = "I") @OriginalMember(owner = "client!eb", name = "u", descriptor = "I")
public static int anInt1695; public static int anInt1695;
@OriginalMember(owner = "client!eb", name = "t", descriptor = "I")
public static int anInt1694 = -1;
@OriginalMember(owner = "client!eb", name = "a", descriptor = "(IIIIIII)I") @OriginalMember(owner = "client!eb", name = "a", descriptor = "(IIIIIII)I")
public static int method1286(@OriginalArg(0) int arg0, @OriginalArg(1) int arg1, @OriginalArg(2) int arg2, @OriginalArg(3) int arg3, @OriginalArg(4) int arg4, @OriginalArg(6) int arg5) { public static int method1286(@OriginalArg(0) int arg0, @OriginalArg(1) int arg1, @OriginalArg(2) int arg2, @OriginalArg(3) int arg3, @OriginalArg(4) int arg4, @OriginalArg(6) int arg5) {
if ((arg2 & 0x1) == 1) { if ((arg2 & 0x1) == 1) {

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

@ -39,7 +39,7 @@ public final class Static73 {
client.setGameState(10); client.setGameState(10);
return; return;
} }
if (Static227.cameraType == 2) { if (Camera.cameraType == 2) {
Static138.renderX = Static245.anInt5375 << 7; Static138.renderX = Static245.anInt5375 << 7;
Static134.renderZ = Static248.anInt4232 << 7; Static134.renderZ = Static248.anInt4232 << 7;
} else { } else {

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

@ -6,9 +6,6 @@ import org.openrs2.deob.annotation.Pc;
public final class Static75 { public final class Static75 {
@OriginalMember(owner = "client!g", name = "d", descriptor = "I")
public static int anInt2119 = 0;
@OriginalMember(owner = "client!g", name = "b", descriptor = "(I)V") @OriginalMember(owner = "client!g", name = "b", descriptor = "(I)V")
public static void setDefaultChunksAtmosphere() { public static void setDefaultChunksAtmosphere() {
@Pc(9) Environment local9 = new Environment(); @Pc(9) Environment local9 = new Environment();

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

@ -49,8 +49,8 @@ public final class Static87 {
@Pc(49) int local49; @Pc(49) int local49;
@Pc(53) byte[] local53; @Pc(53) byte[] local53;
for (local20 = 0; local20 < local18; local20++) { for (local20 = 0; local20 < local18; local20++) {
local38 = (Static238.regionBitPacked[local20] >> 8) * 64 - Static225.originX; local38 = (Static238.regionBitPacked[local20] >> 8) * 64 - Camera.originX;
local49 = (Static238.regionBitPacked[local20] & 0xFF) * 64 - Static142.originZ; local49 = (Static238.regionBitPacked[local20] & 0xFF) * 64 - Camera.originZ;
local53 = local9[local20]; local53 = local9[local20];
if (local53 != null) { if (local53 != null) {
client.audioLoop(); client.audioLoop();
@ -58,8 +58,8 @@ public final class Static87 {
} }
} }
for (local20 = 0; local20 < local18; local20++) { for (local20 = 0; local20 < local18; local20++) {
local38 = (Static238.regionBitPacked[local20] >> 8) * 64 - Static225.originX; local38 = (Static238.regionBitPacked[local20] >> 8) * 64 - Camera.originX;
local49 = (Static238.regionBitPacked[local20] & 0xFF) * 64 - Static142.originZ; local49 = (Static238.regionBitPacked[local20] & 0xFF) * 64 - Camera.originZ;
local53 = local9[local20]; local53 = local9[local20];
if (local53 == null && Static52.anInt1695 < 800) { if (local53 == null && Static52.anInt1695 < 800) {
client.audioLoop(); client.audioLoop();
@ -496,7 +496,7 @@ public final class Static87 {
} }
} }
if (local117 == 0) { if (local117 == 0) {
if (local30.aBoolean30) { if (local30.filled) {
if (GlRenderer.enabled) { if (GlRenderer.enabled) {
GlRaster.method1186(local123, local114, local30.width, local30.height, local270); GlRaster.method1186(local123, local114, local30.width, local30.height, local270);
} else { } else {
@ -507,7 +507,7 @@ public final class Static87 {
} else { } else {
SoftwareRaster.drawRect(local123, local114, local30.width, local30.height, local270); SoftwareRaster.drawRect(local123, local114, local30.width, local30.height, local270);
} }
} else if (local30.aBoolean30) { } else if (local30.filled) {
if (GlRenderer.enabled) { if (GlRenderer.enabled) {
GlRaster.fillRectAlpha(local123, local114, local30.width, local30.height, local270, 256 - (local117 & 0xFF)); GlRaster.fillRectAlpha(local123, local114, local30.width, local30.height, local270, 256 - (local117 & 0xFF));
} else { } else {

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

@ -137,9 +137,9 @@ public class WorldMap {
targetZoom = 8.0F; targetZoom = 8.0F;
} }
@Pc(144) int local144 = (PlayerList.self.xFine >> 7) + Static225.originX - originX; @Pc(144) int local144 = (PlayerList.self.xFine >> 7) + Camera.originX - originX;
@Pc(153) int local153 = local144 + (int) (Math.random() * 10.0D) - 5; @Pc(153) int local153 = local144 + (int) (Math.random() * 10.0D) - 5;
@Pc(168) int local168 = originZ + length - Static142.originZ - (PlayerList.self.zFine >> 7) - 1; @Pc(168) int local168 = originZ + length - Camera.originZ - (PlayerList.self.zFine >> 7) - 1;
@Pc(177) int local177 = local168 + (int) (Math.random() * 10.0D) - 5; @Pc(177) int local177 = local168 + (int) (Math.random() * 10.0D) - 5;
if (local153 >= 0 && width > local153 && local177 >= 0 && local177 < length) { if (local153 >= 0 && width > local153 && local177 >= 0 && local177 < length) {
anInt435 = local153; anInt435 = local153;

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

@ -1010,7 +1010,7 @@ public final class client extends GameShell {
if (!GlRenderer.enabled) { if (!GlRenderer.enabled) {
Flames.update(); Flames.update();
} else if (LoginManager.step == 0 && CreateManager.step == 0) { } else if (LoginManager.step == 0 && CreateManager.step == 0) {
if (Static227.cameraType == 2) { if (Camera.cameraType == 2) {
Camera.updateLockedCamera(); Camera.updateLockedCamera();
} else { } else {
Camera.updateLoginScreenCamera(); Camera.updateLoginScreenCamera();

0
gradlew vendored Normal file → Executable file
View file

1897
ref/cs2-names.txt Normal file
View file

File diff suppressed because it is too large Load diff