diff --git a/client/src/main/java/rt4/Camera.java b/client/src/main/java/rt4/Camera.java index bf0c7de..5fbb8be 100644 --- a/client/src/main/java/rt4/Camera.java +++ b/client/src/main/java/rt4/Camera.java @@ -1,9 +1,12 @@ package rt4; +import org.openrs2.deob.annotation.OriginalArg; import org.openrs2.deob.annotation.OriginalMember; import org.openrs2.deob.annotation.Pc; 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") public static double pitchTarget = 128; @@ -17,6 +20,30 @@ public class Camera { public static int cameraZ; @OriginalMember(owner = "client!gg", name = "bb", descriptor = "I") 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) { return ((a % b) + b) % b; @@ -126,19 +153,19 @@ public class Camera { local268 = 383; } @Pc(292) int local292 = (int) (-325.949D * Math.atan2((double) local246, (double) local241)) & 0x7FF; - if (Static240.cameraPitch < local268) { - Static240.cameraPitch += Static133.anInt5230 + Static233.anInt5217 * (local268 - Static240.cameraPitch) / 1000; - if (Static240.cameraPitch > local268) { - Static240.cameraPitch = local268; + if (cameraPitch < local268) { + cameraPitch += Static133.anInt5230 + Static233.anInt5217 * (local268 - cameraPitch) / 1000; + if (cameraPitch > local268) { + cameraPitch = local268; } } - if (Static240.cameraPitch > local268) { - Static240.cameraPitch -= (Static240.cameraPitch - local268) * Static233.anInt5217 / 1000 + Static133.anInt5230; - if (Static240.cameraPitch < local268) { - Static240.cameraPitch = local268; + if (cameraPitch > local268) { + cameraPitch -= (cameraPitch - local268) * Static233.anInt5217 / 1000 + Static133.anInt5230; + if (cameraPitch < local268) { + cameraPitch = local268; } } - @Pc(350) int local350 = local292 - Static184.cameraYaw; + @Pc(350) int local350 = local292 - cameraYaw; if (local350 > 1024) { local350 -= 2048; } @@ -146,14 +173,14 @@ public class Camera { local350 += 2048; } if (local350 > 0) { - Static184.cameraYaw += local350 * Static233.anInt5217 / 1000 + Static133.anInt5230; - Static184.cameraYaw &= 0x7FF; + cameraYaw += local350 * Static233.anInt5217 / 1000 + Static133.anInt5230; + cameraYaw &= 0x7FF; } if (local350 < 0) { - Static184.cameraYaw -= Static233.anInt5217 * -local350 / 1000 + Static133.anInt5230; - Static184.cameraYaw &= 0x7FF; + cameraYaw -= Static233.anInt5217 * -local350 / 1000 + Static133.anInt5230; + cameraYaw &= 0x7FF; } - @Pc(404) int local404 = local292 - Static184.cameraYaw; + @Pc(404) int local404 = local292 - cameraYaw; if (local404 > 1024) { local404 -= 2048; } @@ -161,20 +188,20 @@ public class Camera { local404 += 2048; } if (local404 < 0 && local350 > 0 || local404 > 0 && local350 < 0) { - Static184.cameraYaw = local292; + cameraYaw = local292; } } @OriginalMember(owner = "client!da", name = "d", descriptor = "(I)V") public static void updateLoginScreenCamera() { - if (Static155.anInt3718 == -1 || Static52.anInt1694 == -1) { + if (anInt3718 == -1 || anInt1694 == -1) { 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]; - Static233.anInt5224 += local27; - if (Static233.anInt5224 >= 65535) { - Static233.anInt5224 = 65535; + anInt5224 += local27; + if (anInt5224 >= 65535) { + anInt5224 = 65535; if (Static186.aBoolean205) { Static13.aBoolean16 = false; } else { @@ -185,8 +212,8 @@ public class Camera { Static186.aBoolean205 = false; Static13.aBoolean16 = false; } - @Pc(66) float local66 = (float) Static233.anInt5224 / 65535.0F; - @Pc(70) int local70 = Static127.anInt3125 * 2; + @Pc(66) float local66 = (float) anInt5224 / 65535.0F; + @Pc(70) int local70 = anInt3125 * 2; @Pc(141) int local141; @Pc(131) int local131; @Pc(111) int local111; @@ -195,28 +222,28 @@ public class Camera { @Pc(155) int local155; @Pc(173) int local173; 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; - local119 = Static107.anIntArrayArrayArray9[Static155.anInt3718][local70][local72]; - local131 = Static107.anIntArrayArrayArray9[Static155.anInt3718][local70 + 1][local72] * 3; - local141 = Static107.anIntArrayArrayArray9[Static155.anInt3718][local70][local72] * 3; + local111 = (anIntArrayArrayArray9[anInt3718][local70 + 2][local72] + anIntArrayArrayArray9[anInt3718][local70 + 2][local72] - anIntArrayArrayArray9[anInt3718][local70 + 3][local72]) * 3; + local119 = anIntArrayArrayArray9[anInt3718][local70][local72]; + local131 = anIntArrayArrayArray9[anInt3718][local70 + 1][local72] * 3; + local141 = anIntArrayArrayArray9[anInt3718][local70][local72] * 3; local146 = local131 - local141; 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; } Static5.anInt40 = (int) renderCoordinates[1] * -1; - Static138.renderX = (int) renderCoordinates[0] - Static225.originX * 128; - Static134.renderZ = (int) renderCoordinates[2] - Static142.originZ * 128; + Static138.renderX = (int) renderCoordinates[0] - originX * 128; + Static134.renderZ = (int) renderCoordinates[2] - originZ * 128; @Pc(226) float[] local226 = new float[3]; - local141 = Static75.anInt2119 * 2; + local141 = anInt2119 * 2; for (local131 = 0; local131 < 3; local131++) { - local111 = Static107.anIntArrayArrayArray9[Static52.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; - local155 = Static107.anIntArrayArrayArray9[Static52.anInt1694][local141][local131]; - local119 = Static107.anIntArrayArrayArray9[Static52.anInt1694][local141 + 1][local131] * 3; + local111 = anIntArrayArrayArray9[anInt1694][local141][local131] * 3; + local146 = (anIntArrayArrayArray9[anInt1694][local141 + 2][local131] + anIntArrayArrayArray9[anInt1694][local141 + 2][local131] - anIntArrayArrayArray9[anInt1694][local141 + 3][local131]) * 3; + local155 = anIntArrayArrayArray9[anInt1694][local141][local131]; + local119 = anIntArrayArrayArray9[anInt1694][local141 + 1][local131] * 3; local173 = local119 - local111; @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); } @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)); Static146.aFloat15 = (float) Math.atan2((double) local382, local392); Static84.aFloat10 = -((float) Math.atan2((double) local363, (double) local371)); - Static240.cameraPitch = (int) ((double) Static146.aFloat15 * 325.949D) & 0x7FF; - Static184.cameraYaw = (int) ((double) Static84.aFloat10 * 325.949D) & 0x7FF; + cameraPitch = (int) ((double) Static146.aFloat15 * 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; } } diff --git a/client/src/main/java/rt4/ClientProt.java b/client/src/main/java/rt4/ClientProt.java index d0682b8..ac4996c 100644 --- a/client/src/main/java/rt4/ClientProt.java +++ b/client/src/main/java/rt4/ClientProt.java @@ -102,8 +102,8 @@ public class ClientProt { Protocol.outboundBuffer.p1(local13 + local13 + 3); } Protocol.outboundBuffer.p1a(Keyboard.pressedKeys[Keyboard.KEY_CTRL] ? 1 : 0); - Protocol.outboundBuffer.p2(Static225.originX + local23); - Protocol.outboundBuffer.p2add(Static142.originZ + local27); + Protocol.outboundBuffer.p2(Camera.originX + local23); + Protocol.outboundBuffer.p2add(Camera.originZ + local27); Static84.anInt2255 = PathFinder.queueZ[0]; Static115.mapFlagX = PathFinder.queueX[0]; 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") public static void rebuildMap() { ping(false); @@ -246,8 +231,8 @@ public class ClientProt { for (id = 0; id < Static273.mapFilesBuffer.length; id++) { @Pc(294) byte[] local294 = Static156.locationMapFilesBuffer[id]; if (local294 != null) { - chunkZ = (Static238.regionBitPacked[id] & 0xFF) * 64 - Static142.originZ; - chunkX = (Static238.regionBitPacked[id] >> 8) * 64 - Static225.originX; + chunkZ = (Static238.regionBitPacked[id] & 0xFF) * 64 - Camera.originZ; + chunkX = (Static238.regionBitPacked[id] >> 8) * 64 - Camera.originX; if (Static230.dynamicMapRegion) { chunkZ = 10; chunkX = 10; @@ -257,8 +242,8 @@ public class ClientProt { if (GlRenderer.enabled) { local294 = Static19.underWaterLocationsMapFilesBuffer[id]; if (local294 != null) { - chunkX = (Static238.regionBitPacked[id] >> 8) * 64 - Static225.originX; - chunkZ = (Static238.regionBitPacked[id] & 0xFF) * 64 - Static142.originZ; + chunkX = (Static238.regionBitPacked[id] >> 8) * 64 - Camera.originX; + chunkZ = (Static238.regionBitPacked[id] & 0xFF) * 64 - Camera.originZ; if (Static230.dynamicMapRegion) { chunkZ = 10; chunkX = 10; diff --git a/client/src/main/java/rt4/Component.java b/client/src/main/java/rt4/Component.java index 90b8b08..283bb54 100644 --- a/client/src/main/java/rt4/Component.java +++ b/client/src/main/java/rt4/Component.java @@ -225,7 +225,7 @@ public final class Component { public boolean modelOrtho = false; @OriginalMember(owner = "client!be", name = "zb", descriptor = "Z") - public boolean aBoolean30 = false; + public boolean filled = false; @OriginalMember(owner = "client!be", name = "y", descriptor = "I") public int dragDeadtime = 0; @@ -669,7 +669,7 @@ public final class Component { } } if (this.type == 3) { - this.aBoolean30 = arg0.g1() == 1; + this.filled = arg0.g1() == 1; } if (this.type == 4 || this.type == 1) { this.anInt460 = arg0.g1(); @@ -1075,7 +1075,7 @@ public final class Component { } if (this.type == 3) { this.color = buffer.g4(); - this.aBoolean30 = buffer.g1() == 1; + this.filled = buffer.g1() == 1; this.alpha = buffer.g1(); } if (this.type == 9) { diff --git a/client/src/main/java/rt4/CreateManager.java b/client/src/main/java/rt4/CreateManager.java index 40b631b..7d33f8a 100644 --- a/client/src/main/java/rt4/CreateManager.java +++ b/client/src/main/java/rt4/CreateManager.java @@ -1,5 +1,6 @@ package rt4; +import org.openrs2.deob.annotation.OriginalArg; import org.openrs2.deob.annotation.OriginalMember; 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; + } } diff --git a/client/src/main/java/rt4/LoginManager.java b/client/src/main/java/rt4/LoginManager.java index 4beb699..8448b6e 100644 --- a/client/src/main/java/rt4/LoginManager.java +++ b/client/src/main/java/rt4/LoginManager.java @@ -497,8 +497,8 @@ public class LoginManager { @OriginalMember(owner = "client!ca", name = "h", descriptor = "(I)V") public static void setupLoadingScreenRegion() { - @Pc(10) int local10 = (Static138.renderX >> 10) + (Static225.originX >> 3); - @Pc(23) int local23 = (Static134.renderZ >> 10) + (Static142.originZ >> 3); + @Pc(10) int local10 = (Static138.renderX >> 10) + (Camera.originX >> 3); + @Pc(23) int local23 = (Static134.renderZ >> 10) + (Camera.originZ >> 3); Static156.locationMapFilesBuffer = new byte[18][]; Static35.underWaterLocationsMapFileIds = new int[18]; Static191.npcSpawnsFilesBuffer = new byte[18][]; diff --git a/client/src/main/java/rt4/MiniMap.java b/client/src/main/java/rt4/MiniMap.java index 8ce599f..7c65647 100644 --- a/client/src/main/java/rt4/MiniMap.java +++ b/client/src/main/java/rt4/MiniMap.java @@ -236,12 +236,12 @@ public class MiniMap { if (Static235.mapElementList != null) { for (@Pc(117) int local117 = 0; local117 < Static235.mapElementList.anInt5074; 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]; local154 = MathUtils.cos[local48]; @Pc(156) Font local156 = Fonts.p11Full; @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); local200 = local181 * local189 - local146 * local164 >> 16; if (Static235.mapElementList.method3894(local117) == 1) { @@ -361,8 +361,8 @@ public class MiniMap { } } if (local770.type == 2) { - local154 = (local770.targetX - Static225.originX) * 4 + 2 - PlayerList.self.xFine / 32; - local231 = (-Static142.originZ + local770.anInt4046) * 4 + 2 - PlayerList.self.zFine / 32; + local154 = (local770.targetX - Camera.originX) * 4 + 2 - PlayerList.self.xFine / 32; + local231 = (-Camera.originZ + local770.anInt4046) * 4 + 2 - PlayerList.self.zFine / 32; Static97.method1960(local770.anInt4048, arg1, arg2, local154, local231, arg3); } if (local770.type == 10 && local770.actorTargetId >= 0 && PlayerList.players.length > local770.actorTargetId) { diff --git a/client/src/main/java/rt4/MiniMenu.java b/client/src/main/java/rt4/MiniMenu.java index 0eeb416..28848ee 100644 --- a/client/src/main/java/rt4/MiniMenu.java +++ b/client/src/main/java/rt4/MiniMenu.java @@ -347,8 +347,8 @@ public class MiniMenu { if (local23 == 46) { PathFinder.findPathToLoc(local31, local19, local15); Protocol.outboundBuffer.p1isaac(247); - Protocol.outboundBuffer.p2le(Static142.originZ + local19); - Protocol.outboundBuffer.p2leadd(local15 + Static225.originX); + Protocol.outboundBuffer.p2le(Camera.originZ + local19); + Protocol.outboundBuffer.p2leadd(local15 + Camera.originX); Protocol.outboundBuffer.p2(Integer.MAX_VALUE & (int) (local31 >>> 32)); } if (local23 == 40) { @@ -412,9 +412,9 @@ public class MiniMenu { if (local23 == 42) { PathFinder.findPathToLoc(local31, local19, local15); 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.p2(local19 + Static142.originZ); + Protocol.outboundBuffer.p2(local19 + Camera.originZ); } if (local23 == 28) { ClientProt.method2909(); @@ -448,16 +448,16 @@ public class MiniMenu { Cross.type = 2; Cross.y = Mouse.clickY; Protocol.outboundBuffer.p1isaac(66); - Protocol.outboundBuffer.p2le(Static225.originX + local15); + Protocol.outboundBuffer.p2le(Camera.originX + local15); Protocol.outboundBuffer.p2(local36); - Protocol.outboundBuffer.p2leadd(local19 + Static142.originZ); + Protocol.outboundBuffer.p2leadd(local19 + Camera.originZ); } if (local23 == 1001) { PathFinder.findPathToLoc(local31, local19, local15); Protocol.outboundBuffer.p1isaac(170); Protocol.outboundBuffer.p2leadd(Integer.MAX_VALUE & (int) (local31 >>> 32)); - Protocol.outboundBuffer.p2leadd(local15 + Static225.originX); - Protocol.outboundBuffer.p2leadd(local19 + Static142.originZ); + Protocol.outboundBuffer.p2leadd(local15 + Camera.originX); + Protocol.outboundBuffer.p2leadd(local19 + Camera.originZ); } if (local23 == 1002) { Cross.type = 2; @@ -485,7 +485,7 @@ public class MiniMenu { method3556(Player.level, local15, local19); } else if (local36 == 1) { 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])) { Protocol.outboundBuffer.p1(Static1.anInt5); Protocol.outboundBuffer.p1(Static107.anInt2878); @@ -559,8 +559,8 @@ public class MiniMenu { PathFinder.findPathToLoc(local31, local19, local15); Protocol.outboundBuffer.p1isaac(84); Protocol.outboundBuffer.p2leadd(Integer.MAX_VALUE & (int) (local31 >>> 32)); - Protocol.outboundBuffer.p2leadd(Static142.originZ + local19); - Protocol.outboundBuffer.p2le(local15 + Static225.originX); + Protocol.outboundBuffer.p2leadd(Camera.originZ + local19); + Protocol.outboundBuffer.p2le(local15 + Camera.originX); } if (local23 == 23) { Protocol.outboundBuffer.p1isaac(206); @@ -573,9 +573,9 @@ public class MiniMenu { } if (local23 == 14 && PathFinder.findPathToLoc(local31, local19, local15)) { Protocol.outboundBuffer.p1isaac(134); - Protocol.outboundBuffer.p2add(Static225.originX + local15); + Protocol.outboundBuffer.p2add(Camera.originX + local15); Protocol.outboundBuffer.p2(anInt4997); - Protocol.outboundBuffer.p2le(local19 + Static142.originZ); + Protocol.outboundBuffer.p2le(local19 + Camera.originZ); Protocol.outboundBuffer.p2(Static185.anInt4370); Protocol.outboundBuffer.p4me(Static224.anInt5062); Protocol.outboundBuffer.p2add((int) (local31 >>> 32) & Integer.MAX_VALUE); @@ -619,8 +619,8 @@ public class MiniMenu { Cross.y = Mouse.clickY; Protocol.outboundBuffer.p1isaac(228); Protocol.outboundBuffer.p2(local36); - Protocol.outboundBuffer.p2le(Static225.originX + local15); - Protocol.outboundBuffer.p2leadd(Static142.originZ + local19); + Protocol.outboundBuffer.p2le(Camera.originX + local15); + Protocol.outboundBuffer.p2leadd(Camera.originZ + local19); } if (local23 == 4) { local192 = NpcList.npcs[local36]; @@ -702,8 +702,8 @@ public class MiniMenu { Cross.y = Mouse.clickY; Cross.milliseconds = 0; Protocol.outboundBuffer.p1isaac(109); - Protocol.outboundBuffer.p2le(local19 + Static142.originZ); - Protocol.outboundBuffer.p2(local15 + Static225.originX); + Protocol.outboundBuffer.p2le(local19 + Camera.originZ); + Protocol.outboundBuffer.p2(local15 + Camera.originX); Protocol.outboundBuffer.p2leadd(local36); } if (local23 == 25) { @@ -775,11 +775,11 @@ public class MiniMenu { Cross.y = Mouse.clickY; Cross.type = 2; Protocol.outboundBuffer.p1isaac(101); - Protocol.outboundBuffer.p2leadd(local15 + Static225.originX); + Protocol.outboundBuffer.p2leadd(local15 + Camera.originX); Protocol.outboundBuffer.p2le(Static185.anInt4370); Protocol.outboundBuffer.p2le(anInt4997); Protocol.outboundBuffer.p2le(local36); - Protocol.outboundBuffer.p2leadd(Static142.originZ + local19); + Protocol.outboundBuffer.p2leadd(Camera.originZ + local19); Protocol.outboundBuffer.p4me(Static224.anInt5062); } if (local23 == 1004) { @@ -797,9 +797,9 @@ public class MiniMenu { } else if (local36 == 1) { Protocol.outboundBuffer.p1isaac(131); Protocol.outboundBuffer.p4me(anInt2512); - Protocol.outboundBuffer.p2add(Static225.originX + local15); + Protocol.outboundBuffer.p2add(Camera.originX + local15); Protocol.outboundBuffer.p2leadd(anInt506); - Protocol.outboundBuffer.p2add(local19 + Static142.originZ); + Protocol.outboundBuffer.p2add(local19 + Camera.originZ); } } if (local23 == 8) { @@ -851,14 +851,14 @@ public class MiniMenu { Cross.x = Mouse.clickX; Cross.milliseconds = 0; Protocol.outboundBuffer.p1isaac(48); - Protocol.outboundBuffer.p2add(local15 + Static225.originX); + Protocol.outboundBuffer.p2add(local15 + Camera.originX); Protocol.outboundBuffer.p2leadd(local36); - Protocol.outboundBuffer.p2le(Static142.originZ + local19); + Protocol.outboundBuffer.p2le(Camera.originZ + local19); } if (local23 == 38 && PathFinder.findPathToLoc(local31, local19, local15)) { Protocol.outboundBuffer.p1isaac(233); - Protocol.outboundBuffer.p2leadd(local19 + Static142.originZ); - Protocol.outboundBuffer.p2add(Static225.originX + local15); + Protocol.outboundBuffer.p2leadd(local19 + Camera.originZ); + Protocol.outboundBuffer.p2add(Camera.originX + local15); Protocol.outboundBuffer.p2leadd(anInt506); Protocol.outboundBuffer.p4rme(anInt2512); Protocol.outboundBuffer.p2add((int) (local31 >>> 32) & Integer.MAX_VALUE); @@ -901,8 +901,8 @@ public class MiniMenu { if (local23 == 50) { PathFinder.findPathToLoc(local31, local19, local15); Protocol.outboundBuffer.p1isaac(194); - Protocol.outboundBuffer.p2leadd(local19 + Static142.originZ); - Protocol.outboundBuffer.p2le(Static225.originX + local15); + Protocol.outboundBuffer.p2leadd(local19 + Camera.originZ); + Protocol.outboundBuffer.p2le(Camera.originX + local15); Protocol.outboundBuffer.p2((int) (local31 >>> 32) & Integer.MAX_VALUE); } if (local23 == 48) { @@ -946,9 +946,9 @@ public class MiniMenu { Cross.milliseconds = 0; Protocol.outboundBuffer.p1isaac(73); Protocol.outboundBuffer.p4rme(anInt2512); - Protocol.outboundBuffer.p2(Static142.originZ + local19); + Protocol.outboundBuffer.p2(Camera.originZ + local19); Protocol.outboundBuffer.p2leadd(local36); - Protocol.outboundBuffer.p2leadd(local15 + Static225.originX); + Protocol.outboundBuffer.p2leadd(local15 + Camera.originX); Protocol.outboundBuffer.p2le(anInt506); } if (local23 == 12) { @@ -963,11 +963,11 @@ public class MiniMenu { Static187.anInt4422 = 1; method3556(Player.level, local15, local19); } 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 { Protocol.outboundBuffer.p1isaac(179); - Protocol.outboundBuffer.p2(local19 + Static142.originZ); - Protocol.outboundBuffer.p2(local15 + Static225.originX); + Protocol.outboundBuffer.p2(local19 + Camera.originZ); + Protocol.outboundBuffer.p2(local15 + Camera.originX); } } if (local23 == 6) { @@ -997,8 +997,8 @@ public class MiniMenu { Cross.type = 2; Protocol.outboundBuffer.p1isaac(33); Protocol.outboundBuffer.p2(local36); - Protocol.outboundBuffer.p2(Static225.originX + local15); - Protocol.outboundBuffer.p2le(Static142.originZ + local19); + Protocol.outboundBuffer.p2(Camera.originX + local15); + Protocol.outboundBuffer.p2le(Camera.originZ + local19); } if (local23 == 16) { local192 = NpcList.npcs[local36]; diff --git a/client/src/main/java/rt4/NpcList.java b/client/src/main/java/rt4/NpcList.java index acff079..ee702ae 100644 --- a/client/src/main/java/rt4/NpcList.java +++ b/client/src/main/java/rt4/NpcList.java @@ -331,8 +331,8 @@ public class NpcList { } } if ((arg0.faceX != 0 || arg0.faceY != 0) && (arg0.movementQueueSize == 0 || arg0.anInt3417 > 0)) { - local70 = arg0.xFine - (arg0.faceX - Static225.originX - Static225.originX) * 64; - local43 = arg0.zFine - (arg0.faceY - Static142.originZ - Static142.originZ) * 64; + local70 = arg0.xFine - (arg0.faceX - Camera.originX - Camera.originX) * 64; + local43 = arg0.zFine - (arg0.faceY - Camera.originZ - Camera.originZ) * 64; if (local70 != 0 || local43 != 0) { arg0.anInt3400 = (int) (Math.atan2((double) local70, (double) local43) * 325.949D) & 0x7FF; } diff --git a/client/src/main/java/rt4/Player.java b/client/src/main/java/rt4/Player.java index 761701c..24cb8ae 100644 --- a/client/src/main/java/rt4/Player.java +++ b/client/src/main/java/rt4/Player.java @@ -180,8 +180,8 @@ public final class Player extends PathingEntity { @OriginalMember(owner = "client!um", name = "a", descriptor = "(Z)V") public static void setTutorialIsland() { inTutorialIsland = 0; - @Pc(17) int local17 = Static225.originX + (PlayerList.self.xFine >> 7); - @Pc(25) int local25 = (PlayerList.self.zFine >> 7) + Static142.originZ; + @Pc(17) int local17 = Camera.originX + (PlayerList.self.xFine >> 7); + @Pc(25) int local25 = (PlayerList.self.zFine >> 7) + Camera.originZ; if (local17 >= 3053 && local17 <= 3156 && local25 >= 3056 && local25 <= 3136) { inTutorialIsland = 1; } @@ -363,8 +363,8 @@ public final class Player extends PathingEntity { } } if (local245.type == 2) { - @Pc(340) int local340 = (local245.targetX - Static225.originX) * 4 + 2 - PlayerList.self.xFine / 32; - local291 = (local245.anInt4046 - Static142.originZ) * 4 + 2 - PlayerList.self.zFine / 32; + @Pc(340) int local340 = (local245.targetX - Camera.originX) * 4 + 2 - PlayerList.self.xFine / 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); } if (local245.type == 10 && local245.actorTargetId >= 0 && PlayerList.players.length > local245.actorTargetId) { diff --git a/client/src/main/java/rt4/PlayerAppearance.java b/client/src/main/java/rt4/PlayerAppearance.java index 5b1b02f..5577bab 100644 --- a/client/src/main/java/rt4/PlayerAppearance.java +++ b/client/src/main/java/rt4/PlayerAppearance.java @@ -141,7 +141,7 @@ public final class PlayerAppearance { } @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.method1947(); } @@ -172,7 +172,7 @@ public final class PlayerAppearance { } @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.method1947(); } diff --git a/client/src/main/java/rt4/Protocol.java b/client/src/main/java/rt4/Protocol.java index 5dbf6a3..fe59e6b 100644 --- a/client/src/main/java/rt4/Protocol.java +++ b/client/src/main/java/rt4/Protocol.java @@ -1251,7 +1251,7 @@ public class Protocol { int step = inboundBuffer.g1(); int dur = inboundBuffer.g1(); setVerifyId(tracknum); - Static260.method3849(cy, tz, step, tx, dur); + Camera.method3849(cy, tz, step, tx, dur); opcode = -1; return true; } else if (opcode == ServerProt.IF_SETANIM) { @@ -1364,8 +1364,8 @@ public class Protocol { } } else { int plane = target >> 28 & 0x3; - int posX = (target >> 14 & 0x3FFF) - Static225.originX; - int posZ = (target & 0x3FFF) - Static142.originZ; + int posX = (target >> 14 & 0x3FFF) - Camera.originX; + int posZ = (target & 0x3FFF) - Camera.originZ; if (posX >= 0 && posZ >= 0 && posX < 104 && posZ < 104) { posZ = posZ * 128 + 64; posX = posX * 128 + 64; @@ -1425,9 +1425,9 @@ public class Protocol { setVerifyId(tracknum); Camera.yawTarget = yaw; Camera.pitchTarget = pitch; - if (Static227.cameraType == 2) { - Static240.cameraPitch = (int)Camera.pitchTarget; - Static184.cameraYaw = (int)Camera.yawTarget; + if (Camera.cameraType == 2) { + Camera.cameraPitch = (int)Camera.pitchTarget; + Camera.cameraYaw = (int)Camera.yawTarget; } Camera.clampCameraAngle(); opcode = -1; @@ -1594,7 +1594,7 @@ public class Protocol { int local1146 = inboundBuffer.g1(); int local277 = inboundBuffer.g1(); setVerifyId(tracknum); - Static141.method2722(true, local1146, counter, local277, modelId, local786); + Camera.method2722(true, local1146, counter, local277, modelId, local786); opcode = -1; return true; } else if (opcode == ServerProt.MESSAGE_QUICKCHAT_PRIVATE) { @@ -1886,8 +1886,8 @@ public class Protocol { } int z = pos & 0x3FFF; int x = pos >> 14 & 0x3FFF; - x -= Static225.originX; - z -= Static142.originZ; + x -= Camera.originX; + z -= Camera.originZ; int plane = pos >> 28 & 0x3; Static92.method1881(plane, rotation, type, z, type2, x, seqId); opcode = -1; @@ -2059,7 +2059,7 @@ public class Protocol { } else if (opcode == ServerProt.CAM_RESET) { int tracknum = inboundBuffer.g2(); setVerifyId(tracknum); - Static35.resetCameraEffects(); + Camera.resetCameraEffects(); opcode = -1; return true; } else if (opcode == ServerProt.LOGOUT) { @@ -2307,7 +2307,7 @@ public class Protocol { Static175.method3279(); return true; } 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++) { local61 = local61 + inboundBuffer.data[local63] + ","; } @@ -2741,11 +2741,11 @@ public class Protocol { y = 3; } // 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 (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; Static125.anInt3096 = 0; @@ -2753,9 +2753,9 @@ public class Protocol { if (MiniMenu.anInt1742 != -1) { outboundBuffer.p1isaac(131); outboundBuffer.p4me(MiniMenu.anInt2512); - outboundBuffer.p2add(Static225.originX + MiniMenu.anInt1742); + outboundBuffer.p2add(Camera.originX + MiniMenu.anInt1742); outboundBuffer.p2leadd(MiniMenu.anInt506); - outboundBuffer.p2add(MiniMenu.anInt2954 + Static142.originZ); + outboundBuffer.p2add(MiniMenu.anInt2954 + Camera.originZ); Cross.type = 1; Cross.milliseconds = 0; Cross.y = Mouse.clickY; @@ -2765,8 +2765,8 @@ public class Protocol { } else if (Static187.anInt4422 == 2) { if (MiniMenu.anInt1742 != -1) { outboundBuffer.p1isaac(179); - outboundBuffer.p2(Static142.originZ + MiniMenu.anInt2954); - outboundBuffer.p2(MiniMenu.anInt1742 + Static225.originX); + outboundBuffer.p2(Camera.originZ + MiniMenu.anInt2954); + outboundBuffer.p2(MiniMenu.anInt1742 + Camera.originX); Cross.milliseconds = 0; Cross.type = 1; Cross.x = Mouse.clickX; @@ -2810,9 +2810,9 @@ public class Protocol { InterfaceList.redraw(Static43.aClass13_11); } } - if (Static227.cameraType == 1) { + if (Camera.cameraType == 1) { Static250.method4273(); - } else if (Static227.cameraType == 2) { + } else if (Camera.cameraType == 2) { Camera.updateLockedCamera(); } else { Camera.updateLoginScreenCamera(); diff --git a/client/src/main/java/rt4/ScriptRunner.java b/client/src/main/java/rt4/ScriptRunner.java index 0f05484..4010d26 100644 --- a/client/src/main/java/rt4/ScriptRunner.java +++ b/client/src/main/java/rt4/ScriptRunner.java @@ -40,7 +40,7 @@ public final class ScriptRunner { @OriginalMember(owner = "client!og", name = "g", descriptor = "[Lclient!na;") public static JagString[] stringLocals; - public class Cs2Opcodes { + public static class Cs2Opcodes { // Component setters public static final int setPosition = 1000; public static final int setSize = 1001; @@ -48,6 +48,34 @@ public final class ScriptRunner { public static final int setAspect = 1004; public static final int setNoClickThrough = 1005; + public static final int setScrollPos = 1100; + public static final int setTrans = 1103; + public static final int setLineWid = 1104; + public static final int setSprite = 1105; + public static final int set2DAngle = 1106; + public static final int setSpriteTiling = 1107; + public static final int setModel = 1108; + public static final int set3DRotation = 1109; + public static final int setAnimation = 1110; + public static final int setModelOrthog = 1111; + public static final int setText = 1112; + public static final int setFont = 1113; + public static final int setTextAlignment = 1114; + public static final int setTextAntiMacro = 1115; + public static final int setOutlineThickness = 1116; + public static final int setShadowColor = 1117; + public static final int setVFlip = 1118; + public static final int setHFlip = 1119; + public static final int setScrollMax = 1120; + public static final int setAlpha = 1122; + public static final int set3DViewDistance = 1123; + + public static final int setItem = 1200; + public static final int setNpcHead = 1201; + public static final int setPlayerHead = 1202; + public static final int setPlayerFull = 1204; + public static final int setItemNoNum = 1205; + // Component properties public static final int getX = 1500; public static final int getY = 1501; @@ -98,7 +126,7 @@ public final class ScriptRunner { public static final int formatNumber = 4124; // Objs - public static final int itemIsStackable = 4207; + public static final int itemIsMembers = 4207; public static final int itemAttribute = 4208; public static final int searchItem = 4210; @@ -115,6 +143,219 @@ public final class ScriptRunner { public static final int getFirstWorldData = 6501; public static final int getNextWorldData = 6502; public static final int setWorldHost = 6503; + public static final int setChild = 200; + public static final int setChild2 = 201; + public static final int setBaseIdkit = 403; + public static final int setBaseColor = 404; + public static final int setFemale = 410; + public static final int setRGB = 1101; + public static final int setFilled = 1102; + public static final int setContextMenuOption = 1300; + public static final int setDraggable = 1301; + public static final int setDragRenderBehaviour = 1302; + public static final int setDragDeadZone = 1303; + public static final int setDragDeadTime = 1304; + public static final int setOptionBase = 1305; + public static final int setTargetVerb = 1306; + public static final int hookMousePress = 1400; + public static final int hookDraggedOver = 1401; + public static final int hookMouseRelease = 1402; + public static final int hookMouseEnter = 1403; + public static final int hookMouseExit = 1404; + public static final int hookDragStart = 1405; + public static final int hookUseWith = 1406; + public static final int hookVARP = 1407; + public static final int hookFrame = 1408; + public static final int hookOptionClick = 1409; + public static final int hookDragRelease = 1410; + public static final int hookDrag = 1411; + public static final int hookMouseHover = 1412; + public static final int hookContainer = 1414; + public static final int hookSkill = 1415; + public static final int hookOnUse = 1416; + public static final int hookScroll = 1417; + public static final int hookMsg = 1418; + public static final int hookKey = 1419; + public static final int hookFriendList = 1420; + public static final int hookClanList = 1421; + public static final int hookMiscData = 1422; + public static final int hookDialogAbort = 1423; + public static final int hookWidgetsOpenClose = 1424; + public static final int hookGEUpdate = 1425; + public static final int hookMinimapUnlock = 1426; + public static final int hookResize = 1427; + public static final int hookVARC = 1428; + public static final int hookSTRING = 1429; + public static final int getScrollX = 1600; + public static final int getScrollY = 1601; + public static final int getText = 1602; + public static final int getScrollMaxH = 1603; + public static final int getScrollMaxV = 1604; + public static final int get3DDistance = 1605; + public static final int getRotateX = 1606; + public static final int getRotateZ = 1607; + public static final int getRotateY = 1608; + public static final int getAlpha = 1609; + public static final int getModelXOffset = 1610; + public static final int getModelYOffset = 1611; + public static final int getSpriteId = 1612; + public static final int getItemId = 1700; + public static final int getItemAmt = 1701; + public static final int getChildId = 1702; + public static final int getTargetMask = 1800; + public static final int getOption = 1801; + public static final int getOptionBase = 1802; + public static final int getX2 = 2500; + public static final int getY2 = 2501; + public static final int getWidth2 = 2502; + public static final int getHeight2 = 2503; + public static final int isHidden2 = 2504; + public static final int getLayer2 = 2505; + public static final int getScrollX2 = 2600; + public static final int getScrollY2 = 2601; + public static final int getText2 = 2602; + public static final int getScrollMaxH2 = 2603; + public static final int getScrollMaxV2 = 2604; + public static final int get3DDistance2 = 2605; + public static final int getRotateX2 = 2606; + public static final int getRotateZ2 = 2607; + public static final int getRotateY2 = 2608; + public static final int getAlpha2 = 2609; + public static final int getModelXOffset2 = 2610; + public static final int getModelYOffset2 = 2611; + public static final int getSpriteId2 = 2612; + public static final int getItemId2 = 2700; + public static final int getItemAmt2 = 2701; + public static final int hasChild = 2702; + public static final int nextChild = 2703; + public static final int hasChildModal = 2704; + public static final int hasChildOverlay = 2705; + public static final int getTargetMask2 = 2800; + public static final int getOption2 = 2801; + public static final int getOptionBase2 = 2802; + public static final int msg = 3100; + public static final int animateSelf = 3101; + public static final int sendIntegerInput = 3104; + public static final int sendNameInput = 3105; + public static final int sendStringInput = 3106; + public static final int clickPlayerOption = 3107; + public static final int playSoundEffect = 3200; + public static final int playMusic = 3201; + public static final int playMusicEffect = 3202; + public static final int getClientCycle = 3300; + public static final int getItemIdInSlot = 3301; + public static final int getItemAmtInSlot = 3302; + public static final int getItemAmtInContainer = 3303; + public static final int getItemContainerLength = 3304; + public static final int getSkillCurrentLvl = 3305; + public static final int getSkillActualLvl = 3306; + public static final int getSkillXp = 3307; + public static final int getMyLocation = 3308; + public static final int x = 3309; + public static final int z = 3310; + public static final int y = 3311; + public static final int isMember = 3312; + public static final int getItemIdInInpsectingSlot = 3313; + public static final int getItemAmtInInspectingSlot = 3314; + public static final int getItemAmtInInspectingContainer = 3315; + public static final int getClientRights = 3316; + public static final int getSystemUpdateTimer = 3317; + public static final int getWorldId = 3318; + public static final int getRunEnergy = 3321; + public static final int getPlayerWeight = 3322; + public static final int hasMoreThen5Blackmarks = 3323; + public static final int getBlackmarks = 3324; + public static final int isSiteSettingsMembers = 3325; + public static final int getMyCombat = 3326; + public static final int IsFemale = 3327; + public static final int mapQuickchat = 3329; + public static final int getContainerFreeSlots = 3330; + public static final int getContainerIntAttrCountIgnoreStacks = 3331; + public static final int getContainerIntAttrCount = 3332; + public static final int getLoginTypeRelatedMethod3333 = 3333; + public static final int getLanguage = 3335; + public static final int moveCoord = 3336; + public static final int getAffid = 3337; + public static final int datamap = 3400; + public static final int datamap2 = 3408; + public static final int datamapContainsValue = 3409; + public static final int datamapContainsValue2 = 3410; + public static final int datamapSize = 3411; + public static final int getFriendCount = 3600; + public static final int getFriendName = 3601; + public static final int getFriendWorld = 3602; + public static final int getFriendRank = 3603; + public static final int isFriend = 3609; + public static final int getFriendWorldName = 3610; + public static final int clanChatDisplayName = 3611; + public static final int clanGetChatCount = 3612; + public static final int clanChatUsername = 3613; + public static final int clanChatUserWorld = 3614; + public static final int clanChatUserRank = 3615; + public static final int getIgnoreCount = 3621; + public static final int getIgnoreName = 3622; + public static final int getGEIsSelling = 3903; + public static final int getGEItem = 3904; + public static final int getGEItemPrice = 3905; + public static final int getGEItemAmt = 3906; + public static final int getGEItemAmtTransfered = 3907; + public static final int getGECashTransfered = 3908; + public static final int getGENotStarted = 3910; + public static final int getGEIsStatus2 = 3911; + public static final int getGEIsDone = 3912; + public static final int getGEIsStatus1 = 3913; + public static final int add = 4000; + public static final int subtract = 4001; + public static final int multiply = 4002; + public static final int divide = 4003; + public static final int rndExcl = 4004; + public static final int rnd = 4005; + public static final int getItemName = 4200; + public static final int getItemGroundOption = 4201; + public static final int getItemOption = 4202; + public static final int getItemValue = 4203; + public static final int itemIsStackable = 4204; + public static final int getNotedItem = 4205; + public static final int getRealItem = 4206; + public static final int nextSearchResult = 4211; + public static final int getNpcAttribute = 4300; + public static final int getTradeSetting = 5016; + public static final int isHoldingAlt = 5100; + public static final int isHoldingCtrl = 5101; + public static final int isHoldingShift = 5102; + public static final int setWorldmapZoom = 5200; + public static final int getWorldmapZoom = 5201; + public static final int loadDungeonmap = 5205; + public static final int getDungeonmap = 5206; + public static final int getDungeonMapName = 5207; + public static final int getDungeonmapCenter = 5210; + public static final int setPositionInMap = 5214; + public static final int dungeonmapContains = 5215; + public static final int getMapDefaultZoom = 5218; + public static final int getDisplayMode = 5306; + public static final int getLastIp5419 = 5419; + public static final int cameraMoveTo = 5500; + public static final int cameraPointAt = 5501; + public static final int cameraUnlock = 5503; + public static final int cameraGetVrot = 5505; + public static final int cameraGetHrot = 5506; + public static final int directlogin = 5600; + public static final int sendRequestAccount = 5604; + public static final int sendCreateAccount = 5605; + public static final int getGameloginRc = 5607; + public static final int getWorldswitchTimer = 5608; + public static final int getAccountCreateRC = 5609; + public static final int getDetailedRC = 5611; + public static final int getMinute = 6300; + public static final int getCurrentDaysSinceLaunch = 6301; + public static final int getDaysSinceLaunch = 6302; + public static final int getYear = 6303; + public static final int isLeapYear = 6304; + public static final int setNoOptions = 1307; + public static final int sendCloseWidgetPacket = 3103; + public static final int skipLoginstage10 = 5601; + public static final int resetRCs = 5602; + public static final int resetAccountCreateRC = 5606; } @OriginalMember(owner = "client!h", name = "a", descriptor = "(BILclient!jl;)V") @@ -494,7 +735,7 @@ public final class ScriptRunner { InterfaceList.redraw(component); continue; } - if (opcode == 200) { + if (opcode == Cs2Opcodes.setChild) { isp -= 2; int1 = intStack[isp]; int3 = intStack[isp + 1]; @@ -511,7 +752,7 @@ public final class ScriptRunner { intStack[isp++] = 0; continue; } - if (opcode == 201) { + if (opcode == Cs2Opcodes.setChild2) { isp--; int1 = intStack[isp]; local1204 = InterfaceList.getComponent(int1); @@ -530,7 +771,7 @@ public final class ScriptRunner { } else { @Pc(12388) boolean local12388; if (opcode < 500) { - if (opcode == 403) { + if (opcode == Cs2Opcodes.setBaseIdkit) { isp -= 2; int3 = intStack[isp + 1]; int1 = intStack[isp]; @@ -552,17 +793,17 @@ public final class ScriptRunner { int2++; } } - if (opcode == 404) { + if (opcode == Cs2Opcodes.setBaseColor) { isp -= 2; int1 = intStack[isp]; int3 = intStack[isp + 1]; - PlayerList.self.appearance.method1951(int1, int3); + PlayerList.self.appearance.setBaseColor(int1, int3); continue; } - if (opcode == 410) { + if (opcode == Cs2Opcodes.setFemale) { isp--; local12388 = intStack[isp] != 0; - PlayerList.self.appearance.method1948(local12388); + PlayerList.self.appearance.setFemale(local12388); continue; } } else { @@ -577,7 +818,7 @@ public final class ScriptRunner { isp--; component = InterfaceList.getComponent(intStack[isp]); } - if (opcode == 1100) { + if (opcode == Cs2Opcodes.setScrollPos) { isp -= 2; component.scrollX = intStack[isp]; if (component.scrollX > component.scrollMaxH - component.width) { @@ -599,7 +840,7 @@ public final class ScriptRunner { } continue; } - if (opcode == 1101) { + if (opcode == Cs2Opcodes.setRGB) { isp--; component.color = intStack[isp]; InterfaceList.redraw(component); @@ -608,43 +849,43 @@ public final class ScriptRunner { } continue; } - if (opcode == 1102) { + if (opcode == Cs2Opcodes.setFilled) { isp--; - component.aBoolean30 = intStack[isp] == 1; + component.filled = intStack[isp] == 1; InterfaceList.redraw(component); continue; } - if (opcode == 1103) { + if (opcode == Cs2Opcodes.setTrans) { isp--; component.alpha = intStack[isp]; InterfaceList.redraw(component); continue; } - if (opcode == 1104) { + if (opcode == Cs2Opcodes.setLineWid) { isp--; component.lineWidth = intStack[isp]; InterfaceList.redraw(component); continue; } - if (opcode == 1105) { + if (opcode == Cs2Opcodes.setSprite) { isp--; component.spriteId = intStack[isp]; InterfaceList.redraw(component); continue; } - if (opcode == 1106) { + if (opcode == Cs2Opcodes.set2DAngle) { isp--; component.angle2d = intStack[isp]; InterfaceList.redraw(component); continue; } - if (opcode == 1107) { + if (opcode == Cs2Opcodes.setSpriteTiling) { isp--; component.spriteTiling = intStack[isp] == 1; InterfaceList.redraw(component); continue; } - if (opcode == 1108) { + if (opcode == Cs2Opcodes.setModel) { component.modelType = 1; isp--; component.modelId = intStack[isp]; @@ -654,7 +895,7 @@ public final class ScriptRunner { } continue; } - if (opcode == 1109) { + if (opcode == Cs2Opcodes.set3DRotation) { isp -= 6; component.modelXOffset = intStack[isp]; component.modelZOffset = intStack[isp + 1]; @@ -669,7 +910,7 @@ public final class ScriptRunner { } continue; } - if (opcode == 1110) { + if (opcode == Cs2Opcodes.setAnimation) { isp--; int3 = intStack[isp]; if (component.modelSeqId != int3) { @@ -684,13 +925,13 @@ public final class ScriptRunner { } continue; } - if (opcode == 1111) { + if (opcode == Cs2Opcodes.setModelOrthog) { isp--; component.modelOrtho = intStack[isp] == 1; InterfaceList.redraw(component); continue; } - if (opcode == 1112) { + if (opcode == Cs2Opcodes.setText) { ssp--; local2522 = stringStack[ssp]; if (!local2522.strEquals(component.text)) { @@ -702,13 +943,13 @@ public final class ScriptRunner { } continue; } - if (opcode == 1113) { + if (opcode == Cs2Opcodes.setFont) { isp--; component.font = intStack[isp]; InterfaceList.redraw(component); continue; } - if (opcode == 1114) { + if (opcode == Cs2Opcodes.setTextAlignment) { isp -= 3; component.anInt460 = intStack[isp]; component.anInt478 = intStack[isp + 1]; @@ -716,37 +957,37 @@ public final class ScriptRunner { InterfaceList.redraw(component); continue; } - if (opcode == 1115) { + if (opcode == Cs2Opcodes.setTextAntiMacro) { isp--; component.textAntiMacro = intStack[isp] == 1; InterfaceList.redraw(component); continue; } - if (opcode == 1116) { + if (opcode == Cs2Opcodes.setOutlineThickness) { isp--; component.outlineThickness = intStack[isp]; InterfaceList.redraw(component); continue; } - if (opcode == 1117) { + if (opcode == Cs2Opcodes.setShadowColor) { isp--; component.shadowColor = intStack[isp]; InterfaceList.redraw(component); continue; } - if (opcode == 1118) { + if (opcode == Cs2Opcodes.setVFlip) { isp--; component.vFlip = intStack[isp] == 1; InterfaceList.redraw(component); continue; } - if (opcode == 1119) { + if (opcode == Cs2Opcodes.setHFlip) { isp--; component.hFlip = intStack[isp] == 1; InterfaceList.redraw(component); continue; } - if (opcode == 1120) { + if (opcode == Cs2Opcodes.setScrollMax) { isp -= 2; component.scrollMaxH = intStack[isp]; component.scrollMaxV = intStack[isp + 1]; @@ -763,13 +1004,13 @@ public final class ScriptRunner { InterfaceList.redraw(component); continue; } - if (opcode == 1122) { + if (opcode == Cs2Opcodes.setAlpha) { isp--; component.hasAlpha = intStack[isp] == 1; InterfaceList.redraw(component); continue; } - if (opcode == 1123) { + if (opcode == Cs2Opcodes.set3DViewDistance) { isp--; component.modelZoom = intStack[isp]; InterfaceList.redraw(component); @@ -787,7 +1028,7 @@ public final class ScriptRunner { opcode -= 1000; } InterfaceList.redraw(component); - if (opcode == 1200 || opcode == 1205) { + if (opcode == Cs2Opcodes.setItem || opcode == Cs2Opcodes.setItemNoNum) { isp -= 2; int2 = intStack[isp + 1]; int3 = intStack[isp]; @@ -815,7 +1056,7 @@ public final class ScriptRunner { } else if (component.baseWidth > 0) { component.modelZoom = component.modelZoom * 32 / component.baseWidth; } - if (opcode == 1205) { + if (opcode == Cs2Opcodes.setItemNoNum) { component.objDrawText = false; } else { component.objDrawText = true; @@ -823,7 +1064,7 @@ public final class ScriptRunner { } continue; } - if (opcode == 1201) { + if (opcode == Cs2Opcodes.setNpcHead) { component.modelType = 2; isp--; component.modelId = intStack[isp]; @@ -840,7 +1081,7 @@ public final class ScriptRunner { } continue; } - if (opcode == 1203) { + if (opcode == Cs2Opcodes.setPlayerHead) { component.modelType = 6; isp--; component.modelId = intStack[isp]; @@ -849,7 +1090,7 @@ public final class ScriptRunner { } continue; } - if (opcode == 1204) { + if (opcode == Cs2Opcodes.setPlayerFull) { component.modelType = 5; isp--; component.modelId = intStack[isp]; @@ -866,7 +1107,7 @@ public final class ScriptRunner { } else { component = local1020 ? staticActiveComponent1 : staticActiveComponent2; } - if (opcode == 1300) { + if (opcode == Cs2Opcodes.setContextMenuOption) { isp--; int3 = intStack[isp] - 1; if (int3 >= 0 && int3 <= 9) { @@ -877,39 +1118,39 @@ public final class ScriptRunner { ssp--; continue; } - if (opcode == 1301) { + if (opcode == Cs2Opcodes.setDraggable) { isp -= 2; int2 = intStack[isp + 1]; int3 = intStack[isp]; component.aClass13_5 = Static201.method1418(int3, int2); continue; } - if (opcode == 1302) { + if (opcode == Cs2Opcodes.setDragRenderBehaviour) { isp--; component.dragRenderBehavior = intStack[isp] == 1; continue; } - if (opcode == 1303) { + if (opcode == Cs2Opcodes.setDragDeadZone) { isp--; component.dragDeadzone = intStack[isp]; continue; } - if (opcode == 1304) { + if (opcode == Cs2Opcodes.setDragDeadTime) { isp--; component.dragDeadtime = intStack[isp]; continue; } - if (opcode == 1305) { + if (opcode == Cs2Opcodes.setOptionBase) { ssp--; component.optionBase = stringStack[ssp]; continue; } - if (opcode == 1306) { + if (opcode == Cs2Opcodes.setTargetVerb) { ssp--; component.targetVerb = stringStack[ssp]; continue; } - if (opcode == 1307) { + if (opcode == Cs2Opcodes.setNoOptions) { component.ops = null; continue; } @@ -973,67 +1214,67 @@ public final class ScriptRunner { local13000[0] = Integer.valueOf(c); } component.aBoolean25 = true; - if (opcode == 1400) { + if (opcode == Cs2Opcodes.hookMousePress) { component.onClickRepeat = local13000; - } else if (opcode == 1401) { + } else if (opcode == Cs2Opcodes.hookDraggedOver) { component.onHold = local13000; - } else if (opcode == 1402) { + } else if (opcode == Cs2Opcodes.hookMouseRelease) { component.onRelease = local13000; - } else if (opcode == 1403) { + } else if (opcode == Cs2Opcodes.hookMouseEnter) { component.onMouseOver = local13000; - } else if (opcode == 1404) { + } else if (opcode == Cs2Opcodes.hookMouseExit) { component.onMouseLeave = local13000; - } else if (opcode == 1405) { + } else if (opcode == Cs2Opcodes.hookDragStart) { component.onDragStart = local13000; - } else if (opcode == 1406) { + } else if (opcode == Cs2Opcodes.hookUseWith) { component.onUseWith = local13000; - } else if (opcode == 1407) { + } else if (opcode == Cs2Opcodes.hookVARP) { component.varpTriggers = local12937; component.onVarpTransmit = local13000; - } else if (opcode == 1408) { + } else if (opcode == Cs2Opcodes.hookFrame) { component.onTimer = local13000; - } else if (opcode == 1409) { + } else if (opcode == Cs2Opcodes.hookOptionClick) { component.onOptionClick = local13000; - } else if (opcode == 1410) { + } else if (opcode == Cs2Opcodes.hookDragRelease) { component.onDragRelease = local13000; - } else if (opcode == 1411) { + } else if (opcode == Cs2Opcodes.hookDrag) { component.onDrag = local13000; - } else if (opcode == 1412) { + } else if (opcode == Cs2Opcodes.hookMouseHover) { component.onMouseRepeat = local13000; - } else if (opcode == 1414) { + } else if (opcode == Cs2Opcodes.hookContainer) { component.inventoryTriggers = local12937; component.onInvTransmit = local13000; - } else if (opcode == 1415) { + } else if (opcode == Cs2Opcodes.hookSkill) { component.statTriggers = local12937; component.onStatTransmit = local13000; - } else if (opcode == 1416) { + } else if (opcode == Cs2Opcodes.hookOnUse) { component.onUse = local13000; - } else if (opcode == 1417) { + } else if (opcode == Cs2Opcodes.hookScroll) { component.onScroll = local13000; - } else if (opcode == 1418) { + } else if (opcode == Cs2Opcodes.hookMsg) { component.onMsg = local13000; - } else if (opcode == 1419) { + } else if (opcode == Cs2Opcodes.hookKey) { component.onKey = local13000; - } else if (opcode == 1420) { + } else if (opcode == Cs2Opcodes.hookFriendList) { component.onFriendTransmit = local13000; - } else if (opcode == 1421) { + } else if (opcode == Cs2Opcodes.hookClanList) { component.onClanTransmit = local13000; - } else if (opcode == 1422) { + } else if (opcode == Cs2Opcodes.hookMiscData) { component.onMiscTransmit = local13000; - } else if (opcode == 1423) { + } else if (opcode == Cs2Opcodes.hookDialogAbort) { component.onDialogAbort = local13000; - } else if (opcode == 1424) { + } else if (opcode == Cs2Opcodes.hookWidgetsOpenClose) { component.onWidgetsOpenClose = local13000; - } else if (opcode == 1425) { + } else if (opcode == Cs2Opcodes.hookGEUpdate) { // if_setonstocktransmit component.onStockTransmit = local13000; - } else if (opcode == 1426) { + } else if (opcode == Cs2Opcodes.hookMinimapUnlock) { component.onMinimapUnlock = local13000; - } else if (opcode == 1427) { + } else if (opcode == Cs2Opcodes.hookResize) { component.onResize = local13000; - } else if (opcode == 1428) { + } else if (opcode == Cs2Opcodes.hookVARC) { component.onVarcTransmit = local13000; component.varcTriggers = local12937; - } else if (opcode == 1429) { + } else if (opcode == Cs2Opcodes.hookSTRING) { component.varcstrTriggers = local12937; component.onVarcstrTransmit = local13000; } @@ -1067,65 +1308,65 @@ public final class ScriptRunner { } } else if (opcode < 1700) { component = local1020 ? staticActiveComponent1 : staticActiveComponent2; - if (opcode == 1600) { + if (opcode == Cs2Opcodes.getScrollX) { intStack[isp++] = component.scrollX; continue; } - if (opcode == 1601) { + if (opcode == Cs2Opcodes.getScrollY) { intStack[isp++] = component.scrollY; continue; } - if (opcode == 1602) { + if (opcode == Cs2Opcodes.getText) { stringStack[ssp++] = component.text; continue; } - if (opcode == 1603) { + if (opcode == Cs2Opcodes.getScrollMaxH) { intStack[isp++] = component.scrollMaxH; continue; } - if (opcode == 1604) { + if (opcode == Cs2Opcodes.getScrollMaxV) { intStack[isp++] = component.scrollMaxV; continue; } - if (opcode == 1605) { + if (opcode == Cs2Opcodes.get3DDistance) { intStack[isp++] = component.modelZoom; continue; } - if (opcode == 1606) { + if (opcode == Cs2Opcodes.getRotateX) { intStack[isp++] = component.modelXAngle; continue; } - if (opcode == 1607) { + if (opcode == Cs2Opcodes.getRotateZ) { intStack[isp++] = component.modelYOffset; continue; } - if (opcode == 1608) { + if (opcode == Cs2Opcodes.getRotateY) { intStack[isp++] = component.modelYAngle; continue; } - if (opcode == 1609) { + if (opcode == Cs2Opcodes.getAlpha) { intStack[isp++] = component.alpha; continue; } - if (opcode == 1610) { + if (opcode == Cs2Opcodes.getModelXOffset) { intStack[isp++] = component.modelXOffset; continue; } - if (opcode == 1611) { + if (opcode == Cs2Opcodes.getModelYOffset) { intStack[isp++] = component.modelZOffset; continue; } - if (opcode == 1612) { + if (opcode == Cs2Opcodes.getSpriteId) { intStack[isp++] = component.spriteId; continue; } } else if (opcode < 1800) { component = local1020 ? staticActiveComponent1 : staticActiveComponent2; - if (opcode == 1700) { + if (opcode == Cs2Opcodes.getItemId) { intStack[isp++] = component.objId; continue; } - if (opcode == 1701) { + if (opcode == Cs2Opcodes.getItemAmt) { if (component.objId == -1) { intStack[isp++] = 0; } else { @@ -1133,17 +1374,17 @@ public final class ScriptRunner { } continue; } - if (opcode == 1702) { + if (opcode == Cs2Opcodes.getChildId) { intStack[isp++] = component.createdComponentId; continue; } } else if (opcode < 1900) { component = local1020 ? staticActiveComponent1 : staticActiveComponent2; - if (opcode == 1800) { + if (opcode == Cs2Opcodes.getTargetMask) { intStack[isp++] = InterfaceList.getServerActiveProperties(component).getTargetMask(); continue; } - if (opcode == 1801) { + if (opcode == Cs2Opcodes.getOption) { isp--; int3 = intStack[isp]; int3--; @@ -1154,7 +1395,7 @@ public final class ScriptRunner { stringStack[ssp++] = EMPTY_STRING; continue; } - if (opcode == 1802) { + if (opcode == Cs2Opcodes.getOptionBase) { if (component.optionBase == null) { stringStack[ssp++] = EMPTY_STRING; } else { @@ -1165,93 +1406,93 @@ public final class ScriptRunner { } else if (opcode < 2600) { isp--; component = InterfaceList.getComponent(intStack[isp]); - if (opcode == 2500) { + if (opcode == Cs2Opcodes.getX2) { intStack[isp++] = component.x; continue; } - if (opcode == 2501) { + if (opcode == Cs2Opcodes.getY2) { intStack[isp++] = component.y; continue; } - if (opcode == 2502) { + if (opcode == Cs2Opcodes.getWidth2) { intStack[isp++] = component.width; continue; } - if (opcode == 2503) { + if (opcode == Cs2Opcodes.getHeight2) { intStack[isp++] = component.height; continue; } - if (opcode == 2504) { + if (opcode == Cs2Opcodes.isHidden2) { intStack[isp++] = component.hidden ? 1 : 0; continue; } - if (opcode == 2505) { + if (opcode == Cs2Opcodes.getLayer2) { intStack[isp++] = component.layer; continue; } } else if (opcode < 2700) { isp--; component = InterfaceList.getComponent(intStack[isp]); - if (opcode == 2600) { + if (opcode == Cs2Opcodes.getScrollX2) { intStack[isp++] = component.scrollX; continue; } - if (opcode == 2601) { + if (opcode == Cs2Opcodes.getScrollY2) { intStack[isp++] = component.scrollY; continue; } - if (opcode == 2602) { + if (opcode == Cs2Opcodes.getText2) { stringStack[ssp++] = component.text; continue; } - if (opcode == 2603) { + if (opcode == Cs2Opcodes.getScrollMaxH2) { intStack[isp++] = component.scrollMaxH; continue; } - if (opcode == 2604) { + if (opcode == Cs2Opcodes.getScrollMaxV2) { intStack[isp++] = component.scrollMaxV; continue; } - if (opcode == 2605) { + if (opcode == Cs2Opcodes.get3DDistance2) { intStack[isp++] = component.modelZoom; continue; } - if (opcode == 2606) { + if (opcode == Cs2Opcodes.getRotateX2) { intStack[isp++] = component.modelXAngle; continue; } - if (opcode == 2607) { + if (opcode == Cs2Opcodes.getRotateZ2) { intStack[isp++] = component.modelYOffset; continue; } - if (opcode == 2608) { + if (opcode == Cs2Opcodes.getRotateY2) { intStack[isp++] = component.modelYAngle; continue; } - if (opcode == 2609) { + if (opcode == Cs2Opcodes.getAlpha2) { intStack[isp++] = component.alpha; continue; } - if (opcode == 2610) { + if (opcode == Cs2Opcodes.getModelXOffset2) { intStack[isp++] = component.modelXOffset; continue; } - if (opcode == 2611) { + if (opcode == Cs2Opcodes.getModelYOffset2) { intStack[isp++] = component.modelZOffset; continue; } - if (opcode == 2612) { + if (opcode == Cs2Opcodes.getSpriteId2) { intStack[isp++] = component.spriteId; continue; } } else if (opcode < 2800) { - if (opcode == 2700) { + if (opcode == Cs2Opcodes.getItemId2) { isp--; component = InterfaceList.getComponent(intStack[isp]); intStack[isp++] = component.objId; continue; } - if (opcode == 2701) { + if (opcode == Cs2Opcodes.getItemAmt2) { isp--; component = InterfaceList.getComponent(intStack[isp]); if (component.objId == -1) { @@ -1261,7 +1502,7 @@ public final class ScriptRunner { } continue; } - if (opcode == 2702) { + if (opcode == Cs2Opcodes.hasChild) { isp--; int1 = intStack[isp]; @Pc(12566) ComponentPointer local12566 = (ComponentPointer) InterfaceList.openInterfaces.get((long) int1); @@ -1272,7 +1513,7 @@ public final class ScriptRunner { } continue; } - if (opcode == 2703) { + if (opcode == Cs2Opcodes.nextChild) { isp--; component = InterfaceList.getComponent(intStack[isp]); if (component.createdComponents == null) { @@ -1289,7 +1530,7 @@ public final class ScriptRunner { intStack[isp++] = int3; continue; } - if (opcode == 2704 || opcode == 2705) { + if (opcode == Cs2Opcodes.hasChildModal || opcode == Cs2Opcodes.hasChildOverlay) { isp -= 2; int1 = intStack[isp]; int3 = intStack[isp + 1]; @@ -1304,11 +1545,11 @@ public final class ScriptRunner { } else if (opcode < 2900) { isp--; component = InterfaceList.getComponent(intStack[isp]); - if (opcode == 2800) { + if (opcode == Cs2Opcodes.getTargetMask2) { intStack[isp++] = InterfaceList.getServerActiveProperties(component).getTargetMask(); continue; } - if (opcode == 2801) { + if (opcode == Cs2Opcodes.getOption2) { isp--; int3 = intStack[isp]; int3--; @@ -1319,7 +1560,7 @@ public final class ScriptRunner { stringStack[ssp++] = EMPTY_STRING; continue; } - if (opcode == 2802) { + if (opcode == Cs2Opcodes.getOptionBase2) { if (component.optionBase == null) { stringStack[ssp++] = EMPTY_STRING; } else { @@ -1328,22 +1569,22 @@ public final class ScriptRunner { continue; } } else if (opcode < 3200) { - if (opcode == 3100) { + if (opcode == Cs2Opcodes.msg) { ssp--; string = stringStack[ssp]; Chat.add(EMPTY_STRING, 0, string); continue; } - if (opcode == 3101) { + if (opcode == Cs2Opcodes.animateSelf) { isp -= 2; Player.animate(intStack[isp + 1], intStack[isp], PlayerList.self); continue; } - if (opcode == 3103) { + if (opcode == Cs2Opcodes.sendCloseWidgetPacket) { ClientProt.method2909(); continue; } - if (opcode == 3104) { + if (opcode == Cs2Opcodes.sendIntegerInput) { ssp--; string = stringStack[ssp]; int3 = 0; @@ -1354,14 +1595,14 @@ public final class ScriptRunner { Protocol.outboundBuffer.p4(int3); continue; } - if (opcode == 3105) { + if (opcode == Cs2Opcodes.sendNameInput) { ssp--; string = stringStack[ssp]; Protocol.outboundBuffer.p1isaac(244); Protocol.outboundBuffer.p8(string.encode37()); continue; } - if (opcode == 3106) { + if (opcode == Cs2Opcodes.sendStringInput) { ssp--; string = stringStack[ssp]; Protocol.outboundBuffer.p1isaac(65); @@ -1369,7 +1610,7 @@ public final class ScriptRunner { Protocol.outboundBuffer.pjstr(string); continue; } - if (opcode == 3107) { + if (opcode == Cs2Opcodes.clickPlayerOption) { isp--; int1 = intStack[isp]; ssp--; @@ -1402,122 +1643,122 @@ public final class ScriptRunner { continue; } } else if (opcode < 3300) { - if (opcode == 3200) { + if (opcode == Cs2Opcodes.playSoundEffect) { isp -= 3; SoundPlayer.play(intStack[isp + 1], intStack[isp], intStack[isp + 2]); continue; } - if (opcode == 3201) { + if (opcode == Cs2Opcodes.playMusic) { isp--; MusicPlayer.playSong(intStack[isp]); continue; } - if (opcode == 3202) { + if (opcode == Cs2Opcodes.playMusicEffect) { isp -= 2; MusicPlayer.playJingle(intStack[isp + 1], intStack[isp]); continue; } } else if (opcode < 3400) { - if (opcode == 3300) { + if (opcode == Cs2Opcodes.getClientCycle) { intStack[isp++] = client.loop; continue; } - if (opcode == 3301) { + if (opcode == Cs2Opcodes.getItemIdInSlot) { isp -= 2; int1 = intStack[isp]; int3 = intStack[isp + 1]; intStack[isp++] = Inv.getItemType(int1, int3); continue; } - if (opcode == 3302) { + if (opcode == Cs2Opcodes.getItemAmtInSlot) { isp -= 2; int3 = intStack[isp + 1]; int1 = intStack[isp]; intStack[isp++] = Inv.getItemCount(int1, int3); continue; } - if (opcode == 3303) { + if (opcode == Cs2Opcodes.getItemAmtInContainer) { isp -= 2; int3 = intStack[isp + 1]; int1 = intStack[isp]; intStack[isp++] = Inv.getSlotTotal(int1, int3); continue; } - if (opcode == 3304) { + if (opcode == Cs2Opcodes.getItemContainerLength) { isp--; int1 = intStack[isp]; intStack[isp++] = InvTypeList.get(int1).size; continue; } - if (opcode == 3305) { + if (opcode == Cs2Opcodes.getSkillCurrentLvl) { isp--; int1 = intStack[isp]; intStack[isp++] = PlayerSkillXpTable.boostedLevels[int1]; continue; } - if (opcode == 3306) { + if (opcode == Cs2Opcodes.getSkillActualLvl) { isp--; int1 = intStack[isp]; intStack[isp++] = PlayerSkillXpTable.baseLevels[int1]; continue; } - if (opcode == 3307) { + if (opcode == Cs2Opcodes.getSkillXp) { isp--; int1 = intStack[isp]; intStack[isp++] = PlayerSkillXpTable.experience[int1]; continue; } - if (opcode == 3308) { + if (opcode == Cs2Opcodes.getMyLocation) { int1 = Player.level; - int3 = Static225.originX + (PlayerList.self.xFine >> 7); - int2 = (PlayerList.self.zFine >> 7) + Static142.originZ; + int3 = Camera.originX + (PlayerList.self.xFine >> 7); + int2 = (PlayerList.self.zFine >> 7) + Camera.originZ; intStack[isp++] = (int1 << 28) - (-(int3 << 14) - int2); continue; } - if (opcode == 3309) { + if (opcode == Cs2Opcodes.x) { isp--; int1 = intStack[isp]; intStack[isp++] = int1 >> 14 & 0x3FFF; continue; } - if (opcode == 3310) { + if (opcode == Cs2Opcodes.z) { isp--; int1 = intStack[isp]; intStack[isp++] = int1 >> 28; continue; } - if (opcode == 3311) { + if (opcode == Cs2Opcodes.y) { isp--; int1 = intStack[isp]; intStack[isp++] = int1 & 0x3FFF; continue; } - if (opcode == 3312) { + if (opcode == Cs2Opcodes.isMember) { intStack[isp++] = LoginManager.mapMembers ? 1 : 0; continue; } - if (opcode == 3313) { + if (opcode == Cs2Opcodes.getItemIdInInpsectingSlot) { isp -= 2; int1 = intStack[isp] + 32768; int3 = intStack[isp + 1]; intStack[isp++] = Inv.getItemType(int1, int3); continue; } - if (opcode == 3314) { + if (opcode == Cs2Opcodes.getItemAmtInInspectingSlot) { isp -= 2; int1 = intStack[isp] + 32768; int3 = intStack[isp + 1]; intStack[isp++] = Inv.getItemCount(int1, int3); continue; } - if (opcode == 3315) { + if (opcode == Cs2Opcodes.getItemAmtInInspectingContainer) { isp -= 2; int1 = intStack[isp] + 32768; int3 = intStack[isp + 1]; intStack[isp++] = Inv.getSlotTotal(int1, int3); continue; } - if (opcode == 3316) { + if (opcode == Cs2Opcodes.getClientRights) { if (LoginManager.staffModLevel < 2) { intStack[isp++] = 0; } else { @@ -1525,23 +1766,23 @@ public final class ScriptRunner { } continue; } - if (opcode == 3317) { + if (opcode == Cs2Opcodes.getSystemUpdateTimer) { intStack[isp++] = Player.rebootTimer; continue; } - if (opcode == 3318) { + if (opcode == Cs2Opcodes.getWorldId) { intStack[isp++] = Player.worldId; continue; } - if (opcode == 3321) { + if (opcode == Cs2Opcodes.getRunEnergy) { intStack[isp++] = Player.runEnergy; continue; } - if (opcode == 3322) { + if (opcode == Cs2Opcodes.getPlayerWeight) { intStack[isp++] = Player.weight; continue; } - if (opcode == 3323) { + if (opcode == Cs2Opcodes.hasMoreThen5Blackmarks) { if (LoginManager.playerModLevel >= 5 && LoginManager.playerModLevel <= 9) { intStack[isp++] = 1; continue; @@ -1549,7 +1790,7 @@ public final class ScriptRunner { intStack[isp++] = 0; continue; } - if (opcode == 3324) { + if (opcode == Cs2Opcodes.getBlackmarks) { if (LoginManager.playerModLevel >= 5 && LoginManager.playerModLevel <= 9) { intStack[isp++] = LoginManager.playerModLevel; continue; @@ -1557,15 +1798,15 @@ public final class ScriptRunner { intStack[isp++] = 0; continue; } - if (opcode == 3325) { + if (opcode == Cs2Opcodes.isSiteSettingsMembers) { intStack[isp++] = LoginManager.playerMember ? 1 : 0; continue; } - if (opcode == 3326) { + if (opcode == Cs2Opcodes.getMyCombat) { intStack[isp++] = PlayerList.self.combatLevel; continue; } - if (opcode == 3327) { + if (opcode == Cs2Opcodes.IsFemale) { intStack[isp++] = PlayerList.self.appearance.gender ? 1 : 0; continue; } @@ -1573,39 +1814,39 @@ public final class ScriptRunner { intStack[isp++] = LoginManager.playerUnderage && !LoginManager.parentalChatConsent ? 1 : 0; continue; } - if (opcode == 3329) { + if (opcode == Cs2Opcodes.mapQuickchat) { intStack[isp++] = LoginManager.mapQuickChat ? 1 : 0; continue; } - if (opcode == 3330) { + if (opcode == Cs2Opcodes.getContainerFreeSlots) { isp--; int1 = intStack[isp]; intStack[isp++] = Inv.getFreeSpace(int1); continue; } - if (opcode == 3331) { + if (opcode == Cs2Opcodes.getContainerIntAttrCountIgnoreStacks) { isp -= 2; int3 = intStack[isp + 1]; int1 = intStack[isp]; intStack[isp++] = Inv.getTotalParam(false, int1, int3); continue; } - if (opcode == 3332) { + if (opcode == Cs2Opcodes.getContainerIntAttrCount) { isp -= 2; int1 = intStack[isp]; int3 = intStack[isp + 1]; intStack[isp++] = Inv.getTotalParam(true, int1, int3); continue; } - if (opcode == 3333) { + if (opcode == Cs2Opcodes.getLoginTypeRelatedMethod3333) { intStack[isp++] = LoginManager.anInt39; continue; } - if (opcode == 3335) { + if (opcode == Cs2Opcodes.getLanguage) { intStack[isp++] = client.language; continue; } - if (opcode == 3336) { + if (opcode == Cs2Opcodes.moveCoord) { isp -= 4; int3 = intStack[isp + 1]; int1 = intStack[isp]; @@ -1617,13 +1858,13 @@ public final class ScriptRunner { intStack[isp++] = int1; continue; } - if (opcode == 3337) { + if (opcode == Cs2Opcodes.getAffid) { intStack[isp++] = client.affiliate; continue; } } else if (opcode < 3500) { @Pc(3422) EnumType local3422; - if (opcode == 3400) { + if (opcode == Cs2Opcodes.datamap) { isp -= 2; int1 = intStack[isp]; int3 = intStack[isp + 1]; @@ -1633,7 +1874,7 @@ public final class ScriptRunner { stringStack[ssp++] = local3422.getString(int3); continue; } - if (opcode == 3408) { + if (opcode == Cs2Opcodes.datamap2) { isp -= 4; int1 = intStack[isp]; int3 = intStack[isp + 1]; @@ -1650,7 +1891,7 @@ public final class ScriptRunner { } throw new RuntimeException("C3408-1"); } - if (opcode == 3409) { + if (opcode == Cs2Opcodes.datamapContainsValue) { isp -= 3; int3 = intStack[isp + 1]; int2 = intStack[isp + 2]; @@ -1665,7 +1906,7 @@ public final class ScriptRunner { intStack[isp++] = local3549.containsValue(int2) ? 1 : 0; continue; } - if (opcode == 3410) { + if (opcode == Cs2Opcodes.datamapContainsValue2) { isp--; int1 = intStack[isp]; ssp--; @@ -1680,7 +1921,7 @@ public final class ScriptRunner { intStack[isp++] = local3422.containsValue(local2522) ? 1 : 0; continue; } - if (opcode == 3411) { + if (opcode == Cs2Opcodes.datamapSize) { isp--; int1 = intStack[isp]; @Pc(3645) EnumType local3645 = EnumTypeList.get(int1); @@ -1688,7 +1929,7 @@ public final class ScriptRunner { continue; } } else if (opcode < 3700) { - if (opcode == 3600) { + if (opcode == Cs2Opcodes.getFriendCount) { if (FriendsList.state == 0) { intStack[isp++] = -2; } else if (FriendsList.state == 1) { @@ -1698,7 +1939,7 @@ public final class ScriptRunner { } continue; } - if (opcode == 3601) { + if (opcode == Cs2Opcodes.getFriendName) { isp--; int1 = intStack[isp]; if (FriendsList.state == 2 && int1 < FriendsList.size) { @@ -1708,7 +1949,7 @@ public final class ScriptRunner { stringStack[ssp++] = EMPTY_STRING; continue; } - if (opcode == 3602) { + if (opcode == Cs2Opcodes.getFriendWorld) { isp--; int1 = intStack[isp]; if (FriendsList.state == 2 && FriendsList.size > int1) { @@ -1718,7 +1959,7 @@ public final class ScriptRunner { intStack[isp++] = 0; continue; } - if (opcode == 3603) { + if (opcode == Cs2Opcodes.getFriendRank) { isp--; int1 = intStack[isp]; if (FriendsList.state == 2 && FriendsList.size > int1) { @@ -1760,7 +2001,7 @@ public final class ScriptRunner { IgnoreList.remove(string.encode37()); continue; } - if (opcode == 3609) { + if (opcode == Cs2Opcodes.isFriend) { ssp--; string = stringStack[ssp]; if (string.startsWith(aClass100_446) || string.startsWith(aClass100_537)) { @@ -1769,7 +2010,7 @@ public final class ScriptRunner { intStack[isp++] = FriendsList.contains(string) ? 1 : 0; continue; } - if (opcode == 3610) { + if (opcode == Cs2Opcodes.getFriendWorldName) { isp--; int1 = intStack[isp]; if (FriendsList.state == 2 && FriendsList.size > int1) { @@ -1779,7 +2020,7 @@ public final class ScriptRunner { stringStack[ssp++] = EMPTY_STRING; continue; } - if (opcode == 3611) { + if (opcode == Cs2Opcodes.clanChatDisplayName) { if (ClanChat.name == null) { stringStack[ssp++] = EMPTY_STRING; } else { @@ -1787,7 +2028,7 @@ public final class ScriptRunner { } continue; } - if (opcode == 3612) { + if (opcode == Cs2Opcodes.clanGetChatCount) { if (ClanChat.name == null) { intStack[isp++] = 0; } else { @@ -1795,7 +2036,7 @@ public final class ScriptRunner { } continue; } - if (opcode == 3613) { + if (opcode == Cs2Opcodes.clanChatUsername) { isp--; int1 = intStack[isp]; if (ClanChat.name != null && ClanChat.size > int1) { @@ -1805,7 +2046,7 @@ public final class ScriptRunner { stringStack[ssp++] = EMPTY_STRING; continue; } - if (opcode == 3614) { + if (opcode == Cs2Opcodes.clanChatUserWorld) { isp--; int1 = intStack[isp]; if (ClanChat.name != null && int1 < ClanChat.size) { @@ -1815,7 +2056,7 @@ public final class ScriptRunner { intStack[isp++] = 0; continue; } - if (opcode == 3615) { + if (opcode == Cs2Opcodes.clanChatUserRank) { isp--; int1 = intStack[isp]; if (ClanChat.name != null && ClanChat.size > int1) { @@ -1849,7 +2090,7 @@ public final class ScriptRunner { ClanChat.leave(); continue; } - if (opcode == 3621) { + if (opcode == Cs2Opcodes.getIgnoreCount) { if (FriendsList.state == 0) { intStack[isp++] = -1; } else { @@ -1857,7 +2098,7 @@ public final class ScriptRunner { } continue; } - if (opcode == 3622) { + if (opcode == Cs2Opcodes.getIgnoreName) { isp--; int1 = intStack[isp]; if (FriendsList.state != 0 && IgnoreList.size > int1) { @@ -1928,64 +2169,64 @@ public final class ScriptRunner { continue; } } else if (opcode < 4000) { - if (opcode == 3903) { + if (opcode == Cs2Opcodes.getGEIsSelling) { isp--; int1 = intStack[isp]; intStack[isp++] = StockMarketManager.offers[int1].getType(); continue; } - if (opcode == 3904) { + if (opcode == Cs2Opcodes.getGEItem) { isp--; int1 = intStack[isp]; intStack[isp++] = StockMarketManager.offers[int1].item; continue; } - if (opcode == 3905) { + if (opcode == Cs2Opcodes.getGEItemPrice) { isp--; int1 = intStack[isp]; intStack[isp++] = StockMarketManager.offers[int1].price; continue; } - if (opcode == 3906) { + if (opcode == Cs2Opcodes.getGEItemAmt) { isp--; int1 = intStack[isp]; intStack[isp++] = StockMarketManager.offers[int1].count; continue; } - if (opcode == 3907) { + if (opcode == Cs2Opcodes.getGEItemAmtTransfered) { isp--; int1 = intStack[isp]; intStack[isp++] = StockMarketManager.offers[int1].completedCount; continue; } - if (opcode == 3908) { + if (opcode == Cs2Opcodes.getGECashTransfered) { isp--; int1 = intStack[isp]; intStack[isp++] = StockMarketManager.offers[int1].completedGold; continue; } - if (opcode == 3910) { + if (opcode == Cs2Opcodes.getGENotStarted) { isp--; int1 = intStack[isp]; int3 = StockMarketManager.offers[int1].getStatus(); intStack[isp++] = int3 == 0 ? 1 : 0; continue; } - if (opcode == 3911) { + if (opcode == Cs2Opcodes.getGEIsStatus2) { isp--; int1 = intStack[isp]; int3 = StockMarketManager.offers[int1].getStatus(); intStack[isp++] = int3 == 2 ? 1 : 0; continue; } - if (opcode == 3912) { + if (opcode == Cs2Opcodes.getGEIsDone) { isp--; int1 = intStack[isp]; int3 = StockMarketManager.offers[int1].getStatus(); intStack[isp++] = int3 == 5 ? 1 : 0; continue; } - if (opcode == 3913) { + if (opcode == Cs2Opcodes.getGEIsStatus1) { isp--; int1 = intStack[isp]; int3 = StockMarketManager.offers[int1].getStatus(); @@ -1993,41 +2234,41 @@ public final class ScriptRunner { continue; } } else if (opcode < 4100) { - if (opcode == 4000) { + if (opcode == Cs2Opcodes.add) { isp -= 2; int1 = intStack[isp]; int3 = intStack[isp + 1]; intStack[isp++] = int3 + int1; continue; } - if (opcode == 4001) { + if (opcode == Cs2Opcodes.subtract) { isp -= 2; int1 = intStack[isp]; int3 = intStack[isp + 1]; intStack[isp++] = int1 - int3; continue; } - if (opcode == 4002) { + if (opcode == Cs2Opcodes.multiply) { isp -= 2; int1 = intStack[isp]; int3 = intStack[isp + 1]; intStack[isp++] = int3 * int1; continue; } - if (opcode == 4003) { + if (opcode == Cs2Opcodes.divide) { isp -= 2; int1 = intStack[isp]; int3 = intStack[isp + 1]; intStack[isp++] = int1 / int3; continue; } - if (opcode == 4004) { + if (opcode == Cs2Opcodes.rndExcl) { isp--; int1 = intStack[isp]; intStack[isp++] = (int) ((double) int1 * Math.random()); continue; } - if (opcode == 4005) { + if (opcode == Cs2Opcodes.rnd) { isp--; int1 = intStack[isp]; intStack[isp++] = (int) (Math.random() * (double) (int1 + 1)); @@ -2143,14 +2384,14 @@ public final class ScriptRunner { } else if (opcode >= 4200) { @Pc(5294) ParamType local5294; if (opcode < 4300) { - if (opcode == 4200) { + if (opcode == Cs2Opcodes.getItemName) { isp--; int1 = intStack[isp]; stringStack[ssp++] = ObjTypeList.get(int1).name; continue; } @Pc(11269) ObjType local11269; - if (opcode == 4201) { + if (opcode == Cs2Opcodes.getItemGroundOption) { isp -= 2; int1 = intStack[isp]; int3 = intStack[isp + 1]; @@ -2162,7 +2403,7 @@ public final class ScriptRunner { stringStack[ssp++] = EMPTY_STRING; continue; } - if (opcode == 4202) { + if (opcode == Cs2Opcodes.getItemOption) { isp -= 2; int1 = intStack[isp]; int3 = intStack[isp + 1]; @@ -2174,20 +2415,20 @@ public final class ScriptRunner { stringStack[ssp++] = EMPTY_STRING; continue; } - if (opcode == 4203) { + if (opcode == Cs2Opcodes.getItemValue) { isp--; int1 = intStack[isp]; intStack[isp++] = ObjTypeList.get(int1).cost; continue; } - if (opcode == 4204) { + if (opcode == Cs2Opcodes.itemIsStackable) { isp--; int1 = intStack[isp]; intStack[isp++] = ObjTypeList.get(int1).stackable == 1 ? 1 : 0; continue; } @Pc(11417) ObjType local11417; - if (opcode == 4205) { + if (opcode == Cs2Opcodes.getNotedItem) { isp--; int1 = intStack[isp]; local11417 = ObjTypeList.get(int1); @@ -2198,7 +2439,7 @@ public final class ScriptRunner { intStack[isp++] = int1; continue; } - if (opcode == 4206) { + if (opcode == Cs2Opcodes.getRealItem) { isp--; int1 = intStack[isp]; local11417 = ObjTypeList.get(int1); @@ -2209,7 +2450,7 @@ public final class ScriptRunner { intStack[isp++] = int1; continue; } - if (opcode == Cs2Opcodes.itemIsStackable) { + if (opcode == Cs2Opcodes.itemIsMembers) { isp--; int1 = intStack[isp]; intStack[isp++] = ObjTypeList.get(int1).members ? 1 : 0; @@ -2236,7 +2477,7 @@ public final class ScriptRunner { intStack[isp++] = Find.index; continue; } - if (opcode == 4211) { + if (opcode == Cs2Opcodes.nextSearchResult) { if (Find.results != null && Find.size < Find.index) { intStack[isp++] = Find.results[Find.size++] & 0xFFFF; continue; @@ -2249,7 +2490,7 @@ public final class ScriptRunner { continue; } } else if (opcode < 4400) { - if (opcode == 4300) { + if (opcode == Cs2Opcodes.getNpcAttribute) { isp -= 2; int1 = intStack[isp]; int3 = intStack[isp + 1]; @@ -2508,7 +2749,7 @@ public final class ScriptRunner { stringStack[ssp++] = string; continue; } - if (opcode == 5016) { + if (opcode == Cs2Opcodes.getTradeSetting) { intStack[isp++] = Chat.tradeFilter; continue; } @@ -2723,7 +2964,7 @@ public final class ScriptRunner { continue; } } else if (opcode < 5200) { - if (opcode == 5100) { + if (opcode == Cs2Opcodes.isHoldingAlt) { if (Keyboard.pressedKeys[Keyboard.KEY_ALT]) { intStack[isp++] = 1; } else { @@ -2731,7 +2972,7 @@ public final class ScriptRunner { } continue; } - if (opcode == 5101) { + if (opcode == Cs2Opcodes.isHoldingCtrl) { if (Keyboard.pressedKeys[Keyboard.KEY_CTRL]) { intStack[isp++] = 1; } else { @@ -2739,7 +2980,7 @@ public final class ScriptRunner { } continue; } - if (opcode == 5102) { + if (opcode == Cs2Opcodes.isHoldingShift) { if (Keyboard.pressedKeys[Keyboard.KEY_SHIFT]) { intStack[isp++] = 1; } else { @@ -2750,12 +2991,12 @@ public final class ScriptRunner { } else { @Pc(7566) boolean local7566; if (opcode < 5300) { - if (opcode == 5200) { + if (opcode == Cs2Opcodes.setWorldmapZoom) { isp--; WorldMap.setTargetZoom(intStack[isp]); continue; } - if (opcode == 5201) { + if (opcode == Cs2Opcodes.getWorldmapZoom) { intStack[isp++] = WorldMap.getTargetZoom(); continue; } @@ -2773,12 +3014,12 @@ public final class ScriptRunner { stringStack[ssp - 1] = WorldMap.method923(stringStack[ssp - 1]); continue; } - if (opcode == 5205) { + if (opcode == Cs2Opcodes.loadDungeonmap) { ssp--; WorldMap.method1853(stringStack[ssp]); continue; } - if (opcode == 5206) { + if (opcode == Cs2Opcodes.getDungeonmap) { isp--; int1 = intStack[isp]; @Pc(7264) Map local7264 = MapList.getContainingSource(int1 >> 14 & 0x3FFF, int1 & 0x3FFF); @@ -2790,7 +3031,7 @@ public final class ScriptRunner { continue; } @Pc(7293) Map local7293; - if (opcode == 5207) { + if (opcode == Cs2Opcodes.getDungeonMapName) { ssp--; local7293 = MapList.get(stringStack[ssp]); if (local7293 != null && local7293.aClass100_137 != null) { @@ -2810,7 +3051,7 @@ public final class ScriptRunner { intStack[isp++] = WorldMap.originZ + WorldMap.length - WorldMap.anInt919 - 1; continue; } - if (opcode == 5210) { + if (opcode == Cs2Opcodes.getDungeonmapCenter) { local7293 = WorldMap.method4361(); if (local7293 == null) { intStack[isp++] = 0; @@ -2860,13 +3101,13 @@ public final class ScriptRunner { intStack[isp++] = int2; continue; } - if (opcode == 5214) { + if (opcode == Cs2Opcodes.setPositionInMap) { isp--; int1 = intStack[isp]; WorldMap.method3616(int1 >> 14 & 0x3FFF, int1 & 0x3FFF); continue; } - if (opcode == 5215) { + if (opcode == Cs2Opcodes.dungeonmapContains) { isp--; int1 = intStack[isp]; ssp--; @@ -2902,7 +3143,7 @@ public final class ScriptRunner { } continue; } - if (opcode == 5218) { + if (opcode == Cs2Opcodes.getMapDefaultZoom) { local7293 = WorldMap.method4361(); if (local7293 == null) { intStack[isp++] = -1; @@ -2963,7 +3204,7 @@ public final class ScriptRunner { intStack[isp++] = int2; continue; } - if (opcode == 5306) { + if (opcode == Cs2Opcodes.getDisplayMode) { intStack[isp++] = Static144.getWindowMode(); continue; } @@ -3019,7 +3260,7 @@ public final class ScriptRunner { int1 = intStack[isp]; int3 = intStack[isp + 1]; if (int1 >= 0 && int1 < 2) { - Static107.anIntArrayArrayArray9[int1] = new int[int3 << 1][4]; + Camera.anIntArrayArrayArray9[int1] = new int[int3 << 1][4]; } continue; } @@ -3032,15 +3273,15 @@ public final class ScriptRunner { c = intStack[isp + 4]; @Pc(8108) int local8108 = intStack[isp + 6]; local1087 = intStack[isp + 5]; - if (int1 >= 0 && int1 < 2 && Static107.anIntArrayArrayArray9[int1] != null && int3 >= 0 && Static107.anIntArrayArrayArray9[int1].length > int3) { - Static107.anIntArrayArrayArray9[int1][int3] = new int[] { (int2 >> 14 & 0x3FFF) * 128, local652, (int2 & 0x3FFF) * 128, local8108 }; - Static107.anIntArrayArrayArray9[int1][int3 + 1] = new int[] { (c >> 14 & 0x3FFF) * 128, local1087, (c & 0x3FFF) * 128 }; + if (int1 >= 0 && int1 < 2 && Camera.anIntArrayArrayArray9[int1] != null && int3 >= 0 && Camera.anIntArrayArrayArray9[int1].length > int3) { + Camera.anIntArrayArrayArray9[int1][int3] = new int[] { (int2 >> 14 & 0x3FFF) * 128, local652, (int2 & 0x3FFF) * 128, local8108 }; + Camera.anIntArrayArrayArray9[int1][int3 + 1] = new int[] { (c >> 14 & 0x3FFF) * 128, local1087, (c & 0x3FFF) * 128 }; } continue; } if (opcode == 5407) { isp--; - int1 = Static107.anIntArrayArrayArray9[intStack[isp]].length >> 1; + int1 = Camera.anIntArrayArrayArray9[intStack[isp]].length >> 1; intStack[isp++] = int1; continue; } @@ -3055,7 +3296,7 @@ public final class ScriptRunner { } continue; } - if (opcode == 5419) { + if (opcode == Cs2Opcodes.getLastIp5419) { string = EMPTY_STRING; if (Player.lastLogAddress != null) { string = Static181.method3341(Player.lastLogAddress.intArg2); @@ -3152,22 +3393,22 @@ public final class ScriptRunner { continue; } } else if (opcode < 5600) { - if (opcode == 5500) { + if (opcode == Cs2Opcodes.cameraMoveTo) { isp -= 4; int1 = intStack[isp]; local652 = intStack[isp + 3]; int2 = intStack[isp + 2]; int3 = intStack[isp + 1]; - Static141.method2722(false, int2, int3, local652, (int1 & 0x3FFF) - Static142.originZ, (int1 >> 14 & 0x3FFF) - Static225.originX); + Camera.method2722(false, int2, int3, local652, (int1 & 0x3FFF) - Camera.originZ, (int1 >> 14 & 0x3FFF) - Camera.originX); continue; } - if (opcode == 5501) { + if (opcode == Cs2Opcodes.cameraPointAt) { isp -= 4; int3 = intStack[isp + 1]; int1 = intStack[isp]; local652 = intStack[isp + 3]; int2 = intStack[isp + 2]; - Static260.method3849(int3, (int1 & 0x3FFF) - Static142.originZ, int2, (int1 >> 14 & 0x3FFF) - Static225.originX, local652); + Camera.method3849(int3, (int1 & 0x3FFF) - Camera.originZ, int2, (int1 >> 14 & 0x3FFF) - Camera.originX, local652); continue; } if (opcode == 5502) { @@ -3176,53 +3417,53 @@ public final class ScriptRunner { if (int1 >= 2) { throw new RuntimeException(); } - Static155.anInt3718 = int1; + Camera.anInt3718 = int1; int3 = intStack[isp + 1]; - if (Static107.anIntArrayArrayArray9[Static155.anInt3718].length >> 1 <= int3 + 1) { + if (Camera.anIntArrayArrayArray9[Camera.anInt3718].length >> 1 <= int3 + 1) { throw new RuntimeException(); } - Static127.anInt3125 = int3; - Static233.anInt5224 = 0; - Static228.anInt5101 = intStack[isp + 2]; - Static114.anInt5843 = intStack[isp + 3]; + Camera.anInt3125 = int3; + Camera.anInt5224 = 0; + Camera.anInt5101 = intStack[isp + 2]; + Camera.anInt5843 = intStack[isp + 3]; int2 = intStack[isp + 4]; if (int2 >= 2) { throw new RuntimeException(); } - Static52.anInt1694 = int2; + Camera.anInt1694 = int2; local652 = intStack[isp + 5]; - if (Static107.anIntArrayArrayArray9[Static52.anInt1694].length >> 1 <= local652 + 1) { + if (Camera.anIntArrayArrayArray9[Camera.anInt1694].length >> 1 <= local652 + 1) { throw new RuntimeException(); } - Static75.anInt2119 = local652; - Static227.cameraType = 3; + Camera.anInt2119 = local652; + Camera.cameraType = 3; continue; } - if (opcode == 5503) { - Static35.resetCameraEffects(); + if (opcode == Cs2Opcodes.cameraUnlock) { + Camera.resetCameraEffects(); continue; } if (opcode == 5504) { isp -= 2; Camera.pitchTarget = intStack[isp]; Camera.yawTarget = intStack[isp + 1]; - if (Static227.cameraType == 2) { - Static184.cameraYaw = (int)Camera.yawTarget; - Static240.cameraPitch = (int)Camera.pitchTarget; + if (Camera.cameraType == 2) { + Camera.cameraYaw = (int)Camera.yawTarget; + Camera.cameraPitch = (int)Camera.pitchTarget; } Camera.clampCameraAngle(); continue; } - if (opcode == 5505) { + if (opcode == Cs2Opcodes.cameraGetVrot) { intStack[isp++] = (int)Camera.pitchTarget; continue; } - if (opcode == 5506) { + if (opcode == Cs2Opcodes.cameraGetHrot) { intStack[isp++] = (int)Camera.yawTarget; continue; } } else if (opcode < 5700) { - if (opcode == 5600) { + if (opcode == Cs2Opcodes.directlogin) { ssp -= 2; string = stringStack[ssp]; local2522 = stringStack[ssp + 1]; @@ -3233,11 +3474,11 @@ public final class ScriptRunner { } continue; } - if (opcode == 5601) { + if (opcode == Cs2Opcodes.skipLoginstage10) { LoginManager.method3395(); continue; } - if (opcode == 5602) { + if (opcode == Cs2Opcodes.resetRCs) { if (LoginManager.step == 0) { LoginManager.reply = -2; } @@ -3246,40 +3487,40 @@ public final class ScriptRunner { if (opcode == 5603) { isp -= 4; if (client.gameState == 10 && LoginManager.anInt4937 == 0 && LoginManager.step == 0 && CreateManager.step == 0 && WorldList.step == 0) { - Static125.method2448(intStack[isp + 2], intStack[isp + 3], intStack[isp], intStack[isp + 1]); + CreateManager.method2448(intStack[isp + 2], intStack[isp + 3], intStack[isp], intStack[isp + 1]); } continue; } - if (opcode == 5604) { + if (opcode == Cs2Opcodes.sendRequestAccount) { ssp--; if (client.gameState == 10 && LoginManager.anInt4937 == 0 && LoginManager.step == 0 && CreateManager.step == 0 && WorldList.step == 0) { - ClientProt.method1691(stringStack[ssp].encode37()); + CreateManager.method1691(stringStack[ssp].encode37()); } continue; } - if (opcode == 5605) { + if (opcode == Cs2Opcodes.sendCreateAccount) { isp -= 4; ssp -= 2; if (client.gameState == 10 && LoginManager.anInt4937 == 0 && LoginManager.step == 0 && CreateManager.step == 0 && WorldList.step == 0) { - Static40.method1016(intStack[isp], intStack[isp + 3], intStack[isp + 1], stringStack[ssp + 1], stringStack[ssp].encode37(), intStack[isp + 2]); + CreateManager.method1016(intStack[isp], intStack[isp + 3], intStack[isp + 1], stringStack[ssp + 1], stringStack[ssp].encode37(), intStack[isp + 2]); } continue; } - if (opcode == 5606) { + if (opcode == Cs2Opcodes.resetAccountCreateRC) { if (CreateManager.step == 0) { CreateManager.reply = -2; } continue; } - if (opcode == 5607) { + if (opcode == Cs2Opcodes.getGameloginRc) { intStack[isp++] = LoginManager.reply; continue; } - if (opcode == 5608) { + if (opcode == Cs2Opcodes.getWorldswitchTimer) { intStack[isp++] = LoginManager.hopTime; continue; } - if (opcode == 5609) { + if (opcode == Cs2Opcodes.getAccountCreateRC) { intStack[isp++] = CreateManager.reply; continue; } @@ -3290,7 +3531,7 @@ public final class ScriptRunner { CreateManager.suggestedNames = null; continue; } - if (opcode == 5611) { + if (opcode == Cs2Opcodes.getDetailedRC) { intStack[isp++] = LoginManager.disallowResult; continue; } @@ -3724,32 +3965,32 @@ public final class ScriptRunner { continue; } } else if (opcode < 6400) { - if (opcode == 6300) { + if (opcode == Cs2Opcodes.getMinute) { intStack[isp++] = (int) (MonotonicClock.currentTimeMillis() / 60000L); continue; } - if (opcode == 6301) { + if (opcode == Cs2Opcodes.getCurrentDaysSinceLaunch) { intStack[isp++] = (int) (MonotonicClock.currentTimeMillis() / 86400000L) - 11745; continue; } - if (opcode == 6302) { + if (opcode == Cs2Opcodes.getDaysSinceLaunch) { isp -= 3; int2 = intStack[isp + 2]; int3 = intStack[isp + 1]; int1 = intStack[isp]; aCalendar2.clear(); - aCalendar2.set(11, 12); + aCalendar2.set(Calendar.HOUR_OF_DAY, 12); aCalendar2.set(int2, int3, int1); intStack[isp++] = (int) (aCalendar2.getTime().getTime() / 86400000L) - 11745; continue; } - if (opcode == 6303) { + if (opcode == Cs2Opcodes.getYear) { aCalendar2.clear(); aCalendar2.setTime(new Date(MonotonicClock.currentTimeMillis())); - intStack[isp++] = aCalendar2.get(1); + intStack[isp++] = aCalendar2.get(Calendar.YEAR); continue; } - if (opcode == 6304) { + if (opcode == Cs2Opcodes.isLeapYear) { local1552 = true; isp--; int1 = intStack[isp]; diff --git a/client/src/main/java/rt4/Static107.java b/client/src/main/java/rt4/Static107.java index 451c8bf..527f755 100644 --- a/client/src/main/java/rt4/Static107.java +++ b/client/src/main/java/rt4/Static107.java @@ -10,7 +10,4 @@ public final class Static107 { @OriginalMember(owner = "client!id", name = "b", descriptor = "I") public static int anInt2875 = -1; - @OriginalMember(owner = "client!id", name = "d", descriptor = "[[[I") - public static final int[][][] anIntArrayArrayArray9 = new int[2][][]; - } diff --git a/client/src/main/java/rt4/Static114.java b/client/src/main/java/rt4/Static114.java index 03a76d6..c0acedf 100644 --- a/client/src/main/java/rt4/Static114.java +++ b/client/src/main/java/rt4/Static114.java @@ -7,9 +7,6 @@ import org.openrs2.deob.annotation.Pc; 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") public static final int[] anIntArray565 = new int[] { 1, -1, -1, 1 }; diff --git a/client/src/main/java/rt4/Static125.java b/client/src/main/java/rt4/Static125.java index 181f3e5..ef575ef 100644 --- a/client/src/main/java/rt4/Static125.java +++ b/client/src/main/java/rt4/Static125.java @@ -1,6 +1,5 @@ package rt4; -import org.openrs2.deob.annotation.OriginalArg; import org.openrs2.deob.annotation.OriginalMember; public final class Static125 { @@ -8,18 +7,4 @@ public final class Static125 { @OriginalMember(owner = "client!jl", name = "v", descriptor = "I") 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; - } - } diff --git a/client/src/main/java/rt4/Static127.java b/client/src/main/java/rt4/Static127.java index 70afabf..0926fef 100644 --- a/client/src/main/java/rt4/Static127.java +++ b/client/src/main/java/rt4/Static127.java @@ -1,6 +1,5 @@ package rt4; -import java.io.UnsupportedEncodingException; import java.nio.charset.StandardCharsets; import org.openrs2.deob.annotation.OriginalArg; @@ -29,9 +28,6 @@ public final class Static127 { @OriginalMember(owner = "client!k", name = "l", descriptor = "[I") 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") public static boolean neverRemoveRoofs = false; @@ -57,13 +53,13 @@ public final class Static127 { client.setGameState(25); } Static114.drawTextOnScreen(true, LocalizedText.LOADING); - @Pc(53) int local53 = Static142.originZ; - @Pc(55) int local55 = Static225.originX; - Static142.originZ = arg1 * 8 - 48; - Static225.originX = (arg2 - 6) * 8; + @Pc(53) int local53 = Camera.originZ; + @Pc(55) int local55 = Camera.originX; + Camera.originZ = arg1 * 8 - 48; + Camera.originX = (arg2 - 6) * 8; Static158.aClass3_Sub2_Sub4_3 = MapList.getContainingSource(Static80.centralZoneX * 8, Static52.anInt1695 * 8); - @Pc(81) int local81 = Static142.originZ - local53; - @Pc(86) int local86 = Static225.originX - local55; + @Pc(81) int local81 = Camera.originZ - local53; + @Pc(86) int local86 = Camera.originX - local55; Static235.mapElementList = null; @Pc(96) int local96; @Pc(103) Npc local103; @@ -157,7 +153,7 @@ public final class Static127 { Static265.anInt5765 -= local81; Static245.anInt5375 -= local86; } else { - Static227.cameraType = 1; + Camera.cameraType = 1; } SoundPlayer.anInt4451 = 0; if (Static115.mapFlagX != 0) { diff --git a/client/src/main/java/rt4/Static141.java b/client/src/main/java/rt4/Static141.java index 78ff5ea..bae9a8c 100644 --- a/client/src/main/java/rt4/Static141.java +++ b/client/src/main/java/rt4/Static141.java @@ -1,6 +1,5 @@ package rt4; -import org.openrs2.deob.annotation.OriginalArg; import org.openrs2.deob.annotation.OriginalMember; public final class Static141 { @@ -8,19 +7,4 @@ public final class Static141 { @OriginalMember(owner = "client!lb", name = "z", descriptor = "I") 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; - } - } diff --git a/client/src/main/java/rt4/Static142.java b/client/src/main/java/rt4/Static142.java index b7f256e..49d8fb7 100644 --- a/client/src/main/java/rt4/Static142.java +++ b/client/src/main/java/rt4/Static142.java @@ -1,10 +1,5 @@ package rt4; -import org.openrs2.deob.annotation.OriginalMember; - public final class Static142 { - @OriginalMember(owner = "client!lc", name = "n", descriptor = "I") - public static int originZ; - } diff --git a/client/src/main/java/rt4/Static155.java b/client/src/main/java/rt4/Static155.java index 42ff0ee..af1166f 100644 --- a/client/src/main/java/rt4/Static155.java +++ b/client/src/main/java/rt4/Static155.java @@ -9,10 +9,7 @@ public final class Static155 { @OriginalMember(owner = "client!me", name = "nb", descriptor = "I") 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) { @Pc(13) VarbitType local13 = VarbitTypeList.get(arg0); @Pc(16) int local16 = local13.baseVar; diff --git a/client/src/main/java/rt4/Static158.java b/client/src/main/java/rt4/Static158.java index 7614898..5ee850b 100644 --- a/client/src/main/java/rt4/Static158.java +++ b/client/src/main/java/rt4/Static158.java @@ -36,9 +36,9 @@ public final class Static158 { @Pc(103) int local103 = local74.g2(); @Pc(107) int local107 = local103 >> 14; @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(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()); 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(); diff --git a/client/src/main/java/rt4/Static18.java b/client/src/main/java/rt4/Static18.java index 6be9031..2faa1f0 100644 --- a/client/src/main/java/rt4/Static18.java +++ b/client/src/main/java/rt4/Static18.java @@ -50,8 +50,8 @@ public final class Static18 { local55 = local72 * local57 >> 16; local57 = local57 * local68 >> 16; } - Static240.cameraPitch = arg6; - Static184.cameraYaw = arg4; + Camera.cameraPitch = arg6; + Camera.cameraYaw = arg4; Static134.renderZ = arg5 - local57; Static138.renderX = arg0 - local55; Static5.anInt40 = arg2 - local59; diff --git a/client/src/main/java/rt4/Static184.java b/client/src/main/java/rt4/Static184.java index 7bf2b11..bc51994 100644 --- a/client/src/main/java/rt4/Static184.java +++ b/client/src/main/java/rt4/Static184.java @@ -6,9 +6,6 @@ import org.openrs2.deob.annotation.Pc; 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") 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); diff --git a/client/src/main/java/rt4/Static198.java b/client/src/main/java/rt4/Static198.java index 40f680a..3e36175 100644 --- a/client/src/main/java/rt4/Static198.java +++ b/client/src/main/java/rt4/Static198.java @@ -20,10 +20,10 @@ public final class Static198 { @Pc(42) int local42 = arg2 - Static134.renderZ; @Pc(46) int local46 = local38 - Static5.anInt40; @Pc(50) int local50 = arg5 - Static138.renderX; - @Pc(54) int local54 = MathUtils.sin[Static240.cameraPitch]; - @Pc(58) int local58 = MathUtils.cos[Static240.cameraPitch]; - @Pc(62) int local62 = MathUtils.sin[Static184.cameraYaw]; - @Pc(66) int local66 = MathUtils.cos[Static184.cameraYaw]; + @Pc(54) int local54 = MathUtils.sin[Camera.cameraPitch]; + @Pc(58) int local58 = MathUtils.cos[Camera.cameraPitch]; + @Pc(62) int local62 = MathUtils.sin[Camera.cameraYaw]; + @Pc(66) int local66 = MathUtils.cos[Camera.cameraYaw]; @Pc(76) int local76 = local50 * local66 + local62 * local42 >> 16; @Pc(87) int local87 = local42 * local66 - local62 * local50 >> 16; @Pc(89) int local89 = local76; diff --git a/client/src/main/java/rt4/Static225.java b/client/src/main/java/rt4/Static225.java index ae14e5b..676f965 100644 --- a/client/src/main/java/rt4/Static225.java +++ b/client/src/main/java/rt4/Static225.java @@ -6,9 +6,6 @@ import org.openrs2.deob.annotation.Pc; public final class Static225 { - @OriginalMember(owner = "client!se", name = "a", descriptor = "I") - public static int originX; - @OriginalMember(owner = "client!se", name = "h", descriptor = "I") public static int anInt5073 = -1; diff --git a/client/src/main/java/rt4/Static227.java b/client/src/main/java/rt4/Static227.java index 1bdc9c1..16cef90 100644 --- a/client/src/main/java/rt4/Static227.java +++ b/client/src/main/java/rt4/Static227.java @@ -4,9 +4,6 @@ import org.openrs2.deob.annotation.OriginalMember; 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;") public static final JagString SETTINGS = JagString.parse("settings"); diff --git a/client/src/main/java/rt4/Static228.java b/client/src/main/java/rt4/Static228.java index ad0c01c..15f5d16 100644 --- a/client/src/main/java/rt4/Static228.java +++ b/client/src/main/java/rt4/Static228.java @@ -8,10 +8,8 @@ public final class Static228 { @OriginalMember(owner = "client!dc", name = "db", descriptor = "[[B") 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(""); @OriginalMember(owner = "client!sh", name = "f", descriptor = "I") diff --git a/client/src/main/java/rt4/Static233.java b/client/src/main/java/rt4/Static233.java index 23cc564..cdd185f 100644 --- a/client/src/main/java/rt4/Static233.java +++ b/client/src/main/java/rt4/Static233.java @@ -21,10 +21,7 @@ public final class Static233 { @OriginalMember(owner = "client!t", name = "y", descriptor = "I") 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"); @OriginalMember(owner = "client!t", name = "a", descriptor = "(IIIZIII)V") @@ -34,7 +31,7 @@ public final class Static233 { while (local5.length > local3) { @Pc(17) MapMarker local17 = local5[local3]; 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) { Sprites.headhints[local17.anInt4048].render(arg1 + Static65.anInt1951 - 12, arg5 + -28 - -Static16.anInt548); } diff --git a/client/src/main/java/rt4/Static240.java b/client/src/main/java/rt4/Static240.java index a92ebb5..199d044 100644 --- a/client/src/main/java/rt4/Static240.java +++ b/client/src/main/java/rt4/Static240.java @@ -4,9 +4,6 @@ import org.openrs2.deob.annotation.OriginalMember; 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;") public static final JagString aClass100_1008 = JagString.parse("